diff --git a/_maps/RandomRuins/IceRuins/icemoon_underground_lavaland.dmm b/_maps/RandomRuins/IceRuins/icemoon_underground_lavaland.dmm
index 487a143ea12..e9cf02996c3 100644
--- a/_maps/RandomRuins/IceRuins/icemoon_underground_lavaland.dmm
+++ b/_maps/RandomRuins/IceRuins/icemoon_underground_lavaland.dmm
@@ -4,7 +4,7 @@
/area/icemoon/underground/unexplored)
"e" = (
/obj/structure/trap/cult,
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/icemoon/underground)
"h" = (
/obj/item/paper{
@@ -22,7 +22,7 @@
/obj/machinery/door/airlock/cult/friendly{
use_power = 0
},
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/icemoon/underground)
"y" = (
/mob/living/simple_animal/hostile/megafauna/dragon{
@@ -39,7 +39,7 @@
/area/icemoon/underground)
"E" = (
/obj/item/grown/bananapeel,
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/icemoon/underground)
"J" = (
/turf/closed/wall/mineral/cult,
@@ -51,7 +51,7 @@
/turf/open/floor/mineral/gold,
/area/icemoon/underground)
"T" = (
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/icemoon/underground)
"V" = (
/obj/item/storage/toolbox/mechanical/old/clean,
diff --git a/_maps/RandomRuins/IceRuins/icemoon_underground_library.dmm b/_maps/RandomRuins/IceRuins/icemoon_underground_library.dmm
index 45e112d5d9e..3eb2a888b5d 100644
--- a/_maps/RandomRuins/IceRuins/icemoon_underground_library.dmm
+++ b/_maps/RandomRuins/IceRuins/icemoon_underground_library.dmm
@@ -6,7 +6,7 @@
/obj/structure/table/wood/fancy/black,
/obj/item/documents/syndicate/mining,
/obj/effect/decal/cleanable/cobweb,
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/ruin/unpowered/buried_library)
"ac" = (
/turf/closed/wall/mineral/wood,
@@ -41,7 +41,7 @@
/obj/structure/table/wood/fancy/black,
/obj/item/paper/crumpled/fluff/stations/lavaland/library/diary2,
/obj/effect/decal/cleanable/cobweb/cobweb2,
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/ruin/unpowered/buried_library)
"aj" = (
/obj/item/paper/fluff/ruins/oldstation/protosing,
@@ -56,7 +56,7 @@
"am" = (
/obj/structure/table/wood/fancy/black,
/obj/item/book_of_babel,
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/ruin/unpowered/buried_library)
"an" = (
/turf/open/floor/plating/asteroid/snow/icemoon,
@@ -82,7 +82,7 @@
},
/area/ruin/unpowered/buried_library)
"ar" = (
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/ruin/unpowered/buried_library)
"at" = (
/obj/structure/fluff/paper,
@@ -103,7 +103,7 @@
/area/ruin/unpowered/buried_library)
"ay" = (
/obj/machinery/door/keycard/library,
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/ruin/unpowered/buried_library)
"az" = (
/obj/item/paper/crumpled/fluff/stations/lavaland/library/diary,
@@ -154,16 +154,16 @@
"aI" = (
/obj/effect/mob_spawn/human/skeleton,
/obj/item/clothing/head/rice_hat,
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/ruin/unpowered/buried_library)
"aJ" = (
/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/ruin/unpowered/buried_library)
"aK" = (
/obj/item/feather,
/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/ruin/unpowered/buried_library)
"aL" = (
/obj/effect/decal/cleanable/dirt/dust,
@@ -213,7 +213,7 @@
/obj/item/flashlight/lantern/jade{
on = 1
},
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/ruin/unpowered/buried_library)
"aT" = (
/obj/effect/decal/cleanable/dirt/dust,
@@ -235,7 +235,7 @@
/area/ruin/unpowered/buried_library)
"aW" = (
/obj/structure/fluff/paper/stack,
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/ruin/unpowered/buried_library)
"aX" = (
/obj/structure/table/bronze,
diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_dead_ratvar.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_dead_ratvar.dmm
index c22ddb92a9a..d297d6cfa51 100644
--- a/_maps/RandomRuins/LavaRuins/lavaland_surface_dead_ratvar.dmm
+++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_dead_ratvar.dmm
@@ -14,8 +14,13 @@
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/ruin/unpowered/ratvar)
"e" = (
+<<<<<<< HEAD
/obj/item/stack/tile/bronze,
/turf/open/floor/bronze/lavaland,
+=======
+/obj/item/stack/sheet/bronze,
+/turf/open/floor/bronze/filled/lavaland,
+>>>>>>> c0f9d2e7e84 ([READY] Tile Reskinning 2: Epic Winaloo (#58801))
/area/ruin/unpowered/ratvar)
"f" = (
/turf/closed/mineral/volcanic/lava_land_surface,
@@ -25,7 +30,7 @@
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/ruin/unpowered/ratvar)
"h" = (
-/turf/open/floor/bronze/lavaland,
+/turf/open/floor/bronze/filled/lavaland,
/area/ruin/unpowered/ratvar)
"i" = (
/obj/structure/grille/broken,
@@ -36,7 +41,7 @@
/area/ruin/unpowered/ratvar)
"k" = (
/obj/structure/fluff/clockwork/alloy_shards/small,
-/turf/open/floor/bronze/lavaland,
+/turf/open/floor/bronze/filled/lavaland,
/area/ruin/unpowered/ratvar)
"l" = (
/turf/open/lava/smooth/lava_land_surface,
@@ -55,7 +60,7 @@
/area/ruin/unpowered/ratvar)
"p" = (
/obj/structure/fluff/clockwork/alloy_shards/medium,
-/turf/open/floor/bronze/lavaland,
+/turf/open/floor/bronze/filled/lavaland,
/area/ruin/unpowered/ratvar)
"q" = (
/obj/structure/lattice,
@@ -67,7 +72,7 @@
/area/ruin/unpowered/ratvar)
"s" = (
/obj/structure/fluff/clockwork/alloy_shards/large,
-/turf/open/floor/bronze/lavaland,
+/turf/open/floor/bronze/filled/lavaland,
/area/ruin/unpowered/ratvar)
"t" = (
/obj/item/stack/tile/bronze,
@@ -75,7 +80,7 @@
/area/ruin/unpowered/ratvar)
"u" = (
/obj/structure/grille,
-/turf/open/floor/bronze/lavaland,
+/turf/open/floor/bronze/filled/lavaland,
/area/ruin/unpowered/ratvar)
"v" = (
/obj/structure/fluff/clockwork/alloy_shards/medium,
@@ -84,32 +89,37 @@
/area/ruin/unpowered/ratvar)
"w" = (
/obj/structure/grille/broken,
-/turf/open/floor/bronze/lavaland,
+/turf/open/floor/bronze/filled/lavaland,
/area/ruin/unpowered/ratvar)
"x" = (
/obj/structure/girder/bronze,
+<<<<<<< HEAD
/obj/item/stack/tile/bronze,
/turf/open/floor/bronze/lavaland,
+=======
+/obj/item/stack/sheet/bronze,
+/turf/open/floor/bronze/filled/lavaland,
+>>>>>>> c0f9d2e7e84 ([READY] Tile Reskinning 2: Epic Winaloo (#58801))
/area/ruin/unpowered/ratvar)
"y" = (
/obj/structure/fluff/clockwork/fallen_armor,
-/turf/open/floor/bronze/lavaland,
+/turf/open/floor/bronze/filled/lavaland,
/area/ruin/unpowered/ratvar)
"z" = (
/obj/structure/girder/bronze,
-/turf/open/floor/bronze/lavaland,
+/turf/open/floor/bronze/filled/lavaland,
/area/ruin/unpowered/ratvar)
"A" = (
/obj/structure/fluff/clockwork/clockgolem_remains,
-/turf/open/floor/bronze/lavaland,
+/turf/open/floor/bronze/filled/lavaland,
/area/ruin/unpowered/ratvar)
"B" = (
/obj/item/nullrod/spear,
-/turf/open/floor/bronze/lavaland,
+/turf/open/floor/bronze/filled/lavaland,
/area/ruin/unpowered/ratvar)
"C" = (
/obj/structure/fluff/clockwork/alloy_shards/medium_gearbit,
-/turf/open/floor/bronze/lavaland,
+/turf/open/floor/bronze/filled/lavaland,
/area/ruin/unpowered/ratvar)
"D" = (
/obj/structure/grille,
@@ -121,7 +131,7 @@
/area/ruin/unpowered/ratvar)
"F" = (
/obj/structure/dead_ratvar,
-/turf/open/floor/bronze/lavaland,
+/turf/open/floor/bronze/filled/lavaland,
/area/ruin/unpowered/ratvar)
"G" = (
/obj/item/stack/tile/bronze/thirty,
diff --git a/_maps/RandomRuins/SpaceRuins/DJstation.dmm b/_maps/RandomRuins/SpaceRuins/DJstation.dmm
index ff1bbe8e1d2..32d3e645e47 100644
--- a/_maps/RandomRuins/SpaceRuins/DJstation.dmm
+++ b/_maps/RandomRuins/SpaceRuins/DJstation.dmm
@@ -8,7 +8,7 @@
/area/ruin/space/djstation/solars)
"ac" = (
/obj/machinery/power/solar/fake,
-/turf/open/floor/iron/airless/solarpanel,
+/turf/open/floor/iron/solarpanel/airless,
/area/ruin/space/djstation/solars)
"ad" = (
/turf/open/floor/plating/airless,
diff --git a/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm b/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm
index 0688205af83..6fab8ec1d77 100644
--- a/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm
+++ b/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm
@@ -672,7 +672,7 @@
/area/ruin/space/derelict/bridge/access)
"de" = (
/obj/effect/spawner/lootdrop/maintenance,
-/turf/open/floor/iron/airless/solarpanel,
+/turf/open/floor/iron/solarpanel/airless,
/area/template_noop)
"df" = (
/obj/item/wallframe/apc,
@@ -687,7 +687,7 @@
/turf/open/floor/plating/airless,
/area/ruin/space/derelict/gravity_generator)
"dj" = (
-/turf/open/floor/iron/airless/solarpanel,
+/turf/open/floor/iron/solarpanel/airless,
/area/template_noop)
"dk" = (
/obj/item/stack/cable_coil/cut,
@@ -1815,11 +1815,11 @@
/turf/open/floor/iron/dark,
/area/ruin/space/derelict/medical/chapel)
"hI" = (
-/turf/open/floor/iron/airless/white,
+/turf/open/floor/iron/white/airless,
/area/ruin/space/derelict/medical)
"hJ" = (
/obj/item/bot_assembly/medbot,
-/turf/open/floor/iron/airless/white,
+/turf/open/floor/iron/white/airless,
/area/ruin/space/derelict/medical)
"hK" = (
/obj/structure/closet,
@@ -1894,11 +1894,11 @@
/obj/machinery/light{
dir = 8
},
-/turf/open/floor/iron/airless/white,
+/turf/open/floor/iron/white/airless,
/area/ruin/space/derelict/medical)
"hW" = (
/obj/item/stack/medical/bruise_pack,
-/turf/open/floor/iron/airless/white,
+/turf/open/floor/iron/white/airless,
/area/ruin/space/derelict/medical)
"hX" = (
/turf/open/floor/iron/airless{
@@ -2055,7 +2055,7 @@
/obj/machinery/sleeper{
dir = 4
},
-/turf/open/floor/iron/airless/white,
+/turf/open/floor/iron/white/airless,
/area/ruin/space/derelict/medical)
"iB" = (
/obj/structure/table,
@@ -2064,11 +2064,11 @@
},
/obj/structure/window/reinforced,
/obj/item/reagent_containers/glass/beaker,
-/turf/open/floor/iron/airless/white,
+/turf/open/floor/iron/white/airless,
/area/ruin/space/derelict/medical)
"iC" = (
/obj/structure/window/reinforced,
-/turf/open/floor/iron/airless/white,
+/turf/open/floor/iron/white/airless,
/area/ruin/space/derelict/medical)
"iD" = (
/obj/structure/window/reinforced,
@@ -2076,7 +2076,7 @@
/area/ruin/unpowered/no_grav)
"iE" = (
/obj/structure/window/reinforced,
-/turf/open/floor/iron/airless/white,
+/turf/open/floor/iron/white/airless,
/area/ruin/unpowered/no_grav)
"iG" = (
/obj/structure/window/reinforced{
@@ -2113,7 +2113,7 @@
/obj/item/shard{
icon_state = "small"
},
-/turf/open/floor/iron/airless/white,
+/turf/open/floor/iron/white/airless,
/area/ruin/space/derelict/medical)
"iM" = (
/obj/item/stack/medical/bruise_pack,
@@ -2200,11 +2200,11 @@
/obj/structure/window/reinforced{
dir = 8
},
-/turf/open/floor/iron/airless/white,
+/turf/open/floor/iron/white/airless,
/area/ruin/space/derelict/medical)
"iZ" = (
/obj/item/cigbutt,
-/turf/open/floor/iron/airless/white,
+/turf/open/floor/iron/white/airless,
/area/ruin/space/derelict/medical)
"ja" = (
/obj/machinery/door/airlock/public/glass{
@@ -2223,18 +2223,18 @@
/area/ruin/space/derelict/arrival)
"jf" = (
/obj/structure/cable,
-/turf/open/floor/iron/airless/white,
+/turf/open/floor/iron/white/airless,
/area/ruin/space/derelict/medical)
"jg" = (
/obj/structure/window/reinforced{
dir = 8
},
/obj/structure/cable,
-/turf/open/floor/iron/airless/white,
+/turf/open/floor/iron/white/airless,
/area/ruin/space/derelict/medical)
"ji" = (
/obj/item/stack/cable_coil/cut,
-/turf/open/floor/iron/airless/white,
+/turf/open/floor/iron/white/airless,
/area/ruin/space/derelict/medical)
"jj" = (
/obj/item/stack/cable_coil/cut,
@@ -2254,7 +2254,7 @@
lootcount = 2;
name = "2maintenance loot spawner"
},
-/turf/open/floor/iron/airless/white,
+/turf/open/floor/iron/white/airless,
/area/ruin/space/derelict/medical)
"jm" = (
/obj/structure/window/reinforced{
@@ -2276,7 +2276,7 @@
/turf/open/floor/plating/airless,
/area/ruin/unpowered/no_grav)
"jp" = (
-/turf/open/floor/iron/airless/white,
+/turf/open/floor/iron/white/airless,
/area/ruin/unpowered/no_grav)
"jr" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on,
@@ -2330,22 +2330,22 @@
pixel_y = -23
},
/obj/structure/cable,
-/turf/open/floor/iron/airless/white,
+/turf/open/floor/iron/white/airless,
/area/ruin/space/derelict/medical)
"jA" = (
/obj/structure/window/reinforced{
dir = 8
},
/obj/structure/bed,
-/turf/open/floor/iron/airless/white,
+/turf/open/floor/iron/white/airless,
/area/ruin/space/derelict/medical)
"jB" = (
/obj/item/stack/medical/ointment,
-/turf/open/floor/iron/airless/white,
+/turf/open/floor/iron/white/airless,
/area/ruin/space/derelict/medical)
"jC" = (
/obj/structure/bed,
-/turf/open/floor/iron/airless/white,
+/turf/open/floor/iron/white/airless,
/area/ruin/space/derelict/medical)
"jD" = (
/obj/item/stack/cable_coil/cut,
@@ -2357,7 +2357,7 @@
/obj/machinery/door/airlock/medical{
name = "Medical"
},
-/turf/open/floor/iron/airless/white,
+/turf/open/floor/iron/white/airless,
/area/ruin/space/derelict/medical)
"jF" = (
/obj/structure/window/reinforced{
@@ -2402,11 +2402,11 @@
"jN" = (
/obj/machinery/door/window/southleft,
/obj/structure/cable,
-/turf/open/floor/iron/airless/white,
+/turf/open/floor/iron/white/airless,
/area/ruin/space/derelict/medical)
"jO" = (
/obj/machinery/door/window/southright,
-/turf/open/floor/iron/airless/white,
+/turf/open/floor/iron/white/airless,
/area/ruin/space/derelict/medical)
"jQ" = (
/obj/machinery/door/airlock/research{
@@ -3844,7 +3844,7 @@
dir = 8
},
/obj/item/storage/box/lights/mixed,
-/turf/open/floor/iron/airless/white,
+/turf/open/floor/iron/white/airless,
/area/ruin/space/derelict/medical)
"Uz" = (
/turf/open/floor/plating/airless,
diff --git a/_maps/RandomRuins/SpaceRuins/abandonedzoo.dmm b/_maps/RandomRuins/SpaceRuins/abandonedzoo.dmm
index 5d2ef2083d0..a86730e6431 100644
--- a/_maps/RandomRuins/SpaceRuins/abandonedzoo.dmm
+++ b/_maps/RandomRuins/SpaceRuins/abandonedzoo.dmm
@@ -630,7 +630,7 @@
dir = 8
},
/obj/item/stack/cable_coil/cut,
-/obj/item/stack/tile/iron{
+/obj/item/stack/tile/iron/base{
pixel_x = 3;
pixel_y = -4
},
diff --git a/_maps/RandomRuins/SpaceRuins/bus.dmm b/_maps/RandomRuins/SpaceRuins/bus.dmm
index 536d055565c..a2cf38d06cf 100644
--- a/_maps/RandomRuins/SpaceRuins/bus.dmm
+++ b/_maps/RandomRuins/SpaceRuins/bus.dmm
@@ -56,20 +56,20 @@
"am" = (
/obj/structure/fluff/bus/passable/seat,
/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron/airless/dark{
+/turf/open/floor/iron/dark/airless{
icon_state = "bus"
},
/area/ruin/unpowered/no_grav)
"an" = (
/obj/structure/fluff/bus/passable/seat,
/obj/item/food/meatball,
-/turf/open/floor/iron/airless/dark{
+/turf/open/floor/iron/dark/airless{
icon_state = "bus"
},
/area/ruin/unpowered/no_grav)
"ao" = (
/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron/airless/dark{
+/turf/open/floor/iron/dark/airless{
icon_state = "bus"
},
/area/ruin/unpowered/no_grav)
@@ -77,7 +77,7 @@
/obj/structure/fluff/bus/passable/seat{
pixel_y = 15
},
-/turf/open/floor/iron/airless/dark{
+/turf/open/floor/iron/dark/airless{
icon_state = "bus"
},
/area/ruin/unpowered/no_grav)
@@ -85,14 +85,14 @@
/obj/structure/fluff/bus/passable/seat,
/obj/item/food/meatball,
/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron/airless/dark{
+/turf/open/floor/iron/dark/airless{
icon_state = "bus"
},
/area/ruin/unpowered/no_grav)
"ar" = (
/obj/structure/fluff/bus/passable/seat,
/obj/item/food/grown/cherry_bomb,
-/turf/open/floor/iron/airless/dark{
+/turf/open/floor/iron/dark/airless{
icon_state = "bus"
},
/area/ruin/unpowered/no_grav)
@@ -100,7 +100,7 @@
/obj/structure/fluff/bus/passable/seat/driver,
/obj/effect/decal/cleanable/dirt,
/obj/item/food/grown/citrus/orange,
-/turf/open/floor/iron/airless/dark{
+/turf/open/floor/iron/dark/airless{
icon_state = "bus"
},
/area/ruin/unpowered/no_grav)
@@ -126,20 +126,20 @@
"ax" = (
/obj/structure/fluff/bus/passable,
/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron/airless/dark{
+/turf/open/floor/iron/dark/airless{
icon_state = "bus"
},
/area/ruin/unpowered/no_grav)
"ay" = (
/obj/structure/fluff/bus/passable,
/obj/item/storage/firstaid/regular,
-/turf/open/floor/iron/airless/dark{
+/turf/open/floor/iron/dark/airless{
icon_state = "bus"
},
/area/ruin/unpowered/no_grav)
"az" = (
/obj/structure/fluff/bus/passable,
-/turf/open/floor/iron/airless/dark{
+/turf/open/floor/iron/dark/airless{
icon_state = "bus"
},
/area/ruin/unpowered/no_grav)
@@ -149,14 +149,14 @@
/obj/item/food/meatball,
/obj/item/food/meatball,
/obj/item/food/meatball,
-/turf/open/floor/iron/airless/dark{
+/turf/open/floor/iron/dark/airless{
icon_state = "bus"
},
/area/ruin/unpowered/no_grav)
"aB" = (
/obj/structure/fluff/bus/passable,
/obj/effect/mine/sound/bwoink,
-/turf/open/floor/iron/airless/dark{
+/turf/open/floor/iron/dark/airless{
icon_state = "bus"
},
/area/ruin/unpowered/no_grav)
@@ -164,14 +164,14 @@
/obj/structure/fluff/bus/passable,
/obj/item/reagent_containers/food/condiment/saltshaker,
/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron/airless/dark{
+/turf/open/floor/iron/dark/airless{
icon_state = "bus"
},
/area/ruin/unpowered/no_grav)
"aD" = (
/obj/structure/fluff/bus/passable,
/obj/item/food/meatball,
-/turf/open/floor/iron/airless/dark{
+/turf/open/floor/iron/dark/airless{
icon_state = "bus"
},
/area/ruin/unpowered/no_grav)
@@ -180,7 +180,7 @@
icon_state = "topdoor"
},
/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron/airless/dark{
+/turf/open/floor/iron/dark/airless{
icon_state = "bus"
},
/area/ruin/unpowered/no_grav)
@@ -267,21 +267,21 @@
/obj/structure/fluff/bus/passable/seat,
/obj/effect/decal/cleanable/dirt,
/obj/item/food/meatball,
-/turf/open/floor/iron/airless/dark{
+/turf/open/floor/iron/dark/airless{
icon_state = "bus"
},
/area/ruin/unpowered/no_grav)
"aV" = (
/obj/structure/fluff/bus/passable/seat,
/obj/effect/decal/remains/human,
-/turf/open/floor/iron/airless/dark{
+/turf/open/floor/iron/dark/airless{
icon_state = "bus"
},
/area/ruin/unpowered/no_grav)
"aW" = (
/obj/structure/fluff/bus/passable/seat/driver,
/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron/airless/dark{
+/turf/open/floor/iron/dark/airless{
icon_state = "bus"
},
/area/ruin/unpowered/no_grav)
@@ -298,14 +298,14 @@
/obj/structure/fluff/bus/passable,
/obj/effect/decal/cleanable/dirt,
/obj/item/food/meatball,
-/turf/open/floor/iron/airless/dark{
+/turf/open/floor/iron/dark/airless{
icon_state = "bus"
},
/area/ruin/unpowered/no_grav)
"ba" = (
/obj/structure/fluff/bus/passable,
/obj/item/banhammer,
-/turf/open/floor/iron/airless/dark{
+/turf/open/floor/iron/dark/airless{
icon_state = "bus"
},
/area/ruin/unpowered/no_grav)
@@ -317,7 +317,7 @@
/obj/structure/fluff/bus/passable/seat,
/obj/effect/decal/cleanable/dirt,
/obj/item/toy/plush/awakenedplushie,
-/turf/open/floor/iron/airless/dark{
+/turf/open/floor/iron/dark/airless{
icon_state = "bus"
},
/area/ruin/unpowered/no_grav)
diff --git a/_maps/RandomRuins/SpaceRuins/caravanambush.dmm b/_maps/RandomRuins/SpaceRuins/caravanambush.dmm
index 91f080df7f0..9a6dae97357 100644
--- a/_maps/RandomRuins/SpaceRuins/caravanambush.dmm
+++ b/_maps/RandomRuins/SpaceRuins/caravanambush.dmm
@@ -108,7 +108,7 @@
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
/obj/structure/cable,
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/shuttle/caravan/freighter3)
"aw" = (
/obj/structure/rack,
@@ -180,7 +180,7 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 1
},
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/shuttle/caravan/freighter3)
"aP" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on,
@@ -228,7 +228,7 @@
density = 0;
name = "broken airlock"
},
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/shuttle/caravan/freighter3)
"aY" = (
/obj/effect/turf_decal/bot_white/right,
@@ -249,7 +249,7 @@
dir = 1
},
/obj/structure/cable,
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/shuttle/caravan/freighter2)
"aZ" = (
/obj/machinery/door/firedoor,
@@ -262,7 +262,7 @@
density = 0;
name = "broken airlock"
},
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/shuttle/caravan/freighter2)
"bd" = (
/turf/open/floor/plating/airless{
@@ -409,13 +409,13 @@
"gs" = (
/obj/effect/turf_decal/bot_white,
/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/shuttle/caravan/freighter3)
"gt" = (
/obj/effect/turf_decal/bot_white,
/obj/structure/closet/crate/secure/weapon,
/obj/item/gun/ballistic/revolver/grenadelauncher/unrestricted,
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/shuttle/caravan/freighter3)
"gv" = (
/obj/effect/turf_decal/bot_white,
@@ -428,7 +428,7 @@
/obj/item/clothing/gloves/color/yellow,
/obj/item/multitool,
/obj/item/multitool,
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/shuttle/caravan/freighter3)
"gw" = (
/obj/effect/turf_decal/bot_white,
@@ -440,7 +440,7 @@
name = "Cargo Blast Door Control";
pixel_y = 24
},
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/shuttle/caravan/freighter3)
"gy" = (
/obj/machinery/light/small{
@@ -451,7 +451,7 @@
pixel_y = 32
},
/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/shuttle/caravan/freighter3)
"gP" = (
/obj/structure/shuttle/engine/propulsion/burst{
@@ -517,7 +517,7 @@
dir = 10
},
/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/shuttle/caravan/freighter3)
"ha" = (
/obj/structure/table/reinforced,
@@ -612,7 +612,7 @@
/obj/effect/turf_decal/box/white/corners{
dir = 1
},
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/shuttle/caravan/freighter3)
"hx" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
@@ -620,14 +620,14 @@
/obj/structure/closet/crate/secure/engineering,
/obj/effect/spawner/lootdrop/space/fancytech,
/obj/effect/spawner/lootdrop/space/fancytech,
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/shuttle/caravan/freighter3)
"hy" = (
/obj/effect/turf_decal/box/white/corners{
dir = 4
},
/mob/living/simple_animal/hostile/syndicate/ranged/shotgun/space/stormtrooper,
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/shuttle/caravan/freighter3)
"hz" = (
/obj/machinery/firealarm{
@@ -667,7 +667,7 @@
/obj/item/ammo_casing/shotgun/dragonsbreath,
/obj/item/ammo_casing/shotgun/stunslug,
/obj/item/ammo_casing/shotgun/stunslug,
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/shuttle/caravan/freighter2)
"hU" = (
/obj/effect/turf_decal/bot_white,
@@ -681,7 +681,7 @@
/obj/effect/decal/cleanable/dirt,
/obj/structure/closet/crate/secure/gear,
/obj/item/storage/box/rubbershot,
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/shuttle/caravan/freighter2)
"hW" = (
/obj/effect/turf_decal/bot_white,
@@ -696,7 +696,7 @@
/obj/structure/closet/crate/secure,
/obj/effect/spawner/lootdrop/space/cashmoney,
/obj/effect/spawner/lootdrop/space/cashmoney,
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/shuttle/caravan/freighter2)
"hX" = (
/obj/effect/decal/cleanable/dirt,
@@ -758,7 +758,7 @@
"id" = (
/obj/effect/turf_decal/box/white/corners,
/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/shuttle/caravan/freighter3)
"ie" = (
/obj/machinery/airalarm/all_access{
@@ -775,7 +775,7 @@
pixel_x = -26
},
/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/shuttle/caravan/freighter3)
"ig" = (
/obj/structure/chair{
@@ -783,7 +783,7 @@
},
/obj/effect/mob_spawn/human/corpse/cargo_tech,
/obj/effect/decal/cleanable/blood,
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/shuttle/caravan/freighter3)
"ih" = (
/obj/effect/decal/cleanable/dirt,
@@ -906,7 +906,7 @@
/area/shuttle/caravan/freighter3)
"iF" = (
/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/shuttle/caravan/freighter3)
"iH" = (
/obj/structure/table/reinforced,
@@ -944,14 +944,14 @@
},
/obj/structure/closet/crate/secure/weapon,
/obj/item/gun/energy/disabler,
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/shuttle/caravan/freighter2)
"iX" = (
/obj/effect/turf_decal/box/white/corners{
dir = 4
},
/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/shuttle/caravan/freighter2)
"iY" = (
/obj/machinery/firealarm{
@@ -971,7 +971,7 @@
/obj/item/organ/cyberimp/arm/toolset,
/obj/item/organ/cyberimp/eyes/hud/medical,
/obj/item/organ/cyberimp/brain/anti_stun,
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/shuttle/caravan/freighter3)
"jb" = (
/obj/effect/turf_decal/bot_white,
@@ -985,7 +985,7 @@
/obj/structure/closet/crate/secure/plasma,
/obj/item/mecha_parts/mecha_equipment/weapon/energy/plasma,
/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/shuttle/caravan/freighter3)
"jd" = (
/obj/effect/turf_decal/bot_white,
@@ -995,7 +995,7 @@
name = "Cargo Blast Door Control";
pixel_y = -24
},
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/shuttle/caravan/freighter3)
"je" = (
/obj/machinery/light/small{
@@ -1006,7 +1006,7 @@
pixel_y = -32
},
/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/shuttle/caravan/freighter3)
"jp" = (
/obj/effect/decal/cleanable/dirt,
@@ -1032,18 +1032,18 @@
/obj/effect/decal/cleanable/dirt,
/obj/structure/closet/crate/secure/weapon,
/obj/item/gun/energy/laser/retro,
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/shuttle/caravan/freighter2)
"js" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/shuttle/caravan/freighter2)
"jt" = (
/obj/effect/turf_decal/box/white/corners,
/obj/structure/closet/crate/secure/weapon,
/obj/item/gun/energy/e_gun/mini,
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/shuttle/caravan/freighter2)
"ju" = (
/obj/effect/decal/cleanable/dirt,
@@ -1076,7 +1076,7 @@
/obj/item/wirecutters/caravan,
/obj/item/crowbar/red/caravan,
/obj/item/screwdriver/caravan,
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/shuttle/caravan/freighter3)
"jH" = (
/obj/machinery/atmospherics/components/unary/tank/air{
@@ -1161,23 +1161,23 @@
pixel_y = -24
},
/obj/machinery/light/small,
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/shuttle/caravan/freighter2)
"jX" = (
/obj/effect/turf_decal/bot_white,
/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/shuttle/caravan/freighter2)
"jY" = (
/obj/effect/turf_decal/bot_white,
/obj/structure/closet/crate/secure/gear,
/obj/item/storage/belt/bandolier,
/obj/item/storage/belt/holster,
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/shuttle/caravan/freighter2)
"jZ" = (
/obj/effect/turf_decal/bot_white,
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/shuttle/caravan/freighter2)
"ka" = (
/obj/effect/turf_decal/bot_white,
@@ -1188,7 +1188,7 @@
pixel_y = -24
},
/obj/machinery/light/small,
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/shuttle/caravan/freighter2)
"kb" = (
/obj/effect/decal/cleanable/dirt,
@@ -1199,7 +1199,7 @@
pixel_x = -32;
pixel_y = -32
},
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/shuttle/caravan/freighter2)
"kc" = (
/obj/structure/rack,
diff --git a/_maps/RandomRuins/SpaceRuins/clericden.dmm b/_maps/RandomRuins/SpaceRuins/clericden.dmm
index 50d58be1e45..7722ce76fa7 100644
--- a/_maps/RandomRuins/SpaceRuins/clericden.dmm
+++ b/_maps/RandomRuins/SpaceRuins/clericden.dmm
@@ -35,7 +35,7 @@
/area/ruin/unpowered/no_grav)
"i" = (
/obj/structure/light_prism,
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/ruin/unpowered/no_grav)
"j" = (
/obj/effect/decal/cleanable/blood/drip,
@@ -47,7 +47,7 @@
/area/ruin/unpowered/no_grav)
"l" = (
/obj/structure/closet/crate/coffin,
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/ruin/unpowered/no_grav)
"m" = (
/turf/open/floor/plating/airless,
@@ -98,7 +98,7 @@
/area/ruin/unpowered/no_grav)
"x" = (
/obj/structure/bonfire,
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/ruin/unpowered/no_grav)
"y" = (
/obj/effect/decal/cleanable/blood/tracks,
@@ -156,7 +156,7 @@
/obj/structure/rack,
/obj/item/tank/internals/emergency_oxygen,
/obj/item/clothing/mask/breath,
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/ruin/unpowered/no_grav)
"K" = (
/obj/structure/grille,
@@ -190,7 +190,7 @@
"R" = (
/obj/structure/closet/crate/coffin,
/obj/item/gps/spaceruin,
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/ruin/unpowered/no_grav)
"S" = (
/obj/effect/decal/cleanable/blood/drip,
diff --git a/_maps/RandomRuins/SpaceRuins/derelict6.dmm b/_maps/RandomRuins/SpaceRuins/derelict6.dmm
index 28eaa726f60..a2f3ba6ca81 100644
--- a/_maps/RandomRuins/SpaceRuins/derelict6.dmm
+++ b/_maps/RandomRuins/SpaceRuins/derelict6.dmm
@@ -124,7 +124,7 @@
/turf/open/floor/iron/airless,
/area/ruin/unpowered)
"ay" = (
-/obj/item/stack/tile/iron,
+/obj/item/stack/tile/iron/base,
/turf/open/floor/plating/airless{
icon_state = "platingdmg2"
},
@@ -146,7 +146,7 @@
/turf/template_noop,
/area/template_noop)
"aB" = (
-/obj/item/stack/tile/iron,
+/obj/item/stack/tile/iron/base,
/turf/open/floor/plating/airless{
icon_state = "platingdmg1"
},
@@ -195,23 +195,23 @@
"aI" = (
/obj/structure/table,
/obj/machinery/microwave,
-/turf/open/floor/iron/airless/cafeteria,
+/turf/open/floor/iron/cafeteria/airless,
/area/ruin/unpowered)
"aJ" = (
/obj/structure/table,
/obj/item/storage/box/drinkingglasses,
-/turf/open/floor/iron/airless/cafeteria,
+/turf/open/floor/iron/cafeteria/airless,
/area/ruin/unpowered)
"aK" = (
/obj/structure/closet/secure_closet/freezer/fridge/open,
/obj/machinery/light/broken{
dir = 1
},
-/turf/open/floor/iron/airless/cafeteria,
+/turf/open/floor/iron/cafeteria/airless,
/area/ruin/unpowered)
"aL" = (
/obj/structure/closet/secure_closet/freezer/kitchen,
-/turf/open/floor/iron/airless/cafeteria,
+/turf/open/floor/iron/cafeteria/airless,
/area/ruin/unpowered)
"aM" = (
/obj/effect/turf_decal/tile/bar,
@@ -245,15 +245,15 @@
},
/area/ruin/unpowered)
"aQ" = (
-/obj/item/stack/tile/iron,
+/obj/item/stack/tile/iron/base,
/turf/open/floor/plating/airless,
/area/ruin/unpowered)
"aR" = (
-/turf/open/floor/iron/airless/cafeteria,
+/turf/open/floor/iron/cafeteria/airless,
/area/ruin/unpowered)
"aS" = (
/obj/structure/table_frame,
-/turf/open/floor/iron/airless/cafeteria,
+/turf/open/floor/iron/cafeteria/airless,
/area/ruin/unpowered)
"aT" = (
/obj/item/kitchen/fork,
@@ -279,7 +279,7 @@
/area/ruin/unpowered)
"aW" = (
/obj/structure/table,
-/turf/open/floor/iron/airless/cafeteria,
+/turf/open/floor/iron/cafeteria/airless,
/area/ruin/unpowered)
"aX" = (
/obj/item/chair/stool/bar,
@@ -301,16 +301,16 @@
/area/template_noop)
"ba" = (
/mob/living/simple_animal/hostile/retaliate/ghost,
-/turf/open/floor/iron/airless/cafeteria,
+/turf/open/floor/iron/cafeteria/airless,
/area/ruin/unpowered)
"bb" = (
/obj/item/food/donkpocket,
-/turf/open/floor/iron/airless/cafeteria,
+/turf/open/floor/iron/cafeteria/airless,
/area/ruin/unpowered)
"bc" = (
/obj/structure/table,
/obj/item/shard,
-/turf/open/floor/iron/airless/cafeteria,
+/turf/open/floor/iron/cafeteria/airless,
/area/ruin/unpowered)
"bd" = (
/obj/structure/chair/stool/bar,
@@ -336,7 +336,7 @@
dir = 8
},
/obj/structure/table_frame,
-/turf/open/floor/iron/airless/cafeteria,
+/turf/open/floor/iron/cafeteria/airless,
/area/ruin/unpowered)
"bi" = (
/obj/item/stack/sheet/iron,
@@ -348,7 +348,7 @@
"bj" = (
/obj/item/plate,
/obj/effect/decal/remains/human,
-/turf/open/floor/iron/airless/cafeteria,
+/turf/open/floor/iron/cafeteria/airless,
/area/ruin/unpowered)
"bk" = (
/obj/structure/table_frame/wood,
@@ -380,7 +380,7 @@
},
/area/ruin/unpowered)
"bq" = (
-/obj/item/stack/tile/iron,
+/obj/item/stack/tile/iron/base,
/turf/open/floor/plating/airless{
icon_state = "platingdmg3"
},
diff --git a/_maps/RandomRuins/SpaceRuins/gasthelizards.dmm b/_maps/RandomRuins/SpaceRuins/gasthelizards.dmm
index fb5e8ff166e..8e08eed4207 100644
--- a/_maps/RandomRuins/SpaceRuins/gasthelizards.dmm
+++ b/_maps/RandomRuins/SpaceRuins/gasthelizards.dmm
@@ -18,7 +18,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 8
},
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/ruin/space/has_grav/gasthelizard)
"e" = (
/obj/structure/window/reinforced{
@@ -27,7 +27,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 4
},
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/ruin/space/has_grav/gasthelizard)
"f" = (
/obj/structure/window/reinforced{
@@ -41,7 +41,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 8
},
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/ruin/space/has_grav/gasthelizard)
"g" = (
/obj/structure/window/reinforced{
@@ -54,19 +54,19 @@
/obj/effect/turf_decal/stripes/line{
dir = 8
},
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/ruin/space/has_grav/gasthelizard)
"h" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
},
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/ruin/space/has_grav/gasthelizard)
"i" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
},
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/ruin/space/has_grav/gasthelizard)
"j" = (
/obj/structure/window/reinforced{
@@ -76,7 +76,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 4
},
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/ruin/space/has_grav/gasthelizard)
"k" = (
/obj/structure/window/reinforced{
@@ -85,14 +85,14 @@
/obj/effect/turf_decal/stripes/line{
dir = 8
},
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/ruin/space/has_grav/gasthelizard)
"l" = (
/obj/machinery/atmospherics/components/unary/outlet_injector,
/obj/effect/turf_decal/stripes/line{
dir = 4
},
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/ruin/space/has_grav/gasthelizard)
"m" = (
/obj/structure/closet/crate/freezer,
@@ -103,7 +103,7 @@
/obj/item/food/meat/slab/human/mutant/lizard,
/obj/item/food/meat/slab/human/mutant/lizard,
/obj/item/food/meat/slab/human/mutant/lizard,
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/ruin/space/has_grav/gasthelizard)
"n" = (
/obj/structure/closet/crate/freezer,
@@ -117,7 +117,7 @@
},
/obj/item/food/meat/slab/human/mutant/lizard,
/obj/item/food/meat/slab/human/mutant/lizard,
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/ruin/space/has_grav/gasthelizard)
"o" = (
/obj/structure/closet/crate/freezer,
@@ -129,7 +129,7 @@
/obj/item/food/meat/slab/human/mutant/lizard,
/obj/item/food/meat/slab/human/mutant/lizard,
/obj/item/food/meat/slab/human/mutant/lizard,
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/ruin/space/has_grav/gasthelizard)
"p" = (
/obj/structure/window/reinforced{
@@ -158,7 +158,7 @@
/turf/open/floor/iron,
/area/ruin/space/has_grav/gasthelizard)
"r" = (
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/ruin/space/has_grav/gasthelizard)
"s" = (
/obj/machinery/atmospherics/components/unary/portables_connector/visible{
@@ -198,14 +198,14 @@
/area/ruin/space/has_grav/gasthelizard)
"x" = (
/obj/structure/kitchenspike,
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/ruin/space/has_grav/gasthelizard)
"y" = (
/obj/structure/table/reinforced,
/obj/item/kitchen/knife/butcher,
/obj/item/restraints/handcuffs,
/obj/item/reagent_containers/spray/pepper,
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/ruin/space/has_grav/gasthelizard)
"z" = (
/obj/machinery/atmospherics/components/unary/portables_connector/visible{
@@ -225,14 +225,14 @@
/area/ruin/space/has_grav/gasthelizard)
"C" = (
/obj/machinery/gibber,
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/ruin/space/has_grav/gasthelizard)
"D" = (
/obj/structure/table/reinforced,
/obj/item/clothing/suit/straight_jacket,
/obj/item/reagent_containers/syringe/lethal,
/obj/item/reagent_containers/syringe/lethal/choral,
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/ruin/space/has_grav/gasthelizard)
"E" = (
/obj/machinery/atmospherics/components/unary/portables_connector/visible{
@@ -253,7 +253,7 @@
/area/ruin/space/has_grav/gasthelizard)
"H" = (
/obj/machinery/door/airlock/security,
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/ruin/space/has_grav/gasthelizard)
"I" = (
/obj/item/reagent_containers/glass/bottle/morphine{
@@ -275,7 +275,7 @@
pixel_y = 6
},
/obj/structure/table/reinforced,
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/ruin/space/has_grav/gasthelizard)
"J" = (
/obj/structure/rack,
@@ -322,12 +322,12 @@
/obj/item/cautery,
/obj/item/circular_saw,
/obj/machinery/light,
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/ruin/space/has_grav/gasthelizard)
"Q" = (
/obj/structure/table/optable,
/obj/effect/decal/cleanable/blood/old,
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/ruin/space/has_grav/gasthelizard)
"R" = (
/obj/structure/table/reinforced,
@@ -336,7 +336,7 @@
/obj/item/reagent_containers/glass/bottle/mutagen,
/obj/item/reagent_containers/glass/bottle/mutagen,
/obj/item/razor,
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/ruin/space/has_grav/gasthelizard)
"S" = (
/obj/machinery/suit_storage_unit/standard_unit,
diff --git a/_maps/RandomRuins/SpaceRuins/hellfactory.dmm b/_maps/RandomRuins/SpaceRuins/hellfactory.dmm
index 449514ed49b..80255e5b591 100644
--- a/_maps/RandomRuins/SpaceRuins/hellfactory.dmm
+++ b/_maps/RandomRuins/SpaceRuins/hellfactory.dmm
@@ -814,7 +814,7 @@
/obj/effect/turf_decal{
dir = 1
},
-/obj/item/stack/tile/iron,
+/obj/item/stack/tile/iron/base,
/turf/open/floor/plating,
/area/ruin/space/has_grav/hellfactory)
"cx" = (
@@ -844,7 +844,7 @@
/turf/open/floor/plating,
/area/ruin/space/has_grav/hellfactory)
"cB" = (
-/obj/item/stack/tile/iron,
+/obj/item/stack/tile/iron/base,
/turf/open/floor/plating,
/area/ruin/space/has_grav/hellfactory)
"cC" = (
@@ -874,7 +874,7 @@
"cG" = (
/obj/effect/turf_decal/delivery/white,
/obj/effect/turf_decal/delivery/red,
-/obj/item/stack/tile/iron,
+/obj/item/stack/tile/iron/base,
/obj/machinery/door/poddoor,
/turf/open/floor/plating{
broken = 1;
@@ -901,7 +901,7 @@
/area/ruin/space/has_grav/hellfactory)
"cJ" = (
/obj/effect/turf_decal/delivery/white,
-/obj/item/stack/tile/iron,
+/obj/item/stack/tile/iron/base,
/obj/machinery/door/poddoor,
/turf/open/floor/plating{
broken = 1;
diff --git a/_maps/RandomRuins/SpaceRuins/mechtransport.dmm b/_maps/RandomRuins/SpaceRuins/mechtransport.dmm
index f7d30bbc112..8da3bc435a3 100644
--- a/_maps/RandomRuins/SpaceRuins/mechtransport.dmm
+++ b/_maps/RandomRuins/SpaceRuins/mechtransport.dmm
@@ -128,7 +128,7 @@
/turf/open/floor/mineral/titanium/yellow/airless,
/area/ruin/space/has_grav/powered/mechtransport)
"G" = (
-/obj/item/stack/tile/iron,
+/obj/item/stack/tile/iron/base,
/turf/open/floor/plating/airless,
/area/ruin/space/has_grav/powered/mechtransport)
"H" = (
@@ -150,7 +150,7 @@
/area/ruin/space/has_grav/powered/mechtransport)
"L" = (
/obj/effect/decal/cleanable/robot_debris,
-/obj/item/stack/tile/iron,
+/obj/item/stack/tile/iron/base,
/turf/open/floor/mineral/titanium/yellow/airless,
/area/ruin/space/has_grav/powered/mechtransport)
"M" = (
diff --git a/_maps/RandomRuins/SpaceRuins/oldAIsat.dmm b/_maps/RandomRuins/SpaceRuins/oldAIsat.dmm
index ac880481e87..8eb9e21274d 100644
--- a/_maps/RandomRuins/SpaceRuins/oldAIsat.dmm
+++ b/_maps/RandomRuins/SpaceRuins/oldAIsat.dmm
@@ -292,18 +292,18 @@
/obj/structure/window/reinforced{
dir = 8
},
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/tcommsat/oldaisat)
"bc" = (
/obj/structure/window/reinforced,
/obj/structure/window/reinforced{
dir = 1
},
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/tcommsat/oldaisat)
"bd" = (
/obj/structure/window/reinforced,
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/tcommsat/oldaisat)
"be" = (
/obj/structure/window/reinforced,
@@ -311,7 +311,7 @@
dir = 1
},
/obj/item/electronics/airlock,
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/tcommsat/oldaisat)
"bf" = (
/obj/structure/door_assembly/door_assembly_hatch,
@@ -377,7 +377,7 @@
/obj/structure/window/reinforced{
dir = 4
},
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/tcommsat/oldaisat)
"bq" = (
/obj/structure/window/reinforced{
@@ -413,14 +413,14 @@
/area/tcommsat/oldaisat)
"bv" = (
/obj/machinery/door/airlock/maintenance_hatch,
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/tcommsat/oldaisat)
"bw" = (
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/tcommsat/oldaisat)
"bx" = (
/obj/machinery/door/airlock/hatch,
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/tcommsat/oldaisat)
"by" = (
/obj/structure/window/reinforced{
@@ -436,7 +436,7 @@
/obj/item/shard{
icon_state = "medium"
},
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/tcommsat/oldaisat)
"bA" = (
/obj/effect/spawner/structure/window/hollow/reinforced/end{
@@ -467,7 +467,7 @@
/obj/structure/window/reinforced{
dir = 8
},
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/tcommsat/oldaisat)
"bF" = (
/obj/structure/window/reinforced{
@@ -484,7 +484,7 @@
dir = 8
},
/obj/item/stack/rods,
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/tcommsat/oldaisat)
"bH" = (
/obj/item/stack/rods,
@@ -497,13 +497,13 @@
/obj/structure/window/reinforced{
dir = 8
},
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/tcommsat/oldaisat)
"bJ" = (
/obj/structure/window/reinforced{
dir = 4
},
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/tcommsat/oldaisat)
"bK" = (
/obj/effect/spawner/structure/window/hollow/reinforced/directional{
@@ -526,7 +526,7 @@
/obj/item/scalpel{
pixel_y = 12
},
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/tcommsat/oldaisat)
"bO" = (
/obj/structure/window/reinforced{
@@ -535,7 +535,7 @@
/obj/item/shard{
icon_state = "medium"
},
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/tcommsat/oldaisat)
"bP" = (
/obj/effect/spawner/structure/window/hollow/reinforced/middle{
@@ -550,7 +550,7 @@
/area/tcommsat/oldaisat)
"bR" = (
/obj/item/radio/off,
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/tcommsat/oldaisat)
"bS" = (
/obj/effect/spawner/structure/window/hollow/reinforced/middle{
@@ -581,11 +581,11 @@
dir = 1
},
/obj/structure/window/reinforced,
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/tcommsat/oldaisat)
"bX" = (
/obj/structure/door_assembly/door_assembly_mhatch,
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/tcommsat/oldaisat)
"bY" = (
/obj/machinery/light/small{
@@ -600,7 +600,7 @@
"ca" = (
/obj/effect/decal/cleanable/blood,
/obj/item/assembly/signaler,
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/tcommsat/oldaisat)
"cb" = (
/obj/structure/table,
@@ -608,7 +608,7 @@
/obj/item/reagent_containers/syringe/lethal{
pixel_y = 4
},
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/tcommsat/oldaisat)
"cc" = (
/obj/effect/spawner/structure/window/hollow/reinforced/end{
@@ -628,12 +628,12 @@
"cf" = (
/obj/structure/table,
/obj/item/hemostat,
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/tcommsat/oldaisat)
"cg" = (
/obj/structure/table,
/obj/item/circular_saw,
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/tcommsat/oldaisat)
"ch" = (
/obj/effect/spawner/structure/window/hollow/reinforced/directional{
@@ -649,7 +649,7 @@
dir = 4
},
/obj/item/stack/rods,
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/tcommsat/oldaisat)
"cj" = (
/obj/structure/window/reinforced{
@@ -699,7 +699,7 @@
/obj/structure/window/reinforced{
dir = 8
},
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/tcommsat/oldaisat)
"cr" = (
/obj/item/paper/crumpled,
@@ -723,7 +723,7 @@
/obj/structure/window/reinforced{
dir = 4
},
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/tcommsat/oldaisat)
"cv" = (
/obj/effect/turf_decal/stripes/line{
@@ -904,7 +904,7 @@
"AX" = (
/obj/effect/decal/cleanable/blood,
/obj/effect/spawner/lootdrop/space/fancytool,
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/tcommsat/oldaisat)
(1,1,1) = {"
diff --git a/_maps/RandomRuins/SpaceRuins/onehalf.dmm b/_maps/RandomRuins/SpaceRuins/onehalf.dmm
index 2e2817d0aa2..342d74bfbbb 100644
--- a/_maps/RandomRuins/SpaceRuins/onehalf.dmm
+++ b/_maps/RandomRuins/SpaceRuins/onehalf.dmm
@@ -826,7 +826,7 @@
/turf/open/floor/iron,
/area/ruin/space/has_grav/onehalf/bridge)
"cx" = (
-/obj/item/stack/tile/iron,
+/obj/item/stack/tile/iron/base,
/turf/open/floor/iron,
/area/ruin/space/has_grav/onehalf/bridge)
"cy" = (
@@ -1001,7 +1001,7 @@
/turf/template_noop,
/area/template_noop)
"ms" = (
-/obj/item/stack/tile/iron,
+/obj/item/stack/tile/iron/base,
/obj/structure/cable,
/turf/open/floor/iron,
/area/ruin/space/has_grav/onehalf/bridge)
diff --git a/_maps/RandomZLevels/Academy.dmm b/_maps/RandomZLevels/Academy.dmm
index ac4829b4d4c..125c95fe68c 100644
--- a/_maps/RandomZLevels/Academy.dmm
+++ b/_maps/RandomZLevels/Academy.dmm
@@ -2297,7 +2297,7 @@
/obj/structure/window/reinforced{
dir = 1
},
-/turf/open/floor/iron/airless/white{
+/turf/open/floor/iron/white/airless{
dir = 4
},
/area/awaymission/academy/academyaft)
@@ -2311,7 +2311,7 @@
dir = 4
},
/obj/effect/turf_decal/tile/red,
-/turf/open/floor/iron/airless/white,
+/turf/open/floor/iron/white/airless,
/area/awaymission/academy/academyaft)
"iY" = (
/obj/structure/shuttle/engine/propulsion/left,
@@ -2335,7 +2335,7 @@
/area/awaymission/academy/academyaft)
"jf" = (
/obj/structure/cable,
-/turf/open/floor/iron/airless/white{
+/turf/open/floor/iron/white/airless{
dir = 4
},
/area/awaymission/academy/academyaft)
@@ -2345,7 +2345,7 @@
},
/obj/effect/turf_decal/tile/red,
/obj/structure/cable,
-/turf/open/floor/iron/airless/white,
+/turf/open/floor/iron/white/airless,
/area/awaymission/academy/academyaft)
"ji" = (
/obj/structure/table,
@@ -2377,7 +2377,7 @@
/turf/open/floor/carpet,
/area/awaymission/academy/academyaft)
"jn" = (
-/turf/open/floor/iron/airless/white{
+/turf/open/floor/iron/white/airless{
dir = 4
},
/area/awaymission/academy/academyaft)
@@ -2390,7 +2390,7 @@
dir = 4
},
/obj/effect/turf_decal/tile/red,
-/turf/open/floor/iron/airless/white,
+/turf/open/floor/iron/white/airless,
/area/awaymission/academy/academyaft)
"jp" = (
/obj/item/weldingtool,
@@ -2471,7 +2471,7 @@
/area/awaymission/academy/academyaft)
"jz" = (
/obj/structure/window/reinforced,
-/turf/open/floor/iron/airless/white{
+/turf/open/floor/iron/white/airless{
dir = 4
},
/area/awaymission/academy/academyaft)
@@ -2483,7 +2483,7 @@
dir = 4
},
/obj/effect/turf_decal/tile/red,
-/turf/open/floor/iron/airless/white,
+/turf/open/floor/iron/white/airless,
/area/awaymission/academy/academyaft)
"jB" = (
/obj/item/shard{
diff --git a/_maps/RandomZLevels/caves.dmm b/_maps/RandomZLevels/caves.dmm
index 90dbb61ec09..3a73f723437 100644
--- a/_maps/RandomZLevels/caves.dmm
+++ b/_maps/RandomZLevels/caves.dmm
@@ -1821,7 +1821,7 @@
},
/area/awaymission/caves/bmp_asteroid)
"fQ" = (
-/turf/open/floor/iron/elevatorshaft{
+/turf/open/floor/plating/elevatorshaft{
initial_gas_mix = "n2=23;o2=14;TEMP=2.7";
name = "elevator flooring"
},
@@ -1846,7 +1846,7 @@
/area/awaymission/caves/bmp_asteroid)
"fU" = (
/obj/effect/landmark/awaystart,
-/turf/open/floor/iron/elevatorshaft{
+/turf/open/floor/plating/elevatorshaft{
initial_gas_mix = "n2=23;o2=14;TEMP=2.7";
name = "elevator flooring"
},
diff --git a/_maps/RandomZLevels/snowdin.dmm b/_maps/RandomZLevels/snowdin.dmm
index 010421b6484..293b4ed19c0 100644
--- a/_maps/RandomZLevels/snowdin.dmm
+++ b/_maps/RandomZLevels/snowdin.dmm
@@ -9482,7 +9482,7 @@
/turf/open/floor/plating/snowed,
/area/awaymission/snowdin/cave)
"xl" = (
-/turf/open/floor/iron/elevatorshaft{
+/turf/open/floor/plating/elevatorshaft{
initial_gas_mix = "o2=22;n2=82;TEMP=180"
},
/area/awaymission/snowdin/cave)
@@ -9673,7 +9673,7 @@
roundstart_template = /datum/map_template/shuttle/snowdin/excavation;
width = 6
},
-/turf/open/floor/iron/elevatorshaft{
+/turf/open/floor/plating/elevatorshaft{
initial_gas_mix = "o2=22;n2=82;TEMP=180"
},
/area/awaymission/snowdin/cave)
@@ -9714,7 +9714,7 @@
name = "snowdin excavation down";
width = 6
},
-/turf/open/floor/iron/elevatorshaft,
+/turf/open/floor/plating/elevatorshaft,
/area/awaymission/snowdin/post/mining_dock)
"xQ" = (
/obj/effect/turf_decal/stripes/line{
@@ -14204,7 +14204,7 @@
/turf/open/floor/iron,
/area/awaymission/snowdin/post/mining_main)
"JQ" = (
-/turf/open/floor/iron/elevatorshaft,
+/turf/open/floor/plating/elevatorshaft,
/area/awaymission/snowdin/post/mining_main)
"JT" = (
/obj/machinery/light/small,
@@ -14360,7 +14360,7 @@
roundstart_template = /datum/map_template/shuttle/snowdin/mining;
width = 5
},
-/turf/open/floor/iron/elevatorshaft,
+/turf/open/floor/plating/elevatorshaft,
/area/awaymission/snowdin/post/mining_main)
"Ko" = (
/obj/machinery/light{
@@ -14416,7 +14416,7 @@
name = "snowdin mining bottom";
width = 5
},
-/turf/open/floor/iron/elevatorshaft,
+/turf/open/floor/plating/elevatorshaft,
/area/awaymission/snowdin/post/mining_dock)
"Ku" = (
/obj/machinery/light{
@@ -14856,7 +14856,7 @@
/turf/open/floor/plating,
/area/awaymission/snowdin/post/garage)
"Ys" = (
-/turf/open/floor/iron/elevatorshaft,
+/turf/open/floor/plating/elevatorshaft,
/area/awaymission/snowdin/post/mining_dock)
"ZH" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible{
diff --git a/_maps/RandomZLevels/spacebattle.dmm b/_maps/RandomZLevels/spacebattle.dmm
index 477a71860d8..fc9e5199efa 100644
--- a/_maps/RandomZLevels/spacebattle.dmm
+++ b/_maps/RandomZLevels/spacebattle.dmm
@@ -2347,7 +2347,7 @@
/turf/closed/wall/mineral/plasma,
/area/awaymission/spacebattle/secret)
"jm" = (
-/turf/open/floor/iron/rockvault/alien,
+/turf/open/floor/vault/alien,
/area/awaymission/spacebattle/secret)
"jn" = (
/obj/machinery/door/airlock/plasma,
@@ -2355,7 +2355,7 @@
/area/awaymission/spacebattle/secret)
"jo" = (
/obj/item/clothing/suit/space/hardsuit/wizard,
-/turf/open/floor/iron/rockvault/alien,
+/turf/open/floor/vault/alien,
/area/awaymission/spacebattle/secret)
"jp" = (
/obj/vehicle/sealed/mecha/combat/gygax,
diff --git a/_maps/RandomZLevels/wildwest.dmm b/_maps/RandomZLevels/wildwest.dmm
index 8890577faeb..999d0962e0f 100644
--- a/_maps/RandomZLevels/wildwest.dmm
+++ b/_maps/RandomZLevels/wildwest.dmm
@@ -51,7 +51,7 @@
/turf/open/floor/circuit/off,
/area/awaymission/wildwest/vault)
"an" = (
-/turf/open/floor/iron/cult{
+/turf/open/floor/cult{
initial_gas_mix = "TEMP=2.7"
},
/area/awaymission/wildwest/vault)
@@ -130,7 +130,7 @@
/area/awaymission/wildwest/vault)
"aL" = (
/obj/item/paper/fluff/awaymissions/wildwest/grinder,
-/turf/open/floor/iron/cult{
+/turf/open/floor/cult{
initial_gas_mix = "TEMP=2.7"
},
/area/awaymission/wildwest/vault)
@@ -142,7 +142,7 @@
/area/awaymission/wildwest/mines)
"aO" = (
/obj/effect/mob_spawn/human/corpse/syndicatecommando,
-/turf/open/floor/iron/cult{
+/turf/open/floor/cult{
initial_gas_mix = "TEMP=2.7"
},
/area/awaymission/wildwest/vault)
diff --git a/_maps/map_files/CTF/limbo.dmm b/_maps/map_files/CTF/limbo.dmm
index 631d28cc398..cb9e070e878 100644
--- a/_maps/map_files/CTF/limbo.dmm
+++ b/_maps/map_files/CTF/limbo.dmm
@@ -46,7 +46,7 @@
/obj/effect/turf_decal/tile/green{
dir = 8
},
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/ctf)
"cl" = (
/obj/effect/turf_decal/tile/yellow,
@@ -59,7 +59,7 @@
/obj/effect/turf_decal/tile/yellow{
dir = 1
},
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/ctf)
"cu" = (
/obj/effect/turf_decal/tile/green{
@@ -72,7 +72,7 @@
dir = 8
},
/obj/effect/turf_decal/tile/green,
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/ctf)
"cV" = (
/obj/structure/ladder/unbreakable/rune{
@@ -92,7 +92,7 @@
/obj/effect/turf_decal/tile/blue{
dir = 8
},
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/ctf)
"ef" = (
/obj/structure/window/reinforced/fulltile{
@@ -121,7 +121,7 @@
/obj/effect/turf_decal/tile/blue{
dir = 4
},
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/ctf)
"fs" = (
/obj/effect/turf_decal/tile/red{
@@ -134,7 +134,7 @@
dir = 4
},
/obj/effect/turf_decal/tile/red,
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/ctf)
"fH" = (
/obj/effect/turf_decal/siding/wood/corner,
@@ -154,7 +154,7 @@
/obj/effect/turf_decal/tile/red{
dir = 8
},
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/ctf)
"gq" = (
/obj/structure/barricade/security/ctf,
@@ -169,7 +169,7 @@
"hh" = (
/obj/structure/barricade/security/ctf,
/obj/structure/barricade/security/ctf,
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/ctf)
"hl" = (
/obj/effect/turf_decal/siding/wood/corner{
@@ -205,7 +205,7 @@
/obj/effect/turf_decal/tile/green{
dir = 8
},
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/ctf)
"iN" = (
/obj/effect/turf_decal/tile/green,
@@ -215,7 +215,7 @@
/obj/effect/turf_decal/tile/green{
dir = 8
},
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/ctf)
"jn" = (
/obj/effect/turf_decal/tile/green,
@@ -228,7 +228,7 @@
/obj/effect/turf_decal/tile/green{
dir = 4
},
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/ctf)
"jz" = (
/obj/effect/turf_decal/siding/blue{
@@ -257,7 +257,7 @@
/obj/effect/turf_decal/tile/green{
dir = 4
},
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/ctf)
"mG" = (
/obj/effect/turf_decal/siding/yellow{
@@ -267,7 +267,7 @@
/area/ctf)
"mP" = (
/obj/structure/barricade/security/ctf,
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/ctf)
"ng" = (
/obj/effect/turf_decal/siding/yellow{
@@ -289,7 +289,7 @@
/obj/effect/turf_decal/tile/blue{
dir = 4
},
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/ctf)
"nB" = (
/obj/effect/turf_decal/siding/wood{
@@ -373,7 +373,7 @@
/obj/effect/turf_decal/tile/green{
dir = 8
},
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/ctf)
"pF" = (
/obj/effect/portal/permanent{
@@ -435,7 +435,7 @@
/obj/effect/turf_decal/tile/yellow{
dir = 8
},
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/ctf)
"rm" = (
/obj/machinery/capture_the_flag/blue,
@@ -468,14 +468,14 @@
/obj/effect/turf_decal/tile/yellow{
dir = 8
},
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/ctf)
"st" = (
/obj/effect/turf_decal/tile/green,
/obj/effect/turf_decal/tile/green{
dir = 4
},
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/ctf)
"tm" = (
/obj/effect/turf_decal/siding/wood/corner{
@@ -500,7 +500,7 @@
/obj/effect/turf_decal/tile/green{
dir = 8
},
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/ctf)
"uh" = (
/turf/template_noop,
@@ -541,7 +541,7 @@
/obj/effect/turf_decal/tile/red{
dir = 8
},
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/ctf)
"wS" = (
/obj/effect/portal/permanent{
@@ -575,7 +575,7 @@
/obj/effect/turf_decal/tile/yellow{
dir = 8
},
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/ctf)
"yo" = (
/turf/closed/indestructible/wood,
@@ -614,7 +614,7 @@
/obj/effect/turf_decal/tile/red{
dir = 1
},
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/ctf)
"AD" = (
/obj/structure/ladder/unbreakable/rune{
@@ -666,7 +666,7 @@
/obj/effect/turf_decal/tile/red{
dir = 4
},
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/ctf)
"Cf" = (
/obj/effect/turf_decal/siding/blue/corner{
@@ -676,7 +676,7 @@
/area/ctf)
"Ch" = (
/obj/effect/turf_decal/tile/yellow,
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/ctf)
"Cn" = (
/obj/effect/portal/permanent{
@@ -723,7 +723,7 @@
/obj/effect/turf_decal/tile/green{
dir = 4
},
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/ctf)
"Ez" = (
/obj/effect/turf_decal/tile/blue{
@@ -736,7 +736,7 @@
dir = 4
},
/obj/effect/turf_decal/tile/blue,
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/ctf)
"EE" = (
/obj/effect/turf_decal/siding/wood/corner{
@@ -763,7 +763,7 @@
/obj/effect/turf_decal/tile/green{
dir = 8
},
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/ctf)
"FH" = (
/obj/effect/turf_decal/siding/blue/corner{
@@ -783,7 +783,7 @@
/obj/effect/turf_decal/tile/yellow{
dir = 8
},
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/ctf)
"GC" = (
/obj/effect/turf_decal/siding/yellow{
@@ -807,7 +807,7 @@
/obj/effect/turf_decal/tile/yellow{
dir = 8
},
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/ctf)
"GZ" = (
/obj/effect/portal/permanent{
@@ -856,7 +856,7 @@
/obj/effect/turf_decal/tile/yellow{
dir = 8
},
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/ctf)
"Ia" = (
/turf/open/floor/carpet/orange,
@@ -890,7 +890,7 @@
/obj/effect/turf_decal/tile/red{
dir = 8
},
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/ctf)
"Ly" = (
/obj/effect/turf_decal/tile/green{
@@ -899,13 +899,13 @@
/obj/effect/turf_decal/tile/green{
dir = 4
},
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/ctf)
"LC" = (
/obj/effect/turf_decal/tile/blue{
dir = 4
},
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/ctf)
"LX" = (
/obj/machinery/capture_the_flag/yellow,
@@ -1026,7 +1026,7 @@
dir = 4
},
/obj/effect/turf_decal/tile/red,
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/ctf)
"QJ" = (
/obj/effect/turf_decal/siding/blue,
@@ -1065,7 +1065,7 @@
dir = 4
},
/obj/effect/turf_decal/tile/yellow,
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/ctf)
"Sh" = (
/obj/structure/trap/ctf/yellow,
@@ -1087,7 +1087,7 @@
/turf/open/floor/carpet/blue,
/area/ctf)
"Tw" = (
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/ctf)
"TK" = (
/obj/effect/turf_decal/siding/blue{
@@ -1111,7 +1111,7 @@
/area/ctf)
"Uy" = (
/obj/effect/turf_decal/tile/green,
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/ctf)
"UN" = (
/obj/effect/turf_decal/siding/wood{
@@ -1141,7 +1141,7 @@
/obj/effect/turf_decal/tile/green{
dir = 1
},
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/ctf)
"VE" = (
/obj/effect/turf_decal/siding/blue{
@@ -1169,7 +1169,7 @@
/obj/effect/turf_decal/tile/blue{
dir = 4
},
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/ctf)
"Yl" = (
/obj/effect/portal/permanent{
@@ -1194,7 +1194,7 @@
/obj/effect/turf_decal/tile/red{
dir = 4
},
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/ctf)
"Zi" = (
/obj/effect/turf_decal/tile/green,
@@ -1204,7 +1204,7 @@
/obj/effect/turf_decal/tile/green{
dir = 8
},
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/ctf)
"Zr" = (
/obj/effect/turf_decal/siding/yellow{
@@ -1219,7 +1219,7 @@
/obj/effect/turf_decal/tile/blue{
dir = 1
},
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/ctf)
"ZY" = (
/obj/effect/turf_decal/tile/green{
@@ -1232,7 +1232,7 @@
/obj/effect/turf_decal/tile/green{
dir = 4
},
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/ctf)
(1,1,1) = {"
diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm
index b4b3de177c2..04f20eac83b 100644
--- a/_maps/map_files/Deltastation/DeltaStation2.dmm
+++ b/_maps/map_files/Deltastation/DeltaStation2.dmm
@@ -6384,7 +6384,7 @@
/area/ai_monitored/turret_protected/ai)
"aSd" = (
/obj/structure/disposalpipe/segment,
-/turf/open/floor/goonplaque,
+/turf/open/floor/iron/goonplaque,
/area/hallway/primary/fore)
"aSh" = (
/obj/structure/disposalpipe/segment{
@@ -48302,7 +48302,7 @@
name = "Aft-Starboard Solar Array"
},
/obj/structure/cable,
-/turf/open/floor/iron/airless/solarpanel,
+/turf/open/floor/iron/solarpanel/airless,
/area/solars/starboard/aft)
"gTH" = (
/obj/structure/disposalpipe/segment{
@@ -50733,7 +50733,7 @@
"hDg" = (
/obj/machinery/power/tracker,
/obj/structure/cable,
-/turf/open/floor/iron/airless/solarpanel,
+/turf/open/floor/iron/solarpanel/airless,
/area/solars/port/fore)
"hDA" = (
/obj/machinery/light_switch{
@@ -52010,7 +52010,7 @@
"hVc" = (
/obj/machinery/power/tracker,
/obj/structure/cable,
-/turf/open/floor/iron/airless/solarpanel,
+/turf/open/floor/iron/solarpanel/airless,
/area/solars/starboard/fore)
"hVi" = (
/obj/machinery/shower{
@@ -67886,7 +67886,7 @@
name = "Aft-Port Solar Array"
},
/obj/structure/cable,
-/turf/open/floor/iron/airless/solarpanel,
+/turf/open/floor/iron/solarpanel/airless,
/area/solars/port/aft)
"mef" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible{
@@ -72418,7 +72418,7 @@
"nnf" = (
/obj/machinery/power/tracker,
/obj/structure/cable,
-/turf/open/floor/iron/airless/solarpanel,
+/turf/open/floor/iron/solarpanel/airless,
/area/solars/port/aft)
"nnn" = (
/obj/item/kirbyplants/random,
@@ -81092,7 +81092,7 @@
name = "Fore-Port Solar Array"
},
/obj/structure/cable,
-/turf/open/floor/iron/airless/solarpanel,
+/turf/open/floor/iron/solarpanel/airless,
/area/solars/port/fore)
"pvh" = (
/obj/structure/chair{
@@ -96905,7 +96905,7 @@
name = "Fore-Starboard Solar Array"
},
/obj/structure/cable,
-/turf/open/floor/iron/airless/solarpanel,
+/turf/open/floor/iron/solarpanel/airless,
/area/solars/starboard/fore)
"tEy" = (
/obj/machinery/photocopier,
@@ -109124,7 +109124,7 @@
"wSL" = (
/obj/machinery/power/tracker,
/obj/structure/cable,
-/turf/open/floor/iron/airless/solarpanel,
+/turf/open/floor/iron/solarpanel/airless,
/area/solars/starboard/aft)
"wSM" = (
/obj/structure/disposalpipe/segment,
diff --git a/_maps/map_files/IceBoxStation/IceBoxStation.dmm b/_maps/map_files/IceBoxStation/IceBoxStation.dmm
index 4644e863ed8..56335b8fa82 100644
--- a/_maps/map_files/IceBoxStation/IceBoxStation.dmm
+++ b/_maps/map_files/IceBoxStation/IceBoxStation.dmm
@@ -43,7 +43,7 @@
/turf/open/floor/iron,
/area/security/prison)
"aan" = (
-/obj/item/stack/tile/iron,
+/obj/item/stack/tile/iron/base,
/turf/open/floor/plating/asteroid/snow/icemoon,
/area/icemoon/surface/outdoors)
"aao" = (
@@ -9568,7 +9568,7 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 4
},
-/turf/open/floor/goonplaque,
+/turf/open/floor/iron/goonplaque,
/area/hallway/secondary/entry)
"aNj" = (
/obj/machinery/navbeacon{
diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm
index f3745bf807a..372661040ad 100644
--- a/_maps/map_files/KiloStation/KiloStation.dmm
+++ b/_maps/map_files/KiloStation/KiloStation.dmm
@@ -5201,7 +5201,7 @@
name = "Fore-Port Solar Array"
},
/obj/structure/cable,
-/turf/open/floor/iron/airless/solarpanel,
+/turf/open/floor/iron/solarpanel/airless,
/area/space/nearstation)
"alb" = (
/obj/structure/sign/warning/electricshock{
@@ -6417,7 +6417,7 @@
/obj/machinery/power/tracker,
/obj/effect/turf_decal/box,
/obj/structure/cable,
-/turf/open/floor/iron/airless/solarpanel,
+/turf/open/floor/iron/solarpanel/airless,
/area/space/nearstation)
"anu" = (
/obj/effect/spawner/structure/window/reinforced,
@@ -44059,7 +44059,7 @@
/obj/effect/turf_decal/stripes/corner{
dir = 1
},
-/turf/open/floor/goonplaque,
+/turf/open/floor/iron/goonplaque,
/area/security/brig)
"cmD" = (
/obj/effect/turf_decal/tile/neutral,
@@ -56371,7 +56371,7 @@
"ePG" = (
/obj/structure/cable,
/obj/machinery/power/tracker,
-/turf/open/floor/iron/airless/solarpanel,
+/turf/open/floor/iron/solarpanel/airless,
/area/solars/port/aft)
"eRf" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
@@ -58036,7 +58036,7 @@
name = "Fore-Port Solar Array"
},
/obj/structure/cable,
-/turf/open/floor/iron/airless/solarpanel,
+/turf/open/floor/iron/solarpanel/airless,
/area/solars/port/fore)
"fES" = (
/obj/effect/spawner/structure/window/reinforced,
@@ -65577,7 +65577,7 @@
name = "Aft-Port Solar Array"
},
/obj/structure/cable,
-/turf/open/floor/iron/airless/solarpanel,
+/turf/open/floor/iron/solarpanel/airless,
/area/solars/port/aft)
"jOl" = (
/obj/structure/cable,
@@ -66676,7 +66676,7 @@
/obj/machinery/power/tracker,
/obj/effect/turf_decal/box,
/obj/structure/cable,
-/turf/open/floor/iron/airless/solarpanel,
+/turf/open/floor/iron/solarpanel/airless,
/area/solars/starboard/fore)
"krN" = (
/obj/structure/table,
@@ -73275,7 +73275,7 @@
},
/obj/effect/turf_decal/box,
/obj/structure/cable,
-/turf/open/floor/iron/airless/solarpanel,
+/turf/open/floor/iron/solarpanel/airless,
/area/solars/starboard/aft)
"nRA" = (
/obj/effect/turf_decal/tile/red,
@@ -80492,7 +80492,7 @@
/obj/machinery/power/tracker,
/obj/effect/turf_decal/box,
/obj/structure/cable,
-/turf/open/floor/iron/airless/solarpanel,
+/turf/open/floor/iron/solarpanel/airless,
/area/solars/starboard/aft)
"rHf" = (
/obj/effect/turf_decal/tile/yellow{
@@ -91596,7 +91596,7 @@
name = "Fore-Starboard Solar Array"
},
/obj/structure/cable,
-/turf/open/floor/iron/airless/solarpanel,
+/turf/open/floor/iron/solarpanel/airless,
/area/solars/starboard/fore)
"xMa" = (
/obj/effect/turf_decal/stripes/line,
diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm
index d55f475c543..1113ad76b80 100644
--- a/_maps/map_files/MetaStation/MetaStation.dmm
+++ b/_maps/map_files/MetaStation/MetaStation.dmm
@@ -8164,7 +8164,7 @@
/obj/machinery/light/small{
dir = 1
},
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/service/chapel/main)
"bdr" = (
/obj/structure/rack,
@@ -25411,7 +25411,7 @@
id = "foreport";
name = "Fore-Port Solar Array"
},
-/turf/open/floor/iron/airless/solarpanel,
+/turf/open/floor/iron/solarpanel/airless,
/area/solars/port/fore)
"eMz" = (
/obj/structure/chair/office,
@@ -35437,7 +35437,7 @@
/area/maintenance/starboard)
"iit" = (
/obj/structure/cable,
-/turf/open/floor/iron/airless/solarpanel,
+/turf/open/floor/iron/solarpanel/airless,
/area/solars/starboard/aft)
"iiI" = (
/obj/effect/turf_decal/tile/neutral{
@@ -45505,7 +45505,7 @@
/obj/machinery/door/morgue{
name = "Chapel Garden"
},
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/service/chapel/main)
"lIr" = (
/obj/structure/cable,
@@ -60281,7 +60281,7 @@
},
/obj/item/organ/heart,
/obj/item/soulstone/anybody/chaplain,
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/service/chapel/office)
"qAD" = (
/obj/effect/turf_decal/tile/neutral{
@@ -68978,7 +68978,7 @@
id = "aftport";
name = "Aft-Port Solar Array"
},
-/turf/open/floor/iron/airless/solarpanel,
+/turf/open/floor/iron/solarpanel/airless,
/area/solars/port/aft)
"tid" = (
/obj/effect/turf_decal/trimline/blue/filled/line{
@@ -74165,7 +74165,7 @@
name = "Relic Closet";
req_access_txt = "22"
},
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/service/chapel/office)
"uTb" = (
/obj/machinery/door/window/westright,
@@ -74737,7 +74737,7 @@
/area/maintenance/port/fore)
"vaT" = (
/obj/structure/cable,
-/turf/open/floor/goonplaque,
+/turf/open/floor/iron/goonplaque,
/area/hallway/primary/port)
"vaY" = (
/obj/structure/table,
@@ -75673,7 +75673,7 @@
/area/security/brig)
"vsN" = (
/obj/structure/cable,
-/turf/open/floor/iron/airless/solarpanel,
+/turf/open/floor/iron/solarpanel/airless,
/area/solars/port/aft)
"vsV" = (
/obj/structure/disposalpipe/segment,
@@ -80848,7 +80848,7 @@
id = "forestarboard";
name = "Fore-Starboard Solar Array"
},
-/turf/open/floor/iron/airless/solarpanel,
+/turf/open/floor/iron/solarpanel/airless,
/area/solars/starboard/fore)
"xfM" = (
/obj/effect/turf_decal/stripes/line{
diff --git a/_maps/map_files/tramstation/tramstation.dmm b/_maps/map_files/tramstation/tramstation.dmm
index d0b084eb038..2a95af8253a 100644
--- a/_maps/map_files/tramstation/tramstation.dmm
+++ b/_maps/map_files/tramstation/tramstation.dmm
@@ -8101,7 +8101,7 @@
/area/service/janitor)
"azj" = (
/obj/structure/cable,
-/turf/open/floor/goonplaque,
+/turf/open/floor/iron/goonplaque,
/area/hallway/secondary/entry)
"azk" = (
/obj/structure/reagent_dispensers/fueltank/large,
@@ -26227,7 +26227,7 @@
/turf/open/floor/iron/dark,
/area/service/hydroponics)
"fSF" = (
-/turf/open/floor/iron/elevatorshaft,
+/turf/open/floor/plating/elevatorshaft,
/area/security/prison)
"fSO" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
@@ -57685,7 +57685,7 @@
name = "AI Core Solar Array"
},
/obj/structure/cable,
-/turf/open/floor/iron/airless/solarpanel,
+/turf/open/floor/iron/solarpanel/airless,
/area/space/nearstation)
"sBn" = (
/obj/structure/fireaxecabinet{
diff --git a/_maps/shuttles/emergency_discoinferno.dmm b/_maps/shuttles/emergency_discoinferno.dmm
index 21b565ab322..a9743d3643f 100644
--- a/_maps/shuttles/emergency_discoinferno.dmm
+++ b/_maps/shuttles/emergency_discoinferno.dmm
@@ -7,7 +7,7 @@
/area/shuttle/escape)
"c" = (
/obj/effect/spawner/structure/window/plasma/reinforced,
-/turf/open/floor/iron/elevatorshaft,
+/turf/open/floor/plating/elevatorshaft,
/area/shuttle/escape)
"d" = (
/obj/structure/table/wood,
diff --git a/_maps/shuttles/emergency_luxury.dmm b/_maps/shuttles/emergency_luxury.dmm
index 95c5c36a378..2e15b74b3d3 100644
--- a/_maps/shuttles/emergency_luxury.dmm
+++ b/_maps/shuttles/emergency_luxury.dmm
@@ -526,7 +526,7 @@
/turf/open/floor/plating,
/area/shuttle/escape/luxury)
"bI" = (
-/obj/item/stack/tile/iron,
+/obj/item/stack/tile/iron/base,
/turf/open/floor/iron,
/area/shuttle/escape/luxury)
"bJ" = (
@@ -592,7 +592,7 @@
/turf/open/floor/plating,
/area/shuttle/escape/luxury)
"bS" = (
-/obj/item/stack/tile/iron,
+/obj/item/stack/tile/iron/base,
/turf/open/floor/plating,
/area/shuttle/escape/luxury)
"bT" = (
@@ -721,7 +721,7 @@
/turf/open/floor/carpet/cyan,
/area/shuttle/escape/luxury)
"ck" = (
-/obj/item/stack/tile/iron,
+/obj/item/stack/tile/iron/base,
/obj/machinery/light/small{
dir = 8
},
@@ -915,7 +915,7 @@
/turf/open/floor/carpet/blue,
/area/shuttle/escape/luxury)
"cJ" = (
-/obj/item/stack/tile/iron,
+/obj/item/stack/tile/iron/base,
/obj/machinery/light/small{
dir = 8
},
diff --git a/_maps/shuttles/emergency_narnar.dmm b/_maps/shuttles/emergency_narnar.dmm
index 1f01745a341..957353b5203 100644
--- a/_maps/shuttles/emergency_narnar.dmm
+++ b/_maps/shuttles/emergency_narnar.dmm
@@ -12,17 +12,17 @@
"d" = (
/obj/structure/table,
/obj/item/storage/firstaid/fire,
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/shuttle/escape)
"e" = (
/obj/structure/chair/comfy/shuttle{
dir = 1
},
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/shuttle/escape)
"f" = (
/obj/machinery/computer/emergency_shuttle,
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/shuttle/escape)
"g" = (
/obj/structure/table,
@@ -31,40 +31,40 @@
pixel_y = 3
},
/obj/item/crowbar,
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/shuttle/escape)
"h" = (
/obj/machinery/computer/atmos_alert{
dir = 4
},
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/shuttle/escape)
"i" = (
/obj/structure/chair/comfy/shuttle{
dir = 8
},
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/shuttle/escape)
"j" = (
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/shuttle/escape)
"k" = (
/obj/structure/chair/comfy/shuttle{
dir = 4
},
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/shuttle/escape)
"l" = (
/obj/machinery/computer/security{
dir = 8
},
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/shuttle/escape)
"m" = (
/obj/machinery/computer/crew{
dir = 4
},
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/shuttle/escape)
"n" = (
/obj/structure/chair/comfy/shuttle{
@@ -73,29 +73,29 @@
/obj/structure/extinguisher_cabinet{
pixel_y = -30
},
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/shuttle/escape)
"o" = (
/obj/item/radio/intercom{
name = "Station Intercom (General)";
pixel_y = -29
},
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/shuttle/escape)
"p" = (
/obj/machinery/computer/communications{
dir = 8
},
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/shuttle/escape)
"q" = (
/obj/item/stack/sheet/iron,
/obj/effect/decal/remains/human,
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/shuttle/escape)
"r" = (
/obj/machinery/door/airlock/cult/unruned/glass/friendly,
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/shuttle/escape)
"s" = (
/obj/machinery/status_display/evac,
@@ -103,7 +103,7 @@
/area/shuttle/escape)
"t" = (
/obj/structure/closet/emcloset,
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/shuttle/escape)
"u" = (
/obj/structure/table,
@@ -113,15 +113,15 @@
pixel_y = 3
},
/obj/item/crowbar,
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/shuttle/escape)
"v" = (
/obj/effect/decal/cleanable/blood,
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/shuttle/escape)
"w" = (
/mob/living/simple_animal/hostile/construct/artificer,
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/shuttle/escape)
"x" = (
/obj/machinery/door/airlock/cult/friendly,
@@ -130,31 +130,31 @@
"y" = (
/obj/effect/decal/cleanable/blood/gibs/up,
/obj/item/candle/infinite,
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/shuttle/escape)
"z" = (
/obj/effect/rune/raise_dead,
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/shuttle/escape)
"A" = (
/obj/item/candle/infinite,
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/shuttle/escape)
"B" = (
/obj/effect/rune/convert,
/obj/effect/decal/remains/human,
/obj/effect/decal/cleanable/blood/gibs/body,
/obj/effect/decal/cleanable/blood/gibs/core,
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/shuttle/escape)
"C" = (
/mob/living/simple_animal/hostile/construct/juggernaut,
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/shuttle/escape)
"D" = (
/obj/effect/rune/convert,
/obj/effect/decal/remains/human,
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/shuttle/escape)
"E" = (
/obj/machinery/door/airlock/cult/friendly,
@@ -165,7 +165,7 @@
/area/shuttle/escape)
"F" = (
/obj/effect/decal/cleanable/blood/gibs/down,
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/shuttle/escape)
"G" = (
/obj/structure/extinguisher_cabinet{
@@ -174,11 +174,11 @@
/obj/item/extinguisher{
safety = 0
},
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/shuttle/escape)
"H" = (
/mob/living/simple_animal/hostile/construct/wraith,
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/shuttle/escape)
"I" = (
/obj/effect/rune/narsie,
@@ -186,43 +186,43 @@
effect_range = 5;
group_name = "horrible monsters on Shuttle 667"
},
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/shuttle/escape)
"J" = (
/mob/living/simple_animal/hostile/eyeball{
faction = list("cult");
name = "left eyeball"
},
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/shuttle/escape)
"K" = (
/mob/living/simple_animal/hostile/eyeball{
faction = list("cult");
name = "right eyeball"
},
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/shuttle/escape)
"L" = (
/obj/effect/decal/cleanable/blood/drip,
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/shuttle/escape)
"M" = (
/obj/structure/extinguisher_cabinet{
pixel_x = 27
},
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/shuttle/escape)
"N" = (
/obj/machinery/door/airlock/cult/glass/friendly,
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/shuttle/escape)
"O" = (
/obj/structure/dresser,
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/shuttle/escape)
"P" = (
/obj/structure/showcase/horrific_experiment,
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/shuttle/escape)
"Q" = (
/obj/item/storage/firstaid/fire,
@@ -235,21 +235,21 @@
pixel_x = 27
},
/obj/item/stack/sheet/iron,
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/shuttle/escape)
"R" = (
/obj/item/stack/sheet/iron,
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/shuttle/escape)
"S" = (
/obj/structure/table/wood,
/obj/item/tome,
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/shuttle/escape)
"T" = (
/obj/structure/bed,
/obj/item/bedsheet/cult,
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/shuttle/escape)
"U" = (
/obj/structure/window/reinforced{
@@ -264,7 +264,7 @@
/area/shuttle/escape)
"Z" = (
/obj/machinery/stasis,
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/shuttle/escape)
(1,1,1) = {"
diff --git a/_maps/shuttles/emergency_rollerdome.dmm b/_maps/shuttles/emergency_rollerdome.dmm
index e836fc5de76..0e776f1e46a 100644
--- a/_maps/shuttles/emergency_rollerdome.dmm
+++ b/_maps/shuttles/emergency_rollerdome.dmm
@@ -130,7 +130,7 @@
/area/shuttle/escape)
"wf" = (
/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
-/turf/open/floor/iron/elevatorshaft,
+/turf/open/floor/plating/elevatorshaft,
/area/shuttle/escape)
"wn" = (
/obj/structure/chair/comfy/brown{
diff --git a/_maps/shuttles/emergency_wabbajack.dmm b/_maps/shuttles/emergency_wabbajack.dmm
index 8fd9685f89c..b2072060c84 100644
--- a/_maps/shuttles/emergency_wabbajack.dmm
+++ b/_maps/shuttles/emergency_wabbajack.dmm
@@ -85,7 +85,7 @@
"aj" = (
/obj/structure/barricade/wooden,
/obj/machinery/door/airlock/titanium,
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/shuttle/escape)
"ak" = (
/obj/structure/chair/comfy/shuttle{
@@ -105,14 +105,14 @@
"an" = (
/obj/structure/table/wood,
/obj/item/candle/infinite,
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/shuttle/escape)
"ao" = (
/obj/structure/barricade/wooden,
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/shuttle/escape)
"ap" = (
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/shuttle/escape)
"aq" = (
/turf/open/floor/mineral/titanium,
@@ -149,7 +149,7 @@
/area/shuttle/escape/brig)
"au" = (
/obj/structure/chair/wood,
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/shuttle/escape)
"av" = (
/obj/structure/chair/comfy/shuttle,
@@ -478,7 +478,7 @@
/obj/machinery/light{
dir = 8
},
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/shuttle/escape)
"bl" = (
/obj/machinery/light{
diff --git a/_maps/shuttles/pirate_dutchman.dmm b/_maps/shuttles/pirate_dutchman.dmm
index dd5e29c590f..ec45c5cc080 100644
--- a/_maps/shuttles/pirate_dutchman.dmm
+++ b/_maps/shuttles/pirate_dutchman.dmm
@@ -483,7 +483,7 @@
dir = 8
},
/obj/structure/cable,
-/turf/open/floor/iron/airless/solarpanel,
+/turf/open/floor/iron/solarpanel/airless,
/area/shuttle/pirate/flying_dutchman)
"vi" = (
/obj/structure/railing{
@@ -876,7 +876,7 @@
"RY" = (
/obj/machinery/power/solar/fake,
/obj/structure/cable,
-/turf/open/floor/iron/airless/solarpanel,
+/turf/open/floor/iron/solarpanel/airless,
/area/shuttle/pirate/flying_dutchman)
"Sp" = (
/obj/effect/turf_decal/siding/wood{
diff --git a/_maps/shuttles/ruin_caravan_victim.dmm b/_maps/shuttles/ruin_caravan_victim.dmm
index 5158d524ae6..4f4978d0e4d 100644
--- a/_maps/shuttles/ruin_caravan_victim.dmm
+++ b/_maps/shuttles/ruin_caravan_victim.dmm
@@ -15,7 +15,7 @@
/obj/item/stack/sheet/mineral/silver{
amount = 25
},
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/shuttle/caravan/freighter1)
"aP" = (
/obj/machinery/door/airlock{
@@ -59,7 +59,7 @@
/obj/item/stack/sheet/mineral/diamond{
amount = 5
},
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/shuttle/caravan/freighter1)
"bR" = (
/obj/structure/toilet{
@@ -180,7 +180,7 @@
/area/shuttle/caravan/freighter1)
"hk" = (
/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/shuttle/caravan/freighter1)
"if" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
@@ -305,10 +305,10 @@
/obj/effect/turf_decal/box/white/corners{
dir = 4
},
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/shuttle/caravan/freighter1)
"oS" = (
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/shuttle/caravan/freighter1)
"pR" = (
/obj/machinery/light/small,
@@ -345,7 +345,7 @@
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/blood,
/obj/machinery/atmospherics/components/unary/vent_pump/on,
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/shuttle/caravan/freighter1)
"rF" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
@@ -396,7 +396,7 @@
dir = 8
},
/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/shuttle/caravan/freighter1)
"ur" = (
/obj/effect/decal/cleanable/dirt,
@@ -527,7 +527,7 @@
/obj/machinery/door/airlock/command{
name = "Bridge"
},
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/shuttle/caravan/freighter1)
"AX" = (
/obj/effect/turf_decal/box/white/corners,
@@ -535,7 +535,7 @@
/obj/item/stack/sheet/glass/fifty,
/obj/item/stack/sheet/glass/fifty,
/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/shuttle/caravan/freighter1)
"Bu" = (
/obj/item/stack/sheet/mineral/titanium,
@@ -630,7 +630,7 @@
/obj/item/stack/sheet/mineral/gold{
amount = 25
},
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/shuttle/caravan/freighter1)
"El" = (
/turf/closed/wall/mineral/titanium/nodiagonal,
@@ -899,7 +899,7 @@
amount = 10
},
/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/shuttle/caravan/freighter1)
"PM" = (
/obj/machinery/light/small,
@@ -989,7 +989,7 @@
/obj/effect/turf_decal/box/white/corners{
dir = 8
},
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/shuttle/caravan/freighter1)
"RN" = (
/obj/effect/turf_decal/bot,
@@ -1017,7 +1017,7 @@
icon_state = "crateopen"
},
/obj/item/stack/sheet/iron/fifty,
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/shuttle/caravan/freighter1)
"Ut" = (
/obj/effect/decal/cleanable/dirt,
@@ -1130,7 +1130,7 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
dir = 9
},
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/shuttle/caravan/freighter1)
"XI" = (
/obj/effect/turf_decal/bot_white,
@@ -1174,7 +1174,7 @@
/obj/item/stack/sheet/rglass{
amount = 20
},
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/shuttle/caravan/freighter1)
(1,1,1) = {"
diff --git a/_maps/shuttles/whiteship_donut.dmm b/_maps/shuttles/whiteship_donut.dmm
index b83138fcd63..a1377bd8dee 100644
--- a/_maps/shuttles/whiteship_donut.dmm
+++ b/_maps/shuttles/whiteship_donut.dmm
@@ -178,7 +178,7 @@
/obj/machinery/door/airlock/titanium{
name = "restroom"
},
-/turf/open/floor/iron/airless/showroomfloor,
+/turf/open/floor/iron/showroomfloor/airless,
/area/shuttle/abandoned)
"aG" = (
/obj/effect/decal/cleanable/dirt/dust,
@@ -211,11 +211,11 @@
},
/obj/machinery/door/window/eastleft,
/obj/structure/window/reinforced/tinted,
-/turf/open/floor/iron/airless/showroomfloor,
+/turf/open/floor/iron/showroomfloor/airless,
/area/shuttle/abandoned)
"aL" = (
/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/iron/airless/showroomfloor,
+/turf/open/floor/iron/showroomfloor/airless,
/area/shuttle/abandoned)
"aM" = (
/obj/effect/decal/cleanable/dirt/dust,
@@ -224,7 +224,7 @@
pixel_x = 32
},
/obj/structure/window/reinforced/tinted,
-/turf/open/floor/iron/airless/showroomfloor,
+/turf/open/floor/iron/showroomfloor/airless,
/area/shuttle/abandoned)
"aN" = (
/obj/effect/decal/cleanable/dirt/dust,
@@ -253,12 +253,12 @@
pixel_x = -12
},
/obj/item/soap,
-/turf/open/floor/iron/airless/showroomfloor,
+/turf/open/floor/iron/showroomfloor/airless,
/area/shuttle/abandoned)
"aR" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/machinery/light,
-/turf/open/floor/iron/airless/showroomfloor,
+/turf/open/floor/iron/showroomfloor/airless,
/area/shuttle/abandoned)
"aS" = (
/obj/effect/decal/cleanable/dirt/dust,
@@ -269,7 +269,7 @@
/obj/structure/window/reinforced/tinted{
dir = 1
},
-/turf/open/floor/iron/airless/showroomfloor,
+/turf/open/floor/iron/showroomfloor/airless,
/area/shuttle/abandoned)
"aT" = (
/obj/machinery/mech_bay_recharge_port,
diff --git a/code/controllers/subsystem/traumas.dm b/code/controllers/subsystem/traumas.dm
index 1f9716f6142..a476c0e7934 100644
--- a/code/controllers/subsystem/traumas.dm
+++ b/code/controllers/subsystem/traumas.dm
@@ -186,7 +186,7 @@ SUBSYSTEM_DEF(traumas)
)
phobia_turfs = list("space" = typecacheof(list(/turf/open/space, /turf/open/floor/holofloor/space, /turf/open/floor/fakespace)),
- "the supernatural" = typecacheof(list(/turf/open/floor/iron/cult, /turf/closed/wall/mineral/cult)),
+ "the supernatural" = typecacheof(list(/turf/open/floor/cult, /turf/closed/wall/mineral/cult)),
"aliens" = typecacheof(list(/turf/open/floor/plating/abductor, /turf/open/floor/plating/abductor2,
/turf/open/floor/mineral/abductor, /turf/closed/wall/mineral/abductor
)),
diff --git a/code/game/objects/effects/spawners/vaultspawner.dm b/code/game/objects/effects/spawners/vaultspawner.dm
index 9bdf0a673ed..cacb22369ab 100644
--- a/code/game/objects/effects/spawners/vaultspawner.dm
+++ b/code/game/objects/effects/spawners/vaultspawner.dm
@@ -20,9 +20,8 @@
for(var/j = lowBoundY,j<=hiBoundY,j++)
var/turf/T = locate(i,j,z)
if(i == lowBoundX || i == hiBoundX || j == lowBoundY || j == hiBoundY)
- T.PlaceOnTop(/turf/closed/wall/vault)
+ T.PlaceOnTop(text2path("/turf/closed/wall/vault/[type]"))
else
- T.PlaceOnTop(/turf/open/floor/vault)
- T.icon_state = "[type]vault"
+ T.PlaceOnTop(text2path("/turf/open/floor/vault/[type]"))
qdel(src)
diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm
index e2334df3ec0..2366e9e5050 100644
--- a/code/game/objects/items/stacks/sheets/sheet_types.dm
+++ b/code/game/objects/items/stacks/sheets/sheet_types.dm
@@ -70,7 +70,7 @@ GLOBAL_LIST_INIT(metal_recipes, list ( \
null, \
new/datum/stack_recipe("canister frame", /obj/structure/canister_frame/machine/frame_tier_0, 5, time = 8, one_per_turf = TRUE, on_floor = TRUE), \
null, \
- new/datum/stack_recipe("floor tile", /obj/item/stack/tile/iron, 1, 4, 20), \
+ new/datum/stack_recipe("floor tile", /obj/item/stack/tile/iron/base, 1, 4, 20), \
new/datum/stack_recipe("iron rod", /obj/item/stack/rods, 1, 2, 60), \
null, \
new/datum/stack_recipe("wall girders", /obj/structure/girder, 2, time = 40, one_per_turf = TRUE, on_floor = TRUE, trait_booster = TRAIT_QUICK_BUILD, trait_modifier = 0.75), \
diff --git a/code/game/objects/items/stacks/tiles/tile_iron.dm b/code/game/objects/items/stacks/tiles/tile_iron.dm
new file mode 100644
index 00000000000..4883a30f9b8
--- /dev/null
+++ b/code/game/objects/items/stacks/tiles/tile_iron.dm
@@ -0,0 +1,204 @@
+/obj/item/stack/tile/iron
+ name = "floor tile"
+ singular_name = "floor tile"
+ desc = "The ground you walk on."
+ icon_state = "tile"
+ inhand_icon_state = "tile"
+ force = 6
+ mats_per_unit = list(/datum/material/iron=500)
+ throwforce = 10
+ flags_1 = CONDUCT_1
+ turf_type = /turf/open/floor/iron
+ armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 100, ACID = 70)
+ resistance_flags = FIRE_PROOF
+ matter_amount = 1
+ cost = 125
+ source = /datum/robot_energy_storage/iron
+ merge_type = /obj/item/stack/tile/iron
+ tile_reskin_types = list(
+ /obj/item/stack/tile/iron,
+ /obj/item/stack/tile/iron/dark,
+ /obj/item/stack/tile/iron/dark_side,
+ /obj/item/stack/tile/iron/dark_corner,
+ /obj/item/stack/tile/iron/checker,
+ /obj/item/stack/tile/iron/white,
+ /obj/item/stack/tile/iron/white_side,
+ /obj/item/stack/tile/iron/white_corner,
+ /obj/item/stack/tile/iron/cafeteria,
+ /obj/item/stack/tile/iron/recharge_floor,
+ /obj/item/stack/tile/iron/chapel,
+ /obj/item/stack/tile/iron/showroomfloor,
+ /obj/item/stack/tile/iron/solarpanel,
+ /obj/item/stack/tile/iron/freezer,
+ /obj/item/stack/tile/iron/grimy,
+ /obj/item/stack/tile/iron/monotile,
+ /obj/item/stack/tile/iron/sepia,
+ )
+
+/obj/item/stack/tile/iron/attackby(obj/item/W, mob/user, params)
+ if(W.tool_behaviour == TOOL_WELDER)
+ if(get_amount() < 4)
+ to_chat(user, "You need at least four tiles to do this!")
+ return
+ if(W.use_tool(src, user, 0, volume=40))
+ var/obj/item/stack/sheet/iron/new_item = new(user.loc)
+ user.visible_message("[user] shaped [src] into [new_item] with [W].", \
+ "You shaped [src] into [new_item] with [W].", \
+ "You hear welding.")
+ var/holding = user.is_holding(src)
+ use(4)
+ if(holding && QDELETED(src))
+ user.put_in_hands(new_item)
+ else
+ return ..()
+
+/obj/item/stack/tile/iron/base //this subtype should be used for most stuff
+ merge_type = /obj/item/stack/tile/iron/base
+
+/obj/item/stack/tile/iron/dark
+ name = "dark tile"
+ singular_name = "dark floor tile"
+ icon_state = "tile_dark"
+ turf_type = /turf/open/floor/iron/dark
+ merge_type = /obj/item/stack/tile/iron/dark
+
+/obj/item/stack/tile/iron/dark_side
+ name = "half dark tile"
+ singular_name = "half dark floor tile"
+ icon_state = "tile_darkside"
+ turf_type = /turf/open/floor/iron/dark/side
+ merge_type = /obj/item/stack/tile/iron/dark_side
+ tile_rotate_dirs = list(SOUTH, NORTH, EAST, WEST, SOUTHEAST, SOUTHWEST, NORTHEAST, NORTHWEST)
+
+/obj/item/stack/tile/iron/dark_corner
+ name = "quarter dark tile"
+ singular_name = "quarter dark floor tile"
+ icon_state = "tile_darkcorner"
+ turf_type = /turf/open/floor/iron/dark/corner
+ merge_type = /obj/item/stack/tile/iron/dark_corner
+ tile_rotate_dirs = list(SOUTH, NORTH, EAST, WEST)
+
+/obj/item/stack/tile/iron/checker
+ name = "checker tile"
+ singular_name = "checker floor tile"
+ icon_state = "tile_checker"
+ turf_type = /turf/open/floor/iron/checker
+ merge_type = /obj/item/stack/tile/iron/checker
+ tile_rotate_dirs = list(SOUTH, NORTH)
+
+/obj/item/stack/tile/iron/white
+ name = "white tile"
+ singular_name = "white floor tile"
+ icon_state = "tile_white"
+ turf_type = /turf/open/floor/iron/white
+ merge_type = /obj/item/stack/tile/iron/white
+
+/obj/item/stack/tile/iron/white_side
+ name = "half white tile"
+ singular_name = "half white floor tile"
+ icon_state = "tile_whiteside"
+ turf_type = /turf/open/floor/iron/white/side
+ merge_type = /obj/item/stack/tile/iron/white_side
+ tile_rotate_dirs = list(SOUTH, NORTH, EAST, WEST, SOUTHEAST, SOUTHWEST, NORTHEAST, NORTHWEST)
+
+/obj/item/stack/tile/iron/white_corner
+ name = "quarter white tile"
+ singular_name = "quarter white floor tile"
+ icon_state = "tile_whitecorner"
+ turf_type = /turf/open/floor/iron/white/corner
+ merge_type = /obj/item/stack/tile/iron/white_corner
+ tile_rotate_dirs = list(SOUTH, NORTH, EAST, WEST)
+
+/obj/item/stack/tile/iron/cafeteria
+ name = "cafeteria tile"
+ singular_name = "cafeteria floor tile"
+ icon_state = "tile_cafeteria"
+ turf_type = /turf/open/floor/iron/cafeteria
+ merge_type = /obj/item/stack/tile/iron/cafeteria
+ tile_rotate_dirs = list(SOUTH, NORTH)
+
+/obj/item/stack/tile/iron/recharge_floor
+ name = "recharge floor tile"
+ singular_name = "recharge floor tile"
+ icon_state = "tile_recharge"
+ turf_type = /turf/open/floor/iron/recharge_floor
+ merge_type = /obj/item/stack/tile/iron/recharge_floor
+
+/obj/item/stack/tile/iron/chapel
+ name = "chapel floor tile"
+ singular_name = "chapel floor tile"
+ icon_state = "tile_chapel"
+ turf_type = /turf/open/floor/iron/chapel
+ merge_type = /obj/item/stack/tile/iron/chapel
+ tile_rotate_dirs = list(SOUTH, NORTH, EAST, WEST, SOUTHEAST, SOUTHWEST, NORTHEAST, NORTHWEST)
+
+/obj/item/stack/tile/iron/showroomfloor
+ name = "showroom floor tile"
+ singular_name = "showroom floor tile"
+ icon_state = "tile_showroom"
+ turf_type = /turf/open/floor/iron/showroomfloor
+ merge_type = /obj/item/stack/tile/iron/showroomfloor
+
+/obj/item/stack/tile/iron/solarpanel
+ name = "solar panel tile"
+ singular_name = "solar panel floor tile"
+ icon_state = "tile_solarpanel"
+ turf_type = /turf/open/floor/iron/solarpanel
+ merge_type = /obj/item/stack/tile/iron/solarpanel
+
+/obj/item/stack/tile/iron/freezer
+ name = "freezer floor tile"
+ singular_name = "freezer floor tile"
+ icon_state = "tile_freezer"
+ turf_type = /turf/open/floor/iron/freezer
+ merge_type = /obj/item/stack/tile/iron/freezer
+
+/obj/item/stack/tile/iron/grimy
+ name = "grimy floor tile"
+ singular_name = "grimy floor tile"
+ icon_state = "tile_grimy"
+ turf_type = /turf/open/floor/iron/grimy
+ merge_type = /obj/item/stack/tile/iron/grimy
+
+/obj/item/stack/tile/iron/monotile
+ name = "floor monotile"
+ singular_name = "floor monotile"
+ icon_state = "tile_mono"
+ turf_type = /turf/open/floor/iron/monotile
+ merge_type = /obj/item/stack/tile/iron/monotile
+
+/obj/item/stack/tile/iron/sepia
+ name = "sepia floor tile"
+ singular_name = "sepia floor tile"
+ desc = "Well, the flow of time is normal on these tiles, weird."
+ icon_state = "tile_sepia"
+ turf_type = /turf/open/floor/iron/sepia
+ merge_type = /obj/item/stack/tile/iron/sepia
+
+//Tiles below can't be gotten through tile reskinning
+
+/obj/item/stack/tile/iron/bluespace
+ name = "bluespace floor tile"
+ singular_name = "bluespace floor tile"
+ desc = "Sadly, these don't seem to make you faster..."
+ icon_state = "tile_bluespace"
+ turf_type = /turf/open/floor/iron/bluespace
+ merge_type = /obj/item/stack/tile/iron/bluespace
+ tile_reskin_types = null
+
+/obj/item/stack/tile/iron/goonplaque
+ name = "plaqued floor tile"
+ singular_name = "plaqued floor tile"
+ desc = "\"This is a plaque in honour of our comrades on the G4407 Stations. Hopefully TG4407 model can live up to your fame and fortune.\" Scratched in beneath that is a crude image of a meteor and a spaceman. The spaceman is laughing. The meteor is exploding."
+ icon_state = "tile_plaque"
+ turf_type = /turf/open/floor/iron/goonplaque
+ merge_type = /obj/item/stack/tile/iron/goonplaque
+ tile_reskin_types = null
+
+/obj/item/stack/tile/iron/vaporwave
+ name = "vaporwave floor tile"
+ singular_name = "vaporwave floor tile"
+ icon_state = "tile_vaporwave"
+ turf_type = /turf/open/floor/iron/vaporwave
+ merge_type = /obj/item/stack/tile/iron/vaporwave
+ tile_reskin_types = null
diff --git a/code/game/objects/items/stacks/tiles/tile_mineral.dm b/code/game/objects/items/stacks/tiles/tile_mineral.dm
index 0a51c7ebd35..93b9d9eb4a1 100644
--- a/code/game/objects/items/stacks/tiles/tile_mineral.dm
+++ b/code/game/objects/items/stacks/tiles/tile_mineral.dm
@@ -1,3 +1,29 @@
+/obj/item/stack/tile/mineral
+ /// Determines what stack is gotten out of us when welded.
+ var/mineralType = null
+
+/obj/item/stack/tile/mineral/attackby(obj/item/W, mob/user, params)
+ if(W.tool_behaviour == TOOL_WELDER)
+ if(get_amount() < 4)
+ to_chat(user, "You need at least four tiles to do this!")
+ return
+ if(!mineralType)
+ to_chat(user, "You can not reform this!")
+ stack_trace("A mineral tile of type [type] doesn't have its' mineralType set.")
+ return
+ if(W.use_tool(src, user, 0, volume=40))
+ var/sheet_type = text2path("/obj/item/stack/sheet/mineral/[mineralType]")
+ var/obj/item/stack/sheet/mineral/new_item = new sheet_type(user.loc)
+ user.visible_message("[user] shaped [src] into [new_item] with [W].", \
+ "You shaped [src] into [new_item] with [W].", \
+ "You hear welding.")
+ var/holding = user.is_holding(src)
+ use(4)
+ if(holding && QDELETED(src))
+ user.put_in_hands(new_item)
+ else
+ return ..()
+
/obj/item/stack/tile/mineral/plasma
name = "plasma tile"
singular_name = "plasma floor tile"
@@ -6,9 +32,22 @@
inhand_icon_state = "tile-plasma"
turf_type = /turf/open/floor/mineral/plasma
mineralType = "plasma"
- mats_per_unit = list(/datum/material/plasma=500)
+ mats_per_unit = list(/datum/material/plasma=MINERAL_MATERIAL_AMOUNT*0.25)
merge_type = /obj/item/stack/tile/mineral/plasma
+/obj/item/stack/tile/mineral/plasma/attackby(obj/item/W, mob/user, params)
+ if(W.get_temperature() > 300)//If the temperature of the object is over 300, then ignite
+ var/turf/T = get_turf(src)
+ message_admins("Plasma tiles ignited by [ADMIN_LOOKUPFLW(user)] in [ADMIN_VERBOSEJMP(T)]")
+ log_game("Plasma tiles ignited by [key_name(user)] in [AREACOORD(T)]")
+ fire_act(W.get_temperature())
+ else
+ return ..()
+
+/obj/item/stack/tile/mineral/plasma/fire_act(exposed_temperature, exposed_volume)
+ atmos_spawn_air("plasma=[amount*2.5];TEMP=[exposed_temperature]")
+ qdel(src)
+
/obj/item/stack/tile/mineral/uranium
name = "uranium tile"
singular_name = "uranium floor tile"
@@ -17,7 +56,7 @@
inhand_icon_state = "tile-uranium"
turf_type = /turf/open/floor/mineral/uranium
mineralType = "uranium"
- mats_per_unit = list(/datum/material/uranium=500)
+ mats_per_unit = list(/datum/material/uranium=MINERAL_MATERIAL_AMOUNT*0.25)
merge_type = /obj/item/stack/tile/mineral/uranium
/obj/item/stack/tile/mineral/gold
@@ -28,7 +67,7 @@
inhand_icon_state = "tile-gold"
turf_type = /turf/open/floor/mineral/gold
mineralType = "gold"
- mats_per_unit = list(/datum/material/gold=500)
+ mats_per_unit = list(/datum/material/gold=MINERAL_MATERIAL_AMOUNT*0.25)
merge_type = /obj/item/stack/tile/mineral/gold
/obj/item/stack/tile/mineral/silver
@@ -39,7 +78,7 @@
inhand_icon_state = "tile-silver"
turf_type = /turf/open/floor/mineral/silver
mineralType = "silver"
- mats_per_unit = list(/datum/material/silver=500)
+ mats_per_unit = list(/datum/material/silver=MINERAL_MATERIAL_AMOUNT*0.25)
merge_type = /obj/item/stack/tile/mineral/silver
/obj/item/stack/tile/mineral/diamond
@@ -50,7 +89,7 @@
inhand_icon_state = "tile-diamond"
turf_type = /turf/open/floor/mineral/diamond
mineralType = "diamond"
- mats_per_unit = list(/datum/material/diamond=500)
+ mats_per_unit = list(/datum/material/diamond=MINERAL_MATERIAL_AMOUNT*0.25)
merge_type = /obj/item/stack/tile/mineral/diamond
/obj/item/stack/tile/mineral/bananium
@@ -61,7 +100,7 @@
inhand_icon_state = "tile-bananium"
turf_type = /turf/open/floor/mineral/bananium
mineralType = "bananium"
- mats_per_unit = list(/datum/material/bananium=500)
+ mats_per_unit = list(/datum/material/bananium=MINERAL_MATERIAL_AMOUNT*0.25)
merge_type = /obj/item/stack/tile/mineral/bananium
/obj/item/stack/tile/mineral/abductor
@@ -79,12 +118,12 @@
/obj/item/stack/tile/mineral/titanium
name = "titanium tile"
singular_name = "titanium floor tile"
- desc = "Sleek titanium tiles, used for shuttles. Use while in your hand to change what type of titanium tiles you want."
- icon_state = "tile_shuttle"
+ desc = "Sleek titanium tiles, used for shuttles."
+ icon_state = "tile_titanium"
inhand_icon_state = "tile-shuttle"
turf_type = /turf/open/floor/mineral/titanium
mineralType = "titanium"
- mats_per_unit = list(/datum/material/titanium=500)
+ mats_per_unit = list(/datum/material/titanium=MINERAL_MATERIAL_AMOUNT*0.25)
merge_type = /obj/item/stack/tile/mineral/titanium
tile_reskin_types = list(
/obj/item/stack/tile/mineral/titanium,
@@ -102,7 +141,7 @@
/obj/item/stack/tile/mineral/titanium/yellow
name = "yellow titanium tile"
singular_name = "yellow titanium floor tile"
- desc = "Sleek yellow titanium tiles. Use while in your hand to change what type of titanium tiles you want."
+ desc = "Sleek yellow titanium tiles, used for shuttles."
turf_type = /turf/open/floor/mineral/titanium/yellow
icon_state = "tile_titanium_yellow"
merge_type = /obj/item/stack/tile/mineral/titanium/yellow
@@ -110,7 +149,7 @@
/obj/item/stack/tile/mineral/titanium/blue
name = "blue titanium tile"
singular_name = "blue titanium floor tile"
- desc = "Sleek blue titanium tiles. Use while in your hand to change what type of titanium tiles you want."
+ desc = "Sleek blue titanium tiles, used for shuttles."
turf_type = /turf/open/floor/mineral/titanium/blue
icon_state = "tile_titanium_blue"
merge_type = /obj/item/stack/tile/mineral/titanium/blue
@@ -118,7 +157,7 @@
/obj/item/stack/tile/mineral/titanium/white
name = "white titanium tile"
singular_name = "white titanium floor tile"
- desc = "Sleek white titanium tiles. Use while in your hand to change what type of titanium tiles you want."
+ desc = "Sleek white titanium tiles, used for shuttles."
turf_type = /turf/open/floor/mineral/titanium/white
icon_state = "tile_titanium_white"
merge_type = /obj/item/stack/tile/mineral/titanium/white
@@ -126,7 +165,7 @@
/obj/item/stack/tile/mineral/titanium/purple
name = "purple titanium tile"
singular_name = "purple titanium floor tile"
- desc = "Sleek purple titanium tiles. Use while in your hand to change what type of titanium tiles you want."
+ desc = "Sleek purple titanium tiles, used for shuttles."
turf_type = /turf/open/floor/mineral/titanium/purple
icon_state = "tile_titanium_purple"
merge_type = /obj/item/stack/tile/mineral/titanium/purple
@@ -134,7 +173,7 @@
/obj/item/stack/tile/mineral/titanium/tiled
name = "tiled titanium tile"
singular_name = "tiled titanium floor tile"
- desc = "Titanium floor tiles. Use while in your hand to change what type of titanium tiles you want."
+ desc = "Titanium floor tiles, used for shuttles."
turf_type = /turf/open/floor/mineral/titanium/tiled
icon_state = "tile_titanium_tiled"
merge_type = /obj/item/stack/tile/mineral/titanium/tiled
@@ -142,7 +181,7 @@
/obj/item/stack/tile/mineral/titanium/tiled/yellow
name = "yellow titanium tile"
singular_name = "yellow titanium floor tile"
- desc = "Yellow titanium floor tiles. Use while in your hand to change what type of titanium tiles you want."
+ desc = "Yellow titanium floor tiles, used for shuttles."
turf_type = /turf/open/floor/mineral/titanium/tiled/yellow
icon_state = "tile_titanium_tiled_yellow"
merge_type = /obj/item/stack/tile/mineral/titanium/tiled/yellow
@@ -150,7 +189,7 @@
/obj/item/stack/tile/mineral/titanium/tiled/blue
name = "blue titanium tile"
singular_name = "blue titanium floor tile"
- desc = "Blue titanium floor tiles. Use while in your hand to change what type of titanium tiles you want."
+ desc = "Blue titanium floor tiles, used for shuttles."
turf_type = /turf/open/floor/mineral/titanium/tiled/blue
icon_state = "tile_titanium_tiled_blue"
merge_type = /obj/item/stack/tile/mineral/titanium/tiled/blue
@@ -158,7 +197,7 @@
/obj/item/stack/tile/mineral/titanium/tiled/white
name = "white titanium tile"
singular_name = "white titanium floor tile"
- desc = "White titanium floor tiles. Use while in your hand to change what type of titanium tiles you want."
+ desc = "White titanium floor tiles, used for shuttles."
turf_type = /turf/open/floor/mineral/titanium/tiled/white
icon_state = "tile_titanium_tiled_white"
merge_type = /obj/item/stack/tile/mineral/titanium/tiled/white
@@ -166,7 +205,7 @@
/obj/item/stack/tile/mineral/titanium/tiled/purple
name = "purple titanium tile"
singular_name = "purple titanium floor tile"
- desc = "Purple titanium floor tiles. Use while in your hand to change what type of titanium tiles you want."
+ desc = "Purple titanium floor tiles, used for shuttles."
turf_type = /turf/open/floor/mineral/titanium/tiled/purple
icon_state = "tile_titanium_tiled_purple"
merge_type = /obj/item/stack/tile/mineral/titanium/tiled/purple
@@ -175,13 +214,24 @@
name = "plastitanium tile"
singular_name = "plastitanium floor tile"
desc = "A tile made of plastitanium, used for very evil shuttles."
- icon_state = "tile_darkshuttle"
+ icon_state = "tile_plastitanium"
inhand_icon_state = "tile-darkshuttle"
turf_type = /turf/open/floor/mineral/plastitanium
mineralType = "plastitanium"
mats_per_unit = list(/datum/material/alloy/plastitanium=MINERAL_MATERIAL_AMOUNT*0.25)
- material_flags = MATERIAL_NO_EFFECTS
merge_type = /obj/item/stack/tile/mineral/plastitanium
+ tile_reskin_types = list(
+ /obj/item/stack/tile/mineral/plastitanium,
+ /obj/item/stack/tile/mineral/plastitanium/red,
+ )
+
+/obj/item/stack/tile/mineral/plastitanium/red
+ name = "red plastitanium tile"
+ singular_name = "red plastitanium floor tile"
+ desc = "A tile made of plastitanium, used for very red shuttles."
+ turf_type = /turf/open/floor/mineral/plastitanium/red
+ icon_state = "tile_plastitanium_red"
+ merge_type = /obj/item/stack/tile/mineral/plastitanium/red
/obj/item/stack/tile/mineral/snow
name = "snow tile"
diff --git a/code/game/objects/items/stacks/tiles/tile_reskinning.dm b/code/game/objects/items/stacks/tiles/tile_reskinning.dm
index 47270a2a637..a6d2286dcbb 100644
--- a/code/game/objects/items/stacks/tiles/tile_reskinning.dm
+++ b/code/game/objects/items/stacks/tiles/tile_reskinning.dm
@@ -10,6 +10,8 @@
GLOBAL_LIST_EMPTY(tile_reskin_lists)
+GLOBAL_LIST_EMPTY(tile_dir_lists)
+
/**
* Caches associative lists with type path index keys and images of said type's initial icon state (typepath -> image).
*/
@@ -23,10 +25,35 @@ GLOBAL_LIST_EMPTY(tile_reskin_lists)
values[path] = image(icon = initial(type_cast_path.icon), icon_state = initial(type_cast_path.icon_state))
return GLOB.tile_reskin_lists[string_id] = values
+/obj/item/stack/tile/proc/tile_dir_list(list/values, atom/type_cast_path)
+ . = GLOB.tile_dir_lists[type]
+ if(.)
+ return
+ for(var/set_dir in values)
+ var/image/turf_image = image(icon = initial(type_cast_path.icon), icon_state = initial(type_cast_path.icon_state), dir = text2dir(set_dir))
+ turf_image.transform = turf_image.transform.Scale(0.5, 0.5)
+ values[set_dir] = turf_image
+ return GLOB.tile_dir_lists[type] = values
/obj/item/stack/tile/attack_self(mob/user)
- if(!tile_reskin_types)
- return ..()
+ var/list/radial_options = list()
+ if(tile_reskin_types && tile_rotate_dirs)
+ radial_options["Reskin"] = image(icon = 'icons/hud/radial.dmi', icon_state = "radial_reskin")
+ radial_options["Rotate"] = image(icon = 'icons/hud/radial.dmi', icon_state = "radial_rotate")
+ var/radial_result = show_radial_menu(user, src, radial_options, require_near = TRUE, tooltips = TRUE)
+ switch(radial_result)
+ if("Reskin")
+ return tile_reskin(user)
+ if("Rotate")
+ return tile_rotate(user)
+ return
+ if(tile_reskin_types)
+ return tile_reskin(user)
+ if(tile_rotate_dirs)
+ return tile_rotate(user)
+ return ..()
+
+/obj/item/stack/tile/proc/tile_reskin(mob/user)
var/obj/item/stack/tile/choice = show_radial_menu(user, src, tile_reskin_types, radius = 48, require_near = TRUE)
if(!choice || choice == type)
return
@@ -35,3 +62,9 @@ GLOBAL_LIST_EMPTY(tile_reskin_lists)
if(!QDELETED(choice)) // Tile could have merged with stuff on the ground. The user will have to pick it up if so.
user.put_in_active_hand(choice)
qdel(src)
+
+/obj/item/stack/tile/proc/tile_rotate(mob/user)
+ var/choice = show_radial_menu(user, src, tile_rotate_dirs, radius = 56, require_near = TRUE)
+ if(!choice)
+ return
+ turf_dir = text2dir(choice)
diff --git a/code/game/objects/items/stacks/tiles/tile_types.dm b/code/game/objects/items/stacks/tiles/tile_types.dm
index 1aadeb59f7c..a68cd31ab5f 100644
--- a/code/game/objects/items/stacks/tiles/tile_types.dm
+++ b/code/game/objects/items/stacks/tiles/tile_types.dm
@@ -14,11 +14,12 @@
novariants = TRUE
/// What type of turf does this tile produce.
var/turf_type = null
- /// Determines certain welder interactions.
- var/mineralType = null
+ /// What dir will the turf have?
+ var/turf_dir = SOUTH
/// Cached associative lazy list to hold the radial options for tile reskinning. See tile_reskinning.dm for more information. Pattern: list[type] -> image
var/list/tile_reskin_types
-
+ /// Cached associative lazy list to hold the radial options for tile dirs. See tile_reskinning.dm for more information.
+ var/list/tile_rotate_dirs
/obj/item/stack/tile/Initialize(mapload, new_amount, merge = TRUE, list/mat_override=null, mat_amt=1)
. = ..()
@@ -26,10 +27,17 @@
pixel_y = rand(-3, 3) //randomize a little
if(tile_reskin_types)
tile_reskin_types = tile_reskin_list(tile_reskin_types)
+ if(tile_rotate_dirs)
+ var/list/values = list()
+ for(var/set_dir in tile_rotate_dirs)
+ values += dir2text(set_dir)
+ tile_rotate_dirs = tile_dir_list(values, turf_type)
/obj/item/stack/tile/examine(mob/user)
. = ..()
+ if(tile_reskin_types || tile_rotate_dirs)
+ . += "Use while in your hand to change what type of [src] you want."
if(throwforce && !is_cyborg) //do not want to divide by zero or show the message to borgs who can't throw
var/verb
switch(CEILING(MAX_LIVING_HEALTH / throwforce, 1)) //throws to crit a human
@@ -48,56 +56,12 @@
. += "Those could work as a [verb] throwing weapon."
-/obj/item/stack/tile/attackby(obj/item/W, mob/user, params)
-
- if (W.tool_behaviour == TOOL_WELDER)
- if(get_amount() < 4)
- to_chat(user, "You need at least four tiles to do this!")
- return
-
- if(!mineralType)
- to_chat(user, "You can not reform this!")
- return
-
- if(W.use_tool(src, user, 0, volume=40))
- if(mineralType == "plasma")
- atmos_spawn_air("plasma=5;TEMP=1000")
- user.visible_message("[user.name] sets the plasma tiles on fire!", \
- "You set the plasma tiles on fire!")
- qdel(src)
- return
-
- if (mineralType == "iron")
- var/obj/item/stack/sheet/iron/new_item = new(user.loc)
- user.visible_message("[user.name] shaped [src] into iron with the welding tool.", \
- "You shaped [src] into iron with the welding tool.", \
- "You hear welding.")
- var/obj/item/stack/rods/R = src
- src = null
- var/replace = (user.get_inactive_held_item()==R)
- R.use(4)
- if (!R && replace)
- user.put_in_hands(new_item)
-
- else
- var/sheet_type = text2path("/obj/item/stack/sheet/mineral/[mineralType]")
- var/obj/item/stack/sheet/mineral/new_item = new sheet_type(user.loc)
- user.visible_message("[user.name] shaped [src] into a sheet with the welding tool.", \
- "You shaped [src] into a sheet with the welding tool.", \
- "You hear welding.")
- var/obj/item/stack/rods/R = src
- src = null
- var/replace = (user.get_inactive_held_item()==R)
- R.use(4)
- if (!R && replace)
- user.put_in_hands(new_item)
- else
- return ..()
-
/obj/item/stack/tile/proc/place_tile(turf/open/T)
if(!turf_type || !use(1))
return
- . = T.PlaceOnTop(turf_type, flags = CHANGETURF_INHERIT_AIR)
+ var/turf/placed_turf = T.PlaceOnTop(turf_type, flags = CHANGETURF_INHERIT_AIR)
+ placed_turf.setDir(turf_dir)
+ return placed_turf
//Grass
/obj/item/stack/tile/grass
@@ -180,6 +144,28 @@
resistance_flags = FLAMMABLE
tableVariant = /obj/structure/table/wood/fancy
merge_type = /obj/item/stack/tile/carpet
+ tile_reskin_types = list(
+ /obj/item/stack/tile/carpet,
+ /obj/item/stack/tile/carpet/symbol,
+ /obj/item/stack/tile/carpet/star,
+ )
+
+/obj/item/stack/tile/carpet/symbol
+ name = "symbol carpet"
+ singular_name = "symbol carpet tile"
+ icon_state = "tile-carpet-symbol"
+ desc = "A piece of carpet. This one has a symbol on it."
+ turf_type = /turf/open/floor/carpet/lone
+ merge_type = /obj/item/stack/tile/carpet/symbol
+ tile_rotate_dirs = list(SOUTH, NORTH, EAST, WEST, SOUTHEAST)
+
+/obj/item/stack/tile/carpet/star
+ name = "star carpet"
+ singular_name = "star carpet tile"
+ icon_state = "tile-carpet-star"
+ desc = "A piece of carpet. This one has a star on it."
+ turf_type = /turf/open/floor/carpet/lone/star
+ merge_type = /obj/item/stack/tile/carpet/star
/obj/item/stack/tile/carpet/black
name = "black carpet"
@@ -397,6 +383,11 @@
inhand_icon_state = "tile-pod"
turf_type = /turf/open/floor/pod
merge_type = /obj/item/stack/tile/pod
+ tile_reskin_types = list(
+ /obj/item/stack/tile/pod,
+ /obj/item/stack/tile/pod/light,
+ /obj/item/stack/tile/pod/dark,
+ )
/obj/item/stack/tile/pod/light
name = "light pod floor tile"
@@ -414,27 +405,6 @@
turf_type = /turf/open/floor/pod/dark
merge_type = /obj/item/stack/tile/pod/dark
-//Plasteel (normal)
-/obj/item/stack/tile/iron//SKYRAT EDIT - ICON OVERRIDEN BY AESTHETICS - SEE MODULE
- name = "floor tile"
- singular_name = "floor tile"
- desc = "The ground you walk on."
- icon_state = "tile"
- inhand_icon_state = "tile"
- force = 6
- mats_per_unit = list(/datum/material/iron=500)
- //throwforce = 10 //ORIGINAL
- throwforce = 6 //SKYRAT EDIT CHANGE
- flags_1 = CONDUCT_1
- turf_type = /turf/open/floor/iron
- mineralType = "iron"
- armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 100, ACID = 70)
- resistance_flags = FIRE_PROOF
- matter_amount = 1
- cost = 125
- source = /datum/robot_energy_storage/iron
- merge_type = /obj/item/stack/tile/iron
-
/obj/item/stack/tile/plastic
name = "plastic tile"
singular_name = "plastic floor tile"
@@ -491,3 +461,31 @@
turf_type = /turf/open/floor/bronze
mats_per_unit = list(/datum/material/bronze=500)
merge_type = /obj/item/stack/tile/bronze
+ tile_reskin_types = list(
+ /obj/item/stack/tile/bronze,
+ /obj/item/stack/tile/bronze/flat,
+ /obj/item/stack/tile/bronze/filled,
+ )
+
+/obj/item/stack/tile/bronze/flat
+ name = "flat bronze tile"
+ singular_name = "flat bronze floor tile"
+ icon_state = "tile_reebe"
+ turf_type = /turf/open/floor/bronze/flat
+ merge_type = /obj/item/stack/tile/bronze/flat
+
+/obj/item/stack/tile/bronze/filled
+ name = "filled bronze tile"
+ singular_name = "filled bronze floor tile"
+ icon_state = "tile_brass_filled"
+ turf_type = /turf/open/floor/bronze/filled
+ merge_type = /obj/item/stack/tile/bronze/filled
+
+/obj/item/stack/tile/cult
+ name = "engraved tile"
+ singular_name = "engraved floor tile"
+ desc = "A strange tile made from runed metal. Doesn't seem to actually have any paranormal powers."
+ icon_state = "tile_cult"
+ turf_type = /turf/open/floor/cult
+ mats_per_unit = list(/datum/material/runedmetal=500)
+ merge_type = /obj/item/stack/tile/cult
diff --git a/code/game/objects/items/storage/backpack.dm b/code/game/objects/items/storage/backpack.dm
index 7996ddbe3ef..18845017510 100644
--- a/code/game/objects/items/storage/backpack.dm
+++ b/code/game/objects/items/storage/backpack.dm
@@ -340,7 +340,7 @@
//SKYRAT EDIT CHANGE END
/obj/item/storage/backpack/satchel/flat/with_tools/PopulateContents()
- new /obj/item/stack/tile/iron(src)
+ new /obj/item/stack/tile/iron/base(src)
new /obj/item/crowbar(src)
// ..() SKYRAT EDIT REMOVAL
diff --git a/code/game/turfs/closed/wall/misc_walls.dm b/code/game/turfs/closed/wall/misc_walls.dm
index 84e89b70296..09caec2d3e5 100644
--- a/code/game/turfs/closed/wall/misc_walls.dm
+++ b/code/game/turfs/closed/wall/misc_walls.dm
@@ -39,10 +39,29 @@
new /obj/effect/temp_visual/cult/turf(get_turf(src))
/turf/closed/wall/vault
+ name = "strange wall"
icon = 'icons/turf/walls.dmi'
icon_state = "rockvault"
+ base_icon_state = "rockvault"
+ smoothing_flags = NONE
+ canSmoothWith = null
+ smoothing_groups = null
rcd_memory = null
+/turf/closed/wall/vault/rock
+ name = "rocky wall"
+ desc = "You feel a strange nostalgia from looking at this..."
+
+/turf/closed/wall/vault/alien
+ name = "alien wall"
+ icon_state = "alienvault"
+ base_icon_state = "alienvault"
+
+/turf/closed/wall/vault/sandstone
+ name = "sandstone wall"
+ icon_state = "sandstonevault"
+ base_icon_state = "sandstonevault"
+
/turf/closed/wall/ice
icon = 'icons/turf/walls/icedmetal_wall.dmi'
icon_state = "icedmetal_wall-0"
diff --git a/code/game/turfs/open/floor.dm b/code/game/turfs/open/floor.dm
index b6a3836f477..df05ae735f1 100644
--- a/code/game/turfs/open/floor.dm
+++ b/code/game/turfs/open/floor.dm
@@ -179,7 +179,7 @@
return TRUE
/turf/open/floor/proc/try_replace_tile(obj/item/stack/tile/T, mob/user, params)
- if(T.turf_type == type)
+ if(T.turf_type == type && T.turf_dir == dir)
return
var/obj/item/crowbar/CB = user.is_holding_item_of_type(/obj/item/crowbar)
if(!CB)
diff --git a/code/game/turfs/open/floor/fancy_floor.dm b/code/game/turfs/open/floor/fancy_floor.dm
index 642d73bbd9d..0a517aed566 100644
--- a/code/game/turfs/open/floor/fancy_floor.dm
+++ b/code/game/turfs/open/floor/fancy_floor.dm
@@ -249,9 +249,11 @@
/turf/open/floor/carpet/lone
icon_state = "carpetsymbol"
smoothing_flags = NONE
+ floor_tile = /obj/item/stack/tile/carpet/symbol
/turf/open/floor/carpet/lone/star
icon_state = "carpetstar"
+ floor_tile = /obj/item/stack/tile/carpet/star
/turf/open/floor/carpet/black
icon = 'icons/turf/floors/carpet_black.dmi'
diff --git a/code/game/turfs/open/floor/iron_floor.dm b/code/game/turfs/open/floor/iron_floor.dm
index bf5a52073df..6d6b369cad8 100644
--- a/code/game/turfs/open/floor/iron_floor.dm
+++ b/code/game/turfs/open/floor/iron_floor.dm
@@ -1,6 +1,6 @@
/turf/open/floor/iron
icon_state = "floor"
- floor_tile = /obj/item/stack/tile/iron
+ floor_tile = /obj/item/stack/tile/iron/base
/turf/open/floor/iron/setup_broken_states()
return list("damaged1", "damaged2", "damaged3", "damaged4", "damaged5")
@@ -39,6 +39,22 @@
/turf/open/floor/iron/dark
icon_state = "darkfull"
base_icon_state = "darkfull"
+ floor_tile = /obj/item/stack/tile/iron/dark
+
+/turf/open/floor/iron/dark/side
+ icon_state = "dark"
+ base_icon_state = "dark"
+ floor_tile = /obj/item/stack/tile/iron/dark_side
+
+/turf/open/floor/iron/dark/corner
+ icon_state = "darkcorner"
+ base_icon_state = "darkcorner"
+ floor_tile = /obj/item/stack/tile/iron/dark_corner
+
+/turf/open/floor/iron/checker
+ icon_state = "checker"
+ base_icon_state = "checker"
+ floor_tile = /obj/item/stack/tile/iron/checker
/turf/open/floor/iron/dark/airless
initial_gas_mix = AIRLESS_ATMOS
@@ -46,67 +62,54 @@
/turf/open/floor/iron/dark/telecomms
initial_gas_mix = TCOMMS_ATMOS
-/turf/open/floor/iron/airless/dark
- icon_state = "darkfull"
- base_icon_state = "darkfull"
+/turf/open/floor/iron/dark/side/airless
+ initial_gas_mix = AIRLESS_ATMOS
-/turf/open/floor/iron/dark/side
- icon_state = "dark"
- base_icon_state = "dark"
-
-/turf/open/floor/iron/dark/corner
- icon_state = "darkcorner"
- base_icon_state = "darkcorner"
-
-/turf/open/floor/iron/checker
- icon_state = "checker"
- base_icon_state = "checker"
+/turf/open/floor/iron/dark/corner/airless
+ initial_gas_mix = AIRLESS_ATMOS
+/turf/open/floor/iron/checker/airless
+ initial_gas_mix = AIRLESS_ATMOS
/turf/open/floor/iron/white
icon_state = "white"
base_icon_state = "white"
+ floor_tile = /obj/item/stack/tile/iron/white
/turf/open/floor/iron/white/side
icon_state = "whitehall"
base_icon_state = "whitehall"
+ floor_tile = /obj/item/stack/tile/iron/white_side
/turf/open/floor/iron/white/corner
icon_state = "whitecorner"
base_icon_state = "whitecorner"
+ floor_tile = /obj/item/stack/tile/iron/white_corner
-/turf/open/floor/iron/airless/white
- icon_state = "white"
- base_icon_state = "white"
+/turf/open/floor/iron/cafeteria
+ icon_state = "cafeteria"
+ base_icon_state = "cafeteria"
+ floor_tile = /obj/item/stack/tile/iron/cafeteria
-/turf/open/floor/iron/airless/white/side
- icon_state = "whitehall"
- base_icon_state = "whitehall"
-
-/turf/open/floor/iron/airless/white/corner
- icon_state = "whitecorner"
- base_icon_state = "whitecorner"
+/turf/open/floor/iron/white/airless
+ initial_gas_mix = AIRLESS_ATMOS
/turf/open/floor/iron/white/telecomms
initial_gas_mix = TCOMMS_ATMOS
-/turf/open/floor/iron/airless/showroomfloor
- icon_state = "showroomfloor"
- base_icon_state = "showroomfloor"
+/turf/open/floor/iron/white/side/airless
+ initial_gas_mix = AIRLESS_ATMOS
+/turf/open/floor/iron/white/corner/airless
+ initial_gas_mix = AIRLESS_ATMOS
-/turf/open/floor/iron/yellowsiding
- icon_state = "yellowsiding"
- base_icon_state = "yellowsiding"
-
-/turf/open/floor/iron/yellowsiding/corner
- icon_state = "yellowcornersiding"
- base_icon_state = "yellowcornersiding"
-
+/turf/open/floor/iron/cafeteria/airless
+ initial_gas_mix = AIRLESS_ATMOS
/turf/open/floor/iron/recharge_floor
icon_state = "recharge_floor"
base_icon_state = "recharge_floor"
+ floor_tile = /obj/item/stack/tile/iron/recharge_floor
/turf/open/floor/iron/recharge_floor/asteroid
icon_state = "recharge_floor_asteroid"
@@ -116,63 +119,55 @@
/turf/open/floor/iron/chapel
icon_state = "chapel"
base_icon_state = "chapel"
+ floor_tile = /obj/item/stack/tile/iron/chapel
/turf/open/floor/iron/showroomfloor
icon_state = "showroomfloor"
base_icon_state = "showroomfloor"
+ floor_tile = /obj/item/stack/tile/iron/showroomfloor
+/turf/open/floor/iron/showroomfloor/airless
+ initial_gas_mix = AIRLESS_ATMOS
/turf/open/floor/iron/solarpanel
icon_state = "solarpanel"
base_icon_state = "solarpanel"
+ floor_tile = /obj/item/stack/tile/iron/solarpanel
-/turf/open/floor/iron/airless/solarpanel
- icon_state = "solarpanel"
- base_icon_state = "solarpanel"
+/turf/open/floor/iron/solarpanel/airless
+ initial_gas_mix = AIRLESS_ATMOS
/turf/open/floor/iron/freezer
icon_state = "freezerfloor"
base_icon_state = "freezerfloor"
+ floor_tile = /obj/item/stack/tile/iron/freezer
/turf/open/floor/iron/freezer/airless
initial_gas_mix = AIRLESS_ATMOS
-
/turf/open/floor/iron/kitchen_coldroom
name = "cold room floor"
-/turf/open/floor/iron/kitchen_coldroom/Initialize()
+/turf/open/floor/iron/kitchen_coldroom/Initialize(mapload)
initial_gas_mix = KITCHEN_COLDROOM_ATMOS
- . = ..()
+ return ..()
/turf/open/floor/iron/kitchen_coldroom/freezerfloor
icon_state = "freezerfloor"
base_icon_state = "freezerfloor"
-
+ floor_tile = /obj/item/stack/tile/iron/freezer
/turf/open/floor/iron/grimy
icon_state = "grimy"
base_icon_state = "grimy"
tiled_dirt = FALSE
-
-/turf/open/floor/iron/cafeteria
- icon_state = "cafeteria"
- base_icon_state = "cafeteria"
-
-/turf/open/floor/iron/airless/cafeteria
- icon_state = "cafeteria"
- base_icon_state = "cafeteria"
-
-
-/turf/open/floor/iron/cult
- name = "engraved floor"
- icon_state = "cult"
- base_icon_state = "cult"
+ floor_tile = /obj/item/stack/tile/iron/grimy
/turf/open/floor/iron/vaporwave
icon_state = "pinkblack"
base_icon_state = "pinkblack"
+ floor_tile = /obj/item/stack/tile/iron/vaporwave
/turf/open/floor/iron/goonplaque
name = "commemorative plaque"
@@ -180,13 +175,7 @@
icon_state = "plaque"
base_icon_state = "plaque"
tiled_dirt = FALSE
-
-/turf/open/floor/iron/cult/narsie_act()
- return
-
-/turf/open/floor/iron/cult/airless
- initial_gas_mix = AIRLESS_ATMOS
-
+ floor_tile = /obj/item/stack/tile/iron/goonplaque
/turf/open/floor/iron/stairs
icon_state = "stairs"
@@ -209,28 +198,27 @@
icon_state = "stairs-old"
base_icon_state = "stairs-old"
-
-/turf/open/floor/iron/rockvault
- icon_state = "rockvault"
- base_icon_state = "rockvault"
-
-/turf/open/floor/iron/rockvault/alien
- icon_state = "alienvault"
- base_icon_state = "alienvault"
-
-/turf/open/floor/iron/rockvault/sandstone
- icon_state = "sandstonevault"
- base_icon_state = "sandstonevault"
-
-
-/turf/open/floor/iron/elevatorshaft
- icon_state = "elevatorshaft"
- base_icon_state = "elevatorshaft"
-
/turf/open/floor/iron/bluespace
icon_state = "bluespace"
base_icon_state = "bluespace"
+ desc = "Sadly, these don't seem to make you faster..."
+ floor_tile = /obj/item/stack/tile/iron/bluespace
+
+/turf/open/floor/iron/monotile
+ icon_state = "monotile"
+ base_icon_state = "monotile"
+ floor_tile = /obj/item/stack/tile/iron/monotile
/turf/open/floor/iron/sepia
icon_state = "sepia"
base_icon_state = "sepia"
+ desc = "Well, the flow of time is normal on these tiles, weird."
+ floor_tile = /obj/item/stack/tile/iron/sepia
+
+/turf/open/floor/iron/yellowsiding
+ icon_state = "yellowsiding"
+ base_icon_state = "yellowsiding"
+
+/turf/open/floor/iron/yellowsiding/corner
+ icon_state = "yellowcornersiding"
+ base_icon_state = "yellowcornersiding"
diff --git a/code/game/turfs/open/floor/mineral_floor.dm b/code/game/turfs/open/floor/mineral_floor.dm
index 5e0f2d96afc..f821b97d07b 100644
--- a/code/game/turfs/open/floor/mineral_floor.dm
+++ b/code/game/turfs/open/floor/mineral_floor.dm
@@ -184,6 +184,7 @@
/turf/open/floor/mineral/plastitanium/red
icon_state = "plastitanium_red"
+ floor_tile = /obj/item/stack/tile/mineral/plastitanium/red
/turf/open/floor/mineral/plastitanium/red/airless
initial_gas_mix = AIRLESS_ATMOS
diff --git a/code/game/turfs/open/floor/misc_floor.dm b/code/game/turfs/open/floor/misc_floor.dm
index fd9575728e8..31c85564516 100644
--- a/code/game/turfs/open/floor/misc_floor.dm
+++ b/code/game/turfs/open/floor/misc_floor.dm
@@ -1,14 +1,3 @@
-/turf/open/floor/goonplaque
- name = "commemorative plaque"
- icon_state = "plaque"
- desc = "\"This is a plaque in honour of our comrades on the G4407 Stations. Hopefully TG4407 model can live up to your fame and fortune.\" Scratched in beneath that is a crude image of a meteor and a spaceman. The spaceman is laughing. The meteor is exploding."
- floor_tile = /obj/item/stack/tile/iron
- tiled_dirt = FALSE
-
-/turf/open/floor/vault
- icon_state = "rockvault"
- floor_tile = /obj/item/stack/tile/iron
-
//Circuit flooring, glows a little
/turf/open/floor/circuit
icon = 'icons/turf/floors.dmi'
@@ -133,7 +122,7 @@
/turf/open/floor/oldshuttle
icon = 'icons/turf/shuttleold.dmi'
icon_state = "floor"
- floor_tile = /obj/item/stack/tile/iron
+ floor_tile = /obj/item/stack/tile/iron/base
/turf/open/floor/bluespace
slowdown = -1
@@ -152,15 +141,22 @@
/turf/open/floor/bronze
name = "bronze floor"
desc = "Some heavy bronze tiles."
- icon = 'icons/obj/clockwork_objects.dmi'
icon_state = "clockwork_floor"
floor_tile = /obj/item/stack/tile/bronze
-/turf/open/floor/bronze/lavaland
+/turf/open/floor/bronze/flat
+ icon_state = "reebe"
+ floor_tile = /obj/item/stack/tile/bronze/flat
+
+/turf/open/floor/bronze/filled
+ icon = 'icons/obj/clockwork_objects.dmi'
+ floor_tile = /obj/item/stack/tile/bronze/filled
+
+/turf/open/floor/bronze/filled/lavaland
planetary_atmos = TRUE
initial_gas_mix = LAVALAND_DEFAULT_ATMOS
-/turf/open/floor/bronze/icemoon
+/turf/open/floor/bronze/filled/icemoon
planetary_atmos = TRUE
initial_gas_mix = ICEMOON_DEFAULT_ATMOS
@@ -223,3 +219,37 @@
out of. It only makes sense in the context of space because you're trying to keep a freezing vacuum out. Is anyone following me on this? \
The idea of a \"rudimentary\" iron wall makes no sense at all! Is anything i'm even saying here true? Someone's gotta fact check this!"
icon_state = "stone_floor"
+
+/turf/open/floor/vault
+ name = "strange floor"
+ desc = "You feel a strange nostalgia from looking at this..."
+ icon_state = "rockvault"
+ base_icon_state = "rockvault"
+
+/turf/open/floor/vault/rock
+ name = "rocky floor"
+
+/turf/open/floor/vault/alien
+ name = "alien floor"
+ icon_state = "alienvault"
+ base_icon_state = "alienvault"
+
+/turf/open/floor/vault/sandstone
+ name = "sandstone floor"
+ icon_state = "sandstonevault"
+ base_icon_state = "sandstonevault"
+
+/turf/open/floor/cult
+ name = "engraved floor"
+ icon_state = "cult"
+ base_icon_state = "cult"
+ floor_tile = /obj/item/stack/tile/cult
+
+/turf/open/floor/cult/setup_broken_states()
+ return list("cultdamage","cultdamage2","cultdamage3","cultdamage4","cultdamage5","cultdamage6","cultdamage7")
+
+/turf/open/floor/cult/narsie_act()
+ return
+
+/turf/open/floor/cult/airless
+ initial_gas_mix = AIRLESS_ATMOS
diff --git a/code/game/turfs/open/floor/plating/misc_plating.dm b/code/game/turfs/open/floor/plating/misc_plating.dm
index 445d1a3d079..f058166b7b4 100644
--- a/code/game/turfs/open/floor/plating/misc_plating.dm
+++ b/code/game/turfs/open/floor/plating/misc_plating.dm
@@ -344,3 +344,8 @@
planetary_atmos = TRUE
baseturfs = /turf/open/lava/smooth/lava_land_surface
initial_gas_mix = LAVALAND_DEFAULT_ATMOS
+
+/turf/open/floor/plating/elevatorshaft
+ name = "elevator shaft"
+ icon_state = "elevatorshaft"
+ base_icon_state = "elevatorshaft"
diff --git a/code/modules/clothing/outfits/standard.dm b/code/modules/clothing/outfits/standard.dm
index ea8004386c3..041d11defd9 100644
--- a/code/modules/clothing/outfits/standard.dm
+++ b/code/modules/clothing/outfits/standard.dm
@@ -73,7 +73,7 @@
suit = null
back = /obj/item/storage/backpack
backpack_contents = list(
- /obj/item/stack/tile/iron = 6,
+ /obj/item/stack/tile/iron/base = 6,
)
head = null
r_pocket = /obj/item/grenade/chem_grenade/cleaner
diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm
index 1c4c53c93ab..da2cb018a58 100644
--- a/code/modules/mob/living/silicon/robot/robot_modules.dm
+++ b/code/modules/mob/living/silicon/robot/robot_modules.dm
@@ -254,9 +254,14 @@
/obj/item/stack/sheet/glass,
/obj/item/stack/sheet/rglass/cyborg,
/obj/item/stack/rods/cyborg,
+<<<<<<< HEAD
/obj/item/stack/tile/iron,
/obj/item/stack/cable_coil,
/obj/item/lightreplacer/cyborg) // Skyrat Edit - Surprised Engie borgs don't get these
+=======
+ /obj/item/stack/tile/iron/base,
+ /obj/item/stack/cable_coil)
+>>>>>>> c0f9d2e7e84 ([READY] Tile Reskinning 2: Epic Winaloo (#58801))
radio_channels = list(RADIO_CHANNEL_ENGINEERING)
emag_modules = list(/obj/item/borg/stun)
cyborg_base_icon = "engineer"
@@ -271,7 +276,7 @@
/obj/item/assembly/flash/cyborg,
/obj/item/screwdriver/cyborg,
/obj/item/crowbar/cyborg,
- /obj/item/stack/tile/iron,
+ /obj/item/stack/tile/iron/base,
/obj/item/soap/nanotrasen,
/obj/item/storage/bag/trash/cyborg,
/obj/item/melee/flyswatter,
@@ -595,7 +600,7 @@
/obj/item/stack/sheet/glass,
/obj/item/stack/sheet/rglass/cyborg,
/obj/item/stack/rods/cyborg,
- /obj/item/stack/tile/iron,
+ /obj/item/stack/tile/iron/base,
/obj/item/dest_tagger/borg,
/obj/item/stack/cable_coil,
/obj/item/pinpointer/syndicate_cyborg,
diff --git a/code/modules/mob/living/simple_animal/bot/floorbot.dm b/code/modules/mob/living/simple_animal/bot/floorbot.dm
index 0e3ef0b4740..73af637ffd7 100644
--- a/code/modules/mob/living/simple_animal/bot/floorbot.dm
+++ b/code/modules/mob/living/simple_animal/bot/floorbot.dm
@@ -411,7 +411,7 @@
if(prob(50))
drop_part(robot_arm, Tsec)
- new /obj/item/stack/tile/iron(Tsec, 1)
+ new /obj/item/stack/tile/iron/base(Tsec, 1)
do_sparks(3, TRUE, src)
..()
diff --git a/code/modules/procedural_mapping/mapGenerators/shuttle.dm b/code/modules/procedural_mapping/mapGenerators/shuttle.dm
index 3b107c76c24..5e8100fcdc2 100644
--- a/code/modules/procedural_mapping/mapGenerators/shuttle.dm
+++ b/code/modules/procedural_mapping/mapGenerators/shuttle.dm
@@ -1,8 +1,7 @@
/datum/map_generator_module/bottom_layer/shuttle_floor
- spawnableTurfs = list(/turf/open/floor/iron/shuttle = 100)
+ spawnableTurfs = list(/turf/open/floor/mineral/titanium = 100)
/datum/map_generator_module/border/shuttle_walls
- spawnableAtoms = list()
spawnableTurfs = list(/turf/closed/wall/mineral/titanium = 100)
// Generators
diff --git a/code/modules/procedural_mapping/mapGenerators/syndicate.dm b/code/modules/procedural_mapping/mapGenerators/syndicate.dm
index 3f452f01d35..7b9b405eaca 100644
--- a/code/modules/procedural_mapping/mapGenerators/syndicate.dm
+++ b/code/modules/procedural_mapping/mapGenerators/syndicate.dm
@@ -1,15 +1,12 @@
// Modules
-/turf/open/floor/iron/shuttle/red/syndicate
- name = "floor" //Not Brig Floor
-
/datum/map_generator_module/bottom_layer/syndie_floor
- spawnableTurfs = list(/turf/open/floor/iron/shuttle/red/syndicate = 100)
+ spawnableTurfs = list(/turf/open/floor/mineral/plastitanium/red = 100)
/datum/map_generator_module/border/syndie_walls
spawnableAtoms = list()
- spawnableTurfs = list(/turf/closed/wall/r_wall = 100)
+ spawnableTurfs = list(/turf/closed/wall/r_wall/syndicate = 100)
/datum/map_generator_module/syndie_furniture
diff --git a/code/modules/research/xenobiology/xenobiology.dm b/code/modules/research/xenobiology/xenobiology.dm
index d657b1bc7fa..955549fc5c4 100644
--- a/code/modules/research/xenobiology/xenobiology.dm
+++ b/code/modules/research/xenobiology/xenobiology.dm
@@ -1006,7 +1006,7 @@
name = "bluespace floor tile"
singular_name = "floor tile"
desc = "Through a series of micro-teleports these tiles let people move at incredible speeds."
- icon_state = "tile-bluespace"
+ icon_state = "tile_bluespace"
inhand_icon_state = "tile-bluespace"
w_class = WEIGHT_CLASS_NORMAL
force = 6
@@ -1023,7 +1023,7 @@
name = "sepia floor tile"
singular_name = "floor tile"
desc = "Time seems to flow very slowly around these tiles."
- icon_state = "tile-sepia"
+ icon_state = "tile_sepia"
inhand_icon_state = "tile-sepia"
w_class = WEIGHT_CLASS_NORMAL
force = 6
diff --git a/code/modules/shuttle/emergency.dm b/code/modules/shuttle/emergency.dm
index 1df108f8491..50d390f24f5 100644
--- a/code/modules/shuttle/emergency.dm
+++ b/code/modules/shuttle/emergency.dm
@@ -393,7 +393,7 @@
has_people = TRUE
var/location = get_turf(player.mind.current)
//Non-antag present. Can't hijack.
- if(!(player.mind.has_antag_datum(/datum/antagonist)) && !istype(location, /turf/open/floor/iron/shuttle/red) && !istype(location, /turf/open/floor/mineral/plastitanium/red/brig))
+ if(!(player.mind.has_antag_datum(/datum/antagonist)) && !istype(location, /turf/open/floor/mineral/plastitanium/red/brig))
return FALSE
//Antag present, doesn't stop but let's see if we actually want to hijack
var/prevent = FALSE
diff --git a/code/modules/shuttle/shuttle.dm b/code/modules/shuttle/shuttle.dm
index 551f903fdc2..0d93f976dbb 100644
--- a/code/modules/shuttle/shuttle.dm
+++ b/code/modules/shuttle/shuttle.dm
@@ -603,7 +603,7 @@
var/turf/T = t
for(var/mob/living/M in T.GetAllContents())
// If they have a mind and they're not in the brig, they escaped
- if(M.mind && !istype(t, /turf/open/floor/iron/shuttle/red) && !istype(t, /turf/open/floor/mineral/plastitanium/red/brig))
+ if(M.mind && !istype(t, /turf/open/floor/mineral/plastitanium/red/brig))
M.mind.force_escaped = TRUE
// Ghostize them and put them in nullspace stasis (for stat & possession checks)
M.notransform = TRUE
diff --git a/icons/hud/radial.dmi b/icons/hud/radial.dmi
index 60d6a9c95e3..1ddd75a137c 100644
Binary files a/icons/hud/radial.dmi and b/icons/hud/radial.dmi differ
diff --git a/icons/obj/tiles.dmi b/icons/obj/tiles.dmi
index e37d111ddf5..3b5d5b80f45 100644
Binary files a/icons/obj/tiles.dmi and b/icons/obj/tiles.dmi differ
diff --git a/icons/turf/floors.dmi b/icons/turf/floors.dmi
index 65ed76d1dc7..abced9d193c 100644
Binary files a/icons/turf/floors.dmi and b/icons/turf/floors.dmi differ
diff --git a/modular_skyrat/modules/aesthetics/floors/icons/floors.dmi b/modular_skyrat/modules/aesthetics/floors/icons/floors.dmi
index 0ac11e71573..f518eb089e8 100644
Binary files a/modular_skyrat/modules/aesthetics/floors/icons/floors.dmi and b/modular_skyrat/modules/aesthetics/floors/icons/floors.dmi differ
diff --git a/modular_skyrat/modules/aesthetics/stacks/stack_objects.dmi b/modular_skyrat/modules/aesthetics/stacks/stack_objects.dmi
index 91e4b3fa805..29273b72c24 100644
Binary files a/modular_skyrat/modules/aesthetics/stacks/stack_objects.dmi and b/modular_skyrat/modules/aesthetics/stacks/stack_objects.dmi differ
diff --git a/modular_skyrat/modules/aesthetics/stacks/stacks.dm b/modular_skyrat/modules/aesthetics/stacks/stacks.dm
index d23acb66e2d..dd72662f84e 100644
--- a/modular_skyrat/modules/aesthetics/stacks/stacks.dm
+++ b/modular_skyrat/modules/aesthetics/stacks/stacks.dm
@@ -24,3 +24,6 @@
/obj/item/stack/tile/iron
icon = 'modular_skyrat/modules/aesthetics/stacks/stack_objects.dmi'
+
+/obj/item/stack/tile/iron/dark
+ icon = 'modular_skyrat/modules/aesthetics/stacks/stack_objects.dmi'
diff --git a/tgstation.dme b/tgstation.dme
index c057a695970..6c00367633a 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -1326,6 +1326,7 @@
#include "code\game\objects\items\stacks\sheets\sheet_types.dm"
#include "code\game\objects\items\stacks\sheets\sheets.dm"
#include "code\game\objects\items\stacks\tiles\light.dm"
+#include "code\game\objects\items\stacks\tiles\tile_iron.dm"
#include "code\game\objects\items\stacks\tiles\tile_mineral.dm"
#include "code\game\objects\items\stacks\tiles\tile_reskinning.dm"
#include "code\game\objects\items\stacks\tiles\tile_types.dm"
diff --git a/tools/UpdatePaths/replaceplasteelturf.txt b/tools/UpdatePaths/replaceplasteelturf.txt
index b349d1da2a8..643aad5e42c 100644
--- a/tools/UpdatePaths/replaceplasteelturf.txt
+++ b/tools/UpdatePaths/replaceplasteelturf.txt
@@ -1,25 +1,25 @@
/turf/open/floor/plasteel : /turf/open/floor/iron {@OLD}
/turf/open/floor/plasteel/airless : /turf/open/floor/iron/airless {@OLD}
-/turf/open/floor/plasteel/airless/cafeteria : /turf/open/floor/iron/airless/cafeteria {@OLD}
-/turf/open/floor/plasteel/airless/dark : /turf/open/floor/iron/airless/dark {@OLD}
-/turf/open/floor/plasteel/airless/showroomfloor : /turf/open/floor/iron/airless/showroomfloor {@OLD}
-/turf/open/floor/plasteel/airless/solarpanel : /turf/open/floor/iron/airless/solarpanel {@OLD}
-/turf/open/floor/plasteel/airless/white : /turf/open/floor/iron/airless/white {@OLD}
-/turf/open/floor/plasteel/airless/white/corner : /turf/open/floor/iron/airless/white/corner {@OLD}
-/turf/open/floor/plasteel/airless/white/side : /turf/open/floor/iron/airless/white/side {@OLD}
+/turf/open/floor/plasteel/airless/cafeteria : /turf/open/floor/iron/cafeteria/airless {@OLD}
+/turf/open/floor/plasteel/airless/dark : /turf/open/floor/iron/dark/airless {@OLD}
+/turf/open/floor/plasteel/airless/showroomfloor : /turf/open/floor/iron/showroomfloor/airless {@OLD}
+/turf/open/floor/plasteel/airless/solarpanel : /turf/open/floor/iron/solarpanel/airless {@OLD}
+/turf/open/floor/plasteel/airless/white : /turf/open/floor/iron/white/airless {@OLD}
+/turf/open/floor/plasteel/airless/white/corner : /turf/open/floor/iron/white/corner/airless {@OLD}
+/turf/open/floor/plasteel/airless/white/side : /turf/open/floor/iron/white/side/airless {@OLD}
/turf/open/floor/plasteel/bluespace : /turf/open/floor/iron/bluespace {@OLD}
/turf/open/floor/plasteel/cafeteria : /turf/open/floor/iron/cafeteria {@OLD}
/turf/open/floor/plasteel/chapel : /turf/open/floor/iron/chapel {@OLD}
/turf/open/floor/plasteel/checker : /turf/open/floor/iron/checker {@OLD}
-/turf/open/floor/plasteel/cult : /turf/open/floor/iron/cult {@OLD}
-/turf/open/floor/plasteel/cult/airless : /turf/open/floor/iron/cult/airless {@OLD}
+/turf/open/floor/plasteel/cult : /turf/open/floor/cult {@OLD}
+/turf/open/floor/plasteel/cult/airless : /turf/open/floor/cult/airless {@OLD}
/turf/open/floor/plasteel/dark : /turf/open/floor/iron/dark {@OLD}
/turf/open/floor/plasteel/dark/airless : /turf/open/floor/iron/dark/airless {@OLD}
/turf/open/floor/plasteel/dark/corner : /turf/open/floor/iron/dark/corner {@OLD}
/turf/open/floor/plasteel/dark/side : /turf/open/floor/iron/dark/side {@OLD}
/turf/open/floor/plasteel/dark/snowdin : /turf/open/floor/iron/dark/snowdin {@OLD}
/turf/open/floor/plasteel/dark/telecomms : /turf/open/floor/iron/dark/telecomms {@OLD}
-/turf/open/floor/plasteel/elevatorshaft : /turf/open/floor/iron/elevatorshaft {@OLD}
+/turf/open/floor/plasteel/elevatorshaft : /turf/open/floor/plating/elevatorshaft {@OLD}
/turf/open/floor/plasteel/freezer : /turf/open/floor/iron/freezer {@OLD}
/turf/open/floor/plasteel/freezer/airless : /turf/open/floor/iron/freezer/airless {@OLD}
/turf/open/floor/plasteel/goonplaque : /turf/open/floor/iron/goonplaque {@OLD}
@@ -29,14 +29,11 @@
/turf/open/floor/plasteel/kitchen_coldroom/freezerfloor : /turf/open/floor/iron/kitchen_coldroom/freezerfloor {@OLD}
/turf/open/floor/plasteel/recharge_floor : /turf/open/floor/iron/recharge_floor {@OLD}
/turf/open/floor/plasteel/recharge_floor/asteroid : /turf/open/floor/iron/recharge_floor/asteroid {@OLD}
-/turf/open/floor/plasteel/rockvault : /turf/open/floor/iron/rockvault {@OLD}
-/turf/open/floor/plasteel/rockvault/alien : /turf/open/floor/iron/rockvault/alien {@OLD}
-/turf/open/floor/plasteel/rockvault/sandstone : /turf/open/floor/iron/rockvault/sandstone {@OLD}
+/turf/open/floor/plasteel/rockvault : /turf/open/floor/vault/rock {@OLD}
+/turf/open/floor/plasteel/rockvault/alien : /turf/open/floor/vault/alien {@OLD}
+/turf/open/floor/plasteel/rockvault/sandstone : /turf/open/floor/vault/sandstone {@OLD}
/turf/open/floor/plasteel/sepia : /turf/open/floor/iron/sepia {@OLD}
/turf/open/floor/plasteel/showroomfloor : /turf/open/floor/iron/showroomfloor {@OLD}
-/turf/open/floor/plasteel/shuttle : /turf/open/floor/iron/shuttle {@OLD}
-/turf/open/floor/plasteel/shuttle/red : /turf/open/floor/iron/shuttle/red {@OLD}
-/turf/open/floor/plasteel/shuttle/red/syndicate : /turf/open/floor/iron/shuttle/red/syndicate {@OLD}
/turf/open/floor/plasteel/solarpanel : /turf/open/floor/iron/solarpanel {@OLD}
/turf/open/floor/plasteel/stairs : /turf/open/floor/iron/stairs {@OLD}
/turf/open/floor/plasteel/stairs/left : /turf/open/floor/iron/stairs/left {@OLD}
@@ -50,4 +47,4 @@
/turf/open/floor/plasteel/white/side : /turf/open/floor/iron/white/side {@OLD}
/turf/open/floor/plasteel/white/telecomms : /turf/open/floor/iron/white/telecomms {@OLD}
/turf/open/floor/plasteel/yellowsiding : /turf/open/floor/iron/yellowsiding {@OLD}
-/turf/open/floor/plasteel/yellowsiding/corner : /turf/open/floor/iron/yellowsiding/corner {@OLD}
\ No newline at end of file
+/turf/open/floor/plasteel/yellowsiding/corner : /turf/open/floor/iron/yellowsiding/corner {@OLD}