diff --git a/_maps/RandomRuins/SpaceRuins/Academy.dmm b/_maps/RandomRuins/SpaceRuins/Academy.dmm index 13ccf9790e49..9f10a4412f9b 100644 --- a/_maps/RandomRuins/SpaceRuins/Academy.dmm +++ b/_maps/RandomRuins/SpaceRuins/Academy.dmm @@ -727,6 +727,7 @@ "cF" = ( /obj/effect/immovablerod{ dir = 4 + notdebris = 1 }, /obj/structure/cable, /obj/structure/cable{ diff --git a/_maps/RandomZLevels/Academy.dmm b/_maps/RandomZLevels/Academy.dmm index 0d26580ac0fa..46803920ff8c 100644 --- a/_maps/RandomZLevels/Academy.dmm +++ b/_maps/RandomZLevels/Academy.dmm @@ -4019,6 +4019,7 @@ "lK" = ( /obj/effect/immovablerod{ dir = 4 + notdebris = 1 }, /obj/structure/cable, /obj/structure/cable{ diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm index c1a27ff2eea0..02be2fa7cadc 100644 --- a/_maps/map_files/generic/CentCom.dmm +++ b/_maps/map_files/generic/CentCom.dmm @@ -20593,7 +20593,9 @@ /turf/closed/indestructible/riveted, /area/centcom/testchamber) "TY" = ( -/obj/effect/immovablerod/duck, +/obj/effect/immovablerod/duck{ + notdebris = 1 + }, /turf/open/floor/engine, /area/centcom/testchamber) "Ub" = ( diff --git a/code/modules/events/immovable_rod.dm b/code/modules/events/immovable_rod.dm index 84c2df75d91a..1b5be3cbcc52 100644 --- a/code/modules/events/immovable_rod.dm +++ b/code/modules/events/immovable_rod.dm @@ -54,6 +54,7 @@ In my current plan for it, 'solid' will be defined as anything with density == 1 var/destination var/notify = TRUE var/atom/special_target + var/notdebris = FALSE /obj/effect/immovablerod/New(atom/start, atom/end, aimed_at) ..() @@ -62,6 +63,8 @@ In my current plan for it, 'solid' will be defined as anything with density == 1 destination = end special_target = aimed_at GLOB.poi_list += src + if(notdebris) + SSaugury.unregister_doom(src) var/special_target_valid = FALSE if(special_target) diff --git a/yogstation/code/modules/events/immovable_duck.dm b/yogstation/code/modules/events/immovable_duck.dm index a899d56d8bf1..b9f9c70d49e6 100644 --- a/yogstation/code/modules/events/immovable_duck.dm +++ b/yogstation/code/modules/events/immovable_duck.dm @@ -33,6 +33,7 @@ . = ..() SpinAnimation(24,-1) + /obj/effect/immovablerod/duck/Bump(atom/clong) if(prob(90)) playsound(src, 'yogstation/sound/misc/quack.ogg', 50, 1) @@ -68,4 +69,4 @@ var/mob/living/carbon/human/H = L H.adjustBruteLoss(160) if(L && (L.density || prob(10))) - L.ex_act(EXPLODE_HEAVY) \ No newline at end of file + L.ex_act(EXPLODE_HEAVY)