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

Revert "fixes"

Browse Source 
This reverts commit a7e0bafde3.
This commit is contained in:
Timothy Teakettle
2020-11-08 02:23:55 +00:00
parent a7e0bafde3
commit 2fb9dc88e7
2 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preferences.dm
+1 -1
View File
@@ -500,7 +500,7 @@ 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)
if(istype(accessory, /datum/sprite_accessory/mam_body_markings))
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"
code/modules/surgery/bodyparts/_bodyparts.dm
-1
View File
@@ -639,7 +639,6 @@
//body marking memes
var/list/colorlist = list()
var/advanced_color_system = (H.dna.features["color_scheme"] == ADVANCED_CHARACTER_COLORING)
colorlist.Cut()
colorlist += advanced_color_system ? ReadRGB("[H.dna.features["mam_body_markings_primary"]]00") : ReadRGB("[H.dna.features["mcolor1"]]00")
colorlist += advanced_color_system ? ReadRGB("[H.dna.features["mam_body_markings_secondary"]]00") : ReadRGB("[H.dna.features["mcolor2"]]00")