From 48ecffa8f44f262309e5a243d8b937f605b6f322 Mon Sep 17 00:00:00 2001 From: Timothy Teakettle <59849408+timothyteakettle@users.noreply.github.com> Date: Sun, 8 Nov 2020 12:48:00 +0000 Subject: [PATCH] Revert "Revert "fixes"" This reverts commit 2fb9dc88e73d7d80f4f1b6e83785f70e8927cee4. --- code/modules/client/preferences.dm | 2 +- code/modules/surgery/bodyparts/_bodyparts.dm | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index c97344ccff..8d39c0b352 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -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" diff --git a/code/modules/surgery/bodyparts/_bodyparts.dm b/code/modules/surgery/bodyparts/_bodyparts.dm index 0b86d3a191..57b56e0231 100644 --- a/code/modules/surgery/bodyparts/_bodyparts.dm +++ b/code/modules/surgery/bodyparts/_bodyparts.dm @@ -639,6 +639,7 @@ //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")