diff --git a/code/game/objects/items/weapons/surgery_tools.dm b/code/game/objects/items/weapons/surgery_tools.dm
index 6fafaa70a54..415cd08efea 100644
--- a/code/game/objects/items/weapons/surgery_tools.dm
+++ b/code/game/objects/items/weapons/surgery_tools.dm
@@ -241,7 +241,11 @@
 		/obj/item/surgery/surgicaldrill = "tray_drill",
 		/obj/item/surgery/bonegel = "tray_bone-gel",
 		/obj/item/surgery/FixOVein = "tray_fixovein",
-		/obj/item/stack/medical/advanced/bruise_pack = "tray_bruise_pack"
+		/obj/item/stack/medical/advanced/bruise_pack = "tray_bruise_pack",
+		/obj/item/autopsy_scanner = "tray_autopsy_scanner",
+		/obj/item/device/mass_spectrometer = "tray_mass_spectrometer",
+		/obj/item/reagent_containers/glass/beaker/vial = "tray_vial",
+		/obj/item/reagent_containers/syringe = "tray_syringe"
 	)
 	for (var/obj/item/W in contents)
 		if (types_and_overlays[W.type])
@@ -289,3 +293,27 @@
 /obj/item/storage/box/fancy/tray/throw_impact(atom/hit_atom)
 	..()
 	spill(3, src.loc)
+
+/obj/item/storage/box/fancy/tray/autopsy
+	name = "autopsy tray"
+	starts_with = list(
+		/obj/item/surgery/circular_saw = 1,
+		/obj/item/surgery/hemostat = 1,
+		/obj/item/surgery/retractor = 1,
+		/obj/item/surgery/scalpel = 1,
+		/obj/item/surgery/surgicaldrill = 1,
+		/obj/item/autopsy_scanner = 1,
+		/obj/item/device/mass_spectrometer = 1
+	)
+
+	can_hold = list(
+		/obj/item/surgery/circular_saw,
+		/obj/item/surgery/hemostat,
+		/obj/item/surgery/retractor,
+		/obj/item/surgery/scalpel,
+		/obj/item/surgery/surgicaldrill,
+		/obj/item/autopsy_scanner,
+		/obj/item/device/mass_spectrometer,
+		/obj/item/reagent_containers/glass/beaker/vial,
+		/obj/item/reagent_containers/syringe
+	)
\ No newline at end of file
diff --git a/html/changelogs/AutopsyTray.yml b/html/changelogs/AutopsyTray.yml
new file mode 100644
index 00000000000..5ddf610bbe0
--- /dev/null
+++ b/html/changelogs/AutopsyTray.yml
@@ -0,0 +1,8 @@
+author: TheGreyWolf
+
+delete-after: True
+
+changes:
+  - rscadd: "Investigators are now given an autopsy tray containing most tools needed for autopsies."
+  - maptweak: "Medical & security autopsy now contains an autopsy tray, replacing the tools formerly located in those places."
+  - maptweak: "Medical autopsy now has a sink too."
diff --git a/icons/obj/surgery.dmi b/icons/obj/surgery.dmi
index 3a9d16c5360..781444fa46a 100644
Binary files a/icons/obj/surgery.dmi and b/icons/obj/surgery.dmi differ
diff --git a/maps/aurora/aurora-3_sublevel.dmm b/maps/aurora/aurora-3_sublevel.dmm
index 0ee03e32df5..b34ce76dba6 100644
--- a/maps/aurora/aurora-3_sublevel.dmm
+++ b/maps/aurora/aurora-3_sublevel.dmm
@@ -933,10 +933,8 @@
 "acm" = (
 /obj/effect/floor_decal/corner/paleblue/diagonal,
 /obj/structure/table/standard,
-/obj/item/surgery/scalpel,
-/obj/item/autopsy_scanner,
 /obj/machinery/firealarm/south,
-/obj/item/surgery/surgicaldrill,
+/obj/item/storage/box/fancy/tray/autopsy,
 /turf/simulated/floor/tiled/white,
 /area/medical/morgue)
 "acn" = (
@@ -11847,9 +11845,10 @@
 	dir = 8;
 	pixel_x = 28
 	},
-/obj/machinery/light{
-	dir = 4;
-	icon_state = "tube1"
+/obj/structure/sink/kitchen{
+	dir = 8;
+	name = "Autopsy sink";
+	pixel_x = 20
 	},
 /turf/simulated/floor/tiled/white,
 /area/medical/morgue)
@@ -19727,7 +19726,6 @@
 "aOb" = (
 /obj/effect/floor_decal/corner/paleblue/diagonal,
 /obj/structure/table/standard,
-/obj/item/device/mass_spectrometer,
 /obj/item/device/camera{
 	name = "Autopsy Camera";
 	pixel_x = -2;
@@ -36713,6 +36711,14 @@
 	temperature = 278
 	},
 /area/maintenance/medsublevel_port)
+"xyT" = (
+/obj/effect/floor_decal/corner/paleblue/diagonal,
+/obj/machinery/light{
+	dir = 8;
+	icon_state = "tube1"
+	},
+/turf/simulated/floor/tiled/white,
+/area/medical/morgue)
 "xzL" = (
 /obj/effect/floor_decal/corner_wide/mauve{
 	dir = 1
@@ -75314,7 +75320,7 @@ aHe
 aKf
 aLh
 aMl
-aMk
+xyT
 acm
 aGi
 aUZ
diff --git a/maps/aurora/aurora-4_mainlevel.dmm b/maps/aurora/aurora-4_mainlevel.dmm
index a7da470b0ba..a6eafb3afaa 100644
--- a/maps/aurora/aurora-4_mainlevel.dmm
+++ b/maps/aurora/aurora-4_mainlevel.dmm
@@ -3269,13 +3269,7 @@
 /area/security/forensics_morgue)
 "agv" = (
 /obj/structure/table/standard,
-/obj/item/surgery/surgicaldrill{
-	pixel_x = 1;
-	pixel_y = -2
-	},
-/obj/item/surgery/hemostat,
-/obj/item/surgery/retractor,
-/obj/item/surgery/circular_saw,
+/obj/item/storage/box/fancy/tray/autopsy,
 /turf/simulated/floor/tiled{
 	name = "cooled floor";
 	temperature = 278
@@ -4360,11 +4354,6 @@
 /area/security/main)
 "aiF" = (
 /obj/structure/table/standard,
-/obj/item/autopsy_scanner,
-/obj/item/surgery/scalpel{
-	desc = "Cut, cut, and once more cut. This one is extra shiny!";
-	name = "shiny scalpel"
-	},
 /obj/machinery/light/small,
 /turf/simulated/floor/tiled{
 	name = "cooled floor";