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

Moves transit space to separate z level. (#1696)

Browse Source
This commit is contained in:
CitadelStationBot
2017-06-30 22:56:45 -05:00
committed by kevinz000
parent 2304cb7887
commit ca2d03a082
11 changed files with 31 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/atoms_movable.dm
+1 -1
View File
@@ -592,7 +592,7 @@
/atom/movable/proc/in_bounds()
. = FALSE
var/turf/currentturf = get_turf(src)
if(currentturf && (currentturf.z == ZLEVEL_CENTCOM || currentturf.z == ZLEVEL_STATION))
if(currentturf && (currentturf.z == ZLEVEL_CENTCOM || currentturf.z == ZLEVEL_STATION || currentturf.z == ZLEVEL_TRANSIT))
. = TRUE
code/game/gamemodes/nuclear/nuclearbomb.dm
+1 -1
View File
@@ -450,7 +450,7 @@
if(istype(SSticker.mode, /datum/game_mode/nuclear))
var/obj/docking_port/mobile/Shuttle = SSshuttle.getShuttle("syndicate")
var/datum/game_mode/nuclear/NM = SSticker.mode
NM.syndies_didnt_escape = (Shuttle && Shuttle.z == ZLEVEL_CENTCOM) ? 0 : 1
NM.syndies_didnt_escape = (Shuttle && (Shuttle.z == ZLEVEL_CENTCOM || Shuttle.z == ZLEVEL_TRANSIT)) ? 0 : 1
NM.nuke_off_station = off_station
SSticker.station_explosion_cinematic(off_station,null,src)