From de5ca70ddb10a8adbb87a9969d19257e19762061 Mon Sep 17 00:00:00 2001 From: Hubblenaut Date: Fri, 11 Dec 2015 16:01:50 +0100 Subject: [PATCH 1/2] Fixes doortape using wrong icon --- code/game/objects/items/weapons/policetape.dm | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/code/game/objects/items/weapons/policetape.dm b/code/game/objects/items/weapons/policetape.dm index 9d820f6892..e3c1268ea0 100644 --- a/code/game/objects/items/weapons/policetape.dm +++ b/code/game/objects/items/weapons/policetape.dm @@ -91,12 +91,16 @@ var/list/tape_roll_applications = list() overlays += "stop" /obj/item/taperoll/dropped(mob/user) - ..() update_icon() + return ..() /obj/item/taperoll/pickup(mob/user) - ..() update_icon() + return ..() + +/obj/item/taperoll/attack_hand() + update_icon() + return ..() /obj/item/taperoll/attack_self(mob/user as mob) if(!start) @@ -218,7 +222,7 @@ var/list/tape_roll_applications = list() var/turf/T = get_turf(A) var/obj/item/tape/P = new tape_type(T.x,T.y,T.z) P.loc = locate(T.x,T.y,T.z) - P.icon_state = "[src.icon_base]_door" + P.update_icon() P.layer = 3.2 user << "You finish placing \the [src]." From 3d0b24c1f7af8235c5329094af06fdb26ee6c3a4 Mon Sep 17 00:00:00 2001 From: Hubblenaut Date: Fri, 11 Dec 2015 16:48:21 +0100 Subject: [PATCH 2/2] Shifts taperoll icon two pixels down --- icons/policetape.dmi | Bin 4486 -> 4497 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/icons/policetape.dmi b/icons/policetape.dmi index 03efe3aef22c20773d7cd2464f26c05de1f1176c..bc469f2eabce4bc4fa1d903603223eba6efeed8f 100644 GIT binary patch delta 4107 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