From 8f01581fc03e2a60b03ea8410f57008aee84ae33 Mon Sep 17 00:00:00 2001 From: KorPhaeron Date: Mon, 7 Dec 2015 18:28:36 -0600 Subject: [PATCH] Updates to use variables --- code/modules/mining/mine_turfs.dm | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/code/modules/mining/mine_turfs.dm b/code/modules/mining/mine_turfs.dm index 1278b1b2388..91cf3642b1a 100644 --- a/code/modules/mining/mine_turfs.dm +++ b/code/modules/mining/mine_turfs.dm @@ -655,6 +655,9 @@ var/global/list/rockTurfEdgeCache smooth = SMOOTH_TRUE icon = 'icons/turf/floors/Chasms.dmi' icon_state = "smooth" + var/drop_x = 1 + var/drop_y = 1 + var/drop_z = 1 /turf/simulated/chasm/Entered(atom/movable/AM) @@ -665,17 +668,21 @@ var/global/list/rockTurfEdgeCache /turf/simulated/chasm/proc/drop(atom/movable/AM) visible_message("[AM] falls into [src]!") - if(z+1 > world.maxz) - qdel(AM) - else - AM.Move(locate(src.x, src.y, src.z+1)) - AM.visible_message("[AM] falls from above!") - if(istype(AM, /mob/living)) - var/mob/living/L = AM - L.adjustBruteLoss(30) + AM.Move(locate(drop_x, drop_y, drop_z)) + AM.visible_message("[AM] falls from above!") + if(istype(AM, /mob/living)) + var/mob/living/L = AM + L.adjustBruteLoss(30) +/turf/simulated/chasm/straight_down/New() + ..() + drop_x = x + drop_y = y + if(z+1 <= world.maxz) + drop_z = z+1 + #undef NORTH_EDGING #undef SOUTH_EDGING