diff --git a/_maps/shuttles/nanotrasen/nanotrasen_osprey.dmm b/_maps/shuttles/nanotrasen/nanotrasen_osprey.dmm
index 341cb1224936..3efabec5b3c3 100644
--- a/_maps/shuttles/nanotrasen/nanotrasen_osprey.dmm
+++ b/_maps/shuttles/nanotrasen/nanotrasen_osprey.dmm
@@ -85,10 +85,15 @@
 /area/ship/cargo)
 "aE" = (
 /obj/structure/sign/nanotrasen,
-/turf/closed/wall/mineral/titanium/nodiagonal,
+/turf/closed/wall/mineral/plastitanium,
 /area/ship/cargo/office)
 "aI" = (
-/obj/item/radio/intercom/directional/north,
+/obj/effect/turf_decal/corner/opaque/blue{
+	dir = 8
+	},
+/obj/effect/turf_decal/corner/opaque/blue{
+	dir = 1
+	},
 /turf/open/floor/plasteel/white,
 /area/ship/medical)
 "aL" = (
@@ -151,6 +156,7 @@
 /obj/machinery/camera/autoname{
 	dir = 8
 	},
+/obj/effect/turf_decal/corner/transparent/neutral,
 /turf/open/floor/plasteel,
 /area/ship/hallway/central)
 "bg" = (
@@ -196,6 +202,9 @@
 	dir = 9
 	},
 /obj/machinery/airalarm/directional/south,
+/obj/effect/turf_decal/corner/transparent/neutral{
+	dir = 8
+	},
 /turf/open/floor/plasteel,
 /area/ship/hallway/central)
 "bF" = (
@@ -240,12 +249,33 @@
 /obj/structure/disposalpipe/segment,
 /turf/open/floor/plasteel,
 /area/ship/cargo)
+"bO" = (
+/obj/structure/railing/wood{
+	dir = 8
+	},
+/obj/machinery/vending/games,
+/turf/open/floor/wood,
+/area/ship/cargo/office)
+"bS" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/turf/open/floor/wood/bamboo,
+/area/ship/cargo/office)
 "bT" = (
-/obj/structure/spider/stickyweb,
-/obj/effect/spawner/lootdrop/maintenance,
-/obj/item/toy/figure/cargotech,
+/obj/structure/mecha_wreckage/gygax{
+	name = "\The mistake"
+	},
 /turf/open/floor/plating,
 /area/ship/cargo)
+"cb" = (
+/obj/effect/turf_decal/corner/opaque/lime{
+	dir = 1
+	},
+/obj/effect/turf_decal/corner/opaque/lime{
+	dir = 8
+	},
+/obj/effect/turf_decal/corner/opaque/lime,
+/turf/open/floor/plasteel/white,
+/area/ship/medical)
 "cd" = (
 /obj/machinery/door/airlock/medical{
 	name = "Infirmary";
@@ -312,10 +342,12 @@
 /turf/open/floor/plasteel/patterned/grid,
 /area/ship/engineering)
 "co" = (
-/obj/structure/disposalpipe/segment,
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
 	dir = 4
 	},
+/obj/structure/disposalpipe/segment{
+	dir = 10
+	},
 /turf/open/floor/plasteel/white,
 /area/ship/science)
 "cp" = (
@@ -336,27 +368,14 @@
 /turf/closed/wall/mineral/titanium/nodiagonal,
 /area/ship/crew/canteen)
 "ct" = (
-/obj/structure/closet/secure_closet{
-	icon_state = "science";
-	name = "scientist's locker";
-	req_access_txt = "47"
-	},
 /obj/effect/turf_decal/corner/opaque/mauve{
 	dir = 4
 	},
 /obj/effect/turf_decal/corner/opaque/mauve{
 	dir = 1
 	},
-/obj/item/storage/backpack/duffelbag,
-/obj/item/storage/backpack/messenger/tox,
-/obj/item/storage/backpack/satchel/tox,
-/obj/item/storage/backpack/science,
-/obj/item/clothing/shoes/sneakers/white,
-/obj/item/clothing/under/rank/rnd/scientist/skirt,
-/obj/item/clothing/under/rank/rnd/scientist,
-/obj/item/clothing/suit/toggle/labcoat/science,
-/obj/item/clothing/glasses/science,
 /obj/machinery/light/directional/north,
+/obj/effect/turf_decal/rechargefloor,
 /turf/open/floor/plasteel/white,
 /area/ship/science)
 "cD" = (
@@ -364,10 +383,7 @@
 	name = "AI Core Access";
 	req_one_access_txt = "16"
 	},
-/obj/structure/rack,
-/obj/item/aicard,
-/obj/item/borg/upgrade/ai,
-/obj/item/mmi/posibrain,
+/obj/machinery/telecomms/broadcaster,
 /turf/open/floor/circuit,
 /area/ship/science/ai_chamber)
 "cI" = (
@@ -415,6 +431,13 @@
 	},
 /turf/open/floor/plasteel/patterned/grid,
 /area/ship/engineering/atmospherics)
+"cU" = (
+/obj/structure/bookcase/random,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+	dir = 1
+	},
+/turf/open/floor/wood/bamboo,
+/area/ship/cargo/office)
 "cY" = (
 /obj/structure/disposalpipe/segment{
 	dir = 10
@@ -436,6 +459,7 @@
 	dir = 8;
 	pixel_y = 0
 	},
+/obj/effect/turf_decal/corner/transparent/neutral,
 /turf/open/floor/plasteel,
 /area/ship/hallway/central)
 "dm" = (
@@ -506,6 +530,13 @@
 /obj/structure/sign/departments/medbay/alt,
 /turf/closed/wall/mineral/titanium/nodiagonal,
 /area/ship/medical)
+"dF" = (
+/obj/structure/bookcase/random,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+	dir = 1
+	},
+/turf/open/floor/wood/bamboo,
+/area/ship/cargo/office)
 "dJ" = (
 /obj/effect/turf_decal/corner/transparent/neutral{
 	dir = 4
@@ -523,6 +554,7 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
+/obj/structure/reagent_dispensers/fueltank,
 /turf/open/floor/plasteel/patterned/cargo_one,
 /area/ship/cargo)
 "dN" = (
@@ -534,7 +566,8 @@
 "dP" = (
 /obj/structure/bed,
 /obj/structure/curtain/cloth/fancy,
-/obj/item/bedsheet/captain,
+/obj/structure/bed/double,
+/obj/item/bedsheet/double/captain,
 /turf/open/floor/carpet/royalblue,
 /area/ship/bridge)
 "dS" = (
@@ -696,7 +729,7 @@
 /area/ship/engineering/atmospherics)
 "eZ" = (
 /obj/structure/sign/warning/vacuum/external,
-/turf/closed/wall/mineral/titanium/nodiagonal,
+/turf/closed/wall/mineral/plastitanium,
 /area/ship/science/ai_chamber)
 "fa" = (
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
@@ -720,6 +753,7 @@
 "fc" = (
 /obj/structure/table/wood,
 /obj/machinery/light/small/directional/north,
+/obj/structure/bedsheetbin,
 /turf/open/floor/wood,
 /area/ship/crew/dorm)
 "fg" = (
@@ -738,6 +772,7 @@
 /obj/effect/decal/cleanable/cobweb/cobweb2,
 /obj/item/trash/can/food/peaches/maint,
 /obj/machinery/light/small/directional/north,
+/obj/machinery/ore_silo,
 /turf/open/floor/plating,
 /area/ship/cargo)
 "fj" = (
@@ -792,6 +827,12 @@
 	},
 /turf/open/floor/engine/hull,
 /area/ship/external)
+"fO" = (
+/obj/effect/turf_decal/corner/opaque/blue{
+	dir = 8
+	},
+/turf/open/floor/plasteel/white,
+/area/ship/medical)
 "fU" = (
 /obj/machinery/button/door{
 	dir = 1;
@@ -827,6 +868,9 @@
 	dir = 1
 	},
 /obj/structure/extinguisher_cabinet/directional/west,
+/obj/effect/turf_decal/corner/transparent/neutral{
+	dir = 8
+	},
 /turf/open/floor/plasteel,
 /area/ship/hallway/central)
 "gg" = (
@@ -843,6 +887,10 @@
 	},
 /turf/open/floor/plasteel,
 /area/ship/cargo)
+"gk" = (
+/obj/structure/bookcase/random,
+/turf/open/floor/wood/bamboo,
+/area/ship/cargo/office)
 "go" = (
 /obj/machinery/atmospherics/pipe/layer_manifold/visible{
 	dir = 4
@@ -880,6 +928,11 @@
 /obj/effect/turf_decal/industrial/shutoff,
 /turf/open/floor/plasteel,
 /area/ship/hallway/central)
+"gz" = (
+/obj/structure/bookcase/random,
+/obj/machinery/light/floor,
+/turf/open/floor/wood/bamboo,
+/area/ship/cargo/office)
 "gB" = (
 /obj/structure/disposalpipe/segment,
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
@@ -914,6 +967,10 @@
 /obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/layer2,
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/hallway/central)
+"gL" = (
+/obj/structure/stairs,
+/turf/open/floor/wood,
+/area/ship/cargo/office)
 "gM" = (
 /obj/effect/spawner/structure/window/shuttle,
 /obj/machinery/door/poddoor/shutters{
@@ -958,6 +1015,7 @@
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
 	dir = 8
 	},
+/obj/machinery/porta_turret/ai,
 /turf/open/floor/circuit,
 /area/ship/science/ai_chamber)
 "hg" = (
@@ -971,7 +1029,7 @@
 /turf/open/floor/plasteel/tech/techmaint,
 /area/ship/hallway/central)
 "hh" = (
-/turf/closed/wall/mineral/titanium,
+/turf/closed/wall/mineral/plastitanium,
 /area/ship/science)
 "hj" = (
 /obj/machinery/mass_driver{
@@ -1014,7 +1072,7 @@
 	color = "Black";
 	dir = 1
 	},
-/turf/closed/wall/mineral/titanium/nodiagonal,
+/turf/closed/wall/mineral/plastitanium,
 /area/ship/science)
 "ht" = (
 /obj/structure/closet/secure_closet{
@@ -1042,6 +1100,7 @@
 /obj/item/clothing/head/caphat/parade,
 /obj/item/clothing/suit/armor/vest/capcarapace,
 /obj/item/clothing/gloves/color/captain/nt,
+/obj/item/clothing/under/rank/civilian/lawyer/galaxy,
 /turf/open/floor/carpet/royalblue,
 /area/ship/bridge)
 "hv" = (
@@ -1152,8 +1211,17 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
+/obj/effect/turf_decal/corner/opaque/ntblue{
+	dir = 1
+	},
 /turf/open/floor/plasteel,
 /area/ship/hallway/central)
+"io" = (
+/obj/machinery/computer/arcade/orion_trail{
+	dir = 1
+	},
+/turf/open/floor/wood,
+/area/ship/cargo/office)
 "ip" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -1188,15 +1256,7 @@
 /turf/open/floor/plasteel,
 /area/ship/crew/canteen)
 "it" = (
-/obj/machinery/sleeper{
-	dir = 4
-	},
-/obj/effect/turf_decal/corner/opaque/lime{
-	dir = 1
-	},
-/obj/effect/turf_decal/corner/opaque/lime{
-	dir = 8
-	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /turf/open/floor/plasteel/white,
 /area/ship/medical)
 "iv" = (
@@ -1206,7 +1266,7 @@
 /turf/open/floor/plasteel/grimy,
 /area/ship/crew/dorm)
 "iw" = (
-/turf/closed/wall/mineral/titanium,
+/turf/closed/wall/mineral/plastitanium,
 /area/ship/cargo)
 "iA" = (
 /obj/structure/disposalpipe/segment{
@@ -1228,6 +1288,9 @@
 	icon_state = "4-8"
 	},
 /obj/machinery/light/directional/north,
+/obj/effect/turf_decal/corner/opaque/ntblue{
+	dir = 4
+	},
 /turf/open/floor/plasteel,
 /area/ship/hallway/central)
 "iD" = (
@@ -1244,7 +1307,7 @@
 /turf/open/floor/plasteel,
 /area/ship/crew/canteen)
 "iI" = (
-/turf/closed/wall/mineral/titanium,
+/turf/closed/wall/mineral/plastitanium,
 /area/ship/cargo/office)
 "iM" = (
 /obj/structure/table,
@@ -1301,7 +1364,7 @@
 	color = "Black";
 	dir = 1
 	},
-/turf/closed/wall/mineral/titanium/nodiagonal,
+/turf/closed/wall/mineral/plastitanium,
 /area/ship/science)
 "jc" = (
 /obj/machinery/light/directional/north,
@@ -1316,6 +1379,9 @@
 	},
 /turf/open/floor/plasteel,
 /area/ship/crew/janitor)
+"jh" = (
+/turf/closed/wall/mineral/plastitanium,
+/area/ship/crew/canteen)
 "jk" = (
 /obj/machinery/medical_kiosk,
 /obj/effect/turf_decal/corner/opaque/blue{
@@ -1401,6 +1467,10 @@
 	},
 /turf/open/floor/wood,
 /area/ship/crew/canteen)
+"jR" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/turf/open/floor/wood/bamboo,
+/area/ship/cargo/office)
 "jU" = (
 /obj/structure/sink/kitchen{
 	dir = 4;
@@ -1415,6 +1485,20 @@
 /obj/structure/extinguisher_cabinet/directional/west,
 /turf/open/floor/plasteel,
 /area/ship/crew/canteen)
+"jV" = (
+/obj/structure/table/glass,
+/obj/item/storage/backpack/duffelbag/med/surgery{
+	pixel_x = -3;
+	pixel_y = 13
+	},
+/obj/effect/turf_decal/corner/opaque/pink{
+	dir = 4
+	},
+/obj/effect/turf_decal/corner/opaque/pink,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
+/obj/item/clothing/neck/stethoscope,
+/turf/open/floor/plasteel/white,
+/area/ship/medical)
 "kb" = (
 /obj/machinery/atmospherics/pipe/simple/cyan/visible,
 /turf/open/floor/plasteel/patterned/grid,
@@ -1598,7 +1682,16 @@
 /turf/open/floor/plasteel,
 /area/ship/cargo/office)
 "kU" = (
-/obj/machinery/recharge_station,
+/obj/machinery/door/window/brigdoor/westleft{
+	dir = 4;
+	req_one_access_txt = "61"
+	},
+/obj/structure/AIcore,
+/obj/item/circuitboard/aicore,
+/obj/item/stack/sheet/rglass{
+	amount = 5
+	},
+/obj/item/malf_upgrade,
 /turf/open/floor/circuit,
 /area/ship/science/ai_chamber)
 "kV" = (
@@ -1621,6 +1714,9 @@
 /obj/structure/railing{
 	layer = 2.91
 	},
+/obj/effect/turf_decal/corner/transparent/neutral{
+	dir = 8
+	},
 /turf/open/floor/plasteel,
 /area/ship/hallway/central)
 "la" = (
@@ -1681,21 +1777,13 @@
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/science/ai_chamber)
 "lr" = (
-/obj/machinery/door/window/brigdoor/westleft{
-	name = "AI Core Access";
-	req_one_access_txt = "16"
-	},
-/obj/structure/AIcore,
-/obj/item/circuitboard/aicore,
-/obj/item/stack/sheet/rglass{
-	amount = 5
-	},
 /obj/item/radio/intercom/directional/south,
 /obj/item/radio/intercom/directional/north{
 	frequency = 1351;
 	freqlock = 1
 	},
 /obj/item/radio/intercom/wideband/directional/east,
+/obj/machinery/recharge_station,
 /turf/open/floor/circuit,
 /area/ship/science/ai_chamber)
 "lt" = (
@@ -1892,32 +1980,21 @@
 /turf/open/floor/plasteel,
 /area/ship/cargo/office)
 "mu" = (
-/obj/machinery/conveyor{
-	dir = 8;
-	id = "osprey_production"
-	},
+/obj/machinery/mineral/ore_redemption,
 /turf/open/floor/plating,
 /area/ship/cargo)
 "my" = (
-/obj/structure/table,
-/obj/item/stack/packageWrap{
-	pixel_y = 9
-	},
-/obj/item/hand_labeler{
-	pixel_x = 2;
-	pixel_y = 8
-	},
 /obj/effect/turf_decal/corner/opaque/mauve{
 	dir = 1
 	},
 /obj/effect/turf_decal/corner/opaque/mauve{
 	dir = 8
 	},
-/obj/item/storage/box/gloves{
-	pixel_x = -3;
-	pixel_y = -8
-	},
 /obj/item/radio/intercom/directional/west,
+/obj/structure/disposalpipe/trunk{
+	dir = 4
+	},
+/obj/machinery/disposal/bin,
 /turf/open/floor/plasteel/white,
 /area/ship/science)
 "mB" = (
@@ -1931,6 +2008,11 @@
 /obj/effect/turf_decal/industrial/caution,
 /turf/open/floor/plasteel/tech/techmaint,
 /area/ship/hallway/central)
+"mE" = (
+/obj/structure/table/wood,
+/obj/machinery/bookbinder,
+/turf/open/floor/wood,
+/area/ship/cargo/office)
 "mF" = (
 /obj/structure/disposalpipe/segment{
 	dir = 6
@@ -1941,14 +2023,7 @@
 /turf/open/floor/plasteel,
 /area/ship/cargo/office)
 "mH" = (
-/obj/structure/closet/crate,
-/obj/item/stack/sheet/metal/five{
-	pixel_x = -3
-	},
-/obj/item/stack/sheet/glass/five{
-	pixel_x = 2;
-	pixel_y = 5
-	},
+/obj/structure/reagent_dispensers/watertank,
 /turf/open/floor/plasteel/patterned/cargo_one,
 /area/ship/cargo)
 "mI" = (
@@ -1962,6 +2037,7 @@
 	icon_state = "4-8"
 	},
 /obj/machinery/light/directional/south,
+/obj/effect/turf_decal/corner/opaque/ntblue,
 /turf/open/floor/plasteel,
 /area/ship/hallway/central)
 "mR" = (
@@ -2052,10 +2128,29 @@
 /obj/effect/turf_decal/corner/opaque/ntblue,
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
+"nC" = (
+/obj/effect/turf_decal/corner/opaque/lime{
+	dir = 4
+	},
+/obj/effect/turf_decal/corner/opaque/lime,
+/obj/effect/turf_decal/corner/opaque/lime{
+	dir = 1
+	},
+/obj/machinery/vending/medical,
+/turf/open/floor/plasteel/white,
+/area/ship/medical)
 "nE" = (
 /obj/effect/turf_decal/box/corners{
 	dir = 1
 	},
+/obj/item/stack/sheet/glass/five{
+	pixel_x = 2;
+	pixel_y = 5
+	},
+/obj/item/stack/sheet/metal/five{
+	pixel_x = -3
+	},
+/obj/structure/closet/crate,
 /turf/open/floor/plasteel/patterned/cargo_one,
 /area/ship/cargo)
 "nK" = (
@@ -2093,16 +2188,19 @@
 /obj/machinery/door/firedoor/border_only,
 /turf/open/floor/plasteel,
 /area/ship/medical)
-"nT" = (
-/obj/structure/filingcabinet/double/grey,
-/obj/effect/turf_decal/corner/opaque/brown{
+"nN" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/effect/turf_decal/corner/opaque/lime{
 	dir = 8
 	},
-/obj/effect/turf_decal/corner/opaque/brown{
+/obj/effect/turf_decal/corner/opaque/lime{
 	dir = 1
 	},
-/obj/item/radio/intercom/directional/west,
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/white,
+/area/ship/medical)
+"nT" = (
+/obj/structure/railing/wood,
+/turf/open/floor/wood/bamboo,
 /area/ship/cargo/office)
 "nZ" = (
 /obj/structure/disposalpipe/segment{
@@ -2324,6 +2422,26 @@
 	},
 /turf/open/floor/plating,
 /area/ship/science/ai_chamber)
+"pf" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/effect/turf_decal/corner/opaque/lime{
+	dir = 8
+	},
+/turf/open/floor/plasteel/white,
+/area/ship/medical)
+"pi" = (
+/obj/effect/turf_decal/corner/opaque/blue,
+/obj/effect/turf_decal/corner/opaque/blue,
+/obj/effect/turf_decal/corner/opaque/blue{
+	dir = 4
+	},
+/obj/effect/turf_decal/corner/opaque/blue{
+	dir = 8
+	},
+/obj/machinery/door/airlock/public/glass,
+/obj/machinery/door/firedoor,
+/turf/open/floor/plasteel/white,
+/area/ship/medical)
 "pk" = (
 /obj/structure/disposalpipe/segment,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
@@ -2334,7 +2452,7 @@
 /turf/open/floor/plasteel,
 /area/ship/crew/cryo)
 "pm" = (
-/obj/structure/frame/computer{
+/obj/machinery/computer/communications{
 	dir = 8
 	},
 /turf/open/floor/plasteel/tech/grid,
@@ -2478,27 +2596,14 @@
 /turf/open/floor/plating,
 /area/ship/engineering)
 "qb" = (
-/obj/structure/closet/secure_closet{
-	icon_state = "science";
-	name = "scientist's locker";
-	req_access_txt = "47"
-	},
 /obj/effect/turf_decal/corner/opaque/mauve{
 	dir = 4
 	},
 /obj/effect/turf_decal/corner/opaque/mauve{
 	dir = 1
 	},
-/obj/item/storage/backpack/duffelbag,
-/obj/item/storage/backpack/messenger/tox,
-/obj/item/storage/backpack/satchel/tox,
-/obj/item/storage/backpack/science,
-/obj/item/clothing/shoes/sneakers/white,
-/obj/item/clothing/under/rank/rnd/scientist/skirt,
-/obj/item/clothing/under/rank/rnd/scientist,
-/obj/item/clothing/suit/toggle/labcoat/science,
-/obj/item/clothing/glasses/science,
 /obj/structure/extinguisher_cabinet/directional/north,
+/obj/machinery/mech_bay_recharge_port,
 /turf/open/floor/plasteel/white,
 /area/ship/science)
 "qc" = (
@@ -2522,6 +2627,19 @@
 /obj/machinery/atmospherics/pipe/simple/green/visible,
 /turf/open/floor/plasteel/patterned/grid,
 /area/ship/engineering/atmospherics)
+"qr" = (
+/obj/effect/turf_decal/corner/opaque/blue,
+/obj/effect/turf_decal/corner/opaque/blue{
+	dir = 4
+	},
+/obj/effect/turf_decal/corner/opaque/blue{
+	dir = 8
+	},
+/obj/machinery/door/airlock/public/glass,
+/obj/machinery/door/firedoor,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/turf/open/floor/plasteel/white,
+/area/ship/medical)
 "qs" = (
 /obj/structure/disposalpipe/segment,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
@@ -2538,29 +2656,44 @@
 	},
 /turf/open/floor/plasteel,
 /area/ship/hallway/central)
-"qv" = (
-/obj/structure/disposalpipe/segment{
-	dir = 8
-	},
-/obj/effect/turf_decal/corner/transparent/neutral,
-/obj/structure/closet/emcloset/wall/directional/south,
-/turf/open/floor/plasteel,
-/area/ship/hallway/central)
-"qw" = (
-/obj/effect/turf_decal/siding/wood{
-	dir = 1
+"qt" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
 	},
-/obj/item/trash/can,
-/turf/open/floor/wood,
-/area/ship/crew/canteen)
-"qL" = (
-/obj/effect/turf_decal/industrial/warning{
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 4
 	},
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/obj/effect/turf_decal/industrial/stand_clear{
+/obj/structure/closet/crate/internals,
+/obj/item/clothing/head/helmet/space/orange,
+/obj/item/clothing/head/helmet/space/orange,
+/obj/item/clothing/head/helmet/space/orange,
+/obj/item/clothing/suit/space/orange,
+/obj/item/clothing/suit/space/orange,
+/obj/item/clothing/suit/space/orange,
+/turf/open/floor/plasteel/patterned/cargo_one,
+/area/ship/cargo)
+"qv" = (
+/obj/structure/disposalpipe/segment{
+	dir = 8
+	},
+/obj/effect/turf_decal/corner/transparent/neutral,
+/obj/structure/closet/emcloset/wall/directional/south,
+/obj/effect/turf_decal/corner/transparent/neutral{
+	dir = 8
+	},
+/turf/open/floor/plasteel,
+/area/ship/hallway/central)
+"qL" = (
+/obj/effect/turf_decal/industrial/warning{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/effect/turf_decal/industrial/stand_clear{
 	dir = 8
 	},
 /turf/open/floor/plasteel/patterned,
@@ -2602,6 +2735,14 @@
 /obj/item/radio/intercom/directional/east,
 /turf/open/floor/plasteel,
 /area/ship/crew/canteen)
+"qR" = (
+/obj/structure/extinguisher_cabinet/directional/south,
+/obj/effect/turf_decal/siding/wood{
+	dir = 1
+	},
+/obj/item/radio/intercom/directional/west,
+/turf/open/floor/wood,
+/area/ship/cargo/office)
 "qX" = (
 /obj/machinery/atmospherics/components/unary/shuttle/heater{
 	dir = 4
@@ -2658,6 +2799,12 @@
 /obj/structure/catwalk/over,
 /turf/open/floor/plating,
 /area/ship/science/ai_chamber)
+"rh" = (
+/obj/machinery/computer/arcade/battle{
+	dir = 1
+	},
+/turf/open/floor/wood,
+/area/ship/cargo/office)
 "ry" = (
 /obj/item/storage/backpack/explorer,
 /obj/item/storage/backpack/satchel/explorer,
@@ -2676,6 +2823,10 @@
 	pixel_y = -32
 	},
 /obj/machinery/airalarm/directional/west,
+/obj/item/gun/energy/kinetic_accelerator,
+/obj/item/gun/energy/kinetic_accelerator,
+/obj/item/gps,
+/obj/item/gps,
 /turf/open/floor/plasteel/patterned/grid,
 /area/ship/cargo)
 "rz" = (
@@ -2687,6 +2838,22 @@
 	},
 /turf/open/floor/wood,
 /area/ship/crew/dorm)
+"rA" = (
+/obj/structure/table/reinforced,
+/obj/effect/turf_decal/corner/opaque/lime{
+	dir = 4
+	},
+/obj/machinery/door/window{
+	dir = 8;
+	icon_state = "right";
+	name = "Medical Supplies";
+	opacity = 1
+	},
+/obj/item/storage/firstaid/regular,
+/obj/item/storage/firstaid/brute,
+/obj/item/storage/firstaid/brute,
+/turf/open/floor/plasteel/white,
+/area/ship/medical)
 "rG" = (
 /obj/machinery/power/shuttle/engine/fueled/plasma{
 	dir = 4
@@ -2758,12 +2925,16 @@
 	dir = 8
 	},
 /obj/machinery/light/directional/south,
+/obj/effect/turf_decal/corner/transparent/neutral{
+	dir = 8
+	},
 /turf/open/floor/plasteel,
 /area/ship/hallway/central)
 "rX" = (
 /obj/effect/turf_decal/corner/transparent/neutral{
 	dir = 8
 	},
+/obj/effect/turf_decal/corner/transparent/neutral,
 /turf/open/floor/plasteel,
 /area/ship/hallway/central)
 "rZ" = (
@@ -2784,7 +2955,7 @@
 /area/ship/crew/canteen)
 "sd" = (
 /obj/structure/sign/nanotrasen,
-/turf/closed/wall/mineral/titanium/nodiagonal,
+/turf/closed/wall/mineral/plastitanium,
 /area/ship/science)
 "si" = (
 /obj/structure/disposalpipe/segment{
@@ -2793,6 +2964,9 @@
 /obj/effect/turf_decal/corner/opaque/yellow{
 	dir = 1
 	},
+/obj/effect/turf_decal/corner/transparent/neutral{
+	dir = 8
+	},
 /turf/open/floor/plasteel,
 /area/ship/hallway/central)
 "sl" = (
@@ -2866,38 +3040,6 @@
 /turf/open/floor/plasteel,
 /area/ship/crew/canteen)
 "sE" = (
-/obj/item/reagent_containers/food/snacks/canned/beans{
-	pixel_x = -5;
-	pixel_y = 3
-	},
-/obj/item/reagent_containers/food/snacks/canned/beans{
-	pixel_x = 2;
-	pixel_y = 3
-	},
-/obj/item/reagent_containers/food/snacks/canned/beans{
-	pixel_x = -2
-	},
-/obj/item/reagent_containers/food/drinks/waterbottle/large{
-	pixel_x = 5
-	},
-/obj/item/reagent_containers/food/drinks/waterbottle/large{
-	pixel_x = 1;
-	pixel_y = -3
-	},
-/obj/item/reagent_containers/food/drinks/waterbottle/large{
-	pixel_x = 8;
-	pixel_y = -3
-	},
-/obj/structure/closet/crate{
-	name = "food crate"
-	},
-/obj/item/storage/cans/sixbeer,
-/obj/effect/spawner/lootdrop/ration,
-/obj/effect/spawner/lootdrop/ration,
-/obj/effect/spawner/lootdrop/ration,
-/obj/effect/spawner/lootdrop/ration,
-/obj/effect/spawner/lootdrop/ration,
-/obj/effect/spawner/lootdrop/ration,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 4
 	},
@@ -2907,6 +3049,8 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
+/obj/structure/closet/crate,
+/obj/item/vending_refill/coffee,
 /turf/open/floor/plasteel/patterned/cargo_one,
 /area/ship/cargo)
 "sG" = (
@@ -3020,6 +3164,19 @@
 /obj/machinery/door/firedoor/window,
 /turf/open/floor/plating,
 /area/ship/bridge)
+"tz" = (
+/obj/structure/table/optable,
+/obj/effect/turf_decal/corner/opaque/pink{
+	dir = 1
+	},
+/obj/effect/turf_decal/corner/opaque/pink{
+	dir = 8
+	},
+/obj/effect/turf_decal/corner/opaque/pink{
+	dir = 4
+	},
+/turf/open/floor/plasteel/white,
+/area/ship/medical)
 "tF" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -3033,9 +3190,6 @@
 /obj/effect/turf_decal/box/corners{
 	dir = 1
 	},
-/obj/structure/closet/crate,
-/obj/item/vending_refill/coffee,
-/obj/effect/spawner/lootdrop/maintenance/three,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /turf/open/floor/plasteel/patterned/cargo_one,
 /area/ship/cargo)
@@ -3050,6 +3204,9 @@
 	dir = 4
 	},
 /obj/structure/closet/emcloset/wall/directional/north,
+/obj/effect/turf_decal/corner/transparent/neutral{
+	dir = 1
+	},
 /turf/open/floor/plasteel,
 /area/ship/hallway/central)
 "tO" = (
@@ -3122,6 +3279,12 @@
 /obj/effect/turf_decal/box/white{
 	color = "#2CB2E8"
 	},
+/obj/effect/turf_decal/corner/opaque/blue{
+	dir = 8
+	},
+/obj/effect/turf_decal/corner/opaque/blue{
+	dir = 1
+	},
 /turf/open/floor/plasteel/white,
 /area/ship/medical)
 "uq" = (
@@ -3157,7 +3320,6 @@
 /turf/open/floor/plasteel,
 /area/ship/crew/janitor)
 "ux" = (
-/obj/machinery/computer/operating,
 /obj/effect/turf_decal/corner/opaque/pink{
 	dir = 8
 	},
@@ -3197,6 +3359,7 @@
 /obj/effect/turf_decal/trimline/opaque/blue/corner{
 	dir = 4
 	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /turf/open/floor/plasteel/white,
 /area/ship/medical)
 "uI" = (
@@ -3225,6 +3388,14 @@
 	},
 /turf/open/floor/plasteel,
 /area/ship/crew/janitor)
+"uL" = (
+/obj/machinery/door/airlock/mining{
+	name = "Cargo Office";
+	req_access_txt = "31"
+	},
+/obj/machinery/door/firedoor,
+/turf/open/floor/wood/bamboo,
+/area/ship/cargo/office)
 "uM" = (
 /obj/machinery/door/airlock{
 	name = "Cryopod Room"
@@ -3245,6 +3416,9 @@
 "uN" = (
 /obj/effect/turf_decal/corner/transparent/neutral,
 /obj/item/kirbyplants/random,
+/obj/effect/turf_decal/corner/transparent/neutral{
+	dir = 4
+	},
 /turf/open/floor/plasteel,
 /area/ship/hallway/central)
 "uQ" = (
@@ -3252,6 +3426,23 @@
 /obj/machinery/atmospherics/pipe/layer_manifold,
 /turf/open/floor/plasteel/tech,
 /area/ship/hallway/central)
+"va" = (
+/obj/effect/turf_decal/corner/opaque/lime{
+	dir = 4
+	},
+/turf/open/floor/plasteel/white,
+/area/ship/medical)
+"ve" = (
+/obj/machinery/sleeper,
+/obj/effect/turf_decal/corner/opaque/lime{
+	dir = 1
+	},
+/obj/effect/turf_decal/corner/opaque/lime{
+	dir = 4
+	},
+/obj/effect/turf_decal/corner/opaque/lime,
+/turf/open/floor/plasteel/white,
+/area/ship/medical)
 "vi" = (
 /obj/structure/table,
 /obj/item/storage/bag/trash{
@@ -3340,6 +3531,11 @@
 	},
 /turf/open/floor/plating,
 /area/ship/crew/janitor)
+"vQ" = (
+/obj/structure/table/wood,
+/obj/machinery/computer/bookmanagement,
+/turf/open/floor/wood,
+/area/ship/cargo/office)
 "vY" = (
 /obj/machinery/atmospherics/pipe/manifold/orange/visible,
 /obj/structure/cable{
@@ -3350,6 +3546,12 @@
 	},
 /turf/open/floor/plasteel/patterned/grid,
 /area/ship/engineering)
+"wa" = (
+/obj/effect/turf_decal/corner/opaque/pink{
+	dir = 1
+	},
+/turf/open/floor/plasteel/white,
+/area/ship/medical)
 "wb" = (
 /obj/structure/disposalpipe/segment{
 	dir = 8
@@ -3462,13 +3664,10 @@
 /turf/open/floor/plasteel/white,
 /area/ship/medical)
 "wr" = (
-/obj/structure/chair{
-	dir = 1
-	},
-/obj/effect/turf_decal/corner/opaque/blue,
 /obj/effect/turf_decal/corner/opaque/blue{
 	dir = 8
 	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /turf/open/floor/plasteel/white,
 /area/ship/medical)
 "wx" = (
@@ -3559,9 +3758,6 @@
 	dir = 4
 	},
 /obj/effect/turf_decal/corner/opaque/lime,
-/obj/structure/sign/poster/official/moth/epi{
-	pixel_y = 32
-	},
 /obj/machinery/light/directional/east,
 /turf/open/floor/plasteel/white,
 /area/ship/medical)
@@ -3727,8 +3923,7 @@
 /turf/open/floor/plasteel/dark,
 /area/ship/hallway/central)
 "xN" = (
-/obj/structure/table/wood,
-/obj/item/flashlight/lamp,
+/obj/machinery/vending/clothing,
 /turf/open/floor/wood,
 /area/ship/crew/dorm)
 "xP" = (
@@ -3768,16 +3963,28 @@
 	},
 /turf/open/floor/plasteel,
 /area/ship/hallway/central)
+"ya" = (
+/obj/structure/table/reinforced,
+/obj/effect/turf_decal/corner/opaque/lime{
+	dir = 4
+	},
+/obj/structure/window/plasma/reinforced/spawner/north,
+/obj/machinery/door/window{
+	dir = 8;
+	icon_state = "right";
+	name = "Medical Supplies";
+	opacity = 1
+	},
+/obj/item/storage/firstaid/regular,
+/obj/item/storage/firstaid/fire,
+/obj/item/storage/firstaid/o2,
+/turf/open/floor/plasteel/white,
+/area/ship/medical)
 "yc" = (
 /obj/structure/closet/secure_closet{
 	icon_state = "med";
 	name = "medicine locker"
 	},
-/obj/item/storage/firstaid/fire{
-	pixel_x = -4;
-	pixel_y = 5
-	},
-/obj/item/storage/firstaid/regular,
 /obj/machinery/button/door{
 	dir = 1;
 	id = "ospreymed";
@@ -3793,6 +4000,11 @@
 /obj/machinery/camera/autoname{
 	dir = 1
 	},
+/obj/effect/turf_decal/corner/opaque/blue,
+/obj/effect/turf_decal/corner/opaque/blue{
+	dir = 8
+	},
+/obj/item/clothing/neck/stethoscope,
 /turf/open/floor/plasteel/white,
 /area/ship/medical)
 "yd" = (
@@ -3861,6 +4073,9 @@
 /obj/machinery/status_display/shuttle{
 	pixel_x = 32
 	},
+/obj/effect/turf_decal/corner/transparent/neutral{
+	dir = 4
+	},
 /turf/open/floor/plasteel,
 /area/ship/hallway/central)
 "yC" = (
@@ -3898,7 +4113,6 @@
 	},
 /obj/machinery/door/window/brigdoor/westleft{
 	dir = 4;
-	name = "Comms Relay";
 	req_one_access_txt = "61"
 	},
 /turf/open/floor/circuit,
@@ -3918,6 +4132,7 @@
 /obj/machinery/status_display/shuttle{
 	pixel_x = 32
 	},
+/obj/effect/turf_decal/corner/transparent/neutral,
 /turf/open/floor/plasteel,
 /area/ship/hallway/central)
 "yS" = (
@@ -4045,6 +4260,7 @@
 	},
 /obj/machinery/vending/snack/random,
 /obj/machinery/light/directional/east,
+/obj/effect/turf_decal/corner/transparent/neutral,
 /turf/open/floor/plasteel,
 /area/ship/hallway/central)
 "zL" = (
@@ -4136,6 +4352,7 @@
 /obj/effect/turf_decal/trimline/opaque/blue/corner{
 	dir = 1
 	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /turf/open/floor/plasteel/white,
 /area/ship/medical)
 "Ag" = (
@@ -4168,6 +4385,7 @@
 /obj/structure/cable{
 	icon_state = "1-8"
 	},
+/obj/effect/turf_decal/corner/opaque/ntblue,
 /turf/open/floor/plasteel,
 /area/ship/hallway/central)
 "Aj" = (
@@ -4210,6 +4428,10 @@
 	dir = 4
 	},
 /obj/item/kirbyplants/random,
+/obj/effect/turf_decal/corner/transparent/neutral,
+/obj/effect/turf_decal/corner/transparent/neutral{
+	dir = 1
+	},
 /turf/open/floor/plasteel,
 /area/ship/hallway/central)
 "AR" = (
@@ -4261,7 +4483,6 @@
 /turf/open/floor/plasteel/patterned/cargo_one,
 /area/ship/cargo)
 "Bc" = (
-/obj/structure/table/optable,
 /obj/effect/turf_decal/corner/opaque/pink{
 	dir = 4
 	},
@@ -4354,9 +4575,22 @@
 	},
 /turf/open/floor/plating,
 /area/ship/cargo/office)
+"Bx" = (
+/obj/machinery/door/window/brigdoor/westleft{
+	dir = 4;
+	req_one_access_txt = "61"
+	},
+/obj/structure/AIcore,
+/obj/item/circuitboard/aicore,
+/obj/item/stack/sheet/rglass{
+	amount = 5
+	},
+/obj/item/surveillance_upgrade,
+/turf/open/floor/circuit,
+/area/ship/science/ai_chamber)
 "BH" = (
 /obj/structure/sign/nanotrasen,
-/turf/closed/wall/mineral/titanium/nodiagonal,
+/turf/closed/wall/mineral/plastitanium,
 /area/ship/crew/dorm)
 "BK" = (
 /obj/structure/disposalpipe/segment{
@@ -4442,6 +4676,15 @@
 	},
 /turf/open/floor/plasteel,
 /area/ship/hallway/central)
+"Cs" = (
+/obj/effect/turf_decal/corner/opaque/lime{
+	dir = 8
+	},
+/obj/effect/turf_decal/corner/opaque/lime{
+	dir = 1
+	},
+/turf/open/floor/plasteel/white,
+/area/ship/medical)
 "Cu" = (
 /obj/effect/turf_decal/box/corners{
 	dir = 4
@@ -4453,8 +4696,8 @@
 /turf/open/floor/plasteel/patterned/cargo_one,
 /area/ship/cargo)
 "Cv" = (
-/turf/closed/wall/mineral/titanium/nodiagonal,
-/area/ship/cargo)
+/turf/closed/wall/mineral/plastitanium,
+/area/ship/medical)
 "Cw" = (
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
 /turf/open/floor/plasteel/patterned,
@@ -4469,6 +4712,9 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
+/obj/structure/closet/crate{
+	name = "food crate"
+	},
 /turf/open/floor/plasteel/patterned/cargo_one,
 /area/ship/cargo)
 "CC" = (
@@ -4487,11 +4733,15 @@
 /obj/structure/cable{
 	icon_state = "2-4"
 	},
+/obj/effect/turf_decal/corner/opaque/ntblue{
+	dir = 4
+	},
 /turf/open/floor/plasteel,
 /area/ship/hallway/central)
 "CF" = (
-/turf/closed/wall/mineral/titanium,
-/area/ship/medical)
+/obj/machinery/light/dim/directional/north,
+/turf/open/floor/wood/bamboo,
+/area/ship/cargo/office)
 "CH" = (
 /obj/structure/disposalpipe/segment{
 	dir = 8
@@ -4545,6 +4795,11 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 4
 	},
+/obj/effect/turf_decal/corner/opaque/blue{
+	dir = 4
+	},
+/obj/effect/turf_decal/corner/opaque/blue,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /turf/open/floor/plasteel/white,
 /area/ship/medical)
 "CT" = (
@@ -4588,8 +4843,6 @@
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
 "Dj" = (
-/obj/structure/table/glass,
-/obj/item/defibrillator,
 /obj/effect/turf_decal/corner/opaque/pink{
 	dir = 4
 	},
@@ -4597,9 +4850,7 @@
 	dir = 1
 	},
 /obj/effect/turf_decal/corner/opaque/pink,
-/obj/structure/sign/warning/nosmoking/circle{
-	pixel_x = 25
-	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /turf/open/floor/plasteel/white,
 /area/ship/medical)
 "Dq" = (
@@ -4610,7 +4861,6 @@
 /turf/open/floor/engine/hull,
 /area/ship/external)
 "Dx" = (
-/obj/structure/reagent_dispensers/fueltank,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /turf/open/floor/plasteel/patterned/cargo_one,
@@ -4630,6 +4880,11 @@
 	},
 /turf/open/floor/wood,
 /area/ship/crew/canteen)
+"DC" = (
+/obj/structure/crate_shelf,
+/obj/machinery/light/directional/west,
+/turf/open/floor/wood/bamboo,
+/area/ship/cargo/office)
 "DE" = (
 /obj/effect/turf_decal/industrial/loading{
 	dir = 8
@@ -4649,7 +4904,7 @@
 /obj/structure/sign/number/eight{
 	color = "Black"
 	},
-/turf/closed/wall/mineral/titanium/nodiagonal,
+/turf/closed/wall/mineral/plastitanium,
 /area/ship/cargo/office)
 "DH" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
@@ -4684,7 +4939,7 @@
 	color = "Black";
 	dir = 1
 	},
-/turf/closed/wall/mineral/titanium/nodiagonal,
+/turf/closed/wall/mineral/plastitanium,
 /area/ship/science)
 "DU" = (
 /obj/structure/sign/nanotrasen,
@@ -4713,10 +4968,6 @@
 /turf/open/floor/wood,
 /area/ship/crew/canteen)
 "Ee" = (
-/obj/structure/closet/secure_closet{
-	icon_state = "med_secure";
-	name = "medical doctor's locker"
-	},
 /obj/structure/cable{
 	icon_state = "0-4"
 	},
@@ -4726,16 +4977,6 @@
 /obj/effect/turf_decal/corner/opaque/blue{
 	dir = 1
 	},
-/obj/item/storage/backpack/duffelbag/med,
-/obj/item/storage/backpack/messenger/med,
-/obj/item/storage/backpack/satchel/med,
-/obj/item/storage/backpack/medic,
-/obj/item/clothing/shoes/sneakers/white,
-/obj/item/clothing/under/rank/medical/doctor/skirt,
-/obj/item/clothing/under/rank/medical/doctor,
-/obj/item/clothing/suit/toggle/labcoat,
-/obj/item/storage/belt/medical,
-/obj/item/clothing/glasses/hud/health,
 /obj/machinery/power/apc/auto_name/directional/west,
 /obj/machinery/light_switch{
 	dir = 4;
@@ -4768,6 +5009,7 @@
 /obj/effect/turf_decal/corner/transparent/neutral{
 	dir = 4
 	},
+/obj/effect/turf_decal/corner/transparent/neutral,
 /turf/open/floor/plasteel,
 /area/ship/hallway/central)
 "Ey" = (
@@ -4825,6 +5067,7 @@
 /obj/item/folder,
 /obj/item/pen,
 /obj/machinery/light/small/directional/south,
+/obj/item/flashlight/lamp,
 /turf/open/floor/wood,
 /area/ship/crew/dorm)
 "EW" = (
@@ -4951,11 +5194,14 @@
 /obj/structure/sign/warning/docking{
 	pixel_y = -8
 	},
-/turf/closed/wall/mineral/titanium/nodiagonal,
+/turf/closed/wall/mineral/plastitanium,
 /area/ship/hallway/central)
 "FL" = (
 /turf/open/floor/plasteel,
 /area/ship/crew/cryo)
+"FN" = (
+/turf/closed/wall/mineral/plastitanium,
+/area/ship/science/ai_chamber)
 "FP" = (
 /obj/structure/disposalpipe/segment{
 	dir = 8
@@ -4965,14 +5211,22 @@
 	},
 /turf/open/floor/plasteel/white,
 /area/ship/medical)
+"FS" = (
+/obj/structure/table/glass,
+/obj/effect/turf_decal/corner/opaque/pink{
+	dir = 4
+	},
+/obj/effect/turf_decal/corner/opaque/pink,
+/obj/item/defibrillator/loaded,
+/turf/open/floor/plasteel/white,
+/area/ship/medical)
 "FV" = (
 /obj/structure/sign/departments/restroom,
 /turf/closed/wall/mineral/titanium/nodiagonal,
 /area/ship/crew/toilet)
 "FZ" = (
-/obj/structure/table/wood,
-/obj/structure/bedsheetbin,
 /obj/item/radio/intercom/directional/north,
+/obj/machinery/vending/autodrobe,
 /turf/open/floor/wood,
 /area/ship/crew/dorm)
 "Ga" = (
@@ -4996,6 +5250,9 @@
 /area/ship/crew/canteen)
 "Ge" = (
 /obj/effect/turf_decal/corner/transparent/neutral,
+/obj/effect/turf_decal/corner/transparent/neutral{
+	dir = 4
+	},
 /turf/open/floor/plasteel,
 /area/ship/hallway/central)
 "Gk" = (
@@ -5105,6 +5362,10 @@
 	},
 /turf/open/floor/wood,
 /area/ship/crew/dorm)
+"GQ" = (
+/obj/machinery/photocopier,
+/turf/open/floor/wood,
+/area/ship/cargo/office)
 "GU" = (
 /obj/structure/tank_dispenser/oxygen,
 /obj/effect/turf_decal/borderfloor{
@@ -5153,6 +5414,10 @@
 	},
 /obj/item/storage/box/masks,
 /obj/machinery/light/directional/east,
+/obj/effect/turf_decal/corner/opaque/blue,
+/obj/effect/turf_decal/corner/opaque/blue{
+	dir = 8
+	},
 /turf/open/floor/plasteel/white,
 /area/ship/medical)
 "Hf" = (
@@ -5231,8 +5496,12 @@
 	pixel_x = -1;
 	pixel_y = 12
 	},
-/turf/open/floor/plasteel/white,
-/area/ship/medical)
+/obj/effect/turf_decal/corner/opaque/blue,
+/obj/effect/turf_decal/corner/opaque/blue{
+	dir = 8
+	},
+/turf/open/floor/plasteel/white,
+/area/ship/medical)
 "Hy" = (
 /obj/effect/turf_decal/corner/opaque/purple{
 	dir = 1
@@ -5284,13 +5553,8 @@
 /turf/open/floor/plasteel/patterned/grid,
 /area/ship/engineering/atmospherics)
 "HU" = (
-/obj/structure/chair{
-	dir = 1
-	},
-/obj/effect/turf_decal/corner/opaque/blue{
-	dir = 8
-	},
 /obj/effect/turf_decal/corner/opaque/blue,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /turf/open/floor/plasteel/white,
 /area/ship/medical)
 "HV" = (
@@ -5312,8 +5576,6 @@
 /obj/effect/turf_decal/corner/opaque/brown{
 	dir = 1
 	},
-/obj/machinery/photocopier,
-/obj/machinery/computer/helm/viewscreen/directional/west,
 /turf/open/floor/plasteel,
 /area/ship/cargo/office)
 "Ig" = (
@@ -5346,6 +5608,9 @@
 	icon_state = "1-2"
 	},
 /obj/machinery/firealarm/directional/east,
+/obj/effect/turf_decal/corner/transparent/neutral{
+	dir = 4
+	},
 /turf/open/floor/plasteel,
 /area/ship/hallway/central)
 "Iq" = (
@@ -5426,15 +5691,19 @@
 /obj/effect/turf_decal/box/corners{
 	dir = 8
 	},
-/obj/structure/closet/crate/internals,
-/obj/item/clothing/suit/space/orange,
-/obj/item/clothing/suit/space/orange,
-/obj/item/clothing/suit/space/orange,
-/obj/item/clothing/head/helmet/space/orange,
-/obj/item/clothing/head/helmet/space/orange,
-/obj/item/clothing/head/helmet/space/orange,
 /turf/open/floor/plasteel/patterned/cargo_one,
 /area/ship/cargo)
+"IC" = (
+/obj/machinery/computer/operating,
+/obj/effect/turf_decal/corner/opaque/pink{
+	dir = 4
+	},
+/obj/effect/turf_decal/corner/opaque/pink{
+	dir = 1
+	},
+/obj/effect/turf_decal/corner/opaque/pink,
+/turf/open/floor/plasteel/white,
+/area/ship/medical)
 "IL" = (
 /turf/closed/wall/mineral/titanium/nodiagonal,
 /area/ship/science)
@@ -5495,11 +5764,11 @@
 /obj/effect/turf_decal/box/corners{
 	dir = 4
 	},
-/obj/structure/reagent_dispensers/watertank,
+/obj/structure/closet/crate,
 /turf/open/floor/plasteel/patterned/cargo_one,
 /area/ship/cargo)
 "IY" = (
-/turf/closed/wall/mineral/titanium,
+/turf/closed/wall/mineral/plastitanium,
 /area/ship/engineering/atmospherics)
 "Jc" = (
 /obj/structure/disposalpipe/segment,
@@ -5511,6 +5780,11 @@
 	},
 /turf/open/floor/noslip,
 /area/ship/engineering)
+"Jk" = (
+/obj/structure/table/wood,
+/obj/item/paper_bin,
+/turf/open/floor/wood,
+/area/ship/cargo/office)
 "Jl" = (
 /obj/machinery/atmospherics/components/trinary/mixer/airmix/flipped{
 	dir = 1
@@ -5613,12 +5887,22 @@
 /obj/effect/turf_decal/corner/transparent/neutral{
 	dir = 4
 	},
+/obj/effect/turf_decal/corner/transparent/neutral,
 /turf/open/floor/plasteel,
 /area/ship/hallway/central)
 "JX" = (
 /obj/structure/sign/departments/engineering,
 /turf/closed/wall/mineral/titanium/nodiagonal,
 /area/ship/crew/janitor)
+"JZ" = (
+/obj/effect/turf_decal/corner/opaque/lime{
+	dir = 1
+	},
+/obj/effect/turf_decal/corner/opaque/lime{
+	dir = 8
+	},
+/turf/open/floor/plasteel/white,
+/area/ship/medical)
 "Ka" = (
 /obj/structure/disposalpipe/segment{
 	dir = 8
@@ -5641,6 +5925,23 @@
 /obj/machinery/camera/autoname,
 /turf/open/floor/plasteel/patterned/grid,
 /area/ship/engineering/atmospherics)
+"Kh" = (
+/obj/effect/turf_decal/corner/opaque/pink{
+	dir = 1
+	},
+/obj/effect/turf_decal/corner/opaque/pink{
+	dir = 8
+	},
+/obj/machinery/shower{
+	dir = 4
+	},
+/obj/effect/turf_decal/industrial/warning,
+/obj/effect/turf_decal/industrial/warning{
+	dir = 5
+	},
+/obj/structure/curtain,
+/turf/open/floor/plasteel/white,
+/area/ship/medical)
 "Ko" = (
 /obj/structure/window/plasma/reinforced,
 /obj/structure/cable{
@@ -5671,10 +5972,6 @@
 /turf/open/floor/wood,
 /area/ship/crew/dorm)
 "KE" = (
-/obj/structure/closet/secure_closet{
-	icon_state = "brig_phys";
-	name = "paramedic's locker"
-	},
 /obj/machinery/airalarm/directional/west,
 /obj/effect/turf_decal/corner/opaque/blue{
 	dir = 8
@@ -5682,16 +5979,6 @@
 /obj/effect/turf_decal/corner/opaque/blue{
 	dir = 1
 	},
-/obj/item/storage/backpack/duffelbag/med,
-/obj/item/storage/backpack/satchel/med,
-/obj/item/storage/backpack/medic,
-/obj/item/storage/backpack/messenger/para,
-/obj/item/clothing/shoes/sneakers/blue,
-/obj/item/clothing/under/rank/medical/paramedic/skirt,
-/obj/item/clothing/under/rank/medical/paramedic,
-/obj/item/clothing/head/soft/paramedic,
-/obj/item/storage/belt/medical,
-/obj/item/clothing/glasses/hud/health,
 /turf/open/floor/plasteel/white,
 /area/ship/medical)
 "KI" = (
@@ -5720,6 +6007,14 @@
 /obj/machinery/computer/med_data{
 	dir = 4
 	},
+/obj/effect/turf_decal/corner/opaque/blue{
+	dir = 4
+	},
+/obj/effect/turf_decal/corner/opaque/blue,
+/obj/effect/turf_decal/corner/opaque/blue{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /turf/open/floor/plasteel/white,
 /area/ship/medical)
 "Ll" = (
@@ -5759,6 +6054,9 @@
 /obj/machinery/door/firedoor,
 /turf/open/floor/plasteel,
 /area/ship/crew/canteen)
+"LA" = (
+/turf/closed/wall/mineral/plastitanium,
+/area/template_noop)
 "LB" = (
 /obj/machinery/atmospherics/pipe/manifold/orange/visible,
 /obj/effect/turf_decal/industrial/warning{
@@ -5771,13 +6069,7 @@
 	name = "AI Core Access";
 	req_one_access_txt = "16"
 	},
-/obj/structure/rack,
-/obj/item/aiModule/core/full/asimov,
-/obj/item/aiModule/core/full/corp,
-/obj/item/aiModule/core/freeformcore,
-/obj/item/aiModule/reset/purge{
-	pixel_y = 5
-	},
+/obj/machinery/telecomms/receiver,
 /turf/open/floor/circuit,
 /area/ship/science/ai_chamber)
 "LF" = (
@@ -5869,6 +6161,15 @@
 /obj/machinery/power/apc/auto_name/directional/east,
 /turf/open/floor/plasteel/patterned/grid,
 /area/ship/engineering/atmospherics)
+"Mp" = (
+/obj/effect/turf_decal/corner/opaque/ntblue{
+	dir = 8
+	},
+/obj/effect/turf_decal/corner/opaque/ntblue{
+	dir = 1
+	},
+/turf/open/floor/plasteel,
+/area/ship/hallway/central)
 "Mu" = (
 /obj/structure/window/reinforced{
 	dir = 8
@@ -5925,6 +6226,27 @@
 /obj/structure/sign/departments/engineering,
 /turf/closed/wall/mineral/titanium/nodiagonal,
 /area/ship/crew/toilet)
+"MH" = (
+/obj/structure/window/plasma/reinforced/spawner/east,
+/obj/structure/window/plasma/reinforced/spawner/north,
+/obj/structure/window/plasma/reinforced/spawner/west,
+/obj/structure/window/plasma/reinforced/spawner,
+/obj/structure/flora/ausbushes/sunnybush,
+/obj/structure/flora/junglebush,
+/obj/machinery/light/floor,
+/turf/open/floor/grass/ship,
+/area/ship/medical)
+"MI" = (
+/obj/effect/turf_decal/corner/opaque/lime{
+	dir = 1
+	},
+/obj/effect/turf_decal/corner/opaque/lime{
+	dir = 4
+	},
+/obj/effect/turf_decal/corner/opaque/lime,
+/obj/machinery/vending/cola/random,
+/turf/open/floor/plasteel/white,
+/area/ship/medical)
 "MJ" = (
 /obj/structure/disposalpipe/segment{
 	dir = 2
@@ -5953,7 +6275,7 @@
 /turf/open/floor/plasteel/showroomfloor,
 /area/ship/cargo)
 "MM" = (
-/turf/closed/wall/mineral/titanium,
+/turf/closed/wall/mineral/plastitanium,
 /area/ship/engineering)
 "MR" = (
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
@@ -5983,6 +6305,9 @@
 	dir = 8
 	},
 /obj/machinery/light/directional/west,
+/obj/effect/turf_decal/corner/opaque/ntblue{
+	dir = 1
+	},
 /turf/open/floor/plasteel,
 /area/ship/hallway/central)
 "Nm" = (
@@ -6106,19 +6431,15 @@
 /obj/effect/turf_decal/corner/transparent/neutral{
 	dir = 4
 	},
+/obj/effect/turf_decal/corner/transparent/neutral,
 /turf/open/floor/plasteel,
 /area/ship/hallway/central)
 "NH" = (
-/obj/structure/table/glass,
-/obj/item/storage/backpack/duffelbag/med/surgery{
-	pixel_x = -3;
-	pixel_y = 13
-	},
 /obj/effect/turf_decal/corner/opaque/pink{
 	dir = 4
 	},
 /obj/effect/turf_decal/corner/opaque/pink,
-/obj/item/clothing/gloves/color/latex/nitrile,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /turf/open/floor/plasteel/white,
 /area/ship/medical)
 "NP" = (
@@ -6271,6 +6592,22 @@
 	},
 /turf/open/floor/plating,
 /area/ship/cargo)
+"OE" = (
+/obj/effect/turf_decal/corner/transparent/neutral{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/effect/turf_decal/corner/transparent/neutral,
+/turf/open/floor/plasteel,
+/area/ship/hallway/central)
+"OF" = (
+/obj/effect/turf_decal/corner/opaque/blue,
+/turf/open/floor/plasteel/white,
+/area/ship/medical)
 "OG" = (
 /obj/machinery/conveyor_switch/oneway{
 	id = "osprey_production"
@@ -6286,14 +6623,35 @@
 	},
 /turf/open/floor/plasteel/white,
 /area/ship/medical)
+"OK" = (
+/obj/effect/turf_decal/corner/opaque/pink{
+	dir = 1
+	},
+/obj/effect/turf_decal/corner/opaque/pink{
+	dir = 8
+	},
+/obj/effect/turf_decal/corner/opaque/pink{
+	dir = 4
+	},
+/obj/machinery/stasis{
+	dir = 4
+	},
+/obj/machinery/light/directional/west,
+/turf/open/floor/plasteel/white,
+/area/ship/medical)
 "OS" = (
 /obj/effect/spawner/structure/window/shuttle,
 /obj/machinery/door/poddoor/shutters{
 	id = "ospreymed"
 	},
 /obj/machinery/door/firedoor/window,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /turf/open/floor/plating,
 /area/ship/medical)
+"OT" = (
+/obj/structure/crate_shelf,
+/turf/open/floor/wood/bamboo,
+/area/ship/cargo/office)
 "OV" = (
 /obj/structure/disposalpipe/segment{
 	dir = 8
@@ -6345,6 +6703,27 @@
 	},
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
+"Ph" = (
+/obj/structure/closet/secure_closet{
+	icon_state = "med_secure";
+	name = "medical doctor's locker"
+	},
+/obj/item/storage/backpack/duffelbag/med,
+/obj/item/storage/backpack/messenger/med,
+/obj/item/storage/backpack/medic,
+/obj/item/clothing/shoes/sneakers/white,
+/obj/item/clothing/under/rank/medical/doctor/skirt,
+/obj/item/clothing/under/rank/medical/doctor,
+/obj/item/clothing/suit/toggle/labcoat,
+/obj/item/clothing/glasses/hud/health,
+/obj/effect/turf_decal/corner/opaque/pink{
+	dir = 1
+	},
+/obj/effect/turf_decal/corner/opaque/pink{
+	dir = 8
+	},
+/turf/open/floor/plasteel/white,
+/area/ship/medical)
 "Pj" = (
 /obj/machinery/disposal/bin,
 /obj/structure/disposalpipe/trunk{
@@ -6372,6 +6751,19 @@
 "Po" = (
 /turf/open/floor/plasteel/dark,
 /area/ship/science)
+"Pp" = (
+/obj/effect/turf_decal/corner/opaque/blue{
+	dir = 8
+	},
+/obj/effect/turf_decal/corner/opaque/blue{
+	dir = 1
+	},
+/obj/effect/turf_decal/corner/opaque/blue,
+/obj/machinery/door/airlock/public/glass,
+/obj/machinery/door/firedoor,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/turf/open/floor/plasteel/white,
+/area/ship/medical)
 "Pq" = (
 /obj/effect/turf_decal/corner/transparent/neutral{
 	dir = 4
@@ -6380,8 +6772,23 @@
 /obj/structure/disposalpipe/trunk{
 	dir = 8
 	},
+/obj/effect/turf_decal/corner/transparent/neutral,
 /turf/open/floor/plasteel,
 /area/ship/hallway/central)
+"PD" = (
+/obj/machinery/sleeper,
+/obj/effect/turf_decal/corner/opaque/lime{
+	dir = 1
+	},
+/obj/effect/turf_decal/corner/opaque/lime{
+	dir = 4
+	},
+/obj/effect/turf_decal/corner/opaque/lime{
+	dir = 8
+	},
+/obj/machinery/light/dim/directional/north,
+/turf/open/floor/plasteel/white,
+/area/ship/medical)
 "PE" = (
 /obj/machinery/recharge_station,
 /obj/effect/turf_decal/corner/opaque/mauve{
@@ -6408,7 +6815,7 @@
 /turf/open/floor/plasteel/tech/techmaint,
 /area/ship/crew/cryo)
 "PP" = (
-/turf/closed/wall/mineral/titanium,
+/turf/closed/wall/mineral/plastitanium,
 /area/ship/crew/cryo)
 "PQ" = (
 /obj/structure/disposalpipe/sorting/mail/flip{
@@ -6472,9 +6879,6 @@
 /obj/structure/disposalpipe/segment{
 	dir = 8
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 4
-	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 4
 	},
@@ -6484,6 +6888,9 @@
 /obj/effect/turf_decal/trimline/opaque/blue/corner{
 	dir = 8
 	},
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+	dir = 1
+	},
 /turf/open/floor/plasteel/white,
 /area/ship/medical)
 "Qr" = (
@@ -6510,6 +6917,9 @@
 	dir = 4
 	},
 /obj/machinery/light/dim/directional/north,
+/obj/effect/turf_decal/corner/transparent/neutral{
+	dir = 1
+	},
 /turf/open/floor/plasteel,
 /area/ship/hallway/central)
 "Qv" = (
@@ -6530,8 +6940,32 @@
 	dir = 9
 	},
 /obj/effect/turf_decal/corner/transparent/neutral,
+/obj/effect/turf_decal/corner/transparent/neutral{
+	dir = 4
+	},
 /turf/open/floor/plasteel,
 /area/ship/hallway/central)
+"Qz" = (
+/obj/structure/table/reinforced,
+/obj/effect/turf_decal/corner/opaque/lime{
+	dir = 4
+	},
+/obj/structure/window/plasma/reinforced/unanchored,
+/obj/machinery/door/window{
+	dir = 8;
+	icon_state = "right";
+	name = "Medical Supplies";
+	opacity = 1
+	},
+/obj/item/storage/firstaid/regular,
+/obj/item/storage/firstaid/toxin,
+/obj/item/storage/firstaid/radiation,
+/turf/open/floor/plasteel/white,
+/area/ship/medical)
+"QB" = (
+/obj/machinery/light/directional/south,
+/turf/open/floor/wood,
+/area/ship/cargo/office)
 "QD" = (
 /obj/machinery/atmospherics/components/binary/volume_pump,
 /obj/effect/turf_decal/industrial/warning/corner{
@@ -6543,16 +6977,14 @@
 /obj/structure/disposalpipe/segment{
 	dir = 8
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 4
-	},
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
 /obj/effect/turf_decal/trimline/opaque/blue/corner,
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+	dir = 1
+	},
 /turf/open/floor/plasteel/white,
 /area/ship/medical)
 "QI" = (
@@ -6591,6 +7023,20 @@
 	},
 /turf/open/floor/plasteel/white,
 /area/ship/medical)
+"QQ" = (
+/obj/structure/disposalpipe/segment{
+	dir = 2
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/effect/turf_decal/corner/transparent/neutral{
+	dir = 4
+	},
+/turf/open/floor/plasteel,
+/area/ship/hallway/central)
 "QW" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
 	dir = 8
@@ -6602,7 +7048,7 @@
 /obj/structure/sign/number/one{
 	color = "Black"
 	},
-/turf/closed/wall/mineral/titanium/nodiagonal,
+/turf/closed/wall/mineral/plastitanium,
 /area/ship/cargo/office)
 "Ri" = (
 /obj/structure/cable{
@@ -6616,11 +7062,16 @@
 	},
 /turf/open/floor/plasteel/patterned/grid,
 /area/ship/engineering/atmospherics)
+"Rm" = (
+/obj/structure/table/wood,
+/obj/machinery/printer,
+/turf/open/floor/wood,
+/area/ship/cargo/office)
 "Ro" = (
 /turf/closed/wall/mineral/titanium/nodiagonal,
 /area/ship/crew/toilet)
 "Rq" = (
-/turf/closed/wall/mineral/titanium,
+/turf/closed/wall/mineral/plastitanium,
 /area/ship/crew/dorm)
 "Rr" = (
 /turf/open/floor/plasteel/stairs/left{
@@ -6686,15 +7137,28 @@
 	},
 /obj/item/stack/sheet/mineral/plasma/twenty,
 /obj/machinery/light/directional/north,
+/obj/item/storage/box/stockparts/t3,
 /turf/open/floor/plasteel/tech/techmaint,
 /area/ship/engineering)
-"RI" = (
-/obj/structure/disposalpipe/trunk{
+"RH" = (
+/obj/effect/turf_decal/corner/opaque/lime{
+	dir = 8
+	},
+/obj/effect/turf_decal/corner/opaque/lime{
 	dir = 1
 	},
-/obj/machinery/disposal/bin,
-/obj/structure/sign/warning/nosmoking/circle{
-	pixel_x = 25
+/obj/effect/turf_decal/corner/opaque/lime{
+	dir = 4
+	},
+/turf/open/floor/plasteel/white,
+/area/ship/medical)
+"RI" = (
+/obj/structure/disposalpipe/trunk{
+	dir = 1
+	},
+/obj/machinery/disposal/bin,
+/obj/structure/sign/warning/nosmoking/circle{
+	pixel_x = 25
 	},
 /obj/structure/sign/poster/official/moth/smokey{
 	pixel_y = -32
@@ -6728,6 +7192,11 @@
 /obj/structure/disposalpipe/segment,
 /turf/open/floor/plasteel,
 /area/ship/cargo)
+"RT" = (
+/obj/structure/bookcase/random,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/turf/open/floor/wood/bamboo,
+/area/ship/cargo/office)
 "RU" = (
 /obj/structure/table/wood,
 /obj/item/toy/plush/carpplushie,
@@ -6767,11 +7236,9 @@
 /turf/open/floor/plasteel/white,
 /area/ship/medical)
 "Se" = (
-/obj/structure/disposalpipe/segment{
-	dir = 10
-	},
-/turf/open/floor/plasteel/white,
-/area/ship/science)
+/obj/machinery/airalarm/directional/south,
+/turf/open/floor/wood,
+/area/ship/cargo/office)
 "Si" = (
 /obj/structure/disposalpipe/segment{
 	dir = 2
@@ -6880,6 +7347,7 @@
 	dir = 5
 	},
 /obj/item/radio/intercom/directional/west,
+/obj/item/gps,
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
 "SO" = (
@@ -6921,19 +7389,6 @@
 /obj/structure/disposalpipe/junction/flip{
 	dir = 4
 	},
-/obj/structure/closet/secure_closet{
-	icon_state = "cargo";
-	name = "\proper cargo technician's locker";
-	req_access_txt = "31"
-	},
-/obj/item/storage/backpack,
-/obj/item/storage/backpack/satchel,
-/obj/item/storage/backpack/messenger,
-/obj/item/storage/backpack/duffelbag,
-/obj/item/clothing/shoes/sneakers/black,
-/obj/item/clothing/under/rank/cargo/tech/skirt,
-/obj/item/clothing/under/rank/cargo/tech,
-/obj/item/clothing/head/safety_helmet,
 /obj/machinery/airalarm/directional/south,
 /turf/open/floor/plasteel,
 /area/ship/cargo/office)
@@ -6950,6 +7405,21 @@
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/crew/cryo)
 "SW" = (
+/obj/structure/closet/secure_closet{
+	icon_state = "science";
+	name = "scientist's locker";
+	req_access_txt = "47"
+	},
+/obj/item/storage/backpack/duffelbag,
+/obj/item/storage/backpack/messenger/tox,
+/obj/item/storage/backpack/satchel/tox,
+/obj/item/storage/backpack/science,
+/obj/item/clothing/shoes/sneakers/white,
+/obj/item/clothing/under/rank/rnd/scientist/skirt,
+/obj/item/clothing/under/rank/rnd/scientist,
+/obj/item/clothing/suit/toggle/labcoat/science,
+/obj/item/clothing/glasses/science,
+/obj/structure/extinguisher_cabinet/directional/north,
 /obj/machinery/button/door{
 	dir = 8;
 	id = "ospreysci_window";
@@ -6991,12 +7461,13 @@
 /turf/open/floor/plasteel/patterned/grid,
 /area/ship/engineering)
 "Ti" = (
-/obj/machinery/conveyor/inverted{
-	dir = 5;
-	id = "osprey_production"
+/obj/effect/turf_decal/corner/opaque/blue{
+	dir = 4
 	},
-/turf/open/floor/plating,
-/area/ship/cargo)
+/obj/effect/turf_decal/corner/opaque/blue,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/turf/open/floor/plasteel/white,
+/area/ship/medical)
 "Tn" = (
 /obj/structure/cable{
 	icon_state = "0-8"
@@ -7106,6 +7577,9 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
+/obj/effect/turf_decal/corner/transparent/neutral{
+	dir = 8
+	},
 /turf/open/floor/plasteel,
 /area/ship/hallway/central)
 "TJ" = (
@@ -7169,7 +7643,7 @@
 /area/ship/cargo)
 "TZ" = (
 /obj/effect/turf_decal/industrial/outline/yellow,
-/obj/machinery/rnd/production/circuit_imprinter/department/science,
+/obj/machinery/rnd/production/circuit_imprinter,
 /turf/open/floor/plasteel/dark,
 /area/ship/science)
 "Uc" = (
@@ -7192,12 +7666,16 @@
 /turf/open/floor/plasteel/patterned/grid,
 /area/ship/engineering/atmospherics)
 "Uj" = (
-/obj/effect/spawner/structure/window/shuttle,
-/obj/machinery/door/poddoor/shutters{
-	id = "ospreywindows"
+/obj/effect/turf_decal/corner/opaque/blue{
+	dir = 8
 	},
-/obj/machinery/door/firedoor/heavy,
-/turf/open/floor/plating,
+/obj/effect/turf_decal/corner/opaque/blue{
+	dir = 1
+	},
+/obj/effect/turf_decal/corner/opaque/blue,
+/obj/machinery/door/airlock/public/glass,
+/obj/machinery/door/firedoor,
+/turf/open/floor/plasteel/white,
 /area/ship/medical)
 "Uo" = (
 /obj/structure/disposalpipe/segment{
@@ -7216,21 +7694,13 @@
 /turf/open/floor/plasteel/patterned/grid,
 /area/ship/engineering/atmospherics)
 "UB" = (
-/obj/machinery/sleeper{
-	dir = 4
-	},
 /obj/effect/turf_decal/corner/opaque/lime{
 	dir = 1
 	},
 /obj/effect/turf_decal/corner/opaque/lime{
 	dir = 4
 	},
-/obj/effect/turf_decal/corner/opaque/lime{
-	dir = 8
-	},
-/obj/structure/sign/warning/nosmoking/circle{
-	pixel_x = -25
-	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /turf/open/floor/plasteel/white,
 /area/ship/medical)
 "UG" = (
@@ -7277,7 +7747,7 @@
 /area/ship/medical)
 "Vl" = (
 /obj/structure/sign/warning/vacuum/external,
-/turf/closed/wall/mineral/titanium/nodiagonal,
+/turf/closed/wall/mineral/plastitanium,
 /area/ship/cargo)
 "Vq" = (
 /obj/machinery/conveyor{
@@ -7401,6 +7871,9 @@
 /obj/machinery/light/directional/south,
 /turf/open/floor/plasteel/freezer,
 /area/ship/crew/toilet)
+"VU" = (
+/turf/open/floor/wood,
+/area/ship/cargo/office)
 "VV" = (
 /turf/closed/wall/mineral/titanium/nodiagonal,
 /area/ship/science/ai_chamber)
@@ -7440,14 +7913,13 @@
 /turf/open/floor/plasteel,
 /area/ship/cargo)
 "Wj" = (
-/obj/machinery/mineral/processing_unit,
 /turf/open/floor/plating,
 /area/ship/cargo)
 "Wk" = (
 /obj/structure/sign/number/four{
 	color = "Black"
 	},
-/turf/closed/wall/mineral/titanium/nodiagonal,
+/turf/closed/wall/mineral/plastitanium,
 /area/ship/cargo/office)
 "Wn" = (
 /obj/structure/table/wood,
@@ -7463,6 +7935,9 @@
 	},
 /turf/template_noop,
 /area/template_noop)
+"Wr" = (
+/turf/open/floor/wood/bamboo,
+/area/ship/cargo/office)
 "Ws" = (
 /obj/structure/chair/comfy/orange/directional/east,
 /obj/effect/landmark/start/head_of_personnel,
@@ -7512,6 +7987,10 @@
 "WU" = (
 /turf/closed/wall/mineral/titanium/nodiagonal,
 /area/ship/engineering)
+"WV" = (
+/obj/machinery/light/directional/east,
+/turf/open/floor/wood/bamboo,
+/area/ship/cargo/office)
 "WZ" = (
 /obj/machinery/door/airlock/public/glass{
 	name = "Canteen";
@@ -7670,6 +8149,19 @@
 	},
 /turf/open/floor/plasteel/patterned/grid,
 /area/ship/engineering)
+"XP" = (
+/obj/effect/turf_decal/corner/opaque/mauve{
+	dir = 4
+	},
+/obj/effect/turf_decal/corner/opaque/mauve{
+	dir = 1
+	},
+/obj/effect/turf_decal/corner/opaque/mauve{
+	dir = 8
+	},
+/obj/machinery/computer/mech_bay_power_console,
+/turf/open/floor/plasteel/white,
+/area/ship/science)
 "XR" = (
 /obj/structure/disposalpipe/segment{
 	dir = 2
@@ -7712,6 +8204,11 @@
 	},
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/hallway/central)
+"XY" = (
+/obj/structure/bookcase/random,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/turf/open/floor/wood/bamboo,
+/area/ship/cargo/office)
 "Yc" = (
 /obj/machinery/atmospherics/pipe/simple/orange/visible,
 /turf/open/floor/plasteel/patterned/grid,
@@ -7742,16 +8239,23 @@
 /obj/machinery/light/small/directional/east,
 /turf/open/floor/plasteel,
 /area/ship/crew/cryo)
+"Yz" = (
+/obj/structure/chair/stool,
+/turf/open/floor/wood,
+/area/ship/cargo/office)
 "YD" = (
 /obj/structure/chair/office/light,
 /obj/effect/landmark/start/medical_doctor,
+/obj/effect/turf_decal/corner/opaque/blue{
+	dir = 8
+	},
+/obj/effect/turf_decal/corner/opaque/blue{
+	dir = 1
+	},
+/obj/effect/turf_decal/corner/opaque/blue,
 /turf/open/floor/plasteel/white,
 /area/ship/medical)
 "YF" = (
-/obj/structure/table,
-/obj/item/paper_bin,
-/obj/item/clipboard,
-/obj/item/pen/red,
 /obj/machinery/button/door{
 	dir = 4;
 	id = "ospreycargo";
@@ -7773,18 +8277,7 @@
 /obj/effect/turf_decal/corner/opaque/brown{
 	dir = 8
 	},
-/obj/item/folder/yellow,
-/obj/item/stamp/denied{
-	pixel_x = 4
-	},
-/obj/item/stamp{
-	pixel_x = -5;
-	pixel_y = 9
-	},
-/obj/item/pen/red,
-/obj/item/holochip{
-	credits = 4000
-	},
+/obj/structure/table,
 /turf/open/floor/plasteel,
 /area/ship/cargo/office)
 "YH" = (
@@ -7826,10 +8319,6 @@
 /turf/open/floor/plasteel/white,
 /area/ship/medical)
 "YP" = (
-/obj/machinery/disposal/bin,
-/obj/structure/disposalpipe/trunk{
-	dir = 4
-	},
 /obj/effect/turf_decal/corner/opaque/mauve{
 	dir = 1
 	},
@@ -7849,6 +8338,18 @@
 	},
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
+"YV" = (
+/obj/effect/turf_decal/corner/opaque/pink{
+	dir = 1
+	},
+/obj/effect/turf_decal/corner/opaque/pink{
+	dir = 8
+	},
+/obj/machinery/stasis{
+	dir = 4
+	},
+/turf/open/floor/plasteel/white,
+/area/ship/medical)
 "Zj" = (
 /obj/structure/tank_dispenser/oxygen,
 /obj/effect/turf_decal/borderfloor{
@@ -7897,6 +8398,10 @@
 	},
 /turf/open/floor/plasteel,
 /area/ship/cargo)
+"ZB" = (
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
+/turf/open/floor/plasteel/white,
+/area/ship/medical)
 "ZC" = (
 /obj/structure/cable{
 	icon_state = "0-4"
@@ -7906,7 +8411,7 @@
 /turf/open/floor/plasteel/dark,
 /area/ship/hallway/central)
 "ZJ" = (
-/turf/closed/wall/mineral/titanium/nodiagonal,
+/turf/closed/wall/mineral/plastitanium,
 /area/ship/hallway/central)
 "ZK" = (
 /obj/structure/window/reinforced{
@@ -7920,10 +8425,28 @@
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
 	dir = 8
 	},
+/obj/machinery/porta_turret/ai,
 /turf/open/floor/circuit,
 /area/ship/science/ai_chamber)
 "ZR" = (
-/obj/machinery/porta_turret/ai,
+/obj/structure/rack,
+/obj/item/aiModule/core/freeformcore,
+/obj/item/aiModule/reset/purge{
+	pixel_y = 5
+	},
+/obj/item/aiModule/core/full/corp,
+/obj/item/aiModule/core/full/asimov,
+/obj/item/mmi/posibrain,
+/obj/item/borg/upgrade/ai,
+/obj/item/borg/upgrade/ai,
+/obj/item/aicard,
+/obj/machinery/door/window/brigdoor/westleft,
+/obj/machinery/door/window/brigdoor/westleft{
+	dir = 4;
+	req_one_access_txt = "61"
+	},
+/obj/structure/window/plasma/reinforced/spawner,
+/obj/structure/window/plasma/reinforced/spawner/north,
 /turf/open/floor/circuit,
 /area/ship/science/ai_chamber)
 "ZW" = (
@@ -7947,24 +8470,24 @@
 /area/ship/science/ai_chamber)
 "ZY" = (
 /obj/effect/turf_decal/industrial/outline/yellow,
-/obj/machinery/rnd/production/protolathe/department/science,
+/obj/machinery/rnd/production/protolathe,
 /turf/open/floor/plasteel/dark,
 /area/ship/science)
 "ZZ" = (
 /obj/structure/sign/nanotrasen,
-/turf/closed/wall/mineral/titanium/nodiagonal,
+/turf/closed/wall/mineral/plastitanium,
 /area/ship/crew/cryo)
 
 (1,1,1) = {"
 li
-WU
+MM
 pD
 pD
 rG
 rG
 pD
 pD
-WU
+MM
 li
 li
 li
@@ -7980,26 +8503,26 @@ li
 li
 li
 li
-yj
+IY
 Hk
 Hk
 wT
 wT
 Hk
 Hk
-yj
+IY
 li
 "}
 (2,1,1) = {"
 li
-WU
+MM
 Tn
 VA
 qX
 Tr
 Tn
 VA
-WU
+MM
 li
 li
 li
@@ -8015,26 +8538,26 @@ li
 li
 li
 li
-yj
+IY
 wo
 wQ
 kB
 hU
 wo
 wQ
-yj
+IY
 li
 "}
 (3,1,1) = {"
 li
-WU
+MM
 eE
 eE
 EW
 LB
 eE
 eE
-WU
+MM
 li
 li
 li
@@ -8050,26 +8573,26 @@ li
 li
 li
 li
-yj
+IY
 kG
 kG
 cJ
 cJ
 kG
 kG
-yj
+IY
 li
 "}
 (4,1,1) = {"
 li
-WU
+MM
 pP
 ap
 KC
 Gr
 oi
 mZ
-WU
+MM
 li
 li
 li
@@ -8085,26 +8608,26 @@ li
 li
 li
 li
-yj
+IY
 Iv
 Bl
 Tz
 ra
 Ri
 dS
-yj
+IY
 li
 "}
 (5,1,1) = {"
 li
-WU
+MM
 NT
 Yc
 RY
 SD
 BN
 ci
-WU
+MM
 MM
 li
 li
@@ -8120,7 +8643,7 @@ li
 li
 li
 IY
-yj
+IY
 pT
 pH
 kb
@@ -8132,7 +8655,7 @@ li
 "}
 (6,1,1) = {"
 li
-WU
+MM
 qc
 PS
 Fj
@@ -8140,17 +8663,17 @@ QD
 vY
 yg
 Tg
-WU
+MM
 ao
 kP
 uz
-VV
-VV
-VV
-VV
-VV
-VV
-VV
+FN
+FN
+FN
+FN
+FN
+FN
+FN
 ao
 kP
 uz
@@ -8167,7 +8690,7 @@ li
 "}
 (7,1,1) = {"
 li
-WU
+MM
 qa
 gX
 hr
@@ -8175,21 +8698,21 @@ vx
 XK
 jn
 MT
-VV
+FN
 Aj
-VV
+FN
 HE
-VV
+FN
 kU
 VV
 yP
 VV
-kU
-VV
+Bx
+FN
 pe
 eZ
 ZX
-VV
+FN
 RB
 qp
 HV
@@ -8202,7 +8725,7 @@ li
 "}
 (8,1,1) = {"
 li
-WU
+MM
 RE
 JO
 uh
@@ -8232,12 +8755,12 @@ sq
 sw
 cp
 Uc
-yj
+IY
 li
 "}
 (9,1,1) = {"
 li
-WU
+MM
 Hf
 gX
 oQ
@@ -8267,12 +8790,12 @@ HK
 hm
 HK
 Qb
-yj
+IY
 li
 "}
 (10,1,1) = {"
 li
-WU
+MM
 Mu
 Ix
 WK
@@ -8302,12 +8825,12 @@ lV
 Mo
 eX
 fU
-yj
+IY
 li
 "}
 (11,1,1) = {"
 li
-WU
+MM
 Qv
 lz
 Em
@@ -8337,12 +8860,12 @@ NP
 yj
 pJ
 gC
-yj
+IY
 li
 "}
 (12,1,1) = {"
 li
-WU
+MM
 Zo
 LF
 LK
@@ -8372,12 +8895,12 @@ lM
 yj
 oo
 oo
-yj
+IY
 li
 "}
 (13,1,1) = {"
 li
-WU
+MM
 bH
 Xz
 OA
@@ -8407,12 +8930,12 @@ RI
 yj
 ik
 lA
-yj
+IY
 li
 "}
 (14,1,1) = {"
 li
-WU
+MM
 WU
 WU
 WU
@@ -8442,7 +8965,7 @@ yj
 yj
 yj
 yj
-yj
+IY
 li
 "}
 (15,1,1) = {"
@@ -8488,7 +9011,7 @@ Tq
 rJ
 bl
 yQ
-sJ
+OE
 sJ
 gy
 yE
@@ -8552,7 +9075,7 @@ li
 "}
 (18,1,1) = {"
 li
-IW
+Rq
 iO
 KD
 fb
@@ -8567,7 +9090,7 @@ gT
 wn
 UL
 YR
-UL
+UT
 UT
 UL
 Ry
@@ -8582,12 +9105,12 @@ ea
 yI
 Su
 dw
-gV
+PP
 li
 "}
 (19,1,1) = {"
 li
-IW
+Rq
 fc
 pv
 iv
@@ -8617,12 +9140,12 @@ PJ
 UZ
 uk
 SU
-gV
+PP
 li
 "}
 (20,1,1) = {"
 li
-IW
+Rq
 rz
 SO
 Xv
@@ -8652,12 +9175,12 @@ tp
 yl
 gB
 sI
-gV
+PP
 li
 "}
 (21,1,1) = {"
 li
-IW
+Rq
 Oh
 hv
 LV
@@ -8667,16 +9190,16 @@ IW
 bh
 Cn
 mg
-Cn
-ak
-ak
-ak
 ak
+Mp
+Mp
+Mp
+Mp
 Ni
-ak
-ak
-ak
-ak
+Mp
+Mp
+Mp
+Mp
 in
 RW
 Cn
@@ -8687,22 +9210,22 @@ FL
 FL
 FL
 EO
-gV
+PP
 li
 "}
 (22,1,1) = {"
 li
 Rq
-IW
+Rq
 FZ
 xN
 ET
-IW
-IW
+Rq
+Rq
 ZJ
 Es
 cY
-Nd
+QQ
 Nd
 Si
 Nd
@@ -8716,12 +9239,12 @@ eG
 Qy
 Ge
 ZJ
-gV
-gV
+PP
+PP
 bs
 Fr
 Wb
-gV
+PP
 PP
 li
 "}
@@ -8734,7 +9257,7 @@ YI
 YI
 Rq
 li
-sG
+ZJ
 su
 ZJ
 AB
@@ -8750,7 +9273,7 @@ zU
 uN
 ZJ
 kV
-sG
+ZJ
 li
 PP
 EN
@@ -8771,8 +9294,8 @@ li
 li
 li
 li
-sG
-cq
+ZJ
+jh
 cq
 cq
 cq
@@ -8782,8 +9305,8 @@ cq
 WZ
 zy
 cq
-cq
-sG
+jh
+ZJ
 li
 li
 li
@@ -8912,7 +9435,7 @@ li
 li
 li
 li
-cq
+jh
 lY
 rH
 gt
@@ -8953,7 +9476,7 @@ rH
 rH
 sl
 sC
-qw
+xb
 ly
 pK
 lh
@@ -9017,7 +9540,7 @@ li
 li
 li
 li
-cq
+jh
 DK
 tO
 qN
@@ -9027,12 +9550,12 @@ DA
 yq
 tT
 DY
-cq
-li
-li
-li
-li
-li
+jh
+iI
+iI
+iI
+iI
+iI
 li
 li
 li
@@ -9047,12 +9570,12 @@ li
 li
 li
 li
-li
-li
-li
-li
-li
-Zr
+Cv
+Cv
+Cv
+Cv
+Cv
+Cv
 Zr
 Zr
 Zr
@@ -9062,14 +9585,14 @@ Zr
 ke
 xB
 Zr
-Zr
-li
-li
-li
-li
-li
-li
-li
+Cv
+DC
+OT
+OT
+DC
+iI
+iI
+iI
 li
 li
 li
@@ -9081,13 +9604,13 @@ li
 li
 li
 li
-li
-li
-li
-li
-li
-li
-Zr
+Cv
+Cv
+OK
+YV
+YV
+Kh
+Ph
 ux
 Xl
 KE
@@ -9097,14 +9620,14 @@ Zr
 eP
 dN
 Ih
-Zr
-li
-li
-li
-li
-li
-li
-li
+Cv
+Wr
+Wr
+Wr
+Wr
+gL
+qR
+iI
 li
 li
 li
@@ -9116,13 +9639,13 @@ li
 li
 li
 li
-li
-li
-li
-li
-li
-li
-Uj
+Cv
+tz
+wa
+WN
+WN
+WN
+WN
 Bc
 WN
 Vh
@@ -9131,16 +9654,16 @@ aW
 nL
 PV
 FP
-HU
+fO
 Uj
-li
-li
-li
-li
-li
-li
-li
-li
+Wr
+Wr
+Wr
+nT
+bO
+QB
+iI
+iI
 li
 li
 li
@@ -9151,31 +9674,31 @@ li
 li
 li
 li
-li
-li
-li
-li
-li
-li
-Uj
+Cv
+IC
+FS
+jV
+NH
+NH
+NH
 Dj
 NH
-WN
+Ti
 CQ
 Lc
 OS
 QE
 uE
 HU
-Uj
-li
-li
-li
-li
-li
-li
-li
-li
+qr
+bS
+XY
+cU
+nT
+VU
+Yz
+rh
+iI
 li
 li
 li
@@ -9186,15 +9709,15 @@ li
 li
 li
 li
-li
-li
-li
-li
-li
-li
-Zr
-Zr
-Zr
+Cv
+PD
+JZ
+JZ
+JZ
+cb
+MH
+RH
+Cs
 aI
 un
 YD
@@ -9203,14 +9726,14 @@ zQ
 vl
 jk
 Zr
-li
-li
-li
-li
-li
-li
-li
-li
+Wr
+gz
+gz
+nT
+GQ
+Yz
+io
+iI
 li
 li
 li
@@ -9221,31 +9744,31 @@ li
 li
 li
 li
-li
-li
-li
-li
-li
-li
-Uj
+Cv
+ve
+va
+gH
+it
+pf
+nN
 UB
 it
-WN
-CQ
+it
+ZB
 Hx
 oW
 Qm
 Ac
 wr
-Uj
-li
-li
-li
-li
-li
-li
-li
-li
+Pp
+jR
+RT
+dF
+nT
+Rm
+Se
+iI
+iI
 li
 li
 li
@@ -9256,13 +9779,13 @@ li
 li
 li
 li
-li
-li
-li
-li
-li
-li
-Uj
+Cv
+Cv
+MI
+va
+WN
+WN
+WN
 IU
 WN
 gH
@@ -9271,15 +9794,15 @@ yc
 Zr
 Sm
 il
-wr
-Uj
-li
-li
-li
-li
-li
-li
-li
+OF
+pi
+Wr
+gk
+gk
+nT
+vQ
+QB
+iI
 li
 li
 li
@@ -9292,12 +9815,12 @@ li
 li
 li
 li
-li
-li
-li
-li
-CF
-Zr
+Cv
+Cv
+nC
+ya
+rA
+Qz
 wR
 JD
 gg
@@ -9307,14 +9830,14 @@ Zr
 CH
 QK
 Sd
-Zr
+Cv
 CF
-li
-li
-li
-li
-li
-li
+Wr
+WV
+nT
+mE
+Jk
+iI
 li
 li
 li
@@ -9328,28 +9851,28 @@ li
 li
 li
 li
-li
-hh
+LA
 IL
 IL
 IL
 IL
-Zr
+IL
+Cv
 cd
 cd
 dE
 Zr
 xJ
 oX
-Pl
-Pl
-Pl
-Pl
 iI
-li
-li
-li
-li
+iI
+uL
+uL
+iI
+iI
+iI
+iI
+iI
 li
 li
 li
@@ -9364,7 +9887,7 @@ li
 li
 li
 hh
-IL
+XP
 YP
 my
 kL
@@ -9379,10 +9902,10 @@ Xe
 Pl
 YF
 Ie
-nT
-Pl
+Ie
+iI
+iI
 iI
-li
 li
 li
 li
@@ -9398,9 +9921,9 @@ li
 li
 li
 li
-IL
+hh
 qb
-Se
+hG
 co
 Oj
 pL
@@ -9416,7 +9939,7 @@ AS
 mW
 tH
 Nv
-Pl
+iI
 li
 li
 li
@@ -9433,7 +9956,7 @@ li
 li
 li
 li
-IL
+hh
 ct
 hG
 Iq
@@ -9451,7 +9974,7 @@ aL
 mF
 ZW
 Zs
-Pl
+iI
 li
 li
 li
@@ -9468,7 +9991,7 @@ li
 li
 li
 li
-IL
+hh
 PE
 Vf
 iM
@@ -9486,7 +10009,7 @@ kS
 yn
 mq
 SG
-Pl
+iI
 li
 li
 li
@@ -9503,7 +10026,7 @@ li
 li
 li
 li
-IL
+hh
 fF
 TG
 ss
@@ -9521,7 +10044,7 @@ Nr
 tH
 IT
 SR
-Pl
+iI
 li
 li
 li
@@ -9652,7 +10175,7 @@ IL
 Hy
 yd
 IX
-CA
+qt
 Gk
 gw
 QJ
@@ -9714,9 +10237,9 @@ li
 li
 li
 iw
-Cv
+iw
 bT
-Ti
+Wj
 Wj
 Wc
 yd
@@ -9730,7 +10253,7 @@ ZK
 iZ
 wd
 ry
-Cv
+iw
 iw
 li
 li
@@ -9749,7 +10272,7 @@ li
 li
 li
 li
-Cv
+iw
 fh
 mu
 OG
@@ -9765,7 +10288,7 @@ Fs
 NA
 Cj
 TP
-Cv
+iw
 li
 li
 li
@@ -9785,7 +10308,7 @@ li
 li
 li
 iw
-Cv
+iw
 Gw
 cN
 jo
@@ -9799,7 +10322,7 @@ yT
 na
 ML
 Oq
-Cv
+iw
 iw
 li
 li
@@ -9821,19 +10344,19 @@ li
 li
 li
 iw
-Cv
-Cv
-Cv
-Cv
+iw
+iw
+iw
+iw
 wx
 Gt
 Gt
 Gt
 Os
 Vl
-Cv
-Cv
-Cv
+iw
+iw
+iw
 iw
 li
 li
@@ -9858,7 +10381,7 @@ li
 li
 li
 iw
-Cv
+iw
 Dq
 fJ
 fJ
@@ -9866,7 +10389,7 @@ hQ
 fJ
 fJ
 qM
-Cv
+iw
 iw
 li
 li
@@ -9893,7 +10416,7 @@ li
 li
 li
 li
-Cv
+iw
 li
 li
 li
@@ -9901,7 +10424,7 @@ li
 li
 li
 li
-Cv
+iw
 li
 li
 li