From 47ad6e34c21a4da839d3797fa51aa4ab0e4ed4e2 Mon Sep 17 00:00:00 2001 From: oranges Date: Sun, 25 Sep 2016 08:52:55 +1300 Subject: [PATCH] Chasms now check their dropped atom doesn't go away after sleep (#20645) --- code/modules/mining/mine_turfs.dm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/code/modules/mining/mine_turfs.dm b/code/modules/mining/mine_turfs.dm index 2438bd0b626..db741e5f04c 100644 --- a/code/modules/mining/mine_turfs.dm +++ b/code/modules/mining/mine_turfs.dm @@ -662,6 +662,10 @@ return 1 /turf/open/chasm/proc/drop(atom/movable/AM) + //Make sure the item is still there after our sleep + if(!AM || qdeleted(AM)) + return + var/turf/T = locate(drop_x, drop_y, drop_z) if(T) AM.visible_message("[AM] falls into [src]!", "GAH! Ah... where are you?") @@ -697,6 +701,9 @@ initial_gas_mix = "o2=22;n2=82;TEMP=293.15" /turf/open/chasm/straight_down/lava_land_surface/drop(atom/movable/AM) + //Make sure the item is still there after our sleep + if(!AM || qdeleted(AM)) + return AM.visible_message("[AM] falls into [src]!", "You stumble and stare into an abyss before you. It stares back, and you fall \ into the enveloping dark.") if(isliving(AM))