shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4638 from Citadel-Station-13/upstream-merge-33967

Browse Source 
[MIRROR] Makes the decal component handle updating inventory icons
This commit is contained in:
LetterJay
2018-01-02 19:15:46 -06:00
committed by GitHub
parent c43a7b33e1 c22e0dc862
commit d8806cacc7
4 changed files with 36 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/clothing/chameleon.dm
+2 -31
View File
@@ -128,7 +128,8 @@
return
update_item(picked_item)
update_item_icon()
var/obj/item/thing = target
thing.update_slot_icon()
UpdateButtonIcon()
/datum/action/item_action/chameleon/change/proc/update_item(obj/item/picked_item)
@@ -166,36 +167,6 @@
return
random_look(owner)
/datum/action/item_action/chameleon/change/proc/update_item_icon()
var/obj/item/I = target
var/mob/living/M = owner
var/flags_1 = I.slot_flags
if(flags_1 & SLOT_OCLOTHING)
M.update_inv_wear_suit()
if(flags_1 & SLOT_ICLOTHING)
M.update_inv_w_uniform()
if(flags_1 & SLOT_GLOVES)
M.update_inv_gloves()
if(flags_1 & SLOT_EYES)
M.update_inv_glasses()
if(flags_1 & SLOT_EARS)
M.update_inv_ears()
if(flags_1 & SLOT_MASK)
M.update_inv_wear_mask()
if(flags_1 & SLOT_HEAD)
M.update_inv_head()
if(flags_1 & SLOT_FEET)
M.update_inv_shoes()
if(flags_1 & SLOT_ID)
M.update_inv_wear_id()
if(flags_1 & SLOT_BELT)
M.update_inv_belt()
if(flags_1 & SLOT_BACK)
M.update_inv_back()
if(flags_1 & SLOT_NECK)
M.update_inv_neck()
/obj/item/clothing/under/chameleon
//starts off as black
name = "black jumpsuit"