cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 03:33:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6669 from Mechoid/FixSuitIconIssue

Browse Source 
Fix issues introduced by the world server icon system port.
This commit is contained in:
Atermonera
2020-02-04 12:49:51 -08:00
committed by VirgoBot
parent f1394460c2
commit af6992e09a
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/modules/clothing/clothing.dm
View File

@@ -636,6 +636,9 @@
SPECIES_VOX = 'icons/mob/species/vox/suit.dmi' SPECIES_VOX = 'icons/mob/species/vox/suit.dmi'
) )
valid_accessory_slots = (ACCESSORY_SLOT_OVER | ACCESSORY_SLOT_ARMBAND)
restricted_accessory_slots = (ACCESSORY_SLOT_ARMBAND)
/obj/item/clothing/suit/set_clothing_index() /obj/item/clothing/suit/set_clothing_index()
..() ..()
@@ -650,9 +653,6 @@
return 0 return 0
valid_accessory_slots = (ACCESSORY_SLOT_OVER | ACCESSORY_SLOT_ARMBAND)
restricted_accessory_slots = (ACCESSORY_SLOT_ARMBAND)
/obj/item/clothing/suit/update_clothing_icon() /obj/item/clothing/suit/update_clothing_icon()
if (ismob(src.loc)) if (ismob(src.loc))
var/mob/M = src.loc var/mob/M = src.loc

2
code/modules/mob/living/carbon/human/update_icons.dm
View File

@@ -771,6 +771,8 @@ var/global/list/damage_icon_parts = list() //see UpdateDamageIcon()
if(suit.index) if(suit.index)
suit_sprite = "[INV_SUIT_DEF_ICON]_[suit.index].dmi" suit_sprite = "[INV_SUIT_DEF_ICON]_[suit.index].dmi"
else if(istype(suit, /obj/item/clothing) && !isnull(suit.update_icon_define))
suit_sprite = suit.update_icon_define
else else
suit_sprite = "[INV_SUIT_DEF_ICON].dmi" suit_sprite = "[INV_SUIT_DEF_ICON].dmi"