diff --git a/hyperstation/code/modules/mob/dead/new_player/sprite_accessories.dm b/hyperstation/code/modules/mob/dead/new_player/sprite_accessories.dm new file mode 100644 index 000000000..03f2874f7 --- /dev/null +++ b/hyperstation/code/modules/mob/dead/new_player/sprite_accessories.dm @@ -0,0 +1,150 @@ +/* +from modular_citadel/code/modules/mob/dead/new_player/sprite_accessories.dm: +/datum/sprite_accessory + var/extra = FALSE + var/extra_color_src = MUTCOLORS2 //The color source for the extra overlay. + var/extra2 = FALSE + var/extra_icon = 'modular_citadel/icons/mob/mam_tails.dmi' + var/extra2_icon = 'modular_citadel/icons/mob/mam_tails.dmi' + var/extra2_color_src = MUTCOLORS3 + var/list/ckeys_allowed + +we use the "citadel" versions of mutant/species parts, which usually (but not always) +begins with "mam_" somewhere. stuff that's built for only humans/lizards in other parts +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 + + +/* +SNOUTS +========================================================== +*/ + + +/* +EARS +========================================================== +*/ + + +/* +TAILS + ANIMATED TAILS +========================================================== +*/ + +// "fan" bird tail, short +/datum/sprite_accessory/mam_tails/shorthawk + name = "Hawk - Short" + icon_state = "shorthawk" + icon = 'hyperstation/icons/mob/char_tails.dmi' + +/datum/sprite_accessory/mam_tails_animated/shorthawk + name = "Hawk - Short" + icon_state = "shorthawk" + icon = 'hyperstation/icons/mob/char_tails.dmi' + +// "narrow" bird tail, long +/datum/sprite_accessory/mam_tails/longpigeon + name = "Pigeon - Long" + icon_state = "longpigeon" + icon = 'hyperstation/icons/mob/char_tails.dmi' + +/datum/sprite_accessory/mam_tails_animated/longpigeon + name = "Pigeon - Long" + icon_state = "longpigeon" + icon = 'hyperstation/icons/mob/char_tails.dmi' + +// "narrow" bird tail, short +/datum/sprite_accessory/mam_tails/shortpigeon + name = "Pigeon - Short" + icon_state = "shortpigeon" + icon = 'hyperstation/icons/mob/char_tails.dmi' + +/datum/sprite_accessory/mam_tails_animated/shortpigeon + name = "Pigeon - Short" + icon_state = "shortpigeon" + icon = 'hyperstation/icons/mob/char_tails.dmi' + +// "forked" bird tail, long +/datum/sprite_accessory/mam_tails/swallow + name = "Swallow" + icon_state = "swallow" + icon = 'hyperstation/icons/mob/char_tails.dmi' + +/datum/sprite_accessory/mam_tails_animated/swallow + name = "Swallow" + icon_state = "swallow" + icon = 'hyperstation/icons/mob/char_tails.dmi' + +// forked bird tail, long; special stripe markings +/datum/sprite_accessory/mam_tails/swallowstriped + name = "Swallow - Striped" + icon_state = "swallowstriped" + icon = 'hyperstation/icons/mob/char_tails.dmi' + +/datum/sprite_accessory/mam_tails_animated/swallowstriped + name = "Swallow - Striped" + icon_state = "swallowstriped" + icon = 'hyperstation/icons/mob/char_tails.dmi' + + +/* +BODY MARKINGS +========================================================== +*/ + +/* +from modular_citadel/code/modules/mob/dead/new_player/sprite_accessories.dm: +/datum/sprite_accessory/mam_body_markings + extra = FALSE + extra2 = FALSE + color_src = MATRIXED + gender_specific = 0 + icon = 'modular_citadel/icons/mob/mam_markings.dmi' + recommended_species = list("mammal", "xeno", "slimeperson", "podweak", "avian", "aquatic") +*/ + +/datum/sprite_accessory/mam_body_markings/pigeon + name = "Pigeon" + icon_state = "pigeon" + icon = 'hyperstation/icons/mob/char_markings.dmi' + recommended_species = list("avian") + +/datum/sprite_accessory/mam_body_markings/shrike + name = "Shrike" + icon_state = "shrike" + icon = 'hyperstation/icons/mob/char_markings.dmi' + recommended_species = list("avian") + + +/* +TAUR BODIES +========================================================== +*/ + +/* +from modular_citadel/code/modules/mob/dead/new_player/sprite_accessories.dm: +/datum/sprite_accessory/taur + icon = 'modular_citadel/icons/mob/mam_taur.dmi' + extra_icon = 'modular_citadel/icons/mob/mam_taur.dmi' + extra = TRUE + extra2_icon = 'modular_citadel/icons/mob/mam_taur.dmi' + extra2 = TRUE + center = TRUE + dimension_x = 64 + var/taur_mode = NOT_TAURIC + color_src = MATRIXED + recommended_species = list("human", "lizard", "insect", "mammal", "xeno", "jelly", "slimeperson", "podweak", "avian", "aquatic") +*/ + + +/* +HAIRSTYLES +========================================================== +*/ \ No newline at end of file diff --git a/hyperstation/icons/mob/char_markings.dmi b/hyperstation/icons/mob/char_markings.dmi new file mode 100644 index 000000000..d65a7b363 Binary files /dev/null and b/hyperstation/icons/mob/char_markings.dmi differ diff --git a/hyperstation/icons/mob/char_tails.dmi b/hyperstation/icons/mob/char_tails.dmi new file mode 100644 index 000000000..41923b940 Binary files /dev/null and b/hyperstation/icons/mob/char_tails.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 7247c9758..83f8235ae 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 @@ -1407,14 +1407,6 @@ datum/sprite_accessory/ears/human/gret /datum/sprite_accessory/mam_tails_animated/hawk name = "Hawk" icon_state = "hawk" - -/datum/sprite_accessory/mam_tails/shorthawk - name = "Hawk - Short" - icon_state = "shorthawk" - -/datum/sprite_accessory/mam_tails_animated/shorthawk - name = "Hawk - Short" - icon_state = "shorthawk" /datum/sprite_accessory/mam_tails/horse name = "Horse" @@ -1490,22 +1482,6 @@ datum/sprite_accessory/mam_tails/insect name = "Orca" icon_state = "orca" -/datum/sprite_accessory/mam_tails/longpigeon - name = "Pigeon - Long" - icon_state = "longpigeon" - -/datum/sprite_accessory/mam_tails_animated/longpigeon - name = "Pigeon - Long" - icon_state = "longpigeon" - -/datum/sprite_accessory/mam_tails/shortpigeon - name = "Pigeon - Short" - icon_state = "shortpigeon" - -/datum/sprite_accessory/mam_tails_animated/shortpigeon - name = "Pigeon - Short" - icon_state = "shortpigeon" - /datum/sprite_accessory/mam_tails/pede name = "Scolipede" icon_state = "pede" @@ -1759,11 +1735,6 @@ datum/sprite_accessory/mam_tails/insect name = "Panther" icon_state = "panther" -/datum/sprite_accessory/mam_body_markings/pigeon - name = "Pigeon" - icon_state = "pigeon" - recommended_species = list("avian") - /datum/sprite_accessory/mam_body_markings/possum name = "Possum" icon_state = "possum" diff --git a/modular_citadel/icons/mob/mam_markings.dmi b/modular_citadel/icons/mob/mam_markings.dmi index a91827106..f4195d7ba 100644 Binary files a/modular_citadel/icons/mob/mam_markings.dmi and b/modular_citadel/icons/mob/mam_markings.dmi differ diff --git a/modular_citadel/icons/mob/mam_tails.dmi b/modular_citadel/icons/mob/mam_tails.dmi index 21681a168..583772d84 100644 Binary files a/modular_citadel/icons/mob/mam_tails.dmi and b/modular_citadel/icons/mob/mam_tails.dmi differ diff --git a/tgstation.dme b/tgstation.dme index d467faa45..eacff3297 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -3157,6 +3157,7 @@ #include "hyperstation\code\modules\mining\shelters.dm" #include "hyperstation\code\modules\mining\equipment\survival_pod.dm" #include "hyperstation\code\modules\mob\mob_helpers.dm" +#include "hyperstation\code\modules\mob\dead\new_player\sprite_accessories.dm" #include "hyperstation\code\modules\mob\living\status_indicators.dm" #include "hyperstation\code\modules\mob\living\silicon\robot\robot.dm" #include "hyperstation\code\modules\mob\living\silicon\robot\robot_modules.dm"