From 7413256cb86e4cc0db6e22e8cf9d787f8f99e5ff Mon Sep 17 00:00:00 2001 From: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com> Date: Fri, 2 Jul 2021 11:20:12 -0400 Subject: [PATCH] Prevents ghosts from setting off mousetraps (#16274) * Prevents ghosts from setting off mousetraps * Update code/game/objects/items/weapons/storage/storage.dm Co-authored-by: dearmochi <1496804+dearmochi@users.noreply.github.com> * Note to self: Do not be tired when commiting suggestions Co-authored-by: dearmochi <1496804+dearmochi@users.noreply.github.com> Co-authored-by: dearmochi <1496804+dearmochi@users.noreply.github.com> --- code/game/objects/items/weapons/storage/storage.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/weapons/storage/storage.dm b/code/game/objects/items/weapons/storage/storage.dm index d1548eb2305..61b3cdfedd7 100644 --- a/code/game/objects/items/weapons/storage/storage.dm +++ b/code/game/objects/items/weapons/storage/storage.dm @@ -163,7 +163,7 @@ /obj/item/storage/proc/show_to(mob/user) if(!user.client) return - if(user.s_active != src) // Switching from another container + if(user.s_active != src && !isobserver(user)) for(var/obj/item/I in src) if(I.on_found(user)) // For mouse traps and such return // If something triggered, don't open the UI