diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index af38521b4a..ccb79ce255 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -1965,7 +1965,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) if(new_body_markings) var/marking_list = list() for(var/part in list(ARM_LEFT, ARM_RIGHT, LEG_LEFT, LEG_RIGHT, CHEST, HEAD)) - marking_list += list(part, new_body_markings) + marking_list += list(list(part, new_body_markings)) features["body_markings"] = marking_list if(new_body_markings != list()) features["mam_body_markings"] = list() @@ -2104,7 +2104,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) if(new_mam_body_markings != "None") var/marking_list = list() for(var/part in list(ARM_LEFT, ARM_RIGHT, LEG_LEFT, LEG_RIGHT, CHEST, HEAD)) - marking_list += list(part, new_mam_body_markings) + marking_list += list(list(part, new_mam_body_markings)) features["mam_body_markings"] = marking_list else if(new_mam_body_markings == "None") features["mam_body_markings"] = list() diff --git a/code/modules/surgery/bodyparts/_bodyparts.dm b/code/modules/surgery/bodyparts/_bodyparts.dm index 1790809d14..f8c1b525c6 100644 --- a/code/modules/surgery/bodyparts/_bodyparts.dm +++ b/code/modules/surgery/bodyparts/_bodyparts.dm @@ -810,10 +810,9 @@ // Body markings if(!length(body_markings_list)) if(species_id == "husk") - marking = image('modular_citadel/icons/mob/markings_notmammals.dmi', "husk_[body_zone]", -MARKING_LAYER, image_dir) + . += image('modular_citadel/icons/mob/markings_notmammals.dmi', "husk_[body_zone]", -MARKING_LAYER, image_dir) else if(species_id == "husk" && use_digitigrade) - marking = image('modular_citadel/icons/mob/markings_notmammals.dmi', "husk_[digitigrade_type]_[use_digitigrade]_[body_zone]", -MARKING_LAYER, image_dir) - + . += image('modular_citadel/icons/mob/markings_notmammals.dmi', "husk_[digitigrade_type]_[use_digitigrade]_[body_zone]", -MARKING_LAYER, image_dir) else for(var/list/marking_list in body_markings_list) // marking stores icon and value for the specific bodypart @@ -862,10 +861,9 @@ if(!isnull(body_markings)) if(species_id == "husk") - marking = image('modular_citadel/icons/mob/markings_notmammals.dmi', "husk_[body_zone]", -MARKING_LAYER, image_dir) + . += image('modular_citadel/icons/mob/markings_notmammals.dmi', "husk_[body_zone]", -MARKING_LAYER, image_dir) else if(species_id == "husk" && use_digitigrade) - marking = image('modular_citadel/icons/mob/markings_notmammals.dmi', "husk_digitigrade_[use_digitigrade]_[body_zone]", -MARKING_LAYER, image_dir) - + . += = image('modular_citadel/icons/mob/markings_notmammals.dmi', "husk_digitigrade_[use_digitigrade]_[body_zone]", -MARKING_LAYER, image_dir) else for(var/list/marking_list in body_markings_list) // marking stores icon and value for the specific bodypart @@ -877,8 +875,8 @@ else . += image(marking[1], "[marking_list[2]]_[digitigrade_type]_[use_digitigrade]_[body_zone]", -MARKING_LAYER, image_dir) return - - if(color_src) //TODO - add color matrix support for base species limbs +/* + if(color_src) //TODO - add color matrix support for base species limbs (or dont because color matrixes suck) var/draw_color = mutation_color || species_color var/grayscale = FALSE if(!draw_color) @@ -909,7 +907,7 @@ marking.color = "#141414" else marking.color = list(markings_color) - +*/ /obj/item/bodypart/deconstruct(disassembled = TRUE) drop_organs()