From f1570a3f34b00e39d214ac632c9b1a50d7023dc4 Mon Sep 17 00:00:00 2001 From: SierraKomodo <11140088+SierraKomodo@users.noreply.github.com> Date: Fri, 6 Dec 2024 11:49:45 +0000 Subject: [PATCH 1/2] [MIRROR] Fix cancelled allergy inputs breaking allergies --- code/modules/client/preference_setup/general/02_body.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/modules/client/preference_setup/general/02_body.dm b/code/modules/client/preference_setup/general/02_body.dm index c14f7d845c9ce..ff45512600b44 100644 --- a/code/modules/client/preference_setup/general/02_body.dm +++ b/code/modules/client/preference_setup/general/02_body.dm @@ -701,6 +701,8 @@ 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] From 5df14d391f5ef6e3105d8441cb347ba4ae0c3be5 Mon Sep 17 00:00:00 2001 From: Lexanx <61974560+Lexanx@users.noreply.github.com> Date: Fri, 20 Dec 2024 15:50:35 +0300 Subject: [PATCH 2/2] Update 02_body.dm --- code/modules/client/preference_setup/general/02_body.dm | 5 ----- 1 file changed, 5 deletions(-) diff --git a/code/modules/client/preference_setup/general/02_body.dm b/code/modules/client/preference_setup/general/02_body.dm index ff45512600b44..340ef7d9b00da 100644 --- a/code/modules/client/preference_setup/general/02_body.dm +++ b/code/modules/client/preference_setup/general/02_body.dm @@ -707,11 +707,6 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O 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