From d3604b939cee82e2f9afb713a38e26442917b99e Mon Sep 17 00:00:00 2001
From: Casper3667 <8396443+Casper3667@users.noreply.github.com>
Date: Fri, 7 Jan 2022 19:16:37 +0100
Subject: [PATCH] fixes cryobags deploying (#12892)

---
 code/game/objects/items/bodybag.dm | 16 +++++++++-------
 html/changelogs/CryoBagFix.yml     |  6 ++++++
 2 files changed, 15 insertions(+), 7 deletions(-)
 create mode 100644 html/changelogs/CryoBagFix.yml

diff --git a/code/game/objects/items/bodybag.dm b/code/game/objects/items/bodybag.dm
index f8129588b2c..06af46792be 100644
--- a/code/game/objects/items/bodybag.dm
+++ b/code/game/objects/items/bodybag.dm
@@ -8,6 +8,7 @@
 	w_class = ITEMSIZE_SMALL
 	drop_sound = 'sound/items/drop/cloth.ogg'
 	pickup_sound = 'sound/items/pickup/cloth.ogg'
+	var/deploy_type = /obj/structure/closet/body_bag
 
 /obj/item/bodybag/attack_self(mob/user)
 	deploy_bag(user, user.loc)
@@ -21,11 +22,15 @@
 			deploy_bag(user, target)
 
 /obj/item/bodybag/proc/deploy_bag(mob/user, atom/location)
-	var/obj/structure/closet/body_bag/R = new /obj/structure/closet/body_bag(location)
+	var/obj/structure/closet/body_bag/R = new deploy_type(location)
 	R.add_fingerprint(user)
+	tweak_bag(R)
 	playsound(src, 'sound/items/drop/cloth.ogg', 30)
 	qdel(src)
 
+/obj/item/bodybag/proc/tweak_bag(var/obj/structure/closet/body_bag/BB)
+	return
+
 /obj/item/storage/box/bodybags
 	name = "body bags"
 	desc = "This box contains body bags."
@@ -156,15 +161,12 @@
 	icon = 'icons/obj/cryobag.dmi'
 	icon_state = "bodybag_folded"
 	origin_tech = list(TECH_BIO = 4)
+	deploy_type = /obj/structure/closet/body_bag/cryobag
 	var/stasis_power
 
-/obj/item/bodybag/cryobag/attack_self(mob/user)
-	var/obj/structure/closet/body_bag/cryobag/R = new /obj/structure/closet/body_bag/cryobag(user.loc)
+/obj/item/bodybag/cryobag/tweak_bag(var/obj/structure/closet/body_bag/cryobag/C)
 	if(stasis_power)
-		R.stasis_power = stasis_power
-	R.update_icon()
-	R.add_fingerprint(user)
-	qdel(src)
+		C.stasis_power = stasis_power
 
 /obj/structure/closet/body_bag/cryobag
 	name = "stasis bag"
diff --git a/html/changelogs/CryoBagFix.yml b/html/changelogs/CryoBagFix.yml
new file mode 100644
index 00000000000..5e09d190902
--- /dev/null
+++ b/html/changelogs/CryoBagFix.yml
@@ -0,0 +1,6 @@
+author: TheGreyWolf
+
+delete-after: True
+
+changes:
+  - bugfix: "Stasis bags can now be properly deployed on adjacent turfs without becoming bodybags."