Fixes for #91816

_maps/bubber/automapper/templates/CatwalkStation/catwalk_ntrep.dmm

@@ -79,6 +79,7 @@
 /area/template_noop)
 "lR" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
+/obj/machinery/firealarm/directional/north,
 /turf/open/floor/carpet/green,
 /area/station/command/heads_quarters/nt_rep)
 "oq" = (

_maps/bubber/automapper/templates/IceBoxStation/iceboxstation_medbay.dmm

@@ -36,6 +36,7 @@
 /area/station/medical/treatment_center)
 "E" = (
 /obj/structure/sign/departments/chemistry/pharmacy/directional/west,
+/obj/effect/landmark/firealarm_sanity,
 /turf/open/openspace,
 /area/station/medical/medbay/lobby)
 "G" = (

_maps/bubber/automapper/templates/IceBoxStation/iceboxstation_ntrep_office.dmm

@@ -107,7 +107,6 @@
 "aG" = (
 /obj/effect/mapping_helpers/airlock/access/all/cent_com/rep_door,
 /obj/machinery/door/airlock/maintenance,
-/obj/machinery/door/firedoor,
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
@@ -190,6 +189,7 @@
 /obj/structure/chair/comfy/lime{
 	dir = 4
 	},
+/obj/machinery/firealarm/directional/west,
 /turf/open/floor/carpet/green,
 /area/station/command/heads_quarters/nt_rep)
 "gQ" = (

_maps/bubber/automapper/templates/MetaStation/metastation_arrivals.dmm

@@ -616,7 +616,6 @@
 	height = 13;
 	shuttle_id = "arrivals_stationary";
 	name = "arrivals";
-	roundstart_template = null;
 	width = 5
 	},
 /turf/open/space/basic,
@@ -933,6 +932,7 @@
 /area/station/hallway/secondary/entry)
 "Dj" = (
 /obj/machinery/light/directional/north,
+/obj/machinery/firealarm/directional/north,
 /turf/open/floor/iron,
 /area/station/hallway/secondary/entry)
 "Dl" = (

_maps/bubber/automapper/templates/MetaStation/metastation_barber.dmm

@@ -44,6 +44,7 @@
 	},
 /obj/effect/turf_decal/tile/purple,
 /obj/item/lipstick/random,
+/obj/machinery/firealarm/directional/east,
 /turf/open/floor/iron,
 /area/station/service/barber)
 "dV" = (

_maps/bubber/automapper/templates/MetaStation/metastation_ntrep_office.dmm

@@ -73,6 +73,11 @@
 /obj/structure/cable,
 /turf/open/floor/wood,
 /area/station/command/heads_quarters/nt_rep)
+"n" = (
+/obj/structure/chair/comfy/beige,
+/obj/machinery/firealarm/directional/west,
+/turf/open/floor/wood,
+/area/station/command/heads_quarters/nt_rep)
 "p" = (
 /obj/effect/turf_decal/tile/neutral{
 	dir = 8
@@ -270,7 +275,6 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/effect/mapping_helpers/airlock/access/all/cent_com/rep_door,
 /obj/machinery/door/airlock/maintenance,
-/obj/machinery/door/firedoor,
 /obj/effect/turf_decal/siding/wood{
 	dir = 7
 	},
@@ -307,7 +311,7 @@ a
 f
 s
 v
-b
+n
 I
 x
 d

_maps/bubber/automapper/templates/NebulaStation/nebulastation_aux.dmm

@@ -320,7 +320,6 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/structure/disposalpipe/segment,
 /obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance,
-/obj/machinery/door/firedoor,
 /turf/open/floor/iron/dark/textured_large,
 /area/station/maintenance/aft/lesser)
 "ud" = (
@@ -400,7 +399,6 @@
 /obj/machinery/door/airlock/public/glass{
 	name = "Auxiliary Ship Dock"
 	},
-/obj/machinery/door/firedoor,
 /obj/effect/turf_decal/stripes/corner,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -488,7 +486,6 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/door/firedoor,
 /turf/open/floor/iron/showroomfloor,
 /area/station/commons/dock/aux)
 "Ci" = (
@@ -690,7 +687,6 @@
 /obj/machinery/door/airlock/public/glass{
 	name = "Auxiliary Ship Dock"
 	},
-/obj/machinery/door/firedoor,
 /turf/open/floor/iron/dark/textured,
 /area/station/commons/dock/aux)
 "QB" = (

_maps/bubber/automapper/templates/NebulaStation/nebulastation_centcom.dmm

@@ -371,6 +371,7 @@
 "HQ" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/landmark/firealarm_sanity,
 /turf/open/floor/iron/dark,
 /area/station/commons/dock/secondary)
 "Ia" = (
@@ -383,7 +384,6 @@
 	},
 /obj/effect/mapping_helpers/airlock/access/any/service/maintenance,
 /obj/effect/mapping_helpers/airlock/unres,
-/obj/machinery/door/firedoor,
 /turf/open/floor/catwalk_floor/iron_dark,
 /area/station/commons/dock/secondary)
 "IE" = (
@@ -406,7 +406,6 @@
 /obj/effect/mapping_helpers/airlock/unres{
 	dir = 1
 	},
-/obj/machinery/door/firedoor,
 /turf/open/floor/catwalk_floor/iron_dark,
 /area/station/commons/dock/secondary)
 "Jp" = (

_maps/bubber/automapper/templates/NebulaStation/nebulastation_corridor.dmm

@@ -98,6 +98,10 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /turf/open/floor/grass/fairy,
 /area/station/common/cryopods/aux)
+"t" = (
+/obj/machinery/firealarm/directional/south,
+/turf/template_noop,
+/area/template_noop)
 "u" = (
 /obj/machinery/modular_computer/preset/time_clock/directional/east,
 /obj/effect/turf_decal/tile/neutral/half/contrasted{
@@ -221,7 +225,7 @@ C
 e
 "}
 (4,1,1) = {"
-a
+t
 A
 x
 u

_maps/bubber/automapper/templates/NebulaStation/nebulastation_ntrep_office.dmm

@@ -36,6 +36,7 @@
 /area/station/command/heads_quarters/nt_rep)
 "h" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
+/obj/machinery/firealarm/directional/north,
 /turf/open/floor/carpet/green,
 /area/station/command/heads_quarters/nt_rep)
 "i" = (
@@ -85,6 +86,13 @@
 	},
 /turf/open/floor/plating,
 /area/station/command/heads_quarters/nt_rep)
+"p" = (
+/obj/structure/chair/comfy/beige{
+	dir = 8
+	},
+/obj/machinery/firealarm/directional/south,
+/turf/open/floor/wood,
+/area/station/command/heads_quarters/nt_rep)
 "q" = (
 /obj/structure/table/wood,
 /obj/effect/turf_decal/siding/wood{
@@ -380,7 +388,7 @@ D
 L
 A
 J
-J
+p
 D
 D
 "}

_maps/bubber/automapper/templates/NebulaStation/nebulastation_sauna.dmm

@@ -10,6 +10,7 @@
 "d" = (
 /obj/structure/cable,
 /obj/structure/disposalpipe/segment,
+/obj/effect/landmark/firealarm_sanity,
 /turf/open/floor/wood/tile,
 /area/station/commons/fitness/recreation/sauna)
 "e" = (

_maps/bubber/automapper/templates/tramstation/tramstation_cryo.dmm

@@ -206,6 +206,7 @@
 	dir = 8
 	},
 /obj/structure/closet/wardrobe/white,
+/obj/machinery/firealarm/directional/east,
 /turf/open/floor/iron/cafeteria,
 /area/station/commons/dorms/laundry)
 "F" = (

_maps/bubber/automapper/templates/tramstation/tramstation_ntrep_office.dmm

@@ -151,6 +151,7 @@
 /turf/open/floor/wood,
 /area/station/command/heads_quarters/nt_rep)
 "s" = (
+/obj/machinery/firealarm/directional/west,
 /turf/open/floor/carpet/green,
 /area/station/command/heads_quarters/nt_rep)
 "t" = (

_maps/map_files/BoxStation/BoxStation.dmm

@@ -645,6 +645,7 @@
 "aeQ" = (
 /obj/machinery/light/directional/east,
 /obj/structure/closet/radiation,
+/obj/machinery/firealarm/directional/east,
 /turf/open/floor/iron/smooth_large,
 /area/station/engineering/main)
 "aeS" = (
@@ -718,6 +719,7 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
 	dir = 9
 	},
+/obj/machinery/firealarm/directional/south,
 /turf/open/floor/mineral/gold,
 /area/station/command/heads_quarters/qm)
 "afw" = (
@@ -1058,6 +1060,7 @@
 	c_tag = "Evidence Storage";
 	network = list("interrogation")
 	},
+/obj/machinery/firealarm/directional/east,
 /turf/open/floor/iron/dark,
 /area/station/security/evidence)
 "aio" = (
@@ -1225,9 +1228,6 @@
 "ajq" = (
 /obj/structure/closet/secure_closet/engineering_personal,
 /obj/machinery/firealarm/directional/east,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
-	dir = 9
-	},
 /obj/effect/turf_decal/tile/yellow/half{
 	dir = 4
 	},
@@ -2036,6 +2036,7 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
 	dir = 4
 	},
+/obj/machinery/firealarm/directional/north,
 /turf/open/floor/iron/grimy,
 /area/station/security/detectives_office)
 "anZ" = (
@@ -2449,6 +2450,7 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/structure/cable,
 /obj/structure/disposalpipe/segment,
+/obj/machinery/firealarm/directional/west,
 /turf/open/floor/iron/dark,
 /area/station/commons/fitness/recreation/entertainment)
 "aqn" = (
@@ -4651,7 +4653,6 @@
 	name = "EVA Maintenance"
 	},
 /obj/effect/mapping_helpers/airlock/access/any/command/eva,
-/obj/machinery/door/firedoor,
 /obj/structure/disposalpipe/segment,
 /turf/open/floor/iron/dark,
 /area/station/maintenance/fore)
@@ -5937,7 +5938,6 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/door/firedoor,
 /obj/structure/cable,
-/obj/machinery/firealarm/directional/west,
 /obj/effect/turf_decal/tile/neutral{
 	dir = 8
 	},
@@ -6083,6 +6083,7 @@
 /obj/effect/turf_decal/tile/neutral{
 	dir = 1
 	},
+/obj/machinery/firealarm/directional/west,
 /turf/open/floor/iron/dark,
 /area/station/security/checkpoint/customs)
 "aEI" = (
@@ -7444,6 +7445,7 @@
 /obj/effect/turf_decal/tile/blue{
 	dir = 4
 	},
+/obj/machinery/firealarm/directional/north,
 /turf/open/floor/iron,
 /area/station/hallway/primary/central)
 "aJv" = (
@@ -8594,6 +8596,7 @@
 "aNM" = (
 /obj/machinery/light/small/directional/west,
 /obj/machinery/icecream_vat,
+/obj/machinery/firealarm/directional/west,
 /turf/open/floor/iron/kitchen_coldroom/freezerfloor,
 /area/station/service/kitchen)
 "aNO" = (
@@ -12149,6 +12152,7 @@
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/landmark/firealarm_sanity,
 /turf/open/floor/iron/dark,
 /area/station/ai_monitored/turret_protected/ai_upload)
 "aZU" = (
@@ -12664,6 +12668,7 @@
 /obj/effect/turf_decal/tile/green{
 	dir = 1
 	},
+/obj/machinery/firealarm/directional/south,
 /turf/open/floor/iron,
 /area/station/medical/virology)
 "bbG" = (
@@ -13847,6 +13852,7 @@
 /area/station/command/heads_quarters/captain)
 "bfz" = (
 /obj/machinery/atmospherics/pipe/smart/simple/dark/visible,
+/obj/effect/landmark/firealarm_sanity,
 /turf/open/floor/plating,
 /area/station/engineering/atmos)
 "bfA" = (
@@ -15450,6 +15456,7 @@
 	c_tag = "Mech Bay"
 	},
 /obj/machinery/light/directional/south,
+/obj/machinery/firealarm/directional/south,
 /turf/open/floor/iron,
 /area/station/science/robotics/mechbay)
 "blt" = (
@@ -17029,7 +17036,6 @@
 "bqL" = (
 /obj/structure/disposalpipe/segment,
 /obj/machinery/door/firedoor,
-/obj/machinery/firealarm/directional/west,
 /turf/open/floor/iron,
 /area/station/hallway/primary/central)
 "bqM" = (
@@ -17183,6 +17189,12 @@
 	},
 /turf/open/floor/iron,
 /area/station/science/robotics/lab)
+"brt" = (
+/obj/effect/turf_decal/tile/blue,
+/obj/structure/disposalpipe/segment,
+/obj/machinery/firealarm/directional/east,
+/turf/open/floor/iron,
+/area/station/hallway/primary/fore)
 "brC" = (
 /obj/effect/turf_decal/bot,
 /obj/structure/closet/crate,
@@ -18946,6 +18958,7 @@
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/obj/effect/landmark/firealarm_sanity,
 /turf/open/floor/plating,
 /area/station/maintenance/aft)
 "bwh" = (
@@ -20304,6 +20317,7 @@
 	dir = 1
 	},
 /obj/machinery/light/directional/west,
+/obj/machinery/firealarm/directional/west,
 /turf/open/floor/iron,
 /area/station/maintenance/disposal/incinerator)
 "bCg" = (
@@ -20413,7 +20427,6 @@
 /turf/open/floor/iron/dark,
 /area/station/hallway/primary/central)
 "bCB" = (
-/obj/machinery/door/firedoor,
 /obj/machinery/door/airlock/maintenance{
 	name = "Chemistry Maintenance"
 	},
@@ -20989,6 +21002,9 @@
 	},
 /obj/machinery/disposal/bin,
 /obj/item/radio/intercom/directional/south,
+/obj/machinery/firealarm/directional/south{
+	pixel_y = -34
+	},
 /turf/open/floor/iron/dark,
 /area/station/medical/storage)
 "bEk" = (
@@ -22419,6 +22435,7 @@
 /obj/effect/turf_decal/stripes/corner{
 	dir = 4
 	},
+/obj/machinery/firealarm/directional/east,
 /turf/open/floor/iron,
 /area/station/science/ordnance)
 "bIW" = (
@@ -23182,7 +23199,6 @@
 /turf/open/floor/iron,
 /area/station/engineering/atmos)
 "bLO" = (
-/obj/machinery/door/firedoor/heavy,
 /obj/machinery/door/airlock/maintenance{
 	name = "Atmospherics Maintenance"
 	},
@@ -23191,6 +23207,7 @@
 /obj/effect/turf_decal/siding/thinplating,
 /obj/effect/mapping_helpers/airlock/access/any/engineering/atmos,
 /obj/structure/cable,
+/obj/machinery/door/firedoor/heavy,
 /turf/open/floor/plating,
 /area/station/maintenance/aft)
 "bLR" = (
@@ -23471,6 +23488,7 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
 	dir = 10
 	},
+/obj/machinery/firealarm/directional/north,
 /turf/open/floor/iron,
 /area/station/engineering/atmos)
 "bMT" = (
@@ -24540,6 +24558,7 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
 	dir = 4
 	},
+/obj/effect/landmark/firealarm_sanity,
 /turf/open/floor/iron,
 /area/station/medical/virology)
 "bSd" = (
@@ -25061,6 +25080,7 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
 	dir = 6
 	},
+/obj/machinery/firealarm/directional/north,
 /turf/open/floor/iron,
 /area/station/engineering/atmos)
 "bUI" = (
@@ -26164,6 +26184,7 @@
 /obj/machinery/modular_computer/preset/cargochat/engineering{
 	dir = 8
 	},
+/obj/machinery/firealarm/directional/east,
 /turf/open/floor/iron/smooth,
 /area/station/engineering/break_room)
 "bYL" = (
@@ -27208,6 +27229,7 @@
 	dir = 1
 	},
 /obj/effect/landmark/start/chief_engineer,
+/obj/machinery/firealarm/directional/west,
 /turf/open/floor/carpet/orange,
 /area/station/command/heads_quarters/ce)
 "cdn" = (
@@ -27715,6 +27737,9 @@
 /obj/effect/turf_decal/tile/yellow{
 	dir = 8
 	},
+/obj/machinery/firealarm/directional/west{
+	pixel_x = -32
+	},
 /turf/open/floor/iron/dark,
 /area/station/command/heads_quarters/ce)
 "cfK" = (
@@ -28886,7 +28911,6 @@
 /turf/open/floor/plating,
 /area/station/maintenance/solars/starboard/aft)
 "cnu" = (
-/obj/machinery/firealarm/directional/west,
 /obj/effect/turf_decal/stripes/line{
 	dir = 6
 	},
@@ -30092,6 +30116,7 @@
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
 	dir = 4
 	},
+/obj/machinery/firealarm/directional/west,
 /turf/open/floor/iron/dark,
 /area/station/ai_monitored/turret_protected/aisat_interior)
 "cus" = (
@@ -30946,7 +30971,6 @@
 /obj/machinery/door/airlock/command/glass{
 	name = "EVA Storage"
 	},
-/obj/machinery/door/firedoor,
 /obj/effect/mapping_helpers/airlock/access/any/command/eva,
 /obj/effect/landmark/navigate_destination/eva,
 /obj/structure/disposalpipe/segment,
@@ -31045,6 +31069,7 @@
 	},
 /obj/item/storage/box/bodybags,
 /obj/item/folder/white,
+/obj/machinery/firealarm/directional/west,
 /turf/open/floor/iron/dark,
 /area/station/medical/morgue)
 "cyT" = (
@@ -31818,6 +31843,7 @@
 	},
 /obj/effect/turf_decal/stripes/line,
 /obj/structure/cable,
+/obj/machinery/firealarm/directional/south,
 /turf/open/floor/iron/smooth_large,
 /area/station/engineering/engine_smes)
 "cDa" = (
@@ -34025,6 +34051,7 @@
 	pixel_x = 10
 	},
 /obj/machinery/light/directional/west,
+/obj/machinery/firealarm/directional/south,
 /turf/open/floor/wood/parquet,
 /area/station/command/heads_quarters/cmo)
 "dkC" = (
@@ -38121,12 +38148,6 @@
 /obj/structure/light_construct/directional/west,
 /turf/open/floor/plating,
 /area/station/maintenance/port/aft)
-"fRa" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
-	dir = 9
-	},
-/turf/closed/wall/r_wall,
-/area/station/engineering/main)
 "fRc" = (
 /obj/item/radio/intercom/directional/south,
 /turf/open/floor/iron,
@@ -38456,6 +38477,10 @@
 	},
 /turf/open/floor/iron,
 /area/station/science/explab)
+"gcm" = (
+/obj/machinery/firealarm/directional/south,
+/turf/open/floor/iron,
+/area/station/hallway/primary/central)
 "gcG" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -38706,6 +38731,7 @@
 /obj/effect/turf_decal/trimline/green/filled/line{
 	dir = 6
 	},
+/obj/machinery/firealarm/directional/east,
 /turf/open/floor/iron/white,
 /area/station/medical/virology)
 "glg" = (
@@ -39460,6 +39486,10 @@
 	},
 /turf/open/floor/iron/dark,
 /area/station/ai_monitored/security/armory)
+"gLS" = (
+/obj/machinery/firealarm/directional/east,
+/turf/open/floor/iron/dark,
+/area/station/security/courtroom)
 "gLY" = (
 /obj/effect/mapping_helpers/burnt_floor,
 /obj/structure/chair/comfy/brown{
@@ -39581,6 +39611,10 @@
 /obj/structure/cable,
 /turf/open/floor/iron,
 /area/station/hallway/primary/port)
+"gRX" = (
+/obj/machinery/firealarm/directional/east,
+/turf/open/floor/iron/dark/small,
+/area/station/security/interrogation)
 "gSC" = (
 /obj/machinery/door/firedoor,
 /obj/machinery/door/airlock/public/glass{
@@ -40106,6 +40140,7 @@
 /area/station/hallway/secondary/exit)
 "hiL" = (
 /obj/effect/turf_decal/tile/neutral,
+/obj/machinery/firealarm/directional/east,
 /turf/open/floor/iron/dark,
 /area/station/commons/fitness/recreation/entertainment)
 "hja" = (
@@ -40577,6 +40612,13 @@
 /obj/effect/spawner/structure/window/hollow/reinforced/middle,
 /turf/open/floor/plating,
 /area/station/maintenance/starboard/fore)
+"hys" = (
+/obj/structure/chair{
+	dir = 1
+	},
+/obj/machinery/firealarm/directional/east,
+/turf/open/floor/iron/dark,
+/area/station/security/courtroom)
 "hyJ" = (
 /obj/effect/spawner/random/trash/botanical_waste,
 /turf/open/floor/plating,
@@ -41274,6 +41316,7 @@
 /obj/item/storage/box/prisoner{
 	pixel_y = 2
 	},
+/obj/machinery/firealarm/directional/south,
 /turf/open/floor/iron/dark,
 /area/station/security/execution/transfer)
 "hVD" = (
@@ -43499,12 +43542,12 @@
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/door/firedoor/heavy,
 /obj/structure/disposalpipe/segment,
 /obj/machinery/door/airlock/atmos{
 	name = "Turbine Access"
 	},
 /obj/effect/mapping_helpers/airlock/access/any/engineering/atmos,
+/obj/machinery/door/firedoor/heavy,
 /turf/open/floor/iron,
 /area/station/maintenance/disposal/incinerator)
 "jjO" = (
@@ -44646,6 +44689,10 @@
 /obj/structure/disposalpipe/segment,
 /turf/open/floor/iron/white,
 /area/station/medical/medbay/aft)
+"jQC" = (
+/obj/machinery/firealarm/directional/west,
+/turf/open/floor/iron/white,
+/area/station/science/xenobiology)
 "jQY" = (
 /obj/effect/landmark/event_spawn,
 /obj/effect/turf_decal/trimline/dark_blue/filled/line{
@@ -44894,6 +44941,7 @@
 	dir = 9
 	},
 /obj/item/radio/intercom/directional/east,
+/obj/machinery/firealarm/directional/south,
 /turf/open/floor/iron/white,
 /area/station/medical/surgery/fore)
 "jXG" = (
@@ -44999,6 +45047,11 @@
 	},
 /turf/open/floor/plating,
 /area/station/maintenance/starboard/fore)
+"kaY" = (
+/obj/effect/turf_decal/tile/red/opposingcorners,
+/obj/machinery/firealarm/directional/south,
+/turf/open/floor/iron,
+/area/station/commons/fitness/recreation)
 "kbk" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
@@ -45282,6 +45335,7 @@
 /obj/structure/bed/dogbed/mcgriff,
 /mob/living/basic/pet/dog/pug/mcgriff,
 /obj/machinery/light/directional/north,
+/obj/machinery/firealarm/directional/north,
 /turf/open/floor/iron/showroomfloor,
 /area/station/security/warden)
 "kii" = (
@@ -46659,6 +46713,12 @@
 	},
 /turf/open/floor/iron,
 /area/station/construction/mining/aux_base)
+"kZr" = (
+/obj/structure/disposalpipe/segment,
+/obj/machinery/light/directional/west,
+/obj/machinery/firealarm/directional/west,
+/turf/open/floor/iron,
+/area/station/hallway/primary/central)
 "kZJ" = (
 /turf/open/floor/iron/dark/side{
 	dir = 1
@@ -47709,6 +47769,7 @@
 "lLZ" = (
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/firealarm/directional/south,
 /turf/open/floor/iron/dark,
 /area/station/command/heads_quarters/hos)
 "lMP" = (
@@ -48009,7 +48070,6 @@
 /turf/open/floor/iron/dark,
 /area/station/common/cryopods)
 "lUc" = (
-/obj/machinery/door/firedoor,
 /obj/machinery/door/airlock/maintenance{
 	name = "Medbay Maintenance"
 	},
@@ -48764,7 +48824,6 @@
 /turf/open/floor/grass,
 /area/station/service/hydroponics)
 "muH" = (
-/obj/machinery/door/firedoor,
 /obj/structure/table/reinforced,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
 	dir = 6
@@ -48898,6 +48957,7 @@
 	dir = 4
 	},
 /obj/structure/closet/firecloset,
+/obj/machinery/firealarm/directional/east,
 /turf/open/floor/iron/dark,
 /area/station/hallway/primary/fore)
 "mAx" = (
@@ -48925,6 +48985,7 @@
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/firealarm/directional/east,
 /turf/open/floor/iron/white,
 /area/station/medical/medbay/aft)
 "mBl" = (
@@ -49051,6 +49112,7 @@
 /area/station/security/courtroom)
 "mEP" = (
 /obj/machinery/light/small/directional/south,
+/obj/machinery/firealarm/directional/east,
 /turf/open/floor/wood,
 /area/station/command/heads_quarters/rd)
 "mEX" = (
@@ -49437,6 +49499,14 @@
 	},
 /turf/open/floor/iron/dark,
 /area/station/command/heads_quarters/hos)
+"mVl" = (
+/obj/structure/chair{
+	dir = 1
+	},
+/obj/effect/turf_decal/stripes/line,
+/obj/machinery/firealarm/directional/south,
+/turf/open/floor/iron,
+/area/station/hallway/secondary/entry)
 "mVz" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -49720,6 +49790,12 @@
 	},
 /turf/open/floor/iron/textured,
 /area/station/security/prison)
+"ncQ" = (
+/obj/effect/landmark/firealarm_sanity,
+/turf/open/floor/engine{
+	name = "Holodeck Projector Floor"
+	},
+/area/station/holodeck/rec_center)
 "ndc" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
 	dir = 4
@@ -50434,6 +50510,7 @@
 /obj/item/clothing/head/bio_hood/security,
 /obj/item/clothing/head/bio_hood/security,
 /obj/structure/cable,
+/obj/machinery/firealarm/directional/south,
 /turf/open/floor/iron/dark,
 /area/station/security/office)
 "nDM" = (
@@ -50622,6 +50699,10 @@
 /obj/machinery/light/small/directional/east,
 /turf/open/floor/wood,
 /area/station/service/bar)
+"nJJ" = (
+/obj/machinery/firealarm/directional/south,
+/turf/open/floor/wood,
+/area/station/security/detectives_office)
 "nJL" = (
 /obj/effect/turf_decal/stripes/line,
 /obj/effect/mapping_helpers/broken_floor,
@@ -51096,7 +51177,6 @@
 "nXH" = (
 /obj/machinery/door/firedoor,
 /obj/effect/landmark/start/hangover,
-/obj/machinery/firealarm/directional/north,
 /turf/open/floor/iron,
 /area/station/hallway/primary/central)
 "nXT" = (
@@ -51464,6 +51544,10 @@
 	},
 /turf/open/floor/iron/dark,
 /area/station/engineering/atmos/hfr_room)
+"olZ" = (
+/obj/machinery/firealarm/directional/north,
+/turf/open/floor/iron,
+/area/station/hallway/primary/port)
 "omf" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/mapping_helpers/broken_floor,
@@ -53666,6 +53750,12 @@
 /obj/effect/spawner/structure/window/reinforced,
 /turf/open/floor/plating,
 /area/station/science/cytology)
+"pIy" = (
+/obj/effect/turf_decal/bot_blue,
+/obj/structure/closet/secure_closet/security/sec,
+/obj/machinery/firealarm/directional/west,
+/turf/open/floor/iron/dark,
+/area/station/security/office)
 "pIJ" = (
 /obj/effect/turf_decal/tile/yellow/half/contrasted{
 	dir = 8
@@ -53899,6 +53989,7 @@
 "pPF" = (
 /obj/structure/window/reinforced/spawner/directional/east,
 /obj/item/kirbyplants/random,
+/obj/machinery/firealarm/directional/south,
 /turf/open/floor/carpet,
 /area/station/command/heads_quarters/rd)
 "pPI" = (
@@ -53939,6 +54030,7 @@
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
 	dir = 1
 	},
+/obj/machinery/firealarm/directional/west,
 /turf/open/floor/iron/dark/textured,
 /area/station/command/gateway)
 "pQB" = (
@@ -55958,6 +56050,15 @@
 /obj/structure/cable,
 /turf/open/floor/iron,
 /area/station/hallway/primary/central)
+"raM" = (
+/obj/effect/turf_decal/tile/blue{
+	dir = 4
+	},
+/obj/machinery/firealarm/directional/north,
+/turf/open/floor/iron/white/corner{
+	dir = 1
+	},
+/area/station/hallway/secondary/entry)
 "raN" = (
 /obj/structure/sign/warning/docking,
 /turf/closed/wall,
@@ -56739,7 +56840,6 @@
 /turf/open/floor/wood,
 /area/station/security/prison)
 "rzl" = (
-/obj/machinery/door/firedoor,
 /obj/machinery/door/airlock/maintenance{
 	name = "Medbay Maintenance"
 	},
@@ -57773,6 +57873,7 @@
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
 	dir = 1
 	},
+/obj/machinery/firealarm/directional/south,
 /turf/open/floor/iron,
 /area/station/medical/virology)
 "shf" = (
@@ -57950,6 +58051,7 @@
 "snm" = (
 /obj/effect/turf_decal/caution/stand_clear/blue,
 /obj/effect/turf_decal/bot_blue,
+/obj/effect/landmark/firealarm_sanity,
 /turf/open/floor/iron/dark,
 /area/station/security/brig)
 "snU" = (
@@ -58738,6 +58840,14 @@
 	},
 /turf/open/floor/iron,
 /area/station/commons/fitness/recreation)
+"sNv" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/cable,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/landmark/firealarm_sanity,
+/turf/open/floor/iron,
+/area/station/security/prison)
 "sNC" = (
 /obj/structure/chalkboard,
 /turf/closed/wall,
@@ -59451,6 +59561,7 @@
 /obj/machinery/camera/directional/west{
 	c_tag = "Gateway Storage"
 	},
+/obj/machinery/firealarm/directional/west,
 /turf/open/floor/iron/dark/textured,
 /area/station/command/gateway)
 "tkd" = (
@@ -61046,6 +61157,7 @@
 /obj/item/toy/plush/moth{
 	name = "Dr. Moff"
 	},
+/obj/machinery/firealarm/directional/north,
 /turf/open/floor/carpet/blue,
 /area/station/medical/psychology)
 "umE" = (
@@ -61475,6 +61587,7 @@
 /area/station/service/hydroponics)
 "uzr" = (
 /obj/item/kirbyplants/random,
+/obj/machinery/firealarm/directional/south,
 /turf/open/floor/iron/dark/textured_large,
 /area/station/hallway/primary/central)
 "uzY" = (
@@ -61672,6 +61785,13 @@
 /obj/machinery/air_sensor/air_tank,
 /turf/open/floor/engine/air,
 /area/station/engineering/atmos)
+"uGZ" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/landmark/firealarm_sanity,
+/turf/open/floor/iron/dark,
+/area/station/ai_monitored/turret_protected/aisat/hallway)
 "uHg" = (
 /obj/effect/turf_decal/stripes/line,
 /obj/effect/decal/cleanable/dirt,
@@ -62085,6 +62205,7 @@
 /obj/effect/turf_decal/tile/brown{
 	dir = 4
 	},
+/obj/machinery/firealarm/directional/west,
 /turf/open/floor/iron/white,
 /area/station/medical/break_room)
 "uTD" = (
@@ -62220,6 +62341,12 @@
 /obj/machinery/light_switch/directional/north,
 /turf/open/floor/iron,
 /area/station/cargo/miningdock)
+"uXI" = (
+/obj/machinery/firealarm/directional/west,
+/turf/open/floor/iron/white/side{
+	dir = 5
+	},
+/area/station/science/research)
 "uXM" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -62750,6 +62877,7 @@
 /obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{
 	cycle_id = "holodeck"
 	},
+/obj/machinery/door/firedoor,
 /turf/open/floor/iron,
 /area/station/commons/fitness/recreation)
 "voA" = (
@@ -63365,6 +63493,7 @@
 /area/station/hallway/primary/central)
 "vFD" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/landmark/firealarm_sanity,
 /turf/open/floor/plating,
 /area/station/security/prison)
 "vFJ" = (
@@ -63403,7 +63532,6 @@
 	dir = 8
 	},
 /obj/machinery/door/firedoor,
-/obj/machinery/firealarm/directional/west,
 /turf/open/floor/iron,
 /area/station/hallway/primary/central)
 "vGg" = (
@@ -63668,6 +63796,11 @@
 /obj/item/stack/cable_coil,
 /turf/open/space/basic,
 /area/space/nearstation)
+"vPU" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
+/obj/machinery/firealarm/directional/north,
+/turf/open/floor/iron/dark,
+/area/station/security/office)
 "vQK" = (
 /obj/structure/closet/secure_closet/engineering_chief,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -63755,7 +63888,6 @@
 	},
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/structure/cable,
-/obj/machinery/firealarm/directional/south,
 /obj/effect/turf_decal/tile/neutral,
 /turf/open/floor/iron/dark,
 /area/station/commons/fitness/recreation/entertainment)
@@ -63800,12 +63932,6 @@
 	},
 /turf/open/floor/iron/dark,
 /area/station/security/office)
-"vWE" = (
-/obj/machinery/door/firedoor,
-/obj/effect/turf_decal/trimline/neutral/filled/warning,
-/obj/machinery/firealarm/directional/west,
-/turf/open/floor/iron/dark/textured_large,
-/area/station/hallway/primary/central)
 "vXe" = (
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
@@ -64575,6 +64701,7 @@
 	dir = 5
 	},
 /obj/item/radio/intercom/directional/west,
+/obj/machinery/firealarm/directional/south,
 /turf/open/floor/iron/white,
 /area/station/medical/surgery)
 "wvq" = (
@@ -76587,7 +76714,7 @@ baC
 auP
 iEJ
 arB
-awZ
+raM
 ayl
 aUN
 awW
@@ -80444,7 +80571,7 @@ pAx
 qKx
 onG
 cdj
-beM
+mVl
 asE
 xzh
 xzh
@@ -88910,7 +89037,7 @@ arP
 arP
 arP
 arP
-aLE
+olZ
 aMQ
 aNT
 aPI
@@ -90133,7 +90260,7 @@ vhr
 wik
 vFD
 wWc
-dyN
+sNv
 dyN
 fNk
 fNk
@@ -91223,7 +91350,7 @@ uQK
 sob
 uQK
 xKN
-aLE
+olZ
 gRS
 kGQ
 aRf
@@ -92732,7 +92859,7 @@ wek
 hOM
 vij
 osW
-ahq
+gRX
 bqU
 mtZ
 aiB
@@ -92785,7 +92912,7 @@ bgG
 bid
 aYl
 aHn
-lfF
+msR
 bnN
 boY
 bqw
@@ -92796,7 +92923,7 @@ uGq
 oXL
 lfF
 ova
-aJq
+gcm
 aJw
 xzh
 xzh
@@ -95320,7 +95447,7 @@ wYB
 apY
 wCe
 bbc
-arR
+nJJ
 wYB
 fXn
 gNu
@@ -96391,7 +96518,7 @@ kfE
 btG
 buQ
 iFv
-vWE
+knx
 bwa
 raE
 bBq
@@ -96872,7 +96999,7 @@ aAa
 aAa
 aAa
 atj
-aAa
+brt
 aAa
 pzW
 aJt
@@ -98380,7 +98507,7 @@ adR
 lSJ
 vHb
 xeM
-vHb
+pIy
 jvR
 oAN
 ngw
@@ -99401,7 +99528,7 @@ adR
 adR
 adR
 adR
-xjQ
+vPU
 jaY
 iVu
 aUl
@@ -99476,7 +99603,7 @@ btL
 buY
 buY
 bqH
-aJq
+aMm
 ova
 qvD
 bCv
@@ -99513,7 +99640,7 @@ ccw
 ccw
 ccw
 ccw
-fRa
+ccw
 ccw
 ccw
 mBQ
@@ -100498,7 +100625,7 @@ ble
 xDS
 bmE
 bqL
-ttj
+kZr
 bsp
 btO
 wNj
@@ -100969,12 +101096,12 @@ apw
 wHs
 ajm
 fQj
-ajp
+gLS
 ife
 kFE
 amr
 amY
-amY
+hys
 aup
 bYy
 awv
@@ -104047,7 +104174,7 @@ asm
 uem
 cXx
 diW
-uem
+kaY
 qwZ
 lFo
 sBI
@@ -104555,7 +104682,7 @@ xzh
 xzh
 sUX
 mBa
-avx
+ncQ
 avx
 avx
 avx
@@ -106225,7 +106352,7 @@ cuG
 cuS
 cve
 cvo
-cvz
+uGZ
 bmS
 cvI
 bmZ
@@ -111315,7 +111442,7 @@ wUr
 ccP
 bMi
 mQw
-bMi
+jQC
 bMi
 bMi
 bMi
@@ -113625,7 +113752,7 @@ bzE
 bHA
 bzE
 bzE
-bzE
+uXI
 bzE
 bzE
 bsX

_maps/map_files/KiloStation/KiloStation.dmm

@@ -345,6 +345,10 @@
 /obj/effect/mapping_helpers/burnt_floor,
 /turf/open/floor/plating,
 /area/station/maintenance/starboard)
+"adB" = (
+/obj/effect/landmark/firealarm_sanity,
+/turf/open/floor/engine,
+/area/station/science/xenobiology)
 "adI" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -2167,6 +2171,12 @@
 	},
 /turf/open/floor/iron/dark,
 /area/station/command/heads_quarters/cmo)
+"aIb" = (
+/obj/effect/landmark/firealarm_sanity,
+/turf/open/floor/engine{
+	name = "Holodeck Projector Floor"
+	},
+/area/station/holodeck/rec_center)
 "aIl" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -2325,6 +2335,7 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/mapping_helpers/burnt_floor,
+/obj/effect/landmark/firealarm_sanity,
 /turf/open/floor/plating,
 /area/station/security/execution/education)
 "aLi" = (
@@ -3920,6 +3931,7 @@
 	dir = 4
 	},
 /obj/effect/turf_decal/tile/neutral,
+/obj/machinery/firealarm/directional/east,
 /turf/open/floor/iron/dark,
 /area/station/command/bridge)
 "brg" = (
@@ -4895,6 +4907,7 @@
 /obj/machinery/light_switch/directional/south{
 	pixel_x = 12
 	},
+/obj/machinery/firealarm/directional/south,
 /turf/open/floor/iron/dark/smooth_large,
 /area/station/cargo/bitrunning/den)
 "bId" = (
@@ -7557,7 +7570,6 @@
 /turf/open/floor/iron,
 /area/station/service/hydroponics)
 "cAz" = (
-/obj/machinery/firealarm/directional/west,
 /obj/machinery/door/firedoor,
 /obj/effect/turf_decal/caution/stand_clear,
 /obj/effect/turf_decal/stripes/corner{
@@ -9191,7 +9203,6 @@
 /turf/open/floor/iron/showroomfloor,
 /area/station/medical/medbay/central)
 "dez" = (
-/obj/machinery/door/firedoor,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/door/airlock/external{
 	name = "Mining Dock Airlock"
@@ -10405,13 +10416,13 @@
 	name = "Private AI Channel";
 	pixel_y = -2
 	},
-/obj/structure/window/reinforced/spawner/directional/east,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/light/small/directional/south,
 /obj/machinery/computer/security/telescreen/minisat/directional/south,
+/obj/machinery/firealarm/directional/east,
 /turf/open/floor/plating,
 /area/station/hallway/primary/central/fore)
 "dwh" = (
@@ -10647,6 +10658,7 @@
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/obj/effect/landmark/firealarm_sanity,
 /turf/open/floor/iron/showroomfloor,
 /area/station/medical/virology)
 "dAQ" = (
@@ -13198,15 +13210,6 @@
 	},
 /turf/open/floor/iron/dark,
 /area/station/hallway/primary/fore)
-"eul" = (
-/obj/machinery/firealarm/directional/north,
-/obj/machinery/door/firedoor/border_only{
-	dir = 8
-	},
-/turf/open/floor/iron/stairs/right{
-	dir = 4
-	},
-/area/station/service/chapel)
 "euX" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -13822,9 +13825,6 @@
 	dir = 1
 	},
 /obj/machinery/camera/autoname/directional/north,
-/obj/machinery/door/firedoor/border_only{
-	dir = 8
-	},
 /turf/open/floor/iron/stairs/right{
 	dir = 4
 	},
@@ -18723,6 +18723,7 @@
 	},
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/landmark/firealarm_sanity,
 /turf/open/floor/iron/dark,
 /area/station/maintenance/port/greater)
 "geO" = (
@@ -25144,6 +25145,7 @@
 	},
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/mapping_helpers/broken_floor,
+/obj/effect/landmark/firealarm_sanity,
 /turf/open/floor/plating,
 /area/station/security/execution/transfer)
 "idh" = (
@@ -26351,6 +26353,7 @@
 /obj/effect/turf_decal/tile/neutral/half/contrasted{
 	dir = 1
 	},
+/obj/machinery/firealarm/directional/south,
 /turf/open/floor/iron/dark,
 /area/station/hallway/secondary/exit/departure_lounge)
 "iwf" = (
@@ -27454,7 +27457,7 @@
 /area/station/maintenance/port/greater)
 "iLX" = (
 /obj/structure/table,
-/obj/machinery/newscaster/directional/south,
+/obj/machinery/firealarm/directional/south,
 /turf/open/floor/iron/dark,
 /area/station/security/checkpoint/science/research)
 "iMr" = (
@@ -28509,7 +28512,6 @@
 /area/station/medical/virology)
 "jdW" = (
 /obj/structure/table/reinforced,
-/obj/machinery/door/firedoor,
 /obj/machinery/door/poddoor/shutters{
 	dir = 4;
 	id = "bankshutter";
@@ -36139,6 +36141,7 @@
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/firealarm/directional/east,
 /turf/open/floor/iron/checker,
 /area/station/security/processing/cremation)
 "lBb" = (
@@ -39697,6 +39700,7 @@
 /obj/effect/turf_decal/tile/neutral/half/contrasted{
 	dir = 4
 	},
+/obj/machinery/firealarm/directional/south,
 /turf/open/floor/iron/dark,
 /area/station/science/xenobiology)
 "mIW" = (
@@ -41798,6 +41802,7 @@
 /obj/effect/turf_decal/tile/neutral{
 	dir = 1
 	},
+/obj/effect/landmark/firealarm_sanity,
 /turf/open/floor/iron,
 /area/station/security/processing)
 "nuc" = (
@@ -42352,6 +42357,7 @@
 	dir = 4
 	},
 /obj/effect/turf_decal/tile/purple/half/contrasted,
+/obj/machinery/firealarm/directional/south,
 /turf/open/floor/iron/showroomfloor,
 /area/station/science/ordnance)
 "nDO" = (
@@ -42546,6 +42552,7 @@
 	pixel_y = 6
 	},
 /obj/item/food/grown/poppy,
+/obj/machinery/firealarm/directional/north,
 /turf/open/floor/iron/dark,
 /area/station/service/chapel)
 "nGH" = (
@@ -49753,7 +49760,6 @@
 /turf/open/floor/grass,
 /area/station/medical/psychology)
 "qbP" = (
-/obj/machinery/firealarm/directional/south,
 /obj/machinery/door/firedoor/border_only{
 	dir = 8
 	},
@@ -49877,6 +49883,7 @@
 	dir = 8
 	},
 /obj/effect/turf_decal/tile/blue/opposingcorners,
+/obj/machinery/firealarm/directional/south,
 /turf/open/floor/iron/showroomfloor,
 /area/station/medical/psychology)
 "qeJ" = (
@@ -51207,7 +51214,6 @@
 /area/space/nearstation)
 "qDt" = (
 /obj/structure/table/reinforced,
-/obj/machinery/door/firedoor,
 /obj/machinery/door/poddoor/shutters{
 	dir = 4;
 	id = "bankshutter";
@@ -54432,6 +54438,7 @@
 /obj/effect/turf_decal/tile/neutral{
 	dir = 1
 	},
+/obj/machinery/firealarm/directional/north,
 /turf/open/floor/iron,
 /area/station/hallway/secondary/exit/departure_lounge)
 "rDi" = (
@@ -54458,6 +54465,7 @@
 	},
 /obj/effect/turf_decal/stripes/line,
 /obj/effect/turf_decal/tile/neutral/opposingcorners,
+/obj/effect/landmark/firealarm_sanity,
 /turf/open/floor/iron/dark,
 /area/station/ai_monitored/command/storage/eva)
 "rDO" = (
@@ -55601,6 +55609,9 @@
 /obj/effect/turf_decal/tile/neutral/half/contrasted{
 	dir = 1
 	},
+/obj/machinery/firealarm/directional/south{
+	pixel_y = -36
+	},
 /turf/open/floor/iron/dark,
 /area/station/security/checkpoint/medical)
 "rVt" = (
@@ -58304,6 +58315,18 @@
 	},
 /turf/open/floor/iron,
 /area/station/service/hydroponics)
+"sMv" = (
+/obj/effect/turf_decal/tile/blue{
+	dir = 8
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
+	},
+/obj/effect/landmark/firealarm_sanity,
+/turf/open/floor/iron/dark/corner{
+	dir = 8
+	},
+/area/station/hallway/primary/fore)
 "sME" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -63729,6 +63752,7 @@
 /area/station/hallway/primary/aft)
 "usT" = (
 /obj/structure/dresser,
+/obj/machinery/firealarm/directional/south,
 /turf/open/floor/carpet/green,
 /area/station/command/heads_quarters/nt_rep)
 "usV" = (
@@ -64141,9 +64165,6 @@
 /area/station/commons/locker)
 "uAH" = (
 /obj/machinery/airalarm/directional/south,
-/obj/machinery/door/firedoor/border_only{
-	dir = 8
-	},
 /turf/open/floor/iron/stairs/left{
 	dir = 4
 	},
@@ -65368,6 +65389,7 @@
 /obj/structure/cable,
 /obj/effect/turf_decal/tile/purple,
 /obj/effect/turf_decal/tile/purple/half/contrasted,
+/obj/effect/landmark/firealarm_sanity,
 /turf/open/floor/iron/showroomfloor,
 /area/station/science/xenobiology)
 "uXL" = (
@@ -65877,6 +65899,12 @@
 /obj/structure/cable,
 /turf/open/floor/plating,
 /area/station/engineering/main)
+"vfw" = (
+/obj/effect/turf_decal/tile/red/half/contrasted,
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/landmark/firealarm_sanity,
+/turf/open/floor/iron,
+/area/station/security/brig)
 "vfF" = (
 /obj/machinery/firealarm/directional/south,
 /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{
@@ -67539,6 +67567,7 @@
 	network = list("aicore")
 	},
 /obj/machinery/light/floor,
+/obj/effect/landmark/firealarm_sanity,
 /turf/open/floor/engine,
 /area/station/ai_monitored/turret_protected/ai)
 "vFv" = (
@@ -71276,6 +71305,7 @@
 /turf/closed/wall/rust,
 /area/station/maintenance/department/cargo)
 "wJo" = (
+/obj/effect/landmark/firealarm_sanity,
 /turf/open/floor/plating,
 /area/station/maintenance/department/security)
 "wJw" = (
@@ -74716,9 +74746,6 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/obj/machinery/door/firedoor/border_only{
-	dir = 8
-	},
 /turf/open/floor/iron/stairs/medium{
 	dir = 4
 	},
@@ -89667,7 +89694,7 @@ pOV
 pOV
 pOV
 tiv
-eul
+vUi
 jpa
 cne
 rsX
@@ -92055,7 +92082,7 @@ mzt
 afn
 vdK
 khT
-bJv
+aIb
 bJv
 bJv
 bJv
@@ -96195,7 +96222,7 @@ dzy
 sCJ
 ocz
 dZA
-lYX
+vfw
 ijl
 abj
 lzg
@@ -99716,7 +99743,7 @@ kGB
 hYM
 tOY
 nkb
-fYa
+sMv
 xAN
 nkb
 fYa
@@ -113334,7 +113361,7 @@ aeu
 vJc
 qmW
 bXa
-qmW
+adB
 qdR
 lev
 lUH

_maps/map_files/VoidRaptor/VoidRaptor.dmm

@@ -4298,6 +4298,7 @@
 /obj/structure/railing{
 	dir = 8
 	},
+/obj/machinery/firealarm/directional/south,
 /turf/open/floor/iron/smooth,
 /area/station/command/cc_dock)
 "blY" = (
@@ -7018,6 +7019,13 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/wood/large,
 /area/station/command/heads_quarters/rd)
+"cef" = (
+/obj/structure/railing{
+	dir = 1
+	},
+/obj/machinery/firealarm/directional/west,
+/turf/open/floor/circuit,
+/area/station/ai_monitored/turret_protected/aisat_interior)
 "ceg" = (
 /obj/effect/turf_decal/trimline/dark_red/arrow_ccw,
 /obj/structure/closet/firecloset/wall{
@@ -9152,6 +9160,13 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/catwalk_floor/iron_smooth,
 /area/station/science/robotics/mechbay)
+"cKI" = (
+/obj/effect/turf_decal/tile/neutral/opposingcorners{
+	dir = 1
+	},
+/obj/machinery/firealarm/directional/east,
+/turf/open/floor/iron/checker,
+/area/station/service/theater)
 "cKW" = (
 /obj/machinery/door/firedoor,
 /turf/open/floor/iron/large,
@@ -10301,6 +10316,7 @@
 	},
 /obj/structure/disposalpipe/segment,
 /obj/structure/cable,
+/obj/effect/landmark/firealarm_sanity,
 /turf/open/floor/iron/dark,
 /area/station/security/brig)
 "ddt" = (
@@ -10714,6 +10730,12 @@
 	},
 /turf/open/floor/circuit,
 /area/station/ai_monitored/turret_protected/ai_upload)
+"diI" = (
+/obj/effect/landmark/firealarm_sanity,
+/turf/open/floor/engine{
+	name = "Holodeck Projector Floor"
+	},
+/area/station/holodeck/rec_center)
 "diV" = (
 /obj/effect/turf_decal/tile/purple{
 	dir = 1
@@ -11900,6 +11922,7 @@
 /obj/effect/turf_decal/trimline/blue/filled/arrow_ccw{
 	dir = 4
 	},
+/obj/effect/landmark/firealarm_sanity,
 /turf/open/floor/iron/dark,
 /area/station/hallway/secondary/command)
 "dAL" = (
@@ -14010,6 +14033,7 @@
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
 	dir = 8
 	},
+/obj/effect/landmark/firealarm_sanity,
 /turf/open/floor/iron/white/smooth_large,
 /area/station/common/cryopods)
 "edL" = (
@@ -16653,7 +16677,6 @@
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/door/firedoor,
 /turf/open/floor/wood/parquet,
 /area/station/common/night_club)
 "ePH" = (
@@ -16835,6 +16858,7 @@
 /obj/effect/turf_decal/tile/blue/anticorner{
 	dir = 1
 	},
+/obj/effect/landmark/firealarm_sanity,
 /turf/open/floor/iron/dark/smooth_large,
 /area/station/command/bridge)
 "eSD" = (
@@ -18721,6 +18745,7 @@
 	dir = 1
 	},
 /obj/effect/turf_decal/tile/dark_blue/full,
+/obj/effect/landmark/firealarm_sanity,
 /turf/open/floor/iron/dark/smooth_large,
 /area/station/command/heads_quarters/blueshield)
 "fwW" = (
@@ -20957,6 +20982,7 @@
 	},
 /obj/machinery/atmospherics/pipe/smart/simple/dark/visible,
 /obj/machinery/light/directional/north,
+/obj/machinery/firealarm/directional/north,
 /turf/open/floor/iron/smooth,
 /area/station/engineering/atmos)
 "ghB" = (
@@ -26946,6 +26972,7 @@
 	dir = 4
 	},
 /obj/effect/turf_decal/bot,
+/obj/machinery/firealarm/directional/west,
 /turf/open/floor/iron/edge{
 	dir = 4
 	},
@@ -29481,6 +29508,7 @@
 	dir = 2
 	},
 /obj/effect/decal/cleanable/dirt,
+/obj/effect/landmark/firealarm_sanity,
 /turf/open/floor/catwalk_floor/iron_smooth,
 /area/station/maintenance/port/greater)
 "izt" = (
@@ -30846,7 +30874,7 @@
 /obj/effect/turf_decal/trimline/red/filled/warning{
 	dir = 9
 	},
-/obj/structure/sign/calendar/directional/north,
+/obj/machinery/firealarm/directional/north,
 /turf/open/floor/iron/dark,
 /area/station/security/warden)
 "iUL" = (
@@ -32856,6 +32884,7 @@
 /obj/effect/turf_decal/trimline/blue/filled/line{
 	dir = 4
 	},
+/obj/machinery/firealarm/directional/east,
 /turf/open/floor/vault,
 /area/station/ai_monitored/turret_protected/ai_upload)
 "jvr" = (
@@ -33270,6 +33299,7 @@
 /obj/effect/turf_decal/trimline/blue/filled/line{
 	dir = 10
 	},
+/obj/machinery/firealarm/directional/south,
 /turf/open/floor/iron/smooth,
 /area/station/engineering/atmos/storage)
 "jBH" = (
@@ -33542,7 +33572,6 @@
 /area/station/maintenance/starboard/lesser)
 "jEj" = (
 /obj/effect/turf_decal/delivery,
-/obj/machinery/door/firedoor,
 /obj/effect/turf_decal/bot,
 /obj/machinery/door/window/left/directional/west{
 	name = "Engineering Deliveries";
@@ -33594,6 +33623,7 @@
 	dir = 9
 	},
 /obj/structure/closet/radiation,
+/obj/machinery/firealarm/directional/north,
 /turf/open/floor/iron/smooth,
 /area/station/engineering/atmos)
 "jEP" = (
@@ -41647,7 +41677,6 @@
 	req_access = list("medical")
 	},
 /obj/structure/window/reinforced/spawner/directional/north,
-/obj/machinery/door/firedoor,
 /obj/structure/sign/calendar/directional/south,
 /obj/effect/turf_decal/delivery/blue,
 /turf/open/floor/iron/white/smooth_large,
@@ -42352,6 +42381,15 @@
 /obj/machinery/firealarm/directional/north,
 /turf/open/floor/iron/freezer,
 /area/station/medical/chemistry)
+"lUv" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/turf_decal/tile/dark_red/diagonal_centre,
+/obj/effect/turf_decal/tile/neutral/diagonal_centre,
+/obj/machinery/firealarm/directional/south,
+/turf/open/floor/iron/dark/diagonal,
+/area/station/security/execution/transfer)
 "lUA" = (
 /obj/effect/turf_decal/trimline/yellow/filled/corner,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -44770,6 +44808,7 @@
 "mFl" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/firealarm/directional/south,
 /turf/open/floor/circuit/green,
 /area/station/ai_monitored/turret_protected/ai)
 "mFq" = (
@@ -52353,7 +52392,6 @@
 /area/station/hallway/primary/central)
 "oIw" = (
 /obj/structure/table/reinforced,
-/obj/machinery/door/firedoor,
 /obj/machinery/door/poddoor/shutters{
 	dir = 4;
 	id = "bankshutter";
@@ -55742,6 +55780,7 @@
 /obj/effect/turf_decal/trimline/yellow/filled/line{
 	dir = 9
 	},
+/obj/machinery/firealarm/directional/north,
 /turf/open/floor/iron/smooth,
 /area/station/engineering/gravity_generator)
 "pCQ" = (
@@ -56369,11 +56408,11 @@
 /turf/open/floor/plating,
 /area/station/maintenance/starboard/greater)
 "pMO" = (
-/obj/machinery/newscaster/directional/north,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/structure/cable,
 /obj/machinery/light/cold/directional/north,
+/obj/machinery/firealarm/directional/north,
 /turf/open/floor/iron/smooth,
 /area/station/command/cc_dock)
 "pMR" = (
@@ -58745,6 +58784,7 @@
 "qrK" = (
 /obj/machinery/teleport/station,
 /obj/effect/turf_decal/bot,
+/obj/machinery/firealarm/directional/west,
 /turf/open/floor/circuit,
 /area/station/command/teleporter)
 "qrR" = (
@@ -59095,6 +59135,13 @@
 /obj/machinery/computer/security/telescreen/tcomms/directional/west,
 /turf/open/floor/engine,
 /area/station/tcommsat/computer)
+"qxM" = (
+/obj/structure/chair/office{
+	dir = 4
+	},
+/obj/machinery/firealarm/directional/north,
+/turf/open/floor/carpet/cyan,
+/area/station/command/heads_quarters/blueshield)
 "qxO" = (
 /turf/closed/wall/r_wall,
 /area/station/security/checkpoint/medical)
@@ -61785,7 +61832,7 @@
 /obj/effect/turf_decal/trimline/green/filled/line{
 	dir = 10
 	},
-/obj/machinery/newscaster/directional/south,
+/obj/machinery/firealarm/directional/south,
 /turf/open/floor/iron,
 /area/station/commons/storage/primary)
 "rjQ" = (
@@ -62423,7 +62470,6 @@
 	dir = 8
 	},
 /obj/machinery/light/blacklight/directional/east,
-/obj/machinery/firealarm/directional/east,
 /turf/open/floor/carpet/purple,
 /area/station/common/night_club)
 "rue" = (
@@ -67256,6 +67302,7 @@
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/landmark/firealarm_sanity,
 /turf/open/floor/iron/dark/smooth_large,
 /area/station/ai_monitored/command/nuke_storage)
 "sMN" = (
@@ -69303,6 +69350,7 @@
 /obj/effect/landmark/start/cyborg,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/landmark/firealarm_sanity,
 /turf/open/floor/vault,
 /area/station/ai_monitored/turret_protected/ai_upload)
 "toY" = (
@@ -72753,6 +72801,7 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/spawner/random/trash/food_packaging,
 /obj/machinery/light/small/directional/west,
+/obj/machinery/firealarm/directional/north,
 /turf/open/floor/iron/smooth,
 /area/station/maintenance/department/engine/atmos/lesser)
 "uml" = (
@@ -78130,7 +78179,6 @@
 /obj/structure/disposalpipe/junction{
 	dir = 2
 	},
-/obj/structure/sign/poster/official/random/directional/east,
 /obj/effect/turf_decal/trimline/blue/filled/line{
 	dir = 4
 	},
@@ -79171,6 +79219,7 @@
 /area/station/service/chapel)
 "vYJ" = (
 /obj/item/kirbyplants/random,
+/obj/machinery/firealarm/directional/north,
 /turf/open/floor/iron/smooth,
 /area/station/hallway/secondary/entry)
 "vYP" = (
@@ -80692,6 +80741,9 @@
 	dir = 9
 	},
 /obj/structure/disposalpipe/segment,
+/obj/machinery/firealarm/directional/west{
+	pixel_y = -6
+	},
 /turf/open/floor/iron/dark,
 /area/station/security/office)
 "wue" = (
@@ -82637,6 +82689,7 @@
 	dir = 1
 	},
 /obj/machinery/light/cold/directional/north,
+/obj/machinery/firealarm/directional/north,
 /turf/open/floor/iron/kitchen{
 	dir = 1
 	},
@@ -83549,7 +83602,6 @@
 /area/station/command/heads_quarters/nt_rep)
 "xlM" = (
 /obj/structure/table/reinforced,
-/obj/machinery/door/firedoor,
 /obj/machinery/door/poddoor/shutters{
 	dir = 4;
 	id = "bankshutter";
@@ -85241,6 +85293,7 @@
 "xJH" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/landmark/firealarm_sanity,
 /turf/open/floor/catwalk_floor/iron_smooth,
 /area/station/maintenance/department/engine/atmos)
 "xJW" = (
@@ -86042,6 +86095,7 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/structure/cable,
 /obj/effect/turf_decal/tile/blue/diagonal_centre,
+/obj/machinery/firealarm/directional/south,
 /turf/open/floor/iron/dark/diagonal,
 /area/station/engineering/transit_tube)
 "xWq" = (
@@ -101281,7 +101335,7 @@ xPW
 oBx
 oBx
 enT
-aIi
+cef
 bBd
 tOI
 teP
@@ -117287,7 +117341,7 @@ uHZ
 pEv
 ydl
 vKh
-mmy
+cKI
 mTQ
 uHZ
 jCA
@@ -117732,7 +117786,7 @@ doJ
 oTe
 csX
 cmH
-uvW
+qxM
 uvW
 wEB
 kAm
@@ -125266,7 +125320,7 @@ rHw
 cVF
 uQo
 wDc
-ryo
+diI
 ryo
 ryo
 ryo
@@ -132156,7 +132210,7 @@ xTY
 oxW
 wOx
 opr
-mpF
+lUv
 acN
 ahi
 ehU

_maps/map_files/biodome/biodome.dmm

@@ -2850,6 +2850,7 @@
 "aVD" = (
 /obj/machinery/coffeemaker/impressa,
 /obj/structure/table/wood,
+/obj/machinery/firealarm/directional/east,
 /turf/open/floor/wood,
 /area/station/command/meeting_room)
 "aVG" = (
@@ -3286,6 +3287,7 @@
 "bdn" = (
 /obj/structure/cable,
 /obj/effect/landmark/start/nanotrasen_consultant,
+/obj/machinery/firealarm/directional/west,
 /turf/open/floor/carpet/green,
 /area/station/command/heads_quarters/nt_rep)
 "bdu" = (
@@ -3409,6 +3411,7 @@
 /turf/closed/wall,
 /area/station/engineering/storage/tech)
 "bgp" = (
+/obj/effect/landmark/firealarm_sanity,
 /turf/open/floor/iron/stairs/medium,
 /area/station/cargo/warehouse)
 "bgQ" = (
@@ -4035,6 +4038,7 @@
 /area/station/hallway/primary/port)
 "bsm" = (
 /obj/structure/stairs/west,
+/obj/effect/landmark/firealarm_sanity,
 /turf/open/floor/iron/dark/smooth_half,
 /area/station/ai_monitored/security/armory)
 "bsp" = (
@@ -5920,6 +5924,10 @@
 /obj/structure/extinguisher_cabinet/directional/east,
 /turf/open/floor/grass,
 /area/station/biodome)
+"caa" = (
+/obj/effect/landmark/firealarm_sanity,
+/turf/open/openspace,
+/area/station/security/brig)
 "cab" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -6278,6 +6286,13 @@
 /obj/structure/ladder,
 /turf/open/misc/asteroid/airless,
 /area/station/asteroid)
+"cha" = (
+/obj/effect/turf_decal/tile/blue/half/contrasted{
+	dir = 4
+	},
+/obj/machinery/firealarm/directional/east,
+/turf/open/floor/iron/white,
+/area/station/medical/medbay/central)
 "chb" = (
 /obj/structure/table/wood,
 /obj/item/flashlight/lamp,
@@ -6747,6 +6762,7 @@
 /area/station/hallway/secondary/exit/departure_lounge)
 "cqp" = (
 /obj/structure/sign/departments/exam_room/directional/west,
+/obj/effect/landmark/firealarm_sanity,
 /turf/open/openspace,
 /area/station/medical/medbay/central)
 "cqs" = (
@@ -10952,7 +10968,6 @@
 	},
 /area/station/ai_monitored/command/nuke_storage)
 "dMC" = (
-/obj/machinery/firealarm/directional/east,
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
 	dir = 8
 	},
@@ -11063,6 +11078,11 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/engine,
 /area/station/science/explab)
+"dNR" = (
+/obj/structure/stairs/south,
+/obj/effect/landmark/firealarm_sanity,
+/turf/open/floor/grass,
+/area/station/hallway/primary/starboard)
 "dOh" = (
 /obj/item/holosign_creator/robot_seat/bar,
 /obj/structure/table/wood,
@@ -12267,6 +12287,11 @@
 /obj/structure/cable,
 /turf/open/floor/iron/white,
 /area/station/medical/medbay/central)
+"ejW" = (
+/obj/structure/lattice/catwalk,
+/obj/effect/landmark/firealarm_sanity,
+/turf/open/openspace,
+/area/station/service/kitchen/diner)
 "ekj" = (
 /obj/structure/table/reinforced,
 /obj/machinery/recharger,
@@ -12881,6 +12906,7 @@
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
 /obj/effect/turf_decal/tile/green/full,
 /obj/machinery/light/small/directional/north,
+/obj/machinery/firealarm/directional/north,
 /turf/open/floor/iron/smooth_large,
 /area/station/medical/virology)
 "evI" = (
@@ -13673,6 +13699,11 @@
 /obj/effect/landmark/event_spawn,
 /turf/open/floor/iron/dark,
 /area/station/command/heads_quarters/rd)
+"eJf" = (
+/obj/machinery/light/directional/west,
+/obj/machinery/firealarm/directional/west,
+/turf/open/floor/carpet/black,
+/area/station/security/prison)
 "eJi" = (
 /obj/structure/disposalpipe/segment{
 	dir = 10
@@ -16548,6 +16579,13 @@
 	},
 /turf/open/floor/wood/large,
 /area/station/hallway/primary/central)
+"fHe" = (
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/obj/machinery/firealarm/directional/north,
+/turf/open/floor/stone,
+/area/station/hallway/primary/starboard)
 "fHJ" = (
 /obj/structure/cable/multilayer/multiz,
 /turf/open/floor/plating,
@@ -18174,6 +18212,10 @@
 /obj/structure/cable,
 /turf/open/floor/iron,
 /area/station/engineering/engine_smes)
+"giP" = (
+/obj/effect/landmark/firealarm_sanity,
+/turf/open/openspace,
+/area/station/medical/medbay/central)
 "gjb" = (
 /obj/structure/chair/stool/directional/north,
 /obj/effect/turf_decal/trimline/red/warning{
@@ -19005,6 +19047,7 @@
 /obj/effect/turf_decal/tile/brown/half/contrasted{
 	dir = 1
 	},
+/obj/machinery/firealarm/directional/north,
 /turf/open/floor/iron,
 /area/station/command/bridge)
 "gxn" = (
@@ -19059,6 +19102,7 @@
 /turf/open/floor/iron,
 /area/station/security/office)
 "gym" = (
+/obj/effect/landmark/firealarm_sanity,
 /turf/open/openspace,
 /area/station/service/kitchen/coldroom)
 "gyq" = (
@@ -20977,6 +21021,15 @@
 /obj/item/storage/fancy/nugget_box,
 /turf/open/misc/asteroid/airless,
 /area/station/asteroid)
+"hiD" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/obj/machinery/firealarm/directional/south,
+/turf/open/floor/grass,
+/area/station/biodome/aft)
 "hiF" = (
 /obj/effect/turf_decal/weather/dirt,
 /obj/effect/spawner/structure/window,
@@ -21986,6 +22039,7 @@
 /obj/effect/turf_decal/trimline/yellow/line{
 	dir = 8
 	},
+/obj/machinery/firealarm/directional/west,
 /turf/open/floor/iron,
 /area/station/commons/fitness)
 "hDE" = (
@@ -22288,13 +22342,18 @@
 /obj/item/trash/candle,
 /turf/open/floor/plating,
 /area/station/maintenance/port/central)
+"hIp" = (
+/obj/effect/landmark/firealarm_sanity,
+/turf/open/floor/engine{
+	name = "Holodeck Projector Floor"
+	},
+/area/station/holodeck/rec_center)
 "hIs" = (
 /obj/structure/bed,
 /obj/item/bedsheet/brown,
 /turf/open/floor/wood/large,
 /area/station/cargo/miningdock)
 "hIE" = (
-/obj/machinery/firealarm/directional/south,
 /obj/machinery/door/firedoor/border_only{
 	dir = 8
 	},
@@ -22764,6 +22823,10 @@
 /obj/effect/turf_decal/tile/brown/half/contrasted,
 /turf/open/floor/iron,
 /area/station/cargo/storage)
+"hSL" = (
+/obj/machinery/firealarm/directional/east,
+/turf/open/floor/eighties/red,
+/area/station/hallway/secondary/exit/departure_lounge)
 "hTo" = (
 /obj/effect/spawner/structure/window/reinforced,
 /obj/structure/cable,
@@ -23969,6 +24032,7 @@
 /obj/structure/table,
 /obj/machinery/microwave,
 /obj/effect/spawner/random/food_or_drink/donkpockets,
+/obj/machinery/firealarm/directional/west,
 /turf/open/floor/iron/smooth,
 /area/station/cargo/warehouse)
 "ioC" = (
@@ -25518,6 +25582,7 @@
 /obj/effect/turf_decal/tile/red/half/contrasted{
 	dir = 4
 	},
+/obj/machinery/firealarm/directional/east,
 /turf/open/floor/iron/dark,
 /area/station/ai_monitored/security/armory)
 "iQS" = (
@@ -25903,6 +25968,7 @@
 	c_tag = "Research - Xenobiology";
 	network = list("ss13","rd","xeno")
 	},
+/obj/machinery/firealarm/directional/south,
 /turf/open/floor/iron/white,
 /area/station/science/xenobiology)
 "iZl" = (
@@ -27821,6 +27887,10 @@
 /obj/effect/turf_decal/tile/blue/opposingcorners,
 /turf/open/floor/iron/cafeteria,
 /area/station/commons/dorms/laundry)
+"jHo" = (
+/obj/machinery/firealarm/directional/north,
+/turf/open/floor/iron/dark,
+/area/station/command/bridge)
 "jHG" = (
 /obj/effect/turf_decal/tile/neutral{
 	dir = 1
@@ -28209,6 +28279,7 @@
 	c_tag = "Civilian - Laundry Room"
 	},
 /obj/effect/turf_decal/tile/blue/opposingcorners,
+/obj/machinery/firealarm/directional/east,
 /turf/open/floor/iron/cafeteria,
 /area/station/commons/dorms/laundry)
 "jOH" = (
@@ -28605,6 +28676,7 @@
 	},
 /area/station/commons/fitness)
 "jVT" = (
+/obj/effect/landmark/firealarm_sanity,
 /turf/open/openspace,
 /area/station/hallway/primary/aft)
 "jVW" = (
@@ -30483,6 +30555,10 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating/rust,
 /area/station/maintenance/disposal)
+"kAn" = (
+/obj/machinery/firealarm/directional/south,
+/turf/open/floor/grass,
+/area/station/security/courtroom)
 "kAo" = (
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -31156,6 +31232,7 @@
 /obj/effect/turf_decal/siding/dark{
 	dir = 1
 	},
+/obj/machinery/firealarm/directional/north,
 /turf/open/floor/carpet/black,
 /area/station/service/chapel)
 "kLR" = (
@@ -33060,6 +33137,19 @@
 /obj/machinery/vending/cigarette,
 /turf/open/floor/iron,
 /area/station/hallway/primary/starboard)
+"lrt" = (
+/obj/machinery/firealarm/directional/east,
+/turf/open/floor/iron/white,
+/area/station/science/xenobiology)
+"lrC" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/disposalpipe/segment{
+	dir = 5
+	},
+/obj/machinery/firealarm/directional/west,
+/turf/open/floor/stone,
+/area/station/biodome/aft)
 "lrN" = (
 /obj/machinery/suit_storage_unit/engine,
 /obj/effect/turf_decal/siding/thinplating_new/terracotta,
@@ -34975,6 +35065,7 @@
 /obj/item/food/grown/banana,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/landmark/firealarm_sanity,
 /turf/open/floor/grass,
 /area/station/medical/virology)
 "lXS" = (
@@ -36039,6 +36130,7 @@
 "mpy" = (
 /obj/effect/turf_decal/delivery,
 /obj/structure/transport/linear/public,
+/obj/effect/landmark/firealarm_sanity,
 /turf/open/floor/plating/elevatorshaft,
 /area/station/security/brig)
 "mpz" = (
@@ -36537,6 +36629,10 @@
 	},
 /turf/open/floor/iron/white,
 /area/station/medical/medbay/central)
+"myu" = (
+/obj/effect/landmark/firealarm_sanity,
+/turf/open/openspace,
+/area/station/science/research)
 "myK" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/structure/cable,
@@ -37804,6 +37900,10 @@
 	},
 /turf/open/floor/iron/dark/smooth_corner,
 /area/station/commons/fitness)
+"mVI" = (
+/obj/effect/landmark/firealarm_sanity,
+/turf/open/openspace,
+/area/station/science/xenobiology)
 "mVJ" = (
 /obj/structure/rack,
 /obj/effect/spawner/random/techstorage/command_all,
@@ -40887,6 +40987,7 @@
 /obj/machinery/camera/directional/east{
 	c_tag = "Service - Theater Dressing Room"
 	},
+/obj/machinery/firealarm/directional/east,
 /turf/open/floor/carpet/black,
 /area/station/service/theater)
 "nVu" = (
@@ -40944,6 +41045,10 @@
 /obj/item/wallframe/apc,
 /turf/open/floor/plating,
 /area/station/maintenance/central/greater)
+"nWV" = (
+/obj/machinery/firealarm/directional/east,
+/turf/open/floor/grass,
+/area/station/biodome/aft)
 "nWX" = (
 /obj/effect/spawner/structure/window/reinforced,
 /obj/structure/cable,
@@ -42079,6 +42184,7 @@
 "oqf" = (
 /obj/machinery/vending/wardrobe/hydro_wardrobe,
 /obj/effect/turf_decal/tile/dark_green/full,
+/obj/machinery/firealarm/directional/east,
 /turf/open/floor/iron/dark/small,
 /area/station/service/hydroponics)
 "oqn" = (
@@ -42273,7 +42379,6 @@
 /obj/machinery/door/firedoor/border_only{
 	dir = 4
 	},
-/obj/machinery/firealarm/directional/south,
 /turf/open/floor/iron/smooth,
 /area/station/cargo/warehouse)
 "ouh" = (
@@ -42452,6 +42557,18 @@
 /obj/effect/turf_decal/siding/yellow,
 /turf/open/floor/wood/tile,
 /area/station/command/heads_quarters/captain)
+"oxZ" = (
+/obj/structure/cable,
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/obj/machinery/duct,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/turf_decal/tile/green/fourcorners,
+/obj/effect/landmark/firealarm_sanity,
+/turf/open/floor/iron/white,
+/area/station/medical/virology)
 "oya" = (
 /obj/machinery/air_sensor/carbon_tank,
 /turf/open/floor/engine/co2,
@@ -44233,6 +44350,11 @@
 /obj/effect/spawner/random/bureaucracy/birthday_wrap,
 /turf/open/floor/wood,
 /area/station/cargo/office)
+"pdD" = (
+/obj/structure/closet/secure_closet/brig,
+/obj/machinery/firealarm/directional/west,
+/turf/open/floor/iron/dark/smooth_half,
+/area/station/security/brig)
 "pdG" = (
 /obj/structure/bed/maint,
 /obj/effect/landmark/start/hangover,
@@ -46686,6 +46808,7 @@
 /area/space/nearstation)
 "pYu" = (
 /obj/structure/chair/stool/directional/west,
+/obj/machinery/firealarm/directional/south,
 /turf/open/floor/iron,
 /area/station/security/prison)
 "pYv" = (
@@ -47732,6 +47855,7 @@
 /area/station/security/courtroom)
 "qpq" = (
 /obj/machinery/teleport/station,
+/obj/machinery/firealarm/directional/south,
 /turf/open/floor/iron/dark,
 /area/station/command/teleporter)
 "qpC" = (
@@ -51676,6 +51800,7 @@
 "rDd" = (
 /obj/effect/turf_decal/stripes/red/line,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible,
+/obj/effect/landmark/firealarm_sanity,
 /turf/open/floor/engine,
 /area/station/science/cytology)
 "rDr" = (
@@ -51796,6 +51921,9 @@
 	dir = 5
 	},
 /obj/effect/landmark/start/blueshield,
+/obj/machinery/firealarm/directional/east{
+	pixel_x = 32
+	},
 /turf/open/floor/wood/parquet,
 /area/station/command/heads_quarters/blueshield)
 "rGg" = (
@@ -51922,6 +52050,7 @@
 /area/station/service/chapel)
 "rHX" = (
 /obj/structure/stairs/north,
+/obj/effect/landmark/firealarm_sanity,
 /turf/open/floor/iron/stairs/left,
 /area/station/cargo/miningdock)
 "rIk" = (
@@ -53029,6 +53158,7 @@
 /area/station/tcommsat/server)
 "sbJ" = (
 /obj/machinery/light/dim/directional/west,
+/obj/effect/landmark/firealarm_sanity,
 /turf/open/floor/iron/stairs{
 	dir = 1
 	},
@@ -54787,6 +54917,7 @@
 	dir = 8
 	},
 /obj/machinery/light/small/directional/east,
+/obj/machinery/firealarm/directional/north,
 /turf/open/floor/iron,
 /area/station/security/brig)
 "sKk" = (
@@ -56598,6 +56729,10 @@
 /obj/structure/disposalpipe/segment,
 /turf/open/floor/stone,
 /area/station/biodome/aft)
+"toj" = (
+/obj/effect/landmark/firealarm_sanity,
+/turf/open/openspace,
+/area/station/hallway/primary/starboard)
 "toN" = (
 /obj/effect/spawner/structure/window/reinforced,
 /obj/structure/cable,
@@ -57118,6 +57253,7 @@
 /turf/open/floor/iron/herringbone,
 /area/station/hallway/primary/central)
 "tyh" = (
+/obj/effect/landmark/firealarm_sanity,
 /turf/open/floor/iron/stairs/medium,
 /area/station/medical/medbay/central)
 "tyi" = (
@@ -57888,6 +58024,7 @@
 /obj/effect/turf_decal/siding/wood{
 	dir = 10
 	},
+/obj/machinery/firealarm/directional/south,
 /turf/open/floor/stone,
 /area/station/cargo/blacksmith)
 "tLm" = (
@@ -58232,6 +58369,10 @@
 "tRA" = (
 /turf/open/openspace,
 /area/station/science/genetics)
+"tSd" = (
+/obj/effect/landmark/firealarm_sanity,
+/turf/open/openspace,
+/area/station/cargo/miningdock)
 "tSu" = (
 /obj/effect/turf_decal/bot,
 /turf/open/floor/wood/large,
@@ -58611,6 +58752,7 @@
 "uaO" = (
 /obj/effect/turf_decal/delivery,
 /obj/structure/transport/linear/public,
+/obj/effect/landmark/firealarm_sanity,
 /turf/open/floor/plating/elevatorshaft,
 /area/station/hallway/secondary/construction/engineering)
 "uaZ" = (
@@ -59234,6 +59376,7 @@
 /area/station/biodome/aft)
 "unD" = (
 /obj/structure/stairs/east,
+/obj/effect/landmark/firealarm_sanity,
 /turf/open/floor/iron/stairs/left{
 	dir = 8
 	},
@@ -62226,6 +62369,10 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /turf/open/floor/plating,
 /area/station/maintenance/disposal)
+"vrE" = (
+/obj/machinery/firealarm/directional/north,
+/turf/open/floor/grass,
+/area/station/biodome/aft)
 "vrL" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -65750,6 +65897,10 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/iron/white/small,
 /area/station/maintenance/central/greater)
+"wyw" = (
+/obj/machinery/firealarm/directional/south,
+/turf/open/floor/wood/large,
+/area/station/hallway/primary/aft)
 "wyx" = (
 /obj/structure/sign/poster/random/directional/west,
 /obj/machinery/door/airlock/public/glass,
@@ -68670,6 +68821,10 @@
 /obj/effect/turf_decal/siding/dark,
 /turf/open/floor/carpet/orange,
 /area/station/security/prison)
+"xze" = (
+/obj/effect/landmark/firealarm_sanity,
+/turf/open/openspace,
+/area/station/ai_monitored/security/armory)
 "xzy" = (
 /obj/effect/spawner/random/structure/grille,
 /turf/open/floor/plating,
@@ -68787,6 +68942,7 @@
 	dir = 8
 	},
 /obj/machinery/light/warm/directional/north,
+/obj/machinery/firealarm/directional/north,
 /turf/open/floor/iron/dark,
 /area/station/medical/virology)
 "xAJ" = (
@@ -69651,6 +69807,10 @@
 	},
 /turf/open/floor/plating/rust,
 /area/station/security/prison/safe)
+"xOj" = (
+/obj/effect/landmark/firealarm_sanity,
+/turf/open/openspace,
+/area/station/cargo/storage)
 "xOm" = (
 /obj/effect/turf_decal/siding/wideplating_new,
 /turf/open/floor/catwalk_floor/iron_dark,
@@ -69689,6 +69849,13 @@
 	},
 /turf/open/floor/wood/large,
 /area/station/commons/lounge)
+"xOT" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/firealarm/directional/south,
+/turf/open/floor/iron,
+/area/station/command/bridge)
 "xPc" = (
 /obj/structure/closet/radiation,
 /turf/open/floor/iron/white,
@@ -70206,6 +70373,7 @@
 /area/station/security/brig)
 "xYc" = (
 /obj/item/radio/intercom/directional/east,
+/obj/machinery/firealarm/directional/south,
 /turf/open/floor/iron,
 /area/station/security/brig/entrance)
 "xYo" = (
@@ -70771,6 +70939,7 @@
 	},
 /obj/machinery/status_display/evac/directional/north,
 /obj/structure/cable,
+/obj/machinery/firealarm/directional/west,
 /turf/open/floor/iron/dark,
 /area/station/ai_monitored/turret_protected/aisat/foyer)
 "yiN" = (
@@ -90404,7 +90573,7 @@ cCZ
 cCZ
 cCZ
 qBA
-duv
+oxZ
 qBA
 cCZ
 cCZ
@@ -94771,7 +94940,7 @@ osr
 tyh
 gYt
 dMC
-kSr
+cha
 jKP
 gAf
 oAe
@@ -98368,7 +98537,7 @@ kle
 kle
 jdP
 bVc
-xVa
+lrC
 sAB
 oAe
 ydb
@@ -101453,7 +101622,7 @@ jTy
 ixe
 olz
 ota
-ooS
+hiD
 oAe
 nFE
 fOt
@@ -102474,7 +102643,7 @@ ota
 ota
 lGQ
 ota
-ota
+nWV
 ota
 ota
 ota
@@ -103173,7 +103342,7 @@ tkz
 oYs
 ciW
 hkq
-rsj
+lrt
 lfp
 dJN
 nfT
@@ -104020,7 +104189,7 @@ roi
 bdX
 xDy
 bAL
-ota
+vrE
 fPs
 frW
 uQJ
@@ -113781,7 +113950,7 @@ kUY
 aUm
 puS
 bRU
-jYS
+fHe
 wpy
 kPb
 cCZ
@@ -114338,7 +114507,7 @@ uwt
 oEf
 brg
 usE
-kPk
+eJf
 usE
 nWI
 usE
@@ -116128,7 +116297,7 @@ hNy
 kHf
 tgr
 kBd
-tgr
+pdD
 fwM
 iGd
 wfO
@@ -116371,7 +116540,7 @@ rJn
 mRz
 dms
 dms
-dms
+kAn
 uQi
 pjz
 tju
@@ -117131,7 +117300,7 @@ imJ
 dsR
 hNy
 kPb
-jYS
+fHe
 dAM
 oDU
 oDU
@@ -117905,7 +118074,7 @@ kPb
 fDK
 mfd
 gaw
-lwc
+dNR
 kPb
 fOU
 dTJ
@@ -157449,7 +157618,7 @@ mBc
 ibC
 hxH
 bqd
-wOV
+hIp
 wOV
 wOV
 wOV
@@ -159797,7 +159966,7 @@ dVy
 woD
 vyL
 pEE
-bwV
+giP
 bwV
 jHc
 pSH
@@ -167425,7 +167594,7 @@ xwT
 xJH
 eGS
 vCD
-rKS
+mVI
 dJN
 eNU
 eWK
@@ -168764,7 +168933,7 @@ wyP
 uAr
 rtw
 jDZ
-oaL
+ejW
 oaL
 vHx
 rtw
@@ -168972,7 +169141,7 @@ dJN
 aqd
 aqd
 dJN
-vUU
+myu
 koX
 dCg
 gcX
@@ -176227,7 +176396,7 @@ pwZ
 uoB
 qeS
 gAI
-omJ
+xOT
 nOL
 hMo
 wEH
@@ -177289,7 +177458,7 @@ aGH
 hUL
 hUL
 hUL
-hUL
+wyw
 cEV
 jxs
 uEl
@@ -177755,7 +177924,7 @@ rAq
 rAq
 rAq
 ofe
-gRD
+jHo
 gRD
 ofe
 rAq
@@ -177768,7 +177937,7 @@ fQs
 fQs
 fQs
 ofe
-gRD
+jHo
 uVv
 nOL
 lqy
@@ -179095,7 +179264,7 @@ oay
 vNc
 kHf
 rWr
-rWr
+caa
 odq
 nQw
 plE
@@ -180043,7 +180212,7 @@ xdO
 pwC
 kmf
 dJM
-cyq
+hSL
 roe
 xdO
 msV
@@ -181669,7 +181838,7 @@ hNy
 fwM
 nUj
 ume
-oTe
+xze
 pQQ
 dGr
 uox
@@ -183440,7 +183609,7 @@ dUQ
 pzj
 oOd
 kPb
-nUl
+toj
 nUl
 mUg
 iBo
@@ -183678,7 +183847,7 @@ hSI
 eNs
 dKn
 meJ
-meJ
+tSd
 meJ
 eZB
 tiX
@@ -184177,7 +184346,7 @@ xvk
 cMq
 cMq
 tHt
-tHt
+xOj
 kWo
 bOm
 bOm