From f816bba62a34b3858d02510e61d978e1cea94cd2 Mon Sep 17 00:00:00 2001
From: timothyteakettle <59849408+timothyteakettle@users.noreply.github.com>
Date: Wed, 5 May 2021 00:51:52 +0100
Subject: [PATCH] bugfixes
---
code/modules/client/preferences.dm | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm
index a06e2c4b22..7e06868c6b 100644
--- a/code/modules/client/preferences.dm
+++ b/code/modules/client/preferences.dm
@@ -524,7 +524,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
if(marking_type)
dat += APPEARANCE_CATEGORY_COLUMN
dat += "
[GLOB.all_mutant_parts[marking_type]]
" // give it the appropriate title for the type of marking
- dat += "Add marking"
// list out the current markings you have
if(length(features[marking_type]))
dat += ""
@@ -554,10 +554,8 @@ GLOBAL_LIST_EMPTY(preferences_datums)
dat += "
"
for(var/mutant_part in GLOB.all_mutant_parts)
- // these are sorted out separately due to the rp marking system being funky
- // NOTE TO SELF: UNCOMMENT THIS ONCE YOU'RE DONE DEBUGGING
- //if(istype(accessory, /datum/sprite_accessory/mam_body_markings) || istype(accessory, /datum/sprite_accessory/body_markings))
- // continue
+ if(istype(accessory, /datum/sprite_accessory/mam_body_markings) || istype(accessory, /datum/sprite_accessory/body_markings))
+ continue
if(parent.can_have_part(mutant_part))
if(!mutant_category)
dat += APPEARANCE_CATEGORY_COLUMN
@@ -2450,11 +2448,11 @@ GLOBAL_LIST_EMPTY(preferences_datums)
// gross copypasta here because mam markings arent a subtype of regular markings despite one containing the other ???
if(istype(S, /datum/sprite_accessory/body_markings))
var/datum/sprite_accessory/body_markings/marking = S
- if(!(GLOB.bodypart_names[selected_limb] in marking.covered_limbs))
+ if(!(text2num(GLOB.bodypart_names[selected_limb]) in marking.covered_limbs))
continue
if(istype(S, /datum/sprite_accessory/mam_body_markings))
var/datum/sprite_accessory/mam_body_markings/marking = S
- if(!(GLOB.bodypart_names[selected_limb] in marking.covered_limbs))
+ if(!(text2num(GLOB.bodypart_names[selected_limb]) in marking.covered_limbs))
continue
if((!S.ckeys_allowed) || (S.ckeys_allowed.Find(user.client.ckey)))