Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.
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
1 change: 1 addition & 0 deletions code/__DEFINES/inventory.dm
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,7 @@
#define NORMAL_STYLE 0
#define ALT_STYLE 1
#define DIGITIGRADE_STYLE 2
#define DIGIALT_STYLE 3 //Yogs

//flags for digitigrade checks related to footwear. Only Human accessible / Both accessible / Only funny leg accessible.
#define NO_DIGIT 0
Expand Down
18 changes: 12 additions & 6 deletions code/modules/clothing/clothing.dm
Original file line number Diff line number Diff line change
Expand Up @@ -271,11 +271,17 @@ BLIND // can't see anything
H.update_inv_w_uniform()
H.update_body()

/obj/item/clothing/under/proc/toggle_jumpsuit_adjust()
if(adjusted == DIGITIGRADE_STYLE)
return
adjusted = !adjusted
if(adjusted)
/obj/item/clothing/under/proc/toggle_jumpsuit_adjust() //Yogs Start: Reworking this to allow for Digialt to function
switch(adjusted)
if(NORMAL_STYLE)
adjusted = ALT_STYLE
if(ALT_STYLE)
adjusted = NORMAL_STYLE
if(DIGITIGRADE_STYLE)
adjusted = DIGIALT_STYLE
if(DIGIALT_STYLE)
adjusted = DIGITIGRADE_STYLE
if(adjusted == NORMAL_STYLE || adjusted == DIGIALT_STYLE) //Yogs End
if(fitted != FEMALE_UNIFORM_TOP)
fitted = NO_FEMALE_UNIFORM
if(!alt_covers_chest) // for the special snowflake suits that expose the chest when adjusted
Expand Down Expand Up @@ -329,4 +335,4 @@ BLIND // can't see anything
Shreds.desc = "The sad remains of what used to be [name]."
deconstruct(FALSE)
else
..()
..()
33 changes: 24 additions & 9 deletions code/modules/clothing/under/_under.dm
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@
var/freshly_laundered = FALSE
var/dodgy_colours = FALSE
tearable = TRUE //all jumpsuits can be torn down and used for cloth in an emergency | yogs

var/digiversion = FALSE //Yogs Start: Does this peice of clothing have a digitigrade alt? It should have _l at the end or things will break
var/digiadjusted = FALSE //Yogs End: Does this peice of clothing have an adjusted digitigrade alt? It should have _d_l at the end or things will break

/obj/item/clothing/under/worn_overlays(isinhands = FALSE)
. = list()
Expand Down Expand Up @@ -69,18 +72,30 @@
if(!alt_covers_chest)
body_parts_covered |= CHEST

if(mutantrace_variation && ishuman(user))
var/mob/living/carbon/human/H = user
if(DIGITIGRADE in H.dna.species.species_traits)
adjusted = DIGITIGRADE_STYLE
H.update_inv_w_uniform()

if(slot == SLOT_W_UNIFORM && freshly_laundered)
freshly_laundered = FALSE
SEND_SIGNAL(user, COMSIG_ADD_MOOD_EVENT, "fresh_laundry", /datum/mood_event/fresh_laundry)

if(attached_accessory && slot != SLOT_HANDS && ishuman(user))
var/mob/living/carbon/human/H = user
if(!ishuman(user)) //Yogs Start: Reorganized to reduce repetition
return
var/mob/living/carbon/human/H = user

if(mutantrace_variation || digiversion || digiadjusted)
var/is_digi = FALSE
if(DIGITIGRADE in H.dna.species.species_traits)
is_digi = TRUE

if((is_digi && !adjusted == ALT_STYLE) && (mutantrace_variation || digiversion))
adjusted = DIGITIGRADE_STYLE
else if(is_digi && adjusted == ALT_STYLE && digiadjusted) //Handles when you are using an alternate style while having digi legs
adjusted = DIGIALT_STYLE
else if(!(is_digi) && adjusted == DIGITIGRADE_STYLE)
adjusted = NORMAL_STYLE
else if(!(is_digi) && adjusted == DIGIALT_STYLE)
adjusted = ALT_STYLE
H.update_inv_w_uniform()
//Yogs End
if(attached_accessory && slot != SLOT_HANDS)
attached_accessory.on_uniform_equip(src, user)
if(attached_accessory.above_suit)
H.update_inv_wear_suit()
Expand Down Expand Up @@ -156,7 +171,7 @@
if(freshly_laundered)
. += "It looks fresh and clean."
if(can_adjust)
if(adjusted == ALT_STYLE)
if(adjusted == ALT_STYLE || adjusted == DIGIALT_STYLE)
. += "Alt-click on [src] to wear it normally."
else
. += "Alt-click on [src] to wear it casually."
Expand Down
5 changes: 4 additions & 1 deletion code/modules/clothing/under/color.dm
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
/obj/item/clothing/under/color
desc = "A standard issue colored jumpsuit. Variety is the spice of life!"
mutantrace_variation = MUTANTRACE_VARIATION //Yogs Start: Digilegs alt stuff
digiversion = TRUE //Yogs Start: Digilegs alt stuff
digiadjusted = TRUE //Yogs End

/obj/item/clothing/under/skirt/color
body_parts_covered = CHEST|GROIN|ARMS
Expand Down Expand Up @@ -238,4 +241,4 @@
icon_state = "rainbow"
item_state = "rainbow"
item_color = "rainbow"
can_adjust = FALSE
can_adjust = FALSE
Loading