From 37dec6e15e94f9ee009c7a82e97e415e3c6cac65 Mon Sep 17 00:00:00 2001 From: Albert Iordache Date: Wed, 30 May 2012 20:23:25 +0300 Subject: [PATCH] Revert "All objects leaving the boundaries of a Z level will now be deleted" This reverts commit 606a4a75fe320e67207d0f3134496099c019876f. --- code/game/turf.dm | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/code/game/turf.dm b/code/game/turf.dm index df2b4c642a6..ac32981a41f 100644 --- a/code/game/turf.dm +++ b/code/game/turf.dm @@ -1400,9 +1400,14 @@ turf/simulated/floor/return_siding_icon_state() if(ticker && ticker.mode) // Okay, so let's make it so that people can travel z levels but not nuke disks! + // if(ticker.mode.name == "nuclear emergency") return if (src.x <= TRANSITIONEDGE || A.x >= (world.maxx - TRANSITIONEDGE - 1) || src.y <= TRANSITIONEDGE || A.y >= (world.maxy - TRANSITIONEDGE - 1)) - if(istype(A, /obj)) - del(A) // The nuke disk's del() will spawn a new disk + if(istype(A, /obj/effect/meteor)||istype(A, /obj/effect/space_dust)) + del(A) + return + + if(istype(A, /obj/item/weapon/disk/nuclear)) // Don't let nuke disks travel Z levels ... And moving this shit down here so it only fires when they're actually trying to change z-level. + del(A) //The disk's Del() proc ensures a new one is created return if(!isemptylist(A.search_contents_for(/obj/item/weapon/disk/nuclear))) @@ -1412,7 +1417,10 @@ turf/simulated/floor/return_siding_icon_state() MM << "\red Something you are carrying is preventing you from leaving. Don't play stupid; you know exactly what it is." return - var/move_to_z = text2num(pickweight(accessable_z_levels)) + var/move_to_z_str = pickweight(accessable_z_levels) + + var/move_to_z = text2num(move_to_z_str) + if(!move_to_z) return