From 723d54c8a86b62926ba29f9f8e564bd1d5115150 Mon Sep 17 00:00:00 2001 From: KorPhaeron Date: Tue, 26 Sep 2017 13:00:53 -0500 Subject: [PATCH] Fixes doomsday not working with multiz stations --- code/game/gamemodes/malfunction/Malf_Modules.dm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/code/game/gamemodes/malfunction/Malf_Modules.dm b/code/game/gamemodes/malfunction/Malf_Modules.dm index 80a22c6b3b..13e87f4f03 100644 --- a/code/game/gamemodes/malfunction/Malf_Modules.dm +++ b/code/game/gamemodes/malfunction/Malf_Modules.dm @@ -377,7 +377,11 @@ GLOBAL_LIST_INIT(blacklisted_malf_machines, typecacheof(list( sleep(100) for(var/mob/living/L in GLOB.mob_list) var/turf/T = get_turf(L) +<<<<<<< HEAD if(!T || T.z != z_level) +======= + if(!T || !(T.z in GLOB.station_z_levels)) +>>>>>>> c36ee83... typo continue if(issilicon(L)) continue