From 9d54dc132653b8ab4a066ad599670e7a8b1a229e Mon Sep 17 00:00:00 2001
From: Daeberdir <115735095+Daeberdir@users.noreply.github.com>
Date: Tue, 17 Sep 2024 19:12:42 +0300
Subject: [PATCH] experiment: Trash lines cleaning for map files. (#5899)

Done.
---
 _maps/map_files/Delta/delta.dmm               | 111 +--
 .../LavaRuins/lavaland_surface_golem_ship.dmm |   1 -
 .../lavaland_surface_syndicate_base1.dmm      | 114 +--
 .../RandomRuins/SpaceRuins/abandonedzoo.dmm   |  50 +-
 .../RandomRuins/SpaceRuins/debris1.dmm        |   1 -
 .../RandomRuins/SpaceRuins/deepstorage.dmm    |  33 +-
 .../RandomRuins/SpaceRuins/derelict2.dmm      |  11 -
 .../RandomRuins/SpaceRuins/gasthelizards.dmm  |   4 -
 .../RandomRuins/SpaceRuins/listeningpost.dmm  |   2 -
 .../RandomRuins/SpaceRuins/onehalf.dmm        |  23 +-
 .../RandomRuins/SpaceRuins/spaceprison.dmm    | 147 ++--
 .../SpaceRuins/syndiecakesfactory.dmm         |   2 -
 .../SpaceRuins/turretedoutpost.dmm            |   6 +-
 .../SpaceRuins/ussp_laboratory.dmm            |   9 +-
 .../RandomRuins/SpaceRuins/wizardcrash.dmm    |   6 +-
 _maps/map_files/RandomZLevels/academy.dmm     |  12 +-
 .../RandomZLevels/blackmarketpackers.dmm      |  46 +-
 _maps/map_files/RandomZLevels/centcomAway.dmm | 659 +++++-------------
 _maps/map_files/RandomZLevels/example.dmm     |  20 +-
 .../map_files/RandomZLevels/moonoutpost19.dmm |   1 -
 .../RandomZLevels/stationCollision.dmm        | 133 +---
 .../RandomZLevels/undergroundoutpost45.dmm    |   7 +-
 _maps/map_files/celestation/celestation.dmm   |  91 +--
 _maps/map_files/cerestation/cerestation.dmm   | 102 +--
 _maps/map_files/cyberiad/cyberiad.dmm         |  64 +-
 _maps/map_files/debug/multiz_test.dmm         |  57 +-
 _maps/map_files/event/Station/delta_old.dmm   | 112 +--
 .../map_files/event/Station/towerstation.dmm  |  75 +-
 _maps/map_files/generic/Admin_Zone.dmm        |  30 +-
 _maps/map_files/generic/syndicatebase.dmm     | 154 ++--
 _maps/map_files/generic/z2_old.dmm            |   8 +-
 _maps/map_files/shuttles/emergency_bar.dmm    |   1 -
 _maps/map_files/shuttles/emergency_clown.dmm  |   2 -
 _maps/map_files/shuttles/emergency_cyb.dmm    |   2 -
 _maps/map_files/shuttles/emergency_dept.dmm   |   3 -
 _maps/map_files/shuttles/emergency_meta.dmm   |   1 -
 _maps/map_files/shuttles/emergency_narnar.dmm |  21 +-
 _maps/map_files/shuttles/emergency_old.dmm    |   2 -
 _maps/map_files/shuttles/ferry_cargo.dmm      |   4 +-
 .../shuttles/ferry_deepdarkdungeon.dmm        |   2 +-
 _maps/map_files/templates/shelter_1.dmm       |   5 +-
 _maps/map_files/templates/shelter_2.dmm       |   5 +-
 _maps/map_files/templates/shelter_3.dmm       |   8 +-
 _maps/map_files/templates/small_shuttle_1.dmm |   4 +-
 _maps/map_files/templates/spacehotel/n_01.dmm |   1 -
 _maps/map_files/templates/spacehotel/n_02.dmm |   1 -
 _maps/map_files/templates/spacehotel/n_03.dmm |   1 -
 _maps/map_files/templates/spacehotel/n_04.dmm |   1 -
 _maps/map_files/templates/spacehotel/n_05.dmm |   1 -
 _maps/map_files/templates/spacehotel/n_06.dmm |   1 -
 _maps/map_files/templates/spacehotel/n_07.dmm |   1 -
 _maps/map_files/templates/spacehotel/n_08.dmm |   1 -
 _maps/map_files/templates/spacehotel/n_09.dmm |   1 -
 _maps/map_files/templates/spacehotel/n_11.dmm |   1 -
 _maps/map_files/templates/spacehotel/n_12.dmm |   1 -
 _maps/map_files/templates/spacehotel/n_13.dmm |   1 -
 _maps/map_files/templates/spacehotel/n_14.dmm |   1 -
 _maps/map_files/templates/spacehotel/n_15.dmm |   3 +-
 _maps/map_files/templates/spacehotel/n_17.dmm |   1 -
 _maps/map_files/templates/spacehotel/n_18.dmm |   1 -
 _maps/map_files/templates/spacehotel/s_04.dmm |   2 -
 _maps/map_files/templates/spacehotel/s_05.dmm |   2 -
 _maps/map_files/templates/spacehotel/s_06.dmm |   2 -
 63 files changed, 475 insertions(+), 1700 deletions(-)

diff --git a/_maps/map_files/Delta/delta.dmm b/_maps/map_files/Delta/delta.dmm
index 1d07f9c4464..cc8fe57a405 100644
--- a/_maps/map_files/Delta/delta.dmm
+++ b/_maps/map_files/Delta/delta.dmm
@@ -234,10 +234,7 @@
 /area/crew_quarters/fitness)
 "aaA" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/mob/living/carbon/human/lesser/monkey{
-	icon = 'icons/mob/monkey.dmi';
-	icon_state = "monkey1"
-	},
+/mob/living/carbon/human/lesser/monkey,
 /turf/simulated/floor/engine,
 /area/toxins/test_chamber)
 "aaB" = (
@@ -283,10 +280,7 @@
 /obj/structure/cable{
 	icon_state = "2-4"
 	},
-/mob/living/carbon/human/lesser/monkey{
-	icon = 'icons/mob/monkey.dmi';
-	icon_state = "monkey1"
-	},
+/mob/living/carbon/human/lesser/monkey,
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
 	},
@@ -299,10 +293,7 @@
 	pixel_y = -26
 	},
 /obj/structure/cable,
-/mob/living/carbon/human/lesser/monkey{
-	icon = 'icons/mob/monkey.dmi';
-	icon_state = "monkey1"
-	},
+/mob/living/carbon/human/lesser/monkey,
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
 	},
@@ -10128,9 +10119,7 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/obj/structure/plasticflaps{
-	opacity = 1
-	},
+/obj/structure/plasticflaps,
 /obj/effect/decal/warning_stripes/yellow,
 /turf/simulated/floor/plasteel,
 /area/atmos/control)
@@ -12896,9 +12885,7 @@
 /area/security/prisonershuttle)
 "bEw" = (
 /obj/effect/decal/warning_stripes/yellow,
-/obj/structure/plasticflaps{
-	opacity = 1
-	},
+/obj/structure/plasticflaps,
 /obj/machinery/navbeacon{
 	codes_txt = "delivery;dir=4";
 	dir = 4;
@@ -15735,9 +15722,7 @@
 	},
 /area/crew_quarters/bar)
 "bSw" = (
-/obj/structure/plasticflaps{
-	opacity = 1
-	},
+/obj/structure/plasticflaps,
 /turf/simulated/floor/plating,
 /area/hydroponics)
 "bSA" = (
@@ -20813,9 +20798,7 @@
 /turf/simulated/floor/carpet,
 /area/crew_quarters/serviceyard)
 "crJ" = (
-/obj/structure/plasticflaps{
-	opacity = 1
-	},
+/obj/structure/plasticflaps,
 /obj/effect/decal/warning_stripes/yellow/hollow,
 /obj/machinery/navbeacon{
 	codes_txt = "delivery;dir=4";
@@ -22216,7 +22199,6 @@
 /area/gateway)
 "cyt" = (
 /mob/living/carbon/human/lesser/monkey/punpun{
-	icon = 'icons/mob/monkey.dmi';
 	icon_state = "punpun1"
 	},
 /turf/simulated/floor/plasteel{
@@ -26497,9 +26479,7 @@
 /area/toxins/test_chamber)
 "cQB" = (
 /obj/effect/decal/warning_stripes/yellow,
-/obj/structure/plasticflaps{
-	opacity = 1
-	},
+/obj/structure/plasticflaps,
 /obj/machinery/navbeacon{
 	codes_txt = "delivery;dir=2";
 	location = "Mime"
@@ -28277,9 +28257,7 @@
 /area/crew_quarters/chief)
 "cXT" = (
 /obj/effect/decal/warning_stripes/yellow,
-/obj/structure/plasticflaps{
-	opacity = 1
-	},
+/obj/structure/plasticflaps,
 /obj/machinery/navbeacon{
 	codes_txt = "delivery;dir=2";
 	location = "Clown"
@@ -34358,9 +34336,7 @@
 	codes_txt = "delivery";
 	location = "Chemistry"
 	},
-/obj/structure/plasticflaps{
-	opacity = 1
-	},
+/obj/structure/plasticflaps,
 /turf/simulated/floor/plasteel{
 	icon_state = "neutralfull"
 	},
@@ -45414,9 +45390,7 @@
 	dir = 4
 	},
 /obj/effect/decal/cleanable/dirt,
-/obj/machinery/door/firedoor/closed{
-	opacity = 0
-	},
+/obj/machinery/door/firedoor/closed,
 /turf/simulated/floor/plasteel{
 	dir = 4;
 	icon_state = "neutralcorner"
@@ -53382,9 +53356,7 @@
 /area/hallway/secondary/exit)
 "gVN" = (
 /obj/effect/decal/warning_stripes/yellow,
-/obj/structure/plasticflaps{
-	opacity = 1
-	},
+/obj/structure/plasticflaps,
 /obj/machinery/navbeacon{
 	codes_txt = "delivery;dir=1";
 	dir = 1;
@@ -64410,9 +64382,7 @@
 /area/toxins/test_area)
 "jIl" = (
 /obj/effect/decal/warning_stripes/yellow,
-/obj/structure/plasticflaps{
-	opacity = 1
-	},
+/obj/structure/plasticflaps,
 /obj/machinery/navbeacon{
 	codes_txt = "delivery;dir=2";
 	location = "Chapel"
@@ -68353,9 +68323,7 @@
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
-/obj/structure/plasticflaps{
-	opacity = 1
-	},
+/obj/structure/plasticflaps,
 /obj/effect/decal/warning_stripes/yellow,
 /turf/simulated/floor/plasteel,
 /area/storage/primary)
@@ -68515,9 +68483,7 @@
 	},
 /area/hallway/primary/fore)
 "kMb" = (
-/obj/structure/plasticflaps{
-	opacity = 1
-	},
+/obj/structure/plasticflaps,
 /obj/effect/decal/warning_stripes/yellow,
 /obj/machinery/navbeacon{
 	codes_txt = "delivery";
@@ -68857,9 +68823,7 @@
 /area/medical/cmo)
 "kQH" = (
 /obj/effect/decal/warning_stripes/yellow,
-/obj/structure/plasticflaps{
-	opacity = 1
-	},
+/obj/structure/plasticflaps,
 /obj/machinery/navbeacon{
 	codes_txt = "delivery;dir=2";
 	location = "Bar"
@@ -76247,9 +76211,7 @@
 "mHa" = (
 /obj/effect/decal/warning_stripes/north,
 /obj/effect/decal/cleanable/dirt,
-/obj/machinery/door/firedoor/closed{
-	opacity = 0
-	},
+/obj/machinery/door/firedoor/closed,
 /turf/simulated/floor/plating,
 /area/maintenance/consarea_virology)
 "mHd" = (
@@ -83062,9 +83024,7 @@
 /area/security/checkpoint/south)
 "olI" = (
 /obj/effect/decal/warning_stripes/yellow,
-/obj/structure/plasticflaps{
-	opacity = 1
-	},
+/obj/structure/plasticflaps,
 /obj/machinery/navbeacon{
 	codes_txt = "delivery";
 	dir = 1;
@@ -86400,10 +86360,7 @@
 "pbv" = (
 /obj/effect/decal/warning_stripes/west,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/mob/living/carbon/human/lesser/monkey{
-	icon = 'icons/mob/monkey.dmi';
-	icon_state = "monkey1"
-	},
+/mob/living/carbon/human/lesser/monkey,
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
 	},
@@ -88837,9 +88794,7 @@
 	},
 /area/hallway/primary/central/south)
 "pCQ" = (
-/obj/machinery/door/firedoor/closed{
-	opacity = 0
-	},
+/obj/machinery/door/firedoor/closed,
 /turf/simulated/floor/plating,
 /area/maintenance/asmaint4)
 "pCW" = (
@@ -102700,9 +102655,7 @@
 	dir = 4
 	},
 /obj/effect/decal/cleanable/dirt,
-/obj/machinery/door/firedoor/closed{
-	opacity = 0
-	},
+/obj/machinery/door/firedoor/closed,
 /turf/simulated/floor/plating,
 /area/maintenance/asmaint4)
 "sNY" = (
@@ -104476,10 +104429,7 @@
 "tjA" = (
 /obj/effect/decal/warning_stripes/east,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/mob/living/carbon/human/lesser/monkey{
-	icon = 'icons/mob/monkey.dmi';
-	icon_state = "monkey1"
-	},
+/mob/living/carbon/human/lesser/monkey,
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
 	},
@@ -113467,10 +113417,7 @@
 /area/assembly/chargebay)
 "vom" = (
 /obj/machinery/light,
-/mob/living/carbon/human/lesser/monkey{
-	icon = 'icons/mob/monkey.dmi';
-	icon_state = "monkey1"
-	},
+/mob/living/carbon/human/lesser/monkey,
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
 	},
@@ -119512,9 +119459,7 @@
 "wJM" = (
 /obj/structure/grille/broken,
 /obj/effect/decal/cleanable/dirt,
-/obj/machinery/door/firedoor/closed{
-	opacity = 0
-	},
+/obj/machinery/door/firedoor/closed,
 /turf/simulated/floor/plating,
 /area/maintenance/asmaint4)
 "wJR" = (
@@ -123100,9 +123045,7 @@
 /area/maintenance/asmaint2)
 "xzw" = (
 /obj/effect/decal/warning_stripes/yellow,
-/obj/structure/plasticflaps{
-	opacity = 1
-	},
+/obj/structure/plasticflaps,
 /obj/machinery/navbeacon{
 	codes_txt = "delivery;dir=4";
 	dir = 4;
@@ -124895,9 +124838,7 @@
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
-/obj/machinery/door/firedoor/closed{
-	opacity = 0
-	},
+/obj/machinery/door/firedoor/closed,
 /turf/simulated/floor/plating,
 /area/maintenance/consarea_virology)
 "xSf" = (
diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_golem_ship.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_golem_ship.dmm
index 82362568ad9..568844c53bd 100644
--- a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_golem_ship.dmm
+++ b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_golem_ship.dmm
@@ -476,7 +476,6 @@
 "zc" = (
 /obj/structure/sign/mining/survival{
 	dir = 1;
-	icon_state = "survival";
 	tag = "icon-survival (NORTH)"
 	},
 /turf/simulated/wall/mineral/titanium/survival/pod,
diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm
index 7de120f4a9a..0ae9184923c 100644
--- a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm
+++ b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm
@@ -22,7 +22,6 @@
 	},
 /obj/machinery/access_button{
 	command = "cycle_interior";
-	frequency = 1449;
 	master_tag = "syndicate_base_virology";
 	name = "interior access button";
 	pixel_x = 25;
@@ -241,7 +240,6 @@
 /obj/item/flashlight/seclite,
 /obj/item/clothing/mask/gas,
 /obj/structure/sign/vacuum{
-	pixel_x = 0;
 	pixel_y = 32
 	},
 /turf/simulated/floor/plating,
@@ -273,7 +271,6 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/access_button{
 	command = "cycle_interior";
-	frequency = 1449;
 	master_tag = "syndicate_base_west_south";
 	name = "interior access button";
 	pixel_x = 25;
@@ -395,7 +392,6 @@
 	},
 /obj/machinery/access_button{
 	command = "cycle_exterior";
-	frequency = 1449;
 	master_tag = "syndicate_base_virology";
 	name = "exterior access button";
 	pixel_x = -25;
@@ -434,7 +430,6 @@
 	},
 /obj/machinery/access_button{
 	command = "cycle_interior";
-	frequency = 1449;
 	master_tag = "syndicate_base_south";
 	name = "interior access button";
 	pixel_x = 25;
@@ -487,7 +482,6 @@
 "aS" = (
 /obj/machinery/access_button{
 	command = "cycle_exterior";
-	frequency = 1449;
 	master_tag = "syndicate_base_south";
 	name = "exterior access button";
 	pixel_x = 20;
@@ -506,7 +500,6 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/access_button{
 	command = "cycle_interior";
-	frequency = 1449;
 	master_tag = "syndicate_base_west_north";
 	name = "interior access button";
 	pixel_x = 25;
@@ -540,7 +533,6 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/sign/vacuum{
-	pixel_x = 0;
 	pixel_y = -32
 	},
 /turf/simulated/floor/plating,
@@ -620,7 +612,6 @@
 /obj/effect/mapping_helpers/no_lava,
 /obj/machinery/access_button{
 	command = "cycle_exterior";
-	frequency = 1449;
 	master_tag = "syndicate_base_west_north";
 	name = "exterior access button";
 	pixel_x = -21;
@@ -667,7 +658,6 @@
 	icon_state = "4-8"
 	},
 /obj/structure/cable/yellow{
-	d1 = 0;
 	d2 = 8;
 	icon_state = "0-8"
 	},
@@ -689,11 +679,9 @@
 	},
 /obj/machinery/access_button{
 	command = "cycle_interior";
-	frequency = 1449;
 	master_tag = "syndicate_base_incinerator";
 	name = "interior access button";
 	pixel_x = -25;
-	pixel_y = 0;
 	req_access = list(150)
 	},
 /turf/simulated/floor/engine/insulated,
@@ -731,11 +719,9 @@
 	},
 /obj/machinery/access_button{
 	command = "cycle_exterior";
-	frequency = 1449;
 	master_tag = "syndicate_base_incinerator";
 	name = "exterior access button";
 	pixel_x = -25;
-	pixel_y = 0;
 	req_access = list(150)
 	},
 /turf/simulated/floor/engine/insulated,
@@ -775,7 +761,6 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/access_button{
 	command = "cycle_interior";
-	frequency = 1449;
 	master_tag = "syndicate_base_east";
 	name = "interior access button";
 	pixel_x = 25;
@@ -802,7 +787,6 @@
 /obj/machinery/embedded_controller/radio/airlock/access_controller{
 	frequency = 1449;
 	id_tag = "syndicate_base_east";
-	pixel_x = 0;
 	pixel_y = 25;
 	req_access = list(150);
 	tag_exterior_door = "syndicate_base_east_exterior";
@@ -823,7 +807,6 @@
 "bq" = (
 /obj/machinery/access_button{
 	command = "cycle_exterior";
-	frequency = 1449;
 	master_tag = "syndicate_base_east";
 	name = "exterior access button";
 	pixel_x = -21;
@@ -872,7 +855,6 @@
 /obj/effect/mapping_helpers/no_lava,
 /obj/machinery/access_button{
 	command = "cycle_exterior";
-	frequency = 1449;
 	master_tag = "syndicate_base_west_south";
 	name = "exterior access button";
 	pixel_x = -21;
@@ -909,7 +891,6 @@
 	},
 /obj/machinery/turretid/lethal{
 	ailock = 1;
-	check_synth = 0;
 	control_area = "Syndicate Lavaland Primary Hallway";
 	dir = 1;
 	faction = "syndicate";
@@ -929,8 +910,7 @@
 "bz" = (
 /obj/machinery/atmospherics/pipe/simple/visible/cyan{
 	dir = 6;
-	initialize_directions = 6;
-	level = 2
+	initialize_directions = 6
 	},
 /turf/simulated/floor/plasteel,
 /area/ruin/unpowered/syndicate_lava_base/engineering)
@@ -943,8 +923,7 @@
 	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/visible/cyan{
-	dir = 4;
-	level = 2
+	dir = 4
 	},
 /turf/simulated/floor/plasteel,
 /area/ruin/unpowered/syndicate_lava_base/engineering)
@@ -952,8 +931,7 @@
 /obj/structure/grille,
 /obj/structure/window/plastitanium,
 /obj/machinery/atmospherics/pipe/simple/visible/cyan{
-	dir = 4;
-	level = 2
+	dir = 4
 	},
 /turf/simulated/floor/plating,
 /area/ruin/unpowered/syndicate_lava_base/engineering)
@@ -1010,16 +988,14 @@
 	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/visible/cyan{
-	dir = 4;
-	level = 2
+	dir = 4
 	},
 /turf/simulated/floor/plasteel,
 /area/ruin/unpowered/syndicate_lava_base/engineering)
 "bL" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/manifold/visible/yellow{
-	dir = 8;
-	level = 2
+	dir = 8
 	},
 /turf/simulated/floor/plasteel,
 /area/ruin/unpowered/syndicate_lava_base/engineering)
@@ -1039,8 +1015,7 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/visible/yellow{
-	dir = 10;
-	level = 2
+	dir = 10
 	},
 /obj/structure/reagent_dispensers/fueltank,
 /obj/item/clothing/head/welding,
@@ -1166,8 +1141,7 @@
 "ca" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/visible/yellow{
-	dir = 6;
-	level = 2
+	dir = 6
 	},
 /obj/effect/baseturf_helper/lava_land/surface,
 /turf/simulated/floor/plasteel,
@@ -1314,7 +1288,6 @@
 "ct" = (
 /obj/structure/cable,
 /obj/machinery/power/turbine{
-	dir = 2;
 	luminosity = 2
 	},
 /turf/simulated/floor/engine/insulated,
@@ -1414,7 +1387,6 @@
 	pixel_x = -24
 	},
 /obj/structure/cable/yellow{
-	d1 = 0;
 	d2 = 2;
 	icon_state = "0-2"
 	},
@@ -1726,7 +1698,6 @@
 	dir = 1
 	},
 /obj/structure/cable/yellow{
-	d1 = 0;
 	d2 = 2;
 	icon_state = "0-2"
 	},
@@ -2401,7 +2372,6 @@
 	pixel_y = 24
 	},
 /obj/structure/cable/yellow{
-	d1 = 0;
 	d2 = 2;
 	icon_state = "0-2"
 	},
@@ -2430,7 +2400,6 @@
 /area/ruin/unpowered/syndicate_lava_base/virology)
 "fk" = (
 /obj/machinery/power/apc/syndicate{
-	dir = 2;
 	name = "Experimentation Lab APC";
 	pixel_y = -24
 	},
@@ -2499,15 +2468,10 @@
 /obj/machinery/door/firedoor,
 /obj/structure/table/reinforced,
 /obj/machinery/door/window/southleft{
-	base_state = "left";
-	dir = 2;
-	icon_state = "left";
 	name = "Chemistry"
 	},
 /obj/machinery/door/window/southleft{
-	base_state = "left";
 	dir = 1;
-	icon_state = "left";
 	name = "Chemistry";
 	req_access = list(150)
 	},
@@ -2855,9 +2819,7 @@
 /area/ruin/unpowered/syndicate_lava_base/virology)
 "gs" = (
 /obj/machinery/atmospherics/pipe/manifold/hidden/supply,
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
-	dir = 2
-	},
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
 /obj/machinery/light/small,
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/plasteel/white,
@@ -2983,9 +2945,7 @@
 	icon_state = "4-8"
 	},
 /obj/machinery/atmospherics/pipe/manifold/hidden/supply,
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
-	dir = 2
-	},
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
 /obj/structure/cable/yellow{
 	d1 = 1;
 	d2 = 8;
@@ -3554,7 +3514,6 @@
 /area/ruin/unpowered/syndicate_lava_base/main)
 "ib" = (
 /obj/effect/mob_spawn/human/lavaland_syndicate{
-	icon_state = "sleeper_s";
 	dir = 4
 	},
 /turf/simulated/floor/plasteel/grimy,
@@ -3594,8 +3553,7 @@
 /area/ruin/unpowered/syndicate_lava_base/dormitories)
 "ie" = (
 /obj/effect/mob_spawn/human/lavaland_syndicate/comms{
-	dir = 8;
-	icon_state = "sleeper_s"
+	dir = 8
 	},
 /turf/simulated/floor/plasteel/grimy,
 /area/ruin/unpowered/syndicate_lava_base/dormitories)
@@ -3829,7 +3787,6 @@
 	dir = 1
 	},
 /obj/machinery/firealarm/syndicate{
-	dir = 2;
 	pixel_y = 24
 	},
 /obj/machinery/atmospherics/unary/vent_scrubber/on,
@@ -4011,9 +3968,7 @@
 "iT" = (
 /obj/machinery/light/small,
 /obj/machinery/atmospherics/pipe/manifold/hidden/supply,
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
-	dir = 2
-	},
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
 /obj/structure/cable/yellow{
 	d1 = 4;
 	d2 = 8;
@@ -4052,12 +4007,10 @@
 	dir = 4
 	},
 /obj/machinery/power/apc/syndicate{
-	dir = 2;
 	name = "Dormitories APC";
 	pixel_y = -24
 	},
 /obj/structure/cable/yellow{
-	d1 = 0;
 	d2 = 8;
 	icon_state = "0-8"
 	},
@@ -4219,7 +4172,6 @@
 /area/ruin/unpowered/syndicate_lava_base/dormitories)
 "ji" = (
 /obj/structure/cable/yellow{
-	d1 = 0;
 	d2 = 2;
 	icon_state = "0-2"
 	},
@@ -4271,7 +4223,6 @@
 /area/ruin/unpowered/syndicate_lava_base/main)
 "jn" = (
 /obj/effect/mob_spawn/human/lavaland_syndicate{
-	icon_state = "sleeper_s";
 	dir = 4
 	},
 /obj/machinery/alarm/syndicate{
@@ -4299,8 +4250,7 @@
 /area/ruin/unpowered/syndicate_lava_base/main)
 "jq" = (
 /obj/effect/mob_spawn/human/lavaland_syndicate{
-	dir = 8;
-	icon_state = "sleeper_s"
+	dir = 8
 	},
 /obj/machinery/alarm/syndicate{
 	pixel_y = 24
@@ -4714,9 +4664,7 @@
 /area/ruin/unpowered/syndicate_lava_base/main)
 "kd" = (
 /obj/machinery/atmospherics/pipe/manifold/hidden/supply,
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
-	dir = 2
-	},
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
 /obj/structure/cable/yellow{
 	d1 = 1;
 	d2 = 4;
@@ -4803,9 +4751,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 9
 	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
-	dir = 2
-	},
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
 /turf/simulated/floor/plasteel,
 /area/ruin/unpowered/syndicate_lava_base/main)
 "kj" = (
@@ -4839,7 +4785,6 @@
 /area/ruin/unpowered/syndicate_lava_base/engineering)
 "km" = (
 /obj/structure/cable/yellow{
-	d1 = 0;
 	d2 = 2;
 	icon_state = "0-2"
 	},
@@ -5734,7 +5679,6 @@
 /obj/machinery/light/small,
 /obj/structure/cable/yellow,
 /obj/machinery/power/apc/syndicate{
-	dir = 2;
 	name = "Bar APC";
 	pixel_y = -24
 	},
@@ -6153,9 +6097,7 @@
 /area/ruin/unpowered/syndicate_lava_base/arrivals)
 "nw" = (
 /obj/machinery/atmospherics/pipe/manifold/hidden/supply,
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
-	dir = 2
-	},
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
 /obj/structure/cable/yellow{
 	d1 = 1;
 	d2 = 4;
@@ -6402,7 +6344,6 @@
 	dir = 4
 	},
 /obj/machinery/firealarm/syndicate{
-	dir = 2;
 	pixel_y = 24
 	},
 /obj/structure/cable/yellow{
@@ -6542,7 +6483,6 @@
 	},
 /obj/structure/cable/yellow,
 /obj/machinery/power/apc/syndicate{
-	dir = 2;
 	name = "Telecommunications APC";
 	pixel_y = -24
 	},
@@ -6651,36 +6591,18 @@
 /obj/structure/sign/chemistry,
 /turf/simulated/wall/mineral/plastitanium/nodiagonal,
 /area/ruin/unpowered/syndicate_lava_base/testlab)
-"oT" = (
-/obj/machinery/porta_turret/syndicate{
-	dir = 5
-	},
-/turf/simulated/wall/mineral/plastitanium/nodiagonal,
-/area/ruin/unpowered/syndicate_lava_base/cargo)
 "pQ" = (
 /obj/structure/sign/explosives/alt{
 	pixel_x = 32
 	},
 /turf/simulated/floor/redgrid,
 /area/ruin/unpowered/syndicate_lava_base/main)
-"qE" = (
-/obj/machinery/porta_turret/syndicate{
-	dir = 6
-	},
-/turf/simulated/wall/mineral/plastitanium/nodiagonal,
-/area/ruin/unpowered/syndicate_lava_base/engineering)
 "qG" = (
 /obj/structure/sign/explosives/alt{
 	pixel_x = -32
 	},
 /turf/simulated/floor/engine,
 /area/ruin/unpowered/syndicate_lava_base/testlab)
-"tN" = (
-/obj/machinery/porta_turret/syndicate{
-	dir = 6
-	},
-/turf/simulated/wall/mineral/plastitanium/nodiagonal,
-/area/ruin/unpowered/syndicate_lava_base/telecomms)
 "vu" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -6792,12 +6714,6 @@
 	},
 /turf/simulated/floor/engine,
 /area/ruin/unpowered/syndicate_lava_base/testlab)
-"Zs" = (
-/obj/machinery/porta_turret/syndicate{
-	dir = 9
-	},
-/turf/simulated/wall/mineral/plastitanium/nodiagonal,
-/area/ruin/unpowered/syndicate_lava_base/virology)
 
 (1,1,1) = {"
 aa
diff --git a/_maps/map_files/RandomRuins/SpaceRuins/abandonedzoo.dmm b/_maps/map_files/RandomRuins/SpaceRuins/abandonedzoo.dmm
index 6c5a465d46a..542bcc408fa 100644
--- a/_maps/map_files/RandomRuins/SpaceRuins/abandonedzoo.dmm
+++ b/_maps/map_files/RandomRuins/SpaceRuins/abandonedzoo.dmm
@@ -11,8 +11,7 @@
 	},
 /obj/item/storage/box/beakers,
 /obj/machinery/light{
-	dir = 4;
-	icon_state = "tube1"
+	dir = 4
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
@@ -88,8 +87,7 @@
 /obj/structure/grille,
 /obj/structure/window/full/reinforced,
 /obj/structure/cable{
-	icon_state = "4-8";
-	pixel_y = 0
+	icon_state = "4-8"
 	},
 /obj/structure/cable{
 	icon_state = "0-8"
@@ -151,8 +149,7 @@
 /area/ruin/unpowered)
 "kQ" = (
 /obj/structure/cable{
-	icon_state = "4-8";
-	pixel_y = 0
+	icon_state = "4-8"
 	},
 /obj/machinery/door/airlock/highsecurity{
 	name = "Bio Containment";
@@ -266,8 +263,7 @@
 /area/ruin/unpowered)
 "qD" = (
 /obj/structure/cable{
-	icon_state = "4-8";
-	pixel_y = 0
+	icon_state = "4-8"
 	},
 /obj/structure/disposalpipe/segment{
 	dir = 10
@@ -298,7 +294,6 @@
 "rC" = (
 /obj/machinery/space_heater,
 /obj/machinery/light{
-	icon_state = "tube1";
 	dir = 8
 	},
 /turf/simulated/floor/plasteel{
@@ -307,8 +302,7 @@
 /area/ruin/unpowered)
 "rZ" = (
 /obj/structure/cable{
-	icon_state = "4-8";
-	pixel_y = 0
+	icon_state = "4-8"
 	},
 /obj/machinery/door/airlock/highsecurity{
 	name = "Bio Containment";
@@ -368,8 +362,7 @@
 /area/ruin/unpowered)
 "vl" = (
 /obj/structure/cable{
-	icon_state = "4-8";
-	pixel_y = 0
+	icon_state = "4-8"
 	},
 /obj/machinery/door/airlock/highsecurity{
 	name = "Bio Containment";
@@ -388,8 +381,7 @@
 "vS" = (
 /obj/machinery/power/apc/worn_out{
 	dir = 8;
-	pixel_x = -24;
-	pixel_y = 0
+	pixel_x = -24
 	},
 /obj/structure/rack,
 /obj/item/melee/baton/security/cattleprod,
@@ -405,8 +397,7 @@
 /obj/structure/grille,
 /obj/structure/window/full/reinforced,
 /obj/structure/cable{
-	icon_state = "4-8";
-	pixel_y = 0
+	icon_state = "4-8"
 	},
 /obj/structure/cable{
 	icon_state = "0-8"
@@ -435,8 +426,7 @@
 /area/ruin/unpowered)
 "wK" = (
 /obj/structure/cable{
-	icon_state = "4-8";
-	pixel_y = 0
+	icon_state = "4-8"
 	},
 /obj/structure/cable{
 	icon_state = "1-4"
@@ -548,8 +538,7 @@
 /obj/structure/grille,
 /obj/structure/window/full/reinforced,
 /obj/structure/cable{
-	icon_state = "4-8";
-	pixel_y = 0
+	icon_state = "4-8"
 	},
 /obj/structure/cable{
 	icon_state = "0-4"
@@ -607,8 +596,7 @@
 /obj/structure/grille,
 /obj/structure/window/full/reinforced,
 /obj/structure/cable{
-	icon_state = "4-8";
-	pixel_y = 0
+	icon_state = "4-8"
 	},
 /turf/simulated/floor/plating/airless,
 /area/ruin/unpowered)
@@ -668,7 +656,6 @@
 /obj/item/clothing/mask/surgical,
 /obj/item/razor,
 /obj/machinery/light{
-	icon_state = "tube1";
 	dir = 8
 	},
 /turf/simulated/floor/plasteel{
@@ -713,8 +700,7 @@
 /area/ruin/unpowered)
 "LT" = (
 /obj/structure/cable{
-	icon_state = "4-8";
-	pixel_y = 0
+	icon_state = "4-8"
 	},
 /turf/simulated/floor/plasteel,
 /area/ruin/unpowered)
@@ -841,8 +827,7 @@
 /area/ruin/unpowered)
 "Tf" = (
 /obj/structure/cable{
-	icon_state = "4-8";
-	pixel_y = 0
+	icon_state = "4-8"
 	},
 /obj/machinery/door/airlock/highsecurity{
 	name = "Bio Containment";
@@ -872,8 +857,7 @@
 	name = "Bio-Research Station"
 	},
 /obj/structure/cable{
-	icon_state = "4-8";
-	pixel_y = 0
+	icon_state = "4-8"
 	},
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -918,8 +902,7 @@
 /area/ruin/unpowered)
 "VI" = (
 /obj/structure/cable{
-	icon_state = "4-8";
-	pixel_y = 0
+	icon_state = "4-8"
 	},
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -953,8 +936,7 @@
 	name = "Bio-Research Station"
 	},
 /obj/structure/cable{
-	icon_state = "4-8";
-	pixel_y = 0
+	icon_state = "4-8"
 	},
 /turf/simulated/floor/plasteel,
 /area/ruin/unpowered)
diff --git a/_maps/map_files/RandomRuins/SpaceRuins/debris1.dmm b/_maps/map_files/RandomRuins/SpaceRuins/debris1.dmm
index 0be2f9595ce..3ca74d259a4 100644
--- a/_maps/map_files/RandomRuins/SpaceRuins/debris1.dmm
+++ b/_maps/map_files/RandomRuins/SpaceRuins/debris1.dmm
@@ -99,7 +99,6 @@
 "D" = (
 /obj/structure/cable{
 	icon_state = "4-8";
-	pixel_y = 0;
 	tag = ""
 	},
 /turf/simulated/floor/plating/burnt,
diff --git a/_maps/map_files/RandomRuins/SpaceRuins/deepstorage.dmm b/_maps/map_files/RandomRuins/SpaceRuins/deepstorage.dmm
index 5bc3ff74b30..3d21eb96736 100644
--- a/_maps/map_files/RandomRuins/SpaceRuins/deepstorage.dmm
+++ b/_maps/map_files/RandomRuins/SpaceRuins/deepstorage.dmm
@@ -113,8 +113,7 @@
 "aj" = (
 /obj/structure/closet/cardboard,
 /obj/machinery/light{
-	dir = 8;
-	icon_state = "tube1"
+	dir = 8
 	},
 /obj/item/flashlight/flare,
 /obj/item/flashlight/flare,
@@ -173,8 +172,7 @@
 "ao" = (
 /obj/structure/closet/cardboard,
 /obj/machinery/light{
-	dir = 4;
-	icon_state = "tube1"
+	dir = 4
 	},
 /obj/item/ammo_box/c9mm,
 /obj/item/ammo_box/c9mm,
@@ -234,9 +232,7 @@
 	},
 /obj/structure/sink{
 	dir = 4;
-	icon_state = "sink";
-	pixel_x = 11;
-	pixel_y = 0
+	pixel_x = 11
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "freezerfloor"
@@ -256,8 +252,7 @@
 	pixel_y = 6
 	},
 /obj/item/gun/projectile/automatic/wt550{
-	pixel_x = 2;
-	pixel_y = 0
+	pixel_x = 2
 	},
 /obj/structure/reagent_dispensers/peppertank{
 	pixel_y = 30
@@ -391,8 +386,7 @@
 "aO" = (
 /obj/structure/closet/radiation,
 /obj/machinery/light{
-	dir = 8;
-	icon_state = "tube1"
+	dir = 8
 	},
 /turf/simulated/floor/plasteel,
 /area/ruin/unpowered)
@@ -404,8 +398,7 @@
 /obj/item/reagent_containers/food/drinks/cans/cola,
 /obj/item/reagent_containers/food/drinks/cans/cola,
 /obj/machinery/light{
-	dir = 4;
-	icon_state = "tube1"
+	dir = 4
 	},
 /turf/simulated/floor/plasteel,
 /area/ruin/unpowered)
@@ -525,8 +518,7 @@
 /area/ruin/unpowered)
 "bg" = (
 /obj/machinery/sleeper{
-	dir = 4;
-	icon_state = "sleeper-open"
+	dir = 4
 	},
 /obj/machinery/light/small{
 	dir = 8
@@ -548,8 +540,7 @@
 /area/ruin/unpowered)
 "bj" = (
 /obj/machinery/sleeper{
-	dir = 4;
-	icon_state = "sleeper-open"
+	dir = 4
 	},
 /turf/simulated/floor/plasteel,
 /area/ruin/unpowered)
@@ -626,8 +617,7 @@
 /area/ruin/unpowered)
 "by" = (
 /obj/machinery/power/terminal{
-	dir = 1;
-	icon_state = "term"
+	dir = 1
 	},
 /obj/structure/cable{
 	icon_state = "0-4"
@@ -681,8 +671,7 @@
 	dir = 8;
 	keep_preset_name = 1;
 	name = "Bunker APC";
-	pixel_x = -24;
-	pixel_y = 0
+	pixel_x = -24
 	},
 /obj/structure/cable{
 	icon_state = "0-4"
@@ -737,7 +726,6 @@
 "bP" = (
 /obj/structure/chair/office/dark{
 	dir = 4;
-	icon_state = "officechair_dark";
 	tag = "icon-officechair_dark (EAST)"
 	},
 /turf/simulated/floor/plasteel,
@@ -784,7 +772,6 @@
 	dir = 1;
 	name = "Bunker Entrance";
 	network = list("Bunker1");
-	pixel_x = 0;
 	pixel_y = 2
 	},
 /turf/simulated/floor/plasteel,
diff --git a/_maps/map_files/RandomRuins/SpaceRuins/derelict2.dmm b/_maps/map_files/RandomRuins/SpaceRuins/derelict2.dmm
index 3eacf25d547..3a4387b7b54 100644
--- a/_maps/map_files/RandomRuins/SpaceRuins/derelict2.dmm
+++ b/_maps/map_files/RandomRuins/SpaceRuins/derelict2.dmm
@@ -5,7 +5,6 @@
 "b" = (
 /obj/structure/window/reinforced{
 	tag = "icon-rwindow (EAST)";
-	icon_state = "rwindow";
 	dir = 4
 	},
 /turf/space,
@@ -17,7 +16,6 @@
 "d" = (
 /obj/structure/window/reinforced{
 	tag = "icon-rwindow (WEST)";
-	icon_state = "rwindow";
 	dir = 8
 	},
 /turf/space,
@@ -25,12 +23,10 @@
 "e" = (
 /obj/structure/window/reinforced{
 	tag = "icon-rwindow (EAST)";
-	icon_state = "rwindow";
 	dir = 4
 	},
 /obj/structure/window/reinforced{
 	tag = "icon-rwindow (WEST)";
-	icon_state = "rwindow";
 	dir = 8
 	},
 /turf/simulated/floor/plating,
@@ -46,7 +42,6 @@
 "h" = (
 /obj/machinery/light/small{
 	tag = "icon-bulb1 (NORTH)";
-	icon_state = "bulb1";
 	dir = 1
 	},
 /turf/simulated/floor/plasteel,
@@ -57,7 +52,6 @@
 "j" = (
 /obj/machinery/light/small{
 	tag = "icon-bulb1 (EAST)";
-	icon_state = "bulb1";
 	dir = 4
 	},
 /turf/simulated/floor/plasteel,
@@ -70,7 +64,6 @@
 /obj/structure/window/reinforced,
 /obj/structure/window/reinforced{
 	tag = "icon-rwindow (NORTH)";
-	icon_state = "rwindow";
 	dir = 1
 	},
 /turf/simulated/floor/plating,
@@ -78,7 +71,6 @@
 "m" = (
 /obj/structure/chair{
 	tag = "icon-chair (EAST)";
-	icon_state = "chair";
 	dir = 4
 	},
 /obj/effect/decal/remains/human,
@@ -100,7 +92,6 @@
 "o" = (
 /obj/structure/chair{
 	tag = "icon-chair (WEST)";
-	icon_state = "chair";
 	dir = 8
 	},
 /obj/effect/decal/remains/human,
@@ -109,7 +100,6 @@
 "p" = (
 /obj/structure/window/reinforced{
 	tag = "icon-rwindow (NORTH)";
-	icon_state = "rwindow";
 	dir = 1
 	},
 /turf/space,
@@ -117,7 +107,6 @@
 "q" = (
 /obj/machinery/light/small{
 	tag = "icon-bulb1 (WEST)";
-	icon_state = "bulb1";
 	dir = 8
 	},
 /turf/simulated/floor/plasteel,
diff --git a/_maps/map_files/RandomRuins/SpaceRuins/gasthelizards.dmm b/_maps/map_files/RandomRuins/SpaceRuins/gasthelizards.dmm
index 06b06aa58de..dc20ffc6db7 100644
--- a/_maps/map_files/RandomRuins/SpaceRuins/gasthelizards.dmm
+++ b/_maps/map_files/RandomRuins/SpaceRuins/gasthelizards.dmm
@@ -237,7 +237,6 @@
 "iy" = (
 /obj/machinery/atmospherics/unary/outlet_injector/on{
 	dir = 8;
-	frequency = 1441;
 	id = "mix_in_gtl"
 	},
 /turf/simulated/floor/engine,
@@ -476,7 +475,6 @@
 /area/ruin/space/gasthelizards/jail)
 "rk" = (
 /obj/machinery/atmospherics/air_sensor{
-	frequency = 1441;
 	id_tag = "mix_sensor_gtl";
 	output = 127
 	},
@@ -534,7 +532,6 @@
 /area/ruin/space/gasthelizards/jail)
 "tA" = (
 /obj/machinery/computer/general_air_control/large_tank_control{
-	frequency = 1441;
 	input_tag = "mix_in_gtl";
 	name = "Gas Mix Tank Control";
 	output_tag = "mix_out_gtl";
@@ -713,7 +710,6 @@
 /area/space)
 "Dg" = (
 /obj/machinery/atmospherics/unary/outlet_injector/on{
-	frequency = 1441;
 	id = "mix_in"
 	},
 /obj/machinery/light/small,
diff --git a/_maps/map_files/RandomRuins/SpaceRuins/listeningpost.dmm b/_maps/map_files/RandomRuins/SpaceRuins/listeningpost.dmm
index fc6cc9efd78..102bd3bd0ca 100644
--- a/_maps/map_files/RandomRuins/SpaceRuins/listeningpost.dmm
+++ b/_maps/map_files/RandomRuins/SpaceRuins/listeningpost.dmm
@@ -280,7 +280,6 @@
 "Q" = (
 /obj/machinery/shower{
 	tag = "icon-shower (WEST)";
-	icon_state = "shower";
 	dir = 8
 	},
 /turf/simulated/floor/plasteel{
@@ -295,7 +294,6 @@
 "S" = (
 /obj/structure/toilet{
 	tag = "icon-toilet00 (WEST)";
-	icon_state = "toilet00";
 	dir = 8
 	},
 /turf/simulated/floor/plasteel{
diff --git a/_maps/map_files/RandomRuins/SpaceRuins/onehalf.dmm b/_maps/map_files/RandomRuins/SpaceRuins/onehalf.dmm
index 38b9331264d..5bb012506a9 100644
--- a/_maps/map_files/RandomRuins/SpaceRuins/onehalf.dmm
+++ b/_maps/map_files/RandomRuins/SpaceRuins/onehalf.dmm
@@ -27,7 +27,6 @@
 /obj/structure/lattice,
 /obj/item/stack/cable_coil/cut{
 	amount = 2;
-	dir = 2;
 	icon_state = "coil_red2"
 	},
 /turf/space,
@@ -156,8 +155,7 @@
 /area/ruin/onehalf/dorms_med)
 "aB" = (
 /obj/machinery/light{
-	dir = 4;
-	icon_state = "tube1"
+	dir = 4
 	},
 /obj/structure/table,
 /obj/item/storage/firstaid/brute{
@@ -223,7 +221,6 @@
 /obj/machinery/power/apc/noalarm{
 	keep_preset_name = 1;
 	name = "Hallway APC";
-	pixel_x = 0;
 	pixel_y = -24
 	},
 /turf/simulated/floor/plasteel/airless,
@@ -422,12 +419,10 @@
 "be" = (
 /obj/structure/disposalpipe/broken{
 	tag = "icon-pipe-b (EAST)";
-	icon_state = "pipe-b";
 	dir = 4
 	},
 /obj/item/stack/cable_coil/cut{
 	amount = 2;
-	dir = 2;
 	icon_state = "coil_red2"
 	},
 /turf/simulated/floor/plating/airless,
@@ -467,7 +462,6 @@
 "bi" = (
 /obj/structure/disposalpipe/broken{
 	tag = "icon-pipe-b (EAST)";
-	icon_state = "pipe-b";
 	dir = 4
 	},
 /obj/effect/landmark/tiles/damageturf,
@@ -529,9 +523,7 @@
 /turf/simulated/floor/plasteel,
 /area/ruin/onehalf/drone_bay)
 "bp" = (
-/obj/machinery/door/airlock/maintenance_hatch{
-	name = "maintenance hatch"
-	},
+/obj/machinery/door/airlock/maintenance_hatch,
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
@@ -667,9 +659,7 @@
 /turf/simulated/floor/plating/airless,
 /area/ruin/onehalf/hallway)
 "bK" = (
-/obj/machinery/vending/coffee{
-	name = "\improper Solar's Best Hot Drinks"
-	},
+/obj/machinery/vending/coffee,
 /obj/effect/landmark/tiles/damageturf,
 /turf/simulated/floor/plasteel/airless,
 /area/ruin/onehalf/hallway)
@@ -858,7 +848,6 @@
 "cq" = (
 /obj/structure/chair{
 	tag = "icon-chair (WEST)";
-	icon_state = "chair";
 	dir = 8
 	},
 /turf/simulated/floor/plasteel,
@@ -869,7 +858,6 @@
 "cs" = (
 /obj/structure/chair{
 	tag = "icon-chair (NORTH)";
-	icon_state = "chair";
 	dir = 1
 	},
 /turf/simulated/floor/plasteel,
@@ -980,12 +968,10 @@
 /obj/structure/lattice,
 /obj/structure/disposalpipe/broken{
 	tag = "icon-pipe-b (NORTH)";
-	icon_state = "pipe-b";
 	dir = 1
 	},
 /obj/structure/disposalpipe/broken{
 	tag = "icon-pipe-b (WEST)";
-	icon_state = "pipe-b";
 	dir = 8
 	},
 /turf/space,
@@ -1028,7 +1014,6 @@
 "cN" = (
 /obj/structure/chair/comfy/black{
 	tag = "icon-comfychair (EAST)";
-	icon_state = "comfychair";
 	dir = 4
 	},
 /turf/simulated/floor/plasteel,
@@ -1037,7 +1022,6 @@
 /obj/structure/lattice,
 /obj/item/stack/cable_coil/cut{
 	amount = 2;
-	dir = 2;
 	icon_state = "coil_red2"
 	},
 /turf/space,
@@ -1079,7 +1063,6 @@
 /obj/machinery/door_control{
 	id = "onehalf bridge";
 	name = "Bridge Lockdown";
-	pixel_x = 0;
 	pixel_y = 5
 	},
 /turf/simulated/floor/plasteel,
diff --git a/_maps/map_files/RandomRuins/SpaceRuins/spaceprison.dmm b/_maps/map_files/RandomRuins/SpaceRuins/spaceprison.dmm
index d76c4c75974..24460fd7c82 100644
--- a/_maps/map_files/RandomRuins/SpaceRuins/spaceprison.dmm
+++ b/_maps/map_files/RandomRuins/SpaceRuins/spaceprison.dmm
@@ -47,8 +47,7 @@
 "aj" = (
 /obj/structure/lattice/catwalk,
 /obj/structure/cable{
-	icon_state = "1-2";
-	pixel_y = 0
+	icon_state = "1-2"
 	},
 /turf/template_noop,
 /area/space/nearstation)
@@ -105,8 +104,7 @@
 "aq" = (
 /obj/structure/lattice/catwalk,
 /obj/structure/cable{
-	icon_state = "1-2";
-	pixel_y = 0
+	icon_state = "1-2"
 	},
 /obj/structure/cable{
 	icon_state = "2-4"
@@ -157,12 +155,10 @@
 "av" = (
 /obj/structure/lattice/catwalk,
 /obj/structure/cable{
-	icon_state = "1-2";
-	pixel_y = 0
+	icon_state = "1-2"
 	},
 /obj/structure/cable{
-	icon_state = "1-2";
-	pixel_y = 0
+	icon_state = "1-2"
 	},
 /turf/template_noop,
 /area/space/nearstation)
@@ -175,8 +171,7 @@
 	icon_state = "2-8"
 	},
 /obj/structure/cable{
-	icon_state = "1-2";
-	pixel_y = 0
+	icon_state = "1-2"
 	},
 /turf/template_noop,
 /area/space/nearstation)
@@ -195,15 +190,13 @@
 /area/space/nearstation)
 "aA" = (
 /obj/structure/cable{
-	icon_state = "1-2";
-	pixel_y = 0
+	icon_state = "1-2"
 	},
 /turf/simulated/floor/plating/airless,
 /area/space/nearstation)
 "aB" = (
 /obj/structure/cable{
-	icon_state = "1-2";
-	pixel_y = 0
+	icon_state = "1-2"
 	},
 /obj/machinery/atmospherics/unary/vent_pump/high_volume{
 	frequency = 1379;
@@ -213,8 +206,7 @@
 /area/ruin/spaceprison)
 "aC" = (
 /obj/structure/cable{
-	icon_state = "1-2";
-	pixel_y = 0
+	icon_state = "1-2"
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden{
 	dir = 1
@@ -224,8 +216,7 @@
 /area/ruin/spaceprison)
 "aD" = (
 /obj/structure/cable{
-	icon_state = "1-2";
-	pixel_y = 0
+	icon_state = "1-2"
 	},
 /obj/structure/door_assembly/door_assembly_ext,
 /turf/simulated/floor/plating,
@@ -329,8 +320,7 @@
 	dir = 9
 	},
 /obj/structure/cable{
-	icon_state = "1-2";
-	pixel_y = 0
+	icon_state = "1-2"
 	},
 /obj/effect/decal/warning_stripes/north,
 /obj/effect/landmark/tiles/damageturf,
@@ -348,8 +338,7 @@
 /area/space/nearstation)
 "aW" = (
 /obj/structure/cable{
-	icon_state = "1-2";
-	pixel_y = 0
+	icon_state = "1-2"
 	},
 /turf/simulated/floor/plasteel{
 	dir = 8;
@@ -500,8 +489,7 @@
 "bs" = (
 /obj/structure/table,
 /obj/structure/cable{
-	icon_state = "1-2";
-	pixel_y = 0
+	icon_state = "1-2"
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "grimy"
@@ -571,15 +559,13 @@
 	dir = 8
 	},
 /obj/structure/cable{
-	icon_state = "1-2";
-	pixel_y = 0
+	icon_state = "1-2"
 	},
 /turf/simulated/floor/plating,
 /area/ruin/spaceprison)
 "bE" = (
 /obj/structure/cable{
-	icon_state = "1-2";
-	pixel_y = 0
+	icon_state = "1-2"
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "grimy"
@@ -602,8 +588,7 @@
 "bJ" = (
 /obj/structure/table/reinforced,
 /obj/structure/cable{
-	icon_state = "1-2";
-	pixel_y = 0
+	icon_state = "1-2"
 	},
 /obj/machinery/door_control{
 	id = "spaceprisonnot";
@@ -641,8 +626,7 @@
 "bK" = (
 /obj/effect/decal/cleanable/dust,
 /obj/structure/cable{
-	icon_state = "1-2";
-	pixel_y = 0
+	icon_state = "1-2"
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "bar"
@@ -671,8 +655,7 @@
 /area/ruin/spaceprison)
 "bN" = (
 /obj/structure/cable{
-	icon_state = "1-2";
-	pixel_y = 0
+	icon_state = "1-2"
 	},
 /obj/machinery/door/airlock/maintenance_hatch{
 	name = "Space Prison Engineering";
@@ -726,8 +709,7 @@
 /area/ruin/spaceprison)
 "bX" = (
 /obj/structure/cable{
-	icon_state = "1-2";
-	pixel_y = 0
+	icon_state = "1-2"
 	},
 /obj/item/paper/crumpled/bloody,
 /turf/simulated/floor/plasteel{
@@ -747,8 +729,7 @@
 	dir = 4
 	},
 /obj/structure/cable{
-	icon_state = "1-2";
-	pixel_y = 0
+	icon_state = "1-2"
 	},
 /turf/simulated/floor/plating,
 /area/ruin/spaceprison)
@@ -850,13 +831,11 @@
 /area/ruin/spaceprison)
 "co" = (
 /obj/structure/cable{
-	icon_state = "1-2";
-	pixel_y = 0
+	icon_state = "1-2"
 	},
 /obj/machinery/door_timer/cell_1{
 	id = "Ruin Cell 1";
-	pixel_x = -32;
-	pixel_y = 0
+	pixel_x = -32
 	},
 /obj/effect/landmark/tiles/damageturf,
 /turf/simulated/floor/plating,
@@ -888,8 +867,7 @@
 	dir = 4
 	},
 /obj/structure/cable{
-	icon_state = "1-2";
-	pixel_y = 0
+	icon_state = "1-2"
 	},
 /turf/simulated/floor/plating,
 /area/ruin/spaceprison)
@@ -923,8 +901,7 @@
 	dir = 8
 	},
 /obj/structure/cable{
-	icon_state = "1-2";
-	pixel_y = 0
+	icon_state = "1-2"
 	},
 /obj/effect/landmark/tiles/damageturf,
 /turf/simulated/floor/plating,
@@ -980,8 +957,7 @@
 	icon_state = "1-4"
 	},
 /obj/structure/cable{
-	icon_state = "1-2";
-	pixel_y = 0
+	icon_state = "1-2"
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
@@ -1055,8 +1031,7 @@
 /area/ruin/spaceprison)
 "ea" = (
 /obj/structure/cable{
-	icon_state = "1-2";
-	pixel_y = 0
+	icon_state = "1-2"
 	},
 /obj/effect/landmark/tiles/damageturf,
 /turf/simulated/floor/plasteel{
@@ -1084,8 +1059,7 @@
 	},
 /obj/machinery/door_timer/cell_3{
 	id = "Ruin Cell 3";
-	pixel_x = -32;
-	pixel_y = 0
+	pixel_x = -32
 	},
 /obj/effect/landmark/tiles/damageturf,
 /turf/simulated/floor/plating,
@@ -1163,8 +1137,7 @@
 	req_access = list(1)
 	},
 /obj/structure/cable{
-	icon_state = "1-2";
-	pixel_y = 0
+	icon_state = "1-2"
 	},
 /obj/structure/cable{
 	icon_state = "2-4"
@@ -1215,8 +1188,7 @@
 	dir = 4
 	},
 /obj/structure/cable{
-	icon_state = "1-2";
-	pixel_y = 0
+	icon_state = "1-2"
 	},
 /obj/effect/landmark/tiles/damageturf,
 /turf/simulated/floor/plating,
@@ -1438,8 +1410,7 @@
 "kH" = (
 /obj/effect/spawner/window/reinforced,
 /obj/structure/cable{
-	icon_state = "1-2";
-	pixel_y = 0
+	icon_state = "1-2"
 	},
 /obj/structure/cable{
 	icon_state = "0-2"
@@ -1499,8 +1470,7 @@
 /area/ruin/spaceprison)
 "mK" = (
 /obj/structure/cable{
-	icon_state = "1-2";
-	pixel_y = 0
+	icon_state = "1-2"
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
@@ -1671,8 +1641,7 @@
 	dir = 8
 	},
 /obj/structure/cable{
-	icon_state = "1-2";
-	pixel_y = 0
+	icon_state = "1-2"
 	},
 /turf/simulated/floor/plating,
 /area/ruin/spaceprison)
@@ -1681,8 +1650,7 @@
 	dir = 8
 	},
 /obj/machinery/door_timer/cell_5{
-	pixel_x = 32;
-	pixel_y = 0
+	pixel_x = 32
 	},
 /turf/simulated/floor/plating,
 /area/ruin/spaceprison)
@@ -1743,8 +1711,7 @@
 /area/ruin/spaceprison)
 "tz" = (
 /obj/structure/cable{
-	icon_state = "1-2";
-	pixel_y = 0
+	icon_state = "1-2"
 	},
 /obj/effect/landmark/tiles/damageturf,
 /turf/simulated/floor/plasteel{
@@ -1778,8 +1745,7 @@
 /area/ruin/spaceprison)
 "uL" = (
 /obj/structure/cable{
-	icon_state = "1-2";
-	pixel_y = 0
+	icon_state = "1-2"
 	},
 /obj/effect/decal/cleanable/dust,
 /turf/simulated/floor/plasteel{
@@ -1818,8 +1784,7 @@
 	req_access = list(1)
 	},
 /obj/structure/cable{
-	icon_state = "1-2";
-	pixel_y = 0
+	icon_state = "1-2"
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
@@ -1989,8 +1954,7 @@
 "zk" = (
 /obj/effect/spawner/window/reinforced,
 /obj/structure/cable{
-	icon_state = "1-2";
-	pixel_y = 0
+	icon_state = "1-2"
 	},
 /obj/structure/cable,
 /turf/simulated/floor/plating,
@@ -2024,13 +1988,11 @@
 /area/ruin/spaceprison)
 "Aa" = (
 /obj/structure/cable{
-	icon_state = "1-2";
-	pixel_y = 0
+	icon_state = "1-2"
 	},
 /obj/machinery/door_timer/cell_2{
 	id = "Ruin Cell 2";
-	pixel_x = -32;
-	pixel_y = 0
+	pixel_x = -32
 	},
 /turf/simulated/floor/plating,
 /area/ruin/spaceprison)
@@ -2244,8 +2206,7 @@
 	dir = 8
 	},
 /obj/structure/cable{
-	icon_state = "1-2";
-	pixel_y = 0
+	icon_state = "1-2"
 	},
 /obj/machinery/door_timer/cell_6{
 	pixel_x = 32
@@ -2261,8 +2222,7 @@
 /area/space/nearstation)
 "EY" = (
 /obj/structure/cable{
-	icon_state = "1-2";
-	pixel_y = 0
+	icon_state = "1-2"
 	},
 /turf/simulated/floor/plating,
 /area/ruin/spaceprison)
@@ -2272,15 +2232,13 @@
 	icon_state = "0-2"
 	},
 /obj/structure/cable{
-	icon_state = "1-2";
-	pixel_y = 0
+	icon_state = "1-2"
 	},
 /turf/simulated/floor/plating,
 /area/ruin/spaceprison)
 "Fr" = (
 /obj/structure/cable{
-	icon_state = "1-2";
-	pixel_y = 0
+	icon_state = "1-2"
 	},
 /obj/effect/landmark/tiles/damageturf,
 /turf/simulated/floor/plasteel{
@@ -2401,15 +2359,13 @@
 /obj/effect/spawner/window/reinforced,
 /obj/structure/cable,
 /obj/structure/cable{
-	icon_state = "1-2";
-	pixel_y = 0
+	icon_state = "1-2"
 	},
 /turf/simulated/floor/plating,
 /area/ruin/spaceprison)
 "Ji" = (
 /obj/structure/cable{
-	icon_state = "1-2";
-	pixel_y = 0
+	icon_state = "1-2"
 	},
 /obj/item/shard{
 	icon_state = "medium"
@@ -2500,8 +2456,7 @@
 /area/ruin/spaceprison)
 "Me" = (
 /obj/structure/cable{
-	icon_state = "1-2";
-	pixel_y = 0
+	icon_state = "1-2"
 	},
 /obj/structure/chair/stool,
 /turf/simulated/floor/plasteel{
@@ -2584,8 +2539,7 @@
 "MW" = (
 /obj/structure/window/reinforced,
 /obj/machinery/door_timer/cell_4{
-	pixel_x = 32;
-	pixel_y = 0
+	pixel_x = 32
 	},
 /obj/structure/cable{
 	icon_state = "1-8"
@@ -2654,8 +2608,7 @@
 /area/ruin/spaceprison)
 "OK" = (
 /obj/structure/cable{
-	icon_state = "1-2";
-	pixel_y = 0
+	icon_state = "1-2"
 	},
 /obj/machinery/door/airlock/security/glass{
 	name = "Space Prison Armory";
@@ -2874,8 +2827,7 @@
 "TK" = (
 /obj/effect/decal/warning_stripes/northwestcorner,
 /obj/structure/cable{
-	icon_state = "1-2";
-	pixel_y = 0
+	icon_state = "1-2"
 	},
 /turf/simulated/floor/plating,
 /area/ruin/spaceprison)
@@ -3081,8 +3033,7 @@
 	security_level = 1
 	},
 /obj/structure/cable{
-	icon_state = "1-2";
-	pixel_y = 0
+	icon_state = "1-2"
 	},
 /turf/simulated/floor/plasteel{
 	dir = 10;
diff --git a/_maps/map_files/RandomRuins/SpaceRuins/syndiecakesfactory.dmm b/_maps/map_files/RandomRuins/SpaceRuins/syndiecakesfactory.dmm
index 170e83a0f79..f4de66413ef 100644
--- a/_maps/map_files/RandomRuins/SpaceRuins/syndiecakesfactory.dmm
+++ b/_maps/map_files/RandomRuins/SpaceRuins/syndiecakesfactory.dmm
@@ -544,7 +544,6 @@
 /area/ruin/powered)
 "Vf" = (
 /obj/machinery/power/apc/noalarm{
-	area = null;
 	dir = 8;
 	keep_preset_name = 1;
 	locked = 0;
@@ -574,7 +573,6 @@
 /area/ruin/space)
 "Xd" = (
 /obj/machinery/power/apc/noalarm{
-	area = null;
 	dir = 8;
 	keep_preset_name = 1;
 	light_power = 0;
diff --git a/_maps/map_files/RandomRuins/SpaceRuins/turretedoutpost.dmm b/_maps/map_files/RandomRuins/SpaceRuins/turretedoutpost.dmm
index 67dc298eb20..ad474fedf72 100644
--- a/_maps/map_files/RandomRuins/SpaceRuins/turretedoutpost.dmm
+++ b/_maps/map_files/RandomRuins/SpaceRuins/turretedoutpost.dmm
@@ -56,7 +56,6 @@
 "n" = (
 /obj/structure/chair{
 	tag = "icon-chair (WEST)";
-	icon_state = "chair";
 	dir = 8
 	},
 /turf/simulated/floor/plasteel,
@@ -107,7 +106,6 @@
 /area/ruin/unpowered)
 "w" = (
 /obj/machinery/power/apc/noalarm{
-	dir = 2;
 	name = "Outpost APC";
 	keep_preset_name = 1;
 	pixel_y = -24
@@ -165,8 +163,7 @@
 /obj/structure/bed,
 /obj/item/bedsheet/orange,
 /obj/machinery/light{
-	dir = 4;
-	icon_state = "tube1"
+	dir = 4
 	},
 /turf/simulated/floor/plasteel,
 /area/ruin/unpowered)
@@ -265,7 +262,6 @@
 /obj/structure/table/wood,
 /obj/item/reagent_containers/food/snacks/rawcutlet,
 /obj/machinery/light{
-	icon_state = "tube1";
 	dir = 8
 	},
 /turf/simulated/floor/plasteel,
diff --git a/_maps/map_files/RandomRuins/SpaceRuins/ussp_laboratory.dmm b/_maps/map_files/RandomRuins/SpaceRuins/ussp_laboratory.dmm
index 902b2d4e296..dc09cd0dd07 100644
--- a/_maps/map_files/RandomRuins/SpaceRuins/ussp_laboratory.dmm
+++ b/_maps/map_files/RandomRuins/SpaceRuins/ussp_laboratory.dmm
@@ -1958,8 +1958,7 @@
 	icon_state = "1-2"
 	},
 /mob/living/simple_animal/hostile/alien/drone{
-	dir = 8;
-	
+	dir = 8
 	},
 /obj/structure/alien/weeds,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -2908,8 +2907,7 @@
 	pixel_y = 10
 	},
 /mob/living/simple_animal/hostile/alien/drone{
-	dir = 8;
-	
+	dir = 8
 	},
 /turf/simulated/floor/plasteel{
 	dir = 8;
@@ -3697,8 +3695,7 @@
 	},
 /obj/effect/decal/cleanable/cobweb,
 /mob/living/simple_animal/hostile/alien/drone{
-	dir = 8;
-	
+	dir = 8
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
diff --git a/_maps/map_files/RandomRuins/SpaceRuins/wizardcrash.dmm b/_maps/map_files/RandomRuins/SpaceRuins/wizardcrash.dmm
index fe9ecea1a92..480fffc7b2e 100644
--- a/_maps/map_files/RandomRuins/SpaceRuins/wizardcrash.dmm
+++ b/_maps/map_files/RandomRuins/SpaceRuins/wizardcrash.dmm
@@ -253,8 +253,7 @@
 /area/ruin/unpowered)
 "aT" = (
 /obj/machinery/light{
-	dir = 4;
-	icon_state = "tube1"
+	dir = 4
 	},
 /obj/structure/reagent_dispensers/oil,
 /turf/simulated/floor/plating,
@@ -495,8 +494,7 @@
 /area/ruin/unpowered)
 "bJ" = (
 /obj/structure/window/reinforced{
-	dir = 4;
-	pixel_x = 0
+	dir = 4
 	},
 /turf/simulated/floor/mineral/plasma,
 /area/ruin/unpowered)
diff --git a/_maps/map_files/RandomZLevels/academy.dmm b/_maps/map_files/RandomZLevels/academy.dmm
index 8a85191a429..f40bb88ce3a 100644
--- a/_maps/map_files/RandomZLevels/academy.dmm
+++ b/_maps/map_files/RandomZLevels/academy.dmm
@@ -7,9 +7,7 @@
 /turf/simulated/wall/indestructible/reinforced,
 /area/awaymission/academy/academyaft)
 "ae" = (
-/obj/structure/computerframe{
-	anchored = 1
-	},
+/obj/structure/computerframe,
 /turf/simulated/floor/carpet,
 /area/awaymission/academy/headmaster)
 "af" = (
@@ -183,9 +181,7 @@
 /turf/simulated/wall/indestructible/fakeglass,
 /area/awaymission/academy/headmaster)
 "aZ" = (
-/obj/structure/computerframe{
-	anchored = 1
-	},
+/obj/structure/computerframe,
 /turf/simulated/floor/plasteel{
 	dir = 1;
 	icon_state = "green"
@@ -6283,9 +6279,7 @@
 	},
 /area/awaymission/academy/classrooms)
 "Vv" = (
-/obj/structure/computerframe{
-	anchored = 1
-	},
+/obj/structure/computerframe,
 /turf/simulated/floor/plasteel{
 	dir = 9;
 	icon_state = "green"
diff --git a/_maps/map_files/RandomZLevels/blackmarketpackers.dmm b/_maps/map_files/RandomZLevels/blackmarketpackers.dmm
index e7c0de3e3e2..d891676d33a 100644
--- a/_maps/map_files/RandomZLevels/blackmarketpackers.dmm
+++ b/_maps/map_files/RandomZLevels/blackmarketpackers.dmm
@@ -390,7 +390,6 @@
 	armed = 1
 	},
 /obj/machinery/door/firedoor/closed{
-	opacity = 0;
 	layer = 2.8
 	},
 /turf/simulated/floor/engine,
@@ -627,7 +626,6 @@
 	tag = ""
 	},
 /obj/machinery/door/firedoor/closed{
-	opacity = 0;
 	layer = 3.3
 	},
 /turf/simulated/floor/plating,
@@ -885,9 +883,7 @@
 	tag = ""
 	},
 /obj/effect/decal/cleanable/dirt,
-/obj/structure/computerframe{
-	anchored = 1
-	},
+/obj/structure/computerframe,
 /turf/simulated/floor/mineral/plastitanium/red,
 /area/awaymission/BMPship/Containment)
 "cN" = (
@@ -1322,7 +1318,6 @@
 	tag = ""
 	},
 /obj/machinery/door/firedoor/closed{
-	opacity = 0;
 	layer = 2.8
 	},
 /turf/simulated/floor/plating,
@@ -1583,9 +1578,7 @@
 /turf/simulated/floor/plating,
 /area/awaymission/BMPship/Kitchen)
 "eA" = (
-/obj/structure/computerframe{
-	anchored = 1
-	},
+/obj/structure/computerframe,
 /obj/structure/alien/weeds,
 /turf/simulated/floor/plating/airless,
 /area/awaymission/BMPship/Fore)
@@ -1732,7 +1725,6 @@
 "eU" = (
 /obj/machinery/door/airlock/titanium,
 /obj/machinery/door/firedoor/closed{
-	opacity = 0;
 	layer = 2.8
 	},
 /turf/simulated/floor/plating,
@@ -1886,7 +1878,6 @@
 "fn" = (
 /obj/machinery/door/airlock/silver,
 /obj/machinery/door/firedoor/closed{
-	opacity = 0;
 	layer = 2.8
 	},
 /turf/simulated/floor/plasteel,
@@ -2421,9 +2412,7 @@
 /turf/simulated/floor/plating/airless,
 /area/awaymission/BMPship/Fore)
 "gE" = (
-/obj/structure/computerframe{
-	anchored = 1
-	},
+/obj/structure/computerframe,
 /obj/effect/landmark/tiles/damageturf,
 /turf/simulated/floor/plating/airless,
 /area/awaymission/BMPship/Fore)
@@ -2489,9 +2478,7 @@
 /turf/simulated/floor/plasteel,
 /area/awaymission/BMPship/Kitchen)
 "gN" = (
-/obj/structure/computerframe{
-	anchored = 1
-	},
+/obj/structure/computerframe,
 /obj/effect/landmark/tiles/burnturf,
 /turf/simulated/floor/plating/airless,
 /area/awaymission/BMPship/Fore)
@@ -2695,7 +2682,6 @@
 	},
 /obj/structure/alien/weeds,
 /obj/machinery/door/firedoor/closed{
-	opacity = 0;
 	layer = 2.8
 	},
 /turf/simulated/floor/vault,
@@ -3280,7 +3266,6 @@
 	locked = 1
 	},
 /obj/machinery/door/firedoor/closed{
-	opacity = 0;
 	layer = 2.8
 	},
 /turf/simulated/floor/plasteel{
@@ -3351,7 +3336,6 @@
 	tag = ""
 	},
 /obj/machinery/door/firedoor/closed{
-	opacity = 0;
 	layer = 2.8
 	},
 /turf/simulated/floor/plasteel{
@@ -3379,7 +3363,6 @@
 	icon_state = "1-2"
 	},
 /obj/machinery/door/firedoor/closed{
-	opacity = 0;
 	layer = 3.3
 	},
 /turf/simulated/floor/plasteel,
@@ -3454,7 +3437,6 @@
 "kI" = (
 /obj/machinery/door/airlock/silver,
 /obj/machinery/door/firedoor/closed{
-	opacity = 0;
 	layer = 2.8
 	},
 /turf/simulated/floor/engine,
@@ -4264,7 +4246,6 @@
 "qJ" = (
 /obj/machinery/door/airlock/silver,
 /obj/machinery/door/firedoor/closed{
-	opacity = 0;
 	layer = 2.8
 	},
 /turf/simulated/floor/plating,
@@ -4394,7 +4375,6 @@
 	locked = 1
 	},
 /obj/machinery/door/firedoor/closed{
-	opacity = 0;
 	layer = 2.8
 	},
 /turf/simulated/floor/plasteel{
@@ -4739,7 +4719,6 @@
 	tag = ""
 	},
 /obj/machinery/door/firedoor/closed{
-	opacity = 0;
 	layer = 2.8
 	},
 /turf/simulated/floor/plating,
@@ -4876,7 +4855,6 @@
 	tag = ""
 	},
 /obj/machinery/door/firedoor/closed{
-	opacity = 0;
 	layer = 3.3
 	},
 /turf/simulated/floor/plating,
@@ -5496,7 +5474,6 @@
 	},
 /obj/structure/alien/weeds,
 /obj/machinery/door/firedoor/closed{
-	opacity = 0;
 	layer = 2.8
 	},
 /obj/structure/cable{
@@ -5582,7 +5559,6 @@
 	tag = ""
 	},
 /obj/machinery/door/firedoor/closed{
-	opacity = 0;
 	layer = 3.3
 	},
 /turf/simulated/floor/plating/airless,
@@ -6022,9 +5998,7 @@
 	icon_state = "2-8"
 	},
 /obj/effect/decal/cleanable/dirt,
-/obj/structure/computerframe{
-	anchored = 1
-	},
+/obj/structure/computerframe,
 /turf/simulated/floor/mineral/plastitanium/red,
 /area/awaymission/BMPship/Containment)
 "FU" = (
@@ -6502,7 +6476,6 @@
 	tag = ""
 	},
 /obj/machinery/door/firedoor/closed{
-	opacity = 0;
 	layer = 2.8
 	},
 /turf/simulated/floor/plasteel,
@@ -7376,9 +7349,7 @@
 	icon_state = "1-4"
 	},
 /obj/effect/decal/cleanable/dirt,
-/obj/structure/computerframe{
-	anchored = 1
-	},
+/obj/structure/computerframe,
 /turf/simulated/floor/mineral/plastitanium/red,
 /area/awaymission/BMPship/Containment)
 "Uj" = (
@@ -7691,9 +7662,7 @@
 "Xy" = (
 /obj/item/stack/tile/plasteel,
 /obj/structure/alien/weeds,
-/obj/structure/computerframe{
-	anchored = 1
-	},
+/obj/structure/computerframe,
 /turf/simulated/floor/plating/airless,
 /area/awaymission/BMPship/Fore)
 "XB" = (
@@ -7878,7 +7847,6 @@
 "Za" = (
 /obj/machinery/door/airlock/titanium,
 /obj/machinery/door/firedoor/closed{
-	opacity = 0;
 	layer = 2.8
 	},
 /turf/simulated/floor/plating,
diff --git a/_maps/map_files/RandomZLevels/centcomAway.dmm b/_maps/map_files/RandomZLevels/centcomAway.dmm
index 00c58b6eff7..f9fd2940d5b 100644
--- a/_maps/map_files/RandomZLevels/centcomAway.dmm
+++ b/_maps/map_files/RandomZLevels/centcomAway.dmm
@@ -46,21 +46,18 @@
 	req_access = list(101)
 	},
 /turf/simulated/floor/plasteel{
-	icon_state = "bar";
-	dir = 2
+	icon_state = "bar"
 	},
 /area/awaymission/centcomAway/maint)
 "ai" = (
 /turf/simulated/floor/plasteel{
-	icon_state = "bar";
-	dir = 2
+	icon_state = "bar"
 	},
 /area/awaymission/centcomAway/cafe)
 "aj" = (
 /obj/machinery/vending/cigarette,
 /turf/simulated/floor/plasteel{
-	icon_state = "bar";
-	dir = 2
+	icon_state = "bar"
 	},
 /area/awaymission/centcomAway/cafe)
 "ak" = (
@@ -172,12 +169,10 @@
 /area/awaymission/centcomAway/cafe)
 "aw" = (
 /obj/machinery/light{
-	icon_state = "tube1";
 	dir = 4
 	},
 /turf/simulated/floor/plasteel{
-	icon_state = "bar";
-	dir = 2
+	icon_state = "bar"
 	},
 /area/awaymission/centcomAway/cafe)
 "ax" = (
@@ -252,12 +247,10 @@
 /area/awaymission/centcomAway/cafe)
 "aJ" = (
 /obj/machinery/light{
-	icon_state = "tube1";
 	dir = 8
 	},
 /turf/simulated/floor/plasteel{
-	icon_state = "bar";
-	dir = 2
+	icon_state = "bar"
 	},
 /area/awaymission/centcomAway/cafe)
 "aK" = (
@@ -286,8 +279,7 @@
 	pixel_y = 8
 	},
 /turf/simulated/floor/plasteel{
-	icon_state = "bar";
-	dir = 2
+	icon_state = "bar"
 	},
 /area/awaymission/centcomAway/cafe)
 "aN" = (
@@ -365,7 +357,6 @@
 "aX" = (
 /obj/machinery/hydroponics/constructable,
 /obj/machinery/light{
-	icon_state = "tube1";
 	dir = 4
 	},
 /turf/simulated/floor/plasteel{
@@ -376,7 +367,6 @@
 /obj/structure/bed,
 /obj/item/bedsheet,
 /obj/machinery/light{
-	icon_state = "tube1";
 	dir = 8
 	},
 /turf/simulated/floor/carpet,
@@ -391,7 +381,6 @@
 /area/awaymission/centcomAway/cafe)
 "ba" = (
 /obj/machinery/light{
-	icon_state = "tube1";
 	dir = 8
 	},
 /turf/simulated/floor/plating,
@@ -452,7 +441,6 @@
 "bi" = (
 /obj/structure/table,
 /obj/machinery/processor{
-	pixel_x = 0;
 	pixel_y = 10
 	},
 /turf/simulated/floor/plasteel{
@@ -500,15 +488,13 @@
 "bp" = (
 /obj/structure/table/reinforced,
 /turf/simulated/floor/plasteel{
-	icon_state = "bar";
-	dir = 2
+	icon_state = "bar"
 	},
 /area/awaymission/centcomAway/cafe)
 "bq" = (
 /obj/machinery/door/airlock/freezer,
 /turf/simulated/floor/plasteel{
-	icon_state = "freezerfloor";
-	dir = 2
+	icon_state = "freezerfloor"
 	},
 /area/awaymission/centcomAway/cafe)
 "br" = (
@@ -523,7 +509,6 @@
 "bs" = (
 /obj/machinery/chem_master,
 /obj/machinery/light{
-	icon_state = "tube1";
 	dir = 4
 	},
 /turf/simulated/floor/plasteel{
@@ -566,8 +551,7 @@
 	dir = 5
 	},
 /turf/simulated/wall/shuttle{
-	icon_state = "swall_f6";
-	dir = 2
+	icon_state = "swall_f6"
 	},
 /area/awaymission/centcomAway/hangar)
 "by" = (
@@ -593,7 +577,6 @@
 /area/awaymission/centcomAway/cafe)
 "bC" = (
 /obj/structure/shuttle/engine/propulsion{
-	icon_state = "propulsion";
 	dir = 1
 	},
 /turf/simulated/floor/plating,
@@ -604,8 +587,7 @@
 	dir = 5
 	},
 /turf/simulated/wall/shuttle{
-	icon_state = "swall_f10";
-	dir = 2
+	icon_state = "swall_f10"
 	},
 /area/awaymission/centcomAway/hangar)
 "bE" = (
@@ -618,8 +600,7 @@
 "bF" = (
 /obj/structure/closet/secure_closet/freezer/meat,
 /turf/simulated/floor/plasteel{
-	icon_state = "freezerfloor";
-	dir = 2
+	icon_state = "freezerfloor"
 	},
 /area/awaymission/centcomAway/cafe)
 "bG" = (
@@ -627,12 +608,10 @@
 	name = "CondiMaster Neo"
 	},
 /obj/machinery/light{
-	icon_state = "tube1";
 	dir = 4
 	},
 /turf/simulated/floor/plasteel{
-	icon_state = "freezerfloor";
-	dir = 2
+	icon_state = "freezerfloor"
 	},
 /area/awaymission/centcomAway/cafe)
 "bH" = (
@@ -643,8 +622,7 @@
 /area/awaymission/centcomAway/hangar)
 "bI" = (
 /turf/simulated/floor/plasteel{
-	icon_state = "freezerfloor";
-	dir = 2
+	icon_state = "freezerfloor"
 	},
 /area/awaymission/centcomAway/cafe)
 "bJ" = (
@@ -657,39 +635,33 @@
 "bK" = (
 /obj/structure/window/reinforced,
 /obj/structure/shuttle/engine/heater{
-	icon_state = "heater";
 	dir = 1
 	},
 /turf/simulated/floor/plating,
 /area/awaymission/centcomAway/hangar)
 "bL" = (
 /turf/simulated/wall/shuttle{
-	icon_state = "swall3";
-	dir = 2
+	icon_state = "swall3"
 	},
 /area/awaymission/centcomAway/hangar)
 "bM" = (
 /turf/simulated/wall/shuttle{
-	icon_state = "swall8";
-	dir = 2
+	icon_state = "swall8"
 	},
 /area/awaymission/centcomAway/hangar)
 "bN" = (
 /turf/simulated/wall/shuttle{
-	icon_state = "swall7";
-	dir = 2
+	icon_state = "swall7"
 	},
 /area/awaymission/centcomAway/hangar)
 "bO" = (
 /turf/simulated/wall/shuttle{
-	icon_state = "swall4";
-	dir = 2
+	icon_state = "swall4"
 	},
 /area/awaymission/centcomAway/hangar)
 "bP" = (
 /turf/simulated/wall/shuttle{
-	icon_state = "swall12";
-	dir = 2
+	icon_state = "swall12"
 	},
 /area/awaymission/centcomAway/hangar)
 "bQ" = (
@@ -699,15 +671,13 @@
 /area/awaymission/centcomAway/cafe)
 "bR" = (
 /turf/simulated/wall/shuttle{
-	icon_state = "swall11";
-	dir = 2
+	icon_state = "swall11"
 	},
 /area/awaymission/centcomAway/hangar)
 "bS" = (
 /obj/structure/chair/comfy/brown,
 /turf/simulated/floor/plasteel{
-	icon_state = "bar";
-	dir = 2
+	icon_state = "bar"
 	},
 /area/awaymission/centcomAway/cafe)
 "bT" = (
@@ -732,8 +702,7 @@
 "bW" = (
 /obj/structure/kitchenspike,
 /turf/simulated/floor/plasteel{
-	icon_state = "freezerfloor";
-	dir = 2
+	icon_state = "freezerfloor"
 	},
 /area/awaymission/centcomAway/cafe)
 "bX" = (
@@ -748,8 +717,7 @@
 "bZ" = (
 /obj/machinery/gibber,
 /turf/simulated/floor/plasteel{
-	icon_state = "freezerfloor";
-	dir = 2
+	icon_state = "freezerfloor"
 	},
 /area/awaymission/centcomAway/cafe)
 "ca" = (
@@ -760,7 +728,6 @@
 /area/awaymission/centcomAway/cafe)
 "cb" = (
 /turf/simulated/floor/plasteel{
-	dir = 2;
 	icon_state = "green"
 	},
 /area/awaymission/centcomAway/cafe)
@@ -780,15 +747,13 @@
 "cd" = (
 /turf/simulated/floor/shuttle/plating,
 /turf/simulated/wall/shuttle{
-	icon_state = "swall_f6";
-	dir = 2
+	icon_state = "swall_f6"
 	},
 /area/awaymission/centcomAway/hangar)
 "ce" = (
 /turf/simulated/floor/shuttle,
 /turf/simulated/wall/shuttle{
-	icon_state = "swall_f9";
-	dir = 2
+	icon_state = "swall_f9"
 	},
 /area/awaymission/centcomAway/hangar)
 "cf" = (
@@ -803,8 +768,7 @@
 "cg" = (
 /obj/structure/table,
 /obj/item/storage/firstaid/regular{
-	pixel_x = 2;
-	pixel_y = 0
+	pixel_x = 2
 	},
 /obj/item/storage/firstaid/regular{
 	pixel_x = -2;
@@ -847,7 +811,6 @@
 "ck" = (
 /turf/simulated/floor/shuttle/plating,
 /turf/simulated/wall/shuttle{
-	dir = 2;
 	icon_state = "swall_f10";
 	layer = 2
 	},
@@ -872,8 +835,7 @@
 "cn" = (
 /turf/simulated/floor/shuttle,
 /turf/simulated/wall/shuttle{
-	icon_state = "swall_f5";
-	dir = 2
+	icon_state = "swall_f5"
 	},
 /area/awaymission/centcomAway/hangar)
 "co" = (
@@ -926,7 +888,6 @@
 "cv" = (
 /obj/structure/table/reinforced,
 /obj/item/reagent_containers/spray/plantbgone{
-	pixel_x = 0;
 	pixel_y = 3
 	},
 /turf/simulated/floor/plasteel{
@@ -956,7 +917,6 @@
 /obj/machinery/door/airlock/external,
 /obj/structure/cable{
 	icon_state = "4-8";
-	pixel_x = 0;
 	tag = ""
 	},
 /turf/simulated/floor/plating,
@@ -1028,7 +988,6 @@
 /obj/machinery/door/airlock/external,
 /obj/structure/cable{
 	icon_state = "4-8";
-	pixel_x = 0;
 	tag = ""
 	},
 /turf/simulated/floor/plating/airless,
@@ -1036,7 +995,6 @@
 "cM" = (
 /obj/structure/cable{
 	icon_state = "4-8";
-	pixel_x = 0;
 	tag = ""
 	},
 /turf/simulated/floor/plating,
@@ -1044,7 +1002,6 @@
 "cN" = (
 /obj/structure/cable{
 	icon_state = "4-8";
-	pixel_x = 0;
 	tag = ""
 	},
 /obj/structure/lattice/catwalk,
@@ -1061,7 +1018,6 @@
 	},
 /obj/structure/cable{
 	icon_state = "4-8";
-	pixel_x = 0;
 	tag = ""
 	},
 /obj/structure/lattice/catwalk,
@@ -1075,15 +1031,13 @@
 /area/awaymission/centcomAway/hangar)
 "cQ" = (
 /obj/machinery/light{
-	icon_state = "tube1";
 	dir = 8
 	},
 /turf/simulated/floor/shuttle/plating,
 /area/awaymission/centcomAway/hangar)
 "cR" = (
 /turf/simulated/wall/shuttle{
-	icon_state = "swall1";
-	dir = 2
+	icon_state = "swall1"
 	},
 /area/awaymission/centcomAway/hangar)
 "cS" = (
@@ -1094,7 +1048,6 @@
 /area/awaymission/centcomAway/hangar)
 "cT" = (
 /obj/machinery/light{
-	icon_state = "tube1";
 	dir = 4
 	},
 /turf/simulated/floor/shuttle/plating,
@@ -1164,8 +1117,7 @@
 /area/awaymission/centcomAway/cafe)
 "dc" = (
 /obj/structure/cable{
-	icon_state = "1-2";
-	pixel_y = 0
+	icon_state = "1-2"
 	},
 /turf/simulated/floor/plating,
 /area/awaymission/centcomAway/maint)
@@ -1204,8 +1156,7 @@
 	dir = 5
 	},
 /turf/simulated/wall/shuttle{
-	icon_state = "swall_f5";
-	dir = 2
+	icon_state = "swall_f5"
 	},
 /area/awaymission/centcomAway/hangar)
 "di" = (
@@ -1214,13 +1165,11 @@
 	dir = 5
 	},
 /turf/simulated/wall/shuttle{
-	icon_state = "swall_f9";
-	dir = 2
+	icon_state = "swall_f9"
 	},
 /area/awaymission/centcomAway/hangar)
 "dj" = (
 /obj/machinery/light{
-	icon_state = "tube1";
 	dir = 4
 	},
 /turf/simulated/floor/plasteel{
@@ -1236,15 +1185,13 @@
 	},
 /obj/structure/cable,
 /obj/structure/cable{
-	icon_state = "1-2";
-	pixel_y = 0
+	icon_state = "1-2"
 	},
 /turf/simulated/floor/plating,
 /area/awaymission/centcomAway/maint)
 "dl" = (
 /turf/simulated/wall/shuttle{
-	icon_state = "swallc1";
-	dir = 2
+	icon_state = "swallc1"
 	},
 /area/awaymission/centcomAway/hangar)
 "dm" = (
@@ -1258,7 +1205,6 @@
 /obj/structure/table/reinforced,
 /obj/item/paper_bin,
 /obj/machinery/light{
-	icon_state = "tube1";
 	dir = 8
 	},
 /turf/simulated/floor/shuttle{
@@ -1273,21 +1219,16 @@
 	},
 /area/awaymission/centcomAway/hangar)
 "dp" = (
-/obj/machinery/sleeper{
-	icon_state = "sleeper-open";
-	dir = 8
-	},
+/obj/machinery/sleeper,
 /turf/simulated/floor/shuttle,
 /area/awaymission/centcomAway/hangar)
 "dq" = (
 /turf/simulated/wall/shuttle{
-	icon_state = "swallc2";
-	dir = 2
+	icon_state = "swallc2"
 	},
 /area/awaymission/centcomAway/hangar)
 "dr" = (
 /obj/machinery/light{
-	icon_state = "tube1";
 	dir = 4
 	},
 /obj/structure/chair/comfy/shuttle{
@@ -1305,8 +1246,7 @@
 "dt" = (
 /obj/machinery/door/airlock/external,
 /turf/simulated/floor/plasteel{
-	icon_state = "bar";
-	dir = 2
+	icon_state = "bar"
 	},
 /area/awaymission/centcomAway/maint)
 "du" = (
@@ -1343,7 +1283,6 @@
 /area/awaymission/centcomAway/cafe)
 "dz" = (
 /obj/machinery/light{
-	icon_state = "tube1";
 	dir = 8
 	},
 /turf/simulated/floor/plasteel{
@@ -1448,12 +1387,10 @@
 "dN" = (
 /obj/machinery/gibber,
 /obj/machinery/light{
-	icon_state = "tube1";
 	dir = 4
 	},
 /turf/simulated/floor/plasteel{
-	icon_state = "freezerfloor";
-	dir = 2
+	icon_state = "freezerfloor"
 	},
 /area/awaymission/centcomAway/cafe)
 "dO" = (
@@ -1470,8 +1407,7 @@
 /area/awaymission/centcomAway/cafe)
 "dQ" = (
 /obj/structure/cable{
-	icon_state = "1-2";
-	pixel_y = 0
+	icon_state = "1-2"
 	},
 /obj/structure/cable{
 	icon_state = "1-4";
@@ -1482,8 +1418,7 @@
 "dR" = (
 /obj/structure/chair/stool/bar,
 /turf/simulated/floor/plasteel{
-	icon_state = "bar";
-	dir = 2
+	icon_state = "bar"
 	},
 /area/awaymission/centcomAway/cafe)
 "dS" = (
@@ -1495,9 +1430,7 @@
 /area/awaymission/centcomAway/hangar)
 "dT" = (
 /obj/machinery/door/window/northright{
-	base_state = "right";
 	dir = 4;
-	icon_state = "right";
 	name = "Security Desk";
 	req_access = list(103)
 	},
@@ -1512,7 +1445,6 @@
 	},
 /obj/structure/cable{
 	icon_state = "4-8";
-	pixel_x = 0;
 	tag = ""
 	},
 /obj/structure/lattice/catwalk,
@@ -1571,8 +1503,7 @@
 	name = "CondiMaster Neo"
 	},
 /turf/simulated/floor/plasteel{
-	icon_state = "freezerfloor";
-	dir = 2
+	icon_state = "freezerfloor"
 	},
 /area/awaymission/centcomAway/cafe)
 "ed" = (
@@ -1584,7 +1515,6 @@
 "ee" = (
 /obj/structure/closet/secure_closet/hydroponics,
 /obj/machinery/light{
-	icon_state = "tube1";
 	dir = 4
 	},
 /turf/simulated/floor/plasteel{
@@ -1598,14 +1528,12 @@
 /area/awaymission/centcomAway/hangar)
 "eg" = (
 /turf/simulated/wall/shuttle{
-	icon_state = "swall0";
-	dir = 2
+	icon_state = "swall0"
 	},
 /area/awaymission/centcomAway/hangar)
 "eh" = (
 /obj/structure/cable{
 	icon_state = "1-2";
-	pixel_y = 0;
 	tag = ""
 	},
 /obj/structure/lattice/catwalk,
@@ -1619,7 +1547,6 @@
 "ej" = (
 /obj/structure/disposalpipe/segment,
 /obj/machinery/light{
-	icon_state = "tube1";
 	dir = 4
 	},
 /turf/simulated/floor/plasteel{
@@ -1669,7 +1596,6 @@
 /area/awaymission/centcomAway/cafe)
 "eq" = (
 /obj/machinery/light{
-	icon_state = "tube1";
 	dir = 4
 	},
 /turf/simulated/floor/plasteel{
@@ -1710,7 +1636,6 @@
 "eu" = (
 /obj/structure/table,
 /obj/machinery/processor{
-	pixel_x = 0;
 	pixel_y = 10
 	},
 /turf/simulated/floor/plasteel{
@@ -1727,7 +1652,6 @@
 "ew" = (
 /obj/structure/bed,
 /obj/machinery/light{
-	icon_state = "tube1";
 	dir = 4
 	},
 /turf/simulated/floor/shuttle{
@@ -1736,7 +1660,6 @@
 /area/awaymission/centcomAway/hangar)
 "ex" = (
 /obj/machinery/light{
-	icon_state = "tube1";
 	dir = 8
 	},
 /turf/simulated/floor/shuttle{
@@ -1780,8 +1703,7 @@
 	start_charge = 100
 	},
 /obj/structure/cable{
-	icon_state = "1-2";
-	pixel_y = 0
+	icon_state = "1-2"
 	},
 /obj/structure/cable,
 /turf/simulated/floor/plating,
@@ -1840,14 +1762,11 @@
 /turf/simulated/floor/plating,
 /area/awaymission/centcomAway/hangar)
 "eO" = (
-/turf/simulated/floor/plasteel{
-	icon_state = "floor"
-	},
+/turf/simulated/floor/plasteel,
 /area/awaymission/centcomAway/general)
 "eQ" = (
 /turf/simulated/wall/shuttle{
-	icon_state = "swall2";
-	dir = 2
+	icon_state = "swall2"
 	},
 /area/awaymission/centcomAway/hangar)
 "eR" = (
@@ -1866,8 +1785,7 @@
 	d2 = 2
 	},
 /turf/simulated/floor/plasteel{
-	icon_state = "bar";
-	dir = 2
+	icon_state = "bar"
 	},
 /area/awaymission/centcomAway/cafe)
 "eS" = (
@@ -1903,7 +1821,6 @@
 "eX" = (
 /obj/machinery/portable_atmospherics/canister/air,
 /obj/machinery/light{
-	icon_state = "tube1";
 	dir = 8
 	},
 /obj/effect/decal/warning_stripes/west,
@@ -2021,26 +1938,22 @@
 "fp" = (
 /obj/machinery/door/airlock/centcom,
 /turf/simulated/floor/plasteel{
-	icon_state = "bar";
-	dir = 2
+	icon_state = "bar"
 	},
 /area/awaymission/centcomAway/cafe)
 "fq" = (
 /obj/machinery/door/airlock/centcom,
 /obj/structure/cable{
-	icon_state = "1-2";
-	pixel_y = 0
+	icon_state = "1-2"
 	},
 /turf/simulated/floor/plasteel{
-	icon_state = "bar";
-	dir = 2
+	icon_state = "bar"
 	},
 /area/awaymission/centcomAway/cafe)
 "fr" = (
 /obj/structure/table,
 /obj/item/radio/off,
 /obj/machinery/light{
-	icon_state = "tube1";
 	dir = 4
 	},
 /turf/simulated/floor/shuttle,
@@ -2205,8 +2118,7 @@
 "fM" = (
 /turf/simulated/floor/plating,
 /turf/simulated/wall/shuttle{
-	icon_state = "swall_f5";
-	dir = 2
+	icon_state = "swall_f5"
 	},
 /area/awaymission/centcomAway/hangar)
 "fN" = (
@@ -2216,20 +2128,16 @@
 /obj/structure/window/reinforced{
 	dir = 1
 	},
-/turf/simulated/floor/plasteel{
-	icon_state = "floor"
-	},
+/turf/simulated/floor/plasteel,
 /area/awaymission/centcomAway/general)
 "fO" = (
 /turf/simulated/wall/shuttle{
-	icon_state = "swall14";
-	dir = 2
+	icon_state = "swall14"
 	},
 /area/awaymission/centcomAway/hangar)
 "fP" = (
 /turf/simulated/wall/shuttle{
-	icon_state = "swallc4";
-	dir = 2
+	icon_state = "swallc4"
 	},
 /area/awaymission/centcomAway/hangar)
 "fQ" = (
@@ -2290,7 +2198,6 @@
 /area/awaymission/centcomAway/general)
 "fZ" = (
 /obj/machinery/light{
-	icon_state = "tube1";
 	dir = 8
 	},
 /turf/simulated/floor/plasteel{
@@ -2301,12 +2208,10 @@
 /area/awaymission/centcomAway/general)
 "ga" = (
 /obj/machinery/light{
-	icon_state = "tube1";
 	dir = 4
 	},
 /obj/structure/cable{
-	icon_state = "1-2";
-	pixel_y = 0
+	icon_state = "1-2"
 	},
 /turf/simulated/floor/plasteel{
 	tag = "icon-vault (NORTHEAST)";
@@ -2325,9 +2230,7 @@
 	dir = 1;
 	in_use = 1
 	},
-/turf/simulated/floor/plasteel{
-	icon_state = "floor"
-	},
+/turf/simulated/floor/plasteel,
 /area/awaymission/centcomAway/general)
 "ge" = (
 /turf/simulated/floor/plasteel{
@@ -2352,9 +2255,7 @@
 /area/awaymission/centcomAway/general)
 "gh" = (
 /obj/machinery/door/window/eastright,
-/turf/simulated/floor/plasteel{
-	icon_state = "floor"
-	},
+/turf/simulated/floor/plasteel,
 /area/awaymission/centcomAway/general)
 "gi" = (
 /obj/machinery/door/window/northleft,
@@ -2434,8 +2335,7 @@
 /area/awaymission/centcomAway/general)
 "gu" = (
 /obj/structure/cable{
-	icon_state = "1-2";
-	pixel_y = 0
+	icon_state = "1-2"
 	},
 /turf/simulated/floor/plasteel{
 	tag = "icon-vault (NORTHEAST)";
@@ -2494,10 +2394,7 @@
 /turf/simulated/floor/plating,
 /area/awaymission/centcomAway/general)
 "gA" = (
-/obj/machinery/sleeper{
-	icon_state = "sleeper-open";
-	dir = 8
-	},
+/obj/machinery/sleeper,
 /turf/simulated/floor/plasteel{
 	icon_state = "white"
 	},
@@ -2574,9 +2471,7 @@
 /area/awaymission/centcomAway/general)
 "gL" = (
 /obj/machinery/pdapainter,
-/turf/simulated/floor/plasteel{
-	icon_state = "floor"
-	},
+/turf/simulated/floor/plasteel,
 /area/awaymission/centcomAway/general)
 "gM" = (
 /obj/machinery/clonepod,
@@ -2594,9 +2489,7 @@
 /obj/machinery/recharger{
 	pixel_y = 4
 	},
-/turf/simulated/floor/plasteel{
-	icon_state = "floor"
-	},
+/turf/simulated/floor/plasteel,
 /area/awaymission/centcomAway/general)
 "gO" = (
 /obj/machinery/dna_scannernew,
@@ -2617,21 +2510,16 @@
 /area/awaymission/centcomAway/maint)
 "gQ" = (
 /obj/structure/filingcabinet,
-/turf/simulated/floor/plasteel{
-	icon_state = "floor"
-	},
+/turf/simulated/floor/plasteel,
 /area/awaymission/centcomAway/general)
 "gR" = (
 /obj/structure/filingcabinet/chestdrawer,
-/turf/simulated/floor/plasteel{
-	icon_state = "floor"
-	},
+/turf/simulated/floor/plasteel,
 /area/awaymission/centcomAway/general)
 "gS" = (
 /obj/machinery/light,
 /obj/structure/cable{
 	icon_state = "4-8";
-	pixel_x = 0;
 	tag = ""
 	},
 /turf/simulated/floor/plating,
@@ -2673,7 +2561,6 @@
 /obj/structure/table,
 /obj/item/storage/box/donkpockets,
 /obj/machinery/light{
-	icon_state = "tube1";
 	dir = 8
 	},
 /turf/simulated/floor/shuttle,
@@ -2702,7 +2589,6 @@
 	},
 /obj/structure/cable{
 	icon_state = "4-8";
-	pixel_x = 0;
 	tag = ""
 	},
 /turf/simulated/floor/plating,
@@ -2721,18 +2607,14 @@
 /obj/structure/cable{
 	icon_state = "2-4"
 	},
-/turf/simulated/floor/plasteel{
-	icon_state = "floor"
-	},
+/turf/simulated/floor/plasteel,
 /area/awaymission/centcomAway/general)
 "hi" = (
 /obj/structure/cable{
 	icon_state = "2-8";
 	tag = ""
 	},
-/turf/simulated/floor/plasteel{
-	icon_state = "floor"
-	},
+/turf/simulated/floor/plasteel,
 /area/awaymission/centcomAway/general)
 "hj" = (
 /obj/machinery/door/airlock/centcom,
@@ -2757,37 +2639,28 @@
 /area/awaymission/centcomAway/general)
 "hl" = (
 /obj/machinery/computer/robotics,
-/turf/simulated/floor/plasteel{
-	icon_state = "floor"
-	},
+/turf/simulated/floor/plasteel,
 /area/awaymission/centcomAway/general)
 "hm" = (
 /obj/structure/chair/office/dark{
 	dir = 8
 	},
-/turf/simulated/floor/plasteel{
-	icon_state = "floor"
-	},
+/turf/simulated/floor/plasteel,
 /area/awaymission/centcomAway/general)
 "hn" = (
 /obj/structure/chair/office/dark{
 	dir = 4
 	},
-/turf/simulated/floor/plasteel{
-	icon_state = "floor"
-	},
+/turf/simulated/floor/plasteel,
 /area/awaymission/centcomAway/general)
 "ho" = (
 /obj/machinery/computer/med_data,
-/turf/simulated/floor/plasteel{
-	icon_state = "floor"
-	},
+/turf/simulated/floor/plasteel,
 /area/awaymission/centcomAway/general)
 "hp" = (
 /obj/machinery/door/airlock/centcom,
 /obj/structure/cable{
-	icon_state = "1-2";
-	pixel_y = 0
+	icon_state = "1-2"
 	},
 /turf/simulated/floor/plasteel{
 	tag = "icon-vault (NORTHEAST)";
@@ -2819,8 +2692,7 @@
 /area/awaymission/centcomAway/general)
 "hu" = (
 /obj/structure/cable{
-	icon_state = "1-2";
-	pixel_y = 0
+	icon_state = "1-2"
 	},
 /turf/simulated/wall,
 /area/awaymission/centcomAway/courtroom)
@@ -2853,21 +2725,15 @@
 /area/awaymission/centcomAway/general)
 "hz" = (
 /obj/machinery/computer/card,
-/turf/simulated/floor/plasteel{
-	icon_state = "floor"
-	},
+/turf/simulated/floor/plasteel,
 /area/awaymission/centcomAway/general)
 "hA" = (
 /obj/structure/chair/office/dark,
-/turf/simulated/floor/plasteel{
-	icon_state = "floor"
-	},
+/turf/simulated/floor/plasteel,
 /area/awaymission/centcomAway/general)
 "hB" = (
 /obj/machinery/computer/crew,
-/turf/simulated/floor/plasteel{
-	icon_state = "floor"
-	},
+/turf/simulated/floor/plasteel,
 /area/awaymission/centcomAway/general)
 "hC" = (
 /obj/machinery/vending/cigarette,
@@ -2938,18 +2804,13 @@
 /area/awaymission/centcomAway/hangar)
 "hM" = (
 /obj/structure/cable{
-	icon_state = "1-2";
-	pixel_y = 0
-	},
-/turf/simulated/floor/plasteel{
-	icon_state = "floor"
+	icon_state = "1-2"
 	},
+/turf/simulated/floor/plasteel,
 /area/awaymission/centcomAway/general)
 "hN" = (
 /obj/machinery/computer/secure_data,
-/turf/simulated/floor/plasteel{
-	icon_state = "floor"
-	},
+/turf/simulated/floor/plasteel,
 /area/awaymission/centcomAway/general)
 "hO" = (
 /obj/structure/cable{
@@ -2963,14 +2824,11 @@
 /area/awaymission/centcomAway/general)
 "hP" = (
 /obj/machinery/computer/security,
-/turf/simulated/floor/plasteel{
-	icon_state = "floor"
-	},
+/turf/simulated/floor/plasteel,
 /area/awaymission/centcomAway/general)
 "hQ" = (
 /obj/structure/cable{
-	icon_state = "1-2";
-	pixel_y = 0
+	icon_state = "1-2"
 	},
 /obj/structure/cable{
 	icon_state = "1-4";
@@ -2984,9 +2842,7 @@
 "hR" = (
 /obj/structure/table/reinforced,
 /obj/item/taperecorder,
-/turf/simulated/floor/plasteel{
-	icon_state = "floor"
-	},
+/turf/simulated/floor/plasteel,
 /area/awaymission/centcomAway/general)
 "hS" = (
 /obj/structure/grille,
@@ -3059,8 +2915,7 @@
 /area/awaymission/centcomAway/general)
 "hZ" = (
 /obj/structure/cable{
-	icon_state = "1-2";
-	pixel_y = 0
+	icon_state = "1-2"
 	},
 /turf/simulated/floor/plasteel{
 	tag = "icon-blackcorner (EAST)";
@@ -3142,12 +2997,9 @@
 "ik" = (
 /obj/structure/cable{
 	icon_state = "4-8";
-	pixel_x = 0;
 	tag = ""
 	},
-/turf/simulated/floor/plasteel{
-	icon_state = "floor"
-	},
+/turf/simulated/floor/plasteel,
 /area/awaymission/centcomAway/general)
 "il" = (
 /obj/machinery/power/terminal,
@@ -3155,9 +3007,7 @@
 	d2 = 4;
 	icon_state = "0-4"
 	},
-/turf/simulated/floor/plasteel{
-	icon_state = "floor"
-	},
+/turf/simulated/floor/plasteel,
 /area/awaymission/centcomAway/general)
 "im" = (
 /obj/machinery/door/airlock/centcom,
@@ -3182,9 +3032,7 @@
 	icon_state = "1-2";
 	tag = ""
 	},
-/turf/simulated/floor/plasteel{
-	icon_state = "floor"
-	},
+/turf/simulated/floor/plasteel,
 /area/awaymission/centcomAway/general)
 "ip" = (
 /obj/structure/reagent_dispensers/watertank,
@@ -3198,12 +3046,9 @@
 	req_access = list(32)
 	},
 /obj/structure/cable{
-	icon_state = "1-2";
-	pixel_y = 0
-	},
-/turf/simulated/floor/plasteel{
-	icon_state = "floor"
+	icon_state = "1-2"
 	},
+/turf/simulated/floor/plasteel,
 /area/awaymission/centcomAway/general)
 "ir" = (
 /obj/machinery/power/apc/noalarm{
@@ -3221,12 +3066,9 @@
 	d2 = 2
 	},
 /obj/structure/cable{
-	icon_state = "1-2";
-	pixel_y = 0
-	},
-/turf/simulated/floor/plasteel{
-	icon_state = "floor"
+	icon_state = "1-2"
 	},
+/turf/simulated/floor/plasteel,
 /area/awaymission/centcomAway/general)
 "is" = (
 /obj/structure/closet,
@@ -3250,9 +3092,7 @@
 	dir = 1
 	},
 /obj/item/storage/box/monkeycubes,
-/turf/simulated/floor/plasteel{
-	icon_state = "floor"
-	},
+/turf/simulated/floor/plasteel,
 /area/awaymission/centcomAway/general)
 "iw" = (
 /obj/machinery/computer/scan_consolenew,
@@ -3276,7 +3116,6 @@
 /area/awaymission/centcomAway/courtroom)
 "iz" = (
 /obj/machinery/light{
-	icon_state = "tube1";
 	dir = 8
 	},
 /turf/simulated/floor/carpet,
@@ -3301,9 +3140,7 @@
 /area/awaymission/centcomAway/courtroom)
 "iD" = (
 /obj/machinery/door/airlock/centcom,
-/turf/simulated/floor/plasteel{
-	icon_state = "floor"
-	},
+/turf/simulated/floor/plasteel,
 /area/awaymission/centcomAway/general)
 "iE" = (
 /turf/simulated/floor/plasteel{
@@ -3359,16 +3196,13 @@
 	charge = 5e+006;
 	input_level = 200000;
 	inputting = 0;
-	output_level = 100000;
-	outputting = 1
+	output_level = 100000
 	},
 /obj/structure/cable{
 	d2 = 4;
 	icon_state = "0-4"
 	},
-/turf/simulated/floor/plasteel{
-	icon_state = "floor"
-	},
+/turf/simulated/floor/plasteel,
 /area/awaymission/centcomAway/general)
 "iM" = (
 /turf/simulated/floor/mech_bay_recharge_floor,
@@ -3396,7 +3230,6 @@
 "iQ" = (
 /obj/structure/cable{
 	icon_state = "4-8";
-	pixel_x = 0;
 	tag = ""
 	},
 /turf/simulated/floor/plasteel{
@@ -3429,9 +3262,7 @@
 	icon_state = "1-4";
 	tag = "90Curve"
 	},
-/turf/simulated/floor/plasteel{
-	icon_state = "floor"
-	},
+/turf/simulated/floor/plasteel,
 /area/awaymission/centcomAway/general)
 "iV" = (
 /obj/machinery/light{
@@ -3440,7 +3271,6 @@
 	},
 /obj/structure/cable{
 	icon_state = "4-8";
-	pixel_x = 0;
 	tag = ""
 	},
 /turf/simulated/floor/plasteel{
@@ -3458,7 +3288,6 @@
 "iX" = (
 /obj/structure/cable{
 	icon_state = "4-8";
-	pixel_x = 0;
 	tag = ""
 	},
 /turf/simulated/floor/plasteel{
@@ -3469,7 +3298,6 @@
 "iY" = (
 /obj/structure/cable{
 	icon_state = "4-8";
-	pixel_x = 0;
 	tag = ""
 	},
 /turf/simulated/floor/plasteel{
@@ -3504,12 +3332,9 @@
 	},
 /obj/structure/cable{
 	icon_state = "4-8";
-	pixel_x = 0;
 	tag = ""
 	},
-/turf/simulated/floor/plasteel{
-	icon_state = "floor"
-	},
+/turf/simulated/floor/plasteel,
 /area/awaymission/centcomAway/general)
 "jd" = (
 /obj/structure/sign/redcross{
@@ -3524,7 +3349,6 @@
 	},
 /obj/structure/cable{
 	icon_state = "4-8";
-	pixel_x = 0;
 	tag = ""
 	},
 /turf/simulated/floor/plasteel{
@@ -3536,7 +3360,6 @@
 "jf" = (
 /obj/structure/cable{
 	icon_state = "4-8";
-	pixel_x = 0;
 	tag = ""
 	},
 /turf/simulated/floor/plasteel{
@@ -3547,7 +3370,6 @@
 /area/awaymission/centcomAway/general)
 "jg" = (
 /obj/machinery/light{
-	icon_state = "tube1";
 	dir = 8
 	},
 /turf/simulated/floor/plasteel{
@@ -3570,7 +3392,6 @@
 	dir = 8
 	},
 /obj/machinery/light{
-	icon_state = "tube1";
 	dir = 4
 	},
 /turf/simulated/floor/wood,
@@ -3617,14 +3438,12 @@
 	dir = 1
 	},
 /obj/machinery/light{
-	icon_state = "tube1";
 	dir = 8
 	},
 /turf/simulated/floor/wood,
 /area/awaymission/centcomAway/courtroom)
 "jo" = (
 /obj/machinery/light{
-	icon_state = "tube1";
 	dir = 8
 	},
 /turf/simulated/floor/plasteel{
@@ -3654,7 +3473,6 @@
 "jr" = (
 /obj/structure/cable{
 	icon_state = "4-8";
-	pixel_x = 0;
 	tag = ""
 	},
 /turf/simulated/wall/r_wall,
@@ -3665,20 +3483,16 @@
 	},
 /obj/structure/cable{
 	icon_state = "4-8";
-	pixel_x = 0;
 	tag = ""
 	},
 /turf/simulated/floor/plating,
 /area/awaymission/centcomAway/maint)
 "jt" = (
 /obj/structure/cable{
-	icon_state = "1-2";
-	pixel_y = 0
+	icon_state = "1-2"
 	},
 /obj/effect/decal/warning_stripes/southwestcorner,
-/turf/simulated/floor/plasteel{
-	icon_state = "floor"
-	},
+/turf/simulated/floor/plasteel,
 /area/awaymission/centcomAway/general)
 "ju" = (
 /turf/simulated/floor/plasteel{
@@ -3694,13 +3508,10 @@
 /area/awaymission/centcomAway/general)
 "jw" = (
 /obj/structure/cable{
-	icon_state = "1-2";
-	pixel_y = 0
+	icon_state = "1-2"
 	},
 /obj/effect/decal/warning_stripes/southeastcorner,
-/turf/simulated/floor/plasteel{
-	icon_state = "floor"
-	},
+/turf/simulated/floor/plasteel,
 /area/awaymission/centcomAway/general)
 "jx" = (
 /obj/structure/table/reinforced,
@@ -3713,7 +3524,6 @@
 	dir = 4
 	},
 /obj/machinery/light{
-	icon_state = "tube1";
 	dir = 8
 	},
 /turf/simulated/floor/carpet,
@@ -3729,9 +3539,7 @@
 	icon_state = "1-8"
 	},
 /obj/effect/decal/warning_stripes/west,
-/turf/simulated/floor/plasteel{
-	icon_state = "floor"
-	},
+/turf/simulated/floor/plasteel,
 /area/awaymission/centcomAway/general)
 "jB" = (
 /obj/structure/cable{
@@ -3743,9 +3551,7 @@
 	tag = ""
 	},
 /obj/effect/decal/warning_stripes/east,
-/turf/simulated/floor/plasteel{
-	icon_state = "floor"
-	},
+/turf/simulated/floor/plasteel,
 /area/awaymission/centcomAway/general)
 "jC" = (
 /turf/simulated/floor/plasteel{
@@ -3756,23 +3562,17 @@
 "jD" = (
 /obj/machinery/photocopier,
 /obj/item/paper/ccaMemo,
-/turf/simulated/floor/plasteel{
-	icon_state = "floor"
-	},
+/turf/simulated/floor/plasteel,
 /area/awaymission/centcomAway/general)
 "jE" = (
 /obj/structure/table/reinforced,
 /obj/item/hand_labeler,
-/turf/simulated/floor/plasteel{
-	icon_state = "floor"
-	},
+/turf/simulated/floor/plasteel,
 /area/awaymission/centcomAway/general)
 "jF" = (
 /obj/structure/table/reinforced,
 /obj/item/paper_bin,
-/turf/simulated/floor/plasteel{
-	icon_state = "floor"
-	},
+/turf/simulated/floor/plasteel,
 /area/awaymission/centcomAway/general)
 "jG" = (
 /turf/simulated/floor/plasteel{
@@ -3831,7 +3631,6 @@
 /area/awaymission/centcomAway/courtroom)
 "jO" = (
 /obj/machinery/crema_switch{
-	pixel_x = 0;
 	pixel_y = 25
 	},
 /turf/simulated/floor/plasteel{
@@ -3862,7 +3661,6 @@
 /area/awaymission/centcomAway/general)
 "jS" = (
 /obj/machinery/light{
-	icon_state = "tube1";
 	dir = 8
 	},
 /turf/simulated/floor/plasteel{
@@ -3888,12 +3686,10 @@
 /area/awaymission/centcomAway/cafe)
 "jV" = (
 /obj/machinery/light{
-	icon_state = "tube1";
 	dir = 4
 	},
 /obj/structure/cable{
-	icon_state = "1-2";
-	pixel_y = 0
+	icon_state = "1-2"
 	},
 /turf/simulated/floor/plasteel{
 	tag = "icon-blackcorner";
@@ -3908,7 +3704,6 @@
 /area/awaymission/centcomAway/general)
 "jX" = (
 /obj/machinery/light{
-	icon_state = "tube1";
 	dir = 4
 	},
 /turf/simulated/floor/wood,
@@ -3916,7 +3711,6 @@
 "jY" = (
 /obj/structure/table,
 /obj/machinery/light{
-	icon_state = "tube1";
 	dir = 4
 	},
 /obj/effect/decal/warning_stripes/north,
@@ -3927,8 +3721,7 @@
 	icon_state = "dark"
 	},
 /turf/simulated/wall/shuttle{
-	icon_state = "swall_f10";
-	dir = 2
+	icon_state = "swall_f10"
 	},
 /area/awaymission/centcomAway/hangar)
 "ka" = (
@@ -3974,13 +3767,10 @@
 "kf" = (
 /obj/machinery/door/window/northright,
 /obj/machinery/door/window/southleft,
-/turf/simulated/floor/plasteel{
-	icon_state = "floor"
-	},
+/turf/simulated/floor/plasteel,
 /area/awaymission/centcomAway/general)
 "kg" = (
 /obj/machinery/light{
-	icon_state = "tube1";
 	dir = 8
 	},
 /turf/simulated/floor/plasteel{
@@ -3990,23 +3780,17 @@
 "kh" = (
 /obj/structure/table/reinforced,
 /obj/item/folder/red,
-/turf/simulated/floor/plasteel{
-	icon_state = "floor"
-	},
+/turf/simulated/floor/plasteel,
 /area/awaymission/centcomAway/general)
 "ki" = (
 /obj/structure/table/reinforced,
 /obj/item/storage/box/PDAs,
-/turf/simulated/floor/plasteel{
-	icon_state = "floor"
-	},
+/turf/simulated/floor/plasteel,
 /area/awaymission/centcomAway/general)
 "kj" = (
 /obj/structure/table/reinforced,
 /obj/item/folder/blue,
-/turf/simulated/floor/plasteel{
-	icon_state = "floor"
-	},
+/turf/simulated/floor/plasteel,
 /area/awaymission/centcomAway/general)
 "kk" = (
 /obj/machinery/door/airlock/centcom{
@@ -4020,17 +3804,14 @@
 /area/awaymission/centcomAway/courtroom)
 "kl" = (
 /obj/effect/decal/warning_stripes/northwestcorner,
-/turf/simulated/floor/plasteel{
-	icon_state = "floor"
-	},
+/turf/simulated/floor/plasteel,
 /area/awaymission/centcomAway/general)
 "km" = (
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
 	},
 /turf/simulated/wall/shuttle{
-	icon_state = "swall_f9";
-	dir = 2
+	icon_state = "swall_f9"
 	},
 /area/awaymission/centcomAway/hangar)
 "kn" = (
@@ -4043,7 +3824,6 @@
 /area/awaymission/centcomAway/hangar)
 "ko" = (
 /obj/structure/sink{
-	icon_state = "sink";
 	dir = 8;
 	pixel_x = -12;
 	pixel_y = 2
@@ -4109,9 +3889,7 @@
 /area/awaymission/centcomAway/hangar)
 "ku" = (
 /obj/structure/chair,
-/turf/simulated/floor/plasteel{
-	icon_state = "floor"
-	},
+/turf/simulated/floor/plasteel,
 /area/awaymission/centcomAway/general)
 "kv" = (
 /obj/structure/table/reinforced,
@@ -4134,13 +3912,10 @@
 /area/awaymission/centcomAway/general)
 "ky" = (
 /obj/machinery/door/airlock/centcom,
-/turf/simulated/floor/plasteel{
-	icon_state = "floor"
-	},
+/turf/simulated/floor/plasteel,
 /area/awaymission/centcomAway/hangar)
 "kz" = (
 /obj/machinery/light{
-	icon_state = "tube1";
 	dir = 4
 	},
 /turf/simulated/floor/plasteel{
@@ -4149,13 +3924,10 @@
 /area/awaymission/centcomAway/courtroom)
 "kA" = (
 /obj/structure/cable{
-	icon_state = "1-2";
-	pixel_y = 0
+	icon_state = "1-2"
 	},
 /obj/effect/decal/warning_stripes/northeastcorner,
-/turf/simulated/floor/plasteel{
-	icon_state = "floor"
-	},
+/turf/simulated/floor/plasteel,
 /area/awaymission/centcomAway/general)
 "kB" = (
 /obj/structure/rack,
@@ -4190,23 +3962,13 @@
 /obj/structure/chair/comfy/beige{
 	dir = 1
 	},
-/turf/simulated/floor/plasteel{
-	icon_state = "floor"
-	},
-/area/awaymission/centcomAway/general)
-"kG" = (
-/turf/simulated/floor/plasteel{
-	dir = 2;
-	icon_state = "greencorner"
-	},
+/turf/simulated/floor/plasteel,
 /area/awaymission/centcomAway/general)
 "kH" = (
 /obj/structure/chair{
 	dir = 1
 	},
-/turf/simulated/floor/plasteel{
-	icon_state = "floor"
-	},
+/turf/simulated/floor/plasteel,
 /area/awaymission/centcomAway/general)
 "kI" = (
 /obj/machinery/gateway{
@@ -4253,12 +4015,6 @@
 	},
 /turf/simulated/floor/plating,
 /area/awaymission/centcomAway/hangar)
-"kP" = (
-/turf/simulated/floor/plasteel{
-	dir = 2;
-	icon_state = "green"
-	},
-/area/awaymission/centcomAway/general)
 "kQ" = (
 /obj/machinery/gateway{
 	dir = 10
@@ -4278,7 +4034,6 @@
 "kT" = (
 /obj/structure/cable{
 	icon_state = "4-8";
-	pixel_x = 0;
 	tag = ""
 	},
 /turf/simulated/floor/plasteel{
@@ -4348,7 +4103,6 @@
 	tag = ""
 	},
 /turf/simulated/floor/plasteel{
-	dir = 2;
 	icon_state = "green"
 	},
 /area/awaymission/centcomAway/general)
@@ -4356,7 +4110,6 @@
 /obj/machinery/light,
 /obj/structure/cable{
 	icon_state = "4-8";
-	pixel_x = 0;
 	tag = ""
 	},
 /turf/simulated/floor/plasteel{
@@ -4367,7 +4120,6 @@
 "lb" = (
 /obj/structure/cable{
 	icon_state = "4-8";
-	pixel_x = 0;
 	tag = ""
 	},
 /turf/simulated/floor/plasteel{
@@ -4388,15 +4140,11 @@
 /obj/structure/cable{
 	icon_state = "1-8"
 	},
-/turf/simulated/floor/plasteel{
-	icon_state = "floor"
-	},
+/turf/simulated/floor/plasteel,
 /area/awaymission/centcomAway/general)
 "le" = (
 /obj/structure/table/reinforced,
-/turf/simulated/floor/plasteel{
-	icon_state = "floor"
-	},
+/turf/simulated/floor/plasteel,
 /area/awaymission/centcomAway/general)
 "lf" = (
 /obj/structure/table/wood,
@@ -4424,8 +4172,7 @@
 /area/awaymission/centcomAway/general)
 "li" = (
 /obj/structure/cable{
-	icon_state = "1-2";
-	pixel_y = 0
+	icon_state = "1-2"
 	},
 /turf/simulated/wall/r_wall,
 /area/awaymission/centcomAway/general)
@@ -4443,17 +4190,13 @@
 /obj/structure/chair{
 	dir = 4
 	},
-/turf/simulated/floor/plasteel{
-	icon_state = "floor"
-	},
+/turf/simulated/floor/plasteel,
 /area/awaymission/centcomAway/general)
 "ll" = (
 /obj/structure/chair{
 	dir = 8
 	},
-/turf/simulated/floor/plasteel{
-	icon_state = "floor"
-	},
+/turf/simulated/floor/plasteel,
 /area/awaymission/centcomAway/general)
 "lm" = (
 /mob/living/simple_animal/hostile/russian/ranged{
@@ -4511,8 +4254,7 @@
 	},
 /turf/simulated/floor/plating,
 /turf/simulated/wall/shuttle{
-	icon_state = "swall_f6";
-	dir = 2
+	icon_state = "swall_f6"
 	},
 /area/awaymission/centcomAway/hangar)
 "lt" = (
@@ -4521,8 +4263,7 @@
 	},
 /turf/simulated/floor/plating,
 /turf/simulated/wall/shuttle{
-	icon_state = "swall_f5";
-	dir = 2
+	icon_state = "swall_f5"
 	},
 /area/awaymission/centcomAway/hangar)
 "lu" = (
@@ -4604,9 +4345,7 @@
 	name = "XCC Main Access Shutters"
 	},
 /obj/effect/decal/warning_stripes/yellow,
-/turf/simulated/floor/plasteel{
-	icon_state = "floor"
-	},
+/turf/simulated/floor/plasteel,
 /area/awaymission/centcomAway/general)
 "lF" = (
 /obj/machinery/door/airlock/external,
@@ -4646,8 +4385,7 @@
 	dir = 4
 	},
 /obj/structure/cable{
-	icon_state = "1-2";
-	pixel_y = 0
+	icon_state = "1-2"
 	},
 /turf/simulated/floor/plating,
 /area/awaymission/centcomAway/general)
@@ -4743,8 +4481,7 @@
 /area/awaymission/centcomAway/general)
 "lT" = (
 /obj/structure/cable{
-	icon_state = "1-2";
-	pixel_y = 0
+	icon_state = "1-2"
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "greencorner";
@@ -4947,9 +4684,7 @@
 	},
 /area/awaymission/centcomAway/general)
 "mr" = (
-/turf/simulated/floor/plasteel{
-	icon_state = "floor"
-	},
+/turf/simulated/floor/plasteel,
 /area/awaymission/centcomAway/thunderdome)
 "ms" = (
 /obj/structure/table/reinforced,
@@ -4984,11 +4719,9 @@
 /area/awaymission/centcomAway/general)
 "mw" = (
 /obj/structure/cable{
-	icon_state = "1-2";
-	pixel_y = 0
+	icon_state = "1-2"
 	},
 /turf/simulated/floor/plasteel{
-	dir = 2;
 	icon_state = "greencorner"
 	},
 /area/awaymission/centcomAway/general)
@@ -5035,9 +4768,7 @@
 /area/awaymission/centcomAway/general)
 "mE" = (
 /obj/machinery/igniter/on,
-/turf/simulated/floor/plasteel{
-	icon_state = "floor"
-	},
+/turf/simulated/floor/plasteel,
 /area/awaymission/centcomAway/thunderdome)
 "mF" = (
 /obj/machinery/light,
@@ -5110,8 +4841,7 @@
 	dir = 8
 	},
 /obj/structure/cable{
-	icon_state = "1-2";
-	pixel_y = 0
+	icon_state = "1-2"
 	},
 /turf/simulated/floor/plating,
 /area/awaymission/centcomAway/general)
@@ -5235,18 +4965,14 @@
 	name = "XCC Main Access Shutters"
 	},
 /obj/structure/cable{
-	icon_state = "1-2";
-	pixel_y = 0
+	icon_state = "1-2"
 	},
 /obj/effect/decal/warning_stripes/yellow,
-/turf/simulated/floor/plasteel{
-	icon_state = "floor"
-	},
+/turf/simulated/floor/plasteel,
 /area/awaymission/centcomAway/general)
 "nd" = (
 /obj/machinery/vending/coffee,
 /obj/machinery/light{
-	icon_state = "tube1";
 	dir = 8
 	},
 /turf/simulated/floor/plasteel{
@@ -5257,7 +4983,6 @@
 "ne" = (
 /obj/machinery/vending/cigarette,
 /obj/machinery/light{
-	icon_state = "tube1";
 	dir = 4
 	},
 /turf/simulated/floor/plasteel{
@@ -5268,9 +4993,7 @@
 "nf" = (
 /obj/structure/table,
 /obj/item/paper/pamphlet/ccaInfo,
-/turf/simulated/floor/plasteel{
-	icon_state = "floor"
-	},
+/turf/simulated/floor/plasteel,
 /area/awaymission/centcomAway/general)
 "ng" = (
 /obj/machinery/door/poddoor{
@@ -5286,7 +5009,6 @@
 /area/awaymission/centcomAway/hangar)
 "ni" = (
 /obj/machinery/light{
-	icon_state = "tube1";
 	dir = 4
 	},
 /turf/simulated/floor/plasteel{
@@ -5305,7 +5027,6 @@
 "nk" = (
 /obj/structure/flora/ausbushes,
 /obj/machinery/light{
-	icon_state = "tube1";
 	dir = 8
 	},
 /turf/simulated/floor/plasteel{
@@ -5317,7 +5038,6 @@
 "nl" = (
 /obj/structure/flora/ausbushes,
 /obj/machinery/light{
-	icon_state = "tube1";
 	dir = 4
 	},
 /turf/simulated/floor/plasteel{
@@ -5336,28 +5056,21 @@
 /area/awaymission/centcomAway/general)
 "nn" = (
 /obj/machinery/light{
-	icon_state = "tube1";
 	dir = 8
 	},
-/turf/simulated/floor/plasteel{
-	icon_state = "floor"
-	},
+/turf/simulated/floor/plasteel,
 /area/awaymission/centcomAway/general)
 "no" = (
 /obj/machinery/light{
-	icon_state = "tube1";
 	dir = 4
 	},
-/turf/simulated/floor/plasteel{
-	icon_state = "floor"
-	},
+/turf/simulated/floor/plasteel,
 /area/awaymission/centcomAway/general)
 "np" = (
 /obj/structure/chair{
 	dir = 4
 	},
 /obj/machinery/light{
-	icon_state = "tube1";
 	dir = 8
 	},
 /turf/simulated/floor/plasteel{
@@ -5370,7 +5083,6 @@
 	dir = 8
 	},
 /obj/machinery/light{
-	icon_state = "tube1";
 	dir = 4
 	},
 /turf/simulated/floor/plasteel{
@@ -5398,8 +5110,7 @@
 /area/awaymission/centcomAway/hangar)
 "nt" = (
 /obj/structure/cable{
-	icon_state = "1-2";
-	pixel_y = 0
+	icon_state = "1-2"
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "green"
@@ -5439,15 +5150,11 @@
 	dir = 1;
 	in_use = 1
 	},
-/turf/simulated/floor/plasteel{
-	icon_state = "floor"
-	},
+/turf/simulated/floor/plasteel,
 /area/awaymission/centcomAway/general)
 "ny" = (
 /obj/structure/chair/comfy/teal,
-/turf/simulated/floor/plasteel{
-	icon_state = "floor"
-	},
+/turf/simulated/floor/plasteel,
 /area/awaymission/centcomAway/thunderdome)
 "nz" = (
 /turf/simulated/floor/plasteel{
@@ -5457,8 +5164,7 @@
 /area/awaymission/centcomAway/general)
 "nA" = (
 /obj/structure/cable{
-	icon_state = "1-2";
-	pixel_y = 0
+	icon_state = "1-2"
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "neutral";
@@ -5480,7 +5186,6 @@
 "nD" = (
 /obj/machinery/photocopier,
 /obj/machinery/light{
-	icon_state = "tube1";
 	dir = 8
 	},
 /turf/simulated/floor/plasteel{
@@ -5497,12 +5202,9 @@
 /area/awaymission/centcomAway/hangar)
 "nF" = (
 /obj/machinery/door/window/northright{
-	icon_state = "right";
 	dir = 2
 	},
-/turf/simulated/floor/plasteel{
-	icon_state = "floor"
-	},
+/turf/simulated/floor/plasteel,
 /area/awaymission/centcomAway/general)
 "nG" = (
 /obj/structure/table/reinforced,
@@ -5535,15 +5237,13 @@
 /area/awaymission/centcomAway/general)
 "nK" = (
 /turf/simulated/floor/plasteel{
-	icon_state = "red";
-	dir = 2
+	icon_state = "red"
 	},
 /area/awaymission/centcomAway/general)
 "nL" = (
 /obj/machinery/light,
 /turf/simulated/floor/plasteel{
-	icon_state = "red";
-	dir = 2
+	icon_state = "red"
 	},
 /area/awaymission/centcomAway/general)
 "nM" = (
@@ -5580,8 +5280,7 @@
 "nQ" = (
 /obj/machinery/door/airlock/external,
 /obj/structure/cable{
-	icon_state = "1-2";
-	pixel_y = 0
+	icon_state = "1-2"
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "green";
@@ -5604,8 +5303,7 @@
 "nT" = (
 /obj/machinery/door/airlock/external,
 /obj/structure/cable{
-	icon_state = "1-2";
-	pixel_y = 0
+	icon_state = "1-2"
 	},
 /turf/simulated/floor/plating,
 /area/awaymission/centcomAway/general)
@@ -5631,16 +5329,13 @@
 /area/awaymission/centcomAway/thunderdome)
 "nX" = (
 /obj/structure/shuttle/engine/propulsion{
-	icon_state = "propulsion";
 	dir = 1
 	},
 /turf/simulated/floor/shuttle/plating,
 /area/awaymission/centcomAway/thunderdome)
 "nY" = (
 /obj/structure/computerframe,
-/turf/simulated/floor/plasteel{
-	icon_state = "floor"
-	},
+/turf/simulated/floor/plasteel,
 /area/awaymission/centcomAway/general)
 "nZ" = (
 /obj/machinery/light,
@@ -5652,14 +5347,11 @@
 /mob/living/simple_animal/hostile/russian/ranged{
 	loot = list(/obj/effect/mob_spawn/human/corpse/russian/ranged)
 	},
-/turf/simulated/floor/plasteel{
-	icon_state = "floor"
-	},
+/turf/simulated/floor/plasteel,
 /area/awaymission/centcomAway/general)
 "ob" = (
 /obj/structure/cable{
-	icon_state = "1-2";
-	pixel_y = 0
+	icon_state = "1-2"
 	},
 /turf/simulated/floor/plating,
 /area/awaymission/centcomAway/general)
@@ -5679,9 +5371,7 @@
 /area/awaymission/centcomAway/hangar)
 "oe" = (
 /obj/machinery/light,
-/turf/simulated/floor/plasteel{
-	icon_state = "floor"
-	},
+/turf/simulated/floor/plasteel,
 /area/awaymission/centcomAway/general)
 "of" = (
 /obj/item/clipboard,
@@ -5712,8 +5402,7 @@
 "oi" = (
 /obj/machinery/door/airlock/external,
 /obj/structure/cable{
-	icon_state = "1-2";
-	pixel_y = 0
+	icon_state = "1-2"
 	},
 /turf/simulated/floor/plating,
 /area/awaymission/centcomAway/thunderdome)
@@ -6037,7 +5726,6 @@
 /area/awaymission/centcomAway/thunderdome)
 "oU" = (
 /obj/machinery/light{
-	icon_state = "tube1";
 	dir = 4
 	},
 /turf/simulated/floor/plasteel{
@@ -6119,7 +5807,6 @@
 /area/awaymission/centcomAway/thunderdome)
 "pg" = (
 /obj/structure/sink{
-	icon_state = "sink";
 	dir = 8;
 	pixel_x = -12;
 	pixel_y = 2
@@ -6179,7 +5866,6 @@
 /area/awaymission/centcomAway/thunderdome)
 "pm" = (
 /obj/machinery/light{
-	icon_state = "tube1";
 	dir = 8
 	},
 /turf/simulated/floor/plasteel{
@@ -6190,7 +5876,6 @@
 /area/awaymission/centcomAway/thunderdome)
 "pn" = (
 /obj/machinery/light{
-	icon_state = "tube1";
 	dir = 4
 	},
 /turf/simulated/floor/plasteel{
@@ -6199,7 +5884,6 @@
 /area/awaymission/centcomAway/thunderdome)
 "po" = (
 /obj/machinery/light{
-	icon_state = "tube1";
 	dir = 8
 	},
 /turf/simulated/floor/plasteel{
@@ -6208,7 +5892,6 @@
 /area/awaymission/centcomAway/thunderdome)
 "pp" = (
 /turf/simulated/floor/plasteel{
-	dir = 2;
 	icon_state = "redcorner"
 	},
 /area/awaymission/centcomAway/thunderdome)
@@ -6224,9 +5907,7 @@
 	},
 /obj/structure/sink{
 	dir = 4;
-	icon_state = "sink";
-	pixel_x = 11;
-	pixel_y = 0
+	pixel_x = 11
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "white"
@@ -6240,12 +5921,9 @@
 /area/awaymission/centcomAway/thunderdome)
 "pt" = (
 /obj/machinery/light{
-	icon_state = "tube1";
 	dir = 4
 	},
-/turf/simulated/floor/plasteel{
-	icon_state = "floor"
-	},
+/turf/simulated/floor/plasteel,
 /area/awaymission/centcomAway/thunderdome)
 "pu" = (
 /turf/simulated/floor/plasteel{
@@ -6255,12 +5933,9 @@
 /area/awaymission/centcomAway/thunderdome)
 "pv" = (
 /obj/machinery/light{
-	icon_state = "tube1";
 	dir = 8
 	},
-/turf/simulated/floor/plasteel{
-	icon_state = "floor"
-	},
+/turf/simulated/floor/plasteel,
 /area/awaymission/centcomAway/thunderdome)
 "pw" = (
 /turf/simulated/floor/plasteel{
@@ -6288,7 +5963,6 @@
 /area/awaymission/centcomAway/thunderdome)
 "pA" = (
 /turf/simulated/floor/plasteel{
-	dir = 2;
 	icon_state = "greencorner"
 	},
 /area/awaymission/centcomAway/thunderdome)
@@ -6334,9 +6008,7 @@
 	name = "XCC Checkpoint 1 Shutters"
 	},
 /obj/effect/decal/warning_stripes/yellow,
-/turf/simulated/floor/plasteel{
-	icon_state = "floor"
-	},
+/turf/simulated/floor/plasteel,
 /area/awaymission/centcomAway/general)
 "pH" = (
 /obj/machinery/portable_atmospherics/scrubber/huge,
@@ -6353,7 +6025,6 @@
 /area/awaymission/centcomAway/thunderdome)
 "pJ" = (
 /turf/simulated/floor/plasteel{
-	dir = 2;
 	icon_state = "green"
 	},
 /area/awaymission/centcomAway/thunderdome)
@@ -6551,9 +6222,7 @@
 	name = "XCC Thunderdome Melee!"
 	},
 /obj/structure/table/reinforced,
-/turf/simulated/floor/plasteel{
-	icon_state = "floor"
-	},
+/turf/simulated/floor/plasteel,
 /area/awaymission/centcomAway/thunderdome)
 "qh" = (
 /obj/machinery/door_control{
@@ -6561,9 +6230,7 @@
 	name = "XCC Thunderdome Guns!"
 	},
 /obj/structure/table/reinforced,
-/turf/simulated/floor/plasteel{
-	icon_state = "floor"
-	},
+/turf/simulated/floor/plasteel,
 /area/awaymission/centcomAway/thunderdome)
 "qi" = (
 /obj/machinery/door_control{
@@ -6571,9 +6238,7 @@
 	name = "XCC Thunderdome Go!"
 	},
 /obj/structure/table/reinforced,
-/turf/simulated/floor/plasteel{
-	icon_state = "floor"
-	},
+/turf/simulated/floor/plasteel,
 /area/awaymission/centcomAway/thunderdome)
 "qj" = (
 /obj/structure/rack,
@@ -6588,9 +6253,7 @@
 	name = "XCC Checkpoint 2 Shutters"
 	},
 /obj/effect/decal/warning_stripes/yellow,
-/turf/simulated/floor/plasteel{
-	icon_state = "floor"
-	},
+/turf/simulated/floor/plasteel,
 /area/awaymission/centcomAway/general)
 "ql" = (
 /obj/machinery/door_control{
@@ -6605,9 +6268,7 @@
 /area/awaymission/centcomAway/hangar)
 "qm" = (
 /obj/effect/decal/warning_stripes/yellow,
-/turf/simulated/floor/plasteel{
-	icon_state = "floor"
-	},
+/turf/simulated/floor/plasteel,
 /area/awaymission/centcomAway/general)
 "qn" = (
 /obj/machinery/door/poddoor{
@@ -6653,9 +6314,7 @@
 /obj/machinery/tcomms/relay/ruskie{
 	network_id = "XCC-P5831-RELAY"
 	},
-/turf/simulated/floor/plasteel{
-	icon_state = "floor"
-	},
+/turf/simulated/floor/plasteel,
 /area/awaymission/centcomAway/general)
 
 (1,1,1) = {"
@@ -15301,7 +14960,7 @@ eO
 kh
 fH
 kw
-kG
+gn
 eF
 eF
 eF
@@ -15431,7 +15090,7 @@ hA
 hN
 fH
 kw
-kP
+go
 eF
 lE
 fg
diff --git a/_maps/map_files/RandomZLevels/example.dmm b/_maps/map_files/RandomZLevels/example.dmm
index 62c87f9002d..64a26aeaf1c 100644
--- a/_maps/map_files/RandomZLevels/example.dmm
+++ b/_maps/map_files/RandomZLevels/example.dmm
@@ -39,8 +39,6 @@
 "ag" = (
 /obj/machinery/power/apc/noalarm{
 	dir = 1;
-	name = "area power controller";
-	pixel_x = 0;
 	pixel_y = 24
 	},
 /obj/structure/cable{
@@ -90,7 +88,6 @@
 	},
 /obj/structure/cable{
 	icon_state = "4-8";
-	pixel_x = 0;
 	tag = ""
 	},
 /turf/simulated/floor/plasteel,
@@ -155,7 +152,6 @@
 	},
 /obj/structure/cable{
 	icon_state = "4-8";
-	pixel_x = 0;
 	tag = ""
 	},
 /turf/simulated/floor/plasteel,
@@ -181,7 +177,6 @@
 /obj/machinery/light/small,
 /obj/structure/cable{
 	icon_state = "4-8";
-	pixel_x = 0;
 	tag = ""
 	},
 /turf/simulated/floor/plating,
@@ -189,7 +184,6 @@
 "az" = (
 /obj/structure/cable{
 	icon_state = "4-8";
-	pixel_x = 0;
 	tag = ""
 	},
 /turf/simulated/floor/plasteel,
@@ -204,7 +198,6 @@
 /area/awaymission/example)
 "aB" = (
 /obj/machinery/light{
-	icon_state = "tube1";
 	dir = 8
 	},
 /obj/structure/table,
@@ -213,8 +206,7 @@
 /area/awaymission/example)
 "aC" = (
 /obj/machinery/light{
-	dir = 4;
-	icon_state = "tube1"
+	dir = 4
 	},
 /turf/simulated/floor/plasteel,
 /area/awaymission/example)
@@ -292,8 +284,7 @@
 /area/awaymission/example)
 "aR" = (
 /turf/simulated/floor/plasteel{
-	icon_state = "whitehall";
-	dir = 2
+	icon_state = "whitehall"
 	},
 /area/awaymission/example)
 "aS" = (
@@ -438,7 +429,6 @@
 /area/awaymission/example)
 "bj" = (
 /obj/machinery/light{
-	icon_state = "tube1";
 	dir = 8
 	},
 /turf/simulated/floor/plasteel,
@@ -588,7 +578,6 @@
 /area/awaymission/example)
 "bC" = (
 /obj/structure/sink{
-	icon_state = "sink";
 	dir = 8;
 	pixel_x = -12;
 	pixel_y = 2
@@ -647,7 +636,6 @@
 "bJ" = (
 /obj/structure/chair/wood{
 	tag = "icon-wooden_chair (EAST)";
-	icon_state = "wooden_chair";
 	dir = 4
 	},
 /turf/simulated/floor/plasteel{
@@ -657,7 +645,6 @@
 "bK" = (
 /obj/structure/chair/wood{
 	tag = "icon-wooden_chair (WEST)";
-	icon_state = "wooden_chair";
 	dir = 8
 	},
 /turf/simulated/floor/plasteel{
@@ -683,7 +670,6 @@
 "bN" = (
 /obj/structure/chair/wood{
 	tag = "icon-wooden_chair (NORTH)";
-	icon_state = "wooden_chair";
 	dir = 1
 	},
 /turf/simulated/floor/plasteel{
@@ -785,7 +771,6 @@
 /obj/item/screwdriver,
 /obj/item/hand_labeler,
 /obj/machinery/light{
-	icon_state = "tube1";
 	dir = 8
 	},
 /turf/simulated/floor/plasteel,
@@ -856,7 +841,6 @@
 /obj/effect/landmark/awaystart,
 /obj/machinery/light_construct/small{
 	tag = "icon-bulb-construct-stage1 (WEST)";
-	icon_state = "bulb-construct-stage1";
 	dir = 8
 	},
 /turf/simulated/floor/plasteel,
diff --git a/_maps/map_files/RandomZLevels/moonoutpost19.dmm b/_maps/map_files/RandomZLevels/moonoutpost19.dmm
index aa4fab68ec1..991157caa41 100644
--- a/_maps/map_files/RandomZLevels/moonoutpost19.dmm
+++ b/_maps/map_files/RandomZLevels/moonoutpost19.dmm
@@ -7100,7 +7100,6 @@
 /area/moonoutpost19/mo19arrivals)
 "oL" = (
 /obj/structure/closet/secure_closet{
-	icon_state = "secure";
 	locked = 0;
 	name = "kitchen Cabinet";
 	req_access = list(271)
diff --git a/_maps/map_files/RandomZLevels/stationCollision.dmm b/_maps/map_files/RandomZLevels/stationCollision.dmm
index a6433208bff..1fa06f86925 100644
--- a/_maps/map_files/RandomZLevels/stationCollision.dmm
+++ b/_maps/map_files/RandomZLevels/stationCollision.dmm
@@ -85,16 +85,13 @@
 /turf/simulated/floor/plasteel,
 /area/awaymission/northblock)
 "au" = (
-/obj/structure/computerframe{
-	anchored = 1
-	},
+/obj/structure/computerframe,
 /turf/simulated/floor/plasteel,
 /area/awaymission/northblock)
 "av" = (
 /obj/structure/window/reinforced/tinted,
 /obj/structure/window/reinforced/tinted{
 	dir = 8;
-	icon_state = "twindow";
 	tag = ""
 	},
 /obj/structure/table,
@@ -131,7 +128,6 @@
 /obj/structure/window/reinforced/tinted,
 /obj/structure/window/reinforced/tinted{
 	dir = 4;
-	icon_state = "twindow";
 	tag = ""
 	},
 /obj/structure/closet/secure_closet/engineering_electrical,
@@ -191,7 +187,6 @@
 "aP" = (
 /obj/structure/shuttle/engine/heater{
 	tag = "icon-heater (WEST)";
-	icon_state = "heater";
 	dir = 8
 	},
 /turf/simulated/floor/plating/airless,
@@ -285,8 +280,7 @@
 "bk" = (
 /turf/simulated/floor/plasteel/airless{
 	tag = "icon-bluecorner";
-	icon_state = "bluecorner";
-	dir = 2
+	icon_state = "bluecorner"
 	},
 /area/awaymission/northblock)
 "bl" = (
@@ -315,7 +309,6 @@
 "bq" = (
 /obj/structure/shuttle/engine/heater{
 	tag = "icon-heater (WEST)";
-	icon_state = "heater";
 	dir = 8
 	},
 /turf/simulated/floor/shuttle/plating,
@@ -359,8 +352,7 @@
 /obj/structure/table,
 /turf/simulated/floor/plasteel/airless{
 	tag = "icon-bluecorner";
-	icon_state = "bluecorner";
-	dir = 2
+	icon_state = "bluecorner"
 	},
 /area/awaymission/northblock)
 "bA" = (
@@ -499,7 +491,6 @@
 "bV" = (
 /obj/structure/shuttle/engine/heater{
 	tag = "icon-heater (NORTH)";
-	icon_state = "heater";
 	dir = 1
 	},
 /turf/simulated/floor/shuttle/plating,
@@ -598,7 +589,6 @@
 /obj/item/clothing/head/helmet/space/syndicate,
 /obj/effect/decal/remains/human{
 	desc = "This guy seemed to have died in terrible way! Half his remains are dust.";
-	icon_state = "remains";
 	name = "Syndicate agent remains"
 	},
 /obj/effect/decal/cleanable/blood/splatter,
@@ -709,7 +699,6 @@
 "cz" = (
 /obj/structure/shuttle/engine/heater{
 	tag = "icon-heater (WEST)";
-	icon_state = "heater";
 	dir = 8
 	},
 /obj/structure/window/reinforced,
@@ -750,7 +739,6 @@
 /obj/machinery/power/emitter{
 	anchored = 1;
 	dir = 1;
-	icon_state = "emitter";
 	state = 2
 	},
 /turf/simulated/floor/plasteel{
@@ -785,7 +773,6 @@
 "cK" = (
 /obj/structure/shuttle/engine/heater{
 	tag = "icon-heater (WEST)";
-	icon_state = "heater";
 	dir = 8
 	},
 /obj/structure/window/reinforced{
@@ -800,7 +787,6 @@
 "cL" = (
 /obj/effect/decal/remains/human{
 	desc = "This guy seemed to have died in terrible way! Half his remains are dust.";
-	icon_state = "remains";
 	name = "Syndicate agent remains"
 	},
 /obj/item/clipboard{
@@ -837,7 +823,6 @@
 /area/awaymission/research)
 "cP" = (
 /obj/machinery/light{
-	icon_state = "tube1";
 	dir = 4
 	},
 /turf/simulated/floor/plasteel{
@@ -922,7 +907,6 @@
 "db" = (
 /obj/machinery/shower{
 	tag = "icon-shower (EAST)";
-	icon_state = "shower";
 	dir = 4
 	},
 /obj/structure/window/reinforced/tinted,
@@ -946,7 +930,6 @@
 /area/awaymission/research)
 "de" = (
 /obj/machinery/light{
-	icon_state = "tube1";
 	dir = 8
 	},
 /obj/structure/window/reinforced{
@@ -998,7 +981,6 @@
 /obj/item/clothing/under/rank/bartender,
 /obj/structure/cable{
 	icon_state = "4-8";
-	pixel_x = 0;
 	tag = ""
 	},
 /obj/effect/decal/cleanable/blood/splatter,
@@ -1053,7 +1035,6 @@
 	},
 /obj/structure/cable{
 	icon_state = "4-8";
-	pixel_x = 0;
 	tag = ""
 	},
 /turf/simulated/floor/plasteel,
@@ -1075,7 +1056,6 @@
 	},
 /obj/structure/cable{
 	icon_state = "4-8";
-	pixel_x = 0;
 	tag = ""
 	},
 /turf/simulated/floor/plasteel{
@@ -1100,9 +1080,7 @@
 	},
 /area/awaymission/research)
 "dw" = (
-/obj/structure/computerframe{
-	anchored = 1
-	},
+/obj/structure/computerframe,
 /turf/simulated/floor/plasteel/airless{
 	tag = "icon-blue (EAST)";
 	icon_state = "blue";
@@ -1119,7 +1097,6 @@
 "dy" = (
 /obj/structure/cable{
 	icon_state = "4-8";
-	pixel_x = 0;
 	tag = ""
 	},
 /turf/simulated/floor/plasteel/airless,
@@ -1127,7 +1104,6 @@
 "dz" = (
 /obj/structure/cable{
 	icon_state = "4-8";
-	pixel_x = 0;
 	tag = ""
 	},
 /turf/simulated/floor/plasteel/airless{
@@ -1139,7 +1115,6 @@
 "dA" = (
 /obj/structure/cable{
 	icon_state = "4-8";
-	pixel_x = 0;
 	tag = ""
 	},
 /obj/effect/decal/warning_stripes/yellow,
@@ -1148,7 +1123,6 @@
 "dB" = (
 /obj/machinery/shower{
 	dir = 4;
-	icon_state = "shower";
 	pixel_y = -10;
 	tag = "icon-shower (EAST)"
 	},
@@ -1211,7 +1185,6 @@
 "dI" = (
 /obj/structure/cable{
 	icon_state = "4-8";
-	pixel_x = 0;
 	tag = ""
 	},
 /turf/simulated/floor/plasteel,
@@ -1332,18 +1305,14 @@
 	},
 /area/awaymission/research)
 "dX" = (
-/obj/structure/computerframe{
-	anchored = 1
-	},
+/obj/structure/computerframe,
 /turf/simulated/floor/plasteel{
 	icon_state = "showroomfloor"
 	},
 /area/awaymission/research)
 "dY" = (
 /obj/machinery/light,
-/obj/structure/computerframe{
-	anchored = 1
-	},
+/obj/structure/computerframe,
 /turf/simulated/floor/plasteel{
 	icon_state = "showroomfloor"
 	},
@@ -1376,9 +1345,7 @@
 /area/awaymission/northblock)
 "ed" = (
 /obj/machinery/light/small,
-/obj/structure/computerframe{
-	anchored = 1
-	},
+/obj/structure/computerframe,
 /turf/simulated/floor/plasteel/airless{
 	tag = "icon-blue (NORTH)";
 	icon_state = "blue";
@@ -1402,9 +1369,7 @@
 	},
 /area/awaymission/northblock)
 "eg" = (
-/obj/structure/computerframe{
-	anchored = 1
-	},
+/obj/structure/computerframe,
 /turf/simulated/floor/plasteel/airless{
 	dir = 1;
 	icon_state = "bluecorner"
@@ -1504,7 +1469,6 @@
 /obj/machinery/door/airlock/command,
 /obj/structure/cable{
 	icon_state = "4-8";
-	pixel_x = 0;
 	tag = ""
 	},
 /turf/simulated/floor/plasteel,
@@ -1512,7 +1476,6 @@
 "et" = (
 /obj/structure/cable{
 	icon_state = "4-8";
-	pixel_x = 0;
 	tag = ""
 	},
 /obj/effect/landmark/tiles/damageturf,
@@ -1530,7 +1493,6 @@
 "ev" = (
 /obj/structure/cable{
 	icon_state = "4-8";
-	pixel_x = 0;
 	tag = ""
 	},
 /obj/effect/landmark/tiles/burnturf,
@@ -1559,7 +1521,6 @@
 /area/awaymission/syndishuttle)
 "ey" = (
 /obj/machinery/light{
-	icon_state = "tube1";
 	dir = 8
 	},
 /obj/effect/landmark/tiles/damageturf,
@@ -1619,7 +1580,6 @@
 "eH" = (
 /obj/structure/shuttle/engine/heater{
 	tag = "icon-heater (WEST)";
-	icon_state = "heater";
 	dir = 8
 	},
 /obj/structure/window/reinforced{
@@ -1695,9 +1655,7 @@
 /obj/structure/window/reinforced{
 	dir = 1
 	},
-/obj/structure/computerframe{
-	anchored = 1
-	},
+/obj/structure/computerframe,
 /turf/simulated/floor/plasteel{
 	icon_state = "showroomfloor"
 	},
@@ -1759,7 +1717,6 @@
 /obj/machinery/power/emitter{
 	anchored = 1;
 	dir = 1;
-	icon_state = "emitter";
 	state = 2
 	},
 /turf/simulated/floor/plasteel{
@@ -1801,7 +1758,6 @@
 "fb" = (
 /obj/structure/cable{
 	icon_state = "4-8";
-	pixel_x = 0;
 	tag = ""
 	},
 /turf/simulated/floor/plating/airless,
@@ -1969,7 +1925,6 @@
 "ft" = (
 /obj/structure/cable{
 	icon_state = "4-8";
-	pixel_x = 0;
 	tag = ""
 	},
 /obj/effect/landmark/tiles/damageturf,
@@ -2040,7 +1995,6 @@
 "fA" = (
 /obj/effect/decal/remains/human{
 	desc = "This guy seemed to have died in terrible way! Half his remains are dust.";
-	icon_state = "remains";
 	name = "Syndicate agent remains"
 	},
 /obj/item/ammo_casing/c10mm,
@@ -2059,7 +2013,6 @@
 "fC" = (
 /obj/effect/decal/remains/human{
 	desc = "This guy seemed to have died in terrible way! Half his remains are dust.";
-	icon_state = "remains";
 	name = "Syndicate agent remains"
 	},
 /obj/item/ammo_casing/c10mm,
@@ -2074,7 +2027,6 @@
 "fD" = (
 /obj/effect/decal/remains/human{
 	desc = "This guy seemed to have died in terrible way! Half his remains are dust.";
-	icon_state = "remains";
 	name = "Syndicate agent remains"
 	},
 /obj/item/ammo_casing/c10mm,
@@ -2086,7 +2038,6 @@
 /area/awaymission/midblock)
 "fE" = (
 /obj/machinery/light{
-	icon_state = "tube1";
 	dir = 8
 	},
 /turf/simulated/floor/plasteel/airless,
@@ -2264,7 +2215,6 @@
 "gf" = (
 /obj/effect/decal/remains/human{
 	desc = "This guy seemed to have died in terrible way! Half his remains are dust.";
-	icon_state = "remains";
 	name = "Syndicate agent remains"
 	},
 /obj/item/ammo_casing/c10mm,
@@ -2292,12 +2242,10 @@
 /obj/structure/closet/wardrobe/pjs,
 /obj/structure/window/reinforced/tinted{
 	dir = 8;
-	icon_state = "twindow";
 	tag = ""
 	},
 /obj/structure/window/reinforced/tinted{
 	dir = 4;
-	icon_state = "twindow";
 	tag = ""
 	},
 /obj/machinery/light/small{
@@ -2448,7 +2396,6 @@
 /obj/structure/table,
 /obj/structure/cable{
 	icon_state = "4-8";
-	pixel_x = 0;
 	tag = ""
 	},
 /turf/simulated/floor/plasteel,
@@ -2487,7 +2434,6 @@
 "gM" = (
 /obj/effect/decal/remains/human{
 	desc = "This guy seemed to have died in terrible way! Half his remains are dust.";
-	icon_state = "remains";
 	name = "Syndicate agent remains"
 	},
 /obj/effect/landmark/sc_bible_spawner,
@@ -2609,12 +2555,10 @@
 "hd" = (
 /obj/structure/window/reinforced/tinted{
 	dir = 4;
-	icon_state = "twindow";
 	tag = ""
 	},
 /obj/structure/window/reinforced/tinted{
 	dir = 8;
-	icon_state = "twindow";
 	tag = ""
 	},
 /turf/simulated/floor/plasteel,
@@ -2676,8 +2620,7 @@
 /area/awaymission/midblock)
 "hk" = (
 /obj/machinery/light{
-	dir = 4;
-	icon_state = "tube1"
+	dir = 4
 	},
 /turf/simulated/floor/plasteel,
 /area/awaymission/midblock)
@@ -2782,8 +2725,7 @@
 /area/awaymission/midblock)
 "hz" = (
 /obj/machinery/light{
-	dir = 4;
-	icon_state = "tube1"
+	dir = 4
 	},
 /obj/structure/cable{
 	icon_state = "1-2";
@@ -2957,7 +2899,6 @@
 "hY" = (
 /obj/structure/cable{
 	icon_state = "4-8";
-	pixel_x = 0;
 	tag = ""
 	},
 /turf/simulated/floor/plasteel,
@@ -2968,7 +2909,6 @@
 	},
 /obj/structure/cable{
 	icon_state = "4-8";
-	pixel_x = 0;
 	tag = ""
 	},
 /turf/simulated/floor/plasteel,
@@ -2977,7 +2917,6 @@
 /obj/effect/decal/remains/human,
 /obj/structure/cable{
 	icon_state = "4-8";
-	pixel_x = 0;
 	tag = ""
 	},
 /turf/simulated/floor/plasteel{
@@ -2991,7 +2930,6 @@
 	},
 /obj/structure/cable{
 	icon_state = "4-8";
-	pixel_x = 0;
 	tag = ""
 	},
 /turf/simulated/floor/plasteel,
@@ -2999,7 +2937,6 @@
 "ic" = (
 /obj/structure/cable{
 	icon_state = "4-8";
-	pixel_x = 0;
 	tag = ""
 	},
 /turf/simulated/floor/plasteel/airless,
@@ -3065,7 +3002,6 @@
 /area/awaymission/arrivalblock)
 "im" = (
 /obj/machinery/light{
-	icon_state = "tube1";
 	dir = 4
 	},
 /turf/simulated/floor/plasteel,
@@ -3251,7 +3187,6 @@
 /area/awaymission/arrivalblock)
 "iP" = (
 /obj/machinery/light{
-	icon_state = "tube1";
 	dir = 8
 	},
 /obj/effect/decal/warning_stripes/east,
@@ -3259,15 +3194,13 @@
 /area/awaymission/gateroom)
 "iQ" = (
 /obj/machinery/light{
-	dir = 4;
-	icon_state = "tube1"
+	dir = 4
 	},
 /obj/effect/decal/warning_stripes/west,
 /turf/simulated/floor/plasteel,
 /area/awaymission/gateroom)
 "iR" = (
 /obj/machinery/light{
-	icon_state = "tube1";
 	dir = 8
 	},
 /turf/simulated/floor/plasteel/airless,
@@ -3301,8 +3234,7 @@
 /area/awaymission/southblock)
 "iX" = (
 /obj/machinery/light{
-	dir = 4;
-	icon_state = "tube1"
+	dir = 4
 	},
 /turf/simulated/floor/plasteel/airless,
 /area/awaymission/southblock)
@@ -3377,7 +3309,6 @@
 "ji" = (
 /obj/structure/cable{
 	icon_state = "4-8";
-	pixel_x = 0;
 	tag = ""
 	},
 /turf/simulated/floor/plasteel/airless,
@@ -3388,7 +3319,6 @@
 	},
 /obj/structure/cable{
 	icon_state = "4-8";
-	pixel_x = 0;
 	tag = ""
 	},
 /turf/simulated/floor/plasteel/airless,
@@ -3396,7 +3326,6 @@
 "jk" = (
 /obj/structure/cable{
 	icon_state = "4-8";
-	pixel_x = 0;
 	tag = ""
 	},
 /obj/structure/cable{
@@ -3447,7 +3376,6 @@
 /area/awaymission/southblock)
 "jr" = (
 /obj/machinery/door/airlock/medical/glass{
-	id_tag = null;
 	name = "Glass Airlock"
 	},
 /turf/simulated/floor/plasteel,
@@ -3508,7 +3436,6 @@
 "jA" = (
 /obj/effect/decal/remains/human{
 	desc = "This guy seemed to have died in terrible way! Half his remains are dust.";
-	icon_state = "remains";
 	name = "Syndicate agent remains"
 	},
 /turf/simulated/floor/plasteel,
@@ -3697,22 +3624,19 @@
 "kc" = (
 /obj/machinery/light/small,
 /turf/simulated/floor/plasteel{
-	icon_state = "whitehall";
-	dir = 2
+	icon_state = "whitehall"
 	},
 /area/awaymission/southblock)
 "kd" = (
 /turf/simulated/floor/plasteel{
-	icon_state = "whitehall";
-	dir = 2
+	icon_state = "whitehall"
 	},
 /area/awaymission/southblock)
 "ke" = (
 /obj/structure/table,
 /obj/item/paper_bin,
 /turf/simulated/floor/plasteel{
-	icon_state = "whitehall";
-	dir = 2
+	icon_state = "whitehall"
 	},
 /area/awaymission/southblock)
 "kf" = (
@@ -3722,8 +3646,7 @@
 /area/awaymission/southblock)
 "kg" = (
 /obj/machinery/light{
-	dir = 4;
-	icon_state = "tube1"
+	dir = 4
 	},
 /obj/structure/cable{
 	icon_state = "1-2";
@@ -3901,7 +3824,6 @@
 /obj/item/clothing/under/syndicate,
 /obj/effect/decal/remains/human{
 	desc = "This guy seemed to have died in terrible way! Half his remains are dust.";
-	icon_state = "remains";
 	name = "Syndicate agent remains"
 	},
 /obj/item/paper/sc_safehint_paper_hydro,
@@ -3933,7 +3855,6 @@
 "kL" = (
 /obj/structure/cable{
 	icon_state = "4-8";
-	pixel_x = 0;
 	tag = ""
 	},
 /obj/effect/decal/warning_stripes/north,
@@ -3946,7 +3867,6 @@
 	},
 /obj/structure/cable{
 	icon_state = "4-8";
-	pixel_x = 0;
 	tag = ""
 	},
 /obj/effect/decal/warning_stripes/north,
@@ -3955,7 +3875,6 @@
 "kN" = (
 /obj/structure/cable{
 	icon_state = "4-8";
-	pixel_x = 0;
 	tag = ""
 	},
 /obj/effect/decal/warning_stripes/northeast,
@@ -4028,7 +3947,6 @@
 "kY" = (
 /obj/structure/window/reinforced/tinted{
 	dir = 8;
-	icon_state = "twindow";
 	tag = ""
 	},
 /obj/structure/window/reinforced/tinted{
@@ -4075,7 +3993,6 @@
 /area/awaymission/arrivalblock)
 "lh" = (
 /obj/machinery/light{
-	icon_state = "tube1";
 	dir = 8
 	},
 /turf/simulated/floor/plasteel{
@@ -4087,7 +4004,6 @@
 "li" = (
 /obj/structure/window/reinforced/tinted{
 	dir = 8;
-	icon_state = "twindow";
 	tag = ""
 	},
 /turf/simulated/floor/plasteel,
@@ -4271,7 +4187,6 @@
 /area/awaymission/southblock)
 "lL" = (
 /obj/machinery/light{
-	icon_state = "tube1";
 	dir = 8
 	},
 /turf/simulated/floor/plasteel,
@@ -4286,7 +4201,6 @@
 "lN" = (
 /obj/structure/cable{
 	icon_state = "4-8";
-	pixel_x = 0;
 	tag = ""
 	},
 /turf/simulated/floor/plasteel,
@@ -4294,7 +4208,6 @@
 "lR" = (
 /obj/structure/cable{
 	icon_state = "4-8";
-	pixel_x = 0;
 	tag = ""
 	},
 /obj/machinery/door/airlock/engineering,
@@ -4303,7 +4216,6 @@
 "lS" = (
 /obj/structure/cable{
 	icon_state = "4-8";
-	pixel_x = 0;
 	tag = ""
 	},
 /turf/simulated/floor/plasteel,
@@ -4311,7 +4223,6 @@
 "lT" = (
 /obj/structure/cable{
 	icon_state = "4-8";
-	pixel_x = 0;
 	tag = ""
 	},
 /obj/structure/cable{
@@ -4363,12 +4274,10 @@
 "lY" = (
 /obj/structure/window/reinforced/tinted{
 	dir = 8;
-	icon_state = "twindow";
 	tag = ""
 	},
 /turf/simulated/floor/plasteel{
-	icon_state = "whitehall";
-	dir = 2
+	icon_state = "whitehall"
 	},
 /area/awaymission/southblock)
 "lZ" = (
@@ -4376,8 +4285,7 @@
 	dir = 1
 	},
 /turf/simulated/floor/plasteel{
-	icon_state = "whitehall";
-	dir = 2
+	icon_state = "whitehall"
 	},
 /area/awaymission/southblock)
 "md" = (
@@ -4392,8 +4300,7 @@
 /obj/machinery/power/apc/noalarm{
 	dir = 4;
 	name = "Gateroom APC";
-	pixel_x = 28;
-	pixel_y = 0
+	pixel_x = 28
 	},
 /obj/structure/cable{
 	d2 = 8;
diff --git a/_maps/map_files/RandomZLevels/undergroundoutpost45.dmm b/_maps/map_files/RandomZLevels/undergroundoutpost45.dmm
index c3db77029f7..82d9691159f 100644
--- a/_maps/map_files/RandomZLevels/undergroundoutpost45.dmm
+++ b/_maps/map_files/RandomZLevels/undergroundoutpost45.dmm
@@ -3809,7 +3809,6 @@
 /area/awaymission/UO45/crew_quarters)
 "jg" = (
 /obj/structure/closet/secure_closet{
-	icon_state = "secure";
 	locked = 0;
 	name = "kitchen Cabinet";
 	req_access = list(201)
@@ -9758,8 +9757,7 @@
 /obj/machinery/atmospherics/trinary/filter{
 	dir = 4;
 	filter_type = 2;
-	on = 1;
-	req_access = null
+	on = 1
 	},
 /turf/simulated/floor/plasteel{
 	dir = 10;
@@ -9840,8 +9838,7 @@
 /obj/machinery/atmospherics/trinary/filter{
 	dir = 4;
 	filter_type = 1;
-	on = 1;
-	req_access = null
+	on = 1
 	},
 /turf/simulated/floor/plasteel{
 	dir = 10;
diff --git a/_maps/map_files/celestation/celestation.dmm b/_maps/map_files/celestation/celestation.dmm
index d3cc018a9fa..b34b213357e 100644
--- a/_maps/map_files/celestation/celestation.dmm
+++ b/_maps/map_files/celestation/celestation.dmm
@@ -311,7 +311,6 @@
 	icon_state = "4-8"
 	},
 /turf/simulated/floor/plasteel{
-	dir = 2;
 	icon_state = "greenfull"
 	},
 /area/security/permabrig)
@@ -1167,7 +1166,6 @@
 /area/maintenance/maintcentral)
 "aky" = (
 /obj/machinery/door_timer/cell_6{
-	pixel_x = 0;
 	pixel_y = 32
 	},
 /turf/simulated/floor/plasteel{
@@ -10638,7 +10636,6 @@
 	icon_state = "4-8"
 	},
 /turf/simulated/floor/plasteel{
-	dir = 2;
 	icon_state = "greenfull"
 	},
 /area/security/permabrig)
@@ -11834,21 +11831,6 @@
 	},
 /turf/simulated/floor/plating,
 /area/quartermaster/storage)
-"bGn" = (
-/obj/machinery/atmospherics/pipe/simple/visible/yellow{
-	desc = "Труба хранит в себе набор газов для смешивания";
-	dir = 4;
-	name = "Труба смешивания"
-	},
-/obj/machinery/atmospherics/pipe/simple/visible{
-	desc = "Труба служит для подачу горючей смеси в турбину для её работы";
-	dir = 2;
-	name = "Труба турбины"
-	},
-/turf/simulated/floor/plasteel{
-	icon_state = "dark"
-	},
-/area/atmos)
 "bGt" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
@@ -18491,7 +18473,6 @@
 /area/library)
 "ctq" = (
 /turf/simulated/floor/plasteel{
-	dir = 2;
 	icon_state = "navyblue"
 	},
 /area/tcommsat/computer)
@@ -24567,7 +24548,6 @@
 	},
 /obj/item/seeds/chili,
 /turf/simulated/floor/plasteel{
-	dir = 2;
 	icon_state = "green"
 	},
 /area/security/permabrig)
@@ -27743,7 +27723,6 @@
 /obj/structure/reagent_dispensers/watertank,
 /obj/item/reagent_containers/glass/bucket,
 /turf/simulated/floor/plasteel{
-	dir = 2;
 	icon_state = "green"
 	},
 /area/security/permabrig)
@@ -28601,7 +28580,6 @@
 	icon_state = "1-8"
 	},
 /turf/simulated/floor/plasteel{
-	dir = 2;
 	icon_state = "navyblue"
 	},
 /area/tcommsat/computer)
@@ -30792,7 +30770,6 @@
 /area/maintenance/fsmaint2)
 "eyp" = (
 /turf/simulated/floor/plasteel{
-	dir = 2;
 	icon_state = "navyblue"
 	},
 /area/aisat/maintenance)
@@ -36766,7 +36743,6 @@
 /obj/item/seeds/chili,
 /obj/item/seeds/chili,
 /turf/simulated/floor/plasteel{
-	dir = 2;
 	icon_state = "green"
 	},
 /area/security/permabrig)
@@ -37739,7 +37715,6 @@
 "fPO" = (
 /obj/machinery/porta_turret,
 /turf/simulated/floor/plasteel{
-	dir = 2;
 	icon_state = "navyblue"
 	},
 /area/turret_protected/ai)
@@ -43487,7 +43462,6 @@
 	pixel_y = -28
 	},
 /turf/simulated/floor/plasteel{
-	dir = 2;
 	icon_state = "navyblue"
 	},
 /area/turret_protected/aisat_interior)
@@ -56630,10 +56604,7 @@
 /turf/simulated/floor/plating,
 /area/maintenance/asmaint3)
 "jtI" = (
-/mob/living/carbon/human/lesser/monkey{
-	icon = 'icons/mob/monkey.dmi';
-	icon_state = "monkey1"
-	},
+/mob/living/carbon/human/lesser/monkey,
 /obj/machinery/door/window/brigdoor/southleft{
 	req_access = list(39)
 	},
@@ -57165,7 +57136,6 @@
 /obj/item/radio,
 /obj/item/t_scanner,
 /turf/simulated/floor/plasteel{
-	dir = 2;
 	icon_state = "navyblue"
 	},
 /area/turret_protected/ai)
@@ -58539,7 +58509,6 @@
 	},
 /obj/machinery/hologram/holopad,
 /turf/simulated/floor/plasteel{
-	dir = 2;
 	icon_state = "navyblue"
 	},
 /area/turret_protected/ai)
@@ -62509,7 +62478,6 @@
 /obj/structure/table/reinforced,
 /obj/item/paicard,
 /turf/simulated/floor/plasteel{
-	dir = 2;
 	icon_state = "navyblue"
 	},
 /area/turret_protected/ai)
@@ -63866,7 +63834,6 @@
 	icon_state = "4-8"
 	},
 /turf/simulated/floor/plasteel{
-	dir = 2;
 	icon_state = "navyblue"
 	},
 /area/aisat/maintenance)
@@ -64252,7 +64219,6 @@
 	dir = 4
 	},
 /turf/simulated/floor/plasteel{
-	dir = 2;
 	icon_state = "navybluecornersalt"
 	},
 /area/turret_protected/aisat)
@@ -65032,7 +64998,6 @@
 /area/security/checkpoint/south)
 "laE" = (
 /turf/simulated/floor/plasteel{
-	dir = 2;
 	icon_state = "navyblue"
 	},
 /area/turret_protected/aisat_interior/secondary)
@@ -73651,7 +73616,6 @@
 	icon_state = "4-8"
 	},
 /turf/simulated/floor/plasteel{
-	dir = 2;
 	icon_state = "navyblue"
 	},
 /area/tcommsat/computer)
@@ -73884,7 +73848,6 @@
 /obj/item/tank/internals/emergency_oxygen,
 /obj/item/clothing/mask/breath,
 /turf/simulated/floor/plasteel{
-	dir = 2;
 	icon_state = "navyblue"
 	},
 /area/turret_protected/ai)
@@ -75119,7 +75082,6 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /turf/simulated/floor/plasteel{
-	dir = 2;
 	icon_state = "navyblue"
 	},
 /area/aisat/maintenance)
@@ -80407,7 +80369,6 @@
 /area/engine/engineering/monitor)
 "oev" = (
 /turf/simulated/floor/plasteel{
-	dir = 2;
 	icon_state = "navyblue"
 	},
 /area/turret_protected/ai)
@@ -82451,7 +82412,6 @@
 	dir = 1
 	},
 /turf/simulated/floor/plasteel{
-	dir = 2;
 	icon_state = "navyblue"
 	},
 /area/turret_protected/aisat_interior/secondary)
@@ -84383,7 +84343,6 @@
 /obj/structure/table,
 /obj/item/storage/toolbox/electrical,
 /turf/simulated/floor/plasteel{
-	dir = 2;
 	icon_state = "navyblue"
 	},
 /area/turret_protected/aisat)
@@ -91223,7 +91182,6 @@
 	dir = 1
 	},
 /turf/simulated/floor/plasteel{
-	dir = 2;
 	icon_state = "navyblue"
 	},
 /area/turret_protected/aisat_interior/secondary)
@@ -91281,7 +91239,6 @@
 	},
 /obj/machinery/porta_turret,
 /turf/simulated/floor/plasteel{
-	dir = 2;
 	icon_state = "navyblue"
 	},
 /area/turret_protected/aisat_interior)
@@ -92094,7 +92051,6 @@
 	dir = 8
 	},
 /turf/simulated/floor/plasteel{
-	dir = 2;
 	icon_state = "navyblue"
 	},
 /area/aisat/maintenance)
@@ -99746,10 +99702,7 @@
 /turf/simulated/floor/plasteel,
 /area/security/checkpoint/south)
 "rQQ" = (
-/mob/living/carbon/human/lesser/monkey{
-	icon = 'icons/mob/monkey.dmi';
-	icon_state = "monkey1"
-	},
+/mob/living/carbon/human/lesser/monkey,
 /turf/simulated/floor/beach/sand,
 /area/medical/virology/lab)
 "rQR" = (
@@ -102265,7 +102218,6 @@
 /area/crew_quarters/serviceyard)
 "sqX" = (
 /turf/simulated/floor/plasteel{
-	dir = 2;
 	icon_state = "navybluecorners"
 	},
 /area/turret_protected/ai)
@@ -105661,7 +105613,6 @@
 /obj/machinery/porta_turret,
 /obj/machinery/light,
 /turf/simulated/floor/plasteel{
-	dir = 2;
 	icon_state = "navyblue"
 	},
 /area/turret_protected/aisat_interior)
@@ -109932,7 +109883,6 @@
 /area/turret_protected/ai)
 "tMH" = (
 /turf/simulated/floor/plasteel{
-	dir = 2;
 	icon_state = "navybluecorners"
 	},
 /area/turret_protected/aisat)
@@ -112884,7 +112834,6 @@
 	icon_state = "2-8"
 	},
 /turf/simulated/floor/plasteel{
-	dir = 2;
 	icon_state = "navyblue"
 	},
 /area/aisat/maintenance)
@@ -113668,7 +113617,6 @@
 	pixel_y = -28
 	},
 /turf/simulated/floor/plasteel{
-	dir = 2;
 	icon_state = "navyblue"
 	},
 /area/turret_protected/aisat)
@@ -116638,10 +116586,7 @@
 /obj/structure/window/reinforced{
 	dir = 8
 	},
-/mob/living/carbon/human/lesser/monkey{
-	icon = 'icons/mob/monkey.dmi';
-	icon_state = "monkey1"
-	},
+/mob/living/carbon/human/lesser/monkey,
 /turf/simulated/floor/beach/sand,
 /area/medical/genetics)
 "vbl" = (
@@ -117217,7 +117162,6 @@
 	pixel_y = -28
 	},
 /turf/simulated/floor/plasteel{
-	dir = 2;
 	icon_state = "navyblue"
 	},
 /area/turret_protected/aisat_interior)
@@ -119587,10 +119531,7 @@
 /turf/simulated/floor/carpet/black,
 /area/chapel/office)
 "vFO" = (
-/mob/living/carbon/human/lesser/monkey{
-	icon = 'icons/mob/monkey.dmi';
-	icon_state = "monkey1"
-	},
+/mob/living/carbon/human/lesser/monkey,
 /turf/simulated/floor/beach/sand,
 /area/medical/genetics)
 "vFP" = (
@@ -121272,7 +121213,6 @@
 "vWX" = (
 /obj/machinery/porta_turret,
 /turf/simulated/floor/plasteel{
-	dir = 2;
 	icon_state = "navybluecornersalt"
 	},
 /area/turret_protected/aisat)
@@ -126417,7 +126357,6 @@
 /area/maintenance/fpmaint)
 "wVx" = (
 /mob/living/carbon/human/lesser/monkey/punpun{
-	icon = 'icons/mob/monkey.dmi';
 	icon_state = "punpun1"
 	},
 /obj/machinery/hologram/holopad,
@@ -126932,16 +126871,6 @@
 	},
 /turf/simulated/floor/plating,
 /area/security/reception)
-"xaI" = (
-/obj/machinery/atmospherics/pipe/simple/visible{
-	desc = "Труба служит для подачу горючей смеси в турбину для её работы";
-	dir = 2;
-	name = "Труба турбины"
-	},
-/turf/simulated/floor/plasteel{
-	icon_state = "dark"
-	},
-/area/atmos)
 "xaJ" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 5
@@ -131671,7 +131600,6 @@
 	pixel_y = -28
 	},
 /turf/simulated/floor/plasteel{
-	dir = 2;
 	icon_state = "navyblue"
 	},
 /area/aisat/maintenance)
@@ -132281,7 +132209,6 @@
 	dir = 1
 	},
 /turf/simulated/floor/plasteel{
-	dir = 2;
 	icon_state = "navyblue"
 	},
 /area/turret_protected/ai)
@@ -230756,11 +230683,11 @@ jEA
 mAG
 rkl
 jmg
-xaI
-xaI
-xaI
-xaI
-bGn
+kmC
+kmC
+kmC
+kmC
+xBK
 tLu
 dZI
 bUV
diff --git a/_maps/map_files/cerestation/cerestation.dmm b/_maps/map_files/cerestation/cerestation.dmm
index e9ac4e55395..09f1f53e645 100644
--- a/_maps/map_files/cerestation/cerestation.dmm
+++ b/_maps/map_files/cerestation/cerestation.dmm
@@ -2991,10 +2991,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
-/mob/living/carbon/human/lesser/monkey{
-	icon = 'icons/mob/monkey.dmi';
-	icon_state = "monkey1"
-	},
+/mob/living/carbon/human/lesser/monkey,
 /turf/simulated/floor/engine,
 /area/toxins/test_chamber)
 "azW" = (
@@ -12043,10 +12040,7 @@
 /turf/simulated/wall,
 /area/library)
 "bGw" = (
-/mob/living/carbon/human/lesser/monkey{
-	icon = 'icons/mob/monkey.dmi';
-	icon_state = "monkey1"
-	},
+/mob/living/carbon/human/lesser/monkey,
 /turf/simulated/floor/grass,
 /area/medical/genetics)
 "bGx" = (
@@ -16995,9 +16989,7 @@
 /obj/effect/turf_decal/stripes/end{
 	dir = 8
 	},
-/obj/machinery/quantumpad/cere/arrivals_science{
-	name = "quantum pad"
-	},
+/obj/machinery/quantumpad/cere/arrivals_science,
 /turf/simulated/floor/plasteel{
 	dir = 8;
 	icon_state = "darkpurplefull"
@@ -20400,9 +20392,7 @@
 /turf/simulated/floor/plating,
 /area/engine/engine_smes)
 "cFE" = (
-/obj/structure/plasticflaps{
-	opacity = 1
-	},
+/obj/structure/plasticflaps,
 /turf/simulated/floor/plating,
 /area/engine/engine_smes)
 "cFF" = (
@@ -21405,9 +21395,7 @@
 /obj/effect/turf_decal/stripes/end{
 	dir = 8
 	},
-/obj/machinery/quantumpad/cere/cargo_security{
-	name = "quantum pad"
-	},
+/obj/machinery/quantumpad/cere/cargo_security,
 /turf/simulated/floor/plasteel{
 	icon_state = "darkredfull"
 	},
@@ -21460,9 +21448,7 @@
 	dir = 4;
 	pixel_x = 24
 	},
-/obj/machinery/quantumpad/cere/cargo_arrivals{
-	name = "quantum pad"
-	},
+/obj/machinery/quantumpad/cere/cargo_arrivals,
 /turf/simulated/floor/plasteel{
 	dir = 8;
 	icon_state = "darkgreenfull"
@@ -29065,9 +29051,7 @@
 /obj/machinery/door/window/northleft{
 	dir = 4
 	},
-/obj/structure/plasticflaps{
-	opacity = 1
-	},
+/obj/structure/plasticflaps,
 /obj/machinery/navbeacon{
 	codes_txt = "delivery";
 	location = "Hydroponics"
@@ -33440,10 +33424,7 @@
 /obj/structure/window/reinforced{
 	dir = 4
 	},
-/mob/living/carbon/human/lesser/monkey{
-	icon = 'icons/mob/monkey.dmi';
-	icon_state = "monkey1"
-	},
+/mob/living/carbon/human/lesser/monkey,
 /turf/simulated/floor/grass,
 /area/medical/genetics)
 "fKt" = (
@@ -35625,9 +35606,7 @@
 	dir = 8;
 	pixel_x = -24
 	},
-/obj/machinery/quantumpad/cere/science_security{
-	name = "quantum pad"
-	},
+/obj/machinery/quantumpad/cere/science_security,
 /turf/simulated/floor/plasteel{
 	icon_state = "darkredfull"
 	},
@@ -41984,9 +41963,7 @@
 /turf/simulated/floor/carpet,
 /area/crew_quarters/courtroom)
 "ikY" = (
-/obj/structure/plasticflaps{
-	opacity = 1
-	},
+/obj/structure/plasticflaps,
 /obj/machinery/navbeacon{
 	codes_txt = "delivery";
 	location = "Janitor"
@@ -45034,9 +45011,7 @@
 /obj/effect/turf_decal/stripes/end{
 	dir = 8
 	},
-/obj/machinery/quantumpad/cere/security_science{
-	name = "quantum pad"
-	},
+/obj/machinery/quantumpad/cere/security_science,
 /turf/simulated/floor/plasteel{
 	dir = 8;
 	icon_state = "darkpurplefull"
@@ -45358,9 +45333,7 @@
 /obj/effect/turf_decal/stripes/end{
 	dir = 4
 	},
-/obj/machinery/quantumpad/cere/security_cargo{
-	name = "quantum pad"
-	},
+/obj/machinery/quantumpad/cere/security_cargo,
 /turf/simulated/floor/plasteel{
 	dir = 8;
 	icon_state = "darkyellowfull"
@@ -49150,10 +49123,7 @@
 	},
 /area/turret_protected/ai_upload)
 "knS" = (
-/mob/living/carbon/human/lesser/monkey/teeny{
-	icon = 'icons/mob/monkey.dmi';
-	icon_state = "monkey1"
-	},
+/mob/living/carbon/human/lesser/monkey/teeny,
 /turf/simulated/floor/plating{
 	icon_state = "asteroidplating"
 	},
@@ -64849,9 +64819,7 @@
 	dir = 4;
 	location = "Bar"
 	},
-/obj/structure/plasticflaps{
-	opacity = 1
-	},
+/obj/structure/plasticflaps,
 /obj/machinery/door/window/eastright{
 	dir = 8
 	},
@@ -66670,10 +66638,7 @@
 	},
 /area/security/checkpoint2)
 "phX" = (
-/mob/living/carbon/human/lesser/monkey{
-	icon = 'icons/mob/monkey.dmi';
-	icon_state = "monkey1"
-	},
+/mob/living/carbon/human/lesser/monkey,
 /obj/structure/sink{
 	dir = 8;
 	pixel_x = -12;
@@ -69132,9 +69097,7 @@
 /obj/machinery/door/window/northleft{
 	dir = 4
 	},
-/obj/structure/plasticflaps{
-	opacity = 1
-	},
+/obj/structure/plasticflaps,
 /obj/effect/turf_decal/delivery,
 /turf/simulated/floor/plating,
 /area/crew_quarters/kitchen)
@@ -70912,10 +70875,7 @@
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
-/mob/living/carbon/human/lesser/monkey{
-	icon = 'icons/mob/monkey.dmi';
-	icon_state = "monkey1"
-	},
+/mob/living/carbon/human/lesser/monkey,
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
 	},
@@ -79106,9 +79066,7 @@
 	dir = 8;
 	location = "Security"
 	},
-/obj/structure/plasticflaps{
-	opacity = 1
-	},
+/obj/structure/plasticflaps,
 /obj/machinery/door/poddoor/preopen{
 	id_tag = "Secure Gate";
 	name = "Security Blast Door"
@@ -79634,10 +79592,7 @@
 	},
 /area/security/lobby)
 "sRC" = (
-/mob/living/carbon/human/lesser/monkey{
-	icon = 'icons/mob/monkey.dmi';
-	icon_state = "monkey1"
-	},
+/mob/living/carbon/human/lesser/monkey,
 /obj/machinery/door/window/brigdoor/southleft{
 	dir = 4;
 	req_access = list(39)
@@ -85454,10 +85409,7 @@
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
-/mob/living/carbon/human/lesser/monkey{
-	icon = 'icons/mob/monkey.dmi';
-	icon_state = "monkey1"
-	},
+/mob/living/carbon/human/lesser/monkey,
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
 	},
@@ -87533,7 +87485,6 @@
 	},
 /obj/machinery/door_timer/cell_6{
 	name = "General Population Cell C";
-	pixel_x = 0;
 	pixel_y = -32
 	},
 /turf/simulated/floor/plasteel{
@@ -87752,9 +87703,7 @@
 	dir = 4;
 	pixel_x = 24
 	},
-/obj/machinery/quantumpad/cere/arrivals_cargo{
-	name = "quantum pad"
-	},
+/obj/machinery/quantumpad/cere/arrivals_cargo,
 /turf/simulated/floor/plasteel{
 	dir = 8;
 	icon_state = "darkyellowfull"
@@ -90090,9 +90039,7 @@
 	},
 /area/medical/medbay)
 "vWu" = (
-/obj/structure/plasticflaps{
-	opacity = 1
-	},
+/obj/structure/plasticflaps,
 /obj/machinery/navbeacon{
 	codes_txt = "delivery";
 	dir = 4;
@@ -93391,7 +93338,6 @@
 /area/maintenance/starboardaux)
 "wVx" = (
 /mob/living/carbon/human/lesser/monkey/punpun{
-	icon = 'icons/mob/monkey.dmi';
 	icon_state = "punpun1"
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -96079,9 +96025,7 @@
 /obj/effect/turf_decal/stripes/end{
 	dir = 4
 	},
-/obj/machinery/quantumpad/cere/science_arrivals{
-	name = "quantum pad"
-	},
+/obj/machinery/quantumpad/cere/science_arrivals,
 /turf/simulated/floor/plasteel{
 	dir = 8;
 	icon_state = "darkgreenfull"
diff --git a/_maps/map_files/cyberiad/cyberiad.dmm b/_maps/map_files/cyberiad/cyberiad.dmm
index 071531aa0fa..19508e4afd5 100644
--- a/_maps/map_files/cyberiad/cyberiad.dmm
+++ b/_maps/map_files/cyberiad/cyberiad.dmm
@@ -6190,7 +6190,6 @@
 "auM" = (
 /obj/machinery/door_timer/cell_1{
 	dir = 1;
-	layer = 4;
 	pixel_y = 32
 	},
 /obj/machinery/atmospherics/unary/vent_scrubber/on,
@@ -6213,7 +6212,6 @@
 "auO" = (
 /obj/machinery/door_timer/cell_3{
 	dir = 1;
-	layer = 4;
 	pixel_y = 32
 	},
 /obj/machinery/atmospherics/unary/vent_pump/on,
@@ -7306,7 +7304,6 @@
 /obj/structure/disposalpipe/segment,
 /obj/machinery/door_timer/cell_5{
 	dir = 4;
-	layer = 4;
 	pixel_x = 32
 	},
 /turf/simulated/floor/plasteel{
@@ -13996,9 +13993,7 @@
 	dir = 1;
 	location = "Security"
 	},
-/obj/structure/plasticflaps{
-	opacity = 1
-	},
+/obj/structure/plasticflaps,
 /obj/machinery/door/poddoor{
 	density = 0;
 	icon_state = "open";
@@ -20371,9 +20366,7 @@
 /turf/simulated/floor/plasteel,
 /area/hallway/primary/port)
 "bmt" = (
-/obj/structure/plasticflaps{
-	opacity = 1
-	},
+/obj/structure/plasticflaps,
 /obj/machinery/navbeacon{
 	codes_txt = "delivery";
 	location = "Kitchen"
@@ -20923,9 +20916,7 @@
 	codes_txt = "delivery";
 	location = "Hydroponics"
 	},
-/obj/structure/plasticflaps{
-	opacity = 1
-	},
+/obj/structure/plasticflaps,
 /turf/simulated/floor/plasteel{
 	dir = 1;
 	icon_state = "bot"
@@ -23377,9 +23368,7 @@
 	dir = 1;
 	location = "Bridge"
 	},
-/obj/structure/plasticflaps{
-	opacity = 1
-	},
+/obj/structure/plasticflaps,
 /obj/effect/decal/warning_stripes/yellow/hollow,
 /turf/simulated/floor/plasteel,
 /area/bridge/meeting_room)
@@ -27871,9 +27860,7 @@
 /turf/simulated/floor/carpet/black,
 /area/quartermaster/storage)
 "bKZ" = (
-/obj/structure/plasticflaps{
-	opacity = 1
-	},
+/obj/structure/plasticflaps,
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/conveyor{
 	dir = 4;
@@ -31534,9 +31521,7 @@
 	dir = 8;
 	location = "Research Division"
 	},
-/obj/structure/plasticflaps{
-	opacity = 1
-	},
+/obj/structure/plasticflaps,
 /turf/simulated/floor/plasteel{
 	icon_state = "bot"
 	},
@@ -43316,9 +43301,7 @@
 	},
 /area/storage/office)
 "cGi" = (
-/obj/structure/plasticflaps{
-	opacity = 1
-	},
+/obj/structure/plasticflaps,
 /obj/effect/decal/warning_stripes/yellow/hollow,
 /turf/simulated/floor/plasteel,
 /area/assembly/assembly_line)
@@ -45047,9 +45030,7 @@
 	dir = 8;
 	location = "Bar"
 	},
-/obj/structure/plasticflaps{
-	opacity = 1
-	},
+/obj/structure/plasticflaps,
 /turf/simulated/floor/plasteel,
 /area/maintenance/fsmaint2)
 "cKF" = (
@@ -45766,7 +45747,6 @@
 /area/solar/port)
 "cMD" = (
 /mob/living/carbon/human/lesser/monkey/punpun{
-	icon = 'icons/mob/monkey.dmi';
 	icon_state = "punpun1"
 	},
 /turf/simulated/floor/plasteel{
@@ -61148,10 +61128,7 @@
 	},
 /area/medical/cmo)
 "gAN" = (
-/mob/living/carbon/human/lesser/monkey{
-	icon = 'icons/mob/monkey.dmi';
-	icon_state = "monkey1"
-	},
+/mob/living/carbon/human/lesser/monkey,
 /obj/structure/disposalpipe/segment{
 	dir = 6
 	},
@@ -69105,10 +69082,7 @@
 /turf/simulated/floor/plating,
 /area/maintenance/port)
 "lZK" = (
-/mob/living/carbon/human/lesser/monkey{
-	icon = 'icons/mob/monkey.dmi';
-	icon_state = "monkey1"
-	},
+/mob/living/carbon/human/lesser/monkey,
 /obj/machinery/atmospherics/unary/vent_scrubber/on,
 /turf/simulated/floor/plasteel{
 	icon_state = "whitegreenfull"
@@ -69327,10 +69301,7 @@
 /turf/simulated/floor/plating,
 /area/maintenance/livingcomplex)
 "meY" = (
-/mob/living/carbon/human/lesser/monkey{
-	icon = 'icons/mob/monkey.dmi';
-	icon_state = "monkey1"
-	},
+/mob/living/carbon/human/lesser/monkey,
 /turf/simulated/floor/engine,
 /area/toxins/test_chamber)
 "meZ" = (
@@ -75285,9 +75256,7 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/obj/structure/plasticflaps{
-	opacity = 1
-	},
+/obj/structure/plasticflaps,
 /obj/effect/decal/warning_stripes/yellow/hollow,
 /turf/simulated/floor/plasteel,
 /area/maintenance/asmaint)
@@ -83339,9 +83308,7 @@
 	dir = 4;
 	location = "Medbay"
 	},
-/obj/structure/plasticflaps{
-	opacity = 1
-	},
+/obj/structure/plasticflaps,
 /turf/simulated/floor/plating,
 /area/medical/sleeper)
 "vxL" = (
@@ -84079,10 +84046,7 @@
 /turf/simulated/floor/plasteel,
 /area/engine/controlroom)
 "vUY" = (
-/mob/living/carbon/human/lesser/monkey{
-	icon = 'icons/mob/monkey.dmi';
-	icon_state = "monkey1"
-	},
+/mob/living/carbon/human/lesser/monkey,
 /obj/machinery/atmospherics/unary/vent_pump/on{
 	dir = 8
 	},
diff --git a/_maps/map_files/debug/multiz_test.dmm b/_maps/map_files/debug/multiz_test.dmm
index 8db02d1603e..06b112d984c 100644
--- a/_maps/map_files/debug/multiz_test.dmm
+++ b/_maps/map_files/debug/multiz_test.dmm
@@ -20,7 +20,6 @@
 /area/hallway/primary/central)
 "aT" = (
 /obj/machinery/alarm{
-	frequency = 1439;
 	locked = 0;
 	pixel_y = 23
 	},
@@ -260,7 +259,6 @@
 "hw" = (
 /obj/effect/turf_decal/stripes/asteroid/line,
 /obj/effect/turf_decal/stripes/asteroid/line{
-	icon_state = "ast_warn";
 	dir = 4
 	},
 /turf/simulated/floor/plasteel,
@@ -274,14 +272,12 @@
 /area/storage/primary)
 "hI" = (
 /obj/effect/turf_decal/stripes/asteroid/line{
-	icon_state = "ast_warn";
 	dir = 4
 	},
 /turf/simulated/floor/plasteel,
 /area/construction/solars)
 "hJ" = (
 /obj/machinery/alarm{
-	frequency = 1439;
 	locked = 0;
 	pixel_y = 23
 	},
@@ -316,7 +312,6 @@
 /area/engine/engineering)
 "is" = (
 /obj/effect/turf_decal/stripes/asteroid/line{
-	icon_state = "ast_warn";
 	dir = 8
 	},
 /turf/simulated/floor/plasteel,
@@ -442,7 +437,6 @@
 /area/construction/hallway)
 "mh" = (
 /obj/effect/turf_decal/stripes/asteroid/line{
-	icon_state = "ast_warn";
 	dir = 8
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -471,11 +465,9 @@
 /area/hallway/secondary/entry)
 "nr" = (
 /obj/effect/turf_decal/stripes/asteroid/line{
-	icon_state = "ast_warn";
 	dir = 8
 	},
 /obj/effect/turf_decal/stripes/asteroid/line{
-	icon_state = "ast_warn";
 	dir = 4
 	},
 /turf/simulated/floor/plasteel,
@@ -583,7 +575,6 @@
 /area/space)
 "qs" = (
 /obj/machinery/alarm{
-	frequency = 1439;
 	locked = 0;
 	pixel_y = 23
 	},
@@ -755,7 +746,6 @@
 /area/engine/gravitygenerator)
 "ud" = (
 /obj/machinery/alarm{
-	frequency = 1439;
 	locked = 0;
 	pixel_y = 23
 	},
@@ -813,12 +803,8 @@
 	dir = 4
 	},
 /obj/machinery/portable_atmospherics/canister,
-/obj/effect/turf_decal/bot{
-	dir = 2
-	},
-/turf/simulated/floor/plasteel{
-	dir = 2
-	},
+/obj/effect/turf_decal/bot,
+/turf/simulated/floor/plasteel,
 /area/atmos)
 "vC" = (
 /obj/structure/lattice/catwalk,
@@ -920,7 +906,6 @@
 	dir = 4
 	},
 /obj/effect/turf_decal/stripes/asteroid/line{
-	icon_state = "ast_warn";
 	dir = 8
 	},
 /turf/simulated/floor/plasteel,
@@ -1059,7 +1044,6 @@
 /area/construction/hallway)
 "BQ" = (
 /obj/effect/turf_decal/stripes/asteroid/line{
-	icon_state = "ast_warn";
 	dir = 8
 	},
 /turf/simulated/floor/plasteel,
@@ -1067,7 +1051,6 @@
 "Ca" = (
 /obj/effect/turf_decal/stripes/asteroid/line,
 /obj/effect/turf_decal/stripes/asteroid/line{
-	icon_state = "ast_warn";
 	dir = 8
 	},
 /obj/structure/disposalpipe/segment{
@@ -1203,7 +1186,6 @@
 /area/construction)
 "FK" = (
 /obj/effect/turf_decal/stripes/asteroid/line{
-	icon_state = "ast_warn";
 	dir = 8
 	},
 /obj/effect/spawner/window/reinforced,
@@ -1277,7 +1259,6 @@
 /area/construction/solars)
 "HA" = (
 /obj/effect/turf_decal/stripes/asteroid/line{
-	icon_state = "ast_warn";
 	dir = 1
 	},
 /turf/simulated/floor/plasteel,
@@ -1310,11 +1291,6 @@
 /obj/machinery/light,
 /turf/simulated/floor/plasteel,
 /area/construction/solars)
-"IC" = (
-/turf/simulated/floor/plasteel{
-	dir = 2
-	},
-/area/construction/hallway)
 "IF" = (
 /obj/effect/turf_decal/stripes/asteroid/corner,
 /turf/simulated/floor/plasteel,
@@ -1370,7 +1346,6 @@
 /area/storage/primary)
 "JY" = (
 /obj/effect/turf_decal/stripes/asteroid/corner{
-	icon_state = "ast_warn_corner";
 	dir = 4
 	},
 /turf/simulated/floor/plasteel,
@@ -1378,7 +1353,6 @@
 "Ka" = (
 /obj/structure/ladder,
 /obj/effect/turf_decal/stripes/asteroid/corner{
-	icon_state = "ast_warn_corner";
 	dir = 8
 	},
 /turf/simulated/floor/plasteel,
@@ -1470,7 +1444,6 @@
 /area/hallway/primary/central)
 "Mj" = (
 /obj/machinery/alarm{
-	frequency = 1439;
 	locked = 0;
 	pixel_y = 23
 	},
@@ -1551,11 +1524,9 @@
 /area/engine/engineering)
 "ND" = (
 /obj/effect/turf_decal/stripes/asteroid/line{
-	icon_state = "ast_warn";
 	dir = 1
 	},
 /obj/effect/turf_decal/stripes/asteroid/line{
-	icon_state = "ast_warn";
 	dir = 4
 	},
 /turf/simulated/floor/plasteel,
@@ -1609,7 +1580,6 @@
 /area/construction/hallway)
 "Ph" = (
 /obj/effect/turf_decal/stripes/asteroid/line{
-	icon_state = "ast_warn";
 	dir = 1
 	},
 /obj/effect/spawner/window/reinforced,
@@ -1620,11 +1590,9 @@
 /area/construction/hallway)
 "Px" = (
 /obj/effect/turf_decal/stripes/asteroid/corner{
-	icon_state = "ast_warn_corner";
 	dir = 4
 	},
 /obj/effect/turf_decal/stripes/asteroid/corner{
-	icon_state = "ast_warn_corner";
 	dir = 1
 	},
 /turf/simulated/floor/plasteel,
@@ -1642,7 +1610,6 @@
 /area/atmos)
 "PW" = (
 /obj/effect/turf_decal/stripes/asteroid/line{
-	icon_state = "ast_warn";
 	dir = 1
 	},
 /turf/simulated/floor/plasteel,
@@ -1705,12 +1672,8 @@
 	dir = 4
 	},
 /obj/machinery/portable_atmospherics/canister/sleeping_agent,
-/obj/effect/turf_decal/bot{
-	dir = 2
-	},
-/turf/simulated/floor/plasteel{
-	dir = 2
-	},
+/obj/effect/turf_decal/bot,
+/turf/simulated/floor/plasteel,
 /area/atmos)
 "Sj" = (
 /turf/simulated/floor/plasteel,
@@ -1732,7 +1695,6 @@
 	icon_state = "0-2"
 	},
 /obj/machinery/alarm{
-	frequency = 1439;
 	locked = 0;
 	pixel_y = 23
 	},
@@ -1819,11 +1781,9 @@
 /area/engine/engineering)
 "TR" = (
 /obj/effect/turf_decal/stripes/asteroid/line{
-	icon_state = "ast_warn";
 	dir = 8
 	},
 /obj/effect/turf_decal/stripes/asteroid/line{
-	icon_state = "ast_warn";
 	dir = 1
 	},
 /turf/simulated/floor/plasteel,
@@ -1834,7 +1794,6 @@
 /area/construction/hallway)
 "Uw" = (
 /obj/machinery/alarm{
-	frequency = 1439;
 	locked = 0;
 	pixel_y = 23
 	},
@@ -1847,7 +1806,6 @@
 /area/storage/primary)
 "UJ" = (
 /obj/effect/turf_decal/stripes/asteroid/line{
-	icon_state = "ast_warn";
 	dir = 4
 	},
 /obj/effect/spawner/window/reinforced,
@@ -1884,11 +1842,9 @@
 /area/construction)
 "Vx" = (
 /obj/effect/turf_decal/stripes/asteroid/line{
-	icon_state = "ast_warn";
 	dir = 8
 	},
 /obj/effect/turf_decal/stripes/asteroid/line{
-	icon_state = "ast_warn";
 	dir = 4
 	},
 /obj/machinery/door/airlock,
@@ -2014,7 +1970,6 @@
 /area/atmos)
 "Yk" = (
 /obj/effect/turf_decal/stripes/asteroid/line{
-	icon_state = "ast_warn";
 	dir = 4
 	},
 /turf/simulated/floor/plasteel,
@@ -84266,8 +84221,8 @@ dg
 YU
 Ps
 Ps
-IC
-IC
+wl
+wl
 wl
 wl
 wl
diff --git a/_maps/map_files/event/Station/delta_old.dmm b/_maps/map_files/event/Station/delta_old.dmm
index 4ce65405b34..b8b80724412 100644
--- a/_maps/map_files/event/Station/delta_old.dmm
+++ b/_maps/map_files/event/Station/delta_old.dmm
@@ -1042,9 +1042,7 @@
 	pixel_x = 28;
 	pixel_y = -2
 	},
-/obj/machinery/computer/security{
-	network = list("SS13","Mining Outpost")
-	},
+/obj/machinery/computer/security,
 /turf/simulated/floor/plasteel{
 	icon_state = "redfull"
 	},
@@ -5619,9 +5617,7 @@
 	location = "Bar"
 	},
 /obj/effect/decal/warning_stripes/yellow,
-/obj/structure/plasticflaps{
-	opacity = 1
-	},
+/obj/structure/plasticflaps,
 /turf/simulated/floor/plasteel{
 	dir = 5;
 	icon_state = "dark";
@@ -8438,7 +8434,6 @@
 "bmp" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/flasher{
-	id = null;
 	pixel_y = 24
 	},
 /obj/structure/extinguisher_cabinet{
@@ -9451,9 +9446,7 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/obj/structure/plasticflaps{
-	opacity = 1
-	},
+/obj/structure/plasticflaps,
 /obj/effect/decal/warning_stripes/yellow,
 /turf/simulated/floor/plasteel,
 /area/atmos/control)
@@ -17015,7 +17008,6 @@
 	name = "Труба фильтрации"
 	},
 /obj/machinery/computer/general_air_control/large_tank_control{
-	frequency = 1441;
 	input_tag = "co2_in";
 	name = "Carbon Dioxide Supply Control";
 	output_tag = "co2_out";
@@ -18369,8 +18361,7 @@
 "ciT" = (
 /obj/structure/closet/secure_closet/guncabinet{
 	anchored = 1;
-	name = "Magazines for SMG";
-	req_access = list(3)
+	name = "Magazines for SMG"
 	},
 /obj/item/ammo_box/magazine/wt550m9{
 	pixel_x = -4;
@@ -18627,9 +18618,7 @@
 /area/library)
 "ckk" = (
 /obj/structure/disposalpipe/segment,
-/obj/structure/plasticflaps{
-	opacity = 1
-	},
+/obj/structure/plasticflaps,
 /obj/effect/decal/warning_stripes/yellow,
 /turf/simulated/floor/plating,
 /area/crew_quarters/serviceyard)
@@ -23698,9 +23687,7 @@
 	dir = 4;
 	location = "Mime"
 	},
-/obj/structure/plasticflaps{
-	opacity = 1
-	},
+/obj/structure/plasticflaps,
 /turf/simulated/floor/plasteel{
 	dir = 4;
 	icon_regular_floor = "yellowsiding";
@@ -26188,9 +26175,7 @@
 	dir = 4;
 	location = "Clown"
 	},
-/obj/structure/plasticflaps{
-	opacity = 1
-	},
+/obj/structure/plasticflaps,
 /turf/simulated/floor/plasteel{
 	icon_state = "bar"
 	},
@@ -26838,7 +26823,6 @@
 "cTl" = (
 /obj/machinery/atmospherics/unary/outlet_injector/on{
 	dir = 4;
-	frequency = 1441;
 	id = "mix_in"
 	},
 /turf/simulated/floor/engine,
@@ -30584,7 +30568,6 @@
 	network = list("Medical","SS13")
 	},
 /obj/machinery/button/windowtint{
-	anchored = 1;
 	id = "cloninglab";
 	pixel_x = 22;
 	pixel_y = 10
@@ -34501,9 +34484,7 @@
 	codes_txt = "delivery";
 	location = "Chemistry"
 	},
-/obj/structure/plasticflaps{
-	opacity = 1
-	},
+/obj/structure/plasticflaps,
 /turf/simulated/floor/plasteel{
 	dir = 8;
 	icon_state = "neutralfull"
@@ -34955,9 +34936,7 @@
 	codes_txt = "delivery";
 	location = "Hydroponics"
 	},
-/obj/structure/plasticflaps{
-	opacity = 1
-	},
+/obj/structure/plasticflaps,
 /obj/effect/decal/warning_stripes/yellow/hollow,
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
@@ -35733,7 +35712,6 @@
 /area/medical/research)
 "dEg" = (
 /obj/machinery/computer/general_air_control/large_tank_control{
-	frequency = 1441;
 	input_tag = "o2_in";
 	name = "Oxygen Supply Control";
 	output_tag = "o2_out";
@@ -38677,7 +38655,6 @@
 /area/quartermaster/storage)
 "dQW" = (
 /obj/machinery/computer/general_air_control/large_tank_control{
-	frequency = 1441;
 	input_tag = "n2_in";
 	name = "Nitrogen Supply Control";
 	output_tag = "n2_out";
@@ -42138,7 +42115,6 @@
 	},
 /obj/machinery/door/window/brigdoor{
 	dir = 8;
-	id = null;
 	name = "Creature Pen";
 	req_access = list(47)
 	},
@@ -43344,7 +43320,6 @@
 /obj/item/twohanded/required/kirbyplants,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/flasher{
-	id = null;
 	pixel_y = -24
 	},
 /turf/simulated/floor/plasteel{
@@ -44060,7 +44035,6 @@
 /area/medical/medbay3)
 "eMu" = (
 /obj/machinery/computer/general_air_control/large_tank_control{
-	frequency = 1441;
 	input_tag = "air_in";
 	name = "Mixed Air Supply Control";
 	output_tag = "air_out";
@@ -44492,7 +44466,6 @@
 	dir = 4
 	},
 /obj/machinery/button/windowtint{
-	anchored = 1;
 	id = "privateroom";
 	pixel_x = -24;
 	pixel_y = 24
@@ -45051,9 +45024,7 @@
 	},
 /area/medical/medbay3)
 "eZR" = (
-/obj/structure/plasticflaps{
-	opacity = 1
-	},
+/obj/structure/plasticflaps,
 /obj/machinery/navbeacon{
 	codes_txt = "delivery;dir=4";
 	dir = 4;
@@ -52450,9 +52421,7 @@
 	location = "Engineering"
 	},
 /obj/effect/decal/warning_stripes/yellow,
-/obj/structure/plasticflaps{
-	opacity = 1
-	},
+/obj/structure/plasticflaps,
 /turf/simulated/floor/plasteel,
 /area/engine/engineering)
 "gVO" = (
@@ -55226,7 +55195,6 @@
 "hKe" = (
 /obj/machinery/tcomms/core/station,
 /obj/machinery/flasher{
-	id = null;
 	pixel_y = -24
 	},
 /obj/structure/cable{
@@ -56688,8 +56656,7 @@
 "igH" = (
 /obj/structure/closet/secure_closet/guncabinet{
 	anchored = 1;
-	name = "Security SMG's";
-	req_access = list(3)
+	name = "Security SMG's"
 	},
 /obj/item/gun/projectile/automatic/wt550{
 	pixel_x = -3;
@@ -56942,7 +56909,6 @@
 	name = "Труба фильтрации"
 	},
 /obj/machinery/computer/general_air_control/large_tank_control{
-	frequency = 1441;
 	input_tag = "tox_in";
 	name = "Toxin Supply Control";
 	output_tag = "tox_out";
@@ -57520,9 +57486,7 @@
 	dir = 8;
 	location = "Library"
 	},
-/obj/structure/plasticflaps{
-	opacity = 1
-	},
+/obj/structure/plasticflaps,
 /turf/simulated/floor/wood,
 /area/library)
 "irC" = (
@@ -59703,9 +59667,7 @@
 	},
 /area/maintenance/gambling_den)
 "iXX" = (
-/obj/machinery/computer/security{
-	network = list("SS13","Mining Outpost")
-	},
+/obj/machinery/computer/security,
 /turf/simulated/floor/bluegrid,
 /area/tcommsat/chamber)
 "iYa" = (
@@ -60117,7 +60079,6 @@
 	dir = 4
 	},
 /obj/machinery/button/windowtint{
-	anchored = 1;
 	id = "Interrogation";
 	pixel_x = 24
 	},
@@ -62304,9 +62265,7 @@
 	codes_txt = "delivery";
 	location = "Chapel"
 	},
-/obj/structure/plasticflaps{
-	opacity = 1
-	},
+/obj/structure/plasticflaps,
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
 	},
@@ -65749,9 +65708,7 @@
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
-/obj/structure/plasticflaps{
-	opacity = 1
-	},
+/obj/structure/plasticflaps,
 /obj/effect/decal/warning_stripes/yellow,
 /turf/simulated/floor/plasteel,
 /area/storage/primary)
@@ -67620,7 +67577,6 @@
 /area/security/detectives_office)
 "lpu" = (
 /obj/machinery/computer/general_air_control/large_tank_control{
-	frequency = 1441;
 	input_tag = "n2o_in";
 	name = "Nitrous Oxide Supply Control";
 	output_tag = "n2o_out";
@@ -73099,9 +73055,7 @@
 	},
 /area/crew_quarters/locker)
 "mMi" = (
-/obj/machinery/computer/security{
-	network = list("SS13","Mining Outpost")
-	},
+/obj/machinery/computer/security,
 /turf/simulated/floor/plasteel{
 	dir = 10;
 	icon_state = "darkred"
@@ -74879,9 +74833,7 @@
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
-/obj/machinery/computer/security{
-	network = list("SS13","Mining Outpost")
-	},
+/obj/machinery/computer/security,
 /turf/simulated/floor/wood,
 /area/security/hos)
 "nnt" = (
@@ -77172,7 +77124,6 @@
 /area/crew_quarters/locker)
 "nRQ" = (
 /obj/machinery/computer/general_air_control/large_tank_control{
-	frequency = 1441;
 	input_tag = "mix_in";
 	name = "Gas Mix Tank Control";
 	output_tag = "mix_out";
@@ -78135,7 +78086,6 @@
 	icon_state = "4-8"
 	},
 /obj/machinery/door/window/brigdoor{
-	id = null;
 	name = "Creature Pen";
 	req_access = list(47)
 	},
@@ -81059,9 +81009,7 @@
 /area/hallway/primary/central/ne)
 "oSQ" = (
 /obj/effect/decal/warning_stripes/east,
-/obj/machinery/atmospherics/trinary/mixer{
-	req_access = null
-	},
+/obj/machinery/atmospherics/trinary/mixer,
 /turf/simulated/floor/plasteel{
 	dir = 8;
 	icon_state = "neutral"
@@ -81186,9 +81134,7 @@
 	},
 /area/quartermaster/delivery)
 "oUP" = (
-/obj/machinery/computer/security{
-	network = list("SS13","Mining Outpost")
-	},
+/obj/machinery/computer/security,
 /obj/structure/extinguisher_cabinet{
 	pixel_y = 62
 	},
@@ -85694,9 +85640,7 @@
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
-/obj/machinery/computer/security{
-	network = list("SS13","Mining Outpost")
-	},
+/obj/machinery/computer/security,
 /turf/simulated/floor/plasteel{
 	dir = 1;
 	icon_state = "darkred"
@@ -92063,9 +92007,7 @@
 	location = "Robotics"
 	},
 /obj/effect/decal/warning_stripes/yellow,
-/obj/structure/plasticflaps{
-	opacity = 1
-	},
+/obj/structure/plasticflaps,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /turf/simulated/floor/plasteel,
 /area/assembly/robotics)
@@ -92099,7 +92041,6 @@
 	pixel_y = 2
 	},
 /obj/machinery/flasher{
-	id = null;
 	pixel_y = 24
 	},
 /turf/simulated/floor/plasteel{
@@ -102533,7 +102474,6 @@
 "uHl" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/flasher{
-	id = null;
 	pixel_y = -24
 	},
 /obj/structure/extinguisher_cabinet{
@@ -109738,9 +109678,7 @@
 	codes_txt = "patrol;next_patrol=Armory_sprava";
 	location = "Armory_South"
 	},
-/mob/living/simple_animal/bot/secbot/armsky{
-	auto_patrol = 1
-	},
+/mob/living/simple_animal/bot/secbot/armsky,
 /obj/structure/cable{
 	icon_state = "2-8"
 	},
@@ -110792,9 +110730,7 @@
 	codes_txt = "delivery";
 	location = "Janitor"
 	},
-/obj/structure/plasticflaps{
-	opacity = 1
-	},
+/obj/structure/plasticflaps,
 /turf/simulated/floor/plating,
 /area/janitor)
 "wMn" = (
diff --git a/_maps/map_files/event/Station/towerstation.dmm b/_maps/map_files/event/Station/towerstation.dmm
index f26c99f84f9..1d66d3ad711 100644
--- a/_maps/map_files/event/Station/towerstation.dmm
+++ b/_maps/map_files/event/Station/towerstation.dmm
@@ -895,7 +895,6 @@
 "ayR" = (
 /obj/machinery/door/airlock/research{
 	name = "Research and Development Lab";
-	check_one_access = 1;
 	req_access = list(7)
 	},
 /obj/structure/cable{
@@ -1150,10 +1149,7 @@
 /obj/structure/window/reinforced{
 	dir = 4
 	},
-/mob/living/carbon/human/lesser/monkey{
-	icon = 'icons/mob/monkey.dmi';
-	icon_state = "monkey1"
-	},
+/mob/living/carbon/human/lesser/monkey,
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
 	},
@@ -4522,7 +4518,6 @@
 "cYx" = (
 /obj/machinery/door/airlock/security/glass{
 	name = "Security Office";
-	check_one_access = 1;
 	req_access = list(1,4)
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -4989,10 +4984,7 @@
 /obj/structure/flora/ausbushes/grassybush,
 /obj/structure/flora/ausbushes/lavendergrass,
 /obj/structure/flora/ausbushes/sparsegrass,
-/mob/living/carbon/human/lesser/monkey{
-	icon = 'icons/mob/monkey.dmi';
-	icon_state = "monkey1"
-	},
+/mob/living/carbon/human/lesser/monkey,
 /turf/simulated/floor/grass,
 /area/quartermaster/storage)
 "dqc" = (
@@ -6645,7 +6637,6 @@
 /obj/machinery/door/airlock/highsecurity{
 	heat_proof = 1;
 	name = "Supermatter Chamber";
-	check_one_access = 1;
 	req_access = list(24,10)
 	},
 /turf/simulated/floor/engine,
@@ -7968,7 +7959,6 @@
 "fpu" = (
 /obj/machinery/door/airlock/security/glass{
 	name = "Gear Room";
-	check_one_access = 1;
 	req_access = list(1,4)
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -9863,7 +9853,6 @@
 "gvk" = (
 /obj/machinery/door/airlock/atmos{
 	name = "Atmospherics Access";
-	check_one_access = 1;
 	req_access = list(24,10)
 	},
 /obj/structure/disposalpipe/segment,
@@ -11203,7 +11192,6 @@
 "hkn" = (
 /obj/machinery/door/airlock{
 	name = "Service Hall";
-	check_one_access = 1;
 	req_access = list(22,25,26,28,35,37,38,46,70)
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -11974,7 +11962,6 @@
 "hLl" = (
 /obj/machinery/door/airlock/atmos{
 	name = "Atmospherics Access";
-	check_one_access = 1;
 	req_access = list(24,10)
 	},
 /obj/structure/disposalpipe/segment,
@@ -12872,9 +12859,7 @@
 	},
 /area/engine/mechanic_workshop)
 "ipc" = (
-/obj/structure/stairs{
-	dir = 2
-	},
+/obj/structure/stairs,
 /turf/simulated/floor/plasteel,
 /area/engine/break_room)
 "ipu" = (
@@ -13021,7 +13006,6 @@
 "iur" = (
 /obj/machinery/door/airlock/atmos{
 	name = "Atmospherics Access";
-	check_one_access = 1;
 	req_access = list(24,10)
 	},
 /obj/structure/disposalpipe/segment,
@@ -13560,7 +13544,6 @@
 "iKK" = (
 /obj/machinery/door/airlock/engineering{
 	name = "Engine Room";
-	check_one_access = 1;
 	req_access = list(24,10)
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -16601,9 +16584,7 @@
 /turf/simulated/floor/plasteel/airless,
 /area/space)
 "kKB" = (
-/obj/machinery/power/smes/engineering{
-	charge = 2e+006
-	},
+/obj/machinery/power/smes/engineering,
 /obj/structure/cable{
 	icon_state = "0-8"
 	},
@@ -17738,9 +17719,7 @@
 	},
 /area/quartermaster/storage)
 "lwN" = (
-/obj/structure/stairs{
-	dir = 2
-	},
+/obj/structure/stairs,
 /turf/simulated/floor/plasteel,
 /area/hallway/primary/central)
 "lxq" = (
@@ -18027,7 +18006,6 @@
 "lGd" = (
 /obj/machinery/door/airlock/atmos{
 	name = "Atmospherics Access";
-	check_one_access = 1;
 	req_access = list(24,10)
 	},
 /obj/structure/disposalpipe/segment,
@@ -19113,7 +19091,6 @@
 "mmX" = (
 /obj/machinery/door/airlock/atmos{
 	name = "Atmospherics Access";
-	check_one_access = 1;
 	req_access = list(24,10)
 	},
 /obj/structure/disposalpipe/segment,
@@ -19915,7 +19892,6 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/door/airlock/security{
 	name = "Evidence Storage";
-	check_one_access = 1;
 	req_access = list(1,4)
 	},
 /obj/machinery/door/firedoor,
@@ -20534,9 +20510,7 @@
 /turf/simulated/floor/plasteel/dark,
 /area/security/prison)
 "nkj" = (
-/obj/structure/stairs{
-	dir = 2
-	},
+/obj/structure/stairs,
 /turf/simulated/floor/plasteel,
 /area/crew_quarters/bar/atrium)
 "nkn" = (
@@ -20949,9 +20923,7 @@
 /turf/simulated/floor/plasteel,
 /area/crew_quarters/bar/atrium)
 "nAC" = (
-/obj/structure/stairs{
-	dir = 2
-	},
+/obj/structure/stairs,
 /turf/simulated/floor/plasteel,
 /area/hallway/primary/aft)
 "nAF" = (
@@ -21967,7 +21939,6 @@
 "ogE" = (
 /obj/machinery/door/airlock/atmos{
 	name = "Atmospherics Access";
-	check_one_access = 1;
 	req_access = list(24,10)
 	},
 /obj/structure/disposalpipe/segment,
@@ -24315,7 +24286,6 @@
 /area/engine/break_room)
 "pHi" = (
 /obj/machinery/door/window{
-	dir = 4;
 	name = "Fitness Ring"
 	},
 /obj/structure/window/reinforced{
@@ -24451,7 +24421,6 @@
 "pLe" = (
 /obj/machinery/door/airlock/atmos{
 	name = "Atmospherics Access";
-	check_one_access = 1;
 	req_access = list(24,10)
 	},
 /obj/structure/disposalpipe/segment,
@@ -24790,7 +24759,6 @@
 "pVN" = (
 /obj/machinery/door/airlock/atmos{
 	name = "Atmospherics Access";
-	check_one_access = 1;
 	req_access = list(24,10)
 	},
 /obj/structure/disposalpipe/segment,
@@ -26273,9 +26241,7 @@
 	},
 /area/hallway/secondary/entry)
 "qUW" = (
-/obj/machinery/power/smes/engineering{
-	charge = 2e+006
-	},
+/obj/machinery/power/smes/engineering,
 /obj/structure/cable,
 /obj/structure/cable{
 	icon_state = "1-8"
@@ -27840,9 +27806,7 @@
 /turf/simulated/floor/plasteel/dark,
 /area/hallway/secondary/exit)
 "rSs" = (
-/obj/machinery/power/smes/engineering{
-	charge = 2e+006
-	},
+/obj/machinery/power/smes/engineering,
 /obj/structure/cable{
 	icon_state = "0-4"
 	},
@@ -28639,10 +28603,7 @@
 /obj/structure/window/reinforced{
 	dir = 4
 	},
-/mob/living/carbon/human/lesser/monkey{
-	icon = 'icons/mob/monkey.dmi';
-	icon_state = "monkey1"
-	},
+/mob/living/carbon/human/lesser/monkey,
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
 	},
@@ -29401,7 +29362,6 @@
 "sYI" = (
 /obj/machinery/door/airlock/atmos{
 	name = "Atmospherics Access";
-	check_one_access = 1;
 	req_access = list(24,10)
 	},
 /obj/structure/disposalpipe/segment,
@@ -30012,7 +29972,6 @@
 "ttQ" = (
 /obj/machinery/door/airlock/atmos{
 	name = "Atmospherics Access";
-	check_one_access = 1;
 	req_access = list(24,10)
 	},
 /obj/structure/disposalpipe/segment,
@@ -30327,9 +30286,7 @@
 /turf/simulated/floor/glass/reinforced,
 /area/crew_quarters/dorms)
 "tEc" = (
-/obj/structure/stairs{
-	dir = 2
-	},
+/obj/structure/stairs,
 /turf/simulated/floor/plasteel,
 /area/medical/medbay)
 "tEf" = (
@@ -30642,7 +30599,6 @@
 /area/crew_quarters/dorms)
 "tOv" = (
 /mob/living/carbon/human/lesser/monkey/punpun{
-	icon = 'icons/mob/monkey.dmi';
 	icon_state = "punpun1"
 	},
 /turf/simulated/floor/carpet/black,
@@ -31388,7 +31344,6 @@
 "uml" = (
 /obj/machinery/door/airlock/mining/glass{
 	name = "Cargo Office";
-	check_one_access = 1;
 	req_access = list(31,48)
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -31971,7 +31926,6 @@
 	},
 /obj/machinery/door/airlock/engineering/glass{
 	name = "Laser Room";
-	check_one_access = 1;
 	req_access = list(24,10)
 	},
 /obj/machinery/door/firedoor,
@@ -33448,10 +33402,7 @@
 /turf/simulated/floor/carpet/royalblack,
 /area/ntrep)
 "vAv" = (
-/mob/living/carbon/human/lesser/monkey{
-	icon = 'icons/mob/monkey.dmi';
-	icon_state = "monkey1"
-	},
+/mob/living/carbon/human/lesser/monkey,
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
 	},
@@ -36008,7 +35959,6 @@
 "wWY" = (
 /obj/machinery/door/airlock/engineering{
 	name = "Engine Room";
-	check_one_access = 1;
 	req_access = list(24,10)
 	},
 /obj/structure/cable{
@@ -36412,7 +36362,6 @@
 /area/toxins/lab)
 "xjO" = (
 /obj/machinery/door/window/brigdoor{
-	dir = 4;
 	name = "Secure Creature Pen";
 	req_access = list(47)
 	},
diff --git a/_maps/map_files/generic/Admin_Zone.dmm b/_maps/map_files/generic/Admin_Zone.dmm
index d08a06e2ea0..29e8283512a 100644
--- a/_maps/map_files/generic/Admin_Zone.dmm
+++ b/_maps/map_files/generic/Admin_Zone.dmm
@@ -462,8 +462,7 @@
 /obj/machinery/door/poddoor/shutters{
 	dir = 2;
 	id_tag = "TD_Strela";
-	name = "Strela";
-	tag = null
+	name = "Strela"
 	},
 /turf/simulated/floor/plasteel{
 	dir = 1;
@@ -474,8 +473,7 @@
 /obj/machinery/door/poddoor/shutters{
 	dir = 2;
 	id_tag = "TD_Bojutsu";
-	name = "Bojutsu";
-	tag = null
+	name = "Bojutsu"
 	},
 /turf/simulated/floor/plasteel{
 	dir = 1;
@@ -619,8 +617,7 @@
 /obj/machinery/door/poddoor/shutters{
 	dir = 1;
 	id_tag = "TD_Shitcurity";
-	name = "Shitcurity";
-	tag = null
+	name = "Shitcurity"
 	},
 /turf/simulated/floor/plasteel{
 	dir = 1;
@@ -662,8 +659,7 @@
 /obj/machinery/door/poddoor/shutters{
 	dir = 1;
 	id_tag = "TD_Robaster";
-	name = "Robaster";
-	tag = null
+	name = "Robaster"
 	},
 /turf/simulated/floor/plasteel{
 	dir = 1;
@@ -947,8 +943,7 @@
 /obj/machinery/door/poddoor/shutters{
 	dir = 1;
 	id_tag = "TD_Cowboy";
-	name = "Cowboy";
-	tag = null
+	name = "Cowboy"
 	},
 /turf/simulated/floor/plasteel{
 	dir = 1;
@@ -1427,8 +1422,7 @@
 /obj/machinery/door/poddoor/shutters{
 	dir = 1;
 	id_tag = "TD_Cowboy";
-	name = "Cowboy";
-	tag = null
+	name = "Cowboy"
 	},
 /turf/simulated/floor/plasteel{
 	dir = 1;
@@ -1597,8 +1591,7 @@
 /obj/machinery/door/poddoor/shutters{
 	dir = 1;
 	id_tag = "TD_Shitcurity";
-	name = "Shitcurity";
-	tag = null
+	name = "Shitcurity"
 	},
 /turf/simulated/floor/plasteel{
 	dir = 1;
@@ -3208,8 +3201,7 @@
 /obj/machinery/door/poddoor/shutters{
 	dir = 2;
 	id_tag = "TD_Bojutsu";
-	name = "Bojutsu";
-	tag = null
+	name = "Bojutsu"
 	},
 /turf/simulated/floor/plasteel{
 	dir = 1;
@@ -3328,8 +3320,7 @@
 /obj/machinery/door/poddoor/shutters{
 	dir = 2;
 	id_tag = "TD_Strela";
-	name = "Strela";
-	tag = null
+	name = "Strela"
 	},
 /turf/simulated/floor/plasteel{
 	dir = 1;
@@ -3579,8 +3570,7 @@
 /obj/machinery/door/poddoor/shutters{
 	dir = 1;
 	id_tag = "TD_Robaster";
-	name = "Robaster";
-	tag = null
+	name = "Robaster"
 	},
 /turf/simulated/floor/plasteel{
 	dir = 1;
diff --git a/_maps/map_files/generic/syndicatebase.dmm b/_maps/map_files/generic/syndicatebase.dmm
index 2d05a13487b..73d118a8912 100644
--- a/_maps/map_files/generic/syndicatebase.dmm
+++ b/_maps/map_files/generic/syndicatebase.dmm
@@ -220,8 +220,7 @@
 	dir = 6
 	},
 /obj/structure/cable{
-	icon_state = "2-4";
-	tag = null
+	icon_state = "2-4"
 	},
 /turf/simulated/floor/plasteel{
 	dir = 1;
@@ -1393,8 +1392,7 @@
 	dir = 1
 	},
 /obj/structure/cable{
-	icon_state = "2-4";
-	tag = null
+	icon_state = "2-4"
 	},
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -1442,8 +1440,7 @@
 	dir = 6
 	},
 /obj/structure/cable{
-	icon_state = "2-4";
-	tag = null
+	icon_state = "2-4"
 	},
 /turf/simulated/floor/plating,
 /area/syndicate/unpowered/syndicate_space_base/maintenance/north)
@@ -1489,9 +1486,7 @@
 	tag = "icon-bulb1 (WEST)";
 	throw_range = 2
 	},
-/obj/effect/spawner/random_spawners/syndicate/loot{
-	spawn_inside = null
-	},
+/obj/effect/spawner/random_spawners/syndicate/loot,
 /turf/simulated/floor/plating,
 /area/syndicate/unpowered/syndicate_space_base/maintenance/north)
 "bmH" = (
@@ -3566,8 +3561,7 @@
 /area/syndicate/unpowered/syndicate_space_base/engineering)
 "dms" = (
 /obj/structure/cable{
-	icon_state = "2-4";
-	tag = null
+	icon_state = "2-4"
 	},
 /obj/machinery/light/small{
 	dir = 8
@@ -6036,9 +6030,7 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/rack,
 /obj/effect/spawner/lootdrop/maintenance/double,
-/obj/effect/spawner/random_spawners/syndicate/loot{
-	spawn_inside = null
-	},
+/obj/effect/spawner/random_spawners/syndicate/loot,
 /obj/random/tool,
 /turf/simulated/floor/plating,
 /area/syndicate/unpowered/syndicate_space_base/maintenance/south)
@@ -6562,9 +6554,7 @@
 /obj/effect/spawner/lootdrop/maintenance/tripple,
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/rack,
-/obj/effect/spawner/random_spawners/syndicate/loot{
-	spawn_inside = null
-	},
+/obj/effect/spawner/random_spawners/syndicate/loot,
 /obj/random/tool,
 /turf/simulated/floor/plating,
 /area/syndicate/unpowered/syndicate_space_base/maintenance/north)
@@ -7390,7 +7380,6 @@
 /area/syndicate/unpowered/syndicate_space_base/rnd)
 "gPn" = (
 /obj/machinery/atmospherics/trinary/mixer{
-	desc = null;
 	dir = 8;
 	node1_concentration = 0.8;
 	node2_concentration = 0.2;
@@ -7531,9 +7520,7 @@
 /obj/effect/turf_decal/tile/brown{
 	dir = 8
 	},
-/obj/effect/spawner/random_spawners/syndicate/loot{
-	spawn_inside = null
-	},
+/obj/effect/spawner/random_spawners/syndicate/loot,
 /turf/simulated/floor/plasteel{
 	dir = 1;
 	icon_state = "dark"
@@ -7882,8 +7869,7 @@
 	dir = 4
 	},
 /obj/structure/cable{
-	icon_state = "2-4";
-	tag = null
+	icon_state = "2-4"
 	},
 /obj/effect/turf_decal{
 	icon = 'icons/obj/lavaland/survival_pod.dmi';
@@ -8058,8 +8044,7 @@
 	icon_state = "1-2"
 	},
 /obj/structure/cable{
-	icon_state = "2-4";
-	tag = null
+	icon_state = "2-4"
 	},
 /obj/structure/disposalpipe/segment{
 	dir = 10
@@ -10026,9 +10011,7 @@
 /obj/structure/rack,
 /obj/effect/spawner/lootdrop/maintenance/tripple,
 /obj/random/toolbox,
-/obj/effect/spawner/random_spawners/syndicate/loot{
-	spawn_inside = null
-	},
+/obj/effect/spawner/random_spawners/syndicate/loot,
 /turf/simulated/floor/plating,
 /area/syndicate/unpowered/syndicate_space_base/maintenance/south)
 "jkz" = (
@@ -12047,9 +12030,7 @@
 /obj/structure/rack,
 /obj/effect/spawner/lootdrop/maintenance/tripple,
 /obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/random_spawners/syndicate/loot{
-	spawn_inside = null
-	},
+/obj/effect/spawner/random_spawners/syndicate/loot,
 /turf/simulated/floor/plating,
 /area/syndicate/unpowered/syndicate_space_base/maintenance/south)
 "lho" = (
@@ -12877,8 +12858,7 @@
 	icon_state = "1-2"
 	},
 /obj/structure/cable{
-	icon_state = "2-4";
-	tag = null
+	icon_state = "2-4"
 	},
 /obj/effect/turf_decal/tile/yellow,
 /turf/simulated/floor/plasteel{
@@ -13201,7 +13181,7 @@
 	pixel_y = 15
 	},
 /obj/item/instrument/bikehorn{
-	pixel_y = -7;
+	pixel_y = -7
 	},
 /obj/structure/sign/poster/contraband/random{
 	pixel_x = 32
@@ -13213,7 +13193,7 @@
 	pixel_y = 8
 	},
 /obj/item/clothing/mask/muzzle{
-	pixel_y = -12;
+	pixel_y = -12
 	},
 /turf/simulated/floor/plasteel{
 	dir = 1;
@@ -13582,13 +13562,13 @@
 	pixel_y = 14
 	},
 /obj/item/radio/electropack{
-	pixel_x = -3;
+	pixel_x = -3
 	},
 /obj/item/razor{
-	pixel_x = 10;
+	pixel_x = 10
 	},
 /obj/item/assembly/signaler{
-	pixel_x = -4;
+	pixel_x = -4
 	},
 /obj/structure/sign/poster/contraband/random{
 	pixel_x = -32
@@ -14197,8 +14177,7 @@
 	tag = ""
 	},
 /obj/structure/cable{
-	icon_state = "2-4";
-	tag = null
+	icon_state = "2-4"
 	},
 /obj/structure/grille,
 /obj/structure/window/plastitanium,
@@ -14586,8 +14565,7 @@
 	initialize_directions = 11
 	},
 /obj/structure/cable{
-	icon_state = "2-4";
-	tag = null
+	icon_state = "2-4"
 	},
 /obj/structure/disposalpipe/junction{
 	dir = 4
@@ -15125,8 +15103,7 @@
 	tag = ""
 	},
 /obj/structure/cable{
-	icon_state = "2-4";
-	tag = null
+	icon_state = "2-4"
 	},
 /obj/structure/disposalpipe/junction/yjunction{
 	dir = 2
@@ -15250,8 +15227,7 @@
 	tag = ""
 	},
 /obj/structure/cable{
-	icon_state = "2-4";
-	tag = null
+	icon_state = "2-4"
 	},
 /turf/simulated/floor/plasteel{
 	dir = 1;
@@ -15400,8 +15376,7 @@
 	tag = ""
 	},
 /obj/structure/cable{
-	icon_state = "2-4";
-	tag = null
+	icon_state = "2-4"
 	},
 /obj/structure/disposalpipe/segment,
 /turf/simulated/floor/plasteel{
@@ -15419,8 +15394,7 @@
 	},
 /obj/effect/turf_decal/tile/neutral,
 /obj/structure/cable{
-	icon_state = "2-4";
-	tag = null
+	icon_state = "2-4"
 	},
 /turf/simulated/floor/plasteel{
 	dir = 1;
@@ -15769,8 +15743,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/structure/cable{
-	icon_state = "2-4";
-	tag = null
+	icon_state = "2-4"
 	},
 /turf/simulated/floor/plasteel{
 	dir = 1;
@@ -16231,7 +16204,6 @@
 "osV" = (
 /obj/effect/turf_decal/tile/yellow,
 /obj/machinery/atmospherics/trinary/filter{
-	desc = null;
 	dir = 1;
 	filter_type = 3;
 	on = 1
@@ -16567,8 +16539,7 @@
 	icon_state = "4-8"
 	},
 /obj/structure/cable{
-	icon_state = "2-4";
-	tag = null
+	icon_state = "2-4"
 	},
 /turf/simulated/floor/plasteel{
 	dir = 1;
@@ -16931,9 +16902,7 @@
 /area/syndicate/unpowered/syndicate_space_base/engineering)
 "oTI" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/random_spawners/syndicate/loot{
-	spawn_inside = null
-	},
+/obj/effect/spawner/random_spawners/syndicate/loot,
 /turf/simulated/floor/plating,
 /area/syndicate/unpowered/syndicate_space_base/maintenance/south)
 "oTR" = (
@@ -17494,9 +17463,7 @@
 	},
 /obj/item/stack/tape_roll,
 /obj/effect/spawner/lootdrop/maintenance/double,
-/obj/effect/spawner/random_spawners/syndicate/loot{
-	spawn_inside = null
-	},
+/obj/effect/spawner/random_spawners/syndicate/loot,
 /turf/simulated/floor/plating,
 /area/syndicate/unpowered/syndicate_space_base/maintenance/central)
 "ppf" = (
@@ -17568,8 +17535,7 @@
 	dir = 4
 	},
 /obj/structure/cable{
-	icon_state = "2-4";
-	tag = null
+	icon_state = "2-4"
 	},
 /turf/simulated/floor/wood,
 /area/syndicate/unpowered/syndicate_space_base/dormitories/cabin1)
@@ -18371,8 +18337,7 @@
 	icon_state = "4-8"
 	},
 /obj/structure/cable{
-	icon_state = "2-4";
-	tag = null
+	icon_state = "2-4"
 	},
 /obj/structure/disposalpipe/trunk{
 	dir = 4
@@ -18422,8 +18387,7 @@
 	icon_state = "4-8"
 	},
 /obj/structure/cable{
-	icon_state = "2-4";
-	tag = null
+	icon_state = "2-4"
 	},
 /turf/simulated/floor/plasteel{
 	dir = 1;
@@ -19241,7 +19205,7 @@
 	dir = 4
 	},
 /obj/machinery/vending/wallmed/syndicate{
-	pixel_x = 24;
+	pixel_x = 24
 	},
 /turf/simulated/floor/plasteel{
 	dir = 1;
@@ -20940,8 +20904,7 @@
 	dir = 4
 	},
 /obj/structure/cable{
-	icon_state = "2-4";
-	tag = null
+	icon_state = "2-4"
 	},
 /turf/simulated/floor/carpet/black,
 /area/syndicate/unpowered/syndicate_space_base/dormitories/cabin2)
@@ -21249,8 +21212,7 @@
 "ska" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable{
-	icon_state = "2-4";
-	tag = null
+	icon_state = "2-4"
 	},
 /turf/simulated/floor/plating,
 /area/syndicate/unpowered/syndicate_space_base/maintenance/east)
@@ -21333,9 +21295,7 @@
 /obj/structure/closet/crate,
 /obj/effect/spawner/lootdrop/maintenance/tripple,
 /obj/item/storage/wallet/random,
-/obj/effect/spawner/random_spawners/syndicate/loot{
-	spawn_inside = null
-	},
+/obj/effect/spawner/random_spawners/syndicate/loot,
 /turf/simulated/floor/plating,
 /area/syndicate/unpowered/syndicate_space_base/maintenance/east)
 "smz" = (
@@ -21720,9 +21680,7 @@
 "sJO" = (
 /obj/structure/closet/crate,
 /obj/effect/spawner/lootdrop/maintenance/double,
-/obj/effect/spawner/random_spawners/syndicate/loot{
-	spawn_inside = null
-	},
+/obj/effect/spawner/random_spawners/syndicate/loot,
 /turf/simulated/floor/plasteel{
 	dir = 1;
 	icon_state = "dark"
@@ -21741,9 +21699,7 @@
 "sLk" = (
 /obj/effect/spawner/lootdrop/maintenance/tripple,
 /obj/structure/closet/crate,
-/obj/effect/spawner/random_spawners/syndicate/loot{
-	spawn_inside = null
-	},
+/obj/effect/spawner/random_spawners/syndicate/loot,
 /turf/simulated/floor/plating,
 /area/syndicate/unpowered/syndicate_space_base/maintenance/south)
 "sLL" = (
@@ -22842,8 +22798,7 @@
 	dir = 4
 	},
 /obj/structure/cable{
-	icon_state = "2-4";
-	tag = null
+	icon_state = "2-4"
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 6
@@ -23941,9 +23896,7 @@
 /obj/effect/spawner/lootdrop/maintenance/tripple,
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/rack,
-/obj/effect/spawner/random_spawners/syndicate/loot{
-	spawn_inside = null
-	},
+/obj/effect/spawner/random_spawners/syndicate/loot,
 /turf/simulated/floor/plating,
 /area/syndicate/unpowered/syndicate_space_base/maintenance/east)
 "ujO" = (
@@ -23973,9 +23926,7 @@
 	dir = 4
 	},
 /obj/structure/rack,
-/obj/effect/spawner/random_spawners/syndicate/loot{
-	spawn_inside = null
-	},
+/obj/effect/spawner/random_spawners/syndicate/loot,
 /turf/simulated/floor/plating,
 /area/syndicate/unpowered/syndicate_space_base/maintenance/east)
 "ulz" = (
@@ -24048,9 +23999,7 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/spawner/lootdrop/maintenance/tripple,
 /obj/structure/rack,
-/obj/effect/spawner/random_spawners/syndicate/loot{
-	spawn_inside = null
-	},
+/obj/effect/spawner/random_spawners/syndicate/loot,
 /turf/simulated/floor/plating,
 /area/syndicate/unpowered/syndicate_space_base/maintenance/south)
 "umD" = (
@@ -24945,8 +24894,7 @@
 	icon_state = "4-8"
 	},
 /obj/structure/cable{
-	icon_state = "2-4";
-	tag = null
+	icon_state = "2-4"
 	},
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -25452,8 +25400,7 @@
 	tag = "90Curve"
 	},
 /obj/structure/cable{
-	icon_state = "2-4";
-	tag = null
+	icon_state = "2-4"
 	},
 /turf/simulated/wall/mineral/plastitanium/nodiagonal,
 /area/syndicate/unpowered/syndicate_space_base/prison)
@@ -25786,8 +25733,7 @@
 	dir = 10
 	},
 /obj/structure/cable{
-	icon_state = "2-4";
-	tag = null
+	icon_state = "2-4"
 	},
 /obj/structure/disposalpipe/segment{
 	dir = 6
@@ -25883,8 +25829,7 @@
 	dir = 10
 	},
 /obj/structure/cable{
-	icon_state = "2-4";
-	tag = null
+	icon_state = "2-4"
 	},
 /obj/structure/disposalpipe/segment{
 	dir = 6
@@ -26673,8 +26618,7 @@
 	icon_state = "2-8"
 	},
 /obj/structure/cable{
-	icon_state = "2-4";
-	tag = null
+	icon_state = "2-4"
 	},
 /obj/structure/disposalpipe/segment,
 /turf/simulated/floor/plasteel{
@@ -28058,8 +28002,7 @@
 	dir = 6
 	},
 /obj/structure/cable{
-	icon_state = "2-4";
-	tag = null
+	icon_state = "2-4"
 	},
 /obj/structure/disposalpipe/segment{
 	dir = 6
@@ -29487,8 +29430,7 @@
 /area/syndicate/unpowered/syndicate_space_base/medbay)
 "xOB" = (
 /obj/structure/cable{
-	icon_state = "2-4";
-	tag = null
+	icon_state = "2-4"
 	},
 /turf/simulated/floor/plasteel{
 	dir = 1;
diff --git a/_maps/map_files/generic/z2_old.dmm b/_maps/map_files/generic/z2_old.dmm
index eed13a85dc3..425a1df4322 100644
--- a/_maps/map_files/generic/z2_old.dmm
+++ b/_maps/map_files/generic/z2_old.dmm
@@ -7002,9 +7002,7 @@
 /obj/machinery/conveyor{
 	id = "SOL"
 	},
-/obj/structure/plasticflaps{
-	opacity = 1
-	},
+/obj/structure/plasticflaps,
 /turf/simulated/floor/indestructible{
 	icon_state = "floor"
 	},
@@ -25891,9 +25889,7 @@
 	},
 /area/centcom/jail)
 "sCb" = (
-/obj/structure/plasticflaps{
-	opacity = 1
-	},
+/obj/structure/plasticflaps,
 /obj/structure/cable{
 	icon_state = "1-2";
 	tag = ""
diff --git a/_maps/map_files/shuttles/emergency_bar.dmm b/_maps/map_files/shuttles/emergency_bar.dmm
index 3d3d1ea7019..ab419c871b6 100644
--- a/_maps/map_files/shuttles/emergency_bar.dmm
+++ b/_maps/map_files/shuttles/emergency_bar.dmm
@@ -424,7 +424,6 @@
 /area/shuttle/escape)
 "bn" = (
 /obj/machinery/door/airlock/medical/glass{
-	id_tag = null;
 	name = "Escape Shuttle Infirmary"
 	},
 /turf/simulated/floor/shuttle{
diff --git a/_maps/map_files/shuttles/emergency_clown.dmm b/_maps/map_files/shuttles/emergency_clown.dmm
index ec29ed67cb5..26f6fd51861 100644
--- a/_maps/map_files/shuttles/emergency_clown.dmm
+++ b/_maps/map_files/shuttles/emergency_clown.dmm
@@ -253,7 +253,6 @@
 /obj/machinery/door/airlock/shuttle{
 	aiControlDisabled = 1;
 	hackProof = 1;
-	id_tag = null;
 	name = "Shuttle Cargo Hatch"
 	},
 /turf/simulated/floor/shuttle{
@@ -274,7 +273,6 @@
 /area/shuttle/escape)
 "bb" = (
 /obj/machinery/door/airlock/medical/glass{
-	id_tag = null;
 	name = "Escape Shuttle Infirmary"
 	},
 /turf/simulated/floor/plasteel{
diff --git a/_maps/map_files/shuttles/emergency_cyb.dmm b/_maps/map_files/shuttles/emergency_cyb.dmm
index 517f00a6adb..17815c6e9e7 100644
--- a/_maps/map_files/shuttles/emergency_cyb.dmm
+++ b/_maps/map_files/shuttles/emergency_cyb.dmm
@@ -760,7 +760,6 @@
 /area/shuttle/escape)
 "cl" = (
 /obj/machinery/door/airlock/medical/glass{
-	id_tag = null;
 	name = "Escape Shuttle Infirmary"
 	},
 /obj/effect/decal/warning_stripes/south,
@@ -812,7 +811,6 @@
 /area/shuttle/escape)
 "cu" = (
 /obj/machinery/door/airlock/medical/glass{
-	id_tag = null;
 	name = "Escape Shuttle Infirmary"
 	},
 /turf/simulated/floor/plasteel{
diff --git a/_maps/map_files/shuttles/emergency_dept.dmm b/_maps/map_files/shuttles/emergency_dept.dmm
index 51931dff826..8ee3bd94123 100644
--- a/_maps/map_files/shuttles/emergency_dept.dmm
+++ b/_maps/map_files/shuttles/emergency_dept.dmm
@@ -214,7 +214,6 @@
 /area/shuttle/escape)
 "aI" = (
 /obj/machinery/door/airlock/medical/glass{
-	id_tag = null;
 	name = "Escape Shuttle Infirmary"
 	},
 /turf/simulated/floor/plasteel{
@@ -229,7 +228,6 @@
 /area/shuttle/escape)
 "aL" = (
 /obj/machinery/door/airlock/medical/glass{
-	id_tag = null;
 	name = "Escape Shuttle Infirmary";
 	normalspeed = 0;
 	req_access = list(5)
@@ -785,7 +783,6 @@
 /area/shuttle/escape)
 "sc" = (
 /obj/machinery/door/airlock/medical/glass{
-	id_tag = null;
 	name = "Escape Shuttle Medical Seating";
 	normalspeed = 0;
 	req_access = list(5)
diff --git a/_maps/map_files/shuttles/emergency_meta.dmm b/_maps/map_files/shuttles/emergency_meta.dmm
index 28688cc1906..b6c0fa5d596 100644
--- a/_maps/map_files/shuttles/emergency_meta.dmm
+++ b/_maps/map_files/shuttles/emergency_meta.dmm
@@ -416,7 +416,6 @@
 /area/shuttle/escape)
 "bl" = (
 /obj/machinery/door/airlock/medical/glass{
-	id_tag = null;
 	name = "Escape Shuttle Infirmary"
 	},
 /turf/simulated/floor/shuttle,
diff --git a/_maps/map_files/shuttles/emergency_narnar.dmm b/_maps/map_files/shuttles/emergency_narnar.dmm
index 4a433e3081f..8ccb2334757 100644
--- a/_maps/map_files/shuttles/emergency_narnar.dmm
+++ b/_maps/map_files/shuttles/emergency_narnar.dmm
@@ -90,7 +90,6 @@
 "as" = (
 /obj/effect/decal/remains/human{
 	desc = "This guy seemed to have died in terrible way! Half his remains are dust.";
-	icon_state = "remains";
 	name = "Human remains"
 	},
 /obj/structure/chair/comfy/shuttle{
@@ -104,12 +103,10 @@
 	},
 /obj/machinery/light/spot{
 	tag = "icon-tube1 (NORTH)";
-	icon_state = "tube1";
 	dir = 1
 	},
 /obj/effect/decal/remains/human{
 	desc = "This guy seemed to have died in terrible way! Half his remains are dust.";
-	icon_state = "remains";
 	name = "Human remains"
 	},
 /obj/structure/chair/comfy/shuttle,
@@ -118,7 +115,6 @@
 "au" = (
 /obj/effect/decal/remains/human{
 	desc = "This guy seemed to have died in terrible way! Half his remains are dust.";
-	icon_state = "remains";
 	name = "Human remains"
 	},
 /obj/structure/chair/comfy/shuttle{
@@ -136,7 +132,6 @@
 	},
 /obj/machinery/light/spot{
 	tag = "icon-tube1 (NORTH)";
-	icon_state = "tube1";
 	dir = 1
 	},
 /turf/simulated/floor/engine/cult,
@@ -147,7 +142,6 @@
 	},
 /obj/effect/decal/remains/human{
 	desc = "This guy seemed to have died in terrible way! Half his remains are dust.";
-	icon_state = "remains";
 	name = "Human remains"
 	},
 /obj/structure/chair/comfy/shuttle{
@@ -172,7 +166,6 @@
 "aB" = (
 /obj/effect/decal/remains/human{
 	desc = "This guy seemed to have died in terrible way! Half his remains are dust.";
-	icon_state = "remains";
 	name = "Human remains"
 	},
 /obj/structure/chair/comfy/shuttle{
@@ -183,12 +176,10 @@
 "aC" = (
 /obj/item/radio/intercom{
 	dir = 4;
-	name = "station intercom (General)";
 	pixel_x = 28
 	},
 /obj/effect/decal/remains/human{
 	desc = "This guy seemed to have died in terrible way! Half his remains are dust.";
-	icon_state = "remains";
 	name = "Human remains"
 	},
 /obj/structure/chair/comfy/shuttle{
@@ -204,7 +195,6 @@
 /area/shuttle/escape)
 "aE" = (
 /obj/docking_port/mobile/emergency{
-	dir = 4;
 	dwidth = 11;
 	height = 13;
 	name = "Shuttle 667";
@@ -221,12 +211,10 @@
 "aG" = (
 /obj/item/radio/intercom{
 	dir = 8;
-	name = "station intercom (General)";
 	pixel_x = -28
 	},
 /obj/machinery/light/spot{
 	tag = "icon-tube1 (WEST)";
-	icon_state = "tube1";
 	dir = 8
 	},
 /obj/item/flag/cult,
@@ -246,7 +234,6 @@
 	},
 /obj/machinery/light/spot{
 	tag = "icon-tube1 (EAST)";
-	icon_state = "tube1";
 	dir = 4
 	},
 /turf/simulated/floor/engine/cult,
@@ -279,7 +266,6 @@
 /obj/item/crowbar,
 /obj/machinery/light/spot{
 	tag = "icon-tube1 (WEST)";
-	icon_state = "tube1";
 	dir = 8
 	},
 /turf/simulated/floor/engine/cult,
@@ -294,8 +280,7 @@
 	color = "red"
 	},
 /turf/simulated/wall/shuttle{
-	icon_state = "swall3";
-	dir = 2
+	icon_state = "swall3"
 	},
 /turf/simulated/wall/cult,
 /area/shuttle/escape)
@@ -318,8 +303,7 @@
 	},
 /turf/simulated/wall/shuttle{
 	tag = "icon-swall14";
-	icon_state = "swall14";
-	dir = 2
+	icon_state = "swall14"
 	},
 /area/shuttle/escape)
 "aV" = (
@@ -365,7 +349,6 @@
 "bb" = (
 /obj/machinery/light/spot{
 	tag = "icon-tube1 (EAST)";
-	icon_state = "tube1";
 	dir = 4
 	},
 /turf/simulated/floor/engine/cult,
diff --git a/_maps/map_files/shuttles/emergency_old.dmm b/_maps/map_files/shuttles/emergency_old.dmm
index 861d23787ef..5ebaafd471a 100644
--- a/_maps/map_files/shuttles/emergency_old.dmm
+++ b/_maps/map_files/shuttles/emergency_old.dmm
@@ -220,7 +220,6 @@
 /obj/machinery/door/airlock/shuttle{
 	aiControlDisabled = 1;
 	hackProof = 1;
-	id_tag = null;
 	name = "Shuttle Cargo Hatch"
 	},
 /turf/simulated/floor/shuttle{
@@ -229,7 +228,6 @@
 /area/shuttle/escape)
 "aV" = (
 /obj/machinery/door/airlock/medical/glass{
-	id_tag = null;
 	name = "Escape Shuttle Infirmary"
 	},
 /turf/simulated/floor/shuttle,
diff --git a/_maps/map_files/shuttles/ferry_cargo.dmm b/_maps/map_files/shuttles/ferry_cargo.dmm
index 79947ec84fd..ef174ea9ec8 100644
--- a/_maps/map_files/shuttles/ferry_cargo.dmm
+++ b/_maps/map_files/shuttles/ferry_cargo.dmm
@@ -139,9 +139,7 @@
 	},
 /area/shuttle/transport)
 "D" = (
-/obj/structure/plasticflaps{
-	opacity = 1
-	},
+/obj/structure/plasticflaps,
 /turf/simulated/floor/plasteel{
 	dir = 8;
 	icon_state = "vault"
diff --git a/_maps/map_files/shuttles/ferry_deepdarkdungeon.dmm b/_maps/map_files/shuttles/ferry_deepdarkdungeon.dmm
index f41aefabd3d..1194537a946 100644
--- a/_maps/map_files/shuttles/ferry_deepdarkdungeon.dmm
+++ b/_maps/map_files/shuttles/ferry_deepdarkdungeon.dmm
@@ -179,7 +179,7 @@
 /area/shuttle/transport)
 "L" = (
 /obj/machinery/disco{
-	anchored = 1;
+	anchored = 1
 	},
 /turf/simulated/floor/shuttle/syndicate,
 /area/shuttle/transport)
diff --git a/_maps/map_files/templates/shelter_1.dmm b/_maps/map_files/templates/shelter_1.dmm
index 11bf7520e5f..ff40646262d 100644
--- a/_maps/map_files/templates/shelter_1.dmm
+++ b/_maps/map_files/templates/shelter_1.dmm
@@ -4,9 +4,7 @@
 /area/survivalpod)
 "b" = (
 /obj/structure/sign/mining/survival{
-	dir = 1;
-	icon_state = "survival";
-	
+	dir = 1
 	},
 /turf/simulated/wall/mineral/titanium/survival,
 /area/survivalpod)
@@ -46,7 +44,6 @@
 "j" = (
 /obj/structure/sign/mining/survival{
 	dir = 4;
-	icon_state = "survival";
 	tag = "icon-survival (EAST)"
 	},
 /turf/simulated/wall/mineral/titanium/survival,
diff --git a/_maps/map_files/templates/shelter_2.dmm b/_maps/map_files/templates/shelter_2.dmm
index 600c1c9e410..a93b8de9cc4 100644
--- a/_maps/map_files/templates/shelter_2.dmm
+++ b/_maps/map_files/templates/shelter_2.dmm
@@ -27,9 +27,7 @@
 /area/survivalpod)
 "g" = (
 /obj/structure/sign/mining/survival{
-	dir = 1;
-	icon_state = "survival";
-	
+	dir = 1
 	},
 /turf/simulated/wall/mineral/titanium/survival,
 /area/survivalpod)
@@ -143,7 +141,6 @@
 "x" = (
 /obj/structure/sign/mining/survival{
 	dir = 4;
-	icon_state = "survival";
 	tag = "icon-survival (EAST)"
 	},
 /turf/simulated/wall/mineral/titanium/survival,
diff --git a/_maps/map_files/templates/shelter_3.dmm b/_maps/map_files/templates/shelter_3.dmm
index 2fa177400ac..287e2d2c845 100644
--- a/_maps/map_files/templates/shelter_3.dmm
+++ b/_maps/map_files/templates/shelter_3.dmm
@@ -30,7 +30,6 @@
 "f" = (
 /obj/structure/sign/mining/survival{
 	dir = 4;
-	icon_state = "survival";
 	tag = "icon-survival (EAST)"
 	},
 /obj/structure/disposalpipe/segment{
@@ -41,7 +40,6 @@
 "g" = (
 /obj/structure/sign/mining/survival{
 	dir = 4;
-	icon_state = "survival";
 	tag = "icon-survival (EAST)"
 	},
 /obj/structure/disposalpipe/segment{
@@ -108,9 +106,7 @@
 /area/survivalpod)
 "s" = (
 /obj/structure/sign/mining/survival{
-	dir = 1;
-	icon_state = "survival";
-	
+	dir = 1
 	},
 /turf/simulated/wall/mineral/titanium/survival,
 /area/survivalpod)
@@ -139,7 +135,6 @@
 "y" = (
 /obj/structure/sign/mining/survival{
 	dir = 4;
-	icon_state = "survival";
 	tag = "icon-survival (EAST)"
 	},
 /obj/structure/disposalpipe/junction{
@@ -232,7 +227,6 @@
 "W" = (
 /obj/structure/sign/mining/survival{
 	dir = 4;
-	icon_state = "survival";
 	tag = "icon-survival (EAST)"
 	},
 /turf/simulated/wall/mineral/titanium/survival,
diff --git a/_maps/map_files/templates/small_shuttle_1.dmm b/_maps/map_files/templates/small_shuttle_1.dmm
index 56921138203..82ec3b34a99 100644
--- a/_maps/map_files/templates/small_shuttle_1.dmm
+++ b/_maps/map_files/templates/small_shuttle_1.dmm
@@ -66,7 +66,6 @@
 /area/ruin/powered)
 "n" = (
 /obj/machinery/light{
-	icon_state = "tube1";
 	dir = 8
 	},
 /turf/simulated/floor/shuttle,
@@ -115,8 +114,7 @@
 /area/ruin/powered)
 "v" = (
 /obj/machinery/light{
-	dir = 4;
-	icon_state = "tube1"
+	dir = 4
 	},
 /turf/simulated/floor/shuttle,
 /area/ruin/powered)
diff --git a/_maps/map_files/templates/spacehotel/n_01.dmm b/_maps/map_files/templates/spacehotel/n_01.dmm
index cbded8a0231..03d6e9cea78 100644
--- a/_maps/map_files/templates/spacehotel/n_01.dmm
+++ b/_maps/map_files/templates/spacehotel/n_01.dmm
@@ -51,7 +51,6 @@
 /area/template_noop)
 "k" = (
 /obj/structure/sink{
-	icon_state = "sink";
 	dir = 8;
 	pixel_x = -12;
 	pixel_y = 2
diff --git a/_maps/map_files/templates/spacehotel/n_02.dmm b/_maps/map_files/templates/spacehotel/n_02.dmm
index f7d60121698..4e69776ac26 100644
--- a/_maps/map_files/templates/spacehotel/n_02.dmm
+++ b/_maps/map_files/templates/spacehotel/n_02.dmm
@@ -81,7 +81,6 @@
 /area/template_noop)
 "n" = (
 /obj/structure/sink{
-	icon_state = "sink";
 	dir = 8;
 	pixel_x = -12;
 	pixel_y = 2
diff --git a/_maps/map_files/templates/spacehotel/n_03.dmm b/_maps/map_files/templates/spacehotel/n_03.dmm
index 38f5b0b74b6..4c2095ce50c 100644
--- a/_maps/map_files/templates/spacehotel/n_03.dmm
+++ b/_maps/map_files/templates/spacehotel/n_03.dmm
@@ -46,7 +46,6 @@
 /area/template_noop)
 "j" = (
 /obj/structure/sink{
-	icon_state = "sink";
 	dir = 8;
 	pixel_x = -12;
 	pixel_y = 2
diff --git a/_maps/map_files/templates/spacehotel/n_04.dmm b/_maps/map_files/templates/spacehotel/n_04.dmm
index 8a7267de9a2..dde66ef0cd2 100644
--- a/_maps/map_files/templates/spacehotel/n_04.dmm
+++ b/_maps/map_files/templates/spacehotel/n_04.dmm
@@ -79,7 +79,6 @@
 /area/template_noop)
 "p" = (
 /obj/structure/sink{
-	icon_state = "sink";
 	dir = 8;
 	pixel_x = -12;
 	pixel_y = 2
diff --git a/_maps/map_files/templates/spacehotel/n_05.dmm b/_maps/map_files/templates/spacehotel/n_05.dmm
index 8745adb72f7..9d397d472a3 100644
--- a/_maps/map_files/templates/spacehotel/n_05.dmm
+++ b/_maps/map_files/templates/spacehotel/n_05.dmm
@@ -51,7 +51,6 @@
 /area/template_noop)
 "k" = (
 /obj/structure/sink{
-	icon_state = "sink";
 	dir = 8;
 	pixel_x = -12;
 	pixel_y = 2
diff --git a/_maps/map_files/templates/spacehotel/n_06.dmm b/_maps/map_files/templates/spacehotel/n_06.dmm
index f5ab2411f0b..69ed0acfd9d 100644
--- a/_maps/map_files/templates/spacehotel/n_06.dmm
+++ b/_maps/map_files/templates/spacehotel/n_06.dmm
@@ -72,7 +72,6 @@
 /area/template_noop)
 "n" = (
 /obj/structure/sink{
-	icon_state = "sink";
 	dir = 8;
 	pixel_x = -12;
 	pixel_y = 2
diff --git a/_maps/map_files/templates/spacehotel/n_07.dmm b/_maps/map_files/templates/spacehotel/n_07.dmm
index b84ace1fa25..9b04e127708 100644
--- a/_maps/map_files/templates/spacehotel/n_07.dmm
+++ b/_maps/map_files/templates/spacehotel/n_07.dmm
@@ -51,7 +51,6 @@
 /area/template_noop)
 "k" = (
 /obj/structure/sink{
-	icon_state = "sink";
 	dir = 8;
 	pixel_x = -12;
 	pixel_y = 2
diff --git a/_maps/map_files/templates/spacehotel/n_08.dmm b/_maps/map_files/templates/spacehotel/n_08.dmm
index 99bfbceea16..9098f6380c6 100644
--- a/_maps/map_files/templates/spacehotel/n_08.dmm
+++ b/_maps/map_files/templates/spacehotel/n_08.dmm
@@ -64,7 +64,6 @@
 /area/template_noop)
 "l" = (
 /obj/structure/sink{
-	icon_state = "sink";
 	dir = 8;
 	pixel_x = -12;
 	pixel_y = 2
diff --git a/_maps/map_files/templates/spacehotel/n_09.dmm b/_maps/map_files/templates/spacehotel/n_09.dmm
index bfd17288b6e..aa873aa5521 100644
--- a/_maps/map_files/templates/spacehotel/n_09.dmm
+++ b/_maps/map_files/templates/spacehotel/n_09.dmm
@@ -50,7 +50,6 @@
 /area/template_noop)
 "k" = (
 /obj/structure/sink{
-	icon_state = "sink";
 	dir = 8;
 	pixel_x = -12;
 	pixel_y = 2
diff --git a/_maps/map_files/templates/spacehotel/n_11.dmm b/_maps/map_files/templates/spacehotel/n_11.dmm
index c7e57ecddb1..ae46d377db2 100644
--- a/_maps/map_files/templates/spacehotel/n_11.dmm
+++ b/_maps/map_files/templates/spacehotel/n_11.dmm
@@ -63,7 +63,6 @@
 /area/template_noop)
 "l" = (
 /obj/structure/sink{
-	icon_state = "sink";
 	dir = 8;
 	pixel_x = -12;
 	pixel_y = 2
diff --git a/_maps/map_files/templates/spacehotel/n_12.dmm b/_maps/map_files/templates/spacehotel/n_12.dmm
index f81a062605b..f7c8a92e760 100644
--- a/_maps/map_files/templates/spacehotel/n_12.dmm
+++ b/_maps/map_files/templates/spacehotel/n_12.dmm
@@ -51,7 +51,6 @@
 /area/template_noop)
 "k" = (
 /obj/structure/sink{
-	icon_state = "sink";
 	dir = 8;
 	pixel_x = -12;
 	pixel_y = 2
diff --git a/_maps/map_files/templates/spacehotel/n_13.dmm b/_maps/map_files/templates/spacehotel/n_13.dmm
index 215bd091039..0a8f5fba535 100644
--- a/_maps/map_files/templates/spacehotel/n_13.dmm
+++ b/_maps/map_files/templates/spacehotel/n_13.dmm
@@ -107,7 +107,6 @@
 /area/template_noop)
 "o" = (
 /obj/structure/sink{
-	icon_state = "sink";
 	dir = 8;
 	pixel_x = -12;
 	pixel_y = 2
diff --git a/_maps/map_files/templates/spacehotel/n_14.dmm b/_maps/map_files/templates/spacehotel/n_14.dmm
index 7a0068d6628..789f9ed10fb 100644
--- a/_maps/map_files/templates/spacehotel/n_14.dmm
+++ b/_maps/map_files/templates/spacehotel/n_14.dmm
@@ -52,7 +52,6 @@
 /area/template_noop)
 "l" = (
 /obj/structure/sink{
-	icon_state = "sink";
 	dir = 8;
 	pixel_x = -12;
 	pixel_y = 2
diff --git a/_maps/map_files/templates/spacehotel/n_15.dmm b/_maps/map_files/templates/spacehotel/n_15.dmm
index f2a3e31619e..8e234ea5470 100644
--- a/_maps/map_files/templates/spacehotel/n_15.dmm
+++ b/_maps/map_files/templates/spacehotel/n_15.dmm
@@ -26,8 +26,7 @@
 /area/template_noop)
 "e" = (
 /obj/machinery/light{
-	dir = 4;
-	icon_state = "tube1"
+	dir = 4
 	},
 /turf/simulated/floor/indestructible{
 	icon_state = "engine"
diff --git a/_maps/map_files/templates/spacehotel/n_17.dmm b/_maps/map_files/templates/spacehotel/n_17.dmm
index 10ddcca6fc1..191239f3b41 100644
--- a/_maps/map_files/templates/spacehotel/n_17.dmm
+++ b/_maps/map_files/templates/spacehotel/n_17.dmm
@@ -78,7 +78,6 @@
 /area/template_noop)
 "m" = (
 /obj/structure/sink{
-	icon_state = "sink";
 	dir = 8;
 	pixel_x = -12;
 	pixel_y = 2
diff --git a/_maps/map_files/templates/spacehotel/n_18.dmm b/_maps/map_files/templates/spacehotel/n_18.dmm
index d3fe86b3782..fc67494d86e 100644
--- a/_maps/map_files/templates/spacehotel/n_18.dmm
+++ b/_maps/map_files/templates/spacehotel/n_18.dmm
@@ -46,7 +46,6 @@
 /area/template_noop)
 "j" = (
 /obj/structure/sink{
-	icon_state = "sink";
 	dir = 8;
 	pixel_x = -12;
 	pixel_y = 2
diff --git a/_maps/map_files/templates/spacehotel/s_04.dmm b/_maps/map_files/templates/spacehotel/s_04.dmm
index 0436b00ff74..645de705000 100644
--- a/_maps/map_files/templates/spacehotel/s_04.dmm
+++ b/_maps/map_files/templates/spacehotel/s_04.dmm
@@ -122,7 +122,6 @@
 /obj/machinery/button/windowtint{
 	id = "room_s";
 	pixel_x = -24;
-	pixel_y = 0;
 	range = 5
 	},
 /obj/item/soap/syndie,
@@ -149,7 +148,6 @@
 /area/template_noop)
 "o" = (
 /obj/structure/sink{
-	icon_state = "sink";
 	dir = 8;
 	pixel_x = -12;
 	pixel_y = 2
diff --git a/_maps/map_files/templates/spacehotel/s_05.dmm b/_maps/map_files/templates/spacehotel/s_05.dmm
index d9c286e88bd..91d36c17a52 100644
--- a/_maps/map_files/templates/spacehotel/s_05.dmm
+++ b/_maps/map_files/templates/spacehotel/s_05.dmm
@@ -76,7 +76,6 @@
 /obj/machinery/button/windowtint{
 	id = "room_s";
 	pixel_x = -24;
-	pixel_y = 0;
 	range = 5
 	},
 /obj/item/soap,
@@ -103,7 +102,6 @@
 /area/template_noop)
 "n" = (
 /obj/structure/sink{
-	icon_state = "sink";
 	dir = 8;
 	pixel_x = -12;
 	pixel_y = 2
diff --git a/_maps/map_files/templates/spacehotel/s_06.dmm b/_maps/map_files/templates/spacehotel/s_06.dmm
index 1868755ff27..29aef884f95 100644
--- a/_maps/map_files/templates/spacehotel/s_06.dmm
+++ b/_maps/map_files/templates/spacehotel/s_06.dmm
@@ -78,7 +78,6 @@
 /obj/machinery/button/windowtint{
 	id = "room_s";
 	pixel_x = -24;
-	pixel_y = 0;
 	range = 5
 	},
 /obj/item/soap/nanotrasen,
@@ -105,7 +104,6 @@
 /area/template_noop)
 "p" = (
 /obj/structure/sink{
-	icon_state = "sink";
 	dir = 8;
 	pixel_x = -12;
 	pixel_y = 2