From 7be7317c3d3ced3c5cbd7d9648b3a07b8f25ca4d Mon Sep 17 00:00:00 2001
From: Mirag1993 <goblin5118@gmail.com>
Date: Wed, 19 Jun 2024 01:40:25 +0300
Subject: [PATCH 1/3] =?UTF-8?q?=D0=A0=D0=B5=D0=BC=D0=B0=D0=BF=20Savior=20+?=
 =?UTF-8?q?=20=D1=87=D0=B8=D1=81=D1=82=D0=BA=D0=B0=20=D1=85=D0=B2=D0=BE?=
 =?UTF-8?q?=D1=81=D1=82=D0=BE=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Проведен ремап севиора , сделаны мелкие фиксы атмоса и косметические перестановки. Подчищены хвосты от модпака ивент
---
 .../configs/nanotrasen_savior.json            |    5 +-
 .../shuttles/nanotrasen/nanotrasen_savior.dmm | 1979 +++++++----------
 code/__DEFINES/cinematics.dm                  |    4 +-
 .../event_cly/ship}/event_bucket.json         |    0
 .../event_cly/ship}/subbucket.dmm             |    0
 5 files changed, 860 insertions(+), 1128 deletions(-)
 rename {_maps/_mod_celadon/configs => mod_celadon/event_cly/ship}/event_bucket.json (100%)
 rename {_maps/_mod_celadon/shuttles/Event => mod_celadon/event_cly/ship}/subbucket.dmm (100%)

diff --git a/_maps/_mod_celadon/configs/nanotrasen_savior.json b/_maps/_mod_celadon/configs/nanotrasen_savior.json
index 063df691d0fb..bd330c01e599 100644
--- a/_maps/_mod_celadon/configs/nanotrasen_savior.json
+++ b/_maps/_mod_celadon/configs/nanotrasen_savior.json
@@ -8,13 +8,12 @@
 		"NANOTRASEN"
 	],
 	"map_short_name": "Savior-class",
-	"description": "Многофункциональное медицинское судно класса 'Savior' - относительно современная разработка НТ, предназначенная для оказания медицинской помощи.",
+	"description": "Многофункциональное медицинское судно класса 'Savior' является одной из новейших разработок компании Nanotrasen. Оно спроектировано для оказания всесторонней медицинской помощи в условиях космоса. Судно оснащено современным медицинским оборудованием и системами жизнеобеспечения, что позволяет оперативно и эффективно реагировать на различные медицинские чрезвычайные ситуации. Благодаря своей универсальности, судно 'Savior' может использоваться как для спасательных операций, так и для проведения длительных медицинских экспедиций.",
 	"tags": [
 		"Science",
-		"medical"
+		"Medical"
 	],
 	"map_path": "_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_savior.dmm",
-	"starting_funds": 0,
 	"job_slots": {
 		"Captain": {
 			"outfit": "/datum/outfit/job/nanotrasen/captain",
diff --git a/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_savior.dmm b/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_savior.dmm
index d2cbb0c7e68a..616b5c56fc2c 100644
--- a/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_savior.dmm
+++ b/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_savior.dmm
@@ -9,14 +9,12 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 5
 	},
+/obj/machinery/firealarm/directional/south,
 /turf/open/floor/wood,
 /area/ship/crew/crewtwo)
 "au" = (
 /turf/closed/wall/mineral/titanium,
-/area/ship/crew/toilet)
-"aH" = (
-/turf/closed/wall/mineral/titanium,
-/area/ship/crew/dorm)
+/area/ship/crew/cryo)
 "aM" = (
 /turf/closed/wall/mineral/titanium/nodiagonal,
 /area/ship/medical/surgery)
@@ -36,7 +34,7 @@
 /obj/machinery/door/firedoor/border_only,
 /obj/structure/window/reinforced/fulltile/shuttle,
 /turf/open/floor/plating,
-/area/ship/crew/dorm)
+/area/ship/crew/cryo)
 "be" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -51,13 +49,16 @@
 	dir = 1
 	},
 /turf/open/floor/plating,
-/area/ship/engineering)
+/area/ship/engineering/electrical)
 "bu" = (
+/obj/machinery/air_sensor/atmos/mix_tank,
+/obj/structure/window/plasma/reinforced/spawner/east,
+/obj/structure/window/plasma/reinforced/spawner,
 /obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/mix_output{
+	on = 0;
 	piping_layer = 5
 	},
-/obj/machinery/air_sensor/atmos/mix_tank,
-/turf/open/floor/engine/fuel,
+/turf/open/floor/engine/o2,
 /area/ship/engineering/atmospherics)
 "bx" = (
 /obj/structure/cable{
@@ -77,14 +78,14 @@
 	icon_state = "2-8"
 	},
 /turf/open/floor/wood,
-/area/ship/crew/dorm)
+/area/ship/crew/cryo)
 "bN" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
 "bY" = (
 /turf/closed/wall/mineral/titanium,
-/area/ship/engineering)
+/area/ship/engineering/electrical)
 "cg" = (
 /obj/item/clothing/shoes/magboots,
 /obj/item/clothing/mask/breath,
@@ -101,15 +102,11 @@
 	pixel_x = -9;
 	pixel_y = 14
 	},
-/obj/item/paper_bin{
-	pixel_x = -7;
-	pixel_y = -14
-	},
 /obj/item/folder,
 /obj/item/pen,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/wood,
-/area/ship/crew/dorm)
+/area/ship/crew/cryo)
 "cr" = (
 /obj/machinery/power/terminal{
 	dir = 8
@@ -120,21 +117,15 @@
 /obj/effect/turf_decal/industrial/fire{
 	dir = 8
 	},
-/obj/structure/window/plasma/reinforced/spawner/north,
 /obj/effect/decal/cleanable/oil/streak,
 /obj/machinery/atmospherics/pipe/layer_manifold,
 /turf/open/floor/plating,
 /area/ship/engineering/atmospherics)
 "cF" = (
-/obj/structure/railing{
-	dir = 5;
-	layer = 2
-	},
 /obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 4
 	},
-/obj/machinery/portable_atmospherics/canister,
 /turf/open/floor/plating,
 /area/ship/engineering/atmospherics)
 "cS" = (
@@ -145,13 +136,19 @@
 /turf/open/floor/plasteel/white,
 /area/ship/medical/surgery)
 "df" = (
-/obj/effect/turf_decal/corner/opaque/blue,
-/obj/machinery/firealarm/directional/east{
-	pixel_x = 33;
-	pixel_y = 3
+/obj/structure/cable{
+	icon_state = "4-8"
 	},
-/turf/open/floor/plasteel/white,
-/area/ship/hallway/starboard)
+/obj/structure/cable{
+	icon_state = "1-8"
+	},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
+/obj/effect/turf_decal/corner/opaque/blue/border{
+	dir = 1
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/hallway/port)
 "dg" = (
 /turf/closed/wall/mineral/titanium,
 /area/ship/crew)
@@ -161,6 +158,12 @@
 	pixel_x = 4;
 	pixel_y = 7
 	},
+/obj/structure/window/plasma/reinforced/spawner/north,
+/obj/machinery/atmospherics/components/unary/vent_pump/high_volume/siphon/atmos/air_output{
+	dir = 1;
+	piping_layer = 2
+	},
+/obj/machinery/air_sensor/atmos/air_tank,
 /turf/open/floor/engine/air,
 /area/ship/engineering/atmospherics)
 "dB" = (
@@ -173,23 +176,18 @@
 /obj/structure/window/plasma/reinforced/spawner{
 	dir = 8
 	},
-/obj/machinery/door/window/eastleft{
-	name = "Engine Access"
-	},
 /obj/structure/window/plasma/reinforced/spawner/north,
 /obj/machinery/door/poddoor{
 	dir = 4;
 	id = "savior_thrusters"
 	},
+/obj/structure/window/reinforced/spawner/west,
 /turf/open/floor/plating,
-/area/ship/engineering)
+/area/ship/engineering/electrical)
 "dI" = (
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/obj/effect/turf_decal/corner/opaque/blue{
-	dir = 8
-	},
 /obj/structure/disposalpipe/segment{
 	dir = 8
 	},
@@ -202,8 +200,9 @@
 /obj/structure/cable{
 	icon_state = "2-8"
 	},
-/turf/open/floor/plasteel/white,
-/area/ship/hallway/starboard)
+/obj/effect/turf_decal/corner/opaque/blue/diagonal,
+/turf/open/floor/plasteel/dark,
+/area/ship/hallway/port)
 "dJ" = (
 /obj/machinery/door/poddoor{
 	dir = 1;
@@ -211,13 +210,14 @@
 	name = "Window Shield"
 	},
 /obj/structure/window/reinforced/fulltile/shuttle,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /turf/open/floor/plating,
-/area/ship/engineering)
+/area/ship/engineering/electrical)
 "dP" = (
 /obj/machinery/vending/medical,
-/obj/machinery/airalarm/directional/west,
+/obj/machinery/light/directional/west,
 /turf/open/floor/plasteel/white,
-/area/ship/storage)
+/area/ship/medical/surgery)
 "dZ" = (
 /obj/structure/window/reinforced{
 	dir = 4
@@ -228,19 +228,17 @@
 	},
 /obj/effect/turf_decal/borderfloorwhite,
 /obj/structure/curtain,
+/obj/item/soap,
 /turf/open/floor/plasteel/white,
-/area/ship/crew/toilet)
+/area/ship/crew/cryo)
 "el" = (
 /obj/item/clothing/mask/breath/medical,
 /obj/item/clothing/mask/breath/medical,
 /obj/structure/closet/secure_closet/medical2,
 /obj/item/tank/internals/anesthetic,
 /obj/item/tank/internals/anesthetic,
+/obj/machinery/light/directional/east,
 /obj/machinery/firealarm/directional/north,
-/obj/machinery/light_switch{
-	pixel_x = -11;
-	pixel_y = 22
-	},
 /turf/open/floor/plasteel/white,
 /area/ship/medical/surgery)
 "eE" = (
@@ -251,33 +249,22 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
-/obj/machinery/airalarm/directional/south,
+/obj/machinery/light/directional/south,
 /turf/open/floor/engine,
-/area/ship/engineering/engine)
+/area/ship/engineering/atmospherics)
 "eL" = (
-/obj/machinery/power/apc/auto_name/directional/south{
-	pixel_x = 7;
-	pixel_y = -35
-	},
-/obj/machinery/firealarm/directional/south{
-	pixel_x = -8;
-	pixel_y = -36
+/obj/structure/cable{
+	icon_state = "0-4"
 	},
+/obj/machinery/power/apc/auto_name/directional/south,
 /obj/machinery/light_switch{
 	dir = 1;
-	pixel_x = -8;
-	pixel_y = -31
-	},
-/obj/structure/cable{
-	icon_state = "0-4"
+	pixel_x = 11;
+	pixel_y = -16
 	},
 /turf/open/floor/wood,
-/area/ship/crew/dorm)
+/area/ship/crew/cryo)
 "eW" = (
-/obj/machinery/door/airlock/engineering{
-	name = "Engine Room";
-	req_access_txt = "10"
-	},
 /obj/structure/cable/yellow{
 	icon_state = "1-2"
 	},
@@ -287,33 +274,32 @@
 	dir = 1
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/door/airlock/engineering{
+	name = "Engine Room";
+	req_access_txt = "10"
+	},
 /turf/open/floor/engine,
-/area/ship/engineering/engine)
+/area/ship/engineering/atmospherics)
 "ff" = (
 /obj/effect/turf_decal/siding/wood{
 	dir = 8
 	},
-/obj/structure/table/wood,
-/obj/structure/bedsheetbin{
-	pixel_x = -3;
-	pixel_y = -2
-	},
 /obj/effect/decal/cleanable/dirt,
-/obj/item/radio/intercom/directional/west,
+/obj/machinery/vending/autodrobe/all_access,
+/obj/machinery/light/directional/west,
 /turf/open/floor/wood,
-/area/ship/crew/dorm)
+/area/ship/crew/cryo)
 "fi" = (
 /obj/effect/turf_decal/corner/opaque/blue{
 	dir = 8
 	},
-/obj/machinery/atmospherics/components/unary/thermomachine/freezer{
+/obj/machinery/atmospherics/components/unary/cryo_cell{
 	dir = 1;
-	initialize_directions = 1
+	layer = 5
 	},
-/obj/machinery/light/dim/directional/south{
-	pixel_y = -38
+/obj/item/reagent_containers/glass/beaker/cryoxadone{
+	layer = 5
 	},
-/obj/item/radio/intercom/directional/south,
 /turf/open/floor/plasteel/white,
 /area/ship/medical)
 "fC" = (
@@ -341,45 +327,26 @@
 	pixel_x = 6;
 	pixel_y = 8
 	},
-/obj/machinery/light/small/directional/west{
-	pixel_x = -35
-	},
-/obj/item/radio/intercom/directional/west,
 /turf/open/floor/wood,
 /area/ship/crew)
 "fG" = (
 /obj/machinery/autolathe,
-/obj/item/clothing/glasses/meson/engine/tray,
-/obj/structure/closet/wall/orange{
-	pixel_y = 32;
-	dir = 1
-	},
-/obj/item/storage/box/metalfoam,
-/obj/item/holosign_creator/engineering,
-/obj/item/storage/belt/utility/full/engi,
-/obj/item/clothing/head/hardhat/weldhat,
-/obj/item/clothing/suit/hazardvest,
-/obj/item/clothing/under/rank/engineering/engineer/nt/skirt,
-/obj/item/clothing/under/rank/engineering/engineer/nt,
-/obj/item/clothing/shoes/workboots,
-/obj/item/storage/backpack/industrial,
-/obj/item/multitool,
-/obj/item/rcl/pre_loaded,
-/obj/item/pipe_dispenser,
 /turf/open/floor/plating,
-/area/ship/engineering)
+/area/ship/engineering/electrical)
 "fI" = (
-/obj/machinery/airalarm/directional/west,
 /obj/effect/turf_decal/corner/opaque/ntblue{
 	dir = 8
 	},
-/obj/structure/table/reinforced,
-/obj/machinery/recharger,
 /obj/structure/cable,
-/obj/machinery/power/apc/auto_name/directional/south,
-/obj/item/coin/titanium{
-	pixel_x = 11
+/obj/machinery/power/apc/auto_name/directional/south{
+	pixel_x = -5
+	},
+/obj/machinery/light_switch{
+	dir = 1;
+	pixel_x = 7;
+	pixel_y = -16
 	},
+/obj/machinery/light/directional/west,
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
 "fJ" = (
@@ -391,48 +358,31 @@
 /obj/effect/turf_decal/borderfloorwhite{
 	dir = 1
 	},
-/obj/machinery/airalarm/directional/west{
-	pixel_x = -38
-	},
-/obj/machinery/light/dim/directional/west,
 /obj/effect/decal/cleanable/dirt,
+/obj/machinery/light/directional/west,
 /turf/open/floor/plasteel/white,
-/area/ship/crew/toilet)
+/area/ship/crew/cryo)
 "fL" = (
-/obj/machinery/power/smes/shuttle/precharged{
-	dir = 4
-	},
-/obj/structure/cable{
-	icon_state = "0-8"
-	},
-/obj/structure/window/plasma/reinforced/spawner{
-	dir = 8
-	},
-/obj/machinery/door/window/eastleft{
-	name = "Engine Access"
-	},
-/obj/machinery/door/poddoor{
-	dir = 4;
-	id = "savior_thrusters2"
-	},
-/turf/open/floor/plating,
-/area/ship/engineering/atmospherics)
+/obj/effect/decal/cleanable/blood/gibs/up,
+/turf/open/floor/plasteel/white,
+/area/ship/cargo)
 "fV" = (
 /obj/machinery/computer/operating{
 	dir = 1
 	},
+/obj/machinery/light/directional/east,
 /turf/open/floor/plasteel/white,
 /area/ship/medical/surgery)
 "ga" = (
 /obj/effect/turf_decal/siding/wood{
 	dir = 8
 	},
+/obj/item/radio/intercom/directional/west,
 /obj/machinery/cryopod{
 	dir = 4
 	},
-/obj/machinery/light/dim/directional/west,
 /turf/open/floor/wood,
-/area/ship/crew/dorm)
+/area/ship/crew/cryo)
 "ge" = (
 /obj/machinery/power/terminal{
 	dir = 8
@@ -445,6 +395,7 @@
 	},
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/oil/streak,
+/obj/machinery/portable_atmospherics/canister/oxygen,
 /turf/open/floor/plating,
 /area/ship/engineering/atmospherics)
 "gi" = (
@@ -488,7 +439,6 @@
 	pixel_x = 9;
 	pixel_y = 22
 	},
-/obj/machinery/light/dim/directional/north,
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/button/door{
@@ -504,11 +454,12 @@
 /area/ship/bridge)
 "gx" = (
 /obj/structure/window/reinforced/spawner/east,
-/obj/machinery/suit_storage_unit/cmo,
+/obj/structure/curtain/cloth/fancy,
+/obj/structure/bed,
+/obj/item/bedsheet/captain,
 /turf/open/floor/carpet/royalblue,
 /area/ship/crew/crewtwo)
 "gD" = (
-/obj/machinery/light/dim/directional/east,
 /obj/structure/rack,
 /obj/item/tank/jetpack/oxygen{
 	pixel_y = 5;
@@ -521,13 +472,10 @@
 	pixel_y = -1;
 	pixel_x = -3
 	},
+/obj/machinery/firealarm/directional/north,
 /turf/open/floor/plasteel/white,
 /area/ship/cargo)
 "gW" = (
-/obj/structure/cable{
-	icon_state = "1-10"
-	},
-/obj/machinery/airalarm/directional/east,
 /obj/structure/disposalpipe/segment,
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/components/binary/pump{
@@ -536,6 +484,9 @@
 	piping_layer = 5;
 	pixel_x = 10
 	},
+/obj/machinery/firealarm/directional/east{
+	pixel_y = 4
+	},
 /turf/open/floor/plating,
 /area/ship/engineering/atmospherics)
 "hf" = (
@@ -546,32 +497,32 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
+/mob/living/simple_animal/bot/hygienebot,
 /turf/open/floor/plasteel/white,
 /area/ship/medical)
 "hg" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /obj/structure/table,
-/obj/item/folder/blue,
-/obj/item/flashlight/lamp{
-	layer = 5;
-	pixel_x = -9;
-	pixel_y = 14
+/obj/item/stack/sheet/glass/five,
+/obj/item/stack/sheet/glass/five,
+/obj/item/stack/sheet/metal/five,
+/obj/item/stack/sheet/metal/five,
+/obj/machinery/jukebox/boombox{
+	pixel_x = -8;
+	pixel_y = 5
 	},
-/obj/item/toy/figure/engineer{
-	layer = 4;
-	pixel_x = 9;
-	pixel_y = 12
+/obj/item/toy/figure/ce{
+	pixel_y = 10;
+	pixel_x = 9
 	},
-/obj/effect/decal/cleanable/dirt,
+/obj/effect/spawner/lootdrop/waste/trash,
 /turf/open/floor/plating,
-/area/ship/engineering)
+/area/ship/engineering/electrical)
 "hm" = (
 /obj/machinery/rnd/production/circuit_imprinter/department/med,
-/obj/machinery/light/dim/directional/west,
 /turf/open/floor/plasteel/white,
-/area/ship/science)
+/area/ship/medical/surgery)
 "hI" = (
-/obj/machinery/power/apc/auto_name/directional/north,
-/obj/machinery/airalarm/directional/west,
 /obj/structure/closet/secure_closet/medical3{
 	name = "Surgery locker"
 	},
@@ -583,6 +534,11 @@
 /obj/structure/cable{
 	icon_state = "0-4"
 	},
+/obj/machinery/power/apc/auto_name/directional/north,
+/obj/machinery/light_switch{
+	pixel_y = 20;
+	pixel_x = 12
+	},
 /turf/open/floor/plasteel/white,
 /area/ship/medical/surgery)
 "hR" = (
@@ -591,6 +547,11 @@
 	},
 /obj/structure/cable,
 /obj/machinery/power/apc/auto_name/directional/west,
+/obj/machinery/light_switch{
+	dir = 4;
+	pixel_x = -19;
+	pixel_y = 12
+	},
 /turf/open/floor/plasteel/white,
 /area/ship/cargo)
 "ia" = (
@@ -607,28 +568,29 @@
 /area/ship/engineering/atmospherics)
 "il" = (
 /obj/structure/table/reinforced,
-/obj/machinery/light/dim/directional/south,
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/computer/med_data/laptop{
-	dir = 1
+	dir = 1;
+	pixel_y = 5
 	},
 /obj/effect/turf_decal/corner/opaque/ntblue{
 	dir = 8
 	},
+/obj/machinery/airalarm/directional/south,
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
 "in" = (
-/obj/machinery/light/small/directional/north,
 /obj/machinery/power/ship_gravity,
 /obj/structure/cable{
 	icon_state = "0-2"
 	},
+/obj/machinery/light/directional/north,
 /turf/open/floor/plating,
-/area/ship/engineering)
+/area/ship/engineering/electrical)
 "io" = (
 /obj/structure/urinal{
 	dir = 8;
-	pixel_x = 32
+	pixel_x = 15
 	},
 /obj/effect/turf_decal/borderfloorwhite{
 	dir = 1
@@ -636,11 +598,11 @@
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /turf/open/floor/plasteel/white,
-/area/ship/crew/toilet)
+/area/ship/crew/cryo)
 "iw" = (
 /obj/effect/spawner/lootdrop/waste/trash,
 /turf/open/floor/plating,
-/area/ship/engineering)
+/area/ship/engineering/electrical)
 "ix" = (
 /obj/docking_port/stationary{
 	dir = 4
@@ -661,15 +623,12 @@
 	icon_state = "1-4"
 	},
 /turf/open/floor/plating,
-/area/ship/engineering)
+/area/ship/engineering/electrical)
 "iG" = (
 /obj/structure/closet/secure_closet/captains,
 /turf/open/floor/carpet/royalblue,
 /area/ship/crew)
 "iQ" = (
-/obj/effect/turf_decal/corner/opaque/blue{
-	dir = 8
-	},
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
@@ -680,14 +639,14 @@
 	dir = 1
 	},
 /obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4,
-/turf/open/floor/plasteel/white,
-/area/ship/hallway/starboard)
+/obj/effect/turf_decal/corner/opaque/blue/border,
+/turf/open/floor/plasteel/dark,
+/area/ship/hallway/port)
 "iX" = (
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
 	dir = 4
 	},
 /obj/machinery/iv_drip,
-/obj/item/radio/intercom/directional/west,
 /turf/open/floor/plasteel/white,
 /area/ship/medical/surgery)
 "jp" = (
@@ -702,18 +661,22 @@
 	pixel_x = -22
 	},
 /turf/open/floor/wood,
-/area/ship/crew/dorm)
+/area/ship/crew/cryo)
 "jz" = (
-/obj/structure/filingcabinet{
-	pixel_x = -10
-	},
 /obj/effect/turf_decal/siding/wood{
 	dir = 10
 	},
-/obj/machinery/power/apc/auto_name/directional/south,
 /obj/structure/cable{
 	icon_state = "0-4"
 	},
+/obj/machinery/power/apc/auto_name/directional/south,
+/obj/machinery/light_switch{
+	dir = 1;
+	pixel_x = 11;
+	pixel_y = -16
+	},
+/obj/structure/bed/dogbed/ian,
+/mob/living/simple_animal/pet/dog/corgi/Ian,
 /turf/open/floor/wood,
 /area/ship/crew)
 "jK" = (
@@ -725,6 +688,8 @@
 /obj/machinery/fax{
 	pixel_y = 6
 	},
+/obj/machinery/light/directional/west,
+/obj/machinery/firealarm/directional/north,
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
 "jM" = (
@@ -735,7 +700,7 @@
 	dir = 4
 	},
 /turf/open/floor/engine/hull/reinforced,
-/area/ship/engineering)
+/area/ship/engineering/electrical)
 "jW" = (
 /turf/open/floor/plasteel/white,
 /area/ship/cargo)
@@ -749,13 +714,11 @@
 /obj/structure/window/plasma/reinforced/spawner{
 	dir = 8
 	},
-/obj/machinery/door/window/eastright{
-	name = "Engine Access"
-	},
 /obj/machinery/door/poddoor{
 	dir = 4;
 	id = "savior_thrusters2"
 	},
+/obj/structure/window/reinforced/spawner/west,
 /turf/open/floor/plating,
 /area/ship/engineering/atmospherics)
 "kb" = (
@@ -764,19 +727,32 @@
 	},
 /obj/effect/spawner/lootdrop/techstorage/medical,
 /obj/structure/rack,
-/obj/machinery/airalarm/directional/west,
+/obj/machinery/light/directional/west,
+/obj/machinery/firealarm/directional/north,
 /turf/open/floor/plasteel/white,
-/area/ship/science)
+/area/ship/medical/surgery)
 "ke" = (
 /obj/structure/sign/warning/fire,
 /turf/closed/wall/mineral/titanium/nodiagonal,
-/area/ship/engineering/engine)
+/area/ship/engineering/atmospherics)
 "kf" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 9
+/obj/structure/rack,
+/obj/item/roller{
+	pixel_x = -3;
+	pixel_y = 7
 	},
-/turf/closed/wall/mineral/titanium/nodiagonal,
-/area/ship/engineering/engine)
+/obj/item/roller{
+	pixel_x = -3;
+	pixel_y = 7
+	},
+/obj/item/roller{
+	pixel_x = -3;
+	pixel_y = 7
+	},
+/obj/item/defibrillator/loaded,
+/obj/machinery/light/directional/north,
+/turf/open/floor/plasteel/white,
+/area/ship/medical/surgery)
 "kg" = (
 /obj/machinery/power/smes/shuttle/precharged{
 	dir = 4
@@ -787,16 +763,13 @@
 /obj/structure/window/plasma/reinforced/spawner{
 	dir = 8
 	},
-/obj/machinery/door/window/eastleft{
-	name = "Engine Access"
-	},
 /obj/machinery/door/poddoor{
 	dir = 4;
 	id = "savior_thrusters"
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/structure/window/reinforced/spawner/west,
 /turf/open/floor/plating,
-/area/ship/engineering)
+/area/ship/engineering/electrical)
 "ko" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 9
@@ -819,6 +792,9 @@
 	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4,
+/obj/effect/turf_decal/corner/opaque/blue/border{
+	dir = 8
+	},
 /turf/open/floor/plasteel/dark,
 /area/ship/hallway/port)
 "kM" = (
@@ -836,38 +812,40 @@
 /obj/effect/spawner/lootdrop/waste/trash,
 /obj/item/trash/candy,
 /turf/open/floor/engine/airless,
-/area/ship/engineering/engine)
+/area/ship/engineering/atmospherics)
 "kR" = (
-/turf/closed/wall/mineral/titanium/nodiagonal,
-/area/ship/storage)
+/obj/machinery/door/airlock/medical/glass{
+	dir = 4;
+	name = "Medbay"
+	},
+/obj/structure/curtain/cloth,
+/turf/open/floor/plasteel/white,
+/area/ship/medical/surgery)
 "kT" = (
 /obj/structure/sign/poster/official/help_others{
 	pixel_y = 30
 	},
+/obj/structure/chair/office{
+	dir = 4
+	},
 /turf/open/floor/plasteel/white,
-/area/ship/storage)
+/area/ship/medical/surgery)
 "kX" = (
-/obj/machinery/power/apc/auto_name/directional/east,
 /obj/machinery/atmospherics/pipe/simple/dark/visible/layer5{
 	dir = 10
 	},
-/obj/structure/cable{
-	icon_state = "0-2"
-	},
 /obj/structure/disposalpipe/segment,
-/obj/machinery/light/small/directional/east{
-	pixel_x = 35
+/obj/structure/sign/warning/nosmoking/circle{
+	pixel_x = 31;
+	pixel_y = -5
 	},
 /turf/open/floor/engine,
-/area/ship/engineering/engine)
+/area/ship/engineering/atmospherics)
 "kZ" = (
-/obj/structure/window/plasma/reinforced/spawner,
 /obj/structure/sign/warning/nosmoking/circle{
 	pixel_x = 33
 	},
-/obj/item/radio/intercom/directional/east{
-	pixel_x = 32
-	},
+/obj/machinery/light/directional/east,
 /obj/machinery/atmospherics/components/binary/pump/on/layer2{
 	dir = 1
 	},
@@ -893,6 +871,7 @@
 	pixel_x = 11;
 	pixel_y = 17
 	},
+/obj/item/storage/wallet,
 /turf/open/floor/wood,
 /area/ship/crew/crewtwo)
 "lr" = (
@@ -905,33 +884,22 @@
 /obj/structure/window/plasma/reinforced/spawner{
 	dir = 8
 	},
-/obj/machinery/door/window/eastright{
-	name = "Engine Access"
-	},
 /obj/machinery/door/poddoor{
 	dir = 4;
 	id = "savior_thrusters"
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 6
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+	dir = 4
 	},
+/obj/structure/window/reinforced/spawner/west,
 /turf/open/floor/plating,
-/area/ship/engineering)
+/area/ship/engineering/electrical)
 "lx" = (
-/obj/machinery/computer/atmos_alert{
-	dir = 8;
-	icon_state = "computer-right"
-	},
 /obj/machinery/firealarm/directional/east{
 	pixel_y = -3
 	},
-/obj/machinery/light_switch{
-	dir = 8;
-	pixel_x = 20;
-	pixel_y = 11
-	},
 /turf/open/floor/plating,
-/area/ship/engineering)
+/area/ship/engineering/electrical)
 "ly" = (
 /obj/structure/cable/yellow{
 	icon_state = "1-8"
@@ -939,46 +907,19 @@
 /obj/structure/disposalpipe/segment{
 	dir = 10
 	},
-/obj/machinery/firealarm/directional/east{
-	pixel_y = -8
-	},
-/obj/machinery/light_switch{
-	dir = 8;
-	pixel_x = 20;
-	pixel_y = 11
-	},
-/obj/structure/sign/warning/nosmoking/circle{
-	pixel_x = 31;
-	pixel_y = -5
-	},
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
-/obj/machinery/button/door{
-	dir = 8;
-	id = "Savior_chamber";
-	name = "Combustion Chamber Blast Door Control";
-	pixel_x = 33;
-	pixel_y = 10;
-	sync_doors = 0
-	},
-/obj/machinery/button/ignition{
-	dir = 8;
-	id = "Savior";
-	pixel_x = 19;
-	pixel_y = 3
-	},
+/obj/effect/decal/cleanable/blood/gibs/body,
 /turf/open/floor/engine,
-/area/ship/engineering/engine)
+/area/ship/engineering/atmospherics)
 "lI" = (
-/obj/machinery/airalarm/directional/south,
+/obj/effect/turf_decal/corner/opaque/blue/diagonal,
+/obj/effect/decal/cleanable/blood/gibs/limb,
 /turf/open/floor/plasteel/dark,
 /area/ship/hallway/port)
 "lN" = (
-/obj/item/radio/intercom/directional/east,
-/obj/structure/rack,
-/obj/item/storage/box/stockparts/basic,
 /turf/open/floor/plasteel/white,
-/area/ship/science)
+/area/ship/medical/surgery)
 "ms" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /turf/open/floor/plasteel/white,
@@ -990,7 +931,7 @@
 	name = "Combustion Chamber Vent"
 	},
 /turf/open/floor/engine,
-/area/ship/engineering/engine)
+/area/ship/engineering/atmospherics)
 "mK" = (
 /obj/effect/turf_decal/corner/opaque/ntblue{
 	dir = 6
@@ -999,22 +940,17 @@
 	dir = 8
 	},
 /obj/structure/table/reinforced,
-/obj/item/toy/plush/slimeplushie{
-	pixel_y = 9;
-	pixel_x = 5
+/obj/item/toy/plush/celadon/borbplushie{
+	pixel_x = 12;
+	pixel_y = 15
 	},
-/obj/item/reagent_containers/food/drinks/coffee{
-	pixel_y = 10;
-	pixel_x = -7
+/obj/item/reagent_containers/food/drinks/soda_cans/cola{
+	pixel_x = -10;
+	pixel_y = 5
 	},
+/obj/machinery/recharger,
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
-"mN" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 6
-	},
-/turf/closed/wall/mineral/titanium,
-/area/ship/engineering/engine)
 "mO" = (
 /obj/machinery/airalarm/directional/north,
 /obj/structure/table/wood,
@@ -1045,19 +981,17 @@
 	pixel_x = -16;
 	pixel_y = 15
 	},
-/obj/item/radio/intercom/directional/east,
+/obj/machinery/light/directional/east,
 /turf/open/floor/wood,
 /area/ship/crew/crewtwo)
 "nj" = (
 /obj/effect/turf_decal/corner/opaque/orange{
 	dir = 4
 	},
-/obj/machinery/chem_heater,
-/obj/machinery/light/dim/directional/east,
-/obj/structure/closet/firecloset/wall{
-	pixel_y = 32;
-	dir = 1
-	},
+/obj/structure/disposalpipe/trunk,
+/obj/machinery/disposal/bin,
+/obj/machinery/airalarm/directional/north,
+/obj/machinery/light/directional/east,
 /turf/open/floor/plasteel/white,
 /area/ship/medical)
 "nP" = (
@@ -1078,7 +1012,9 @@
 /obj/item/storage/belt/medical/webbing,
 /obj/item/clothing/neck/stethoscope,
 /obj/item/clothing/accessory/pocketprotector,
-/obj/machinery/light/dim/directional/south,
+/obj/item/spacecash/bundle/c50,
+/obj/item/spacecash/bundle/c50,
+/obj/item/storage/wallet,
 /turf/open/floor/plasteel/white,
 /area/ship/crew/canteen)
 "od" = (
@@ -1088,17 +1024,16 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/obj/effect/turf_decal/corner/opaque/blue{
-	dir = 8
-	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 4
 	},
-/turf/open/floor/plasteel/white,
-/area/ship/hallway/starboard)
+/obj/effect/turf_decal/corner/opaque/blue/diagonal,
+/obj/machinery/light/directional/south,
+/turf/open/floor/plasteel/dark,
+/area/ship/hallway/port)
 "oz" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -1109,6 +1044,7 @@
 /obj/structure/cable{
 	icon_state = "1-8"
 	},
+/obj/effect/decal/cleanable/blood/gibs/up,
 /turf/open/floor/plating,
 /area/ship/engineering/atmospherics)
 "pd" = (
@@ -1121,33 +1057,24 @@
 /obj/structure/window/plasma/reinforced/spawner{
 	dir = 8
 	},
-/obj/machinery/door/window/eastright{
-	name = "Engine Access"
-	},
 /obj/machinery/door/poddoor{
 	dir = 4;
 	id = "savior_thrusters"
 	},
 /obj/structure/window/plasma/reinforced/spawner,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/structure/window/reinforced/spawner/west,
 /turf/open/floor/plating,
-/area/ship/engineering)
+/area/ship/engineering/electrical)
 "pe" = (
-/obj/machinery/door/airlock/medical/glass{
-	name = "Medicine Storage.";
-	req_access_txt = "5"
-	},
-/obj/machinery/door/firedoor/border_only,
-/obj/machinery/door/firedoor/border_only{
-	dir = 1
-	},
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/effect/spawner/structure/window/reinforced,
+/obj/structure/curtain/cloth,
 /turf/open/floor/plasteel/white,
-/area/ship/storage)
+/area/ship/medical/surgery)
 "py" = (
 /obj/structure/chair/comfy/shuttle{
 	dir = 4
@@ -1155,22 +1082,12 @@
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
 "pB" = (
-/obj/item/defibrillator/loaded,
-/obj/item/roller{
-	pixel_x = -3;
-	pixel_y = 7
-	},
-/obj/item/roller{
-	pixel_x = -3;
-	pixel_y = 7
-	},
-/obj/item/roller{
-	pixel_x = -3;
-	pixel_y = 7
+/obj/structure/bodycontainer/morgue{
+	dir = 8
 	},
-/obj/structure/rack,
+/obj/structure/curtain/cloth/grey,
 /turf/open/floor/plasteel/white,
-/area/ship/storage)
+/area/ship/medical/surgery)
 "pH" = (
 /obj/structure/cable{
 	icon_state = "0-4"
@@ -1180,7 +1097,7 @@
 	dir = 4
 	},
 /turf/open/floor/engine/hull/reinforced,
-/area/ship/engineering)
+/area/ship/engineering/electrical)
 "pT" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -1194,6 +1111,8 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 4
 	},
+/obj/effect/turf_decal/corner/opaque/blue/full,
+/obj/machinery/light/directional/north,
 /turf/open/floor/plasteel/dark,
 /area/ship/hallway/port)
 "qc" = (
@@ -1204,12 +1123,14 @@
 	dir = 1
 	},
 /turf/open/floor/plasteel/white,
-/area/ship/science)
+/area/ship/medical/surgery)
 "qx" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/high_volume/siphon/atmos/air_output{
+/obj/machinery/airalarm/directional/east,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/computer/atmos_control/tank/air_tank{
 	dir = 1
 	},
-/turf/open/floor/engine/air,
+/turf/open/floor/plating,
 /area/ship/engineering/atmospherics)
 "qD" = (
 /obj/machinery/defibrillator_mount/charging{
@@ -1219,6 +1140,7 @@
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
 	dir = 1
 	},
+/obj/effect/gibspawner/human,
 /turf/open/floor/plasteel/white,
 /area/ship/medical/surgery)
 "qR" = (
@@ -1239,6 +1161,10 @@
 /obj/item/storage/belt/medical/webbing,
 /obj/item/clothing/neck/stethoscope,
 /obj/item/clothing/accessory/pocketprotector,
+/obj/machinery/light/directional/south,
+/obj/item/spacecash/bundle/c50,
+/obj/item/spacecash/bundle/c50,
+/obj/item/storage/wallet,
 /turf/open/floor/plasteel/white,
 /area/ship/crew/canteen)
 "qT" = (
@@ -1252,6 +1178,11 @@
 	layer = 5
 	},
 /obj/effect/turf_decal/corner/opaque/ntblue/diagonal,
+/obj/structure/closet/firecloset/wall{
+	dir = 1;
+	pixel_y = 28;
+	pixel_x = 2
+	},
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
 "qW" = (
@@ -1268,34 +1199,28 @@
 	dir = 4
 	},
 /turf/open/floor/plating,
-/area/ship/engineering)
+/area/ship/engineering/electrical)
 "rc" = (
-/obj/effect/turf_decal/corner/opaque/blue{
-	dir = 5
-	},
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
 /obj/structure/disposalpipe/segment,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/turf/open/floor/plasteel/white,
-/area/ship/hallway/starboard)
+/obj/effect/turf_decal/corner/opaque/blue/border{
+	dir = 1
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/hallway/port)
 "re" = (
 /obj/effect/turf_decal/corner/opaque/blue{
 	dir = 4
 	},
-/obj/machinery/disposal/bin{
-	pixel_x = 8;
-	pixel_y = 12
-	},
-/obj/machinery/medical_kiosk{
-	pixel_x = 5;
-	pixel_y = -5
-	},
+/obj/machinery/disposal/bin,
 /obj/structure/disposalpipe/trunk{
 	dir = 8
 	},
+/obj/machinery/light/directional/east,
 /turf/open/floor/plasteel/white,
 /area/ship/medical)
 "rn" = (
@@ -1311,21 +1236,17 @@
 	pixel_y = 10
 	},
 /turf/open/floor/engine/airless,
-/area/ship/engineering/engine)
+/area/ship/engineering/atmospherics)
 "ro" = (
 /obj/effect/turf_decal/borderfloorwhite{
 	dir = 1
 	},
 /obj/effect/turf_decal/borderfloorwhite,
-/obj/structure/window/reinforced/spawner/east,
 /obj/machinery/door/window/southright{
 	name = "Chemist Lab";
 	req_access_txt = "5"
 	},
 /obj/machinery/door/firedoor/border_only,
-/obj/machinery/door/firedoor/border_only{
-	dir = 4
-	},
 /obj/structure/disposalpipe/segment,
 /turf/open/floor/plasteel/white,
 /area/ship/medical)
@@ -1343,6 +1264,10 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 4
 	},
+/obj/machinery/light/directional/north,
+/obj/effect/turf_decal/corner/opaque/blue/border{
+	dir = 4
+	},
 /turf/open/floor/plasteel/dark,
 /area/ship/hallway/port)
 "rE" = (
@@ -1350,64 +1275,33 @@
 	icon_state = "6-9"
 	},
 /obj/structure/disposalpipe/segment,
-/obj/machinery/firealarm/directional/east{
-	pixel_y = 4
-	},
-/obj/machinery/light_switch{
-	dir = 8;
-	pixel_x = 20;
-	pixel_y = -9
-	},
 /obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/lootdrop/waste/trash,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 10
 	},
+/obj/machinery/light/directional/east,
 /turf/open/floor/plating,
 /area/ship/engineering/atmospherics)
 "rS" = (
-/obj/structure/cable{
-	icon_state = "0-8"
-	},
-/obj/machinery/power/apc/auto_name/directional/north,
-/obj/machinery/light_switch{
-	pixel_x = -9;
-	pixel_y = 34
-	},
-/obj/machinery/firealarm/directional/north{
-	pixel_x = 4;
-	pixel_y = 43
-	},
-/obj/machinery/cell_charger,
 /obj/structure/table/reinforced,
+/obj/item/storage/box/stockparts/basic,
+/obj/machinery/airalarm/directional/north,
 /turf/open/floor/plasteel/white,
-/area/ship/science)
+/area/ship/medical/surgery)
 "rT" = (
 /obj/structure/sink/kitchen{
-	dir = 4;
-	pixel_x = -13
+	dir = 4
 	},
 /obj/structure/mirror{
-	pixel_x = -24
-	},
-/obj/machinery/power/apc/auto_name/directional/south{
-	pixel_x = -7;
-	pixel_y = -34
-	},
-/obj/machinery/firealarm/directional/south{
-	pixel_x = 7;
-	pixel_y = -44
+	pixel_x = -28
 	},
 /obj/machinery/light_switch{
 	dir = 1;
-	pixel_x = 7;
-	pixel_y = -22
-	},
-/obj/structure/cable{
-	icon_state = "0-4"
+	pixel_x = 11;
+	pixel_y = -16
 	},
 /turf/open/floor/plasteel/white,
-/area/ship/crew/toilet)
+/area/ship/crew/cryo)
 "si" = (
 /obj/structure/disposalpipe/segment{
 	dir = 8
@@ -1427,15 +1321,19 @@
 /turf/closed/wall/mineral/titanium/nodiagonal,
 /area/ship/medical)
 "sz" = (
+/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/air_input{
+	dir = 1;
+	piping_layer = 4;
+	pixel_x = 5
+	},
+/obj/structure/window/plasma/reinforced/spawner/north,
 /turf/open/floor/engine/air,
 /area/ship/engineering/atmospherics)
 "sC" = (
-/obj/effect/turf_decal/corner/opaque/blue{
-	dir = 1
-	},
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
-/turf/open/floor/plasteel/white,
-/area/ship/hallway/starboard)
+/obj/effect/turf_decal/corner/opaque/blue/diagonal,
+/turf/open/floor/plasteel/dark,
+/area/ship/hallway/port)
 "sD" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -1454,34 +1352,32 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 9
 	},
-/obj/structure/closet/firecloset/wall{
-	dir = 4;
-	pixel_x = 28
+/obj/machinery/button/ignition{
+	dir = 8;
+	id = "Savior";
+	pixel_x = 26;
+	pixel_y = 10
+	},
+/obj/machinery/button/door{
+	dir = 8;
+	id = "Savior_chamber";
+	name = "Combustion Chamber Blast Door Control";
+	pixel_x = 28;
+	sync_doors = 0
 	},
 /turf/open/floor/engine,
-/area/ship/engineering/engine)
+/area/ship/engineering/atmospherics)
 "sT" = (
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/obj/structure/cable{
-	icon_state = "5-8"
-	},
-/obj/machinery/atmospherics/pipe/manifold/general/visible/layer5,
 /obj/structure/cable{
 	icon_state = "6-8"
 	},
-/obj/structure/table/reinforced,
-/obj/item/storage/toolbox/mechanical{
-	layer = 4
-	},
-/obj/item/storage/toolbox/mechanical{
-	pixel_x = 2;
-	pixel_y = 6
-	},
 /obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/lootdrop/waste/trash,
-/obj/item/bot_assembly/hygienebot,
+/obj/machinery/atmospherics/pipe/simple/general/visible/layer5{
+	dir = 4
+	},
 /turf/open/floor/plating,
 /area/ship/engineering/atmospherics)
 "td" = (
@@ -1494,26 +1390,10 @@
 /obj/effect/decal/cleanable/oil,
 /turf/open/floor/plating,
 /area/ship/engineering/atmospherics)
-"tf" = (
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/effect/turf_decal/corner/opaque/blue{
-	dir = 8
-	},
-/obj/structure/disposalpipe/segment,
-/obj/machinery/light/dim/directional/west,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/turf/open/floor/plasteel/white,
-/area/ship/hallway/starboard)
 "tl" = (
 /obj/structure/cable/yellow{
 	icon_state = "0-4"
 	},
-/obj/structure/cable/yellow{
-	icon_state = "4-10"
-	},
 /obj/structure/cable{
 	icon_state = "1-8"
 	},
@@ -1521,16 +1401,18 @@
 	dir = 1
 	},
 /turf/open/floor/plating,
-/area/ship/engineering)
+/area/ship/engineering/electrical)
 "to" = (
 /obj/effect/turf_decal/siding/wood{
 	dir = 1
 	},
-/obj/structure/chair/office{
-	dir = 8
+/obj/structure/table/wood,
+/obj/structure/bedsheetbin{
+	pixel_x = -3;
+	pixel_y = -2
 	},
 /turf/open/floor/wood,
-/area/ship/crew/dorm)
+/area/ship/crew/cryo)
 "tq" = (
 /obj/structure/railing{
 	layer = 3.1
@@ -1538,11 +1420,6 @@
 /obj/structure/chair/comfy/shuttle{
 	dir = 1
 	},
-/obj/structure/closet/firecloset/wall{
-	pixel_y = 32;
-	pixel_x = 32;
-	dir = 1
-	},
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
 "tr" = (
@@ -1575,9 +1452,6 @@
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
-/obj/structure/railing{
-	dir = 9
-	},
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable{
 	icon_state = "1-8"
@@ -1585,41 +1459,25 @@
 /obj/structure/cable,
 /obj/machinery/power/smes/engineering,
 /turf/open/floor/plating,
-/area/ship/engineering)
+/area/ship/engineering/electrical)
 "tA" = (
-/obj/structure/table,
-/obj/structure/sign/warning/nosmoking/circle{
-	pixel_x = 32
-	},
-/obj/item/storage/firstaid/fire,
-/obj/item/storage/firstaid/fire,
-/obj/item/storage/firstaid/brute,
-/obj/item/storage/firstaid/brute,
-/obj/item/reagent_containers/glass/beaker/cryoxadone{
-	pixel_x = -6;
-	pixel_y = 6
-	},
-/obj/item/reagent_containers/glass/beaker/cryoxadone{
-	pixel_x = 7;
-	pixel_y = 6
-	},
 /obj/machinery/door/window/westright{
 	name = "Medical storage"
 	},
-/obj/structure/window/reinforced/spawner/north,
 /turf/open/floor/plasteel/white,
-/area/ship/storage)
+/area/ship/medical/surgery)
 "tI" = (
-/obj/effect/turf_decal/corner/opaque/blue,
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
 	dir = 8
 	},
-/turf/open/floor/plasteel/white,
-/area/ship/hallway/starboard)
+/obj/effect/turf_decal/corner/opaque/blue/diagonal,
+/turf/open/floor/plasteel/dark,
+/area/ship/hallway/port)
 "tJ" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/structure/chair/office,
 /turf/open/floor/plating,
-/area/ship/engineering)
+/area/ship/engineering/electrical)
 "tX" = (
 /obj/effect/turf_decal/siding/wood,
 /obj/item/radio,
@@ -1635,19 +1493,18 @@
 	name = "Radio Storage";
 	pixel_x = 28
 	},
-/obj/structure/dresser{
-	dir = 4;
-	pixel_x = 5
-	},
+/obj/item/flashlight,
+/obj/item/flashlight,
+/obj/item/flashlight,
+/obj/item/flashlight,
+/obj/item/flashlight,
+/obj/item/flashlight,
 /turf/open/floor/wood,
-/area/ship/crew/dorm)
+/area/ship/crew/cryo)
 "uf" = (
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
-/obj/effect/turf_decal/corner/opaque/blue{
-	dir = 8
-	},
 /obj/structure/disposalpipe/junction{
 	dir = 2
 	},
@@ -1660,20 +1517,16 @@
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
 	dir = 4
 	},
-/turf/open/floor/plasteel/white,
-/area/ship/hallway/starboard)
-"uj" = (
-/obj/effect/turf_decal/corner/opaque/orange{
-	dir = 4
+/obj/effect/turf_decal/corner/opaque/blue/border{
+	dir = 8
 	},
-/obj/machinery/chem_dispenser/fullupgrade,
-/turf/open/floor/plasteel/white,
-/area/ship/medical)
+/turf/open/floor/plasteel/dark,
+/area/ship/hallway/port)
 "ur" = (
-/obj/structure/window/reinforced/spawner/west,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 4
 	},
+/obj/machinery/door/window/brigdoor/westright,
 /turf/open/floor/carpet/royalblue,
 /area/ship/crew)
 "uD" = (
@@ -1691,15 +1544,6 @@
 	},
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
-"uG" = (
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/structure/disposalpipe/segment,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/turf/open/floor/plasteel/dark,
-/area/ship/hallway/port)
 "uI" = (
 /obj/structure/cable{
 	icon_state = "2-8"
@@ -1716,13 +1560,10 @@
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
 "vc" = (
-/obj/structure/bed,
-/obj/structure/curtain/cloth/fancy,
-/obj/item/bedsheet/captain,
-/obj/machinery/light/small/directional/east,
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
 	dir = 8
 	},
+/obj/machinery/light/directional/east,
 /turf/open/floor/carpet/royalblue,
 /area/ship/crew)
 "vf" = (
@@ -1733,11 +1574,12 @@
 	icon_state = "2-9"
 	},
 /obj/effect/decal/cleanable/dirt,
+/obj/machinery/light/directional/east,
 /obj/machinery/atmospherics/components/binary/pump/layer4{
 	dir = 1
 	},
 /turf/open/floor/plating,
-/area/ship/engineering)
+/area/ship/engineering/electrical)
 "vi" = (
 /obj/effect/spawner/structure/window/plasma/reinforced,
 /obj/machinery/door/firedoor,
@@ -1745,11 +1587,11 @@
 	dir = 4
 	},
 /turf/open/floor/engine,
-/area/ship/engineering/engine)
+/area/ship/engineering/atmospherics)
 "vu" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /turf/open/floor/plasteel/white,
-/area/ship/science)
+/area/ship/medical/surgery)
 "vF" = (
 /obj/structure/cable{
 	icon_state = "2-4"
@@ -1757,12 +1599,11 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/obj/structure/window/plasma/reinforced/spawner/north,
 /obj/machinery/atmospherics/pipe/simple/general/visible/layer5{
 	dir = 5
 	},
-/obj/machinery/computer/atmos_control/tank/mix_tank,
 /obj/effect/decal/cleanable/dirt,
+/obj/machinery/computer/atmos_control/tank/mix_tank,
 /turf/open/floor/plating,
 /area/ship/engineering/atmospherics)
 "vG" = (
@@ -1772,39 +1613,10 @@
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
-/obj/structure/railing{
-	dir = 9;
-	layer = 2
-	},
-/obj/structure/closet/secure_closet/engineering_welding,
-/obj/item/mop,
-/obj/item/reagent_containers/glass/bucket,
-/obj/item/gps{
-	gpstag = "NTREC1";
-	pixel_x = -9;
-	pixel_y = 4
-	},
-/obj/item/gps{
-	gpstag = "NTREC1";
-	pixel_x = -9;
-	pixel_y = 4
-	},
-/obj/item/gps{
-	gpstag = "NTREC1";
-	pixel_x = -9;
-	pixel_y = 4
-	},
-/obj/item/gps{
-	gpstag = "NTREC1";
-	pixel_x = -9;
-	pixel_y = 4
-	},
-/obj/item/clothing/glasses/welding{
-	pixel_y = -1
-	},
-/obj/item/clothing/glasses/welding{
-	pixel_y = -1
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+	dir = 4
 	},
+/obj/effect/decal/cleanable/blood/gibs/limb,
 /turf/open/floor/plating,
 /area/ship/engineering/atmospherics)
 "vH" = (
@@ -1821,11 +1633,12 @@
 /area/ship/hallway/port)
 "vX" = (
 /obj/machinery/rnd/production/protolathe/department/medical,
+/obj/machinery/light/directional/west,
 /turf/open/floor/plasteel/white,
-/area/ship/science)
+/area/ship/medical/surgery)
 "vZ" = (
 /turf/closed/wall/mineral/titanium/nodiagonal,
-/area/ship/crew/toilet)
+/area/ship/crew/cryo)
 "we" = (
 /obj/structure/cable/yellow{
 	icon_state = "0-6"
@@ -1837,36 +1650,32 @@
 	dir = 1
 	},
 /turf/open/floor/plating,
-/area/ship/engineering)
-"wj" = (
-/turf/closed/wall/mineral/titanium/nodiagonal,
-/area/ship/crew/dorm)
+/area/ship/engineering/electrical)
 "wo" = (
-/obj/machinery/light/dim/directional/west,
-/obj/structure/bodycontainer/morgue,
+/obj/effect/turf_decal/corner/opaque/orange{
+	dir = 4
+	},
+/obj/machinery/chem_heater,
 /turf/open/floor/plasteel/white,
-/area/ship/storage)
+/area/ship/medical)
 "wp" = (
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/obj/machinery/light_switch{
-	pixel_y = 20
-	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 8
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 4
 	},
+/obj/machinery/airalarm/directional/north,
+/obj/effect/turf_decal/corner/opaque/blue/diagonal,
 /turf/open/floor/plasteel/dark,
 /area/ship/hallway/port)
 "wE" = (
-/obj/structure/chair/office{
-	dir = 1
-	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /turf/open/floor/plating,
-/area/ship/engineering)
+/area/ship/engineering/electrical)
 "wG" = (
 /obj/effect/turf_decal/siding/wood{
 	dir = 1
@@ -1874,9 +1683,14 @@
 /obj/structure/disposalpipe/segment{
 	dir = 6
 	},
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
+/obj/structure/dresser,
+/obj/item/toy/figure/assistant{
+	pixel_x = 5;
+	pixel_y = 10
+	},
 /turf/open/floor/wood,
-/area/ship/crew/dorm)
+/area/ship/crew/cryo)
 "wJ" = (
 /obj/effect/turf_decal/corner/opaque/red/diagonal,
 /obj/effect/turf_decal/corner/opaque/yellow/diagonal{
@@ -1889,32 +1703,44 @@
 /obj/structure/sign/warning/nosmoking/circle{
 	pixel_x = 32
 	},
-/obj/machinery/light/dim/directional/east,
+/mob/living/simple_animal/bot/medbot,
 /turf/open/floor/plasteel/white,
 /area/ship/medical/surgery)
 "xd" = (
-/obj/structure/window/plasma/reinforced/spawner/west,
-/obj/machinery/atmospherics/components/unary/thermomachine/freezer{
-	heat_capacity = 500;
-	name = "thermo-electric cooler";
-	piping_layer = 5;
-	layer = 5
-	},
-/obj/machinery/light/dim/directional/north,
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating,
-/area/ship/engineering/atmospherics)
-"xt" = (
-/obj/structure/cable{
-	icon_state = "1-4"
+/obj/structure/closet/secure_closet/engineering_welding,
+/obj/item/clothing/glasses/welding{
+	pixel_y = -1
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 9
+/obj/item/gps{
+	gpstag = "NTREC1";
+	pixel_x = -9;
+	pixel_y = 4
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/turf/open/floor/plasteel/white,
-/area/ship/science)
+/obj/item/gps{
+	gpstag = "NTREC1";
+	pixel_x = -9;
+	pixel_y = 4
+	},
+/obj/item/gps{
+	gpstag = "NTREC1";
+	pixel_x = -9;
+	pixel_y = 4
+	},
+/obj/item/gps{
+	gpstag = "NTREC1";
+	pixel_x = -9;
+	pixel_y = 4
+	},
+/obj/item/reagent_containers/glass/bucket,
+/obj/item/mop,
+/obj/item/clothing/glasses/welding{
+	pixel_y = -1
+	},
+/obj/machinery/light/directional/north,
+/turf/open/floor/plating,
+/area/ship/engineering/atmospherics)
 "xO" = (
 /obj/machinery/door/airlock/engineering{
 	dir = 8;
@@ -1961,12 +1787,16 @@
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
 	dir = 1
 	},
+/obj/effect/turf_decal/corner/opaque/blue/border,
 /turf/open/floor/plasteel/dark,
-/area/ship/hallway/starboard)
+/area/ship/hallway/port)
 "ys" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
 	dir = 8
 	},
+/obj/effect/turf_decal/corner/opaque/blue/border{
+	dir = 4
+	},
 /turf/open/floor/plasteel/dark,
 /area/ship/hallway/port)
 "yH" = (
@@ -1984,13 +1814,15 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /turf/open/floor/plasteel/white,
-/area/ship/science)
+/area/ship/medical/surgery)
 "yK" = (
-/obj/effect/turf_decal/corner/opaque/blue{
+/obj/structure/closet/firecloset/wall{
+	pixel_y = 32;
 	dir = 1
 	},
-/turf/open/floor/plasteel/white,
-/area/ship/hallway/starboard)
+/obj/effect/turf_decal/corner/opaque/blue/diagonal,
+/turf/open/floor/plasteel/dark,
+/area/ship/hallway/port)
 "yU" = (
 /obj/machinery/airalarm/directional/east{
 	pixel_x = 22
@@ -1998,30 +1830,24 @@
 /obj/effect/decal/cleanable/oil,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /turf/open/floor/plating,
-/area/ship/engineering)
+/area/ship/engineering/electrical)
 "zi" = (
 /obj/machinery/computer/rdconsole/core{
 	dir = 1
 	},
 /turf/open/floor/plasteel/white,
-/area/ship/science)
+/area/ship/medical/surgery)
 "zl" = (
-/obj/machinery/power/port_gen/pacman{
-	anchored = 1
-	},
-/obj/structure/cable/yellow{
-	icon_state = "0-5"
-	},
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/dirt,
 /obj/machinery/button/door{
 	dir = 4;
 	id = "savior_thrusters";
 	name = "Engine shutter";
 	pixel_x = -25
 	},
+/obj/structure/closet/secure_closet/engineering_electrical,
+/obj/machinery/light/directional/south,
 /turf/open/floor/plating,
-/area/ship/engineering)
+/area/ship/engineering/electrical)
 "zn" = (
 /obj/effect/turf_decal/siding/wood{
 	dir = 4
@@ -2039,16 +1865,14 @@
 /obj/structure/cable{
 	icon_state = "1-8"
 	},
-/obj/effect/turf_decal/corner/opaque/blue{
-	dir = 8
-	},
 /obj/structure/disposalpipe/junction{
 	dir = 8
 	},
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
-/turf/open/floor/plasteel/white,
-/area/ship/hallway/starboard)
+/obj/effect/turf_decal/corner/opaque/blue/diagonal,
+/turf/open/floor/plasteel/dark,
+/area/ship/hallway/port)
 "zV" = (
 /obj/item/wrench/medical,
 /obj/machinery/portable_atmospherics/canister/oxygen,
@@ -2061,28 +1885,21 @@
 /turf/open/floor/plasteel/white,
 /area/ship/cargo)
 "zX" = (
-/obj/item/clothing/shoes/magboots,
-/obj/item/clothing/mask/breath,
-/obj/item/clothing/suit/space/hardsuit/medical,
-/obj/machinery/suit_storage_unit/inherit,
-/obj/machinery/light/dim/directional/east,
-/turf/open/floor/plasteel/white,
-/area/ship/cargo)
+/obj/structure/chair/office{
+	dir = 8
+	},
+/turf/open/floor/wood,
+/area/ship/crew/cryo)
 "Ad" = (
-/obj/structure/bed,
-/obj/structure/curtain/cloth/fancy,
-/obj/item/bedsheet/captain,
-/obj/machinery/light/small/directional/west,
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
+/obj/structure/closet/secure_closet/CMO,
+/obj/item/clothing/neck/stethoscope,
 /turf/open/floor/carpet/royalblue,
 /area/ship/crew/crewtwo)
 "Ao" = (
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/obj/effect/turf_decal/corner/opaque/blue{
-	dir = 8
-	},
 /obj/structure/cable{
 	icon_state = "1-8"
 	},
@@ -2094,12 +1911,13 @@
 /obj/structure/disposalpipe/segment{
 	dir = 9
 	},
-/turf/open/floor/plasteel/white,
-/area/ship/hallway/starboard)
+/obj/effect/turf_decal/corner/opaque/blue/diagonal,
+/turf/open/floor/plasteel/dark,
+/area/ship/hallway/port)
 "Ap" = (
 /obj/machinery/rnd/server,
 /turf/open/floor/plasteel/white,
-/area/ship/science)
+/area/ship/medical/surgery)
 "AC" = (
 /obj/structure/railing{
 	layer = 3.1
@@ -2119,7 +1937,8 @@
 /turf/open/floor/plating,
 /area/ship/crew)
 "AM" = (
-/obj/machinery/firealarm/directional/east,
+/obj/effect/turf_decal/corner/opaque/blue/diagonal,
+/obj/machinery/light/directional/east,
 /turf/open/floor/plasteel/dark,
 /area/ship/hallway/port)
 "AQ" = (
@@ -2129,6 +1948,7 @@
 /obj/effect/turf_decal/corner/opaque/ntblue/diagonal{
 	dir = 4
 	},
+/obj/machinery/light/directional/east,
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
 "AW" = (
@@ -2152,16 +1972,14 @@
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
-/obj/effect/turf_decal/corner/opaque/blue{
-	dir = 8
-	},
 /obj/structure/disposalpipe/segment,
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
 	dir = 8
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/turf/open/floor/plasteel/white,
-/area/ship/hallway/starboard)
+/obj/effect/turf_decal/corner/opaque/blue/diagonal,
+/turf/open/floor/plasteel/dark,
+/area/ship/hallway/port)
 "Bl" = (
 /obj/structure/disposalpipe/segment{
 	dir = 5
@@ -2182,9 +2000,8 @@
 /obj/structure/bed,
 /obj/structure/curtain/bounty,
 /obj/item/bedsheet/dorms,
-/obj/machinery/light/dim/directional/east,
 /turf/open/floor/wood,
-/area/ship/crew/dorm)
+/area/ship/crew/cryo)
 "Bv" = (
 /obj/effect/turf_decal/corner/opaque/orange/diagonal{
 	dir = 4
@@ -2192,8 +2009,8 @@
 /obj/structure/sign/warning/chemdiamond{
 	pixel_y = 31
 	},
-/obj/machinery/disposal/bin,
-/obj/structure/disposalpipe/trunk,
+/obj/item/radio/intercom/directional/west,
+/obj/machinery/chem_dispenser/fullupgrade,
 /turf/open/floor/plasteel/white,
 /area/ship/medical)
 "BA" = (
@@ -2209,9 +2026,10 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 4
 	},
-/obj/machinery/light/dim/directional/north,
+/obj/effect/turf_decal/corner/opaque/blue/full,
+/obj/machinery/firealarm/directional/north,
 /turf/open/floor/plasteel/dark,
-/area/ship/hallway/starboard)
+/area/ship/hallway/port)
 "BS" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 10
@@ -2247,8 +2065,9 @@
 /obj/effect/turf_decal/borderfloorwhite,
 /obj/structure/curtain,
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
+/obj/item/soap/homemade,
 /turf/open/floor/plasteel/white,
-/area/ship/crew/toilet)
+/area/ship/crew/cryo)
 "Cv" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -2262,27 +2081,17 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 4
 	},
-/obj/machinery/light/dim/directional/south,
+/obj/effect/turf_decal/corner/opaque/blue/full,
+/obj/machinery/firealarm/directional/south,
 /turf/open/floor/plasteel/dark,
 /area/ship/hallway/port)
 "Cy" = (
-/obj/structure/table,
-/obj/item/paper_bin{
-	pixel_x = 7;
-	pixel_y = 7
-	},
-/obj/item/pen/fourcolor{
-	pixel_x = 6;
-	pixel_y = 12
-	},
-/obj/effect/decal/cleanable/dirt,
-/obj/item/trash/cheesie{
-	pixel_x = -14;
-	pixel_y = 6
-	},
 /obj/item/radio/intercom/directional/north,
+/obj/structure/table,
+/obj/machinery/cell_charger,
+/obj/machinery/light/directional/east,
 /turf/open/floor/plating,
-/area/ship/engineering)
+/area/ship/engineering/electrical)
 "Dd" = (
 /obj/structure/cable{
 	icon_state = "1-8"
@@ -2335,9 +2144,6 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /turf/open/floor/plasteel/white,
 /area/ship/medical)
-"DC" = (
-/turf/open/floor/plasteel/white,
-/area/ship/science)
 "DV" = (
 /obj/structure/disposalpipe/segment{
 	dir = 8
@@ -2345,7 +2151,7 @@
 /obj/effect/spawner/structure/window/plasma/reinforced,
 /obj/machinery/door/firedoor,
 /turf/open/floor/engine,
-/area/ship/engineering/engine)
+/area/ship/engineering/atmospherics)
 "Em" = (
 /obj/effect/turf_decal/corner/opaque/orange{
 	dir = 8
@@ -2353,9 +2159,6 @@
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
 	dir = 4
 	},
-/obj/structure/disposalpipe/segment{
-	dir = 5
-	},
 /turf/open/floor/plasteel/white,
 /area/ship/medical)
 "Ew" = (
@@ -2364,13 +2167,15 @@
 	},
 /obj/structure/bed/dogbed/runtime,
 /mob/living/simple_animal/pet/cat/Runtime,
-/obj/machinery/light/small/directional/east{
-	pixel_x = 34
-	},
-/obj/machinery/power/apc/auto_name/directional/east,
 /obj/structure/cable{
 	icon_state = "0-2"
 	},
+/obj/machinery/power/apc/auto_name/directional/east,
+/obj/machinery/light_switch{
+	dir = 8;
+	pixel_x = 20;
+	pixel_y = 11
+	},
 /turf/open/floor/wood,
 /area/ship/crew/crewtwo)
 "EJ" = (
@@ -2387,12 +2192,6 @@
 	},
 /turf/open/floor/plasteel/white,
 /area/ship/cargo)
-"EL" = (
-/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/atmos_waste{
-	dir = 1
-	},
-/turf/open/floor/engine/hull,
-/area/ship/external)
 "ER" = (
 /obj/machinery/holopad/emergency/command,
 /obj/structure/railing{
@@ -2404,8 +2203,13 @@
 /turf/closed/wall/mineral/titanium/nodiagonal,
 /area/ship/cargo)
 "Fh" = (
-/turf/closed/wall/mineral/titanium,
-/area/ship/science)
+/obj/structure/table,
+/obj/item/storage/firstaid/o2,
+/obj/item/storage/firstaid/o2,
+/obj/item/storage/firstaid/radiation,
+/obj/item/storage/firstaid/radiation,
+/turf/open/floor/plasteel/white,
+/area/ship/medical/surgery)
 "Fl" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -2424,9 +2228,8 @@
 /turf/open/floor/plasteel/white,
 /area/ship/medical)
 "Fp" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /turf/closed/wall/mineral/titanium/nodiagonal,
-/area/ship/engineering)
+/area/ship/engineering/electrical)
 "Fv" = (
 /obj/effect/turf_decal/borderfloorwhite{
 	dir = 1
@@ -2442,16 +2245,15 @@
 	pixel_x = -8;
 	pixel_y = 3
 	},
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/door/firedoor/border_only,
 /obj/item/toy/figure/chemist{
 	pixel_x = 7;
 	pixel_y = 5
 	},
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/door/firedoor/border_only,
 /turf/open/floor/plasteel/white,
 /area/ship/medical)
 "FE" = (
-/obj/machinery/pipedispenser,
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
@@ -2461,6 +2263,8 @@
 	name = "Engine shutter";
 	pixel_x = -25
 	},
+/obj/machinery/pipedispenser,
+/obj/machinery/light/directional/south,
 /turf/open/floor/plating,
 /area/ship/engineering/atmospherics)
 "FL" = (
@@ -2484,8 +2288,8 @@
 /turf/open/floor/plasteel/white,
 /area/ship/medical)
 "FP" = (
-/obj/structure/closet/secure_closet/CMO,
-/obj/item/clothing/neck/stethoscope,
+/obj/machinery/light/directional/west,
+/obj/structure/dresser,
 /turf/open/floor/carpet/royalblue,
 /area/ship/crew/crewtwo)
 "Ga" = (
@@ -2496,13 +2300,16 @@
 	dir = 4
 	},
 /turf/open/floor/plasteel/white,
-/area/ship/storage)
+/area/ship/medical/surgery)
 "Gi" = (
-/obj/structure/tank_dispenser/oxygen,
 /obj/item/toy/figure/paramedic{
 	pixel_x = -11;
 	pixel_y = 8
 	},
+/obj/structure/rack,
+/obj/item/pickaxe/emergency,
+/obj/item/mining_scanner,
+/obj/machinery/light/directional/north,
 /turf/open/floor/plasteel/white,
 /area/ship/cargo)
 "Gp" = (
@@ -2516,7 +2323,7 @@
 	},
 /obj/structure/closet/emcloset/wall{
 	dir = 8;
-	pixel_x = -30
+	pixel_x = -28
 	},
 /turf/open/floor/plasteel,
 /area/ship/crew/canteen)
@@ -2525,8 +2332,13 @@
 /obj/effect/spawner/lootdrop/waste/trash,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /obj/structure/cable,
+/obj/machinery/light_switch{
+	dir = 8;
+	pixel_x = 20;
+	pixel_y = 11
+	},
 /turf/open/floor/plating,
-/area/ship/engineering)
+/area/ship/engineering/electrical)
 "Gw" = (
 /obj/effect/turf_decal/siding/wood{
 	dir = 5
@@ -2537,8 +2349,10 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/disposal/bin,
+/obj/machinery/light/directional/east,
+/obj/machinery/firealarm/directional/north,
 /turf/open/floor/wood,
-/area/ship/crew/dorm)
+/area/ship/crew/cryo)
 "GD" = (
 /obj/machinery/door/airlock/medical{
 	name = "Surgery";
@@ -2553,20 +2367,15 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/structure/curtain/cloth,
 /turf/open/floor/plasteel/white,
 /area/ship/medical/surgery)
-"GR" = (
-/turf/closed/wall/mineral/titanium/nodiagonal,
-/area/ship/engineering/engine)
 "Hb" = (
-/obj/structure/railing{
-	dir = 5
-	},
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable,
 /obj/machinery/power/smes/engineering,
 /turf/open/floor/plating,
-/area/ship/engineering)
+/area/ship/engineering/electrical)
 "Hy" = (
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
 	dir = 4
@@ -2598,23 +2407,27 @@
 /obj/item/storage/firstaid/fire,
 /obj/item/storage/firstaid,
 /obj/item/storage/firstaid,
-/obj/item/storage/box/masks,
-/obj/item/storage/box/gloves,
-/obj/item/storage/box/bodybags{
-	pixel_x = -7;
-	pixel_y = 4
-	},
 /obj/item/reagent_containers/glass/bottle/formaldehyde{
 	pixel_x = 8;
 	pixel_y = 8
 	},
+/obj/item/storage/box/masks,
+/obj/item/storage/box/gloves,
 /obj/item/reagent_containers/glass/bottle{
 	list_reagents = list(/datum/reagent/medicine/thializid=30);
 	name = "thializid bottle";
 	pixel_x = 5
 	},
+/obj/item/storage/box/bodybags{
+	pixel_x = -7;
+	pixel_y = 4
+	},
+/obj/structure/table,
+/obj/machinery/jukebox/boombox{
+	icon_state = "wooden_tv"
+	},
 /turf/open/floor/plasteel/white,
-/area/ship/storage)
+/area/ship/medical/surgery)
 "HA" = (
 /obj/effect/turf_decal/borderfloorwhite,
 /obj/machinery/door/firedoor/border_only{
@@ -2622,30 +2435,21 @@
 	},
 /obj/machinery/door/firedoor/border_only,
 /obj/machinery/door/airlock/public/glass,
+/obj/effect/turf_decal/corner/opaque/blue/diagonal,
 /turf/open/floor/plasteel/dark,
 /area/ship/hallway/port)
 "Il" = (
 /obj/item/clothing/shoes/magboots,
 /obj/item/clothing/mask/breath,
 /obj/item/clothing/suit/space/hardsuit/medical,
-/obj/item/radio/intercom/directional/west{
-	pixel_x = -41
-	},
 /obj/machinery/suit_storage_unit/inherit,
+/obj/machinery/light/directional/south,
 /turf/open/floor/plasteel/white,
 /area/ship/cargo)
 "It" = (
 /obj/effect/turf_decal/siding/wood{
 	dir = 6
 	},
-/obj/machinery/firealarm/directional/south{
-	pixel_x = -6
-	},
-/obj/machinery/light_switch{
-	dir = 1;
-	pixel_x = 7;
-	pixel_y = -22
-	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 4
 	},
@@ -2683,18 +2487,6 @@
 	pixel_x = 7;
 	pixel_y = 18
 	},
-/obj/item/storage/box/donkpockets/donkpocketberry{
-	pixel_x = 7;
-	pixel_y = 23
-	},
-/obj/item/storage/box/donkpockets/donkpocketpizza{
-	pixel_x = 5;
-	pixel_y = 6
-	},
-/obj/item/storage/box/donkpockets/donkpocketteriyaki{
-	pixel_x = 5;
-	pixel_y = 10
-	},
 /obj/item/toy/cards/deck{
 	pixel_x = -10;
 	pixel_y = 7
@@ -2706,10 +2498,8 @@
 	dir = 4
 	},
 /obj/machinery/iv_drip,
-/obj/machinery/stasis{
-	dir = 1
-	},
-/obj/machinery/airalarm/directional/west,
+/obj/machinery/stasis,
+/obj/machinery/firealarm/directional/west,
 /turf/open/floor/plasteel/white,
 /area/ship/medical)
 "Jd" = (
@@ -2719,24 +2509,13 @@
 /obj/structure/disposalpipe/segment,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /turf/open/floor/wood,
-/area/ship/crew/dorm)
+/area/ship/crew/cryo)
 "Jw" = (
-/obj/structure/bed/dogbed/ian,
-/mob/living/simple_animal/pet/dog/corgi/Ian,
 /obj/effect/turf_decal/siding/wood{
 	dir = 8
 	},
-/obj/machinery/airalarm/directional/west{
-	pixel_x = -40
-	},
-/obj/machinery/firealarm/directional/west{
-	pixel_y = 6
-	},
-/obj/machinery/light_switch{
-	dir = 4;
-	pixel_x = -19;
-	pixel_y = -5
-	},
+/obj/machinery/light/directional/west,
+/obj/structure/chair/comfy/beige/old/directional/north,
 /turf/open/floor/wood,
 /area/ship/crew)
 "Jz" = (
@@ -2770,42 +2549,45 @@
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
 	dir = 1
 	},
+/obj/effect/turf_decal/corner/opaque/blue/diagonal,
 /turf/open/floor/plasteel/dark,
 /area/ship/hallway/port)
 "JR" = (
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/obj/effect/turf_decal/corner/opaque/blue{
-	dir = 8
-	},
-/obj/structure/cable{
-	icon_state = "1-8"
-	},
 /obj/structure/disposalpipe/segment{
 	dir = 8
 	},
-/obj/machinery/light/dim/directional/south,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 4
 	},
-/turf/open/floor/plasteel/white,
-/area/ship/hallway/starboard)
+/obj/effect/turf_decal/corner/opaque/blue/diagonal,
+/obj/machinery/light/directional/south,
+/turf/open/floor/plasteel/dark,
+/area/ship/hallway/port)
 "JX" = (
+/obj/machinery/light/directional/west,
 /obj/machinery/limbgrower,
 /turf/open/floor/plasteel/white,
-/area/ship/storage)
+/area/ship/medical/surgery)
 "Ki" = (
 /obj/effect/turf_decal/corner/opaque/orange/diagonal{
 	dir = 4
 	},
-/obj/item/radio/intercom/directional/east,
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
 	dir = 8
 	},
+/obj/structure/closet/wall/white/chem{
+	dir = 4;
+	pixel_x = 28
+	},
+/obj/structure/disposalpipe/segment{
+	dir = 9
+	},
 /turf/open/floor/plasteel/white,
 /area/ship/medical)
 "Kn" = (
@@ -2824,22 +2606,14 @@
 /turf/open/floor/plating,
 /area/ship/engineering/atmospherics)
 "Kz" = (
-/obj/machinery/firealarm/directional/north{
-	pixel_x = 4;
-	pixel_y = 43
-	},
-/obj/machinery/light_switch{
-	pixel_x = -9;
-	pixel_y = 34
-	},
 /obj/structure/cable{
 	icon_state = "0-8"
 	},
-/obj/machinery/power/apc/auto_name/directional/north,
-/obj/item/radio/intercom/directional/east,
+/obj/structure/window/reinforced/spawner/west,
 /obj/structure/closet/crate/freezer/blood,
+/obj/machinery/airalarm/directional/north,
 /turf/open/floor/plasteel/white,
-/area/ship/storage)
+/area/ship/medical/surgery)
 "KP" = (
 /obj/machinery/air_sensor/atmos/incinerator_tank{
 	id_tag = "gecko_burn_sensor"
@@ -2849,21 +2623,24 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/spawner/lootdrop/waste/trash,
-/obj/machinery/atmospherics/components/unary/passive_vent/layer4{
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
 	dir = 4
 	},
 /turf/open/floor/engine/airless,
-/area/ship/engineering/engine)
+/area/ship/engineering/atmospherics)
 "Ln" = (
-/obj/machinery/computer/apc_control{
-	dir = 8;
-	icon_state = "computer-left"
-	},
-/obj/machinery/light/small/directional/east,
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/oil,
+/obj/structure/table,
+/obj/item/flashlight/lamp{
+	pixel_x = -9;
+	pixel_y = 14
+	},
+/obj/item/folder,
+/obj/item/pen,
+/obj/effect/spawner/lootdrop/waste/trash,
 /turf/open/floor/plating,
-/area/ship/engineering)
+/area/ship/engineering/electrical)
 "Lu" = (
 /obj/effect/turf_decal/industrial/warning{
 	dir = 4
@@ -2903,27 +2680,28 @@
 	dir = 9
 	},
 /obj/structure/disposalpipe/segment,
+/obj/machinery/light_switch{
+	dir = 8;
+	pixel_x = 20;
+	pixel_y = -12
+	},
 /turf/open/floor/plating,
 /area/ship/engineering/atmospherics)
 "Mp" = (
 /obj/effect/turf_decal/industrial/warning{
 	dir = 8
 	},
-/turf/open/floor/engine/hull,
-/area/ship/external)
-"Mt" = (
-/obj/structure/urinal{
-	dir = 8;
-	pixel_x = 32;
-	pixel_y = 7
-	},
-/obj/structure/cable{
-	icon_state = "2-8"
-	},
+/turf/open/floor/engine/hull,
+/area/ship/external)
+"Mt" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/structure/urinal{
+	dir = 8;
+	pixel_x = 15
+	},
 /turf/open/floor/plasteel/white,
-/area/ship/crew/toilet)
+/area/ship/crew/cryo)
 "Mv" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -2933,7 +2711,7 @@
 /area/ship/cargo)
 "MM" = (
 /turf/open/floor/wood,
-/area/ship/crew/dorm)
+/area/ship/crew/cryo)
 "MT" = (
 /turf/closed/wall/mineral/titanium/nodiagonal,
 /area/ship/engineering/atmospherics)
@@ -2971,24 +2749,18 @@
 /turf/open/floor/plasteel,
 /area/ship/crew/canteen)
 "NH" = (
-/obj/structure/window/plasma/reinforced/spawner/east,
-/obj/machinery/computer/atmos_control/tank/air_tank{
-	dir = 1
-	},
 /obj/effect/decal/cleanable/dirt,
-/obj/machinery/light/dim/directional/south,
 /turf/open/floor/plating,
 /area/ship/engineering/atmospherics)
 "NU" = (
 /obj/effect/turf_decal/corner/opaque/blue{
 	dir = 8
 	},
-/obj/machinery/iv_drip,
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
 	dir = 4
 	},
-/obj/machinery/stasis{
-	dir = 1
+/obj/machinery/sleeper{
+	dir = 4
 	},
 /turf/open/floor/plasteel/white,
 /area/ship/medical)
@@ -2996,36 +2768,27 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/obj/effect/turf_decal/corner/opaque/blue{
-	dir = 8
-	},
 /obj/structure/disposalpipe/segment{
 	dir = 8
 	},
-/obj/machinery/light_switch{
-	dir = 1;
-	pixel_y = -19
-	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 4
 	},
-/turf/open/floor/plasteel/white,
-/area/ship/hallway/starboard)
+/obj/effect/turf_decal/corner/opaque/blue/diagonal,
+/turf/open/floor/plasteel/dark,
+/area/ship/hallway/port)
 "On" = (
 /obj/machinery/atmospherics/components/binary/circulator{
 	piping_layer = 4
 	},
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
-/obj/structure/sign/poster/contraband/smoke{
-	pixel_y = 32
-	},
-/obj/machinery/light/small/built/directional/north,
+/obj/machinery/light/directional/north,
 /turf/open/floor/engine,
-/area/ship/engineering/engine)
+/area/ship/engineering/atmospherics)
 "Or" = (
 /obj/structure/sign/nanotrasen,
 /turf/closed/wall/mineral/titanium,
@@ -3035,11 +2798,6 @@
 /obj/effect/turf_decal/siding/wood{
 	dir = 5
 	},
-/obj/item/toy/figure/captain{
-	layer = 4;
-	pixel_x = -16;
-	pixel_y = 16
-	},
 /obj/item/flashlight/lamp/green{
 	layer = 4;
 	pixel_x = 8;
@@ -3049,6 +2807,8 @@
 	pixel_x = -2;
 	pixel_y = 7
 	},
+/obj/item/spacecash/bundle/c5,
+/obj/item/storage/wallet/random,
 /turf/open/floor/wood,
 /area/ship/crew)
 "OG" = (
@@ -3063,30 +2823,23 @@
 	},
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/engine,
-/area/ship/engineering/engine)
+/area/ship/engineering/atmospherics)
 "OH" = (
 /obj/effect/turf_decal/corner/opaque/blue/diagonal{
 	dir = 4
 	},
-/obj/machinery/atmospherics/components/unary/cryo_cell{
-	dir = 1
-	},
-/obj/item/reagent_containers/glass/beaker/cryoxadone{
-	layer = 5
+/obj/machinery/atmospherics/components/unary/thermomachine/freezer{
+	dir = 1;
+	initialize_directions = 1
 	},
+/obj/machinery/light/directional/east,
 /turf/open/floor/plasteel/white,
 /area/ship/medical)
-"OL" = (
-/turf/closed/wall/mineral/titanium,
-/area/ship/engineering/engine)
 "OM" = (
-/obj/structure/dresser{
-	dir = 8;
-	pixel_x = -5
-	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 5
 	},
+/obj/machinery/suit_storage_unit/cmo,
 /turf/open/floor/carpet/royalblue,
 /area/ship/crew/crewtwo)
 "OU" = (
@@ -3120,7 +2873,7 @@
 	dir = 4
 	},
 /turf/open/floor/plasteel/dark,
-/area/ship/engineering)
+/area/ship/engineering/electrical)
 "Pp" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -3147,9 +2900,6 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/obj/effect/turf_decal/borderfloorwhite{
-	dir = 4
-	},
 /obj/structure/disposalpipe/segment{
 	dir = 8
 	},
@@ -3162,8 +2912,10 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 4
 	},
+/obj/effect/turf_decal/corner/opaque/blue/full,
+/obj/machinery/light/directional/south,
 /turf/open/floor/plasteel/dark,
-/area/ship/hallway/starboard)
+/area/ship/hallway/port)
 "Pv" = (
 /obj/structure/cable{
 	icon_state = "2-8"
@@ -3177,11 +2929,19 @@
 /obj/structure/disposalpipe/segment,
 /obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2,
 /obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4,
+/obj/effect/turf_decal/corner/opaque/blue/border{
+	dir = 1
+	},
 /turf/open/floor/plasteel/dark,
 /area/ship/hallway/port)
 "PB" = (
 /obj/structure/window/reinforced/spawner/west,
-/obj/machinery/suit_storage_unit/captain,
+/obj/structure/dresser,
+/obj/item/toy/figure/captain{
+	pixel_x = 5;
+	pixel_y = 5
+	},
+/obj/machinery/firealarm/directional/north,
 /turf/open/floor/carpet/royalblue,
 /area/ship/crew)
 "PE" = (
@@ -3199,7 +2959,7 @@
 	dir = 1
 	},
 /turf/open/floor/engine,
-/area/ship/engineering/engine)
+/area/ship/engineering/atmospherics)
 "PG" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -3216,75 +2976,48 @@
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
-/obj/effect/turf_decal/corner/opaque/blue{
-	dir = 8
-	},
 /obj/structure/disposalpipe/segment,
-/obj/item/radio/intercom/directional/west,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/turf/open/floor/plasteel/white,
-/area/ship/hallway/starboard)
+/obj/effect/turf_decal/corner/opaque/blue/diagonal,
+/turf/open/floor/plasteel/dark,
+/area/ship/hallway/port)
 "PN" = (
+/obj/item/gun/energy/e_gun,
+/obj/effect/turf_decal/corner/opaque/ntblue{
+	dir = 1
+	},
+/obj/item/melee/baton/loaded,
+/obj/item/clothing/head/helmet,
+/obj/item/stock_parts/cell/gun/upgraded,
+/obj/item/clothing/suit/armor/nanotrasen,
+/obj/item/restraints/handcuffs,
+/obj/item/assembly/flash,
 /obj/structure/closet/secure_closet/wall{
 	dir = 8;
 	icon_door = "sec_wall";
 	icon_state = "sec_wall";
 	name = "gun locker";
-	pixel_x = -32;
+	pixel_x = -28;
 	req_access_txt = "19"
 	},
-/obj/machinery/light_switch{
-	dir = 4;
-	pixel_x = -25;
-	pixel_y = 15
-	},
-/obj/machinery/firealarm/directional/west{
-	pixel_x = -46;
-	pixel_y = 18
-	},
-/obj/item/gun/energy/e_gun,
-/obj/item/gun/energy/e_gun/mini,
-/obj/item/gun/energy/e_gun/mini,
-/obj/item/stock_parts/cell/gun/mini{
-	pixel_x = 10
-	},
-/obj/item/stock_parts/cell/gun/mini{
-	pixel_x = 10
-	},
-/obj/item/stock_parts/cell/gun/mini{
-	pixel_x = 10
-	},
-/obj/item/stock_parts/cell/gun/mini{
-	pixel_x = 10
-	},
-/obj/item/assembly/flash/handheld{
-	pixel_x = -9
-	},
-/obj/item/assembly/flash/handheld{
-	pixel_x = -9
-	},
-/obj/item/melee/classic_baton/telescopic{
-	pixel_x = 8
-	},
-/obj/item/stock_parts/cell/gun,
-/obj/item/stock_parts/cell/gun,
-/obj/effect/turf_decal/corner/opaque/ntblue{
-	dir = 1
+/obj/structure/table/reinforced,
+/obj/item/coin/titanium{
+	pixel_y = 11;
+	pixel_x = -11
 	},
-/obj/item/stock_parts/cell/gun,
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
 "Qc" = (
 /obj/effect/turf_decal/corner/opaque/orange{
 	dir = 8
 	},
-/obj/structure/disposalpipe/segment{
-	dir = 10
-	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 4
 	},
+/obj/structure/disposalpipe/segment{
+	dir = 6
+	},
 /turf/open/floor/plasteel/white,
 /area/ship/medical)
 "Qi" = (
@@ -3297,29 +3030,19 @@
 /obj/structure/cable{
 	icon_state = "2-4"
 	},
-/obj/structure/railing{
-	dir = 4
-	},
-/obj/structure/railing{
-	dir = 8
-	},
-/obj/structure/railing{
-	dir = 6;
-	layer = 3.1
-	},
-/obj/structure/closet/secure_closet/engineering_electrical{
-	req_access = null;
-	req_access_txt = "11"
-	},
 /obj/effect/decal/cleanable/oil,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 5
+	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 5
+/obj/machinery/computer/atmos_alert{
+	dir = 1;
+	icon_state = "computer-right"
 	},
 /turf/open/floor/plating,
-/area/ship/engineering)
+/area/ship/engineering/electrical)
 "Qo" = (
 /obj/structure/closet/secure_closet{
 	icon_state = "med_secure";
@@ -3339,27 +3062,38 @@
 /obj/item/clothing/neck/stethoscope,
 /obj/item/clothing/accessory/pocketprotector,
 /obj/machinery/airalarm/directional/south,
+/obj/item/spacecash/bundle/c50,
+/obj/item/spacecash/bundle/c50,
+/obj/item/storage/wallet,
 /turf/open/floor/plasteel/white,
 /area/ship/crew/canteen)
 "Qt" = (
+/obj/item/storage/firstaid/brute,
+/obj/item/storage/firstaid/brute,
+/obj/item/storage/firstaid/fire,
+/obj/item/storage/firstaid/fire,
+/obj/item/reagent_containers/glass/beaker/cryoxadone{
+	pixel_x = 7;
+	pixel_y = 6
+	},
+/obj/item/reagent_containers/glass/beaker/cryoxadone{
+	pixel_x = -6;
+	pixel_y = 6
+	},
+/obj/structure/window/reinforced/spawner/west,
 /obj/structure/table,
-/obj/item/storage/firstaid/o2,
-/obj/item/storage/firstaid/o2,
-/obj/item/storage/firstaid/radiation,
-/obj/item/storage/firstaid/radiation,
 /obj/structure/window/reinforced/spawner,
-/obj/machinery/door/window/westleft,
 /turf/open/floor/plasteel/white,
-/area/ship/storage)
+/area/ship/medical/surgery)
 "QD" = (
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/obj/structure/cable{
-	icon_state = "1-8"
-	},
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
+/obj/effect/turf_decal/corner/opaque/blue/border{
+	dir = 1
+	},
 /turf/open/floor/plasteel/dark,
 /area/ship/hallway/port)
 "QE" = (
@@ -3369,10 +3103,7 @@
 	},
 /obj/structure/window/reinforced/spawner,
 /obj/effect/turf_decal/spline/fancy/transparent/black,
-/obj/machinery/vending/coffee{
-	pixel_x = -6
-	},
-/obj/machinery/light/dim/directional/west,
+/obj/machinery/vending/snack/random,
 /turf/open/floor/plasteel,
 /area/ship/crew/canteen)
 "QO" = (
@@ -3396,14 +3127,13 @@
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
-/obj/effect/turf_decal/corner/opaque/blue{
-	dir = 8
-	},
 /obj/structure/disposalpipe/segment,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/turf/open/floor/plasteel/white,
-/area/ship/hallway/starboard)
+/obj/effect/turf_decal/corner/opaque/blue/diagonal,
+/obj/effect/decal/cleanable/blood/gibs/limb,
+/turf/open/floor/plasteel/dark,
+/area/ship/hallway/port)
 "QT" = (
 /obj/structure/sign/nanotrasen,
 /turf/closed/wall/mineral/titanium,
@@ -3423,23 +3153,30 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /turf/open/floor/wood,
-/area/ship/crew/dorm)
+/area/ship/crew/cryo)
 "Ri" = (
 /obj/effect/turf_decal/corner/opaque/blue{
 	dir = 8
 	},
-/obj/item/bedsheet/medical,
-/obj/structure/bed,
-/obj/machinery/iv_drip,
+/obj/machinery/medical_kiosk,
 /turf/open/floor/plasteel/white,
 /area/ship/medical)
 "Rw" = (
-/obj/effect/turf_decal/corner/opaque/blue{
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 4
 	},
-/obj/machinery/airalarm/directional/north,
-/turf/open/floor/plasteel/white,
-/area/ship/hallway/starboard)
+/obj/effect/turf_decal/corner/opaque/blue/diagonal,
+/obj/machinery/light_switch{
+	pixel_y = 20
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/hallway/port)
 "Ry" = (
 /obj/effect/turf_decal/corner/opaque/red/diagonal,
 /obj/effect/turf_decal/corner/opaque/yellow/diagonal{
@@ -3464,7 +3201,9 @@
 /obj/item/kitchen/spoon/plastic,
 /obj/item/kitchen/spoon/plastic,
 /obj/item/kitchen/fork/plastic,
-/obj/structure/closet/wall/directional/east,
+/obj/machinery/firealarm/directional/east{
+	pixel_y = 4
+	},
 /turf/open/floor/plasteel,
 /area/ship/crew/canteen)
 "Rz" = (
@@ -3487,9 +3226,10 @@
 /obj/structure/bed,
 /obj/structure/curtain/bounty,
 /obj/item/bedsheet/dorms,
-/obj/machinery/airalarm/directional/east,
+/obj/machinery/airalarm/directional/south,
+/obj/machinery/light/directional/east,
 /turf/open/floor/wood,
-/area/ship/crew/dorm)
+/area/ship/crew/cryo)
 "RM" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -3501,8 +3241,12 @@
 	icon_state = "2-4"
 	},
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
+/obj/machinery/computer/apc_control{
+	dir = 1;
+	icon_state = "computer-left"
+	},
 /turf/open/floor/plating,
-/area/ship/engineering)
+/area/ship/engineering/electrical)
 "RV" = (
 /obj/machinery/door/poddoor{
 	dir = 4;
@@ -3515,14 +3259,37 @@
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
 	dir = 1
 	},
+/obj/effect/turf_decal/corner/opaque/blue/diagonal,
 /turf/open/floor/plasteel/dark,
 /area/ship/hallway/port)
 "Sf" = (
 /turf/closed/wall/mineral/titanium,
 /area/ship/engineering/atmospherics)
 "Sl" = (
-/turf/closed/wall/mineral/titanium/nodiagonal,
-/area/ship/science)
+/obj/machinery/door/window/westright{
+	name = "Medical storage"
+	},
+/obj/structure/table/chem,
+/obj/item/reagent_containers/glass/beaker/plastic{
+	pixel_x = -5;
+	pixel_y = 1
+	},
+/obj/item/reagent_containers/glass/beaker/plastic{
+	pixel_x = -2;
+	pixel_y = 3
+	},
+/obj/item/reagent_containers/glass/beaker/plastic{
+	pixel_y = 4;
+	pixel_x = 1
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 4
+	},
+/obj/effect/turf_decal/corner/opaque/orange/half{
+	dir = 8
+	},
+/turf/open/floor/plasteel/white,
+/area/ship/medical)
 "Sp" = (
 /obj/structure/window/reinforced/spawner/east,
 /turf/open/floor/carpet/royalblue,
@@ -3533,7 +3300,7 @@
 	},
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
 /turf/open/floor/plating,
-/area/ship/engineering)
+/area/ship/engineering/electrical)
 "SD" = (
 /obj/effect/turf_decal/trimline/opaque/blue/corner{
 	dir = 1;
@@ -3552,7 +3319,8 @@
 	layer = 1;
 	pixel_x = -10
 	},
-/turf/open/floor/engine/fuel,
+/obj/structure/window/plasma/reinforced/spawner,
+/turf/open/floor/engine/plasma,
 /area/ship/engineering/atmospherics)
 "Ta" = (
 /obj/effect/turf_decal/borderfloorwhite{
@@ -3571,25 +3339,26 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /turf/open/floor/plasteel/dark,
-/area/ship/crew/toilet)
+/area/ship/crew/cryo)
 "Ti" = (
 /obj/machinery/smartfridge/chemistry/preloaded,
 /obj/machinery/door/window/southright{
-	dir = 1;
 	name = "Chemist Lab";
 	req_access_txt = "5"
 	},
-/obj/machinery/door/firedoor/border_only{
-	dir = 1;
-	layer = 5
-	},
+/obj/machinery/door/firedoor/border_only,
 /turf/open/floor/plasteel/white,
 /area/ship/medical)
 "TB" = (
-/obj/machinery/power/apc/auto_name/directional/west,
 /obj/structure/cable{
 	icon_state = "0-4"
 	},
+/obj/machinery/power/apc/auto_name/directional/west,
+/obj/machinery/light_switch{
+	dir = 4;
+	pixel_x = -19;
+	pixel_y = 12
+	},
 /turf/open/floor/plasteel/white,
 /area/ship/crew/canteen)
 "TY" = (
@@ -3620,18 +3389,13 @@
 /obj/effect/turf_decal/corner/opaque/blue{
 	dir = 8
 	},
-/obj/machinery/sleeper{
-	dir = 4
-	},
-/obj/machinery/firealarm/directional/south,
-/obj/machinery/light_switch{
-	dir = 1;
-	pixel_x = 10;
-	pixel_y = -19
-	},
 /obj/structure/sign/warning/nosmoking/circle{
 	pixel_x = -25
 	},
+/obj/item/bedsheet/medical,
+/obj/structure/bed,
+/obj/machinery/iv_drip,
+/obj/structure/curtain/cloth,
 /turf/open/floor/plasteel/white,
 /area/ship/medical)
 "Ug" = (
@@ -3645,17 +3409,17 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 6
 	},
-/obj/structure/disposalpipe/segment{
-	dir = 8
-	},
 /turf/open/floor/plasteel/white,
 /area/ship/medical)
 "Ui" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 9
 	},
+/obj/machinery/medipen_refiller{
+	pixel_x = -5
+	},
 /turf/open/floor/plasteel/white,
-/area/ship/storage)
+/area/ship/medical/surgery)
 "Ul" = (
 /obj/structure/sign/departments/medbay/alt{
 	pixel_x = -32
@@ -3675,6 +3439,7 @@
 "Uw" = (
 /obj/machinery/computer/cargo/express,
 /obj/effect/turf_decal/corner/opaque/ntblue/diagonal,
+/obj/machinery/light/directional/east,
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
 "UB" = (
@@ -3682,6 +3447,7 @@
 	dir = 8
 	},
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
+/obj/structure/chair/comfy/beige/old/directional/north,
 /turf/open/floor/wood,
 /area/ship/crew/crewtwo)
 "UN" = (
@@ -3692,20 +3458,24 @@
 	},
 /obj/machinery/door/firedoor/border_only,
 /obj/structure/window/reinforced/fulltile/shuttle,
+/obj/structure/curtain/cloth,
 /turf/open/floor/plating,
-/area/ship/storage)
+/area/ship/medical/surgery)
 "US" = (
 /obj/item/storage/backpack/duffelbag/med/surgery,
 /obj/item/clothing/gloves/color/latex/nitrile,
 /obj/structure/table/reinforced,
-/obj/item/defibrillator/loaded,
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plasteel/white,
 /area/ship/medical/surgery)
 "Vf" = (
-/turf/closed/wall/mineral/titanium/nodiagonal,
-/area/ship/engineering)
+/obj/effect/spawner/structure/window/reinforced,
+/obj/effect/turf_decal/corner/opaque/orange/half{
+	dir = 1
+	},
+/turf/open/floor/plasteel/white,
+/area/ship/medical)
 "Vk" = (
 /obj/effect/turf_decal/trimline/opaque/blue/end{
 	dir = 1;
@@ -3720,7 +3490,6 @@
 /obj/structure/disposalpipe/segment{
 	dir = 6
 	},
-/mob/living/simple_animal/bot/medbot,
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
 	dir = 4
 	},
@@ -3730,6 +3499,7 @@
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
+/obj/effect/decal/cleanable/blood/gibs/old,
 /turf/open/floor/plasteel/white,
 /area/ship/medical)
 "Vm" = (
@@ -3737,25 +3507,21 @@
 	dir = 1
 	},
 /obj/effect/turf_decal/borderfloorwhite,
-/obj/structure/window/reinforced/spawner/east,
 /obj/machinery/door/window/southleft{
 	name = "Chemist Lab";
 	req_access_txt = "5"
 	},
 /obj/structure/table/chem,
-/obj/item/paper_bin{
-	pixel_x = 7;
-	pixel_y = 2
-	},
-/obj/item/pen/fourcolor{
-	pixel_x = 6;
-	pixel_y = 2
-	},
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/door/firedoor/border_only,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/reagentgrinder{
+	pixel_x = 3;
+	pixel_y = 8
+	},
+/obj/machinery/door/firedoor/border_only,
 /turf/open/floor/plasteel/white,
 /area/ship/medical)
 "Vn" = (
@@ -3768,24 +3534,14 @@
 /turf/open/floor/plasteel,
 /area/ship/crew/canteen)
 "Vr" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/vending/engivend,
-/obj/machinery/light/small/directional/south,
+/obj/structure/closet/secure_closet/engineering_personal,
 /turf/open/floor/plating,
-/area/ship/engineering)
+/area/ship/engineering/electrical)
 "Vs" = (
 /obj/structure/closet/secure_closet{
 	icon_state = "brig_phys";
 	name = "paramedic's locker"
 	},
-/obj/machinery/firealarm/directional/east,
-/obj/machinery/light_switch{
-	dir = 8;
-	pixel_x = 21;
-	pixel_y = 11
-	},
 /obj/item/clothing/glasses/hud/health,
 /obj/item/storage/belt/medical,
 /obj/item/clothing/head/soft/paramedic,
@@ -3799,15 +3555,14 @@
 /obj/item/storage/belt/medical/webbing/paramedic,
 /obj/item/clothing/neck/stethoscope,
 /obj/item/clothing/accessory/pocketprotector,
+/obj/machinery/light/directional/south,
+/obj/item/spacecash/bundle/c200,
+/obj/item/storage/wallet,
 /turf/open/floor/plasteel/white,
 /area/ship/crew/canteen)
-"Vv" = (
-/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/air_input{
-	dir = 1;
-	piping_layer = 4;
-	pixel_x = 5
-	},
-/turf/open/floor/engine/air,
+"Vv" = (
+/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer4,
+/turf/open/floor/plating,
 /area/ship/engineering/atmospherics)
 "Vx" = (
 /obj/effect/turf_decal/corner/opaque/red/diagonal,
@@ -3838,10 +3593,15 @@
 /turf/open/floor/plasteel,
 /area/ship/crew/canteen)
 "VH" = (
-/obj/machinery/door/window/brigdoor/westright,
+/obj/machinery/airalarm/directional/south,
+/obj/structure/window/reinforced/spawner/west,
+/obj/machinery/suit_storage_unit/captain,
 /turf/open/floor/carpet/royalblue,
 /area/ship/crew)
 "VL" = (
+/obj/effect/turf_decal/corner/opaque/blue/border{
+	dir = 4
+	},
 /turf/open/floor/plasteel/dark,
 /area/ship/hallway/port)
 "VN" = (
@@ -3857,6 +3617,7 @@
 /obj/machinery/door/airlock/public/glass,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/effect/turf_decal/corner/opaque/blue/diagonal,
 /turf/open/floor/plasteel/dark,
 /area/ship/hallway/port)
 "VP" = (
@@ -3866,42 +3627,26 @@
 /obj/machinery/button/shieldwallgen{
 	dir = 4;
 	id = "Savior_entrance";
-	pixel_x = -25;
-	pixel_y = -10
+	pixel_x = -26;
+	pixel_y = 10
 	},
 /obj/machinery/button/door{
 	dir = 4;
 	id = "Savior_entrance";
 	name = "Cargo Bay Door Control";
-	pixel_x = -36;
-	pixel_y = -4
-	},
-/obj/machinery/light_switch{
-	dir = 4;
-	pixel_x = -25;
-	pixel_y = -3
-	},
-/obj/machinery/firealarm/directional/west{
-	pixel_x = -36;
-	pixel_y = 7
+	pixel_x = -28
 	},
-/obj/machinery/airalarm/directional/north,
-/obj/machinery/portable_atmospherics/canister/oxygen,
 /obj/effect/turf_decal/box/white{
 	color = "#75A2BB"
 	},
+/obj/structure/tank_dispenser/oxygen,
+/obj/machinery/airalarm/directional/north,
 /turf/open/floor/plasteel/white,
 /area/ship/cargo)
 "VT" = (
-/obj/effect/turf_decal/corner/opaque/blue{
-	dir = 4
-	},
-/obj/machinery/power/apc/auto_name/directional/north,
-/obj/structure/cable{
-	icon_state = "0-2"
-	},
-/turf/open/floor/plasteel/white,
-/area/ship/hallway/starboard)
+/obj/effect/turf_decal/corner/opaque/blue/diagonal,
+/turf/open/floor/plasteel/dark,
+/area/ship/hallway/port)
 "We" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -3909,18 +3654,20 @@
 /obj/structure/cable{
 	icon_state = "2-8"
 	},
-/obj/machinery/light/dim/directional/north,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 8
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 4
 	},
+/obj/effect/turf_decal/corner/opaque/blue/diagonal,
+/obj/machinery/light/directional/north,
 /turf/open/floor/plasteel/dark,
 /area/ship/hallway/port)
 "Wf" = (
+/obj/effect/gibspawner/human,
 /turf/open/floor/plasteel/white,
-/area/ship/storage)
+/area/ship/medical/surgery)
 "Wh" = (
 /obj/structure/cable{
 	icon_state = "0-4"
@@ -3931,9 +3678,6 @@
 	},
 /turf/open/floor/engine/hull/reinforced,
 /area/ship/engineering/atmospherics)
-"Wx" = (
-/turf/open/floor/plasteel/white,
-/area/ship/hallway/starboard)
 "Wy" = (
 /obj/effect/turf_decal/industrial/warning{
 	dir = 4
@@ -3970,24 +3714,13 @@
 /turf/open/floor/plasteel,
 /area/ship/crew/canteen)
 "WB" = (
-/obj/structure/window/plasma/reinforced/spawner,
-/obj/effect/spawner/lootdrop/waste/trash,
-/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer4,
+/obj/effect/decal/cleanable/blood/gibs/limb,
 /turf/open/floor/plating,
 /area/ship/engineering/atmospherics)
 "WC" = (
-/obj/structure/dresser{
-	dir = 4;
-	pixel_x = 5
-	},
-/obj/item/hand_tele{
-	pixel_x = 4;
-	pixel_y = 11
-	},
-/obj/item/melee/chainofcommand{
-	pixel_x = 7;
-	pixel_y = 8
-	},
+/obj/item/bedsheet/captain,
+/obj/structure/bed,
+/obj/structure/curtain/cloth/fancy,
 /turf/open/floor/carpet/royalblue,
 /area/ship/crew)
 "WE" = (
@@ -4011,13 +3744,7 @@
 	dir = 8
 	},
 /turf/open/floor/plating,
-/area/ship/engineering)
-"WP" = (
-/obj/machinery/medipen_refiller{
-	pixel_x = -5
-	},
-/turf/open/floor/plasteel/white,
-/area/ship/storage)
+/area/ship/engineering/electrical)
 "WU" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -4048,10 +3775,15 @@
 /obj/effect/turf_decal/corner/opaque/blue{
 	dir = 4
 	},
-/obj/machinery/power/apc/auto_name/directional/east,
 /obj/structure/cable{
 	icon_state = "0-8"
 	},
+/obj/machinery/power/apc/auto_name/directional/east,
+/obj/machinery/light_switch{
+	dir = 8;
+	pixel_x = 20;
+	pixel_y = 11
+	},
 /turf/open/floor/plasteel/white,
 /area/ship/medical)
 "Xb" = (
@@ -4064,16 +3796,9 @@
 /turf/open/floor/engine/hull,
 /area/ship/external)
 "XG" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/closet/firecloset/wall{
-	dir = 1;
-	pixel_y = -28
-	},
 /obj/machinery/suit_storage_unit/engine,
 /turf/open/floor/plating,
-/area/ship/engineering)
+/area/ship/engineering/electrical)
 "XK" = (
 /obj/effect/turf_decal/corner/opaque/red/diagonal,
 /obj/effect/turf_decal/corner/opaque/red/diagonal,
@@ -4099,7 +3824,7 @@
 	dir = 4
 	},
 /turf/open/floor/plasteel/dark,
-/area/ship/hallway/starboard)
+/area/ship/hallway/port)
 "XR" = (
 /turf/closed/wall/mineral/titanium/nodiagonal,
 /area/ship/crew)
@@ -4120,14 +3845,22 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 4
 	},
+/obj/effect/turf_decal/corner/opaque/blue/full,
+/obj/machinery/light/directional/north,
 /turf/open/floor/plasteel/dark,
 /area/ship/hallway/port)
 "Yb" = (
 /turf/closed/wall/mineral/titanium/nodiagonal,
 /area/ship/crew/crewtwo)
 "Yf" = (
-/obj/machinery/power/apc/auto_name/directional/south,
 /obj/structure/cable,
+/obj/machinery/power/apc/auto_name/directional/south,
+/obj/machinery/light_switch{
+	dir = 1;
+	pixel_x = 11;
+	pixel_y = -16
+	},
+/obj/effect/turf_decal/corner/opaque/blue/diagonal,
 /turf/open/floor/plasteel/dark,
 /area/ship/hallway/port)
 "Yp" = (
@@ -4137,32 +3870,28 @@
 /obj/effect/turf_decal/corner/opaque/ntblue/diagonal{
 	dir = 4
 	},
-/obj/structure/closet/emcloset/wall/directional/south,
+/obj/structure/closet/emcloset/wall/directional/south{
+	pixel_x = 2
+	},
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
 "Ys" = (
-/obj/effect/turf_decal/corner/opaque/blue,
-/turf/open/floor/plasteel/white,
-/area/ship/hallway/starboard)
+/obj/effect/turf_decal/corner/opaque/blue/diagonal,
+/obj/machinery/firealarm/directional/east{
+	pixel_y = 4
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/hallway/port)
 "Yv" = (
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
 /obj/structure/disposalpipe/segment,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /turf/open/floor/wood,
-/area/ship/crew/dorm)
+/area/ship/crew/cryo)
 "Yx" = (
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/structure/disposalpipe/segment,
-/obj/machinery/light/dim/directional/west{
-	pixel_x = -38
-	},
-/obj/item/radio/intercom/directional/west,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/turf/open/floor/plasteel/dark,
-/area/ship/hallway/port)
+/obj/machinery/atmospherics/components/unary/outlet_injector/on/layer4,
+/turf/open/floor/engine/hull,
+/area/ship/engineering/electrical)
 "YE" = (
 /obj/effect/turf_decal/trimline/opaque/blue/corner{
 	dir = 8;
@@ -4183,8 +3912,13 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/structure/table/chem,
+/obj/item/modular_computer/laptop/preset/civilian/rilena,
+/obj/item/flashlight/lamp{
+	pixel_y = 8
+	},
 /turf/open/floor/plasteel/white,
-/area/ship/storage)
+/area/ship/medical/surgery)
 "YR" = (
 /obj/structure/chair/comfy/shuttle,
 /turf/open/floor/plasteel/dark,
@@ -4195,13 +3929,12 @@
 	},
 /area/ship/bridge)
 "ZR" = (
-/mob/living/simple_animal/bot/medbot,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
 	dir = 1
 	},
 /turf/open/floor/plasteel/white,
-/area/ship/storage)
+/area/ship/medical/surgery)
 "ZY" = (
 /obj/structure/sign/warning/gasmask{
 	pixel_y = 32
@@ -4218,8 +3951,10 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 4
 	},
+/obj/effect/turf_decal/corner/opaque/blue/full,
+/obj/machinery/light/directional/south,
 /turf/open/floor/plasteel/dark,
-/area/ship/hallway/starboard)
+/area/ship/hallway/port)
 "ZZ" = (
 /obj/effect/spawner/structure/window/plasma/reinforced,
 /obj/machinery/door/firedoor,
@@ -4227,7 +3962,7 @@
 	dir = 4
 	},
 /turf/open/floor/engine,
-/area/ship/engineering/engine)
+/area/ship/engineering/atmospherics)
 
 (1,1,1) = {"
 Jz
@@ -4240,11 +3975,11 @@ pH
 jM
 pH
 bY
-mN
-EL
+Sf
 Ga
 Ga
-OL
+Ga
+Sf
 Sf
 Ut
 Wh
@@ -4261,21 +3996,21 @@ Jz
 Jz
 Jz
 bY
-Vf
+Fp
 dB
 lr
 kg
 pd
 Fp
-kf
+MT
 ke
 mt
 ke
-GR
 MT
-fL
+MT
+jX
+jX
 jX
-fL
 jX
 MT
 Sf
@@ -4287,18 +4022,18 @@ Jz
 Jz
 Jz
 bY
-Vf
+Fp
 in
 iy
 qW
 WK
 WK
 zl
-GR
+MT
 KP
 kM
 rn
-GR
+MT
 ST
 cr
 Kn
@@ -4313,7 +4048,7 @@ Jz
 (4,1,1) = {"
 Jz
 Jz
-Vf
+Fp
 fG
 iw
 Ss
@@ -4321,11 +4056,11 @@ Qi
 tx
 tl
 Vr
-GR
+MT
 ZZ
 DV
 vi
-GR
+MT
 bu
 vF
 td
@@ -4339,7 +4074,7 @@ Jz
 "}
 (5,1,1) = {"
 Jz
-Jz
+Yx
 dJ
 hg
 wE
@@ -4348,11 +4083,11 @@ RM
 Hb
 we
 XG
-GR
+MT
 On
 OG
 eE
-GR
+MT
 xd
 sT
 Ci
@@ -4367,7 +4102,7 @@ Jz
 (6,1,1) = {"
 Jz
 bY
-Vf
+Fp
 Cy
 Ln
 lx
@@ -4393,20 +4128,20 @@ Jz
 "}
 (7,1,1) = {"
 Jz
-Vf
-Vf
-Vf
-Vf
-Vf
+Fp
+Fp
+Fp
+Fp
+Fp
 Pj
-Vf
-Vf
-Vf
-GR
-GR
-GR
-GR
-GR
+Fp
+Fp
+Fp
+MT
+MT
+MT
+MT
+MT
 MT
 MT
 MT
@@ -4438,12 +4173,12 @@ TB
 qR
 qc
 ZY
-Sl
+aM
 kb
 hm
 vX
-Sl
-Fh
+aM
+MW
 "}
 (9,1,1) = {"
 vZ
@@ -4466,19 +4201,19 @@ Qo
 qc
 xY
 yH
-xt
+cS
 vu
 qo
 zi
-Sl
+aM
 "}
 (10,1,1) = {"
-wj
-wj
-wj
-wj
-wj
-wj
+vZ
+vZ
+vZ
+vZ
+vZ
+vZ
 Cv
 Yb
 lo
@@ -4492,20 +4227,20 @@ tu
 nP
 qc
 BA
-Sl
+aM
 rS
 lN
-DC
+lN
 Ap
-Sl
+aM
 "}
 (11,1,1) = {"
-wj
+vZ
 cn
 ff
 ga
 jp
-wj
+vZ
 vH
 Yb
 mO
@@ -4519,20 +4254,20 @@ si
 Vs
 qc
 XQ
+aM
+aM
 kR
-kR
-kR
-kR
-kR
-kR
+aM
+aM
+aM
 "}
 (12,1,1) = {"
 bb
 to
-MM
+zX
 MM
 eL
-wj
+vZ
 pT
 Yb
 Yb
@@ -4546,12 +4281,12 @@ Di
 qc
 qc
 Ps
-kR
+aM
 dP
-wo
+lN
 Hy
 JX
-kR
+aM
 "}
 (13,1,1) = {"
 bb
@@ -4561,44 +4296,44 @@ Yv
 bD
 Re
 Pv
-uG
-Yx
-uG
+PK
+PK
+PK
 kv
 VN
 QP
 Bd
-tf
+PK
 uf
 PK
-QP
+PK
 zN
-kR
+aM
 kT
-Wf
+lN
 Gb
-WP
+lN
 UN
 "}
 (14,1,1) = {"
-wj
+vZ
 Gw
 tX
 Bt
 RK
-wj
-rD
-VL
+vZ
+Rw
+VT
 AM
-VL
+VT
 ys
 HA
-Ys
+AM
 tI
+VT
 Ys
-Ys
-df
-Wx
+AM
+VT
 dI
 pe
 YM
@@ -4608,7 +4343,7 @@ Wf
 UN
 "}
 (15,1,1) = {"
-aH
+dg
 XR
 XR
 XR
@@ -4618,21 +4353,21 @@ wp
 lI
 sr
 sr
-xW
+Sl
 sr
 sr
 xW
 xW
 sr
 sr
-Rw
+VT
 Oi
-kR
+aM
 Kz
 tA
 Qt
 pB
-kR
+aM
 "}
 (16,1,1) = {"
 Jz
@@ -4655,9 +4390,9 @@ sr
 VT
 JR
 aM
-aM
-aM
-aM
+kf
+lN
+Fh
 aM
 MW
 "}
@@ -4668,10 +4403,10 @@ Ot
 zn
 gi
 JC
-QD
-VL
-xW
-ID
+df
+VT
+Vf
+wo
 Ug
 Vm
 tr
@@ -4697,8 +4432,8 @@ VH
 XR
 JD
 Sb
-xW
-uj
+Vf
+ID
 Qc
 ro
 hf
@@ -4744,8 +4479,8 @@ Jz
 "}
 (20,1,1) = {"
 Jz
-dg
-XR
+Jd
+PH
 PH
 PH
 PH
@@ -4754,8 +4489,8 @@ uD
 PH
 PH
 PH
-sr
-sr
+PH
+PH
 sr
 zV
 Fa
@@ -4790,7 +4525,7 @@ VP
 oz
 Dd
 hR
-Il
+cg
 Fa
 Or
 Jz
@@ -4817,7 +4552,7 @@ Mv
 ms
 BS
 bx
-cg
+Il
 Fa
 Jz
 Jz
@@ -4841,10 +4576,10 @@ Jz
 Fa
 gD
 PG
-jW
+fL
 jW
 PG
-zX
+cg
 Fa
 Jz
 Jz
diff --git a/code/__DEFINES/cinematics.dm b/code/__DEFINES/cinematics.dm
index 2c4d65e12af4..dd771fdba983 100644
--- a/code/__DEFINES/cinematics.dm
+++ b/code/__DEFINES/cinematics.dm
@@ -12,6 +12,4 @@
 #define CINEMATIC_NUKE_CLOWNOP 12
 #define CINEMATIC_CULT_NUKE 13
 #define CINEMATIC_CULT_FAIL 14
-// [CELADON-ADD] - EVENT_CLY
-#define CINEMATIC_COLONYDESTRUCT 15
-// [/CELADON-ADD]
+
diff --git a/_maps/_mod_celadon/configs/event_bucket.json b/mod_celadon/event_cly/ship/event_bucket.json
similarity index 100%
rename from _maps/_mod_celadon/configs/event_bucket.json
rename to mod_celadon/event_cly/ship/event_bucket.json
diff --git a/_maps/_mod_celadon/shuttles/Event/subbucket.dmm b/mod_celadon/event_cly/ship/subbucket.dmm
similarity index 100%
rename from _maps/_mod_celadon/shuttles/Event/subbucket.dmm
rename to mod_celadon/event_cly/ship/subbucket.dmm

From 20ed8844de52b26f42bc3bcc6f1ae0c6082d6b66 Mon Sep 17 00:00:00 2001
From: Mirag1993 <goblin5118@gmail.com>
Date: Wed, 19 Jun 2024 01:58:18 +0300
Subject: [PATCH 2/3] small fix

small fix
---
 _maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_savior.dmm | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_savior.dmm b/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_savior.dmm
index 616b5c56fc2c..072334d17997 100644
--- a/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_savior.dmm
+++ b/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_savior.dmm
@@ -239,6 +239,7 @@
 /obj/item/tank/internals/anesthetic,
 /obj/machinery/light/directional/east,
 /obj/machinery/firealarm/directional/north,
+/obj/effect/spawner/lootdrop/armory_contraband,
 /turf/open/floor/plasteel/white,
 /area/ship/medical/surgery)
 "eE" = (
@@ -516,6 +517,7 @@
 	pixel_x = 9
 	},
 /obj/effect/spawner/lootdrop/waste/trash,
+/obj/effect/spawner/lootdrop/gloves,
 /turf/open/floor/plating,
 /area/ship/engineering/electrical)
 "hm" = (
@@ -2491,6 +2493,7 @@
 	pixel_x = -10;
 	pixel_y = 7
 	},
+/obj/effect/spawner/lootdrop/ration,
 /turf/open/floor/plasteel,
 /area/ship/crew/canteen)
 "IY" = (
@@ -3467,6 +3470,7 @@
 /obj/structure/table/reinforced,
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
+/obj/effect/spawner/lootdrop/tool_surgery_adv,
 /turf/open/floor/plasteel/white,
 /area/ship/medical/surgery)
 "Vf" = (

From 895a7efe73dc78e978ff9e4122acf8377c02813c Mon Sep 17 00:00:00 2001
From: Mirag1993 <goblin5118@gmail.com>
Date: Fri, 21 Jun 2024 21:17:41 +0300
Subject: [PATCH 3/3] WEH!!

---
 .../shuttles/nanotrasen/nanotrasen_savior.dmm | 218 +++++++++++-------
 1 file changed, 131 insertions(+), 87 deletions(-)

diff --git a/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_savior.dmm b/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_savior.dmm
index 072334d17997..3deaa8ee2fc2 100644
--- a/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_savior.dmm
+++ b/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_savior.dmm
@@ -144,9 +144,6 @@
 	},
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
-/obj/effect/turf_decal/corner/opaque/blue/border{
-	dir = 1
-	},
 /turf/open/floor/plasteel/dark,
 /area/ship/hallway/port)
 "dg" = (
@@ -200,8 +197,10 @@
 /obj/structure/cable{
 	icon_state = "2-8"
 	},
-/obj/effect/turf_decal/corner/opaque/blue/diagonal,
-/turf/open/floor/plasteel/dark,
+/obj/effect/turf_decal/corner/opaque/blue{
+	dir = 8
+	},
+/turf/open/floor/plasteel/white,
 /area/ship/hallway/port)
 "dJ" = (
 /obj/machinery/door/poddoor{
@@ -641,8 +640,10 @@
 	dir = 1
 	},
 /obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4,
-/obj/effect/turf_decal/corner/opaque/blue/border,
-/turf/open/floor/plasteel/dark,
+/obj/effect/turf_decal/corner/opaque/blue{
+	dir = 8
+	},
+/turf/open/floor/plasteel/white,
 /area/ship/hallway/port)
 "iX" = (
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
@@ -794,9 +795,6 @@
 	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4,
-/obj/effect/turf_decal/corner/opaque/blue/border{
-	dir = 8
-	},
 /turf/open/floor/plasteel/dark,
 /area/ship/hallway/port)
 "kM" = (
@@ -915,7 +913,6 @@
 /turf/open/floor/engine,
 /area/ship/engineering/atmospherics)
 "lI" = (
-/obj/effect/turf_decal/corner/opaque/blue/diagonal,
 /obj/effect/decal/cleanable/blood/gibs/limb,
 /turf/open/floor/plasteel/dark,
 /area/ship/hallway/port)
@@ -1032,9 +1029,11 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 4
 	},
-/obj/effect/turf_decal/corner/opaque/blue/diagonal,
 /obj/machinery/light/directional/south,
-/turf/open/floor/plasteel/dark,
+/obj/effect/turf_decal/corner/opaque/blue{
+	dir = 8
+	},
+/turf/open/floor/plasteel/white,
 /area/ship/hallway/port)
 "oz" = (
 /obj/structure/cable{
@@ -1113,8 +1112,11 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 4
 	},
-/obj/effect/turf_decal/corner/opaque/blue/full,
 /obj/machinery/light/directional/north,
+/obj/effect/turf_decal/industrial/warning/fulltile,
+/obj/effect/turf_decal/borderfloorblack{
+	dir = 4
+	},
 /turf/open/floor/plasteel/dark,
 /area/ship/hallway/port)
 "qc" = (
@@ -1173,9 +1175,6 @@
 /obj/structure/railing{
 	layer = 3.1
 	},
-/obj/machinery/modular_computer/console/preset/command{
-	dir = 8
-	},
 /obj/item/radio/intercom/wideband/directional/east{
 	layer = 5
 	},
@@ -1185,6 +1184,9 @@
 	pixel_y = 28;
 	pixel_x = 2
 	},
+/obj/machinery/computer/cargo/express{
+	dir = 8
+	},
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
 "qW" = (
@@ -1209,10 +1211,10 @@
 /obj/structure/disposalpipe/segment,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/effect/turf_decal/corner/opaque/blue/border{
+/obj/effect/turf_decal/corner/opaque/blue{
 	dir = 1
 	},
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/plasteel/white,
 /area/ship/hallway/port)
 "re" = (
 /obj/effect/turf_decal/corner/opaque/blue{
@@ -1267,9 +1269,6 @@
 	dir = 4
 	},
 /obj/machinery/light/directional/north,
-/obj/effect/turf_decal/corner/opaque/blue/border{
-	dir = 4
-	},
 /turf/open/floor/plasteel/dark,
 /area/ship/hallway/port)
 "rE" = (
@@ -1333,8 +1332,10 @@
 /area/ship/engineering/atmospherics)
 "sC" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
-/obj/effect/turf_decal/corner/opaque/blue/diagonal,
-/turf/open/floor/plasteel/dark,
+/obj/effect/turf_decal/corner/opaque/blue{
+	dir = 1
+	},
+/turf/open/floor/plasteel/white,
 /area/ship/hallway/port)
 "sD" = (
 /obj/structure/cable{
@@ -1472,8 +1473,8 @@
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
 	dir = 8
 	},
-/obj/effect/turf_decal/corner/opaque/blue/diagonal,
-/turf/open/floor/plasteel/dark,
+/obj/effect/turf_decal/corner/opaque/blue,
+/turf/open/floor/plasteel/white,
 /area/ship/hallway/port)
 "tJ" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
@@ -1519,10 +1520,10 @@
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
 	dir = 4
 	},
-/obj/effect/turf_decal/corner/opaque/blue/border{
+/obj/effect/turf_decal/corner/opaque/blue{
 	dir = 8
 	},
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/plasteel/white,
 /area/ship/hallway/port)
 "ur" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
@@ -1633,6 +1634,11 @@
 	},
 /turf/open/floor/plasteel/dark,
 /area/ship/hallway/port)
+"vV" = (
+/obj/machinery/light/directional/east,
+/obj/effect/turf_decal/corner/opaque/blue,
+/turf/open/floor/plasteel/white,
+/area/ship/hallway/port)
 "vX" = (
 /obj/machinery/rnd/production/protolathe/department/medical,
 /obj/machinery/light/directional/west,
@@ -1671,7 +1677,6 @@
 	dir = 4
 	},
 /obj/machinery/airalarm/directional/north,
-/obj/effect/turf_decal/corner/opaque/blue/diagonal,
 /turf/open/floor/plasteel/dark,
 /area/ship/hallway/port)
 "wE" = (
@@ -1691,6 +1696,10 @@
 	pixel_x = 5;
 	pixel_y = 10
 	},
+/obj/item/toy/plush/celadon/fermis{
+	pixel_x = -5;
+	pixel_y = 10
+	},
 /turf/open/floor/wood,
 /area/ship/crew/cryo)
 "wJ" = (
@@ -1743,6 +1752,9 @@
 /obj/machinery/light/directional/north,
 /turf/open/floor/plating,
 /area/ship/engineering/atmospherics)
+"xu" = (
+/turf/open/floor/plasteel/white,
+/area/ship/hallway/port)
 "xO" = (
 /obj/machinery/door/airlock/engineering{
 	dir = 8;
@@ -1789,16 +1801,12 @@
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
 	dir = 1
 	},
-/obj/effect/turf_decal/corner/opaque/blue/border,
 /turf/open/floor/plasteel/dark,
 /area/ship/hallway/port)
 "ys" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
 	dir = 8
 	},
-/obj/effect/turf_decal/corner/opaque/blue/border{
-	dir = 4
-	},
 /turf/open/floor/plasteel/dark,
 /area/ship/hallway/port)
 "yH" = (
@@ -1815,6 +1823,9 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/effect/turf_decal/borderfloorwhite{
+	dir = 1
+	},
 /turf/open/floor/plasteel/white,
 /area/ship/medical/surgery)
 "yK" = (
@@ -1822,8 +1833,10 @@
 	pixel_y = 32;
 	dir = 1
 	},
-/obj/effect/turf_decal/corner/opaque/blue/diagonal,
-/turf/open/floor/plasteel/dark,
+/obj/effect/turf_decal/corner/opaque/blue{
+	dir = 1
+	},
+/turf/open/floor/plasteel/white,
 /area/ship/hallway/port)
 "yU" = (
 /obj/machinery/airalarm/directional/east{
@@ -1872,8 +1885,10 @@
 	},
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
-/obj/effect/turf_decal/corner/opaque/blue/diagonal,
-/turf/open/floor/plasteel/dark,
+/obj/effect/turf_decal/corner/opaque/blue{
+	dir = 8
+	},
+/turf/open/floor/plasteel/white,
 /area/ship/hallway/port)
 "zV" = (
 /obj/item/wrench/medical,
@@ -1913,8 +1928,10 @@
 /obj/structure/disposalpipe/segment{
 	dir = 9
 	},
-/obj/effect/turf_decal/corner/opaque/blue/diagonal,
-/turf/open/floor/plasteel/dark,
+/obj/effect/turf_decal/corner/opaque/blue{
+	dir = 8
+	},
+/turf/open/floor/plasteel/white,
 /area/ship/hallway/port)
 "Ap" = (
 /obj/machinery/rnd/server,
@@ -1939,7 +1956,6 @@
 /turf/open/floor/plating,
 /area/ship/crew)
 "AM" = (
-/obj/effect/turf_decal/corner/opaque/blue/diagonal,
 /obj/machinery/light/directional/east,
 /turf/open/floor/plasteel/dark,
 /area/ship/hallway/port)
@@ -1979,8 +1995,10 @@
 	dir = 8
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/effect/turf_decal/corner/opaque/blue/diagonal,
-/turf/open/floor/plasteel/dark,
+/obj/effect/turf_decal/corner/opaque/blue{
+	dir = 8
+	},
+/turf/open/floor/plasteel/white,
 /area/ship/hallway/port)
 "Bl" = (
 /obj/structure/disposalpipe/segment{
@@ -2028,7 +2046,6 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 4
 	},
-/obj/effect/turf_decal/corner/opaque/blue/full,
 /obj/machinery/firealarm/directional/north,
 /turf/open/floor/plasteel/dark,
 /area/ship/hallway/port)
@@ -2083,7 +2100,6 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 4
 	},
-/obj/effect/turf_decal/corner/opaque/blue/full,
 /obj/machinery/firealarm/directional/south,
 /turf/open/floor/plasteel/dark,
 /area/ship/hallway/port)
@@ -2132,6 +2148,9 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 4
 	},
+/obj/effect/turf_decal/borderfloorwhite{
+	dir = 4
+	},
 /turf/open/floor/plasteel/white,
 /area/ship/crew/canteen)
 "Dj" = (
@@ -2227,6 +2246,7 @@
 /obj/machinery/door/firedoor/border_only,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/effect/turf_decal/borderfloorwhite,
 /turf/open/floor/plasteel/white,
 /area/ship/medical)
 "Fp" = (
@@ -2370,6 +2390,9 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /obj/structure/curtain/cloth,
+/obj/effect/turf_decal/borderfloorwhite{
+	dir = 1
+	},
 /turf/open/floor/plasteel/white,
 /area/ship/medical/surgery)
 "Hb" = (
@@ -2438,7 +2461,7 @@
 /obj/machinery/door/firedoor/border_only,
 /obj/machinery/door/airlock/public/glass,
 /obj/effect/turf_decal/corner/opaque/blue/diagonal,
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/plasteel/white,
 /area/ship/hallway/port)
 "Il" = (
 /obj/item/clothing/shoes/magboots,
@@ -2540,6 +2563,7 @@
 	dir = 1
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/effect/turf_decal/siding/wood,
 /turf/open/floor/wood,
 /area/ship/crew)
 "JD" = (
@@ -2552,7 +2576,6 @@
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
 	dir = 1
 	},
-/obj/effect/turf_decal/corner/opaque/blue/diagonal,
 /turf/open/floor/plasteel/dark,
 /area/ship/hallway/port)
 "JR" = (
@@ -2568,9 +2591,11 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 4
 	},
-/obj/effect/turf_decal/corner/opaque/blue/diagonal,
 /obj/machinery/light/directional/south,
-/turf/open/floor/plasteel/dark,
+/obj/effect/turf_decal/corner/opaque/blue{
+	dir = 8
+	},
+/turf/open/floor/plasteel/white,
 /area/ship/hallway/port)
 "JX" = (
 /obj/machinery/light/directional/west,
@@ -2593,6 +2618,15 @@
 	},
 /turf/open/floor/plasteel/white,
 /area/ship/medical)
+"Kl" = (
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/turf/open/floor/plasteel/dark,
+/area/ship/hallway/port)
 "Kn" = (
 /obj/machinery/power/terminal{
 	dir = 8
@@ -2696,6 +2730,12 @@
 	},
 /turf/open/floor/engine/hull,
 /area/ship/external)
+"Mr" = (
+/obj/effect/turf_decal/corner/opaque/blue{
+	dir = 1
+	},
+/turf/open/floor/plasteel/white,
+/area/ship/hallway/port)
 "Mt" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
@@ -2780,8 +2820,10 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 4
 	},
-/obj/effect/turf_decal/corner/opaque/blue/diagonal,
-/turf/open/floor/plasteel/dark,
+/obj/effect/turf_decal/corner/opaque/blue{
+	dir = 8
+	},
+/turf/open/floor/plasteel/white,
 /area/ship/hallway/port)
 "On" = (
 /obj/machinery/atmospherics/components/binary/circulator{
@@ -2897,6 +2939,9 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 4
 	},
+/obj/effect/turf_decal/siding/wood{
+	dir = 4
+	},
 /turf/open/floor/wood,
 /area/ship/crew/crewtwo)
 "Ps" = (
@@ -2915,8 +2960,11 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 4
 	},
-/obj/effect/turf_decal/corner/opaque/blue/full,
 /obj/machinery/light/directional/south,
+/obj/effect/turf_decal/industrial/warning/fulltile,
+/obj/effect/turf_decal/borderfloorwhite{
+	dir = 4
+	},
 /turf/open/floor/plasteel/dark,
 /area/ship/hallway/port)
 "Pv" = (
@@ -2932,9 +2980,6 @@
 /obj/structure/disposalpipe/segment,
 /obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2,
 /obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4,
-/obj/effect/turf_decal/corner/opaque/blue/border{
-	dir = 1
-	},
 /turf/open/floor/plasteel/dark,
 /area/ship/hallway/port)
 "PB" = (
@@ -2982,8 +3027,10 @@
 /obj/structure/disposalpipe/segment,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/effect/turf_decal/corner/opaque/blue/diagonal,
-/turf/open/floor/plasteel/dark,
+/obj/effect/turf_decal/corner/opaque/blue{
+	dir = 8
+	},
+/turf/open/floor/plasteel/white,
 /area/ship/hallway/port)
 "PN" = (
 /obj/item/gun/energy/e_gun,
@@ -3094,9 +3141,6 @@
 	},
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
-/obj/effect/turf_decal/corner/opaque/blue/border{
-	dir = 1
-	},
 /turf/open/floor/plasteel/dark,
 /area/ship/hallway/port)
 "QE" = (
@@ -3133,9 +3177,11 @@
 /obj/structure/disposalpipe/segment,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/effect/turf_decal/corner/opaque/blue/diagonal,
 /obj/effect/decal/cleanable/blood/gibs/limb,
-/turf/open/floor/plasteel/dark,
+/obj/effect/turf_decal/corner/opaque/blue{
+	dir = 8
+	},
+/turf/open/floor/plasteel/white,
 /area/ship/hallway/port)
 "QT" = (
 /obj/structure/sign/nanotrasen,
@@ -3155,6 +3201,7 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/effect/turf_decal/siding/wood,
 /turf/open/floor/wood,
 /area/ship/crew/cryo)
 "Ri" = (
@@ -3174,7 +3221,6 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 4
 	},
-/obj/effect/turf_decal/corner/opaque/blue/diagonal,
 /obj/machinery/light_switch{
 	pixel_y = 20
 	},
@@ -3262,7 +3308,6 @@
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
 	dir = 1
 	},
-/obj/effect/turf_decal/corner/opaque/blue/diagonal,
 /turf/open/floor/plasteel/dark,
 /area/ship/hallway/port)
 "Sf" = (
@@ -3440,9 +3485,9 @@
 /turf/open/floor/engine/hull/reinforced,
 /area/ship/engineering/atmospherics)
 "Uw" = (
-/obj/machinery/computer/cargo/express,
 /obj/effect/turf_decal/corner/opaque/ntblue/diagonal,
 /obj/machinery/light/directional/east,
+/obj/machinery/modular_computer/console/preset/command,
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
 "UB" = (
@@ -3603,9 +3648,6 @@
 /turf/open/floor/carpet/royalblue,
 /area/ship/crew)
 "VL" = (
-/obj/effect/turf_decal/corner/opaque/blue/border{
-	dir = 4
-	},
 /turf/open/floor/plasteel/dark,
 /area/ship/hallway/port)
 "VN" = (
@@ -3622,7 +3664,7 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /obj/effect/turf_decal/corner/opaque/blue/diagonal,
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/plasteel/white,
 /area/ship/hallway/port)
 "VP" = (
 /obj/structure/cable{
@@ -3648,8 +3690,8 @@
 /turf/open/floor/plasteel/white,
 /area/ship/cargo)
 "VT" = (
-/obj/effect/turf_decal/corner/opaque/blue/diagonal,
-/turf/open/floor/plasteel/dark,
+/obj/effect/turf_decal/corner/opaque/blue,
+/turf/open/floor/plasteel/white,
 /area/ship/hallway/port)
 "We" = (
 /obj/structure/cable{
@@ -3664,7 +3706,6 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 4
 	},
-/obj/effect/turf_decal/corner/opaque/blue/diagonal,
 /obj/machinery/light/directional/north,
 /turf/open/floor/plasteel/dark,
 /area/ship/hallway/port)
@@ -3849,8 +3890,10 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 4
 	},
-/obj/effect/turf_decal/corner/opaque/blue/full,
 /obj/machinery/light/directional/north,
+/obj/effect/turf_decal/industrial/stand_clear{
+	dir = 8
+	},
 /turf/open/floor/plasteel/dark,
 /area/ship/hallway/port)
 "Yb" = (
@@ -3864,7 +3907,6 @@
 	pixel_x = 11;
 	pixel_y = -16
 	},
-/obj/effect/turf_decal/corner/opaque/blue/diagonal,
 /turf/open/floor/plasteel/dark,
 /area/ship/hallway/port)
 "Yp" = (
@@ -3880,11 +3922,11 @@
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
 "Ys" = (
-/obj/effect/turf_decal/corner/opaque/blue/diagonal,
 /obj/machinery/firealarm/directional/east{
 	pixel_y = 4
 	},
-/turf/open/floor/plasteel/dark,
+/obj/effect/turf_decal/corner/opaque/blue,
+/turf/open/floor/plasteel/white,
 /area/ship/hallway/port)
 "Yv" = (
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
@@ -3955,8 +3997,10 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 4
 	},
-/obj/effect/turf_decal/corner/opaque/blue/full,
 /obj/machinery/light/directional/south,
+/obj/effect/turf_decal/industrial/stand_clear{
+	dir = 8
+	},
 /turf/open/floor/plasteel/dark,
 /area/ship/hallway/port)
 "ZZ" = (
@@ -4300,9 +4344,9 @@ Yv
 bD
 Re
 Pv
-PK
-PK
-PK
+Kl
+Kl
+Kl
 kv
 VN
 QP
@@ -4327,17 +4371,17 @@ Bt
 RK
 vZ
 Rw
-VT
+VL
 AM
-VT
+VL
 ys
 HA
-AM
+vV
 tI
 VT
 Ys
-AM
-VT
+vV
+xu
 dI
 pe
 YM
@@ -4364,7 +4408,7 @@ xW
 xW
 sr
 sr
-VT
+Mr
 Oi
 aM
 Kz
@@ -4391,7 +4435,7 @@ NU
 Ri
 Ue
 sr
-VT
+Mr
 JR
 aM
 kf
@@ -4408,7 +4452,7 @@ zn
 gi
 JC
 df
-VT
+VL
 Vf
 wo
 Ug