From 076bc3eb426f907ba97d49110e54b2b975c809cb Mon Sep 17 00:00:00 2001 From: Alexander V Date: Thu, 27 Jul 2023 21:27:04 +0300 Subject: [PATCH] flame_range and flash_range autoset fix (#77118) ## About The Pull Request From #27184 flame_range and flash_range should automatically default to light_impact_range and devastation_range https://github.com/tgstation/tgstation/blob/4abf35e4a7fba8bcee5633f0fefe438baba2f046/code/controllers/subsystem/explosions.dm#L285-L288 But it was broken, probably after moving to subsystem, because now functions set arguments to 0. Please note I don't play tg and haven't tested this change. Fix changes default behavior and may cause unwanted effects. --- code/controllers/subsystem/explosions.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/controllers/subsystem/explosions.dm b/code/controllers/subsystem/explosions.dm index 7934a9628c6..da1e7564161 100644 --- a/code/controllers/subsystem/explosions.dm +++ b/code/controllers/subsystem/explosions.dm @@ -199,7 +199,7 @@ SUBSYSTEM_DEF(explosions) * - smoke: Whether to generate a smoke cloud provided the explosion is powerful enough to warrant it. * - explosion_cause: [Optional] The atom that caused the explosion, when different to the origin. Used for logging. */ -/proc/explosion(atom/origin, devastation_range = 0, heavy_impact_range = 0, light_impact_range = 0, flame_range = 0, flash_range = 0, adminlog = TRUE, ignorecap = FALSE, silent = FALSE, smoke = FALSE, atom/explosion_cause = null) +/proc/explosion(atom/origin, devastation_range = 0, heavy_impact_range = 0, light_impact_range = 0, flame_range = null, flash_range = null, adminlog = TRUE, ignorecap = FALSE, silent = FALSE, smoke = FALSE, atom/explosion_cause = null) . = SSexplosions.explode(arglist(args)) @@ -219,7 +219,7 @@ SUBSYSTEM_DEF(explosions) * - smoke: Whether to generate a smoke cloud provided the explosion is powerful enough to warrant it. * - explosion_cause: [Optional] The atom that caused the explosion, when different to the origin. Used for logging. */ -/datum/controller/subsystem/explosions/proc/explode(atom/origin, devastation_range = 0, heavy_impact_range = 0, light_impact_range = 0, flame_range = 0, flash_range = 0, adminlog = TRUE, ignorecap = FALSE, silent = FALSE, smoke = FALSE, atom/explosion_cause = null) +/datum/controller/subsystem/explosions/proc/explode(atom/origin, devastation_range = 0, heavy_impact_range = 0, light_impact_range = 0, flame_range = null, flash_range = null, adminlog = TRUE, ignorecap = FALSE, silent = FALSE, smoke = FALSE, atom/explosion_cause = null) var/list/arguments = list( EXARG_KEY_ORIGIN = origin, EXARG_KEY_DEV_RANGE = devastation_range,