Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Backpack spawned job uniform adheres to uniform pref #132

Merged
merged 1 commit into from
Oct 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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"
Expand Down Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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()
Expand Down Expand Up @@ -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()
Expand Down
2 changes: 1 addition & 1 deletion tgstation.dme
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down
Loading