Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

Fixes "Adds digitigrade jumpsuit alts using ThatGuyPhil's icons #11744" #11884

Merged
JamieD1 merged 3 commits into from
Aug 1, 2021
Merged

Fixes "Adds digitigrade jumpsuit alts using ThatGuyPhil's icons #11744" #11884

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8f7f1cc
Fixes some stuff
nmajask Jul 24, 2021
ec378d1
Removes the footwrap changes
nmajask Jul 28, 2021
14e23d8
Fixes chaplains jumpsuit
nmajask Jul 31, 2021
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/modules/clothing/suits/armor.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@
name = "warden's armored jacket"
desc = "A red jacket with silver rank pips and body armor strapped on top."
icon_state = "warden_jacket"
mutantrace_variation = MUTANTRACE_VARIATION

/obj/item/clothing/suit/armor/vest/leather
name = "security overcoat"
Expand Down
13 changes: 5 additions & 8 deletions code/modules/clothing/under/_under.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,6 @@
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 @@ -85,18 +82,18 @@
return
var/mob/living/carbon/human/H = user

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

if((is_digi && !adjusted == ALT_STYLE) && (mutantrace_variation || digiversion))
if(is_digi && !adjusted == ALT_STYLE && mutantrace_variation)
adjusted = DIGITIGRADE_STYLE
else if(is_digi && adjusted == ALT_STYLE && digiadjusted) //Handles when you are using an alternate style while having digi legs
else if(is_digi && adjusted == ALT_STYLE && mutantrace_variation) //Handles when you are using an alternate style while having digi legs
adjusted = DIGIALT_STYLE
else if(!(is_digi) && adjusted == DIGITIGRADE_STYLE)
else if(!is_digi && adjusted == DIGITIGRADE_STYLE)
adjusted = NORMAL_STYLE
else if(!(is_digi) && adjusted == DIGIALT_STYLE)
else if(!is_digi && adjusted == DIGIALT_STYLE)
adjusted = ALT_STYLE
H.update_inv_w_uniform()
//Yogs End
Expand Down
4 changes: 1 addition & 3 deletions code/modules/clothing/under/color.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
/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
mutantrace_variation = MUTANTRACE_VARIATION

/obj/item/clothing/under/skirt/color
body_parts_covered = CHEST|GROIN|ARMS
Expand Down
Loading