shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

better fix

Browse Source
This commit is contained in:
Timothy Teakettle
2020-10-30 19:39:43 +00:00
parent 87be4581d7
commit f4f322dd0e
3 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preferences.dm
+2 -1
View File
@@ -567,7 +567,8 @@ GLOBAL_LIST_EMPTY(preferences_datums)
if(accessory.color_src == MATRIXED || accessory.color_src == MUTCOLORS || accessory.color_src == MUTCOLORS2 || accessory.color_src == MUTCOLORS3) //mutcolors1-3 are deprecated now, please don't rely on these in the future
var/mutant_string = accessory.mutant_part_string
if(!mutant_string)
mutant_string = "[accessory]"
if(istype(accessory, /datum/sprite_accessory/mam_body_markings))
mutant_string = "mam_body_markings"
var/primary_feature = "[mutant_string]_primary"
var/secondary_feature = "[mutant_string]_secondary"
var/tertiary_feature = "[mutant_string]_tertiary"
code/modules/client/preferences_savefile.dm
+6 -3
View File
@@ -237,7 +237,8 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
if(accessory)
var/mutant_string = accessory.mutant_part_string
if(!mutant_string)
mutant_string = "[accessory]"
if(istype(accessory, /datum/sprite_accessory/mam_body_markings))
mutant_string = "mam_body_markings"
var/primary_string = "[mutant_string]_primary"
var/secondary_string = "[mutant_string]_secondary]"
var/tertiary_string = "[mutant_string]_tertiary]"
@@ -848,7 +849,8 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
if(accessory)
var/mutant_string = accessory.mutant_part_string
if(!mutant_string)
mutant_string = "[accessory]"
if(istype(accessory, /datum/sprite_accessory/mam_body_markings))
mutant_string = "mam_body_markings"
var/primary_string = "[mutant_string]_primary"
var/secondary_string = "[mutant_string]_secondary]"
var/tertiary_string = "[mutant_string]_tertiary]"
@@ -998,7 +1000,8 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
if(accessory)
var/mutant_string = accessory.mutant_part_string
if(!mutant_string)
mutant_string = "[accessory]"
if(istype(accessory, /datum/sprite_accessory/mam_body_markings))
mutant_string = "mam_body_markings"
var/primary_string = "[mutant_string]_primary"
var/secondary_string = "[mutant_string]_secondary]"
var/tertiary_string = "[mutant_string]_tertiary]"
code/modules/surgery/bodyparts/_bodyparts.dm
+11 -1
View File
@@ -685,7 +685,17 @@
else
body_markings = "plain"
aux_marking = "plain"
markings_color = list(colorlist)
var/color_scheme = H.dna.features["color_scheme"]
if(color_scheme == ADVANCED_CHARACTER_COLORING)
var/alt_colorlist = list()
alt_colorlist.Cut()
alt_colorlist += ReadRGB("[H.dna.features["primary_mam_body_markings"]]00")
alt_colorlist += ReadRGB("[H.dna.features["secondary_mam_body_markings"]]00")
alt_colorlist += ReadRGB("[H.dna.features["tertiary_mam_body_markings"]]00")
alt_colorlist += list(0,0,0, S.hair_alpha)
markings_color = list(alt_colorlist)
else
markings_color = list(colorlist)
else
body_markings = null
aux_marking = null