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..6cb8054b5 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 @@ -184,10 +183,23 @@ 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 + name = "Bee (Hyper)" + icon_state = "bee" + 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..556ad1e96 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..e44e5b3e2 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..2221cf3e1 100644 Binary files a/hyperstation/icons/mob/char_snouts.dmi and b/hyperstation/icons/mob/char_snouts.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..7019b92d7 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 @@ -1629,11 +1629,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 +1709,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..b01ab27eb 100644 Binary files a/modular_citadel/icons/mob/mutant_bodyparts.dmi and b/modular_citadel/icons/mob/mutant_bodyparts.dmi differ