diff --git a/code/modules/mob/living/carbon/human/human_update_icons.dm b/code/modules/mob/living/carbon/human/human_update_icons.dm index a659e842dffe7..eaf538367dbdc 100644 --- a/code/modules/mob/living/carbon/human/human_update_icons.dm +++ b/code/modules/mob/living/carbon/human/human_update_icons.dm @@ -393,7 +393,7 @@ There are several things that need to be remembered: var/icon_file = 'icons/mob/clothing/head/default.dmi' // BANDASTATION EDIT START - SPECIES CLOTHING ICONS var/list/icon_files_species = list( - "vulpkanin" = 'modular_bandastation/species/icons/mob/species/clothing/head.dmi', + "vulpkanin" = 'modular_bandastation/species/icons/mob/species/vulpkanin/clothing/head.dmi', ) var/mutant_override = FALSE @@ -462,7 +462,7 @@ There are several things that need to be remembered: var/icon_file = DEFAULT_SUIT_FILE // BANDASTATION EDIT START - SPECIES CLOTHING ICONS var/list/icon_files_species = list( - "vulpkanin" = 'modular_bandastation/species/icons/mob/species/clothing/suit.dmi', + "vulpkanin" = 'modular_bandastation/species/icons/mob/species/vulpkanin/clothing/suit.dmi', ) var/mutant_override = FALSE @@ -532,7 +532,7 @@ There are several things that need to be remembered: var/icon_file = 'icons/mob/clothing/mask.dmi' var/list/icon_files_species = list( - "vulpkanin" = 'modular_bandastation/species/icons/mob/species/clothing/mask.dmi', + "vulpkanin" = 'modular_bandastation/species/icons/mob/species/vulpkanin/clothing/mask.dmi', ) var/mutant_override = FALSE diff --git a/modular_bandastation/customization/_customization.dm b/modular_bandastation/customization/_customization.dm new file mode 100644 index 0000000000000..9e04905b5985d --- /dev/null +++ b/modular_bandastation/customization/_customization.dm @@ -0,0 +1,4 @@ +/datum/modpack/customization + name = "Cutomization" + desc = "Кастомизация персонажей." + author = "dj-34, Dekupich" diff --git a/modular_bandastation/customization/_customization.dme b/modular_bandastation/customization/_customization.dme new file mode 100644 index 0000000000000..c75c74d2d6f2b --- /dev/null +++ b/modular_bandastation/customization/_customization.dme @@ -0,0 +1,3 @@ +#include "_customization.dm" + +#include "code/sprite_accessories/hair.dm" diff --git a/modular_bandastation/hair/code/hair.dm b/modular_bandastation/customization/code/sprite_accessories/hair.dm similarity index 53% rename from modular_bandastation/hair/code/hair.dm rename to modular_bandastation/customization/code/sprite_accessories/hair.dm index 0197bd1c281c1..a81b4c2287a2d 100644 --- a/modular_bandastation/hair/code/hair.dm +++ b/modular_bandastation/customization/code/sprite_accessories/hair.dm @@ -1,124 +1,124 @@ /datum/sprite_accessory/hair/afropuffleft name = "Afropuff Left" - icon = 'modular_bandastation/hair/icons/human_face.dmi' + icon = 'modular_bandastation/customization/icons/sprite_accessories/hair.dmi' icon_state = "hair_afropuffleft" /datum/sprite_accessory/hair/afropuffright name = "Afropuff Rigt" - icon = 'modular_bandastation/hair/icons/human_face.dmi' + icon = 'modular_bandastation/customization/icons/sprite_accessories/hair.dmi' icon_state = "hair_afropuffright" /datum/sprite_accessory/hair/baum name = "Baum" - icon = 'modular_bandastation/hair/icons/human_face.dmi' + icon = 'modular_bandastation/customization/icons/sprite_accessories/hair.dmi' icon_state = "hair_baum" /datum/sprite_accessory/hair/cotton name = "Cotton" - icon = 'modular_bandastation/hair/icons/human_face.dmi' + icon = 'modular_bandastation/customization/icons/sprite_accessories/hair.dmi' icon_state = "hair_cotton" /datum/sprite_accessory/hair/cottonalt name = "Cotton Alt" - icon = 'modular_bandastation/hair/icons/human_face.dmi' + icon = 'modular_bandastation/customization/icons/sprite_accessories/hair.dmi' icon_state = "hair_cottonalt" /datum/sprite_accessory/hair/flipped name = "Flipped" - icon = 'modular_bandastation/hair/icons/human_face.dmi' + icon = 'modular_bandastation/customization/icons/sprite_accessories/hair.dmi' icon_state = "hair_flipped" /datum/sprite_accessory/hair/froofy name = "Froofy" - icon = 'modular_bandastation/hair/icons/human_face.dmi' + icon = 'modular_bandastation/customization/icons/sprite_accessories/hair.dmi' icon_state = "hair_froofy" /datum/sprite_accessory/hair/frontbraids name = "Long Braids" - icon = 'modular_bandastation/hair/icons/human_face.dmi' + icon = 'modular_bandastation/customization/icons/sprite_accessories/hair.dmi' icon_state = "hair_frontbraids" /datum/sprite_accessory/hair/glammetal name = "Glammetal" - icon = 'modular_bandastation/hair/icons/human_face.dmi' + icon = 'modular_bandastation/customization/icons/sprite_accessories/hair.dmi' icon_state = "hair_glammetal" /datum/sprite_accessory/hair/inari name = "Inari" - icon = 'modular_bandastation/hair/icons/human_face.dmi' + icon = 'modular_bandastation/customization/icons/sprite_accessories/hair.dmi' icon_state = "hair_inari" /datum/sprite_accessory/hair/kisaragi name = "Kisaragi" - icon = 'modular_bandastation/hair/icons/human_face.dmi' + icon = 'modular_bandastation/customization/icons/sprite_accessories/hair.dmi' icon_state = "hair_kisaragi" /datum/sprite_accessory/hair/longbuns name = "Long Buns" - icon = 'modular_bandastation/hair/icons/human_face.dmi' + icon = 'modular_bandastation/customization/icons/sprite_accessories/hair.dmi' icon_state = "hair_longbuns" /datum/sprite_accessory/hair/longstraighttwintails name = "Long Twintails" - icon = 'modular_bandastation/hair/icons/human_face.dmi' + icon = 'modular_bandastation/customization/icons/sprite_accessories/hair.dmi' icon_state = "hair_longstraighttwintails" /datum/sprite_accessory/hair/longwavy name = "Long Wavy" - icon = 'modular_bandastation/hair/icons/human_face.dmi' + icon = 'modular_bandastation/customization/icons/sprite_accessories/hair.dmi' icon_state = "hair_longwavy" /datum/sprite_accessory/hair/ponytail6 name = "Ponytail Strict" - icon = 'modular_bandastation/hair/icons/human_face.dmi' + icon = 'modular_bandastation/customization/icons/sprite_accessories/hair.dmi' icon_state = "hair_ponytail6" /datum/sprite_accessory/hair/quadcurls name = "Quadcurls" - icon = 'modular_bandastation/hair/icons/human_face.dmi' + icon = 'modular_bandastation/customization/icons/sprite_accessories/hair.dmi' icon_state = "hair_quadcurls" /datum/sprite_accessory/hair/rockstar name = "Rockstar" - icon = 'modular_bandastation/hair/icons/human_face.dmi' + icon = 'modular_bandastation/customization/icons/sprite_accessories/hair.dmi' icon_state = "hair_rockstar" /datum/sprite_accessory/hair/stacy name = "Stacy" - icon = 'modular_bandastation/hair/icons/human_face.dmi' + icon = 'modular_bandastation/customization/icons/sprite_accessories/hair.dmi' icon_state = "hair_stacy" /datum/sprite_accessory/hair/shorttassles name = "Short Tassles" - icon = 'modular_bandastation/hair/icons/human_face.dmi' + icon = 'modular_bandastation/customization/icons/sprite_accessories/hair.dmi' icon_state = "hair_shorttassles" /datum/sprite_accessory/hair/supernova name = "Supernova" - icon = 'modular_bandastation/hair/icons/human_face.dmi' + icon = 'modular_bandastation/customization/icons/sprite_accessories/hair.dmi' icon_state = "hair_supernova" /datum/sprite_accessory/hair/tribum name = "Tri-bun" - icon = 'modular_bandastation/hair/icons/human_face.dmi' + icon = 'modular_bandastation/customization/icons/sprite_accessories/hair.dmi' icon_state = "hair_tribun" /datum/sprite_accessory/hair/twintail name = "Twintails" - icon = 'modular_bandastation/hair/icons/human_face.dmi' + icon = 'modular_bandastation/customization/icons/sprite_accessories/hair.dmi' icon_state = "hair_twintail" /datum/sprite_accessory/hair/unkempt name = "Unkempt" - icon = 'modular_bandastation/hair/icons/human_face.dmi' + icon = 'modular_bandastation/customization/icons/sprite_accessories/hair.dmi' icon_state = "hair_unkempt" /datum/sprite_accessory/hair/verylongtails name = "Very Long Twintails" - icon = 'modular_bandastation/hair/icons/human_face.dmi' + icon = 'modular_bandastation/customization/icons/sprite_accessories/hair.dmi' icon_state = "hair_verylongtails" /datum/sprite_accessory/hair/vivi name = "Vivi" - icon = 'modular_bandastation/hair/icons/human_face.dmi' + icon = 'modular_bandastation/customization/icons/sprite_accessories/hair.dmi' icon_state = "hair_vivi" diff --git a/modular_bandastation/hair/icons/human_face.dmi b/modular_bandastation/customization/icons/sprite_accessories/hair.dmi similarity index 100% rename from modular_bandastation/hair/icons/human_face.dmi rename to modular_bandastation/customization/icons/sprite_accessories/hair.dmi diff --git a/modular_bandastation/hair/_hair.dm b/modular_bandastation/hair/_hair.dm deleted file mode 100644 index 0932a8390130d..0000000000000 --- a/modular_bandastation/hair/_hair.dm +++ /dev/null @@ -1,4 +0,0 @@ -/datum/modpack/hair - name = "Прически" - desc = "Добавляет новые прически" - author = "Dekupich" diff --git a/modular_bandastation/hair/_hair.dme b/modular_bandastation/hair/_hair.dme deleted file mode 100644 index dfed7522c732a..0000000000000 --- a/modular_bandastation/hair/_hair.dme +++ /dev/null @@ -1,3 +0,0 @@ -#include "_hair.dm" - -#include "code/hair.dm" diff --git a/modular_bandastation/modular_bandastation.dme b/modular_bandastation/modular_bandastation.dme index ce0ebd54a1de4..e0d19e63e5c8d 100644 --- a/modular_bandastation/modular_bandastation.dme +++ b/modular_bandastation/modular_bandastation.dme @@ -15,13 +15,13 @@ #include "balance/_balance.dme" #include "barsigns/_barsigns.dme" #include "communication/_communication.dme" +#include "customization/_customization.dme" #include "cyrillic_fixes/_cyrillic_fixes.dme" #include "database220/_database220.dme" #include "discord/_discord.dme" #include "emote_panel/_emote_panel.dme" #include "examine_panel/_examine_panel.dme" #include "gunhud/_gunhud.dme" -#include "hair/_hair.dme" #include "jobs/_jobs.dme" #include "keybinding/_keybinding.dme" #include "loadout/_loadout.dme" diff --git a/modular_bandastation/species/_species.dm b/modular_bandastation/species/_species.dm index 969e303c13547..91bc465e9c9b3 100644 --- a/modular_bandastation/species/_species.dm +++ b/modular_bandastation/species/_species.dm @@ -1,4 +1,4 @@ /datum/modpack/species name = "Species" desc = "Добавление архитектуры для новых видов и конфигурирования существующих." - author = "nlaysi, Podvaldeda" + author = "Nlaysi, Podvaldeda" diff --git a/modular_bandastation/species/_species.dme b/modular_bandastation/species/_species.dme index de2c508736e2a..2b94891fbd827 100644 --- a/modular_bandastation/species/_species.dme +++ b/modular_bandastation/species/_species.dme @@ -1,21 +1,23 @@ #include "_species.dm" #include "code/_defines.dm" -#include "code/language.dm" #include "code/dna.dm" +#include "code/language.dm" -#include "code/lizardperson/sprite_accesories/hair.dm" -#include "code/human/carbon.dm" -#include "code/human/sprite_accessories/vulpkanin.dm" +#include "code/clothing/items.dm" +#include "code/clothing/mod.dm" + +#include "code/human/species/skills.dm" #include "code/human/species_type/vulpkanin.dm" #include "code/human/sprite_accessories/hair.dm" -#include "code/human/species/species.dm" -#include "code/surgery/organs/external/vulpkanin_external.dm" -#include "code/surgery/organs/internal/vulpkanin_internal.dm" -#include "code/surgery/organs/limbgrower_designs.dm" +#include "code/human/sprite_accessories/vulpkanin.dm" +#include "code/human/carbon.dm" + #include "code/preferences/species_features/vulpkanin.dm" -#include "code/surgery/bodyparts/vulpkanin_bodyparts.dm" + #include "code/reagents/mutation.dm" -#include "code/clothing/items.dm" -#include "code/clothing/mod.dm" +#include "code/surgery/bodyparts/vulpkanin_bodyparts.dm" +#include "code/surgery/organs/external/vulpkanin_external.dm" +#include "code/surgery/organs/internal/vulpkanin_internal.dm" +#include "code/surgery/organs/limbgrower_designs.dm" diff --git a/modular_bandastation/species/code/clothing/items.dm b/modular_bandastation/species/code/clothing/items.dm index d9ea9808e0ef1..b102841a7b2bd 100644 --- a/modular_bandastation/species/code/clothing/items.dm +++ b/modular_bandastation/species/code/clothing/items.dm @@ -3,25 +3,25 @@ /obj/item/clothing/head/mod worn_icon_species = list( - SPECIES_VULPKANIN = 'modular_bandastation/species/icons/mob/species/clothing/vulp_modsuits.dmi', + SPECIES_VULPKANIN = 'modular_bandastation/species/icons/mob/species/vulpkanin/clothing/modsuits.dmi', ) /obj/item/clothing/suit/mod worn_icon_species = list( - SPECIES_VULPKANIN = 'modular_bandastation/species/icons/mob/species/clothing/vulp_modsuits.dmi', + SPECIES_VULPKANIN = 'modular_bandastation/species/icons/mob/species/vulpkanin/clothing/modsuits.dmi', ) /obj/item/mod/module worn_icon_species = list( - SPECIES_VULPKANIN = 'modular_bandastation/species/icons/mob/species/clothing/modules_vulp.dmi', + SPECIES_VULPKANIN = 'modular_bandastation/species/icons/mob/species/vulpkanin/clothing/modules.dmi', ) /obj/item/clothing/suit worn_icon_species = list( - SPECIES_VULPKANIN = 'modular_bandastation/species/icons/mob/species/clothing/suit.dmi', + SPECIES_VULPKANIN = 'modular_bandastation/species/icons/mob/species/vulpkanin/clothing/suit.dmi', ) /obj/item/clothing/head worn_icon_species = list( - SPECIES_VULPKANIN = 'modular_bandastation/species/icons/mob/species/clothing/head.dmi', + SPECIES_VULPKANIN = 'modular_bandastation/species/icons/mob/species/vulpkanin/clothing/head.dmi', ) diff --git a/modular_bandastation/species/code/emote.dm b/modular_bandastation/species/code/emote.dm deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/modular_bandastation/species/code/human/species/species.dm b/modular_bandastation/species/code/human/species/skills.dm similarity index 99% rename from modular_bandastation/species/code/human/species/species.dm rename to modular_bandastation/species/code/human/species/skills.dm index 7f66c4a1ae3da..a03708f723c0e 100644 --- a/modular_bandastation/species/code/human/species/species.dm +++ b/modular_bandastation/species/code/human/species/skills.dm @@ -1,6 +1,7 @@ #define GET_ATOM_SHIFF_FINGERPRINTS(atom) atom.forensics?.fingerprints #define GET_ATOM_SHIFF_BLOOD_DNA(atom) atom.forensics?.blood_DNA +// MARK: Vulpkanin skills /datum/action/cooldown/sniff name = "Вынюхать" desc = "Вы обнюхиваете предмет и определяете, кто с ним взаимодействовал. Также, вы можете запомнить запах определённого человека, обнюхав его." diff --git a/modular_bandastation/species/code/human/sprite_accessories/hair.dm b/modular_bandastation/species/code/human/sprite_accessories/hair.dm index 60b64661a8e6b..ac08dd142140d 100644 --- a/modular_bandastation/species/code/human/sprite_accessories/hair.dm +++ b/modular_bandastation/species/code/human/sprite_accessories/hair.dm @@ -1,7 +1,6 @@ -/// VULPKANIN HAIR - +// MARK: Vulpkanin hair /datum/sprite_accessory/hair/vulpkanin - icon = 'modular_bandastation/species/icons/mob/species/vulpkanin/hair.dmi' + icon = 'modular_bandastation/species/icons/mob/species/vulpkanin/sprite_accessories/hair.dmi' /datum/sprite_accessory/hair/vulpkanin/vulp_hair_kajam name = "Kajam" @@ -87,3 +86,121 @@ /datum/sprite_accessory/hair/vulpkanin/vulp_hair_clean_cut name = "Clean Cut" icon_state = "clean_cut" + +// MARK: Lizardperson hair +// Frills +/datum/sprite_accessory/frills/divinity + name = "Divinity" + icon = 'modular_bandastation/species/icons/mob/species/lizardperson/sprite_accessories/frills.dmi' + icon_state = "divinity" + +/datum/sprite_accessory/frills/horns + name = "Horns" + icon = 'modular_bandastation/species/icons/mob/species/lizardperson/sprite_accessories/frills.dmi' + icon_state = "horns" + +/datum/sprite_accessory/frills/hornsdouble + name = "Horns Double" + icon = 'modular_bandastation/species/icons/mob/species/lizardperson/sprite_accessories/frills.dmi' + icon_state = "hornsdouble" + +/datum/sprite_accessory/frills/big + name = "Big" + icon = 'modular_bandastation/species/icons/mob/species/lizardperson/sprite_accessories/frills.dmi' + icon_state = "big" + +/datum/sprite_accessory/frills/cobrahood + name = "Cobrahood" + icon = 'modular_bandastation/species/icons/mob/species/lizardperson/sprite_accessories/frills.dmi' + icon_state = "cobrahood" + +/datum/sprite_accessory/frills/cobraears + name = "Cobraears" + icon = 'modular_bandastation/species/icons/mob/species/lizardperson/sprite_accessories/frills.dmi' + icon_state = "cobraears" + +/datum/sprite_accessory/frills/neck + name = "Neck" + icon = 'modular_bandastation/species/icons/mob/species/lizardperson/sprite_accessories/frills.dmi' + icon_state = "neck" + +/datum/sprite_accessory/frills/neckfull + name = "Neck Full" + icon = 'modular_bandastation/species/icons/mob/species/lizardperson/sprite_accessories/frills.dmi' + icon_state = "neckfull" + +/datum/sprite_accessory/frills/cobraslim + name = "Cobraslim" + icon = 'modular_bandastation/species/icons/mob/species/lizardperson/sprite_accessories/frills.dmi' + icon_state = "cobraslim" + +// Horns +/datum/sprite_accessory/horns/guilmon + name = "Guilmon" + icon = 'modular_bandastation/species/icons/mob/species/lizardperson/sprite_accessories/horns.dmi' + icon_state = "guilmon" + +/datum/sprite_accessory/horns/drake + name = "Drake" + icon = 'modular_bandastation/species/icons/mob/species/lizardperson/sprite_accessories/horns.dmi' + icon_state = "drake" + +/datum/sprite_accessory/horns/knight + name = "Knight" + icon = 'modular_bandastation/species/icons/mob/species/lizardperson/sprite_accessories/horns.dmi' + icon_state = "knight" + +/datum/sprite_accessory/horns/uni + name = "Uni" + icon = 'modular_bandastation/species/icons/mob/species/lizardperson/sprite_accessories/horns.dmi' + icon_state = "uni" + +/datum/sprite_accessory/horns/oni + name = "Oni" + icon = 'modular_bandastation/species/icons/mob/species/lizardperson/sprite_accessories/horns.dmi' + icon_state = "oni" + +/datum/sprite_accessory/horns/onilarge + name = "Oni Large" + icon = 'modular_bandastation/species/icons/mob/species/lizardperson/sprite_accessories/horns.dmi' + icon_state = "onilarge" + +/datum/sprite_accessory/horns/broken + name = "Broken" + icon = 'modular_bandastation/species/icons/mob/species/lizardperson/sprite_accessories/horns.dmi' + icon_state = "broken" + +/datum/sprite_accessory/horns/rbroken + name = "Right Broken" + icon = 'modular_bandastation/species/icons/mob/species/lizardperson/sprite_accessories/horns.dmi' + icon_state = "rbroken" + +/datum/sprite_accessory/horns/lbroken + name = "Left Broken" + icon = 'modular_bandastation/species/icons/mob/species/lizardperson/sprite_accessories/horns.dmi' + icon_state = "lbroken" + +/datum/sprite_accessory/horns/dragon + name = "Dragon" + icon = 'modular_bandastation/species/icons/mob/species/lizardperson/sprite_accessories/horns.dmi' + icon_state = "dragon" + +/datum/sprite_accessory/horns/lifted + name = "Lifted" + icon = 'modular_bandastation/species/icons/mob/species/lizardperson/sprite_accessories/horns.dmi' + icon_state = "lifted" + +/datum/sprite_accessory/horns/newcurly + name = "New Curly" + icon = 'modular_bandastation/species/icons/mob/species/lizardperson/sprite_accessories/horns.dmi' + icon_state = "newcurly" + +/datum/sprite_accessory/horns/upwardshorns + name = "Upwards Horns" + icon = 'modular_bandastation/species/icons/mob/species/lizardperson/sprite_accessories/horns.dmi' + icon_state = "upwardshorns" + +/datum/sprite_accessory/horns/sideswept + name = "Side Swept" + icon = 'modular_bandastation/species/icons/mob/species/lizardperson/sprite_accessories/horns.dmi' + icon_state = "sideswept" diff --git a/modular_bandastation/species/code/human/sprite_accessories/vulpkanin.dm b/modular_bandastation/species/code/human/sprite_accessories/vulpkanin.dm index 286cc1327e570..0ac44a41c709d 100644 --- a/modular_bandastation/species/code/human/sprite_accessories/vulpkanin.dm +++ b/modular_bandastation/species/code/human/sprite_accessories/vulpkanin.dm @@ -15,7 +15,7 @@ return /datum/sprite_accessory/vulpkanin_body_markings - icon = 'modular_bandastation/species/icons/mob/species/vulpkanin/body_markings.dmi' + icon = 'modular_bandastation/species/icons/mob/species/vulpkanin/sprite_accessories/body_markings.dmi' name = "None" icon_state = "none" color_src = "vulpkanin_body_markings_color" @@ -66,7 +66,7 @@ // TAIL /datum/sprite_accessory/tails/vulpkanin - icon = 'modular_bandastation/species/icons/mob/species/vulpkanin/body_accessory.dmi' + icon = 'modular_bandastation/species/icons/mob/species/vulpkanin/sprite_accessories/body_accessory.dmi' spine_key = "vulpkanin" /datum/sprite_accessory/tails/vulpkanin/fluffy @@ -88,7 +88,7 @@ // HEAD ACCESSORY /datum/sprite_accessory/vulpkanin_head_accessories - icon = 'modular_bandastation/species/icons/mob/species/vulpkanin/facial_hair.dmi' + icon = 'modular_bandastation/species/icons/mob/species/vulpkanin/sprite_accessories/facial_hair.dmi' name = "None" icon_state = "none" color_src = "vulpkanin_head_accessories_color" @@ -130,12 +130,12 @@ icon_state = "swift" /datum/sprite_accessory/vulpkanin_head_accessories/vulp_nose - icon = 'modular_bandastation/species/icons/mob/species/vulpkanin/head_markings.dmi' + icon = 'modular_bandastation/species/icons/mob/species/vulpkanin/sprite_accessories/head_markings.dmi' name = "Vulpkanin Nose" icon_state = "nose" /datum/sprite_accessory/vulpkanin_head_accessories/vulp_nose2 - icon = 'modular_bandastation/species/icons/mob/species/vulpkanin/head_markings.dmi' + icon = 'modular_bandastation/species/icons/mob/species/vulpkanin/sprite_accessories/head_markings.dmi' name = "Vulpkanin Nose Alt." icon_state = "nose_alt" @@ -150,7 +150,7 @@ // HEAD MARKINGS /datum/sprite_accessory/vulpkanin_head_markings - icon = 'modular_bandastation/species/icons/mob/species/vulpkanin/head_markings.dmi' + icon = 'modular_bandastation/species/icons/mob/species/vulpkanin/sprite_accessories/head_markings.dmi' name = "None" icon_state = "none" color_src = "vulpkanin_head_markings_color" @@ -190,7 +190,7 @@ // FACIAL HAIR /datum/sprite_accessory/vulpkanin_facial_hair - icon = 'modular_bandastation/species/icons/mob/species/vulpkanin/facial_hair.dmi' + icon = 'modular_bandastation/species/icons/mob/species/vulpkanin/sprite_accessories/facial_hair.dmi' name = "None" icon_state = "none" color_src = "vulpkanin_facial_hair_color" @@ -246,7 +246,7 @@ // TAIL MARKINGS /datum/sprite_accessory/vulpkanin_tail_markings - icon = 'modular_bandastation/species/icons/mob/species/vulpkanin/tail_markings.dmi' + icon = 'modular_bandastation/species/icons/mob/species/vulpkanin/sprite_accessories/tail_markings.dmi' name = "None" icon_state = "none" em_block = TRUE diff --git a/modular_bandastation/species/code/lizardperson/sprite_accesories/hair.dm b/modular_bandastation/species/code/lizardperson/sprite_accesories/hair.dm deleted file mode 100644 index bbf5f33f31797..0000000000000 --- a/modular_bandastation/species/code/lizardperson/sprite_accesories/hair.dm +++ /dev/null @@ -1,116 +0,0 @@ -// MARK: Frills -/datum/sprite_accessory/frills/divinity - name = "Divinity" - icon = 'modular_bandastation/species/icons/lizardperson/frills.dmi' - icon_state = "divinity" - -/datum/sprite_accessory/frills/horns - name = "Horns" - icon = 'modular_bandastation/species/icons/lizardperson/frills.dmi' - icon_state = "horns" - -/datum/sprite_accessory/frills/hornsdouble - name = "Horns Double" - icon = 'modular_bandastation/species/icons/lizardperson/frills.dmi' - icon_state = "hornsdouble" - -/datum/sprite_accessory/frills/big - name = "Big" - icon = 'modular_bandastation/species/icons/lizardperson/frills.dmi' - icon_state = "big" - -/datum/sprite_accessory/frills/cobrahood - name = "Cobrahood" - icon = 'modular_bandastation/species/icons/lizardperson/frills.dmi' - icon_state = "cobrahood" - -/datum/sprite_accessory/frills/cobraears - name = "Cobraears" - icon = 'modular_bandastation/species/icons/lizardperson/frills.dmi' - icon_state = "cobraears" - -/datum/sprite_accessory/frills/neck - name = "Neck" - icon = 'modular_bandastation/species/icons/lizardperson/frills.dmi' - icon_state = "neck" - -/datum/sprite_accessory/frills/neckfull - name = "Neck Full" - icon = 'modular_bandastation/species/icons/lizardperson/frills.dmi' - icon_state = "neckfull" - -/datum/sprite_accessory/frills/cobraslim - name = "Cobraslim" - icon = 'modular_bandastation/species/icons/lizardperson/frills.dmi' - icon_state = "cobraslim" - -// MARK: Horns -/datum/sprite_accessory/horns/guilmon - name = "Guilmon" - icon = 'modular_bandastation/species/icons/lizardperson/horns.dmi' - icon_state = "guilmon" - -/datum/sprite_accessory/horns/drake - name = "Drake" - icon = 'modular_bandastation/species/icons/lizardperson/horns.dmi' - icon_state = "drake" - -/datum/sprite_accessory/horns/knight - name = "Knight" - icon = 'modular_bandastation/species/icons/lizardperson/horns.dmi' - icon_state = "knight" - -/datum/sprite_accessory/horns/uni - name = "Uni" - icon = 'modular_bandastation/species/icons/lizardperson/horns.dmi' - icon_state = "uni" - -/datum/sprite_accessory/horns/oni - name = "Oni" - icon = 'modular_bandastation/species/icons/lizardperson/horns.dmi' - icon_state = "oni" - -/datum/sprite_accessory/horns/onilarge - name = "Oni Large" - icon = 'modular_bandastation/species/icons/lizardperson/horns.dmi' - icon_state = "onilarge" - -/datum/sprite_accessory/horns/broken - name = "Broken" - icon = 'modular_bandastation/species/icons/lizardperson/horns.dmi' - icon_state = "broken" - -/datum/sprite_accessory/horns/rbroken - name = "Right Broken" - icon = 'modular_bandastation/species/icons/lizardperson/horns.dmi' - icon_state = "rbroken" - -/datum/sprite_accessory/horns/lbroken - name = "Left Broken" - icon = 'modular_bandastation/species/icons/lizardperson/horns.dmi' - icon_state = "lbroken" - -/datum/sprite_accessory/horns/dragon - name = "Dragon" - icon = 'modular_bandastation/species/icons/lizardperson/horns.dmi' - icon_state = "dragon" - -/datum/sprite_accessory/horns/lifted - name = "Lifted" - icon = 'modular_bandastation/species/icons/lizardperson/horns.dmi' - icon_state = "lifted" - -/datum/sprite_accessory/horns/newcurly - name = "New Curly" - icon = 'modular_bandastation/species/icons/lizardperson/horns.dmi' - icon_state = "newcurly" - -/datum/sprite_accessory/horns/upwardshorns - name = "Upwards Horns" - icon = 'modular_bandastation/species/icons/lizardperson/horns.dmi' - icon_state = "upwardshorns" - -/datum/sprite_accessory/horns/sideswept - name = "Side Swept" - icon = 'modular_bandastation/species/icons/lizardperson/horns.dmi' - icon_state = "sideswept" diff --git a/modular_bandastation/species/code/preferences/species_features/vulpkanin.dm b/modular_bandastation/species/code/preferences/species_features/vulpkanin.dm index 72b6754f11edf..093270f016fe5 100644 --- a/modular_bandastation/species/code/preferences/species_features/vulpkanin.dm +++ b/modular_bandastation/species/code/preferences/species_features/vulpkanin.dm @@ -19,13 +19,13 @@ var/static/icon/body if (isnull(body)) body = icon('icons/blanks/32x32.dmi', "nothing") - body.Blend(icon('modular_bandastation/species/icons/mob/species/vulpkanin/body.dmi', "vulpkanin_chest_m"), ICON_OVERLAY) - body.Blend(icon('modular_bandastation/species/icons/mob/species/vulpkanin/body.dmi', "vulpkanin_l_leg"), ICON_OVERLAY) - body.Blend(icon('modular_bandastation/species/icons/mob/species/vulpkanin/body.dmi', "vulpkanin_r_leg"), ICON_OVERLAY) - body.Blend(icon('modular_bandastation/species/icons/mob/species/vulpkanin/body.dmi', "vulpkanin_l_arm"), ICON_OVERLAY) - body.Blend(icon('modular_bandastation/species/icons/mob/species/vulpkanin/body.dmi', "vulpkanin_r_arm"), ICON_OVERLAY) - body.Blend(icon('modular_bandastation/species/icons/mob/species/vulpkanin/body.dmi', "vulpkanin_l_hand"), ICON_OVERLAY) - body.Blend(icon('modular_bandastation/species/icons/mob/species/vulpkanin/body.dmi', "vulpkanin_r_hand"), ICON_OVERLAY) + body.Blend(icon('modular_bandastation/species/icons/mob/species/vulpkanin/sprite_accessories/body.dmi', "vulpkanin_chest_m"), ICON_OVERLAY) + body.Blend(icon('modular_bandastation/species/icons/mob/species/vulpkanin/sprite_accessories/body.dmi', "vulpkanin_l_leg"), ICON_OVERLAY) + body.Blend(icon('modular_bandastation/species/icons/mob/species/vulpkanin/sprite_accessories/body.dmi', "vulpkanin_r_leg"), ICON_OVERLAY) + body.Blend(icon('modular_bandastation/species/icons/mob/species/vulpkanin/sprite_accessories/body.dmi', "vulpkanin_l_arm"), ICON_OVERLAY) + body.Blend(icon('modular_bandastation/species/icons/mob/species/vulpkanin/sprite_accessories/body.dmi', "vulpkanin_r_arm"), ICON_OVERLAY) + body.Blend(icon('modular_bandastation/species/icons/mob/species/vulpkanin/sprite_accessories/body.dmi', "vulpkanin_l_hand"), ICON_OVERLAY) + body.Blend(icon('modular_bandastation/species/icons/mob/species/vulpkanin/sprite_accessories/body.dmi', "vulpkanin_r_hand"), ICON_OVERLAY) body.Blend(COLOR_ORANGE, ICON_MULTIPLY) var/datum/sprite_accessory/markings = SSaccessories.vulpkanin_body_markings_list[value] @@ -99,14 +99,14 @@ var/static/icon/body if (isnull(body)) body = icon('icons/blanks/32x32.dmi', "nothing") - body.Blend(icon('modular_bandastation/species/icons/mob/species/vulpkanin/body.dmi', "vulpkanin_head_m"), ICON_OVERLAY) - body.Blend(icon('modular_bandastation/species/icons/mob/species/vulpkanin/body.dmi', "vulpkanin_chest_m"), ICON_OVERLAY) - body.Blend(icon('modular_bandastation/species/icons/mob/species/vulpkanin/body.dmi', "vulpkanin_l_leg"), ICON_OVERLAY) - body.Blend(icon('modular_bandastation/species/icons/mob/species/vulpkanin/body.dmi', "vulpkanin_r_leg"), ICON_OVERLAY) - body.Blend(icon('modular_bandastation/species/icons/mob/species/vulpkanin/body.dmi', "vulpkanin_l_arm"), ICON_OVERLAY) - body.Blend(icon('modular_bandastation/species/icons/mob/species/vulpkanin/body.dmi', "vulpkanin_r_arm"), ICON_OVERLAY) - body.Blend(icon('modular_bandastation/species/icons/mob/species/vulpkanin/body.dmi', "vulpkanin_l_hand"), ICON_OVERLAY) - body.Blend(icon('modular_bandastation/species/icons/mob/species/vulpkanin/body.dmi', "vulpkanin_r_hand"), ICON_OVERLAY) + body.Blend(icon('modular_bandastation/species/icons/mob/species/vulpkanin/sprite_accessories/body.dmi', "vulpkanin_head_m"), ICON_OVERLAY) + body.Blend(icon('modular_bandastation/species/icons/mob/species/vulpkanin/sprite_accessories/body.dmi', "vulpkanin_chest_m"), ICON_OVERLAY) + body.Blend(icon('modular_bandastation/species/icons/mob/species/vulpkanin/sprite_accessories/body.dmi', "vulpkanin_l_leg"), ICON_OVERLAY) + body.Blend(icon('modular_bandastation/species/icons/mob/species/vulpkanin/sprite_accessories/body.dmi', "vulpkanin_r_leg"), ICON_OVERLAY) + body.Blend(icon('modular_bandastation/species/icons/mob/species/vulpkanin/sprite_accessories/body.dmi', "vulpkanin_l_arm"), ICON_OVERLAY) + body.Blend(icon('modular_bandastation/species/icons/mob/species/vulpkanin/sprite_accessories/body.dmi', "vulpkanin_r_arm"), ICON_OVERLAY) + body.Blend(icon('modular_bandastation/species/icons/mob/species/vulpkanin/sprite_accessories/body.dmi', "vulpkanin_l_hand"), ICON_OVERLAY) + body.Blend(icon('modular_bandastation/species/icons/mob/species/vulpkanin/sprite_accessories/body.dmi', "vulpkanin_r_hand"), ICON_OVERLAY) body.Blend(COLOR_ORANGE, ICON_MULTIPLY) var/datum/sprite_accessory/markings = SSaccessories.vulpkanin_head_markings_list[value] @@ -167,12 +167,12 @@ var/static/icon/body if (isnull(body)) body = icon('icons/blanks/32x32.dmi', "nothing") - body.Blend(icon('modular_bandastation/species/icons/mob/species/vulpkanin/body.dmi', "vulpkanin_head_m"), ICON_OVERLAY) - body.Blend(icon('modular_bandastation/species/icons/mob/species/vulpkanin/body.dmi', "vulpkanin_chest_m"), ICON_OVERLAY) - body.Blend(icon('modular_bandastation/species/icons/mob/species/vulpkanin/body.dmi', "vulpkanin_l_arm"), ICON_OVERLAY) - body.Blend(icon('modular_bandastation/species/icons/mob/species/vulpkanin/body.dmi', "vulpkanin_r_arm"), ICON_OVERLAY) - body.Blend(icon('modular_bandastation/species/icons/mob/species/vulpkanin/body.dmi', "vulpkanin_l_hand"), ICON_OVERLAY) - body.Blend(icon('modular_bandastation/species/icons/mob/species/vulpkanin/body.dmi', "vulpkanin_r_hand"), ICON_OVERLAY) + body.Blend(icon('modular_bandastation/species/icons/mob/species/vulpkanin/sprite_accessories/body.dmi', "vulpkanin_head_m"), ICON_OVERLAY) + body.Blend(icon('modular_bandastation/species/icons/mob/species/vulpkanin/sprite_accessories/body.dmi', "vulpkanin_chest_m"), ICON_OVERLAY) + body.Blend(icon('modular_bandastation/species/icons/mob/species/vulpkanin/sprite_accessories/body.dmi', "vulpkanin_l_arm"), ICON_OVERLAY) + body.Blend(icon('modular_bandastation/species/icons/mob/species/vulpkanin/sprite_accessories/body.dmi', "vulpkanin_r_arm"), ICON_OVERLAY) + body.Blend(icon('modular_bandastation/species/icons/mob/species/vulpkanin/sprite_accessories/body.dmi', "vulpkanin_l_hand"), ICON_OVERLAY) + body.Blend(icon('modular_bandastation/species/icons/mob/species/vulpkanin/sprite_accessories/body.dmi', "vulpkanin_r_hand"), ICON_OVERLAY) body.Blend(COLOR_ORANGE, ICON_MULTIPLY) var/datum/sprite_accessory/markings = SSaccessories.vulpkanin_head_accessories_list[value] @@ -233,7 +233,7 @@ var/datum/sprite_accessory/markings = SSaccessories.vulpkanin_facial_hair_list[value] var/static/icon/head_icon if (isnull(head_icon)) - head_icon = icon('modular_bandastation/species/icons/mob/species/vulpkanin/body.dmi', "vulpkanin_head_m") + head_icon = icon('modular_bandastation/species/icons/mob/species/vulpkanin/sprite_accessories/body.dmi', "vulpkanin_head_m") head_icon.Blend(COLOR_ORANGE, ICON_MULTIPLY) var/icon/final_icon = new(head_icon) diff --git a/modular_bandastation/species/code/surgery/bodyparts/vulpkanin_bodyparts.dm b/modular_bandastation/species/code/surgery/bodyparts/vulpkanin_bodyparts.dm index e96adcc5f59dd..c3dd01a7da1e7 100644 --- a/modular_bandastation/species/code/surgery/bodyparts/vulpkanin_bodyparts.dm +++ b/modular_bandastation/species/code/surgery/bodyparts/vulpkanin_bodyparts.dm @@ -1,12 +1,12 @@ /obj/item/bodypart/head/vulpkanin - icon_greyscale = 'modular_bandastation/species/icons/mob/species/vulpkanin/body.dmi' + icon_greyscale = 'modular_bandastation/species/icons/mob/species/vulpkanin/sprite_accessories/body.dmi' limb_id = SPECIES_VULPKANIN is_dimorphic = TRUE head_flags = HEAD_LIPS|HEAD_EYESPRITES|HEAD_EYECOLOR|HEAD_EYEHOLES|HEAD_DEBRAIN|HEAD_HAIR|HEAD_VULPKANIN species_bodytype = SPECIES_VULPKANIN /obj/item/bodypart/chest/vulpkanin - icon_greyscale = 'modular_bandastation/species/icons/mob/species/vulpkanin/body.dmi' + icon_greyscale = 'modular_bandastation/species/icons/mob/species/vulpkanin/sprite_accessories/body.dmi' limb_id = SPECIES_VULPKANIN is_dimorphic = TRUE wing_types = list(/obj/item/organ/wings/functional/dragon) @@ -16,7 +16,7 @@ return BUTT_SPRITE_VULPKANIN /obj/item/bodypart/arm/left/vulpkanin - icon_greyscale = 'modular_bandastation/species/icons/mob/species/vulpkanin/body.dmi' + icon_greyscale = 'modular_bandastation/species/icons/mob/species/vulpkanin/sprite_accessories/body.dmi' limb_id = SPECIES_VULPKANIN unarmed_attack_verbs = list("slash") grappled_attack_verb = "lacerate" @@ -25,7 +25,7 @@ unarmed_miss_sound = 'sound/items/weapons/slashmiss.ogg' /obj/item/bodypart/arm/right/vulpkanin - icon_greyscale = 'modular_bandastation/species/icons/mob/species/vulpkanin/body.dmi' + icon_greyscale = 'modular_bandastation/species/icons/mob/species/vulpkanin/sprite_accessories/body.dmi' limb_id = SPECIES_VULPKANIN unarmed_attack_verbs = list("slash") grappled_attack_verb = "lacerate" @@ -34,9 +34,9 @@ unarmed_miss_sound = 'sound/items/weapons/slashmiss.ogg' /obj/item/bodypart/leg/left/vulpkanin - icon_greyscale = 'modular_bandastation/species/icons/mob/species/vulpkanin/body.dmi' + icon_greyscale = 'modular_bandastation/species/icons/mob/species/vulpkanin/sprite_accessories/body.dmi' limb_id = SPECIES_VULPKANIN /obj/item/bodypart/leg/right/vulpkanin - icon_greyscale = 'modular_bandastation/species/icons/mob/species/vulpkanin/body.dmi' + icon_greyscale = 'modular_bandastation/species/icons/mob/species/vulpkanin/sprite_accessories/body.dmi' limb_id = SPECIES_VULPKANIN diff --git a/modular_bandastation/species/icons/lizardperson/frills.dmi b/modular_bandastation/species/icons/mob/species/lizardperson/sprite_accessories/frills.dmi similarity index 100% rename from modular_bandastation/species/icons/lizardperson/frills.dmi rename to modular_bandastation/species/icons/mob/species/lizardperson/sprite_accessories/frills.dmi diff --git a/modular_bandastation/species/icons/lizardperson/horns.dmi b/modular_bandastation/species/icons/mob/species/lizardperson/sprite_accessories/horns.dmi similarity index 100% rename from modular_bandastation/species/icons/lizardperson/horns.dmi rename to modular_bandastation/species/icons/mob/species/lizardperson/sprite_accessories/horns.dmi diff --git a/modular_bandastation/species/icons/mob/species/clothing/head.dmi b/modular_bandastation/species/icons/mob/species/vulpkanin/clothing/head.dmi similarity index 100% rename from modular_bandastation/species/icons/mob/species/clothing/head.dmi rename to modular_bandastation/species/icons/mob/species/vulpkanin/clothing/head.dmi diff --git a/modular_bandastation/species/icons/mob/species/clothing/mask.dmi b/modular_bandastation/species/icons/mob/species/vulpkanin/clothing/mask.dmi similarity index 100% rename from modular_bandastation/species/icons/mob/species/clothing/mask.dmi rename to modular_bandastation/species/icons/mob/species/vulpkanin/clothing/mask.dmi diff --git a/modular_bandastation/species/icons/mob/species/clothing/vulp_modsuits.dmi b/modular_bandastation/species/icons/mob/species/vulpkanin/clothing/modsuits.dmi similarity index 100% rename from modular_bandastation/species/icons/mob/species/clothing/vulp_modsuits.dmi rename to modular_bandastation/species/icons/mob/species/vulpkanin/clothing/modsuits.dmi diff --git a/modular_bandastation/species/icons/mob/species/clothing/modules_vulp.dmi b/modular_bandastation/species/icons/mob/species/vulpkanin/clothing/modules.dmi similarity index 100% rename from modular_bandastation/species/icons/mob/species/clothing/modules_vulp.dmi rename to modular_bandastation/species/icons/mob/species/vulpkanin/clothing/modules.dmi diff --git a/modular_bandastation/species/icons/mob/species/clothing/suit.dmi b/modular_bandastation/species/icons/mob/species/vulpkanin/clothing/suit.dmi similarity index 100% rename from modular_bandastation/species/icons/mob/species/clothing/suit.dmi rename to modular_bandastation/species/icons/mob/species/vulpkanin/clothing/suit.dmi diff --git a/modular_bandastation/species/icons/mob/species/vulpkanin/body.dmi b/modular_bandastation/species/icons/mob/species/vulpkanin/sprite_accessories/body.dmi similarity index 100% rename from modular_bandastation/species/icons/mob/species/vulpkanin/body.dmi rename to modular_bandastation/species/icons/mob/species/vulpkanin/sprite_accessories/body.dmi diff --git a/modular_bandastation/species/icons/mob/species/vulpkanin/body_accessory.dmi b/modular_bandastation/species/icons/mob/species/vulpkanin/sprite_accessories/body_accessory.dmi similarity index 100% rename from modular_bandastation/species/icons/mob/species/vulpkanin/body_accessory.dmi rename to modular_bandastation/species/icons/mob/species/vulpkanin/sprite_accessories/body_accessory.dmi diff --git a/modular_bandastation/species/icons/mob/species/vulpkanin/body_markings.dmi b/modular_bandastation/species/icons/mob/species/vulpkanin/sprite_accessories/body_markings.dmi similarity index 100% rename from modular_bandastation/species/icons/mob/species/vulpkanin/body_markings.dmi rename to modular_bandastation/species/icons/mob/species/vulpkanin/sprite_accessories/body_markings.dmi diff --git a/modular_bandastation/species/icons/mob/species/vulpkanin/facial_hair.dmi b/modular_bandastation/species/icons/mob/species/vulpkanin/sprite_accessories/facial_hair.dmi similarity index 100% rename from modular_bandastation/species/icons/mob/species/vulpkanin/facial_hair.dmi rename to modular_bandastation/species/icons/mob/species/vulpkanin/sprite_accessories/facial_hair.dmi diff --git a/modular_bandastation/species/icons/mob/species/vulpkanin/hair.dmi b/modular_bandastation/species/icons/mob/species/vulpkanin/sprite_accessories/hair.dmi similarity index 100% rename from modular_bandastation/species/icons/mob/species/vulpkanin/hair.dmi rename to modular_bandastation/species/icons/mob/species/vulpkanin/sprite_accessories/hair.dmi diff --git a/modular_bandastation/species/icons/mob/species/vulpkanin/head_markings.dmi b/modular_bandastation/species/icons/mob/species/vulpkanin/sprite_accessories/head_markings.dmi similarity index 100% rename from modular_bandastation/species/icons/mob/species/vulpkanin/head_markings.dmi rename to modular_bandastation/species/icons/mob/species/vulpkanin/sprite_accessories/head_markings.dmi diff --git a/modular_bandastation/species/icons/mob/species/vulpkanin/tail_markings.dmi b/modular_bandastation/species/icons/mob/species/vulpkanin/sprite_accessories/tail_markings.dmi similarity index 100% rename from modular_bandastation/species/icons/mob/species/vulpkanin/tail_markings.dmi rename to modular_bandastation/species/icons/mob/species/vulpkanin/sprite_accessories/tail_markings.dmi