mirror of
https://github.com/vegapnk/RJW-Genes.git
synced 2024-08-15 00:23:31 +00:00
Resolve Merge conflicts
This commit is contained in:
commit
bf5617ffe0
35 changed files with 641 additions and 123 deletions
|
@ -14,7 +14,7 @@ namespace RJW_Genes
|
|||
protected override Job TryGiveJob(Pawn pawn)
|
||||
{
|
||||
Pawn target = pawn.mindState.duty.focus.Pawn;
|
||||
if (pawn.CanReach(target, PathEndMode.InteractionCell, Danger.Deadly))
|
||||
if (pawn.CanReach(target, PathEndMode.InteractionCell, Danger.Deadly) && !target.jobs.curDriver.asleep)
|
||||
{
|
||||
return JobMaker.MakeJob(JobDefOf.rjw_genes_flirt, target);
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue