Merge branch 'master' of https://github.com/tgstation/-tg-station into pr/11057

Conflicts:
	icons/obj/items.dmi

code/game/objects/items/bodybag.dm

@@ -36,27 +36,36 @@
 	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
 
 
 /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
 		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 of [src].</span>"
+		user << "<span class='notice'>You cut the tag off [src].</span>"
 		name = "body bag"
+		tagged = 0
+		update_icon()
+
+/obj/structure/closet/body_bag/update_icon()
+	..()
+	if (tagged)
+		overlays += "bodybag_label"
+	else
 		overlays.Cut()
 
 

code/game/objects/items/weapons/storage/belt.dm

@@ -205,6 +205,7 @@
 		/obj/item/weapon/gun/projectile/revolver,
 		/obj/item/ammo_box,
 		)
+	alternate_worn_layer = UNDER_SUIT_LAYER
 
 /obj/item/weapon/storage/belt/fannypack
 	name = "fannypack"