From fe1b9088d40c5a9fc3fd84d84d8ffc2fe63dc52e Mon Sep 17 00:00:00 2001 From: Incoming Date: Fri, 22 May 2015 00:33:52 -0400 Subject: [PATCH] Fixes an edge case in malf where mulligan could incorrectly determine that there were never any antags because the malf AI died by gibbing Resolves a similar sort of deal in monkey Note to self: if a mode has a hard return in the child before ..() you NEED to be sure continuous_sanity_checked is handled in the child. Note to future self: remove all hard returns in child modes, they are shit and cause all the mulligan bugs --- code/game/gamemodes/malfunction/malfunction.dm | 1 + code/game/gamemodes/monkey/monkey.dm | 1 + 2 files changed, 2 insertions(+) diff --git a/code/game/gamemodes/malfunction/malfunction.dm b/code/game/gamemodes/malfunction/malfunction.dm index 9a9197dcfee..112de195a4a 100644 --- a/code/game/gamemodes/malfunction/malfunction.dm +++ b/code/game/gamemodes/malfunction/malfunction.dm @@ -179,6 +179,7 @@ priority_announce("Hostile enviroment resolved. You have 3 minutes to board the Emergency Shuttle.", null, 'sound/AI/shuttledock.ogg', "Priority") SSshuttle.emergencyNoEscape = 0 malf_mode_declared = 0 + continuous_sanity_checked = 1 if(get_security_level() == "delta") set_security_level("red") return ..() diff --git a/code/game/gamemodes/monkey/monkey.dm b/code/game/gamemodes/monkey/monkey.dm index a8791d20d77..dfdc1f1f139 100644 --- a/code/game/gamemodes/monkey/monkey.dm +++ b/code/game/gamemodes/monkey/monkey.dm @@ -71,6 +71,7 @@ if(!round_converted) for(var/datum/mind/monkey_mind in ape_infectees) + continuous_sanity_checked = 1 if(monkey_mind.current && monkey_mind.current.stat != DEAD) return 0