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] Fix cancelled allergy inputs breaking allergies #2961

Merged
merged 3 commits into from
Dec 20, 2024
Merged

[MIRROR] Fix cancelled allergy inputs breaking allergies #2961

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f1570a3
[MIRROR] Fix cancelled allergy inputs breaking allergies
SierraKomodo Dec 6, 2024
588906f
Merge branch 'dev-sierra' into upstream-pr-34937
Lexanx Dec 20, 2024
5df14d3
Update 02_body.dm
Lexanx Dec 20, 2024
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
7 changes: 2 additions & 5 deletions code/modules/client/preference_setup/general/02_body.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -701,15 +701,12 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
for (var/severity in possible_levels)
LAZYSET(letterized_levels, LetterizeSeverity(severity), severity)
var/letterized_input = input(user, "Select the trait's level to apply.", "Select Level") as null | anything in letterized_levels
if (!letterized_input)
return
selected_level = letterized_levels[letterized_input]
else
selected_level = possible_levels[1]

//[SIERRA-ADD] - pr34500 - Prevents runtimes, because as of now it can be null
if(!selected_level)
return
//[/SIERRA-ADD]

var/additional_data
if (length(selected.metaoptions))
var/list/sanitized_metaoptions
Expand Down
Loading