From 29b5b3bf055ef3306266fe75ff9dd598b6aa4ce9 Mon Sep 17 00:00:00 2001
From: Novacat <35587478+Novacat@users.noreply.github.com>
Date: Fri, 9 Jul 2021 14:23:52 -0400
Subject: [PATCH] Merge pull request #10995 from Enzo-Leon/medical_tools

Properly Adds Bio-Regenerator to Surgery Bag
---
 code/datums/supplypacks/medical.dm                     | 3 +--
 code/datums/supplypacks/medical_vr.dm                  | 2 +-
 code/game/objects/items/weapons/storage/firstaid.dm    | 6 ++----
 code/game/objects/items/weapons/storage/firstaid_vr.dm | 7 +++++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/code/datums/supplypacks/medical.dm b/code/datums/supplypacks/medical.dm
index 28ed9f07bf..69f198bbd4 100644
--- a/code/datums/supplypacks/medical.dm
+++ b/code/datums/supplypacks/medical.dm
@@ -66,8 +66,7 @@
 			/obj/item/weapon/surgical/bonegel,
 			/obj/item/weapon/surgical/retractor,
 			/obj/item/weapon/surgical/bonesetter,
-			/obj/item/weapon/surgical/circular_saw,
-			/obj/item/weapon/surgical/bioregen
+			/obj/item/weapon/surgical/circular_saw
 			)
 	cost = 25
 	containertype = /obj/structure/closet/crate/secure/veymed
diff --git a/code/datums/supplypacks/medical_vr.dm b/code/datums/supplypacks/medical_vr.dm
index 2d6a340f0a..4f2dc7e8fe 100644
--- a/code/datums/supplypacks/medical_vr.dm
+++ b/code/datums/supplypacks/medical_vr.dm
@@ -50,4 +50,4 @@
 	cost = 90
 	containertype = /obj/structure/closet/crate/secure
 	containername = "Compact Defibrillator crate"
-	access = access_medical_equip
+	access = access_medical_equip
\ No newline at end of file
diff --git a/code/game/objects/items/weapons/storage/firstaid.dm b/code/game/objects/items/weapons/storage/firstaid.dm
index ca9709b3fb..2bc47b43f5 100644
--- a/code/game/objects/items/weapons/storage/firstaid.dm
+++ b/code/game/objects/items/weapons/storage/firstaid.dm
@@ -137,8 +137,7 @@
 		/obj/item/stack/medical/advanced/bruise_pack,
 		/obj/item/stack/nanopaste,
 		/obj/item/device/healthanalyzer/advanced,
-		/obj/item/weapon/autopsy_scanner,
-		/obj/item/weapon/surgical/bioregen
+		/obj/item/weapon/autopsy_scanner
 		)
 
 	starts_with = list(
@@ -153,8 +152,7 @@
 		/obj/item/weapon/surgical/FixOVein,
 		/obj/item/stack/medical/advanced/bruise_pack,
 		/obj/item/device/healthanalyzer/advanced,
-		/obj/item/weapon/autopsy_scanner,
-		/obj/item/weapon/surgical/bioregen
+		/obj/item/weapon/autopsy_scanner
 		)
 
 /obj/item/weapon/storage/firstaid/clotting
diff --git a/code/game/objects/items/weapons/storage/firstaid_vr.dm b/code/game/objects/items/weapons/storage/firstaid_vr.dm
index 09d5117ece..7120d9c3af 100644
--- a/code/game/objects/items/weapons/storage/firstaid_vr.dm
+++ b/code/game/objects/items/weapons/storage/firstaid_vr.dm
@@ -83,7 +83,8 @@
 		/obj/item/stack/medical/advanced/bruise_pack,
 		/obj/item/stack/nanopaste,
 		/obj/item/device/healthanalyzer,
-		/obj/item/weapon/autopsy_scanner
+		/obj/item/weapon/autopsy_scanner,
+		/obj/item/weapon/surgical/bioregen
 		)
 
 	starts_with = list(
@@ -98,9 +99,11 @@
 		/obj/item/weapon/surgical/FixOVein,
 		/obj/item/stack/medical/advanced/bruise_pack,
 		/obj/item/device/healthanalyzer,
-		/obj/item/weapon/autopsy_scanner
+		/obj/item/weapon/autopsy_scanner,
+		/obj/item/weapon/surgical/bioregen
 		)
 
+
 /obj/item/weapon/storage/firstaid/clotting
 	icon_state = "clottingkit"