cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-24 04:28:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6536 from VOREStation/upstream-merge-6669

Browse Source 
[MIRROR] Fix issues introduced by the world server icon system port.
This commit is contained in:
Novacat
2020-02-04 15:59:55 -05:00
committed by GitHub
parent f1394460c2 9f178a6d35
commit 2edcd273e5
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/clothing/clothing.dm
+3 -3
View File
@@ -636,6 +636,9 @@
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()
..()
@@ -650,9 +653,6 @@
return 0
valid_accessory_slots = (ACCESSORY_SLOT_OVER | ACCESSORY_SLOT_ARMBAND)
restricted_accessory_slots = (ACCESSORY_SLOT_ARMBAND)
/obj/item/clothing/suit/update_clothing_icon()
if (ismob(src.loc))
var/mob/M = src.loc
code/modules/mob/living/carbon/human/update_icons.dm
+2
View File
@@ -771,6 +771,8 @@ var/global/list/damage_icon_parts = list() //see UpdateDamageIcon()
if(suit.index)
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
suit_sprite = "[INV_SUIT_DEF_ICON].dmi"