From 3ab197f80f2b68fff90fa0569607f6a393f9b649 Mon Sep 17 00:00:00 2001
From: bgobandit <bandit@mailinator.com>
Date: Thu, 23 Jul 2015 20:20:55 -0400
Subject: [PATCH 1/3] Body bag sprites now update their tag overlay properly.

---
 code/game/objects/items/bodybag.dm                     | 5 ++++-
 code/game/objects/structures/crates_lockers/closets.dm | 5 +++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/code/game/objects/items/bodybag.dm b/code/game/objects/items/bodybag.dm
index c32a35c5b89..a3c0a0a8290 100644
--- a/code/game/objects/items/bodybag.dm
+++ b/code/game/objects/items/bodybag.dm
@@ -36,6 +36,7 @@
 	icon = 'icons/obj/bodybag.dmi'
 	icon_state = "bodybag"
 	var/foldedbag_path = /obj/item/bodybag
+	var/tagged = 0 // so closet code knows to put the tag overlay back
 	density = 0
 	mob_storage_capacity = 2
 
@@ -51,13 +52,15 @@
 			name = "body bag - "
 			name += t
 			overlays += "bodybag_label"
+			tagged = 1
 		else
 			name = "body bag"
 		return
 	else if(istype(I, /obj/item/weapon/wirecutters))
-		user << "<span class='notice'>You cut the tag off of [src].</span>"
+		user << "<span class='notice'>You cut the tag off [src].</span>"
 		name = "body bag"
 		overlays.Cut()
+		tagged = 0
 
 
 /obj/structure/closet/body_bag/close()
diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm
index e41fac7870f..b43e760fe09 100644
--- a/code/game/objects/structures/crates_lockers/closets.dm
+++ b/code/game/objects/structures/crates_lockers/closets.dm
@@ -46,6 +46,11 @@
 					overlays += "unlocked"
 			else
 				overlays += "off"
+		if(istype(src, /obj/structure/closet/body_bag)) // GUESS WHAT BODY BAGS ARE CLOSETS
+			var/obj/structure/closet/body_bag/B = src
+			if (B.tagged)
+				overlays += "bodybag_label"
+
 	else
 		if(icon_door_override)
 			overlays += "[icon_door]_open"

From ab9668dd3d0569c6f1bb91ff8a4b93bcc049894d Mon Sep 17 00:00:00 2001
From: bgobandit <bandit@mailinator.com>
Date: Fri, 24 Jul 2015 09:38:13 -0400
Subject: [PATCH 2/3] Moves update_icon(). Adds crayons.

---
 code/game/objects/items/bodybag.dm                     | 7 ++++++-
 code/game/objects/structures/crates_lockers/closets.dm | 4 ----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/code/game/objects/items/bodybag.dm b/code/game/objects/items/bodybag.dm
index a3c0a0a8290..3c7772cf4ad 100644
--- a/code/game/objects/items/bodybag.dm
+++ b/code/game/objects/items/bodybag.dm
@@ -42,7 +42,7 @@
 
 
 /obj/structure/closet/body_bag/attackby(obj/item/I, mob/user, params)
-	if (istype(I, /obj/item/weapon/pen))
+	if (istype(I, /obj/item/weapon/pen) || istype(I, /obj/item/toy/crayon))
 		var/t = stripped_input(user, "What would you like the label to be?", name, null, 53)
 		if(user.get_active_hand() != I)
 			return
@@ -62,6 +62,11 @@
 		overlays.Cut()
 		tagged = 0
 
+/obj/structure/closet/body_bag/update_icon()
+	..()
+	if (tagged)
+		overlays += "bodybag_label"
+
 
 /obj/structure/closet/body_bag/close()
 	if(..())
diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm
index b43e760fe09..bb209cb9515 100644
--- a/code/game/objects/structures/crates_lockers/closets.dm
+++ b/code/game/objects/structures/crates_lockers/closets.dm
@@ -46,10 +46,6 @@
 					overlays += "unlocked"
 			else
 				overlays += "off"
-		if(istype(src, /obj/structure/closet/body_bag)) // GUESS WHAT BODY BAGS ARE CLOSETS
-			var/obj/structure/closet/body_bag/B = src
-			if (B.tagged)
-				overlays += "bodybag_label"
 
 	else
 		if(icon_door_override)

From 1f3440649a4e1606c3bd4d0001f51e124344ea58 Mon Sep 17 00:00:00 2001
From: bgobandit <bandit@mailinator.com>
Date: Sat, 8 Aug 2015 19:49:09 -0400
Subject: [PATCH 3/3] fixes my shit

---
 code/game/objects/items/bodybag.dm | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/code/game/objects/items/bodybag.dm b/code/game/objects/items/bodybag.dm
index 3c7772cf4ad..866a51ea5f4 100644
--- a/code/game/objects/items/bodybag.dm
+++ b/code/game/objects/items/bodybag.dm
@@ -49,23 +49,24 @@
 		if(!in_range(src, user) && loc != user)
 			return
 		if(t)
-			name = "body bag - "
-			name += t
-			overlays += "bodybag_label"
+			name = "body bag - [t]"
 			tagged = 1
+			update_icon()
 		else
 			name = "body bag"
 		return
 	else if(istype(I, /obj/item/weapon/wirecutters))
 		user << "<span class='notice'>You cut the tag off [src].</span>"
 		name = "body bag"
-		overlays.Cut()
 		tagged = 0
+		update_icon()
 
 /obj/structure/closet/body_bag/update_icon()
 	..()
 	if (tagged)
 		overlays += "bodybag_label"
+	else
+		overlays.Cut()
 
 
 /obj/structure/closet/body_bag/close()