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] 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