Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.
Merged
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
27f5fc5
Merge remote-tracking branch 'MqiibUpstream/master'
Mqiib Oct 6, 2020
dd26ed1
Merge remote-tracking branch 'MqiibUpstream/master'
Mqiib Oct 9, 2020
edc0df1
Merge branch 'yogstation13:master' into master
Mqiib Jan 29, 2022
7a20bc0
Merge branch 'yogstation13:master' into master
Mqiib Feb 7, 2022
88b109e
Merge branch 'yogstation13:master' into master
Mqiib Feb 24, 2022
6dd33d0
Merge branch 'yogstation13:master' into master
Mqiib Jul 29, 2022
5c2e288
Merge remote-tracking branch 'MqiibUpstream/master'
Mqiib Aug 2, 2022
b9aadc8
Merge remote-tracking branch 'MqiibUpstream/master'
Mqiib Aug 15, 2022
7761c93
Merge remote-tracking branch 'MqiibUpstream/master'
Mqiib Aug 15, 2022
4ddc713
Merge remote-tracking branch 'MqiibUpstream/master'
Mqiib Aug 16, 2022
eea26c8
Merge remote-tracking branch 'MqiibUpstream/master'
Mqiib Aug 26, 2022
a73cf7a
Merge remote-tracking branch 'MqiibUpstream/master'
Mqiib Aug 29, 2022
5e0ab40
Merge remote-tracking branch 'MqiibUpstream/master'
Mqiib Aug 30, 2022
4aba646
Merge remote-tracking branch 'MqiibUpstream/master'
Mqiib Sep 1, 2022
2774a47
Merge remote-tracking branch 'MqiibUpstream/master'
Mqiib Sep 9, 2022
bcdda9c
Merge remote-tracking branch 'MqiibUpstream/master'
Mqiib Sep 11, 2022
44c69a8
Merge remote-tracking branch 'MqiibUpstream/master'
Mqiib Sep 18, 2022
5db52e9
Merge remote-tracking branch 'MqiibUpstream/master'
Mqiib Sep 23, 2022
780b76b
Merge remote-tracking branch 'MqiibUpstream/master'
Mqiib Oct 1, 2022
d172895
Merge remote-tracking branch 'MqiibUpstream/master'
Mqiib Oct 11, 2022
aaa54ac
Merge remote-tracking branch 'MqiibUpstream/master'
Mqiib Oct 18, 2022
7c7d153
leggies
Mqiib Oct 18, 2022
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
6 changes: 5 additions & 1 deletion code/modules/mob/living/carbon/human/update_icons.dm
Original file line number Diff line number Diff line change
Expand Up @@ -377,10 +377,14 @@ There are several things that need to be remembered:

if(istype(wear_suit, /obj/item))
wear_suit.screen_loc = ui_oclothing
var/obj/item/clothing/suit/S = wear_suit
var/worn_suit_icon = S.icon_state
if(S.adjusted == DIGITIGRADE_STYLE)
worn_suit_icon = "[wear_suit.icon_state]_l" // Checks for digitgrade version of a suit and forces the alternate if it does
if(client && hud_used && hud_used.hud_shown)
if(hud_used.inventory_shown)
client.screen += wear_suit
overlays_standing[SUIT_LAYER] = wear_suit.build_worn_icon(default_layer = SUIT_LAYER, default_icon_file = 'icons/mob/clothing/suit/suit.dmi')
overlays_standing[SUIT_LAYER] = wear_suit.build_worn_icon(default_layer = SUIT_LAYER, default_icon_file = 'icons/mob/clothing/suit/suit.dmi', override_state = worn_suit_icon)
var/mutable_appearance/suit_overlay = overlays_standing[SUIT_LAYER]
if(OFFSET_SUIT in dna.species.offset_features)
suit_overlay.pixel_x += dna.species.offset_features[OFFSET_SUIT][1]
Expand Down