From 0d2f61d6af9e5e21550ee90473b292f6a00aa39f Mon Sep 17 00:00:00 2001 From: nikothedude <59709059+nikothedude@users.noreply.github.com> Date: Sat, 11 May 2024 16:15:15 -0400 Subject: [PATCH] Nerfs the required synth blunt T3 wound's burn wound to be T1, also shortens heating time (#2431) * sdwedw * why did i make this so high?? --- .../modules/medical/code/wounds/synth/blunt/robotic_blunt.dm | 2 +- .../medical/code/wounds/synth/blunt/robotic_blunt_T3.dm | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modular_nova/modules/medical/code/wounds/synth/blunt/robotic_blunt.dm b/modular_nova/modules/medical/code/wounds/synth/blunt/robotic_blunt.dm index 92f74d8b508..e29e5e9dbbd 100644 --- a/modular_nova/modules/medical/code/wounds/synth/blunt/robotic_blunt.dm +++ b/modular_nova/modules/medical/code/wounds/synth/blunt/robotic_blunt.dm @@ -166,7 +166,7 @@ RETURN_TYPE(/datum/wound/burn/robotic/overheat) for (var/datum/wound/found_wound as anything in limb.wounds) var/datum/wound_pregen_data/pregen_data = found_wound.get_pregen_data() - if (pregen_data.wound_series == WOUND_SERIES_METAL_BURN_OVERHEAT && found_wound.severity >= WOUND_SEVERITY_SEVERE) // meh solution but whateva + if (pregen_data.wound_series == WOUND_SERIES_METAL_BURN_OVERHEAT && found_wound.severity >= WOUND_SEVERITY_MODERATE) // meh solution but whateva return found_wound return null diff --git a/modular_nova/modules/medical/code/wounds/synth/blunt/robotic_blunt_T3.dm b/modular_nova/modules/medical/code/wounds/synth/blunt/robotic_blunt_T3.dm index 6d0930af59b..03a9910b3ae 100644 --- a/modular_nova/modules/medical/code/wounds/synth/blunt/robotic_blunt_T3.dm +++ b/modular_nova/modules/medical/code/wounds/synth/blunt/robotic_blunt_T3.dm @@ -213,10 +213,10 @@ if (HAS_TRAIT(src, TRAIT_WOUND_SCANNED)) delay_mult *= 0.75 - if (!welder.use_tool(target = victim, user = user, delay = 7 SECONDS * delay_mult, volume = 50, extra_checks = CALLBACK(src, PROC_REF(still_exists)))) + if (!welder.use_tool(target = victim, user = user, delay = 3 SECONDS * delay_mult, volume = 50, extra_checks = CALLBACK(src, PROC_REF(still_exists)))) return TRUE - var/wound_path = /datum/wound/burn/robotic/overheat/severe + var/wound_path = /datum/wound/burn/robotic/overheat/moderate if (user != victim && user.combat_mode) wound_path = /datum/wound/burn/robotic/overheat/critical // it really isnt that bad, overheat wounds are a bit funky user.visible_message(span_danger("[user] heats [victim]'s [limb.plaintext_zone] aggressively, overheating it far beyond the necessary point!"), \