Skip to content

Fix Quests involving lending colonists via a Shuttle cannot be completed, the shuttle will never register as fully loaded and cannot leave. #851

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
notfood merged 1 commit into from
Mar 26, 2026
Merged

Fix Quests involving lending colonists via a Shuttle cannot be completed, the shuttle will never register as fully loaded and cannot leave. #851

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
34 changes: 34 additions & 0 deletions Source/Client/Factions/MultifactionPatches.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -741,3 +741,37 @@ private static bool DontDrawIdeoPlate(bool generating)
return Multiplayer.Client != null && generating;
}
}

[HarmonyPatch(typeof(CompShuttle), "ContainedColonistCount", MethodType.Getter)]
static class CompShuttle_ContainedColonistCount_Patch
{
static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> insts)
{
var isFreeColonist = AccessTools.PropertyGetter(typeof(Pawn), nameof(Pawn.IsFreeColonist));
var replacement = AccessTools.Method(typeof(CompShuttle_ContainedColonistCount_Patch),
nameof(IsFreeColonistAnyPlayerFaction));

foreach (var ci in insts)
{
if (ci.Calls(isFreeColonist))
{
ci.opcode = OpCodes.Call;
ci.operand = replacement;
}
yield return ci;
}
}
static bool IsFreeColonistAnyPlayerFaction(Pawn pawn)
{
if (Multiplayer.Client == null || !Multiplayer.GameComp.multifaction)
return pawn.IsFreeColonist;

return pawn.Faction != null &&
pawn.Faction.IsPlayer &&
pawn.RaceProps.Humanlike &&
(!pawn.IsSlave || pawn.guest.SlaveIsSecure) &&
!pawn.IsSubhuman &&
pawn.HostFaction == null;
}

}
Loading