From aa44396e2e20075800b66f87a473e257ead5f7f2 Mon Sep 17 00:00:00 2001 From: Iamgoofball Date: Thu, 2 Jun 2016 08:45:02 -0700 Subject: [PATCH 1/2] Fixes #18000 Fixes #18000 --- code/modules/mining/mine_turfs.dm | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/code/modules/mining/mine_turfs.dm b/code/modules/mining/mine_turfs.dm index baf182806d7..14e48e46906 100644 --- a/code/modules/mining/mine_turfs.dm +++ b/code/modules/mining/mine_turfs.dm @@ -206,14 +206,15 @@ /turf/closed/mineral/gibtonite/proc/countdown(notify_admins = 0) set waitfor = 0 - while(stage == 1 && det_time > 0 && mineralAmt >= 1) + while(src && stage == 1 && det_time > 0 && mineralAmt >= 1) det_time-- sleep(5) - 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) + if(src) + 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() if(stage == 1) From e745f7e9238db56e9c9629aac1a56d4ba314b250 Mon Sep 17 00:00:00 2001 From: Iamgoofball Date: Thu, 2 Jun 2016 08:51:15 -0700 Subject: [PATCH 2/2] Update mine_turfs.dm --- code/modules/mining/mine_turfs.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/mining/mine_turfs.dm b/code/modules/mining/mine_turfs.dm index 14e48e46906..8cd922a1e25 100644 --- a/code/modules/mining/mine_turfs.dm +++ b/code/modules/mining/mine_turfs.dm @@ -206,10 +206,10 @@ /turf/closed/mineral/gibtonite/proc/countdown(notify_admins = 0) set waitfor = 0 - while(src && stage == 1 && det_time > 0 && mineralAmt >= 1) + while(istype(src, /turf/closed/mineral/gibtonite) && stage == 1 && det_time > 0 && mineralAmt >= 1) det_time-- sleep(5) - if(src) + if(istype(src, /turf/closed/mineral/gibtonite)) if(stage == 1 && det_time <= 0 && mineralAmt >= 1) var/turf/bombturf = get_turf(src) mineralAmt = 0