From fb60efeacb9695c4b11c91d53868cd461512ce4a Mon Sep 17 00:00:00 2001
From: Kevak <Kevak@users.noreply.github.com>
Date: Mon, 9 Oct 2017 22:45:02 -0700
Subject: [PATCH] Fixes shock collars getting stuck in pockets.

---
 code/game/objects/items/devices/radio/electropack.dm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/code/game/objects/items/devices/radio/electropack.dm b/code/game/objects/items/devices/radio/electropack.dm
index 513ffb8d2b..108c561fc1 100644
--- a/code/game/objects/items/devices/radio/electropack.dm
+++ b/code/game/objects/items/devices/radio/electropack.dm
@@ -162,8 +162,9 @@ Code:
 /obj/item/device/electropack/shockcollar/attack_hand(mob/user)
 	if(loc == user)
 		if(slot_flags == SLOT_NECK)
-			to_chat(user, "<span class='warning'>The collar is fastened tight! You'll need help taking this off!</span>")
-			return
+			if(user.get_item_by_slot(slot_neck))
+				to_chat(user, "<span class='warning'>The collar is fastened tight! You'll need help taking this off!</span>")
+				return
 	..()
 
 /obj/item/device/electropack/shockcollar/receive_signal(datum/signal/signal)