diff --git a/_maps/RandomRuins/SpaceRuins/mechtransport.dmm b/_maps/RandomRuins/SpaceRuins/mechtransport.dmm index 3286290fa5..c4a7c18c98 100644 --- a/_maps/RandomRuins/SpaceRuins/mechtransport.dmm +++ b/_maps/RandomRuins/SpaceRuins/mechtransport.dmm @@ -10,10 +10,7 @@ /turf/open/floor/plating, /area/ruin/space/has_grav/powered/mechtransport) "d" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall_s10"; - dir = 2 - }, +/turf/closed/wall/mineral/titanium, /area/ruin/space/has_grav/powered/mechtransport) "e" = ( /turf/closed/wall/mineral/titanium, @@ -63,10 +60,7 @@ /turf/open/floor/mineral/titanium/blue, /area/ruin/space/has_grav/powered/mechtransport) "o" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall13"; - dir = 2 - }, +/turf/closed/wall/mineral/titanium, /area/ruin/space/has_grav/powered/mechtransport) "p" = ( /obj/machinery/door/airlock/hatch{ @@ -76,10 +70,7 @@ /turf/open/floor/mineral/titanium, /area/ruin/space/has_grav/powered/mechtransport) "q" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall12"; - dir = 2 - }, +/turf/closed/wall/mineral/titanium, /area/ruin/space/has_grav/powered/mechtransport) "r" = ( /obj/effect/decal/cleanable/dirt, @@ -200,26 +191,17 @@ /turf/open/floor/plating/airless, /area/ruin/space/has_grav/powered/mechtransport) "T" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall14"; - dir = 2 - }, +/turf/closed/wall/mineral/titanium, /area/ruin/space/has_grav/powered/mechtransport) "U" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall_s9"; - dir = 2 - }, +/turf/closed/wall/mineral/titanium, /area/ruin/space/has_grav/powered/mechtransport) "V" = ( /obj/item/stack/rods, /turf/template_noop, /area/template_noop) "W" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall15"; - dir = 2 - }, +/turf/closed/wall/mineral/titanium, /area/ruin/space/has_grav/powered/mechtransport) "X" = ( /obj/structure/shuttle/engine/propulsion, diff --git a/_maps/RandomZLevels/Academy.dmm b/_maps/RandomZLevels/Academy.dmm index ba93de1bc8..9227ab0fd9 100644 --- a/_maps/RandomZLevels/Academy.dmm +++ b/_maps/RandomZLevels/Academy.dmm @@ -495,15 +495,10 @@ /turf/closed/wall/mineral/titanium, /area/awaymission/academy/classrooms) "bG" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall12"; - dir = 2 - }, +/turf/closed/wall/mineral/titanium, /area/awaymission/academy/classrooms) "bH" = ( -/turf/closed/wall/shuttle{ - icon_state = "swallc1" - }, +/turf/closed/wall/mineral/titanium, /area/awaymission/academy/classrooms) "bI" = ( /obj/machinery/light{ @@ -603,10 +598,7 @@ /turf/open/floor/plasteel/floorgrime, /area/awaymission/academy/classrooms) "bW" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall3"; - dir = 2 - }, +/turf/closed/wall/mineral/titanium, /area/awaymission/academy/classrooms) "bX" = ( /obj/effect/decal/cleanable/ash, @@ -727,9 +719,7 @@ /turf/open/floor/plasteel, /area/awaymission/academy/classrooms) "cs" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall1" - }, +/turf/closed/wall/mineral/titanium, /area/awaymission/academy/classrooms) "ct" = ( /obj/structure/chair, diff --git a/_maps/RandomZLevels/centcomAway.dmm b/_maps/RandomZLevels/centcomAway.dmm index 2faa93900f..f62787babf 100644 --- a/_maps/RandomZLevels/centcomAway.dmm +++ b/_maps/RandomZLevels/centcomAway.dmm @@ -365,10 +365,7 @@ /turf/open/floor/plasteel/vault{ dir = 5 }, -/turf/closed/wall/shuttle{ - icon_state = "swall_f10"; - dir = 2 - }, +/turf/closed/wall/mineral/titanium, /area/awaymission/centcomAway/hangar) "bs" = ( /obj/structure/closet/crate, @@ -429,16 +426,10 @@ /turf/open/floor/plating, /area/awaymission/centcomAway/hangar) "bD" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall7"; - dir = 2 - }, +/turf/closed/wall/mineral/titanium, /area/awaymission/centcomAway/hangar) "bE" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall8"; - dir = 2 - }, +/turf/closed/wall/mineral/titanium, /area/awaymission/centcomAway/hangar) "bF" = ( /obj/machinery/door/airlock/external{ @@ -447,22 +438,13 @@ /turf/open/floor/plating, /area/awaymission/centcomAway/hangar) "bG" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall4"; - dir = 2 - }, +/turf/closed/wall/mineral/titanium, /area/awaymission/centcomAway/hangar) "bH" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall12"; - dir = 2 - }, +/turf/closed/wall/mineral/titanium, /area/awaymission/centcomAway/hangar) "bI" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall11"; - dir = 2 - }, +/turf/closed/wall/mineral/titanium, /area/awaymission/centcomAway/hangar) "bJ" = ( /obj/structure/chair/comfy/brown, @@ -557,19 +539,10 @@ /turf/open/floor/mineral/titanium/blue, /area/awaymission/centcomAway/hangar) "bZ" = ( -/turf/open/floor/plasteel/shuttle, -/turf/closed/wall/shuttle{ - icon_state = "swall_f5"; - dir = 2 - }, +/turf/closed/wall/mineral/titanium, /area/awaymission/centcomAway/hangar) "ca" = ( -/turf/open/floor/plating, -/turf/closed/wall/shuttle{ - dir = 2; - icon_state = "swall_f10"; - layer = 2 - }, +/turf/closed/wall/mineral/titanium, /area/awaymission/centcomAway/hangar) "cb" = ( /obj/item/paper_bin, @@ -667,13 +640,7 @@ /turf/closed/wall/r_wall, /area/awaymission/centcomAway/maint) "cw" = ( -/turf/open/floor/plasteel/vault{ - dir = 5 - }, -/turf/closed/wall/shuttle{ - icon_state = "swall_f5"; - dir = 2 - }, +/turf/closed/wall/mineral/titanium, /area/awaymission/centcomAway/hangar) "cx" = ( /obj/machinery/door/airlock/maintenance_hatch{ @@ -682,13 +649,7 @@ /turf/open/floor/plating, /area/awaymission/centcomAway/hangar) "cy" = ( -/turf/open/floor/plasteel/vault{ - dir = 5 - }, -/turf/closed/wall/shuttle{ - icon_state = "swall_f9"; - dir = 2 - }, +/turf/closed/wall/mineral/titanium, /area/awaymission/centcomAway/hangar) "cz" = ( /turf/closed/wall, @@ -726,10 +687,7 @@ /turf/open/floor/plasteel/hydrofloor, /area/awaymission/centcomAway/cafe) "cI" = ( -/turf/closed/wall/shuttle{ - icon_state = "swallc1"; - dir = 2 - }, +/turf/closed/wall/mineral/titanium, /area/awaymission/centcomAway/hangar) "cJ" = ( /obj/structure/table/reinforced, @@ -770,10 +728,7 @@ /turf/open/floor/mineral/titanium/blue, /area/awaymission/centcomAway/hangar) "cQ" = ( -/turf/closed/wall/shuttle{ - icon_state = "swallc2"; - dir = 2 - }, +/turf/closed/wall/mineral/titanium, /area/awaymission/centcomAway/hangar) "cR" = ( /turf/open/floor/plating, @@ -930,10 +885,7 @@ }, /area/awaymission/centcomAway/cafe) "du" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall0"; - dir = 2 - }, +/turf/closed/wall/mineral/titanium, /area/awaymission/centcomAway/hangar) "dv" = ( /obj/structure/closet/crate, @@ -1061,10 +1013,7 @@ /turf/open/floor/plating, /area/awaymission/centcomAway/cafe) "dR" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall2"; - dir = 2 - }, +/turf/closed/wall/mineral/titanium, /area/awaymission/centcomAway/hangar) "dS" = ( /obj/effect/spawner/structure/window/hollow/reinforced/end/west, @@ -1199,23 +1148,13 @@ /turf/open/floor/plasteel/red, /area/awaymission/centcomAway/cafe) "eq" = ( -/turf/open/floor/plating, -/turf/closed/wall/shuttle{ - icon_state = "swall_f5"; - dir = 2 - }, +/turf/closed/wall/mineral/titanium, /area/awaymission/centcomAway/hangar) "er" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall14"; - dir = 2 - }, +/turf/closed/wall/mineral/titanium, /area/awaymission/centcomAway/hangar) "es" = ( -/turf/closed/wall/shuttle{ - icon_state = "swallc4"; - dir = 2 - }, +/turf/closed/wall/mineral/titanium, /area/awaymission/centcomAway/hangar) "et" = ( /obj/machinery/door/airlock/hatch{ @@ -2054,21 +1993,13 @@ /turf/open/floor/plating, /area/awaymission/centcomAway/hangar) "hv" = ( -/turf/open/floor/plating, /obj/structure/shuttle/engine/propulsion/burst{ dir = 4 }, -/turf/closed/wall/shuttle{ - icon_state = "swall_f5"; - dir = 2 - }, +/turf/closed/wall/mineral/titanium, /area/awaymission/centcomAway/hangar) "hw" = ( -/turf/open/floor/plasteel/black, -/turf/closed/wall/shuttle{ - icon_state = "swall_f9"; - dir = 2 - }, +/turf/closed/wall/mineral/titanium, /area/awaymission/centcomAway/hangar) "hx" = ( /obj/structure/table, diff --git a/_maps/RandomZLevels/moonoutpost19.dmm b/_maps/RandomZLevels/moonoutpost19.dmm index b88d60a0f6..5daed4908c 100644 --- a/_maps/RandomZLevels/moonoutpost19.dmm +++ b/_maps/RandomZLevels/moonoutpost19.dmm @@ -8006,11 +8006,7 @@ initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; heat_capacity = 1e+006 }, -/turf/closed/wall/shuttle{ - dir = 3; - icon_state = "swall_f10"; - layer = 2 - }, +/turf/closed/wall/mineral/titanium, /area/awaycontent/a1{ has_gravity = 1; name = "MO19 Arrivals" @@ -8270,19 +8266,13 @@ name = "MO19 Arrivals" }) "ly" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall14"; - dir = 2 - }, +/turf/closed/wall/mineral/titanium, /area/awaycontent/a1{ has_gravity = 1; name = "MO19 Arrivals" }) "lz" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall8"; - dir = 2 - }, +/turf/closed/wall/mineral/titanium, /area/awaycontent/a1{ has_gravity = 1; name = "MO19 Arrivals" @@ -8295,19 +8285,13 @@ name = "MO19 Arrivals" }) "lB" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall4"; - dir = 2 - }, +/turf/closed/wall/mineral/titanium, /area/awaycontent/a1{ has_gravity = 1; name = "MO19 Arrivals" }) "lC" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall1"; - dir = 2 - }, +/turf/closed/wall/mineral/titanium, /area/awaycontent/a1{ has_gravity = 1; name = "MO19 Arrivals" @@ -8528,10 +8512,7 @@ name = "MO19 Arrivals" }) "lY" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall3"; - dir = 2 - }, +/turf/closed/wall/mineral/titanium, /area/awaycontent/a1{ has_gravity = 1; name = "MO19 Arrivals" @@ -9122,10 +9103,7 @@ name = "MO19 Arrivals" }) "mX" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall2"; - dir = 2 - }, +/turf/closed/wall/mineral/titanium, /area/awaycontent/a1{ has_gravity = 1; name = "MO19 Arrivals" @@ -9194,24 +9172,13 @@ name = "MO19 Arrivals" }) "nd" = ( -/turf/open/floor/plating/asteroid{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; - heat_capacity = 1e+006 - }, -/turf/closed/wall/shuttle{ - icon_state = "swall_f5"; - dir = 2 - }, +/turf/closed/wall/mineral/titanium, /area/awaycontent/a1{ has_gravity = 1; name = "MO19 Arrivals" }) "ne" = ( -/turf/open/floor/plasteel/shuttle, -/turf/closed/wall/shuttle{ - icon_state = "swall_f10"; - dir = 2 - }, +/turf/closed/wall/mineral/titanium, /area/awaycontent/a1{ has_gravity = 1; name = "MO19 Arrivals" @@ -9306,10 +9273,7 @@ name = "MO19 Arrivals" }) "nn" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall13"; - dir = 2 - }, +/turf/closed/wall/mineral/titanium, /area/awaycontent/a1{ has_gravity = 1; name = "MO19 Arrivals" @@ -9409,14 +9373,7 @@ name = "MO19 Arrivals" }) "nv" = ( -/turf/open/floor/plating/asteroid{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; - heat_capacity = 1e+006 - }, -/turf/closed/wall/shuttle{ - icon_state = "swall_f9"; - dir = 2 - }, +/turf/closed/wall/mineral/titanium, /area/awaycontent/a1{ has_gravity = 1; name = "MO19 Arrivals" diff --git a/_maps/RandomZLevels/research.dmm b/_maps/RandomZLevels/research.dmm index f80b70ff37..7da8026638 100644 --- a/_maps/RandomZLevels/research.dmm +++ b/_maps/RandomZLevels/research.dmm @@ -4403,10 +4403,7 @@ /obj/structure/shuttle/engine/propulsion/burst{ dir = 8 }, -/turf/closed/wall/shuttle{ - icon_state = "swall_f9"; - dir = 2 - }, +/turf/closed/wall/mineral/titanium, /area/awaymission/research/exterior) "mA" = ( /obj/structure/chair{ diff --git a/_maps/RandomZLevels/spacebattle.dmm b/_maps/RandomZLevels/spacebattle.dmm index d8f2349de5..c554618c9a 100644 --- a/_maps/RandomZLevels/spacebattle.dmm +++ b/_maps/RandomZLevels/spacebattle.dmm @@ -540,20 +540,13 @@ /turf/closed/wall/mineral/titanium, /area/awaymission/spacebattle/cruiser) "bU" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall14" - }, +/turf/closed/wall/mineral/titanium, /area/awaymission/spacebattle/cruiser) "bV" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall12" - }, +/turf/closed/wall/mineral/titanium, /area/awaymission/spacebattle/cruiser) "bW" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall_s10"; - dir = 2 - }, +/turf/closed/wall/mineral/titanium, /area/awaymission/spacebattle/cruiser) "bX" = ( /obj/structure/shuttle/engine/propulsion/burst/left{ @@ -594,9 +587,7 @@ /turf/open/floor/plasteel, /area/awaymission/spacebattle/cruiser) "ce" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall3" - }, +/turf/closed/wall/mineral/titanium, /area/awaymission/spacebattle/cruiser) "cf" = ( /obj/structure/shuttle/engine/propulsion{ @@ -681,17 +672,13 @@ /turf/open/floor/plasteel, /area/awaymission/spacebattle/cruiser) "cs" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall7" - }, +/turf/closed/wall/mineral/titanium, /area/awaymission/spacebattle/cruiser) "ct" = ( /turf/closed/wall/mineral/titanium/nodiagonal, /area/awaymission/spacebattle/cruiser) "cu" = ( -/turf/closed/wall/shuttle{ - icon_state = "swallc2" - }, +/turf/closed/wall/mineral/titanium, /area/awaymission/spacebattle/cruiser) "cv" = ( /obj/machinery/power/smes/magical{ @@ -814,9 +801,7 @@ /turf/open/floor/plasteel, /area/awaymission/spacebattle/cruiser) "cR" = ( -/turf/closed/wall/shuttle{ - icon_state = "swallc3" - }, +/turf/closed/wall/mineral/titanium, /area/awaymission/spacebattle/cruiser) "cS" = ( /obj/effect/mob_spawn/human/engineer{ @@ -937,16 +922,10 @@ /turf/open/floor/plasteel/bar, /area/awaymission/spacebattle/cruiser) "do" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall7"; - dir = 2 - }, +/turf/closed/wall/mineral/titanium, /area/awaymission/spacebattle/cruiser) "dp" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall11"; - dir = 2 - }, +/turf/closed/wall/mineral/titanium, /area/awaymission/spacebattle/cruiser) "dq" = ( /turf/open/floor/plasteel{ @@ -973,24 +952,17 @@ }, /area/awaymission/spacebattle/cruiser) "dt" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall_s5"; - dir = 2 - }, +/turf/closed/wall/mineral/titanium, /area/awaymission/spacebattle/cruiser) "du" = ( /obj/effect/decal/cleanable/blood, /turf/closed/wall/mineral/titanium, /area/awaymission/spacebattle/cruiser) "dv" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall15" - }, +/turf/closed/wall/mineral/titanium, /area/awaymission/spacebattle/cruiser) "dw" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall11" - }, +/turf/closed/wall/mineral/titanium, /area/awaymission/spacebattle/cruiser) "dx" = ( /obj/structure/chair, @@ -1305,10 +1277,7 @@ /turf/open/floor/mineral/plastitanium, /area/awaymission/spacebattle/syndicate1) "eB" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall3"; - dir = 2 - }, +/turf/closed/wall/mineral/titanium, /area/awaymission/spacebattle/cruiser) "eC" = ( /obj/structure/table/reinforced, @@ -1344,15 +1313,10 @@ /turf/open/floor/plating/airless, /area/awaymission/spacebattle/cruiser) "eI" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall13"; - dir = 2 - }, +/turf/closed/wall/mineral/titanium, /area/awaymission/spacebattle/cruiser) "eJ" = ( -/turf/closed/wall/shuttle{ - icon_state = "swallc4" - }, +/turf/closed/wall/mineral/titanium, /area/awaymission/spacebattle/cruiser) "eK" = ( /turf/open/floor/mineral/plastitanium, @@ -1494,10 +1458,7 @@ /turf/closed/wall/mineral/titanium, /area/awaymission/spacebattle/cruiser) "fk" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall_s9"; - dir = 2 - }, +/turf/closed/wall/mineral/titanium, /area/awaymission/spacebattle/cruiser) "fl" = ( /obj/machinery/door/airlock/external, @@ -1939,9 +1900,7 @@ /area/awaymission/spacebattle/cruiser) "gE" = ( /obj/effect/decal/cleanable/blood, -/turf/closed/wall/shuttle{ - icon_state = "swall3" - }, +/turf/closed/wall/mineral/titanium, /area/awaymission/spacebattle/cruiser) "gF" = ( /obj/effect/mob_spawn/human/doctor{ @@ -2228,10 +2187,7 @@ }, /area/awaymission/spacebattle/syndicate7) "hH" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall14"; - dir = 2 - }, +/turf/closed/wall/mineral/titanium, /area/awaymission/spacebattle/cruiser) "hI" = ( /obj/structure/table/reinforced, @@ -2333,18 +2289,14 @@ /turf/open/floor/plasteel/white, /area/awaymission/spacebattle/cruiser) "ia" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall_s9" - }, +/turf/closed/wall/mineral/titanium, /area/awaymission/spacebattle/cruiser) "ib" = ( /obj/machinery/door/unpowered/shuttle, /turf/open/floor/plasteel/freezer, /area/awaymission/spacebattle/cruiser) "ic" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall1" - }, +/turf/closed/wall/mineral/titanium, /area/awaymission/spacebattle/cruiser) "id" = ( /obj/item/storage/firstaid/regular, diff --git a/_maps/RandomZLevels/undergroundoutpost45.dmm b/_maps/RandomZLevels/undergroundoutpost45.dmm index fec63e34de..575af3c075 100644 --- a/_maps/RandomZLevels/undergroundoutpost45.dmm +++ b/_maps/RandomZLevels/undergroundoutpost45.dmm @@ -55,19 +55,13 @@ name = "UO45 Central Hall" }) "ah" = ( -/turf/closed/wall/shuttle{ - icon_state = "swallc1"; - dir = 2 - }, +/turf/closed/wall/mineral/titanium, /area/awaycontent/a1{ has_gravity = 1; name = "UO45 Central Hall" }) "ai" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall3"; - dir = 2 - }, +/turf/closed/wall/mineral/titanium, /area/awaycontent/a1{ has_gravity = 1; name = "UO45 Central Hall" @@ -231,19 +225,13 @@ name = "UO45 Central Hall" }) "av" = ( -/turf/closed/wall/shuttle{ - icon_state = "swallc3"; - dir = 2 - }, +/turf/closed/wall/mineral/titanium, /area/awaycontent/a1{ has_gravity = 1; name = "UO45 Central Hall" }) "aw" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall8"; - dir = 2 - }, +/turf/closed/wall/mineral/titanium, /area/awaycontent/a1{ has_gravity = 1; name = "UO45 Central Hall" @@ -286,10 +274,7 @@ name = "UO45 Central Hall" }) "aA" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall4"; - dir = 2 - }, +/turf/closed/wall/mineral/titanium, /area/awaycontent/a1{ has_gravity = 1; name = "UO45 Central Hall" @@ -318,9 +303,7 @@ name = "UO45 Central Hall" }) "aE" = ( -/turf/closed/wall/shuttle{ - icon_state = "swallc4" - }, +/turf/closed/wall/mineral/titanium, /area/awaycontent/a1{ has_gravity = 1; name = "UO45 Central Hall" diff --git a/_maps/RandomZLevels/wildwest.dmm b/_maps/RandomZLevels/wildwest.dmm index 45e023d24a..61d5c4ee49 100644 --- a/_maps/RandomZLevels/wildwest.dmm +++ b/_maps/RandomZLevels/wildwest.dmm @@ -2094,28 +2094,20 @@ /turf/closed/wall/mineral/titanium, /area/awaymission/wwrefine) "gK" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall8" - }, +/turf/closed/wall/mineral/titanium, /area/awaymission/wwrefine) "gL" = ( /obj/machinery/door/unpowered/shuttle, /turf/open/floor/mineral/titanium/yellow, /area/awaymission/wwrefine) "gM" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall4" - }, +/turf/closed/wall/mineral/titanium, /area/awaymission/wwrefine) "gN" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall_s10" - }, +/turf/closed/wall/mineral/titanium, /area/awaymission/wwrefine) "gO" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall3" - }, +/turf/closed/wall/mineral/titanium, /area/awaymission/wwrefine) "gP" = ( /obj/structure/chair, @@ -2125,22 +2117,16 @@ /turf/open/floor/mineral/titanium/yellow, /area/awaymission/wwrefine) "gR" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall_s5" - }, +/turf/closed/wall/mineral/titanium, /area/awaymission/wwrefine) "gS" = ( /turf/closed/wall/mineral/titanium/nodiagonal, /area/awaymission/wwrefine) "gT" = ( -/turf/closed/wall/shuttle{ - icon_state = "swallc2" - }, +/turf/closed/wall/mineral/titanium, /area/awaymission/wwrefine) "gU" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall_s9" - }, +/turf/closed/wall/mineral/titanium, /area/awaymission/wwrefine) "gV" = ( /obj/effect/landmark/awaystart, diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index e1a6d179b6..95f1cb283c 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -19,9 +19,7 @@ /turf/closed/wall/mineral/plastitanium, /area/shuttle/syndicate) "aad" = ( -/turf/closed/wall/shuttle{ - icon_state = "wall3" - }, +/turf/closed/wall/mineral/plastitanium, /area/shuttle/syndicate) "aae" = ( /obj/effect/landmark/carpspawn, diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 595e4922db..ec76a564d5 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -79656,9 +79656,7 @@ /turf/open/floor/mineral/titanium, /area/shuttle/abandoned) "cVW" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall1" - }, +/turf/closed/wall/mineral/titanium, /area/shuttle/abandoned) "cVX" = ( /obj/structure/tank_dispenser/oxygen{ diff --git a/_maps/shuttles/cargo_birdboat.dmm b/_maps/shuttles/cargo_birdboat.dmm index d892e13726..f05af797d1 100644 --- a/_maps/shuttles/cargo_birdboat.dmm +++ b/_maps/shuttles/cargo_birdboat.dmm @@ -6,16 +6,10 @@ /turf/closed/wall/mineral/titanium, /area/shuttle/supply) "c" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall_s10"; - dir = 2 - }, +/turf/closed/wall/mineral/titanium, /area/shuttle/supply) "d" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall3"; - dir = 2 - }, +/turf/closed/wall/mineral/titanium, /area/shuttle/supply) "e" = ( /obj/machinery/conveyor{ @@ -148,10 +142,7 @@ /turf/closed/wall/mineral/titanium/nodiagonal, /area/shuttle/supply) "t" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall14"; - dir = 2 - }, +/turf/closed/wall/mineral/titanium, /area/shuttle/supply) "u" = ( /obj/structure/window/reinforced{ @@ -161,10 +152,7 @@ /turf/open/floor/plating/airless, /area/shuttle/supply) "v" = ( -/turf/closed/wall/shuttle{ - icon_state = "swallc4"; - dir = 2 - }, +/turf/closed/wall/mineral/titanium, /area/shuttle/supply) "w" = ( /turf/open/space, diff --git a/_maps/shuttles/cargo_box.dmm b/_maps/shuttles/cargo_box.dmm index 08ae8d8267..a45006d7df 100644 --- a/_maps/shuttles/cargo_box.dmm +++ b/_maps/shuttles/cargo_box.dmm @@ -6,16 +6,10 @@ /turf/closed/wall/mineral/titanium, /area/shuttle/supply) "c" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall_s10"; - dir = 2 - }, +/turf/closed/wall/mineral/titanium, /area/shuttle/supply) "d" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall3"; - dir = 2 - }, +/turf/closed/wall/mineral/titanium, /area/shuttle/supply) "e" = ( /turf/open/floor/mineral/titanium/blue, @@ -81,10 +75,7 @@ /turf/open/floor/plating, /area/shuttle/supply) "k" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall7"; - dir = 2 - }, +/turf/closed/wall/mineral/titanium, /area/shuttle/supply) "l" = ( /turf/open/floor/mineral/titanium/blue, @@ -97,22 +88,13 @@ }, /area/shuttle/supply) "n" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall11"; - dir = 2 - }, +/turf/closed/wall/mineral/titanium, /area/shuttle/supply) "o" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall_s5"; - dir = 2 - }, +/turf/closed/wall/mineral/titanium, /area/shuttle/supply) "p" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall15"; - dir = 2 - }, +/turf/closed/wall/mineral/titanium, /area/shuttle/supply) "q" = ( /obj/structure/window/reinforced{ @@ -122,10 +104,7 @@ /turf/open/floor/plating/airless, /area/shuttle/supply) "r" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall_s9"; - dir = 2 - }, +/turf/closed/wall/mineral/titanium, /area/shuttle/supply) "s" = ( /turf/open/space, diff --git a/_maps/shuttles/emergency_asteroid.dmm b/_maps/shuttles/emergency_asteroid.dmm index 338b59da1d..457373132c 100644 --- a/_maps/shuttles/emergency_asteroid.dmm +++ b/_maps/shuttles/emergency_asteroid.dmm @@ -20,10 +20,7 @@ /turf/open/floor/mineral/titanium/yellow, /area/shuttle/escape) "af" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall_s10"; - dir = 2 - }, +/turf/closed/wall/mineral/titanium, /area/shuttle/escape) "ag" = ( /turf/open/space, @@ -53,10 +50,7 @@ /turf/open/floor/mineral/titanium, /area/shuttle/escape) "ak" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall12"; - dir = 2 - }, +/turf/closed/wall/mineral/titanium, /area/shuttle/escape) "al" = ( /obj/machinery/door/airlock/titanium{ @@ -78,10 +72,7 @@ /turf/open/floor/plating/airless, /area/shuttle/escape) "ao" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall11"; - dir = 2 - }, +/turf/closed/wall/mineral/titanium, /area/shuttle/escape) "ap" = ( /obj/structure/ore_box, @@ -95,19 +86,13 @@ /turf/open/floor/mineral/titanium/yellow, /area/shuttle/escape) "as" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall7"; - dir = 2 - }, +/turf/closed/wall/mineral/titanium, /area/shuttle/escape) "at" = ( /turf/open/floor/mineral/titanium, /area/shuttle/escape) "au" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall3"; - dir = 2 - }, +/turf/closed/wall/mineral/titanium, /area/shuttle/escape) "av" = ( /obj/structure/chair{ @@ -125,28 +110,20 @@ /turf/open/floor/mineral/plastitanium/brig, /area/shuttle/escape) "ay" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall15"; - dir = 2 - }, +/turf/closed/wall/mineral/titanium, /area/shuttle/escape) "az" = ( /turf/closed/wall/mineral/titanium/nodiagonal, /area/shuttle/escape) "aA" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall13"; - dir = 2 - }, +/turf/closed/wall/mineral/titanium, /area/shuttle/escape) "aB" = ( /turf/open/floor/mineral/titanium, /turf/closed/wall/mineral/titanium/interior, /area/shuttle/escape) "aC" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall_f11" - }, +/turf/closed/wall/mineral/titanium, /area/shuttle/escape) "aD" = ( /obj/structure/window/shuttle, @@ -218,10 +195,7 @@ /turf/open/floor/mineral/titanium/blue, /area/shuttle/escape) "aO" = ( -/turf/closed/wall/shuttle{ - icon_state = "swallc1"; - dir = 2 - }, +/turf/closed/wall/mineral/titanium, /area/shuttle/escape) "aP" = ( /obj/machinery/door/airlock/glass_security{ @@ -367,10 +341,7 @@ /area/shuttle/escape) "bo" = ( /obj/machinery/status_display, -/turf/closed/wall/shuttle{ - icon_state = "swall2"; - dir = 2 - }, +/turf/closed/wall/mineral/titanium, /area/shuttle/escape) "bp" = ( /obj/machinery/computer/crew, @@ -450,16 +421,10 @@ /turf/open/floor/mineral/titanium, /area/shuttle/escape) "bA" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall_s9"; - dir = 2 - }, +/turf/closed/wall/mineral/titanium, /area/shuttle/escape) "bB" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall_s5"; - dir = 2 - }, +/turf/closed/wall/mineral/titanium, /area/shuttle/escape) "bC" = ( /obj/item/device/radio/intercom{ diff --git a/_maps/shuttles/emergency_bar.dmm b/_maps/shuttles/emergency_bar.dmm index 955af902c0..19b6a85ea9 100644 --- a/_maps/shuttles/emergency_bar.dmm +++ b/_maps/shuttles/emergency_bar.dmm @@ -3,17 +3,14 @@ /turf/open/space, /area/space) "ab" = ( -/turf/closed/wall/mineral/titanium/overspace, +/turf/closed/wall/mineral/titanium, /area/shuttle/escape) "ac" = ( /obj/effect/spawner/structure/window/shuttle, /turf/open/floor/plating, /area/shuttle/escape) "ad" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall_s10"; - dir = 2 - }, +/turf/closed/wall/mineral/titanium, /area/shuttle/escape) "ae" = ( /turf/closed/wall/mineral/titanium/nodiagonal, @@ -43,10 +40,7 @@ /turf/open/floor/carpet, /area/shuttle/escape) "aj" = ( -/turf/closed/wall/shuttle{ - icon_state = "swallc3"; - dir = 2 - }, +/turf/closed/wall/mineral/titanium, /area/shuttle/escape) "ak" = ( /obj/structure/extinguisher_cabinet{ @@ -117,28 +111,16 @@ /turf/open/floor/carpet, /area/shuttle/escape) "av" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall13"; - dir = 2 - }, +/turf/closed/wall/mineral/titanium, /area/shuttle/escape) "aw" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall12"; - dir = 2 - }, +/turf/closed/wall/mineral/titanium, /area/shuttle/escape) "ax" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall14"; - dir = 2 - }, +/turf/closed/wall/mineral/titanium, /area/shuttle/escape) "ay" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall8"; - dir = 2 - }, +/turf/closed/wall/mineral/titanium, /area/shuttle/escape) "az" = ( /obj/machinery/door/airlock/glass{ @@ -152,10 +134,7 @@ /turf/closed/wall/mineral/titanium, /area/shuttle/escape) "aB" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall4"; - dir = 2 - }, +/turf/closed/wall/mineral/titanium, /area/shuttle/escape) "aC" = ( /obj/structure/chair, @@ -258,10 +237,7 @@ /turf/open/floor/plasteel/bar, /area/shuttle/escape) "aQ" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall7"; - dir = 2 - }, +/turf/closed/wall/mineral/titanium, /area/shuttle/escape) "aR" = ( /obj/structure/table/wood/bar{ @@ -350,10 +326,7 @@ /turf/open/floor/plasteel/bar, /area/shuttle/escape) "bf" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall1"; - dir = 2 - }, +/turf/closed/wall/mineral/titanium, /area/shuttle/escape) "bg" = ( /obj/machinery/door/airlock/titanium{ @@ -384,10 +357,7 @@ /turf/open/floor/plasteel/bar, /area/shuttle/escape) "bl" = ( -/turf/closed/wall/shuttle{ - icon_state = "swallc2"; - dir = 2 - }, +/turf/closed/wall/mineral/titanium, /area/shuttle/escape) "bm" = ( /obj/machinery/door/airlock{ diff --git a/_maps/shuttles/emergency_box.dmm b/_maps/shuttles/emergency_box.dmm index 55900b8ee0..1645d971c2 100644 --- a/_maps/shuttles/emergency_box.dmm +++ b/_maps/shuttles/emergency_box.dmm @@ -10,10 +10,7 @@ /turf/open/floor/plating, /area/shuttle/escape) "ad" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall_s10"; - dir = 2 - }, +/turf/closed/wall/mineral/titanium, /area/shuttle/escape) "ae" = ( /turf/open/floor/mineral/titanium, @@ -110,22 +107,13 @@ /turf/open/floor/mineral/titanium, /area/shuttle/escape) "av" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall13"; - dir = 2 - }, +/turf/closed/wall/mineral/titanium, /area/shuttle/escape) "aw" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall12"; - dir = 2 - }, +/turf/closed/wall/mineral/titanium, /area/shuttle/escape) "ax" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall14"; - dir = 2 - }, +/turf/closed/wall/mineral/titanium, /area/shuttle/escape) "ay" = ( /obj/machinery/door/airlock/glass{ @@ -225,16 +213,10 @@ /turf/open/floor/mineral/titanium, /area/shuttle/escape) "aN" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall7"; - dir = 2 - }, +/turf/closed/wall/mineral/titanium, /area/shuttle/escape) "aO" = ( -/turf/closed/wall/shuttle{ - icon_state = "swallc4"; - dir = 2 - }, +/turf/closed/wall/mineral/titanium, /area/shuttle/escape) "aP" = ( /obj/machinery/door/airlock/titanium{ @@ -306,10 +288,7 @@ /area/shuttle/escape) "aY" = ( /obj/machinery/status_display, -/turf/closed/wall/shuttle{ - icon_state = "swall14"; - dir = 2 - }, +/turf/closed/wall/mineral/titanium, /area/shuttle/escape) "aZ" = ( /obj/machinery/door/airlock/glass{ @@ -318,10 +297,7 @@ /turf/open/floor/mineral/titanium/blue, /area/shuttle/escape) "ba" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall11"; - dir = 2 - }, +/turf/closed/wall/mineral/titanium, /area/shuttle/escape) "bb" = ( /turf/open/floor/mineral/titanium/yellow, @@ -363,10 +339,7 @@ /turf/open/floor/mineral/titanium/yellow, /area/shuttle/escape) "bh" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall_s5"; - dir = 2 - }, +/turf/closed/wall/mineral/titanium, /area/shuttle/escape) "bi" = ( /obj/structure/window/reinforced{ diff --git a/_maps/shuttles/emergency_goon.dmm b/_maps/shuttles/emergency_goon.dmm index 1b41f6ef9b..dad0466b8b 100644 --- a/_maps/shuttles/emergency_goon.dmm +++ b/_maps/shuttles/emergency_goon.dmm @@ -45,20 +45,13 @@ /turf/open/floor/mineral/titanium/blue, /area/shuttle/escape) "i" = ( -/turf/closed/wall/shuttle{ - icon_state = "wall_space"; - dir = 8 - }, +/turf/closed/wall/mineral/titanium, /area/shuttle/escape) "j" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall4" - }, +/turf/closed/wall/mineral/titanium, /area/shuttle/escape) "k" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall12" - }, +/turf/closed/wall/mineral/titanium, /area/shuttle/escape) "l" = ( /obj/machinery/vending/wallmed, @@ -70,9 +63,7 @@ /turf/open/floor/mineral/titanium/blue, /area/shuttle/escape) "n" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall1" - }, +/turf/closed/wall/mineral/titanium, /area/shuttle/escape) "o" = ( /turf/open/floor/mineral/titanium/blue, @@ -161,14 +152,10 @@ /turf/open/floor/mineral/titanium/yellow, /area/shuttle/escape) "C" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall8" - }, +/turf/closed/wall/mineral/titanium, /area/shuttle/escape) "D" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall3" - }, +/turf/closed/wall/mineral/titanium, /area/shuttle/escape) "E" = ( /obj/machinery/door/airlock/glass{ @@ -227,22 +214,14 @@ /turf/open/floor/mineral/titanium/yellow, /area/shuttle/escape) "N" = ( -/turf/closed/wall/shuttle{ - icon_state = "wall_space"; - dir = 4 - }, +/turf/closed/wall/mineral/titanium, /area/shuttle/escape) "O" = ( -/turf/closed/wall/shuttle{ - icon_state = "wall_floor"; - dir = 8 - }, +/turf/closed/wall/mineral/titanium, /area/shuttle/escape) "P" = ( /obj/machinery/status_display, -/turf/closed/wall/shuttle{ - icon_state = "swall0" - }, +/turf/closed/wall/mineral/titanium, /area/shuttle/escape) "Q" = ( /obj/machinery/light, diff --git a/_maps/shuttles/emergency_meta.dmm b/_maps/shuttles/emergency_meta.dmm index cc49763c6b..641ea8d36f 100644 --- a/_maps/shuttles/emergency_meta.dmm +++ b/_maps/shuttles/emergency_meta.dmm @@ -13,10 +13,7 @@ /turf/closed/wall/mineral/titanium, /area/shuttle/escape) "ae" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall12"; - dir = 2 - }, +/turf/closed/wall/mineral/titanium, /area/shuttle/escape) "af" = ( /obj/machinery/door/airlock/titanium{ @@ -42,10 +39,7 @@ /turf/open/floor/mineral/titanium/blue, /area/shuttle/escape) "ai" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall_s10"; - dir = 2 - }, +/turf/closed/wall/mineral/titanium, /area/shuttle/escape) "aj" = ( /turf/open/space, @@ -55,10 +49,7 @@ }, /area/shuttle/escape) "ak" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall3"; - dir = 2 - }, +/turf/closed/wall/mineral/titanium, /area/shuttle/escape) "al" = ( /obj/structure/table, @@ -246,9 +237,7 @@ /turf/open/floor/mineral/titanium/blue, /area/shuttle/escape) "aD" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall1" - }, +/turf/closed/wall/mineral/titanium, /area/shuttle/escape) "aE" = ( /obj/structure/chair{ @@ -293,9 +282,7 @@ /turf/open/floor/mineral/titanium/blue, /area/shuttle/escape) "aM" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall2" - }, +/turf/closed/wall/mineral/titanium, /area/shuttle/escape) "aN" = ( /obj/machinery/status_display{ @@ -367,16 +354,10 @@ /turf/open/floor/mineral/titanium, /area/shuttle/escape) "aU" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall7"; - dir = 2 - }, +/turf/closed/wall/mineral/titanium, /area/shuttle/escape) "aV" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall8"; - dir = 2 - }, +/turf/closed/wall/mineral/titanium, /area/shuttle/escape) "aW" = ( /obj/machinery/door/airlock/command{ @@ -387,10 +368,7 @@ /turf/open/floor/mineral/titanium/blue, /area/shuttle/escape) "aX" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall15"; - dir = 2 - }, +/turf/closed/wall/mineral/titanium, /area/shuttle/escape) "aY" = ( /obj/machinery/door/airlock/glass_security{ @@ -419,10 +397,7 @@ /turf/open/floor/plasteel, /area/shuttle/escape) "bc" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall11"; - dir = 2 - }, +/turf/closed/wall/mineral/titanium, /area/shuttle/escape) "bd" = ( /obj/structure/chair{ @@ -502,10 +477,7 @@ /turf/open/floor/plasteel, /area/shuttle/escape) "br" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall4"; - dir = 2 - }, +/turf/closed/wall/mineral/titanium, /area/shuttle/escape) "bs" = ( /obj/structure/chair{ diff --git a/_maps/shuttles/emergency_mini.dmm b/_maps/shuttles/emergency_mini.dmm index a15cd97ef6..570b600743 100644 --- a/_maps/shuttles/emergency_mini.dmm +++ b/_maps/shuttles/emergency_mini.dmm @@ -195,10 +195,7 @@ /turf/open/floor/mineral/titanium, /area/shuttle/escape) "F" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall7"; - dir = 2 - }, +/turf/closed/wall/mineral/titanium, /obj/structure/table, /obj/item/storage/firstaid/fire, /obj/item/storage/firstaid/regular{ diff --git a/_maps/shuttles/emergency_supermatter.dmm b/_maps/shuttles/emergency_supermatter.dmm index ae1bcfe983..5324551cec 100644 --- a/_maps/shuttles/emergency_supermatter.dmm +++ b/_maps/shuttles/emergency_supermatter.dmm @@ -14,10 +14,7 @@ /turf/open/floor/plating, /area/shuttle/escape) "ae" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall_s10"; - dir = 2 - }, +/turf/closed/wall/mineral/titanium, /area/shuttle/escape) "af" = ( /turf/closed/wall/mineral/titanium, @@ -44,9 +41,7 @@ /area/shuttle/escape) "ak" = ( /obj/structure/sign/radiation, -/turf/closed/wall/shuttle{ - icon_state = "swall3" - }, +/turf/closed/wall/mineral/titanium, /area/shuttle/escape) "al" = ( /obj/machinery/shower{ @@ -121,15 +116,10 @@ /turf/closed/wall/mineral/titanium/interior, /area/shuttle/escape) "ay" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall_f5"; - dir = 2 - }, +/turf/closed/wall/mineral/titanium, /area/shuttle/escape) "az" = ( -/turf/closed/wall/shuttle{ - icon_state = "swallc1" - }, +/turf/closed/wall/mineral/titanium, /area/shuttle/escape) "aA" = ( /obj/machinery/door/airlock/titanium{ @@ -177,15 +167,11 @@ /turf/open/floor/plating, /area/shuttle/escape) "aG" = ( -/turf/closed/wall/shuttle{ - icon_state = "swallc3" - }, +/turf/closed/wall/mineral/titanium, /area/shuttle/escape) "aH" = ( /obj/machinery/status_display, -/turf/closed/wall/shuttle{ - icon_state = "swall12" - }, +/turf/closed/wall/mineral/titanium, /area/shuttle/escape) "aI" = ( /obj/structure/sign/radiation, @@ -193,16 +179,10 @@ /area/shuttle/escape) "aJ" = ( /obj/structure/sign/radiation, -/turf/closed/wall/shuttle{ - icon_state = "swallc2"; - dir = 2 - }, +/turf/closed/wall/mineral/titanium, /area/shuttle/escape) "aK" = ( -/turf/closed/wall/shuttle{ - icon_state = "swallc4"; - dir = 2 - }, +/turf/closed/wall/mineral/titanium, /area/shuttle/escape) "aL" = ( /obj/machinery/door/airlock/external{ diff --git a/_maps/shuttles/ferry_base.dmm b/_maps/shuttles/ferry_base.dmm index d4447ebe2f..f227228b85 100644 --- a/_maps/shuttles/ferry_base.dmm +++ b/_maps/shuttles/ferry_base.dmm @@ -67,16 +67,11 @@ /obj/structure/shuttle/engine/propulsion{ dir = 4 }, -/turf/closed/wall/shuttle{ - icon_state = "swall_s5"; - dir = 2 - }, +/turf/closed/wall/mineral/titanium, /area/shuttle/transport) "o" = ( /turf/open/floor/plasteel/shuttle, -/turf/closed/wall/mineral/titanium/interior{ - icon_state = "swall_f10" - }, +/turf/closed/wall/mineral/titanium, /area/shuttle/transport) "p" = ( /obj/structure/closet/crate, @@ -89,10 +84,7 @@ /turf/open/floor/mineral/titanium/blue, /area/shuttle/transport) "r" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall_s9"; - dir = 2 - }, +/turf/closed/wall/mineral/titanium, /area/shuttle/transport) (1,1,1) = {" diff --git a/_maps/shuttles/ferry_lighthouse.dmm b/_maps/shuttles/ferry_lighthouse.dmm index bfecd3aae0..d7880e1164 100644 --- a/_maps/shuttles/ferry_lighthouse.dmm +++ b/_maps/shuttles/ferry_lighthouse.dmm @@ -99,10 +99,7 @@ /turf/closed/wall/mineral/titanium, /area/shuttle/transport) "ax" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall12"; - dir = 2 - }, +/turf/closed/wall/mineral/titanium, /area/shuttle/transport) "ay" = ( /obj/structure/window/shuttle, @@ -114,10 +111,7 @@ /turf/open/floor/plating, /area/shuttle/transport) "aA" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall_s10"; - dir = 2 - }, +/turf/closed/wall/mineral/titanium, /area/shuttle/transport) "aB" = ( /obj/structure/grille{ diff --git a/_maps/shuttles/ferry_meat.dmm b/_maps/shuttles/ferry_meat.dmm index e1582807fb..6384f0e057 100644 --- a/_maps/shuttles/ferry_meat.dmm +++ b/_maps/shuttles/ferry_meat.dmm @@ -6,13 +6,13 @@ /obj/structure/shuttle/engine/propulsion{ dir = 4 }, -/turf/closed/wall/mineral/titanium/overspace, +/turf/closed/wall/mineral/titanium, /area/shuttle/transport) "c" = ( /turf/closed/wall/mineral/titanium, /area/shuttle/transport) "d" = ( -/turf/closed/wall/mineral/titanium/overspace, +/turf/closed/wall/mineral/titanium, /area/shuttle/transport) "e" = ( /turf/open/floor/plasteel/freezer, @@ -123,16 +123,11 @@ /obj/structure/shuttle/engine/propulsion{ dir = 4 }, -/turf/closed/wall/shuttle{ - icon_state = "swall_s5"; - dir = 2 - }, +/turf/closed/wall/mineral/titanium, /area/shuttle/transport) "s" = ( /turf/open/floor/plasteel/freezer, -/turf/closed/wall/mineral/titanium/interior{ - icon_state = "swall_f10" - }, +/turf/closed/wall/mineral/titanium, /area/shuttle/transport) "t" = ( /obj/structure/closet/chefcloset, @@ -156,10 +151,7 @@ /turf/open/floor/plasteel/freezer, /area/shuttle/transport) "x" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall_s9"; - dir = 2 - }, +/turf/closed/wall/mineral/titanium, /area/shuttle/transport) (1,1,1) = {" diff --git a/_maps/shuttles/whiteship_box.dmm b/_maps/shuttles/whiteship_box.dmm index 1c44997198..a52eb6aa36 100644 --- a/_maps/shuttles/whiteship_box.dmm +++ b/_maps/shuttles/whiteship_box.dmm @@ -6,10 +6,7 @@ /turf/closed/wall/mineral/titanium/overspace, /area/shuttle/abandoned) "ac" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall_s10"; - dir = 2 - }, +/turf/closed/wall/mineral/titanium, /area/shuttle/abandoned) "ad" = ( /obj/machinery/door/airlock/titanium, @@ -30,10 +27,7 @@ /turf/open/floor/mineral/titanium, /area/shuttle/abandoned) "ae" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall12"; - dir = 2 - }, +/turf/closed/wall/mineral/titanium, /area/shuttle/abandoned) "af" = ( /obj/machinery/door/airlock/titanium, @@ -46,16 +40,10 @@ /turf/open/floor/plating/airless, /area/shuttle/abandoned) "ah" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall13"; - dir = 2 - }, +/turf/closed/wall/mineral/titanium, /area/shuttle/abandoned) "ai" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall11"; - dir = 2 - }, +/turf/closed/wall/mineral/titanium, /area/shuttle/abandoned) "aj" = ( /turf/open/floor/mineral/titanium, @@ -74,10 +62,7 @@ /turf/open/floor/mineral/titanium, /area/shuttle/abandoned) "am" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall3"; - dir = 2 - }, +/turf/closed/wall/mineral/titanium, /area/shuttle/abandoned) "an" = ( /obj/structure/shuttle/engine/propulsion{ @@ -99,10 +84,7 @@ /turf/closed/wall/mineral/titanium/interior, /area/shuttle/abandoned) "aq" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall15"; - dir = 2 - }, +/turf/closed/wall/mineral/titanium, /area/shuttle/abandoned) "ar" = ( /obj/machinery/computer/pod{ @@ -111,18 +93,13 @@ /turf/open/floor/mineral/titanium, /area/shuttle/abandoned) "as" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall7"; - dir = 2 - }, +/turf/closed/wall/mineral/titanium, /area/shuttle/abandoned) "at" = ( /turf/open/floor/plating, /area/shuttle/abandoned) "au" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall_f13" - }, +/turf/closed/wall/mineral/titanium, /area/shuttle/abandoned) "av" = ( /obj/structure/rack, @@ -150,15 +127,10 @@ /turf/open/floor/plating, /area/shuttle/abandoned) "az" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall_f12" - }, +/turf/closed/wall/mineral/titanium, /area/shuttle/abandoned) "aA" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall14"; - dir = 2 - }, +/turf/closed/wall/mineral/titanium, /area/shuttle/abandoned) "aB" = ( /obj/structure/shuttle/engine/propulsion/right{ @@ -181,9 +153,7 @@ /turf/open/floor/mineral/titanium, /area/shuttle/abandoned) "aF" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall_f14" - }, +/turf/closed/wall/mineral/titanium, /area/shuttle/abandoned) "aG" = ( /obj/structure/rack, @@ -202,9 +172,7 @@ /turf/open/floor/mineral/titanium, /area/shuttle/abandoned) "aI" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall_f11" - }, +/turf/closed/wall/mineral/titanium, /area/shuttle/abandoned) "aJ" = ( /obj/structure/chair{ diff --git a/_maps/shuttles/whiteship_meta.dmm b/_maps/shuttles/whiteship_meta.dmm index 8949b3d138..67847a4b9f 100644 --- a/_maps/shuttles/whiteship_meta.dmm +++ b/_maps/shuttles/whiteship_meta.dmm @@ -9,20 +9,14 @@ /turf/closed/wall/mineral/titanium, /area/shuttle/abandoned) "ad" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall12"; - dir = 2 - }, +/turf/closed/wall/mineral/titanium, /area/shuttle/abandoned) "ae" = ( /obj/effect/spawner/structure/window/shuttle, /turf/open/floor/plating, /area/shuttle/abandoned) "af" = ( -/turf/closed/wall/shuttle{ - icon_state = "swallc1"; - dir = 2 - }, +/turf/closed/wall/mineral/titanium, /area/shuttle/abandoned) "ag" = ( /obj/docking_port/mobile{ @@ -58,16 +52,10 @@ /turf/open/floor/mineral/titanium/blue, /area/shuttle/abandoned) "ai" = ( -/turf/closed/wall/shuttle{ - icon_state = "swallc2"; - dir = 2 - }, +/turf/closed/wall/mineral/titanium, /area/shuttle/abandoned) "aj" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall_s10"; - dir = 2 - }, +/turf/closed/wall/mineral/titanium, /area/shuttle/abandoned) "ak" = ( /obj/structure/shuttle/engine/propulsion/left{ @@ -76,16 +64,10 @@ /turf/open/floor/plating/airless, /area/shuttle/abandoned) "al" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall13"; - dir = 2 - }, +/turf/closed/wall/mineral/titanium, /area/shuttle/abandoned) "am" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall11"; - dir = 2 - }, +/turf/closed/wall/mineral/titanium, /area/shuttle/abandoned) "an" = ( /obj/structure/toilet{ @@ -122,10 +104,7 @@ /turf/open/floor/mineral/titanium, /area/shuttle/abandoned) "ap" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall3"; - dir = 2 - }, +/turf/closed/wall/mineral/titanium, /area/shuttle/abandoned) "aq" = ( /obj/structure/closet/wardrobe/mixed, @@ -195,9 +174,7 @@ /turf/open/floor/mineral/titanium, /area/shuttle/abandoned) "av" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall1" - }, +/turf/closed/wall/mineral/titanium, /area/shuttle/abandoned) "aw" = ( /obj/structure/sign/vacuum{ @@ -329,16 +306,10 @@ /turf/open/floor/plating/airless, /area/shuttle/abandoned) "aE" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall7"; - dir = 2 - }, +/turf/closed/wall/mineral/titanium, /area/shuttle/abandoned) "aF" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall8"; - dir = 2 - }, +/turf/closed/wall/mineral/titanium, /area/shuttle/abandoned) "aG" = ( /obj/machinery/door/airlock/titanium{ @@ -601,9 +572,7 @@ /turf/open/floor/mineral/titanium, /area/shuttle/abandoned) "aZ" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall2" - }, +/turf/closed/wall/mineral/titanium, /area/shuttle/abandoned) "ba" = ( /obj/effect/decal/cleanable/oil, @@ -645,10 +614,7 @@ /turf/open/floor/mineral/titanium/blue, /area/shuttle/abandoned) "be" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall1"; - dir = 2 - }, +/turf/closed/wall/mineral/titanium, /area/shuttle/abandoned) "bf" = ( /obj/machinery/door/airlock/titanium{ @@ -671,16 +637,10 @@ /turf/closed/wall/mineral/titanium, /area/shuttle/abandoned) "bh" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall4"; - dir = 2 - }, +/turf/closed/wall/mineral/titanium, /area/shuttle/abandoned) "bi" = ( -/turf/closed/wall/shuttle{ - icon_state = "swallc4"; - dir = 2 - }, +/turf/closed/wall/mineral/titanium, /area/shuttle/abandoned) "bj" = ( /obj/machinery/door/airlock/titanium{ @@ -697,10 +657,7 @@ /turf/open/floor/mineral/titanium/blue, /area/shuttle/abandoned) "bk" = ( -/turf/closed/wall/shuttle{ - icon_state = "swallc3"; - dir = 2 - }, +/turf/closed/wall/mineral/titanium, /area/shuttle/abandoned) "bl" = ( /obj/machinery/door/airlock/titanium{ @@ -1180,10 +1137,7 @@ /turf/open/floor/mineral/titanium, /area/shuttle/abandoned) "cc" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall_s5"; - dir = 2 - }, +/turf/closed/wall/mineral/titanium, /area/shuttle/abandoned) "cd" = ( /obj/machinery/vending/snack/random, @@ -1287,10 +1241,7 @@ /turf/open/floor/mineral/titanium/blue, /area/shuttle/abandoned) "cp" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall_s9"; - dir = 2 - }, +/turf/closed/wall/mineral/titanium, /area/shuttle/abandoned) "cq" = ( /obj/item/storage/bag/plants/portaseeder, diff --git a/_maps/templates/small_shuttle_1.dmm b/_maps/templates/small_shuttle_1.dmm index 8dfe620914..71cd3cdca5 100644 --- a/_maps/templates/small_shuttle_1.dmm +++ b/_maps/templates/small_shuttle_1.dmm @@ -11,9 +11,7 @@ /area/space) "d" = ( /turf/open/space, -/turf/closed/wall/shuttle{ - icon_state = "swall_f10" - }, +/turf/closed/wall/mineral/titanium, /area/space) "e" = ( /turf/closed/wall/mineral/titanium, @@ -28,23 +26,17 @@ /turf/open/floor/mineral/titanium/blue, /area/space) "h" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall13" - }, +/turf/closed/wall/mineral/titanium, /area/space) "i" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall8" - }, +/turf/closed/wall/mineral/titanium, /area/space) "j" = ( /obj/machinery/door/unpowered/shuttle, /turf/open/floor/mineral/titanium/blue, /area/space) "k" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall4" - }, +/turf/closed/wall/mineral/titanium, /area/space) "l" = ( /obj/structure/chair{ @@ -64,9 +56,7 @@ /area/space) "o" = ( /turf/open/space, -/turf/closed/wall/shuttle{ - icon_state = "swall_f5" - }, +/turf/closed/wall/mineral/titanium, /area/space) "p" = ( /obj/structure/shuttle/engine/propulsion/left, @@ -81,10 +71,7 @@ /turf/open/floor/plating/airless, /area/space) "s" = ( -/turf/open/space, -/turf/closed/wall/shuttle{ - icon_state = "swall_f9" - }, +/turf/closed/wall/mineral/titanium, /area/space) (1,1,1) = {" diff --git a/code/__HELPERS/icon_smoothing.dm b/code/__HELPERS/icon_smoothing.dm index 849e5a01ee..33189ffcee 100644 --- a/code/__HELPERS/icon_smoothing.dm +++ b/code/__HELPERS/icon_smoothing.dm @@ -20,7 +20,7 @@ A non null 'fixed_underlay' list var will skip copying the previous turf appearance and always use the list. If the list is not set properly, the underlay will default to regular floor plating. - To see an example of a diagonal wall, see '/turf/closed/wall/shuttle' and its subtypes. + To see an example of a diagonal wall, see '/turf/closed/wall/mineral/titanium' and its subtypes. */ //Redefinitions of the diagonal directions so they can be stored in one var without conflicts diff --git a/code/game/gamemodes/clock_cult/clock_helpers/fabrication_helpers.dm b/code/game/gamemodes/clock_cult/clock_helpers/fabrication_helpers.dm index 0c740d7f36..18c8103eef 100644 --- a/code/game/gamemodes/clock_cult/clock_helpers/fabrication_helpers.dm +++ b/code/game/gamemodes/clock_cult/clock_helpers/fabrication_helpers.dm @@ -27,9 +27,6 @@ /turf/closed/wall/mineral/cult/fabrication_vals(mob/living/user, obj/item/clockwork/replica_fabricator/fabricator, silent) //no metal return list("operation_time" = 80, "new_obj_type" = /turf/closed/wall/clockwork, "power_cost" = POWER_WALL_TOTAL, "spawn_dir" = SOUTH) -/turf/closed/wall/shuttle/fabrication_vals(mob/living/user, obj/item/clockwork/replica_fabricator/fabricator, silent) //two sheets of metal - return list("operation_time" = 50, "new_obj_type" = /turf/closed/wall/clockwork, "power_cost" = POWER_WALL_TOTAL - (POWER_METAL * 2), "spawn_dir" = SOUTH) - /turf/closed/wall/r_wall/fabrication_vals(mob/living/user, obj/item/clockwork/replica_fabricator/fabricator, silent) return FALSE diff --git a/code/game/objects/structures/false_walls.dm b/code/game/objects/structures/false_walls.dm index ab2a10e2c9..daa29df061 100644 --- a/code/game/objects/structures/false_walls.dm +++ b/code/game/objects/structures/false_walls.dm @@ -303,7 +303,7 @@ mineral = /obj/item/stack/sheet/mineral/titanium walltype = /turf/closed/wall/mineral/titanium smooth = SMOOTH_MORE - canSmoothWith = list(/turf/closed/wall/mineral/titanium, /obj/machinery/door/airlock/shuttle, /obj/machinery/door/airlock/, /turf/closed/wall/shuttle, /obj/structure/window/shuttle, /obj/structure/shuttle/engine, /obj/structure/shuttle/engine/heater, ) + canSmoothWith = list(/turf/closed/wall/mineral/titanium, /obj/machinery/door/airlock/shuttle, /obj/machinery/door/airlock, /obj/structure/window/shuttle, /obj/structure/shuttle/engine/heater) /obj/structure/falsewall/plastitanium name = "wall" diff --git a/code/game/turfs/simulated/wall/mineral_walls.dm b/code/game/turfs/simulated/wall/mineral_walls.dm index 183956cf74..05d6de5ca6 100644 --- a/code/game/turfs/simulated/wall/mineral_walls.dm +++ b/code/game/turfs/simulated/wall/mineral_walls.dm @@ -178,7 +178,7 @@ flags_1 = CAN_BE_DIRTY_1 | CHECK_RICOCHET_1 sheet_type = /obj/item/stack/sheet/mineral/titanium smooth = SMOOTH_MORE|SMOOTH_DIAGONAL - canSmoothWith = list(/turf/closed/wall/mineral/titanium, /obj/machinery/door/airlock/shuttle, /obj/machinery/door/airlock/, /turf/closed/wall/shuttle, /obj/structure/window/shuttle, /obj/structure/shuttle/engine/heater, /obj/structure/falsewall/titanium) + canSmoothWith = list(/turf/closed/wall/mineral/titanium, /obj/machinery/door/airlock/shuttle, /obj/machinery/door/airlock, /obj/structure/window/shuttle, /obj/structure/shuttle/engine/heater, /obj/structure/falsewall/titanium) /turf/closed/wall/mineral/titanium/nodiagonal smooth = SMOOTH_MORE diff --git a/code/modules/procedural_mapping/mapGenerators/shuttle.dm b/code/modules/procedural_mapping/mapGenerators/shuttle.dm index 7ce98040bb..ba877eeabb 100644 --- a/code/modules/procedural_mapping/mapGenerators/shuttle.dm +++ b/code/modules/procedural_mapping/mapGenerators/shuttle.dm @@ -3,7 +3,7 @@ /datum/mapGeneratorModule/border/shuttleWalls spawnableAtoms = list() - spawnableTurfs = list(/turf/closed/wall/shuttle = 100) + spawnableTurfs = list(/turf/closed/wall/mineral/titanium = 100) // Generators /datum/mapGenerator/shuttle/full