Revert "12/21 modernizations from TG live"

code/modules/detectivework/evidence.dm

@@ -6,7 +6,7 @@
 	icon = 'icons/obj/storage.dmi'
 	icon_state = "evidenceobj"
 	item_state = ""
-	w_class = WEIGHT_CLASS_TINY
+	w_class = 1
 
 /obj/item/weapon/evidencebag/afterattack(obj/item/I, mob/user,proximity)
 	if(!proximity || loc == I)
@@ -25,7 +25,7 @@
 		user << "<span class='notice'>You find putting an evidence bag in another evidence bag to be slightly absurd.</span>"
 		return 1 //now this is podracing
 
-	if(I.w_class > WEIGHT_CLASS_NORMAL)
+	if(I.w_class > 3)
 		user << "<span class='notice'>[I] won't fit in [src].</span>"
 		return
 
@@ -37,8 +37,10 @@
 		if(istype(I.loc,/obj/item/weapon/storage))	//in a container.
 			var/obj/item/weapon/storage/U = I.loc
 			U.remove_from_storage(I, src)
-		if(user.is_holding(I))
-			user.unEquip(I)
+		else if(user.l_hand == I)					//in a hand
+			user.drop_l_hand()
+		else if(user.r_hand == I)					//in a hand
+			user.drop_r_hand()
 		else
 			return
 
@@ -69,7 +71,7 @@
 		"<span class='italics'>You hear someone rustle around in a plastic bag, and remove something.</span>")
 		cut_overlays()	//remove the overlays
 		user.put_in_hands(I)
-		w_class = WEIGHT_CLASS_TINY
+		w_class = 1
 		icon_state = "evidenceobj"
 		desc = "An empty evidence bag."
 
@@ -90,4 +92,4 @@
 	new /obj/item/weapon/evidencebag(src)
 	new /obj/item/weapon/evidencebag(src)
 	..()
-	return
+	return

code/modules/detectivework/footprints_and_rag.dm

@@ -9,7 +9,7 @@
 /obj/item/weapon/reagent_containers/glass/rag
 	name = "damp rag"
 	desc = "For cleaning up messes, you suppose."
-	w_class = WEIGHT_CLASS_TINY
+	w_class = 1
 	icon = 'icons/obj/toy.dmi'
 	icon_state = "rag"
 	flags = OPENCONTAINER | NOBLUDGEON
@@ -19,7 +19,8 @@
 	spillable = 0
 
 /obj/item/weapon/reagent_containers/glass/rag/suicide_act(mob/user)
-	user.visible_message("<span class='suicide'>[user] is smothering [user.p_them()]self with [src]! It looks like [user.p_theyre()] trying to commit suicide!</span>")
+	user.visible_message("<span class='suicide'>[user] ties the [src.name] around their head and groans! It looks like--</span>")
+	user.say("MY BRAIN HURTS!!")
 	return (OXYLOSS)
 
 /obj/item/weapon/reagent_containers/glass/rag/afterattack(atom/A as obj|turf|area, mob/user,proximity)
@@ -27,7 +28,7 @@
 		return
 	if(iscarbon(A) && A.reagents && reagents.total_volume)
 		var/mob/living/carbon/C = A
-		if(user.a_intent == INTENT_HARM && !C.is_mouth_covered())
+		if(user.a_intent == "harm" && !C.is_mouth_covered())
 			reagents.reaction(C, INGEST)
 			reagents.trans_to(C, reagents.total_volume)
 			C.visible_message("<span class='danger'>[user] has smothered \the [C] with \the [src]!</span>", "<span class='userdanger'>[user] has smothered you with \the [src]!</span>", "<span class='italics'>You hear some struggling and muffled cries of surprise.</span>")

code/modules/detectivework/scanner.dm

@@ -6,7 +6,7 @@
 	name = "forensic scanner"
 	desc = "Used to remotely scan objects and biomass for DNA and fingerprints. Can print a report of the findings."
 	icon_state = "forensicnew"
-	w_class = WEIGHT_CLASS_SMALL
+	w_class = 2
 	item_state = "electronic"
 	flags = CONDUCT | NOBLUDGEON
 	slot_flags = SLOT_BELT