diff --git a/modular_doppler/loadout_categories/categories/undersuit.dm b/modular_doppler/loadout_categories/categories/undersuit.dm index 9b97bd86f0735..b811519abc237 100644 --- a/modular_doppler/loadout_categories/categories/undersuit.dm +++ b/modular_doppler/loadout_categories/categories/undersuit.dm @@ -18,7 +18,13 @@ /datum/loadout_item/undersuit/insert_path_into_outfit(datum/outfit/outfit, mob/living/carbon/human/equipper, visuals_only = FALSE, override_items = LOADOUT_OVERRIDE_BACKPACK) if(override_items == LOADOUT_OVERRIDE_BACKPACK && !visuals_only) if(outfit.uniform) - LAZYADD(outfit.backpack_contents, outfit.uniform) + if(equipper.jumpsuit_style == PREF_SKIRT) + outfit.uniform = "[outfit.uniform]/skirt" + if(!text2path(outfit.uniform)) + outfit.uniform = initial(outfit.uniform) + LAZYADD(outfit.backpack_contents, outfit.uniform) + else + LAZYADD(outfit.backpack_contents, outfit.uniform) outfit.uniform = item_path else outfit.uniform = item_path diff --git a/modular_doppler/sprite_accessories/code/hair.dm b/modular_doppler/modular_customization/accessories/code/hair.dm similarity index 99% rename from modular_doppler/sprite_accessories/code/hair.dm rename to modular_doppler/modular_customization/accessories/code/hair.dm index c57828ce11ade..8d2609d3b48a9 100644 --- a/modular_doppler/sprite_accessories/code/hair.dm +++ b/modular_doppler/modular_customization/accessories/code/hair.dm @@ -1,7 +1,7 @@ // Hairstyles /datum/sprite_accessory/hair/modular - icon = 'modular_doppler/sprite_accessories/icons/hair.dmi' + icon = 'modular_doppler/modular_customization/accessories/icons/hair.dmi' /datum/sprite_accessory/hair/modular/pigtails4 name = "Pigtails 4" @@ -654,7 +654,7 @@ // Facial hair /datum/sprite_accessory/facial_hair/modular - icon = 'modular_doppler/sprite_accessories/icons/facialhair.dmi' + icon = 'modular_doppler/modular_customization/accessories/icons/facialhair.dmi' /datum/sprite_accessory/facial_hair/modular/sideburns name = "Sideburns" diff --git a/modular_doppler/sprite_accessories/icons/facialhair.dmi b/modular_doppler/modular_customization/accessories/icons/facialhair.dmi similarity index 100% rename from modular_doppler/sprite_accessories/icons/facialhair.dmi rename to modular_doppler/modular_customization/accessories/icons/facialhair.dmi diff --git a/modular_doppler/sprite_accessories/icons/hair.dmi b/modular_doppler/modular_customization/accessories/icons/hair.dmi similarity index 100% rename from modular_doppler/sprite_accessories/icons/hair.dmi rename to modular_doppler/modular_customization/accessories/icons/hair.dmi diff --git a/modular_doppler/modular_species/species_types/snails/modular_snail.dm b/modular_doppler/modular_species/species_types/snails/modular_snail.dm index e18aa0f758227..24065f73f3ece 100644 --- a/modular_doppler/modular_species/species_types/snails/modular_snail.dm +++ b/modular_doppler/modular_species/species_types/snails/modular_snail.dm @@ -1,6 +1,7 @@ #define SHELL_TRANSPARENCY_ALPHA 90 /datum/species/snail + preview_outfit = /datum/outfit/snail_preview mutantliver = /obj/item/organ/internal/liver/snail //This is just a better liver to deal with toxins, it's a thematic thing. mutantheart = /obj/item/organ/internal/heart/snail //This gives them the shell buff where they take less damage from behind, and their heart's more durable. exotic_blood = /datum/reagent/blood/green @@ -12,6 +13,11 @@ BODY_ZONE_R_LEG = /obj/item/bodypart/leg/right/digitigrade/insectoid, ) +/datum/outfit/snail_preview + name = "Snail (Species Preview)" + uniform = /obj/item/clothing/under/rank/medical/chemist/pharmacologist/skirt + mask = /obj/item/clothing/mask/surgical + /datum/species/snail/on_species_gain(mob/living/carbon/new_snailperson, datum/species/old_species, pref_load) . = ..() new_snailperson.update_icons() @@ -141,7 +147,12 @@ wearer.update_worn_back() /datum/species/snail/prepare_human_for_preview(mob/living/carbon/human/snail) - snail.dna.features["mcolor"] = "#adaba7" + snail.dna.features["mcolor"] = "#797289" + snail.hairstyle = "Phoenix Half-Shaven" + snail.hair_color = "#4C3C7E" + snail.eye_color_left = "#615188" + snail.eye_color_right = "#615188" + regenerate_organs(snail, src, visual_only = TRUE) snail.update_body(TRUE) /datum/species/snail/create_pref_unique_perks() diff --git a/tgstation.dme b/tgstation.dme index 0677d12dcdb6a..2884fca875475 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -6702,6 +6702,7 @@ #include "modular_doppler\modular_cosmetics\GAGS\greyscale_configs_under.dm" #include "modular_doppler\modular_crafting\code\crafting_extended.dm" #include "modular_doppler\modular_crafting\code\sheet_types.dm" +#include "modular_doppler\modular_customization\accessories\code\hair.dm" #include "modular_doppler\modular_customization\accessories\code\aquatic_accessories\aquatic_body_markings.dm" #include "modular_doppler\modular_customization\accessories\code\aquatic_accessories\aquatic_ears.dm" #include "modular_doppler\modular_customization\accessories\code\aquatic_accessories\aquatic_snout.dm" @@ -6929,7 +6930,6 @@ #include "modular_doppler\religion\code\mind.dm" #include "modular_doppler\religion\code\religious_sects.dm" #include "modular_doppler\research\designs\limbgrower_designs.dm" -#include "modular_doppler\sprite_accessories\code\hair.dm" #include "modular_doppler\stone\code\ore_veins.dm" #include "modular_doppler\stone\code\stone.dm" #include "modular_doppler\tableflip\tableflip.dm"