cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-18 10:33:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: Hide shoes if suit hides shoes (#21652)

Browse Source 
https://github.com/ss220-space/Paradise/pull/1062
This commit is contained in:
larentoun
2023-07-17 19:22:40 +09:00
committed by GitHub
parent 78db85de65
commit c7935c8f35
2 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/human_inventory.dm
+4
View File
@@ -77,6 +77,8 @@
wear_suit = null
if(I.flags_inv & HIDEJUMPSUIT)
update_inv_w_uniform()
if(I.flags_inv & HIDESHOES)
update_inv_shoes()
update_inv_wear_suit()
else if(I == w_uniform)
if(r_store)
@@ -279,6 +281,8 @@
update_inv_shoes()
if(slot_wear_suit)
wear_suit = I
if(wear_suit.flags_inv & HIDESHOES)
update_inv_shoes()
update_inv_wear_suit()
if(slot_w_uniform)
w_uniform = I
code/modules/mob/living/carbon/human/human_update_icons.dm
+15 -14
View File
@@ -803,21 +803,22 @@ GLOBAL_LIST_EMPTY(damage_icon_parts)
shoes.screen_loc = ui_shoes //...draw the item in the inventory screen
client.screen += shoes //Either way, add the item to the HUD
var/mutable_appearance/standing
if(shoes.icon_override)
standing = mutable_appearance(shoes.icon_override, "[shoes.icon_state]", layer = -SHOES_LAYER)
else if(shoes.sprite_sheets && shoes.sprite_sheets[dna.species.name])
standing = mutable_appearance(shoes.sprite_sheets[dna.species.name], "[shoes.icon_state]", layer = -SHOES_LAYER)
else
standing = mutable_appearance('icons/mob/clothing/feet.dmi', "[shoes.icon_state]", layer = -SHOES_LAYER)
if(!wear_suit || !(wear_suit.flags_inv & HIDESHOES))
var/mutable_appearance/standing
if(shoes.icon_override)
standing = mutable_appearance(shoes.icon_override, "[shoes.icon_state]", layer = -SHOES_LAYER)
else if(shoes.sprite_sheets && shoes.sprite_sheets[dna.species.name])
standing = mutable_appearance(shoes.sprite_sheets[dna.species.name], "[shoes.icon_state]", layer = -SHOES_LAYER)
else
standing = mutable_appearance('icons/mob/clothing/feet.dmi', "[shoes.icon_state]", layer = -SHOES_LAYER)
if(shoes.blood_DNA)
var/image/bloodsies = image("icon" = dna.species.blood_mask, "icon_state" = "shoeblood")
bloodsies.color = shoes.blood_color
standing.overlays += bloodsies
standing.alpha = shoes.alpha
standing.color = shoes.color
overlays_standing[SHOES_LAYER] = standing
if(shoes.blood_DNA)
var/image/bloodsies = image("icon" = dna.species.blood_mask, "icon_state" = "shoeblood")
bloodsies.color = shoes.blood_color
standing.overlays += bloodsies
standing.alpha = shoes.alpha
standing.color = shoes.color
overlays_standing[SHOES_LAYER] = standing
else
if(feet_blood_DNA)
var/mutable_appearance/bloodsies = mutable_appearance(dna.species.blood_mask, "shoeblood", layer = -SHOES_LAYER)