From 5feeb8dd073a804e20f52620853c08e2799ef5e9 Mon Sep 17 00:00:00 2001 From: "johnsonmt88@gmail.com" Date: Thu, 19 Jul 2012 18:40:40 +0000 Subject: [PATCH] Immovable rods now work properly again. Someone derped and accidentally gave them a 75% chance to delete themselves. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4118 316c924e-a436-60f5-8080-3fe189b3f50e --- code/game/gamemodes/events/clang.dm | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/code/game/gamemodes/events/clang.dm b/code/game/gamemodes/events/clang.dm index a2d2cf7d8ec..91aa2268f02 100644 --- a/code/game/gamemodes/events/clang.dm +++ b/code/game/gamemodes/events/clang.dm @@ -19,22 +19,27 @@ In my current plan for it, 'solid' will be defined as anything with density == 1 Bump(atom/clong) if(istype(clong, /turf/simulated/shuttle)) //Skip shuttles without actually deleting the rod return - if (istype(clong, /turf) && !istype(clong, /turf/unsimulated)) + + else if (istype(clong, /turf) && !istype(clong, /turf/unsimulated)) if(clong.density) clong.ex_act(2) for (var/mob/O in hearers(src, null)) O.show_message("CLANG", 2) - if (istype(clong, /obj)) + + else if (istype(clong, /obj)) if(clong.density) clong.ex_act(2) for (var/mob/O in hearers(src, null)) O.show_message("CLANG", 2) - if (istype(clong, /mob)) + + else if (istype(clong, /mob)) if(clong.density || prob(10)) clong.meteorhit(src) + else + del(src) + if(clong && prob(25)) src.loc = clong.loc - else del(src) /proc/immovablerod() var/startx = 0