From e6912d122829aeffc160276b42b7105de0c13ac0 Mon Sep 17 00:00:00 2001
From: FartMaster69420 <78667902+FartMaster69420@users.noreply.github.com>
Date: Wed, 6 Apr 2022 20:33:52 -0400
Subject: [PATCH 1/4] minitest

---
 vorestation.dme | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vorestation.dme b/vorestation.dme
index 1384c2c471..724a86ff2c 100644
--- a/vorestation.dme
+++ b/vorestation.dme
@@ -4102,7 +4102,6 @@
 #include "maps\expedition_vr\beach\submaps\mountains.dm"
 #include "maps\expedition_vr\beach\submaps\mountains_areas.dm"
 #include "maps\gateway_archive_vr\blackmarketpackers.dm"
-#include "maps\groundbase\groundbase.dm"
 #include "maps\offmap_vr\om_ships\abductor.dm"
 #include "maps\southern_cross\items\clothing\sc_accessory.dm"
 #include "maps\southern_cross\items\clothing\sc_suit.dm"
@@ -4119,5 +4118,6 @@
 #include "maps\submaps\space_submaps\debrisfield\debrisfield.dm"
 #include "maps\submaps\surface_submaps\wilderness\wilderness.dm"
 #include "maps\submaps\surface_submaps\wilderness\wilderness_areas.dm"
+#include "maps\virgo_minitest\virgo_minitest.dm"
 #include "maps\~map_system\maps.dm"
 // END_INCLUDE

From 0f7107217323e3fd71aebbe50e91e0435bc19c8d Mon Sep 17 00:00:00 2001
From: FartMaster69420 <78667902+FartMaster69420@users.noreply.github.com>
Date: Wed, 6 Apr 2022 20:40:08 -0400
Subject: [PATCH 2/4] Stacking Stacks

---
 code/game/objects/items/stacks/stack_vr.dm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 code/game/objects/items/stacks/stack_vr.dm

diff --git a/code/game/objects/items/stacks/stack_vr.dm b/code/game/objects/items/stacks/stack_vr.dm
new file mode 100644
index 0000000000..8997ad7617
--- /dev/null
+++ b/code/game/objects/items/stacks/stack_vr.dm
@@ -0,0 +1,19 @@
+/obj/item/stack/proc/merge(obj/item/stack/S) //Merge src into S, as much as possible
+	var/transfer = get_amount()
+	transfer = min(transfer, S.max_amount - S.amount)
+	if(pulledby)
+		pulledby.start_pulling(S)
+	//S.copy_evidences(src)
+	transfer_fingerprints_to(S)
+	if(blood_DNA)
+		S.blood_DNA |= blood_DNA
+	use(transfer)
+	S.add(transfer)
+
+/obj/item/stack/Crossed(var/atom/movable/AM)
+	//if(istype(AM, /obj/item/stack) && istype(src, /obj/item/stack))
+	if(AM != src)
+		if(istype(AM, src.type) && !AM.throwing)
+			log_and_message_admins("AM is [AM] and source is [src] going ahead with merge.")
+			merge(AM)
+	return ..()
\ No newline at end of file

From 8fa89518babc88f4fd6923ef7532ff1cf9cefc39 Mon Sep 17 00:00:00 2001
From: FartMaster69420 <78667902+FartMaster69420@users.noreply.github.com>
Date: Wed, 6 Apr 2022 21:01:13 -0400
Subject: [PATCH 3/4] Cleanup

---
 code/game/objects/items/stacks/stack_vr.dm | 11 +++++------
 vorestation.dme                            |  1 +
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/code/game/objects/items/stacks/stack_vr.dm b/code/game/objects/items/stacks/stack_vr.dm
index 8997ad7617..14fc8962e9 100644
--- a/code/game/objects/items/stacks/stack_vr.dm
+++ b/code/game/objects/items/stacks/stack_vr.dm
@@ -1,9 +1,10 @@
+// Porting stack dragging/auto stacking from TG.
+
 /obj/item/stack/proc/merge(obj/item/stack/S) //Merge src into S, as much as possible
 	var/transfer = get_amount()
 	transfer = min(transfer, S.max_amount - S.amount)
 	if(pulledby)
 		pulledby.start_pulling(S)
-	//S.copy_evidences(src)
 	transfer_fingerprints_to(S)
 	if(blood_DNA)
 		S.blood_DNA |= blood_DNA
@@ -11,9 +12,7 @@
 	S.add(transfer)
 
 /obj/item/stack/Crossed(var/atom/movable/AM)
-	//if(istype(AM, /obj/item/stack) && istype(src, /obj/item/stack))
-	if(AM != src)
-		if(istype(AM, src.type) && !AM.throwing)
-			log_and_message_admins("AM is [AM] and source is [src] going ahead with merge.")
-			merge(AM)
+	if(AM != src && istype(AM, src.type) && !AM.throwing)
+		log_and_message_admins("AM is [AM] and source is [src] going ahead with merge.")
+		merge(AM)
 	return ..()
\ No newline at end of file
diff --git a/vorestation.dme b/vorestation.dme
index 724a86ff2c..f815ad7def 100644
--- a/vorestation.dme
+++ b/vorestation.dme
@@ -1239,6 +1239,7 @@
 #include "code\game\objects\items\stacks\nanopaste_vr.dm"
 #include "code\game\objects\items\stacks\sandbags.dm"
 #include "code\game\objects\items\stacks\stack.dm"
+#include "code\game\objects\items\stacks\stack_vr.dm"
 #include "code\game\objects\items\stacks\telecrystal.dm"
 #include "code\game\objects\items\stacks\tickets.dm"
 #include "code\game\objects\items\stacks\tiles\fifty_spawner_tiles.dm"

From f121f7fa1a0e7b027add5fee4ae396abca7d2dba Mon Sep 17 00:00:00 2001
From: FartMaster69420 <78667902+FartMaster69420@users.noreply.github.com>
Date: Wed, 6 Apr 2022 21:26:45 -0400
Subject: [PATCH 4/4] Final

Removing debug stuff and disabling minitest
---
 code/game/objects/items/stacks/stack_vr.dm | 4 +++-
 vorestation.dme                            | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/code/game/objects/items/stacks/stack_vr.dm b/code/game/objects/items/stacks/stack_vr.dm
index 14fc8962e9..25ea848ffb 100644
--- a/code/game/objects/items/stacks/stack_vr.dm
+++ b/code/game/objects/items/stacks/stack_vr.dm
@@ -1,6 +1,9 @@
 // Porting stack dragging/auto stacking from TG.
 
 /obj/item/stack/proc/merge(obj/item/stack/S) //Merge src into S, as much as possible
+	if(uses_charge || S.uses_charge) // This should realistically never happen, but in case it does lets avoid breaking things.
+		return
+
 	var/transfer = get_amount()
 	transfer = min(transfer, S.max_amount - S.amount)
 	if(pulledby)
@@ -13,6 +16,5 @@
 
 /obj/item/stack/Crossed(var/atom/movable/AM)
 	if(AM != src && istype(AM, src.type) && !AM.throwing)
-		log_and_message_admins("AM is [AM] and source is [src] going ahead with merge.")
 		merge(AM)
 	return ..()
\ No newline at end of file
diff --git a/vorestation.dme b/vorestation.dme
index f815ad7def..cfbf761943 100644
--- a/vorestation.dme
+++ b/vorestation.dme
@@ -4103,6 +4103,7 @@
 #include "maps\expedition_vr\beach\submaps\mountains.dm"
 #include "maps\expedition_vr\beach\submaps\mountains_areas.dm"
 #include "maps\gateway_archive_vr\blackmarketpackers.dm"
+#include "maps\groundbase\groundbase.dm"
 #include "maps\offmap_vr\om_ships\abductor.dm"
 #include "maps\southern_cross\items\clothing\sc_accessory.dm"
 #include "maps\southern_cross\items\clothing\sc_suit.dm"
@@ -4119,6 +4120,5 @@
 #include "maps\submaps\space_submaps\debrisfield\debrisfield.dm"
 #include "maps\submaps\surface_submaps\wilderness\wilderness.dm"
 #include "maps\submaps\surface_submaps\wilderness\wilderness_areas.dm"
-#include "maps\virgo_minitest\virgo_minitest.dm"
 #include "maps\~map_system\maps.dm"
 // END_INCLUDE