diff --git a/archive/maps/overmap/bearcat/bearcat.dm b/archive/maps/overmap/bearcat/bearcat.dm
index c070f6a259c..1b5fd346b0d 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/code/defines/obj.dm b/code/defines/obj.dm
index c753eed0e43..16aed722071 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 e3d782c0cf3..738fe8802a7 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 0ccd6a5d059..d39ac03b0b6 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 54fe3d3b78b..8044ef0fe2f 100644
--- a/code/game/machinery/doors/airlock.dm
+++ b/code/game/machinery/doors/airlock.dm
@@ -643,6 +643,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 c61abf1809e..6674cb9571b 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 1d8cbf63679..1c15466e7cd 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 819f4df3467..22e7420b6cb 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 bacd4163903..4ed4e4ca32c 100644
--- a/code/game/objects/items/devices/radio/intercom.dm
+++ b/code/game/objects/items/devices/radio/intercom.dm
@@ -1,7 +1,7 @@
 /obj/item/radio/intercom
 	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 74746d6b565..59e72b0b675 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 32e810adec3..89550ee05f8 100644
--- a/code/game/objects/items/devices/translocator_vr.dm
+++ b/code/game/objects/items/devices/translocator_vr.dm
@@ -396,7 +396,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 de549655514..4919ae4c3be 100644
--- a/code/game/objects/mob_spawner_vr.dm
+++ b/code/game/objects/mob_spawner_vr.dm
@@ -196,3 +196,13 @@ It also makes it so a ghost wont know where all the goodies/mobs are.
 	spawn_types = list(
 	/mob/living/simple_mob/animal/space/alien/queen = 5,
 	)
+
+/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 086685662f1..031796653fd 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 8ec7a10651a..4b09b6cc9fc 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 89d99422dcf..6083e8562a9 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 f5b16ac606a..3cff87402a4 100644
--- a/code/game/objects/structures/stool_bed_chair_nest/bed.dm
+++ b/code/game/objects/structures/stool_bed_chair_nest/bed.dm
@@ -373,7 +373,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 46c86fc3978..42f9eb31629 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 6e3e8da7e23..3f4bbb75209 100644
--- a/code/game/turfs/simulated/wall_types.dm
+++ b/code/game/turfs/simulated/wall_types.dm
@@ -552,6 +552,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 ce13e84f084..b2eabdb2044 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 82fccbdaed7..c43075f9489 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 b5fc47a5565..c8ef40a6dc5 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 ab5b3bbee4e..5a5a6f74a3f 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 6f8e8ab67c5..ff0d9db24ee 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 f4f54277d67..5e548a77447 100644
--- a/code/modules/mining/mine_turfs.dm
+++ b/code/modules/mining/mine_turfs.dm
@@ -7,6 +7,14 @@ var/list/mining_overlay_cache = list()
 	icon_state = "rock-dark"
 	density = TRUE
 
+//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/mob/living/simple_mob/subtypes/vore/mimic.dm b/code/modules/mob/living/simple_mob/subtypes/vore/mimic.dm
index 19eab2768bf..20ba1b199a3 100644
--- a/code/modules/mob/living/simple_mob/subtypes/vore/mimic.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/vore/mimic.dm
@@ -64,6 +64,9 @@
 /obj/structure/closet/crate/mimic/guaranteed
 	mimic_chance = 100
 
+/obj/structure/closet/crate/mimic/guaranteed/chest
+	icon = 'icons/obj/closets/chest.dmi'
+
 /obj/structure/closet/crate/mimic/dangerous
 	mimic_chance = 70
 
diff --git a/code/modules/power/port_gen_vr.dm b/code/modules/power/port_gen_vr.dm
index aa3abe612c9..9939e305cbd 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 4d90a87fd7f..a21b7915821 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 7814c13f6ec..4bfe7cd7ff7 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 fbb9a0be46b..42192a86edd 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 226e2abd63c..82edae02bd4 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 3fb5c6896bb..00000000000
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 a166bed89b9..3b8818750d2 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 68fe43fbf27..145f80753ba 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 482f9c09f03..00000000000
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 51b222ef013..94ca54fd22d 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 005def0f17c..00000000000
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 1bd3a99f13b..d00064bff19 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 66469e308ba..56e717d757d 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 5e89ac3b366..757bff30542 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"
@@ -196,3 +218,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 bab17f9959a..f5a2556a56a 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 6812f71f73e..ec96ce3b7d4 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 8fd4987ae24..fa1a368bafc 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 d65905b54c7..d0de763049a 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 fcfd9364066..787b6f26e28 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 2edd60c8e61..49b9042d77b 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 eebcb299798..424ebbfbd57 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 30b01e9b99c..192db8e0579 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 00cbe53142a..869dd1b1675 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 2781ff7b835..a098de90be7 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 34df73d6ef4..7414f114e80 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 c43dffdaf9e..6c1271a0062 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/hybridshuttle.dmm b/maps/offmap_vr/om_ships/hybridshuttle.dmm
index 27f29fcb386..4cfe22c590d 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 8163f1d5784..685d734d6f9 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/overmap/example_sector1.dmm b/maps/overmap/example_sector1.dmm
index 38b2d8bf49a..3f393d18ca4 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 ea53afe67a6..09bb257b31c 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 5c3d96ef95f..840ac38fd1d 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 18e0115f8de..a70d991f275 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 e4d5b1beca1..2fcb147c7f5 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 e3af7942ed2..4f2e0ef2e72 100644
--- a/maps/redgate/train.dmm
+++ b/maps/redgate/train.dmm
@@ -425,10 +425,7 @@
 	dir = 4
 	},
 /obj/effect/step_trigger/death/train_crush,
-/turf/unsimulated/floor/techfloor_grid{
-	icon = 'icons/turf/transit_vr.dmi';
-	outdoors = 1
-	},
+/turf/unsimulated/floor/techfloor_grid/outdoors_tansit,
 /area/redgate/train/overboard)
 "iX" = (
 /obj/effect/floor_decal/transit/orange{
@@ -438,10 +435,7 @@
 	dir = 8
 	},
 /obj/effect/step_trigger/death/train_lost,
-/turf/unsimulated/floor/techfloor_grid{
-	icon = 'icons/turf/transit_vr.dmi';
-	outdoors = 1
-	},
+/turf/unsimulated/floor/techfloor_grid/outdoors_tansit,
 /area/redgate/train/overboard)
 "ja" = (
 /obj/structure/closet/walllocker/emerglocker{
@@ -492,10 +486,7 @@
 	dir = 8
 	},
 /obj/effect/step_trigger/death/train_lost,
-/turf/unsimulated/floor/techfloor_grid{
-	icon = 'icons/turf/transit_vr.dmi';
-	outdoors = 1
-	},
+/turf/unsimulated/floor/techfloor_grid/outdoors_tansit,
 /area/redgate/train/overboard)
 "jL" = (
 /mob/living/simple_mob/vore/alienanimals/teppi/baby,
@@ -574,10 +565,7 @@
 /obj/structure/railing{
 	dir = 8
 	},
-/turf/unsimulated/floor/techfloor_grid{
-	icon = 'icons/turf/transit_vr.dmi';
-	outdoors = 1
-	},
+/turf/unsimulated/floor/techfloor_grid/outdoors_tansit,
 /area/redgate/train/overboard)
 "lL" = (
 /turf/simulated/shuttle/floor/white{
@@ -619,10 +607,7 @@
 	stopper = 0;
 	tiles = 0
 	},
-/turf/unsimulated/floor/techfloor_grid{
-	icon = 'icons/turf/transit_vr.dmi';
-	outdoors = 1
-	},
+/turf/unsimulated/floor/techfloor_grid/outdoors_tansit,
 /area/redgate/train/overboard)
 "mw" = (
 /obj/structure/railing{
@@ -630,10 +615,7 @@
 	},
 /obj/effect/step_trigger/death/train_crush,
 /obj/structure/railing/grey,
-/turf/unsimulated/floor/techfloor_grid{
-	icon = 'icons/turf/transit_vr.dmi';
-	outdoors = 1
-	},
+/turf/unsimulated/floor/techfloor_grid/outdoors_tansit,
 /area/redgate/train/overboard)
 "mG" = (
 /obj/effect/step_trigger/death/train_crush,
@@ -644,10 +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/unsimulated/floor/techfloor_grid{
-	icon = 'icons/turf/transit_vr.dmi';
-	outdoors = 1
-	},
+/turf/unsimulated/floor/techfloor_grid/outdoors_tansit,
 /area/redgate/train/overboard)
 "mQ" = (
 /obj/structure/bed/chair/shuttle{
@@ -674,10 +653,7 @@
 /obj/structure/railing{
 	dir = 4
 	},
-/turf/unsimulated/floor/techfloor_grid{
-	icon = 'icons/turf/transit_vr.dmi';
-	outdoors = 1
-	},
+/turf/unsimulated/floor/techfloor_grid/outdoors_tansit,
 /area/redgate/train/overboard)
 "mY" = (
 /obj/structure/fence/door,
@@ -734,10 +710,7 @@
 /obj/structure/railing/grey{
 	dir = 1
 	},
-/turf/unsimulated/floor/maglev{
-	icon = 'icons/turf/transit_vr.dmi';
-	outdoors = 1
-	},
+/turf/unsimulated/floor/maglev/transit,
 /area/redgate/train/overboard)
 "nv" = (
 /obj/structure/ladder/up{
@@ -769,10 +742,7 @@
 /obj/structure/railing/grey{
 	dir = 4
 	},
-/turf/unsimulated/floor/techfloor_grid{
-	icon = 'icons/turf/transit_vr.dmi';
-	outdoors = 1
-	},
+/turf/unsimulated/floor/techfloor_grid/outdoors_tansit,
 /area/redgate/train/overboard)
 "nK" = (
 /obj/structure/closet/walllocker/emerglocker{
@@ -828,10 +798,7 @@
 /obj/structure/railing/grey{
 	dir = 8
 	},
-/turf/unsimulated/floor/techfloor_grid{
-	icon = 'icons/turf/transit_vr.dmi';
-	outdoors = 1
-	},
+/turf/unsimulated/floor/techfloor_grid/outdoors_tansit,
 /area/redgate/train/overboard)
 "ph" = (
 /obj/effect/floor_decal/industrial/outline/blue,
@@ -850,10 +817,7 @@
 /obj/structure/railing{
 	dir = 4
 	},
-/turf/unsimulated/floor/techfloor_grid{
-	icon = 'icons/turf/transit_vr.dmi';
-	outdoors = 1
-	},
+/turf/unsimulated/floor/techfloor_grid/outdoors_tansit,
 /area/redgate/train/overboard)
 "pM" = (
 /obj/structure/closet/walllocker_double/misc_civ/north,
@@ -981,10 +945,7 @@
 	dir = 4
 	},
 /obj/effect/step_trigger/death/train_lost,
-/turf/unsimulated/floor/techfloor_grid{
-	icon = 'icons/turf/transit_vr.dmi';
-	outdoors = 1
-	},
+/turf/unsimulated/floor/techfloor_grid/outdoors_tansit,
 /area/redgate/train/overboard)
 "sa" = (
 /obj/machinery/door/airlock/glass{
@@ -1002,10 +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/unsimulated/floor/techfloor_grid{
-	icon = 'icons/turf/transit_vr.dmi';
-	outdoors = 1
-	},
+/turf/unsimulated/floor/techfloor_grid/outdoors_tansit,
 /area/redgate/train/overboard)
 "se" = (
 /obj/structure/bed/chair/shuttle,
@@ -1129,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,
@@ -1174,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,
@@ -1224,10 +1175,7 @@
 /obj/structure/railing/grey{
 	dir = 1
 	},
-/turf/unsimulated/floor/techfloor_grid{
-	icon = 'icons/turf/transit_vr.dmi';
-	outdoors = 1
-	},
+/turf/unsimulated/floor/techfloor_grid/outdoors_tansit,
 /area/redgate/train/overboard)
 "wX" = (
 /obj/structure/bed/chair/shuttle{
@@ -1266,10 +1214,7 @@
 /obj/structure/railing{
 	dir = 1
 	},
-/turf/unsimulated/floor/maglev{
-	icon = 'icons/turf/transit_vr.dmi';
-	outdoors = 1
-	},
+/turf/unsimulated/floor/maglev/transit,
 /area/redgate/train/overboard)
 "xz" = (
 /obj/structure/reagent_dispensers/fueltank/barrel/two{
@@ -1285,20 +1230,14 @@
 "xU" = (
 /obj/effect/step_trigger/death/train_crush,
 /obj/structure/railing/grey,
-/turf/unsimulated/floor/maglev{
-	icon = 'icons/turf/transit_vr.dmi';
-	outdoors = 1
-	},
+/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/unsimulated/floor/techfloor_grid{
-	icon = 'icons/turf/transit_vr.dmi';
-	outdoors = 1
-	},
+/turf/unsimulated/floor/techfloor_grid/outdoors_tansit,
 /area/redgate/train/overboard)
 "yf" = (
 /obj/effect/floor_decal/transit/orange{
@@ -1316,10 +1255,7 @@
 /obj/structure/railing/grey{
 	dir = 4
 	},
-/turf/unsimulated/floor/techfloor_grid{
-	icon = 'icons/turf/transit_vr.dmi';
-	outdoors = 1
-	},
+/turf/unsimulated/floor/techfloor_grid/outdoors_tansit,
 /area/redgate/train/overboard)
 "yj" = (
 /obj/effect/floor_decal/spline/fancy/wood{
@@ -1333,10 +1269,7 @@
 /obj/structure/railing/grey{
 	dir = 8
 	},
-/turf/unsimulated/floor/techfloor_grid{
-	icon = 'icons/turf/transit_vr.dmi';
-	outdoors = 1
-	},
+/turf/unsimulated/floor/techfloor_grid/outdoors_tansit,
 /area/redgate/train/overboard)
 "yq" = (
 /obj/item/stool/padded,
@@ -1366,10 +1299,7 @@
 /obj/structure/railing/grey{
 	dir = 1
 	},
-/turf/unsimulated/floor/techfloor_grid{
-	icon = 'icons/turf/transit_vr.dmi';
-	outdoors = 1
-	},
+/turf/unsimulated/floor/techfloor_grid/outdoors_tansit,
 /area/redgate/train/overboard)
 "yx" = (
 /obj/machinery/light{
@@ -1458,10 +1388,7 @@
 	stopper = 0;
 	tiles = 0
 	},
-/turf/unsimulated/floor/techfloor_grid{
-	icon = 'icons/turf/transit_vr.dmi';
-	outdoors = 1
-	},
+/turf/unsimulated/floor/techfloor_grid/outdoors_tansit,
 /area/redgate/train/overboard)
 "zp" = (
 /obj/structure/table/standard,
@@ -1636,10 +1563,7 @@
 	stopper = 0;
 	tiles = 0
 	},
-/turf/unsimulated/floor/techfloor_grid{
-	icon = 'icons/turf/transit_vr.dmi';
-	outdoors = 1
-	},
+/turf/unsimulated/floor/techfloor_grid/outdoors_tansit,
 /area/redgate/train/overboard)
 "Ch" = (
 /turf/simulated/shuttle/wall/voidcraft,
@@ -1656,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,
@@ -1714,10 +1634,7 @@
 	stopper = 0;
 	tiles = 0
 	},
-/turf/unsimulated/floor/maglev{
-	icon = 'icons/turf/transit_vr.dmi';
-	outdoors = 1
-	},
+/turf/unsimulated/floor/maglev/transit,
 /area/redgate/train/overboard)
 "Da" = (
 /obj/machinery/light{
@@ -1794,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{
@@ -1922,10 +1836,7 @@
 /obj/structure/railing/grey{
 	dir = 4
 	},
-/turf/unsimulated/floor/techfloor_grid{
-	icon = 'icons/turf/transit_vr.dmi';
-	outdoors = 1
-	},
+/turf/unsimulated/floor/techfloor_grid/outdoors_tansit,
 /area/redgate/train/overboard)
 "GU" = (
 /obj/structure/bed/chair/shuttle{
@@ -1961,10 +1872,7 @@
 	stopper = 0;
 	tiles = 0
 	},
-/turf/unsimulated/floor/techfloor_grid{
-	icon = 'icons/turf/transit_vr.dmi';
-	outdoors = 1
-	},
+/turf/unsimulated/floor/techfloor_grid/outdoors_tansit,
 /area/redgate/train/overboard)
 "Hs" = (
 /turf/simulated/shuttle/wall/voidcraft,
@@ -1982,10 +1890,7 @@
 	stopper = 0;
 	tiles = 0
 	},
-/turf/unsimulated/floor/techfloor_grid{
-	icon = 'icons/turf/transit_vr.dmi';
-	outdoors = 1
-	},
+/turf/unsimulated/floor/techfloor_grid/outdoors_tansit,
 /area/redgate/train/overboard)
 "HF" = (
 /obj/machinery/light{
@@ -2057,10 +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/unsimulated/floor/techfloor_grid{
-	icon = 'icons/turf/transit_vr.dmi';
-	outdoors = 1
-	},
+/turf/unsimulated/floor/techfloor_grid/outdoors_tansit,
 /area/redgate/train/overboard)
 "In" = (
 /obj/structure/grille,
@@ -2192,10 +2094,7 @@
 /obj/structure/railing{
 	dir = 8
 	},
-/turf/unsimulated/floor/techfloor_grid{
-	icon = 'icons/turf/transit_vr.dmi';
-	outdoors = 1
-	},
+/turf/unsimulated/floor/techfloor_grid/outdoors_tansit,
 /area/redgate/train/overboard)
 "Kl" = (
 /obj/structure/table/standard,
@@ -2272,10 +2171,7 @@
 	stopper = 0;
 	tiles = 0
 	},
-/turf/unsimulated/floor/techfloor_grid{
-	icon = 'icons/turf/transit_vr.dmi';
-	outdoors = 1
-	},
+/turf/unsimulated/floor/techfloor_grid/outdoors_tansit,
 /area/redgate/train/overboard)
 "KZ" = (
 /obj/machinery/light{
@@ -2407,20 +2303,14 @@
 /area/redgate/train/meeting)
 "LY" = (
 /obj/effect/step_trigger/death/train_lost,
-/turf/unsimulated/floor/techfloor_grid{
-	icon = 'icons/turf/transit_vr.dmi';
-	outdoors = 1
-	},
+/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/unsimulated/floor/maglev{
-	icon = 'icons/turf/transit_vr.dmi';
-	outdoors = 1
-	},
+/turf/unsimulated/floor/maglev/transit,
 /area/redgate/train/overboard)
 "MJ" = (
 /obj/structure/bed/chair/shuttle{
@@ -2442,10 +2332,7 @@
 /area/redgate/train/wood)
 "Nd" = (
 /obj/effect/step_trigger/death/train_crush,
-/turf/unsimulated/floor/techfloor_grid{
-	icon = 'icons/turf/transit_vr.dmi';
-	outdoors = 1
-	},
+/turf/unsimulated/floor/techfloor_grid/outdoors_tansit,
 /area/redgate/train/overboard)
 "Ne" = (
 /turf/simulated/shuttle/floor/black,
@@ -2569,10 +2456,7 @@
 	stopper = 0;
 	tiles = 0
 	},
-/turf/unsimulated/floor/techfloor_grid{
-	icon = 'icons/turf/transit_vr.dmi';
-	outdoors = 1
-	},
+/turf/unsimulated/floor/techfloor_grid/outdoors_tansit,
 /area/redgate/train/overboard)
 "Pf" = (
 /obj/machinery/vending/coffee,
@@ -2591,10 +2475,7 @@
 /obj/structure/railing/grey{
 	dir = 8
 	},
-/turf/unsimulated/floor/techfloor_grid{
-	icon = 'icons/turf/transit_vr.dmi';
-	outdoors = 1
-	},
+/turf/unsimulated/floor/techfloor_grid/outdoors_tansit,
 /area/redgate/train/overboard)
 "Pp" = (
 /obj/structure/railing{
@@ -2685,10 +2566,7 @@
 /obj/structure/railing/grey{
 	dir = 8
 	},
-/turf/unsimulated/floor/techfloor_grid{
-	icon = 'icons/turf/transit_vr.dmi';
-	outdoors = 1
-	},
+/turf/unsimulated/floor/techfloor_grid/outdoors_tansit,
 /area/redgate/train/overboard)
 "Qw" = (
 /obj/effect/floor_decal/spline/fancy/wood,
@@ -2757,10 +2635,7 @@
 /obj/structure/railing{
 	dir = 1
 	},
-/turf/unsimulated/floor/maglev{
-	icon = 'icons/turf/transit_vr.dmi';
-	outdoors = 1
-	},
+/turf/unsimulated/floor/maglev/transit,
 /area/redgate/train/overboard)
 "RC" = (
 /obj/effect/step_trigger/thrower{
@@ -2769,10 +2644,7 @@
 	stopper = 0;
 	tiles = 0
 	},
-/turf/unsimulated/floor/techfloor_grid{
-	icon = 'icons/turf/transit_vr.dmi';
-	outdoors = 1
-	},
+/turf/unsimulated/floor/techfloor_grid/outdoors_tansit,
 /area/redgate/train/overboard)
 "RE" = (
 /obj/machinery/smartfridge/drinks,
@@ -2861,10 +2733,7 @@
 	stopper = 0;
 	tiles = 0
 	},
-/turf/unsimulated/floor/techfloor_grid{
-	icon = 'icons/turf/transit_vr.dmi';
-	outdoors = 1
-	},
+/turf/unsimulated/floor/techfloor_grid/outdoors_tansit,
 /area/redgate/train/overboard)
 "SQ" = (
 /turf/simulated/shuttle/wall/voidcraft/hard_corner,
@@ -3087,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,
@@ -3114,10 +2979,7 @@
 	dir = 8
 	},
 /obj/effect/step_trigger/death/train_crush,
-/turf/unsimulated/floor/techfloor_grid{
-	icon = 'icons/turf/transit_vr.dmi';
-	outdoors = 1
-	},
+/turf/unsimulated/floor/techfloor_grid/outdoors_tansit,
 /area/redgate/train/overboard)
 "WM" = (
 /obj/effect/step_trigger/death/train_lost,
@@ -3180,10 +3042,7 @@
 	},
 /obj/effect/step_trigger/death/train_crush,
 /obj/structure/railing/grey,
-/turf/unsimulated/floor/techfloor_grid{
-	icon = 'icons/turf/transit_vr.dmi';
-	outdoors = 1
-	},
+/turf/unsimulated/floor/techfloor_grid/outdoors_tansit,
 /area/redgate/train/overboard)
 "YC" = (
 /obj/machinery/light{
@@ -3243,10 +3102,7 @@
 /obj/structure/railing{
 	dir = 1
 	},
-/turf/unsimulated/floor/techfloor_grid{
-	icon = 'icons/turf/transit_vr.dmi';
-	outdoors = 1
-	},
+/turf/unsimulated/floor/techfloor_grid/outdoors_tansit,
 /area/redgate/train/overboard)
 "Zj" = (
 /obj/structure/fence/corner{
@@ -3307,10 +3163,7 @@
 /obj/structure/railing/grey{
 	dir = 4
 	},
-/turf/unsimulated/floor/techfloor_grid{
-	icon = 'icons/turf/transit_vr.dmi';
-	outdoors = 1
-	},
+/turf/unsimulated/floor/techfloor_grid/outdoors_tansit,
 /area/redgate/train/overboard)
 "ZK" = (
 /obj/structure/railing{
@@ -3326,10 +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/unsimulated/floor/techfloor_grid{
-	icon = 'icons/turf/transit_vr.dmi';
-	outdoors = 1
-	},
+/turf/unsimulated/floor/techfloor_grid/outdoors_tansit,
 /area/redgate/train/overboard)
 "ZO" = (
 /obj/random/mob/semirandom_mob_spawner/vore/retaliate,
diff --git a/maps/stellar_delight/ship_centcom.dmm b/maps/stellar_delight/ship_centcom.dmm
index 537ca288922..097464cb1c6 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 e2a8ff3d24a..192b08aef7e 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 7d4768c4669..030d2b3e84a 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 7c6231376fa..1b64f70b0fc 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 c097d79d4e7..68847b85759 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 8b6a927894d..9a5f8d093c8 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 816fb1b6415..81d7ac3a983 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 caffa2b3ccf..7bbcb2f7774 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 feb8686d441..864c1488bc6 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 f7358ef69c1..e4330bc2ab2 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 b55e1a73d4f..117c9064cdd 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 3f35b81a0d3..0caac5b6a64 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 7043f0230ea..60986e6bcc1 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 bfe26b77fbb..b63fb186eb3 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 540b2ff0643..74457dadf01 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 0790a0e3d89..b99187f567a 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 fe27b9b5e6a..9ea9fbd7fb0 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/tools/maplint/lints/banned_vars.yml b/tools/maplint/lints/banned_vars.yml
new file mode 100644
index 00000000000..2c04069b189
--- /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