shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2962 from Citadel-Station-13/upstream-merge-31032

Browse Source 
[MIRROR] Fixes doomsday not working with multiz stations
This commit is contained in:
LetterJay
2017-09-30 15:17:14 -04:00
committed by GitHub
parent d3c952d974 7f2d8bdaff
commit 825f05b3f9
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/gamemodes/malfunction/Malf_Modules.dm
+2 -2
View File
@@ -377,7 +377,7 @@ 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)
if(!T || T.z != z_level)
if(!T || !(T.z in GLOB.station_z_levels))
continue
if(issilicon(L))
continue
@@ -827,4 +827,4 @@ GLOBAL_LIST_INIT(blacklisted_malf_machines, typecacheof(list(
AI.eyeobj.relay_speech = TRUE
#undef DEFAULT_DOOMSDAY_TIMER
#undef DOOMSDAY_ANNOUNCE_INTERVAL
#undef DOOMSDAY_ANNOUNCE_INTERVAL