diff --git a/_maps/map_files/LayeniaStation/LayeniaStation.dmm b/_maps/map_files/LayeniaStation/LayeniaStation.dmm
index a406278ea..82c2b07f2 100644
--- a/_maps/map_files/LayeniaStation/LayeniaStation.dmm
+++ b/_maps/map_files/LayeniaStation/LayeniaStation.dmm
@@ -795,7 +795,9 @@
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
-/obj/structure/chair/bench/right,
+/obj/structure/chair/bench/left{
+	dir = 1
+	},
 /turf/open/floor/plasteel/chapel,
 /area/chapel/main)
 "acs" = (
@@ -1824,7 +1826,9 @@
 /turf/open/floor/plating/layenia,
 /area/layenia)
 "aeY" = (
-/obj/structure/chair/bench/left,
+/obj/structure/chair/bench/right{
+	dir = 1
+	},
 /turf/open/floor/plasteel/dark{
 	dir = 8;
 	icon_state = "darkfull_trim"
@@ -3233,6 +3237,23 @@
 	},
 /turf/open/floor/plasteel,
 /area/construction/mining/aux_base)
+"ahP" = (
+/obj/structure/railing/handrail{
+	dir = 4
+	},
+/obj/effect/turf_decal/loading_area{
+	dir = 9;
+	icon_state = "steel_panel";
+	name = "steel pannel"
+	},
+/obj/structure/chair/bench/metal/left{
+	dir = 8
+	},
+/turf/open/floor/plasteel{
+	dir = 4;
+	icon_state = "floor_plate"
+	},
+/area/medical/medbay/upper)
 "ahQ" = (
 /obj/structure/cable{
 	icon_state = "1-4"
@@ -4087,7 +4108,8 @@
 	icon_state = "drain";
 	name = "drain"
 	},
-/obj/structure/railing/handrail{
+/obj/structure/railing,
+/obj/structure/railing{
 	dir = 8
 	},
 /turf/open/floor/wood,
@@ -5504,12 +5526,7 @@
 /turf/open/floor/plasteel/dark,
 /area/security/checkpoint/medical)
 "aBC" = (
-/obj/effect/turf_decal/loading_area{
-	dir = 4;
-	icon_state = "drain";
-	name = "drain"
-	},
-/turf/open/floor/plasteel/layenia,
+/turf/open/floor/plasteel,
 /area/artatrium)
 "aBG" = (
 /obj/structure/chair/comfy/black{
@@ -5927,7 +5944,9 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer3{
 	name = "air supply pipe"
 	},
-/obj/structure/chair/bench,
+/obj/structure/chair/bench{
+	dir = 1
+	},
 /turf/open/floor/plasteel/chapel{
 	dir = 4
 	},
@@ -6284,6 +6303,26 @@
 "aLX" = (
 /turf/open/floor/wood,
 /area/maintenance/fore)
+"aMb" = (
+/obj/effect/turf_decal/loading_area{
+	dir = 4;
+	icon_state = "drain";
+	name = "drain"
+	},
+/obj/effect/turf_decal/tile/blue{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/neutral{
+	dir = 8
+	},
+/obj/structure/sign/nanotrasen{
+	pixel_x = 32
+	},
+/turf/open/floor/plasteel{
+	dir = 4;
+	icon_state = "floor_plate"
+	},
+/area/hallway/primary/aft/upper)
 "aMl" = (
 /obj/machinery/door/airlock/command/glass{
 	dir = 8;
@@ -10314,7 +10353,12 @@
 /area/security/checkpoint/supply)
 "bLq" = (
 /obj/structure/table/wood,
-/turf/open/floor/plasteel/layenia,
+/obj/effect/turf_decal/loading_area{
+	dir = 1;
+	icon_state = "drain";
+	name = "drain"
+	},
+/turf/open/floor/plasteel,
 /area/artatrium)
 "bLu" = (
 /obj/machinery/atmospherics/components/binary/pump{
@@ -11412,7 +11456,9 @@
 /area/engine/atmos)
 "cdu" = (
 /obj/effect/turf_decal/stripes/line,
-/obj/structure/chair/bench/metal/right,
+/obj/structure/chair/bench/metal/left{
+	dir = 1
+	},
 /turf/open/floor/plasteel{
 	icon_state = "floor_plate"
 	},
@@ -23811,6 +23857,13 @@
 	},
 /turf/open/floor/plasteel,
 /area/engine/break_room)
+"eUB" = (
+/obj/machinery/light{
+	dir = 4;
+	pixel_x = 7
+	},
+/turf/open/transparent/openspace,
+/area/medical/medbay/upper)
 "eUF" = (
 /obj/machinery/atmospherics/pipe/simple/multiz,
 /turf/open/floor/plating,
@@ -24367,6 +24420,13 @@
 	},
 /turf/open/floor/plasteel,
 /area/engine/break_room)
+"fcA" = (
+/obj/machinery/light{
+	dir = 8;
+	pixel_x = -7
+	},
+/turf/open/floor/plasteel/white,
+/area/medical/medbay/upper)
 "fcJ" = (
 /obj/structure/railing,
 /obj/effect/turf_decal/tile/blue{
@@ -24423,6 +24483,20 @@
 "fdG" = (
 /turf/open/floor/plasteel/stairs/medium,
 /area/science/xenobiology)
+"fdL" = (
+/obj/structure/table,
+/obj/effect/turf_decal/tile/red{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/red{
+	dir = 4
+	},
+/obj/item/radio/off,
+/obj/item/screwdriver{
+	pixel_y = 10
+	},
+/turf/open/floor/plasteel/dark,
+/area/security/checkpoint/medical)
 "fdN" = (
 /obj/machinery/door/airlock/maintenance{
 	dir = 8;
@@ -26209,7 +26283,6 @@
 	name = "scrubbers pipe"
 	},
 /obj/effect/turf_decal/loading_area{
-	dir = 9;
 	icon_state = "steel_decals_central6_corner";
 	name = "maintenance hatch"
 	},
@@ -26514,16 +26587,6 @@
 /turf/open/floor/plating/layenia,
 /area/layenia)
 "fBc" = (
-/obj/effect/turf_decal/tile/brown{
-	dir = 4
-	},
-/obj/effect/turf_decal/tile/brown{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/brown{
-	dir = 8
-	},
-/obj/effect/turf_decal/tile/brown,
 /obj/machinery/computer/cargo/request{
 	dir = 1
 	},
@@ -26534,7 +26597,12 @@
 	c_tag = "Cargo Office";
 	dir = 10
 	},
-/turf/open/floor/plasteel,
+/obj/effect/turf_decal/loading_area{
+	icon_state = "loadingarea_flip"
+	},
+/turf/open/floor/plasteel/dark{
+	icon_state = "darkfull_whole_alt"
+	},
 /area/quartermaster/office)
 "fBp" = (
 /obj/effect/turf_decal/loading_area{
@@ -27122,6 +27190,13 @@
 "fJp" = (
 /turf/open/floor/plating,
 /area/science/xenobiology)
+"fJN" = (
+/obj/machinery/light{
+	dir = 8;
+	pixel_x = -7
+	},
+/turf/open/transparent/openspace,
+/area/medical/medbay/upper)
 "fJS" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{
 	name = "scrubbers pipe"
@@ -27405,6 +27480,7 @@
 /obj/machinery/computer/secure_data{
 	dir = 1
 	},
+/obj/structure/table/reinforced,
 /turf/open/floor/plasteel/dark,
 /area/security/checkpoint/medical)
 "fOo" = (
@@ -27561,7 +27637,9 @@
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer3{
 	name = "air supply pipe"
 	},
-/obj/structure/chair/bench,
+/obj/structure/chair/bench{
+	dir = 1
+	},
 /turf/open/floor/plasteel/chapel{
 	dir = 4
 	},
@@ -30296,7 +30374,9 @@
 	},
 /area/hallway/primary/aft)
 "gyt" = (
-/obj/structure/chair/bench/metal/right,
+/obj/structure/chair/bench/metal/left{
+	dir = 1
+	},
 /turf/open/floor/plasteel/dark{
 	icon_state = "darkfull_plate"
 	},
@@ -31745,7 +31825,9 @@
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{
 	name = "scrubbers pipe"
 	},
-/obj/structure/chair/bench/left,
+/obj/structure/chair/bench/right{
+	dir = 1
+	},
 /turf/open/floor/plasteel/chapel{
 	dir = 1
 	},
@@ -32397,7 +32479,9 @@
 /obj/machinery/light{
 	pixel_y = -1
 	},
-/obj/structure/chair/bench/metal/left,
+/obj/structure/chair/bench/metal/right{
+	dir = 1
+	},
 /turf/open/floor/plasteel/dark{
 	icon_state = "darkfull_plate"
 	},
@@ -32442,10 +32526,14 @@
 /obj/machinery/light_switch{
 	pixel_x = 23
 	},
-/obj/structure/table,
 /obj/machinery/recharger{
 	pixel_y = 4
 	},
+/obj/item/toy/plush/mammal/freddy{
+	pixel_x = -9;
+	pixel_y = 5
+	},
+/obj/structure/table/reinforced,
 /turf/open/floor/plasteel/dark,
 /area/security/checkpoint/medical)
 "gYU" = (
@@ -33518,7 +33606,6 @@
 /turf/open/floor/plasteel/dark,
 /area/security/checkpoint/supply)
 "hmN" = (
-/obj/structure/railing/handrail,
 /obj/effect/turf_decal/loading_area{
 	icon_state = "drain";
 	name = "drain"
@@ -33528,6 +33615,7 @@
 	icon_state = "drain";
 	name = "drain"
 	},
+/obj/structure/railing,
 /turf/open/floor/wood,
 /area/hallway/primary/aft/upper)
 "hmS" = (
@@ -34101,7 +34189,9 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{
 	name = "scrubbers pipe"
 	},
-/obj/structure/chair/bench/left,
+/obj/structure/chair/bench/right{
+	dir = 1
+	},
 /turf/open/floor/plasteel/chapel{
 	dir = 8
 	},
@@ -34939,7 +35029,9 @@
 	dir = 8;
 	name = "air supply pipe"
 	},
-/obj/structure/chair/bench/left,
+/obj/structure/chair/bench/right{
+	dir = 1
+	},
 /turf/open/floor/plasteel/dark{
 	dir = 8;
 	icon_state = "darkfull_trim"
@@ -34953,7 +35045,9 @@
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{
 	name = "scrubbers pipe"
 	},
-/obj/structure/chair/bench,
+/obj/structure/chair/bench{
+	dir = 1
+	},
 /turf/open/floor/plasteel/chapel{
 	dir = 1
 	},
@@ -34978,7 +35072,9 @@
 /obj/structure/cable{
 	icon_state = "1-4"
 	},
-/obj/structure/chair/bench/right,
+/obj/structure/chair/bench/left{
+	dir = 1
+	},
 /turf/open/floor/plasteel/chapel{
 	dir = 4
 	},
@@ -35867,13 +35963,17 @@
 /turf/open/floor/plasteel/dark,
 /area/ai_monitored/turret_protected/aisat_interior)
 "hLN" = (
-/obj/structure/chair/bench/left,
+/obj/structure/chair/bench/right{
+	dir = 1
+	},
 /turf/open/floor/plasteel/chapel{
 	dir = 8
 	},
 /area/chapel/main)
 "hLO" = (
-/obj/structure/chair/bench,
+/obj/structure/chair/bench{
+	dir = 1
+	},
 /turf/open/floor/plasteel/chapel,
 /area/chapel/main)
 "hLU" = (
@@ -35897,7 +35997,9 @@
 	},
 /area/medical/storage)
 "hLV" = (
-/obj/structure/chair/bench,
+/obj/structure/chair/bench{
+	dir = 1
+	},
 /turf/open/floor/plasteel/chapel{
 	dir = 8
 	},
@@ -36424,6 +36526,19 @@
 	},
 /turf/open/transparent/openspace,
 /area/space)
+"hRG" = (
+/obj/structure/railing/handrail{
+	dir = 1
+	},
+/obj/effect/turf_decal/loading_area{
+	dir = 5;
+	icon_state = "steel_panel";
+	name = "steel pannel"
+	},
+/turf/open/floor/plasteel{
+	icon_state = "floor_plate"
+	},
+/area/medical/medbay/upper)
 "hRK" = (
 /obj/effect/turf_decal/stripes/corner{
 	dir = 8
@@ -36879,7 +36994,9 @@
 /obj/machinery/light{
 	dir = 8
 	},
-/obj/structure/chair/bench/metal/left,
+/obj/structure/chair/bench/metal/right{
+	dir = 1
+	},
 /turf/open/floor/plasteel{
 	icon_state = "floor_plate"
 	},
@@ -39075,10 +39192,6 @@
 /turf/open/floor/plasteel/layenia,
 /area/layenia/cloudlayer)
 "ixk" = (
-/obj/machinery/light{
-	dir = 4;
-	pixel_x = 7
-	},
 /obj/effect/turf_decal/loading_area{
 	dir = 4;
 	icon_state = "steel_panel";
@@ -39255,8 +39368,8 @@
 /turf/open/floor/plasteel/white,
 /area/medical/psych/rec)
 "izq" = (
-/obj/structure/chair/bench/metal/right{
-	dir = 4
+/obj/structure/chair/bench/metal/left{
+	dir = 8
 	},
 /turf/open/floor/plasteel{
 	dir = 4;
@@ -41032,6 +41145,10 @@
 /area/crew_quarters/dorms)
 "iRH" = (
 /obj/structure/table,
+/obj/item/flashlight/lamp/green{
+	pixel_x = 1;
+	pixel_y = 5
+	},
 /turf/open/floor/plasteel{
 	dir = 4;
 	icon_state = "floor_plate"
@@ -41596,7 +41713,12 @@
 /turf/open/floor/wood,
 /area/crew_quarters/heads/hop)
 "iZK" = (
-/turf/open/floor/plasteel/layenia,
+/obj/effect/turf_decal/loading_area{
+	dir = 1;
+	icon_state = "drain";
+	name = "drain"
+	},
+/turf/open/floor/plasteel,
 /area/artatrium)
 "iZU" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{
@@ -42198,6 +42320,16 @@
 	},
 /turf/open/floor/plasteel,
 /area/quartermaster/miningdock)
+"jfY" = (
+/obj/effect/turf_decal/tile/blue,
+/obj/effect/turf_decal/tile/blue{
+	dir = 8
+	},
+/obj/machinery/light{
+	pixel_y = -1
+	},
+/turf/open/floor/plasteel/white,
+/area/medical/medbay/upper)
 "jfZ" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -44963,8 +45095,14 @@
 /obj/structure/sign/painting/library{
 	pixel_y = -24
 	},
-/obj/structure/chair/bench/right,
-/turf/open/floor/plasteel/layenia,
+/obj/effect/turf_decal/loading_area{
+	icon_state = "drain";
+	name = "drain"
+	},
+/obj/structure/chair/bench/left{
+	dir = 1
+	},
+/turf/open/floor/plasteel,
 /area/artatrium)
 "jKz" = (
 /obj/structure/lattice/catwalk,
@@ -51519,8 +51657,8 @@
 /turf/open/floor/plasteel/dark,
 /area/security/brig)
 "llx" = (
-/obj/structure/chair/bench/metal/left{
-	dir = 4
+/obj/structure/chair/bench/metal/right{
+	dir = 8
 	},
 /turf/open/floor/plasteel{
 	dir = 4;
@@ -53446,16 +53584,6 @@
 	},
 /turf/open/floor/plating,
 /area/maintenance/starboard/central)
-"lKX" = (
-/obj/item/twohanded/required/kirbyplants/random,
-/obj/effect/turf_decal/tile/blue{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/blue{
-	dir = 8
-	},
-/turf/open/floor/plasteel/white,
-/area/medical/medbay/upper)
 "lKZ" = (
 /turf/closed/wall/r_wall,
 /area/crew_quarters/kitchen)
@@ -53500,7 +53628,9 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{
 	name = "scrubbers pipe"
 	},
-/obj/structure/chair/bench/left,
+/obj/structure/chair/bench/right{
+	dir = 1
+	},
 /turf/open/floor/plasteel/chapel{
 	dir = 1
 	},
@@ -53529,7 +53659,9 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{
 	name = "scrubbers pipe"
 	},
-/obj/structure/chair/bench,
+/obj/structure/chair/bench{
+	dir = 1
+	},
 /turf/open/floor/plasteel/chapel{
 	dir = 1
 	},
@@ -53841,14 +53973,12 @@
 /area/library)
 "lQF" = (
 /obj/effect/turf_decal/loading_area{
-	dir = 4;
+	dir = 1;
 	icon_state = "drain";
 	name = "drain"
 	},
-/obj/structure/chair/bench/right{
-	dir = 1
-	},
-/turf/open/floor/plasteel/layenia,
+/obj/structure/chair/bench/left,
+/turf/open/floor/plasteel,
 /area/artatrium)
 "lQI" = (
 /obj/effect/turf_decal/loading_area{
@@ -54114,6 +54244,23 @@
 	},
 /turf/open/floor/plasteel/dark,
 /area/quartermaster/miningdock)
+"lTQ" = (
+/obj/structure/railing/handrail{
+	dir = 8
+	},
+/obj/effect/turf_decal/loading_area{
+	dir = 6;
+	icon_state = "steel_panel";
+	name = "steel pannel"
+	},
+/obj/structure/chair/bench/metal/left{
+	dir = 4
+	},
+/turf/open/floor/plasteel{
+	dir = 8;
+	icon_state = "floor_plate"
+	},
+/area/medical/medbay/upper)
 "lTY" = (
 /obj/effect/turf_decal/tile/neutral{
 	dir = 1
@@ -54709,6 +54856,12 @@
 	icon_state = "floor_plate"
 	},
 /area/hydroponics)
+"mak" = (
+/obj/machinery/light{
+	pixel_y = -1
+	},
+/turf/open/transparent/openspace,
+/area/crew_quarters/dorms/upper)
 "map" = (
 /obj/structure/lattice/catwalk,
 /obj/structure/trash_pile,
@@ -54753,8 +54906,8 @@
 	icon_state = "drain";
 	name = "drain"
 	},
-/obj/structure/chair/bench/metal/left{
-	dir = 4
+/obj/structure/chair/bench/metal/right{
+	dir = 8
 	},
 /turf/open/floor/plasteel/white/side{
 	dir = 8
@@ -54972,7 +55125,9 @@
 /turf/open/floor/plasteel,
 /area/hallway/primary/port/fore)
 "mdN" = (
-/obj/structure/chair/bench/metal,
+/obj/structure/chair/bench/metal{
+	dir = 1
+	},
 /turf/open/floor/plasteel/dark{
 	icon_state = "darkfull_plate"
 	},
@@ -55415,8 +55570,8 @@
 /obj/structure/window{
 	dir = 4
 	},
-/obj/structure/chair/bench/metal/left{
-	dir = 4
+/obj/structure/chair/bench/metal/right{
+	dir = 8
 	},
 /turf/open/floor/plasteel{
 	dir = 8;
@@ -55650,8 +55805,9 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{
 	name = "scrubbers pipe"
 	},
-/obj/structure/chair/bench,
-/obj/structure/chair/bench,
+/obj/structure/chair/bench{
+	dir = 1
+	},
 /turf/open/floor/plasteel/chapel{
 	dir = 8
 	},
@@ -56364,9 +56520,7 @@
 /obj/machinery/light{
 	dir = 8
 	},
-/obj/structure/chair/bench/metal/right{
-	dir = 1
-	},
+/obj/structure/chair/bench/metal/left,
 /turf/open/floor/plasteel{
 	dir = 1;
 	icon_state = "floor_plate"
@@ -56376,9 +56530,7 @@
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
-/obj/structure/chair/bench/metal/right{
-	dir = 1
-	},
+/obj/structure/chair/bench/metal/left,
 /turf/open/floor/plasteel{
 	dir = 1;
 	icon_state = "floor_plate"
@@ -56391,9 +56543,7 @@
 /obj/machinery/light{
 	dir = 4
 	},
-/obj/structure/chair/bench/metal/left{
-	dir = 1
-	},
+/obj/structure/chair/bench/metal/right,
 /turf/open/floor/plasteel{
 	dir = 1;
 	icon_state = "floor_plate"
@@ -56538,14 +56688,13 @@
 /turf/open/floor/grass,
 /area/hallway/secondary/exit)
 "mvf" = (
-/obj/effect/turf_decal/tile/neutral{
-	dir = 1
+/obj/effect/turf_decal/loading_area{
+	dir = 1;
+	icon_state = "drain";
+	name = "drain"
 	},
-/obj/effect/turf_decal/tile/neutral,
-/obj/structure/chair/bench/left{
-	dir = 1
-	},
-/turf/open/floor/plasteel/checker,
+/obj/structure/chair/bench/right,
+/turf/open/floor/plasteel,
 /area/artatrium)
 "mvv" = (
 /obj/structure/flora/junglebush/c,
@@ -56873,8 +57022,8 @@
 /obj/structure/cable{
 	icon_state = "2-8"
 	},
-/obj/structure/chair/bench/metal/left{
-	dir = 4
+/obj/structure/chair/bench/metal/right{
+	dir = 8
 	},
 /turf/open/floor/plasteel/dark/side{
 	dir = 8
@@ -58462,7 +58611,9 @@
 	},
 /area/hallway/primary/central)
 "mQV" = (
-/obj/structure/chair/bench/right,
+/obj/structure/chair/bench/left{
+	dir = 1
+	},
 /turf/open/floor/plasteel/chapel,
 /area/chapel/main)
 "mQW" = (
@@ -58609,6 +58760,23 @@
 	},
 /turf/open/floor/plasteel,
 /area/hallway/primary/starboard)
+"mSc" = (
+/obj/structure/railing/handrail{
+	dir = 8
+	},
+/obj/effect/turf_decal/loading_area{
+	dir = 6;
+	icon_state = "steel_panel";
+	name = "steel pannel"
+	},
+/obj/structure/chair/bench/metal/right{
+	dir = 4
+	},
+/turf/open/floor/plasteel{
+	dir = 8;
+	icon_state = "floor_plate"
+	},
+/area/medical/medbay/upper)
 "mSl" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -60718,9 +60886,7 @@
 	c_tag = "Central Hallway North";
 	dir = 6
 	},
-/obj/structure/chair/bench/metal/left{
-	dir = 1
-	},
+/obj/structure/chair/bench/metal/right,
 /turf/open/floor/plasteel{
 	dir = 1;
 	icon_state = "floor_plate"
@@ -60976,18 +61142,44 @@
 	dir = 4;
 	pixel_x = -22
 	},
-/turf/open/floor/plasteel/layenia,
+/obj/effect/turf_decal/loading_area{
+	dir = 1;
+	icon_state = "drain";
+	name = "drain"
+	},
+/obj/effect/turf_decal/loading_area{
+	dir = 8;
+	icon_state = "drain";
+	name = "drain"
+	},
+/obj/effect/turf_decal/loading_area{
+	dir = 4;
+	icon_state = "drain_corner";
+	name = "drain"
+	},
+/turf/open/floor/plasteel,
 /area/artatrium)
 "npK" = (
 /obj/structure/sign/painting/library{
 	pixel_x = 25
 	},
-/obj/effect/turf_decal/tile/neutral{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/neutral,
 /obj/structure/table/wood,
-/turf/open/floor/plasteel/checker,
+/obj/effect/turf_decal/loading_area{
+	dir = 1;
+	icon_state = "drain";
+	name = "drain"
+	},
+/obj/effect/turf_decal/loading_area{
+	dir = 4;
+	icon_state = "drain";
+	name = "drain"
+	},
+/obj/effect/turf_decal/loading_area{
+	dir = 8;
+	icon_state = "drain_corner";
+	name = "drain"
+	},
+/turf/open/floor/plasteel,
 /area/artatrium)
 "npM" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -61570,7 +61762,12 @@
 	dir = 8;
 	pixel_x = -7
 	},
-/turf/open/floor/plasteel/layenia,
+/obj/effect/turf_decal/loading_area{
+	dir = 8;
+	icon_state = "drain";
+	name = "drain"
+	},
+/turf/open/floor/plasteel,
 /area/artatrium)
 "nvS" = (
 /obj/structure/chair/bench/left{
@@ -62572,14 +62769,34 @@
 	pixel_y = -24
 	},
 /obj/structure/table/wood,
-/turf/open/floor/plasteel/layenia,
+/obj/effect/turf_decal/loading_area{
+	icon_state = "drain";
+	name = "drain"
+	},
+/obj/effect/turf_decal/loading_area{
+	dir = 8;
+	icon_state = "drain";
+	name = "drain"
+	},
+/obj/effect/turf_decal/loading_area{
+	dir = 1;
+	icon_state = "drain_corner";
+	name = "drain"
+	},
+/turf/open/floor/plasteel,
 /area/artatrium)
 "nHM" = (
 /obj/structure/sign/painting/library{
 	pixel_y = -24
 	},
-/obj/structure/chair/bench/left,
-/turf/open/floor/plasteel/layenia,
+/obj/effect/turf_decal/loading_area{
+	icon_state = "drain";
+	name = "drain"
+	},
+/obj/structure/chair/bench/right{
+	dir = 1
+	},
+/turf/open/floor/plasteel,
 /area/artatrium)
 "nHO" = (
 /obj/machinery/computer/camera_advanced/xenobio{
@@ -62607,13 +62824,12 @@
 /obj/structure/sign/painting/library{
 	pixel_y = -24
 	},
+/obj/structure/table/wood,
 /obj/effect/turf_decal/loading_area{
-	dir = 4;
 	icon_state = "drain";
 	name = "drain"
 	},
-/obj/structure/table/wood,
-/turf/open/floor/plasteel/layenia,
+/turf/open/floor/plasteel,
 /area/artatrium)
 "nHX" = (
 /obj/structure/rack,
@@ -63257,7 +63473,9 @@
 /turf/open/floor/carpet/black,
 /area/arcade)
 "nQN" = (
-/obj/structure/chair/bench/right,
+/obj/structure/chair/bench/left{
+	dir = 1
+	},
 /turf/open/floor/plasteel/dark{
 	dir = 4;
 	icon_state = "darkfull_trim"
@@ -64681,7 +64899,9 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer3{
 	name = "air supply pipe"
 	},
-/obj/structure/chair/bench,
+/obj/structure/chair/bench{
+	dir = 1
+	},
 /turf/open/floor/plasteel/chapel,
 /area/chapel/main)
 "oey" = (
@@ -64964,6 +65184,18 @@
 /obj/structure/trash_pile,
 /turf/open/floor/plating,
 /area/maintenance/starboard)
+"oie" = (
+/obj/effect/turf_decal/tile/blue{
+	dir = 8
+	},
+/obj/effect/turf_decal/tile/blue,
+/obj/effect/turf_decal/loading_area{
+	dir = 5;
+	icon_state = "steel_panel";
+	name = "steel pannel"
+	},
+/turf/open/floor/plasteel/white/side,
+/area/medical/medbay/upper)
 "oii" = (
 /obj/structure/table,
 /obj/item/stack/sheet/metal/fifty,
@@ -65371,6 +65603,7 @@
 /obj/machinery/computer/crew{
 	dir = 1
 	},
+/obj/structure/table/reinforced,
 /turf/open/floor/plasteel/dark,
 /area/security/checkpoint/medical)
 "one" = (
@@ -65914,8 +66147,8 @@
 	icon_state = "drain";
 	name = "drain"
 	},
-/obj/structure/chair/bench/metal/right{
-	dir = 4
+/obj/structure/chair/bench/metal/left{
+	dir = 8
 	},
 /turf/open/floor/plasteel/white/side{
 	dir = 8
@@ -67905,11 +68138,11 @@
 	},
 /area/hallway/primary/fore)
 "oKb" = (
-/obj/structure/railing/handrail,
 /obj/effect/turf_decal/loading_area{
 	icon_state = "drain";
 	name = "drain"
 	},
+/obj/structure/railing,
 /turf/open/floor/wood,
 /area/hallway/primary/aft/upper)
 "oKc" = (
@@ -68363,8 +68596,8 @@
 /obj/structure/window{
 	dir = 4
 	},
-/obj/structure/chair/bench/metal/right{
-	dir = 4
+/obj/structure/chair/bench/metal/left{
+	dir = 8
 	},
 /turf/open/floor/plasteel{
 	dir = 8;
@@ -68463,9 +68696,7 @@
 /obj/effect/turf_decal/tile/blue{
 	dir = 4
 	},
-/obj/structure/chair/bench/metal/right{
-	dir = 1
-	},
+/obj/structure/chair/bench/metal/left,
 /turf/open/floor/plasteel/white,
 /area/medical/medbay/central)
 "oPS" = (
@@ -69282,10 +69513,6 @@
 	dir = 4;
 	name = "air vent"
 	},
-/obj/machinery/light{
-	dir = 8;
-	pixel_x = -7
-	},
 /turf/open/floor/plasteel/white,
 /area/medical/medbay/upper)
 "oWN" = (
@@ -70389,6 +70616,10 @@
 /obj/effect/turf_decal/tile/blue{
 	dir = 1
 	},
+/obj/machinery/light{
+	dir = 8;
+	pixel_x = -7
+	},
 /turf/open/floor/plasteel/white,
 /area/medical/medbay/upper)
 "pjU" = (
@@ -70785,7 +71016,6 @@
 	dir = 4
 	},
 /obj/effect/turf_decal/loading_area{
-	dir = 9;
 	icon_state = "steel_decals_central6_corner";
 	name = "maintenance hatch"
 	},
@@ -73259,25 +73489,12 @@
 	},
 /area/ai_monitored/turret_protected/aisat/atmos)
 "pQa" = (
-/obj/effect/turf_decal/loading_area{
+/obj/machinery/light{
 	dir = 4;
-	icon_state = "drain";
-	name = "drain"
+	pixel_x = 7
 	},
-/obj/effect/turf_decal/tile/blue{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/neutral{
-	dir = 8
-	},
-/obj/structure/sign/nanotrasen{
-	pixel_x = 32
-	},
-/turf/open/floor/plasteel{
-	dir = 4;
-	icon_state = "floor_plate"
-	},
-/area/hallway/primary/aft/upper)
+/turf/open/floor/plasteel/stairs/medium,
+/area/crew_quarters/dorms)
 "pQd" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
@@ -73964,6 +74181,19 @@
 	icon_state = "floor_plate"
 	},
 /area/hallway/primary/aft/upper)
+"pXm" = (
+/obj/effect/turf_decal/tile/blue{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/blue{
+	dir = 4
+	},
+/obj/machinery/light{
+	dir = 4;
+	pixel_x = 7
+	},
+/turf/open/floor/plasteel/white,
+/area/medical/medbay/upper)
 "pXv" = (
 /turf/open/transparent/openspace,
 /area/security/brig)
@@ -76832,14 +77062,14 @@
 /turf/open/space/basic,
 /area/layenia/cloudlayer)
 "qCV" = (
-/obj/structure/railing/handrail{
-	dir = 8
-	},
 /obj/effect/turf_decal/loading_area{
 	dir = 8;
 	icon_state = "drain";
 	name = "drain"
 	},
+/obj/structure/railing{
+	dir = 8
+	},
 /turf/open/floor/wood,
 /area/hallway/primary/aft/upper)
 "qDf" = (
@@ -77248,8 +77478,9 @@
 "qGN" = (
 /obj/effect/turf_decal/delivery,
 /turf/open/floor/plasteel{
+	dir = 8;
 	icon_plating = "floor";
-	icon_state = "floor_whole"
+	icon_state = "floor_whole_alt"
 	},
 /area/hallway/primary/aft/upper)
 "qGU" = (
@@ -78040,8 +78271,9 @@
 "qOn" = (
 /obj/effect/turf_decal/bot,
 /turf/open/floor/plasteel{
+	dir = 8;
 	icon_plating = "floor";
-	icon_state = "floor_whole"
+	icon_state = "floor_whole_alt"
 	},
 /area/hallway/primary/aft/upper)
 "qOx" = (
@@ -79558,8 +79790,13 @@
 /turf/open/floor/carpet/red,
 /area/crew_quarters/bar)
 "rdR" = (
-/turf/open/floor/plating,
-/area/chapel/main)
+/obj/machinery/light/floor,
+/turf/open/floor/plasteel{
+	dir = 8;
+	icon_plating = "floor";
+	icon_state = "floor_whole_alt"
+	},
+/area/maintenance/starboard/central)
 "rdU" = (
 /obj/effect/spawner/structure/window/reinforced,
 /obj/machinery/door/firedoor,
@@ -80233,13 +80470,25 @@
 /turf/closed/wall/r_wall,
 /area/maintenance/port)
 "rjY" = (
-/obj/structure/disposalpipe/segment,
-/obj/structure/railing/handrail,
-/turf/open/floor/plasteel{
+/obj/effect/turf_decal/loading_area{
 	dir = 8;
+	icon_state = "drain";
+	name = "drain"
+	},
+/obj/effect/turf_decal/loading_area{
+	icon_state = "drain";
+	name = "drain"
+	},
+/obj/structure/railing,
+/obj/structure/railing{
+	dir = 8
+	},
+/obj/machinery/light/floor,
+/turf/open/floor/plasteel{
+	dir = 1;
 	icon_state = "floor_plate"
 	},
-/area/quartermaster/office)
+/area/maintenance/starboard/central)
 "rjZ" = (
 /obj/structure/chair,
 /obj/effect/landmark/start/assistant,
@@ -82893,8 +83142,14 @@
 /obj/structure/sign/painting/library{
 	pixel_y = -24
 	},
-/obj/structure/chair/bench,
-/turf/open/floor/plasteel/layenia,
+/obj/effect/turf_decal/loading_area{
+	icon_state = "drain";
+	name = "drain"
+	},
+/obj/structure/chair/bench{
+	dir = 1
+	},
+/turf/open/floor/plasteel,
 /area/artatrium)
 "rMD" = (
 /obj/structure/table/glass,
@@ -84422,7 +84677,6 @@
 	dir = 4
 	},
 /obj/effect/turf_decal/loading_area{
-	dir = 9;
 	icon_state = "steel_decals_central6_corner";
 	name = "maintenance hatch"
 	},
@@ -85180,6 +85434,10 @@
 /obj/machinery/airalarm{
 	pixel_y = 24
 	},
+/obj/machinery/light{
+	dir = 8;
+	pixel_x = -7
+	},
 /turf/open/floor/plasteel/white,
 /area/medical/medbay/upper)
 "sij" = (
@@ -85229,11 +85487,25 @@
 /turf/open/floor/plasteel/white,
 /area/science/circuit)
 "siy" = (
-/turf/open/floor/plasteel{
-	icon_plating = "floor";
-	icon_state = "floor_whole"
+/obj/effect/turf_decal/loading_area{
+	dir = 4;
+	icon_state = "drain";
+	name = "drain"
 	},
-/area/hallway/primary/aft/upper)
+/obj/effect/turf_decal/loading_area{
+	icon_state = "drain";
+	name = "drain"
+	},
+/obj/structure/railing,
+/obj/structure/railing{
+	dir = 4
+	},
+/obj/machinery/light/floor,
+/turf/open/floor/plasteel{
+	dir = 1;
+	icon_state = "floor_plate"
+	},
+/area/maintenance/starboard/central)
 "siG" = (
 /obj/structure/table/reinforced,
 /obj/machinery/door/firedoor,
@@ -86754,9 +87026,6 @@
 /obj/structure/railing{
 	dir = 4
 	},
-/obj/structure/chair/bench{
-	dir = 4
-	},
 /obj/effect/turf_decal/tile/blue{
 	dir = 1
 	},
@@ -86768,6 +87037,9 @@
 	icon_state = "drain";
 	name = "drain"
 	},
+/obj/structure/chair/bench{
+	dir = 8
+	},
 /turf/open/floor/plasteel{
 	dir = 4;
 	icon_state = "floor_plate"
@@ -86866,6 +87138,23 @@
 	icon_state = "floor_whole_alt"
 	},
 /area/maintenance/starboard/central)
+"sxe" = (
+/obj/structure/railing/handrail{
+	dir = 4
+	},
+/obj/effect/turf_decal/loading_area{
+	dir = 9;
+	icon_state = "steel_panel";
+	name = "steel pannel"
+	},
+/obj/structure/chair/bench/metal/right{
+	dir = 8
+	},
+/turf/open/floor/plasteel{
+	dir = 4;
+	icon_state = "floor_plate"
+	},
+/area/medical/medbay/upper)
 "sxi" = (
 /obj/item/assembly/signaler{
 	pixel_y = 8
@@ -88329,7 +88618,7 @@
 	dir = 1
 	},
 /obj/structure/chair/bench{
-	dir = 8
+	dir = 4
 	},
 /turf/open/floor/plasteel/checker,
 /area/artatrium)
@@ -89781,19 +90070,12 @@
 /area/security/brig)
 "tbe" = (
 /obj/effect/turf_decal/loading_area{
-	dir = 10;
-	icon_state = "steel_panel";
-	name = "steel pannel"
-	},
-/obj/machinery/light{
 	dir = 4;
-	pixel_x = 7
+	icon_state = "drain";
+	name = "drain"
 	},
-/turf/open/floor/plasteel/dark{
-	dir = 1;
-	icon_state = "darkfull_plate"
-	},
-/area/crew_quarters/dorms)
+/turf/open/floor/plasteel,
+/area/artatrium)
 "tbg" = (
 /obj/effect/turf_decal/loading_area{
 	dir = 1;
@@ -89915,14 +90197,12 @@
 /turf/open/floor/plasteel/dark/corner,
 /area/engine/break_room)
 "tcc" = (
-/obj/structure/railing/handrail{
-	dir = 1
+/obj/effect/turf_decal/loading_area{
+	icon_state = "drain";
+	name = "drain"
 	},
-/obj/structure/railing/handrail{
-	dir = 8
-	},
-/turf/open/floor/plating,
-/area/maintenance/port/aft)
+/turf/open/floor/plasteel,
+/area/artatrium)
 "tci" = (
 /obj/machinery/light{
 	dir = 1;
@@ -89933,20 +90213,21 @@
 	},
 /area/hallway/primary/aft/upper)
 "tck" = (
-/obj/structure/railing/handrail{
-	dir = 4
+/obj/effect/turf_decal/loading_area{
+	icon_state = "drain";
+	name = "drain"
 	},
 /obj/effect/turf_decal/loading_area{
 	dir = 4;
 	icon_state = "drain";
 	name = "drain"
 	},
-/obj/effect/turf_decal/tile/blue{
-	dir = 4
+/obj/effect/turf_decal/loading_area{
+	icon_state = "drain_corner";
+	name = "drain"
 	},
-/obj/effect/turf_decal/tile/blue,
-/turf/open/floor/plasteel/white,
-/area/medical/medbay/upper)
+/turf/open/floor/plasteel,
+/area/artatrium)
 "tcn" = (
 /obj/item/seeds/apple,
 /obj/item/seeds/banana,
@@ -90770,14 +91051,17 @@
 /turf/open/floor/plasteel/layenia,
 /area/layenia)
 "tko" = (
-/obj/structure/railing/handrail{
-	dir = 8
-	},
 /obj/structure/closet,
 /obj/effect/spawner/lootdrop/maintenance{
 	lootcount = 2;
 	name = "2maintenance loot spawner"
 	},
+/obj/structure/railing{
+	dir = 1
+	},
+/obj/structure/railing{
+	dir = 8
+	},
 /turf/open/floor/plating,
 /area/maintenance/port/aft)
 "tkr" = (
@@ -92906,11 +93190,11 @@
 	name = "Medbay Security APC";
 	pixel_x = -25
 	},
-/obj/item/radio/off,
-/obj/item/screwdriver{
-	pixel_y = 10
-	},
 /obj/structure/cable,
+/obj/item/flashlight/lamp/green{
+	pixel_y = 3
+	},
+/obj/structure/table/reinforced,
 /turf/open/floor/plasteel/dark,
 /area/security/checkpoint/medical)
 "tGE" = (
@@ -93054,11 +93338,9 @@
 /turf/open/floor/plasteel/layenia,
 /area/layenia)
 "tHQ" = (
-/obj/structure/railing/handrail{
-	dir = 8
-	},
-/turf/open/floor/plating,
-/area/maintenance/port/aft)
+/obj/structure/railing,
+/turf/closed/wall,
+/area/quartermaster/sorting)
 "tId" = (
 /obj/effect/turf_decal/bot,
 /obj/structure/ore_box,
@@ -96101,9 +96383,7 @@
 	dir = 4
 	},
 /obj/effect/turf_decal/tile/blue,
-/obj/structure/chair/bench/metal/left{
-	dir = 1
-	},
+/obj/structure/chair/bench/metal/right,
 /turf/open/floor/plasteel/white,
 /area/medical/medbay/central)
 "ujW" = (
@@ -96694,6 +96974,10 @@
 /obj/effect/turf_decal/tile/blue{
 	dir = 8
 	},
+/obj/machinery/light{
+	dir = 8;
+	pixel_x = -7
+	},
 /turf/open/floor/plasteel/white,
 /area/medical/medbay/upper)
 "uqE" = (
@@ -97534,19 +97818,17 @@
 	},
 /area/medical/morgue)
 "uze" = (
-/obj/structure/railing/handrail{
-	dir = 1
+/obj/effect/turf_decal/tile/blue{
+	dir = 8
 	},
+/obj/effect/turf_decal/tile/blue,
 /obj/effect/turf_decal/loading_area{
 	dir = 5;
 	icon_state = "steel_panel";
 	name = "steel pannel"
 	},
-/obj/effect/turf_decal/tile/blue{
-	dir = 8
-	},
-/obj/effect/turf_decal/tile/blue,
-/turf/open/floor/plasteel/white,
+/obj/item/twohanded/required/kirbyplants/random,
+/turf/open/floor/plasteel/white/side,
 /area/medical/medbay/upper)
 "uzk" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer3{
@@ -99888,10 +100170,10 @@
 /turf/open/floor/engine/vacuum,
 /area/engine/engineering)
 "uZo" = (
-/obj/structure/railing/handrail,
 /obj/effect/turf_decal/tile/brown{
 	dir = 1
 	},
+/obj/structure/railing,
 /turf/open/floor/plasteel{
 	dir = 4;
 	icon_state = "floor_plate"
@@ -101012,13 +101294,12 @@
 /turf/closed/wall,
 /area/chapel/main)
 "vjV" = (
-/obj/item/twohanded/required/kirbyplants/random,
-/obj/effect/turf_decal/tile/blue{
-	dir = 4
+/obj/machinery/light{
+	dir = 4;
+	pixel_x = 7
 	},
-/obj/effect/turf_decal/tile/blue,
-/turf/open/floor/plasteel/white,
-/area/medical/medbay/upper)
+/turf/open/transparent/openspace,
+/area/crew_quarters/dorms/upper)
 "vka" = (
 /turf/open/indestructible/concrete/smooth,
 /area/layenia)
@@ -102663,7 +102944,7 @@
 	name = "drain"
 	},
 /obj/structure/chair/bench/metal{
-	dir = 4
+	dir = 8
 	},
 /turf/open/floor/plasteel/white/side{
 	dir = 8
@@ -102963,9 +103244,6 @@
 /obj/structure/railing{
 	dir = 8
 	},
-/obj/structure/chair/bench/left{
-	dir = 8
-	},
 /obj/effect/turf_decal/tile/blue,
 /obj/effect/turf_decal/tile/neutral{
 	dir = 4
@@ -102975,6 +103253,9 @@
 	icon_state = "drain";
 	name = "drain"
 	},
+/obj/structure/chair/bench/right{
+	dir = 4
+	},
 /turf/open/floor/plasteel{
 	dir = 8;
 	icon_state = "floor_plate"
@@ -104296,14 +104577,6 @@
 /turf/open/floor/plating,
 /area/maintenance/disposal)
 "vRH" = (
-/obj/structure/railing/handrail{
-	dir = 8
-	},
-/obj/effect/turf_decal/loading_area{
-	dir = 8;
-	icon_state = "drain";
-	name = "drain"
-	},
 /obj/effect/turf_decal/tile/blue{
 	dir = 1
 	},
@@ -105053,8 +105326,8 @@
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
-/obj/structure/chair/bench/metal/right{
-	dir = 4
+/obj/structure/chair/bench/metal/left{
+	dir = 8
 	},
 /turf/open/floor/plasteel/dark/corner{
 	dir = 1
@@ -105996,7 +106269,6 @@
 	name = "air supply pipe"
 	},
 /obj/effect/turf_decal/loading_area{
-	dir = 9;
 	icon_state = "steel_decals_central6_corner";
 	name = "maintenance hatch"
 	},
@@ -106352,7 +106624,9 @@
 	dir = 8;
 	name = "air supply pipe"
 	},
-/obj/structure/chair/bench/right,
+/obj/structure/chair/bench/left{
+	dir = 1
+	},
 /turf/open/floor/plasteel/dark{
 	dir = 4;
 	icon_state = "darkfull_trim"
@@ -106828,7 +107102,9 @@
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
-/obj/structure/chair/bench/right,
+/obj/structure/chair/bench/left{
+	dir = 1
+	},
 /turf/open/floor/plasteel/chapel{
 	dir = 4
 	},
@@ -142887,7 +143163,7 @@ iJO
 xux
 wFo
 wFo
-yeE
+rEa
 eAU
 jHj
 hWA
@@ -143136,11 +143412,11 @@ swP
 cqQ
 eAU
 hUu
-vsG
+pQa
 ixk
 xZV
 xZV
-tbe
+iJO
 iRH
 iZz
 jhB
@@ -145771,10 +146047,10 @@ uJc
 uJc
 uJc
 uJc
-tcc
+uJc
 tko
 uJc
-tHQ
+cpK
 wva
 uJc
 qcd
@@ -145946,8 +146222,8 @@ xwv
 xwv
 xGa
 xGa
-rdR
-rdR
+vjT
+vjT
 vjT
 fDy
 rnr
@@ -146020,7 +146296,7 @@ ycK
 oET
 mbi
 oET
-ycK
+tHQ
 rUH
 rUH
 ycK
@@ -146531,7 +146807,7 @@ qwb
 dSG
 pfX
 rfx
-rjY
+rfx
 rsc
 vbC
 vbC
@@ -147796,7 +148072,7 @@ vId
 dJm
 wcf
 iZK
-iZK
+aBC
 nHM
 iMm
 vIK
@@ -148053,7 +148329,7 @@ vId
 yeV
 wcf
 iZK
-iZK
+aBC
 rMt
 iMm
 vIK
@@ -148310,7 +148586,7 @@ vId
 ncw
 iMm
 bLq
-iZK
+aBC
 jKx
 iMm
 vIK
@@ -148824,8 +149100,8 @@ vIq
 jHn
 azV
 mvf
-ybt
-ybt
+aBC
+tcc
 egA
 ybt
 ybt
@@ -149081,8 +149357,8 @@ vIq
 vTh
 iMm
 npK
-ybt
-ybt
+tbe
+tck
 ybt
 odg
 odg
@@ -159602,9 +159878,9 @@ xXB
 afY
 tII
 tII
-tII
+rdR
 ltt
-syL
+rjY
 xjq
 wXl
 wXl
@@ -161144,9 +161420,9 @@ xXB
 afY
 tII
 tII
-tII
+rdR
 swY
-sPv
+siy
 xjq
 bJt
 bJt
@@ -208423,7 +208699,7 @@ vTE
 vTE
 vTE
 vTE
-vTE
+mak
 rKU
 kSH
 kam
@@ -208672,7 +208948,7 @@ xWl
 kbF
 psN
 vTE
-vTE
+vjV
 vTE
 vTE
 vTE
@@ -214386,7 +214662,7 @@ mgn
 frD
 pCa
 uge
-siy
+msC
 wNm
 wNm
 wNm
@@ -216194,7 +216470,7 @@ uqD
 vUz
 vUz
 vUz
-sAs
+fcA
 vUz
 oWw
 vUz
@@ -216704,13 +216980,13 @@ tot
 kYv
 nwL
 sfE
-tck
-tck
-tck
-tck
-tck
-tck
-vjV
+scR
+scR
+scR
+scR
+scR
+scR
+scR
 bsR
 tIg
 wsF
@@ -216957,16 +217233,16 @@ wpc
 wpc
 eTW
 naA
-tot
+pXm
 kYv
 tJB
 ukM
-wpc
-wpc
-wpc
-wpc
-wpc
-wpc
+sxe
+ahP
+ukM
+sxe
+ahP
+ukM
 uze
 pkE
 sNg
@@ -217220,11 +217496,11 @@ xBD
 qNY
 wpc
 wpc
+fJN
 wpc
 wpc
-wpc
-wpc
-uze
+hRG
+oie
 wbu
 sJv
 wsF
@@ -217480,8 +217756,8 @@ wpc
 wpc
 wpc
 wpc
-wpc
-uze
+hRG
+oie
 wbu
 tIg
 wsF
@@ -217737,8 +218013,8 @@ wpc
 wpc
 wpc
 wpc
-wpc
-uze
+hRG
+oie
 wbu
 tIg
 wsF
@@ -217994,8 +218270,8 @@ wpc
 wpc
 wpc
 wpc
-wpc
-uze
+hRG
+oie
 wbu
 tIg
 wsF
@@ -218251,8 +218527,8 @@ wpc
 wpc
 wpc
 wpc
-wpc
-uze
+hRG
+oie
 wbu
 tIg
 wsF
@@ -218496,7 +218772,7 @@ qiH
 wpc
 wpc
 qNY
-vEM
+fdL
 uTi
 xBD
 xBD
@@ -218505,11 +218781,11 @@ xBD
 qNY
 wpc
 wpc
+eUB
 wpc
 wpc
-wpc
-wpc
-uze
+hRG
+oie
 wbu
 sJv
 wsF
@@ -218760,12 +219036,12 @@ sie
 sZQ
 tIg
 ukM
-wpc
-wpc
-wpc
-wpc
-wpc
-wpc
+lTQ
+mSc
+ukM
+lTQ
+mSc
+ukM
 uze
 wbu
 tIg
@@ -219023,7 +219299,7 @@ vRH
 vRH
 vRH
 vRH
-lKX
+vRH
 wbu
 tIg
 wsF
@@ -219796,7 +220072,7 @@ kVl
 dli
 dli
 vaj
-tJB
+jfY
 wsF
 gNx
 wsF
@@ -221835,8 +222111,8 @@ nVc
 qNU
 dfq
 wnk
-pQa
 wnk
+aMb
 ihy
 wwG
 nXc
diff --git a/code/game/objects/items/plushes.dm b/code/game/objects/items/plushes.dm
index 7318bc957..7e2929c4a 100644
--- a/code/game/objects/items/plushes.dm
+++ b/code/game/objects/items/plushes.dm
@@ -949,11 +949,11 @@
 	item_state = "marisol"
 
 /obj/item/toy/plush/mammal/freddy
-	name = "Felix Fastbear plushie"
+	name = "felix fastbear plushie"
 	desc = "An adorable stuffed plushie that resembles a bear with a bow tie and a top hat with buttons for eyes."
 	icon_state = "freddy"
 	item_state = "freddy"
-	squeak_override = list('modular_citadel/sound/voice/merp.ogg' = 1)
+	squeak_override = list('sound/items/toysqueak1.ogg' = 1)
 
 /obj/item/toy/plush/catgirl
 	name = "feline plushie"
diff --git a/hyperstation/sound/misc/Fnaf Nose honk.ogg b/hyperstation/sound/misc/Fnaf Nose honk.ogg
new file mode 100644
index 000000000..f5ef27e74
Binary files /dev/null and b/hyperstation/sound/misc/Fnaf Nose honk.ogg differ