From 511662fa781bdbea9259398487dc5917fa446309 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Wed, 9 Aug 2023 22:54:10 +0200 Subject: [PATCH] [MIRROR] Fixes gibtonite explosions producing flames and flashes [MDB IGNORE] (#22964) * Fixes gibtonite explosions producing flames and flashes (#77344) * Fixes gibtonite explosions producing flames and flashes --------- Co-authored-by: Sealed101 --- code/game/turfs/closed/minerals.dm | 4 ++-- code/modules/mining/ores_coins.dm | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/code/game/turfs/closed/minerals.dm b/code/game/turfs/closed/minerals.dm index e46bb98408e..13948ea569b 100644 --- a/code/game/turfs/closed/minerals.dm +++ b/code/game/turfs/closed/minerals.dm @@ -716,7 +716,7 @@ var/turf/bombturf = get_turf(src) mineralAmt = 0 stage = GIBTONITE_DETONATE - explosion(bombturf, devastation_range = 1, heavy_impact_range = 3, light_impact_range = 5, adminlog = notify_admins, explosion_cause = src) + explosion(bombturf, devastation_range = 1, heavy_impact_range = 3, light_impact_range = 5, flame_range = 0, flash_range = 0, adminlog = notify_admins, explosion_cause = src) /turf/closed/mineral/gibtonite/proc/defuse(mob/living/defuser) if(stage == GIBTONITE_ACTIVE) @@ -743,7 +743,7 @@ var/turf/bombturf = get_turf(src) mineralAmt = 0 stage = GIBTONITE_DETONATE - explosion(bombturf, devastation_range = 1, heavy_impact_range = 2, light_impact_range = 5, adminlog = FALSE, explosion_cause = src) + explosion(bombturf, devastation_range = 1, heavy_impact_range = 2, light_impact_range = 5, flame_range = 0, flash_range = 0, adminlog = FALSE, explosion_cause = src) 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/modules/mining/ores_coins.dm b/code/modules/mining/ores_coins.dm index 1f83058ec6c..c56f218aa3a 100644 --- a/code/modules/mining/ores_coins.dm +++ b/code/modules/mining/ores_coins.dm @@ -329,11 +329,11 @@ GLOBAL_LIST_INIT(sand_recipes, list(\ if(primed) switch(quality) if(GIBTONITE_QUALITY_HIGH) - explosion(src, devastation_range = 2, heavy_impact_range = 4, light_impact_range = 9, adminlog = notify_admins) + explosion(src, devastation_range = 2, heavy_impact_range = 4, light_impact_range = 9, flame_range = 0, flash_range = 0, adminlog = notify_admins) if(GIBTONITE_QUALITY_MEDIUM) - explosion(src, devastation_range = 1, heavy_impact_range = 2, light_impact_range = 5, adminlog = notify_admins) + explosion(src, devastation_range = 1, heavy_impact_range = 2, light_impact_range = 5, flame_range = 0, flash_range = 0, adminlog = notify_admins) if(GIBTONITE_QUALITY_LOW) - explosion(src, heavy_impact_range = 1, light_impact_range = 3, adminlog = notify_admins) + explosion(src, heavy_impact_range = 1, light_impact_range = 3, flame_range = 0, flash_range = 0, adminlog = notify_admins) qdel(src) /obj/item/gibtonite/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum)