cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-07-14 09:43:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1869 from Darlantanis/Fixes-#10237-2

Browse Source 
Emergency earlyport of "Fixes #10237"
This commit is contained in:
Nadyr
2021-04-30 02:46:36 -04:00
committed by GitHub
parent 61dbe68e54 8d05156f42
commit 9dd025973b
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference_setup/general/03_body.dm
+6 -6
View File
@@ -244,11 +244,11 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
pref.r_wing3 = sanitize_integer(pref.r_wing3, 0, 255, initial(pref.r_wing3))
pref.g_wing3 = sanitize_integer(pref.g_wing3, 0, 255, initial(pref.g_wing3))
pref.b_wing3 = sanitize_integer(pref.b_wing3, 0, 255, initial(pref.b_wing3))
if(!(pref.ear_style in get_ear_styles()))
if(get_ear_styles()[pref.ear_style])
pref.ear_style = initial(pref.ear_style)
if(!(pref.wing_style in get_wing_styles()))
if(get_wing_styles()[pref.wing_style])
pref.wing_style = initial(pref.wing_style)
if(!(pref.tail_style in get_tail_styles()))
if(get_tail_styles()[pref.tail_style])
pref.tail_style = initial(pref.tail_style)
// Moved from /datum/preferences/proc/copy_to()
@@ -698,11 +698,11 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
pref.body_markings.Cut() // Basically same as above.
// Sanitize ear/wing/tail styles
if(!(pref.ear_style in get_ear_styles()))
if(get_ear_styles()[pref.ear_style])
pref.ear_style = initial(pref.ear_style)
if(!(pref.wing_style in get_wing_styles()))
if(get_wing_styles()[pref.wing_style])
pref.wing_style = initial(pref.wing_style)
if(!(pref.tail_style in get_tail_styles()))
if(get_tail_styles()[pref.tail_style])
pref.tail_style = initial(pref.tail_style)
var/min_age = get_min_age()