diff --git a/code/game/objects/effects/spawners/corpsespawner.dm b/code/game/objects/effects/spawners/corpsespawner.dm
index 4ba2917f817..62cd1cf29e8 100644
--- a/code/game/objects/effects/spawners/corpsespawner.dm
+++ b/code/game/objects/effects/spawners/corpsespawner.dm
@@ -287,6 +287,19 @@
 	corpseid = 1
 	corpseidjob = "Ironhammer Operative"
 	corpseidaccess = "ihoper"
+	injury_level = 6
+
+/obj/landmark/corpse/scientist
+	name = "Moebius Scientist"
+	corpseuniform = /obj/item/clothing/under/rank/scientist
+	corpseshoes = /obj/item/clothing/shoes/jackboots
+	corpsegloves = list(/obj/item/clothing/gloves/thick, /obj/item/clothing/gloves/latex)
+	corpseradio = /obj/item/device/radio/headset/headset_sci
+	corpsesuit = /obj/item/clothing/suit/storage/toggle/labcoat/science
+	corpsehelmet = list(/obj/item/clothing/head/beret/moebius, null)
+	corpseid = 1
+	corpseidjob = "Moebius Scientist"
+	corpseidaccess = "ihoper"
 	injury_level = 9
 
 ////LEGACY CORPSES////REPLACE WITH NEW CORPSES IF FOUND IN MAP////
diff --git a/maps/CEVEris/_CEV_Eris.dmm b/maps/CEVEris/_CEV_Eris.dmm
index 6b06023d9ba..2d7868aad15 100644
--- a/maps/CEVEris/_CEV_Eris.dmm
+++ b/maps/CEVEris/_CEV_Eris.dmm
@@ -3293,6 +3293,7 @@
 /obj/structure/bed/chair/comfy/black{
 	dir = 1
 	},
+/obj/landmark/join/start/ihc,
 /turf/simulated/floor/wood,
 /area/eris/command/commander)
 "ahY" = (
@@ -26402,8 +26403,8 @@
 /turf/simulated/floor/plating/under,
 /area/eris/maintenance/section3deck1central)
 "bkL" = (
-/obj/structure/table/reinforced,
 /obj/item/tool/crowbar,
+/obj/structure/table/standard,
 /turf/simulated/floor/tiled/white/gray_platform,
 /area/eris/rnd/lab)
 "bkM" = (
@@ -31019,6 +31020,7 @@
 /obj/machinery/light{
 	dir = 4
 	},
+/obj/item/gun/projectile/shotgun/pump/gladstone,
 /turf/simulated/floor/tiled/steel,
 /area/eris/security/lobby)
 "bwl" = (
@@ -31036,6 +31038,7 @@
 /obj/machinery/light{
 	dir = 1
 	},
+/obj/machinery/porta_turret/excelsior,
 /turf/simulated/floor/tiled/steel,
 /area/eris/hallway/main/section1)
 "bwp" = (
@@ -31053,6 +31056,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
+/obj/machinery/porta_turret/excelsior,
 /turf/simulated/floor/tiled/steel,
 /area/eris/hallway/main/section1)
 "bwr" = (
@@ -31959,6 +31963,7 @@
 /obj/machinery/light{
 	dir = 4
 	},
+/obj/effect/decal/cleanable/blood/splatter,
 /turf/simulated/floor/tiled/steel,
 /area/eris/hallway/main/section2)
 "byn" = (
@@ -33767,6 +33772,7 @@
 	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
+/obj/effect/decal/cleanable/blood/splatter,
 /turf/simulated/floor/tiled/white/panels,
 /area/eris/rnd/scient)
 "bCN" = (
@@ -38401,7 +38407,6 @@
 /area/eris/maintenance/section4deck4port)
 "bMR" = (
 /obj/structure/table/standard,
-/obj/machinery/recharger,
 /obj/machinery/alarm{
 	pixel_y = 26
 	},
@@ -41793,13 +41798,10 @@
 /turf/simulated/floor/tiled/steel,
 /area/eris/maintenance/section1deck3central)
 "bVm" = (
-/obj/structure/showcase{
-	desc = "Ancient robotic frame, that is long deactivated and rusted solid. However, it still strikes am awesome pose, that somehow makes you think of justice and righteousness.";
-	name = "Statue of Judge Boopsky"
-	},
 /obj/machinery/holoposter{
 	pixel_y = 32
 	},
+/obj/machinery/excelsior_boombox,
 /turf/simulated/floor/tiled/dark/gray_platform,
 /area/eris/command/meeting_room)
 "bVn" = (
@@ -41859,9 +41861,9 @@
 	},
 /area/eris/hallway/main/section1)
 "bVw" = (
-/obj/structure/table/reinforced,
 /obj/machinery/door/window/brigdoor/northleft,
 /obj/machinery/door/firedoor,
+/obj/structure/table/standard,
 /turf/simulated/floor/tiled/steel/cargo,
 /area/eris/security/lobby)
 "bVx" = (
@@ -41875,10 +41877,10 @@
 /turf/simulated/floor/tiled/dark,
 /area/eris/security/warden)
 "bVy" = (
-/obj/structure/table/reinforced,
 /obj/structure/disposalpipe/segment,
 /obj/machinery/door/window/brigdoor/northright,
 /obj/machinery/door/firedoor,
+/obj/structure/table/standard,
 /turf/simulated/floor/tiled/steel/cargo,
 /area/eris/security/lobby)
 "bVz" = (
@@ -43095,7 +43097,6 @@
 /area/eris/security/lobby)
 "bYH" = (
 /obj/structure/table/standard,
-/obj/machinery/recharger,
 /turf/simulated/floor/tiled/steel/gray_perforated,
 /area/eris/security/lobby)
 "bYI" = (
@@ -45472,6 +45473,10 @@
 	},
 /turf/simulated/floor/plating/under,
 /area/eris/maintenance/section2deck3starboard)
+"cex" = (
+/obj/structure/sign/faction/excelsior,
+/turf/simulated/wall,
+/area/eris/command/fo/quarters)
 "cey" = (
 /obj/machinery/flasher{
 	id = "AI";
@@ -48111,8 +48116,8 @@
 /turf/simulated/floor/tiled/white,
 /area/eris/rnd/lab)
 "ckH" = (
-/obj/structure/table/reinforced,
 /obj/item/device/radio,
+/obj/structure/table/standard,
 /turf/simulated/floor/tiled/white/gray_platform,
 /area/eris/rnd/lab)
 "ckI" = (
@@ -48148,6 +48153,7 @@
 /turf/simulated/floor/tiled/white,
 /area/eris/rnd/research)
 "ckP" = (
+/obj/structure/table/standard,
 /turf/simulated/floor/tiled/white/gray_platform,
 /area/eris/rnd/lab)
 "ckQ" = (
@@ -51789,6 +51795,7 @@
 /obj/structure/bed/chair/office/light{
 	dir = 1
 	},
+/obj/landmark/join/start/rd,
 /turf/simulated/floor/carpet/purcarpet,
 /area/eris/command/meo)
 "cuF" = (
@@ -53437,11 +53444,11 @@
 /turf/simulated/floor/plating/under,
 /area/eris/maintenance/section1deck2central)
 "cyQ" = (
-/obj/structure/reagent_dispensers/water_cooler,
 /obj/item/device/radio/intercom{
 	dir = 4;
 	pixel_x = -22
 	},
+/obj/machinery/complant_teleporter,
 /turf/simulated/floor/tiled/dark/gray_platform,
 /area/eris/command/meeting_room)
 "cyR" = (
@@ -53716,9 +53723,7 @@
 	dir = 8;
 	pixel_x = 22
 	},
-/obj/machinery/vending/powermat{
-	dir = 8
-	},
+/obj/machinery/complant_maker,
 /turf/simulated/floor/tiled/dark/gray_platform,
 /area/eris/command/meeting_room)
 "czz" = (
@@ -53970,8 +53975,6 @@
 /turf/simulated/floor/tiled/techmaint,
 /area/eris/maintenance/section3deck3port)
 "cAg" = (
-/obj/structure/table/reinforced,
-/obj/item/storage/box/donut,
 /obj/machinery/power/apc{
 	dir = 8;
 	name = "West APC";
@@ -53981,6 +53984,7 @@
 	d2 = 4;
 	icon_state = "0-4"
 	},
+/obj/machinery/autolathe/excelsior,
 /turf/simulated/floor/tiled/dark/gray_platform,
 /area/eris/command/meeting_room)
 "cAh" = (
@@ -54159,14 +54163,6 @@
 /turf/simulated/open,
 /area/eris/quartermaster/storage)
 "cAC" = (
-/obj/machinery/vending/coffee,
-/turf/simulated/floor/tiled/dark/gray_platform,
-/area/eris/command/meeting_room)
-"cAD" = (
-/obj/machinery/photocopier,
-/obj/machinery/camera/network/command{
-	dir = 1
-	},
 /turf/simulated/floor/tiled/dark/gray_platform,
 /area/eris/command/meeting_room)
 "cAE" = (
@@ -54280,7 +54276,6 @@
 /turf/simulated/floor/plating,
 /area/eris/hallway/side/atmosphericshallway)
 "cAP" = (
-/obj/machinery/vending/cigarette,
 /obj/machinery/camera/network/command{
 	dir = 1
 	},
@@ -54336,10 +54331,10 @@
 /turf/simulated/floor/plating,
 /area/eris/quartermaster/storage)
 "cAX" = (
-/obj/machinery/suit_storage_unit/standard_unit,
 /obj/machinery/holoposter{
 	pixel_x = -32
 	},
+/obj/machinery/excelsior_autodoc,
 /turf/simulated/floor/tiled/dark/gray_platform,
 /area/eris/command/meeting_room)
 "cAY" = (
@@ -54389,10 +54384,10 @@
 /turf/simulated/floor/tiled/steel/bluecorner,
 /area/eris/hallway/side/bridgehallway)
 "cBd" = (
-/obj/machinery/suit_storage_unit/standard_unit,
 /obj/machinery/holoposter{
 	pixel_x = 32
 	},
+/obj/machinery/excelsior_autodoc,
 /turf/simulated/floor/tiled/dark/gray_platform,
 /area/eris/command/meeting_room)
 "cBe" = (
@@ -54590,7 +54585,7 @@
 /turf/simulated/floor/tiled/steel/bluecorner,
 /area/eris/hallway/side/bridgehallway)
 "cBB" = (
-/obj/machinery/suit_storage_unit/standard_unit,
+/obj/machinery/excelsior_autodoc,
 /turf/simulated/floor/tiled/dark/gray_platform,
 /area/eris/command/meeting_room)
 "cBD" = (
@@ -57462,6 +57457,7 @@
 	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/landmark/join/start/merchant,
 /turf/simulated/floor/tiled/steel/gray_perforated,
 /area/eris/quartermaster/office)
 "cIP" = (
@@ -60204,6 +60200,7 @@
 	dir = 2;
 	icon_state = "pipe-c"
 	},
+/obj/item/paper_bin,
 /turf/simulated/floor/tiled/dark,
 /area/eris/command/meeting_room)
 "cQp" = (
@@ -61554,7 +61551,7 @@
 /area/eris/maintenance/section2deck2port)
 "cUd" = (
 /obj/machinery/door/firedoor,
-/obj/effect/window_lwall_spawn/smartspawn,
+/obj/effect/window_lwall_spawn/reinforced,
 /turf/simulated/floor/plating,
 /area/eris/command/bridgebar)
 "cUe" = (
@@ -62418,27 +62415,17 @@
 /turf/simulated/floor/plating/under,
 /area/eris/maintenance/section3deck4starboard)
 "cWt" = (
-/obj/structure/flora/pottedplant{
-	icon_state = "plant-17"
-	},
 /obj/machinery/camera/network/command{
 	dir = 4
 	},
-/obj/structure/sign/faction/moebius{
-	pixel_x = -32
-	},
+/obj/machinery/shieldwallgen/excelsior,
 /turf/simulated/floor/tiled/dark,
 /area/eris/command/meeting_room)
 "cWu" = (
-/obj/structure/flora/pottedplant{
-	icon_state = "plant-17"
-	},
 /obj/machinery/camera/network/command{
 	dir = 8
 	},
-/obj/structure/sign/faction/astersguild{
-	pixel_x = 32
-	},
+/obj/machinery/shieldwallgen/excelsior,
 /turf/simulated/floor/tiled/dark,
 /area/eris/command/meeting_room)
 "cWv" = (
@@ -65190,11 +65177,9 @@
 /turf/simulated/floor/tiled/white/violetcorener,
 /area/eris/rnd/xenobiology)
 "dcL" = (
-/obj/structure/table/reinforced,
-/obj/item/flame/lighter/zippo,
-/obj/item/tool/tape_roll,
-/turf/simulated/floor/carpet/bcarpet,
-/area/eris/command/meeting_room)
+/obj/landmark/corpse/operative,
+/turf/simulated/floor/tiled/dark/gray_perforated,
+/area/eris/security/warden)
 "dcM" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -65448,7 +65433,7 @@
 /area/eris/hallway/side/atmosphericshallway)
 "ddt" = (
 /obj/machinery/door/firedoor,
-/obj/effect/window_lwall_spawn/smartspawn,
+/obj/effect/window_lwall_spawn/reinforced,
 /turf/simulated/floor/plating,
 /area/space)
 "ddu" = (
@@ -65847,7 +65832,6 @@
 /turf/simulated/floor/carpet/bcarpet,
 /area/eris/command/meeting_room)
 "dei" = (
-/obj/structure/bed/chair/comfy/black,
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
@@ -65858,7 +65842,6 @@
 	d2 = 2;
 	icon_state = "1-2"
 	},
-/obj/landmark/join/start/captain,
 /turf/simulated/floor/carpet/bcarpet,
 /area/eris/command/meeting_room)
 "dej" = (
@@ -65925,43 +65908,80 @@
 /turf/simulated/floor/carpet/bcarpet,
 /area/eris/command/meeting_room)
 "det" = (
-/obj/structure/bed/chair/comfy/black{
-	dir = 4
-	},
-/obj/landmark/join/start/hop,
+/obj/item/computer_hardware/hard_drive/portable/design/excelsior/core,
+/obj/item/computer_hardware/hard_drive/portable/design/excelsior/core,
 /turf/simulated/floor/carpet/bcarpet,
 /area/eris/command/meeting_room)
 "deu" = (
-/obj/structure/table/reinforced,
-/obj/item/paper_bin,
+/obj/item/stock_parts/scanning_module/excelsior,
+/obj/item/stock_parts/scanning_module/excelsior,
+/obj/item/stock_parts/scanning_module/excelsior,
+/obj/item/stock_parts/scanning_module/excelsior,
+/obj/item/stock_parts/scanning_module/excelsior,
+/obj/item/stock_parts/scanning_module/excelsior,
+/obj/item/stock_parts/scanning_module/excelsior,
+/obj/item/stock_parts/scanning_module/excelsior,
+/obj/item/stock_parts/scanning_module/excelsior,
+/obj/item/stock_parts/scanning_module/excelsior,
+/obj/item/stock_parts/micro_laser/excelsior,
+/obj/item/stock_parts/micro_laser/excelsior,
+/obj/item/stock_parts/micro_laser/excelsior,
+/obj/item/stock_parts/micro_laser/excelsior,
+/obj/item/stock_parts/micro_laser/excelsior,
+/obj/item/stock_parts/micro_laser/excelsior,
+/obj/item/stock_parts/micro_laser/excelsior,
+/obj/item/stock_parts/micro_laser/excelsior,
+/obj/item/stock_parts/micro_laser/excelsior,
+/obj/item/stock_parts/micro_laser/excelsior,
+/obj/item/stock_parts/matter_bin/excelsior,
+/obj/item/stock_parts/matter_bin/excelsior,
+/obj/item/stock_parts/matter_bin/excelsior,
+/obj/item/stock_parts/matter_bin/excelsior,
+/obj/item/stock_parts/matter_bin/excelsior,
+/obj/item/stock_parts/matter_bin/excelsior,
+/obj/item/stock_parts/matter_bin/excelsior,
+/obj/item/stock_parts/matter_bin/excelsior,
+/obj/item/stock_parts/matter_bin/excelsior,
+/obj/item/stock_parts/matter_bin/excelsior,
+/obj/item/stock_parts/manipulator/excelsior,
+/obj/item/stock_parts/manipulator/excelsior,
+/obj/item/stock_parts/manipulator/excelsior,
+/obj/item/stock_parts/manipulator/excelsior,
+/obj/item/stock_parts/manipulator/excelsior,
+/obj/item/stock_parts/manipulator/excelsior,
+/obj/item/stock_parts/manipulator/excelsior,
+/obj/item/stock_parts/manipulator/excelsior,
+/obj/item/stock_parts/manipulator/excelsior,
+/obj/item/stock_parts/manipulator/excelsior,
+/obj/item/stock_parts/capacitor/excelsior,
+/obj/item/stock_parts/capacitor/excelsior,
+/obj/item/stock_parts/capacitor/excelsior,
+/obj/item/stock_parts/capacitor/excelsior,
+/obj/item/stock_parts/capacitor/excelsior,
+/obj/item/stock_parts/capacitor/excelsior,
+/obj/item/stock_parts/capacitor/excelsior,
+/obj/item/stock_parts/capacitor/excelsior,
+/obj/item/stock_parts/capacitor/excelsior,
+/obj/item/stock_parts/capacitor/excelsior,
 /turf/simulated/floor/carpet/bcarpet,
 /area/eris/command/meeting_room)
 "dev" = (
-/obj/structure/table/reinforced,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/structure/cable/green{
-	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2"
-	},
-/turf/simulated/floor/carpet/bcarpet,
-/area/eris/command/meeting_room)
+/obj/landmark/corpse/operative,
+/turf/simulated/floor/tiled/steel/bluecorner,
+/area/eris/security/prisoncells)
 "dew" = (
-/obj/structure/table/reinforced,
-/obj/item/storage/box/donut,
-/turf/simulated/floor/carpet/bcarpet,
-/area/eris/command/meeting_room)
+/obj/effect/decal/cleanable/graffiti/graffiti_excelsior,
+/turf/simulated/wall/r_wall,
+/area/eris/security/lobby)
 "dex" = (
-/obj/structure/bed/chair/comfy/black{
-	dir = 8
-	},
-/obj/landmark/join/start/ihc,
-/turf/simulated/floor/carpet/bcarpet,
-/area/eris/command/meeting_room)
+/obj/landmark/corpse/operative,
+/obj/effect/decal/cleanable/blood/splatter,
+/turf/simulated/floor/tiled/steel,
+/area/eris/security/lobby)
 "dey" = (
 /obj/machinery/door/firedoor,
-/obj/effect/window_lwall_spawn/smartspawn,
+/obj/effect/window_lwall_spawn/reinforced,
 /turf/simulated/floor/plating,
 /area/turret_protected/ai_upload_foyer{
 	name = "AI Upload Foyer"
@@ -66053,7 +66073,6 @@
 /turf/simulated/floor/carpet/turcarpet,
 /area/eris/command/captain)
 "deI" = (
-/mob/living/simple_animal/iriska,
 /turf/simulated/floor/carpet/turcarpet,
 /area/eris/command/captain)
 "deJ" = (
@@ -66108,25 +66127,26 @@
 /turf/simulated/floor/carpet/bcarpet,
 /area/eris/command/meeting_room)
 "deP" = (
-/obj/structure/bed/chair/comfy/black{
-	dir = 4
-	},
 /obj/structure/cable/green{
 	d1 = 4;
 	d2 = 8;
 	icon_state = "4-8"
 	},
-/obj/landmark/join/start/cmo,
+/obj/item/computer_hardware/hard_drive/portable/design/excelsior/weapons,
+/obj/item/computer_hardware/hard_drive/portable/design/excelsior/weapons,
 /turf/simulated/floor/carpet/bcarpet,
 /area/eris/command/meeting_room)
 "deQ" = (
-/obj/structure/table/reinforced,
-/obj/machinery/recharger,
 /obj/structure/cable/green{
 	d1 = 4;
 	d2 = 8;
 	icon_state = "4-8"
 	},
+/obj/item/clothing/glasses/hud/excelsior,
+/obj/item/clothing/glasses/hud/excelsior,
+/obj/item/clothing/glasses/hud/excelsior,
+/obj/item/clothing/glasses/hud/excelsior,
+/obj/item/clothing/glasses/hud/excelsior,
 /turf/simulated/floor/carpet/bcarpet,
 /area/eris/command/meeting_room)
 "deR" = (
@@ -66146,17 +66166,25 @@
 /turf/simulated/floor/carpet/bcarpet,
 /area/eris/command/meeting_room)
 "deS" = (
-/obj/structure/table/reinforced,
-/obj/item/storage/secure/briefcase,
-/turf/simulated/floor/carpet/bcarpet,
-/area/eris/command/meeting_room)
+/obj/item/ammo_magazine/ammobox/shotgun_small/buckshot,
+/turf/simulated/floor/tiled/steel,
+/area/eris/security/lobby)
 "deT" = (
-/obj/structure/bed/chair/comfy/black{
-	dir = 8
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
 	},
-/obj/landmark/join/start/chief_engineer,
-/turf/simulated/floor/carpet/bcarpet,
-/area/eris/command/meeting_room)
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/structure/cable/green{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
+	},
+/obj/effect/decal/cleanable/blood/splatter,
+/obj/item/gun/projectile/automatic/sol,
+/turf/simulated/floor/tiled/steel/bluecorner,
+/area/eris/security/lobby)
 "deU" = (
 /obj/item/stool/padded,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -66317,17 +66345,25 @@
 /turf/simulated/floor/tiled/white/violetcorener,
 /area/eris/rnd/research)
 "dfl" = (
-/obj/structure/bed/chair/comfy/black{
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
-/obj/landmark/join/start/merchant,
-/turf/simulated/floor/carpet/bcarpet,
-/area/eris/command/meeting_room)
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/structure/cable/green{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
+	},
+/obj/item/ammo_magazine/ihclrifle,
+/turf/simulated/floor/tiled/steel/bluecorner,
+/area/eris/security/lobby)
 "dfm" = (
-/obj/structure/table/reinforced,
-/obj/item/device/megaphone,
-/turf/simulated/floor/carpet/bcarpet,
-/area/eris/command/meeting_room)
+/obj/landmark/corpse/operative,
+/obj/effect/decal/cleanable/blood/splatter,
+/turf/simulated/floor/tiled/steel/gray_perforated,
+/area/eris/security/lobby)
 "dfn" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -66348,12 +66384,9 @@
 /turf/simulated/floor/wood,
 /area/eris/medical/psych)
 "dfp" = (
-/obj/structure/bed/chair/comfy/black{
-	dir = 8
-	},
-/obj/landmark/join/start/rd,
-/turf/simulated/floor/carpet/bcarpet,
-/area/eris/command/meeting_room)
+/obj/item/gun/projectile/selfload/moebius,
+/turf/simulated/floor/tiled/white/brown_perforated,
+/area/eris/medical/reception)
 "dfq" = (
 /obj/machinery/door/firedoor,
 /obj/machinery/door/airlock/command{
@@ -66396,6 +66429,7 @@
 /obj/structure/bed/chair/comfy/brown{
 	dir = 8
 	},
+/obj/landmark/join/start/captain,
 /turf/simulated/floor/carpet/turcarpet,
 /area/eris/command/captain)
 "dfw" = (
@@ -66475,15 +66509,17 @@
 /turf/simulated/floor/tiled/dark/gray_platform,
 /area/eris/crew_quarters/janitor)
 "dfG" = (
-/obj/structure/table/reinforced,
-/turf/simulated/floor/carpet/bcarpet,
-/area/eris/command/meeting_room)
+/obj/effect/decal/cleanable/blood/splatter,
+/turf/simulated/floor/tiled/white/brown_perforated,
+/area/eris/medical/reception)
 "dfH" = (
-/obj/structure/bed/chair/comfy/black{
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/table/standard,
+/turf/simulated/floor/tiled/steel/monofloor{
 	dir = 8
 	},
-/turf/simulated/floor/carpet/bcarpet,
-/area/eris/command/meeting_room)
+/area/eris/hallway/main/section2)
 "dfI" = (
 /obj/machinery/status_display{
 	pixel_x = 32
@@ -66533,6 +66569,7 @@
 /turf/simulated/floor/wood,
 /area/eris/command/fo/quarters)
 "dfN" = (
+/mob/living/simple_animal/iriska,
 /turf/simulated/floor/carpet/turcarpet,
 /area/eris/command/captain)
 "dfO" = (
@@ -66578,6 +66615,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
 	},
+/obj/structure/table/standard,
 /turf/simulated/floor/carpet/bcarpet,
 /area/eris/command/meeting_room)
 "dfV" = (
@@ -66592,12 +66630,15 @@
 	d2 = 2;
 	icon_state = "1-2"
 	},
+/obj/structure/table/standard,
 /turf/simulated/floor/carpet/bcarpet,
 /area/eris/command/meeting_room)
 "dfW" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
+/obj/structure/table/standard,
+/obj/item/storage/box/donut,
 /turf/simulated/floor/carpet/bcarpet,
 /area/eris/command/meeting_room)
 "dfX" = (
@@ -67045,6 +67086,7 @@
 /obj/structure/sign/department/conference_room{
 	pixel_y = 32
 	},
+/obj/machinery/porta_turret/excelsior,
 /turf/simulated/floor/carpet/bcarpet,
 /area/eris/command/meeting_room)
 "dgW" = (
@@ -67089,6 +67131,7 @@
 	d2 = 8;
 	icon_state = "4-8"
 	},
+/obj/machinery/porta_turret/excelsior,
 /turf/simulated/floor/carpet/bcarpet,
 /area/eris/command/meeting_room)
 "dgY" = (
@@ -67362,6 +67405,7 @@
 /area/eris/command/fo/quarters)
 "dhz" = (
 /obj/structure/bed/chair/comfy/black,
+/obj/landmark/join/start/hop,
 /turf/simulated/floor/carpet/blucarpet,
 /area/eris/command/fo/quarters)
 "dhA" = (
@@ -68778,6 +68822,7 @@
 /obj/structure/bed/chair/office/light{
 	dir = 4
 	},
+/obj/landmark/join/start/chief_engineer,
 /turf/simulated/floor/tiled/steel/brown_perforated,
 /area/eris/command/exultant)
 "dkP" = (
@@ -73837,12 +73882,17 @@
 /turf/simulated/floor/tiled/steel/cargo,
 /area/eris/hallway/side/section3starboard)
 "dwG" = (
-/obj/structure/bed/chair/comfy/black{
+/obj/structure/cable/green{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/table/standard,
+/turf/simulated/floor/tiled/steel/monofloor{
 	dir = 4
 	},
-/obj/landmark/join/start/chaplain,
-/turf/simulated/floor/carpet/bcarpet,
-/area/eris/command/meeting_room)
+/area/eris/hallway/main/section2)
 "dwH" = (
 /obj/structure/table/standard,
 /obj/item/storage/firstaid/toxin{
@@ -74542,6 +74592,9 @@
 /obj/machinery/status_display/supply_display{
 	pixel_x = -32
 	},
+/obj/structure/bed/chair/comfy/black{
+	dir = 4
+	},
 /turf/simulated/floor/carpet/bcarpet,
 /area/eris/command/meeting_room)
 "dyF" = (
@@ -75111,6 +75164,7 @@
 /obj/structure/bed/chair/comfy/teal{
 	dir = 4
 	},
+/obj/landmark/join/start/cmo,
 /turf/simulated/floor/carpet/sblucarpet,
 /area/eris/command/mbo)
 "dzU" = (
@@ -75968,6 +76022,7 @@
 "dBP" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/item/ammo_magazine/hpistol,
 /turf/simulated/floor/tiled/white/brown_perforated,
 /area/eris/medical/reception)
 "dBQ" = (
@@ -76536,6 +76591,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
+/obj/effect/decal/cleanable/blood/splatter,
 /turf/simulated/floor/tiled/white,
 /area/eris/medical/reception)
 "dDh" = (
@@ -78951,7 +79007,7 @@
 	},
 /area/eris/security/lobby)
 "dIQ" = (
-/obj/structure/sign/faction/ironhammer,
+/obj/structure/sign/faction/excelsior,
 /turf/simulated/wall/r_wall,
 /area/eris/security/lobby)
 "dIR" = (
@@ -99649,6 +99705,10 @@
 /obj/effect/window_lwall_spawn/smartspawn,
 /turf/simulated/floor/plating,
 /area/eris/rnd/lab)
+"fRi" = (
+/obj/structure/sign/faction/excelsior,
+/turf/simulated/wall,
+/area/eris/command/meo/quarters)
 "fRY" = (
 /obj/structure/disposalpipe/segment,
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
@@ -100363,6 +100423,7 @@
 /obj/structure/bed/chair/comfy/black{
 	dir = 1
 	},
+/obj/landmark/join/start/chaplain,
 /turf/simulated/floor/carpet/bcarpet,
 /area/eris/neotheology/office)
 "hAw" = (
@@ -100457,6 +100518,11 @@
 	},
 /turf/simulated/floor/tiled/dark/gray_platform,
 /area/eris/quartermaster/hangarsupply)
+"hLz" = (
+/obj/machinery/door/firedoor,
+/obj/effect/window_lwall_spawn/reinforced,
+/turf/simulated/floor/plating,
+/area/eris/hallway/side/bridgehallway)
 "hMo" = (
 /obj/machinery/holomap{
 	dir = 8;
@@ -101391,6 +101457,20 @@
 	},
 /turf/simulated/floor/tiled/dark/golden,
 /area/eris/neotheology/chapel)
+"jUE" = (
+/obj/structure/cable/green{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+	dir = 8
+	},
+/obj/structure/table/standard,
+/turf/simulated/floor/tiled/steel/monofloor{
+	dir = 4
+	},
+/area/eris/hallway/main/section2)
 "jUO" = (
 /obj/effect/shuttle_landmark/merc/atmos,
 /turf/space,
@@ -102347,6 +102427,16 @@
 	},
 /turf/simulated/floor/tiled/steel/techfloor,
 /area/eris/engineering/foyer)
+"mrT" = (
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+	dir = 4
+	},
+/obj/structure/table/standard,
+/turf/simulated/floor/tiled/steel/monofloor{
+	dir = 8
+	},
+/area/eris/hallway/main/section2)
 "mrW" = (
 /obj/structure/catwalk,
 /turf/simulated/floor/plating/under,
@@ -103189,6 +103279,7 @@
 /obj/structure/sign/department/gene{
 	pixel_x = 32
 	},
+/obj/structure/table/standard,
 /turf/simulated/floor/tiled/white/gray_platform,
 /area/eris/rnd/lab)
 "oEI" = (
@@ -103654,6 +103745,11 @@
 	},
 /turf/simulated/floor/tiled/steel/techfloor_grid,
 /area/eris/medical/chemstor)
+"pKj" = (
+/obj/machinery/door/firedoor,
+/obj/effect/window_lwall_spawn/reinforced,
+/turf/simulated/floor/plating,
+/area/eris/command/meeting_room)
 "pKn" = (
 /obj/machinery/holoposter{
 	pixel_y = 32
@@ -103897,6 +103993,15 @@
 	},
 /turf/simulated/floor/plating/under,
 /area/eris/maintenance/section3deck4port)
+"qsl" = (
+/obj/machinery/atmospherics/unary/vent_pump/on{
+	dir = 8
+	},
+/obj/structure/table/standard,
+/obj/item/flame/lighter/zippo,
+/obj/item/tool/tape_roll,
+/turf/simulated/floor/carpet/bcarpet,
+/area/eris/command/meeting_room)
 "qtc" = (
 /obj/machinery/portable_atmospherics/hydroponics,
 /obj/machinery/button/remote/blast_door{
@@ -104277,6 +104382,16 @@
 	},
 /turf/simulated/floor/tiled/white/golden,
 /area/eris/neotheology/chapelritualroom)
+"rDm" = (
+/obj/item/implantcase/excelsior,
+/obj/item/implantcase/excelsior,
+/obj/item/implantcase/excelsior,
+/obj/item/implantcase/excelsior,
+/obj/item/implantcase/excelsior,
+/obj/item/implantcase/excelsior,
+/obj/item/implanter/excelsior,
+/turf/simulated/floor/carpet/bcarpet,
+/area/eris/command/meeting_room)
 "rDp" = (
 /obj/structure/table/rack,
 /obj/machinery/light{
@@ -106095,6 +106210,11 @@
 	},
 /turf/simulated/floor/carpet/bcarpet,
 /area/eris/neotheology/office)
+"vYz" = (
+/obj/structure/table/woodentable,
+/obj/machinery/recharger,
+/turf/simulated/floor/wood,
+/area/eris/command/bridgebar)
 "vYG" = (
 /obj/structure/bed/chair{
 	dir = 4
@@ -106715,6 +106835,13 @@
 /obj/machinery/holoposter,
 /turf/simulated/wall/r_wall,
 /area/eris/hallway/main/section2)
+"xFw" = (
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+	dir = 4
+	},
+/obj/structure/table/standard,
+/turf/simulated/floor/carpet/bcarpet,
+/area/eris/command/meeting_room)
 "xHE" = (
 /obj/structure/sign/faction/neotheology_cross/gold{
 	pixel_y = -32
@@ -106902,6 +107029,14 @@
 /obj/spawner/contraband/low_chance,
 /turf/simulated/floor/tiled/steel,
 /area/eris/hallway/side/section3starboard)
+"xYd" = (
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/effect/decal/cleanable/blood/splatter,
+/turf/simulated/floor/tiled/steel/monofloor{
+	dir = 8
+	},
+/area/eris/hallway/main/section2)
 "xYK" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -167655,7 +167790,7 @@ aBW
 baJ
 aHL
 aQu
-aUB
+dev
 aUB
 aUB
 aUO
@@ -168854,7 +168989,7 @@ aLO
 aaB
 aaB
 aSt
-aTa
+dcL
 aSx
 aWV
 aZG
@@ -206672,8 +206807,8 @@ kUI
 coS
 coM
 dzF
-coM
-coM
+dfp
+dfG
 dno
 cqJ
 xdY
@@ -207648,8 +207783,8 @@ bLx
 bRG
 bUb
 bTY
-bVW
-bXg
+deT
+dfm
 bYt
 bYU
 bBL
@@ -207850,7 +207985,7 @@ bMq
 bSv
 bUc
 bVw
-bVW
+dfl
 bXh
 bXy
 bDF
@@ -207885,15 +208020,15 @@ caj
 cgP
 cbg
 cbP
-cce
-cce
+dfH
+xYd
 cce
 dJe
 dDS
 cce
 cce
 cce
-cbg
+mrT
 cer
 bZf
 cov
@@ -208087,7 +208222,7 @@ cak
 cgE
 cbu
 cbQ
-ccf
+dwG
 ccf
 dBa
 dEV
@@ -208095,7 +208230,7 @@ ccf
 ccf
 ccf
 ccf
-ceh
+jUE
 dup
 bZj
 dxu
@@ -209462,9 +209597,9 @@ biM
 bsm
 bzs
 bAa
-bBL
-bwj
+dew
 bwj
+deS
 bwl
 bXc
 bXj
@@ -209665,7 +209800,7 @@ byI
 bzt
 bAb
 bBL
-bwj
+dex
 bwk
 bwl
 bXc
@@ -244424,10 +244559,10 @@ aaa
 aaa
 aad
 aaa
-cWD
+hLz
 cwl
 cum
-cWD
+hLz
 aaa
 aad
 aaa
@@ -244626,10 +244761,10 @@ aaa
 aaa
 aad
 aaa
-cWD
+hLz
 cwl
 cum
-cWD
+hLz
 aaa
 aad
 aaa
@@ -245826,7 +245961,7 @@ cgb
 ddI
 ded
 dep
-deL
+vYz
 deL
 dfC
 dec
@@ -246433,14 +246568,14 @@ cTS
 dcW
 cyQ
 cAg
-cAD
+cAP
 dcW
 cAX
 cBB
 dcW
 cXJ
 dgl
-dgl
+fRi
 dgk
 dbF
 dbF
@@ -246643,7 +246778,7 @@ dgE
 cSv
 cTX
 cWt
-daA
+pKj
 dbF
 dbF
 cWD
@@ -246837,15 +246972,15 @@ ddN
 deh
 det
 deP
-dfl
-dwG
-ddu
+ddl
+ddl
+xFw
 cQi
 dgE
 dgU
 ddl
 ddl
-daA
+pKj
 dbF
 dbF
 cWD
@@ -247039,8 +247174,8 @@ ddN
 deh
 deu
 deQ
-dfm
-dfG
+ddl
+ddl
 dfU
 cQo
 dgF
@@ -247239,7 +247374,7 @@ ddl
 ddv
 ddO
 dei
-dev
+dfn
 deR
 dfn
 dfn
@@ -247441,10 +247576,10 @@ ddl
 ddw
 ddN
 deh
-dew
-deS
-dcL
-dfG
+ddl
+ddl
+ddl
+ddl
 dfW
 cQp
 dgE
@@ -247643,17 +247778,17 @@ ddm
 cgc
 ddN
 deh
-dex
-deT
-dfp
-dfH
-ddw
+ddl
+ddl
+ddl
+ddl
+qsl
 cQV
 dgE
 dgY
 ddl
 ddl
-daA
+pKj
 dbF
 dbF
 cWD
@@ -247845,7 +247980,7 @@ ddn
 cgc
 ddP
 dej
-ddl
+rDm
 ddl
 ddl
 dfI
@@ -247855,7 +247990,7 @@ dgE
 cSv
 cUa
 cWu
-daA
+pKj
 dbF
 dbF
 dhk
@@ -248056,7 +248191,7 @@ cBB
 dcW
 cYi
 dhx
-dhx
+cex
 dgt
 dbF
 dbF
@@ -251284,12 +251419,12 @@ abF
 abF
 bXj
 bXj
-cWD
-cWD
-cWD
-cWD
-cWD
-cWD
+hLz
+hLz
+hLz
+hLz
+hLz
+hLz
 ddt
 aae
 diM