diff --git a/code/modules/mob/dead/new_player/sprite_accessories_Citadel.dm b/code/modules/mob/dead/new_player/sprite_accessories_Citadel.dm index 3d5900031e..e66bca2d2f 100644 --- a/code/modules/mob/dead/new_player/sprite_accessories_Citadel.dm +++ b/code/modules/mob/dead/new_player/sprite_accessories_Citadel.dm @@ -25,38 +25,10 @@ ************ Human Ears/Tails ************* *******************************************/ -/datum/sprite_accessory/ears/fox - name = "Fox" - icon_state = "fox" - hasinner = 0 - icon = 'icons/mob/mam_bodyparts.dmi' - -/datum/sprite_accessory/ears/wolf - name = "Wolf" - icon_state = "wolf" - hasinner = 1 - icon = 'icons/mob/mam_bodyparts.dmi' - -/datum/sprite_accessory/tails/human/fox - name = "Fox" - icon_state = "fox" - icon = 'icons/mob/mam_bodyparts.dmi' - extra = 1 - -/datum/sprite_accessory/tails_animated/human/fox - name = "Fox" - icon_state = "fox" - icon = 'icons/mob/mam_bodyparts.dmi' - extra = 1 - -/datum/sprite_accessory/tails/human/wolf - name = "Wolf" - icon_state = "wolf" - icon = 'icons/mob/mam_bodyparts.dmi' - -/datum/sprite_accessory/tails_animated/human/wolf - name = "Wolf" - icon_state = "wolf" +/datum/sprite_accessory/tails/human/ailurus + name = "Red Panda" + icon_state = "ailurus" + color_src = 0 icon = 'icons/mob/mam_bodyparts.dmi' /datum/sprite_accessory/tails/human/catbig @@ -84,12 +56,24 @@ icon_state = "fennec" icon = 'icons/mob/mam_bodyparts.dmi' -/datum/sprite_accessory/ears/lab - name = "Dog, Floppy" - icon_state = "lab" +/datum/sprite_accessory/ears/fox + name = "Fox" + icon_state = "fox" hasinner = 0 icon = 'icons/mob/mam_bodyparts.dmi' +/datum/sprite_accessory/tails/human/fox + name = "Fox" + icon_state = "fox" + icon = 'icons/mob/mam_bodyparts.dmi' + extra = 1 + +/datum/sprite_accessory/tails_animated/human/fox + name = "Fox" + icon_state = "fox" + icon = 'icons/mob/mam_bodyparts.dmi' + extra = 1 + /datum/sprite_accessory/tails/human/husky name = "Husky" icon_state = "husky" @@ -102,6 +86,12 @@ icon = 'icons/mob/mam_bodyparts.dmi' extra = 1 +/datum/sprite_accessory/ears/lab + name = "Dog, Floppy" + icon_state = "lab" + hasinner = 0 + icon = 'icons/mob/mam_bodyparts.dmi' + /datum/sprite_accessory/ears/murid name = "Murid" icon_state = "murid" @@ -113,7 +103,6 @@ color_src = 0 icon = 'icons/mob/mam_bodyparts.dmi' - /datum/sprite_accessory/tails_animated/human/murid name = "Murid" icon_state = "murid" @@ -132,12 +121,6 @@ color_src = 0 icon = 'icons/mob/mam_bodyparts.dmi' -/datum/sprite_accessory/tails/human/ailurus - name = "ailurus" - icon_state = "ailurus" - color_src = 0 - icon = 'icons/mob/mam_bodyparts.dmi' - /datum/sprite_accessory/ears/squirrel name = "Squirrel" icon_state = "squirrel" @@ -154,6 +137,21 @@ icon_state = "squirrel" icon = 'icons/mob/mam_bodyparts.dmi' +/datum/sprite_accessory/ears/wolf + name = "Wolf" + icon_state = "wolf" + hasinner = 1 + icon = 'icons/mob/mam_bodyparts.dmi' + +/datum/sprite_accessory/tails/human/wolf + name = "Wolf" + icon_state = "wolf" + icon = 'icons/mob/mam_bodyparts.dmi' + +/datum/sprite_accessory/tails_animated/human/wolf + name = "Wolf" + icon_state = "wolf" + icon = 'icons/mob/mam_bodyparts.dmi' /****************************************** *************** Body Parts **************** @@ -211,7 +209,19 @@ /****************************************** ************ Actual Species *************** *******************************************/ -//Cat, Big + +/datum/sprite_accessory/mam_tails/ailurus + name = "Ailurus" + icon_state = "ailurus" + extra = 1 + extra_color_src = MUTCOLORS2 + +/datum/sprite_accessory/mam_tails_animated/ailurus + name = "Ailurus" + icon_state = "ailurus" + extra = 1 + extra_color_src = MUTCOLORS2 + /datum/sprite_accessory/mam_ears/catbig name = "Cat, Big" icon_state = "cat" @@ -226,21 +236,42 @@ name = "Cat, Big" icon_state = "catbig" -//Wolf -/datum/sprite_accessory/mam_ears/wolf - name = "Wolf" - icon_state = "wolf" +/datum/sprite_accessory/mam_ears/cow + name = "Cow" + icon_state = "cow" + gender_specific = 1 + +/datum/sprite_accessory/mam_ears/deer + name = "Deer" + icon_state = "deer" + +/datum/sprite_accessory/mam_tails/eevee + name = "Eevee" + icon_state = "eevee" + extra = 1 + extra_color_src = MUTCOLORS2 + +/datum/sprite_accessory/mam_ears/eevee + name = "Eevee" + icon_state = "eevee" + +/datum/sprite_accessory/mam_tails_animated/eevee + name = "Eevee" + icon_state = "eevee" + +/datum/sprite_accessory/mam_ears/fennec + name = "Fennec" + icon_state = "fennec" hasinner = 1 -/datum/sprite_accessory/mam_tails/wolf - name = "Wolf" - icon_state = "wolf" +/datum/sprite_accessory/mam_tails/fennec + name = "Fennec" + icon_state = "fennec" -/datum/sprite_accessory/mam_tails_animated/wolf - name = "Wolf" - icon_state = "wolf" +/datum/sprite_accessory/mam_tails_animated/fennec + name = "Fennec" + icon_state = "fennec" -//Fox /datum/sprite_accessory/mam_ears/fox name = "Fox" icon_state = "fox" @@ -258,21 +289,31 @@ extra = 1 extra_color_src = MUTCOLORS2 -//Fennec -/datum/sprite_accessory/mam_ears/fennec - name = "Fennec" - icon_state = "fennec" +/datum/sprite_accessory/mam_ears/husky + name = "Husky" + icon_state = "wolf" hasinner = 1 + icon = 'icons/mob/mam_bodyparts.dmi' + extra = 1 -/datum/sprite_accessory/mam_tails/fennec - name = "Fennec" - icon_state = "fennec" +/datum/sprite_accessory/mam_tails/hawk + name = "Hawk" + icon_state = "hawk" -/datum/sprite_accessory/mam_tails_animated/fennec - name = "Fennec" - icon_state = "fennec" +/datum/sprite_accessory/mam_tails_animated/hawk + name = "Hawk" + icon_state = "hawk" + +/datum/sprite_accessory/mam_tails/husky + name = "Husky" + icon_state = "husky" + extra = 1 + +/datum/sprite_accessory/mam_tails_animated/husky + name = "Husky" + icon_state = "husky" + extra = 1 -//Lab /datum/sprite_accessory/mam_ears/lab name = "Dog, Long" icon_state = "lab" @@ -285,25 +326,6 @@ name = "Lab" icon_state = "lab" -//Husky -/datum/sprite_accessory/mam_ears/husky - name = "Husky" - icon_state = "wolf" - hasinner = 1 - icon = 'icons/mob/mam_bodyparts.dmi' - extra = 1 - -/datum/sprite_accessory/mam_tails/husky - name = "Husky" - icon_state = "husky" - extra = 1 - -/datum/sprite_accessory/mam_tails_animated/husky - name = "Husky" - icon_state = "husky" - extra = 1 - -//Murid /datum/sprite_accessory/mam_ears/murid name = "Murid" icon_state = "murid" @@ -318,61 +340,6 @@ icon_state = "murid" color_src = 0 -//Shark -/datum/sprite_accessory/mam_tails/shark - name = "Shark" - icon_state = "shark" - color_src = 0 - icon = 'icons/mob/mam_bodyparts.dmi' - - -/datum/sprite_accessory/mam_tails/shark/datashark - name = "DataShark" - icon_state = "datashark" - color_src = 0 - icon = 'icons/mob/mam_bodyparts.dmi' -// ckeys_allowed = list("rubyflamewing") - - -//Squirrel -/datum/sprite_accessory/mam_ears/squirrel - name = "Squirrel" - icon_state = "squirrel" - hasinner= 1 - -/datum/sprite_accessory/mam_tails/squirrel - name = "Squirrel" - icon_state = "squirrel" - -/datum/sprite_accessory/mam_tails_animated/squirrel - name = "Squirrel" - icon_state = "squirrel" - -// Wah - -/datum/sprite_accessory/mam_tails/ailurus - name = "Ailurus" - icon_state = "ailurus" - extra = 1 - extra_color_src = MUTCOLORS2 - -/datum/sprite_accessory/mam_tails_animated/ailurus - name = "Ailurus" - icon_state = "ailurus" - extra = 1 - extra_color_src = MUTCOLORS2 - -// Hawk - -/datum/sprite_accessory/mam_tails/hawk - name = "Hawk" - icon_state = "hawk" - -/datum/sprite_accessory/mam_tails_animated/hawk - name = "Hawk" - icon_state = "hawk" - -//Otusian /datum/sprite_accessory/mam_ears/otie name = "Otusian" icon_state = "otie" @@ -386,7 +353,27 @@ name = "Otusian" icon_state = "otie" -// G Shepherd +/datum/sprite_accessory/mam_tails/shark + name = "Shark" + icon_state = "shark" + color_src = 0 + +/datum/sprite_accessory/mam_tails_animated/shark + name = "Shark" + icon_state = "shark" + color_src = 0 + +/datum/sprite_accessory/mam_tails/shark/datashark + name = "DataShark" + icon_state = "datashark" + color_src = 0 +// ckeys_allowed = list("rubyflamewing") + +/datum/sprite_accessory/mam_tails_animated/shark/datashark + name = "DataShark" + icon_state = "datashark" + color_src = 0 + /datum/sprite_accessory/mam_tails/shepherd name = "Shepherd" icon_state = "shepherd" @@ -398,23 +385,32 @@ icon_state = "shepherd" extra = 1 extra2 = 1 - -// Eevee -/datum/sprite_accessory/mam_tails/eevee - name = "Eevee" - icon_state = "eevee" - extra = 1 - extra_color_src = MUTCOLORS2 -/datum/sprite_accessory/mam_ears/eevee - name = "Eevee" - icon_state = "eevee" +/datum/sprite_accessory/mam_ears/squirrel + name = "Squirrel" + icon_state = "squirrel" + hasinner= 1 -/datum/sprite_accessory/mam_tails_animated/eevee - name = "Eevee" - icon_state = "eevee" +/datum/sprite_accessory/mam_tails/squirrel + name = "Squirrel" + icon_state = "squirrel" +/datum/sprite_accessory/mam_tails_animated/squirrel + name = "Squirrel" + icon_state = "squirrel" +/datum/sprite_accessory/mam_ears/wolf + name = "Wolf" + icon_state = "wolf" + hasinner = 1 + +/datum/sprite_accessory/mam_tails/wolf + name = "Wolf" + icon_state = "wolf" + +/datum/sprite_accessory/mam_tails_animated/wolf + name = "Wolf" + icon_state = "wolf" /****************************************** ************ Body Markings **************** @@ -423,17 +419,12 @@ /datum/sprite_accessory/mam_body_markings extra = 1 extra2 = 1 - icon = 'icons/mob/special/mam_body_markings.dmi' + icon = 'icons/mob/mam_body_markings.dmi' /datum/sprite_accessory/mam_body_markings/none name = "None" icon_state = "none" -/datum/sprite_accessory/mam_body_markings/belly - name = "Belly" - icon_state = "belly" - gender_specific = 1 - /datum/sprite_accessory/mam_body_markings/ailurus name = "Red Panda" icon_state = "ailurus" @@ -441,21 +432,16 @@ extra2_color_src = MUTCOLORS3 gender_specific = 1 -/datum/sprite_accessory/mam_body_markings/fox - name = "Fox" - icon_state = "fox" - extra_color_src = MUTCOLORS3 +/datum/sprite_accessory/mam_body_markings/belly + name = "Belly" + icon_state = "belly" gender_specific = 1 -/datum/sprite_accessory/mam_body_markings/wolf - name = "Wolf" - icon_state = "wolf" +/datum/sprite_accessory/mam_body_markings/corgi + name = "Corgi" + icon_state = "corgi" color_src = MUTCOLORS2 - gender_specific = 1 - -/datum/sprite_accessory/mam_body_markings/otie - name = "Otie" - icon_state = "otie" + extra_color_src = MUTCOLORS3 gender_specific = 1 /datum/sprite_accessory/mam_body_markings/cow @@ -465,15 +451,33 @@ extra_color_src = MUTCOLORS3 gender_specific = 1 +/datum/sprite_accessory/mam_body_markings/corvid + name = "Crow" + icon_state = "corvid" + gender_specific = 1 + +/datum/sprite_accessory/mam_body_markings/deer + name = "Deer" + icon_state = "deer" + color_src = MUTCOLORS2 + extra_color_src = MUTCOLORS3 + gender_specific = 1 + +/datum/sprite_accessory/mam_body_markings/eevee + name = "Eevee" + icon_state = "eevee" + color_src = MUTCOLORS3 + /datum/sprite_accessory/mam_body_markings/fennec name = "Fennec" icon_state = "Fennec" extra_color_src = MUTCOLORS3 gender_specific = 1 -/datum/sprite_accessory/mam_body_markings/corvid - name = "Crow" - icon_state = "corvid" +/datum/sprite_accessory/mam_body_markings/fox + name = "Fox" + icon_state = "fox" + extra_color_src = MUTCOLORS3 gender_specific = 1 /datum/sprite_accessory/mam_body_markings/hawk @@ -481,11 +485,6 @@ icon_state = "hawk" gender_specific = 1 -/datum/sprite_accessory/mam_body_markings/tiger - name = "Tiger Stripes" - color_src = MUTCOLORS3 - icon_state = "tiger" - /datum/sprite_accessory/mam_body_markings/husky name = "Husky" icon_state = "husky" @@ -493,18 +492,6 @@ extra_color_src = MUTCOLORS3 gender_specific = 1 -/datum/sprite_accessory/mam_body_markings/shepherd - name = "Shepherd" - icon_state = "shepherd" - gender_specific = 1 - -/datum/sprite_accessory/mam_body_markings/corgi - name = "Corgi" - icon_state = "corgi" - color_src = MUTCOLORS2 - extra_color_src = MUTCOLORS3 - gender_specific = 1 - /datum/sprite_accessory/mam_body_markings/moth name = "Moth" icon_state = "moth" @@ -512,26 +499,42 @@ extra_color_src = MUTCOLORS3 gender_specific = 1 +/datum/sprite_accessory/mam_body_markings/otie + name = "Otie" + icon_state = "otie" + gender_specific = 1 + /datum/sprite_accessory/mam_body_markings/shark name = "Shark" icon_state = "shark" color_src = MUTCOLORS2 extra_color_src = MUTCOLORS3 gender_specific = 1 - -/datum/sprite_accessory/mam_body_markings/eevee - name = "Eevee" - icon_state = "eevee" + +/datum/sprite_accessory/mam_body_markings/shepherd + name = "Shepherd" + icon_state = "shepherd" + gender_specific = 1 + +/datum/sprite_accessory/mam_body_markings/tiger + name = "Tiger Stripes" color_src = MUTCOLORS3 + icon_state = "tiger" + +/datum/sprite_accessory/mam_body_markings/wolf + name = "Wolf" + icon_state = "wolf" + color_src = MUTCOLORS2 + gender_specific = 1 /****************************************** ************ Taur Bodies ****************** *******************************************/ /datum/sprite_accessory/taur - icon = 'icons/mob/special/mam_taur.dmi' - extra_icon = 'icons/mob/special/mam_taur.dmi' + icon = 'icons/mob/mam_taur.dmi' + extra_icon = 'icons/mob/mam_taur.dmi' extra = 1 - extra2_icon = 'icons/mob/special/mam_taur.dmi' + extra2_icon = 'icons/mob/mam_taur.dmi' extra2 = 1 center = TRUE dimension_x = 64 @@ -540,13 +543,29 @@ name = "None" icon_state = "None" -/datum/sprite_accessory/taur/panther - name = "Panther" - icon_state = "panther" +/datum/sprite_accessory/taur/cow + name = "Cow" + icon_state = "cow" -/datum/sprite_accessory/taur/tajaran - name = "Tajaran" - icon_state = "tajaran" +/datum/sprite_accessory/taur/drake + name = "Drake" + icon_state = "drake" + +/datum/sprite_accessory/taur/drider + name = "Drider" + icon_state = "drider" + +/datum/sprite_accessory/taur/eevee + name = "Eevee" + icon_state = "eevee" + +/datum/sprite_accessory/taur/fox + name = "Fox" + icon_state = "fox" + +/datum/sprite_accessory/taur/husky + name = "Husky" + icon_state = "husky" /datum/sprite_accessory/taur/horse name = "Horse" @@ -556,26 +575,6 @@ name = "Lab" icon_state = "lab" -/datum/sprite_accessory/taur/shepherd - name = "Shepherd" - icon_state = "shepherd" - -/datum/sprite_accessory/taur/husky - name = "Husky" - icon_state = "husky" - -/datum/sprite_accessory/taur/cow - name = "Cow" - icon_state = "cow" - -/datum/sprite_accessory/taur/fox - name = "Fox" - icon_state = "fox" - -/datum/sprite_accessory/taur/wolf - name = "Wolf" - icon_state = "wolf" - /datum/sprite_accessory/taur/naga name = "Naga" icon_state = "naga" @@ -584,17 +583,21 @@ name = "Otie" icon_state = "otie" -/datum/sprite_accessory/taur/drake - name = "Drake" - icon_state = "drake" +/datum/sprite_accessory/taur/panther + name = "Panther" + icon_state = "panther" -/datum/sprite_accessory/taur/drider - name = "Drider" - icon_state = "drider" - -/datum/sprite_accessory/taur/eevee - name = "Eevee" - icon_state = "eevee" +/datum/sprite_accessory/taur/shepherd + name = "Shepherd" + icon_state = "shepherd" + +/datum/sprite_accessory/taur/tajaran + name = "Tajaran" + icon_state = "tajaran" + +/datum/sprite_accessory/taur/wolf + name = "Wolf" + icon_state = "wolf" /****************************************** *************** Ayyliums ****************** diff --git a/icons/mob/tail.dmi b/icons/mob/citadel_refs/cit_tail_reference.dmi similarity index 100% rename from icons/mob/tail.dmi rename to icons/mob/citadel_refs/cit_tail_reference.dmi diff --git a/icons/mob/wing.dmi b/icons/mob/citadel_refs/cit_wings.dmi similarity index 100% rename from icons/mob/wing.dmi rename to icons/mob/citadel_refs/cit_wings.dmi diff --git a/icons/mob/citadel_refs/datashark_parts.dmi b/icons/mob/citadel_refs/datashark_parts.dmi new file mode 100644 index 0000000000..35a422964a Binary files /dev/null and b/icons/mob/citadel_refs/datashark_parts.dmi differ diff --git a/icons/mob/special/furry_parts_greyscale.dmi b/icons/mob/citadel_refs/furry_parts_greyscale.dmi similarity index 100% rename from icons/mob/special/furry_parts_greyscale.dmi rename to icons/mob/citadel_refs/furry_parts_greyscale.dmi diff --git a/icons/mob/special/furryrace.dmi b/icons/mob/citadel_refs/furryrace_references.dmi similarity index 100% rename from icons/mob/special/furryrace.dmi rename to icons/mob/citadel_refs/furryrace_references.dmi diff --git a/icons/mob/special/furrytail.dmi b/icons/mob/citadel_refs/furrytail_references.dmi similarity index 100% rename from icons/mob/special/furrytail.dmi rename to icons/mob/citadel_refs/furrytail_references.dmi diff --git a/icons/mob/special/taur.dmi b/icons/mob/citadel_refs/taur_referencesVOREbellies.dmi similarity index 100% rename from icons/mob/special/taur.dmi rename to icons/mob/citadel_refs/taur_referencesVOREbellies.dmi diff --git a/icons/mob/special/mam_body_markings.dmi b/icons/mob/mam_body_markings.dmi similarity index 54% rename from icons/mob/special/mam_body_markings.dmi rename to icons/mob/mam_body_markings.dmi index 445ff322c2..07fe5b841f 100644 Binary files a/icons/mob/special/mam_body_markings.dmi and b/icons/mob/mam_body_markings.dmi differ diff --git a/icons/mob/mam_bodyparts.dmi b/icons/mob/mam_bodyparts.dmi index 06dcd6dce5..5011c4d0ed 100644 Binary files a/icons/mob/mam_bodyparts.dmi and b/icons/mob/mam_bodyparts.dmi differ diff --git a/icons/mob/special/mam_taur.dmi b/icons/mob/mam_taur.dmi similarity index 100% rename from icons/mob/special/mam_taur.dmi rename to icons/mob/mam_taur.dmi diff --git a/icons/mob/special/furry_parts.dmi b/icons/mob/special/furry_parts.dmi deleted file mode 100644 index 5007739a52..0000000000 Binary files a/icons/mob/special/furry_parts.dmi and /dev/null differ diff --git a/icons/mob/special/mutant_bodyparts.dmi b/icons/mob/special/mutant_bodyparts.dmi deleted file mode 100644 index 423c93b4ff..0000000000 Binary files a/icons/mob/special/mutant_bodyparts.dmi and /dev/null differ diff --git a/icons/mob/special/sub_species.dmi b/icons/mob/special/sub_species.dmi deleted file mode 100644 index ae833a4c28..0000000000 Binary files a/icons/mob/special/sub_species.dmi and /dev/null differ