diff --git a/_maps/map_files/debug/runtimestation.dmm b/_maps/map_files/debug/runtimestation.dmm
index 4072ee21a70..149ec89dad1 100644
--- a/_maps/map_files/debug/runtimestation.dmm
+++ b/_maps/map_files/debug/runtimestation.dmm
@@ -662,6 +662,7 @@
 "cK" = (
 /obj/machinery/light/directional/south,
 /obj/structure/table/glass,
+/obj/item/disk/surgery/debug,
 /obj/item/storage/box/monkeycubes{
 	pixel_x = 6;
 	pixel_y = 1
@@ -676,8 +677,7 @@
 /turf/open/floor/iron/white/corner,
 /area/station/medical/medbay)
 "cL" = (
-/obj/item/storage/backpack/duffelbag/syndie/surgery,
-/obj/item/disk/surgery/debug,
+/obj/item/surgery_tray/advanced,
 /obj/structure/table/glass,
 /obj/effect/turf_decal/tile/blue{
 	dir = 8
diff --git a/code/game/objects/items/surgery_tray.dm b/code/game/objects/items/surgery_tray.dm
index 5ef5bfdae7a..1d05bc5ca2f 100644
--- a/code/game/objects/items/surgery_tray.dm
+++ b/code/game/objects/items/surgery_tray.dm
@@ -1,8 +1,31 @@
+/datum/storage/surgery_tray
+	max_total_storage = 30
+	max_specific_storage = WEIGHT_CLASS_NORMAL
+	max_slots = 14
+
+/datum/storage/surgery_tray/New()
+	. = ..()
+	set_holdable(list(
+		/obj/item/blood_filter,
+		/obj/item/bonesetter,
+		/obj/item/cautery,
+		/obj/item/circular_saw,
+		/obj/item/clothing/mask/surgical,
+		/obj/item/hemostat,
+		/obj/item/razor,
+		/obj/item/reagent_containers/medigel,
+		/obj/item/retractor,
+		/obj/item/scalpel,
+		/obj/item/stack/medical/bone_gel,
+		/obj/item/stack/sticky_tape/surgical,
+		/obj/item/surgical_drapes,
+		/obj/item/surgicaldrill,
+	))
+
 /**
  * Surgery Trays
  * A storage object that displays tools in its contents based on tier, better tools are more visible.
  * Can be folded up and carried. Click it to draw a random tool.
- *
  */
 /obj/item/surgery_tray
 	name = "surgery tray"
@@ -183,25 +206,17 @@
 		/obj/item/surgicaldrill,
 	)
 
-/datum/storage/surgery_tray
-	max_total_storage = 30
-	max_specific_storage = WEIGHT_CLASS_NORMAL
-	max_slots = 14
-
-/datum/storage/surgery_tray/New()
-	. = ..()
-	set_holdable(list(
-		/obj/item/blood_filter,
+/// Surgery tray with advanced tools for debug
+/obj/item/surgery_tray/advanced
+	initial_contents = list(
+		/obj/item/scalpel/advanced,
+		/obj/item/retractor/advanced,
+		/obj/item/cautery/advanced,
+		/obj/item/surgical_drapes,
+		/obj/item/reagent_containers/medigel/sterilizine,
 		/obj/item/bonesetter,
-		/obj/item/cautery,
-		/obj/item/circular_saw,
-		/obj/item/clothing/mask/surgical,
-		/obj/item/hemostat,
-		/obj/item/razor,
-		/obj/item/retractor,
-		/obj/item/scalpel,
+		/obj/item/blood_filter,
 		/obj/item/stack/medical/bone_gel,
 		/obj/item/stack/sticky_tape/surgical,
-		/obj/item/surgical_drapes,
-		/obj/item/surgicaldrill,
-	))
+		/obj/item/clothing/mask/surgical,
+	)