Fixes shock collars getting stuck in pockets.

2017-10-09 22:45:02 -07:00
parent e2b786a328
commit fb60efeacb
1 changed files with 3 additions and 2 deletions
@@ -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)