From fcd1c7749a8d83d4eb754433550482d69f1f7b1c Mon Sep 17 00:00:00 2001 From: Chinsky Date: Fri, 29 Aug 2014 00:50:01 +0400 Subject: [PATCH] Tape now does not stop anything like magical wall it used to be. If someone with no access walks through it, it adds his fingerprints/fibers, gives him an omnious message and crumples the tape. --- code/WorkInProgress/Ported/policetape.dm | 35 ++++++++++++----------- icons/policetape.dmi | Bin 1855 -> 2510 bytes 2 files changed, 19 insertions(+), 16 deletions(-) diff --git a/code/WorkInProgress/Ported/policetape.dm b/code/WorkInProgress/Ported/policetape.dm index 6b40b370ca7..f331f8401bb 100644 --- a/code/WorkInProgress/Ported/policetape.dm +++ b/code/WorkInProgress/Ported/policetape.dm @@ -14,7 +14,8 @@ name = "tape" icon = 'icons/policetape.dmi' anchored = 1 - density = 1 + var/lifted = 0 + var/crumpled = 0 var/icon_base /obj/item/taperoll/police @@ -97,8 +98,8 @@ //is_blocked_turf(var/turf/T) usr << "\blue You finish placing the [src]." //Git Test -/obj/item/taperoll/afterattack(var/atom/A, mob/user as mob, proximity) - if (proximity && istype(A, /obj/machinery/door/airlock)) +/obj/item/taperoll/afterattack(var/atom/A, mob/user as mob) + if (istype(A, /obj/machinery/door/airlock)) 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) @@ -106,19 +107,20 @@ P.layer = 3.2 user << "\blue You finish placing the [src]." -/obj/item/tape/Bumped(M as mob) - if(src.allowed(M)) - var/turf/T = get_turf(src) - M:loc = T +/obj/item/tape/proc/crumple() + if(!crumpled) + crumpled = 1 + icon_state = "[icon_state]_c" + name = "crumpled [name]" /obj/item/tape/CanPass(atom/movable/mover, turf/target, height=0, air_group=0) - if(!density) return 1 - if(air_group || (height==0)) return 1 - - if ((mover.flags & 2 || istype(mover, /obj/effect/meteor) || mover.throwing == 1) ) - return 1 - else - return 0 + if(!lifted && ismob(mover)) + var/mob/M = mover + add_fingerprint(M) + if (!allowed(M)) //only select few learn art of not crumpling the tape + M << "You are not supposed to go past [src]..." + crumple() + return ..(mover) /obj/item/tape/attackby(obj/item/weapon/W as obj, mob/user as mob) breaktape(W, user) @@ -126,9 +128,10 @@ /obj/item/tape/attack_hand(mob/user as mob) if (user.a_intent == "help" && src.allowed(user)) user.show_viewers("\blue [user] lifts [src], allowing passage.") - src.density = 0 + crumple() + lifted = 1 spawn(200) - src.density = 1 + lifted = 0 else breaktape(null, user) diff --git a/icons/policetape.dmi b/icons/policetape.dmi index bf3d726ada23be57defb53423a986d122d0522c5..841878f73fc671312f5f9cfef852b08a298f5ded 100644 GIT binary patch delta 2491 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 UbYjQ9BLDyZ07*qoM6N<$f=}^1ssI20