From 2e0a9c6901f111af2662c9cb9fbc0222dd3198a5 Mon Sep 17 00:00:00 2001 From: NovaBot <154629622+NovaBot13@users.noreply.github.com> Date: Mon, 5 Feb 2024 13:29:54 -0500 Subject: [PATCH] [MIRROR] pillow altclick sanity (#782) * pillow altclick sanity (#81265) ## About The Pull Request you may no longer rip out the tag with the power of your mind at range ## Why It's Good For The Game bug bad ## Changelog :cl: fix: you may no longer rip pillow tags at range without telekinesis or crit or any other time you shouldnt be capable of it /:cl: * pillow altclick sanity --------- Co-authored-by: jimmyl <70376633+mc-oofert@users.noreply.github.com> --- code/game/objects/items/pillow.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/game/objects/items/pillow.dm b/code/game/objects/items/pillow.dm index 928f1a373bb..1dad0a7fba5 100644 --- a/code/game/objects/items/pillow.dm +++ b/code/game/objects/items/pillow.dm @@ -104,6 +104,8 @@ /obj/item/pillow/AltClick(mob/user) . = ..() + if(!can_interact(user) || !user.can_hold_items(src)) + return if(!pillow_trophy) balloon_alert(user, "no tag!") return