From 2d05304f919ad0c1958ece36ed9188d4969ad8e1 Mon Sep 17 00:00:00 2001 From: Iajret Creature <122297233+AnArgonianLizardThatStealsPRs@users.noreply.github.com> Date: Fri, 20 Oct 2023 22:13:47 +0300 Subject: [PATCH] [MIRROR] [NO GBP] Fixes scream for me, and also fixes literally EVERY INSTANCE of non-random puncture wounds [MDB IGNORE] (#24460) (#184) * [NO GBP] Fixes scream for me, and also fixes literally EVERY INSTANCE of non-random puncture wounds * Update wounds.dm * Update wounds.dm * Update wounds.dm * Update wounds.dm --------- Co-authored-by: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Co-authored-by: nikothedude <59709059+nikothedude@users.noreply.github.com> Co-authored-by: Bloop <13398309+vinylspiders@users.noreply.github.com> --- code/__DEFINES/wounds.dm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/code/__DEFINES/wounds.dm b/code/__DEFINES/wounds.dm index 14067fbcd6a..68318fec1c8 100644 --- a/code/__DEFINES/wounds.dm +++ b/code/__DEFINES/wounds.dm @@ -226,6 +226,9 @@ GLOBAL_LIST_INIT(wounding_types_to_series, list( WOUND_SERIES_MUSCLE_DAMAGE, // SKYRAT EDIT ADDITION - MUSCLE WOUNDS WOUND_SERIES_WIRE_PIERCE_ELECTRICAL_DAMAGE, // SKYRAT EDIT ADDITION - SYNTH WOUNDS ), + WOUND_PIERCE = list( + WOUND_SERIES_FLESH_PUNCTURE_BLEED, + ), )) /// Used in get_corresponding_wound_type(): Will pick the highest severity wound out of severity_min and severity_max @@ -275,7 +278,7 @@ GLOBAL_LIST_INIT(wounding_types_to_series, list( var/picked_severity for (var/severity_text as anything in shuffle(GLOB.wound_severities_chronological)) var/severity = text2num(severity_text) - if (severity > severity_min || severity < severity_max) + if (!ISINRANGE(severity, severity_min, severity_max)) continue if (isnull(picked_severity) || ((severity_pick_mode == WOUND_PICK_HIGHEST_SEVERITY && severity > picked_severity) || (severity_pick_mode == WOUND_PICK_LOWEST_SEVERITY && severity < picked_severity)))