From 3d3dcc8527fb2271f739d718edace1cb99847d3d Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Tue, 23 Feb 2021 14:22:16 +0100 Subject: [PATCH] [MIRROR] #57049 but only the prox check: fixes tape being able to be used on objects without proximity (#3607) * Sticky tape no longer can be used on objects that aren't within reach. (#57103) * #57049 but only the prox check: fixes tape being able to be used on objects without proximity Co-authored-by: necromanceranne <40847847+necromanceranne@users.noreply.github.com> --- code/game/objects/items/stacks/tape.dm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/code/game/objects/items/stacks/tape.dm b/code/game/objects/items/stacks/tape.dm index 26daedd82f9..ed1052cc352 100644 --- a/code/game/objects/items/stacks/tape.dm +++ b/code/game/objects/items/stacks/tape.dm @@ -19,7 +19,10 @@ var/list/conferred_embed = EMBED_HARMLESS var/overwrite_existing = FALSE -/obj/item/stack/sticky_tape/afterattack(obj/item/I, mob/living/user) +/obj/item/stack/sticky_tape/afterattack(obj/item/I, mob/living/user, proximity) + if(!proximity) + return + if(!istype(I)) return