From 568dfa7f35a89334e6081a7b40ca0601f2091b87 Mon Sep 17 00:00:00 2001 From: vuonojenmustaturska Date: Sun, 3 Jun 2018 21:24:45 +0300 Subject: [PATCH] Include item overlays in attack animations (shows the proper color of screwdrivers etc) (#38225) * overlay attacks * this works too * fix trays too --- code/game/atoms_movable.dm | 2 +- code/game/objects/items/storage/bags.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm index 29c02932fc..22a7940bbf 100644 --- a/code/game/atoms_movable.dm +++ b/code/game/atoms_movable.dm @@ -562,7 +562,7 @@ if(visual_effect_icon) I = image('icons/effects/effects.dmi', A, visual_effect_icon, A.layer + 0.1) else if(used_item) - I = image(used_item.icon, A, used_item.icon_state, A.layer + 0.1) + I = image(icon = used_item, loc = A, layer = A.layer + 0.1) // Scale the icon. I.transform *= 0.75 diff --git a/code/game/objects/items/storage/bags.dm b/code/game/objects/items/storage/bags.dm index a44e61f16a..a3e4bc112e 100644 --- a/code/game/objects/items/storage/bags.dm +++ b/code/game/objects/items/storage/bags.dm @@ -310,7 +310,7 @@ /obj/item/storage/bag/tray/update_icon() cut_overlays() for(var/obj/item/I in contents) - add_overlay(mutable_appearance(I.icon, I.icon_state)) + add_overlay(new /mutable_appearance(I)) /obj/item/storage/bag/tray/Entered() . = ..()