From cdbb00d2646626563c114d457f5a84858cd43ac2 Mon Sep 17 00:00:00 2001 From: SkyMarshal Date: Fri, 6 Jan 2012 16:55:56 -0700 Subject: [PATCH] Fixes a problem with aliums and police tape. --- code/WorkInProgress/SkyMarshal/policetape.dm | 2 +- icons/obj/structures.dmi | Bin 47702 -> 47705 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/code/WorkInProgress/SkyMarshal/policetape.dm b/code/WorkInProgress/SkyMarshal/policetape.dm index cf777e37c8e..8e0e1e094bc 100644 --- a/code/WorkInProgress/SkyMarshal/policetape.dm +++ b/code/WorkInProgress/SkyMarshal/policetape.dm @@ -106,7 +106,7 @@ breaktape(null, user) /obj/item/policetape/attack_paw(mob/user as mob) - breaktape(1,user) + breaktape(/obj/item/weapon/wirecutters,user) /obj/item/policetape/proc/breaktape(obj/item/weapon/W as obj, mob/user as mob) if(user.a_intent == "help" && ((!is_sharp(W) && src.allowed(user)) ||(!is_cut(W) && !src.allowed(user)))) diff --git a/icons/obj/structures.dmi b/icons/obj/structures.dmi index 33e49ea70b9bcac6a800018712ee00c5f41428c5..c8a16328ba2a94c2991c547c8146f9d1b85aa829 100644 GIT binary patch delta 2650 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