From 67026e62e485b536a9fdfb3606635cbed36d48c6 Mon Sep 17 00:00:00 2001 From: Heroman Date: Sat, 9 Dec 2023 14:27:50 +1000 Subject: [PATCH] Adds 'default' option for bloodreagents --- code/modules/client/preference_setup/vore/07_traits.dm | 5 +++-- code/modules/client/preferences.dm | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/code/modules/client/preference_setup/vore/07_traits.dm b/code/modules/client/preference_setup/vore/07_traits.dm index e89d12f2cc3..14b0775363e 100644 --- a/code/modules/client/preference_setup/vore/07_traits.dm +++ b/code/modules/client/preference_setup/vore/07_traits.dm @@ -5,7 +5,7 @@ #define ORGANICS 1 #define SYNTHETICS 2 -var/global/list/valid_bloodreagents = list("iron","copper","phoron","silver","gold","slimejelly") //allowlist-based so people don't make their blood restored by alcohol or something really silly. use reagent IDs! +var/global/list/valid_bloodreagents = list("default","iron","copper","phoron","silver","gold","slimejelly") //allowlist-based so people don't make their blood restored by alcohol or something really silly. use reagent IDs! /datum/preferences var/custom_species // Custom species name, can't be changed due to it having been used in savefiles already. @@ -258,7 +258,8 @@ var/global/list/valid_bloodreagents = list("iron","copper","phoron","silver","go //Any additional non-trait settings can be applied here new_S.blood_color = pref.blood_color - new_S.blood_reagents = pref.blood_reagents + if(!(pref.blood_reagents == "default")) + new_S.blood_reagents = pref.blood_reagents if(pref.species == SPECIES_CUSTOM) //Statistics for this would be nice diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index 4603e8840ce..810dab44bf3 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -48,7 +48,7 @@ var/list/preferences_datums = list() var/bday_announce = FALSE //Public announcement for birthdays var/spawnpoint = "Arrivals Shuttle" //where this character will spawn (0-2). var/b_type = "A+" //blood type (not-chooseable) - var/blood_reagents = "iron" //blood restoration reagents + var/blood_reagents = "default" //blood restoration reagents var/backbag = 2 //backpack type var/pdachoice = 1 //PDA type var/h_style = "Bald" //Hair type