Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[MIRROR] Fixes scream for me, and also fixes literally EVERY INSTANCE of non-random puncture wounds #184

Merged
merged 1 commit into from
Oct 20, 2023
Merged

[MIRROR] Fixes scream for me, and also fixes literally EVERY INSTANCE of non-random puncture wounds #184

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion code/__DEFINES/wounds.dm
View file
Open in desktop
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
Loading