diff --git a/_maps/map_files220/RandomRuins/LavaRuins/ash_old.dmm b/_maps/map_files220/RandomRuins/LavaRuins/ash_old.dmm
index ef76da2d8f33f..92d7ecb0b3ddc 100644
--- a/_maps/map_files220/RandomRuins/LavaRuins/ash_old.dmm
+++ b/_maps/map_files220/RandomRuins/LavaRuins/ash_old.dmm
@@ -73,7 +73,7 @@
 	dir = 4
 	},
 /obj/effect/mapping_helpers/no_lava,
-/obj/structure/closet/crate/wooden/wooden_crate,
+/obj/structure/closet/crate/wooden,
 /obj/item/circuitboard/prisoner,
 /obj/item/circuitboard/chem_master{
 	pixel_y = -5;
@@ -156,7 +156,7 @@
 	dir = 8
 	},
 /obj/effect/mapping_helpers/no_lava,
-/obj/structure/closet/crate/wooden/wooden_crate,
+/obj/structure/closet/crate/wooden,
 /obj/item/seeds/aloe,
 /obj/item/seeds/potato{
 	pixel_x = 5
@@ -366,7 +366,7 @@
 	},
 /obj/item/mod/module/visor/night,
 /obj/effect/mapping_helpers/no_lava,
-/obj/structure/closet/crate/wooden/wooden_crate,
+/obj/structure/closet/crate/wooden,
 /obj/item/stack/sheet/mineral/diamond{
 	amount = 4;
 	pixel_x = 4
diff --git a/_maps/map_files220/RandomZLevels/blackmesa.dmm b/_maps/map_files220/RandomZLevels/blackmesa.dmm
index a0ef94ba7dcd2..77885d7c03dcc 100644
--- a/_maps/map_files220/RandomZLevels/blackmesa.dmm
+++ b/_maps/map_files220/RandomZLevels/blackmesa.dmm
@@ -1468,7 +1468,7 @@
 /area/awaymission/black_mesa/lambda_teleporter)
 "bOB" = (
 /obj/item/aicard,
-/obj/structure/closet/crate/wooden/wooden_crate,
+/obj/structure/closet/crate/wooden,
 /turf/simulated/floor/plasteel/smooth,
 /area/awaymission/black_mesa/deep_sci_feesh)
 "bPs" = (
@@ -1763,7 +1763,7 @@
 /turf/simulated/floor/plasteel,
 /area/awaymission/black_mesa/hecu_zone_test_chambers)
 "ciE" = (
-/obj/structure/closet/crate/wooden/wooden_crate,
+/obj/structure/closet/crate/wooden,
 /obj/item/ammo_box/magazine/enforcer/lethal,
 /turf/simulated/floor/plasteel/smooth,
 /area/awaymission/black_mesa/cryo_storage)
@@ -2010,7 +2010,7 @@
 /turf/simulated/floor/mineral/titanium,
 /area/awaymission/black_mesa/entrance)
 "cuC" = (
-/obj/structure/closet/crate/wooden/wooden_crate,
+/obj/structure/closet/crate/wooden,
 /obj/item/storage/firstaid/ancient,
 /turf/simulated/floor/wood/fancy/cherry,
 /area/awaymission/black_mesa/xen/vortigaunt_village)
@@ -3480,7 +3480,7 @@
 /turf/simulated/floor/plasteel,
 /area/awaymission/black_mesa/genetics)
 "eji" = (
-/obj/structure/closet/crate/wooden/wooden_crate,
+/obj/structure/closet/crate/wooden,
 /turf/simulated/floor/plasteel/smooth,
 /area/awaymission/black_mesa/deep_sci_feesh)
 "ejL" = (
@@ -4272,7 +4272,7 @@
 /turf/simulated/floor/plasteel,
 /area/awaymission/black_mesa/entrance_lobby)
 "fiC" = (
-/obj/structure/closet/crate/wooden/wooden_crate,
+/obj/structure/closet/crate/wooden,
 /obj/item/food/meat,
 /turf/simulated/floor/wood/fancy/cherry,
 /area/awaymission/black_mesa/xen/vortigaunt_village)
@@ -5425,7 +5425,7 @@
 /turf/simulated/floor/plasteel/smooth,
 /area/awaymission/black_mesa/entrance_internal_hall)
 "gBL" = (
-/obj/structure/closet/crate/wooden/wooden_crate,
+/obj/structure/closet/crate/wooden,
 /obj/item/ammo_box/magazine/enforcer/lethal,
 /obj/item/ammo_box/shotgun/buck,
 /obj/effect/decal/cleanable/dirt,
@@ -5919,7 +5919,7 @@
 /turf/simulated/floor/plasteel/smooth,
 /area/awaymission/black_mesa/high_security_hallway)
 "hiI" = (
-/obj/structure/closet/crate/wooden/wooden_crate,
+/obj/structure/closet/crate/wooden,
 /obj/item/flashlight,
 /turf/simulated/floor/plating,
 /area/awaymission/black_mesa/entrance_tunnel)
@@ -6364,7 +6364,7 @@
 "hOh" = (
 /obj/item/ammo_box/magazine/enforcer/lethal,
 /obj/item/ammo_box/magazine/enforcer/lethal,
-/obj/structure/closet/crate/wooden/wooden_crate,
+/obj/structure/closet/crate/wooden,
 /turf/simulated/floor/plating,
 /area/awaymission/black_mesa/science_internal)
 "hOn" = (
@@ -6867,7 +6867,7 @@
 	},
 /area/awaymission/black_mesa/deep_sci_hall)
 "iAP" = (
-/obj/structure/closet/crate/wooden/wooden_crate,
+/obj/structure/closet/crate/wooden,
 /obj/item/kitchen/knife/combat,
 /turf/simulated/floor/plating,
 /area/awaymission/black_mesa/entrance_tunnel)
@@ -7494,7 +7494,7 @@
 /turf/simulated/floor/plasteel/dark,
 /area/awaymission/black_mesa/xen/acid_lake_building)
 "jka" = (
-/obj/structure/closet/crate/wooden/wooden_crate,
+/obj/structure/closet/crate/wooden,
 /obj/item/food/fancy/doshik_spicy,
 /turf/simulated/floor/plasteel/smooth,
 /area/awaymission/black_mesa/deep_sci_storage)
@@ -8768,7 +8768,7 @@
 /turf/simulated/floor/plating,
 /area/awaymission/black_mesa/hecu_zone_tunnel)
 "kMr" = (
-/obj/structure/closet/crate/wooden/wooden_crate,
+/obj/structure/closet/crate/wooden,
 /turf/simulated/floor/plasteel/smooth,
 /area/awaymission/black_mesa/cryo_storage)
 "kMu" = (
@@ -8994,7 +8994,7 @@
 /turf/simulated/floor/plasteel,
 /area/awaymission/black_mesa/hecu_zone_atrium)
 "kYD" = (
-/obj/structure/closet/crate/wooden/wooden_crate,
+/obj/structure/closet/crate/wooden,
 /turf/simulated/floor/plasteel,
 /area/awaymission/black_mesa/black_ops_downstairs_atrium)
 "kZm" = (
@@ -12239,7 +12239,7 @@
 /turf/simulated/floor/catwalk,
 /area/awaymission/black_mesa/xen/acid_lake)
 "oQS" = (
-/obj/structure/closet/crate/wooden/wooden_crate,
+/obj/structure/closet/crate/wooden,
 /obj/item/kitchen/knife/combat/survival/bone,
 /turf/simulated/floor/wood/fancy/cherry,
 /area/awaymission/black_mesa/xen/vortigaunt_village_nihilanth)
@@ -13290,7 +13290,7 @@
 /area/awaymission/black_mesa/security_outpost)
 "qgG" = (
 /obj/item/ammo_box/n762,
-/obj/structure/closet/crate/wooden/wooden_crate,
+/obj/structure/closet/crate/wooden,
 /turf/simulated/floor/plasteel/smooth,
 /area/awaymission/black_mesa/deep_sci_feesh)
 "qhG" = (
@@ -13915,7 +13915,7 @@
 /turf/simulated/floor/plasteel,
 /area/awaymission/black_mesa/entrance_large_office)
 "qPE" = (
-/obj/structure/closet/crate/wooden/wooden_crate,
+/obj/structure/closet/crate/wooden,
 /obj/item/food/fancy/doshik,
 /turf/simulated/floor/plasteel/smooth,
 /area/awaymission/black_mesa/deep_sci_storage)
@@ -14947,7 +14947,7 @@
 	},
 /area/awaymission/black_mesa/high_security_hallway)
 "sfi" = (
-/obj/structure/closet/crate/wooden/wooden_crate,
+/obj/structure/closet/crate/wooden,
 /obj/item/clothing/under/pants/shorts/red,
 /obj/item/stack/spacecash/c1000,
 /obj/item/ammo_box/shotgun/buck,
@@ -14976,7 +14976,7 @@
 /turf/simulated/floor/plasteel,
 /area/awaymission/black_mesa/hecu_zone_atrium)
 "sgF" = (
-/obj/structure/closet/crate/wooden/wooden_crate,
+/obj/structure/closet/crate/wooden,
 /obj/item/fireaxe,
 /turf/simulated/floor/plasteel/smooth,
 /area/awaymission/black_mesa/cryo_storage)
@@ -17264,7 +17264,7 @@
 "vdm" = (
 /obj/item/ammo_box/magazine/wt550m9,
 /obj/item/ammo_box/magazine/wt550m9,
-/obj/structure/closet/crate/wooden/wooden_crate,
+/obj/structure/closet/crate/wooden,
 /turf/simulated/floor/plating,
 /area/awaymission/black_mesa/science_internal)
 "vdn" = (
@@ -17288,7 +17288,7 @@
 	},
 /area/awaymission/black_mesa/science_internal)
 "vdy" = (
-/obj/structure/closet/crate/wooden/wooden_crate,
+/obj/structure/closet/crate/wooden,
 /obj/item/stack/spacecash/c1000,
 /obj/item/stack/spacecash/c1000,
 /obj/effect/decal/cleanable/dirt,
@@ -19264,7 +19264,7 @@
 	},
 /area/awaymission/black_mesa/resonant_chamber)
 "xxB" = (
-/obj/structure/closet/crate/wooden/wooden_crate,
+/obj/structure/closet/crate/wooden,
 /obj/item/stack/spacecash/c1000,
 /turf/simulated/floor/plasteel,
 /area/awaymission/black_mesa/black_ops_downstairs_atrium)
@@ -19427,7 +19427,7 @@
 /turf/simulated/floor/plasteel,
 /area/awaymission/black_mesa/employee_dorm_room)
 "xKX" = (
-/obj/structure/closet/crate/wooden/wooden_crate,
+/obj/structure/closet/crate/wooden,
 /obj/item/food/beans,
 /turf/simulated/floor/plasteel/smooth,
 /area/awaymission/black_mesa/deep_sci_storage)
diff --git a/_maps/map_files220/RandomZLevels/caves.dmm b/_maps/map_files220/RandomZLevels/caves.dmm
index 689743ab5bbc4..a781c21ee11bd 100644
--- a/_maps/map_files220/RandomZLevels/caves.dmm
+++ b/_maps/map_files220/RandomZLevels/caves.dmm
@@ -6192,7 +6192,7 @@
 /turf/simulated/floor/carpet/green,
 /area/awaymission/caves/build/reqpower_build)
 "GR" = (
-/obj/structure/closet/crate/wooden/wooden_crate,
+/obj/structure/closet/crate/wooden,
 /obj/structure/stone_tile/slab,
 /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
 /area/awaymission/caves)
@@ -6371,7 +6371,7 @@
 /turf/simulated/wall/indestructible/necropolis,
 /area/awaymission/caves)
 "HH" = (
-/obj/structure/closet/crate/wooden/wooden_crate,
+/obj/structure/closet/crate/wooden,
 /obj/structure/stone_tile/slab,
 /obj/item/toy/character/lich,
 /obj/effect/decal/cleanable/dust,
@@ -7042,7 +7042,7 @@
 /turf/simulated/floor/plating/lavaland_air,
 /area/awaymission/caves)
 "Lf" = (
-/obj/structure/closet/crate/wooden/wooden_crate,
+/obj/structure/closet/crate/wooden,
 /obj/item/clothing/suit/hooded/fluff/bone,
 /turf/simulated/floor/engine/cult/lavaland_air,
 /area/awaymission/caves)
@@ -7470,7 +7470,7 @@
 	},
 /area/awaymission/caves)
 "NX" = (
-/obj/structure/closet/crate/wooden/wooden_crate,
+/obj/structure/closet/crate/wooden,
 /obj/item/seeds/berry/poison,
 /obj/item/seeds/nettle/death,
 /obj/item/seeds/cannabis/death,
@@ -8515,7 +8515,7 @@
 /turf/simulated/floor/wood/lavaland_air,
 /area/awaymission/caves)
 "TN" = (
-/obj/structure/closet/crate/wooden/wooden_crate,
+/obj/structure/closet/crate/wooden,
 /obj/item/kitchen/knife/ritual,
 /obj/item/staff/broom,
 /obj/item/clothing/accessory/necklace/locket/fluff/fethasnecklace,
@@ -9674,7 +9674,7 @@
 /turf/simulated/floor/wood/oak,
 /area/awaymission/caves/build/reqpower_build)
 "Zz" = (
-/obj/structure/closet/crate/wooden/wooden_crate,
+/obj/structure/closet/crate/wooden,
 /obj/structure/stone_tile/slab,
 /obj/item/reagent_containers/drinks/trophy/bronze_cup,
 /obj/item/reagent_containers/drinks/bottle/wine{
diff --git a/_maps/map_files220/RandomZLevels/gate_lizard.dmm b/_maps/map_files220/RandomZLevels/gate_lizard.dmm
index fe643a0327552..dd86a847aa02e 100644
--- a/_maps/map_files220/RandomZLevels/gate_lizard.dmm
+++ b/_maps/map_files220/RandomZLevels/gate_lizard.dmm
@@ -541,7 +541,7 @@
 /obj/item/clothing/accessory/necklace/talisman,
 /obj/item/clothing/accessory/necklace/skullcodpiece,
 /obj/item/clothing/accessory/necklace/talisman,
-/obj/structure/closet/crate/wooden/wooden_crate,
+/obj/structure/closet/crate/wooden,
 /turf/simulated/floor/wood/oak,
 /area/awaymission/jungle_planet/outside/cave)
 "aPj" = (
@@ -674,7 +674,7 @@
 "bbp" = (
 /obj/item/clothing/head/helmet/skull,
 /obj/item/clothing/head/helmet/skull,
-/obj/structure/closet/crate/wooden/wooden_crate,
+/obj/structure/closet/crate/wooden,
 /obj/effect/landmark/damageturf,
 /turf/simulated/floor/wood/oak,
 /area/awaymission/jungle_planet/outside/cave)
@@ -1017,7 +1017,7 @@
 /obj/item/stack/sheet/leather,
 /obj/item/stack/sheet/leather,
 /obj/item/clothing/accessory/necklace/dope,
-/obj/structure/closet/crate/wooden/wooden_crate,
+/obj/structure/closet/crate/wooden,
 /turf/simulated/floor/engine/cult,
 /area/awaymission/jungle_planet/outside/cave)
 "bti" = (
@@ -1202,7 +1202,7 @@
 /obj/item/food/grown/onion,
 /obj/item/food/grown/potato,
 /obj/item/food/grown/potato,
-/obj/structure/closet/crate/wooden/wooden_crate,
+/obj/structure/closet/crate/wooden,
 /turf/simulated/floor/wood/oak,
 /area/awaymission/jungle_planet/outside/cave/small)
 "bCI" = (
@@ -1469,7 +1469,7 @@
 /obj/item/coin/gold,
 /obj/item/coin/gold,
 /obj/effect/spawner/random_spawners/dirt_often,
-/obj/structure/closet/crate/wooden/wooden_crate,
+/obj/structure/closet/crate/wooden,
 /obj/item/salvage/loot/pirate,
 /obj/item/salvage/loot/pirate,
 /obj/item/salvage/loot/pirate,
@@ -10345,7 +10345,7 @@
 /obj/item/clothing/accessory/necklace/locket,
 /obj/item/coin/gold,
 /obj/effect/spawner/random_spawners/dirt_often,
-/obj/structure/closet/crate/wooden/wooden_crate,
+/obj/structure/closet/crate/wooden,
 /obj/item/salvage/loot/pirate,
 /obj/item/salvage/loot/pirate,
 /obj/item/salvage/loot/pirate,
@@ -10439,7 +10439,7 @@
 /obj/item/clothing/gloves/bracer,
 /obj/item/clothing/gloves/bracer,
 /obj/item/clothing/suit/armor/bone,
-/obj/structure/closet/crate/wooden/wooden_crate,
+/obj/structure/closet/crate/wooden,
 /obj/effect/landmark/damageturf,
 /turf/simulated/floor/wood/oak,
 /area/awaymission/jungle_planet/outside/cave)
@@ -10963,7 +10963,7 @@
 /obj/item/reagent_containers/drinks/trophy/silver_cup,
 /obj/item/clothing/gloves/ring/gold,
 /obj/effect/spawner/random_spawners/dirt_often,
-/obj/structure/closet/crate/wooden/wooden_crate,
+/obj/structure/closet/crate/wooden,
 /turf/simulated/floor/wood/oak,
 /area/awaymission/jungle_planet/outside/cave/pirate)
 "nZE" = (
@@ -11138,7 +11138,7 @@
 /area/awaymission/jungle_planet/inside/complex)
 "omT" = (
 /obj/effect/decal/cleanable/cobweb,
-/obj/structure/closet/crate/wooden/wooden_crate,
+/obj/structure/closet/crate/wooden,
 /obj/item/food/grown/cannabis,
 /obj/item/food/grown/cannabis,
 /obj/item/food/grown/cannabis/ultimate,
@@ -11921,7 +11921,7 @@
 /obj/item/stack/spacecash/c500,
 /obj/machinery/light/small/directional/south,
 /obj/effect/spawner/random_spawners/dirt_often,
-/obj/structure/closet/crate/wooden/wooden_crate,
+/obj/structure/closet/crate/wooden,
 /obj/item/stack/spacecash/c1000,
 /turf/simulated/floor/wood/oak,
 /area/awaymission/jungle_planet/outside/cave/pirate)
@@ -15016,7 +15016,7 @@
 /obj/item/food/grown/potato,
 /obj/item/food/grown/potato,
 /obj/effect/decal/cleanable/cobweb2,
-/obj/structure/closet/crate/wooden/wooden_crate,
+/obj/structure/closet/crate/wooden,
 /turf/simulated/floor/wood/oak,
 /area/awaymission/jungle_planet/outside/cave)
 "teN" = (
@@ -15296,7 +15296,7 @@
 "tte" = (
 /obj/item/bikehorn/golden,
 /obj/effect/spawner/random_spawners/dirt_often,
-/obj/structure/closet/crate/wooden/wooden_crate,
+/obj/structure/closet/crate/wooden,
 /obj/item/salvage/loot/pirate,
 /obj/item/salvage/loot/pirate,
 /obj/item/salvage/loot/pirate,
@@ -15970,7 +15970,7 @@
 /obj/item/coin/silver,
 /obj/item/coin/silver,
 /obj/effect/spawner/random_spawners/dirt_often,
-/obj/structure/closet/crate/wooden/wooden_crate,
+/obj/structure/closet/crate/wooden,
 /turf/simulated/floor/wood/oak,
 /area/awaymission/jungle_planet/outside/cave/pirate)
 "ulv" = (
@@ -16213,7 +16213,7 @@
 /turf/simulated/floor/indestructible/grass,
 /area/awaymission/jungle_planet/outside)
 "uAI" = (
-/obj/structure/closet/crate/wooden/wooden_crate,
+/obj/structure/closet/crate/wooden,
 /obj/item/stack/medical/bruise_pack/advanced,
 /obj/item/stack/medical/ointment/advanced,
 /obj/item/stack/medical/bruise_pack,
@@ -16955,7 +16955,7 @@
 /obj/item/clothing/suit/unathi/mantle,
 /obj/item/clothing/suit/unathi/robe,
 /obj/item/clothing/suit/unathi/robe,
-/obj/structure/closet/crate/wooden/wooden_crate,
+/obj/structure/closet/crate/wooden,
 /turf/simulated/floor/wood/oak,
 /area/awaymission/jungle_planet/outside/cave)
 "vvO" = (
diff --git a/_maps/map_files220/generic/Admin_Zone.dmm b/_maps/map_files220/generic/Admin_Zone.dmm
index 1bfe5902c58d2..12395b8054322 100644
--- a/_maps/map_files220/generic/Admin_Zone.dmm
+++ b/_maps/map_files220/generic/Admin_Zone.dmm
@@ -1906,7 +1906,7 @@
 	},
 /area/vox_base)
 "gI" = (
-/obj/structure/closet/crate/wooden/wooden_crate,
+/obj/structure/closet/crate/wooden,
 /obj/item/instrument/accordion,
 /obj/item/instrument/banjo,
 /obj/item/instrument/bikehorn,
@@ -5128,7 +5128,7 @@
 /turf/simulated/floor/beach/away/sand_alternative,
 /area/ghost_bar/outdoor/beach)
 "rL" = (
-/obj/structure/closet/crate/wooden/wooden_crate,
+/obj/structure/closet/crate/wooden,
 /obj/item/grown/log/tree,
 /obj/item/grown/log/tree,
 /obj/item/grown/log/tree,
diff --git a/modular_ss220/aesthetics/better_ids/code/better_ids.dm b/modular_ss220/aesthetics/better_ids/code/better_ids.dm
index bf5baa161c741..b5caaf45c192d 100644
--- a/modular_ss220/aesthetics/better_ids/code/better_ids.dm
+++ b/modular_ss220/aesthetics/better_ids/code/better_ids.dm
@@ -24,7 +24,7 @@ GLOBAL_LIST_INIT(card_skins_donor_ss220, list(
 ))
 
 /obj/item/card
-	icon = 'modular_ss220/aesthetics/better_ids/icons/better_ids.dmi'
+	icon = 'modular_ss220/aesthetics/better_ids/icons/card.dmi'
 
 /obj/item/nanomob_card
 	icon = 'modular_ss220/aesthetics/better_ids/icons/better_ids.dmi'
diff --git a/modular_ss220/aesthetics/better_ids/icons/better_ids.dmi b/modular_ss220/aesthetics/better_ids/icons/better_ids.dmi
deleted file mode 100644
index 09e2c4a107f41..0000000000000
Binary files a/modular_ss220/aesthetics/better_ids/icons/better_ids.dmi and /dev/null differ
diff --git a/modular_ss220/aesthetics/better_ids/icons/card.dmi b/modular_ss220/aesthetics/better_ids/icons/card.dmi
new file mode 100644
index 0000000000000..a6270c06d5850
Binary files /dev/null and b/modular_ss220/aesthetics/better_ids/icons/card.dmi differ
diff --git a/modular_ss220/aesthetics/cameras/code/cameras.dm b/modular_ss220/aesthetics/cameras/code/cameras.dm
index 061af80422901..d7a04bd4b19be 100644
--- a/modular_ss220/aesthetics/cameras/code/cameras.dm
+++ b/modular_ss220/aesthetics/cameras/code/cameras.dm
@@ -1,2 +1,8 @@
 /obj/machinery/camera
 	icon = 'modular_ss220/aesthetics/cameras/icons/cameras.dmi'
+
+/obj/machinery/camera/tracking_head
+	icon = 'icons/obj/monitors.dmi'
+
+/obj/item/camera_assembly 
+	icon = 'modular_ss220/aesthetics/cameras/icons/cameras.dmi'
diff --git a/modular_ss220/aesthetics/decals/icons/siding.dmi b/modular_ss220/aesthetics/decals/icons/siding.dmi
index eccc13c6a9f72..127b3431102de 100644
Binary files a/modular_ss220/aesthetics/decals/icons/siding.dmi and b/modular_ss220/aesthetics/decals/icons/siding.dmi differ
diff --git a/modular_ss220/aesthetics/floors/icons/tiles.dmi b/modular_ss220/aesthetics/floors/icons/tiles.dmi
index 019ca3ba4fb88..25adb345181bd 100644
Binary files a/modular_ss220/aesthetics/floors/icons/tiles.dmi and b/modular_ss220/aesthetics/floors/icons/tiles.dmi differ
diff --git a/modular_ss220/aesthetics/lights/code/lights.dm b/modular_ss220/aesthetics/lights/code/lights.dm
index 84b7c65eaa62e..1dd9cb2909f93 100644
--- a/modular_ss220/aesthetics/lights/code/lights.dm
+++ b/modular_ss220/aesthetics/lights/code/lights.dm
@@ -15,6 +15,13 @@
 /obj/machinery/light/floor
 	icon = 'icons/obj/lighting.dmi'
 
+/obj/machinery/light/clockwork
+	icon = 'icons/obj/lighting.dmi'
+	layer = ABOVE_MOB_LAYER
+
+/obj/machinery/light/clockwork/small
+	layer = ABOVE_MOB_LAYER
+
 /obj/machinery/light_construct
 	icon = 'modular_ss220/aesthetics/lights/icons/lights.dmi'
 	layer = ABOVE_MOB_LAYER
@@ -26,6 +33,9 @@
 /obj/machinery/light_construct/floor
 	icon = 'icons/obj/lighting.dmi'
 
+/obj/machinery/light_construct/clockwork
+	icon = 'icons/obj/lighting.dmi'
+
 /obj/item/mounted/frame/light_fixture
 	icon = 'modular_ss220/aesthetics/lights/icons/lights.dmi'
 
@@ -35,5 +45,8 @@
 /obj/item/mounted/frame/light_fixture/floor
 	icon = 'icons/obj/lighting.dmi'
 
+/obj/item/mounted/frame/light_fixture/clockwork
+	icon = 'icons/obj/lighting.dmi'
+
 /obj/item/flashlight/lamp
 	on = FALSE
diff --git a/modular_ss220/aesthetics/lights/icons/lamps.dmi b/modular_ss220/aesthetics/lights/icons/lamps.dmi
index 4fe2260f5b7ca..0dfd181eeaa44 100644
Binary files a/modular_ss220/aesthetics/lights/icons/lamps.dmi and b/modular_ss220/aesthetics/lights/icons/lamps.dmi differ
diff --git a/modular_ss220/aesthetics/sheets/code/sheets.dm b/modular_ss220/aesthetics/sheets/code/sheets.dm
index 5b66a6a2e2c34..b3e21e7d5a08b 100644
--- a/modular_ss220/aesthetics/sheets/code/sheets.dm
+++ b/modular_ss220/aesthetics/sheets/code/sheets.dm
@@ -82,9 +82,6 @@
 /obj/item/bedsheet/wiz/double
 	icon_state = "double_sheetwiz"
 
-/obj/item/bedsheet/rev/double
-	icon_state = "double_sheetrev"
-
 /obj/item/bedsheet/nanotrasen/double
 	icon_state = "double_sheetNT"
 
diff --git a/modular_ss220/clothing/code/helmet.dm b/modular_ss220/clothing/code/helmet.dm
index 2a7c2e5c7c879..9fc5388a9aa3c 100644
--- a/modular_ss220/clothing/code/helmet.dm
+++ b/modular_ss220/clothing/code/helmet.dm
@@ -68,6 +68,22 @@
 		"Nucleation"		=	'modular_ss220/clothing/icons/mob/helmet.dmi',
 		)
 
+/obj/item/clothing/head/helmet/ert/security
+	icon_state = "ember_sec"
+	item_state = "ember_sec"
+
+/obj/item/clothing/head/helmet/ert/engineer
+	icon_state = "ember_eng"
+	item_state = "ember_eng"
+
+/obj/item/clothing/head/helmet/ert/medical
+	icon_state = "ember_med"
+	item_state = "ember_med"
+
+/obj/item/clothing/head/helmet/ert/janitor
+	icon_state = "ember_jan"
+	item_state = "ember_jan"
+
 /obj/item/clothing/head/helmet/ert/command
 	icon_state = "ember_com"
 	item_state = "ember_com"
@@ -125,10 +141,6 @@
 	user.update_inv_head()
 	to_chat(user, span_notice("[msg]"))
 
-/obj/item/clothing/head/helmet/ert/security
-	icon_state = "ember_sec"
-	item_state = "ember_sec"
-
 /obj/item/clothing/head/helmet/ert/security/paranormal
 	icon_state = "knight_templar"
 	item_state = "knight_templar"
@@ -167,11 +179,3 @@
 		"Nucleation"		=	'modular_ss220/clothing/icons/mob/helmet.dmi',
 		)
 	armor = list(MELEE = 20, BULLET = 20, LASER = 20, ENERGY = 20, BOMB = 10, RAD = 50, FIRE = 200, ACID = 115)
-
-/obj/item/clothing/head/helmet/ert/medical
-	icon_state = "ember_med"
-	item_state = "ember_med"
-
-/obj/item/clothing/head/helmet/ert/janitor
-	icon_state = "ember_jan"
-	item_state = "ember_jan"
diff --git a/modular_ss220/clothing/code/suits.dm b/modular_ss220/clothing/code/suits.dm
index f1b7a3a7960ff..6627a3671eb9a 100644
--- a/modular_ss220/clothing/code/suits.dm
+++ b/modular_ss220/clothing/code/suits.dm
@@ -317,11 +317,24 @@
 	icon_state = "ember_com"
 	item_state = "ember_com"
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS
+
 /obj/item/clothing/suit/armor/vest/ert/security
 	icon_state = "ember_sec"
 	item_state = "ember_sec"
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
 
+/obj/item/clothing/suit/armor/vest/ert/medical
+	icon_state = "ember_med"
+	item_state = "ember_med"
+
+// Actualy not used - ERT engineer uses /obj/item/clothing/suit/space/ert_engineer instead
+/obj/item/clothing/suit/armor/vest/ert/engineer
+	icon = 'icons/obj/clothing/suits.dmi'
+
+/obj/item/clothing/suit/armor/vest/ert/janitor
+	icon_state = "ember_jan"
+	item_state = "ember_jan"
+
 /obj/item/clothing/suit/armor/vest/ert/security/paranormal
 	icon_state = "knight_templar"
 	item_state = "knight_templar"
@@ -360,14 +373,6 @@
 		"Nucleation"		=	'modular_ss220/clothing/icons/mob/suits.dmi',
 		)
 
-/obj/item/clothing/suit/armor/vest/ert/medical
-	icon_state = "ember_med"
-	item_state = "ember_med"
-
-/obj/item/clothing/suit/armor/vest/ert/janitor
-	icon_state = "ember_jan"
-	item_state = "ember_jan"
-
 /obj/item/clothing/suit/storage/browntrenchcoat
 	name = "старое коричневое пальто"
 	desc = "Поношенное пальто старого фасона."
diff --git a/modular_ss220/clothing/icons/object/mod_clothing.dmi b/modular_ss220/clothing/icons/object/mod_clothing.dmi
index 870844708f310..d1b91725df35a 100644
Binary files a/modular_ss220/clothing/icons/object/mod_clothing.dmi and b/modular_ss220/clothing/icons/object/mod_clothing.dmi differ
diff --git a/modular_ss220/jobs/code/card_id.dm b/modular_ss220/jobs/code/card_id.dm
index d61e04da44dba..5a9d189dc4f2b 100644
--- a/modular_ss220/jobs/code/card_id.dm
+++ b/modular_ss220/jobs/code/card_id.dm
@@ -77,7 +77,7 @@
 	name = "Deliverer ID"
 	access = list(ACCESS_MAINT_TUNNELS, ACCESS_MAILSORTING, ACCESS_CARGO, ACCESS_MINERAL_STOREROOM)
 	icon = 'modular_ss220/aesthetics/better_ids/icons/better_ids.dmi'
-	icon_state = "deliverer"
+	icon_state = "courier"
 
 /obj/item/card/id/wrestler
 	name = "Wrestler ID"
diff --git a/modular_ss220/maps220/code/mobs.dm b/modular_ss220/maps220/code/mobs.dm
index 19aca4337f970..fbd75b1f3d2dc 100644
--- a/modular_ss220/maps220/code/mobs.dm
+++ b/modular_ss220/maps220/code/mobs.dm
@@ -426,7 +426,7 @@
 
 /* Jungle Mob Spawners */
 /obj/effect/landmark/awaymissions/gate_lizard/mine_spawner
-	icon = 'icons/obj/items.dmi'
+	icon = 'icons/obj/restraints.dmi'
 	icon_state = "fleshtrap"
 	var/id = null
 	var/triggered = FALSE
@@ -436,6 +436,7 @@
 /obj/effect/landmark/awaymissions/gate_lizard/mob_spawn
 	name = "spawner"
 	icon = 'modular_ss220/maps220/icons/simple_human.dmi'
+	icon_state = "spawner"
 	var/id = null
 	var/jungle_mob = null
 
@@ -1280,6 +1281,7 @@
 /obj/effect/landmark/awaymissions/spacebattle/mob_spawn
 	name = "spawner"
 	icon = 'modular_ss220/maps220/icons/spacebattle.dmi'
+	icon_state = "melee"
 	var/id = null
 	var/syndi_mob = null
 
diff --git a/modular_ss220/maps220/code/objects.dm b/modular_ss220/maps220/code/objects.dm
index a46f81d6c680c..d5636d90eaad6 100644
--- a/modular_ss220/maps220/code/objects.dm
+++ b/modular_ss220/maps220/code/objects.dm
@@ -42,16 +42,14 @@
 
 //Crates
 /obj/structure/closet/crate/wooden
-	icon = 'modular_ss220/maps220/icons/crates.dmi'
-	open_sound = 'sound/machines/wooden_closet_open.ogg'
-	close_sound = 'sound/machines/wooden_closet_close.ogg'
-
-/obj/structure/closet/crate/wooden/wooden_crate
 	name = "wooden crate"
 	desc = "A wooden crate."
+	icon = 'modular_ss220/maps220/icons/crates.dmi'
 	icon_state = "wooden"
 	icon_opened = "wooden_open"
 	icon_closed = "wooden"
+	open_sound = 'sound/machines/wooden_closet_open.ogg'
+	close_sound = 'sound/machines/wooden_closet_close.ogg'
 
 /obj/structure/closet/crate/wooden/barrel
 	name = "wooden barrel"
diff --git a/modular_ss220/maps220/icons/mapping_helpers.dmi b/modular_ss220/maps220/icons/mapping_helpers.dmi
index 09b1656984194..98f6b9118df84 100644
Binary files a/modular_ss220/maps220/icons/mapping_helpers.dmi and b/modular_ss220/maps220/icons/mapping_helpers.dmi differ
diff --git a/modular_ss220/mecha_skins/code/paintkit_install.dm b/modular_ss220/mecha_skins/code/paintkit_install.dm
index 98a09fa690b3a..5bd857a500c89 100644
--- a/modular_ss220/mecha_skins/code/paintkit_install.dm
+++ b/modular_ss220/mecha_skins/code/paintkit_install.dm
@@ -35,7 +35,7 @@
 	. = ..()
 	icon_state = reset_icon(icon_state)+"-open"
 
-// RIP AND PEPPERONI
+// MARK: Ripley
 
 /obj/structure/mecha_wreckage/ripley/titan
 	name = "\improper Обломки \"Кулака Титана\""
@@ -85,7 +85,7 @@
 	icon = 'modular_ss220/mecha_skins/icons/mecha.dmi'
 	icon_state = "deathripley-broken"
 
-// ODYSSEUS`S ASS
+// MARK: Odysseus
 
 /obj/structure/mecha_wreckage/odysseus/hermes
 	name = "\improper Обломки \"Гермеса\""
@@ -99,7 +99,7 @@
 	icon = 'modular_ss220/mecha_skins/icons/mecha.dmi'
 	icon_state = "murdysseus-broken"
 
-// GYGAXCHAD
+// MARK: Gygax
 
 /obj/structure/mecha_wreckage/gygax/medigax
 	name = "\improper Обломки \"Медигакса\""
@@ -129,7 +129,7 @@
 	name = "\improper Обломки \"Молчигакса\""
 	desc = "..."
 	icon = 'modular_ss220/mecha_skins/icons/mecha.dmi'
-	icon_state = "mimegax-broken"
+	icon_state = "mime-broken"
 
 /obj/structure/mecha_wreckage/gygax/gygax_black
 	name = "\improper Обломки черного Гигакса"
@@ -137,7 +137,7 @@
 	icon = 'modular_ss220/mecha_skins/icons/mecha.dmi'
 	icon_state = "gygax_black-broken"
 
-// DURAND
+// MARK: Durand
 
 /obj/structure/mecha_wreckage/durand/dollhouse
 	name = "\improper Обломки \"Кукольного домика\""
@@ -163,7 +163,7 @@
 	icon = 'modular_ss220/mecha_skins/icons/mecha.dmi'
 	icon_state = "skullmech-broken"
 
-// USELESS SHIT
+// MARK: Phazon
 
 /obj/structure/mecha_wreckage/phazon/imperion
 	name = "\improper Обломки \"Империона\""
diff --git a/modular_ss220/mecha_skins/code/paintkit_menu.dm b/modular_ss220/mecha_skins/code/paintkit_menu.dm
index 5cb6f4619dc3b..04860eaaea614 100644
--- a/modular_ss220/mecha_skins/code/paintkit_menu.dm
+++ b/modular_ss220/mecha_skins/code/paintkit_menu.dm
@@ -1,13 +1,16 @@
 // Please don't use this for anything, it's a base type for custom mech paintjobs.
 /obj/item/paintkit
 	name = "Набор кастомизации меха"
-	desc = "Дефолтный набор кастомизации, превращающий мех в другой мех(визуально)."
+	desc = "Дефолтный набор кастомизации, превращающий мех в другой мех (визуально)."
 	icon = 'modular_ss220/mecha_skins/icons/paintkit.dmi'
 	icon_state = "paintkit"
 	// New type of wreckage
 	var/new_wreckage = null
 
-// RIPLEY
+/obj/item/paintkit/titansfist
+	icon = 'icons/obj/painting.dmi'
+
+// MARK: Ripley
 
 /obj/item/paintkit/ripley_titansfist
 	name = "Набор кастомизации АЭП \"Кулак Титана\""
@@ -97,7 +100,7 @@
 	allowed_types = list("ripley", "firefighter")
 	new_wreckage = /obj/structure/mecha_wreckage/ripley/reaper
 
-// ODYSSEUS
+// MARK: Odysseus
 
 /obj/item/paintkit/odysseus_hermes
 	name = "Набор кастомизации Одиссея \"Гермес\""
@@ -121,7 +124,7 @@
 	allowed_types = list("odysseus")
 	new_wreckage = /obj/structure/mecha_wreckage/odysseus/reaper
 
-// GYGAXCHAD
+// MARK: Gygax
 
 /obj/item/paintkit/gygax_alt
 	name = "Набор кастомизации старого Гигакса"
@@ -174,7 +177,7 @@
 
 	new_name = "Молчигакс"
 	new_desc = "...!"
-	new_icon = "mimegax"
+	new_icon = "mime"
 	allowed_types = list("gygax")
 	new_wreckage = /obj/structure/mecha_wreckage/gygax/mimegax
 
@@ -189,7 +192,7 @@
 	allowed_types = list("gygax")
 	new_wreckage = /obj/structure/mecha_wreckage/gygax/gygax_black
 
-// DURAND
+// MARK: Durand
 
 /obj/item/paintkit/durand_soviet
 	name = "Набор кастомизации Дюранда \"Кукольный домик\""
@@ -235,7 +238,7 @@
 	allowed_types = list("durand")
 	new_wreckage = /obj/structure/mecha_wreckage/durand/skull
 
-// USELESS SHIT
+// MARK: Phazon
 
 /obj/item/paintkit/phazon_imperion
 	name = "Набор кастомизации Фазона \"Империон\""
diff --git a/modular_ss220/mobs/code/mob_holder.dm b/modular_ss220/mobs/code/mob_holder.dm
index ab2b778e99ae1..6c3c52cd9fa62 100644
--- a/modular_ss220/mobs/code/mob_holder.dm
+++ b/modular_ss220/mobs/code/mob_holder.dm
@@ -107,7 +107,6 @@
 /obj/item/holder/pai
 	name = "pAI"
 	desc = "It's a little robot."
-	icon_state = "pai"
 	origin_tech = "materials=3;programming=4;engineering=4"
 	slot_flags = ITEM_SLOT_HEAD | ITEM_SLOT_BOTH_EARS
 
@@ -148,12 +147,6 @@
 	icon_state = "drone-emagged"
 	origin_tech = "materials=3;programming=4;powerstorage=3;engineering=4;syndicate=3"
 
-/obj/item/holder/cogscarab
-	name = "cogscarab"
-	desc = "A strange, drone-like machine. It constantly emits the hum of gears."
-	icon_state = "cogscarab"
-	origin_tech = "materials=3;magnets=4;powerstorage=9;bluespace=4"
-
 /obj/item/holder/monkey
 	name = "monkey"
 	desc = "It's a monkey"
@@ -276,12 +269,6 @@
 	icon = 'modular_ss220/mobs/icons/mob/pets.dmi'
 	icon_state = "crusher"
 
-/obj/item/holder/original
-	name = "pet"
-	desc = "It's a pet"
-	icon = 'modular_ss220/mobs/icons/mob/pets.dmi'
-	icon_state = "original"
-
 /obj/item/holder/spacecat
 	name = "pet"
 	desc = "It's a pet"
@@ -366,6 +353,7 @@
 /obj/item/holder/fennec
 	name = "fennec"
 	desc = "It's a fennec. Yiff!"
+	icon = 'modular_ss220/mobs/icons/mob/pets.dmi'
 	icon_state = "fennec"
 	origin_tech = "biotech=4"
 
@@ -379,7 +367,7 @@
 /obj/item/holder/headslug
 	name = "headslug"
 	desc = "It's a headslug. Ewwww..."
-	icon = 'modular_ss220/mobs/icons/mob/animal.dmi'
+	icon = 'icons/mob/mob.dmi'
 	icon_state = "headslug"
 	origin_tech = "biotech=6"
 
@@ -422,5 +410,5 @@
 /obj/item/holder/clowngoblin
 	name = "clowngoblin"
 	desc = "Honk honk"
-	icon = 'modular_ss220/mobs/icons/mob/animal.dmi'
+	icon = 'icons/mob/animal.dmi'
 	icon_state = "clowngoblin"
diff --git a/modular_ss220/mobs/code/simple_animal/mobs.dm b/modular_ss220/mobs/code/simple_animal/mobs.dm
index 981bfffd30e6a..1decab575cf3f 100644
--- a/modular_ss220/mobs/code/simple_animal/mobs.dm
+++ b/modular_ss220/mobs/code/simple_animal/mobs.dm
@@ -7,7 +7,7 @@
 
 /mob/living/simple_animal/hostile/headslug
 	attacktext = "грызёт"
-// holder_type = /obj/item/holder/headslug (Пупс попросил закомментить)
+	holder_type = /obj/item/holder/headslug
 
 /mob/living/simple_animal/hostile/retaliate/clown/goblin
 	holder_type = /obj/item/holder/clowngoblin
diff --git a/modular_ss220/mobs/icons/mob/pets.dmi b/modular_ss220/mobs/icons/mob/pets.dmi
index fa2fabc90e575..8e18c44950b9a 100644
Binary files a/modular_ss220/mobs/icons/mob/pets.dmi and b/modular_ss220/mobs/icons/mob/pets.dmi differ