From 80599201cf212013d86b8ca02e4ea2e1cd388f49 Mon Sep 17 00:00:00 2001 From: timothyteakettle <59849408+timothyteakettle@users.noreply.github.com> Date: Thu, 6 May 2021 22:39:07 +0100 Subject: [PATCH] better fix --- code/modules/client/preferences.dm | 4 +- .../sprite_accessories/body_markings.dm | 92 +++++++++---------- 2 files changed, 48 insertions(+), 48 deletions(-) diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index b6b134cb1a..1572d45d2f 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -535,7 +535,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) var/color_marking_dat = "" var/number_colors = 1 var/datum/sprite_accessory/mam_body_markings/S = GLOB.mam_body_markings_list[marking_list[2]] - var/matrixed_sections = S.covered_limbs[limb_value] + var/matrixed_sections = S.covered_limbs[actual_name] if(S && matrixed_sections) // if it has nothing initialize it to white if(length(marking_list) == 2) @@ -2446,7 +2446,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) if(istype(S)) if(istype(S, /datum/sprite_accessory/mam_body_markings)) var/datum/sprite_accessory/mam_body_markings/marking = S - if(!(limb_value in marking.covered_limbs)) + if(!(selected_limb in marking.covered_limbs)) continue if((!S.ckeys_allowed) || (S.ckeys_allowed.Find(user.client.ckey))) diff --git a/code/modules/mob/dead/new_player/sprite_accessories/body_markings.dm b/code/modules/mob/dead/new_player/sprite_accessories/body_markings.dm index 0d9e845d74..285e7ca7e2 100644 --- a/code/modules/mob/dead/new_player/sprite_accessories/body_markings.dm +++ b/code/modules/mob/dead/new_player/sprite_accessories/body_markings.dm @@ -14,7 +14,7 @@ icon = 'modular_citadel/icons/mob/mam_markings.dmi' recommended_species = list("mammal", "xeno", "slimeperson", "podweak") matrixed_sections = MATRIX_ALL // this value is used if there is no value in covered_limbs, don't rely on it, it's a backup value - var/list/covered_limbs = list(HEAD, CHEST, LEG_LEFT, LEG_RIGHT, ARM_LEFT, ARM_RIGHT) + var/list/covered_limbs = list("Head", "Chest", "Left Leg", "Right Leg", "Left Arm", "Right Arm") /datum/sprite_accessory/mam_body_markings/none name = "None" @@ -27,107 +27,107 @@ /datum/sprite_accessory/mam_body_markings/redpanda name = "Redpanda" icon_state = "redpanda" - covered_limbs = list(num2text(HEAD) = MATRIX_RED_BLUE, num2text(CHEST) = MATRIX_RED_GREEN, num2text(LEG_LEFT) = MATRIX_RED_GREEN, num2text(LEG_RIGHT) = MATRIX_RED_GREEN, num2text(ARM_LEFT) = MATRIX_RED_GREEN, num2text(ARM_RIGHT) = MATRIX_RED_GREEN) + covered_limbs = list("Head" = MATRIX_RED_BLUE, "Chest" = MATRIX_RED_GREEN, "Left Leg" = MATRIX_RED_GREEN, "Right Leg" = MATRIX_RED_GREEN, "Left Arm" = MATRIX_RED_GREEN, "Right Arm" = MATRIX_RED_GREEN) /datum/sprite_accessory/mam_body_markings/bat name = "Bat" icon_state = "bat" - covered_limbs = list(num2text(HEAD) = MATRIX_RED_GREEN, num2text(CHEST) = MATRIX_ALL, num2text(LEG_LEFT) = MATRIX_RED_BLUE, num2text(LEG_RIGHT) = MATRIX_RED_BLUE, num2text(ARM_LEFT) = MATRIX_RED, num2text(ARM_RIGHT) = MATRIX_RED) + covered_limbs = list("Head" = MATRIX_RED_GREEN, "Chest" = MATRIX_ALL, "Left Leg" = MATRIX_RED_BLUE, "Right Leg" = MATRIX_RED_BLUE, "Left Arm" = MATRIX_RED, "Right Arm" = MATRIX_RED) /datum/sprite_accessory/mam_body_markings/bee name = "Bee" icon_state = "bee" icon = 'modular_citadel/icons/mob/markings_notmammals.dmi' - covered_limbs = list(num2text(HEAD) = MATRIX_RED_GREEN, num2text(CHEST) = MATRIX_GREEN, num2text(LEG_LEFT) = MATRIX_GREEN, num2text(LEG_RIGHT) = MATRIX_GREEN, num2text(ARM_LEFT) = MATRIX_GREEN, num2text(ARM_RIGHT) = MATRIX_GREEN) + covered_limbs = list("Head" = MATRIX_RED_GREEN, "Chest" = MATRIX_GREEN, "Left Leg" = MATRIX_GREEN, "Right Leg" = MATRIX_GREEN, "Left Arm" = MATRIX_GREEN, "Right Arm" = MATRIX_GREEN) /datum/sprite_accessory/mam_body_markings/belly name = "Belly" icon_state = "belly" icon = 'modular_citadel/icons/mob/markings_notmammals.dmi' - covered_limbs = list(num2text(HEAD) = MATRIX_RED_GREEN, num2text(CHEST) = MATRIX_GREEN, num2text(LEG_LEFT) = MATRIX_RED, num2text(LEG_RIGHT) = MATRIX_RED) + covered_limbs = list("Head" = MATRIX_RED_GREEN, "Chest" = MATRIX_GREEN, "Left Leg" = MATRIX_RED, "Right Leg" = MATRIX_RED) /datum/sprite_accessory/mam_body_markings/bellyslim name = "Bellyslim" icon_state = "bellyslim" icon = 'modular_citadel/icons/mob/markings_notmammals.dmi' - covered_limbs = list(num2text(HEAD) = MATRIX_RED_GREEN, num2text(CHEST) = MATRIX_RED_GREEN, num2text(LEG_LEFT) = MATRIX_RED, num2text(LEG_RIGHT) = MATRIX_RED, num2text(ARM_LEFT) = MATRIX_RED, num2text(ARM_RIGHT) = MATRIX_RED) + covered_limbs = list("Head" = MATRIX_RED_GREEN, "Chest" = MATRIX_RED_GREEN, "Left Leg" = MATRIX_RED, "Right Leg" = MATRIX_RED, "Left Arm" = MATRIX_RED, "Right Arm" = MATRIX_RED) /datum/sprite_accessory/mam_body_markings/cow name = "Bovine" icon_state = "bovine" - covered_limbs = list(num2text(HEAD) = MATRIX_ALL, num2text(CHEST) = MATRIX_RED_GREEN, num2text(LEG_LEFT) = MATRIX_ALL, num2text(LEG_RIGHT) = MATRIX_ALL, num2text(ARM_LEFT) = MATRIX_RED_GREEN, num2text(ARM_RIGHT) = MATRIX_RED_GREEN) + covered_limbs = list("Head" = MATRIX_ALL, "Chest" = MATRIX_RED_GREEN, "Left Leg" = MATRIX_ALL, "Right Leg" = MATRIX_ALL, "Left Arm" = MATRIX_RED_GREEN, "Right Arm" = MATRIX_RED_GREEN) /datum/sprite_accessory/mam_body_markings/corgi name = "Corgi" icon_state = "corgi" - covered_limbs = list(num2text(HEAD) = MATRIX_RED_GREEN, num2text(CHEST) = MATRIX_RED_GREEN, num2text(LEG_LEFT) = MATRIX_RED_GREEN, num2text(LEG_RIGHT) = MATRIX_RED_GREEN, num2text(ARM_LEFT) = MATRIX_RED_GREEN, num2text(ARM_RIGHT) = MATRIX_RED_GREEN) + covered_limbs = list("Head" = MATRIX_RED_GREEN, "Chest" = MATRIX_RED_GREEN, "Left Leg" = MATRIX_RED_GREEN, "Right Leg" = MATRIX_RED_GREEN, "Left Arm" = MATRIX_RED_GREEN, "Right Arm" = MATRIX_RED_GREEN) /datum/sprite_accessory/mam_body_markings/corvid name = "Corvid" icon_state = "corvid" - covered_limbs = list(num2text(HEAD) = MATRIX_RED_GREEN, num2text(CHEST) = MATRIX_RED_GREEN, num2text(LEG_LEFT) = MATRIX_ALL, num2text(LEG_RIGHT) = MATRIX_ALL, num2text(ARM_LEFT) = MATRIX_RED, num2text(ARM_RIGHT) = MATRIX_RED) + covered_limbs = list("Head" = MATRIX_RED_GREEN, "Chest" = MATRIX_RED_GREEN, "Left Leg" = MATRIX_ALL, "Right Leg" = MATRIX_ALL, "Left Arm" = MATRIX_RED, "Right Arm" = MATRIX_RED) /datum/sprite_accessory/mam_body_markings/dalmation name = "Dalmation" icon_state = "dalmation" - covered_limbs = list(num2text(HEAD) = MATRIX_RED_GREEN, num2text(CHEST) = MATRIX_RED_GREEN, num2text(LEG_LEFT) = MATRIX_RED_GREEN, num2text(LEG_RIGHT) = MATRIX_RED_GREEN, num2text(ARM_LEFT) = MATRIX_RED_GREEN, num2text(ARM_RIGHT) = MATRIX_RED_GREEN) + covered_limbs = list("Head" = MATRIX_RED_GREEN, "Chest" = MATRIX_RED_GREEN, "Left Leg" = MATRIX_RED_GREEN, "Right Leg" = MATRIX_RED_GREEN, "Left Arm" = MATRIX_RED_GREEN, "Right Arm" = MATRIX_RED_GREEN) /datum/sprite_accessory/mam_body_markings/deer name = "Deer" icon_state = "deer" - covered_limbs = list(num2text(HEAD) = MATRIX_RED_GREEN, num2text(CHEST) = MATRIX_RED_GREEN, num2text(LEG_LEFT) = MATRIX_GREEN_BLUE, num2text(LEG_RIGHT) = MATRIX_GREEN_BLUE, num2text(ARM_LEFT) = MATRIX_GREEN, num2text(ARM_RIGHT) = MATRIX_GREEN) + covered_limbs = list("Head" = MATRIX_RED_GREEN, "Chest" = MATRIX_RED_GREEN, "Left Leg" = MATRIX_GREEN_BLUE, "Right Leg" = MATRIX_GREEN_BLUE, "Left Arm" = MATRIX_GREEN, "Right Arm" = MATRIX_GREEN) /datum/sprite_accessory/mam_body_markings/dog name = "Dog" icon_state = "dog" - covered_limbs = list(num2text(HEAD) = MATRIX_RED_BLUE, num2text(CHEST) = MATRIX_ALL, num2text(LEG_LEFT) = MATRIX_GREEN_BLUE, num2text(LEG_RIGHT) = MATRIX_GREEN_BLUE, num2text(ARM_LEFT) = MATRIX_ALL, num2text(ARM_RIGHT) = MATRIX_ALL) + covered_limbs = list("Head" = MATRIX_RED_BLUE, "Chest" = MATRIX_ALL, "Left Leg" = MATRIX_GREEN_BLUE, "Right Leg" = MATRIX_GREEN_BLUE, "Left Arm" = MATRIX_ALL, "Right Arm" = MATRIX_ALL) /datum/sprite_accessory/mam_body_markings/eevee name = "Eevee" icon_state = "eevee" - covered_limbs = list(num2text(HEAD) = MATRIX_RED_GREEN, num2text(CHEST) = MATRIX_GREEN) + covered_limbs = list("Head" = MATRIX_RED_GREEN, "Chest" = MATRIX_GREEN) /datum/sprite_accessory/mam_body_markings/fennec name = "Fennec" icon_state = "Fennec" - covered_limbs = list(num2text(HEAD) = MATRIX_RED_GREEN, num2text(CHEST) = MATRIX_RED_GREEN, num2text(LEG_LEFT) = MATRIX_RED_GREEN, num2text(LEG_RIGHT) = MATRIX_RED_GREEN, num2text(ARM_LEFT) = MATRIX_RED_GREEN, num2text(ARM_RIGHT) = MATRIX_RED_GREEN) + covered_limbs = list("Head" = MATRIX_RED_GREEN, "Chest" = MATRIX_RED_GREEN, "Left Leg" = MATRIX_RED_GREEN, "Right Leg" = MATRIX_RED_GREEN, "Left Arm" = MATRIX_RED_GREEN, "Right Arm" = MATRIX_RED_GREEN) /datum/sprite_accessory/mam_body_markings/fox name = "Fox" icon_state = "fox" - covered_limbs = list(num2text(HEAD) = MATRIX_RED_GREEN, num2text(CHEST) = MATRIX_RED_GREEN, num2text(LEG_LEFT) = MATRIX_RED_GREEN, num2text(LEG_RIGHT) = MATRIX_RED_GREEN, num2text(ARM_LEFT) = MATRIX_RED_BLUE, num2text(ARM_RIGHT) = MATRIX_RED_BLUE) + covered_limbs = list("Head" = MATRIX_RED_GREEN, "Chest" = MATRIX_RED_GREEN, "Left Leg" = MATRIX_RED_GREEN, "Right Leg" = MATRIX_RED_GREEN, "Left Arm" = MATRIX_RED_BLUE, "Right Arm" = MATRIX_RED_BLUE) /datum/sprite_accessory/mam_body_markings/frog name = "Frog" icon_state = "frog" icon = 'modular_citadel/icons/mob/markings_notmammals.dmi' - covered_limbs = list(num2text(HEAD) = MATRIX_RED_GREEN, num2text(CHEST) = MATRIX_GREEN, num2text(LEG_LEFT) = MATRIX_GREEN, num2text(LEG_RIGHT) = MATRIX_GREEN, num2text(ARM_LEFT) = MATRIX_GREEN, num2text(ARM_RIGHT) = MATRIX_GREEN) + covered_limbs = list("Head" = MATRIX_RED_GREEN, "Chest" = MATRIX_GREEN, "Left Leg" = MATRIX_GREEN, "Right Leg" = MATRIX_GREEN, "Left Arm" = MATRIX_GREEN, "Right Arm" = MATRIX_GREEN) /datum/sprite_accessory/mam_body_markings/goat name = "Goat" icon_state = "goat" - covered_limbs = list(num2text(HEAD) = MATRIX_RED, num2text(CHEST) = MATRIX_RED, num2text(LEG_LEFT) = MATRIX_RED_BLUE, num2text(LEG_RIGHT) = MATRIX_RED_BLUE, num2text(ARM_LEFT) = MATRIX_RED_BLUE, num2text(ARM_RIGHT) = MATRIX_RED_BLUE) + covered_limbs = list("Head" = MATRIX_RED, "Chest" = MATRIX_RED, "Left Leg" = MATRIX_RED_BLUE, "Right Leg" = MATRIX_RED_BLUE, "Left Arm" = MATRIX_RED_BLUE, "Right Arm" = MATRIX_RED_BLUE) /datum/sprite_accessory/mam_body_markings/handsfeet name = "Handsfeet" icon_state = "handsfeet" icon = 'modular_citadel/icons/mob/markings_notmammals.dmi' - covered_limbs = list(num2text(HEAD) = MATRIX_RED, num2text(CHEST) = MATRIX_RED, num2text(LEG_LEFT) = MATRIX_RED_GREEN, num2text(LEG_RIGHT) = MATRIX_RED_GREEN, num2text(ARM_LEFT) = MATRIX_RED_GREEN, num2text(ARM_RIGHT) = MATRIX_RED_GREEN) + covered_limbs = list("Head" = MATRIX_RED, "Chest" = MATRIX_RED, "Left Leg" = MATRIX_RED_GREEN, "Right Leg" = MATRIX_RED_GREEN, "Left Arm" = MATRIX_RED_GREEN, "Right Arm" = MATRIX_RED_GREEN) /datum/sprite_accessory/mam_body_markings/hawk name = "Hawk" icon_state = "hawk" - covered_limbs = list(num2text(HEAD) = MATRIX_RED_GREEN, num2text(CHEST) = MATRIX_RED_GREEN, num2text(LEG_LEFT) = MATRIX_ALL, num2text(LEG_RIGHT) = MATRIX_ALL, num2text(ARM_LEFT) = MATRIX_RED, num2text(ARM_RIGHT) = MATRIX_RED) + covered_limbs = list("Head" = MATRIX_RED_GREEN, "Chest" = MATRIX_RED_GREEN, "Left Leg" = MATRIX_ALL, "Right Leg" = MATRIX_ALL, "Left Arm" = MATRIX_RED, "Right Arm" = MATRIX_RED) /datum/sprite_accessory/mam_body_markings/husky name = "Husky" icon_state = "husky" - covered_limbs = list(num2text(HEAD) = MATRIX_RED_GREEN, num2text(CHEST) = MATRIX_RED_GREEN, num2text(LEG_LEFT) = MATRIX_ALL, num2text(LEG_RIGHT) = MATRIX_ALL, num2text(ARM_LEFT) = MATRIX_RED_GREEN, num2text(ARM_RIGHT) = MATRIX_RED_GREEN) + covered_limbs = list("Head" = MATRIX_RED_GREEN, "Chest" = MATRIX_RED_GREEN, "Left Leg" = MATRIX_ALL, "Right Leg" = MATRIX_ALL, "Left Arm" = MATRIX_RED_GREEN, "Right Arm" = MATRIX_RED_GREEN) /datum/sprite_accessory/mam_body_markings/hyena name = "Hyena" icon_state = "hyena" - covered_limbs = list(num2text(HEAD) = MATRIX_ALL, num2text(CHEST) = MATRIX_ALL, num2text(LEG_LEFT) = MATRIX_RED_GREEN, num2text(LEG_RIGHT) = MATRIX_RED_GREEN, num2text(ARM_LEFT) = MATRIX_RED_GREEN, num2text(ARM_RIGHT) = MATRIX_RED_GREEN) + covered_limbs = list("Head" = MATRIX_ALL, "Chest" = MATRIX_ALL, "Left Leg" = MATRIX_RED_GREEN, "Right Leg" = MATRIX_RED_GREEN, "Left Arm" = MATRIX_RED_GREEN, "Right Arm" = MATRIX_RED_GREEN) /datum/sprite_accessory/mam_body_markings/insect name = "Insect" @@ -137,118 +137,118 @@ /datum/sprite_accessory/mam_body_markings/lab name = "Lab" icon_state = "lab" - covered_limbs = list(num2text(HEAD) = MATRIX_RED, num2text(CHEST) = MATRIX_RED, num2text(LEG_LEFT) = MATRIX_RED, num2text(LEG_RIGHT) = MATRIX_RED, num2text(ARM_LEFT) = MATRIX_RED, num2text(ARM_RIGHT) = MATRIX_RED) + covered_limbs = list("Head" = MATRIX_RED, "Chest" = MATRIX_RED, "Left Leg" = MATRIX_RED, "Right Leg" = MATRIX_RED, "Left Arm" = MATRIX_RED, "Right Arm" = MATRIX_RED) /datum/sprite_accessory/mam_body_markings/orca name = "Orca" icon_state = "orca" - covered_limbs = list(num2text(HEAD) = MATRIX_RED_GREEN, num2text(CHEST) = MATRIX_RED_GREEN, num2text(LEG_LEFT) = MATRIX_RED_GREEN, num2text(LEG_RIGHT) = MATRIX_RED_GREEN, num2text(ARM_LEFT) = MATRIX_RED_GREEN, num2text(ARM_RIGHT) = MATRIX_RED_GREEN) + covered_limbs = list("Head" = MATRIX_RED_GREEN, "Chest" = MATRIX_RED_GREEN, "Left Leg" = MATRIX_RED_GREEN, "Right Leg" = MATRIX_RED_GREEN, "Left Arm" = MATRIX_RED_GREEN, "Right Arm" = MATRIX_RED_GREEN) /datum/sprite_accessory/mam_body_markings/otie name = "Otie" icon_state = "otie" - covered_limbs = list(num2text(HEAD) = MATRIX_ALL, num2text(CHEST) = MATRIX_ALL, num2text(LEG_LEFT) = MATRIX_ALL, num2text(LEG_RIGHT) = MATRIX_ALL, num2text(ARM_LEFT) = MATRIX_ALL, num2text(ARM_RIGHT) = MATRIX_ALL) + covered_limbs = list("Head" = MATRIX_ALL, "Chest" = MATRIX_ALL, "Left Leg" = MATRIX_ALL, "Right Leg" = MATRIX_ALL, "Left Arm" = MATRIX_ALL, "Right Arm" = MATRIX_ALL) /datum/sprite_accessory/mam_body_markings/otter name = "Otter" icon_state = "otter" - covered_limbs = list(num2text(HEAD) = MATRIX_ALL, num2text(CHEST) = MATRIX_GREEN) + covered_limbs = list("Head" = MATRIX_ALL, "Chest" = MATRIX_GREEN) /datum/sprite_accessory/mam_body_markings/panther name = "Panther" icon_state = "panther" - covered_limbs = list(num2text(HEAD) = MATRIX_RED_GREEN, num2text(CHEST) = MATRIX_RED_GREEN, num2text(LEG_LEFT) = MATRIX_RED_GREEN, num2text(LEG_RIGHT) = MATRIX_RED_GREEN, num2text(ARM_LEFT) = MATRIX_RED_GREEN, num2text(ARM_RIGHT) = MATRIX_RED_GREEN) + covered_limbs = list("Head" = MATRIX_RED_GREEN, "Chest" = MATRIX_RED_GREEN, "Left Leg" = MATRIX_RED_GREEN, "Right Leg" = MATRIX_RED_GREEN, "Left Arm" = MATRIX_RED_GREEN, "Right Arm" = MATRIX_RED_GREEN) /datum/sprite_accessory/mam_body_markings/plain name = "Plain" icon_state = "plain" icon = 'modular_citadel/icons/mob/markings_notmammals.dmi' - covered_limbs = list(num2text(HEAD) = MATRIX_RED, num2text(CHEST) = MATRIX_RED, num2text(LEG_LEFT) = MATRIX_RED, num2text(LEG_RIGHT) = MATRIX_RED, num2text(ARM_LEFT) = MATRIX_RED, num2text(ARM_RIGHT) = MATRIX_RED) + covered_limbs = list("Head" = MATRIX_RED, "Chest" = MATRIX_RED, "Left Leg" = MATRIX_RED, "Right Leg" = MATRIX_RED, "Left Arm" = MATRIX_RED, "Right Arm" = MATRIX_RED) /datum/sprite_accessory/mam_body_markings/possum name = "Possum" icon_state = "possum" - covered_limbs = list(num2text(HEAD) = MATRIX_RED_GREEN, num2text(CHEST) = MATRIX_RED_GREEN, num2text(LEG_LEFT) = MATRIX_RED_BLUE, num2text(LEG_RIGHT) = MATRIX_RED_BLUE, num2text(ARM_LEFT) = MATRIX_RED_BLUE, num2text(ARM_RIGHT) = MATRIX_RED_BLUE) + covered_limbs = list("Head" = MATRIX_RED_GREEN, "Chest" = MATRIX_RED_GREEN, "Left Leg" = MATRIX_RED_BLUE, "Right Leg" = MATRIX_RED_BLUE, "Left Arm" = MATRIX_RED_BLUE, "Right Arm" = MATRIX_RED_BLUE) /datum/sprite_accessory/mam_body_markings/raccoon name = "Raccoon" icon_state = "raccoon" - covered_limbs = list(num2text(HEAD) = MATRIX_ALL, num2text(CHEST) = MATRIX_RED_GREEN, num2text(LEG_LEFT) = MATRIX_ALL, num2text(LEG_RIGHT) = MATRIX_ALL, num2text(ARM_LEFT) = MATRIX_RED_GREEN, num2text(ARM_RIGHT) = MATRIX_RED_GREEN) + covered_limbs = list("Head" = MATRIX_ALL, "Chest" = MATRIX_RED_GREEN, "Left Leg" = MATRIX_ALL, "Right Leg" = MATRIX_ALL, "Left Arm" = MATRIX_RED_GREEN, "Right Arm" = MATRIX_RED_GREEN) /datum/sprite_accessory/mam_body_markings/sergal name = "Sergal" icon_state = "sergal" - covered_limbs = list(num2text(HEAD) = MATRIX_RED_GREEN, num2text(CHEST) = MATRIX_RED_GREEN) + covered_limbs = list("Head" = MATRIX_RED_GREEN, "Chest" = MATRIX_RED_GREEN) /datum/sprite_accessory/mam_body_markings/pede name = "Scolipede" icon_state = "scolipede" icon = 'modular_citadel/icons/mob/markings_notmammals.dmi' - covered_limbs = list(num2text(HEAD) = MATRIX_GREEN, num2text(CHEST) = MATRIX_GREEN_BLUE, num2text(LEG_LEFT) = MATRIX_GREEN, num2text(LEG_RIGHT) = MATRIX_GREEN, num2text(ARM_LEFT) = MATRIX_GREEN, num2text(ARM_RIGHT) = MATRIX_GREEN) + covered_limbs = list("Head" = MATRIX_GREEN, "Chest" = MATRIX_GREEN_BLUE, "Left Leg" = MATRIX_GREEN, "Right Leg" = MATRIX_GREEN, "Left Arm" = MATRIX_GREEN, "Right Arm" = MATRIX_GREEN) /datum/sprite_accessory/mam_body_markings/shark name = "Shark" icon_state = "shark" - covered_limbs = list(num2text(HEAD) = MATRIX_RED_GREEN, num2text(CHEST) = MATRIX_RED, num2text(LEG_LEFT) = MATRIX_RED, num2text(LEG_RIGHT) = MATRIX_RED_GREEN, num2text(ARM_LEFT) = MATRIX_RED_GREEN, num2text(ARM_RIGHT) = MATRIX_RED_GREEN) + covered_limbs = list("Head" = MATRIX_RED_GREEN, "Chest" = MATRIX_RED, "Left Leg" = MATRIX_RED, "Right Leg" = MATRIX_RED_GREEN, "Left Arm" = MATRIX_RED_GREEN, "Right Arm" = MATRIX_RED_GREEN) /datum/sprite_accessory/mam_body_markings/shepherd name = "Shepherd" icon_state = "shepherd" - covered_limbs = list(num2text(HEAD) = MATRIX_ALL, num2text(CHEST) = MATRIX_ALL, num2text(LEG_LEFT) = MATRIX_RED_GREEN, num2text(LEG_RIGHT) = MATRIX_RED_GREEN, num2text(ARM_LEFT) = MATRIX_RED, num2text(ARM_RIGHT) = MATRIX_RED) + covered_limbs = list("Head" = MATRIX_ALL, "Chest" = MATRIX_ALL, "Left Leg" = MATRIX_RED_GREEN, "Right Leg" = MATRIX_RED_GREEN, "Left Arm" = MATRIX_RED, "Right Arm" = MATRIX_RED) /datum/sprite_accessory/mam_body_markings/skunk name = "Skunk" icon_state = "skunk" - covered_limbs = list(num2text(HEAD) = MATRIX_RED_GREEN, num2text(CHEST) = MATRIX_RED_GREEN, num2text(LEG_LEFT) = MATRIX_RED_GREEN, num2text(LEG_RIGHT) = MATRIX_RED_GREEN, num2text(ARM_LEFT) = MATRIX_RED, num2text(ARM_RIGHT) = MATRIX_RED) + covered_limbs = list("Head" = MATRIX_RED_GREEN, "Chest" = MATRIX_RED_GREEN, "Left Leg" = MATRIX_RED_GREEN, "Right Leg" = MATRIX_RED_GREEN, "Left Arm" = MATRIX_RED, "Right Arm" = MATRIX_RED) /datum/sprite_accessory/mam_body_markings/tajaran name = "Tajaran" icon_state = "tajaran" - covered_limbs = list(num2text(HEAD) = MATRIX_RED_GREEN, num2text(CHEST) = MATRIX_RED_GREEN, num2text(LEG_LEFT) = MATRIX_RED, num2text(LEG_RIGHT) = MATRIX_RED, num2text(ARM_LEFT) = MATRIX_RED, num2text(ARM_RIGHT) = MATRIX_RED) + covered_limbs = list("Head" = MATRIX_RED_GREEN, "Chest" = MATRIX_RED_GREEN, "Left Leg" = MATRIX_RED, "Right Leg" = MATRIX_RED, "Left Arm" = MATRIX_RED, "Right Arm" = MATRIX_RED) /datum/sprite_accessory/mam_body_markings/tiger name = "Tiger" icon_state = "tiger" - covered_limbs = list(num2text(HEAD) = MATRIX_ALL, num2text(CHEST) = MATRIX_ALL, num2text(LEG_LEFT) = MATRIX_ALL, num2text(LEG_RIGHT) = MATRIX_ALL, num2text(ARM_LEFT) = MATRIX_RED_BLUE, num2text(ARM_RIGHT) = MATRIX_RED_BLUE) + covered_limbs = list("Head" = MATRIX_ALL, "Chest" = MATRIX_ALL, "Left Leg" = MATRIX_ALL, "Right Leg" = MATRIX_ALL, "Left Arm" = MATRIX_RED_BLUE, "Right Arm" = MATRIX_RED_BLUE) /datum/sprite_accessory/mam_body_markings/turian name = "Turian" icon_state = "turian" icon = 'modular_citadel/icons/mob/markings_notmammals.dmi' - covered_limbs = list(num2text(HEAD) = MATRIX_RED_GREEN, num2text(CHEST) = MATRIX_RED, num2text(LEG_LEFT) = MATRIX_RED, num2text(LEG_RIGHT) = MATRIX_RED, num2text(ARM_LEFT) = MATRIX_RED, num2text(ARM_RIGHT) = MATRIX_RED) + covered_limbs = list("Head" = MATRIX_RED_GREEN, "Chest" = MATRIX_RED, "Left Leg" = MATRIX_RED, "Right Leg" = MATRIX_RED, "Left Arm" = MATRIX_RED, "Right Arm" = MATRIX_RED) /datum/sprite_accessory/mam_body_markings/wolf name = "Wolf" icon_state = "wolf" - covered_limbs = list(num2text(HEAD) = MATRIX_ALL, num2text(CHEST) = MATRIX_ALL, num2text(LEG_LEFT) = MATRIX_RED_BLUE, num2text(LEG_RIGHT) = MATRIX_RED_BLUE, num2text(ARM_LEFT) = MATRIX_RED_BLUE, num2text(ARM_RIGHT) = MATRIX_RED_BLUE) + covered_limbs = list("Head" = MATRIX_ALL, "Chest" = MATRIX_ALL, "Left Leg" = MATRIX_RED_BLUE, "Right Leg" = MATRIX_RED_BLUE, "Left Arm" = MATRIX_RED_BLUE, "Right Arm" = MATRIX_RED_BLUE) /datum/sprite_accessory/mam_body_markings/xeno name = "Xeno" icon_state = "xeno" icon = 'modular_citadel/icons/mob/markings_notmammals.dmi' - covered_limbs = list(num2text(HEAD) = MATRIX_BLUE, num2text(CHEST) = MATRIX_GREEN, num2text(LEG_LEFT) = MATRIX_GREEN, num2text(LEG_RIGHT) = MATRIX_GREEN, num2text(ARM_LEFT) = MATRIX_GREEN, num2text(ARM_RIGHT) = MATRIX_GREEN) + covered_limbs = list("Head" = MATRIX_BLUE, "Chest" = MATRIX_GREEN, "Left Leg" = MATRIX_GREEN, "Right Leg" = MATRIX_GREEN, "Left Arm" = MATRIX_GREEN, "Right Arm" = MATRIX_GREEN) // sticking old lizard markings here for now /datum/sprite_accessory/mam_body_markings/dtiger name = "Dark Tiger Body" icon_state = "dtiger" - covered_limbs = list(num2text(HEAD) = MATRIX_RED, num2text(CHEST) = MATRIX_RED, num2text(LEG_LEFT) = MATRIX_RED, num2text(LEG_RIGHT) = MATRIX_RED, num2text(ARM_LEFT) = MATRIX_RED, num2text(ARM_RIGHT) = MATRIX_RED) + covered_limbs = list("Head" = MATRIX_RED, "Chest" = MATRIX_RED, "Left Leg" = MATRIX_RED, "Right Leg" = MATRIX_RED, "Left Arm" = MATRIX_RED, "Right Arm" = MATRIX_RED) /datum/sprite_accessory/mam_body_markings/guilmon name = "Guilmon" icon_state = "guilmon" icon = 'modular_citadel/icons/mob/markings_notmammals.dmi' - covered_limbs = list(num2text(HEAD) = MATRIX_RED_BLUE, num2text(CHEST) = MATRIX_GREEN_BLUE, num2text(LEG_LEFT) = MATRIX_BLUE, num2text(LEG_RIGHT) = MATRIX_BLUE, num2text(ARM_LEFT) = MATRIX_GREEN_BLUE, num2text(ARM_RIGHT) = MATRIX_GREEN_BLUE) + covered_limbs = list("Head" = MATRIX_RED_BLUE, "Chest" = MATRIX_GREEN_BLUE, "Left Leg" = MATRIX_BLUE, "Right Leg" = MATRIX_BLUE, "Left Arm" = MATRIX_GREEN_BLUE, "Right Arm" = MATRIX_GREEN_BLUE) /datum/sprite_accessory/mam_body_markings/ltiger name = "Light Tiger Body" icon_state = "ltiger" - covered_limbs = list(num2text(HEAD) = MATRIX_RED, num2text(CHEST) = MATRIX_RED, num2text(LEG_LEFT) = MATRIX_RED, num2text(LEG_RIGHT) = MATRIX_RED, num2text(ARM_LEFT) = MATRIX_RED, num2text(ARM_RIGHT) = MATRIX_RED) + covered_limbs = list("Head" = MATRIX_RED, "Chest" = MATRIX_RED, "Left Leg" = MATRIX_RED, "Right Leg" = MATRIX_RED, "Left Arm" = MATRIX_RED, "Right Arm" = MATRIX_RED) /datum/sprite_accessory/mam_body_markings/lbelly name = "Light Belly" icon_state = "lbelly" - covered_limbs = list(num2text(HEAD) = MATRIX_RED, num2text(CHEST) = MATRIX_RED, num2text(LEG_LEFT) = MATRIX_RED, num2text(LEG_RIGHT) = MATRIX_RED, num2text(ARM_LEFT) = MATRIX_RED, num2text(ARM_RIGHT) = MATRIX_RED) + covered_limbs = list("Head" = MATRIX_RED, "Chest" = MATRIX_RED, "Left Leg" = MATRIX_RED, "Right Leg" = MATRIX_RED, "Left Arm" = MATRIX_RED, "Right Arm" = MATRIX_RED) /****************************************** ************* Insect Markings ************* @@ -296,9 +296,9 @@ icon_state = "snow" color_src = HAIR -/datum/sprite_accessory/insect_fluff/deathhead - name = "Deathshead" - icon_state = "deathhead" +/datum/sprite_accessory/insect_fluff/death"Head" + name = "Deaths"Head"" + icon_state = "death"Head"" /datum/sprite_accessory/insect_fluff/featherymoth name = "Feathery Moth"