From 8e61de1458fcb503290ad6fe4fbdfa7df63f99af Mon Sep 17 00:00:00 2001 From: Kyle Spier-Swenson Date: Sat, 28 May 2016 10:18:40 -0700 Subject: [PATCH] Fixes Gibtonite both defusing AND exploding in rare conditions. (#17970) (explosion() sleeps) --- code/modules/mining/mine_turfs.dm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/code/modules/mining/mine_turfs.dm b/code/modules/mining/mine_turfs.dm index 0f33a087bd2..8a63714047f 100644 --- a/code/modules/mining/mine_turfs.dm +++ b/code/modules/mining/mine_turfs.dm @@ -212,6 +212,7 @@ if(stage == 1 && det_time <= 0 && mineralAmt >= 1) var/turf/bombturf = get_turf(src) mineralAmt = 0 + stage = 3 explosion(bombturf,1,3,5, adminlog = notify_admins) /turf/closed/mineral/gibtonite/proc/defuse() @@ -233,6 +234,7 @@ if(stage == 1 && mineralAmt >= 1) //Gibtonite deposit goes kaboom var/turf/bombturf = get_turf(src) mineralAmt = 0 + stage = 3 explosion(bombturf,1,2,5, adminlog = 0) if(stage == 2) //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/weapon/twohanded/required/gibtonite/G = new /obj/item/weapon/twohanded/required/gibtonite/(src) @@ -242,6 +244,8 @@ if(det_time >= 1 && det_time <= 2) G.quality = 2 G.icon_state = "Gibtonite ore 2" + if(stage == 3) + return ChangeTurf(turf_type, defer_change) AfterChange()