Skip to content

Commit

Permalink
[MIRROR] [NO GBP] Fixes scream for me, and also fixes literally EVERY…
Browse files Browse the repository at this point in the history
… INSTANCE of non-random puncture wounds [MDB IGNORE] (#24460)

* [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: nikothedude <[email protected]>
Co-authored-by: Bloop <[email protected]>
  • Loading branch information
3 people authored and FFMirrorBot committed Oct 20, 2023
1 parent 542a6de commit 80dcd53
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion code/__DEFINES/wounds.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)))
Expand Down

0 comments on commit 80dcd53

Please sign in to comment.