From d39a60dd6b87e1df5289edd8c386a13695428783 Mon Sep 17 00:00:00 2001 From: Timothy Teakettle <59849408+timothyteakettle@users.noreply.github.com> Date: Wed, 5 May 2021 21:24:07 +0100 Subject: [PATCH] casually list the matrixes for several hundred sprites --- .../sprite_accessories/Citadel_Snowflake.dm | 2 + .../sprite_accessories/body_markings.dm | 43 ++++++++++++++++++- .../new_player/sprite_accessories/synthliz.dm | 6 +-- 3 files changed, 47 insertions(+), 4 deletions(-) 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 f58788d9af..860c299baf 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,6 +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) //Sabresune /datum/sprite_accessory/ears/mam_ears/sabresune @@ -39,6 +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) //Lunasune /datum/sprite_accessory/ears/mam_ears/lunasune 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 278a31959f..d6da8be86e 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,87 +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) /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) /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) /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) /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) /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) /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) /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) /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) /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) /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) /datum/sprite_accessory/mam_body_markings/eevee name = "Eevee" icon_state = "eevee" + 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(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) /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) /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) /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) /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) /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) /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) /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) /datum/sprite_accessory/mam_body_markings/insect name = "Insect" @@ -117,97 +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) /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) /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) /datum/sprite_accessory/mam_body_markings/otter name = "Otter" icon_state = "otter" + covered_limbs = list(HEAD = MATRIX_ALL, 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) /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) /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) /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) /datum/sprite_accessory/mam_body_markings/sergal name = "Sergal" icon_state = "sergal" + 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(HEAD = MATRIX_GREEN, CHEST = MATRIX_GREEN_BLUE, LEG_LEFT = MATRIX_GREEN, LEG_RIGHT = MATRIX_GREEN, ARM_LEFT = MATRIX_GREEN, 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) /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) /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) /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) /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) /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) /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) /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) // 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) /datum/sprite_accessory/mam_body_markings/guilmon name = "Guilmon" icon_state = "guilmon" icon = 'modular_citadel/icons/mob/markings_notmammals.dmi' - matrixed_sections = MATRIX_ALL + 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) /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) /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) /****************************************** ************* Insect Markings ************* 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 bc4d4dd00d..22015a9e92 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" - matrixed_sections = 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" - matrixed_sections = 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" - matrixed_sections = MATRIX_GREEN + covered_limbs = list(CHEST = MATRIX_GREEN) //Synth tails /datum/sprite_accessory/tails/mam_tails/synthliz