From 3193325f20bf6687f468613dd32b33ca90b443f4 Mon Sep 17 00:00:00 2001 From: mikomyazaki <47489928+mikomyazaki@users.noreply.github.com> Date: Wed, 27 Apr 2022 16:43:06 +0100 Subject: [PATCH] Can apply tape to doors again & tape can cross lattices (#13677) --- code/game/machinery/doors/airlock.dm | 2 +- code/game/objects/items/weapons/policetape.dm | 2 +- html/changelogs/tape-on-doors.yml | 7 +++++++ 3 files changed, 9 insertions(+), 2 deletions(-) create mode 100644 html/changelogs/tape-on-doors.yml diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index 00bb6b037be..e4e295db06a 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -1252,7 +1252,7 @@ About the new airlock wires panel: if(src.shock(user, 75)) return TRUE if(istype(C, /obj/item/taperoll) || istype(C, /obj/item/rfd)) - return TRUE + return if(!istype(C, /obj/item/forensics)) src.add_fingerprint(user) if (!repairing && (stat & BROKEN) && src.locked) //bolted and broken diff --git a/code/game/objects/items/weapons/policetape.dm b/code/game/objects/items/weapons/policetape.dm index 5b02d12c5e5..2991bdc1fd7 100644 --- a/code/game/objects/items/weapons/policetape.dm +++ b/code/game/objects/items/weapons/policetape.dm @@ -138,7 +138,7 @@ var/list/tape_roll_applications = list() can_place = 0 else for(var/obj/O in cur) - if(!istype(O, /obj/item/tape) && O.density) + if(istype(O, /obj/structure/lattice) && (!istype(O, /obj/item/tape) && O.density)) can_place = 0 break cur = get_step_towards(cur,end) diff --git a/html/changelogs/tape-on-doors.yml b/html/changelogs/tape-on-doors.yml new file mode 100644 index 00000000000..68520817c56 --- /dev/null +++ b/html/changelogs/tape-on-doors.yml @@ -0,0 +1,7 @@ +author: mikomyazaki + +delete-after: True + +changes: + - bugfix: "You can place tape on doors again." + - bugfix: "Tape can now cross lattices/gratings." \ No newline at end of file