diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a013b79e78..f0ed360d82 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -68,6 +68,7 @@ jobs:
           bash tools/ci/install_build_deps.sh
           bash tools/ci/install_ripgrep.sh
           bash tools/ci/install_spaceman_dmm.sh dreamchecker
+          bash tools/ci/install_spaceman_dmm.sh dmm-tools
           tools/bootstrap/python -c ''
       - name: Run Tests
         run: |
@@ -79,6 +80,8 @@ jobs:
         run: ~/dreamchecker 2>&1 | bash tools/ci/annotate_dm.sh
       - name: Run TGUI Checks
         run: tools/build/build --ci lint tgui-test
+      - name: Run Nanomap Checks
+        run: tools/github-actions/nanomap-renderer-invoker.sh --testing
 
   dreamchecker:
     name: DreamChecker
diff --git a/.github/workflows/render_nanomaps.yml b/.github/workflows/render_nanomaps.yml
index 8679fda597..ca089a9c15 100644
--- a/.github/workflows/render_nanomaps.yml
+++ b/.github/workflows/render_nanomaps.yml
@@ -46,7 +46,7 @@ jobs:
       run: chmod -R +x ./tools/github-actions
 
     - name: Generate Maps
-      run: './tools/github-actions/nanomap-renderer-invoker.sh'
+      run: tools/github-actions/nanomap-renderer-invoker.sh
 
     - name: Commit Maps
       run: |
diff --git a/1SP_pods.dmm b/1SP_pods.dmm
index 7fa5d65f4a..a62015da88 100644
--- a/1SP_pods.dmm
+++ b/1SP_pods.dmm
@@ -3889,7 +3889,6 @@
 /obj/item/clothing/shoes/sandal,
 /obj/item/clothing/shoes/sandal,
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	pixel_x = -32
 	},
 /obj/item/towel/random,
@@ -6693,7 +6692,6 @@
 	dir = 8
 	},
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	pixel_x = 32
 	},
 /turf/simulated/floor/carpet,
@@ -10935,9 +10933,7 @@
 "hJi" = (
 /obj/machinery/portable_atmospherics/hydroponics/soil,
 /obj/effect/decal/cleanable/dirt,
-/obj/item/seeds/wheatseed{
-	icon_state = "seed"
-	},
+/obj/item/seeds/wheatseed,
 /turf/simulated/floor/outdoors/dirt,
 /area/survivalpod/superpose/DragonCave)
 "hJu" = (
@@ -16708,7 +16704,6 @@
 /obj/structure/curtain/bed,
 /obj/item/bedsheet/hosdouble,
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	pixel_y = 32
 	},
 /turf/simulated/floor/wood,
@@ -34042,7 +34037,6 @@
 	pixel_y = 20
 	},
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	pixel_x = -32
 	},
 /obj/item/handcuffs/legcuffs/fuzzy,
@@ -34253,9 +34247,7 @@
 /area/survivalpod/superpose/Farm)
 "xms" = (
 /obj/machinery/portable_atmospherics/hydroponics/soil,
-/obj/item/seeds/onionseed{
-	icon_state = "seed"
-	},
+/obj/item/seeds/onionseed,
 /obj/item/seeds/tomatoseed{
 	icon_state = "seed";
 	pixel_x = 4;
diff --git a/1mapping_palette.dmm b/1mapping_palette.dmm
index 2c59edb827..4eb6c85fd9 100644
--- a/1mapping_palette.dmm
+++ b/1mapping_palette.dmm
@@ -7040,7 +7040,6 @@
 /obj/structure/curtain/bed,
 /obj/item/bedsheet/hosdouble,
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	pixel_y = 32
 	},
 /turf/simulated/floor/wood,
@@ -14522,7 +14521,6 @@
 	pixel_y = 20
 	},
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	pixel_x = -32
 	},
 /obj/item/handcuffs/legcuffs/fuzzy,
@@ -15885,7 +15883,6 @@
 /obj/item/clothing/shoes/sandal,
 /obj/item/clothing/shoes/sandal,
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	pixel_x = -32
 	},
 /obj/item/towel/random,
diff --git a/archive/maps/cynosure/cynosure-2.dmm b/archive/maps/cynosure/cynosure-2.dmm
index 807e9dcf43..3168736fc8 100644
--- a/archive/maps/cynosure/cynosure-2.dmm
+++ b/archive/maps/cynosure/cynosure-2.dmm
@@ -8906,7 +8906,6 @@
 "eqk" = (
 /obj/structure/window/reinforced,
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	pixel_x = -32
 	},
 /obj/machinery/camera/network/civilian{
@@ -21631,7 +21630,6 @@
 /area/surface/station/engineering/atmos)
 "kwY" = (
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	pixel_y = 32
 	},
 /obj/structure/sign/christmas/lights{
@@ -30547,7 +30545,6 @@
 /obj/effect/floor_decal/borderfloor,
 /obj/effect/floor_decal/corner/grey/border,
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	pixel_x = 32
 	},
 /obj/effect/floor_decal/spline/plain,
@@ -42043,7 +42040,6 @@
 	},
 /obj/item/clothing/glasses/science,
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	pixel_y = -32
 	},
 /obj/machinery/light,
@@ -50317,7 +50313,6 @@
 	dir = 1
 	},
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	pixel_y = 32
 	},
 /turf/simulated/floor/tiled/white,
diff --git a/archive/maps/cynosure/cynosure-3.dmm b/archive/maps/cynosure/cynosure-3.dmm
index 6689c57cb8..7c30d797bd 100644
--- a/archive/maps/cynosure/cynosure-3.dmm
+++ b/archive/maps/cynosure/cynosure-3.dmm
@@ -11550,7 +11550,6 @@
 /area/surface/station/hallway/primary/secondfloor/east)
 "hMg" = (
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	pixel_y = -32
 	},
 /turf/simulated/floor/carpet/sblucarpet,
@@ -15302,7 +15301,6 @@
 	dir = 4
 	},
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	pixel_x = 32
 	},
 /obj/machinery/light{
@@ -16263,7 +16261,6 @@
 /obj/structure/table/wooden_reinforced,
 /obj/item/flashlight/lamp/green,
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	pixel_y = 32
 	},
 /turf/simulated/floor/carpet,
@@ -18227,7 +18224,6 @@
 	},
 /obj/effect/floor_decal/corner/lime/diagonal,
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	pixel_y = -32
 	},
 /turf/simulated/floor/tiled/neutral,
@@ -31476,7 +31472,6 @@
 	},
 /obj/item/bedsheet/medical,
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	pixel_x = -32
 	},
 /obj/effect/floor_decal/corner/pink/border{
@@ -35997,7 +35992,6 @@
 	},
 /obj/item/bedsheet/medical,
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	pixel_x = -32
 	},
 /obj/effect/floor_decal/corner/pink/border{
diff --git a/archive/maps/cynosure/cynosure-6.dmm b/archive/maps/cynosure/cynosure-6.dmm
index 95ac6376a5..8ff54660f0 100644
--- a/archive/maps/cynosure/cynosure-6.dmm
+++ b/archive/maps/cynosure/cynosure-6.dmm
@@ -38,7 +38,7 @@
 /obj/machinery/space_heater,
 /turf/unsimulated/floor{
 	icon = 'icons/turf/flooring/wood.dmi';
-	icon_state = "wood_broken3"
+	icon_state = "wood-broken3"
 	},
 /area/ninja_dojo/dojo)
 "abS" = (
@@ -227,7 +227,7 @@
 /obj/item/target/alien,
 /turf/unsimulated/floor{
 	icon = 'icons/turf/flooring/wood.dmi';
-	icon_state = "wood_broken2"
+	icon_state = "wood-broken2"
 	},
 /area/ninja_dojo/dojo)
 "akY" = (
@@ -992,7 +992,7 @@
 "bcu" = (
 /turf/unsimulated/floor{
 	icon = 'icons/turf/flooring/wood.dmi';
-	icon_state = "wood_broken3"
+	icon_state = "wood-broken3"
 	},
 /area/skipjack_station)
 "bcB" = (
@@ -2926,7 +2926,7 @@
 "dxQ" = (
 /turf/unsimulated/floor{
 	icon = 'icons/turf/flooring/wood.dmi';
-	icon_state = "wood_broken1"
+	icon_state = "wood-broken1"
 	},
 /area/ninja_dojo/dojo)
 "dxS" = (
@@ -8043,7 +8043,7 @@
 	},
 /turf/unsimulated/floor{
 	icon = 'icons/turf/flooring/wood.dmi';
-	icon_state = "wood_broken2"
+	icon_state = "wood-broken2"
 	},
 /area/skipjack_station)
 "jcy" = (
@@ -19534,9 +19534,7 @@
 /turf/space/transit/east,
 /area/space)
 "vCc" = (
-/turf/unsimulated/floor{
-	icon_state = "sandwater"
-	},
+/turf/unsimulated/floor,
 /area/beach)
 "vCL" = (
 /obj/structure/table/steel,
@@ -20360,7 +20358,7 @@
 /obj/item/bedsheet/orange,
 /turf/unsimulated/floor{
 	icon = 'icons/turf/flooring/wood.dmi';
-	icon_state = "wood_broken1"
+	icon_state = "wood-broken1"
 	},
 /area/skipjack_station)
 "wsc" = (
@@ -22007,7 +22005,6 @@
 	dir = 8
 	},
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	pixel_x = 32
 	},
 /turf/simulated/floor/carpet,
diff --git a/archive/maps/example/example-1.dmm b/archive/maps/example/example-1.dmm
index 8547b3c245..b840d76a3f 100644
--- a/archive/maps/example/example-1.dmm
+++ b/archive/maps/example/example-1.dmm
@@ -132,7 +132,6 @@
 "w" = (
 /obj/machinery/alarm{
 	dir = 4;
-	icon_state = "alarm0";
 	pixel_x = -22
 	},
 /obj/machinery/light{
diff --git a/archive/maps/example/example-2.dmm b/archive/maps/example/example-2.dmm
index ffb00707dc..e30451667e 100644
--- a/archive/maps/example/example-2.dmm
+++ b/archive/maps/example/example-2.dmm
@@ -138,7 +138,6 @@
 "x" = (
 /obj/machinery/alarm{
 	dir = 4;
-	icon_state = "alarm0";
 	pixel_x = -22
 	},
 /obj/machinery/light{
diff --git a/archive/maps/northern_star/polaris-1.dmm b/archive/maps/northern_star/polaris-1.dmm
index dc1b196bfe..8aba01880e 100644
--- a/archive/maps/northern_star/polaris-1.dmm
+++ b/archive/maps/northern_star/polaris-1.dmm
@@ -64,7 +64,7 @@
 "abl" = (/obj/structure/closet/crate,/obj/random/action_figure,/obj/random/action_figure,/obj/random/action_figure,/obj/random/action_figure,/obj/random/maintenance/clean,/obj/random/toy,/turf/simulated/floor,/area/maintenance/library)
 "abm" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/maintenance/auxsolarstarboard)
 "abn" = (/obj/structure/cable/yellow,/obj/machinery/power/solar_control{id = "auxsolareast"; name = "Fore Starboard Solar Control"; track = 0},/turf/simulated/floor,/area/maintenance/auxsolarstarboard)
-"abo" = (/obj/item/stool,/obj/machinery/alarm{dir = 1; icon_state = "alarm0"; pixel_y = -22},/obj/item/stack/cable_coil/yellow,/obj/item/stack/cable_coil/yellow,/turf/simulated/floor,/area/maintenance/auxsolarstarboard)
+"abo" = (/obj/item/stool,/obj/machinery/alarm{dir = 1; pixel_y = -22},/obj/item/stack/cable_coil/yellow,/obj/item/stack/cable_coil/yellow,/turf/simulated/floor,/area/maintenance/auxsolarstarboard)
 "abp" = (/obj/structure/cable,/obj/machinery/power/apc{dir = 2; name = "south bump"; pixel_y = -24},/obj/machinery/camera/network/engineering{c_tag = "ENG - Solar Fore Starboard"; dir = 1},/turf/simulated/floor,/area/maintenance/auxsolarstarboard)
 "abq" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor,/area/maintenance/library)
 "abr" = (/turf/simulated/floor,/area/maintenance/library)
@@ -188,7 +188,7 @@
 "adF" = (/obj/structure/table/woodentable,/obj/item/book/codex/lore/vir,/turf/simulated/floor/wood,/area/library_conference_room)
 "adG" = (/obj/structure/table/woodentable,/obj/item/deck/cards,/turf/simulated/floor/wood,/area/library_conference_room)
 "adH" = (/obj/structure/bed/chair/office/dark{dir = 8},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/wood,/area/library_conference_room)
-"adI" = (/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/turf/simulated/floor/wood,/area/library_conference_room)
+"adI" = (/obj/machinery/alarm{dir = 8; pixel_x = 24},/turf/simulated/floor/wood,/area/library_conference_room)
 "adJ" = (/turf/simulated/wall,/area/hallway/secondary/civilian_hallway_fore)
 "adK" = (/obj/machinery/embedded_controller/radio/simple_docking_controller/escape_pod_berth{frequency = 1380; id_tag = "cryostorage_shuttle_berth"; name = "cryostorage shuttle berth controller"; pixel_x = -26; pixel_y = 0; tag_door = "cryostorage_shuttle_berth_hatch"},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/tiled,/area/hallway/secondary/civilian_hallway_fore)
 "adL" = (/obj/machinery/door/firedoor/glass,/turf/simulated/floor/tiled,/area/hallway/secondary/civilian_hallway_fore)
@@ -207,14 +207,14 @@
 "adY" = (/obj/machinery/atmospherics/pipe/tank/air,/obj/effect/floor_decal/industrial/warning/corner,/turf/simulated/floor,/area/maintenance/library)
 "adZ" = (/obj/effect/floor_decal/industrial/warning{dir = 1},/turf/simulated/floor/tiled,/area/hallway/secondary/civilian_hallway_fore)
 "aea" = (/obj/effect/decal/cleanable/generic,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/mob/living/simple_mob/animal/passive/mouse,/turf/simulated/floor/plating,/area/maintenance/locker)
-"aeb" = (/obj/machinery/camera/network/civilian{c_tag = "CIV - Chapel Morgue"; dir = 4},/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22},/turf/simulated/floor/tiled/dark,/area/chapel/chapel_morgue)
+"aeb" = (/obj/machinery/camera/network/civilian{c_tag = "CIV - Chapel Morgue"; dir = 4},/obj/machinery/alarm{dir = 4; pixel_x = -22},/turf/simulated/floor/tiled/dark,/area/chapel/chapel_morgue)
 "aec" = (/obj/machinery/hologram/holopad,/turf/simulated/floor/tiled/dark,/area/chapel/chapel_morgue)
 "aed" = (/obj/machinery/door/window{dir = 8; name = "Mass Driver"; req_access = list(22)},/obj/machinery/mass_driver{dir = 4; id = "chapelgun"},/obj/machinery/atmospherics/unary/vent_pump/on{dir = 8},/obj/machinery/airlock_sensor{pixel_y = 25},/obj/effect/floor_decal/industrial/warning{dir = 8},/turf/simulated/floor/plating,/area/chapel/chapel_morgue)
 "aee" = (/obj/structure/sign/securearea{desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK"; pixel_x = 0; pixel_y = 32},/obj/effect/floor_decal/industrial/warning{dir = 4},/turf/simulated/floor/plating,/area/chapel/chapel_morgue)
 "aef" = (/obj/machinery/door/blast/regular{id = "chapelgun"; name = "Chapel Launcher Door"},/obj/machinery/shield_diffuser,/turf/simulated/floor/plating,/area/chapel/chapel_morgue)
 "aeg" = (/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/structure/disposalpipe/segment{dir = 4; icon_state = "pipe-c"},/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/cobweb,/turf/simulated/floor,/area/maintenance/library)
 "aeh" = (/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/structure/disposalpipe/segment{dir = 4},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor,/area/maintenance/library)
-"aei" = (/obj/structure/disposalpipe/segment{dir = 8; icon_state = "pipe-c"},/obj/effect/decal/cleanable/dirt,/obj/machinery/alarm{dir = 1; icon_state = "alarm0"; pixel_y = -22},/turf/simulated/floor,/area/maintenance/library)
+"aei" = (/obj/structure/disposalpipe/segment{dir = 8; icon_state = "pipe-c"},/obj/effect/decal/cleanable/dirt,/obj/machinery/alarm{dir = 1; pixel_y = -22},/turf/simulated/floor,/area/maintenance/library)
 "aej" = (/obj/machinery/bookbinder{pixel_y = 0},/turf/simulated/floor/wood,/area/library_conference_room)
 "aek" = (/obj/machinery/light,/turf/simulated/floor/wood,/area/library_conference_room)
 "ael" = (/obj/machinery/camera/network/civilian{c_tag = "CIV - Library Meeting Room"; dir = 1},/turf/simulated/floor/wood,/area/library_conference_room)
@@ -253,7 +253,7 @@
 "aeS" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/library_conference_room)
 "aeT" = (/obj/machinery/door/firedoor/glass,/obj/machinery/door/airlock/glass{name = "Library Meeting Room"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/wood,/area/library_conference_room)
 "aeU" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/structure/disposalpipe/segment{dir = 1; icon_state = "pipe-c"},/turf/simulated/floor,/area/maintenance/library)
-"aeV" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/alarm{dir = 1; icon_state = "alarm0"; pixel_y = -22},/turf/simulated/floor,/area/maintenance/library)
+"aeV" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/alarm{dir = 1; pixel_y = -22},/turf/simulated/floor,/area/maintenance/library)
 "aeW" = (/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor,/area/maintenance/library)
 "aeX" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 5},/turf/simulated/floor,/area/maintenance/library)
 "aeY" = (/obj/machinery/door/airlock/maintenance{req_access = list(12)},/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor,/area/maintenance/library)
@@ -328,7 +328,7 @@
 "agp" = (/obj/structure/disposalpipe/segment,/obj/machinery/light{icon_state = "tube1"; dir = 4},/turf/simulated/floor/tiled,/area/hallway/secondary/civilian_hallway_fore)
 "agq" = (/obj/structure/bed/chair{dir = 4},/obj/machinery/alarm{dir = 4; pixel_x = -23; pixel_y = 0},/obj/machinery/light/small{dir = 1},/obj/item/radio/intercom{broadcasting = 1; dir = 1; frequency = 1480; name = "Confessional Intercom"; pixel_x = 0; pixel_y = 27},/turf/simulated/floor/tiled/dark,/area/chapel/main)
 "agr" = (/obj/structure/grille,/obj/structure/window/reinforced/tinted{dir = 1},/obj/structure/window/reinforced/tinted,/obj/structure/window/reinforced/tinted{dir = 4; icon_state = "twindow"},/obj/structure/window/reinforced/tinted{dir = 8; icon_state = "twindow"},/turf/simulated/floor/plating,/area/chapel/main)
-"ags" = (/obj/structure/bed/chair{dir = 8},/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/obj/machinery/light/small{dir = 1},/obj/item/radio/intercom{broadcasting = 1; dir = 1; frequency = 1480; name = "Confessional Intercom"; pixel_x = 0; pixel_y = 27},/turf/simulated/floor/tiled/dark,/area/chapel/main)
+"ags" = (/obj/structure/bed/chair{dir = 8},/obj/machinery/alarm{dir = 8; pixel_x = 24},/obj/machinery/light/small{dir = 1},/obj/item/radio/intercom{broadcasting = 1; dir = 1; frequency = 1480; name = "Confessional Intercom"; pixel_x = 0; pixel_y = 27},/turf/simulated/floor/tiled/dark,/area/chapel/main)
 "agt" = (/obj/structure/bed/chair{dir = 1},/turf/simulated/floor/lino,/area/chapel/office)
 "agu" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment{dir = 4; icon_state = "pipe-c"},/turf/simulated/floor/lino,/area/chapel/office)
 "agv" = (/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/lino,/area/chapel/office)
@@ -488,7 +488,7 @@
 "ajt" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/table/reinforced,/obj/machinery/microscope,/turf/simulated/floor/tiled/freezer,/area/security/detectives_office)
 "aju" = (/obj/machinery/hologram/holopad,/turf/simulated/floor/tiled/white,/area/security/detectives_office)
 "ajv" = (/obj/machinery/atmospherics/unary/vent_scrubber/on,/turf/simulated/floor/tiled/white,/area/security/detectives_office)
-"ajw" = (/obj/structure/table/reinforced,/obj/item/reagent_containers/spray/luminol,/obj/item/uv_light,/obj/item/clothing/gloves/sterile/latex,/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/turf/simulated/floor/tiled/freezer,/area/security/detectives_office)
+"ajw" = (/obj/structure/table/reinforced,/obj/item/reagent_containers/spray/luminol,/obj/item/uv_light,/obj/item/clothing/gloves/sterile/latex,/obj/machinery/alarm{dir = 8; pixel_x = 24},/turf/simulated/floor/tiled/freezer,/area/security/detectives_office)
 "ajx" = (/obj/machinery/door/airlock/glass_external{icon_state = "door_locked"; locked = 1; name = "Escape Pod"},/turf/simulated/floor,/area/maintenance/security_starboard)
 "ajy" = (/obj/machinery/door/airlock/glass_external{frequency = 1380; icon_state = "door_locked"; id_tag = "escape_pod_1_berth_hatch"; locked = 1; name = "Escape Pod 1"; req_access = list(13)},/turf/simulated/floor/plating,/area/hallway/secondary/escape/fore_escape_pod_hallway)
 "ajz" = (/obj/structure/sign/pods,/turf/simulated/wall,/area/hallway/secondary/escape/fore_escape_pod_hallway)
@@ -567,7 +567,7 @@
 "akU" = (/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled/dark,/area/chapel/main)
 "akV" = (/obj/machinery/door/airlock/maintenance{name = "Chapel Maintenance"; req_one_access = list(12,22)},/obj/machinery/door/firedoor,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor,/area/maintenance/chapel)
 "akW" = (/obj/item/radio/intercom{name = "Station Intercom (General)"; pixel_y = -21},/obj/structure/closet/wardrobe/detective,/turf/simulated/floor/lino,/area/security/detectives_office)
-"akX" = (/obj/machinery/alarm{dir = 1; icon_state = "alarm0"; pixel_y = -22},/turf/simulated/floor/lino,/area/security/detectives_office)
+"akX" = (/obj/machinery/alarm{dir = 1; pixel_y = -22},/turf/simulated/floor/lino,/area/security/detectives_office)
 "akY" = (/obj/structure/table/rack,/obj/item/storage/briefcase{pixel_x = -2; pixel_y = -5},/obj/item/storage/briefcase{pixel_x = 3; pixel_y = 0},/obj/machinery/light,/turf/simulated/floor/lino,/area/security/detectives_office)
 "akZ" = (/turf/simulated/floor/lino,/area/security/detectives_office)
 "ala" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable/green{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/lino,/area/security/detectives_office)
@@ -588,7 +588,7 @@
 "alp" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor,/area/maintenance/security_starboard)
 "alq" = (/turf/simulated/floor/tiled,/area/hallway/secondary/escape/fore_escape_pod_hallway)
 "alr" = (/obj/machinery/light,/turf/simulated/floor/tiled,/area/hallway/secondary/escape/fore_escape_pod_hallway)
-"als" = (/obj/machinery/alarm{dir = 1; icon_state = "alarm0"; pixel_y = -22},/turf/simulated/floor/tiled,/area/hallway/secondary/escape/fore_escape_pod_hallway)
+"als" = (/obj/machinery/alarm{dir = 1; pixel_y = -22},/turf/simulated/floor/tiled,/area/hallway/secondary/escape/fore_escape_pod_hallway)
 "alt" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 4},/turf/simulated/floor/tiled,/area/hallway/secondary/escape/fore_escape_pod_hallway)
 "alu" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 10},/turf/simulated/floor/tiled,/area/hallway/secondary/escape/fore_escape_pod_hallway)
 "alv" = (/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled,/area/hallway/secondary/escape/fore_escape_pod_hallway)
@@ -697,7 +697,7 @@
 "anu" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 8},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled,/area/hallway/secondary/civilian_hallway_fore)
 "anv" = (/obj/structure/bed/chair,/turf/simulated/floor/tiled/dark,/area/hallway/secondary/civilian_hallway_fore)
 "anw" = (/obj/effect/floor_decal/chapel{icon_state = "chapel"; dir = 1},/turf/simulated/floor/tiled/dark,/area/chapel/main)
-"anx" = (/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/turf/simulated/floor/tiled/dark,/area/chapel/main)
+"anx" = (/obj/machinery/alarm{dir = 8; pixel_x = 24},/turf/simulated/floor/tiled/dark,/area/chapel/main)
 "any" = (/turf/simulated/wall,/area/vacant/vacant_site)
 "anz" = (/obj/machinery/smartfridge/drinks,/turf/simulated/floor/wood,/area/vacant/vacant_site)
 "anA" = (/obj/structure/table/reinforced,/obj/machinery/reagentgrinder,/turf/simulated/floor,/area/vacant/vacant_site)
@@ -792,7 +792,7 @@
 "apl" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled/freezer,/area/security/security_bathroom)
 "apm" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 10},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 9; pixel_y = 0},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled/freezer,/area/security/security_bathroom)
 "apn" = (/obj/machinery/power/apc{dir = 2; name = "south bump"; pixel_y = -24},/obj/structure/cable/green{d2 = 8; icon_state = "0-8"},/turf/simulated/floor/tiled/freezer,/area/security/security_bathroom)
-"apo" = (/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/obj/machinery/light{dir = 4; icon_state = "tube1"; pixel_x = 0},/turf/simulated/floor/tiled/freezer,/area/security/security_bathroom)
+"apo" = (/obj/machinery/alarm{dir = 8; pixel_x = 24},/obj/machinery/light{dir = 4; icon_state = "tube1"; pixel_x = 0},/turf/simulated/floor/tiled/freezer,/area/security/security_bathroom)
 "app" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/light/small{dir = 4},/turf/simulated/floor,/area/maintenance/security_starboard)
 "apq" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/library)
 "apr" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/library)
@@ -813,14 +813,14 @@
 "apG" = (/obj/structure/table/reinforced,/obj/item/stack/tile/wood,/turf/simulated/floor/wood,/area/vacant/vacant_site)
 "apH" = (/obj/structure/table/reinforced,/obj/item/flashlight,/turf/simulated/floor/wood,/area/vacant/vacant_site)
 "apI" = (/obj/structure/table/reinforced,/obj/item/reagent_containers/food/drinks/glass2/square{pixel_x = 4; pixel_y = 5},/obj/item/reagent_containers/food/drinks/glass2/square,/turf/simulated/floor/wood,/area/vacant/vacant_site)
-"apJ" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/turf/simulated/floor,/area/maintenance/chapel)
+"apJ" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/alarm{dir = 8; pixel_x = 24},/turf/simulated/floor,/area/maintenance/chapel)
 "apK" = (/turf/simulated/wall/r_wall,/area/security/security_equiptment_storage)
 "apL" = (/obj/structure/window/reinforced/tinted{dir = 1},/obj/structure/grille,/obj/structure/window/reinforced/tinted,/obj/structure/window/reinforced/tinted{dir = 8; icon_state = "twindow"},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/security/interrogation)
 "apM" = (/obj/structure/window/reinforced/tinted{dir = 1},/obj/structure/grille,/obj/structure/window/reinforced/tinted,/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/security/interrogation)
 "apN" = (/obj/structure/window/reinforced/tinted{dir = 1},/obj/structure/window/reinforced/tinted{dir = 4; icon_state = "twindow"},/obj/structure/grille,/obj/structure/window/reinforced/tinted,/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/security/interrogation)
 "apO" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/effect/floor_decal/corner/red{dir = 9},/obj/item/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -21},/turf/simulated/floor/tiled,/area/security/brig)
 "apP" = (/obj/effect/floor_decal/corner/red{dir = 6},/obj/machinery/light{dir = 4; icon_state = "tube1"; pixel_x = 0},/turf/simulated/floor/tiled,/area/security/brig)
-"apQ" = (/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/tiled/dark,/area/security/evidence_storage)
+"apQ" = (/obj/machinery/alarm{dir = 4; pixel_x = -22},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/tiled/dark,/area/security/evidence_storage)
 "apR" = (/obj/structure/closet{name = "Evidence Closet"},/obj/effect/floor_decal/industrial/outline/grey,/turf/simulated/floor/tiled/dark,/area/security/evidence_storage)
 "apS" = (/obj/machinery/alarm{dir = 4; pixel_x = -23; pixel_y = 0},/obj/machinery/requests_console{announcementConsole = 1; department = "Head of Security's Desk"; departmentType = 5; name = "Head of Security RC"; pixel_x = 0; pixel_y = 30},/obj/structure/table/woodentable,/obj/machinery/recharger{pixel_y = 4},/obj/item/reagent_containers/food/drinks/flask/barflask{pixel_x = -4; pixel_y = 8},/obj/item/taperecorder{pixel_y = 0},/obj/item/megaphone,/obj/item/radio/off,/turf/simulated/floor/tiled/dark,/area/crew_quarters/heads/hos)
 "apT" = (/turf/simulated/floor/tiled/dark,/area/crew_quarters/heads/hos)
@@ -869,7 +869,7 @@
 "aqK" = (/obj/structure/bed/chair,/turf/simulated/floor/tiled/dark,/area/security/interrogation)
 "aqL" = (/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/obj/machinery/power/apc{dir = 4; name = "east bump"; pixel_x = 24},/turf/simulated/floor/tiled/dark,/area/security/interrogation)
 "aqM" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/effect/floor_decal/corner/red{dir = 1},/turf/simulated/floor/tiled,/area/security/brig)
-"aqN" = (/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/obj/effect/floor_decal/corner/red{dir = 4},/turf/simulated/floor/tiled,/area/security/brig)
+"aqN" = (/obj/machinery/alarm{dir = 8; pixel_x = 24},/obj/effect/floor_decal/corner/red{dir = 4},/turf/simulated/floor/tiled,/area/security/brig)
 "aqO" = (/obj/structure/closet{name = "Evidence Closet"},/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 4},/obj/effect/floor_decal/industrial/outline/grey,/turf/simulated/floor/tiled/dark,/area/security/evidence_storage)
 "aqP" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 9},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 5},/turf/simulated/floor/tiled/dark,/area/security/evidence_storage)
 "aqQ" = (/obj/structure/closet{name = "Evidence Closet"},/obj/machinery/light/small{dir = 4; pixel_y = 0},/obj/machinery/atmospherics/unary/vent_pump/on{dir = 8},/obj/effect/floor_decal/industrial/outline/grey,/turf/simulated/floor/tiled/dark,/area/security/evidence_storage)
@@ -896,7 +896,7 @@
 "arl" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/tiled,/area/hallway/secondary/civilian_hallway_aft)
 "arm" = (/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/tiled,/area/hallway/secondary/civilian_hallway_aft)
 "arn" = (/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled,/area/hallway/secondary/civilian_hallway_aft)
-"aro" = (/obj/machinery/newscaster{pixel_x = 0; pixel_y = 32},/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/turf/simulated/floor/tiled/dark,/area/hallway/secondary/civilian_hallway_aft)
+"aro" = (/obj/machinery/newscaster{pixel_x = 0; pixel_y = 32},/obj/machinery/alarm{dir = 8; pixel_x = 24},/turf/simulated/floor/tiled/dark,/area/hallway/secondary/civilian_hallway_aft)
 "arp" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/hallway/secondary/civilian_hallway_aft)
 "arq" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/hallway/secondary/civilian_hallway_aft)
 "arr" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/hallway/secondary/civilian_hallway_aft)
@@ -1046,7 +1046,7 @@
 "auf" = (/obj/effect/floor_decal/corner/blue/full{dir = 1},/obj/structure/table/rack,/obj/item/clothing/gloves/arm_guard/laserproof,/obj/item/clothing/shoes/leg_guard/laserproof,/obj/item/clothing/suit/armor/laserproof{pixel_x = 0; pixel_y = 0},/obj/item/clothing/head/helmet/laserproof,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4; health = 1e+006},/obj/machinery/door/window/brigdoor/southright{name = "Laser Armor"},/turf/simulated/floor/tiled/dark,/area/security/armoury)
 "aug" = (/obj/machinery/deployable/barrier,/obj/effect/floor_decal/industrial/hatch/yellow,/turf/simulated/floor/tiled,/area/security/security_equiptment_storage)
 "auh" = (/obj/machinery/hologram/holopad,/turf/simulated/floor/tiled,/area/security/security_equiptment_storage)
-"aui" = (/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/turf/simulated/floor/tiled,/area/security/security_equiptment_storage)
+"aui" = (/obj/machinery/alarm{dir = 8; pixel_x = 24},/turf/simulated/floor/tiled,/area/security/security_equiptment_storage)
 "auj" = (/turf/simulated/wall/r_wall,/area/security/warden)
 "auk" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/door/firedoor/glass,/obj/machinery/door/airlock/glass_security{name = "Security Hallway"; req_access = list(1)},/obj/effect/floor_decal/corner/red{dir = 9},/turf/simulated/floor/tiled,/area/security/brig)
 "aul" = (/obj/machinery/door/firedoor/glass,/obj/machinery/door/airlock/glass_security{name = "Security Hallway"; req_access = list(1)},/obj/effect/floor_decal/corner/red{dir = 6},/turf/simulated/floor/tiled,/area/security/brig)
@@ -1060,7 +1060,7 @@
 "aut" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled,/area/security/main)
 "auu" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment,/obj/structure/cable/green{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/tiled,/area/security/main)
 "auv" = (/obj/machinery/power/apc{dir = 2; name = "south bump"; pixel_y = -24},/obj/structure/cable/green{d2 = 8; icon_state = "0-8"},/turf/simulated/floor/tiled,/area/security/main)
-"auw" = (/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/obj/effect/floor_decal/corner/red{dir = 6},/turf/simulated/floor/tiled,/area/security/main)
+"auw" = (/obj/machinery/alarm{dir = 8; pixel_x = 24},/obj/effect/floor_decal/corner/red{dir = 6},/turf/simulated/floor/tiled,/area/security/main)
 "aux" = (/obj/machinery/atmospherics/unary/vent_pump/on,/obj/effect/floor_decal/corner/red/full{dir = 8},/turf/simulated/floor/tiled,/area/security/security_cell_hallway)
 "auy" = (/obj/machinery/light/small{dir = 4; pixel_y = 0},/obj/structure/table/standard,/obj/item/paper,/obj/item/pen,/obj/effect/floor_decal/corner/red/full{dir = 1},/turf/simulated/floor/tiled,/area/security/security_cell_hallway)
 "auz" = (/obj/machinery/light/small{dir = 8},/obj/structure/table/standard,/obj/item/paper,/obj/item/pen,/obj/effect/floor_decal/corner/red/full{dir = 8},/turf/simulated/floor/tiled,/area/security/security_cell_hallway)
@@ -1072,7 +1072,7 @@
 "auF" = (/obj/machinery/door/airlock/atmos{name = "Riot Control Maintenance"; req_access = newlist(); req_one_access = list(2,12,24)},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor,/area/security/riot_control)
 "auG" = (/obj/machinery/door/blast/regular{density = 0; icon_state = "pdoor0"; id = "security_lockdown"; name = "Security Blast Door"; opacity = 0},/turf/simulated/floor,/area/maintenance/security_starboard)
 "auH" = (/obj/effect/floor_decal/industrial/warning{dir = 8},/turf/simulated/floor,/area/maintenance/security_starboard)
-"auI" = (/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/turf/simulated/floor,/area/maintenance/security_starboard)
+"auI" = (/obj/machinery/alarm{dir = 8; pixel_x = 24},/turf/simulated/floor,/area/maintenance/security_starboard)
 "auJ" = (/obj/structure/closet,/obj/item/clothing/glasses/welding,/obj/item/weldingtool,/obj/effect/decal/cleanable/dirt,/obj/random/maintenance/security,/obj/random/maintenance/security,/turf/simulated/floor/plating,/area/maintenance/security_starboard)
 "auK" = (/obj/structure/closet/emcloset,/turf/simulated/floor/tiled/dark,/area/hallway/secondary/civilian_hallway_aft)
 "auL" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/tiled,/area/hallway/secondary/civilian_hallway_aft)
@@ -1103,7 +1103,7 @@
 "avk" = (/obj/effect/decal/cleanable/dirt,/obj/structure/cable/green{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor/wood,/area/vacant/vacant_site)
 "avl" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/wood,/area/vacant/vacant_site)
 "avm" = (/obj/structure/table/gamblingtable,/turf/simulated/floor/wood,/area/vacant/vacant_site)
-"avn" = (/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/obj/structure/table/gamblingtable,/obj/effect/decal/cleanable/dirt,/obj/item/deck/cards,/turf/simulated/floor,/area/vacant/vacant_site)
+"avn" = (/obj/machinery/alarm{dir = 8; pixel_x = 24},/obj/structure/table/gamblingtable,/obj/effect/decal/cleanable/dirt,/obj/item/deck/cards,/turf/simulated/floor,/area/vacant/vacant_site)
 "avo" = (/obj/effect/decal/cleanable/dirt,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor,/area/maintenance/chapel)
 "avp" = (/obj/structure/table/rack,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/item/gun/energy/gun{pixel_x = 3; pixel_y = 3},/obj/item/gun/energy/gun,/obj/effect/floor_decal/corner/blue/full{dir = 8},/obj/machinery/status_display{density = 0; layer = 4; pixel_x = 0; pixel_y = 32},/obj/machinery/light{dir = 8},/obj/machinery/door/window/brigdoor/eastleft{name = "Energy"},/turf/simulated/floor/tiled/dark,/area/security/armoury)
 "avq" = (/obj/machinery/atmospherics/unary/vent_scrubber/on,/turf/simulated/floor/tiled/dark,/area/security/armoury)
@@ -1322,14 +1322,14 @@
 "azv" = (/obj/machinery/firealarm{dir = 2; pixel_y = 24},/turf/simulated/floor/tiled/dark,/area/security/armoury)
 "azw" = (/obj/structure/table/standard,/obj/item/storage/box/empslite{pixel_x = 2; pixel_y = 2},/obj/item/storage/box/flashbangs{pixel_x = -2; pixel_y = -2},/obj/effect/floor_decal/industrial/outline/grey,/turf/simulated/floor/tiled/dark,/area/security/armoury)
 "azx" = (/obj/structure/table/standard,/obj/item/storage/box/handcuffs{pixel_x = 8; pixel_y = 6},/obj/item/storage/box/chemimp{pixel_x = 4; pixel_y = 3},/obj/item/storage/box/trackimp,/obj/effect/floor_decal/industrial/outline/grey,/turf/simulated/floor/tiled/dark,/area/security/armoury)
-"azy" = (/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/obj/machinery/power/apc{dir = 1; name = "north bump"; pixel_x = 0; pixel_y = 24},/obj/effect/floor_decal/industrial/outline/grey,/turf/simulated/floor/tiled/dark,/area/security/armoury)
+"azy" = (/obj/machinery/alarm{dir = 8; pixel_x = 24},/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/obj/machinery/power/apc{dir = 1; name = "north bump"; pixel_x = 0; pixel_y = 24},/obj/effect/floor_decal/industrial/outline/grey,/turf/simulated/floor/tiled/dark,/area/security/armoury)
 "azz" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/machinery/door/firedoor/border_only,/obj/structure/window/reinforced{dir = 8},/obj/structure/cable/green{d2 = 4; icon_state = "0-4"},/turf/simulated/floor/plating,/area/security/security_equiptment_storage)
 "azA" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/obj/machinery/door/firedoor/border_only,/obj/structure/cable/green{d2 = 4; icon_state = "0-4"},/obj/structure/cable/green{d2 = 8; icon_state = "0-8"},/turf/simulated/floor/plating,/area/security/security_equiptment_storage)
 "azB" = (/obj/machinery/door/airlock/security{name = "Equipment Storage"; req_access = list(2)},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable/green{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/tiled,/area/security/security_equiptment_storage)
 "azC" = (/turf/simulated/wall,/area/security/security_equiptment_storage)
 "azD" = (/obj/structure/table/rack,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/obj/machinery/door/window/brigdoor/northleft{name = "Weapons locker"; req_access = list(2)},/obj/effect/floor_decal/industrial/outline/yellow,/obj/structure/window/reinforced{dir = 4},/obj/item/clothing/suit/storage/vest/heavy/officer,/obj/item/clothing/suit/storage/vest/heavy/officer,/obj/item/clothing/suit/storage/vest/heavy/officer,/obj/item/clothing/suit/storage/vest/heavy/officer,/turf/simulated/floor/tiled,/area/security/security_equiptment_storage)
 "azE" = (/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/table/rack,/obj/machinery/door/window/brigdoor/northleft{name = "Weapons locker"; req_access = list(2)},/obj/effect/floor_decal/industrial/outline/yellow,/obj/structure/window/reinforced{dir = 8},/obj/item/gun/projectile/colt/detective,/obj/item/gun/projectile/colt/detective,/obj/item/gun/projectile/colt/detective,/obj/item/gun/projectile/colt/detective,/turf/simulated/floor/tiled,/area/security/security_equiptment_storage)
-"azF" = (/obj/machinery/disposal,/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22},/obj/structure/disposalpipe/trunk,/obj/effect/floor_decal/industrial/outline/grey,/turf/simulated/floor/tiled/dark,/area/security/warden)
+"azF" = (/obj/machinery/disposal,/obj/machinery/alarm{dir = 4; pixel_x = -22},/obj/structure/disposalpipe/trunk,/obj/effect/floor_decal/industrial/outline/grey,/turf/simulated/floor/tiled/dark,/area/security/warden)
 "azG" = (/obj/structure/closet/secure_closet/warden,/obj/effect/floor_decal/industrial/outline/grey,/turf/simulated/floor/tiled/dark,/area/security/warden)
 "azH" = (/obj/machinery/computer/secure_data,/obj/effect/floor_decal/industrial/outline/grey,/turf/simulated/floor/tiled/dark,/area/security/warden)
 "azI" = (/obj/machinery/computer/security{pixel_y = 0},/obj/effect/floor_decal/industrial/outline/grey,/obj/machinery/light,/turf/simulated/floor/tiled/dark,/area/security/warden)
@@ -1369,7 +1369,7 @@
 "aAq" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 4},/turf/simulated/floor/tiled,/area/crew_quarters/recreation_area_hallway)
 "aAr" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled,/area/crew_quarters/recreation_area_hallway)
 "aAs" = (/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/tiled,/area/crew_quarters/recreation_area_hallway)
-"aAt" = (/obj/structure/disposalpipe/segment,/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/turf/simulated/floor/tiled,/area/crew_quarters/recreation_area_hallway)
+"aAt" = (/obj/structure/disposalpipe/segment,/obj/machinery/alarm{dir = 8; pixel_x = 24},/turf/simulated/floor/tiled,/area/crew_quarters/recreation_area_hallway)
 "aAu" = (/obj/structure/flora/pottedplant{icon_state = "plant-22"},/turf/simulated/floor/carpet,/area/crew_quarters/recreation_area)
 "aAv" = (/obj/item/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/turf/simulated/floor/carpet,/area/crew_quarters/recreation_area)
 "aAw" = (/obj/machinery/computer/arcade,/turf/simulated/floor/carpet,/area/crew_quarters/recreation_area)
@@ -1546,7 +1546,7 @@
 "aDL" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/cable/green{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/tiled,/area/security/brig)
 "aDM" = (/obj/structure/cable/green{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/structure/cable/green{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/structure/disposalpipe/junction{icon_state = "pipe-j1"; dir = 4},/turf/simulated/floor/tiled,/area/security/brig)
 "aDN" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/effect/floor_decal/corner/red,/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/firealarm{dir = 1; pixel_x = 0; pixel_y = -25},/turf/simulated/floor/tiled,/area/security/brig)
-"aDO" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 1},/obj/machinery/alarm{dir = 1; icon_state = "alarm0"; pixel_y = -22},/obj/effect/floor_decal/corner/red{dir = 8},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/tiled,/area/security/brig)
+"aDO" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 1},/obj/machinery/alarm{dir = 1; pixel_y = -22},/obj/effect/floor_decal/corner/red{dir = 8},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/tiled,/area/security/brig)
 "aDP" = (/obj/structure/cable/green{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/structure/cable/green{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/tiled,/area/security/brig)
 "aDQ" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/camera/network/security{c_tag = "SEC - Brig Mid"; dir = 1},/turf/simulated/floor/tiled,/area/security/brig)
 "aDR" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/tiled,/area/security/brig)
@@ -1682,7 +1682,7 @@
 "aGr" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 8},/obj/machinery/firealarm{dir = 4; pixel_x = 24},/obj/effect/floor_decal/corner/red{dir = 6},/turf/simulated/floor/tiled,/area/security/lobby)
 "aGs" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 4},/obj/effect/floor_decal/corner/red{dir = 9},/obj/machinery/button/remote/blast_door{id = "visit_blast"; name = "Privacy Shutters"; pixel_x = -25; pixel_y = 0},/obj/machinery/button/flasher{id = "IAflash"; pixel_x = -25; pixel_y = 12},/obj/machinery/light{dir = 1},/turf/simulated/floor/tiled,/area/security/prison)
 "aGt" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 9; pixel_y = 0},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled,/area/security/prison)
-"aGu" = (/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 8},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22; pixel_y = 0},/turf/simulated/floor/tiled,/area/security/prison)
+"aGu" = (/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 8},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/alarm{dir = 4; pixel_x = -22; pixel_y = 0},/turf/simulated/floor/tiled,/area/security/prison)
 "aGv" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 8},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable/green{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/machinery/light{dir = 4; icon_state = "tube1"; pixel_x = 0},/turf/simulated/floor/tiled,/area/security/prison)
 "aGw" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/obj/structure/cable/green{d2 = 8; icon_state = "0-8"},/obj/machinery/door/firedoor/border_only,/obj/machinery/door/blast/regular{density = 0; icon_state = "pdoor0"; id = "Prison Gate"; name = "Communal Brig Blast Door"; opacity = 0},/turf/simulated/floor/plating,/area/security/prison)
 "aGx" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 5},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/button/flasher{id = "permentryflash"; name = "entry flash"; pixel_x = 0; pixel_y = -34; req_access = list(2)},/obj/machinery/button/remote/airlock{id = "prisonexit"; name = "Exit Doors"; pixel_x = 6; pixel_y = -26; req_access = list(2)},/obj/machinery/button/remote/airlock{id = "prisonentry"; name = "Entry Doors"; pixel_x = -6; pixel_y = -26; req_access = list(2)},/turf/simulated/floor/tiled,/area/security/prison)
@@ -1696,7 +1696,7 @@
 "aGF" = (/obj/machinery/atmospherics/unary/outlet_injector{dir = 1; frequency = 1443; icon_state = "on"; id = "air_in"; use_power = 1},/obj/effect/floor_decal/industrial/outline/yellow,/turf/simulated/floor/tiled,/area/security/prison)
 "aGG" = (/turf/simulated/floor/tiled,/area/security/prison)
 "aGH" = (/obj/machinery/portable_atmospherics/powered/scrubber/huge,/turf/simulated/floor/tiled,/area/security/riot_control)
-"aGI" = (/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22; pixel_y = 0},/obj/structure/reagent_dispensers/fueltank,/turf/simulated/floor,/area/maintenance/security_starboard)
+"aGI" = (/obj/machinery/alarm{dir = 4; pixel_x = -22; pixel_y = 0},/obj/structure/reagent_dispensers/fueltank,/turf/simulated/floor,/area/maintenance/security_starboard)
 "aGJ" = (/obj/machinery/navbeacon/delivery/east{location = "Janitor"},/obj/structure/plasticflaps{opacity = 1},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/janitor)
 "aGK" = (/obj/structure/window/reinforced{dir = 4},/obj/effect/floor_decal/industrial/hatch/yellow,/obj/machinery/door/window/northleft{name = "Janitorial Delivery"; req_access = list(26)},/turf/simulated/floor/tiled,/area/janitor)
 "aGL" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk{dir = 1},/turf/simulated/floor/tiled,/area/janitor)
@@ -1727,7 +1727,7 @@
 "aHk" = (/obj/structure/table/standard,/obj/machinery/camera/network/security{c_tag = "SEC - Secure Armory Aft"; dir = 2},/turf/simulated/floor/tiled/dark,/area/security/tactical)
 "aHl" = (/obj/structure/table/standard,/turf/simulated/floor/tiled/dark,/area/security/tactical)
 "aHm" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled/dark,/area/security/tactical)
-"aHn" = (/obj/structure/table/standard,/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/obj/item/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/obj/machinery/recharger,/obj/item/cell/device/weapon{pixel_x = 4; pixel_y = 4},/obj/item/cell/device/weapon{pixel_x = 2; pixel_y = 2},/obj/item/cell/device/weapon,/obj/item/cell/device/weapon{pixel_x = -2; pixel_y = -2},/obj/effect/floor_decal/industrial/outline/grey,/turf/simulated/floor/tiled/dark,/area/security/tactical)
+"aHn" = (/obj/structure/table/standard,/obj/machinery/alarm{dir = 8; pixel_x = 24},/obj/item/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/obj/machinery/recharger,/obj/item/cell/device/weapon{pixel_x = 4; pixel_y = 4},/obj/item/cell/device/weapon{pixel_x = 2; pixel_y = 2},/obj/item/cell/device/weapon,/obj/item/cell/device/weapon{pixel_x = -2; pixel_y = -2},/obj/effect/floor_decal/industrial/outline/grey,/turf/simulated/floor/tiled/dark,/area/security/tactical)
 "aHo" = (/obj/effect/floor_decal/industrial/hatch/yellow,/obj/structure/target_stake,/turf/simulated/floor/tiled,/area/security/range)
 "aHp" = (/obj/effect/floor_decal/industrial/hatch/yellow,/turf/simulated/floor/tiled,/area/security/range)
 "aHq" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/tiled,/area/security/range)
@@ -1742,7 +1742,7 @@
 "aHz" = (/obj/structure/bed/chair/office/dark,/obj/machinery/button/remote/airlock{desc = "A remote control switch for the brig foyer."; id = "BrigFoyer"; name = "Brig Foyer Doors"; pixel_x = -6; pixel_y = -26; req_access = list(63)},/turf/simulated/floor/tiled,/area/security/lobby)
 "aHA" = (/obj/structure/bed/chair/office/dark,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled,/area/security/lobby)
 "aHB" = (/obj/machinery/computer/secure_data,/obj/effect/floor_decal/corner/red{dir = 6},/turf/simulated/floor/tiled,/area/security/lobby)
-"aHC" = (/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22},/obj/effect/floor_decal/corner/red/full,/turf/simulated/floor/tiled,/area/security/prison)
+"aHC" = (/obj/machinery/alarm{dir = 4; pixel_x = -22},/obj/effect/floor_decal/corner/red/full,/turf/simulated/floor/tiled,/area/security/prison)
 "aHD" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 1},/obj/structure/bed/chair,/obj/effect/floor_decal/corner/red{dir = 10},/obj/item/radio/intercom{broadcasting = 0; dir = 4; frequency = 1475; icon_state = "intercom"; listening = 1; name = "Station Intercom (Security)"; pixel_x = 21; pixel_y = 0},/turf/simulated/floor/tiled,/area/security/prison)
 "aHE" = (/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 8},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/flasher{id = "permentryflash"; name = "Floor mounted flash"; pixel_x = 0},/obj/machinery/power/apc{dir = 8; name = "west bump"; pixel_x = -24},/obj/effect/floor_decal/industrial/outline/yellow,/obj/structure/cable/green{d2 = 4; icon_state = "0-4"},/turf/simulated/floor/tiled,/area/security/prison)
 "aHF" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 8},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/camera/network/prison{c_tag = "SEC - Common Brig Enterance"; dir = 8},/obj/structure/cable/green{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor/tiled,/area/security/prison)
@@ -1762,7 +1762,7 @@
 "aHT" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/structure/cable/green{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/tiled/dark,/area/lawoffice)
 "aHU" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 9},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 10},/obj/structure/disposalpipe/segment{dir = 8; icon_state = "pipe-c"},/turf/simulated/floor/tiled/dark,/area/lawoffice)
 "aHV" = (/obj/machinery/hologram/holopad,/turf/simulated/floor/tiled/dark,/area/lawoffice)
-"aHW" = (/obj/structure/table/reinforced,/obj/machinery/photocopier/faxmachine{anchored = 0; department = "Internal Affairs"},/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/turf/simulated/floor/tiled/dark,/area/lawoffice)
+"aHW" = (/obj/structure/table/reinforced,/obj/machinery/photocopier/faxmachine{anchored = 0; department = "Internal Affairs"},/obj/machinery/alarm{dir = 8; pixel_x = 24},/turf/simulated/floor/tiled/dark,/area/lawoffice)
 "aHX" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 5},/turf/simulated/floor,/area/maintenance/holodeck)
 "aHY" = (/obj/machinery/light/small{dir = 4; pixel_y = 0},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 10},/obj/machinery/meter,/turf/simulated/floor,/area/maintenance/holodeck)
 "aHZ" = (/obj/machinery/power/apc{dir = 8; name = "west bump"; pixel_x = -24},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/turf/simulated/floor/tiled,/area/holodeck_control)
@@ -1850,7 +1850,7 @@
 "aJD" = (/obj/effect/floor_decal/spline/plain{dir = 10},/turf/simulated/floor/tiled/freezer,/area/crew_quarters/pool)
 "aJE" = (/obj/effect/floor_decal/industrial/hatch/yellow,/obj/machinery/door/window/westright{name = "Security Delivery"; req_access = list(1)},/obj/structure/window/reinforced,/obj/machinery/light/small{dir = 1},/turf/simulated/floor/tiled,/area/security/security_cell_hallway)
 "aJF" = (/obj/effect/floor_decal/spline/plain{dir = 6},/turf/simulated/floor/tiled/freezer,/area/crew_quarters/pool)
-"aJG" = (/obj/structure/table/glass,/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/turf/simulated/floor/tiled/freezer,/area/crew_quarters/pool)
+"aJG" = (/obj/structure/table/glass,/obj/machinery/alarm{dir = 8; pixel_x = 24},/turf/simulated/floor/tiled/freezer,/area/crew_quarters/pool)
 "aJH" = (/obj/effect/decal/cleanable/dirt,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor,/area/maintenance/pool)
 "aJI" = (/obj/structure/table/rack,/obj/effect/floor_decal/corner/green/full,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 2; health = 1e+006},/obj/machinery/light{dir = 8},/obj/machinery/door/window/brigdoor/eastright{name = "Ballistics"},/obj/machinery/status_display{density = 0; layer = 4; pixel_x = 0; pixel_y = -32},/obj/random/projectile/sec,/turf/simulated/floor/tiled/dark,/area/security/tactical)
 "aJJ" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 1},/turf/simulated/floor/tiled/dark,/area/security/tactical)
@@ -1878,7 +1878,7 @@
 "aKf" = (/obj/structure/cable/green{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/tiled,/area/security/prison)
 "aKg" = (/obj/structure/cable/green{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/item/radio/intercom{desc = "Talk... listen through this."; dir = 1; name = "Station Intercom (Brig Radio)"; pixel_x = 0; pixel_y = 21; wires = 7},/turf/simulated/floor/tiled,/area/security/prison)
 "aKh" = (/obj/machinery/atmospherics/unary/vent_pump/on,/obj/machinery/computer/cryopod{density = 0; layer = 3.3; pixel_y = 32},/turf/simulated/floor/tiled,/area/security/prison)
-"aKi" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/turf/simulated/floor/tiled,/area/security/prison)
+"aKi" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/alarm{dir = 8; pixel_x = 24},/turf/simulated/floor/tiled,/area/security/prison)
 "aKj" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/security/prison)
 "aKk" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/security/prison)
 "aKl" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/security/prison)
@@ -1967,7 +1967,7 @@
 "aLQ" = (/obj/effect/floor_decal/corner/red/full,/obj/structure/bed/chair{dir = 1},/obj/machinery/atm{pixel_y = -30},/turf/simulated/floor/tiled,/area/security/lobby)
 "aLR" = (/obj/structure/cable/green,/obj/machinery/power/apc{dir = 2; name = "south bump"; pixel_y = -24},/obj/structure/bed/chair{dir = 1},/turf/simulated/floor/tiled,/area/security/lobby)
 "aLS" = (/obj/effect/floor_decal/corner/red{dir = 10},/turf/simulated/floor/tiled,/area/security/lobby)
-"aLT" = (/obj/structure/bed/chair{dir = 1},/obj/machinery/alarm{dir = 1; icon_state = "alarm0"; pixel_y = -22},/turf/simulated/floor/tiled,/area/security/lobby)
+"aLT" = (/obj/structure/bed/chair{dir = 1},/obj/machinery/alarm{dir = 1; pixel_y = -22},/turf/simulated/floor/tiled,/area/security/lobby)
 "aLU" = (/obj/effect/floor_decal/corner/red/full{dir = 4},/obj/structure/bed/chair{dir = 1},/obj/structure/extinguisher_cabinet{pixel_x = 25; pixel_y = 0},/obj/item/radio/intercom{name = "Station Intercom (General)"; pixel_y = -21},/turf/simulated/floor/tiled,/area/security/lobby)
 "aLV" = (/obj/structure/table/steel,/obj/item/paper_bin,/obj/item/pen,/obj/machinery/light{icon_state = "tube1"; dir = 8},/obj/machinery/vending/wallmed1{pixel_y = -32},/turf/simulated/floor/tiled,/area/security/prison)
 "aLW" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled,/area/security/prison)
@@ -1975,7 +1975,7 @@
 "aLY" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 5},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 5},/turf/simulated/floor/tiled,/area/security/prison)
 "aLZ" = (/obj/machinery/door/airlock/glass{name = "Brig Dormitories"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/tiled,/area/security/prison)
 "aMa" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 10},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 9; pixel_y = 0},/turf/simulated/floor/tiled,/area/security/prison)
-"aMb" = (/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/turf/simulated/floor/tiled,/area/security/prison)
+"aMb" = (/obj/machinery/alarm{dir = 8; pixel_x = 24},/turf/simulated/floor/tiled,/area/security/prison)
 "aMc" = (/obj/machinery/shower{dir = 4; icon_state = "shower"; pixel_x = 5; pixel_y = 0},/obj/structure/curtain/open/shower/security,/turf/simulated/floor/tiled/freezer,/area/security/prison)
 "aMd" = (/obj/structure/mopbucket,/obj/item/mop,/obj/machinery/light{dir = 4; icon_state = "tube1"; pixel_x = 0},/turf/simulated/floor/tiled/freezer,/area/security/prison)
 "aMe" = (/obj/machinery/firealarm{dir = 8; pixel_x = -24; pixel_y = 0},/turf/simulated/floor/tiled,/area/storage/art)
@@ -1983,10 +1983,10 @@
 "aMg" = (/obj/machinery/camera/network/civilian{c_tag = "CIV - Art Storage"; dir = 8},/turf/simulated/floor/tiled,/area/storage/art)
 "aMh" = (/obj/machinery/firealarm{dir = 4; pixel_x = 26},/turf/simulated/floor/tiled,/area/hallway/secondary/civilian_hallway_aft)
 "aMi" = (/obj/machinery/newscaster{pixel_x = 0; pixel_y = -30},/turf/simulated/floor/tiled/dark,/area/lawoffice)
-"aMj" = (/obj/structure/table/standard,/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22},/obj/item/soap/nanotrasen,/turf/simulated/floor/tiled,/area/holodeck_control)
+"aMj" = (/obj/structure/table/standard,/obj/machinery/alarm{dir = 4; pixel_x = -22},/obj/item/soap/nanotrasen,/turf/simulated/floor/tiled,/area/holodeck_control)
 "aMk" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 4},/obj/machinery/light{dir = 8},/obj/item/stool/padded,/turf/simulated/floor/tiled,/area/crew_quarters/recreation_area_hallway)
 "aMl" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/tiled,/area/crew_quarters/recreation_area_hallway)
-"aMm" = (/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled,/area/crew_quarters/recreation_area_hallway)
+"aMm" = (/obj/machinery/alarm{dir = 8; pixel_x = 24},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled,/area/crew_quarters/recreation_area_hallway)
 "aMn" = (/obj/item/soap/nanotrasen,/obj/item/soap/nanotrasen,/obj/structure/table/standard,/obj/random/soap,/obj/item/clothing/under/bathrobe,/obj/item/clothing/under/bathrobe,/turf/simulated/floor/tiled/freezer,/area/crew_quarters/recreation_area_restroom)
 "aMo" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/cable/green{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/structure/cable/green{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/tiled/freezer,/area/crew_quarters/recreation_area_restroom)
 "aMp" = (/obj/structure/mirror{pixel_x = 28},/obj/structure/sink{dir = 4; icon_state = "sink"; pixel_x = 11; pixel_y = 0},/obj/machinery/power/apc{dir = 1; name = "north bump"; pixel_x = 0; pixel_y = 24},/obj/structure/cable/green{d2 = 8; icon_state = "0-8"},/turf/simulated/floor/tiled/freezer,/area/crew_quarters/recreation_area_restroom)
@@ -2051,7 +2051,7 @@
 "aNw" = (/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled,/area/hallway/secondary/civilian_hallway_aft)
 "aNx" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/machinery/door/firedoor/border_only,/obj/machinery/camera/network/civilian{c_tag = "CIV - Holodeck Aft"; dir = 1},/turf/simulated/floor/plating,/area/holodeck_control)
 "aNy" = (/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/tiled,/area/crew_quarters/recreation_area_hallway)
-"aNz" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 4},/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22},/turf/simulated/floor/tiled/freezer,/area/crew_quarters/recreation_area_restroom)
+"aNz" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 4},/obj/machinery/alarm{dir = 4; pixel_x = -22},/turf/simulated/floor/tiled/freezer,/area/crew_quarters/recreation_area_restroom)
 "aNA" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 9; pixel_y = 0},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 5},/turf/simulated/floor/tiled/freezer,/area/crew_quarters/recreation_area_restroom)
 "aNB" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 8},/turf/simulated/floor/tiled/freezer,/area/crew_quarters/recreation_area_restroom)
 "aNC" = (/obj/machinery/door/airlock{name = "Unisex Showers"},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/tiled/freezer,/area/crew_quarters/recreation_area_restroom)
@@ -2142,7 +2142,7 @@
 "aPj" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk,/turf/simulated/floor/tiled/dark,/area/hallway/primary/central_two)
 "aPk" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/maintenance{req_access = list(12)},/turf/simulated/floor,/area/maintenance/holodeck)
 "aPl" = (/obj/structure/cable{icon_state = "0-2"; d2 = 2},/obj/machinery/power/apc{dir = 8; name = "west bump"; pixel_x = -24},/turf/simulated/floor,/area/maintenance/pool)
-"aPm" = (/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor,/area/maintenance/pool)
+"aPm" = (/obj/machinery/alarm{dir = 8; pixel_x = 24},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor,/area/maintenance/pool)
 "aPn" = (/obj/machinery/door/airlock/external{frequency = 1380; icon_state = "door_locked"; id_tag = "large_escape_pod_2_hatch"; locked = 1; name = "Large Escape Pod Hatch 2"; req_access = list(13)},/turf/simulated/shuttle/floor,/area/shuttle/large_escape_pod2/station)
 "aPo" = (/turf/space,/obj/structure/shuttle/engine/propulsion{dir = 4; icon_state = "propulsion_l"},/turf/simulated/shuttle/plating/airless/carry,/area/shuttle/large_escape_pod2/station)
 "aPp" = (/obj/machinery/alarm{dir = 4; pixel_x = -23; pixel_y = 0},/obj/structure/table/steel,/obj/machinery/cell_charger,/obj/item/cell/high,/turf/simulated/floor,/area/maintenance/substation/security)
@@ -2402,12 +2402,12 @@
 "aUj" = (/obj/effect/floor_decal/industrial/warning{icon_state = "warning"; dir = 4},/turf/simulated/floor/tiled,/area/hallway/primary/central_one)
 "aUk" = (/obj/machinery/firealarm{dir = 8; pixel_x = -26},/obj/structure/closet/emcloset,/turf/simulated/floor/tiled/dark,/area/hallway/primary/central_one)
 "aUl" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled/dark,/area/hallway/primary/central_one)
-"aUm" = (/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/obj/machinery/light,/turf/simulated/floor/tiled/dark,/area/hallway/primary/central_one)
+"aUm" = (/obj/machinery/alarm{dir = 8; pixel_x = 24},/obj/machinery/light,/turf/simulated/floor/tiled/dark,/area/hallway/primary/central_one)
 "aUn" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/hallway/primary/central_one)
 "aUo" = (/obj/effect/floor_decal/industrial/warning,/obj/structure/disposalpipe/segment,/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/tiled,/area/hallway/primary/central_one)
 "aUp" = (/obj/machinery/door/firedoor/glass,/obj/effect/floor_decal/industrial/warning,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled,/area/hallway/primary/central_one)
 "aUq" = (/obj/effect/floor_decal/industrial/warning,/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/tiled,/area/hallway/primary/central_one)
-"aUr" = (/obj/machinery/firealarm{dir = 8; pixel_x = -26},/obj/machinery/alarm{dir = 1; icon_state = "alarm0"; pixel_y = -22},/turf/simulated/floor/tiled/dark,/area/hallway/primary/central_two)
+"aUr" = (/obj/machinery/firealarm{dir = 8; pixel_x = -26},/obj/machinery/alarm{dir = 1; pixel_y = -22},/turf/simulated/floor/tiled/dark,/area/hallway/primary/central_two)
 "aUs" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled,/area/hallway/primary/central_two)
 "aUt" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/tiled,/area/hallway/primary/central_two)
 "aUu" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 1},/turf/simulated/floor/tiled/dark,/area/hallway/primary/central_two)
@@ -2418,7 +2418,7 @@
 "aUz" = (/obj/machinery/power/apc{dir = 2; name = "south bump"; pixel_y = -24},/obj/machinery/light_switch{pixel_x = -26; pixel_y = 0},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/turf/simulated/floor/tiled,/area/storage/tools)
 "aUA" = (/obj/item/radio/intercom{name = "Station Intercom (General)"; pixel_y = -21},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/turf/simulated/floor/tiled,/area/storage/tools)
 "aUB" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/tiled,/area/storage/tools)
-"aUC" = (/obj/machinery/alarm{dir = 1; icon_state = "alarm0"; pixel_y = -22},/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor/tiled,/area/storage/tools)
+"aUC" = (/obj/machinery/alarm{dir = 1; pixel_y = -22},/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor/tiled,/area/storage/tools)
 "aUD" = (/obj/random/tech_supply,/obj/random/tech_supply,/obj/random/tech_supply,/obj/random/tech_supply,/obj/structure/table/steel,/obj/machinery/firealarm{dir = 4; pixel_x = 24},/obj/machinery/recharger{pixel_y = 0},/turf/simulated/floor/tiled,/area/storage/tools)
 "aUE" = (/turf/simulated/wall,/area/maintenance/engineering/pumpstation)
 "aUF" = (/obj/machinery/space_heater,/turf/simulated/floor/tiled,/area/maintenance/engineering/pumpstation)
@@ -2467,7 +2467,7 @@
 "aVw" = (/obj/structure/sign/securearea,/turf/simulated/wall/r_wall,/area/rnd/research_foyer_auxiliary)
 "aVx" = (/obj/effect/floor_decal/industrial/warning{dir = 1},/obj/machinery/door/airlock/research{name = "Research Division Auxiliary Access"; req_access = list(47)},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/tiled/white,/area/rnd/research_foyer_auxiliary)
 "aVy" = (/obj/structure/sign/science,/turf/simulated/wall/r_wall,/area/rnd/research_foyer_auxiliary)
-"aVz" = (/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22; pixel_y = 0},/turf/simulated/floor/tiled/dark,/area/gateway)
+"aVz" = (/obj/machinery/alarm{dir = 4; pixel_x = -22; pixel_y = 0},/turf/simulated/floor/tiled/dark,/area/gateway)
 "aVA" = (/obj/machinery/atmospherics/unary/vent_scrubber/on,/turf/simulated/floor/tiled/dark,/area/gateway)
 "aVB" = (/obj/machinery/gateway{dir = 9},/turf/simulated/floor/tiled/dark,/area/gateway)
 "aVC" = (/obj/machinery/gateway{dir = 1},/turf/simulated/floor/tiled/dark,/area/gateway)
@@ -2568,7 +2568,7 @@
 "aXt" = (/obj/effect/floor_decal/corner/yellow{dir = 5},/obj/machinery/atmospherics/unary/vent_scrubber/on,/turf/simulated/floor/tiled/white,/area/ai_monitored/storage/emergency/eva)
 "aXu" = (/obj/machinery/light/small{dir = 8},/turf/simulated/floor,/area/maintenance/medbay_fore)
 "aXv" = (/obj/structure/closet,/obj/item/storage/backpack,/obj/random/maintenance/medical,/obj/random/maintenance/medical,/obj/random/maintenance/medical,/obj/random/firstaid,/turf/simulated/floor/plating,/area/maintenance/medbay_fore)
-"aXw" = (/obj/machinery/atmospherics/portables_connector{dir = 4},/obj/machinery/portable_atmospherics/powered/pump/filled,/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22; pixel_y = 0},/turf/simulated/floor/tiled/hydro,/area/maintenance/engineering/pumpstation)
+"aXw" = (/obj/machinery/atmospherics/portables_connector{dir = 4},/obj/machinery/portable_atmospherics/powered/pump/filled,/obj/machinery/alarm{dir = 4; pixel_x = -22; pixel_y = 0},/turf/simulated/floor/tiled/hydro,/area/maintenance/engineering/pumpstation)
 "aXx" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/cyan{dir = 9; icon_state = "intact"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled,/area/maintenance/engineering/pumpstation)
 "aXy" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled,/area/maintenance/engineering/pumpstation)
 "aXz" = (/obj/machinery/door/airlock/glass_engineeringatmos{name = "Pump Station Atmospherics"; req_one_access = list(11,24)},/obj/machinery/door/firedoor/glass,/turf/simulated/floor/tiled,/area/maintenance/engineering/pumpstation)
@@ -2581,7 +2581,7 @@
 "aXG" = (/turf/simulated/floor,/area/maintenance/research_shuttle)
 "aXH" = (/obj/machinery/power/apc{dir = 2; name = "south bump"; pixel_y = -24},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/turf/simulated/floor,/area/maintenance/research_shuttle)
 "aXI" = (/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor,/area/maintenance/research_shuttle)
-"aXJ" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 4},/obj/structure/closet/firecloset,/obj/effect/floor_decal/industrial/warning{dir = 8},/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22; pixel_y = 0},/obj/machinery/camera/network/research{c_tag = "SCI - Research Auxiliary Access"; dir = 4},/turf/simulated/floor/tiled/white,/area/rnd/research_foyer_auxiliary)
+"aXJ" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 4},/obj/structure/closet/firecloset,/obj/effect/floor_decal/industrial/warning{dir = 8},/obj/machinery/alarm{dir = 4; pixel_x = -22; pixel_y = 0},/obj/machinery/camera/network/research{c_tag = "SCI - Research Auxiliary Access"; dir = 4},/turf/simulated/floor/tiled/white,/area/rnd/research_foyer_auxiliary)
 "aXK" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 6},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 10},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/white,/area/rnd/research_foyer_auxiliary)
 "aXL" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 8},/obj/effect/floor_decal/industrial/warning{dir = 4},/obj/machinery/light{dir = 4; icon_state = "tube1"; pixel_x = 0},/turf/simulated/floor/tiled/white,/area/rnd/research_foyer_auxiliary)
 "aXM" = (/obj/structure/window/reinforced,/obj/machinery/newscaster{pixel_x = -31; pixel_y = 0},/obj/machinery/camera/network/civilian{c_tag = "CIV - Gateway"; dir = 4},/turf/simulated/floor/tiled/dark,/area/gateway)
@@ -2664,12 +2664,12 @@
 "aZl" = (/obj/item/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -21},/turf/simulated/floor/tiled/dark,/area/ai_server_room)
 "aZm" = (/turf/simulated/floor/tiled/dark,/area/ai_server_room)
 "aZn" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled/dark,/area/ai_server_room)
-"aZo" = (/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22; pixel_y = 0},/obj/machinery/turretid/stun{control_area = "\improper AI Upload Chamber"; name = "AI Upload turret control"; pixel_x = 6; pixel_y = -24},/obj/item/radio/intercom{broadcasting = 1; frequency = 1447; name = "Private AI Channel"; pixel_x = -12; pixel_y = -21},/turf/simulated/floor/tiled/dark,/area/ai_upload_foyer)
+"aZo" = (/obj/machinery/alarm{dir = 4; pixel_x = -22; pixel_y = 0},/obj/machinery/turretid/stun{control_area = "\improper AI Upload Chamber"; name = "AI Upload turret control"; pixel_x = 6; pixel_y = -24},/obj/item/radio/intercom{broadcasting = 1; frequency = 1447; name = "Private AI Channel"; pixel_x = -12; pixel_y = -21},/turf/simulated/floor/tiled/dark,/area/ai_upload_foyer)
 "aZp" = (/obj/structure/cable/cyan{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable/cyan{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/flasher{id = "AIFoyer"; pixel_x = 22; pixel_y = -36},/turf/simulated/floor/tiled/dark,/area/ai_upload_foyer)
 "aZq" = (/obj/machinery/power/apc{dir = 2; name = "south bump"; pixel_y = -24},/obj/structure/cable/cyan{d2 = 8; icon_state = "0-8"},/obj/machinery/light{dir = 4},/turf/simulated/floor/tiled/dark,/area/ai_upload_foyer)
 "aZr" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled/dark,/area/ai_cyborg_station)
 "aZs" = (/obj/effect/landmark/start{name = "Cyborg"},/turf/simulated/floor/tiled/dark,/area/ai_cyborg_station)
-"aZt" = (/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/obj/effect/landmark/start{name = "Cyborg"},/turf/simulated/floor/tiled/dark,/area/ai_cyborg_station)
+"aZt" = (/obj/machinery/alarm{dir = 8; pixel_x = 24},/obj/effect/landmark/start{name = "Cyborg"},/turf/simulated/floor/tiled/dark,/area/ai_cyborg_station)
 "aZu" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/grille,/obj/machinery/door/firedoor/border_only,/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/hydroponics/garden)
 "aZv" = (/obj/effect/floor_decal/spline/fancy/wood{dir = 6},/obj/structure/flora/ausbushes/sparsegrass,/turf/simulated/floor/grass,/area/hydroponics/garden)
 "aZw" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 4},/turf/simulated/floor/tiled,/area/hydroponics/garden)
@@ -2735,7 +2735,7 @@
 "baE" = (/obj/structure/table/reinforced,/obj/effect/floor_decal/industrial/warning,/obj/item/stack/cable_coil{pixel_x = 3; pixel_y = -7},/obj/item/cell/high,/obj/item/stack/cable_coil{pixel_x = 3; pixel_y = -7},/obj/item/cell/high,/obj/item/storage/toolbox/mechanical{pixel_x = -2; pixel_y = -1},/obj/structure/cable/green,/obj/machinery/power/apc{dir = 2; name = "south bump"; pixel_y = -24},/obj/machinery/light_switch{pixel_x = 12; pixel_y = -24},/obj/machinery/light{dir = 8},/turf/simulated/floor/tiled/dark,/area/ai_monitored/storage/emergency/eva)
 "baF" = (/obj/item/storage/briefcase/inflatable{pixel_x = 3; pixel_y = 6},/obj/item/storage/briefcase/inflatable{pixel_y = 3},/obj/item/storage/briefcase/inflatable{pixel_x = -3},/obj/structure/table/reinforced,/obj/effect/floor_decal/industrial/warning,/obj/machinery/status_display{density = 0; layer = 4; pixel_x = 0; pixel_y = -32},/turf/simulated/floor/tiled/dark,/area/ai_monitored/storage/emergency/eva)
 "baG" = (/obj/machinery/suit_storage_unit/standard_unit,/obj/effect/floor_decal/industrial/warning,/turf/simulated/floor/tiled/dark,/area/ai_monitored/storage/emergency/eva)
-"baH" = (/obj/structure/table/reinforced,/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 1},/obj/effect/floor_decal/industrial/warning,/obj/item/tool/crowbar/red,/obj/item/tool/crowbar/red,/obj/item/tool/crowbar/red,/obj/item/tool/crowbar/red,/obj/item/tool/crowbar/red,/obj/item/flashlight,/obj/item/flashlight,/obj/item/radio/off,/obj/item/radio/off,/obj/item/radio/off,/obj/item/radio/off,/obj/machinery/alarm{dir = 1; icon_state = "alarm0"; pixel_y = -22},/obj/machinery/camera/network/civilian{c_tag = "CIV - Emergency EVA"; dir = 1},/turf/simulated/floor/tiled/dark,/area/ai_monitored/storage/emergency/eva)
+"baH" = (/obj/structure/table/reinforced,/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 1},/obj/effect/floor_decal/industrial/warning,/obj/item/tool/crowbar/red,/obj/item/tool/crowbar/red,/obj/item/tool/crowbar/red,/obj/item/tool/crowbar/red,/obj/item/tool/crowbar/red,/obj/item/flashlight,/obj/item/flashlight,/obj/item/radio/off,/obj/item/radio/off,/obj/item/radio/off,/obj/item/radio/off,/obj/machinery/alarm{dir = 1; pixel_y = -22},/obj/machinery/camera/network/civilian{c_tag = "CIV - Emergency EVA"; dir = 1},/turf/simulated/floor/tiled/dark,/area/ai_monitored/storage/emergency/eva)
 "baI" = (/obj/structure/table/woodentable,/obj/machinery/light,/obj/effect/floor_decal/corner/brown{dir = 10},/obj/random/maintenance/engineering,/obj/item/storage/belt/utility,/turf/simulated/floor/tiled/white,/area/ai_monitored/storage/emergency/eva)
 "baJ" = (/obj/effect/floor_decal/corner/brown{dir = 10},/obj/machinery/status_display{density = 0; layer = 4; pixel_x = 0; pixel_y = -32},/turf/simulated/floor/tiled/white,/area/ai_monitored/storage/emergency/eva)
 "baK" = (/obj/effect/floor_decal/corner/brown/full{dir = 4},/turf/simulated/floor/tiled/white,/area/ai_monitored/storage/emergency/eva)
@@ -2803,7 +2803,7 @@
 "bbU" = (/obj/structure/closet/wardrobe/black,/obj/machinery/light,/turf/simulated/floor/tiled,/area/gateway)
 "bbV" = (/obj/structure/closet/l3closet/scientist,/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/tiled,/area/gateway)
 "bbW" = (/obj/structure/closet/l3closet/scientist,/turf/simulated/floor/tiled,/area/gateway)
-"bbX" = (/obj/structure/disposalpipe/segment,/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22},/turf/simulated/floor/tiled,/area/hallway/primary/central_four)
+"bbX" = (/obj/structure/disposalpipe/segment,/obj/machinery/alarm{dir = 4; pixel_x = -22},/turf/simulated/floor/tiled,/area/hallway/primary/central_four)
 "bbY" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/newscaster{pixel_x = 28; pixel_y = 1},/turf/simulated/floor/tiled,/area/hallway/primary/central_four)
 "bbZ" = (/obj/structure/table/standard,/obj/item/hand_tele,/turf/simulated/floor/tiled/dark,/area/teleporter)
 "bca" = (/obj/machinery/computer/teleporter,/turf/simulated/floor/tiled/dark,/area/teleporter)
@@ -2818,7 +2818,7 @@
 "bcj" = (/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/water/pool,/area/hydroponics/garden)
 "bck" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/obj/structure/flora/ausbushes/reedbush,/turf/simulated/floor/water/pool,/area/hydroponics/garden)
 "bcl" = (/obj/structure/table/woodentable,/obj/effect/floor_decal/corner/green{dir = 6},/turf/simulated/floor/tiled,/area/hydroponics/garden)
-"bcm" = (/obj/structure/disposalpipe/segment,/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/turf/simulated/floor/tiled,/area/hallway/primary/central_two)
+"bcm" = (/obj/structure/disposalpipe/segment,/obj/machinery/alarm{dir = 8; pixel_x = 24},/turf/simulated/floor/tiled,/area/hallway/primary/central_two)
 "bcn" = (/turf/simulated/wall,/area/medical/surgeryobs)
 "bco" = (/obj/structure/table/standard,/obj/item/storage/box/cups{pixel_x = 0; pixel_y = 0},/turf/simulated/floor/tiled,/area/medical/surgeryobs)
 "bcp" = (/obj/structure/reagent_dispensers/water_cooler/full,/obj/effect/floor_decal/corner/paleblue{dir = 2},/turf/simulated/floor/tiled,/area/medical/surgeryobs)
@@ -2837,13 +2837,13 @@
 "bcC" = (/obj/structure/reagent_dispensers/fueltank,/turf/simulated/floor,/area/maintenance/medbay_fore)
 "bcD" = (/obj/structure/reagent_dispensers/watertank,/turf/simulated/floor,/area/maintenance/medbay_fore)
 "bcE" = (/obj/random/powercell,/obj/random/powercell,/obj/random/powercell,/obj/random/powercell,/obj/random/toolbox,/obj/effect/decal/cleanable/molten_item,/obj/structure/closet/crate,/obj/random/maintenance/medical,/obj/random/maintenance/medical,/turf/simulated/floor,/area/maintenance/medbay_fore)
-"bcF" = (/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22},/turf/simulated/floor,/area/maintenance/research_shuttle)
+"bcF" = (/obj/machinery/alarm{dir = 4; pixel_x = -22},/turf/simulated/floor,/area/maintenance/research_shuttle)
 "bcG" = (/obj/machinery/alarm{dir = 4; pixel_x = -23; pixel_y = 0},/turf/simulated/floor,/area/rnd/research_storage)
 "bcH" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor,/area/rnd/research_storage)
 "bcI" = (/obj/machinery/light/small{dir = 4},/obj/machinery/portable_atmospherics/powered/pump/filled,/turf/simulated/floor,/area/rnd/research_storage)
 "bcJ" = (/obj/effect/floor_decal/corner/purple{dir = 9},/obj/machinery/firealarm{dir = 8; pixel_x = -24},/turf/simulated/floor/tiled/white,/area/rnd/research)
 "bcK" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled/white,/area/rnd/research)
-"bcL" = (/obj/effect/floor_decal/corner/purple{dir = 6},/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/white,/area/rnd/research)
+"bcL" = (/obj/effect/floor_decal/corner/purple{dir = 6},/obj/machinery/alarm{dir = 8; pixel_x = 24},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/white,/area/rnd/research)
 "bcM" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/machinery/door/firedoor/border_only,/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/gateway)
 "bcN" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/gateway)
 "bcO" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/gateway)
@@ -2853,7 +2853,7 @@
 "bcS" = (/obj/effect/floor_decal/industrial/warning{dir = 1},/obj/structure/extinguisher_cabinet{pixel_x = -27; pixel_y = 1},/obj/machinery/light,/turf/simulated/floor/tiled,/area/teleporter)
 "bcT" = (/obj/item/stool/padded,/obj/effect/floor_decal/industrial/warning{dir = 1},/turf/simulated/floor/tiled,/area/teleporter)
 "bcU" = (/obj/effect/floor_decal/industrial/warning{dir = 1},/turf/simulated/floor/tiled,/area/teleporter)
-"bcV" = (/obj/effect/floor_decal/industrial/warning/corner,/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/obj/effect/floor_decal/industrial/warning{dir = 1},/turf/simulated/floor/tiled,/area/teleporter)
+"bcV" = (/obj/effect/floor_decal/industrial/warning/corner,/obj/machinery/alarm{dir = 8; pixel_x = 24},/obj/effect/floor_decal/industrial/warning{dir = 1},/turf/simulated/floor/tiled,/area/teleporter)
 "bcW" = (/obj/structure/table/standard,/obj/item/aiModule/protectStation,/obj/machinery/light{dir = 1},/turf/simulated/floor/bluegrid,/area/ai_upload)
 "bcX" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 4},/turf/simulated/floor/tiled/dark,/area/ai_upload)
 "bcY" = (/obj/structure/cable/cyan{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 8},/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 4},/obj/machinery/ai_slipper{icon_state = "motion0"},/turf/simulated/floor/tiled/dark,/area/ai_upload)
@@ -3008,7 +3008,7 @@
 "bfR" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/structure/sign/securearea{desc = "A warning sign which reads 'SERVER ROOM'."; name = "SERVER ROOM"; pixel_y = 32},/obj/machinery/atmospherics/pipe/simple/hidden{icon_state = "intact"; dir = 4},/turf/simulated/floor/plating,/area/server)
 "bfS" = (/obj/machinery/atmospherics/pipe/simple/hidden{dir = 10; icon_state = "intact"},/obj/machinery/light/small{dir = 1},/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/obj/machinery/power/apc/high{dir = 1; name = "north bump"; pixel_y = 24},/turf/simulated/floor/tiled/dark,/area/server)
 "bfT" = (/obj/machinery/camera/network/research{c_tag = "SCI - Server Room"},/obj/machinery/portable_atmospherics/canister/nitrogen,/obj/machinery/atmospherics/portables_connector,/turf/simulated/floor/tiled/dark,/area/server)
-"bfU" = (/obj/machinery/atmospherics/unary/freezer{dir = 2; icon_state = "freezer_1"; use_power = 1; power_setting = 20; set_temperature = 73},/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/turf/simulated/floor/tiled/dark,/area/server)
+"bfU" = (/obj/machinery/atmospherics/unary/freezer{dir = 2; icon_state = "freezer_1"; use_power = 1; power_setting = 20; set_temperature = 73},/obj/machinery/alarm{dir = 8; pixel_x = 24},/turf/simulated/floor/tiled/dark,/area/server)
 "bfV" = (/obj/machinery/atmospherics/unary/vent_scrubber/on,/obj/effect/floor_decal/industrial/warning/corner{icon_state = "warningcorner"; dir = 8},/obj/effect/floor_decal/corner/purple{dir = 1},/turf/simulated/floor/tiled/white,/area/rnd/research)
 "bfW" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/white,/area/rnd/research)
 "bfX" = (/obj/machinery/atmospherics/unary/vent_pump/on,/turf/simulated/floor/tiled/white,/area/rnd/research)
@@ -3139,8 +3139,8 @@
 "bis" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled/freezer,/area/crew_quarters/medical_restroom)
 "bit" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 10},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 9; pixel_y = 0},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled/freezer,/area/crew_quarters/medical_restroom)
 "biu" = (/obj/machinery/power/apc{dir = 2; name = "south bump"; pixel_y = -24},/obj/structure/cable/green{d2 = 8; icon_state = "0-8"},/obj/machinery/light_switch{pixel_x = 12; pixel_y = -24},/turf/simulated/floor/tiled/freezer,/area/crew_quarters/medical_restroom)
-"biv" = (/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/turf/simulated/floor/tiled/freezer,/area/crew_quarters/medical_restroom)
-"biw" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/turf/simulated/floor,/area/maintenance/medbay_fore)
+"biv" = (/obj/machinery/alarm{dir = 8; pixel_x = 24},/turf/simulated/floor/tiled/freezer,/area/crew_quarters/medical_restroom)
+"biw" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/alarm{dir = 8; pixel_x = 24},/turf/simulated/floor,/area/maintenance/medbay_fore)
 "bix" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/firedoor/border_only,/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/medical/virology)
 "biy" = (/obj/machinery/door/window/southright{dir = 1; name = "Virology Isolation Room Three"; req_access = list(39)},/obj/machinery/door/firedoor/glass,/obj/effect/floor_decal/corner/lime{dir = 5},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/black,/turf/simulated/floor/tiled/white,/area/medical/virology)
 "biz" = (/turf/simulated/wall,/area/medical/virology)
@@ -3193,7 +3193,7 @@
 "bju" = (/obj/structure/closet/secure_closet/medical2,/obj/effect/floor_decal/corner/pink/full{dir = 1},/turf/simulated/floor/tiled/white,/area/medical/surgery)
 "bjv" = (/turf/simulated/wall,/area/medical/surgery)
 "bjw" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment,/obj/machinery/camera/network/medbay{c_tag = "MED - Surgery Hallway"; dir = 4},/obj/item/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -21},/turf/simulated/floor/tiled/white,/area/medical/surgery_hallway)
-"bjx" = (/obj/structure/table/standard,/obj/item/reagent_containers/blood/AMinus,/obj/item/reagent_containers/blood/APlus,/obj/item/reagent_containers/blood/BMinus,/obj/item/reagent_containers/blood/BPlus,/obj/item/reagent_containers/blood/OPlus,/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/turf/simulated/floor/tiled/white,/area/medical/surgery_hallway)
+"bjx" = (/obj/structure/table/standard,/obj/item/reagent_containers/blood/AMinus,/obj/item/reagent_containers/blood/APlus,/obj/item/reagent_containers/blood/BMinus,/obj/item/reagent_containers/blood/BPlus,/obj/item/reagent_containers/blood/OPlus,/obj/machinery/alarm{dir = 8; pixel_x = 24},/turf/simulated/floor/tiled/white,/area/medical/surgery_hallway)
 "bjy" = (/obj/effect/floor_decal/corner/pink{dir = 9},/obj/machinery/atmospherics/unary/vent_pump/on{dir = 4},/turf/simulated/floor/tiled/white,/area/medical/exam_room)
 "bjz" = (/obj/machinery/hologram/holopad,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 10},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/white,/area/medical/exam_room)
 "bjA" = (/obj/effect/floor_decal/corner/pink{dir = 6},/obj/item/radio/intercom{broadcasting = 0; canhear_range = 5; dir = 4; frequency = 1487; icon_state = "intercom"; listening = 0; name = "Station Intercom (Medbay)"; pixel_x = 21; pixel_y = 0},/turf/simulated/floor/tiled/white,/area/medical/exam_room)
@@ -3214,7 +3214,7 @@
 "bjP" = (/obj/item/storage/secure/safe{pixel_x = 5; pixel_y = 29},/obj/effect/floor_decal/corner/lime{dir = 5},/obj/machinery/atmospherics/unary/vent_scrubber/on,/obj/machinery/camera/network/medbay{c_tag = "MED - Virology Fore"; dir = 2},/turf/simulated/floor/tiled/white,/area/medical/virology)
 "bjQ" = (/obj/effect/floor_decal/corner/lime{dir = 1},/turf/simulated/floor/tiled/white,/area/medical/virology)
 "bjR" = (/obj/machinery/smartfridge/secure/virology,/obj/effect/floor_decal/corner/lime/full{dir = 1},/obj/machinery/status_display{density = 0; layer = 4; pixel_x = 0; pixel_y = 32},/turf/simulated/floor/tiled/white,/area/medical/virology)
-"bjS" = (/obj/structure/bed/padded,/obj/item/bedsheet/green,/obj/effect/floor_decal/corner/lime/full{dir = 8},/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22},/turf/simulated/floor/tiled/white,/area/medical/virology)
+"bjS" = (/obj/structure/bed/padded,/obj/item/bedsheet/green,/obj/effect/floor_decal/corner/lime/full{dir = 8},/obj/machinery/alarm{dir = 4; pixel_x = -22},/turf/simulated/floor/tiled/white,/area/medical/virology)
 "bjT" = (/obj/effect/floor_decal/corner/lime{dir = 5},/obj/machinery/firealarm{dir = 2; pixel_y = 24},/turf/simulated/floor/tiled/white,/area/medical/virology)
 "bjU" = (/turf/simulated/floor/tiled/white,/area/medical/virology)
 "bjV" = (/obj/machinery/washing_machine,/obj/effect/floor_decal/corner/lime/full{dir = 1},/turf/simulated/floor/tiled/white,/area/medical/virology)
@@ -3231,7 +3231,7 @@
 "bkg" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/firedoor/border_only,/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/rnd/research)
 "bkh" = (/obj/effect/floor_decal/corner/purple/diagonal,/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 4},/turf/simulated/floor/tiled/white,/area/rnd/research_restroom)
 "bki" = (/obj/effect/floor_decal/corner/purple/diagonal,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 10},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 6},/turf/simulated/floor/tiled/white,/area/rnd/research_restroom)
-"bkj" = (/obj/structure/closet/wardrobe/science_white,/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/obj/effect/floor_decal/corner/purple/diagonal,/obj/machinery/atmospherics/unary/vent_pump/on{dir = 8},/turf/simulated/floor/tiled/white,/area/rnd/research_restroom)
+"bkj" = (/obj/structure/closet/wardrobe/science_white,/obj/machinery/alarm{dir = 8; pixel_x = 24},/obj/effect/floor_decal/corner/purple/diagonal,/obj/machinery/atmospherics/unary/vent_pump/on{dir = 8},/turf/simulated/floor/tiled/white,/area/rnd/research_restroom)
 "bkk" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk,/turf/simulated/floor/tiled/dark,/area/rnd/lab)
 "bkl" = (/obj/structure/table/standard,/obj/item/storage/belt/utility,/obj/item/clothing/gloves/sterile/latex,/obj/machinery/status_display{density = 0; layer = 4; pixel_x = 0; pixel_y = 32},/turf/simulated/floor/tiled/dark,/area/rnd/lab)
 "bkm" = (/obj/machinery/autolathe,/obj/machinery/light{dir = 1},/turf/simulated/floor/tiled/dark,/area/rnd/lab)
@@ -3285,7 +3285,7 @@
 "bli" = (/obj/machinery/shower{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/window/northright{dir = 1; name = "Shower"; req_access = list()},/obj/structure/curtain/open/shower/medical,/turf/simulated/floor/tiled/freezer,/area/crew_quarters/medical_restroom)
 "blj" = (/obj/structure/toilet{dir = 1},/obj/effect/landmark{name = "xeno_spawn"; pixel_x = -1},/obj/machinery/light/small{dir = 4},/turf/simulated/floor/tiled/freezer,/area/crew_quarters/medical_restroom)
 "blk" = (/obj/structure/table/rack,/obj/item/clothing/glasses/sunglasses,/obj/item/clothing/suit/storage/hazardvest,/obj/item/radio,/obj/random/maintenance/medical,/obj/random/maintenance/medical,/turf/simulated/floor/plating,/area/maintenance/medbay_fore)
-"bll" = (/obj/structure/table/standard,/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22},/obj/effect/floor_decal/corner/lime{dir = 9},/obj/machinery/light{dir = 1},/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 4},/turf/simulated/floor/tiled/white,/area/medical/virology)
+"bll" = (/obj/structure/table/standard,/obj/machinery/alarm{dir = 4; pixel_x = -22},/obj/effect/floor_decal/corner/lime{dir = 9},/obj/machinery/light{dir = 1},/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 4},/turf/simulated/floor/tiled/white,/area/medical/virology)
 "blm" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 6},/obj/machinery/atmospherics/pipe/simple/hidden/black{dir = 4},/turf/simulated/floor/tiled/white,/area/medical/virology)
 "bln" = (/obj/effect/floor_decal/corner/lime{dir = 6},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/black{dir = 4},/turf/simulated/floor/tiled/white,/area/medical/virology)
 "blo" = (/obj/machinery/door/window/westright{name = "Virology Isolation Room Two"; req_access = list(39)},/obj/machinery/door/firedoor/glass,/obj/effect/floor_decal/corner/lime{dir = 9},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/black{dir = 4},/turf/simulated/floor/tiled/white,/area/medical/virology)
@@ -3324,7 +3324,7 @@
 "blV" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/effect/floor_decal/industrial/warning{dir = 8},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled/white,/area/rnd/research)
 "blW" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers,/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled/white,/area/rnd/research)
 "blX" = (/obj/effect/floor_decal/corner/purple{dir = 6},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/camera/network/research{c_tag = "SCI - Research Hallway Aft"; dir = 8},/obj/structure/cable/green{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 8},/turf/simulated/floor/tiled/white,/area/rnd/research)
-"blY" = (/obj/structure/bed/chair/comfy/purp{dir = 4},/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22; pixel_y = 0},/turf/simulated/floor/wood,/area/rnd/research)
+"blY" = (/obj/structure/bed/chair/comfy/purp{dir = 4},/obj/machinery/alarm{dir = 4; pixel_x = -22; pixel_y = 0},/turf/simulated/floor/wood,/area/rnd/research)
 "blZ" = (/obj/structure/table/glass,/obj/machinery/newscaster{pixel_y = 32},/obj/machinery/light{dir = 1},/turf/simulated/floor/wood,/area/rnd/research)
 "bma" = (/obj/structure/bed/chair/comfy/purp{dir = 8},/turf/simulated/floor/wood,/area/rnd/research)
 "bmb" = (/obj/structure/table/standard,/obj/machinery/power/apc{dir = 2; name = "south bump"; pixel_y = -24},/obj/machinery/light_switch{pixel_x = -12; pixel_y = -24},/obj/effect/floor_decal/corner/purple/diagonal,/obj/structure/cable/green{d2 = 4; icon_state = "0-4"},/obj/item/soap/nanotrasen,/obj/item/soap/nanotrasen,/turf/simulated/floor/tiled/white,/area/rnd/research_restroom)
@@ -3336,7 +3336,7 @@
 "bmh" = (/obj/structure/table/standard{name = "plastic table frame"},/obj/item/stack/material/glass{amount = 50; pixel_x = 3; pixel_y = 3},/obj/item/stack/material/steel{amount = 50},/obj/item/clothing/glasses/welding,/obj/effect/floor_decal/corner/purple{dir = 5},/turf/simulated/floor/tiled/white,/area/rnd/lab)
 "bmi" = (/obj/structure/table/standard,/obj/item/hand_labeler,/obj/item/pen,/obj/item/packageWrap,/obj/item/packageWrap,/obj/effect/floor_decal/corner/purple{dir = 5},/turf/simulated/floor/tiled/white,/area/rnd/lab)
 "bmj" = (/obj/item/stock_parts/console_screen,/obj/structure/table/standard,/obj/item/stock_parts/console_screen,/obj/item/stock_parts/console_screen,/obj/item/stock_parts/matter_bin,/obj/item/stock_parts/matter_bin,/obj/effect/floor_decal/corner/purple/full{dir = 1},/obj/machinery/firealarm{dir = 4; layer = 3.3; pixel_x = 26},/obj/machinery/recharger{pixel_y = 0},/turf/simulated/floor/tiled/white,/area/rnd/lab)
-"bmk" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/turf/simulated/floor/tiled,/area/hallway/primary/central_four)
+"bmk" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/alarm{dir = 8; pixel_x = 24},/turf/simulated/floor/tiled,/area/hallway/primary/central_four)
 "bml" = (/obj/structure/closet/crate,/obj/item/tool/crowbar,/turf/simulated/floor/tiled,/area/teleporter)
 "bmm" = (/obj/structure/closet/crate,/turf/simulated/floor/tiled,/area/teleporter)
 "bmn" = (/obj/structure/table/standard,/obj/structure/flora/pottedplant{icon_state = "plant-09"; name = "Steve"; pixel_y = 15},/obj/effect/floor_decal/industrial/warning/corner,/turf/simulated/floor/tiled/dark,/area/ai)
@@ -3414,7 +3414,7 @@
 "bnH" = (/obj/effect/floor_decal/industrial/warning/corner,/turf/simulated/floor/tiled/white,/area/rnd/lab)
 "bnI" = (/obj/effect/floor_decal/industrial/warning,/turf/simulated/floor/tiled/white,/area/rnd/lab)
 "bnJ" = (/obj/effect/floor_decal/industrial/warning/corner{dir = 8},/turf/simulated/floor/tiled/white,/area/rnd/lab)
-"bnK" = (/obj/structure/table/standard,/obj/item/stock_parts/manipulator,/obj/item/stock_parts/capacitor,/obj/item/stock_parts/capacitor,/obj/item/stock_parts/manipulator,/obj/item/stock_parts/micro_laser,/obj/item/stock_parts/micro_laser,/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/obj/effect/floor_decal/corner/purple{dir = 6},/turf/simulated/floor/tiled/white,/area/rnd/lab)
+"bnK" = (/obj/structure/table/standard,/obj/item/stock_parts/manipulator,/obj/item/stock_parts/capacitor,/obj/item/stock_parts/capacitor,/obj/item/stock_parts/manipulator,/obj/item/stock_parts/micro_laser,/obj/item/stock_parts/micro_laser,/obj/machinery/alarm{dir = 8; pixel_x = 24},/obj/effect/floor_decal/corner/purple{dir = 6},/turf/simulated/floor/tiled/white,/area/rnd/lab)
 "bnL" = (/obj/effect/floor_decal/industrial/warning{icon_state = "warning"; dir = 4},/turf/simulated/floor/tiled/dark,/area/ai)
 "bnM" = (/turf/simulated/floor/bluegrid,/area/ai)
 "bnN" = (/obj/structure/cable/cyan{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/bluegrid,/area/ai)
@@ -3505,7 +3505,7 @@
 "bpu" = (/obj/effect/floor_decal/spline/fancy/wood{dir = 5},/obj/structure/flora/ausbushes/sparsegrass,/obj/structure/flora/ausbushes/brflowers,/turf/simulated/floor/grass,/area/hydroponics/garden)
 "bpv" = (/obj/effect/floor_decal/spline/fancy/wood{icon_state = "spline_fancy"; dir = 9},/obj/structure/flora/ausbushes/sparsegrass,/turf/simulated/floor/grass,/area/hydroponics/garden)
 "bpw" = (/obj/structure/flora/ausbushes/ppflowers,/turf/simulated/floor/grass,/area/hydroponics/garden)
-"bpx" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22; pixel_y = 0},/turf/simulated/floor/tiled,/area/hallway/primary/central_two)
+"bpx" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/alarm{dir = 4; pixel_x = -22; pixel_y = 0},/turf/simulated/floor/tiled,/area/hallway/primary/central_two)
 "bpy" = (/obj/structure/disposalpipe/segment,/obj/machinery/camera/network/northern_star{c_tag = "Hall - Central Primary Starboard Mid 1"; dir = 8},/turf/simulated/floor/tiled,/area/hallway/primary/central_two)
 "bpz" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/hallway/primary/central_two)
 "bpA" = (/obj/effect/floor_decal/corner/paleblue{dir = 4},/turf/simulated/floor/tiled,/area/medical/surgeryobs)
@@ -3561,7 +3561,7 @@
 "bqy" = (/obj/machinery/alarm{pixel_y = 25},/obj/machinery/atmospherics/unary/vent_pump/on,/obj/machinery/camera/network/research{c_tag = "SCI - Workshop"; dir = 2},/obj/effect/floor_decal/corner/green{dir = 1},/turf/simulated/floor/tiled/dark,/area/rnd/workshop)
 "bqz" = (/obj/machinery/firealarm{dir = 4; pixel_x = 24},/obj/machinery/power/apc{dir = 1; name = "north bump"; pixel_x = 0; pixel_y = 24},/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/turf/simulated/floor/tiled/dark,/area/rnd/workshop)
 "bqA" = (/turf/simulated/wall/r_wall,/area/rnd/workshop)
-"bqB" = (/obj/effect/floor_decal/corner/purple{dir = 9},/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22; pixel_y = 0},/turf/simulated/floor/tiled/white,/area/rnd/research)
+"bqB" = (/obj/effect/floor_decal/corner/purple{dir = 9},/obj/machinery/alarm{dir = 4; pixel_x = -22; pixel_y = 0},/turf/simulated/floor/tiled/white,/area/rnd/research)
 "bqC" = (/obj/effect/floor_decal/corner/purple{dir = 6},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/white,/area/rnd/research)
 "bqD" = (/obj/structure/table/glass,/obj/item/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -28},/obj/machinery/camera/network/research{c_tag = "SCI - Break Room"; dir = 4},/turf/simulated/floor/wood,/area/rnd/research)
 "bqE" = (/obj/structure/table/glass,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 5},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 6},/turf/simulated/floor/wood,/area/rnd/research)
@@ -3603,7 +3603,7 @@
 "bro" = (/obj/effect/floor_decal/corner/mauve{dir = 5},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/tiled/white,/area/medical/genetics_cloning)
 "brp" = (/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/tiled/white,/area/medical/genetics_cloning)
 "brq" = (/obj/effect/floor_decal/corner/mauve/full{dir = 1},/obj/machinery/firealarm{dir = 4; pixel_x = 24},/obj/structure/disposalpipe/trunk{dir = 8},/obj/machinery/disposal,/turf/simulated/floor/tiled/white,/area/medical/genetics_cloning)
-"brr" = (/obj/structure/table/standard,/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22},/obj/effect/floor_decal/corner/lime{dir = 9},/obj/machinery/light,/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 4},/turf/simulated/floor/tiled/white,/area/medical/virology)
+"brr" = (/obj/structure/table/standard,/obj/machinery/alarm{dir = 4; pixel_x = -22},/obj/effect/floor_decal/corner/lime{dir = 9},/obj/machinery/light,/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 4},/turf/simulated/floor/tiled/white,/area/medical/virology)
 "brs" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 5},/obj/machinery/atmospherics/pipe/simple/hidden/black{dir = 4},/turf/simulated/floor/tiled/white,/area/medical/virology)
 "brt" = (/obj/machinery/door/window/westright{name = "Virology Isolation Room One"; req_access = list(39)},/obj/machinery/door/firedoor/glass,/obj/effect/floor_decal/corner/lime{dir = 9},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/black{dir = 4},/turf/simulated/floor/tiled/white,/area/medical/virology)
 "bru" = (/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,/obj/machinery/atmospherics/pipe/manifold/hidden/black,/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled/white,/area/medical/virology)
@@ -3697,7 +3697,7 @@
 "bte" = (/obj/effect/floor_decal/corner/mauve{dir = 6},/obj/machinery/light{dir = 4; icon_state = "tube1"; pixel_x = 0},/turf/simulated/floor/tiled/white,/area/medical/genetics_cloning)
 "btf" = (/obj/item/roller,/obj/effect/floor_decal/corner/lime{dir = 6},/obj/item/radio/intercom{name = "Station Intercom (General)"; pixel_y = -21},/turf/simulated/floor/tiled/white,/area/medical/virology)
 "btg" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 1},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled/white,/area/medical/virology)
-"bth" = (/obj/structure/table/glass,/obj/item/storage/fancy/vials,/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/obj/effect/floor_decal/corner/lime/full{dir = 4},/turf/simulated/floor/tiled/white,/area/medical/virology)
+"bth" = (/obj/structure/table/glass,/obj/item/storage/fancy/vials,/obj/machinery/alarm{dir = 8; pixel_x = 24},/obj/effect/floor_decal/corner/lime/full{dir = 4},/turf/simulated/floor/tiled/white,/area/medical/virology)
 "bti" = (/obj/structure/bed/padded,/obj/item/bedsheet/green,/obj/effect/floor_decal/corner/lime/full,/obj/machinery/atmospherics/pipe/simple/hidden/black,/turf/simulated/floor/tiled/white,/area/medical/virology)
 "btj" = (/obj/effect/floor_decal/corner/lime{dir = 10},/obj/structure/extinguisher_cabinet{pixel_x = 5; pixel_y = -32},/turf/simulated/floor/tiled/white,/area/medical/virology)
 "btk" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 5},/obj/machinery/atmospherics/pipe/simple/hidden/black{dir = 5},/turf/simulated/floor/tiled/white,/area/medical/virology)
@@ -3779,7 +3779,7 @@
 "buI" = (/obj/effect/floor_decal/corner/paleblue{dir = 1},/obj/machinery/light{dir = 1},/obj/structure/disposalpipe/segment{dir = 4},/mob/living/simple_mob/animal/passive/cat/runtime,/turf/simulated/floor/tiled/white,/area/crew_quarters/heads/cmo)
 "buJ" = (/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/tiled/white,/area/crew_quarters/heads/cmo)
 "buK" = (/obj/effect/floor_decal/corner/paleblue{dir = 4},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/tiled/white,/area/crew_quarters/heads/cmo)
-"buL" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk{dir = 8},/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/obj/effect/floor_decal/corner/paleblue/full{dir = 1},/turf/simulated/floor/tiled/white,/area/crew_quarters/heads/cmo)
+"buL" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk{dir = 8},/obj/machinery/alarm{dir = 8; pixel_x = 24},/obj/effect/floor_decal/corner/paleblue/full{dir = 1},/turf/simulated/floor/tiled/white,/area/crew_quarters/heads/cmo)
 "buM" = (/obj/machinery/clonepod/full,/obj/effect/floor_decal/corner/mauve/full,/turf/simulated/floor/tiled/white,/area/medical/genetics_cloning)
 "buN" = (/obj/machinery/computer/cloning,/obj/effect/floor_decal/corner/mauve{dir = 10},/obj/machinery/light,/turf/simulated/floor/tiled/white,/area/medical/genetics_cloning)
 "buO" = (/obj/machinery/dna_scannernew,/obj/effect/floor_decal/corner/mauve{dir = 8},/turf/simulated/floor/tiled/white,/area/medical/genetics_cloning)
@@ -3823,7 +3823,7 @@
 "bvA" = (/obj/machinery/light,/obj/effect/floor_decal/industrial/warning{icon_state = "warning"; dir = 4},/turf/simulated/floor/tiled/dark,/area/ai)
 "bvB" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/bluegrid,/area/ai)
 "bvC" = (/obj/machinery/flasher{id = "AI"; pixel_x = 0; pixel_y = -24},/obj/machinery/hologram/holopad,/turf/simulated/floor/bluegrid,/area/ai)
-"bvD" = (/obj/machinery/alarm{dir = 1; icon_state = "alarm0"; pixel_y = -22},/turf/simulated/floor/bluegrid,/area/ai)
+"bvD" = (/obj/machinery/alarm{dir = 1; pixel_y = -22},/turf/simulated/floor/bluegrid,/area/ai)
 "bvE" = (/obj/machinery/light,/obj/effect/floor_decal/industrial/warning{dir = 8},/turf/simulated/floor/tiled/dark,/area/ai)
 "bvF" = (/turf/simulated/wall,/area/medical/reception)
 "bvG" = (/obj/structure/bed/chair{dir = 4},/obj/structure/sign/nosmoking_1{pixel_x = -32},/obj/effect/floor_decal/corner/paleblue{dir = 9},/obj/machinery/atmospherics/unary/vent_pump/on{dir = 4},/turf/simulated/floor/tiled/white,/area/medical/reception)
@@ -3883,7 +3883,7 @@
 "bwI" = (/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled/white,/area/rnd/research)
 "bwJ" = (/obj/item/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 27},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/white,/area/rnd/research)
 "bwK" = (/turf/simulated/wall/r_wall,/area/rnd/research_foyer)
-"bwL" = (/obj/effect/floor_decal/corner/purple/full{dir = 8},/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22; pixel_y = 0},/turf/simulated/floor/tiled,/area/rnd/research_foyer)
+"bwL" = (/obj/effect/floor_decal/corner/purple/full{dir = 8},/obj/machinery/alarm{dir = 4; pixel_x = -22; pixel_y = 0},/turf/simulated/floor/tiled,/area/rnd/research_foyer)
 "bwM" = (/obj/effect/floor_decal/corner/purple{dir = 5},/turf/simulated/floor/tiled,/area/rnd/research_foyer)
 "bwN" = (/obj/effect/floor_decal/corner/purple/full{dir = 1},/obj/machinery/firealarm{dir = 4; layer = 3.3; pixel_x = 26},/obj/machinery/light{dir = 4; icon_state = "tube1"; pixel_x = 0},/turf/simulated/floor/tiled,/area/rnd/research_foyer)
 "bwO" = (/obj/machinery/atm{pixel_x = 0; pixel_y = 32},/obj/structure/sign/directions/science{dir = 8; pixel_x = -32; pixel_z = -8},/obj/structure/sign/directions/security{dir = 1; pixel_x = -32},/obj/structure/sign/directions/evac{dir = 2; pixel_x = -32; pixel_z = 8},/turf/simulated/floor/tiled/dark,/area/hallway/primary/central_four)
@@ -4022,7 +4022,7 @@
 "bzr" = (/obj/machinery/embedded_controller/radio/airlock/access_controller{id_tag = "virology_airlock_control"; name = "Virology Access Console"; pixel_x = 8; pixel_y = -22; tag_exterior_door = "virology_airlock_exterior"; tag_interior_door = "virology_airlock_interior"},/obj/effect/floor_decal/industrial/warning/corner,/obj/effect/floor_decal/corner/lime{dir = 8},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/tiled/white,/area/medical/virology)
 "bzs" = (/obj/effect/floor_decal/industrial/warning,/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 8},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 6},/obj/machinery/atmospherics/pipe/simple/hidden/black,/obj/structure/disposalpipe/junction/yjunction,/turf/simulated/floor/tiled/white,/area/medical/virology)
 "bzt" = (/obj/machinery/button/remote/blast_door{desc = "A remote control-switch for shutters."; id = "virologyquar"; name = "Virology Emergency Lockdown Control"; pixel_x = 0; pixel_y = -28; req_access = list(5)},/obj/effect/floor_decal/industrial/warning/corner{dir = 8},/obj/effect/floor_decal/corner/lime,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/yellow{dir = 6},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/tiled/white,/area/medical/virology)
-"bzu" = (/obj/effect/floor_decal/corner/lime{dir = 10},/obj/machinery/alarm{dir = 1; icon_state = "alarm0"; pixel_y = -22},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/yellow{dir = 4},/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/camera/network/medbay{c_tag = "MED - Virology Hallway"; dir = 1},/turf/simulated/floor/tiled/white,/area/medical/virology)
+"bzu" = (/obj/effect/floor_decal/corner/lime{dir = 10},/obj/machinery/alarm{dir = 1; pixel_y = -22},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/yellow{dir = 4},/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/camera/network/medbay{c_tag = "MED - Virology Hallway"; dir = 1},/turf/simulated/floor/tiled/white,/area/medical/virology)
 "bzv" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/disposalpipe/segment{dir = 4},/obj/effect/floor_decal/corner/lime{dir = 10},/obj/machinery/atmospherics/pipe/manifold/hidden/supply,/turf/simulated/floor/tiled/white,/area/medical/virology)
 "bzw" = (/obj/effect/floor_decal/corner/lime{dir = 8},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/yellow{dir = 4},/obj/structure/disposalpipe/segment{dir = 4},/obj/item/radio/intercom{name = "Station Intercom (General)"; pixel_y = -21},/turf/simulated/floor/tiled/white,/area/medical/virology)
 "bzx" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 9},/obj/machinery/atmospherics/pipe/simple/hidden/yellow{dir = 4},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/tiled/white,/area/medical/virology)
@@ -4030,7 +4030,7 @@
 "bzz" = (/obj/machinery/door/airlock/medical{autoclose = 0; frequency = 1379; icon_state = "door_locked"; id_tag = "virologyq_airlock_interior"; locked = 1; name = "Virology Quarantine Airlock"; req_access = list(39)},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/tiled/white,/area/medical/virology)
 "bzA" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/structure/disposalpipe/segment{dir = 8; icon_state = "pipe-c"},/turf/simulated/floor/tiled/white,/area/medical/virology)
 "bzB" = (/obj/effect/floor_decal/industrial/warning/corner,/obj/machinery/atmospherics/pipe/manifold/hidden/supply,/turf/simulated/floor/tiled/white,/area/medical/virology)
-"bzC" = (/obj/effect/floor_decal/industrial/warning{dir = 6},/obj/structure/closet/secure_closet/personal/patient,/obj/machinery/atmospherics/unary/vent_pump/on{dir = 8},/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/turf/simulated/floor/tiled/white,/area/medical/virology)
+"bzC" = (/obj/effect/floor_decal/industrial/warning{dir = 6},/obj/structure/closet/secure_closet/personal/patient,/obj/machinery/atmospherics/unary/vent_pump/on{dir = 8},/obj/machinery/alarm{dir = 8; pixel_x = 24},/turf/simulated/floor/tiled/white,/area/medical/virology)
 "bzD" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/airless,/area/solar/auxport)
 "bzE" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/machinery/door/firedoor/border_only,/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/maintenance/auxsolarport)
 "bzF" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/maintenance/auxsolarport)
@@ -4042,7 +4042,7 @@
 "bzL" = (/obj/effect/floor_decal/industrial/warning/corner{dir = 8},/obj/machinery/atmospherics/pipe/simple/visible{icon_state = "intact"; dir = 5},/obj/machinery/access_button{command = "cycle_interior"; frequency = 1379; master_tag = "arrivals_airlock"; name = "interior access button"; pixel_x = 25; pixel_y = 25; req_access = list(13)},/turf/simulated/floor,/area/maintenance/research)
 "bzM" = (/obj/machinery/portable_atmospherics/canister/air/airlock,/obj/machinery/atmospherics/portables_connector{dir = 8},/obj/effect/floor_decal/industrial/outline/yellow,/turf/simulated/floor,/area/maintenance/research)
 "bzN" = (/obj/structure/closet/emcloset,/obj/structure/sign/securearea{desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK"; pixel_x = 0; pixel_y = 32},/turf/simulated/floor,/area/maintenance/research)
-"bzO" = (/obj/machinery/power/apc{dir = 2; name = "south bump"; pixel_y = -24},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/machinery/light_switch{pixel_x = 12; pixel_y = -25},/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22; pixel_y = 0},/turf/simulated/floor,/area/maintenance/disposal)
+"bzO" = (/obj/machinery/power/apc{dir = 2; name = "south bump"; pixel_y = -24},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/machinery/light_switch{pixel_x = 12; pixel_y = -25},/obj/machinery/alarm{dir = 4; pixel_x = -22; pixel_y = 0},/turf/simulated/floor,/area/maintenance/disposal)
 "bzP" = (/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/machinery/atmospherics/pipe/simple/hidden/yellow,/turf/simulated/floor,/area/maintenance/disposal)
 "bzQ" = (/obj/item/radio/intercom{name = "Station Intercom (General)"; pixel_x = 0; pixel_y = -21},/obj/machinery/light/small,/obj/effect/decal/cleanable/blood/oil,/turf/simulated/floor/plating,/area/maintenance/disposal)
 "bzR" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/maintenance{name = "Disposal Access"; req_access = list(12)},/turf/simulated/floor/plating,/area/maintenance/disposal)
@@ -4168,7 +4168,7 @@
 "bCh" = (/obj/structure/cable/green{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled/white,/area/rnd/research)
 "bCi" = (/obj/effect/floor_decal/corner/purple{dir = 10},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled/white,/area/rnd/research)
 "bCj" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 1},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled/white,/area/rnd/research)
-"bCk" = (/obj/effect/floor_decal/corner/purple{dir = 10},/obj/machinery/alarm{dir = 1; icon_state = "alarm0"; pixel_y = -22},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled/white,/area/rnd/research)
+"bCk" = (/obj/effect/floor_decal/corner/purple{dir = 10},/obj/machinery/alarm{dir = 1; pixel_y = -22},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled/white,/area/rnd/research)
 "bCl" = (/obj/effect/floor_decal/corner/pink,/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled/white,/area/rnd/research)
 "bCm" = (/obj/effect/floor_decal/corner/pink{dir = 10},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/cable/green{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled/white,/area/rnd/research)
 "bCn" = (/obj/effect/floor_decal/corner/pink{dir = 8},/obj/structure/cable/green{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/machinery/computer/guestpass{pixel_x = 28},/obj/effect/floor_decal/industrial/warning/corner{dir = 4},/turf/simulated/floor/tiled/white,/area/rnd/research)
@@ -4222,7 +4222,7 @@
 "bDj" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/machinery/door/firedoor/border_only,/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/medical/medbay_primary_storage)
 "bDk" = (/obj/machinery/iv_drip,/obj/structure/closet/secure_closet/medical_wall{name = "O- Blood Locker"; pixel_x = -32},/obj/item/reagent_containers/blood/OMinus,/obj/item/reagent_containers/blood/OMinus,/obj/item/reagent_containers/blood/OMinus,/turf/simulated/floor/tiled/white,/area/medical/sleeper)
 "bDl" = (/obj/effect/floor_decal/corner/paleblue{dir = 9},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/tiled/white,/area/medical/sleeper)
-"bDm" = (/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/obj/effect/floor_decal/corner/paleblue{dir = 4},/obj/structure/disposalpipe/segment,/obj/machinery/light{dir = 4; icon_state = "tube1"; pixel_x = 0},/turf/simulated/floor/tiled/white,/area/medical/sleeper)
+"bDm" = (/obj/machinery/alarm{dir = 8; pixel_x = 24},/obj/effect/floor_decal/corner/paleblue{dir = 4},/obj/structure/disposalpipe/segment,/obj/machinery/light{dir = 4; icon_state = "tube1"; pixel_x = 0},/turf/simulated/floor/tiled/white,/area/medical/sleeper)
 "bDn" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/structure/grille,/obj/machinery/door/blast/shutters{density = 0; dir = 2; icon_state = "shutter0"; id = "cmooffice"; name = "CMO Office Privacy Shutters"; opacity = 0},/turf/simulated/floor/plating,/area/crew_quarters/heads/cmo)
 "bDo" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/structure/grille,/obj/machinery/door/blast/shutters{density = 0; dir = 2; icon_state = "shutter0"; id = "cmooffice"; name = "CMO Office Privacy Shutters"; opacity = 0},/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/crew_quarters/heads/cmo)
 "bDp" = (/obj/machinery/power/apc{dir = 1; name = "north bump"; pixel_x = 0; pixel_y = 24},/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/obj/effect/floor_decal/corner/paleblue/full{dir = 8},/obj/structure/sink{icon_state = "sink"; dir = 8; pixel_x = -12; pixel_y = 2},/turf/simulated/floor/tiled,/area/medical/morgue)
@@ -4230,12 +4230,12 @@
 "bDr" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/tiled,/area/medical/morgue)
 "bDs" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 9; pixel_y = 0},/turf/simulated/floor/tiled,/area/medical/morgue)
 "bDt" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 10},/turf/simulated/floor/tiled,/area/medical/morgue)
-"bDu" = (/obj/effect/floor_decal/industrial/warning{dir = 5},/obj/structure/closet/wardrobe/virology_white,/obj/machinery/access_button{command = "cycle_interior"; frequency = 1379; master_tag = "virology_airlock_control"; name = "Virology Access Button"; pixel_x = 8; pixel_y = 28; req_access = list(39)},/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22},/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 4},/turf/simulated/floor/tiled/white,/area/medical/virology)
+"bDu" = (/obj/effect/floor_decal/industrial/warning{dir = 5},/obj/structure/closet/wardrobe/virology_white,/obj/machinery/access_button{command = "cycle_interior"; frequency = 1379; master_tag = "virology_airlock_control"; name = "Virology Access Button"; pixel_x = 8; pixel_y = 28; req_access = list(39)},/obj/machinery/alarm{dir = 4; pixel_x = -22},/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 4},/turf/simulated/floor/tiled/white,/area/medical/virology)
 "bDv" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/black{dir = 9},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled/white,/area/medical/virology)
 "bDw" = (/obj/effect/floor_decal/industrial/warning{dir = 10},/obj/machinery/shower{dir = 8; icon_state = "shower"; pixel_x = -5; pixel_y = 0},/obj/structure/window/reinforced,/obj/machinery/atmospherics/pipe/simple/hidden/yellow,/turf/simulated/floor/tiled/steel,/area/medical/virology)
 "bDx" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/maintenance/auxsolarport)
 "bDy" = (/obj/structure/cable/yellow,/obj/machinery/power/solar_control{id = "auxsolareast"; name = "Fore Port Solar Control"; track = 0},/turf/simulated/floor,/area/maintenance/auxsolarport)
-"bDz" = (/obj/item/stool,/obj/machinery/alarm{dir = 1; icon_state = "alarm0"; pixel_y = -22},/obj/item/stack/cable_coil/yellow,/obj/item/stack/cable_coil/yellow,/turf/simulated/floor,/area/maintenance/auxsolarport)
+"bDz" = (/obj/item/stool,/obj/machinery/alarm{dir = 1; pixel_y = -22},/obj/item/stack/cable_coil/yellow,/obj/item/stack/cable_coil/yellow,/turf/simulated/floor,/area/maintenance/auxsolarport)
 "bDA" = (/obj/structure/cable,/obj/machinery/power/apc{dir = 2; name = "south bump"; pixel_y = -24},/obj/machinery/camera/network/engineering{c_tag = "ENG - Solar Fore Port"; dir = 1},/turf/simulated/floor,/area/maintenance/auxsolarport)
 "bDB" = (/obj/machinery/camera/network/engineering{c_tag = "ENG - Solar Fore Port Access"; dir = 4},/obj/effect/floor_decal/industrial/warning/corner{dir = 1},/turf/simulated/floor,/area/maintenance/research)
 "bDC" = (/obj/machinery/light/small,/turf/simulated/floor,/area/maintenance/research)
@@ -4284,7 +4284,7 @@
 "bEt" = (/obj/machinery/chem_master,/turf/simulated/floor/tiled/freezer,/area/crew_quarters/kitchen)
 "bEu" = (/obj/machinery/door/airlock/maintenance{name = "Kitchen Maintenance"; req_access = list(28)},/obj/machinery/door/firedoor,/obj/structure/disposalpipe/segment,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor,/area/crew_quarters/kitchen)
 "bEv" = (/obj/structure/plasticflaps{opacity = 1},/obj/machinery/navbeacon/delivery/south{location = "Kitchen"},/obj/machinery/door/firedoor/border_only,/obj/effect/floor_decal/industrial/loading,/turf/simulated/floor/tiled,/area/crew_quarters/kitchen)
-"bEw" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 4},/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22; pixel_y = 0},/turf/simulated/floor/tiled,/area/hallway/primary/central_two)
+"bEw" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 4},/obj/machinery/alarm{dir = 4; pixel_x = -22; pixel_y = 0},/turf/simulated/floor/tiled,/area/hallway/primary/central_two)
 "bEx" = (/obj/machinery/light{icon_state = "tube1"; dir = 4},/obj/structure/sign/directions/medical{dir = 4; pixel_x = 32; pixel_y = 0},/obj/structure/sign/directions/cargo{dir = 2; pixel_x = 32; pixel_z = 8},/obj/structure/sign/directions/engineering{dir = 2; pixel_x = 32; pixel_z = -8},/turf/simulated/floor/tiled/dark,/area/hallway/primary/central_two)
 "bEy" = (/obj/structure/bed/chair{dir = 4},/obj/effect/landmark/start{name = "Medical Doctor"},/obj/effect/floor_decal/corner/paleblue{dir = 8},/obj/machinery/light{dir = 8},/turf/simulated/floor/tiled/white,/area/medical/reception)
 "bEz" = (/obj/effect/floor_decal/corner/paleblue{dir = 4},/obj/structure/disposalpipe/segment{dir = 1; icon_state = "pipe-c"},/turf/simulated/floor/tiled/white,/area/medical/reception)
@@ -4309,7 +4309,7 @@
 "bES" = (/obj/machinery/portable_atmospherics/canister/oxygen,/obj/machinery/atmospherics/portables_connector,/obj/effect/floor_decal/industrial/hatch/yellow,/turf/simulated/floor/tiled,/area/medical/sleeper)
 "bET" = (/obj/machinery/atmospherics/unary/freezer{dir = 2; icon_state = "freezer"},/obj/effect/floor_decal/industrial/outline/yellow,/turf/simulated/floor/tiled,/area/medical/sleeper)
 "bEU" = (/obj/machinery/atmospherics/unary/cryo_cell,/obj/effect/floor_decal/industrial/outline/yellow,/turf/simulated/floor/tiled,/area/medical/sleeper)
-"bEV" = (/obj/structure/table/steel,/obj/item/storage/box/bodybags,/obj/effect/floor_decal/corner/paleblue/full{dir = 8},/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22},/obj/item/storage/box/bodybags,/turf/simulated/floor/tiled,/area/medical/morgue)
+"bEV" = (/obj/structure/table/steel,/obj/item/storage/box/bodybags,/obj/effect/floor_decal/corner/paleblue/full{dir = 8},/obj/machinery/alarm{dir = 4; pixel_x = -22},/obj/item/storage/box/bodybags,/turf/simulated/floor/tiled,/area/medical/morgue)
 "bEW" = (/obj/structure/table/steel,/obj/item/paper_bin,/obj/item/pen/blue{pixel_x = 3; pixel_y = -5},/obj/item/pen/red{pixel_x = -1; pixel_y = -9},/obj/effect/floor_decal/corner/paleblue{dir = 5},/obj/item/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/turf/simulated/floor/tiled,/area/medical/morgue)
 "bEX" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/effect/floor_decal/corner/paleblue{dir = 1},/turf/simulated/floor/tiled,/area/medical/morgue)
 "bEY" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled,/area/medical/morgue)
@@ -4370,7 +4370,7 @@
 "bGb" = (/obj/structure/closet/chefcloset,/obj/item/glass_jar,/obj/effect/floor_decal/corner/grey/diagonal{dir = 4},/obj/item/retail_scanner/civilian,/obj/item/soap/nanotrasen,/obj/item/destTagger{pixel_x = 4; pixel_y = 3},/obj/item/packageWrap,/obj/item/packageWrap,/obj/item/packageWrap,/obj/machinery/firealarm{dir = 8; pixel_x = -24},/turf/simulated/floor/tiled/white,/area/crew_quarters/kitchen)
 "bGc" = (/obj/effect/floor_decal/corner/grey/diagonal{dir = 4},/obj/machinery/light{dir = 1},/turf/simulated/floor/tiled/white,/area/crew_quarters/kitchen)
 "bGd" = (/obj/effect/floor_decal/corner/grey/diagonal{dir = 4},/obj/structure/closet/secure_closet/freezer/meat,/turf/simulated/floor/tiled/white,/area/crew_quarters/kitchen)
-"bGe" = (/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22; pixel_y = 0},/turf/simulated/floor/tiled/freezer,/area/crew_quarters/kitchen)
+"bGe" = (/obj/machinery/alarm{dir = 4; pixel_x = -22; pixel_y = 0},/turf/simulated/floor/tiled/freezer,/area/crew_quarters/kitchen)
 "bGf" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 4},/turf/simulated/floor/tiled/freezer,/area/crew_quarters/kitchen)
 "bGg" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/tiled/freezer,/area/crew_quarters/kitchen)
 "bGh" = (/obj/structure/disposalpipe/segment{dir = 4; icon_state = "pipe-c"},/obj/machinery/firealarm{dir = 2; pixel_y = 24},/obj/structure/cable/green{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 6},/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 1},/turf/simulated/floor/tiled/freezer,/area/crew_quarters/kitchen)
@@ -4442,7 +4442,7 @@
 "bHv" = (/obj/effect/floor_decal/corner/blue{dir = 9},/obj/effect/floor_decal/industrial/hatch/yellow,/obj/machinery/door/window/southleft{base_state = "left"; dir = 2; icon_state = "left"; name = "Command Delivery"; req_access = list(19)},/turf/simulated/floor/tiled,/area/bridge_hallway)
 "bHw" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/tiled,/area/bridge_hallway)
 "bHx" = (/obj/effect/floor_decal/corner/blue{dir = 6},/obj/structure/table/standard,/obj/item/storage/box/cups,/turf/simulated/floor/tiled,/area/bridge_hallway)
-"bHy" = (/obj/machinery/cell_charger,/obj/structure/table/steel,/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22; pixel_y = 0},/turf/simulated/floor/plating,/area/maintenance/substation/command)
+"bHy" = (/obj/machinery/cell_charger,/obj/structure/table/steel,/obj/machinery/alarm{dir = 4; pixel_x = -22; pixel_y = 0},/turf/simulated/floor/plating,/area/maintenance/substation/command)
 "bHz" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/effect/floor_decal/industrial/warning{icon_state = "warning"; dir = 4},/turf/simulated/floor,/area/maintenance/substation/command)
 "bHA" = (/obj/machinery/power/breakerbox/activated{RCon_tag = "Command Substation Bypass"},/turf/simulated/floor,/area/maintenance/substation/command)
 "bHB" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/disposalpipe/segment{dir = 4; icon_state = "pipe-c"},/turf/simulated/floor,/area/maintenance/central)
@@ -4454,7 +4454,7 @@
 "bHH" = (/obj/machinery/smartfridge,/turf/simulated/wall,/area/hydroponics)
 "bHI" = (/obj/effect/floor_decal/corner/grey/diagonal{dir = 4},/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 4},/turf/simulated/floor/tiled/white,/area/crew_quarters/kitchen)
 "bHJ" = (/obj/effect/floor_decal/corner/grey/diagonal{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 6},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 10},/turf/simulated/floor/tiled/white,/area/crew_quarters/kitchen)
-"bHK" = (/obj/effect/floor_decal/corner/grey/diagonal{dir = 4},/obj/structure/closet/secure_closet/freezer/kitchen,/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/obj/machinery/atmospherics/unary/vent_pump/on{dir = 8},/turf/simulated/floor/tiled/white,/area/crew_quarters/kitchen)
+"bHK" = (/obj/effect/floor_decal/corner/grey/diagonal{dir = 4},/obj/structure/closet/secure_closet/freezer/kitchen,/obj/machinery/alarm{dir = 8; pixel_x = 24},/obj/machinery/atmospherics/unary/vent_pump/on{dir = 8},/turf/simulated/floor/tiled/white,/area/crew_quarters/kitchen)
 "bHL" = (/obj/structure/closet/crate/freezer,/turf/simulated/floor/tiled/freezer,/area/crew_quarters/kitchen)
 "bHM" = (/obj/structure/closet/secure_closet/freezer/meat,/obj/machinery/atmospherics/unary/vent_pump/on{dir = 4},/obj/machinery/light,/turf/simulated/floor/tiled/freezer,/area/crew_quarters/kitchen)
 "bHN" = (/obj/machinery/camera/network/civilian{c_tag = "CIV - Kitchen Cold Room"; dir = 1},/obj/item/radio/intercom{name = "Station Intercom (General)"; pixel_y = -21},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/tiled/freezer,/area/crew_quarters/kitchen)
@@ -4470,7 +4470,7 @@
 "bHX" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled/white,/area/medical/sleeper)
 "bHY" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled/white,/area/medical/sleeper)
 "bHZ" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 1},/obj/effect/floor_decal/corner/paleblue{dir = 10},/turf/simulated/floor/tiled/white,/area/medical/sleeper)
-"bIa" = (/obj/machinery/alarm{dir = 1; icon_state = "alarm0"; pixel_y = -22},/obj/effect/floor_decal/corner/paleblue{dir = 10},/turf/simulated/floor/tiled/white,/area/medical/sleeper)
+"bIa" = (/obj/machinery/alarm{dir = 1; pixel_y = -22},/obj/effect/floor_decal/corner/paleblue{dir = 10},/turf/simulated/floor/tiled/white,/area/medical/sleeper)
 "bIb" = (/obj/effect/floor_decal/corner/paleblue{dir = 10},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/tiled/white,/area/medical/sleeper)
 "bIc" = (/obj/effect/floor_decal/corner/paleblue{dir = 8},/turf/simulated/floor/tiled/white,/area/medical/sleeper)
 "bId" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/white,/area/medical/sleeper)
@@ -4499,7 +4499,7 @@
 "bIA" = (/obj/structure/table/standard,/obj/structure/table/standard,/obj/item/stack/cable_coil,/obj/item/multitool,/obj/machinery/cell_charger,/obj/item/cell/high,/obj/item/cell/high,/obj/machinery/sparker{id = "Xenobio"; pixel_x = -25},/turf/simulated/floor/reinforced,/area/rnd/misc_lab)
 "bIB" = (/obj/machinery/atmospherics/pipe/simple/visible{icon_state = "intact"; dir = 5},/turf/simulated/floor/reinforced,/area/rnd/misc_lab)
 "bIC" = (/obj/machinery/atmospherics/unary/outlet_injector{dir = 8; frequency = 1441; icon_state = "map_injector"; id = "n2_in"; use_power = 1},/turf/simulated/floor/reinforced,/area/rnd/misc_lab)
-"bID" = (/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22; pixel_y = 0},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/white,/area/rnd/research)
+"bID" = (/obj/machinery/alarm{dir = 4; pixel_x = -22; pixel_y = 0},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/white,/area/rnd/research)
 "bIE" = (/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 8},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled/white,/area/rnd/research)
 "bIF" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 8},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled/white,/area/rnd/research)
 "bIG" = (/obj/structure/grille,/obj/machinery/door/firedoor/border_only,/obj/structure/window/reinforced/polarized{dir = 8},/obj/structure/window/reinforced/polarized,/obj/structure/window/reinforced/polarized{dir = 4},/turf/simulated/floor/plating,/area/rnd/rdoffice)
@@ -4670,7 +4670,7 @@
 "bLP" = (/turf/simulated/shuttle/wall,/area/shuttle/mining/station)
 "bLQ" = (/obj/structure/shuttle/window,/obj/structure/grille,/turf/simulated/shuttle/plating,/area/shuttle/mining/station)
 "bLR" = (/obj/structure/closet/crate,/obj/item/multitool,/obj/item/multitool,/obj/item/assembly/prox_sensor,/obj/item/flashlight,/obj/item/storage/backpack,/obj/machinery/atmospherics/pipe/simple/hidden/yellow,/obj/random/maintenance/cargo,/obj/random/maintenance/cargo,/turf/simulated/floor/plating,/area/maintenance/research)
-"bLS" = (/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22},/obj/structure/reagent_dispensers/watertank,/turf/simulated/floor,/area/maintenance/research)
+"bLS" = (/obj/machinery/alarm{dir = 4; pixel_x = -22},/obj/structure/reagent_dispensers/watertank,/turf/simulated/floor,/area/maintenance/research)
 "bLT" = (/obj/effect/floor_decal/corner/purple/full{dir = 8},/obj/machinery/vending/cigarette,/turf/simulated/floor/tiled/white,/area/rnd/research)
 "bLU" = (/obj/effect/floor_decal/corner/purple{dir = 1},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/white,/area/rnd/research)
 "bLV" = (/obj/structure/filingcabinet/chestdrawer,/obj/effect/floor_decal/corner/purple{dir = 9},/turf/simulated/floor/tiled/white,/area/rnd/rdoffice)
@@ -4769,7 +4769,7 @@
 "bNK" = (/obj/structure/table/reinforced,/obj/machinery/light{dir = 4; icon_state = "tube1"; pixel_x = 0},/turf/simulated/shuttle/floor,/area/shuttle/mining/station)
 "bNL" = (/turf/simulated/mineral/floor/ignore_mapgen,/area/quartermaster/miningdock)
 "bNM" = (/obj/machinery/atmospherics/pipe/simple/hidden/yellow,/turf/simulated/floor,/area/maintenance/research)
-"bNN" = (/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/turf/simulated/floor,/area/maintenance/research)
+"bNN" = (/obj/machinery/alarm{dir = 8; pixel_x = 24},/turf/simulated/floor,/area/maintenance/research)
 "bNO" = (/obj/effect/decal/cleanable/dirt,/obj/machinery/atmospherics/pipe/simple/hidden/yellow{dir = 6},/turf/simulated/floor/plating,/area/maintenance/research)
 "bNP" = (/obj/machinery/atmospherics/pipe/simple/hidden/yellow{dir = 4},/obj/structure/disposalpipe/segment{dir = 4; icon_state = "pipe-c"},/obj/effect/floor_decal/industrial/warning{icon_state = "warning"; dir = 4},/turf/simulated/floor,/area/maintenance/research)
 "bNQ" = (/obj/machinery/door/blast/regular{density = 0; icon_state = "pdoor0"; id = "Biohazard"; name = "Biohazard Shutter"; opacity = 0},/obj/machinery/atmospherics/pipe/simple/hidden/yellow{dir = 4},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor,/area/maintenance/research)
@@ -4818,7 +4818,7 @@
 "bOH" = (/obj/structure/table/marble,/obj/effect/floor_decal/corner/grey/diagonal{dir = 4},/obj/item/storage/box/donkpockets{pixel_x = 3; pixel_y = 3},/obj/item/reagent_containers/glass/beaker{pixel_x = 5},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/tiled/white,/area/crew_quarters/kitchen)
 "bOI" = (/obj/structure/table/marble,/obj/effect/floor_decal/corner/grey/diagonal{dir = 4},/obj/item/material/knife/butch,/obj/item/material/kitchen/rollingpin,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/white,/area/crew_quarters/kitchen)
 "bOJ" = (/obj/effect/floor_decal/corner/grey/diagonal{dir = 4},/obj/machinery/appliance/mixer/cereal,/obj/machinery/camera/network/civilian{c_tag = "CIV - Kitchen Starboard"; dir = 8},/turf/simulated/floor/tiled/white,/area/crew_quarters/kitchen)
-"bOK" = (/obj/item/stack/material/phoron,/obj/item/stack/material/phoron,/obj/item/stack/material/phoron,/obj/item/stack/material/phoron,/obj/item/stack/material/phoron,/obj/structure/table/reinforced,/obj/machinery/button/remote/blast_door{id = "chemcounter"; name = "Pharmacy Counter Lockdown Control"; pixel_y = 14},/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22},/obj/effect/floor_decal/corner/beige{dir = 9},/turf/simulated/floor/tiled/white,/area/medical/chemistry)
+"bOK" = (/obj/item/stack/material/phoron,/obj/item/stack/material/phoron,/obj/item/stack/material/phoron,/obj/item/stack/material/phoron,/obj/item/stack/material/phoron,/obj/structure/table/reinforced,/obj/machinery/button/remote/blast_door{id = "chemcounter"; name = "Pharmacy Counter Lockdown Control"; pixel_y = 14},/obj/machinery/alarm{dir = 4; pixel_x = -22},/obj/effect/floor_decal/corner/beige{dir = 9},/turf/simulated/floor/tiled/white,/area/medical/chemistry)
 "bOL" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 6},/turf/simulated/floor/tiled/white,/area/medical/chemistry)
 "bOM" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/disposalpipe/segment{dir = 4; icon_state = "pipe-c"},/turf/simulated/floor/tiled/white,/area/medical/chemistry)
 "bON" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 5},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/hologram/holopad,/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/tiled/white,/area/medical/chemistry)
@@ -4895,7 +4895,7 @@
 "bQg" = (/obj/effect/floor_decal/industrial/outline/yellow,/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/tiled,/area/hallway/primary/central_four)
 "bQh" = (/obj/machinery/door/airlock/command{name = "Head of Personnel"; req_access = list(57)},/obj/machinery/door/firedoor/border_only,/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/tiled,/area/crew_quarters/heads/hop)
 "bQi" = (/obj/structure/extinguisher_cabinet{pixel_x = 5; pixel_y = -32},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/tiled,/area/crew_quarters/heads/hop)
-"bQj" = (/obj/effect/floor_decal/corner/blue{dir = 10},/obj/machinery/alarm{dir = 1; icon_state = "alarm0"; pixel_y = -22},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/tiled,/area/crew_quarters/heads/hop)
+"bQj" = (/obj/effect/floor_decal/corner/blue{dir = 10},/obj/machinery/alarm{dir = 1; pixel_y = -22},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/tiled,/area/crew_quarters/heads/hop)
 "bQk" = (/obj/effect/floor_decal/corner/blue{dir = 10},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/tiled,/area/crew_quarters/heads/hop)
 "bQl" = (/obj/effect/floor_decal/corner/blue{dir = 10},/obj/machinery/camera/network/command{c_tag = "COM - HoP's Office"; dir = 1},/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/light,/turf/simulated/floor/tiled,/area/crew_quarters/heads/hop)
 "bQm" = (/obj/effect/floor_decal/corner/blue{dir = 8},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/tiled,/area/crew_quarters/heads/hop)
@@ -4927,7 +4927,7 @@
 "bQM" = (/obj/effect/floor_decal/corner/grey/diagonal{dir = 4},/obj/structure/cable/green{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor/tiled/white,/area/crew_quarters/kitchen)
 "bQN" = (/obj/machinery/vending/dinnerware,/obj/effect/floor_decal/corner/grey/diagonal{dir = 4},/turf/simulated/floor/tiled/white,/area/crew_quarters/kitchen)
 "bQO" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/crew_quarters/kitchen)
-"bQP" = (/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/obj/structure/flora/pottedplant{icon_state = "plant-22"},/turf/simulated/floor/tiled/dark,/area/hallway/primary/central_two)
+"bQP" = (/obj/machinery/alarm{dir = 8; pixel_x = 24},/obj/structure/flora/pottedplant{icon_state = "plant-22"},/turf/simulated/floor/tiled/dark,/area/hallway/primary/central_two)
 "bQQ" = (/obj/machinery/chem_master,/obj/effect/floor_decal/corner/beige{dir = 9},/obj/machinery/light{dir = 8},/turf/simulated/floor/tiled/white,/area/medical/chemistry)
 "bQR" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 1},/turf/simulated/floor/tiled/white,/area/medical/chemistry)
 "bQS" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk{dir = 1},/turf/simulated/floor/tiled/white,/area/medical/chemistry)
@@ -4944,7 +4944,7 @@
 "bRd" = (/obj/structure/bed/chair/comfy/brown{dir = 1},/obj/item/radio/intercom{broadcasting = 0; canhear_range = 5; dir = 8; frequency = 1487; icon_state = "intercom"; listening = 0; name = "Station Intercom (Medbay)"; pixel_x = -21; pixel_y = 0},/turf/simulated/floor/carpet/blue,/area/medical/psych)
 "bRe" = (/obj/structure/table/woodentable,/turf/simulated/floor/carpet/blue,/area/medical/psych)
 "bRf" = (/obj/structure/bed/chair/office/dark{dir = 1},/obj/machinery/light_switch{pixel_x = -25; pixel_y = 8},/obj/machinery/button/windowtint{id = "psyco_tint"; pixel_x = -25},/obj/machinery/button/remote/airlock{desc = "A remote control-switch for the office door."; id = "mentaldoor"; name = "office door control"; pixel_x = -34; pixel_y = 7},/obj/machinery/firealarm{dir = 4; pixel_x = 24},/obj/effect/landmark/start{name = "Psychiatrist"},/turf/simulated/floor/carpet/blue,/area/medical/psych)
-"bRg" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 4},/obj/effect/floor_decal/corner/pink{dir = 9},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22; pixel_y = 0},/turf/simulated/floor/tiled/white,/area/medical/patient_wing)
+"bRg" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 4},/obj/effect/floor_decal/corner/pink{dir = 9},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/alarm{dir = 4; pixel_x = -22; pixel_y = 0},/turf/simulated/floor/tiled/white,/area/medical/patient_wing)
 "bRh" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 4},/obj/effect/floor_decal/corner/pink{dir = 6},/obj/machinery/light{dir = 4; icon_state = "tube1"; pixel_x = 0},/turf/simulated/floor/tiled/white,/area/medical/patient_wing)
 "bRi" = (/turf/simulated/wall,/area/medical/patient_b)
 "bRj" = (/turf/simulated/wall,/area/medical/biostorage)
@@ -4980,7 +4980,7 @@
 "bRN" = (/obj/effect/floor_decal/industrial/warning{icon_state = "warning"; dir = 1},/turf/simulated/floor/tiled/white,/area/assembly/robotics)
 "bRO" = (/obj/effect/floor_decal/industrial/warning{icon_state = "warning"; dir = 5},/turf/simulated/floor/tiled/white,/area/assembly/robotics)
 "bRP" = (/obj/structure/table/standard,/obj/machinery/light{dir = 4; icon_state = "tube1"},/obj/machinery/firealarm{dir = 4; pixel_x = 24},/obj/machinery/camera/network/research{c_tag = "SCI - Robotics Starboard"; dir = 8},/obj/item/defib_kit/jumper_kit/loaded,/obj/item/defib_kit/jumper_kit/loaded,/turf/simulated/floor/tiled,/area/assembly/robotics)
-"bRQ" = (/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled,/area/hallway/primary/central_four)
+"bRQ" = (/obj/machinery/alarm{dir = 8; pixel_x = 24},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled,/area/hallway/primary/central_four)
 "bRR" = (/obj/machinery/door/airlock/command{name = "Head of Personnel"; req_access = list(57)},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/wood,/area/crew_quarters/heads/hop)
 "bRS" = (/obj/effect/floor_decal/corner/blue{dir = 9},/obj/machinery/power/apc{dir = 8; name = "west bump"; pixel_x = -24},/obj/structure/cable/green{d2 = 4; icon_state = "0-4"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled,/area/bridge_hallway)
 "bRT" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/effect/floor_decal/corner/blue,/obj/structure/cable/green{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor/tiled,/area/bridge_hallway)
@@ -4990,7 +4990,7 @@
 "bRX" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 8},/turf/simulated/floor/carpet,/area/crew_quarters/captain)
 "bRY" = (/obj/structure/displaycase,/turf/simulated/floor/carpet,/area/crew_quarters/captain)
 "bRZ" = (/obj/structure/sink{icon_state = "sink"; dir = 8; pixel_x = -12; pixel_y = 2},/obj/structure/mirror{pixel_x = -28},/turf/simulated/floor/tiled/freezer,/area/crew_quarters/captain)
-"bSa" = (/obj/structure/table/standard,/obj/machinery/light,/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/turf/simulated/floor/tiled/freezer,/area/crew_quarters/captain)
+"bSa" = (/obj/structure/table/standard,/obj/machinery/light,/obj/machinery/alarm{dir = 8; pixel_x = 24},/turf/simulated/floor/tiled/freezer,/area/crew_quarters/captain)
 "bSb" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 8},/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 8},/obj/structure/disposalpipe/segment,/turf/simulated/floor,/area/maintenance/central)
 "bSc" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/maintenance{name = "Bar Maintenance"; req_access = list(25)},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor,/area/crew_quarters/bar)
 "bSd" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/wood,/area/crew_quarters/bar)
@@ -5021,7 +5021,7 @@
 "bSC" = (/obj/structure/cable/green{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor/tiled/white,/area/medical/medbay_emt_bay)
 "bSD" = (/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/table/rack,/obj/machinery/door/window/westleft{name = "EVA Suit Storage"; req_access = list(5)},/obj/item/clothing/mask/breath,/obj/item/clothing/head/helmet/space/void/medical,/obj/item/clothing/shoes/magboots,/obj/item/clothing/suit/space/void/medical,/obj/item/tank/oxygen,/obj/machinery/light{dir = 4; icon_state = "tube1"; pixel_x = 0},/turf/simulated/floor/tiled/dark,/area/medical/medbay_emt_bay)
 "bSE" = (/obj/structure/table/woodentable,/obj/item/paper_bin,/obj/item/pen,/obj/item/toy/plushie/therapy/blue,/turf/simulated/floor/carpet/blue,/area/medical/psych)
-"bSF" = (/obj/machinery/alarm{dir = 1; icon_state = "alarm0"; pixel_y = -22},/turf/simulated/floor/carpet/blue,/area/medical/psych)
+"bSF" = (/obj/machinery/alarm{dir = 1; pixel_y = -22},/turf/simulated/floor/carpet/blue,/area/medical/psych)
 "bSG" = (/obj/machinery/camera/network/medbay{c_tag = "MED - Mental Health"; dir = 1},/obj/machinery/light,/turf/simulated/floor/carpet/blue,/area/medical/psych)
 "bSH" = (/obj/machinery/vending/wallmed1{name = "NanoMed Wall"; pixel_x = 25; pixel_y = 0},/turf/simulated/floor/carpet/blue,/area/medical/psych)
 "bSI" = (/turf/simulated/wall,/area/medical/patient_c)
@@ -5046,7 +5046,7 @@
 "bTb" = (/obj/structure/cable/green{d2 = 4; icon_state = "0-4"},/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/obj/structure/cable/green,/obj/machinery/power/sensor{name = "Powernet Sensor - Medbay Subgrid"; name_tag = "Medbay Subgrid"},/turf/simulated/floor,/area/maintenance/substation/medical)
 "bTc" = (/obj/machinery/power/smes/buildable{charge = 0; RCon_tag = "Substation - Medical"},/obj/structure/cable/green{d2 = 8; icon_state = "0-8"},/obj/structure/cable/green{d2 = 4; icon_state = "0-4"},/turf/simulated/floor,/area/maintenance/substation/medical)
 "bTd" = (/obj/machinery/power/breakerbox/activated{RCon_tag = "Medical Substation Bypass"},/turf/simulated/floor,/area/maintenance/substation/medical)
-"bTe" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 4},/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled,/area/hallway/secondary/escape/medical_escape_pod_hallway)
+"bTe" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 4},/obj/machinery/alarm{dir = 4; pixel_x = -22},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled,/area/hallway/secondary/escape/medical_escape_pod_hallway)
 "bTf" = (/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/yellow,/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled,/area/hallway/secondary/escape/medical_escape_pod_hallway)
 "bTg" = (/obj/machinery/door/airlock/external{frequency = 1380; icon_state = "door_locked"; id_tag = "mining_shuttle_hatch"; locked = 1; name = "Shuttle Hatch"; req_access = list(13)},/turf/simulated/floor,/area/shuttle/mining/station)
 "bTh" = (/obj/structure/table/standard,/obj/item/hand_labeler,/obj/effect/floor_decal/corner/green/full{dir = 8},/obj/machinery/alarm{pixel_y = 22},/obj/machinery/light{dir = 1},/turf/simulated/floor/tiled/white,/area/rnd/xenobiology/xenoflora_storage)
@@ -5081,7 +5081,7 @@
 "bTK" = (/obj/structure/table/woodentable,/obj/item/retail_scanner/command{icon_state = "retail_idle"; dir = 4},/turf/simulated/floor/wood,/area/bridge/meeting_room)
 "bTL" = (/obj/machinery/power/apc{dir = 4; name = "east bump"; pixel_x = 24},/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/obj/structure/table/woodentable,/obj/machinery/photocopier/faxmachine{department = "Bridge"},/obj/machinery/light_switch{pixel_x = 36; pixel_y = 0},/turf/simulated/floor/wood,/area/bridge/meeting_room)
 "bTM" = (/obj/effect/floor_decal/corner/blue{dir = 9},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 8},/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/simulated/floor/tiled,/area/bridge_hallway)
-"bTN" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/effect/floor_decal/corner/blue{dir = 6},/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 8},/turf/simulated/floor/tiled,/area/bridge_hallway)
+"bTN" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/effect/floor_decal/corner/blue{dir = 6},/obj/machinery/alarm{dir = 8; pixel_x = 24},/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 8},/turf/simulated/floor/tiled,/area/bridge_hallway)
 "bTO" = (/turf/simulated/wall/r_wall,/area/bridge_hallway)
 "bTP" = (/obj/machinery/door/airlock/command{name = "Colony Director's Quarters"; req_access = list(20)},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/door/firedoor,/turf/simulated/floor/carpet,/area/crew_quarters/captain)
 "bTQ" = (/obj/structure/table/woodentable,/obj/machinery/reagentgrinder,/obj/item/reagent_containers/food/drinks/shaker,/obj/item/packageWrap,/obj/item/radio/intercom{broadcasting = 0; name = "Station Intercom (General)"; pixel_y = -22},/turf/simulated/floor/wood,/area/crew_quarters/bar)
@@ -5128,7 +5128,7 @@
 "bUF" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 5},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 9},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/dark,/area/medical/biostorage)
 "bUG" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 8},/turf/simulated/floor/tiled/dark,/area/medical/biostorage)
 "bUH" = (/turf/simulated/floor/tiled/dark,/area/medical/biostorage)
-"bUI" = (/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/turf/simulated/floor/tiled/dark,/area/medical/biostorage)
+"bUI" = (/obj/machinery/alarm{dir = 8; pixel_x = 24},/turf/simulated/floor/tiled/dark,/area/medical/biostorage)
 "bUJ" = (/obj/machinery/light/small{dir = 8},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 6},/obj/machinery/meter,/obj/structure/disposalpipe/segment,/turf/simulated/floor,/area/maintenance/medbay_aft)
 "bUK" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 9},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor,/area/maintenance/medbay_aft)
 "bUL" = (/obj/structure/cable/green,/obj/machinery/power/apc{dir = 8; name = "west bump"; pixel_x = -24},/turf/simulated/floor,/area/maintenance/substation/medical)
@@ -5198,7 +5198,7 @@
 "bVX" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/firedoor/border_only,/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/hallway/primary/central_two)
 "bVY" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/blast/shutters{density = 0; dir = 2; icon_state = "shutter0"; id = "chemwindow"; name = "Chemistry Window Shutters"; opacity = 0},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/medical/chemistry)
 "bVZ" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/blast/shutters{density = 0; dir = 2; icon_state = "shutter0"; id = "chemwindow"; name = "Chemistry Window Shutters"; opacity = 0},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/medical/chemistry)
-"bWa" = (/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22},/obj/item/radio/intercom{broadcasting = 0; canhear_range = 5; dir = 2; frequency = 1487; icon_state = "intercom"; listening = 0; name = "Station Intercom (Medbay)"; pixel_x = 0; pixel_y = -21},/obj/structure/closet/secure_closet/medical1,/turf/simulated/floor/tiled/white,/area/medical/medbay_emt_bay)
+"bWa" = (/obj/machinery/alarm{dir = 4; pixel_x = -22},/obj/item/radio/intercom{broadcasting = 0; canhear_range = 5; dir = 2; frequency = 1487; icon_state = "intercom"; listening = 0; name = "Station Intercom (Medbay)"; pixel_x = 0; pixel_y = -21},/obj/structure/closet/secure_closet/medical1,/turf/simulated/floor/tiled/white,/area/medical/medbay_emt_bay)
 "bWb" = (/obj/effect/floor_decal/corner/pink{dir = 9},/turf/simulated/floor/tiled/white,/area/medical/medbay_emt_bay)
 "bWc" = (/obj/effect/floor_decal/corner/pink{dir = 6},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/white,/area/medical/medbay_emt_bay)
 "bWd" = (/obj/structure/table/rack,/obj/item/tool/crowbar,/obj/item/tool/crowbar,/obj/item/storage/toolbox/mechanical,/obj/item/roller,/obj/item/roller,/obj/item/roller,/obj/structure/sign/poster{pixel_x = 0; pixel_y = -32},/obj/item/radio{frequency = 1487; icon_state = "med_walkietalkie"; name = "Medbay Emergency Radio Link"},/obj/item/radio{frequency = 1487; icon_state = "med_walkietalkie"; name = "Medbay Emergency Radio Link"},/turf/simulated/floor/tiled/white,/area/medical/medbay_emt_bay)
@@ -5220,7 +5220,7 @@
 "bWt" = (/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 4},/obj/machinery/meter,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor,/area/maintenance/medbay_aft)
 "bWu" = (/obj/machinery/door/airlock/engineering{name = "Medbay Substation"; req_one_access = list(11,24,5)},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/door/firedoor,/turf/simulated/floor,/area/maintenance/substation/medical)
 "bWv" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor,/area/maintenance/substation/medical)
-"bWw" = (/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/machinery/light/small,/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/turf/simulated/floor,/area/maintenance/substation/medical)
+"bWw" = (/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/machinery/light/small,/obj/machinery/alarm{dir = 8; pixel_x = 24},/turf/simulated/floor,/area/maintenance/substation/medical)
 "bWx" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 4},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/camera/network/medbay{c_tag = "MED - Escape Pod Access"; dir = 4},/obj/effect/floor_decal/industrial/warning/corner{icon_state = "warningcorner"; dir = 8},/turf/simulated/floor/tiled,/area/hallway/secondary/escape/medical_escape_pod_hallway)
 "bWy" = (/obj/structure/sign/pods{dir = 1; pixel_x = 32},/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/yellow,/obj/structure/disposalpipe/segment,/obj/effect/floor_decal/industrial/warning/corner,/turf/simulated/floor/tiled,/area/hallway/secondary/escape/medical_escape_pod_hallway)
 "bWz" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/quartermaster/miningdock)
@@ -5439,7 +5439,7 @@
 "caE" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 9; pixel_y = 0},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 10},/turf/simulated/floor/tiled/white,/area/medical/patient_d)
 "caF" = (/obj/machinery/hologram/holopad,/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled/white,/area/medical/patient_d)
 "caG" = (/obj/machinery/power/apc{dir = 4; name = "east bump"; pixel_x = 24},/obj/structure/bed/chair/office/light,/obj/structure/cable/green{d2 = 8; icon_state = "0-8"},/obj/effect/floor_decal/corner/pink{dir = 6},/obj/machinery/camera/network/medbay{c_tag = "MED - Patient Room D"; dir = 8},/turf/simulated/floor/tiled/white,/area/medical/patient_d)
-"caH" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/disposalpipe/segment,/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22; pixel_y = 0},/turf/simulated/floor,/area/maintenance/medbay_aft)
+"caH" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/disposalpipe/segment,/obj/machinery/alarm{dir = 4; pixel_x = -22; pixel_y = 0},/turf/simulated/floor,/area/maintenance/medbay_aft)
 "caI" = (/obj/machinery/atmospherics/pipe/simple/hidden/cyan{dir = 5; icon_state = "intact"},/obj/machinery/light/small,/turf/simulated/floor,/area/maintenance/medbay_aft)
 "caJ" = (/obj/machinery/meter,/obj/effect/floor_decal/industrial/warning{dir = 10},/obj/machinery/atmospherics/pipe/manifold/hidden/cyan,/obj/structure/door_assembly/door_assembly_com,/turf/simulated/floor/plating,/area/maintenance/medbay_aft)
 "caK" = (/obj/machinery/atmospherics/pipe/tank/air{dir = 8},/obj/effect/floor_decal/industrial/warning,/turf/simulated/floor/plating,/area/maintenance/medbay_aft)
@@ -5478,7 +5478,7 @@
 "cbr" = (/obj/structure/extinguisher_cabinet{pixel_x = 5; pixel_y = -32},/turf/simulated/floor/wood,/area/bridge/meeting_room)
 "cbs" = (/obj/machinery/ai_status_display{pixel_y = -32},/obj/machinery/light,/turf/simulated/floor/wood,/area/bridge/meeting_room)
 "cbt" = (/obj/machinery/firealarm{dir = 1; pixel_x = 0; pixel_y = -26},/turf/simulated/floor/wood,/area/bridge/meeting_room)
-"cbu" = (/obj/machinery/alarm{dir = 1; icon_state = "alarm0"; pixel_y = -22},/obj/machinery/photocopier,/turf/simulated/floor/wood,/area/bridge/meeting_room)
+"cbu" = (/obj/machinery/alarm{dir = 1; pixel_y = -22},/obj/machinery/photocopier,/turf/simulated/floor/wood,/area/bridge/meeting_room)
 "cbv" = (/turf/simulated/wall/r_wall,/area/bridge)
 "cbw" = (/obj/machinery/door/airlock/glass_command{name = "Bridge Hallway"; req_access = list(19)},/obj/machinery/door/firedoor/glass,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled,/area/bridge)
 "cbx" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/door/airlock/glass_command{name = "Bridge Hallway"; req_access = list(19)},/obj/machinery/door/firedoor/glass,/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled,/area/bridge)
@@ -5486,7 +5486,7 @@
 "cbz" = (/obj/structure/cable/green{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/disposalpipe/segment{dir = 4; icon_state = "pipe-c"},/turf/simulated/floor/wood,/area/crew_quarters/captain)
 "cbA" = (/obj/machinery/power/apc{dir = 2; name = "south bump"; pixel_y = -24},/obj/machinery/light_switch{pixel_x = 12; pixel_y = -24},/obj/structure/cable/green{d2 = 8; icon_state = "0-8"},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/wood,/area/crew_quarters/captain)
 "cbB" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/camera/network/command{c_tag = "COM - Captain's Office"; dir = 1},/turf/simulated/floor/wood,/area/crew_quarters/captain)
-"cbC" = (/obj/machinery/alarm{dir = 1; icon_state = "alarm0"; pixel_y = -22},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/wood,/area/crew_quarters/captain)
+"cbC" = (/obj/machinery/alarm{dir = 1; pixel_y = -22},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/wood,/area/crew_quarters/captain)
 "cbD" = (/obj/structure/disposalpipe/segment{dir = 2; icon_state = "pipe-c"},/turf/simulated/floor/wood,/area/crew_quarters/captain)
 "cbE" = (/obj/item/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 21},/turf/simulated/floor/wood,/area/crew_quarters/captain)
 "cbF" = (/obj/structure/table/reinforced,/obj/item/book/manual/barman_recipes,/obj/item/clothing/head/that{pixel_x = 4; pixel_y = 6},/obj/item/tool/screwdriver,/obj/item/flame/lighter/zippo,/obj/machinery/light_switch{pixel_x = -36; pixel_y = 0},/obj/machinery/button/remote/blast_door{id = "bar"; name = "Bar Shutters"; pixel_x = -26; pixel_y = 0},/turf/simulated/floor/lino,/area/crew_quarters/bar)
@@ -5551,7 +5551,7 @@
 "ccM" = (/obj/structure/table/standard,/obj/item/reagent_containers/food/condiment/small/saltshaker{pixel_x = -3; pixel_y = 0},/obj/item/reagent_containers/food/condiment/small/peppermill{pixel_x = 3},/obj/machinery/camera/network/civilian{c_tag = "CIV - Cafeteria Aft"; dir = 1},/obj/machinery/firealarm{dir = 1; pixel_x = 0; pixel_y = -25},/turf/simulated/floor/tiled,/area/crew_quarters/cafeteria)
 "ccN" = (/obj/structure/table/standard,/obj/machinery/computer/security/telescreen/entertainment{icon_state = "frame"; pixel_x = 0; pixel_y = -32},/obj/machinery/light,/obj/item/book/codex/lore/vir,/turf/simulated/floor/tiled/neutral,/area/crew_quarters/cafeteria)
 "ccO" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled/neutral,/area/crew_quarters/cafeteria)
-"ccP" = (/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/obj/machinery/newscaster{pixel_x = 0; pixel_y = -28},/turf/simulated/floor/tiled,/area/crew_quarters/cafeteria)
+"ccP" = (/obj/machinery/alarm{dir = 8; pixel_x = 24},/obj/machinery/newscaster{pixel_x = 0; pixel_y = -28},/turf/simulated/floor/tiled,/area/crew_quarters/cafeteria)
 "ccQ" = (/obj/machinery/light{dir = 8},/obj/effect/floor_decal/corner/pink{dir = 9},/turf/simulated/floor/tiled,/area/hallway/secondary/medical_emergency_hallway)
 "ccR" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/effect/floor_decal/corner/pink{dir = 6},/obj/structure/extinguisher_cabinet{pixel_x = 25},/turf/simulated/floor/tiled,/area/hallway/secondary/medical_emergency_hallway)
 "ccS" = (/obj/effect/decal/cleanable/vomit,/obj/item/stool/padded,/obj/machinery/light/small{dir = 4; pixel_y = 0},/turf/simulated/floor,/area/maintenance/medbay_aft)
@@ -5595,7 +5595,7 @@
 "cdE" = (/obj/machinery/light{dir = 8},/turf/simulated/floor/tiled/dark,/area/hallway/primary/central_three)
 "cdF" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled/dark,/area/hallway/primary/central_three)
 "cdG" = (/turf/simulated/floor/tiled/dark,/area/hallway/primary/central_three)
-"cdH" = (/obj/structure/disposalpipe/segment,/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22; pixel_y = 0},/obj/machinery/camera/network/civilian{c_tag = "CIV - Bar Aft Port"; dir = 4},/turf/simulated/floor/wood,/area/crew_quarters/bar)
+"cdH" = (/obj/structure/disposalpipe/segment,/obj/machinery/alarm{dir = 4; pixel_x = -22; pixel_y = 0},/obj/machinery/camera/network/civilian{c_tag = "CIV - Bar Aft Port"; dir = 4},/turf/simulated/floor/wood,/area/crew_quarters/bar)
 "cdI" = (/obj/machinery/hologram/holopad,/turf/simulated/floor/wood,/area/crew_quarters/bar)
 "cdJ" = (/obj/machinery/atmospherics/unary/vent_pump/on,/turf/simulated/floor/wood,/area/crew_quarters/bar)
 "cdK" = (/obj/structure/disposalpipe/segment,/turf/simulated/floor/wood,/area/crew_quarters/bar)
@@ -5694,7 +5694,7 @@
 "cfz" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/cable/green{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor,/area/maintenance/substation/research)
 "cfA" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/effect/floor_decal/industrial/warning/corner,/obj/machinery/alarm{pixel_y = 23},/turf/simulated/floor,/area/maintenance/substation/research)
 "cfB" = (/obj/structure/cable/green{d2 = 8; icon_state = "0-8"},/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/obj/machinery/power/sensor{name = "Powernet Sensor - Research Subgrid"; name_tag = "Research Subgrid"},/obj/effect/floor_decal/industrial/warning,/turf/simulated/floor,/area/maintenance/substation/research)
-"cfC" = (/obj/structure/cable/green{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22},/obj/structure/disposalpipe/segment{dir = 4; icon_state = "pipe-c"},/turf/simulated/floor/tiled,/area/hallway/primary/central_four)
+"cfC" = (/obj/structure/cable/green{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/machinery/alarm{dir = 4; pixel_x = -22},/obj/structure/disposalpipe/segment{dir = 4; icon_state = "pipe-c"},/turf/simulated/floor/tiled,/area/hallway/primary/central_four)
 "cfD" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/tiled,/area/hallway/primary/central_four)
 "cfE" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/hologram/holopad,/obj/structure/disposalpipe/sortjunction{dir = 8; icon_state = "pipe-j1s"; sortType = "HoP Office"; name = "HoP Office"},/turf/simulated/floor/tiled,/area/hallway/primary/central_four)
 "cfF" = (/obj/machinery/door/firedoor/glass,/obj/effect/floor_decal/industrial/warning{icon_state = "warning"; dir = 4},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/tiled,/area/hallway/primary/central_four)
@@ -5784,7 +5784,7 @@
 "chl" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/effect/floor_decal/corner/blue{dir = 8},/turf/simulated/floor/tiled,/area/bridge)
 "chm" = (/obj/structure/cable/green{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/structure/bed/chair,/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled,/area/bridge)
 "chn" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 1},/turf/simulated/floor/tiled,/area/bridge)
-"cho" = (/obj/effect/floor_decal/corner/blue,/obj/structure/cable/green{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/turf/simulated/floor/tiled,/area/bridge)
+"cho" = (/obj/effect/floor_decal/corner/blue,/obj/structure/cable/green{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/machinery/alarm{dir = 8; pixel_x = 24},/turf/simulated/floor/tiled,/area/bridge)
 "chp" = (/obj/machinery/door/firedoor/border_only,/obj/effect/floor_decal/industrial/warning{dir = 8},/turf/simulated/floor/tiled,/area/hallway/primary/central_three)
 "chq" = (/obj/structure/disposalpipe/sortjunction{dir = 1; icon_state = "pipe-j1s"; name = "Bar"; sortType = "Bar"},/turf/simulated/floor/tiled,/area/hallway/primary/central_three)
 "chr" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment{dir = 8; icon_state = "pipe-c"},/turf/simulated/floor/tiled,/area/hallway/primary/central_three)
@@ -5828,7 +5828,7 @@
 "cid" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/tiled,/area/quartermaster/miningdock)
 "cie" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 8},/obj/effect/landmark/start{name = "Shaft Miner"},/turf/simulated/floor/tiled,/area/quartermaster/miningdock)
 "cif" = (/obj/effect/floor_decal/corner/brown,/turf/simulated/floor/tiled,/area/quartermaster/miningdock)
-"cig" = (/obj/item/pickaxe{pixel_x = 5},/obj/item/shovel{pixel_x = -5},/obj/structure/table/rack{dir = 1},/obj/effect/floor_decal/corner/brown/full{dir = 4},/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/obj/machinery/ai_status_display{pixel_y = -32},/turf/simulated/floor/tiled,/area/quartermaster/miningdock)
+"cig" = (/obj/item/pickaxe{pixel_x = 5},/obj/item/shovel{pixel_x = -5},/obj/structure/table/rack{dir = 1},/obj/effect/floor_decal/corner/brown/full{dir = 4},/obj/machinery/alarm{dir = 8; pixel_x = 24},/obj/machinery/ai_status_display{pixel_y = -32},/turf/simulated/floor/tiled,/area/quartermaster/miningdock)
 "cih" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/maintenance{name = "Delivery Office Maintenance"; req_access = list(50)},/obj/structure/disposalpipe/segment,/turf/simulated/floor,/area/quartermaster/delivery)
 "cii" = (/turf/simulated/wall,/area/quartermaster/delivery)
 "cij" = (/obj/structure/disposalpipe/segment,/turf/simulated/wall,/area/quartermaster/delivery)
@@ -5862,7 +5862,7 @@
 "ciL" = (/obj/structure/table/reinforced,/obj/item/paper_bin,/obj/item/folder/red,/obj/item/folder/blue,/obj/item/pen,/obj/structure/window/reinforced{dir = 8},/obj/effect/floor_decal/corner/blue/full,/obj/machinery/light,/turf/simulated/floor/tiled,/area/bridge)
 "ciM" = (/obj/structure/table/reinforced,/obj/item/storage/firstaid/regular,/obj/effect/floor_decal/corner/blue{dir = 10},/turf/simulated/floor/tiled,/area/bridge)
 "ciN" = (/obj/structure/table/reinforced,/obj/item/storage/box/donut,/obj/effect/floor_decal/corner/blue/full{dir = 4},/obj/machinery/keycard_auth{pixel_x = 0; pixel_y = -24},/turf/simulated/floor/tiled,/area/bridge)
-"ciO" = (/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22; pixel_y = 0},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled,/area/hallway/primary/central_three)
+"ciO" = (/obj/machinery/alarm{dir = 4; pixel_x = -22; pixel_y = 0},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled,/area/hallway/primary/central_three)
 "ciP" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled,/area/hallway/primary/central_three)
 "ciQ" = (/obj/machinery/light{icon_state = "tube1"; dir = 4},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled,/area/hallway/primary/central_three)
 "ciR" = (/turf/simulated/wall,/area/hallway/primary/central_three)
@@ -6014,7 +6014,7 @@
 "clH" = (/obj/effect/floor_decal/corner/brown,/obj/machinery/firealarm{dir = 1; pixel_x = 0; pixel_y = -26},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 5},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/tiled,/area/quartermaster/miningdock)
 "clI" = (/obj/effect/floor_decal/corner/brown{dir = 8},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/tiled,/area/quartermaster/miningdock)
 "clJ" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 4},/obj/structure/disposalpipe/segment{dir = 8; icon_state = "pipe-c"},/turf/simulated/floor/tiled,/area/quartermaster/miningdock)
-"clK" = (/obj/effect/floor_decal/corner/brown{dir = 8},/obj/machinery/alarm{dir = 1; icon_state = "alarm0"; pixel_y = -22},/obj/machinery/atmospherics/unary/vent_pump/on{dir = 1},/turf/simulated/floor/tiled,/area/quartermaster/miningdock)
+"clK" = (/obj/effect/floor_decal/corner/brown{dir = 8},/obj/machinery/alarm{dir = 1; pixel_y = -22},/obj/machinery/atmospherics/unary/vent_pump/on{dir = 1},/turf/simulated/floor/tiled,/area/quartermaster/miningdock)
 "clL" = (/obj/machinery/door/airlock/glass_mining{name = "Delivery Office"; req_access = list(50)},/obj/machinery/door/firedoor/glass,/turf/simulated/floor/tiled,/area/quartermaster/delivery)
 "clM" = (/turf/simulated/floor/tiled,/area/quartermaster/delivery)
 "clN" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled,/area/quartermaster/delivery)
@@ -6341,7 +6341,7 @@
 "crW" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable/green{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled,/area/hallway/primary/port)
 "crX" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled,/area/hallway/primary/port)
 "crY" = (/obj/structure/cable/green{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor/tiled,/area/hallway/primary/port)
-"crZ" = (/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/turf/simulated/floor/tiled/dark,/area/hallway/primary/port)
+"crZ" = (/obj/machinery/alarm{dir = 8; pixel_x = 24},/turf/simulated/floor/tiled/dark,/area/hallway/primary/port)
 "csa" = (/obj/machinery/light{dir = 8},/obj/machinery/camera/network/civilian{c_tag = "CIV - Residential Elevator Port"; dir = 4},/turf/simulated/floor/tiled,/area/crew_quarters/sleep/elevator)
 "csb" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 6},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 6},/turf/simulated/floor/tiled,/area/crew_quarters/sleep/elevator)
 "csc" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 9},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/computer/cryopod/dorms{pixel_y = -30},/turf/simulated/floor/tiled,/area/crew_quarters/sleep/elevator)
@@ -6489,7 +6489,7 @@
 "cuO" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/vacant/vacant_shop)
 "cuP" = (/obj/item/tool/crowbar,/turf/simulated/floor/tiled,/area/vacant/vacant_shop)
 "cuQ" = (/obj/machinery/alarm{dir = 8; pixel_x = 25; pixel_y = 0},/turf/simulated/floor/tiled,/area/vacant/vacant_shop)
-"cuR" = (/obj/structure/table/marble,/obj/item/reagent_containers/food/drinks/cup{pixel_x = 8; pixel_y = 8},/obj/item/reagent_containers/food/drinks/cup{pixel_x = -4; pixel_y = 8},/obj/item/reagent_containers/food/drinks/cup{pixel_x = 8; pixel_y = -4},/obj/item/reagent_containers/food/drinks/cup{pixel_x = -4; pixel_y = -4},/obj/item/reagent_containers/food/drinks/cup{pixel_x = 8},/obj/item/reagent_containers/food/drinks/cup{pixel_x = -4},/obj/item/reagent_containers/food/drinks/cup{pixel_x = 8; pixel_y = 12},/obj/item/reagent_containers/food/drinks/cup{pixel_x = -4; pixel_y = 12},/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22},/turf/simulated/floor/tiled/yellow,/area/crew_quarters/coffee_shop)
+"cuR" = (/obj/structure/table/marble,/obj/item/reagent_containers/food/drinks/cup{pixel_x = 8; pixel_y = 8},/obj/item/reagent_containers/food/drinks/cup{pixel_x = -4; pixel_y = 8},/obj/item/reagent_containers/food/drinks/cup{pixel_x = 8; pixel_y = -4},/obj/item/reagent_containers/food/drinks/cup{pixel_x = -4; pixel_y = -4},/obj/item/reagent_containers/food/drinks/cup{pixel_x = 8},/obj/item/reagent_containers/food/drinks/cup{pixel_x = -4},/obj/item/reagent_containers/food/drinks/cup{pixel_x = 8; pixel_y = 12},/obj/item/reagent_containers/food/drinks/cup{pixel_x = -4; pixel_y = 12},/obj/machinery/alarm{dir = 4; pixel_x = -22},/turf/simulated/floor/tiled/yellow,/area/crew_quarters/coffee_shop)
 "cuS" = (/obj/structure/table/marble,/obj/item/reagent_containers/food/drinks/glass2/square{pixel_x = 8; pixel_y = 8},/obj/item/reagent_containers/food/drinks/glass2/square{pixel_x = 0; pixel_y = 8},/obj/item/reagent_containers/food/drinks/glass2/square{pixel_x = -8; pixel_y = 8},/obj/item/reagent_containers/food/drinks/glass2/square{pixel_x = 8; pixel_y = 4},/obj/item/reagent_containers/food/drinks/glass2/square{pixel_x = 0; pixel_y = 4},/obj/item/reagent_containers/food/drinks/glass2/square{pixel_x = -8; pixel_y = 4},/obj/machinery/camera/network/civilian{c_tag = "CIV - Cafe Back Room"; dir = 2},/turf/simulated/floor/tiled/yellow,/area/crew_quarters/coffee_shop)
 "cuT" = (/obj/structure/table/marble,/obj/machinery/chemical_dispenser/bar_coffee/full,/obj/machinery/light{dir = 1},/turf/simulated/floor/tiled/yellow,/area/crew_quarters/coffee_shop)
 "cuU" = (/obj/structure/sink/kitchen{pixel_y = 28},/obj/machinery/button/remote/blast_door{id = "coffeeshop"; name = "Cafe Shutters"; pixel_x = 26; pixel_y = 0},/obj/machinery/light_switch{pixel_x = 34; pixel_y = 4},/obj/machinery/button/windowtint{id = "coffee"; pixel_x = 34; pixel_y = -4},/turf/simulated/floor/tiled/yellow,/area/crew_quarters/coffee_shop)
@@ -6536,7 +6536,7 @@
 "cvJ" = (/obj/effect/floor_decal/corner/brown{dir = 10},/obj/machinery/ai_status_display{pixel_y = -32},/turf/simulated/floor/tiled,/area/hallway/secondary/cargo_hallway)
 "cvK" = (/obj/machinery/light,/turf/simulated/floor/tiled,/area/hallway/secondary/cargo_hallway)
 "cvL" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 1},/obj/machinery/camera/network/northern_star{c_tag = "Hall - Cargo Hallway Mid"; dir = 1},/turf/simulated/floor/tiled,/area/hallway/secondary/cargo_hallway)
-"cvM" = (/obj/machinery/alarm{dir = 1; icon_state = "alarm0"; pixel_y = -22},/turf/simulated/floor/tiled,/area/hallway/secondary/cargo_hallway)
+"cvM" = (/obj/machinery/alarm{dir = 1; pixel_y = -22},/turf/simulated/floor/tiled,/area/hallway/secondary/cargo_hallway)
 "cvN" = (/obj/effect/floor_decal/corner/brown{dir = 10},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/machinery/power/apc{dir = 2; name = "south bump"; pixel_y = -24},/turf/simulated/floor/tiled,/area/hallway/secondary/cargo_hallway)
 "cvO" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/turf/simulated/floor/tiled,/area/hallway/secondary/cargo_hallway)
 "cvP" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 1},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/turf/simulated/floor/tiled,/area/hallway/secondary/cargo_hallway)
@@ -6588,26 +6588,26 @@
 "cwJ" = (/obj/machinery/vending/cigarette,/turf/simulated/floor/tiled,/area/crew_quarters/locker)
 "cwK" = (/obj/structure/closet/secure_closet/personal,/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_5)
 "cwL" = (/obj/structure/bed/double/padded,/obj/item/bedsheet/browndouble,/obj/machinery/newscaster{pixel_x = 0; pixel_y = 32},/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_5)
-"cwM" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 4},/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22; pixel_y = 0},/turf/simulated/floor/tiled/white,/area/crew_quarters/sleep/vistor_room_5)
+"cwM" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 4},/obj/machinery/alarm{dir = 4; pixel_x = -22; pixel_y = 0},/turf/simulated/floor/tiled/white,/area/crew_quarters/sleep/vistor_room_5)
 "cwN" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 10},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 6},/turf/simulated/floor/tiled/white,/area/crew_quarters/sleep/vistor_room_5)
 "cwO" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 8},/obj/structure/mirror{pixel_x = 28},/obj/structure/sink{dir = 4; icon_state = "sink"; pixel_x = 11; pixel_y = 0},/turf/simulated/floor/tiled/white,/area/crew_quarters/sleep/vistor_room_5)
 "cwP" = (/obj/effect/floor_decal/corner/white{dir = 8},/obj/effect/floor_decal/corner/blue{dir = 1},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled,/area/crew_quarters/visitor_lodging)
 "cwQ" = (/obj/effect/floor_decal/corner/white{dir = 4},/obj/effect/floor_decal/corner/blue,/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled,/area/crew_quarters/visitor_lodging)
 "cwR" = (/obj/structure/sink{icon_state = "sink"; dir = 8; pixel_x = -12; pixel_y = 2},/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 4},/obj/structure/mirror{pixel_x = -28},/turf/simulated/floor/tiled/white,/area/crew_quarters/sleep/vistor_room_6)
 "cwS" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 6},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 10},/turf/simulated/floor/tiled/white,/area/crew_quarters/sleep/vistor_room_6)
-"cwT" = (/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/obj/machinery/atmospherics/unary/vent_pump/on{dir = 8},/turf/simulated/floor/tiled/white,/area/crew_quarters/sleep/vistor_room_6)
+"cwT" = (/obj/machinery/alarm{dir = 8; pixel_x = 24},/obj/machinery/atmospherics/unary/vent_pump/on{dir = 8},/turf/simulated/floor/tiled/white,/area/crew_quarters/sleep/vistor_room_6)
 "cwU" = (/obj/structure/closet/secure_closet/personal,/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_6)
 "cwV" = (/obj/machinery/newscaster{pixel_x = 0; pixel_y = 32},/obj/structure/bed/double/padded,/obj/item/bedsheet/browndouble,/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_6)
 "cwW" = (/obj/structure/closet/secure_closet/personal,/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_11)
 "cwX" = (/obj/machinery/newscaster{pixel_x = 0; pixel_y = 32},/obj/structure/bed/double/padded,/obj/item/bedsheet/browndouble,/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_11)
-"cwY" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 4},/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22; pixel_y = 0},/turf/simulated/floor/tiled/white,/area/crew_quarters/sleep/vistor_room_11)
+"cwY" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 4},/obj/machinery/alarm{dir = 4; pixel_x = -22; pixel_y = 0},/turf/simulated/floor/tiled/white,/area/crew_quarters/sleep/vistor_room_11)
 "cwZ" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 10},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 6},/turf/simulated/floor/tiled/white,/area/crew_quarters/sleep/vistor_room_11)
 "cxa" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 8},/obj/structure/mirror{pixel_x = 28},/obj/structure/sink{dir = 4; icon_state = "sink"; pixel_x = 11; pixel_y = 0},/turf/simulated/floor/tiled/white,/area/crew_quarters/sleep/vistor_room_11)
 "cxb" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/effect/floor_decal/corner/white{dir = 8},/obj/effect/floor_decal/corner/blue{dir = 1},/turf/simulated/floor/tiled,/area/crew_quarters/visitor_lodging)
 "cxc" = (/obj/effect/floor_decal/corner/white{dir = 4},/obj/effect/floor_decal/corner/blue,/turf/simulated/floor/tiled,/area/crew_quarters/visitor_lodging)
 "cxd" = (/obj/structure/sink{icon_state = "sink"; dir = 8; pixel_x = -12; pixel_y = 2},/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 4},/obj/structure/mirror{pixel_x = -28},/turf/simulated/floor/tiled/white,/area/crew_quarters/sleep/vistor_room_12)
 "cxe" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 6},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 10},/turf/simulated/floor/tiled/white,/area/crew_quarters/sleep/vistor_room_12)
-"cxf" = (/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/obj/machinery/atmospherics/unary/vent_pump/on{dir = 8},/turf/simulated/floor/tiled/white,/area/crew_quarters/sleep/vistor_room_12)
+"cxf" = (/obj/machinery/alarm{dir = 8; pixel_x = 24},/obj/machinery/atmospherics/unary/vent_pump/on{dir = 8},/turf/simulated/floor/tiled/white,/area/crew_quarters/sleep/vistor_room_12)
 "cxg" = (/obj/structure/closet/secure_closet/personal,/obj/item/clothing/head/kitty,/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_12)
 "cxh" = (/obj/machinery/newscaster{pixel_x = 0; pixel_y = 32},/obj/structure/bed/double/padded,/obj/item/bedsheet/browndouble,/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_12)
 "cxi" = (/turf/simulated/wall,/area/quartermaster/storage)
@@ -6637,7 +6637,7 @@
 "cxG" = (/turf/simulated/shuttle/wall/dark/hard_corner,/area/crew_quarters/sleep/elevator)
 "cxH" = (/obj/machinery/light{icon_state = "tube1"; dir = 4},/turf/simulated/floor/tiled/dark,/area/crew_quarters/sleep/elevator)
 "cxI" = (/obj/machinery/camera/network/northern_star{c_tag = "HALL - Dock Hallway Fore"; dir = 4},/obj/item/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -21},/turf/simulated/floor/tiled,/area/hallway/secondary/docking_hallway)
-"cxJ" = (/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/turf/simulated/floor/tiled,/area/hallway/secondary/docking_hallway)
+"cxJ" = (/obj/machinery/alarm{dir = 8; pixel_x = 24},/turf/simulated/floor/tiled,/area/hallway/secondary/docking_hallway)
 "cxK" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/vacant/vacant_shop)
 "cxL" = (/obj/item/frame/light,/turf/simulated/floor/tiled,/area/vacant/vacant_shop)
 "cxM" = (/obj/structure/table/marble,/obj/item/hand_labeler,/obj/item/reagent_containers/food/condiment/small/sugar,/obj/item/reagent_containers/food/drinks/britcup,/obj/item/reagent_containers/food/drinks/britcup,/obj/machinery/firealarm{dir = 8; pixel_x = -24},/obj/item/reagent_containers/food/drinks/teapot,/turf/simulated/floor/tiled/yellow,/area/crew_quarters/coffee_shop)
@@ -6695,7 +6695,7 @@
 "cyM" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/door/airlock/maintenance{req_access = list(12)},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor,/area/maintenance/engineering)
 "cyN" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/hallway/primary/port)
 "cyO" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/dark,/area/hallway/primary/port)
-"cyP" = (/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22},/turf/simulated/floor/tiled/dark,/area/crew_quarters/sleep/elevator)
+"cyP" = (/obj/machinery/alarm{dir = 4; pixel_x = -22},/turf/simulated/floor/tiled/dark,/area/crew_quarters/sleep/elevator)
 "cyQ" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 5},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 5},/turf/simulated/floor/tiled/dark,/area/crew_quarters/sleep/elevator)
 "cyR" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 1},/turf/simulated/floor/tiled/dark,/area/crew_quarters/sleep/elevator)
 "cyS" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/tiled/dark,/area/crew_quarters/sleep/elevator)
@@ -6763,12 +6763,12 @@
 "cAc" = (/obj/structure/reagent_dispensers/watertank,/turf/simulated/floor,/area/maintenance/apmaint)
 "cAd" = (/obj/structure/table/rack,/obj/random/maintenance/cargo,/obj/random/maintenance/cargo,/obj/random/maintenance/cargo,/turf/simulated/floor,/area/maintenance/apmaint)
 "cAe" = (/turf/simulated/wall,/area/maintenance/apmaint)
-"cAf" = (/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22},/obj/machinery/light{dir = 1},/turf/simulated/floor/tiled/dark,/area/hallway/secondary/engineering_hallway)
+"cAf" = (/obj/machinery/alarm{dir = 4; pixel_x = -22},/obj/machinery/light{dir = 1},/turf/simulated/floor/tiled/dark,/area/hallway/secondary/engineering_hallway)
 "cAg" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/effect/floor_decal/corner/yellow{dir = 9},/turf/simulated/floor/tiled,/area/hallway/secondary/engineering_hallway)
 "cAh" = (/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 8},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/tiled,/area/hallway/secondary/engineering_hallway)
 "cAi" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 8},/obj/effect/floor_decal/corner/yellow{dir = 6},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled,/area/hallway/secondary/engineering_hallway)
 "cAj" = (/obj/machinery/newscaster{pixel_x = 28; pixel_y = 0},/turf/simulated/floor/tiled/dark,/area/hallway/secondary/engineering_hallway)
-"cAk" = (/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22; pixel_y = 0},/turf/simulated/floor,/area/maintenance/engineering)
+"cAk" = (/obj/machinery/alarm{dir = 4; pixel_x = -22; pixel_y = 0},/turf/simulated/floor,/area/maintenance/engineering)
 "cAl" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor,/area/maintenance/engineering)
 "cAm" = (/turf/simulated/wall/r_wall,/area/ai_monitored/storage/eva)
 "cAn" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/obj/structure/sign/securearea,/obj/machinery/door/firedoor/border_only,/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/ai_monitored/storage/eva)
@@ -6852,7 +6852,7 @@
 "cBN" = (/obj/structure/cable/green{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor/tiled,/area/quartermaster/qm)
 "cBO" = (/obj/machinery/computer/security/mining,/turf/simulated/floor/tiled,/area/quartermaster/qm)
 "cBP" = (/turf/simulated/floor,/area/maintenance/apmaint)
-"cBQ" = (/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22; pixel_y = 0},/obj/structure/table/rack,/obj/random/maintenance/cargo,/obj/random/maintenance/engineering,/obj/random/maintenance/cargo,/turf/simulated/floor,/area/maintenance/apmaint)
+"cBQ" = (/obj/machinery/alarm{dir = 4; pixel_x = -22; pixel_y = 0},/obj/structure/table/rack,/obj/random/maintenance/cargo,/obj/random/maintenance/engineering,/obj/random/maintenance/cargo,/turf/simulated/floor,/area/maintenance/apmaint)
 "cBR" = (/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 6},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 6},/turf/simulated/floor,/area/maintenance/apmaint)
 "cBS" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/turf/simulated/floor,/area/maintenance/apmaint)
 "cBT" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/machinery/light/small{dir = 1},/turf/simulated/floor,/area/maintenance/apmaint)
@@ -6869,7 +6869,7 @@
 "cCe" = (/turf/simulated/floor/tiled/dark,/area/ai_monitored/storage/eva)
 "cCf" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/camera/network/command{c_tag = "EVA - Fore"},/turf/simulated/floor/tiled/dark,/area/ai_monitored/storage/eva)
 "cCg" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/dark,/area/ai_monitored/storage/eva)
-"cCh" = (/obj/effect/floor_decal/industrial/warning{icon_state = "warning"; dir = 4},/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/turf/simulated/floor/tiled,/area/ai_monitored/storage/eva)
+"cCh" = (/obj/effect/floor_decal/industrial/warning{icon_state = "warning"; dir = 4},/obj/machinery/alarm{dir = 8; pixel_x = 24},/turf/simulated/floor/tiled,/area/ai_monitored/storage/eva)
 "cCi" = (/turf/simulated/wall,/area/maintenance/evahallway)
 "cCj" = (/obj/machinery/door/airlock/maintenance{req_access = list(12)},/obj/machinery/door/firedoor/border_only,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor,/area/maintenance/evahallway)
 "cCk" = (/obj/machinery/door/airlock/maintenance{req_one_access = list(11,24)},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor,/area/vacant/vacant_shop)
@@ -6994,7 +6994,7 @@
 "cEz" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/grille,/obj/machinery/door/firedoor/border_only,/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/quartermaster/qm)
 "cEA" = (/obj/structure/closet,/obj/item/storage/backpack/dufflebag,/turf/simulated/floor/tiled,/area/quartermaster/qm)
 "cEB" = (/obj/structure/closet/secure_closet/quartermaster,/turf/simulated/floor/tiled,/area/quartermaster/qm)
-"cEC" = (/obj/structure/table/standard,/obj/item/coin/silver{pixel_x = -3; pixel_y = 3},/obj/item/coin/silver,/obj/machinery/alarm{dir = 1; icon_state = "alarm0"; pixel_y = -22},/obj/machinery/light,/turf/simulated/floor/tiled,/area/quartermaster/qm)
+"cEC" = (/obj/structure/table/standard,/obj/item/coin/silver{pixel_x = -3; pixel_y = 3},/obj/item/coin/silver,/obj/machinery/alarm{dir = 1; pixel_y = -22},/obj/machinery/light,/turf/simulated/floor/tiled,/area/quartermaster/qm)
 "cED" = (/obj/structure/table/standard,/obj/item/cartridge/quartermaster{pixel_x = 6; pixel_y = 5},/obj/item/cartridge/quartermaster,/obj/item/cartridge/quartermaster{pixel_x = -4; pixel_y = 7},/obj/machinery/firealarm{dir = 4; pixel_x = 24},/turf/simulated/floor/tiled,/area/quartermaster/qm)
 "cEE" = (/obj/structure/disposalpipe/segment,/turf/simulated/floor,/area/maintenance/apmaint)
 "cEF" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/disposalpipe/segment,/turf/simulated/floor,/area/maintenance/apmaint)
@@ -7028,31 +7028,31 @@
 "cFh" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable/green{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/tiled,/area/crew_quarters/locker)
 "cFi" = (/obj/structure/bed/padded,/obj/item/bedsheet/brown,/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_3)
 "cFj" = (/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_3)
-"cFk" = (/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22; pixel_y = 0},/obj/machinery/atmospherics/unary/vent_pump/on{dir = 4},/turf/simulated/floor/tiled/white,/area/crew_quarters/sleep/vistor_room_3)
+"cFk" = (/obj/machinery/alarm{dir = 4; pixel_x = -22; pixel_y = 0},/obj/machinery/atmospherics/unary/vent_pump/on{dir = 4},/turf/simulated/floor/tiled/white,/area/crew_quarters/sleep/vistor_room_3)
 "cFl" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 10},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 6},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled/white,/area/crew_quarters/sleep/vistor_room_3)
 "cFm" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 8},/obj/structure/mirror{pixel_x = 28},/obj/structure/sink{dir = 4; icon_state = "sink"; pixel_x = 11; pixel_y = 0},/turf/simulated/floor/tiled/white,/area/crew_quarters/sleep/vistor_room_3)
 "cFn" = (/obj/effect/floor_decal/corner/white{dir = 4},/obj/effect/floor_decal/corner/blue,/obj/structure/disposalpipe/segment,/obj/machinery/camera/network/civilian{c_tag = "CIV - Visitor Room Hall FP"; dir = 8},/turf/simulated/floor/tiled,/area/crew_quarters/visitor_lodging)
 "cFo" = (/obj/structure/sink{icon_state = "sink"; dir = 8; pixel_x = -12; pixel_y = 2},/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 4},/obj/structure/mirror{pixel_x = -28},/obj/structure/disposalpipe/segment{dir = 4; icon_state = "pipe-c"},/turf/simulated/floor/tiled/white,/area/crew_quarters/sleep/vistor_room_4)
 "cFp" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 6},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 10},/obj/structure/disposalpipe/segment{dir = 8; icon_state = "pipe-c"},/turf/simulated/floor/tiled/white,/area/crew_quarters/sleep/vistor_room_4)
-"cFq" = (/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/obj/machinery/atmospherics/unary/vent_pump/on{dir = 8},/turf/simulated/floor/tiled/white,/area/crew_quarters/sleep/vistor_room_4)
+"cFq" = (/obj/machinery/alarm{dir = 8; pixel_x = 24},/obj/machinery/atmospherics/unary/vent_pump/on{dir = 8},/turf/simulated/floor/tiled/white,/area/crew_quarters/sleep/vistor_room_4)
 "cFr" = (/obj/structure/bed/padded,/obj/item/bedsheet/brown,/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_4)
 "cFs" = (/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_4)
 "cFt" = (/obj/structure/bed/padded,/obj/item/bedsheet/brown,/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_9)
 "cFu" = (/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_9)
-"cFv" = (/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22; pixel_y = 0},/obj/machinery/atmospherics/unary/vent_pump/on{dir = 4},/turf/simulated/floor/tiled/white,/area/crew_quarters/sleep/vistor_room_9)
+"cFv" = (/obj/machinery/alarm{dir = 4; pixel_x = -22; pixel_y = 0},/obj/machinery/atmospherics/unary/vent_pump/on{dir = 4},/turf/simulated/floor/tiled/white,/area/crew_quarters/sleep/vistor_room_9)
 "cFw" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 10},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 6},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled/white,/area/crew_quarters/sleep/vistor_room_9)
 "cFx" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 8},/obj/structure/mirror{pixel_x = 28},/obj/structure/sink{dir = 4; icon_state = "sink"; pixel_x = 11; pixel_y = 0},/turf/simulated/floor/tiled/white,/area/crew_quarters/sleep/vistor_room_9)
 "cFy" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/effect/floor_decal/corner/white{dir = 8},/obj/effect/floor_decal/corner/blue{dir = 1},/obj/machinery/camera/network/civilian{c_tag = "CIV - Visitor Room Hall FS"; dir = 4},/turf/simulated/floor/tiled,/area/crew_quarters/visitor_lodging)
 "cFz" = (/obj/structure/sink{icon_state = "sink"; dir = 8; pixel_x = -12; pixel_y = 2},/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 4},/obj/structure/mirror{pixel_x = -28},/turf/simulated/floor/tiled/white,/area/crew_quarters/sleep/vistor_room_10)
 "cFA" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 6},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 10},/turf/simulated/floor/tiled/white,/area/crew_quarters/sleep/vistor_room_10)
-"cFB" = (/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/obj/machinery/atmospherics/unary/vent_pump/on{dir = 8},/turf/simulated/floor/tiled/white,/area/crew_quarters/sleep/vistor_room_10)
+"cFB" = (/obj/machinery/alarm{dir = 8; pixel_x = 24},/obj/machinery/atmospherics/unary/vent_pump/on{dir = 8},/turf/simulated/floor/tiled/white,/area/crew_quarters/sleep/vistor_room_10)
 "cFC" = (/obj/structure/bed/padded,/obj/item/bedsheet/brown,/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_10)
 "cFD" = (/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_10)
 "cFE" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/structure/grille,/obj/structure/sign/securearea{desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK"; pixel_x = 0},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/quartermaster/storage)
 "cFF" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/structure/grille,/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/quartermaster/storage)
 "cFG" = (/obj/machinery/embedded_controller/radio/simple_docking_controller{frequency = 1380; id_tag = "cargo_bay"; name = "cargo bay hatch controller"; pixel_x = -30; pixel_y = 0; req_one_access = list(13,31); tag_door = "cargo_bay_door"},/obj/effect/floor_decal/industrial/warning{dir = 8},/obj/machinery/camera/network/cargo{c_tag = "CRG - Cargo Bay Port"; dir = 4; name = "security camera"},/turf/simulated/floor/tiled,/area/quartermaster/storage)
 "cFH" = (/obj/machinery/hologram/holopad,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled,/area/quartermaster/storage)
-"cFI" = (/obj/effect/floor_decal/industrial/outline/yellow,/obj/vehicle/train/trolley,/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/turf/simulated/floor/tiled,/area/quartermaster/storage)
+"cFI" = (/obj/effect/floor_decal/industrial/outline/yellow,/obj/vehicle/train/trolley,/obj/machinery/alarm{dir = 8; pixel_x = 24},/turf/simulated/floor/tiled,/area/quartermaster/storage)
 "cFJ" = (/obj/machinery/light/small,/turf/simulated/floor,/area/maintenance/apmaint)
 "cFK" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 5},/obj/structure/disposalpipe/segment,/turf/simulated/floor,/area/maintenance/apmaint)
 "cFL" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 10},/obj/machinery/space_heater,/turf/simulated/floor,/area/maintenance/apmaint)
@@ -7083,7 +7083,7 @@
 "cGk" = (/obj/effect/floor_decal/corner/yellow{dir = 6},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled/white,/area/crew_quarters/coffee_shop)
 "cGl" = (/obj/effect/floor_decal/corner/yellow{dir = 10},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled/white,/area/crew_quarters/coffee_shop)
 "cGm" = (/obj/effect/floor_decal/corner/yellow/full{icon_state = "corner_white_full"; dir = 4},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled/white,/area/crew_quarters/coffee_shop)
-"cGn" = (/obj/effect/floor_decal/corner/brown{dir = 6},/obj/structure/cable/green{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled/white,/area/crew_quarters/coffee_shop)
+"cGn" = (/obj/effect/floor_decal/corner/brown{dir = 6},/obj/structure/cable/green{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/machinery/alarm{dir = 8; pixel_x = 24},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled/white,/area/crew_quarters/coffee_shop)
 "cGo" = (/obj/machinery/light{dir = 4; icon_state = "tube1"},/turf/simulated/floor/tiled/dark,/area/hallway/secondary/docking_hallway2)
 "cGp" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/tiled,/area/crew_quarters/locker)
 "cGq" = (/obj/machinery/newscaster{pixel_x = -32; pixel_y = 0},/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_3)
@@ -7120,7 +7120,7 @@
 "cGV" = (/turf/simulated/wall,/area/crew_quarters/sleep/engi_wash)
 "cGW" = (/obj/item/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -28},/turf/simulated/floor/tiled,/area/hallway/secondary/engineering_hallway)
 "cGX" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled,/area/hallway/secondary/engineering_hallway)
-"cGY" = (/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled,/area/hallway/secondary/engineering_hallway)
+"cGY" = (/obj/machinery/alarm{dir = 8; pixel_x = 24},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled,/area/hallway/secondary/engineering_hallway)
 "cGZ" = (/turf/simulated/wall,/area/construction)
 "cHa" = (/obj/machinery/door/airlock/maintenance{req_one_access = list(11,24)},/turf/simulated/floor,/area/construction)
 "cHb" = (/obj/structure/table/rack{dir = 8; layer = 2.9},/obj/item/clothing/mask/breath,/obj/item/rig/eva/equipped,/turf/simulated/floor/tiled/dark,/area/ai_monitored/storage/eva)
@@ -7227,7 +7227,7 @@
 "cIY" = (/obj/machinery/light{icon_state = "tube1"; dir = 4},/turf/simulated/floor,/area/construction)
 "cIZ" = (/obj/machinery/door/airlock/glass_engineering{name = "Engineering Hardsuits"; req_one_access = list(11,24)},/obj/machinery/door/firedoor/glass,/turf/simulated/floor/tiled,/area/ai_monitored/storage/eva)
 "cJa" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/tiled/dark,/area/ai_monitored/storage/eva)
-"cJb" = (/obj/machinery/alarm{dir = 1; icon_state = "alarm0"; pixel_y = -22},/turf/simulated/floor/tiled,/area/crew_quarters/locker)
+"cJb" = (/obj/machinery/alarm{dir = 1; pixel_y = -22},/turf/simulated/floor/tiled,/area/crew_quarters/locker)
 "cJc" = (/obj/effect/floor_decal/industrial/warning{dir = 4},/turf/simulated/floor/tiled,/area/ai_monitored/storage/eva)
 "cJd" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor,/area/maintenance/evahallway)
 "cJe" = (/turf/simulated/floor,/area/maintenance/evahallway)
@@ -7252,7 +7252,7 @@
 "cJx" = (/obj/structure/cable/green{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/structure/cable/green{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 4},/turf/simulated/floor,/area/maintenance/arrivals)
 "cJy" = (/obj/random/obstruction,/turf/simulated/floor,/area/maintenance/arrivals)
 "cJz" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor,/area/maintenance/arrivals)
-"cJA" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22; pixel_y = 0},/turf/simulated/floor/tiled,/area/hallway/secondary/docking_hallway2)
+"cJA" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/alarm{dir = 4; pixel_x = -22; pixel_y = 0},/turf/simulated/floor/tiled,/area/hallway/secondary/docking_hallway2)
 "cJB" = (/turf/simulated/wall,/area/crew_quarters/locker/locker_toilet)
 "cJC" = (/obj/machinery/door/airlock{name = "Unisex Restrooms"},/obj/machinery/door/firedoor/border_only,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/freezer,/area/crew_quarters/locker/locker_toilet)
 "cJD" = (/obj/structure/bed/chair/comfy/beige{dir = 4},/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_3)
@@ -7323,7 +7323,7 @@
 "cKQ" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/firedoor/border_only,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/security/checkpoint2)
 "cKR" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/firedoor/border_only,/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/hallway/secondary/docking_hallway)
 "cKS" = (/obj/machinery/light{dir = 8},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled,/area/hallway/secondary/docking_hallway)
-"cKT" = (/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/turf/simulated/floor/tiled/dark,/area/hallway/secondary/docking_hallway)
+"cKT" = (/obj/machinery/alarm{dir = 8; pixel_x = 24},/turf/simulated/floor/tiled/dark,/area/hallway/secondary/docking_hallway)
 "cKU" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 5},/turf/simulated/floor,/area/maintenance/arrivals)
 "cKV" = (/obj/machinery/atmospherics/pipe/simple/visible/universal{dir = 4},/obj/machinery/light/small,/turf/simulated/floor,/area/maintenance/arrivals)
 "cKW" = (/obj/machinery/atmospherics/valve{dir = 4},/turf/simulated/floor,/area/maintenance/arrivals)
@@ -7354,7 +7354,7 @@
 "cLv" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/tiled,/area/quartermaster/warehouse)
 "cLw" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 9},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 10},/turf/simulated/floor/tiled,/area/quartermaster/warehouse)
 "cLx" = (/turf/simulated/floor/tiled,/area/quartermaster/warehouse)
-"cLy" = (/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/obj/structure/closet/crate,/turf/simulated/floor/tiled/steel,/area/quartermaster/warehouse)
+"cLy" = (/obj/machinery/alarm{dir = 8; pixel_x = 24},/obj/structure/closet/crate,/turf/simulated/floor/tiled/steel,/area/quartermaster/warehouse)
 "cLz" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 6},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/obj/structure/disposalpipe/segment,/obj/machinery/door/blast/regular{density = 0; dir = 1; icon_state = "pdoor0"; id = "atmoslockdown"; name = "Atmospherics Lockdown"; opacity = 0},/turf/simulated/floor,/area/maintenance/apmaint)
 "cLA" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 9},/obj/machinery/door/blast/regular{density = 0; dir = 1; icon_state = "pdoor0"; id = "atmoslockdown"; name = "Atmospherics Lockdown"; opacity = 0},/turf/simulated/floor,/area/maintenance/apmaint)
 "cLB" = (/obj/structure/closet/secure_closet/engineering_personal,/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 4},/obj/machinery/camera/network/engineering{c_tag = "ENG - Locker Room"; dir = 4},/turf/simulated/floor/tiled/yellow,/area/engineering/locker_room)
@@ -7438,7 +7438,7 @@
 "cNb" = (/obj/structure/sink{icon_state = "sink"; dir = 8; pixel_x = -12; pixel_y = 2},/obj/structure/mirror{pixel_x = -28; pixel_y = 0},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 6},/turf/simulated/floor/tiled/freezer,/area/crew_quarters/sleep/engi_wash)
 "cNc" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 8},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/cable/green{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/tiled/freezer,/area/crew_quarters/sleep/engi_wash)
 "cNd" = (/obj/machinery/power/apc{dir = 1; name = "north bump"; pixel_x = 0; pixel_y = 24},/obj/structure/cable/green{d2 = 8; icon_state = "0-8"},/obj/structure/table/standard,/obj/machinery/light_switch{pixel_x = 12; pixel_y = 24},/turf/simulated/floor/tiled/freezer,/area/crew_quarters/sleep/engi_wash)
-"cNe" = (/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/obj/item/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/obj/structure/undies_wardrobe,/turf/simulated/floor/tiled/freezer,/area/crew_quarters/sleep/engi_wash)
+"cNe" = (/obj/machinery/alarm{dir = 8; pixel_x = 24},/obj/item/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/obj/structure/undies_wardrobe,/turf/simulated/floor/tiled/freezer,/area/crew_quarters/sleep/engi_wash)
 "cNf" = (/obj/effect/floor_decal/industrial/warning,/turf/simulated/floor/tiled,/area/hallway/secondary/engineering_hallway)
 "cNg" = (/obj/effect/floor_decal/industrial/warning,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled,/area/hallway/secondary/engineering_hallway)
 "cNh" = (/obj/effect/floor_decal/industrial/warning,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled,/area/hallway/secondary/engineering_hallway)
@@ -7474,18 +7474,18 @@
 "cNL" = (/turf/simulated/floor/tiled/freezer,/area/crew_quarters/locker/locker_toilet)
 "cNM" = (/obj/machinery/door/airlock{name = "Unit 2"},/turf/simulated/floor/tiled/freezer,/area/crew_quarters/locker/locker_toilet)
 "cNN" = (/obj/machinery/light/small,/obj/structure/toilet{dir = 8},/obj/effect/landmark{name = "blobstart"},/turf/simulated/floor/tiled/freezer,/area/crew_quarters/locker/locker_toilet)
-"cNO" = (/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22; pixel_y = 0},/obj/machinery/atmospherics/unary/vent_pump/on{dir = 4},/turf/simulated/floor/tiled/white,/area/crew_quarters/sleep/vistor_room_1)
+"cNO" = (/obj/machinery/alarm{dir = 4; pixel_x = -22; pixel_y = 0},/obj/machinery/atmospherics/unary/vent_pump/on{dir = 4},/turf/simulated/floor/tiled/white,/area/crew_quarters/sleep/vistor_room_1)
 "cNP" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 10},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 6},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled/white,/area/crew_quarters/sleep/vistor_room_1)
 "cNQ" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 8},/obj/structure/mirror{pixel_x = 28},/obj/structure/sink{dir = 4; icon_state = "sink"; pixel_x = 11; pixel_y = 0},/turf/simulated/floor/tiled/white,/area/crew_quarters/sleep/vistor_room_1)
 "cNR" = (/obj/structure/sink{icon_state = "sink"; dir = 8; pixel_x = -12; pixel_y = 2},/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 4},/obj/structure/mirror{pixel_x = -28},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled/white,/area/crew_quarters/sleep/vistor_room_2)
 "cNS" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 6},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 10},/turf/simulated/floor/tiled/white,/area/crew_quarters/sleep/vistor_room_2)
-"cNT" = (/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/obj/machinery/atmospherics/unary/vent_pump/on{dir = 8},/turf/simulated/floor/tiled/white,/area/crew_quarters/sleep/vistor_room_2)
-"cNU" = (/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22; pixel_y = 0},/obj/machinery/atmospherics/unary/vent_pump/on{dir = 4},/turf/simulated/floor/tiled/white,/area/crew_quarters/sleep/vistor_room_7)
+"cNT" = (/obj/machinery/alarm{dir = 8; pixel_x = 24},/obj/machinery/atmospherics/unary/vent_pump/on{dir = 8},/turf/simulated/floor/tiled/white,/area/crew_quarters/sleep/vistor_room_2)
+"cNU" = (/obj/machinery/alarm{dir = 4; pixel_x = -22; pixel_y = 0},/obj/machinery/atmospherics/unary/vent_pump/on{dir = 4},/turf/simulated/floor/tiled/white,/area/crew_quarters/sleep/vistor_room_7)
 "cNV" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 10},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 6},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled/white,/area/crew_quarters/sleep/vistor_room_7)
 "cNW" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 8},/obj/structure/mirror{pixel_x = 28},/obj/structure/sink{dir = 4; icon_state = "sink"; pixel_x = 11; pixel_y = 0},/turf/simulated/floor/tiled/white,/area/crew_quarters/sleep/vistor_room_7)
 "cNX" = (/obj/structure/sink{icon_state = "sink"; dir = 8; pixel_x = -12; pixel_y = 2},/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 4},/obj/structure/mirror{pixel_x = -28},/turf/simulated/floor/tiled/white,/area/crew_quarters/sleep/vistor_room_8)
 "cNY" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 6},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 10},/turf/simulated/floor/tiled/white,/area/crew_quarters/sleep/vistor_room_8)
-"cNZ" = (/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/obj/machinery/atmospherics/unary/vent_pump/on{dir = 8},/turf/simulated/floor/tiled/white,/area/crew_quarters/sleep/vistor_room_8)
+"cNZ" = (/obj/machinery/alarm{dir = 8; pixel_x = 24},/obj/machinery/atmospherics/unary/vent_pump/on{dir = 8},/turf/simulated/floor/tiled/white,/area/crew_quarters/sleep/vistor_room_8)
 "cOa" = (/obj/structure/table/standard,/obj/item/clothing/head/soft,/obj/item/stamp{pixel_x = -3; pixel_y = 3},/obj/item/clothing/head/soft,/obj/machinery/firealarm{dir = 1; pixel_x = 0; pixel_y = -24},/turf/simulated/floor/tiled,/area/quartermaster/storage)
 "cOb" = (/obj/structure/table/standard,/obj/machinery/cell_charger,/obj/machinery/requests_console{department = "Cargo Bay"; departmentType = 2; pixel_x = 0; pixel_y = -30},/turf/simulated/floor/tiled,/area/quartermaster/storage)
 "cOc" = (/obj/structure/table/standard,/obj/item/hand_labeler,/obj/item/stamp{pixel_x = -3; pixel_y = 3},/obj/item/hand_labeler,/turf/simulated/floor/tiled,/area/quartermaster/storage)
@@ -7516,7 +7516,7 @@
 "cOB" = (/obj/structure/table/reinforced,/obj/item/clothing/head/welding,/obj/item/storage/belt/utility,/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/effect/floor_decal/industrial/warning{dir = 8},/obj/machinery/camera/network/command{c_tag = "EVA - Aft"; dir = 4},/turf/simulated/floor/tiled,/area/ai_monitored/storage/eva)
 "cOC" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled/dark,/area/ai_monitored/storage/eva)
 "cOD" = (/obj/structure/table/reinforced,/obj/item/stack/material/glass/reinforced{amount = 50},/obj/item/stack/rods{amount = 50},/obj/effect/floor_decal/industrial/warning{dir = 4},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled,/area/ai_monitored/storage/eva)
-"cOE" = (/obj/effect/floor_decal/corner/red/full,/obj/structure/filingcabinet/chestdrawer,/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22},/turf/simulated/floor/tiled,/area/security/checkpoint2)
+"cOE" = (/obj/effect/floor_decal/corner/red/full,/obj/structure/filingcabinet/chestdrawer,/obj/machinery/alarm{dir = 4; pixel_x = -22},/turf/simulated/floor/tiled,/area/security/checkpoint2)
 "cOF" = (/obj/effect/floor_decal/corner/red{dir = 10},/obj/machinery/light,/turf/simulated/floor/tiled,/area/security/checkpoint2)
 "cOG" = (/obj/effect/floor_decal/corner/red/full{dir = 4},/obj/structure/table/reinforced,/obj/item/tool/crowbar,/obj/item/flash,/obj/machinery/camera/network/security{c_tag = "SEC - Arrival Checkpoint"; dir = 1},/obj/item/paper_bin{pixel_x = 1; pixel_y = 9},/turf/simulated/floor/tiled,/area/security/checkpoint2)
 "cOH" = (/obj/effect/floor_decal/industrial/outline/yellow,/obj/structure/cable/green{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/tiled,/area/hallway/secondary/docking_hallway)
@@ -7525,11 +7525,11 @@
 "cOK" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled,/area/hallway/secondary/docking_hallway)
 "cOL" = (/obj/structure/cable/green{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled,/area/hallway/secondary/docking_hallway)
 "cOM" = (/obj/item/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 26},/turf/simulated/floor/tiled/dark,/area/hallway/secondary/docking_hallway)
-"cON" = (/obj/effect/floor_decal/industrial/warning{dir = 4},/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22},/turf/simulated/floor,/area/maintenance/substation/dock)
+"cON" = (/obj/effect/floor_decal/industrial/warning{dir = 4},/obj/machinery/alarm{dir = 4; pixel_x = -22},/turf/simulated/floor,/area/maintenance/substation/dock)
 "cOO" = (/obj/machinery/power/breakerbox/activated{RCon_tag = "Dock Substation Bypass"},/turf/simulated/floor/plating,/area/maintenance/substation/dock)
 "cOP" = (/obj/machinery/power/smes/buildable{charge = 0; RCon_tag = "Substation - Dock"},/obj/structure/cable/green{d2 = 8; icon_state = "0-8"},/obj/structure/cable/green{d2 = 4; icon_state = "0-4"},/turf/simulated/floor/plating,/area/maintenance/substation/dock)
 "cOQ" = (/obj/effect/floor_decal/industrial/warning{dir = 8},/obj/structure/cable/green{d2 = 8; icon_state = "0-8"},/obj/structure/cable/green,/obj/machinery/power/apc{dir = 4; name = "east bump"; pixel_x = 24},/turf/simulated/floor,/area/maintenance/substation/dock)
-"cOR" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/turf/simulated/floor,/area/maintenance/arrivals)
+"cOR" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/alarm{dir = 8; pixel_x = 24},/turf/simulated/floor,/area/maintenance/arrivals)
 "cOS" = (/obj/structure/filingcabinet,/turf/simulated/floor/wood,/area/crew_quarters/longue_area)
 "cOT" = (/obj/structure/bed/chair/office/dark,/turf/simulated/floor/wood,/area/crew_quarters/longue_area)
 "cOU" = (/obj/structure/table/woodentable,/obj/machinery/photocopier/faxmachine{department = "Public Office"},/turf/simulated/floor/wood,/area/crew_quarters/longue_area)
@@ -7540,7 +7540,7 @@
 "cOZ" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 8},/obj/machinery/firealarm{dir = 4; pixel_x = 24},/turf/simulated/floor/tiled,/area/hallway/secondary/docking_hallway2)
 "cPa" = (/obj/structure/undies_wardrobe,/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 4},/turf/simulated/floor/tiled/freezer,/area/crew_quarters/locker/locker_toilet)
 "cPb" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 9},/turf/simulated/floor/tiled/freezer,/area/crew_quarters/locker/locker_toilet)
-"cPc" = (/obj/machinery/alarm{dir = 1; icon_state = "alarm0"; pixel_y = -22},/obj/item/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 22},/turf/simulated/floor/tiled/freezer,/area/crew_quarters/locker/locker_toilet)
+"cPc" = (/obj/machinery/alarm{dir = 1; pixel_y = -22},/obj/item/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 22},/turf/simulated/floor/tiled/freezer,/area/crew_quarters/locker/locker_toilet)
 "cPd" = (/obj/structure/table/standard,/obj/machinery/newscaster{pixel_x = 0; pixel_y = 32},/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_1)
 "cPe" = (/obj/structure/bed/padded,/obj/item/bedsheet/brown,/obj/machinery/atmospherics/unary/vent_pump/on,/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_1)
 "cPf" = (/obj/structure/closet/secure_closet/personal,/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_1)
@@ -7566,7 +7566,7 @@
 "cPz" = (/obj/machinery/power/apc{dir = 4; name = "east bump"; pixel_x = 24},/obj/structure/cable/cyan{d2 = 2; icon_state = "0-2"},/turf/simulated/floor,/area/engineering/atmos/storage)
 "cPA" = (/turf/simulated/wall/r_wall,/area/engineering/atmos/monitoring)
 "cPB" = (/obj/machinery/power/apc{dir = 8; name = "west bump"; pixel_x = -24},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/obj/machinery/light_switch{dir = 2; name = "light switch "; pixel_x = -36; pixel_y = 0},/turf/simulated/floor/tiled/yellow,/area/engineering/locker_room)
-"cPC" = (/obj/structure/table/reinforced,/obj/item/storage/firstaid/regular,/obj/item/bodybag/cryobag{pixel_x = 6},/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/obj/random/medical/lite,/turf/simulated/floor/tiled/yellow,/area/engineering/locker_room)
+"cPC" = (/obj/structure/table/reinforced,/obj/item/storage/firstaid/regular,/obj/item/bodybag/cryobag{pixel_x = 6},/obj/machinery/alarm{dir = 8; pixel_x = 24},/obj/random/medical/lite,/turf/simulated/floor/tiled/yellow,/area/engineering/locker_room)
 "cPD" = (/obj/structure/table/standard,/obj/structure/bedsheetbin,/obj/machinery/light{icon_state = "tube1"; dir = 8},/obj/item/soap/nanotrasen,/obj/random/soap,/turf/simulated/floor/tiled/freezer,/area/crew_quarters/sleep/engi_wash)
 "cPE" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/freezer,/area/crew_quarters/sleep/engi_wash)
 "cPF" = (/obj/machinery/shower{dir = 1},/obj/machinery/door/window/northleft{name = "Shower"; req_access = list()},/obj/structure/curtain/open/shower/engineering,/obj/structure/window/basic{dir = 8},/turf/simulated/floor/tiled/freezer,/area/crew_quarters/sleep/engi_wash)
@@ -7593,7 +7593,7 @@
 "cQa" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/door/airlock/glass{name = "Dock"},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/tiled,/area/hallway/secondary/entry/docking_lounge)
 "cQb" = (/obj/structure/table/woodentable,/obj/item/pen/blue{pixel_x = -5; pixel_y = -1},/obj/item/pen/red{pixel_x = -1; pixel_y = 3},/obj/item/pen,/obj/item/paper,/turf/simulated/floor/wood,/area/crew_quarters/longue_area)
 "cQc" = (/obj/structure/table/woodentable,/obj/item/paper_bin{pixel_x = 1; pixel_y = 9},/obj/item/taperecorder,/obj/machinery/firealarm{dir = 1; pixel_x = 0; pixel_y = -26},/turf/simulated/floor/wood,/area/crew_quarters/longue_area)
-"cQd" = (/obj/structure/bed/chair/comfy/black{dir = 4},/obj/machinery/alarm{dir = 1; icon_state = "alarm0"; pixel_y = -22},/turf/simulated/floor/carpet,/area/crew_quarters/longue_area)
+"cQd" = (/obj/structure/bed/chair/comfy/black{dir = 4},/obj/machinery/alarm{dir = 1; pixel_y = -22},/turf/simulated/floor/carpet,/area/crew_quarters/longue_area)
 "cQe" = (/obj/machinery/camera/network/civilian{c_tag = "CIV - Lounge"; dir = 1},/turf/simulated/floor/carpet,/area/crew_quarters/longue_area)
 "cQf" = (/obj/structure/bed/chair/comfy/black{dir = 8},/obj/machinery/power/apc{dir = 2; name = "south bump"; pixel_y = -24},/obj/machinery/light_switch{pixel_x = 12; pixel_y = -24},/obj/structure/cable/green,/turf/simulated/floor/carpet,/area/crew_quarters/longue_area)
 "cQg" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk{dir = 1},/turf/simulated/floor/wood,/area/crew_quarters/longue_area)
@@ -7633,7 +7633,7 @@
 "cQO" = (/obj/structure/cable/cyan{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/machinery/light/small{dir = 8},/turf/simulated/floor,/area/engineering/atmos/storage)
 "cQP" = (/obj/structure/cable/cyan{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor,/area/engineering/atmos/storage)
 "cQQ" = (/obj/structure/cable/cyan{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/disposalpipe/segment{dir = 1; icon_state = "pipe-c"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor,/area/engineering/atmos/storage)
-"cQR" = (/obj/structure/cable/cyan{d2 = 8; icon_state = "0-8"},/obj/structure/cable/cyan{d2 = 2; icon_state = "0-2"},/obj/machinery/power/sensor{name = "Powernet Sensor - Atmospherics Subgrid"; name_tag = "Atmospherics Subgrid"},/obj/structure/cable/cyan,/obj/structure/disposalpipe/segment{dir = 2; icon_state = "pipe-c"},/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/turf/simulated/floor,/area/engineering/atmos/storage)
+"cQR" = (/obj/structure/cable/cyan{d2 = 8; icon_state = "0-8"},/obj/structure/cable/cyan{d2 = 2; icon_state = "0-2"},/obj/machinery/power/sensor{name = "Powernet Sensor - Atmospherics Subgrid"; name_tag = "Atmospherics Subgrid"},/obj/structure/cable/cyan,/obj/structure/disposalpipe/segment{dir = 2; icon_state = "pipe-c"},/obj/machinery/alarm{dir = 8; pixel_x = 24},/turf/simulated/floor,/area/engineering/atmos/storage)
 "cQS" = (/obj/machinery/computer/general_air_control{frequency = 1443; level = 3; name = "Distribution and Waste Monitor"; sensors = list("mair_in_meter" = "Mixed Air In", "air_sensor" = "Mixed Air Supply Tank", "mair_out_meter" = "Mixed Air Out", "dloop_atm_meter" = "Distribution Loop", "wloop_atm_meter" = "Engine Waste")},/turf/simulated/floor/tiled,/area/engineering/atmos/monitoring)
 "cQT" = (/obj/machinery/firealarm{pixel_y = 24},/turf/simulated/floor/tiled,/area/engineering/atmos/monitoring)
 "cQU" = (/obj/structure/bed/chair/office/dark{dir = 4},/obj/machinery/button/remote/blast_door{id = "atmoslockdown"; name = "Atmospherics Lockdown"; pixel_x = 0; pixel_y = 24; req_access = newlist(); req_one_access = list(10,24)},/turf/simulated/floor/tiled,/area/engineering/atmos/monitoring)
@@ -7799,7 +7799,7 @@
 "cTY" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/effect/floor_decal/industrial/warning/corner{dir = 4},/turf/simulated/floor,/area/maintenance/evahallway)
 "cTZ" = (/obj/effect/floor_decal/industrial/warning{dir = 1},/obj/machinery/atmospherics/pipe/manifold/hidden/supply,/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor,/area/maintenance/evahallway)
 "cUa" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/effect/floor_decal/industrial/warning/corner{dir = 1},/turf/simulated/floor,/area/maintenance/evahallway)
-"cUb" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/alarm{dir = 1; icon_state = "alarm0"; pixel_y = -22},/turf/simulated/floor,/area/maintenance/evahallway)
+"cUb" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/alarm{dir = 1; pixel_y = -22},/turf/simulated/floor,/area/maintenance/evahallway)
 "cUc" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 9},/turf/simulated/floor,/area/maintenance/evahallway)
 "cUd" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 9},/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor,/area/maintenance/evahallway)
 "cUe" = (/obj/structure/reagent_dispensers/watertank,/obj/machinery/atmospherics/pipe/simple/hidden/universal,/turf/simulated/floor/plating,/area/maintenance/evahallway)
@@ -7895,7 +7895,7 @@
 "cVQ" = (/obj/machinery/atmospherics/binary/pump/on,/turf/simulated/floor,/area/maintenance/arrivals)
 "cVR" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 4},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/starboard)
 "cVS" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 10},/obj/structure/extinguisher_cabinet{pixel_x = 25; pixel_y = 0},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/starboard)
-"cVT" = (/obj/structure/cable/green{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22},/obj/effect/floor_decal/corner/white{dir = 8},/obj/effect/floor_decal/corner/blue{dir = 1},/turf/simulated/floor/tiled,/area/crew_quarters/visitor_dining)
+"cVT" = (/obj/structure/cable/green{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/machinery/alarm{dir = 4; pixel_x = -22},/obj/effect/floor_decal/corner/white{dir = 8},/obj/effect/floor_decal/corner/blue{dir = 1},/turf/simulated/floor/tiled,/area/crew_quarters/visitor_dining)
 "cVU" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled,/area/crew_quarters/visitor_dining)
 "cVV" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/hologram/holopad,/turf/simulated/floor/tiled,/area/crew_quarters/visitor_dining)
 "cVW" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/disposalpipe/segment{dir = 1; icon_state = "pipe-c"},/turf/simulated/floor/tiled,/area/crew_quarters/visitor_dining)
@@ -7916,7 +7916,7 @@
 "cWl" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/firealarm{dir = 2; pixel_y = 24},/turf/simulated/floor/tiled,/area/crew_quarters/visitor_laundry)
 "cWm" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled,/area/crew_quarters/visitor_laundry)
 "cWn" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/hologram/holopad,/turf/simulated/floor/tiled,/area/crew_quarters/visitor_laundry)
-"cWo" = (/obj/structure/cable/green{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/obj/effect/floor_decal/corner/blue,/obj/effect/floor_decal/corner/white{dir = 4},/turf/simulated/floor/tiled,/area/crew_quarters/visitor_laundry)
+"cWo" = (/obj/structure/cable/green{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/machinery/alarm{dir = 8; pixel_x = 24},/obj/effect/floor_decal/corner/blue,/obj/effect/floor_decal/corner/white{dir = 4},/turf/simulated/floor/tiled,/area/crew_quarters/visitor_laundry)
 "cWp" = (/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/firedoor/border_only,/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/blast/regular{density = 0; dir = 1; icon_state = "pdoor0"; id = "atmoslockdown"; name = "Atmospherics Lockdown"; opacity = 0},/turf/simulated/floor,/area/engineering/atmos)
 "cWq" = (/obj/machinery/door/firedoor/border_only,/obj/structure/grille,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 6},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 6},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/obj/machinery/door/blast/regular{density = 0; dir = 1; icon_state = "pdoor0"; id = "atmoslockdown"; name = "Atmospherics Lockdown"; opacity = 0},/turf/simulated/floor,/area/engineering/atmos)
 "cWr" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 1},/obj/machinery/portable_atmospherics/powered/pump/filled,/turf/simulated/floor/tiled,/area/engineering/atmos)
@@ -7935,7 +7935,7 @@
 "cWE" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/engineering/atmos/monitoring)
 "cWF" = (/obj/machinery/computer/atmos_alert,/obj/machinery/light{dir = 8; icon_state = "tube1"; pixel_y = 0},/turf/simulated/floor/tiled,/area/engineering/atmos/monitoring)
 "cWG" = (/obj/structure/bed/chair/office/dark{dir = 8},/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 1},/obj/effect/landmark/start{name = "Atmospheric Technician"},/obj/structure/cable/cyan{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled,/area/engineering/atmos/monitoring)
-"cWH" = (/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/turf/simulated/floor/tiled,/area/engineering/atmos/monitoring)
+"cWH" = (/obj/machinery/alarm{dir = 8; pixel_x = 24},/turf/simulated/floor/tiled,/area/engineering/atmos/monitoring)
 "cWI" = (/obj/effect/floor_decal/corner/white/diagonal,/obj/machinery/vending/cigarette,/turf/simulated/floor/tiled,/area/engineering/break_room)
 "cWJ" = (/obj/structure/bed/chair/comfy/brown{dir = 4},/obj/effect/landmark/start{name = "Station Engineer"},/turf/simulated/floor/carpet,/area/engineering/break_room)
 "cWK" = (/obj/structure/table/woodentable,/obj/item/book/manual/supermatter_engine{pixel_x = -3},/obj/machinery/atmospherics/unary/vent_scrubber/on,/turf/simulated/floor/carpet,/area/engineering/break_room)
@@ -8021,7 +8021,7 @@
 "cYm" = (/obj/structure/flora/pottedplant{icon_state = "plant-20"},/obj/effect/floor_decal/corner/blue/full,/turf/simulated/floor/tiled,/area/crew_quarters/heads/chief)
 "cYn" = (/obj/machinery/light,/turf/simulated/floor/tiled,/area/crew_quarters/heads/chief)
 "cYo" = (/obj/machinery/light_switch{pixel_x = 12; pixel_y = -24},/obj/structure/cable/green,/obj/machinery/power/apc{dir = 2; name = "south bump"; pixel_y = -24},/turf/simulated/floor/tiled,/area/crew_quarters/heads/chief)
-"cYp" = (/obj/machinery/alarm{dir = 1; icon_state = "alarm0"; pixel_y = -22},/obj/structure/disposalpipe/segment{dir = 1; icon_state = "pipe-c"},/obj/machinery/camera/network/engineering{c_tag = "ENG - Chief Engineer's Office"; dir = 1},/turf/simulated/floor/tiled,/area/crew_quarters/heads/chief)
+"cYp" = (/obj/machinery/alarm{dir = 1; pixel_y = -22},/obj/structure/disposalpipe/segment{dir = 1; icon_state = "pipe-c"},/obj/machinery/camera/network/engineering{c_tag = "ENG - Chief Engineer's Office"; dir = 1},/turf/simulated/floor/tiled,/area/crew_quarters/heads/chief)
 "cYq" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk{dir = 8},/obj/structure/extinguisher_cabinet{pixel_x = 25},/obj/effect/floor_decal/corner/blue/full{dir = 4},/turf/simulated/floor/tiled,/area/crew_quarters/heads/chief)
 "cYr" = (/obj/machinery/atmospherics/pipe/manifold/hidden{dir = 8; icon_state = "map"},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor,/area/maintenance/evahallway)
 "cYs" = (/obj/machinery/portable_atmospherics/canister/air/airlock,/obj/effect/floor_decal/industrial/outline/yellow,/obj/machinery/atmospherics/portables_connector{dir = 8},/turf/simulated/floor/plating,/area/maintenance/evahallway)
@@ -8092,9 +8092,9 @@
 "cZF" = (/obj/machinery/door/airlock/command{name = "Chief Engineer"; req_access = list(56)},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/tiled,/area/crew_quarters/heads/chief)
 "cZG" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor,/area/maintenance/engineering)
 "cZH" = (/obj/machinery/light/small{dir = 8},/obj/effect/decal/cleanable/dirt,/obj/machinery/atmospherics/pipe/manifold/hidden{dir = 8; icon_state = "map"},/turf/simulated/floor,/area/maintenance/evahallway)
-"cZI" = (/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22; pixel_y = 0},/turf/simulated/floor/lino,/area/hallway/secondary/entry/docking_lounge)
+"cZI" = (/obj/machinery/alarm{dir = 4; pixel_x = -22; pixel_y = 0},/turf/simulated/floor/lino,/area/hallway/secondary/entry/docking_lounge)
 "cZJ" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/firedoor/border_only,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/hallway/secondary/entry/docking_lounge)
-"cZK" = (/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/turf/simulated/floor/lino,/area/hallway/secondary/entry/docking_lounge)
+"cZK" = (/obj/machinery/alarm{dir = 8; pixel_x = 24},/turf/simulated/floor/lino,/area/hallway/secondary/entry/docking_lounge)
 "cZL" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/light/small{dir = 4; pixel_y = 0},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/manifold/hidden{dir = 4; icon_state = "map"},/turf/simulated/floor,/area/maintenance/arrivals)
 "cZM" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 4},/obj/machinery/alarm{dir = 4; pixel_x = -23; pixel_y = 0},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/starboard)
 "cZN" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 10},/obj/machinery/light{dir = 4; icon_state = "tube1"},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/starboard)
@@ -8457,7 +8457,7 @@
 "dgG" = (/obj/machinery/atmospherics/pipe/simple/visible/red,/obj/machinery/meter,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled,/area/engineering/atmos)
 "dgH" = (/obj/machinery/atmospherics/binary/pump{dir = 1; name = "Port to Waste"},/turf/simulated/floor/tiled,/area/engineering/atmos)
 "dgI" = (/obj/structure/window/reinforced,/obj/structure/closet/firecloset,/turf/simulated/floor/tiled,/area/engineering/atmos)
-"dgJ" = (/obj/structure/window/reinforced,/obj/structure/closet/firecloset,/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/turf/simulated/floor/tiled,/area/engineering/atmos)
+"dgJ" = (/obj/structure/window/reinforced,/obj/structure/closet/firecloset,/obj/machinery/alarm{dir = 8; pixel_x = 24},/turf/simulated/floor/tiled,/area/engineering/atmos)
 "dgK" = (/turf/simulated/wall/r_wall,/area/engineering/workshop)
 "dgL" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/machinery/door/firedoor/border_only,/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/engineering/workshop)
 "dgM" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/engineering/workshop)
@@ -8475,7 +8475,7 @@
 "dgY" = (/obj/machinery/door/airlock/glass_engineeringatmos{name = "Engineering EVA Storage"; req_one_access = list(11,24)},/obj/machinery/door/firedoor/glass,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/tiled,/area/engineering/engine_eva)
 "dgZ" = (/obj/structure/table/rack{dir = 1},/obj/item/clothing/suit/fire/firefighter,/obj/item/tank/oxygen,/obj/item/clothing/mask/gas,/obj/item/extinguisher,/obj/item/clothing/head/hardhat/red,/obj/item/clothing/glasses/meson,/obj/random/maintenance/engineering,/obj/random/maintenance/clean,/turf/simulated/floor/plating,/area/maintenance/engineering)
 "dha" = (/turf/simulated/floor/plating,/area/maintenance/engineering)
-"dhb" = (/obj/item/t_scanner,/obj/structure/table/steel,/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/turf/simulated/floor/plating,/area/maintenance/engineering)
+"dhb" = (/obj/item/t_scanner,/obj/structure/table/steel,/obj/machinery/alarm{dir = 8; pixel_x = 24},/turf/simulated/floor/plating,/area/maintenance/engineering)
 "dhc" = (/obj/machinery/light/small{dir = 8},/obj/effect/floor_decal/industrial/warning{dir = 10},/turf/simulated/floor,/area/hallway/secondary/escape/dock_escape_pod_hallway_port)
 "dhd" = (/obj/effect/floor_decal/industrial/warning,/turf/simulated/floor,/area/hallway/secondary/escape/dock_escape_pod_hallway_port)
 "dhe" = (/obj/structure/closet/emcloset,/obj/effect/floor_decal/industrial/warning{dir = 6},/turf/simulated/floor,/area/hallway/secondary/escape/dock_escape_pod_hallway_port)
@@ -8559,7 +8559,7 @@
 "diE" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/tiled,/area/engineering/engine_eva)
 "diF" = (/obj/structure/table/rack{dir = 8; layer = 2.6},/obj/structure/window/reinforced{dir = 8},/obj/item/tank/jetpack/carbondioxide,/obj/machinery/door/window/southleft{name = "Jetpack Storage"; req_access = newlist(); req_one_access = list(11,24)},/turf/simulated/floor/tiled,/area/engineering/engine_eva)
 "diG" = (/obj/structure/table/rack{dir = 8; layer = 2.6},/obj/structure/window/reinforced{dir = 4},/obj/item/tank/jetpack/carbondioxide,/obj/machinery/door/window/southright{name = "Jetpack Storage"; req_one_access = list(11,24)},/obj/machinery/light{dir = 1},/turf/simulated/floor/tiled,/area/engineering/engine_eva)
-"diH" = (/obj/item/storage/briefcase/inflatable{pixel_x = 3; pixel_y = 3},/obj/item/storage/briefcase/inflatable,/obj/structure/table/steel_reinforced,/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/obj/item/suit_cooling_unit,/obj/item/suit_cooling_unit,/turf/simulated/floor/tiled,/area/engineering/engine_eva)
+"diH" = (/obj/item/storage/briefcase/inflatable{pixel_x = 3; pixel_y = 3},/obj/item/storage/briefcase/inflatable,/obj/structure/table/steel_reinforced,/obj/machinery/alarm{dir = 8; pixel_x = 24},/obj/item/suit_cooling_unit,/obj/item/suit_cooling_unit,/turf/simulated/floor/tiled,/area/engineering/engine_eva)
 "diI" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/door/airlock/maintenance{req_access = null; req_one_access = list(12,47)},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor,/area/maintenance/engineering)
 "diJ" = (/obj/structure/closet,/obj/item/lipstick/purple,/obj/random/maintenance/engineering,/obj/random/maintenance/engineering,/obj/random/maintenance/clean,/turf/simulated/floor/plating,/area/maintenance/engineering)
 "diK" = (/obj/machinery/space_heater,/turf/simulated/floor/plating,/area/maintenance/engineering)
@@ -8914,16 +8914,16 @@
 "dpv" = (/obj/item/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -21},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/D1)
 "dpw" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 8},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/D1)
 "dpx" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 8},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/D1)
-"dpy" = (/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/D1)
-"dpz" = (/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/D2)
+"dpy" = (/obj/machinery/alarm{dir = 8; pixel_x = 24},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/D1)
+"dpz" = (/obj/machinery/alarm{dir = 4; pixel_x = -22},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/D2)
 "dpA" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 4},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/D2)
 "dpB" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 4},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/D2)
 "dpC" = (/obj/item/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 28},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/D2)
 "dpD" = (/obj/item/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -28},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/D3)
 "dpE" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 8},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/D3)
 "dpF" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 8},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/D3)
-"dpG" = (/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/D3)
-"dpH" = (/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/D4)
+"dpG" = (/obj/machinery/alarm{dir = 8; pixel_x = 24},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/D3)
+"dpH" = (/obj/machinery/alarm{dir = 4; pixel_x = -22},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/D4)
 "dpI" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 4},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden,/turf/simulated/floor/tiled,/area/hallway/secondary/entry/D4)
 "dpJ" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 4},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/D4)
 "dpK" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/item/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 28},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/D4)
@@ -8939,7 +8939,7 @@
 "dpU" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/door/firedoor/glass,/turf/simulated/floor/tiled,/area/engineering)
 "dpV" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/tiled,/area/engineering)
 "dpW" = (/turf/simulated/wall/r_wall,/area/engineering/storage)
-"dpX" = (/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22; pixel_y = 0},/obj/effect/floor_decal/industrial/warning/corner{dir = 1},/obj/structure/closet/crate,/obj/random/maintenance/engineering,/obj/random/maintenance/engineering,/obj/random/maintenance/engineering,/obj/random/maintenance/engineering,/turf/simulated/floor,/area/maintenance/engineering)
+"dpX" = (/obj/machinery/alarm{dir = 4; pixel_x = -22; pixel_y = 0},/obj/effect/floor_decal/industrial/warning/corner{dir = 1},/obj/structure/closet/crate,/obj/random/maintenance/engineering,/obj/random/maintenance/engineering,/obj/random/maintenance/engineering,/obj/random/maintenance/engineering,/turf/simulated/floor,/area/maintenance/engineering)
 "dpY" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/obj/machinery/light/small{dir = 4},/turf/simulated/floor,/area/maintenance/engineering)
 "dpZ" = (/obj/effect/landmark{name = "xeno_spawn"; pixel_x = -1},/turf/simulated/floor,/area/vacant/vacant_site2)
 "dqa" = (/turf/simulated/mineral/ignore_mapgen,/area/mine/explored/upper_level)
@@ -8958,7 +8958,7 @@
 "dqn" = (/turf/simulated/wall,/area/engineering/drone_fabrication)
 "dqo" = (/obj/structure/cable/green{d2 = 4; icon_state = "0-4"},/obj/machinery/power/apc{dir = 8; name = "west bump"; pixel_x = -24},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled,/area/engineering)
 "dqp" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled,/area/engineering)
-"dqq" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable/green{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/turf/simulated/floor/tiled,/area/engineering)
+"dqq" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable/green{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/machinery/alarm{dir = 8; pixel_x = 24},/turf/simulated/floor/tiled,/area/engineering)
 "dqr" = (/obj/machinery/shield_gen/external,/obj/effect/floor_decal/industrial/outline/yellow,/turf/simulated/floor/plating,/area/engineering/storage)
 "dqs" = (/obj/machinery/light{dir = 1},/obj/machinery/shield_gen/external,/obj/effect/floor_decal/industrial/outline/yellow,/turf/simulated/floor,/area/engineering/storage)
 "dqt" = (/obj/machinery/shield_gen,/obj/effect/floor_decal/industrial/outline/yellow,/turf/simulated/floor,/area/engineering/storage)
@@ -9037,7 +9037,7 @@
 "drO" = (/obj/machinery/portable_atmospherics/canister/phoron,/turf/simulated/floor/reinforced/phoron,/area/engineering/atmos)
 "drP" = (/turf/simulated/floor/reinforced/n20,/area/engineering/atmos)
 "drQ" = (/obj/machinery/portable_atmospherics/canister/nitrous_oxide,/turf/simulated/floor/reinforced/n20,/area/engineering/atmos)
-"drR" = (/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor,/area/maintenance/atmos_control)
+"drR" = (/obj/machinery/alarm{dir = 4; pixel_x = -22},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor,/area/maintenance/atmos_control)
 "drS" = (/obj/machinery/power/apc{dir = 4; name = "east bump"; pixel_x = 24},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/turf/simulated/floor,/area/maintenance/atmos_control)
 "drT" = (/turf/simulated/floor,/area/engineering/drone_fabrication)
 "drU" = (/obj/effect/floor_decal/industrial/warning{dir = 8},/obj/effect/decal/remains/robot,/turf/simulated/floor,/area/engineering/drone_fabrication)
@@ -9111,7 +9111,7 @@
 "dtk" = (/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 1},/turf/simulated/floor,/area/engineering/storage)
 "dtl" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor,/area/engineering/storage)
 "dtm" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 10},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 9; pixel_y = 0},/turf/simulated/floor,/area/engineering/storage)
-"dtn" = (/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/obj/machinery/portable_atmospherics/canister/phoron,/turf/simulated/floor,/area/engineering/storage)
+"dtn" = (/obj/machinery/alarm{dir = 8; pixel_x = 24},/obj/machinery/portable_atmospherics/canister/phoron,/turf/simulated/floor,/area/engineering/storage)
 "dto" = (/obj/structure/table/steel,/obj/item/clothing/head/orangebandana,/obj/random/maintenance/engineering,/turf/simulated/floor,/area/maintenance/engineering)
 "dtp" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/firedoor/border_only,/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/maintenance/engineering)
 "dtq" = (/obj/effect/floor_decal/industrial/warning{dir = 4},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/D1)
@@ -9166,7 +9166,7 @@
 "dun" = (/obj/machinery/vending/cola,/turf/simulated/floor/tiled/dark,/area/hallway/secondary/entry/D4)
 "duo" = (/turf/simulated/wall/r_wall,/area/engineering/aft_hallway)
 "dup" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/door/firedoor,/obj/machinery/door/airlock/maintenance{name = "Atmospherics Maintenance Access"; req_access = newlist(); req_one_access = list(10)},/turf/simulated/floor,/area/maintenance/atmos_control)
-"duq" = (/obj/effect/floor_decal/industrial/warning{dir = 10},/obj/machinery/alarm{dir = 1; icon_state = "alarm0"; pixel_y = -22},/turf/simulated/floor,/area/engineering/drone_fabrication)
+"duq" = (/obj/effect/floor_decal/industrial/warning{dir = 10},/obj/machinery/alarm{dir = 1; pixel_y = -22},/turf/simulated/floor,/area/engineering/drone_fabrication)
 "dur" = (/obj/effect/floor_decal/industrial/warning,/obj/machinery/computer/drone_control,/turf/simulated/floor,/area/engineering/drone_fabrication)
 "dus" = (/obj/effect/floor_decal/industrial/warning,/obj/machinery/light,/obj/structure/bed/chair{dir = 8},/turf/simulated/floor/plating,/area/engineering/drone_fabrication)
 "dut" = (/obj/effect/floor_decal/industrial/warning,/turf/simulated/floor/plating,/area/engineering/drone_fabrication)
@@ -9360,7 +9360,7 @@
 "dxZ" = (/obj/effect/floor_decal/industrial/warning{dir = 1},/obj/machinery/atmospherics/pipe/simple/hidden,/turf/simulated/floor/tiled,/area/engineering/aft_hallway)
 "dya" = (/obj/machinery/embedded_controller/radio/airlock/docking_port{frequency = 1380; id_tag = "engineering_dock_airlock"; pixel_x = 0; pixel_y = 25; req_one_access = list(13,11,24); tag_airpump = "engineering_dock_pump"; tag_chamber_sensor = "engineering_dock_sensor"; tag_exterior_door = "engineering_dock_outer"; tag_interior_door = "engineering_dock_inner"},/obj/effect/floor_decal/industrial/warning/corner{dir = 1},/turf/simulated/floor/tiled,/area/engineering/aft_hallway)
 "dyb" = (/obj/effect/floor_decal/industrial/outline/yellow,/turf/simulated/floor,/area/engineering/aft_hallway)
-"dyc" = (/obj/effect/floor_decal/industrial/warning,/obj/machinery/button/remote/blast_door{desc = "A remote control-switch for the engine control room blast doors."; id = "EngineEmitterPortWest"; name = "Engine Room Blast Doors"; pixel_x = 0; pixel_y = 25; req_access = null; req_one_access = list(11,24)},/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22; pixel_y = 0},/obj/machinery/atmospherics/unary/vent_pump/on{dir = 4},/turf/simulated/floor/tiled,/area/engineering/engine_waste)
+"dyc" = (/obj/effect/floor_decal/industrial/warning,/obj/machinery/button/remote/blast_door{desc = "A remote control-switch for the engine control room blast doors."; id = "EngineEmitterPortWest"; name = "Engine Room Blast Doors"; pixel_x = 0; pixel_y = 25; req_access = null; req_one_access = list(11,24)},/obj/machinery/alarm{dir = 4; pixel_x = -22; pixel_y = 0},/obj/machinery/atmospherics/unary/vent_pump/on{dir = 4},/turf/simulated/floor/tiled,/area/engineering/engine_waste)
 "dyd" = (/obj/effect/floor_decal/industrial/warning,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 5},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 9; pixel_y = 0},/turf/simulated/floor/tiled/steel,/area/engineering/engine_waste)
 "dye" = (/obj/effect/floor_decal/industrial/warning,/obj/structure/closet/radiation,/obj/item/clothing/glasses/meson,/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 8},/obj/machinery/camera/network/engine{c_tag = "ENG - Waste Handling"},/turf/simulated/floor/tiled,/area/engineering/engine_waste)
 "dyf" = (/obj/machinery/power/apc{dir = 8; name = "west bump"; pixel_x = -24},/obj/structure/cable/green,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/light_switch{pixel_x = -38; pixel_y = 0},/turf/simulated/floor/tiled,/area/engineering/engine_smes)
@@ -9436,7 +9436,7 @@
 "dzx" = (/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/machinery/power/apc{dir = 4; name = "east bump"; pixel_x = 24},/obj/machinery/light_switch{pixel_x = 38; pixel_y = 0},/turf/simulated/floor,/area/engineering/engine_waste)
 "dzy" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 5},/turf/simulated/floor/tiled,/area/engineering/engine_smes)
 "dzz" = (/obj/item/stack/cable_coil,/obj/item/stack/cable_coil{pixel_x = 3; pixel_y = 3},/obj/item/storage/box/lights/mixed,/obj/structure/table/steel,/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 8},/obj/machinery/light{dir = 4},/turf/simulated/floor/tiled,/area/engineering/engine_smes)
-"dzA" = (/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22},/obj/machinery/light{dir = 8},/turf/simulated/floor/tiled,/area/engineering/engine_monitoring)
+"dzA" = (/obj/machinery/alarm{dir = 4; pixel_x = -22},/obj/machinery/light{dir = 8},/turf/simulated/floor/tiled,/area/engineering/engine_monitoring)
 "dzB" = (/turf/simulated/floor/tiled,/area/engineering/engine_monitoring)
 "dzC" = (/obj/structure/cable/green{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled,/area/engineering/engine_monitoring)
 "dzD" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled,/area/engineering/engine_monitoring)
@@ -9516,7 +9516,7 @@
 "dAZ" = (/obj/machinery/door/window/northleft{name = "Engine Waste"; req_one_access = list(10,24)},/turf/simulated/floor,/area/engineering/engine_waste)
 "dBa" = (/obj/machinery/atmospherics/pipe/simple/visible/black{dir = 6},/obj/machinery/door/window/northright{name = "Engine Waste"; req_one_access = list(10,24)},/turf/simulated/floor,/area/engineering/engine_waste)
 "dBb" = (/obj/machinery/atmospherics/portables_connector{dir = 8},/obj/effect/floor_decal/industrial/outline/yellow,/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor,/area/engineering/engine_waste)
-"dBc" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/effect/floor_decal/industrial/warning,/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22; pixel_y = 0},/turf/simulated/floor/tiled,/area/engineering/engine_smes)
+"dBc" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/effect/floor_decal/industrial/warning,/obj/machinery/alarm{dir = 4; pixel_x = -22; pixel_y = 0},/turf/simulated/floor/tiled,/area/engineering/engine_smes)
 "dBd" = (/obj/effect/floor_decal/industrial/warning/corner{dir = 8},/obj/machinery/camera/network/engine{c_tag = "ENG - SMES Room"; dir = 8},/turf/simulated/floor/tiled,/area/engineering/engine_smes)
 "dBe" = (/obj/structure/table/reinforced,/obj/machinery/firealarm{dir = 8; pixel_x = -24},/obj/machinery/camera/network/engine{c_tag = "ENG - Monitoring Room"; dir = 4},/obj/item/book/manual/supermatter_engine,/turf/simulated/floor/tiled,/area/engineering/engine_monitoring)
 "dBf" = (/obj/structure/bed/chair/office/dark,/obj/effect/landmark/start{name = "Station Engineer"},/turf/simulated/floor/tiled,/area/engineering/engine_monitoring)
@@ -9579,7 +9579,7 @@
 "dCk" = (/obj/structure/extinguisher_cabinet{pixel_x = 25; pixel_y = 0},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/D3)
 "dCl" = (/obj/structure/extinguisher_cabinet{pixel_x = -27; pixel_y = 1},/obj/machinery/atmospherics/pipe/simple/hidden,/turf/simulated/floor/tiled,/area/hallway/secondary/entry/D4)
 "dCm" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled,/area/hallway/secondary/entry/D4)
-"dCn" = (/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/D4)
+"dCn" = (/obj/machinery/alarm{dir = 8; pixel_x = 24},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/D4)
 "dCo" = (/obj/structure/shuttle/engine/propulsion/burst{dir = 1},/turf/simulated/shuttle/wall,/area/shuttle/escape_pod4/station)
 "dCp" = (/obj/machinery/door/airlock/external{frequency = 1380; icon_state = "door_locked"; id_tag = "escape_pod_4_hatch"; locked = 1; name = "Escape Pod Hatch 4"; req_access = list(13)},/turf/simulated/shuttle/floor,/area/shuttle/escape_pod4/station)
 "dCq" = (/obj/structure/shuttle/engine/propulsion/burst{dir = 1},/turf/simulated/shuttle/wall,/area/shuttle/escape_pod3/station)
@@ -9612,7 +9612,7 @@
 "dCR" = (/obj/structure/bed/chair,/obj/item/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -28},/obj/structure/closet/walllocker/emerglocker{pixel_x = 28},/turf/simulated/shuttle/floor,/area/shuttle/escape_pod4/station)
 "dCS" = (/turf/simulated/shuttle/wall,/area/shuttle/escape_pod3/station)
 "dCT" = (/obj/structure/bed/chair,/obj/item/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -28},/obj/structure/closet/walllocker/emerglocker{pixel_x = 28},/turf/simulated/shuttle/floor,/area/shuttle/escape_pod3/station)
-"dCU" = (/obj/item/stool,/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22},/obj/machinery/camera/network/engineering{c_tag = "ENG - Solar Aft Starboard"; dir = 4},/turf/simulated/floor/plating,/area/maintenance/starboardsolar)
+"dCU" = (/obj/item/stool,/obj/machinery/alarm{dir = 4; pixel_x = -22},/obj/machinery/camera/network/engineering{c_tag = "ENG - Solar Aft Starboard"; dir = 4},/turf/simulated/floor/plating,/area/maintenance/starboardsolar)
 "dCV" = (/obj/effect/decal/cleanable/dirt,/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/plating,/area/maintenance/starboardsolar)
 "dCW" = (/obj/machinery/power/terminal{icon_state = "term"; dir = 1},/obj/machinery/light/small{dir = 4},/obj/structure/cable/yellow{d2 = 8; icon_state = "0-8"},/turf/simulated/floor/plating,/area/maintenance/starboardsolar)
 "dCX" = (/obj/effect/landmark{name = "carpspawn"},/turf/space,/area/syndicate_station/southwest)
@@ -9645,8 +9645,8 @@
 "dDy" = (/obj/effect/floor_decal/industrial/warning/corner,/obj/machinery/atmospherics/pipe/simple/hidden,/turf/simulated/floor/tiled,/area/hallway/secondary/entry/D1)
 "dDz" = (/obj/effect/floor_decal/industrial/warning,/obj/machinery/access_button{command = "cycle_interior"; frequency = 1380; master_tag = "trade_shuttle_dock_airlock"; name = "interior access button"; pixel_x = -28; pixel_y = -26; req_access = list(13)},/obj/effect/floor_decal/sign/dock/one,/turf/simulated/floor/tiled,/area/hallway/secondary/entry/D1)
 "dDA" = (/obj/effect/floor_decal/industrial/warning,/turf/simulated/floor/tiled,/area/hallway/secondary/entry/D1)
-"dDB" = (/obj/machinery/alarm{dir = 1; icon_state = "alarm0"; pixel_y = -22},/obj/structure/table/standard,/obj/effect/floor_decal/industrial/warning/corner{dir = 8},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/D1)
-"dDC" = (/obj/machinery/alarm{dir = 1; icon_state = "alarm0"; pixel_y = -22},/obj/structure/table/standard,/obj/effect/floor_decal/industrial/warning/corner,/turf/simulated/floor/tiled,/area/hallway/secondary/entry/D2)
+"dDB" = (/obj/machinery/alarm{dir = 1; pixel_y = -22},/obj/structure/table/standard,/obj/effect/floor_decal/industrial/warning/corner{dir = 8},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/D1)
+"dDC" = (/obj/machinery/alarm{dir = 1; pixel_y = -22},/obj/structure/table/standard,/obj/effect/floor_decal/industrial/warning/corner,/turf/simulated/floor/tiled,/area/hallway/secondary/entry/D2)
 "dDD" = (/obj/effect/floor_decal/industrial/warning,/turf/simulated/floor/tiled,/area/hallway/secondary/entry/D2)
 "dDE" = (/obj/machinery/access_button{command = "cycle_interior"; frequency = 1380; master_tag = "admin_shuttle_dock_airlock"; name = "interior access button"; pixel_x = 26; pixel_y = -26; req_one_access = list(13)},/obj/effect/floor_decal/industrial/warning,/obj/effect/floor_decal/sign/dock/two,/turf/simulated/floor/tiled,/area/hallway/secondary/entry/D2)
 "dDF" = (/obj/machinery/atmospherics/pipe/simple/hidden,/obj/effect/floor_decal/industrial/warning/corner{dir = 8},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/D2)
@@ -9655,7 +9655,7 @@
 "dDI" = (/obj/effect/floor_decal/industrial/warning/corner,/obj/machinery/atmospherics/pipe/simple/hidden,/turf/simulated/floor/tiled,/area/hallway/secondary/entry/D3)
 "dDJ" = (/obj/effect/floor_decal/industrial/warning,/obj/machinery/access_button{command = "cycle_interior"; frequency = 1379; master_tag = "dock_three_aft_airlock"; name = "interior access button"; pixel_x = -28; pixel_y = -26; req_access = list(13)},/obj/effect/floor_decal/sign/dock/three,/turf/simulated/floor/tiled,/area/hallway/secondary/entry/D3)
 "dDK" = (/obj/effect/floor_decal/industrial/warning,/turf/simulated/floor/tiled,/area/hallway/secondary/entry/D3)
-"dDL" = (/obj/machinery/alarm{dir = 1; icon_state = "alarm0"; pixel_y = -22},/obj/structure/table/standard,/obj/effect/floor_decal/industrial/warning/corner{dir = 8},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/D3)
+"dDL" = (/obj/machinery/alarm{dir = 1; pixel_y = -22},/obj/structure/table/standard,/obj/effect/floor_decal/industrial/warning/corner{dir = 8},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/D3)
 "dDM" = (/obj/machinery/atmospherics/pipe/simple/hidden,/obj/effect/floor_decal/industrial/warning,/turf/simulated/floor/tiled,/area/hallway/secondary/entry/D4)
 "dDN" = (/obj/machinery/access_button{command = "cycle_interior"; frequency = 1331; master_tag = "nuke_shuttle_dock_airlock"; name = "interior access button"; pixel_x = 26; pixel_y = -26; req_one_access = list(13)},/obj/effect/floor_decal/industrial/warning,/turf/simulated/floor/tiled,/area/hallway/secondary/entry/D4)
 "dDO" = (/obj/effect/floor_decal/industrial/warning/corner{dir = 8},/obj/machinery/firealarm{dir = 4; layer = 3.3; pixel_x = 26},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/D4)
diff --git a/archive/maps/northern_star/polaris-2.dmm b/archive/maps/northern_star/polaris-2.dmm
index f4b048f2d5..b86d5081e6 100644
--- a/archive/maps/northern_star/polaris-2.dmm
+++ b/archive/maps/northern_star/polaris-2.dmm
@@ -2730,7 +2730,6 @@
 	dir = 8
 	},
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	pixel_x = 32
 	},
 /turf/simulated/floor/carpet,
@@ -5542,10 +5541,7 @@
 	},
 /area/centcom/specops)
 "ne" = (
-/turf/unsimulated/wall{
-	icon = 'icons/misc/title.dmi';
-	icon_state = "title"
-	},
+/turf/unsimulated/wall,
 /area)
 "nf" = (
 /turf/unsimulated/wall,
@@ -11635,7 +11631,6 @@
 /obj/item/storage/box/donkpockets,
 /obj/item/storage/box/donkpockets,
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	pixel_x = 30
 	},
 /obj/effect/floor_decal/corner/orange{
@@ -14759,7 +14754,6 @@
 "FO" = (
 /obj/structure/table/standard,
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	pixel_x = -30
 	},
 /turf/unsimulated/floor{
@@ -14775,7 +14769,6 @@
 "FQ" = (
 /obj/structure/table/standard,
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	pixel_x = 30
 	},
 /turf/unsimulated/floor{
@@ -15626,7 +15619,6 @@
 	dir = 8
 	},
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	pixel_x = -30
 	},
 /turf/unsimulated/floor{
@@ -18327,9 +18319,7 @@
 /turf/simulated/shuttle/floor/white,
 /area/centcom/evac)
 "Nu" = (
-/turf/unsimulated/floor{
-	icon_state = "sandwater"
-	},
+/turf/unsimulated/floor,
 /area/beach)
 "Nv" = (
 /turf/unsimulated/wall{
diff --git a/archive/maps/northern_star/polaris-3.dmm b/archive/maps/northern_star/polaris-3.dmm
index 06c6d021da..8a93c1f613 100644
--- a/archive/maps/northern_star/polaris-3.dmm
+++ b/archive/maps/northern_star/polaris-3.dmm
@@ -1098,7 +1098,6 @@
 	},
 /obj/machinery/alarm{
 	dir = 4;
-	icon_state = "alarm0";
 	pixel_x = -22
 	},
 /turf/simulated/floor/tiled,
@@ -2880,7 +2879,6 @@
 "gT" = (
 /obj/machinery/alarm{
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /turf/simulated/floor/tiled/dark,
@@ -3078,7 +3076,6 @@
 "hl" = (
 /obj/machinery/alarm{
 	dir = 4;
-	icon_state = "alarm0";
 	pixel_x = -22
 	},
 /turf/simulated/floor/tiled/dark,
diff --git a/archive/maps/northern_star/polaris-4.dmm b/archive/maps/northern_star/polaris-4.dmm
index e17bb1608e..04cf27a42b 100644
--- a/archive/maps/northern_star/polaris-4.dmm
+++ b/archive/maps/northern_star/polaris-4.dmm
@@ -1638,7 +1638,6 @@
 	},
 /obj/machinery/alarm{
 	dir = 8;
-	icon_state = "alarm0";
 	pixel_x = 24
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
diff --git a/archive/maps/northern_star/polaris-5.dmm b/archive/maps/northern_star/polaris-5.dmm
index 8bd0e71af8..118ebf57b5 100644
--- a/archive/maps/northern_star/polaris-5.dmm
+++ b/archive/maps/northern_star/polaris-5.dmm
@@ -482,7 +482,6 @@
 "bo" = (
 /obj/machinery/alarm{
 	dir = 4;
-	icon_state = "alarm0";
 	pixel_x = -22
 	},
 /obj/machinery/camera/network/research_outpost{
@@ -1903,7 +1902,6 @@
 	},
 /obj/machinery/alarm{
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /turf/simulated/floor/tiled,
@@ -2420,7 +2418,6 @@
 "eY" = (
 /obj/machinery/alarm{
 	dir = 4;
-	icon_state = "alarm0";
 	pixel_x = -22
 	},
 /obj/effect/floor_decal/corner/purple{
@@ -3361,7 +3358,6 @@
 "he" = (
 /obj/machinery/alarm{
 	dir = 4;
-	icon_state = "alarm0";
 	pixel_x = -22
 	},
 /turf/simulated/floor/tiled,
@@ -4057,7 +4053,6 @@
 	},
 /obj/machinery/alarm{
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /turf/simulated/floor/tiled/white,
@@ -4835,7 +4830,6 @@
 	},
 /obj/machinery/alarm{
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /obj/effect/floor_decal/industrial/warning/corner{
@@ -5226,7 +5220,6 @@
 "kJ" = (
 /obj/machinery/alarm{
 	dir = 4;
-	icon_state = "alarm0";
 	pixel_x = -22
 	},
 /turf/simulated/floor/tiled/dark,
@@ -5742,7 +5735,6 @@
 "lS" = (
 /obj/machinery/alarm{
 	dir = 4;
-	icon_state = "alarm0";
 	pixel_x = -22
 	},
 /turf/simulated/floor/tiled,
@@ -7624,7 +7616,6 @@
 "pG" = (
 /obj/machinery/alarm{
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /obj/structure/cable/blue{
@@ -7714,7 +7705,6 @@
 	},
 /obj/machinery/alarm{
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /turf/simulated/floor/tiled/white,
@@ -7800,7 +7790,6 @@
 	},
 /obj/machinery/alarm{
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /turf/simulated/floor/tiled/white,
@@ -7926,7 +7915,6 @@
 	},
 /obj/machinery/alarm{
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /turf/simulated/floor/tiled,
@@ -8174,7 +8162,6 @@
 	},
 /obj/machinery/alarm{
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /turf/simulated/floor/tiled,
@@ -8759,7 +8746,6 @@
 	},
 /obj/machinery/alarm{
 	dir = 4;
-	icon_state = "alarm0";
 	pixel_x = -22;
 	pixel_y = 0
 	},
@@ -8994,7 +8980,6 @@
 /obj/machinery/atmospherics/unary/vent_scrubber/on,
 /obj/machinery/alarm{
 	dir = 4;
-	icon_state = "alarm0";
 	pixel_x = -22;
 	pixel_y = 0
 	},
@@ -9639,7 +9624,6 @@
 /obj/effect/floor_decal/industrial/warning,
 /obj/machinery/alarm{
 	dir = 4;
-	icon_state = "alarm0";
 	pixel_x = -22
 	},
 /turf/simulated/floor/tiled,
@@ -9739,7 +9723,6 @@
 	},
 /obj/machinery/alarm{
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /obj/structure/cable/blue{
@@ -9865,7 +9848,6 @@
 	},
 /obj/machinery/alarm{
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /turf/simulated/floor/tiled/dark,
@@ -11288,7 +11270,6 @@
 /obj/item/storage/box/donkpockets,
 /obj/machinery/alarm{
 	dir = 8;
-	icon_state = "alarm0";
 	pixel_x = 24
 	},
 /turf/simulated/floor/tiled/dark,
@@ -13956,7 +13937,6 @@
 /obj/structure/disposalpipe/segment,
 /obj/machinery/alarm{
 	dir = 8;
-	icon_state = "alarm0";
 	pixel_x = 24
 	},
 /turf/simulated/floor/tiled,
@@ -14938,7 +14918,6 @@
 "EM" = (
 /obj/machinery/alarm{
 	dir = 4;
-	icon_state = "alarm0";
 	pixel_x = -20
 	},
 /turf/simulated/floor/tiled,
@@ -15824,7 +15803,6 @@
 	},
 /obj/machinery/alarm{
 	dir = 8;
-	icon_state = "alarm0";
 	pixel_x = 24
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -15872,7 +15850,6 @@
 /obj/machinery/atmospherics/pipe/simple/visible/cyan,
 /obj/machinery/alarm{
 	dir = 8;
-	icon_state = "alarm0";
 	pixel_x = 24
 	},
 /turf/simulated/floor/plating,
@@ -15909,7 +15886,6 @@
 /obj/structure/table/steel,
 /obj/machinery/alarm{
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /turf/simulated/floor/tiled,
@@ -16078,7 +16054,6 @@
 	},
 /obj/machinery/alarm{
 	dir = 4;
-	icon_state = "alarm0";
 	pixel_x = -20
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -16759,7 +16734,6 @@
 "IK" = (
 /obj/machinery/alarm{
 	dir = 4;
-	icon_state = "alarm0";
 	pixel_x = -20
 	},
 /turf/simulated/floor/tiled,
diff --git a/archive/maps/southern_cross/southern_cross-1.dmm b/archive/maps/southern_cross/southern_cross-1.dmm
index d68d3e83bc..dbb7bcee5f 100644
--- a/archive/maps/southern_cross/southern_cross-1.dmm
+++ b/archive/maps/southern_cross/southern_cross-1.dmm
@@ -26429,7 +26429,6 @@
 /area/security/main)
 "bbj" = (
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	pixel_y = 32
 	},
 /obj/machinery/vending/cola,
@@ -26591,7 +26590,6 @@
 	dir = 1
 	},
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	pixel_y = -32
 	},
 /obj/machinery/light,
@@ -32648,7 +32646,6 @@
 	pixel_x = 32
 	},
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	pixel_y = 32
 	},
 /obj/effect/floor_decal/borderfloorblack{
@@ -43744,7 +43741,6 @@
 "bGE" = (
 /obj/structure/table/steel,
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	pixel_y = 32
 	},
 /obj/effect/floor_decal/borderfloorblack{
@@ -44969,7 +44965,6 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/light,
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	pixel_y = -32
 	},
 /obj/item/tabloid,
@@ -54002,7 +53997,6 @@
 	},
 /obj/effect/floor_decal/corner/white/diagonal,
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	pixel_y = -32
 	},
 /turf/simulated/floor/tiled,
@@ -63949,7 +63943,6 @@
 	pixel_y = 30
 	},
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	pixel_x = -32
 	},
 /turf/simulated/floor/tiled/white,
@@ -64166,7 +64159,6 @@
 /obj/item/clothing/glasses/science,
 /obj/item/clothing/glasses/science,
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	pixel_y = 32
 	},
 /obj/machinery/light{
@@ -72806,7 +72798,6 @@
 	dir = 4
 	},
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	pixel_y = 32
 	},
 /turf/simulated/floor/carpet/sblucarpet,
@@ -76738,7 +76729,6 @@
 /obj/structure/table/glass,
 /obj/machinery/computer/med_data/laptop,
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	pixel_y = 32
 	},
 /obj/machinery/light{
@@ -77299,7 +77289,6 @@
 /obj/structure/bed/padded,
 /obj/item/bedsheet/brown,
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	pixel_y = 32
 	},
 /turf/simulated/floor/carpet,
@@ -77873,7 +77862,6 @@
 /obj/structure/bed/padded,
 /obj/item/bedsheet/brown,
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	pixel_y = 32
 	},
 /turf/simulated/floor/carpet,
@@ -81457,7 +81445,6 @@
 	pixel_x = 21
 	},
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	layer = 4;
 	pixel_y = -32
 	},
@@ -81503,7 +81490,6 @@
 	pixel_x = 30
 	},
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	layer = 4;
 	pixel_y = -32
 	},
@@ -84628,7 +84614,6 @@
 	dir = 4
 	},
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	pixel_x = 32
 	},
 /turf/simulated/floor/lino,
@@ -88603,7 +88588,6 @@
 	dir = 1
 	},
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	pixel_x = -32
 	},
 /obj/machinery/light{
@@ -88634,7 +88618,6 @@
 	dir = 1
 	},
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	pixel_x = 32
 	},
 /obj/machinery/light{
@@ -96578,7 +96561,6 @@
 /obj/item/folder/blue_hop,
 /obj/item/pen/multi,
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	pixel_x = 32
 	},
 /turf/simulated/floor/carpet,
@@ -96707,7 +96689,6 @@
 /obj/item/folder/white_cmo,
 /obj/item/pen/multi,
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	pixel_x = 32
 	},
 /turf/simulated/floor/carpet/blue,
@@ -96724,7 +96705,6 @@
 /obj/item/folder/white_rd,
 /obj/item/pen/multi,
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	pixel_x = -32
 	},
 /turf/simulated/floor/carpet,
@@ -99124,7 +99104,6 @@
 	dir = 8
 	},
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	pixel_x = 32
 	},
 /turf/simulated/floor/tiled/freezer,
@@ -99141,7 +99120,6 @@
 /obj/item/folder/yellow_ce,
 /obj/item/pen/multi,
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	pixel_x = -32
 	},
 /turf/simulated/floor/carpet,
@@ -99301,7 +99279,6 @@
 /obj/item/folder/red_hos,
 /obj/item/pen/multi,
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	pixel_x = 32
 	},
 /turf/simulated/floor/carpet,
@@ -99311,7 +99288,6 @@
 	dir = 8
 	},
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	pixel_x = -32
 	},
 /obj/structure/table/standard,
@@ -99812,7 +99788,6 @@
 "dNA" = (
 /obj/machinery/vending/coffee,
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	pixel_x = 32
 	},
 /turf/simulated/floor/wood,
@@ -99897,7 +99872,6 @@
 /obj/structure/table/wooden_reinforced,
 /obj/machinery/atmospherics/unary/vent_pump/on,
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	pixel_x = -32
 	},
 /obj/item/flashlight/lamp/green,
@@ -103819,7 +103793,6 @@
 /area/construction/seconddeck/construction2)
 "dVc" = (
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	pixel_y = -32
 	},
 /obj/item/stack/cable_coil{
diff --git a/archive/maps/southern_cross/southern_cross-3.dmm b/archive/maps/southern_cross/southern_cross-3.dmm
index 41baf37324..8c756ba9a0 100644
--- a/archive/maps/southern_cross/southern_cross-3.dmm
+++ b/archive/maps/southern_cross/southern_cross-3.dmm
@@ -802,7 +802,6 @@
 /obj/effect/floor_decal/industrial/hatch/yellow,
 /obj/machinery/alarm{
 	dir = 4;
-	icon_state = "alarm0";
 	pixel_x = -22
 	},
 /turf/simulated/floor/tiled,
@@ -927,7 +926,6 @@
 /obj/structure/bed/roller,
 /obj/machinery/alarm{
 	dir = 8;
-	icon_state = "alarm0";
 	pixel_x = 22
 	},
 /obj/effect/floor_decal/borderfloorwhite{
@@ -1182,7 +1180,6 @@
 	},
 /obj/machinery/alarm{
 	dir = 4;
-	icon_state = "alarm0";
 	pixel_x = -22
 	},
 /turf/simulated/floor/tiled,
@@ -4109,7 +4106,6 @@
 "jb" = (
 /obj/machinery/alarm{
 	dir = 8;
-	icon_state = "alarm0";
 	pixel_x = 22
 	},
 /obj/effect/floor_decal/borderfloor{
@@ -4209,7 +4205,6 @@
 "jm" = (
 /obj/machinery/alarm{
 	dir = 8;
-	icon_state = "alarm0";
 	pixel_x = 22
 	},
 /turf/simulated/floor/tiled,
@@ -4231,7 +4226,6 @@
 	},
 /obj/machinery/alarm{
 	dir = 8;
-	icon_state = "alarm0";
 	pixel_x = 22
 	},
 /turf/simulated/floor/plating,
@@ -4716,7 +4710,6 @@
 	},
 /obj/machinery/alarm{
 	dir = 4;
-	icon_state = "alarm0";
 	pixel_x = -22
 	},
 /obj/effect/floor_decal/borderfloor,
@@ -5235,7 +5228,6 @@
 /obj/structure/table/marble,
 /obj/machinery/alarm{
 	dir = 4;
-	icon_state = "alarm0";
 	pixel_x = -22
 	},
 /obj/item/reagent_containers/food/condiment/small/saltshaker,
@@ -5766,7 +5758,6 @@
 	},
 /obj/machinery/alarm{
 	dir = 8;
-	icon_state = "alarm0";
 	pixel_x = 22
 	},
 /turf/simulated/floor/plating,
@@ -5839,7 +5830,6 @@
 /obj/item/storage/firstaid/regular,
 /obj/machinery/alarm{
 	dir = 8;
-	icon_state = "alarm0";
 	pixel_x = 22
 	},
 /turf/simulated/floor/tiled,
@@ -6058,7 +6048,6 @@
 /obj/structure/table/standard,
 /obj/item/storage/box/cups,
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	pixel_x = 32;
 	pixel_y = 0
 	},
@@ -6275,7 +6264,6 @@
 	},
 /obj/machinery/alarm{
 	dir = 8;
-	icon_state = "alarm0";
 	pixel_x = 22
 	},
 /turf/simulated/floor/tiled/freezer,
@@ -6339,7 +6327,6 @@
 	},
 /obj/machinery/alarm{
 	dir = 4;
-	icon_state = "alarm0";
 	pixel_x = -22
 	},
 /obj/item/radio/intercom{
@@ -7773,7 +7760,6 @@
 "qO" = (
 /obj/machinery/alarm{
 	dir = 8;
-	icon_state = "alarm0";
 	pixel_x = 22
 	},
 /turf/simulated/floor/tiled/freezer,
@@ -8006,7 +7992,6 @@
 /area/surface/outpost/main/dorms)
 "rl" = (
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	pixel_x = 0;
 	pixel_y = 32
 	},
@@ -8159,7 +8144,6 @@
 /area/surface/outpost/main/dorms)
 "ry" = (
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	pixel_x = 0;
 	pixel_y = 32
 	},
@@ -8312,7 +8296,6 @@
 "rO" = (
 /obj/structure/table/standard,
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	pixel_x = 32;
 	pixel_y = 0
 	},
@@ -8941,7 +8924,6 @@
 "tb" = (
 /obj/structure/table/standard,
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	pixel_x = 32;
 	pixel_y = 0
 	},
@@ -9041,7 +9023,6 @@
 /area/surface/outpost/main/pool)
 "tm" = (
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	pixel_x = -32;
 	pixel_y = 0
 	},
@@ -9085,7 +9066,6 @@
 /area/surface/outpost/main/pool)
 "ts" = (
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	pixel_x = 32;
 	pixel_y = 0
 	},
@@ -9728,7 +9708,6 @@
 "vf" = (
 /obj/structure/table/reinforced,
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	pixel_x = 0;
 	pixel_y = 32
 	},
@@ -9758,7 +9737,6 @@
 "vi" = (
 /obj/structure/table/standard,
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	pixel_x = -32;
 	pixel_y = 0
 	},
@@ -9787,7 +9765,6 @@
 "vm" = (
 /obj/machinery/alarm{
 	dir = 8;
-	icon_state = "alarm0";
 	pixel_x = 22
 	},
 /turf/simulated/floor/plating,
@@ -12371,7 +12348,6 @@
 /obj/machinery/portable_atmospherics/hydroponics,
 /obj/machinery/alarm{
 	dir = 8;
-	icon_state = "alarm0";
 	pixel_x = 22
 	},
 /turf/simulated/floor/tiled/hydro,
diff --git a/archive/maps/southern_cross/southern_cross-4.dmm b/archive/maps/southern_cross/southern_cross-4.dmm
index 18038970b2..bbb46a0b71 100644
--- a/archive/maps/southern_cross/southern_cross-4.dmm
+++ b/archive/maps/southern_cross/southern_cross-4.dmm
@@ -510,7 +510,6 @@
 	},
 /obj/machinery/alarm{
 	dir = 8;
-	icon_state = "alarm0";
 	pixel_x = 22
 	},
 /turf/simulated/floor/tiled/freezer,
@@ -1421,7 +1420,6 @@
 "dc" = (
 /obj/machinery/alarm{
 	dir = 8;
-	icon_state = "alarm0";
 	pixel_x = 22
 	},
 /obj/machinery/light{
@@ -2734,7 +2732,6 @@
 	},
 /obj/machinery/alarm{
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /turf/simulated/floor/tiled/white,
@@ -3389,7 +3386,6 @@
 	},
 /obj/machinery/alarm{
 	dir = 8;
-	icon_state = "alarm0";
 	pixel_x = 22
 	},
 /turf/simulated/floor/tiled/white,
@@ -3455,7 +3451,6 @@
 	},
 /obj/machinery/alarm{
 	dir = 4;
-	icon_state = "alarm0";
 	pixel_x = -22;
 	pixel_y = 0
 	},
diff --git a/archive/maps/southern_cross/southern_cross-6.dmm b/archive/maps/southern_cross/southern_cross-6.dmm
index 3c44e18ff5..792d4531c0 100644
--- a/archive/maps/southern_cross/southern_cross-6.dmm
+++ b/archive/maps/southern_cross/southern_cross-6.dmm
@@ -1633,7 +1633,7 @@
 "Fu" = (/obj/effect/overlay/palmtree_l,/turf/unsimulated/beach/sand,/area/beach)
 "Fv" = (/obj/effect/overlay/palmtree_r,/obj/effect/overlay/coconut,/turf/unsimulated/beach/sand,/area/beach)
 "Fw" = (/obj/effect/overlay/coconut,/turf/unsimulated/beach/sand,/area/beach)
-"Fx" = (/obj/item/target/alien,/turf/unsimulated/floor{icon = 'icons/turf/flooring/wood.dmi'; icon_state = "wood_broken2"},/area/ninja_dojo/dojo)
+"Fx" = (/obj/item/target/alien,/turf/unsimulated/floor{icon = 'icons/turf/flooring/wood.dmi'; icon_state = "wood-broken2"},/area/ninja_dojo/dojo)
 "Fy" = (/turf/unsimulated/floor{dir = 8; icon_state = "wood"},/area/ninja_dojo/dojo)
 "Fz" = (/obj/structure/table/wooden_reinforced,/obj/item/flame/candle,/turf/unsimulated/floor{dir = 8; icon_state = "wood"},/area/ninja_dojo/dojo)
 "FA" = (/obj/structure/table/wooden_reinforced,/obj/item/material/sword/katana,/turf/unsimulated/floor{dir = 8; icon_state = "wood"},/area/ninja_dojo/dojo)
@@ -1686,7 +1686,7 @@
 "Gv" = (/obj/effect/floor_decal/carpet{dir = 4},/obj/effect/floor_decal/carpet,/obj/effect/floor_decal/carpet{dir = 6},/turf/unsimulated/floor{dir = 2; icon_state = "carpet"},/area/ninja_dojo/dojo)
 "Gw" = (/obj/machinery/computer/security{dir = 8},/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/security)
 "Gx" = (/obj/machinery/computer/cloning{dir = 1},/turf/simulated/shuttle/floor/white,/area/centcom/evac)
-"Gy" = (/turf/unsimulated/floor{icon = 'icons/turf/flooring/wood.dmi'; icon_state = "wood_broken1"},/area/ninja_dojo/dojo)
+"Gy" = (/turf/unsimulated/floor{icon = 'icons/turf/flooring/wood.dmi'; icon_state = "wood-broken1"},/area/ninja_dojo/dojo)
 "Gz" = (/obj/structure/table/steel_reinforced,/obj/item/paicard,/obj/item/pda/syndicate,/turf/simulated/shuttle/floor/voidcraft/light,/area/ninja_dojo/start)
 "GA" = (/obj/structure/bed/chair/comfy/black,/turf/simulated/shuttle/floor/voidcraft/dark,/area/ninja_dojo/start)
 "GB" = (/obj/structure/table/steel_reinforced,/obj/item/storage/toolbox/syndicate{pixel_x = -1; pixel_y = 3},/obj/machinery/button/remote/blast_door{id = "ninjawindow"; name = "remote shutter control"; pixel_x = 0; pixel_y = -25; req_access = list(150)},/turf/simulated/shuttle/floor/voidcraft/light,/area/ninja_dojo/start)
@@ -1751,7 +1751,7 @@
 "HI" = (/obj/machinery/sleep_console,/turf/unsimulated/floor{icon_state = "white"},/area/ninja_dojo/dojo)
 "HJ" = (/obj/structure/table/standard,/obj/item/storage/firstaid/adv{pixel_x = 5; pixel_y = 5},/obj/item/storage/firstaid/adv,/turf/unsimulated/floor{icon_state = "white"},/area/ninja_dojo/dojo)
 "HK" = (/turf/unsimulated/wall,/area/syndicate_station)
-"HL" = (/obj/machinery/space_heater,/turf/unsimulated/floor{icon = 'icons/turf/flooring/wood.dmi'; icon_state = "wood_broken3"},/area/ninja_dojo/dojo)
+"HL" = (/obj/machinery/space_heater,/turf/unsimulated/floor{icon = 'icons/turf/flooring/wood.dmi'; icon_state = "wood-broken3"},/area/ninja_dojo/dojo)
 "HM" = (/turf/unsimulated/wall,/area/syndicate_mothership/elite_squad)
 "HN" = (/turf/unsimulated/wall,/area/skipjack_station)
 "HO" = (/turf/unsimulated/wall,/area/prison/solitary)
@@ -1844,7 +1844,7 @@
 "Jx" = (/obj/structure/table/rack,/obj/item/gun/energy/darkmatter,/obj/item/gun/energy/darkmatter,/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/skipjack_station)
 "Jy" = (/obj/machinery/door/airlock/centcom{name = "Storage"; opacity = 1},/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_station)
 "Jz" = (/obj/machinery/door/airlock/centcom{icon_state = "door_locked"; locked = 1},/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_station)
-"JA" = (/obj/structure/bed/padded,/obj/item/bedsheet/orange,/turf/unsimulated/floor{icon = 'icons/turf/flooring/wood.dmi'; icon_state = "wood_broken1"},/area/skipjack_station)
+"JA" = (/obj/structure/bed/padded,/obj/item/bedsheet/orange,/turf/unsimulated/floor{icon = 'icons/turf/flooring/wood.dmi'; icon_state = "wood-broken1"},/area/skipjack_station)
 "JB" = (/obj/structure/table/standard,/turf/unsimulated/floor{icon_state = "wood"},/area/skipjack_station)
 "JC" = (/obj/structure/bed/padded,/obj/item/bedsheet/brown,/turf/unsimulated/floor{icon_state = "wood"},/area/skipjack_station)
 "JD" = (/obj/structure/bed/padded,/obj/item/bedsheet/green,/turf/unsimulated/floor{icon_state = "wood"},/area/skipjack_station)
@@ -1883,7 +1883,7 @@
 "Kk" = (/obj/machinery/recharge_station,/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/syndicate_station)
 "Kl" = (/obj/machinery/computer/station_alert{dir = 1},/turf/simulated/shuttle/floor/black,/area/centcom/evac)
 "Km" = (/obj/machinery/computer/card{dir = 1},/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/security)
-"Kn" = (/turf/unsimulated/floor{icon = 'icons/turf/flooring/wood.dmi'; icon_state = "wood_broken3"},/area/skipjack_station)
+"Kn" = (/turf/unsimulated/floor{icon = 'icons/turf/flooring/wood.dmi'; icon_state = "wood-broken3"},/area/skipjack_station)
 "Ko" = (/obj/effect/floor_decal/carpet{dir = 8},/obj/effect/floor_decal/carpet{dir = 4},/turf/unsimulated/floor{dir = 2; icon_state = "carpet"},/area/skipjack_station)
 "Kp" = (/obj/machinery/door/airlock/hatch{req_access = list(150)},/turf/unsimulated/floor{icon_state = "steel_dirty"},/area/skipjack_station)
 "Kq" = (/turf/unsimulated/floor{icon_state = "steel_dirty"},/area/skipjack_station)
@@ -1895,7 +1895,7 @@
 "Kw" = (/obj/structure/mirror{dir = 4; pixel_x = -32; pixel_y = 0},/obj/structure/sink{icon_state = "sink"; dir = 8; pixel_x = -12; pixel_y = 2},/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/syndicate_station)
 "Kx" = (/turf/simulated/shuttle/wall/dark/hard_corner,/area/shuttle/syndicate_elite/mothership)
 "Ky" = (/obj/machinery/door/airlock/external{name = "Shuttle Airlock"; req_access = list(150)},/obj/machinery/door/blast/regular{icon_state = "pdoor1"; id = "syndicate_elite"; name = "Front Hull Door"; opacity = 1},/turf/simulated/shuttle/plating,/area/shuttle/syndicate_elite/mothership)
-"Kz" = (/obj/effect/landmark{name = "voxstart"},/turf/unsimulated/floor{icon = 'icons/turf/flooring/wood.dmi'; icon_state = "wood_broken2"},/area/skipjack_station)
+"Kz" = (/obj/effect/landmark{name = "voxstart"},/turf/unsimulated/floor{icon = 'icons/turf/flooring/wood.dmi'; icon_state = "wood-broken2"},/area/skipjack_station)
 "KA" = (/obj/effect/floor_decal/carpet{dir = 8},/obj/effect/floor_decal/carpet{dir = 4},/obj/effect/floor_decal/carpet{dir = 10},/obj/effect/floor_decal/carpet{dir = 6},/turf/unsimulated/floor{dir = 2; icon_state = "carpet"},/area/skipjack_station)
 "KB" = (/obj/machinery/door/airlock/hatch{req_access = list(150)},/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/skipjack_station)
 "KC" = (/obj/structure/table/rack,/obj/item/clothing/glasses/thermal/plain/monocle,/turf/unsimulated/floor{icon_state = "asteroid"},/area/skipjack_station)
@@ -2239,7 +2239,7 @@
 "Rc" = (/obj/item/pizzabox/meat,/turf/simulated/shuttle/floor/red,/area/skipjack_station/start)
 "Rd" = (/obj/item/bedsheet/clown,/obj/structure/bed/padded,/turf/simulated/shuttle/floor/red,/area/skipjack_station/start)
 "Re" = (/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/space)
-"Rf" = (/turf/unsimulated/wall{icon = 'icons/misc/title.dmi'; icon_state = "title"},/area/space)
+"Rf" = (/turf/unsimulated/wall,/area/space)
 "Rg" = (/obj/effect/step_trigger/thrower{affect_ghosts = 1; direction = 2; name = "thrower_throwdown"; tiles = 0},/obj/effect/step_trigger/teleporter/random{affect_ghosts = 1; name = "escapeshuttle_leave"; teleport_x = 25; teleport_x_offset = 245; teleport_y = 25; teleport_y_offset = 245; teleport_z = 6; teleport_z_offset = 6},/obj/effect/step_trigger/teleporter/random{affect_ghosts = 1; name = "escapeshuttle_leave"; teleport_x = 25; teleport_x_offset = 245; teleport_y = 25; teleport_y_offset = 245; teleport_z = 6; teleport_z_offset = 6},/turf/simulated/mineral,/area/space)
 "Rh" = (/turf/unsimulated/wall,/area/tdome/tdomeobserve)
 "Ri" = (/obj/machinery/door/blast/regular{id = "thunderdomeaxe"; name = "Axe Supply"},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/tdome/tdome1)
diff --git a/archive/maps/submaps/engine_submaps/southern_cross/engine_rust.dmm b/archive/maps/submaps/engine_submaps/southern_cross/engine_rust.dmm
index a971b12a33..368b1971b7 100644
--- a/archive/maps/submaps/engine_submaps/southern_cross/engine_rust.dmm
+++ b/archive/maps/submaps/engine_submaps/southern_cross/engine_rust.dmm
@@ -671,7 +671,7 @@
 /obj/machinery/atmospherics/pipe/simple/visible/green{
 	dir = 10;
 	icon_state = "intact";
-	
+
 	},
 /obj/effect/floor_decal/industrial/warning,
 /turf/simulated/floor,
@@ -685,7 +685,7 @@
 /obj/machinery/atmospherics/pipe/manifold/visible/red{
 	dir = 8;
 	icon_state = "map";
-	
+
 	},
 /turf/simulated/floor,
 /area/engineering/engine_room)
@@ -1141,7 +1141,7 @@
 	dir = 1;
 	icon_state = "extinguisher_closed";
 	pixel_y = 32;
-	
+
 	},
 /turf/simulated/floor,
 /area/engineering/engine_gas)
@@ -1184,7 +1184,6 @@
 	},
 /obj/machinery/alarm{
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /turf/simulated/floor,
diff --git a/archive/maps/submaps/engine_submaps/southern_cross/engine_singulo.dmm b/archive/maps/submaps/engine_submaps/southern_cross/engine_singulo.dmm
index 5be48006a7..a02749a93c 100644
--- a/archive/maps/submaps/engine_submaps/southern_cross/engine_singulo.dmm
+++ b/archive/maps/submaps/engine_submaps/southern_cross/engine_singulo.dmm
@@ -35,7 +35,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden{
 	dir = 10;
 	icon_state = "intact";
-	
+
 	},
 /turf/simulated/floor,
 /area/engineering/engine_gas)
@@ -93,14 +93,13 @@
 /obj/machinery/atmospherics/pipe/manifold/hidden{
 	dir = 4;
 	icon_state = "map";
-	
+
 	},
 /turf/simulated/floor,
 /area/engineering/engine_gas)
 "aq" = (
 /obj/machinery/alarm{
 	dir = 8;
-	icon_state = "alarm0";
 	pixel_x = 24
 	},
 /obj/structure/dispenser/phoron,
@@ -201,7 +200,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden{
 	dir = 10;
 	icon_state = "intact";
-	
+
 	},
 /obj/effect/floor_decal/borderfloor{
 	dir = 1
@@ -395,7 +394,7 @@
 	dir = 1;
 	icon_state = "borderfloor";
 	pixel_y = 0;
-	
+
 	},
 /obj/effect/floor_decal/corner/yellow/border{
 	dir = 1
@@ -485,7 +484,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden{
 	dir = 5;
 	icon_state = "intact";
-	
+
 	},
 /turf/simulated/floor/tiled,
 /area/engineering/engine_room)
@@ -545,7 +544,7 @@
 /obj/machinery/atmospherics/pipe/manifold/hidden{
 	dir = 4;
 	icon_state = "map";
-	
+
 	},
 /turf/simulated/floor/tiled,
 /area/engineering/engine_room)
@@ -1222,7 +1221,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden{
 	dir = 9;
 	icon_state = "intact";
-	
+
 	},
 /turf/simulated/floor/tiled,
 /area/engineering/engine_room)
@@ -1286,7 +1285,6 @@
 	},
 /obj/machinery/alarm{
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /obj/effect/floor_decal/borderfloor,
@@ -1400,7 +1398,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden{
 	dir = 9;
 	icon_state = "intact";
-	
+
 	},
 /obj/effect/floor_decal/borderfloor,
 /obj/effect/floor_decal/corner/yellow/border,
diff --git a/code/game/machinery/camera/presets.dm b/code/game/machinery/camera/presets.dm
index ce93d75c37..f1e6d627d0 100644
--- a/code/game/machinery/camera/presets.dm
+++ b/code/game/machinery/camera/presets.dm
@@ -136,7 +136,7 @@ var/global/list/engineering_networks = list(
 // X-RAY
 
 /obj/machinery/camera/xray
-	icon_state = "xraycam" // Thanks to Krutchen for the icons.
+	icon_state = "camera" // Thanks to Krutchen for the icons. // no xraycam in vr icons
 
 /obj/machinery/camera/xray/command
 	network = list(NETWORK_COMMAND)
diff --git a/code/game/machinery/computer/camera.dm b/code/game/machinery/computer/camera.dm
index 3d42c2fe70..af2dba0c14 100644
--- a/code/game/machinery/computer/camera.dm
+++ b/code/game/machinery/computer/camera.dm
@@ -344,7 +344,7 @@ GLOBAL_LIST_EMPTY(bodycamera_screens) // CHOMPEdit
 /obj/machinery/computer/security/nuclear
 	name = "head mounted camera monitor"
 	desc = "Used to access the built-in cameras in helmets."
-	icon_state = "syndicam"
+	icon_state = "syndie"
 	network = list(NETWORK_MERCENARY)
 	circuit = null
 	req_access = list(150)
diff --git a/code/game/machinery/computer/security.dm b/code/game/machinery/computer/security.dm
index b695eb3617..17f9619792 100644
--- a/code/game/machinery/computer/security.dm
+++ b/code/game/machinery/computer/security.dm
@@ -520,7 +520,7 @@
 	..(severity)
 
 /obj/machinery/computer/secure_data/detective_computer
-	icon_state = "messyfiles"
+	icon_state = "forensic"
 
 #undef SEC_DATA_R_LIST
 #undef SEC_DATA_MAINT
diff --git a/code/game/machinery/cryopod.dm b/code/game/machinery/cryopod.dm
index ddae41fcbc..b735baa844 100644
--- a/code/game/machinery/cryopod.dm
+++ b/code/game/machinery/cryopod.dm
@@ -238,7 +238,7 @@
 	//This inherits from the robot cryo, so synths can be properly cryo'd.  If a non-synth enters and is cryo'd, ..() is called and it'll still work.
 	name = "Airlock of Wonders"
 	desc = "An airlock that isn't an airlock, and shouldn't exist.  Yell at a coder/mapper."
-	icon = 'icons/obj/doors/Doorint.dmi'
+	icon = 'icons/obj/doors/doorint.dmi'
 	icon_state = "door_open"
 	base_icon_state = "door_open"
 	occupied_icon_state = "door_closed"
diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm
index ff562d7a9c..df6066d22c 100644
--- a/code/game/machinery/doors/airlock.dm
+++ b/code/game/machinery/doors/airlock.dm
@@ -9,7 +9,7 @@
 /obj/machinery/door/airlock
 	name = "Airlock"
 	description_info = "If you hold left alt whilst left-clicking on an airlock, you can ring the doorbell to announce your presence to anyone on the other side! Alternately if you are on HARM intent when doing this, you will bang loudly on the door!<br><br>AIs and Cyborgs can also quickly open/close, bolt/unbolt, and electrify/de-electrify doors at a distance by holding left shift, left control, or left alt respectively whilst left-clicking."
-	icon = 'icons/obj/doors/Doorint.dmi'
+	icon = 'icons/obj/doors/doorint.dmi'
 	icon_state = "door_closed"
 	power_channel = ENVIRON
 
@@ -169,7 +169,7 @@
 
 /obj/machinery/door/airlock/medical
 	name = "Medical Airlock"
-	icon = 'icons/obj/doors/Doormed.dmi'
+	icon = 'icons/obj/doors/doormed.dmi'
 	req_one_access = list(access_medical)
 	assembly_type = /obj/structure/door_assembly/door_assembly_med
 	open_sound_powered = 'sound/machines/door/hall1o.ogg' // VOREStation Edit: Default door sounds for fancy, department-off.
@@ -387,7 +387,7 @@
 
 /obj/machinery/door/airlock/glass_medical
 	name = "Medical Airlock"
-	icon = 'icons/obj/doors/Doormedglass.dmi'
+	icon = 'icons/obj/doors/doormedglass.dmi'
 	hitsound = 'sound/effects/Glasshit.ogg'
 	maxhealth = 300
 	explosion_resistance = 5
@@ -424,7 +424,7 @@
 
 /obj/machinery/door/airlock/research
 	name = "Research Airlock"
-	icon = 'icons/obj/doors/Doorresearch.dmi'
+	icon = 'icons/obj/doors/doorresearch.dmi'
 	assembly_type = /obj/structure/door_assembly/door_assembly_research
 	open_sound_powered = 'sound/machines/door/hall1o.ogg' // VOREStation Edit: Default door sounds for fancy, department-off.
 	close_sound_powered = 'sound/machines/door/hall1c.ogg' // VOREStation Edit: Default door sounds for fancy, department-off.
@@ -434,7 +434,7 @@
 
 /obj/machinery/door/airlock/glass_research
 	name = "Research Airlock"
-	icon = 'icons/obj/doors/Doorresearchglass.dmi'
+	icon = 'icons/obj/doors/doorresearchglass.dmi'
 	hitsound = 'sound/effects/Glasshit.ogg'
 	maxhealth = 300
 	explosion_resistance = 5
@@ -555,7 +555,7 @@
 
 /obj/machinery/door/airlock/science
 	name = "Research Airlock"
-	icon = 'icons/obj/doors/Doorsci.dmi'
+	icon = 'icons/obj/doors/doorsci.dmi'
 	assembly_type = /obj/structure/door_assembly/door_assembly_science
 	req_one_access = list(access_research)
 	open_sound_powered = 'sound/machines/door/hall1o.ogg' // VOREStation Edit: Default door sounds for fancy, department-off.
@@ -566,7 +566,7 @@
 
 /obj/machinery/door/airlock/glass_science
 	name = "Glass Airlocks"
-	icon = 'icons/obj/doors/Doorsciglass.dmi'
+	icon = 'icons/obj/doors/doorsciglass.dmi'
 	opacity = 0
 	assembly_type = /obj/structure/door_assembly/door_assembly_science
 	glass = 1
diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm
index 7f6aeaeb6e..a7c00169ac 100644
--- a/code/game/machinery/doors/door.dm
+++ b/code/game/machinery/doors/door.dm
@@ -1,7 +1,7 @@
 /obj/machinery/door
 	name = "Door"
 	desc = "It opens and closes."
-	icon = 'icons/obj/doors/Doorint.dmi'
+	icon = 'icons/obj/doors/doorint.dmi'
 	icon_state = "door1"
 	anchored = TRUE
 	opacity = 1
diff --git a/code/game/objects/effects/gibs.dm b/code/game/objects/effects/gibs.dm
index e3ede73f84..27cac182a9 100644
--- a/code/game/objects/effects/gibs.dm
+++ b/code/game/objects/effects/gibs.dm
@@ -8,6 +8,9 @@
 	var/list/gibdirections = list() //of lists
 	var/fleshcolor //Used for gibbed humans.
 	var/bloodcolor //Used for gibbed humans.
+	invisibility = 99 // So a badmin can go view these by changing their see_invisible.
+	icon = 'icons/effects/map_effects.dmi'
+	icon_state = "gibspawn"
 
 /obj/effect/gibspawner/New(location, var/datum/dna/MobDNA, var/fleshcolor, var/bloodcolor)
 	..()
diff --git a/code/game/objects/items/stacks/marker_beacons.dm b/code/game/objects/items/stacks/marker_beacons.dm
index 72c7ee679f..31dd95baca 100644
--- a/code/game/objects/items/stacks/marker_beacons.dm
+++ b/code/game/objects/items/stacks/marker_beacons.dm
@@ -22,10 +22,11 @@ var/list/marker_beacon_colors = list(
 	description_info = "Use inhand to drop one marker beacon. You can pick them up again with an empty hand or \
 	hitting them with this marker stack. Alt-click to select a specific color."
 	icon = 'icons/obj/lighting.dmi'
-	icon_state = "marker"
+	icon_state = "markerrandom"
 	max_amount = 100
 	no_variants = TRUE
 	w_class = ITEMSIZE_SMALL
+	var/icon_base = "marker"
 	var/picked_color = "random"
 
 /obj/item/stack/marker_beacon/ten
@@ -47,7 +48,7 @@ var/list/marker_beacon_colors = list(
 	. += span_notice("Alt-click to select a color. Current color is [picked_color].")
 
 /obj/item/stack/marker_beacon/update_icon()
-	icon_state = "[initial(icon_state)][lowertext(picked_color)]"
+	icon_state = "[icon_base][lowertext(picked_color)]"
 
 /obj/item/stack/marker_beacon/attack_self(mob/user)
 	if(!isturf(user.loc))
@@ -79,11 +80,12 @@ var/list/marker_beacon_colors = list(
 	name = "marker beacon"
 	desc = "A prismatic path illumination device. It is anchored in place and glowing steadily."
 	icon = 'icons/obj/lighting.dmi'
-	icon_state = "marker"
+	icon_state = "markerrandom"
 //	layer = BELOW_OPEN_DOOR_LAYER
 	anchored = TRUE
 	light_range = 2
 	light_power = 0.8
+	var/icon_base = "marker"
 	var/remove_speed = 15
 	var/picked_color
 	var/perma = FALSE
@@ -105,7 +107,7 @@ var/list/marker_beacon_colors = list(
 /obj/structure/marker_beacon/update_icon()
 	if(!picked_color || !marker_beacon_colors[picked_color])
 		picked_color = pick(marker_beacon_colors)
-	icon_state = "[initial(icon_state)][lowertext(picked_color)]-on"
+	icon_state = "[icon_base][lowertext(picked_color)]-on"
 	set_light(light_range, light_power, marker_beacon_colors[picked_color])
 
 /obj/structure/marker_beacon/attack_hand(mob/living/user)
diff --git a/code/game/objects/items/weapons/policetape.dm b/code/game/objects/items/weapons/policetape.dm
index 46c1588244..70a0d5ade4 100644
--- a/code/game/objects/items/weapons/policetape.dm
+++ b/code/game/objects/items/weapons/policetape.dm
@@ -32,6 +32,7 @@ var/list/tape_roll_applications = list()
 /obj/item/tape
 	name = "tape"
 	icon = 'icons/policetape.dmi'
+	icon_state = "tape"
 	anchored = TRUE
 	layer = WINDOW_LAYER
 	var/lifted = 0
diff --git a/code/game/objects/random/guns_and_ammo.dm b/code/game/objects/random/guns_and_ammo.dm
index bd465e6608..b7a582f331 100644
--- a/code/game/objects/random/guns_and_ammo.dm
+++ b/code/game/objects/random/guns_and_ammo.dm
@@ -126,7 +126,6 @@
 /obj/random/handgun
 	name = "Random Handgun"
 	desc = "This is a random sidearm."
-	icon = 'icons/obj/gun.dmi'
 	icon_state = "gun"
 
 /obj/random/handgun/item_to_spawn()
@@ -239,7 +238,6 @@
 /obj/random/projectile/random
 	name = "Random Projectile Weapon"
 	desc = "This is a random projectile weapon."
-	icon = 'icons/obj/gun.dmi'
 	icon_state = "gun_2"
 
 /obj/random/projectile/random/item_to_spawn()
diff --git a/code/game/objects/random/misc.dm b/code/game/objects/random/misc.dm
index 565adb66a5..c84785b5d0 100644
--- a/code/game/objects/random/misc.dm
+++ b/code/game/objects/random/misc.dm
@@ -163,7 +163,7 @@
 /obj/random/tech_supply/component
 	name = "random tech component"
 	desc = "This is a random machine component."
-	icon_state = "tech"
+	icon_state = "random_device"
 
 /obj/random/tech_supply/component/item_to_spawn()
 	return pick(prob(3);/obj/item/stock_parts/gear,
diff --git a/code/game/objects/structures/barsign.dm b/code/game/objects/structures/barsign.dm
index 1bad5048c4..8c32a73329 100644
--- a/code/game/objects/structures/barsign.dm
+++ b/code/game/objects/structures/barsign.dm
@@ -2,7 +2,7 @@
 	desc = "The current barsign of this shift! The bartender can change it with their ID."
 	icon = 'icons/obj/barsigns.dmi'
 	plane = ABOVE_PLANE
-	icon_state = "empty"
+	icon_state = "Empty"
 	appearance_flags = 0
 	anchored = TRUE
 	var/cult = 0
diff --git a/code/game/objects/structures/crates_lockers/closets/coffin.dm b/code/game/objects/structures/crates_lockers/closets/coffin.dm
index 46ad381463..17f9d2f736 100644
--- a/code/game/objects/structures/crates_lockers/closets/coffin.dm
+++ b/code/game/objects/structures/crates_lockers/closets/coffin.dm
@@ -3,7 +3,7 @@
 	desc = "It's a burial receptacle for the dearly departed."
 	icon = 'icons/obj/closets/coffin.dmi'
 
-	icon_state = "closed_unlocked"
+	icon_state = "closed"
 	seal_tool = /obj/item/tool/screwdriver
 	breakout_sound = 'sound/weapons/tablehit1.ogg'
 	closet_appearance = null // Special icon for us
@@ -13,7 +13,7 @@
 	name = "grave"
 	desc = "Dirt."
 	icon = 'icons/obj/closets/grave.dmi'
-	icon_state = "closed_unlocked"
+	icon_state = ""
 	seal_tool = null
 	breakout_sound = 'sound/weapons/thudswoosh.ogg'
 	anchored = TRUE
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm b/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm
index e02cc997e5..a8bb044644 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm
@@ -20,6 +20,7 @@
 /obj/structure/closet/secure_closet/freezer/meat
 	name = "meat fridge"
 	icon = 'icons/obj/closets/fridge.dmi'
+	icon_state = ""
 	closet_appearance = null
 
 	open_sound = 'sound/machines/kitchen/fridge/open_fridge.ogg' // CHOMPEdit: Fridge sounds~
@@ -32,6 +33,7 @@
 /obj/structure/closet/secure_closet/freezer/fridge
 	name = "refrigerator"
 	icon = 'icons/obj/closets/fridge.dmi'
+	icon_state = ""
 	closet_appearance = null
 
 	open_sound = 'sound/machines/kitchen/fridge/open_fridge.ogg' // CHOMPEdit: Fridge sounds~
@@ -47,6 +49,7 @@
 /obj/structure/closet/secure_closet/freezer/money
 	name = "freezer"
 	icon = 'icons/obj/closets/fridge.dmi'
+	icon_state = ""
 	closet_appearance = null
 	req_access = list(access_heads_vault)
 
diff --git a/code/game/objects/structures/crates_lockers/crates.dm b/code/game/objects/structures/crates_lockers/crates.dm
index 3c6fb26d80..fc1b3c3148 100644
--- a/code/game/objects/structures/crates_lockers/crates.dm
+++ b/code/game/objects/structures/crates_lockers/crates.dm
@@ -378,6 +378,7 @@
 	desc = "A large bin."
 	closet_appearance = null
 	icon = 'icons/obj/closets/largebin.dmi'
+	icon_state = ""
 
 /obj/structure/closet/crate/radiation
 	name = "radioactive gear crate"
diff --git a/code/game/turfs/unsimulated/floor.dm b/code/game/turfs/unsimulated/floor.dm
index 7f3df78c13..6601917c19 100644
--- a/code/game/turfs/unsimulated/floor.dm
+++ b/code/game/turfs/unsimulated/floor.dm
@@ -1,7 +1,7 @@
 /turf/unsimulated/floor
 	name = "floor"
 	icon = 'icons/turf/floors.dmi'
-	icon_state = "Floor3"
+	icon_state = ""
 
 /turf/unsimulated/mask
 	name = "mask"
@@ -14,4 +14,4 @@
 /turf/unsimulated/elevator_shaft
 	name = "floor"
 	icon = 'icons/turf/floors.dmi'
-	icon_state = "elevatorshaft"
\ No newline at end of file
+	icon_state = "elevatorshaft"
diff --git a/code/modules/clothing/head/misc_ch.dm b/code/modules/clothing/head/misc_ch.dm
index dd4ea29e0a..d350bb629b 100644
--- a/code/modules/clothing/head/misc_ch.dm
+++ b/code/modules/clothing/head/misc_ch.dm
@@ -65,6 +65,7 @@
 	item_state = "bearpelt_brown"
 
 /obj/item/clothing/head/pelt/black
+	icon=""
 	icon_state = "bearpelt_black"
 	item_state = "bearpelt_black"
 
diff --git a/code/modules/clothing/spacesuits/rig/suits/station_ch.dm b/code/modules/clothing/spacesuits/rig/suits/station_ch.dm
index e002081a94..ba1f73d68a 100644
--- a/code/modules/clothing/spacesuits/rig/suits/station_ch.dm
+++ b/code/modules/clothing/spacesuits/rig/suits/station_ch.dm
@@ -24,7 +24,7 @@
 //A second security suit. Comes with a grenade launcher that only accepts flashbangs and adds a new sprinter and flash modules.
 /obj/item/rig/ch/pursuit
 	name = "pursuit hardsuit control module"
-	icon = 'icons/obj/rig_modules.dmi'
+	icon = 'modular_chomp/icons/obj/rig_modules_ch.dmi'
 	icon_state = "pursuit_rig"
 	suit_type = "pursuit hardsuit"
 	desc = "A Security hardsuit designed for chasing down the grey tide."
diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm
index 7d0bc8b970..ee1013ddf7 100644
--- a/code/modules/clothing/suits/miscellaneous.dm
+++ b/code/modules/clothing/suits/miscellaneous.dm
@@ -143,7 +143,7 @@
 /obj/item/clothing/suit/justice
 	name = "justice suit"
 	desc = "This pretty much looks ridiculous."
-	icon_state = "gentle_coat"
+	icon_state = "gentlecoat"
 	item_state_slots = list(slot_r_hand_str = "greatcoat", slot_l_hand_str = "greatcoat")
 	flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT|HIDETIE|HIDEHOLSTER
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS|HANDS|LEGS|FEET
@@ -482,14 +482,16 @@
 /obj/item/clothing/suit/stripper/stripper_pink
 	name = "pink skimpy dress"
 	desc = "A rather skimpy pink dress."
-	icon_state = "stripper_p_over"
+	icon = 'icons/inventory/uniform/item.dmi'
+	icon_state = "stripper_p"
 	item_state_slots = list(slot_r_hand_str = "pink_labcoat", slot_l_hand_str = "pink_labcoat")
 	siemens_coefficient = 1
 
 /obj/item/clothing/suit/stripper/stripper_green
 	name = "green skimpy dress"
 	desc = "A rather skimpy green dress."
-	icon_state = "stripper_g_over"
+	icon = 'icons/inventory/uniform/item.dmi'
+	icon_state = "stripper_g"
 	item_state_slots = list(slot_r_hand_str = "green_labcoat", slot_l_hand_str = "green_labcoat")
 	siemens_coefficient = 1
 
diff --git a/code/modules/clothing/under/shiny_vr.dm b/code/modules/clothing/under/shiny_vr.dm
index 9020823276..fa77edf5fe 100644
--- a/code/modules/clothing/under/shiny_vr.dm
+++ b/code/modules/clothing/under/shiny_vr.dm
@@ -19,4 +19,4 @@
 
 /obj/item/clothing/under/shiny/leotard/poly
 	name = "polychromic shiny leotard"
-	polychromic = TRUE
\ No newline at end of file
+	polychromic = TRUE
diff --git a/code/modules/detectivework/tools/scanner.dm b/code/modules/detectivework/tools/scanner.dm
index b00ab89f39..2ac3f36f3c 100644
--- a/code/modules/detectivework/tools/scanner.dm
+++ b/code/modules/detectivework/tools/scanner.dm
@@ -1,4 +1,5 @@
 /obj/item/detective_scanner
+	icon = 'icons/obj/device.dmi'
 	name = "forensic scanner"
 	desc = "Used to scan objects for DNA and fingerprints."
 	icon_state = "forensic"
diff --git a/code/modules/food/drinkingglass/glass_types.dm b/code/modules/food/drinkingglass/glass_types.dm
index 6b039c615c..2002d2c50e 100644
--- a/code/modules/food/drinkingglass/glass_types.dm
+++ b/code/modules/food/drinkingglass/glass_types.dm
@@ -2,6 +2,7 @@
 	name = "half-pint glass"
 	base_name = "glass"
 	base_icon = "square"
+	icon_state = "square"
 	desc = "Your standard drinking glass."
 	filling_states = list(20, 40, 60, 80, 100)
 	volume = 30
@@ -13,6 +14,7 @@
 	name = "rocks glass"
 	base_name = "glass"
 	base_icon = "rocks"
+	icon_state = "rocks"
 	filling_states = list(25, 50, 75, 100)
 	volume = 20
 	possible_transfer_amounts = list(5,10,20)
@@ -23,6 +25,7 @@
 	name = "milkshake glass"
 	base_name = "glass"
 	base_icon = "shake"
+	icon_state = "shake"
 	filling_states = list(25, 50, 75, 100)
 	volume = 30
 	possible_transfer_amounts = list(5,10,15,30)
@@ -33,6 +36,7 @@
 	name = "cocktail glass"
 	base_name = "glass"
 	base_icon = "cocktail"
+	icon_state = "cocktail"
 	filling_states = list(33, 66, 100)
 	volume = 15
 	possible_transfer_amounts = list(5,10,15)
@@ -43,6 +47,7 @@
 	name = "shot glass"
 	base_name = "shot"
 	base_icon = "shot"
+	icon_state = "shot"
 	filling_states = list(33, 66, 100)
 	volume = 5
 	possible_transfer_amounts = list(1,2,5)
@@ -53,6 +58,7 @@
 	name = "pint glass"
 	base_name = "pint"
 	base_icon = "pint"
+	icon_state = "pint"
 	filling_states = list(16, 33, 50, 66, 83, 100)
 	volume = 60
 	possible_transfer_amounts = list(5,10,15,30,60)
@@ -63,6 +69,7 @@
 	name = "glass mug"
 	base_name = "mug"
 	base_icon = "mug"
+	icon_state = "mug"
 	filling_states = list(25, 50, 75, 100)
 	volume = 40
 	possible_transfer_amounts = list(5,10,20,40)
@@ -73,8 +80,9 @@
 	name = "wine glass"
 	base_name = "glass"
 	base_icon = "wine"
+	icon_state = "wine"
 	filling_states = list(20, 40, 60, 80, 100)
 	volume = 25
 	possible_transfer_amounts = list(5, 10, 15, 25)
 	rim_pos = list(25, 12, 21)
-	matter = list(MAT_GLASS = 50)
\ No newline at end of file
+	matter = list(MAT_GLASS = 50)
diff --git a/code/modules/food/drinkingglass/mugs.dm b/code/modules/food/drinkingglass/mugs.dm
index 21d7d4c0ea..b1e8117558 100644
--- a/code/modules/food/drinkingglass/mugs.dm
+++ b/code/modules/food/drinkingglass/mugs.dm
@@ -42,6 +42,7 @@
 	desc = "A plain white coffee mug."
 	icon = 'icons/obj/drinks_mugs.dmi'
 	base_icon = "coffeecup"
+	icon_state = "coffeecup"
 	volume = 30
 	var/fillsource = "coffeecup"
 
diff --git a/code/modules/library/hardcode_library/fiction/battlefieldcommander.dm b/code/modules/library/hardcode_library/fiction/battlefieldcommander.dm
index b9953697ff..6a50ac3f7a 100644
--- a/code/modules/library/hardcode_library/fiction/battlefieldcommander.dm
+++ b/code/modules/library/hardcode_library/fiction/battlefieldcommander.dm
@@ -12,7 +12,7 @@ CATEGORY: Fiction
 						In this first volume in the series of the Chronicles of Margata, follow a young man's journey to dispel a curse of pure evil."
 
 	title = "The Chronicles of Margata: Volume I"
-	icon_state = "chronicles1_battlefieldcommander"
+	icon_state = "book"
 	origkey = "battlefieldcommander"
 	author = "Molly Highlander"
 
diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/mimic.dm b/code/modules/mob/living/simple_mob/subtypes/vore/mimic.dm
index f1f4ec9607..c50a9d1b0f 100644
--- a/code/modules/mob/living/simple_mob/subtypes/vore/mimic.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/vore/mimic.dm
@@ -81,10 +81,11 @@
 	name = "crate"
 	desc = "A rectangular steel crate."
 
-
-	icon_state = "crate"
-	icon_living = "crate"
-	icon = 'modular_chomp/icons/mob/animal_ch.dmi' //CHOMPEdit
+	//CHOMPEdit Start
+	icon_state = "open"
+	icon_living = "open"
+	icon = 'modular_chomp/icons/mob/animal_ch.dmi'
+	// CHOMPEdit End
 
 	faction = FACTION_MIMIC
 
diff --git a/code/modules/organs/misc.dm b/code/modules/organs/misc.dm
index c6d9f32682..50e4d55b2c 100644
--- a/code/modules/organs/misc.dm
+++ b/code/modules/organs/misc.dm
@@ -46,7 +46,7 @@
 /obj/item/organ/internal/stack
 	name = "cortical stack"
 	parent_organ = BP_HEAD
-	icon_state = "brain-prosthetic"
+	icon_state = "brain_prosthetic"
 	organ_tag = "stack"
 	vital = 1
 	var/backup_time = 0
diff --git a/code/modules/projectiles/ammunition/rounds.dm b/code/modules/projectiles/ammunition/rounds.dm
index 50c36f37d3..04102b62c2 100644
--- a/code/modules/projectiles/ammunition/rounds.dm
+++ b/code/modules/projectiles/ammunition/rounds.dm
@@ -473,7 +473,7 @@
 /obj/item/ammo_casing/rocket
 	name = "rocket shell"
 	desc = "A high explosive designed to be fired from a launcher."
-	icon_state = "rocketshell"
+	icon_state = "sshell_alt"
 	projectile_type = /obj/item/projectile/bullet/srmrocket
 	caliber = "rocket"
 	matter = list(MAT_STEEL = 10000)
diff --git a/code/modules/projectiles/guns/energy/laser.dm b/code/modules/projectiles/guns/energy/laser.dm
index 0901f23265..eab2ddf7f6 100644
--- a/code/modules/projectiles/guns/energy/laser.dm
+++ b/code/modules/projectiles/guns/energy/laser.dm
@@ -464,6 +464,7 @@
 	desc = "A modernized version of the classic mono-rifle. This one has an optimized capacitor bank that allows the rifle to fire twice before requiring a recharge."
 	description_fluff = "A modern design of a classic rifle produced by a small arms company operating out of Saint Columbia. It was based on the \
 	antique mono-rifle design that was dubbed the 'Rainy Day Special' by many of its users."
+	icon = 'icons/obj/gun.dmi'
 	icon_state = "cmono"
 	item_state = "cshotgun"
 	charge_cost = 1200
diff --git a/code/modules/projectiles/guns/vox.dm b/code/modules/projectiles/guns/vox.dm
index 8c849b0b66..20ee50f67a 100644
--- a/code/modules/projectiles/guns/vox.dm
+++ b/code/modules/projectiles/guns/vox.dm
@@ -54,6 +54,7 @@
 /obj/item/gun/energy/darkmatter
 	name = "dark matter gun"
 	desc = "A vicious alien beam weapon. Parts of it quiver gelatinously, as though the thing is insectile and alive."
+	icon = 'icons/obj/gun.dmi' // CHOMPAdd
 	icon_state = "darkcannon"
 	item_state = "darkcannon"
 	w_class = ITEMSIZE_HUGE
@@ -117,6 +118,7 @@
 /obj/item/gun/energy/sonic
 	name = "soundcannon"
 	desc = "A vicious alien sound weapon. Parts of it quiver gelatinously, as though the thing is insectile and alive."
+	icon = 'icons/obj/gun.dmi' // CHOMPAdd
 	icon_state = "noise"
 	item_state = "noise"
 	w_class = ITEMSIZE_HUGE
@@ -152,4 +154,4 @@
 	if(ismob(target))
 		var/throwdir = get_dir(firer,target)
 		target.throw_at(get_edge_target_turf(target, throwdir), rand(1,6), 10)
-		return 1
\ No newline at end of file
+		return 1
diff --git a/code/modules/vore/smoleworld/smoleworld_vr.dm b/code/modules/vore/smoleworld/smoleworld_vr.dm
index 7e43c79a21..426cf779e3 100644
--- a/code/modules/vore/smoleworld/smoleworld_vr.dm
+++ b/code/modules/vore/smoleworld/smoleworld_vr.dm
@@ -37,6 +37,7 @@
 
 //Extra micro turfs
 /turf/simulated/floor/smole/grass
+	icon = 'icons/turf/outdoors.dmi'
 	name = "grass"
 	icon_state = "grass0"
 	initial_flooring = /decl/flooring/grass/outdoors
diff --git a/icons/inventory/head/item_vr.dmi b/icons/inventory/head/item_vr.dmi
index 813586c308..3c7930fe8c 100644
Binary files a/icons/inventory/head/item_vr.dmi and b/icons/inventory/head/item_vr.dmi differ
diff --git a/icons/misc/random_spawners.dmi b/icons/misc/random_spawners.dmi
index 9db4770062..6089163964 100644
Binary files a/icons/misc/random_spawners.dmi and b/icons/misc/random_spawners.dmi differ
diff --git a/icons/obj/card_vr.dmi b/icons/obj/card_vr.dmi
index 1d091059da..fe5a0d8a0e 100644
Binary files a/icons/obj/card_vr.dmi and b/icons/obj/card_vr.dmi differ
diff --git a/icons/obj/closets/bodybag.dmi b/icons/obj/closets/bodybag.dmi
index d6922f8bbe..1aa41bd0f0 100644
Binary files a/icons/obj/closets/bodybag.dmi and b/icons/obj/closets/bodybag.dmi differ
diff --git a/icons/obj/closets/chest.dmi b/icons/obj/closets/chest.dmi
index 66e51b7d9d..d7b3bb78e9 100644
Binary files a/icons/obj/closets/chest.dmi and b/icons/obj/closets/chest.dmi differ
diff --git a/icons/obj/closets/laundry.dmi b/icons/obj/closets/laundry.dmi
index 7f81884817..7e28ef4280 100644
Binary files a/icons/obj/closets/laundry.dmi and b/icons/obj/closets/laundry.dmi differ
diff --git a/icons/obj/closets/wooden.dmi b/icons/obj/closets/wooden.dmi
index 0c4816f490..169b85ea26 100644
Binary files a/icons/obj/closets/wooden.dmi and b/icons/obj/closets/wooden.dmi differ
diff --git a/icons/obj/clothing/modular_shiny_vr.dmi b/icons/obj/clothing/modular_shiny_vr.dmi
index 425375c102..2ee858b4ce 100644
Binary files a/icons/obj/clothing/modular_shiny_vr.dmi and b/icons/obj/clothing/modular_shiny_vr.dmi differ
diff --git a/icons/obj/custom_books.dmi b/icons/obj/custom_books.dmi
index f60a15fc1a..f4bcefcf3a 100644
Binary files a/icons/obj/custom_books.dmi and b/icons/obj/custom_books.dmi differ
diff --git a/icons/obj/flora/sifflora.dmi b/icons/obj/flora/sifflora.dmi
index ae29d4c0f4..2a2eac7e6c 100644
Binary files a/icons/obj/flora/sifflora.dmi and b/icons/obj/flora/sifflora.dmi differ
diff --git a/icons/obj/furniture_ch.dmi b/icons/obj/furniture_ch.dmi
index 576f661a7a..203902dd12 100644
Binary files a/icons/obj/furniture_ch.dmi and b/icons/obj/furniture_ch.dmi differ
diff --git a/icons/obj/items_ch.dmi b/icons/obj/items_ch.dmi
index cb547ce225..c7d59225d0 100644
Binary files a/icons/obj/items_ch.dmi and b/icons/obj/items_ch.dmi differ
diff --git a/icons/obj/surgery.dmi b/icons/obj/surgery.dmi
index aed970c79e..969836f5c3 100644
Binary files a/icons/obj/surgery.dmi and b/icons/obj/surgery.dmi differ
diff --git a/icons/obj/syringe.dmi b/icons/obj/syringe.dmi
index 6ac3040bee..00e4c82485 100644
Binary files a/icons/obj/syringe.dmi and b/icons/obj/syringe.dmi differ
diff --git a/icons/policetape.dmi b/icons/policetape.dmi
index 5dde02f1b5..318fde2030 100644
Binary files a/icons/policetape.dmi and b/icons/policetape.dmi differ
diff --git a/maps/groundbase/gb-centcomm.dmm b/maps/groundbase/gb-centcomm.dmm
index 734c903995..89c40b7a51 100644
--- a/maps/groundbase/gb-centcomm.dmm
+++ b/maps/groundbase/gb-centcomm.dmm
@@ -13572,7 +13572,6 @@
 /area/centcom/security)
 "Sn" = (
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	pixel_x = 32
 	},
 /obj/effect/floor_decal/borderfloorblack{
diff --git a/maps/groundbase/gb-misc.dmm b/maps/groundbase/gb-misc.dmm
index efbbcf5a27..a0c9305864 100644
--- a/maps/groundbase/gb-misc.dmm
+++ b/maps/groundbase/gb-misc.dmm
@@ -2066,9 +2066,7 @@
 /turf/unsimulated/beach/sand,
 /area/beach)
 "gt" = (
-/turf/unsimulated/floor{
-	icon_state = "sandwater"
-	},
+/turf/unsimulated/floor,
 /area/beach)
 "gu" = (
 /turf/unsimulated/beach/coastline{
diff --git a/maps/groundbase/gb-z1.dmm b/maps/groundbase/gb-z1.dmm
index ad9a20b2b9..354831a5fd 100644
--- a/maps/groundbase/gb-z1.dmm
+++ b/maps/groundbase/gb-z1.dmm
@@ -4310,7 +4310,6 @@
 /area/groundbase/security/halls)
 "jw" = (
 /obj/structure/closet/crate{
-	icon_state = "crate";
 	name = "Grenade Crate"
 	},
 /obj/item/grenade/chem_grenade,
diff --git a/maps/offmap_vr/om_ships/aro2.dmm b/maps/offmap_vr/om_ships/aro2.dmm
index 8763cf8bf7..fb7049a782 100644
--- a/maps/offmap_vr/om_ships/aro2.dmm
+++ b/maps/offmap_vr/om_ships/aro2.dmm
@@ -196,7 +196,6 @@
 	alarm_id = null;
 	breach_detection = 0;
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /turf/simulated/floor/carpet/blue,
@@ -339,7 +338,6 @@
 	alarm_id = null;
 	breach_detection = 0;
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /turf/simulated/floor/carpet/gaycarpet,
@@ -483,7 +481,6 @@
 	alarm_id = null;
 	breach_detection = 0;
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /turf/simulated/floor/carpet/purcarpet,
@@ -608,7 +605,6 @@
 	alarm_id = null;
 	breach_detection = 0;
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /obj/machinery/light_switch{
@@ -1716,7 +1712,6 @@
 	},
 /obj/machinery/alarm{
 	dir = 4;
-	icon_state = "alarm0";
 	pixel_x = -22;
 	pixel_y = 0
 	},
@@ -1862,7 +1857,6 @@
 "rL" = (
 /obj/machinery/alarm{
 	dir = 4;
-	icon_state = "alarm0";
 	pixel_x = -22;
 	pixel_y = 0
 	},
@@ -1985,7 +1979,6 @@
 	alarm_id = null;
 	breach_detection = 0;
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /turf/simulated/floor/tiled/eris/dark,
@@ -2211,7 +2204,6 @@
 	alarm_id = null;
 	breach_detection = 0;
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /turf/simulated/floor/tiled/eris/dark/gray_perforated,
@@ -2398,7 +2390,6 @@
 "yC" = (
 /obj/machinery/alarm{
 	dir = 4;
-	icon_state = "alarm0";
 	pixel_x = -22;
 	pixel_y = 0
 	},
@@ -2726,7 +2717,6 @@
 	alarm_id = null;
 	breach_detection = 0;
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /turf/simulated/floor/tiled/eris/dark,
@@ -2828,7 +2818,6 @@
 	alarm_id = null;
 	breach_detection = 0;
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /turf/simulated/floor/tiled/eris/dark/gray_perforated,
@@ -3129,7 +3118,6 @@
 	alarm_id = null;
 	breach_detection = 0;
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /obj/machinery/light_switch{
@@ -3407,7 +3395,6 @@
 	alarm_id = null;
 	breach_detection = 0;
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /obj/machinery/light_switch{
@@ -3745,7 +3732,6 @@
 	alarm_id = null;
 	breach_detection = 0;
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /turf/simulated/floor/wood,
@@ -3919,7 +3905,6 @@
 "QH" = (
 /obj/machinery/alarm{
 	dir = 4;
-	icon_state = "alarm0";
 	pixel_x = -22;
 	pixel_y = 0
 	},
diff --git a/maps/offmap_vr/om_ships/bearcat.dmm b/maps/offmap_vr/om_ships/bearcat.dmm
index d335b27453..b65b965234 100644
--- a/maps/offmap_vr/om_ships/bearcat.dmm
+++ b/maps/offmap_vr/om_ships/bearcat.dmm
@@ -60,7 +60,6 @@
 /obj/machinery/light,
 /obj/machinery/alarm/alarms_hidden{
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -26
 	},
 /turf/simulated/floor/tiled/techfloor,
@@ -214,7 +213,6 @@
 	},
 /obj/machinery/alarm/alarms_hidden{
 	dir = 8;
-	icon_state = "alarm0";
 	pixel_x = 26
 	},
 /turf/simulated/floor/wood,
@@ -241,7 +239,6 @@
 	},
 /obj/machinery/alarm/alarms_hidden{
 	dir = 8;
-	icon_state = "alarm0";
 	pixel_x = 26
 	},
 /obj/structure/handrail{
@@ -309,7 +306,6 @@
 	},
 /obj/machinery/alarm/alarms_hidden{
 	dir = 4;
-	icon_state = "alarm0";
 	pixel_x = -26
 	},
 /obj/machinery/light{
@@ -722,7 +718,6 @@
 "bN" = (
 /obj/machinery/alarm/alarms_hidden{
 	dir = 8;
-	icon_state = "alarm0";
 	pixel_x = 26
 	},
 /obj/machinery/atmospherics/unary/vent_pump/on{
@@ -759,7 +754,6 @@
 "bV" = (
 /obj/machinery/alarm/alarms_hidden{
 	dir = 4;
-	icon_state = "alarm0";
 	pixel_x = -26
 	},
 /obj/machinery/atmospherics/unary/vent_pump/on{
@@ -905,7 +899,6 @@
 	},
 /obj/machinery/alarm/alarms_hidden{
 	dir = 8;
-	icon_state = "alarm0";
 	pixel_x = 26
 	},
 /obj/machinery/light{
@@ -925,7 +918,6 @@
 /obj/machinery/vending/snack,
 /obj/machinery/alarm/alarms_hidden{
 	dir = 4;
-	icon_state = "alarm0";
 	pixel_x = -26
 	},
 /turf/simulated/floor/tiled/techfloor,
@@ -983,7 +975,6 @@
 /obj/structure/closet,
 /obj/machinery/alarm/alarms_hidden{
 	dir = 8;
-	icon_state = "alarm0";
 	pixel_x = 26
 	},
 /obj/item/clothing/suit/space/void/refurb,
@@ -1456,7 +1447,6 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/alarm/alarms_hidden{
 	dir = 4;
-	icon_state = "alarm0";
 	pixel_x = -26
 	},
 /obj/structure/handrail{
@@ -1570,7 +1560,6 @@
 	},
 /obj/machinery/alarm/alarms_hidden{
 	dir = 4;
-	icon_state = "alarm0";
 	pixel_x = -26
 	},
 /turf/simulated/floor/tiled/techmaint,
@@ -1795,7 +1784,6 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/cyan,
 /obj/machinery/alarm/alarms_hidden{
 	dir = 8;
-	icon_state = "alarm0";
 	pixel_x = 26
 	},
 /turf/simulated/floor/tiled/techmaint,
@@ -1957,7 +1945,6 @@
 	},
 /obj/machinery/alarm/alarms_hidden{
 	dir = 8;
-	icon_state = "alarm0";
 	pixel_x = 26
 	},
 /turf/simulated/floor/tiled/techfloor,
@@ -2165,7 +2152,6 @@
 /obj/item/clothing/head/helmet/space/void/refurb/engineering,
 /obj/machinery/alarm/alarms_hidden{
 	dir = 8;
-	icon_state = "alarm0";
 	pixel_x = 26
 	},
 /obj/item/storage/belt/utility/full,
@@ -2304,7 +2290,6 @@
 /obj/structure/cable,
 /obj/machinery/alarm/alarms_hidden{
 	dir = 4;
-	icon_state = "alarm0";
 	pixel_x = -26
 	},
 /obj/machinery/power/apc/alarms_hidden,
@@ -2577,7 +2562,6 @@
 	},
 /obj/machinery/alarm/alarms_hidden{
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -26
 	},
 /turf/simulated/floor/tiled/techfloor,
@@ -2932,7 +2916,6 @@
 	},
 /obj/machinery/alarm/alarms_hidden{
 	dir = 4;
-	icon_state = "alarm0";
 	pixel_x = -26
 	},
 /turf/simulated/floor/plating,
@@ -3004,7 +2987,6 @@
 	},
 /obj/machinery/alarm/alarms_hidden{
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -26
 	},
 /obj/structure/handrail{
@@ -3379,7 +3361,6 @@
 "Ea" = (
 /obj/machinery/alarm/alarms_hidden{
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -26
 	},
 /obj/structure/cable{
@@ -3439,7 +3420,6 @@
 "Ik" = (
 /obj/machinery/alarm/alarms_hidden{
 	dir = 4;
-	icon_state = "alarm0";
 	pixel_x = -26
 	},
 /obj/structure/closet/firecloset/full,
diff --git a/maps/offmap_vr/om_ships/cruiser.dmm b/maps/offmap_vr/om_ships/cruiser.dmm
index c2d76757cc..2bf18b03f1 100644
--- a/maps/offmap_vr/om_ships/cruiser.dmm
+++ b/maps/offmap_vr/om_ships/cruiser.dmm
@@ -909,7 +909,6 @@
 /obj/machinery/light,
 /obj/machinery/alarm{
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /obj/machinery/button/remote/blast_door{
@@ -1604,7 +1603,6 @@
 	alarm_id = "pen_nine";
 	breach_detection = 0;
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /obj/machinery/light/small,
@@ -1677,7 +1675,6 @@
 	alarm_id = "pen_nine";
 	breach_detection = 0;
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /turf/simulated/floor/tiled/techmaint,
@@ -1711,7 +1708,6 @@
 	alarm_id = "pen_nine";
 	breach_detection = 0;
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /obj/machinery/light/small,
@@ -2030,7 +2026,6 @@
 	alarm_id = "pen_nine";
 	breach_detection = 0;
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /obj/machinery/atmospherics/unary/vent_pump/on{
@@ -2192,7 +2187,6 @@
 	alarm_id = "pen_nine";
 	breach_detection = 0;
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /obj/machinery/atmospherics/unary/vent_pump/on{
@@ -2325,7 +2319,6 @@
 	alarm_id = "pen_nine";
 	breach_detection = 0;
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /obj/effect/floor_decal/industrial/warning/corner{
@@ -2614,7 +2607,6 @@
 	},
 /obj/machinery/alarm{
 	dir = 4;
-	icon_state = "alarm0";
 	pixel_x = -22
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -7224,7 +7216,6 @@
 	alarm_id = "pen_nine";
 	breach_detection = 0;
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /turf/simulated/floor/tiled/techmaint,
@@ -9105,7 +9096,6 @@
 /obj/machinery/atmospherics/pipe/simple/hidden,
 /obj/machinery/alarm{
 	dir = 4;
-	icon_state = "alarm0";
 	pixel_x = -22
 	},
 /turf/simulated/floor/tiled/techmaint,
@@ -9450,7 +9440,6 @@
 	alarm_id = "pen_nine";
 	breach_detection = 0;
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /obj/machinery/atmospherics/unary/vent_scrubber/on{
@@ -9508,7 +9497,6 @@
 /obj/machinery/atmospherics/pipe/manifold/hidden/supply,
 /obj/machinery/alarm{
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /turf/simulated/floor/tiled/techmaint,
@@ -9693,7 +9681,6 @@
 	},
 /obj/machinery/alarm{
 	dir = 4;
-	icon_state = "alarm0";
 	pixel_x = -22
 	},
 /turf/simulated/floor/tiled/techmaint,
diff --git a/maps/offmap_vr/om_ships/curashuttle.dmm b/maps/offmap_vr/om_ships/curashuttle.dmm
index 3d4887fed2..c54a152ec2 100644
--- a/maps/offmap_vr/om_ships/curashuttle.dmm
+++ b/maps/offmap_vr/om_ships/curashuttle.dmm
@@ -1289,7 +1289,6 @@
 /obj/machinery/light,
 /obj/machinery/alarm{
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -32
 	},
 /turf/simulated/floor/tiled/techfloor/grid,
diff --git a/maps/offmap_vr/om_ships/mercenarybase.dmm b/maps/offmap_vr/om_ships/mercenarybase.dmm
index a7768d529d..26b0abef68 100644
--- a/maps/offmap_vr/om_ships/mercenarybase.dmm
+++ b/maps/offmap_vr/om_ships/mercenarybase.dmm
@@ -182,7 +182,6 @@
 	},
 /obj/machinery/alarm{
 	dir = 4;
-	icon_state = "alarm0";
 	pixel_x = -22;
 	pixel_y = 0
 	},
@@ -362,7 +361,6 @@
 "fY" = (
 /obj/machinery/alarm{
 	dir = 4;
-	icon_state = "alarm0";
 	pixel_x = -22;
 	pixel_y = 0
 	},
@@ -427,7 +425,6 @@
 "gq" = (
 /obj/machinery/alarm{
 	dir = 4;
-	icon_state = "alarm0";
 	pixel_x = -22;
 	pixel_y = 0
 	},
@@ -507,7 +504,6 @@
 "gD" = (
 /obj/machinery/alarm{
 	dir = 4;
-	icon_state = "alarm0";
 	pixel_x = -22;
 	pixel_y = 0
 	},
@@ -1289,7 +1285,6 @@
 	},
 /obj/machinery/alarm{
 	dir = 4;
-	icon_state = "alarm0";
 	pixel_x = -22;
 	pixel_y = 0
 	},
@@ -2560,7 +2555,6 @@
 "lF" = (
 /obj/machinery/alarm{
 	dir = 4;
-	icon_state = "alarm0";
 	pixel_x = -22;
 	pixel_y = 0
 	},
@@ -2569,7 +2563,6 @@
 "lG" = (
 /obj/machinery/alarm{
 	dir = 4;
-	icon_state = "alarm0";
 	pixel_x = -22;
 	pixel_y = 0
 	},
@@ -2583,7 +2576,6 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/alarm{
 	dir = 4;
-	icon_state = "alarm0";
 	pixel_x = -22;
 	pixel_y = 0
 	},
@@ -2596,7 +2588,6 @@
 	},
 /obj/machinery/alarm{
 	dir = 4;
-	icon_state = "alarm0";
 	pixel_x = -22;
 	pixel_y = 0
 	},
@@ -3006,7 +2997,6 @@
 "mQ" = (
 /obj/machinery/alarm{
 	dir = 4;
-	icon_state = "alarm0";
 	pixel_x = -22;
 	pixel_y = 0
 	},
diff --git a/maps/offmap_vr/om_ships/mercship.dmm b/maps/offmap_vr/om_ships/mercship.dmm
index b5c981dc22..43634d37cb 100644
--- a/maps/offmap_vr/om_ships/mercship.dmm
+++ b/maps/offmap_vr/om_ships/mercship.dmm
@@ -131,7 +131,6 @@
 /obj/machinery/alarm{
 	breach_detection = 0;
 	dir = 8;
-	icon_state = "alarm0";
 	pixel_x = 25;
 	rcon_setting = 3;
 	report_danger_level = 0
@@ -2967,7 +2966,6 @@
 /obj/machinery/alarm{
 	breach_detection = 0;
 	dir = 8;
-	icon_state = "alarm0";
 	pixel_x = 25;
 	rcon_setting = 3;
 	report_danger_level = 0
@@ -3626,7 +3624,6 @@
 	alarm_id = "pen_nine";
 	breach_detection = 0;
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /turf/simulated/floor/tiled/dark,
@@ -3650,7 +3647,6 @@
 	alarm_id = "pen_nine";
 	breach_detection = 0;
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /turf/simulated/floor/tiled/dark,
@@ -3667,7 +3663,6 @@
 	alarm_id = "pen_nine";
 	breach_detection = 0;
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /turf/simulated/floor/tiled/dark,
@@ -4169,7 +4164,6 @@
 	alarm_id = "pen_nine";
 	breach_detection = 0;
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /turf/simulated/floor/tiled/dark,
diff --git a/maps/overmap/bearcat/bearcat.dmm b/maps/overmap/bearcat/bearcat.dmm
index 3f18ad6a7f..ca8df000d0 100644
--- a/maps/overmap/bearcat/bearcat.dmm
+++ b/maps/overmap/bearcat/bearcat.dmm
@@ -285,7 +285,6 @@
 /obj/structure/table/woodentable,
 /obj/machinery/alarm{
 	dir = 8;
-	icon_state = "alarm0";
 	pixel_x = 24
 	},
 /obj/machinery/light_switch{
@@ -420,7 +419,6 @@
 "aK" = (
 /obj/machinery/alarm{
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_x = 0;
 	pixel_y = -32
 	},
@@ -439,7 +437,6 @@
 	},
 /obj/machinery/alarm{
 	dir = 8;
-	icon_state = "alarm0";
 	pixel_x = 24
 	},
 /turf/simulated/floor{
@@ -904,7 +901,6 @@
 	},
 /obj/machinery/alarm{
 	dir = 8;
-	icon_state = "alarm0";
 	pixel_x = 24
 	},
 /turf/simulated/floor{
@@ -939,7 +935,6 @@
 	},
 /obj/machinery/alarm{
 	dir = 4;
-	icon_state = "alarm0";
 	pixel_x = -24
 	},
 /turf/simulated/floor{
@@ -1293,7 +1288,6 @@
 	},
 /obj/machinery/alarm{
 	dir = 8;
-	icon_state = "alarm0";
 	pixel_x = 24
 	},
 /turf/simulated/floor{
@@ -1320,7 +1314,6 @@
 /obj/machinery/vending/snack,
 /obj/machinery/alarm{
 	dir = 4;
-	icon_state = "alarm0";
 	pixel_x = -24
 	},
 /turf/simulated/floor{
@@ -1395,7 +1388,6 @@
 /obj/structure/closet/secure_closet/personal,
 /obj/machinery/alarm{
 	dir = 8;
-	icon_state = "alarm0";
 	pixel_x = 24
 	},
 /turf/simulated/floor,
@@ -2116,7 +2108,6 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/alarm{
 	dir = 4;
-	icon_state = "alarm0";
 	pixel_x = -24
 	},
 /turf/simulated/floor{
@@ -2199,7 +2190,6 @@
 	},
 /obj/machinery/alarm{
 	dir = 8;
-	icon_state = "alarm0";
 	pixel_x = 24
 	},
 /turf/simulated/floor{
@@ -2481,7 +2471,6 @@
 	},
 /obj/machinery/alarm{
 	dir = 4;
-	icon_state = "alarm0";
 	pixel_x = -24
 	},
 /turf/simulated/floor{
@@ -2692,7 +2681,6 @@
 /obj/structure/closet/wardrobe/grey,
 /obj/machinery/alarm{
 	dir = 4;
-	icon_state = "alarm0";
 	pixel_x = -24
 	},
 /turf/simulated/floor{
@@ -3157,7 +3145,6 @@
 /obj/item/clothing/mask/breath,
 /obj/machinery/alarm{
 	dir = 8;
-	icon_state = "alarm0";
 	pixel_x = 24
 	},
 /turf/simulated/floor{
@@ -4191,7 +4178,6 @@
 "hn" = (
 /obj/machinery/alarm{
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_x = 0;
 	pixel_y = -32
 	},
@@ -4284,7 +4270,6 @@
 /obj/effect/decal/cleanable/cobweb2,
 /obj/machinery/alarm{
 	dir = 8;
-	icon_state = "alarm0";
 	pixel_x = 24
 	},
 /obj/machinery/atmospherics/pipe/tank/phoron{
diff --git a/maps/stellar_delight/ship_misc.dmm b/maps/stellar_delight/ship_misc.dmm
index 251e171f68..01f2c019d3 100644
--- a/maps/stellar_delight/ship_misc.dmm
+++ b/maps/stellar_delight/ship_misc.dmm
@@ -2070,9 +2070,7 @@
 /turf/unsimulated/beach/sand,
 /area/beach)
 "gt" = (
-/turf/unsimulated/floor{
-	icon_state = "sandwater"
-	},
+/turf/unsimulated/floor,
 /area/beach)
 "gu" = (
 /turf/unsimulated/beach/coastline{
diff --git a/maps/stellar_delight/stellar_delight2.dmm b/maps/stellar_delight/stellar_delight2.dmm
index a31ad48b0b..d26d1886eb 100644
--- a/maps/stellar_delight/stellar_delight2.dmm
+++ b/maps/stellar_delight/stellar_delight2.dmm
@@ -8781,7 +8781,6 @@
 /area/engineering/engine_room)
 "sZ" = (
 /obj/structure/closet/crate{
-	icon_state = "crate";
 	name = "Grenade Crate"
 	},
 /obj/item/grenade/chem_grenade,
diff --git a/maps/submaps/admin_use_vr/avii_eventMapv2.dmm b/maps/submaps/admin_use_vr/avii_eventMapv2.dmm
index 1a217688cc..0d976ccb77 100644
--- a/maps/submaps/admin_use_vr/avii_eventMapv2.dmm
+++ b/maps/submaps/admin_use_vr/avii_eventMapv2.dmm
@@ -4816,7 +4816,6 @@
 	},
 /obj/machinery/alarm{
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /obj/effect/floor_decal/borderfloor,
@@ -9334,7 +9333,6 @@
 "Rd" = (
 /obj/machinery/alarm{
 	dir = 8;
-	icon_state = "alarm0";
 	pixel_x = 24
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -10040,7 +10038,6 @@
 "Uv" = (
 /obj/machinery/alarm{
 	dir = 8;
-	icon_state = "alarm0";
 	pixel_x = 24
 	},
 /obj/structure/table/standard,
@@ -10656,7 +10653,6 @@
 	},
 /obj/machinery/alarm{
 	dir = 8;
-	icon_state = "alarm0";
 	pixel_x = 24
 	},
 /turf/simulated/floor/tiled,
diff --git a/maps/submaps/admin_use_vr/dojo.dmm b/maps/submaps/admin_use_vr/dojo.dmm
index 7c6231376f..5fe637c00e 100644
--- a/maps/submaps/admin_use_vr/dojo.dmm
+++ b/maps/submaps/admin_use_vr/dojo.dmm
@@ -35,7 +35,7 @@
 /obj/item/target/alien,
 /turf/unsimulated/floor{
 	icon = 'icons/turf/flooring/wood.dmi';
-	icon_state = "wood_broken2"
+	icon_state = "wood-broken2"
 	},
 /area/ninja_dojo/dojo)
 "ai" = (
@@ -427,7 +427,7 @@
 "bb" = (
 /turf/unsimulated/floor{
 	icon = 'icons/turf/flooring/wood.dmi';
-	icon_state = "wood_broken1"
+	icon_state = "wood-broken1"
 	},
 /area/ninja_dojo/dojo)
 "bc" = (
@@ -917,7 +917,7 @@
 /obj/machinery/space_heater,
 /turf/unsimulated/floor{
 	icon = 'icons/turf/flooring/wood.dmi';
-	icon_state = "wood_broken3"
+	icon_state = "wood-broken3"
 	},
 /area/ninja_dojo/dojo)
 
diff --git a/maps/submaps/admin_use_vr/guttersite.dmm b/maps/submaps/admin_use_vr/guttersite.dmm
index ff70042323..6a5920856e 100644
--- a/maps/submaps/admin_use_vr/guttersite.dmm
+++ b/maps/submaps/admin_use_vr/guttersite.dmm
@@ -591,7 +591,6 @@
 /obj/machinery/alarm{
 	alarms_hidden = 1;
 	dir = 4;
-	icon_state = "alarm0";
 	pixel_x = -22;
 	pixel_y = 0
 	},
@@ -932,7 +931,6 @@
 /obj/machinery/alarm{
 	alarms_hidden = 1;
 	dir = 4;
-	icon_state = "alarm0";
 	pixel_x = -22;
 	pixel_y = 0
 	},
@@ -1405,7 +1403,6 @@
 	alarms_hidden = 1;
 	breach_detection = 0;
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /turf/simulated/floor/tiled/eris/dark/gray_perforated,
@@ -1598,7 +1595,6 @@
 /obj/machinery/alarm{
 	alarms_hidden = 1;
 	dir = 4;
-	icon_state = "alarm0";
 	pixel_x = -22;
 	pixel_y = 0
 	},
@@ -1692,7 +1688,6 @@
 /obj/machinery/alarm{
 	alarms_hidden = 1;
 	dir = 4;
-	icon_state = "alarm0";
 	pixel_x = -22;
 	pixel_y = 0
 	},
@@ -1819,7 +1814,6 @@
 /obj/machinery/alarm{
 	alarms_hidden = 1;
 	dir = 4;
-	icon_state = "alarm0";
 	pixel_x = -22;
 	pixel_y = 0
 	},
@@ -2482,7 +2476,6 @@
 /obj/machinery/alarm{
 	alarms_hidden = 1;
 	dir = 4;
-	icon_state = "alarm0";
 	pixel_x = -22;
 	pixel_y = 0
 	},
@@ -2832,7 +2825,6 @@
 /obj/machinery/alarm{
 	alarms_hidden = 1;
 	dir = 4;
-	icon_state = "alarm0";
 	pixel_x = -22;
 	pixel_y = 0
 	},
@@ -2842,7 +2834,6 @@
 /obj/machinery/alarm{
 	alarms_hidden = 1;
 	dir = 4;
-	icon_state = "alarm0";
 	pixel_x = -22;
 	pixel_y = 0
 	},
@@ -2933,7 +2924,6 @@
 /obj/machinery/alarm{
 	alarms_hidden = 1;
 	dir = 4;
-	icon_state = "alarm0";
 	pixel_x = -22;
 	pixel_y = 0
 	},
@@ -2960,7 +2950,6 @@
 /obj/machinery/alarm{
 	alarms_hidden = 1;
 	dir = 4;
-	icon_state = "alarm0";
 	pixel_x = -22;
 	pixel_y = 0
 	},
@@ -3124,7 +3113,6 @@
 /obj/machinery/alarm{
 	alarms_hidden = 1;
 	dir = 4;
-	icon_state = "alarm0";
 	pixel_x = -22;
 	pixel_y = 0
 	},
@@ -3980,7 +3968,6 @@
 /obj/machinery/alarm{
 	alarms_hidden = 1;
 	dir = 4;
-	icon_state = "alarm0";
 	pixel_x = -22;
 	pixel_y = 0
 	},
@@ -5573,7 +5560,6 @@
 /obj/machinery/alarm{
 	alarms_hidden = 1;
 	dir = 4;
-	icon_state = "alarm0";
 	pixel_x = -22;
 	pixel_y = 0
 	},
@@ -5623,7 +5609,6 @@
 "nV" = (
 /obj/machinery/alarm/alarms_hidden{
 	dir = 4;
-	icon_state = "alarm0";
 	pixel_x = -25
 	},
 /turf/simulated/floor/tiled/eris/dark/gray_perforated,
@@ -5631,7 +5616,6 @@
 "nW" = (
 /obj/machinery/alarm/alarms_hidden{
 	dir = 4;
-	icon_state = "alarm0";
 	pixel_x = -25
 	},
 /obj/machinery/firealarm{
@@ -5704,7 +5688,6 @@
 /obj/machinery/alarm{
 	alarms_hidden = 1;
 	dir = 4;
-	icon_state = "alarm0";
 	pixel_x = -22;
 	pixel_y = 0
 	},
@@ -5777,7 +5760,6 @@
 /obj/machinery/alarm{
 	alarms_hidden = 1;
 	dir = 4;
-	icon_state = "alarm0";
 	pixel_x = -22;
 	pixel_y = 0
 	},
diff --git a/maps/submaps/admin_use_vr/skipjack.dmm b/maps/submaps/admin_use_vr/skipjack.dmm
index e79272d1da..6536b6d480 100644
--- a/maps/submaps/admin_use_vr/skipjack.dmm
+++ b/maps/submaps/admin_use_vr/skipjack.dmm
@@ -312,7 +312,7 @@
 /obj/item/bedsheet/orange,
 /turf/unsimulated/floor{
 	icon = 'icons/turf/flooring/wood.dmi';
-	icon_state = "wood_broken1"
+	icon_state = "wood-broken1"
 	},
 /area/skipjack_station)
 "aO" = (
@@ -481,7 +481,7 @@
 "bi" = (
 /turf/unsimulated/floor{
 	icon = 'icons/turf/flooring/wood.dmi';
-	icon_state = "wood_broken3"
+	icon_state = "wood-broken3"
 	},
 /area/skipjack_station)
 "bj" = (
@@ -528,7 +528,7 @@
 /obj/effect/landmark/late_antag/raider,
 /turf/unsimulated/floor{
 	icon = 'icons/turf/flooring/wood.dmi';
-	icon_state = "wood_broken3"
+	icon_state = "wood-broken3"
 	},
 /area/skipjack_station)
 "bp" = (
diff --git a/maps/submaps/engine_submaps_vr/tether/engine_rust.dmm b/maps/submaps/engine_submaps_vr/tether/engine_rust.dmm
index 920c54b903..2812b7b9b4 100644
--- a/maps/submaps/engine_submaps_vr/tether/engine_rust.dmm
+++ b/maps/submaps/engine_submaps_vr/tether/engine_rust.dmm
@@ -1148,7 +1148,6 @@
 	},
 /obj/machinery/alarm{
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /turf/simulated/floor,
diff --git a/maps/submaps/engine_submaps_vr/tether/engine_singulo.dmm b/maps/submaps/engine_submaps_vr/tether/engine_singulo.dmm
index 4870d4c684..f5df5b3826 100644
--- a/maps/submaps/engine_submaps_vr/tether/engine_singulo.dmm
+++ b/maps/submaps/engine_submaps_vr/tether/engine_singulo.dmm
@@ -94,7 +94,6 @@
 "aq" = (
 /obj/machinery/alarm{
 	dir = 8;
-	icon_state = "alarm0";
 	pixel_x = 24
 	},
 /obj/structure/dispenser/phoron,
@@ -1244,7 +1243,6 @@
 	},
 /obj/machinery/alarm{
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /obj/effect/floor_decal/borderfloor,
diff --git a/maps/submaps/engine_submaps_vr/tether/engine_sme.dmm b/maps/submaps/engine_submaps_vr/tether/engine_sme.dmm
index d762f0b6fa..a3c4d7d9b9 100644
--- a/maps/submaps/engine_submaps_vr/tether/engine_sme.dmm
+++ b/maps/submaps/engine_submaps_vr/tether/engine_sme.dmm
@@ -1364,7 +1364,6 @@
 	},
 /obj/machinery/alarm{
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /turf/simulated/floor,
diff --git a/maps/submaps/engine_submaps_vr/tether/engine_tesla.dmm b/maps/submaps/engine_submaps_vr/tether/engine_tesla.dmm
index feac4771dd..3fa98d8206 100644
--- a/maps/submaps/engine_submaps_vr/tether/engine_tesla.dmm
+++ b/maps/submaps/engine_submaps_vr/tether/engine_tesla.dmm
@@ -95,7 +95,6 @@
 "aq" = (
 /obj/machinery/alarm{
 	dir = 8;
-	icon_state = "alarm0";
 	pixel_x = 24
 	},
 /obj/structure/table/standard,
@@ -1204,7 +1203,6 @@
 	},
 /obj/machinery/alarm{
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /obj/effect/floor_decal/borderfloor,
diff --git a/maps/submaps/engine_submaps_yw/_overlay.dmm b/maps/submaps/engine_submaps_yw/_overlay.dmm
index 40c15e8641..619d253ba3 100644
--- a/maps/submaps/engine_submaps_yw/_overlay.dmm
+++ b/maps/submaps/engine_submaps_yw/_overlay.dmm
@@ -326,7 +326,6 @@
 	},
 /obj/machinery/alarm{
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /turf/simulated/floor/tiled/techmaint,
@@ -771,7 +770,6 @@
 	},
 /obj/machinery/alarm{
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /obj/effect/floor_decal/borderfloor,
@@ -1072,7 +1070,6 @@
 /obj/structure/cable/green,
 /obj/machinery/alarm{
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /obj/structure/closet/radiation,
diff --git a/maps/submaps/pois_vr/aerostat/Manor1.dmm b/maps/submaps/pois_vr/aerostat/Manor1.dmm
index a84c0a6065..29b71f2c1c 100644
--- a/maps/submaps/pois_vr/aerostat/Manor1.dmm
+++ b/maps/submaps/pois_vr/aerostat/Manor1.dmm
@@ -275,7 +275,7 @@
 "bi" = (
 /obj/effect/decal/cleanable/cobweb,
 /turf/simulated/floor/holofloor/wood{
-	icon_state = "wood_broken0"
+	icon_state = "wood-broken0"
 	},
 /area/submap/virgo2/Manor1)
 "bj" = (
@@ -317,7 +317,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/holofloor/wood{
-	icon_state = "wood_broken5"
+	icon_state = "wood-broken5"
 	},
 /area/submap/virgo2/Manor1)
 "bs" = (
@@ -476,7 +476,7 @@
 /area/submap/virgo2/Manor1)
 "bV" = (
 /turf/simulated/floor/holofloor/wood{
-	icon_state = "wood_broken6"
+	icon_state = "wood-broken6"
 	},
 /area/submap/virgo2/Manor1)
 "bW" = (
@@ -642,7 +642,7 @@
 /area/submap/virgo2/Manor1)
 "cB" = (
 /turf/simulated/floor/holofloor/wood{
-	icon_state = "wood_broken3"
+	icon_state = "wood-broken3"
 	},
 /area/submap/virgo2/Manor1)
 "cC" = (
diff --git a/maps/submaps/pois_vr/aerostat/Shack1.dmm b/maps/submaps/pois_vr/aerostat/Shack1.dmm
index faac7d99b6..7a2540d316 100644
--- a/maps/submaps/pois_vr/aerostat/Shack1.dmm
+++ b/maps/submaps/pois_vr/aerostat/Shack1.dmm
@@ -14,7 +14,7 @@
 "e" = (
 /obj/effect/decal/cleanable/cobweb,
 /turf/simulated/floor/holofloor/wood{
-	icon_state = "wood_broken1"
+	icon_state = "wood-broken1"
 	},
 /area/submap/virgo2/Shack1)
 "f" = (
@@ -36,13 +36,13 @@
 /area/submap/virgo2/Shack1)
 "j" = (
 /turf/simulated/floor/holofloor/wood{
-	icon_state = "wood_broken0"
+	icon_state = "wood-broken0"
 	},
 /area/submap/virgo2/Shack1)
 "k" = (
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/holofloor/wood{
-	icon_state = "wood_broken5"
+	icon_state = "wood-broken5"
 	},
 /area/submap/virgo2/Shack1)
 "l" = (
@@ -57,7 +57,7 @@
 /area/submap/virgo2/Shack1)
 "n" = (
 /turf/simulated/floor/holofloor/wood{
-	icon_state = "wood_broken3"
+	icon_state = "wood-broken3"
 	},
 /area/submap/virgo2/Shack1)
 "o" = (
@@ -82,7 +82,7 @@
 /area/submap/virgo2/Shack1)
 "s" = (
 /turf/simulated/floor/holofloor/wood{
-	icon_state = "wood_broken6"
+	icon_state = "wood-broken6"
 	},
 /area/submap/virgo2/Shack1)
 "t" = (
diff --git a/maps/submaps/surface_submaps/plains/Boathouse.dmm b/maps/submaps/surface_submaps/plains/Boathouse.dmm
index 33b092a7d0..86ddf2624c 100644
--- a/maps/submaps/surface_submaps/plains/Boathouse.dmm
+++ b/maps/submaps/surface_submaps/plains/Boathouse.dmm
@@ -19,13 +19,13 @@
 "as" = (/obj/structure/table/woodentable,/obj/item/reagent_containers/food/snacks/chips,/turf/simulated/floor/carpet/turcarpet,/area/submap/Boathouse)
 "at" = (/obj/structure/table/woodentable,/obj/item/trash/candle,/turf/simulated/floor/wood,/area/submap/Boathouse)
 "au" = (/obj/item/stool,/turf/simulated/floor/wood,/area/submap/Boathouse)
-"av" = (/turf/simulated/floor/wood{ icon_state = "wood_broken6"},/area/submap/Boathouse)
+"av" = (/turf/simulated/floor/wood{ icon_state = "wood-broken6"},/area/submap/Boathouse)
 "aw" = (/obj/structure/railing{dir = 8},/turf/simulated/floor/water,/area/submap/Boathouse)
 "ax" = (/obj/structure/table/woodentable,/obj/item/reagent_containers/food/drinks/bottle/whiskey,/turf/simulated/floor/carpet/turcarpet,/area/submap/Boathouse)
 "ay" = (/obj/structure/table/woodentable,/obj/item/reagent_containers/food/drinks/glass2/shot,/turf/simulated/floor/carpet/turcarpet,/area/submap/Boathouse)
 "az" = (/obj/structure/table/woodentable,/obj/item/tape_roll,/obj/random/firstaid,/turf/simulated/floor/wood,/area/submap/Boathouse)
 "aA" = (/obj/structure/table/woodentable,/obj/item/reagent_containers/food/drinks/glass2/shot,/obj/item/reagent_containers/food/drinks/glass2/shot,/obj/item/reagent_containers/food/drinks/glass2/shot,/turf/simulated/floor/carpet/turcarpet,/area/submap/Boathouse)
-"aB" = (/turf/simulated/floor/wood{ icon_state = "wood_broken2"},/area/submap/Boathouse)
+"aB" = (/turf/simulated/floor/wood{ icon_state = "wood-broken2"},/area/submap/Boathouse)
 "aC" = (/obj/structure/railing{dir = 8},/obj/structure/railing{ icon_state = "railing0"; dir = 1},/turf/simulated/floor/water,/area/submap/Boathouse)
 "aD" = (/obj/structure/railing{ icon_state = "railing0"; dir = 1},/turf/simulated/floor/water,/area/submap/Boathouse)
 "aE" = (/obj/vehicle/boat/sifwood,/turf/simulated/floor/water,/area/submap/Boathouse)
@@ -33,7 +33,7 @@
 "aG" = (/obj/structure/table/woodentable,/obj/item/oar,/obj/item/oar,/turf/simulated/floor/wood,/area/submap/Boathouse)
 "aH" = (/obj/structure/railing{ icon_state = "railing0"; dir = 8},/turf/simulated/floor/water,/area/submap/Boathouse)
 "aI" = (/obj/structure/table/woodentable,/obj/random/powercell,/turf/simulated/floor/wood,/area/submap/Boathouse)
-"aJ" = (/turf/simulated/floor/wood{ icon_state = "wood_broken4"},/area/submap/Boathouse)
+"aJ" = (/turf/simulated/floor/wood{ icon_state = "wood-broken4"},/area/submap/Boathouse)
 "aK" = (/obj/structure/railing{ icon_state = "railing0"; dir = 8},/obj/structure/railing{ icon_state = "railing0"; dir = 1},/turf/simulated/floor/water,/area/submap/Boathouse)
 "aL" = (/obj/structure/simple_door/wood,/turf/simulated/floor/wood,/area/submap/Boathouse)
 "aM" = (/obj/structure/closet/secure_closet/freezer/fridge,/obj/item/reagent_containers/food/snacks/meat,/obj/item/reagent_containers/food/snacks/meat,/obj/item/reagent_containers/food/snacks/meat,/obj/item/reagent_containers/food/snacks/meat,/obj/item/reagent_containers/food/snacks/meat,/obj/item/reagent_containers/food/snacks/fruitsalad,/turf/simulated/floor/wood,/area/submap/Boathouse)
diff --git a/maps/submaps/surface_submaps/plains/Oldhouse.dmm b/maps/submaps/surface_submaps/plains/Oldhouse.dmm
index 96058de7da..a154ba9ec0 100644
--- a/maps/submaps/surface_submaps/plains/Oldhouse.dmm
+++ b/maps/submaps/surface_submaps/plains/Oldhouse.dmm
@@ -7,21 +7,21 @@
 "g" = (/obj/item/stack/material/wood,/obj/effect/decal/cleanable/cobweb,/turf/simulated/floor/wood,/area/submap/Oldhouse)
 "h" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/wood,/area/submap/Oldhouse)
 "i" = (/turf/simulated/floor/wood,/area/submap/Oldhouse)
-"j" = (/turf/simulated/floor/wood{icon_state = "wood_broken6"},/area/submap/Oldhouse)
+"j" = (/turf/simulated/floor/wood{icon_state = "wood-broken6"},/area/submap/Oldhouse)
 "k" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/spiderling_remains,/turf/simulated/floor/wood,/area/submap/Oldhouse)
 "l" = (/obj/structure/table/woodentable,/turf/simulated/floor/wood,/area/submap/Oldhouse)
 "m" = (/obj/structure/closet/cabinet,/turf/simulated/floor/wood,/area/submap/Oldhouse)
 "n" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/carpet/turcarpet,/area/submap/Oldhouse)
-"o" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/wood{icon_state = "wood_broken4"},/area/submap/Oldhouse)
-"p" = (/turf/simulated/floor/wood{icon_state = "wood_broken2"},/area/submap/Oldhouse)
+"o" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/wood{icon_state = "wood-broken4"},/area/submap/Oldhouse)
+"p" = (/turf/simulated/floor/wood{icon_state = "wood-broken2"},/area/submap/Oldhouse)
 "q" = (/obj/item/stack/material/wood,/turf/simulated/floor/wood,/area/submap/Oldhouse)
 "r" = (/turf/simulated/floor/carpet/turcarpet,/area/submap/Oldhouse)
-"s" = (/turf/simulated/floor/wood{icon_state = "wood_broken4"},/area/submap/Oldhouse)
+"s" = (/turf/simulated/floor/wood{icon_state = "wood-broken4"},/area/submap/Oldhouse)
 "t" = (/obj/structure/table/woodentable,/obj/item/paper,/obj/effect/decal/cleanable/cobweb2,/turf/simulated/floor/wood,/area/submap/Oldhouse)
 "u" = (/obj/structure/simple_door/wood,/turf/simulated/floor/wood,/area/submap/Oldhouse)
 "v" = (/obj/structure/bed/chair/wood{icon_state = "wooden_chair"; dir = 1},/turf/simulated/floor/wood,/area/submap/Oldhouse)
 "w" = (/obj/item/stack/material/wood,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/wood,/area/submap/Oldhouse)
-"x" = (/obj/effect/decal/cleanable/cobweb,/turf/simulated/floor/wood{icon_state = "wood_broken6"},/area/submap/Oldhouse)
+"x" = (/obj/effect/decal/cleanable/cobweb,/turf/simulated/floor/wood{icon_state = "wood-broken6"},/area/submap/Oldhouse)
 "y" = (/obj/effect/decal/remains/mouse,/turf/simulated/floor/wood,/area/submap/Oldhouse)
 "z" = (/obj/structure/table/woodentable,/obj/item/stack/material/wood,/turf/simulated/floor/wood,/area/submap/Oldhouse)
 "A" = (/obj/structure/bed,/obj/item/bedsheet,/turf/simulated/floor/wood,/area/submap/Oldhouse)
@@ -48,8 +48,8 @@
 "V" = (/obj/item/flashlight,/turf/simulated/floor/wood,/area/submap/Oldhouse)
 "W" = (/obj/structure/table/rack,/obj/item/clothing/shoes/boots/winter,/obj/item/clothing/shoes/boots/winter,/obj/item/clothing/shoes/boots/winter,/turf/simulated/floor/wood,/area/submap/Oldhouse)
 "X" = (/obj/structure/coatrack,/turf/simulated/floor/wood,/area/submap/Oldhouse)
-"Y" = (/obj/structure/table/woodentable,/turf/simulated/floor/wood{icon_state = "wood_broken6"},/area/submap/Oldhouse)
-"Z" = (/obj/structure/table/woodentable,/turf/simulated/floor/wood{icon_state = "wood_broken2"},/area/submap/Oldhouse)
+"Y" = (/obj/structure/table/woodentable,/turf/simulated/floor/wood{icon_state = "wood-broken6"},/area/submap/Oldhouse)
+"Z" = (/obj/structure/table/woodentable,/turf/simulated/floor/wood{icon_state = "wood-broken2"},/area/submap/Oldhouse)
 
 (1,1,1) = {"
 aaaaaaaaaaaaaaaaaaaaaaaaaaaa
@@ -72,4 +72,4 @@ abbbbbcccccccuucccccccbbbbba
 adbbbbbbbbbbbbbbbbbbbbbbbbba
 abbbbbbbbbbbbbbbbbbbbbbbbbba
 aaaaaaaaaaaaaaaaaaaaaaaaaaaa
-"}
\ No newline at end of file
+"}
diff --git a/maps/submaps/surface_submaps/plains/Oldhouse_vr.dmm b/maps/submaps/surface_submaps/plains/Oldhouse_vr.dmm
index bdb7cdb825..a82d259069 100644
--- a/maps/submaps/surface_submaps/plains/Oldhouse_vr.dmm
+++ b/maps/submaps/surface_submaps/plains/Oldhouse_vr.dmm
@@ -35,7 +35,7 @@
 /area/submap/Oldhouse)
 "aj" = (
 /turf/simulated/floor/wood{
-	icon_state = "wood_broken6"
+	icon_state = "wood-broken6"
 	},
 /area/submap/Oldhouse)
 "ak" = (
@@ -58,12 +58,12 @@
 "ao" = (
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/wood{
-	icon_state = "wood_broken4"
+	icon_state = "wood-broken4"
 	},
 /area/submap/Oldhouse)
 "ap" = (
 /turf/simulated/floor/wood{
-	icon_state = "wood_broken2"
+	icon_state = "wood-broken2"
 	},
 /area/submap/Oldhouse)
 "aq" = (
@@ -75,7 +75,7 @@
 /area/submap/Oldhouse)
 "as" = (
 /turf/simulated/floor/wood{
-	icon_state = "wood_broken4"
+	icon_state = "wood-broken4"
 	},
 /area/submap/Oldhouse)
 "at" = (
@@ -103,7 +103,7 @@
 "ax" = (
 /obj/effect/decal/cleanable/cobweb,
 /turf/simulated/floor/wood{
-	icon_state = "wood_broken6"
+	icon_state = "wood-broken6"
 	},
 /area/submap/Oldhouse)
 "ay" = (
@@ -246,13 +246,13 @@
 "aY" = (
 /obj/structure/table/woodentable,
 /turf/simulated/floor/wood{
-	icon_state = "wood_broken6"
+	icon_state = "wood-broken6"
 	},
 /area/submap/Oldhouse)
 "aZ" = (
 /obj/structure/table/woodentable,
 /turf/simulated/floor/wood{
-	icon_state = "wood_broken2"
+	icon_state = "wood-broken2"
 	},
 /area/submap/Oldhouse)
 "ba" = (
diff --git a/maps/submaps/surface_submaps/wilderness/Manor1.dmm b/maps/submaps/surface_submaps/wilderness/Manor1.dmm
index db8a77c213..64019b041b 100644
--- a/maps/submaps/surface_submaps/wilderness/Manor1.dmm
+++ b/maps/submaps/surface_submaps/wilderness/Manor1.dmm
@@ -58,7 +58,7 @@
 "bf" = (/obj/structure/closet/cabinet,/obj/item/clothing/head/hood/winter,/obj/item/clothing/shoes/boots/winter,/obj/item/clothing/suit/storage/hooded/wintercoat,/obj/random/contraband,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1)
 "bg" = (/obj/structure/table/woodentable,/obj/item/paper_bin,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1)
 "bh" = (/obj/structure/bed/chair/wood{icon_state = "wooden_chair"; dir = 1},/turf/simulated/floor/holofloor/wood,/area/submap/Manor1)
-"bi" = (/obj/effect/decal/cleanable/cobweb,/turf/simulated/floor/holofloor/wood{icon_state = "wood_broken0"},/area/submap/Manor1)
+"bi" = (/obj/effect/decal/cleanable/cobweb,/turf/simulated/floor/holofloor/wood{icon_state = "wood-broken0"},/area/submap/Manor1)
 "bj" = (/obj/effect/decal/cleanable/cobweb,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1)
 "bk" = (/obj/random/plushielarge,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1)
 "bl" = (/turf/simulated/floor/carpet/blucarpet,/area/submap/Manor1)
@@ -67,7 +67,7 @@
 "bo" = (/obj/item/material/twohanded/baseballbat/metal,/turf/simulated/floor/carpet/blucarpet,/area/submap/Manor1)
 "bp" = (/obj/effect/decal/cleanable/blood,/turf/simulated/floor/carpet/blucarpet,/area/submap/Manor1)
 "bq" = (/obj/effect/decal/cleanable/blood/drip,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1)
-"br" = (/obj/structure/bed/chair/comfy/purp{icon_state = "comfychair_preview"; dir = 4},/turf/simulated/floor/holofloor/wood{icon_state = "wood_broken5"},/area/submap/Manor1)
+"br" = (/obj/structure/bed/chair/comfy/purp{icon_state = "comfychair_preview"; dir = 4},/turf/simulated/floor/holofloor/wood{icon_state = "wood-broken5"},/area/submap/Manor1)
 "bs" = (/obj/structure/table,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1)
 "bt" = (/obj/structure/bed/chair/wood{icon_state = "wooden_chair"; dir = 4},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1)
 "bu" = (/obj/structure/bed/chair/wood{icon_state = "wooden_chair"; dir = 8},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1)
@@ -97,7 +97,7 @@
 "bS" = (/obj/structure/flora/pottedplant/subterranean,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1)
 "bT" = (/obj/item/material/minihoe,/turf/simulated/floor/carpet/blucarpet,/area/submap/Manor1)
 "bU" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/carpet/purcarpet,/area/submap/Manor1)
-"bV" = (/turf/simulated/floor/holofloor/wood{icon_state = "wood_broken6"},/area/submap/Manor1)
+"bV" = (/turf/simulated/floor/holofloor/wood{icon_state = "wood-broken6"},/area/submap/Manor1)
 "bW" = (/obj/machinery/washing_machine,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1)
 "bX" = (/obj/structure/table/woodentable,/obj/structure/bedsheetbin,/obj/effect/decal/cleanable/cobweb2,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1)
 "bY" = (/obj/structure/table/rack,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1)
@@ -129,7 +129,7 @@
 "cy" = (/obj/structure/table/standard,/obj/item/towel/random,/obj/item/towel/random,/turf/simulated/floor/tiled/hydro,/area/submap/Manor1)
 "cz" = (/obj/effect/decal/cleanable/cobweb2,/obj/effect/spider/stickyweb,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1)
 "cA" = (/obj/item/paper/crumpled,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1)
-"cB" = (/turf/simulated/floor/holofloor/wood{icon_state = "wood_broken3"},/area/submap/Manor1)
+"cB" = (/turf/simulated/floor/holofloor/wood{icon_state = "wood-broken3"},/area/submap/Manor1)
 "cC" = (/obj/effect/decal/cleanable/spiderling_remains,/obj/effect/spider/stickyweb,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1)
 "cD" = (/obj/structure/closet/crate,/obj/item/clothing/suit/armor/vest,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1)
 "cE" = (/obj/structure/closet/crate,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1)
diff --git a/maps/submaps/surface_submaps/wilderness/Shack1.dmm b/maps/submaps/surface_submaps/wilderness/Shack1.dmm
index fa629810d7..2479af94ff 100644
--- a/maps/submaps/surface_submaps/wilderness/Shack1.dmm
+++ b/maps/submaps/surface_submaps/wilderness/Shack1.dmm
@@ -2,21 +2,21 @@
 "b" = (/turf/simulated/wall/log_sif,/area/submap/Shack1)
 "c" = (/turf/template_noop,/area/submap/Shack1)
 "d" = (/turf/simulated/floor/outdoors/dirt,/area/submap/Shack1)
-"e" = (/obj/effect/decal/cleanable/cobweb,/turf/simulated/floor/holofloor/wood{icon_state = "wood_broken1"},/area/submap/Shack1)
+"e" = (/obj/effect/decal/cleanable/cobweb,/turf/simulated/floor/holofloor/wood{icon_state = "wood-broken1"},/area/submap/Shack1)
 "f" = (/obj/structure/table/wooden_reinforced,/obj/item/storage/fancy/candle_box,/obj/item/storage/box/matches,/turf/simulated/floor/wood,/area/submap/Shack1)
 "g" = (/obj/structure/closet/cabinet,/obj/item/clothing/suit/storage/apron/overalls,/obj/item/clothing/under/overalls,/obj/random/mre,/turf/simulated/floor/wood,/area/submap/Shack1)
 "h" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/wood,/area/submap/Shack1)
 "i" = (/turf/simulated/floor/wood,/area/submap/Shack1)
-"j" = (/turf/simulated/floor/holofloor/wood{icon_state = "wood_broken0"},/area/submap/Shack1)
-"k" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/holofloor/wood{icon_state = "wood_broken5"},/area/submap/Shack1)
+"j" = (/turf/simulated/floor/holofloor/wood{icon_state = "wood-broken0"},/area/submap/Shack1)
+"k" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/holofloor/wood{icon_state = "wood-broken5"},/area/submap/Shack1)
 "l" = (/obj/structure/flora/tree/sif,/turf/template_noop,/area/submap/Shack1)
 "m" = (/obj/structure/simple_door/wood,/turf/simulated/floor/wood,/area/submap/Shack1)
-"n" = (/turf/simulated/floor/holofloor/wood{icon_state = "wood_broken3"},/area/submap/Shack1)
+"n" = (/turf/simulated/floor/holofloor/wood{icon_state = "wood-broken3"},/area/submap/Shack1)
 "o" = (/obj/structure/table/bench/wooden,/turf/simulated/floor/wood,/area/submap/Shack1)
 "p" = (/obj/effect/decal/cleanable/dirt,/obj/structure/table/wooden_reinforced,/obj/item/storage/toolbox,/turf/simulated/floor/wood,/area/submap/Shack1)
 "q" = (/obj/effect/decal/cleanable/dirt,/obj/structure/table/wooden_reinforced,/obj/item/material/twohanded/fireaxe/scythe,/turf/simulated/floor/wood,/area/submap/Shack1)
 "r" = (/obj/effect/decal/cleanable/spiderling_remains,/turf/simulated/floor/wood,/area/submap/Shack1)
-"s" = (/turf/simulated/floor/holofloor/wood{icon_state = "wood_broken6"},/area/submap/Shack1)
+"s" = (/turf/simulated/floor/holofloor/wood{icon_state = "wood-broken6"},/area/submap/Shack1)
 "t" = (/obj/effect/decal/cleanable/dirt,/obj/structure/table/wooden_reinforced,/obj/item/flashlight/lamp,/turf/simulated/floor/wood,/area/submap/Shack1)
 "u" = (/obj/structure/flora/tree/dead,/turf/template_noop,/area/submap/Shack1)
 
diff --git a/maps/tether/submaps/tether_centcom.dmm b/maps/tether/submaps/tether_centcom.dmm
index 2bbba0df2b..153049fb76 100644
--- a/maps/tether/submaps/tether_centcom.dmm
+++ b/maps/tether/submaps/tether_centcom.dmm
@@ -2780,7 +2780,6 @@
 /area/centcom/command)
 "iU" = (
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	pixel_x = 32
 	},
 /obj/effect/floor_decal/borderfloorblack{
@@ -8426,7 +8425,6 @@
 /area/shuttle/supply)
 "HH" = (
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	pixel_y = 30
 	},
 /turf/simulated/floor/lino,
@@ -14155,7 +14153,6 @@
 /area/shuttle/ccboat)
 "VK" = (
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	pixel_x = 32
 	},
 /obj/effect/floor_decal/borderfloorblack{
diff --git a/maps/tether/submaps/tether_misc.dmm b/maps/tether/submaps/tether_misc.dmm
index cc263c9b1c..6fd74b6819 100644
--- a/maps/tether/submaps/tether_misc.dmm
+++ b/maps/tether/submaps/tether_misc.dmm
@@ -2553,9 +2553,7 @@
 /turf/simulated/floor/holofloor/bmarble,
 /area/holodeck/source_chess)
 "wZ" = (
-/turf/unsimulated/floor{
-	icon_state = "sandwater"
-	},
+/turf/unsimulated/floor,
 /area/beach)
 "xc" = (
 /obj/machinery/scale,
diff --git a/maps/tether/tether-03-surface3.dmm b/maps/tether/tether-03-surface3.dmm
index 0538924ee5..101a7e81b2 100644
--- a/maps/tether/tether-03-surface3.dmm
+++ b/maps/tether/tether-03-surface3.dmm
@@ -29917,7 +29917,6 @@
 /area/tether/surfacebase/surface_three_hall)
 "baI" = (
 /obj/structure/closet/crate{
-	icon_state = "crate";
 	name = "Grenade Crate"
 	},
 /obj/item/grenade/chem_grenade,
diff --git a/maps/tether/tether-06-mining.dmm b/maps/tether/tether-06-mining.dmm
index 278ba12d9e..1a0f3c7abc 100644
--- a/maps/tether/tether-06-mining.dmm
+++ b/maps/tether/tether-06-mining.dmm
@@ -1116,7 +1116,6 @@
 	alarm_id = null;
 	breach_detection = 0;
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /obj/effect/floor_decal/borderfloor,
@@ -1442,7 +1441,6 @@
 	alarm_id = null;
 	breach_detection = 0;
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /obj/structure/cable/green{
diff --git a/maps/tether/tether-07-solars.dmm b/maps/tether/tether-07-solars.dmm
index ec60c30ab4..51c8a66b09 100644
--- a/maps/tether/tether-07-solars.dmm
+++ b/maps/tether/tether-07-solars.dmm
@@ -3269,7 +3269,6 @@
 /obj/machinery/meter,
 /obj/machinery/alarm{
 	dir = 4;
-	icon_state = "alarm0";
 	pixel_x = -22
 	},
 /turf/simulated/floor,
@@ -7337,7 +7336,6 @@
 /obj/machinery/atmospherics/unary/vent_pump/on,
 /obj/machinery/alarm{
 	dir = 4;
-	icon_state = "alarm0";
 	pixel_x = -22
 	},
 /obj/machinery/firealarm{
@@ -7358,7 +7356,6 @@
 	},
 /obj/machinery/alarm{
 	dir = 4;
-	icon_state = "alarm0";
 	pixel_x = -22
 	},
 /obj/machinery/light,
diff --git a/maps/tether_better/submaps/tether_misc.dmm b/maps/tether_better/submaps/tether_misc.dmm
index 122634651b..81b498c377 100644
--- a/maps/tether_better/submaps/tether_misc.dmm
+++ b/maps/tether_better/submaps/tether_misc.dmm
@@ -2374,9 +2374,7 @@
 /turf/unsimulated/wall,
 /area/centcom/control)
 "wZ" = (
-/turf/unsimulated/floor{
-	icon_state = "sandwater"
-	},
+/turf/unsimulated/floor,
 /area/beach)
 "xe" = (
 /obj/machinery/account_database{
diff --git a/maps/tether_better/tether-01-surface1.dmm b/maps/tether_better/tether-01-surface1.dmm
index 36a149cadb..3ff410086b 100644
--- a/maps/tether_better/tether-01-surface1.dmm
+++ b/maps/tether_better/tether-01-surface1.dmm
@@ -2615,7 +2615,6 @@
 	},
 /obj/machinery/computer/security/telescreen/entertainment{
 	desc = "Looks like it's set to history channel, the show is talking about modern aliens.  I wonder what else is on?";
-	icon_state = "frame";
 	pixel_y = -32
 	},
 /turf/simulated/floor/tiled,
@@ -2760,7 +2759,6 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/computer/security/telescreen/entertainment{
 	desc = "Looks like its set to the kek-centeral. I wonder what else is on?";
-	icon_state = "frame";
 	pixel_x = 32
 	},
 /turf/simulated/floor/wood,
@@ -2801,7 +2799,6 @@
 "aeL" = (
 /obj/machinery/computer/security/telescreen/entertainment{
 	desc = "Looks like it's on MTV. Now you can't blame that demi-cowgirl for working her money maker. I wonder what else is on?";
-	icon_state = "frame";
 	pixel_y = 32
 	},
 /turf/simulated/floor/lino,
@@ -2809,7 +2806,6 @@
 "aeM" = (
 /obj/machinery/computer/security/telescreen/entertainment{
 	desc = "Looks like it's on the fishing channel. I wonder what else is on?";
-	icon_state = "frame";
 	pixel_y = 32
 	},
 /turf/simulated/floor/tiled,
@@ -19116,7 +19112,6 @@
 "aGT" = (
 /obj/machinery/computer/security/telescreen/entertainment{
 	desc = "Looks like it's on MTV. Now you can't blame that demi-cowgirl for working her money maker. I wonder what else is on?";
-	icon_state = "frame";
 	pixel_x = 16;
 	pixel_y = 64
 	},
diff --git a/maps/tether_better/tether-02-surface2.dmm b/maps/tether_better/tether-02-surface2.dmm
index 62940ea0b3..c691e7b161 100644
--- a/maps/tether_better/tether-02-surface2.dmm
+++ b/maps/tether_better/tether-02-surface2.dmm
@@ -5543,7 +5543,6 @@
 "aiS" = (
 /obj/machinery/computer/security/telescreen/entertainment{
 	desc = "Looks like it's on MTV. Now you can't blame that demi-cowgirl for working her money maker. I wonder what else is on?";
-	icon_state = "frame";
 	pixel_x = 16;
 	pixel_y = 64
 	},
@@ -6470,7 +6469,6 @@
 "akw" = (
 /obj/machinery/computer/security/telescreen/entertainment{
 	desc = "Looks like it's set to ree-Anur-ntertanment, I wonder what else is on?";
-	icon_state = "frame";
 	pixel_y = 32
 	},
 /obj/effect/floor_decal/corner/paleblue/diagonal,
@@ -22777,7 +22775,6 @@
 "aPR" = (
 /obj/machinery/computer/security/telescreen/entertainment{
 	desc = "Looks like it's set to Free-Anur-Entertanment, I wonder what else is on?";
-	icon_state = "frame";
 	pixel_y = 32
 	},
 /turf/simulated/floor/wood,
@@ -27027,7 +27024,6 @@
 	},
 /obj/machinery/computer/security/telescreen/entertainment{
 	desc = "Looks like it's set to history channel, the show is talking about modern aliens.  I wonder what else is on?";
-	icon_state = "frame";
 	pixel_x = 32
 	},
 /turf/simulated/floor/tiled/techmaint,
diff --git a/maps/tether_better/tether-03-surface3.dmm b/maps/tether_better/tether-03-surface3.dmm
index fc4bf44414..62f7a334fa 100644
--- a/maps/tether_better/tether-03-surface3.dmm
+++ b/maps/tether_better/tether-03-surface3.dmm
@@ -8752,7 +8752,6 @@
 	},
 /obj/machinery/computer/security/telescreen/entertainment{
 	desc = "Looks like it's set to history channel, the show is talking about modern aliens.  I wonder what else is on?";
-	icon_state = "frame";
 	pixel_x = -32
 	},
 /turf/simulated/floor/tiled/freezer,
@@ -12470,7 +12469,6 @@
 /obj/structure/table/standard,
 /obj/machinery/computer/security/telescreen/entertainment{
 	desc = "Look's like it's set to the info station... I wonder what else is on?";
-	icon_state = "frame";
 	pixel_y = 32
 	},
 /turf/simulated/floor/tiled,
@@ -12584,7 +12582,6 @@
 "avg" = (
 /obj/machinery/computer/security/telescreen/entertainment{
 	desc = "Damn, looks like it's on the clown world channel. I wonder what else is on?";
-	icon_state = "frame";
 	pixel_y = 32
 	},
 /obj/structure/disposalpipe/segment{
@@ -21289,7 +21286,6 @@
 /area/rnd/robotics/mechbay)
 "aJS" = (
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	pixel_x = -64
 	},
 /turf/simulated/floor/wood,
@@ -33829,7 +33825,6 @@
 "biO" = (
 /obj/machinery/computer/security/telescreen/entertainment{
 	desc = "Looks like it's set to Free-Anur-Entertanment, I wonder what else is on?";
-	icon_state = "frame";
 	pixel_y = 32
 	},
 /turf/simulated/floor/tiled,
@@ -34087,7 +34082,6 @@
 /obj/structure/table/bench/sifwooden/padded,
 /obj/machinery/computer/security/telescreen/entertainment{
 	desc = "Looks like it's set to history channel, the show is talking about modern aliens.  I wonder what else is on?";
-	icon_state = "frame";
 	pixel_y = -32
 	},
 /turf/simulated/floor/tiled,
@@ -35144,7 +35138,6 @@
 /area/tether/surfacebase/medical/storage)
 "bmk" = (
 /obj/structure/closet/crate{
-	icon_state = "crate";
 	name = "Grenade Crate"
 	},
 /obj/item/grenade/chem_grenade,
@@ -41120,7 +41113,6 @@
 	},
 /obj/machinery/computer/security/telescreen/entertainment{
 	desc = "Look's like it's set to the info station... I wonder what else is on?";
-	icon_state = "frame";
 	pixel_x = 32;
 	pixel_y = -64
 	},
diff --git a/maps/virgo_minitest/virgo_minitest-1.dmm b/maps/virgo_minitest/virgo_minitest-1.dmm
index cbb321147c..ae55070f73 100644
--- a/maps/virgo_minitest/virgo_minitest-1.dmm
+++ b/maps/virgo_minitest/virgo_minitest-1.dmm
@@ -1030,7 +1030,6 @@
 	},
 /obj/machinery/alarm{
 	dir = 8;
-	icon_state = "alarm0";
 	pixel_x = 24
 	},
 /turf/simulated/floor/tiled,
@@ -2265,7 +2264,6 @@
 "fg" = (
 /obj/machinery/alarm{
 	dir = 8;
-	icon_state = "alarm0";
 	pixel_x = 24
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -4288,7 +4286,6 @@
 "uq" = (
 /obj/machinery/alarm{
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /obj/machinery/atmospherics/pipe/simple/visible/cyan{
@@ -5965,7 +5962,6 @@
 	},
 /obj/machinery/alarm{
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /obj/effect/floor_decal/borderfloor,
@@ -6829,7 +6825,6 @@
 "XA" = (
 /obj/machinery/alarm{
 	dir = 8;
-	icon_state = "alarm0";
 	pixel_x = 24
 	},
 /obj/structure/table/standard,
diff --git a/maps/virgo_minitest/virgo_minitest-sector-3.dmm b/maps/virgo_minitest/virgo_minitest-sector-3.dmm
index e102ac017c..90e8ac8c6e 100644
--- a/maps/virgo_minitest/virgo_minitest-sector-3.dmm
+++ b/maps/virgo_minitest/virgo_minitest-sector-3.dmm
@@ -88,7 +88,7 @@
 /area/awaymission/wwmines)
 "av" = (
 /turf/simulated/floor/wood{
-	icon_state = "wood_broken6"
+	icon_state = "wood-broken6"
 	},
 /area/awaymission/wwmines)
 "aw" = (
@@ -122,7 +122,7 @@
 /area/awaymission/wwmines)
 "aB" = (
 /turf/simulated/floor/wood{
-	icon_state = "wood_broken2"
+	icon_state = "wood-broken2"
 	},
 /area/awaymission/wwmines)
 "aC" = (
@@ -170,7 +170,7 @@
 /area/awaymission/wwmines)
 "aJ" = (
 /turf/simulated/floor/wood{
-	icon_state = "wood_broken4"
+	icon_state = "wood-broken4"
 	},
 /area/awaymission/wwmines)
 "aK" = (
diff --git a/maps/yw/cryogaia-01-centcomm.dmm b/maps/yw/cryogaia-01-centcomm.dmm
index 66dddf434f..a28612c971 100644
--- a/maps/yw/cryogaia-01-centcomm.dmm
+++ b/maps/yw/cryogaia-01-centcomm.dmm
@@ -1266,7 +1266,6 @@
 "gf" = (
 /obj/structure/table/standard,
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	pixel_x = 30
 	},
 /turf/unsimulated/floor{
@@ -1540,7 +1539,6 @@
 "hB" = (
 /obj/structure/table/standard,
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	pixel_x = -30
 	},
 /turf/unsimulated/floor{
@@ -4919,7 +4917,6 @@
 	dir = 8
 	},
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	pixel_x = -30
 	},
 /turf/unsimulated/floor{
@@ -6940,7 +6937,6 @@
 /obj/item/storage/box/donkpockets,
 /obj/item/storage/box/donkpockets,
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	pixel_x = 30
 	},
 /obj/effect/floor_decal/corner/orange{
diff --git a/maps/yw/cryogaia-04-maintenance.dmm b/maps/yw/cryogaia-04-maintenance.dmm
index 9dbdc6f9dd..9184978011 100644
--- a/maps/yw/cryogaia-04-maintenance.dmm
+++ b/maps/yw/cryogaia-04-maintenance.dmm
@@ -2946,7 +2946,6 @@
 	dir = 1
 	},
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	pixel_y = -32
 	},
 /obj/structure/table/standard,
@@ -4148,7 +4147,6 @@
 	dir = 1
 	},
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	pixel_y = -32
 	},
 /turf/simulated/floor/wood,
@@ -10992,7 +10990,6 @@
 	dir = 4
 	},
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	pixel_y = -32
 	},
 /turf/simulated/floor/wood,
@@ -21068,7 +21065,6 @@
 	dir = 1
 	},
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	pixel_y = -32
 	},
 /turf/simulated/floor/wood,
@@ -21858,7 +21854,6 @@
 	dir = 1
 	},
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	pixel_y = -32
 	},
 /turf/simulated/floor/wood,
@@ -33818,7 +33813,6 @@
 	dir = 1
 	},
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	pixel_y = -32
 	},
 /turf/simulated/floor/wood,
diff --git a/maps/yw/cryogaia-07-misc.dmm b/maps/yw/cryogaia-07-misc.dmm
index c3769c66ee..be0c4f5f3e 100644
--- a/maps/yw/cryogaia-07-misc.dmm
+++ b/maps/yw/cryogaia-07-misc.dmm
@@ -1158,9 +1158,7 @@
 /turf/simulated/floor/holofloor/tiled,
 /area/holodeck/source_basketball)
 "fy" = (
-/turf/unsimulated/floor{
-	icon_state = "sandwater"
-	},
+/turf/unsimulated/floor,
 /area/beach)
 "fz" = (
 /obj/structure/bed/chair,
@@ -5021,10 +5019,7 @@
 /turf/simulated/floor/holofloor/tiled,
 /area/holodeck/source_thunderdomecourt)
 "yO" = (
-/turf/unsimulated/wall{
-	icon = 'icons/misc/title.dmi';
-	icon_state = "title"
-	},
+/turf/unsimulated/wall,
 /area)
 "yR" = (
 /obj/machinery/mech_recharger,
@@ -5201,7 +5196,6 @@
 	dir = 8
 	},
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	pixel_x = 32
 	},
 /turf/simulated/shuttle/floor/darkred,
diff --git a/maps/yw/residential/backup/residential.dmm b/maps/yw/residential/backup/residential.dmm
index 7424097e5a..ff87db34ec 100644
--- a/maps/yw/residential/backup/residential.dmm
+++ b/maps/yw/residential/backup/residential.dmm
@@ -1130,7 +1130,6 @@
 "dA" = (
 /obj/structure/table/marble,
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	pixel_x = -30;
 	pixel_y = 0
 	},
@@ -3014,7 +3013,6 @@
 "iF" = (
 /obj/machinery/alarm{
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /turf/simulated/floor/tiled/white,
@@ -3136,7 +3134,6 @@
 "iT" = (
 /obj/machinery/alarm{
 	dir = 4;
-	icon_state = "alarm0";
 	pixel_x = -22
 	},
 /turf/simulated/floor/carpet,
@@ -3458,7 +3455,6 @@
 "jL" = (
 /obj/machinery/alarm{
 	dir = 4;
-	icon_state = "alarm0";
 	pixel_x = -22
 	},
 /turf/simulated/floor/wood,
@@ -3468,7 +3464,6 @@
 /area/residential/room5)
 "jN" = (
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	pixel_x = 0;
 	pixel_y = 0
 	},
@@ -3614,7 +3609,6 @@
 	},
 /obj/machinery/alarm{
 	dir = 8;
-	icon_state = "alarm0";
 	pixel_x = 24
 	},
 /turf/simulated/floor/tiled/neutral,
@@ -4123,7 +4117,6 @@
 "lj" = (
 /obj/machinery/alarm{
 	dir = 8;
-	icon_state = "alarm0";
 	pixel_x = 24
 	},
 /obj/machinery/light{
@@ -4149,7 +4142,6 @@
 "lm" = (
 /obj/structure/table/woodentable,
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	pixel_x = 0;
 	pixel_y = 30
 	},
@@ -4519,7 +4511,6 @@
 "mc" = (
 /obj/machinery/alarm{
 	dir = 8;
-	icon_state = "alarm0";
 	pixel_x = 24
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -4572,7 +4563,6 @@
 "ml" = (
 /obj/machinery/alarm{
 	dir = 8;
-	icon_state = "alarm0";
 	pixel_x = 24
 	},
 /turf/simulated/floor/wood,
@@ -5163,7 +5153,6 @@
 "nX" = (
 /obj/machinery/alarm{
 	dir = 8;
-	icon_state = "alarm0";
 	pixel_x = 24
 	},
 /obj/machinery/atmospherics/unary/vent_scrubber/on{
@@ -5892,7 +5881,6 @@
 "pL" = (
 /obj/machinery/alarm{
 	dir = 4;
-	icon_state = "alarm0";
 	pixel_x = -22
 	},
 /turf/simulated/floor/wood,
@@ -5907,7 +5895,6 @@
 "pO" = (
 /obj/machinery/alarm{
 	dir = 4;
-	icon_state = "alarm0";
 	pixel_x = -22
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -6432,7 +6419,6 @@
 /area/residential/room6)
 "rk" = (
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	pixel_x = 0;
 	pixel_y = 0
 	},
diff --git a/maps/yw/residential/residential.dmm b/maps/yw/residential/residential.dmm
index 9ec5c16882..e30406535a 100644
--- a/maps/yw/residential/residential.dmm
+++ b/maps/yw/residential/residential.dmm
@@ -3010,7 +3010,6 @@
 "qe" = (
 /obj/structure/table/marble,
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	pixel_x = -30
 	},
 /turf/simulated/floor/carpet/oracarpet,
@@ -4257,7 +4256,6 @@
 /area/residential/mansion)
 "xS" = (
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	pixel_x = 30
 	},
 /turf/simulated/floor/carpet,
@@ -4724,7 +4722,6 @@
 /area/residential/mroom2)
 "AA" = (
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	pixel_x = -32
 	},
 /turf/simulated/floor/carpet/blue,
@@ -6887,7 +6884,6 @@
 /area/residential/room5)
 "Lf" = (
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	pixel_x = -32
 	},
 /turf/simulated/floor/wood,
@@ -8824,7 +8820,6 @@
 "UM" = (
 /obj/structure/table/woodentable,
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	pixel_y = 30
 	},
 /turf/simulated/floor/wood,
@@ -9366,7 +9361,6 @@
 /area/residential/ship_bay)
 "Yb" = (
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	pixel_y = 30
 	},
 /turf/simulated/floor/carpet,
diff --git a/maps/yw/scratchmap.dmm b/maps/yw/scratchmap.dmm
index 26a783a6be..2bbed98ae0 100644
--- a/maps/yw/scratchmap.dmm
+++ b/maps/yw/scratchmap.dmm
@@ -288,7 +288,6 @@
 "aK" = (
 /obj/machinery/alarm{
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /turf/simulated/floor/tiled/white,
@@ -1006,7 +1005,6 @@
 /obj/fiftyspawner/glass,
 /obj/machinery/alarm{
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /obj/machinery/light,
@@ -2651,7 +2649,6 @@
 /obj/machinery/atmospherics/unary/vent_pump/on,
 /obj/machinery/alarm{
 	dir = 4;
-	icon_state = "alarm0";
 	pixel_x = -22
 	},
 /turf/simulated/floor/tiled/techfloor/grid,
@@ -3461,7 +3458,6 @@
 /obj/effect/floor_decal/industrial/hatch/yellow,
 /obj/machinery/alarm{
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /obj/structure/handrail{
@@ -3674,7 +3670,6 @@
 "hZ" = (
 /obj/machinery/alarm{
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /turf/simulated/floor/tiled/monotile,
@@ -4401,7 +4396,6 @@
 /obj/item/stack/cable_coil/pink,
 /obj/machinery/alarm{
 	dir = 8;
-	icon_state = "alarm0";
 	pixel_x = 24
 	},
 /turf/simulated/floor/tiled,
@@ -4814,7 +4808,6 @@
 "kY" = (
 /obj/machinery/alarm{
 	dir = 8;
-	icon_state = "alarm0";
 	pixel_x = 24
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -5166,7 +5159,6 @@
 	},
 /obj/machinery/alarm{
 	dir = 4;
-	icon_state = "alarm0";
 	pixel_x = -22;
 	pixel_y = 0
 	},
@@ -5899,7 +5891,6 @@
 /obj/item/pen/multi,
 /obj/machinery/alarm{
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /obj/effect/floor_decal/corner/blue{
@@ -6965,7 +6956,6 @@
 "pd" = (
 /obj/machinery/alarm{
 	dir = 4;
-	icon_state = "alarm0";
 	pixel_x = -22;
 	pixel_y = 0
 	},
@@ -7087,7 +7077,6 @@
 "pw" = (
 /obj/machinery/alarm{
 	dir = 4;
-	icon_state = "alarm0";
 	pixel_x = -22;
 	pixel_y = 0
 	},
@@ -9011,7 +9000,6 @@
 	},
 /obj/machinery/alarm{
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /obj/item/defib_kit/loaded,
@@ -9792,7 +9780,6 @@
 	},
 /obj/machinery/alarm{
 	dir = 4;
-	icon_state = "alarm0";
 	pixel_x = -22
 	},
 /turf/simulated/floor/tiled/white,
@@ -14104,7 +14091,6 @@
 	},
 /obj/machinery/alarm{
 	dir = 8;
-	icon_state = "alarm0";
 	pixel_x = 24
 	},
 /obj/structure/cable/green{
@@ -15241,7 +15227,6 @@
 "EG" = (
 /obj/machinery/alarm{
 	dir = 4;
-	icon_state = "alarm0";
 	pixel_x = -22
 	},
 /obj/effect/floor_decal/corner_oldtile/gray{
@@ -15888,7 +15873,6 @@
 /obj/item/clothing/shoes/boots/winter/explorer,
 /obj/machinery/alarm{
 	dir = 4;
-	icon_state = "alarm0";
 	pixel_x = -22
 	},
 /turf/simulated/floor/tiled,
@@ -16133,7 +16117,6 @@
 "Gs" = (
 /obj/machinery/alarm{
 	dir = 8;
-	icon_state = "alarm0";
 	pixel_x = 24
 	},
 /obj/machinery/computer/security/exploration{
@@ -16925,7 +16908,6 @@
 /obj/structure/closet/secure_closet/explorer,
 /obj/machinery/alarm{
 	dir = 8;
-	icon_state = "alarm0";
 	pixel_x = 24
 	},
 /turf/simulated/floor/tiled/steel_grid,
@@ -17395,7 +17377,6 @@
 /obj/structure/table/standard,
 /obj/machinery/alarm{
 	dir = 8;
-	icon_state = "alarm0";
 	pixel_x = 24
 	},
 /turf/simulated/floor/tiled,
@@ -17649,7 +17630,6 @@
 	},
 /obj/machinery/alarm{
 	dir = 8;
-	icon_state = "alarm0";
 	pixel_x = 24
 	},
 /turf/simulated/floor/tiled,
@@ -18425,7 +18405,6 @@
 	},
 /obj/machinery/alarm{
 	dir = 8;
-	icon_state = "alarm0";
 	pixel_x = 24
 	},
 /turf/simulated/floor/tiled,
diff --git a/maps/yw/submaps/aerostat/submaps/Manor1.dmm b/maps/yw/submaps/aerostat/submaps/Manor1.dmm
index 814ce5470e..964069c57c 100644
--- a/maps/yw/submaps/aerostat/submaps/Manor1.dmm
+++ b/maps/yw/submaps/aerostat/submaps/Manor1.dmm
@@ -275,7 +275,7 @@
 "bi" = (
 /obj/effect/decal/cleanable/cobweb,
 /turf/simulated/floor/holofloor/wood{
-	icon_state = "wood_broken0"
+	icon_state = "wood-broken0"
 	},
 /area/submap/virgo2/Manor1)
 "bj" = (
@@ -317,7 +317,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/holofloor/wood{
-	icon_state = "wood_broken5"
+	icon_state = "wood-broken5"
 	},
 /area/submap/virgo2/Manor1)
 "bs" = (
@@ -476,7 +476,7 @@
 /area/submap/virgo2/Manor1)
 "bV" = (
 /turf/simulated/floor/holofloor/wood{
-	icon_state = "wood_broken6"
+	icon_state = "wood-broken6"
 	},
 /area/submap/virgo2/Manor1)
 "bW" = (
@@ -642,7 +642,7 @@
 /area/submap/virgo2/Manor1)
 "cB" = (
 /turf/simulated/floor/holofloor/wood{
-	icon_state = "wood_broken3"
+	icon_state = "wood-broken3"
 	},
 /area/submap/virgo2/Manor1)
 "cC" = (
diff --git a/maps/yw/submaps/aerostat/submaps/Shack1.dmm b/maps/yw/submaps/aerostat/submaps/Shack1.dmm
index 74a8d6c2b0..6fdc1b211d 100644
--- a/maps/yw/submaps/aerostat/submaps/Shack1.dmm
+++ b/maps/yw/submaps/aerostat/submaps/Shack1.dmm
@@ -14,7 +14,7 @@
 "e" = (
 /obj/effect/decal/cleanable/cobweb,
 /turf/simulated/floor/holofloor/wood{
-	icon_state = "wood_broken1"
+	icon_state = "wood-broken1"
 	},
 /area/submap/virgo2/Shack1)
 "f" = (
@@ -36,13 +36,13 @@
 /area/submap/virgo2/Shack1)
 "j" = (
 /turf/simulated/floor/holofloor/wood{
-	icon_state = "wood_broken0"
+	icon_state = "wood-broken0"
 	},
 /area/submap/virgo2/Shack1)
 "k" = (
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/holofloor/wood{
-	icon_state = "wood_broken5"
+	icon_state = "wood-broken5"
 	},
 /area/submap/virgo2/Shack1)
 "l" = (
@@ -57,7 +57,7 @@
 /area/submap/virgo2/Shack1)
 "n" = (
 /turf/simulated/floor/holofloor/wood{
-	icon_state = "wood_broken3"
+	icon_state = "wood-broken3"
 	},
 /area/submap/virgo2/Shack1)
 "o" = (
@@ -82,7 +82,7 @@
 /area/submap/virgo2/Shack1)
 "s" = (
 /turf/simulated/floor/holofloor/wood{
-	icon_state = "wood_broken6"
+	icon_state = "wood-broken6"
 	},
 /area/submap/virgo2/Shack1)
 "t" = (
diff --git a/maps/yw/submaps/aerostat/submaps/backup/Manor1.dmm b/maps/yw/submaps/aerostat/submaps/backup/Manor1.dmm
index a84c0a6065..29b71f2c1c 100644
--- a/maps/yw/submaps/aerostat/submaps/backup/Manor1.dmm
+++ b/maps/yw/submaps/aerostat/submaps/backup/Manor1.dmm
@@ -275,7 +275,7 @@
 "bi" = (
 /obj/effect/decal/cleanable/cobweb,
 /turf/simulated/floor/holofloor/wood{
-	icon_state = "wood_broken0"
+	icon_state = "wood-broken0"
 	},
 /area/submap/virgo2/Manor1)
 "bj" = (
@@ -317,7 +317,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/holofloor/wood{
-	icon_state = "wood_broken5"
+	icon_state = "wood-broken5"
 	},
 /area/submap/virgo2/Manor1)
 "bs" = (
@@ -476,7 +476,7 @@
 /area/submap/virgo2/Manor1)
 "bV" = (
 /turf/simulated/floor/holofloor/wood{
-	icon_state = "wood_broken6"
+	icon_state = "wood-broken6"
 	},
 /area/submap/virgo2/Manor1)
 "bW" = (
@@ -642,7 +642,7 @@
 /area/submap/virgo2/Manor1)
 "cB" = (
 /turf/simulated/floor/holofloor/wood{
-	icon_state = "wood_broken3"
+	icon_state = "wood-broken3"
 	},
 /area/submap/virgo2/Manor1)
 "cC" = (
diff --git a/maps/yw/submaps/aerostat/submaps/backup/Shack1.dmm b/maps/yw/submaps/aerostat/submaps/backup/Shack1.dmm
index faac7d99b6..7a2540d316 100644
--- a/maps/yw/submaps/aerostat/submaps/backup/Shack1.dmm
+++ b/maps/yw/submaps/aerostat/submaps/backup/Shack1.dmm
@@ -14,7 +14,7 @@
 "e" = (
 /obj/effect/decal/cleanable/cobweb,
 /turf/simulated/floor/holofloor/wood{
-	icon_state = "wood_broken1"
+	icon_state = "wood-broken1"
 	},
 /area/submap/virgo2/Shack1)
 "f" = (
@@ -36,13 +36,13 @@
 /area/submap/virgo2/Shack1)
 "j" = (
 /turf/simulated/floor/holofloor/wood{
-	icon_state = "wood_broken0"
+	icon_state = "wood-broken0"
 	},
 /area/submap/virgo2/Shack1)
 "k" = (
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/holofloor/wood{
-	icon_state = "wood_broken5"
+	icon_state = "wood-broken5"
 	},
 /area/submap/virgo2/Shack1)
 "l" = (
@@ -57,7 +57,7 @@
 /area/submap/virgo2/Shack1)
 "n" = (
 /turf/simulated/floor/holofloor/wood{
-	icon_state = "wood_broken3"
+	icon_state = "wood-broken3"
 	},
 /area/submap/virgo2/Shack1)
 "o" = (
@@ -82,7 +82,7 @@
 /area/submap/virgo2/Shack1)
 "s" = (
 /turf/simulated/floor/holofloor/wood{
-	icon_state = "wood_broken6"
+	icon_state = "wood-broken6"
 	},
 /area/submap/virgo2/Shack1)
 "t" = (
diff --git a/maps/yw/submaps/gateway/zoo.dmm b/maps/yw/submaps/gateway/zoo.dmm
index 44e5242346..e3d7904c5e 100644
--- a/maps/yw/submaps/gateway/zoo.dmm
+++ b/maps/yw/submaps/gateway/zoo.dmm
@@ -1008,7 +1008,6 @@
 	dir = 8
 	},
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	pixel_x = 32
 	},
 /turf/simulated/floor/carpet,
diff --git a/maps/yw/submaps/space/guttersite.dmm b/maps/yw/submaps/space/guttersite.dmm
index 00ad9d0c75..a2316d7769 100644
--- a/maps/yw/submaps/space/guttersite.dmm
+++ b/maps/yw/submaps/space/guttersite.dmm
@@ -591,7 +591,6 @@
 /obj/machinery/alarm{
 	alarms_hidden = 1;
 	dir = 4;
-	icon_state = "alarm0";
 	pixel_x = -22;
 	pixel_y = 0
 	},
@@ -932,7 +931,6 @@
 /obj/machinery/alarm{
 	alarms_hidden = 1;
 	dir = 4;
-	icon_state = "alarm0";
 	pixel_x = -22;
 	pixel_y = 0
 	},
@@ -1405,7 +1403,6 @@
 	alarms_hidden = 1;
 	breach_detection = 0;
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /turf/simulated/floor/tiled/eris/dark/gray_perforated,
@@ -1598,7 +1595,6 @@
 /obj/machinery/alarm{
 	alarms_hidden = 1;
 	dir = 4;
-	icon_state = "alarm0";
 	pixel_x = -22;
 	pixel_y = 0
 	},
@@ -1692,7 +1688,6 @@
 /obj/machinery/alarm{
 	alarms_hidden = 1;
 	dir = 4;
-	icon_state = "alarm0";
 	pixel_x = -22;
 	pixel_y = 0
 	},
@@ -1819,7 +1814,6 @@
 /obj/machinery/alarm{
 	alarms_hidden = 1;
 	dir = 4;
-	icon_state = "alarm0";
 	pixel_x = -22;
 	pixel_y = 0
 	},
@@ -2482,7 +2476,6 @@
 /obj/machinery/alarm{
 	alarms_hidden = 1;
 	dir = 4;
-	icon_state = "alarm0";
 	pixel_x = -22;
 	pixel_y = 0
 	},
@@ -2832,7 +2825,6 @@
 /obj/machinery/alarm{
 	alarms_hidden = 1;
 	dir = 4;
-	icon_state = "alarm0";
 	pixel_x = -22;
 	pixel_y = 0
 	},
@@ -2842,7 +2834,6 @@
 /obj/machinery/alarm{
 	alarms_hidden = 1;
 	dir = 4;
-	icon_state = "alarm0";
 	pixel_x = -22;
 	pixel_y = 0
 	},
@@ -2933,7 +2924,6 @@
 /obj/machinery/alarm{
 	alarms_hidden = 1;
 	dir = 4;
-	icon_state = "alarm0";
 	pixel_x = -22;
 	pixel_y = 0
 	},
@@ -2960,7 +2950,6 @@
 /obj/machinery/alarm{
 	alarms_hidden = 1;
 	dir = 4;
-	icon_state = "alarm0";
 	pixel_x = -22;
 	pixel_y = 0
 	},
@@ -3124,7 +3113,6 @@
 /obj/machinery/alarm{
 	alarms_hidden = 1;
 	dir = 4;
-	icon_state = "alarm0";
 	pixel_x = -22;
 	pixel_y = 0
 	},
@@ -3980,7 +3968,6 @@
 /obj/machinery/alarm{
 	alarms_hidden = 1;
 	dir = 4;
-	icon_state = "alarm0";
 	pixel_x = -22;
 	pixel_y = 0
 	},
@@ -5573,7 +5560,6 @@
 /obj/machinery/alarm{
 	alarms_hidden = 1;
 	dir = 4;
-	icon_state = "alarm0";
 	pixel_x = -22;
 	pixel_y = 0
 	},
@@ -5623,7 +5609,6 @@
 "nV" = (
 /obj/machinery/alarm/alarms_hidden{
 	dir = 4;
-	icon_state = "alarm0";
 	pixel_x = -25
 	},
 /turf/simulated/floor/tiled/eris/dark/gray_perforated,
@@ -5631,7 +5616,6 @@
 "nW" = (
 /obj/machinery/alarm/alarms_hidden{
 	dir = 4;
-	icon_state = "alarm0";
 	pixel_x = -25
 	},
 /obj/machinery/firealarm{
@@ -5704,7 +5688,6 @@
 /obj/machinery/alarm{
 	alarms_hidden = 1;
 	dir = 4;
-	icon_state = "alarm0";
 	pixel_x = -22;
 	pixel_y = 0
 	},
@@ -5777,7 +5760,6 @@
 /obj/machinery/alarm{
 	alarms_hidden = 1;
 	dir = 4;
-	icon_state = "alarm0";
 	pixel_x = -22;
 	pixel_y = 0
 	},
diff --git a/maps/yw/submaps/wild/tether_wild-crash.dmm b/maps/yw/submaps/wild/tether_wild-crash.dmm
index 9254871d2e..19b2aeed93 100644
--- a/maps/yw/submaps/wild/tether_wild-crash.dmm
+++ b/maps/yw/submaps/wild/tether_wild-crash.dmm
@@ -201,7 +201,6 @@
 	dir = 8
 	},
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	pixel_x = 32
 	},
 /turf/simulated/shuttle/floor/black/virgo3b,
@@ -768,7 +767,7 @@
 	icon_state = "plant-09";
 	name = "Esteban";
 	pixel_y = 8;
-	
+
 	},
 /turf/simulated/shuttle/floor/black/virgo3b,
 /area/tether/surfacebase/outside/wilderness)
diff --git a/maps/~map_system/_map_selection.dm b/maps/~map_system/_map_selection.dm
index d6b6856a6f..072c14e3ff 100644
--- a/maps/~map_system/_map_selection.dm
+++ b/maps/~map_system/_map_selection.dm
@@ -1,4 +1,4 @@
-#ifndef CITESTING
+#if !defined(CITESTING) && !defined(SPACEMAN_DMM)
 
 /*********************/
 /* MAP SELECTION     */
diff --git a/modular_chomp/code/game/objects/random/misc.dm b/modular_chomp/code/game/objects/random/misc.dm
index e30f022d79..06172d43a5 100644
--- a/modular_chomp/code/game/objects/random/misc.dm
+++ b/modular_chomp/code/game/objects/random/misc.dm
@@ -1,7 +1,7 @@
 /obj/random/organ
 	name = "Random Organ"
 	desc = "An amalgamate of meaty things"
-	icon_state = "brain2"
+	icon_state = "brain"
 
 /obj/random/organ/item_to_spawn()
 	return pick(prob(1500);/obj/random/meat,
diff --git a/modular_chomp/code/game/objects/structures/desert_planet_structures.dm b/modular_chomp/code/game/objects/structures/desert_planet_structures.dm
index db2878b0aa..334cbcb640 100644
--- a/modular_chomp/code/game/objects/structures/desert_planet_structures.dm
+++ b/modular_chomp/code/game/objects/structures/desert_planet_structures.dm
@@ -4,6 +4,7 @@
 	desc = "Sandy and smooth from erosion."
 	density = TRUE
 	anchored = TRUE
+	icon_state = "desert_rock0"
 
 /obj/structure/prop/desert_rock/rock
 	name = "desert rock"
@@ -16,8 +17,8 @@
 	if(do_after(user, 3 SECONDS, src))
 		step(src, movedir)
 
-/obj/structure/prop/desert_rock/rock/New()
-	..()
+/obj/structure/prop/desert_rock/rock/Initialize(mapload)
+	. = ..()
 	icon_state = "desert_rock[rand(0,6)]"
 
 /obj/structure/prop/desert_rock/pebble
@@ -33,8 +34,8 @@
 			M.Weaken(2)
 			to_chat(M, "You trip over the [src]!")
 
-/obj/structure/prop/desert_rock/pebble/New()
-	..()
+/obj/structure/prop/desert_rock/pebble/Initialize(mapload)
+	. = ..()
 	icon_state = "desert_pebble[rand(0,6)]"
 
 /obj/structure/prop/desert_rock/anthill
@@ -43,8 +44,8 @@
 	icon = 'modular_chomp/icons/obj/desert_planet/desert_plants.dmi'
 	icon_state = "anthill0"
 
-/obj/structure/prop/desert_rock/anthill/New()
-	..()
+/obj/structure/prop/desert_rock/anthill/Initialize(mapload)
+	. = ..()
 	icon_state = "anthill[rand(0,2)]"
 
 /obj/structure/prop/desert_planet64x64
@@ -150,8 +151,8 @@
 	desc = "Colloquially known as a pot plant."
 	icon_state = "potplant0"
 
-/obj/structure/flora/desert_planet/potted_plant/New()
-	..()
+/obj/structure/flora/desert_planet/potted_plant/Initialize(mapload)
+	. = ..()
 	icon_state = "potplant[rand(0,2)]"
 
 /obj/structure/flora/desert_planet/thicket
@@ -159,8 +160,8 @@
 	desc = "Weedy growths."
 	icon_state = "thicket0"
 
-/obj/structure/flora/desert_planet/thicket/New()
-	..()
+/obj/structure/flora/desert_planet/thicket/Initialize(mapload)
+	. = ..()
 	icon_state = "thicket[rand(0,6)]"
 
 /obj/structure/flora/desert_planet/shrub
@@ -168,8 +169,8 @@
 	desc = "Dense and weedy."
 	icon_state = "shrub0"
 
-/obj/structure/flora/desert_planet/shrub/New()
-	..()
+/obj/structure/flora/desert_planet/shrub/Initialize(mapload)
+	. = ..()
 	icon_state = "shrub[rand(0,5)]"
 
 /obj/structure/flora/desert_planet/bush
@@ -177,8 +178,8 @@
 	desc = "Denser and weedier."
 	icon_state = "bush0"
 
-/obj/structure/flora/desert_planet/bush/New()
-	..()
+/obj/structure/flora/desert_planet/bush/Initialize(mapload)
+	. = ..()
 	icon_state = "bush[rand(0,5)]"
 
 /obj/structure/flora/desert_planet/barrelcacti
@@ -186,8 +187,8 @@
 	desc = "Small, adorable, and begging for a hug."
 	icon_state = "barrelcacti0"
 
-/obj/structure/flora/desert_planet/barrelcacti/New()
-	..()
+/obj/structure/flora/desert_planet/barrelcacti/Initialize(mapload)
+	. = ..()
 	icon_state = "barrelcacti[rand(0,3)]"
 
 /obj/structure/flora/desert_planet/palmy
@@ -195,8 +196,8 @@
 	desc = "Probably not actually a yucca."
 	icon_state = "palmy0"
 
-/obj/structure/flora/desert_planet/palmy/New()
-	..()
+/obj/structure/flora/desert_planet/palmy/Initialize(mapload)
+	. = ..()
 	icon_state = "palmy[rand(0,2)]"
 
 /obj/structure/flora/desert_planet/shrubber
@@ -204,8 +205,8 @@
 	desc = "Makes for great fur accessories."
 	icon_state = "shrubber0"
 
-/obj/structure/flora/desert_planet/shrubber/New()
-	..()
+/obj/structure/flora/desert_planet/shrubber/Initialize(mapload)
+	. = ..()
 	icon_state = "shrubber[rand(0,2)]"
 
 /obj/structure/flora/desert_planet/lbarrelcacti
@@ -213,8 +214,8 @@
 	desc = "Absolutely begging for pets."
 	icon_state = "lbarrelcacti0"
 
-/obj/structure/flora/desert_planet/lbarrelcacti/New()
-	..()
+/obj/structure/flora/desert_planet/lbarrelcacti/Initialize(mapload)
+	. = ..()
 	icon_state = "lbarrelcacti[rand(0,2)]"
 
 // Trees
diff --git a/modular_chomp/maps/overmap/om_ships/bearcat.dmm b/modular_chomp/maps/overmap/om_ships/bearcat.dmm
index 4545b414b4..7fa39aefb5 100644
--- a/modular_chomp/maps/overmap/om_ships/bearcat.dmm
+++ b/modular_chomp/maps/overmap/om_ships/bearcat.dmm
@@ -60,7 +60,6 @@
 /obj/machinery/light,
 /obj/machinery/alarm/alarms_hidden{
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -26
 	},
 /turf/simulated/floor/tiled/techfloor,
@@ -214,7 +213,6 @@
 	},
 /obj/machinery/alarm/alarms_hidden{
 	dir = 8;
-	icon_state = "alarm0";
 	pixel_x = 26
 	},
 /turf/simulated/floor/wood,
@@ -241,7 +239,6 @@
 	},
 /obj/machinery/alarm/alarms_hidden{
 	dir = 8;
-	icon_state = "alarm0";
 	pixel_x = 26
 	},
 /obj/structure/handrail{
@@ -309,7 +306,6 @@
 	},
 /obj/machinery/alarm/alarms_hidden{
 	dir = 4;
-	icon_state = "alarm0";
 	pixel_x = -26
 	},
 /obj/machinery/light{
@@ -722,7 +718,6 @@
 "bN" = (
 /obj/machinery/alarm/alarms_hidden{
 	dir = 8;
-	icon_state = "alarm0";
 	pixel_x = 26
 	},
 /obj/machinery/atmospherics/unary/vent_pump/on{
@@ -759,7 +754,6 @@
 "bV" = (
 /obj/machinery/alarm/alarms_hidden{
 	dir = 4;
-	icon_state = "alarm0";
 	pixel_x = -26
 	},
 /obj/machinery/atmospherics/unary/vent_pump/on{
@@ -905,7 +899,6 @@
 	},
 /obj/machinery/alarm/alarms_hidden{
 	dir = 8;
-	icon_state = "alarm0";
 	pixel_x = 26
 	},
 /obj/machinery/light{
@@ -925,7 +918,6 @@
 /obj/machinery/vending/snack,
 /obj/machinery/alarm/alarms_hidden{
 	dir = 4;
-	icon_state = "alarm0";
 	pixel_x = -26
 	},
 /turf/simulated/floor/tiled/techfloor,
@@ -983,7 +975,6 @@
 /obj/structure/closet,
 /obj/machinery/alarm/alarms_hidden{
 	dir = 8;
-	icon_state = "alarm0";
 	pixel_x = 26
 	},
 /obj/item/clothing/suit/space/void/refurb,
@@ -1456,7 +1447,6 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/alarm/alarms_hidden{
 	dir = 4;
-	icon_state = "alarm0";
 	pixel_x = -26
 	},
 /obj/structure/handrail{
@@ -1570,7 +1560,6 @@
 	},
 /obj/machinery/alarm/alarms_hidden{
 	dir = 4;
-	icon_state = "alarm0";
 	pixel_x = -26
 	},
 /turf/simulated/floor/tiled/techmaint,
@@ -1795,7 +1784,6 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/cyan,
 /obj/machinery/alarm/alarms_hidden{
 	dir = 8;
-	icon_state = "alarm0";
 	pixel_x = 26
 	},
 /turf/simulated/floor/tiled/techmaint,
@@ -1957,7 +1945,6 @@
 	},
 /obj/machinery/alarm/alarms_hidden{
 	dir = 8;
-	icon_state = "alarm0";
 	pixel_x = 26
 	},
 /turf/simulated/floor/tiled/techfloor,
@@ -2165,7 +2152,6 @@
 /obj/item/clothing/head/helmet/space/void/refurb/engineering,
 /obj/machinery/alarm/alarms_hidden{
 	dir = 8;
-	icon_state = "alarm0";
 	pixel_x = 26
 	},
 /obj/item/storage/belt/utility/full,
@@ -2304,7 +2290,6 @@
 /obj/structure/cable,
 /obj/machinery/alarm/alarms_hidden{
 	dir = 4;
-	icon_state = "alarm0";
 	pixel_x = -26
 	},
 /obj/machinery/power/apc/alarms_hidden,
@@ -2577,7 +2562,6 @@
 	},
 /obj/machinery/alarm/alarms_hidden{
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -26
 	},
 /turf/simulated/floor/tiled/techfloor,
@@ -2932,7 +2916,6 @@
 	},
 /obj/machinery/alarm/alarms_hidden{
 	dir = 4;
-	icon_state = "alarm0";
 	pixel_x = -26
 	},
 /turf/simulated/floor/plating,
@@ -3004,7 +2987,6 @@
 	},
 /obj/machinery/alarm/alarms_hidden{
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -26
 	},
 /obj/structure/handrail{
@@ -3376,7 +3358,6 @@
 "Ea" = (
 /obj/machinery/alarm/alarms_hidden{
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -26
 	},
 /obj/structure/cable{
@@ -3436,7 +3417,6 @@
 "Ik" = (
 /obj/machinery/alarm/alarms_hidden{
 	dir = 4;
-	icon_state = "alarm0";
 	pixel_x = -26
 	},
 /obj/structure/closet/firecloset/full,
diff --git a/modular_chomp/maps/overmap/om_ships/cruiser.dmm b/modular_chomp/maps/overmap/om_ships/cruiser.dmm
index 6b15664c04..1874de084e 100644
--- a/modular_chomp/maps/overmap/om_ships/cruiser.dmm
+++ b/modular_chomp/maps/overmap/om_ships/cruiser.dmm
@@ -909,7 +909,6 @@
 /obj/machinery/light,
 /obj/machinery/alarm{
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /obj/machinery/button/remote/blast_door{
@@ -1604,7 +1603,6 @@
 	alarm_id = "pen_nine";
 	breach_detection = 0;
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /obj/machinery/light/small,
@@ -1676,7 +1674,6 @@
 	alarm_id = "pen_nine";
 	breach_detection = 0;
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /turf/simulated/floor/tiled/techmaint,
@@ -1710,7 +1707,6 @@
 	alarm_id = "pen_nine";
 	breach_detection = 0;
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /obj/machinery/light/small,
@@ -2029,7 +2025,6 @@
 	alarm_id = "pen_nine";
 	breach_detection = 0;
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /obj/machinery/atmospherics/unary/vent_pump/on{
@@ -2191,7 +2186,6 @@
 	alarm_id = "pen_nine";
 	breach_detection = 0;
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /obj/machinery/atmospherics/unary/vent_pump/on{
@@ -2324,7 +2318,6 @@
 	alarm_id = "pen_nine";
 	breach_detection = 0;
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /obj/effect/floor_decal/industrial/warning/corner{
@@ -2613,7 +2606,6 @@
 	},
 /obj/machinery/alarm{
 	dir = 4;
-	icon_state = "alarm0";
 	pixel_x = -22
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -7207,7 +7199,6 @@
 	alarm_id = "pen_nine";
 	breach_detection = 0;
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /turf/simulated/floor/tiled/techmaint,
@@ -9086,7 +9077,6 @@
 /obj/machinery/atmospherics/pipe/simple/hidden,
 /obj/machinery/alarm{
 	dir = 4;
-	icon_state = "alarm0";
 	pixel_x = -22
 	},
 /turf/simulated/floor/tiled/techmaint,
@@ -9433,7 +9423,6 @@
 	alarm_id = "pen_nine";
 	breach_detection = 0;
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /obj/machinery/atmospherics/unary/vent_scrubber/on{
@@ -9491,7 +9480,6 @@
 /obj/machinery/atmospherics/pipe/manifold/hidden/supply,
 /obj/machinery/alarm{
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /turf/simulated/floor/tiled/techmaint,
@@ -9676,7 +9664,6 @@
 	},
 /obj/machinery/alarm{
 	dir = 4;
-	icon_state = "alarm0";
 	pixel_x = -22
 	},
 /turf/simulated/floor/tiled/techmaint,
diff --git a/modular_chomp/maps/overmap/om_ships/curashuttle.dmm b/modular_chomp/maps/overmap/om_ships/curashuttle.dmm
index 1cb7303d63..5e5ac00054 100644
--- a/modular_chomp/maps/overmap/om_ships/curashuttle.dmm
+++ b/modular_chomp/maps/overmap/om_ships/curashuttle.dmm
@@ -1286,7 +1286,6 @@
 /obj/machinery/light,
 /obj/machinery/alarm{
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -32
 	},
 /turf/simulated/floor/tiled/techfloor/grid,
diff --git a/modular_chomp/maps/overmap/om_ships/whiteship-26x33.dmm b/modular_chomp/maps/overmap/om_ships/whiteship-26x33.dmm
index fb7b298abb..acbd666e93 100644
--- a/modular_chomp/maps/overmap/om_ships/whiteship-26x33.dmm
+++ b/modular_chomp/maps/overmap/om_ships/whiteship-26x33.dmm
@@ -1836,7 +1836,6 @@
 /obj/structure/curtain/bed,
 /obj/item/bedsheet/hosdouble,
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	pixel_y = 32
 	},
 /turf/simulated/floor/wood,
diff --git a/modular_chomp/maps/overmap/om_ships/whiteship.dmm b/modular_chomp/maps/overmap/om_ships/whiteship.dmm
index f5230f1a18..d92f4d95e9 100644
--- a/modular_chomp/maps/overmap/om_ships/whiteship.dmm
+++ b/modular_chomp/maps/overmap/om_ships/whiteship.dmm
@@ -689,7 +689,6 @@
 /obj/item/clothing/shoes/sandal,
 /obj/item/clothing/shoes/sandal,
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	pixel_x = -32
 	},
 /obj/item/towel/random,
@@ -1727,7 +1726,6 @@
 	pixel_y = 20
 	},
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	pixel_x = -32
 	},
 /obj/item/handcuffs/legcuffs/fuzzy,
@@ -1791,7 +1789,6 @@
 /obj/structure/curtain/bed,
 /obj/item/bedsheet/hosdouble,
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	pixel_y = 32
 	},
 /turf/simulated/floor/wood,
diff --git a/modular_chomp/maps/relic_base/relicbase-12.dmm b/modular_chomp/maps/relic_base/relicbase-12.dmm
index 35e26797bc..10c30d12e8 100644
--- a/modular_chomp/maps/relic_base/relicbase-12.dmm
+++ b/modular_chomp/maps/relic_base/relicbase-12.dmm
@@ -560,7 +560,7 @@
 /obj/item/bedsheet/orange,
 /turf/unsimulated/floor{
 	icon = 'icons/turf/flooring/wood.dmi';
-	icon_state = "wood_broken1"
+	icon_state = "wood-broken1"
 	},
 /area/skipjack_station)
 "acP" = (
@@ -2158,7 +2158,7 @@
 "bzT" = (
 /turf/unsimulated/floor{
 	icon = 'icons/turf/flooring/wood.dmi';
-	icon_state = "wood_broken3"
+	icon_state = "wood-broken3"
 	},
 /area/skipjack_station)
 "bAn" = (
@@ -4081,7 +4081,7 @@
 /obj/item/target/alien,
 /turf/unsimulated/floor{
 	icon = 'icons/turf/flooring/wood.dmi';
-	icon_state = "wood_broken2"
+	icon_state = "wood-broken2"
 	},
 /area/ninja_dojo/dojo)
 "dCj" = (
@@ -11453,10 +11453,7 @@
 	},
 /area/centcom/living)
 "mcF" = (
-/turf/unsimulated/wall{
-	icon = 'icons/misc/title.dmi';
-	icon_state = "title"
-	},
+/turf/unsimulated/wall,
 /area/space)
 "mcT" = (
 /turf/simulated/floor/holofloor/lino,
@@ -11616,7 +11613,7 @@
 	},
 /turf/unsimulated/floor{
 	icon = 'icons/turf/flooring/wood.dmi';
-	icon_state = "wood_broken2"
+	icon_state = "wood-broken2"
 	},
 /area/skipjack_station)
 "moz" = (
@@ -14875,7 +14872,6 @@
 	dir = 8
 	},
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	pixel_x = 32
 	},
 /turf/simulated/floor/carpet,
@@ -16513,7 +16509,7 @@
 /obj/machinery/space_heater,
 /turf/unsimulated/floor{
 	icon = 'icons/turf/flooring/wood.dmi';
-	icon_state = "wood_broken3"
+	icon_state = "wood-broken3"
 	},
 /area/ninja_dojo/dojo)
 "ssX" = (
@@ -18654,7 +18650,7 @@
 "vco" = (
 /turf/unsimulated/floor{
 	icon = 'icons/turf/flooring/wood.dmi';
-	icon_state = "wood_broken1"
+	icon_state = "wood-broken1"
 	},
 /area/ninja_dojo/dojo)
 "vcz" = (
diff --git a/modular_chomp/maps/soluna_nexus/soluna_nexus-1.dmm b/modular_chomp/maps/soluna_nexus/soluna_nexus-1.dmm
index a00046d495..99a38056b9 100644
--- a/modular_chomp/maps/soluna_nexus/soluna_nexus-1.dmm
+++ b/modular_chomp/maps/soluna_nexus/soluna_nexus-1.dmm
@@ -256,9 +256,7 @@
 /area/shuttle/cryo/station)
 "abq" = (
 /obj/machinery/portable_atmospherics/hydroponics/soil,
-/obj/item/seeds/glowshroom{
-	icon_state = "seed"
-	},
+/obj/item/seeds/glowshroom,
 /turf/simulated/floor/grass2/turfpack/station,
 /area/hallway/Star_1Deck_Atrium)
 "abs" = (
@@ -15860,9 +15858,7 @@
 /area/hallway/For_Locker_Room)
 "dOW" = (
 /obj/machinery/portable_atmospherics/hydroponics/soil,
-/obj/item/seeds/rose{
-	icon_state = "seed"
-	},
+/obj/item/seeds/rose,
 /turf/simulated/floor/grass2/turfpack/station,
 /area/hallway/Port_1Deck_Atrium)
 "dPk" = (
@@ -18517,9 +18513,7 @@
 /area/engineering/Telecomms_Control_Room)
 "emw" = (
 /obj/machinery/portable_atmospherics/hydroponics/soil,
-/obj/item/seeds/lustflower{
-	icon_state = "seed"
-	},
+/obj/item/seeds/lustflower,
 /turf/simulated/floor/grass,
 /area/hallway/Port_1Deck_Atrium)
 "emE" = (
@@ -28592,9 +28586,7 @@
 /area/harbor/Dock4)
 "hVl" = (
 /obj/machinery/portable_atmospherics/hydroponics/soil,
-/obj/item/seeds/sunflowerseed{
-	icon_state = "seed"
-	},
+/obj/item/seeds/sunflowerseed,
 /turf/simulated/floor/grass,
 /area/hallway/Port_1Deck_Atrium)
 "hVG" = (
@@ -30855,9 +30847,7 @@
 /area/maintenance/Deck1_Cargo_Corridor3)
 "iNr" = (
 /obj/machinery/portable_atmospherics/hydroponics/soil,
-/obj/item/seeds/rose{
-	icon_state = "seed"
-	},
+/obj/item/seeds/rose,
 /turf/simulated/floor/grass,
 /area/hallway/Port_1Deck_Atrium)
 "iOk" = (
@@ -31898,9 +31888,7 @@
 /area/maintenance/Deck1_ForPort_Chamber1)
 "jkC" = (
 /obj/machinery/portable_atmospherics/hydroponics/soil,
-/obj/item/seeds/siflettuce{
-	icon_state = "seed"
-	},
+/obj/item/seeds/siflettuce,
 /turf/simulated/floor/grass2/turfpack/station,
 /area/hallway/Star_1Deck_Atrium)
 "jkR" = (
@@ -50719,9 +50707,7 @@
 "pOj" = (
 /obj/machinery/portable_atmospherics/hydroponics/soil,
 /obj/structure/flora/ausbushes/ppflowers,
-/obj/item/seeds/rose{
-	icon_state = "seed"
-	},
+/obj/item/seeds/rose,
 /turf/simulated/floor/grass2/turfpack/station,
 /area/hallway/Port_1Deck_Atrium)
 "pOq" = (
@@ -55316,9 +55302,7 @@
 /obj/machinery/portable_atmospherics/hydroponics/soil,
 /obj/structure/flora/ausbushes/ppflowers,
 /obj/structure/flora/ausbushes/ywflowers,
-/obj/item/seeds/lustflower{
-	icon_state = "seed"
-	},
+/obj/item/seeds/lustflower,
 /turf/simulated/floor/grass2/turfpack/station,
 /area/hallway/Port_1Deck_Atrium)
 "rqj" = (
@@ -58860,9 +58844,7 @@
 /area/engineering/GravGen_Room)
 "sER" = (
 /obj/machinery/portable_atmospherics/hydroponics/soil,
-/obj/item/seeds/sunflowerseed{
-	icon_state = "seed"
-	},
+/obj/item/seeds/sunflowerseed,
 /turf/simulated/floor/grass2/turfpack/station,
 /area/hallway/Port_1Deck_Atrium)
 "sET" = (
@@ -58945,9 +58927,7 @@
 /area/crew_quarters/Public_EVA)
 "sGr" = (
 /obj/machinery/portable_atmospherics/hydroponics/soil,
-/obj/item/seeds/poppyseed{
-	icon_state = "seed"
-	},
+/obj/item/seeds/poppyseed,
 /turf/simulated/floor/grass,
 /area/hallway/Port_1Deck_Atrium)
 "sGw" = (
@@ -60768,9 +60748,7 @@
 /area/rnd/Xenobotany_Lab)
 "tqp" = (
 /obj/machinery/portable_atmospherics/hydroponics/soil,
-/obj/item/seeds/rose/blood{
-	icon_state = "seed"
-	},
+/obj/item/seeds/rose/blood,
 /turf/simulated/floor/grass2/turfpack/station,
 /area/hallway/Port_1Deck_Atrium)
 "tqB" = (
@@ -61261,9 +61239,7 @@
 /area/harbor/Fueling_Post)
 "tzi" = (
 /obj/machinery/portable_atmospherics/hydroponics/soil,
-/obj/item/seeds/poppyseed{
-	icon_state = "seed"
-	},
+/obj/item/seeds/poppyseed,
 /turf/simulated/floor/grass2/turfpack/station,
 /area/hallway/Port_1Deck_Atrium)
 "tzt" = (
@@ -61387,9 +61363,7 @@
 /area/harbor/Ship_Bay4)
 "tAW" = (
 /obj/machinery/portable_atmospherics/hydroponics/soil,
-/obj/item/seeds/sifbulb{
-	icon_state = "seed"
-	},
+/obj/item/seeds/sifbulb,
 /turf/simulated/floor/grass2/turfpack/station,
 /area/hallway/Star_1Deck_Atrium)
 "tAZ" = (
@@ -61443,9 +61417,7 @@
 "tBN" = (
 /obj/structure/flora/ausbushes/fullgrass,
 /obj/machinery/portable_atmospherics/hydroponics/soil,
-/obj/item/seeds/shrinkshroom{
-	icon_state = "seed"
-	},
+/obj/item/seeds/shrinkshroom,
 /turf/simulated/floor/grass2/turfpack/station,
 /area/hallway/Star_1Deck_Atrium)
 "tCf" = (
@@ -66358,9 +66330,7 @@
 /area/hallway/Aft_1_Deck_Stairwell)
 "voc" = (
 /obj/machinery/portable_atmospherics/hydroponics/soil,
-/obj/item/seeds/lustflower{
-	icon_state = "seed"
-	},
+/obj/item/seeds/lustflower,
 /turf/simulated/floor/grass2/turfpack/station,
 /area/hallway/Port_1Deck_Atrium)
 "vof" = (
@@ -72444,9 +72414,7 @@
 	dir = 4
 	},
 /obj/structure/table/rack,
-/obj/item/seeds/siflettuce{
-	icon_state = "seed"
-	},
+/obj/item/seeds/siflettuce,
 /turf/simulated/floor/plating,
 /area/maintenance/Market_Stall_1)
 "xsB" = (
diff --git a/modular_chomp/maps/soluna_nexus/soluna_nexus-6.dmm b/modular_chomp/maps/soluna_nexus/soluna_nexus-6.dmm
index 46ff270ce3..f0e3e0f439 100644
--- a/modular_chomp/maps/soluna_nexus/soluna_nexus-6.dmm
+++ b/modular_chomp/maps/soluna_nexus/soluna_nexus-6.dmm
@@ -2689,7 +2689,7 @@
 /turf/simulated/floor/wood,
 /area/expoutpost/bar)
 "ctL" = (
-/obj/item/trash,
+/obj/random/trash,
 /turf/simulated/floor,
 /area/expoutpost/portuppermaint)
 "ctO" = (
@@ -10087,7 +10087,7 @@
 /turf/simulated/floor/tiled/white,
 /area/expoutpost/suite1)
 "jbK" = (
-/obj/item/trash,
+/obj/random/trash,
 /turf/simulated/floor,
 /area/expoutpost/staruppermaint)
 "jbR" = (
@@ -17079,7 +17079,7 @@
 /obj/machinery/light/small{
 	dir = 4
 	},
-/obj/item/trash,
+/obj/random/trash,
 /obj/structure/closet/crate,
 /turf/simulated/floor,
 /area/expoutpost/staruppermaint)
@@ -23964,7 +23964,7 @@
 /turf/simulated/floor,
 /area/expoutpost/pathfinderroom)
 "uLV" = (
-/obj/item/trash,
+/obj/random/trash,
 /obj/structure/closet/crate,
 /turf/simulated/floor,
 /area/expoutpost/portuppermaint)
diff --git a/modular_chomp/maps/soluna_nexus/soluna_nexus-7.dmm b/modular_chomp/maps/soluna_nexus/soluna_nexus-7.dmm
index 57c7edde72..f7f3e8cff3 100644
--- a/modular_chomp/maps/soluna_nexus/soluna_nexus-7.dmm
+++ b/modular_chomp/maps/soluna_nexus/soluna_nexus-7.dmm
@@ -5904,7 +5904,7 @@
 /obj/item/bedsheet/orange,
 /turf/unsimulated/floor{
 	icon = 'icons/turf/flooring/wood.dmi';
-	icon_state = "wood_broken1"
+	icon_state = "wood-broken1"
 	},
 /area/skipjack_station)
 "ePF" = (
@@ -5944,7 +5944,6 @@
 /obj/item/storage/box/donkpockets,
 /obj/item/storage/box/donkpockets,
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	pixel_x = 30
 	},
 /obj/effect/floor_decal/corner/orange{
@@ -8798,7 +8797,7 @@
 "hrC" = (
 /turf/unsimulated/floor{
 	icon = 'icons/turf/flooring/wood.dmi';
-	icon_state = "wood_broken3"
+	icon_state = "wood-broken3"
 	},
 /area/skipjack_station)
 "hrS" = (
@@ -9494,7 +9493,7 @@
 	},
 /turf/unsimulated/floor{
 	icon = 'icons/turf/flooring/wood.dmi';
-	icon_state = "wood_broken2"
+	icon_state = "wood-broken2"
 	},
 /area/skipjack_station)
 "hUU" = (
@@ -10274,7 +10273,7 @@
 "iCl" = (
 /turf/unsimulated/floor{
 	icon = 'icons/turf/flooring/wood.dmi';
-	icon_state = "wood_broken1"
+	icon_state = "wood-broken1"
 	},
 /area/ninja_dojo/dojo)
 "iCF" = (
@@ -12588,9 +12587,7 @@
 	},
 /area/ninja_dojo/dojo)
 "kwC" = (
-/turf/unsimulated/floor{
-	icon_state = "sandwater"
-	},
+/turf/unsimulated/floor,
 /area/beach)
 "kwM" = (
 /obj/structure/flora/ausbushes/reedbush,
@@ -14458,10 +14455,7 @@
 /turf/space,
 /area/space)
 "mcF" = (
-/turf/unsimulated/wall{
-	icon = 'icons/misc/title.dmi';
-	icon_state = "title"
-	},
+/turf/unsimulated/wall,
 /area/space)
 "mcT" = (
 /obj/effect/floor_decal/corner/red/full,
@@ -19050,7 +19044,6 @@
 	dir = 8
 	},
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	pixel_x = 32
 	},
 /turf/simulated/floor/carpet,
diff --git a/modular_chomp/maps/southern_cross/overmap/planets/kara/northern_star/backup/northern_star_mine.dmm b/modular_chomp/maps/southern_cross/overmap/planets/kara/northern_star/backup/northern_star_mine.dmm
index b3bfe1a4ad..b4072ef989 100644
--- a/modular_chomp/maps/southern_cross/overmap/planets/kara/northern_star/backup/northern_star_mine.dmm
+++ b/modular_chomp/maps/southern_cross/overmap/planets/kara/northern_star/backup/northern_star_mine.dmm
@@ -482,7 +482,6 @@
 "bo" = (
 /obj/machinery/alarm{
 	dir = 4;
-	icon_state = "alarm0";
 	pixel_x = -22
 	},
 /obj/machinery/camera/network/research_outpost{
@@ -1910,7 +1909,6 @@
 	},
 /obj/machinery/alarm{
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /turf/simulated/floor/tiled,
@@ -2430,7 +2428,6 @@
 "eY" = (
 /obj/machinery/alarm{
 	dir = 4;
-	icon_state = "alarm0";
 	pixel_x = -22
 	},
 /obj/effect/floor_decal/corner/purple{
@@ -3492,7 +3489,6 @@
 "he" = (
 /obj/machinery/alarm{
 	dir = 4;
-	icon_state = "alarm0";
 	pixel_x = -22
 	},
 /turf/simulated/floor/tiled,
@@ -4199,7 +4195,6 @@
 	},
 /obj/machinery/alarm{
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /turf/simulated/floor/tiled/white,
@@ -5334,7 +5329,6 @@
 	},
 /obj/machinery/alarm{
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /obj/effect/floor_decal/industrial/warning/corner{
@@ -5476,7 +5470,6 @@
 "kJ" = (
 /obj/machinery/alarm{
 	dir = 4;
-	icon_state = "alarm0";
 	pixel_x = -22
 	},
 /turf/simulated/floor/tiled/dark,
@@ -5987,7 +5980,6 @@
 "lS" = (
 /obj/machinery/alarm{
 	dir = 4;
-	icon_state = "alarm0";
 	pixel_x = -22
 	},
 /turf/simulated/floor/tiled,
@@ -7864,7 +7856,6 @@
 "pG" = (
 /obj/machinery/alarm{
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /obj/structure/cable/blue{
@@ -7954,7 +7945,6 @@
 	},
 /obj/machinery/alarm{
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /turf/simulated/floor/tiled/white,
@@ -8040,7 +8030,6 @@
 	},
 /obj/machinery/alarm{
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /turf/simulated/floor/tiled/white,
@@ -8166,7 +8155,6 @@
 	},
 /obj/machinery/alarm{
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /turf/simulated/floor/tiled,
@@ -8414,7 +8402,6 @@
 	},
 /obj/machinery/alarm{
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /turf/simulated/floor/tiled,
@@ -8999,7 +8986,6 @@
 	},
 /obj/machinery/alarm{
 	dir = 4;
-	icon_state = "alarm0";
 	pixel_x = -22;
 	pixel_y = 0
 	},
@@ -9234,7 +9220,6 @@
 /obj/machinery/atmospherics/unary/vent_scrubber/on,
 /obj/machinery/alarm{
 	dir = 4;
-	icon_state = "alarm0";
 	pixel_x = -22;
 	pixel_y = 0
 	},
@@ -9888,7 +9873,6 @@
 /obj/effect/floor_decal/industrial/warning,
 /obj/machinery/alarm{
 	dir = 4;
-	icon_state = "alarm0";
 	pixel_x = -22
 	},
 /turf/simulated/floor/tiled,
@@ -9988,7 +9972,6 @@
 	},
 /obj/machinery/alarm{
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /obj/structure/cable/blue{
@@ -10117,7 +10100,6 @@
 	},
 /obj/machinery/alarm{
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /turf/simulated/floor/tiled/dark,
@@ -17568,7 +17550,6 @@
 /obj/machinery/alarm{
 	alarms_hidden = 1;
 	dir = 8;
-	icon_state = "alarm0";
 	pixel_x = 24
 	},
 /turf/simulated/floor/tiled/dark,
@@ -17854,7 +17835,6 @@
 /obj/machinery/alarm{
 	alarms_hidden = 1;
 	dir = 8;
-	icon_state = "alarm0";
 	pixel_x = 24
 	},
 /turf/simulated/floor/tiled,
@@ -18856,7 +18836,6 @@
 "LP" = (
 /obj/machinery/alarm{
 	dir = 4;
-	icon_state = "alarm0";
 	pixel_x = -20
 	},
 /turf/simulated/floor/tiled,
@@ -19845,7 +19824,6 @@
 /obj/machinery/alarm{
 	alarms_hidden = 1;
 	dir = 8;
-	icon_state = "alarm0";
 	pixel_x = 24
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -19894,7 +19872,6 @@
 /obj/machinery/alarm{
 	alarms_hidden = 1;
 	dir = 8;
-	icon_state = "alarm0";
 	pixel_x = 24
 	},
 /turf/simulated/floor/plating,
@@ -19931,7 +19908,6 @@
 /obj/structure/table/steel,
 /obj/machinery/alarm{
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /turf/simulated/floor/tiled,
@@ -20103,7 +20079,6 @@
 	},
 /obj/machinery/alarm{
 	dir = 4;
-	icon_state = "alarm0";
 	pixel_x = -20
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -20794,7 +20769,6 @@
 "Qa" = (
 /obj/machinery/alarm{
 	dir = 4;
-	icon_state = "alarm0";
 	pixel_x = -20
 	},
 /turf/simulated/floor/tiled,
diff --git a/modular_chomp/maps/southern_cross/overmap/planets/kara/northern_star/northern_star_mine.dmm b/modular_chomp/maps/southern_cross/overmap/planets/kara/northern_star/northern_star_mine.dmm
index 7324303777..76ee8e4e8d 100644
--- a/modular_chomp/maps/southern_cross/overmap/planets/kara/northern_star/northern_star_mine.dmm
+++ b/modular_chomp/maps/southern_cross/overmap/planets/kara/northern_star/northern_star_mine.dmm
@@ -482,7 +482,6 @@
 "bo" = (
 /obj/machinery/alarm{
 	dir = 4;
-	icon_state = "alarm0";
 	pixel_x = -22
 	},
 /obj/machinery/camera/network/research_outpost{
@@ -1910,7 +1909,6 @@
 	},
 /obj/machinery/alarm{
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /turf/simulated/floor/tiled,
@@ -2430,7 +2428,6 @@
 "eY" = (
 /obj/machinery/alarm{
 	dir = 4;
-	icon_state = "alarm0";
 	pixel_x = -22
 	},
 /obj/effect/floor_decal/corner/purple{
@@ -3492,7 +3489,6 @@
 "he" = (
 /obj/machinery/alarm{
 	dir = 4;
-	icon_state = "alarm0";
 	pixel_x = -22
 	},
 /turf/simulated/floor/tiled,
@@ -4199,7 +4195,6 @@
 	},
 /obj/machinery/alarm{
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /turf/simulated/floor/tiled/white,
@@ -5334,7 +5329,6 @@
 	},
 /obj/machinery/alarm{
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /obj/effect/floor_decal/industrial/warning/corner{
@@ -5476,7 +5470,6 @@
 "kJ" = (
 /obj/machinery/alarm{
 	dir = 4;
-	icon_state = "alarm0";
 	pixel_x = -22
 	},
 /turf/simulated/floor/tiled/dark,
@@ -5987,7 +5980,6 @@
 "lS" = (
 /obj/machinery/alarm{
 	dir = 4;
-	icon_state = "alarm0";
 	pixel_x = -22
 	},
 /turf/simulated/floor/tiled,
@@ -7864,7 +7856,6 @@
 "pG" = (
 /obj/machinery/alarm{
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /obj/structure/cable/blue{
@@ -7954,7 +7945,6 @@
 	},
 /obj/machinery/alarm{
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /turf/simulated/floor/tiled/white,
@@ -8040,7 +8030,6 @@
 	},
 /obj/machinery/alarm{
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /turf/simulated/floor/tiled/white,
@@ -8166,7 +8155,6 @@
 	},
 /obj/machinery/alarm{
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /turf/simulated/floor/tiled,
@@ -8414,7 +8402,6 @@
 	},
 /obj/machinery/alarm{
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /turf/simulated/floor/tiled,
@@ -8999,7 +8986,6 @@
 	},
 /obj/machinery/alarm{
 	dir = 4;
-	icon_state = "alarm0";
 	pixel_x = -22;
 	pixel_y = 0
 	},
@@ -9234,7 +9220,6 @@
 /obj/machinery/atmospherics/unary/vent_scrubber/on,
 /obj/machinery/alarm{
 	dir = 4;
-	icon_state = "alarm0";
 	pixel_x = -22;
 	pixel_y = 0
 	},
@@ -9888,7 +9873,6 @@
 /obj/effect/floor_decal/industrial/warning,
 /obj/machinery/alarm{
 	dir = 4;
-	icon_state = "alarm0";
 	pixel_x = -22
 	},
 /turf/simulated/floor/tiled,
@@ -9988,7 +9972,6 @@
 	},
 /obj/machinery/alarm{
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /obj/structure/cable/blue{
@@ -10117,7 +10100,6 @@
 	},
 /obj/machinery/alarm{
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /turf/simulated/floor/tiled/dark,
@@ -17568,7 +17550,6 @@
 /obj/machinery/alarm{
 	alarms_hidden = 1;
 	dir = 8;
-	icon_state = "alarm0";
 	pixel_x = 24
 	},
 /turf/simulated/floor/tiled/dark,
@@ -17854,7 +17835,6 @@
 /obj/machinery/alarm{
 	alarms_hidden = 1;
 	dir = 8;
-	icon_state = "alarm0";
 	pixel_x = 24
 	},
 /turf/simulated/floor/tiled,
@@ -18856,7 +18836,6 @@
 "LP" = (
 /obj/machinery/alarm{
 	dir = 4;
-	icon_state = "alarm0";
 	pixel_x = -20
 	},
 /turf/simulated/floor/tiled,
@@ -19844,7 +19823,6 @@
 /obj/machinery/alarm{
 	alarms_hidden = 1;
 	dir = 8;
-	icon_state = "alarm0";
 	pixel_x = 24
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -19893,7 +19871,6 @@
 /obj/machinery/alarm{
 	alarms_hidden = 1;
 	dir = 8;
-	icon_state = "alarm0";
 	pixel_x = 24
 	},
 /turf/simulated/floor/plating,
@@ -19930,7 +19907,6 @@
 /obj/structure/table/steel,
 /obj/machinery/alarm{
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /turf/simulated/floor/tiled,
@@ -20102,7 +20078,6 @@
 	},
 /obj/machinery/alarm{
 	dir = 4;
-	icon_state = "alarm0";
 	pixel_x = -20
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -20793,7 +20768,6 @@
 "Qa" = (
 /obj/machinery/alarm{
 	dir = 4;
-	icon_state = "alarm0";
 	pixel_x = -20
 	},
 /turf/simulated/floor/tiled,
diff --git a/modular_chomp/maps/southern_cross/southern_cross-7.dmm b/modular_chomp/maps/southern_cross/southern_cross-7.dmm
index 74d180477d..e22fc91155 100644
--- a/modular_chomp/maps/southern_cross/southern_cross-7.dmm
+++ b/modular_chomp/maps/southern_cross/southern_cross-7.dmm
@@ -2809,7 +2809,7 @@
 /turf/simulated/floor,
 /area/shuttle/ursula)
 "ctL" = (
-/obj/item/trash,
+/obj/random/trash,
 /turf/simulated/floor,
 /area/expoutpost/portuppermaint)
 "ctO" = (
@@ -10709,7 +10709,7 @@
 /turf/simulated/floor/tiled/white,
 /area/expoutpost/suite1)
 "jbK" = (
-/obj/item/trash,
+/obj/random/trash,
 /turf/simulated/floor,
 /area/expoutpost/staruppermaint)
 "jbR" = (
@@ -18210,7 +18210,7 @@
 /obj/machinery/light/small{
 	dir = 4
 	},
-/obj/item/trash,
+/obj/random/trash,
 /obj/structure/closet/crate,
 /turf/simulated/floor,
 /area/expoutpost/staruppermaint)
@@ -25495,7 +25495,7 @@
 /turf/simulated/floor,
 /area/expoutpost/pathfinderroom)
 "uLV" = (
-/obj/item/trash,
+/obj/random/trash,
 /obj/structure/closet/crate,
 /turf/simulated/floor,
 /area/expoutpost/portuppermaint)
diff --git a/modular_chomp/maps/southern_cross/southern_cross-8.dmm b/modular_chomp/maps/southern_cross/southern_cross-8.dmm
index c2aa67d3fb..c45b986ba8 100644
--- a/modular_chomp/maps/southern_cross/southern_cross-8.dmm
+++ b/modular_chomp/maps/southern_cross/southern_cross-8.dmm
@@ -3024,7 +3024,7 @@
 /obj/item/target/alien,
 /turf/unsimulated/floor{
 	icon = 'icons/turf/flooring/wood.dmi';
-	icon_state = "wood_broken2"
+	icon_state = "wood-broken2"
 	},
 /area/ninja_dojo/dojo)
 "chd" = (
@@ -5798,7 +5798,7 @@
 /obj/item/bedsheet/orange,
 /turf/unsimulated/floor{
 	icon = 'icons/turf/flooring/wood.dmi';
-	icon_state = "wood_broken1"
+	icon_state = "wood-broken1"
 	},
 /area/skipjack_station)
 "ePF" = (
@@ -7362,7 +7362,6 @@
 /obj/item/storage/box/donkpockets,
 /obj/item/storage/box/donkpockets,
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	pixel_x = 30
 	},
 /obj/effect/floor_decal/corner/orange{
@@ -8438,7 +8437,7 @@
 "hrC" = (
 /turf/unsimulated/floor{
 	icon = 'icons/turf/flooring/wood.dmi';
-	icon_state = "wood_broken3"
+	icon_state = "wood-broken3"
 	},
 /area/skipjack_station)
 "hrS" = (
@@ -9037,7 +9036,7 @@
 	},
 /turf/unsimulated/floor{
 	icon = 'icons/turf/flooring/wood.dmi';
-	icon_state = "wood_broken2"
+	icon_state = "wood-broken2"
 	},
 /area/skipjack_station)
 "hUU" = (
@@ -9802,7 +9801,7 @@
 "iCl" = (
 /turf/unsimulated/floor{
 	icon = 'icons/turf/flooring/wood.dmi';
-	icon_state = "wood_broken1"
+	icon_state = "wood-broken1"
 	},
 /area/ninja_dojo/dojo)
 "iCF" = (
@@ -12091,9 +12090,7 @@
 	},
 /area/ninja_dojo/dojo)
 "kwC" = (
-/turf/unsimulated/floor{
-	icon_state = "sandwater"
-	},
+/turf/unsimulated/floor,
 /area/beach)
 "kwM" = (
 /obj/structure/flora/ausbushes/reedbush,
@@ -13749,10 +13746,7 @@
 	},
 /area/centcom/living)
 "mcF" = (
-/turf/unsimulated/wall{
-	icon = 'icons/misc/title.dmi';
-	icon_state = "title"
-	},
+/turf/unsimulated/wall,
 /area/space)
 "mcT" = (
 /obj/effect/floor_decal/corner/red/full,
@@ -17982,7 +17976,6 @@
 	dir = 8
 	},
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	pixel_x = 32
 	},
 /turf/simulated/floor/carpet,
@@ -22220,7 +22213,7 @@
 /obj/machinery/space_heater,
 /turf/unsimulated/floor{
 	icon = 'icons/turf/flooring/wood.dmi';
-	icon_state = "wood_broken3"
+	icon_state = "wood-broken3"
 	},
 /area/ninja_dojo/dojo)
 "uxc" = (
diff --git a/modular_chomp/maps/southern_cross/submaps/sc_belt_miner.dmm b/modular_chomp/maps/southern_cross/submaps/sc_belt_miner.dmm
index c021c9c878..5590126d90 100644
--- a/modular_chomp/maps/southern_cross/submaps/sc_belt_miner.dmm
+++ b/modular_chomp/maps/southern_cross/submaps/sc_belt_miner.dmm
@@ -751,7 +751,6 @@
 	alarm_id = "pen_nine";
 	breach_detection = 0;
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /turf/simulated/floor/tiled,
@@ -867,7 +866,6 @@
 /obj/machinery/alarm{
 	breach_detection = 0;
 	dir = 8;
-	icon_state = "alarm0";
 	pixel_x = 25;
 	rcon_setting = 3;
 	report_danger_level = 0
@@ -920,7 +918,6 @@
 /obj/machinery/alarm{
 	breach_detection = 0;
 	dir = 8;
-	icon_state = "alarm0";
 	pixel_x = 25;
 	rcon_setting = 3;
 	report_danger_level = 0
@@ -1741,7 +1738,6 @@
 	alarm_id = null;
 	breach_detection = 0;
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /turf/simulated/floor/tiled,
@@ -1858,7 +1854,6 @@
 /obj/machinery/alarm{
 	breach_detection = 0;
 	dir = 8;
-	icon_state = "alarm0";
 	pixel_x = 25;
 	rcon_setting = 3;
 	report_danger_level = 0
diff --git a/modular_chomp/maps/submaps/engine_submaps/southern_cross/engine_rust.dmm b/modular_chomp/maps/submaps/engine_submaps/southern_cross/engine_rust.dmm
index 22f4fc8fee..d950817815 100644
--- a/modular_chomp/maps/submaps/engine_submaps/southern_cross/engine_rust.dmm
+++ b/modular_chomp/maps/submaps/engine_submaps/southern_cross/engine_rust.dmm
@@ -1186,7 +1186,6 @@
 	},
 /obj/machinery/alarm{
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /turf/simulated/floor,
diff --git a/modular_chomp/maps/submaps/engine_submaps/southern_cross/engine_singulo.dmm b/modular_chomp/maps/submaps/engine_submaps/southern_cross/engine_singulo.dmm
index c68c5f4893..a02749a93c 100644
--- a/modular_chomp/maps/submaps/engine_submaps/southern_cross/engine_singulo.dmm
+++ b/modular_chomp/maps/submaps/engine_submaps/southern_cross/engine_singulo.dmm
@@ -100,7 +100,6 @@
 "aq" = (
 /obj/machinery/alarm{
 	dir = 8;
-	icon_state = "alarm0";
 	pixel_x = 24
 	},
 /obj/structure/dispenser/phoron,
@@ -1286,7 +1285,6 @@
 	},
 /obj/machinery/alarm{
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /obj/effect/floor_decal/borderfloor,
diff --git a/modular_chomp/maps/submaps/shelters/DragonCave-18x18.dmm b/modular_chomp/maps/submaps/shelters/DragonCave-18x18.dmm
index d3c40762ff..2ee2c2d926 100644
--- a/modular_chomp/maps/submaps/shelters/DragonCave-18x18.dmm
+++ b/modular_chomp/maps/submaps/shelters/DragonCave-18x18.dmm
@@ -147,9 +147,7 @@
 "pD" = (
 /obj/machinery/portable_atmospherics/hydroponics/soil,
 /obj/effect/decal/cleanable/dirt,
-/obj/item/seeds/wheatseed{
-	icon_state = "seed"
-	},
+/obj/item/seeds/wheatseed,
 /turf/simulated/floor/outdoors/dirt,
 /area/survivalpod/superpose/DragonCave)
 "pF" = (
@@ -510,9 +508,7 @@
 /area/survivalpod/superpose/DragonCave)
 "Yq" = (
 /obj/machinery/portable_atmospherics/hydroponics/soil,
-/obj/item/seeds/onionseed{
-	icon_state = "seed"
-	},
+/obj/item/seeds/onionseed,
 /obj/item/seeds/tomatoseed{
 	icon_state = "seed";
 	pixel_x = 4;
diff --git a/modular_chomp/maps/submaps/shelters/ScienceShip-25x33.dmm b/modular_chomp/maps/submaps/shelters/ScienceShip-25x33.dmm
index 43b09924e6..7c06984de8 100644
--- a/modular_chomp/maps/submaps/shelters/ScienceShip-25x33.dmm
+++ b/modular_chomp/maps/submaps/shelters/ScienceShip-25x33.dmm
@@ -705,7 +705,6 @@
 /obj/item/clothing/shoes/sandal,
 /obj/item/clothing/shoes/sandal,
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	pixel_x = -32
 	},
 /obj/item/towel/random,
@@ -1760,7 +1759,6 @@
 	pixel_y = 20
 	},
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	pixel_x = -32
 	},
 /obj/item/handcuffs/legcuffs/fuzzy,
@@ -1824,7 +1822,6 @@
 /obj/structure/curtain/bed,
 /obj/item/bedsheet/hosdouble,
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	pixel_y = 32
 	},
 /turf/simulated/floor/wood,
diff --git a/modular_chomp/maps/submaps/shelters/TradingShip-40x22.dmm b/modular_chomp/maps/submaps/shelters/TradingShip-40x22.dmm
index 48efa5bc43..ad3eccf67e 100644
--- a/modular_chomp/maps/submaps/shelters/TradingShip-40x22.dmm
+++ b/modular_chomp/maps/submaps/shelters/TradingShip-40x22.dmm
@@ -1694,7 +1694,6 @@
 	dir = 8
 	},
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	pixel_x = 32
 	},
 /turf/simulated/floor/carpet,
diff --git a/modular_chomp/maps/submaps/surface_submaps/plains/Boathouse.dmm b/modular_chomp/maps/submaps/surface_submaps/plains/Boathouse.dmm
index 0317a997c2..9ae3241f04 100644
--- a/modular_chomp/maps/submaps/surface_submaps/plains/Boathouse.dmm
+++ b/modular_chomp/maps/submaps/surface_submaps/plains/Boathouse.dmm
@@ -89,7 +89,7 @@
 /area/submap/boathouse)
 "av" = (
 /turf/simulated/floor/wood{
-	icon_state = "wood_broken6"
+	icon_state = "wood-broken6"
 	},
 /area/submap/boathouse)
 "aw" = (
@@ -123,7 +123,7 @@
 /area/submap/boathouse)
 "aB" = (
 /turf/simulated/floor/wood{
-	icon_state = "wood_broken2"
+	icon_state = "wood-broken2"
 	},
 /area/submap/boathouse)
 "aC" = (
@@ -171,7 +171,7 @@
 /area/submap/boathouse)
 "aJ" = (
 /turf/simulated/floor/wood{
-	icon_state = "wood_broken4"
+	icon_state = "wood-broken4"
 	},
 /area/submap/boathouse)
 "aK" = (
diff --git a/modular_chomp/maps/submaps/surface_submaps/plains/Boathouse_vr.dmm b/modular_chomp/maps/submaps/surface_submaps/plains/Boathouse_vr.dmm
index 66321c309d..6881c4716e 100644
--- a/modular_chomp/maps/submaps/surface_submaps/plains/Boathouse_vr.dmm
+++ b/modular_chomp/maps/submaps/surface_submaps/plains/Boathouse_vr.dmm
@@ -89,7 +89,7 @@
 /area/submap/Boathouse)
 "av" = (
 /turf/simulated/floor/wood{
-	icon_state = "wood_broken6"
+	icon_state = "wood-broken6"
 	},
 /area/submap/Boathouse)
 "aw" = (
@@ -123,7 +123,7 @@
 /area/submap/Boathouse)
 "aB" = (
 /turf/simulated/floor/wood{
-	icon_state = "wood_broken2"
+	icon_state = "wood-broken2"
 	},
 /area/submap/Boathouse)
 "aC" = (
@@ -171,7 +171,7 @@
 /area/submap/Boathouse)
 "aJ" = (
 /turf/simulated/floor/wood{
-	icon_state = "wood_broken4"
+	icon_state = "wood-broken4"
 	},
 /area/submap/Boathouse)
 "aK" = (
diff --git a/modular_chomp/maps/submaps/surface_submaps/plains/Oldhouse.dmm b/modular_chomp/maps/submaps/surface_submaps/plains/Oldhouse.dmm
index 960f570bfa..3d8bad3fc7 100644
--- a/modular_chomp/maps/submaps/surface_submaps/plains/Oldhouse.dmm
+++ b/modular_chomp/maps/submaps/surface_submaps/plains/Oldhouse.dmm
@@ -35,7 +35,7 @@
 /area/submap/Oldhouse)
 "j" = (
 /turf/simulated/floor/wood{
-	icon_state = "wood_broken6"
+	icon_state = "wood-broken6"
 	},
 /area/submap/Oldhouse)
 "k" = (
@@ -58,12 +58,12 @@
 "o" = (
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/wood{
-	icon_state = "wood_broken4"
+	icon_state = "wood-broken4"
 	},
 /area/submap/Oldhouse)
 "p" = (
 /turf/simulated/floor/wood{
-	icon_state = "wood_broken2"
+	icon_state = "wood-broken2"
 	},
 /area/submap/Oldhouse)
 "q" = (
@@ -75,7 +75,7 @@
 /area/submap/Oldhouse)
 "s" = (
 /turf/simulated/floor/wood{
-	icon_state = "wood_broken4"
+	icon_state = "wood-broken4"
 	},
 /area/submap/Oldhouse)
 "t" = (
@@ -103,7 +103,7 @@
 "x" = (
 /obj/effect/decal/cleanable/cobweb,
 /turf/simulated/floor/wood{
-	icon_state = "wood_broken6"
+	icon_state = "wood-broken6"
 	},
 /area/submap/Oldhouse)
 "y" = (
@@ -246,13 +246,13 @@
 "Y" = (
 /obj/structure/table/woodentable,
 /turf/simulated/floor/wood{
-	icon_state = "wood_broken6"
+	icon_state = "wood-broken6"
 	},
 /area/submap/Oldhouse)
 "Z" = (
 /obj/structure/table/woodentable,
 /turf/simulated/floor/wood{
-	icon_state = "wood_broken2"
+	icon_state = "wood-broken2"
 	},
 /area/submap/Oldhouse)
 
diff --git a/modular_chomp/maps/submaps/surface_submaps/plains/Oldhouse_vr.dmm b/modular_chomp/maps/submaps/surface_submaps/plains/Oldhouse_vr.dmm
index bdb7cdb825..a82d259069 100644
--- a/modular_chomp/maps/submaps/surface_submaps/plains/Oldhouse_vr.dmm
+++ b/modular_chomp/maps/submaps/surface_submaps/plains/Oldhouse_vr.dmm
@@ -35,7 +35,7 @@
 /area/submap/Oldhouse)
 "aj" = (
 /turf/simulated/floor/wood{
-	icon_state = "wood_broken6"
+	icon_state = "wood-broken6"
 	},
 /area/submap/Oldhouse)
 "ak" = (
@@ -58,12 +58,12 @@
 "ao" = (
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/wood{
-	icon_state = "wood_broken4"
+	icon_state = "wood-broken4"
 	},
 /area/submap/Oldhouse)
 "ap" = (
 /turf/simulated/floor/wood{
-	icon_state = "wood_broken2"
+	icon_state = "wood-broken2"
 	},
 /area/submap/Oldhouse)
 "aq" = (
@@ -75,7 +75,7 @@
 /area/submap/Oldhouse)
 "as" = (
 /turf/simulated/floor/wood{
-	icon_state = "wood_broken4"
+	icon_state = "wood-broken4"
 	},
 /area/submap/Oldhouse)
 "at" = (
@@ -103,7 +103,7 @@
 "ax" = (
 /obj/effect/decal/cleanable/cobweb,
 /turf/simulated/floor/wood{
-	icon_state = "wood_broken6"
+	icon_state = "wood-broken6"
 	},
 /area/submap/Oldhouse)
 "ay" = (
@@ -246,13 +246,13 @@
 "aY" = (
 /obj/structure/table/woodentable,
 /turf/simulated/floor/wood{
-	icon_state = "wood_broken6"
+	icon_state = "wood-broken6"
 	},
 /area/submap/Oldhouse)
 "aZ" = (
 /obj/structure/table/woodentable,
 /turf/simulated/floor/wood{
-	icon_state = "wood_broken2"
+	icon_state = "wood-broken2"
 	},
 /area/submap/Oldhouse)
 "ba" = (
diff --git a/modular_chomp/maps/submaps/surface_submaps/plains/oldlibrary.dmm b/modular_chomp/maps/submaps/surface_submaps/plains/oldlibrary.dmm
index c3fcd5dd56..51845ff837 100644
--- a/modular_chomp/maps/submaps/surface_submaps/plains/oldlibrary.dmm
+++ b/modular_chomp/maps/submaps/surface_submaps/plains/oldlibrary.dmm
@@ -35,7 +35,7 @@
 /area/submap/oldlibrary)
 "aj" = (
 /turf/simulated/floor/wood{
-	icon_state = "wood_broken6"
+	icon_state = "wood-broken6"
 	},
 /area/submap/oldlibrary)
 "ak" = (
@@ -58,12 +58,12 @@
 "ao" = (
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/wood{
-	icon_state = "wood_broken4"
+	icon_state = "wood-broken4"
 	},
 /area/submap/oldlibrary)
 "ap" = (
 /turf/simulated/floor/wood{
-	icon_state = "wood_broken2"
+	icon_state = "wood-broken2"
 	},
 /area/submap/oldlibrary)
 "aq" = (
@@ -75,7 +75,7 @@
 /area/submap/oldlibrary)
 "as" = (
 /turf/simulated/floor/wood{
-	icon_state = "wood_broken4"
+	icon_state = "wood-broken4"
 	},
 /area/submap/oldlibrary)
 "at" = (
@@ -103,7 +103,7 @@
 "ax" = (
 /obj/effect/decal/cleanable/cobweb,
 /turf/simulated/floor/wood{
-	icon_state = "wood_broken6"
+	icon_state = "wood-broken6"
 	},
 /area/submap/oldlibrary)
 "ay" = (
@@ -246,13 +246,13 @@
 "aY" = (
 /obj/structure/table/woodentable,
 /turf/simulated/floor/wood{
-	icon_state = "wood_broken6"
+	icon_state = "wood-broken6"
 	},
 /area/submap/oldlibrary)
 "aZ" = (
 /obj/structure/table/woodentable,
 /turf/simulated/floor/wood{
-	icon_state = "wood_broken2"
+	icon_state = "wood-broken2"
 	},
 /area/submap/oldlibrary)
 "ba" = (
diff --git a/modular_chomp/maps/submaps/surface_submaps/wilderness/Shack1.dmm b/modular_chomp/maps/submaps/surface_submaps/wilderness/Shack1.dmm
index 07996a9607..bdf41bb616 100644
--- a/modular_chomp/maps/submaps/surface_submaps/wilderness/Shack1.dmm
+++ b/modular_chomp/maps/submaps/surface_submaps/wilderness/Shack1.dmm
@@ -14,7 +14,7 @@
 "e" = (
 /obj/effect/decal/cleanable/cobweb,
 /turf/simulated/floor/holofloor/wood{
-	icon_state = "wood_broken1"
+	icon_state = "wood-broken1"
 	},
 /area/submap/Shack1)
 "f" = (
@@ -39,13 +39,13 @@
 /area/submap/Shack1)
 "j" = (
 /turf/simulated/floor/holofloor/wood{
-	icon_state = "wood_broken0"
+	icon_state = "wood-broken0"
 	},
 /area/submap/Shack1)
 "k" = (
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/holofloor/wood{
-	icon_state = "wood_broken5"
+	icon_state = "wood-broken5"
 	},
 /area/submap/Shack1)
 "l" = (
@@ -58,7 +58,7 @@
 /area/submap/Shack1)
 "n" = (
 /turf/simulated/floor/holofloor/wood{
-	icon_state = "wood_broken3"
+	icon_state = "wood-broken3"
 	},
 /area/submap/Shack1)
 "o" = (
@@ -83,7 +83,7 @@
 /area/submap/Shack1)
 "s" = (
 /turf/simulated/floor/holofloor/wood{
-	icon_state = "wood_broken6"
+	icon_state = "wood-broken6"
 	},
 /area/submap/Shack1)
 "t" = (
diff --git a/modular_chomp/maps/virgo_minitest/virgo_minitest-1.dmm b/modular_chomp/maps/virgo_minitest/virgo_minitest-1.dmm
index cbb321147c..ae55070f73 100644
--- a/modular_chomp/maps/virgo_minitest/virgo_minitest-1.dmm
+++ b/modular_chomp/maps/virgo_minitest/virgo_minitest-1.dmm
@@ -1030,7 +1030,6 @@
 	},
 /obj/machinery/alarm{
 	dir = 8;
-	icon_state = "alarm0";
 	pixel_x = 24
 	},
 /turf/simulated/floor/tiled,
@@ -2265,7 +2264,6 @@
 "fg" = (
 /obj/machinery/alarm{
 	dir = 8;
-	icon_state = "alarm0";
 	pixel_x = 24
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -4288,7 +4286,6 @@
 "uq" = (
 /obj/machinery/alarm{
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /obj/machinery/atmospherics/pipe/simple/visible/cyan{
@@ -5965,7 +5962,6 @@
 	},
 /obj/machinery/alarm{
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /obj/effect/floor_decal/borderfloor,
@@ -6829,7 +6825,6 @@
 "XA" = (
 /obj/machinery/alarm{
 	dir = 8;
-	icon_state = "alarm0";
 	pixel_x = 24
 	},
 /obj/structure/table/standard,
diff --git a/modular_chomp/maps/virgo_minitest/virgo_minitest-sector-3.dmm b/modular_chomp/maps/virgo_minitest/virgo_minitest-sector-3.dmm
index e102ac017c..90e8ac8c6e 100644
--- a/modular_chomp/maps/virgo_minitest/virgo_minitest-sector-3.dmm
+++ b/modular_chomp/maps/virgo_minitest/virgo_minitest-sector-3.dmm
@@ -88,7 +88,7 @@
 /area/awaymission/wwmines)
 "av" = (
 /turf/simulated/floor/wood{
-	icon_state = "wood_broken6"
+	icon_state = "wood-broken6"
 	},
 /area/awaymission/wwmines)
 "aw" = (
@@ -122,7 +122,7 @@
 /area/awaymission/wwmines)
 "aB" = (
 /turf/simulated/floor/wood{
-	icon_state = "wood_broken2"
+	icon_state = "wood-broken2"
 	},
 /area/awaymission/wwmines)
 "aC" = (
@@ -170,7 +170,7 @@
 /area/awaymission/wwmines)
 "aJ" = (
 /turf/simulated/floor/wood{
-	icon_state = "wood_broken4"
+	icon_state = "wood-broken4"
 	},
 /area/awaymission/wwmines)
 "aK" = (
diff --git a/modular_chomp/maps/virtual_reality/constructVR.dmm b/modular_chomp/maps/virtual_reality/constructVR.dmm
index e5f9768180..250d7b90f9 100644
--- a/modular_chomp/maps/virtual_reality/constructVR.dmm
+++ b/modular_chomp/maps/virtual_reality/constructVR.dmm
@@ -9050,7 +9050,6 @@
 	pixel_y = 20
 	},
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	pixel_x = -32
 	},
 /obj/item/handcuffs/legcuffs/fuzzy,
@@ -25975,7 +25974,6 @@
 /obj/structure/curtain/bed,
 /obj/item/bedsheet/hosdouble,
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	pixel_y = 32
 	},
 /turf/simulated/floor/wood,
@@ -29781,7 +29779,6 @@
 /obj/item/clothing/shoes/sandal,
 /obj/item/clothing/shoes/sandal,
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	pixel_x = -32
 	},
 /obj/item/towel/random,
diff --git a/modular_chomp/maps/~map_system/_map_selection.dm b/modular_chomp/maps/~map_system/_map_selection.dm
index bc9b7546f3..66dea1e8a8 100644
--- a/modular_chomp/maps/~map_system/_map_selection.dm
+++ b/modular_chomp/maps/~map_system/_map_selection.dm
@@ -1,4 +1,4 @@
-#ifndef CITESTING
+#if !defined(CITESTING) && !defined(SPACEMAN_DMM)
 
 /*********************/
 /* MAP SELECTION     */
diff --git a/tools/github-actions/nanomap-renderer-invoker.sh b/tools/github-actions/nanomap-renderer-invoker.sh
index 6f82e0bafd..2f000c8802 100755
--- a/tools/github-actions/nanomap-renderer-invoker.sh
+++ b/tools/github-actions/nanomap-renderer-invoker.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+
 BASEDIR=$PWD
 #Put directories to get maps from here. One per line.
 mapdirs=(
@@ -6,36 +7,98 @@ mapdirs=(
     "modular_chomp/maps/soluna_nexus"
     "modular_chomp/maps/relic_base"
 )
-#DO NOT TOUCH THIS VARIABLE. It will automatically fill with any maps in mapdirs that are form MAPNAME-n.dmm where n is the z level.
+#Put a define file to include. One per line matching mapdirs.
+#If the same define is reused it will be batched if in sequence.
+mapdefines=(
+	"modular_chomp/maps/southern_cross/southern_cross.dm"
+	"modular_chomp/maps/soluna_nexus/soluna_nexus.dm"
+	"modular_chomp/maps/relic_base/relicbase.dm"
+)
+dme="vorestation.dme"
+
+RED='\033[0;31m'
+GREEN="\033[0;32m"
+#This will automatically fill with any maps in mapdirs that are form MAPNAMEn.dmm.
 map_files=()
 
 #Fill up mapfiles list
-for mapdir in ${mapdirs[@]}; do
-    echo "Scanning $mapdir..."
-    FULLMAPDIR=$BASEDIR/$mapdir
-    map_files+=($FULLMAPDIR/*-*[0-9].dmm)
+for mapdir in "${mapdirs[@]}"; do
+	echo "Scanning $mapdir..."
+	#https://stackoverflow.com/a/23357277
+	while IFS= read -r -d $'\0'; do
+		map_files+=("$REPLY")
+	done < <(find "${BASEDIR}/${mapdir}" -maxdepth 1 -name '*[0-9]*.dmm' -print0)
 done
 
 #Print full map list
-echo "Full map list:"
-for map in ${map_files[@]}; do
-    echo $map
+echo "Full map list (${#map_files[@]}):"
+for map in "${map_files[@]}"; do
+	echo $map
+done
+printf "\n\n\n"
+
+#Duplicate stderr because dmm-tools doesn't return an error code for bad icons or bad path so we need to capture it
+exec 5>&2
+
+#Now render per group to initial images
+any_errors=0
+map_files=()
+index=0
+for mapdir in "${mapdirs[@]}"; do
+	#https://stackoverflow.com/a/23357277
+	while IFS= read -r -d $'\0'; do
+		map_files+=("$REPLY")
+	done < <(find "${BASEDIR}/${mapdir}" -maxdepth 1 -name '*[0-9]*.dmm' -print0)
+	cur_define=${mapdefines[index++]}
+
+	if [[ (index -lt ${#mapdefines[@]}) && ("${cur_define}" == "${mapdefines[$index]}") ]]; then
+		# Next iteration uses the same define so batch it
+		echo "Batching next iteration..."
+		continue
+	fi
+
+	#Insert the define file into the dme if needed
+	if [[ "${cur_define}" != "" ]]; then
+		echo "Injecting ${cur_define} into ${dme}..."
+		echo "#include \"${cur_define}\"" >> ${dme}
+	fi
+
+	#Render maps to initial images ignoring some tg specific icon_state handling
+	result=$(~/dmm-tools minimap "${map_files[@]}" --disable smart-cables,overlays,pretty,transit-tube 2>&1 | tee /dev/fd/5)
+
+	#Check if anything errored
+	if [[ ($? -ne 0) || ("${result}" =~ ("bad icon"|"bad path"|"error")) ]]; then
+		any_errors=1
+	fi
+
+	#Undo changes for next iteration
+	map_files=()
+	if [[ "${cur_define}" != "" ]]; then
+		sed -i '$ d' ${dme}
+	fi
+
+	printf "\n"
 done
 
-printf "\n\n\n"
-echo "Rendering maps..."
+#Close the new file descriptor
+exec 5>&-
 
-#Render maps to initial images
-~/dmm-tools minimap "${map_files[@]}"
+#Give results if we're just testing
+if [[ $1 == "--testing" ]]; then
+	if [[ any_errors -ne 0 ]]; then
+		echo -e "${RED}Errors occured during testing!"
+		exit 1
+	fi
+	echo -e "${GREEN}Maps were successfully rendered."
+	exit 0
+fi
 
+echo "Starting image resizing..."
 cd data/minimaps
 
-printf "\n\n\n"
-echo "Starting image resizing..."
-
-#Resize images to proper size and move them to the correct place
+#Resize images to proper size and copy them to the correct place
 for map in ./*.png; do
-    j=$(echo $map | sed -n "s/^\.\/\(.*\)-\([0-9]*\)\-1.png$/\1_nanomap_z\2.png/p")
-    echo "Resizing $map and moving to icons/_nanomaps/$j"
-    convert $map -resize 2240x2240 "$BASEDIR/icons/_nanomaps/$j"
+	j=$(echo $map | sed -nE "s/^\.\/([^-]*)(-[^1-9]*)?([1-9][0-9]*)(.*)-1\.png$/\1_nanomap_z\3.png/p")
+	echo "Resizing $map and copying to icons/_nanomaps/$j"
+	convert $map -resize 2240x2240 "$BASEDIR/icons/_nanomaps/$j"
 done