From f59d57571c27b477553ad695986f69d000e2e740 Mon Sep 17 00:00:00 2001
From: Sparky <ben.polwart@gmail.com>
Date: Sat, 20 Feb 2021 12:56:51 +0000
Subject: [PATCH] Body bag Label Fix (#11229)

---
 code/game/objects/items/bodybag.dm                    | 11 +++++++++--
 .../objects/structures/stool_bed_chair_nest/bed.dm    |  5 ++---
 html/changelogs/label.yml                             |  6 ++++++
 3 files changed, 17 insertions(+), 5 deletions(-)
 create mode 100644 html/changelogs/label.yml

diff --git a/code/game/objects/items/bodybag.dm b/code/game/objects/items/bodybag.dm
index e68fd6e5f83..ba60b2f0b66 100644
--- a/code/game/objects/items/bodybag.dm
+++ b/code/game/objects/items/bodybag.dm
@@ -71,7 +71,14 @@
 			src.name = "body bag - "
 			src.name += t
 			playsound(src, pick('sound/bureaucracy/pen1.ogg','sound/bureaucracy/pen2.ogg'), 20)
-			add_overlay("bodybag_label")
+			if(istype(buckled_to, /obj/structure/bed/roller))
+				var/obj/structure/bed/roller/R = buckled_to
+				if(R.bag_strap)
+					LAZYREMOVE(overlays, image(R.icon, R.bag_strap))
+					LAZYADD(overlays, image(icon, "bodybag_label"))
+					LAZYADD(overlays, image(R.icon, R.bag_strap))
+			else
+				LAZYADD(overlays, image(icon, "bodybag_label"))
 		else
 			src.name = "body bag"
 		return
@@ -79,7 +86,7 @@
 		to_chat(user, "You cut the tag off the bodybag.")
 		playsound(src.loc, 'sound/items/wirecutter.ogg', 50, 1)
 		src.name = "body bag"
-		cut_overlays()
+		LAZYREMOVE(overlays, image(icon, "bodybag_label"))
 
 /obj/structure/closet/body_bag/store_mobs(var/stored_units)
 	contains_body = ..()
diff --git a/code/game/objects/structures/stool_bed_chair_nest/bed.dm b/code/game/objects/structures/stool_bed_chair_nest/bed.dm
index 353c6da1613..4ead4212bd2 100644
--- a/code/game/objects/structures/stool_bed_chair_nest/bed.dm
+++ b/code/game/objects/structures/stool_bed_chair_nest/bed.dm
@@ -252,7 +252,7 @@
 			iv.pixel_y = 6
 		overlays += iv
 	if(bag_strap && istype(buckled, /obj/structure/closet/body_bag))
-		buckled.overlays += image(icon, bag_strap)
+		LAZYADD(buckled.overlays, image(icon, bag_strap))
 
 /obj/structure/bed/roller/attackby(obj/item/I, mob/user)
 	if(iswrench(I) || istype(I, /obj/item/stack) || iswirecutter(I))
@@ -360,8 +360,7 @@
 			if(iv_attached)
 				detach_iv(M, usr)
 		else
-			MA.overlays.Cut() //Remove straps
-			MA.update_icon() //Add label back (if it had one)
+			LAZYREMOVE(MA.overlays, image(icon, bag_strap)) //Remove straps
 		density = FALSE
 		MA.pixel_y = 0
 		update_icon()
diff --git a/html/changelogs/label.yml b/html/changelogs/label.yml
new file mode 100644
index 00000000000..5da4a80398f
--- /dev/null
+++ b/html/changelogs/label.yml
@@ -0,0 +1,6 @@
+author: Sparky_hotdog
+
+delete-after: True
+
+changes:
+  - bugfix: "Fixed bodybags losing their labels after being unbuckled to roller beds."