From 98e3e11aa0bdde87ffa7a1666fe58b79e89280bc Mon Sep 17 00:00:00 2001 From: oranges Date: Tue, 31 Dec 2019 08:41:02 +1300 Subject: [PATCH] Binoculars no longer runtime when unwielding with no one listening (#48440) --- code/game/objects/items/twohanded.dm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/twohanded.dm b/code/game/objects/items/twohanded.dm index b5d56b8c0b8..6e08a759404 100644 --- a/code/game/objects/items/twohanded.dm +++ b/code/game/objects/items/twohanded.dm @@ -843,8 +843,9 @@ /obj/item/twohanded/binoculars/unwield(mob/user) . = ..() - UnregisterSignal(listeningTo, COMSIG_MOVABLE_MOVED) - listeningTo = null + if(listeningTo) + UnregisterSignal(listeningTo, COMSIG_MOVABLE_MOVED) + listeningTo = null user.visible_message("[user] lowers [src].", "You lower [src].") item_state = "binoculars" user.regenerate_icons()