cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 02:34:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Adds 'default' option for bloodreagents (#7374)

Browse Source 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
This commit is contained in:
CHOMPStation2
2023-12-09 04:39:19 -07:00
committed by GitHub
parent 75680c3eee
commit c6a65f3b08
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
code/modules/client/preference_setup/vore/07_traits.dm
View File

@@ -5,7 +5,7 @@
#define ORGANICS 1 #define ORGANICS 1
#define SYNTHETICS 2 #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 /datum/preferences
var/custom_species // Custom species name, can't be changed due to it having been used in savefiles already. var/custom_species // Custom species name, can't be changed due to it having been used in savefiles already.
@@ -264,7 +264,8 @@ var/global/list/valid_bloodreagents = list("iron","copper","phoron","silver","go
//Any additional non-trait settings can be applied here //Any additional non-trait settings can be applied here
new_S.blood_color = pref.blood_color 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
//Any additional non-trait settings can be applied here //Any additional non-trait settings can be applied here
new_S.blood_color = pref.blood_color new_S.blood_color = pref.blood_color

2
code/modules/client/preferences.dm
View File

@@ -45,7 +45,7 @@ var/list/preferences_datums = list()
var/bday_announce = FALSE //Public announcement for birthdays var/bday_announce = FALSE //Public announcement for birthdays
var/spawnpoint = "Arrivals Shuttle" //where this character will spawn (0-2). var/spawnpoint = "Arrivals Shuttle" //where this character will spawn (0-2).
var/b_type = "A+" //blood type (not-chooseable) 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/backbag = 2 //backpack type
var/pdachoice = 1 //PDA type var/pdachoice = 1 //PDA type
var/h_style = "Bald" //Hair type var/h_style = "Bald" //Hair type