diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm
index 6c04a82fae94..90de741895dc 100644
--- a/_maps/map_files/Deltastation/DeltaStation2.dmm
+++ b/_maps/map_files/Deltastation/DeltaStation2.dmm
@@ -3697,6 +3697,9 @@
 	name = "MiniSat Exterior Access"
 	},
 /obj/effect/mapping_helpers/airlock/access/all/engineering/construction,
+/obj/structure/sign/directions/upload/directional/south{
+	pixel_y = -24
+	},
 /turf/open/floor/iron/dark,
 /area/station/engineering/hallway)
 "aQx" = (
@@ -4104,6 +4107,11 @@
 	name = "Barber Entrance"
 	},
 /obj/machinery/door/firedoor,
+/obj/structure/sign/directions/upload{
+	dir = 8;
+	pixel_x = -32;
+	pixel_y = 8
+	},
 /turf/open/floor/iron,
 /area/station/service/barber)
 "aWU" = (
@@ -7848,6 +7856,15 @@
 /obj/machinery/light/small/directional/south,
 /turf/open/floor/engine,
 /area/station/engineering/supermatter)
+"bPM" = (
+/obj/effect/turf_decal/tile/yellow{
+	dir = 8
+	},
+/obj/structure/sign/directions/upload/directional/west{
+	pixel_y = 10
+	},
+/turf/open/floor/iron,
+/area/station/hallway/primary/port)
 "bPY" = (
 /obj/effect/turf_decal/trimline/purple/filled/corner{
 	dir = 1
@@ -9297,10 +9314,11 @@
 /obj/structure/sign/directions/dorms{
 	dir = 4;
 	pixel_x = 32;
-	pixel_y = 8
+	pixel_y = 1
 	},
 /obj/structure/sign/directions/medical{
-	pixel_x = 32
+	pixel_x = 32;
+	pixel_y = 1
 	},
 /obj/structure/sign/directions/evac{
 	pixel_x = 32;
@@ -11826,6 +11844,17 @@
 /obj/item/storage/secure/safe/directional/east,
 /turf/open/floor/iron/grimy,
 /area/station/command/heads_quarters/captain/private)
+"cNz" = (
+/obj/structure/sign/directions/cryo/directional/east{
+	pixel_y = 10
+	},
+/obj/structure/sign/directions/dorms{
+	dir = 4;
+	pixel_x = 32;
+	pixel_y = 1
+	},
+/turf/closed/wall,
+/area/station/commons/toilet/locker)
 "cNH" = (
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -22496,7 +22525,11 @@
 /obj/structure/sign/directions/arrival{
 	dir = 1;
 	pixel_x = 32;
-	pixel_y = -4
+	pixel_y = 10
+	},
+/obj/structure/sign/directions/medical{
+	pixel_x = 32;
+	pixel_y = -8
 	},
 /turf/open/floor/iron,
 /area/station/hallway/secondary/entry)
@@ -22767,7 +22800,7 @@
 /obj/structure/sign/directions/upload{
 	dir = 8;
 	pixel_x = -31;
-	pixel_y = -6
+	pixel_y = 10
 	},
 /obj/structure/table/reinforced,
 /obj/item/storage/fancy/donut_box{
@@ -27372,11 +27405,12 @@
 /area/station/security/office)
 "gDS" = (
 /obj/structure/sign/directions/supply{
-	dir = 4
+	dir = 4;
+	pixel_y = 1
 	},
 /obj/structure/sign/directions/security{
 	dir = 4;
-	pixel_y = 8
+	pixel_y = -8
 	},
 /turf/closed/wall,
 /area/station/hallway/primary/central/fore)
@@ -28994,6 +29028,10 @@
 "gYS" = (
 /obj/effect/turf_decal/tile/neutral/anticorner/contrasted,
 /obj/item/radio/intercom/directional/east,
+/obj/structure/sign/directions/dorms{
+	pixel_x = 32;
+	pixel_y = -8
+	},
 /turf/open/floor/iron,
 /area/station/commons/locker)
 "gZb" = (
@@ -37045,6 +37083,9 @@
 	},
 /obj/structure/extinguisher_cabinet/directional/north,
 /obj/item/radio/intercom/directional/west,
+/obj/machinery/light_switch/directional/west{
+	pixel_y = -8
+	},
 /turf/open/floor/iron,
 /area/station/commons/locker)
 "jbG" = (
@@ -38225,7 +38266,8 @@
 	},
 /obj/structure/sign/directions/science{
 	dir = 8;
-	pixel_x = -32
+	pixel_x = -32;
+	pixel_y = 10
 	},
 /turf/open/floor/iron,
 /area/station/hallway/primary/central/aft)
@@ -39047,17 +39089,13 @@
 	dir = 8
 	},
 /obj/structure/sign/directions/science{
-	pixel_x = -32
+	pixel_x = -32;
+	pixel_y = 10
 	},
 /obj/structure/sign/directions/medical{
 	pixel_x = -32;
 	pixel_y = -8
 	},
-/obj/structure/sign/directions/upload{
-	dir = 8;
-	pixel_x = -32;
-	pixel_y = 8
-	},
 /turf/open/floor/iron,
 /area/station/hallway/primary/central/fore)
 "jzC" = (
@@ -39736,6 +39774,12 @@
 	},
 /turf/closed/wall/r_wall,
 /area/station/maintenance/port/aft)
+"jGu" = (
+/obj/structure/sign/directions/evac{
+	pixel_y = -8
+	},
+/turf/closed/wall,
+/area/station/medical/psychology)
 "jGw" = (
 /obj/machinery/light/directional/north,
 /obj/effect/turf_decal/tile/neutral/fourcorners,
@@ -41531,7 +41575,8 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/structure/sign/directions/evac{
 	dir = 4;
-	pixel_x = 32
+	pixel_x = 32;
+	pixel_y = 10
 	},
 /obj/structure/sign/directions/medical{
 	dir = 4;
@@ -44267,12 +44312,13 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/structure/sign/directions/science{
 	dir = 8;
-	pixel_x = -32
+	pixel_x = -32;
+	pixel_y = 1
 	},
 /obj/structure/sign/directions/command{
 	dir = 1;
 	pixel_x = -32;
-	pixel_y = 8
+	pixel_y = 10
 	},
 /turf/open/floor/iron,
 /area/station/hallway/secondary/exit/departure_lounge)
@@ -46578,6 +46624,13 @@
 	},
 /turf/open/floor/iron,
 /area/station/medical/storage)
+"lpq" = (
+/obj/structure/sign/directions/evac{
+	pixel_x = 32;
+	pixel_y = 1
+	},
+/turf/closed/wall,
+/area/station/service/barber)
 "lpt" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/structure/chair/office,
@@ -49041,6 +49094,13 @@
 	},
 /turf/open/floor/iron/checker,
 /area/station/security/interrogation)
+"lTm" = (
+/obj/structure/sign/directions/evac{
+	pixel_x = 32;
+	pixel_y = 1
+	},
+/turf/closed/wall,
+/area/station/commons/storage/primary)
 "lTt" = (
 /obj/machinery/door/window/brigdoor/right/directional/west{
 	name = "Shooting Range";
@@ -52261,6 +52321,17 @@
 /obj/effect/mapping_helpers/airlock/access/all/service/general,
 /turf/open/floor/iron/checker,
 /area/station/hallway/secondary/service)
+"mJh" = (
+/obj/effect/turf_decal/tile/neutral{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/sign/directions/command/directional/north{
+	pixel_y = 33
+	},
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/aft)
 "mJm" = (
 /obj/machinery/door/firedoor/heavy,
 /obj/machinery/door/airlock/research/glass{
@@ -57601,7 +57672,6 @@
 /turf/open/floor/iron,
 /area/station/maintenance/starboard/aft)
 "oaB" = (
-/obj/machinery/light_switch/directional/west,
 /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{
 	dir = 8
 	},
@@ -58443,6 +58513,12 @@
 	},
 /turf/open/floor/iron/textured,
 /area/station/maintenance/department/chapel)
+"ola" = (
+/obj/structure/sign/directions/security/directional/east{
+	pixel_y = -8
+	},
+/turf/closed/wall/r_wall,
+/area/station/security/detectives_office)
 "olg" = (
 /obj/structure/frame/machine{
 	anchored = 1
@@ -67098,6 +67174,13 @@
 /obj/structure/sink/directional/south,
 /turf/open/floor/wood/large,
 /area/station/service/barber)
+"qtG" = (
+/obj/structure/lattice,
+/obj/structure/sign/directions/command/directional/west{
+	pixel_y = 1
+	},
+/turf/open/space,
+/area/space/nearstation)
 "qtS" = (
 /obj/structure/cable,
 /obj/effect/turf_decal/stripes/line{
@@ -72794,10 +72877,10 @@
 /area/station/hallway/secondary/exit/departure_lounge)
 "rPI" = (
 /obj/structure/sign/directions/engineering{
-	pixel_y = -6
+	pixel_y = -8
 	},
 /obj/structure/sign/directions/science{
-	pixel_y = 2
+	pixel_y = 1
 	},
 /turf/closed/wall,
 /area/station/commons/vacant_room/office)
@@ -76343,11 +76426,7 @@
 /obj/structure/sign/directions/command{
 	dir = 1;
 	pixel_x = -32;
-	pixel_y = 8
-	},
-/obj/structure/sign/directions/vault{
-	dir = 1;
-	pixel_x = -32
+	pixel_y = 10
 	},
 /turf/open/floor/iron,
 /area/station/hallway/primary/central/fore)
@@ -79368,6 +79447,9 @@
 "tuB" = (
 /obj/effect/spawner/random/structure/table_or_rack,
 /obj/effect/spawner/random/trash/janitor_supplies,
+/obj/structure/sign/directions/cryo/directional/south{
+	pixel_y = -40
+	},
 /turf/open/floor/plating,
 /area/station/maintenance/department/security)
 "tuH" = (
@@ -80110,11 +80192,12 @@
 	pixel_y = -8
 	},
 /obj/structure/sign/directions/medical{
-	dir = 1
+	dir = 1;
+	pixel_y = 1
 	},
 /obj/structure/sign/directions/security{
 	dir = 1;
-	pixel_y = 8
+	pixel_y = 10
 	},
 /turf/closed/wall,
 /area/station/hallway/secondary/exit/departure_lounge)
@@ -80512,14 +80595,11 @@
 	},
 /obj/structure/sign/directions/vault{
 	pixel_x = 32;
-	pixel_y = -8
-	},
-/obj/structure/sign/directions/dorms{
-	pixel_x = 32
+	pixel_y = 10
 	},
 /obj/structure/sign/directions/security{
 	pixel_x = 32;
-	pixel_y = 8
+	pixel_y = -8
 	},
 /turf/open/floor/iron,
 /area/station/hallway/primary/central/fore)
@@ -80713,6 +80793,21 @@
 "tMA" = (
 /turf/open/floor/engine/air,
 /area/station/engineering/atmos)
+"tMB" = (
+/obj/machinery/door/firedoor,
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/sign/directions/command/directional/north{
+	pixel_y = 33
+	},
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/aft)
 "tMF" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -80773,6 +80868,12 @@
 /obj/machinery/newscaster/directional/west,
 /turf/open/floor/iron/dark,
 /area/station/hallway/secondary/entry)
+"tMY" = (
+/obj/structure/sign/directions/evac/directional/south{
+	pixel_y = 1
+	},
+/turf/closed/wall,
+/area/station/service/janitor)
 "tNa" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -86964,7 +87065,7 @@
 /obj/structure/sign/directions/vault{
 	dir = 4;
 	pixel_x = 32;
-	pixel_y = -8
+	pixel_y = 10
 	},
 /turf/open/floor/iron,
 /area/station/hallway/primary/central/fore)
@@ -89419,10 +89520,6 @@
 /obj/effect/turf_decal/tile/neutral{
 	dir = 8
 	},
-/obj/structure/sign/directions/lavaland{
-	dir = 4;
-	pixel_y = -26
-	},
 /turf/open/floor/iron,
 /area/station/hallway/secondary/entry)
 "vSk" = (
@@ -90723,7 +90820,9 @@
 	dir = 1
 	},
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/firealarm/directional/west,
+/obj/machinery/firealarm/directional/west{
+	pixel_y = 2
+	},
 /turf/open/floor/iron,
 /area/station/hallway/primary/starboard)
 "whu" = (
@@ -91493,12 +91592,13 @@
 	pixel_y = -8
 	},
 /obj/structure/sign/directions/medical{
-	pixel_x = -32
+	pixel_x = -32;
+	pixel_y = 1
 	},
 /obj/structure/sign/directions/arrival{
 	dir = 8;
 	pixel_x = -32;
-	pixel_y = 8
+	pixel_y = 10
 	},
 /turf/open/floor/iron,
 /area/station/hallway/primary/central/fore)
@@ -91953,17 +92053,16 @@
 /obj/structure/sign/directions/supply{
 	dir = 1;
 	pixel_x = 32;
-	pixel_y = 8
-	},
-/obj/structure/sign/directions/vault{
-	dir = 1;
-	pixel_x = 32
+	pixel_y = 1
 	},
 /obj/structure/sign/directions/security{
 	dir = 1;
 	pixel_x = 32;
 	pixel_y = -8
 	},
+/obj/structure/sign/directions/cryo/directional/east{
+	pixel_y = 10
+	},
 /turf/open/floor/iron,
 /area/station/hallway/primary/central/aft)
 "wuh" = (
@@ -95122,7 +95221,7 @@
 /obj/structure/sign/directions/engineering{
 	dir = 4;
 	pixel_x = 33;
-	pixel_y = 2
+	pixel_y = 1
 	},
 /turf/open/floor/iron,
 /area/station/engineering/hallway)
@@ -97810,6 +97909,12 @@
 	},
 /turf/open/floor/iron,
 /area/station/service/hydroponics)
+"xTq" = (
+/obj/structure/sign/directions/cryo/directional/east{
+	pixel_y = -8
+	},
+/turf/closed/wall,
+/area/station/maintenance/starboard/aft)
 "xTr" = (
 /turf/closed/wall,
 /area/station/science/robotics/lab)
@@ -127384,7 +127489,7 @@ azy
 tJk
 wSv
 hza
-hza
+bPM
 hza
 hza
 emB
@@ -132784,11 +132889,11 @@ fgM
 dUe
 oly
 muo
-fHI
+lTm
 wjF
 uED
 saD
-qAQ
+lpq
 fcl
 xpI
 qAQ
@@ -134095,7 +134200,7 @@ mlE
 mlE
 mlE
 mlE
-nXY
+mJh
 whK
 rcW
 ngQ
@@ -134278,7 +134383,7 @@ sjt
 yaP
 iWA
 vRU
-tCs
+tMY
 tCs
 tCs
 bJf
@@ -142319,7 +142424,7 @@ ksK
 ksK
 ksK
 ksK
-kxg
+tMB
 hJs
 vlY
 uNY
@@ -142351,7 +142456,7 @@ dki
 jzN
 vjY
 mVb
-dki
+jGu
 pAK
 aZO
 hXm
@@ -143564,7 +143669,7 @@ tpZ
 qmT
 tpZ
 aaa
-aad
+qtG
 aaa
 teY
 ykl
@@ -146425,7 +146530,7 @@ iVq
 nMd
 crR
 szQ
-iYi
+cNz
 uqq
 dCT
 ggc
@@ -147947,7 +148052,7 @@ msb
 kKg
 nuK
 xEJ
-dCk
+ola
 vVS
 ljd
 uvR
@@ -152094,7 +152199,7 @@ qfH
 yaI
 ouy
 bfe
-nXH
+xTq
 qPE
 jBm
 wpH
diff --git a/_maps/map_files/IceBoxStation/IceBoxStation.dmm b/_maps/map_files/IceBoxStation/IceBoxStation.dmm
index 54189f9bc763..b2888158ec4c 100644
--- a/_maps/map_files/IceBoxStation/IceBoxStation.dmm
+++ b/_maps/map_files/IceBoxStation/IceBoxStation.dmm
@@ -770,6 +770,9 @@
 /obj/effect/turf_decal/tile/purple/anticorner/contrasted{
 	dir = 8
 	},
+/obj/structure/sign/directions/medical/directional/west{
+	pixel_y = -8
+	},
 /turf/open/floor/iron,
 /area/station/hallway/primary/starboard)
 "aos" = (
@@ -7066,6 +7069,15 @@
 /obj/effect/mapping_helpers/burnt_floor,
 /turf/open/floor/plating,
 /area/station/maintenance/port/aft)
+"cjR" = (
+/obj/structure/sign/directions/command/directional/north{
+	pixel_y = 1
+	},
+/obj/structure/sign/directions/medical/directional/north{
+	pixel_y = 10
+	},
+/turf/closed/wall/r_wall,
+/area/station/command/teleporter)
 "ckc" = (
 /obj/machinery/door/firedoor,
 /obj/machinery/camera/directional/south{
@@ -8929,6 +8941,12 @@
 "cLN" = (
 /turf/open/floor/iron,
 /area/station/hallway/primary/aft)
+"cLO" = (
+/obj/structure/sign/directions/evac/directional/east{
+	pixel_y = 1
+	},
+/turf/closed/wall/r_wall,
+/area/station/science/robotics/lab)
 "cMd" = (
 /obj/machinery/recharge_station,
 /obj/effect/turf_decal/tile/yellow{
@@ -12065,20 +12083,6 @@
 	},
 /turf/open/floor/iron/dark/textured,
 /area/station/security/range)
-"dKW" = (
-/obj/structure/sign/directions/security{
-	dir = 1;
-	pixel_x = 32;
-	pixel_y = 36
-	},
-/obj/structure/sign/directions/evac{
-	dir = 4;
-	pixel_x = 32;
-	pixel_y = 28
-	},
-/obj/effect/landmark/start/hangover,
-/turf/open/floor/iron,
-/area/station/hallway/primary/central)
 "dLe" = (
 /obj/structure/chair/stool/directional/west,
 /turf/open/floor/wood/large,
@@ -13442,6 +13446,11 @@
 /area/station/security/holding_cell)
 "eit" = (
 /obj/machinery/light/directional/west,
+/obj/structure/sign/directions/security{
+	dir = 4;
+	pixel_x = -32;
+	pixel_y = 10
+	},
 /turf/open/floor/iron,
 /area/station/hallway/primary/central)
 "eix" = (
@@ -14031,6 +14040,13 @@
 /obj/structure/window/reinforced/spawner/directional/east,
 /turf/open/floor/glass/reinforced,
 /area/station/security/brig/entrance)
+"esR" = (
+/obj/structure/disposalpipe/segment,
+/obj/structure/sign/directions/command/directional/east{
+	pixel_y = 1
+	},
+/turf/closed/wall,
+/area/station/commons/vacant_room/commissary)
 "etw" = (
 /obj/effect/turf_decal/stripes/white/line,
 /obj/effect/decal/cleanable/dirt,
@@ -14982,6 +14998,12 @@
 /obj/machinery/light/small/directional/west,
 /turf/open/floor/wood,
 /area/station/service/library)
+"eIy" = (
+/obj/structure/sign/directions/command/directional/east{
+	pixel_y = 1
+	},
+/turf/closed/wall,
+/area/station/commons/storage/tools)
 "eIC" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/disposalpipe/segment{
@@ -16318,6 +16340,12 @@
 	},
 /turf/open/floor/glass,
 /area/station/service/library)
+"ffc" = (
+/obj/structure/sign/directions/cryo/directional/south{
+	pixel_y = 1
+	},
+/turf/closed/wall,
+/area/station/commons/locker)
 "ffe" = (
 /turf/closed/wall/r_wall,
 /area/station/maintenance/aft/lesser)
@@ -17104,6 +17132,12 @@
 "fsv" = (
 /turf/open/floor/iron,
 /area/station/hallway/secondary/entry)
+"fsC" = (
+/obj/structure/sign/directions/command/directional/north{
+	pixel_y = 1
+	},
+/turf/closed/wall,
+/area/station/hallway/primary/central)
 "fsF" = (
 /obj/effect/spawner/structure/window,
 /obj/effect/mapping_helpers/broken_floor,
@@ -17539,6 +17573,15 @@
 /obj/structure/girder,
 /turf/open/floor/iron/white,
 /area/station/maintenance/port/fore)
+"fzN" = (
+/obj/structure/sign/directions/engineering/directional/south{
+	pixel_y = -8
+	},
+/obj/structure/sign/directions/supply/directional/south{
+	pixel_y = 10
+	},
+/turf/closed/wall,
+/area/station/commons/vacant_room/commissary)
 "fzQ" = (
 /obj/structure/chair/office{
 	dir = 8
@@ -18532,6 +18575,12 @@
 	},
 /turf/open/floor/iron/white,
 /area/station/science/xenobiology)
+"fTw" = (
+/obj/structure/sign/directions/medical/directional/south{
+	pixel_y = -8
+	},
+/turf/closed/wall,
+/area/station/maintenance/starboard/fore)
 "fTx" = (
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
 	dir = 4
@@ -22750,10 +22799,6 @@
 	dir = 8
 	},
 /area/station/science/research)
-"hnV" = (
-/obj/machinery/newscaster/directional/east,
-/turf/open/floor/iron,
-/area/station/hallway/secondary/entry)
 "hor" = (
 /obj/structure/table/wood,
 /obj/effect/decal/cleanable/dirt/dust,
@@ -24776,6 +24821,9 @@
 /obj/effect/turf_decal/tile/red{
 	dir = 4
 	},
+/obj/structure/sign/directions/engineering/directional/east{
+	pixel_y = 10
+	},
 /turf/open/floor/iron,
 /area/station/hallway/primary/central)
 "hZe" = (
@@ -27828,6 +27876,7 @@
 /obj/structure/railing{
 	dir = 8
 	},
+/obj/structure/sign/directions/supply/directional/north,
 /turf/open/floor/iron,
 /area/mine/eva/lower)
 "iVA" = (
@@ -28993,6 +29042,18 @@
 /obj/structure/transit_tube/crossing/horizontal,
 /turf/open/floor/plating/snowed/icemoon,
 /area/icemoon/surface/outdoors/nospawn)
+"jqD" = (
+/obj/structure/closet/emcloset,
+/obj/structure/sign/directions/evac/directional/east{
+	pixel_y = 1
+	},
+/obj/structure/sign/directions/science{
+	dir = 4;
+	pixel_x = 32;
+	pixel_y = 10
+	},
+/turf/open/floor/iron,
+/area/station/hallway/primary/starboard)
 "jqE" = (
 /obj/structure/table,
 /obj/item/book/manual/wiki/grenades,
@@ -30884,6 +30945,14 @@
 	},
 /turf/open/floor/plating,
 /area/station/maintenance/department/crew_quarters/bar)
+"jWD" = (
+/obj/structure/sign/directions/medical{
+	dir = 4;
+	pixel_x = 32;
+	pixel_y = -8
+	},
+/turf/closed/wall/r_wall,
+/area/station/command/gateway)
 "jWJ" = (
 /obj/machinery/light/small/directional/west,
 /obj/structure/closet/emcloset/anchored,
@@ -32218,23 +32287,6 @@
 /obj/structure/reagent_dispensers/watertank,
 /turf/open/floor/plating,
 /area/mine/eva/lower)
-"krv" = (
-/obj/structure/sign/directions/engineering{
-	pixel_x = -32;
-	pixel_y = -40
-	},
-/obj/structure/sign/directions/medical{
-	dir = 4;
-	pixel_x = -32;
-	pixel_y = -24
-	},
-/obj/structure/sign/directions/evac{
-	dir = 4;
-	pixel_x = -32;
-	pixel_y = -32
-	},
-/turf/open/floor/iron,
-/area/station/hallway/primary/central)
 "krx" = (
 /obj/machinery/atmospherics/components/unary/cryo_cell,
 /obj/effect/turf_decal/stripes/line{
@@ -36196,23 +36248,6 @@
 /obj/item/trash/tray,
 /turf/open/floor/plating,
 /area/station/maintenance/port/aft)
-"lDo" = (
-/obj/structure/sign/directions/medical{
-	dir = 4;
-	pixel_x = 32;
-	pixel_y = -24
-	},
-/obj/structure/sign/directions/science{
-	dir = 4;
-	pixel_x = 32;
-	pixel_y = -32
-	},
-/obj/structure/sign/directions/engineering{
-	pixel_x = 32;
-	pixel_y = -40
-	},
-/turf/open/floor/iron,
-/area/station/hallway/primary/central)
 "lDq" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
 	dir = 8
@@ -36772,6 +36807,10 @@
 /obj/structure/sign/poster/contraband/random/directional/east,
 /turf/open/floor/catwalk_floor/iron_smooth,
 /area/station/maintenance/starboard/fore)
+"lNL" = (
+/obj/machinery/newscaster/directional/east,
+/turf/closed/wall,
+/area/station/service/hydroponics/garden)
 "lNP" = (
 /obj/machinery/disposal/bin,
 /obj/structure/disposalpipe/trunk{
@@ -37314,6 +37353,11 @@
 	dir = 1
 	},
 /area/station/hallway/secondary/entry)
+"lXd" = (
+/obj/structure/stairs/north,
+/obj/structure/sign/directions/supply/directional/north,
+/turf/open/floor/iron,
+/area/station/cargo/storage)
 "lXi" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -42139,6 +42183,12 @@
 /obj/item/crowbar,
 /turf/open/floor/iron,
 /area/station/service/chapel)
+"nBh" = (
+/obj/structure/sign/directions/dorms/directional/west{
+	pixel_y = -8
+	},
+/turf/closed/wall,
+/area/station/commons/fitness)
 "nBj" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/mapping_helpers/broken_floor,
@@ -42827,6 +42877,16 @@
 	},
 /obj/structure/disposalpipe/segment,
 /obj/effect/turf_decal/tile/blue,
+/obj/structure/sign/directions/security{
+	dir = 1;
+	pixel_x = 32;
+	pixel_y = 10
+	},
+/obj/structure/sign/directions/medical{
+	dir = 4;
+	pixel_x = 32;
+	pixel_y = 1
+	},
 /turf/open/floor/iron,
 /area/station/hallway/primary/central)
 "nKH" = (
@@ -43164,6 +43224,12 @@
 /obj/machinery/light/small/directional/east,
 /turf/open/floor/plating,
 /area/station/maintenance/department/chapel)
+"nOy" = (
+/obj/structure/sign/directions/cryo/directional/south{
+	pixel_y = 1
+	},
+/turf/closed/wall,
+/area/station/service/hydroponics/garden)
 "nOB" = (
 /obj/structure/railing{
 	dir = 4
@@ -46975,6 +47041,13 @@
 	},
 /turf/open/floor/plating,
 /area/station/maintenance/department/crew_quarters/bar)
+"oYF" = (
+/obj/effect/spawner/structure/window,
+/obj/structure/sign/directions/arrival/directional/west{
+	pixel_y = 10
+	},
+/turf/open/floor/plating,
+/area/station/service/hydroponics/garden)
 "oYH" = (
 /obj/effect/turf_decal/siding/wideplating/dark,
 /obj/effect/landmark/start/botanist,
@@ -48771,6 +48844,9 @@
 	pixel_y = -22
 	},
 /obj/effect/turf_decal/tile/yellow,
+/obj/structure/sign/directions/engineering/directional/east{
+	pixel_y = 1
+	},
 /turf/open/floor/iron,
 /area/station/hallway/primary/aft)
 "pDt" = (
@@ -52194,16 +52270,6 @@
 /turf/open/floor/plating/snowed/icemoon,
 /area/icemoon/underground/explored)
 "qJV" = (
-/obj/structure/sign/directions/security{
-	dir = 1;
-	pixel_x = 32;
-	pixel_y = 40
-	},
-/obj/structure/sign/directions/medical{
-	dir = 4;
-	pixel_x = 32;
-	pixel_y = 32
-	},
 /obj/structure/sign/directions/evac{
 	dir = 4;
 	pixel_x = 32;
@@ -53809,6 +53875,13 @@
 /obj/effect/turf_decal/tile/purple/fourcorners,
 /turf/open/floor/iron,
 /area/mine/living_quarters)
+"rjb" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/structure/sign/directions/command/directional/west{
+	pixel_y = 10
+	},
+/turf/open/floor/plating,
+/area/station/service/hydroponics)
 "rjh" = (
 /obj/structure/closet/firecloset,
 /turf/open/floor/iron/dark,
@@ -54810,6 +54883,23 @@
 	},
 /turf/open/floor/iron,
 /area/mine/laborcamp/security)
+"rAx" = (
+/obj/structure/sign/directions/science{
+	dir = 4;
+	pixel_x = 32;
+	pixel_y = 1
+	},
+/obj/structure/sign/directions/engineering{
+	pixel_x = 32;
+	pixel_y = -8
+	},
+/obj/structure/sign/directions/medical{
+	dir = 4;
+	pixel_x = 32;
+	pixel_y = 10
+	},
+/turf/open/floor/iron,
+/area/station/hallway/primary/central)
 "rAA" = (
 /obj/machinery/pdapainter,
 /turf/open/floor/iron,
@@ -57869,6 +57959,7 @@
 /obj/structure/railing{
 	dir = 4
 	},
+/obj/structure/sign/directions/supply/directional/north,
 /turf/open/floor/iron,
 /area/mine/eva/lower)
 "sAc" = (
@@ -59986,6 +60077,19 @@
 	},
 /turf/open/floor/plating,
 /area/station/maintenance/starboard/lesser)
+"tlG" = (
+/obj/structure/sign/directions/engineering/directional/south{
+	pixel_y = -8
+	},
+/obj/structure/sign/directions/supply{
+	dir = 8;
+	pixel_y = 1
+	},
+/obj/structure/sign/directions/command{
+	pixel_y = 10
+	},
+/turf/closed/wall,
+/area/station/hallway/primary/central)
 "tlH" = (
 /turf/open/openspace/icemoon,
 /area/icemoon/surface/outdoors/nospawn)
@@ -66872,6 +66976,12 @@
 	},
 /turf/open/floor/plating,
 /area/station/maintenance/fore)
+"vzl" = (
+/obj/structure/sign/directions/science/directional/south{
+	pixel_y = 10
+	},
+/turf/closed/wall/r_wall,
+/area/station/science/robotics/lab)
 "vzo" = (
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -67599,6 +67709,12 @@
 /obj/structure/cable,
 /turf/open/floor/plating,
 /area/station/maintenance/department/crew_quarters/bar)
+"vJN" = (
+/obj/structure/sign/directions/supply/directional/west{
+	pixel_y = -8
+	},
+/turf/closed/wall,
+/area/station/hallway/primary/central)
 "vJS" = (
 /obj/structure/chair/sofa/corp/right{
 	dir = 4;
@@ -67754,6 +67870,19 @@
 /obj/structure/cable/layer3,
 /turf/open/floor/plating,
 /area/station/ai_monitored/turret_protected/aisat_interior)
+"vMO" = (
+/obj/structure/sign/directions/security{
+	dir = 1;
+	pixel_x = 32;
+	pixel_y = 1
+	},
+/obj/structure/sign/directions/evac{
+	dir = 4;
+	pixel_x = 32;
+	pixel_y = -8
+	},
+/turf/open/floor/iron,
+/area/station/hallway/primary/central)
 "vMR" = (
 /obj/structure/table/glass,
 /obj/item/seeds/glowshroom,
@@ -70701,6 +70830,13 @@
 /obj/item/flashlight/lamp,
 /turf/open/floor/wood,
 /area/station/hallway/secondary/service)
+"wJg" = (
+/obj/effect/spawner/structure/window,
+/obj/structure/sign/directions/vault/directional/east{
+	pixel_y = 1
+	},
+/turf/open/floor/plating,
+/area/station/commons/storage/primary)
 "wJi" = (
 /obj/structure/railing{
 	dir = 4
@@ -71242,17 +71378,6 @@
 /obj/machinery/camera/directional/north{
 	c_tag = "Central Hallway North"
 	},
-/obj/structure/sign/directions/supply{
-	dir = 8;
-	pixel_y = 32
-	},
-/obj/structure/sign/directions/vault{
-	dir = 8;
-	pixel_y = 24
-	},
-/obj/structure/sign/directions/command{
-	pixel_y = 40
-	},
 /obj/effect/turf_decal/tile/blue/half/contrasted{
 	dir = 1
 	},
@@ -71374,6 +71499,14 @@
 	},
 /turf/open/floor/iron,
 /area/station/hallway/primary/port)
+"wTr" = (
+/obj/structure/sign/directions/security{
+	dir = 1;
+	pixel_x = 32;
+	pixel_y = 1
+	},
+/turf/closed/wall/r_wall,
+/area/station/ai_monitored/command/storage/eva)
 "wTw" = (
 /obj/effect/turf_decal/trimline/neutral/warning{
 	dir = 10
@@ -72188,6 +72321,12 @@
 	},
 /turf/open/floor/iron/smooth,
 /area/station/security/execution/transfer)
+"xgf" = (
+/obj/structure/sign/directions/dorms/directional/north{
+	pixel_y = 1
+	},
+/turf/closed/wall,
+/area/station/hallway/primary/central)
 "xgg" = (
 /obj/structure/rack,
 /obj/item/clothing/suit/hooded/wintercoat/eva{
@@ -72210,20 +72349,10 @@
 /turf/open/floor/engine,
 /area/station/engineering/atmos/hfr_room)
 "xgm" = (
-/obj/structure/sign/directions/evac{
-	dir = 4;
-	pixel_x = -31;
-	pixel_y = -32
-	},
 /obj/structure/sign/directions/engineering{
-	pixel_x = -31;
+	pixel_x = -32;
 	pixel_y = -40
 	},
-/obj/structure/sign/directions/security{
-	dir = 4;
-	pixel_x = -31;
-	pixel_y = -24
-	},
 /turf/open/floor/iron,
 /area/station/hallway/primary/central)
 "xgr" = (
@@ -72360,6 +72489,13 @@
 "xhK" = (
 /turf/closed/wall/r_wall,
 /area/station/security/prison/safe)
+"xhM" = (
+/obj/structure/sign/directions/vault{
+	dir = 8;
+	pixel_y = 10
+	},
+/turf/closed/wall/r_wall,
+/area/station/maintenance/port/fore)
 "xie" = (
 /obj/machinery/camera/directional/west{
 	c_tag = "Engineering MiniSat Access"
@@ -72929,6 +73065,14 @@
 /obj/effect/turf_decal/tile/yellow/half/contrasted,
 /turf/open/floor/iron,
 /area/station/hallway/primary/aft)
+"xst" = (
+/obj/structure/sign/directions/evac{
+	dir = 4;
+	pixel_x = -32;
+	pixel_y = 1
+	},
+/turf/closed/wall,
+/area/station/maintenance/port/fore)
 "xsv" = (
 /obj/machinery/door/airlock/engineering{
 	name = "Tech Storage"
@@ -74172,6 +74316,13 @@
 	},
 /turf/open/floor/iron/cafeteria,
 /area/station/security/prison/work)
+"xMe" = (
+/obj/structure/disposalpipe/segment,
+/obj/structure/sign/directions/engineering/directional/west{
+	pixel_y = -8
+	},
+/turf/open/floor/iron,
+/area/station/hallway/primary/central)
 "xMg" = (
 /obj/machinery/computer/security,
 /obj/structure/reagent_dispensers/wall/peppertank/directional/north,
@@ -75591,6 +75742,20 @@
 /obj/effect/turf_decal/tile/yellow{
 	dir = 8
 	},
+/obj/structure/sign/directions/evac{
+	dir = 4;
+	pixel_x = -32;
+	pixel_y = -8
+	},
+/obj/structure/sign/directions/medical{
+	dir = 4;
+	pixel_x = -32;
+	pixel_y = 1
+	},
+/obj/structure/sign/directions/engineering{
+	pixel_x = -32;
+	pixel_y = 10
+	},
 /turf/open/floor/iron,
 /area/station/hallway/primary/aft)
 "ylM" = (
@@ -161344,7 +161509,7 @@ gjq
 gjq
 gjq
 dLf
-vfg
+lXd
 ajw
 rty
 lNH
@@ -221970,7 +222135,7 @@ kMu
 esB
 oCO
 xJv
-hnV
+fsv
 fsv
 nDk
 fsv
@@ -222227,7 +222392,7 @@ slv
 rEN
 oCO
 oCO
-oCO
+nOy
 aPI
 iKR
 aPI
@@ -222484,7 +222649,7 @@ nxV
 nor
 qiT
 cgw
-hjv
+oYF
 gpp
 ons
 eVy
@@ -223255,7 +223420,7 @@ fzF
 mAV
 jzr
 psr
-oCO
+lNL
 wpO
 oRM
 oel
@@ -224544,7 +224709,7 @@ fYS
 hTo
 aJA
 tAR
-qnj
+ffc
 gYR
 vqg
 oGX
@@ -225568,7 +225733,7 @@ tak
 skj
 kkK
 lNP
-vQt
+wJg
 gpp
 aJA
 oel
@@ -230708,11 +230873,11 @@ spV
 gad
 gAk
 tMI
-hDU
+jWD
 vAY
 ons
 eNE
-bXm
+eIy
 mWs
 lSg
 mTh
@@ -230723,7 +230888,7 @@ lpj
 gst
 jWU
 oiK
-bLW
+esR
 xjP
 jIA
 gxO
@@ -230965,7 +231130,7 @@ biY
 biY
 biY
 biY
-biY
+xhM
 wkC
 lnE
 wkC
@@ -230980,7 +231145,7 @@ eBd
 wJR
 tDF
 tKZ
-gst
+fzN
 rCC
 rCC
 wEh
@@ -231222,7 +231387,7 @@ iLK
 det
 iLK
 vBi
-lJO
+xst
 rwQ
 iuv
 xgm
@@ -232022,7 +232187,7 @@ rcE
 rcE
 rcE
 hVc
-jII
+fsC
 dnq
 ylU
 bEK
@@ -232279,7 +232444,7 @@ nzk
 iIA
 iIA
 eAV
-jII
+vJN
 phx
 ylU
 dnq
@@ -234810,7 +234975,7 @@ hzY
 jHm
 fng
 lBt
-bWn
+wTr
 bWn
 tgn
 tgn
@@ -235075,7 +235240,7 @@ raL
 rxA
 pfe
 pfe
-jII
+tlG
 wRC
 qLt
 uom
@@ -235366,7 +235531,7 @@ oUE
 kta
 qQG
 nlT
-krv
+dnq
 ylF
 fdy
 fdy
@@ -237133,7 +237298,7 @@ ygB
 vXU
 drZ
 yfF
-jII
+xgf
 mpy
 wtb
 bmz
@@ -239218,7 +239383,7 @@ mhQ
 rXN
 mhQ
 mhQ
-mhQ
+cjR
 dnq
 jtE
 vXh
@@ -239475,7 +239640,7 @@ aVw
 gxq
 rlb
 vBh
-vBh
+xMe
 vBh
 uuq
 vlf
@@ -239972,11 +240137,11 @@ dby
 otQ
 dnq
 mpy
-dnq
-dKW
+vMO
+bep
 ylU
-lDo
 dnq
+rAx
 iuu
 dnq
 dnq
@@ -240461,7 +240626,7 @@ ykA
 skl
 gmW
 gmW
-gmW
+nBh
 ltV
 mAz
 oSk
@@ -240486,7 +240651,7 @@ xgy
 xgy
 uTN
 jBq
-hmb
+rjb
 lso
 dEV
 bai
@@ -246397,7 +246562,7 @@ haN
 kqA
 tUS
 cpY
-ivB
+jqD
 lso
 brj
 pJC
@@ -246654,7 +246819,7 @@ kKL
 kKL
 kKL
 kKL
-kKL
+fTw
 rqT
 pfB
 gBq
@@ -251027,7 +251192,7 @@ iQQ
 rvZ
 cYE
 lso
-ult
+cLO
 vuq
 tfM
 rIU
@@ -251284,7 +251449,7 @@ hUD
 rqT
 cjl
 rqT
-ult
+vzl
 ult
 wBk
 rIU
diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm
index 365d9e8a5f6a..975e7f4f6a7b 100644
--- a/_maps/map_files/MetaStation/MetaStation.dmm
+++ b/_maps/map_files/MetaStation/MetaStation.dmm
@@ -3129,6 +3129,7 @@
 	dir = 1
 	},
 /obj/effect/mapping_helpers/broken_floor,
+/obj/structure/sign/directions/upload/directional/east,
 /turf/open/floor/plating,
 /area/station/maintenance/fore/lesser)
 "bec" = (
@@ -5814,11 +5815,12 @@
 /area/station/security/prison)
 "chZ" = (
 /obj/structure/sign/directions/engineering{
-	dir = 4
+	dir = 4;
+	pixel_y = 1
 	},
 /obj/structure/sign/directions/security{
 	dir = 1;
-	pixel_y = 8
+	pixel_y = 10
 	},
 /obj/structure/sign/directions/command{
 	dir = 8;
@@ -5936,6 +5938,7 @@
 /area/station/security/detectives_office)
 "clA" = (
 /obj/structure/sign/departments/cargo,
+/obj/structure/sign/directions/vault/directional/north,
 /turf/closed/wall,
 /area/station/cargo/warehouse)
 "clE" = (
@@ -8041,6 +8044,7 @@
 "daz" = (
 /obj/effect/turf_decal/tile/neutral/fourcorners,
 /obj/machinery/atm,
+/obj/structure/sign/directions/cryo/directional/west,
 /turf/open/floor/iron/dark,
 /area/station/commons/fitness/recreation)
 "daC" = (
@@ -14095,10 +14099,11 @@
 "fmS" = (
 /obj/structure/sign/directions/security{
 	dir = 1;
-	pixel_y = 8
+	pixel_y = 10
 	},
 /obj/structure/sign/directions/engineering{
-	dir = 4
+	dir = 4;
+	pixel_y = 1
 	},
 /obj/structure/sign/directions/command{
 	dir = 1;
@@ -15902,9 +15907,11 @@
 /turf/open/floor/carpet,
 /area/station/command/heads_quarters/hop)
 "gaV" = (
-/obj/structure/sign/directions/evac,
+/obj/structure/sign/directions/evac{
+	pixel_y = 1
+	},
 /obj/structure/sign/directions/medical{
-	pixel_y = 8
+	pixel_y = 10
 	},
 /obj/structure/sign/directions/science{
 	pixel_y = -8
@@ -30249,10 +30256,11 @@
 	},
 /obj/structure/sign/directions/security{
 	dir = 1;
-	pixel_y = 8
+	pixel_y = 10
 	},
 /obj/structure/sign/directions/engineering{
-	dir = 4
+	dir = 4;
+	pixel_y = 1
 	},
 /turf/closed/wall,
 /area/station/hallway/secondary/command)
@@ -32404,6 +32412,10 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /turf/open/floor/plating,
 /area/station/maintenance/fore)
+"lLO" = (
+/obj/structure/sign/directions/cryo/directional/north,
+/turf/closed/wall,
+/area/station/commons/toilet/restrooms)
 "lLR" = (
 /obj/machinery/atmospherics/pipe/smart/simple/purple/visible{
 	dir = 8
@@ -33893,9 +33905,11 @@
 /turf/open/floor/iron/dark,
 /area/station/command/gateway)
 "mnx" = (
-/obj/structure/sign/directions/evac,
+/obj/structure/sign/directions/evac{
+	pixel_y = 1
+	},
 /obj/structure/sign/directions/medical{
-	pixel_y = 8
+	pixel_y = 10
 	},
 /obj/structure/sign/directions/science{
 	pixel_y = -8
@@ -34433,9 +34447,11 @@
 /turf/open/floor/iron,
 /area/station/security/checkpoint/science)
 "myG" = (
-/obj/structure/sign/directions/evac,
+/obj/structure/sign/directions/evac{
+	pixel_y = 1
+	},
 /obj/structure/sign/directions/medical{
-	pixel_y = 8
+	pixel_y = 10
 	},
 /obj/structure/sign/directions/science{
 	pixel_y = -8
@@ -35637,9 +35653,11 @@
 "mST" = (
 /obj/structure/sign/directions/medical{
 	dir = 8;
-	pixel_y = 8
+	pixel_y = 10
+	},
+/obj/structure/sign/directions/evac{
+	pixel_y = 1
 	},
-/obj/structure/sign/directions/evac,
 /obj/structure/sign/directions/science{
 	dir = 4;
 	pixel_y = -8
@@ -40347,6 +40365,7 @@
 	},
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/sign/directions/cryo/directional/north,
 /turf/open/floor/iron,
 /area/station/hallway/primary/central)
 "oAj" = (
@@ -45595,9 +45614,11 @@
 /turf/open/floor/plating,
 /area/station/maintenance/solars/port/fore)
 "qwR" = (
-/obj/structure/sign/directions/evac,
+/obj/structure/sign/directions/evac{
+	pixel_y = 1
+	},
 /obj/structure/sign/directions/medical{
-	pixel_y = 8
+	pixel_y = 10
 	},
 /obj/structure/sign/directions/science{
 	pixel_y = -8
@@ -55928,9 +55949,11 @@
 	pixel_y = -8
 	},
 /obj/structure/sign/directions/medical{
-	pixel_y = 8
+	pixel_y = 10
+	},
+/obj/structure/sign/directions/evac{
+	pixel_y = 1
 	},
-/obj/structure/sign/directions/evac,
 /turf/closed/wall/r_wall,
 /area/station/ai_monitored/command/storage/eva)
 "ubl" = (
@@ -58737,10 +58760,11 @@
 "uZj" = (
 /obj/structure/sign/directions/security{
 	dir = 1;
-	pixel_y = 8
+	pixel_y = 10
 	},
 /obj/structure/sign/directions/engineering{
-	dir = 4
+	dir = 4;
+	pixel_y = 1
 	},
 /obj/structure/sign/directions/command{
 	pixel_y = -8
@@ -64344,6 +64368,10 @@
 	},
 /turf/open/floor/grass,
 /area/station/science/research)
+"wZi" = (
+/obj/structure/sign/directions/arrival/directional/west,
+/turf/closed/wall,
+/area/station/command/heads_quarters/qm)
 "wZk" = (
 /obj/machinery/light_switch/directional/north,
 /obj/structure/showcase/cyborg/old{
@@ -66814,10 +66842,11 @@
 "xUB" = (
 /obj/structure/sign/directions/security{
 	dir = 1;
-	pixel_y = 8
+	pixel_y = 10
 	},
 /obj/structure/sign/directions/engineering{
-	dir = 4
+	dir = 4;
+	pixel_y = 1
 	},
 /obj/structure/sign/directions/command{
 	pixel_y = -8
@@ -85907,7 +85936,7 @@ cjJ
 cjJ
 cLc
 vkR
-kQP
+wZi
 dWF
 xOw
 mux
@@ -102593,7 +102622,7 @@ fbg
 dIO
 dIO
 dIO
-dIO
+lLO
 tTT
 vLA
 qsK
diff --git a/_maps/map_files/tramstation/tramstation.dmm b/_maps/map_files/tramstation/tramstation.dmm
index 4bcd8d51e13e..44722222902c 100644
--- a/_maps/map_files/tramstation/tramstation.dmm
+++ b/_maps/map_files/tramstation/tramstation.dmm
@@ -5551,21 +5551,17 @@
 "aGN" = (
 /obj/structure/sign/directions/supply{
 	dir = 4;
-	pixel_y = 28
+	pixel_y = 24
 	},
 /obj/structure/sign/directions/security{
 	dir = 8;
-	pixel_y = 34
+	pixel_y = 32
 	},
 /obj/structure/sign/directions/command{
 	dir = 8;
 	pixel_y = 40
 	},
 /obj/machinery/light/directional/north,
-/obj/structure/sign/directions/vault{
-	dir = 8;
-	pixel_y = 22
-	},
 /obj/effect/turf_decal/trimline/yellow/filled/line{
 	dir = 1
 	},
@@ -5602,19 +5598,15 @@
 "aGQ" = (
 /obj/structure/sign/directions/evac{
 	dir = 4;
-	pixel_y = 28
+	pixel_y = 24
 	},
 /obj/structure/sign/directions/medical{
-	pixel_y = 34
+	pixel_y = 32
 	},
 /obj/structure/sign/directions/engineering{
 	pixel_y = 40
 	},
 /obj/machinery/light/directional/north,
-/obj/structure/sign/directions/upload{
-	dir = 4;
-	pixel_y = 22
-	},
 /obj/effect/turf_decal/trimline/yellow/filled/line{
 	dir = 1
 	},
@@ -7339,6 +7331,9 @@
 /obj/structure/disposalpipe/segment{
 	dir = 5
 	},
+/obj/structure/sign/directions/upload/directional/south{
+	pixel_y = -39
+	},
 /turf/open/floor/iron/white,
 /area/station/science/research)
 "aXN" = (
@@ -11891,6 +11886,10 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /turf/open/floor/plating,
 /area/station/maintenance/tram/mid)
+"cuS" = (
+/obj/structure/sign/directions/upload/directional/east,
+/turf/closed/wall,
+/area/station/maintenance/department/science)
 "cvf" = (
 /obj/machinery/door/window{
 	name = "Captain's Desk";
@@ -12614,6 +12613,13 @@
 /obj/structure/flora/bush/lavendergrass/style_random,
 /turf/open/floor/grass,
 /area/station/medical/virology)
+"cHA" = (
+/obj/structure/sign/directions/vault{
+	dir = 1;
+	pixel_y = 30
+	},
+/turf/closed/wall/r_wall,
+/area/station/command/bridge)
 "cHH" = (
 /obj/effect/turf_decal/stripes/line,
 /obj/structure/closet/bombcloset,
@@ -14886,6 +14892,10 @@
 	},
 /turf/open/floor/plating/airless,
 /area/station/science/ordnance/bomb)
+"duu" = (
+/obj/structure/sign/directions/upload/directional/east,
+/turf/closed/wall/r_wall,
+/area/station/science/xenobiology)
 "duA" = (
 /obj/effect/turf_decal/trimline/neutral/filled/corner,
 /obj/effect/turf_decal/trimline/neutral/filled/line{
@@ -22091,6 +22101,7 @@
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
 	dir = 4
 	},
+/obj/structure/extinguisher_cabinet/directional/north,
 /turf/open/floor/iron/smooth,
 /area/station/hallway/primary/tram/left)
 "fNV" = (
@@ -22451,6 +22462,10 @@
 	},
 /turf/open/floor/plating,
 /area/station/ai_monitored/turret_protected/aisat/foyer)
+"fVL" = (
+/obj/structure/sign/directions/upload/directional/east,
+/turf/open/floor/iron/stairs/right,
+/area/station/science/lower)
 "fVX" = (
 /obj/effect/turf_decal/trimline/dark_green/filled/line{
 	dir = 1
@@ -27422,6 +27437,7 @@
 "hHu" = (
 /obj/machinery/light/directional/west,
 /obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/structure/sign/directions/dorms/directional/west,
 /turf/open/floor/iron,
 /area/station/commons/fitness)
 "hHI" = (
@@ -27434,6 +27450,12 @@
 	},
 /turf/open/floor/iron,
 /area/station/security/checkpoint/arrivals)
+"hIb" = (
+/obj/structure/sign/directions/upload{
+	pixel_y = 25
+	},
+/turf/closed/wall,
+/area/station/commons/vacant_room/commissary)
 "hIt" = (
 /obj/structure/railing{
 	dir = 1
@@ -28062,6 +28084,10 @@
 /obj/effect/turf_decal/tile/neutral/fourcorners,
 /turf/open/floor/iron/dark,
 /area/station/ai_monitored/command/storage/eva)
+"hTK" = (
+/obj/structure/sign/directions/dorms/directional/east,
+/turf/closed/wall,
+/area/station/maintenance/department/crew_quarters/dorms)
 "hTL" = (
 /obj/effect/turf_decal/trimline/neutral/filled/corner{
 	dir = 1
@@ -28754,21 +28780,17 @@
 "ieY" = (
 /obj/structure/sign/directions/evac{
 	dir = 4;
-	pixel_y = -28
+	pixel_y = -24
 	},
 /obj/structure/sign/directions/medical{
 	dir = 4;
-	pixel_y = -34
+	pixel_y = -32
 	},
 /obj/structure/sign/directions/engineering{
 	dir = 4;
 	pixel_y = -40
 	},
 /obj/machinery/light/directional/south,
-/obj/structure/sign/directions/upload{
-	dir = 4;
-	pixel_y = -22
-	},
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
@@ -30585,21 +30607,17 @@
 "iLh" = (
 /obj/structure/sign/directions/supply{
 	dir = 4;
-	pixel_y = 28
+	pixel_y = 24
 	},
 /obj/structure/sign/directions/security{
 	dir = 1;
-	pixel_y = 34
+	pixel_y = 40
 	},
 /obj/structure/sign/directions/command{
 	dir = 1;
 	pixel_y = 40
 	},
 /obj/machinery/light/directional/north,
-/obj/structure/sign/directions/vault{
-	dir = 1;
-	pixel_y = 22
-	},
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
@@ -30693,6 +30711,10 @@
 /obj/effect/turf_decal/sand/plating,
 /turf/open/floor/plating,
 /area/station/maintenance/starboard/central)
+"iMh" = (
+/obj/structure/sign/directions/dorms/directional/west,
+/turf/closed/wall,
+/area/station/maintenance/department/crew_quarters/dorms)
 "iMj" = (
 /obj/machinery/door/firedoor,
 /obj/effect/turf_decal/stripes/white/full,
@@ -36848,6 +36870,13 @@
 /obj/effect/mapping_helpers/airlock/access/all/service/lawyer,
 /turf/open/floor/wood,
 /area/station/service/lawoffice)
+"kKC" = (
+/obj/structure/sign/directions/security{
+	dir = 1;
+	pixel_y = 40
+	},
+/turf/closed/wall/r_wall,
+/area/station/command/heads_quarters/captain/private)
 "kKF" = (
 /obj/effect/turf_decal/trimline/yellow/filled/corner{
 	dir = 8
@@ -36915,7 +36944,10 @@
 /obj/effect/turf_decal/trimline/blue/filled/line{
 	dir = 9
 	},
-/obj/machinery/firealarm/directional/west,
+/obj/machinery/firealarm/directional/west{
+	pixel_x = -25;
+	pixel_y = -5
+	},
 /obj/machinery/atm,
 /turf/open/floor/iron/white,
 /area/station/medical/medbay/lobby)
@@ -40314,21 +40346,17 @@
 "lPu" = (
 /obj/structure/sign/directions/supply{
 	dir = 4;
-	pixel_y = -28
+	pixel_y = -24
 	},
 /obj/structure/sign/directions/security{
 	dir = 8;
-	pixel_y = -34
+	pixel_y = -32
 	},
 /obj/structure/sign/directions/command{
 	dir = 8;
 	pixel_y = -40
 	},
 /obj/machinery/light/directional/south,
-/obj/structure/sign/directions/vault{
-	dir = 8;
-	pixel_y = -22
-	},
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
@@ -41522,6 +41550,10 @@
 "mgS" = (
 /turf/open/floor/iron/cafeteria,
 /area/station/security/prison/mess)
+"mgU" = (
+/obj/structure/sign/directions/cryo/directional/south,
+/turf/closed/wall,
+/area/station/security/checkpoint/arrivals)
 "mhl" = (
 /obj/effect/turf_decal/trimline/purple/filled/line{
 	dir = 4
@@ -41941,6 +41973,7 @@
 "moE" = (
 /obj/machinery/vending/wardrobe/science_wardrobe,
 /obj/effect/turf_decal/tile/purple/fourcorners,
+/obj/structure/sign/directions/upload/directional/south,
 /turf/open/floor/iron/white,
 /area/station/science/lower)
 "moH" = (
@@ -43114,6 +43147,13 @@
 /obj/structure/cable,
 /turf/open/floor/iron,
 /area/station/commons/dorms)
+"mJl" = (
+/obj/structure/sign/directions/security{
+	dir = 1;
+	pixel_y = -32
+	},
+/turf/open/openspace,
+/area/station/hallway/primary/tram/left)
 "mJm" = (
 /obj/effect/spawner/random/engineering/tracking_beacon,
 /obj/effect/turf_decal/tile/blue/fourcorners,
@@ -43376,6 +43416,16 @@
 /obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance,
 /turf/open/floor/plating,
 /area/station/maintenance/starboard/greater)
+"mOV" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/trimline/neutral/filled/line,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/sign/directions/upload{
+	dir = 4;
+	pixel_y = -30
+	},
+/turf/open/floor/iron/smooth,
+/area/station/hallway/primary/tram/left)
 "mOZ" = (
 /obj/machinery/door/airlock/security{
 	name = "Labor Shuttle"
@@ -45952,20 +46002,17 @@
 "nFm" = (
 /obj/structure/sign/directions/evac{
 	dir = 4;
-	pixel_y = 28
+	pixel_y = 24
 	},
 /obj/structure/sign/directions/medical{
 	dir = 8;
-	pixel_y = 34
+	pixel_y = 32
 	},
 /obj/structure/sign/directions/engineering{
 	dir = 8;
 	pixel_y = 40
 	},
 /obj/machinery/light/directional/north,
-/obj/structure/sign/directions/upload{
-	pixel_y = 22
-	},
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/effect/turf_decal/trimline/yellow/filled/line{
@@ -46010,21 +46057,17 @@
 "nFE" = (
 /obj/structure/sign/directions/supply{
 	dir = 1;
-	pixel_y = -28
+	pixel_y = -24
 	},
 /obj/structure/sign/directions/security{
 	dir = 8;
-	pixel_y = -34
+	pixel_y = -32
 	},
 /obj/structure/sign/directions/command{
 	dir = 8;
 	pixel_y = -40
 	},
 /obj/machinery/light/directional/south,
-/obj/structure/sign/directions/vault{
-	dir = 8;
-	pixel_y = -22
-	},
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
@@ -48510,6 +48553,10 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /turf/open/floor/catwalk_floor/iron,
 /area/station/security/prison)
+"oxT" = (
+/obj/structure/sign/directions/arrival/directional/west,
+/turf/closed/wall,
+/area/station/construction/mining/aux_base)
 "oyp" = (
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating,
@@ -50464,6 +50511,13 @@
 /obj/machinery/light/small/directional/west,
 /turf/open/floor/plating,
 /area/station/maintenance/central/greater)
+"piQ" = (
+/obj/effect/spawner/structure/window,
+/obj/structure/sign/directions/engineering{
+	pixel_y = 40
+	},
+/turf/open/floor/plating,
+/area/station/medical/medbay/lobby)
 "piT" = (
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
@@ -52129,18 +52183,14 @@
 "pGz" = (
 /obj/structure/sign/directions/evac{
 	dir = 4;
-	pixel_y = -28
+	pixel_y = -24
 	},
 /obj/structure/sign/directions/medical{
-	pixel_y = -34
+	pixel_y = -32
 	},
 /obj/structure/sign/directions/engineering{
 	pixel_y = -40
 	},
-/obj/structure/sign/directions/upload{
-	dir = 4;
-	pixel_y = -22
-	},
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
@@ -52705,6 +52755,10 @@
 /obj/structure/cable,
 /turf/open/floor/iron,
 /area/station/commons/storage/primary)
+"pOW" = (
+/obj/structure/sign/directions/vault/directional/west,
+/turf/closed/wall,
+/area/station/hallway/primary/tram/left)
 "pOZ" = (
 /obj/machinery/portable_atmospherics/scrubber,
 /obj/effect/turf_decal/trimline/red/filled/line{
@@ -54306,21 +54360,17 @@
 "qrm" = (
 /obj/structure/sign/directions/supply{
 	dir = 1;
-	pixel_y = 28
+	pixel_y = 24
 	},
 /obj/structure/sign/directions/security{
 	dir = 8;
-	pixel_y = 34
+	pixel_y = 32
 	},
 /obj/structure/sign/directions/command{
 	dir = 8;
 	pixel_y = 40
 	},
 /obj/machinery/light/directional/north,
-/obj/structure/sign/directions/vault{
-	dir = 8;
-	pixel_y = 22
-	},
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/effect/turf_decal/trimline/yellow/filled/line{
 	dir = 1
@@ -55742,6 +55792,10 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/iron/dark,
 /area/station/service/hydroponics)
+"qMj" = (
+/obj/structure/sign/directions/vault/directional/west,
+/turf/closed/wall,
+/area/station/hallway/primary/tram/center)
 "qMx" = (
 /obj/machinery/door/airlock/external{
 	name = "Port Docking Bay 3"
@@ -60211,6 +60265,7 @@
 	dir = 1
 	},
 /obj/effect/mapping_helpers/airlock/access/any/supply/maintenance,
+/obj/structure/sign/directions/vault/directional/west,
 /turf/open/floor/iron/smooth,
 /area/station/maintenance/department/cargo)
 "skX" = (
@@ -60748,7 +60803,6 @@
 /obj/effect/turf_decal/trimline/neutral/filled/line{
 	dir = 9
 	},
-/obj/machinery/newscaster/directional/west,
 /obj/machinery/status_display/evac/directional/north,
 /obj/structure/closet/secure_closet/personal,
 /turf/open/floor/iron,
@@ -61752,6 +61806,10 @@
 /obj/item/stack/package_wrap,
 /obj/item/hand_labeler,
 /obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/structure/sign/directions/evac{
+	dir = 4;
+	pixel_y = -37
+	},
 /turf/open/floor/iron/dark,
 /area/station/commons/vacant_room/commissary)
 "sKg" = (
@@ -64362,6 +64420,13 @@
 	},
 /turf/open/floor/iron/dark,
 /area/station/science/explab)
+"tyr" = (
+/obj/structure/sign/directions/security{
+	dir = 1;
+	pixel_y = 40
+	},
+/turf/closed/wall/r_wall,
+/area/station/command/teleporter)
 "tyx" = (
 /obj/structure/closet{
 	name = "Evidence Closet 1"
@@ -64906,21 +64971,17 @@
 "tIJ" = (
 /obj/structure/sign/directions/evac{
 	dir = 4;
-	pixel_y = 28
+	pixel_y = 24
 	},
 /obj/structure/sign/directions/medical{
 	dir = 4;
-	pixel_y = 34
+	pixel_y = 32
 	},
 /obj/structure/sign/directions/engineering{
 	dir = 4;
 	pixel_y = 40
 	},
 /obj/machinery/light/directional/north,
-/obj/structure/sign/directions/upload{
-	dir = 4;
-	pixel_y = 22
-	},
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
@@ -68033,6 +68094,9 @@
 /obj/machinery/door/firedoor,
 /obj/effect/turf_decal/stripes/white/full,
 /obj/effect/turf_decal/trimline/purple/filled/line,
+/obj/structure/sign/directions/upload/directional/south{
+	pixel_y = -39
+	},
 /turf/open/floor/iron/white,
 /area/station/science/research)
 "uHm" = (
@@ -68430,6 +68494,10 @@
 	},
 /turf/open/floor/engine,
 /area/station/science/xenobiology)
+"uMd" = (
+/obj/structure/sign/directions/upload/directional/east,
+/turf/closed/wall,
+/area/station/maintenance/department/medical)
 "uMg" = (
 /obj/structure/table,
 /obj/item/radio/intercom,
@@ -68817,6 +68885,7 @@
 "uTu" = (
 /obj/machinery/light/directional/east,
 /obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/structure/sign/directions/dorms/directional/east,
 /turf/open/floor/iron,
 /area/station/commons/fitness)
 "uTz" = (
@@ -69754,20 +69823,17 @@
 "vie" = (
 /obj/structure/sign/directions/evac{
 	dir = 4;
-	pixel_y = -28
+	pixel_y = -24
 	},
 /obj/structure/sign/directions/medical{
 	dir = 8;
-	pixel_y = -34
+	pixel_y = -32
 	},
 /obj/structure/sign/directions/engineering{
 	dir = 8;
 	pixel_y = -40
 	},
 /obj/machinery/light/directional/south,
-/obj/structure/sign/directions/upload{
-	pixel_y = -22
-	},
 /obj/structure/cable,
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -70411,6 +70477,10 @@
 /obj/machinery/duct,
 /turf/open/floor/catwalk_floor,
 /area/station/maintenance/central/lesser)
+"vqq" = (
+/obj/structure/sign/directions/vault/directional/north,
+/turf/closed/wall/r_wall,
+/area/station/maintenance/port/central)
 "vqz" = (
 /obj/machinery/button/door/directional/north{
 	pixel_x = 9;
@@ -71013,6 +71083,14 @@
 	},
 /turf/open/floor/plating,
 /area/station/maintenance/port/aft)
+"vzF" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/trimline/neutral/filled/line,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/extinguisher_cabinet/directional/south,
+/turf/open/floor/iron/smooth,
+/area/station/hallway/primary/tram/left)
 "vzQ" = (
 /obj/structure/closet/cardboard,
 /obj/effect/spawner/random/maintenance/four,
@@ -72703,6 +72781,14 @@
 /obj/structure/cable,
 /turf/open/openspace,
 /area/station/solars/starboard/fore)
+"vZY" = (
+/obj/effect/turf_decal/trimline/neutral/filled/line,
+/obj/structure/sign/directions/evac{
+	dir = 4;
+	pixel_y = -26
+	},
+/turf/open/floor/iron,
+/area/station/hallway/secondary/exit)
 "vZZ" = (
 /obj/machinery/duct,
 /obj/structure/cable,
@@ -73630,21 +73716,17 @@
 "wqg" = (
 /obj/structure/sign/directions/supply{
 	dir = 4;
-	pixel_y = -28
+	pixel_y = -24
 	},
 /obj/structure/sign/directions/security{
 	dir = 1;
-	pixel_y = -34
+	pixel_y = -32
 	},
 /obj/structure/sign/directions/command{
 	dir = 1;
 	pixel_y = -40
 	},
 /obj/machinery/light/directional/south,
-/obj/structure/sign/directions/vault{
-	dir = 1;
-	pixel_y = -22
-	},
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
@@ -77473,6 +77555,10 @@
 	},
 /turf/open/floor/iron,
 /area/station/maintenance/department/security)
+"xHK" = (
+/obj/structure/sign/directions/arrival/directional/west,
+/turf/closed/wall,
+/area/station/service/hydroponics/garden)
 "xHL" = (
 /obj/machinery/door/airlock/maintenance_hatch{
 	name = "Tunnel Access Hatch"
@@ -79194,6 +79280,10 @@
 /obj/structure/cable,
 /turf/open/floor/catwalk_floor,
 /area/station/maintenance/starboard/central)
+"yjs" = (
+/obj/structure/sign/directions/arrival/directional/west,
+/turf/closed/wall,
+/area/station/command/heads_quarters/hop)
 "yjz" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/disposalpipe/segment,
@@ -96795,7 +96885,7 @@ elr
 fOs
 ala
 toy
-apC
+iMh
 eAE
 apC
 uqm
@@ -97279,7 +97369,7 @@ rUR
 hMQ
 uaC
 lQM
-lQM
+vqq
 hWa
 pZW
 pVD
@@ -98307,7 +98397,7 @@ rUR
 jVG
 tVe
 lQM
-lQM
+vqq
 hWa
 pZW
 pVD
@@ -98851,7 +98941,7 @@ elr
 fOs
 alb
 toy
-apC
+hTK
 lgu
 apC
 dXm
@@ -123791,7 +123881,7 @@ qwX
 dUT
 kEN
 eHE
-eHE
+fVL
 asc
 rin
 dUT
@@ -127659,7 +127749,7 @@ fip
 fip
 dUT
 aaa
-qVr
+duu
 qiI
 gNz
 bfH
@@ -156655,7 +156745,7 @@ oca
 uhv
 vyI
 biI
-oca
+oxT
 jNb
 qsa
 wdU
@@ -156667,7 +156757,7 @@ jNb
 fLN
 tRo
 jNb
-ckM
+xHK
 nEF
 jBy
 iHr
@@ -160752,7 +160842,7 @@ eQR
 dxC
 dxC
 dxC
-ief
+tyr
 ief
 ujt
 ujt
@@ -160776,7 +160866,7 @@ jSd
 mof
 aGh
 cKd
-jvf
+yjs
 rRK
 tel
 yiM
@@ -162052,7 +162142,7 @@ aQO
 aQO
 aQO
 aQO
-aQO
+cHA
 qhM
 wqg
 yiM
@@ -162060,7 +162150,7 @@ cFs
 lNP
 nJq
 vVY
-cFs
+mJl
 yiM
 iLh
 rLP
@@ -162324,7 +162414,7 @@ uHT
 fSr
 fSr
 pjg
-fSr
+mgU
 fSr
 qOF
 qOF
@@ -164380,7 +164470,7 @@ kll
 fSr
 fSr
 lwd
-fSr
+mgU
 fSr
 qOF
 qOF
@@ -164622,7 +164712,7 @@ aQO
 aQO
 aQO
 aQO
-aQO
+cHA
 qhM
 ieY
 yiM
@@ -165892,7 +165982,7 @@ vdh
 tFJ
 ltw
 ltw
-ltw
+kKC
 ltw
 ltw
 ltw
@@ -166175,7 +166265,7 @@ afX
 afy
 iPy
 rnR
-jXq
+vzF
 yiM
 qqi
 hMb
@@ -166689,7 +166779,7 @@ afX
 afy
 iPy
 aEP
-aHe
+mOV
 yiM
 tDT
 tDT
@@ -166935,7 +167025,7 @@ keQ
 xNt
 bVs
 rPH
-yiM
+pOW
 aEh
 ojT
 ukT
@@ -174131,7 +174221,7 @@ sQd
 eSz
 eSz
 eSz
-izU
+qMj
 oPM
 vYA
 qhy
@@ -175944,7 +176034,7 @@ mTM
 ocU
 wyd
 wyd
-rks
+piQ
 rks
 rks
 wyd
@@ -180054,7 +180144,7 @@ afy
 qhy
 wYw
 gvc
-whz
+uMd
 vNN
 whz
 aIq
@@ -187250,7 +187340,7 @@ afy
 aRO
 gaH
 rxO
-lVi
+cuS
 kCF
 soq
 loJ
@@ -192649,7 +192739,7 @@ qTv
 vrW
 tXz
 tXz
-tXz
+hIb
 tiG
 mYy
 xNT
@@ -193662,7 +193752,7 @@ lSQ
 duO
 goC
 wxb
-fZS
+vZY
 bMb
 bMb
 bMb
diff --git a/_maps/shuttles/emergency_cruise.dmm b/_maps/shuttles/emergency_cruise.dmm
index a4aa7e70c9ea..a6d02332e064 100644
--- a/_maps/shuttles/emergency_cruise.dmm
+++ b/_maps/shuttles/emergency_cruise.dmm
@@ -1,7 +1,9 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
 "ac" = (
 /obj/effect/turf_decal/tile/red/opposingcorners,
-/obj/structure/window/reinforced/survival_pod/spawner/directional/south,
+/obj/structure/window/reinforced/survival_pod/spawner/directional/south{
+	damage_deflection = 21
+	},
 /obj/structure/closet/secure_closet/ert_sec{
 	name = "Emergency response security locker";
 	desc = "A storage unit containing equipment for responding to emergencies.";
@@ -52,7 +54,8 @@
 /area/shuttle/escape/luxury)
 "bE" = (
 /mob/living/simple_animal/bot/secbot{
-	name = "Officer Beefsky"
+	name = "Officer Beefsky";
+	damage_deflection = 21
 	},
 /obj/effect/turf_decal/trimline/red/line{
 	dir = 4
@@ -175,7 +178,10 @@
 /turf/open/floor/iron/kitchen/diagonal,
 /area/shuttle/escape)
 "dQ" = (
-/obj/effect/spawner/structure/window/reinforced/plasma/plastitanium,
+/obj/effect/spawner/structure/window/reinforced/plasma/plastitanium{
+	damage_deflection = 21;
+	desc = "A 'Titan' brand Plastitanium window, there is a small image of a cat etched into the bottom right corner"
+	},
 /obj/structure/cable,
 /turf/open/floor/plating/airless,
 /area/shuttle/escape/brig)
@@ -203,7 +209,8 @@
 /area/shuttle/escape)
 "dY" = (
 /obj/machinery/porta_turret/centcom_shuttle{
-	dir = 6
+	dir = 6;
+	faction = list("neutral","silicon","turret","clowns")
 	},
 /turf/closed/wall/mineral/plastitanium,
 /area/shuttle/escape)
@@ -225,11 +232,14 @@
 /turf/open/ballpit,
 /area/shuttle/escape/luxury)
 "en" = (
-/obj/effect/spawner/structure/window/reinforced/plasma/plastitanium,
 /obj/machinery/door/poddoor/shutters/preopen{
 	id = "shuttlewindow";
 	dir = 8
 	},
+/obj/effect/spawner/structure/window/reinforced/plasma/plastitanium{
+	damage_deflection = 21;
+	desc = "A 'Titan' brand Plastitanium window, there is a small image of a cat etched into the bottom right corner"
+	},
 /turf/open/floor/plating,
 /area/shuttle/escape)
 "ey" = (
@@ -324,7 +334,7 @@
 "fy" = (
 /obj/structure/table/reinforced/plastitaniumglass,
 /obj/structure/disposalpipe/segment,
-/obj/item/storage/box/fireworks/dangerous,
+/obj/item/gun/ballistic/automatic/pistol/paco/no_mag,
 /turf/open/floor/noslip,
 /area/shuttle/escape)
 "fA" = (
@@ -354,10 +364,20 @@
 /turf/open/floor/plastic,
 /area/shuttle/escape)
 "fP" = (
-/obj/structure/table/reinforced/plastitaniumglass,
-/obj/item/gun/ballistic/automatic/pistol/m1911,
-/turf/open/floor/wood/tile,
-/area/shuttle/escape)
+/obj/effect/turf_decal/tile/red/opposingcorners,
+/obj/structure/closet/secure_closet/ert_sec{
+	name = "Emergency response security locker";
+	desc = "A storage unit containing equipment for responding to emergencies.";
+	req_access = list("security")
+	},
+/obj/item/food/burger/cheese,
+/obj/item/gun/ballistic/revolver/mateba,
+/obj/item/ammo_box/a357,
+/obj/structure/window/reinforced/survival_pod/spawner/directional/south{
+	damage_deflection = 21
+	},
+/turf/open/floor/iron/dark/textured,
+/area/shuttle/escape/brig)
 "gr" = (
 /obj/item/radio/intercom/directional/south,
 /mob/living/simple_animal/bot/medbot{
@@ -367,7 +387,8 @@
 /area/shuttle/escape)
 "gH" = (
 /obj/machinery/porta_turret/centcom_shuttle{
-	dir = 5
+	dir = 5;
+	faction = list("neutral","silicon","turret","clowns")
 	},
 /turf/closed/wall/mineral/plastitanium,
 /area/shuttle/escape)
@@ -450,7 +471,10 @@
 /area/shuttle/escape/luxury)
 "iP" = (
 /obj/structure/cable,
-/obj/effect/spawner/structure/window/reinforced/plasma/plastitanium,
+/obj/effect/spawner/structure/window/reinforced/plasma/plastitanium{
+	damage_deflection = 21;
+	desc = "A 'Titan' brand Plastitanium window, there is a small image of a cat etched into the bottom right corner"
+	},
 /turf/open/floor/plating/airless,
 /area/shuttle/escape/brig)
 "iQ" = (
@@ -507,11 +531,13 @@
 /obj/structure/table/reinforced,
 /obj/item/reagent_containers/cup/soda_cans/monkey_energy,
 /obj/item/stack/sheet/mineral/coal/ten,
-/obj/item/gun/ballistic/revolver/mateba,
+/obj/item/gun/ballistic/automatic/pistol/paco/no_mag,
+/obj/item/ammo_box/magazine/m35/rubber,
 /turf/open/floor/iron/kitchen/diagonal,
 /area/shuttle/escape)
 "jG" = (
 /obj/machinery/vending/boozeomat/all_access,
+/obj/structure/sign/flag/nanotrasen/directional/north,
 /turf/open/floor/plastic,
 /area/shuttle/escape/luxury)
 "jO" = (
@@ -559,22 +585,29 @@
 /turf/open/floor/plastic,
 /area/shuttle/escape/luxury)
 "kc" = (
-/obj/effect/spawner/structure/window/reinforced/plasma/plastitanium,
 /obj/machinery/door/poddoor/shutters/preopen{
 	id = "shuttlewindow";
 	dir = 4
 	},
+/obj/effect/spawner/structure/window/reinforced/plasma/plastitanium{
+	damage_deflection = 21;
+	desc = "A 'Titan' brand Plastitanium window, there is a small image of a cat etched into the bottom right corner"
+	},
 /turf/open/floor/plating,
 /area/shuttle/escape)
 "kd" = (
 /turf/template_noop,
 /area/template_noop)
 "kn" = (
-/obj/structure/window/reinforced/spawner/directional/north,
+/obj/structure/window/reinforced/spawner/directional/north{
+	damage_deflection = 21
+	},
 /obj/item/clothing/accessory/medal/gold,
 /obj/structure/table/reinforced/plastitaniumglass,
 /obj/effect/turf_decal/tile/dark_blue/opposingcorners,
-/obj/structure/window/reinforced/spawner/directional/east,
+/obj/structure/window/reinforced/spawner/directional/east{
+	damage_deflection = 21
+	},
 /obj/structure/disposalpipe/segment,
 /turf/open/floor/iron/dark/textured_large,
 /area/shuttle/escape/luxury)
@@ -621,12 +654,18 @@
 	dir = 4
 	},
 /obj/structure/table/reinforced/plastitaniumglass,
-/obj/item/grenade/frag,
 /turf/open/floor/iron/showroomfloor,
 /area/shuttle/escape)
 "ld" = (
 /obj/effect/decal/cleanable/confetti,
 /obj/structure/window/reinforced/spawner/directional/west,
+/mob/living/simple_animal/hostile/retaliate/clown{
+	health = 300;
+	name = "Honk-E-Clown";
+	desc = "This clown looks pretty tough, better stay on his good side...";
+	limb_destroyer = 1;
+	maxHealth = "300"
+	},
 /turf/open/ballpit,
 /area/shuttle/escape/luxury)
 "lk" = (
@@ -728,7 +767,7 @@
 /area/shuttle/escape)
 "nx" = (
 /obj/machinery/porta_turret/syndicate{
-	faction = list("neutral","silicon","turret");
+	faction = list("neutral","silicon","turret","clowns");
 	gender = "female";
 	req_access = list("security");
 	dir = 4
@@ -812,14 +851,8 @@
 "pz" = (
 /obj/effect/decal/cleanable/confetti,
 /obj/structure/window/reinforced/spawner/directional/north,
-/obj/item/gun/ballistic/automatic/pistol/aps,
 /turf/open/ballpit,
 /area/shuttle/escape/luxury)
-"pY" = (
-/obj/structure/table/reinforced/plastitaniumglass,
-/obj/item/gun,
-/turf/open/floor/wood/tile,
-/area/shuttle/escape)
 "qd" = (
 /obj/machinery/computer/warrant,
 /obj/effect/turf_decal/tile/red/anticorner/contrasted{
@@ -881,7 +914,9 @@
 /obj/structure/sign/poster/contraband/clown{
 	pixel_y = 35
 	},
-/obj/structure/window/reinforced/survival_pod/spawner/directional/west,
+/obj/structure/window/reinforced/survival_pod/spawner/directional/west{
+	damage_deflection = 21
+	},
 /turf/open/floor/iron/dark/textured,
 /area/shuttle/escape/brig)
 "ri" = (
@@ -900,6 +935,7 @@
 "rw" = (
 /obj/structure/disposalpipe/segment,
 /obj/structure/table/reinforced/plastitaniumglass,
+/obj/item/storage/box/fireworks,
 /turf/open/floor/noslip,
 /area/shuttle/escape)
 "rx" = (
@@ -915,14 +951,8 @@
 /area/shuttle/escape/brig)
 "rO" = (
 /obj/effect/decal/cleanable/plastic,
-/obj/structure/window/reinforced/spawner/directional/east,
 /obj/structure/window/reinforced/spawner/directional/north,
-/mob/living/simple_animal/hostile/retaliate/clown{
-	health = 300;
-	name = "Honk-E-Clown";
-	desc = "This clown looks pretty tough, better stay on his good side...";
-	limb_destroyer = 1
-	},
+/obj/machinery/door/window/brigdoor/right/directional/east,
 /turf/open/ballpit,
 /area/shuttle/escape/luxury)
 "rX" = (
@@ -930,7 +960,8 @@
 /area/shuttle/escape/brig)
 "si" = (
 /obj/machinery/porta_turret/centcom_shuttle{
-	dir = 10
+	dir = 10;
+	faction = list("neutral","silicon","turret","clowns")
 	},
 /turf/closed/wall/mineral/plastitanium,
 /area/shuttle/escape)
@@ -1000,8 +1031,9 @@
 /turf/open/floor/iron/dark/textured_large,
 /area/shuttle/escape)
 "tF" = (
-/obj/structure/window/reinforced/survival_pod/spawner/directional/south,
-/obj/structure/window/reinforced/survival_pod/spawner/directional/west,
+/obj/structure/window/reinforced/survival_pod/spawner/directional/west{
+	damage_deflection = 21
+	},
 /obj/structure/table/reinforced/plastitaniumglass,
 /obj/item/storage/box/handcuffs{
 	pixel_x = -3;
@@ -1021,6 +1053,9 @@
 	pixel_y = 4
 	},
 /obj/item/gun/grenadelauncher,
+/obj/structure/window/reinforced/survival_pod/spawner/directional/south{
+	damage_deflection = 21
+	},
 /turf/open/floor/iron/dark/textured,
 /area/shuttle/escape/brig)
 "tS" = (
@@ -1028,9 +1063,6 @@
 /obj/machinery/chem_dispenser/drinks/beer{
 	dir = 8
 	},
-/obj/item/gun/ballistic/shotgun/lethal{
-	pixel_y = -10
-	},
 /turf/open/floor/wood/tile,
 /area/shuttle/escape)
 "tU" = (
@@ -1153,7 +1185,8 @@
 	name = "Shuttle Armory";
 	req_access = list("security");
 	dir = 8;
-	safe = 0
+	safe = 0;
+	damage_deflection = 21
 	},
 /obj/effect/turf_decal/trimline/red/warning,
 /obj/effect/turf_decal/trimline/red/warning{
@@ -1235,14 +1268,16 @@
 	pixel_y = 2;
 	pixel_x = 7
 	},
-/obj/item/gun/ballistic/automatic/pistol/clandestine{
-	pixel_y = 9
-	},
+/obj/item/ammo_box/magazine/m35/rubber,
+/obj/item/gun/ballistic/automatic/pistol/paco/no_mag,
 /turf/open/floor/eighties,
 /area/shuttle/escape/luxury)
 "xT" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden,
-/obj/effect/spawner/structure/window/reinforced/plasma/plastitanium,
+/obj/effect/spawner/structure/window/reinforced/plasma/plastitanium{
+	damage_deflection = 21;
+	desc = "A 'Titan' brand Plastitanium window, there is a small image of a cat etched into the bottom right corner"
+	},
 /turf/open/floor/plating/airless,
 /area/shuttle/escape/brig)
 "xU" = (
@@ -1269,7 +1304,8 @@
 /area/shuttle/escape)
 "yq" = (
 /obj/structure/table/reinforced/plastitaniumglass,
-/obj/item/gun/ballistic/revolver/c38,
+/obj/item/gun/ballistic/automatic/pistol/paco/no_mag,
+/obj/item/ammo_box/magazine/m35/rubber,
 /turf/open/floor/wood/tile,
 /area/shuttle/escape)
 "ys" = (
@@ -1343,8 +1379,8 @@
 /area/shuttle/escape)
 "Al" = (
 /obj/structure/table/reinforced/plastitaniumglass,
-/obj/item/storage/box/fireworks/dangerous,
-/obj/item/gun/ballistic/shotgun/lethal,
+/obj/item/gun/ballistic/automatic/pistol/paco/no_mag,
+/obj/item/ammo_box/magazine/m35/rubber,
 /turf/open/floor/noslip,
 /area/shuttle/escape)
 "Aq" = (
@@ -1375,14 +1411,18 @@
 /turf/open/floor/wood/tile,
 /area/shuttle/escape)
 "Bf" = (
-/obj/structure/window/reinforced/spawner/directional/north,
 /obj/structure/table/reinforced/plastitaniumglass,
 /obj/effect/turf_decal/tile/dark_blue/opposingcorners,
-/obj/structure/window/reinforced/spawner/directional/west,
+/obj/structure/window/reinforced/spawner/directional/west{
+	damage_deflection = 21
+	},
 /obj/item/gun/ballistic/rocketlauncher/unrestricted{
 	name = "\improper Nanotrasen PML-9";
 	desc = "A reusable rocket propelled grenade launcher. The words 'Syndicate this way' and an arrow have been written near the barrel. A sticker near the cheek rest reads, 'FOR DISPLAY PURPOSES ONLY'"
 	},
+/obj/structure/window/reinforced/spawner/directional/north{
+	damage_deflection = 21
+	},
 /turf/open/floor/iron/dark/textured_large,
 /area/shuttle/escape/luxury)
 "Bl" = (
@@ -1399,11 +1439,12 @@
 	},
 /obj/effect/turf_decal/tile/purple/anticorner/contrasted,
 /obj/item/gravity_gun,
+/obj/item/assembly/signaler/anomaly/grav,
 /turf/open/floor/iron/showroomfloor,
 /area/shuttle/escape)
 "Bv" = (
 /obj/machinery/porta_turret/syndicate{
-	faction = list("neutral","silicon","turret");
+	faction = list("neutral","silicon","turret","clowns");
 	gender = "female";
 	req_access = list("security");
 	dir = 5
@@ -1430,9 +1471,10 @@
 /turf/open/floor/carpet/blue,
 /area/shuttle/escape/brig)
 "BW" = (
-/obj/machinery/light/directional/west,
-/turf/open/floor/eighties,
-/area/shuttle/escape/luxury)
+/obj/structure/table/reinforced/plastitaniumglass,
+/obj/item/ammo_box/c35/rubber,
+/turf/open/floor/wood/tile,
+/area/shuttle/escape)
 "Cj" = (
 /obj/effect/turf_decal/trimline/red/corner{
 	dir = 4
@@ -1458,7 +1500,6 @@
 /turf/open/floor/iron/dark/textured_large,
 /area/shuttle/escape)
 "Cy" = (
-/obj/effect/mapping_helpers/airlock/access/all/command/general,
 /obj/machinery/door/airlock/command{
 	name = "Honk-E-Clown's Mafia Free Playland and Casino"
 	},
@@ -1601,7 +1642,7 @@
 /area/shuttle/escape)
 "Et" = (
 /obj/machinery/porta_turret/syndicate{
-	faction = list("neutral","silicon","turret");
+	faction = list("neutral","silicon","turret","clowns");
 	gender = "female";
 	req_access = list("security");
 	dir = 10
@@ -1801,7 +1842,9 @@
 /turf/open/floor/eighties,
 /area/shuttle/escape/luxury)
 "HT" = (
-/obj/structure/window/reinforced/spawner/directional/north,
+/obj/structure/window/reinforced/spawner/directional/north{
+	damage_deflection = 21
+	},
 /obj/item/reagent_containers/cup/glass/trophy/gold_cup{
 	pixel_x = 16;
 	pixel_y = 2
@@ -1861,7 +1904,8 @@
 /area/shuttle/escape)
 "IQ" = (
 /obj/machinery/porta_turret/centcom_shuttle{
-	dir = 9
+	dir = 9;
+	faction = list("neutral","silicon","turret","clowns")
 	},
 /turf/closed/wall/mineral/plastitanium,
 /area/shuttle/escape)
@@ -1871,12 +1915,12 @@
 	},
 /obj/structure/disposalpipe/segment,
 /obj/structure/table/reinforced/plastitaniumglass,
-/obj/item/grenade/frag,
+/obj/item/ammo_box/c35/rubber,
 /turf/open/floor/noslip,
 /area/shuttle/escape)
 "Jk" = (
-/obj/item/storage/box/fireworks/dangerous,
 /obj/structure/table/reinforced/plastitaniumglass,
+/obj/item/storage/box/fireworks,
 /turf/open/floor/noslip,
 /area/shuttle/escape)
 "Jm" = (
@@ -2165,7 +2209,7 @@
 /area/shuttle/escape)
 "OK" = (
 /obj/machinery/porta_turret/syndicate{
-	faction = list("neutral","silicon","turret");
+	faction = list("neutral","silicon","turret","clowns");
 	gender = "female";
 	req_access = list("security");
 	dir = 6
@@ -2175,11 +2219,6 @@
 "OQ" = (
 /turf/open/floor/carpet/blue,
 /area/shuttle/escape/brig)
-"OT" = (
-/obj/structure/table/reinforced/plastitaniumglass,
-/obj/item/gun/ballistic,
-/turf/open/floor/wood/tile,
-/area/shuttle/escape)
 "OU" = (
 /obj/effect/turf_decal/trimline/dark_blue/line{
 	dir = 10
@@ -2238,13 +2277,16 @@
 /turf/open/floor/iron/showroomfloor,
 /area/shuttle/escape)
 "Qp" = (
-/obj/effect/mapping_helpers/airlock/access/all/command/general,
-/obj/structure/sign/flag/nanotrasen/directional/north,
-/obj/machinery/door/airlock/command{
-	name = "Honk-E-Clown's Mafia Free Playland and Casino"
+/obj/machinery/door/poddoor/preopen{
+	id = "escape_cockpit_windows";
+	name = "Cockpit Blast Door"
 	},
-/turf/open/floor/iron/dark/textured_large,
-/area/shuttle/escape/luxury)
+/obj/effect/spawner/structure/window/reinforced/plasma/plastitanium{
+	damage_deflection = 21;
+	desc = "A 'Titan' brand Plastitanium window, there is a small image of a cat etched into the bottom right corner"
+	},
+/turf/open/floor/plating,
+/area/shuttle/escape)
 "Qu" = (
 /obj/structure/bed/roller,
 /obj/item/bedsheet/patriot,
@@ -2282,6 +2324,7 @@
 "Rz" = (
 /obj/machinery/light/directional/east,
 /obj/structure/table/reinforced/plastitaniumglass,
+/obj/item/ammo_box/c35/rubber,
 /turf/open/floor/wood/tile,
 /area/shuttle/escape)
 "RO" = (
@@ -2446,7 +2489,9 @@
 /turf/open/floor/iron/showroomfloor,
 /area/shuttle/escape)
 "Ul" = (
-/obj/structure/window/reinforced/spawner/directional/north,
+/obj/structure/window/reinforced/spawner/directional/north{
+	damage_deflection = 21
+	},
 /obj/structure/table/reinforced/plastitaniumglass,
 /obj/effect/turf_decal/tile/dark_blue/opposingcorners,
 /obj/item/ammo_casing/caseless/rocket/heap,
@@ -2588,7 +2633,7 @@
 /area/shuttle/escape)
 "Wq" = (
 /obj/machinery/porta_turret/syndicate{
-	faction = list("neutral","silicon","turret");
+	faction = list("neutral","silicon","turret","clowns");
 	gender = "female";
 	req_access = list("security");
 	dir = 9
@@ -2621,7 +2666,7 @@
 /area/shuttle/escape)
 "Xd" = (
 /obj/machinery/porta_turret/syndicate{
-	faction = list("neutral","silicon","turret");
+	faction = list("neutral","silicon","turret","clowns");
 	gender = "female";
 	req_access = list("security");
 	dir = 8
@@ -2684,6 +2729,7 @@
 /area/shuttle/escape)
 "YI" = (
 /obj/effect/spawner/random/vending/snackvend,
+/obj/structure/sign/flag/nanotrasen/directional/north,
 /turf/open/floor/plastic,
 /area/shuttle/escape/luxury)
 "YN" = (
@@ -2845,8 +2891,8 @@ aG
 uV
 Eg
 uV
-pY
-fP
+nU
+nU
 bT
 mw
 mw
@@ -2894,9 +2940,9 @@ Lf
 xf
 xf
 iQ
+yq
+BW
 nU
-nU
-OT
 xb
 so
 Od
@@ -2954,8 +3000,8 @@ kd
 (6,1,1) = {"
 kd
 kd
-Tw
-Tw
+Qp
+Qp
 uV
 uV
 rX
@@ -2979,7 +3025,7 @@ YZ
 YZ
 Cy
 YZ
-Qp
+Cy
 YZ
 YZ
 YZ
@@ -3000,7 +3046,7 @@ uV
 (7,1,1) = {"
 Wq
 uV
-Tw
+Qp
 xU
 FR
 yH
@@ -3090,7 +3136,7 @@ xj
 xj
 "}
 (9,1,1) = {"
-Tw
+Qp
 qd
 KB
 hH
@@ -3115,7 +3161,7 @@ qI
 Yr
 YZ
 bt
-BW
+uC
 Xw
 iO
 cY
@@ -3136,7 +3182,7 @@ xj
 xj
 "}
 (10,1,1) = {"
-Tw
+Qp
 dg
 PU
 OU
@@ -3182,7 +3228,7 @@ uV
 OK
 "}
 (11,1,1) = {"
-Tw
+Qp
 vq
 tx
 Gs
@@ -3228,7 +3274,7 @@ uV
 kd
 "}
 (12,1,1) = {"
-Tw
+Qp
 mG
 zm
 Gs
@@ -3274,7 +3320,7 @@ uV
 kd
 "}
 (13,1,1) = {"
-Tw
+Qp
 Sq
 ys
 bp
@@ -3320,7 +3366,7 @@ uV
 Et
 "}
 (14,1,1) = {"
-Tw
+Qp
 oZ
 Ho
 Xo
@@ -3329,7 +3375,7 @@ KZ
 rX
 yT
 dC
-ac
+fP
 AB
 iP
 iP
@@ -3375,7 +3421,7 @@ eb
 rX
 hZ
 dC
-ac
+fP
 nZ
 UX
 Kd
@@ -3466,8 +3512,8 @@ uV
 uV
 rX
 Vm
-dQ
-dQ
+iP
+iP
 Fp
 iP
 iP
@@ -3485,7 +3531,7 @@ YZ
 YZ
 Cy
 YZ
-Qp
+Cy
 YZ
 YZ
 YZ
diff --git a/code/modules/mob/living/basic/farm_animals/bee/_bee.dm b/code/modules/mob/living/basic/farm_animals/bee/_bee.dm
index f9f6f0b8f7c4..4b1c01b086f2 100644
--- a/code/modules/mob/living/basic/farm_animals/bee/_bee.dm
+++ b/code/modules/mob/living/basic/farm_animals/bee/_bee.dm
@@ -25,6 +25,8 @@
 	response_harm_continuous = "squashes"
 	response_harm_simple = "squash"
 
+	guaranteed_butcher_results = list(/obj/item/stack/sheet/animalhide/bee = 1 )
+
 	mob_size = MOB_SIZE_LARGE
 	pixel_x = -16
 	base_pixel_x = -16
@@ -44,7 +46,6 @@
 	held_w_class = WEIGHT_CLASS_TINY
 	environment_smash  = ENVIRONMENT_SMASH_NONE
 	habitable_atmos = list("min_oxy" = 0, "max_oxy" = 0, "min_plas" = 0, "max_plas" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
-	basic_mob_flags = DEL_ON_DEATH
 	ai_controller = /datum/ai_controller/basic_controller/bee
 	///the reagent the bee has
 	var/datum/reagent/beegent = null
@@ -99,6 +100,8 @@
 	if(beehome)
 		beehome.bees -= src
 		beehome = null
+	if(flags_1 & HOLOGRAM_1 || gibbed)
+		return ..()
 	var/obj/item/food/pollensac/sac = new(loc) //monkestation edit, bee update
 	sac.pixel_x = pixel_x
 	sac.pixel_y = pixel_y
@@ -109,9 +112,6 @@
 		sac.reagents.add_reagent(beegent.type, 5)
 		sac.color = beegent.color
 	sac.update_appearance()
-	if(flags_1 & HOLOGRAM_1 || gibbed)
-		return ..()
-	new /obj/item/trash/bee(loc, src)
 	return ..()
 
 /mob/living/basic/bee/proc/pre_attack(mob/living/puncher, atom/target)
diff --git a/html/changelogs/AutoChangeLog-pr-353.yml b/html/changelogs/AutoChangeLog-pr-353.yml
new file mode 100644
index 000000000000..1e76877a1190
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-353.yml
@@ -0,0 +1,4 @@
+author: "MomoBerri"
+delete-after: True
+changes:
+  - bugfix: "Signs should be overall nicer!"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-355.yml b/html/changelogs/AutoChangeLog-pr-355.yml
new file mode 100644
index 000000000000..69e2c15cf737
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-355.yml
@@ -0,0 +1,5 @@
+author: "lmenvs"
+delete-after: True
+changes:
+  - bugfix: "bees are butcherable again"
+  - rscadd: "friendly maintenance bees are available to summon from the pet beacon"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-356.yml b/html/changelogs/AutoChangeLog-pr-356.yml
new file mode 100644
index 000000000000..c71491694d47
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-356.yml
@@ -0,0 +1,4 @@
+author: "NanoCats"
+delete-after: True
+changes:
+  - balance: "NTSS Independence balance pass"
\ No newline at end of file
diff --git a/icons/obj/signs.dmi b/icons/obj/signs.dmi
index 2421fbb208d3..518624aab840 100644
Binary files a/icons/obj/signs.dmi and b/icons/obj/signs.dmi differ
diff --git a/monkestation/code/game/objects/items/choice_beacon.dm b/monkestation/code/game/objects/items/choice_beacon.dm
index d0e649f7f81b..801403f5be11 100644
--- a/monkestation/code/game/objects/items/choice_beacon.dm
+++ b/monkestation/code/game/objects/items/choice_beacon.dm
@@ -19,6 +19,7 @@
 			/mob/living/basic/mouse/rat,
 			/mob/living/simple_animal/parrot,
 			/mob/living/basic/butterfly,
+			/mob/living/basic/bee/friendly,
 			/mob/living/simple_animal/crab,
 			/mob/living/basic/pet/penguin/baby,
 			/mob/living/basic/pet/fox,
diff --git a/monkestation/code/modules/mob/living/simple_animal/pets/bees.dm b/monkestation/code/modules/mob/living/simple_animal/pets/bees.dm
index bf20bae11ec7..7674b035fd3f 100644
--- a/monkestation/code/modules/mob/living/simple_animal/pets/bees.dm
+++ b/monkestation/code/modules/mob/living/simple_animal/pets/bees.dm
@@ -1,7 +1,6 @@
 /mob/living/basic/bee/friendly
 	name = "friendly maintenance bee"
 	desc = "He wants to bee friends!"
-	faction = list(FACTION_NEUTRAL)
 	response_help_continuous = "hugs"
 	response_help_simple = "hug"
 	attack_verb_continuous = "nuzzles"
@@ -20,7 +19,7 @@
 /obj/item/stack/sheet/animalhide/bee
 	name = "bee fuzz"
 	desc = "How could you do this."
-	singular_name = "a piece of bee fuzz"
+	singular_name = "bee fuzz piece"
 	icon = 'monkestation/icons/mob/simple/bees.dmi'
 	icon_state = "sheet-bee_fuzz"
 	inhand_icon_state = null