diff --git a/1SP_pods.dmm b/1SP_pods.dmm
index 182aaa6f56..fbafb17314 100644
--- a/1SP_pods.dmm
+++ b/1SP_pods.dmm
@@ -2997,12 +2997,7 @@
 /turf/simulated/shuttle/plating,
 /area/survivalpod/superpose/TradingShip)
 "cpj" = (
-/obj/effect/decal/cleanable/blood/tracks{
-	color = "red";
-	desc = "Your instincts say you shouldn't be following these.";
-	icon = 'icons/effects/blood.dmi';
-	icon_state = "tracks"
-	},
+/obj/effect/decal/cleanable/blood/tracks/suspicious,
 /turf/simulated/mineral/floor/ignore_mapgen/cave,
 /area/survivalpod/superpose/HydroCave)
 "cpn" = (
@@ -5457,12 +5452,7 @@
 /turf/simulated/shuttle/floor/alienplating,
 /area/survivalpod/superpose/CrashedInfestedShip)
 "eam" = (
-/obj/effect/decal/cleanable/blood/tracks{
-	color = "red";
-	desc = "Your instincts say you shouldn't be following these.";
-	icon = 'icons/effects/blood.dmi';
-	icon_state = "tracks"
-	},
+/obj/effect/decal/cleanable/blood/tracks/suspicious,
 /obj/effect/decal/cleanable/blood/splatter{
 	color = "red"
 	},
@@ -5738,13 +5728,7 @@
 /obj/effect/floor_decal/techfloor{
 	dir = 6
 	},
-/obj/machinery/power/smes/buildable{
-	icon = 'icons/obj/alien_smes.dmi';
-	icon_state = "unit";
-	input_level = 950000;
-	name = "Alien Royal Capacitor";
-	output_level = 950000
-	},
+/obj/machinery/power/smes/buildable/alien_royal,
 /turf/simulated/floor/cult,
 /area/survivalpod/superpose/CultShip)
 "eir" = (
@@ -7308,13 +7292,7 @@
 /turf/simulated/floor/plating,
 /area/survivalpod/superpose/HydroCave)
 "fkW" = (
-/obj/machinery/power/smes/buildable{
-	icon = 'icons/obj/alien_smes.dmi';
-	icon_state = "unit";
-	input_level = 950000;
-	name = "Alien Royal Capacitor";
-	output_level = 950000
-	},
+/obj/machinery/power/smes/buildable/alien_royal,
 /obj/effect/floor_decal/techfloor{
 	dir = 5
 	},
@@ -8197,12 +8175,7 @@
 /turf/simulated/floor/tiled/techfloor,
 /area/survivalpod/superpose/HydroCave)
 "fOX" = (
-/obj/effect/decal/cleanable/blood/tracks{
-	color = "red";
-	desc = "Your instincts say you shouldn't be following these.";
-	icon = 'icons/effects/blood.dmi';
-	icon_state = "tracks"
-	},
+/obj/effect/decal/cleanable/blood/tracks/suspicious,
 /obj/item/gps/medical/on{
 	pixel_x = 7;
 	pixel_y = 6
@@ -8685,12 +8658,8 @@
 /obj/effect/decal/cleanable/blood/splatter{
 	color = "red"
 	},
-/obj/effect/decal/cleanable/blood/tracks{
-	color = "red";
-	desc = "Your instincts say you shouldn't be following these.";
-	dir = 4;
-	icon = 'icons/effects/blood.dmi';
-	icon_state = "tracks"
+/obj/effect/decal/cleanable/blood/tracks/suspicious{
+	dir = 4
 	},
 /turf/simulated/mineral/floor/ignore_mapgen/cave,
 /area/survivalpod/superpose/HydroCave)
@@ -9532,12 +9501,7 @@
 /obj/effect/decal/cleanable/blood/splatter{
 	color = "red"
 	},
-/obj/effect/decal/cleanable/blood/tracks{
-	color = "red";
-	desc = "Your instincts say you shouldn't be following these.";
-	icon = 'icons/effects/blood.dmi';
-	icon_state = "tracks"
-	},
+/obj/effect/decal/cleanable/blood/tracks/suspicious,
 /turf/simulated/mineral/floor/ignore_mapgen/cave,
 /area/survivalpod/superpose/HydroCave)
 "gJt" = (
@@ -11372,12 +11336,7 @@
 /turf/simulated/shuttle/floor/voidcraft/light,
 /area/survivalpod)
 "ibf" = (
-/obj/effect/decal/cleanable/blood/tracks{
-	color = "red";
-	desc = "Your instincts say you shouldn't be following these.";
-	icon = 'icons/effects/blood.dmi';
-	icon_state = "tracks"
-	},
+/obj/effect/decal/cleanable/blood/tracks/suspicious,
 /turf/simulated/floor/outdoors/rocks,
 /area/survivalpod/superpose/DragonCave)
 "ibi" = (
@@ -12242,12 +12201,8 @@
 /turf/simulated/shuttle/floor/white,
 /area/template_noop)
 "iMp" = (
-/obj/effect/decal/cleanable/blood/tracks{
-	color = "red";
-	desc = "Your instincts say you shouldn't be following these.";
-	dir = 4;
-	icon = 'icons/effects/blood.dmi';
-	icon_state = "tracks"
+/obj/effect/decal/cleanable/blood/tracks/suspicious{
+	dir = 4
 	},
 /turf/simulated/floor/outdoors/dirt,
 /area/survivalpod/superpose/DragonCave)
@@ -12724,13 +12679,7 @@
 /turf/simulated/floor/wood,
 /area/template_noop)
 "jfv" = (
-/obj/machinery/power/smes/buildable{
-	icon = 'icons/obj/alien_smes.dmi';
-	icon_state = "unit";
-	input_level = 950000;
-	name = "Alien Royal Capacitor";
-	output_level = 950000
-	},
+/obj/machinery/power/smes/buildable/alien_royal,
 /obj/effect/floor_decal/techfloor{
 	dir = 5
 	},
@@ -13216,13 +13165,7 @@
 /area/survivalpod/superpose/Dinner)
 "jyy" = (
 /obj/effect/floor_decal/industrial/outline/yellow,
-/obj/machinery/power/smes/buildable{
-	icon = 'icons/obj/alien_smes.dmi';
-	icon_state = "unit";
-	input_level = 950000;
-	name = "Alien Royal Capacitor";
-	output_level = 950000
-	},
+/obj/machinery/power/smes/buildable/alien_royal,
 /obj/structure/cable/cyan{
 	icon_state = "0-2"
 	},
@@ -14565,13 +14508,7 @@
 /area/survivalpod/superpose/LoneHome)
 "krb" = (
 /obj/effect/floor_decal/industrial/outline/yellow,
-/obj/machinery/power/smes/buildable{
-	icon = 'icons/obj/alien_smes.dmi';
-	icon_state = "unit";
-	input_level = 950000;
-	name = "Alien Royal Capacitor";
-	output_level = 950000
-	},
+/obj/machinery/power/smes/buildable/alien_royal,
 /obj/machinery/light/poi,
 /turf/simulated/floor,
 /area/survivalpod/superpose/CrashedInfestedShip)
@@ -15800,12 +15737,7 @@
 /turf/simulated/floor/tiled/steel_grid,
 /area/survivalpod/superpose/HydroCave)
 "lma" = (
-/obj/effect/decal/cleanable/blood/tracks{
-	color = "red";
-	desc = "Your instincts say you shouldn't be following these.";
-	icon = 'icons/effects/blood.dmi';
-	icon_state = "tracks"
-	},
+/obj/effect/decal/cleanable/blood/tracks/suspicious,
 /turf/template_noop,
 /area/template_noop)
 "lmg" = (
@@ -18554,12 +18486,7 @@
 /turf/simulated/floor/tiled/steel_dirty,
 /area/survivalpod/superpose/FieldLab)
 "nbF" = (
-/obj/effect/decal/cleanable/blood/tracks{
-	color = "red";
-	desc = "Your instincts say you shouldn't be following these.";
-	icon = 'icons/effects/blood.dmi';
-	icon_state = "tracks"
-	},
+/obj/effect/decal/cleanable/blood/tracks/suspicious,
 /turf/simulated/mineral/floor/ignore_mapgen/cave,
 /area/template_noop)
 "nbR" = (
@@ -20115,7 +20042,6 @@
 	anchored = 1;
 	canhear_range = 1;
 	frequency = 1487;
-	icon = 'icons/obj/items.dmi';
 	icon_state = "red_phone";
 	name = "Reception Emergency Phone"
 	},
@@ -21519,13 +21445,7 @@
 /obj/effect/floor_decal/techfloor{
 	dir = 6
 	},
-/obj/machinery/power/smes/buildable{
-	icon = 'icons/obj/alien_smes.dmi';
-	icon_state = "unit";
-	input_level = 950000;
-	name = "Alien Royal Capacitor";
-	output_level = 950000
-	},
+/obj/machinery/power/smes/buildable/alien_royal,
 /turf/simulated/floor/cult,
 /area/template_noop)
 "paG" = (
@@ -21614,12 +21534,7 @@
 /area/template_noop)
 "pdg" = (
 /obj/structure/barricade,
-/obj/effect/decal/cleanable/blood/tracks{
-	color = "red";
-	desc = "Your instincts say you shouldn't be following these.";
-	icon = 'icons/effects/blood.dmi';
-	icon_state = "tracks"
-	},
+/obj/effect/decal/cleanable/blood/tracks/suspicious,
 /turf/simulated/mineral/floor/ignore_mapgen/cave,
 /area/template_noop)
 "pdo" = (
@@ -27582,12 +27497,8 @@
 /area/survivalpod/superpose/CrashedInfestedShip)
 "sxA" = (
 /obj/structure/barricade,
-/obj/effect/decal/cleanable/blood/tracks{
-	color = "red";
-	desc = "Your instincts say you shouldn't be following these.";
-	dir = 4;
-	icon = 'icons/effects/blood.dmi';
-	icon_state = "tracks"
+/obj/effect/decal/cleanable/blood/tracks/suspicious{
+	dir = 4
 	},
 /turf/simulated/mineral/floor/ignore_mapgen/cave,
 /area/survivalpod/superpose/HydroCave)
@@ -27759,12 +27670,7 @@
 /turf/simulated/floor/wood,
 /area/template_noop)
 "sFi" = (
-/obj/effect/decal/cleanable/blood/tracks{
-	color = "red";
-	desc = "Your instincts say you shouldn't be following these.";
-	icon = 'icons/effects/blood.dmi';
-	icon_state = "tracks"
-	},
+/obj/effect/decal/cleanable/blood/tracks/suspicious,
 /obj/effect/decal/cleanable/blood/splatter{
 	color = "red"
 	},
@@ -28511,12 +28417,8 @@
 /turf/simulated/shuttle/plating/skipjack,
 /area/template_noop)
 "tiZ" = (
-/obj/effect/decal/cleanable/blood/tracks{
-	color = "red";
-	desc = "Your instincts say you shouldn't be following these.";
-	dir = 4;
-	icon = 'icons/effects/blood.dmi';
-	icon_state = "tracks"
+/obj/effect/decal/cleanable/blood/tracks/suspicious{
+	dir = 4
 	},
 /turf/simulated/floor/outdoors/rocks,
 /area/survivalpod/superpose/DragonCave)
@@ -28874,12 +28776,7 @@
 /area/survivalpod/superpose/TradingShip)
 "tqh" = (
 /obj/effect/decal/cleanable/filth,
-/obj/effect/decal/cleanable/blood/tracks{
-	color = "red";
-	desc = "Your instincts say you shouldn't be following these.";
-	icon = 'icons/effects/blood.dmi';
-	icon_state = "tracks"
-	},
+/obj/effect/decal/cleanable/blood/tracks/suspicious,
 /turf/simulated/floor/outdoors/dirt,
 /area/survivalpod/superpose/DragonCave)
 "tql" = (
@@ -29891,12 +29788,7 @@
 /turf/simulated/shuttle/floor/black,
 /area/survivalpod/superpose/TradingShip)
 "uid" = (
-/obj/effect/decal/cleanable/blood/tracks{
-	color = "red";
-	desc = "Your instincts say you shouldn't be following these.";
-	icon = 'icons/effects/blood.dmi';
-	icon_state = "tracks"
-	},
+/obj/effect/decal/cleanable/blood/tracks/suspicious,
 /turf/simulated/floor/outdoors/dirt,
 /area/survivalpod/superpose/DragonCave)
 "uig" = (
@@ -30473,12 +30365,7 @@
 	deployed = 1;
 	icon_state = "beartrap1"
 	},
-/obj/effect/decal/cleanable/blood/tracks{
-	color = "red";
-	desc = "Your instincts say you shouldn't be following these.";
-	icon = 'icons/effects/blood.dmi';
-	icon_state = "tracks"
-	},
+/obj/effect/decal/cleanable/blood/tracks/suspicious,
 /turf/simulated/mineral/floor/ignore_mapgen/cave,
 /area/survivalpod/superpose/HydroCave)
 "uEN" = (
@@ -31474,12 +31361,8 @@
 /turf/simulated/floor/tiled/techmaint,
 /area/template_noop)
 "vvE" = (
-/obj/effect/decal/cleanable/blood/tracks{
-	color = "red";
-	desc = "Your instincts say you shouldn't be following these.";
-	dir = 4;
-	icon = 'icons/effects/blood.dmi';
-	icon_state = "tracks"
+/obj/effect/decal/cleanable/blood/tracks/suspicious{
+	dir = 4
 	},
 /turf/simulated/mineral/floor/ignore_mapgen/cave,
 /area/template_noop)
@@ -32882,12 +32765,7 @@
 /turf/simulated/shuttle/floor/voidcraft,
 /area/template_noop)
 "wzV" = (
-/obj/effect/decal/cleanable/blood/tracks{
-	color = "red";
-	desc = "Your instincts say you shouldn't be following these.";
-	icon = 'icons/effects/blood.dmi';
-	icon_state = "tracks"
-	},
+/obj/effect/decal/cleanable/blood/tracks/suspicious,
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/outdoors/dirt,
 /area/survivalpod/superpose/DragonCave)
diff --git a/1mapping_palette.dmm b/1mapping_palette.dmm
index d8f9661005..4ad2ad0e95 100644
--- a/1mapping_palette.dmm
+++ b/1mapping_palette.dmm
@@ -2810,12 +2810,8 @@
 /turf/simulated/floor/tiled,
 /area/space)
 "bUv" = (
-/obj/effect/decal/cleanable/blood/tracks{
-	color = "red";
-	desc = "Your instincts say you shouldn't be following these.";
-	dir = 4;
-	icon = 'icons/effects/blood.dmi';
-	icon_state = "tracks"
+/obj/effect/decal/cleanable/blood/tracks/suspicious{
+	dir = 4
 	},
 /turf/simulated/floor/outdoors/dirt,
 /area/space)
@@ -3472,12 +3468,8 @@
 /obj/item/cell/void,
 /obj/item/cell/void,
 /obj/item/gun/energy/sickshot,
-/obj/machinery/smartfridge/survival_pod{
-	desc = "A mysterious machine which can fabricate many tools for acquiring test subjects.";
-	icon = 'icons/obj/abductor_vr.dmi';
-	icon_base = "dispenser_2way";
-	icon_state = "dispenser_2way";
-	name = "Ro-Bust-Us"
+/obj/machinery/smartfridge/survival_pod/abductor{
+	dir = 2
 	},
 /obj/item/storage/box/handcuffs,
 /obj/item/storage/box/handcuffs,
@@ -3554,12 +3546,8 @@
 /turf/simulated/floor/wood/sif,
 /area/space)
 "cuj" = (
-/obj/machinery/smartfridge/survival_pod{
-	desc = "A mysterious machine which can fabricate many tools for acquiring test subjects.";
-	icon = 'icons/obj/abductor_vr.dmi';
-	icon_base = "dispenser_2way";
-	icon_state = "dispenser_2way";
-	name = "Implant-Co"
+/obj/machinery/smartfridge/survival_pod/abductor{
+	dir = 2
 	},
 /obj/item/implantcase/taser,
 /obj/item/implantcase/taser,
@@ -4156,12 +4144,7 @@
 /obj/item/radio/headset/syndicate,
 /obj/item/radio/headset/syndicate,
 /obj/item/radio/headset/syndicate,
-/obj/machinery/smartfridge/survival_pod{
-	desc = "A mysterious machine which can fabricate many tools for acquiring test subjects.";
-	dir = 4;
-	icon = 'icons/obj/abductor_vr.dmi';
-	icon_base = "dispenser_2way";
-	icon_state = "dispenser_2way";
+/obj/machinery/smartfridge/survival_pod/abductor{
 	name = "ID-Mart"
 	},
 /obj/item/card/id/casino{
@@ -4358,13 +4341,7 @@
 /area/space)
 "cTz" = (
 /obj/effect/floor_decal/industrial/outline/yellow,
-/obj/machinery/power/smes/buildable{
-	icon = 'icons/obj/alien_smes.dmi';
-	icon_state = "unit";
-	input_level = 950000;
-	name = "Alien Royal Capacitor";
-	output_level = 950000
-	},
+/obj/machinery/power/smes/buildable/alien_royal,
 /turf/simulated/floor,
 /area/space)
 "cTZ" = (
@@ -4627,13 +4604,7 @@
 /area/space)
 "dbD" = (
 /obj/effect/floor_decal/industrial/outline/yellow,
-/obj/machinery/power/smes/buildable{
-	icon = 'icons/obj/alien_smes.dmi';
-	icon_state = "unit";
-	input_level = 950000;
-	name = "Alien Royal Capacitor";
-	output_level = 950000
-	},
+/obj/machinery/power/smes/buildable/alien_royal,
 /obj/structure/cable/cyan{
 	icon_state = "0-2"
 	},
@@ -4832,15 +4803,6 @@
 /obj/machinery/atmospherics/pipe/manifold4w/hidden/yellow,
 /turf/simulated/shuttle/wall/voidcraft/green,
 /area/space)
-"dmp" = (
-/obj/effect/decal/cleanable/blood/tracks{
-	color = "red";
-	desc = "Your instincts say you shouldn't be following these.";
-	icon = 'icons/effects/blood.dmi';
-	icon_state = "tracks"
-	},
-/turf/simulated/floor/outdoors/dirt,
-/area/space)
 "dmw" = (
 /turf/template_noop,
 /area/awaymission/snowfield/outside)
@@ -5878,12 +5840,7 @@
 /obj/item/clothing/accessory/collar/shock,
 /obj/item/radio/electropack,
 /obj/item/clothing/accessory/collar/shock,
-/obj/machinery/smartfridge/survival_pod{
-	desc = "A mysterious machine which can fabricate many tools for acquiring test subjects.";
-	dir = 4;
-	icon = 'icons/obj/abductor_vr.dmi';
-	icon_base = "dispenser_2way";
-	icon_state = "dispenser_2way";
+/obj/machinery/smartfridge/survival_pod/abductor{
 	name = "Ross-Traints";
 	req_access = list(777)
 	},
@@ -7267,13 +7224,7 @@
 /area/space)
 "eYy" = (
 /obj/effect/floor_decal/industrial/outline/yellow,
-/obj/machinery/power/smes/buildable{
-	icon = 'icons/obj/alien_smes.dmi';
-	icon_state = "unit";
-	input_level = 950000;
-	name = "Alien Royal Capacitor";
-	output_level = 950000
-	},
+/obj/machinery/power/smes/buildable/alien_royal,
 /obj/structure/cable/cyan,
 /turf/simulated/floor,
 /area/space)
@@ -7709,12 +7660,7 @@
 /obj/item/radio/bluespacehandset/linked/talon_prelinked,
 /obj/item/radio/bluespacehandset/linked/talon_prelinked,
 /obj/item/radio/bluespacehandset/linked/talon_prelinked,
-/obj/machinery/smartfridge/survival_pod{
-	desc = "A mysterious machine which can fabricate many tools for acquiring test subjects.";
-	dir = 4;
-	icon = 'icons/obj/abductor_vr.dmi';
-	icon_base = "dispenser_2way";
-	icon_state = "dispenser_2way";
+/obj/machinery/smartfridge/survival_pod/abductor{
 	name = "Translocate-R-US"
 	},
 /turf/simulated/floor/tiled/techfloor,
@@ -7855,9 +7801,7 @@
 /obj/mecha/combat/fighter/pinnace{
 	dir = 8
 	},
-/obj/machinery/mech_recharger{
-	icon = 'icons/turf/shuttle_alien_blue.dmi'
-	},
+/obj/machinery/mech_recharger/alien,
 /turf/simulated/floor/reinforced,
 /area/space)
 "fue" = (
@@ -9354,12 +9298,8 @@
 /obj/structure/window/reinforced/survival_pod{
 	opacity = 1
 	},
-/obj/machinery/smartfridge/survival_pod{
-	desc = "A mysterious machine which can fabricate many tools for acquiring test subjects.";
-	icon = 'icons/obj/abductor_vr.dmi';
-	icon_base = "dispenser_2way";
-	icon_state = "dispenser_2way";
-	name = "Implant-Co"
+/obj/machinery/smartfridge/survival_pod/abductor{
+	dir = 2
 	},
 /obj/effect/floor_decal/techfloor{
 	dir = 6
@@ -11211,13 +11151,8 @@
 /obj/item/implanter,
 /obj/item/implanter,
 /obj/item/implanter,
-/obj/machinery/smartfridge/survival_pod{
-	desc = "A mysterious machine which can fabricate many tools for acquiring test subjects.";
-	dir = 4;
-	icon = 'icons/obj/abductor_vr.dmi';
-	icon_base = "dispenser_2way";
-	icon_state = "dispenser_2way";
-	name = "Implant-Co"
+/obj/machinery/smartfridge/survival_pod/abductor{
+	dir = 4
 	},
 /turf/simulated/floor/tiled/techfloor,
 /area/space)
@@ -14651,11 +14586,7 @@
 	},
 /obj/item/handcuffs/legcuffs/fuzzy,
 /obj/item/handcuffs/legcuffs/fuzzy,
-/obj/machinery/smartfridge/survival_pod{
-	desc = "A mysterious machine which can fabricate many tools for acquiring test subjects.";
-	icon = 'icons/obj/abductor_vr.dmi';
-	icon_base = "dispenser_2way";
-	icon_state = "dispenser_2way";
+/obj/machinery/smartfridge/survival_pod/abductor{
 	name = "Ross-Traints";
 	req_access = list(777)
 	},
@@ -15292,13 +15223,7 @@
 /obj/structure/cable{
 	icon_state = "0-8"
 	},
-/obj/machinery/power/smes/buildable{
-	icon = 'icons/obj/alien_smes.dmi';
-	icon_state = "unit";
-	input_level = 950000;
-	name = "Alien Royal Capacitor";
-	output_level = 950000
-	},
+/obj/machinery/power/smes/buildable/alien_royal,
 /turf/simulated/floor/tiled/techfloor,
 /area/space)
 "kns" = (
@@ -16052,11 +15977,8 @@
 /turf/simulated/floor/outdoors/dirt,
 /area/space)
 "kOg" = (
-/obj/machinery/smartfridge/survival_pod{
-	desc = "A mysterious machine which can fabricate many tools for acquiring test subjects.";
-	icon = 'icons/obj/abductor_vr.dmi';
-	icon_base = "dispenser_2way";
-	icon_state = "dispenser_2way";
+/obj/machinery/smartfridge/survival_pod/abductor{
+	    dir = 2;
 	name = "Translocate-R-US"
 	},
 /obj/item/gps/syndie,
@@ -17908,12 +17830,8 @@
 /turf/simulated/floor/tiled/dark,
 /area/space)
 "mdx" = (
-/obj/effect/decal/cleanable/blood/tracks{
-	color = "red";
-	desc = "Your instincts say you shouldn't be following these.";
-	dir = 5;
-	icon = 'icons/effects/blood.dmi';
-	icon_state = "tracks"
+/obj/effect/decal/cleanable/blood/tracks/suspicious{
+	dir = 5
 	},
 /turf/simulated/floor/outdoors/dirt,
 /area/space)
@@ -18590,11 +18508,8 @@
 /turf/simulated/floor/tiled/techfloor,
 /area/space)
 "mxW" = (
-/obj/machinery/smartfridge/survival_pod{
-	desc = "A mysterious machine which can fabricate many tools for acquiring test subjects.";
-	icon = 'icons/obj/abductor_vr.dmi';
-	icon_base = "dispenser_2way";
-	icon_state = "dispenser_2way";
+/obj/machinery/smartfridge/survival_pod/abductor{
+	dir = 2;
 	name = "ID-Mart"
 	},
 /obj/item/encryptionkey/syndicate,
@@ -18857,12 +18772,7 @@
 	pixel_x = -2;
 	pixel_y = 5
 	},
-/obj/machinery/smartfridge/survival_pod{
-	desc = "A mysterious machine which can fabricate many tools for acquiring test subjects.";
-	dir = 4;
-	icon = 'icons/obj/abductor_vr.dmi';
-	icon_base = "dispenser_2way";
-	icon_state = "dispenser_2way";
+/obj/machinery/smartfridge/survival_pod/abductor{
 	name = "Ross-Traints";
 	req_access = list(777)
 	},
@@ -23253,12 +23163,7 @@
 /obj/item/tank/emergency/oxygen/double,
 /obj/item/tank/emergency/oxygen/double,
 /obj/item/gun/energy/sickshot,
-/obj/machinery/smartfridge/survival_pod{
-	desc = "A mysterious machine which can fabricate many tools for acquiring test subjects.";
-	dir = 4;
-	icon = 'icons/obj/abductor_vr.dmi';
-	icon_base = "dispenser_2way";
-	icon_state = "dispenser_2way";
+/obj/machinery/smartfridge/survival_pod/abductor{
 	name = "UP-Duction";
 	req_access = list(777)
 	},
@@ -24031,12 +23936,7 @@
 	pixel_x = -2;
 	pixel_y = 5
 	},
-/obj/machinery/smartfridge/survival_pod{
-	desc = "A mysterious machine which can fabricate many tools for acquiring test subjects.";
-	dir = 4;
-	icon = 'icons/obj/abductor_vr.dmi';
-	icon_base = "dispenser_2way";
-	icon_state = "dispenser_2way";
+/obj/machinery/smartfridge/survival_pod/abductor{
 	name = "Ross-Traints";
 	req_access = list(777)
 	},
@@ -27929,12 +27829,7 @@
 /obj/item/clothing/accessory/collar/shock,
 /obj/item/radio/electropack,
 /obj/item/clothing/accessory/collar/shock,
-/obj/machinery/smartfridge/survival_pod{
-	desc = "A mysterious machine which can fabricate many tools for acquiring test subjects.";
-	dir = 4;
-	icon = 'icons/obj/abductor_vr.dmi';
-	icon_base = "dispenser_2way";
-	icon_state = "dispenser_2way";
+/obj/machinery/smartfridge/survival_pod/abductor{
 	name = "Ross-Traints";
 	req_access = list(777)
 	},
@@ -28437,12 +28332,9 @@
 /turf/simulated/shuttle/floor/alienplating,
 /area/space)
 "sVQ" = (
-/obj/effect/decal/cleanable/blood/tracks{
-	color = "red";
-	desc = "Your instincts say you shouldn't be following these.";
+/obj/effect/decal/cleanable/blood/tracks/suspicious{
 	dir = 6;
-	icon = 'icons/effects/blood.dmi';
-	icon_state = "tracks"
+	
 	},
 /turf/simulated/floor/outdoors/dirt,
 /area/space)
@@ -28450,14 +28342,7 @@
 /obj/structure/window/reinforced/survival_pod{
 	opacity = 1
 	},
-/obj/machinery/smartfridge/survival_pod{
-	desc = "A mysterious machine which can fabricate many tools for acquiring test subjects.";
-	dir = 4;
-	icon = 'icons/obj/abductor_vr.dmi';
-	icon_base = "dispenser_2way";
-	icon_state = "dispenser_2way";
-	name = "Implant-Co"
-	},
+/obj/machinery/smartfridge/survival_pod/abductor,
 /obj/effect/floor_decal/techfloor{
 	dir = 10
 	},
@@ -29953,13 +29838,7 @@
 /turf/simulated/floor/tiled/techmaint,
 /area/space)
 "tSl" = (
-/obj/machinery/smartfridge/survival_pod{
-	desc = "A mysterious machine which can fabricate many tools for acquiring test subjects.";
-	icon = 'icons/obj/abductor_vr.dmi';
-	icon_base = "dispenser_2way";
-	icon_state = "dispenser_2way";
-	name = "Implant-Co"
-	},
+/obj/machinery/smartfridge/survival_pod/abductor,
 /obj/item/implantcase/taser,
 /obj/item/implantcase/taser,
 /obj/item/implantcase/taser,
@@ -31519,10 +31398,7 @@
 /obj/item/radio/electropack,
 /obj/item/clothing/accessory/collar/shock,
 /obj/machinery/smartfridge/survival_pod{
-	desc = "A mysterious machine which can fabricate many tools for acquiring test subjects.";
-	icon = 'icons/obj/abductor_vr.dmi';
-	icon_base = "dispenser_2way";
-	icon_state = "dispenser_2way";
+	dir = 2;
 	name = "Ross-Traints";
 	req_access = list(777)
 	},
@@ -32424,10 +32300,7 @@
 /area/space)
 "vAo" = (
 /obj/machinery/smartfridge/survival_pod{
-	desc = "A mysterious machine which can fabricate many tools for acquiring test subjects.";
-	icon = 'icons/obj/abductor.dmi';
-	icon_base = "dispenser_2way";
-	icon_state = "dispenser";
+	dir = 2;
 	name = "Scrap-Storage"
 	},
 /turf/simulated/floor/tiled/techfloor,
@@ -35109,10 +34982,7 @@
 /obj/item/healthanalyzer/phasic,
 /obj/item/healthanalyzer/phasic,
 /obj/machinery/smartfridge/survival_pod{
-	desc = "A mysterious machine which can fabricate many tools for acquiring test subjects.";
-	icon = 'icons/obj/abductor_vr.dmi';
-	icon_base = "dispenser_2way";
-	icon_state = "dispenser_2way";
+	dir = 2;
 	name = "Ross-Traints";
 	req_access = list(777)
 	},
@@ -41975,7 +41845,7 @@ noS
 uGy
 mYY
 mYY
-dmp
+bUv
 bUv
 sVQ
 mdx
diff --git a/SouthernCrossRef.dmm b/SouthernCrossRef.dmm
index c4bbcc3710..0217634c8d 100644
--- a/SouthernCrossRef.dmm
+++ b/SouthernCrossRef.dmm
@@ -33059,7 +33059,6 @@
 	anchored = 1;
 	canhear_range = 1;
 	frequency = 1487;
-	icon = 'icons/obj/items.dmi';
 	icon_state = "red_phone";
 	name = "Reception Emergency Phone";
 	pixel_x = -5
@@ -83750,7 +83749,6 @@
 	anchored = 1;
 	canhear_range = 1;
 	frequency = 1487;
-	icon = 'icons/obj/items.dmi';
 	icon_state = "red_phone";
 	name = "Reception Emergency Phone"
 	},
diff --git a/archive/maps/cynosure/cynosure-6.dmm b/archive/maps/cynosure/cynosure-6.dmm
index a6c000ee4c..94db1ae9d3 100644
--- a/archive/maps/cynosure/cynosure-6.dmm
+++ b/archive/maps/cynosure/cynosure-6.dmm
@@ -483,9 +483,7 @@
 	},
 /area/centcom/specops)
 "avR" = (
-/obj/machinery/door/airlock{
-	icon = 'icons/obj/doors/Dooruranium.dmi'
-	},
+/obj/machinery/door/airlock/uranium_appearance,
 /turf/unsimulated/floor{
 	dir = 8;
 	icon_state = "wood"
@@ -1204,13 +1202,6 @@
 	icon_state = "steel"
 	},
 /area/centcom/main_hall)
-"boo" = (
-/obj/structure/shuttle/falsewall_no_join{
-	icon = 'icons/turf/wall_masks_tgmc.dmi';
-	icon_state = "white2"
-	},
-/turf/simulated/floor/plating,
-/area/shuttle/escape/centcom)
 "bos" = (
 /obj/effect/floor_decal/techfloor{
 	dir = 10
@@ -1451,9 +1442,7 @@
 	},
 /area/centcom/terminal)
 "bCf" = (
-/obj/machinery/door/airlock{
-	icon = 'icons/obj/doors/Dooruranium.dmi'
-	},
+/obj/machinery/door/airlock/uranium_appearance,
 /turf/unsimulated/floor{
 	icon_state = "dark"
 	},
@@ -8481,9 +8470,7 @@
 /turf/simulated/shuttle/floor/red,
 /area/shuttle/administration/centcom)
 "jGM" = (
-/obj/machinery/door/airlock{
-	icon = 'icons/obj/doors/Dooruranium.dmi'
-	},
+/obj/machinery/door/airlock/uranium_appearance,
 /turf/unsimulated/floor{
 	icon_state = "plating";
 	name = "plating"
@@ -9179,11 +9166,7 @@
 /turf/simulated/shuttle/plating,
 /area/skipjack_station/start)
 "krB" = (
-/turf/unsimulated/wall{
-	icon = 'icons/obj/doors/Dooruranium.dmi';
-	icon_state = "door_closed";
-	name = "Sealed Door"
-	},
+/turf/unsimulated/wall/fake_uranium,
 /area/ninja_dojo/dojo)
 "ksg" = (
 /obj/machinery/power/emitter{
@@ -10259,8 +10242,7 @@
 	},
 /area/centcom/specops)
 "lxd" = (
-/obj/machinery/door/airlock{
-	icon = 'icons/obj/doors/Dooruranium.dmi';
+/obj/machinery/door/airlock/uranium_appearance{
 	name = "Object Deletion"
 	},
 /turf/unsimulated/floor{
@@ -12987,8 +12969,7 @@
 /turf/simulated/shuttle/floor/red,
 /area/shuttle/response_ship/start)
 "oHh" = (
-/obj/machinery/door/airlock{
-	icon = 'icons/obj/doors/Dooruranium.dmi';
+/obj/machinery/door/airlock/uranium_appearance{
 	name = "Spawn"
 	},
 /turf/unsimulated/floor{
@@ -17762,9 +17743,7 @@
 /turf/simulated/shuttle/floor/white,
 /area/centcom/evac)
 "tDF" = (
-/obj/machinery/door/airlock{
-	icon = 'icons/obj/doors/Dooruranium.dmi'
-	},
+/obj/machinery/door/airlock/uranium_appearance,
 /turf/unsimulated/floor{
 	icon_state = "dark"
 	},
@@ -18298,9 +18277,7 @@
 /turf/simulated/shuttle/floor,
 /area/shuttle/transport1/centcom)
 "udk" = (
-/obj/machinery/door/airlock{
-	icon = 'icons/obj/doors/Dooruranium.dmi'
-	},
+/obj/machinery/door/airlock/uranium_appearance,
 /turf/unsimulated/floor{
 	icon_state = "white"
 	},
diff --git a/archive/maps/overmap/bearcat/bearcat.dm b/archive/maps/overmap/bearcat/bearcat.dm
index c070f6a259..1b5fd346b0 100644
--- a/archive/maps/overmap/bearcat/bearcat.dm
+++ b/archive/maps/overmap/bearcat/bearcat.dm
@@ -16,7 +16,17 @@
 	shuttle_tag = "Exploration"
 	landing_type = /area/ship/scrap/shuttle/outgoing
 
+/obj/effect/mapinfo/sector/commsrelay
+	icon = 'icons/obj/stock_parts.dmi'
+	icon_state = "treatment_disk"
+	landing_area = /area/shuttle/escape_pod1/centcom
+	name = "Communications Relay"
 
+/obj/effect/mapinfo/sector/abandoned
+	icon = 'icons/obj/mining.dmi'
+	icon_state = "ore2"
+	landing_area = /area/shuttle/escape_pod2/centcom
+	name = "Abandoned Outpost"
 
 /area/ship/scrap
 	name = "\improper Generic Ship"
@@ -116,4 +126,4 @@
 
 /area/ship/scrap/shuttle/outgoing
 	name = "\improper Docking Bay #1"
-	icon_state = "tcomsatcham"
\ No newline at end of file
+	icon_state = "tcomsatcham"
diff --git a/archive/maps/southern_cross/southern_cross-1.dmm b/archive/maps/southern_cross/southern_cross-1.dmm
index 534f48d270..95a430e9a0 100644
--- a/archive/maps/southern_cross/southern_cross-1.dmm
+++ b/archive/maps/southern_cross/southern_cross-1.dmm
@@ -18040,10 +18040,6 @@
 /obj/structure/closet/emcloset,
 /turf/simulated/floor/plating,
 /area/maintenance/firstdeck/aftstarboard)
-"aLx" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/turf/simulated/floor/tiled/monotile,
-/area/hangar/two)
 "aLy" = (
 /obj/machinery/light{
 	dir = 8
@@ -64989,7 +64985,6 @@
 	anchored = 1;
 	canhear_range = 1;
 	frequency = 1487;
-	icon = 'icons/obj/items.dmi';
 	icon_state = "red_phone";
 	name = "Reception Emergency Phone";
 	pixel_x = -5
@@ -66606,7 +66601,6 @@
 	anchored = 1;
 	canhear_range = 1;
 	frequency = 1487;
-	icon = 'icons/obj/items.dmi';
 	icon_state = "red_phone";
 	name = "Reception Emergency Phone"
 	},
@@ -147520,7 +147514,7 @@ aGw
 aGw
 aKC
 aKY
-aLx
+aKY
 aLV
 aME
 aNk
@@ -151118,7 +151112,7 @@ aGw
 aGw
 aKE
 aKY
-aLx
+aKY
 aLY
 aMH
 aNk
diff --git a/archive/maps/southern_cross/southern_cross-3.dmm b/archive/maps/southern_cross/southern_cross-3.dmm
index 416a3d9e5e..27bab6d3f8 100644
--- a/archive/maps/southern_cross/southern_cross-3.dmm
+++ b/archive/maps/southern_cross/southern_cross-3.dmm
@@ -6944,13 +6944,6 @@
 	},
 /turf/simulated/floor/tiled/freezer,
 /area/surface/outpost/main/restroom)
-"pm" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/overlay/snow/floor,
-/turf/simulated/floor/tiled/steel_dirty{
-	outdoors = 1
-	},
-/area/surface/outpost/main/dorms)
 "pn" = (
 /obj/machinery/door/airlock/mining{
 	autoclose = 0;
@@ -7579,11 +7572,7 @@
 	dir = 1;
 	icon_state = "spline_plain_full"
 	},
-/obj/structure/showcase{
-	desc = "It looks almost lifelike.";
-	icon = 'icons/obj/statue.dmi';
-	icon_state = "hos";
-	name = "Statue";
+/obj/structure/showcase/hos{
 	pixel_y = 2
 	},
 /obj/item/gps/internal/base,
@@ -13041,11 +13030,6 @@
 /obj/effect/overlay/snow/floor,
 /turf/simulated/floor/tiled/steel/sif/planetuse,
 /area/surface/outpost/research/xenoresearch/xenobiology)
-"Cl" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/overlay/snow/floor,
-/turf/simulated/floor/tiled/steel/sif/planetuse,
-/area/surface/outside/plains/outpost)
 "Cm" = (
 /obj/machinery/portable_atmospherics/canister/nitrogen,
 /obj/effect/floor_decal/industrial/warning{
@@ -13579,11 +13563,7 @@
 /turf/simulated/shuttle/wall/voidcraft/hard_corner,
 /area/surface/outpost/wall)
 "DS" = (
-/turf/simulated/wall/dungeon{
-	icon = 'icons/obj/doors/shuttledoors.dmi';
-	icon_state = "door_locked";
-	name = "Wall Gate"
-	},
+/turf/simulated/wall/dungeon/gate,
 /area/surface/outpost/wall)
 "DT" = (
 /obj/structure/sign/warning/caution{
@@ -37712,7 +37692,7 @@ al
 aI
 al
 ov
-pm
+ov
 pX
 al
 aI
@@ -51636,7 +51616,7 @@ zz
 BA
 xe
 Ck
-Cl
+ff
 bm
 CQ
 al
@@ -51892,8 +51872,8 @@ xo
 xo
 xo
 xo
-Cl
-Cl
+ff
+ff
 bm
 CQ
 al
@@ -52149,7 +52129,7 @@ AO
 Bi
 Ds
 xo
-Cl
+ff
 ue
 ue
 CQ
diff --git a/code/defines/obj.dm b/code/defines/obj.dm
index 019e8b32af..5e6b172cab 100644
--- a/code/defines/obj.dm
+++ b/code/defines/obj.dm
@@ -105,6 +105,18 @@ GLOBAL_LIST_INIT(acting_rank_prefixes, list("acting", "temporary", "interim", "p
 	anchored = TRUE
 	unacidable = TRUE//temporary until I decide whether the borg can be removed. -veyveyr
 
+/obj/structure/showcase/monkey
+	desc = "It looks almost lifelike."
+	icon = 'icons/obj/statue.dmi'
+	icon_state = "monkey"
+	name = "Statue"
+
+/obj/structure/showcase/human
+	desc = "It looks almost lifelike."
+	icon = 'icons/obj/statue.dmi'
+	icon_state = "Human_male"
+	name = "Statue"
+
 /obj/structure/showcase/sign
 	name = "WARNING: WILDERNESS"
 	icon = 'icons/obj/stationobjs.dmi'
diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm
index e3d782c0cf..738fe8802a 100644
--- a/code/defines/obj/weapon.dm
+++ b/code/defines/obj/weapon.dm
@@ -1,7 +1,7 @@
 /obj/item/phone
 	name = "red phone"
 	desc = "Should anything ever go wrong..."
-	icon = 'icons/obj/items.dmi'
+	icon = 'icons/obj/radio.dmi'
 	icon_state = "red_phone"
 	force = 3.0
 	throwforce = 2.0
diff --git a/code/game/machinery/cryopod_vr.dm b/code/game/machinery/cryopod_vr.dm
index 0ccd6a5d05..d39ac03b0b 100644
--- a/code/game/machinery/cryopod_vr.dm
+++ b/code/game/machinery/cryopod_vr.dm
@@ -12,6 +12,19 @@
 /obj/machinery/cryopod/robot/door/dorms
 	spawnpoint_type = /datum/spawnpoint/tram
 
+///Door specifically for a site in tether. Or other places that uses a 2x1 glass door.
+/obj/machinery/cryopod/robot/door/dorms/tether_glass
+	name = "elevator"
+	desc = "A small elevator"
+	base_icon_state = "door_closed"
+	icon = 'icons/obj/doors/Door2x1glass.dmi'
+	icon_state = "door_closed"
+	on_enter_occupant_message = "The elevator doors close slowly. You can now head off for the residential, commercial, and other floors.";
+	on_store_message = "has departed for one of the various colony floors"
+	on_store_name = "Colony Oversight"
+	on_store_visible_message_2 = "to the colony districts."
+	time_till_despawn = 5
+
 /obj/machinery/cryopod/robot/door/gateway
 	name = "public teleporter"
 	desc = "The short-range teleporter you might've came in from. You could leave easily using this."
diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm
index 3a3187d2ae..045b73f815 100644
--- a/code/game/machinery/doors/airlock.dm
+++ b/code/game/machinery/doors/airlock.dm
@@ -645,6 +645,9 @@
 	normalspeed = FALSE // So it closes faster and hopefully keeps the warm air inside.
 	hackProof = TRUE //No borgs
 
+/obj/machinery/door/airlock/uranium_appearance
+	icon = 'icons/obj/doors/Dooruranium.dmi'
+
 /*
 About the new airlock wires panel:
 *	An airlock wire dialog can be accessed by the normal way or by using wirecutters or a multitool on the door while the wire-panel is open. This would show the following wires, which you can either wirecut/mend or send a multitool pulse through. There are 9 wires.
diff --git a/code/game/machinery/teleporter.dm b/code/game/machinery/teleporter.dm
index c61abf1809..6674cb9571 100644
--- a/code/game/machinery/teleporter.dm
+++ b/code/game/machinery/teleporter.dm
@@ -129,7 +129,6 @@
 /obj/machinery/teleport/hub
 	name = "teleporter hub"
 	desc = "It's the hub of a teleporting machine."
-	icon = 'icons/obj/teleporter_vr.dmi' //VOREStation Add
 	icon_state = "tele0"
 	dir = 4
 	var/accurate = 0
@@ -196,7 +195,6 @@
 /obj/machinery/teleport/station
 	name = "station"
 	desc = "It's the station thingy of a teleport thingy." //seriously, wtf.
-	icon = 'icons/obj/teleporter_vr.dmi' //VOREStation Add
 	icon_state = "controller"
 	dir = 4
 	var/active = 0
diff --git a/code/game/mecha/mech_bay.dm b/code/game/mecha/mech_bay.dm
index 1d8cbf6367..1c15466e7c 100644
--- a/code/game/mecha/mech_bay.dm
+++ b/code/game/mecha/mech_bay.dm
@@ -15,6 +15,8 @@
 		/obj/mecha,
 		/mob/living/silicon/robot/platform
 	)
+/obj/machinery/mech_recharger/alien
+	icon = 'icons/turf/shuttle_alien_blue.dmi'
 
 /obj/machinery/mech_recharger/Initialize(mapload)
 	. = ..()
diff --git a/code/game/objects/effects/decals/Cleanable/tracks.dm b/code/game/objects/effects/decals/Cleanable/tracks.dm
index 819f4df346..22e7420b6c 100644
--- a/code/game/objects/effects/decals/Cleanable/tracks.dm
+++ b/code/game/objects/effects/decals/Cleanable/tracks.dm
@@ -190,4 +190,11 @@
 	random_icon_states = null
 	amount = 0
 
+//Used for the otieshelter and drgnplateu
+/obj/effect/decal/cleanable/blood/tracks/suspicious
+	color = "red"
+	desc = "Your instincts say you shouldn't be following these."
+	icon = 'icons/effects/blood.dmi'
+	icon_state = "tracks"
+
 #undef TRACKS_CRUSTIFY_TIME
diff --git a/code/game/objects/items/devices/radio/intercom.dm b/code/game/objects/items/devices/radio/intercom.dm
index 9e9a4b72fd..effe85ff39 100644
--- a/code/game/objects/items/devices/radio/intercom.dm
+++ b/code/game/objects/items/devices/radio/intercom.dm
@@ -2,7 +2,7 @@
 	listening = 0 //CHOMP Edit: Temporary bandaid fix for comms lag.
 	name = "station intercom (General)"
 	desc = "Talk through this."
-	icon = 'icons/obj/radio_vr.dmi'
+	icon = 'icons/obj/radio.dmi'
 	icon_state = "intercom"
 	layer = ABOVE_WINDOW_LAYER
 	anchored = TRUE
diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm
index 74746d6b56..59e72b0b67 100644
--- a/code/game/objects/items/devices/radio/radio.dm
+++ b/code/game/objects/items/devices/radio/radio.dm
@@ -1,7 +1,7 @@
 #define CANBROADCAST_INNERBOX 0.7071067811865476	//This is sqrt(2)/2
 
 /obj/item/radio
-	icon = 'icons/obj/radio_vr.dmi'
+	icon = 'icons/obj/radio.dmi'
 	name = "shortwave radio"
 	desc = "Used to talk to people when headsets don't function. Range is limited."
 	suffix = "\[3\]"
@@ -732,7 +732,6 @@ GLOBAL_DATUM(autospeaker, /mob/living/silicon/ai/announcer)
 
 /obj/item/radio/phone
 	broadcasting = 0
-	icon = 'icons/obj/items.dmi'
 	icon_state = "red_phone"
 	listening = 1
 	name = "phone"
diff --git a/code/game/objects/items/devices/translocator_vr.dm b/code/game/objects/items/devices/translocator_vr.dm
index 944fe04fc7..eb91b0da38 100644
--- a/code/game/objects/items/devices/translocator_vr.dm
+++ b/code/game/objects/items/devices/translocator_vr.dm
@@ -397,7 +397,7 @@ not carry this around."}, "OOC Warning", list("Take It","Leave It"))
 
 /obj/item/perfect_tele_beacon/stationary
 	name = "stationary translocator beacon"
-	icon = 'icons/obj/radio_vr.dmi'
+	icon = 'icons/obj/radio.dmi'
 	icon_state = "floor_beacon"
 	w_class = ITEMSIZE_HUGE
 	anchored = TRUE
diff --git a/code/game/objects/mob_spawner_vr.dm b/code/game/objects/mob_spawner_vr.dm
index 9c954bdf14..336cd00fd5 100644
--- a/code/game/objects/mob_spawner_vr.dm
+++ b/code/game/objects/mob_spawner_vr.dm
@@ -338,3 +338,13 @@ It also makes it so a ghost wont know where all the goodies/mobs are.
 	simultaneous_spawns = 6
 	spawn_delay = 300
 	spawn_types = list(/mob/living/simple_mob/mechanical/hivebot/swarm = 200, /mob/living/simple_mob/mechanical/hivebot/ranged_damage/basic = 50, /mob/living/simple_mob/mechanical/hivebot/ranged_damage/laser = 25, /mob/living/simple_mob/mechanical/hivebot/ranged_damage/ion = 10, /mob/living/simple_mob/mechanical/hivebot/tank/meatshield = 10)
+
+/obj/structure/mob_spawner/recycler
+	desc = "A bizarre mess of robotic limbs, glowing microrefineries, and nanoassemblers gradually converting the pile of raw materials into active hivebots."
+	destructible = 1
+	icon = 'icons/obj/recycling.dmi'
+	icon_state = "grinder-b1"
+	name = "hivebot assembler"
+	simultaneous_spawns = 6
+	spawn_delay = 300
+	spawn_types = list(/mob/living/simple_mob/mechanical/hivebot/swarm = 200, /mob/living/simple_mob/mechanical/hivebot/ranged_damage/basic = 50, /mob/living/simple_mob/mechanical/hivebot/ranged_damage/laser = 25, /mob/living/simple_mob/mechanical/hivebot/ranged_damage/ion = 10, /mob/living/simple_mob/mechanical/hivebot/tank/meatshield = 10)
diff --git a/code/game/objects/structures/loot_piles.dm b/code/game/objects/structures/loot_piles.dm
index 7ac4dc6468..87b4da65c9 100644
--- a/code/game/objects/structures/loot_piles.dm
+++ b/code/game/objects/structures/loot_piles.dm
@@ -116,6 +116,10 @@ Loot piles can be depleted, if loot_depleted is turned on.  Note that players wh
 	icon_state = "drone_dead"
 	loot_element_path = /datum/element/lootable/surface/drone
 
+/obj/structure/loot_pile/surface/drone/large
+	//icon = 'icons/mob/animal_vr64x64.dmi' //This file doesn't exist anymore.
+	icon_state = "drone"
+
 // Mechaparts loot piles
 /obj/structure/loot_pile/mecha
 	name = "pod wreckage"
diff --git a/code/game/objects/structures/props/alien_props_vr.dm b/code/game/objects/structures/props/alien_props_vr.dm
index 8ec7a10651..4b09b6cc9f 100644
--- a/code/game/objects/structures/props/alien_props_vr.dm
+++ b/code/game/objects/structures/props/alien_props_vr.dm
@@ -1,17 +1,14 @@
 /obj/structure/prop/alien/computer/hybrid
 	name = "hybrid console"
 	desc = "The console flashes what appear to be symbols you've never seen before, intermixed with human writing moving too fast to comprehend."
-	icon = 'icons/obj/abductor_vr.dmi'
-	icon_state = "console-c"
+	icon_state = "console-c_alt"
 	interaction_message = span_warning("The screen flashes an 'access denied' message at you. Perhaps for the best.")
 
 /obj/structure/prop/alien/pod/hybrid
 	name = "hybrid pod"
 	desc = "This seems to be a container for something."
-	icon = 'icons/obj/abductor_vr.dmi'
-	icon_state = "experiment"
+	icon_state = "experiment_alt"
 	interaction_message = span_warning("You don't see any mechanism to open this thing. Probably for the best.")
 
 /obj/structure/prop/alien/dispenser/twoway
-	icon = 'icons/obj/abductor_vr.dmi'
 	icon_state = "dispenser_2way"
diff --git a/code/game/objects/structures/props/prop.dm b/code/game/objects/structures/props/prop.dm
index 89d99422dc..6083e8562a 100644
--- a/code/game/objects/structures/props/prop.dm
+++ b/code/game/objects/structures/props/prop.dm
@@ -59,6 +59,29 @@
 	icon_state = "big_skeleton"
 	density = 0
 
+/obj/structure/prop/cryopod
+	name = "cryogenic freezer"
+	desc = "A man-sized pod for entering suspended animation. This one is room temperature."
+	icon = 'icons/obj/Cryogenic2.dmi'
+	icon_state = "cryopod_0"
+
+/obj/structure/prop/grid_checker
+	desc = "An array of conventional power storage units, for when the added charge longivity and cost of a SMES unit is unneded or impractical."
+	icon = 'icons/obj/power.dmi'
+	icon_state = "gridchecker_off"
+	name = "capacitor bank"
+
+/obj/structure/prop/mainframe
+	desc = "There are a number of what seem to be error messages on these screens, none intelligible."
+	icon = 'icons/obj/mainframe.dmi'
+	icon_state = "leftb"
+	name = "console"
+
+/obj/structure/prop/mainframe/ai
+	name = "broken console"
+	desc = "This isn't going to be fixable."
+	icon_state = "aimainframeb"
+
 /**
  *
  * Notes on change_state
diff --git a/code/game/objects/structures/stool_bed_chair_nest/bed.dm b/code/game/objects/structures/stool_bed_chair_nest/bed.dm
index 468b8ec57b..5d28d928e9 100644
--- a/code/game/objects/structures/stool_bed_chair_nest/bed.dm
+++ b/code/game/objects/structures/stool_bed_chair_nest/bed.dm
@@ -377,7 +377,7 @@
 	desc = "Whatever species designed this must've enjoyed relaxation as well. Looks vaguely comfy."
 	catalogue_data = list(/datum/category_item/catalogue/anomalous/precursor_a/alien_bed)
 	icon = 'icons/obj/abductor.dmi'
-	icon_state = "bed"
+	icon_state = "bed_red"
 	flippable = FALSE
 
 /obj/structure/bed/alien/update_icon()
diff --git a/code/game/turfs/flooring/flooring_decals.dm b/code/game/turfs/flooring/flooring_decals.dm
index 28ec32edc8..070b03295a 100644
--- a/code/game/turfs/flooring/flooring_decals.dm
+++ b/code/game/turfs/flooring/flooring_decals.dm
@@ -532,6 +532,24 @@ var/list/floor_decals = list()
 /obj/effect/floor_decal/spline/fancy/wood/three_quarters
 	icon_state = "spline_fancy_full"
 
+/obj/effect/floor_decal/spline/asteroid
+	icon = 'icons/turf/floors.dmi'
+	icon_state = "asteroid_edge_e"
+	name = "rocky edge"
+
+/obj/effect/floor_decal/spline/asteroid/west
+	icon_state = "asteroid_edge_w"
+
+/obj/effect/floor_decal/spline/asteroid/east
+	icon_state = "asteroid_edge_e"
+
+/obj/effect/floor_decal/spline/asteroid/south
+	icon_state = "asteroid_edge_s"
+
+/obj/effect/floor_decal/spline/asteroid/north
+	icon_state = "asteroid_edge_n"
+	name = "rocky edge"
+
 /obj/effect/floor_decal/industrial/warning
 	name = "hazard stripes"
 	icon_state = "warning"
diff --git a/code/game/turfs/simulated/wall_types.dm b/code/game/turfs/simulated/wall_types.dm
index 5f0172430c..2bcaf05b56 100644
--- a/code/game/turfs/simulated/wall_types.dm
+++ b/code/game/turfs/simulated/wall_types.dm
@@ -606,6 +606,10 @@
 /turf/simulated/wall/tgmc/darkwall/deco3
 	icon_state = "darkwall_deco3"
 	force_icon = "_deco3"
+/turf/simulated/wall/tgmc/darkwall/fake_door
+	icon = 'icons/obj/doors/angled/elevator/door.dmi'
+	icon_state = "preview"
+	name = "locked elevator"
 
 /turf/simulated/wall/tgmc/whitewall
 	icon_state = "white0"
diff --git a/code/game/turfs/unsimulated/floor.dm b/code/game/turfs/unsimulated/floor.dm
index ce13e84f08..b2eabdb204 100644
--- a/code/game/turfs/unsimulated/floor.dm
+++ b/code/game/turfs/unsimulated/floor.dm
@@ -20,3 +20,40 @@
 	name = "reinforced floor"
 	icon = 'icons/turf/flooring/tiles.dmi'
 	icon_state = "reinforced"
+
+/turf/unsimulated/floor/wood
+	icon = 'icons/turf/floors_vr.dmi'
+	icon_state = "wood"
+
+/turf/unsimulated/floor/grass
+	icon = 'icons/turf/outdoors.dmi'
+	icon_state = "grass-dark0"
+
+/turf/unsimulated/floor/circuit
+	icon = 'icons/turf/flooring/circuit.dmi'
+	icon_state = "bcircuit"
+
+/turf/unsimulated/floor/snow_new
+	icon = 'icons/turf/snow_new.dmi'
+	icon_state = "snow"
+	name = "snow"
+
+/turf/unsimulated/floor/broken_wood
+	icon = 'icons/turf/flooring/wood.dmi'
+	icon_state = "wood_broken2"
+
+/turf/unsimulated/floor/broken_wood/alt
+	icon_state = "wood_broken1"
+
+/turf/unsimulated/floor/broken_wood/alt2
+	icon_state = "wood_broken3"
+
+/turf/simulated/floor/holofloor/desert/scorched
+	icon = 'icons/turf/floors.dmi'
+	icon_state = "asteroidplating"
+	name = "scorched sand"
+
+/turf/simulated/floor/holofloor/reinforced/lava
+	icon = 'icons/turf/floors.dmi'
+	icon_state = "lava"
+	name = "hololava"
diff --git a/code/game/turfs/unsimulated/planetary_vr.dm b/code/game/turfs/unsimulated/planetary_vr.dm
index 82fccbdaed..c43075f948 100644
--- a/code/game/turfs/unsimulated/planetary_vr.dm
+++ b/code/game/turfs/unsimulated/planetary_vr.dm
@@ -16,6 +16,8 @@
 	alpha = 0xFF
 	VIRGO3BB_SET_ATMOS
 
-//other set - for map building
-/turf/unsimulated/wall2/planetary/virgo3b_better
-	icon_state = "riveted2"
+/turf/unsimulated/wall/planetary/virgo3b_unpassable
+	desc = "You can't go there!"
+	icon = 'icons/turf/flooring/plating.dmi'
+	icon_state = ""
+	name = "impassible landscape"
diff --git a/code/game/turfs/unsimulated/walls.dm b/code/game/turfs/unsimulated/walls.dm
index b5fc47a556..c8ef40a6dc 100644
--- a/code/game/turfs/unsimulated/walls.dm
+++ b/code/game/turfs/unsimulated/walls.dm
@@ -6,6 +6,10 @@
 	density = TRUE
 	blocks_air = TRUE
 
+//For the tram
+/turf/unsimulated/wall/moving
+	icon = 'icons/turf/transit_vr.dmi'
+
 //other set - for map building
 /turf/unsimulated/wall/wall1
 	icon_state = "riveted1"
@@ -25,3 +29,14 @@
 
 /turf/unsimulated/wall/other
 	icon_state = "r_wall"
+
+/turf/unsimulated/wall/fake_uranium_door
+	icon = 'icons/obj/doors/Dooruranium.dmi'
+	icon_state = "door_closed"
+	name = "Sealed Door"
+
+/turf/unsimulated/wall/fake_pod
+	desc = "That looks like it doesn't open easily."
+	icon = 'icons/obj/doors/rapid_pdoor.dmi'
+	icon_state = "pdoor1"
+	name = "Shuttle Bay Blast Door"
diff --git a/code/modules/economy/vending_machines_vr.dm b/code/modules/economy/vending_machines_vr.dm
index 4a3ff53550..0ed3a9f867 100644
--- a/code/modules/economy/vending_machines_vr.dm
+++ b/code/modules/economy/vending_machines_vr.dm
@@ -299,7 +299,6 @@
 /obj/machinery/vending/abductor
 	name = "Abduct-U"
 	desc = "A mysterious machine which can fabricate many tools for acquiring test subjects."
-	icon = 'icons/obj/abductor_vr.dmi'
 	icon_state = "dispenser_2way"
 	products = list(/obj/item/card/id/syndicate/station_access = 1,
 					/obj/item/storage/box/syndie_kit/chameleon = 1,
diff --git a/code/modules/holodeck/HolodeckObjects.dm b/code/modules/holodeck/HolodeckObjects.dm
index 6f8e8ab67c..ff0d9db24e 100644
--- a/code/modules/holodeck/HolodeckObjects.dm
+++ b/code/modules/holodeck/HolodeckObjects.dm
@@ -50,6 +50,19 @@
 	icon_state = "grass0"
 	initial_flooring = /decl/flooring/grass
 
+/turf/simulated/floor/holofloor/grass/jungle
+	icon = 'icons/jungle.dmi'
+	icon_state = "grass2"
+
+/turf/simulated/floor/holofloor/grass/hive
+	icon = 'icons/turf/flooring/misc_vr.dmi'
+	icon_state = "hive"
+	name = "giant honeycomb"
+
+/turf/simulated/floor/holofloor/wood/diona
+	icon = 'icons/turf/floors.dmi'
+	icon_state = "diona"
+
 /turf/simulated/floor/holofloor/snow
 	name = "snow"
 	base_name = "snow"
diff --git a/code/modules/mining/mine_turfs.dm b/code/modules/mining/mine_turfs.dm
index 01665021fe..44843259a3 100644
--- a/code/modules/mining/mine_turfs.dm
+++ b/code/modules/mining/mine_turfs.dm
@@ -16,6 +16,14 @@ var/list/mining_overlay_cache = list()
 	icon_state = "Icerock"
 //YW add end
 
+//For the tram
+/turf/unsimulated/mineral/moving
+	icon = 'icons/turf/transit_vr.dmi'
+	icon_state = "rock"
+
+/turf/unsimulated/mineral/moving/outdoors
+	outdoors = TRUE
+
 /turf/simulated/mineral //wall piece
 	name = "rock"
 	icon = 'icons/turf/walls.dmi'
diff --git a/code/modules/power/port_gen_vr.dm b/code/modules/power/port_gen_vr.dm
index e3175a1c89..7cca09c4c2 100644
--- a/code/modules/power/port_gen_vr.dm
+++ b/code/modules/power/port_gen_vr.dm
@@ -151,6 +151,13 @@
 /obj/machinery/power/rtg/fake_gen/update_icon()
 	return
 
+/obj/machinery/power/rtg/fake_gen/grid
+	desc = "An array of conventional power storage units, for when the added charge longivity and cost of a SMES unit is unneded or impractical."
+	icon = 'icons/obj/power.dmi'
+	icon_state = "gridchecker_off"
+	name = "capacitor bank"
+	power_gen = 12000
+
 // Void Core, power source for Abductor ships and bases.
 // Provides a lot of power, but tends to explode when mistreated.
 /obj/machinery/power/rtg/abductor
diff --git a/code/modules/power/smes_vr.dm b/code/modules/power/smes_vr.dm
index 4d90a87fd7..a21b791582 100644
--- a/code/modules/power/smes_vr.dm
+++ b/code/modules/power/smes_vr.dm
@@ -33,4 +33,9 @@
 	charge += min(recharge_rate, capacity - charge)
 	..()
 
-//hey travis wake up
+/obj/machinery/power/smes/buildable/alien_royal
+	name = "Alien Royal Capacitor"
+	icon_state = "unit"
+	icon = 'icons/obj/alien_smes.dmi'
+	input_level = 950000
+	output_level = 950000
diff --git a/code/modules/reagents/machinery/dispenser/dispenser_presets_vr.dm b/code/modules/reagents/machinery/dispenser/dispenser_presets_vr.dm
index 7814c13f6e..4bfe7cd7ff 100644
--- a/code/modules/reagents/machinery/dispenser/dispenser_presets_vr.dm
+++ b/code/modules/reagents/machinery/dispenser/dispenser_presets_vr.dm
@@ -68,6 +68,5 @@
 
 /obj/machinery/chemical_dispenser/ert/specialops/abductor
 	name = "chemical dispenser"
-	icon = 'icons/obj/abductor_vr.dmi'
 	icon_state = "dispenser_2way"
 	desc = "A mysterious machine which can fabricate many chemicals."
diff --git a/code/modules/resleeving/machine_subtypes.dm b/code/modules/resleeving/machine_subtypes.dm
index fbb9a0be46..42192a86ed 100644
--- a/code/modules/resleeving/machine_subtypes.dm
+++ b/code/modules/resleeving/machine_subtypes.dm
@@ -1,12 +1,9 @@
 /obj/machinery/transhuman/resleever/abductor
-	icon = 'icons/obj/abductor_vr.dmi'
 	icon_state = "implantchair"
 
 /obj/machinery/computer/transhuman/resleeving/abductor
-	icon = 'icons/obj/abductor.dmi'
 	icon_state = "console"
 
 /obj/machinery/clonepod/transhuman/full/abductor
-	icon = 'icons/obj/abductor_vr.dmi'
 	icon_state = "pod_0"
 	name = "clonepod"
diff --git a/icons/obj/abductor.dmi b/icons/obj/abductor.dmi
index 226e2abd63..82edae02bd 100644
Binary files a/icons/obj/abductor.dmi and b/icons/obj/abductor.dmi differ
diff --git a/icons/obj/abductor_vr.dmi b/icons/obj/abductor_vr.dmi
deleted file mode 100644
index 3fb5c6896b..0000000000
Binary files a/icons/obj/abductor_vr.dmi and /dev/null differ
diff --git a/icons/obj/items.dmi b/icons/obj/items.dmi
index a166bed89b..3b8818750d 100644
Binary files a/icons/obj/items.dmi and b/icons/obj/items.dmi differ
diff --git a/icons/obj/radio.dmi b/icons/obj/radio.dmi
index 68fe43fbf2..145f80753b 100644
Binary files a/icons/obj/radio.dmi and b/icons/obj/radio.dmi differ
diff --git a/icons/obj/radio_vr.dmi b/icons/obj/radio_vr.dmi
deleted file mode 100644
index 482f9c09f0..0000000000
Binary files a/icons/obj/radio_vr.dmi and /dev/null differ
diff --git a/icons/obj/stationobjs.dmi b/icons/obj/stationobjs.dmi
index 51b222ef01..94ca54fd22 100644
Binary files a/icons/obj/stationobjs.dmi and b/icons/obj/stationobjs.dmi differ
diff --git a/icons/obj/teleporter_vr.dmi b/icons/obj/teleporter_vr.dmi
deleted file mode 100644
index 005def0f17..0000000000
Binary files a/icons/obj/teleporter_vr.dmi and /dev/null differ
diff --git a/maps/common/common_defines.dm b/maps/common/common_defines.dm
index 1bd3a99f13..d00064bff1 100644
--- a/maps/common/common_defines.dm
+++ b/maps/common/common_defines.dm
@@ -209,3 +209,13 @@ GLOBAL_LIST_EMPTY(all_stellar_delights)
 	skybox_pixel_y = 0
 
 	extra_z_levels = list(Z_NAME_AEROSTAT_SURFACE)
+
+//This is in the v5_outpost_build.dmm. I am unsure if this was maintained, but it's put here because it was a map edit
+/obj/effect/overmap/visitable/sector/virgo5
+	icon = 'icons/obj/overmap_vr.dmi'
+	icon_state = "virgo5"
+	name = "Virgo 5"
+	scanner_desc = "Mahir, or Virgo 5, is the fifth planet from the star Virgo-Erigone. It suffers from Kessler Syndrome, making landing difficult and only possible at specific time intervals. The surface sits well below inhabitable temperatures and the atmosphere consists primarily of carbon dioxide."
+	skybox_icon = 'icons/skybox/virgo5.dmi'
+	skybox_icon_state = "v5"
+	unknown_name = "unknown planet"
diff --git a/maps/common/common_things.dm b/maps/common/common_things.dm
index 66469e308b..56e717d757 100644
--- a/maps/common/common_things.dm
+++ b/maps/common/common_things.dm
@@ -91,6 +91,10 @@
 
 	var/area/shock_area = /area/tether/surfacebase/tram
 
+//For the tram.
+/turf/simulated/floor/maglev/moving
+	icon = 'icons/turf/transit_vr.dmi'
+
 /turf/simulated/floor/maglev/Initialize(mapload)
 	. = ..()
 	shock_area = locate(shock_area)
diff --git a/maps/common/common_turfs.dm b/maps/common/common_turfs.dm
index a74c5e58ad..87ffce845a 100644
--- a/maps/common/common_turfs.dm
+++ b/maps/common/common_turfs.dm
@@ -14,18 +14,40 @@
 	icon = 'icons/turf/flooring/techfloor.dmi'
 	icon_state = "techfloor_grid"
 
+///Used for train.dmm
+/turf/unsimulated/floor/techfloor_grid/outdoors_tansit
+	icon = 'icons/turf/transit_vr.dmi'
+	outdoors = TRUE
+
 /turf/unsimulated/floor/maglev
 	name = "maglev track"
 	desc = "Magnetic levitation tram tracks. Caution! Electrified!"
 	icon = 'icons/turf/flooring/maglevs.dmi'
 	icon_state = "maglevup"
 
+/turf/unsimulated/floor/maglev/transit
+	icon = 'icons/turf/transit_vr.dmi'
+	outdoors = TRUE
+
 /turf/unsimulated/wall/transit
 	icon = 'icons/turf/transit_vr.dmi'
 
+/turf/unsimulated/wall/transit/outdoors
+	outdoors = TRUE
+
 /turf/unsimulated/floor/transit
 	icon = 'icons/turf/transit_vr.dmi'
 
+//Unsim turf to constantly fill the atmos in the area. Made for v5_outpost_build
+/turf/unsimulated/floor/steel/v5_snow
+	carbon_dioxide = 75
+	icon = 'icons/turf/outdoors.dmi'
+	icon_state = "snow"
+	nitrogen = 17
+	outdoors = 1
+	oxygen = 8
+	temperature = 150
+
 /obj/effect/floor_decal/transit/orange
 	icon = 'icons/turf/transit_vr.dmi'
 	icon_state = "transit_techfloororange_edges"
@@ -198,3 +220,9 @@ VIRGO2_TURF_CREATE(/turf/simulated/floor/hull)
 	VIRGO3B_SET_ATMOS
 /turf/simulated/floor/virgo3b_indoors/update_graphic(list/graphic_add = null, list/graphic_remove = null)
 	return 0
+
+/turf/simulated/floor/virgo3b_indoors/dirt
+	desc = "Quite dirty!"
+	icon = 'icons/turf/outdoors.dmi'
+	icon_state = "dirt-dark"
+	name = "dirt"
diff --git a/maps/expedition_vr/virgo5/v5_outpost_build.dmm b/maps/expedition_vr/virgo5/v5_outpost_build.dmm
index bab17f9959..f5a2556a56 100644
--- a/maps/expedition_vr/virgo5/v5_outpost_build.dmm
+++ b/maps/expedition_vr/virgo5/v5_outpost_build.dmm
@@ -2063,15 +2063,7 @@
 /turf/simulated/floor/outdoors/snow/v5,
 /area/submap/v5/outdoors)
 "IZ" = (
-/obj/effect/overmap/visitable{
-	icon = 'icons/obj/overmap_vr.dmi';
-	icon_state = "virgo5";
-	name = "Virgo 5";
-	scanner_desc = "Mahir, or Virgo 5, is the fifth planet from the star Virgo-Erigone. It suffers from Kessler Syndrome, making landing difficult and only possible at specific time intervals. The surface sits well below inhabitable temperatures and the atmosphere consists primarily of carbon dioxide.";
-	skybox_icon = 'icons/skybox/virgo5.dmi';
-	skybox_icon_state = 'v5';
-	unknown_name = "unknown planet"
-	},
+/obj/effect/overmap/visitable/sector/virgo5,
 /turf/unsimulated/mineral{
 	carbon_dioxide = 75;
 	icon_state = "rock-icey";
@@ -3102,15 +3094,7 @@
 /turf/simulated/floor/plating,
 /area/submap/v5/outpost_wr2)
 "XG" = (
-/turf/unsimulated/floor/steel{
-	carbon_dioxide = 75;
-	icon = 'icons/turf/outdoors.dmi';
-	icon_state = "snow";
-	nitrogen = 17;
-	outdoors = 1;
-	oxygen = 8;
-	temperature = 150
-	},
+/turf/unsimulated/floor/steel/v5_snow,
 /area/submap/v5/outdoors)
 "XJ" = (
 /turf/simulated/floor/plating{
diff --git a/maps/expedition_vr/wild/tether_wild-crash-alt.dmm b/maps/expedition_vr/wild/tether_wild-crash-alt.dmm
index 6812f71f73..ec96ce3b7d 100644
--- a/maps/expedition_vr/wild/tether_wild-crash-alt.dmm
+++ b/maps/expedition_vr/wild/tether_wild-crash-alt.dmm
@@ -1,11 +1,6 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
 "a" = (
-/turf/unsimulated/wall/planetary/virgo3b{
-	desc = "You can't go there!";
-	icon = 'icons/turf/flooring/plating_vr.dmi';
-	icon_state = "";
-	name = "impassible landscape"
-	},
+/turf/unsimulated/wall/planetary/virgo3b_unpassable,
 /area/tether/surfacebase/outside/wilderness)
 "b" = (
 /obj/effect/step_trigger/teleporter/wild/to_wild_5,
diff --git a/maps/expedition_vr/wild/tether_wild-crash.dmm b/maps/expedition_vr/wild/tether_wild-crash.dmm
index 8fd4987ae2..fa1a368baf 100644
--- a/maps/expedition_vr/wild/tether_wild-crash.dmm
+++ b/maps/expedition_vr/wild/tether_wild-crash.dmm
@@ -1,11 +1,6 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
 "aa" = (
-/turf/unsimulated/wall/planetary/virgo3b{
-	desc = "You can't go there!";
-	icon = 'icons/turf/flooring/plating_vr.dmi';
-	icon_state = "";
-	name = "impassible landscape"
-	},
+/turf/unsimulated/wall/planetary/virgo3b_unpassable,
 /area/tether/surfacebase/outside/wilderness)
 "ab" = (
 /obj/effect/step_trigger/teleporter/wild/to_wild_5,
@@ -71,12 +66,7 @@
 /turf/simulated/shuttle/floor/black/virgo3b,
 /area/tether/surfacebase/outside/wilderness)
 "aj" = (
-/turf/simulated/floor/virgo3b_indoors{
-	desc = "Quite dirty!";
-	icon = 'icons/turf/outdoors.dmi';
-	icon_state = "dirt-dark";
-	name = "dirt"
-	},
+/turf/simulated/floor/virgo3b_indoors/dirt,
 /area/tether/surfacebase/outside/wilderness)
 "ak" = (
 /obj/item/material/shard,
@@ -177,12 +167,7 @@
 	icon_state = "propulsion_r";
 	dir = 4
 	},
-/turf/simulated/floor/virgo3b_indoors{
-	desc = "Quite dirty!";
-	icon = 'icons/turf/outdoors.dmi';
-	icon_state = "dirt-dark";
-	name = "dirt"
-	},
+/turf/simulated/floor/virgo3b_indoors/dirt,
 /area/tether/surfacebase/outside/wilderness)
 "aC" = (
 /obj/item/material/shard,
@@ -241,12 +226,7 @@
 /obj/structure/shuttle/engine/propulsion{
 	dir = 4
 	},
-/turf/simulated/floor/virgo3b_indoors{
-	desc = "Quite dirty!";
-	icon = 'icons/turf/outdoors.dmi';
-	icon_state = "dirt-dark";
-	name = "dirt"
-	},
+/turf/simulated/floor/virgo3b_indoors/dirt,
 /area/tether/surfacebase/outside/wilderness)
 "aK" = (
 /obj/machinery/suit_cycler/syndicate,
@@ -371,12 +351,7 @@
 	icon_state = "propulsion_l";
 	dir = 4
 	},
-/turf/simulated/floor/virgo3b_indoors{
-	desc = "Quite dirty!";
-	icon = 'icons/turf/outdoors.dmi';
-	icon_state = "dirt-dark";
-	name = "dirt"
-	},
+/turf/simulated/floor/virgo3b_indoors/dirt,
 /area/tether/surfacebase/outside/wilderness)
 "aY" = (
 /obj/structure/closet/walllocker/emerglocker{
@@ -1058,12 +1033,7 @@
 	icon_state = "heater";
 	dir = 4
 	},
-/turf/simulated/floor/virgo3b_indoors{
-	desc = "Quite dirty!";
-	icon = 'icons/turf/outdoors.dmi';
-	icon_state = "dirt-dark";
-	name = "dirt"
-	},
+/turf/simulated/floor/virgo3b_indoors/dirt,
 /area/tether/surfacebase/outside/wilderness)
 
 (1,1,1) = {"
diff --git a/maps/expedition_vr/wild/tether_wild-surface.dmm b/maps/expedition_vr/wild/tether_wild-surface.dmm
index d65905b54c..d0de763049 100644
--- a/maps/expedition_vr/wild/tether_wild-surface.dmm
+++ b/maps/expedition_vr/wild/tether_wild-surface.dmm
@@ -7,12 +7,7 @@
 	},
 /area/tether/surfacebase/outside/wilderness)
 "b" = (
-/turf/unsimulated/wall/planetary/virgo3b{
-	desc = "You can't go there!";
-	icon = 'icons/turf/flooring/plating_vr.dmi';
-	icon_state = "";
-	name = "impassible landscape"
-	},
+/turf/unsimulated/wall/planetary/virgo3b_unpassable,
 /area/tether/surfacebase/outside/wilderness)
 "c" = (
 /turf/simulated/floor/outdoors/grass/sif/virgo3b{
diff --git a/maps/expedition_vr/wild/tether_wild-temple.dmm b/maps/expedition_vr/wild/tether_wild-temple.dmm
index fcfd936406..787b6f26e2 100644
--- a/maps/expedition_vr/wild/tether_wild-temple.dmm
+++ b/maps/expedition_vr/wild/tether_wild-temple.dmm
@@ -1,11 +1,6 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
 "a" = (
-/turf/unsimulated/wall/planetary/virgo3b{
-	desc = "You can't go there!";
-	icon = 'icons/turf/flooring/plating_vr.dmi';
-	icon_state = "";
-	name = "impassible landscape"
-	},
+/turf/unsimulated/wall/planetary/virgo3b_unpassable,
 /area/tether/surfacebase/outside/wilderness)
 "b" = (
 /obj/effect/step_trigger/teleporter/wild/to_wild_1,
@@ -41,30 +36,15 @@
 /turf/simulated/wall/sandstonediamond,
 /area/tether/surfacebase/temple)
 "g" = (
-/turf/simulated/floor/outdoors/dirt{
-	desc = "Quite dirty!";
-	icon = 'icons/turf/outdoors.dmi';
-	icon_state = "dirt-dark";
-	name = "dirt"
-	},
+/turf/simulated/floor/outdoors/dirt,
 /area/tether/surfacebase/temple)
 "h" = (
 /obj/structure/mob_spawner/scanner/xenos,
-/turf/simulated/floor/outdoors/dirt{
-	desc = "Quite dirty!";
-	icon = 'icons/turf/outdoors.dmi';
-	icon_state = "dirt-dark";
-	name = "dirt"
-	},
+/turf/simulated/floor/outdoors/dirt,
 /area/tether/surfacebase/temple)
 "i" = (
 /obj/structure/mob_spawner/scanner/xenos/royal,
-/turf/simulated/floor/outdoors/dirt{
-	desc = "Quite dirty!";
-	icon = 'icons/turf/outdoors.dmi';
-	icon_state = "dirt-dark";
-	name = "dirt"
-	},
+/turf/simulated/floor/outdoors/dirt,
 /area/tether/surfacebase/temple)
 "j" = (
 /obj/effect/step_trigger/teleporter/wild/to_wild_6,
@@ -76,43 +56,23 @@
 /area/tether/surfacebase/outside/wilderness)
 "k" = (
 /obj/item/material/star,
-/turf/simulated/floor/outdoors/dirt{
-	desc = "Quite dirty!";
-	icon = 'icons/turf/outdoors.dmi';
-	icon_state = "dirt-dark";
-	name = "dirt"
-	},
+/turf/simulated/floor/outdoors/dirt,
 /area/tether/surfacebase/temple)
 "l" = (
 /obj/effect/decal/mecha_wreckage/phazon{
 	anchored = 1;
 	name = "rusted Phazon wreckage"
 	},
-/turf/simulated/floor/outdoors/dirt{
-	desc = "Quite dirty!";
-	icon = 'icons/turf/outdoors.dmi';
-	icon_state = "dirt-dark";
-	name = "dirt"
-	},
+/turf/simulated/floor/outdoors/dirt,
 /area/tether/surfacebase/temple)
 "m" = (
 /obj/item/cell/infinite,
 /obj/effect/gibspawner/human,
-/turf/simulated/floor/outdoors/dirt{
-	desc = "Quite dirty!";
-	icon = 'icons/turf/outdoors.dmi';
-	icon_state = "dirt-dark";
-	name = "dirt"
-	},
+/turf/simulated/floor/outdoors/dirt,
 /area/tether/surfacebase/temple)
 "n" = (
 /obj/item/material/sword/katana,
-/turf/simulated/floor/outdoors/dirt{
-	desc = "Quite dirty!";
-	icon = 'icons/turf/outdoors.dmi';
-	icon_state = "dirt-dark";
-	name = "dirt"
-	},
+/turf/simulated/floor/outdoors/dirt,
 /area/tether/surfacebase/temple)
 "o" = (
 /obj/effect/step_trigger/teleporter/wild/to_wild_4,
diff --git a/maps/gateway_vr/zoo.dmm b/maps/gateway_vr/zoo.dmm
index 2edd60c8e6..49b9042d77 100644
--- a/maps/gateway_vr/zoo.dmm
+++ b/maps/gateway_vr/zoo.dmm
@@ -4123,12 +4123,7 @@
 	dir = 1;
 	icon_state = "spline_plain_full"
 	},
-/obj/structure/showcase{
-	desc = "It looks almost lifelike.";
-	icon = 'icons/obj/statue.dmi';
-	icon_state = "monkey";
-	name = "Statue"
-	},
+/obj/structure/showcase/monkey,
 /turf/simulated/floor/grass,
 /area/awaymission/zoo)
 "lz" = (
@@ -4810,17 +4805,11 @@
 /turf/simulated/floor/beach/water,
 /area/awaymission/zoo)
 "nm" = (
-/turf/simulated/floor/holofloor/grass{
-	icon = 'icons/jungle.dmi';
-	icon_state = "grass2"
-	},
+/turf/simulated/floor/holofloor/grass/jungle,
 /area/awaymission/zoo)
 "nn" = (
 /obj/structure/flora/ausbushes,
-/turf/simulated/floor/holofloor/grass{
-	icon = 'icons/jungle.dmi';
-	icon_state = "grass2"
-	},
+/turf/simulated/floor/holofloor/grass/jungle,
 /area/awaymission/zoo)
 "no" = (
 /obj/structure/window/reinforced{
@@ -4840,12 +4829,7 @@
 /area/awaymission/zoo)
 "nq" = (
 /obj/structure/bed/chair,
-/obj/structure/showcase{
-	desc = "It looks almost lifelike.";
-	icon = 'icons/obj/statue.dmi';
-	icon_state = "Human_male";
-	name = "Statue"
-	},
+/obj/structure/showcase/human,
 /turf/simulated/floor/lino,
 /area/awaymission/zoo)
 "nr" = (
@@ -4917,25 +4901,15 @@
 	},
 /area/awaymission/zoo)
 "nD" = (
-/turf/simulated/floor/holofloor/grass{
-	icon = 'icons/turf/flooring/misc_vr.dmi';
-	icon_state = "hive";
-	name = "giant honeycomb"
-	},
+/turf/simulated/floor/holofloor/grass/hive,
 /area/awaymission/zoo)
 "nE" = (
 /obj/structure/flora/ausbushes/ywflowers,
-/turf/simulated/floor/holofloor/grass{
-	icon = 'icons/jungle.dmi';
-	icon_state = "grass2"
-	},
+/turf/simulated/floor/holofloor/grass/jungle,
 /area/awaymission/zoo)
 "nF" = (
 /obj/structure/flora/ausbushes/lavendergrass,
-/turf/simulated/floor/holofloor/grass{
-	icon = 'icons/jungle.dmi';
-	icon_state = "grass2"
-	},
+/turf/simulated/floor/holofloor/grass/jungle,
 /area/awaymission/zoo)
 "nG" = (
 /turf/simulated/floor/holofloor/beach/water{
@@ -5130,19 +5104,13 @@
 /area/awaymission/zoo)
 "oe" = (
 /obj/structure/flora/ausbushes/leafybush,
-/turf/simulated/floor/holofloor/grass{
-	icon = 'icons/jungle.dmi';
-	icon_state = "grass2"
-	},
+/turf/simulated/floor/holofloor/grass/jungle,
 /area/awaymission/zoo)
 "of" = (
 /mob/living/simple_mob/vore/aggressive/frog{
 	faction = "zoo"
 	},
-/turf/simulated/floor/holofloor/grass{
-	icon = 'icons/jungle.dmi';
-	icon_state = "grass2"
-	},
+/turf/simulated/floor/holofloor/grass/jungle,
 /area/awaymission/zoo)
 "og" = (
 /turf/simulated/floor/holofloor/beach/water{
@@ -5212,24 +5180,15 @@
 /area/awaymission/zoo)
 "oq" = (
 /obj/structure/flora/ausbushes/fullgrass,
-/turf/simulated/floor/holofloor/grass{
-	icon = 'icons/jungle.dmi';
-	icon_state = "grass2"
-	},
+/turf/simulated/floor/holofloor/grass/jungle,
 /area/awaymission/zoo)
 "or" = (
 /obj/structure/flora/ausbushes/brflowers,
-/turf/simulated/floor/holofloor/grass{
-	icon = 'icons/jungle.dmi';
-	icon_state = "grass2"
-	},
+/turf/simulated/floor/holofloor/grass/jungle,
 /area/awaymission/zoo)
 "os" = (
 /obj/structure/flora/ausbushes/genericbush,
-/turf/simulated/floor/holofloor/grass{
-	icon = 'icons/jungle.dmi';
-	icon_state = "grass2"
-	},
+/turf/simulated/floor/holofloor/grass/jungle,
 /area/awaymission/zoo)
 "ot" = (
 /turf/simulated/floor/holofloor/beach/water,
@@ -5282,25 +5241,15 @@
 /mob/living/simple_mob/vore/bee{
 	faction = "zoo"
 	},
-/turf/simulated/floor/holofloor/grass{
-	icon = 'icons/turf/flooring/misc_vr.dmi';
-	icon_state = "hive";
-	name = "giant honeycomb"
-	},
+/turf/simulated/floor/holofloor/grass/hive,
 /area/awaymission/zoo)
 "oC" = (
 /obj/structure/flora/ausbushes/sparsegrass,
-/turf/simulated/floor/holofloor/grass{
-	icon = 'icons/jungle.dmi';
-	icon_state = "grass2"
-	},
+/turf/simulated/floor/holofloor/grass/jungle,
 /area/awaymission/zoo)
 "oD" = (
 /obj/structure/flora/ausbushes/palebush,
-/turf/simulated/floor/holofloor/grass{
-	icon = 'icons/jungle.dmi';
-	icon_state = "grass2"
-	},
+/turf/simulated/floor/holofloor/grass/jungle,
 /area/awaymission/zoo)
 "oE" = (
 /obj/structure/bed/chair,
@@ -5572,10 +5521,7 @@
 /area/awaymission/zoo)
 "pp" = (
 /obj/structure/flora/ausbushes/grassybush,
-/turf/simulated/floor/holofloor/grass{
-	icon = 'icons/jungle.dmi';
-	icon_state = "grass2"
-	},
+/turf/simulated/floor/holofloor/grass/jungle,
 /area/awaymission/zoo)
 "pq" = (
 /obj/structure/flora/ausbushes/sparsegrass,
@@ -5634,10 +5580,7 @@
 /area/awaymission/zoo)
 "pz" = (
 /obj/structure/flora/ausbushes/ppflowers,
-/turf/simulated/floor/holofloor/grass{
-	icon = 'icons/jungle.dmi';
-	icon_state = "grass2"
-	},
+/turf/simulated/floor/holofloor/grass/jungle,
 /area/awaymission/zoo)
 "pA" = (
 /obj/structure/flora/ausbushes/sparsegrass,
@@ -6176,10 +6119,7 @@
 /mob/living/carbon/human/neaera{
 	faction = "zoo"
 	},
-/turf/simulated/floor/holofloor/grass{
-	icon = 'icons/jungle.dmi';
-	icon_state = "grass2"
-	},
+/turf/simulated/floor/holofloor/grass/jungle,
 /area/awaymission/zoo)
 "rc" = (
 /obj/effect/floor_decal/spline/fancy/wood{
@@ -6335,199 +6275,79 @@
 /turf/simulated/floor/plating,
 /area/awaymission/zoo)
 "rx" = (
-/turf/simulated/floor/holofloor/desert{
-	icon = 'icons/turf/floors.dmi';
-	icon_state = "asteroidplating";
-	name = "scorched sand"
-	},
+/turf/simulated/floor/holofloor/desert/scorched,
 /area/awaymission/zoo)
 "ry" = (
-/obj/effect/floor_decal/spline{
-	icon = 'icons/turf/floors.dmi';
-	icon_state = "asteroid_edge_e";
-	name = "rocky edge"
-	},
-/turf/simulated/floor/holofloor/desert{
-	icon = 'icons/turf/floors.dmi';
-	icon_state = "asteroidplating";
-	name = "scorched sand"
-	},
+/obj/effect/floor_decal/spline/asteroid,
+/turf/simulated/floor/holofloor/desert/scorched,
 /area/awaymission/zoo)
 "rz" = (
-/turf/simulated/floor/holofloor/reinforced{
-	icon = 'icons/turf/floors.dmi';
-	icon_state = "lava";
-	name = "hololava"
-	},
+/turf/simulated/floor/holofloor/reinforced/lava,
 /area/awaymission/zoo)
 "rA" = (
-/obj/effect/floor_decal/spline{
-	icon = 'icons/turf/floors.dmi';
-	icon_state = "asteroid_edge_w";
-	name = "rocky edge"
-	},
-/turf/simulated/floor/holofloor/desert{
-	icon = 'icons/turf/floors.dmi';
-	icon_state = "asteroidplating";
-	name = "scorched sand"
-	},
+/obj/effect/floor_decal/spline/asteroid/west,
+/turf/simulated/floor/holofloor/desert/scorched,
 /area/awaymission/zoo)
 "rB" = (
-/obj/effect/floor_decal/spline{
-	icon = 'icons/turf/floors.dmi';
-	icon_state = "asteroid_edge_e";
-	name = "rocky edge"
-	},
-/obj/effect/floor_decal/spline{
-	icon = 'icons/turf/floors.dmi';
-	icon_state = "asteroid_edge_s";
-	name = "rocky edge"
-	},
-/turf/simulated/floor/holofloor/desert{
-	icon = 'icons/turf/floors.dmi';
-	icon_state = "asteroidplating";
-	name = "scorched sand"
-	},
+/obj/effect/floor_decal/spline/asteroid/east,
+/obj/effect/floor_decal/spline/asteroid/south,
+/turf/simulated/floor/holofloor/desert/scorched,
 /area/awaymission/zoo)
 "rC" = (
 /turf/simulated/floor/holofloor/space,
 /area/awaymission/zoo)
 "rD" = (
 /obj/effect/floor_decal/asteroid,
-/turf/simulated/floor/holofloor/desert{
-	icon = 'icons/turf/floors.dmi';
-	icon_state = "asteroidplating";
-	name = "scorched sand"
-	},
+/turf/simulated/floor/holofloor/desert/scorched,
 /area/awaymission/zoo)
 "rE" = (
-/obj/effect/floor_decal/spline{
-	icon = 'icons/turf/floors.dmi';
-	icon_state = "asteroid_edge_w";
-	name = "rocky edge"
-	},
-/obj/effect/floor_decal/spline{
-	icon = 'icons/turf/floors.dmi';
-	icon_state = "asteroid_edge_s";
-	name = "rocky edge"
-	},
-/turf/simulated/floor/holofloor/desert{
-	icon = 'icons/turf/floors.dmi';
-	icon_state = "asteroidplating";
-	name = "scorched sand"
-	},
+/obj/effect/floor_decal/spline/asteroid/west,
+/obj/effect/floor_decal/spline/asteroid/south,
+/turf/simulated/floor/holofloor/desert/scorched,
 /area/awaymission/zoo)
 "rF" = (
-/obj/effect/floor_decal/spline{
-	icon = 'icons/turf/floors.dmi';
-	icon_state = "asteroid_edge_w";
-	name = "rocky edge"
-	},
-/obj/effect/floor_decal/spline{
-	icon = 'icons/turf/floors.dmi';
-	icon_state = "asteroid_edge_n";
-	name = "rocky edge"
-	},
-/turf/simulated/floor/holofloor/desert{
-	icon = 'icons/turf/floors.dmi';
-	icon_state = "asteroidplating";
-	name = "scorched sand"
-	},
+/obj/effect/floor_decal/spline/asteroid/west,
+/obj/effect/floor_decal/spline/asteroid/north,
+/turf/simulated/floor/holofloor/desert/scorched,
 /area/awaymission/zoo)
 "rG" = (
-/obj/effect/floor_decal/spline{
-	icon = 'icons/turf/floors.dmi';
-	icon_state = "asteroid_edge_n";
-	name = "rocky edge"
-	},
-/turf/simulated/floor/holofloor/desert{
-	icon = 'icons/turf/floors.dmi';
-	icon_state = "asteroidplating";
-	name = "scorched sand"
-	},
+/obj/effect/floor_decal/spline/asteroid/north,
+/turf/simulated/floor/holofloor/desert/scorched,
 /area/awaymission/zoo)
 "rH" = (
 /obj/structure/flora/ausbushes/sparsegrass,
 /turf/simulated/floor/holofloor/snow,
 /area/awaymission/zoo)
 "rI" = (
-/obj/effect/floor_decal/spline{
-	icon = 'icons/turf/floors.dmi';
-	icon_state = "asteroid_edge_w";
-	name = "rocky edge"
-	},
+/obj/effect/floor_decal/spline/asteroid/west,
 /obj/effect/floor_decal/asteroid,
-/turf/simulated/floor/holofloor/desert{
-	icon = 'icons/turf/floors.dmi';
-	icon_state = "asteroidplating";
-	name = "scorched sand"
-	},
+/turf/simulated/floor/holofloor/desert/scorched,
 /area/awaymission/zoo)
 "rJ" = (
 /obj/structure/flora/bush,
 /turf/simulated/floor/holofloor/snow,
 /area/awaymission/zoo)
 "rK" = (
-/obj/effect/floor_decal/spline{
-	icon = 'icons/turf/floors.dmi';
-	icon_state = "asteroid_edge_w";
-	name = "rocky edge"
-	},
-/obj/effect/floor_decal/spline{
-	icon = 'icons/turf/floors.dmi';
-	icon_state = "asteroid_edge_e";
-	name = "rocky edge"
-	},
-/obj/effect/floor_decal/spline{
-	icon = 'icons/turf/floors.dmi';
-	icon_state = "asteroid_edge_n";
-	name = "rocky edge"
-	},
-/turf/simulated/floor/holofloor/desert{
-	icon = 'icons/turf/floors.dmi';
-	icon_state = "asteroidplating";
-	name = "scorched sand"
-	},
+/obj/effect/floor_decal/spline/asteroid/west,
+/obj/effect/floor_decal/spline/asteroid/east,
+/obj/effect/floor_decal/spline/asteroid/north,
+/turf/simulated/floor/holofloor/desert/scorched,
 /area/awaymission/zoo)
 "rL" = (
 /mob/living/simple_mob/animal/space/alien{
 	faction = "zoo"
 	},
-/turf/simulated/floor/holofloor/desert{
-	icon = 'icons/turf/floors.dmi';
-	icon_state = "asteroidplating";
-	name = "scorched sand"
-	},
+/turf/simulated/floor/holofloor/desert/scorched,
 /area/awaymission/zoo)
 "rM" = (
-/obj/effect/floor_decal/spline{
-	icon = 'icons/turf/floors.dmi';
-	icon_state = "asteroid_edge_e";
-	name = "rocky edge"
-	},
-/obj/effect/floor_decal/spline{
-	icon = 'icons/turf/floors.dmi';
-	icon_state = "asteroid_edge_n";
-	name = "rocky edge"
-	},
-/turf/simulated/floor/holofloor/desert{
-	icon = 'icons/turf/floors.dmi';
-	icon_state = "asteroidplating";
-	name = "scorched sand"
-	},
+/obj/effect/floor_decal/spline/asteroid/east,
+/obj/effect/floor_decal/spline/asteroid/north,
+/turf/simulated/floor/holofloor/desert/scorched,
 /area/awaymission/zoo)
 "rN" = (
-/obj/effect/floor_decal/spline{
-	icon = 'icons/turf/floors.dmi';
-	icon_state = "asteroid_edge_e";
-	name = "rocky edge"
-	},
+/obj/effect/floor_decal/spline/asteroid/east,
 /obj/effect/floor_decal/asteroid,
-/turf/simulated/floor/holofloor/desert{
-	icon = 'icons/turf/floors.dmi';
-	icon_state = "asteroidplating";
-	name = "scorched sand"
-	},
+/turf/simulated/floor/holofloor/desert/scorched,
 /area/awaymission/zoo)
 "rO" = (
 /obj/structure/closet/crate,
@@ -6559,11 +6379,7 @@
 /mob/living/simple_mob/animal/space/alien/drone{
 	faction = "zoo"
 	},
-/turf/simulated/floor/holofloor/desert{
-	icon = 'icons/turf/floors.dmi';
-	icon_state = "asteroidplating";
-	name = "scorched sand"
-	},
+/turf/simulated/floor/holofloor/desert/scorched,
 /area/awaymission/zoo)
 "rT" = (
 /obj/structure/window/reinforced{
@@ -6630,36 +6446,16 @@
 	},
 /area/awaymission/zoo)
 "sa" = (
-/obj/effect/floor_decal/spline{
-	icon = 'icons/turf/floors.dmi';
-	icon_state = "asteroid_edge_w";
-	name = "rocky edge"
-	},
-/obj/effect/floor_decal/spline{
-	icon = 'icons/turf/floors.dmi';
-	icon_state = "asteroid_edge_s";
-	name = "rocky edge"
-	},
+/obj/effect/floor_decal/spline/asteroid/west,
+/obj/effect/floor_decal/spline/asteroid/south,
 /mob/living/simple_mob/animal/space/alien/drone{
 	faction = "zoo"
 	},
-/turf/simulated/floor/holofloor/desert{
-	icon = 'icons/turf/floors.dmi';
-	icon_state = "asteroidplating";
-	name = "scorched sand"
-	},
+/turf/simulated/floor/holofloor/desert/scorched,
 /area/awaymission/zoo)
 "sb" = (
-/obj/effect/floor_decal/spline{
-	icon = 'icons/turf/floors.dmi';
-	icon_state = "asteroid_edge_s";
-	name = "rocky edge"
-	},
-/turf/simulated/floor/holofloor/desert{
-	icon = 'icons/turf/floors.dmi';
-	icon_state = "asteroidplating";
-	name = "scorched sand"
-	},
+/obj/effect/floor_decal/spline/asteroid/south,
+/turf/simulated/floor/holofloor/desert/scorched,
 /area/awaymission/zoo)
 "sc" = (
 /obj/effect/floor_decal/industrial/outline/yellow,
@@ -6732,36 +6528,16 @@
 /turf/simulated/floor/plating,
 /area/awaymission/zoo)
 "sn" = (
-/obj/effect/floor_decal/spline{
-	icon = 'icons/turf/floors.dmi';
-	icon_state = "asteroid_edge_w";
-	name = "rocky edge"
-	},
-/obj/effect/floor_decal/spline{
-	icon = 'icons/turf/floors.dmi';
-	icon_state = "asteroid_edge_e";
-	name = "rocky edge"
-	},
-/turf/simulated/floor/holofloor/desert{
-	icon = 'icons/turf/floors.dmi';
-	icon_state = "asteroidplating";
-	name = "scorched sand"
-	},
+/obj/effect/floor_decal/spline/asteroid/west,
+/obj/effect/floor_decal/spline/asteroid/east,
+/turf/simulated/floor/holofloor/desert/scorched,
 /area/awaymission/zoo)
 "so" = (
-/obj/effect/floor_decal/spline{
-	icon = 'icons/turf/floors.dmi';
-	icon_state = "asteroid_edge_e";
-	name = "rocky edge"
-	},
+/obj/effect/floor_decal/spline/asteroid/east,
 /mob/living/simple_mob/animal/space/alien/drone{
 	faction = "zoo"
 	},
-/turf/simulated/floor/holofloor/desert{
-	icon = 'icons/turf/floors.dmi';
-	icon_state = "asteroidplating";
-	name = "scorched sand"
-	},
+/turf/simulated/floor/holofloor/desert/scorched,
 /area/awaymission/zoo)
 "sp" = (
 /obj/structure/window/reinforced{
@@ -6855,42 +6631,18 @@
 /turf/simulated/floor/plating,
 /area/awaymission/zoo)
 "sy" = (
-/obj/effect/floor_decal/spline{
-	icon = 'icons/turf/floors.dmi';
-	icon_state = "asteroid_edge_e";
-	name = "rocky edge"
-	},
-/obj/effect/floor_decal/spline{
-	icon = 'icons/turf/floors.dmi';
-	icon_state = "asteroid_edge_s";
-	name = "rocky edge"
-	},
-/obj/effect/floor_decal/spline{
-	icon = 'icons/turf/floors.dmi';
-	icon_state = "asteroid_edge_n";
-	name = "rocky edge"
-	},
-/turf/simulated/floor/holofloor/desert{
-	icon = 'icons/turf/floors.dmi';
-	icon_state = "asteroidplating";
-	name = "scorched sand"
-	},
+/obj/effect/floor_decal/spline/asteroid/east,
+/obj/effect/floor_decal/spline/asteroid/south,
+/obj/effect/floor_decal/spline/asteroid/north,
+/turf/simulated/floor/holofloor/desert/scorched,
 /area/awaymission/zoo)
 "sz" = (
-/obj/effect/floor_decal/spline{
-	icon = 'icons/turf/floors.dmi';
-	icon_state = "asteroid_edge_w";
-	name = "rocky edge"
-	},
+/obj/effect/floor_decal/spline/asteroid/west,
 /mob/living/simple_mob/animal/space/alien{
 	faction = "zoo";
 	name = "invisible alien hunter"
 	},
-/turf/simulated/floor/holofloor/desert{
-	icon = 'icons/turf/floors.dmi';
-	icon_state = "asteroidplating";
-	name = "scorched sand"
-	},
+/turf/simulated/floor/holofloor/desert/scorched,
 /area/awaymission/zoo)
 "sA" = (
 /obj/effect/spider/stickyweb{
@@ -6944,19 +6696,11 @@
 /turf/simulated/floor/holofloor/desert,
 /area/awaymission/zoo)
 "sF" = (
-/obj/effect/floor_decal/spline{
-	icon = 'icons/turf/floors.dmi';
-	icon_state = "asteroid_edge_e";
-	name = "rocky edge"
-	},
+/obj/effect/floor_decal/spline/asteroid/east,
 /mob/living/simple_mob/animal/space/alien/queen{
 	faction = "zoo"
 	},
-/turf/simulated/floor/holofloor/desert{
-	icon = 'icons/turf/floors.dmi';
-	icon_state = "asteroidplating";
-	name = "scorched sand"
-	},
+/turf/simulated/floor/holofloor/desert/scorched,
 /area/awaymission/zoo)
 "sG" = (
 /obj/effect/landmark/away,
@@ -6998,11 +6742,7 @@
 	faction = "zoo";
 	name = "invisible alien hunter"
 	},
-/turf/simulated/floor/holofloor/desert{
-	icon = 'icons/turf/floors.dmi';
-	icon_state = "asteroidplating";
-	name = "scorched sand"
-	},
+/turf/simulated/floor/holofloor/desert/scorched,
 /area/awaymission/zoo)
 "sN" = (
 /obj/effect/decal/remains,
@@ -7022,26 +6762,10 @@
 	},
 /area/awaymission/zoo)
 "sQ" = (
-/obj/effect/floor_decal/spline{
-	icon = 'icons/turf/floors.dmi';
-	icon_state = "asteroid_edge_w";
-	name = "rocky edge"
-	},
-/obj/effect/floor_decal/spline{
-	icon = 'icons/turf/floors.dmi';
-	icon_state = "asteroid_edge_e";
-	name = "rocky edge"
-	},
-/obj/effect/floor_decal/spline{
-	icon = 'icons/turf/floors.dmi';
-	icon_state = "asteroid_edge_s";
-	name = "rocky edge"
-	},
-/turf/simulated/floor/holofloor/desert{
-	icon = 'icons/turf/floors.dmi';
-	icon_state = "asteroidplating";
-	name = "scorched sand"
-	},
+/obj/effect/floor_decal/spline/asteroid/west,
+/obj/effect/floor_decal/spline/asteroid/east,
+/obj/effect/floor_decal/spline/asteroid/south,
+/turf/simulated/floor/holofloor/desert/scorched,
 /area/awaymission/zoo)
 "sR" = (
 /obj/effect/spider/stickyweb{
@@ -7072,26 +6796,10 @@
 /turf/simulated/floor/beach/water,
 /area/awaymission/zoo)
 "sW" = (
-/obj/effect/floor_decal/spline{
-	icon = 'icons/turf/floors.dmi';
-	icon_state = "asteroid_edge_w";
-	name = "rocky edge"
-	},
-/obj/effect/floor_decal/spline{
-	icon = 'icons/turf/floors.dmi';
-	icon_state = "asteroid_edge_s";
-	name = "rocky edge"
-	},
-/obj/effect/floor_decal/spline{
-	icon = 'icons/turf/floors.dmi';
-	icon_state = "asteroid_edge_n";
-	name = "rocky edge"
-	},
-/turf/simulated/floor/holofloor/desert{
-	icon = 'icons/turf/floors.dmi';
-	icon_state = "asteroidplating";
-	name = "scorched sand"
-	},
+/obj/effect/floor_decal/spline/asteroid/west,
+/obj/effect/floor_decal/spline/asteroid/south,
+/obj/effect/floor_decal/spline/asteroid/north,
+/turf/simulated/floor/holofloor/desert/scorched,
 /area/awaymission/zoo)
 "sX" = (
 /obj/effect/spider/stickyweb{
@@ -7112,11 +6820,7 @@
 /mob/living/simple_mob/animal/space/alien{
 	faction = "zoo"
 	},
-/turf/simulated/floor/holofloor/desert{
-	icon = 'icons/turf/floors.dmi';
-	icon_state = "asteroidplating";
-	name = "scorched sand"
-	},
+/turf/simulated/floor/holofloor/desert/scorched,
 /area/awaymission/zoo)
 "tb" = (
 /obj/structure/grille,
@@ -7168,39 +6872,24 @@
 /area/awaymission/zoo)
 "tf" = (
 /obj/structure/flora/ausbushes/fullgrass,
-/turf/simulated/floor/holofloor/wood{
-	icon = 'icons/turf/floors.dmi';
-	icon_state = "diona"
-	},
+/turf/simulated/floor/holofloor/wood/diona,
 /area/awaymission/zoo)
 "tg" = (
 /obj/structure/flora/ausbushes/genericbush,
-/turf/simulated/floor/holofloor/wood{
-	icon = 'icons/turf/floors.dmi';
-	icon_state = "diona"
-	},
+/turf/simulated/floor/holofloor/wood/diona,
 /area/awaymission/zoo)
 "th" = (
-/turf/simulated/floor/holofloor/wood{
-	icon = 'icons/turf/floors.dmi';
-	icon_state = "diona"
-	},
+/turf/simulated/floor/holofloor/wood/diona,
 /area/awaymission/zoo)
 "ti" = (
 /mob/living/simple_mob/animal/passive/yithian{
 	faction = "zoo"
 	},
-/turf/simulated/floor/holofloor/wood{
-	icon = 'icons/turf/floors.dmi';
-	icon_state = "diona"
-	},
+/turf/simulated/floor/holofloor/wood/diona,
 /area/awaymission/zoo)
 "tj" = (
 /obj/machinery/portable_atmospherics/hydroponics/soil/invisible,
-/turf/simulated/floor/holofloor/wood{
-	icon = 'icons/turf/floors.dmi';
-	icon_state = "diona"
-	},
+/turf/simulated/floor/holofloor/wood/diona,
 /area/awaymission/zoo)
 "tk" = (
 /turf/simulated/floor/cult,
@@ -7222,17 +6911,11 @@
 /area/awaymission/zoo)
 "to" = (
 /obj/structure/flora/ausbushes/lavendergrass,
-/turf/simulated/floor/holofloor/wood{
-	icon = 'icons/turf/floors.dmi';
-	icon_state = "diona"
-	},
+/turf/simulated/floor/holofloor/wood/diona,
 /area/awaymission/zoo)
 "tp" = (
 /obj/structure/flora/ausbushes/fernybush,
-/turf/simulated/floor/holofloor/wood{
-	icon = 'icons/turf/floors.dmi';
-	icon_state = "diona"
-	},
+/turf/simulated/floor/holofloor/wood/diona,
 /area/awaymission/zoo)
 "tq" = (
 /mob/living/carbon/human/farwa{
@@ -7256,34 +6939,22 @@
 /area/awaymission/zoo)
 "tu" = (
 /obj/structure/flora/ausbushes/sunnybush,
-/turf/simulated/floor/holofloor/wood{
-	icon = 'icons/turf/floors.dmi';
-	icon_state = "diona"
-	},
+/turf/simulated/floor/holofloor/wood/diona,
 /area/awaymission/zoo)
 "tv" = (
 /obj/structure/flora/ausbushes/palebush,
-/turf/simulated/floor/holofloor/wood{
-	icon = 'icons/turf/floors.dmi';
-	icon_state = "diona"
-	},
+/turf/simulated/floor/holofloor/wood/diona,
 /area/awaymission/zoo)
 "tw" = (
 /obj/structure/flora/ausbushes/ywflowers,
-/turf/simulated/floor/holofloor/wood{
-	icon = 'icons/turf/floors.dmi';
-	icon_state = "diona"
-	},
+/turf/simulated/floor/holofloor/wood/diona,
 /area/awaymission/zoo)
 "tx" = (
 /obj/structure/flora/ausbushes/sunnybush,
 /mob/living/simple_mob/animal/passive/yithian{
 	faction = "zoo"
 	},
-/turf/simulated/floor/holofloor/wood{
-	icon = 'icons/turf/floors.dmi';
-	icon_state = "diona"
-	},
+/turf/simulated/floor/holofloor/wood/diona,
 /area/awaymission/zoo)
 "ty" = (
 /obj/structure/flora/tree/pine{
@@ -7310,10 +6981,7 @@
 /area/awaymission/zoo)
 "tC" = (
 /obj/structure/flora/ausbushes/leafybush,
-/turf/simulated/floor/holofloor/wood{
-	icon = 'icons/turf/floors.dmi';
-	icon_state = "diona"
-	},
+/turf/simulated/floor/holofloor/wood/diona,
 /area/awaymission/zoo)
 "tD" = (
 /obj/effect/decal/remains/human,
@@ -7325,10 +6993,7 @@
 /area/awaymission/zoo)
 "tF" = (
 /obj/structure/flora/ausbushes/grassybush,
-/turf/simulated/floor/holofloor/wood{
-	icon = 'icons/turf/floors.dmi';
-	icon_state = "diona"
-	},
+/turf/simulated/floor/holofloor/wood/diona,
 /area/awaymission/zoo)
 "tG" = (
 /obj/structure/grille,
@@ -7464,11 +7129,7 @@
 /area/awaymission/zoo)
 "tU" = (
 /obj/effect/decal/remains/human,
-/turf/simulated/floor/holofloor/desert{
-	icon = 'icons/turf/floors.dmi';
-	icon_state = "asteroidplating";
-	name = "scorched sand"
-	},
+/turf/simulated/floor/holofloor/desert/scorched,
 /area/awaymission/zoo)
 "tV" = (
 /obj/effect/floor_decal/industrial/outline/yellow,
@@ -7489,11 +7150,7 @@
 /mob/living/simple_mob/vore/aggressive/dragon{
 	faction = "zoo"
 	},
-/turf/simulated/floor/holofloor/desert{
-	icon = 'icons/turf/floors.dmi';
-	icon_state = "asteroidplating";
-	name = "scorched sand"
-	},
+/turf/simulated/floor/holofloor/desert/scorched,
 /area/awaymission/zoo)
 "tY" = (
 /mob/living/simple_mob/animal/passive/lizard{
@@ -7853,24 +7510,15 @@
 /area/awaymission/zoo)
 "uS" = (
 /obj/structure/flora/ausbushes/fernybush,
-/turf/simulated/floor/holofloor/grass{
-	icon = 'icons/jungle.dmi';
-	icon_state = "grass2"
-	},
+/turf/simulated/floor/holofloor/grass/jungle,
 /area/awaymission/zoo)
 "uT" = (
 /obj/effect/overlay/palmtree_r,
-/turf/simulated/floor/holofloor/grass{
-	icon = 'icons/jungle.dmi';
-	icon_state = "grass2"
-	},
+/turf/simulated/floor/holofloor/grass/jungle,
 /area/awaymission/zoo)
 "uU" = (
 /obj/effect/overlay/palmtree_l,
-/turf/simulated/floor/holofloor/grass{
-	icon = 'icons/jungle.dmi';
-	icon_state = "grass2"
-	},
+/turf/simulated/floor/holofloor/grass/jungle,
 /area/awaymission/zoo)
 "uV" = (
 /obj/structure/window/reinforced{
@@ -7928,17 +7576,11 @@
 /area/awaymission/zoo)
 "vb" = (
 /obj/effect/overlay/coconut,
-/turf/simulated/floor/holofloor/grass{
-	icon = 'icons/jungle.dmi';
-	icon_state = "grass2"
-	},
+/turf/simulated/floor/holofloor/grass/jungle,
 /area/awaymission/zoo)
 "vc" = (
 /obj/structure/flora/ausbushes/sunnybush,
-/turf/simulated/floor/holofloor/grass{
-	icon = 'icons/jungle.dmi';
-	icon_state = "grass2"
-	},
+/turf/simulated/floor/holofloor/grass/jungle,
 /area/awaymission/zoo)
 "vd" = (
 /mob/living/simple_mob/animal/passive/crab{
@@ -7958,10 +7600,7 @@
 /mob/living/simple_mob/vore/aggressive/panther{
 	faction = "zoo"
 	},
-/turf/simulated/floor/holofloor/grass{
-	icon = 'icons/jungle.dmi';
-	icon_state = "grass2"
-	},
+/turf/simulated/floor/holofloor/grass/jungle,
 /area/awaymission/zoo)
 "vg" = (
 /obj/structure/window/reinforced{
diff --git a/maps/gateway_vr/zoo_b.dmm b/maps/gateway_vr/zoo_b.dmm
index eebcb29979..424ebbfbd5 100644
--- a/maps/gateway_vr/zoo_b.dmm
+++ b/maps/gateway_vr/zoo_b.dmm
@@ -194,10 +194,7 @@
 /area/awaymission/zoo/syndieship)
 "bp" = (
 /obj/structure/flora/ausbushes/leafybush,
-/turf/simulated/floor/holofloor/grass{
-	icon = 'icons/jungle.dmi';
-	icon_state = "grass2"
-	},
+/turf/simulated/floor/holofloor/grass/jungle,
 /area/awaymission/zoo)
 "br" = (
 /obj/structure/table/reinforced,
@@ -329,10 +326,7 @@
 /area/awaymission/zoo/pirateship)
 "cE" = (
 /obj/structure/flora/ausbushes,
-/turf/simulated/floor/holofloor/grass{
-	icon = 'icons/jungle.dmi';
-	icon_state = "grass2"
-	},
+/turf/simulated/floor/holofloor/grass/jungle,
 /area/awaymission/zoo)
 "cI" = (
 /obj/structure/window/reinforced,
@@ -422,11 +416,7 @@
 	},
 /area/awaymission/zoo)
 "dq" = (
-/turf/simulated/floor/holofloor/grass{
-	icon = 'icons/turf/flooring/misc_vr.dmi';
-	icon_state = "hive";
-	name = "giant honeycomb"
-	},
+/turf/simulated/floor/holofloor/grass/hive,
 /area/awaymission/zoo)
 "dt" = (
 /obj/structure/closet,
@@ -460,20 +450,12 @@
 /turf/simulated/floor/tiled/steel,
 /area/awaymission/zoo/pirateship)
 "dC" = (
-/obj/effect/floor_decal/spline{
-	icon = 'icons/turf/floors.dmi';
-	icon_state = "asteroid_edge_w";
-	name = "rocky edge"
-	},
+/obj/effect/floor_decal/spline/asteroid/west,
 /mob/living/simple_mob/animal/space/alien{
 	faction = "zoo";
 	name = "invisible alien hunter"
 	},
-/turf/simulated/floor/holofloor/desert{
-	icon = 'icons/turf/floors.dmi';
-	icon_state = "asteroidplating";
-	name = "scorched sand"
-	},
+/turf/simulated/floor/holofloor/desert/scorched,
 /area/awaymission/zoo)
 "dF" = (
 /obj/structure/flora/ausbushes/lavendergrass,
@@ -542,21 +524,9 @@
 /turf/simulated/floor/holofloor/lino,
 /area/awaymission/zoo)
 "em" = (
-/obj/effect/floor_decal/spline{
-	icon = 'icons/turf/floors.dmi';
-	icon_state = "asteroid_edge_e";
-	name = "rocky edge"
-	},
-/obj/effect/floor_decal/spline{
-	icon = 'icons/turf/floors.dmi';
-	icon_state = "asteroid_edge_s";
-	name = "rocky edge"
-	},
-/turf/simulated/floor/holofloor/desert{
-	icon = 'icons/turf/floors.dmi';
-	icon_state = "asteroidplating";
-	name = "scorched sand"
-	},
+/obj/effect/floor_decal/spline/asteroid/east,
+/obj/effect/floor_decal/spline/asteroid/south,
+/turf/simulated/floor/holofloor/desert/scorched,
 /area/awaymission/zoo)
 "et" = (
 /obj/structure/table/rack{
@@ -599,43 +569,15 @@
 /turf/simulated/shuttle/floor/darkred,
 /area/awaymission/zoo/syndieship)
 "eE" = (
-/obj/effect/floor_decal/spline{
-	icon = 'icons/turf/floors.dmi';
-	icon_state = "asteroid_edge_w";
-	name = "rocky edge"
-	},
-/obj/effect/floor_decal/spline{
-	icon = 'icons/turf/floors.dmi';
-	icon_state = "asteroid_edge_e";
-	name = "rocky edge"
-	},
-/obj/effect/floor_decal/spline{
-	icon = 'icons/turf/floors.dmi';
-	icon_state = "asteroid_edge_s";
-	name = "rocky edge"
-	},
-/turf/simulated/floor/holofloor/desert{
-	icon = 'icons/turf/floors.dmi';
-	icon_state = "asteroidplating";
-	name = "scorched sand"
-	},
+/obj/effect/floor_decal/spline/asteroid/west,
+/obj/effect/floor_decal/spline/asteroid/east,
+/obj/effect/floor_decal/spline/asteroid/south,
+/turf/simulated/floor/holofloor/desert/scorched,
 /area/awaymission/zoo)
 "eF" = (
-/obj/effect/floor_decal/spline{
-	icon = 'icons/turf/floors.dmi';
-	icon_state = "asteroid_edge_w";
-	name = "rocky edge"
-	},
-/obj/effect/floor_decal/spline{
-	icon = 'icons/turf/floors.dmi';
-	icon_state = "asteroid_edge_s";
-	name = "rocky edge"
-	},
-/turf/simulated/floor/holofloor/desert{
-	icon = 'icons/turf/floors.dmi';
-	icon_state = "asteroidplating";
-	name = "scorched sand"
-	},
+/obj/effect/floor_decal/spline/asteroid/west,
+/obj/effect/floor_decal/spline/asteroid/south,
+/turf/simulated/floor/holofloor/desert/scorched,
 /area/awaymission/zoo)
 "eG" = (
 /obj/effect/floor_decal/corner/green/full{
@@ -682,26 +624,10 @@
 /turf/simulated/floor/wood,
 /area/awaymission/zoo)
 "fe" = (
-/obj/effect/floor_decal/spline{
-	icon = 'icons/turf/floors.dmi';
-	icon_state = "asteroid_edge_w";
-	name = "rocky edge"
-	},
-/obj/effect/floor_decal/spline{
-	icon = 'icons/turf/floors.dmi';
-	icon_state = "asteroid_edge_s";
-	name = "rocky edge"
-	},
-/obj/effect/floor_decal/spline{
-	icon = 'icons/turf/floors.dmi';
-	icon_state = "asteroid_edge_n";
-	name = "rocky edge"
-	},
-/turf/simulated/floor/holofloor/desert{
-	icon = 'icons/turf/floors.dmi';
-	icon_state = "asteroidplating";
-	name = "scorched sand"
-	},
+/obj/effect/floor_decal/spline/asteroid/west,
+/obj/effect/floor_decal/spline/asteroid/south,
+/obj/effect/floor_decal/spline/asteroid/north,
+/turf/simulated/floor/holofloor/desert/scorched,
 /area/awaymission/zoo)
 "fk" = (
 /obj/structure/flora/pottedplant{
@@ -876,21 +802,9 @@
 /turf/simulated/floor/plating,
 /area/awaymission/zoo)
 "gx" = (
-/obj/effect/floor_decal/spline{
-	icon = 'icons/turf/floors.dmi';
-	icon_state = "asteroid_edge_w";
-	name = "rocky edge"
-	},
-/obj/effect/floor_decal/spline{
-	icon = 'icons/turf/floors.dmi';
-	icon_state = "asteroid_edge_e";
-	name = "rocky edge"
-	},
-/turf/simulated/floor/holofloor/desert{
-	icon = 'icons/turf/floors.dmi';
-	icon_state = "asteroidplating";
-	name = "scorched sand"
-	},
+/obj/effect/floor_decal/spline/asteroid/west,
+/obj/effect/floor_decal/spline/asteroid/east,
+/turf/simulated/floor/holofloor/desert/scorched,
 /area/awaymission/zoo)
 "gz" = (
 /obj/effect/floor_decal/spline/fancy/wood{
@@ -915,11 +829,7 @@
 	},
 /area/awaymission/zoo)
 "gM" = (
-/turf/simulated/floor/holofloor/reinforced{
-	icon = 'icons/turf/floors.dmi';
-	icon_state = "lava";
-	name = "hololava"
-	},
+/turf/simulated/floor/holofloor/reinforced/lava,
 /area/awaymission/zoo)
 "gS" = (
 /turf/simulated/floor/holofloor/snow,
@@ -1050,16 +960,8 @@
 	},
 /area/awaymission/zoo)
 "hS" = (
-/obj/effect/floor_decal/spline{
-	icon = 'icons/turf/floors.dmi';
-	icon_state = "asteroid_edge_e";
-	name = "rocky edge"
-	},
-/turf/simulated/floor/holofloor/desert{
-	icon = 'icons/turf/floors.dmi';
-	icon_state = "asteroidplating";
-	name = "scorched sand"
-	},
+/obj/effect/floor_decal/spline/asteroid/east,
+/turf/simulated/floor/holofloor/desert/scorched,
 /area/awaymission/zoo)
 "hU" = (
 /obj/structure/flora/ausbushes/pointybush,
@@ -1147,11 +1049,7 @@
 	faction = "zoo";
 	name = "invisible alien hunter"
 	},
-/turf/simulated/floor/holofloor/desert{
-	icon = 'icons/turf/floors.dmi';
-	icon_state = "asteroidplating";
-	name = "scorched sand"
-	},
+/turf/simulated/floor/holofloor/desert/scorched,
 /area/awaymission/zoo)
 "iQ" = (
 /obj/structure/window/phoronreinforced{
@@ -1250,19 +1148,11 @@
 	},
 /area/awaymission/zoo)
 "jL" = (
-/obj/effect/floor_decal/spline{
-	icon = 'icons/turf/floors.dmi';
-	icon_state = "asteroid_edge_e";
-	name = "rocky edge"
-	},
+/obj/effect/floor_decal/spline/asteroid/east,
 /mob/living/simple_mob/animal/space/alien/drone{
 	faction = "zoo"
 	},
-/turf/simulated/floor/holofloor/desert{
-	icon = 'icons/turf/floors.dmi';
-	icon_state = "asteroidplating";
-	name = "scorched sand"
-	},
+/turf/simulated/floor/holofloor/desert/scorched,
 /area/awaymission/zoo)
 "jN" = (
 /obj/item/trash/syndi_cakes,
@@ -1275,19 +1165,11 @@
 	},
 /area/awaymission/zoo)
 "jT" = (
-/obj/effect/floor_decal/spline{
-	icon = 'icons/turf/floors.dmi';
-	icon_state = "asteroid_edge_e";
-	name = "rocky edge"
-	},
+/obj/effect/floor_decal/spline/asteroid/east,
 /mob/living/simple_mob/animal/space/alien/queen{
 	faction = "zoo"
 	},
-/turf/simulated/floor/holofloor/desert{
-	icon = 'icons/turf/floors.dmi';
-	icon_state = "asteroidplating";
-	name = "scorched sand"
-	},
+/turf/simulated/floor/holofloor/desert/scorched,
 /area/awaymission/zoo)
 "jY" = (
 /mob/living/simple_mob/animal/passive/chick,
@@ -1522,16 +1404,8 @@
 	},
 /area/awaymission/zoo)
 "mM" = (
-/obj/effect/floor_decal/spline{
-	icon = 'icons/turf/floors.dmi';
-	icon_state = "asteroid_edge_s";
-	name = "rocky edge"
-	},
-/turf/simulated/floor/holofloor/desert{
-	icon = 'icons/turf/floors.dmi';
-	icon_state = "asteroidplating";
-	name = "scorched sand"
-	},
+/obj/effect/floor_decal/spline/asteroid/south,
+/turf/simulated/floor/holofloor/desert/scorched,
 /area/awaymission/zoo)
 "mT" = (
 /obj/machinery/vending/cola,
@@ -1556,16 +1430,8 @@
 /turf/simulated/floor/plating,
 /area/awaymission/zoo/pirateship)
 "nm" = (
-/obj/effect/floor_decal/spline{
-	icon = 'icons/turf/floors.dmi';
-	icon_state = "asteroid_edge_n";
-	name = "rocky edge"
-	},
-/turf/simulated/floor/holofloor/desert{
-	icon = 'icons/turf/floors.dmi';
-	icon_state = "asteroidplating";
-	name = "scorched sand"
-	},
+/obj/effect/floor_decal/spline/asteroid/north,
+/turf/simulated/floor/holofloor/desert/scorched,
 /area/awaymission/zoo)
 "no" = (
 /obj/structure/table/reinforced,
@@ -1809,10 +1675,7 @@
 /area/awaymission/zoo/pirateship)
 "pg" = (
 /obj/structure/flora/ausbushes/grassybush,
-/turf/simulated/floor/holofloor/grass{
-	icon = 'icons/jungle.dmi';
-	icon_state = "grass2"
-	},
+/turf/simulated/floor/holofloor/grass/jungle,
 /area/awaymission/zoo)
 "ph" = (
 /obj/effect/floor_decal/spline/plain{
@@ -1886,11 +1749,7 @@
 /turf/simulated/shuttle/plating,
 /area/awaymission/zoo/syndieship)
 "pS" = (
-/turf/simulated/floor/holofloor/desert{
-	icon = 'icons/turf/floors.dmi';
-	icon_state = "asteroidplating";
-	name = "scorched sand"
-	},
+/turf/simulated/floor/holofloor/desert/scorched,
 /area/awaymission/zoo)
 "pU" = (
 /obj/structure/closet/secure_closet/medical_wall{
@@ -2041,21 +1900,9 @@
 	},
 /area/awaymission/zoo)
 "ro" = (
-/obj/effect/floor_decal/spline{
-	icon = 'icons/turf/floors.dmi';
-	icon_state = "asteroid_edge_w";
-	name = "rocky edge"
-	},
-/obj/effect/floor_decal/spline{
-	icon = 'icons/turf/floors.dmi';
-	icon_state = "asteroid_edge_n";
-	name = "rocky edge"
-	},
-/turf/simulated/floor/holofloor/desert{
-	icon = 'icons/turf/floors.dmi';
-	icon_state = "asteroidplating";
-	name = "scorched sand"
-	},
+/obj/effect/floor_decal/spline/asteroid/west,
+/obj/effect/floor_decal/spline/asteroid/north,
+/turf/simulated/floor/holofloor/desert/scorched,
 /area/awaymission/zoo)
 "rw" = (
 /obj/structure/closet/crate/freezer,
@@ -2526,10 +2373,7 @@
 /area/awaymission/zoo/syndieship)
 "va" = (
 /obj/structure/flora/ausbushes/ywflowers,
-/turf/simulated/floor/holofloor/grass{
-	icon = 'icons/jungle.dmi';
-	icon_state = "grass2"
-	},
+/turf/simulated/floor/holofloor/grass/jungle,
 /area/awaymission/zoo)
 "vb" = (
 /obj/effect/overlay/palmtree_r,
@@ -2729,10 +2573,7 @@
 /mob/living/simple_mob/vore/aggressive/frog{
 	faction = "zoo"
 	},
-/turf/simulated/floor/holofloor/grass{
-	icon = 'icons/jungle.dmi';
-	icon_state = "grass2"
-	},
+/turf/simulated/floor/holofloor/grass/jungle,
 /area/awaymission/zoo)
 "xL" = (
 /obj/item/reagent_containers/food/drinks/bottle/small/beer,
@@ -2819,10 +2660,7 @@
 /area/awaymission/zoo)
 "yy" = (
 /obj/structure/flora/ausbushes/palebush,
-/turf/simulated/floor/holofloor/grass{
-	icon = 'icons/jungle.dmi';
-	icon_state = "grass2"
-	},
+/turf/simulated/floor/holofloor/grass/jungle,
 /area/awaymission/zoo)
 "yC" = (
 /obj/structure/flora/ausbushes/ywflowers,
@@ -2938,11 +2776,7 @@
 /mob/living/simple_mob/animal/space/alien{
 	faction = "zoo"
 	},
-/turf/simulated/floor/holofloor/desert{
-	icon = 'icons/turf/floors.dmi';
-	icon_state = "asteroidplating";
-	name = "scorched sand"
-	},
+/turf/simulated/floor/holofloor/desert/scorched,
 /area/awaymission/zoo)
 "zC" = (
 /turf/simulated/floor/holofloor/beach/sand{
@@ -3173,24 +3007,12 @@
 	},
 /area/awaymission/zoo)
 "BN" = (
-/obj/effect/floor_decal/spline{
-	icon = 'icons/turf/floors.dmi';
-	icon_state = "asteroid_edge_w";
-	name = "rocky edge"
-	},
-/obj/effect/floor_decal/spline{
-	icon = 'icons/turf/floors.dmi';
-	icon_state = "asteroid_edge_s";
-	name = "rocky edge"
-	},
+/obj/effect/floor_decal/spline/asteroid/west,
+/obj/effect/floor_decal/spline/asteroid/south,
 /mob/living/simple_mob/animal/space/alien/drone{
 	faction = "zoo"
 	},
-/turf/simulated/floor/holofloor/desert{
-	icon = 'icons/turf/floors.dmi';
-	icon_state = "asteroidplating";
-	name = "scorched sand"
-	},
+/turf/simulated/floor/holofloor/desert/scorched,
 /area/awaymission/zoo)
 "BO" = (
 /obj/structure/window/reinforced{
@@ -3212,17 +3034,11 @@
 /area/awaymission/zoo/syndieship)
 "Cc" = (
 /obj/structure/flora/ausbushes/brflowers,
-/turf/simulated/floor/holofloor/grass{
-	icon = 'icons/jungle.dmi';
-	icon_state = "grass2"
-	},
+/turf/simulated/floor/holofloor/grass/jungle,
 /area/awaymission/zoo)
 "Ce" = (
 /obj/structure/flora/ausbushes/sparsegrass,
-/turf/simulated/floor/holofloor/grass{
-	icon = 'icons/jungle.dmi';
-	icon_state = "grass2"
-	},
+/turf/simulated/floor/holofloor/grass/jungle,
 /area/awaymission/zoo)
 "Cj" = (
 /obj/structure/table/rack,
@@ -3510,17 +3326,9 @@
 /turf/simulated/floor/tiled/white,
 /area/awaymission/zoo)
 "Ea" = (
-/obj/effect/floor_decal/spline{
-	icon = 'icons/turf/floors.dmi';
-	icon_state = "asteroid_edge_e";
-	name = "rocky edge"
-	},
+/obj/effect/floor_decal/spline/asteroid/east,
 /obj/effect/floor_decal/asteroid,
-/turf/simulated/floor/holofloor/desert{
-	icon = 'icons/turf/floors.dmi';
-	icon_state = "asteroidplating";
-	name = "scorched sand"
-	},
+/turf/simulated/floor/holofloor/desert/scorched,
 /area/awaymission/zoo)
 "Ei" = (
 /obj/item/radio/intercom{
@@ -3580,11 +3388,7 @@
 /mob/living/simple_mob/animal/space/alien{
 	faction = "zoo"
 	},
-/turf/simulated/floor/holofloor/desert{
-	icon = 'icons/turf/floors.dmi';
-	icon_state = "asteroidplating";
-	name = "scorched sand"
-	},
+/turf/simulated/floor/holofloor/desert/scorched,
 /area/awaymission/zoo)
 "EF" = (
 /obj/structure/grille,
@@ -3640,11 +3444,7 @@
 /mob/living/simple_mob/vore/bee{
 	faction = "zoo"
 	},
-/turf/simulated/floor/holofloor/grass{
-	icon = 'icons/turf/flooring/misc_vr.dmi';
-	icon_state = "hive";
-	name = "giant honeycomb"
-	},
+/turf/simulated/floor/holofloor/grass/hive,
 /area/awaymission/zoo)
 "Fe" = (
 /obj/structure/grille,
@@ -3745,10 +3545,7 @@
 /area/awaymission/zoo)
 "FQ" = (
 /obj/structure/flora/ausbushes/ppflowers,
-/turf/simulated/floor/holofloor/grass{
-	icon = 'icons/jungle.dmi';
-	icon_state = "grass2"
-	},
+/turf/simulated/floor/holofloor/grass/jungle,
 /area/awaymission/zoo)
 "FS" = (
 /obj/structure/table/rack,
@@ -3930,10 +3727,7 @@
 /turf/simulated/floor/tiled/white,
 /area/awaymission/zoo)
 "Hw" = (
-/turf/simulated/floor/holofloor/grass{
-	icon = 'icons/jungle.dmi';
-	icon_state = "grass2"
-	},
+/turf/simulated/floor/holofloor/grass/jungle,
 /area/awaymission/zoo)
 "Hx" = (
 /obj/structure/window/reinforced{
@@ -4019,11 +3813,7 @@
 /area/awaymission/zoo)
 "HU" = (
 /obj/effect/floor_decal/asteroid,
-/turf/simulated/floor/holofloor/desert{
-	icon = 'icons/turf/floors.dmi';
-	icon_state = "asteroidplating";
-	name = "scorched sand"
-	},
+/turf/simulated/floor/holofloor/desert/scorched,
 /area/awaymission/zoo)
 "HW" = (
 /mob/living/simple_mob/animal/passive/dog/corgi/puppy{
@@ -4244,10 +4034,7 @@
 /area/awaymission/zoo)
 "Kg" = (
 /obj/structure/flora/ausbushes/lavendergrass,
-/turf/simulated/floor/holofloor/grass{
-	icon = 'icons/jungle.dmi';
-	icon_state = "grass2"
-	},
+/turf/simulated/floor/holofloor/grass/jungle,
 /area/awaymission/zoo)
 "Kn" = (
 /obj/structure/disposalpipe/segment{
@@ -4430,16 +4217,8 @@
 	},
 /area/awaymission/zoo)
 "Mj" = (
-/obj/effect/floor_decal/spline{
-	icon = 'icons/turf/floors.dmi';
-	icon_state = "asteroid_edge_w";
-	name = "rocky edge"
-	},
-/turf/simulated/floor/holofloor/desert{
-	icon = 'icons/turf/floors.dmi';
-	icon_state = "asteroidplating";
-	name = "scorched sand"
-	},
+/obj/effect/floor_decal/spline/asteroid/west,
+/turf/simulated/floor/holofloor/desert/scorched,
 /area/awaymission/zoo)
 "Ml" = (
 /turf/simulated/floor/wood,
@@ -4608,10 +4387,7 @@
 /area/awaymission/zoo)
 "NU" = (
 /obj/structure/flora/ausbushes/genericbush,
-/turf/simulated/floor/holofloor/grass{
-	icon = 'icons/jungle.dmi';
-	icon_state = "grass2"
-	},
+/turf/simulated/floor/holofloor/grass/jungle,
 /area/awaymission/zoo)
 "NV" = (
 /turf/simulated/floor/carpet,
@@ -4966,43 +4742,15 @@
 	},
 /area/awaymission/zoo)
 "Rh" = (
-/obj/effect/floor_decal/spline{
-	icon = 'icons/turf/floors.dmi';
-	icon_state = "asteroid_edge_e";
-	name = "rocky edge"
-	},
-/obj/effect/floor_decal/spline{
-	icon = 'icons/turf/floors.dmi';
-	icon_state = "asteroid_edge_n";
-	name = "rocky edge"
-	},
-/turf/simulated/floor/holofloor/desert{
-	icon = 'icons/turf/floors.dmi';
-	icon_state = "asteroidplating";
-	name = "scorched sand"
-	},
+/obj/effect/floor_decal/spline/asteroid/east,
+/obj/effect/floor_decal/spline/asteroid/north,
+/turf/simulated/floor/holofloor/desert/scorched,
 /area/awaymission/zoo)
 "Ri" = (
-/obj/effect/floor_decal/spline{
-	icon = 'icons/turf/floors.dmi';
-	icon_state = "asteroid_edge_w";
-	name = "rocky edge"
-	},
-/obj/effect/floor_decal/spline{
-	icon = 'icons/turf/floors.dmi';
-	icon_state = "asteroid_edge_e";
-	name = "rocky edge"
-	},
-/obj/effect/floor_decal/spline{
-	icon = 'icons/turf/floors.dmi';
-	icon_state = "asteroid_edge_n";
-	name = "rocky edge"
-	},
-/turf/simulated/floor/holofloor/desert{
-	icon = 'icons/turf/floors.dmi';
-	icon_state = "asteroidplating";
-	name = "scorched sand"
-	},
+/obj/effect/floor_decal/spline/asteroid/west,
+/obj/effect/floor_decal/spline/asteroid/east,
+/obj/effect/floor_decal/spline/asteroid/north,
+/turf/simulated/floor/holofloor/desert/scorched,
 /area/awaymission/zoo)
 "Rj" = (
 /obj/item/stool,
@@ -5162,17 +4910,9 @@
 /turf/simulated/floor/plating,
 /area/awaymission/zoo)
 "Su" = (
-/obj/effect/floor_decal/spline{
-	icon = 'icons/turf/floors.dmi';
-	icon_state = "asteroid_edge_w";
-	name = "rocky edge"
-	},
+/obj/effect/floor_decal/spline/asteroid/west,
 /obj/effect/floor_decal/asteroid,
-/turf/simulated/floor/holofloor/desert{
-	icon = 'icons/turf/floors.dmi';
-	icon_state = "asteroidplating";
-	name = "scorched sand"
-	},
+/turf/simulated/floor/holofloor/desert/scorched,
 /area/awaymission/zoo)
 "SG" = (
 /obj/structure/table/rack,
@@ -5409,12 +5149,7 @@
 	dir = 1;
 	icon_state = "spline_plain_full"
 	},
-/obj/structure/showcase{
-	desc = "It looks almost lifelike.";
-	icon = 'icons/obj/statue.dmi';
-	icon_state = "monkey";
-	name = "Statue"
-	},
+/obj/structure/showcase/monkey,
 /turf/simulated/floor/grass,
 /area/awaymission/zoo)
 "UO" = (
@@ -5718,26 +5453,10 @@
 /turf/simulated/floor/plating,
 /area/awaymission/zoo/pirateship)
 "Xj" = (
-/obj/effect/floor_decal/spline{
-	icon = 'icons/turf/floors.dmi';
-	icon_state = "asteroid_edge_e";
-	name = "rocky edge"
-	},
-/obj/effect/floor_decal/spline{
-	icon = 'icons/turf/floors.dmi';
-	icon_state = "asteroid_edge_s";
-	name = "rocky edge"
-	},
-/obj/effect/floor_decal/spline{
-	icon = 'icons/turf/floors.dmi';
-	icon_state = "asteroid_edge_n";
-	name = "rocky edge"
-	},
-/turf/simulated/floor/holofloor/desert{
-	icon = 'icons/turf/floors.dmi';
-	icon_state = "asteroidplating";
-	name = "scorched sand"
-	},
+/obj/effect/floor_decal/spline/asteroid/east,
+/obj/effect/floor_decal/spline/asteroid/south,
+/obj/effect/floor_decal/spline/asteroid/north,
+/turf/simulated/floor/holofloor/desert/scorched,
 /area/awaymission/zoo)
 "Xq" = (
 /obj/effect/overlay/palmtree_l,
@@ -5779,11 +5498,7 @@
 /mob/living/simple_mob/animal/space/alien/drone{
 	faction = "zoo"
 	},
-/turf/simulated/floor/holofloor/desert{
-	icon = 'icons/turf/floors.dmi';
-	icon_state = "asteroidplating";
-	name = "scorched sand"
-	},
+/turf/simulated/floor/holofloor/desert/scorched,
 /area/awaymission/zoo)
 "XQ" = (
 /obj/structure/flora/ausbushes/fernybush,
@@ -5876,10 +5591,7 @@
 /area/awaymission/zoo)
 "YE" = (
 /obj/structure/flora/ausbushes/fullgrass,
-/turf/simulated/floor/holofloor/grass{
-	icon = 'icons/jungle.dmi';
-	icon_state = "grass2"
-	},
+/turf/simulated/floor/holofloor/grass/jungle,
 /area/awaymission/zoo)
 "YG" = (
 /turf/simulated/floor/tiled/steel,
@@ -6001,12 +5713,7 @@
 /area/awaymission/zoo)
 "Zy" = (
 /obj/structure/bed/chair,
-/obj/structure/showcase{
-	desc = "It looks almost lifelike.";
-	icon = 'icons/obj/statue.dmi';
-	icon_state = "Human_male";
-	name = "Statue"
-	},
+/obj/structure/showcase/human,
 /turf/simulated/floor/lino,
 /area/awaymission/zoo)
 "ZA" = (
diff --git a/maps/groundbase/gb-centcomm.dmm b/maps/groundbase/gb-centcomm.dmm
index 30b01e9b99..192db8e057 100644
--- a/maps/groundbase/gb-centcomm.dmm
+++ b/maps/groundbase/gb-centcomm.dmm
@@ -7377,18 +7377,8 @@
 /turf/simulated/floor/tiled/dark,
 /area/centcom/security/residential)
 "yV" = (
-/obj/machinery/cryopod/robot/door/dorms{
-	base_icon_state = "door_closed";
-	desc = "A small elevator";
-	dir = 2;
-	icon = 'icons/obj/doors/Door2x1glass.dmi';
-	icon_state = "door_closed";
-	name = "elevator";
-	on_enter_occupant_message = "The elevator doors close slowly. You can now head off for the residential, commercial, and other floors.";
-	on_store_message = "has departed for one of the various colony floors";
-	on_store_name = "Colony Oversight";
-	on_store_visible_message_2 = "to the colony districts.";
-	time_till_despawn = 5
+/obj/machinery/cryopod/robot/door/dorms/tether_glass{
+	dir = 2
 	},
 /turf/simulated/floor/tiled,
 /area/centcom/living)
diff --git a/maps/groundbase/gb-z2.dmm b/maps/groundbase/gb-z2.dmm
index 00cbe53142..869dd1b167 100644
--- a/maps/groundbase/gb-z2.dmm
+++ b/maps/groundbase/gb-z2.dmm
@@ -4238,12 +4238,10 @@
 /area/medical/virology)
 "lj" = (
 /obj/structure/table/glass,
-/obj/item/radio{
+/obj/item/radio/phone{
 	anchored = 1;
 	canhear_range = 7;
 	frequency = 1487;
-	icon = 'icons/obj/items.dmi';
-	icon_state = "red_phone";
 	name = "Virology Emergency Phone";
 	pixel_y = 9
 	},
@@ -13883,14 +13881,11 @@
 /obj/machinery/computer/med_data/laptop{
 	dir = 8
 	},
-/obj/item/radio{
+/obj/item/radio/phone{
 	anchored = 1;
 	canhear_range = 7;
 	frequency = 1487;
-	icon = 'icons/obj/items.dmi';
-	icon_state = "red_phone";
 	name = "Virology Emergency Phone";
-	pixel_x = 7;
 	pixel_y = 9
 	},
 /turf/simulated/floor/tiled/white,
diff --git a/maps/offmap_vr/om_ships/aro.dmm b/maps/offmap_vr/om_ships/aro.dmm
index 2781ff7b83..a098de90be 100644
--- a/maps/offmap_vr/om_ships/aro.dmm
+++ b/maps/offmap_vr/om_ships/aro.dmm
@@ -2732,9 +2732,7 @@
 /turf/simulated/floor/tiled/monotile,
 /area/ship/aro/midshipshangars)
 "gt" = (
-/obj/machinery/mech_recharger{
-	icon = 'icons/turf/shuttle_alien_blue.dmi'
-	},
+/obj/machinery/mech_recharger/alien,
 /obj/mecha/combat/fighter/pinnace,
 /turf/simulated/floor/tiled/techfloor,
 /area/ship/aro/midshipshangars)
@@ -3046,9 +3044,7 @@
 /area/ship/aro/centralarea)
 "wC" = (
 /obj/effect/floor_decal/industrial/outline,
-/obj/machinery/mech_recharger{
-	icon = 'icons/turf/shuttle_alien_blue.dmi'
-	},
+/obj/machinery/mech_recharger/alien,
 /obj/mecha/combat/fighter/pinnace,
 /turf/simulated/floor/tiled/techfloor,
 /area/ship/aro/midshipshangars)
diff --git a/maps/offmap_vr/om_ships/aro2.dmm b/maps/offmap_vr/om_ships/aro2.dmm
index 34df73d6ef..7414f114e8 100644
--- a/maps/offmap_vr/om_ships/aro2.dmm
+++ b/maps/offmap_vr/om_ships/aro2.dmm
@@ -897,9 +897,7 @@
 /area/aro2/starboardbay)
 "go" = (
 /obj/mecha/combat/fighter/pinnace/loaded,
-/obj/machinery/mech_recharger{
-	icon = 'icons/turf/shuttle_alien_blue.dmi'
-	},
+/obj/machinery/mech_recharger/alien,
 /turf/simulated/floor/tiled/eris/techmaint_cargo,
 /area/aro2/starboardbay)
 "gr" = (
@@ -3041,9 +3039,7 @@
 /turf/simulated/floor/tiled/eris/techmaint_cargo,
 /area/aro2/starboardbay)
 "Hh" = (
-/obj/machinery/mech_recharger{
-	icon = 'icons/turf/shuttle_alien_blue.dmi'
-	},
+/obj/machinery/mech_recharger/alien,
 /turf/simulated/floor/tiled/eris/dark/cargo,
 /area/shuttle/aroboat2)
 "Hm" = (
@@ -3225,9 +3221,7 @@
 /area/aro2/airarea)
 "Jb" = (
 /obj/mecha/combat/fighter/pinnace/loaded,
-/obj/machinery/mech_recharger{
-	icon = 'icons/turf/shuttle_alien_blue.dmi'
-	},
+/obj/machinery/mech_recharger/alien,
 /turf/simulated/floor/tiled/eris/techmaint_cargo,
 /area/aro2/portbay)
 "Jg" = (
diff --git a/maps/offmap_vr/om_ships/aro3.dmm b/maps/offmap_vr/om_ships/aro3.dmm
index c43dffdaf9..6c1271a006 100644
--- a/maps/offmap_vr/om_ships/aro3.dmm
+++ b/maps/offmap_vr/om_ships/aro3.dmm
@@ -3883,9 +3883,7 @@
 /turf/simulated/floor/tiled/milspec,
 /area/aro3/workshop)
 "yu" = (
-/obj/machinery/mech_recharger{
-	icon = 'icons/turf/shuttle_alien_blue.dmi'
-	},
+/obj/machinery/mech_recharger/alien,
 /turf/simulated/floor/tiled/milspec,
 /area/aro3/repair_bay)
 "yx" = (
@@ -4924,9 +4922,7 @@
 /turf/simulated/floor/tiled/milspec,
 /area/aro3/suite_port_wc)
 "ER" = (
-/obj/machinery/mech_recharger{
-	icon = 'icons/turf/shuttle_alien_blue.dmi'
-	},
+/obj/machinery/mech_recharger/alien,
 /turf/simulated/floor/tiled/milspec,
 /area/aro3/workshop)
 "EU" = (
@@ -7737,9 +7733,7 @@
 /turf/simulated/floor/tiled/techmaint,
 /area/aro3/workshop)
 "ZW" = (
-/obj/machinery/mech_recharger{
-	icon = 'icons/turf/shuttle_alien_blue.dmi'
-	},
+/obj/machinery/mech_recharger/alien,
 /obj/mecha/combat/fighter/gunpod/loaded,
 /turf/simulated/floor/tiled/milspec,
 /area/aro3/repair_bay)
diff --git a/maps/offmap_vr/om_ships/cruiser.dmm b/maps/offmap_vr/om_ships/cruiser.dmm
index 538799c2f9..4ec5483edd 100644
--- a/maps/offmap_vr/om_ships/cruiser.dmm
+++ b/maps/offmap_vr/om_ships/cruiser.dmm
@@ -7855,9 +7855,7 @@
 /obj/effect/floor_decal/corner_techfloor_grid{
 	dir = 4
 	},
-/obj/machinery/mech_recharger{
-	icon = 'icons/turf/shuttle_alien_blue.dmi'
-	},
+/obj/machinery/mech_recharger/alien,
 /obj/mecha/combat/fighter/gunpod/loaded,
 /turf/simulated/floor/tiled/techfloor,
 /area/mothership/telecomms1)
@@ -8063,9 +8061,7 @@
 	dir = 6;
 	icon_state = "corner_techfloor_grid"
 	},
-/obj/machinery/mech_recharger{
-	icon = 'icons/turf/shuttle_alien_blue.dmi'
-	},
+/obj/machinery/mech_recharger/alien,
 /obj/mecha/combat/fighter/gunpod/loaded,
 /turf/simulated/floor/tiled/techfloor,
 /area/mothership/telecomms2)
@@ -8384,9 +8380,7 @@
 /obj/effect/floor_decal/corner_techfloor_grid{
 	dir = 4
 	},
-/obj/machinery/mech_recharger{
-	icon = 'icons/turf/shuttle_alien_blue.dmi'
-	},
+/obj/machinery/mech_recharger/alien,
 /obj/mecha/combat/fighter/gunpod/loaded,
 /turf/simulated/floor/tiled/techfloor,
 /area/mothership/telecomms2)
@@ -8972,9 +8966,7 @@
 /obj/effect/floor_decal/corner_techfloor_grid{
 	dir = 1
 	},
-/obj/machinery/mech_recharger{
-	icon = 'icons/turf/shuttle_alien_blue.dmi'
-	},
+/obj/machinery/mech_recharger/alien,
 /turf/simulated/floor/tiled/techfloor,
 /area/mothership/telecomms2)
 "wA" = (
@@ -9180,9 +9172,7 @@
 	dir = 6;
 	icon_state = "corner_techfloor_grid"
 	},
-/obj/machinery/mech_recharger{
-	icon = 'icons/turf/shuttle_alien_blue.dmi'
-	},
+/obj/machinery/mech_recharger/alien,
 /obj/mecha/combat/fighter/gunpod/loaded,
 /turf/simulated/floor/tiled/techfloor,
 /area/mothership/telecomms1)
@@ -9194,9 +9184,7 @@
 /obj/effect/floor_decal/corner_techfloor_grid{
 	dir = 1
 	},
-/obj/machinery/mech_recharger{
-	icon = 'icons/turf/shuttle_alien_blue.dmi'
-	},
+/obj/machinery/mech_recharger/alien,
 /turf/simulated/floor/tiled/techfloor,
 /area/mothership/telecomms1)
 "Ct" = (
@@ -9411,9 +9399,7 @@
 /obj/effect/floor_decal/corner_techfloor_grid{
 	dir = 9
 	},
-/obj/machinery/mech_recharger{
-	icon = 'icons/turf/shuttle_alien_blue.dmi'
-	},
+/obj/machinery/mech_recharger/alien,
 /turf/simulated/floor/tiled/techfloor,
 /area/mothership/telecomms2)
 "HG" = (
@@ -9620,9 +9606,7 @@
 /obj/effect/floor_decal/corner_techfloor_grid{
 	dir = 9
 	},
-/obj/machinery/mech_recharger{
-	icon = 'icons/turf/shuttle_alien_blue.dmi'
-	},
+/obj/machinery/mech_recharger/alien,
 /turf/simulated/floor/tiled/techfloor,
 /area/mothership/telecomms1)
 "RP" = (
diff --git a/maps/offmap_vr/om_ships/hybridshuttle.dmm b/maps/offmap_vr/om_ships/hybridshuttle.dmm
index 27f29fcb38..4cfe22c590 100644
--- a/maps/offmap_vr/om_ships/hybridshuttle.dmm
+++ b/maps/offmap_vr/om_ships/hybridshuttle.dmm
@@ -84,7 +84,7 @@
 /area/shuttle/blue_fo)
 "am" = (
 /obj/structure/bed/alien{
-	icon = 'icons/obj/abductor_vr.dmi'
+	icon_state = "bed_blue"
 	},
 /obj/item/bedsheet/blue,
 /turf/simulated/floor/tiled/techfloor,
@@ -539,9 +539,7 @@
 /turf/simulated/floor/tiled/techfloor,
 /area/shuttle/blue_fo)
 "bn" = (
-/obj/machinery/mech_recharger{
-	icon = 'icons/turf/shuttle_alien_blue.dmi'
-	},
+/obj/machinery/mech_recharger/alien,
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/shuttle/blue_fo)
 "bo" = (
diff --git a/maps/offmap_vr/om_ships/lunaship.dmm b/maps/offmap_vr/om_ships/lunaship.dmm
index 8163f1d578..685d734d6f 100644
--- a/maps/offmap_vr/om_ships/lunaship.dmm
+++ b/maps/offmap_vr/om_ships/lunaship.dmm
@@ -2117,9 +2117,7 @@
 /turf/space,
 /area/space)
 "Dm" = (
-/obj/machinery/mech_recharger{
-	icon = 'icons/turf/shuttle_alien_blue.dmi'
-	},
+/obj/machinery/mech_recharger/alien,
 /obj/effect/floor_decal/milspec/color/black/half{
 	dir = 8
 	},
diff --git a/maps/offmap_vr/om_ships/shelter_6.dmm b/maps/offmap_vr/om_ships/shelter_6.dmm
index 02b6842f9e..c343448eec 100644
--- a/maps/offmap_vr/om_ships/shelter_6.dmm
+++ b/maps/offmap_vr/om_ships/shelter_6.dmm
@@ -203,12 +203,7 @@
 /turf/simulated/floor/reinforced,
 /area/shuttle/tabiranth)
 "af" = (
-/obj/machinery/portable_atmospherics/powered/scrubber/huge/stationary{
-	desc = "A large machine releasing a constant gust of air.";
-	icon = 'icons/obj/survival_pod.dmi';
-	icon_state = "fans";
-	name = "enviornmental regulation system"
-	},
+/obj/machinery/portable_atmospherics/powered/scrubber/huge/stationary/fluff_fan,
 /turf/simulated/floor/reinforced,
 /area/shuttle/tabiranth)
 "ag" = (
@@ -1546,9 +1541,7 @@
 /turf/simulated/floor/tiled/steel_ridged,
 /area/shuttle/tabiranth)
 "bO" = (
-/obj/machinery/mech_recharger{
-	icon = 'icons/turf/shuttle_alien_blue.dmi'
-	},
+/obj/machinery/mech_recharger/alien,
 /obj/mecha/combat/fighter/baron/loaded,
 /turf/simulated/floor/reinforced,
 /area/shuttle/tabiranth)
@@ -1630,34 +1623,10 @@
 /obj/item/storage/secure/briefcase/nsfw_pack_hybrid,
 /obj/item/ammo_casing/microbattery/medical/corpse_mend,
 /obj/item/ammo_casing/microbattery/medical/corpse_mend,
-/obj/item/cell/slime{
-	description_info = "This 'cell' holds a max charge of 20k and self recharges over time.";
-	icon = 'icons/obj/power.dmi';
-	icon_state = "icell";
-	maxcharge = 20000;
-	name = "slime core cell"
-	},
-/obj/item/cell/slime{
-	description_info = "This 'cell' holds a max charge of 20k and self recharges over time.";
-	icon = 'icons/obj/power.dmi';
-	icon_state = "icell";
-	maxcharge = 20000;
-	name = "slime core cell"
-	},
-/obj/item/cell/slime{
-	description_info = "This 'cell' holds a max charge of 20k and self recharges over time.";
-	icon = 'icons/obj/power.dmi';
-	icon_state = "icell";
-	maxcharge = 20000;
-	name = "slime core cell"
-	},
-/obj/item/cell/slime{
-	description_info = "This 'cell' holds a max charge of 20k and self recharges over time.";
-	icon = 'icons/obj/power.dmi';
-	icon_state = "icell";
-	maxcharge = 20000;
-	name = "slime core cell"
-	},
+/obj/item/cell/slime,
+/obj/item/cell/slime,
+/obj/item/cell/slime,
+/obj/item/cell/slime,
 /obj/item/slime_extract/pink,
 /obj/item/slime_extract/pink,
 /obj/item/slime_extract/pink,
diff --git a/maps/overmap/example_sector1.dmm b/maps/overmap/example_sector1.dmm
index 38b2d8bf49..3f393d18ca 100644
--- a/maps/overmap/example_sector1.dmm
+++ b/maps/overmap/example_sector1.dmm
@@ -2605,13 +2605,9 @@
 /turf/simulated/floor/plating,
 /area/tcommsat/entrance)
 "fq" = (
-/obj/effect/mapinfo/sector{
-	icon = 'icons/obj/stock_parts.dmi';
-	icon_state = "treatment_disk";
-	landing_area = /area/shuttle/escape_pod1/centcom;
+/obj/effect/mapinfo/sector/commsrelay{
 	mapx = 7;
-	mapy = 3;
-	name = "Communications Relay"
+	mapy = 3
 	},
 /turf/space,
 /area)
diff --git a/maps/overmap/example_sector2.dmm b/maps/overmap/example_sector2.dmm
index ea53afe67a..09bb257b31 100644
--- a/maps/overmap/example_sector2.dmm
+++ b/maps/overmap/example_sector2.dmm
@@ -18,12 +18,7 @@
 /turf/simulated/shuttle/floor,
 /area/shuttle/overmap_examples/outpost)
 "ag" = (
-/obj/effect/mapinfo/sector{
-	icon = 'icons/obj/mining.dmi';
-	icon_state = "ore2";
-	landing_area = /area/shuttle/escape_pod2/centcom;
-	name = "Abandoned Outpost"
-	},
+/obj/effect/mapinfo/sector/abandoned,
 /turf/space,
 /area)
 "ah" = (
diff --git a/maps/redgate/cybercity.dmm b/maps/redgate/cybercity.dmm
index 5c3d96ef95..840ac38fd1 100644
--- a/maps/redgate/cybercity.dmm
+++ b/maps/redgate/cybercity.dmm
@@ -3583,11 +3583,7 @@
 /turf/simulated/floor/carpet/turcarpet,
 /area/redgate/city/house9)
 "eOR" = (
-/turf/simulated/wall/tgmc/darkwall{
-	icon = 'icons/obj/doors/angled/elevator/door.dmi';
-	icon_state = "preview";
-	name = "locked elevator"
-	},
+/turf/simulated/wall/tgmc/darkwall/fake_door,
 /area/redgate/city/corporation)
 "ePv" = (
 /obj/structure/fitness/boxing_ropes/turnbuckle{
@@ -3671,11 +3667,7 @@
 /turf/simulated/floor/tiled/dark,
 /area/redgate/city/church)
 "eVq" = (
-/turf/simulated/wall/tgmc/darkwall{
-	icon = 'icons/obj/doors/angled/elevator/door.dmi';
-	icon_state = "preview";
-	name = "locked elevator"
-	},
+/turf/simulated/wall/tgmc/darkwall/fake_door,
 /area/redgate/city/parkinglot)
 "eVu" = (
 /turf/simulated/wall/tgmc/darkwall,
diff --git a/maps/redgate/fantasy_dungeon.dmm b/maps/redgate/fantasy_dungeon.dmm
index 18e0115f8d..a70d991f27 100644
--- a/maps/redgate/fantasy_dungeon.dmm
+++ b/maps/redgate/fantasy_dungeon.dmm
@@ -1173,9 +1173,7 @@
 /turf/simulated/mineral/floor/ignore_cavegen/cave,
 /area/redgate/fantasy/mines)
 "yS" = (
-/obj/structure/closet/crate/mimic/guaranteed{
-	icon = 'icons/obj/closets/chest.dmi'
-	},
+/obj/structure/closet/crate/mimic/guaranteed/chest,
 /turf/simulated/floor/wmarble,
 /area/redgate/fantasy/dungeon)
 "yT" = (
diff --git a/maps/redgate/innland.dmm b/maps/redgate/innland.dmm
index e4d5b1beca..2fcb147c7f 100644
--- a/maps/redgate/innland.dmm
+++ b/maps/redgate/innland.dmm
@@ -13,28 +13,19 @@
 /area/redgate/structure/powered)
 "aj" = (
 /obj/structure/table/woodentable,
-/turf/unsimulated/floor/steel{
-	icon = 'icons/turf/floors_vr.dmi';
-	icon_state = "wood"
-	},
+/turf/unsimulated/floor/wood,
 /area/redgate/structure/powered)
 "am" = (
 /turf/simulated/floor/carpet/bcarpet,
 /area/redgate/structure/powered)
 "ap" = (
-/turf/unsimulated/floor/steel{
-	icon = 'icons/turf/floors_vr.dmi';
-	icon_state = "wood"
-	},
+/turf/unsimulated/floor/wood,
 /area/redgate/structure/powered)
 "ar" = (
 /obj/structure/closet/crate/bin{
 	anchored = 1
 	},
-/turf/unsimulated/floor/steel{
-	icon = 'icons/turf/floors_vr.dmi';
-	icon_state = "wood"
-	},
+/turf/unsimulated/floor/wood,
 /area/redgate/structure/powered)
 "at" = (
 /mob/living/simple_mob/vore/alienanimals/teppi,
@@ -46,17 +37,11 @@
 /area/redgate/wilds)
 "aG" = (
 /obj/structure/flora/pottedplant/fern,
-/turf/unsimulated/floor/steel{
-	icon = 'icons/turf/floors_vr.dmi';
-	icon_state = "wood"
-	},
+/turf/unsimulated/floor/wood,
 /area/redgate/structure/powered)
 "aK" = (
 /obj/structure/flora/pottedplant/minitree,
-/turf/unsimulated/floor/steel{
-	icon = 'icons/turf/floors_vr.dmi';
-	icon_state = "wood"
-	},
+/turf/unsimulated/floor/wood,
 /area/redgate/structure/powered)
 "aL" = (
 /turf/simulated/floor/reinforced,
@@ -99,10 +84,7 @@
 /obj/machinery/light/small{
 	dir = 1
 	},
-/turf/unsimulated/floor/steel{
-	icon = 'icons/turf/floors_vr.dmi';
-	icon_state = "wood"
-	},
+/turf/unsimulated/floor/wood,
 /area/redgate/structure/powered)
 "bu" = (
 /obj/machinery/portable_atmospherics/hydroponics,
@@ -120,10 +102,7 @@
 	dir = 8
 	},
 /obj/machinery/light/small,
-/turf/unsimulated/floor/steel{
-	icon = 'icons/turf/floors_vr.dmi';
-	icon_state = "wood"
-	},
+/turf/unsimulated/floor/wood,
 /area/redgate/structure/powered)
 "bE" = (
 /obj/machinery/light/small{
@@ -284,10 +263,7 @@
 /obj/effect/floor_decal/spline/plain{
 	dir = 1
 	},
-/turf/unsimulated/floor/steel{
-	icon = 'icons/turf/floors_vr.dmi';
-	icon_state = "wood"
-	},
+/turf/unsimulated/floor/wood,
 /area/redgate/structure/powered)
 "dg" = (
 /obj/structure/sink/kitchen{
@@ -317,19 +293,13 @@
 /area/redgate/structure/powered)
 "dm" = (
 /obj/machinery/recharge_station,
-/turf/unsimulated/floor/steel{
-	icon = 'icons/turf/floors_vr.dmi';
-	icon_state = "wood"
-	},
+/turf/unsimulated/floor/wood,
 /area/redgate/structure/powered)
 "dn" = (
 /obj/structure/sign/poster{
 	dir = 1
 	},
-/turf/unsimulated/floor/steel{
-	icon = 'icons/turf/floors_vr.dmi';
-	icon_state = "wood"
-	},
+/turf/unsimulated/floor/wood,
 /area/redgate/structure/powered)
 "do" = (
 /obj/structure/mopbucket,
@@ -377,10 +347,7 @@
 /obj/structure/bed/chair/wood/wings{
 	dir = 4
 	},
-/turf/unsimulated/floor/steel{
-	icon = 'icons/turf/floors_vr.dmi';
-	icon_state = "wood"
-	},
+/turf/unsimulated/floor/wood,
 /area/redgate/structure/powered)
 "dB" = (
 /obj/machinery/portable_atmospherics/hydroponics,
@@ -399,20 +366,14 @@
 /obj/structure/bed/chair/wood/wings{
 	dir = 8
 	},
-/turf/unsimulated/floor/steel{
-	icon = 'icons/turf/floors_vr.dmi';
-	icon_state = "wood"
-	},
+/turf/unsimulated/floor/wood,
 /area/redgate/structure/powered)
 "dD" = (
 /obj/structure/extinguisher_cabinet{
 	dir = 1;
 	pixel_y = 32
 	},
-/turf/unsimulated/floor/steel{
-	icon = 'icons/turf/floors_vr.dmi';
-	icon_state = "wood"
-	},
+/turf/unsimulated/floor/wood,
 /area/redgate/structure/powered)
 "dE" = (
 /obj/structure/table/marble,
@@ -495,10 +456,7 @@
 "dR" = (
 /obj/structure/table/woodentable,
 /obj/item/reagent_containers/food/snacks/grilledcheese,
-/turf/unsimulated/floor/steel{
-	icon = 'icons/turf/floors_vr.dmi';
-	icon_state = "wood"
-	},
+/turf/unsimulated/floor/wood,
 /area/redgate/structure/powered)
 "dS" = (
 /obj/machinery/door/airlock/glass{
@@ -534,10 +492,7 @@
 "ea" = (
 /obj/structure/table/woodentable,
 /obj/item/reagent_containers/food/snacks/roastbeef,
-/turf/unsimulated/floor/steel{
-	icon = 'icons/turf/floors_vr.dmi';
-	icon_state = "wood"
-	},
+/turf/unsimulated/floor/wood,
 /area/redgate/structure/powered)
 "eb" = (
 /obj/effect/floor_decal/corner/grey/diagonal{
@@ -583,10 +538,7 @@
 /obj/item/reagent_containers/food/condiment/small/peppermill{
 	pixel_x = 3
 	},
-/turf/unsimulated/floor/steel{
-	icon = 'icons/turf/floors_vr.dmi';
-	icon_state = "wood"
-	},
+/turf/unsimulated/floor/wood,
 /area/redgate/structure/powered)
 "ei" = (
 /obj/structure/table/marble,
@@ -635,10 +587,7 @@
 	dir = 4;
 	pixel_x = -30
 	},
-/turf/unsimulated/floor/steel{
-	icon = 'icons/turf/floors_vr.dmi';
-	icon_state = "wood"
-	},
+/turf/unsimulated/floor/wood,
 /area/redgate/structure/powered)
 "eo" = (
 /obj/effect/floor_decal/spline/plain{
@@ -723,10 +672,7 @@
 "eE" = (
 /obj/structure/table/woodentable,
 /obj/item/reagent_containers/food/snacks/meatballsoup,
-/turf/unsimulated/floor/steel{
-	icon = 'icons/turf/floors_vr.dmi';
-	icon_state = "wood"
-	},
+/turf/unsimulated/floor/wood,
 /area/redgate/structure/powered)
 "eF" = (
 /turf/simulated/floor/lino,
@@ -748,10 +694,7 @@
 "eN" = (
 /obj/structure/table/woodentable,
 /obj/item/reagent_containers/food/snacks/meatsteak,
-/turf/unsimulated/floor/steel{
-	icon = 'icons/turf/floors_vr.dmi';
-	icon_state = "wood"
-	},
+/turf/unsimulated/floor/wood,
 /area/redgate/structure/powered)
 "eO" = (
 /obj/structure/table/marble,
@@ -783,10 +726,7 @@
 /area/redgate/structure/powered)
 "eR" = (
 /obj/structure/sign/poster,
-/turf/unsimulated/floor/steel{
-	icon = 'icons/turf/floors_vr.dmi';
-	icon_state = "wood"
-	},
+/turf/unsimulated/floor/wood,
 /area/redgate/structure/powered)
 "eS" = (
 /obj/structure/table/marble,
@@ -961,10 +901,7 @@
 /obj/structure/sign/poster{
 	dir = 1
 	},
-/turf/unsimulated/floor/steel{
-	icon = 'icons/turf/floors_vr.dmi';
-	icon_state = "wood"
-	},
+/turf/unsimulated/floor/wood,
 /area/redgate/structure/powered)
 "ub" = (
 /turf/simulated/floor/water,
diff --git a/maps/redgate/train.dmm b/maps/redgate/train.dmm
index 8304196b38..4f2e0ef2e7 100644
--- a/maps/redgate/train.dmm
+++ b/maps/redgate/train.dmm
@@ -1,8 +1,4 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
-"aa" = (
-/obj/effect/step_trigger/death/train_lost,
-/turf/simulated/floor/maglev,
-/area/redgate/train/overboard)
 "ab" = (
 /obj/effect/step_trigger/thrower{
 	direction = 4;
@@ -16,29 +12,6 @@
 	oxygen = 21.8366
 	},
 /area/redgate/train/overboard)
-"ac" = (
-/obj/structure/railing{
-	dir = 4
-	},
-/obj/effect/step_trigger/death/train_crush,
-/turf/simulated/floor/maglev,
-/area/redgate/train/overboard)
-"ad" = (
-/obj/structure/railing{
-	dir = 4
-	},
-/obj/effect/step_trigger/thrower{
-	immobilize = 0;
-	name = "down thrower";
-	stopper = 0;
-	tiles = 0
-	},
-/obj/structure/sign/warning/falling{
-	desc = "This is a train in motion. Do not try to stand on the outside of the train. Take caution near railings. Do not attempt to fly from the moving train. Falling is guaranteed death, your body will not be recoverable.";
-	pixel_y = 31
-	},
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/redgate/train/overboard)
 "aj" = (
 /obj/structure/closet/secure_closet/animal,
 /turf/simulated/shuttle/floor/black,
@@ -452,7 +425,7 @@
 	dir = 4
 	},
 /obj/effect/step_trigger/death/train_crush,
-/turf/simulated/floor/tiled/techfloor/grid,
+/turf/unsimulated/floor/techfloor_grid/outdoors_tansit,
 /area/redgate/train/overboard)
 "iX" = (
 /obj/effect/floor_decal/transit/orange{
@@ -462,7 +435,7 @@
 	dir = 8
 	},
 /obj/effect/step_trigger/death/train_lost,
-/turf/simulated/floor/tiled/techfloor/grid,
+/turf/unsimulated/floor/techfloor_grid/outdoors_tansit,
 /area/redgate/train/overboard)
 "ja" = (
 /obj/structure/closet/walllocker/emerglocker{
@@ -513,7 +486,7 @@
 	dir = 8
 	},
 /obj/effect/step_trigger/death/train_lost,
-/turf/simulated/floor/tiled/techfloor/grid,
+/turf/unsimulated/floor/techfloor_grid/outdoors_tansit,
 /area/redgate/train/overboard)
 "jL" = (
 /mob/living/simple_mob/vore/alienanimals/teppi/baby,
@@ -592,7 +565,7 @@
 /obj/structure/railing{
 	dir = 8
 	},
-/turf/simulated/floor/tiled/techfloor/grid,
+/turf/unsimulated/floor/techfloor_grid/outdoors_tansit,
 /area/redgate/train/overboard)
 "lL" = (
 /turf/simulated/shuttle/floor/white{
@@ -634,7 +607,7 @@
 	stopper = 0;
 	tiles = 0
 	},
-/turf/simulated/floor/tiled/techfloor/grid,
+/turf/unsimulated/floor/techfloor_grid/outdoors_tansit,
 /area/redgate/train/overboard)
 "mw" = (
 /obj/structure/railing{
@@ -642,7 +615,7 @@
 	},
 /obj/effect/step_trigger/death/train_crush,
 /obj/structure/railing/grey,
-/turf/simulated/floor/tiled/techfloor/grid,
+/turf/unsimulated/floor/techfloor_grid/outdoors_tansit,
 /area/redgate/train/overboard)
 "mG" = (
 /obj/effect/step_trigger/death/train_crush,
@@ -653,7 +626,7 @@
 	desc = "This is a train in motion. Do not try to stand on the outside of the train. Take caution near railings. Do not attempt to fly from the moving train. Falling is guaranteed death, your body will not be recoverable.";
 	pixel_y = 31
 	},
-/turf/simulated/floor/tiled/techfloor/grid,
+/turf/unsimulated/floor/techfloor_grid/outdoors_tansit,
 /area/redgate/train/overboard)
 "mQ" = (
 /obj/structure/bed/chair/shuttle{
@@ -680,7 +653,7 @@
 /obj/structure/railing{
 	dir = 4
 	},
-/turf/simulated/floor/tiled/techfloor/grid,
+/turf/unsimulated/floor/techfloor_grid/outdoors_tansit,
 /area/redgate/train/overboard)
 "mY" = (
 /obj/structure/fence/door,
@@ -737,7 +710,7 @@
 /obj/structure/railing/grey{
 	dir = 1
 	},
-/turf/simulated/floor/maglev,
+/turf/unsimulated/floor/maglev/transit,
 /area/redgate/train/overboard)
 "nv" = (
 /obj/structure/ladder/up{
@@ -769,7 +742,7 @@
 /obj/structure/railing/grey{
 	dir = 4
 	},
-/turf/simulated/floor/tiled/techfloor/grid,
+/turf/unsimulated/floor/techfloor_grid/outdoors_tansit,
 /area/redgate/train/overboard)
 "nK" = (
 /obj/structure/closet/walllocker/emerglocker{
@@ -825,7 +798,7 @@
 /obj/structure/railing/grey{
 	dir = 8
 	},
-/turf/simulated/floor/tiled/techfloor/grid,
+/turf/unsimulated/floor/techfloor_grid/outdoors_tansit,
 /area/redgate/train/overboard)
 "ph" = (
 /obj/effect/floor_decal/industrial/outline/blue,
@@ -844,7 +817,7 @@
 /obj/structure/railing{
 	dir = 4
 	},
-/turf/simulated/floor/tiled/techfloor/grid,
+/turf/unsimulated/floor/techfloor_grid/outdoors_tansit,
 /area/redgate/train/overboard)
 "pM" = (
 /obj/structure/closet/walllocker_double/misc_civ/north,
@@ -972,7 +945,7 @@
 	dir = 4
 	},
 /obj/effect/step_trigger/death/train_lost,
-/turf/simulated/floor/tiled/techfloor/grid,
+/turf/unsimulated/floor/techfloor_grid/outdoors_tansit,
 /area/redgate/train/overboard)
 "sa" = (
 /obj/machinery/door/airlock/glass{
@@ -990,7 +963,7 @@
 	desc = "This is a train in motion. Do not try to stand on the outside of the train. Take caution near railings. Do not attempt to fly from the moving train. Falling is guaranteed death, your body will not be recoverable.";
 	pixel_y = 31
 	},
-/turf/simulated/floor/tiled/techfloor/grid,
+/turf/unsimulated/floor/techfloor_grid/outdoors_tansit,
 /area/redgate/train/overboard)
 "se" = (
 /obj/structure/bed/chair/shuttle,
@@ -1114,10 +1087,7 @@
 /area/redgate/train/casino)
 "uf" = (
 /obj/effect/step_trigger/death/train_lost,
-/turf/unsimulated/floor/maglev{
-	icon = 'icons/turf/transit_vr.dmi';
-	outdoors = 1
-	},
+/turf/unsimulated/floor/maglev/transit,
 /area/redgate/train/overboard)
 "us" = (
 /obj/random/mob/semirandom_mob_spawner/vore/retaliate,
@@ -1159,11 +1129,7 @@
 /area/redgate/train/bar)
 "vS" = (
 /obj/effect/step_trigger/death/train_lost,
-/turf/unsimulated/mineral{
-	icon = 'icons/turf/transit_vr.dmi';
-	icon_state = "rock";
-	outdoors = 1
-	},
+/turf/unsimulated/mineral/moving/outdoors,
 /area/redgate/train/overboard)
 "wb" = (
 /obj/structure/fence/door,
@@ -1209,7 +1175,7 @@
 /obj/structure/railing/grey{
 	dir = 1
 	},
-/turf/simulated/floor/tiled/techfloor/grid,
+/turf/unsimulated/floor/techfloor_grid/outdoors_tansit,
 /area/redgate/train/overboard)
 "wX" = (
 /obj/structure/bed/chair/shuttle{
@@ -1248,7 +1214,7 @@
 /obj/structure/railing{
 	dir = 1
 	},
-/turf/simulated/floor/maglev,
+/turf/unsimulated/floor/maglev/transit,
 /area/redgate/train/overboard)
 "xz" = (
 /obj/structure/reagent_dispensers/fueltank/barrel/two{
@@ -1264,14 +1230,14 @@
 "xU" = (
 /obj/effect/step_trigger/death/train_crush,
 /obj/structure/railing/grey,
-/turf/simulated/floor/maglev,
+/turf/unsimulated/floor/maglev/transit,
 /area/redgate/train/overboard)
 "yc" = (
 /obj/effect/floor_decal/transit/orange{
 	dir = 4
 	},
 /obj/effect/step_trigger/death/train_lost,
-/turf/simulated/floor/tiled/techfloor/grid,
+/turf/unsimulated/floor/techfloor_grid/outdoors_tansit,
 /area/redgate/train/overboard)
 "yf" = (
 /obj/effect/floor_decal/transit/orange{
@@ -1289,7 +1255,7 @@
 /obj/structure/railing/grey{
 	dir = 4
 	},
-/turf/simulated/floor/tiled/techfloor/grid,
+/turf/unsimulated/floor/techfloor_grid/outdoors_tansit,
 /area/redgate/train/overboard)
 "yj" = (
 /obj/effect/floor_decal/spline/fancy/wood{
@@ -1303,7 +1269,7 @@
 /obj/structure/railing/grey{
 	dir = 8
 	},
-/turf/simulated/floor/tiled/techfloor/grid,
+/turf/unsimulated/floor/techfloor_grid/outdoors_tansit,
 /area/redgate/train/overboard)
 "yq" = (
 /obj/item/stool/padded,
@@ -1333,7 +1299,7 @@
 /obj/structure/railing/grey{
 	dir = 1
 	},
-/turf/simulated/floor/tiled/techfloor/grid,
+/turf/unsimulated/floor/techfloor_grid/outdoors_tansit,
 /area/redgate/train/overboard)
 "yx" = (
 /obj/machinery/light{
@@ -1422,7 +1388,7 @@
 	stopper = 0;
 	tiles = 0
 	},
-/turf/simulated/floor/tiled/techfloor/grid,
+/turf/unsimulated/floor/techfloor_grid/outdoors_tansit,
 /area/redgate/train/overboard)
 "zp" = (
 /obj/structure/table/standard,
@@ -1597,7 +1563,7 @@
 	stopper = 0;
 	tiles = 0
 	},
-/turf/simulated/floor/tiled/techfloor/grid,
+/turf/unsimulated/floor/techfloor_grid/outdoors_tansit,
 /area/redgate/train/overboard)
 "Ch" = (
 /turf/simulated/shuttle/wall/voidcraft,
@@ -1614,11 +1580,7 @@
 /turf/simulated/floor/outdoors/newdirt,
 /area/redgate/train/animals)
 "Co" = (
-/turf/unsimulated/mineral{
-	icon = 'icons/turf/transit_vr.dmi';
-	icon_state = "rock";
-	outdoors = 1
-	},
+/turf/unsimulated/mineral/moving/outdoors,
 /area/redgate/train/overboard)
 "Cu" = (
 /obj/random/forgotten_tram,
@@ -1672,7 +1634,7 @@
 	stopper = 0;
 	tiles = 0
 	},
-/turf/simulated/floor/maglev,
+/turf/unsimulated/floor/maglev/transit,
 /area/redgate/train/overboard)
 "Da" = (
 /obj/machinery/light{
@@ -1749,10 +1711,7 @@
 /turf/simulated/shuttle/wall/voidcraft,
 /area/redgate/train/bar)
 "EJ" = (
-/turf/unsimulated/wall{
-	icon = 'icons/turf/transit_vr.dmi';
-	outdoors = 1
-	},
+/turf/unsimulated/wall/transit/outdoors,
 /area/redgate/train/overboard)
 "EL" = (
 /mob/living/simple_mob/vore/alienanimals/catslug{
@@ -1877,7 +1836,7 @@
 /obj/structure/railing/grey{
 	dir = 4
 	},
-/turf/simulated/floor/tiled/techfloor/grid,
+/turf/unsimulated/floor/techfloor_grid/outdoors_tansit,
 /area/redgate/train/overboard)
 "GU" = (
 /obj/structure/bed/chair/shuttle{
@@ -1913,7 +1872,7 @@
 	stopper = 0;
 	tiles = 0
 	},
-/turf/simulated/floor/tiled/techfloor/grid,
+/turf/unsimulated/floor/techfloor_grid/outdoors_tansit,
 /area/redgate/train/overboard)
 "Hs" = (
 /turf/simulated/shuttle/wall/voidcraft,
@@ -1931,7 +1890,7 @@
 	stopper = 0;
 	tiles = 0
 	},
-/turf/simulated/floor/tiled/techfloor/grid,
+/turf/unsimulated/floor/techfloor_grid/outdoors_tansit,
 /area/redgate/train/overboard)
 "HF" = (
 /obj/machinery/light{
@@ -2003,7 +1962,7 @@
 	desc = "This is a train in motion. Do not try to stand on the outside of the train. Take caution near railings. Do not attempt to fly from the moving train. Falling is guaranteed death, your body will not be recoverable.";
 	pixel_y = 31
 	},
-/turf/simulated/floor/maglev,
+/turf/unsimulated/floor/techfloor_grid/outdoors_tansit,
 /area/redgate/train/overboard)
 "In" = (
 /obj/structure/grille,
@@ -2135,7 +2094,7 @@
 /obj/structure/railing{
 	dir = 8
 	},
-/turf/simulated/floor/tiled/techfloor/grid,
+/turf/unsimulated/floor/techfloor_grid/outdoors_tansit,
 /area/redgate/train/overboard)
 "Kl" = (
 /obj/structure/table/standard,
@@ -2212,7 +2171,7 @@
 	stopper = 0;
 	tiles = 0
 	},
-/turf/simulated/floor/tiled/techfloor/grid,
+/turf/unsimulated/floor/techfloor_grid/outdoors_tansit,
 /area/redgate/train/overboard)
 "KZ" = (
 /obj/machinery/light{
@@ -2344,14 +2303,14 @@
 /area/redgate/train/meeting)
 "LY" = (
 /obj/effect/step_trigger/death/train_lost,
-/turf/simulated/floor/tiled/techfloor/grid,
+/turf/unsimulated/floor/techfloor_grid/outdoors_tansit,
 /area/redgate/train/overboard)
 "Mj" = (
 /turf/simulated/shuttle/wall/voidcraft,
 /area/redgate/train/rear)
 "Mo" = (
 /obj/effect/step_trigger/death/train_crush,
-/turf/simulated/floor/maglev,
+/turf/unsimulated/floor/maglev/transit,
 /area/redgate/train/overboard)
 "MJ" = (
 /obj/structure/bed/chair/shuttle{
@@ -2373,7 +2332,7 @@
 /area/redgate/train/wood)
 "Nd" = (
 /obj/effect/step_trigger/death/train_crush,
-/turf/simulated/floor/tiled/techfloor/grid,
+/turf/unsimulated/floor/techfloor_grid/outdoors_tansit,
 /area/redgate/train/overboard)
 "Ne" = (
 /turf/simulated/shuttle/floor/black,
@@ -2497,7 +2456,7 @@
 	stopper = 0;
 	tiles = 0
 	},
-/turf/simulated/floor/tiled/techfloor/grid,
+/turf/unsimulated/floor/techfloor_grid/outdoors_tansit,
 /area/redgate/train/overboard)
 "Pf" = (
 /obj/machinery/vending/coffee,
@@ -2516,7 +2475,7 @@
 /obj/structure/railing/grey{
 	dir = 8
 	},
-/turf/simulated/floor/tiled/techfloor/grid,
+/turf/unsimulated/floor/techfloor_grid/outdoors_tansit,
 /area/redgate/train/overboard)
 "Pp" = (
 /obj/structure/railing{
@@ -2607,7 +2566,7 @@
 /obj/structure/railing/grey{
 	dir = 8
 	},
-/turf/simulated/floor/tiled/techfloor/grid,
+/turf/unsimulated/floor/techfloor_grid/outdoors_tansit,
 /area/redgate/train/overboard)
 "Qw" = (
 /obj/effect/floor_decal/spline/fancy/wood,
@@ -2676,7 +2635,7 @@
 /obj/structure/railing{
 	dir = 1
 	},
-/turf/simulated/floor/maglev,
+/turf/unsimulated/floor/maglev/transit,
 /area/redgate/train/overboard)
 "RC" = (
 /obj/effect/step_trigger/thrower{
@@ -2685,7 +2644,7 @@
 	stopper = 0;
 	tiles = 0
 	},
-/turf/simulated/floor/tiled/techfloor/grid,
+/turf/unsimulated/floor/techfloor_grid/outdoors_tansit,
 /area/redgate/train/overboard)
 "RE" = (
 /obj/machinery/smartfridge/drinks,
@@ -2774,7 +2733,7 @@
 	stopper = 0;
 	tiles = 0
 	},
-/turf/simulated/floor/tiled/techfloor/grid,
+/turf/unsimulated/floor/techfloor_grid/outdoors_tansit,
 /area/redgate/train/overboard)
 "SQ" = (
 /turf/simulated/shuttle/wall/voidcraft/hard_corner,
@@ -2997,11 +2956,7 @@
 	stopper = 0;
 	tiles = 0
 	},
-/turf/unsimulated/mineral{
-	icon = 'icons/turf/transit_vr.dmi';
-	icon_state = "rock";
-	outdoors = 1
-	},
+/turf/unsimulated/mineral/moving/outdoors,
 /area/redgate/train/overboard)
 "Wr" = (
 /obj/structure/table/standard,
@@ -3024,7 +2979,7 @@
 	dir = 8
 	},
 /obj/effect/step_trigger/death/train_crush,
-/turf/simulated/floor/tiled/techfloor/grid,
+/turf/unsimulated/floor/techfloor_grid/outdoors_tansit,
 /area/redgate/train/overboard)
 "WM" = (
 /obj/effect/step_trigger/death/train_lost,
@@ -3087,7 +3042,7 @@
 	},
 /obj/effect/step_trigger/death/train_crush,
 /obj/structure/railing/grey,
-/turf/simulated/floor/tiled/techfloor/grid,
+/turf/unsimulated/floor/techfloor_grid/outdoors_tansit,
 /area/redgate/train/overboard)
 "YC" = (
 /obj/machinery/light{
@@ -3147,7 +3102,7 @@
 /obj/structure/railing{
 	dir = 1
 	},
-/turf/simulated/floor/tiled/techfloor/grid,
+/turf/unsimulated/floor/techfloor_grid/outdoors_tansit,
 /area/redgate/train/overboard)
 "Zj" = (
 /obj/structure/fence/corner{
@@ -3208,7 +3163,7 @@
 /obj/structure/railing/grey{
 	dir = 4
 	},
-/turf/simulated/floor/tiled/techfloor/grid,
+/turf/unsimulated/floor/techfloor_grid/outdoors_tansit,
 /area/redgate/train/overboard)
 "ZK" = (
 /obj/structure/railing{
@@ -3224,7 +3179,7 @@
 	desc = "This is a train in motion. Do not try to stand on the outside of the train. Take caution near railings. Do not attempt to fly from the moving train. Falling is guaranteed death, your body will not be recoverable.";
 	pixel_y = 31
 	},
-/turf/simulated/floor/tiled/techfloor/grid,
+/turf/unsimulated/floor/techfloor_grid/outdoors_tansit,
 /area/redgate/train/overboard)
 "ZO" = (
 /obj/random/mob/semirandom_mob_spawner/vore/retaliate,
@@ -7372,11 +7327,11 @@ Ne
 Ne
 xx
 CZ
-aa
-aa
-aa
-aa
-aa
+uf
+uf
+uf
+uf
+uf
 uf
 ch
 "}
@@ -7424,7 +7379,7 @@ lZ
 lZ
 zV
 Il
-ac
+iG
 me
 FT
 FT
@@ -8224,12 +8179,12 @@ BM
 Ne
 Ru
 CZ
-aa
-aa
-aa
-aa
-aa
-aa
+uf
+uf
+uf
+uf
+uf
+uf
 ch
 "}
 (36,1,1) = {"
@@ -16745,11 +16700,11 @@ CB
 CB
 Mo
 Mo
-aa
-aa
-aa
-aa
-aa
+uf
+uf
+uf
+uf
+uf
 ch
 "}
 (96,1,1) = {"
@@ -16795,7 +16750,7 @@ AX
 yz
 lH
 sj
-ad
+Il
 iG
 cs
 fJ
@@ -17597,11 +17552,11 @@ CB
 CB
 Mo
 Mo
-aa
-aa
-aa
-aa
-aa
+uf
+uf
+uf
+uf
+uf
 ch
 "}
 (102,1,1) = {"
diff --git a/maps/stellar_delight/ship_centcom.dmm b/maps/stellar_delight/ship_centcom.dmm
index 537ca28892..097464cb1c 100644
--- a/maps/stellar_delight/ship_centcom.dmm
+++ b/maps/stellar_delight/ship_centcom.dmm
@@ -11654,18 +11654,8 @@
 	},
 /area/centcom/living)
 "PY" = (
-/obj/machinery/cryopod/robot/door/dorms{
-	base_icon_state = "door_closed";
-	desc = "A small elevator";
-	dir = 2;
-	icon = 'icons/obj/doors/Door2x1glass.dmi';
-	icon_state = "door_closed";
-	name = "elevator";
-	on_enter_occupant_message = "The elevator doors close slowly. You can now head off for the residential, commercial, and other floors.";
-	on_store_message = "has departed for one of the various colony floors";
-	on_store_name = "Colony Oversight";
-	on_store_visible_message_2 = "to the colony districts.";
-	time_till_despawn = 5
+/obj/machinery/cryopod/robot/door/dorms/tether_glass{
+	dir = 2
 	},
 /turf/simulated/floor/tiled,
 /area/centcom/living)
diff --git a/maps/stellar_delight/stellar_delight1.dmm b/maps/stellar_delight/stellar_delight1.dmm
index e2a8ff3d24..192b08aef7 100644
--- a/maps/stellar_delight/stellar_delight1.dmm
+++ b/maps/stellar_delight/stellar_delight1.dmm
@@ -6085,12 +6085,10 @@
 /obj/machinery/computer/med_data/laptop{
 	dir = 4
 	},
-/obj/item/radio{
+/obj/item/radio/phone{
 	anchored = 1;
 	canhear_range = 7;
 	frequency = 1487;
-	icon = 'icons/obj/items.dmi';
-	icon_state = "red_phone";
 	name = "Virology Emergency Phone";
 	pixel_x = 7;
 	pixel_y = 9
diff --git a/maps/submaps/admin_use_vr/dhael_centcom.dmm b/maps/submaps/admin_use_vr/dhael_centcom.dmm
index 7d4768c466..030d2b3e84 100644
--- a/maps/submaps/admin_use_vr/dhael_centcom.dmm
+++ b/maps/submaps/admin_use_vr/dhael_centcom.dmm
@@ -790,25 +790,16 @@
 	name = "hacked Getmore Chocolate Corp";
 	prices = list()
 	},
-/turf/unsimulated/floor/steel{
-	icon = 'icons/turf/floors_vr.dmi';
-	icon_state = "wood"
-	},
+/turf/unsimulated/floor/wood,
 /area/centcom/specops)
 "bL" = (
 /obj/structure/closet/wardrobe/ert,
 /obj/item/modular_computer/laptop/preset/custom_loadout/elite,
-/turf/unsimulated/floor/steel{
-	icon = 'icons/turf/floors_vr.dmi';
-	icon_state = "wood"
-	},
+/turf/unsimulated/floor/wood,
 /area/centcom/specops)
 "bM" = (
 /obj/structure/undies_wardrobe,
-/turf/unsimulated/floor/steel{
-	icon = 'icons/turf/floors_vr.dmi';
-	icon_state = "wood"
-	},
+/turf/unsimulated/floor/wood,
 /area/centcom/specops)
 "bO" = (
 /obj/structure/sign/nanotrasen,
@@ -842,38 +833,26 @@
 	},
 /area/centcom/specops)
 "bS" = (
-/turf/unsimulated/floor/steel{
-	icon = 'icons/turf/floors_vr.dmi';
-	icon_state = "wood"
-	},
+/turf/unsimulated/floor/wood,
 /area/centcom/specops)
 "bU" = (
 /obj/structure/table/reinforced,
 /obj/item/megaphone,
 /obj/item/storage/box/trackimp,
 /obj/item/storage/box/cdeathalarm_kit,
-/turf/unsimulated/floor/steel{
-	icon = 'icons/turf/floors_vr.dmi';
-	icon_state = "wood"
-	},
+/turf/unsimulated/floor/wood,
 /area/centcom/specops)
 "bV" = (
 /obj/structure/table/rack,
 /obj/item/clothing/suit/armor/vest/ert/command,
 /obj/item/clothing/head/helmet/ert/command,
 /obj/item/storage/backpack/ert/commander,
-/turf/unsimulated/floor/steel{
-	icon = 'icons/turf/floors_vr.dmi';
-	icon_state = "wood"
-	},
+/turf/unsimulated/floor/wood,
 /area/centcom/specops)
 "bW" = (
 /obj/structure/table/reinforced,
 /obj/item/storage/secure/briefcase/nsfw_pack_hybrid,
-/turf/unsimulated/floor/steel{
-	icon = 'icons/turf/floors_vr.dmi';
-	icon_state = "wood"
-	},
+/turf/unsimulated/floor/wood,
 /area/centcom/specops)
 "bX" = (
 /obj/structure/sign/redcross{
@@ -896,10 +875,7 @@
 /area/centcom/specops)
 "bZ" = (
 /obj/item/stool/padded,
-/turf/unsimulated/floor/steel{
-	icon = 'icons/turf/floors_vr.dmi';
-	icon_state = "wood"
-	},
+/turf/unsimulated/floor/wood,
 /area/centcom/specops)
 "ca" = (
 /obj/effect/wingrille_spawn/reinforced/crescent,
@@ -910,10 +886,7 @@
 /obj/item/aicard,
 /obj/item/pinpointer/advpinpointer,
 /obj/item/stamp/centcomm,
-/turf/unsimulated/floor/steel{
-	icon = 'icons/turf/floors_vr.dmi';
-	icon_state = "wood"
-	},
+/turf/unsimulated/floor/wood,
 /area/centcom/specops)
 "cc" = (
 /obj/machinery/door/airlock/centcom{
@@ -921,10 +894,7 @@
 	opacity = 1;
 	req_access = list(103)
 	},
-/turf/unsimulated/floor/steel{
-	icon = 'icons/turf/floors_vr.dmi';
-	icon_state = "wood"
-	},
+/turf/unsimulated/floor/wood,
 /area/centcom/specops)
 "cd" = (
 /obj/structure/table/reinforced,
@@ -932,10 +902,7 @@
 /obj/item/ammo_magazine/m44,
 /obj/item/ammo_magazine/m44,
 /obj/item/gun/projectile/deagle,
-/turf/unsimulated/floor/steel{
-	icon = 'icons/turf/floors_vr.dmi';
-	icon_state = "wood"
-	},
+/turf/unsimulated/floor/wood,
 /area/centcom/specops)
 "ce" = (
 /obj/structure/sign/securearea{
@@ -952,10 +919,7 @@
 /obj/item/pda/ert,
 /obj/item/perfect_tele,
 /obj/item/hand_tele,
-/turf/unsimulated/floor/steel{
-	icon = 'icons/turf/floors_vr.dmi';
-	icon_state = "wood"
-	},
+/turf/unsimulated/floor/wood,
 /area/centcom/specops)
 "cg" = (
 /obj/effect/floor_decal/corner/yellow{
@@ -1043,27 +1007,18 @@
 /obj/item/gun/energy/stunrevolver,
 /obj/item/clothing/glasses/sunglasses/sechud/tactical,
 /obj/item/material/knife/tacknife/combatknife,
-/turf/unsimulated/floor/steel{
-	icon = 'icons/turf/floors_vr.dmi';
-	icon_state = "wood"
-	},
+/turf/unsimulated/floor/wood,
 /area/centcom/specops)
 "cn" = (
 /obj/structure/table/rack,
 /obj/item/rig/ert,
 /obj/item/clothing/accessory/storage/black_vest,
-/turf/unsimulated/floor/steel{
-	icon = 'icons/turf/floors_vr.dmi';
-	icon_state = "wood"
-	},
+/turf/unsimulated/floor/wood,
 /area/centcom/specops)
 "co" = (
 /obj/structure/table/reinforced,
 /obj/item/gun/energy/gun/nuclear,
-/turf/unsimulated/floor/steel{
-	icon = 'icons/turf/floors_vr.dmi';
-	icon_state = "wood"
-	},
+/turf/unsimulated/floor/wood,
 /area/centcom/specops)
 "cp" = (
 /obj/machinery/vending/engivend,
@@ -1147,20 +1102,14 @@
 	prices = list();
 	products = list(/obj/item/storage/fancy/cigarettes = 10, /obj/item/storage/box/matches = 10, /obj/item/flame/lighter/zippo = 4, /obj/item/clothing/mask/smokable/cigarette/cigar/havana = 2)
 	},
-/turf/unsimulated/floor/steel{
-	icon = 'icons/turf/floors_vr.dmi';
-	icon_state = "wood"
-	},
+/turf/unsimulated/floor/wood,
 /area/centcom/specops)
 "cv" = (
 /obj/machinery/vending/cola{
 	name = "hacked Robust Softdrinks";
 	prices = list()
 	},
-/turf/unsimulated/floor/steel{
-	icon = 'icons/turf/floors_vr.dmi';
-	icon_state = "wood"
-	},
+/turf/unsimulated/floor/wood,
 /area/centcom/specops)
 "cw" = (
 /obj/machinery/pipedispenser/orderable,
@@ -2956,10 +2905,7 @@
 	},
 /area/centcom/control)
 "fT" = (
-/turf/unsimulated/floor/steel{
-	icon = 'icons/turf/flooring/circuit.dmi';
-	icon_state = "bcircuit"
-	},
+/turf/unsimulated/floor/circuit,
 /area/centcom/control)
 "fU" = (
 /obj/machinery/door/blast/regular{
@@ -10301,18 +10247,8 @@
 /turf/unsimulated/floor/steel,
 /area/centcom/terminal)
 "va" = (
-/obj/machinery/cryopod/robot/door/dorms{
-	base_icon_state = "door_closed";
-	desc = "A small elevator";
-	dir = 2;
-	icon = 'icons/obj/doors/Door2x1glass.dmi';
-	icon_state = "door_closed";
-	name = "elevator";
-	on_enter_occupant_message = "The elevator doors close slowly. You can now head off for the residential, commercial, and other floors.";
-	on_store_message = "has departed for one of the various colony floors";
-	on_store_name = "Colony Oversight";
-	on_store_visible_message_2 = "to the colony districts.";
-	time_till_despawn = 5
+/obj/machinery/cryopod/robot/door/dorms/tether_glass{
+	dir = 2
 	},
 /turf/unsimulated/floor/steel,
 /area/centcom/living)
@@ -10581,55 +10517,34 @@
 /area/centcom/main_hall)
 "vC" = (
 /obj/machinery/vending/cigarette,
-/turf/unsimulated/floor/steel{
-	icon = 'icons/turf/floors_vr.dmi';
-	icon_state = "wood"
-	},
+/turf/unsimulated/floor/wood,
 /area/centcom/restaurant)
 "vD" = (
 /obj/structure/closet/crate/bin,
-/turf/unsimulated/floor/steel{
-	icon = 'icons/turf/floors_vr.dmi';
-	icon_state = "wood"
-	},
+/turf/unsimulated/floor/wood,
 /area/centcom/restaurant)
 "vE" = (
 /obj/machinery/vending/nifsoft_shop,
-/turf/unsimulated/floor/steel{
-	icon = 'icons/turf/floors_vr.dmi';
-	icon_state = "wood"
-	},
+/turf/unsimulated/floor/wood,
 /area/centcom/restaurant)
 "vF" = (
 /obj/structure/sign/double/barsign{
 	dir = 1
 	},
-/turf/unsimulated/floor/steel{
-	icon = 'icons/turf/floors_vr.dmi';
-	icon_state = "wood"
-	},
+/turf/unsimulated/floor/wood,
 /area/centcom/restaurant)
 "vG" = (
-/turf/unsimulated/floor/steel{
-	icon = 'icons/turf/floors_vr.dmi';
-	icon_state = "wood"
-	},
+/turf/unsimulated/floor/wood,
 /area/centcom/restaurant)
 "vH" = (
 /obj/machinery/camera/network/crescent,
-/turf/unsimulated/floor/steel{
-	icon = 'icons/turf/floors_vr.dmi';
-	icon_state = "wood"
-	},
+/turf/unsimulated/floor/wood,
 /area/centcom/restaurant)
 "vI" = (
 /obj/structure/flora/pottedplant{
 	icon_state = "plant-22"
 	},
-/turf/unsimulated/floor/steel{
-	icon = 'icons/turf/floors_vr.dmi';
-	icon_state = "wood"
-	},
+/turf/unsimulated/floor/wood,
 /area/centcom/restaurant)
 "vJ" = (
 /obj/structure/sign/directions/elevator{
@@ -11063,19 +10978,13 @@
 /obj/machinery/newscaster{
 	pixel_y = 30
 	},
-/turf/unsimulated/floor/steel{
-	icon = 'icons/turf/floors_vr.dmi';
-	icon_state = "wood"
-	},
+/turf/unsimulated/floor/wood,
 /area/centcom/restaurant)
 "wp" = (
 /obj/machinery/status_display{
 	pixel_y = 29
 	},
-/turf/unsimulated/floor/steel{
-	icon = 'icons/turf/floors_vr.dmi';
-	icon_state = "wood"
-	},
+/turf/unsimulated/floor/wood,
 /area/centcom/restaurant)
 "wq" = (
 /obj/structure/sink{
@@ -11313,17 +11222,11 @@
 /turf/unsimulated/floor/steel,
 /area/centcom/main_hall)
 "wI" = (
-/turf/unsimulated/floor/steel{
-	icon = 'icons/turf/outdoors.dmi';
-	icon_state = "grass-dark0"
-	},
+/turf/unsimulated/floor/grass,
 /area/centcom/main_hall)
 "wJ" = (
 /obj/structure/table/bench/wooden,
-/turf/unsimulated/floor/steel{
-	icon = 'icons/turf/outdoors.dmi';
-	icon_state = "grass-dark0"
-	},
+/turf/unsimulated/floor/grass,
 /area/centcom/main_hall)
 "wK" = (
 /obj/effect/floor_decal/spline/fancy/wood{
@@ -11333,10 +11236,7 @@
 /area/centcom/main_hall)
 "wL" = (
 /obj/structure/bed/chair/wood/wings,
-/turf/unsimulated/floor/steel{
-	icon = 'icons/turf/floors_vr.dmi';
-	icon_state = "wood"
-	},
+/turf/unsimulated/floor/wood,
 /area/centcom/restaurant)
 "wM" = (
 /obj/machinery/door/airlock{
@@ -11593,17 +11493,11 @@
 /area/centcom/main_hall)
 "xg" = (
 /obj/machinery/light/flamp/noshade,
-/turf/unsimulated/floor/steel{
-	icon = 'icons/turf/outdoors.dmi';
-	icon_state = "grass-dark0"
-	},
+/turf/unsimulated/floor/grass,
 /area/centcom/main_hall)
 "xh" = (
 /obj/structure/flora/ausbushes/brflowers,
-/turf/unsimulated/floor/steel{
-	icon = 'icons/turf/outdoors.dmi';
-	icon_state = "grass-dark0"
-	},
+/turf/unsimulated/floor/grass,
 /area/centcom/main_hall)
 "xi" = (
 /obj/structure/bed/chair{
@@ -11616,18 +11510,12 @@
 	icon_state = "wooden_chair_wings";
 	dir = 4
 	},
-/turf/unsimulated/floor/steel{
-	icon = 'icons/turf/floors_vr.dmi';
-	icon_state = "wood"
-	},
+/turf/unsimulated/floor/wood,
 /area/centcom/restaurant)
 "xk" = (
 /obj/structure/table/woodentable,
 /obj/item/reagent_containers/food/snacks/fries,
-/turf/unsimulated/floor/steel{
-	icon = 'icons/turf/floors_vr.dmi';
-	icon_state = "wood"
-	},
+/turf/unsimulated/floor/wood,
 /area/centcom/restaurant)
 "xl" = (
 /obj/structure/table/woodentable,
@@ -11636,36 +11524,24 @@
 	pixel_y = 3
 	},
 /obj/item/reagent_containers/food/snacks/cheeseburger,
-/turf/unsimulated/floor/steel{
-	icon = 'icons/turf/floors_vr.dmi';
-	icon_state = "wood"
-	},
+/turf/unsimulated/floor/wood,
 /area/centcom/restaurant)
 "xm" = (
 /obj/structure/bed/chair/wood/wings{
 	icon_state = "wooden_chair_wings";
 	dir = 8
 	},
-/turf/unsimulated/floor/steel{
-	icon = 'icons/turf/floors_vr.dmi';
-	icon_state = "wood"
-	},
+/turf/unsimulated/floor/wood,
 /area/centcom/restaurant)
 "xn" = (
 /obj/structure/table/woodentable,
 /obj/item/reagent_containers/food/snacks/grilledcheese,
-/turf/unsimulated/floor/steel{
-	icon = 'icons/turf/floors_vr.dmi';
-	icon_state = "wood"
-	},
+/turf/unsimulated/floor/wood,
 /area/centcom/restaurant)
 "xo" = (
 /obj/structure/table/woodentable,
 /obj/item/reagent_containers/food/snacks/meatballsoup,
-/turf/unsimulated/floor/steel{
-	icon = 'icons/turf/floors_vr.dmi';
-	icon_state = "wood"
-	},
+/turf/unsimulated/floor/wood,
 /area/centcom/restaurant)
 "xp" = (
 /obj/structure/sink{
@@ -11948,10 +11824,7 @@
 /area/centcom/security/arrivals)
 "xI" = (
 /obj/structure/flora/ausbushes/ppflowers,
-/turf/unsimulated/floor/steel{
-	icon = 'icons/turf/outdoors.dmi';
-	icon_state = "grass-dark0"
-	},
+/turf/unsimulated/floor/grass,
 /area/centcom/main_hall)
 "xJ" = (
 /obj/structure/table/woodentable,
@@ -11960,34 +11833,22 @@
 	pixel_x = -5;
 	pixel_y = -3
 	},
-/turf/unsimulated/floor/steel{
-	icon = 'icons/turf/floors_vr.dmi';
-	icon_state = "wood"
-	},
+/turf/unsimulated/floor/wood,
 /area/centcom/restaurant)
 "xK" = (
 /obj/structure/table/woodentable,
 /obj/item/reagent_containers/food/snacks/bigbiteburger,
-/turf/unsimulated/floor/steel{
-	icon = 'icons/turf/floors_vr.dmi';
-	icon_state = "wood"
-	},
+/turf/unsimulated/floor/wood,
 /area/centcom/restaurant)
 "xL" = (
 /obj/structure/table/woodentable,
 /obj/item/reagent_containers/food/snacks/roastbeef,
-/turf/unsimulated/floor/steel{
-	icon = 'icons/turf/floors_vr.dmi';
-	icon_state = "wood"
-	},
+/turf/unsimulated/floor/wood,
 /area/centcom/restaurant)
 "xM" = (
 /obj/structure/table/woodentable,
 /obj/item/reagent_containers/food/snacks/meatsteak,
-/turf/unsimulated/floor/steel{
-	icon = 'icons/turf/floors_vr.dmi';
-	icon_state = "wood"
-	},
+/turf/unsimulated/floor/wood,
 /area/centcom/restaurant)
 "xN" = (
 /obj/effect/floor_decal/borderfloorwhite{
@@ -12127,10 +11988,7 @@
 	icon_state = "wooden_chair_wings";
 	dir = 1
 	},
-/turf/unsimulated/floor/steel{
-	icon = 'icons/turf/floors_vr.dmi';
-	icon_state = "wood"
-	},
+/turf/unsimulated/floor/wood,
 /area/centcom/restaurant)
 "xZ" = (
 /obj/structure/table/woodentable,
@@ -12588,26 +12446,17 @@
 /obj/machinery/camera/network/crescent{
 	dir = 4
 	},
-/turf/unsimulated/floor/steel{
-	icon = 'icons/turf/floors_vr.dmi';
-	icon_state = "wood"
-	},
+/turf/unsimulated/floor/wood,
 /area/centcom/restaurant)
 "yH" = (
 /obj/structure/table/woodentable,
 /obj/item/reagent_containers/food/snacks/pastatomato,
-/turf/unsimulated/floor/steel{
-	icon = 'icons/turf/floors_vr.dmi';
-	icon_state = "wood"
-	},
+/turf/unsimulated/floor/wood,
 /area/centcom/restaurant)
 "yI" = (
 /obj/structure/table/woodentable,
 /obj/item/reagent_containers/food/snacks/meatballspagetti,
-/turf/unsimulated/floor/steel{
-	icon = 'icons/turf/floors_vr.dmi';
-	icon_state = "wood"
-	},
+/turf/unsimulated/floor/wood,
 /area/centcom/restaurant)
 "yJ" = (
 /obj/structure/sign/department/bar,
@@ -12617,10 +12466,7 @@
 /obj/machinery/computer/guestpass{
 	pixel_y = 26
 	},
-/turf/unsimulated/floor/steel{
-	icon = 'icons/turf/floors_vr.dmi';
-	icon_state = "wood"
-	},
+/turf/unsimulated/floor/wood,
 /area/centcom/restaurant)
 "yL" = (
 /obj/structure/table/marble,
@@ -12653,19 +12499,13 @@
 	pixel_x = -4;
 	pixel_y = 12
 	},
-/turf/unsimulated/floor/steel{
-	icon = 'icons/turf/floors_vr.dmi';
-	icon_state = "wood"
-	},
+/turf/unsimulated/floor/wood,
 /area/centcom/restaurant)
 "yM" = (
 /obj/structure/table/marble,
 /obj/machinery/chemical_dispenser/bar_coffee/full,
 /obj/machinery/camera/network/crescent,
-/turf/unsimulated/floor/steel{
-	icon = 'icons/turf/floors_vr.dmi';
-	icon_state = "wood"
-	},
+/turf/unsimulated/floor/wood,
 /area/centcom/restaurant)
 "yN" = (
 /obj/structure/table/marble,
@@ -12693,10 +12533,7 @@
 	pixel_x = -8;
 	pixel_y = 4
 	},
-/turf/unsimulated/floor/steel{
-	icon = 'icons/turf/floors_vr.dmi';
-	icon_state = "wood"
-	},
+/turf/unsimulated/floor/wood,
 /area/centcom/restaurant)
 "yO" = (
 /obj/effect/floor_decal/borderfloorblack{
@@ -12930,33 +12767,21 @@
 /area/centcom/security)
 "ze" = (
 /obj/structure/flora/ausbushes/ywflowers,
-/turf/unsimulated/floor/steel{
-	icon = 'icons/turf/outdoors.dmi';
-	icon_state = "grass-dark0"
-	},
+/turf/unsimulated/floor/grass,
 /area/centcom/main_hall)
 "zf" = (
 /obj/structure/table/woodentable,
 /obj/item/reagent_containers/food/snacks/kitsuneudon,
-/turf/unsimulated/floor/steel{
-	icon = 'icons/turf/floors_vr.dmi';
-	icon_state = "wood"
-	},
+/turf/unsimulated/floor/wood,
 /area/centcom/restaurant)
 "zg" = (
 /obj/structure/table/woodentable,
 /obj/item/reagent_containers/food/snacks/lasagna,
-/turf/unsimulated/floor/steel{
-	icon = 'icons/turf/floors_vr.dmi';
-	icon_state = "wood"
-	},
+/turf/unsimulated/floor/wood,
 /area/centcom/restaurant)
 "zh" = (
 /obj/machinery/door/firedoor,
-/turf/unsimulated/floor/steel{
-	icon = 'icons/turf/floors_vr.dmi';
-	icon_state = "wood"
-	},
+/turf/unsimulated/floor/wood,
 /area/centcom/restaurant)
 "zi" = (
 /obj/effect/floor_decal/borderfloorblack{
@@ -13082,10 +12907,7 @@
 	icon_state = "door_closed";
 	dir = 2
 	},
-/turf/unsimulated/floor/steel{
-	icon = 'icons/turf/floors_vr.dmi';
-	icon_state = "wood"
-	},
+/turf/unsimulated/floor/wood,
 /area/centcom/restaurant)
 "zs" = (
 /obj/machinery/door/firedoor,
@@ -13338,17 +13160,11 @@
 /area/centcom/bar)
 "zL" = (
 /obj/item/stool/padded,
-/turf/unsimulated/floor/steel{
-	icon = 'icons/turf/floors_vr.dmi';
-	icon_state = "wood"
-	},
+/turf/unsimulated/floor/wood,
 /area/centcom/bar)
 "zM" = (
 /obj/structure/table/woodentable,
-/turf/unsimulated/floor/steel{
-	icon = 'icons/turf/floors_vr.dmi';
-	icon_state = "wood"
-	},
+/turf/unsimulated/floor/wood,
 /area/centcom/restaurant)
 "zN" = (
 /obj/machinery/door/airlock,
@@ -13406,49 +13222,31 @@
 "zV" = (
 /obj/structure/table/woodentable,
 /obj/item/reagent_containers/food/drinks/bottle/grenadine,
-/turf/unsimulated/floor/steel{
-	icon = 'icons/turf/floors_vr.dmi';
-	icon_state = "wood"
-	},
+/turf/unsimulated/floor/wood,
 /area/centcom/bar)
 "zW" = (
 /obj/structure/table/woodentable,
 /obj/item/reagent_containers/food/drinks/bottle/cola,
-/turf/unsimulated/floor/steel{
-	icon = 'icons/turf/floors_vr.dmi';
-	icon_state = "wood"
-	},
+/turf/unsimulated/floor/wood,
 /area/centcom/bar)
 "zX" = (
 /obj/structure/table/woodentable,
 /obj/machinery/cash_register/civilian,
-/turf/unsimulated/floor/steel{
-	icon = 'icons/turf/floors_vr.dmi';
-	icon_state = "wood"
-	},
+/turf/unsimulated/floor/wood,
 /area/centcom/bar)
 "zY" = (
 /obj/structure/table/woodentable,
 /obj/item/reagent_containers/food/drinks/bottle/space_mountain_wind,
-/turf/unsimulated/floor/steel{
-	icon = 'icons/turf/floors_vr.dmi';
-	icon_state = "wood"
-	},
+/turf/unsimulated/floor/wood,
 /area/centcom/bar)
 "zZ" = (
 /obj/structure/table/woodentable,
 /obj/item/reagent_containers/food/snacks/toastedsandwich,
-/turf/unsimulated/floor/steel{
-	icon = 'icons/turf/floors_vr.dmi';
-	icon_state = "wood"
-	},
+/turf/unsimulated/floor/wood,
 /area/centcom/bar)
 "Aa" = (
 /obj/structure/table/woodentable,
-/turf/unsimulated/floor/steel{
-	icon = 'icons/turf/floors_vr.dmi';
-	icon_state = "wood"
-	},
+/turf/unsimulated/floor/wood,
 /area/centcom/bar)
 "Ab" = (
 /obj/structure/flora/pottedplant{
@@ -13596,38 +13394,23 @@
 /turf/unsimulated/floor/steel,
 /area/centcom/main_hall)
 "Ap" = (
-/turf/unsimulated/floor/steel{
-	icon = 'icons/turf/floors_vr.dmi';
-	icon_state = "wood"
-	},
+/turf/unsimulated/floor/wood,
 /area/centcom/bar)
 "Aq" = (
 /obj/machinery/vending/coffee,
-/turf/unsimulated/floor/steel{
-	icon = 'icons/turf/floors_vr.dmi';
-	icon_state = "wood"
-	},
+/turf/unsimulated/floor/wood,
 /area/centcom/restaurant)
 "Ar" = (
 /obj/machinery/vending/sovietsoda,
-/turf/unsimulated/floor/steel{
-	icon = 'icons/turf/floors_vr.dmi';
-	icon_state = "wood"
-	},
+/turf/unsimulated/floor/wood,
 /area/centcom/restaurant)
 "As" = (
 /obj/machinery/vending/snack,
-/turf/unsimulated/floor/steel{
-	icon = 'icons/turf/floors_vr.dmi';
-	icon_state = "wood"
-	},
+/turf/unsimulated/floor/wood,
 /area/centcom/restaurant)
 "At" = (
 /obj/machinery/vending/cola,
-/turf/unsimulated/floor/steel{
-	icon = 'icons/turf/floors_vr.dmi';
-	icon_state = "wood"
-	},
+/turf/unsimulated/floor/wood,
 /area/centcom/restaurant)
 "Au" = (
 /obj/machinery/atm{
@@ -13667,43 +13450,28 @@
 /area/centcom/security)
 "Ax" = (
 /obj/machinery/smartfridge/drinks,
-/turf/unsimulated/floor/steel{
-	icon = 'icons/turf/floors_vr.dmi';
-	icon_state = "wood"
-	},
+/turf/unsimulated/floor/wood,
 /area/centcom/bar)
 "Ay" = (
 /obj/machinery/vending/boozeomat,
-/turf/unsimulated/floor/steel{
-	icon = 'icons/turf/floors_vr.dmi';
-	icon_state = "wood"
-	},
+/turf/unsimulated/floor/wood,
 /area/centcom/bar)
 "Az" = (
 /obj/structure/table/reinforced,
 /obj/machinery/chemical_dispenser/bar_soft/full,
-/turf/unsimulated/floor/steel{
-	icon = 'icons/turf/floors_vr.dmi';
-	icon_state = "wood"
-	},
+/turf/unsimulated/floor/wood,
 /area/centcom/bar)
 "AA" = (
 /obj/structure/table/reinforced,
 /obj/machinery/chemical_dispenser/bar_alc/full,
-/turf/unsimulated/floor/steel{
-	icon = 'icons/turf/floors_vr.dmi';
-	icon_state = "wood"
-	},
+/turf/unsimulated/floor/wood,
 /area/centcom/bar)
 "AB" = (
 /obj/structure/table/reinforced,
 /obj/item/reagent_containers/food/drinks/flask/barflask,
 /obj/item/reagent_containers/glass/rag,
 /obj/item/reagent_containers/food/drinks/flask/vacuumflask,
-/turf/unsimulated/floor/steel{
-	icon = 'icons/turf/floors_vr.dmi';
-	icon_state = "wood"
-	},
+/turf/unsimulated/floor/wood,
 /area/centcom/bar)
 "AC" = (
 /obj/machinery/door/firedoor,
diff --git a/maps/submaps/admin_use_vr/dojo.dmm b/maps/submaps/admin_use_vr/dojo.dmm
index 7c6231376f..1b64f70b0f 100644
--- a/maps/submaps/admin_use_vr/dojo.dmm
+++ b/maps/submaps/admin_use_vr/dojo.dmm
@@ -12,20 +12,14 @@
 /turf/simulated/mineral,
 /area/ninja_dojo/dojo)
 "ae" = (
-/turf/unsimulated/floor{
-	dir = 2;
-	icon = 'icons/turf/snow_new.dmi';
-	icon_state = "snow";
-	name = "snow"
+/turf/unsimulated/floor/snow_new{
+	dir = 2
 	},
 /area/ninja_dojo/dojo)
 "af" = (
 /obj/effect/floor_decal/asteroid,
-/turf/unsimulated/floor{
-	dir = 2;
-	icon = 'icons/turf/snow_new.dmi';
-	icon_state = "snow";
-	name = "snow"
+/turf/unsimulated/floor/snow_new{
+	dir = 2
 	},
 /area/ninja_dojo/dojo)
 "ag" = (
@@ -33,10 +27,7 @@
 /area/shuttle/ninja)
 "ah" = (
 /obj/item/target/alien,
-/turf/unsimulated/floor{
-	icon = 'icons/turf/flooring/wood.dmi';
-	icon_state = "wood_broken2"
-	},
+/turf/unsimulated/floor/broken_wood,
 /area/ninja_dojo/dojo)
 "ai" = (
 /turf/unsimulated/floor{
@@ -233,17 +224,13 @@
 	},
 /area/ninja_dojo/dojo)
 "aI" = (
-/obj/machinery/door/airlock{
-	icon = 'icons/obj/doors/Dooruranium.dmi'
-	},
+/obj/machinery/door/airlock/uranium_appearance,
 /turf/unsimulated/floor{
 	icon_state = "dark"
 	},
 /area/ninja_dojo/dojo)
 "aJ" = (
-/obj/machinery/door/airlock{
-	icon = 'icons/obj/doors/Dooruranium.dmi'
-	},
+/obj/machinery/door/airlock/uranium_appearance,
 /turf/unsimulated/floor{
 	icon_state = "plating";
 	name = "plating"
@@ -425,10 +412,7 @@
 /turf/simulated/shuttle/floor/voidcraft/light,
 /area/shuttle/ninja)
 "bb" = (
-/turf/unsimulated/floor{
-	icon = 'icons/turf/flooring/wood.dmi';
-	icon_state = "wood_broken1"
-	},
+/turf/unsimulated/floor/broken_wood/alt,
 /area/ninja_dojo/dojo)
 "bc" = (
 /obj/structure/table/steel_reinforced,
@@ -481,9 +465,7 @@
 /turf/simulated/shuttle/floor/voidcraft/light,
 /area/shuttle/ninja)
 "bj" = (
-/obj/machinery/door/airlock{
-	icon = 'icons/obj/doors/Dooruranium.dmi'
-	},
+/obj/machinery/door/airlock/uranium_appearance,
 /turf/unsimulated/floor{
 	dir = 8;
 	icon_state = "wood"
@@ -548,20 +530,14 @@
 /area/shuttle/ninja)
 "bn" = (
 /obj/structure/flora/tree/pine,
-/turf/unsimulated/floor{
-	dir = 2;
-	icon = 'icons/turf/snow_new.dmi';
-	icon_state = "snow";
-	name = "snow"
+/turf/unsimulated/floor/snow_new{
+	dir = 2
 	},
 /area/ninja_dojo/dojo)
 "bo" = (
 /obj/structure/flora/ausbushes/palebush,
-/turf/unsimulated/floor{
-	dir = 2;
-	icon = 'icons/turf/snow_new.dmi';
-	icon_state = "snow";
-	name = "snow"
+/turf/unsimulated/floor/snow_new{
+	dir = 2
 	},
 /area/ninja_dojo/dojo)
 "bp" = (
@@ -569,11 +545,8 @@
 	dir = 4;
 	health = 1e+006
 	},
-/turf/unsimulated/floor{
-	dir = 2;
-	icon = 'icons/turf/snow_new.dmi';
-	icon_state = "snow";
-	name = "snow"
+/turf/unsimulated/floor/snow_new{
+	dir = 2
 	},
 /area/ninja_dojo/dojo)
 "bq" = (
@@ -602,11 +575,8 @@
 /obj/structure/window/reinforced{
 	dir = 8
 	},
-/turf/unsimulated/floor{
-	dir = 2;
-	icon = 'icons/turf/snow_new.dmi';
-	icon_state = "snow";
-	name = "snow"
+/turf/unsimulated/floor/snow_new{
+	dir = 2
 	},
 /area/ninja_dojo/dojo)
 "bu" = (
@@ -627,11 +597,7 @@
 	},
 /area/ninja_dojo/dojo)
 "bw" = (
-/turf/unsimulated/wall{
-	icon = 'icons/obj/doors/Dooruranium.dmi';
-	icon_state = "door_closed";
-	name = "Sealed Door"
-	},
+/turf/unsimulated/wall/fake_uranium_door,
 /area/ninja_dojo/dojo)
 "bx" = (
 /obj/structure/table/glass,
@@ -779,9 +745,7 @@
 	},
 /area/ninja_dojo/dojo)
 "bN" = (
-/obj/machinery/door/airlock{
-	icon = 'icons/obj/doors/Dooruranium.dmi'
-	},
+/obj/machinery/door/airlock/uranium_appearance,
 /turf/unsimulated/floor{
 	icon_state = "white"
 	},
@@ -915,10 +879,7 @@
 /area/ninja_dojo/dojo)
 "ce" = (
 /obj/machinery/space_heater,
-/turf/unsimulated/floor{
-	icon = 'icons/turf/flooring/wood.dmi';
-	icon_state = "wood_broken3"
-	},
+/turf/unsimulated/floor/broken_wood/alt2,
 /area/ninja_dojo/dojo)
 
 (1,1,1) = {"
diff --git a/maps/submaps/admin_use_vr/skipjack.dmm b/maps/submaps/admin_use_vr/skipjack.dmm
index c097d79d4e..68847b8575 100644
--- a/maps/submaps/admin_use_vr/skipjack.dmm
+++ b/maps/submaps/admin_use_vr/skipjack.dmm
@@ -310,10 +310,7 @@
 "aN" = (
 /obj/structure/bed/padded,
 /obj/item/bedsheet/orange,
-/turf/unsimulated/floor{
-	icon = 'icons/turf/flooring/wood.dmi';
-	icon_state = "wood_broken1"
-	},
+/turf/unsimulated/floor/broken_wood/alt,
 /area/skipjack_station)
 "aO" = (
 /obj/structure/table/standard,
@@ -471,18 +468,10 @@
 	},
 /area/skipjack_station)
 "bh" = (
-/turf/unsimulated/wall{
-	desc = "That looks like it doesn't open easily.";
-	icon = 'icons/obj/doors/rapid_pdoor.dmi';
-	icon_state = "pdoor1";
-	name = "Shuttle Bay Blast Door"
-	},
+/turf/unsimulated/wall/fake_pod,
 /area/skipjack_station)
 "bi" = (
-/turf/unsimulated/floor{
-	icon = 'icons/turf/flooring/wood.dmi';
-	icon_state = "wood_broken3"
-	},
+/turf/unsimulated/floor/broken_wood/alt2,
 /area/skipjack_station)
 "bj" = (
 /obj/effect/floor_decal/carpet{
@@ -526,10 +515,7 @@
 /area/skipjack_station)
 "bo" = (
 /obj/effect/landmark/late_antag/raider,
-/turf/unsimulated/floor{
-	icon = 'icons/turf/flooring/wood.dmi';
-	icon_state = "wood_broken3"
-	},
+/turf/unsimulated/floor/broken_wood/alt2,
 /area/skipjack_station)
 "bp" = (
 /obj/effect/floor_decal/carpet{
diff --git a/maps/submaps/pois_vr/debris_field/old_teleporter.dmm b/maps/submaps/pois_vr/debris_field/old_teleporter.dmm
index 8b6a927894..9a5f8d093c 100644
--- a/maps/submaps/pois_vr/debris_field/old_teleporter.dmm
+++ b/maps/submaps/pois_vr/debris_field/old_teleporter.dmm
@@ -11,14 +11,12 @@
 /area/submap/debrisfield/old_tele)
 "d" = (
 /obj/machinery/teleport/station{
-	icon = 'icons/obj/stationobjs.dmi'
+	icon_state = "controller_old"
 	},
 /turf/simulated/floor/airless,
 /area/submap/debrisfield/old_tele)
 "e" = (
-/obj/machinery/teleport/hub{
-	icon = 'icons/obj/stationobjs.dmi'
-	},
+/obj/machinery/teleport/hub,
 /turf/simulated/floor/airless,
 /area/submap/debrisfield/old_tele)
 "f" = (
diff --git a/maps/submaps/pois_vr/debris_field/ship_mining_drone.dmm b/maps/submaps/pois_vr/debris_field/ship_mining_drone.dmm
index 816fb1b641..81d7ac3a98 100644
--- a/maps/submaps/pois_vr/debris_field/ship_mining_drone.dmm
+++ b/maps/submaps/pois_vr/debris_field/ship_mining_drone.dmm
@@ -42,12 +42,7 @@
 /turf/simulated/floor/airless,
 /area/submap/debrisfield/mining_drone_ship)
 "ah" = (
-/obj/structure/prop{
-	desc = "An array of conventional power storage units, for when the added charge longivity and cost of a SMES unit is unneded or impractical.";
-	icon = 'icons/obj/power.dmi';
-	icon_state = "gridchecker_off";
-	name = "capacitor bank"
-	},
+/obj/structure/prop/grid_checker,
 /obj/structure/cable/yellow{
 	icon_state = "0-4"
 	},
@@ -73,21 +68,11 @@
 /turf/simulated/floor/airless,
 /area/submap/debrisfield/mining_drone_ship)
 "ak" = (
-/obj/structure/prop{
-	desc = "There are a number of what seem to be error messages on these screens, none intelligible.";
-	icon = 'icons/obj/mainframe.dmi';
-	icon_state = "leftb";
-	name = "console"
-	},
+/obj/structure/prop/mainframe,
 /turf/simulated/floor/airless,
 /area/submap/debrisfield/mining_drone_ship)
 "al" = (
-/obj/structure/prop{
-	desc = "This isn't going to be fixable.";
-	icon = 'icons/obj/mainframe.dmi';
-	icon_state = "aimainframeb";
-	name = "broken console"
-	},
+/obj/structure/prop/mainframe/ai,
 /obj/effect/map_effect/interval/effect_emitter/sparks,
 /turf/simulated/floor/airless,
 /area/submap/debrisfield/mining_drone_ship)
@@ -117,13 +102,7 @@
 /turf/simulated/floor/airless,
 /area/submap/debrisfield/mining_drone_ship)
 "ar" = (
-/obj/machinery/power/rtg/fake_gen{
-	desc = "An array of conventional power storage units, for when the added charge longivity and cost of a SMES unit is unneded or impractical.";
-	icon = 'icons/obj/power.dmi';
-	icon_state = "gridchecker_off";
-	name = "capacitor bank";
-	power_gen = 12000
-	},
+/obj/machinery/power/rtg/fake_gen/grid,
 /obj/structure/cable/yellow{
 	icon_state = "0-4"
 	},
@@ -439,16 +418,8 @@
 "aQ" = (
 /obj/item/ore/gold,
 /obj/item/ore/iron,
-/obj/structure/mob_spawner{
-	density = 1;
-	desc = "A bizarre mess of robotic limbs, glowing microrefineries, and nanoassemblers gradually converting the pile of raw materials into active hivebots.";
-	destructible = 1;
-	icon = 'icons/obj/recycling.dmi';
-	icon_state = "grinder-b1";
-	name = "hivebot assembler";
-	simultaneous_spawns = 6;
-	spawn_delay = 300;
-	spawn_types = list(/mob/living/simple_mob/mechanical/hivebot/swarm = 200, /mob/living/simple_mob/mechanical/hivebot/ranged_damage/basic = 50, /mob/living/simple_mob/mechanical/hivebot/ranged_damage/laser = 25, /mob/living/simple_mob/mechanical/hivebot/ranged_damage/ion = 10, /mob/living/simple_mob/mechanical/hivebot/tank/meatshield = 10)
+/obj/structure/mob_spawner/recycler{
+	density = 1    
 	},
 /turf/simulated/floor/airless,
 /area/submap/debrisfield/mining_drone_ship)
@@ -541,12 +512,7 @@
 /turf/space,
 /area/submap/debrisfield/mining_drone_ship)
 "ba" = (
-/obj/structure/prop{
-	desc = "An array of conventional power storage units, for when the added charge longivity and cost of a SMES unit is unneded or impractical.";
-	icon = 'icons/obj/power.dmi';
-	icon_state = "gridchecker_off";
-	name = "capacitor bank"
-	},
+/obj/structure/prop/gridchecker,
 /obj/structure/cable/yellow{
 	icon_state = "0-4"
 	},
diff --git a/maps/submaps/pois_vr/debris_field/tinycarrier.dmm b/maps/submaps/pois_vr/debris_field/tinycarrier.dmm
index caffa2b3cc..7bbcb2f777 100644
--- a/maps/submaps/pois_vr/debris_field/tinycarrier.dmm
+++ b/maps/submaps/pois_vr/debris_field/tinycarrier.dmm
@@ -377,12 +377,8 @@
 /turf/simulated/floor/tiled,
 /area/submap/debrisfield/tinyshuttle/crew)
 "aN" = (
-/obj/structure/prop{
-	desc = "A man-sized pod for entering suspended animation. This one is room temperature.";
-	dir = 8;
-	icon = 'icons/obj/Cryogenic2_vr.dmi';
-	icon_state = "cryopod_0";
-	name = "cryogenic freezer"
+/obj/structure/prop/cryopod{
+	dir = 8
 	},
 /obj/effect/floor_decal/corner/brown/full{
 	dir = 1
@@ -1094,11 +1090,9 @@
 /turf/simulated/shuttle/plating/airless/carry,
 /area/submap/debrisfield/tinyshuttle/hangar)
 "cd" = (
-/obj/structure/loot_pile/surface/drone{
+/obj/structure/loot_pile/surface/drone/large{
 	density = 1;
 	dir = 8;
-	icon = 'icons/mob/animal_vr64x64.dmi';
-	icon_state = "drone";
 	pixel_x = -16;
 	pixel_y = -16
 	},
@@ -1157,12 +1151,8 @@
 /turf/simulated/floor/tiled,
 /area/submap/debrisfield/tinyshuttle/crew)
 "ck" = (
-/obj/structure/prop{
-	desc = "A man-sized pod for entering suspended animation. This one is room temperature.";
-	dir = 8;
-	icon = 'icons/obj/Cryogenic2_vr.dmi';
-	icon_state = "cryopod_0";
-	name = "cryogenic freezer"
+/obj/structure/prop/cryopod{
+	dir = 8
 	},
 /obj/effect/floor_decal/corner/brown/full{
 	dir = 4
diff --git a/maps/submaps/surface_submaps/plains/drgnplateu.dmm b/maps/submaps/surface_submaps/plains/drgnplateu.dmm
index feb8686d44..864c1488bc 100644
--- a/maps/submaps/surface_submaps/plains/drgnplateu.dmm
+++ b/maps/submaps/surface_submaps/plains/drgnplateu.dmm
@@ -348,12 +348,8 @@
 /area/template_noop)
 "We" = (
 /obj/effect/decal/remains,
-/obj/effect/decal/cleanable/blood/tracks{
-	color = "red";
-	desc = "Your instincts say you shouldn't be following these.";
-	dir = 4;
-	icon = 'icons/effects/blood.dmi';
-	icon_state = "tracks"
+/obj/effect/decal/cleanable/blood/tracks/suspicious{
+	dir = 4
 	},
 /turf/simulated/floor/outdoors/dirt/virgo3b,
 /area/submap/drgnplateu)
diff --git a/maps/submaps/surface_submaps/plains/methlab.dmm b/maps/submaps/surface_submaps/plains/methlab.dmm
index f7358ef69c..e4330bc2ab 100644
--- a/maps/submaps/surface_submaps/plains/methlab.dmm
+++ b/maps/submaps/surface_submaps/plains/methlab.dmm
@@ -46,12 +46,10 @@
 /area/submap/methlab)
 "cg" = (
 /obj/structure/table/steel_reinforced,
-/obj/item/radio{
+/obj/item/radio/phone{
 	anchored = 1;
 	canhear_range = 1;
 	frequency = 1487;
-	icon = 'icons/obj/items.dmi';
-	icon_state = "red_phone";
 	name = "Reception Emergency Phone"
 	},
 /turf/simulated/floor/tiled/steel_dirty,
diff --git a/maps/submaps/surface_submaps/plains/otieshelter.dmm b/maps/submaps/surface_submaps/plains/otieshelter.dmm
index b55e1a73d4..117c9064cd 100644
--- a/maps/submaps/surface_submaps/plains/otieshelter.dmm
+++ b/maps/submaps/surface_submaps/plains/otieshelter.dmm
@@ -121,12 +121,8 @@
 /obj/item/material/shard{
 	icon_state = "medium"
 	},
-/obj/effect/decal/cleanable/blood/tracks{
-	color = "red";
-	desc = "Your instincts say you shouldn't be following these.";
-	dir = 4;
-	icon = 'icons/effects/blood.dmi';
-	icon_state = "tracks"
+/obj/effect/decal/cleanable/blood/tracks/suspicious{
+	dir = 4
 	},
 /turf/simulated/floor/tiled/virgo3b,
 /area/submap/OtieShelter)
@@ -373,12 +369,8 @@
 /area/submap/OtieShelter)
 "BM" = (
 /obj/item/melee/baton/cattleprod,
-/obj/effect/decal/cleanable/blood/tracks{
-	color = "red";
-	desc = "Your instincts say you shouldn't be following these.";
-	dir = 4;
-	icon = 'icons/effects/blood.dmi';
-	icon_state = "tracks"
+/obj/effect/decal/cleanable/blood/tracks/suspicious{
+	dir = 4
 	},
 /obj/effect/decal/cleanable/filth,
 /obj/effect/floor_decal/industrial/warning{
diff --git a/maps/submaps/surface_submaps/wilderness/derelictengine.dmm b/maps/submaps/surface_submaps/wilderness/derelictengine.dmm
index 3f35b81a0d..0caac5b6a6 100644
--- a/maps/submaps/surface_submaps/wilderness/derelictengine.dmm
+++ b/maps/submaps/surface_submaps/wilderness/derelictengine.dmm
@@ -2309,13 +2309,7 @@
 /obj/structure/cable{
 	icon_state = "0-8"
 	},
-/obj/machinery/power/smes/buildable{
-	icon = 'icons/obj/alien_smes.dmi';
-	icon_state = "unit";
-	input_level = 950000;
-	name = "Alien Royal Capacitor";
-	output_level = 950000
-	},
+/obj/machinery/power/smes/buildable/alien_royal,
 /turf/simulated/floor/tiled/techfloor,
 /area/submap/DerelictEngine)
 "Ro" = (
diff --git a/maps/submaps/surface_submaps/wilderness/drgnplateu.dmm b/maps/submaps/surface_submaps/wilderness/drgnplateu.dmm
index 7043f0230e..60986e6bcc 100644
--- a/maps/submaps/surface_submaps/wilderness/drgnplateu.dmm
+++ b/maps/submaps/surface_submaps/wilderness/drgnplateu.dmm
@@ -348,12 +348,8 @@
 /area/template_noop)
 "We" = (
 /obj/effect/decal/remains,
-/obj/effect/decal/cleanable/blood/tracks{
-	color = "red";
-	desc = "Your instincts say you shouldn't be following these.";
-	dir = 4;
-	icon = 'icons/effects/blood.dmi';
-	icon_state = "tracks"
+/obj/effect/decal/cleanable/blood/tracks/suspicious{
+	dir = 4
 	},
 /turf/simulated/floor/outdoors/dirt,
 /area/submap/drgnplateu)
diff --git a/maps/submaps/surface_submaps/wilderness/otieshelter.dmm b/maps/submaps/surface_submaps/wilderness/otieshelter.dmm
index bfe26b77fb..b63fb186eb 100644
--- a/maps/submaps/surface_submaps/wilderness/otieshelter.dmm
+++ b/maps/submaps/surface_submaps/wilderness/otieshelter.dmm
@@ -121,12 +121,8 @@
 /obj/item/material/shard{
 	icon_state = "medium"
 	},
-/obj/effect/decal/cleanable/blood/tracks{
-	color = "red";
-	desc = "Your instincts say you shouldn't be following these.";
-	dir = 4;
-	icon = 'icons/effects/blood.dmi';
-	icon_state = "tracks"
+/obj/effect/decal/cleanable/blood/tracks/suspicious{
+	dir = 4
 	},
 /turf/simulated/floor/tiled,
 /area/submap/OtieShelter)
@@ -360,12 +356,8 @@
 /area/submap/OtieShelter)
 "BM" = (
 /obj/item/melee/baton/cattleprod,
-/obj/effect/decal/cleanable/blood/tracks{
-	color = "red";
-	desc = "Your instincts say you shouldn't be following these.";
-	dir = 4;
-	icon = 'icons/effects/blood.dmi';
-	icon_state = "tracks"
+/obj/effect/decal/cleanable/blood/tracks/suspicious{
+	dir = 4
 	},
 /obj/effect/decal/cleanable/filth,
 /obj/effect/floor_decal/industrial/warning{
diff --git a/maps/tether/submaps/tether_centcom.dmm b/maps/tether/submaps/tether_centcom.dmm
index 540b2ff064..74457dadf0 100644
--- a/maps/tether/submaps/tether_centcom.dmm
+++ b/maps/tether/submaps/tether_centcom.dmm
@@ -11699,18 +11699,8 @@
 	},
 /area/centcom/living)
 "PY" = (
-/obj/machinery/cryopod/robot/door/dorms{
-	base_icon_state = "door_closed";
-	desc = "A small elevator";
-	dir = 2;
-	icon = 'icons/obj/doors/Door2x1glass.dmi';
-	icon_state = "door_closed";
-	name = "elevator";
-	on_enter_occupant_message = "The elevator doors close slowly. You can now head off for the residential, commercial, and other floors.";
-	on_store_message = "has departed for one of the various colony floors";
-	on_store_name = "Colony Oversight";
-	on_store_visible_message_2 = "to the colony districts.";
-	time_till_despawn = 5
+/obj/machinery/cryopod/robot/door/dorms/tether_glass{
+	dir = 2
 	},
 /turf/simulated/floor/tiled,
 /area/centcom/living)
diff --git a/maps/tether/submaps/tether_misc.dmm b/maps/tether/submaps/tether_misc.dmm
index 0790a0e3d8..b99187f567 100644
--- a/maps/tether/submaps/tether_misc.dmm
+++ b/maps/tether/submaps/tether_misc.dmm
@@ -735,9 +735,7 @@
 /turf/simulated/shuttle/floor/alien,
 /area/unknown/dorm3)
 "cq" = (
-/turf/simulated/floor/maglev{
-	icon = 'icons/turf/transit_vr.dmi'
-	},
+/turf/simulated/floor/maglev/moving,
 /area/space)
 "cr" = (
 /turf/simulated/shuttle/wall/alien/blue/hard_corner,
@@ -985,9 +983,7 @@
 /turf/simulated/shuttle/floor/alien,
 /area/unknown/dorm6)
 "dg" = (
-/turf/unsimulated/wall{
-	icon = 'icons/turf/transit_vr.dmi'
-	},
+/turf/unsimulated/wall/moving,
 /area/space)
 "dh" = (
 /obj/effect/floor_decal/industrial/warning{
@@ -2494,9 +2490,7 @@
 	stopper = 0;
 	tiles = 0
 	},
-/turf/simulated/floor/maglev{
-	icon = 'icons/turf/transit_vr.dmi'
-	},
+/turf/simulated/floor/maglev/moving,
 /area/space)
 "vW" = (
 /obj/effect/floor_decal/sign/small_a,
@@ -2538,9 +2532,7 @@
 /area/space)
 "yk" = (
 /obj/effect/step_trigger/lost_in_space/tram,
-/turf/simulated/floor/maglev{
-	icon = 'icons/turf/transit_vr.dmi'
-	},
+/turf/simulated/floor/maglev/moving,
 /area/space)
 "yr" = (
 /obj/effect/floor_decal/carpet{
@@ -2592,10 +2584,7 @@
 /obj/effect/transit/light{
 	dir = 8
 	},
-/turf/unsimulated/mineral{
-	icon = 'icons/turf/transit_vr.dmi';
-	icon_state = "rock"
-	},
+/turf/unsimulated/mineral/moving,
 /area/space)
 "Ax" = (
 /turf/unsimulated/beach/coastline{
@@ -2681,10 +2670,7 @@
 /obj/effect/transit/light{
 	dir = 4
 	},
-/turf/unsimulated/mineral{
-	icon = 'icons/turf/transit_vr.dmi';
-	icon_state = "rock"
-	},
+/turf/unsimulated/mineral/moving,
 /area/space)
 "FH" = (
 /obj/structure/bed/chair,
@@ -2751,10 +2737,7 @@
 /turf/simulated/floor/holofloor/bmarble,
 /area/holodeck/source_chess)
 "Hy" = (
-/turf/unsimulated/mineral{
-	icon = 'icons/turf/transit_vr.dmi';
-	icon_state = "rock"
-	},
+/turf/unsimulated/mineral/moving,
 /area/space)
 "HL" = (
 /obj/effect/floor_decal/sign/small_1,
diff --git a/maps/tether/tether-01-surface1.dmm b/maps/tether/tether-01-surface1.dmm
index fe27b9b5e6..9ea9fbd7fb 100644
--- a/maps/tether/tether-01-surface1.dmm
+++ b/maps/tether/tether-01-surface1.dmm
@@ -3325,12 +3325,10 @@
 /area/rnd/hardstorage)
 "afB" = (
 /obj/structure/table/glass,
-/obj/item/radio{
+/obj/item/radio/phone{
 	anchored = 1;
 	canhear_range = 7;
 	frequency = 1487;
-	icon = 'icons/obj/items.dmi';
-	icon_state = "red_phone";
 	name = "Virology Emergency Phone";
 	pixel_x = -4;
 	pixel_y = 4
diff --git a/modular_chomp/code/game/objects/map_bs.dm b/modular_chomp/code/game/objects/map_bs.dm
new file mode 100644
index 0000000000..6e6825685a
--- /dev/null
+++ b/modular_chomp/code/game/objects/map_bs.dm
@@ -0,0 +1,205 @@
+///This file contains various objects used on maps that were illegally doing icon = 'xxx' as a mapedit.
+///This is bad practice and this file exists to replace those objects with proper icon_states instead. (Thanks copilot)
+
+/obj/machinery/smartfridge/survival_pod/scifridge
+	icon = 'icons/obj/vending.dmi'
+	icon_base = "fridge_sci"
+	icon_contents = "chem"
+	icon_state = "fridge_sci"
+	name = "Advanced storage"
+
+/obj/machinery/smartfridge/survival_pod/abductor
+	desc = "A mysterious machine which can fabricate many tools for acquiring test subjects."
+	dir = 4
+	icon = 'icons/obj/abductor.dmi';
+	icon_base = "dispenser_2way"
+	icon_state = "dispenser_2way"
+	name = "Implant-Co"
+
+/obj/machinery/smartfridge/survival_pod/boxes
+	icon = 'icons/obj/vending.dmi';
+	icon_base = "smartfridge"
+	icon_contents = "boxes"
+	icon_state = "smartfridge"
+	name = "Advanced storage"
+
+/obj/machinery/smartfridge/survival_pod/dispenser1
+	desc = "A mysterious machine which can fabricate many tools for acquiring test subjects."
+	icon = 'icons/obj/abductor.dmi'
+	icon_state = "dispenser"
+	name = "Drug-Dispenser"
+	req_access = list(777)
+
+/obj/machinery/smartfridge/survival_pod/dispenser1/garmentier
+	name = "Garmentier"
+
+/obj/effect/simple_portal/linked/weird_dark
+	icon = 'icons/turf/flooring/weird_vr.dmi'
+	icon_state = "dark"
+	light_on = 0
+	portal_id = 6690
+
+/obj/effect/simple_portal/coords/offcenter
+	density = 0
+	icon = 'icons/obj/machines/gateway_vr.dmi'
+	icon_state = "offcenter"
+
+/obj/effect/simple_portal/coords/old_sprite
+	icon = 'icons/obj/machines/gateway.dmi'
+	icon_state = "oncenter"
+	density = 0
+
+/obj/effect/simple_portal/coords/gateway_on
+	icon = 'icons/obj/machines/gateway.dmi'
+	icon_state = "on"
+
+/obj/effect/simple_portal/linked/gateway
+	icon = 'icons/obj/machines/gateway.dmi'
+	icon_state = "oncenter"
+
+/turf/simulated/shuttle/wall/no_join/orange
+	base_state = "orange"
+	icon = 'icons/turf/shuttle_orange.dmi'
+	icon_state = "orange"
+
+/turf/unsimulated/wall/concrete/turfpack/station/yellow
+	color = "#ebcd7c"
+	icon = 'icons/turf/wall_masks.dmi'
+
+/obj/item/gun/energy/laser/experimental_shit
+	icon = 'icons/obj/gun.dmi'
+	icon_state = "pulse"
+	name = "Expirmental Pulse Rifle"
+	firemodes = list(list("mode_name" = "normal", "fire_delay" = 8, "projectile_type" = /obj/item/projectile/beam/midlaser, "charge_cost" = 120),list("mode_name" = "suppressive", "fire_delay" = 5, "projectile_type" = /obj/item/projectile/beam/weaklaser, "charge_cost" = 30))
+
+/obj/item/radio/redphone
+	name = "Red Phone"
+	icon = 'icons/obj/items.dmi'
+	icon_state = "red_phone"
+	frequency = 1487
+
+/obj/machinery/portable_atmospherics/powered/scrubber/huge/stationary/fluff_fan
+	desc = "A large machine releasing a constant gust of air."
+	icon = 'icons/obj/survival_pod.dmi'
+	icon_state = "fans"
+	name = "enviornmental regulation system"
+
+/obj/machinery/computer/crew/abductor
+	icon = 'icons/obj/abductor.dmi'
+	icon_screen = null
+	icon_state = "console-c"
+
+/obj/machinery/cryopod/robot/borg_pod
+	base_icon_state = "borg_pod_closed"
+	icon = 'icons/obj/structures.dmi'
+	icon_state = "borg_pod_closed"
+	occupied_icon_state = "borg_pod_opened"
+
+/mob/living/simple_mob/vore/alienanimals/startreader/cutout
+	icon_living = "cutout_basic"
+	icon_dead = "cutout_basic"
+	icon_state = "cutout_basic"
+	icon = 'icons/obj/cardboard_cutout.dmi'
+	name = "stand-up figure?"
+
+/turf/simulated/wall/dungeon/gate
+	icon = 'icons/obj/doors/shuttledoors.dmi'
+	icon_state = "door_locked"
+	name = "Wall Gate"
+
+/obj/structure/showcase/AI
+	desc = "So that's how the shuttle moves on its own."
+	icon = 'icons/mob/AI.dmi'
+	icon_state = "ai-red"
+	name = "Arrivals Announcement Computer"
+
+/obj/structure/showcase/hos
+	desc = "It looks almost lifelike."
+	icon = 'icons/obj/statue.dmi'
+	icon_state = "hos"
+	name = "Statue"
+
+/obj/effect/floor_decal/sign/small_8/decal
+	icon = 'icons/turf/flooring/decals.dmi'
+
+/obj/effect/floor_decal/sign/small_7/decal
+	icon = 'icons/turf/flooring/decals.dmi'
+
+/obj/effect/floor_decal/sign/small_6/decal
+	icon = 'icons/turf/flooring/decals.dmi'
+
+/obj/effect/floor_decal/sign/small_5/decal
+	icon = 'icons/turf/flooring/decals.dmi'
+
+/obj/effect/floor_decal/sign/small_4/decal
+	icon = 'icons/turf/flooring/decals.dmi'
+
+/obj/effect/floor_decal/sign/small_3/decal
+	icon = 'icons/turf/flooring/decals.dmi'
+
+/obj/effect/floor_decal/sign/small_2/decal
+	icon = 'icons/turf/flooring/decals.dmi'
+
+/obj/effect/floor_decal/sign/small_1/decal
+	icon = 'icons/turf/flooring/decals.dmi'
+
+/obj/effect/floor_decal/sign/small_a/decal
+	icon = 'icons/turf/flooring/decals.dmi'
+
+/obj/effect/floor_decal/sign/small_b/decal
+	icon = 'icons/turf/flooring/decals.dmi'
+
+/obj/effect/floor_decal/sign/small_c/decal
+	icon = 'icons/turf/flooring/decals.dmi'
+
+/obj/effect/floor_decal/sign/small_d/decal
+	icon = 'icons/turf/flooring/decals.dmi'
+
+/obj/effect/floor_decal/sign/small_e/decal
+	icon = 'icons/turf/flooring/decals.dmi'
+
+/obj/effect/floor_decal/sign/small_f/decal
+	icon = 'icons/turf/flooring/decals.dmi'
+
+/obj/effect/floor_decal/sign/small_g/decal
+	icon = 'icons/turf/flooring/decals.dmi'
+
+/obj/effect/floor_decal/sign/small_h/decal
+	icon = 'icons/turf/flooring/decals.dmi'
+
+/turf/unsimulated/floor/snow_new
+	icon = 'icons/turf/snow_new.dmi'
+	icon_state = "snow"
+	name = "snow"
+
+/turf/unsimulated/wall/shuttle_bay
+	desc = "That looks like it doesn't open easily."
+	icon = 'icons/obj/doors/rapid_pdoor.dmi'
+	icon_state = "pdoor1"
+	name = "Shuttle Bay Blast Door"
+
+/turf/unsimulated/wall/door_maint
+	icon = 'icons/obj/doors/Doormaint.dmi'
+	icon_state = "door_closed"
+	name = "Sealed Door"
+
+/turf/unsimulated/floor/wood
+	icon = 'icons/turf/flooring/wood.dmi'
+
+/turf/unsimulated/wall/fake_dark
+	desc = "It's a strange, impenetrable darkness."
+	icon = 'icons/turf/flooring/weird_vr.dmi'
+	icon_state = "dark"
+	name = "dark"
+
+/turf/unsimulated/wall/fake_uranium
+	icon = 'icons/obj/doors/Dooruranium.dmi'
+	icon_state = "door_closed"
+	name = "Sealed Door"
+
+/turf/simulated/floor/tiled/techfloor/grid/train
+	base_name = "maglev rails"
+	desc = "Train go brrrr."
+	icon = 'icons/turf/flooring/maglevs.dmi'
+	icon_state = "maglevup"
+	name = "maglev rails"
diff --git a/modular_chomp/maps/common_submaps/gateway/BaseBlep.dmm b/modular_chomp/maps/common_submaps/gateway/BaseBlep.dmm
index fe790bd2b0..ab666d20f5 100644
--- a/modular_chomp/maps/common_submaps/gateway/BaseBlep.dmm
+++ b/modular_chomp/maps/common_submaps/gateway/BaseBlep.dmm
@@ -572,18 +572,8 @@
 /obj/item/gun/energy/monorifle/combat,
 /obj/item/gun/energy/hooklauncher,
 /obj/item/gun/energy/hooklauncher,
-/obj/item/gun/energy/laser{
-	icon = 'icons/obj/gun.dmi';
-	icon_state = "pulse";
-	name = "Expirmental Pulse Rifle";
-	firemodes = list(list("mode_name" = "normal", "fire_delay" = 8, "projectile_type" = /obj/item/projectile/beam/midlaser, "charge_cost" = 120),list("mode_name" = "suppressive", "fire_delay" = 5, "projectile_type" = /obj/item/projectile/beam/weaklaser, "charge_cost" = 30))
-	},
-/obj/item/gun/energy/laser{
-	icon = 'icons/obj/gun.dmi';
-	icon_state = "pulse";
-	name = "Expirmental Pulse Rifle";
-	firemodes = list(list("mode_name" = "normal", "fire_delay" = 8, "projectile_type" = /obj/item/projectile/beam/midlaser, "charge_cost" = 120),list("mode_name" = "suppressive", "fire_delay" = 5, "projectile_type" = /obj/item/projectile/beam/weaklaser, "charge_cost" = 30))
-	},
+/obj/item/gun/energy/laser/experimental_shit,
+/obj/item/gun/energy/laser/experimental_shit,
 /turf/simulated/shuttle/floor/darkred,
 /area/awaymission/baseblep/hivebotsphere)
 "yu" = (
diff --git a/modular_chomp/maps/common_submaps/gateway/darkrps.dmm b/modular_chomp/maps/common_submaps/gateway/darkrps.dmm
index 0b19d2bf3f..25b6b1c273 100644
--- a/modular_chomp/maps/common_submaps/gateway/darkrps.dmm
+++ b/modular_chomp/maps/common_submaps/gateway/darkrps.dmm
@@ -238,12 +238,8 @@
 /obj/effect/floor_decal/corner/grey/diagonal{
 	dir = 4
 	},
-/obj/effect/decal/cleanable/blood/tracks{
-	color = "red";
-	desc = "Your instincts say you shouldn't be following these.";
-	dir = 4;
-	icon = 'icons/effects/blood.dmi';
-	icon_state = "tracks"
+/obj/effect/decal/cleanable/blood/tracks/suspicious{
+	dir = 4
 	},
 /turf/simulated/floor/tiled/white,
 /area/awaymission/darkrp/ghettoeats)
@@ -484,12 +480,8 @@
 /obj/effect/floor_decal/corner/grey/diagonal{
 	dir = 4
 	},
-/obj/effect/decal/cleanable/blood/tracks{
-	color = "red";
-	desc = "Your instincts say you shouldn't be following these.";
-	dir = 4;
-	icon = 'icons/effects/blood.dmi';
-	icon_state = "tracks"
+/obj/effect/decal/cleanable/blood/tracks/suspicious{
+	dir = 4
 	},
 /turf/simulated/floor/tiled/white,
 /area/awaymission/darkrp/ghettoeats)
@@ -1498,12 +1490,7 @@
 	},
 /area/awaymission/darkrp/subcondo)
 "bZr" = (
-/obj/effect/decal/cleanable/blood/tracks{
-	color = "red";
-	desc = "Your instincts say you shouldn't be following these.";
-	icon = 'icons/effects/blood.dmi';
-	icon_state = "tracks"
-	},
+/obj/effect/decal/cleanable/blood/tracks/suspicious,
 /turf/simulated/floor/wmarble,
 /area/awaymission/darkrp/plazahotel)
 "caf" = (
@@ -5731,12 +5718,8 @@
 	},
 /area/awaymission/darkrp/outside)
 "hDU" = (
-/obj/effect/decal/cleanable/blood/tracks{
-	color = "red";
-	desc = "Your instincts say you shouldn't be following these.";
-	dir = 5;
-	icon = 'icons/effects/blood.dmi';
-	icon_state = "tracks"
+/obj/effect/decal/cleanable/blood/tracks/suspicious{
+	dir = 5
 	},
 /turf/simulated/floor/carpet/blue,
 /area/awaymission/darkrp/plazahotel)
@@ -7553,12 +7536,8 @@
 /turf/simulated/floor/tiled,
 /area/awaymission/darkrp/plazawarehouse)
 "kcj" = (
-/obj/effect/decal/cleanable/blood/tracks{
-	color = "red";
-	desc = "Your instincts say you shouldn't be following these.";
-	dir = 4;
-	icon = 'icons/effects/blood.dmi';
-	icon_state = "tracks"
+/obj/effect/decal/cleanable/blood/tracks/suspicious{
+	dir = 4
 	},
 /turf/simulated/floor/outdoors/newdirt{
 	temperature = 293.15
@@ -8818,12 +8797,8 @@
 /area/awaymission/darkrp/downtownempty)
 "lKP" = (
 /obj/structure/simple_door/wood,
-/obj/effect/decal/cleanable/blood/tracks{
-	color = "red";
-	desc = "Your instincts say you shouldn't be following these.";
-	dir = 4;
-	icon = 'icons/effects/blood.dmi';
-	icon_state = "tracks"
+/obj/effect/decal/cleanable/blood/tracks/suspicious{
+	dir = 4
 	},
 /turf/simulated/floor/carpet/blue,
 /area/awaymission/darkrp/plazahotel)
@@ -9828,12 +9803,8 @@
 	dir = 4;
 	pixel_x = -13
 	},
-/obj/effect/decal/cleanable/blood/tracks{
-	color = "red";
-	desc = "Your instincts say you shouldn't be following these.";
-	dir = 10;
-	icon = 'icons/effects/blood.dmi';
-	icon_state = "tracks"
+/obj/effect/decal/cleanable/blood/tracks/suspicious{
+	dir = 10
 	},
 /turf/simulated/floor/tiled/white,
 /area/awaymission/darkrp/ghettoeats)
@@ -10832,12 +10803,8 @@
 	dir = 4
 	},
 /obj/item/material/knife/butch,
-/obj/effect/decal/cleanable/blood/tracks{
-	color = "red";
-	desc = "Your instincts say you shouldn't be following these.";
-	dir = 5;
-	icon = 'icons/effects/blood.dmi';
-	icon_state = "tracks"
+/obj/effect/decal/cleanable/blood/tracks/suspicious{
+	dir = 5
 	},
 /turf/simulated/floor/tiled/white,
 /area/awaymission/darkrp/ghettoeats)
@@ -17289,12 +17256,8 @@
 /turf/simulated/floor/tiled,
 /area/awaymission/darkrp/ghettohouse2)
 "wcv" = (
-/obj/effect/decal/cleanable/blood/tracks{
-	color = "red";
-	desc = "Your instincts say you shouldn't be following these.";
-	dir = 9;
-	icon = 'icons/effects/blood.dmi';
-	icon_state = "tracks"
+/obj/effect/decal/cleanable/blood/tracks/suspicious{
+	dir = 9
 	},
 /turf/simulated/floor/wmarble,
 /area/awaymission/darkrp/plazahotel)
diff --git a/modular_chomp/maps/common_submaps/gateway/diescraper.dmm b/modular_chomp/maps/common_submaps/gateway/diescraper.dmm
index 566a6b5107..09c7fecc6e 100644
--- a/modular_chomp/maps/common_submaps/gateway/diescraper.dmm
+++ b/modular_chomp/maps/common_submaps/gateway/diescraper.dmm
@@ -1198,9 +1198,7 @@
 /turf/simulated/floor/bmarble,
 /area/awaymission/diescraper/indoors/floor1)
 "dG" = (
-/obj/effect/simple_portal/coords{
-	icon = 'icons/obj/machines/gateway.dmi';
-	icon_state = "on";
+/obj/effect/simple_portal/coords/gateway_on{
 	dir = 4
 	},
 /turf/simulated/floor/tiled/milspec/raised,
@@ -1907,17 +1905,11 @@
 /turf/simulated/floor/plating,
 /area/awaymission/diescraper/indoors/floor6)
 "fP" = (
-/obj/effect/simple_portal/linked{
-	portal_id = 6666;
-	icon = 'icons/obj/machines/gateway.dmi';
-	icon_state = "oncenter"
+/obj/effect/simple_portal/linked/gateway{
+	portal_id = 6666
 	},
 /obj/effect/map_effect/perma_light/gateway,
-/obj/effect/simple_portal/coords{
-	icon = 'icons/obj/machines/gateway.dmi';
-	icon_state = "oncenter";
-	density = 0
-	},
+/obj/effect/simple_portal/coords/old_sprite,
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/awaymission/diescraper/indoors/floor4second)
 "fQ" = (
@@ -4327,9 +4319,7 @@
 /turf/simulated/floor/plating,
 /area/awaymission/diescraper/indoors/floor2)
 "nh" = (
-/obj/effect/simple_portal/coords{
-	icon = 'icons/obj/machines/gateway.dmi';
-	icon_state = "on";
+/obj/effect/simple_portal/coords/gateway_on{
 	dir = 1
 	},
 /turf/simulated/floor/tiled/milspec/raised,
@@ -5124,9 +5114,7 @@
 /turf/simulated/floor/tiled,
 /area/awaymission/diescraper/indoors/floor4second)
 "pu" = (
-/obj/effect/simple_portal/coords{
-	icon = 'icons/obj/machines/gateway.dmi';
-	icon_state = "on";
+/obj/effect/simple_portal/coords/gateway_on{
 	dir = 8
 	},
 /turf/simulated/floor/tiled/milspec/raised,
@@ -5799,7 +5787,6 @@
 /obj/structure/table/rack/shelf/steel,
 /obj/item/gun/projectile/revolver/toy/big_iron,
 /obj/item/toy/plushie/green_fox{
-	icon = 'icons/obj/surgery_vr.dmi';
 	name = "The most beautiful plushie ever";
 	desc = "A small toy plushie. You feel like you forgot to install something."
 	},
@@ -11478,9 +11465,7 @@
 /turf/unsimulated/floor/tiled/milspec,
 /area/awaymission/diescraper/indoors/floor6)
 "Hn" = (
-/obj/effect/simple_portal/coords{
-	icon = 'icons/obj/machines/gateway.dmi';
-	icon_state = "on";
+/obj/effect/simple_portal/coords/gateway_on{
 	dir = 4
 	},
 /obj/effect/floor_decal/techfloor/orange{
@@ -11709,17 +11694,11 @@
 /turf/simulated/floor/wood,
 /area/awaymission/diescraper/indoors/floor2)
 "HW" = (
-/obj/effect/simple_portal/linked{
-	portal_id = 6666;
-	icon = 'icons/obj/machines/gateway.dmi';
-	icon_state = "oncenter"
+/obj/effect/simple_portal/linked/gateway{
+	portal_id = 6666
 	},
 /obj/effect/map_effect/perma_light/gateway,
-/obj/effect/simple_portal/coords{
-	icon = 'icons/obj/machines/gateway.dmi';
-	icon_state = "oncenter";
-	density = 0
-	},
+/obj/effect/simple_portal/coords/old_sprite,
 /turf/simulated/floor/tiled/milspec/raised,
 /area/awaymission/diescraper/indoors/floor2)
 "HX" = (
@@ -13904,9 +13883,7 @@
 /turf/unsimulated/floor/tiled/techfloor,
 /area/awaymission/diescraper/indoors/floor6)
 "On" = (
-/obj/effect/simple_portal/coords{
-	icon = 'icons/obj/machines/gateway.dmi';
-	icon_state = "on";
+/obj/effect/simple_portal/coords/gateway_on{
 	dir = 1
 	},
 /obj/effect/floor_decal/techfloor/orange{
@@ -14368,9 +14345,7 @@
 	},
 /area/awaymission/diescraper/indoors/floor5)
 "PI" = (
-/obj/effect/simple_portal/coords{
-	icon = 'icons/obj/machines/gateway.dmi';
-	icon_state = "on";
+/obj/effect/simple_portal/coords/gateway_on{
 	dir = 8
 	},
 /obj/effect/floor_decal/techfloor/orange{
@@ -15073,13 +15048,7 @@
 /turf/simulated/shuttle/wall/voidcraft/hard_corner,
 /area/awaymission/diescraper/outside)
 "Sf" = (
-/mob/living/simple_mob/vore/alienanimals/startreader{
-	icon_living = "cutout_basic";
-	icon_dead = "cutout_basic";
-	icon_state = "cutout_basic";
-	icon = 'icons/obj/cardboard_cutout.dmi';
-	name = "stand-up figure?"
-	},
+/mob/living/simple_mob/vore/alienanimals/startreader/cutout,
 /turf/simulated/floor/plating,
 /area/awaymission/diescraper/indoors/floor4second)
 "Sg" = (
diff --git a/modular_chomp/maps/common_submaps/overmap/planets/kara/northern_star/northern_star_mine.dmm b/modular_chomp/maps/common_submaps/overmap/planets/kara/northern_star/northern_star_mine.dmm
index 2bc1cbf288..8699901240 100644
--- a/modular_chomp/maps/common_submaps/overmap/planets/kara/northern_star/northern_star_mine.dmm
+++ b/modular_chomp/maps/common_submaps/overmap/planets/kara/northern_star/northern_star_mine.dmm
@@ -14055,13 +14055,10 @@
 /area/outpost/medical/rec)
 "Do" = (
 /obj/structure/table/standard,
-/obj/item/radio{
+/obj/item/radio/redphone{
+	name = "Medical Emergency Phone";
 	anchored = 1;
-	canhear_range = 1;
-	frequency = 1487;
-	icon = 'icons/obj/items.dmi';
-	icon_state = "red_phone";
-	name = "Medical Emergency Phone"
+	canhear_range = 1
 	},
 /turf/simulated/floor/tiled/white,
 /area/outpost/medical/rec)
diff --git a/modular_chomp/maps/common_submaps/virtual_reality/constructVR.dmm b/modular_chomp/maps/common_submaps/virtual_reality/constructVR.dmm
index e347370c0d..3f229cbe2b 100644
--- a/modular_chomp/maps/common_submaps/virtual_reality/constructVR.dmm
+++ b/modular_chomp/maps/common_submaps/virtual_reality/constructVR.dmm
@@ -1801,10 +1801,7 @@
 /area/vr/powered/space/whiteship)
 "bDm" = (
 /obj/structure/sign/chemdiamond,
-/turf/unsimulated/wall/concrete/turfpack/station{
-	color = "#ebcd7c";
-	icon = 'icons/turf/wall_masks.dmi'
-	},
+/turf/unsimulated/wall/concrete/turfpack/station/yellow,
 /area/vr/powered/mall/backrooms)
 "bDC" = (
 /obj/effect/floor_decal/industrial/warning{
@@ -2421,12 +2418,7 @@
 /turf/simulated/floor/carpet/brown,
 /area/vr/powered/mall)
 "cdu" = (
-/obj/machinery/smartfridge/survival_pod{
-	icon = 'icons/obj/vending.dmi';
-	icon_base = "fridge_sci";
-	icon_contents = "chem";
-	icon_state = "fridge_sci";
-	name = "Advanced storage";
+/obj/machinery/smartfridge/survival_pod/scifridge{
 	pixel_y = 0
 	},
 /obj/item/grenade/spawnergrenade/casino/armadillo,
@@ -4352,14 +4344,7 @@
 /obj/structure/window/reinforced/survival_pod{
 	opacity = 1
 	},
-/obj/machinery/smartfridge/survival_pod{
-	desc = "A mysterious machine which can fabricate many tools for acquiring test subjects.";
-	dir = 4;
-	icon = 'icons/obj/abductor_vr.dmi';
-	icon_base = "dispenser_2way";
-	icon_state = "dispenser_2way";
-	name = "Implant-Co"
-	},
+/obj/machinery/smartfridge/survival_pod/abductor,
 /obj/effect/floor_decal/techfloor{
 	dir = 10
 	},
@@ -4469,10 +4454,7 @@
 /area/vr/powered/mall)
 "dQA" = (
 /obj/structure/sign/warning/falling,
-/turf/unsimulated/wall/concrete/turfpack/station{
-	color = "#ebcd7c";
-	icon = 'icons/turf/wall_masks.dmi'
-	},
+/turf/unsimulated/wall/concrete/turfpack/station/yellow,
 /area/vr/powered/mall/backrooms)
 "dQM" = (
 /obj/structure/table/marble,
@@ -5518,12 +5500,8 @@
 /turf/simulated/floor/plating,
 /area/vr/powered/material)
 "eEr" = (
-/obj/machinery/smartfridge/survival_pod{
-	desc = "A mysterious machine which can fabricate many tools for acquiring test subjects.";
-	icon = 'icons/obj/abductor_vr.dmi';
-	icon_base = "dispenser_2way";
-	icon_state = "dispenser_2way";
-	name = "Implant-Co"
+/obj/machinery/smartfridge/survival_pod/abductor{
+	dir = 2
 	},
 /obj/item/implanter,
 /obj/item/implanter,
@@ -6904,12 +6882,7 @@
 /obj/structure/sign/department/drones{
 	pixel_y = 32
 	},
-/obj/machinery/smartfridge/survival_pod{
-	icon = 'icons/obj/vending.dmi';
-	icon_base = "fridge_sci";
-	icon_contents = "chem";
-	icon_state = "fridge_sci";
-	name = "Advanced storage";
+/obj/machinery/smartfridge/survival_pod/scifridge{
 	pixel_y = 0
 	},
 /obj/item/mecha_parts/mecha_equipment/weapon/energy/laser/xray,
@@ -9571,12 +9544,7 @@
 /turf/simulated/floor/carpet/oracarpet,
 /area/vr/powered/mall/dorms/dorms3)
 "ifF" = (
-/obj/machinery/smartfridge/survival_pod{
-	icon = 'icons/obj/vending.dmi';
-	icon_base = "fridge_sci";
-	icon_contents = "chem";
-	icon_state = "fridge_sci";
-	name = "Advanced storage";
+/obj/machinery/smartfridge/survival_pod/scifridge{
 	pixel_y = 0
 	},
 /obj/item/stock_parts/micro_laser/ultra,
@@ -11820,12 +11788,7 @@
 /obj/structure/sign/department/drones{
 	pixel_y = 32
 	},
-/obj/machinery/smartfridge/survival_pod{
-	icon = 'icons/obj/vending.dmi';
-	icon_base = "fridge_sci";
-	icon_contents = "chem";
-	icon_state = "fridge_sci";
-	name = "Advanced storage";
+/obj/machinery/smartfridge/survival_pod/scifridge{
 	pixel_y = 0
 	},
 /obj/item/mecha_parts/mecha_equipment/tool/hydraulic_clamp,
@@ -14021,11 +13984,7 @@
 /obj/effect/floor_decal/industrial/warning{
 	dir = 8
 	},
-/obj/machinery/smartfridge/survival_pod{
-	icon = 'icons/obj/vending.dmi';
-	icon_base = "fridge_sci";
-	icon_contents = "chem";
-	icon_state = "fridge_sci";
+/obj/machinery/smartfridge/survival_pod/scifridge{
 	name = "Armors R Us";
 	pixel_y = 0
 	},
@@ -15207,12 +15166,7 @@
 /obj/effect/floor_decal/techfloor{
 	dir = 4
 	},
-/obj/machinery/smartfridge/survival_pod{
-	icon = 'icons/obj/vending.dmi';
-	icon_base = "fridge_sci";
-	icon_contents = "chem";
-	icon_state = "fridge_sci";
-	name = "Advanced storage";
+/obj/machinery/smartfridge/survival_pod/scifridge{
 	pixel_y = 0
 	},
 /obj/item/disk/limb/bishop,
@@ -15655,13 +15609,7 @@
 /turf/simulated/floor/wood,
 /area/vr/powered/shop)
 "naF" = (
-/obj/machinery/smartfridge/survival_pod{
-	desc = "A mysterious machine which can fabricate many tools for acquiring test subjects.";
-	icon = 'icons/obj/abductor.dmi';
-	icon_state = "dispenser";
-	name = "Drug-Dispenser";
-	req_access = list(777)
-	},
+/obj/machinery/smartfridge/survival_pod/dispenser1,
 /obj/item/reagent_containers/hypospray/autoinjector/biginjector/soporific,
 /obj/item/reagent_containers/hypospray/autoinjector/biginjector/soporific,
 /obj/item/reagent_containers/hypospray/autoinjector/biginjector/soporific,
@@ -16394,11 +16342,7 @@
 /turf/simulated/floor/tiled/yellow,
 /area/vr/powered/mall)
 "nGZ" = (
-/obj/machinery/smartfridge/survival_pod{
-	icon = 'icons/obj/vending.dmi';
-	icon_base = "fridge_sci";
-	icon_contents = "chem";
-	icon_state = "fridge_sci";
+/obj/machinery/smartfridge/survival_pod/scifridge{
 	pixel_y = 0
 	},
 /obj/item/stack/material/durasteel{
@@ -17865,10 +17809,7 @@
 /area/vr/powered)
 "oCa" = (
 /obj/structure/sign/chemistry,
-/turf/unsimulated/wall/concrete/turfpack/station{
-	color = "#ebcd7c";
-	icon = 'icons/turf/wall_masks.dmi'
-	},
+/turf/unsimulated/wall/concrete/turfpack/station/yellow,
 /area/vr/powered/mall/backrooms)
 "oCA" = (
 /obj/structure/bed/pillowpile/yellow,
@@ -18159,12 +18100,7 @@
 /turf/simulated/floor/tiled/asteroid_steel/turfpack/station,
 /area/vr/powered/space/mechfactory)
 "oOv" = (
-/obj/effect/simple_portal/linked{
-	icon = 'icons/turf/flooring/weird_vr.dmi';
-	icon_state = "dark";
-	light_on = 0;
-	portal_id = 6690
-	},
+/obj/effect/simple_portal/linked/weird_dark,
 /turf/simulated/floor/weird_things/dark,
 /area/vr/powered/mall/backrooms)
 "oOF" = (
@@ -19321,11 +19257,7 @@
 /turf/unsimulated/wall/seperator,
 /area/vr/space)
 "pNg" = (
-/turf/simulated/shuttle/wall/no_join{
-	base_state = "orange";
-	icon = 'icons/turf/shuttle_orange.dmi';
-	icon_state = "orange"
-	},
+/turf/simulated/shuttle/wall/no_join/orange,
 /area/vr/powered/space/whiteship)
 "pNl" = (
 /obj/effect/floor_decal/techfloor{
@@ -21044,12 +20976,8 @@
 /obj/structure/window/reinforced/survival_pod{
 	opacity = 1
 	},
-/obj/machinery/smartfridge/survival_pod{
-	desc = "A mysterious machine which can fabricate many tools for acquiring test subjects.";
-	icon = 'icons/obj/abductor_vr.dmi';
-	icon_base = "dispenser_2way";
-	icon_state = "dispenser_2way";
-	name = "Implant-Co"
+/obj/machinery/smartfridge/survival_pod/abductor{
+	dir = 2
 	},
 /obj/effect/floor_decal/techfloor{
 	dir = 6
@@ -21286,11 +21214,7 @@
 	teleport_x = 185;
 	teleport_y = 157
 	},
-/obj/effect/simple_portal/coords{
-	density = 0;
-	icon = 'icons/obj/machines/gateway_vr.dmi';
-	icon_state = "offcenter"
-	},
+/obj/effect/simple_portal/coords/offcenter,
 /obj/effect/map_effect/perma_light/gateway,
 /turf/unsimulated/floor/lino/turfpack/station{
 	color = "#ffe9ab"
@@ -22631,10 +22555,7 @@
 /area/vr/space)
 "szB" = (
 /obj/structure/sign/warning/lava,
-/turf/unsimulated/wall/concrete/turfpack/station{
-	color = "#ebcd7c";
-	icon = 'icons/turf/wall_masks.dmi'
-	},
+/turf/unsimulated/wall/concrete/turfpack/station/yellow,
 /area/vr/powered/mall/backrooms)
 "szE" = (
 /obj/machinery/sleeper{
@@ -24510,13 +24431,8 @@
 /obj/item/clothing/shoes/dress,
 /obj/item/clothing/shoes/dress,
 /obj/item/clothing/shoes/dress,
-/obj/machinery/smartfridge/survival_pod{
-	desc = "A mysterious machine which can fabricate many tools for acquiring test subjects.";
-	icon = 'icons/obj/abductor.dmi';
-	icon_state = "dispenser";
-	name = "Garmentier";
-	pixel_y = 0;
-	req_access = list(777)
+/obj/machinery/smartfridge/survival_pod/dispenser1/garmentier{
+	pixel_y = 0
 	},
 /obj/item/clothing/head/headband/maid,
 /obj/item/clothing/head/headband/maid,
@@ -26082,10 +25998,7 @@
 /turf/simulated/floor/tiled/steel_dirty,
 /area/vr/powered/cult)
 "vrG" = (
-/turf/unsimulated/wall/concrete/turfpack/station{
-	color = "#ebcd7c";
-	icon = 'icons/turf/wall_masks.dmi'
-	},
+/turf/unsimulated/wall/concrete/turfpack/station/yellow,
 /area/vr/powered/mall/backrooms)
 "vrM" = (
 /obj/structure/table/rack/shelf/steel,
@@ -27208,10 +27121,7 @@
 /area/vr/powered/mall/dorms/dorms4)
 "woV" = (
 /obj/structure/sign/explosive,
-/turf/unsimulated/wall/concrete/turfpack/station{
-	color = "#ebcd7c";
-	icon = 'icons/turf/wall_masks.dmi'
-	},
+/turf/unsimulated/wall/concrete/turfpack/station/yellow,
 /area/vr/powered/mall/backrooms)
 "wpn" = (
 /obj/machinery/computer/arcade,
diff --git a/modular_chomp/maps/overmap/om_ships/cruiser.dmm b/modular_chomp/maps/overmap/om_ships/cruiser.dmm
index faefa5a73c..0b144d0914 100644
--- a/modular_chomp/maps/overmap/om_ships/cruiser.dmm
+++ b/modular_chomp/maps/overmap/om_ships/cruiser.dmm
@@ -7841,9 +7841,7 @@
 /obj/effect/floor_decal/corner_techfloor_grid{
 	dir = 4
 	},
-/obj/machinery/mech_recharger{
-	icon = 'icons/turf/shuttle_alien_blue.dmi'
-	},
+/obj/machinery/mech_recharger/alien,
 /obj/mecha/combat/fighter/gunpod/loaded,
 /turf/simulated/floor/tiled/techfloor,
 /area/mothership/telecomms1)
@@ -8049,9 +8047,7 @@
 	dir = 6;
 	icon_state = "corner_techfloor_grid"
 	},
-/obj/machinery/mech_recharger{
-	icon = 'icons/turf/shuttle_alien_blue.dmi'
-	},
+/obj/machinery/mech_recharger/alien,
 /obj/mecha/combat/fighter/gunpod/loaded,
 /turf/simulated/floor/tiled/techfloor,
 /area/mothership/telecomms2)
@@ -8370,9 +8366,7 @@
 /obj/effect/floor_decal/corner_techfloor_grid{
 	dir = 4
 	},
-/obj/machinery/mech_recharger{
-	icon = 'icons/turf/shuttle_alien_blue.dmi'
-	},
+/obj/machinery/mech_recharger/alien,
 /obj/mecha/combat/fighter/gunpod/loaded,
 /turf/simulated/floor/tiled/techfloor,
 /area/mothership/telecomms2)
@@ -8956,9 +8950,7 @@
 /obj/effect/floor_decal/corner_techfloor_grid{
 	dir = 1
 	},
-/obj/machinery/mech_recharger{
-	icon = 'icons/turf/shuttle_alien_blue.dmi'
-	},
+/obj/machinery/mech_recharger/alien,
 /turf/simulated/floor/tiled/techfloor,
 /area/mothership/telecomms2)
 "wA" = (
@@ -9164,9 +9156,7 @@
 	dir = 6;
 	icon_state = "corner_techfloor_grid"
 	},
-/obj/machinery/mech_recharger{
-	icon = 'icons/turf/shuttle_alien_blue.dmi'
-	},
+/obj/machinery/mech_recharger/alien,
 /obj/mecha/combat/fighter/gunpod/loaded,
 /turf/simulated/floor/tiled/techfloor,
 /area/mothership/telecomms1)
@@ -9178,9 +9168,7 @@
 /obj/effect/floor_decal/corner_techfloor_grid{
 	dir = 1
 	},
-/obj/machinery/mech_recharger{
-	icon = 'icons/turf/shuttle_alien_blue.dmi'
-	},
+/obj/machinery/mech_recharger/alien,
 /turf/simulated/floor/tiled/techfloor,
 /area/mothership/telecomms1)
 "Ct" = (
@@ -9397,9 +9385,7 @@
 /obj/effect/floor_decal/corner_techfloor_grid{
 	dir = 9
 	},
-/obj/machinery/mech_recharger{
-	icon = 'icons/turf/shuttle_alien_blue.dmi'
-	},
+/obj/machinery/mech_recharger/alien,
 /turf/simulated/floor/tiled/techfloor,
 /area/mothership/telecomms2)
 "HG" = (
@@ -9606,9 +9592,7 @@
 /obj/effect/floor_decal/corner_techfloor_grid{
 	dir = 9
 	},
-/obj/machinery/mech_recharger{
-	icon = 'icons/turf/shuttle_alien_blue.dmi'
-	},
+/obj/machinery/mech_recharger/alien,
 /turf/simulated/floor/tiled/techfloor,
 /area/mothership/telecomms1)
 "RP" = (
diff --git a/modular_chomp/maps/overmap/om_ships/shelter_6.dmm b/modular_chomp/maps/overmap/om_ships/shelter_6.dmm
index dfda58bd0e..afa5c2bf8d 100644
--- a/modular_chomp/maps/overmap/om_ships/shelter_6.dmm
+++ b/modular_chomp/maps/overmap/om_ships/shelter_6.dmm
@@ -1528,9 +1528,7 @@
 /turf/simulated/floor/tiled/steel_ridged,
 /area/shuttle/tabiranth)
 "bO" = (
-/obj/machinery/mech_recharger{
-	icon = 'icons/turf/shuttle_alien_blue.dmi'
-	},
+/obj/machinery/mech_recharger/alien,
 /obj/mecha/combat/fighter/baron/loaded{
 	ground_capable = 1;
 	health = 600;
@@ -1612,34 +1610,10 @@
 /obj/item/storage/secure/briefcase/nsfw_pack_hybrid,
 /obj/item/ammo_casing/microbattery/medical/corpse_mend,
 /obj/item/ammo_casing/microbattery/medical/corpse_mend,
-/obj/item/cell/slime{
-	description_info = "This 'cell' holds a max charge of 20k and self recharges over time.";
-	icon = 'icons/obj/power.dmi';
-	icon_state = "icell";
-	maxcharge = 20000;
-	name = "slime core cell"
-	},
-/obj/item/cell/slime{
-	description_info = "This 'cell' holds a max charge of 20k and self recharges over time.";
-	icon = 'icons/obj/power.dmi';
-	icon_state = "icell";
-	maxcharge = 20000;
-	name = "slime core cell"
-	},
-/obj/item/cell/slime{
-	description_info = "This 'cell' holds a max charge of 20k and self recharges over time.";
-	icon = 'icons/obj/power.dmi';
-	icon_state = "icell";
-	maxcharge = 20000;
-	name = "slime core cell"
-	},
-/obj/item/cell/slime{
-	description_info = "This 'cell' holds a max charge of 20k and self recharges over time.";
-	icon = 'icons/obj/power.dmi';
-	icon_state = "icell";
-	maxcharge = 20000;
-	name = "slime core cell"
-	},
+/obj/item/cell/slime,
+/obj/item/cell/slime,
+/obj/item/cell/slime,
+/obj/item/cell/slime,
 /obj/item/slime_extract/pink,
 /obj/item/slime_extract/pink,
 /obj/item/slime_extract/pink,
diff --git a/modular_chomp/maps/overmap/space_pois/abandonedzoo_50x50.dmm b/modular_chomp/maps/overmap/space_pois/abandonedzoo_50x50.dmm
index 36647c130e..e4ed354bfd 100644
--- a/modular_chomp/maps/overmap/space_pois/abandonedzoo_50x50.dmm
+++ b/modular_chomp/maps/overmap/space_pois/abandonedzoo_50x50.dmm
@@ -728,11 +728,7 @@
 /turf/simulated/floor/outdoors/grass/sif,
 /area/submap/abandonedzoo)
 "ii" = (
-/obj/machinery/smartfridge/survival_pod{
-	icon = 'icons/obj/vending.dmi';
-	icon_base = "fridge_sci";
-	icon_contents = "chem";
-	icon_state = "fridge_sci";
+/obj/machinery/smartfridge/survival_pod/scifridge{
 	pixel_y = 0;
 	name = "Containment Equipment"
 	},
diff --git a/modular_chomp/maps/overmap/space_pois/deepstorage_85x67.dmm b/modular_chomp/maps/overmap/space_pois/deepstorage_85x67.dmm
index 2e3ebe8787..e716469d3f 100644
--- a/modular_chomp/maps/overmap/space_pois/deepstorage_85x67.dmm
+++ b/modular_chomp/maps/overmap/space_pois/deepstorage_85x67.dmm
@@ -354,12 +354,7 @@
 	dir = 4;
 	pixel_y = -8
 	},
-/obj/effect/decal/cleanable/blood/tracks{
-	color = "red";
-	desc = "Your instincts say you shouldn't be following these.";
-	icon = 'icons/effects/blood.dmi';
-	icon_state = "tracks"
-	},
+/obj/effect/decal/cleanable/blood/tracks/suspicious,
 /turf/simulated/floor/tiled/freezer,
 /area/submap/deepstorage)
 "aM" = (
@@ -438,12 +433,7 @@
 /obj/machinery/shower{
 	dir = 8
 	},
-/obj/effect/decal/cleanable/blood/tracks{
-	color = "red";
-	desc = "Your instincts say you shouldn't be following these.";
-	icon = 'icons/effects/blood.dmi';
-	icon_state = "tracks"
-	},
+/obj/effect/decal/cleanable/blood/tracks/suspicious,
 /turf/simulated/floor/tiled/freezer,
 /area/submap/deepstorage)
 "aV" = (
@@ -974,12 +964,8 @@
 /area/submap/deepstorage)
 "sF" = (
 /obj/effect/floor_decal/rust,
-/obj/effect/decal/cleanable/blood/tracks{
-	color = "red";
-	desc = "Your instincts say you shouldn't be following these.";
-	dir = 4;
-	icon = 'icons/effects/blood.dmi';
-	icon_state = "tracks"
+/obj/effect/decal/cleanable/blood/tracks/suspicious{
+	dir = 4
 	},
 /turf/simulated/floor/tiled/asteroid_steel{
 	temperature = 295.15
@@ -1102,11 +1088,7 @@
 /area/submap/deepstorage)
 "CA" = (
 /obj/effect/floor_decal/rust,
-/obj/effect/decal/cleanable/blood/tracks{
-	color = "red";
-	desc = "Your instincts say you shouldn't be following these.";
-	icon = 'icons/effects/blood.dmi';
-	icon_state = "tracks";
+/obj/effect/decal/cleanable/blood/tracks/suspicious{
 	dir = 10
 	},
 /turf/simulated/floor/tiled/asteroid_steel{
@@ -1183,12 +1165,8 @@
 /area/submap/deepstorage)
 "Lm" = (
 /obj/effect/floor_decal/rust,
-/obj/effect/decal/cleanable/blood/tracks{
-	color = "red";
-	desc = "Your instincts say you shouldn't be following these.";
-	dir = 5;
-	icon = 'icons/effects/blood.dmi';
-	icon_state = "tracks"
+/obj/effect/decal/cleanable/blood/tracks/suspicious{
+	dir = 5
 	},
 /turf/simulated/floor/tiled/asteroid_steel{
 	temperature = 295.15
@@ -1315,12 +1293,8 @@
 /turf/simulated/floor/tiled,
 /area/submap/deepstorage)
 "Zi" = (
-/obj/effect/decal/cleanable/blood/tracks{
-	color = "red";
-	desc = "Your instincts say you shouldn't be following these.";
-	dir = 4;
-	icon = 'icons/effects/blood.dmi';
-	icon_state = "tracks"
+/obj/effect/decal/cleanable/blood/tracks/suspicious{
+	dir = 4
 	},
 /turf/simulated/floor/tiled/asteroid_steel{
 	temperature = 295.15
diff --git a/modular_chomp/maps/overmap/space_pois/ussp_84x90.dmm b/modular_chomp/maps/overmap/space_pois/ussp_84x90.dmm
index df634db277..d24888613d 100644
--- a/modular_chomp/maps/overmap/space_pois/ussp_84x90.dmm
+++ b/modular_chomp/maps/overmap/space_pois/ussp_84x90.dmm
@@ -2282,12 +2282,8 @@
 	icon_state = "4-8"
 	},
 /obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/blood/tracks{
-	color = "red";
-	desc = "Your instincts say you shouldn't be following these.";
-	dir = 4;
-	icon = 'icons/effects/blood.dmi';
-	icon_state = "tracks"
+/obj/effect/decal/cleanable/blood/tracks/suspicious{
+	dir = 4
 	},
 /turf/simulated/floor/tiled/techfloor,
 /area/derelict/eva/annex)
@@ -2324,12 +2320,8 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/obj/effect/decal/cleanable/blood/tracks{
-	color = "red";
-	desc = "Your instincts say you shouldn't be following these.";
-	dir = 4;
-	icon = 'icons/effects/blood.dmi';
-	icon_state = "tracks"
+/obj/effect/decal/cleanable/blood/tracks/suspicious{
+	dir = 4
 	},
 /turf/simulated/floor/tiled/old_tile/gray,
 /area/derelict/eva/annex)
@@ -2337,12 +2329,8 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/obj/effect/decal/cleanable/blood/tracks{
-	color = "red";
-	desc = "Your instincts say you shouldn't be following these.";
-	dir = 4;
-	icon = 'icons/effects/blood.dmi';
-	icon_state = "tracks"
+/obj/effect/decal/cleanable/blood/tracks/suspicious{
+	dir = 4
 	},
 /obj/effect/floor_decal/stairs/dark_stairs{
 	dir = 4
@@ -2358,12 +2346,8 @@
 	desc = "This guy seemed to have died in terrible way! Half his remains are dust.";
 	name = "Human remains"
 	},
-/obj/effect/decal/cleanable/blood/tracks{
-	color = "red";
-	desc = "Your instincts say you shouldn't be following these.";
-	dir = 4;
-	icon = 'icons/effects/blood.dmi';
-	icon_state = "tracks"
+/obj/effect/decal/cleanable/blood/tracks/suspicious{
+	dir = 4
 	},
 /turf/simulated/floor/tiled/old_tile/gray,
 /area/derelict/eva/annex)
@@ -4823,12 +4807,8 @@
 /obj/machinery/light/small{
 	dir = 1
 	},
-/obj/effect/decal/cleanable/blood/tracks{
-	color = "red";
-	desc = "Your instincts say you shouldn't be following these.";
-	dir = 4;
-	icon = 'icons/effects/blood.dmi';
-	icon_state = "tracks"
+/obj/effect/decal/cleanable/blood/tracks/suspicious{
+	dir = 4
 	},
 /turf/simulated/floor/tiled/techfloor,
 /area/derelict/eva/annex)
diff --git a/modular_chomp/maps/relic_base/relicbase-12.dmm b/modular_chomp/maps/relic_base/relicbase-12.dmm
index 0eac82a874..5f3178b9ec 100644
--- a/modular_chomp/maps/relic_base/relicbase-12.dmm
+++ b/modular_chomp/maps/relic_base/relicbase-12.dmm
@@ -548,8 +548,7 @@
 "acF" = (
 /obj/structure/bed/padded,
 /obj/item/bedsheet/orange,
-/turf/unsimulated/floor{
-	icon = 'icons/turf/flooring/wood.dmi';
+/turf/unsimulated/floor/wood{
 	icon_state = "wood-broken1"
 	},
 /area/skipjack_station)
@@ -617,9 +616,7 @@
 /turf/simulated/shuttle/floor/black,
 /area/shuttle/merchant)
 "agc" = (
-/obj/machinery/door/airlock{
-	icon = 'icons/obj/doors/Dooruranium.dmi'
-	},
+/obj/machinery/door/airlock/uranium_appearance,
 /turf/unsimulated/floor{
 	dir = 8;
 	icon_state = "wood"
@@ -971,9 +968,7 @@
 	},
 /area/syndicate_station)
 "azl" = (
-/obj/effect/floor_decal/sign/small_8{
-	icon = 'icons/turf/flooring/decals.dmi'
-	},
+/obj/effect/floor_decal/sign/small_8/decal,
 /turf/simulated/floor/holofloor/wood,
 /area/holodeck/source_chess)
 "azD" = (
@@ -1443,9 +1438,7 @@
 /turf/simulated/floor/wood/alt/parquet,
 /area/centcom/terminal)
 "aFi" = (
-/obj/machinery/door/airlock{
-	icon = 'icons/obj/doors/Dooruranium.dmi'
-	},
+/obj/machinery/door/airlock/uranium_appearance,
 /turf/unsimulated/floor{
 	icon_state = "dark"
 	},
@@ -1641,11 +1634,7 @@
 /area/centcom/specops)
 "aQu" = (
 /obj/structure/flora/ausbushes/palebush,
-/turf/unsimulated/floor{
-	icon = 'icons/turf/snow_new.dmi';
-	icon_state = "snow";
-	name = "snow"
-	},
+/turf/unsimulated/floor/snow_new,
 /area/ninja_dojo/dojo)
 "aQA" = (
 /obj/machinery/vending/wallmed1{
@@ -1844,12 +1833,7 @@
 /turf/simulated/floor/tiled/old_tile/white,
 /area/centcom/medical)
 "bew" = (
-/turf/unsimulated/wall{
-	desc = "That looks like it doesn't open easily.";
-	icon = 'icons/obj/doors/rapid_pdoor.dmi';
-	icon_state = "pdoor1";
-	name = "Shuttle Bay Blast Door"
-	},
+/turf/unsimulated/wall/shuttle_bay,
 /area/centcom/evac)
 "beV" = (
 /obj/effect/landmark{
@@ -1947,9 +1931,7 @@
 /turf/simulated/shuttle/floor/black,
 /area/shuttle/merchant)
 "blO" = (
-/obj/effect/floor_decal/sign/small_7{
-	icon = 'icons/turf/flooring/decals.dmi'
-	},
+/obj/effect/floor_decal/sign/small_7/decal,
 /turf/simulated/floor/holofloor/wood,
 /area/holodeck/source_chess)
 "bmz" = (
@@ -2039,9 +2021,7 @@
 	},
 /area/centcom/command)
 "bsI" = (
-/obj/effect/floor_decal/sign/small_6{
-	icon = 'icons/turf/flooring/decals.dmi'
-	},
+/obj/effect/floor_decal/sign/small_6/decal,
 /turf/simulated/floor/holofloor/wood,
 /area/holodeck/source_chess)
 "btc" = (
@@ -2121,8 +2101,7 @@
 	},
 /area/centcom/living)
 "bzT" = (
-/turf/unsimulated/floor{
-	icon = 'icons/turf/flooring/wood.dmi';
+/turf/unsimulated/floor/wood{
 	icon_state = "wood-broken3"
 	},
 /area/skipjack_station)
@@ -2194,11 +2173,7 @@
 /turf/simulated/floor/tiled/eris/steel/bar_flat,
 /area/centcom/bar)
 "bFy" = (
-/turf/unsimulated/wall{
-	icon = 'icons/obj/doors/Doormaint.dmi';
-	icon_state = "door_closed";
-	name = "Sealed Door"
-	},
+/turf/unsimulated/wall/door_maint,
 /area/centcom/main_hall)
 "bFO" = (
 /obj/effect/wingrille_spawn/reinforced/crescent,
@@ -2238,15 +2213,11 @@
 /turf/simulated/floor/tiled/dark,
 /area/centcom/specops)
 "bHc" = (
-/obj/effect/floor_decal/sign/small_5{
-	icon = 'icons/turf/flooring/decals.dmi'
-	},
+/obj/effect/floor_decal/sign/small_5/decal,
 /turf/simulated/floor/holofloor/wood,
 /area/holodeck/source_chess)
 "bHZ" = (
-/obj/effect/floor_decal/sign/small_4{
-	icon = 'icons/turf/flooring/decals.dmi'
-	},
+/obj/effect/floor_decal/sign/small_4/decal,
 /turf/simulated/floor/holofloor/wood,
 /area/holodeck/source_chess)
 "bIz" = (
@@ -2263,9 +2234,7 @@
 	},
 /area/skipjack_station)
 "bIK" = (
-/obj/effect/floor_decal/sign/small_3{
-	icon = 'icons/turf/flooring/decals.dmi'
-	},
+/obj/effect/floor_decal/sign/small_3/decal,
 /turf/simulated/floor/holofloor/wood,
 /area/holodeck/source_chess)
 "bIR" = (
@@ -2515,9 +2484,7 @@
 	},
 /area/tdome/tdomeobserve)
 "bSv" = (
-/obj/effect/floor_decal/sign/small_2{
-	icon = 'icons/turf/flooring/decals.dmi'
-	},
+/obj/effect/floor_decal/sign/small_2/decal,
 /turf/simulated/floor/holofloor/wood,
 /area/holodeck/source_chess)
 "bSN" = (
@@ -2735,9 +2702,7 @@
 /turf/simulated/floor/tiled/techmaint,
 /area/centcom/specops)
 "caN" = (
-/obj/effect/floor_decal/sign/small_1{
-	icon = 'icons/turf/flooring/decals.dmi'
-	},
+/obj/effect/floor_decal/sign/small_1/decal,
 /turf/simulated/floor/holofloor/wood,
 /area/holodeck/source_chess)
 "caR" = (
@@ -3300,9 +3265,7 @@
 	},
 /area/wizard_station)
 "cJs" = (
-/obj/effect/floor_decal/sign/small_a{
-	icon = 'icons/turf/flooring/decals.dmi'
-	},
+/obj/effect/floor_decal/sign/small_a/decal,
 /turf/simulated/floor/holofloor/wood,
 /area/holodeck/source_chess)
 "cJE" = (
@@ -3387,9 +3350,7 @@
 /turf/simulated/floor/tiled/techmaint,
 /area/centcom/specops)
 "cMt" = (
-/obj/effect/floor_decal/sign/small_b{
-	icon = 'icons/turf/flooring/decals.dmi'
-	},
+/obj/effect/floor_decal/sign/small_b/decal,
 /turf/simulated/floor/holofloor/wood,
 /area/holodeck/source_chess)
 "cNE" = (
@@ -3442,9 +3403,7 @@
 	},
 /area/wizard_station)
 "cQW" = (
-/obj/effect/floor_decal/sign/small_c{
-	icon = 'icons/turf/flooring/decals.dmi'
-	},
+/obj/effect/floor_decal/sign/small_c/decal,
 /turf/simulated/floor/holofloor/wood,
 /area/holodeck/source_chess)
 "cSt" = (
@@ -3490,9 +3449,7 @@
 /turf/simulated/shuttle/floor/white,
 /area/centcom/evac)
 "cVe" = (
-/obj/effect/floor_decal/sign/small_d{
-	icon = 'icons/turf/flooring/decals.dmi'
-	},
+/obj/effect/floor_decal/sign/small_d/decal,
 /turf/simulated/floor/holofloor/wood,
 /area/holodeck/source_chess)
 "cVf" = (
@@ -3511,9 +3468,7 @@
 	},
 /area/centcom/command)
 "cVU" = (
-/obj/effect/floor_decal/sign/small_e{
-	icon = 'icons/turf/flooring/decals.dmi'
-	},
+/obj/effect/floor_decal/sign/small_e/decal,
 /turf/simulated/floor/holofloor/wood,
 /area/holodeck/source_chess)
 "cWy" = (
@@ -3530,9 +3485,7 @@
 	},
 /area/shuttle/trade)
 "cWK" = (
-/obj/effect/floor_decal/sign/small_f{
-	icon = 'icons/turf/flooring/decals.dmi'
-	},
+/obj/effect/floor_decal/sign/small_f/decal,
 /turf/simulated/floor/holofloor/wood,
 /area/holodeck/source_chess)
 "cXM" = (
@@ -3550,15 +3503,11 @@
 /turf/simulated/floor/tiled/techfloor,
 /area/centcom/security)
 "cYN" = (
-/obj/effect/floor_decal/sign/small_g{
-	icon = 'icons/turf/flooring/decals.dmi'
-	},
+/obj/effect/floor_decal/sign/small_g/decal,
 /turf/simulated/floor/holofloor/wood,
 /area/holodeck/source_chess)
 "daf" = (
-/obj/effect/floor_decal/sign/small_h{
-	icon = 'icons/turf/flooring/decals.dmi'
-	},
+/obj/effect/floor_decal/sign/small_h/decal,
 /turf/simulated/floor/holofloor/wood,
 /area/holodeck/source_chess)
 "dag" = (
@@ -4038,8 +3987,7 @@
 /area/holodeck/source_theatre)
 "dCb" = (
 /obj/item/target/alien,
-/turf/unsimulated/floor{
-	icon = 'icons/turf/flooring/wood.dmi';
+/turf/unsimulated/floor/wood{
 	icon_state = "wood-broken2"
 	},
 /area/ninja_dojo/dojo)
@@ -4064,9 +4012,7 @@
 /turf/simulated/floor/tiled/eris/cafe,
 /area/centcom/bar)
 "dCy" = (
-/obj/machinery/door/airlock{
-	icon = 'icons/obj/doors/Dooruranium.dmi'
-	},
+/obj/machinery/door/airlock/uranium_appearance,
 /turf/unsimulated/floor{
 	icon_state = "white"
 	},
@@ -4478,11 +4424,7 @@
 	dir = 4;
 	health = 1e+006
 	},
-/turf/unsimulated/floor{
-	icon = 'icons/turf/snow_new.dmi';
-	icon_state = "snow";
-	name = "snow"
-	},
+/turf/unsimulated/floor/snow_new,
 /area/ninja_dojo/dojo)
 "dZw" = (
 /obj/structure/sign/scenery/map/left{
@@ -8252,11 +8194,7 @@
 	},
 /area/shuttle/trade)
 "iJS" = (
-/turf/simulated/shuttle/wall/no_join{
-	base_state = "orange";
-	icon = 'icons/turf/shuttle_orange.dmi';
-	icon_state = "orange"
-	},
+/turf/simulated/shuttle/wall/no_join/orange,
 /area/centcom/evac)
 "iKj" = (
 /obj/machinery/optable,
@@ -9383,11 +9321,7 @@
 /turf/simulated/floor/redgrid/off,
 /area/centcom/specops)
 "jUW" = (
-/turf/unsimulated/floor{
-	icon = 'icons/turf/snow_new.dmi';
-	icon_state = "snow";
-	name = "snow"
-	},
+/turf/unsimulated/floor/snow_new,
 /area/ninja_dojo/dojo)
 "jVf" = (
 /obj/effect/floor_decal/carpet,
@@ -10833,9 +10767,7 @@
 /turf/simulated/floor/tiled/techfloor,
 /area/centcom/specops)
 "lxX" = (
-/obj/machinery/door/airlock{
-	icon = 'icons/obj/doors/Dooruranium.dmi'
-	},
+/obj/machinery/door/airlock/uranium_appearance,
 /turf/unsimulated/floor{
 	icon_state = "plating";
 	name = "plating"
@@ -10853,11 +10785,7 @@
 	},
 /area/skipjack_station)
 "lzn" = (
-/turf/unsimulated/wall{
-	icon = 'icons/obj/doors/Dooruranium.dmi';
-	icon_state = "door_closed";
-	name = "Sealed Door"
-	},
+/turf/unsimulated/wall/fake_uranium,
 /area/ninja_dojo/dojo)
 "lzv" = (
 /turf/unsimulated/floor{
@@ -11546,8 +11474,7 @@
 /obj/effect/landmark{
 	name = "voxstart"
 	},
-/turf/unsimulated/floor{
-	icon = 'icons/turf/flooring/wood.dmi';
+/turf/unsimulated/floor/wood{
 	icon_state = "wood-broken2"
 	},
 /area/skipjack_station)
@@ -12418,11 +12345,7 @@
 /area/wizard_station)
 "nsf" = (
 /obj/effect/floor_decal/asteroid,
-/turf/unsimulated/floor{
-	icon = 'icons/turf/snow_new.dmi';
-	icon_state = "snow";
-	name = "snow"
-	},
+/turf/unsimulated/floor/snow_new,
 /area/ninja_dojo/dojo)
 "nsF" = (
 /obj/structure/window/reinforced{
@@ -12489,12 +12412,7 @@
 	},
 /area/wizard_station)
 "nuO" = (
-/turf/unsimulated/wall{
-	desc = "That looks like it doesn't open easily.";
-	icon = 'icons/obj/doors/rapid_pdoor.dmi';
-	icon_state = "pdoor1";
-	name = "Shuttle Bay Blast Door"
-	},
+/turf/unsimulated/wall/shuttle_bay,
 /area/skipjack_station)
 "nvl" = (
 /obj/item/bikehorn/rubberducky,
@@ -15299,12 +15217,8 @@
 /turf/simulated/floor/tiled/techfloor,
 /area/centcom/specops)
 "rkG" = (
-/turf/unsimulated/wall{
-	desc = "That looks like it doesn't open easily.";
-	dir = 8;
-	icon = 'icons/obj/doors/rapid_pdoor.dmi';
-	icon_state = "pdoor1";
-	name = "Shuttle Bay Blast Door"
+/turf/unsimulated/wall/shuttle_bay{
+	dir = 8
 	},
 /area/centcom/evac)
 "rmU" = (
@@ -16070,12 +15984,7 @@
 	},
 /area/syndicate_station)
 "saE" = (
-/turf/unsimulated/wall{
-	desc = "That looks like it doesn't open easily.";
-	icon = 'icons/obj/doors/rapid_pdoor.dmi';
-	icon_state = "pdoor1";
-	name = "Shuttle Bay Blast Door"
-	},
+/turf/unsimulated/wall/shuttle_bay,
 /area/syndicate_mothership/elite_squad)
 "saX" = (
 /obj/machinery/door/window/northright{
@@ -16422,8 +16331,7 @@
 /area/centcom/medical)
 "ssk" = (
 /obj/machinery/space_heater,
-/turf/unsimulated/floor{
-	icon = 'icons/turf/flooring/wood.dmi';
+/turf/unsimulated/floor/wood{
 	icon_state = "wood-broken3"
 	},
 /area/ninja_dojo/dojo)
@@ -17555,11 +17463,7 @@
 /area/centcom/main_hall)
 "tMh" = (
 /obj/structure/flora/tree/pine,
-/turf/unsimulated/floor{
-	icon = 'icons/turf/snow_new.dmi';
-	icon_state = "snow";
-	name = "snow"
-	},
+/turf/unsimulated/floor/snow_new,
 /area/ninja_dojo/dojo)
 "tMF" = (
 /obj/structure/bed/chair/sofa/right/black{
@@ -18537,8 +18441,7 @@
 	},
 /area/syndicate_station)
 "vco" = (
-/turf/unsimulated/floor{
-	icon = 'icons/turf/flooring/wood.dmi';
+/turf/unsimulated/floor/wood{
 	icon_state = "wood-broken1"
 	},
 /area/ninja_dojo/dojo)
@@ -18792,11 +18695,7 @@
 /obj/structure/window/reinforced{
 	dir = 8
 	},
-/turf/unsimulated/floor{
-	icon = 'icons/turf/snow_new.dmi';
-	icon_state = "snow";
-	name = "snow"
-	},
+/turf/unsimulated/floor/snow_new,
 /area/ninja_dojo/dojo)
 "vpj" = (
 /obj/item/mecha_parts/mecha_equipment/tool/sleeper,
@@ -21026,11 +20925,8 @@
 /turf/simulated/floor/tiled/techfloor,
 /area/centcom/specops)
 "xJr" = (
-/turf/unsimulated/wall{
-	desc = "That looks like it doesn't open easily.";
+/turf/unsimulated/wall/shuttle_bay{
 	dir = 8;
-	icon = 'icons/obj/doors/rapid_pdoor.dmi';
-	icon_state = "pdoor1";
 	name = "Blast Door"
 	},
 /area/centcom/main_hall)
@@ -21140,12 +21036,8 @@
 /turf/simulated/shuttle/floor/black,
 /area/shuttle/merchant)
 "xOR" = (
-/turf/unsimulated/wall{
-	desc = "That looks like it doesn't open easily.";
-	dir = 8;
-	icon = 'icons/obj/doors/rapid_pdoor.dmi';
-	icon_state = "pdoor1";
-	name = "Shuttle Bay Blast Door"
+/turf/unsimulated/wall/shuttle_bay{
+	dir = 8
 	},
 /area/centcom/command)
 "xPC" = (
diff --git a/modular_chomp/maps/relic_base/relicbase-13.dmm b/modular_chomp/maps/relic_base/relicbase-13.dmm
index 351e387c04..12bee3aefc 100644
--- a/modular_chomp/maps/relic_base/relicbase-13.dmm
+++ b/modular_chomp/maps/relic_base/relicbase-13.dmm
@@ -253,12 +253,7 @@
 /obj/effect/floor_decal/corner/white/border{
 	dir = 1
 	},
-/obj/structure/showcase{
-	desc = "So that's how the shuttle moves on its own.";
-	icon = 'icons/mob/AI.dmi';
-	icon_state = "ai-red";
-	name = "Arrivals Announcement Computer"
-	},
+/obj/structure/showcase/ai,
 /turf/simulated/shuttle/floor/white,
 /area/shuttle/arrival/pre_game/simulated_grid)
 "qR" = (
diff --git a/modular_chomp/maps/relic_base/relicbase-2.dmm b/modular_chomp/maps/relic_base/relicbase-2.dmm
index 2af1946d7b..8a83b07cc4 100644
--- a/modular_chomp/maps/relic_base/relicbase-2.dmm
+++ b/modular_chomp/maps/relic_base/relicbase-2.dmm
@@ -73,25 +73,13 @@
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/hallway/primary/firstdeck/auxdockaft/simulated_caves)
 "aay" = (
-/turf/simulated/floor/tiled/techfloor/grid{
-	base_name = "maglev rails";
-	desc = "Train go brrrr.";
-	icon = 'icons/turf/flooring/maglevs.dmi';
-	icon_state = "maglevup";
-	name = "maglev rails"
-	},
+/turf/simulated/floor/tiled/techfloor/grid/train,
 /area/hallway/primary/firstdeck/auxdockaft/simulated_caves)
 "aaz" = (
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/hallway/primary/seconddeck/dockhallway/simulated_caves)
 "aaB" = (
-/turf/simulated/floor/tiled/techfloor/grid{
-	base_name = "maglev rails";
-	desc = "Train go brrrr.";
-	icon = 'icons/turf/flooring/maglevs.dmi';
-	icon_state = "maglevup";
-	name = "maglev rails"
-	},
+/turf/simulated/floor/tiled/techfloor/grid/train,
 /area/hallway/primary/seconddeck/dockhallway/simulated_caves)
 "aaD" = (
 /obj/random/trash,
@@ -185,13 +173,7 @@
 /area/hallway/primary/firstdeck/auxdockaft/simulated_caves)
 "ahM" = (
 /obj/effect/zone_divider,
-/turf/simulated/floor/tiled/techfloor/grid{
-	base_name = "maglev rails";
-	desc = "Train go brrrr.";
-	icon = 'icons/turf/flooring/maglevs.dmi';
-	icon_state = "maglevup";
-	name = "maglev rails"
-	},
+/turf/simulated/floor/tiled/techfloor/grid/train,
 /area/hallway/primary/firstdeck/auxdockaft/simulated_caves)
 "ahS" = (
 /obj/random/powercell,
@@ -270,13 +252,7 @@
 "akL" = (
 /obj/random/powercell,
 /obj/effect/floor_decal/rust,
-/turf/simulated/floor/tiled/techfloor/grid{
-	base_name = "maglev rails";
-	desc = "Train go brrrr.";
-	icon = 'icons/turf/flooring/maglevs.dmi';
-	icon_state = "maglevup";
-	name = "maglev rails"
-	},
+/turf/simulated/floor/tiled/techfloor/grid/train,
 /area/maintenance/firstdeck/aftport/simulated_caves)
 "ald" = (
 /obj/effect/floor_decal/rust,
@@ -1086,13 +1062,7 @@
 /turf/simulated/floor/plating,
 /area/maintenance/firstdeck/simulated_caves)
 "aQS" = (
-/turf/simulated/floor/tiled/techfloor/grid{
-	base_name = "maglev rails";
-	desc = "Train go brrrr.";
-	icon = 'icons/turf/flooring/maglevs.dmi';
-	icon_state = "maglevup";
-	name = "maglev rails"
-	},
+/turf/simulated/floor/tiled/techfloor/grid/train,
 /area/shuttle/arrival/station/simulated_grid)
 "aQZ" = (
 /obj/effect/floor_decal/rust,
@@ -1133,13 +1103,7 @@
 "aTg" = (
 /obj/random/junk,
 /obj/effect/floor_decal/rust,
-/turf/simulated/floor/tiled/techfloor/grid{
-	base_name = "maglev rails";
-	desc = "Train go brrrr.";
-	icon = 'icons/turf/flooring/maglevs.dmi';
-	icon_state = "maglevup";
-	name = "maglev rails"
-	},
+/turf/simulated/floor/tiled/techfloor/grid/train,
 /area/maintenance/firstdeck/foreport/simulated_caves)
 "aTs" = (
 /obj/effect/floor_decal/rust,
@@ -1359,13 +1323,7 @@
 "bdb" = (
 /obj/random/trash,
 /obj/effect/floor_decal/rust,
-/turf/simulated/floor/tiled/techfloor/grid{
-	base_name = "maglev rails";
-	desc = "Train go brrrr.";
-	icon = 'icons/turf/flooring/maglevs.dmi';
-	icon_state = "maglevup";
-	name = "maglev rails"
-	},
+/turf/simulated/floor/tiled/techfloor/grid/train,
 /area/maintenance/firstdeck/aftport/simulated_caves)
 "bdf" = (
 /obj/structure/table/rack{
@@ -1984,13 +1942,7 @@
 /obj/effect/floor_decal/rust,
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/zone_divider,
-/turf/simulated/floor/tiled/techfloor/grid{
-	base_name = "maglev rails";
-	desc = "Train go brrrr.";
-	icon = 'icons/turf/flooring/maglevs.dmi';
-	icon_state = "maglevup";
-	name = "maglev rails"
-	},
+/turf/simulated/floor/tiled/techfloor/grid/train,
 /area/maintenance/firstdeck/aftport/simulated_caves)
 "bXG" = (
 /obj/machinery/atmospherics/pipe/simple/visible/cyan,
@@ -2385,13 +2337,7 @@
 /area/maintenance/firstdeck/fore/simulated_caves)
 "cwr" = (
 /obj/effect/shuttle_landmark/relicbase/arrivals/station,
-/turf/simulated/floor/tiled/techfloor/grid{
-	base_name = "maglev rails";
-	desc = "Train go brrrr.";
-	icon = 'icons/turf/flooring/maglevs.dmi';
-	icon_state = "maglevup";
-	name = "maglev rails"
-	},
+/turf/simulated/floor/tiled/techfloor/grid/train,
 /area/shuttle/arrival/station/simulated_grid)
 "cwG" = (
 /turf/simulated/mineral/cave,
@@ -2875,13 +2821,7 @@
 /area/maintenance/firstdeck/aftport/simulated_caves)
 "dbJ" = (
 /obj/effect/floor_decal/rust,
-/turf/simulated/floor/tiled/techfloor/grid{
-	base_name = "maglev rails";
-	desc = "Train go brrrr.";
-	icon = 'icons/turf/flooring/maglevs.dmi';
-	icon_state = "maglevup";
-	name = "maglev rails"
-	},
+/turf/simulated/floor/tiled/techfloor/grid/train,
 /area/maintenance/firstdeck/foreport/simulated_caves)
 "dcT" = (
 /obj/machinery/status_display{
@@ -3177,13 +3117,7 @@
 "dss" = (
 /obj/effect/floor_decal/rust,
 /obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/tiled/techfloor/grid{
-	base_name = "maglev rails";
-	desc = "Train go brrrr.";
-	icon = 'icons/turf/flooring/maglevs.dmi';
-	icon_state = "maglevup";
-	name = "maglev rails"
-	},
+/turf/simulated/floor/tiled/techfloor/grid/train,
 /area/maintenance/firstdeck/aftport/simulated_caves)
 "dsB" = (
 /obj/structure/catwalk,
@@ -3713,13 +3647,7 @@
 /obj/effect/floor_decal/rust,
 /obj/effect/floor_decal/rust,
 /obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/tiled/techfloor/grid{
-	base_name = "maglev rails";
-	desc = "Train go brrrr.";
-	icon = 'icons/turf/flooring/maglevs.dmi';
-	icon_state = "maglevup";
-	name = "maglev rails"
-	},
+/turf/simulated/floor/tiled/techfloor/grid/train,
 /area/maintenance/firstdeck/aftport/simulated_caves)
 "dWn" = (
 /obj/effect/floor_decal/rust,
@@ -4589,13 +4517,7 @@
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/shuttle/escape/station/simulated_grid)
 "eRW" = (
-/turf/simulated/floor/tiled/techfloor/grid{
-	base_name = "maglev rails";
-	desc = "Train go brrrr.";
-	icon = 'icons/turf/flooring/maglevs.dmi';
-	icon_state = "maglevup";
-	name = "maglev rails"
-	},
+/turf/simulated/floor/tiled/techfloor/grid/train,
 /area/shuttle/escape/station/simulated_grid)
 "eSy" = (
 /obj/effect/floor_decal/rust,
@@ -5352,13 +5274,7 @@
 "fRL" = (
 /obj/effect/floor_decal/rust,
 /obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/tiled/techfloor/grid{
-	base_name = "maglev rails";
-	desc = "Train go brrrr.";
-	icon = 'icons/turf/flooring/maglevs.dmi';
-	icon_state = "maglevup";
-	name = "maglev rails"
-	},
+/turf/simulated/floor/tiled/techfloor/grid/train,
 /area/maintenance/firstdeck/foreport/simulated_caves)
 "fTS" = (
 /obj/random/trash,
@@ -5567,13 +5483,7 @@
 /obj/effect/floor_decal/rust,
 /obj/effect/floor_decal/rust,
 /obj/random/obstruction,
-/turf/simulated/floor/tiled/techfloor/grid{
-	base_name = "maglev rails";
-	desc = "Train go brrrr.";
-	icon = 'icons/turf/flooring/maglevs.dmi';
-	icon_state = "maglevup";
-	name = "maglev rails"
-	},
+/turf/simulated/floor/tiled/techfloor/grid/train,
 /area/maintenance/firstdeck/centralport/simulated_caves)
 "gfJ" = (
 /obj/structure/catwalk,
@@ -5957,13 +5867,7 @@
 /area/engineering/atmos)
 "gDx" = (
 /obj/effect/zone_divider,
-/turf/simulated/floor/tiled/techfloor/grid{
-	base_name = "maglev rails";
-	desc = "Train go brrrr.";
-	icon = 'icons/turf/flooring/maglevs.dmi';
-	icon_state = "maglevup";
-	name = "maglev rails"
-	},
+/turf/simulated/floor/tiled/techfloor/grid/train,
 /area/hallway/primary/seconddeck/dockhallway/simulated_caves)
 "gEx" = (
 /obj/effect/zone_divider,
@@ -6865,13 +6769,7 @@
 /area/hallway/primary/seconddeck/dockhallway/simulated_caves)
 "hBr" = (
 /obj/effect/shuttle_landmark/relicbase/escape/station,
-/turf/simulated/floor/tiled/techfloor/grid{
-	base_name = "maglev rails";
-	desc = "Train go brrrr.";
-	icon = 'icons/turf/flooring/maglevs.dmi';
-	icon_state = "maglevup";
-	name = "maglev rails"
-	},
+/turf/simulated/floor/tiled/techfloor/grid/train,
 /area/shuttle/escape/station/simulated_grid)
 "hBA" = (
 /obj/effect/floor_decal/borderfloorblack,
@@ -7567,13 +7465,7 @@
 /area/maintenance/firstdeck/simulated_caves)
 "iwA" = (
 /obj/effect/step_trigger/tramblock,
-/turf/simulated/floor/tiled/techfloor/grid{
-	base_name = "maglev rails";
-	desc = "Train go brrrr.";
-	icon = 'icons/turf/flooring/maglevs.dmi';
-	icon_state = "maglevup";
-	name = "maglev rails"
-	},
+/turf/simulated/floor/tiled/techfloor/grid/train,
 /area/hallway/primary/firstdeck/auxdockaft/simulated_caves)
 "iwU" = (
 /obj/structure/catwalk,
@@ -8464,13 +8356,7 @@
 /obj/random/trash,
 /obj/effect/floor_decal/rust,
 /obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/tiled/techfloor/grid{
-	base_name = "maglev rails";
-	desc = "Train go brrrr.";
-	icon = 'icons/turf/flooring/maglevs.dmi';
-	icon_state = "maglevup";
-	name = "maglev rails"
-	},
+/turf/simulated/floor/tiled/techfloor/grid/train,
 /area/maintenance/firstdeck/aftport/simulated_caves)
 "jrC" = (
 /obj/effect/zone_divider,
@@ -8864,13 +8750,7 @@
 /obj/effect/floor_decal/rust,
 /obj/effect/floor_decal/rust,
 /obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/tiled/techfloor/grid{
-	base_name = "maglev rails";
-	desc = "Train go brrrr.";
-	icon = 'icons/turf/flooring/maglevs.dmi';
-	icon_state = "maglevup";
-	name = "maglev rails"
-	},
+/turf/simulated/floor/tiled/techfloor/grid/train,
 /area/maintenance/firstdeck/foreport/simulated_caves)
 "jWz" = (
 /obj/effect/floor_decal/rust,
@@ -9336,13 +9216,7 @@
 "kLJ" = (
 /obj/effect/floor_decal/rust,
 /obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/tiled/techfloor/grid{
-	base_name = "maglev rails";
-	desc = "Train go brrrr.";
-	icon = 'icons/turf/flooring/maglevs.dmi';
-	icon_state = "maglevup";
-	name = "maglev rails"
-	},
+/turf/simulated/floor/tiled/techfloor/grid/train,
 /area/maintenance/firstdeck/centralport/simulated_caves)
 "kLW" = (
 /turf/simulated/floor/water/ocean,
@@ -9540,13 +9414,7 @@
 "lgW" = (
 /obj/effect/floor_decal/rust,
 /obj/effect/floor_decal/rust,
-/turf/simulated/floor/tiled/techfloor/grid{
-	base_name = "maglev rails";
-	desc = "Train go brrrr.";
-	icon = 'icons/turf/flooring/maglevs.dmi';
-	icon_state = "maglevup";
-	name = "maglev rails"
-	},
+/turf/simulated/floor/tiled/techfloor/grid/train,
 /area/maintenance/firstdeck/centralport/simulated_caves)
 "lhf" = (
 /obj/machinery/atmospherics/valve/digital/open{
@@ -9681,13 +9549,7 @@
 "lyn" = (
 /obj/effect/floor_decal/rust,
 /obj/effect/zone_divider,
-/turf/simulated/floor/tiled/techfloor/grid{
-	base_name = "maglev rails";
-	desc = "Train go brrrr.";
-	icon = 'icons/turf/flooring/maglevs.dmi';
-	icon_state = "maglevup";
-	name = "maglev rails"
-	},
+/turf/simulated/floor/tiled/techfloor/grid/train,
 /area/maintenance/firstdeck/foreport/simulated_caves)
 "lzT" = (
 /obj/effect/floor_decal/rust,
@@ -11520,13 +11382,7 @@
 "ovx" = (
 /obj/random/trash,
 /obj/effect/floor_decal/rust,
-/turf/simulated/floor/tiled/techfloor/grid{
-	base_name = "maglev rails";
-	desc = "Train go brrrr.";
-	icon = 'icons/turf/flooring/maglevs.dmi';
-	icon_state = "maglevup";
-	name = "maglev rails"
-	},
+/turf/simulated/floor/tiled/techfloor/grid/train,
 /area/maintenance/firstdeck/centralport/simulated_caves)
 "ovy" = (
 /obj/effect/zone_divider,
@@ -11920,13 +11776,7 @@
 "pay" = (
 /obj/effect/floor_decal/rust,
 /obj/effect/zone_divider,
-/turf/simulated/floor/tiled/techfloor/grid{
-	base_name = "maglev rails";
-	desc = "Train go brrrr.";
-	icon = 'icons/turf/flooring/maglevs.dmi';
-	icon_state = "maglevup";
-	name = "maglev rails"
-	},
+/turf/simulated/floor/tiled/techfloor/grid/train,
 /area/maintenance/firstdeck/aftport/simulated_caves)
 "pbQ" = (
 /obj/random/trash_pile,
@@ -12289,13 +12139,7 @@
 "pxd" = (
 /obj/effect/floor_decal/rust,
 /obj/effect/floor_decal/rust,
-/turf/simulated/floor/tiled/techfloor/grid{
-	base_name = "maglev rails";
-	desc = "Train go brrrr.";
-	icon = 'icons/turf/flooring/maglevs.dmi';
-	icon_state = "maglevup";
-	name = "maglev rails"
-	},
+/turf/simulated/floor/tiled/techfloor/grid/train,
 /area/maintenance/firstdeck/aftport/simulated_caves)
 "pxt" = (
 /obj/machinery/atmospherics/pipe/manifold/hidden/supply,
@@ -13085,13 +12929,7 @@
 "qCn" = (
 /obj/random/powercell,
 /obj/effect/floor_decal/rust,
-/turf/simulated/floor/tiled/techfloor/grid{
-	base_name = "maglev rails";
-	desc = "Train go brrrr.";
-	icon = 'icons/turf/flooring/maglevs.dmi';
-	icon_state = "maglevup";
-	name = "maglev rails"
-	},
+/turf/simulated/floor/tiled/techfloor/grid/train,
 /area/maintenance/firstdeck/centralport/simulated_caves)
 "qDM" = (
 /obj/machinery/button/remote/blast_door{
@@ -14023,13 +13861,7 @@
 /obj/random/trash,
 /obj/effect/floor_decal/rust,
 /obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/tiled/techfloor/grid{
-	base_name = "maglev rails";
-	desc = "Train go brrrr.";
-	icon = 'icons/turf/flooring/maglevs.dmi';
-	icon_state = "maglevup";
-	name = "maglev rails"
-	},
+/turf/simulated/floor/tiled/techfloor/grid/train,
 /area/maintenance/firstdeck/centralport/simulated_caves)
 "rWr" = (
 /obj/structure/curtain/open/privacy,
@@ -14344,13 +14176,7 @@
 "svI" = (
 /obj/structure/girder/displaced,
 /obj/effect/floor_decal/rust,
-/turf/simulated/floor/tiled/techfloor/grid{
-	base_name = "maglev rails";
-	desc = "Train go brrrr.";
-	icon = 'icons/turf/flooring/maglevs.dmi';
-	icon_state = "maglevup";
-	name = "maglev rails"
-	},
+/turf/simulated/floor/tiled/techfloor/grid/train,
 /area/maintenance/firstdeck/centralport/simulated_caves)
 "swE" = (
 /obj/structure/table/woodentable,
@@ -15082,24 +14908,12 @@
 /area/maintenance/firstdeck/centralport/simulated_caves)
 "twn" = (
 /obj/effect/floor_decal/rust,
-/turf/simulated/floor/tiled/techfloor/grid{
-	base_name = "maglev rails";
-	desc = "Train go brrrr.";
-	icon = 'icons/turf/flooring/maglevs.dmi';
-	icon_state = "maglevup";
-	name = "maglev rails"
-	},
+/turf/simulated/floor/tiled/techfloor/grid/train,
 /area/maintenance/firstdeck/centralport/simulated_caves)
 "twz" = (
 /obj/effect/floor_decal/rust,
 /obj/random/contraband,
-/turf/simulated/floor/tiled/techfloor/grid{
-	base_name = "maglev rails";
-	desc = "Train go brrrr.";
-	icon = 'icons/turf/flooring/maglevs.dmi';
-	icon_state = "maglevup";
-	name = "maglev rails"
-	},
+/turf/simulated/floor/tiled/techfloor/grid/train,
 /area/maintenance/firstdeck/centralport/simulated_caves)
 "twN" = (
 /obj/effect/floor_decal/rust,
@@ -16485,13 +16299,7 @@
 /obj/random/powercell,
 /obj/effect/floor_decal/rust,
 /obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/tiled/techfloor/grid{
-	base_name = "maglev rails";
-	desc = "Train go brrrr.";
-	icon = 'icons/turf/flooring/maglevs.dmi';
-	icon_state = "maglevup";
-	name = "maglev rails"
-	},
+/turf/simulated/floor/tiled/techfloor/grid/train,
 /area/maintenance/firstdeck/centralport/simulated_caves)
 "vwn" = (
 /obj/structure/curtain/open/privacy,
@@ -16803,13 +16611,7 @@
 /area/maintenance/firstdeck/foreport/simulated_caves)
 "vVV" = (
 /obj/effect/floor_decal/rust,
-/turf/simulated/floor/tiled/techfloor/grid{
-	base_name = "maglev rails";
-	desc = "Train go brrrr.";
-	icon = 'icons/turf/flooring/maglevs.dmi';
-	icon_state = "maglevup";
-	name = "maglev rails"
-	},
+/turf/simulated/floor/tiled/techfloor/grid/train,
 /area/maintenance/firstdeck/aftport/simulated_caves)
 "vWy" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -16944,13 +16746,7 @@
 /obj/effect/floor_decal/rust,
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/zone_divider,
-/turf/simulated/floor/tiled/techfloor/grid{
-	base_name = "maglev rails";
-	desc = "Train go brrrr.";
-	icon = 'icons/turf/flooring/maglevs.dmi';
-	icon_state = "maglevup";
-	name = "maglev rails"
-	},
+/turf/simulated/floor/tiled/techfloor/grid/train,
 /area/maintenance/firstdeck/foreport/simulated_caves)
 "wgL" = (
 /obj/effect/floor_decal/rust,
@@ -18539,13 +18335,7 @@
 /obj/random/trash,
 /obj/effect/floor_decal/rust,
 /obj/effect/floor_decal/rust,
-/turf/simulated/floor/tiled/techfloor/grid{
-	base_name = "maglev rails";
-	desc = "Train go brrrr.";
-	icon = 'icons/turf/flooring/maglevs.dmi';
-	icon_state = "maglevup";
-	name = "maglev rails"
-	},
+/turf/simulated/floor/tiled/techfloor/grid/train,
 /area/maintenance/firstdeck/centralport/simulated_caves)
 "xTH" = (
 /obj/structure/cable/green{
diff --git a/modular_chomp/maps/relic_base/relicbase-3.dmm b/modular_chomp/maps/relic_base/relicbase-3.dmm
index 99e8d5164a..f922b61fc1 100644
--- a/modular_chomp/maps/relic_base/relicbase-3.dmm
+++ b/modular_chomp/maps/relic_base/relicbase-3.dmm
@@ -19497,7 +19497,6 @@
 	anchored = 1;
 	canhear_range = 1;
 	frequency = 1487;
-	icon = 'icons/obj/items.dmi';
 	icon_state = "red_phone";
 	name = "Reception Emergency Phone";
 	pixel_x = -5
diff --git a/modular_chomp/maps/relic_base/relicbase-4.dmm b/modular_chomp/maps/relic_base/relicbase-4.dmm
index 2cbbed4faf..e73c305c5c 100644
--- a/modular_chomp/maps/relic_base/relicbase-4.dmm
+++ b/modular_chomp/maps/relic_base/relicbase-4.dmm
@@ -624,13 +624,10 @@
 	pixel_x = 1;
 	pixel_y = 8
 	},
-/obj/item/radio{
+/obj/item/radio/redphone{
+	name = "Virology Emergency Phone";
 	anchored = 1;
 	canhear_range = 7;
-	frequency = 1487;
-	icon = 'icons/obj/items.dmi';
-	icon_state = "red_phone";
-	name = "Virology Emergency Phone";
 	pixel_x = -6;
 	pixel_y = 8
 	},
diff --git a/modular_chomp/maps/soluna_nexus/soluna_nexus-1.dmm b/modular_chomp/maps/soluna_nexus/soluna_nexus-1.dmm
index 5dfdbb4f99..59cb87e071 100644
--- a/modular_chomp/maps/soluna_nexus/soluna_nexus-1.dmm
+++ b/modular_chomp/maps/soluna_nexus/soluna_nexus-1.dmm
@@ -5799,11 +5799,7 @@
 /area/hallway/Stairwell_For)
 "azv" = (
 /obj/structure/sign/nanotrasen,
-/turf/simulated/shuttle/wall/no_join{
-	base_state = "orange";
-	icon = 'icons/turf/shuttle_orange.dmi';
-	icon_state = "orange"
-	},
+/turf/simulated/shuttle/wall/no_join/orange,
 /area/shuttle/large_escape_pod1/station)
 "azD" = (
 /turf/simulated/floor/tiled,
@@ -5896,11 +5892,7 @@
 /area/quartermaster/Supply_Ship_Bay)
 "aAz" = (
 /obj/structure/sign/warning/evac,
-/turf/simulated/shuttle/wall/no_join{
-	base_state = "orange";
-	icon = 'icons/turf/shuttle_orange.dmi';
-	icon_state = "orange"
-	},
+/turf/simulated/shuttle/wall/no_join/orange,
 /area/shuttle/escape_pod5/station)
 "aAA" = (
 /obj/structure/table/rack/shelf/steel,
@@ -11285,11 +11277,7 @@
 /area/harbor/Dock5)
 "bLd" = (
 /obj/structure/sign/warning/evac,
-/turf/simulated/shuttle/wall/no_join{
-	base_state = "orange";
-	icon = 'icons/turf/shuttle_orange.dmi';
-	icon_state = "orange"
-	},
+/turf/simulated/shuttle/wall/no_join/orange,
 /area/shuttle/escape_pod6/station)
 "bLt" = (
 /obj/machinery/door/firedoor/border_only,
@@ -11453,11 +11441,7 @@
 /area/maintenance/Deck1_AftStar1_Corridor3)
 "bNP" = (
 /obj/structure/sign/warning/evac,
-/turf/simulated/shuttle/wall/no_join{
-	base_state = "orange";
-	icon = 'icons/turf/shuttle_orange.dmi';
-	icon_state = "orange"
-	},
+/turf/simulated/shuttle/wall/no_join/orange,
 /area/shuttle/escape_pod14/station)
 "bNS" = (
 /obj/effect/floor_decal/steeldecal/steel_decals4{
@@ -12436,11 +12420,7 @@
 /area/hallway/Cryostorage_Lounge)
 "cfj" = (
 /obj/structure/sign/nanotrasen,
-/turf/simulated/shuttle/wall/no_join{
-	base_state = "orange";
-	icon = 'icons/turf/shuttle_orange.dmi';
-	icon_state = "orange"
-	},
+/turf/simulated/shuttle/wall/no_join/orange,
 /area/shuttle/escape_pod8/station)
 "cfn" = (
 /obj/structure/bed/chair/bay/shuttle{
@@ -13404,11 +13384,7 @@
 /area/maintenance/Market_Stall_1)
 "cyo" = (
 /obj/structure/sign/warning/evac,
-/turf/simulated/shuttle/wall/no_join{
-	base_state = "orange";
-	icon = 'icons/turf/shuttle_orange.dmi';
-	icon_state = "orange"
-	},
+/turf/simulated/shuttle/wall/no_join/orange,
 /area/shuttle/escape_pod3/station)
 "cyp" = (
 /obj/structure/table,
@@ -13554,11 +13530,7 @@
 /area/maintenance/ab_Kitchen)
 "cAK" = (
 /obj/structure/sign/nanotrasen,
-/turf/simulated/shuttle/wall/no_join{
-	base_state = "orange";
-	icon = 'icons/turf/shuttle_orange.dmi';
-	icon_state = "orange"
-	},
+/turf/simulated/shuttle/wall/no_join/orange,
 /area/shuttle/escape_pod4/station)
 "cAL" = (
 /obj/machinery/door/firedoor/border_only,
@@ -18370,11 +18342,7 @@
 /area/maintenance/Telecomms_Substation)
 "dXm" = (
 /obj/structure/sign/warning/evac,
-/turf/simulated/shuttle/wall/no_join{
-	base_state = "orange";
-	icon = 'icons/turf/shuttle_orange.dmi';
-	icon_state = "orange"
-	},
+/turf/simulated/shuttle/wall/no_join/orange,
 /area/shuttle/large_escape_pod2/station)
 "dXn" = (
 /obj/structure/table/reinforced,
@@ -19288,11 +19256,7 @@
 /area/hallway/Aft_Transit_Lobby)
 "eaB" = (
 /obj/structure/sign/nanotrasen,
-/turf/simulated/shuttle/wall/no_join{
-	base_state = "orange";
-	icon = 'icons/turf/shuttle_orange.dmi';
-	icon_state = "orange"
-	},
+/turf/simulated/shuttle/wall/no_join/orange,
 /area/shuttle/escape_pod2/station)
 "eaE" = (
 /turf/simulated/wall,
@@ -20198,11 +20162,7 @@
 /area/maintenance/Deck1_ForPort_Chamber1)
 "eqf" = (
 /obj/structure/sign/warning/evac,
-/turf/simulated/shuttle/wall/no_join{
-	base_state = "orange";
-	icon = 'icons/turf/shuttle_orange.dmi';
-	icon_state = "orange"
-	},
+/turf/simulated/shuttle/wall/no_join/orange,
 /area/shuttle/escape_pod1/station)
 "eqg" = (
 /obj/machinery/door/firedoor/border_only,
@@ -27942,11 +27902,7 @@
 /area/harbor/Ship_Bay1)
 "hdP" = (
 /obj/structure/sign/warning/evac,
-/turf/simulated/shuttle/wall/no_join{
-	base_state = "orange";
-	icon = 'icons/turf/shuttle_orange.dmi';
-	icon_state = "orange"
-	},
+/turf/simulated/shuttle/wall/no_join/orange,
 /area/shuttle/large_escape_pod1/station)
 "hdQ" = (
 /obj/effect/floor_decal/borderfloorblack/corner{
@@ -32491,11 +32447,7 @@
 /area/maintenance/Market_Stall_1)
 "iQw" = (
 /obj/structure/sign/warning/evac,
-/turf/simulated/shuttle/wall/no_join{
-	base_state = "orange";
-	icon = 'icons/turf/shuttle_orange.dmi';
-	icon_state = "orange"
-	},
+/turf/simulated/shuttle/wall/no_join/orange,
 /area/shuttle/escape_pod7/station)
 "iQE" = (
 /obj/machinery/door/firedoor/border_only,
@@ -33951,11 +33903,7 @@
 /area/rnd/PA_Chamber)
 "juP" = (
 /obj/structure/sign/nanotrasen,
-/turf/simulated/shuttle/wall/no_join{
-	base_state = "orange";
-	icon = 'icons/turf/shuttle_orange.dmi';
-	icon_state = "orange"
-	},
+/turf/simulated/shuttle/wall/no_join/orange,
 /area/shuttle/escape_pod1/station)
 "juW" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -35879,11 +35827,7 @@
 /area/hallway/Star_1Deck_Central_Corridor_1)
 "keq" = (
 /obj/structure/sign/warning/evac,
-/turf/simulated/shuttle/wall/no_join{
-	base_state = "orange";
-	icon = 'icons/turf/shuttle_orange.dmi';
-	icon_state = "orange"
-	},
+/turf/simulated/shuttle/wall/no_join/orange,
 /area/shuttle/escape_pod4/station)
 "ker" = (
 /turf/simulated/floor/tiled/white,
@@ -38272,11 +38216,7 @@
 /area/security/Quantum_Pad_Checkpoint)
 "lbI" = (
 /obj/structure/sign/nanotrasen,
-/turf/simulated/shuttle/wall/no_join{
-	base_state = "orange";
-	icon = 'icons/turf/shuttle_orange.dmi';
-	icon_state = "orange"
-	},
+/turf/simulated/shuttle/wall/no_join/orange,
 /area/shuttle/escape_pod6/station)
 "lbL" = (
 /obj/machinery/atmospherics/unary/vent_scrubber/on,
@@ -43040,11 +42980,7 @@
 /area/maintenance/Distro_Central)
 "mHK" = (
 /obj/structure/sign/nanotrasen,
-/turf/simulated/shuttle/wall/no_join{
-	base_state = "orange";
-	icon = 'icons/turf/shuttle_orange.dmi';
-	icon_state = "orange"
-	},
+/turf/simulated/shuttle/wall/no_join/orange,
 /area/shuttle/escape_pod7/station)
 "mIi" = (
 /obj/structure/shuttle/engine/propulsion/burst{
@@ -45723,11 +45659,7 @@
 /area/rnd/Research_Ship_Bay)
 "nJN" = (
 /obj/structure/sign/warning/evac,
-/turf/simulated/shuttle/wall/no_join{
-	base_state = "orange";
-	icon = 'icons/turf/shuttle_orange.dmi';
-	icon_state = "orange"
-	},
+/turf/simulated/shuttle/wall/no_join/orange,
 /area/shuttle/escape_pod8/station)
 "nJW" = (
 /obj/machinery/atmospherics/unary/vent_pump/on{
@@ -48689,11 +48621,7 @@
 /turf/simulated/floor/tiled/white,
 /area/maintenance/ab_Medical)
 "oIG" = (
-/turf/simulated/shuttle/wall/no_join{
-	base_state = "orange";
-	icon = 'icons/turf/shuttle_orange.dmi';
-	icon_state = "orange"
-	},
+/turf/simulated/shuttle/wall/no_join/orange,
 /area/shuttle/large_escape_pod2/station)
 "oII" = (
 /turf/simulated/wall,
@@ -50466,11 +50394,7 @@
 /area/hallway/ForStar_1_Deck_Observatory)
 "pkU" = (
 /obj/structure/sign/warning/evac,
-/turf/simulated/shuttle/wall/no_join{
-	base_state = "orange";
-	icon = 'icons/turf/shuttle_orange.dmi';
-	icon_state = "orange"
-	},
+/turf/simulated/shuttle/wall/no_join/orange,
 /area/shuttle/escape_pod2/station)
 "pkW" = (
 /obj/machinery/atmospherics/pipe/manifold/hidden/supply,
@@ -56839,11 +56763,7 @@
 /obj/structure/sign/nanotrasen{
 	icon_rotation = 90
 	},
-/turf/simulated/shuttle/wall/no_join{
-	base_state = "orange";
-	icon = 'icons/turf/shuttle_orange.dmi';
-	icon_state = "orange"
-	},
+/turf/simulated/shuttle/wall/no_join/orange,
 /area/shuttle/escape_pod14/station)
 "ruP" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -63773,11 +63693,7 @@
 /obj/structure/sign/nanotrasen{
 	icon_rotation = 90
 	},
-/turf/simulated/shuttle/wall/no_join{
-	base_state = "orange";
-	icon = 'icons/turf/shuttle_orange.dmi';
-	icon_state = "orange"
-	},
+/turf/simulated/shuttle/wall/no_join/orange,
 /area/shuttle/escape_pod13/station)
 "uat" = (
 /turf/simulated/wall/r_wall,
@@ -64544,11 +64460,7 @@
 /area/shuttle/needle)
 "uoq" = (
 /obj/structure/sign/warning/evac,
-/turf/simulated/shuttle/wall/no_join{
-	base_state = "orange";
-	icon = 'icons/turf/shuttle_orange.dmi';
-	icon_state = "orange"
-	},
+/turf/simulated/shuttle/wall/no_join/orange,
 /area/shuttle/escape_pod13/station)
 "uoE" = (
 /obj/effect/catwalk_plated/techmaint,
@@ -65100,11 +65012,7 @@
 /area/crew_quarters/For_Restroom)
 "uzg" = (
 /obj/structure/sign/nanotrasen,
-/turf/simulated/shuttle/wall/no_join{
-	base_state = "orange";
-	icon = 'icons/turf/shuttle_orange.dmi';
-	icon_state = "orange"
-	},
+/turf/simulated/shuttle/wall/no_join/orange,
 /area/shuttle/escape_pod3/station)
 "uzh" = (
 /turf/simulated/wall,
@@ -68133,11 +68041,7 @@
 /area/shuttle/expoutpost/station)
 "vzy" = (
 /obj/structure/sign/nanotrasen,
-/turf/simulated/shuttle/wall/no_join{
-	base_state = "orange";
-	icon = 'icons/turf/shuttle_orange.dmi';
-	icon_state = "orange"
-	},
+/turf/simulated/shuttle/wall/no_join/orange,
 /area/shuttle/escape_pod5/station)
 "vzJ" = (
 /obj/structure/table/rack/shelf,
@@ -75203,11 +75107,7 @@
 /turf/simulated/floor/tiled,
 /area/harbor/Dock4)
 "ybW" = (
-/turf/simulated/shuttle/wall/no_join{
-	base_state = "orange";
-	icon = 'icons/turf/shuttle_orange.dmi';
-	icon_state = "orange"
-	},
+/turf/simulated/shuttle/wall/no_join/orange,
 /area/shuttle/large_escape_pod1/station)
 "ycf" = (
 /obj/machinery/vending/cola,
@@ -75713,11 +75613,7 @@
 /area/quartermaster/Mining_Ship_Bay)
 "ylw" = (
 /obj/structure/sign/nanotrasen,
-/turf/simulated/shuttle/wall/no_join{
-	base_state = "orange";
-	icon = 'icons/turf/shuttle_orange.dmi';
-	icon_state = "orange"
-	},
+/turf/simulated/shuttle/wall/no_join/orange,
 /area/shuttle/large_escape_pod2/station)
 "ylB" = (
 /obj/structure/table/glass,
diff --git a/modular_chomp/maps/soluna_nexus/soluna_nexus-2.dmm b/modular_chomp/maps/soluna_nexus/soluna_nexus-2.dmm
index 9af54b73bb..b5acf313d0 100644
--- a/modular_chomp/maps/soluna_nexus/soluna_nexus-2.dmm
+++ b/modular_chomp/maps/soluna_nexus/soluna_nexus-2.dmm
@@ -2095,11 +2095,7 @@
 /area/maintenance/Deck2_Engineering_ForStarChamber2)
 "adw" = (
 /obj/structure/sign/warning/evac,
-/turf/simulated/shuttle/wall/no_join{
-	base_state = "orange";
-	icon = 'icons/turf/shuttle_orange.dmi';
-	icon_state = "orange"
-	},
+/turf/simulated/shuttle/wall/no_join/orange,
 /area/shuttle/escape_pod9/station)
 "adx" = (
 /obj/effect/catwalk_plated/techmaint,
@@ -11016,11 +11012,7 @@
 /area/shuttle/escape_pod9/station)
 "atW" = (
 /obj/structure/sign/nanotrasen,
-/turf/simulated/shuttle/wall/no_join{
-	base_state = "orange";
-	icon = 'icons/turf/shuttle_orange.dmi';
-	icon_state = "orange"
-	},
+/turf/simulated/shuttle/wall/no_join/orange,
 /area/shuttle/large_escape_pod4/station)
 "atX" = (
 /obj/machinery/door/firedoor/border_only,
@@ -13894,7 +13886,6 @@
 	anchored = 1;
 	canhear_range = 1;
 	frequency = 1487;
-	icon = 'icons/obj/items.dmi';
 	icon_state = "red_phone";
 	name = "Reception Emergency Phone";
 	pixel_y = 2
@@ -16720,9 +16711,7 @@
 "aNL" = (
 /obj/structure/lattice,
 /obj/effect/catwalk_plated/white,
-/obj/machinery/mech_recharger{
-	icon = 'icons/turf/shuttle_alien_blue.dmi'
-	},
+/obj/machinery/mech_recharger/alien,
 /obj/mecha/combat/fighter/baron{
 	dir = 1
 	},
@@ -30099,11 +30088,7 @@
 /area/shuttle/escape_pod10/station)
 "bLi" = (
 /obj/structure/sign/nanotrasen,
-/turf/simulated/shuttle/wall/no_join{
-	base_state = "orange";
-	icon = 'icons/turf/shuttle_orange.dmi';
-	icon_state = "orange"
-	},
+/turf/simulated/shuttle/wall/no_join/orange,
 /area/shuttle/escape_pod10/station)
 "bLj" = (
 /turf/simulated/wall/rthull,
@@ -31048,9 +31033,7 @@
 "bOH" = (
 /obj/structure/lattice,
 /obj/effect/catwalk_plated/white,
-/obj/machinery/mech_recharger{
-	icon = 'icons/turf/shuttle_alien_blue.dmi'
-	},
+/obj/machinery/mech_recharger/alien,
 /turf/space,
 /area/harbor/Aft_Shuttlebay)
 "bOK" = (
@@ -35860,11 +35843,7 @@
 /area/engineering/Drone_Fab)
 "cgf" = (
 /obj/structure/sign/nanotrasen,
-/turf/simulated/shuttle/wall/no_join{
-	base_state = "orange";
-	icon = 'icons/turf/shuttle_orange.dmi';
-	icon_state = "orange"
-	},
+/turf/simulated/shuttle/wall/no_join/orange,
 /area/shuttle/escape_pod9/station)
 "cgg" = (
 /turf/simulated/wall/r_wall,
@@ -36105,11 +36084,7 @@
 /area/security/Wardens_Office)
 "chc" = (
 /obj/structure/sign/nanotrasen,
-/turf/simulated/shuttle/wall/no_join{
-	base_state = "orange";
-	icon = 'icons/turf/shuttle_orange.dmi';
-	icon_state = "orange"
-	},
+/turf/simulated/shuttle/wall/no_join/orange,
 /area/shuttle/escape_pod11/station)
 "chd" = (
 /obj/structure/closet/lasertag/red,
@@ -46363,11 +46338,7 @@
 /area/maintenance/Deck2_Civilian_AftPortCorridor1)
 "dzn" = (
 /obj/structure/sign/warning/evac,
-/turf/simulated/shuttle/wall/no_join{
-	base_state = "orange";
-	icon = 'icons/turf/shuttle_orange.dmi';
-	icon_state = "orange"
-	},
+/turf/simulated/shuttle/wall/no_join/orange,
 /area/shuttle/large_escape_pod4/station)
 "dzw" = (
 /obj/effect/floor_decal/industrial/hatch/red,
@@ -61476,9 +61447,7 @@
 "hmH" = (
 /obj/structure/lattice,
 /obj/effect/catwalk_plated/white,
-/obj/machinery/mech_recharger{
-	icon = 'icons/turf/shuttle_alien_blue.dmi'
-	},
+/obj/machinery/mech_recharger/alien,
 /turf/space,
 /area/harbor/Star_Shuttlebay)
 "hnd" = (
@@ -62994,11 +62963,7 @@
 /area/quartermaster/Aft_Tool_Storage)
 "hMh" = (
 /obj/structure/sign/warning/evac,
-/turf/simulated/shuttle/wall/no_join{
-	base_state = "orange";
-	icon = 'icons/turf/shuttle_orange.dmi';
-	icon_state = "orange"
-	},
+/turf/simulated/shuttle/wall/no_join/orange,
 /area/shuttle/escape_pod10/station)
 "hMv" = (
 /obj/effect/floor_decal/industrial/arrows{
@@ -70905,9 +70870,7 @@
 "jUJ" = (
 /obj/structure/lattice,
 /obj/effect/catwalk_plated/white,
-/obj/machinery/mech_recharger{
-	icon = 'icons/turf/shuttle_alien_blue.dmi'
-	},
+/obj/machinery/mech_recharger/alien,
 /turf/space,
 /area/harbor/For_Shuttlebay)
 "jUU" = (
@@ -74783,11 +74746,7 @@
 /area/maintenance/Deck2_Medical_AftCorridor2)
 "kZB" = (
 /obj/structure/sign/nanotrasen,
-/turf/simulated/shuttle/wall/no_join{
-	base_state = "orange";
-	icon = 'icons/turf/shuttle_orange.dmi';
-	icon_state = "orange"
-	},
+/turf/simulated/shuttle/wall/no_join/orange,
 /area/shuttle/large_escape_pod3/station)
 "kZG" = (
 /obj/structure/girder,
@@ -79855,11 +79814,7 @@
 /turf/simulated/floor/tiled,
 /area/hallway/Port_2_Deck_Central_Corridor_1)
 "mBX" = (
-/turf/simulated/shuttle/wall/no_join{
-	base_state = "orange";
-	icon = 'icons/turf/shuttle_orange.dmi';
-	icon_state = "orange"
-	},
+/turf/simulated/shuttle/wall/no_join/orange,
 /area/shuttle/large_escape_pod3/station)
 "mBY" = (
 /obj/machinery/door/firedoor/glass,
@@ -81121,11 +81076,7 @@
 /area/maintenance/Deck2_Civilian_StarChamber2)
 "mQX" = (
 /obj/structure/sign/nanotrasen,
-/turf/simulated/shuttle/wall/no_join{
-	base_state = "orange";
-	icon = 'icons/turf/shuttle_orange.dmi';
-	icon_state = "orange"
-	},
+/turf/simulated/shuttle/wall/no_join/orange,
 /area/shuttle/escape_pod12/station)
 "mQY" = (
 /obj/structure/table/rack/shelf,
@@ -92367,11 +92318,7 @@
 /area/engineering/CE_Office)
 "qfw" = (
 /obj/structure/sign/warning/evac,
-/turf/simulated/shuttle/wall/no_join{
-	base_state = "orange";
-	icon = 'icons/turf/shuttle_orange.dmi';
-	icon_state = "orange"
-	},
+/turf/simulated/shuttle/wall/no_join/orange,
 /area/shuttle/large_escape_pod3/station)
 "qfA" = (
 /obj/item/towel/random{
@@ -92812,11 +92759,7 @@
 /turf/simulated/floor/tiled,
 /area/security/Visitation_Room)
 "qli" = (
-/turf/simulated/shuttle/wall/no_join{
-	base_state = "orange";
-	icon = 'icons/turf/shuttle_orange.dmi';
-	icon_state = "orange"
-	},
+/turf/simulated/shuttle/wall/no_join/orange,
 /area/shuttle/large_escape_pod4/station)
 "qlp" = (
 /obj/structure/table/woodentable,
@@ -98315,11 +98258,7 @@
 /area/hallway/Central_2_Deck_Hall)
 "rHN" = (
 /obj/structure/sign/warning/evac,
-/turf/simulated/shuttle/wall/no_join{
-	base_state = "orange";
-	icon = 'icons/turf/shuttle_orange.dmi';
-	icon_state = "orange"
-	},
+/turf/simulated/shuttle/wall/no_join/orange,
 /area/shuttle/escape_pod12/station)
 "rHO" = (
 /obj/effect/catwalk_plated/techmaint,
@@ -107184,11 +107123,7 @@
 /area/hallway/Port_2_Deck_Central_Corridor_1)
 "ugY" = (
 /obj/structure/sign/warning/evac,
-/turf/simulated/shuttle/wall/no_join{
-	base_state = "orange";
-	icon = 'icons/turf/shuttle_orange.dmi';
-	icon_state = "orange"
-	},
+/turf/simulated/shuttle/wall/no_join/orange,
 /area/shuttle/escape_pod11/station)
 "uhk" = (
 /obj/machinery/door/firedoor/border_only,
@@ -119226,9 +119161,7 @@
 "xHj" = (
 /obj/structure/lattice,
 /obj/effect/catwalk_plated/white,
-/obj/machinery/mech_recharger{
-	icon = 'icons/turf/shuttle_alien_blue.dmi'
-	},
+/obj/machinery/mech_recharger/alien,
 /turf/space,
 /area/harbor/Port_Shuttlebay)
 "xHq" = (
diff --git a/modular_chomp/maps/soluna_nexus/soluna_nexus-3.dmm b/modular_chomp/maps/soluna_nexus/soluna_nexus-3.dmm
index 162fecaa5a..a995917e0a 100644
--- a/modular_chomp/maps/soluna_nexus/soluna_nexus-3.dmm
+++ b/modular_chomp/maps/soluna_nexus/soluna_nexus-3.dmm
@@ -60627,13 +60627,10 @@
 /area/medical/Aft_Medical_Post)
 "tKl" = (
 /obj/structure/table/glass,
-/obj/item/radio{
+/obj/item/radio/redphone{
+	name = "Virology Emergency Phone";
 	anchored = 1;
 	canhear_range = 7;
-	frequency = 1487;
-	icon = 'icons/obj/items.dmi';
-	icon_state = "red_phone";
-	name = "Virology Emergency Phone";
 	pixel_y = 3
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
diff --git a/modular_chomp/maps/soluna_nexus/soluna_nexus-7.dmm b/modular_chomp/maps/soluna_nexus/soluna_nexus-7.dmm
index 93d7c437bb..5e938dc825 100644
--- a/modular_chomp/maps/soluna_nexus/soluna_nexus-7.dmm
+++ b/modular_chomp/maps/soluna_nexus/soluna_nexus-7.dmm
@@ -614,9 +614,7 @@
 /turf/simulated/shuttle/plating/airless/carry,
 /area/shuttle/syndicate_elite/mothership)
 "akO" = (
-/obj/effect/floor_decal/sign/small_7{
-	icon = 'icons/turf/flooring/decals.dmi'
-	},
+/obj/effect/floor_decal/sign/small_7/decal,
 /turf/simulated/floor/holofloor/wood,
 /area/holodeck/source_chess)
 "ala" = (
@@ -692,9 +690,7 @@
 /turf/simulated/floor/carpet/turcarpet,
 /area/shadekin)
 "arj" = (
-/obj/effect/floor_decal/sign/small_5{
-	icon = 'icons/turf/flooring/decals.dmi'
-	},
+/obj/effect/floor_decal/sign/small_5/decal,
 /turf/simulated/floor/holofloor/wood,
 /area/holodeck/source_chess)
 "arT" = (
@@ -810,11 +806,7 @@
 /turf/simulated/floor/bronze,
 /area/holodeck/source_meetinghall)
 "auX" = (
-/turf/unsimulated/floor{
-	icon = 'icons/turf/snow_new.dmi';
-	icon_state = "snow";
-	name = "snow"
-	},
+/turf/unsimulated/floor/snow_new,
 /area/ninja_dojo/dojo)
 "avb" = (
 /obj/effect/floor_decal/milspec/color/black,
@@ -837,11 +829,7 @@
 /area/tdome)
 "awz" = (
 /obj/effect/floor_decal/asteroid,
-/turf/unsimulated/floor{
-	icon = 'icons/turf/snow_new.dmi';
-	icon_state = "snow";
-	name = "snow"
-	},
+/turf/unsimulated/floor/snow_new,
 /area/ninja_dojo/dojo)
 "awC" = (
 /turf/unsimulated/beach/sand,
@@ -891,9 +879,7 @@
 /turf/simulated/mineral,
 /area/skipjack_station)
 "ayE" = (
-/obj/effect/floor_decal/sign/small_4{
-	icon = 'icons/turf/flooring/decals.dmi'
-	},
+/obj/effect/floor_decal/sign/small_4/decal,
 /turf/simulated/floor/holofloor/wood,
 /area/holodeck/source_chess)
 "ayP" = (
@@ -980,9 +966,7 @@
 	},
 /area/skipjack_station)
 "aFt" = (
-/obj/effect/floor_decal/sign/small_3{
-	icon = 'icons/turf/flooring/decals.dmi'
-	},
+/obj/effect/floor_decal/sign/small_3/decal,
 /turf/simulated/floor/holofloor/wood,
 /area/holodeck/source_chess)
 "aFz" = (
@@ -1304,9 +1288,7 @@
 /turf/simulated/shuttle/floor/white,
 /area/centcom/evac)
 "aQI" = (
-/obj/effect/floor_decal/sign/small_2{
-	icon = 'icons/turf/flooring/decals.dmi'
-	},
+/obj/effect/floor_decal/sign/small_2/decal,
 /turf/simulated/floor/holofloor/wood,
 /area/holodeck/source_chess)
 "aQJ" = (
@@ -1510,9 +1492,7 @@
 	},
 /area/skipjack_station)
 "aZo" = (
-/obj/effect/floor_decal/sign/small_1{
-	icon = 'icons/turf/flooring/decals.dmi'
-	},
+/obj/effect/floor_decal/sign/small_1/decal,
 /turf/simulated/floor/holofloor/wood,
 /area/holodeck/source_chess)
 "aZG" = (
@@ -3375,9 +3355,7 @@
 /turf/simulated/floor/tiled/techmaint,
 /area/shadekin)
 "cyR" = (
-/obj/effect/floor_decal/sign/small_a{
-	icon = 'icons/turf/flooring/decals.dmi'
-	},
+/obj/effect/floor_decal/sign/small_a/decal,
 /turf/simulated/floor/holofloor/wood,
 /area/holodeck/source_chess)
 "czr" = (
@@ -3616,12 +3594,7 @@
 	},
 /area/centcom/specops)
 "cIR" = (
-/turf/unsimulated/wall{
-	desc = "That looks like it doesn't open easily.";
-	icon = 'icons/obj/doors/rapid_pdoor.dmi';
-	icon_state = "pdoor1";
-	name = "Shuttle Bay Blast Door"
-	},
+/turf/unsimulated/wall/shuttle_bay,
 /area/syndicate_mothership/elite_squad)
 "cJi" = (
 /obj/mecha/medical/odysseus/loaded,
@@ -3655,9 +3628,7 @@
 	},
 /area/ninja_dojo/dojo)
 "cJI" = (
-/obj/effect/floor_decal/sign/small_8{
-	icon = 'icons/turf/flooring/decals.dmi'
-	},
+/obj/effect/floor_decal/sign/small_8/decal,
 /turf/simulated/floor/holofloor/wood,
 /area/holodeck/source_chess)
 "cJV" = (
@@ -3742,9 +3713,7 @@
 /turf/simulated/floor/wood/alt,
 /area/shadekin)
 "cNE" = (
-/obj/effect/floor_decal/sign/small_b{
-	icon = 'icons/turf/flooring/decals.dmi'
-	},
+/obj/effect/floor_decal/sign/small_b/decal,
 /turf/simulated/floor/holofloor/wood,
 /area/holodeck/source_chess)
 "cNG" = (
@@ -3756,9 +3725,7 @@
 	},
 /area/shuttle/trade)
 "cOx" = (
-/obj/effect/floor_decal/sign/small_c{
-	icon = 'icons/turf/flooring/decals.dmi'
-	},
+/obj/effect/floor_decal/sign/small_c/decal,
 /turf/simulated/floor/holofloor/wood,
 /area/holodeck/source_chess)
 "cOL" = (
@@ -4154,9 +4121,7 @@
 	},
 /area/centcom/specops)
 "dgc" = (
-/obj/effect/floor_decal/sign/small_d{
-	icon = 'icons/turf/flooring/decals.dmi'
-	},
+/obj/effect/floor_decal/sign/small_d/decal,
 /turf/simulated/floor/holofloor/wood,
 /area/holodeck/source_chess)
 "dgU" = (
@@ -4251,9 +4216,7 @@
 /turf/simulated/shuttle/wall,
 /area/shuttle/escape/centcom)
 "dmw" = (
-/obj/effect/floor_decal/sign/small_e{
-	icon = 'icons/turf/flooring/decals.dmi'
-	},
+/obj/effect/floor_decal/sign/small_e/decal,
 /turf/simulated/floor/holofloor/wood,
 /area/holodeck/source_chess)
 "dmB" = (
@@ -4630,9 +4593,7 @@
 /turf/simulated/shuttle/floor/black,
 /area/shuttle/merchant)
 "dFq" = (
-/obj/effect/floor_decal/sign/small_f{
-	icon = 'icons/turf/flooring/decals.dmi'
-	},
+/obj/effect/floor_decal/sign/small_f/decal,
 /turf/simulated/floor/holofloor/wood,
 /area/holodeck/source_chess)
 "dFB" = (
@@ -4726,9 +4687,7 @@
 /turf/simulated/floor/smole/grass,
 /area/holodeck/source_smoleworld)
 "dIk" = (
-/obj/effect/floor_decal/sign/small_g{
-	icon = 'icons/turf/flooring/decals.dmi'
-	},
+/obj/effect/floor_decal/sign/small_g/decal,
 /turf/simulated/floor/holofloor/wood,
 /area/holodeck/source_chess)
 "dIK" = (
@@ -5926,8 +5885,7 @@
 "ePs" = (
 /obj/structure/bed/padded,
 /obj/item/bedsheet/orange,
-/turf/unsimulated/floor{
-	icon = 'icons/turf/flooring/wood.dmi';
+/turf/unsimulated/floor/wood{
 	icon_state = "wood-broken1"
 	},
 /area/skipjack_station)
@@ -5988,9 +5946,7 @@
 	},
 /area/wizard_station)
 "eRl" = (
-/obj/effect/floor_decal/sign/small_h{
-	icon = 'icons/turf/flooring/decals.dmi'
-	},
+/obj/effect/floor_decal/sign/small_h/decal,
 /turf/simulated/floor/holofloor/wood,
 /area/holodeck/source_chess)
 "eRT" = (
@@ -7096,9 +7052,7 @@
 	},
 /area/centcom/main_hall)
 "gav" = (
-/obj/machinery/door/airlock{
-	icon = 'icons/obj/doors/Dooruranium.dmi'
-	},
+/obj/machinery/door/airlock/uranium_appearance,
 /turf/unsimulated/floor{
 	icon_state = "dark"
 	},
@@ -7126,9 +7080,7 @@
 /turf/simulated/shuttle/floor/black,
 /area/shuttle/merchant)
 "gbB" = (
-/obj/machinery/door/airlock{
-	icon = 'icons/obj/doors/Dooruranium.dmi'
-	},
+/obj/machinery/door/airlock/uranium_appearance,
 /turf/unsimulated/floor{
 	icon_state = "plating";
 	name = "plating"
@@ -7939,12 +7891,7 @@
 /turf/simulated/shuttle/floor/white,
 /area/shuttle/escape/centcom)
 "gJV" = (
-/turf/unsimulated/wall{
-	desc = "That looks like it doesn't open easily.";
-	icon = 'icons/obj/doors/rapid_pdoor.dmi';
-	icon_state = "pdoor1";
-	name = "Shuttle Bay Blast Door"
-	},
+/turf/unsimulated/wall/shuttle_bay,
 /area/skipjack_station)
 "gKE" = (
 /obj/effect/floor_decal/spline/fancy{
@@ -8362,12 +8309,7 @@
 /turf/simulated/shuttle/floor/skipjack,
 /area/shuttle/syndicate_elite/mothership)
 "hdC" = (
-/turf/unsimulated/wall{
-	desc = "That looks like it doesn't open easily.";
-	icon = 'icons/obj/doors/rapid_pdoor.dmi';
-	icon_state = "pdoor1";
-	name = "Shuttle Bay Blast Door"
-	},
+/turf/unsimulated/wall/shuttle_bay,
 /area/space)
 "hel" = (
 /obj/effect/floor_decal/milspec/monotile,
@@ -8800,8 +8742,7 @@
 /turf/simulated/shuttle/wall/dark/hard_corner,
 /area/wizard_station)
 "hrC" = (
-/turf/unsimulated/floor{
-	icon = 'icons/turf/flooring/wood.dmi';
+/turf/unsimulated/floor/wood{
 	icon_state = "wood-broken3"
 	},
 /area/skipjack_station)
@@ -9496,8 +9437,7 @@
 /obj/effect/landmark{
 	name = "voxstart"
 	},
-/turf/unsimulated/floor{
-	icon = 'icons/turf/flooring/wood.dmi';
+/turf/unsimulated/floor/wood{
 	icon_state = "wood-broken2"
 	},
 /area/skipjack_station)
@@ -10265,8 +10205,7 @@
 /turf/simulated/shuttle/floor/red,
 /area/shuttle/skipjack)
 "iCl" = (
-/turf/unsimulated/floor{
-	icon = 'icons/turf/flooring/wood.dmi';
+/turf/unsimulated/floor/wood{
 	icon_state = "wood-broken1"
 	},
 /area/ninja_dojo/dojo)
@@ -10441,11 +10380,7 @@
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/shadekin)
 "iJS" = (
-/turf/simulated/shuttle/wall/no_join{
-	base_state = "orange";
-	icon = 'icons/turf/shuttle_orange.dmi';
-	icon_state = "orange"
-	},
+/turf/simulated/shuttle/wall/no_join/orange,
 /area/centcom/evac)
 "iKe" = (
 /turf/unsimulated/floor{
@@ -10540,13 +10475,9 @@
 /turf/simulated/shuttle/floor/black,
 /area/centcom/evac)
 "iQW" = (
-/turf/unsimulated/wall{
+/turf/unsimulated/wall/fake_dark{
 	block_tele = 1;
-	blocks_nonghost_incorporeal = 1;
-	desc = "It's a strange, impenetrable darkness.";
-	icon = 'icons/turf/flooring/weird_vr.dmi';
-	icon_state = "dark";
-	name = "dark"
+	blocks_nonghost_incorporeal = 1
 	},
 /area/shadekin)
 "iQX" = (
@@ -11137,13 +11068,9 @@
 	},
 /area/syndicate_station)
 "jsz" = (
-/turf/unsimulated/wall{
+/turf/unsimulated/wall/fake_dark{
 	block_tele = 1;
-	blocks_nonghost_incorporeal = 1;
-	desc = "It's a strange, impenetrable darkness.";
-	icon = 'icons/turf/flooring/weird_vr.dmi';
-	icon_state = "dark";
-	name = "dark"
+	blocks_nonghost_incorporeal = 1
 	},
 /area/space)
 "jsR" = (
@@ -11339,12 +11266,8 @@
 	},
 /area/wizard_station)
 "jxr" = (
-/turf/unsimulated/wall{
-	desc = "That looks like it doesn't open easily.";
-	dir = 8;
-	icon = 'icons/obj/doors/rapid_pdoor.dmi';
-	icon_state = "pdoor1";
-	name = "Shuttle Bay Blast Door"
+/turf/unsimulated/wall/shuttle_bay{
+	dir = 8
 	},
 /area/centcom/specops)
 "jxJ" = (
@@ -11578,9 +11501,7 @@
 	},
 /area/centcom/bar)
 "jKl" = (
-/obj/machinery/door/airlock{
-	icon = 'icons/obj/doors/Dooruranium.dmi'
-	},
+/obj/machinery/door/airlock/uranium_appearance,
 /turf/unsimulated/floor{
 	dir = 8;
 	icon_state = "wood"
@@ -12180,9 +12101,7 @@
 	},
 /area/centcom/medical)
 "kkH" = (
-/obj/effect/floor_decal/sign/small_6{
-	icon = 'icons/turf/flooring/decals.dmi'
-	},
+/obj/effect/floor_decal/sign/small_6/decal,
 /turf/simulated/floor/holofloor/wood,
 /area/holodeck/source_chess)
 "kkP" = (
@@ -12235,11 +12154,7 @@
 /area/centcom/medical)
 "klw" = (
 /obj/structure/flora/tree/pine,
-/turf/unsimulated/floor{
-	icon = 'icons/turf/snow_new.dmi';
-	icon_state = "snow";
-	name = "snow"
-	},
+/turf/unsimulated/floor/snow_new,
 /area/ninja_dojo/dojo)
 "kmc" = (
 /obj/machinery/door/airlock/silver{
@@ -12343,11 +12258,7 @@
 /area/centcom/medical)
 "kog" = (
 /obj/structure/flora/ausbushes/palebush,
-/turf/unsimulated/floor{
-	icon = 'icons/turf/snow_new.dmi';
-	icon_state = "snow";
-	name = "snow"
-	},
+/turf/unsimulated/floor/snow_new,
 /area/ninja_dojo/dojo)
 "koh" = (
 /obj/effect/floor_decal/corner/white/diagonal,
@@ -12391,11 +12302,7 @@
 	dir = 4;
 	health = 1e+006
 	},
-/turf/unsimulated/floor{
-	icon = 'icons/turf/snow_new.dmi';
-	icon_state = "snow";
-	name = "snow"
-	},
+/turf/unsimulated/floor/snow_new,
 /area/ninja_dojo/dojo)
 "krw" = (
 /obj/effect/floor_decal/corner/green{
@@ -12564,21 +12471,13 @@
 /turf/simulated/shuttle/floor/yellow,
 /area/centcom/evac)
 "kwj" = (
-/turf/unsimulated/wall{
-	icon = 'icons/obj/doors/Doormaint.dmi';
-	icon_state = "door_closed";
-	name = "Sealed Door"
-	},
+/turf/unsimulated/wall/fake_uranium,
 /area/centcom/bar)
 "kwv" = (
 /obj/structure/window/reinforced{
 	dir = 8
 	},
-/turf/unsimulated/floor{
-	icon = 'icons/turf/snow_new.dmi';
-	icon_state = "snow";
-	name = "snow"
-	},
+/turf/unsimulated/floor/snow_new,
 /area/ninja_dojo/dojo)
 "kwC" = (
 /turf/unsimulated/floor,
@@ -15765,12 +15664,8 @@
 /turf/simulated/floor/tiled/freezer,
 /area/shadekin)
 "npP" = (
-/turf/unsimulated/wall{
-	desc = "That looks like it doesn't open easily.";
-	dir = 8;
-	icon = 'icons/obj/doors/rapid_pdoor.dmi';
-	icon_state = "pdoor1";
-	name = "Shuttle Bay Blast Door"
+/turf/unsimulated/wall/shuttle_bay{
+	dir = 8
 	},
 /area/centcom/command)
 "nqa" = (
@@ -17281,11 +17176,7 @@
 /turf/simulated/shuttle/floor,
 /area/shuttle/escape/centcom)
 "oLs" = (
-/turf/unsimulated/wall{
-	icon = 'icons/obj/doors/Dooruranium.dmi';
-	icon_state = "door_closed";
-	name = "Sealed Door"
-	},
+/turf/unsimulated/wall/fake_uranium,
 /area/ninja_dojo/dojo)
 "oLt" = (
 /obj/structure/sign/double/barsign,
@@ -17743,11 +17634,7 @@
 /turf/simulated/floor/holofloor/lino,
 /area/holodeck/source_meetinghall)
 "pir" = (
-/turf/unsimulated/wall{
-	icon = 'icons/obj/doors/Doormaint.dmi';
-	icon_state = "door_closed";
-	name = "Sealed Door"
-	},
+/turf/unsimulated/wall/door_maint,
 /area/centcom/terminal)
 "piQ" = (
 /obj/machinery/recharge_station,
@@ -19784,12 +19671,8 @@
 /turf/simulated/shuttle/floor/black,
 /area/centcom/evac)
 "rkG" = (
-/turf/unsimulated/wall{
-	desc = "That looks like it doesn't open easily.";
-	dir = 8;
-	icon = 'icons/obj/doors/rapid_pdoor.dmi';
-	icon_state = "pdoor1";
-	name = "Shuttle Bay Blast Door"
+/turf/unsimulated/wall/shuttle_bay{
+	dir = 8
 	},
 /area/centcom/evac)
 "rkN" = (
@@ -21014,9 +20897,7 @@
 	},
 /area/wizard_station)
 "shJ" = (
-/obj/machinery/door/airlock{
-	icon = 'icons/obj/doors/Dooruranium.dmi'
-	},
+/obj/machinery/door/airlock/uranium_appearance,
 /turf/unsimulated/floor{
 	icon_state = "white"
 	},
@@ -22795,11 +22676,7 @@
 	},
 /area/centcom/specops)
 "tJN" = (
-/turf/unsimulated/wall{
-	icon = 'icons/obj/doors/Doormaint.dmi';
-	icon_state = "door_closed";
-	name = "Sealed Door"
-	},
+/turf/unsimulated/wall/door_maint,
 /area/centcom/main_hall)
 "tKE" = (
 /obj/structure/bed/chair/office/light{
@@ -27105,11 +26982,8 @@
 /turf/simulated/floor/outdoors/grass/heavy,
 /area/shadekin)
 "xJr" = (
-/turf/unsimulated/wall{
-	desc = "That looks like it doesn't open easily.";
+/turf/unsimulated/wall/shuttle_bay{
 	dir = 8;
-	icon = 'icons/obj/doors/rapid_pdoor.dmi';
-	icon_state = "pdoor1";
 	name = "Blast Door"
 	},
 /area/centcom/main_hall)
diff --git a/modular_chomp/maps/soluna_nexus/soluna_nexus-8.dmm b/modular_chomp/maps/soluna_nexus/soluna_nexus-8.dmm
index cd200aca3d..22c6b71c3f 100644
--- a/modular_chomp/maps/soluna_nexus/soluna_nexus-8.dmm
+++ b/modular_chomp/maps/soluna_nexus/soluna_nexus-8.dmm
@@ -807,12 +807,7 @@
 /turf/simulated/shuttle/wall,
 /area/shuttle/arrival/pre_game)
 "Xz" = (
-/obj/structure/showcase{
-	desc = "So that's how the shuttle moves on its own.";
-	icon = 'icons/mob/AI.dmi';
-	icon_state = "ai-red";
-	name = "Arrivals Announcement Computer"
-	},
+/obj/structure/showcase/AI,
 /turf/simulated/shuttle/floor{
 	icon_state = "floor_red"
 	},
diff --git a/modular_chomp/maps/southern_cross/southern_cross-2.dmm b/modular_chomp/maps/southern_cross/southern_cross-2.dmm
index df05148de5..58a3501382 100644
--- a/modular_chomp/maps/southern_cross/southern_cross-2.dmm
+++ b/modular_chomp/maps/southern_cross/southern_cross-2.dmm
@@ -2448,11 +2448,7 @@
 /turf/simulated/wall,
 /area/maintenance/firstdeck/foreport)
 "akp" = (
-/turf/simulated/shuttle/wall/no_join{
-	base_state = "orange";
-	icon = 'icons/turf/shuttle_orange.dmi';
-	icon_state = "orange"
-	},
+/turf/simulated/shuttle/wall/no_join/orange,
 /area/shuttle/escape_pod1/station)
 "akw" = (
 /obj/structure/bed/chair{
@@ -2469,11 +2465,7 @@
 /turf/simulated/shuttle/floor,
 /area/shuttle/escape_pod2/station)
 "akx" = (
-/turf/simulated/shuttle/wall/no_join{
-	base_state = "orange";
-	icon = 'icons/turf/shuttle_orange.dmi';
-	icon_state = "orange"
-	},
+/turf/simulated/shuttle/wall/no_join/orange,
 /area/shuttle/escape_pod2/station)
 "aky" = (
 /obj/machinery/embedded_controller/radio/airlock/airlock_controller{
@@ -7857,11 +7849,7 @@
 /turf/simulated/floor/tiled,
 /area/expoutpost/stationshuttle)
 "aPF" = (
-/turf/simulated/shuttle/wall/no_join{
-	base_state = "orange";
-	icon = 'icons/turf/shuttle_orange.dmi';
-	icon_state = "orange"
-	},
+/turf/simulated/shuttle/wall/no_join/orange,
 /area/shuttle/escape_pod5/station)
 "aPL" = (
 /obj/structure/cable{
@@ -8014,11 +8002,7 @@
 /turf/simulated/wall/r_wall,
 /area/quartermaster/mininglockerroom)
 "aQY" = (
-/turf/simulated/shuttle/wall/no_join{
-	base_state = "orange";
-	icon = 'icons/turf/shuttle_orange.dmi';
-	icon_state = "orange"
-	},
+/turf/simulated/shuttle/wall/no_join/orange,
 /area/shuttle/escape_pod6/station)
 "aRa" = (
 /obj/effect/floor_decal/borderfloor/corner{
@@ -10364,11 +10348,7 @@
 /turf/simulated/floor/tiled/steel,
 /area/hangar/three)
 "bYO" = (
-/turf/simulated/shuttle/wall/no_join{
-	base_state = "orange";
-	icon = 'icons/turf/shuttle_orange.dmi';
-	icon_state = "orange"
-	},
+/turf/simulated/shuttle/wall/no_join/orange,
 /area/shuttle/escape_pod3/station)
 "bZv" = (
 /obj/structure/table/standard,
@@ -15723,11 +15703,7 @@
 /turf/simulated/floor/tiled/dark,
 /area/hallway/primary/firstdeck/elevator)
 "fBA" = (
-/turf/simulated/shuttle/wall/no_join{
-	base_state = "orange";
-	icon = 'icons/turf/shuttle_orange.dmi';
-	icon_state = "orange"
-	},
+/turf/simulated/shuttle/wall/no_join/orange,
 /area/shuttle/escape_pod4/station)
 "fBB" = (
 /obj/structure/table/glass,
diff --git a/modular_chomp/maps/southern_cross/southern_cross-3.dmm b/modular_chomp/maps/southern_cross/southern_cross-3.dmm
index c44786987a..1e89b1ce5f 100644
--- a/modular_chomp/maps/southern_cross/southern_cross-3.dmm
+++ b/modular_chomp/maps/southern_cross/southern_cross-3.dmm
@@ -19900,7 +19900,6 @@
 	anchored = 1;
 	canhear_range = 1;
 	frequency = 1487;
-	icon = 'icons/obj/items.dmi';
 	icon_state = "red_phone";
 	name = "Reception Emergency Phone";
 	pixel_x = -5
@@ -21056,7 +21055,6 @@
 	anchored = 1;
 	canhear_range = 1;
 	frequency = 1487;
-	icon = 'icons/obj/items.dmi';
 	icon_state = "red_phone";
 	name = "Reception Emergency Phone"
 	},
@@ -28465,13 +28463,10 @@
 /area/medical/ward)
 "bNQ" = (
 /obj/structure/table/glass,
-/obj/item/radio{
+/obj/item/radio/redphone{
+	name = "Surgery Emergency Phone";
 	anchored = 1;
-	canhear_range = 7;
-	frequency = 1487;
-	icon = 'icons/obj/items.dmi';
-	icon_state = "red_phone";
-	name = "Surgery Emergency Phone"
+	canhear_range = 7
 	},
 /obj/random/medical,
 /obj/random/medical,
@@ -57489,11 +57484,7 @@
 /turf/simulated/floor/tiled/dark,
 /area/rnd/mixing)
 "lhH" = (
-/turf/simulated/shuttle/wall/no_join{
-	base_state = "orange";
-	icon = 'icons/turf/shuttle_orange.dmi';
-	icon_state = "orange"
-	},
+/turf/simulated/shuttle/wall/no_join/orange,
 /area/shuttle/cryo/station)
 "lhV" = (
 /obj/effect/floor_decal/industrial/outline/yellow,
diff --git a/modular_chomp/maps/southern_cross/southern_cross-4.dmm b/modular_chomp/maps/southern_cross/southern_cross-4.dmm
index a59d7cc087..7355aa9747 100644
--- a/modular_chomp/maps/southern_cross/southern_cross-4.dmm
+++ b/modular_chomp/maps/southern_cross/southern_cross-4.dmm
@@ -8529,11 +8529,7 @@
 /turf/simulated/shuttle/wall,
 /area/shuttle/escape_pod7/station)
 "gJN" = (
-/turf/simulated/shuttle/wall/no_join{
-	base_state = "orange";
-	icon = 'icons/turf/shuttle_orange.dmi';
-	icon_state = "orange"
-	},
+/turf/simulated/shuttle/wall/no_join/orange,
 /area/shuttle/escape_pod7/station)
 "gKj" = (
 /obj/structure/disposalpipe/segment{
@@ -8953,11 +8949,7 @@
 /turf/simulated/floor/tiled,
 /area/maintenance/thirddeck/dormsstarboard/maintbar)
 "hgE" = (
-/turf/simulated/shuttle/wall/no_join{
-	base_state = "orange";
-	icon = 'icons/turf/shuttle_orange.dmi';
-	icon_state = "orange"
-	},
+/turf/simulated/shuttle/wall/no_join/orange,
 /area/shuttle/escape_pod8/station)
 "hgN" = (
 /obj/structure/bed/chair{
diff --git a/modular_chomp/maps/southern_cross/southern_cross-5.dmm b/modular_chomp/maps/southern_cross/southern_cross-5.dmm
index c3bd82263d..90edec0e4b 100644
--- a/modular_chomp/maps/southern_cross/southern_cross-5.dmm
+++ b/modular_chomp/maps/southern_cross/southern_cross-5.dmm
@@ -5937,11 +5937,7 @@
 /turf/simulated/floor/plating,
 /area/surface/outpost/security/maa)
 "lA" = (
-/turf/simulated/wall/dungeon{
-	icon = 'icons/obj/doors/shuttledoors.dmi';
-	icon_state = "door_locked";
-	name = "Wall Gate"
-	},
+/turf/simulated/wall/dungeon/gate,
 /area/surface/outpost/wall)
 "lB" = (
 /obj/structure/cable/blue{
diff --git a/modular_chomp/maps/southern_cross/southern_cross-8.dmm b/modular_chomp/maps/southern_cross/southern_cross-8.dmm
index 21f50d142d..2fb05c62d2 100644
--- a/modular_chomp/maps/southern_cross/southern_cross-8.dmm
+++ b/modular_chomp/maps/southern_cross/southern_cross-8.dmm
@@ -819,9 +819,7 @@
 /turf/simulated/shuttle/plating/airless/carry,
 /area/shuttle/syndicate_elite/mothership)
 "akO" = (
-/obj/effect/floor_decal/sign/small_7{
-	icon = 'icons/turf/flooring/decals.dmi'
-	},
+/obj/effect/floor_decal/sign/small_7/decal,
 /turf/simulated/floor/holofloor/wood,
 /area/holodeck/source_chess)
 "ala" = (
@@ -894,9 +892,7 @@
 /turf/simulated/floor/carpet/turcarpet,
 /area/shadekin)
 "arj" = (
-/obj/effect/floor_decal/sign/small_5{
-	icon = 'icons/turf/flooring/decals.dmi'
-	},
+/obj/effect/floor_decal/sign/small_5/decal,
 /turf/simulated/floor/holofloor/wood,
 /area/holodeck/source_chess)
 "asc" = (
@@ -998,11 +994,7 @@
 /turf/simulated/floor/holofloor/carpet,
 /area/holodeck/source_courtroom)
 "auX" = (
-/turf/unsimulated/floor{
-	icon = 'icons/turf/snow_new.dmi';
-	icon_state = "snow";
-	name = "snow"
-	},
+/turf/unsimulated/floor/snow_new,
 /area/ninja_dojo/dojo)
 "avb" = (
 /obj/effect/floor_decal/milspec/color/black,
@@ -1024,11 +1016,7 @@
 /area/centcom/specops)
 "awz" = (
 /obj/effect/floor_decal/asteroid,
-/turf/unsimulated/floor{
-	icon = 'icons/turf/snow_new.dmi';
-	icon_state = "snow";
-	name = "snow"
-	},
+/turf/unsimulated/floor/snow_new,
 /area/ninja_dojo/dojo)
 "awC" = (
 /turf/unsimulated/beach/sand,
@@ -1081,9 +1069,7 @@
 /turf/simulated/mineral,
 /area/skipjack_station)
 "ayE" = (
-/obj/effect/floor_decal/sign/small_4{
-	icon = 'icons/turf/flooring/decals.dmi'
-	},
+/obj/effect/floor_decal/sign/small_4/decal,
 /turf/simulated/floor/holofloor/wood,
 /area/holodeck/source_chess)
 "ayP" = (
@@ -1185,9 +1171,7 @@
 	},
 /area/skipjack_station)
 "aFt" = (
-/obj/effect/floor_decal/sign/small_3{
-	icon = 'icons/turf/flooring/decals.dmi'
-	},
+/obj/effect/floor_decal/sign/small_3/decal,
 /turf/simulated/floor/holofloor/wood,
 /area/holodeck/source_chess)
 "aFz" = (
@@ -1438,9 +1422,7 @@
 /turf/simulated/shuttle/floor/white,
 /area/centcom/evac)
 "aQI" = (
-/obj/effect/floor_decal/sign/small_2{
-	icon = 'icons/turf/flooring/decals.dmi'
-	},
+/obj/effect/floor_decal/sign/small_2/decal,
 /turf/simulated/floor/holofloor/wood,
 /area/holodeck/source_chess)
 "aQJ" = (
@@ -1633,9 +1615,7 @@
 	},
 /area/skipjack_station)
 "aZo" = (
-/obj/effect/floor_decal/sign/small_1{
-	icon = 'icons/turf/flooring/decals.dmi'
-	},
+/obj/effect/floor_decal/sign/small_1/decal,
 /turf/simulated/floor/holofloor/wood,
 /area/holodeck/source_chess)
 "aZH" = (
@@ -1747,12 +1727,7 @@
 	},
 /area/centcom/medical)
 "bew" = (
-/turf/unsimulated/wall{
-	desc = "That looks like it doesn't open easily.";
-	icon = 'icons/obj/doors/rapid_pdoor.dmi';
-	icon_state = "pdoor1";
-	name = "Shuttle Bay Blast Door"
-	},
+/turf/unsimulated/wall/shuttle_bay,
 /area/centcom/evac)
 "beU" = (
 /obj/effect/floor_decal/milspec/color/black,
@@ -2325,11 +2300,7 @@
 	},
 /area/centcom/bar)
 "bFy" = (
-/turf/unsimulated/wall{
-	icon = 'icons/obj/doors/Doormaint.dmi';
-	icon_state = "door_closed";
-	name = "Sealed Door"
-	},
+/turf/unsimulated/wall/door_maint,
 /area/centcom/main_hall)
 "bFJ" = (
 /obj/structure/bed/chair/oldsofa/right{
@@ -3021,8 +2992,7 @@
 /area/centcom/specops)
 "cgL" = (
 /obj/item/target/alien,
-/turf/unsimulated/floor{
-	icon = 'icons/turf/flooring/wood.dmi';
+/turf/unsimulated/floor/wood{
 	icon_state = "wood-broken2"
 	},
 /area/ninja_dojo/dojo)
@@ -3340,9 +3310,7 @@
 /turf/simulated/floor/tiled/techmaint,
 /area/shadekin)
 "cyR" = (
-/obj/effect/floor_decal/sign/small_a{
-	icon = 'icons/turf/flooring/decals.dmi'
-	},
+/obj/effect/floor_decal/sign/small_a/decal,
 /turf/simulated/floor/holofloor/wood,
 /area/holodeck/source_chess)
 "czr" = (
@@ -3577,12 +3545,7 @@
 /turf/simulated/shuttle/floor/red,
 /area/shuttle/administration)
 "cIR" = (
-/turf/unsimulated/wall{
-	desc = "That looks like it doesn't open easily.";
-	icon = 'icons/obj/doors/rapid_pdoor.dmi';
-	icon_state = "pdoor1";
-	name = "Shuttle Bay Blast Door"
-	},
+/turf/unsimulated/wall/shuttle_bay,
 /area/syndicate_mothership/elite_squad)
 "cJi" = (
 /obj/machinery/atmospherics/pipe/vent{
@@ -3642,9 +3605,7 @@
 	},
 /area/ninja_dojo/dojo)
 "cJI" = (
-/obj/effect/floor_decal/sign/small_8{
-	icon = 'icons/turf/flooring/decals.dmi'
-	},
+/obj/effect/floor_decal/sign/small_8/decal,
 /turf/simulated/floor/holofloor/wood,
 /area/holodeck/source_chess)
 "cJV" = (
@@ -3715,9 +3676,7 @@
 /turf/simulated/floor/wood/alt,
 /area/shadekin)
 "cNE" = (
-/obj/effect/floor_decal/sign/small_b{
-	icon = 'icons/turf/flooring/decals.dmi'
-	},
+/obj/effect/floor_decal/sign/small_b/decal,
 /turf/simulated/floor/holofloor/wood,
 /area/holodeck/source_chess)
 "cNG" = (
@@ -3729,9 +3688,7 @@
 	},
 /area/shuttle/trade)
 "cOx" = (
-/obj/effect/floor_decal/sign/small_c{
-	icon = 'icons/turf/flooring/decals.dmi'
-	},
+/obj/effect/floor_decal/sign/small_c/decal,
 /turf/simulated/floor/holofloor/wood,
 /area/holodeck/source_chess)
 "cOL" = (
@@ -4069,9 +4026,7 @@
 	},
 /area/centcom/living)
 "dgc" = (
-/obj/effect/floor_decal/sign/small_d{
-	icon = 'icons/turf/flooring/decals.dmi'
-	},
+/obj/effect/floor_decal/sign/small_d/decal,
 /turf/simulated/floor/holofloor/wood,
 /area/holodeck/source_chess)
 "dgU" = (
@@ -4136,9 +4091,7 @@
 /turf/simulated/shuttle/wall,
 /area/shuttle/escape/centcom)
 "dmw" = (
-/obj/effect/floor_decal/sign/small_e{
-	icon = 'icons/turf/flooring/decals.dmi'
-	},
+/obj/effect/floor_decal/sign/small_e/decal,
 /turf/simulated/floor/holofloor/wood,
 /area/holodeck/source_chess)
 "dmB" = (
@@ -4526,9 +4479,7 @@
 /turf/simulated/shuttle/floor/black,
 /area/shuttle/merchant)
 "dFq" = (
-/obj/effect/floor_decal/sign/small_f{
-	icon = 'icons/turf/flooring/decals.dmi'
-	},
+/obj/effect/floor_decal/sign/small_f/decal,
 /turf/simulated/floor/holofloor/wood,
 /area/holodeck/source_chess)
 "dFB" = (
@@ -4635,9 +4586,7 @@
 /turf/simulated/shuttle/floor/black,
 /area/centcom/evac)
 "dIk" = (
-/obj/effect/floor_decal/sign/small_g{
-	icon = 'icons/turf/flooring/decals.dmi'
-	},
+/obj/effect/floor_decal/sign/small_g/decal,
 /turf/simulated/floor/holofloor/wood,
 /area/holodeck/source_chess)
 "dIK" = (
@@ -5772,8 +5721,7 @@
 "ePs" = (
 /obj/structure/bed/padded,
 /obj/item/bedsheet/orange,
-/turf/unsimulated/floor{
-	icon = 'icons/turf/flooring/wood.dmi';
+/turf/unsimulated/floor/wood{
 	icon_state = "wood-broken1"
 	},
 /area/skipjack_station)
@@ -5868,9 +5816,7 @@
 	},
 /area/wizard_station)
 "eRl" = (
-/obj/effect/floor_decal/sign/small_h{
-	icon = 'icons/turf/flooring/decals.dmi'
-	},
+/obj/effect/floor_decal/sign/small_h/decal,
 /turf/simulated/floor/holofloor/wood,
 /area/holodeck/source_chess)
 "eRT" = (
@@ -6696,11 +6642,7 @@
 /turf/simulated/floor/tiled/techmaint,
 /area/shadekin)
 "fVX" = (
-/turf/unsimulated/wall{
-	icon = 'icons/obj/doors/Doormaint.dmi';
-	icon_state = "door_closed";
-	name = "Sealed Door"
-	},
+/turf/unsimulated/wall/door_maint,
 /area/centcom/terminal)
 "fWi" = (
 /obj/structure/bed/chair,
@@ -6798,9 +6740,7 @@
 	},
 /area/tdome/tdomeobserve)
 "gav" = (
-/obj/machinery/door/airlock{
-	icon = 'icons/obj/doors/Dooruranium.dmi'
-	},
+/obj/machinery/door/airlock/uranium_appearance,
 /turf/unsimulated/floor{
 	icon_state = "dark"
 	},
@@ -6823,9 +6763,7 @@
 /turf/simulated/shuttle/floor/black,
 /area/shuttle/merchant)
 "gbB" = (
-/obj/machinery/door/airlock{
-	icon = 'icons/obj/doors/Dooruranium.dmi'
-	},
+/obj/machinery/door/airlock/uranium_appearance,
 /turf/unsimulated/floor{
 	icon_state = "plating";
 	name = "plating"
@@ -7493,12 +7431,7 @@
 /turf/simulated/shuttle/floor/white,
 /area/shuttle/escape/centcom)
 "gJV" = (
-/turf/unsimulated/wall{
-	desc = "That looks like it doesn't open easily.";
-	icon = 'icons/obj/doors/rapid_pdoor.dmi';
-	icon_state = "pdoor1";
-	name = "Shuttle Bay Blast Door"
-	},
+/turf/unsimulated/wall/shuttle_bay,
 /area/skipjack_station)
 "gKE" = (
 /obj/effect/floor_decal/spline/fancy{
@@ -8360,8 +8293,7 @@
 /turf/simulated/shuttle/wall/dark/hard_corner,
 /area/wizard_station)
 "hrC" = (
-/turf/unsimulated/floor{
-	icon = 'icons/turf/flooring/wood.dmi';
+/turf/unsimulated/floor/wood{
 	icon_state = "wood-broken3"
 	},
 /area/skipjack_station)
@@ -8958,8 +8890,7 @@
 /obj/effect/landmark{
 	name = "voxstart"
 	},
-/turf/unsimulated/floor{
-	icon = 'icons/turf/flooring/wood.dmi';
+/turf/unsimulated/floor/wood{
 	icon_state = "wood-broken2"
 	},
 /area/skipjack_station)
@@ -9723,8 +9654,7 @@
 /turf/simulated/shuttle/floor/red,
 /area/shuttle/skipjack)
 "iCl" = (
-/turf/unsimulated/floor{
-	icon = 'icons/turf/flooring/wood.dmi';
+/turf/unsimulated/floor/wood{
 	icon_state = "wood-broken1"
 	},
 /area/ninja_dojo/dojo)
@@ -9893,11 +9823,7 @@
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/shadekin)
 "iJS" = (
-/turf/simulated/shuttle/wall/no_join{
-	base_state = "orange";
-	icon = 'icons/turf/shuttle_orange.dmi';
-	icon_state = "orange"
-	},
+/turf/simulated/shuttle/wall/no_join/orange,
 /area/centcom/evac)
 "iKj" = (
 /obj/structure/morgue,
@@ -9981,13 +9907,9 @@
 	},
 /area/skipjack_station)
 "iQW" = (
-/turf/unsimulated/wall{
+/turf/unsimulated/wall/fake_dark{
 	block_tele = 1;
-	blocks_nonghost_incorporeal = 1;
-	desc = "It's a strange, impenetrable darkness.";
-	icon = 'icons/turf/flooring/weird_vr.dmi';
-	icon_state = "dark";
-	name = "dark"
+	blocks_nonghost_incorporeal = 1
 	},
 /area/shadekin)
 "iQX" = (
@@ -10344,11 +10266,7 @@
 	},
 /area/wizard_station)
 "jgt" = (
-/turf/unsimulated/wall{
-	icon = 'icons/obj/doors/Doormaint.dmi';
-	icon_state = "door_closed";
-	name = "Sealed Door"
-	},
+/turf/unsimulated/wall/door_maint,
 /area/centcom/bar)
 "jgC" = (
 /obj/machinery/power/emitter,
@@ -10447,12 +10365,8 @@
 /turf/simulated/floor/holofloor/carpet,
 /area/holodeck/source_theatre)
 "jlo" = (
-/turf/unsimulated/wall{
-	desc = "That looks like it doesn't open easily.";
-	dir = 8;
-	icon = 'icons/obj/doors/rapid_pdoor.dmi';
-	icon_state = "pdoor1";
-	name = "Shuttle Bay Blast Door"
+/turf/unsimulated/wall/shuttle_bay{
+	dir = 8
 	},
 /area/centcom/specops)
 "jlq" = (
@@ -10587,13 +10501,9 @@
 	},
 /area/syndicate_station)
 "jsz" = (
-/turf/unsimulated/wall{
+/turf/unsimulated/wall/fake_dark{
 	block_tele = 1;
-	blocks_nonghost_incorporeal = 1;
-	desc = "It's a strange, impenetrable darkness.";
-	icon = 'icons/turf/flooring/weird_vr.dmi';
-	icon_state = "dark";
-	name = "dark"
+	blocks_nonghost_incorporeal = 1
 	},
 /area/space)
 "jsR" = (
@@ -10975,9 +10885,7 @@
 /turf/simulated/floor/tiled/techmaint,
 /area/shadekin)
 "jKl" = (
-/obj/machinery/door/airlock{
-	icon = 'icons/obj/doors/Dooruranium.dmi'
-	},
+/obj/machinery/door/airlock/uranium_appearance,
 /turf/unsimulated/floor{
 	dir = 8;
 	icon_state = "wood"
@@ -11516,9 +11424,7 @@
 	},
 /area/centcom/medical)
 "kkH" = (
-/obj/effect/floor_decal/sign/small_6{
-	icon = 'icons/turf/flooring/decals.dmi'
-	},
+/obj/effect/floor_decal/sign/small_6/decal,
 /turf/simulated/floor/holofloor/wood,
 /area/holodeck/source_chess)
 "kkP" = (
@@ -11561,11 +11467,7 @@
 /area/shuttle/merchant)
 "klw" = (
 /obj/structure/flora/tree/pine,
-/turf/unsimulated/floor{
-	icon = 'icons/turf/snow_new.dmi';
-	icon_state = "snow";
-	name = "snow"
-	},
+/turf/unsimulated/floor/snow_new,
 /area/ninja_dojo/dojo)
 "klP" = (
 /obj/structure/table/standard{
@@ -11700,11 +11602,7 @@
 /area/centcom/specops)
 "kog" = (
 /obj/structure/flora/ausbushes/palebush,
-/turf/unsimulated/floor{
-	icon = 'icons/turf/snow_new.dmi';
-	icon_state = "snow";
-	name = "snow"
-	},
+/turf/unsimulated/floor/snow_new,
 /area/ninja_dojo/dojo)
 "koh" = (
 /obj/structure/window/reinforced{
@@ -11768,11 +11666,7 @@
 	dir = 4;
 	health = 1e+006
 	},
-/turf/unsimulated/floor{
-	icon = 'icons/turf/snow_new.dmi';
-	icon_state = "snow";
-	name = "snow"
-	},
+/turf/unsimulated/floor/snow_new,
 /area/ninja_dojo/dojo)
 "krw" = (
 /obj/machinery/door/window/holowindoor{
@@ -11998,11 +11892,7 @@
 /obj/structure/window/reinforced{
 	dir = 8
 	},
-/turf/unsimulated/floor{
-	icon = 'icons/turf/snow_new.dmi';
-	icon_state = "snow";
-	name = "snow"
-	},
+/turf/unsimulated/floor/snow_new,
 /area/ninja_dojo/dojo)
 "kwC" = (
 /turf/unsimulated/floor,
@@ -16250,11 +16140,7 @@
 /turf/simulated/shuttle/floor,
 /area/shuttle/escape/centcom)
 "oLs" = (
-/turf/unsimulated/wall{
-	icon = 'icons/obj/doors/Dooruranium.dmi';
-	icon_state = "door_closed";
-	name = "Sealed Door"
-	},
+/turf/unsimulated/wall/fake_uranium,
 /area/ninja_dojo/dojo)
 "oLA" = (
 /obj/structure/table/glass,
@@ -18443,12 +18329,8 @@
 /turf/simulated/floor/wood/sif,
 /area/shadekin)
 "rkG" = (
-/turf/unsimulated/wall{
-	desc = "That looks like it doesn't open easily.";
-	dir = 8;
-	icon = 'icons/obj/doors/rapid_pdoor.dmi';
-	icon_state = "pdoor1";
-	name = "Shuttle Bay Blast Door"
+/turf/unsimulated/wall/shuttle_bay{
+	dir = 8
 	},
 /area/centcom/evac)
 "rlg" = (
@@ -19530,9 +19412,7 @@
 	},
 /area/wizard_station)
 "shJ" = (
-/obj/machinery/door/airlock{
-	icon = 'icons/obj/doors/Dooruranium.dmi'
-	},
+/obj/machinery/door/airlock/uranium_appearance,
 /turf/unsimulated/floor{
 	icon_state = "white"
 	},
@@ -22031,8 +21911,7 @@
 /area/centcom/bar)
 "uwo" = (
 /obj/machinery/space_heater,
-/turf/unsimulated/floor{
-	icon = 'icons/turf/flooring/wood.dmi';
+/turf/unsimulated/floor/wood{
 	icon_state = "wood-broken3"
 	},
 /area/ninja_dojo/dojo)
@@ -25324,11 +25203,8 @@
 /turf/simulated/floor/outdoors/grass/heavy,
 /area/shadekin)
 "xJr" = (
-/turf/unsimulated/wall{
-	desc = "That looks like it doesn't open easily.";
+/turf/unsimulated/wall/shuttle_bay{
 	dir = 8;
-	icon = 'icons/obj/doors/rapid_pdoor.dmi';
-	icon_state = "pdoor1";
 	name = "Blast Door"
 	},
 /area/centcom/main_hall)
@@ -25453,12 +25329,8 @@
 /turf/simulated/shuttle/floor/black,
 /area/shuttle/merchant)
 "xOR" = (
-/turf/unsimulated/wall{
-	desc = "That looks like it doesn't open easily.";
-	dir = 8;
-	icon = 'icons/obj/doors/rapid_pdoor.dmi';
-	icon_state = "pdoor1";
-	name = "Shuttle Bay Blast Door"
+/turf/unsimulated/wall/shuttle_bay{
+	dir = 8
 	},
 /area/centcom/command)
 "xPh" = (
diff --git a/modular_chomp/maps/southern_cross/southern_cross-9.dmm b/modular_chomp/maps/southern_cross/southern_cross-9.dmm
index 44be2b5f8e..46e1b5f6f4 100644
--- a/modular_chomp/maps/southern_cross/southern_cross-9.dmm
+++ b/modular_chomp/maps/southern_cross/southern_cross-9.dmm
@@ -717,12 +717,7 @@
 /turf/simulated/shuttle/wall,
 /area/shuttle/arrival/pre_game)
 "Xz" = (
-/obj/structure/showcase{
-	desc = "So that's how the shuttle moves on its own.";
-	icon = 'icons/mob/AI.dmi';
-	icon_state = "ai-red";
-	name = "Arrivals Announcement Computer"
-	},
+/obj/structure/showcase/AI,
 /turf/simulated/shuttle/floor{
 	icon_state = "floor_red"
 	},
diff --git a/modular_chomp/maps/submaps/shelters/CrashedInfestedShip-56x25.dmm b/modular_chomp/maps/submaps/shelters/CrashedInfestedShip-56x25.dmm
index cda33d822d..6aacac3e15 100644
--- a/modular_chomp/maps/submaps/shelters/CrashedInfestedShip-56x25.dmm
+++ b/modular_chomp/maps/submaps/shelters/CrashedInfestedShip-56x25.dmm
@@ -1007,13 +1007,7 @@
 /area/survivalpod/superpose/CrashedInfestedShip)
 "tr" = (
 /obj/effect/floor_decal/industrial/outline/yellow,
-/obj/machinery/power/smes/buildable{
-	icon = 'icons/obj/alien_smes.dmi';
-	icon_state = "unit";
-	input_level = 950000;
-	name = "Alien Royal Capacitor";
-	output_level = 950000
-	},
+/obj/machinery/power/smes/buildable/alien_royal,
 /obj/machinery/light/poi,
 /turf/simulated/floor,
 /area/survivalpod/superpose/CrashedInfestedShip)
@@ -2068,11 +2062,7 @@
 /turf/simulated/shuttle/floor/voidcraft,
 /area/survivalpod/superpose/CrashedInfestedShip)
 "PT" = (
-/obj/machinery/computer/crew{
-	icon = 'icons/obj/abductor_vr.dmi';
-	icon_screen = null;
-	icon_state = "console-c"
-	},
+/obj/machinery/computer/crew/abductor,
 /obj/effect/floor_decal/techfloor{
 	dir = 1
 	},
@@ -2351,13 +2341,7 @@
 /area/survivalpod/superpose/CrashedInfestedShip)
 "Up" = (
 /obj/effect/floor_decal/industrial/outline/yellow,
-/obj/machinery/power/smes/buildable{
-	icon = 'icons/obj/alien_smes.dmi';
-	icon_state = "unit";
-	input_level = 950000;
-	name = "Alien Royal Capacitor";
-	output_level = 950000
-	},
+/obj/machinery/power/smes/buildable/alien_royal,
 /obj/structure/cable/cyan{
 	icon_state = "0-2"
 	},
diff --git a/modular_chomp/maps/submaps/shelters/CultShip-28x17.dmm b/modular_chomp/maps/submaps/shelters/CultShip-28x17.dmm
index dcf50b7a00..a645267752 100644
--- a/modular_chomp/maps/submaps/shelters/CultShip-28x17.dmm
+++ b/modular_chomp/maps/submaps/shelters/CultShip-28x17.dmm
@@ -565,13 +565,7 @@
 /turf/simulated/shuttle/floor/voidcraft/light,
 /area/survivalpod/superpose/CultShip)
 "NH" = (
-/obj/machinery/power/smes/buildable{
-	icon = 'icons/obj/alien_smes.dmi';
-	icon_state = "unit";
-	input_level = 950000;
-	name = "Alien Royal Capacitor";
-	output_level = 950000
-	},
+/obj/machinery/power/smes/buildable/alien_royal,
 /obj/effect/floor_decal/techfloor{
 	dir = 5
 	},
diff --git a/modular_chomp/maps/submaps/shelters/DragonCave-18x18.dmm b/modular_chomp/maps/submaps/shelters/DragonCave-18x18.dmm
index 2ee2c2d926..5b9c3471bd 100644
--- a/modular_chomp/maps/submaps/shelters/DragonCave-18x18.dmm
+++ b/modular_chomp/maps/submaps/shelters/DragonCave-18x18.dmm
@@ -43,12 +43,8 @@
 /turf/simulated/floor/outdoors/newdirt,
 /area/survivalpod/superpose/DragonCave)
 "dc" = (
-/obj/effect/decal/cleanable/blood/tracks{
-	color = "red";
-	desc = "Your instincts say you shouldn't be following these.";
-	dir = 4;
-	icon = 'icons/effects/blood.dmi';
-	icon_state = "tracks"
+/obj/effect/decal/cleanable/blood/tracks/suspicious{
+	dir = 4
 	},
 /turf/simulated/floor/outdoors/rocks,
 /area/survivalpod/superpose/DragonCave)
@@ -218,12 +214,7 @@
 /area/survivalpod/superpose/DragonCave)
 "wy" = (
 /obj/effect/decal/cleanable/filth,
-/obj/effect/decal/cleanable/blood/tracks{
-	color = "red";
-	desc = "Your instincts say you shouldn't be following these.";
-	icon = 'icons/effects/blood.dmi';
-	icon_state = "tracks"
-	},
+/obj/effect/decal/cleanable/blood/tracks/suspicious,
 /turf/simulated/floor/outdoors/dirt,
 /area/survivalpod/superpose/DragonCave)
 "xc" = (
@@ -234,12 +225,7 @@
 /turf/simulated/floor/outdoors/newdirt,
 /area/survivalpod/superpose/DragonCave)
 "xL" = (
-/obj/effect/decal/cleanable/blood/tracks{
-	color = "red";
-	desc = "Your instincts say you shouldn't be following these.";
-	icon = 'icons/effects/blood.dmi';
-	icon_state = "tracks"
-	},
+/obj/effect/decal/cleanable/blood/tracks/suspicious,
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/outdoors/dirt,
 /area/survivalpod/superpose/DragonCave)
@@ -268,21 +254,11 @@
 /turf/simulated/floor/outdoors/dirt,
 /area/survivalpod/superpose/DragonCave)
 "zp" = (
-/obj/effect/decal/cleanable/blood/tracks{
-	color = "red";
-	desc = "Your instincts say you shouldn't be following these.";
-	icon = 'icons/effects/blood.dmi';
-	icon_state = "tracks"
-	},
+/obj/effect/decal/cleanable/blood/tracks/suspicious,
 /turf/simulated/floor/outdoors/dirt,
 /area/survivalpod/superpose/DragonCave)
 "AK" = (
-/obj/effect/decal/cleanable/blood/tracks{
-	color = "red";
-	desc = "Your instincts say you shouldn't be following these.";
-	icon = 'icons/effects/blood.dmi';
-	icon_state = "tracks"
-	},
+/obj/effect/decal/cleanable/blood/tracks/suspicious,
 /turf/simulated/floor/outdoors/rocks,
 /area/survivalpod/superpose/DragonCave)
 "Bh" = (
@@ -301,12 +277,8 @@
 /turf/simulated/floor/outdoors/dirt,
 /area/survivalpod/superpose/DragonCave)
 "DI" = (
-/obj/effect/decal/cleanable/blood/tracks{
-	color = "red";
-	desc = "Your instincts say you shouldn't be following these.";
-	dir = 4;
-	icon = 'icons/effects/blood.dmi';
-	icon_state = "tracks"
+/obj/effect/decal/cleanable/blood/tracks/suspicious{
+	dir = 4
 	},
 /turf/simulated/floor/outdoors/dirt,
 /area/survivalpod/superpose/DragonCave)
diff --git a/modular_chomp/maps/submaps/shelters/HydroCave-40x40.dmm b/modular_chomp/maps/submaps/shelters/HydroCave-40x40.dmm
index 2c050f717a..6b9088dc8b 100644
--- a/modular_chomp/maps/submaps/shelters/HydroCave-40x40.dmm
+++ b/modular_chomp/maps/submaps/shelters/HydroCave-40x40.dmm
@@ -1132,12 +1132,7 @@
 /turf/simulated/floor/carpet,
 /area/survivalpod/superpose/HydroCave)
 "Fn" = (
-/obj/effect/decal/cleanable/blood/tracks{
-	color = "red";
-	desc = "Your instincts say you shouldn't be following these.";
-	icon = 'icons/effects/blood.dmi';
-	icon_state = "tracks"
-	},
+/obj/effect/decal/cleanable/blood/tracks/suspicious,
 /turf/template_noop,
 /area/template_noop)
 "FB" = (
@@ -1256,12 +1251,7 @@
 /turf/simulated/floor/plating,
 /area/survivalpod/superpose/HydroCave)
 "Im" = (
-/obj/effect/decal/cleanable/blood/tracks{
-	color = "red";
-	desc = "Your instincts say you shouldn't be following these.";
-	icon = 'icons/effects/blood.dmi';
-	icon_state = "tracks"
-	},
+/obj/effect/decal/cleanable/blood/tracks/suspicious,
 /turf/simulated/mineral/floor/ignore_mapgen/cave,
 /area/template_noop)
 "In" = (
@@ -1925,12 +1915,8 @@
 /turf/simulated/floor/tiled,
 /area/survivalpod/superpose/HydroCave)
 "YE" = (
-/obj/effect/decal/cleanable/blood/tracks{
-	color = "red";
-	desc = "Your instincts say you shouldn't be following these.";
-	dir = 4;
-	icon = 'icons/effects/blood.dmi';
-	icon_state = "tracks"
+/obj/effect/decal/cleanable/blood/tracks/suspicious{
+	dir = 4
 	},
 /turf/simulated/mineral/floor/ignore_mapgen/cave,
 /area/template_noop)
diff --git a/modular_chomp/maps/submaps/shelters/LargeAlienShip-57x25.dmm b/modular_chomp/maps/submaps/shelters/LargeAlienShip-57x25.dmm
index cfd9109259..81738471b8 100644
--- a/modular_chomp/maps/submaps/shelters/LargeAlienShip-57x25.dmm
+++ b/modular_chomp/maps/submaps/shelters/LargeAlienShip-57x25.dmm
@@ -1142,13 +1142,7 @@
 /turf/simulated/floor/plating,
 /area/survivalpod/superpose/LargeAlienShip)
 "xs" = (
-/obj/machinery/power/smes/buildable{
-	icon = 'icons/obj/alien_smes.dmi';
-	icon_state = "unit";
-	input_level = 950000;
-	name = "Alien Royal Capacitor";
-	output_level = 950000
-	},
+/obj/machinery/power/smes/buildable/alien_royal,
 /obj/structure/cable,
 /turf/simulated/floor/tiled/techmaint,
 /area/survivalpod/superpose/LargeAlienShip)
@@ -1536,12 +1530,8 @@
 /obj/item/clothing/accessory/storage/black_drop_pouches,
 /obj/item/storage/belt,
 /obj/item/clothing/accessory/poncho/thermal,
-/obj/machinery/smartfridge/survival_pod{
-	desc = "A mysterious machine which can fabricate many tools for acquiring test subjects.";
-	icon = 'icons/obj/abductor_vr.dmi';
-	icon_base = "dispenser_2way";
-	icon_state = "dispenser_2way";
-	name = "Implant-Co"
+/obj/machinery/smartfridge/survival_pod/abductor{
+	dir = 2
 	},
 /turf/simulated/floor/plating,
 /area/survivalpod/superpose/LargeAlienShip)
@@ -1897,11 +1887,7 @@
 /turf/simulated/shuttle/floor/voidcraft,
 /area/survivalpod/superpose/LargeAlienShip)
 "PT" = (
-/obj/machinery/computer/crew{
-	icon = 'icons/obj/abductor_vr.dmi';
-	icon_screen = null;
-	icon_state = "console-c"
-	},
+/obj/machinery/computer/crew/abductor,
 /obj/effect/floor_decal/techfloor{
 	dir = 1
 	},
diff --git a/modular_chomp/maps/submaps/shelters/MechFabShip-27x24.dmm b/modular_chomp/maps/submaps/shelters/MechFabShip-27x24.dmm
index f33521ad49..79dcc455b9 100644
--- a/modular_chomp/maps/submaps/shelters/MechFabShip-27x24.dmm
+++ b/modular_chomp/maps/submaps/shelters/MechFabShip-27x24.dmm
@@ -247,12 +247,7 @@
 /turf/template_noop,
 /area/template_noop)
 "iD" = (
-/obj/machinery/smartfridge/survival_pod{
-	icon = 'icons/obj/vending.dmi';
-	icon_base = "fridge_sci";
-	icon_contents = "chem";
-	icon_state = "fridge_sci";
-	name = "Advanced storage";
+/obj/machinery/smartfridge/survival_pod/scifridge{
 	pixel_y = 0
 	},
 /obj/item/stock_parts/micro_laser/ultra,
@@ -1123,12 +1118,8 @@
 /obj/structure/sign/electricshock{
 	pixel_y = 32
 	},
-/obj/machinery/cryopod/robot{
-	base_icon_state = "borg_pod_closed";
-	dir = 4;
-	icon = 'icons/obj/structures.dmi';
-	icon_state = "borg_pod_closed";
-	occupied_icon_state = "borg_pod_opened"
+/obj/machinery/cryopod/robot/borg_pod{
+	dir = 4
 	},
 /turf/simulated/floor/plating,
 /area/survivalpod/superpose/MechFabShip)
@@ -1358,12 +1349,7 @@
 /turf/simulated/floor/tiled/techfloor,
 /area/survivalpod/superpose/MechFabShip)
 "Py" = (
-/obj/machinery/smartfridge/survival_pod{
-	icon = 'icons/obj/vending.dmi';
-	icon_base = "fridge_sci";
-	icon_contents = "chem";
-	icon_state = "fridge_sci";
-	name = "Advanced storage";
+/obj/machinery/smartfridge/survival_pod/scifridge{
 	pixel_y = 0
 	},
 /obj/item/stack/material/durasteel{
diff --git a/modular_chomp/maps/submaps/shelters/MercShip-57x25.dmm b/modular_chomp/maps/submaps/shelters/MercShip-57x25.dmm
index 16d95c5946..5f21d43530 100644
--- a/modular_chomp/maps/submaps/shelters/MercShip-57x25.dmm
+++ b/modular_chomp/maps/submaps/shelters/MercShip-57x25.dmm
@@ -1,11 +1,6 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
 "aj" = (
-/obj/machinery/smartfridge/survival_pod{
-	icon = 'icons/obj/vending.dmi';
-	icon_base = "fridge_sci";
-	icon_contents = "chem";
-	icon_state = "fridge_sci";
-	name = "Advanced storage";
+/obj/machinery/smartfridge/survival_pod/scifridge{
 	pixel_y = 0
 	},
 /obj/random/maintenance/clean,
@@ -87,12 +82,7 @@
 /turf/simulated/shuttle/floor/voidcraft,
 /area/survivalpod/superpose/MercShip)
 "aM" = (
-/obj/machinery/smartfridge/survival_pod{
-	icon = 'icons/obj/vending.dmi';
-	icon_base = "fridge_sci";
-	icon_contents = "chem";
-	icon_state = "fridge_sci";
-	name = "Advanced storage";
+/obj/machinery/smartfridge/survival_pod/scifridge{
 	pixel_y = 0
 	},
 /obj/random/maintenance/clean,
@@ -204,12 +194,7 @@
 /turf/simulated/floor/tiled/techfloor,
 /area/survivalpod/superpose/MercShip)
 "cH" = (
-/obj/machinery/smartfridge/survival_pod{
-	icon = 'icons/obj/vending.dmi';
-	icon_base = "fridge_sci";
-	icon_contents = "chem";
-	icon_state = "fridge_sci";
-	name = "Advanced storage";
+/obj/machinery/smartfridge/survival_pod/scifridge{
 	pixel_y = 0
 	},
 /obj/random/maintenance/clean,
@@ -1077,12 +1062,7 @@
 /obj/item/clothing/accessory/storage/black_drop_pouches,
 /obj/item/storage/belt,
 /obj/item/clothing/accessory/poncho/thermal,
-/obj/machinery/smartfridge/survival_pod{
-	icon = 'icons/obj/vending.dmi';
-	icon_base = "fridge_sci";
-	icon_contents = "chem";
-	icon_state = "fridge_sci";
-	name = "Advanced storage";
+/obj/machinery/smartfridge/survival_pod/scifridge{
 	pixel_y = 0
 	},
 /turf/simulated/floor/tiled/techmaint,
@@ -2015,12 +1995,7 @@
 /turf/simulated/floor/tiled/techfloor,
 /area/survivalpod/superpose/MercShip)
 "Hc" = (
-/obj/machinery/smartfridge/survival_pod{
-	icon = 'icons/obj/vending.dmi';
-	icon_base = "fridge_sci";
-	icon_contents = "chem";
-	icon_state = "fridge_sci";
-	name = "Advanced storage";
+/obj/machinery/smartfridge/survival_pod/scifridge{
 	pixel_y = 0
 	},
 /obj/random/maintenance/clean,
@@ -2151,12 +2126,7 @@
 /turf/simulated/floor/carpet/blue,
 /area/survivalpod/superpose/MercShip)
 "Ke" = (
-/obj/machinery/smartfridge/survival_pod{
-	icon = 'icons/obj/vending.dmi';
-	icon_base = "fridge_sci";
-	icon_contents = "chem";
-	icon_state = "fridge_sci";
-	name = "Advanced storage";
+/obj/machinery/smartfridge/survival_pod/scifridge{
 	pixel_y = 0
 	},
 /obj/random/maintenance/clean,
diff --git a/modular_chomp/maps/submaps/shelters/MethLab-20x20.dmm b/modular_chomp/maps/submaps/shelters/MethLab-20x20.dmm
index bc5b965678..b078b612a4 100644
--- a/modular_chomp/maps/submaps/shelters/MethLab-20x20.dmm
+++ b/modular_chomp/maps/submaps/shelters/MethLab-20x20.dmm
@@ -49,7 +49,6 @@
 	anchored = 1;
 	canhear_range = 1;
 	frequency = 1487;
-	icon = 'icons/obj/items.dmi';
 	icon_state = "red_phone";
 	name = "Reception Emergency Phone"
 	},
diff --git a/modular_chomp/maps/submaps/shelters/ScienceShip-25x33.dmm b/modular_chomp/maps/submaps/shelters/ScienceShip-25x33.dmm
index 111cf3ffbc..7063a4407a 100644
--- a/modular_chomp/maps/submaps/shelters/ScienceShip-25x33.dmm
+++ b/modular_chomp/maps/submaps/shelters/ScienceShip-25x33.dmm
@@ -566,11 +566,7 @@
 /turf/simulated/floor/tiled/steel_grid,
 /area/survivalpod/superpose/ScienceShip)
 "sH" = (
-/turf/simulated/shuttle/wall/no_join{
-	base_state = "orange";
-	icon = 'icons/turf/shuttle_orange.dmi';
-	icon_state = "orange"
-	},
+/turf/simulated/shuttle/wall/no_join/orange,
 /area/survivalpod/superpose/ScienceShip)
 "sI" = (
 /obj/structure/salvageable/console_os{
diff --git a/modular_chomp/maps/submaps/shelters/SurvivalDIY-11x11.dmm b/modular_chomp/maps/submaps/shelters/SurvivalDIY-11x11.dmm
index bcc6445f5a..971445a3fc 100644
--- a/modular_chomp/maps/submaps/shelters/SurvivalDIY-11x11.dmm
+++ b/modular_chomp/maps/submaps/shelters/SurvivalDIY-11x11.dmm
@@ -340,12 +340,7 @@
 /obj/item/clothing/accessory/storage/black_drop_pouches,
 /obj/item/storage/belt,
 /obj/item/clothing/accessory/poncho/thermal,
-/obj/machinery/smartfridge/survival_pod{
-	icon = 'icons/obj/vending.dmi';
-	icon_base = "fridge_sci";
-	icon_contents = "chem";
-	icon_state = "fridge_sci";
-	name = "Advanced storage";
+/obj/machinery/smartfridge/survival_pod/scifridge{
 	pixel_y = 0
 	},
 /turf/simulated/floor/plating,
diff --git a/modular_chomp/maps/submaps/shelters/SurvivalDinner-11x11.dmm b/modular_chomp/maps/submaps/shelters/SurvivalDinner-11x11.dmm
index 2934f18e8c..7947a1931e 100644
--- a/modular_chomp/maps/submaps/shelters/SurvivalDinner-11x11.dmm
+++ b/modular_chomp/maps/submaps/shelters/SurvivalDinner-11x11.dmm
@@ -269,12 +269,7 @@
 /turf/simulated/floor/wood,
 /area/survivalpod/superpose/SurvivalDinner)
 "CG" = (
-/obj/machinery/smartfridge/survival_pod{
-	icon = 'icons/obj/vending.dmi';
-	icon_base = "smartfridge";
-	icon_contents = "boxes";
-	icon_state = "smartfridge";
-	name = "Advanced storage";
+/obj/machinery/smartfridge/survival_pod/boxes{
 	pixel_y = -1
 	},
 /obj/item/reagent_containers/food/drinks/bottle/small/beer,
diff --git a/modular_chomp/maps/submaps/shelters/SurvivalEngineering-9x9.dmm b/modular_chomp/maps/submaps/shelters/SurvivalEngineering-9x9.dmm
index 42966f6d73..7b66726853 100644
--- a/modular_chomp/maps/submaps/shelters/SurvivalEngineering-9x9.dmm
+++ b/modular_chomp/maps/submaps/shelters/SurvivalEngineering-9x9.dmm
@@ -63,12 +63,7 @@
 /turf/simulated/shuttle/floor/voidcraft/light,
 /area/survivalpod/superpose/SurvivalEngineering)
 "j" = (
-/obj/machinery/smartfridge/survival_pod{
-	icon = 'icons/obj/vending.dmi';
-	icon_base = "smartfridge";
-	icon_contents = "boxes";
-	icon_state = "smartfridge";
-	name = "Advanced storage";
+/obj/machinery/smartfridge/survival_pod/boxes{
 	pixel_y = -1
 	},
 /obj/item/suit_cooling_unit,
diff --git a/modular_chomp/maps/submaps/shelters/SurvivalHydro-9x9.dmm b/modular_chomp/maps/submaps/shelters/SurvivalHydro-9x9.dmm
index 3056a98b1e..3152e3d154 100644
--- a/modular_chomp/maps/submaps/shelters/SurvivalHydro-9x9.dmm
+++ b/modular_chomp/maps/submaps/shelters/SurvivalHydro-9x9.dmm
@@ -165,12 +165,7 @@
 /turf/simulated/shuttle/wall/voidcraft/survival,
 /area/survivalpod/superpose/SurvivalHydro)
 "r" = (
-/obj/machinery/smartfridge/survival_pod{
-	icon = 'icons/obj/vending.dmi';
-	icon_base = "smartfridge";
-	icon_contents = "boxes";
-	icon_state = "smartfridge";
-	name = "Advanced storage";
+/obj/machinery/smartfridge/survival_pod/boxes{
 	pixel_y = -1
 	},
 /obj/item/multitool,
diff --git a/modular_chomp/maps/submaps/shelters/SurvivalLeisure-9x9.dmm b/modular_chomp/maps/submaps/shelters/SurvivalLeisure-9x9.dmm
index 0e62bb5725..cf0b95ee66 100644
--- a/modular_chomp/maps/submaps/shelters/SurvivalLeisure-9x9.dmm
+++ b/modular_chomp/maps/submaps/shelters/SurvivalLeisure-9x9.dmm
@@ -20,12 +20,7 @@
 /obj/structure/fans{
 	pixel_y = 16
 	},
-/obj/machinery/smartfridge/survival_pod{
-	icon = 'icons/obj/vending.dmi';
-	icon_base = "smartfridge";
-	icon_contents = "boxes";
-	icon_state = "smartfridge";
-	name = "Advanced storage";
+/obj/machinery/smartfridge/survival_pod/boxes{
 	pixel_y = -14
 	},
 /obj/structure/table/reinforced,
diff --git a/modular_chomp/maps/submaps/shelters/SurvivalQuarters-9x9.dmm b/modular_chomp/maps/submaps/shelters/SurvivalQuarters-9x9.dmm
index 2b590106af..9a4c755c58 100644
--- a/modular_chomp/maps/submaps/shelters/SurvivalQuarters-9x9.dmm
+++ b/modular_chomp/maps/submaps/shelters/SurvivalQuarters-9x9.dmm
@@ -56,12 +56,7 @@
 /turf/simulated/shuttle/wall/voidcraft/survival/hard_corner,
 /area/survivalpod/superpose/SurvivalQuarters)
 "h" = (
-/obj/machinery/smartfridge/survival_pod{
-	icon = 'icons/obj/vending.dmi';
-	icon_base = "smartfridge";
-	icon_contents = "boxes";
-	icon_state = "smartfridge";
-	name = "Advanced storage";
+/obj/machinery/smartfridge/survival_pod/boxes{
 	pixel_x = -3;
 	pixel_y = -1
 	},
diff --git a/modular_chomp/maps/submaps/shelters/SurvivalScience-9x9.dmm b/modular_chomp/maps/submaps/shelters/SurvivalScience-9x9.dmm
index ccb04529e5..c0e138d985 100644
--- a/modular_chomp/maps/submaps/shelters/SurvivalScience-9x9.dmm
+++ b/modular_chomp/maps/submaps/shelters/SurvivalScience-9x9.dmm
@@ -266,12 +266,7 @@
 /obj/structure/window/reinforced/survival_pod{
 	opacity = 1
 	},
-/obj/machinery/smartfridge/survival_pod{
-	icon = 'icons/obj/vending.dmi';
-	icon_base = "smartfridge";
-	icon_contents = "boxes";
-	icon_state = "smartfridge";
-	name = "Advanced storage";
+/obj/machinery/smartfridge/survival_pod/boxes{
 	pixel_y = -1
 	},
 /obj/item/stock_parts/micro_laser,
@@ -366,12 +361,7 @@
 /turf/simulated/shuttle/wall/voidcraft/lightblue,
 /area/survivalpod/superpose/SurvivalScience)
 "HB" = (
-/obj/machinery/smartfridge/survival_pod{
-	icon = 'icons/obj/vending.dmi';
-	icon_base = "smartfridge";
-	icon_contents = "boxes";
-	icon_state = "smartfridge";
-	name = "Advanced storage";
+/obj/machinery/smartfridge/survival_pod/boxes{
 	pixel_y = -1
 	},
 /obj/item/storage/toolbox/mechanical{
diff --git a/modular_chomp/maps/submaps/shelters/SurvivalScience2-9x9.dmm b/modular_chomp/maps/submaps/shelters/SurvivalScience2-9x9.dmm
index 4a83efbee6..d9c517ed80 100644
--- a/modular_chomp/maps/submaps/shelters/SurvivalScience2-9x9.dmm
+++ b/modular_chomp/maps/submaps/shelters/SurvivalScience2-9x9.dmm
@@ -11,12 +11,7 @@
 /obj/structure/window/reinforced/survival_pod{
 	opacity = 1
 	},
-/obj/machinery/smartfridge/survival_pod{
-	icon = 'icons/obj/vending.dmi';
-	icon_base = "smartfridge";
-	icon_contents = "boxes";
-	icon_state = "smartfridge";
-	name = "Advanced storage";
+/obj/machinery/smartfridge/survival_pod/boxes{
 	pixel_y = -1
 	},
 /obj/item/stock_parts/micro_laser,
@@ -192,12 +187,7 @@
 /turf/simulated/shuttle/plating,
 /area/survivalpod/superpose/SurvivalScienceV2)
 "v" = (
-/obj/machinery/smartfridge/survival_pod{
-	icon = 'icons/obj/vending.dmi';
-	icon_base = "smartfridge";
-	icon_contents = "boxes";
-	icon_state = "smartfridge";
-	name = "Advanced storage";
+/obj/machinery/smartfridge/survival_pod/boxes{
 	pixel_y = -1
 	},
 /obj/item/storage/toolbox/mechanical{
diff --git a/modular_chomp/maps/submaps/shelters/TradingShip-40x22.dmm b/modular_chomp/maps/submaps/shelters/TradingShip-40x22.dmm
index 2395474fb1..ef8f3d857e 100644
--- a/modular_chomp/maps/submaps/shelters/TradingShip-40x22.dmm
+++ b/modular_chomp/maps/submaps/shelters/TradingShip-40x22.dmm
@@ -75,11 +75,7 @@
 /obj/item/coin/phoron,
 /obj/item/coin/phoron,
 /obj/item/coin/phoron,
-/obj/machinery/smartfridge/survival_pod{
-	icon = 'icons/obj/vending.dmi';
-	icon_base = "fridge_sci";
-	icon_contents = "chem";
-	icon_state = "fridge_sci";
+/obj/machinery/smartfridge/survival_pod/scifridge{
 	name = "Phoron storage";
 	pixel_y = 0
 	},
diff --git a/modular_chomp/maps/submaps/shelters/ripperdocpod-12x15.dmm b/modular_chomp/maps/submaps/shelters/ripperdocpod-12x15.dmm
index f579f044aa..94f44b0b9d 100644
--- a/modular_chomp/maps/submaps/shelters/ripperdocpod-12x15.dmm
+++ b/modular_chomp/maps/submaps/shelters/ripperdocpod-12x15.dmm
@@ -130,12 +130,7 @@
 /obj/effect/floor_decal/techfloor{
 	dir = 4
 	},
-/obj/machinery/smartfridge/survival_pod{
-	icon = 'icons/obj/vending.dmi';
-	icon_base = "fridge_sci";
-	icon_contents = "chem";
-	icon_state = "fridge_sci";
-	name = "Advanced storage";
+/obj/machinery/smartfridge/survival_pod/scifridge{
 	pixel_y = 0
 	},
 /obj/item/organ/internal/augment/armmounted,
diff --git a/modular_chomp/maps/submaps/surface_submaps/plains/methlab.dmm b/modular_chomp/maps/submaps/surface_submaps/plains/methlab.dmm
index c9d2225390..051d19b574 100644
--- a/modular_chomp/maps/submaps/surface_submaps/plains/methlab.dmm
+++ b/modular_chomp/maps/submaps/surface_submaps/plains/methlab.dmm
@@ -49,7 +49,6 @@
 	anchored = 1;
 	canhear_range = 1;
 	frequency = 1487;
-	icon = 'icons/obj/items.dmi';
 	icon_state = "red_phone";
 	name = "Reception Emergency Phone"
 	},
diff --git a/modular_chomp/maps/submaps/surface_submaps/plains/otieshelter.dmm b/modular_chomp/maps/submaps/surface_submaps/plains/otieshelter.dmm
index b55e1a73d4..117c9064cd 100644
--- a/modular_chomp/maps/submaps/surface_submaps/plains/otieshelter.dmm
+++ b/modular_chomp/maps/submaps/surface_submaps/plains/otieshelter.dmm
@@ -121,12 +121,8 @@
 /obj/item/material/shard{
 	icon_state = "medium"
 	},
-/obj/effect/decal/cleanable/blood/tracks{
-	color = "red";
-	desc = "Your instincts say you shouldn't be following these.";
-	dir = 4;
-	icon = 'icons/effects/blood.dmi';
-	icon_state = "tracks"
+/obj/effect/decal/cleanable/blood/tracks/suspicious{
+	dir = 4
 	},
 /turf/simulated/floor/tiled/virgo3b,
 /area/submap/OtieShelter)
@@ -373,12 +369,8 @@
 /area/submap/OtieShelter)
 "BM" = (
 /obj/item/melee/baton/cattleprod,
-/obj/effect/decal/cleanable/blood/tracks{
-	color = "red";
-	desc = "Your instincts say you shouldn't be following these.";
-	dir = 4;
-	icon = 'icons/effects/blood.dmi';
-	icon_state = "tracks"
+/obj/effect/decal/cleanable/blood/tracks/suspicious{
+	dir = 4
 	},
 /obj/effect/decal/cleanable/filth,
 /obj/effect/floor_decal/industrial/warning{
diff --git a/modular_chomp/maps/submaps/surface_submaps/wilderness/AbandonedLab.dmm b/modular_chomp/maps/submaps/surface_submaps/wilderness/AbandonedLab.dmm
index ec79c66c3c..27e9b49a51 100644
--- a/modular_chomp/maps/submaps/surface_submaps/wilderness/AbandonedLab.dmm
+++ b/modular_chomp/maps/submaps/surface_submaps/wilderness/AbandonedLab.dmm
@@ -196,12 +196,8 @@
 /turf/simulated/shuttle/floor/voidcraft,
 /area/submap/AbandonedLab)
 "iv" = (
-/obj/effect/decal/cleanable/blood/tracks{
-	color = "red";
-	desc = "Your instincts say you shouldn't be following these.";
-	dir = 1;
-	icon = 'icons/effects/blood.dmi';
-	icon_state = "tracks"
+/obj/effect/decal/cleanable/blood/tracks/suspicious{
+	dir = 1
 	},
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/floor_decal/industrial/warning,
@@ -213,12 +209,8 @@
 /turf/simulated/floor/reinforced,
 /area/submap/AbandonedLab)
 "iL" = (
-/obj/effect/decal/cleanable/blood/tracks{
-	color = "red";
-	desc = "Your instincts say you shouldn't be following these.";
-	dir = 5;
-	icon = 'icons/effects/blood.dmi';
-	icon_state = "tracks"
+/obj/effect/decal/cleanable/blood/tracks/suspicious{
+	dir = 5
 	},
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/floor_decal/borderfloorblack{
diff --git a/modular_chomp/maps/submaps/surface_submaps/wilderness/derelictengine.dmm b/modular_chomp/maps/submaps/surface_submaps/wilderness/derelictengine.dmm
index c86588c6fc..91140463ba 100644
--- a/modular_chomp/maps/submaps/surface_submaps/wilderness/derelictengine.dmm
+++ b/modular_chomp/maps/submaps/surface_submaps/wilderness/derelictengine.dmm
@@ -3471,13 +3471,7 @@
 /obj/structure/cable{
 	icon_state = "0-8"
 	},
-/obj/machinery/power/smes/buildable{
-	icon = 'icons/obj/alien_smes.dmi';
-	icon_state = "unit";
-	input_level = 950000;
-	name = "Alien Royal Capacitor";
-	output_level = 950000
-	},
+/obj/machinery/power/smes/buildable/alien_royal,
 /turf/simulated/floor/tiled/techfloor{
 	nitrogen = 93.7835;
 	oxygen = 20.7263;
diff --git a/modular_chomp/maps/submaps/surface_submaps/wilderness/drgnplateu.dmm b/modular_chomp/maps/submaps/surface_submaps/wilderness/drgnplateu.dmm
index 7043f0230e..60986e6bcc 100644
--- a/modular_chomp/maps/submaps/surface_submaps/wilderness/drgnplateu.dmm
+++ b/modular_chomp/maps/submaps/surface_submaps/wilderness/drgnplateu.dmm
@@ -348,12 +348,8 @@
 /area/template_noop)
 "We" = (
 /obj/effect/decal/remains,
-/obj/effect/decal/cleanable/blood/tracks{
-	color = "red";
-	desc = "Your instincts say you shouldn't be following these.";
-	dir = 4;
-	icon = 'icons/effects/blood.dmi';
-	icon_state = "tracks"
+/obj/effect/decal/cleanable/blood/tracks/suspicious{
+	dir = 4
 	},
 /turf/simulated/floor/outdoors/dirt,
 /area/submap/drgnplateu)
diff --git a/modular_chomp/maps/submaps/surface_submaps/wilderness/drgnplateuAlt.dmm b/modular_chomp/maps/submaps/surface_submaps/wilderness/drgnplateuAlt.dmm
index 192badba29..f884c143f1 100644
--- a/modular_chomp/maps/submaps/surface_submaps/wilderness/drgnplateuAlt.dmm
+++ b/modular_chomp/maps/submaps/surface_submaps/wilderness/drgnplateuAlt.dmm
@@ -277,12 +277,8 @@
 /area/submap/drgnplateu)
 "N" = (
 /obj/effect/decal/remains,
-/obj/effect/decal/cleanable/blood/tracks{
-	color = "red";
-	desc = "Your instincts say you shouldn't be following these.";
-	dir = 4;
-	icon = 'icons/effects/blood.dmi';
-	icon_state = "tracks"
+/obj/effect/decal/cleanable/blood/tracks/suspicious{
+	dir = 4
 	},
 /turf/simulated/floor/outdoors/dirt,
 /area/submap/drgnplateu)
diff --git a/modular_chomp/maps/submaps/surface_submaps/wilderness/otieshelter.dmm b/modular_chomp/maps/submaps/surface_submaps/wilderness/otieshelter.dmm
index e0631f0d44..fc67779bd1 100644
--- a/modular_chomp/maps/submaps/surface_submaps/wilderness/otieshelter.dmm
+++ b/modular_chomp/maps/submaps/surface_submaps/wilderness/otieshelter.dmm
@@ -133,12 +133,8 @@
 /obj/item/material/shard{
 	icon_state = "medium"
 	},
-/obj/effect/decal/cleanable/blood/tracks{
-	color = "red";
-	desc = "Your instincts say you shouldn't be following these.";
-	dir = 4;
-	icon = 'icons/effects/blood.dmi';
-	icon_state = "tracks"
+/obj/effect/decal/cleanable/blood/tracks/suspicious{
+	dir = 4
 	},
 /turf/simulated/floor/tiled,
 /area/submap/OtieShelter)
@@ -372,12 +368,8 @@
 /area/submap/OtieShelter)
 "BM" = (
 /obj/item/melee/baton/cattleprod,
-/obj/effect/decal/cleanable/blood/tracks{
-	color = "red";
-	desc = "Your instincts say you shouldn't be following these.";
-	dir = 4;
-	icon = 'icons/effects/blood.dmi';
-	icon_state = "tracks"
+/obj/effect/decal/cleanable/blood/tracks/suspicious{
+	dir = 4
 	},
 /obj/effect/decal/cleanable/filth,
 /obj/effect/floor_decal/industrial/warning{
diff --git a/tools/maplint/lints/banned_vars.yml b/tools/maplint/lints/banned_vars.yml
new file mode 100644
index 0000000000..2c04069b18
--- /dev/null
+++ b/tools/maplint/lints/banned_vars.yml
@@ -0,0 +1,16 @@
+help: "Icons are not allowed to be altered on map edits"
+/atom:
+  banned_variables:
+    - icon
+
+/obj:
+  banned_variables:
+    - icon
+
+/turf:
+  banned_variables:
+    - icon
+
+/mob:
+  banned_variables:
+    - icon
\ No newline at end of file
diff --git a/vorestation.dme b/vorestation.dme
index 91396292d9..a99fcb9886 100644
--- a/vorestation.dme
+++ b/vorestation.dme
@@ -5013,6 +5013,7 @@
 #include "modular_chomp\code\game\mecha\mecha_parts.dm"
 #include "modular_chomp\code\game\mecha\secert\hades.dm"
 #include "modular_chomp\code\game\objects\items.dm"
+#include "modular_chomp\code\game\objects\map_bs.dm"
 #include "modular_chomp\code\game\objects\trash_eating.dm"
 #include "modular_chomp\code\game\objects\effects\dark_growth.dm"
 #include "modular_chomp\code\game\objects\effects\explosion.dm"