diff --git a/code/modules/mob/dead/new_player/sprite_accessories/tails.dm b/code/modules/mob/dead/new_player/sprite_accessories/tails.dm index edf5515f2..750f5a17d 100644 --- a/code/modules/mob/dead/new_player/sprite_accessories/tails.dm +++ b/code/modules/mob/dead/new_player/sprite_accessories/tails.dm @@ -540,14 +540,6 @@ name = "Axolotl" icon_state = "axolotl" -/datum/sprite_accessory/mam_tails/bee - name = "Bee" - icon_state = "bee" - -/datum/sprite_accessory/mam_tails_animated/bee - name = "Bee" - icon_state = "bee" - /datum/sprite_accessory/mam_tails/cat name = "Cat" icon_state = "cat" @@ -648,14 +640,6 @@ name = "Husky" icon_state = "husky" -datum/sprite_accessory/mam_tails/insect - name = "Insect" - icon_state = "insect" - -/datum/sprite_accessory/mam_tails_animated/insect - name = "Insect" - icon_state = "insect" - /datum/sprite_accessory/mam_tails/kangaroo name = "kangaroo" icon_state = "kangaroo" diff --git a/hyperstation/code/modules/mob/dead/new_player/sprite_accessories.dm b/hyperstation/code/modules/mob/dead/new_player/sprite_accessories.dm index 7827b3e4a..c10a97d10 100644 --- a/hyperstation/code/modules/mob/dead/new_player/sprite_accessories.dm +++ b/hyperstation/code/modules/mob/dead/new_player/sprite_accessories.dm @@ -16,7 +16,6 @@ of the code are from TG, don't use those. keep everything in alphabetical order, please! */ - // TODO: code it so that we don't have to type in "icon = 'hyperstation/icons/mob/etc'" // manually for hyperstation parts @@ -74,18 +73,80 @@ EARS ========================================================== */ +/datum/sprite_accessory/mam_ears/faceant // sarcoph @ hyperstation, march 2022 + name = "Face Antennae (Hyper)" + icon_state = "faceant" + icon = 'hyperstation/icons/mob/char_ears.dmi' + recommended_species = list("insect") + +/datum/sprite_accessory/mam_ears/faceant2 // sarcoph @ hyperstation, march 2022 + name = "Face Antennae 2 (Hyper)" + icon_state = "faceant2" + icon = 'hyperstation/icons/mob/char_ears.dmi' + recommended_species = list("insect") + /datum/sprite_accessory/mam_ears/moth - name = "Moth (Hyper)" + name = "Moth Antennae (Hyper)" icon_state = "moth" icon = 'hyperstation/icons/mob/char_ears.dmi' recommended_species = list("insect") +/datum/sprite_accessory/mam_ears/plumeant // sarcoph @ hyperstation, march 2022 + name = "Plume Antennae (Hyper)" + icon_state = "plumeant" + icon = 'hyperstation/icons/mob/char_ears.dmi' + recommended_species = list("insect") + +/datum/sprite_accessory/mam_ears/roundant // sarcoph @ hyperstation, march 2022 + name = "Round Antennae (Hyper)" + icon_state = "roundant" + icon = 'hyperstation/icons/mob/char_ears.dmi' + recommended_species = list("insect") + +/datum/sprite_accessory/mam_ears/thinant // sarcoph @ hyperstation, march 2022 + name = "Thin Antennae (Hyper)" + icon_state = "thinant" + icon = 'hyperstation/icons/mob/char_ears.dmi' + recommended_species = list("insect") + /* WINGS ========================================================== */ +/datum/sprite_accessory/deco_wings/beetle // sarcoph @ hyperstation, march 2022 + name = "Beetle (Hyper)" + icon_state = "beetle" + icon = 'hyperstation/icons/mob/char_wings.dmi' + +/datum/sprite_accessory/moth_wings/beetle + name = "Beetle (Hyper)" + icon_state = "beetle" + icon = 'hyperstation/icons/mob/char_wings.dmi' + +/datum/sprite_accessory/deco_wings/beetle2 // sarcoph @ hyperstation, march 2022 + name = "Beetle - 2-toned (Hyper)" + icon_state = "beetle2" + icon = 'hyperstation/icons/mob/char_wings.dmi' + color_src = MATRIXED + +/datum/sprite_accessory/moth_wings/beetle2 + name = "Beetle - 2-toned (Hyper)" + icon_state = "beetle2" + icon = 'hyperstation/icons/mob/char_wings.dmi' + color_src = MATRIXED + +/datum/sprite_accessory/deco_wings/insect // sarcoph @ hyperstation, march 2022 + name = "Insect (Hyper)" + icon_state = "insect" + icon = 'hyperstation/icons/mob/char_wings.dmi' + +/datum/sprite_accessory/moth_wings/insect + name = "Insect (Hyper)" + icon_state = "insect" + icon = 'hyperstation/icons/mob/char_wings.dmi' + /datum/sprite_accessory/deco_wings/minibat // sarcoph @ hyperstation, march 2022 name = "Mini Bat (Hyper)" icon_state = "minibat" @@ -112,24 +173,72 @@ TAILS + ANIMATED TAILS ========================================================== */ +/datum/sprite_accessory/mam_tails/bee // sarcoph @ hyperstation, march 2022 + name = "Bee (Hyper)" + icon_state = "bee" + icon = 'hyperstation/icons/mob/char_tails.dmi' + recommended_species = list("insect") + +/datum/sprite_accessory/mam_tails_animated/bee + name = "Bee (Hyper)" + icon_state = "bee" + icon = 'hyperstation/icons/mob/char_tails.dmi' + recommended_species = list("insect") + +/datum/sprite_accessory/mam_tails/bee2 // sarcoph @ hyperstation, march 2022 + name = "Bee w/ Stinger (Hyper)" + icon_state = "bee2" + icon = 'hyperstation/icons/mob/char_tails.dmi' + recommended_species = list("insect") + +/datum/sprite_accessory/mam_tails_animated/bee2 + name = "Bee w/ Stinger (Hyper)" + icon_state = "bee2" + icon = 'hyperstation/icons/mob/char_tails.dmi' + recommended_species = list("insect") + // "fan" bird tail, short /datum/sprite_accessory/mam_tails/shorthawk // sarcoph @ hyperstation, jan 2022 name = "Hawk - Short (Hyper)" icon_state = "shorthawk" icon = 'hyperstation/icons/mob/char_tails.dmi' -/datum/sprite_accessory/mam_tails_animated/shorthawk // sarcoph @ hyperstation, jan 2022 +/datum/sprite_accessory/mam_tails_animated/shorthawk name = "Hawk - Short (Hyper)" icon_state = "shorthawk" icon = 'hyperstation/icons/mob/char_tails.dmi' +/datum/sprite_accessory/mam_tails/insect // sarcoph @ hyperstation, march 2022 + name = "Insect (Hyper)" + icon_state = "insect" + icon = 'hyperstation/icons/mob/char_tails.dmi' + recommended_species = list("insect") + +/datum/sprite_accessory/mam_tails_animated/insect + name = "Insect (Hyper)" + icon_state = "insect" + icon = 'hyperstation/icons/mob/char_tails.dmi' + recommended_species = list("insect") + +/datum/sprite_accessory/mam_tails/bug2tone // sarcoph @ hyperstation, march 2022 + name = "Insect - 2-tone (Hyper)" + icon_state = "bug2tone" + icon = 'hyperstation/icons/mob/char_tails.dmi' + recommended_species = list("insect") + +/datum/sprite_accessory/mam_tails_animated/bug2tone + name = "Insect - 2-tone (Hyper)" + icon_state = "bug2tone" + icon = 'hyperstation/icons/mob/char_tails.dmi' + recommended_species = list("insect") + // "narrow" bird tail, long /datum/sprite_accessory/mam_tails/longpigeon // sarcoph @ hyperstation, jan 2022 name = "Pigeon - Long (Hyper)" icon_state = "longpigeon" icon = 'hyperstation/icons/mob/char_tails.dmi' -/datum/sprite_accessory/mam_tails_animated/longpigeon // sarcoph @ hyperstation, jan 2022 +/datum/sprite_accessory/mam_tails_animated/longpigeon name = "Pigeon - Long (Hyper)" icon_state = "longpigeon" icon = 'hyperstation/icons/mob/char_tails.dmi' @@ -140,7 +249,7 @@ TAILS + ANIMATED TAILS icon_state = "shortpigeon" icon = 'hyperstation/icons/mob/char_tails.dmi' -/datum/sprite_accessory/mam_tails_animated/shortpigeon // sarcoph @ hyperstation, jan 2022 +/datum/sprite_accessory/mam_tails_animated/shortpigeon name = "Pigeon - Short (Hyper)" icon_state = "shortpigeon" icon = 'hyperstation/icons/mob/char_tails.dmi' @@ -151,7 +260,7 @@ TAILS + ANIMATED TAILS icon_state = "swallow" icon = 'hyperstation/icons/mob/char_tails.dmi' -/datum/sprite_accessory/mam_tails_animated/swallow // sarcoph @ hyperstation, jan 2022 +/datum/sprite_accessory/mam_tails_animated/swallow name = "Swallow (Hyper)" icon_state = "swallow" icon = 'hyperstation/icons/mob/char_tails.dmi' @@ -162,7 +271,7 @@ TAILS + ANIMATED TAILS icon_state = "swallowstriped" icon = 'hyperstation/icons/mob/char_tails.dmi' -/datum/sprite_accessory/mam_tails_animated/swallowstriped // sarcoph @ hyperstation, jan 2022 +/datum/sprite_accessory/mam_tails_animated/swallowstriped name = "Swallow - Striped (Hyper)" icon_state = "swallowstriped" icon = 'hyperstation/icons/mob/char_tails.dmi' @@ -184,10 +293,35 @@ from modular_citadel/code/modules/mob/dead/new_player/sprite_accessories.dm: recommended_species = list("mammal", "xeno", "slimeperson", "podweak", "avian", "aquatic") */ -// /datum/sprite_accessory/mam_body_markings/empty -// name = "None (Hyper)" -// icon_state = "empty" -// icon = 'modular_citadel/icons/mob/markings_notmammals.dmi' +/datum/sprite_accessory/mam_body_markings/bee // sarcoph @ hyperstation, march 2022 + name = "Bee (Hyper)" + icon_state = "bee" + icon = 'hyperstation/icons/mob/char_markings.dmi' + recommended_species = list("insect") + +/datum/sprite_accessory/mam_body_markings/bee_fluff // sarcoph @ hyperstation, march 2022 + name = "Bee - Fluffy (Hyper)" + icon_state = "bee_fluff" + icon = 'hyperstation/icons/mob/char_markings.dmi' + recommended_species = list("insect") + +/datum/sprite_accessory/mam_body_markings/bug3tone // sarcoph @ hyperstation, march 2022 + name = "Beetle - 3-tone (Hyper)" + icon_state = "bug3tone" + icon = 'hyperstation/icons/mob/char_markings.dmi' + recommended_species = list("insect") + +/datum/sprite_accessory/mam_body_markings/moth // sarcoph @ hyperstation, jan 2022 + name = "Moth (Hyper)" + icon_state = "moth" + icon = 'hyperstation/icons/mob/char_markings.dmi' + recommended_species = list("insect") + +/datum/sprite_accessory/mam_body_markings/empty + name = "None (Hyper)" + icon_state = "empty" + recommended_species = list("podweak", /*"mammal",*/ "avian", "aquatic", "insect", "xeno", "synthliz", "slimeperson") + // mammals are cursed to no empty markings until they get their heads fixed. /datum/sprite_accessory/mam_body_markings/pigeon // sarcoph @ hyperstation, jan 2022 name = "Pigeon (Hyper)" diff --git a/hyperstation/icons/mob/char_ears.dmi b/hyperstation/icons/mob/char_ears.dmi index 9aa62d51a..26709be52 100644 Binary files a/hyperstation/icons/mob/char_ears.dmi and b/hyperstation/icons/mob/char_ears.dmi differ diff --git a/hyperstation/icons/mob/char_markings.dmi b/hyperstation/icons/mob/char_markings.dmi index d65a7b363..f38c1db49 100644 Binary files a/hyperstation/icons/mob/char_markings.dmi and b/hyperstation/icons/mob/char_markings.dmi differ diff --git a/hyperstation/icons/mob/char_snouts.dmi b/hyperstation/icons/mob/char_snouts.dmi index 16b495023..c7ad9dca1 100644 Binary files a/hyperstation/icons/mob/char_snouts.dmi and b/hyperstation/icons/mob/char_snouts.dmi differ diff --git a/hyperstation/icons/mob/char_tails.dmi b/hyperstation/icons/mob/char_tails.dmi index 41923b940..c9faf1b2e 100644 Binary files a/hyperstation/icons/mob/char_tails.dmi and b/hyperstation/icons/mob/char_tails.dmi differ diff --git a/hyperstation/icons/mob/char_wings.dmi b/hyperstation/icons/mob/char_wings.dmi index 8bdcd0f0d..2a7b34cf1 100644 Binary files a/hyperstation/icons/mob/char_wings.dmi and b/hyperstation/icons/mob/char_wings.dmi differ diff --git a/modular_citadel/code/modules/mob/dead/new_player/sprite_accessories.dm b/modular_citadel/code/modules/mob/dead/new_player/sprite_accessories.dm index 83f8235ae..f5cde2ef0 100644 --- a/modular_citadel/code/modules/mob/dead/new_player/sprite_accessories.dm +++ b/modular_citadel/code/modules/mob/dead/new_player/sprite_accessories.dm @@ -1326,14 +1326,6 @@ datum/sprite_accessory/ears/human/gret name = "Axolotl" icon_state = "axolotl" -/datum/sprite_accessory/mam_tails/bee - name = "Bee" - icon_state = "bee" - -/datum/sprite_accessory/mam_tails_animated/bee - name = "Bee" - icon_state = "bee" - /datum/sprite_accessory/mam_tails/cat name = "Cat" icon_state = "cat" @@ -1426,14 +1418,6 @@ datum/sprite_accessory/ears/human/gret name = "Husky" icon_state = "husky" -datum/sprite_accessory/mam_tails/insect - name = "Insect" - icon_state = "insect" - -/datum/sprite_accessory/mam_tails_animated/insect - name = "Insect" - icon_state = "insect" - /datum/sprite_accessory/mam_tails/kangaroo name = "kangaroo" icon_state = "kangaroo" @@ -1629,11 +1613,6 @@ datum/sprite_accessory/mam_tails/insect name = "Abdominals Three-Tones" icon_state = "absarms" -/datum/sprite_accessory/mam_body_markings/bee - name = "Bee" - icon_state = "bee" - icon = 'modular_citadel/icons/mob/markings_notmammals.dmi' - /datum/sprite_accessory/mam_body_markings/belly name = "Belly" icon_state = "belly" @@ -1714,11 +1693,6 @@ datum/sprite_accessory/mam_tails/insect name = "Lab" icon_state = "lab" -/datum/sprite_accessory/mam_body_markings/moth - name = "Moth" - icon_state = "moth" - icon = 'modular_citadel/icons/mob/markings_notmammals.dmi' - /datum/sprite_accessory/mam_body_markings/otie name = "Otie" icon_state = "otie" diff --git a/modular_citadel/code/modules/mob/living/carbon/human/species_types/furrypeople.dm b/modular_citadel/code/modules/mob/living/carbon/human/species_types/furrypeople.dm index d1a52b52f..2aa99b95a 100644 --- a/modular_citadel/code/modules/mob/living/carbon/human/species_types/furrypeople.dm +++ b/modular_citadel/code/modules/mob/living/carbon/human/species_types/furrypeople.dm @@ -149,8 +149,8 @@ icon_limbs = DEFAULT_BODYPART_ICON_CITADEL species_traits = list(MUTCOLORS,EYECOLOR,LIPS,HAIR) inherent_biotypes = MOB_ORGANIC|MOB_HUMANOID|MOB_BUG - mutant_bodyparts = list("mam_ears", "mam_body_markings", "mam_tail", "taur", "moth_wings","moth_markings", "mam_snouts", "moth_fluff") - default_features = list("mcolor" = "FFF","mcolor2" = "FFF","mcolor3" = "FFF", "mam_tail" = "None", "mam_ears" = "None", "moth_wings" = "Plain","moth_markings" = "None", "mam_snouts" = "Bug", "mam_body_markings" = "Moth", "taur" = "None", "moth_fluff" = "Plain") + mutant_bodyparts = list("mam_ears", "mam_body_markings", "mam_tail", "taur", "moth_wings","moth_markings", "mam_snouts", "moth_fluff", "legs") + default_features = list("mcolor" = "FFF","mcolor2" = "FFF","mcolor3" = "FFF", "mam_tail" = "None", "mam_ears" = "None", "moth_wings" = "Plain","moth_markings" = "None", "mam_snouts" = "Bug", "mam_body_markings" = "Moth", "taur" = "None", "moth_fluff" = "Plain", "legs" = "Normal Legs") attack_verb = "flutter" //wat? attack_sound = 'sound/weapons/slash.ogg' miss_sound = 'sound/weapons/slashmiss.ogg' diff --git a/modular_citadel/icons/mob/markings_notmammals.dmi b/modular_citadel/icons/mob/markings_notmammals.dmi index 1075b20e6..98df59d2b 100644 Binary files a/modular_citadel/icons/mob/markings_notmammals.dmi and b/modular_citadel/icons/mob/markings_notmammals.dmi differ diff --git a/modular_citadel/icons/mob/mutant_bodyparts.dmi b/modular_citadel/icons/mob/mutant_bodyparts.dmi index 72c1c8355..b4fad43ba 100644 Binary files a/modular_citadel/icons/mob/mutant_bodyparts.dmi and b/modular_citadel/icons/mob/mutant_bodyparts.dmi differ