Merge remote-tracking branch 'upstream/master'

code/game/objects/items/weapons/evidence.dm

@@ -8,6 +8,7 @@
 	desc = "An empty evidence bag."
 	icon = 'storage.dmi'
 	icon_state = "evidenceobj"
+	w_class = 1
 
 /* buggy and stuff
 /obj/item/weapon/evidencebag/attackby(obj/item/weapon/O, mob/user as mob)
@@ -23,14 +24,30 @@
 	if(!(O && istype(O)) || O.anchored == 1)
 		user << "You can't put that inside the [src]!"
 		return ..()
+	if(O in user)
+		user << "You are wearing that."
+		return
 	if(src.contents.len > 0)
 		user << "The [src] already has something inside it."
 		return ..()
+	if(istype(O.loc, /obj/item/weapon/storage))
+		user << "This is broke as hell."
+		return
+/*		var/obj/item/weapon/storage/U = O.loc
+		w_class = O.w_class
+		for(var/i, i < U.contents.len, i++)
+			if(O in U.contents[i])
+				U.contents[i] = null
+				O.loc = src
+				continue*/
 	user << "You put the [O] inside the [src]."
-	O.loc = src
 	icon_state = "evidence"
 	src.underlays += O
 	desc = "An evidence bag containing \a [O]. [O.desc]"
+	O.loc = src
+	w_class = O.w_class
+	return
+
 
 /obj/item/weapon/evidencebag/attack_self(mob/user as mob)
 	if (src.contents.len > 0)
@@ -38,9 +55,13 @@
 		user << "You take the [I] out of the [src]."
 		I.loc = user.loc
 		src.underlays -= I
-		icon_state = "evidenceobj"
+		w_class = 1
+		src.icon_state = "evidenceobj"
+		desc = "An empty evidence bag."
 	else
-		user << "The [src] is empty."
+		user << "[src] is empty."
+		src.icon_state = "evidenceobj"
+	return
 
 /obj/item/weapon/storage/box/evidence
 	name = "evidence bag box"
@@ -51,7 +72,7 @@
 		new /obj/item/weapon/evidencebag(src)
 		new /obj/item/weapon/evidencebag(src)
 		new /obj/item/weapon/evidencebag(src)
-		new /obj/item/weapon/evidencebag(src)
-		new /obj/item/weapon/evidencebag(src)
+		new /obj/item/weapon/f_card(src)
+		new /obj/item/weapon/f_card(src)
 		..()
 		return