From adfb077a0a1b6634b89a313c102f39dd86ed3e88 Mon Sep 17 00:00:00 2001 From: Seris02 Date: Thu, 9 Jan 2020 15:05:46 +0800 Subject: [PATCH 1/2] chameleon fixes --- code/modules/clothing/chameleon.dm | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/code/modules/clothing/chameleon.dm b/code/modules/clothing/chameleon.dm index 8b2a34a089..e1790dba61 100644 --- a/code/modules/clothing/chameleon.dm +++ b/code/modules/clothing/chameleon.dm @@ -220,10 +220,14 @@ var/obj/item/I = target I.item_state = initial(picked_item.item_state) I.item_color = initial(picked_item.item_color) - if(istype(I, /obj/item/clothing) && istype(initial(picked_item), /obj/item/clothing)) - var/obj/item/clothing/CL = I - var/obj/item/clothing/PCL = picked_item - CL.flags_cover = initial(PCL.flags_cover) + var/obj/item/clothing/CL = target + var/obj/item/clothing/PCL = new picked_item + if(istype(CL) && istype(PCL)) + CL.flags_cover = PCL.flags_cover + CL.flags_inv = PCL.flags_inv + CL.mutantrace_variation = PCL.mutantrace_variation + CL.alternate_worn_icon = PCL.alternate_worn_icon + qdel(PCL) target.icon = initial(picked_item.icon) /datum/action/item_action/chameleon/change/pda/update_item(obj/item/pda/picked_item) From 3f7a0f4b7c765fdd2b88369e0288d1dd127e4a68 Mon Sep 17 00:00:00 2001 From: Seris02 Date: Thu, 9 Jan 2020 15:07:43 +0800 Subject: [PATCH 2/2] fixes chameleon cloak icon --- code/modules/clothing/chameleon.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/clothing/chameleon.dm b/code/modules/clothing/chameleon.dm index e1790dba61..b67fe2b462 100644 --- a/code/modules/clothing/chameleon.dm +++ b/code/modules/clothing/chameleon.dm @@ -638,6 +638,7 @@ /obj/item/clothing/neck/cloak/chameleon name = "black tie" desc = "A neosilk clip-on tie." + icon = 'icons/obj/clothing/neck.dmi' icon_state = "blacktie" item_color = "blacktie" resistance_flags = NONE