From 940ffa306dd6adb17af7cf7c825145174dcd5c54 Mon Sep 17 00:00:00 2001 From: Rukofamicom Date: Mon, 21 Oct 2024 01:41:39 -0500 Subject: [PATCH] Fix explosives (#11750) --- code/game/turfs/closed/minerals.dm | 3 +++ code/game/turfs/closed/wall/mineral_walls.dm | 11 ++++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/code/game/turfs/closed/minerals.dm b/code/game/turfs/closed/minerals.dm index 7b69e6f8f4e6d..74797a4cfe51c 100644 --- a/code/game/turfs/closed/minerals.dm +++ b/code/game/turfs/closed/minerals.dm @@ -558,6 +558,7 @@ mineralAmt = 0 stage = GIBTONITE_DETONATE explosion(bombturf,1,3,5, adminlog = notify_admins) + turf_destruction() /turf/closed/mineral/gibtonite/proc/defuse() if(stage == GIBTONITE_ACTIVE) @@ -580,6 +581,8 @@ mineralAmt = 0 stage = GIBTONITE_DETONATE explosion(bombturf,1,2,5, adminlog = 0) + turf_destruction() + if(stage == GIBTONITE_STABLE) //Gibtonite deposit is now benign and extractable. Depending on how close you were to it blowing up before defusing, you get better quality ore. var/obj/item/gibtonite/G = new (src) if(det_time <= 0) diff --git a/code/game/turfs/closed/wall/mineral_walls.dm b/code/game/turfs/closed/wall/mineral_walls.dm index 64cf73ab13098..4a9f4d54a846e 100644 --- a/code/game/turfs/closed/wall/mineral_walls.dm +++ b/code/game/turfs/closed/wall/mineral_walls.dm @@ -352,11 +352,16 @@ icon_state = "map-overspace" fixed_underlay = list("space"=1) -/turf/closed/wall/mineral/plastitanium/explosive/ex_act(severity) - var/obj/item/bombcore/large/bombcore = new(get_turf(src)) +/turf/closed/wall/mineral/plastitanium/explosive + var/obj/item/bombcore/large/bombcore + +/turf/closed/wall/mineral/plastitanium/explosive/Initialize(mapload) + . = ..() + bombcore = new(get_turf(src)) bombcore.installed = TRUE + +/turf/closed/wall/mineral/plastitanium/explosive/ex_act(severity) bombcore.detonate() - ..() //have to copypaste this code /turf/closed/wall/mineral/plastitanium/interior/copyTurf(turf/T)