From eefabc90494a26f82f8ea61edd09f28ee16f883a Mon Sep 17 00:00:00 2001 From: timothyteakettle <59849408+timothyteakettle@users.noreply.github.com> Date: Thu, 6 May 2021 22:08:51 +0100 Subject: [PATCH 01/12] Update preferences.dm --- code/modules/client/preferences.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index f6660fa54d..5c25e13e84 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -554,7 +554,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) dat += "" for(var/mutant_part in GLOB.all_mutant_parts) - if(istype(accessory, /datum/sprite_accessory/mam_body_markings) || istype(accessory, /datum/sprite_accessory/body_markings)) + if(mutant_part == "body_markings" || mutant_part == "mam_body_markings") continue if(parent.can_have_part(mutant_part)) if(!mutant_category) From cb12843a34843542d161e3dcda1dfbcfa6bc650d Mon Sep 17 00:00:00 2001 From: timothyteakettle <59849408+timothyteakettle@users.noreply.github.com> Date: Thu, 6 May 2021 22:35:15 +0100 Subject: [PATCH 02/12] bugfix --- .../sprite_accessories/body_markings.dm | 84 +++++++++---------- 1 file changed, 42 insertions(+), 42 deletions(-) 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 d6da8be86e..0d9e845d74 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 @@ -27,107 +27,107 @@ /datum/sprite_accessory/mam_body_markings/redpanda name = "Redpanda" icon_state = "redpanda" - covered_limbs = list(HEAD = MATRIX_RED_BLUE, CHEST = MATRIX_RED_GREEN, LEG_LEFT = MATRIX_RED_GREEN, LEG_RIGHT = MATRIX_RED_GREEN, ARM_LEFT = MATRIX_RED_GREEN, ARM_RIGHT = MATRIX_RED_GREEN) + 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) /datum/sprite_accessory/mam_body_markings/bat name = "Bat" icon_state = "bat" - covered_limbs = list(HEAD = MATRIX_RED_GREEN, CHEST = MATRIX_ALL, LEG_LEFT = MATRIX_RED_BLUE, LEG_RIGHT = MATRIX_RED_BLUE, ARM_LEFT = MATRIX_RED, ARM_RIGHT = MATRIX_RED) + 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) /datum/sprite_accessory/mam_body_markings/bee name = "Bee" icon_state = "bee" icon = 'modular_citadel/icons/mob/markings_notmammals.dmi' - covered_limbs = list(HEAD = MATRIX_RED_GREEN, CHEST = MATRIX_GREEN, LEG_LEFT = MATRIX_GREEN, LEG_RIGHT = MATRIX_GREEN, ARM_LEFT = MATRIX_GREEN, ARM_RIGHT = MATRIX_GREEN) + 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) /datum/sprite_accessory/mam_body_markings/belly name = "Belly" icon_state = "belly" icon = 'modular_citadel/icons/mob/markings_notmammals.dmi' - covered_limbs = list(HEAD = MATRIX_RED_GREEN, CHEST = MATRIX_GREEN, LEG_LEFT = MATRIX_RED, LEG_RIGHT = MATRIX_RED) + covered_limbs = list(num2text(HEAD) = MATRIX_RED_GREEN, num2text(CHEST) = MATRIX_GREEN, num2text(LEG_LEFT) = MATRIX_RED, num2text(LEG_RIGHT) = 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(HEAD = MATRIX_RED_GREEN, CHEST = MATRIX_RED_GREEN, LEG_LEFT = MATRIX_RED, LEG_RIGHT = MATRIX_RED, ARM_LEFT = MATRIX_RED, ARM_RIGHT = MATRIX_RED) + 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) /datum/sprite_accessory/mam_body_markings/cow name = "Bovine" icon_state = "bovine" - covered_limbs = list(HEAD = MATRIX_ALL, CHEST = MATRIX_RED_GREEN, LEG_LEFT = MATRIX_ALL, LEG_RIGHT = MATRIX_ALL, ARM_LEFT = MATRIX_RED_GREEN, ARM_RIGHT = MATRIX_RED_GREEN) + 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) /datum/sprite_accessory/mam_body_markings/corgi name = "Corgi" icon_state = "corgi" - covered_limbs = list(HEAD = MATRIX_RED_GREEN, CHEST = MATRIX_RED_GREEN, LEG_LEFT = MATRIX_RED_GREEN, LEG_RIGHT = MATRIX_RED_GREEN, ARM_LEFT = MATRIX_RED_GREEN, ARM_RIGHT = MATRIX_RED_GREEN) + 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) /datum/sprite_accessory/mam_body_markings/corvid name = "Corvid" icon_state = "corvid" - covered_limbs = list(HEAD = MATRIX_RED_GREEN, CHEST = MATRIX_RED_GREEN, LEG_LEFT = MATRIX_ALL, LEG_RIGHT = MATRIX_ALL, ARM_LEFT = MATRIX_RED, ARM_RIGHT = MATRIX_RED) + 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) /datum/sprite_accessory/mam_body_markings/dalmation name = "Dalmation" icon_state = "dalmation" - covered_limbs = list(HEAD = MATRIX_RED_GREEN, CHEST = MATRIX_RED_GREEN, LEG_LEFT = MATRIX_RED_GREEN, LEG_RIGHT = MATRIX_RED_GREEN, ARM_LEFT = MATRIX_RED_GREEN, ARM_RIGHT = MATRIX_RED_GREEN) + 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) /datum/sprite_accessory/mam_body_markings/deer name = "Deer" icon_state = "deer" - covered_limbs = list(HEAD = MATRIX_RED_GREEN, CHEST = MATRIX_RED_GREEN, LEG_LEFT = MATRIX_GREEN_BLUE, LEG_RIGHT = MATRIX_GREEN_BLUE, ARM_LEFT = MATRIX_GREEN, ARM_RIGHT = MATRIX_GREEN) + 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) /datum/sprite_accessory/mam_body_markings/dog name = "Dog" icon_state = "dog" - covered_limbs = list(HEAD = MATRIX_RED_BLUE, CHEST = MATRIX_ALL, LEG_LEFT = MATRIX_GREEN_BLUE, LEG_RIGHT = MATRIX_GREEN_BLUE, ARM_LEFT = MATRIX_ALL, ARM_RIGHT = MATRIX_ALL) + 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) /datum/sprite_accessory/mam_body_markings/eevee name = "Eevee" icon_state = "eevee" - covered_limbs = list(HEAD = MATRIX_RED_GREEN, CHEST = MATRIX_GREEN) + covered_limbs = list(num2text(HEAD) = MATRIX_RED_GREEN, num2text(CHEST) = MATRIX_GREEN) /datum/sprite_accessory/mam_body_markings/fennec name = "Fennec" icon_state = "Fennec" - covered_limbs = list(HEAD = MATRIX_RED_GREEN, CHEST = MATRIX_RED_GREEN, LEG_LEFT = MATRIX_RED_GREEN, LEG_RIGHT = MATRIX_RED_GREEN, ARM_LEFT = MATRIX_RED_GREEN, ARM_RIGHT = MATRIX_RED_GREEN) + 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) /datum/sprite_accessory/mam_body_markings/fox name = "Fox" icon_state = "fox" - covered_limbs = list(HEAD = MATRIX_RED_GREEN, CHEST = MATRIX_RED_GREEN, LEG_LEFT = MATRIX_RED_GREEN, LEG_RIGHT = MATRIX_RED_GREEN, ARM_LEFT = MATRIX_RED_BLUE, ARM_RIGHT = MATRIX_RED_BLUE) + 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) /datum/sprite_accessory/mam_body_markings/frog name = "Frog" icon_state = "frog" icon = 'modular_citadel/icons/mob/markings_notmammals.dmi' - covered_limbs = list(HEAD = MATRIX_RED_GREEN, CHEST = MATRIX_GREEN, LEG_LEFT = MATRIX_GREEN, LEG_RIGHT = MATRIX_GREEN, ARM_LEFT = MATRIX_GREEN, ARM_RIGHT = MATRIX_GREEN) + 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) /datum/sprite_accessory/mam_body_markings/goat name = "Goat" icon_state = "goat" - covered_limbs = list(HEAD = MATRIX_RED, CHEST = MATRIX_RED, LEG_LEFT = MATRIX_RED_BLUE, LEG_RIGHT = MATRIX_RED_BLUE, ARM_LEFT = MATRIX_RED_BLUE, ARM_RIGHT = MATRIX_RED_BLUE) + 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) /datum/sprite_accessory/mam_body_markings/handsfeet name = "Handsfeet" icon_state = "handsfeet" icon = 'modular_citadel/icons/mob/markings_notmammals.dmi' - covered_limbs = list(HEAD = MATRIX_RED, CHEST = MATRIX_RED, LEG_LEFT = MATRIX_RED_GREEN, LEG_RIGHT = MATRIX_RED_GREEN, ARM_LEFT = MATRIX_RED_GREEN, ARM_RIGHT = MATRIX_RED_GREEN) + 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) /datum/sprite_accessory/mam_body_markings/hawk name = "Hawk" icon_state = "hawk" - covered_limbs = list(HEAD = MATRIX_RED_GREEN, CHEST = MATRIX_RED_GREEN, LEG_LEFT = MATRIX_ALL, LEG_RIGHT = MATRIX_ALL, ARM_LEFT = MATRIX_RED, ARM_RIGHT = MATRIX_RED) + 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) /datum/sprite_accessory/mam_body_markings/husky name = "Husky" icon_state = "husky" - covered_limbs = list(HEAD = MATRIX_RED_GREEN, CHEST = MATRIX_RED_GREEN, LEG_LEFT = MATRIX_ALL, LEG_RIGHT = MATRIX_ALL, ARM_LEFT = MATRIX_RED_GREEN, ARM_RIGHT = MATRIX_RED_GREEN) + 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) /datum/sprite_accessory/mam_body_markings/hyena name = "Hyena" icon_state = "hyena" - covered_limbs = list(HEAD = MATRIX_ALL, CHEST = MATRIX_ALL, LEG_LEFT = MATRIX_RED_GREEN, LEG_RIGHT = MATRIX_RED_GREEN, ARM_LEFT = MATRIX_RED_GREEN, ARM_RIGHT = MATRIX_RED_GREEN) + 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) /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(HEAD = MATRIX_RED, CHEST = MATRIX_RED, LEG_LEFT = MATRIX_RED, LEG_RIGHT = MATRIX_RED, ARM_LEFT = MATRIX_RED, ARM_RIGHT = MATRIX_RED) + 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) /datum/sprite_accessory/mam_body_markings/orca name = "Orca" icon_state = "orca" - covered_limbs = list(HEAD = MATRIX_RED_GREEN, CHEST = MATRIX_RED_GREEN, LEG_LEFT = MATRIX_RED_GREEN, LEG_RIGHT = MATRIX_RED_GREEN, ARM_LEFT = MATRIX_RED_GREEN, ARM_RIGHT = MATRIX_RED_GREEN) + 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) /datum/sprite_accessory/mam_body_markings/otie name = "Otie" icon_state = "otie" - covered_limbs = list(HEAD = MATRIX_ALL, CHEST = MATRIX_ALL, LEG_LEFT = MATRIX_ALL, LEG_RIGHT = MATRIX_ALL, ARM_LEFT = MATRIX_ALL, ARM_RIGHT = MATRIX_ALL) + 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) /datum/sprite_accessory/mam_body_markings/otter name = "Otter" icon_state = "otter" - covered_limbs = list(HEAD = MATRIX_ALL, CHEST = MATRIX_GREEN) + covered_limbs = list(num2text(HEAD) = MATRIX_ALL, num2text(CHEST) = MATRIX_GREEN) /datum/sprite_accessory/mam_body_markings/panther name = "Panther" icon_state = "panther" - covered_limbs = list(HEAD = MATRIX_RED_GREEN, CHEST = MATRIX_RED_GREEN, LEG_LEFT = MATRIX_RED_GREEN, LEG_RIGHT = MATRIX_RED_GREEN, ARM_LEFT = MATRIX_RED_GREEN, ARM_RIGHT = MATRIX_RED_GREEN) + 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) /datum/sprite_accessory/mam_body_markings/plain name = "Plain" icon_state = "plain" icon = 'modular_citadel/icons/mob/markings_notmammals.dmi' - covered_limbs = list(HEAD = MATRIX_RED, CHEST = MATRIX_RED, LEG_LEFT = MATRIX_RED, LEG_RIGHT = MATRIX_RED, ARM_LEFT = MATRIX_RED, ARM_RIGHT = MATRIX_RED) + 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) /datum/sprite_accessory/mam_body_markings/possum name = "Possum" icon_state = "possum" - covered_limbs = list(HEAD = MATRIX_RED_GREEN, CHEST = MATRIX_RED_GREEN, LEG_LEFT = MATRIX_RED_BLUE, LEG_RIGHT = MATRIX_RED_BLUE, ARM_LEFT = MATRIX_RED_BLUE, ARM_RIGHT = MATRIX_RED_BLUE) + 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) /datum/sprite_accessory/mam_body_markings/raccoon name = "Raccoon" icon_state = "raccoon" - covered_limbs = list(HEAD = MATRIX_ALL, CHEST = MATRIX_RED_GREEN, LEG_LEFT = MATRIX_ALL, LEG_RIGHT = MATRIX_ALL, ARM_LEFT = MATRIX_RED_GREEN, ARM_RIGHT = MATRIX_RED_GREEN) + 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) /datum/sprite_accessory/mam_body_markings/sergal name = "Sergal" icon_state = "sergal" - covered_limbs = list(HEAD = MATRIX_RED_GREEN, CHEST = MATRIX_RED_GREEN) + covered_limbs = list(num2text(HEAD) = MATRIX_RED_GREEN, num2text(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(HEAD = MATRIX_GREEN, CHEST = MATRIX_GREEN_BLUE, LEG_LEFT = MATRIX_GREEN, LEG_RIGHT = MATRIX_GREEN, ARM_LEFT = MATRIX_GREEN, ARM_RIGHT = MATRIX_GREEN) + 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) /datum/sprite_accessory/mam_body_markings/shark name = "Shark" icon_state = "shark" - covered_limbs = list(HEAD = MATRIX_RED_GREEN, CHEST = MATRIX_RED, LEG_LEFT = MATRIX_RED, LEG_RIGHT = MATRIX_RED_GREEN, ARM_LEFT = MATRIX_RED_GREEN, ARM_RIGHT = MATRIX_RED_GREEN) + 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) /datum/sprite_accessory/mam_body_markings/shepherd name = "Shepherd" icon_state = "shepherd" - covered_limbs = list(HEAD = MATRIX_ALL, CHEST = MATRIX_ALL, LEG_LEFT = MATRIX_RED_GREEN, LEG_RIGHT = MATRIX_RED_GREEN, ARM_LEFT = MATRIX_RED, ARM_RIGHT = MATRIX_RED) + 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) /datum/sprite_accessory/mam_body_markings/skunk name = "Skunk" icon_state = "skunk" - covered_limbs = list(HEAD = MATRIX_RED_GREEN, CHEST = MATRIX_RED_GREEN, LEG_LEFT = MATRIX_RED_GREEN, LEG_RIGHT = MATRIX_RED_GREEN, ARM_LEFT = MATRIX_RED, ARM_RIGHT = MATRIX_RED) + 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) /datum/sprite_accessory/mam_body_markings/tajaran name = "Tajaran" icon_state = "tajaran" - covered_limbs = list(HEAD = MATRIX_RED_GREEN, CHEST = MATRIX_RED_GREEN, LEG_LEFT = MATRIX_RED, LEG_RIGHT = MATRIX_RED, ARM_LEFT = MATRIX_RED, ARM_RIGHT = MATRIX_RED) + 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) /datum/sprite_accessory/mam_body_markings/tiger name = "Tiger" icon_state = "tiger" - covered_limbs = list(HEAD = MATRIX_ALL, CHEST = MATRIX_ALL, LEG_LEFT = MATRIX_ALL, LEG_RIGHT = MATRIX_ALL, ARM_LEFT = MATRIX_RED_BLUE, ARM_RIGHT = MATRIX_RED_BLUE) + 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) /datum/sprite_accessory/mam_body_markings/turian name = "Turian" icon_state = "turian" icon = 'modular_citadel/icons/mob/markings_notmammals.dmi' - covered_limbs = list(HEAD = MATRIX_RED_GREEN, CHEST = MATRIX_RED, LEG_LEFT = MATRIX_RED, LEG_RIGHT = MATRIX_RED, ARM_LEFT = MATRIX_RED, ARM_RIGHT = MATRIX_RED) + 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) /datum/sprite_accessory/mam_body_markings/wolf name = "Wolf" icon_state = "wolf" - covered_limbs = list(HEAD = MATRIX_ALL, CHEST = MATRIX_ALL, LEG_LEFT = MATRIX_RED_BLUE, LEG_RIGHT = MATRIX_RED_BLUE, ARM_LEFT = MATRIX_RED_BLUE, ARM_RIGHT = MATRIX_RED_BLUE) + 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) /datum/sprite_accessory/mam_body_markings/xeno name = "Xeno" icon_state = "xeno" icon = 'modular_citadel/icons/mob/markings_notmammals.dmi' - covered_limbs = list(HEAD = MATRIX_BLUE, CHEST = MATRIX_GREEN, LEG_LEFT = MATRIX_GREEN, LEG_RIGHT = MATRIX_GREEN, ARM_LEFT = MATRIX_GREEN, ARM_RIGHT = MATRIX_GREEN) + 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) // sticking old lizard markings here for now /datum/sprite_accessory/mam_body_markings/dtiger name = "Dark Tiger Body" icon_state = "dtiger" - covered_limbs = list(HEAD = MATRIX_RED, CHEST = MATRIX_RED, LEG_LEFT = MATRIX_RED, LEG_RIGHT = MATRIX_RED, ARM_LEFT = MATRIX_RED, ARM_RIGHT = MATRIX_RED) + 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) /datum/sprite_accessory/mam_body_markings/guilmon name = "Guilmon" icon_state = "guilmon" icon = 'modular_citadel/icons/mob/markings_notmammals.dmi' - covered_limbs = list(HEAD = MATRIX_RED_BLUE, CHEST = MATRIX_GREEN_BLUE, LEG_LEFT = MATRIX_BLUE, LEG_RIGHT = MATRIX_BLUE, ARM_LEFT = MATRIX_GREEN_BLUE, ARM_RIGHT = MATRIX_GREEN_BLUE) + 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) /datum/sprite_accessory/mam_body_markings/ltiger name = "Light Tiger Body" icon_state = "ltiger" - covered_limbs = list(HEAD = MATRIX_RED, CHEST = MATRIX_RED, LEG_LEFT = MATRIX_RED, LEG_RIGHT = MATRIX_RED, ARM_LEFT = MATRIX_RED, ARM_RIGHT = MATRIX_RED) + 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) /datum/sprite_accessory/mam_body_markings/lbelly name = "Light Belly" icon_state = "lbelly" - covered_limbs = list(HEAD = MATRIX_RED, CHEST = MATRIX_RED, LEG_LEFT = MATRIX_RED, LEG_RIGHT = MATRIX_RED, ARM_LEFT = MATRIX_RED, ARM_RIGHT = MATRIX_RED) + 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) /****************************************** ************* Insect Markings ************* 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 03/12] 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" From b1f84f94db8901acff3f377b1f6517d89a562a02 Mon Sep 17 00:00:00 2001 From: timothyteakettle <59849408+timothyteakettle@users.noreply.github.com> Date: Thu, 6 May 2021 22:43:31 +0100 Subject: [PATCH 04/12] Update body_markings.dm --- .../mob/dead/new_player/sprite_accessories/body_markings.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 285e7ca7e2..7e275e49a2 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 @@ -296,9 +296,9 @@ icon_state = "snow" color_src = HAIR -/datum/sprite_accessory/insect_fluff/death"Head" - name = "Deaths"Head"" - icon_state = "death"Head"" +/datum/sprite_accessory/insect_fluff/deathhead + name = "Deathshead" + icon_state = "deathhead" /datum/sprite_accessory/insect_fluff/featherymoth name = "Feathery Moth" From e95e4ed106ec3b31268613aecd2c756d2dc87a73 Mon Sep 17 00:00:00 2001 From: timothyteakettle <59849408+timothyteakettle@users.noreply.github.com> Date: Thu, 6 May 2021 23:39:41 +0100 Subject: [PATCH 05/12] Update preferences_savefile.dm --- code/modules/client/preferences_savefile.dm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm index ca993be7c4..a59f35e111 100644 --- a/code/modules/client/preferences_savefile.dm +++ b/code/modules/client/preferences_savefile.dm @@ -47,6 +47,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car addtimer(CALLBACK(src, .proc/force_reset_keybindings), 30) //No mob available when this is run, timer allows user choice. /datum/preferences/proc/update_character(current_version, savefile/S) + message_admins(current_version) if(current_version < 19) pda_style = "mono" if(current_version < 20) @@ -296,6 +297,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car S["be_special"] << L if(current_version < 51) // rp markings means markings are now stored as a list, lizard markings now mam like the rest + message_admins("migrating") var/marking_type var/species_id = S["species"] var/datum/species/actual_species = GLOB.species_datums[species_id] @@ -318,7 +320,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car var/marking_list = list() for(var/part in list(ARM_LEFT, ARM_RIGHT, LEG_LEFT, LEG_RIGHT, CHEST, HEAD)) marking_list += list(list(part, old_marking_value, color_list.Copy())) - + message_admins("saved data of length [length(marking_list)]") S[marking_type] = safe_json_encode(marking_list) /datum/preferences/proc/load_path(ckey,filename="preferences.sav") From 440a6633ea3add97b3c89065406cb4974ca6f3b5 Mon Sep 17 00:00:00 2001 From: timothyteakettle <59849408+timothyteakettle@users.noreply.github.com> Date: Fri, 7 May 2021 00:37:33 +0100 Subject: [PATCH 06/12] Update preferences_savefile.dm --- code/modules/client/preferences_savefile.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm index a59f35e111..9e7c942967 100644 --- a/code/modules/client/preferences_savefile.dm +++ b/code/modules/client/preferences_savefile.dm @@ -317,11 +317,12 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car if(S["feature_mcolor2"]) color_list[2] = S["feature_mcolor2"] if(S["feature_mcolor3"]) color_list[3] = S["feature_mcolor3"] - var/marking_list = list() + var/list/marking_list = list() for(var/part in list(ARM_LEFT, ARM_RIGHT, LEG_LEFT, LEG_RIGHT, CHEST, HEAD)) marking_list += list(list(part, old_marking_value, color_list.Copy())) message_admins("saved data of length [length(marking_list)]") S[marking_type] = safe_json_encode(marking_list) + message_admins("final json code is: [S[marking_type]]") /datum/preferences/proc/load_path(ckey,filename="preferences.sav") if(!ckey) From eab47bb6ae2a01fb80c7eacbf45b6b9c172e20e8 Mon Sep 17 00:00:00 2001 From: timothyteakettle <59849408+timothyteakettle@users.noreply.github.com> Date: Fri, 7 May 2021 00:43:33 +0100 Subject: [PATCH 07/12] Update preferences_savefile.dm --- code/modules/client/preferences_savefile.dm | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm index 9e7c942967..285f34ddd4 100644 --- a/code/modules/client/preferences_savefile.dm +++ b/code/modules/client/preferences_savefile.dm @@ -47,7 +47,6 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car addtimer(CALLBACK(src, .proc/force_reset_keybindings), 30) //No mob available when this is run, timer allows user choice. /datum/preferences/proc/update_character(current_version, savefile/S) - message_admins(current_version) if(current_version < 19) pda_style = "mono" if(current_version < 20) @@ -297,7 +296,6 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car S["be_special"] << L if(current_version < 51) // rp markings means markings are now stored as a list, lizard markings now mam like the rest - message_admins("migrating") var/marking_type var/species_id = S["species"] var/datum/species/actual_species = GLOB.species_datums[species_id] @@ -320,9 +318,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car var/list/marking_list = list() for(var/part in list(ARM_LEFT, ARM_RIGHT, LEG_LEFT, LEG_RIGHT, CHEST, HEAD)) marking_list += list(list(part, old_marking_value, color_list.Copy())) - message_admins("saved data of length [length(marking_list)]") - S[marking_type] = safe_json_encode(marking_list) - message_admins("final json code is: [S[marking_type]]") + features["mam_body_markings"] = safe_json_encode(marking_list) /datum/preferences/proc/load_path(ckey,filename="preferences.sav") if(!ckey) From f5e2d3de2c1487efca70e4aa0907ef49b6c9f222 Mon Sep 17 00:00:00 2001 From: timothyteakettle <59849408+timothyteakettle@users.noreply.github.com> Date: Fri, 7 May 2021 00:44:44 +0100 Subject: [PATCH 08/12] Update preferences_savefile.dm --- code/modules/client/preferences_savefile.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm index 285f34ddd4..70e4e1656d 100644 --- a/code/modules/client/preferences_savefile.dm +++ b/code/modules/client/preferences_savefile.dm @@ -302,7 +302,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car // convert lizard markings to lizard markings if(species_id == SPECIES_LIZARD && S["feature_lizard_body_markings"]) - S["feature_mam_body_markings"] = S["feature_lizard_body_markings"] + features["mam_body_markings"] = features["body_markings"] // convert mam body marking data to the new rp marking data if(actual_species.mutant_bodyparts["mam_body_markings"] && S["feature_mam_body_markings"]) marking_type = "feature_mam_body_markings" From 3b07164fb4c90c106122458128a8ff70638d9fe7 Mon Sep 17 00:00:00 2001 From: timothyteakettle <59849408+timothyteakettle@users.noreply.github.com> Date: Fri, 7 May 2021 00:56:27 +0100 Subject: [PATCH 09/12] Update preferences_savefile.dm --- code/modules/client/preferences_savefile.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm index 70e4e1656d..a759fd1411 100644 --- a/code/modules/client/preferences_savefile.dm +++ b/code/modules/client/preferences_savefile.dm @@ -283,7 +283,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car qdel(temporary_gear_item) //it's double packed into a list because += will union the two lists contents - S["loadout"] = safe_json_encode(loadout_data) + S["loadout"] = loadout_data if(current_version < 48) //unlockable loadout items but we need to clear bad data from a mistake S["unlockable_loadout"] = list() From bef9473fa1727bdccce604c901ef1d399c0b33f1 Mon Sep 17 00:00:00 2001 From: timothyteakettle <59849408+timothyteakettle@users.noreply.github.com> Date: Fri, 7 May 2021 16:10:20 +0100 Subject: [PATCH 10/12] more migration fixes and general bugfixes --- code/modules/client/preferences_savefile.dm | 2 +- .../dead/new_player/sprite_accessories/Citadel_Snowflake.dm | 4 ++-- .../mob/dead/new_player/sprite_accessories/synthliz.dm | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm index a759fd1411..d33f249956 100644 --- a/code/modules/client/preferences_savefile.dm +++ b/code/modules/client/preferences_savefile.dm @@ -318,7 +318,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car var/list/marking_list = list() for(var/part in list(ARM_LEFT, ARM_RIGHT, LEG_LEFT, LEG_RIGHT, CHEST, HEAD)) marking_list += list(list(part, old_marking_value, color_list.Copy())) - features["mam_body_markings"] = safe_json_encode(marking_list) + features["mam_body_markings"] = marking_list /datum/preferences/proc/load_path(ckey,filename="preferences.sav") if(!ckey) diff --git a/code/modules/mob/dead/new_player/sprite_accessories/Citadel_Snowflake.dm b/code/modules/mob/dead/new_player/sprite_accessories/Citadel_Snowflake.dm index 860c299baf..016b12d8ec 100644 --- a/code/modules/mob/dead/new_player/sprite_accessories/Citadel_Snowflake.dm +++ b/code/modules/mob/dead/new_player/sprite_accessories/Citadel_Snowflake.dm @@ -12,7 +12,7 @@ name = "DataShark" icon_state = "datashark" ckeys_allowed = list("rubyflamewing") - covered_limbs = list(HEAD = MATRIX_RED_GREEN, CHEST = MATRIX_GREEN, LEG_LEFT = MATRIX_GREEN, LEG_RIGHT = MATRIX_GREEN, ARM_LEFT = MATRIX_GREEN, 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) //Sabresune /datum/sprite_accessory/ears/mam_ears/sabresune @@ -40,7 +40,7 @@ name = "Sabresune" icon_state = "sabresune" ckeys_allowed = list("poojawa") - covered_limbs = list(HEAD = MATRIX_RED_GREEN, CHEST = MATRIX_RED_GREEN, LEG_LEFT = MATRIX_RED_GREEN, LEG_RIGHT = MATRIX_RED_GREEN, ARM_LEFT = MATRIX_RED_GREEN, 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) //Lunasune /datum/sprite_accessory/ears/mam_ears/lunasune diff --git a/code/modules/mob/dead/new_player/sprite_accessories/synthliz.dm b/code/modules/mob/dead/new_player/sprite_accessories/synthliz.dm index 22015a9e92..c7cd699ec9 100644 --- a/code/modules/mob/dead/new_player/sprite_accessories/synthliz.dm +++ b/code/modules/mob/dead/new_player/sprite_accessories/synthliz.dm @@ -32,20 +32,20 @@ icon = 'modular_citadel/icons/mob/synthliz_body_markings.dmi' name = "Synthetic Lizard - Pecs" icon_state = "synthlizpecs" - covered_limbs = list(CHEST = MATRIX_GREEN) + covered_limbs = list("Chest" = MATRIX_GREEN) /datum/sprite_accessory/mam_body_markings/synthliz/synthliz_pecslight icon = 'modular_citadel/icons/mob/synthliz_body_markings.dmi' name = "Synthetic Lizard - Pecs Light" icon_state = "synthlizpecslight" - covered_limbs = list(CHEST = MATRIX_GREEN_BLUE) + covered_limbs = list("Chest" = MATRIX_GREEN_BLUE) /datum/sprite_accessory/mam_body_markings/synthliz recommended_species = list("synthliz") icon = 'modular_citadel/icons/mob/synthliz_body_markings.dmi' name = "Synthetic Lizard - Plates" icon_state = "synthlizscutes" - covered_limbs = list(CHEST = MATRIX_GREEN) + covered_limbs = list("Chest" = MATRIX_GREEN) //Synth tails /datum/sprite_accessory/tails/mam_tails/synthliz From 0fb72497ff9799c3475aa4c65afe9436dbe43553 Mon Sep 17 00:00:00 2001 From: timothyteakettle <59849408+timothyteakettle@users.noreply.github.com> Date: Fri, 7 May 2021 16:46:40 +0100 Subject: [PATCH 11/12] color fix --- code/modules/client/preferences_savefile.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm index d33f249956..25c96aed1a 100644 --- a/code/modules/client/preferences_savefile.dm +++ b/code/modules/client/preferences_savefile.dm @@ -311,9 +311,9 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car var/old_marking_value = S[marking_type] var/list/color_list = list("#FFFFFF","#FFFFFF","#FFFFFF") - if(S["feature_mcolor"]) color_list[1] = S["feature_mcolor"] - if(S["feature_mcolor2"]) color_list[2] = S["feature_mcolor2"] - if(S["feature_mcolor3"]) color_list[3] = S["feature_mcolor3"] + if(S["feature_mcolor"]) color_list[1] = "#" + S["feature_mcolor"] + if(S["feature_mcolor2"]) color_list[2] = "#" + S["feature_mcolor2"] + if(S["feature_mcolor3"]) color_list[3] = "#" + S["feature_mcolor3"] var/list/marking_list = list() for(var/part in list(ARM_LEFT, ARM_RIGHT, LEG_LEFT, LEG_RIGHT, CHEST, HEAD)) From bb893383bc7b00f84dc93518f7dab4cb8272fde5 Mon Sep 17 00:00:00 2001 From: timothyteakettle <59849408+timothyteakettle@users.noreply.github.com> Date: Fri, 7 May 2021 17:27:55 +0100 Subject: [PATCH 12/12] Update _bodyparts.dm --- code/modules/surgery/bodyparts/_bodyparts.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/modules/surgery/bodyparts/_bodyparts.dm b/code/modules/surgery/bodyparts/_bodyparts.dm index 712f0a33a0..bd5095059b 100644 --- a/code/modules/surgery/bodyparts/_bodyparts.dm +++ b/code/modules/surgery/bodyparts/_bodyparts.dm @@ -833,7 +833,6 @@ markings_list.Add(image(marking_list[1], "[marking_list[2]]_[digitigrade_type]_[use_digitigrade]_[body_zone]", -MARKING_LAYER, image_dir)) if(color_src && length(marking_list) == 3) - message_admins("trying to color list of length [length(marking_list)] and also trying to access index [length(markings_list)] on a list of the same length") markings_list[length(markings_list)].color = marking_list[3] . += markings_list