Skip to content

Update for A17 #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
FluffierThanThou merged 1 commit into from
May 7, 2017
Merged

Update for A17 #6

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Source/StackMerger/WorkGiver_StackMerge.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@ public override bool ShouldSkip( Pawn pawn )
return !PotentialWorkThingsGlobal( pawn ).Any();
}

public override Job JobOnThing( Pawn pawn, Thing thing )
public override Job JobOnThing( Pawn pawn, Thing thing, bool forced = false )
{
LogIfDebug( $"{pawn.NameStringShort} is trying to merge {thing.Label}..." );

// standard hauling checks
if ( !HaulAIUtility.PawnCanAutomaticallyHaulFast( pawn, thing ) )
if ( !HaulAIUtility.PawnCanAutomaticallyHaulFast( pawn, thing, forced ) )
return null;

LogIfDebug( $"{thing.LabelCap} can be hauled..." );
Expand Down