From 66dd09ea4f769215bf9494df8bf01bdd8a6abdb2 Mon Sep 17 00:00:00 2001
From: Fox McCloud <Fox-McCloud@users.noreply.github.com>
Date: Sun, 20 May 2018 05:58:14 -0400
Subject: [PATCH] arbitrary

---
 code/modules/paperwork/handlabeler.dm | 23 ++++++++---------------
 1 file changed, 8 insertions(+), 15 deletions(-)

diff --git a/code/modules/paperwork/handlabeler.dm b/code/modules/paperwork/handlabeler.dm
index 2700c8702db..92ec694ecb4 100644
--- a/code/modules/paperwork/handlabeler.dm
+++ b/code/modules/paperwork/handlabeler.dm
@@ -7,30 +7,23 @@
 	var/labels_left = 30
 	var/mode = 0	//off or on.
 
-/obj/item/hand_labeler/afterattack(atom/A, mob/user as mob, proximity)
-	if(!proximity) return
+/obj/item/hand_labeler/afterattack(atom/A, mob/user, proximity)
+	if(!proximity)
+		return
 	if(!mode)	//if it's off, give up.
 		return
-	if(A == loc)	// if placing the labeller into something (e.g. backpack)
-		return		// don't set a label
 
 	if(!labels_left)
-		to_chat(user, "<span class='notice'>No labels left.</span>")
+		to_chat(user, "<span class='warning'>No labels left!</span>")
 		return
 	if(!label || !length(label))
-		to_chat(user, "<span class='notice'>No text set.</span>")
+		to_chat(user, "<span class='warning'>No text set!</span>")
 		return
 	if(length(A.name) + length(label) > 64)
-		to_chat(user, "<span class='notice'>Label too big.</span>")
+		to_chat(user, "<span class='warning'>Label too big!</span>")
 		return
-	if(ishuman(A))
-		to_chat(user, "<span class='notice'>You can't label humans.</span>")
-		return
-	if(issilicon(A))
-		to_chat(user, "<span class='notice'>You can't label cyborgs.</span>")
-		return
-	if(istype(A, /obj/item/reagent_containers/glass))
-		to_chat(user, "<span class='notice'>The label can't stick to the [A.name].  (Try using a pen)</span>")
+	if(ismob(A))
+		to_chat(user, "<span class='warning'>You can't label creatures!</span>") // use a collar
 		return
 
 	user.visible_message("<span class='notice'>[user] labels [A] as [label].</span>", \