diff --git a/_maps/map_files/Delta/delta.dmm b/_maps/map_files/Delta/delta.dmm
index 898bd38ff73..ab1bcbb423d 100644
--- a/_maps/map_files/Delta/delta.dmm
+++ b/_maps/map_files/Delta/delta.dmm
@@ -231,42 +231,18 @@
/turf/simulated/floor/plating,
/area/hallway/secondary/entry)
"add" = (
-/turf/space,
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall_f6"
- },
+/turf/simulated/wall/mineral/titanium,
/area/shuttle/pod_1)
"ade" = (
-/obj/structure/window/full/shuttle,
-/obj/structure/grille,
-/turf/simulated/shuttle/plating,
-/area/shuttle/pod_1)
-"adf" = (
-/turf/space,
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall_f10"
- },
+/obj/effect/spawner/window/shuttle,
+/turf/simulated/floor/plating,
/area/shuttle/pod_1)
"adg" = (
-/turf/space,
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall_f6"
- },
+/turf/simulated/wall/mineral/titanium,
/area/shuttle/pod_2)
"adh" = (
-/obj/structure/window/full/shuttle,
-/obj/structure/grille,
-/turf/simulated/shuttle/plating,
-/area/shuttle/pod_2)
-"adi" = (
-/turf/space,
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall_f10"
- },
+/obj/effect/spawner/window/shuttle,
+/turf/simulated/floor/plating,
/area/shuttle/pod_2)
"adt" = (
/obj/machinery/atmospherics/pipe/simple/hidden{
@@ -296,12 +272,6 @@
/obj/effect/decal/warning_stripes/northwest,
/turf/simulated/floor/plasteel,
/area/hallway/secondary/entry)
-"adw" = (
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall3"
- },
-/area/shuttle/pod_1)
"adx" = (
/obj/machinery/status_display{
density = 0;
@@ -316,14 +286,8 @@
/obj/structure/chair/comfy/shuttle{
dir = 1
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/pod_1)
-"ady" = (
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall3"
- },
-/area/shuttle/pod_2)
"adz" = (
/obj/machinery/status_display{
density = 0;
@@ -338,7 +302,7 @@
/obj/structure/chair/comfy/shuttle{
dir = 1
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/pod_2)
"adK" = (
/obj/machinery/light/small{
@@ -349,19 +313,7 @@
/area/hallway/secondary/entry)
"adL" = (
/obj/structure/shuttle/engine/propulsion/burst,
-/turf/simulated/floor/plating,
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall_f5"
- },
-/area/shuttle/pod_1)
-"adM" = (
-/obj/structure/shuttle/engine/propulsion/burst,
-/turf/simulated/floor/plating,
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall_f9"
- },
+/turf/simulated/wall/mineral/titanium,
/area/shuttle/pod_1)
"adN" = (
/turf/simulated/wall/r_wall,
@@ -375,7 +327,7 @@
/obj/structure/chair/comfy/shuttle{
dir = 1
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/pod_1)
"adP" = (
/obj/item/radio/intercom{
@@ -386,23 +338,11 @@
/obj/structure/chair/comfy/shuttle{
dir = 1
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/pod_2)
"adQ" = (
/obj/structure/shuttle/engine/propulsion/burst,
-/turf/simulated/floor/plating,
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall_f5"
- },
-/area/shuttle/pod_2)
-"adR" = (
-/obj/structure/shuttle/engine/propulsion/burst,
-/turf/simulated/floor/plating,
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall_f9"
- },
+/turf/simulated/wall/mineral/titanium,
/area/shuttle/pod_2)
"adT" = (
/obj/docking_port/stationary{
@@ -447,11 +387,11 @@
id = "pod1";
name = "escape pod 1"
},
-/obj/machinery/door/airlock/shuttle{
+/obj/machinery/door/airlock/titanium{
id_tag = "s_docking_airlock";
name = "Escape Pod Hatch"
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/pod_1)
"aee" = (
/obj/structure/shuttle/engine/propulsion{
@@ -459,7 +399,7 @@
icon_state = "propulsion";
tag = "icon-propulsion (NORTH)"
},
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating/airless,
/area/shuttle/arrival/station)
"aef" = (
/obj/machinery/door/airlock/external{
@@ -474,11 +414,11 @@
id = "pod2";
name = "escape pod 2"
},
-/obj/machinery/door/airlock/shuttle{
+/obj/machinery/door/airlock/titanium{
id_tag = "s_docking_airlock";
name = "Escape Pod Hatch"
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/pod_2)
"aey" = (
/obj/machinery/light/small{
@@ -870,9 +810,7 @@
/turf/simulated/floor/plasteel,
/area/hallway/secondary/entry)
"afM" = (
-/turf/simulated/shuttle/wall{
- icon_state = "wall3"
- },
+/turf/simulated/wall/mineral/plastitanium,
/area/shuttle/arrival/station)
"afN" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -994,19 +932,6 @@
/obj/effect/decal/warning_stripes/east,
/turf/simulated/floor/plasteel,
/area/hallway/secondary/entry)
-"agi" = (
-/turf/space,
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall_f6"
- },
-/area/shuttle/arrival/station)
-"agj" = (
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall12"
- },
-/area/shuttle/arrival/station)
"agk" = (
/obj/structure/window/reinforced,
/obj/structure/shuttle/engine/heater{
@@ -1015,14 +940,7 @@
tag = "icon-heater (NORTH)"
},
/obj/effect/decal/warning_stripes/north,
-/turf/simulated/shuttle/plating,
-/area/shuttle/arrival/station)
-"agl" = (
-/turf/space,
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall_f10"
- },
+/turf/simulated/floor/plating/airless,
/area/shuttle/arrival/station)
"agm" = (
/obj/machinery/light{
@@ -1107,29 +1025,15 @@
/turf/simulated/floor/plasteel,
/area/hallway/secondary/entry)
"agD" = (
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall7"
- },
+/turf/simulated/wall/mineral/titanium/nodiagonal,
/area/shuttle/arrival/station)
"agE" = (
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall12";
- tag = "icon-swall12"
- },
+/turf/simulated/wall/mineral/titanium,
/area/shuttle/arrival/station)
"agF" = (
-/obj/structure/shuttle/window,
-/obj/structure/grille,
+/obj/effect/spawner/window/shuttle,
/turf/simulated/floor/plating,
/area/shuttle/arrival/station)
-"agG" = (
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall11"
- },
-/area/shuttle/arrival/station)
"agH" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/effect/decal/warning_stripes/east,
@@ -1159,12 +1063,6 @@
},
/turf/simulated/wall/r_wall,
/area/engine/mechanic_workshop/hanger)
-"agS" = (
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall3"
- },
-/area/shuttle/arrival/station)
"agT" = (
/obj/item/clothing/suit/storage/hazardvest,
/obj/item/clothing/suit/storage/hazardvest,
@@ -1175,26 +1073,26 @@
/obj/item/clothing/head/hardhat/orange,
/obj/item/clothing/head/hardhat/orange,
/obj/structure/closet/crate/internals,
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/arrival/station)
"agU" = (
/obj/structure/closet/wardrobe/mixed,
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/arrival/station)
"agV" = (
/obj/structure/table/reinforced,
/obj/item/storage/toolbox/emergency,
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/arrival/station)
"agW" = (
/obj/structure/table/reinforced,
/obj/item/storage/firstaid/regular,
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/arrival/station)
"agX" = (
/obj/structure/table/reinforced,
/obj/machinery/cell_charger,
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/arrival/station)
"agY" = (
/obj/structure/table/reinforced,
@@ -1395,23 +1293,23 @@
/turf/simulated/floor/plasteel,
/area/hallway/secondary/entry)
"ahB" = (
-/obj/machinery/door/airlock/shuttle{
+/obj/machinery/door/airlock/titanium{
id_tag = "s_docking_airlock"
},
/obj/effect/decal/warning_stripes/east,
/turf/simulated/floor/plasteel,
/area/shuttle/arrival/station)
"ahC" = (
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/arrival/station)
"ahD" = (
/obj/effect/landmark{
name = "HONKsquad"
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/arrival/station)
"ahE" = (
-/obj/machinery/door/airlock/shuttle{
+/obj/machinery/door/airlock/titanium{
id_tag = "s_docking_airlock"
},
/obj/effect/decal/warning_stripes/west,
@@ -1508,12 +1406,12 @@
/area/hallway/secondary/entry)
"ahV" = (
/obj/item/twohanded/required/kirbyplants,
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/arrival/station)
"ahW" = (
/obj/machinery/hologram/holopad,
/obj/machinery/light,
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/arrival/station)
"ahX" = (
/obj/structure/closet/secure_closet/security,
@@ -1598,7 +1496,7 @@
/obj/structure/chair/comfy/shuttle{
dir = 4
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/arrival/station)
"aim" = (
/obj/effect/landmark{
@@ -1607,14 +1505,7 @@
/obj/structure/chair/comfy/shuttle{
dir = 8
},
-/turf/simulated/shuttle/floor,
-/area/shuttle/arrival/station)
-"ain" = (
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall2";
- tag = "icon-swall2"
- },
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/arrival/station)
"aio" = (
/obj/machinery/light{
@@ -1778,8 +1669,8 @@
/obj/structure/flora/ausbushes/lavendergrass,
/obj/structure/flora/ausbushes/ppflowers,
/obj/structure/flora/ausbushes/stalkybush,
-/obj/structure/shuttle/window,
-/turf/simulated/floor/plating,
+/obj/structure/window/full/shuttle,
+/turf/simulated/floor/grass,
/area/shuttle/arrival/station)
"aiH" = (
/obj/structure/chair{
@@ -1857,7 +1748,7 @@
/obj/structure/chair/comfy/shuttle{
dir = 4
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/arrival/station)
"aiV" = (
/obj/effect/landmark{
@@ -1866,7 +1757,7 @@
/obj/structure/chair/comfy/shuttle{
dir = 8
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/arrival/station)
"aiW" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
@@ -1995,19 +1886,13 @@
/obj/structure/table/reinforced,
/obj/item/clipboard,
/obj/item/toy/figure/assistant,
-/turf/simulated/shuttle/floor,
-/area/shuttle/arrival/station)
-"ajE" = (
-/turf/simulated/shuttle/wall{
- dir = 3;
- icon_state = "swall1"
- },
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/arrival/station)
"ajF" = (
/obj/structure/table/reinforced,
/obj/item/folder,
/obj/item/storage/pill_bottle/dice,
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/arrival/station)
"ajG" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -2079,7 +1964,7 @@
dir = 1;
in_use = 1
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/arrival/station)
"akb" = (
/obj/machinery/status_display{
@@ -2208,24 +2093,24 @@
/obj/structure/table/reinforced,
/obj/item/paper_bin,
/obj/item/pen,
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/arrival/station)
"akx" = (
/obj/structure/closet/wardrobe/black,
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/arrival/station)
"aky" = (
/obj/structure/closet/wardrobe/grey,
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/arrival/station)
"akz" = (
/obj/structure/closet/wardrobe/yellow,
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/arrival/station)
"akA" = (
/obj/structure/table/reinforced,
/obj/item/storage/secure/briefcase,
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/arrival/station)
"akB" = (
/turf/simulated/wall,
@@ -2331,47 +2216,19 @@
/obj/effect/decal/warning_stripes/west,
/turf/simulated/floor/plasteel,
/area/engine/mechanic_workshop)
-"akW" = (
-/turf/space,
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall_f5"
- },
-/area/shuttle/arrival/station)
-"akX" = (
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall14"
- },
-/area/shuttle/arrival/station)
"akY" = (
/obj/machinery/status_display,
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall12";
- tag = "icon-swall12"
- },
+/turf/simulated/wall/mineral/titanium,
/area/shuttle/arrival/station)
"akZ" = (
-/obj/machinery/door/airlock/shuttle{
+/obj/machinery/door/airlock/titanium{
id_tag = "s_docking_airlock"
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/arrival/station)
"ala" = (
/obj/machinery/ai_status_display,
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall12";
- tag = "icon-swall12"
- },
-/area/shuttle/arrival/station)
-"alb" = (
-/turf/space,
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall_f9"
- },
+/turf/simulated/wall/mineral/titanium,
/area/shuttle/arrival/station)
"alc" = (
/obj/machinery/door/firedoor,
@@ -2537,11 +2394,11 @@
/obj/machinery/light/small{
dir = 1
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/arrival/station)
"alw" = (
/obj/structure/chair/comfy/shuttle,
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/arrival/station)
"alx" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -2624,7 +2481,7 @@
/area/hallway/secondary/entry)
"alH" = (
/obj/structure/computerframe,
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/arrival/station)
"alI" = (
/turf/simulated/wall,
@@ -8934,9 +8791,6 @@
"ayM" = (
/turf/simulated/wall/r_wall,
/area/engine/supermatter)
-"ayN" = (
-/turf/simulated/wall/r_wall,
-/area/engine/supermatter)
"ayO" = (
/obj/structure/grille,
/obj/structure/window/plasmareinforced,
@@ -16356,9 +16210,6 @@
/obj/effect/decal/warning_stripes/southeast,
/turf/simulated/floor/plasteel,
/area/engine/controlroom)
-"aMy" = (
-/turf/simulated/wall/r_wall,
-/area/maintenance/incinerator)
"aMz" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/wall/r_wall,
@@ -24168,18 +24019,7 @@
/turf/simulated/floor/plasteel,
/area/security/prison)
"bae" = (
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall12";
- tag = "icon-swall12"
- },
-/area/shuttle/pod_3)
-"baf" = (
-/turf/space,
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall_f10"
- },
+/turf/simulated/wall/mineral/titanium,
/area/shuttle/pod_3)
"bag" = (
/obj/machinery/atmospherics/unary/outlet_injector/on{
@@ -25049,11 +24889,11 @@
id = "pod3";
name = "escape pod 3"
},
-/obj/machinery/door/airlock/shuttle{
+/obj/machinery/door/airlock/titanium{
id_tag = "s_docking_airlock";
name = "Escape Pod Hatch"
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/pod_3)
"bbJ" = (
/obj/item/radio/intercom{
@@ -25065,7 +24905,7 @@
/obj/structure/chair/comfy/shuttle{
dir = 4
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/pod_3)
"bbK" = (
/obj/machinery/status_display{
@@ -25078,12 +24918,11 @@
/obj/structure/chair/comfy/shuttle{
dir = 4
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/pod_3)
"bbL" = (
-/obj/structure/grille,
-/obj/structure/window/full/shuttle,
-/turf/simulated/shuttle/plating,
+/obj/effect/spawner/window/shuttle,
+/turf/simulated/floor/plating,
/area/shuttle/pod_3)
"bbM" = (
/obj/machinery/atmospherics/pipe/simple/visible/cyan,
@@ -25773,13 +25612,6 @@
/obj/effect/decal/warning_stripes/south,
/turf/simulated/floor/plasteel,
/area/security/prison)
-"bdj" = (
-/turf/space,
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall_f9"
- },
-/area/shuttle/pod_3)
"bdk" = (
/turf/simulated/floor/engine/plasma,
/area/atmos)
@@ -32312,12 +32144,7 @@
/obj/structure/shuttle/engine/propulsion/burst{
dir = 8
},
-/turf/simulated/floor/plating,
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall_f6";
- tag = "icon-swall_f6"
- },
+/turf/simulated/wall/mineral/titanium,
/area/shuttle/pod_3)
"bps" = (
/obj/structure/window/reinforced,
@@ -36587,17 +36414,6 @@
"bwN" = (
/turf/simulated/wall/r_wall,
/area/engine/gravitygenerator)
-"bwO" = (
-/obj/structure/shuttle/engine/propulsion/burst{
- dir = 8
- },
-/turf/simulated/floor/plating,
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall_f5";
- tag = "icon-swall_f5"
- },
-/area/shuttle/pod_3)
"bwP" = (
/turf/simulated/wall/r_wall,
/area/engine/break_room)
@@ -98546,9 +98362,7 @@
/turf/simulated/floor/plating/airless,
/area/engine/engineering)
"dCy" = (
-/turf/simulated/shuttle/wall{
- icon_state = "wall3"
- },
+/turf/simulated/wall/indestructible/riveted,
/area/toxins/test_area)
"dCz" = (
/obj/machinery/camera{
@@ -130680,9 +130494,9 @@ aGX
aJL
aGX
acF
-aMy
+aGZ
aPl
-aMy
+aGZ
aSx
aTS
aaa
@@ -130936,11 +130750,11 @@ aGX
aGX
aKo
aGX
-aMy
-aMy
+aGZ
+aGZ
aPm
-aMy
-aMy
+aGZ
+aGZ
aZY
abi
abi
@@ -131193,7 +131007,7 @@ aGY
aIq
aLl
aKY
-aMy
+aGZ
aNU
aPn
aQM
@@ -131450,11 +131264,11 @@ aGY
aIr
aJI
aKZ
-aMy
+aGZ
aNV
aPo
aQN
-aMy
+aGZ
aZY
aSN
aSN
@@ -131707,11 +131521,11 @@ aGY
aIs
aJM
aLc
-aMy
+aGZ
aNW
aPp
aQO
-aMy
+aGZ
aTU
aSN
aXa
@@ -131968,7 +131782,7 @@ aMz
aNX
aPq
aQN
-aMy
+aGZ
aZY
aSN
aXb
@@ -136064,7 +135878,7 @@ auH
avD
awH
axO
-ayN
+ayM
azY
aBi
aCg
@@ -136321,7 +136135,7 @@ auI
avE
awN
axP
-ayN
+ayM
azZ
azZ
azZ
@@ -136835,7 +136649,7 @@ auI
avG
awP
axR
-ayN
+ayM
aAb
aAb
aAb
@@ -137092,7 +136906,7 @@ auJ
avH
awQ
axS
-ayN
+ayM
aAc
aBk
aCh
@@ -147075,8 +146889,8 @@ aaa
aaa
aaa
add
-adw
-adw
+add
+add
adL
aey
acC
@@ -147588,10 +147402,10 @@ aaa
aaa
aaa
aaa
-adf
-adw
-adw
-adM
+add
+add
+add
+adL
aeA
acC
afj
@@ -148625,19 +148439,19 @@ aaa
abj
aaa
aaa
-agi
+afM
agD
-agS
+agE
ahB
-agS
+agE
agF
agF
agF
agF
-agS
+agE
ahB
-agS
-akW
+agE
+agE
aaa
aaa
aaa
@@ -148882,7 +148696,7 @@ aaa
abj
aaa
aee
-agj
+afM
agE
agT
ahC
@@ -149151,10 +148965,10 @@ ahC
ahC
ahD
akx
-akX
-agS
+agE
+agE
agF
-akW
+agE
aaa
acC
anm
@@ -149654,15 +149468,15 @@ abj
aaa
afM
afM
-agE
+agD
agW
ahC
ahW
-ain
+agD
aiG
aiG
aiG
-ajE
+agD
aka
ahC
akZ
@@ -150179,10 +149993,10 @@ ahC
ahC
ahD
akz
-akX
-agS
+agE
+agE
agF
-alb
+agE
aaa
acC
anl
@@ -150424,7 +150238,7 @@ aaa
abj
aaa
aee
-agj
+afM
agE
agT
ahC
@@ -150681,19 +150495,19 @@ aaa
abj
aaa
aaa
-agl
-agG
-agS
+afM
+agD
+agE
ahE
-agS
+agE
agF
agF
agF
agF
-agS
+agE
ahE
-agS
-alb
+agE
+agE
aaa
aaa
aaa
@@ -151701,8 +151515,8 @@ aaa
aaa
aaa
adg
-ady
-ady
+adg
+adg
adQ
aey
acC
@@ -152214,10 +152028,10 @@ aaa
aaa
aaa
aaa
-adi
-ady
-ady
-adR
+adg
+adg
+adg
+adQ
aeA
acC
afj
@@ -168982,7 +168796,7 @@ abj
aMq
bpr
bbI
-bwO
+bpr
aMq
abj
abj
@@ -169751,9 +169565,9 @@ aaa
aaa
aaa
aaa
-baf
+bae
bbL
-bdj
+bae
aaa
aaa
aaa
diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm
index 93c553ce679..a4730f26f86 100644
--- a/_maps/map_files/MetaStation/MetaStation.dmm
+++ b/_maps/map_files/MetaStation/MetaStation.dmm
@@ -97,12 +97,7 @@
/area/solar/auxport)
"abK" = (
/obj/structure/shuttle/engine/propulsion/burst,
-/turf/simulated/floor/plating,
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall_f5";
- tag = "icon-swall_f5"
- },
+/turf/simulated/wall/mineral/titanium,
/area/shuttle/pod_2)
"abL" = (
/obj/structure/cable,
@@ -373,23 +368,11 @@
},
/area/security/permabrig)
"acu" = (
-/turf/space,
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall_f6"
- },
+/turf/simulated/wall/mineral/titanium,
/area/shuttle/pod_2)
"acv" = (
-/obj/structure/window/full/shuttle,
-/obj/structure/grille,
-/turf/simulated/shuttle/plating,
-/area/shuttle/pod_2)
-"acw" = (
-/turf/space,
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall_f10"
- },
+/obj/effect/spawner/window/shuttle,
+/turf/simulated/floor/plating,
/area/shuttle/pod_2)
"acx" = (
/obj/structure/cable{
@@ -464,20 +447,6 @@
icon_state = "floorgrime"
},
/area/security/permabrig)
-"acG" = (
-/turf/space,
-/turf/simulated/shuttle/wall{
- dir = 8;
- icon_state = "diagonalWall3"
- },
-/area/space/nearstation)
-"acH" = (
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall3";
- tag = "icon-swall3"
- },
-/area/shuttle/pod_2)
"acI" = (
/obj/machinery/status_display{
density = 0;
@@ -490,15 +459,8 @@
/obj/structure/chair/comfy/shuttle{
dir = 1
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/pod_2)
-"acJ" = (
-/turf/space,
-/turf/simulated/shuttle/wall{
- dir = 1;
- icon_state = "diagonalWall3"
- },
-/area/space/nearstation)
"acK" = (
/obj/item/beach_ball/holoball,
/obj/structure/holohoop{
@@ -546,7 +508,7 @@
/obj/structure/chair/comfy/shuttle{
dir = 1
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/pod_2)
"acQ" = (
/obj/item/soap/nanotrasen,
@@ -664,15 +626,6 @@
icon_state = "floorgrime"
},
/area/security/permabrig)
-"acY" = (
-/obj/structure/shuttle/engine/propulsion/burst,
-/turf/simulated/floor/plating,
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall_f9";
- tag = "icon-swall_f9"
- },
-/area/shuttle/pod_2)
"acZ" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/structure/cable/yellow{
@@ -764,14 +717,14 @@
},
/area/security/hos)
"adh" = (
-/obj/machinery/door/airlock/shuttle{
+/obj/machinery/door/airlock/titanium{
name = "Escape Pod Airlock"
},
/obj/docking_port/mobile/pod{
id = "pod2";
name = "escape pod 2"
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/pod_2)
"adi" = (
/obj/structure/cable{
@@ -1900,17 +1853,7 @@
/turf/space,
/area/solar/auxstarboard)
"afH" = (
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall12"
- },
-/area/shuttle/pod_3)
-"afI" = (
-/turf/space,
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall_f10"
- },
+/turf/simulated/wall/mineral/titanium,
/area/shuttle/pod_3)
"afO" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
@@ -2122,7 +2065,7 @@
name = "\improper Recreation Area"
})
"agh" = (
-/obj/machinery/door/airlock/shuttle{
+/obj/machinery/door/airlock/titanium{
name = "Escape Pod Airlock"
},
/obj/docking_port/mobile/pod{
@@ -2130,7 +2073,7 @@
id = "pod3";
name = "escape pod 3"
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/pod_3)
"agi" = (
/obj/item/radio/intercom{
@@ -2139,7 +2082,7 @@
/obj/structure/chair/comfy/shuttle{
dir = 4
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/pod_3)
"agj" = (
/obj/machinery/door/firedoor,
@@ -2152,9 +2095,8 @@
},
/area/security/podbay)
"agk" = (
-/obj/structure/grille,
-/obj/structure/window/full/shuttle,
-/turf/simulated/shuttle/plating,
+/obj/effect/spawner/window/shuttle,
+/turf/simulated/floor/plating,
/area/shuttle/pod_3)
"agm" = (
/turf/simulated/floor/plasteel{
@@ -2383,13 +2325,6 @@
/obj/structure/lattice/catwalk,
/turf/space,
/area/solar/auxstarboard)
-"agI" = (
-/turf/space,
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall_f9"
- },
-/area/shuttle/pod_3)
"agL" = (
/obj/effect/spawner/window/reinforced,
/obj/structure/cable/yellow{
@@ -2868,11 +2803,7 @@
/obj/structure/shuttle/engine/propulsion/burst{
dir = 8
},
-/turf/simulated/floor/plating,
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall_f6"
- },
+/turf/simulated/wall/mineral/titanium,
/area/shuttle/pod_3)
"ahI" = (
/obj/machinery/door_control{
@@ -3906,16 +3837,6 @@
tag = "icon-whitehall (WEST)"
},
/area/security/brig)
-"ajs" = (
-/obj/structure/shuttle/engine/propulsion/burst{
- dir = 8
- },
-/turf/simulated/floor/plating,
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall_f5"
- },
-/area/shuttle/pod_3)
"ajv" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 8
@@ -4000,14 +3921,7 @@
/obj/structure/shuttle/engine/propulsion/burst{
dir = 8
},
-/turf/simulated/floor/plasteel{
- dir = 5;
- icon_state = "vault"
- },
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall_f6"
- },
+/turf/simulated/wall/mineral/titanium,
/area/shuttle/pod_4)
"ajB" = (
/turf/simulated/wall/r_wall,
@@ -4034,7 +3948,7 @@
/obj/structure/chair/comfy/shuttle{
dir = 4
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/pod_3)
"ajE" = (
/obj/machinery/power/apc{
@@ -9172,19 +9086,6 @@
/area/maintenance/fpmaint2{
name = "Port Maintenance"
})
-"atI" = (
-/obj/structure/shuttle/engine/propulsion/burst{
- dir = 8
- },
-/turf/simulated/floor/plasteel{
- dir = 5;
- icon_state = "vault"
- },
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall_f5"
- },
-/area/shuttle/pod_4)
"atJ" = (
/obj/structure/table,
/obj/item/weldingtool,
@@ -10270,10 +10171,7 @@
/turf/simulated/floor/plating,
/area/maintenance/auxsolarstarboard)
"avN" = (
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall12"
- },
+/turf/simulated/wall/mineral/titanium,
/area/shuttle/pod_4)
"avO" = (
/obj/item/radio/intercom/department/security,
@@ -10712,7 +10610,7 @@
/obj/structure/chair/comfy/shuttle{
dir = 4
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/pod_4)
"awE" = (
/obj/machinery/space_heater,
@@ -22239,23 +22137,11 @@
/turf/simulated/floor/plating/airless,
/area/space/nearstation)
"aSq" = (
-/turf/space,
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall_f6"
- },
+/turf/simulated/wall/mineral/titanium,
/area/shuttle/pod_1)
"aSr" = (
-/obj/structure/window/full/shuttle,
-/obj/structure/grille,
-/turf/simulated/shuttle/plating,
-/area/shuttle/pod_1)
-"aSs" = (
-/turf/space,
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall_f10"
- },
+/obj/effect/spawner/window/shuttle,
+/turf/simulated/floor/plating,
/area/shuttle/pod_1)
"aSt" = (
/obj/item/storage/toolbox/mechanical,
@@ -23049,13 +22935,6 @@
},
/turf/simulated/floor/plating/airless,
/area/space/nearstation)
-"aTN" = (
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall3";
- tag = "icon-swall3"
- },
-/area/shuttle/pod_1)
"aTO" = (
/obj/effect/spawner/lootdrop/maintenance,
/obj/structure/cable{
@@ -23681,7 +23560,7 @@
/obj/structure/chair/comfy/shuttle{
dir = 1
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/pod_1)
"aUX" = (
/obj/machinery/door/poddoor{
@@ -24518,7 +24397,7 @@
/obj/structure/chair/comfy/shuttle{
dir = 1
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/pod_1)
"aWs" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -24658,23 +24537,18 @@
name = "\improper Captain's Quarters"
})
"aWF" = (
-/obj/machinery/door/airlock/shuttle{
+/obj/machinery/door/airlock/titanium{
name = "Escape Pod Airlock"
},
/obj/docking_port/mobile/pod{
id = "pod1";
name = "escape pod 1"
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/pod_1)
"aWG" = (
/obj/structure/shuttle/engine/propulsion/burst,
-/turf/simulated/floor/plating,
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall_f5";
- tag = "icon-swall_f5"
- },
+/turf/simulated/wall/mineral/titanium,
/area/shuttle/pod_1)
"aWH" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on{
@@ -26068,15 +25942,6 @@
/area/quartermaster/office{
name = "\improper Cargo Office"
})
-"aZz" = (
-/obj/structure/shuttle/engine/propulsion/burst,
-/turf/simulated/floor/plating,
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall_f9";
- tag = "icon-swall_f9"
- },
-/area/shuttle/pod_1)
"aZA" = (
/obj/structure/table,
/obj/item/hatchet,
@@ -31181,45 +31046,17 @@
/turf/simulated/floor/bluegrid,
/area/turret_protected/ai)
"bin" = (
-/turf/space,
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall_f6";
- tag = "icon-swall_f6"
- },
-/area/shuttle/arrival/station)
-"bio" = (
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall12";
- tag = "icon-swall12"
- },
+/turf/simulated/wall/mineral/titanium,
/area/shuttle/arrival/station)
"bip" = (
-/obj/machinery/door/airlock/shuttle{
+/obj/machinery/door/airlock/titanium{
name = "Arrivals Shuttle Airlock"
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/plating,
/area/shuttle/arrival/station)
"biq" = (
-/obj/structure/grille,
-/obj/structure/shuttle/window,
-/turf/simulated/shuttle/plating,
-/area/shuttle/arrival/station)
-"bir" = (
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall14";
- tag = "icon-swall14"
- },
-/area/shuttle/arrival/station)
-"bis" = (
-/turf/space,
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall_f10";
- tag = "icon-swall_f10"
- },
+/obj/effect/spawner/window/shuttle,
+/turf/simulated/floor/plating,
/area/shuttle/arrival/station)
"bit" = (
/obj/machinery/firealarm{
@@ -32171,13 +32008,6 @@
},
/turf/simulated/floor/bluegrid,
/area/turret_protected/ai)
-"bjZ" = (
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall11";
- tag = "icon-swall11"
- },
-/area/shuttle/arrival/station)
"bka" = (
/obj/structure/table,
/obj/item/storage/firstaid/regular{
@@ -32188,18 +32018,18 @@
dir = 1;
in_use = 1
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/arrival/station)
"bkb" = (
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/arrival/station)
"bkc" = (
/obj/machinery/computer/arcade,
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/arrival/station)
"bkd" = (
/obj/structure/closet/wardrobe/green,
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/arrival/station)
"bke" = (
/obj/structure/closet/wardrobe/black,
@@ -32212,7 +32042,7 @@
dir = 1;
in_use = 1
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/arrival/station)
"bkf" = (
/obj/structure/closet/wardrobe/mixed,
@@ -32221,11 +32051,11 @@
icon_state = "map-right-MS";
pixel_y = 32
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/arrival/station)
"bkg" = (
/obj/structure/closet/wardrobe/grey,
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/arrival/station)
"bkh" = (
/obj/machinery/camera{
@@ -32237,14 +32067,7 @@
dir = 1;
in_use = 1
},
-/turf/simulated/shuttle/floor,
-/area/shuttle/arrival/station)
-"bki" = (
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall7";
- tag = "icon-swall7"
- },
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/arrival/station)
"bkj" = (
/obj/item/crowbar,
@@ -32944,14 +32767,6 @@
icon_state = "vault"
},
/area/engine/break_room)
-"blz" = (
-/turf/space,
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall_f10";
- layer = 2
- },
-/area/shuttle/pod_4)
"blA" = (
/obj/item/radio/intercom{
pixel_y = 25
@@ -32959,12 +32774,11 @@
/obj/structure/chair/comfy/shuttle{
dir = 4
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/pod_4)
"blB" = (
-/obj/structure/shuttle/window,
-/obj/structure/grille,
-/turf/simulated/shuttle/plating,
+/obj/effect/spawner/window/shuttle,
+/turf/simulated/floor/plating,
/area/shuttle/pod_4)
"blC" = (
/obj/effect/spawner/window,
@@ -33138,30 +32952,17 @@
/area/construction/hallway{
name = "\improper MiniSat Exterior"
})
-"blO" = (
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall3"
- },
-/area/shuttle/arrival/station)
"blP" = (
/obj/machinery/light{
dir = 1;
in_use = 1
},
/obj/structure/chair/comfy/shuttle,
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/arrival/station)
"blQ" = (
/obj/structure/chair/comfy/shuttle,
-/turf/simulated/shuttle/floor,
-/area/shuttle/arrival/station)
-"blR" = (
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall3";
- tag = "icon-swall3"
- },
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/arrival/station)
"blS" = (
/obj/effect/landmark{
@@ -33170,13 +32971,13 @@
/obj/structure/chair/comfy/shuttle{
dir = 8
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/arrival/station)
"blT" = (
/obj/effect/landmark{
name = "JoinLate"
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/arrival/station)
"blU" = (
/obj/structure/shuttle/engine/heater{
@@ -33187,7 +32988,7 @@
/obj/structure/window/reinforced{
dir = 8
},
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating/airless,
/area/shuttle/arrival/station)
"blV" = (
/obj/structure/shuttle/engine/propulsion{
@@ -33195,7 +32996,7 @@
icon_state = "burst_r";
tag = "icon-burst_r (WEST)"
},
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating/airless,
/area/shuttle/arrival/station)
"blW" = (
/obj/machinery/light{
@@ -34381,10 +34182,10 @@
icon_state = "propulsion";
tag = "icon-propulsion (WEST)"
},
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating/airless,
/area/shuttle/arrival/station)
"bnG" = (
-/obj/machinery/door/airlock/shuttle{
+/obj/machinery/door/airlock/titanium{
name = "Escape Pod Airlock"
},
/obj/docking_port/mobile/pod{
@@ -34392,14 +34193,7 @@
id = "pod4";
name = "escape pod 4"
},
-/turf/simulated/shuttle/floor,
-/area/shuttle/pod_4)
-"bnH" = (
-/turf/space,
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall_f9"
- },
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/pod_4)
"bnI" = (
/obj/machinery/door/airlock/external{
@@ -34543,7 +34337,7 @@
/obj/effect/landmark{
name = "Observer-Start"
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/arrival/station)
"bnW" = (
/obj/structure/closet/crate,
@@ -35298,13 +35092,6 @@
},
/turf/simulated/floor/plasteel,
/area/engine/break_room)
-"bpl" = (
-/turf/space,
-/turf/simulated/shuttle/wall{
- dir = 4;
- icon_state = "diagonalWall3"
- },
-/area/maintenance/starboard)
"bpm" = (
/obj/effect/decal/warning_stripes/north,
/turf/simulated/floor/plasteel,
@@ -35379,13 +35166,13 @@
/obj/structure/chair/comfy/shuttle{
dir = 1
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/arrival/station)
"bpx" = (
/obj/structure/chair/comfy/shuttle{
dir = 1
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/arrival/station)
"bpy" = (
/obj/machinery/conveyor_switch/oneway{
@@ -36465,25 +36252,17 @@
icon_state = "dark"
},
/area/turret_protected/ai)
-"bro" = (
-/turf/space,
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall_f5";
- tag = "icon-swall_f5"
- },
-/area/shuttle/arrival/station)
"brp" = (
/obj/structure/closet/emcloset,
/obj/machinery/light,
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/arrival/station)
"brq" = (
/obj/item/radio/intercom{
name = "Station Intercom (General)";
pixel_y = -29
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/arrival/station)
"brr" = (
/obj/structure/sign/double/map/left{
@@ -36492,7 +36271,7 @@
pixel_y = -32
},
/obj/machinery/light,
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/arrival/station)
"brs" = (
/obj/structure/sign/double/map/right{
@@ -36500,7 +36279,7 @@
icon_state = "map-right-MS";
pixel_y = -32
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/arrival/station)
"brt" = (
/obj/machinery/requests_console{
@@ -36508,7 +36287,7 @@
pixel_y = -30
},
/obj/machinery/light,
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/arrival/station)
"bru" = (
/obj/structure/shuttle/engine/propulsion{
@@ -36516,7 +36295,7 @@
icon_state = "burst_l";
tag = "icon-burst_l (WEST)"
},
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating/airless,
/area/shuttle/arrival/station)
"brv" = (
/obj/structure/cable/yellow{
@@ -37573,27 +37352,6 @@
/area/turret_protected/tcomeast{
name = "\improper MiniSat East Wing"
})
-"bth" = (
-/obj/machinery/door/airlock/shuttle{
- name = "Arrivals Shuttle Airlock"
- },
-/turf/simulated/shuttle/plating,
-/area/shuttle/arrival/station)
-"bti" = (
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall13";
- tag = "icon-swall13"
- },
-/area/shuttle/arrival/station)
-"btj" = (
-/turf/space,
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall_f9";
- tag = "icon-swall_f9"
- },
-/area/shuttle/arrival/station)
"btk" = (
/obj/effect/spawner/window/reinforced,
/obj/machinery/door/poddoor/shutters{
@@ -63917,12 +63675,6 @@
/area/toxins/xenobiology{
name = "\improper Secure Lab"
})
-"cnX" = (
-/obj/machinery/atmospherics/pipe/simple/visible{
- dir = 2
- },
-/turf/simulated/wall/r_wall,
-/area/maintenance/incinerator)
"cnY" = (
/obj/machinery/atmospherics/pipe/simple,
/obj/machinery/meter,
@@ -66983,9 +66735,6 @@
},
/turf/simulated/floor/plating/airless,
/area/space/nearstation)
-"ctu" = (
-/turf/simulated/wall/r_wall,
-/area/maintenance/incinerator)
"ctv" = (
/obj/machinery/door/poddoor{
id_tag = "turbinevent";
@@ -76410,9 +76159,7 @@
name = "\improper Toxins Lab"
})
"cJG" = (
-/turf/simulated/shuttle/wall{
- icon_state = "wall3"
- },
+/turf/simulated/wall/indestructible/riveted,
/area/toxins/test_area)
"cJH" = (
/obj/structure/bed/roller,
@@ -88579,27 +88326,6 @@
/obj/structure/sign/pods,
/turf/simulated/wall,
/area/engine/break_room)
-"dgS" = (
-/turf/simulated/wall/r_wall,
-/area/toxins/mixing{
- name = "\improper Toxins Lab"
- })
-"dgT" = (
-/obj/machinery/atmospherics/pipe/simple/visible{
- dir = 4
- },
-/turf/simulated/wall/r_wall,
-/area/toxins/mixing{
- name = "\improper Toxins Lab"
- })
-"dgU" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/turf/simulated/wall/r_wall,
-/area/toxins/server{
- name = "\improper Research Division Server Room"
- })
"dgW" = (
/obj/machinery/computer/camera_advanced/xenobio,
/turf/simulated/floor/plasteel{
@@ -90346,6 +90072,9 @@
/area/toxins/xenobiology{
name = "\improper Secure Lab"
})
+"mXy" = (
+/turf/simulated/floor/mineral/titanium,
+/area/shuttle/arrival/station)
"nbq" = (
/obj/structure/cable/yellow{
d1 = 4;
@@ -91206,6 +90935,12 @@
},
/turf/simulated/floor/plating,
/area/maintenance/starboard)
+"rJJ" = (
+/obj/machinery/door/airlock/titanium{
+ name = "Arrivals Shuttle Airlock"
+ },
+/turf/simulated/floor/mineral/titanium,
+/area/shuttle/arrival/station)
"rKu" = (
/obj/structure/window/reinforced{
dir = 1
@@ -101010,7 +100745,7 @@ aaa
aaa
aaa
aaa
-acG
+aWD
aWD
aWD
aWD
@@ -101267,8 +101002,8 @@ aaa
aaa
aaa
aSq
-aTN
-aTN
+aSq
+aSq
aWG
ayC
vaO
@@ -101536,10 +101271,10 @@ abq
abq
aaa
bin
-blO
+bin
biq
-blO
-bro
+bin
+bin
aaa
abq
abq
@@ -101780,10 +101515,10 @@ aaa
aaa
aaa
aaa
-aSs
-aTN
-aTN
-aZz
+aSq
+aSq
+aSq
+aWG
aYg
aZj
baJ
@@ -101792,11 +101527,11 @@ bhR
aaa
abq
aaa
-bio
+bin
blP
-bkb
+mXy
bpw
-bio
+bin
aaa
abq
aaa
@@ -102038,7 +101773,7 @@ aaa
abq
aaa
aaa
-acJ
+aWD
aWD
aWD
aXS
@@ -102049,11 +101784,11 @@ aUN
abq
abq
aaa
-bio
+bin
blQ
-bkb
+mXy
bpx
-bio
+bin
aaa
abq
abq
@@ -102306,12 +102041,12 @@ aWD
aaa
aaa
bin
-bjZ
-blR
-bip
-blR
-bjZ
-bro
+bin
+bin
+rJJ
+bin
+bin
+bin
aaa
aaa
aWD
@@ -102562,13 +102297,13 @@ dgx
aUN
aUN
aUN
-bio
+bin
bka
-bkb
-bkb
-bkb
+mXy
+mXy
+mXy
brp
-bio
+bin
aUN
aUN
aUN
@@ -102825,7 +102560,7 @@ blS
blS
blS
bkb
-bth
+bip
bdR
bzw
bdR
@@ -103076,13 +102811,13 @@ dgx
aUN
aUN
aUN
-bio
+bin
bkc
blT
blT
blT
brq
-bio
+bin
aUN
aUN
aUN
@@ -103590,13 +103325,13 @@ bBt
dgx
bhb
aUN
-bio
+bin
bke
blT
bnV
blT
brr
-bio
+bin
aUN
bAQ
baJ
@@ -103847,13 +103582,13 @@ dgo
beO
bhW
aUN
-bio
+bin
bkf
blS
blS
blS
brs
-bio
+bin
aUN
bhb
bzz
@@ -104361,13 +104096,13 @@ dgx
aUN
aUN
aUN
-bio
+bin
bkh
blS
blS
blS
brt
-bio
+bin
aUN
aUN
aUN
@@ -104620,9 +104355,9 @@ aYg
bdR
bip
bkb
-bkb
-bkb
-bkb
+mXy
+mXy
+mXy
bkb
bip
bdR
@@ -104875,13 +104610,13 @@ dgx
aUN
aUN
aUN
-bir
-bki
+bin
+bin
blU
blU
blU
-bki
-bti
+bin
+bin
aUN
aUN
aUN
@@ -105132,13 +104867,13 @@ bcR
beP
aUN
aaa
-bis
+bin
blV
bnF
bnF
bnF
bru
-btj
+bin
aaa
aUN
bzA
@@ -116126,7 +115861,7 @@ aaa
abq
abq
aaa
-acG
+acN
abB
abB
abB
@@ -116383,8 +116118,8 @@ aaa
abq
aaa
acu
-acH
-acH
+acu
+acu
abK
adv
adV
@@ -116896,10 +116631,10 @@ aaa
aaa
abq
aaa
-acw
-acH
-acH
-acY
+acu
+acu
+acu
+abK
djL
adW
abB
@@ -117154,7 +116889,7 @@ aaa
abq
aaa
aaa
-acJ
+acN
acN
acN
acN
@@ -123434,10 +123169,10 @@ cdM
cFL
cdM
cEy
-dgS
-dgS
+cEK
+cEK
cBN
-dgS
+cEK
cOk
cOi
cPc
@@ -123691,11 +123426,11 @@ cHz
cHL
cIE
cJz
-dgS
+cEK
cKx
cKx
cKx
-dgU
+cNn
cOj
cPd
cPZ
@@ -123948,11 +123683,11 @@ cFx
cGG
cHA
cJz
-dgS
+cEK
cfH
cfH
cfH
-dgU
+cNn
cPi
cPe
cQa
@@ -124205,11 +123940,11 @@ cFy
cGH
cKv
cLn
-dgS
+cEK
cNd
chu
chu
-dgU
+cNn
cOl
cPf
dcd
@@ -124462,11 +124197,11 @@ cFz
cGI
cIK
cLQ
-dgS
+cEK
cgL
chu
cke
-dgU
+cNn
cJL
cPg
cKN
@@ -124719,11 +124454,11 @@ cFA
cGI
cIJ
cLG
-dgS
-dgT
+cEK
+cKB
chE
-dgT
-dgU
+cKB
+cNn
cOn
cPh
cQd
@@ -129762,7 +129497,7 @@ aaa
afb
ahH
agh
-ajs
+ahH
afb
ajb
ajp
@@ -130016,7 +129751,7 @@ aaa
aaa
abq
aaa
-cKI
+afb
afH
agi
afH
@@ -130273,7 +130008,7 @@ aaa
aaa
abq
aaa
-acJ
+afb
afH
ajD
afH
@@ -130531,9 +130266,9 @@ aaa
abq
abq
abe
-afI
+afH
agk
-agI
+afH
aeN
air
air
@@ -131641,9 +131376,9 @@ sdQ
cor
clA
clA
-ctu
-ctu
-ctu
+clA
+clA
+clA
cyn
ctt
abq
@@ -131898,10 +131633,10 @@ jmm
bul
clB
cqr
-cnX
+clB
bQA
-ctu
-ctu
+clA
+clA
cyu
abq
aaa
@@ -132414,8 +132149,8 @@ clD
cqI
cNm
cuO
-ctu
-ctu
+clA
+clA
cyu
abq
aaa
@@ -132669,9 +132404,9 @@ blr
clA
clA
clA
-ctu
+clA
bSl
-ctu
+clA
csp
arA
abq
@@ -137742,7 +137477,7 @@ aaa
aoG
ajA
bnG
-atI
+ajA
axh
azf
dAH
@@ -137996,7 +137731,7 @@ aaa
aaa
aaa
aaa
-cKI
+aoG
avN
blA
avN
@@ -138253,11 +137988,11 @@ aaa
aaa
aaa
aaa
-acJ
+aoG
avN
awD
avN
-bpl
+aoG
aoG
asJ
axh
@@ -138511,9 +138246,9 @@ aaa
aaa
aaa
aaa
-blz
+avN
blB
-bnH
+avN
aaa
aoG
asJ
diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_animal_hospital.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_animal_hospital.dmm
index c19abad2f7f..03fd9835019 100644
--- a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_animal_hospital.dmm
+++ b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_animal_hospital.dmm
@@ -256,7 +256,7 @@
/turf/simulated/floor/plasteel,
/area/ruin/powered/animal_hospital)
"aF" = (
-/obj/machinery/door/airlock/shuttle{
+/obj/machinery/door/airlock/titanium{
name = "Restroom"
},
/obj/effect/turf_decal/tile/bar,
@@ -809,7 +809,7 @@
/turf/simulated/floor/plasteel/white,
/area/ruin/powered/animal_hospital)
"cg" = (
-/obj/machinery/door/airlock/shuttle{
+/obj/machinery/door/airlock/titanium{
name = "Break Room"
},
/obj/effect/turf_decal/tile/blue{
@@ -821,39 +821,39 @@
/turf/simulated/floor/plasteel/white,
/area/ruin/powered/animal_hospital)
"ch" = (
-/obj/machinery/door/airlock/shuttle{
+/obj/machinery/door/airlock/titanium{
name = "Operating Theatre"
},
/turf/simulated/floor/plasteel/white,
/area/ruin/powered/animal_hospital)
"ci" = (
/obj/structure/fans/tiny/invisible,
-/obj/machinery/door/airlock/shuttle{
+/obj/machinery/door/airlock/titanium{
desc = "There's a smudged note wedged into it that says something about pizza dropoffs.";
name = "Staff Entrance"
},
/turf/simulated/floor/plating,
/area/ruin/powered/animal_hospital)
"cj" = (
-/obj/machinery/door/airlock/shuttle{
+/obj/machinery/door/airlock/titanium{
name = "Morgue"
},
/turf/simulated/floor/plating,
/area/ruin/powered/animal_hospital)
"ck" = (
-/obj/machinery/door/airlock/shuttle{
+/obj/machinery/door/airlock/titanium{
name = "Medical Supplies"
},
/turf/simulated/floor/plasteel/white,
/area/ruin/powered/animal_hospital)
"cl" = (
-/obj/machinery/door/airlock/shuttle{
+/obj/machinery/door/airlock/titanium{
name = "Safety Supplies"
},
/turf/simulated/floor/plasteel/white,
/area/ruin/powered/animal_hospital)
"cm" = (
-/obj/machinery/door/airlock/shuttle{
+/obj/machinery/door/airlock/titanium{
name = "Storage"
},
/turf/simulated/floor/plating,
@@ -988,7 +988,7 @@
/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
"cG" = (
-/obj/machinery/door/airlock/shuttle{
+/obj/machinery/door/airlock/titanium{
desc = "There's a smudged note wedged into it that says something about pizza dropoffs.";
name = "Staff Entrance"
},
diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_golem_ship.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_golem_ship.dmm
index 8fdc459c863..8e007e8396f 100644
--- a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_golem_ship.dmm
+++ b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_golem_ship.dmm
@@ -1,32 +1,32 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
-"aa" = (
+"a" = (
/turf/template_noop,
/area/template_noop)
-"ab" = (
-/turf/simulated/wall/mineral/titanium,
+"b" = (
+/turf/simulated/wall/mineral/titanium/nodiagonal,
/area/shuttle/freegolem)
-"ac" = (
+"c" = (
/obj/structure/fans/tiny,
-/obj/machinery/door/airlock/shuttle,
-/turf/simulated/shuttle/plating,
+/obj/machinery/door/airlock/titanium,
+/turf/simulated/floor/plating,
/area/shuttle/freegolem)
-"ad" = (
+"d" = (
/obj/structure/closet/crate/golemgear,
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating,
/area/shuttle/freegolem)
-"ae" = (
+"e" = (
/obj/item/storage/toolbox/mechanical,
/obj/item/reagent_containers/spray/cleaner,
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating,
/area/shuttle/freegolem)
-"af" = (
-/turf/simulated/shuttle/plating,
+"f" = (
+/turf/simulated/floor/plating,
/area/shuttle/freegolem)
-"ag" = (
+"g" = (
/obj/structure/reagent_dispensers/watertank/high,
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating,
/area/shuttle/freegolem)
-"ah" = (
+"h" = (
/obj/structure/shuttle/engine/heater{
icon_state = "heater";
dir = 4
@@ -34,131 +34,73 @@
/obj/structure/window/reinforced{
dir = 8
},
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating,
/area/shuttle/freegolem)
-"ai" = (
+"i" = (
/obj/structure/shuttle/engine/propulsion{
dir = 4;
icon_state = "burst_l"
},
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating,
/area/shuttle/freegolem)
-"aj" = (
+"j" = (
/obj/machinery/light/small,
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating,
/area/shuttle/freegolem)
-"ak" = (
+"k" = (
/obj/structure/reagent_dispensers/watertank,
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating,
/area/shuttle/freegolem)
-"al" = (
-/obj/structure/table/wood,
-/obj/item/disk/design_disk/golem_shell,
-/obj/item/areaeditor/golem,
-/turf/simulated/shuttle/floor{
- icon_state = "floor5"
- },
+"l" = (
+/obj/machinery/door/airlock/titanium,
+/turf/simulated/floor/mineral/titanium/purple,
/area/shuttle/freegolem)
-"am" = (
+"m" = (
/obj/machinery/vending/hydronutrients,
-/turf/simulated/shuttle/floor{
- icon_state = "floor5"
- },
+/turf/simulated/floor/mineral/titanium/purple,
/area/shuttle/freegolem)
-"an" = (
+"n" = (
/obj/machinery/vending/hydroseeds,
-/turf/simulated/shuttle/floor{
- icon_state = "floor5"
- },
+/turf/simulated/floor/mineral/titanium/purple,
/area/shuttle/freegolem)
-"ao" = (
+"o" = (
/obj/machinery/light{
dir = 1;
on = 1
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor5"
- },
+/turf/simulated/floor/mineral/titanium/purple,
/area/shuttle/freegolem)
-"ap" = (
-/turf/simulated/shuttle/floor{
- icon_state = "floor5"
- },
+"p" = (
+/turf/simulated/floor/mineral/titanium/purple,
/area/shuttle/freegolem)
-"aq" = (
-/turf/simulated/shuttle/wall{
- icon_state = "swallc2";
- dir = 2
- },
-/area/shuttle/freegolem)
-"ar" = (
-/obj/effect/mob_spawn/human/golem/adamantine,
-/turf/simulated/shuttle/floor{
- icon_state = "floor5"
- },
-/area/shuttle/freegolem)
-"as" = (
-/obj/machinery/vending/coffee/free,
-/turf/simulated/shuttle/floor{
- icon_state = "floor5"
- },
-/area/shuttle/freegolem)
-"at" = (
+"q" = (
/obj/machinery/mineral/equipment_vendor/golem,
-/turf/simulated/shuttle/floor{
- icon_state = "floor5"
- },
+/turf/simulated/floor/mineral/titanium/purple,
/area/shuttle/freegolem)
-"au" = (
-/obj/machinery/door/airlock/shuttle,
+"r" = (
+/obj/machinery/door/airlock/titanium,
/obj/structure/fans/tiny,
-/turf/simulated/shuttle/floor{
- icon_state = "floor5"
- },
+/turf/simulated/floor/mineral/titanium/purple,
/area/shuttle/freegolem)
-"av" = (
-/turf/simulated/shuttle/wall{
- icon_state = "swall12";
- dir = 2
- },
-/area/shuttle/freegolem)
-"aw" = (
-/obj/machinery/door/airlock/shuttle,
-/turf/simulated/shuttle/floor{
- icon_state = "floor5"
- },
-/area/shuttle/freegolem)
-"ax" = (
+"s" = (
/obj/machinery/light{
dir = 8
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor5"
- },
+/turf/simulated/floor/mineral/titanium/purple,
/area/shuttle/freegolem)
-"ay" = (
+"t" = (
+/obj/effect/mob_spawn/human/golem/adamantine,
+/turf/simulated/floor/mineral/titanium/purple,
+/area/shuttle/freegolem)
+"u" = (
/obj/machinery/mineral/ore_redemption/golem,
-/turf/simulated/shuttle/floor{
- icon_state = "floor5"
- },
+/turf/simulated/floor/mineral/titanium/purple,
/area/shuttle/freegolem)
-"az" = (
-/turf/simulated/shuttle/wall{
- icon_state = "swallc1";
- dir = 2
- },
+"v" = (
+/obj/effect/spawner/window/shuttle,
+/turf/simulated/floor/plating,
/area/shuttle/freegolem)
-"aA" = (
-/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
-/area/ruin/powered/golem_ship)
-"aB" = (
-/obj/structure/window/full/shuttle{
- icon_state = "16"
- },
-/obj/structure/grille,
-/turf/simulated/shuttle/plating,
-/area/shuttle/freegolem)
-"aC" = (
+"w" = (
/obj/structure/statue/gold/rd{
name = "statue of the Liberator"
},
@@ -166,32 +108,28 @@
dir = 4;
pixel_x = 0
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor5"
- },
+/turf/simulated/floor/mineral/titanium/purple,
/area/shuttle/freegolem)
-"aD" = (
+"x" = (
/obj/structure/computerframe,
-/turf/simulated/shuttle/floor{
- icon_state = "floor5"
- },
+/turf/simulated/floor/mineral/titanium/purple,
/area/shuttle/freegolem)
-"aE" = (
-/turf/simulated/shuttle/wall{
- icon_state = "swall3";
- dir = 2
- },
+"y" = (
+/obj/structure/table/wood,
+/obj/item/resonator,
+/turf/simulated/floor/mineral/titanium/purple,
/area/shuttle/freegolem)
-"aF" = (
+"z" = (
/obj/structure/extinguisher_cabinet{
pixel_y = 30
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor5"
- },
+/turf/simulated/floor/mineral/titanium/purple,
/area/shuttle/freegolem)
-"aG" = (
-/obj/machinery/door/airlock/shuttle,
+"A" = (
+/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
+/area/ruin/powered/golem_ship)
+"B" = (
+/obj/machinery/door/airlock/titanium,
/obj/structure/fans/tiny,
/obj/docking_port/stationary{
area_type = /area/ruin/powered/golem_ship;
@@ -211,18 +149,9 @@
name = "Free Golem Ship";
width = 16
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor5"
- },
+/turf/simulated/floor/mineral/titanium/purple,
/area/shuttle/freegolem)
-"aH" = (
-/obj/structure/window/full/shuttle{
- icon_state = "15"
- },
-/obj/structure/grille,
-/turf/simulated/shuttle/plating,
-/area/shuttle/freegolem)
-"aI" = (
+"C" = (
/obj/structure/window/reinforced{
dir = 4;
pixel_x = 0
@@ -238,533 +167,474 @@
pixel_x = -4;
pixel_y = 3
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor5"
- },
+/turf/simulated/floor/mineral/titanium/purple,
/area/shuttle/freegolem)
-"aJ" = (
+"D" = (
/obj/machinery/light,
/obj/structure/chair/comfy/purp{
icon_state = "comfychair";
dir = 1
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor5"
- },
+/turf/simulated/floor/mineral/titanium/purple,
/area/shuttle/freegolem)
-"aK" = (
-/turf/simulated/shuttle/wall{
- tag = "icon-swall13";
- icon_state = "swall13";
- dir = 2
- },
-/area/shuttle/freegolem)
-"aL" = (
-/obj/structure/fans/tiny,
-/obj/machinery/door/airlock/shuttle,
-/turf/simulated/shuttle/floor{
- icon_state = "floor5"
- },
-/area/shuttle/freegolem)
-"aM" = (
-/turf/simulated/shuttle/wall{
- tag = "icon-swall11";
- icon_state = "swall11";
- dir = 2
- },
-/area/shuttle/freegolem)
-"aN" = (
-/obj/item/resonator/upgraded,
-/turf/simulated/shuttle/floor{
- icon_state = "floor5"
- },
-/area/shuttle/freegolem)
-"aO" = (
-/obj/machinery/autolathe,
-/turf/simulated/shuttle/floor{
- icon_state = "floor5"
- },
-/area/shuttle/freegolem)
-"aP" = (
-/obj/machinery/computer/shuttle/golem_ship/recall,
-/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
-/area/ruin/powered/golem_ship)
-"aQ" = (
-/obj/structure/table/wood,
-/obj/machinery/reagentgrinder,
-/turf/simulated/shuttle/floor{
- icon_state = "floor5"
- },
-/area/shuttle/freegolem)
-"aR" = (
-/turf/simulated/shuttle/wall{
- icon_state = "swallc4"
- },
-/area/shuttle/freegolem)
-"aS" = (
-/turf/simulated/shuttle/wall{
- icon_state = "swall4";
- dir = 2
- },
-/area/shuttle/freegolem)
-"aT" = (
-/obj/machinery/light,
-/turf/simulated/shuttle/floor{
- icon_state = "floor5"
- },
-/area/shuttle/freegolem)
-"aU" = (
-/obj/structure/table/wood,
-/obj/item/resonator,
-/turf/simulated/shuttle/floor{
- icon_state = "floor5"
- },
-/area/shuttle/freegolem)
-"aV" = (
-/obj/machinery/vending/snack/free,
-/turf/simulated/shuttle/floor{
- icon_state = "floor5"
- },
-/area/shuttle/freegolem)
-"aW" = (
-/obj/structure/table/wood,
-/obj/item/storage/firstaid/brute,
-/obj/item/storage/firstaid/brute,
-/obj/item/storage/firstaid/brute,
-/turf/simulated/shuttle/floor{
- icon_state = "floor5"
- },
-/area/shuttle/freegolem)
-"aX" = (
-/obj/structure/table/wood,
-/obj/item/storage/firstaid/fire,
-/obj/item/storage/firstaid/fire,
-/obj/item/storage/firstaid/fire,
-/obj/machinery/light,
-/turf/simulated/shuttle/floor{
- icon_state = "floor5"
- },
-/area/shuttle/freegolem)
-"aY" = (
-/obj/structure/table/wood,
-/obj/item/storage/firstaid/adv,
-/obj/item/storage/firstaid/adv,
-/turf/simulated/shuttle/floor{
- icon_state = "floor5"
- },
-/area/shuttle/freegolem)
-"ba" = (
-/obj/machinery/light/small{
- dir = 1
- },
-/turf/simulated/shuttle/plating,
-/area/shuttle/freegolem)
-"bb" = (
-/obj/structure/reagent_dispensers/fueltank,
-/turf/simulated/shuttle/plating,
-/area/shuttle/freegolem)
-"bc" = (
-/obj/structure/ore_box,
-/turf/simulated/shuttle/plating,
-/area/shuttle/freegolem)
-"be" = (
+"E" = (
/obj/structure/extinguisher_cabinet{
pixel_y = -30
},
/obj/machinery/light,
-/turf/simulated/shuttle/floor{
- icon_state = "floor5"
- },
+/turf/simulated/floor/mineral/titanium/purple,
/area/shuttle/freegolem)
-"bf" = (
-/turf/simulated/shuttle/wall{
- icon_state = "swallc3";
- dir = 2
- },
+"F" = (
+/obj/structure/fans/tiny,
+/obj/machinery/door/airlock/titanium,
+/turf/simulated/floor/mineral/titanium/purple,
/area/shuttle/freegolem)
-"bh" = (
-/turf/simulated/shuttle/wall{
- tag = "icon-swall14";
- icon_state = "swall14";
- dir = 2
+"G" = (
+/obj/item/resonator/upgraded,
+/turf/simulated/floor/mineral/titanium/purple,
+/area/shuttle/freegolem)
+"H" = (
+/obj/machinery/autolathe,
+/turf/simulated/floor/mineral/titanium/purple,
+/area/shuttle/freegolem)
+"I" = (
+/obj/structure/table/wood,
+/obj/machinery/reagentgrinder,
+/turf/simulated/floor/mineral/titanium/purple,
+/area/shuttle/freegolem)
+"J" = (
+/obj/machinery/vending/coffee/free,
+/turf/simulated/floor/mineral/titanium/purple,
+/area/shuttle/freegolem)
+"K" = (
+/obj/machinery/vending/snack/free,
+/turf/simulated/floor/mineral/titanium/purple,
+/area/shuttle/freegolem)
+"L" = (
+/obj/machinery/light,
+/turf/simulated/floor/mineral/titanium/purple,
+/area/shuttle/freegolem)
+"M" = (
+/obj/structure/table/wood,
+/obj/item/storage/firstaid/brute,
+/obj/item/storage/firstaid/brute,
+/obj/item/storage/firstaid/brute,
+/turf/simulated/floor/mineral/titanium/purple,
+/area/shuttle/freegolem)
+"N" = (
+/obj/structure/table/wood,
+/obj/item/storage/firstaid/fire,
+/obj/item/storage/firstaid/fire,
+/obj/item/storage/firstaid/fire,
+/obj/machinery/light,
+/turf/simulated/floor/mineral/titanium/purple,
+/area/shuttle/freegolem)
+"O" = (
+/obj/structure/table/wood,
+/obj/item/storage/firstaid/adv,
+/obj/item/storage/firstaid/adv,
+/turf/simulated/floor/mineral/titanium/purple,
+/area/shuttle/freegolem)
+"P" = (
+/obj/machinery/computer/shuttle/golem_ship/recall,
+/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
+/area/ruin/powered/golem_ship)
+"Q" = (
+/obj/structure/table/wood,
+/obj/item/disk/design_disk/golem_shell,
+/obj/item/areaeditor/golem,
+/turf/simulated/floor/mineral/titanium/purple,
+/area/shuttle/freegolem)
+"R" = (
+/obj/machinery/light/small{
+ dir = 1
},
+/turf/simulated/floor/plating,
+/area/shuttle/freegolem)
+"S" = (
+/obj/structure/reagent_dispensers/fueltank,
+/turf/simulated/floor/plating,
+/area/shuttle/freegolem)
+"T" = (
+/obj/structure/ore_box,
+/turf/simulated/floor/plating,
/area/shuttle/freegolem)
(1,1,1) = {"
-aa
-aa
-aa
-aa
-aa
-aa
-aq
-aB
-aH
-bf
-aa
-aa
-aa
-aa
-aa
-aa
+a
+a
+a
+a
+a
+a
+b
+v
+v
+b
+a
+a
+a
+a
+a
+a
"}
(2,1,1) = {"
-aa
-aa
-aa
-aa
-aa
-aa
-av
-aC
-aI
-av
-aa
-aa
-aa
-aa
-aa
-aa
+a
+a
+a
+a
+a
+a
+b
+w
+C
+b
+a
+a
+a
+a
+a
+a
"}
(3,1,1) = {"
-aa
-aa
-aa
-aq
-aE
-au
-aR
-aD
-aJ
-ab
-au
-aE
-bf
-aa
-aa
-aa
+a
+a
+a
+b
+b
+r
+b
+x
+D
+b
+r
+b
+b
+a
+a
+a
"}
(4,1,1) = {"
-aa
-aa
-aa
-av
-am
-ap
-ax
-ap
-ap
-ax
-ap
-as
-av
-aa
-aa
-aa
+a
+a
+a
+b
+m
+p
+s
+p
+p
+s
+p
+J
+b
+a
+a
+a
"}
(5,1,1) = {"
-aa
-aa
-aa
-av
-an
-ap
-ap
-ap
-ap
-ap
-ap
-aV
-av
-aa
-aa
-aa
+a
+a
+a
+b
+n
+p
+p
+p
+p
+p
+p
+K
+b
+a
+a
+a
"}
(6,1,1) = {"
-aq
-aE
-aE
-aK
-ao
-ap
-ap
-ap
-ap
-ap
-ap
-aT
-bh
-aE
-aE
-bf
+b
+b
+b
+b
+o
+p
+p
+p
+p
+p
+p
+L
+b
+b
+b
+b
"}
(7,1,1) = {"
-av
-ad
-af
-aw
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-aw
-af
-bc
-av
+b
+d
+f
+l
+p
+p
+p
+p
+p
+p
+p
+p
+l
+f
+T
+b
"}
(8,1,1) = {"
-av
-ad
-af
-aw
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-aw
-af
-bc
-av
+b
+d
+f
+l
+p
+p
+p
+p
+p
+p
+p
+p
+l
+f
+T
+b
"}
(9,1,1) = {"
-av
-ad
-aj
-av
-ao
-ap
-ap
-ap
-ap
-ap
-ap
-aT
-av
-ba
-bc
-av
+b
+d
+j
+b
+o
+p
+p
+p
+p
+p
+p
+L
+b
+R
+T
+b
"}
(10,1,1) = {"
-av
-ad
-af
-av
-ap
-ap
-ar
-aU
-aU
-ar
-ap
-ap
-av
-af
-bc
-av
+b
+d
+f
+b
+p
+p
+t
+y
+y
+t
+p
+p
+b
+f
+T
+b
"}
(11,1,1) = {"
-av
-ad
-af
-av
-ap
-ap
-ar
-aU
-aU
-ar
-ap
-ap
-av
-af
-bc
-av
+b
+d
+f
+b
+p
+p
+t
+y
+y
+t
+p
+p
+b
+f
+T
+b
"}
(12,1,1) = {"
-av
-ad
-aj
-av
-ao
-ap
-ap
-ap
-ap
-ap
-ap
-aT
-av
-ba
-bc
-av
+b
+d
+j
+b
+o
+p
+p
+p
+p
+p
+p
+L
+b
+R
+T
+b
"}
(13,1,1) = {"
-av
-ad
-af
-aw
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-aw
-af
-bc
-av
+b
+d
+f
+l
+p
+p
+p
+p
+p
+p
+p
+p
+l
+f
+T
+b
"}
(14,1,1) = {"
-av
-ad
-af
-aw
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-aw
-af
-bc
-av
+b
+d
+f
+l
+p
+p
+p
+p
+p
+p
+p
+p
+l
+f
+T
+b
"}
(15,1,1) = {"
-av
-ae
-af
-av
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-aW
-av
-af
-ae
-av
+b
+e
+f
+b
+p
+p
+p
+p
+p
+p
+p
+M
+b
+f
+e
+b
"}
(16,1,1) = {"
-ac
-af
-aj
-av
-ao
-ap
-ap
-ap
-ap
-ap
-ap
-aX
-av
-ba
-af
-ac
+c
+f
+j
+b
+o
+p
+p
+p
+p
+p
+p
+N
+b
+R
+f
+c
"}
(17,1,1) = {"
-ac
-af
-af
-av
-ap
-ap
-ap
-ap
-ap
-aN
-ap
-aY
-av
-af
-af
-ac
+c
+f
+f
+b
+p
+p
+p
+p
+p
+G
+p
+O
+b
+f
+f
+c
"}
(18,1,1) = {"
-av
-ag
-ak
-av
-at
-ap
-ay
-ap
-ap
-aO
-aQ
-al
-av
-bb
-bb
-av
+b
+g
+k
+b
+q
+p
+u
+p
+p
+H
+I
+Q
+b
+S
+S
+b
"}
(19,1,1) = {"
-av
-ah
-ah
-av
-ah
-ah
-aS
-aF
-be
-aS
-ah
-ah
-av
-ah
-ah
-av
+b
+h
+h
+b
+h
+h
+b
+z
+E
+b
+h
+h
+b
+h
+h
+b
"}
(20,1,1) = {"
-az
-ai
-ai
-aM
-ai
-ai
-aM
-aG
-aL
-aM
-ai
-ai
-aM
-ai
-ai
-aR
+b
+i
+i
+b
+i
+i
+b
+B
+F
+b
+i
+i
+b
+i
+i
+b
"}
(21,1,1) = {"
-aa
-aa
-aa
-aa
-aa
-aa
-aA
-aA
-aA
-aP
-aa
-aa
-aa
-aa
-aa
-aa
+a
+a
+a
+a
+a
+a
+A
+A
+A
+P
+a
+a
+a
+a
+a
+a
"}
diff --git a/_maps/map_files/RandomRuins/SpaceRuins/asteroid4.dmm b/_maps/map_files/RandomRuins/SpaceRuins/asteroid4.dmm
index fb1039beb6f..166960064eb 100644
--- a/_maps/map_files/RandomRuins/SpaceRuins/asteroid4.dmm
+++ b/_maps/map_files/RandomRuins/SpaceRuins/asteroid4.dmm
@@ -31,37 +31,24 @@
/turf/simulated/floor/plating,
/area/ruin/unpowered)
"i" = (
-/turf/simulated/shuttle/wall{
- icon_state = "swall3";
- dir = 2
- },
+/turf/simulated/wall/mineral/titanium,
/area/ruin/unpowered)
"j" = (
/obj/item/shard,
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/ruin/unpowered)
"k" = (
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/ruin/unpowered)
"l" = (
/obj/structure/shuttle/engine/propulsion/burst,
-/turf/simulated/shuttle/wall{
- icon_state = "swall_s5";
- dir = 2
- },
+/turf/simulated/wall/mineral/titanium,
/area/ruin/unpowered)
"m" = (
-/obj/machinery/door/airlock/shuttle{
+/obj/machinery/door/airlock/titanium{
name = "Escape Pod Airlock"
},
-/turf/simulated/shuttle/floor,
-/area/ruin/unpowered)
-"n" = (
-/obj/structure/shuttle/engine/propulsion/burst,
-/turf/simulated/shuttle/wall{
- icon_state = "swall_s9";
- dir = 2
- },
+/turf/simulated/floor/mineral/titanium/blue,
/area/ruin/unpowered)
(1,1,1) = {"
@@ -369,7 +356,7 @@ f
f
i
i
-n
+l
a
"}
(15,1,1) = {"
diff --git a/_maps/map_files/RandomRuins/SpaceRuins/clownmime.dmm b/_maps/map_files/RandomRuins/SpaceRuins/clownmime.dmm
index 6df1793588d..853fed945a1 100644
--- a/_maps/map_files/RandomRuins/SpaceRuins/clownmime.dmm
+++ b/_maps/map_files/RandomRuins/SpaceRuins/clownmime.dmm
@@ -3,12 +3,7 @@
/turf/template_noop,
/area/template_noop)
"b" = (
-/turf/template_noop,
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall_f6";
- tag = "icon-swall_f6"
- },
+/turf/simulated/wall/mineral/titanium,
/area/space/nearstation)
"c" = (
/obj/structure/shuttle/engine/heater{
@@ -17,18 +12,10 @@
dir = 1
},
/obj/structure/window/reinforced,
-/turf/simulated/shuttle/plating,
-/area/space/nearstation)
-"d" = (
-/turf/template_noop,
-/turf/simulated/shuttle/wall{
- tag = "icon-swall_f10";
- icon_state = "swall_f10";
- dir = 2
- },
+/turf/simulated/floor/plating/airless,
/area/space/nearstation)
"e" = (
-/obj/machinery/door/unpowered/shuttle,
+/obj/machinery/door/airlock/titanium,
/turf/simulated/floor/plasteel/airless,
/area/space/nearstation)
"f" = (
@@ -48,13 +35,6 @@
/obj/effect/mob_spawn/human/mime/corpse,
/turf/simulated/floor/plasteel/airless,
/area/space/nearstation)
-"i" = (
-/turf/simulated/shuttle/wall{
- tag = "icon-swall11";
- icon_state = "swall11";
- dir = 2
- },
-/area/space/nearstation)
"j" = (
/obj/structure/closet/crate,
/obj/item/stack/ore/tranquillite,
@@ -70,25 +50,12 @@
"k" = (
/turf/simulated/floor/plasteel/airless,
/area/space/nearstation)
-"l" = (
-/turf/simulated/shuttle/wall{
- icon_state = "swall7";
- dir = 2
- },
-/area/space/nearstation)
"m" = (
/turf/simulated/mineral,
/area/space/nearstation)
"n" = (
/turf/simulated/floor/plating/asteroid/airless,
/area/space/nearstation)
-"o" = (
-/turf/simulated/floor/plating/asteroid/airless,
-/turf/simulated/shuttle/wall{
- icon_state = "swall_f5";
- dir = 2
- },
-/area/space/nearstation)
"p" = (
/obj/item/shard{
icon_state = "small"
@@ -106,14 +73,6 @@
/obj/item/stack/ore/tranquillite,
/turf/simulated/floor/plasteel/airless,
/area/space/nearstation)
-"r" = (
-/turf/template_noop,
-/turf/simulated/shuttle/wall{
- tag = "icon-swall_f9";
- icon_state = "swall_f9";
- dir = 2
- },
-/area/space/nearstation)
"s" = (
/obj/item/shard,
/turf/simulated/floor/plating/asteroid/airless,
@@ -124,27 +83,6 @@
},
/turf/simulated/floor/plasteel/airless,
/area/space/nearstation)
-"u" = (
-/turf/simulated/shuttle/wall{
- icon_state = "swall3";
- dir = 2
- },
-/area/space/nearstation)
-"v" = (
-/turf/simulated/shuttle/wall{
- tag = "icon-swall12";
- icon_state = "swall12";
- dir = 2
- },
-/area/space/nearstation)
-"w" = (
-/turf/simulated/floor/plating/asteroid/airless,
-/turf/simulated/shuttle/wall{
- tag = "icon-swall_f9";
- icon_state = "swall_f9";
- dir = 2
- },
-/area/space/nearstation)
"x" = (
/obj/effect/mob_spawn/human/clown/corpse,
/turf/simulated/floor/plasteel/airless,
@@ -176,7 +114,7 @@
/obj/structure/window/reinforced{
dir = 8
},
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating/airless,
/area/space/nearstation)
"B" = (
/obj/structure/shuttle/engine/propulsion{
@@ -189,7 +127,7 @@
icon_state = "burst_r";
tag = "icon-burst_r (WEST)"
},
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating/airless,
/area/space/nearstation)
"C" = (
/obj/effect/mob_spawn/human/corpse/clownmili,
@@ -205,7 +143,7 @@
icon_state = "propulsion_l";
tag = "icon-propulsion_l (WEST)"
},
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating/airless,
/area/space/nearstation)
"F" = (
/obj/structure/computerframe/HONKputer,
@@ -231,14 +169,7 @@
/turf/simulated/floor/plasteel/airless,
/area/space/nearstation)
"J" = (
-/obj/structure/grille,
-/obj/structure/window/reinforced,
-/obj/structure/window/reinforced{
- dir = 8
- },
-/obj/structure/window/reinforced{
- dir = 4
- },
+/obj/effect/spawner/window/shuttle,
/turf/simulated/floor/plating/airless,
/area/space/nearstation)
"K" = (
@@ -254,22 +185,6 @@
},
/turf/simulated/floor/plasteel/airless,
/area/space/nearstation)
-"M" = (
-/turf/simulated/mineral/random/labormineral,
-/turf/simulated/shuttle/wall{
- tag = "icon-swall_f5";
- icon_state = "swall_f5";
- dir = 2
- },
-/area/space/nearstation)
-"N" = (
-/turf/simulated/floor/plasteel/airless,
-/turf/simulated/shuttle/wall{
- tag = "icon-swall_f10";
- icon_state = "swall_f10";
- dir = 2
- },
-/area/space/nearstation)
"O" = (
/obj/effect/mob_spawn/human/corpse/clownoff,
/turf/simulated/floor/plasteel/airless,
@@ -297,7 +212,7 @@
icon_state = "propulsion_l";
tag = "icon-propulsion_l (WEST)"
},
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating/airless,
/area/space/nearstation)
(1,1,1) = {"
@@ -480,7 +395,7 @@ a
a
a
b
-o
+b
m
m
m
@@ -501,8 +416,8 @@ a
(10,1,1) = {"
b
e
-i
-i
+b
+b
m
m
m
@@ -587,11 +502,11 @@ m
a
"}
(14,1,1) = {"
-d
+b
e
-l
-l
-u
+b
+b
+b
m
m
n
@@ -611,8 +526,8 @@ a
(15,1,1) = {"
a
a
-d
-r
+b
+b
m
m
m
@@ -643,7 +558,7 @@ b
m
m
J
-M
+b
m
m
m
@@ -661,11 +576,11 @@ a
a
a
a
-v
+b
m
F
k
-v
+b
m
m
m
@@ -683,12 +598,12 @@ a
a
a
b
-w
+b
m
G
K
-N
-M
+b
+b
m
m
m
@@ -704,13 +619,13 @@ a
a
a
a
-v
+b
n
p
H
k
O
-v
+b
m
m
m
@@ -726,13 +641,13 @@ a
a
a
a
-v
+b
x
C
k
L
P
-v
+b
m
m
m
@@ -792,13 +707,13 @@ a
a
a
a
-v
+b
y
k
k
k
Q
-v
+b
m
a
a
@@ -814,13 +729,13 @@ a
a
a
a
-v
+b
y
k
D
k
y
-v
+b
m
a
a
@@ -836,13 +751,13 @@ a
a
a
a
-v
+b
z
D
k
k
y
-v
+b
m
a
a
@@ -858,13 +773,13 @@ a
a
a
a
-v
+b
k
k
D
D
k
-v
+b
a
a
a
@@ -880,13 +795,13 @@ a
a
a
a
-d
+b
A
A
A
A
A
-r
+b
a
a
a
diff --git a/_maps/map_files/RandomRuins/SpaceRuins/derelict4.dmm b/_maps/map_files/RandomRuins/SpaceRuins/derelict4.dmm
index ce660407cca..019d72b4145 100644
--- a/_maps/map_files/RandomRuins/SpaceRuins/derelict4.dmm
+++ b/_maps/map_files/RandomRuins/SpaceRuins/derelict4.dmm
@@ -12,17 +12,17 @@
/turf/simulated/mineral/random/high_chance,
/area/ruin/unpowered)
"e" = (
-/turf/simulated/shuttle/wall,
+/turf/simulated/wall/mineral/titanium,
/area/ruin/unpowered)
"f" = (
-/obj/machinery/door/airlock/shuttle,
+/obj/machinery/door/airlock/titanium,
/turf/simulated/floor/plating/airless,
/area/ruin/unpowered)
"g" = (
/turf/simulated/floor/plating/airless,
/area/ruin/unpowered)
"h" = (
-/turf/simulated/floor/mineral/titanium/blue,
+/turf/simulated/floor/mineral/titanium/blue/airless,
/area/ruin/unpowered)
"i" = (
/obj/structure/window/reinforced{
@@ -31,15 +31,15 @@
dir = 8
},
/obj/structure/chair/comfy/shuttle,
-/turf/simulated/floor/mineral/titanium/blue,
+/turf/simulated/floor/mineral/titanium/blue/airless,
/area/ruin/unpowered)
"j" = (
/obj/structure/chair/comfy/shuttle,
-/turf/simulated/floor/mineral/titanium/blue,
+/turf/simulated/floor/mineral/titanium/blue/airless,
/area/ruin/unpowered)
"k" = (
/obj/effect/spawner/lootdrop/crate_spawner,
-/turf/simulated/floor/mineral/titanium/blue,
+/turf/simulated/floor/mineral/titanium/blue/airless,
/area/ruin/unpowered)
"l" = (
/obj/structure/shuttle/engine/propulsion{
@@ -47,7 +47,7 @@
icon_state = "propulsion";
tag = "icon-propulsion (WEST)"
},
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating/airless,
/area/ruin/unpowered)
"m" = (
/obj/item/shard,
@@ -65,14 +65,14 @@
/area/ruin/unpowered)
"p" = (
/obj/structure/table,
-/turf/simulated/floor/mineral/titanium/blue,
+/turf/simulated/floor/mineral/titanium/blue/airless,
/area/ruin/unpowered)
"q" = (
/obj/item/shard,
/obj/structure/chair/comfy/shuttle{
dir = 8
},
-/turf/simulated/floor/mineral/titanium/blue,
+/turf/simulated/floor/mineral/titanium/blue/airless,
/area/ruin/unpowered)
"r" = (
/obj/structure/window/reinforced{
@@ -83,7 +83,7 @@
/obj/structure/chair/comfy/shuttle{
dir = 1
},
-/turf/simulated/floor/mineral/titanium/blue,
+/turf/simulated/floor/mineral/titanium/blue/airless,
/area/ruin/unpowered)
"s" = (
/obj/structure/chair/comfy/shuttle{
diff --git a/_maps/map_files/RandomRuins/SpaceRuins/dj.dmm b/_maps/map_files/RandomRuins/SpaceRuins/dj.dmm
index 57a4f32e098..334a71acb15 100644
--- a/_maps/map_files/RandomRuins/SpaceRuins/dj.dmm
+++ b/_maps/map_files/RandomRuins/SpaceRuins/dj.dmm
@@ -770,15 +770,6 @@
icon_state = "freezerfloor"
},
/area/djstation)
-"bK" = (
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/turf/simulated/wall/mineral/titanium/nodecon/tileblend{
- fixed_underlay = list("icon" = 'icons/turf/floors.dmi', "icon_state" = "dark");
- icon_state = "4-i"
- },
-/area/djstation)
"bL" = (
/obj/structure/chair/stool,
/turf/simulated/floor/plasteel{
@@ -1258,7 +1249,7 @@ bd
aV
bv
bF
-bK
+ao
ao
ao
aa
diff --git a/_maps/map_files/RandomRuins/SpaceRuins/intactemptyship.dmm b/_maps/map_files/RandomRuins/SpaceRuins/intactemptyship.dmm
index ad1ca6cf96a..3874c094d78 100644
--- a/_maps/map_files/RandomRuins/SpaceRuins/intactemptyship.dmm
+++ b/_maps/map_files/RandomRuins/SpaceRuins/intactemptyship.dmm
@@ -3,23 +3,7 @@
/turf/template_noop,
/area/template_noop)
"b" = (
-/turf/template_noop,
-/turf/simulated/shuttle/wall{
- dir = 8;
- icon_state = "diagonalWall3"
- },
-/area/ruin/powered)
-"c" = (
-/turf/simulated/shuttle/wall{
- icon_state = "wall3"
- },
-/area/ruin/powered)
-"d" = (
-/turf/template_noop,
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "diagonalWall3"
- },
+/turf/simulated/wall/mineral/plastitanium,
/area/ruin/powered)
"e" = (
/obj/structure/shuttle/engine/propulsion{
@@ -27,7 +11,7 @@
icon_state = "propulsion";
tag = "icon-propulsion (EAST)"
},
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating/airless,
/area/ruin/powered)
"f" = (
/obj/structure/window/reinforced{
@@ -38,21 +22,15 @@
icon_state = "heater";
dir = 8
},
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating/airless,
/area/ruin/powered)
"g" = (
/obj/structure/table/wood,
/obj/item/clothing/under/shorts/black,
-/turf/simulated/shuttle/floor{
- tag = "icon-floor5";
- icon_state = "floor5"
- },
+/turf/simulated/floor/mineral/titanium/purple,
/area/ruin/powered)
"h" = (
-/turf/simulated/shuttle/floor{
- tag = "icon-floor5";
- icon_state = "floor5"
- },
+/turf/simulated/floor/mineral/titanium/purple,
/area/ruin/powered)
"i" = (
/obj/structure/table,
@@ -60,117 +38,72 @@
/obj/machinery/light{
dir = 1
},
-/turf/simulated/shuttle/floor{
- tag = "icon-floor5";
- icon_state = "floor5"
- },
+/turf/simulated/floor/mineral/titanium/purple,
/area/ruin/powered)
"j" = (
/obj/structure/closet,
-/turf/simulated/shuttle/floor{
- tag = "icon-floor5";
- icon_state = "floor5"
- },
+/turf/simulated/floor/mineral/titanium/purple,
/area/ruin/powered)
"k" = (
/obj/machinery/vending/assist,
-/turf/simulated/shuttle/floor{
- tag = "icon-floor5";
- icon_state = "floor5"
- },
+/turf/simulated/floor/mineral/titanium/purple,
/area/ruin/powered)
"l" = (
/obj/structure/table/wood,
/obj/item/clothing/shoes/sandal,
-/turf/simulated/shuttle/floor{
- tag = "icon-floor5";
- icon_state = "floor5"
- },
+/turf/simulated/floor/mineral/titanium/purple,
/area/ruin/powered)
"m" = (
/obj/machinery/light{
dir = 8
},
-/turf/simulated/shuttle/floor{
- tag = "icon-floor5";
- icon_state = "floor5"
- },
+/turf/simulated/floor/mineral/titanium/purple,
/area/ruin/powered)
"n" = (
/obj/structure/table/wood,
-/turf/simulated/shuttle/floor{
- tag = "icon-floor5";
- icon_state = "floor5"
- },
+/turf/simulated/floor/mineral/titanium/purple,
/area/ruin/powered)
"o" = (
/obj/structure/table/wood,
/obj/machinery/computer/library/checkout,
-/turf/simulated/shuttle/floor{
- tag = "icon-floor5";
- icon_state = "floor5"
- },
+/turf/simulated/floor/mineral/titanium/purple,
/area/ruin/powered)
"p" = (
-/obj/structure/window/full/reinforced,
-/obj/structure/grille,
-/turf/simulated/floor/plating,
-/area/ruin/powered)
-"q" = (
-/obj/structure/grille,
-/obj/structure/window/full/reinforced,
+/obj/effect/spawner/window/reinforced,
/turf/simulated/floor/plating,
/area/ruin/powered)
"r" = (
/obj/structure/table,
/obj/item/paper_bin,
/obj/item/pen,
-/turf/simulated/shuttle/floor{
- tag = "icon-floor5";
- icon_state = "floor5"
- },
+/turf/simulated/floor/mineral/titanium/purple,
/area/ruin/powered)
"s" = (
/obj/machinery/door/poddoor{
id_tag = "strange ship";
name = "Strange Ship Blast Door"
},
-/turf/simulated/shuttle/floor{
- tag = "icon-floor5";
- icon_state = "floor5"
- },
+/turf/simulated/floor/mineral/titanium/purple,
/area/ruin/powered)
"t" = (
/obj/machinery/door/airlock/external,
-/turf/simulated/shuttle/floor{
- tag = "icon-floor5";
- icon_state = "floor5"
- },
+/turf/simulated/floor/mineral/titanium/purple,
/area/ruin/powered)
"u" = (
/obj/machinery/door/airlock/public/glass,
-/turf/simulated/shuttle/floor{
- tag = "icon-floor5";
- icon_state = "floor5"
- },
+/turf/simulated/floor/mineral/titanium/purple,
/area/ruin/powered)
"v" = (
/obj/structure/chair/comfy/shuttle{
dir = 4
},
-/turf/simulated/shuttle/floor{
- tag = "icon-floor5";
- icon_state = "floor5"
- },
+/turf/simulated/floor/mineral/titanium/purple,
/area/ruin/powered)
"w" = (
/obj/structure/table,
/obj/item/paper,
/obj/item/pen,
-/turf/simulated/shuttle/floor{
- tag = "icon-floor5";
- icon_state = "floor5"
- },
+/turf/simulated/floor/mineral/titanium/purple,
/area/ruin/powered)
"x" = (
/obj/machinery/door_control{
@@ -179,52 +112,24 @@
pixel_y = 0;
id = "strange ship"
},
-/turf/simulated/shuttle/wall{
- icon_state = "wall3"
- },
+/turf/simulated/wall/mineral/plastitanium,
/area/ruin/powered)
"y" = (
/obj/machinery/light,
-/turf/simulated/shuttle/floor{
- tag = "icon-floor5";
- icon_state = "floor5"
- },
+/turf/simulated/floor/mineral/titanium/purple,
/area/ruin/powered)
"z" = (
/mob/living/simple_animal/bot/medbot,
-/turf/simulated/shuttle/floor{
- tag = "icon-floor5";
- icon_state = "floor5"
- },
-/area/ruin/powered)
-"A" = (
-/turf/template_noop,
-/turf/simulated/shuttle/wall{
- dir = 1;
- icon_state = "diagonalWall3"
- },
+/turf/simulated/floor/mineral/titanium/purple,
/area/ruin/powered)
"B" = (
/obj/structure/chair/comfy/shuttle,
-/turf/simulated/shuttle/floor{
- tag = "icon-floor5";
- icon_state = "floor5"
- },
-/area/ruin/powered)
-"C" = (
-/turf/template_noop,
-/turf/simulated/shuttle/wall{
- dir = 4;
- icon_state = "diagonalWall3"
- },
+/turf/simulated/floor/mineral/titanium/purple,
/area/ruin/powered)
"D" = (
/obj/machinery/light,
/obj/structure/bed,
-/turf/simulated/shuttle/floor{
- tag = "icon-floor5";
- icon_state = "floor5"
- },
+/turf/simulated/floor/mineral/titanium/purple,
/area/ruin/powered)
(1,1,1) = {"
@@ -232,10 +137,10 @@ a
a
a
b
-c
+b
s
x
-d
+b
a
a
a
@@ -244,11 +149,11 @@ a
a
e
e
-c
+b
n
h
h
-c
+b
e
e
a
@@ -257,43 +162,43 @@ a
b
f
f
-c
+b
o
h
y
-c
+b
f
f
-d
+b
"}
(4,1,1) = {"
-c
+b
g
l
-c
+b
p
t
p
-c
+b
B
n
-c
+b
"}
(5,1,1) = {"
-c
+b
h
h
-c
+b
h
h
z
-c
+b
h
n
-c
+b
"}
(6,1,1) = {"
-c
+b
i
h
m
@@ -303,10 +208,10 @@ h
m
h
D
-c
+b
"}
(7,1,1) = {"
-c
+b
j
h
h
@@ -316,10 +221,10 @@ h
h
h
h
-c
+b
"}
(8,1,1) = {"
-c
+b
k
h
h
@@ -329,70 +234,70 @@ h
h
h
j
-c
+b
"}
(9,1,1) = {"
-A
-c
-c
-c
-q
+b
+b
+b
+b
+p
u
-q
-c
-c
-c
-C
+p
+b
+b
+b
+b
"}
(10,1,1) = {"
a
a
-c
+b
m
h
h
h
m
-c
+b
a
a
"}
(11,1,1) = {"
a
a
-c
+b
h
h
v
h
h
-c
+b
a
a
"}
(12,1,1) = {"
a
a
-c
+b
j
r
w
n
j
-c
+b
a
a
"}
(13,1,1) = {"
a
a
-A
-c
-c
-c
-c
-c
-C
+b
+b
+b
+b
+b
+b
+b
a
a
"}
diff --git a/_maps/map_files/RandomRuins/SpaceRuins/mechtransport.dmm b/_maps/map_files/RandomRuins/SpaceRuins/mechtransport.dmm
index f64982c332c..835b69d00fc 100644
--- a/_maps/map_files/RandomRuins/SpaceRuins/mechtransport.dmm
+++ b/_maps/map_files/RandomRuins/SpaceRuins/mechtransport.dmm
@@ -3,133 +3,84 @@
/turf/template_noop,
/area/template_noop)
"b" = (
-/turf/simulated/shuttle/wall{
- tag = "icon-swall_s6";
- icon_state = "swall_s6"
- },
+/turf/simulated/wall/mineral/titanium,
/area/ruin/powered)
"c" = (
-/obj/structure/grille,
-/obj/structure/window/full/reinforced,
+/obj/effect/spawner/window/shuttle,
/turf/simulated/floor/plating/airless,
/area/ruin/powered)
-"d" = (
-/turf/simulated/shuttle/wall{
- tag = "icon-swall_s10";
- icon_state = "swall_s10"
- },
-/area/ruin/powered)
-"e" = (
-/turf/simulated/shuttle/wall{
- tag = "icon-swall3";
- icon_state = "swall3"
- },
-/area/ruin/powered)
"f" = (
/obj/structure/closet/crate/secure/loot,
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue/airless,
/area/ruin/powered)
"g" = (
/obj/structure/table,
/obj/machinery/door_control{
id = "mecha cargo"
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue/airless,
/area/ruin/powered)
"h" = (
/obj/structure/table,
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue/airless,
/area/ruin/powered)
"i" = (
/obj/machinery/computer/shuttle,
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue/airless,
/area/ruin/powered)
"j" = (
/obj/effect/decal/cleanable/vomit,
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue/airless,
/area/ruin/powered)
"k" = (
/obj/effect/decal/remains/human,
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue/airless,
/area/ruin/powered)
"l" = (
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue/airless,
/area/ruin/powered)
"m" = (
/obj/structure/chair/comfy/shuttle{
dir = 1
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue/airless,
/area/ruin/powered)
"n" = (
/obj/machinery/computer/mecha,
-/turf/simulated/shuttle/floor,
-/area/ruin/powered)
-"o" = (
-/turf/simulated/shuttle/wall{
- tag = "icon-swall13";
- icon_state = "swall13"
- },
+/turf/simulated/floor/mineral/titanium/blue/airless,
/area/ruin/powered)
"p" = (
/obj/machinery/door/airlock/hatch,
-/turf/simulated/shuttle/floor{
- tag = "icon-floor3";
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium/airless,
/area/ruin/powered)
"q" = (
-/turf/simulated/shuttle/wall{
- tag = "icon-swall12";
- icon_state = "swall12"
- },
+/turf/simulated/wall/mineral/titanium/nodiagonal,
/area/ruin/powered)
"r" = (
-/turf/simulated/shuttle/floor{
- tag = "icon-floor3";
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium/airless,
/area/ruin/powered)
"s" = (
/obj/structure/mecha_wreckage/phazon,
-/turf/simulated/shuttle/floor{
- tag = "icon-floor2";
- icon_state = "floor2"
- },
+/turf/simulated/floor/mineral/titanium/yellow/airless,
/area/ruin/powered)
"t" = (
-/turf/simulated/shuttle/floor{
- tag = "icon-floor2";
- icon_state = "floor2"
- },
+/turf/simulated/floor/mineral/titanium/yellow/airless,
/area/ruin/powered)
"u" = (
/obj/structure/mecha_wreckage/ripley/firefighter,
-/turf/simulated/shuttle/floor{
- tag = "icon-floor2";
- icon_state = "floor2"
- },
+/turf/simulated/floor/mineral/titanium/yellow/airless,
/area/ruin/powered)
"v" = (
/obj/structure/mecha_wreckage/ripley,
-/turf/simulated/shuttle/floor{
- tag = "icon-floor2";
- icon_state = "floor2"
- },
+/turf/simulated/floor/mineral/titanium/yellow/airless,
/area/ruin/powered)
"w" = (
/obj/effect/decal/cleanable/blood/oil,
-/turf/simulated/shuttle/floor{
- tag = "icon-floor2";
- icon_state = "floor2"
- },
+/turf/simulated/floor/mineral/titanium/yellow/airless,
/area/ruin/powered)
"x" = (
/obj/effect/decal/cleanable/blood/gibs/robot/up,
-/turf/simulated/shuttle/floor{
- tag = "icon-floor2";
- icon_state = "floor2"
- },
+/turf/simulated/floor/mineral/titanium/yellow/airless,
/area/ruin/powered)
"y" = (
/obj/machinery/door/poddoor{
@@ -137,24 +88,15 @@
name = "Cargo Bay Door";
tag = ""
},
-/turf/simulated/shuttle/floor{
- tag = "icon-floor3";
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium/airless,
/area/ruin/powered)
"z" = (
/obj/effect/decal/cleanable/blood/gibs/robot,
-/turf/simulated/shuttle/floor{
- tag = "icon-floor2";
- icon_state = "floor2"
- },
+/turf/simulated/floor/mineral/titanium/yellow/airless,
/area/ruin/powered)
"A" = (
/obj/structure/mecha_wreckage/durand,
-/turf/simulated/shuttle/floor{
- tag = "icon-floor2";
- icon_state = "floor2"
- },
+/turf/simulated/floor/mineral/titanium/yellow/airless,
/area/ruin/powered)
"B" = (
/obj/item/stack/tile/plasteel{
@@ -184,10 +126,7 @@
pixel_y = 8
},
/obj/effect/decal/cleanable/blood/gibs/robot,
-/turf/simulated/shuttle/floor{
- tag = "icon-floor2";
- icon_state = "floor2"
- },
+/turf/simulated/floor/mineral/titanium/yellow/airless,
/area/ruin/powered)
"H" = (
/obj/effect/landmark/damageturf,
@@ -195,10 +134,7 @@
/area/ruin/powered)
"J" = (
/obj/structure/mecha_wreckage/odysseus,
-/turf/simulated/shuttle/floor{
- tag = "icon-floor2";
- icon_state = "floor2"
- },
+/turf/simulated/floor/mineral/titanium/yellow/airless,
/area/ruin/powered)
"K" = (
/obj/item/stack/sheet/metal,
@@ -206,46 +142,22 @@
/area/space/nearstation)
"L" = (
/obj/structure/mecha_wreckage/gygax,
-/turf/simulated/shuttle/floor{
- tag = "icon-floor3";
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium/airless,
/area/ruin/powered)
"M" = (
/turf/simulated/floor/plating/airless,
/area/space/nearstation)
-"N" = (
-/turf/simulated/shuttle/wall{
- tag = "icon-swall14";
- icon_state = "swall14"
- },
-/area/ruin/powered)
-"O" = (
-/turf/simulated/shuttle/wall{
- tag = "icon-swall_s9";
- icon_state = "swall_s9"
- },
-/area/ruin/powered)
"P" = (
/obj/item/stack/rods,
/turf/template_noop,
/area/space/nearstation)
-"Q" = (
-/turf/simulated/shuttle/wall{
- tag = "icon-swall15";
- icon_state = "swall15"
- },
-/area/ruin/powered)
"R" = (
/obj/structure/shuttle/engine/propulsion,
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating/airless,
/area/ruin/powered)
"U" = (
/obj/item/gps/ruin,
-/turf/simulated/shuttle/wall{
- tag = "icon-swall12";
- icon_state = "swall12"
- },
+/turf/simulated/wall/mineral/titanium,
/area/ruin/powered)
(1,1,1) = {"
@@ -253,10 +165,10 @@ a
a
a
b
-e
-e
-e
-e
+b
+b
+b
+b
B
D
H
@@ -267,9 +179,9 @@ a
"}
(2,1,1) = {"
b
-e
-e
-o
+b
+b
+b
r
s
w
@@ -303,7 +215,7 @@ a
c
f
k
-q
+b
r
t
x
@@ -337,7 +249,7 @@ a
c
h
m
-q
+b
r
t
v
@@ -354,7 +266,7 @@ a
c
i
n
-q
+b
r
v
t
@@ -368,10 +280,10 @@ b
R
"}
(8,1,1) = {"
-d
-e
-e
-o
+b
+b
+b
+b
r
t
t
@@ -380,24 +292,24 @@ t
w
t
r
-N
-Q
+b
+b
R
"}
(9,1,1) = {"
a
a
a
-d
-e
-e
+b
+b
+b
y
y
y
y
y
-e
-O
-d
+b
+q
+b
R
"}
diff --git a/_maps/map_files/RandomRuins/SpaceRuins/onehalf.dmm b/_maps/map_files/RandomRuins/SpaceRuins/onehalf.dmm
index b7fad56cb27..6e6e0e12f1f 100644
--- a/_maps/map_files/RandomRuins/SpaceRuins/onehalf.dmm
+++ b/_maps/map_files/RandomRuins/SpaceRuins/onehalf.dmm
@@ -813,16 +813,9 @@
/obj/effect/landmark/damageturf,
/turf/simulated/floor/plating,
/area/ruin/onehalf/hallway)
-"bW" = (
-/obj/structure/girder/reinforced,
-/turf/simulated/floor/plating/airless,
-/area/ruin/onehalf/hallway)
"bX" = (
/turf/simulated/wall/r_wall,
/area/ruin/onehalf/hallway)
-"bY" = (
-/turf/simulated/floor/plating/airless,
-/area/ruin/onehalf/hallway)
"bZ" = (
/obj/structure/disposalpipe/junction{
tag = "icon-pipe-j1 (NORTH)";
@@ -1572,7 +1565,7 @@ ag
bh
bv
bL
-bW
+bP
ck
cw
aa
@@ -1616,7 +1609,7 @@ ag
bf
bw
bO
-bY
+aj
aa
aa
cE
@@ -1662,9 +1655,9 @@ aL
bX
bX
ax
-bY
+aj
cF
-bY
+aj
ax
bX
bP
diff --git a/_maps/map_files/RandomRuins/SpaceRuins/spacebar.dmm b/_maps/map_files/RandomRuins/SpaceRuins/spacebar.dmm
index 46bb64b8c60..cf634eb3490 100644
--- a/_maps/map_files/RandomRuins/SpaceRuins/spacebar.dmm
+++ b/_maps/map_files/RandomRuins/SpaceRuins/spacebar.dmm
@@ -33,41 +33,22 @@
/turf/simulated/mineral,
/area/ruin/powered)
"aj" = (
-/turf/simulated/floor/plating/asteroid/airless,
-/turf/simulated/shuttle/wall{
- icon_state = "swall_f6";
- dir = 2
- },
+/turf/simulated/wall/mineral/titanium,
/area/ruin/powered)
"ak" = (
-/obj/structure/grille,
-/obj/structure/window/full/shuttle,
+/obj/effect/spawner/window/shuttle,
/turf/simulated/floor/plating,
/area/ruin/powered)
-"al" = (
-/turf/simulated/floor/plating/asteroid/airless,
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall_f10";
- layer = 2
- },
-/area/ruin/powered)
"am" = (
/turf/simulated/wall,
/area/ruin/powered{
name = "Space Bar"
})
-"an" = (
-/turf/simulated/shuttle/wall{
- icon_state = "swall3";
- dir = 2
- },
-/area/ruin/powered)
"ao" = (
/obj/structure/chair/comfy/shuttle{
dir = 1
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue/airless,
/area/ruin/powered)
"ap" = (
/obj/structure/table,
@@ -124,7 +105,7 @@
name = "Space Bar"
})
"ax" = (
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue/airless,
/area/ruin/powered)
"ay" = (
/obj/machinery/door/airlock{
@@ -144,25 +125,13 @@
})
"aA" = (
/obj/structure/shuttle/engine/propulsion/burst,
-/turf/simulated/floor/plating,
-/turf/simulated/shuttle/wall{
- icon_state = "swall_f5";
- dir = 2
- },
+/turf/simulated/wall/mineral/titanium,
/area/ruin/powered)
"aB" = (
-/obj/machinery/door/airlock/shuttle{
+/obj/machinery/door/airlock/titanium{
name = "Escape Pod Airlock"
},
-/turf/simulated/shuttle/floor,
-/area/ruin/powered)
-"aC" = (
-/obj/structure/shuttle/engine/propulsion/burst,
-/turf/simulated/floor/plating,
-/turf/simulated/shuttle/wall{
- icon_state = "swall_f9";
- dir = 2
- },
+/turf/simulated/floor/mineral/titanium/blue/airless,
/area/ruin/powered)
"aD" = (
/obj/machinery/door_control{
@@ -441,14 +410,6 @@
"bo" = (
/turf/simulated/floor/plating,
/area/ruin/powered)
-"bp" = (
-/obj/structure/shuttle/engine/propulsion/burst,
-/turf/simulated/floor/plating/asteroid/airless,
-/turf/simulated/shuttle/wall{
- icon_state = "swall_f5";
- dir = 2
- },
-/area/ruin/powered)
"bq" = (
/obj/machinery/door/poddoor/preopen{
id_tag = "pod cycle";
@@ -463,14 +424,6 @@
},
/turf/simulated/floor/plating,
/area/ruin/powered)
-"bs" = (
-/obj/structure/shuttle/engine/propulsion/burst,
-/turf/simulated/floor/plating/asteroid/airless,
-/turf/simulated/shuttle/wall{
- icon_state = "swall_f9";
- dir = 2
- },
-/area/ruin/powered)
"bt" = (
/obj/effect/decal/warning_stripes/south,
/turf/simulated/floor/plating,
@@ -951,8 +904,8 @@ ac
af
ag
aj
-an
-an
+aj
+aj
aA
ag
ag
@@ -1034,10 +987,10 @@ ac
af
ag
ag
-al
-an
-an
-aC
+aj
+aj
+aj
+aA
ag
ag
ag
@@ -1131,9 +1084,9 @@ ag
ag
ag
aj
-an
-an
-bp
+aj
+aj
+aA
ag
ag
ag
@@ -1214,10 +1167,10 @@ aQ
ag
ag
ag
-al
-an
-an
-bs
+aj
+aj
+aj
+aA
ag
ag
ag
diff --git a/_maps/map_files/RandomRuins/SpaceRuins/ussp.dmm b/_maps/map_files/RandomRuins/SpaceRuins/ussp.dmm
index d8d711001d0..3a657a7e054 100644
--- a/_maps/map_files/RandomRuins/SpaceRuins/ussp.dmm
+++ b/_maps/map_files/RandomRuins/SpaceRuins/ussp.dmm
@@ -1,10 +1,6 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"aa" = (
/obj/effect/landmark/burnturf,
-/turf/simulated/floor/plasteel{
- dir = 2;
- icon_state = "cautionfull"
- },
/turf/simulated/wall/mineral/titanium/nodecon/tileblend{
fixed_underlay = list("icon" = 'icons/turf/floors.dmi', "icon_state" = "cautionfull");
icon_state = "4-i"
@@ -718,9 +714,6 @@
},
/area/derelict/bridge)
"bE" = (
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
/turf/simulated/wall/mineral/titanium/nodecon/tileblend{
fixed_underlay = list("icon" = 'icons/turf/floors.dmi', "icon_state" = "dark");
icon_state = "4-i"
@@ -1206,7 +1199,7 @@
},
/area/derelict/bridge)
"cI" = (
-/obj/machinery/door/airlock/shuttle{
+/obj/machinery/door/airlock/titanium{
name = "Bathroom"
},
/obj/effect/decal/cleanable/dirt,
@@ -1665,7 +1658,7 @@
/turf/simulated/floor/plating,
/area/derelict/crew_quarters)
"dI" = (
-/obj/machinery/door/airlock/shuttle{
+/obj/machinery/door/airlock/titanium{
name = "Dormitories"
},
/turf/simulated/floor/plasteel,
@@ -1716,10 +1709,6 @@
/turf/simulated/floor/plasteel,
/area/derelict/crew_quarters)
"dO" = (
-/turf/simulated/floor/plasteel{
- dir = 2;
- icon_state = "darkredfull"
- },
/turf/simulated/wall/mineral/titanium/nodecon/tileblend{
icon_state = "4-i"
},
@@ -1927,7 +1916,7 @@
name = "Derelict Annex"
})
"ek" = (
-/obj/machinery/door/airlock/shuttle{
+/obj/machinery/door/airlock/titanium{
name = "Dormitories"
},
/turf/simulated/floor/plasteel{
@@ -2224,10 +2213,6 @@
name = "Derelict Annex"
})
"eM" = (
-/turf/simulated/floor/plasteel{
- dir = 2;
- icon_state = "purplefull"
- },
/turf/simulated/wall/mineral/titanium/nodecon/tileblend{
fixed_underlay = list("icon" = 'icons/turf/floors.dmi', "icon_state" = "purplefull");
icon_state = "4-i"
@@ -2368,10 +2353,6 @@
name = "Derelict Annex"
})
"eZ" = (
-/turf/simulated/floor/plasteel{
- dir = 2;
- icon_state = "cautionfull"
- },
/turf/simulated/wall/mineral/titanium/nodecon/tileblend{
fixed_underlay = list("icon" = 'icons/turf/floors.dmi', "icon_state" = "cautionfull");
icon_state = "4-i"
@@ -3501,10 +3482,6 @@
/obj/structure/window/reinforced{
dir = 1
},
-/turf/simulated/floor/plasteel{
- dir = 1;
- icon_state = "whiteredfull"
- },
/turf/simulated/wall/mineral/titanium/nodecon/tileblend{
fixed_underlay = list("icon" = 'icons/turf/floors.dmi', "icon_state" = "whiteredfull");
icon_state = "4-i"
@@ -3744,17 +3721,7 @@
/area/derelict/crew_quarters)
"hF" = (
/obj/structure/sign/barsign,
-/turf/simulated/shuttle/wall{
- icon_state = "swall4";
- dir = 2
- },
-/area/derelict/crew_quarters)
-"hG" = (
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall8";
- tag = "icon-swall12"
- },
+/turf/simulated/wall/mineral/titanium/nodecon,
/area/derelict/crew_quarters)
"hH" = (
/obj/machinery/door/airlock/public/glass{
@@ -4083,41 +4050,11 @@
/turf/template_noop,
/area/space/nearstation)
"ir" = (
-/obj/structure/grille,
-/obj/structure/shuttle/window{
- tag = "icon-window5_end";
- icon = 'icons/turf/shuttle.dmi';
- icon_state = "window5_end";
- dir = 2
- },
-/turf/simulated/floor/plating,
-/area/derelict/arrival)
-"is" = (
-/obj/structure/grille,
-/obj/structure/shuttle/window{
- tag = "icon-window5_mid";
- icon = 'icons/turf/shuttle.dmi';
- icon_state = "window5_mid";
- dir = 2
- },
-/turf/simulated/floor/plating,
-/area/derelict/arrival)
-"it" = (
-/obj/structure/grille,
-/obj/structure/shuttle/window{
- tag = "icon-window5_end (NORTH)";
- icon = 'icons/turf/shuttle.dmi';
- icon_state = "window5_end";
- dir = 1
- },
+/obj/effect/spawner/window/plastitanium,
/turf/simulated/floor/plating,
/area/derelict/arrival)
"iu" = (
-/turf/template_noop,
-/turf/simulated/shuttle/wall{
- dir = 8;
- icon_state = "diagonalWall3"
- },
+/turf/simulated/wall/mineral/plastitanium,
/area/derelict/arrival)
"iv" = (
/turf/simulated/floor/plasteel{
@@ -4203,11 +4140,6 @@
name = "Derelict Annex"
})
"iD" = (
-/turf/simulated/floor/engine{
- name = "vacuum floor";
- nitrogen = 0.01;
- oxygen = 0.01
- },
/turf/simulated/wall/mineral/titanium/nodecon/tileblend{
fixed_underlay = list("icon" = 'icons/turf/floors.dmi', "icon_state" = "engine");
icon_state = "4-i"
@@ -4224,13 +4156,6 @@
/area/derelict/eva{
name = "Derelict Annex"
})
-"iF" = (
-/turf/template_noop,
-/turf/simulated/shuttle/wall{
- dir = 1;
- icon_state = "diagonalWall3"
- },
-/area/derelict/arrival)
"iG" = (
/obj/item/shard{
icon_state = "medium"
@@ -4295,17 +4220,9 @@
icon_state = "chapel"
},
/area/derelict/crew_quarters)
-"iO" = (
-/turf/simulated/shuttle/wall{
- dir = 4;
- icon_state = "wall3"
- },
-/area/derelict/arrival)
"iP" = (
/obj/structure/computerframe,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/derelict/arrival)
"iQ" = (
/obj/effect/decal/remains/human{
@@ -4316,9 +4233,7 @@
/obj/structure/chair/comfy/shuttle{
dir = 8
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/derelict/arrival)
"iR" = (
/obj/structure/table,
@@ -4326,9 +4241,7 @@
dir = 4
},
/obj/item/clothing/head/soft/solgov,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/derelict/arrival)
"iS" = (
/obj/structure/closet/crate,
@@ -4490,10 +4403,7 @@
},
/area/derelict/crew_quarters)
"jh" = (
-/turf/template_noop,
-/turf/simulated/wall/mineral/titanium/nodecon/nosmooth{
- icon_state = "swall_f10"
- },
+/turf/simulated/wall/mineral/titanium/nodecon/nosmooth,
/area/derelict/eva{
name = "Derelict Annex"
})
@@ -4501,23 +4411,17 @@
/obj/machinery/light/small{
dir = 8
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/derelict/arrival)
"jj" = (
/obj/item/paper/djstation{
info = "Fuck. Fuckfuckfuck. I knew this mission was a mistake, that idiot Thomas got himself killed by some angry Russian security bot in the armoury, and the Lt. ran into the annex like a moron and got himself trapped. Now I'm just sitting on my god damn hands because this shuttle won't bloody move. Stupid USSP piece of shit docking arm must be jammed and I don't have the kit to go out and fix it.
Who the hell attacks a space station without EVA gear anyways? It's not like you can just bloody well waltz out into space with a hot coffee and shrug it off.";
name = "unknown report"
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/derelict/arrival)
"jk" = (
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/derelict/arrival)
"jl" = (
/obj/machinery/door/airlock/external{
@@ -4526,9 +4430,7 @@
name = "Shuttle Airlock";
req_access_txt = "150"
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/plating,
/area/derelict/arrival)
"jm" = (
/obj/machinery/door/airlock/external{
@@ -4654,18 +4556,6 @@
})
"jA" = (
/turf/simulated/floor/plating/airless,
-/area/derelict/eva{
- name = "Derelict Annex"
- })
-"jB" = (
-/turf/simulated/floor/engine{
- name = "vacuum floor";
- nitrogen = 0.01;
- oxygen = 0.01
- },
-/turf/simulated/wall/mineral/titanium/nodecon/nosmooth{
- icon_state = "swall_f5"
- },
/area/derelict/eva{
name = "Derelict Annex"
})
@@ -4839,17 +4729,13 @@
/obj/structure/chair/comfy/shuttle{
dir = 4
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/derelict/arrival)
"jR" = (
/obj/structure/chair/comfy/shuttle{
dir = 8
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/derelict/arrival)
"jS" = (
/turf/simulated/floor/plasteel{
@@ -4924,7 +4810,7 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/machinery/door/airlock/shuttle{
+/obj/machinery/door/airlock/titanium{
name = "Central Annex"
},
/turf/simulated/floor/plasteel,
@@ -4984,7 +4870,7 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/machinery/door/airlock/shuttle{
+/obj/machinery/door/airlock/titanium{
name = "Central Annex"
},
/obj/effect/decal/cleanable/blood/tracks{
@@ -5228,7 +5114,7 @@
layer = 3;
name = "Central Annex Lockdown"
},
-/obj/machinery/door/airlock/shuttle{
+/obj/machinery/door/airlock/titanium{
name = "Central Annex"
},
/turf/simulated/floor/plasteel,
@@ -5252,7 +5138,7 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/machinery/door/airlock/shuttle{
+/obj/machinery/door/airlock/titanium{
name = "Central Annex"
},
/obj/effect/decal/cleanable/dirt,
@@ -5739,9 +5625,7 @@
/obj/structure/chair/comfy/shuttle{
dir = 4
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/derelict/arrival)
"lu" = (
/obj/machinery/door/airlock/external{
@@ -5889,18 +5773,14 @@
/area/derelict/solar_control)
"lI" = (
/obj/structure/window/reinforced/tinted,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/derelict/arrival)
"lJ" = (
/obj/structure/window/reinforced/tinted,
/obj/machinery/light/small{
dir = 4
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/derelict/arrival)
"lK" = (
/obj/structure/dispenser/oxygen,
@@ -6086,13 +5966,7 @@
dir = 1
},
/obj/structure/shuttle/engine/propulsion,
-/turf/simulated/shuttle/plating,
-/area/derelict/arrival)
-"md" = (
-/turf/template_noop,
-/turf/simulated/shuttle/wall{
- icon_state = "diagonalWall3"
- },
+/turf/simulated/floor/plating/airless,
/area/derelict/arrival)
"me" = (
/obj/effect/decal/cleanable/dirt,
@@ -6154,13 +6028,6 @@
/area/derelict/eva{
name = "Derelict Annex"
})
-"mm" = (
-/turf/template_noop,
-/turf/simulated/shuttle/wall{
- dir = 4;
- icon_state = "diagonalWall3"
- },
-/area/derelict/arrival)
"mn" = (
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel{
@@ -6321,7 +6188,7 @@
/area/derelict/arrival)
"mI" = (
/obj/structure/sign/greencross,
-/turf/simulated/shuttle/wall,
+/turf/simulated/wall/mineral/titanium/nodecon,
/area/derelict/arrival)
"mJ" = (
/obj/structure/cable{
@@ -6700,10 +6567,6 @@
/obj/structure/window/reinforced{
dir = 8
},
-/turf/simulated/floor/plasteel{
- dir = 1;
- icon_state = "whiteredfull"
- },
/turf/simulated/wall/mineral/titanium/nodecon/tileblend{
fixed_underlay = list("icon" = 'icons/turf/floors.dmi', "icon_state" = "whiteredfull");
icon_state = "4-i"
@@ -6811,12 +6674,6 @@
icon_state = "floorscorched2"
},
/area/derelict/arrival)
-"nL" = (
-/turf/template_noop,
-/turf/simulated/wall/mineral/titanium/nodecon/nosmooth{
- icon_state = "swall_f10"
- },
-/area/space/nearstation)
"nM" = (
/obj/item/stack/tile,
/turf/simulated/floor/plating/airless,
@@ -6912,9 +6769,6 @@
name = "Derelict Annex"
})
"nU" = (
-/turf/simulated/floor/plasteel{
- icon_state = "hydrofloor"
- },
/turf/simulated/wall/mineral/titanium/nodecon/tileblend{
fixed_underlay = list("icon" = 'icons/turf/floors.dmi', "icon_state" = "hydrofloor");
icon_state = "4-i"
@@ -7066,17 +6920,6 @@
/obj/item/stack/tile,
/turf/template_noop,
/area/derelict/arrival)
-"oo" = (
-/turf/simulated/floor/plasteel/airless{
- dir = 5;
- icon_state = "green"
- },
-/turf/simulated/wall/mineral/titanium/nodecon/nosmooth{
- icon_state = "swall_f10"
- },
-/area/derelict/eva{
- name = "Derelict Annex"
- })
"op" = (
/obj/item/stack/ore/iron,
/turf/simulated/floor/plasteel/airless{
@@ -7255,12 +7098,6 @@
icon_state = "floorscorched2"
},
/area/derelict/arrival)
-"oG" = (
-/turf/template_noop,
-/turf/simulated/wall/mineral/titanium/nodecon/nosmooth{
- icon_state = "swall_f5"
- },
-/area/derelict/arrival)
"oH" = (
/obj/structure/lattice,
/obj/item/retractor,
@@ -7340,14 +7177,6 @@
/area/derelict/eva{
name = "Derelict Annex"
})
-"oQ" = (
-/turf/template_noop,
-/turf/simulated/wall/mineral/titanium/nodecon/nosmooth{
- icon_state = "swall_f5"
- },
-/area/derelict/eva{
- name = "Derelict Annex"
- })
"oR" = (
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel{
@@ -7519,10 +7348,6 @@
},
/area/derelict/crew_quarters)
"pj" = (
-/turf/simulated/floor/plasteel{
- dir = 2;
- icon_state = "orangefull"
- },
/turf/simulated/wall/mineral/titanium/nodecon/tileblend{
fixed_underlay = list("icon" = 'icons/turf/floors.dmi', "icon_state" = "orangefull");
icon_state = "4-i"
@@ -7537,7 +7362,7 @@
d2 = 2;
icon_state = "1-2"
},
-/obj/machinery/door/airlock/shuttle{
+/obj/machinery/door/airlock/titanium{
name = "Central Annex"
},
/obj/effect/decal/cleanable/dirt,
@@ -7702,12 +7527,6 @@
name = "floor"
},
/area/derelict/crew_quarters)
-"pG" = (
-/turf/template_noop,
-/turf/simulated/wall/mineral/titanium/nodecon/nosmooth{
- icon_state = "swall_f10"
- },
-/area/derelict/arrival)
"pH" = (
/obj/effect/landmark/damageturf,
/obj/item/hemostat,
@@ -7950,11 +7769,6 @@
},
/area/derelict/arrival)
"qk" = (
-/turf/simulated/floor/plasteel{
- dir = 2;
- icon_state = "redfull";
- tag = "icon-redfull (NORTHWEST)"
- },
/turf/simulated/wall/mineral/titanium/nodecon/tileblend{
fixed_underlay = list("icon" = 'icons/turf/floors.dmi', "icon_state" = "redfull");
icon_state = "4-i"
@@ -8055,7 +7869,7 @@
d2 = 2;
icon_state = "1-2"
},
-/obj/machinery/door/airlock/shuttle{
+/obj/machinery/door/airlock/titanium{
name = "Central Annex"
},
/turf/simulated/floor/plasteel,
@@ -9133,6 +8947,9 @@
},
/turf/simulated/wall/mineral/titanium/nodecon/nodiagonal,
/area/derelict/arrival)
+"QN" = (
+/turf/simulated/wall/mineral/titanium/nodecon/nosmooth,
+/area/derelict/arrival)
(1,1,1) = {"
ac
@@ -9177,13 +8994,13 @@ ac
ac
ac
iu
-iO
-iO
-iO
-iO
-iO
-iO
-md
+iu
+iu
+iu
+iu
+iu
+iu
+iu
ac
ac
ac
@@ -9360,7 +9177,7 @@ ac
ac
ac
ac
-is
+ir
iQ
jj
jk
@@ -9452,7 +9269,7 @@ ac
ac
ac
ac
-it
+ir
iR
jk
jR
@@ -9544,14 +9361,14 @@ ac
ac
ac
ac
-iF
-iO
+iu
+iu
jl
-iO
-iO
+iu
+iu
jl
-iO
-mm
+iu
+iu
ac
ac
ac
@@ -9636,14 +9453,14 @@ ac
ac
ac
ac
-aW
+QN
bn
jm
bn
bn
lu
bn
-aW
+QN
ac
ac
ac
@@ -10020,7 +9837,7 @@ nw
mG
bn
mG
-oG
+aW
ac
ai
ac
@@ -10752,7 +10569,7 @@ ac
ac
ac
ac
-nL
+pk
oc
on
oc
@@ -10766,7 +10583,7 @@ oc
oc
oc
qf
-oG
+aW
ac
ac
iq
@@ -11220,7 +11037,7 @@ ac
ac
ai
ac
-pG
+aW
aW
pI
mS
@@ -11859,8 +11676,8 @@ ii
ii
ja
jA
-oo
-oQ
+dW
+dW
ac
ac
ac
@@ -12950,7 +12767,7 @@ ac
iq
iY
iZ
-jB
+jh
kq
iD
eg
@@ -15153,7 +14970,7 @@ go
go
gV
hn
-hG
+aV
hU
hU
hT
diff --git a/_maps/map_files/RandomRuins/SpaceRuins/whiteship.dmm b/_maps/map_files/RandomRuins/SpaceRuins/whiteship.dmm
index 1ecf46d8751..96af170f3c2 100644
--- a/_maps/map_files/RandomRuins/SpaceRuins/whiteship.dmm
+++ b/_maps/map_files/RandomRuins/SpaceRuins/whiteship.dmm
@@ -3,32 +3,10 @@
/turf/template_noop,
/area/template_noop)
"ab" = (
-/turf/space,
-/turf/simulated/shuttle/wall{
- icon_state = "swall_f6";
- dir = 2
- },
-/area/shuttle/abandoned)
-"ac" = (
-/turf/simulated/shuttle/wall{
- tag = "icon-swall12";
- icon_state = "swall12";
- dir = 2
- },
-/area/shuttle/abandoned)
-"ad" = (
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
-/turf/simulated/shuttle/wall/interior{
- tag = "icon-swall_f9";
- icon_state = "swall_f9"
- },
+/turf/simulated/wall/mineral/titanium,
/area/shuttle/abandoned)
"ae" = (
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/abandoned)
"af" = (
/obj/machinery/sleeper{
@@ -38,39 +16,7 @@
dir = 1
},
/obj/effect/decal/remains/human,
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
-/area/shuttle/abandoned)
-"ag" = (
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
-/turf/simulated/shuttle/wall/interior{
- tag = "icon-swall_f5";
- icon_state = "swall_f5"
- },
-/area/shuttle/abandoned)
-"ah" = (
-/turf/simulated/shuttle/wall{
- tag = "icon-swall13";
- icon_state = "swall13";
- dir = 2
- },
-/area/shuttle/abandoned)
-"ai" = (
-/turf/simulated/shuttle/wall{
- tag = "icon-swall14";
- icon_state = "swall14";
- dir = 2
- },
-/area/shuttle/abandoned)
-"aj" = (
-/turf/space,
-/turf/simulated/shuttle/wall{
- icon_state = "swall_f10";
- dir = 2
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/abandoned)
"ak" = (
/obj/structure/shuttle/engine/propulsion{
@@ -78,20 +24,11 @@
icon_state = "burst_r";
tag = "icon-burst_r (WEST)"
},
-/turf/simulated/shuttle/plating,
-/area/shuttle/abandoned)
-"al" = (
-/turf/simulated/shuttle/wall{
- tag = "icon-swall11";
- icon_state = "swall11";
- dir = 2
- },
+/turf/simulated/floor/plating/airless,
/area/shuttle/abandoned)
"am" = (
/obj/machinery/computer/med_data,
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/abandoned)
"an" = (
/obj/structure/table,
@@ -99,23 +36,7 @@
pixel_x = 6;
pixel_y = -5
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
-/area/shuttle/abandoned)
-"ao" = (
-/turf/simulated/shuttle/wall{
- tag = "icon-swall15";
- icon_state = "swall15";
- dir = 2
- },
-/area/shuttle/abandoned)
-"ap" = (
-/turf/simulated/shuttle/plating,
-/turf/simulated/shuttle/wall/interior{
- tag = "icon-swall_f9";
- icon_state = "swall_f9"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/abandoned)
"aq" = (
/obj/structure/shuttle/engine/heater{
@@ -126,7 +47,7 @@
/obj/structure/window/reinforced{
dir = 8
},
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating/airless,
/area/shuttle/abandoned)
"ar" = (
/obj/structure/shuttle/engine/propulsion{
@@ -134,134 +55,72 @@
icon_state = "propulsion";
tag = "icon-propulsion (WEST)"
},
-/turf/simulated/shuttle/plating,
-/area/shuttle/abandoned)
-"as" = (
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
-/turf/simulated/shuttle/wall/interior{
- tag = "icon-swall_f10";
- icon_state = "swall_f10"
- },
+/turf/simulated/floor/plating/airless,
/area/shuttle/abandoned)
"at" = (
/obj/item/scalpel,
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
-/area/shuttle/abandoned)
-"au" = (
-/turf/simulated/shuttle/wall{
- tag = "icon-swall7";
- icon_state = "swall7";
- dir = 2
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/abandoned)
"av" = (
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating,
/area/shuttle/abandoned)
"aw" = (
/obj/structure/computerframe{
anchored = 1
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/abandoned)
"ax" = (
-/obj/structure/window/full/shuttle{
- icon_state = "14"
- },
-/obj/structure/grille,
-/turf/simulated/shuttle/plating,
-/area/shuttle/abandoned)
-"ay" = (
-/obj/structure/window/full/shuttle{
- dir = 10;
- icon_state = "9"
- },
-/obj/structure/grille,
-/turf/simulated/shuttle/plating,
-/area/shuttle/abandoned)
-"az" = (
-/obj/structure/window/full/shuttle{
- icon_state = "17"
- },
-/obj/structure/grille,
-/turf/simulated/shuttle/plating,
+/obj/effect/spawner/window/shuttle,
+/turf/simulated/floor/plating,
/area/shuttle/abandoned)
"aA" = (
/obj/machinery/door/airlock/public/glass{
name = "Hibernation Pods"
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/abandoned)
"aB" = (
/obj/machinery/light/small{
dir = 8
},
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating,
/area/shuttle/abandoned)
"aC" = (
/obj/structure/chair/comfy/shuttle{
dir = 1
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/abandoned)
"aD" = (
/obj/structure/table,
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
-/area/shuttle/abandoned)
-"aE" = (
-/turf/simulated/shuttle/wall{
- tag = "icon-swall3";
- icon_state = "swall3";
- dir = 2
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/abandoned)
"aF" = (
/obj/item/multitool,
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/abandoned)
"aG" = (
/obj/item/stock_parts/cell{
charge = 100;
maxcharge = 15000
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/abandoned)
"aH" = (
-/obj/machinery/door/unpowered/shuttle,
+/obj/machinery/door/airlock/titanium,
/turf/simulated/floor/plating,
/area/shuttle/abandoned)
-"aI" = (
-/turf/simulated/shuttle/plating,
-/turf/simulated/shuttle/wall/interior{
- tag = "icon-swall_f6";
- icon_state = "swall_f6"
- },
-/area/shuttle/abandoned)
"aJ" = (
/obj/structure/shuttle/engine/propulsion{
dir = 4;
icon_state = "burst_l";
tag = "icon-burst_l (WEST)"
},
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating/airless,
/area/shuttle/abandoned)
"aK" = (
-/obj/machinery/door/unpowered/shuttle,
+/obj/machinery/door/airlock/titanium,
/obj/docking_port/mobile{
dir = 8;
dwidth = 10;
@@ -277,196 +136,104 @@
id = "whiteship_away";
name = "Deep Space"
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
-/area/shuttle/abandoned)
-"aL" = (
-/obj/structure/window/full/shuttle{
- icon_state = "16"
- },
-/obj/structure/grille,
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/abandoned)
"aM" = (
/obj/structure/table,
/obj/machinery/light{
dir = 4
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
-/area/shuttle/abandoned)
-"aN" = (
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
-/turf/simulated/shuttle/wall/interior{
- tag = "icon-swall_f6";
- icon_state = "swall_f6"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/abandoned)
"aO" = (
/obj/machinery/door/airlock/public/glass,
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/abandoned)
"aP" = (
/obj/machinery/light_switch{
pixel_x = 27
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/abandoned)
"aQ" = (
/obj/machinery/portable_atmospherics/scrubber,
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
-/area/shuttle/abandoned)
-"aR" = (
-/obj/structure/grille,
-/obj/structure/window/full/shuttle{
- icon_state = "8"
- },
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/abandoned)
"aS" = (
/obj/structure/bed,
/obj/item/bedsheet,
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/abandoned)
"aT" = (
/obj/machinery/light{
dir = 8
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/abandoned)
"aU" = (
/obj/structure/table,
/obj/item/gun/energy/laser/retro,
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/abandoned)
"aV" = (
/obj/machinery/computer/shuttle/white_ship,
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
-/area/shuttle/abandoned)
-"aW" = (
-/obj/structure/grille,
-/obj/structure/window/full/shuttle,
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/abandoned)
"aX" = (
/obj/machinery/light/small{
dir = 8
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/abandoned)
"aY" = (
/obj/structure/table,
/obj/item/tank/internals/oxygen,
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
-/area/shuttle/abandoned)
-"aZ" = (
-/obj/structure/window/full/shuttle,
-/obj/structure/grille,
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/abandoned)
"ba" = (
/obj/machinery/light{
dir = 1
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/abandoned)
"bb" = (
/obj/structure/table,
/obj/item/analyzer,
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/abandoned)
"bc" = (
/obj/effect/decal/remains/human,
/obj/structure/chair/comfy/shuttle{
dir = 8
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/abandoned)
"bd" = (
/obj/machinery/door/airlock/public/glass{
name = "Living Module"
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/abandoned)
"be" = (
-/obj/machinery/door/unpowered/shuttle,
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/obj/machinery/door/airlock/titanium,
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/abandoned)
"bf" = (
/obj/machinery/light/small{
dir = 1
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/abandoned)
"bg" = (
/turf/template_noop,
/area/shuttle/abandoned)
"bh" = (
/obj/effect/decal/remains/human,
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/abandoned)
"bi" = (
/obj/machinery/portable_atmospherics/canister/oxygen,
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
-/area/shuttle/abandoned)
-"bj" = (
-/turf/space,
-/turf/simulated/shuttle/wall{
- icon_state = "swall_f9";
- dir = 2
- },
-/area/shuttle/abandoned)
-"bk" = (
-/turf/space,
-/turf/simulated/shuttle/wall{
- icon_state = "swall_f5";
- dir = 2
- },
-/area/shuttle/abandoned)
-"bl" = (
-/obj/structure/window/full/shuttle{
- icon_state = "15"
- },
-/obj/structure/grille,
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/abandoned)
"bm" = (
/obj/machinery/light_switch{
@@ -475,40 +242,30 @@
/obj/machinery/light{
dir = 4
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/abandoned)
"bn" = (
/obj/item/gps/ruin{
gpstag = "NT Medical Ship";
pixel_x = -32
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/abandoned)
"bo" = (
/obj/item/shard,
/obj/structure/chair/comfy/shuttle,
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/abandoned)
"bp" = (
/obj/structure/chair/comfy/shuttle,
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/abandoned)
"bq" = (
/obj/structure/computerframe{
anchored = 1
},
/obj/item/stack/cable_coil/cut,
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/abandoned)
"br" = (
/obj/structure/rack,
@@ -517,80 +274,50 @@
/obj/item/tank/internals/emergency_oxygen,
/obj/item/tank/internals/emergency_oxygen,
/obj/item/storage/toolbox/mechanical,
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/abandoned)
"bs" = (
/obj/structure/rack,
/obj/item/clothing/suit/space/hardsuit/medical,
/obj/item/clothing/mask/breath,
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/abandoned)
"bt" = (
/obj/structure/rack,
/obj/item/clothing/suit/space/syndicate/black/med,
/obj/item/clothing/head/helmet/space/syndicate/black/med,
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/abandoned)
"bu" = (
/obj/machinery/light/small,
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
-/area/shuttle/abandoned)
-"bv" = (
-/turf/simulated/shuttle/plating,
-/turf/simulated/shuttle/wall/interior{
- tag = "icon-swall_f5";
- icon_state = "swall_f5"
- },
-/area/shuttle/abandoned)
-"bw" = (
-/turf/simulated/shuttle/wall{
- icon_state = "swall14";
- dir = 2
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/abandoned)
"bx" = (
/obj/effect/decal/cleanable/blood{
amount = 0
},
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating,
/area/shuttle/abandoned)
"by" = (
/obj/structure/spacepoddoor,
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating,
/area/shuttle/abandoned)
"bz" = (
/obj/machinery/door/airlock/public/glass{
name = "Pod Bay"
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
-/area/shuttle/abandoned)
-"bA" = (
-/turf/simulated/shuttle/plating,
-/turf/simulated/shuttle/wall/interior{
- tag = "icon-swall_f10";
- icon_state = "swall_f10"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/abandoned)
"bB" = (
/obj/effect/decal/remains/human,
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating,
/area/shuttle/abandoned)
"bC" = (
/obj/structure/spacepoddoor,
/obj/machinery/door/poddoor/multi_tile/two_tile_ver{
id_tag = "whiteshippoddoor"
},
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating,
/area/shuttle/abandoned)
"bD" = (
/obj/machinery/door_control{
@@ -598,24 +325,18 @@
name = "Pod Door Control";
pixel_y = -24
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/abandoned)
"bE" = (
/obj/structure/table,
/obj/item/screwdriver,
/obj/machinery/light,
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/abandoned)
"bF" = (
/obj/structure/table,
/obj/item/radio,
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/abandoned)
(1,1,1) = {"
@@ -624,18 +345,18 @@ aa
aa
aa
ab
-au
-aE
-aL
-aR
-aR
-aR
-aR
-aR
-bl
-aE
-au
-bk
+ab
+ab
+ax
+ax
+ax
+ax
+ax
+ax
+ax
+ab
+ab
+ab
aa
aa
aa
@@ -646,8 +367,8 @@ aa
aa
aa
ab
-ao
-ad
+ab
+ab
ae
ae
ae
@@ -657,8 +378,8 @@ aD
ae
ae
bn
-as
-ah
+ab
+ab
aa
aa
aa
@@ -668,8 +389,8 @@ aa
aa
aa
ab
-ao
-ad
+ab
+ab
ae
ae
ae
@@ -681,7 +402,7 @@ ae
ae
bo
aw
-ac
+ab
aa
aa
aa
@@ -690,8 +411,8 @@ aa
(4,1,1) = {"
aa
ab
-al
-ah
+ab
+ab
aw
aC
ae
@@ -704,18 +425,18 @@ ae
ae
bp
bq
-bw
+ab
by
bC
-bk
+ab
aa
"}
(5,1,1) = {"
aa
-ac
+ab
am
-as
-ag
+ab
+ab
ae
ae
ae
@@ -726,19 +447,19 @@ ae
ae
ae
ae
-aN
-ah
+ab
+ab
ae
ae
-ac
+ab
aa
"}
(6,1,1) = {"
ab
-ad
+ab
ae
ae
-ac
+ab
aD
aD
aM
@@ -748,39 +469,39 @@ ae
ae
ae
bm
-aN
-ao
-ad
+ab
+ab
+ab
ae
bD
-ai
-bk
+ab
+ab
"}
(7,1,1) = {"
-ac
+ab
ae
ae
ae
-ai
-aE
-aE
-aE
-aE
-aW
+ab
+ab
+ab
+ab
+ab
+ax
aO
-aW
-aE
-au
-ao
-ad
+ax
+ab
+ab
+ab
+ab
ae
ae
ae
-as
-ah
+ab
+ab
"}
(8,1,1) = {"
-ac
+ab
ae
ae
ae
@@ -793,21 +514,21 @@ ae
ae
ae
ae
-as
-ah
+ab
+ab
br
ae
ae
ae
ae
-ac
+ab
"}
(9,1,1) = {"
-ac
+ab
af
ae
ae
-ay
+ax
ae
ae
ae
@@ -817,43 +538,43 @@ ae
ae
ae
ae
-ac
+ab
bs
ae
ae
ae
bE
-ac
+ab
"}
(10,1,1) = {"
-ac
+ab
ae
ae
at
-az
+ax
aG
ae
-aN
-aE
-aE
-aE
-aE
-ag
+ab
+ab
+ab
+ab
+ab
+ab
ae
-ac
+ab
bt
ae
ae
ae
bF
-ac
+ab
"}
(11,1,1) = {"
-ai
-ag
+ab
+ab
ae
ae
-ac
+ab
ae
ae
aO
@@ -861,48 +582,48 @@ ae
aX
ae
bh
-ac
+ab
ae
-ai
-ag
+ab
+ab
ae
ae
ae
-aN
-ah
+ab
+ab
"}
(12,1,1) = {"
-aj
-ah
+ab
+ab
an
ae
-ac
+ab
ae
ae
-ac
+ab
aS
aY
ae
aS
-ac
+ab
ae
-as
-al
-aE
+ab
+ab
+ab
bz
-au
-ao
-bj
+ab
+ab
+ab
"}
(13,1,1) = {"
aa
-ai
-ag
+ab
+ab
ae
aA
ae
ae
-ac
+ab
ae
aP
ae
@@ -913,39 +634,39 @@ ae
ae
ae
bh
-ai
-ah
+ab
+ab
aa
"}
(14,1,1) = {"
aa
-aj
-ao
-au
-ah
+ab
+ab
+ab
+ab
ae
ae
-as
-aE
-aE
-aE
-aE
-ad
+ab
+ab
+ab
+ab
+ab
+ab
ae
ae
ae
ae
-aN
-ao
-bj
+ab
+ab
+ab
aa
"}
(15,1,1) = {"
aa
aa
-aj
-ao
-ah
+ab
+ab
+ab
ae
ae
ae
@@ -957,9 +678,9 @@ ae
ae
ae
aG
-aN
-ao
-bj
+ab
+ab
+ab
aa
aa
"}
@@ -967,8 +688,8 @@ aa
aa
aa
aa
-aj
-ah
+ab
+ab
ae
ae
aP
@@ -980,8 +701,8 @@ ae
ae
ae
bu
-ai
-bj
+ab
+ab
aa
aa
aa
@@ -991,20 +712,20 @@ aa
aa
aa
ab
-al
+ab
aH
-au
-aE
-aE
-aZ
+ab
+ab
+ab
+ax
bd
-aZ
-aE
-aE
-au
+ax
+ab
+ab
+ab
aH
-al
-bk
+ab
+ab
aa
aa
aa
@@ -1013,10 +734,10 @@ aa
aa
aa
ab
-ap
+ab
aB
av
-ac
+ab
aQ
aT
ae
@@ -1024,82 +745,82 @@ ae
ae
aT
ae
-ac
+ab
av
aB
-bA
-bk
+ab
+ab
aa
aa
"}
(19,1,1) = {"
aa
ab
-ap
+ab
av
av
-aI
-ao
-ag
+ab
+ab
+ab
ae
ae
ae
ae
ae
-aN
-ao
-bv
+ab
+ab
+ab
bx
bB
-bA
-bk
+ab
+ab
aa
"}
(20,1,1) = {"
ab
-ah
+ab
aq
aq
aq
-ac
-aj
-ah
+ab
+ab
+ab
ae
ae
ae
ae
ae
-ai
-bj
-ac
+ab
+ab
+ab
aq
aq
aq
-ai
-bk
+ab
+ab
"}
(21,1,1) = {"
-aj
+ab
ak
ar
ar
ar
aJ
bg
-ai
-ag
+ab
+ab
ae
ae
ae
-aN
-ah
+ab
+ab
bg
ak
ar
ar
ar
aJ
-bj
+ab
"}
(22,1,1) = {"
aa
@@ -1109,13 +830,13 @@ aa
aa
aa
aa
-aj
-ao
-ag
+ab
+ab
+ab
ae
-aN
-ao
-bj
+ab
+ab
+ab
aa
aa
aa
@@ -1133,11 +854,11 @@ aa
aa
aa
aa
-aj
-ao
+ab
+ab
be
-ao
-bj
+ab
+ab
aa
aa
aa
@@ -1157,9 +878,9 @@ aa
aa
aa
aa
-ac
+ab
bf
-ac
+ab
aa
aa
aa
@@ -1180,10 +901,10 @@ aa
aa
aa
ab
-ao
+ab
be
-ao
-bk
+ab
+ab
aa
aa
aa
@@ -1202,11 +923,11 @@ aa
aa
aa
aa
-ai
-ad
+ab
+ab
ae
-as
-ah
+ab
+ab
aa
aa
aa
@@ -1225,11 +946,11 @@ aa
aa
aa
aa
-ac
+ab
ae
ae
ae
-ac
+ab
aa
aa
aa
@@ -1248,11 +969,11 @@ aa
aa
aa
aa
-ac
+ab
ae
ae
ae
-ac
+ab
aa
aa
aa
@@ -1271,11 +992,11 @@ aa
aa
aa
aa
-ac
+ab
ae
ae
ae
-ac
+ab
aa
aa
aa
@@ -1294,11 +1015,11 @@ aa
aa
aa
aa
-ac
+ab
ba
ae
ae
-ac
+ab
aa
aa
aa
@@ -1317,11 +1038,11 @@ aa
aa
aa
aa
-ac
+ab
ae
ae
ae
-ac
+ab
aa
aa
aa
@@ -1340,11 +1061,11 @@ aa
aa
aa
aa
-ac
+ab
ae
ae
ae
-ac
+ab
aa
aa
aa
@@ -1363,11 +1084,11 @@ aa
aa
aa
aa
-ac
+ab
ae
ae
bi
-ac
+ab
aa
aa
aa
@@ -1386,11 +1107,11 @@ aa
aa
aa
aa
-ai
-ag
+ab
+ab
ae
-aN
-ah
+ab
+ab
aa
aa
aa
@@ -1409,11 +1130,11 @@ aa
aa
aa
aa
-aj
-al
+ab
+ab
aK
-al
-bj
+ab
+ab
aa
aa
aa
diff --git a/_maps/map_files/RandomRuins/SpaceRuins/wizardcrash.dmm b/_maps/map_files/RandomRuins/SpaceRuins/wizardcrash.dmm
index 3add952e8e2..228f1580e51 100644
--- a/_maps/map_files/RandomRuins/SpaceRuins/wizardcrash.dmm
+++ b/_maps/map_files/RandomRuins/SpaceRuins/wizardcrash.dmm
@@ -65,9 +65,8 @@
/turf/simulated/floor/wood,
/area/ruin/unpowered)
"al" = (
-/obj/structure/shuttle/window,
-/obj/structure/grille,
-/turf/simulated/floor/wood,
+/obj/effect/spawner/window/shuttle,
+/turf/simulated/floor/plating/airless,
/area/ruin/unpowered)
"am" = (
/obj/structure/table/wood,
@@ -492,7 +491,7 @@
/area/ruin/unpowered)
"bG" = (
/obj/structure/shuttle/engine/propulsion,
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating/airless,
/area/ruin/unpowered)
"bH" = (
/turf/simulated/wall/mineral/titanium,
@@ -533,11 +532,6 @@
},
/turf/simulated/floor/plating,
/area/ruin/unpowered)
-"bO" = (
-/obj/structure/shuttle/window,
-/obj/structure/grille,
-/turf/space,
-/area/ruin/unpowered)
"bP" = (
/obj/item/stack/sheet/mineral/plasma,
/obj/item/stack/sheet/mineral/plasma,
@@ -709,7 +703,7 @@ ae
al
ae
ae
-bO
+al
ae
ae
ae
diff --git a/_maps/map_files/RandomZLevels/academy.dmm b/_maps/map_files/RandomZLevels/academy.dmm
index 4ae6583b295..a98fe0ef8f3 100644
--- a/_maps/map_files/RandomZLevels/academy.dmm
+++ b/_maps/map_files/RandomZLevels/academy.dmm
@@ -505,23 +505,7 @@
/turf/simulated/wall,
/area/awaymission/academy/classrooms)
"bF" = (
-/turf/simulated/shuttle/wall{
- tag = "icon-swallc2";
- icon_state = "swallc2"
- },
-/area/awaymission/academy/classrooms)
-"bG" = (
-/turf/simulated/shuttle/wall{
- tag = "icon-swall12";
- icon_state = "swall12";
- dir = 2
- },
-/area/awaymission/academy/classrooms)
-"bH" = (
-/turf/simulated/shuttle/wall{
- tag = "icon-swallc1";
- icon_state = "swallc1"
- },
+/turf/simulated/wall/mineral/titanium,
/area/awaymission/academy/classrooms)
"bI" = (
/obj/machinery/light{
@@ -638,13 +622,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel,
/area/awaymission/academy/classrooms)
-"bW" = (
-/turf/simulated/shuttle/wall{
- tag = "icon-swall3";
- icon_state = "swall3";
- dir = 2
- },
-/area/awaymission/academy/classrooms)
"bX" = (
/obj/effect/decal/cleanable/ash,
/turf/simulated/floor/engine,
@@ -782,12 +759,6 @@
},
/turf/simulated/floor/plasteel,
/area/awaymission/academy/classrooms)
-"cs" = (
-/turf/simulated/shuttle/wall{
- tag = "icon-swall1";
- icon_state = "swall1"
- },
-/area/awaymission/academy/classrooms)
"ct" = (
/obj/structure/chair,
/turf/simulated/floor/plasteel,
@@ -11565,9 +11536,9 @@ aa
aa
bs
bF
-bW
-bW
-cs
+bF
+bF
+bF
cA
cA
cP
@@ -11694,7 +11665,7 @@ aa
aa
aa
bs
-bG
+bF
bX
bZ
bZ
@@ -11824,7 +11795,7 @@ aa
aa
aP
bs
-bG
+bF
bY
bZ
bZ
@@ -11954,7 +11925,7 @@ aa
aP
aP
bs
-bG
+bF
bZ
bZ
bZ
@@ -12084,7 +12055,7 @@ aP
aP
aa
bs
-bG
+bF
bZ
bX
bZ
@@ -12214,7 +12185,7 @@ ab
aP
aP
bs
-bG
+bF
ca
bZ
bZ
@@ -12344,7 +12315,7 @@ aP
aa
aa
bs
-bG
+bF
bZ
bZ
bZ
@@ -12474,10 +12445,10 @@ aP
aa
aa
bs
-bH
-bW
-bW
-cs
+bF
+bF
+bF
+bF
cC
cC
cR
diff --git a/_maps/map_files/RandomZLevels/beach.dmm b/_maps/map_files/RandomZLevels/beach.dmm
index eb5e1193f4a..534b95b9523 100644
--- a/_maps/map_files/RandomZLevels/beach.dmm
+++ b/_maps/map_files/RandomZLevels/beach.dmm
@@ -836,25 +836,8 @@
icon_state = "wood"
},
/area/awaymission/beach)
-"cP" = (
-/turf/simulated/shuttle/wall{
- tag = "icon-swall8";
- icon_state = "swall8"
- },
-/area/awaymission/beach)
"cQ" = (
-/turf/unsimulated/beach/sand,
-/turf/simulated/shuttle/wall{
- tag = "icon-swall_f6";
- icon_state = "swall_f6"
- },
-/area/awaymission/beach)
-"cR" = (
-/turf/unsimulated/beach/sand,
-/turf/simulated/shuttle/wall{
- tag = "icon-swall_f10";
- icon_state = "swall_f10"
- },
+/turf/simulated/wall/mineral/titanium,
/area/awaymission/beach)
"cS" = (
/obj/structure/closet/gmcloset{
@@ -997,12 +980,6 @@
/obj/structure/flora/ausbushes/sunnybush,
/turf/unsimulated/beach/sand,
/area/awaymission/beach)
-"dp" = (
-/turf/simulated/shuttle/wall{
- tag = "icon-swall3";
- icon_state = "swall3"
- },
-/area/awaymission/beach)
"dq" = (
/turf/unsimulated/floor{
tag = "icon-wood";
@@ -1167,7 +1144,7 @@
/obj/structure/chair/comfy/shuttle{
dir = 4
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/awaymission/beach)
"dS" = (
/obj/machinery/light{
@@ -1177,7 +1154,7 @@
/obj/structure/chair/comfy/shuttle{
dir = 8
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/awaymission/beach)
"dT" = (
/obj/effect/overlay/palmtree_l,
@@ -1190,9 +1167,8 @@
/turf/unsimulated/beach/sand,
/area/awaymission/beach)
"dU" = (
-/obj/structure/grille,
-/obj/structure/shuttle/window,
-/turf/simulated/floor/plating/airless,
+/obj/effect/spawner/window/shuttle,
+/turf/simulated/floor/plating,
/area/awaymission/beach)
"dV" = (
/obj/structure/flora/rock,
@@ -1209,35 +1185,21 @@
/obj/item/paper,
/turf/unsimulated/beach/sand,
/area/awaymission/beach)
-"dY" = (
-/turf/unsimulated/beach/sand,
-/turf/simulated/shuttle/wall{
- tag = "icon-swall_f5";
- icon_state = "swall_f5"
- },
-/area/awaymission/beach)
"dZ" = (
/obj/structure/chair/comfy/shuttle{
dir = 4
},
-/turf/simulated/shuttle/floor,
-/area/awaymission/beach)
-"ea" = (
-/turf/unsimulated/beach/sand,
-/turf/simulated/shuttle/wall{
- tag = "icon-swall_f9";
- icon_state = "swall_f9"
- },
+/turf/simulated/floor/mineral/titanium/blue,
/area/awaymission/beach)
"eb" = (
/obj/structure/chair/comfy/shuttle{
dir = 8
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/awaymission/beach)
"ec" = (
/obj/machinery/computer,
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/awaymission/beach)
"ed" = (
/obj/structure/closet/crate,
@@ -1259,16 +1221,16 @@
/mob/living/simple_animal/hostile/pirate{
loot = list(/obj/effect/mob_spawn/human/corpse/pirate)
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/awaymission/beach)
"eh" = (
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/awaymission/beach)
"ei" = (
/obj/structure/chair/comfy/shuttle{
dir = 1
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/awaymission/beach)
"ej" = (
/obj/structure/table/wood,
@@ -1283,8 +1245,8 @@
/turf/unsimulated/beach/sand,
/area/awaymission/beach)
"el" = (
-/obj/machinery/door/unpowered/shuttle,
-/turf/simulated/shuttle/floor,
+/obj/machinery/door/airlock/titanium,
+/turf/simulated/floor/mineral/titanium/blue,
/area/awaymission/beach)
"em" = (
/obj/item/beach_ball,
@@ -1327,7 +1289,7 @@
/area/awaymission/beach)
"et" = (
/obj/structure/shuttle/engine/heater,
-/turf/simulated/floor/plating/airless,
+/turf/simulated/floor/plating,
/area/awaymission/beach)
"eu" = (
/obj/structure/table/wood,
@@ -1349,7 +1311,7 @@
/obj/structure/shuttle/engine/propulsion{
icon_state = "propulsion_l"
},
-/turf/simulated/floor/plating/airless,
+/turf/simulated/floor/plating,
/area/awaymission/beach)
"ey" = (
/obj/effect/waterfall{
@@ -1362,11 +1324,11 @@
/obj/structure/shuttle/engine/propulsion{
icon_state = "propulsion_r"
},
-/turf/simulated/floor/plating/airless,
+/turf/simulated/floor/plating,
/area/awaymission/beach)
"eA" = (
/obj/structure/shuttle/engine/propulsion,
-/turf/simulated/floor/plating/airless,
+/turf/simulated/floor/plating,
/area/awaymission/beach)
"eB" = (
/obj/effect/waterfall{
@@ -15747,13 +15709,13 @@ bj
bj
bj
cQ
-dp
-dp
+cQ
+cQ
el
el
-dp
-dp
-dY
+cQ
+cQ
+cQ
bj
bj
cb
@@ -16003,7 +15965,7 @@ bV
bj
bj
bj
-cP
+cQ
dZ
eg
eh
@@ -16517,7 +16479,7 @@ bX
bj
bj
bj
-cP
+cQ
eb
eh
eh
@@ -16774,14 +16736,14 @@ bW
bj
bj
bj
-cR
-dp
-dp
+cQ
+cQ
+cQ
el
el
-dp
-dp
-ea
+cQ
+cQ
+cQ
bj
bj
bW
diff --git a/_maps/map_files/RandomZLevels/blackmarketpackers.dmm b/_maps/map_files/RandomZLevels/blackmarketpackers.dmm
index c2937708deb..d4015627b27 100644
--- a/_maps/map_files/RandomZLevels/blackmarketpackers.dmm
+++ b/_maps/map_files/RandomZLevels/blackmarketpackers.dmm
@@ -17,80 +17,25 @@
/obj/structure/lattice,
/turf/space,
/area/space/nearstation)
-"af" = (
-/turf/simulated/shuttle/wall{
- tag = "icon-swall12";
- icon_state = "swall12"
- },
-/area/awaymission/BMPship/Aft)
-"ag" = (
-/turf/simulated/shuttle/wall{
- tag = "icon-swall4";
- icon_state = "swall4"
- },
-/area/awaymission/BMPship/Aft)
-"ah" = (
-/turf/simulated/shuttle/wall{
- tag = "icon-swall14";
- icon_state = "swall14"
- },
-/area/awaymission/BMPship/Aft)
"ai" = (
-/turf/space,
-/turf/simulated/shuttle/wall{
- tag = "icon-swall_f10";
- icon_state = "swall_f10";
- dir = 2
- },
+/turf/simulated/wall/mineral/titanium,
/area/awaymission/BMPship/Aft)
"aj" = (
/mob/living/simple_animal/hostile/carp,
/turf/space,
/area/space/nearstation)
-"ak" = (
-/turf/simulated/shuttle/wall{
- tag = "icon-swall12";
- icon_state = "swall12"
- },
-/area/awaymission/BMPship/Gate)
"al" = (
/turf/simulated/floor/engine,
/area/awaymission/BMPship/Fore)
"am" = (
-/turf/simulated/shuttle/wall{
- tag = "icon-swall4";
- icon_state = "swall4"
- },
+/turf/simulated/wall/mineral/titanium,
/area/awaymission/BMPship/Gate)
-"an" = (
-/turf/simulated/shuttle/wall{
- tag = "icon-swall3";
- icon_state = "swall3";
- dir = 2
- },
-/area/awaymission/BMPship/Aft)
"ao" = (
/obj/machinery/light/small{
dir = 8
},
/turf/simulated/floor/plating,
/area/awaymission/BMPship/Aft)
-"ap" = (
-/obj/structure/window/reinforced{
- dir = 4
- },
-/obj/structure/window/reinforced{
- dir = 8
- },
-/obj/structure/grille,
-/turf/simulated/floor/engine,
-/area/awaymission/BMPship/Aft)
-"aq" = (
-/turf/simulated/shuttle/wall{
- tag = "icon-swall14";
- icon_state = "swall14"
- },
-/area/awaymission/BMPship/Gate)
"ar" = (
/turf/simulated/floor/plating,
/area/awaymission/BMPship/Fore)
@@ -98,14 +43,6 @@
/obj/structure/lattice,
/turf/space,
/area/space/nearstation)
-"at" = (
-/turf/space,
-/turf/simulated/shuttle/wall{
- tag = "icon-swall_f10";
- icon_state = "swall_f10";
- dir = 2
- },
-/area/awaymission/BMPship/Gate)
"au" = (
/obj/machinery/porta_turret{
lethal = 1;
@@ -120,119 +57,30 @@
icon_state = "bar"
},
/area/awaymission/BMPship/Midship)
-"aw" = (
-/turf/simulated/shuttle/wall{
- tag = "icon-swall7";
- icon_state = "swall7"
- },
-/area/awaymission/BMPship/Aft)
"ax" = (
-/obj/structure/window/reinforced{
- dir = 4
- },
-/obj/structure/window/reinforced{
- dir = 1
- },
-/obj/structure/window/reinforced{
- dir = 8
- },
-/obj/structure/grille,
+/obj/effect/spawner/window/shuttle,
/turf/simulated/floor/engine,
/area/awaymission/BMPship/Gate)
-"ay" = (
-/turf/simulated/shuttle/wall{
- tag = "icon-swall13";
- icon_state = "swall13"
- },
-/area/awaymission/BMPship/Aft)
-"az" = (
-/turf/simulated/shuttle/wall{
- tag = "icon-swall3";
- icon_state = "swall3";
- dir = 2
- },
-/area/awaymission/BMPship/Gate)
-"aA" = (
-/turf/simulated/shuttle/wall{
- tag = "icon-swall8";
- icon_state = "swall8"
- },
-/area/awaymission/BMPship/Aft)
"aB" = (
/turf/simulated/floor/engine,
/area/awaymission/BMPship/Gate)
-"aC" = (
-/turf/simulated/floor/plating,
-/turf/simulated/shuttle/wall{
- tag = "icon-swall_f5";
- icon_state = "swall_f5";
- dir = 2
- },
-/area/awaymission/BMPship/Gate)
"aD" = (
/obj/machinery/light/small{
dir = 8
},
/turf/simulated/floor/plating,
/area/awaymission/BMPship/Gate)
-"aE" = (
-/obj/structure/window/reinforced{
- dir = 4
- },
-/obj/structure/window/reinforced{
- dir = 8
- },
-/obj/structure/grille,
-/turf/simulated/floor/engine,
-/area/awaymission/BMPship/Gate)
"aF" = (
-/obj/machinery/door/unpowered/shuttle,
+/obj/machinery/door/airlock/titanium,
/turf/simulated/floor/plating,
/area/awaymission/BMPship/Gate)
"aG" = (
/turf/simulated/floor/plating,
/area/awaymission/BMPship/Gate)
-"aH" = (
-/obj/structure/window/reinforced,
-/obj/structure/window/reinforced{
- dir = 4
- },
-/obj/structure/window/reinforced{
- dir = 8
- },
-/obj/structure/grille,
-/turf/simulated/floor/engine,
-/area/awaymission/BMPship/Gate)
"aI" = (
/obj/machinery/light/small,
/turf/simulated/floor/engine,
/area/awaymission/BMPship/Gate)
-"aJ" = (
-/turf/simulated/shuttle/wall{
- tag = "icon-swall7";
- icon_state = "swall7"
- },
-/area/awaymission/BMPship/Gate)
-"aK" = (
-/turf/space,
-/turf/simulated/shuttle/wall{
- tag = "icon-swall_f6";
- icon_state = "swall_f6";
- dir = 2
- },
-/area/awaymission/BMPship/Gate)
-"aL" = (
-/turf/simulated/shuttle/wall{
- tag = "icon-swall3";
- icon_state = "swall3"
- },
-/area/awaymission/BMPship/Aft)
-"aM" = (
-/turf/simulated/shuttle/wall{
- tag = "icon-swall13";
- icon_state = "swall13"
- },
-/area/awaymission/BMPship/Gate)
"aN" = (
/obj/machinery/door/airlock/silver{
locked = 1
@@ -240,22 +88,6 @@
/obj/effect/landmark/burnturf,
/turf/simulated/floor/plating/airless,
/area/awaymission/BMPship/Gate)
-"aO" = (
-/turf/simulated/shuttle/wall{
- tag = "icon-swall8";
- icon_state = "swall8"
- },
-/area/awaymission/BMPship/Gate)
-"aP" = (
-/turf/simulated/shuttle/wall{
- tag = "icon-swall12";
- icon_state = "swall12";
- dir = 2
- },
-/area/awaymission/BMPship/Gate)
-"aQ" = (
-/turf/simulated/shuttle/wall,
-/area/awaymission/BMPship/Gate)
"aR" = (
/turf/simulated/floor/plating/airless,
/area/awaymission/BMPship/Gate)
@@ -270,29 +102,7 @@
/turf/simulated/floor/plating/airless,
/area/awaymission/BMPship/Gate)
"aU" = (
-/turf/simulated/shuttle/wall{
- tag = "icon-swall4";
- icon_state = "swall4"
- },
-/area/awaymission/BMPship/Fore)
-"aV" = (
-/turf/simulated/shuttle/wall{
- tag = "icon-swall12";
- icon_state = "swall12"
- },
-/area/awaymission/BMPship/Fore)
-"aW" = (
-/turf/simulated/shuttle/wall{
- tag = "icon-swall14";
- icon_state = "swall14"
- },
-/area/awaymission/BMPship/Fore)
-"aX" = (
-/turf/simulated/shuttle/wall{
- tag = "icon-swall_s10";
- icon_state = "swall_s10";
- dir = 2
- },
+/turf/simulated/wall/mineral/titanium,
/area/awaymission/BMPship/Fore)
"aY" = (
/obj/item/restraints/handcuffs,
@@ -317,12 +127,6 @@
},
/turf/simulated/floor/plating/airless,
/area/awaymission/BMPship/Gate)
-"bc" = (
-/turf/simulated/shuttle/wall{
- tag = "icon-swall1";
- icon_state = "swall1"
- },
-/area/awaymission/BMPship/Aft)
"bd" = (
/turf/simulated/floor/plating,
/area/awaymission/BMPship/Aft)
@@ -335,12 +139,6 @@
},
/turf/simulated/floor/plating/airless,
/area/awaymission/BMPship/Gate)
-"bf" = (
-/turf/simulated/shuttle/wall{
- tag = "icon-swall3";
- icon_state = "swall3"
- },
-/area/awaymission/BMPship/Gate)
"bg" = (
/obj/machinery/computer/operating,
/obj/structure/cable{
@@ -367,16 +165,7 @@
/turf/simulated/floor/plating,
/area/awaymission/BMPship/Gate)
"bk" = (
-/obj/structure/window/reinforced{
- dir = 4
- },
-/obj/structure/window/reinforced{
- dir = 8
- },
-/obj/structure/window/reinforced{
- dir = 1
- },
-/obj/structure/grille,
+/obj/effect/spawner/window/shuttle,
/turf/simulated/floor/plating/airless,
/area/awaymission/BMPship/Fore)
"bl" = (
@@ -403,12 +192,6 @@
/obj/effect/decal/warning_stripes/north,
/turf/simulated/floor/plating,
/area/awaymission/BMPship/Gate)
-"bp" = (
-/turf/simulated/shuttle/wall{
- tag = "icon-swall3";
- icon_state = "swall3"
- },
-/area/awaymission/BMPship/Fore)
"bq" = (
/obj/effect/decal/warning_stripes/north,
/turf/simulated/floor/plating,
@@ -437,10 +220,7 @@
/area/awaymission/BMPship/Gate)
"bt" = (
/obj/structure/sign/vacuum,
-/turf/simulated/shuttle/wall{
- tag = "icon-swall1";
- icon_state = "swall1"
- },
+/turf/simulated/wall/mineral/titanium,
/area/awaymission/BMPship/Fore)
"bu" = (
/obj/structure/largecrate,
@@ -481,26 +261,10 @@
},
/turf/simulated/floor/plating/airless,
/area/awaymission/BMPship/Gate)
-"bC" = (
-/turf/simulated/shuttle/wall{
- tag = "icon-swall1";
- icon_state = "swall1"
- },
-/area/awaymission/BMPship/Gate)
"bD" = (
/obj/effect/decal/warning_stripes/northeast,
/turf/simulated/floor/plating,
/area/awaymission/BMPship/Fore)
-"bE" = (
-/obj/structure/window/reinforced{
- dir = 4
- },
-/obj/structure/window/reinforced{
- dir = 8
- },
-/obj/structure/grille,
-/turf/simulated/floor/plating/airless,
-/area/awaymission/BMPship/Fore)
"bF" = (
/turf/simulated/floor/wood,
/area/awaymission/BMPship/Fore)
@@ -529,12 +293,6 @@
/obj/effect/decal/warning_stripes/west,
/turf/simulated/floor/plating,
/area/awaymission/BMPship/Gate)
-"bK" = (
-/turf/simulated/shuttle/wall{
- tag = "icon-swall2";
- icon_state = "swall2"
- },
-/area/awaymission/BMPship/Aft)
"bL" = (
/obj/machinery/gateway{
dir = 1
@@ -562,17 +320,6 @@
},
/turf/simulated/floor/plating,
/area/awaymission/BMPship/Aft)
-"bP" = (
-/obj/structure/window/reinforced,
-/obj/structure/window/reinforced{
- dir = 4
- },
-/obj/structure/window/reinforced{
- dir = 8
- },
-/obj/structure/grille,
-/turf/simulated/floor/plating/airless,
-/area/awaymission/BMPship/Fore)
"bQ" = (
/obj/effect/decal/warning_stripes/west,
/turf/simulated/floor/plating,
@@ -598,12 +345,6 @@
/obj/effect/decal/warning_stripes/south,
/turf/simulated/floor/plating,
/area/awaymission/BMPship/Fore)
-"bV" = (
-/turf/simulated/shuttle/wall{
- tag = "icon-swall2";
- icon_state = "swall2"
- },
-/area/awaymission/BMPship/Fore)
"bW" = (
/obj/item/hand_labeler,
/obj/structure/cable{
@@ -614,12 +355,6 @@
},
/turf/simulated/floor/plating,
/area/awaymission/BMPship/Gate)
-"bX" = (
-/turf/simulated/shuttle/wall{
- tag = "icon-swall11";
- icon_state = "swall11"
- },
-/area/awaymission/BMPship/Aft)
"bY" = (
/obj/structure/window/reinforced{
dir = 1
@@ -646,7 +381,7 @@
/turf/simulated/floor/plating/airless,
/area/awaymission/BMPship/Gate)
"cb" = (
-/obj/machinery/door/unpowered/shuttle,
+/obj/machinery/door/airlock/titanium,
/obj/structure/cable{
d1 = 4;
d2 = 8;
@@ -673,26 +408,14 @@
/obj/structure/closet/crate/freezer,
/turf/simulated/floor/plating,
/area/awaymission/BMPship/Gate)
-"cf" = (
-/turf/simulated/shuttle/wall{
- tag = "icon-swallc2";
- icon_state = "swallc2"
- },
-/area/awaymission/BMPship/Fore)
"cg" = (
-/obj/machinery/door/unpowered/shuttle,
+/obj/machinery/door/airlock/titanium,
/turf/simulated/floor/plasteel{
tag = "icon-carpetside (NORTH)";
icon_state = "carpetside";
dir = 1
},
/area/awaymission/BMPship/Fore)
-"ch" = (
-/turf/simulated/shuttle/wall{
- tag = "icon-swall8";
- icon_state = "swall8"
- },
-/area/awaymission/BMPship/Fore)
"ci" = (
/obj/machinery/door/airlock/silver,
/turf/simulated/floor/plasteel{
@@ -701,36 +424,9 @@
dir = 1
},
/area/awaymission/BMPship/Fore)
-"cj" = (
-/turf/simulated/shuttle/wall{
- tag = "icon-swall1";
- icon_state = "swall1"
- },
-/area/awaymission/BMPship/Fore)
-"ck" = (
-/turf/simulated/shuttle/wall{
- tag = "icon-swall12";
- icon_state = "swall12"
- },
-/area/awaymission/BMPship/Midship)
"cl" = (
-/turf/simulated/shuttle/wall{
- tag = "icon-swallc2";
- icon_state = "swallc2"
- },
+/turf/simulated/wall/mineral/titanium,
/area/awaymission/BMPship/Midship)
-"cm" = (
-/turf/simulated/shuttle/wall{
- tag = "icon-swall13";
- icon_state = "swall13"
- },
-/area/awaymission/BMPship/Midship)
-"cn" = (
-/turf/simulated/shuttle/wall{
- tag = "icon-swall15";
- icon_state = "swall15"
- },
-/area/awaymission/BMPship/Aft)
"co" = (
/obj/machinery/gateway/centeraway{
calibrated = 0
@@ -776,12 +472,6 @@
},
/turf/simulated/floor/plating,
/area/awaymission/BMPship/Gate)
-"ct" = (
-/turf/simulated/shuttle/wall{
- tag = "icon-swall2";
- icon_state = "swall2"
- },
-/area/awaymission/BMPship/Gate)
"cu" = (
/obj/machinery/gateway,
/turf/simulated/floor/plating,
@@ -802,31 +492,6 @@
/obj/effect/decal/warning_stripes/east,
/turf/simulated/floor/plating,
/area/awaymission/BMPship/Gate)
-"cy" = (
-/turf/simulated/shuttle/wall{
- tag = "icon-swall11";
- icon_state = "swall11"
- },
-/area/awaymission/BMPship/Gate)
-"cz" = (
-/turf/simulated/floor/plasteel{
- tag = "icon-carpet";
- icon_state = "carpet"
- },
-/turf/simulated/shuttle/wall{
- tag = "icon-swall_f9";
- icon_state = "swall_f9";
- dir = 2
- },
-/area/awaymission/BMPship/Fore)
-"cA" = (
-/turf/space,
-/turf/simulated/shuttle/wall{
- tag = "icon-swall_f6";
- icon_state = "swall_f6";
- dir = 2
- },
-/area/awaymission/BMPship/Fore)
"cB" = (
/turf/simulated/floor/plasteel{
tag = "icon-carpet";
@@ -865,13 +530,6 @@
icon_state = "bar"
},
/area/awaymission/BMPship/Midship)
-"cE" = (
-/turf/simulated/shuttle/wall{
- tag = "icon-swall3";
- icon_state = "swall3";
- dir = 2
- },
-/area/awaymission/BMPship/Midship)
"cF" = (
/turf/simulated/floor/plasteel{
tag = "icon-green (WEST)";
@@ -919,12 +577,6 @@
dir = 4
},
/area/awaymission/BMPship/Midship)
-"cL" = (
-/turf/simulated/shuttle/wall{
- tag = "icon-swall3";
- icon_state = "swall3"
- },
-/area/awaymission/BMPship/Midship)
"cM" = (
/turf/simulated/floor/plasteel{
icon_state = "bar"
@@ -1035,12 +687,6 @@
icon_state = "bar"
},
/area/awaymission/BMPship/Midship)
-"da" = (
-/turf/simulated/shuttle/wall{
- tag = "icon-swall1";
- icon_state = "swall1"
- },
-/area/awaymission/BMPship/Midship)
"db" = (
/turf/simulated/floor/plasteel{
tag = "icon-barber";
@@ -1068,12 +714,6 @@
},
/turf/simulated/floor/plasteel,
/area/awaymission/BMPship/Aft)
-"df" = (
-/turf/simulated/shuttle/wall{
- tag = "icon-swallc3";
- icon_state = "swallc3"
- },
-/area/awaymission/BMPship/Aft)
"dg" = (
/obj/structure/chair/stool,
/turf/simulated/floor/plasteel{
@@ -1197,7 +837,7 @@
},
/area/awaymission/BMPship/Midship)
"dx" = (
-/obj/machinery/door/unpowered/shuttle,
+/obj/machinery/door/airlock/titanium,
/turf/simulated/floor/plasteel{
icon_state = "bar"
},
@@ -1352,12 +992,6 @@
dir = 6
},
/area/awaymission/BMPship/Midship)
-"dQ" = (
-/turf/simulated/shuttle/wall{
- tag = "icon-swall2";
- icon_state = "swall2"
- },
-/area/awaymission/BMPship/Midship)
"dR" = (
/obj/structure/cable{
d1 = 2;
@@ -1499,7 +1133,7 @@
/obj/structure/window/reinforced{
dir = 8
},
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating/airless,
/area/awaymission/BMPship/Aft)
"ec" = (
/obj/structure/shuttle/engine/propulsion{
@@ -1507,7 +1141,7 @@
icon_state = "propulsion";
tag = "icon-propulsion (WEST)"
},
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating/airless,
/area/awaymission/BMPship/Aft)
"ed" = (
/obj/item/multitool,
@@ -1702,23 +1336,14 @@
},
/area/awaymission/BMPship/Fore)
"ey" = (
-/obj/machinery/door/unpowered/shuttle,
+/obj/machinery/door/airlock/titanium,
/turf/simulated/floor/plating,
/area/awaymission/BMPship/Aft)
"ez" = (
/turf/simulated/floor/engine,
/area/awaymission/BMPship/Aft)
"eA" = (
-/obj/structure/window/reinforced{
- dir = 8
- },
-/obj/structure/window/reinforced{
- dir = 4
- },
-/obj/structure/window/reinforced{
- dir = 1
- },
-/obj/structure/grille,
+/obj/effect/spawner/window/shuttle,
/turf/simulated/floor/plating,
/area/awaymission/BMPship/Fore)
"eB" = (
@@ -1792,7 +1417,7 @@
dir = 4;
id = "meatConvey1"
},
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating,
/area/awaymission/BMPship/Midship)
"eH" = (
/obj/structure/closet/crate,
@@ -1807,7 +1432,7 @@
id = "meatConvey1"
},
/obj/structure/plasticflaps,
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating,
/area/awaymission/BMPship/Midship)
"eJ" = (
/obj/structure/disposalpipe/segment{
@@ -1846,7 +1471,7 @@
/obj/machinery/disposal/deliveryChute{
dir = 8
},
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating,
/area/awaymission/BMPship/Midship)
"eN" = (
/obj/structure/disposalpipe/segment{
@@ -1961,16 +1586,6 @@
dir = 4
},
/area/awaymission/BMPship/Fore)
-"eY" = (
-/obj/structure/window/reinforced{
- dir = 8
- },
-/obj/structure/window/reinforced{
- dir = 4
- },
-/obj/structure/grille,
-/turf/simulated/floor/plating,
-/area/awaymission/BMPship/Fore)
"eZ" = (
/obj/structure/cable{
d1 = 1;
@@ -2073,21 +1688,10 @@
icon_state = "showroomfloor"
},
/area/awaymission/BMPship/Aft)
-"fm" = (
-/turf/space,
-/turf/simulated/shuttle/wall{
- tag = "icon-swall_f9";
- icon_state = "swall_f9";
- dir = 2
- },
-/area/awaymission/BMPship/Aft)
"fn" = (
/obj/effect/gibspawner/human,
/turf/simulated/floor/plating,
/area/awaymission/BMPship/Aft)
-"fo" = (
-/turf/simulated/shuttle/plating,
-/area/awaymission/BMPship/Aft)
"fp" = (
/obj/structure/window/reinforced{
dir = 8
@@ -2264,17 +1868,6 @@
icon_state = "showroomfloor"
},
/area/awaymission/BMPship/Aft)
-"fH" = (
-/obj/structure/window/reinforced{
- dir = 8
- },
-/obj/structure/window/reinforced{
- dir = 4
- },
-/obj/structure/window/reinforced,
-/obj/structure/grille,
-/turf/simulated/floor/plating,
-/area/awaymission/BMPship/Fore)
"fI" = (
/obj/structure/cable{
d1 = 1;
@@ -2489,16 +2082,8 @@
/obj/structure/window/reinforced,
/turf/simulated/floor/plating,
/area/awaymission/BMPship/Aft)
-"gg" = (
-/turf/space,
-/turf/simulated/shuttle/wall{
- tag = "icon-swall_f5";
- icon_state = "swall_f5";
- dir = 2
- },
-/area/awaymission/BMPship/Fore)
"gh" = (
-/obj/machinery/door/unpowered/shuttle,
+/obj/machinery/door/airlock/titanium,
/turf/simulated/floor/plasteel{
tag = "icon-carpetside";
icon_state = "carpetside"
@@ -2512,19 +2097,12 @@
pixel_y = 0;
tag = ""
},
-/obj/machinery/door/unpowered/shuttle,
+/obj/machinery/door/airlock/titanium,
/turf/simulated/floor/plasteel{
tag = "icon-carpetside";
icon_state = "carpetside"
},
/area/awaymission/BMPship/Fore)
-"gj" = (
-/turf/simulated/shuttle/wall{
- tag = "icon-swall11";
- icon_state = "swall11";
- dir = 2
- },
-/area/awaymission/BMPship/Midship)
"gk" = (
/obj/structure/window/reinforced{
dir = 8
@@ -2538,7 +2116,7 @@
id = "meatConvey2"
},
/obj/item/kitchen/knife,
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating,
/area/awaymission/BMPship/Midship)
"gm" = (
/obj/structure/kitchenspike,
@@ -2561,7 +2139,7 @@
dir = 4;
id = "meatConvey2"
},
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating,
/area/awaymission/BMPship/Midship)
"gp" = (
/obj/machinery/conveyor{
@@ -2569,7 +2147,7 @@
id = "meatConvey2"
},
/obj/structure/plasticflaps,
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating,
/area/awaymission/BMPship/Midship)
"gq" = (
/obj/structure/disposalpipe/segment{
@@ -2798,12 +2376,6 @@
icon_state = "showroomfloor"
},
/area/awaymission/BMPship/Aft)
-"gW" = (
-/turf/simulated/shuttle/wall{
- tag = "icon-swallc2";
- icon_state = "swallc2"
- },
-/area/awaymission/BMPship/Aft)
"gX" = (
/obj/structure/reagent_dispensers,
/turf/simulated/floor/plasteel{
@@ -2855,7 +2427,7 @@
/turf/simulated/floor/plasteel,
/area/awaymission/BMPship/Aft)
"hf" = (
-/obj/machinery/door/unpowered/shuttle,
+/obj/machinery/door/airlock/titanium,
/obj/structure/cable{
d1 = 1;
d2 = 2;
@@ -2875,12 +2447,6 @@
/obj/effect/decal/warning_stripes/west,
/turf/simulated/floor/plasteel,
/area/awaymission/BMPship/Aft)
-"hi" = (
-/turf/simulated/shuttle/wall{
- tag = "icon-swallc3";
- icon_state = "swallc3"
- },
-/area/awaymission/BMPship/Fore)
"hj" = (
/turf/simulated/mineral/random,
/area/awaymission)
@@ -2894,33 +2460,6 @@
/obj/machinery/door/airlock/silver,
/turf/simulated/floor/plating/airless,
/area/awaymission/BMPship/Fore)
-"hl" = (
-/turf/simulated/shuttle/wall{
- tag = "icon-swallc1";
- icon_state = "swallc1"
- },
-/area/awaymission/BMPship/Fore)
-"hm" = (
-/turf/simulated/shuttle/wall{
- tag = "icon-swallc3";
- icon_state = "swallc3"
- },
-/area/awaymission/BMPship/Midship)
-"hn" = (
-/turf/simulated/shuttle/wall{
- tag = "icon-swall15";
- icon_state = "swall15"
- },
-/area/awaymission/BMPship/Midship)
-"ho" = (
-/turf/simulated/shuttle/wall{
- tag = "icon-swall4";
- icon_state = "swall4"
- },
-/area/awaymission/BMPship/Midship)
-"hp" = (
-/turf/simulated/shuttle/wall,
-/area/awaymission/BMPship/Midship)
"hq" = (
/turf/simulated/mineral/random,
/area/awaymission/BMPship/Midship)
@@ -2964,31 +2503,12 @@
/obj/item/clothing/under/overalls,
/turf/simulated/floor/plasteel,
/area/awaymission/BMPship/Aft)
-"hy" = (
-/obj/structure/window/reinforced{
- dir = 1
- },
-/obj/structure/window/reinforced{
- dir = 8
- },
-/obj/structure/window/reinforced{
- dir = 4
- },
-/obj/structure/grille,
-/turf/simulated/floor/plating/airless,
-/area/awaymission/BMPship/Fore)
"hz" = (
/obj/machinery/light/small{
dir = 1
},
/turf/simulated/floor/engine,
/area/awaymission/BMPship/Fore)
-"hA" = (
-/turf/simulated/shuttle/wall{
- tag = "icon-swall1";
- icon_state = "swall1"
- },
-/area/awaymission)
"hB" = (
/obj/machinery/light/small{
dir = 1
@@ -3009,7 +2529,7 @@
/turf/simulated/floor/plating/asteroid/airless,
/area/awaymission/BMPship/Fore)
"hF" = (
-/turf/simulated/shuttle/wall,
+/turf/simulated/wall/mineral/titanium,
/area/awaymission)
"hG" = (
/obj/structure/cable{
@@ -3109,16 +2629,6 @@
},
/turf/simulated/floor/plasteel,
/area/awaymission/BMPship/Aft)
-"hT" = (
-/obj/structure/window/reinforced{
- dir = 4
- },
-/obj/structure/grille,
-/obj/item/shard{
- icon_state = "small"
- },
-/turf/simulated/floor/plating/airless,
-/area/awaymission/BMPship/Fore)
"hU" = (
/obj/effect/decal/remains/human,
/obj/item/clothing/head/helmet/space/syndicate/green/dark,
@@ -3137,7 +2647,7 @@
},
/area/awaymission/BMPship/Midship)
"hW" = (
-/obj/machinery/door/unpowered/shuttle,
+/obj/machinery/door/airlock/titanium,
/turf/simulated,
/area/awaymission/BMPship/Fore)
"hX" = (
@@ -3205,14 +2715,6 @@
/obj/item/clothing/suit/space/syndicate/green/dark,
/turf/space,
/area/awaymission)
-"ii" = (
-/obj/structure/window/reinforced{
- dir = 4
- },
-/obj/structure/window/reinforced,
-/obj/structure/grille,
-/turf/simulated/floor/plating/airless,
-/area/awaymission/BMPship/Fore)
"ij" = (
/obj/structure/cable{
icon_state = "0-4";
@@ -3221,7 +2723,7 @@
/turf/simulated/floor/plating/airless,
/area/awaymission)
"ik" = (
-/obj/machinery/door/unpowered/shuttle,
+/obj/machinery/door/airlock/titanium,
/obj/structure/cable{
d1 = 4;
d2 = 8;
@@ -3266,20 +2768,11 @@
},
/turf/space,
/area/space/nearstation)
-"ip" = (
-/turf/simulated/shuttle/wall{
- tag = "icon-swall13";
- icon_state = "swall13"
- },
-/area/awaymission/BMPship/Fore)
"iq" = (
/obj/structure/rack,
/obj/effect/decal/warning_stripes/west,
/turf/simulated/floor/plasteel,
/area/awaymission/BMPship/Aft)
-"ir" = (
-/turf/simulated/shuttle/wall,
-/area/awaymission/BMPship/Fore)
"is" = (
/obj/structure/bed,
/obj/item/bedsheet,
@@ -3290,7 +2783,7 @@
/turf/simulated/floor/plasteel,
/area/awaymission/BMPship/Aft)
"iu" = (
-/obj/machinery/door/unpowered/shuttle,
+/obj/machinery/door/airlock/titanium,
/turf/simulated/floor/plasteel{
icon_state = "cafeteria";
dir = 2
@@ -3321,17 +2814,6 @@
/obj/item/caution,
/turf/simulated/floor/plating/airless,
/area/awaymission)
-"iy" = (
-/turf/simulated/floor/plasteel{
- icon_state = "cafeteria";
- dir = 2
- },
-/turf/simulated/shuttle/wall{
- tag = "icon-swall_f6";
- icon_state = "swall_f6";
- dir = 2
- },
-/area/awaymission/BMPship/Aft)
"iz" = (
/obj/machinery/portable_atmospherics/canister/air,
/turf/simulated/floor/plating/airless,
@@ -3350,22 +2832,10 @@
dir = 2
},
/area/awaymission/BMPship/Aft)
-"iC" = (
-/turf/simulated/shuttle/wall{
- tag = "icon-swall4";
- icon_state = "swall4"
- },
-/area/awaymission)
"iD" = (
/obj/item/clothing/gloves/color/yellow,
/turf/space,
/area/awaymission)
-"iE" = (
-/turf/simulated/shuttle/wall{
- tag = "icon-swall12";
- icon_state = "swall12"
- },
-/area/awaymission)
"iF" = (
/obj/machinery/porta_turret{
check_synth = 1;
@@ -3375,16 +2845,7 @@
/turf/simulated/floor/engine,
/area/awaymission/BMPship/Aft)
"iG" = (
-/obj/structure/window/reinforced{
- dir = 4
- },
-/obj/structure/window/reinforced{
- dir = 8
- },
-/obj/structure/window/reinforced{
- dir = 1
- },
-/obj/structure/grille,
+/obj/effect/spawner/window/shuttle,
/turf/simulated/floor/engine,
/area/awaymission/BMPship/Aft)
"iH" = (
@@ -3446,14 +2907,6 @@
/mob/living/simple_animal/hostile/carp,
/turf/simulated/floor/plating/asteroid/airless,
/area/awaymission)
-"iT" = (
-/turf/simulated/floor/plating,
-/turf/simulated/shuttle/wall{
- tag = "icon-swall_f6";
- icon_state = "swall_f6";
- dir = 2
- },
-/area/awaymission/BMPship/Aft)
"iU" = (
/obj/structure/table,
/obj/item/storage/toolbox/syndicate,
@@ -3465,17 +2918,6 @@
},
/turf/simulated/floor/plating,
/area/awaymission)
-"iW" = (
-/obj/structure/window/reinforced{
- dir = 4
- },
-/obj/structure/window/reinforced{
- dir = 8
- },
-/obj/structure/window/reinforced,
-/obj/structure/grille,
-/turf/simulated/floor/engine,
-/area/awaymission/BMPship/Aft)
"iX" = (
/obj/structure/table,
/obj/item/reagent_containers/glass/beaker/drugs/meth,
@@ -3589,12 +3031,6 @@
},
/turf/simulated/floor/plating,
/area/awaymission/BMPship/Gate)
-"jp" = (
-/turf/simulated/shuttle/wall{
- tag = "icon-swall15";
- icon_state = "swall15"
- },
-/area/awaymission/BMPship/Gate)
"jq" = (
/obj/machinery/door/poddoor/shutters{
dir = 2;
@@ -9668,14 +9104,14 @@ aa
aa
aa
aa
-cA
-cj
+aU
+aU
eA
-eY
-eY
-fH
-bV
-gg
+eA
+eA
+eA
+aU
+aU
aa
aj
aa
@@ -9797,16 +9233,16 @@ aa
aa
aa
aa
-cA
-cz
+aU
+aU
ee
ew
eW
eW
fF
ee
-aW
-gg
+aU
+aU
aa
aa
gP
@@ -9926,8 +9362,8 @@ aa
aa
aa
aa
-cA
-cz
+aU
+aU
cB
ee
ev
@@ -9935,7 +9371,7 @@ eV
eV
fE
ee
-aV
+aU
gs
as
aa
@@ -10055,8 +9491,8 @@ aa
aa
aa
aa
-cA
-cz
+aU
+aU
cB
cB
ee
@@ -10065,7 +9501,7 @@ ee
ee
ee
ee
-aV
+aU
gA
gs
aa
@@ -10182,10 +9618,10 @@ aa
aa
aU
bk
-bE
-bP
-cf
-cz
+bk
+bk
+aU
+aU
cW
dh
dH
@@ -10199,10 +9635,10 @@ gh
gs
gz
gs
-hi
-hy
-hT
-ii
+aU
+bk
+bk
+bk
aU
ac
ac
@@ -10310,11 +9746,11 @@ aa
aa
aa
aa
-aV
+aU
bl
bF
bR
-ch
+aU
cB
cX
dp
@@ -10329,11 +9765,11 @@ gi
gC
gA
gN
-aV
+aU
hv
al
hv
-aV
+aU
hj
hj
hj
@@ -10440,7 +9876,7 @@ aa
aa
aa
aa
-aV
+aU
bn
bG
bF
@@ -10455,15 +9891,15 @@ dh
fr
dh
ee
-aV
+aU
gB
gD
gE
-aV
+aU
hz
al
al
-aV
+aU
hj
hj
hj
@@ -10570,11 +10006,11 @@ aa
aa
aa
aa
-aW
-bp
-bp
-bp
-cj
+aU
+aU
+aU
+aU
+aU
cC
cY
ds
@@ -10585,15 +10021,15 @@ dp
fv
dp
fZ
-aV
+aU
gu
gR
gs
-hl
-cj
+aU
+aU
hW
-bV
-ip
+aU
+aU
hj
hj
hj
@@ -10700,7 +10136,7 @@ aa
aa
aa
aa
-aV
+aU
bv
bQ
ar
@@ -10715,7 +10151,7 @@ eZ
fu
cB
fY
-aV
+aU
gt
gQ
gQ
@@ -10723,7 +10159,7 @@ hk
gS
hX
gs
-aV
+aU
hj
hj
hj
@@ -10830,30 +10266,30 @@ aa
aa
aa
aa
-aV
+aU
bw
ar
bT
cl
-cE
-cE
-cE
-cE
-da
+cl
+cl
+cl
+cl
+cl
eB
-dQ
-da
+cl
+cl
fJ
-dQ
-gj
-cE
-cE
-cE
-hm
+cl
+cl
+cl
+cl
+cl
+cl
hB
gs
gs
-ir
+aU
hj
hj
hj
@@ -10960,11 +10396,11 @@ aa
aa
aa
aa
-aV
+aU
bx
ar
bT
-ck
+cl
cD
cM
cM
@@ -10979,7 +10415,7 @@ cM
cM
cM
cM
-ck
+cl
hC
hX
hC
@@ -11090,11 +10526,11 @@ aa
aa
aa
aa
-aV
+aU
bw
ar
bU
-ck
+cl
cG
cZ
cM
@@ -11109,7 +10545,7 @@ cM
cM
cM
hd
-ck
+cl
hD
hC
gs
@@ -11220,11 +10656,11 @@ aa
aa
aa
aa
-aV
+aU
bx
ar
bT
-ck
+cl
cF
cF
cF
@@ -11239,7 +10675,7 @@ er
er
cM
cM
-ck
+cl
gs
hY
hC
@@ -11350,11 +10786,11 @@ aa
aa
aa
aa
-aV
+aU
bw
ar
bT
-ck
+cl
cI
dc
dc
@@ -11369,7 +10805,7 @@ fg
er
cM
cM
-ck
+cl
hE
hX
gs
@@ -11480,11 +10916,11 @@ aa
aa
aa
aa
-aV
+aU
bD
ar
cd
-ck
+cl
cH
dc
dt
@@ -11499,7 +10935,7 @@ fg
er
cM
cM
-ck
+cl
gs
hC
hC
@@ -11610,11 +11046,11 @@ aa
aa
aa
aa
-aX
+aU
bt
bI
-bV
-cm
+aU
+cl
cJ
dc
dc
@@ -11629,7 +11065,7 @@ fg
er
cM
cM
-ck
+cl
hF
hj
hF
@@ -11744,7 +11180,7 @@ aa
aa
aa
aa
-ck
+cl
cI
dc
dc
@@ -11759,7 +11195,7 @@ gd
er
cM
gO
-ck
+cl
hj
hj
hj
@@ -11874,7 +11310,7 @@ aa
aa
aa
aa
-ck
+cl
cK
cK
cK
@@ -11889,7 +11325,7 @@ fg
eE
cM
cM
-hp
+cl
hj
hj
hj
@@ -12004,7 +11440,7 @@ aa
aa
aa
aa
-ck
+cl
cG
cM
cM
@@ -12133,8 +11569,8 @@ aa
aa
aa
as
-aK
-cm
+am
+cl
cM
cM
cM
@@ -12149,7 +11585,7 @@ gm
cM
cM
gO
-ho
+cl
hj
hj
hF
@@ -12262,25 +11698,25 @@ aa
aa
aa
aa
-aK
-cy
-jp
-cL
-da
+am
+am
+am
+cl
+cl
dx
-dQ
-da
+cl
+cl
eF
en
fx
fO
-dQ
-da
+cl
+cl
dx
-dQ
-cL
-hn
-hA
+cl
+cl
+cl
+hF
hj
hj
hj
@@ -12392,9 +11828,9 @@ aa
as
aa
as
-aQ
+am
by
-ak
+am
cO
db
dv
@@ -12409,7 +11845,7 @@ cM
cM
cM
cM
-ck
+cl
ac
hF
hj
@@ -12524,7 +11960,7 @@ as
by
aR
bz
-ak
+am
cN
db
du
@@ -12539,7 +11975,7 @@ en
en
gT
hd
-ck
+cl
ac
ac
hj
@@ -12654,7 +12090,7 @@ by
by
bz
aR
-ak
+am
cQ
db
dy
@@ -12669,7 +12105,7 @@ hV
cM
ek
cM
-ck
+cl
hH
gY
ac
@@ -12778,13 +12214,13 @@ aa
aa
aa
aa
-aK
-aQ
+am
+am
by
aR
by
cT
-ak
+am
cP
dd
dw
@@ -12799,7 +12235,7 @@ gl
gH
ek
cM
-ck
+cl
gY
ia
ha
@@ -12908,13 +12344,13 @@ aa
aa
aa
aa
-ak
+am
aS
aR
bz
aR
jh
-aO
+am
cM
cM
cM
@@ -12929,7 +12365,7 @@ gp
er
ek
cM
-ck
+cl
ac
hH
ac
@@ -13038,7 +12474,7 @@ aa
aa
aa
aa
-ak
+am
aR
aR
aR
@@ -13059,13 +12495,13 @@ go
er
ek
hd
-ck
+cl
hJ
ib
id
id
gY
-iC
+hF
hj
iQ
hj
@@ -13168,7 +12604,7 @@ aa
aa
aa
aa
-ak
+am
aY
bA
aR
@@ -13189,13 +12625,13 @@ go
er
ek
cM
-ck
+cl
hH
gZ
id
id
hH
-iE
+hF
hj
iK
hj
@@ -13298,7 +12734,7 @@ aa
aa
aj
aa
-ak
+am
aT
aR
aR
@@ -13319,13 +12755,13 @@ go
er
ek
cM
-ck
+cl
ac
id
id
ib
hH
-iE
+hF
hj
iK
hj
@@ -13428,7 +12864,7 @@ aa
aa
aa
aa
-ak
+am
ba
aR
aS
@@ -13449,13 +12885,13 @@ go
er
dS
cM
-ck
+cl
gY
id
id
id
gY
-iE
+hF
hj
iR
hj
@@ -13558,13 +12994,13 @@ aa
aa
aa
aa
-ak
+am
aZ
aR
aR
bA
aR
-ak
+am
cR
dg
cM
@@ -13579,13 +13015,13 @@ eM
er
dS
cM
-ck
+cl
hL
hH
hH
hH
ix
-iE
+hF
ac
ac
ac
@@ -13688,13 +13124,13 @@ aa
aa
aj
aa
-ak
+am
be
bB
ca
aR
cT
-ak
+am
cU
cM
cM
@@ -13709,13 +13145,13 @@ eN
er
dS
hd
-ck
+cl
hM
hH
hH
hb
ix
-iE
+hF
ac
iS
ac
@@ -13818,13 +13254,13 @@ aa
aa
aa
aa
-ak
+am
bb
aR
bb
aR
ji
-ak
+am
av
dg
cM
@@ -13839,13 +13275,13 @@ eJ
en
eC
cM
-ck
+cl
hN
hH
ij
hH
ix
-iE
+hF
aa
aa
aa
@@ -13948,13 +13384,13 @@ aj
aa
aa
aa
-ak
+am
bg
aR
bb
aR
aR
-ak
+am
cV
cM
cM
@@ -13969,13 +13405,13 @@ gq
cM
cM
cM
-ck
+cl
hO
hH
il
hH
iz
-iE
+hF
aa
aa
aa
@@ -14078,34 +13514,34 @@ aa
aa
aa
aa
-aq
-bf
-bC
+am
+am
+am
cb
-ct
-bf
-cy
-aJ
-an
-aL
-an
-aL
-bc
+am
+am
+am
+am
+ai
+ai
+ai
+ai
+ai
fk
fC
fN
ge
-bK
-aL
-an
-aw
-bX
-aL
-bc
+ai
+ai
+ai
+ai
+ai
+ai
+ai
ik
-bK
-aL
-ay
+ai
+ai
+ai
aa
aa
aa
@@ -14206,16 +13642,16 @@ aa
aa
am
ax
-aE
-aH
-ak
+ax
+ax
+am
bh
bs
bJ
bs
bs
dC
-ak
+am
di
dj
dj
@@ -14228,18 +13664,18 @@ fl
dj
dj
gU
-af
+ai
dq
hP
hu
im
dq
iA
-af
+ai
iG
-ap
-iW
-ag
+iG
+iG
+ai
aa
aa
aa
@@ -14334,18 +13770,18 @@ aa
aa
aa
aa
-ak
+am
au
aB
au
-ak
+am
bi
aG
cc
cs
jj
dG
-ak
+am
di
dz
dU
@@ -14358,18 +13794,18 @@ fc
eo
gG
dj
-aA
+ai
dq
dq
dq
im
dq
iA
-af
+ai
iF
ez
iF
-af
+ai
aa
aa
aa
@@ -14464,18 +13900,18 @@ aa
aa
aa
aa
-ak
+am
aB
aB
aI
-ak
+am
bj
aG
aG
aG
jl
dV
-ak
+am
dj
dj
dj
@@ -14495,11 +13931,11 @@ dq
im
it
dq
-af
+ai
iH
ez
ez
-af
+ai
aa
aa
aa
@@ -14594,21 +14030,21 @@ aa
aa
aa
aa
-aq
-az
+am
+am
aF
-az
-aM
+am
+am
bm
bH
ce
aG
jk
ep
-ak
+am
dk
-bK
-df
+ai
+ai
dj
bY
bd
@@ -14618,18 +14054,18 @@ fD
gf
gI
dj
-ag
+ai
dq
dq
ie
im
is
bd
-ah
-bc
+ai
+ai
ey
-bK
-ay
+ai
+ai
aa
aa
aa
@@ -14724,21 +14160,21 @@ aa
aa
aa
aa
-ak
+am
aD
aG
aG
-aO
+am
bo
aG
aG
aG
jk
dG
-ak
+am
dl
dD
-af
+ai
dj
bY
fn
@@ -14748,18 +14184,18 @@ bd
gf
gI
fG
-aA
+ai
ht
dq
dq
im
dq
dq
-aA
+ai
iI
bd
ao
-af
+ai
aa
aa
aa
@@ -14854,8 +14290,8 @@ aa
aa
aa
aa
-at
-aC
+am
+am
aG
aG
aN
@@ -14865,10 +14301,10 @@ aG
aG
jm
dG
-ak
+am
dm
dA
-af
+ai
dj
eQ
eS
@@ -14888,8 +14324,8 @@ dq
hg
bd
bd
-iT
-fm
+ai
+ai
aa
aa
aa
@@ -14985,8 +14421,8 @@ aa
aa
aa
aa
-at
-aC
+am
+am
aG
am
bq
@@ -14995,10 +14431,10 @@ cp
cv
jk
eH
-ak
+am
dl
dF
-af
+ai
dj
dj
dj
@@ -15008,17 +14444,17 @@ dj
dj
dj
gV
-ag
+ai
hu
hQ
dq
dq
dq
dq
-ag
+ai
iJ
-iT
-fm
+ai
+ai
aa
aa
aa
@@ -15116,19 +14552,19 @@ aa
aa
aa
aa
-at
-aJ
-aM
+am
+am
+am
bq
bL
co
cu
jk
eL
-ak
+am
dn
dB
-af
+ai
et
dj
dj
@@ -15138,16 +14574,16 @@ et
dj
gK
gX
-af
+ai
hr
hQ
ie
dq
ie
dq
-ah
-aw
-fm
+ai
+ai
+ai
aa
aa
aa
@@ -15247,36 +14683,36 @@ aa
aa
aa
aa
-at
-aM
+am
+am
bq
bN
cr
cw
jk
fh
-aq
-aL
-aL
-bX
-aL
-aL
-aL
-aL
-aL
-aL
-aL
-aL
-aL
-ay
+am
+ai
+ai
+ai
+ai
+ai
+ai
+ai
+ai
+ai
+ai
+ai
+ai
+ai
hs
hQ
dq
dq
dq
dq
-ah
-fm
+ai
+ai
aa
aa
aa
@@ -15378,14 +14814,14 @@ aa
aa
aa
aa
-ak
+am
bq
aG
cq
aG
jk
fA
-aO
+am
hc
hh
hG
@@ -15398,14 +14834,14 @@ hI
jn
hh
js
-aA
+ai
ht
hQ
dq
-ag
+ai
iu
-bK
-ay
+ai
+ai
aa
aa
aa
@@ -15508,7 +14944,7 @@ aa
aa
aa
aa
-aP
+am
br
bW
cs
@@ -15532,10 +14968,10 @@ hf
es
hS
dq
-af
+ai
iw
iB
-af
+ai
aa
aa
aa
@@ -15638,8 +15074,8 @@ aa
aa
aa
aa
-at
-aC
+am
+am
bu
bu
bS
@@ -15652,20 +15088,20 @@ dW
bd
bd
bd
-fo
-fo
-fo
+bd
+bd
+bd
bd
dq
-fo
-ag
+bd
+ai
hx
hR
ig
-af
+ai
iv
-iy
-fm
+ai
+ai
aa
aa
aa
@@ -15769,14 +15205,14 @@ aa
aa
aa
aa
-at
-bf
-bf
-bf
-bf
-bf
-jp
-df
+am
+am
+am
+am
+am
+am
+am
+ai
do
dZ
eu
@@ -15787,14 +15223,14 @@ fS
bd
gv
do
-gW
-cn
-aL
-aL
-aL
-bX
-aL
-fm
+ai
+ai
+ai
+ai
+ai
+ai
+ai
+ai
aa
aa
aa
@@ -15906,7 +15342,7 @@ aa
aa
aa
ai
-ay
+ai
dE
dY
bd
@@ -15917,8 +15353,8 @@ eP
bd
bd
gM
-ah
-fm
+ai
+ai
aa
aa
aa
@@ -16036,7 +15472,7 @@ aa
aa
aa
aa
-af
+ai
hw
ea
bO
@@ -16047,7 +15483,7 @@ fT
bd
fs
jr
-af
+ai
aa
aa
aa
@@ -16166,18 +15602,18 @@ aa
aa
aa
aa
-ah
-aw
-bc
+ai
+ai
+ai
ey
-bK
-aw
-aw
-bc
+ai
+ai
+ai
+ai
ey
-bK
-aw
-ay
+ai
+ai
+ai
aa
aa
aa
@@ -16297,17 +15733,17 @@ aa
aa
aa
ai
-ay
+ai
ed
ez
ez
-ah
-ay
+ai
+ai
fX
ez
gx
-ah
-fm
+ai
+ai
aa
aa
aa
@@ -16427,16 +15863,16 @@ aa
aa
aa
aa
-af
+ai
eb
eb
eb
-af
-af
+ai
+ai
eb
eb
eb
-af
+ai
aa
aa
aa
@@ -16561,12 +15997,12 @@ ai
ec
ec
ec
-fm
+ai
ai
ec
ec
ec
-fm
+ai
aa
aa
aa
diff --git a/_maps/map_files/RandomZLevels/centcomAway.dmm b/_maps/map_files/RandomZLevels/centcomAway.dmm
index 5adba1d2e08..a540c301ad8 100644
--- a/_maps/map_files/RandomZLevels/centcomAway.dmm
+++ b/_maps/map_files/RandomZLevels/centcomAway.dmm
@@ -563,14 +563,7 @@
/turf/simulated/floor/plating,
/area/awaymission/centcomAway/hangar)
"bx" = (
-/turf/simulated/floor/plasteel{
- icon_state = "vault";
- dir = 5
- },
-/turf/simulated/shuttle/wall{
- icon_state = "swall_f6";
- dir = 2
- },
+/turf/simulated/wall/mineral/titanium,
/area/awaymission/centcomAway/hangar)
"by" = (
/obj/structure/shuttle/engine/propulsion{
@@ -600,16 +593,6 @@
},
/turf/simulated/floor/plating,
/area/awaymission/centcomAway/hangar)
-"bD" = (
-/turf/simulated/floor/plasteel{
- icon_state = "vault";
- dir = 5
- },
-/turf/simulated/shuttle/wall{
- icon_state = "swall_f10";
- dir = 2
- },
-/area/awaymission/centcomAway/hangar)
"bE" = (
/obj/structure/closet/crate,
/turf/simulated/floor/plasteel{
@@ -664,47 +647,11 @@
},
/turf/simulated/floor/plating,
/area/awaymission/centcomAway/hangar)
-"bL" = (
-/turf/simulated/shuttle/wall{
- icon_state = "swall3";
- dir = 2
- },
-/area/awaymission/centcomAway/hangar)
-"bM" = (
-/turf/simulated/shuttle/wall{
- icon_state = "swall8";
- dir = 2
- },
-/area/awaymission/centcomAway/hangar)
-"bN" = (
-/turf/simulated/shuttle/wall{
- icon_state = "swall7";
- dir = 2
- },
-/area/awaymission/centcomAway/hangar)
-"bO" = (
-/turf/simulated/shuttle/wall{
- icon_state = "swall4";
- dir = 2
- },
-/area/awaymission/centcomAway/hangar)
-"bP" = (
-/turf/simulated/shuttle/wall{
- icon_state = "swall12";
- dir = 2
- },
-/area/awaymission/centcomAway/hangar)
"bQ" = (
/obj/structure/disposalpipe/segment,
/obj/structure/reagent_dispensers/watertank,
/turf/simulated/floor/plating,
/area/awaymission/centcomAway/cafe)
-"bR" = (
-/turf/simulated/shuttle/wall{
- icon_state = "swall11";
- dir = 2
- },
-/area/awaymission/centcomAway/hangar)
"bS" = (
/obj/structure/chair/comfy/brown,
/turf/simulated/floor/plasteel{
@@ -720,9 +667,6 @@
dir = 1
},
/area/awaymission/centcomAway/cafe)
-"bU" = (
-/turf/simulated/shuttle/plating,
-/area/awaymission/centcomAway/hangar)
"bV" = (
/obj/structure/table,
/turf/simulated/floor/plasteel{
@@ -740,12 +684,10 @@
/area/awaymission/centcomAway/cafe)
"bX" = (
/obj/structure/closet/emcloset,
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/awaymission/centcomAway/hangar)
"bY" = (
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/awaymission/centcomAway/hangar)
"bZ" = (
/obj/machinery/gibber,
@@ -779,20 +721,6 @@
icon_state = "solarpanel"
},
/area/awaymission/centcomAway/maint)
-"cd" = (
-/turf/simulated/shuttle/plating,
-/turf/simulated/shuttle/wall{
- icon_state = "swall_f6";
- dir = 2
- },
-/area/awaymission/centcomAway/hangar)
-"ce" = (
-/turf/simulated/shuttle/floor,
-/turf/simulated/shuttle/wall{
- icon_state = "swall_f9";
- dir = 2
- },
-/area/awaymission/centcomAway/hangar)
"cf" = (
/obj/structure/table,
/obj/item/storage/firstaid/toxin{
@@ -800,7 +728,7 @@
pixel_y = 4
},
/obj/item/storage/firstaid/toxin,
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/awaymission/centcomAway/hangar)
"cg" = (
/obj/structure/table,
@@ -812,7 +740,7 @@
pixel_x = -2;
pixel_y = 4
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/awaymission/centcomAway/hangar)
"ch" = (
/obj/structure/grille,
@@ -840,20 +768,12 @@
dir = 1;
in_use = 1
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/awaymission/centcomAway/hangar)
"cj" = (
/obj/structure/sign/botany,
/turf/simulated/wall/r_wall,
/area/awaymission/centcomAway/cafe)
-"ck" = (
-/turf/simulated/shuttle/plating,
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall_f10";
- layer = 2
- },
-/area/awaymission/centcomAway/hangar)
"cl" = (
/obj/structure/grille,
/obj/structure/window/reinforced{
@@ -871,13 +791,6 @@
/obj/machinery/door/airlock/external,
/turf/simulated/floor/plating,
/area/awaymission/centcomAway/maint)
-"cn" = (
-/turf/simulated/shuttle/floor,
-/turf/simulated/shuttle/wall{
- icon_state = "swall_f5";
- dir = 2
- },
-/area/awaymission/centcomAway/hangar)
"co" = (
/obj/item/paper_bin,
/obj/structure/table,
@@ -895,7 +808,7 @@
},
/area/awaymission/centcomAway/cafe)
"cq" = (
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/awaymission/centcomAway/hangar)
"cr" = (
/obj/structure/disposalpipe/segment,
@@ -969,7 +882,7 @@
/obj/machinery/door/airlock/maintenance_hatch{
req_access_txt = "101"
},
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating,
/area/awaymission/centcomAway/hangar)
"cB" = (
/obj/structure/cable{
@@ -1087,35 +1000,27 @@
/area/awaymission/centcomAway/maint)
"cP" = (
/obj/structure/table/reinforced,
-/turf/simulated/shuttle/floor{
- icon_state = "floor2"
- },
+/turf/simulated/floor/mineral/titanium/yellow,
/area/awaymission/centcomAway/hangar)
"cQ" = (
/obj/machinery/light{
icon_state = "tube1";
dir = 8
},
-/turf/simulated/shuttle/plating,
-/area/awaymission/centcomAway/hangar)
-"cR" = (
-/turf/simulated/shuttle/wall{
- icon_state = "swall1";
- dir = 2
- },
+/turf/simulated/floor/plating,
/area/awaymission/centcomAway/hangar)
"cS" = (
/obj/structure/chair/comfy/shuttle{
dir = 8
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/awaymission/centcomAway/hangar)
"cT" = (
/obj/machinery/light{
icon_state = "tube1";
dir = 4
},
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating,
/area/awaymission/centcomAway/hangar)
"cU" = (
/turf/simulated/floor/plating,
@@ -1151,9 +1056,7 @@
/area/awaymission/centcomAway/cafe)
"cY" = (
/obj/machinery/computer/secure_data,
-/turf/simulated/shuttle/floor{
- icon_state = "floor2"
- },
+/turf/simulated/floor/mineral/titanium/yellow,
/area/awaymission/centcomAway/hangar)
"cZ" = (
/obj/structure/disposalpipe/segment{
@@ -1169,9 +1072,7 @@
/obj/structure/chair/comfy/shuttle{
dir = 4
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor2"
- },
+/turf/simulated/floor/mineral/titanium/yellow,
/area/awaymission/centcomAway/hangar)
"db" = (
/obj/machinery/light{
@@ -1205,40 +1106,16 @@
"de" = (
/obj/structure/table,
/obj/item/flash,
-/turf/simulated/shuttle/floor{
- icon_state = "floor2"
- },
+/turf/simulated/floor/mineral/titanium/yellow,
/area/awaymission/centcomAway/hangar)
"df" = (
-/turf/simulated/shuttle/floor{
- icon_state = "floor2"
- },
+/turf/simulated/floor/mineral/titanium/yellow,
/area/awaymission/centcomAway/hangar)
"dg" = (
/obj/structure/chair/comfy/shuttle{
dir = 4
},
-/turf/simulated/shuttle/floor,
-/area/awaymission/centcomAway/hangar)
-"dh" = (
-/turf/simulated/floor/plasteel{
- icon_state = "vault";
- dir = 5
- },
-/turf/simulated/shuttle/wall{
- icon_state = "swall_f5";
- dir = 2
- },
-/area/awaymission/centcomAway/hangar)
-"di" = (
-/turf/simulated/floor/plasteel{
- icon_state = "vault";
- dir = 5
- },
-/turf/simulated/shuttle/wall{
- icon_state = "swall_f9";
- dir = 2
- },
+/turf/simulated/floor/mineral/titanium/blue,
/area/awaymission/centcomAway/hangar)
"dj" = (
/obj/machinery/light{
@@ -1265,18 +1142,10 @@
},
/turf/simulated/floor/plating,
/area/awaymission/centcomAway/maint)
-"dl" = (
-/turf/simulated/shuttle/wall{
- icon_state = "swallc1";
- dir = 2
- },
-/area/awaymission/centcomAway/hangar)
"dm" = (
/obj/structure/table/reinforced,
/obj/item/storage/fancy/donut_box,
-/turf/simulated/shuttle/floor{
- icon_state = "floor2"
- },
+/turf/simulated/floor/mineral/titanium/yellow,
/area/awaymission/centcomAway/hangar)
"dn" = (
/obj/structure/table/reinforced,
@@ -1285,29 +1154,19 @@
icon_state = "tube1";
dir = 8
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor2"
- },
+/turf/simulated/floor/mineral/titanium/yellow,
/area/awaymission/centcomAway/hangar)
"do" = (
/obj/structure/table/reinforced,
/obj/item/pen,
-/turf/simulated/shuttle/floor{
- icon_state = "floor2"
- },
+/turf/simulated/floor/mineral/titanium/yellow,
/area/awaymission/centcomAway/hangar)
"dp" = (
/obj/machinery/sleeper{
icon_state = "sleeper-open";
dir = 8
},
-/turf/simulated/shuttle/floor,
-/area/awaymission/centcomAway/hangar)
-"dq" = (
-/turf/simulated/shuttle/wall{
- icon_state = "swallc2";
- dir = 2
- },
+/turf/simulated/floor/mineral/titanium/blue,
/area/awaymission/centcomAway/hangar)
"dr" = (
/obj/machinery/light{
@@ -1317,7 +1176,7 @@
/obj/structure/chair/comfy/shuttle{
dir = 8
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/awaymission/centcomAway/hangar)
"ds" = (
/obj/machinery/light{
@@ -1384,9 +1243,7 @@
/obj/structure/table/reinforced,
/obj/item/clipboard,
/obj/item/stamp/granted,
-/turf/simulated/shuttle/floor{
- icon_state = "floor2"
- },
+/turf/simulated/floor/mineral/titanium/yellow,
/area/awaymission/centcomAway/hangar)
"dB" = (
/obj/structure/disposalpipe/segment,
@@ -1409,21 +1266,11 @@
/area/awaymission/centcomAway/maint)
"dE" = (
/obj/structure/bed,
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/awaymission/centcomAway/hangar)
"dF" = (
-/obj/structure/grille,
-/obj/structure/window/reinforced,
-/obj/structure/window/reinforced{
- dir = 4
- },
-/obj/structure/window/reinforced{
- dir = 8
- },
-/obj/structure/window/reinforced{
- dir = 1
- },
-/turf/simulated/shuttle/plating,
+/obj/effect/spawner/window/shuttle,
+/turf/simulated/floor/plating,
/area/awaymission/centcomAway/hangar)
"dG" = (
/turf/simulated/floor/plasteel{
@@ -1521,9 +1368,7 @@
"dS" = (
/obj/structure/table,
/obj/item/storage/box/handcuffs,
-/turf/simulated/shuttle/floor{
- icon_state = "floor2"
- },
+/turf/simulated/floor/mineral/titanium/yellow,
/area/awaymission/centcomAway/hangar)
"dT" = (
/obj/machinery/door/window/northright{
@@ -1533,9 +1378,7 @@
name = "Security Desk";
req_access_txt = "103"
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor2"
- },
+/turf/simulated/floor/mineral/titanium/yellow,
/area/awaymission/centcomAway/hangar)
"dU" = (
/obj/structure/cable{
@@ -1632,12 +1475,6 @@
/obj/effect/decal/warning_stripes/northeast,
/turf/simulated/floor/plating,
/area/awaymission/centcomAway/hangar)
-"eg" = (
-/turf/simulated/shuttle/wall{
- icon_state = "swall0";
- dir = 2
- },
-/area/awaymission/centcomAway/hangar)
"eh" = (
/obj/structure/cable{
d1 = 1;
@@ -1652,7 +1489,7 @@
"ei" = (
/obj/structure/table,
/obj/structure/bedsheetbin,
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/awaymission/centcomAway/hangar)
"ej" = (
/obj/structure/disposalpipe/segment,
@@ -1770,18 +1607,14 @@
icon_state = "tube1";
dir = 4
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/awaymission/centcomAway/hangar)
"ex" = (
/obj/machinery/light{
icon_state = "tube1";
dir = 8
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/awaymission/centcomAway/hangar)
"ey" = (
/obj/structure/table,
@@ -1833,9 +1666,7 @@
name = "Rest Room";
req_access_txt = "0"
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/awaymission/centcomAway/hangar)
"eE" = (
/obj/effect/decal/warning_stripes/northeast,
@@ -1867,7 +1698,7 @@
"eK" = (
/obj/structure/table,
/obj/item/radio/off,
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/awaymission/centcomAway/hangar)
"eL" = (
/obj/structure/closet/crate,
@@ -1876,7 +1707,7 @@
/area/awaymission/centcomAway/hangar)
"eM" = (
/obj/structure/filingcabinet,
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/awaymission/centcomAway/hangar)
"eN" = (
/obj/effect/decal/warning_stripes/southeast,
@@ -1887,12 +1718,6 @@
icon_state = "floor"
},
/area/awaymission/centcomAway/general)
-"eQ" = (
-/turf/simulated/shuttle/wall{
- icon_state = "swall2";
- dir = 2
- },
-/area/awaymission/centcomAway/hangar)
"eR" = (
/obj/machinery/power/apc/noalarm{
cell_type = 15000;
@@ -1964,16 +1789,16 @@
"fa" = (
/obj/structure/table,
/obj/item/storage/box/donkpockets,
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/awaymission/centcomAway/hangar)
"fb" = (
/obj/structure/table,
/obj/item/hand_labeler,
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/awaymission/centcomAway/hangar)
"fc" = (
/obj/structure/chair/comfy/shuttle,
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/awaymission/centcomAway/hangar)
"fd" = (
/obj/machinery/portable_atmospherics/pump,
@@ -2039,11 +1864,11 @@
/area/awaymission/centcomAway/cafe)
"fl" = (
/obj/structure/table,
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/awaymission/centcomAway/hangar)
"fm" = (
/obj/structure/computerframe,
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/awaymission/centcomAway/hangar)
"fn" = (
/obj/structure/flora/ausbushes,
@@ -2088,7 +1913,7 @@
icon_state = "tube1";
dir = 4
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/awaymission/centcomAway/hangar)
"fs" = (
/obj/structure/closet/chefcloset,
@@ -2140,36 +1965,6 @@
icon_state = "dark"
},
/area/awaymission/centcomAway/courtroom)
-"fz" = (
-/obj/structure/grille,
-/obj/structure/window/reinforced{
- dir = 8
- },
-/obj/structure/window/reinforced{
- dir = 1
- },
-/obj/structure/window/reinforced,
-/turf/simulated/shuttle/plating,
-/area/awaymission/centcomAway/hangar)
-"fA" = (
-/obj/structure/grille,
-/obj/structure/window/reinforced{
- dir = 1
- },
-/obj/structure/window/reinforced,
-/turf/simulated/shuttle/plating,
-/area/awaymission/centcomAway/hangar)
-"fB" = (
-/obj/structure/grille,
-/obj/structure/window/reinforced{
- dir = 1
- },
-/obj/structure/window/reinforced,
-/obj/structure/window/reinforced{
- dir = 4
- },
-/turf/simulated/shuttle/plating,
-/area/awaymission/centcomAway/hangar)
"fC" = (
/obj/structure/closet/secure_closet/freezer/fridge,
/obj/machinery/light,
@@ -2247,13 +2042,6 @@
icon_state = "redfull"
},
/area/awaymission/centcomAway/cafe)
-"fM" = (
-/turf/simulated/floor/plating,
-/turf/simulated/shuttle/wall{
- icon_state = "swall_f5";
- dir = 2
- },
-/area/awaymission/centcomAway/hangar)
"fN" = (
/obj/structure/window/reinforced{
dir = 4
@@ -2265,18 +2053,6 @@
icon_state = "floor"
},
/area/awaymission/centcomAway/general)
-"fO" = (
-/turf/simulated/shuttle/wall{
- icon_state = "swall14";
- dir = 2
- },
-/area/awaymission/centcomAway/hangar)
-"fP" = (
-/turf/simulated/shuttle/wall{
- icon_state = "swallc4";
- dir = 2
- },
-/area/awaymission/centcomAway/hangar)
"fQ" = (
/turf/simulated/floor/carpet,
/area/awaymission/centcomAway/courtroom)
@@ -2285,9 +2061,7 @@
name = "Cockpit";
req_access_txt = "109"
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/awaymission/centcomAway/hangar)
"fS" = (
/obj/machinery/door/airlock/centcom,
@@ -2733,7 +2507,7 @@
icon_state = "tube1";
dir = 8
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/awaymission/centcomAway/hangar)
"hb" = (
/obj/structure/table/reinforced,
@@ -2906,7 +2680,7 @@
"hx" = (
/obj/structure/table,
/obj/item/storage/lockbox,
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/awaymission/centcomAway/hangar)
"hy" = (
/obj/structure/grille,
@@ -2943,8 +2717,8 @@
},
/area/awaymission/centcomAway/courtroom)
"hD" = (
-/obj/machinery/door/unpowered/shuttle,
-/turf/simulated/shuttle/floor,
+/obj/machinery/door/airlock/titanium,
+/turf/simulated/floor/mineral/titanium/blue,
/area/awaymission/centcomAway/hangar)
"hE" = (
/obj/structure/chair{
@@ -2956,21 +2730,7 @@
/obj/structure/chair/comfy/shuttle{
dir = 4
},
-/turf/simulated/shuttle/floor,
-/area/awaymission/centcomAway/hangar)
-"hF" = (
-/obj/structure/grille,
-/obj/structure/window/reinforced{
- dir = 8
- },
-/obj/structure/window/reinforced,
-/obj/structure/window/reinforced{
- dir = 4
- },
-/obj/structure/window/reinforced{
- dir = 1
- },
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/mineral/titanium/blue,
/area/awaymission/centcomAway/hangar)
"hG" = (
/obj/structure/reagent_dispensers/fueltank,
@@ -2980,7 +2740,7 @@
/obj/structure/table,
/obj/item/clipboard,
/obj/item/pen,
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/awaymission/centcomAway/hangar)
"hI" = (
/obj/structure/morgue,
@@ -3001,7 +2761,7 @@
"hL" = (
/obj/structure/table,
/obj/item/paper_bin,
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/awaymission/centcomAway/hangar)
"hM" = (
/obj/structure/cable{
@@ -3109,20 +2869,6 @@
},
/turf/simulated/floor/plating,
/area/awaymission/centcomAway/courtroom)
-"hX" = (
-/obj/structure/grille,
-/obj/structure/window/reinforced{
- dir = 8
- },
-/obj/structure/window/reinforced,
-/obj/structure/window/reinforced{
- dir = 4
- },
-/obj/structure/window/reinforced{
- dir = 1
- },
-/turf/simulated/floor/plating,
-/area/awaymission/centcomAway/hangar)
"hY" = (
/turf/simulated/floor/plasteel{
tag = "icon-blackcorner (NORTH)";
@@ -4046,15 +3792,6 @@
/obj/effect/decal/warning_stripes/north,
/turf/simulated/floor/plating,
/area/awaymission/centcomAway/hangar)
-"jZ" = (
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/turf/simulated/shuttle/wall{
- icon_state = "swall_f10";
- dir = 2
- },
-/area/awaymission/centcomAway/hangar)
"ka" = (
/obj/structure/table,
/obj/item/paper/ccaMemo,
@@ -4069,9 +3806,7 @@
/mob/living/simple_animal/hostile/russian/ranged{
loot = list(/obj/effect/mob_spawn/human/corpse/russian/ranged)
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor2"
- },
+/turf/simulated/floor/mineral/titanium/yellow,
/area/awaymission/centcomAway/hangar)
"kc" = (
/obj/machinery/door/airlock/centcom{
@@ -4148,15 +3883,6 @@
icon_state = "floor"
},
/area/awaymission/centcomAway/general)
-"km" = (
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/turf/simulated/shuttle/wall{
- icon_state = "swall_f9";
- dir = 2
- },
-/area/awaymission/centcomAway/hangar)
"kn" = (
/obj/structure/table,
/obj/item/clothing/gloves/color/yellow,
@@ -4649,21 +4375,7 @@
/obj/structure/shuttle/engine/propulsion/burst{
dir = 8
},
-/turf/simulated/floor/plating,
-/turf/simulated/shuttle/wall{
- icon_state = "swall_f6";
- dir = 2
- },
-/area/awaymission/centcomAway/hangar)
-"lt" = (
-/obj/structure/shuttle/engine/propulsion/burst{
- dir = 8
- },
-/turf/simulated/floor/plating,
-/turf/simulated/shuttle/wall{
- icon_state = "swall_f5";
- dir = 2
- },
+/turf/simulated/wall/mineral/titanium,
/area/awaymission/centcomAway/hangar)
"lu" = (
/obj/structure/flora/ausbushes,
@@ -5772,7 +5484,7 @@
icon_state = "propulsion_r";
dir = 1
},
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating/airless,
/area/awaymission/centcomAway/thunderdome)
"nV" = (
/obj/machinery/light,
@@ -5785,14 +5497,14 @@
icon_state = "propulsion_l";
dir = 1
},
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating/airless,
/area/awaymission/centcomAway/thunderdome)
"nX" = (
/obj/structure/shuttle/engine/propulsion{
icon_state = "propulsion";
dir = 1
},
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating/airless,
/area/awaymission/centcomAway/thunderdome)
"nY" = (
/obj/structure/computerframe,
@@ -6808,7 +6520,7 @@
/obj/structure/chair/comfy/shuttle{
dir = 4
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/awaymission/centcomAway/hangar)
"JB" = (
/obj/effect/decal/warning_stripes/yellow,
@@ -11144,10 +10856,10 @@ aa
aW
bn
bx
-bL
-bL
-bL
-dh
+bx
+bx
+bx
+bx
bn
bo
bo
@@ -11172,7 +10884,7 @@ gX
gX
ls
hD
-lt
+ls
gX
aW
iM
@@ -11275,10 +10987,10 @@ aW
bn
bw
bK
-bU
+cU
cQ
-ck
-dh
+bx
+bx
bn
cU
bn
@@ -11300,9 +11012,9 @@ jz
gX
gX
gX
-bP
+bx
hE
-bP
+bx
gX
aW
iN
@@ -11405,10 +11117,10 @@ aW
bn
bC
bK
-bU
-bU
-bU
-bP
+cU
+cU
+cU
+bx
bn
bn
bn
@@ -11430,9 +11142,9 @@ jz
gX
gX
gX
-bP
+bx
Di
-bP
+bx
oc
aW
lo
@@ -11535,20 +11247,20 @@ aW
bn
by
bK
-cd
-cR
+bx
+bx
cA
-dl
-bL
-bL
-bL
-bN
-bL
-bL
-bL
-bL
-bL
-fM
+bx
+bx
+bx
+bx
+bx
+bx
+bx
+bx
+bx
+bx
+bx
cU
cU
bn
@@ -11560,9 +11272,9 @@ jz
gX
gX
gX
-jZ
-hX
-km
+bx
+dF
+bx
gX
aW
iP
@@ -11663,23 +11375,23 @@ aa
aa
aW
bn
-bD
-bN
-ce
+bx
+bx
+bx
cq
cq
dn
cY
de
dS
-bP
+bx
dE
dE
dE
dE
dE
-fO
-fM
+bx
+bx
cU
cU
bn
@@ -11794,7 +11506,7 @@ aa
aW
bn
bn
-bM
+bx
bX
cq
bY
@@ -11802,17 +11514,17 @@ dm
kb
df
df
-bP
+bx
bY
bY
bY
bY
bY
-fO
-bR
-bL
-bL
-dh
+bx
+bx
+bx
+bx
+bx
bn
bn
jo
@@ -11932,17 +11644,17 @@ do
da
df
df
-bP
+bx
dE
ew
bY
dE
dE
-bP
+bx
eK
ha
hx
-fz
+dF
bn
bn
bn
@@ -11951,7 +11663,7 @@ gX
gX
ls
hD
-lt
+ls
gX
gX
aW
@@ -12054,7 +11766,7 @@ aa
aW
bo
bn
-bO
+bx
cf
cq
bY
@@ -12062,26 +11774,26 @@ cP
dA
cP
dT
-dl
-bL
-cR
+bx
+bx
+bx
eD
-eQ
-bL
-fP
+bx
+bx
+bx
cS
cq
fl
-fA
+dF
bn
bn
jp
jz
gX
gX
-bP
+bx
hE
-bP
+bx
gX
gX
aW
@@ -12184,7 +11896,7 @@ aa
aW
bj
bn
-bP
+bx
ci
cq
bY
@@ -12202,16 +11914,16 @@ fR
bY
fc
fm
-fA
+dF
bn
bn
bn
jz
gX
gX
-bP
+bx
Di
-bP
+bx
gX
gX
iB
@@ -12314,7 +12026,7 @@ aa
aW
bn
bn
-bM
+bx
cg
cq
bY
@@ -12328,20 +12040,20 @@ cS
bY
cq
ei
-bO
+bx
dg
cq
hH
-fA
+dF
bn
bn
bn
jz
gX
gX
-jZ
-hF
-km
+bx
+dF
+bx
gX
oc
aW
@@ -12458,11 +12170,11 @@ dg
bY
cq
fb
-bP
+bx
eM
fr
hL
-fB
+dF
bn
bo
bn
@@ -12574,7 +12286,7 @@ aa
aW
bn
bn
-bO
+bx
bX
cq
bY
@@ -12588,11 +12300,11 @@ bY
bY
cq
fa
-fO
-bN
-bL
-bL
-di
+bx
+bx
+bx
+bx
+bx
bn
bn
bn
@@ -12704,8 +12416,8 @@ aa
aW
bn
bx
-bR
-cn
+bx
+bx
cq
cq
dr
@@ -12718,8 +12430,8 @@ dr
bY
cq
bX
-fO
-di
+bx
+bx
bn
bn
bn
@@ -12835,20 +12547,20 @@ aW
bn
bw
bK
-ck
-cR
+bx
+bx
cA
-dq
-bL
-cR
+bx
+bx
+bx
bH
-eg
+bx
dF
-eg
+bx
bH
-eQ
-bL
-di
+bx
+bx
+bx
bn
bn
bn
@@ -12965,10 +12677,10 @@ aW
bn
bC
bK
-bU
-bU
-bU
-bP
+cU
+cU
+cU
+bx
bn
dC
bn
@@ -13095,10 +12807,10 @@ aW
bn
by
bK
-bU
+cU
cT
-cd
-di
+bx
+bx
bn
bn
bn
@@ -13223,11 +12935,11 @@ aa
aa
aW
bn
-bD
-bL
-bL
-bL
-di
+bx
+bx
+bx
+bx
+bx
bn
bn
bn
diff --git a/_maps/map_files/RandomZLevels/evil_santa.dmm b/_maps/map_files/RandomZLevels/evil_santa.dmm
index f0520744537..62b84545ee0 100644
--- a/_maps/map_files/RandomZLevels/evil_santa.dmm
+++ b/_maps/map_files/RandomZLevels/evil_santa.dmm
@@ -1,8 +1,6 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"aa" = (
-/turf/simulated/shuttle/wall{
- icon_state = "wall3"
- },
+/turf/simulated/wall/indestructible/syndicate,
/area/space)
"ab" = (
/turf/simulated/mineral,
@@ -271,55 +269,16 @@
},
/area/awaymission/challenge/main)
"aP" = (
-/turf/simulated/floor/snow{
- carbon_dioxide = 21.8366;
- nitrogen = 0;
- oxygen = 82.1472;
- temperature = 73
- },
-/turf/simulated/shuttle/wall{
- icon_state = "swall_f6";
- dir = 2
- },
-/area/awaymission/challenge/main)
-"aQ" = (
-/turf/simulated/shuttle/wall{
- icon_state = "swall12";
- dir = 2
- },
-/area/awaymission/challenge/main)
-"aR" = (
-/turf/simulated/shuttle/wall{
- icon_state = "swall8";
- dir = 2
- },
+/turf/simulated/wall/mineral/titanium,
/area/awaymission/challenge/main)
"aS" = (
-/obj/machinery/door/unpowered/shuttle,
+/obj/machinery/door/airlock/titanium,
/obj/structure/fans/tiny,
/obj/effect/decal/warning_stripes/yellow,
/turf/simulated/floor/plasteel{
icon_state = "bar"
},
/area/awaymission/challenge/main)
-"aT" = (
-/turf/simulated/shuttle/wall{
- icon_state = "swall4";
- dir = 2
- },
-/area/awaymission/challenge/main)
-"aU" = (
-/turf/simulated/floor/snow{
- carbon_dioxide = 21.8366;
- nitrogen = 0;
- oxygen = 82.1472;
- temperature = 73
- },
-/turf/simulated/shuttle/wall{
- icon_state = "swall_f10";
- dir = 2
- },
-/area/awaymission/challenge/main)
"aV" = (
/turf/simulated/floor/plasteel{
icon_plating = "asteroid";
@@ -335,12 +294,6 @@
name = "Asteroid"
},
/area/awaymission/challenge/main)
-"aX" = (
-/turf/simulated/shuttle/wall{
- icon_state = "swall3";
- dir = 2
- },
-/area/awaymission/challenge/main)
"aY" = (
/turf/simulated/floor/plasteel{
icon_state = "cafeteria";
@@ -360,12 +313,6 @@
name = "Asteroid"
},
/area/awaymission/challenge/main)
-"bb" = (
-/turf/simulated/shuttle/wall{
- icon_state = "swall1";
- dir = 2
- },
-/area/awaymission/challenge/main)
"bc" = (
/obj/effect/decal/straw/medium,
/obj/effect/decal/remains/human,
@@ -398,36 +345,6 @@
dir = 2
},
/area/awaymission/challenge/main)
-"bg" = (
-/turf/simulated/shuttle/wall{
- icon_state = "swall2";
- dir = 2
- },
-/area/awaymission/challenge/main)
-"bh" = (
-/turf/simulated/floor/snow{
- carbon_dioxide = 21.8366;
- nitrogen = 0;
- oxygen = 82.1472;
- temperature = 73
- },
-/turf/simulated/shuttle/wall{
- icon_state = "swall_f5";
- dir = 2
- },
-/area/awaymission/challenge/main)
-"bi" = (
-/turf/simulated/floor/snow{
- carbon_dioxide = 21.8366;
- nitrogen = 0;
- oxygen = 82.1472;
- temperature = 73
- },
-/turf/simulated/shuttle/wall{
- icon_state = "swall_f9";
- dir = 2
- },
-/area/awaymission/challenge/main)
"bj" = (
/obj/structure/flora/rock,
/turf/simulated/floor/snow{
@@ -547,12 +464,10 @@
/turf/simulated/floor/plasteel,
/area/awaymission/challenge/main)
"bD" = (
-/turf/simulated/shuttle/wall{
- icon_state = "wall3"
- },
+/turf/simulated/wall/indestructible/syndicate,
/area/awaymission/challenge/start)
"bE" = (
-/obj/machinery/door/unpowered/shuttle,
+/obj/machinery/door/airlock/titanium,
/obj/structure/fans/tiny,
/obj/effect/decal/warning_stripes/yellow,
/turf/simulated/floor/plasteel{
@@ -570,7 +485,7 @@
/turf/simulated/floor/plasteel,
/area/awaymission/challenge/start)
"bG" = (
-/obj/machinery/door/unpowered/shuttle,
+/obj/machinery/door/airlock/titanium,
/obj/effect/decal/warning_stripes/yellow,
/turf/simulated/floor/plasteel,
/area/awaymission/challenge/start)
@@ -638,9 +553,7 @@
/turf/simulated/floor/bluegrid,
/area/awaymission/challenge/start)
"bR" = (
-/turf/simulated/shuttle/wall{
- icon_state = "wall3"
- },
+/turf/simulated/wall/indestructible/syndicate,
/area/awaymission/challenge/main)
"bS" = (
/obj/machinery/atmospherics/unary/vent_pump{
@@ -824,40 +737,30 @@
/area/awaymission/challenge/start)
"cq" = (
/obj/machinery/atmospherics/pipe/simple/hidden/universal,
-/turf/simulated/shuttle/wall{
- icon_state = "wall3"
- },
+/turf/simulated/wall/indestructible/syndicate,
/area/awaymission/challenge/start)
"cr" = (
/obj/machinery/atmospherics/pipe/simple/hidden{
dir = 6
},
-/turf/simulated/shuttle/wall{
- icon_state = "wall3"
- },
+/turf/simulated/wall/indestructible/syndicate,
/area/awaymission/challenge/start)
"cs" = (
/obj/machinery/atmospherics/pipe/simple/hidden/universal{
dir = 4
},
-/turf/simulated/shuttle/wall{
- icon_state = "wall3"
- },
+/turf/simulated/wall/indestructible/syndicate,
/area/awaymission/challenge/start)
"ct" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
-/turf/simulated/shuttle/wall{
- icon_state = "wall3"
- },
+/turf/simulated/wall/indestructible/syndicate,
/area/awaymission/challenge/start)
"cu" = (
/obj/machinery/atmospherics/pipe/simple/hidden{
dir = 10;
initialize_directions = 10
},
-/turf/simulated/shuttle/wall{
- icon_state = "wall3"
- },
+/turf/simulated/wall/indestructible/syndicate,
/area/awaymission/challenge/start)
"cv" = (
/obj/machinery/atmospherics/unary/tank/air{
@@ -2703,14 +2606,14 @@ ac
ac
ac
aP
-aX
-bb
+aP
+aP
aS
bE
aS
-bg
-aX
-bh
+aP
+aP
+aP
ac
ac
ac
@@ -2768,7 +2671,7 @@ ac
ac
ac
ac
-aQ
+aP
aY
aZ
aY
@@ -2776,7 +2679,7 @@ aZ
aY
aZ
aY
-aQ
+aP
ac
ac
ac
@@ -2834,7 +2737,7 @@ ac
ac
ac
aG
-aR
+aP
aZ
aY
aZ
@@ -2842,7 +2745,7 @@ aY
aZ
aY
aZ
-aR
+aP
aG
ac
ac
@@ -3098,7 +3001,7 @@ ac
ac
ac
aG
-aT
+aP
aZ
aY
aZ
@@ -3106,7 +3009,7 @@ aY
aZ
aY
aZ
-aT
+aP
aG
ac
ac
@@ -3164,7 +3067,7 @@ ac
ac
ac
ac
-aQ
+aP
aY
aZ
aY
@@ -3172,7 +3075,7 @@ aZ
aY
aZ
aY
-aQ
+aP
ac
ac
ac
@@ -3230,15 +3133,15 @@ ac
aK
aK
ac
-aU
-aX
-bb
+aP
+aP
+aP
aS
bE
aS
-bg
-aX
-bi
+aP
+aP
+aP
ac
ac
ac
diff --git a/_maps/map_files/RandomZLevels/moonoutpost19.dmm b/_maps/map_files/RandomZLevels/moonoutpost19.dmm
index 1e13a3fbf8a..218fdbcfe0a 100644
--- a/_maps/map_files/RandomZLevels/moonoutpost19.dmm
+++ b/_maps/map_files/RandomZLevels/moonoutpost19.dmm
@@ -7807,32 +7807,7 @@
name = "MO19 Arrivals"
})
"ld" = (
-/turf/simulated/floor/plating/asteroid/airless,
-/turf/simulated/shuttle/wall{
- tag = "icon-swall_f6";
- icon_state = "swall_f6";
- dir = 2
- },
-/area/awaycontent/a1{
- has_gravity = 1;
- name = "MO19 Arrivals"
- })
-"le" = (
-/turf/simulated/shuttle/wall{
- icon_state = "swall12";
- dir = 2
- },
-/area/awaycontent/a1{
- has_gravity = 1;
- name = "MO19 Arrivals"
- })
-"lf" = (
-/turf/simulated/floor/plating/asteroid/airless,
-/turf/simulated/shuttle/wall{
- dir = 3;
- icon_state = "swall_f10";
- layer = 2
- },
+/turf/simulated/wall/mineral/titanium,
/area/awaycontent/a1{
has_gravity = 1;
name = "MO19 Arrivals"
@@ -8080,50 +8055,6 @@
has_gravity = 1;
name = "MO19 Arrivals"
})
-"lz" = (
-/turf/simulated/shuttle/wall{
- icon_state = "swall14";
- dir = 2
- },
-/area/awaycontent/a1{
- has_gravity = 1;
- name = "MO19 Arrivals"
- })
-"lA" = (
-/turf/simulated/shuttle/wall{
- icon_state = "swall8";
- dir = 2
- },
-/area/awaycontent/a1{
- has_gravity = 1;
- name = "MO19 Arrivals"
- })
-"lB" = (
-/obj/structure/grille,
-/obj/structure/window/full/reinforced,
-/turf/simulated/shuttle/plating,
-/area/awaycontent/a1{
- has_gravity = 1;
- name = "MO19 Arrivals"
- })
-"lC" = (
-/turf/simulated/shuttle/wall{
- icon_state = "swall4";
- dir = 2
- },
-/area/awaycontent/a1{
- has_gravity = 1;
- name = "MO19 Arrivals"
- })
-"lD" = (
-/turf/simulated/shuttle/wall{
- icon_state = "swall1";
- dir = 2
- },
-/area/awaycontent/a1{
- has_gravity = 1;
- name = "MO19 Arrivals"
- })
"lE" = (
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel/airless{
@@ -8141,7 +8072,7 @@
icon_state = "burst_r";
tag = "icon-burst_r (WEST)"
},
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating/airless,
/area/awaycontent/a1{
has_gravity = 1;
name = "MO19 Arrivals"
@@ -8204,7 +8135,7 @@
/obj/structure/window/reinforced{
dir = 8
},
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating/airless,
/area/awaycontent/a1{
has_gravity = 1;
name = "MO19 Arrivals"
@@ -8334,20 +8265,10 @@
has_gravity = 1;
name = "MO19 Arrivals"
})
-"lW" = (
-/turf/simulated/shuttle/floor,
-/turf/simulated/shuttle/wall{
- icon_state = "swall_f9";
- dir = 2
- },
-/area/awaycontent/a1{
- has_gravity = 1;
- name = "MO19 Arrivals"
- })
"lX" = (
/obj/structure/table,
/obj/item/storage/lockbox,
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/awaycontent/a1{
has_gravity = 1;
name = "MO19 Arrivals"
@@ -8355,18 +8276,7 @@
"lY" = (
/obj/structure/table,
/obj/item/radio/off,
-/turf/simulated/shuttle/floor{
- icon_state = "floor2"
- },
-/area/awaycontent/a1{
- has_gravity = 1;
- name = "MO19 Arrivals"
- })
-"lZ" = (
-/turf/simulated/shuttle/wall{
- icon_state = "swall3";
- dir = 2
- },
+/turf/simulated/floor/mineral/titanium/yellow,
/area/awaycontent/a1{
has_gravity = 1;
name = "MO19 Arrivals"
@@ -8376,9 +8286,7 @@
pixel_x = -32;
pixel_y = 0
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor2"
- },
+/turf/simulated/floor/mineral/titanium/yellow,
/area/awaycontent/a1{
has_gravity = 1;
name = "MO19 Arrivals"
@@ -8390,13 +8298,13 @@
/obj/structure/chair/comfy/shuttle{
dir = 8
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/awaycontent/a1{
has_gravity = 1;
name = "MO19 Arrivals"
})
"mc" = (
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/awaycontent/a1{
has_gravity = 1;
name = "MO19 Arrivals"
@@ -8405,7 +8313,7 @@
/obj/structure/chair/comfy/shuttle{
dir = 8
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/awaycontent/a1{
has_gravity = 1;
name = "MO19 Arrivals"
@@ -8418,14 +8326,14 @@
/obj/machinery/light/small{
dir = 1
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/awaycontent/a1{
has_gravity = 1;
name = "MO19 Arrivals"
})
"mf" = (
/obj/structure/closet/emcloset,
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/awaycontent/a1{
has_gravity = 1;
name = "MO19 Arrivals"
@@ -8436,7 +8344,7 @@
icon_state = "burst_l";
tag = "icon-burst_l (WEST)"
},
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating/airless,
/area/awaycontent/a1{
has_gravity = 1;
name = "MO19 Arrivals"
@@ -8557,7 +8465,7 @@
"mq" = (
/obj/structure/table,
/obj/item/storage/box/donkpockets,
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/awaycontent/a1{
has_gravity = 1;
name = "MO19 Arrivals"
@@ -8569,17 +8477,13 @@
/obj/structure/chair/comfy/shuttle{
dir = 1
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor2"
- },
+/turf/simulated/floor/mineral/titanium/yellow,
/area/awaycontent/a1{
has_gravity = 1;
name = "MO19 Arrivals"
})
"ms" = (
-/turf/simulated/shuttle/floor{
- icon_state = "floor2"
- },
+/turf/simulated/floor/mineral/titanium/yellow,
/area/awaycontent/a1{
has_gravity = 1;
name = "MO19 Arrivals"
@@ -8588,7 +8492,7 @@
/obj/effect/landmark{
name = "awaystart"
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/awaycontent/a1{
has_gravity = 1;
name = "MO19 Arrivals"
@@ -8600,7 +8504,7 @@
/obj/structure/chair/comfy/shuttle{
dir = 8
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/awaycontent/a1{
has_gravity = 1;
name = "MO19 Arrivals"
@@ -8612,9 +8516,7 @@
/obj/structure/window/reinforced{
dir = 1
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor2"
- },
+/turf/simulated/floor/mineral/titanium/yellow,
/area/awaycontent/a1{
has_gravity = 1;
name = "MO19 Arrivals"
@@ -8761,18 +8663,16 @@
})
"mH" = (
/obj/machinery/computer/shuttle,
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/awaycontent/a1{
has_gravity = 1;
name = "MO19 Arrivals"
})
"mI" = (
-/obj/machinery/door/airlock/shuttle{
+/obj/machinery/door/airlock/titanium{
name = "Shuttle Cockpit"
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor2"
- },
+/turf/simulated/floor/mineral/titanium/yellow,
/area/awaycontent/a1{
has_gravity = 1;
name = "MO19 Arrivals"
@@ -8781,9 +8681,7 @@
/obj/effect/landmark{
name = "awaystart"
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor2"
- },
+/turf/simulated/floor/mineral/titanium/yellow,
/area/awaycontent/a1{
has_gravity = 1;
name = "MO19 Arrivals"
@@ -8798,18 +8696,16 @@
/obj/effect/landmark{
name = "awaystart"
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor2"
- },
+/turf/simulated/floor/mineral/titanium/yellow,
/area/awaycontent/a1{
has_gravity = 1;
name = "MO19 Arrivals"
})
"mL" = (
-/obj/machinery/door/airlock/shuttle{
+/obj/machinery/door/airlock/titanium{
name = "Shuttle Airlock"
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/plating,
/area/awaycontent/a1{
has_gravity = 1;
name = "MO19 Arrivals"
@@ -8930,7 +8826,7 @@
/obj/structure/table,
/obj/item/clipboard,
/obj/item/pen,
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/awaycontent/a1{
has_gravity = 1;
name = "MO19 Arrivals"
@@ -8940,18 +8836,7 @@
dir = 4
},
/obj/structure/chair/comfy/shuttle,
-/turf/simulated/shuttle/floor{
- icon_state = "floor2"
- },
-/area/awaycontent/a1{
- has_gravity = 1;
- name = "MO19 Arrivals"
- })
-"mY" = (
-/turf/simulated/shuttle/wall{
- icon_state = "swall2";
- dir = 2
- },
+/turf/simulated/floor/mineral/titanium/yellow,
/area/awaycontent/a1{
has_gravity = 1;
name = "MO19 Arrivals"
@@ -8961,9 +8846,7 @@
dir = 4
},
/obj/structure/window/reinforced,
-/turf/simulated/shuttle/floor{
- icon_state = "floor2"
- },
+/turf/simulated/floor/mineral/titanium/yellow,
/area/awaycontent/a1{
has_gravity = 1;
name = "MO19 Arrivals"
@@ -9013,29 +8896,9 @@
has_gravity = 1;
name = "MO19 Arrivals"
})
-"ne" = (
-/turf/simulated/floor/plating/asteroid/airless,
-/turf/simulated/shuttle/wall{
- icon_state = "swall_f5";
- dir = 2
- },
-/area/awaycontent/a1{
- has_gravity = 1;
- name = "MO19 Arrivals"
- })
-"nf" = (
-/turf/simulated/shuttle/floor,
-/turf/simulated/shuttle/wall{
- icon_state = "swall_f10";
- dir = 2
- },
-/area/awaycontent/a1{
- has_gravity = 1;
- name = "MO19 Arrivals"
- })
"ng" = (
/obj/structure/filingcabinet,
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/awaycontent/a1{
has_gravity = 1;
name = "MO19 Arrivals"
@@ -9045,7 +8908,7 @@
/obj/structure/chair/comfy/shuttle{
dir = 8
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/awaycontent/a1{
has_gravity = 1;
name = "MO19 Arrivals"
@@ -9056,7 +8919,7 @@
pixel_y = -30
},
/obj/machinery/light/small,
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/awaycontent/a1{
has_gravity = 1;
name = "MO19 Arrivals"
@@ -9116,15 +8979,6 @@
/obj/effect/decal/cleanable/dirt,
/obj/item/trash/candy,
/turf/simulated/floor/plating,
-/area/awaycontent/a1{
- has_gravity = 1;
- name = "MO19 Arrivals"
- })
-"no" = (
-/turf/simulated/shuttle/wall{
- icon_state = "swall13";
- dir = 2
- },
/area/awaycontent/a1{
has_gravity = 1;
name = "MO19 Arrivals"
@@ -9190,16 +9044,6 @@
"nv" = (
/obj/effect/decal/warning_stripes/west,
/turf/simulated/floor/plasteel,
-/area/awaycontent/a1{
- has_gravity = 1;
- name = "MO19 Arrivals"
- })
-"nw" = (
-/turf/simulated/floor/plating/asteroid/airless,
-/turf/simulated/shuttle/wall{
- icon_state = "swall_f9";
- dir = 2
- },
/area/awaycontent/a1{
has_gravity = 1;
name = "MO19 Arrivals"
@@ -13624,10 +13468,10 @@ aZ
aZ
aZ
ld
-lB
-lB
-lB
-ne
+is
+is
+is
+ld
aZ
aZ
aZ
@@ -13737,12 +13581,12 @@ aZ
aZ
aZ
ld
-lW
+ld
mq
mH
mW
-nf
-ne
+ld
+ld
aZ
aZ
dA
@@ -13850,13 +13694,13 @@ dA
aZ
aZ
aZ
-le
+ld
lX
mc
md
mc
ng
-le
+ld
aZ
aZ
dA
@@ -13964,13 +13808,13 @@ eU
eT
aZ
aZ
-le
+ld
lY
mr
ms
mX
lY
-le
+ld
aZ
aZ
dA
@@ -14078,13 +13922,13 @@ kc
eT
aZ
aZ
-lz
-lZ
-lD
+ld
+ld
+ld
mI
-mY
-lZ
-no
+ld
+ld
+ld
aZ
aZ
dA
@@ -14192,13 +14036,13 @@ fr
eU
aZ
aZ
-le
+ld
ma
ms
ms
ms
ma
-le
+ld
aZ
aZ
dA
@@ -14306,13 +14150,13 @@ gi
eU
hJ
aZ
-lA
+ld
mb
md
ms
md
nh
-lA
+ld
aZ
aZ
dA
@@ -14420,13 +14264,13 @@ kh
km
hJ
aZ
-lB
+is
mc
mt
mJ
mt
mc
-lB
+is
aZ
aZ
dA
@@ -14534,13 +14378,13 @@ jW
kw
is
aZ
-lC
+ld
md
mu
mK
mu
md
-lC
+ld
aZ
aZ
aZ
@@ -14648,13 +14492,13 @@ jW
kv
is
aZ
-lA
+ld
me
mt
mJ
mt
ni
-lA
+ld
aZ
aZ
dA
@@ -14762,13 +14606,13 @@ kl
kw
is
aZ
-lB
+is
md
md
ms
md
md
-lB
+is
aZ
aZ
dA
@@ -14876,14 +14720,14 @@ ku
kx
hJ
ld
-lD
+ld
mf
mc
ms
mc
mf
-mY
-ne
+ld
+ld
aZ
dA
dA
@@ -14989,7 +14833,7 @@ jw
li
kw
is
-le
+ld
lK
lK
mv
@@ -14997,7 +14841,7 @@ ms
mZ
lK
lK
-le
+ld
aZ
dA
dA
@@ -15103,15 +14947,15 @@ jI
kW
kv
is
-lf
+ld
lF
mg
-lD
+ld
mL
-mY
+ld
lF
mg
-nw
+ld
aZ
dA
dA
diff --git a/_maps/map_files/RandomZLevels/spacebattle.dmm b/_maps/map_files/RandomZLevels/spacebattle.dmm
index 2b73166db76..82ff15e5bd5 100644
--- a/_maps/map_files/RandomZLevels/spacebattle.dmm
+++ b/_maps/map_files/RandomZLevels/spacebattle.dmm
@@ -6,11 +6,7 @@
/turf/space,
/area/space)
"ac" = (
-/turf/space,
-/turf/simulated/shuttle/wall{
- dir = 8;
- icon_state = "diagonalWall3"
- },
+/turf/simulated/wall/mineral/plastitanium,
/area/awaymission/spacebattle/syndicate2)
"ad" = (
/obj/structure/shuttle/engine/propulsion{
@@ -26,7 +22,7 @@
icon_state = "propulsion";
dir = 1
},
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating/airless,
/area/awaymission/spacebattle/syndicate2)
"af" = (
/obj/structure/shuttle/engine/propulsion{
@@ -36,18 +32,6 @@
},
/turf/space,
/area/awaymission/spacebattle/syndicate2)
-"ag" = (
-/turf/space,
-/turf/simulated/shuttle/wall{
- dir = 1;
- icon_state = "diagonalWall3"
- },
-/area/awaymission/spacebattle/syndicate2)
-"ah" = (
-/turf/simulated/shuttle/wall{
- icon_state = "wall3"
- },
-/area/awaymission/spacebattle/syndicate2)
"ai" = (
/obj/structure/shuttle/engine/heater{
tag = "icon-heater (NORTH)";
@@ -55,91 +39,63 @@
dir = 1
},
/obj/structure/window/reinforced,
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating/airless,
/area/awaymission/spacebattle/syndicate2)
"aj" = (
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/awaymission/spacebattle/syndicate2)
"ak" = (
/obj/machinery/door/airlock/external,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/plating,
/area/awaymission/spacebattle/syndicate2)
"al" = (
/mob/living/simple_animal/hostile/syndicate/ranged,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/awaymission/spacebattle/syndicate2)
"am" = (
/obj/structure/table/reinforced,
/obj/item/clothing/suit/space/hardsuit/syndi,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/awaymission/spacebattle/syndicate2)
"an" = (
/obj/structure/table/reinforced,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/awaymission/spacebattle/syndicate2)
"ao" = (
/obj/machinery/sleeper,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/awaymission/spacebattle/syndicate2)
"ap" = (
/obj/effect/landmark{
name = "awaystart"
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/awaymission/spacebattle/syndicate2)
"aq" = (
/mob/living/simple_animal/hostile/syndicate/melee,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/awaymission/spacebattle/syndicate2)
"ar" = (
-/obj/machinery/door/unpowered/shuttle,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/obj/machinery/door/airlock/titanium,
+/turf/simulated/floor/mineral/plastitanium/red,
/area/awaymission/spacebattle/syndicate2)
"as" = (
/obj/structure/table/reinforced,
/obj/item/grenade/empgrenade,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/awaymission/spacebattle/syndicate2)
"at" = (
/obj/structure/table/reinforced,
/obj/item/ammo_casing/c10mm,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/awaymission/spacebattle/syndicate2)
"au" = (
/obj/structure/table/reinforced,
/obj/item/gun/projectile/automatic/c20r,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/awaymission/spacebattle/syndicate2)
"av" = (
-/turf/space,
-/turf/simulated/shuttle/wall{
- dir = 8;
- icon_state = "diagonalWall3"
- },
+/turf/simulated/wall/mineral/plastitanium,
/area/awaymission/spacebattle/syndicate3)
"aw" = (
/obj/structure/shuttle/engine/propulsion{
@@ -147,7 +103,7 @@
icon_state = "propulsion_r";
dir = 1
},
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating/airless,
/area/awaymission/spacebattle/syndicate3)
"ax" = (
/obj/structure/shuttle/engine/propulsion{
@@ -155,7 +111,7 @@
icon_state = "propulsion";
dir = 1
},
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating/airless,
/area/awaymission/spacebattle/syndicate3)
"ay" = (
/obj/structure/shuttle/engine/propulsion{
@@ -163,27 +119,13 @@
icon_state = "propulsion_l";
dir = 1
},
-/turf/simulated/shuttle/plating,
-/area/awaymission/spacebattle/syndicate3)
-"az" = (
-/turf/space,
-/turf/simulated/shuttle/wall{
- dir = 1;
- icon_state = "diagonalWall3"
- },
+/turf/simulated/floor/plating/airless,
/area/awaymission/spacebattle/syndicate3)
"aA" = (
/obj/structure/table/reinforced,
/obj/item/gun/projectile/automatic/pistol,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/awaymission/spacebattle/syndicate2)
-"aB" = (
-/turf/simulated/shuttle/wall{
- icon_state = "wall3"
- },
-/area/awaymission/spacebattle/syndicate3)
"aC" = (
/obj/structure/shuttle/engine/heater{
tag = "icon-heater (NORTH)";
@@ -191,90 +133,41 @@
dir = 1
},
/obj/structure/window/reinforced,
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating/airless,
/area/awaymission/spacebattle/syndicate3)
"aD" = (
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/awaymission/spacebattle/syndicate3)
"aE" = (
/obj/machinery/door/airlock/external,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/plating,
/area/awaymission/spacebattle/syndicate3)
"aF" = (
/obj/effect/landmark{
name = "awaystart"
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/awaymission/spacebattle/syndicate3)
-"aG" = (
-/turf/space,
-/turf/simulated/shuttle/wall{
- icon_state = "diagonalWall3"
- },
-/area/awaymission/spacebattle/syndicate2)
"aH" = (
/obj/structure/chair/comfy/shuttle,
/mob/living/simple_animal/hostile/syndicate,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
-/area/awaymission/spacebattle/syndicate2)
-"aI" = (
-/turf/space,
-/turf/simulated/shuttle/wall{
- dir = 4;
- icon_state = "diagonalWall3"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/awaymission/spacebattle/syndicate2)
"aJ" = (
/obj/structure/table/reinforced,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/awaymission/spacebattle/syndicate3)
"aK" = (
/obj/structure/table/reinforced,
/obj/item/gun/projectile/automatic/pistol/deagle,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/awaymission/spacebattle/syndicate3)
"aL" = (
/obj/machinery/computer/shuttle,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
-/area/awaymission/spacebattle/syndicate2)
-"aM" = (
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
-/turf/simulated/shuttle/wall{
- dir = 8;
- icon_state = "diagonalWall3"
- },
-/area/awaymission/spacebattle/syndicate2)
-"aN" = (
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
-/turf/simulated/shuttle/wall{
- dir = 1;
- icon_state = "diagonalWall3"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/awaymission/spacebattle/syndicate2)
"aO" = (
-/turf/space,
-/turf/simulated/shuttle/wall{
- dir = 8;
- icon_state = "diagonalWall3"
- },
+/turf/simulated/wall/mineral/plastitanium,
/area/awaymission/spacebattle/syndicate1)
"aP" = (
/obj/structure/shuttle/engine/propulsion{
@@ -282,7 +175,7 @@
icon_state = "propulsion_r";
dir = 1
},
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating/airless,
/area/awaymission/spacebattle/syndicate1)
"aQ" = (
/obj/structure/shuttle/engine/propulsion{
@@ -290,7 +183,7 @@
icon_state = "propulsion";
dir = 1
},
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating/airless,
/area/awaymission/spacebattle/syndicate1)
"aR" = (
/obj/structure/shuttle/engine/propulsion{
@@ -298,30 +191,12 @@
icon_state = "propulsion_l";
dir = 1
},
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating/airless,
/area/awaymission/spacebattle/syndicate1)
-"aS" = (
-/turf/space,
-/turf/simulated/shuttle/wall{
- dir = 1;
- icon_state = "diagonalWall3"
- },
-/area/awaymission/spacebattle/syndicate1)
-"aT" = (
-/obj/machinery/door/airlock/external,
-/turf/simulated/shuttle/plating,
-/area/awaymission/spacebattle/syndicate2)
"aU" = (
/obj/machinery/sleeper,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/awaymission/spacebattle/syndicate3)
-"aV" = (
-/turf/simulated/shuttle/wall{
- icon_state = "wall3"
- },
-/area/awaymission/spacebattle/syndicate1)
"aW" = (
/obj/structure/shuttle/engine/heater{
tag = "icon-heater (NORTH)";
@@ -329,7 +204,7 @@
dir = 1
},
/obj/structure/window/reinforced,
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating/airless,
/area/awaymission/spacebattle/syndicate1)
"aX" = (
/obj/structure/window/reinforced,
@@ -356,39 +231,29 @@
/turf/simulated/floor/plating/airless,
/area/awaymission/spacebattle/syndicate2)
"aZ" = (
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/awaymission/spacebattle/syndicate1)
"ba" = (
/obj/structure/chair/comfy/shuttle{
dir = 4
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/awaymission/spacebattle/syndicate2)
"bb" = (
/obj/structure/chair/comfy/shuttle{
dir = 8
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/awaymission/spacebattle/syndicate2)
"bc" = (
/obj/machinery/door/airlock/external,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/plating,
/area/awaymission/spacebattle/syndicate1)
"bd" = (
/obj/effect/landmark{
name = "awaystart"
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/awaymission/spacebattle/syndicate1)
"be" = (
/obj/machinery/porta_turret{
@@ -396,48 +261,36 @@
emagged = 1;
installation = /obj/item/gun/energy/lasercannon
},
-/turf/simulated/floor/plating,
+/turf/simulated/floor/plating/airless,
/area/awaymission/spacebattle/syndicate2)
"bf" = (
-/obj/machinery/door/unpowered/shuttle,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/obj/machinery/door/airlock/titanium,
+/turf/simulated/floor/mineral/plastitanium/red,
/area/awaymission/spacebattle/syndicate3)
"bg" = (
/obj/structure/table/reinforced,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/awaymission/spacebattle/syndicate1)
"bi" = (
/obj/structure/table/reinforced,
/obj/item/clothing/gloves/combat,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/awaymission/spacebattle/syndicate1)
"bj" = (
/obj/machinery/sleeper,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/awaymission/spacebattle/syndicate1)
"bk" = (
/obj/structure/table/reinforced,
/obj/item/clothing/head/helmet/swat,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/awaymission/spacebattle/syndicate3)
"bl" = (
/obj/machinery/computer/pod{
id_tags = list("spacebattlepod3");
name = "Hull Door Control"
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/awaymission/spacebattle/syndicate2)
"bm" = (
/obj/machinery/door/poddoor{
@@ -446,71 +299,30 @@
name = "Front Hull Door";
opacity = 1
},
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating,
/area/awaymission/spacebattle/syndicate2)
"bn" = (
-/obj/machinery/door/unpowered/shuttle,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/obj/machinery/door/airlock/titanium,
+/turf/simulated/floor/mineral/plastitanium/red,
/area/awaymission/spacebattle/syndicate1)
"bo" = (
/obj/structure/table/reinforced,
/obj/item/grenade/spawnergrenade/manhacks,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/awaymission/spacebattle/syndicate1)
-"bp" = (
-/turf/space,
-/turf/simulated/shuttle/wall{
- icon_state = "diagonalWall3"
- },
-/area/awaymission/spacebattle/syndicate3)
"bq" = (
/obj/structure/chair/comfy/shuttle,
/mob/living/simple_animal/hostile/syndicate,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
-/area/awaymission/spacebattle/syndicate3)
-"br" = (
-/turf/space,
-/turf/simulated/shuttle/wall{
- dir = 4;
- icon_state = "diagonalWall3"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/awaymission/spacebattle/syndicate3)
"bs" = (
/obj/machinery/computer/shuttle,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
-/area/awaymission/spacebattle/syndicate3)
-"bt" = (
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
-/turf/simulated/shuttle/wall{
- dir = 8;
- icon_state = "diagonalWall3"
- },
-/area/awaymission/spacebattle/syndicate3)
-"bu" = (
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
-/turf/simulated/shuttle/wall{
- dir = 1;
- icon_state = "diagonalWall3"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/awaymission/spacebattle/syndicate3)
"bv" = (
/obj/structure/table/reinforced,
/obj/item/clothing/head/helmet/swat,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/awaymission/spacebattle/syndicate1)
"bw" = (
/obj/machinery/porta_turret{
@@ -518,51 +330,16 @@
emagged = 1;
installation = /obj/item/gun/energy/lasercannon
},
-/turf/simulated/floor/plating,
+/turf/simulated/floor/plating/airless,
/area/awaymission/spacebattle/syndicate3)
-"bx" = (
-/turf/space,
-/turf/simulated/shuttle/wall{
- icon_state = "diagonalWall3"
- },
-/area/awaymission/spacebattle/syndicate1)
"by" = (
/obj/structure/chair/comfy/shuttle,
/mob/living/simple_animal/hostile/syndicate,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
-/area/awaymission/spacebattle/syndicate1)
-"bz" = (
-/turf/space,
-/turf/simulated/shuttle/wall{
- dir = 4;
- icon_state = "diagonalWall3"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/awaymission/spacebattle/syndicate1)
"bA" = (
/obj/machinery/computer/shuttle,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
-/area/awaymission/spacebattle/syndicate1)
-"bB" = (
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
-/turf/simulated/shuttle/wall{
- dir = 8;
- icon_state = "diagonalWall3"
- },
-/area/awaymission/spacebattle/syndicate1)
-"bC" = (
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
-/turf/simulated/shuttle/wall{
- dir = 1;
- icon_state = "diagonalWall3"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/awaymission/spacebattle/syndicate1)
"bD" = (
/obj/machinery/porta_turret{
@@ -570,14 +347,10 @@
emagged = 1;
installation = /obj/item/gun/energy/lasercannon
},
-/turf/simulated/floor/plating,
+/turf/simulated/floor/plating/airless,
/area/awaymission/spacebattle/syndicate1)
"bE" = (
-/turf/space,
-/turf/simulated/shuttle/wall{
- dir = 8;
- icon_state = "diagonalWall3"
- },
+/turf/simulated/wall/mineral/plastitanium,
/area/awaymission/spacebattle/cruiser)
"bF" = (
/obj/structure/shuttle/engine/propulsion{
@@ -585,11 +358,11 @@
icon_state = "propulsion_r";
dir = 1
},
-/turf/space,
+/turf/simulated/floor/plating/airless,
/area/awaymission/spacebattle/cruiser)
"bG" = (
/obj/machinery/door/airlock/external,
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating,
/area/awaymission/spacebattle/cruiser)
"bH" = (
/obj/structure/shuttle/engine/propulsion{
@@ -597,19 +370,7 @@
icon_state = "propulsion_l";
dir = 1
},
-/turf/space,
-/area/awaymission/spacebattle/cruiser)
-"bI" = (
-/turf/space,
-/turf/simulated/shuttle/wall{
- dir = 1;
- icon_state = "diagonalWall3"
- },
-/area/awaymission/spacebattle/cruiser)
-"bJ" = (
-/turf/simulated/shuttle/wall{
- icon_state = "wall3"
- },
+/turf/simulated/floor/plating/airless,
/area/awaymission/spacebattle/cruiser)
"bK" = (
/obj/structure/window/reinforced,
@@ -624,9 +385,7 @@
/turf/simulated/floor/plating/airless,
/area/awaymission/spacebattle/cruiser)
"bL" = (
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/awaymission/spacebattle/cruiser)
"bM" = (
/obj/structure/window/reinforced,
@@ -644,53 +403,16 @@
/obj/structure/chair/comfy/shuttle{
dir = 4
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/awaymission/spacebattle/cruiser)
"bO" = (
/obj/structure/chair/comfy/shuttle{
dir = 8
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/awaymission/spacebattle/cruiser)
"bP" = (
-/turf/space,
-/turf/simulated/shuttle/wall{
- tag = "icon-swall_f6";
- icon_state = "swall_f6";
- dir = 2
- },
-/area/awaymission/spacebattle/cruiser)
-"bQ" = (
-/turf/simulated/shuttle/wall{
- tag = "icon-swall12";
- icon_state = "swall12";
- dir = 2
- },
-/area/awaymission/spacebattle/cruiser)
-"bR" = (
-/turf/simulated/shuttle/wall{
- tag = "icon-swall14";
- icon_state = "swall14"
- },
-/area/awaymission/spacebattle/cruiser)
-"bS" = (
-/turf/simulated/shuttle/wall{
- tag = "icon-swall12";
- icon_state = "swall12"
- },
-/area/awaymission/spacebattle/cruiser)
-"bT" = (
-/turf/space,
-/turf/simulated/shuttle/wall{
- dir = 3;
- icon_state = "swall_f10";
- layer = 2;
- tag = "icon-swall_f10"
- },
+/turf/simulated/wall/mineral/titanium,
/area/awaymission/spacebattle/cruiser)
"bU" = (
/obj/structure/shuttle/engine/propulsion{
@@ -698,7 +420,7 @@
icon_state = "burst_l";
dir = 4
},
-/turf/space,
+/turf/simulated/floor/plating/airless,
/area/awaymission/spacebattle/cruiser)
"bV" = (
/obj/structure/shuttle/engine/heater{
@@ -709,10 +431,7 @@
/obj/structure/window/reinforced{
dir = 4
},
-/turf/simulated/floor/plasteel{
- tag = "icon-engine";
- icon_state = "engine"
- },
+/turf/simulated/floor/plating/airless,
/area/awaymission/spacebattle/cruiser)
"bX" = (
/obj/effect/landmark/damageturf,
@@ -723,41 +442,27 @@
id_tags = list("spacebattlepod");
name = "Hull Door Control"
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/awaymission/spacebattle/cruiser)
"bZ" = (
/turf/simulated/floor/plasteel,
/area/awaymission/spacebattle/cruiser)
"ca" = (
-/obj/machinery/door/unpowered/shuttle,
+/obj/machinery/door/airlock/titanium,
/turf/simulated/floor/plasteel,
/area/awaymission/spacebattle/cruiser)
-"cb" = (
-/turf/simulated/shuttle/wall{
- tag = "icon-swall3";
- icon_state = "swall3"
- },
-/area/awaymission/spacebattle/cruiser)
"cc" = (
/obj/structure/shuttle/engine/propulsion{
tag = "icon-propulsion (EAST)";
icon_state = "propulsion";
dir = 4
},
-/turf/space,
+/turf/simulated/floor/plating/airless,
/area/awaymission/spacebattle/cruiser)
"cd" = (
/obj/structure/table/reinforced,
/turf/simulated/floor/plasteel,
/area/awaymission/spacebattle/cruiser)
-"ce" = (
-/turf/simulated/floor/plasteel,
-/turf/simulated/shuttle/wall{
- icon_state = "diagonalWall3"
- },
-/area/awaymission/spacebattle/cruiser)
"cf" = (
/obj/machinery/door/poddoor{
density = 0;
@@ -767,14 +472,7 @@
opacity = 1;
tag = "icon-pdoor0"
},
-/turf/simulated/shuttle/plating,
-/area/awaymission/spacebattle/cruiser)
-"cg" = (
-/turf/simulated/floor/plasteel,
-/turf/simulated/shuttle/wall{
- dir = 4;
- icon_state = "diagonalWall3"
- },
+/turf/simulated/floor/plating,
/area/awaymission/spacebattle/cruiser)
"ch" = (
/mob/living/simple_animal/hostile/syndicate/melee/space,
@@ -817,24 +515,6 @@
/obj/effect/decal/cleanable/blood,
/turf/simulated/floor/plasteel,
/area/awaymission/spacebattle/cruiser)
-"cp" = (
-/turf/simulated/shuttle/wall{
- tag = "icon-swall7";
- icon_state = "swall7"
- },
-/area/awaymission/spacebattle/cruiser)
-"cq" = (
-/turf/simulated/shuttle/wall{
- tag = "icon-swallc1";
- icon_state = "swallc1"
- },
-/area/awaymission/spacebattle/cruiser)
-"cr" = (
-/turf/simulated/shuttle/wall{
- tag = "icon-swallc2";
- icon_state = "swallc2"
- },
-/area/awaymission/spacebattle/cruiser)
"cs" = (
/obj/machinery/power/smes/magical{
desc = "A high-capacity superconducting magnetic energy storage (SMES) unit.";
@@ -927,7 +607,7 @@
},
/area/awaymission/spacebattle/cruiser)
"cG" = (
-/obj/machinery/door/unpowered/shuttle,
+/obj/machinery/door/airlock/titanium,
/turf/simulated/floor/plating,
/area/awaymission/spacebattle/cruiser)
"cH" = (
@@ -962,12 +642,6 @@
/obj/item/stack/sheet/metal,
/turf/simulated/floor/plasteel,
/area/awaymission/spacebattle/cruiser)
-"cO" = (
-/turf/simulated/shuttle/wall{
- tag = "icon-swallc3";
- icon_state = "swallc3"
- },
-/area/awaymission/spacebattle/cruiser)
"cP" = (
/obj/effect/mob_spawn/human/engineer{
name = "Bill Sanchez"
@@ -976,7 +650,7 @@
/turf/simulated/floor/plasteel,
/area/awaymission/spacebattle/cruiser)
"cQ" = (
-/obj/machinery/door/unpowered/shuttle,
+/obj/machinery/door/airlock/titanium,
/turf/simulated/floor/plasteel{
icon_state = "cafeteria";
dir = 2
@@ -1010,16 +684,7 @@
/turf/simulated/floor/plasteel,
/area/awaymission/spacebattle/cruiser)
"cV" = (
-/obj/structure/grille,
-/obj/structure/window/reinforced{
- dir = 4
- },
-/obj/structure/window/reinforced{
- dir = 8
- },
-/obj/structure/window/reinforced{
- dir = 1
- },
+/obj/effect/spawner/window/reinforced,
/turf/simulated/floor/plating,
/area/awaymission/spacebattle/cruiser)
"cW" = (
@@ -1039,20 +704,7 @@
id_tags = list("spacebattlepod2");
name = "Hull Door Control"
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
-/area/awaymission/spacebattle/cruiser)
-"da" = (
-/obj/structure/grille,
-/obj/structure/window/reinforced{
- dir = 4
- },
-/obj/structure/window/reinforced{
- dir = 8
- },
-/obj/structure/window/reinforced,
-/turf/simulated/floor/plating,
+/turf/simulated/floor/mineral/plastitanium/red,
/area/awaymission/spacebattle/cruiser)
"db" = (
/obj/machinery/shieldgen{
@@ -1066,7 +718,7 @@
icon_state = "propulsion_r";
dir = 4
},
-/turf/space,
+/turf/simulated/floor/plating/airless,
/area/awaymission/spacebattle/cruiser)
"dd" = (
/obj/effect/mob_spawn/human/engineer{
@@ -1108,20 +760,6 @@
icon_state = "bar"
},
/area/awaymission/spacebattle/cruiser)
-"dl" = (
-/turf/simulated/shuttle/wall{
- tag = "icon-swall7";
- icon_state = "swall7";
- dir = 2
- },
-/area/awaymission/spacebattle/cruiser)
-"dm" = (
-/turf/simulated/shuttle/wall{
- tag = "icon-swall11";
- icon_state = "swall11";
- dir = 2
- },
-/area/awaymission/spacebattle/cruiser)
"dn" = (
/obj/effect/mob_spawn/human/corpse/syndicatesoldier,
/obj/item/gun/projectile/automatic/c20r,
@@ -1137,34 +775,11 @@
opacity = 1;
tag = "icon-pdoor0"
},
-/turf/simulated/shuttle/plating,
-/area/awaymission/spacebattle/cruiser)
-"dq" = (
-/turf/space,
-/turf/simulated/shuttle/wall{
- tag = "icon-swall_f5";
- icon_state = "swall_f5";
- dir = 2
- },
+/turf/simulated/floor/plating,
/area/awaymission/spacebattle/cruiser)
"dr" = (
/obj/effect/decal/cleanable/blood,
-/turf/simulated/shuttle/wall{
- tag = "icon-swall12";
- icon_state = "swall12"
- },
-/area/awaymission/spacebattle/cruiser)
-"ds" = (
-/turf/simulated/shuttle/wall{
- tag = "icon-swall15";
- icon_state = "swall15"
- },
-/area/awaymission/spacebattle/cruiser)
-"dt" = (
-/turf/simulated/shuttle/wall{
- tag = "icon-swall11";
- icon_state = "swall11"
- },
+/turf/simulated/wall/mineral/titanium,
/area/awaymission/spacebattle/cruiser)
"du" = (
/obj/effect/mob_spawn/human/cook{
@@ -1216,38 +831,7 @@
/turf/simulated/floor/plating/airless,
/area/awaymission/spacebattle/cruiser)
"dC" = (
-/obj/structure/grille,
-/obj/structure/window/reinforced{
- dir = 1
- },
-/obj/structure/window/reinforced{
- dir = 8
- },
-/turf/simulated/floor/engine,
-/area/awaymission/spacebattle/cruiser)
-"dD" = (
-/obj/structure/grille,
-/obj/structure/window/reinforced{
- dir = 1
- },
-/obj/structure/window/reinforced,
-/turf/simulated/floor/engine,
-/area/awaymission/spacebattle/cruiser)
-"dE" = (
-/obj/structure/grille,
-/obj/structure/window/reinforced{
- dir = 1
- },
-/turf/simulated/floor/engine,
-/area/awaymission/spacebattle/cruiser)
-"dF" = (
-/obj/structure/grille,
-/obj/structure/window/reinforced{
- dir = 1
- },
-/obj/structure/window/reinforced{
- dir = 4
- },
+/obj/effect/spawner/window/reinforced,
/turf/simulated/floor/engine,
/area/awaymission/spacebattle/cruiser)
"dH" = (
@@ -1336,16 +920,6 @@
/obj/effect/decal/cleanable/blood,
/turf/simulated/floor/plating/airless,
/area/awaymission/spacebattle/cruiser)
-"dW" = (
-/obj/structure/grille,
-/obj/structure/window/reinforced{
- dir = 4
- },
-/obj/structure/window/reinforced{
- dir = 8
- },
-/turf/simulated/floor/engine,
-/area/awaymission/spacebattle/cruiser)
"dX" = (
/obj/machinery/porta_turret{
dir = 8;
@@ -1354,16 +928,6 @@
},
/turf/simulated/floor/engine,
/area/awaymission/spacebattle/cruiser)
-"dZ" = (
-/obj/structure/grille,
-/obj/structure/window/reinforced{
- dir = 4
- },
-/obj/structure/window/reinforced{
- dir = 8
- },
-/turf/simulated/floor/plating,
-/area/awaymission/spacebattle/cruiser)
"ea" = (
/obj/machinery/gateway{
dir = 9
@@ -1409,17 +973,6 @@
dir = 4
},
/area/awaymission/spacebattle/cruiser)
-"ei" = (
-/obj/structure/grille,
-/obj/structure/window/reinforced,
-/obj/structure/window/reinforced{
- dir = 4
- },
-/obj/structure/window/reinforced{
- dir = 8
- },
-/turf/simulated/floor/engine,
-/area/awaymission/spacebattle/cruiser)
"ej" = (
/turf/simulated/floor/engine,
/area/awaymission/spacebattle/cruiser)
@@ -1450,23 +1003,7 @@
},
/area/awaymission/spacebattle/cruiser)
"eo" = (
-/turf/space,
-/turf/simulated/shuttle/wall{
- dir = 8;
- icon_state = "diagonalWall3"
- },
-/area/awaymission/spacebattle/syndicate4)
-"ep" = (
-/turf/simulated/shuttle/wall{
- icon_state = "wall3"
- },
-/area/awaymission/spacebattle/syndicate4)
-"eq" = (
-/turf/space,
-/turf/simulated/shuttle/wall{
- dir = 1;
- icon_state = "diagonalWall3"
- },
+/turf/simulated/wall/mineral/plastitanium,
/area/awaymission/spacebattle/syndicate4)
"er" = (
/obj/machinery/gateway{
@@ -1513,13 +1050,6 @@
dir = 4
},
/area/awaymission/spacebattle/cruiser)
-"ez" = (
-/turf/simulated/shuttle/wall{
- tag = "icon-swall3";
- icon_state = "swall3";
- dir = 2
- },
-/area/awaymission/spacebattle/cruiser)
"eA" = (
/obj/structure/table/reinforced,
/turf/simulated/floor/plasteel{
@@ -1541,19 +1071,6 @@
icon_state = "bluefull"
},
/area/awaymission/spacebattle/cruiser)
-"eD" = (
-/obj/structure/grille,
-/obj/structure/window/reinforced{
- dir = 8
- },
-/obj/structure/window/reinforced{
- dir = 4
- },
-/obj/structure/window/reinforced{
- dir = 1
- },
-/turf/simulated/floor/plating,
-/area/awaymission/spacebattle/cruiser)
"eE" = (
/mob/living/simple_animal/hostile/syndicate/melee/space,
/turf/simulated/floor/plating/airless,
@@ -1565,29 +1082,12 @@
/obj/effect/decal/cleanable/blood,
/turf/simulated/floor/plating/airless,
/area/awaymission/spacebattle/cruiser)
-"eG" = (
-/turf/simulated/shuttle/wall{
- tag = "icon-swall13";
- icon_state = "swall13";
- dir = 2
- },
-/area/awaymission/spacebattle/cruiser)
-"eH" = (
-/turf/simulated/shuttle/wall{
- tag = "icon-swallc4";
- icon_state = "swallc4"
- },
-/area/awaymission/spacebattle/cruiser)
"eI" = (
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/awaymission/spacebattle/syndicate4)
"eJ" = (
/obj/machinery/computer/shuttle,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/awaymission/spacebattle/syndicate4)
"eK" = (
/turf/simulated/floor/plasteel{
@@ -1612,30 +1112,16 @@
icon_state = "bluefull"
},
/area/awaymission/spacebattle/cruiser)
-"eO" = (
-/obj/structure/grille,
-/obj/structure/window/reinforced{
- dir = 8
- },
-/obj/structure/window/reinforced{
- dir = 4
- },
-/turf/simulated/floor/plating,
-/area/awaymission/spacebattle/cruiser)
"eP" = (
/obj/machinery/sleeper,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/awaymission/spacebattle/syndicate4)
"eQ" = (
/obj/structure/chair/comfy/shuttle{
dir = 1
},
/mob/living/simple_animal/hostile/syndicate,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/awaymission/spacebattle/syndicate4)
"eR" = (
/obj/structure/closet/crate,
@@ -1734,16 +1220,14 @@
/area/awaymission/spacebattle/cruiser)
"fh" = (
/obj/machinery/computer/security/telescreen,
-/turf/simulated/shuttle/wall,
+/turf/simulated/wall/mineral/titanium,
/area/awaymission/spacebattle/cruiser)
"fi" = (
/turf/space,
/area/awaymission/spacebattle/cruiser)
"fj" = (
/obj/machinery/door/airlock/external,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/plating,
/area/awaymission/spacebattle/syndicate4)
"fk" = (
/obj/structure/closet/crate,
@@ -1918,17 +1402,6 @@
/obj/effect/decal/cleanable/blood,
/turf/simulated/floor/plasteel,
/area/awaymission/spacebattle/cruiser)
-"gm" = (
-/obj/structure/shuttle/engine/heater{
- tag = "icon-heater (WEST)";
- icon_state = "heater";
- dir = 8
- },
-/obj/structure/window/reinforced{
- dir = 4
- },
-/turf/simulated/shuttle/plating,
-/area/awaymission/spacebattle/cruiser)
"gn" = (
/obj/structure/closet/crate/secure/weapon,
/obj/item/ammo_casing/a357,
@@ -2006,31 +1479,11 @@
/obj/item/gun/projectile/shotgun/automatic/combat,
/turf/simulated/floor/plasteel,
/area/awaymission/spacebattle/cruiser)
-"gz" = (
-/turf/space,
-/turf/simulated/shuttle/wall{
- icon_state = "diagonalWall3"
- },
-/area/awaymission/spacebattle/syndicate4)
-"gA" = (
-/turf/space,
-/turf/simulated/shuttle/wall{
- dir = 4;
- icon_state = "diagonalWall3"
- },
-/area/awaymission/spacebattle/syndicate4)
"gB" = (
/obj/structure/closet/crate/secure/weapon,
/obj/item/gun/energy/laser,
/turf/simulated/floor/plating,
/area/awaymission/spacebattle/cruiser)
-"gD" = (
-/obj/effect/decal/cleanable/blood,
-/turf/simulated/shuttle/wall{
- tag = "icon-swall3";
- icon_state = "swall3"
- },
-/area/awaymission/spacebattle/cruiser)
"gE" = (
/obj/effect/mob_spawn/human/doctor{
name = "Adam Smith"
@@ -2081,18 +1534,14 @@
/turf/simulated/floor/plating/airless,
/area/awaymission/spacebattle/syndicate7)
"gM" = (
-/turf/space,
-/turf/simulated/shuttle/wall{
- dir = 1;
- icon_state = "diagonalWall3"
- },
+/turf/simulated/wall/mineral/plastitanium,
/area/awaymission/spacebattle/syndicate7)
"gN" = (
/obj/structure/shuttle/engine/heater,
/obj/structure/window/reinforced{
dir = 1
},
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating/airless,
/area/awaymission/spacebattle/syndicate4)
"gO" = (
/obj/structure/reagent_dispensers/beerkeg,
@@ -2139,32 +1588,9 @@
icon_state = "blue"
},
/area/awaymission/spacebattle/cruiser)
-"gV" = (
-/obj/structure/grille,
-/obj/structure/window/reinforced{
- dir = 8
- },
-/obj/structure/window/reinforced{
- dir = 4
- },
-/obj/structure/window/reinforced,
-/turf/simulated/floor/plating,
-/area/awaymission/spacebattle/cruiser)
-"gW" = (
-/turf/space,
-/turf/simulated/shuttle/wall{
- dir = 8;
- icon_state = "diagonalWall3"
- },
-/area/awaymission/spacebattle/syndicate7)
-"gX" = (
-/turf/simulated/shuttle/wall{
- icon_state = "wall3"
- },
-/area/awaymission/spacebattle/syndicate7)
"gY" = (
/obj/structure/shuttle/engine/propulsion,
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating/airless,
/area/awaymission/spacebattle/syndicate4)
"gZ" = (
/obj/item/pickaxe,
@@ -2191,28 +1617,15 @@
/turf/simulated/floor/plating/airless,
/area/awaymission/spacebattle/cruiser)
"hd" = (
-/obj/structure/grille,
-/obj/structure/window/reinforced{
- dir = 8
- },
-/obj/structure/window/reinforced{
- dir = 4
- },
-/obj/structure/window/reinforced{
- dir = 1
- },
+/obj/effect/spawner/window/plastitanium,
/turf/simulated/floor/plating,
/area/awaymission/spacebattle/syndicate7)
"he" = (
/obj/structure/table/reinforced,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/awaymission/spacebattle/syndicate7)
"hf" = (
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/awaymission/spacebattle/syndicate7)
"hg" = (
/obj/structure/shuttle/engine/heater{
@@ -2223,7 +1636,7 @@
/obj/structure/window/reinforced{
dir = 8
},
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating/airless,
/area/awaymission/spacebattle/syndicate7)
"hh" = (
/obj/structure/shuttle/engine/propulsion{
@@ -2231,7 +1644,7 @@
icon_state = "propulsion_l";
tag = "icon-propulsion_l (WEST)"
},
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating/airless,
/area/awaymission/spacebattle/syndicate7)
"hi" = (
/obj/structure/largecrate,
@@ -2252,42 +1665,6 @@
/obj/item/clothing/suit/space/hardsuit,
/turf/simulated/floor/plasteel,
/area/awaymission/spacebattle/cruiser)
-"hn" = (
-/obj/structure/grille,
-/obj/structure/window/reinforced{
- dir = 1
- },
-/obj/structure/window/reinforced{
- dir = 8
- },
-/obj/structure/window/reinforced{
- dir = 4
- },
-/turf/simulated/floor/engine,
-/area/awaymission/spacebattle/cruiser)
-"ho" = (
-/obj/structure/grille,
-/obj/structure/window/reinforced{
- dir = 8
- },
-/obj/structure/window/reinforced{
- dir = 1
- },
-/obj/structure/window/reinforced{
- dir = 4
- },
-/turf/simulated/floor/engine,
-/area/awaymission/spacebattle/cruiser)
-"hp" = (
-/obj/structure/grille,
-/obj/structure/window/reinforced{
- dir = 8
- },
-/obj/structure/window/reinforced{
- dir = 4
- },
-/turf/simulated/floor/plating,
-/area/awaymission/spacebattle/syndicate7)
"hr" = (
/obj/structure/largecrate,
/mob/living/simple_animal/pet/dog/corgi/puppy,
@@ -2304,7 +1681,7 @@
/turf/simulated/floor/plating,
/area/awaymission/spacebattle/cruiser)
"hu" = (
-/obj/machinery/door/unpowered/shuttle,
+/obj/machinery/door/airlock/titanium,
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -2322,30 +1699,6 @@
icon_state = "white"
},
/area/awaymission/spacebattle/cruiser)
-"hy" = (
-/obj/structure/grille,
-/obj/structure/window/reinforced{
- dir = 8
- },
-/obj/structure/window/reinforced{
- dir = 4
- },
-/turf/simulated/floor/engine,
-/area/awaymission/spacebattle/cruiser)
-"hz" = (
-/turf/space,
-/turf/simulated/shuttle/wall{
- dir = 4;
- icon_state = "diagonalWall3"
- },
-/area/awaymission/spacebattle/syndicate7)
-"hA" = (
-/turf/simulated/shuttle/wall{
- tag = "icon-swall14";
- icon_state = "swall14";
- dir = 2
- },
-/area/awaymission/spacebattle/cruiser)
"hB" = (
/obj/structure/table/reinforced,
/turf/simulated/floor/plasteel{
@@ -2367,35 +1720,6 @@
},
/turf/simulated/floor/plasteel,
/area/awaymission/spacebattle/cruiser)
-"hG" = (
-/obj/structure/grille,
-/obj/structure/window/reinforced,
-/obj/structure/window/reinforced{
- dir = 8
- },
-/turf/simulated/floor/engine,
-/area/awaymission/spacebattle/cruiser)
-"hH" = (
-/obj/structure/grille,
-/obj/structure/window/reinforced,
-/obj/structure/window/reinforced{
- dir = 1
- },
-/turf/simulated/floor/engine,
-/area/awaymission/spacebattle/cruiser)
-"hI" = (
-/obj/structure/grille,
-/obj/structure/window/reinforced,
-/turf/simulated/floor/engine,
-/area/awaymission/spacebattle/cruiser)
-"hJ" = (
-/obj/structure/grille,
-/obj/structure/window/reinforced,
-/obj/structure/window/reinforced{
- dir = 4
- },
-/turf/simulated/floor/engine,
-/area/awaymission/spacebattle/cruiser)
"hK" = (
/obj/effect/mob_spawn/human/engineer{
name = "Javier Wismer"
@@ -2404,24 +1728,18 @@
/area/awaymission/spacebattle/cruiser)
"hL" = (
/obj/machinery/computer/shuttle,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/awaymission/spacebattle/syndicate7)
"hM" = (
/obj/structure/chair/comfy/shuttle{
dir = 8
},
/mob/living/simple_animal/hostile/syndicate,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/awaymission/spacebattle/syndicate7)
"hN" = (
/obj/machinery/door/airlock/external,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/plating,
/area/awaymission/spacebattle/syndicate7)
"hO" = (
/obj/machinery/shower{
@@ -2462,26 +1780,12 @@
icon_state = "white"
},
/area/awaymission/spacebattle/cruiser)
-"hT" = (
-/turf/space,
-/turf/simulated/shuttle/wall{
- tag = "icon-swall_f9";
- icon_state = "swall_f9";
- dir = 2
- },
-/area/awaymission/spacebattle/cruiser)
"hU" = (
-/obj/machinery/door/unpowered/shuttle,
+/obj/machinery/door/airlock/titanium,
/turf/simulated/floor/plasteel{
icon_state = "freezerfloor"
},
/area/awaymission/spacebattle/cruiser)
-"hV" = (
-/turf/simulated/shuttle/wall{
- tag = "icon-swall1";
- icon_state = "swall1"
- },
-/area/awaymission/spacebattle/cruiser)
"hW" = (
/obj/item/storage/firstaid/regular,
/turf/simulated/floor/plasteel{
@@ -2555,12 +1859,6 @@
icon_state = "white"
},
/area/awaymission/spacebattle/cruiser)
-"ig" = (
-/turf/space,
-/turf/simulated/shuttle/wall{
- icon_state = "diagonalWall3"
- },
-/area/awaymission/spacebattle/syndicate7)
"ih" = (
/obj/structure/sink{
dir = 4;
@@ -2613,233 +1911,109 @@
/turf/space,
/area/space/nearstation)
"is" = (
-/turf/simulated/shuttle/wall{
- icon_state = "wall3"
- },
-/area/space/nearstation)
-"it" = (
-/turf/space,
-/turf/simulated/shuttle/wall{
- dir = 1;
- icon_state = "diagonalWall3"
- },
+/turf/simulated/wall/mineral/plastitanium,
/area/space/nearstation)
"iu" = (
/obj/machinery/sleeper,
-/turf/simulated/floor/plasteel/airless{
- tag = "icon-floor4 (SOUTHWEST)";
- icon_state = "floor4";
- dir = 10
- },
+/turf/simulated/floor/mineral/plastitanium/red/airless,
/area/space/nearstation)
"iv" = (
-/turf/simulated/floor/plasteel/airless{
- tag = "icon-floor4 (SOUTHWEST)";
- icon_state = "floor4";
- dir = 10
- },
+/turf/simulated/floor/mineral/plastitanium/red/airless,
/area/space/nearstation)
"iw" = (
/obj/effect/mob_spawn/human/corpse/syndicatesoldier,
-/turf/simulated/floor/plasteel/airless{
- tag = "icon-floor4 (SOUTHWEST)";
- icon_state = "floor4";
- dir = 10
- },
+/turf/simulated/floor/mineral/plastitanium/red/airless,
/area/space/nearstation)
"ix" = (
/obj/machinery/door/airlock/external,
-/turf/simulated/floor/plasteel/airless{
- tag = "icon-floor4 (SOUTHWEST)";
- icon_state = "floor4";
- dir = 10
- },
+/turf/simulated/floor/plating/airless,
/area/space/nearstation)
"iy" = (
/obj/item/stack/rods,
-/turf/simulated/floor/plasteel/airless{
- tag = "icon-floor4 (SOUTHWEST)";
- icon_state = "floor4";
- dir = 10
- },
+/turf/simulated/floor/mineral/plastitanium/red/airless,
/area/space/nearstation)
"iz" = (
-/turf/space,
-/turf/simulated/shuttle/wall{
- dir = 8;
- icon_state = "diagonalWall3"
- },
+/turf/simulated/wall/mineral/plastitanium,
/area/awaymission/spacebattle/syndicate5)
-"iA" = (
-/turf/simulated/shuttle/wall{
- icon_state = "wall3"
- },
-/area/awaymission/spacebattle/syndicate5)
-"iB" = (
-/turf/space,
-/turf/simulated/shuttle/wall{
- dir = 1;
- icon_state = "diagonalWall3"
- },
-/area/awaymission/spacebattle/syndicate5)
-"iC" = (
-/obj/machinery/sleeper,
-/turf/simulated/floor/plasteel/airless,
-/area/space/nearstation)
"iD" = (
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/awaymission/spacebattle/syndicate5)
"iE" = (
/obj/machinery/computer/shuttle,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/awaymission/spacebattle/syndicate5)
-"iF" = (
-/turf/space,
-/turf/simulated/shuttle/wall{
- icon_state = "diagonalWall3"
- },
-/area/space/nearstation)
-"iG" = (
-/turf/space,
-/turf/simulated/shuttle/wall{
- dir = 4;
- icon_state = "diagonalWall3"
- },
-/area/space/nearstation)
"iH" = (
/obj/machinery/sleeper,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/awaymission/spacebattle/syndicate5)
"iI" = (
/obj/structure/chair/comfy/shuttle{
dir = 1
},
/mob/living/simple_animal/hostile/syndicate,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/awaymission/spacebattle/syndicate5)
"iJ" = (
/obj/structure/shuttle/engine/heater,
/obj/structure/window/reinforced{
dir = 1
},
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating/airless,
/area/space/nearstation)
"iK" = (
/obj/structure/shuttle/engine/propulsion,
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating/airless,
/area/space/nearstation)
"iL" = (
/obj/machinery/door/airlock/external,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
-/area/awaymission/spacebattle/syndicate5)
-"iM" = (
-/turf/space,
-/turf/simulated/shuttle/wall{
- icon_state = "diagonalWall3"
- },
-/area/awaymission/spacebattle/syndicate5)
-"iN" = (
-/turf/space,
-/turf/simulated/shuttle/wall{
- dir = 4;
- icon_state = "diagonalWall3"
- },
+/turf/simulated/floor/plating,
/area/awaymission/spacebattle/syndicate5)
"iO" = (
/obj/structure/shuttle/engine/heater,
/obj/structure/window/reinforced{
dir = 1
},
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating/airless,
/area/awaymission/spacebattle/syndicate5)
"iP" = (
/obj/structure/shuttle/engine/propulsion,
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating/airless,
/area/awaymission/spacebattle/syndicate5)
"iQ" = (
-/turf/space,
-/turf/simulated/shuttle/wall{
- dir = 8;
- icon_state = "diagonalWall3"
- },
-/area/awaymission/spacebattle/syndicate6)
-"iR" = (
-/turf/simulated/shuttle/wall{
- icon_state = "wall3"
- },
-/area/awaymission/spacebattle/syndicate6)
-"iS" = (
-/turf/space,
-/turf/simulated/shuttle/wall{
- dir = 1;
- icon_state = "diagonalWall3"
- },
+/turf/simulated/wall/mineral/plastitanium,
/area/awaymission/spacebattle/syndicate6)
"iT" = (
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/awaymission/spacebattle/syndicate6)
"iU" = (
/obj/machinery/computer/shuttle,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/awaymission/spacebattle/syndicate6)
"iV" = (
/obj/machinery/sleeper,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/awaymission/spacebattle/syndicate6)
"iW" = (
/obj/structure/chair/comfy/shuttle{
dir = 1
},
/mob/living/simple_animal/hostile/syndicate,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/awaymission/spacebattle/syndicate6)
"iX" = (
/obj/machinery/door/airlock/external,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
-/area/awaymission/spacebattle/syndicate6)
-"iY" = (
-/turf/space,
-/turf/simulated/shuttle/wall{
- icon_state = "diagonalWall3"
- },
-/area/awaymission/spacebattle/syndicate6)
-"iZ" = (
-/turf/space,
-/turf/simulated/shuttle/wall{
- dir = 4;
- icon_state = "diagonalWall3"
- },
+/turf/simulated/floor/plating,
/area/awaymission/spacebattle/syndicate6)
"ja" = (
/obj/structure/shuttle/engine/heater,
/obj/structure/window/reinforced{
dir = 1
},
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating/airless,
/area/awaymission/spacebattle/syndicate6)
"jb" = (
/obj/structure/shuttle/engine/propulsion,
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating/airless,
/area/awaymission/spacebattle/syndicate6)
"jc" = (
/turf/simulated/floor/plating/asteroid/airless,
@@ -2857,37 +2031,13 @@
/obj/machinery/door/airlock/plasma,
/turf/simulated/wall/mineral/plasma,
/area/awaymission/spacebattle/secret)
-"nG" = (
-/obj/structure/window/reinforced,
-/obj/structure/shuttle/engine/heater{
- tag = "icon-heater (NORTH)";
- icon_state = "heater";
- dir = 1
- },
-/obj/structure/window/reinforced{
- dir = 4
- },
-/turf/simulated/shuttle/plating,
-/area/awaymission/spacebattle/cruiser)
-"qC" = (
-/obj/structure/window/reinforced,
-/obj/structure/shuttle/engine/heater{
- tag = "icon-heater (NORTH)";
- icon_state = "heater";
- dir = 1
- },
-/obj/structure/window/reinforced{
- dir = 8
- },
-/turf/simulated/shuttle/plating,
-/area/awaymission/spacebattle/cruiser)
"zS" = (
/obj/structure/shuttle/engine/propulsion{
dir = 4;
icon_state = "propulsion_l";
tag = "icon-propulsion_l (WEST)"
},
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating/airless,
/area/space/nearstation)
"Jj" = (
/obj/structure/shuttle/engine/propulsion{
@@ -2895,7 +2045,7 @@
icon_state = "propulsion_l";
dir = 1
},
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating/airless,
/area/awaymission/spacebattle/syndicate2)
"Jw" = (
/obj/structure/shuttle/engine/propulsion{
@@ -2903,31 +2053,15 @@
icon_state = "propulsion_r";
dir = 1
},
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating/airless,
/area/awaymission/spacebattle/syndicate2)
-"JS" = (
-/obj/structure/shuttle/engine/propulsion{
- tag = "icon-propulsion_l (NORTH)";
- icon_state = "propulsion_l";
- dir = 1
- },
-/turf/simulated/shuttle/plating,
-/area/awaymission/spacebattle/cruiser)
-"JW" = (
-/obj/structure/shuttle/engine/propulsion{
- tag = "icon-propulsion_r (NORTH)";
- icon_state = "propulsion_r";
- dir = 1
- },
-/turf/simulated/shuttle/plating,
-/area/awaymission/spacebattle/cruiser)
"YV" = (
/obj/structure/shuttle/engine/propulsion{
dir = 8;
icon_state = "burst_r";
tag = "icon-burst_r (EAST)"
},
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating/airless,
/area/awaymission/spacebattle/cruiser)
(1,1,1) = {"
@@ -15649,13 +14783,13 @@ ab
ab
ab
eo
-ep
-ep
+eo
+eo
fj
fj
-ep
-ep
-gz
+eo
+eo
+eo
ab
ab
ab
@@ -15905,15 +15039,15 @@ ab
ab
ab
eo
-ep
+eo
eI
eI
eI
eI
eI
eP
-ep
-gz
+eo
+eo
ab
ab
ab
@@ -16161,7 +15295,7 @@ ab
ab
ab
eo
-ep
+eo
eP
eI
eI
@@ -16170,8 +15304,8 @@ eI
eI
eI
eP
-ep
-gz
+eo
+eo
ab
ab
ab
@@ -16417,7 +15551,7 @@ ab
ab
ab
ab
-ep
+eo
eI
eI
eI
@@ -16428,8 +15562,8 @@ eI
eI
eI
eP
-ep
-gz
+eo
+eo
ab
ab
ab
@@ -16674,7 +15808,7 @@ ab
ab
ab
ab
-ep
+eo
eJ
eQ
eI
@@ -16931,7 +16065,7 @@ ab
ab
ab
ab
-ep
+eo
eI
eI
eI
@@ -17188,7 +16322,7 @@ ab
ab
ab
ab
-ep
+eo
eI
eI
eI
@@ -17445,7 +16579,7 @@ ab
ab
ab
ab
-ep
+eo
eJ
eQ
eI
@@ -17702,7 +16836,7 @@ ab
ab
ab
ab
-ep
+eo
eI
eI
eI
@@ -17713,8 +16847,8 @@ eI
eI
eI
eP
-ep
-gA
+eo
+eo
ab
ab
ab
@@ -17959,8 +17093,8 @@ ab
ab
ab
ab
-eq
-ep
+eo
+eo
eP
eI
eI
@@ -17969,8 +17103,8 @@ eI
eI
eI
eP
-ep
-gA
+eo
+eo
ab
ab
ab
@@ -18217,16 +17351,16 @@ ab
ab
ab
ab
-eq
-ep
+eo
+eo
eI
eI
eI
eI
eI
eP
-ep
-gA
+eo
+eo
ab
ab
ab
@@ -18475,14 +17609,14 @@ ab
ab
ab
ab
-eq
-ep
-ep
+eo
+eo
+eo
fj
fj
-ep
-ep
-gA
+eo
+eo
+eo
ab
ab
ab
@@ -21223,29 +20357,29 @@ ab
ab
ab
aO
-aV
-aV
+aO
+aO
bc
bc
-aV
-aV
-aV
-aV
-aV
-aV
-aV
-aV
-aV
-aV
-aV
-aV
-aV
-aV
-aV
-aV
-aV
-aV
-bx
+aO
+aO
+aO
+aO
+aO
+aO
+aO
+aO
+aO
+aO
+aO
+aO
+aO
+aO
+aO
+aO
+aO
+aO
+aO
ab
ab
ab
@@ -21342,13 +20476,13 @@ ab
ab
ab
iz
-iA
-iA
+iz
+iz
iL
iL
-iA
-iA
-iM
+iz
+iz
+iz
ab
ab
ab
@@ -21485,26 +20619,26 @@ aZ
aZ
aZ
bg
-aV
+aO
bj
aZ
bj
aZ
bj
aZ
-aV
+aO
bg
bo
bo
bg
bg
bv
-aV
+aO
bj
bj
-aV
-aV
-bx
+aO
+aO
+aO
ab
ab
ab
@@ -21553,7 +20687,7 @@ cc
cc
cc
dc
-dq
+bP
ab
ab
ab
@@ -21582,7 +20716,7 @@ YV
YV
YV
YV
-dq
+bP
ab
ab
ab
@@ -21598,15 +20732,15 @@ ab
ab
ab
iz
-iA
+iz
iD
iD
iD
iD
iD
iH
-iA
-iM
+iz
+iz
ab
ab
ab
@@ -21742,30 +20876,30 @@ aZ
aZ
aZ
bg
-aV
+aO
aZ
aZ
aZ
aZ
aZ
aZ
-aV
+aO
bg
aZ
aZ
aZ
aZ
aZ
-aV
+aO
aZ
aZ
by
bA
-aV
-aV
-aV
-aV
-bx
+aO
+aO
+aO
+aO
+aO
ab
ab
ab
@@ -21800,7 +20934,7 @@ ab
ab
ab
ab
-bQ
+bP
bV
bV
bV
@@ -21810,7 +20944,7 @@ bV
bV
bV
bV
-bS
+bP
ab
ab
ab
@@ -21829,17 +20963,17 @@ ab
ab
ab
ab
-bS
-gm
-gm
-gm
-gm
-gm
-gm
-gm
-gm
-gm
-bQ
+bP
+bV
+bV
+bV
+bV
+bV
+bV
+bV
+bV
+bV
+bP
ab
ab
ab
@@ -21854,7 +20988,7 @@ ab
ab
ab
iz
-iA
+iz
iH
iD
iD
@@ -21863,8 +20997,8 @@ iD
iD
iD
iH
-iA
-iM
+iz
+iz
ab
ab
ab
@@ -21999,29 +21133,29 @@ aZ
aZ
aZ
bg
-aV
+aO
aZ
aZ
aZ
aZ
aZ
aZ
-aV
+aO
bg
aZ
aZ
aZ
aZ
aZ
-aV
+aO
aZ
aZ
by
bA
-aV
-aV
-aV
-aV
+aO
+aO
+aO
+aO
bD
ab
ab
@@ -22057,7 +21191,7 @@ ab
ab
ab
ab
-bQ
+bP
bZ
cd
cd
@@ -22067,7 +21201,7 @@ cs
cd
cd
cd
-bS
+bP
ab
ab
ab
@@ -22086,7 +21220,7 @@ ab
ab
ab
ab
-bS
+bP
cd
cd
cd
@@ -22096,7 +21230,7 @@ cs
cd
cd
bZ
-bQ
+bP
ab
ab
ab
@@ -22110,7 +21244,7 @@ ab
ab
ab
ab
-iA
+iz
iD
iD
iD
@@ -22121,8 +21255,8 @@ iD
iD
iD
iH
-iA
-iM
+iz
+iz
ab
ab
ab
@@ -22256,31 +21390,31 @@ aZ
aZ
aZ
bg
-aV
+aO
aZ
aZ
aZ
aZ
aZ
aZ
-aV
+aO
bg
aZ
aZ
aZ
aZ
aZ
-aV
+aO
aZ
aZ
aZ
-bB
-aV
-aV
-aV
-aV
-aV
-bx
+aO
+aO
+aO
+aO
+aO
+aO
+aO
ab
ab
ab
@@ -22314,7 +21448,7 @@ ab
ab
ab
ab
-bQ
+bP
bX
bZ
bZ
@@ -22324,7 +21458,7 @@ bZ
bZ
cN
bZ
-bS
+bP
ab
ab
ab
@@ -22343,7 +21477,7 @@ ab
ab
ab
ab
-bS
+bP
bZ
bZ
bZ
@@ -22353,7 +21487,7 @@ bZ
bZ
bZ
ip
-bQ
+bP
ab
ab
ab
@@ -22367,7 +21501,7 @@ ab
ab
ab
ab
-iA
+iz
iE
iI
iD
@@ -22513,25 +21647,25 @@ aZ
aZ
aZ
bg
-aV
+aO
bj
aZ
bj
aZ
aZ
aZ
-aV
+aO
bg
bg
bg
bg
aZ
aZ
-aV
+aO
aZ
aZ
aZ
-aV
+aO
ab
ab
ab
@@ -22565,15 +21699,15 @@ ab
ab
ab
bE
-bJ
-bJ
-bJ
-bJ
-bJ
-bJ
-bJ
-bJ
-ce
+bE
+bE
+bE
+bE
+bE
+bE
+bE
+bE
+bE
bZ
bX
bZ
@@ -22600,7 +21734,7 @@ ab
ab
ab
ab
-bS
+bP
bZ
bZ
bZ
@@ -22610,7 +21744,7 @@ bZ
bZ
bZ
bZ
-bQ
+bP
ab
ab
ab
@@ -22624,7 +21758,7 @@ ab
ab
ab
ab
-iA
+iz
iD
iD
iD
@@ -22770,25 +21904,25 @@ aZ
aZ
aZ
bg
-aV
-aV
-aV
-aV
-aV
+aO
+aO
+aO
+aO
+aO
bn
bn
-aV
-aV
-aV
-aV
-aV
+aO
+aO
+aO
+aO
+aO
bn
bn
-aV
+aO
aZ
aZ
aZ
-aV
+aO
ab
ab
ab
@@ -22830,15 +21964,15 @@ bN
bN
bL
bY
-bJ
-ce
+bE
+bE
bZ
cI
bZ
bZ
co
co
-bS
+bP
ab
ab
ab
@@ -22857,7 +21991,7 @@ ab
ab
ab
ab
-bS
+bP
bZ
bZ
bZ
@@ -22867,7 +22001,7 @@ bZ
bZ
bZ
bZ
-bQ
+bP
ab
ab
ab
@@ -22881,7 +22015,7 @@ ab
ab
ab
ab
-iA
+iz
iD
iD
iD
@@ -23095,7 +22229,7 @@ bZ
cN
bZ
de
-bS
+bP
ab
ab
ab
@@ -23114,7 +22248,7 @@ ab
ab
ab
ab
-bS
+bP
de
bZ
bZ
@@ -23124,7 +22258,7 @@ bZ
bZ
bZ
bZ
-bQ
+bP
ab
ab
ab
@@ -23138,7 +22272,7 @@ ab
ab
ab
ab
-iA
+iz
iE
iI
iD
@@ -23352,7 +22486,7 @@ bZ
bZ
bZ
de
-bS
+bP
ab
ab
ab
@@ -23371,7 +22505,7 @@ ab
ab
ab
ab
-bS
+bP
de
bZ
bZ
@@ -23381,7 +22515,7 @@ bZ
bZ
bZ
bZ
-bQ
+bP
ab
ab
ab
@@ -23395,7 +22529,7 @@ ab
ab
ab
ab
-iA
+iz
iD
iD
iD
@@ -23406,8 +22540,8 @@ iD
iD
iD
iH
-iA
-iN
+iz
+iz
ab
ab
ab
@@ -23541,25 +22675,25 @@ aZ
aZ
aZ
bg
-aV
-aV
-aV
-aV
-aV
+aO
+aO
+aO
+aO
+aO
bn
bn
-aV
-aV
-aV
-aV
-aV
+aO
+aO
+aO
+aO
+aO
bn
bn
-aV
+aO
aZ
aZ
aZ
-aV
+aO
ab
ab
ab
@@ -23601,15 +22735,15 @@ bO
bO
bL
bL
-bJ
-cg
+bE
+bE
cu
bX
cJ
bZ
bZ
de
-bS
+bP
ab
ab
ab
@@ -23628,7 +22762,7 @@ ab
ab
ab
ab
-bS
+bP
de
bZ
bZ
@@ -23638,7 +22772,7 @@ bZ
bZ
bZ
bZ
-bQ
+bP
ab
ab
ab
@@ -23652,8 +22786,8 @@ ab
ab
ab
ab
-iB
-iA
+iz
+iz
iH
iD
iD
@@ -23662,8 +22796,8 @@ iD
iD
iD
iH
-iA
-iN
+iz
+iz
ab
ab
ab
@@ -23798,25 +22932,25 @@ aZ
aZ
aZ
bi
-aV
+aO
bj
aZ
bj
aZ
aZ
aZ
-aV
+aO
bg
bg
bg
bg
aZ
aZ
-aV
+aO
aZ
aZ
aZ
-aV
+aO
ab
ab
ab
@@ -23849,16 +22983,16 @@ ab
ab
ab
ab
-bI
-bJ
-bJ
-bJ
-bJ
-bJ
-bJ
-bJ
-bJ
-cg
+bE
+bE
+bE
+bE
+bE
+bE
+bE
+bE
+bE
+bE
bX
bZ
bX
@@ -23866,7 +23000,7 @@ bZ
bZ
co
df
-bS
+bP
ab
ab
ab
@@ -23885,7 +23019,7 @@ ab
ab
ab
ab
-bS
+bP
df
bZ
bZ
@@ -23895,7 +23029,7 @@ bZ
bZ
bZ
bZ
-bQ
+bP
ab
ab
ab
@@ -23910,16 +23044,16 @@ ab
ab
ab
ab
-iB
-iA
+iz
+iz
iD
iD
iD
iD
iD
iH
-iA
-iN
+iz
+iz
ab
ab
ab
@@ -24055,31 +23189,31 @@ aZ
aZ
aZ
bg
-aV
+aO
aZ
aZ
aZ
aZ
aZ
aZ
-aV
+aO
bg
aZ
aZ
aZ
aZ
aZ
-aV
+aO
aZ
aZ
aZ
-bC
-aV
-aV
-aV
-aV
-aV
-bz
+aO
+aO
+aO
+aO
+aO
+aO
+aO
ab
ab
ab
@@ -24113,7 +23247,7 @@ ab
ab
ab
ab
-bQ
+bP
bZ
bZ
bZ
@@ -24123,7 +23257,7 @@ bZ
cP
bZ
df
-bS
+bP
ab
ab
ab
@@ -24142,7 +23276,7 @@ ab
ab
ab
ab
-bS
+bP
df
bZ
bZ
@@ -24152,7 +23286,7 @@ co
bZ
bZ
im
-bQ
+bP
ab
ab
ab
@@ -24168,14 +23302,14 @@ ab
ab
ab
ab
-iB
-iA
-iA
+iz
+iz
+iz
iL
iL
-iA
-iA
-iN
+iz
+iz
+iz
ab
ab
ab
@@ -24312,29 +23446,29 @@ aZ
aZ
aZ
bg
-aV
+aO
aZ
aZ
aZ
aZ
aZ
aZ
-aV
+aO
bg
aZ
aZ
aZ
aZ
aZ
-aV
+aO
aZ
aZ
by
bA
-aV
-aV
-aV
-aV
+aO
+aO
+aO
+aO
bD
ab
ab
@@ -24370,7 +23504,7 @@ ab
ab
ab
ab
-bQ
+bP
bZ
bZ
bZ
@@ -24380,7 +23514,7 @@ cN
bZ
bZ
dg
-bS
+bP
ab
ab
ab
@@ -24399,7 +23533,7 @@ ab
ab
ab
ab
-bS
+bP
dg
bZ
bZ
@@ -24409,7 +23543,7 @@ bZ
bZ
bZ
bZ
-bQ
+bP
ab
ab
ab
@@ -24569,30 +23703,30 @@ aZ
aZ
aZ
bg
-aV
+aO
aZ
aZ
aZ
aZ
aZ
aZ
-aV
+aO
bg
aZ
aZ
aZ
aZ
aZ
-aV
+aO
aZ
aZ
by
bA
-aV
-aV
-aV
-aV
-bz
+aO
+aO
+aO
+aO
+aO
ab
ab
ab
@@ -24627,7 +23761,7 @@ ab
ab
ab
ab
-bQ
+bP
bZ
bZ
bZ
@@ -24637,7 +23771,7 @@ bZ
bZ
bZ
dg
-bS
+bP
ab
ab
ab
@@ -24656,7 +23790,7 @@ ab
ab
ab
ab
-bS
+bP
dg
bZ
bZ
@@ -24666,7 +23800,7 @@ bZ
il
bZ
bZ
-bQ
+bP
ab
ab
ab
@@ -24826,26 +23960,26 @@ aZ
aZ
aZ
bg
-aV
+aO
bj
aZ
bj
aZ
bj
aZ
-aV
+aO
bg
bg
bg
bg
bg
bg
-aV
+aO
bj
bj
-aV
-aV
-bz
+aO
+aO
+aO
ab
ab
ab
@@ -24884,7 +24018,7 @@ ab
ab
ab
ab
-bQ
+bP
bZ
bZ
bZ
@@ -24894,7 +24028,7 @@ bZ
bZ
bZ
dh
-bS
+bP
ab
ab
ab
@@ -24913,7 +24047,7 @@ ab
ab
ab
ab
-bS
+bP
dh
bZ
bZ
@@ -24923,7 +24057,7 @@ bZ
bZ
bZ
bZ
-bQ
+bP
ab
ab
ab
@@ -25077,30 +24211,30 @@ ab
ab
ab
ab
-aS
-aV
-aV
+aO
+aO
+aO
bc
bc
-aV
-aV
-aV
-aV
-aV
-aV
-aV
-aV
-aV
-aV
-aV
-aV
-aV
-aV
-aV
-aV
-aV
-aV
-bz
+aO
+aO
+aO
+aO
+aO
+aO
+aO
+aO
+aO
+aO
+aO
+aO
+aO
+aO
+aO
+aO
+aO
+aO
+aO
ab
ab
ab
@@ -25141,7 +24275,7 @@ ab
ab
ab
ab
-bQ
+bP
bZ
bZ
bZ
@@ -25151,7 +24285,7 @@ bZ
bZ
bZ
dh
-bS
+bP
ab
ab
ab
@@ -25170,7 +24304,7 @@ ab
ab
ab
ab
-bS
+bP
dh
bZ
bZ
@@ -25180,7 +24314,7 @@ bZ
im
bZ
cI
-bQ
+bP
ab
ab
ab
@@ -25398,7 +24532,7 @@ ab
ab
ab
ab
-bQ
+bP
bZ
bZ
bZ
@@ -25408,7 +24542,7 @@ cL
cL
cL
dh
-bS
+bP
ab
ab
ab
@@ -25427,7 +24561,7 @@ ab
ab
ab
ab
-bS
+bP
dh
bZ
bZ
@@ -25437,7 +24571,7 @@ bZ
bX
bZ
cI
-bQ
+bP
ab
ab
ab
@@ -25655,7 +24789,7 @@ ab
ab
ab
ab
-bQ
+bP
bZ
bZ
bZ
@@ -25665,7 +24799,7 @@ cL
cL
cL
di
-bS
+bP
ab
ab
ab
@@ -25684,7 +24818,7 @@ ab
ab
ab
ab
-bS
+bP
di
bZ
bZ
@@ -25694,7 +24828,7 @@ bZ
cJ
bX
bX
-bQ
+bP
ab
ab
ab
@@ -25912,7 +25046,7 @@ ab
ab
ab
ab
-bQ
+bP
bZ
bZ
cn
@@ -25922,7 +25056,7 @@ bZ
bZ
bZ
di
-bS
+bP
ab
ab
ab
@@ -25941,7 +25075,7 @@ ab
ab
ab
ab
-bS
+bP
di
bZ
bZ
@@ -25951,7 +25085,7 @@ bZ
bZ
dn
bX
-bQ
+bP
ab
ab
ab
@@ -26169,7 +25303,7 @@ ab
ab
ab
ab
-bQ
+bP
bZ
bZ
co
@@ -26179,7 +25313,7 @@ bZ
bZ
bZ
di
-bS
+bP
ab
ab
ab
@@ -26198,7 +25332,7 @@ ab
ab
ab
ab
-bS
+bP
di
bZ
bZ
@@ -26208,7 +25342,7 @@ bZ
bX
bX
bX
-bQ
+bP
ab
ab
ab
@@ -26426,46 +25560,46 @@ ab
ab
ab
ab
-bR
+bP
ca
ca
-cp
-cb
-cb
-cb
-cb
-cb
-cb
-ds
-cb
-cb
-cb
-cb
-cb
-cb
-cb
-cb
-cb
-cb
-cb
-cb
-cb
-cb
-cb
-cb
-cb
-cb
-ds
-cb
-cb
-cb
-cb
-cb
-cb
-cp
+bP
+bP
+bP
+bP
+bP
+bP
+bP
+bP
+bP
+bP
+bP
+bP
+bP
+bP
+bP
+bP
+bP
+bP
+bP
+bP
+bP
+bP
+bP
+bP
+bP
+bP
+bP
+bP
+bP
+bP
+bP
+bP
+bP
+bP
ca
ca
-eG
+bP
ab
ab
ab
@@ -26683,17 +25817,17 @@ ab
ab
ab
ab
-bQ
+bP
bZ
bZ
-bQ
+bP
cw
cw
cw
cw
cw
cw
-bQ
+bP
cH
cH
cH
@@ -26712,17 +25846,17 @@ gO
gO
hi
hr
-bQ
+bP
hO
hP
hY
hP
hY
hP
-bQ
+bP
bZ
bZ
-bQ
+bP
ab
ab
ab
@@ -26940,17 +26074,17 @@ ab
ab
ab
ab
-bQ
+bP
bZ
bZ
-bQ
+bP
bZ
bZ
bZ
bZ
bZ
bZ
-bQ
+bP
cH
ea
ek
@@ -26969,17 +26103,17 @@ gO
gO
hi
hi
-bQ
+bP
hP
hP
hP
hP
hP
hP
-bQ
+bP
bZ
bZ
-bQ
+bP
ab
ab
ab
@@ -27197,17 +26331,17 @@ ab
ab
ab
ab
-bQ
+bP
bZ
bZ
-bQ
+bP
cx
bZ
cx
bZ
cx
bZ
-bQ
+bP
cH
eb
el
@@ -27226,17 +26360,17 @@ eR
gZ
hi
hi
-bQ
+bP
hQ
hP
hZ
hP
hQ
hP
-bQ
+bP
bZ
bZ
-bQ
+bP
ab
ab
ab
@@ -27454,17 +26588,17 @@ ab
ab
ab
ab
-bQ
+bP
bZ
bZ
-bQ
+bP
bZ
bZ
bZ
bZ
bZ
bZ
-bQ
+bP
cH
ec
em
@@ -27483,17 +26617,17 @@ cH
cH
hi
hi
-hA
-cb
-cb
-cb
-gD
-hV
+bP
+bP
+bP
+bP
+dr
+bP
hU
-bQ
+bP
bZ
bZ
-bQ
+bP
ab
ab
ab
@@ -27535,13 +26669,13 @@ ab
ab
ab
iQ
-iR
-iR
+iQ
+iQ
iX
iX
-iR
-iR
-iY
+iQ
+iQ
+iQ
ab
ab
ab
@@ -27711,17 +26845,17 @@ ab
ab
ab
ab
-bQ
+bP
bZ
bZ
-bQ
+bP
cx
bZ
cx
bZ
cx
bZ
-bQ
+bP
cH
cH
cH
@@ -27740,17 +26874,17 @@ cH
cH
hi
hi
-bQ
+bP
hR
hU
hP
ic
hP
hP
-bQ
+bP
im
bZ
-bQ
+bP
ab
ab
ab
@@ -27791,15 +26925,15 @@ ab
ab
ab
iQ
-iR
+iQ
iT
iT
iT
iT
iT
iV
-iR
-iY
+iQ
+iQ
ab
ab
ab
@@ -27968,17 +27102,17 @@ ab
ab
ab
ab
-bQ
+bP
bZ
bZ
-bQ
+bP
bZ
bZ
bZ
bZ
bZ
bZ
-bQ
+bP
dI
cH
cH
@@ -27997,17 +27131,17 @@ cH
cH
hj
hj
-hA
-cb
-hV
+bP
+bP
+bP
hP
hP
hP
hP
-bQ
+bP
bZ
bZ
-bQ
+bP
ab
ab
ab
@@ -28047,7 +27181,7 @@ ab
ab
ab
iQ
-iR
+iQ
iV
iT
iT
@@ -28056,8 +27190,8 @@ iT
iT
iT
iV
-iR
-iY
+iQ
+iQ
ab
ab
ab
@@ -28225,17 +27359,17 @@ ab
ab
ab
ab
-bQ
+bP
bZ
bZ
-bQ
+bP
cx
cL
cx
bZ
cx
bZ
-bQ
+bP
dJ
dJ
cH
@@ -28254,17 +27388,17 @@ cH
cH
hj
hj
-bQ
+bP
hR
hU
hP
hP
hP
hP
-bQ
+bP
bZ
bZ
-bQ
+bP
ab
ab
ab
@@ -28303,7 +27437,7 @@ ab
ab
ab
ab
-iR
+iQ
iT
iT
iT
@@ -28314,8 +27448,8 @@ iT
iT
iT
iV
-iR
-iY
+iQ
+iQ
ab
ab
ab
@@ -28482,17 +27616,17 @@ ab
ab
ab
ab
-bQ
+bP
bZ
bZ
-bQ
+bP
bZ
bZ
bZ
bZ
bZ
bZ
-bQ
+bP
dK
ed
cH
@@ -28511,17 +27645,17 @@ cH
cH
eR
eR
-hA
-cb
-hV
+bP
+bP
+bP
hP
hP
hP
hP
-bQ
+bP
bZ
bZ
-bQ
+bP
ab
ab
ab
@@ -28560,7 +27694,7 @@ ab
ab
ab
ab
-iR
+iQ
iU
iW
iT
@@ -28739,17 +27873,17 @@ ab
ab
ab
ab
-bQ
+bP
bZ
bZ
-bQ
+bP
cx
bZ
cx
bZ
cx
bZ
-bQ
+bP
dL
ee
cH
@@ -28768,17 +27902,17 @@ cH
cH
eR
eR
-bQ
+bP
hR
hU
hP
hP
hP
hP
-bQ
+bP
bZ
bZ
-bQ
+bP
ab
ab
ab
@@ -28817,7 +27951,7 @@ ab
ab
ab
ab
-iR
+iQ
iT
iT
iT
@@ -28996,17 +28130,17 @@ ab
ab
ab
ab
-bQ
+bP
bZ
bZ
-bQ
+bP
bZ
bZ
bZ
bZ
bZ
bZ
-bQ
+bP
dM
dM
cH
@@ -29025,17 +28159,17 @@ cH
cH
eR
eR
-hA
-cb
-hV
+bP
+bP
+bP
hP
hP
hP
hP
-bQ
+bP
bZ
bZ
-bQ
+bP
ab
ab
ab
@@ -29074,7 +28208,7 @@ ab
ab
ab
ab
-iR
+iQ
iT
iT
iT
@@ -29253,17 +28387,17 @@ ab
ab
ab
ab
-bQ
+bP
bZ
bZ
-bQ
+bP
cx
bZ
cx
bZ
cx
co
-bQ
+bP
dM
dM
cH
@@ -29282,17 +28416,17 @@ cH
cH
eR
hs
-bQ
+bP
hR
hU
ia
id
ia
hP
-bQ
+bP
bZ
bZ
-bQ
+bP
ab
ab
ab
@@ -29331,7 +28465,7 @@ ab
ab
ab
ab
-iR
+iQ
iU
iW
iT
@@ -29510,17 +28644,17 @@ ab
ab
ab
ab
-bQ
+bP
bZ
bZ
-bQ
+bP
bZ
bZ
bZ
bZ
bZ
dj
-bQ
+bP
dN
dN
cH
@@ -29539,17 +28673,17 @@ cH
cH
hk
hs
-hA
-cb
-hV
+bP
+bP
+bP
hP
hP
hP
hP
-bQ
+bP
bZ
bZ
-bQ
+bP
ab
ab
ab
@@ -29588,7 +28722,7 @@ ab
ab
ab
ab
-iR
+iQ
iT
iT
iT
@@ -29599,8 +28733,8 @@ iT
iT
iT
iV
-iR
-iZ
+iQ
+iQ
ab
ab
ab
@@ -29767,17 +28901,17 @@ ab
ab
ab
ab
-bQ
+bP
bZ
bZ
-bQ
+bP
cy
bZ
bZ
bZ
bZ
co
-bQ
+bP
dN
dN
cH
@@ -29796,17 +28930,17 @@ cH
cH
hk
ht
-bQ
+bP
hR
hU
hP
hP
ih
ih
-bQ
+bP
bZ
bZ
-bQ
+bP
ab
ab
ab
@@ -29845,8 +28979,8 @@ ab
ab
ab
ab
-iS
-iR
+iQ
+iQ
iV
iT
iT
@@ -29855,8 +28989,8 @@ iT
iT
iT
iV
-iR
-iZ
+iQ
+iQ
ab
ab
ab
@@ -30024,46 +29158,46 @@ ab
ab
ab
ab
-bS
+bP
bZ
bZ
-cq
-cb
-cb
+bP
+bP
+bP
ca
ca
-cb
-cb
-dt
-cb
-cb
-cb
-cb
-cb
-cb
-cb
+bP
+bP
+bP
+bP
+bP
+bP
+bP
+bP
+bP
+bP
ff
ff
ff
ff
-cb
-gD
-cb
-cb
-cb
-cb
-cb
-dt
-cb
-cb
+bP
+dr
+bP
+bP
+bP
+bP
+bP
+bP
+bP
+bP
ca
ca
-cb
-cb
-eH
+bP
+bP
+bP
bZ
bZ
-bQ
+bP
ab
ab
ab
@@ -30103,16 +29237,16 @@ ab
ab
ab
ab
-iS
-iR
+iQ
+iQ
iT
iT
iT
iT
iT
iV
-iR
-iZ
+iQ
+iQ
ab
ab
ab
@@ -30281,7 +29415,7 @@ ab
ab
ab
ab
-bQ
+bP
bZ
bZ
bZ
@@ -30320,7 +29454,7 @@ bZ
bZ
bZ
bZ
-bQ
+bP
ab
ab
ab
@@ -30361,14 +29495,14 @@ ab
ab
ab
ab
-iS
-iR
-iR
+iQ
+iQ
+iQ
iX
iX
-iR
-iR
-iZ
+iQ
+iQ
+iQ
ab
ab
ab
@@ -30538,7 +29672,7 @@ ab
ab
ab
ab
-bQ
+bP
bZ
bZ
bZ
@@ -30577,7 +29711,7 @@ bZ
bZ
bZ
bZ
-bQ
+bP
ab
ab
ab
@@ -30795,46 +29929,46 @@ ab
ab
ab
ab
-bS
+bP
bZ
ch
-cr
-cb
-cb
-cb
-cp
-cb
-cb
+bP
+bP
+bP
+bP
+bP
+bP
+bP
ca
ca
-cb
-cb
-cb
-cb
-cb
-cb
-cO
+bP
+bP
+bP
+bP
+bP
+bP
+bP
bZ
bZ
-cr
-cb
-cb
-cb
-cb
-cb
-cb
+bP
+bP
+bP
+bP
+bP
+bP
+bP
hu
hu
-cb
-cb
-cb
-cb
-cb
-cb
-cO
+bP
+bP
+bP
+bP
+bP
+bP
+bP
bZ
ch
-bQ
+bP
ab
ab
ab
@@ -31052,14 +30186,14 @@ ab
ab
ab
ab
-bS
+bP
bZ
bZ
-bS
+bP
cz
cM
cM
-bQ
+bP
cX
cX
cX
@@ -31070,10 +30204,10 @@ cX
dO
dO
cX
-bS
+bP
bZ
bZ
-bS
+bP
gr
gF
gF
@@ -31088,10 +30222,10 @@ gF
ie
gF
ii
-bS
+bP
bZ
bZ
-bS
+bP
ab
ab
ab
@@ -31309,10 +30443,10 @@ ab
ab
ab
ab
-bS
+bP
bZ
bZ
-bS
+bP
cA
cM
cM
@@ -31327,10 +30461,10 @@ dv
dQ
eS
en
-bS
+bP
bZ
bZ
-bS
+bP
gs
gF
gF
@@ -31345,10 +30479,10 @@ gF
gF
gF
ik
-bS
+bP
bZ
bZ
-bS
+bP
ab
ab
ab
@@ -31566,14 +30700,14 @@ ab
ab
ab
ab
-bS
+bP
bZ
bZ
-bS
+bP
cB
cM
cM
-bQ
+bP
cX
dk
cX
@@ -31584,10 +30718,10 @@ dv
dQ
dQ
en
-bS
+bP
bZ
bZ
-bS
+bP
gs
gF
gF
@@ -31602,10 +30736,10 @@ gF
gF
gF
ik
-bS
+bP
bZ
bZ
-bS
+bP
ab
ab
ab
@@ -31823,10 +30957,10 @@ ab
ab
ab
ab
-bS
+bP
bZ
bZ
-bS
+bP
cC
cM
cM
@@ -31841,10 +30975,10 @@ eu
dR
dR
cX
-bS
+bP
bZ
bZ
-bS
+bP
gt
gF
gF
@@ -31859,10 +30993,10 @@ gF
ie
gF
ii
-bS
+bP
bZ
bZ
-bS
+bP
ab
ab
ab
@@ -32080,10 +31214,10 @@ ab
ab
ab
ab
-bS
+bP
bZ
bZ
-bS
+bP
cD
cM
cM
@@ -32098,10 +31232,10 @@ cX
dO
dO
cX
-bS
+bP
bZ
bZ
-bS
+bP
gu
gF
gF
@@ -32116,10 +31250,10 @@ gF
gF
gF
ik
-bS
+bP
bZ
bZ
-bS
+bP
ab
ab
ab
@@ -32337,10 +31471,10 @@ ab
ab
ab
ab
-bS
+bP
bZ
bZ
-bS
+bP
cE
cM
cM
@@ -32355,10 +31489,10 @@ dv
dP
dQ
en
-bS
+bP
bZ
bZ
-bS
+bP
gv
gF
gF
@@ -32373,10 +31507,10 @@ ib
gF
gF
ik
-bS
+bP
bZ
bZ
-bS
+bP
ab
ab
ab
@@ -32594,10 +31728,10 @@ ab
ab
ab
ab
-bS
+bP
bZ
bZ
-bS
+bP
cF
cM
cM
@@ -32612,10 +31746,10 @@ dv
dQ
eT
en
-bS
+bP
bZ
bZ
-bS
+bP
gs
gF
gF
@@ -32630,10 +31764,10 @@ gR
ie
gF
ii
-bS
+bP
bZ
bZ
-bS
+bP
ab
ab
ab
@@ -32851,10 +31985,10 @@ ab
ab
ab
ab
-bS
+bP
bZ
bZ
-bS
+bP
cF
cM
cM
@@ -32869,10 +32003,10 @@ cX
dR
dR
cX
-bS
+bP
bZ
bZ
-bS
+bP
gr
gF
gF
@@ -32887,10 +32021,10 @@ gF
gF
gF
ik
-bS
+bP
bZ
bZ
-bS
+bP
ab
ab
ab
@@ -33108,46 +32242,46 @@ ab
ab
ab
ab
-bS
+bP
bZ
bZ
-cq
-cb
-cb
-cb
-cb
-cb
-cb
-cb
-cb
-cb
-cb
-cb
-cb
-cb
-cb
-eH
+bP
+bP
+bP
+bP
+bP
+bP
+bP
+bP
+bP
+bP
+bP
+bP
+bP
+bP
+bP
+bP
bZ
bZ
-cq
-cb
-cb
-cb
-cb
-cb
-cb
-cb
-cb
-cb
-cb
-cb
-cb
-cb
-cb
-eH
+bP
+bP
+bP
+bP
+bP
+bP
+bP
+bP
+bP
+bP
+bP
+bP
+bP
+bP
+bP
+bP
bZ
bZ
-bS
+bP
ab
ab
ab
@@ -33365,7 +32499,7 @@ ab
ab
ab
ab
-bS
+bP
bZ
bZ
bZ
@@ -33404,7 +32538,7 @@ bZ
bZ
bZ
bZ
-bS
+bP
ab
ab
ab
@@ -33622,7 +32756,7 @@ ab
ab
ab
ab
-bS
+bP
bZ
bZ
bZ
@@ -33661,7 +32795,7 @@ bZ
bZ
bZ
bZ
-bS
+bP
ab
ab
ab
@@ -33879,46 +33013,46 @@ ab
ab
ab
ab
-bT
-cb
-cb
-cp
+bP
+bP
+bP
+bP
cG
cG
-cO
+bP
bZ
bZ
-cr
-cb
-cb
-cb
-cb
-cb
-cb
-cb
-cb
-dl
+bP
+bP
+bP
+bP
+bP
+bP
+bP
+bP
+bP
+bP
ca
ca
-dl
-cb
-cb
-cb
-cb
-cb
-cb
-cb
-cb
-cO
+bP
+bP
+bP
+bP
+bP
+bP
+bP
+bP
+bP
+bP
bZ
bZ
-cr
+bP
cG
cG
-cp
-cb
-cb
-hT
+bP
+bP
+bP
+bP
ab
ab
ab
@@ -34139,13 +33273,13 @@ ab
ab
ab
ab
-bQ
+bP
cH
cH
-bS
+bP
bZ
bZ
-bS
+bP
dw
dS
dS
@@ -34154,10 +33288,10 @@ ev
ev
ev
fa
-bS
+bP
fm
fH
-bS
+bP
gw
gG
gx
@@ -34166,13 +33300,13 @@ gx
gx
fx
hC
-bS
+bP
bZ
bZ
-bS
+bP
cH
cH
-bQ
+bP
ab
ab
ab
@@ -34396,13 +33530,13 @@ ab
ab
ab
ab
-bQ
+bP
cH
cH
-bS
+bP
bZ
bZ
-bS
+bP
dx
bZ
bZ
@@ -34411,10 +33545,10 @@ ew
bZ
bZ
fb
-bS
+bP
fn
fI
-bS
+bP
gx
gx
gx
@@ -34423,13 +33557,13 @@ gx
gx
gH
gx
-bS
+bP
bZ
bZ
-bS
+bP
cH
cH
-bQ
+bP
ab
ab
ab
@@ -34653,13 +33787,13 @@ ab
ab
ab
ab
-bQ
+bP
cH
cH
-bS
+bP
bZ
bZ
-bS
+bP
dx
bZ
bZ
@@ -34680,13 +33814,13 @@ gx
gx
gx
gx
-bS
+bP
bZ
bZ
-bS
+bP
cH
cH
-bQ
+bP
ab
ab
ab
@@ -34910,13 +34044,13 @@ ab
ab
ab
ab
-bQ
+bP
cH
cH
-bS
+bP
bZ
bZ
-bS
+bP
dy
bZ
bZ
@@ -34925,10 +34059,10 @@ bZ
bZ
bZ
fb
-bS
+bP
fp
fH
-bS
+bP
gx
gx
gx
@@ -34937,13 +34071,13 @@ hb
gx
gx
gx
-bS
+bP
bZ
bZ
-bS
+bP
cH
cH
-bQ
+bP
ab
ab
ab
@@ -35167,13 +34301,13 @@ ab
ab
ab
ab
-bQ
+bP
cH
cH
-bS
+bP
bZ
bZ
-bS
+bP
dz
dT
eg
@@ -35182,10 +34316,10 @@ ey
ey
ey
fc
-bS
+bP
fm
fK
-bS
+bP
gx
gx
gx
@@ -35194,13 +34328,13 @@ gx
gx
gx
hD
-bS
+bP
bZ
bZ
-bS
+bP
cH
cH
-bQ
+bP
ab
ab
ab
@@ -35424,40 +34558,40 @@ ab
ab
ab
ab
-bQ
+bP
cH
cH
-bS
+bP
bZ
bZ
-bR
-cb
-cb
-cb
-dl
-ez
-ez
-ez
-ez
-eH
+bP
+bP
+bP
+bP
+bP
+bP
+bP
+bP
+bP
+bP
fm
fL
-cq
-ez
-ez
-ez
-ez
-dl
-ez
-ez
-ez
-eG
+bP
+bP
+bP
+bP
+bP
+bP
+bP
+bP
+bP
+bP
bZ
bZ
-bS
+bP
cH
cH
-bQ
+bP
ab
ab
ab
@@ -35681,17 +34815,17 @@ ab
ab
ab
ab
-bT
+bP
cG
cG
-bS
+bP
bZ
bZ
-bS
+bP
de
de
de
-bS
+bP
eA
eK
eK
@@ -35704,17 +34838,17 @@ eK
eK
eK
gT
-bS
+bP
hl
de
de
-bS
+bP
bZ
bZ
-bS
+bP
cG
cG
-hT
+bP
ab
ab
ab
@@ -35941,14 +35075,14 @@ ab
ab
ab
ab
-bS
+bP
bZ
bZ
-bS
+bP
bZ
bZ
bZ
-bS
+bP
eB
eL
eU
@@ -35961,14 +35095,14 @@ bZ
co
bZ
gU
-bS
+bP
bZ
bZ
bZ
-bS
+bP
bZ
bZ
-bS
+bP
ab
ab
ab
@@ -36198,14 +35332,14 @@ ab
ab
ab
ab
-bS
+bP
bZ
bZ
-bS
+bP
bZ
bZ
bZ
-bS
+bP
eB
bZ
bZ
@@ -36218,14 +35352,14 @@ bZ
bZ
bZ
gU
-bS
+bP
ch
bZ
bZ
-bS
+bP
bZ
bZ
-bS
+bP
ab
ab
ab
@@ -36455,14 +35589,14 @@ ab
ab
ab
ab
-bS
+bP
bZ
bZ
-bS
+bP
bZ
bZ
bZ
-bS
+bP
eB
bZ
bZ
@@ -36475,14 +35609,14 @@ gy
bZ
bZ
gU
-bS
+bP
bZ
bZ
hE
-bS
+bP
bZ
bZ
-bS
+bP
ab
ab
ab
@@ -36618,29 +35752,29 @@ ab
ab
ab
ac
-ah
-ah
+ac
+ac
ak
ak
-ah
-ah
-ah
-ah
-ah
-ah
-ah
-ah
-ah
-ah
-ah
-ah
-ah
-ah
-ah
-ah
-ah
-ah
-aG
+ac
+ac
+ac
+ac
+ac
+ac
+ac
+ac
+ac
+ac
+ac
+ac
+ac
+ac
+ac
+ac
+ac
+ac
+ac
ab
ab
ab
@@ -36712,14 +35846,14 @@ ab
ab
ab
ab
-bS
+bP
bZ
bZ
ca
bZ
bZ
bZ
-bS
+bP
eB
bZ
bZ
@@ -36732,14 +35866,14 @@ bZ
bZ
bZ
gU
-bS
+bP
bZ
bZ
bZ
ca
bZ
bZ
-bS
+bP
ab
ab
ab
@@ -36880,26 +36014,26 @@ aj
aj
aj
am
-ah
+ac
ao
aj
ao
aj
ao
aj
-ah
+ac
as
an
an
an
au
an
-ah
+ac
ao
ao
-ah
-ah
-aG
+ac
+ac
+ac
ab
ab
ab
@@ -36969,14 +36103,14 @@ ab
ab
ab
ab
-bS
+bP
bZ
bZ
-bS
+bP
bZ
bZ
bZ
-bS
+bP
eB
co
eV
@@ -36989,14 +36123,14 @@ cU
bZ
bZ
gU
-bS
+bP
bZ
bZ
bZ
-bS
+bP
bZ
bZ
-bS
+bP
ab
ab
ab
@@ -37137,30 +36271,30 @@ aj
aj
aj
am
-ah
+ac
aj
aj
aj
aj
aj
aj
-ah
+ac
an
aj
aj
aj
aj
aj
-ah
+ac
aj
aj
aH
aL
-ah
-ah
-ah
-ah
-aG
+ac
+ac
+ac
+ac
+ac
ab
ab
ab
@@ -37226,14 +36360,14 @@ ab
ab
ab
ab
-bS
+bP
bZ
bZ
-bS
+bP
bZ
bZ
bZ
-bS
+bP
eB
bZ
eW
@@ -37246,14 +36380,14 @@ bZ
bZ
bZ
gU
-bS
+bP
bZ
ch
bZ
-bS
+bP
cY
bZ
-bS
+bP
ab
ab
ab
@@ -37394,29 +36528,29 @@ aj
aj
aj
an
-ah
+ac
aj
aj
ap
aj
aj
aj
-ah
+ac
an
aj
aq
aj
aq
aj
-ah
+ac
aj
aj
aH
aL
-ah
-ah
-ah
-ah
+ac
+ac
+ac
+ac
be
ab
ab
@@ -37483,14 +36617,14 @@ ab
ab
ab
ab
-bS
+bP
bZ
bZ
-bS
+bP
bZ
bZ
bZ
-bS
+bP
eB
eM
eM
@@ -37503,14 +36637,14 @@ bZ
eM
eM
gU
-bS
+bP
bZ
bZ
bZ
-bS
+bP
bZ
bZ
-bS
+bP
ab
ab
ab
@@ -37651,31 +36785,31 @@ aj
aj
aj
an
-ah
+ac
aj
aj
aj
aj
aj
aj
-ah
+ac
an
aj
aj
aj
aj
aj
-ah
+ac
aj
aj
aj
-aM
-ah
-ah
-ah
-ah
-ah
-aG
+ac
+ac
+ac
+ac
+ac
+ac
+ac
ab
ab
ab
@@ -37740,14 +36874,14 @@ ab
ab
ab
ab
-bS
+bP
bZ
bZ
-bS
+bP
cj
ck
cm
-bS
+bP
eC
eN
eX
@@ -37760,14 +36894,14 @@ eC
gI
gJ
eC
-bS
+bP
ct
ck
cK
-bS
+bP
bZ
bZ
-bS
+bP
ab
ab
ab
@@ -37908,35 +37042,35 @@ aj
aj
al
an
-ah
+ac
ao
aj
ao
aj
aj
aj
-ah
+ac
an
at
an
an
aj
aj
-ah
-aj
-aj
-aj
-ah
ac
-ah
-ah
-ah
-ah
-ah
-ah
-ah
-ah
-aG
+aj
+aj
+aj
+ac
+ac
+ac
+ac
+ac
+ac
+ac
+ac
+ac
+ac
+ac
ab
ab
ab
@@ -37997,34 +37131,34 @@ ab
ab
ab
ab
-bS
+bP
bZ
bZ
-bR
-cb
+bP
+bP
ca
-cb
-dt
-eD
-eO
-eO
-eO
-eO
-eO
-eO
-eO
-eO
-eO
-eO
-gV
-dt
-cb
+bP
+bP
+cV
+cV
+cV
+cV
+cV
+cV
+cV
+cV
+cV
+cV
+cV
+cV
+bP
+bP
ca
-cb
-eG
+bP
+bP
bZ
bZ
-bS
+bP
ab
ab
ab
@@ -38165,25 +37299,25 @@ aj
aj
aj
an
-ah
-ah
-ah
-ah
-ah
+ac
+ac
+ac
+ac
+ac
ar
ar
-ah
-ah
-ah
-ah
-ah
+ac
+ac
+ac
+ac
+ac
ar
ar
-ah
+ac
al
aj
aj
-ah
+ac
ad
aX
ba
@@ -38193,8 +37327,8 @@ ba
ba
aj
bl
-ah
-aG
+ac
+ac
ab
ab
ab
@@ -38254,10 +37388,10 @@ ab
ab
ab
ab
-bS
+bP
bZ
bZ
-bS
+bP
cW
cW
cW
@@ -38278,10 +37412,10 @@ cW
cW
cW
cW
-bS
+bP
bZ
bZ
-bS
+bP
ab
ab
ab
@@ -38441,7 +37575,7 @@ aj
aj
aj
ak
-aT
+ak
aj
aj
aj
@@ -38511,10 +37645,10 @@ ab
ab
ab
ab
-bS
+bP
bZ
cU
-bS
+bP
cW
cW
cW
@@ -38535,10 +37669,10 @@ cW
cW
cW
cW
-bS
+bP
bZ
bZ
-bS
+bP
ab
ab
ab
@@ -38698,7 +37832,7 @@ aj
aj
aj
ak
-aT
+ak
aj
aj
aj
@@ -38768,10 +37902,10 @@ ab
ab
ab
ab
-bS
+bP
bZ
bZ
-bS
+bP
cW
cW
cW
@@ -38792,10 +37926,10 @@ cW
cW
cW
cW
-bS
+bP
bZ
bZ
-bS
+bP
ab
ab
ab
@@ -38936,25 +38070,25 @@ aj
aj
aj
an
-ah
-ah
-ah
-ah
-ah
+ac
+ac
+ac
+ac
+ac
ar
ar
-ah
-ah
-ah
-ah
-ah
+ac
+ac
+ac
+ac
+ac
ar
ar
-ah
+ac
aj
aj
al
-ah
+ac
af
aY
bb
@@ -38964,8 +38098,8 @@ bb
bb
aj
aj
-ah
-aI
+ac
+ac
ab
ab
ab
@@ -39025,10 +38159,10 @@ ab
ab
ab
ab
-bS
+bP
cU
bZ
-bS
+bP
cW
cW
cW
@@ -39049,10 +38183,10 @@ cW
cW
cW
cW
-bS
+bP
bZ
bZ
-bS
+bP
ab
ab
ab
@@ -39193,35 +38327,35 @@ aj
aj
al
an
-ah
+ac
ao
aj
ao
aj
aj
aj
-ah
+ac
an
at
an
an
aj
aj
-ah
+ac
aj
aj
aj
-ah
-ag
-ah
-ah
-ah
-ah
-ah
-ah
-ah
-ah
-aI
+ac
+ac
+ac
+ac
+ac
+ac
+ac
+ac
+ac
+ac
+ac
ab
ab
ab
@@ -39282,10 +38416,10 @@ ab
ab
ab
ab
-bS
+bP
bZ
bZ
-bS
+bP
dB
dV
cW
@@ -39306,10 +38440,10 @@ cW
cW
cW
cW
-bS
+bP
bZ
bZ
-bS
+bP
ab
ab
ab
@@ -39450,31 +38584,31 @@ aj
aj
aj
an
-ah
+ac
aj
aj
aj
aj
aj
aj
-ah
+ac
at
aj
aj
aj
aj
aj
-ah
+ac
aj
aj
aj
-aN
-ah
-ah
-ah
-ah
-ah
-aI
+ac
+ac
+ac
+ac
+ac
+ac
+ac
ab
ab
ab
@@ -39539,10 +38673,10 @@ ab
ab
ab
ab
-bS
+bP
bZ
bZ
-bS
+bP
cW
cW
cW
@@ -39563,10 +38697,10 @@ cW
cW
cW
cW
-bS
+bP
bZ
bZ
-bS
+bP
ab
ab
ab
@@ -39707,29 +38841,29 @@ aj
aj
aj
an
-ah
+ac
aj
aj
aj
aq
aj
aq
-ah
+ac
an
aj
ap
aj
aj
aj
-ah
+ac
aj
aj
aH
aL
-ah
-ah
-ah
-ah
+ac
+ac
+ac
+ac
be
ab
ab
@@ -39796,10 +38930,10 @@ ab
ab
ab
ab
-bS
+bP
bZ
bZ
-bS
+bP
cW
cW
cW
@@ -39820,10 +38954,10 @@ cW
cW
cW
cW
-bS
+bP
bZ
bZ
-bS
+bP
ab
ab
ab
@@ -39964,30 +39098,30 @@ aj
aj
aj
an
-ah
+ac
aj
aj
aj
aj
aj
aj
-ah
+ac
an
aj
aj
aj
aj
aj
-ah
+ac
aj
aj
aH
aL
-ah
-ah
-ah
-ah
-aI
+ac
+ac
+ac
+ac
+ac
ab
ab
ab
@@ -40053,10 +39187,10 @@ ab
ab
ab
ab
-bS
+bP
bZ
bZ
-bS
+bP
cW
cW
cW
@@ -40077,10 +39211,10 @@ hc
dB
cW
eE
-bS
+bP
bZ
bZ
-bS
+bP
ab
ab
ab
@@ -40221,26 +39355,26 @@ aj
aj
aj
an
-ah
+ac
ao
aj
ao
aj
ao
aj
-ah
+ac
an
an
an
an
an
aA
-ah
+ac
ao
ao
-ah
-ah
-aI
+ac
+ac
+ac
ab
ab
ab
@@ -40310,10 +39444,10 @@ ab
ab
ab
ab
-bS
+bP
bZ
bZ
-bS
+bP
cW
cW
cW
@@ -40334,10 +39468,10 @@ cW
dB
cW
cW
-bS
+bP
bZ
bZ
-bS
+bP
ab
ab
ab
@@ -40472,30 +39606,30 @@ ab
ab
ab
ab
-ag
-ah
-ah
+ac
+ac
+ac
ak
ak
-ah
-ah
-ah
-ah
-ah
-ah
-ah
-ah
-ah
-ah
-ah
-ah
-ah
-ah
-ah
-ah
-ah
-ah
-aI
+ac
+ac
+ac
+ac
+ac
+ac
+ac
+ac
+ac
+ac
+ac
+ac
+ac
+ac
+ac
+ac
+ac
+ac
+ac
ab
ab
ab
@@ -40567,10 +39701,10 @@ ab
ab
ab
ab
-bS
+bP
bZ
bZ
-bS
+bP
cW
cW
cW
@@ -40591,10 +39725,10 @@ cW
cW
cW
cW
-bS
+bP
bZ
bZ
-bS
+bP
ab
ab
ab
@@ -40824,10 +39958,10 @@ ab
ab
ab
ab
-bS
+bP
bZ
bZ
-bS
+bP
cW
cW
cW
@@ -40848,10 +39982,10 @@ cW
cW
cW
cW
-bS
+bP
bZ
bZ
-bS
+bP
ab
ab
ab
@@ -41081,10 +40215,10 @@ ab
ab
ab
ab
-bS
+bP
bZ
bZ
-bS
+bP
cW
cW
cW
@@ -41105,10 +40239,10 @@ cW
cW
cW
cW
-bS
+bP
bZ
bZ
-bS
+bP
ab
ab
ab
@@ -41338,10 +40472,10 @@ ab
ab
ab
ab
-bS
+bP
bZ
bZ
-bS
+bP
cW
cW
cW
@@ -41362,10 +40496,10 @@ cW
cW
cW
cW
-bS
+bP
bZ
bZ
-bS
+bP
ab
ab
ab
@@ -41595,10 +40729,10 @@ ab
ab
ab
ab
-bS
+bP
bZ
bZ
-bS
+bP
cW
cW
cW
@@ -41619,10 +40753,10 @@ cW
cW
cW
cW
-bS
+bP
bZ
bZ
-bS
+bP
ab
ab
ab
@@ -41852,10 +40986,10 @@ ab
ab
ab
ab
-bS
+bP
bZ
bZ
-bS
+bP
cW
cW
cW
@@ -41876,10 +41010,10 @@ cW
cW
cW
cW
-bS
+bP
bZ
bZ
-bS
+bP
ab
ab
ab
@@ -42109,10 +41243,10 @@ ab
ab
ab
ab
-bS
+bP
bZ
bZ
-bS
+bP
cW
cW
cW
@@ -42133,10 +41267,10 @@ cW
cW
cW
cW
-bS
+bP
bZ
bZ
-bS
+bP
ab
ab
ab
@@ -42366,34 +41500,34 @@ ab
ab
ab
ab
-bS
+bP
bZ
bZ
-cq
-cb
-cb
-cb
-cb
-cb
-cb
-cb
-cb
-cO
+bP
+bP
+bP
+bP
+bP
+bP
+bP
+bP
+bP
+bP
ab
ab
-cr
-cb
-cb
-cb
-cb
-cb
-cb
-cb
-cb
-eH
+bP
+bP
+bP
+bP
+bP
+bP
+bP
+bP
+bP
+bP
bZ
bZ
-bS
+bP
ab
ab
ab
@@ -42623,7 +41757,7 @@ ab
ab
ab
ab
-bS
+bP
bZ
bZ
ca
@@ -42635,10 +41769,10 @@ bZ
bZ
ch
bZ
-bS
+bP
ab
ab
-bS
+bP
bZ
bZ
bZ
@@ -42650,7 +41784,7 @@ bZ
ca
bZ
bZ
-bS
+bP
ab
ab
ab
@@ -42880,7 +42014,7 @@ ab
ab
ab
ab
-bS
+bP
bZ
bZ
ca
@@ -42892,10 +42026,10 @@ bZ
bZ
bZ
bZ
-bS
+bP
ab
ab
-bS
+bP
bZ
bZ
bZ
@@ -42907,7 +42041,7 @@ bZ
ca
bZ
bZ
-bS
+bP
ab
ab
ab
@@ -43137,34 +42271,34 @@ ab
ab
ab
ab
-bT
-cb
-cb
-dl
-dl
-dl
-dl
-dl
-cO
+bP
+bP
+bP
+bP
+bP
+bP
+bP
+bP
+bP
bZ
ch
bZ
-bS
+bP
ab
ab
-bS
+bP
bZ
bZ
bZ
-cr
-cp
-cp
-cp
-cp
-cp
-cb
-cb
-hT
+bP
+bP
+bP
+bP
+bP
+bP
+bP
+bP
+bP
ab
ab
ab
@@ -43397,28 +42531,28 @@ ab
ab
ab
ab
-bT
-ds
-ds
-ds
-ds
-eG
+bP
+bP
+bP
+bP
+bP
+bP
bZ
bZ
bZ
-bS
+bP
ab
ab
-bS
+bP
bZ
bZ
bZ
-bR
-ds
-ds
-ds
-ds
-hT
+bP
+bP
+bP
+bP
+bP
+bP
ab
ab
ab
@@ -43655,26 +42789,26 @@ ab
ab
ab
ab
-cq
-dm
-dm
-dm
-eG
+bP
+bP
+bP
+bP
+bP
bZ
bZ
bZ
-bS
+bP
ab
ab
-bS
+bP
bZ
bZ
bZ
-bR
-dt
-dt
-dt
-eH
+bP
+bP
+bP
+bP
+bP
ab
ab
ab
@@ -43913,25 +43047,25 @@ ab
ab
ab
dC
-dW
-ei
+dC
+dC
ej
-bS
+bP
bZ
bZ
bZ
-bS
+bP
ab
ab
-bS
+bP
bZ
bZ
bZ
-bS
+bP
ej
-hn
-hy
-hG
+dC
+dC
+dC
ab
ab
ab
@@ -44169,26 +43303,26 @@ ab
ab
ab
ab
-dD
+dC
dX
ej
ej
-bS
+bP
bZ
bZ
bZ
-bS
+bP
ab
ab
-bS
+bP
bZ
bZ
bZ
-bS
+bP
ej
ej
dX
-hH
+dC
ab
ab
ab
@@ -44426,26 +43560,26 @@ ab
ab
ab
ab
-dE
-dW
-ei
+dC
+dC
+dC
ej
-bS
+bP
bZ
bZ
bZ
-bS
+bP
ab
ab
-bS
+bP
bZ
bZ
bZ
-bS
+bP
ej
-hn
-hy
-hI
+dC
+dC
+dC
ab
ab
ab
@@ -44683,26 +43817,26 @@ ab
ab
ab
ab
-dD
+dC
dX
ej
ej
-bS
+bP
bZ
bZ
bZ
-bS
+bP
ab
ab
-bS
+bP
bZ
bZ
bZ
-bS
+bP
ej
ej
dX
-hH
+dC
ab
ab
ab
@@ -44940,26 +44074,26 @@ ab
ab
ab
ab
-dE
-dW
-ei
+dC
+dC
+dC
ej
-bS
+bP
bZ
bZ
bZ
-bS
+bP
ab
ab
-bS
+bP
bZ
bZ
bZ
-bS
+bP
ej
-hn
-hy
-hI
+dC
+dC
+dC
ab
ab
ab
@@ -45197,26 +44331,26 @@ ab
ab
ab
ab
-dD
+dC
dX
ej
ej
-bS
+bP
bZ
bZ
bZ
-bS
+bP
ab
ab
-bS
+bP
bZ
bZ
bZ
-bS
+bP
ej
ej
dX
-hH
+dC
ab
ab
ab
@@ -45454,26 +44588,26 @@ ab
ab
ab
ab
-dE
-dW
-ei
+dC
+dC
+dC
ej
-bS
+bP
bZ
bZ
bZ
-bS
+bP
ab
ab
-bS
+bP
bZ
bZ
bZ
-bS
+bP
ej
-ho
-hy
-hI
+dC
+dC
+dC
ab
ab
ab
@@ -45711,26 +44845,26 @@ ab
ab
ab
ab
-dD
+dC
dX
ej
ej
-bS
+bP
bZ
bZ
bZ
-bS
+bP
ab
ab
-bS
+bP
bZ
bZ
bZ
-bS
+bP
ej
ej
dX
-hH
+dC
ab
ab
ab
@@ -45755,7 +44889,7 @@ ix
ix
is
is
-iF
+is
ab
ab
ab
@@ -45968,26 +45102,26 @@ ab
ab
ab
ab
-dE
-dW
-ei
+dC
+dC
+dC
ej
-bS
+bP
bZ
bZ
bZ
-bS
+bP
ab
ab
-bS
+bP
bZ
bZ
bZ
-bS
+bP
ej
-ho
-hy
-hI
+dC
+dC
+dC
ab
ab
ab
@@ -46011,9 +45145,9 @@ iv
iv
iv
iv
-iC
+iu
+is
is
-iF
ab
ab
ab
@@ -46225,26 +45359,26 @@ ab
ab
ab
ab
-dD
+dC
dX
ej
ej
-bS
+bP
bZ
bZ
bZ
-bS
+bP
ab
ab
-bS
+bP
bZ
bZ
bZ
-bS
+bP
ej
ej
dX
-hH
+dC
ab
ab
ab
@@ -46271,7 +45405,7 @@ iv
iv
iu
is
-iF
+is
ab
ab
ab
@@ -46482,26 +45616,26 @@ ab
ab
ab
ab
-dE
-dW
-ei
+dC
+dC
+dC
ej
-bS
+bP
bZ
bZ
bZ
-bS
+bP
ab
ab
-bS
+bP
bZ
bZ
bZ
-bS
+bP
ej
-ho
-hy
-hI
+dC
+dC
+dC
ab
ab
ab
@@ -46529,7 +45663,7 @@ iv
iv
iu
is
-iF
+is
ab
ab
ab
@@ -46739,7 +45873,7 @@ ab
ab
ab
ab
-dD
+dC
dX
ej
ej
@@ -46747,10 +45881,10 @@ ca
bZ
bZ
bZ
-bS
+bP
ab
ab
-bS
+bP
bZ
bZ
bZ
@@ -46758,7 +45892,7 @@ ca
ej
ej
dX
-hH
+dC
ab
ab
ab
@@ -46996,26 +46130,26 @@ ab
ab
ab
ab
-dE
-dW
-ei
+dC
+dC
+dC
ej
-bS
+bP
bZ
bZ
bZ
-bS
+bP
ab
ab
-bS
+bP
bZ
bZ
bZ
-bS
+bP
ej
-ho
-hy
-hI
+dC
+dC
+dC
ab
ab
ab
@@ -47253,26 +46387,26 @@ ab
ab
ab
ab
-dD
+dC
dX
ej
ej
-bS
+bP
bZ
bZ
bZ
-bS
+bP
ab
ab
-bS
+bP
bZ
bZ
bZ
-bS
+bP
ej
ej
dX
-hH
+dC
ab
ab
ab
@@ -47510,26 +46644,26 @@ ab
ab
ab
ab
-dE
-dW
-ei
+dC
+dC
+dC
ej
-bS
+bP
bZ
bZ
bZ
-bS
+bP
ab
ab
-bS
+bP
bZ
bZ
bZ
-bS
+bP
ej
-ho
-hy
-hI
+dC
+dC
+dC
ab
ab
ab
@@ -47767,26 +46901,26 @@ ab
ab
ab
ab
-dD
+dC
dX
ej
ej
-bS
+bP
bZ
bZ
bZ
-bS
+bP
ab
ab
-bS
+bP
bZ
bZ
bZ
-bS
+bP
ej
ej
dX
-hH
+dC
ab
ab
ab
@@ -47814,7 +46948,7 @@ iv
iv
iu
is
-iG
+is
ab
ab
ab
@@ -48024,26 +47158,26 @@ ab
ab
ab
ab
-dE
-dW
-ei
+dC
+dC
+dC
ej
-bS
+bP
bZ
bZ
bZ
-bS
+bP
ab
ab
-bS
+bP
bZ
bZ
bZ
-bS
+bP
ej
-ho
-hy
-hI
+dC
+dC
+dC
ab
ab
ab
@@ -48070,7 +47204,7 @@ iv
iv
iu
is
-iG
+is
ab
ab
ab
@@ -48281,26 +47415,26 @@ ab
ab
ab
ab
-dD
+dC
dX
ej
ej
-bS
+bP
bZ
bZ
bZ
-bS
+bP
ab
ab
-bS
+bP
bZ
bZ
bZ
-bS
+bP
ej
ej
dX
-hH
+dC
ab
ab
ab
@@ -48317,7 +47451,7 @@ ab
ab
ab
ab
-it
+is
is
iv
iv
@@ -48326,7 +47460,7 @@ iv
iv
iu
is
-iG
+is
ab
ab
ab
@@ -48538,26 +47672,26 @@ ab
ab
ab
ab
-dE
-dW
-ei
+dC
+dC
+dC
ej
-bS
+bP
bZ
bZ
bZ
-bS
+bP
ab
ab
-bS
+bP
bZ
bZ
bZ
-bS
+bP
ej
-ho
-hy
-hI
+dC
+dC
+dC
ab
ab
ab
@@ -48575,14 +47709,14 @@ ab
ab
ab
ab
-it
+is
is
is
ix
ix
is
is
-iG
+is
ab
ab
ab
@@ -48795,26 +47929,26 @@ ab
ab
ab
ab
-dD
+dC
dX
ej
ej
-bS
+bP
bZ
bZ
bZ
-bS
+bP
ab
ab
-bS
+bP
bZ
bZ
bZ
-bS
+bP
ej
ej
dX
-hH
+dC
ab
ab
ab
@@ -49052,26 +48186,26 @@ ab
ab
ab
ab
-dE
-dW
-ei
+dC
+dC
+dC
ej
-bS
+bP
bZ
bZ
bZ
-bS
+bP
ab
ab
-bS
+bP
bZ
bZ
bZ
-bS
+bP
ej
-ho
-hy
-hI
+dC
+dC
+dC
ab
ab
ab
@@ -49309,26 +48443,26 @@ ab
ab
ab
ab
-dD
+dC
dX
ej
ej
-bS
+bP
bZ
bZ
bZ
-bS
+bP
ab
ab
-bS
+bP
bZ
bZ
bZ
-bS
+bP
ej
ej
dX
-hH
+dC
ab
ab
ab
@@ -49566,26 +48700,26 @@ ab
ab
ab
ab
-dF
-dW
-ei
+dC
+dC
+dC
ej
-bS
+bP
bZ
bZ
bZ
-bS
+bP
ab
ab
-bS
+bP
bZ
bZ
bZ
-bS
+bP
ej
-ho
-hy
-hJ
+dC
+dC
+dC
ab
ab
ab
@@ -49823,26 +48957,26 @@ ab
ab
ab
ab
-cr
-dl
-dl
-dl
-eG
+bP
+bP
+bP
+bP
+bP
bZ
bZ
bZ
-bS
+bP
ab
ab
-bS
+bP
bZ
bZ
bZ
-bR
-cp
-cp
-cp
-cO
+bP
+bP
+bP
+bP
+bP
ab
ab
ab
@@ -50000,29 +49134,29 @@ ab
ab
ab
av
-aB
-aB
+av
+av
aE
aE
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-bp
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
ab
ab
ab
@@ -50080,27 +49214,27 @@ ab
ab
ab
bP
-ds
-ds
-ds
-ds
-eG
+bP
+bP
+bP
+bP
+bP
bZ
bZ
bZ
-bS
+bP
ab
ab
-bS
+bP
bZ
bZ
bZ
-bR
-ds
-ds
-ds
-ds
-dq
+bP
+bP
+bP
+bP
+bP
+bP
ab
ab
ab
@@ -50262,26 +49396,26 @@ aD
aD
aD
aJ
-aB
+av
aU
aD
aU
aD
aU
aD
-aB
+av
aJ
aJ
aJ
aJ
aJ
aJ
-aB
+av
aU
aU
-aB
-aB
-bp
+av
+av
+av
ab
ab
ab
@@ -50334,33 +49468,33 @@ ab
ab
ab
bP
-cb
-cb
-dm
-dm
-dm
-dm
-dm
-eH
+bP
+bP
+bP
+bP
+bP
+bP
+bP
+bP
bZ
bZ
bZ
-bS
+bP
ab
ab
-bS
+bP
bZ
bZ
bZ
-cq
-dt
-dt
-dt
-dt
-dt
-cb
-cb
-dq
+bP
+bP
+bP
+bP
+bP
+bP
+bP
+bP
+bP
ab
ab
ab
@@ -50519,30 +49653,30 @@ aD
aD
aD
aJ
-aB
+av
aD
aD
aD
aD
aD
aD
-aB
+av
aJ
aD
aD
aD
aD
aD
-aB
+av
aD
aD
bq
bs
-aB
-aB
-aB
-aB
-bp
+av
+av
+av
+av
+av
ab
ab
ab
@@ -50590,7 +49724,7 @@ ab
ab
ab
ab
-bS
+bP
bZ
bZ
bZ
@@ -50602,10 +49736,10 @@ bZ
bZ
bZ
bZ
-bS
+bP
ab
ab
-bS
+bP
bZ
bZ
bZ
@@ -50617,7 +49751,7 @@ bZ
bZ
bZ
bZ
-bS
+bP
ab
ab
ab
@@ -50776,29 +49910,29 @@ aD
aD
aD
aJ
-aB
+av
aD
aD
aD
aD
aD
aD
-aB
+av
aJ
aD
aD
aD
aD
aD
-aB
+av
aD
aD
bq
bs
-aB
-aB
-aB
-aB
+av
+av
+av
+av
bw
ab
ab
@@ -50847,7 +49981,7 @@ ab
ab
ab
ab
-bS
+bP
bZ
bX
bZ
@@ -50859,10 +49993,10 @@ bZ
bZ
bZ
bZ
-bS
+bP
ab
ab
-bS
+bP
bZ
bZ
bZ
@@ -50874,7 +50008,7 @@ bZ
bZ
bZ
bZ
-bS
+bP
ab
ab
ab
@@ -51033,31 +50167,31 @@ aD
aD
aD
aJ
-aB
+av
aD
aD
aD
aD
aD
aD
-aB
+av
aJ
aD
aD
aD
aD
aD
-aB
+av
aD
aD
aD
-bt
-aB
-aB
-aB
-aB
-aB
-bp
+av
+av
+av
+av
+av
+av
+av
ab
ab
ab
@@ -51104,7 +50238,7 @@ ab
ab
ab
ab
-bS
+bP
bX
bX
bX
@@ -51116,10 +50250,10 @@ bZ
cU
bZ
bZ
-bS
+bP
ab
ab
-bS
+bP
bZ
bZ
bZ
@@ -51131,7 +50265,7 @@ bZ
bZ
bZ
bZ
-bS
+bP
ab
ab
ab
@@ -51290,25 +50424,25 @@ aD
aD
aD
aJ
-aB
+av
aU
aD
aU
aD
aD
aD
-aB
+av
aJ
aJ
aJ
aJ
aD
aD
-aB
+av
aD
aD
aD
-aB
+av
ab
ab
ab
@@ -51356,15 +50490,15 @@ ab
ab
ab
bE
-bJ
-bJ
-bJ
-bJ
-bJ
-bJ
-bJ
-bJ
-ce
+bE
+bE
+bE
+bE
+bE
+bE
+bE
+bE
+bE
bX
bZ
bZ
@@ -51373,10 +50507,10 @@ bZ
bZ
bZ
bZ
-bS
+bP
ab
ab
-bS
+bP
ch
bZ
bZ
@@ -51388,7 +50522,7 @@ bZ
bZ
bZ
bZ
-bS
+bP
ab
ab
ab
@@ -51547,25 +50681,25 @@ aD
aD
aD
aK
-aB
-aB
-aB
-aB
-aB
+av
+av
+av
+av
+av
bf
bf
-aB
-aB
-aB
-aB
-aB
+av
+av
+av
+av
+av
bf
bf
-aB
+av
aD
aD
aD
-aB
+av
ab
ab
ab
@@ -51612,8 +50746,8 @@ ab
ab
ab
ab
-JW
-nG
+bF
+bK
bN
bN
bN
@@ -51621,8 +50755,8 @@ bN
bN
bL
cZ
-bJ
-ce
+bE
+bE
bX
bZ
bZ
@@ -51630,10 +50764,10 @@ cN
bZ
bZ
bZ
-bS
+bP
ab
ab
-bS
+bP
bZ
bZ
bZ
@@ -51645,7 +50779,7 @@ bZ
bZ
bZ
bZ
-bS
+bP
ab
ab
ab
@@ -51887,10 +51021,10 @@ bZ
bZ
bZ
bZ
-bS
+bP
ab
ab
-bS
+bP
bZ
bZ
bZ
@@ -51902,7 +51036,7 @@ hK
bZ
bZ
bZ
-bS
+bP
ab
ab
ab
@@ -52144,10 +51278,10 @@ bZ
bZ
bZ
cN
-bS
+bP
ab
ab
-bS
+bP
bZ
bZ
bZ
@@ -52159,7 +51293,7 @@ bZ
bZ
bZ
bZ
-bS
+bP
ab
ab
ab
@@ -52318,25 +51452,25 @@ aD
aD
aD
aJ
-aB
-aB
-aB
-aB
-aB
+av
+av
+av
+av
+av
bf
bf
-aB
-aB
-aB
-aB
-aB
+av
+av
+av
+av
+av
bf
bf
-aB
+av
aD
aD
aD
-aB
+av
ab
ab
ab
@@ -52383,8 +51517,8 @@ ab
ab
ab
ab
-JS
-qC
+bH
+bM
bO
bO
bO
@@ -52392,8 +51526,8 @@ bO
bO
bL
bL
-bJ
-cg
+bE
+bE
bZ
bX
bZ
@@ -52401,10 +51535,10 @@ bZ
dH
bZ
cU
-bS
+bP
ab
ab
-bS
+bP
bZ
bZ
bZ
@@ -52416,7 +51550,7 @@ bZ
bZ
bZ
bZ
-bS
+bP
ab
ab
ab
@@ -52575,25 +51709,25 @@ aD
aD
aD
aJ
-aB
+av
aU
aD
aU
aD
aD
aD
-aB
+av
aJ
aJ
aJ
aJ
aD
aD
-aB
+av
aD
aD
aD
-aB
+av
ab
ab
ab
@@ -52640,16 +51774,16 @@ ab
ab
ab
ab
-bI
-bJ
-bJ
-bJ
-bJ
-bJ
-bJ
-bJ
-bJ
-cg
+bE
+bE
+bE
+bE
+bE
+bE
+bE
+bE
+bE
+bE
bZ
bX
bX
@@ -52658,10 +51792,10 @@ bZ
bZ
bZ
bZ
-bS
+bP
ab
ab
-bS
+bP
bZ
bZ
bZ
@@ -52673,7 +51807,7 @@ bZ
bZ
bZ
bZ
-bS
+bP
ab
ab
ab
@@ -52832,31 +51966,31 @@ aD
aD
aD
aJ
-aB
+av
aD
aD
aD
aD
aD
aD
-aB
+av
aJ
aD
aD
aD
aD
aD
-aB
+av
aD
aD
aD
-bu
-aB
-aB
-aB
-aB
-aB
-br
+av
+av
+av
+av
+av
+av
+av
ab
ab
ab
@@ -52903,7 +52037,7 @@ ab
ab
ab
ab
-bS
+bP
bZ
bX
bZ
@@ -52915,10 +52049,10 @@ bZ
bZ
bZ
bZ
-bS
+bP
ab
ab
-bS
+bP
bZ
bZ
bZ
@@ -52930,7 +52064,7 @@ bZ
bZ
bZ
bZ
-bS
+bP
ab
ab
ab
@@ -53089,29 +52223,29 @@ aD
aD
aD
aJ
-aB
+av
aD
aD
aD
aD
aD
aD
-aB
+av
aJ
aD
aD
aD
aD
aD
-aB
+av
aD
aD
bq
bs
-aB
-aB
-aB
-aB
+av
+av
+av
+av
bw
ab
ab
@@ -53160,7 +52294,7 @@ ab
ab
ab
ab
-bS
+bP
bX
bZ
bZ
@@ -53172,10 +52306,10 @@ bZ
bZ
bZ
bZ
-bS
+bP
ab
ab
-bS
+bP
bZ
bZ
bZ
@@ -53187,7 +52321,7 @@ bZ
bZ
cY
bZ
-bS
+bP
ab
ab
ab
@@ -53346,30 +52480,30 @@ aD
aD
aD
aJ
-aB
+av
aD
aD
aD
aD
aD
aD
-aB
+av
aJ
aD
aD
aD
aD
aD
-aB
+av
aD
aD
bq
bs
-aB
-aB
-aB
-aB
-br
+av
+av
+av
+av
+av
ab
ab
ab
@@ -53417,7 +52551,7 @@ ab
ab
ab
ab
-bS
+bP
bZ
bZ
bZ
@@ -53429,10 +52563,10 @@ bZ
bZ
bZ
bZ
-bS
+bP
ab
ab
-bS
+bP
bZ
bZ
bZ
@@ -53444,7 +52578,7 @@ bZ
bZ
bZ
bZ
-bS
+bP
ab
ab
ab
@@ -53603,26 +52737,26 @@ aD
aD
aD
aJ
-aB
+av
aU
aD
aU
aD
aU
aD
-aB
+av
bk
aJ
aJ
aJ
aJ
aJ
-aB
+av
aU
aU
-aB
-aB
-br
+av
+av
+av
ab
ab
ab
@@ -53674,34 +52808,34 @@ ab
ab
ab
ab
-bS
+bP
+cV
cV
-da
cG
cV
-dZ
-dZ
-dZ
-da
+cV
+cV
+cV
+cV
cG
cV
-da
-bS
+cV
+bP
ab
ab
-bS
+bP
+cV
cV
-da
cG
cV
-dZ
-dZ
-dZ
-da
+cV
+cV
+cV
+cV
cG
cV
-da
-bS
+cV
+bP
ab
ab
ab
@@ -53854,30 +52988,30 @@ ab
ab
ab
ab
-az
-aB
-aB
+av
+av
+av
aE
aE
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-br
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
ab
ab
ab
@@ -53931,7 +53065,7 @@ ab
ab
ab
ab
-bS
+bP
cW
cW
cW
@@ -53943,10 +53077,10 @@ cW
cW
cW
cW
-bS
+bP
ab
ab
-bS
+bP
cW
cW
cW
@@ -53958,7 +53092,7 @@ cW
cW
cW
cW
-bS
+bP
ab
ab
ab
@@ -54188,7 +53322,7 @@ ab
ab
ab
ab
-bT
+bP
cW
db
cW
@@ -54203,7 +53337,7 @@ cW
fi
ab
ab
-bT
+bP
cW
db
cW
@@ -54215,7 +53349,7 @@ db
cW
db
cW
-hT
+bP
ab
ab
ab
@@ -61660,15 +60794,15 @@ ab
ab
ab
ab
-gW
+gM
hd
-hp
-hp
-hp
-hp
-hp
-hp
-ig
+hd
+hd
+hd
+hd
+hd
+hd
+gM
ab
ab
ab
@@ -61917,7 +61051,7 @@ ab
ab
ab
ab
-gX
+gM
he
he
he
@@ -61925,7 +61059,7 @@ hL
he
he
he
-gX
+gM
ab
ab
ab
@@ -62174,7 +61308,7 @@ ab
ab
ab
gL
-gX
+gM
hf
hf
hf
@@ -62182,7 +61316,7 @@ hM
hf
hf
hf
-gX
+gM
gL
ab
ab
@@ -62431,7 +61565,7 @@ ab
ab
ab
gM
-gX
+gM
hf
hf
hf
@@ -62439,8 +61573,8 @@ hf
hf
hf
hf
-gX
-hz
+gM
+gM
ab
ab
ab
@@ -62688,7 +61822,7 @@ ab
ab
ab
ab
-gX
+gM
hf
hf
hf
@@ -62696,7 +61830,7 @@ hf
hf
hf
hf
-gX
+gM
ab
ab
ab
@@ -62945,7 +62079,7 @@ ab
ab
ab
ab
-gX
+gM
hf
hf
hf
@@ -62953,7 +62087,7 @@ hf
hf
hf
hf
-gX
+gM
ab
ab
ab
@@ -63202,7 +62336,7 @@ ab
ab
ab
ab
-gX
+gM
hf
hf
hf
@@ -63210,7 +62344,7 @@ hf
hf
hf
hf
-gX
+gM
ab
ab
ab
@@ -63459,7 +62593,7 @@ ab
ab
ab
ab
-gX
+gM
hf
hf
hf
@@ -63467,7 +62601,7 @@ hf
hf
hf
hf
-gX
+gM
ab
ab
ab
@@ -63716,7 +62850,7 @@ ab
ab
ab
ab
-gX
+gM
hf
hf
hf
@@ -63724,7 +62858,7 @@ hf
hf
hf
hf
-gX
+gM
ab
ab
ab
@@ -63973,15 +63107,15 @@ ab
ab
ab
ab
-gX
+gM
hg
hg
-gX
+gM
hN
-gX
+gM
hg
hg
-gX
+gM
ab
ab
ab
@@ -64233,12 +63367,12 @@ ab
gM
hh
hh
-hz
+gM
ab
gM
hh
hh
-hz
+gM
ab
ab
ab
diff --git a/_maps/map_files/RandomZLevels/stationCollision.dmm b/_maps/map_files/RandomZLevels/stationCollision.dmm
index db0e0bb7cc4..e6c7bfcd7b0 100644
--- a/_maps/map_files/RandomZLevels/stationCollision.dmm
+++ b/_maps/map_files/RandomZLevels/stationCollision.dmm
@@ -142,16 +142,7 @@
/turf/simulated/floor/plasteel,
/area/awaymission/northblock)
"aC" = (
-/turf/simulated/shuttle/wall{
- icon_state = "wall3"
- },
-/area/awaymission/syndishuttle)
-"aD" = (
-/turf/space,
-/turf/simulated/shuttle/wall{
- dir = 1;
- icon_state = "diagonalWall3"
- },
+/turf/simulated/wall/mineral/plastitanium,
/area/awaymission/syndishuttle)
"aE" = (
/obj/machinery/door/airlock/engineering,
@@ -177,7 +168,7 @@
icon_state = "burst_l";
tag = "icon-burst_l (EAST)"
},
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating/airless,
/area/awaymission/syndishuttle)
"aJ" = (
/turf/simulated/floor/plating/airless,
@@ -205,12 +196,6 @@
},
/turf/simulated/floor/plating/airless,
/area/awaymission/syndishuttle)
-"aQ" = (
-/turf/simulated/floor/plating/airless,
-/turf/simulated/shuttle/wall{
- icon_state = "diagonalWall3"
- },
-/area/awaymission/syndishuttle)
"aR" = (
/obj/structure/closet/secure_closet/engineering_personal,
/obj/effect/landmark/damageturf,
@@ -244,18 +229,10 @@
/obj/machinery/portable_atmospherics/canister/toxins{
destroyed = 1
},
-/turf/simulated/shuttle/plating,
-/area/awaymission/syndishuttle)
-"aY" = (
-/turf/simulated/shuttle/plating,
-/turf/simulated/shuttle/wall{
- icon_state = "diagonalWall3"
- },
+/turf/simulated/floor/plating,
/area/awaymission/syndishuttle)
"aZ" = (
-/turf/simulated/shuttle/wall{
- icon_state = "wall3"
- },
+/turf/simulated/wall/mineral/plastitanium,
/area/space/nearstation)
"ba" = (
/turf/simulated/wall,
@@ -272,10 +249,10 @@
/area/awaymission/northblock)
"be" = (
/obj/structure/shuttle/engine/heater,
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating,
/area/awaymission/syndishuttle)
"bf" = (
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating,
/area/awaymission/syndishuttle)
"bg" = (
/turf/simulated/floor/plasteel/airless{
@@ -333,7 +310,7 @@
/area/awaymission/northblock)
"bp" = (
/obj/structure/shuttle/engine/router,
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating,
/area/awaymission/syndishuttle)
"bq" = (
/obj/structure/shuttle/engine/heater{
@@ -341,11 +318,11 @@
icon_state = "heater";
dir = 8
},
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating,
/area/awaymission/syndishuttle)
"br" = (
/obj/item/storage/toolbox/syndicate,
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating,
/area/awaymission/syndishuttle)
"bs" = (
/obj/structure/lattice,
@@ -353,7 +330,7 @@
/area/awaymission/syndishuttle)
"bt" = (
/obj/machinery/door/airlock/centcom,
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating,
/area/awaymission/syndishuttle)
"bu" = (
/turf/simulated/floor/plasteel/airless{
@@ -376,7 +353,7 @@
/area/awaymission/research)
"by" = (
/obj/machinery/portable_atmospherics/canister/toxins,
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating,
/area/awaymission/syndishuttle)
"bz" = (
/obj/structure/table,
@@ -415,13 +392,6 @@
dir = 1
},
/area/awaymission/northblock)
-"bE" = (
-/turf/space,
-/turf/simulated/shuttle/wall{
- dir = 4;
- icon_state = "diagonalWall3"
- },
-/area/awaymission/syndishuttle)
"bF" = (
/obj/effect/decal/warning_stripes/north,
/turf/simulated/floor/plasteel,
@@ -532,14 +502,7 @@
icon_state = "heater";
dir = 1
},
-/turf/simulated/shuttle/plating,
-/area/awaymission/syndishuttle)
-"bW" = (
-/turf/simulated/shuttle/plating,
-/turf/simulated/shuttle/wall{
- dir = 8;
- icon_state = "diagonalWall3"
- },
+/turf/simulated/floor/plating,
/area/awaymission/syndishuttle)
"bX" = (
/turf/simulated/floor/plasteel/airless{
@@ -741,7 +704,7 @@
icon_state = "burst_l";
tag = "icon-burst_l (EAST)"
},
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating/airless,
/area/awaymission/research)
"cz" = (
/obj/structure/shuttle/engine/heater{
@@ -756,7 +719,7 @@
/obj/structure/window/reinforced{
dir = 1
},
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating/airless,
/area/awaymission/research)
"cA" = (
/turf/simulated/floor/plasteel{
@@ -769,13 +732,6 @@
icon_state = "dark"
},
/area/awaymission/research)
-"cD" = (
-/turf/simulated/floor/plating/airless,
-/turf/simulated/shuttle/wall{
- dir = 8;
- icon_state = "diagonalWall3"
- },
-/area/awaymission/syndishuttle)
"cE" = (
/obj/structure/window/reinforced{
dir = 8
@@ -839,7 +795,7 @@
/obj/structure/window/reinforced{
dir = 1
},
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating/airless,
/area/awaymission/research)
"cL" = (
/obj/effect/decal/remains/human{
@@ -1488,21 +1444,11 @@
/area/awaymission/northblock)
"eh" = (
/obj/machinery/sleeper,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4";
- nitrogen = 0.01;
- oxygen = 0.01;
- temperature = 2.7
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/awaymission/syndishuttle)
"ei" = (
/obj/machinery/vending/snack,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4";
- nitrogen = 0.01;
- oxygen = 0.01;
- temperature = 2.7
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/awaymission/syndishuttle)
"ej" = (
/obj/structure/cable{
@@ -1553,12 +1499,7 @@
/area/awaymission/northblock)
"ep" = (
/obj/machinery/vending/cigarette,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4";
- nitrogen = 0.01;
- oxygen = 0.01;
- temperature = 2.7
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/awaymission/syndishuttle)
"eq" = (
/obj/structure/chair/office/light{
@@ -1569,12 +1510,7 @@
/area/awaymission/northblock)
"er" = (
/obj/machinery/vending/cola,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4";
- nitrogen = 0.01;
- oxygen = 0.01;
- temperature = 2.7
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/awaymission/syndishuttle)
"es" = (
/obj/machinery/door/airlock/command,
@@ -1636,12 +1572,7 @@
/area/awaymission/northblock)
"ex" = (
/obj/machinery/vending/coffee,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4";
- nitrogen = 0.01;
- oxygen = 0.01;
- temperature = 2.7
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/awaymission/syndishuttle)
"ey" = (
/obj/machinery/light{
@@ -1715,7 +1646,7 @@
dir = 1
},
/obj/structure/window/reinforced,
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating/airless,
/area/awaymission/research)
"eI" = (
/obj/structure/window/reinforced{
@@ -1729,29 +1660,14 @@
/area/awaymission/northblock)
"eJ" = (
/obj/structure/closet/syndicate,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4";
- nitrogen = 0.01;
- oxygen = 0.01;
- temperature = 2.7
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/awaymission/syndishuttle)
"eK" = (
-/turf/simulated/shuttle/floor{
- icon_state = "floor4";
- nitrogen = 0.01;
- oxygen = 0.01;
- temperature = 2.7
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/awaymission/syndishuttle)
"eL" = (
/obj/machinery/door/airlock/centcom,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4";
- nitrogen = 0.01;
- oxygen = 0.01;
- temperature = 2.7
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/awaymission/syndishuttle)
"eM" = (
/obj/machinery/light/small,
@@ -1857,21 +1773,11 @@
desc = "A dark little medical robot. She looks somewhat underwhelmed.";
name = "Nightingale"
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4";
- nitrogen = 0.01;
- oxygen = 0.01;
- temperature = 2.7
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/awaymission/syndishuttle)
"eX" = (
/obj/structure/table,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4";
- nitrogen = 0.01;
- oxygen = 0.01;
- temperature = 2.7
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/awaymission/syndishuttle)
"eY" = (
/obj/effect/landmark/burnturf,
@@ -1942,44 +1848,24 @@
/obj/structure/chair/comfy/shuttle{
dir = 4
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4";
- nitrogen = 0.01;
- oxygen = 0.01;
- temperature = 2.7
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/awaymission/syndishuttle)
"fg" = (
/obj/structure/chair/comfy/shuttle{
dir = 8
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4";
- nitrogen = 0.01;
- oxygen = 0.01;
- temperature = 2.7
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/awaymission/syndishuttle)
"fh" = (
/obj/structure/table,
/obj/item/paper/sc_safehint_paper_shuttle,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4";
- nitrogen = 0.01;
- oxygen = 0.01;
- temperature = 2.7
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/awaymission/syndishuttle)
"fi" = (
/obj/machinery/sleeper{
dir = 1
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4";
- nitrogen = 0.01;
- oxygen = 0.01;
- temperature = 2.7
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/awaymission/syndishuttle)
"fj" = (
/obj/machinery/door/airlock/gold{
@@ -2224,79 +2110,15 @@
/turf/simulated/wall/cult,
/area/awaymission/midblock)
"fJ" = (
-/obj/structure/window/reinforced,
-/obj/structure/window/reinforced{
- dir = 1
- },
-/obj/structure/window/reinforced{
- dir = 8
- },
-/obj/structure/grille,
-/turf/simulated/floor/plating,
-/area/awaymission/midblock)
-"fK" = (
-/obj/structure/window/reinforced{
- dir = 1
- },
-/obj/structure/window/reinforced{
- dir = 4
- },
-/obj/structure/grille,
+/obj/effect/spawner/window/reinforced,
/turf/simulated/floor/plating,
/area/awaymission/midblock)
"fL" = (
-/turf/space,
-/turf/simulated/shuttle/wall{
- tag = "icon-swall_f6";
- icon_state = "swall_f6";
- dir = 2
- },
-/area/awaymission/arrivalblock)
-"fM" = (
-/turf/simulated/shuttle/wall{
- tag = "icon-swall14";
- icon_state = "swall14";
- dir = 2
- },
+/turf/simulated/wall/mineral/titanium,
/area/awaymission/arrivalblock)
"fN" = (
-/obj/structure/window/reinforced,
-/obj/structure/window/reinforced{
- dir = 8
- },
-/obj/structure/window/reinforced{
- dir = 1
- },
-/obj/structure/grille,
-/turf/simulated/shuttle/plating,
-/area/awaymission/arrivalblock)
-"fO" = (
-/obj/structure/window/reinforced,
-/obj/structure/window/reinforced{
- dir = 1
- },
-/obj/structure/grille,
-/turf/simulated/shuttle/plating,
-/area/awaymission/arrivalblock)
-"fP" = (
-/obj/structure/window/reinforced,
-/obj/structure/window/reinforced{
- dir = 4
- },
-/obj/structure/window/reinforced{
- dir = 1
- },
-/obj/structure/grille,
-/turf/simulated/shuttle/plating,
-/area/awaymission/arrivalblock)
-"fQ" = (
-/turf/space,
-/turf/simulated/shuttle/wall{
- dir = 3;
- icon_state = "swall_f10";
- layer = 2;
- tag = "icon-swall_f10"
- },
+/obj/effect/spawner/window/shuttle,
+/turf/simulated/floor/plating,
/area/awaymission/arrivalblock)
"fR" = (
/obj/item/paper{
@@ -2351,40 +2173,14 @@
icon_state = "dark"
},
/area/awaymission/midblock)
-"fY" = (
-/obj/structure/window/reinforced,
-/obj/structure/window/reinforced{
- dir = 8
- },
-/obj/structure/grille,
-/turf/simulated/floor/plating,
-/area/awaymission/midblock)
-"fZ" = (
-/turf/simulated/shuttle/wall{
- tag = "icon-swall3";
- icon_state = "swall3";
- dir = 2
- },
-/area/awaymission/arrivalblock)
-"ga" = (
-/turf/simulated/shuttle/wall{
- tag = "icon-swall1";
- icon_state = "swall1";
- dir = 2
- },
-/area/awaymission/arrivalblock)
"gb" = (
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/awaymission/arrivalblock)
"gc" = (
/obj/structure/chair/comfy/shuttle{
dir = 1
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/awaymission/arrivalblock)
"gd" = (
/obj/structure/chair/comfy/brown{
@@ -2505,50 +2301,11 @@
icon_state = "dark"
},
/area/awaymission/midblock)
-"gv" = (
-/obj/structure/window/reinforced{
- dir = 8
- },
-/obj/structure/window/reinforced{
- dir = 4
- },
-/obj/structure/grille,
-/turf/simulated/floor/plating,
-/area/awaymission/midblock)
-"gw" = (
-/obj/structure/window/reinforced{
- dir = 8
- },
-/obj/structure/window/reinforced{
- dir = 4
- },
-/obj/structure/window/reinforced{
- dir = 1
- },
-/obj/structure/grille,
-/turf/simulated/shuttle/plating,
-/area/awaymission/arrivalblock)
"gx" = (
/obj/machinery/status_display{
pixel_y = 32
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
-/area/awaymission/arrivalblock)
-"gy" = (
-/obj/structure/window/reinforced{
- dir = 8
- },
-/obj/structure/window/reinforced{
- dir = 4
- },
-/obj/structure/window/reinforced{
- dir = 1
- },
-/obj/structure/grille,
-/obj/structure/window/reinforced,
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/mineral/titanium,
/area/awaymission/arrivalblock)
"gz" = (
/turf/simulated/wall,
@@ -2661,23 +2418,11 @@
icon_state = "chapel"
},
/area/awaymission/midblock)
-"gQ" = (
-/obj/structure/window/reinforced{
- dir = 8
- },
-/obj/structure/window/reinforced{
- dir = 4
- },
-/obj/structure/grille,
-/turf/simulated/shuttle/plating,
-/area/awaymission/arrivalblock)
"gR" = (
-/obj/machinery/door/unpowered/shuttle{
+/obj/machinery/door/airlock/titanium{
name = "Shuttle Airlock"
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/plating,
/area/awaymission/arrivalblock)
"gS" = (
/obj/machinery/door/airlock/external{
@@ -2844,42 +2589,8 @@
icon_state = "chapel"
},
/area/awaymission/midblock)
-"hn" = (
-/obj/structure/window/reinforced,
-/obj/structure/window/reinforced{
- dir = 8
- },
-/obj/structure/window/reinforced{
- dir = 4
- },
-/obj/structure/grille,
-/turf/simulated/shuttle/plating,
-/area/awaymission/arrivalblock)
-"ho" = (
-/obj/structure/window/reinforced,
-/obj/structure/window/reinforced{
- dir = 8
- },
-/obj/structure/window/reinforced{
- dir = 4
- },
-/obj/structure/grille,
-/obj/structure/window/reinforced{
- dir = 1
- },
-/turf/simulated/shuttle/plating,
-/area/awaymission/arrivalblock)
"hp" = (
-/obj/structure/window/reinforced{
- dir = 8
- },
-/obj/structure/window/reinforced{
- dir = 4
- },
-/obj/structure/grille,
-/obj/structure/window/reinforced{
- dir = 1
- },
+/obj/effect/spawner/window/reinforced,
/turf/simulated/floor/plating,
/area/awaymission/arrivalblock)
"hq" = (
@@ -2907,14 +2618,6 @@
"hu" = (
/turf/simulated/floor/plasteel,
/area/awaymission/arrivalblock)
-"hv" = (
-/turf/space,
-/turf/simulated/shuttle/wall{
- tag = "icon-swall_f5";
- icon_state = "swall_f5";
- dir = 2
- },
-/area/awaymission/arrivalblock)
"hw" = (
/obj/structure/window/reinforced,
/turf/simulated/floor/plasteel,
@@ -2983,16 +2686,6 @@
},
/turf/simulated/floor/plasteel,
/area/awaymission/midblock)
-"hE" = (
-/obj/structure/grille,
-/obj/structure/window/reinforced{
- dir = 8
- },
-/obj/structure/window/reinforced{
- dir = 4
- },
-/turf/simulated/shuttle/plating,
-/area/awaymission/arrivalblock)
"hF" = (
/turf/simulated/floor/plasteel{
icon_state = "red";
@@ -3064,48 +2757,12 @@
/obj/effect/decal/cleanable/blood/splatter,
/turf/simulated/floor/plasteel,
/area/awaymission/midblock)
-"hR" = (
-/turf/space,
-/turf/simulated/shuttle/wall{
- tag = "icon-swall_f9";
- icon_state = "swall_f9";
- dir = 2
- },
-/area/awaymission/arrivalblock)
"hS" = (
/obj/machinery/light/small,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
/area/awaymission/midblock)
-"hT" = (
-/obj/structure/window/reinforced{
- dir = 1
- },
-/obj/structure/window/reinforced{
- dir = 8
- },
-/obj/structure/grille,
-/turf/simulated/floor/plating,
-/area/awaymission/midblock)
-"hU" = (
-/obj/structure/window/reinforced,
-/obj/structure/window/reinforced{
- dir = 4
- },
-/obj/structure/grille,
-/turf/simulated/floor/plating,
-/area/awaymission/midblock)
-"hV" = (
-/obj/structure/window/reinforced{
- dir = 8
- },
-/obj/structure/window/reinforced{
- dir = 4
- },
-/obj/structure/grille,
-/turf/simulated/floor/plating,
-/area/awaymission/arrivalblock)
"hW" = (
/obj/effect/decal/cleanable/blood/splatter,
/obj/item/ammo_casing/c10mm,
@@ -3336,54 +2993,11 @@
},
/turf/simulated/floor/plasteel,
/area/awaymission/midblock)
-"iC" = (
-/obj/structure/window/reinforced{
- dir = 8
- },
-/obj/structure/window/reinforced{
- dir = 4
- },
-/obj/item/shard{
- icon_state = "medium"
- },
-/obj/item/stack/rods,
-/turf/simulated/floor/plating,
-/area/awaymission/arrivalblock)
"iD" = (
/obj/effect/decal/remains/human,
/obj/item/ammo_casing/c10mm,
/turf/simulated/floor/plasteel,
/area/awaymission/arrivalblock)
-"iE" = (
-/obj/structure/window/reinforced,
-/obj/structure/window/reinforced{
- dir = 1
- },
-/obj/structure/grille,
-/obj/structure/window/reinforced{
- dir = 8
- },
-/turf/simulated/floor/plating,
-/area/awaymission/arrivalblock)
-"iF" = (
-/obj/structure/window/reinforced,
-/obj/structure/window/reinforced{
- dir = 1
- },
-/obj/structure/grille,
-/turf/simulated/floor/plating,
-/area/awaymission/arrivalblock)
-"iG" = (
-/obj/structure/window/reinforced,
-/obj/structure/window/reinforced{
- dir = 1
- },
-/obj/structure/grille,
-/obj/structure/window/reinforced{
- dir = 4
- },
-/turf/simulated/floor/plating,
-/area/awaymission/arrivalblock)
"iH" = (
/obj/machinery/door/airlock/security,
/turf/simulated/floor/plasteel,
@@ -3402,14 +3016,6 @@
/obj/machinery/door/airlock/public/glass,
/turf/simulated/floor/plasteel,
/area/awaymission/midblock)
-"iK" = (
-/obj/structure/window/reinforced{
- dir = 8
- },
-/obj/structure/grille,
-/obj/item/shard,
-/turf/simulated/shuttle/plating,
-/area/awaymission/arrivalblock)
"iL" = (
/obj/item/shard{
icon_state = "small"
@@ -3500,13 +3106,6 @@
"iY" = (
/turf/simulated/wall,
/area/awaymission/southblock)
-"iZ" = (
-/obj/structure/window/reinforced{
- dir = 8
- },
-/obj/structure/grille,
-/turf/simulated/floor/plating,
-/area/awaymission/arrivalblock)
"ja" = (
/obj/structure/closet/wardrobe/orange,
/turf/simulated/floor/plasteel{
@@ -3533,14 +3132,14 @@
icon_state = "propulsion_r"
},
/obj/structure/shuttle/engine/propulsion,
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating/airless,
/area/awaymission/arrivalblock)
"je" = (
/turf/space,
/area/awaymission/arrivalblock)
"jf" = (
/obj/structure/shuttle/engine/propulsion,
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating/airless,
/area/awaymission/arrivalblock)
"jg" = (
/obj/structure/shuttle/engine/propulsion{
@@ -3556,7 +3155,7 @@
icon_state = "propulsion_l"
},
/obj/structure/shuttle/engine/propulsion,
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating/airless,
/area/awaymission/arrivalblock)
"jh" = (
/obj/structure/cable{
@@ -3680,32 +3279,7 @@
/turf/simulated/wall,
/area/awaymission/gateroom)
"jv" = (
-/obj/structure/window/reinforced{
- dir = 1
- },
-/obj/structure/window/reinforced{
- dir = 8
- },
-/obj/structure/window/reinforced,
-/obj/structure/grille,
-/turf/simulated/floor/plating,
-/area/awaymission/southblock)
-"jw" = (
-/obj/structure/window/reinforced{
- dir = 1
- },
-/obj/structure/window/reinforced,
-/obj/structure/grille,
-/turf/simulated/floor/plating,
-/area/awaymission/southblock)
-"jx" = (
-/obj/structure/window/reinforced{
- dir = 1
- },
-/obj/structure/window/reinforced{
- dir = 4
- },
-/obj/structure/grille,
+/obj/effect/spawner/window/reinforced,
/turf/simulated/floor/plating,
/area/awaymission/southblock)
"jy" = (
@@ -3843,27 +3417,6 @@
},
/turf/simulated/floor/wood,
/area/awaymission/southblock)
-"jT" = (
-/obj/structure/window/reinforced{
- dir = 8
- },
-/obj/structure/window/reinforced{
- dir = 4
- },
-/obj/structure/grille,
-/turf/simulated/floor/plating,
-/area/awaymission/southblock)
-"jU" = (
-/obj/structure/window/reinforced,
-/obj/structure/window/reinforced{
- dir = 8
- },
-/obj/structure/window/reinforced{
- dir = 4
- },
-/obj/structure/grille,
-/turf/simulated/floor/plating,
-/area/awaymission/arrivalblock)
"jV" = (
/obj/effect/decal/cleanable/blood/splatter,
/obj/item/ammo_casing/c10mm,
@@ -3990,29 +3543,7 @@
/obj/structure/window/reinforced{
dir = 1
},
-/turf/simulated/shuttle/plating,
-/area/awaymission/arrivalblock)
-"km" = (
-/obj/structure/window/reinforced,
-/obj/structure/window/reinforced{
- dir = 8
- },
-/obj/structure/window/reinforced{
- dir = 1
- },
-/obj/structure/grille,
-/turf/simulated/floor/plating,
-/area/awaymission/arrivalblock)
-"kn" = (
-/obj/structure/window/reinforced,
-/obj/structure/window/reinforced{
- dir = 4
- },
-/obj/structure/window/reinforced{
- dir = 1
- },
-/obj/structure/grille,
-/turf/simulated/floor/plating,
+/turf/simulated/floor/plating/airless,
/area/awaymission/arrivalblock)
"ko" = (
/obj/machinery/door/airlock/external{
@@ -4090,7 +3621,7 @@
dir = 1
},
/obj/structure/window/reinforced,
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating/airless,
/area/awaymission/arrivalblock)
"kB" = (
/obj/structure/shuttle/engine/propulsion{
@@ -4099,7 +3630,7 @@
dir = 1
},
/obj/structure/window/reinforced,
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating/airless,
/area/awaymission/arrivalblock)
"kC" = (
/obj/machinery/suit_storage_unit/standard_unit,
@@ -4197,23 +3728,17 @@
/obj/structure/chair/comfy/shuttle{
dir = 4
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/awaymission/arrivalblock)
"kP" = (
/obj/structure/chair/comfy/shuttle,
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/awaymission/arrivalblock)
"kQ" = (
/obj/structure/chair/comfy/shuttle{
dir = 8
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/awaymission/arrivalblock)
"kR" = (
/turf/simulated/floor/plasteel{
@@ -4339,54 +3864,6 @@
dir = 4
},
/area/awaymission/southblock)
-"lm" = (
-/obj/structure/window/reinforced,
-/obj/structure/window/reinforced{
- dir = 8
- },
-/obj/structure/window/reinforced{
- dir = 1
- },
-/obj/structure/grille,
-/turf/simulated/floor/plating,
-/area/awaymission/southblock)
-"ln" = (
-/obj/structure/window/reinforced,
-/obj/structure/window/reinforced{
- dir = 1
- },
-/obj/structure/grille,
-/turf/simulated/floor/plating,
-/area/awaymission/southblock)
-"lo" = (
-/obj/structure/window/reinforced,
-/obj/structure/window/reinforced{
- dir = 4
- },
-/obj/structure/grille,
-/turf/simulated/floor/plating,
-/area/awaymission/southblock)
-"lq" = (
-/turf/simulated/shuttle/wall{
- tag = "icon-swall12";
- icon_state = "swall12";
- dir = 2
- },
-/area/awaymission/arrivalblock)
-"lr" = (
-/obj/structure/grille,
-/obj/structure/window/reinforced,
-/obj/structure/window/reinforced{
- dir = 8
- },
-/obj/structure/window/reinforced{
- dir = 4
- },
-/obj/structure/window/reinforced{
- dir = 1
- },
-/turf/simulated/shuttle/plating,
-/area/awaymission/arrivalblock)
"lt" = (
/obj/structure/closet/crate/hydroponics,
/turf/simulated/floor/plasteel,
@@ -4665,6 +4142,21 @@
},
/turf/simulated/floor/plasteel,
/area/awaymission/gateroom)
+"GR" = (
+/turf/simulated/floor/mineral/plastitanium/red/airless,
+/area/awaymission/syndishuttle)
+"It" = (
+/obj/machinery/door/airlock/centcom,
+/turf/simulated/floor/mineral/plastitanium/red/airless,
+/area/awaymission/syndishuttle)
+"JP" = (
+/obj/structure/shuttle/engine/propulsion{
+ dir = 8;
+ icon_state = "burst_l";
+ tag = "icon-burst_l (EAST)"
+ },
+/turf/simulated/floor/plating,
+/area/awaymission/syndishuttle)
(1,1,1) = {"
aa
@@ -4689,11 +4181,11 @@ aa
aa
aC
aC
-aI
-aI
-aI
-aI
-aI
+JP
+JP
+JP
+JP
+JP
aC
aC
aa
@@ -4775,21 +4267,21 @@ aa
aa
aa
fL
-fZ
-gw
-gQ
-hn
-fZ
-fZ
-fZ
-gw
-gQ
-hn
-fZ
-fZ
-fZ
-fZ
-ga
+fL
+fN
+fN
+fN
+fL
+fL
+fL
+fN
+fN
+fN
+fL
+fL
+fL
+fL
+fL
aa
aa
aa
@@ -4819,15 +4311,15 @@ aa
aa
aa
aa
-aD
-aY
+aC
+aC
bf
bq
bq
bq
bf
-bW
-bE
+aC
+aC
aa
aa
aa
@@ -4840,8 +4332,8 @@ aa
aa
aa
aa
-fM
-ga
+fL
+fL
gx
gb
gc
@@ -4886,13 +4378,13 @@ aa
aa
aa
aa
-aD
-aY
+aC
+aC
br
bf
by
-bW
-bE
+aC
+aC
aa
aa
aa
@@ -4953,11 +4445,11 @@ aa
aa
aa
aa
-aD
+aC
aC
bt
aC
-bE
+aC
aa
aa
aa
@@ -4972,7 +4464,7 @@ aa
aa
aa
aa
-fO
+fN
gc
gb
gb
@@ -5038,7 +4530,7 @@ aa
aa
aa
aa
-fP
+fN
gb
gb
gb
@@ -5104,8 +4596,8 @@ aj
af
aa
aa
-fM
-ga
+fL
+fL
gx
gb
gc
@@ -5148,7 +4640,7 @@ aa
aa
aa
aa
-aD
+aC
aC
aC
aC
@@ -5158,7 +4650,7 @@ aC
aC
aC
aC
-bE
+aC
aa
af
af
@@ -5170,22 +4662,22 @@ aj
aj
aa
aa
-fQ
-fZ
-gy
+fL
+fL
+fN
gR
-ho
-fZ
-fZ
-fZ
-gw
-iK
-hn
-fZ
-fZ
-fZ
-fZ
-ga
+fN
+fL
+fL
+fL
+fN
+fN
+fN
+fL
+fL
+fL
+fL
+fL
aa
aa
aa
@@ -5215,7 +4707,7 @@ aa
aa
aa
aa
-aD
+aC
aC
eh
eK
@@ -5223,7 +4715,7 @@ eK
eK
fi
aC
-bE
+aC
aa
aa
af
@@ -5241,15 +4733,15 @@ aa
gz
gS
hp
-hE
-hV
-hV
-iC
+hp
+hp
+hp
+hp
iL
-iZ
-hE
-hV
-jU
+hp
+hp
+hp
+hp
gz
aa
aa
@@ -5316,12 +4808,12 @@ hu
iD
hu
jV
-km
+hp
+fL
+fL
+fL
+fL
fL
-fZ
-fZ
-fZ
-hv
aa
aa
aa
@@ -5382,12 +4874,12 @@ il
il
hq
iD
-kn
+hp
kA
kO
kO
kO
-lq
+fL
aa
aa
aa
@@ -5453,7 +4945,7 @@ gR
kP
gb
gc
-lr
+fN
aa
aa
aa
@@ -5477,7 +4969,7 @@ ad
aa
aa
aa
-aD
+aC
aJ
aP
aC
@@ -5487,7 +4979,7 @@ eK
eX
eX
aC
-bq
+aP
aJ
af
aj
@@ -5514,12 +5006,12 @@ ja
gz
jz
hW
-km
+hp
kB
kQ
kQ
kQ
-lq
+fL
aa
aa
aa
@@ -5545,7 +5037,7 @@ ag
af
af
aK
-aQ
+aC
aC
ex
eK
@@ -5553,7 +5045,7 @@ eK
fh
eK
aC
-cD
+aC
af
af
aj
@@ -5574,18 +5066,18 @@ hu
hu
hY
io
-iE
+hp
iO
jb
gz
jA
hu
-kn
-fQ
-fZ
-fZ
-fZ
-hR
+hp
+fL
+fL
+fL
+fL
+fL
aa
aa
aa
@@ -5611,7 +5103,7 @@ ak
ak
af
aa
-aD
+aC
aC
eJ
eK
@@ -5640,7 +5132,7 @@ hu
hG
hY
io
-iF
+hp
iO
jb
gz
@@ -5706,7 +5198,7 @@ eu
hH
hZ
io
-iG
+hp
iO
jc
gz
@@ -5879,10 +5371,10 @@ aa
aa
aC
aC
-eK
+GR
+aC
aC
aC
-bE
af
cQ
aq
@@ -5945,9 +5437,9 @@ aa
ba
aa
aK
-eK
+GR
+aC
aC
-bE
af
aq
af
@@ -6011,7 +5503,7 @@ ak
aa
aq
aK
-eK
+GR
aC
af
ci
@@ -6077,7 +5569,7 @@ af
af
aj
aC
-eK
+GR
aC
aj
aj
@@ -6143,7 +5635,7 @@ af
aj
aF
aC
-eK
+GR
aK
aq
aq
@@ -6209,8 +5701,8 @@ af
aj
bc
bs
-eL
-bE
+It
+aC
aq
aq
cR
@@ -7828,7 +7320,7 @@ jQ
jQ
jQ
kw
-lm
+jv
aa
aa
aa
@@ -7887,14 +7379,14 @@ aa
aa
aa
aa
-jw
+jv
jQ
ix
jQ
jQ
ix
jQ
-ln
+jv
aa
aa
aa
@@ -7953,14 +7445,14 @@ aa
aa
aa
aa
-jx
-jT
-jT
-jT
-jT
-jT
-jT
-lo
+jv
+jv
+jv
+jv
+jv
+jv
+jv
+jv
aa
aa
aa
@@ -8205,14 +7697,14 @@ bx
aa
aa
aa
-fK
-fY
+fJ
+fJ
fX
gP
hm
fX
-hT
-hU
+fJ
+fJ
aa
aa
aa
@@ -8272,12 +7764,12 @@ aa
aa
aa
aa
-fK
-gv
-gv
-gv
-gv
-hU
+fJ
+fJ
+fJ
+fJ
+fJ
+fJ
aa
aa
aa
diff --git a/_maps/map_files/RandomZLevels/terrorspiders.dmm b/_maps/map_files/RandomZLevels/terrorspiders.dmm
index b2533832d9c..e540f5a9246 100644
--- a/_maps/map_files/RandomZLevels/terrorspiders.dmm
+++ b/_maps/map_files/RandomZLevels/terrorspiders.dmm
@@ -7482,10 +7482,7 @@
/turf/simulated/floor/plating,
/area/awaymission/UO71/eng)
"pT" = (
-/turf/simulated/shuttle/wall{
- dir = 4;
- icon_state = "wall3"
- },
+/turf/simulated/wall/indestructible/syndicate,
/area/awaymission/UO71/loot)
"pU" = (
/obj/structure/cable{
@@ -8210,10 +8207,7 @@
/area/awaymission/UO71/science)
"rn" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/turf/simulated/shuttle/wall{
- dir = 4;
- icon_state = "wall3"
- },
+/turf/simulated/wall/indestructible/syndicate,
/area/awaymission/UO71/bridge)
"ro" = (
/obj/effect/decal/cleanable/dirt,
@@ -8581,10 +8575,7 @@
},
/area/awaymission/UO71/medical)
"sa" = (
-/turf/simulated/shuttle/wall{
- dir = 4;
- icon_state = "wall3"
- },
+/turf/simulated/wall/indestructible/syndicate,
/area/awaymission/UO71/bridge)
"sb" = (
/obj/structure/table,
@@ -8616,10 +8607,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
-/turf/simulated/shuttle/wall{
- dir = 4;
- icon_state = "wall3"
- },
+/turf/simulated/wall/indestructible/syndicate,
/area/awaymission/UO71/bridge)
"sf" = (
/obj/structure/table,
@@ -9075,10 +9063,7 @@
/area/awaymission/UO71/eng)
"sN" = (
/obj/effect/decal/cleanable/dirt,
-/turf/simulated/shuttle/wall{
- dir = 4;
- icon_state = "wall3"
- },
+/turf/simulated/wall/indestructible/syndicate,
/area/awaymission/UO71/loot)
"sO" = (
/obj/machinery/atmospherics/pipe/simple/visible/yellow{
@@ -12225,10 +12210,7 @@
/area/awaymission/UO71/queen)
"yY" = (
/obj/structure/sign/biohazard,
-/turf/simulated/shuttle/wall{
- dir = 4;
- icon_state = "wall3"
- },
+/turf/simulated/wall/indestructible/syndicate,
/area/awaymission/UO71/prince)
"yZ" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -12244,10 +12226,7 @@
/turf/simulated/wall/rust,
/area/awaymission/UO71/mining)
"zc" = (
-/turf/simulated/shuttle/wall{
- dir = 4;
- icon_state = "wall3"
- },
+/turf/simulated/wall/indestructible/syndicate,
/area/awaymission/UO71/outside)
"zd" = (
/turf/simulated/wall/indestructible/rock,
@@ -12705,10 +12684,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
-/turf/simulated/shuttle/wall{
- dir = 4;
- icon_state = "wall3"
- },
+/turf/simulated/wall/indestructible/syndicate,
/area/awaymission/UO71/outside)
"Vz" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
diff --git a/_maps/map_files/RandomZLevels/undergroundoutpost45.dmm b/_maps/map_files/RandomZLevels/undergroundoutpost45.dmm
index e4003f5ba93..cb3cd4abde8 100644
--- a/_maps/map_files/RandomZLevels/undergroundoutpost45.dmm
+++ b/_maps/map_files/RandomZLevels/undergroundoutpost45.dmm
@@ -28,39 +28,7 @@
name = "UO45 Central Hall"
})
"ae" = (
-/turf/simulated/shuttle/wall{
- tag = "icon-swallc2";
- icon_state = "swallc2";
- dir = 2
- },
-/area/awaycontent/a1{
- has_gravity = 1;
- name = "UO45 Central Hall"
- })
-"af" = (
-/turf/simulated/shuttle/wall{
- icon_state = "swall12";
- dir = 2
- },
-/area/awaycontent/a1{
- has_gravity = 1;
- name = "UO45 Central Hall"
- })
-"ag" = (
-/turf/simulated/shuttle/wall{
- tag = "icon-swallc1";
- icon_state = "swallc1";
- dir = 2
- },
-/area/awaycontent/a1{
- has_gravity = 1;
- name = "UO45 Central Hall"
- })
-"ah" = (
-/turf/simulated/shuttle/wall{
- icon_state = "swall3";
- dir = 2
- },
+/turf/simulated/wall/mineral/titanium,
/area/awaycontent/a1{
has_gravity = 1;
name = "UO45 Central Hall"
@@ -215,25 +183,6 @@
has_gravity = 1;
name = "UO45 Central Hall"
})
-"av" = (
-/turf/simulated/shuttle/wall{
- tag = "icon-swallc3";
- icon_state = "swallc3";
- dir = 2
- },
-/area/awaycontent/a1{
- has_gravity = 1;
- name = "UO45 Central Hall"
- })
-"aw" = (
-/turf/simulated/shuttle/wall{
- icon_state = "swall8";
- dir = 2
- },
-/area/awaycontent/a1{
- has_gravity = 1;
- name = "UO45 Central Hall"
- })
"ax" = (
/obj/effect/landmark/burnturf,
/turf/simulated/floor/plating,
@@ -245,25 +194,6 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel,
-/area/awaycontent/a1{
- has_gravity = 1;
- name = "UO45 Central Hall"
- })
-"az" = (
-/turf/simulated/shuttle/wall{
- icon_state = "swall4";
- dir = 2
- },
-/area/awaycontent/a1{
- has_gravity = 1;
- name = "UO45 Central Hall"
- })
-"aA" = (
-/turf/simulated/shuttle/wall{
- tag = "icon-swallc4";
- icon_state = "swallc4";
- dir = 2
- },
/area/awaycontent/a1{
has_gravity = 1;
name = "UO45 Central Hall"
@@ -25531,10 +25461,10 @@ ac
ac
ad
ae
-ah
-ah
-ah
-av
+ae
+ae
+ae
+ae
am
aG
aH
@@ -25680,11 +25610,11 @@ ac
ac
ac
ad
-af
+ae
ai
aj
al
-aw
+ae
am
aF
aH
@@ -25830,7 +25760,7 @@ ac
ac
ac
ad
-af
+ae
ai
ap
ao
@@ -25980,7 +25910,7 @@ ac
ac
ac
ad
-af
+ae
at
ak
as
@@ -26130,11 +26060,11 @@ ac
ac
ac
ad
-af
+ae
at
aq
au
-az
+ae
ad
aH
aM
@@ -26280,11 +26210,11 @@ ac
ac
ac
ad
-ag
-ah
-ah
-ah
-aA
+ae
+ae
+ae
+ae
+ae
am
aI
aH
diff --git a/_maps/map_files/RandomZLevels/wildwest.dmm b/_maps/map_files/RandomZLevels/wildwest.dmm
index a0b04ac7449..5ceeeac6383 100644
--- a/_maps/map_files/RandomZLevels/wildwest.dmm
+++ b/_maps/map_files/RandomZLevels/wildwest.dmm
@@ -3,7 +3,7 @@
/turf/space,
/area/space)
"ab" = (
-/turf/simulated/shuttle/wall,
+/turf/simulated/wall/indestructible/riveted,
/area/awaymission/wwvault)
"ac" = (
/turf/simulated/floor/engine/cult,
@@ -13,7 +13,7 @@
/turf/simulated/floor/engine/cult,
/area/awaymission/wwvault)
"ae" = (
-/turf/simulated/shuttle/plating{
+/turf/simulated/floor{
tag = "icon-cultdamage5";
icon_state = "cultdamage5"
},
@@ -23,7 +23,7 @@
/turf/simulated/floor/engine/cult,
/area/awaymission/wwvault)
"ag" = (
-/turf/simulated/shuttle/plating{
+/turf/simulated/floor{
tag = "icon-bcircuitoff";
icon_state = "bcircuitoff"
},
@@ -40,13 +40,13 @@
/turf/simulated/wall/cult,
/area/awaymission/wwvault)
"aj" = (
-/turf/simulated/shuttle/plating{
+/turf/simulated/floor{
tag = "icon-cultdamage3";
icon_state = "cultdamage3"
},
/area/awaymission/wwvault)
"ak" = (
-/turf/simulated/shuttle/plating{
+/turf/simulated/floor{
tag = "icon-cultdamage6";
icon_state = "cultdamage6"
},
@@ -57,7 +57,7 @@
/area/awaymission/wwvault)
"am" = (
/mob/living/simple_animal/hostile/faithless,
-/turf/simulated/shuttle/plating{
+/turf/simulated/floor{
tag = "icon-bcircuitoff";
icon_state = "bcircuitoff"
},
@@ -68,24 +68,24 @@
layer = 1;
name = "Blocker"
},
-/turf/simulated/shuttle/wall,
+/turf/simulated/wall/indestructible/riveted,
/area/awaymission/wwvault)
"ao" = (
-/turf/simulated/shuttle/plating{
+/turf/simulated/floor{
tag = "icon-gcircuitoff";
icon_state = "gcircuitoff"
},
/area/awaymission/wwvault)
"ap" = (
/obj/machinery/wish_granter_dark,
-/turf/simulated/shuttle/plating{
+/turf/simulated/floor{
tag = "icon-gcircuitoff";
icon_state = "gcircuitoff"
},
/area/awaymission/wwvault)
"aq" = (
/obj/structure/cult/pylon,
-/turf/simulated/shuttle/plating{
+/turf/simulated/floor{
tag = "icon-gcircuitoff";
icon_state = "gcircuitoff"
},
@@ -94,7 +94,7 @@
/obj/machinery/gateway{
dir = 9
},
-/turf/simulated/shuttle/plating{
+/turf/simulated/floor{
tag = "icon-gcircuitoff";
icon_state = "gcircuitoff"
},
@@ -103,7 +103,7 @@
/obj/machinery/gateway{
dir = 5
},
-/turf/simulated/shuttle/plating{
+/turf/simulated/floor{
tag = "icon-gcircuitoff";
icon_state = "gcircuitoff"
},
@@ -112,7 +112,7 @@
/obj/machinery/gateway{
dir = 1
},
-/turf/simulated/shuttle/plating{
+/turf/simulated/floor{
tag = "icon-gcircuitoff";
icon_state = "gcircuitoff"
},
@@ -121,7 +121,7 @@
/obj/machinery/gateway{
dir = 8
},
-/turf/simulated/shuttle/plating{
+/turf/simulated/floor{
tag = "icon-gcircuitoff";
icon_state = "gcircuitoff"
},
@@ -130,7 +130,7 @@
/obj/machinery/gateway{
dir = 4
},
-/turf/simulated/shuttle/plating{
+/turf/simulated/floor{
tag = "icon-gcircuitoff";
icon_state = "gcircuitoff"
},
@@ -139,7 +139,7 @@
/obj/machinery/gateway/centeraway{
calibrated = 0
},
-/turf/simulated/shuttle/plating{
+/turf/simulated/floor{
tag = "icon-gcircuitoff";
icon_state = "gcircuitoff"
},
@@ -148,7 +148,7 @@
/obj/machinery/gateway{
dir = 10
},
-/turf/simulated/shuttle/plating{
+/turf/simulated/floor{
tag = "icon-gcircuitoff";
icon_state = "gcircuitoff"
},
@@ -157,34 +157,34 @@
/obj/machinery/gateway{
dir = 6
},
-/turf/simulated/shuttle/plating{
+/turf/simulated/floor{
tag = "icon-gcircuitoff";
icon_state = "gcircuitoff"
},
/area/awaymission/wwvault)
"az" = (
/obj/machinery/gateway,
-/turf/simulated/shuttle/plating{
+/turf/simulated/floor{
tag = "icon-gcircuitoff";
icon_state = "gcircuitoff"
},
/area/awaymission/wwvault)
"aA" = (
/obj/effect/meatgrinder,
-/turf/simulated/shuttle/plating{
+/turf/simulated/floor{
tag = "icon-gcircuitoff";
icon_state = "gcircuitoff"
},
/area/awaymission/wwvault)
"aB" = (
/obj/structure/cult/pylon,
-/turf/simulated/shuttle/plating{
+/turf/simulated/floor{
tag = "icon-bcircuitoff";
icon_state = "bcircuitoff"
},
/area/awaymission/wwvault)
"aC" = (
-/turf/simulated/shuttle/plating{
+/turf/simulated/floor{
tag = "icon-cultdamage2";
icon_state = "cultdamage2"
},
@@ -2564,111 +2564,33 @@
},
/turf/simulated/mineral,
/area/awaymission/wwmines)
-"hh" = (
-/turf/simulated/shuttle/wall{
- tag = "icon-swall12";
- icon_state = "swall12"
- },
-/area/awaymission/wwrefine)
"hi" = (
-/turf/space,
-/turf/simulated/shuttle/wall{
- tag = "icon-swall_f6";
- icon_state = "swall_f6";
- dir = 2
- },
+/turf/simulated/wall/mineral/titanium,
/area/awaymission/wwrefine)
"hj" = (
-/obj/machinery/door/unpowered/shuttle,
-/turf/simulated/shuttle{
- tag = "icon-floor2";
- icon_state = "floor2"
- },
+/obj/machinery/door/airlock/titanium,
+/turf/simulated/floor/plating,
/area/awaymission/wwrefine)
"hk" = (
/obj/effect/decal/cleanable/blood/splatter,
/obj/machinery/light/small,
/turf/simulated/floor/wood,
/area/awaymission/wwmines)
-"hl" = (
-/turf/simulated/shuttle/wall{
- tag = "icon-swall8";
- icon_state = "swall8"
- },
-/area/awaymission/wwrefine)
-"hm" = (
-/turf/simulated/shuttle/wall{
- tag = "icon-swall4";
- icon_state = "swall4"
- },
-/area/awaymission/wwrefine)
-"hn" = (
-/turf/space,
-/turf/simulated/shuttle/wall{
- dir = 3;
- icon_state = "swall_f10";
- layer = 2;
- tag = "icon-swall_f10"
- },
-/area/awaymission/wwrefine)
"ho" = (
/obj/structure/chair/comfy/shuttle,
-/turf/simulated/shuttle{
- tag = "icon-floor2";
- icon_state = "floor2"
- },
+/turf/simulated/floor/mineral/titanium/yellow,
/area/awaymission/wwrefine)
"hp" = (
/obj/structure/table/wood,
/obj/machinery/light/small,
/turf/simulated/floor/wood,
/area/awaymission/wwmines)
-"hq" = (
-/turf/simulated/shuttle/wall{
- tag = "icon-swall3";
- icon_state = "swall3"
- },
-/area/awaymission/wwrefine)
"hr" = (
-/turf/simulated/shuttle{
- tag = "icon-floor2";
- icon_state = "floor2"
- },
-/area/awaymission/wwrefine)
-"hs" = (
-/turf/simulated/shuttle/wall{
- tag = "icon-swallc1";
- icon_state = "swallc1"
- },
-/area/awaymission/wwrefine)
-"ht" = (
-/turf/space,
-/turf/simulated/shuttle/wall{
- tag = "icon-swall_f5";
- icon_state = "swall_f5";
- dir = 2
- },
+/turf/simulated/floor/mineral/titanium/yellow,
/area/awaymission/wwrefine)
"hu" = (
/obj/effect/mob_spawn/human/miner,
-/turf/simulated/shuttle{
- tag = "icon-floor2";
- icon_state = "floor2"
- },
-/area/awaymission/wwrefine)
-"hv" = (
-/turf/simulated/shuttle/wall{
- tag = "icon-swallc2";
- icon_state = "swallc2"
- },
-/area/awaymission/wwrefine)
-"hw" = (
-/turf/space,
-/turf/simulated/shuttle/wall{
- tag = "icon-swall_f9";
- icon_state = "swall_f9";
- dir = 2
- },
+/turf/simulated/floor/mineral/titanium/yellow,
/area/awaymission/wwrefine)
"hy" = (
/obj/structure/table/reinforced,
@@ -2677,30 +2599,11 @@
/obj/item/clothing/mask/gas/syndicate,
/obj/item/tank/internals/oxygen,
/obj/item/clothing/shoes/magboots,
-/turf/simulated/shuttle{
- tag = "icon-floor2";
- icon_state = "floor2"
- },
+/turf/simulated/floor/mineral/titanium/yellow,
/area/awaymission/wwrefine)
"hz" = (
-/obj/structure/grille,
-/obj/structure/window/reinforced{
- dir = 1
- },
-/obj/structure/window/reinforced{
- dir = 4
- },
-/obj/structure/window/reinforced{
- dir = 8
- },
-/obj/structure/window/reinforced{
- tag = "icon-fwindow";
- icon_state = "fwindow"
- },
-/turf/simulated/shuttle{
- tag = "icon-floor2";
- icon_state = "floor2"
- },
+/obj/effect/spawner/window/shuttle,
+/turf/simulated/floor/plating,
/area/awaymission/wwrefine)
"hA" = (
/obj/machinery/door/poddoor/multi_tile/four_tile_ver,
@@ -17086,10 +16989,10 @@ aa
aa
aa
hi
-hq
-hq
-hq
-ht
+hi
+hi
+hi
+hi
aa
aa
aa
@@ -17342,15 +17245,15 @@ ew
aa
aa
aa
-hh
+hi
ho
ho
ho
-hs
-hq
-hq
-hq
-ht
+hi
+hi
+hi
+hi
+hi
aa
aa
aa
@@ -17599,7 +17502,7 @@ eQ
eS
eS
gf
-hl
+hi
ho
ho
ho
@@ -17607,7 +17510,7 @@ hu
hr
hr
hy
-hh
+hi
aa
aa
aa
@@ -18113,7 +18016,7 @@ fH
eS
eS
gf
-hm
+hi
ho
ho
ho
@@ -18121,7 +18024,7 @@ hr
hr
hr
hy
-hh
+hi
aa
aa
aa
@@ -18370,15 +18273,15 @@ fK
aa
aa
aa
-hh
+hi
ho
ho
ho
-hv
-hq
-hq
-hq
-hw
+hi
+hi
+hi
+hi
+hi
aa
aa
aa
@@ -18627,11 +18530,11 @@ ez
aa
aa
aa
-hn
-hq
-hq
-hq
-hw
+hi
+hi
+hi
+hi
+hi
aa
aa
aa
diff --git a/_maps/map_files/cyberiad/cyberiad.dmm b/_maps/map_files/cyberiad/cyberiad.dmm
index 572ebffeeb2..93e02389793 100644
--- a/_maps/map_files/cyberiad/cyberiad.dmm
+++ b/_maps/map_files/cyberiad/cyberiad.dmm
@@ -21,10 +21,6 @@
},
/turf/space,
/area/space)
-"abG" = (
-/turf/space,
-/turf/space,
-/area/space)
"abM" = (
/obj/structure/lattice,
/turf/simulated/floor/plating/airless,
@@ -9552,11 +9548,7 @@
/turf/simulated/floor/plating,
/area/maintenance/fsmaint)
"auq" = (
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall12";
- tag = "icon-swall12"
- },
+/turf/simulated/wall/mineral/titanium,
/area/shuttle/pod_3)
"aur" = (
/obj/structure/filingcabinet/employment,
@@ -9566,13 +9558,6 @@
tag = "icon-cult"
},
/area/lawoffice)
-"aus" = (
-/turf/space,
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall_f10"
- },
-/area/shuttle/pod_3)
"aut" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 10
@@ -10221,7 +10206,7 @@
/obj/structure/chair/comfy/shuttle{
dir = 4
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/pod_3)
"avq" = (
/turf/simulated/floor/plating,
@@ -10258,11 +10243,11 @@
id = "pod3";
name = "escape pod 3"
},
-/obj/machinery/door/airlock/shuttle{
+/obj/machinery/door/airlock/titanium{
id_tag = "s_docking_airlock";
name = "Escape Pod Hatch"
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/pod_3)
"avu" = (
/obj/machinery/status_display{
@@ -10275,12 +10260,11 @@
/obj/structure/chair/comfy/shuttle{
dir = 4
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/pod_3)
"avw" = (
-/obj/structure/grille,
-/obj/structure/window/full/shuttle,
-/turf/simulated/shuttle/plating,
+/obj/effect/spawner/window/shuttle,
+/turf/simulated/floor/plating,
/area/shuttle/pod_3)
"avz" = (
/obj/effect/spawner/window/reinforced,
@@ -10820,13 +10804,6 @@
"awl" = (
/turf/simulated/wall,
/area/maintenance/fsmaint)
-"awm" = (
-/turf/space,
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall_f9"
- },
-/area/shuttle/pod_3)
"awn" = (
/obj/structure/cable{
d1 = 2;
@@ -17332,38 +17309,15 @@
/turf/simulated/floor/plating,
/area/maintenance/fpmaint)
"aJP" = (
-/turf/space,
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall_f6"
- },
-/area/shuttle/pod_1)
-"aJQ" = (
-/turf/space,
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall_f10"
- },
+/turf/simulated/wall/mineral/titanium,
/area/shuttle/pod_1)
"aJR" = (
-/turf/space,
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall_f6"
- },
+/turf/simulated/wall/mineral/titanium,
/area/shuttle/pod_2)
"aJS" = (
-/obj/structure/window/full/shuttle,
-/obj/structure/grille,
-/turf/simulated/shuttle/plating,
+/obj/effect/spawner/window/shuttle,
+/turf/simulated/floor/plating,
/area/shuttle/pod_1)
-"aJT" = (
-/turf/space,
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall_f10"
- },
-/area/shuttle/pod_2)
"aJU" = (
/obj/machinery/meter,
/obj/structure/cable{
@@ -17377,9 +17331,8 @@
/turf/simulated/floor/plating,
/area/maintenance/fpmaint2)
"aJV" = (
-/obj/structure/window/full/shuttle,
-/obj/structure/grille,
-/turf/simulated/shuttle/plating,
+/obj/effect/spawner/window/shuttle,
+/turf/simulated/floor/plating,
/area/shuttle/pod_2)
"aJW" = (
/turf/simulated/floor/wood{
@@ -17837,12 +17790,6 @@
/obj/item/coin/iron,
/turf/simulated/floor/plating,
/area/maintenance/fsmaint2)
-"aLa" = (
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall3"
- },
-/area/shuttle/pod_1)
"aLb" = (
/obj/machinery/status_display{
density = 0;
@@ -17857,7 +17804,7 @@
/obj/structure/chair/comfy/shuttle{
dir = 1
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/pod_1)
"aLc" = (
/obj/structure/closet,
@@ -17867,12 +17814,6 @@
"aLd" = (
/turf/simulated/wall/r_wall,
/area/hallway/secondary/entry)
-"aLe" = (
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall3"
- },
-/area/shuttle/pod_2)
"aLf" = (
/obj/machinery/status_display{
density = 0;
@@ -17887,7 +17828,7 @@
/obj/structure/chair/comfy/shuttle{
dir = 1
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/pod_2)
"aLg" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -18526,7 +18467,7 @@
/obj/structure/chair/comfy/shuttle{
dir = 1
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/pod_1)
"aMq" = (
/turf/simulated/wall,
@@ -18546,7 +18487,7 @@
/obj/structure/chair/comfy/shuttle{
dir = 1
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/pod_2)
"aMu" = (
/obj/effect/spawner/window/reinforced,
@@ -18953,11 +18894,11 @@
id = "pod1";
name = "escape pod 1"
},
-/obj/machinery/door/airlock/shuttle{
+/obj/machinery/door/airlock/titanium{
id_tag = "s_docking_airlock";
name = "Escape Pod Hatch"
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/pod_1)
"aNu" = (
/obj/effect/decal/warning_stripes/yellow/hollow,
@@ -18980,11 +18921,11 @@
id = "pod2";
name = "escape pod 2"
},
-/obj/machinery/door/airlock/shuttle{
+/obj/machinery/door/airlock/titanium{
id_tag = "s_docking_airlock";
name = "Escape Pod Hatch"
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/pod_2)
"aNz" = (
/obj/machinery/access_button{
@@ -20785,11 +20726,7 @@
/area/maintenance/fpmaint)
"aRm" = (
/obj/structure/shuttle/engine/propulsion/burst,
-/turf/simulated/floor/plating,
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall_f5"
- },
+/turf/simulated/wall/mineral/titanium,
/area/shuttle/pod_1)
"aRn" = (
/obj/structure/cable{
@@ -20934,14 +20871,6 @@
icon_state = "bluecorner"
},
/area/hallway/primary/starboard/west)
-"aRz" = (
-/obj/structure/shuttle/engine/propulsion/burst,
-/turf/simulated/floor/plating,
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall_f9"
- },
-/area/shuttle/pod_1)
"aRA" = (
/obj/structure/cable{
d1 = 1;
@@ -21157,11 +21086,7 @@
/area/hallway/secondary/entry)
"aRV" = (
/obj/structure/shuttle/engine/propulsion/burst,
-/turf/simulated/floor/plating,
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall_f5"
- },
+/turf/simulated/wall/mineral/titanium,
/area/shuttle/pod_2)
"aRW" = (
/obj/machinery/light{
@@ -21182,14 +21107,6 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plating,
/area/maintenance/fsmaint2)
-"aRY" = (
-/obj/structure/shuttle/engine/propulsion/burst,
-/turf/simulated/floor/plating,
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall_f9"
- },
-/area/shuttle/pod_2)
"aRZ" = (
/obj/structure/table,
/obj/machinery/cell_charger,
@@ -23109,12 +23026,6 @@
icon_state = "dark"
},
/area/ai_monitored/storage/eva)
-"aVS" = (
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall12"
- },
-/area/shuttle/arrival/station)
"aVT" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -23131,44 +23042,15 @@
/turf/simulated/floor/wood,
/area/clownoffice)
"aVV" = (
-/turf/space,
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall_f6";
- tag = "icon-swall_f6"
- },
-/area/shuttle/arrival/station)
-"aVW" = (
-/turf/space,
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall_f10";
- tag = "icon-swall_f10"
- },
+/turf/simulated/wall/mineral/titanium,
/area/shuttle/arrival/station)
"aVX" = (
-/obj/machinery/door/unpowered/shuttle,
-/turf/simulated/shuttle/floor,
+/obj/machinery/door/airlock/titanium,
+/turf/simulated/floor/plating,
/area/shuttle/arrival/station)
"aVY" = (
-/obj/structure/window/full/shuttle{
- icon_state = "window4"
- },
-/obj/structure/grille,
-/turf/simulated/shuttle/plating,
-/area/shuttle/arrival/station)
-"aVZ" = (
-/obj/structure/window/full/shuttle{
- icon_state = "window8"
- },
-/obj/structure/grille,
-/turf/simulated/shuttle/plating,
-/area/shuttle/arrival/station)
-"aWa" = (
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall14"
- },
+/obj/effect/spawner/window/shuttle,
+/turf/simulated/floor/plating,
/area/shuttle/arrival/station)
"aWb" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -23846,18 +23728,12 @@
/obj/structure/fans/tiny,
/turf/simulated/floor/plating,
/area/chapel/main)
-"aXm" = (
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall11"
- },
-/area/shuttle/arrival/station)
"aXn" = (
/obj/structure/shuttle/engine/propulsion{
dir = 4;
icon_state = "burst_r"
},
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating/airless,
/area/shuttle/arrival/station)
"aXo" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on{
@@ -23869,12 +23745,6 @@
tag = "icon-cult"
},
/area/chapel/office)
-"aXp" = (
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall7"
- },
-/area/shuttle/arrival/station)
"aXq" = (
/obj/structure/cable{
d2 = 2;
@@ -23898,46 +23768,46 @@
name = "HONKsquad"
},
/obj/structure/closet/walllocker/emerglocker/north,
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/arrival/station)
"aXs" = (
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/arrival/station)
"aXt" = (
/obj/machinery/computer/arcade,
/obj/machinery/light{
dir = 1
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/arrival/station)
"aXu" = (
/obj/structure/closet/wardrobe/black,
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/arrival/station)
"aXv" = (
/obj/structure/closet/wardrobe/xenos,
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/arrival/station)
"aXw" = (
/obj/structure/closet/wardrobe/mixed,
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/arrival/station)
"aXx" = (
/obj/structure/closet/wardrobe/grey,
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/arrival/station)
"aXy" = (
/obj/structure/closet/walllocker/emerglocker/north,
/obj/machinery/light{
dir = 1
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/arrival/station)
"aXz" = (
/obj/effect/landmark{
name = "HONKsquad"
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/arrival/station)
"aXA" = (
/obj/structure/cable{
@@ -24629,23 +24499,12 @@
dir = 1;
on = 1
},
-/obj/structure/chair/comfy/shuttle{
- dir = 8
- },
-/turf/simulated/shuttle/floor,
+/obj/structure/chair/comfy/shuttle,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/arrival/station)
"aYM" = (
-/turf/simulated/shuttle/floor,
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall_f9"
- },
-/area/shuttle/arrival/station)
-"aYN" = (
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall3"
- },
+/obj/structure/chair/comfy/shuttle,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/arrival/station)
"aYO" = (
/obj/structure/disposalpipe/segment{
@@ -24678,7 +24537,7 @@
dir = 4;
icon_state = "propulsion"
},
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating/airless,
/area/shuttle/arrival/station)
"aYV" = (
/obj/structure/shuttle/engine/heater{
@@ -24688,7 +24547,7 @@
/obj/structure/window/reinforced{
dir = 8
},
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating/airless,
/area/shuttle/arrival/station)
"aYW" = (
/obj/structure/cable{
@@ -24744,7 +24603,7 @@
/obj/structure/chair/comfy/shuttle{
dir = 8
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/arrival/station)
"aZa" = (
/obj/structure/table/reinforced,
@@ -25665,16 +25524,11 @@
/obj/effect/decal/warning_stripes/east,
/turf/simulated/floor/engine/vacuum,
/area/escapepodbay)
-"baZ" = (
-/obj/structure/window/full/shuttle,
-/obj/structure/grille,
-/turf/simulated/shuttle/plating,
-/area/shuttle/arrival/station)
"bba" = (
/obj/effect/landmark{
name = "Observer-Start"
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/arrival/station)
"bbb" = (
/obj/structure/cable{
@@ -26225,15 +26079,6 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
/turf/simulated/floor/plating,
/area/maintenance/fsmaint2)
-"bbW" = (
-/obj/structure/disposalpipe/sortjunction{
- dir = 4;
- icon_state = "pipe-j2s";
- name = "Chapel";
- sortType = 17
- },
-/turf/simulated/wall,
-/area/crew_quarters/kitchen)
"bbX" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 1;
@@ -26441,11 +26286,10 @@
},
/area/chapel/office)
"bcr" = (
-/turf/simulated/shuttle/floor,
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall_f10"
+/obj/structure/chair/comfy/shuttle{
+ dir = 1
},
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/arrival/station)
"bcs" = (
/obj/structure/disposalpipe/segment{
@@ -26631,9 +26475,9 @@
"bcN" = (
/obj/machinery/light,
/obj/structure/chair/comfy/shuttle{
- dir = 8
+ dir = 1
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/arrival/station)
"bcO" = (
/obj/item/radio/intercom{
@@ -27494,14 +27338,6 @@
icon_state = "dark"
},
/area/ai_monitored/storage/eva)
-"beh" = (
-/turf/space,
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall_f5";
- tag = "icon-swall_f5"
- },
-/area/shuttle/arrival/station)
"bei" = (
/obj/structure/table,
/obj/item/book/manual/hydroponics_pod_people,
@@ -27510,12 +27346,6 @@
icon_state = "hydrofloor"
},
/area/hydroponics)
-"bej" = (
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall13"
- },
-/area/shuttle/arrival/station)
"bek" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/wood,
@@ -27574,7 +27404,7 @@
name = "station intercom (General)";
pixel_y = -28
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/arrival/station)
"bet" = (
/obj/structure/chair{
@@ -27625,14 +27455,14 @@
name = "Arrival Shuttle Requests Console";
pixel_y = -30
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/arrival/station)
"bey" = (
/obj/structure/shuttle/engine/propulsion{
dir = 4;
icon_state = "burst_l"
},
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating/airless,
/area/shuttle/arrival/station)
"bez" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on{
@@ -27663,7 +27493,7 @@
/area/crew_quarters/bar)
"beG" = (
/obj/machinery/light,
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/arrival/station)
"beH" = (
/obj/structure/disposalpipe/segment,
@@ -28573,14 +28403,6 @@
},
/turf/simulated/floor/engine,
/area/escapepodbay)
-"bge" = (
-/turf/space,
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall_f9";
- tag = "icon-swall_f9"
- },
-/area/shuttle/arrival/station)
"bgf" = (
/obj/structure/table/wood,
/obj/item/candle,
@@ -40655,21 +40477,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 6
},
-/turf/simulated/floor/plasteel{
- dir = 2;
- icon_state = "asteroid";
- tag = "icon-asteroid (NORTH)"
- },
-/turf/simulated/floor/plasteel{
- dir = 1;
- icon_state = "siding2";
- tag = "icon-siding2 (NORTH)"
- },
-/turf/simulated/floor/plasteel{
- dir = 1;
- icon_state = "siding1";
- tag = "icon-siding1 (NORTH)"
- },
+/turf/simulated/floor/grass,
/area/hydroponics)
"bFK" = (
/obj/machinery/computer/communications,
@@ -43591,21 +43399,7 @@
dir = 4
},
/mob/living/simple_animal/pig,
-/turf/simulated/floor/plasteel{
- dir = 2;
- icon_state = "asteroid";
- tag = "icon-asteroid (NORTH)"
- },
-/turf/simulated/floor/plasteel{
- dir = 1;
- icon_state = "siding1";
- tag = "icon-siding1 (NORTH)"
- },
-/turf/simulated/floor/plasteel{
- dir = 1;
- icon_state = "siding2";
- tag = "icon-siding2 (NORTH)"
- },
+/turf/simulated/floor/grass,
/area/hydroponics)
"bLo" = (
/obj/structure/disposalpipe/segment,
@@ -43992,21 +43786,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
-/turf/simulated/floor/plasteel{
- dir = 2;
- icon_state = "asteroid";
- tag = "icon-asteroid (NORTH)"
- },
-/turf/simulated/floor/plasteel{
- dir = 1;
- icon_state = "siding1";
- tag = "icon-siding1 (NORTH)"
- },
-/turf/simulated/floor/plasteel{
- dir = 1;
- icon_state = "siding2";
- tag = "icon-siding2 (NORTH)"
- },
+/turf/simulated/floor/grass,
/area/hydroponics)
"bLV" = (
/obj/item/storage/firstaid/o2{
@@ -56017,9 +55797,6 @@
/obj/machinery/atmospherics/pipe/simple/insulated,
/turf/simulated/wall/r_wall,
/area/toxins/mixing)
-"cgu" = (
-/turf/simulated/wall/r_wall,
-/area/toxins/mixing)
"cgv" = (
/obj/machinery/photocopier,
/turf/simulated/floor/plasteel{
@@ -64776,10 +64553,7 @@
/turf/simulated/floor/plating/airless,
/area/toxins/test_area)
"cvt" = (
-/turf/simulated/shuttle/wall{
- dir = 4;
- icon_state = "wall3"
- },
+/turf/simulated/wall/indestructible/riveted,
/area/toxins/test_area)
"cvu" = (
/obj/structure/table,
@@ -70009,9 +69783,6 @@
/obj/machinery/light/small,
/turf/simulated/floor/plating/airless,
/area/toxins/test_area)
-"cEU" = (
-/turf/simulated/wall/r_wall,
-/area/maintenance/incinerator)
"cEV" = (
/obj/machinery/light{
dir = 1
@@ -83824,12 +83595,7 @@
/obj/structure/shuttle/engine/propulsion/burst{
dir = 8
},
-/turf/simulated/floor/plating,
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall_f6";
- tag = "icon-swall_f6"
- },
+/turf/simulated/wall/mineral/titanium,
/area/shuttle/pod_4)
"dgE" = (
/obj/effect/decal/warning_stripes/east,
@@ -84333,17 +84099,6 @@
icon_state = "freezerfloor"
},
/area/crew_quarters/toilet)
-"dhT" = (
-/obj/structure/shuttle/engine/propulsion/burst{
- dir = 8
- },
-/turf/simulated/floor/plating,
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall_f5";
- tag = "icon-swall_f5"
- },
-/area/shuttle/pod_4)
"dhV" = (
/obj/structure/sink/kitchen{
pixel_y = 28
@@ -86116,9 +85871,6 @@
/obj/machinery/atmospherics/pipe/simple/visible/purple,
/turf/simulated/floor/plating,
/area/maintenance/turbine)
-"dlm" = (
-/turf/simulated/wall/r_wall,
-/area/maintenance/turbine)
"dln" = (
/obj/machinery/atmospherics/pipe/simple/visible,
/turf/simulated/wall/r_wall,
@@ -86442,9 +86194,6 @@
/obj/effect/decal/cleanable/ash,
/turf/simulated/floor/plating,
/area/maintenance/asmaint2)
-"dma" = (
-/turf/simulated/wall/r_wall,
-/area/maintenance/asmaint)
"dmb" = (
/obj/effect/decal/warning_stripes/west,
/turf/simulated/floor/plating,
@@ -87772,18 +87521,7 @@
/turf/simulated/wall,
/area/engine/controlroom)
"dou" = (
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall12";
- tag = "icon-swall12"
- },
-/area/shuttle/pod_4)
-"dow" = (
-/turf/space,
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall_f10"
- },
+/turf/simulated/wall/mineral/titanium,
/area/shuttle/pod_4)
"doy" = (
/obj/machinery/light/small{
@@ -87803,9 +87541,8 @@
},
/area/turret_protected/aisat_interior)
"doz" = (
-/obj/structure/grille,
-/obj/structure/window/full/shuttle,
-/turf/simulated/shuttle/plating,
+/obj/effect/spawner/window/shuttle,
+/turf/simulated/floor/plating,
/area/shuttle/pod_4)
"doB" = (
/obj/structure/table/wood,
@@ -87854,7 +87591,7 @@
/obj/structure/chair/comfy/shuttle{
dir = 4
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/pod_4)
"doK" = (
/obj/machinery/light,
@@ -87868,11 +87605,11 @@
id = "pod4";
name = "escape pod 4"
},
-/obj/machinery/door/airlock/shuttle{
+/obj/machinery/door/airlock/titanium{
id_tag = "s_docking_airlock";
name = "Escape Pod Hatch"
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/pod_4)
"doM" = (
/obj/machinery/status_display{
@@ -87885,7 +87622,7 @@
/obj/structure/chair/comfy/shuttle{
dir = 4
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/pod_4)
"doN" = (
/obj/machinery/computer/station_alert,
@@ -87900,13 +87637,6 @@
tag = "icon-vault (NORTHEAST)"
},
/area/turret_protected/aisat_interior)
-"doV" = (
-/turf/space,
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall_f9"
- },
-/area/shuttle/pod_4)
"doW" = (
/obj/structure/cable{
d1 = 4;
@@ -89116,15 +88846,6 @@
},
/turf/simulated/wall/r_wall,
/area/maintenance/fsmaint)
-"dHM" = (
-/obj/machinery/light{
- dir = 1;
- on = 1
- },
-/turf/simulated/floor/plasteel{
- icon_state = "neutral"
- },
-/area/shuttle/escape)
"dLF" = (
/obj/machinery/door/firedoor,
/obj/effect/decal/warning_stripes/yellow,
@@ -89364,6 +89085,12 @@
},
/turf/simulated/floor/engine,
/area/engine/engineering)
+"fvP" = (
+/obj/effect/landmark{
+ name = "HONKsquad"
+ },
+/turf/simulated/floor/mineral/titanium,
+/area/shuttle/arrival/station)
"fAw" = (
/obj/machinery/atmospherics/pipe/simple/hidden/yellow,
/obj/machinery/tcomms/core/station,
@@ -89822,6 +89549,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/engine,
/area/engine/engineering)
+"jyO" = (
+/turf/simulated/floor/mineral/titanium,
+/area/shuttle/arrival/station)
"jzn" = (
/obj/structure/cable{
d1 = 1;
@@ -89830,6 +89560,10 @@
},
/turf/simulated/floor/plating,
/area/engine/engineering)
+"jMw" = (
+/obj/machinery/door/airlock/titanium,
+/turf/simulated/floor/mineral/titanium,
+/area/shuttle/arrival/station)
"jPN" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/computer/mob_battle_terminal/blue{
@@ -89913,12 +89647,6 @@
},
/turf/simulated/floor/plasteel,
/area/crew_quarters/dorms)
-"ksF" = (
-/obj/structure/chair/comfy/shuttle{
- dir = 8
- },
-/turf/simulated/shuttle/floor4,
-/area/shuttle/escape)
"kwt" = (
/obj/machinery/door/poddoor{
density = 0;
@@ -89941,43 +89669,6 @@
},
/turf/simulated/floor/plating,
/area/bridge)
-"kyW" = (
-/obj/structure/table,
-/obj/item/weldingtool/largetank{
- pixel_x = 4;
- pixel_y = -4
- },
-/obj/item/clothing/glasses/welding{
- pixel_y = 10
- },
-/obj/machinery/light/small{
- dir = 4;
- pixel_y = 8
- },
-/turf/simulated/floor/plasteel{
- icon_state = "bot";
- dir = 1
- },
-/area/shuttle/escape)
-"kCR" = (
-/obj/machinery/light{
- dir = 1;
- on = 1
- },
-/obj/structure/chair/comfy/shuttle,
-/turf/simulated/floor/plasteel{
- icon_state = "bot";
- dir = 1
- },
-/area/shuttle/escape)
-"kHU" = (
-/obj/structure/table/reinforced,
-/obj/item/storage/toolbox/mechanical,
-/turf/simulated/floor/plasteel{
- dir = 4;
- icon_state = "vault"
- },
-/area/shuttle/escape)
"kIR" = (
/obj/structure/lattice/catwalk,
/obj/machinery/atmospherics/pipe/simple/hidden/yellow,
@@ -90146,12 +89837,7 @@
/obj/structure/shuttle/engine/propulsion/burst{
dir = 8
},
-/turf/simulated/floor/plating,
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall_f6";
- tag = "icon-swall_f6"
- },
+/turf/simulated/wall/mineral/titanium,
/area/shuttle/pod_3)
"lVr" = (
/obj/machinery/atmospherics/pipe/simple/visible/supply{
@@ -90770,9 +90456,6 @@
/obj/machinery/meter,
/turf/simulated/floor/engine,
/area/engine/engineering)
-"shV" = (
-/turf/simulated/wall/r_wall,
-/area/space/nearstation)
"sud" = (
/obj/effect/decal/warning_stripes/yellow/hollow,
/obj/machinery/atmospherics/unary/portables_connector{
@@ -90936,17 +90619,6 @@
},
/turf/simulated/wall/r_wall,
/area/engine/supermatter)
-"utw" = (
-/obj/structure/shuttle/engine/propulsion/burst{
- dir = 8
- },
-/turf/simulated/floor/plating,
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall_f5";
- tag = "icon-swall_f5"
- },
-/area/shuttle/pod_3)
"uxy" = (
/obj/machinery/atmospherics/pipe/simple/heat_exchanging{
dir = 4
@@ -97105,7 +96777,6 @@ aaa
aaa
aaa
aaa
-abG
aaa
aaa
aaa
@@ -97113,7 +96784,8 @@ aaa
aaa
aaa
aaa
-abG
+aaa
+aaa
aaa
aaa
aaa
@@ -99675,7 +99347,7 @@ aaa
aaa
aaa
aaa
-abG
+aaa
aaa
aaa
aaa
@@ -99683,13 +99355,13 @@ aQX
aaa
aaa
aaa
-abG
+aaa
aaa
aVV
-aXp
-baZ
-aXp
-beh
+aVV
+aVY
+aVV
+aVV
aaa
aaa
aab
@@ -99715,15 +99387,15 @@ aaa
aaa
aaa
aaa
-abG
aaa
aaa
-abG
-aaa
-abG
aaa
aaa
-abG
+aaa
+aaa
+aaa
+aaa
+aaa
aaa
aaa
aaa
@@ -99942,11 +99614,11 @@ aab
aab
aaa
aaa
-aWa
+aVV
aYM
-aXs
+jyO
bcr
-bej
+aVV
aaa
aaa
aab
@@ -99955,9 +99627,6 @@ aaa
aaa
aaa
aaa
-abG
-aaa
-abG
aaa
aaa
aaa
@@ -99971,7 +99640,6 @@ aaa
aaa
aaa
aaa
-abG
aaa
aaa
aaa
@@ -99981,7 +99649,11 @@ aaa
aaa
aaa
aaa
-abG
+aaa
+aaa
+aaa
+aaa
+aaa
aaa
aaa
aaa
@@ -100199,11 +99871,11 @@ aab
aLd
aaa
aaa
-aVS
+aVV
aYL
-aXs
+jyO
bcN
-aVS
+aVV
aaa
aaa
bjQ
@@ -100211,11 +99883,6 @@ aab
aaa
aaa
aaa
-abG
-abG
-aaa
-abG
-abG
aaa
aaa
aaa
@@ -100227,7 +99894,6 @@ aaa
aaa
aaa
aaa
-abG
aaa
aaa
aaa
@@ -100239,7 +99905,13 @@ aaa
aaa
aaa
aaa
-abG
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
aaa
aaa
aaa
@@ -100456,12 +100128,12 @@ aMs
aLd
aaa
aVV
-aXm
-aYN
-aVX
-aYN
-aXm
-beh
+aVV
+aVV
+jMw
+aVV
+aVV
+aVV
aaa
aLd
aMs
@@ -100483,7 +100155,6 @@ bjQ
aaa
aaa
aaa
-abG
aaa
aaa
aaa
@@ -100497,7 +100168,8 @@ aaa
aaa
aaa
aaa
-abG
+aaa
+aaa
aaa
aaa
aaa
@@ -100702,8 +100374,8 @@ aaa
aaa
aaa
aJP
-aLa
-aLa
+aJP
+aJP
aRm
aOP
aMs
@@ -100712,13 +100384,13 @@ aMB
aSd
aSd
aSd
-aVS
+aVV
aXr
+fvP
+fvP
+fvP
aXz
-aXz
-aXz
-aXz
-aVS
+aVV
aSd
aSd
aSd
@@ -101215,10 +100887,10 @@ aaa
aaa
aaa
aaa
-aJQ
-aLa
-aLa
-aRz
+aJP
+aJP
+aJP
+aRm
aOR
aQa
aMd
@@ -101226,13 +100898,13 @@ aMD
aSd
aSd
aSd
-aVS
+aVV
aXt
aXs
aXs
aXs
beG
-aVS
+aVV
aSd
aSd
aSd
@@ -101427,7 +101099,6 @@ aaa
aaa
aaa
aaa
-abG
aaa
aaa
aaa
@@ -101435,7 +101106,8 @@ aaa
aaa
aaa
aaa
-abG
+aaa
+aaa
aaa
aaa
aaa
@@ -101483,13 +101155,13 @@ aME
aTo
aUl
aSd
-aVS
+aVV
aXu
aYZ
aYZ
aYZ
bes
-aVS
+aVV
aSd
bid
aTo
@@ -101678,7 +101350,7 @@ aaa
aaa
aaa
aaa
-abG
+aaa
aaa
aaa
aaa
@@ -101730,8 +101402,8 @@ aaa
aaa
aaa
aJR
-aLe
-aLe
+aJR
+aJR
aRV
aOP
aMs
@@ -101997,13 +101669,13 @@ aSf
aSf
aUn
aSd
-aVZ
+aVY
aXw
aYZ
aYZ
aYZ
aXs
-aVZ
+aVY
aSd
bjT
aSf
@@ -102229,7 +101901,7 @@ aaa
aaa
aaa
aaa
-abG
+aaa
aaa
aaa
aaa
@@ -102238,15 +101910,15 @@ aaa
aaa
aCB
aaa
-abG
aaa
aaa
aaa
aaa
-aJT
-aLe
-aLe
-aRY
+aaa
+aJR
+aJR
+aJR
+aRV
aOR
aQa
aPQ
@@ -102254,13 +101926,13 @@ aRd
aTp
aUm
aSd
-aVS
+aVV
aXx
aXs
aXs
aXs
bex
-aVS
+aVV
aSd
bjS
aTp
@@ -102442,28 +102114,6 @@ aaa
aaa
aaa
aaa
-abG
-aaa
-aaa
-aaa
-abG
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-abG
aaa
aaa
aaa
@@ -102496,7 +102146,29 @@ aaa
aaa
aaa
aaa
-abG
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
aab
aab
aab
@@ -102511,13 +102183,13 @@ aMD
aSd
aSd
aSd
-aVS
+aVV
aXy
aYZ
aYZ
aYZ
beG
-aVS
+aVV
aSd
aSd
aSd
@@ -102530,11 +102202,11 @@ aaa
aaa
aaa
aMs
-abG
aaa
aaa
aaa
-abG
+aaa
+aaa
aSd
aMd
bLZ
@@ -102770,9 +102442,9 @@ aOQ
aRU
aVX
aXz
-aXz
-aXz
-aXz
+fvP
+fvP
+fvP
aXz
aVX
bgy
@@ -102781,16 +102453,16 @@ bgy
aSf
bsj
aSd
-abG
+aaa
aaa
bvf
aaa
-abG
+aaa
aMs
aaa
-abG
+aaa
bCi
-abG
+aaa
aaa
aSd
aMd
@@ -102976,7 +102648,6 @@ aaa
aaa
aaa
aaa
-abG
aaa
aaa
aaa
@@ -103010,7 +102681,8 @@ aaa
aaa
aaa
aaa
-abG
+aaa
+aaa
aaa
doE
aII
@@ -103025,13 +102697,13 @@ aRe
aSd
aSd
aSd
-aWa
-aXp
+aVV
+aVV
aYV
aYV
aYV
-aXp
-bej
+aVV
+aVV
aSd
aSd
aSd
@@ -103257,7 +102929,6 @@ aaa
aaa
aaa
aaa
-abG
aaa
aaa
aaa
@@ -103266,7 +102937,8 @@ aaa
aaa
aaa
aaa
-abG
+aaa
+aaa
aaa
aaa
aEM
@@ -103282,13 +102954,13 @@ aME
aRO
aSd
aUZ
-aVW
+aVV
aXn
aYT
aYT
aYT
bey
-bge
+aVV
aUZ
aSd
bpX
@@ -103310,7 +102982,6 @@ aSd
aMd
bMa
bjQ
-abG
aaa
aaa
aaa
@@ -103324,7 +102995,8 @@ aaa
aaa
aaa
aaa
-abG
+aaa
+aaa
aaa
aaa
aaa
@@ -103825,7 +103497,6 @@ aSf
bLZ
aSd
aaa
-abG
aaa
aaa
aaa
@@ -103837,7 +103508,8 @@ aaa
aaa
aaa
aaa
-abG
+aaa
+aaa
aaa
aaa
aaa
@@ -104004,7 +103676,7 @@ aaa
aaa
aaa
aaa
-abG
+aaa
aaa
aaa
aaa
@@ -104083,17 +103755,17 @@ bMc
aSd
aaa
aaa
-abG
-aaa
-aaa
-abG
aaa
aaa
aaa
-abG
aaa
aaa
-abG
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
aaa
aaa
aaa
@@ -104498,11 +104170,11 @@ aaa
aaa
aaa
aaa
-abG
aaa
aaa
aaa
-abG
+aaa
+aaa
aaa
aaa
aaa
@@ -104519,7 +104191,7 @@ aaa
aaa
aaa
aaa
-abG
+aaa
aaa
aaa
aaa
@@ -105021,7 +104693,7 @@ aaa
aaa
aaa
aaa
-abG
+aaa
aaa
aaa
aaa
@@ -105539,7 +105211,6 @@ aaa
aaa
aaa
aaa
-abG
aaa
aaa
aaa
@@ -105547,7 +105218,8 @@ aaa
aaa
aaa
aaa
-abG
+aaa
+aaa
aaa
aaa
aaa
@@ -107163,7 +106835,6 @@ bET
bGV
bMf
bKw
-abG
aaa
aaa
aaa
@@ -107173,7 +106844,8 @@ aaa
aaa
aaa
aaa
-abG
+aaa
+aaa
aaa
aaa
aaa
@@ -107429,7 +107101,7 @@ aaa
aaa
aaa
aaa
-abG
+aaa
aaa
aaa
aaa
@@ -107705,7 +107377,7 @@ czF
cBi
cBi
cBi
-cEU
+cwx
aaa
aaa
aaa
@@ -107879,7 +107551,6 @@ aaa
aaa
aaa
aaa
-abG
aaa
aaa
aaa
@@ -107889,7 +107560,8 @@ aaa
aaa
aaa
aaa
-abG
+aaa
+aaa
aII
aDB
aEJ
@@ -107962,7 +107634,7 @@ czF
cBg
cCw
cDP
-cEU
+cwx
aaa
aaa
aaa
@@ -108219,7 +107891,7 @@ czF
cAX
cCx
cAX
-cEU
+cwx
aaa
aaa
aaa
@@ -108457,7 +108129,7 @@ aaa
aaa
aaa
aaa
-abG
+aaa
aaa
aaa
aaa
@@ -108476,7 +108148,7 @@ czF
cBj
cCq
cDU
-cEU
+cwx
aaa
aaa
aaa
@@ -108705,7 +108377,7 @@ bKq
bGW
bDQ
bKw
-abG
+aaa
aaa
aaa
aaa
@@ -108715,7 +108387,7 @@ bWP
aaa
aaa
aaa
-abG
+aaa
aaa
aaa
aaa
@@ -108733,7 +108405,7 @@ czP
cAX
cCy
cAX
-cEU
+cwx
aaa
aaa
aaa
@@ -108907,7 +108579,7 @@ aaa
aaa
aaa
aaa
-abG
+aaa
aaa
aaa
aaa
@@ -108917,7 +108589,7 @@ aaa
ays
aaa
aaa
-abG
+aaa
aGn
aGn
aGn
@@ -110515,13 +110187,13 @@ dcY
bKB
aaa
aaa
-abG
aaa
aaa
aaa
aaa
aaa
-abG
+aaa
+aaa
aab
cng
coL
@@ -111543,13 +111215,13 @@ bUC
bxb
cbG
aaa
-abG
+aaa
aaa
aaa
ckk
aaa
aaa
-abG
+aaa
aab
cgQ
ctV
@@ -112749,7 +112421,6 @@ aaa
aaa
aaa
aaa
-abG
aaa
aaa
aaa
@@ -112757,7 +112428,8 @@ aaa
aaa
aaa
aaa
-abG
+aaa
+aaa
aaa
aab
abN
@@ -113777,7 +113449,7 @@ aaa
aaa
aaa
aaa
-abG
+aaa
aaa
aaa
aaa
@@ -113785,7 +113457,7 @@ aaa
aaa
ayh
aaa
-abG
+aaa
aaa
aab
aab
@@ -114941,7 +114613,7 @@ amW
amW
aaa
aab
-shV
+dmD
amW
amW
aaa
@@ -115190,16 +114862,16 @@ aaa
aaa
aaa
amW
-shV
-shV
-shV
-shV
-shV
+dmD
+dmD
+dmD
+dmD
+dmD
amW
aaa
aab
-shV
-shV
+dmD
+dmD
amW
aaa
aaa
@@ -116226,7 +115898,7 @@ rlX
aaa
aaa
amW
-shV
+dmD
amW
aaa
aaa
@@ -116483,7 +116155,7 @@ djc
aab
aab
amW
-shV
+dmD
amW
aaa
aaa
@@ -116740,7 +116412,7 @@ rlX
aaa
aaa
amW
-shV
+dmD
amW
aaa
aaa
@@ -116997,7 +116669,7 @@ djc
aab
aab
amW
-shV
+dmD
amW
aaa
aaa
@@ -117254,7 +116926,7 @@ rlX
aaa
aaa
amW
-shV
+dmD
amW
aaa
aaa
@@ -117511,7 +117183,7 @@ djc
aab
aab
amW
-shV
+dmD
amW
aaa
aaa
@@ -117768,7 +117440,7 @@ rlX
aaa
aaa
amW
-shV
+dmD
amW
aaa
aaa
@@ -118800,7 +118472,7 @@ cUM
cSU
aaa
amW
-shV
+dmD
amW
aaa
aaa
@@ -119057,7 +118729,7 @@ ePY
cSU
aaa
amW
-shV
+dmD
amW
aaa
aaa
@@ -119314,7 +118986,7 @@ wQr
cSU
aab
amW
-shV
+dmD
amW
aab
aaa
@@ -119571,7 +119243,7 @@ daG
cSU
aaa
amW
-shV
+dmD
amW
aaa
aaa
@@ -119828,7 +119500,7 @@ ePY
cSU
aab
amW
-shV
+dmD
amW
aaa
aaa
@@ -120085,7 +119757,7 @@ ePY
cSU
aaa
amW
-shV
+dmD
amW
aaa
aaa
@@ -120342,7 +120014,7 @@ ePY
cSU
aaa
amW
-shV
+dmD
amW
aaa
aaa
@@ -120599,7 +120271,7 @@ ePY
cSU
aab
amW
-shV
+dmD
amW
aaa
aaa
@@ -120856,7 +120528,7 @@ ePY
cSU
aab
amW
-shV
+dmD
amW
aaa
aaa
@@ -121113,7 +120785,7 @@ daG
cSU
aaa
amW
-shV
+dmD
amW
aaa
aaa
@@ -121370,7 +121042,7 @@ wQr
cSU
aab
amW
-shV
+dmD
amW
aab
aaa
@@ -121627,7 +121299,7 @@ ePY
cSU
aab
amW
-shV
+dmD
amW
aaa
aaa
@@ -121884,7 +121556,7 @@ cUQ
cSU
aab
amW
-shV
+dmD
amW
aaa
aaa
@@ -123685,7 +123357,7 @@ dcq
dcq
dgC
doL
-dhT
+dgC
dcq
aaa
aaa
@@ -124454,9 +124126,9 @@ dfT
dcq
aaa
dcq
-dow
+dou
doz
-doV
+dou
dcq
aaa
aaa
@@ -129505,7 +129177,7 @@ djt
bjd
boV
bpG
-bbW
+bdT
boj
btJ
bus
@@ -129841,10 +129513,10 @@ dev
dez
ddi
ddq
-dlm
-dlm
-dlm
-dlm
+dgS
+dgS
+dgS
+dgS
dmD
doE
doE
@@ -130102,8 +129774,8 @@ dln
dlV
dln
dmy
-dlm
-dlm
+dgS
+dgS
dnx
aaa
doE
@@ -130502,7 +130174,7 @@ axg
axh
lQS
avt
-utw
+lQS
dEP
sHt
sHt
@@ -130616,8 +130288,8 @@ dln
dlW
dln
dmz
-dlm
-dlm
+dgS
+dgS
dnx
aaa
doE
@@ -130869,11 +130541,11 @@ dgT
djK
dgT
dgT
-dlm
-dlm
-dlm
+dgS
+dgS
+dgS
dmE
-dlm
+dgS
ddD
doE
doE
@@ -131128,7 +130800,7 @@ dkr
dkP
dkP
csL
-dma
+cBP
aab
aaa
aab
@@ -131271,9 +130943,9 @@ awl
doE
avM
doE
-aus
+auq
avw
-awm
+auq
aaa
aaa
aaa
@@ -131386,7 +131058,7 @@ dkQ
dlp
dlM
dmi
-dma
+cBP
aab
aab
aaa
@@ -141098,11 +140770,11 @@ cjA
aYS
aaa
dbP
-cgu
+cgs
chZ
chZ
-cgu
-cgu
+cgs
+cgs
cqg
crI
csg
@@ -142126,11 +141798,11 @@ ccS
aYS
aaa
dbX
-cgu
-cgu
-cgu
-cgu
-cgu
+cgs
+cgs
+cgs
+cgs
+cgs
cql
crK
csg
@@ -144669,7 +144341,7 @@ aaa
aaa
aaa
aaa
-abG
+aaa
aaa
aaa
aaa
@@ -144691,7 +144363,7 @@ aaa
aaa
aaa
aaa
-abG
+aaa
aaa
aaa
aaa
@@ -145376,18 +145048,6 @@ aaa
aaa
aaa
aaa
-abG
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-abG
aaa
aaa
aaa
@@ -145439,7 +145099,19 @@ aaa
aaa
aaa
aaa
-abG
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
aaa
aaa
aaa
@@ -145692,7 +145364,7 @@ aaa
aaa
aaa
aaa
-abG
+aaa
aaa
aaa
aaa
@@ -146147,10 +145819,6 @@ aaa
aaa
aaa
aaa
-abG
-aaa
-aaa
-abG
aaa
aaa
aaa
@@ -146158,7 +145826,11 @@ aaa
aaa
aaa
aaa
-abG
+aaa
+aaa
+aaa
+aaa
+aaa
aaa
aaa
aaa
@@ -146663,7 +146335,7 @@ aaa
aaa
aaa
aaa
-abG
+aaa
aaa
aaa
aaa
@@ -146919,7 +146591,6 @@ aaa
aaa
aaa
aaa
-abG
aaa
aaa
aaa
@@ -146934,7 +146605,8 @@ aaa
aaa
aaa
aaa
-abG
+aaa
+aaa
aaa
aaa
aaa
@@ -147175,7 +146847,6 @@ aaa
aaa
aaa
aaa
-abG
aaa
aaa
aaa
@@ -147192,7 +146863,8 @@ aaa
aaa
aaa
aaa
-abG
+aaa
+aaa
aaa
aaa
aaa
@@ -148005,7 +147677,7 @@ aaa
aaa
aaa
aaa
-abG
+aaa
aaa
aaa
aaa
@@ -148203,24 +147875,6 @@ aaa
aaa
aaa
aaa
-abG
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-abG
aaa
aaa
aaa
@@ -148266,7 +147920,25 @@ aaa
aaa
aaa
aaa
-abG
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
aaa
aaa
aaa
@@ -148461,7 +148133,6 @@ aaa
aaa
aaa
aaa
-abG
aaa
aaa
aaa
@@ -148476,7 +148147,8 @@ aaa
aaa
aaa
aaa
-abG
+aaa
+aaa
aaa
aaa
aaa
@@ -148719,7 +148391,7 @@ aaa
aaa
aaa
aaa
-abG
+aaa
aaa
aaa
aaa
@@ -149038,7 +148710,6 @@ aaa
aaa
aaa
aaa
-abG
aaa
aaa
aaa
@@ -149060,7 +148731,8 @@ aaa
aaa
aaa
aaa
-abG
+aaa
+aaa
aaa
aaa
aaa
@@ -149231,10 +148903,6 @@ aaa
aaa
aaa
aaa
-abG
-aaa
-aaa
-abG
aaa
aaa
aaa
@@ -149242,7 +148910,11 @@ aaa
aaa
aaa
aaa
-abG
+aaa
+aaa
+aaa
+aaa
+aaa
aaa
aaa
aaa
@@ -150002,7 +149674,6 @@ aaa
aaa
aaa
aaa
-abG
aaa
aaa
aaa
@@ -150013,7 +149684,8 @@ aaa
aaa
aaa
aaa
-abG
+aaa
+aaa
aaa
aaa
aaa
diff --git a/_maps/map_files/generic/Lavaland.dmm b/_maps/map_files/generic/Lavaland.dmm
index 1ecdb234111..f69ecd1cce4 100644
--- a/_maps/map_files/generic/Lavaland.dmm
+++ b/_maps/map_files/generic/Lavaland.dmm
@@ -277,13 +277,6 @@
},
/turf/simulated/floor/plasteel,
/area/mine/production)
-"aO" = (
-/obj/structure/grille,
-/obj/structure/window/full/shuttle{
- icon_state = "window8"
- },
-/turf/simulated/floor/plating,
-/area/shuttle/siberia)
"aP" = (
/obj/structure/table,
/obj/item/storage/firstaid/ancient,
@@ -785,7 +778,7 @@
/turf/simulated/floor/plating,
/area/mine/production)
"bO" = (
-/obj/machinery/door/airlock/shuttle{
+/obj/machinery/door/airlock/titanium{
id_tag = "s_docking_airlock";
name = "Labor Shuttle Airlock";
req_access_txt = "0"
@@ -810,7 +803,7 @@
turf_type = /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface;
width = 9
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/plating,
/area/shuttle/siberia)
"bP" = (
/obj/item/radio/beacon,
@@ -2710,7 +2703,7 @@
/turf/simulated/floor/plasteel,
/area/mine/living_quarters)
"fJ" = (
-/obj/machinery/door/airlock/shuttle{
+/obj/machinery/door/airlock/titanium{
id_tag = "s_docking_airlock";
req_access_txt = "48"
},
@@ -2734,7 +2727,7 @@
turf_type = /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface;
width = 7
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/plating,
/area/shuttle/mining)
"fK" = (
/obj/structure/table,
@@ -3269,9 +3262,6 @@
},
/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
-"he" = (
-/turf/simulated/shuttle/wall,
-/area/shuttle/siberia)
"hf" = (
/obj/machinery/flasher_button{
id = "gulagshuttleflasher";
@@ -3280,9 +3270,7 @@
pixel_y = -26;
req_access_txt = "1"
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/siberia)
"hg" = (
/obj/structure/stone_tile/surrounding,
@@ -3302,7 +3290,7 @@
/obj/structure/chair/comfy/shuttle{
dir = 8
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/siberia)
"hs" = (
/obj/structure/stone_tile/block{
@@ -3436,12 +3424,6 @@
/obj/structure/stone_tile/block/cracked,
/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
-"iG" = (
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall_f5"
- },
-/area/shuttle/siberia)
"iK" = (
/obj/structure/stone_tile/block,
/obj/structure/stone_tile/cracked{
@@ -3705,10 +3687,7 @@
/turf/simulated/floor/plating/lava/smooth/lava_land_surface,
/area/lavaland/surface/outdoors)
"kI" = (
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall_f6"
- },
+/turf/simulated/wall/mineral/titanium,
/area/shuttle/siberia)
"kJ" = (
/obj/structure/stone_tile/surrounding_tile{
@@ -4345,10 +4324,7 @@
input_dir = 2;
output_dir = 1
},
-/turf/simulated/shuttle/floor{
- icon = 'icons/turf/floors.dmi';
- icon_state = "dark"
- },
+/turf/simulated/floor/plasteel/dark,
/area/shuttle/siberia)
"on" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -4359,12 +4335,6 @@
},
/turf/simulated/floor/plasteel,
/area/mine/living_quarters)
-"op" = (
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall_f9"
- },
-/area/shuttle/mining)
"oA" = (
/obj/effect/decal/cleanable/cobweb2,
/obj/machinery/atmospherics/unary/tank/air{
@@ -4388,7 +4358,7 @@
/turf/simulated/floor/plasteel,
/area/mine/living_quarters)
"pq" = (
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/siberia)
"pt" = (
/obj/machinery/mineral/labor_claim_console{
@@ -4396,9 +4366,7 @@
pixel_x = 30;
pixel_y = 30
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/siberia)
"qw" = (
/obj/effect/decal/cleanable/dirt,
@@ -4429,9 +4397,7 @@
/obj/structure/chair/comfy/shuttle{
dir = 1
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/siberia)
"qT" = (
/turf/simulated/wall/rust,
@@ -4526,9 +4492,8 @@
/turf/simulated/floor/plasteel,
/area/mine/laborcamp)
"tb" = (
-/obj/structure/window/full/shuttle,
-/obj/structure/grille,
-/turf/simulated/shuttle/plating,
+/obj/effect/spawner/window/shuttle,
+/turf/simulated/floor/plating,
/area/shuttle/mining)
"tj" = (
/obj/effect/decal/cleanable/ash,
@@ -4611,14 +4576,11 @@
/turf/simulated/floor/plating,
/area/mine/laborcamp)
"vk" = (
-/obj/machinery/door/airlock/external{
+/obj/machinery/door/airlock/titanium{
name = "Labor Shuttle Airlock";
req_access_txt = "2"
},
-/turf/simulated/shuttle/floor{
- icon = 'icons/turf/floors.dmi';
- icon_state = "dark"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/siberia)
"vq" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on,
@@ -4666,7 +4628,7 @@
/area/mine/laborcamp)
"wt" = (
/obj/structure/shuttle/engine/propulsion,
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating/airless,
/area/shuttle/siberia)
"wD" = (
/obj/effect/decal/remains/human,
@@ -4678,7 +4640,7 @@
dir = 1;
layer = 2.9
},
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating/airless,
/area/shuttle/siberia)
"wY" = (
/obj/item/clothing/mask/gas/clown_hat,
@@ -4686,7 +4648,7 @@
/area/lavaland/surface/outdoors)
"xo" = (
/obj/structure/shuttle/engine/propulsion/burst,
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating/airless,
/area/shuttle/mining)
"xx" = (
/obj/machinery/light/small{
@@ -4705,10 +4667,7 @@
/turf/simulated/floor/plasteel,
/area/mine/production)
"xC" = (
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall_f6"
- },
+/turf/simulated/wall/mineral/titanium,
/area/shuttle/mining)
"xL" = (
/obj/machinery/atmospherics/unary/outlet_injector/on{
@@ -4723,7 +4682,7 @@
/obj/machinery/light/small{
dir = 4
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/mining)
"xR" = (
/obj/effect/decal/cleanable/dirt,
@@ -4780,9 +4739,7 @@
/turf/simulated/floor/plasteel,
/area/mine/production)
"Bg" = (
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/siberia)
"BD" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -4804,12 +4761,10 @@
/area/mine/living_quarters)
"BY" = (
/obj/machinery/computer/shuttle/labor,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/siberia)
"Cf" = (
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/mining)
"Cy" = (
/obj/effect/decal/cleanable/dirt,
@@ -4820,11 +4775,11 @@
/area/mine/laborcamp)
"CF" = (
/obj/structure/closet/crate,
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/mining)
"CK" = (
/obj/structure/closet/crate,
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/siberia)
"CT" = (
/obj/effect/decal/cleanable/dirt,
@@ -4901,14 +4856,6 @@
},
/turf/simulated/floor/plasteel,
/area/mine/living_quarters)
-"Fc" = (
-/obj/structure/grille,
-/obj/structure/window/full/shuttle{
- dir = 10;
- icon_state = "9"
- },
-/turf/simulated/floor/plating,
-/area/shuttle/siberia)
"Fe" = (
/obj/structure/sink{
dir = 8;
@@ -4931,11 +4878,6 @@
tag = "icon-wood-broken7"
},
/area/mine/laborcamp)
-"FE" = (
-/obj/structure/grille,
-/obj/structure/window/full/shuttle,
-/turf/simulated/floor/plating,
-/area/shuttle/siberia)
"FO" = (
/obj/structure/rack,
/obj/item/storage/bag/ore,
@@ -4957,15 +4899,13 @@
},
/area/mine/laborcamp)
"FW" = (
-/obj/machinery/door/airlock/shuttle{
+/obj/machinery/door/airlock/titanium{
id_tag = "s_docking_airlock";
name = "Labor Shuttle Airlock";
req_access_txt = "2"
},
/obj/structure/fans/tiny,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/plating,
/area/shuttle/siberia)
"Gp" = (
/obj/structure/sign/poster/contraband/clown,
@@ -5032,26 +4972,13 @@
/obj/machinery/vending/cola/free,
/turf/simulated/floor/plasteel/dark,
/area/mine/laborcamp)
-"It" = (
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall12"
- },
-/area/shuttle/mining)
"Iv" = (
/obj/structure/table,
/obj/machinery/light/small{
dir = 1
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/mining)
-"Ix" = (
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall_f10";
- tag = "icon-swall_f10"
- },
-/area/shuttle/siberia)
"IK" = (
/obj/structure/toilet{
dir = 8
@@ -5072,7 +4999,7 @@
/obj/structure/window/reinforced{
dir = 4
},
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating/airless,
/area/shuttle/mining)
"Jl" = (
/obj/effect/spawner/window/reinforced,
@@ -5114,7 +5041,7 @@
/obj/machinery/light/small{
dir = 8
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/mining)
"JZ" = (
/obj/effect/decal/cleanable/dirt,
@@ -5150,7 +5077,7 @@
pixel_x = 30;
pixel_y = 0
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/siberia)
"Lz" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -5183,12 +5110,6 @@
icon_state = "brown"
},
/area/mine/laborcamp)
-"Mn" = (
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall_f9"
- },
-/area/shuttle/siberia)
"ME" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 1
@@ -5251,13 +5172,10 @@
/area/mine/laborcamp)
"NP" = (
/obj/machinery/computer/shuttle/mining,
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/mining)
"NW" = (
-/obj/structure/grille,
-/obj/structure/window/full/shuttle{
- icon_state = "window4"
- },
+/obj/effect/spawner/window/shuttle,
/turf/simulated/floor/plating,
/area/shuttle/siberia)
"NZ" = (
@@ -5283,19 +5201,6 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plating,
/area/mine/living_quarters)
-"Qp" = (
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall_f10";
- tag = "icon-swall_f10"
- },
-/area/shuttle/mining)
-"Qq" = (
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall3"
- },
-/area/shuttle/mining)
"QE" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/light/small{
@@ -5335,20 +5240,8 @@
/area/mine/laborcamp)
"Rs" = (
/obj/structure/table,
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/mining)
-"Rw" = (
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall_f5"
- },
-/area/shuttle/mining)
-"Sa" = (
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall3"
- },
-/area/shuttle/siberia)
"Ss" = (
/obj/structure/rack,
/obj/item/storage/bag/ore,
@@ -5425,7 +5318,7 @@
/obj/structure/chair/comfy/shuttle{
dir = 4
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/siberia)
"UQ" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -5448,6 +5341,12 @@
icon_state = "brown"
},
/area/mine/laborcamp)
+"Vu" = (
+/obj/structure/chair/comfy/shuttle{
+ dir = 1
+ },
+/turf/simulated/floor/mineral/titanium/blue,
+/area/shuttle/mining)
"Vv" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -5502,7 +5401,7 @@
/obj/structure/chair/comfy/shuttle{
dir = 1
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/mining)
"Wt" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on{
@@ -5522,9 +5421,7 @@
dir = 4;
icon_state = "tube1"
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/siberia)
"WJ" = (
/obj/effect/decal/cleanable/dirt,
@@ -8902,14 +8799,14 @@ aw
aw
aw
kI
-Sa
-FE
-Sa
-Sa
-FE
-Sa
-Sa
-iG
+kI
+NW
+kI
+kI
+NW
+kI
+kI
+kI
aw
aj
aj
@@ -9415,10 +9312,10 @@ aw
aw
aw
aw
-Fc
+NW
qL
hf
-he
+kI
pq
pq
pq
@@ -9672,7 +9569,7 @@ aj
aw
aw
aw
-aO
+NW
Wx
pt
nT
@@ -9929,15 +9826,15 @@ qT
aw
aw
aw
-Ix
-Sa
+kI
+kI
FW
-Sa
-Sa
-Sa
+kI
+kI
+kI
bO
-Sa
-Mn
+kI
+kI
xL
ab
aj
@@ -18416,12 +18313,12 @@ aj
aj
ab
xC
-Qq
+xC
tb
-Qq
+xC
tb
-Qq
-Rw
+xC
+xC
ab
aj
aj
@@ -18672,13 +18569,13 @@ aj
aj
ab
ab
-It
+xC
Rs
Cf
JX
-Wo
+Vu
CF
-It
+xC
ab
aj
aj
@@ -18933,7 +18830,7 @@ tb
NP
Wo
Cf
-Wo
+Vu
IZ
xo
ab
@@ -19186,13 +19083,13 @@ aj
aj
aj
ab
-It
+xC
Iv
Cf
Cf
-Wo
+Vu
xM
-It
+xC
ab
ab
aj
@@ -19443,13 +19340,13 @@ aj
aj
aj
ab
-Qp
-Qq
+xC
+xC
tb
fJ
tb
-Qq
-op
+xC
+xC
ab
aj
aj
diff --git a/_maps/map_files/generic/centcomm.dmm b/_maps/map_files/generic/centcomm.dmm
index e0390011c04..a93ae635b6d 100644
--- a/_maps/map_files/generic/centcomm.dmm
+++ b/_maps/map_files/generic/centcomm.dmm
@@ -186,8 +186,8 @@
},
/area/holodeck/source_burntest)
"aB" = (
-/obj/machinery/door/airlock/shuttle,
-/turf/simulated/shuttle/plating,
+/obj/machinery/door/airlock/titanium,
+/turf/simulated/floor/plating,
/area/centcom/evac)
"aC" = (
/turf/simulated/floor/holofloor{
@@ -556,40 +556,7 @@
/area/holodeck/source_emptycourt)
"bD" = (
/obj/machinery/porta_turret/syndicate/pod,
-/turf/simulated/floor/pod,
-/turf/space,
-/turf/simulated/shuttle/wall{
- dir = 8;
- icon_state = "diagonalWall3"
- },
-/area/shuttle/assault_pod)
-"bE" = (
-/obj/machinery/porta_turret/syndicate/pod,
-/turf/simulated/floor/pod,
-/turf/space,
-/turf/simulated/shuttle/wall{
- dir = 1;
- icon_state = "diagonalWall3"
- },
-/area/shuttle/assault_pod)
-"bF" = (
-/obj/machinery/porta_turret/syndicate/pod,
-/turf/simulated/floor/pod,
-/turf/space,
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "diagonalWall3";
- tag = "icon-diagonalWall3"
- },
-/area/shuttle/assault_pod)
-"bG" = (
-/obj/machinery/porta_turret/syndicate/pod,
-/turf/simulated/floor/pod,
-/turf/space,
-/turf/simulated/shuttle/wall{
- dir = 4;
- icon_state = "diagonalWall3"
- },
+/turf/simulated/wall/mineral/plastitanium,
/area/shuttle/assault_pod)
"bH" = (
/obj/structure/flora/ausbushes/brflowers,
@@ -672,9 +639,7 @@
/obj/machinery/recharger{
pixel_y = 4
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"bT" = (
/obj/structure/holowindow{
@@ -696,7 +661,7 @@
/area/holodeck/source_emptycourt)
"bY" = (
/obj/structure/chair/comfy/shuttle,
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/transport)
"bZ" = (
/turf/unsimulated/wall,
@@ -752,9 +717,7 @@
/turf/simulated/floor/holofloor/space,
/area/holodeck/source_space)
"ci" = (
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/syndicate_elite)
"cj" = (
/turf/unsimulated/wall,
@@ -801,10 +764,7 @@
},
/area/holodeck/source_basketball)
"cr" = (
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall12"
- },
+/turf/simulated/wall/mineral/titanium,
/area/shuttle/transport)
"ct" = (
/turf/simulated/floor/plasteel{
@@ -823,7 +783,7 @@
name = "Shuttle Hatch";
req_access_txt = "31"
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/plating,
/area/shuttle/supply)
"cw" = (
/turf/simulated/floor/holofloor{
@@ -842,9 +802,7 @@
"cy" = (
/obj/structure/table,
/obj/item/storage/box/zipties,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/syndicate)
"cz" = (
/obj/docking_port/stationary/transit{
@@ -877,9 +835,7 @@
name = "Cockpit";
req_access_txt = "150"
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/syndicate)
"cD" = (
/turf/simulated/floor/holofloor{
@@ -903,9 +859,7 @@
"cG" = (
/obj/machinery/cell_charger,
/obj/structure/table,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"cH" = (
/obj/machinery/computer/shuttle/ferry,
@@ -918,7 +872,7 @@
dir = 8;
icon_state = "propulsion"
},
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating/airless,
/area/shuttle/specops)
"cJ" = (
/turf/unsimulated/wall/fakeglass,
@@ -1153,7 +1107,7 @@
req_one_access = null;
req_one_access_txt = "0"
},
-/turf/simulated/shuttle/plating/vox,
+/turf/simulated/floor/plating/nitrogen,
/area/shuttle/vox)
"dp" = (
/turf/simulated/floor/holofloor{
@@ -1295,19 +1249,11 @@
icon_state = "red"
},
/area/holodeck/source_boxingcourt)
-"dM" = (
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall_f10"
- },
-/area/shuttle/trade/sol)
"dN" = (
/obj/machinery/vending/wallmed/syndicate{
pixel_x = -30
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/syndicate)
"dO" = (
/turf/simulated/floor/holofloor{
@@ -1435,20 +1381,6 @@
icon_state = "cafeteria"
},
/area/ninja/holding)
-"ef" = (
-/turf/unsimulated/floor/snow,
-/turf/simulated/shuttle/wall{
- dir = 8;
- icon_state = "diagonalWall3"
- },
-/area/syndicate_mothership)
-"eg" = (
-/turf/unsimulated/floor/snow,
-/turf/simulated/shuttle/wall{
- dir = 1;
- icon_state = "diagonalWall3"
- },
-/area/syndicate_mothership)
"eh" = (
/obj/structure/flora/tree/pine,
/turf/unsimulated/floor/snow,
@@ -1515,24 +1447,6 @@
icon_state = "bar"
},
/area/syndicate_mothership)
-"er" = (
-/obj/machinery/door/poddoor/shutters{
- density = 0;
- dir = 2;
- icon_state = "open";
- id_tag = "voxshutters";
- name = "Blast Shutters";
- opacity = 0
- },
-/obj/structure/grille,
-/obj/structure/shuttle/window{
- dir = 1;
- icon = 'icons/turf/shuttle.dmi';
- icon_state = "window5_end";
- tag = "icon-window5_end (NORTH)"
- },
-/turf/simulated/shuttle/plating/vox,
-/area/shuttle/vox)
"eu" = (
/obj/structure/chair/stool,
/obj/machinery/computer/security/telescreen{
@@ -1581,11 +1495,6 @@
icon_state = "wood"
},
/area/syndicate_mothership)
-"eA" = (
-/turf/unsimulated/floor{
- name = "plating"
- },
-/area/syndicate_mothership)
"eB" = (
/turf/simulated/floor/holofloor{
dir = 10;
@@ -1612,9 +1521,7 @@
dir = 5;
icon_state = "intact"
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/syndicate)
"eF" = (
/obj/structure/reagent_dispensers/watertank,
@@ -1629,7 +1536,7 @@
icon_state = "propulsion";
tag = "icon-propulsion (NORTH)"
},
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating/airless,
/area/shuttle/syndicate_elite)
"eH" = (
/turf/simulated/floor/holofloor{
@@ -1765,7 +1672,7 @@
name = "Syndicate Base";
width = 11
},
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating,
/area/shuttle/syndicate_sit)
"eW" = (
/turf/unsimulated/wall{
@@ -1849,7 +1756,7 @@
name = "Syndicate Base";
width = 11
},
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating,
/area/shuttle/syndicate_elite)
"fd" = (
/obj/item/flag/syndi,
@@ -2011,7 +1918,7 @@
roundstart_move = null;
width = 9
},
-/obj/machinery/door/airlock/shuttle/glass{
+/obj/machinery/door/airlock/titanium/glass{
id_tag = "s_docking_airlock";
req_one_access_txt = "0"
},
@@ -2023,7 +1930,7 @@
name = "docking bay 2 at Jupiter Station";
width = 9
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/trade/sol)
"fx" = (
/turf/unsimulated/floor{
@@ -2217,9 +2124,7 @@
pixel_x = -32;
pixel_y = 0
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/gamma/space)
"fW" = (
/obj/machinery/light/spot{
@@ -2295,12 +2200,6 @@
icon_state = "grimy"
},
/area/wizard_station)
-"ge" = (
-/turf/unsimulated/floor/snow,
-/turf/simulated/shuttle/wall{
- icon_state = "diagonalWall3"
- },
-/area/syndicate_mothership)
"gf" = (
/obj/item/camera,
/turf/unsimulated/beach/sand,
@@ -2315,15 +2214,6 @@
icon_state = "dark"
},
/area/syndicate_mothership)
-"gh" = (
-/turf/unsimulated/floor{
- icon_state = "dark"
- },
-/turf/simulated/shuttle/wall{
- dir = 4;
- icon_state = "diagonalWall3"
- },
-/area/syndicate_mothership)
"gi" = (
/obj/effect/decal/warning_stripes/southeastcorner,
/turf/simulated/floor/plating/airless,
@@ -2345,16 +2235,6 @@
icon_state = "wood"
},
/area/wizard_station)
-"gm" = (
-/turf/unsimulated/floor{
- icon_state = "dark"
- },
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "diagonalWall3";
- tag = "icon-diagonalWall3"
- },
-/area/syndicate_mothership)
"gn" = (
/obj/machinery/camera{
c_tag = "Thunderdome Arena";
@@ -2455,13 +2335,6 @@
icon_state = "grimy"
},
/area/ninja/outpost)
-"gB" = (
-/turf/unsimulated/floor/snow,
-/turf/simulated/shuttle/wall{
- dir = 4;
- icon_state = "diagonalWall3"
- },
-/area/syndicate_mothership)
"gC" = (
/turf/unsimulated/floor{
dir = 2;
@@ -2783,7 +2656,7 @@
/area/syndicate_mothership)
"ht" = (
/obj/structure/rack,
-/turf/simulated/shuttle/floor4/vox,
+/turf/simulated/floor/mineral/plastitanium/red/nitrogen,
/area/shuttle/vox)
"hu" = (
/turf/unsimulated/wall/fakeglass{
@@ -2913,9 +2786,7 @@
/area/syndicate_mothership)
"hP" = (
/obj/machinery/computer/communications,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"hQ" = (
/obj/structure/table,
@@ -2929,14 +2800,14 @@
"hR" = (
/obj/machinery/bodyscanner,
/obj/machinery/light/spot,
-/turf/simulated/shuttle/floor4/vox,
+/turf/simulated/floor/mineral/plastitanium/red/nitrogen,
/area/shuttle/vox)
"hU" = (
/obj/structure/AIcore,
-/turf/simulated/shuttle/floor4/vox,
+/turf/simulated/floor/mineral/plastitanium/red/nitrogen,
/area/shuttle/vox)
"hV" = (
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/trade/sol)
"hX" = (
/obj/item/storage/fancy/crayons,
@@ -2956,7 +2827,7 @@
icon_state = "propulsion_l";
tag = "icon-propulsion_l"
},
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating/airless,
/area/shuttle/syndicate)
"ic" = (
/obj/structure/closet/fireaxecabinet{
@@ -3084,19 +2955,12 @@
icon_state = "bar"
},
/area/syndicate_mothership)
-"it" = (
-/turf/simulated/shuttle/wall{
- icon_state = "wall3"
- },
-/area/syndicate_mothership)
"iu" = (
/obj/effect/decal/warning_stripes/southeast,
/turf/simulated/floor/plating/airless,
/area/syndicate_mothership)
"iv" = (
-/turf/simulated/shuttle/wall{
- icon_state = "wall3"
- },
+/turf/simulated/wall/mineral/plastitanium,
/area/shuttle/assault_pod)
"iw" = (
/obj/structure/rack,
@@ -3211,9 +3075,7 @@
/obj/structure/window/reinforced{
dir = 1
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/syndicate)
"iI" = (
/obj/effect/decal/warning_stripes/east,
@@ -3292,9 +3154,7 @@
},
/area/syndicate_mothership)
"iS" = (
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/assault_pod)
"iT" = (
/obj/effect/decal/warning_stripes/west,
@@ -3406,9 +3266,7 @@
/area/syndicate_mothership)
"jj" = (
/obj/machinery/computer/shuttle/syndicate/drop_pod,
-/turf/simulated/shuttle/wall{
- icon_state = "wall3"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/assault_pod)
"jk" = (
/obj/structure/table/wood,
@@ -3494,9 +3352,7 @@
/obj/structure/chair/comfy/shuttle{
dir = 8
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/assault_pod)
"ju" = (
/obj/effect/decal/warning_stripes/northeast,
@@ -3515,9 +3371,7 @@
/obj/structure/chair/comfy/shuttle{
dir = 4
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/assault_pod)
"jx" = (
/obj/effect/decal/warning_stripes/northwest,
@@ -3627,9 +3481,7 @@
icon_state = "tube1";
tag = "icon-tube1 (NORTH)"
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/syndicate)
"jI" = (
/turf/space,
@@ -3764,13 +3616,6 @@
},
/turf/simulated/floor/plasteel,
/area/shuttle/escape)
-"ki" = (
-/obj/structure/grille,
-/obj/structure/window/full/shuttle{
- icon_state = "16"
- },
-/turf/simulated/floor/plating,
-/area/shuttle/escape)
"kj" = (
/turf/unsimulated/floor{
dir = 2;
@@ -4673,7 +4518,7 @@
/obj/structure/table,
/obj/item/pickaxe,
/obj/item/storage/firstaid/toxin,
-/turf/simulated/shuttle/floor4/vox,
+/turf/simulated/floor/mineral/plastitanium/red/nitrogen,
/area/shuttle/vox)
"mF" = (
/obj/machinery/light/spot,
@@ -4704,9 +4549,7 @@
name = "remote shutter control";
req_access_txt = "150"
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/syndicate)
"mI" = (
/obj/structure/flora/ausbushes/brflowers,
@@ -4720,7 +4563,7 @@
dir = 4
},
/obj/item/clothing/mask/breath,
-/turf/simulated/shuttle/floor4/vox,
+/turf/simulated/floor/mineral/plastitanium/red/nitrogen,
/area/shuttle/vox)
"mK" = (
/obj/structure/flora/ausbushes/reedbush,
@@ -4955,9 +4798,7 @@
/obj/machinery/sleeper{
dir = 4
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/centcom/evac)
"np" = (
/obj/machinery/door/airlock/centcom{
@@ -5282,13 +5123,6 @@
icon_state = "greencorner"
},
/area/centcom/control)
-"nV" = (
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall12";
- tag = "icon-swall12"
- },
-/area/shuttle/escape)
"nW" = (
/obj/effect/decal/warning_stripes/blue,
/turf/unsimulated/floor{
@@ -5297,9 +5131,7 @@
/area/syndicate_mothership)
"nY" = (
/obj/machinery/optable,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/syndicate)
"oa" = (
/turf/unsimulated/floor/snow{
@@ -5323,41 +5155,14 @@
/turf/space,
/area/space)
"od" = (
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall_s6"
- },
-/area/shuttle/escape)
-"oe" = (
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall_s10"
- },
+/turf/simulated/wall/mineral/titanium,
/area/shuttle/escape)
"of" = (
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall_s6"
- },
+/turf/simulated/wall/mineral/titanium,
/area/shuttle/gamma/space)
"og" = (
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/escape)
-"oh" = (
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall12";
- tag = "icon-swall12"
- },
-/area/shuttle/gamma/space)
-"oi" = (
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall_s10"
- },
-/area/shuttle/gamma/space)
"oj" = (
/obj/effect/spawner/window/reinforced,
/turf/simulated/floor/plasteel{
@@ -5407,9 +5212,7 @@
/area/centcom/specops)
"op" = (
/obj/machinery/light/spot,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/escape)
"oq" = (
/obj/structure/chair/office/dark{
@@ -5492,20 +5295,6 @@
tag = "icon-fakewindows (WEST)"
},
/area/centcom/specops)
-"ox" = (
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall3";
- tag = "icon-swall3"
- },
-/area/shuttle/escape)
-"oy" = (
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall3";
- tag = "icon-swall3"
- },
-/area/shuttle/gamma/space)
"oz" = (
/obj/structure/chair/office/dark{
dir = 1
@@ -5545,9 +5334,7 @@
icon_state = "tube1";
tag = "icon-tube1 (WEST)"
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/gamma/space)
"oC" = (
/obj/structure/closet/secure_closet/guncabinet,
@@ -5562,9 +5349,7 @@
/obj/machinery/ai_status_display{
pixel_y = 32
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/gamma/space)
"oD" = (
/obj/effect/spawner/window/reinforced,
@@ -5625,9 +5410,7 @@
/obj/item/gun/projectile/automatic/pistol{
name = "pistol"
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/gamma/space)
"oK" = (
/turf/unsimulated/wall/fakeglass{
@@ -5739,9 +5522,7 @@
/obj/item/gun/energy/gun/nuclear,
/obj/item/gun/energy/gun/nuclear,
/obj/item/gun/energy/gun/nuclear,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/gamma/space)
"oX" = (
/obj/machinery/door/airlock/external{
@@ -5754,7 +5535,7 @@
},
/area/centcom/control)
"oY" = (
-/obj/machinery/door/airlock/shuttle,
+/obj/machinery/door/airlock/titanium,
/obj/docking_port/mobile/emergency/backup{
dwidth = 9;
roundstart_move = null
@@ -5767,36 +5548,14 @@
name = "Backup Shuttle Dock";
width = 8
},
-/turf/unsimulated/floor{
- icon_state = "floor"
- },
-/area/shuttle/escape)
-"oZ" = (
-/obj/machinery/door/poddoor/shutters{
- density = 0;
- dir = 4;
- icon_state = "open";
- id_tag = "adminshuttleshutters";
- name = "Blast Shutters";
- opacity = 0
- },
-/obj/structure/grille,
-/obj/structure/shuttle/window{
- dir = 4;
- icon = 'icons/turf/shuttle.dmi';
- icon_state = "window5_mid";
- tag = "icon-window5 (EAST)"
- },
/turf/simulated/floor/plating,
-/area/shuttle/administration)
+/area/shuttle/escape)
"pa" = (
/obj/structure/sign/securearea{
pixel_x = 32;
pixel_y = 0
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/gamma/space)
"pb" = (
/obj/machinery/camera{
@@ -5852,36 +5611,14 @@
},
/area/centcom/specops)
"pf" = (
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/gamma/space)
"ph" = (
/obj/machinery/recharger/wallcharger{
pixel_x = 32
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/gamma/space)
-"pi" = (
-/obj/machinery/door/poddoor/shutters{
- density = 0;
- dir = 8;
- icon_state = "open";
- id_tag = "voxshutters";
- name = "Blast Shutters";
- opacity = 0
- },
-/obj/structure/grille,
-/obj/structure/shuttle/window{
- dir = 4;
- icon = 'icons/turf/shuttle.dmi';
- icon_state = "window5_end";
- tag = "icon-window5_end (EAST)"
- },
-/turf/simulated/shuttle/plating/vox,
-/area/shuttle/vox)
"pj" = (
/obj/structure/window/reinforced{
dir = 1
@@ -5898,9 +5635,7 @@
/obj/item/ammo_casing/rocket,
/obj/item/ammo_casing/rocket,
/obj/item/gun/rocketlauncher,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/gamma/space)
"pl" = (
/obj/structure/window/reinforced{
@@ -5923,10 +5658,8 @@
},
/area/centcom/specops)
"pn" = (
-/obj/machinery/door/airlock/shuttle,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/obj/machinery/door/airlock/titanium,
+/turf/simulated/floor/plating,
/area/shuttle/gamma/space)
"po" = (
/obj/structure/table/reinforced,
@@ -5937,9 +5670,7 @@
/obj/item/kitchen/knife/combat,
/obj/item/kitchen/knife/combat,
/obj/item/kitchen/knife/combat,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/gamma/space)
"pq" = (
/obj/structure/cable{
@@ -5953,34 +5684,21 @@
pixel_x = 0
},
/obj/machinery/mech_bay_recharge_port/upgraded,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/gamma/space)
-"pr" = (
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall_f9";
- tag = "icon-swall_f9"
- },
-/area/shuttle/supply)
"ps" = (
/obj/structure/cable{
d2 = 8;
icon_state = "0-8"
},
/obj/machinery/computer/mech_bay_power_console,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/gamma/space)
"pt" = (
-/obj/machinery/door/airlock/shuttle{
+/obj/machinery/door/airlock/titanium{
req_access_txt = "0"
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/plating,
/area/shuttle/gamma/space)
"pu" = (
/obj/mecha/combat/durand/loaded{
@@ -5992,7 +5710,7 @@
icon_state = "4-8";
pixel_x = 0
},
-/turf/simulated/floor/mech_bay_recharge_floor,
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/gamma/space)
"pv" = (
/obj/machinery/door/poddoor/impassable{
@@ -6015,18 +5733,6 @@
tag = "icon-fakewindows (WEST)"
},
/area/centcom/specops)
-"px" = (
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall_s5"
- },
-/area/shuttle/gamma/space)
-"py" = (
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall_s9"
- },
-/area/shuttle/gamma/space)
"pz" = (
/turf/unsimulated/floor{
icon_state = "floor"
@@ -6212,18 +5918,6 @@
icon_state = "floor"
},
/area/centcom/control)
-"pT" = (
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall_s5"
- },
-/area/shuttle/escape)
-"pU" = (
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall_s9"
- },
-/area/shuttle/escape)
"pV" = (
/obj/machinery/camera{
c_tag = "CentComm Special Ops. Ready Room South";
@@ -6358,7 +6052,7 @@
"qi" = (
/obj/machinery/portable_atmospherics/canister/nitrogen,
/obj/machinery/light/spot,
-/turf/simulated/shuttle/floor4/vox,
+/turf/simulated/floor/mineral/plastitanium/red/nitrogen,
/area/shuttle/vox)
"qj" = (
/turf/unsimulated/wall/fakeglass{
@@ -6409,13 +6103,6 @@
name = "bookcase (Reports)"
},
/area/centcom/specops)
-"qn" = (
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall_f5";
- tag = "icon-swall_f5"
- },
-/area/shuttle/trade/sol)
"qo" = (
/turf/simulated/floor/plasteel{
icon_state = "white"
@@ -6742,7 +6429,7 @@
name = "centcom bay 3";
width = 5
},
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating,
/area/shuttle/specops)
"rc" = (
/obj/effect/decal/cleanable/blood,
@@ -7007,11 +6694,7 @@
/turf/unsimulated/floor,
/area/start)
"rI" = (
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall_s6";
- tag = "icon-swall_s6"
- },
+/turf/simulated/wall/mineral/titanium,
/area/centcom/evac)
"rJ" = (
/obj/structure/shuttle/engine/propulsion{
@@ -7019,7 +6702,7 @@
icon_state = "propulsion";
tag = "icon-propulsion (NORTH)"
},
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating/airless,
/area/centcom/evac)
"rK" = (
/turf/unsimulated/wall/splashscreen,
@@ -7030,14 +6713,7 @@
icon_state = "propulsion_r";
tag = "icon-propulsion_r (NORTH)"
},
-/turf/simulated/shuttle/plating,
-/area/centcom/evac)
-"rM" = (
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall_s10";
- tag = "icon-swall_s10"
- },
+/turf/simulated/floor/plating/airless,
/area/centcom/evac)
"rN" = (
/obj/structure/shuttle/engine/propulsion{
@@ -7045,7 +6721,7 @@
icon_state = "propulsion_l";
tag = "icon-propulsion_l (NORTH)"
},
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating/airless,
/area/centcom/evac)
"rO" = (
/obj/docking_port/stationary{
@@ -7069,13 +6745,6 @@
},
/turf/space,
/area/space)
-"rQ" = (
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall3";
- tag = "icon-swall3"
- },
-/area/centcom/evac)
"rR" = (
/obj/structure/window/reinforced,
/obj/structure/shuttle/engine/heater{
@@ -7083,28 +6752,10 @@
icon_state = "heater";
tag = "icon-heater (NORTH)"
},
-/turf/simulated/shuttle/plating,
-/area/centcom/evac)
-"rS" = (
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall7";
- tag = "icon-swall7"
- },
-/area/centcom/evac)
-"rT" = (
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall12";
- tag = "icon-swall12"
- },
+/turf/simulated/floor/plating/airless,
/area/centcom/evac)
"rU" = (
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall11";
- tag = "icon-swall11"
- },
+/turf/simulated/wall/mineral/titanium/nodiagonal,
/area/centcom/evac)
"rV" = (
/obj/structure/sign/securearea{
@@ -7123,7 +6774,7 @@
height = 18;
width = 29
},
-/obj/machinery/door/airlock/shuttle{
+/obj/machinery/door/airlock/titanium{
aiControlDisabled = 1;
hackProof = 1;
id_tag = "s_docking_airlock";
@@ -7142,27 +6793,8 @@
icon_state = "neutralfull"
},
/area/shuttle/escape)
-"rX" = (
-/turf/simulated/shuttle/floor,
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall_f9";
- tag = "icon-swall_f9"
- },
-/area/centcom/evac)
-"rY" = (
-/turf/simulated/shuttle/plating,
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall_f6";
- tag = "icon-swall_f6"
- },
-/area/centcom/evac)
"rZ" = (
-/turf/simulated/shuttle/floor{
- icon_state = "floor2";
- tag = "icon-floor2"
- },
+/turf/simulated/floor/mineral/titanium/yellow,
/area/centcom/evac)
"sa" = (
/obj/structure/table,
@@ -7171,7 +6803,7 @@
pixel_x = -2;
pixel_y = 4
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/centcom/evac)
"sb" = (
/obj/structure/table,
@@ -7180,7 +6812,7 @@
pixel_y = 4
},
/obj/item/storage/firstaid/toxin,
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/centcom/evac)
"sc" = (
/obj/structure/table,
@@ -7192,24 +6824,7 @@
pixel_x = -2;
pixel_y = 4
},
-/turf/simulated/shuttle/floor,
-/area/centcom/evac)
-"sd" = (
-/turf/simulated/shuttle/floor,
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall_f5";
- tag = "icon-swall_f5"
- },
-/area/centcom/evac)
-"se" = (
-/turf/simulated/shuttle/plating,
-/turf/simulated/shuttle/wall{
- dir = 3;
- icon_state = "swall_f10";
- layer = 2;
- tag = "icon-swall_f10"
- },
+/turf/simulated/floor/mineral/titanium/blue,
/area/centcom/evac)
"sf" = (
/obj/structure/closet/secure_closet/brig,
@@ -7229,14 +6844,7 @@
pixel_y = 0;
req_access_txt = "0"
},
-/turf/simulated/shuttle/floor,
-/area/centcom/evac)
-"sh" = (
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall1";
- tag = "icon-swall1"
- },
+/turf/simulated/floor/mineral/titanium/blue,
/area/centcom/evac)
"si" = (
/obj/machinery/vending/wallmed{
@@ -7245,7 +6853,7 @@
pixel_y = 0;
req_access_txt = "0"
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/centcom/evac)
"sj" = (
/turf/unsimulated/floor{
@@ -7253,20 +6861,6 @@
icon_state = "greencorner"
},
/area/centcom/evac)
-"sk" = (
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall_s5";
- tag = "icon-swall_s5"
- },
-/area/centcom/evac)
-"sl" = (
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall_s9";
- tag = "icon-swall_s9"
- },
-/area/centcom/evac)
"sm" = (
/obj/structure/flora/ausbushes/grassybush,
/turf/unsimulated/floor{
@@ -7278,7 +6872,7 @@
/obj/structure/chair/comfy/shuttle{
dir = 4
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/centcom/evac)
"so" = (
/obj/machinery/vending/boozeomat,
@@ -7357,9 +6951,7 @@
icon_state = "tube1";
tag = "icon-tube1 (WEST)"
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/centcom/evac)
"sz" = (
/obj/structure/reagent_dispensers/beerkeg,
@@ -7390,9 +6982,7 @@
name = "Security Desk";
req_access_txt = "104"
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/centcom/evac)
"sD" = (
/obj/docking_port/stationary{
@@ -7432,9 +7022,7 @@
pixel_y = 4
},
/obj/structure/table/reinforced,
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/centcom/evac)
"sH" = (
/turf/unsimulated/wall/fakeglass{
@@ -7466,10 +7054,7 @@
name = "Infirmary";
req_access_txt = "0"
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor2";
- tag = "icon-floor2"
- },
+/turf/simulated/floor/mineral/titanium/yellow,
/area/centcom/evac)
"sM" = (
/obj/docking_port/stationary{
@@ -7536,9 +7121,7 @@
pixel_y = 0;
req_access_txt = "0"
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/centcom/evac)
"sT" = (
/obj/machinery/vending/cigarette,
@@ -7613,7 +7196,7 @@
},
/area/tdome/tdomeobserve)
"tb" = (
-/obj/machinery/door/airlock/shuttle{
+/obj/machinery/door/airlock/titanium{
id_tag = "s_docking_airlock"
},
/obj/docking_port/mobile{
@@ -7633,7 +7216,7 @@
name = "centcom bay 2";
width = 5
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/plating,
/area/shuttle/transport)
"tc" = (
/turf/unsimulated/floor{
@@ -7703,7 +7286,7 @@
req_access_txt = "0"
},
/obj/machinery/vending/snack,
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/centcom/evac)
"tl" = (
/obj/structure/chair,
@@ -7756,22 +7339,12 @@
tag = "icon-whiteblue (EAST)"
},
/area/centcom/evac)
-"tr" = (
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall14";
- tag = "icon-swall14"
- },
-/area/centcom/evac)
"ts" = (
/obj/machinery/door/airlock/hatch{
name = "Cockpit";
req_access_txt = "106"
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor2";
- tag = "icon-floor2"
- },
+/turf/simulated/floor/mineral/titanium/yellow,
/area/centcom/evac)
"tt" = (
/obj/structure/table{
@@ -7922,7 +7495,7 @@
req_access = null;
req_access_txt = "106"
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/centcom/evac)
"tG" = (
/obj/machinery/door/poddoor{
@@ -7958,18 +7531,8 @@
timid = 1;
width = 19
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
-/area/shuttle/administration)
-"tI" = (
-/obj/structure/grille,
-/obj/structure/window/full/shuttle{
- dir = 10;
- icon_state = "9"
- },
/turf/simulated/floor/plating,
-/area/centcom/evac)
+/area/shuttle/administration)
"tJ" = (
/obj/machinery/door/poddoor{
id_tag = "thunderdomegen";
@@ -8116,7 +7679,7 @@
name = "supply centcom";
width = 12
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/plating,
/area/shuttle/supply)
"tX" = (
/turf/unsimulated/floor{
@@ -8371,12 +7934,6 @@
icon_state = "gcircuit"
},
/area/centcom/control)
-"ux" = (
-/turf/simulated/shuttle/wall{
- dir = 4;
- icon_state = "diagonalWall3"
- },
-/area/shuttle/vox)
"uy" = (
/obj/machinery/computer/card/centcom,
/turf/unsimulated/floor{
@@ -9236,28 +8793,6 @@
tag = "icon-window5_end (NORTH)"
},
/area/admin)
-"vU" = (
-/turf/unsimulated/floor{
- icon_state = "floor";
- tag = "icon-floor"
- },
-/turf/simulated/shuttle/wall{
- dir = 4;
- icon_state = "diagonalWall3";
- tag = "icon-diagonalWall3 (EAST)"
- },
-/area/admin)
-"vV" = (
-/turf/unsimulated/floor{
- icon_state = "floor";
- tag = "icon-floor"
- },
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "diagonalWall3";
- tag = "icon-diagonalWall3"
- },
-/area/admin)
"vW" = (
/obj/machinery/chem_master,
/turf/unsimulated/floor{
@@ -9352,13 +8887,6 @@
tag = "icon-window5_end (WEST)"
},
/area/admin)
-"wg" = (
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall3";
- tag = "icon-swall3"
- },
-/area/shuttle/supply)
"wh" = (
/obj/machinery/recharge_station/upgraded,
/turf/unsimulated/floor{
@@ -10627,7 +10155,7 @@
},
/area/admin)
"yv" = (
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating,
/area/centcom/evac)
"yw" = (
/obj/machinery/light{
@@ -10647,7 +10175,7 @@
/area/trader_station/sol)
"yy" = (
/obj/structure/closet/emcloset,
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/centcom/evac)
"yz" = (
/obj/structure/chair/comfy/black{
@@ -10748,7 +10276,7 @@
},
/area/admin)
"yM" = (
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/centcom/evac)
"yN" = (
/turf/unsimulated/floor{
@@ -10800,7 +10328,7 @@
/obj/machinery/door/airlock/maintenance_hatch{
req_access_txt = "106"
},
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating,
/area/centcom/evac)
"yU" = (
/obj/machinery/computer/secure_data,
@@ -10827,31 +10355,23 @@
"yW" = (
/obj/structure/table/reinforced,
/obj/item/paper_bin,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/centcom/evac)
"yX" = (
/obj/structure/table/reinforced,
/obj/machinery/recharger{
pixel_y = 0
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/centcom/evac)
"yY" = (
/obj/structure/table/reinforced,
/obj/item/pen,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/centcom/evac)
"yZ" = (
/obj/structure/table/reinforced,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/centcom/evac)
"za" = (
/obj/structure/table,
@@ -10874,7 +10394,7 @@
/area/admin)
"zc" = (
/obj/machinery/computer/arcade,
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/centcom/evac)
"zd" = (
/obj/machinery/door/airlock/hatch{
@@ -10904,18 +10424,9 @@
tag = "icon-dark"
},
/area/admin)
-"zg" = (
-/obj/machinery/status_display,
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall3"
- },
-/area/shuttle/escape)
"zh" = (
/obj/machinery/computer/card,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/centcom/evac)
"zi" = (
/obj/structure/table/holotable,
@@ -10942,9 +10453,7 @@
/obj/structure/table/reinforced,
/obj/item/clipboard,
/obj/item/stamp/granted,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/centcom/evac)
"zl" = (
/obj/item/storage/toolbox/syndicate{
@@ -10985,13 +10494,11 @@
},
/area/trader_station/sol)
"zr" = (
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/centcom/evac)
"zs" = (
/obj/effect/spawner/lootdrop/trade_sol/largeitem,
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/trade/sol)
"zt" = (
/obj/structure/table/wood,
@@ -11041,9 +10548,7 @@
/obj/structure/table,
/obj/item/storage/box/handcuffs,
/obj/item/flash,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/centcom/evac)
"zy" = (
/obj/structure/table/wood,
@@ -11126,11 +10631,11 @@
req_one_access = null;
req_one_access_txt = "0"
},
-/turf/simulated/shuttle/plating/vox,
+/turf/simulated/floor/plating/nitrogen,
/area/shuttle/vox)
"zH" = (
/obj/machinery/vending/cola,
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/centcom/evac)
"zI" = (
/obj/effect/decal/cleanable/blood,
@@ -11188,9 +10693,7 @@
/area/syndicate_mothership)
"zO" = (
/obj/structure/closet/secure_closet/personal/patient,
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/centcom/evac)
"zP" = (
/obj/machinery/door/airlock{
@@ -11203,15 +10706,12 @@
},
/area/trader_station/sol)
"zQ" = (
-/obj/structure/grille,
-/obj/structure/window/full/shuttle{
- icon_state = "16"
- },
+/obj/effect/spawner/window/shuttle,
/turf/simulated/floor/plating,
/area/centcom/evac)
"zR" = (
/obj/machinery/vending/coffee,
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/centcom/evac)
"zS" = (
/obj/machinery/light{
@@ -11249,7 +10749,7 @@
name = "vox bay 1";
width = 19
},
-/turf/simulated/shuttle/plating/vox,
+/turf/simulated/floor/plating/nitrogen,
/area/shuttle/vox)
"zU" = (
/obj/machinery/door/window/southleft{
@@ -11261,22 +10761,8 @@
tag = "icon-dark"
},
/area/admin)
-"zV" = (
-/obj/structure/grille,
-/obj/structure/window/full/shuttle,
-/turf/simulated/floor/plating,
-/area/centcom/evac)
"zW" = (
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
-/area/centcom/evac)
-"zX" = (
-/obj/structure/grille,
-/obj/structure/window/full/shuttle{
- icon_state = "15"
- },
-/turf/simulated/floor/plating,
+/turf/simulated/floor/mineral/titanium,
/area/centcom/evac)
"zY" = (
/obj/structure/window/reinforced,
@@ -11434,12 +10920,6 @@
"Ap" = (
/turf/simulated/floor/plating/airless,
/area/shuttle/syndicate_elite)
-"Aq" = (
-/turf/simulated/shuttle/wall{
- dir = 1;
- icon_state = "diagonalWall3"
- },
-/area/shuttle/syndicate_sit)
"Ar" = (
/turf/unsimulated/floor{
icon_state = "dark";
@@ -11515,7 +10995,7 @@
icon_state = "heater";
tag = "icon-heater (NORTH)"
},
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating/airless,
/area/shuttle/syndicate_elite)
"Ay" = (
/obj/structure/table/reinforced,
@@ -11652,12 +11132,12 @@
/area/admin)
"AM" = (
/obj/structure/table,
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/centcom/evac)
"AN" = (
/obj/structure/table,
/obj/item/hand_labeler,
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/centcom/evac)
"AO" = (
/obj/structure/table,
@@ -11780,11 +11260,11 @@
/area/syndicate_mothership)
"Bb" = (
/obj/machinery/computer/crew,
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/centcom/evac)
"Bc" = (
/obj/machinery/computer/communications,
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/centcom/evac)
"Bd" = (
/obj/machinery/vending/coffee/free,
@@ -11803,7 +11283,7 @@
"Bf" = (
/obj/structure/table,
/obj/item/radio,
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/centcom/evac)
"Bg" = (
/obj/structure/table/wood,
@@ -11824,24 +11304,24 @@
"Bi" = (
/obj/structure/table,
/obj/item/stamp/captain,
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/centcom/evac)
"Bj" = (
/obj/machinery/computer{
name = "EMERGENCY SHUTTLE COMPUTER"
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/centcom/evac)
"Bk" = (
/obj/structure/table,
/obj/item/clipboard,
/obj/item/pen,
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/centcom/evac)
"Bl" = (
/obj/structure/table,
/obj/item/paper_bin,
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/centcom/evac)
"Bm" = (
/obj/structure/table,
@@ -11874,26 +11354,12 @@
icon_state = "carpetside"
},
/area/syndicate_mothership)
-"Bq" = (
-/obj/structure/grille,
-/obj/structure/window/full/shuttle{
- icon_state = "window4"
- },
-/turf/simulated/floor/plating,
-/area/centcom/evac)
"Br" = (
/obj/structure/chair/office/dark,
/turf/unsimulated/floor{
icon_state = "dark"
},
/area/syndicate_mothership)
-"Bs" = (
-/obj/structure/grille,
-/obj/structure/window/full/shuttle{
- icon_state = "17"
- },
-/turf/simulated/floor/plating,
-/area/centcom/evac)
"Bt" = (
/obj/structure/chair/comfy/red{
dir = 1;
@@ -12248,7 +11714,7 @@
turf_type = /turf/unsimulated/floor/snow;
width = 18
},
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating,
/area/shuttle/syndicate)
"Cf" = (
/obj/structure/kitchenspike,
@@ -12263,9 +11729,7 @@
pixel_y = 3
},
/obj/item/storage/box/trackimp,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"Cl" = (
/obj/structure/table,
@@ -12279,9 +11743,7 @@
},
/obj/item/assembly/signaler,
/obj/item/assembly/signaler,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/syndicate)
"Cm" = (
/obj/structure/table/holotable,
@@ -12290,12 +11752,6 @@
icon_state = "red"
},
/area/holodeck/source_thunderdomecourt)
-"Cq" = (
-/turf/simulated/shuttle/wall{
- dir = 4;
- icon_state = "wall3"
- },
-/area/shuttle/syndicate)
"Cw" = (
/obj/machinery/access_button{
command = "cycle_interior";
@@ -12303,9 +11759,7 @@
master_tag = "vox_west_control";
req_one_access_txt = "152"
},
-/turf/simulated/shuttle/wall{
- icon_state = "wall3"
- },
+/turf/simulated/wall/mineral/plastitanium,
/area/shuttle/vox)
"Cz" = (
/turf/simulated/floor/plasteel{
@@ -12313,12 +11767,6 @@
icon_state = "brown"
},
/area/shuttle/escape)
-"CC" = (
-/turf/simulated/shuttle/wall{
- dir = 1;
- icon_state = "diagonalWall3"
- },
-/area/shuttle/syndicate_elite)
"CD" = (
/obj/structure/table/wood,
/turf/unsimulated/floor{
@@ -12334,9 +11782,7 @@
"CG" = (
/obj/structure/table/reinforced,
/obj/item/storage/box/drinkingglasses,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"CH" = (
/turf/simulated/floor/mech_bay_recharge_floor,
@@ -12349,9 +11795,7 @@
name = "Equipment Room";
req_access_txt = "150"
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/syndicate)
"CR" = (
/turf/simulated/floor/holofloor{
@@ -12362,14 +11806,8 @@
"CT" = (
/obj/item/clothing/head/bearpelt,
/obj/item/xenos_claw,
-/turf/simulated/shuttle/floor4/vox,
+/turf/simulated/floor/mineral/plastitanium/red/nitrogen,
/area/shuttle/vox)
-"CU" = (
-/turf/simulated/shuttle/wall{
- dir = 4;
- icon_state = "diagonalWall3"
- },
-/area/shuttle/syndicate_elite)
"CV" = (
/obj/structure/table/reinforced,
/obj/item/clothing/gloves/color/latex/nitrile,
@@ -12389,22 +11827,18 @@
req_one_access = null;
req_one_access_txt = "0"
},
-/turf/simulated/shuttle/plating/vox,
+/turf/simulated/floor/plating/nitrogen,
/area/shuttle/vox)
"De" = (
/obj/effect/landmark{
name = "Nuclear-Bomb"
},
/obj/machinery/light/spot,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/syndicate)
"Dg" = (
/obj/structure/computerframe,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/syndicate)
"Dk" = (
/turf/simulated/floor/plasteel{
@@ -12419,9 +11853,7 @@
opacity = 1;
req_access_txt = "101"
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/administration)
"Dp" = (
/obj/structure/table/holotable,
@@ -12436,9 +11868,7 @@
/area/holodeck/source_thunderdomecourt)
"Dr" = (
/obj/machinery/teleport/station,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/syndicate)
"Du" = (
/obj/machinery/door_control{
@@ -12451,19 +11881,14 @@
dir = 8;
icon_state = "tube1"
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"Dv" = (
/turf/space,
/area/admin)
"Dx" = (
/obj/structure/extinguisher_cabinet,
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall3"
- },
+/turf/simulated/wall/mineral/titanium,
/area/shuttle/escape)
"Dy" = (
/obj/machinery/door/airlock/centcom{
@@ -12472,25 +11897,19 @@
opacity = 1;
req_access_txt = "101"
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"Dz" = (
/obj/structure/closet/syndicate/nuclear,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/syndicate)
"DB" = (
/obj/structure/table/reinforced,
/obj/machinery/recharger,
-/turf/simulated/shuttle/floor4,
+/turf/simulated/floor/mineral/plastitanium/red/brig,
/area/shuttle/escape)
"DC" = (
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/syndicate)
"DE" = (
/obj/structure/rack,
@@ -12498,7 +11917,7 @@
/obj/item/clothing/suit/space/vox/stealth,
/obj/item/clothing/head/helmet/space/vox/stealth,
/obj/item/clothing/mask/breath,
-/turf/simulated/shuttle/floor4/vox,
+/turf/simulated/floor/mineral/plastitanium/red/nitrogen,
/area/shuttle/vox)
"DF" = (
/obj/structure/table,
@@ -12511,9 +11930,7 @@
/obj/item/scalpel,
/obj/item/retractor,
/obj/item/FixOVein,
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/administration)
"DG" = (
/obj/machinery/embedded_controller/radio/airlock/access_controller{
@@ -12545,21 +11962,14 @@
icon_state = "propulsion_r";
tag = "icon-propulsion_r (EAST)"
},
-/turf/space,
+/turf/simulated/floor/plating/airless,
/area/shuttle/administration)
-"DJ" = (
-/obj/machinery/porta_turret/syndicate,
-/turf/simulated/shuttle/wall{
- dir = 4;
- icon_state = "wall3"
- },
-/area/shuttle/syndicate)
"DK" = (
/obj/structure/plasticflaps/mining,
/obj/machinery/conveyor/east{
id = "QMLoad2"
},
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating,
/area/shuttle/supply)
"DL" = (
/turf/unsimulated/wall/fakeglass{
@@ -12568,11 +11978,6 @@
tag = "icon-fakewindows (WEST)"
},
/area/syndicate_mothership/jail)
-"DO" = (
-/turf/simulated/shuttle/wall{
- icon_state = "diagonalWall3"
- },
-/area/shuttle/vox)
"DP" = (
/obj/machinery/light/spot{
dir = 1;
@@ -12581,17 +11986,11 @@
},
/obj/effect/spawner/lootdrop/trade_sol/donksoft,
/obj/structure/closet,
-/turf/simulated/shuttle/floor,
-/area/shuttle/trade/sol)
-"DT" = (
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall12"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/trade/sol)
"DW" = (
/obj/structure/shuttle/engine/propulsion,
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating/airless,
/area/shuttle/escape)
"DX" = (
/turf/simulated/floor/mech_bay_recharge_floor,
@@ -12606,7 +12005,7 @@
/area/syndicate_mothership/jail)
"DZ" = (
/obj/machinery/portable_atmospherics/canister/toxins,
-/turf/simulated/shuttle/floor4/vox,
+/turf/simulated/floor/mineral/plastitanium/red/nitrogen,
/area/shuttle/vox)
"Ea" = (
/obj/structure/extinguisher_cabinet{
@@ -12624,7 +12023,7 @@
/area/shuttle/escape)
"Ed" = (
/obj/machinery/computer/camera_advanced/shuttle_docker/vox,
-/turf/simulated/shuttle/floor4/vox,
+/turf/simulated/floor/mineral/plastitanium/red/nitrogen,
/area/shuttle/vox)
"Ef" = (
/turf/simulated/floor/plasteel{
@@ -12651,28 +12050,18 @@
/area/holodeck/source_basketball)
"Eo" = (
/obj/machinery/chem_master,
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/administration)
-"Er" = (
-/turf/simulated/shuttle/wall{
- dir = 1;
- icon_state = "diagonalWall3"
- },
-/area/shuttle/vox)
"Es" = (
/obj/machinery/iv_drip,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/syndicate)
"Et" = (
/obj/structure/shuttle/engine/propulsion{
icon_state = "propulsion_r";
tag = "icon-propulsion_r"
},
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating/airless,
/area/shuttle/syndicate)
"Ew" = (
/turf/simulated/floor/holofloor{
@@ -12686,7 +12075,7 @@
icon_state = "burst_r";
tag = "icon-burst_r"
},
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating/airless,
/area/shuttle/supply)
"Ez" = (
/turf/simulated/floor/holofloor{
@@ -12698,9 +12087,7 @@
"EA" = (
/obj/structure/table/reinforced,
/obj/machinery/chem_dispenser/soda,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"ED" = (
/obj/structure/toilet{
@@ -12731,39 +12118,25 @@
icon_state = "propulsion_r";
tag = "icon-propulsion_r (NORTH)"
},
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating/airless,
/area/shuttle/syndicate_sit)
"EG" = (
/obj/machinery/computer/cloning,
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
-/area/shuttle/administration)
-"EH" = (
-/turf/simulated/shuttle/wall{
- dir = 1;
- icon_state = "diagonalWall3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/administration)
"EI" = (
/obj/structure/dispenser,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"EK" = (
/obj/item/radio/intercom/syndicate{
pixel_x = -28
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/syndicate)
"EL" = (
/obj/machinery/sleeper/syndie,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/syndicate_elite)
"EM" = (
/obj/item/radio/intercom{
@@ -12801,22 +12174,18 @@
/obj/machinery/atmospherics/pipe/manifold/hidden{
dir = 4
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/syndicate)
"ET" = (
/obj/structure/closet/crate,
/obj/machinery/light/spot,
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/transport)
"EU" = (
/obj/structure/table,
/obj/item/stack/cable_coil,
/obj/item/crowbar/red,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/syndicate)
"EV" = (
/obj/machinery/light{
@@ -12830,12 +12199,12 @@
},
/area/shuttle/escape)
"EW" = (
-/turf/simulated/shuttle/plating/vox,
+/turf/simulated/floor/plating/nitrogen,
/area/shuttle/vox)
"EX" = (
/obj/structure/table/reinforced,
/obj/item/storage/fancy/donut_box,
-/turf/simulated/shuttle/floor4,
+/turf/simulated/floor/mineral/plastitanium/red/brig,
/area/shuttle/escape)
"EY" = (
/obj/machinery/door/poddoor{
@@ -12845,20 +12214,14 @@
name = "Security Doors";
opacity = 0
},
-/obj/machinery/door/airlock/shuttle/glass{
+/obj/machinery/door/airlock/titanium/glass{
id_tag = "soltrader_south";
name = "trader shuttle airlock";
req_access_txt = "160";
security_level = 6
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/trade/sol)
-"Fa" = (
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall3"
- },
-/area/shuttle/escape)
"Fb" = (
/obj/machinery/door/poddoor/preopen{
id_tag = "adminshuttleblast";
@@ -12871,9 +12234,7 @@
opacity = 1;
req_access_txt = "101"
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"Fc" = (
/obj/machinery/door/window{
@@ -12881,9 +12242,7 @@
name = "Equipment Room";
req_access_txt = "150"
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/syndicate)
"Fd" = (
/obj/structure/chair/comfy/shuttle{
@@ -12908,22 +12267,11 @@
/obj/structure/chair/comfy/shuttle{
dir = 8
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/trade/sol)
-"Fh" = (
-/turf/simulated/shuttle/wall{
- icon_state = "wall3"
- },
-/area/shuttle/syndicate_sit)
"Fi" = (
-/obj/structure/grille,
-/obj/structure/shuttle/window{
- dir = 2;
- icon = 'icons/turf/shuttle.dmi';
- icon_state = "window5_end";
- tag = "icon-window5_end"
- },
-/turf/simulated/shuttle/plating/vox,
+/obj/effect/spawner/window/plastitanium,
+/turf/simulated/floor/plating/nitrogen,
/area/shuttle/vox)
"Fk" = (
/obj/structure/chair/comfy/shuttle,
@@ -12941,14 +12289,8 @@
name = "Blast Shutters";
opacity = 0
},
-/obj/structure/grille,
-/obj/structure/shuttle/window{
- dir = 2;
- icon = 'icons/turf/shuttle.dmi';
- icon_state = "window5_end";
- tag = "icon-window5_end"
- },
-/turf/simulated/shuttle/plating/vox,
+/obj/effect/spawner/window/plastitanium,
+/turf/simulated/floor/plating/nitrogen,
/area/shuttle/vox)
"Fn" = (
/obj/structure/grille,
@@ -12969,12 +12311,10 @@
/obj/item/clothing/mask/gas,
/obj/item/tank/internals/oxygen/red,
/obj/item/clothing/mask/gas,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/syndicate)
"Fp" = (
-/obj/machinery/door/airlock/shuttle{
+/obj/machinery/door/airlock/titanium{
aiControlDisabled = 1;
hackProof = 1;
id_tag = "s_docking_airlock";
@@ -12990,7 +12330,7 @@
/obj/machinery/recharger{
pixel_y = 0
},
-/turf/simulated/shuttle/floor4/vox,
+/turf/simulated/floor/mineral/plastitanium/red/nitrogen,
/area/shuttle/vox)
"Fr" = (
/obj/structure/window/reinforced{
@@ -12999,23 +12339,18 @@
/obj/structure/table,
/obj/machinery/cell_charger,
/obj/item/weed_extract,
-/turf/simulated/shuttle/floor4/vox,
+/turf/simulated/floor/mineral/plastitanium/red/nitrogen,
/area/shuttle/vox)
-"Fs" = (
-/turf/simulated/shuttle/wall{
- icon_state = "diagonalWall3"
- },
-/area/shuttle/syndicate_elite)
"Ft" = (
/obj/structure/shuttle/engine/propulsion{
dir = 8;
icon_state = "burst_l"
},
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating/airless,
/area/shuttle/specops)
"Fu" = (
/obj/machinery/light/spot,
-/turf/simulated/shuttle/floor4/vox,
+/turf/simulated/floor/mineral/plastitanium/red/nitrogen,
/area/shuttle/vox)
"Fx" = (
/obj/structure/table/holotable,
@@ -13040,9 +12375,7 @@
/area/shuttle/escape)
"FA" = (
/obj/machinery/chem_dispenser,
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/administration)
"FF" = (
/obj/structure/table/holotable,
@@ -13057,7 +12390,7 @@
icon_state = "tube1";
tag = "icon-tube1 (NORTH)"
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/supply)
"FJ" = (
/obj/machinery/computer/secure_data,
@@ -13071,16 +12404,14 @@
/area/adminconstruction)
"FM" = (
/obj/machinery/light,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"FO" = (
/obj/item/stack/spacecash/c50,
/obj/structure/chair/comfy/shuttle{
dir = 8
},
-/turf/simulated/shuttle/floor4/vox,
+/turf/simulated/floor/mineral/plastitanium/red/nitrogen,
/area/shuttle/vox)
"FP" = (
/obj/structure/table,
@@ -13090,17 +12421,13 @@
/obj/item/assembly/voice{
pixel_y = 3
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/syndicate)
"FR" = (
/obj/machinery/door/window/northright{
name = "bar"
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"FZ" = (
/turf/simulated/floor/plasteel{
@@ -13119,14 +12446,12 @@
dir = 1
},
/obj/structure/shuttle/engine/heater,
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating/airless,
/area/shuttle/supply)
"Ge" = (
/obj/structure/table,
/obj/machinery/cell_charger,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/syndicate)
"Gf" = (
/obj/machinery/computer/communications,
@@ -13144,14 +12469,14 @@
/area/holodeck/source_desert)
"Gi" = (
/obj/item/skeleton/r_arm,
-/turf/simulated/shuttle/floor4/vox,
+/turf/simulated/floor/mineral/plastitanium/red/nitrogen,
/area/shuttle/vox)
"Gn" = (
/obj/structure/shuttle/engine/propulsion{
dir = 8;
icon_state = "burst_r"
},
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating/airless,
/area/shuttle/specops)
"Gs" = (
/obj/machinery/access_button{
@@ -13163,9 +12488,7 @@
pixel_y = 25;
req_access_txt = "0"
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/syndicate)
"Gu" = (
/obj/structure/bed,
@@ -13180,9 +12503,7 @@
pixel_x = 4;
pixel_y = 4
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"Gx" = (
/turf/simulated/floor/holofloor{
@@ -13205,21 +12526,16 @@
},
/area/shuttle/escape)
"GA" = (
-/turf/simulated/shuttle/wall{
- dir = 8;
- icon_state = "diagonalWall3"
- },
+/turf/simulated/wall/mineral/plastitanium,
/area/shuttle/syndicate_sit)
"GD" = (
/obj/machinery/computer/camera_advanced/shuttle_docker/syndicate/sst,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/syndicate_elite)
"GJ" = (
/obj/effect/spawner/lootdrop/trade_sol/civ,
/obj/structure/closet,
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/trade/sol)
"GL" = (
/obj/structure/table/reinforced,
@@ -13244,16 +12560,10 @@
},
/obj/machinery/optable,
/obj/item/organ/internal/brain,
-/turf/simulated/shuttle/floor4/vox,
+/turf/simulated/floor/mineral/plastitanium/red/nitrogen,
/area/shuttle/vox)
-"GS" = (
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall14"
- },
-/area/shuttle/trade/sol)
"GU" = (
-/turf/simulated/shuttle/floor4,
+/turf/simulated/floor/mineral/plastitanium/red/brig,
/area/shuttle/escape)
"GX" = (
/obj/structure/chair/comfy/shuttle{
@@ -13265,7 +12575,7 @@
/obj/structure/chair/comfy/shuttle{
dir = 1
},
-/turf/simulated/shuttle/floor4,
+/turf/simulated/floor/mineral/plastitanium/red/brig,
/area/shuttle/escape)
"GZ" = (
/obj/machinery/computer/security/telescreen{
@@ -13275,16 +12585,12 @@
pixel_y = 30
},
/obj/machinery/computer/shuttle/ert,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/specops)
"Ha" = (
/obj/structure/table,
/obj/machinery/kitchen_machine/microwave,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/syndicate)
"Hb" = (
/obj/structure/window/reinforced{
@@ -13295,7 +12601,7 @@
},
/area/admin)
"He" = (
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/transport)
"Hf" = (
/obj/structure/chair/comfy/shuttle{
@@ -13339,15 +12645,11 @@
pixel_x = -30;
req_access_txt = "101"
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"Ho" = (
/obj/machinery/teleport/hub/upgraded,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/syndicate)
"Hp" = (
/turf/simulated/floor/holofloor{
@@ -13393,9 +12695,7 @@
/obj/structure/chair/comfy/shuttle{
dir = 4
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/syndicate_elite)
"Hy" = (
/turf/unsimulated/floor{
@@ -13408,19 +12708,11 @@
icon_state = "white"
},
/area/tdome)
-"HA" = (
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall_f6"
- },
-/area/shuttle/escape)
"HG" = (
/obj/structure/table,
/obj/item/weldingtool/largetank,
/obj/item/multitool,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/syndicate)
"HH" = (
/obj/machinery/light{
@@ -13428,7 +12720,7 @@
on = 1
},
/obj/structure/chair/comfy/shuttle,
-/turf/simulated/shuttle/floor4,
+/turf/simulated/floor/mineral/plastitanium/red/brig,
/area/shuttle/escape)
"HJ" = (
/obj/structure/table/holotable,
@@ -13441,9 +12733,7 @@
},
/area/holodeck/source_knightarena)
"HM" = (
-/turf/simulated/shuttle/wall{
- icon_state = "wall3"
- },
+/turf/simulated/wall/mineral/plastitanium,
/area/shuttle/syndicate)
"HN" = (
/obj/machinery/light/spot{
@@ -13460,7 +12750,7 @@
name = "Escape Shuttle Cell";
req_access_txt = "2"
},
-/turf/simulated/shuttle/floor4,
+/turf/simulated/floor/mineral/plastitanium/red/brig,
/area/shuttle/escape)
"HR" = (
/obj/structure/closet/secure_closet/freezer/meat{
@@ -13478,13 +12768,6 @@
icon_state = "white"
},
/area/tdome)
-"HT" = (
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall14";
- tag = "icon-swall14"
- },
-/area/shuttle/escape)
"HU" = (
/obj/effect/decal/remains/human,
/turf/unsimulated/floor{
@@ -13493,7 +12776,7 @@
/area/syndicate_mothership/jail)
"HW" = (
/obj/structure/shuttle/engine/propulsion,
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating/airless,
/area/shuttle/supply)
"HY" = (
/obj/structure/table,
@@ -13524,7 +12807,7 @@
"Id" = (
/obj/effect/spawner/lootdrop/trade_sol/med,
/obj/structure/closet,
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/trade/sol)
"Ii" = (
/obj/structure/rack,
@@ -13555,9 +12838,7 @@
/obj/item/radio/intercom/specops{
pixel_y = -28
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/specops)
"Io" = (
/turf/unsimulated/floor{
@@ -13594,31 +12875,6 @@
"Iw" = (
/turf/simulated/floor/bluegrid,
/area/tdome/arena)
-"Ix" = (
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall7";
- tag = "icon-swall7"
- },
-/area/shuttle/escape)
-"Iy" = (
-/obj/machinery/door/poddoor/shutters{
- density = 0;
- dir = 2;
- icon_state = "open";
- id_tag = "syndieshutters";
- name = "Blast Shutters";
- opacity = 0
- },
-/obj/structure/grille,
-/obj/structure/shuttle/window{
- dir = 2;
- icon = 'icons/turf/shuttle.dmi';
- icon_state = "window5_mid";
- tag = "icon-window5_mid"
- },
-/turf/simulated/shuttle/plating,
-/area/shuttle/syndicate)
"Iz" = (
/obj/structure/chair/stool,
/turf/unsimulated/floor{
@@ -13649,24 +12905,6 @@
icon_state = "dark"
},
/area/syndicate_mothership/jail)
-"IB" = (
-/obj/machinery/door/poddoor/shutters{
- density = 0;
- dir = 4;
- icon_state = "open";
- id_tag = "voxshutters";
- name = "Blast Shutters";
- opacity = 0
- },
-/obj/structure/grille,
-/obj/structure/shuttle/window{
- dir = 4;
- icon = 'icons/turf/shuttle.dmi';
- icon_state = "window5_mid";
- tag = "icon-window5 (EAST)"
- },
-/turf/simulated/shuttle/plating/vox,
-/area/shuttle/vox)
"IE" = (
/obj/structure/holowindow{
dir = 1
@@ -13679,9 +12917,7 @@
/area/holodeck/source_knightarena)
"IF" = (
/obj/machinery/vending/boozeomat,
-/turf/simulated/shuttle/wall{
- icon_state = "wall3"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"IH" = (
/obj/structure/table/reinforced,
@@ -13721,9 +12957,7 @@
/obj/item/grenade/syndieminibomb{
pixel_x = -1
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/syndicate)
"IP" = (
/obj/structure/mirror{
@@ -13735,9 +12969,7 @@
pixel_x = 11;
pixel_y = 0
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/syndicate)
"IR" = (
/turf/simulated/floor/plasteel{
@@ -13760,9 +12992,7 @@
/area/holodeck/source_theatre)
"IV" = (
/obj/machinery/vending/cigarette,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"IW" = (
/obj/structure/table/glass,
@@ -13770,28 +13000,18 @@
/obj/item/circular_saw,
/obj/item/surgicaldrill,
/obj/item/clothing/gloves/color/latex/nitrile,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/syndicate)
"IX" = (
/obj/machinery/door/airlock/hatch{
req_access_txt = "152"
},
-/turf/simulated/shuttle/plating/vox,
+/turf/simulated/floor/plating/nitrogen,
/area/shuttle/vox)
-"IY" = (
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall_f10"
- },
-/area/shuttle/transport)
"IZ" = (
/obj/structure/table,
/obj/item/storage/lockbox/mindshield,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"Jb" = (
/obj/item/radio/intercom{
@@ -13808,42 +13028,22 @@
/obj/structure/chair/comfy/shuttle{
dir = 8
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/trade/sol)
"Ji" = (
/obj/structure/plasticflaps/mining,
/obj/machinery/conveyor/west{
id = "QMLoad"
},
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating,
/area/shuttle/supply)
-"Jj" = (
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall_f9"
- },
-/area/shuttle/trade/sol)
-"Jk" = (
-/turf/simulated/shuttle/wall{
- dir = 4;
- icon_state = "wall3"
- },
-/area/shuttle/syndicate_sit)
-"Jl" = (
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall12"
- },
-/area/shuttle/escape)
"Jn" = (
/obj/machinery/light/spot{
dir = 8;
icon_state = "tube1";
tag = "icon-tube1 (WEST)"
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"Jo" = (
/obj/item/twohanded/required/kirbyplants,
@@ -13854,9 +13054,7 @@
/area/shuttle/escape)
"Jr" = (
/obj/machinery/atmospherics/pipe/manifold4w/hidden,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/syndicate)
"Jv" = (
/obj/structure/rack,
@@ -13864,7 +13062,7 @@
/obj/item/clothing/suit/space/vox/pressure,
/obj/item/clothing/head/helmet/space/vox/pressure,
/obj/item/clothing/mask/breath,
-/turf/simulated/shuttle/floor4/vox,
+/turf/simulated/floor/mineral/plastitanium/red/nitrogen,
/area/shuttle/vox)
"Jw" = (
/turf/simulated/floor/plasteel{
@@ -13882,14 +13080,8 @@
/obj/structure/chair/comfy/shuttle{
dir = 4
},
-/turf/simulated/shuttle/floor4/vox,
+/turf/simulated/floor/mineral/plastitanium/red/nitrogen,
/area/shuttle/vox)
-"JA" = (
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall11"
- },
-/area/shuttle/escape)
"JC" = (
/obj/structure/chair/stool,
/obj/item/clothing/head/bandana{
@@ -13906,13 +13098,11 @@
/obj/machinery/sleeper/upgraded{
dir = 4
},
-/turf/simulated/shuttle/floor4/vox,
+/turf/simulated/floor/mineral/plastitanium/red/nitrogen,
/area/shuttle/vox)
"JH" = (
/obj/machinery/computer/camera_advanced/shuttle_docker/syndicate/sit,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/syndicate_sit)
"JM" = (
/obj/machinery/door/airlock/centcom{
@@ -13921,17 +13111,13 @@
opacity = 1;
req_access_txt = "101"
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"JO" = (
/obj/machinery/computer/security{
network = list("SS13","Research Outpost","Mining Outpost")
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/specops)
"JU" = (
/obj/structure/holowindow{
@@ -13944,30 +13130,24 @@
/area/holodeck/source_knightarena)
"JV" = (
/obj/machinery/computer/camera_advanced/shuttle_docker/ert,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/specops)
"Kb" = (
/obj/machinery/light/spot,
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/trade/sol)
"Kc" = (
/obj/machinery/bodyscanner,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/syndicate)
"Kd" = (
/turf/simulated/floor/plasteel{
icon_state = "neutral"
},
/area/shuttle/escape)
-"Ko" = (
-/turf/simulated/shuttle/wall{
- icon_state = "wall3"
- },
-/area/shuttle/vox)
+"Kp" = (
+/turf/simulated/floor/mineral/titanium/blue,
+/area/shuttle/trade/sol)
"Kq" = (
/obj/structure/chair/comfy/red,
/obj/effect/landmark{
@@ -13978,16 +13158,12 @@
"Kr" = (
/obj/structure/table,
/obj/item/aicard,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/syndicate)
"Ku" = (
/obj/structure/table/reinforced,
/obj/machinery/chem_dispenser/beer,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"Kv" = (
/obj/structure/chair/stool,
@@ -14001,13 +13177,11 @@
/obj/machinery/recharger{
pixel_y = 0
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/syndicate)
"Kx" = (
/obj/structure/chair/comfy/shuttle,
-/turf/simulated/shuttle/floor4,
+/turf/simulated/floor/mineral/plastitanium/red/brig,
/area/shuttle/escape)
"Ky" = (
/obj/machinery/door/poddoor/shutters{
@@ -14018,20 +13192,12 @@
name = "Blast Shutters";
opacity = 0
},
-/obj/structure/grille,
-/obj/structure/shuttle/window{
- dir = 8;
- icon = 'icons/turf/shuttle.dmi';
- icon_state = "window5_end";
- tag = "icon-window5_end (WEST)"
- },
+/obj/effect/spawner/window/plastitanium,
/turf/simulated/floor/plating,
/area/shuttle/administration)
"KA" = (
/obj/structure/chair/sofa/left,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/escape)
"KB" = (
/obj/structure/table/wood,
@@ -14047,12 +13213,10 @@
master_tag = "vox_east_control";
req_one_access_txt = "152"
},
-/turf/simulated/shuttle/wall{
- icon_state = "wall3"
- },
+/turf/simulated/wall/mineral/plastitanium,
/area/shuttle/vox)
"KD" = (
-/turf/simulated/shuttle/floor4/vox,
+/turf/simulated/floor/mineral/plastitanium/red/nitrogen,
/area/shuttle/vox)
"KF" = (
/obj/item/radio/intercom{
@@ -14063,12 +13227,12 @@
/obj/structure/chair/comfy/shuttle{
dir = 4
},
-/turf/simulated/shuttle/floor4,
+/turf/simulated/floor/mineral/plastitanium/red/brig,
/area/shuttle/escape)
"KJ" = (
/obj/effect/spawner/lootdrop/trade_sol/minerals,
/obj/structure/closet,
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/trade/sol)
"KK" = (
/obj/machinery/tcomms/relay/cc,
@@ -14084,9 +13248,7 @@
/obj/structure/chair/comfy/shuttle{
dir = 1
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"KM" = (
/obj/machinery/light/spot{
@@ -14097,9 +13259,7 @@
/obj/structure/chair/comfy/shuttle{
dir = 4
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/syndicate_elite)
"KN" = (
/obj/machinery/recharger/wallcharger{
@@ -14112,113 +13272,71 @@
tag = "icon-tube1 (NORTH)"
},
/obj/structure/chair/comfy/shuttle,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/specops)
"KO" = (
/obj/item/storage/box/zipties,
-/turf/simulated/shuttle/floor4/vox,
+/turf/simulated/floor/mineral/plastitanium/red/nitrogen,
/area/shuttle/vox)
"KQ" = (
/obj/structure/chair/comfy/shuttle,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/syndicate_elite)
"KR" = (
/obj/machinery/light/small,
/obj/structure/chair/comfy/shuttle{
dir = 1
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/assault_pod)
"KS" = (
/obj/item/storage/toolbox/mechanical,
/obj/item/multitool,
/obj/structure/table,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"KT" = (
/obj/item/storage/toolbox/syndicate,
-/turf/simulated/shuttle/floor4/vox,
-/area/shuttle/vox)
-"KV" = (
-/obj/machinery/door/poddoor/shutters{
- density = 0;
- dir = 4;
- icon_state = "open";
- id_tag = "voxshutters";
- name = "Blast Shutters";
- opacity = 0
- },
-/obj/structure/grille,
-/obj/structure/shuttle/window{
- dir = 4;
- icon = 'icons/turf/shuttle.dmi';
- icon_state = "window5_end";
- tag = "icon-window5_end (EAST)"
- },
-/turf/simulated/shuttle/plating/vox,
+/turf/simulated/floor/mineral/plastitanium/red/nitrogen,
/area/shuttle/vox)
"KW" = (
/obj/machinery/light/small{
dir = 1
},
/obj/structure/chair/comfy/shuttle,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/assault_pod)
"KX" = (
/obj/structure/chair/comfy/shuttle{
dir = 4
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/assault_pod)
"KY" = (
/obj/structure/chair/comfy/shuttle{
dir = 8
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/assault_pod)
"KZ" = (
/obj/structure/shuttle/engine/propulsion/burst{
dir = 8
},
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall_f6";
- tag = "icon-swall_f6"
- },
+/turf/simulated/wall/mineral/titanium,
/area/shuttle/transport)
"Lb" = (
/obj/item/radio/intercom/syndicate{
pixel_y = -28
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/syndicate)
"Lc" = (
/obj/structure/computerframe,
/obj/item/paper/synditele,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/syndicate)
"Ld" = (
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"Lf" = (
/turf/simulated/floor/holofloor{
@@ -14233,9 +13351,7 @@
icon_state = "tube1";
tag = "icon-tube1 (EAST)"
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"Lj" = (
/obj/machinery/light/spot{
@@ -14243,9 +13359,7 @@
icon_state = "tube1";
tag = "icon-tube1 (WEST)"
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/syndicate)
"Ll" = (
/turf/simulated/floor/holofloor{
@@ -14262,22 +13376,16 @@
name = "Blast Shutters";
opacity = 0
},
-/obj/structure/grille,
-/obj/structure/shuttle/window{
- dir = 8;
- icon = 'icons/turf/shuttle.dmi';
- icon_state = "window5_end";
- tag = "icon-window5_end (WEST)"
- },
-/turf/simulated/shuttle/plating/vox,
+/obj/effect/spawner/window/plastitanium,
+/turf/simulated/floor/plating/nitrogen,
/area/shuttle/vox)
"Ln" = (
-/obj/machinery/door/airlock/shuttle/glass{
+/obj/machinery/door/airlock/titanium/glass{
name = "trader shuttle airlock";
req_access_txt = "160";
security_level = 6
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/trade/sol)
"Lp" = (
/obj/structure/table/reinforced,
@@ -14291,9 +13399,7 @@
},
/area/shuttle/escape)
"Lt" = (
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/specops)
"Lx" = (
/obj/structure/shuttle/engine/propulsion{
@@ -14301,7 +13407,7 @@
icon_state = "propulsion_r";
tag = "icon-propulsion_r (NORTH)"
},
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating/airless,
/area/shuttle/syndicate_elite)
"Lz" = (
/obj/structure/holowindow{
@@ -14320,24 +13426,18 @@
icon_state = "tube1";
tag = "icon-tube1 (WEST)"
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"LD" = (
/obj/structure/table,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"LF" = (
/obj/machinery/door/window/brigdoor/westleft{
color = "#d70000";
req_access_txt = "104"
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"LG" = (
/turf/simulated/floor/holofloor{
@@ -14366,20 +13466,8 @@
/obj/machinery/autolathe/upgraded{
hacked = 1
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
-"LP" = (
-/obj/structure/shuttle/engine/propulsion/burst{
- dir = 8
- },
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall_f5";
- tag = "icon-swall_f5"
- },
-/area/shuttle/transport)
"LR" = (
/obj/machinery/computer/emergency_shuttle,
/turf/simulated/floor/plasteel{
@@ -14387,11 +13475,6 @@
icon_state = "darkblue"
},
/area/shuttle/escape)
-"LY" = (
-/turf/simulated/shuttle/wall{
- icon_state = "wall3"
- },
-/area/shuttle/syndicate_elite)
"LZ" = (
/obj/mecha/combat/marauder/seraph/loaded,
/obj/effect/decal/warning_stripes/yellow,
@@ -14422,31 +13505,11 @@
/obj/item/clothing/suit/space/vox/medic,
/obj/item/clothing/head/helmet/space/vox/medic,
/obj/item/clothing/mask/breath,
-/turf/simulated/shuttle/floor4/vox,
+/turf/simulated/floor/mineral/plastitanium/red/nitrogen,
/area/shuttle/vox)
"Mi" = (
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/syndicate_sit)
-"Mm" = (
-/obj/machinery/door/poddoor/shutters{
- density = 0;
- dir = 8;
- icon_state = "open";
- id_tag = "voxshutters";
- name = "Blast Shutters";
- opacity = 0
- },
-/obj/structure/grille,
-/obj/structure/shuttle/window{
- dir = 4;
- icon = 'icons/turf/shuttle.dmi';
- icon_state = "window5_mid";
- tag = "icon-window5 (EAST)"
- },
-/turf/simulated/shuttle/plating/vox,
-/area/shuttle/vox)
"Mo" = (
/obj/structure/table,
/obj/item/circular_saw,
@@ -14479,7 +13542,7 @@
req_access_txt = "150"
},
/obj/structure/fans/tiny,
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating,
/area/shuttle/syndicate_elite)
"Mt" = (
/obj/machinery/door/airlock/external{
@@ -14488,15 +13551,10 @@
req_access_txt = "109"
},
/obj/structure/fans/tiny,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/plating,
/area/shuttle/specops)
-"Mv" = (
-/turf/simulated/shuttle/wall{
- dir = 1;
- icon_state = "diagonalWall3"
- },
+"Mu" = (
+/turf/simulated/wall/mineral/plastitanium/nodiagonal,
/area/shuttle/syndicate)
"Mw" = (
/obj/structure/window/reinforced{
@@ -14506,7 +13564,7 @@
/obj/item/scalpel,
/obj/item/stack/cable_coil,
/obj/item/storage/firstaid/regular,
-/turf/simulated/shuttle/floor4/vox,
+/turf/simulated/floor/mineral/plastitanium/red/nitrogen,
/area/shuttle/vox)
"My" = (
/obj/item/twohanded/required/kirbyplants,
@@ -14522,9 +13580,7 @@
/obj/item/stack/sheet/metal,
/obj/item/clothing/glasses/welding,
/obj/item/weldingtool,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/syndicate_sit)
"MB" = (
/obj/machinery/light/spot{
@@ -14532,18 +13588,11 @@
icon_state = "tube1";
tag = "icon-tube1 (NORTH)"
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/trade/sol)
-"MD" = (
-/turf/simulated/shuttle/wall{
- icon_state = "diagonalWall3"
- },
-/area/shuttle/syndicate_sit)
"ME" = (
/obj/structure/chair/stool/bar,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"MF" = (
/obj/machinery/door/airlock/centcom{
@@ -14552,9 +13601,7 @@
opacity = 1;
req_access_txt = "104"
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"MG" = (
/obj/effect/landmark{
@@ -14566,7 +13613,7 @@
/area/syndicate_mothership/jail)
"MH" = (
/obj/structure/shuttle/engine/propulsion,
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating/airless,
/area/shuttle/syndicate)
"MI" = (
/obj/item/twohanded/required/kirbyplants,
@@ -14582,15 +13629,10 @@
},
/obj/structure/table,
/obj/item/circular_saw,
-/turf/simulated/shuttle/floor4/vox,
+/turf/simulated/floor/mineral/plastitanium/red/nitrogen,
/area/shuttle/vox)
-"MO" = (
-/turf/simulated/shuttle/wall{
- icon_state = "diagonalWall3"
- },
-/area/shuttle/syndicate)
"MP" = (
-/obj/machinery/door/airlock/shuttle/glass{
+/obj/machinery/door/airlock/titanium/glass{
name = "Shuttle Cargo Hatch"
},
/turf/simulated/floor/plasteel,
@@ -14608,29 +13650,23 @@
icon_state = "blue"
},
/area/shuttle/escape)
-"MU" = (
-/turf/simulated/shuttle/wall{
- dir = 1;
- icon_state = "diagonalWall3"
- },
-/area/shuttle/specops)
"MV" = (
/obj/structure/chair/comfy/shuttle{
dir = 4
},
-/turf/simulated/shuttle/floor4,
+/turf/simulated/floor/mineral/plastitanium/red/brig,
/area/shuttle/escape)
"MY" = (
/obj/item/tank/internals/emergency_oxygen,
/obj/item/clothing/mask/breath,
-/turf/simulated/shuttle/floor4/vox,
+/turf/simulated/floor/mineral/plastitanium/red/nitrogen,
/area/shuttle/vox)
"MZ" = (
/obj/machinery/light/spot,
/obj/structure/chair/comfy/shuttle{
dir = 1
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/transport)
"Nb" = (
/obj/machinery/light/spot{
@@ -14638,18 +13674,14 @@
icon_state = "tube1";
tag = "icon-tube1 (WEST)"
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/syndicate_sit)
"Ng" = (
/obj/structure/window/plasmareinforced{
color = "#FF0000";
dir = 8
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"Nl" = (
/obj/machinery/clonepod/upgraded,
@@ -14658,9 +13690,7 @@
icon_state = "tube1";
tag = "icon-tube1 (NORTH)"
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/administration)
"Nn" = (
/obj/machinery/computer/crew,
@@ -14675,13 +13705,11 @@
/obj/item/rcd_ammo,
/obj/item/rcd_ammo,
/obj/item/rcd_ammo,
-/turf/simulated/shuttle/floor4/vox,
+/turf/simulated/floor/mineral/plastitanium/red/nitrogen,
/area/shuttle/vox)
"Nr" = (
/obj/structure/reagent_dispensers/watertank,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"Nv" = (
/obj/machinery/light/spot{
@@ -14703,9 +13731,7 @@
/area/shuttle/escape)
"Ny" = (
/obj/machinery/optable,
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/administration)
"Nz" = (
/obj/effect/decal/warning_stripes/northwest,
@@ -14724,14 +13750,12 @@
dir = 4;
icon_state = "tube1"
},
-/turf/simulated/shuttle/plating/vox,
+/turf/simulated/floor/plating/nitrogen,
/area/shuttle/vox)
"NC" = (
/obj/item/ashtray/glass,
/obj/structure/table,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"ND" = (
/obj/structure/table/reinforced,
@@ -14747,7 +13771,7 @@
/obj/item/clothing/suit/space/vox/carapace,
/obj/item/clothing/head/helmet/space/vox/carapace,
/obj/item/clothing/mask/breath,
-/turf/simulated/shuttle/floor4/vox,
+/turf/simulated/floor/mineral/plastitanium/red/nitrogen,
/area/shuttle/vox)
"NF" = (
/obj/machinery/bsa/full/admin/east,
@@ -14765,12 +13789,6 @@
icon_state = "dark"
},
/area/syndicate_mothership/jail)
-"NH" = (
-/turf/simulated/shuttle/wall{
- dir = 4;
- icon_state = "diagonalWall3"
- },
-/area/shuttle/specops)
"NI" = (
/obj/effect/decal/warning_stripes/north,
/turf/unsimulated/floor{
@@ -14783,29 +13801,14 @@
name = "plating"
},
/area/centcom/control)
-"NK" = (
-/obj/structure/grille,
-/obj/structure/shuttle/window{
- dir = 1;
- icon = 'icons/turf/shuttle.dmi';
- icon_state = "window5_end";
- tag = "icon-window5_end (NORTH)"
- },
-/turf/simulated/shuttle/plating/vox,
-/area/shuttle/vox)
"NL" = (
/obj/machinery/porta_turret/syndicate,
-/turf/simulated/shuttle/wall{
- dir = 8;
- icon_state = "diagonalWall3"
- },
+/turf/simulated/wall/mineral/plastitanium,
/area/shuttle/syndicate)
"NM" = (
/obj/structure/table,
/obj/item/storage/box/syndidonkpockets,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/syndicate)
"NN" = (
/obj/machinery/door/poddoor/shutters{
@@ -14816,14 +13819,8 @@
name = "Blast Shutters";
opacity = 0
},
-/obj/structure/grille,
-/obj/structure/shuttle/window{
- dir = 8;
- icon = 'icons/turf/shuttle.dmi';
- icon_state = "window5_end";
- tag = "icon-window5_end (WEST)"
- },
-/turf/simulated/shuttle/plating/vox,
+/obj/effect/spawner/window/plastitanium,
+/turf/simulated/floor/plating/nitrogen,
/area/shuttle/vox)
"NP" = (
/obj/structure/window/reinforced{
@@ -14833,7 +13830,7 @@
dir = 8;
icon_state = "heater"
},
-/turf/unsimulated/floor,
+/turf/simulated/floor/plating/airless,
/area/shuttle/specops)
"NW" = (
/turf/unsimulated/wall/fakeglass{
@@ -14841,12 +13838,6 @@
icon_state = "fakewindows"
},
/area/syndicate_mothership/jail)
-"NX" = (
-/turf/simulated/shuttle/wall{
- dir = 4;
- icon_state = "diagonalWall3"
- },
-/area/shuttle/syndicate_sit)
"NY" = (
/obj/machinery/light/spot{
dir = 1;
@@ -14856,21 +13847,19 @@
/obj/structure/chair/comfy/shuttle{
dir = 4
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/transport)
"NZ" = (
/obj/structure/chair/comfy/shuttle{
dir = 1
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/syndicate)
"Oe" = (
/turf/simulated/floor/plasteel,
/area/shuttle/escape)
"Of" = (
-/obj/machinery/door/airlock/shuttle/glass{
+/obj/machinery/door/airlock/titanium/glass{
name = "Emergency Airlock Access";
req_one_access_txt = "2;19"
},
@@ -14884,9 +13873,7 @@
/area/centcom/control)
"Oj" = (
/obj/machinery/computer/camera_advanced/shuttle_docker/syndicate,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/syndicate)
"Ok" = (
/obj/structure/closet/crate,
@@ -14954,9 +13941,7 @@
/area/syndicate_mothership/jail)
"Ow" = (
/obj/machinery/iv_drip,
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/administration)
"Oy" = (
/obj/machinery/door/airlock/medical/glass{
@@ -14987,26 +13972,22 @@
master_tag = "vox_west_control";
req_one_access_txt = "152"
},
-/turf/simulated/shuttle/wall{
- icon_state = "wall3"
- },
+/turf/simulated/wall/mineral/plastitanium,
/area/shuttle/vox)
"OE" = (
/obj/structure/closet/syndicate/personal,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/syndicate)
"OF" = (
/obj/structure/shuttle/engine/propulsion{
dir = 8;
icon_state = "burst_r"
},
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating/airless,
/area/shuttle/trade/sol)
"OG" = (
/obj/item/broken_bottle,
-/turf/simulated/shuttle/floor4/vox,
+/turf/simulated/floor/mineral/plastitanium/red/nitrogen,
/area/shuttle/vox)
"OJ" = (
/obj/machinery/light,
@@ -15017,20 +13998,6 @@
icon_state = "dark"
},
/area/shuttle/escape)
-"OK" = (
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall8";
- tag = "icon-swall12"
- },
-/area/shuttle/trade/sol)
-"OO" = (
-/obj/structure/grille,
-/obj/structure/window/full/shuttle{
- icon_state = "8"
- },
-/turf/simulated/floor/plating,
-/area/shuttle/escape)
"OP" = (
/obj/effect/decal/warning_stripes/yellow/partial{
dir = 8
@@ -15046,9 +14013,7 @@
/obj/structure/chair/comfy/shuttle{
dir = 8
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/syndicate_elite)
"OT" = (
/turf/simulated/floor/holofloor{
@@ -15057,23 +14022,10 @@
tag = "icon-asteroid2 (EAST)"
},
/area/holodeck/source_desert)
-"OY" = (
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall3";
- tag = "icon-swall3"
- },
-/area/shuttle/transport)
"OZ" = (
/obj/machinery/light/spot,
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/supply)
-"Pc" = (
-/turf/simulated/shuttle/wall{
- dir = 4;
- icon_state = "wall3"
- },
-/area/shuttle/syndicate_elite)
"Pg" = (
/obj/structure/extinguisher_cabinet{
pixel_x = -28
@@ -15088,16 +14040,12 @@
/obj/structure/chair/comfy/shuttle{
dir = 8
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/syndicate_sit)
"Pj" = (
/obj/machinery/kitchen_machine/microwave/upgraded,
/obj/structure/table,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"Pl" = (
/obj/machinery/light/spot{
@@ -15106,9 +14054,7 @@
tag = "icon-tube1 (WEST)"
},
/obj/machinery/suit_storage_unit/syndicate/secure,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/syndicate)
"Pn" = (
/obj/mecha/combat/marauder/loaded,
@@ -15124,7 +14070,7 @@
/obj/structure/table,
/obj/item/broken_device,
/obj/item/robot_parts/chest,
-/turf/simulated/shuttle/floor4/vox,
+/turf/simulated/floor/mineral/plastitanium/red/nitrogen,
/area/shuttle/vox)
"Pq" = (
/turf/simulated/floor/plasteel{
@@ -15140,16 +14086,14 @@
/area/syndicate_mothership/jail)
"Px" = (
/obj/machinery/door/airlock/public/glass,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"PD" = (
/obj/structure/shuttle/engine/propulsion{
dir = 8;
icon_state = "propulsion"
},
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating/airless,
/area/shuttle/trade/sol)
"PE" = (
/obj/structure/table,
@@ -15157,9 +14101,7 @@
amount = 10
},
/obj/item/multitool,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/syndicate)
"PF" = (
/obj/structure/rack,
@@ -15174,7 +14116,7 @@
icon_state = "tube1";
tag = "icon-tube1 (EAST)"
},
-/turf/simulated/shuttle/floor4/vox,
+/turf/simulated/floor/mineral/plastitanium/red/nitrogen,
/area/shuttle/vox)
"PG" = (
/obj/machinery/embedded_controller/radio/airlock/airlock_controller{
@@ -15187,7 +14129,7 @@
tag_exterior_door = "vox_northwest_lock";
tag_interior_door = "vox_southwest_lock"
},
-/turf/simulated/shuttle/plating/vox,
+/turf/simulated/floor/plating/nitrogen,
/area/shuttle/vox)
"PJ" = (
/obj/effect/decal/warning_stripes/west,
@@ -15195,19 +14137,9 @@
name = "plating"
},
/area/centcom/specops)
-"PL" = (
-/obj/structure/grille,
-/obj/structure/window/full/shuttle{
- icon_state = "15"
- },
-/turf/simulated/floor/plating,
-/area/shuttle/escape)
"PM" = (
/obj/machinery/status_display,
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall12"
- },
+/turf/simulated/wall/mineral/titanium,
/area/shuttle/escape)
"PN" = (
/obj/machinery/door/airlock/external{
@@ -15216,9 +14148,7 @@
req_access_txt = "101"
},
/obj/structure/fans/tiny,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/plating,
/area/shuttle/administration)
"PO" = (
/obj/structure/table,
@@ -15227,14 +14157,12 @@
pixel_y = 3
},
/obj/item/stock_parts/cell/high,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/syndicate)
"PS" = (
/obj/effect/spawner/lootdrop/trade_sol/eng,
/obj/structure/closet,
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/trade/sol)
"PT" = (
/obj/structure/closet/crate/engineering,
@@ -15254,9 +14182,7 @@
/area/shuttle/escape)
"PU" = (
/obj/machinery/computer/shuttle/sit,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/syndicate_sit)
"PX" = (
/obj/item/radio/intercom{
@@ -15271,12 +14197,6 @@
icon_state = "cmo"
},
/area/shuttle/escape)
-"PY" = (
-/turf/simulated/shuttle/wall{
- dir = 4;
- icon_state = "wall3"
- },
-/area/shuttle/vox)
"Qa" = (
/obj/machinery/mech_bay_recharge_port,
/turf/simulated/floor/plasteel{
@@ -15297,20 +14217,12 @@
icon_state = "propulsion_l";
tag = "icon-propulsion_l (NORTH)"
},
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating/airless,
/area/shuttle/syndicate_elite)
"Qf" = (
/obj/machinery/portable_atmospherics/canister/oxygen,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/syndicate_elite)
-"Qg" = (
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall13"
- },
-/area/shuttle/trade/sol)
"Qh" = (
/obj/structure/window/reinforced{
dir = 1
@@ -15319,7 +14231,7 @@
/mob/living/simple_animal/bot/floorbot{
on = 0
},
-/turf/simulated/shuttle/floor4/vox,
+/turf/simulated/floor/mineral/plastitanium/red/nitrogen,
/area/shuttle/vox)
"Qm" = (
/obj/machinery/door/window{
@@ -15327,14 +14239,10 @@
name = "Tool Storage";
req_access_txt = "150"
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/syndicate)
"Qr" = (
-/turf/simulated/shuttle/wall{
- icon_state = "wall3"
- },
+/turf/simulated/wall/mineral/plastitanium/nodiagonal,
/area/shuttle/administration)
"Qt" = (
/obj/machinery/poolcontroller/invisible,
@@ -15365,17 +14273,13 @@
/obj/item/storage/firstaid/regular,
/obj/item/storage/firstaid/adv,
/obj/item/storage/box/syndie_kit/bonerepair,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/syndicate)
"Qy" = (
/obj/structure/chair/comfy/shuttle{
dir = 4
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/syndicate_sit)
"QB" = (
/obj/structure/table/holotable,
@@ -15398,9 +14302,7 @@
/area/shuttle/escape)
"QE" = (
/obj/structure/chair/sofa/right,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/escape)
"QG" = (
/obj/structure/table/reinforced,
@@ -15423,9 +14325,7 @@
/area/shuttle/escape)
"QI" = (
/obj/structure/chair/sofa,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/escape)
"QK" = (
/obj/machinery/light/spot{
@@ -15433,9 +14333,7 @@
icon_state = "tube1";
tag = "icon-tube1 (WEST)"
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/specops)
"QL" = (
/obj/structure/table,
@@ -15448,12 +14346,6 @@
icon_state = "dark"
},
/area/syndicate_mothership/jail)
-"QO" = (
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall_f10"
- },
-/area/shuttle/escape)
"QQ" = (
/turf/simulated/floor/holofloor{
dir = 2;
@@ -15467,9 +14359,7 @@
frequency = 1331;
id_tag = "synd_pump"
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/syndicate)
"QT" = (
/obj/structure/flora/ausbushes/ywflowers,
@@ -15484,14 +14374,8 @@
name = "Blast Shutters";
opacity = 0
},
-/obj/structure/grille,
-/obj/structure/shuttle/window{
- dir = 2;
- icon = 'icons/turf/shuttle.dmi';
- icon_state = "window5_end";
- tag = "icon-window5_end"
- },
-/turf/simulated/shuttle/plating,
+/obj/effect/spawner/window/plastitanium,
+/turf/simulated/floor/plating,
/area/shuttle/syndicate)
"QV" = (
/obj/item/clothing/under/rainbow,
@@ -15511,9 +14395,7 @@
/obj/structure/chair/comfy/shuttle{
dir = 1
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"Re" = (
/obj/machinery/light/spot{
@@ -15524,9 +14406,7 @@
/obj/machinery/sleeper/syndie{
dir = 4
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/syndicate)
"Rf" = (
/obj/structure/chair{
@@ -15543,7 +14423,7 @@
icon_state = "heater";
tag = "icon-heater (NORTH)"
},
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating/airless,
/area/shuttle/syndicate_sit)
"Ri" = (
/turf/unsimulated/wall/fakeglass{
@@ -15562,9 +14442,7 @@
pixel_y = 32
},
/obj/structure/chair/comfy/shuttle,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/specops)
"Rn" = (
/obj/machinery/light/spot{
@@ -15588,12 +14466,15 @@
pixel_y = -8;
req_access_txt = "0"
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/supply)
+"Rp" = (
+/turf/simulated/wall/mineral/plastitanium,
+/area/shuttle/administration)
"Rq" = (
/obj/item/stack/spacecash/c1000,
/obj/item/stack/spacecash/c500,
-/turf/simulated/shuttle/floor4/vox,
+/turf/simulated/floor/mineral/plastitanium/red/nitrogen,
/area/shuttle/vox)
"Rs" = (
/obj/structure/chair/comfy/shuttle{
@@ -15623,32 +14504,12 @@
tag_exterior_door = "vox_northeast_lock";
tag_interior_door = "vox_southeast_lock"
},
-/turf/simulated/shuttle/plating/vox,
+/turf/simulated/floor/plating/nitrogen,
/area/shuttle/vox)
"Ry" = (
/obj/machinery/bodyscanner,
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/administration)
-"Rz" = (
-/obj/machinery/door/poddoor/shutters{
- density = 0;
- dir = 2;
- icon_state = "open";
- id_tag = "syndieshutters";
- name = "Blast Shutters";
- opacity = 0
- },
-/obj/structure/grille,
-/obj/structure/shuttle/window{
- dir = 1;
- icon = 'icons/turf/shuttle.dmi';
- icon_state = "window5_end";
- tag = "icon-window5_end (NORTH)"
- },
-/turf/simulated/shuttle/plating,
-/area/shuttle/syndicate)
"RD" = (
/obj/effect/decal/warning_stripes/south,
/turf/unsimulated/floor{
@@ -15661,7 +14522,7 @@
icon_state = "propulsion";
tag = "icon-propulsion (NORTH)"
},
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating/airless,
/area/shuttle/syndicate_sit)
"RJ" = (
/turf/simulated/floor/plasteel{
@@ -15679,7 +14540,7 @@
/obj/machinery/light/spot,
/obj/effect/spawner/lootdrop/trade_sol/serv,
/obj/structure/closet,
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/trade/sol)
"RR" = (
/obj/machinery/door/window/brigdoor{
@@ -15687,9 +14548,7 @@
name = "Cell Door";
req_access_txt = "150"
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/syndicate_sit)
"RU" = (
/obj/effect/overlay/palmtree_l,
@@ -15704,9 +14563,7 @@
/area/space)
"RY" = (
/obj/machinery/vending/medical,
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/administration)
"RZ" = (
/obj/effect/spawner/window/reinforced,
@@ -15718,7 +14575,7 @@
name = "Privacy Shutters";
opacity = 0
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/trade/sol)
"Sa" = (
/obj/structure/chair/office/dark,
@@ -15730,21 +14587,10 @@
/obj/machinery/sleeper/upgraded{
dir = 4
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/administration)
-"Se" = (
-/obj/structure/sign/greencross,
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall3"
- },
-/area/shuttle/escape)
"Sf" = (
-/turf/simulated/shuttle/wall{
- icon_state = "wall3"
- },
+/turf/simulated/wall/mineral/plastitanium,
/area/shuttle/escape)
"Sj" = (
/obj/structure/rack,
@@ -15755,15 +14601,13 @@
frequency = 1331;
id_tag = "synd_pump"
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/syndicate)
"Sl" = (
/obj/structure/chair/comfy/shuttle{
dir = 8
},
-/turf/simulated/shuttle/floor4/vox,
+/turf/simulated/floor/mineral/plastitanium/red/nitrogen,
/area/shuttle/vox)
"Sn" = (
/obj/structure/sign/securearea{
@@ -15773,15 +14617,10 @@
name = "EXTERNAL AIRLOCK";
pixel_x = 0
},
-/turf/simulated/shuttle/wall{
- icon_state = "wall3"
- },
+/turf/simulated/wall/mineral/plastitanium,
/area/shuttle/syndicate)
"So" = (
-/turf/simulated/shuttle/wall{
- dir = 8;
- icon_state = "diagonalWall3"
- },
+/turf/simulated/wall/mineral/plastitanium,
/area/shuttle/syndicate_elite)
"Sp" = (
/obj/item/flag/med,
@@ -15792,9 +14631,7 @@
/area/shuttle/escape)
"Sq" = (
/obj/structure/chair/comfy/shuttle,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/syndicate_sit)
"Ss" = (
/turf/simulated/floor/holofloor{
@@ -15808,34 +14645,27 @@
/area/shuttle/escape)
"Su" = (
/obj/structure/table/reinforced,
-/turf/simulated/shuttle/floor4,
+/turf/simulated/floor/mineral/plastitanium/red/brig,
/area/shuttle/escape)
"Sv" = (
/obj/machinery/atmospherics/unary/tank/air{
dir = 2
},
-/turf/simulated/shuttle/wall{
- dir = 4;
- icon_state = "wall3"
- },
+/turf/simulated/wall/mineral/plastitanium,
/area/shuttle/syndicate)
"SA" = (
/obj/machinery/computer/shuttle/vox,
-/turf/simulated/shuttle/floor4/vox,
+/turf/simulated/floor/mineral/plastitanium/red/nitrogen,
/area/shuttle/vox)
"SB" = (
/obj/structure/table,
/obj/item/wrench,
/obj/item/assembly/infra,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/syndicate)
"SF" = (
/obj/machinery/computer/scan_consolenew,
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/administration)
"SH" = (
/obj/machinery/light/spot{
@@ -15843,7 +14673,7 @@
icon_state = "tube1";
tag = "icon-tube1 (WEST)"
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/supply)
"SI" = (
/obj/machinery/door/airlock/hatch/syndicate{
@@ -15860,39 +14690,24 @@
/obj/item/twohanded/required/kirbyplants,
/turf/simulated/floor/plasteel,
/area/shuttle/escape)
-"SM" = (
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall_f5";
- tag = "icon-swall_f5"
- },
-/area/shuttle/supply)
"SN" = (
/obj/machinery/sleeper/syndie{
dir = 4
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/syndicate_elite)
"SP" = (
/obj/structure/shuttle/engine/propulsion{
icon_state = "burst_l";
tag = "icon-burst_l"
},
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating/airless,
/area/shuttle/supply)
"ST" = (
/obj/effect/spawner/lootdrop/trade_sol/sci,
/obj/structure/closet,
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/trade/sol)
-"SW" = (
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall_f9"
- },
-/area/shuttle/escape)
"SY" = (
/obj/structure/table/holotable,
/obj/item/clothing/suit/armor/riot/knight/blue,
@@ -15903,11 +14718,6 @@
icon_state = "blue"
},
/area/holodeck/source_knightarena)
-"Td" = (
-/turf/simulated/shuttle/wall{
- icon_state = "swallc3"
- },
-/area/shuttle/trade/sol)
"Te" = (
/obj/machinery/teleport/hub/upgraded{
admin_usage = 1
@@ -15963,7 +14773,7 @@
/obj/structure/chair/comfy/shuttle{
dir = 8
},
-/turf/simulated/shuttle/floor4,
+/turf/simulated/floor/mineral/plastitanium/red/brig,
/area/shuttle/escape)
"To" = (
/obj/structure/table,
@@ -15971,23 +14781,13 @@
pixel_x = 2;
pixel_y = 1
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
-/area/shuttle/syndicate)
-"Tw" = (
-/turf/simulated/shuttle/wall{
- dir = 8;
- icon_state = "diagonalWall3"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/syndicate)
"Ty" = (
/obj/structure/chair/comfy/shuttle{
dir = 8
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/syndicate)
"Tz" = (
/turf/simulated/floor/holofloor{
@@ -16009,15 +14809,11 @@
},
/area/shuttle/escape)
"TC" = (
-/obj/structure/shuttle/window,
-/obj/structure/grille,
-/turf/simulated/shuttle/plating,
+/obj/effect/spawner/window/shuttle,
+/turf/simulated/floor/plating,
/area/shuttle/transport)
"TD" = (
-/turf/simulated/shuttle/wall{
- dir = 8;
- icon_state = "diagonalWall3"
- },
+/turf/simulated/wall/mineral/plastitanium,
/area/shuttle/vox)
"TE" = (
/obj/structure/rack,
@@ -16027,20 +14823,15 @@
/obj/item/tank/internals/nitrogen,
/obj/item/tank/internals/nitrogen,
/obj/item/tank/internals/nitrogen,
-/turf/simulated/shuttle/floor4/vox,
+/turf/simulated/floor/mineral/plastitanium/red/nitrogen,
/area/shuttle/vox)
"TF" = (
/obj/structure/shuttle/engine/propulsion{
dir = 8;
icon_state = "burst_l"
},
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating/airless,
/area/shuttle/trade/sol)
-"TO" = (
-/turf/simulated/shuttle/wall{
- icon_state = "diagonalWall3"
- },
-/area/shuttle/administration)
"TQ" = (
/obj/structure/holowindow,
/turf/simulated/floor/holofloor{
@@ -16051,9 +14842,7 @@
/area/holodeck/source_knightarena)
"TR" = (
/obj/machinery/recharge_station/upgraded,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/syndicate)
"TT" = (
/obj/structure/flora/ausbushes/grassybush,
@@ -16065,10 +14854,7 @@
/area/shuttle/escape)
"TU" = (
/obj/machinery/ai_status_display,
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall3"
- },
+/turf/simulated/wall/mineral/titanium,
/area/shuttle/escape)
"TX" = (
/turf/simulated/floor/holofloor{
@@ -16081,7 +14867,7 @@
/obj/structure/window/reinforced{
dir = 1
},
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating/airless,
/area/shuttle/escape)
"Ub" = (
/obj/machinery/light,
@@ -16095,9 +14881,7 @@
/area/shuttle/escape)
"Ud" = (
/obj/effect/decal/remains/human,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/syndicate_sit)
"Uf" = (
/obj/structure/chair/office/dark{
@@ -16113,34 +14897,23 @@
pixel_x = 5
},
/obj/structure/table,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"Ui" = (
-/obj/structure/grille,
-/obj/structure/window/full/shuttle,
+/obj/effect/spawner/window/shuttle,
/turf/simulated/floor/plating,
/area/shuttle/escape)
"Uj" = (
/obj/structure/closet/crate,
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/transport)
-"Ul" = (
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall_f5"
- },
-/area/shuttle/escape)
"Uo" = (
/obj/machinery/atmospherics/unary/vent_pump/high_volume{
dir = 1;
frequency = 1331;
id_tag = "synd_pump"
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/syndicate)
"Us" = (
/obj/machinery/door/window{
@@ -16148,9 +14921,7 @@
name = "Secure Storage";
req_access_txt = "150"
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/syndicate)
"Uv" = (
/turf/simulated/floor/holofloor{
@@ -16161,9 +14932,7 @@
/area/holodeck/source_desert)
"Uw" = (
/obj/machinery/computer/shuttle/syndicate,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/syndicate)
"Uy" = (
/obj/structure/table/holotable,
@@ -16179,17 +14948,13 @@
/obj/structure/table,
/obj/item/storage/toolbox/syndicate,
/obj/item/crowbar/red,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/syndicate)
"UA" = (
/obj/structure/chair/comfy/shuttle{
dir = 4
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/syndicate)
"UC" = (
/obj/machinery/light/spot{
@@ -16201,9 +14966,7 @@
/obj/structure/chair/comfy/shuttle{
dir = 4
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/syndicate_sit)
"UD" = (
/obj/machinery/door/window{
@@ -16213,14 +14976,12 @@
name = "Infirmary";
req_access_txt = "150"
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/syndicate)
"UG" = (
/obj/effect/spawner/lootdrop/trade_sol/sec,
/obj/structure/closet,
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/trade/sol)
"UH" = (
/obj/structure/chair{
@@ -16238,9 +14999,7 @@
/area/holodeck/source_knightarena)
"UJ" = (
/obj/machinery/computer/shuttle/sst,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/syndicate_elite)
"UK" = (
/turf/simulated/floor/holofloor{
@@ -16260,33 +15019,15 @@
/obj/structure/chair/comfy/shuttle{
dir = 4
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"UP" = (
-/turf/simulated/shuttle/wall{
- icon_state = "swallc2"
- },
+/turf/simulated/wall/mineral/titanium/nodiagonal,
/area/shuttle/trade/sol)
-"UR" = (
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall_f10";
- tag = "icon-swall_f10"
- },
-/area/shuttle/supply)
"UT" = (
/obj/machinery/recharge_station/upgraded,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
-"UU" = (
-/obj/structure/shuttle/window,
-/obj/structure/grille,
-/turf/simulated/shuttle/plating,
-/area/shuttle/trade/sol)
"UV" = (
/obj/structure/holowindow,
/turf/simulated/floor/holofloor{
@@ -16307,9 +15048,7 @@
network = list("ERT","CentComm")
},
/obj/structure/chair/comfy/shuttle,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/specops)
"Vc" = (
/obj/structure/closet/crate/medical,
@@ -16323,9 +15062,7 @@
/obj/item/clothing/mask/breath/medical,
/obj/item/robot_parts/l_leg,
/obj/item/robot_parts/r_leg,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/syndicate)
"Vd" = (
/obj/machinery/door/window/westright{
@@ -16337,9 +15074,7 @@
icon_state = "tube1";
tag = "icon-tube1 (NORTH)"
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/syndicate)
"Ve" = (
/obj/structure/chair/comfy/shuttle{
@@ -16356,13 +15091,17 @@
icon_state = "propulsion_l";
tag = "icon-propulsion_l (NORTH)"
},
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating/airless,
/area/shuttle/syndicate_sit)
"Vj" = (
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/administration)
+"Vk" = (
+/obj/machinery/door/airlock/hatch{
+ req_access_txt = "152"
+ },
+/turf/simulated/floor/mineral/plastitanium/red/nitrogen,
+/area/shuttle/vox)
"Vm" = (
/obj/structure/table/wood,
/obj/item/storage/box/donkpockets,
@@ -16377,9 +15116,7 @@
/area/shuttle/escape)
"Vo" = (
/obj/machinery/suit_storage_unit/syndicate/secure,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/syndicate)
"Vq" = (
/obj/structure/chair/comfy/shuttle{
@@ -16393,9 +15130,7 @@
/obj/machinery/computer/camera_advanced/shuttle_docker/admin{
name = "NTV Argos shuttle navigation computer"
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"Vs" = (
/turf/simulated/floor/plasteel{
@@ -16404,14 +15139,8 @@
/area/shuttle/escape)
"Vw" = (
/obj/machinery/portable_atmospherics/canister/oxygen,
-/turf/simulated/shuttle/floor4/vox,
+/turf/simulated/floor/mineral/plastitanium/red/nitrogen,
/area/shuttle/vox)
-"Vz" = (
-/turf/simulated/shuttle/wall{
- dir = 4;
- icon_state = "diagonalWall3"
- },
-/area/shuttle/syndicate)
"VA" = (
/obj/effect/decal/warning_stripes/northwest,
/turf/unsimulated/floor{
@@ -16444,17 +15173,13 @@
/area/centcom/specops)
"VH" = (
/obj/machinery/dna_scannernew/upgraded,
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/administration)
"VI" = (
/obj/structure/chair/comfy/shuttle{
dir = 1
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/specops)
"VJ" = (
/obj/structure/chair,
@@ -16467,21 +15192,10 @@
icon_state = "propulsion_l";
tag = "icon-propulsion_l"
},
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating/airless,
/area/shuttle/vox)
-"VL" = (
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall12";
- tag = "icon-swall12"
- },
-/area/shuttle/supply)
"VN" = (
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall_f6";
- tag = "icon-swall_f6"
- },
+/turf/simulated/wall/mineral/titanium,
/area/shuttle/trade/sol)
"VO" = (
/obj/structure/chair/comfy/purp{
@@ -16494,9 +15208,7 @@
/area/wizard_station)
"VP" = (
/obj/machinery/computer/card,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"VQ" = (
/turf/simulated/floor/plasteel{
@@ -16513,15 +15225,11 @@
/area/shuttle/escape)
"VU" = (
/obj/effect/spawner/window/reinforced,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/syndicate)
"VY" = (
/obj/machinery/light/spot,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/syndicate)
"VZ" = (
/turf/simulated/floor/holofloor{
@@ -16541,15 +15249,13 @@
desc = "It smells faintly of reptile.";
name = "fancy leader hat"
},
-/turf/simulated/shuttle/floor4/vox,
+/turf/simulated/floor/mineral/plastitanium/red/nitrogen,
/area/shuttle/vox)
"Wc" = (
/obj/machinery/computer/shuttle/admin{
name = "NTV Argos shuttle console"
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"Wd" = (
/obj/structure/chair{
@@ -16569,7 +15275,7 @@
/area/centcom/evac)
"Wf" = (
/obj/structure/chair/stool,
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/centcom/evac)
"Wh" = (
/obj/machinery/door/airlock/command/glass{
@@ -16586,17 +15292,13 @@
/obj/structure/chair/comfy/shuttle{
dir = 1
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/centcom/evac)
"Wl" = (
/obj/structure/chair/comfy/shuttle{
dir = 4
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/centcom/evac)
"Wm" = (
/obj/structure/table,
@@ -16623,50 +15325,24 @@
tag = "icon-tube1 (NORTH)"
},
/obj/structure/chair/comfy/shuttle,
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/transport)
"Wt" = (
/obj/structure/shuttle/engine/heater,
/obj/structure/window/reinforced{
dir = 1
},
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating/airless,
/area/shuttle/vox)
-"Wu" = (
-/turf/simulated/shuttle/wall{
- dir = 4;
- icon_state = "wall3"
- },
-/area/shuttle/administration)
"Wz" = (
/obj/machinery/portable_atmospherics/canister/oxygen,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/syndicate)
"WA" = (
/turf/unsimulated/floor{
icon_state = "dark"
},
/area/syndicate_mothership/jail)
-"WB" = (
-/obj/machinery/door/poddoor/shutters{
- density = 0;
- dir = 2;
- icon_state = "open";
- id_tag = "voxshutters";
- name = "Blast Shutters";
- opacity = 0
- },
-/obj/structure/grille,
-/obj/structure/shuttle/window{
- dir = 2;
- icon = 'icons/turf/shuttle.dmi';
- icon_state = "window5_mid";
- tag = "icon-window5_mid"
- },
-/turf/simulated/shuttle/plating/vox,
-/area/shuttle/vox)
"WD" = (
/obj/structure/table/reinforced,
/obj/item/storage/firstaid/regular,
@@ -16683,7 +15359,7 @@
/obj/structure/chair/comfy/shuttle{
dir = 8
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/centcom/evac)
"WL" = (
/obj/machinery/light/spot{
@@ -16694,9 +15370,7 @@
/obj/structure/chair/comfy/shuttle{
dir = 8
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"WN" = (
/obj/structure/chair/comfy/shuttle{
@@ -16724,7 +15398,7 @@
/area/shuttle/escape)
"WU" = (
/obj/structure/chair/comfy/shuttle,
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/centcom/evac)
"WW" = (
/obj/structure/flora/ausbushes/pointybush,
@@ -16735,26 +15409,8 @@
/area/centcom/control)
"WY" = (
/obj/machinery/computer/shuttle/ferry/request,
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/transport)
-"Xc" = (
-/obj/machinery/door/poddoor/shutters{
- density = 0;
- dir = 4;
- icon_state = "open";
- id_tag = "adminshuttleshutters";
- name = "Blast Shutters";
- opacity = 0
- },
-/obj/structure/grille,
-/obj/structure/shuttle/window{
- dir = 4;
- icon = 'icons/turf/shuttle.dmi';
- icon_state = "window5_end";
- tag = "icon-window5_end (EAST)"
- },
-/turf/simulated/floor/plating,
-/area/shuttle/administration)
"Xi" = (
/obj/machinery/light/spot{
dir = 1;
@@ -16780,9 +15436,7 @@
/obj/structure/chair/comfy/shuttle{
dir = 4
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"Xj" = (
/obj/structure/bed,
@@ -16792,9 +15446,7 @@
/area/centcom)
"Xl" = (
/obj/structure/reagent_dispensers/fueltank,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"Xm" = (
/obj/effect/decal/cleanable/dirt,
@@ -16818,7 +15470,7 @@
pixel_y = 8;
req_access_txt = "160"
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/trade/sol)
"Xq" = (
/obj/structure/table,
@@ -16862,7 +15514,7 @@
opacity = 0;
req_access_txt = "150"
},
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating,
/area/shuttle/syndicate_sit)
"Xw" = (
/obj/structure/rack,
@@ -16872,7 +15524,7 @@
/obj/item/dart_cartridge,
/obj/item/dart_cartridge,
/obj/item/dart_cartridge,
-/turf/simulated/shuttle/floor4/vox,
+/turf/simulated/floor/mineral/plastitanium/red/nitrogen,
/area/shuttle/vox)
"Xx" = (
/obj/structure/shuttle/engine/propulsion{
@@ -16880,13 +15532,13 @@
icon_state = "propulsion_l";
tag = "icon-propulsion_l (EAST)"
},
-/turf/space,
+/turf/simulated/floor/plating/airless,
/area/shuttle/administration)
"XB" = (
/obj/machinery/atmospherics/unary/tank/nitrogen{
dir = 1
},
-/turf/simulated/shuttle/floor4/vox,
+/turf/simulated/floor/mineral/plastitanium/red/nitrogen,
/area/shuttle/vox)
"XC" = (
/obj/machinery/light/spot{
@@ -16894,9 +15546,7 @@
icon_state = "tube1";
tag = "icon-tube1 (EAST)"
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/administration)
"XG" = (
/obj/structure/bed/roller,
@@ -16906,7 +15556,7 @@
},
/area/shuttle/escape)
"XH" = (
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/supply)
"XJ" = (
/obj/machinery/light/spot{
@@ -16940,13 +15590,6 @@
/obj/structure/bed/abductor,
/turf/unsimulated/floor/abductor,
/area/abductor_ship)
-"XN" = (
-/obj/machinery/porta_turret/syndicate,
-/turf/simulated/shuttle/wall{
- dir = 1;
- icon_state = "diagonalWall3"
- },
-/area/shuttle/syndicate)
"XS" = (
/obj/machinery/access_button{
command = "cycle_exterior";
@@ -16954,9 +15597,7 @@
master_tag = "vox_east_control";
req_access_txt = "152"
},
-/turf/simulated/shuttle/wall{
- icon_state = "wall3"
- },
+/turf/simulated/wall/mineral/plastitanium,
/area/shuttle/vox)
"XT" = (
/turf/simulated/floor/holofloor{
@@ -16965,17 +15606,11 @@
tag = "icon-carpet4-0 (EAST)"
},
/area/holodeck/source_meetinghall)
-"XW" = (
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall7"
- },
-/area/shuttle/escape)
"XY" = (
/obj/item/clothing/head/collectable/xenom,
/obj/item/clothing/head/chicken,
/obj/item/aiModule/syndicate,
-/turf/simulated/shuttle/floor4/vox,
+/turf/simulated/floor/mineral/plastitanium/red/nitrogen,
/area/shuttle/vox)
"Ya" = (
/obj/machinery/atm{
@@ -16985,7 +15620,7 @@
/obj/structure/chair/comfy/shuttle{
dir = 8
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/trade/sol)
"Yc" = (
/obj/structure/table/holotable,
@@ -17000,9 +15635,7 @@
"Yf" = (
/obj/machinery/vending/coffee,
/obj/machinery/light/spot,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"Yg" = (
/obj/machinery/door/poddoor{
@@ -17012,20 +15645,14 @@
name = "Security Doors";
opacity = 0
},
-/obj/machinery/door/airlock/shuttle/glass{
+/obj/machinery/door/airlock/titanium/glass{
id_tag = "soltrader_north";
name = "trader shuttle airlock";
req_access_txt = "160";
security_level = 6
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/trade/sol)
-"Yj" = (
-/turf/simulated/shuttle/wall{
- dir = 4;
- icon_state = "diagonalWall3"
- },
-/area/shuttle/administration)
"Yk" = (
/obj/machinery/door/airlock/external{
id_tag = "s_docking_airlock"
@@ -17039,9 +15666,7 @@
icon_state = "tube1";
tag = "icon-tube1 (EAST)"
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/syndicate)
"Yn" = (
/turf/simulated/floor/plasteel{
@@ -17052,24 +15677,15 @@
"Yp" = (
/turf/simulated/floor/beach/water,
/area/holodeck/source_beach)
-"Yt" = (
-/obj/structure/grille,
-/obj/structure/shuttle/window,
-/turf/simulated/shuttle/plating,
-/area/shuttle/transport)
"Yu" = (
/obj/machinery/vending/snack,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"Yv" = (
/obj/structure/chair/comfy/shuttle{
dir = 8
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"Yx" = (
/obj/machinery/door/airlock/hatch/syndicate{
@@ -17082,52 +15698,29 @@
icon_state = "dark"
},
/area/syndicate_mothership/jail)
-"Yy" = (
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall_f9"
- },
-/area/shuttle/transport)
"Yz" = (
/obj/effect/spawner/lootdrop/trade_sol/vehicle,
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/trade/sol)
"YA" = (
-/turf/simulated/shuttle/wall{
- icon_state = "wall3"
- },
+/turf/simulated/wall/mineral/plastitanium,
/area/shuttle/specops)
"YC" = (
-/obj/structure/window/full/shuttle,
-/obj/structure/grille,
-/obj/machinery/door/poddoor/shutters{
- density = 0;
- dir = 2;
- icon_state = "open";
- id_tag = "trader_privacy";
- name = "Privacy Shutters";
- opacity = 0
- },
-/turf/simulated/shuttle/plating,
+/obj/effect/spawner/window/shuttle,
+/turf/simulated/floor/plating,
/area/shuttle/trade/sol)
"YH" = (
/obj/structure/chair/comfy/shuttle{
dir = 1
},
-/turf/simulated/shuttle/floor4/vox,
+/turf/simulated/floor/mineral/plastitanium/red/nitrogen,
/area/shuttle/vox)
"YM" = (
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall_f6";
- tag = "icon-swall_f6"
- },
+/turf/simulated/wall/mineral/titanium,
/area/shuttle/supply)
"YR" = (
/obj/structure/chair/stool,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/syndicate)
"YU" = (
/obj/machinery/status_display{
@@ -17156,7 +15749,7 @@
pixel_x = 24;
pixel_y = -8
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/trade/sol)
"YW" = (
/obj/machinery/computer/robotics,
@@ -17182,9 +15775,7 @@
color = "#FF0000";
dir = 4
},
-/turf/simulated/shuttle/wall{
- icon_state = "wall3"
- },
+/turf/simulated/floor/plating/airless,
/area/shuttle/administration)
"Zd" = (
/obj/structure/table/reinforced,
@@ -17199,20 +15790,12 @@
/obj/structure/chair/comfy/shuttle{
dir = 4
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/trade/sol)
"Zf" = (
/obj/machinery/mecha_part_fabricator/upgraded,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
-"Zg" = (
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall3"
- },
-/area/shuttle/trade/sol)
"Zi" = (
/obj/machinery/sleeper,
/turf/simulated/floor/plasteel{
@@ -17227,7 +15810,7 @@
name = "remote shutter control";
req_access_txt = "152"
},
-/turf/simulated/shuttle/floor4/vox,
+/turf/simulated/floor/mineral/plastitanium/red/nitrogen,
/area/shuttle/vox)
"Zn" = (
/obj/structure/table,
@@ -17235,16 +15818,8 @@
pixel_y = 5
},
/obj/item/radio/beacon/syndicate/bomb,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/syndicate)
-"Zr" = (
-/turf/simulated/shuttle/wall{
- dir = 8;
- icon_state = "diagonalWall3"
- },
-/area/shuttle/administration)
"Zs" = (
/obj/machinery/airlock_sensor{
frequency = 1331;
@@ -17257,13 +15832,11 @@
icon_state = "tube1";
tag = "icon-tube1 (WEST)"
},
-/turf/simulated/shuttle/plating/vox,
+/turf/simulated/floor/plating/nitrogen,
/area/shuttle/vox)
"Zu" = (
/obj/machinery/vending/cola,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"Zv" = (
/turf/simulated/floor/beach/coastline,
@@ -17277,16 +15850,14 @@
/area/shuttle/escape)
"ZC" = (
/obj/structure/window/reinforced,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/syndicate_sit)
"ZD" = (
/obj/structure/shuttle/engine/heater,
/obj/structure/window/reinforced{
dir = 1
},
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating/airless,
/area/shuttle/syndicate)
"ZE" = (
/turf/unsimulated/wall/fakeglass,
@@ -17303,7 +15874,7 @@
icon_state = "tube1";
tag = "icon-tube1 (EAST)"
},
-/turf/simulated/shuttle/plating/vox,
+/turf/simulated/floor/plating/nitrogen,
/area/shuttle/vox)
"ZI" = (
/obj/item/stack/spacecash/c200,
@@ -17312,7 +15883,7 @@
/obj/structure/chair/comfy/shuttle{
dir = 1
},
-/turf/simulated/shuttle/floor4/vox,
+/turf/simulated/floor/mineral/plastitanium/red/nitrogen,
/area/shuttle/vox)
"ZK" = (
/obj/machinery/light/spot{
@@ -17320,22 +15891,17 @@
icon_state = "tube1";
tag = "icon-tube1 (WEST)"
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/syndicate_elite)
"ZP" = (
/obj/structure/chair/comfy/shuttle{
dir = 1
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/transport)
"ZQ" = (
/obj/structure/sign/greencross,
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall12"
- },
+/turf/simulated/wall/mineral/titanium,
/area/shuttle/escape)
"ZR" = (
/turf/simulated/floor/holofloor{
@@ -17343,12 +15909,6 @@
icon_state = "green"
},
/area/holodeck/source_emptycourt)
-"ZT" = (
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall13"
- },
-/area/shuttle/escape)
"ZV" = (
/obj/structure/grille,
/obj/structure/window/full/shuttle{
@@ -30350,12 +28910,12 @@ aN
aN
fm
of
-oy
-oy
-oy
+of
+of
+of
pn
-oy
-px
+of
+of
fm
aN
aN
@@ -30606,13 +29166,13 @@ th
aN
th
fm
-oh
+of
oB
pf
pf
pf
fV
-oh
+of
fm
aN
aN
@@ -30863,13 +29423,13 @@ ti
sX
ti
fm
-oh
+of
oJ
pf
pk
pf
pq
-oh
+of
fm
aN
aN
@@ -31120,13 +29680,13 @@ ti
sX
ti
fm
-oh
+of
oW
pf
po
pf
pu
-oh
+of
fm
aN
aN
@@ -31377,13 +29937,13 @@ ti
sX
ti
fm
-oh
+of
oC
ph
pf
pa
ps
-oh
+of
fm
aN
aN
@@ -31634,13 +30194,13 @@ ti
sX
ti
fm
-oi
-oy
-oy
+of
+of
+of
pt
-oy
-oy
-py
+of
+of
+of
fm
aN
aN
@@ -36529,11 +35089,11 @@ sX
sX
sX
sX
-MU
+YA
YA
Lt
YA
-NH
+YA
sX
aN
aN
@@ -36787,9 +35347,9 @@ vS
qk
sX
aN
-MU
+YA
rb
-NH
+YA
aN
sX
aN
@@ -37841,16 +36401,16 @@ aN
aN
qI
YM
-wg
-wg
-wg
-wg
-wg
-wg
-wg
-wg
-wg
-SM
+YM
+YM
+YM
+YM
+YM
+YM
+YM
+YM
+YM
+YM
aN
qI
aN
@@ -38097,7 +36657,7 @@ cj
cj
cj
qI
-VL
+YM
XH
XH
XH
@@ -38107,7 +36667,7 @@ XH
XH
XH
XH
-VL
+YM
SP
qI
aN
@@ -38347,14 +36907,14 @@ aN
cj
cp
KZ
-OY
-OY
-OY
-LP
+cr
+cr
+cr
+KZ
cp
cj
qI
-VL
+YM
XH
XH
XH
@@ -38611,7 +37171,7 @@ cr
cp
cj
qI
-VL
+YM
FG
XH
XH
@@ -38868,7 +37428,7 @@ cr
cp
cj
qI
-VL
+YM
XH
XH
XH
@@ -39125,7 +37685,7 @@ cr
cp
cj
qI
-VL
+YM
XH
XH
XH
@@ -39135,7 +37695,7 @@ XH
XH
XH
XH
-VL
+YM
Ex
qI
aN
@@ -39382,17 +37942,17 @@ TC
cp
cj
qI
-UR
-wg
-wg
+YM
+YM
+YM
DK
cv
-wg
+YM
tW
Ji
-wg
-wg
-pr
+YM
+YM
+YM
aN
qI
aN
@@ -40155,15 +38715,15 @@ cj
aN
aN
aN
-Zr
+Rp
Xx
DI
-TO
+Rp
aN
-Zr
+Rp
Xx
DI
-TO
+Rp
aN
aN
aN
@@ -40402,26 +38962,26 @@ sr
sr
cj
cp
-Yt
+TC
bY
He
ZP
-Yt
+TC
cp
cj
aN
aN
-Zr
-Qr
+Rp
+Rp
Za
Za
-Qr
-Qr
-Qr
+Rp
+Rp
+Rp
Za
Za
-Qr
-TO
+Rp
+Rp
aN
aN
aN
@@ -40666,20 +39226,20 @@ ZP
cr
cp
cj
-aN
-Zr
-Qr
+Rp
+Rp
+Rp
Pj
Ld
Ld
Yu
-Qr
+Rp
VH
Vj
Vj
Sb
-Qr
-TO
+Rp
+Rp
aN
aN
aN
@@ -40923,21 +39483,21 @@ MZ
cr
cp
cj
-Zr
+Rp
IF
Ld
FR
Ld
Ld
Zu
-Qr
+Rp
EG
Vj
Vj
Vj
Ow
-Qr
-TO
+Rp
+Rp
aN
aN
aN
@@ -41173,28 +39733,28 @@ sr
sr
cj
cp
-IY
+cr
TC
tb
TC
-Yy
+cr
cp
cj
-Qr
+Rp
Ku
Ld
LD
ME
Ld
Yf
-Qr
+Rp
Nl
Vj
Vj
Vj
Vj
DF
-Qr
+Rp
aN
aN
aN
@@ -41437,21 +39997,21 @@ sQ
cp
cp
cj
-Qr
+Rp
CG
Ld
NC
ME
Ld
IV
-Qr
+Rp
VH
Vj
Ry
Eo
Vj
Ny
-Qr
+Rp
aN
aN
aN
@@ -41694,21 +40254,21 @@ tn
sJ
cJ
cj
-Qr
+Rp
EA
Li
Ug
ME
Ld
Ld
-Qr
+Rp
SF
Vj
Vj
FA
XC
RY
-Qr
+Rp
aN
aN
aN
@@ -41951,21 +40511,21 @@ yt
yt
yt
wK
-Qr
-Wu
-Wu
-Wu
-Wu
+Rp
+Rp
+Rp
+Rp
+Rp
Px
-Wu
-Wu
-Wu
+Rp
+Rp
+Rp
Dl
-Wu
-Wu
-Wu
-Wu
-Qr
+Rp
+Rp
+Rp
+Rp
+Rp
aN
aN
aN
@@ -42222,7 +40782,7 @@ Ld
Ld
Ld
Ld
-Qr
+Rp
aN
aN
aN
@@ -42479,7 +41039,7 @@ Ld
Ld
Ld
FM
-Qr
+Rp
aN
aN
aN
@@ -42722,21 +41282,21 @@ yt
yt
cK
wK
-Qr
-Wu
-Wu
+Rp
+Rp
+Rp
Dy
-Wu
-Wu
-Wu
+Rp
+Rp
+Rp
JM
-Wu
-Wu
-Wu
+Rp
+Rp
+Rp
MF
-Wu
-Wu
-Qr
+Rp
+Rp
+Rp
aN
aN
aN
@@ -42979,21 +41539,21 @@ wK
wK
wK
wK
-Qr
+Rp
cG
Jn
Ld
Xl
-Qr
+Rp
VP
Ld
Ld
-Qr
+Rp
Ld
Ld
LB
IZ
-Qr
+Rp
aN
aN
aN
@@ -43236,21 +41796,21 @@ to
to
tw
wK
-Qr
+Rp
KS
Ld
Ld
Nr
-Qr
+Rp
Xi
UN
UN
-Qr
+Rp
Ld
Ld
Ld
Ch
-Qr
+Rp
aN
aN
aN
@@ -43493,21 +42053,21 @@ tp
qv
ty
wK
-Qr
+Rp
bR
Ld
Ld
UT
-Qr
+Rp
hP
Wc
Vr
-Qr
+Rp
Ld
Ld
Ld
Ld
-Qr
+Rp
aN
aN
aN
@@ -43553,7 +42113,7 @@ PD
OF
PD
OF
-qn
+VN
mr
aN
aN
@@ -43750,21 +42310,21 @@ qo
qs
tx
wK
-EH
-Qr
+Rp
+Rp
Gv
Ld
Ld
-Qr
+Rp
Ky
-oZ
-Xc
-Qr
+Ky
+Ky
+Rp
Ng
LF
KL
Qr
-Yj
+Rp
aN
aN
aN
@@ -43802,15 +42362,15 @@ aN
aN
aN
mr
-GS
-Zg
-Zg
-Zg
-Zg
-Zg
-Zg
-Zg
-Qg
+VN
+VN
+VN
+VN
+VN
+VN
+VN
+VN
+VN
mr
aN
aN
@@ -44008,19 +42568,19 @@ qs
tA
wK
aN
-Qr
+Rp
Zf
Ld
LO
-Qr
+Rp
aN
aN
aN
-Qr
+Rp
Ld
Ld
Rc
-Qr
+Rp
aN
aN
aN
@@ -44059,15 +42619,15 @@ aN
aN
aN
mr
-DT
+VN
GJ
-hV
+Kp
ST
-hV
+Kp
UG
-hV
+Kp
zs
-DT
+VN
mr
aN
aN
@@ -44265,19 +42825,19 @@ tv
tz
wK
aN
-EH
-Qr
+Rp
+Rp
Li
EI
-Qr
+Rp
aN
aN
aN
-Qr
+Rp
WL
Yv
-Qr
-Yj
+Rp
+Rp
aN
aN
aN
@@ -44318,11 +42878,11 @@ aN
mr
YC
KJ
-hV
+Kp
Id
-hV
+Kp
PS
-hV
+Kp
Yz
YC
mr
@@ -44484,14 +43044,14 @@ sq
aN
aN
od
-ox
-ox
-ox
+od
+od
+od
oY
-ox
-ox
-ox
-pT
+od
+od
+od
+od
aN
aN
aN
@@ -44523,17 +43083,17 @@ wK
wK
aN
aN
-EH
-Wu
-Wu
-Yj
+Rp
+Rp
+Rp
+Rp
aN
aN
aN
-EH
-Wu
-Wu
-Yj
+Rp
+Rp
+Rp
+Rp
aN
aN
aN
@@ -44573,15 +43133,15 @@ aN
aN
aN
mr
-DT
+VN
DP
+Kp
hV
+Kp
hV
-hV
-hV
-hV
+Kp
RO
-DT
+VN
mr
fZ
fZ
@@ -44740,7 +43300,7 @@ Oq
sq
aN
aN
-nV
+od
og
og
og
@@ -44748,7 +43308,7 @@ og
og
og
og
-nV
+od
aN
aN
aN
@@ -44830,7 +43390,7 @@ aN
aN
aN
mr
-DT
+VN
hV
hV
hV
@@ -44838,7 +43398,7 @@ hV
hV
Ze
hV
-DT
+VN
mr
fL
yF
@@ -44997,7 +43557,7 @@ Oq
sq
aN
aN
-nV
+od
QE
og
og
@@ -45005,7 +43565,7 @@ og
og
og
og
-nV
+od
aN
aN
aN
@@ -45087,15 +43647,15 @@ aN
aN
aN
mr
-DT
-hV
+VN
+Kp
Xo
Ze
Ze
Ze
YV
-hV
-DT
+Kp
+VN
mr
yF
yF
@@ -45254,7 +43814,7 @@ Oq
sq
aN
aN
-nV
+od
QI
og
og
@@ -45262,36 +43822,36 @@ og
og
og
og
-nV
+od
aN
aN
aN
aN
aN
aN
-HA
-Fa
-Fa
-Fa
+od
+od
+od
+od
Fp
-Ix
+od
rW
-Fa
-PL
-OO
-ki
-Fa
+od
+Ui
+Ui
+Ui
+od
Fp
-Fa
+od
Fp
-Fa
-Fa
-PL
-ki
-Fa
-Fa
-XW
-Ul
+od
+od
+Ui
+Ui
+od
+od
+od
+od
aN
aN
aN
@@ -45344,15 +43904,15 @@ aN
aN
aN
mr
-DT
+VN
Ln
UP
RZ
RZ
RZ
-Td
+UP
Ln
-DT
+VN
mr
yF
yF
@@ -45511,7 +44071,7 @@ Oq
sq
aN
aN
-nV
+od
QI
og
og
@@ -45519,19 +44079,19 @@ og
og
og
op
-nV
+od
aN
aN
aN
aN
aN
aN
-Jl
+od
Su
KF
MV
GU
-Jl
+od
Oe
MI
Rb
@@ -45547,7 +44107,7 @@ Rb
Rb
Ic
EE
-Jl
+od
TY
DW
aN
@@ -45601,15 +44161,15 @@ aN
aN
aN
mr
-DT
-hV
-OK
+VN
+Kp
+VN
Ya
Jg
Fg
-OK
-hV
-DT
+VN
+Kp
+VN
mr
yF
yF
@@ -45768,7 +44328,7 @@ Oq
sq
aN
aN
-nV
+od
QI
og
og
@@ -45776,7 +44336,7 @@ og
og
og
og
-nV
+od
aN
aN
aN
@@ -45804,7 +44364,7 @@ Yn
Yn
Yn
Ve
-ZV
+Ui
TY
DW
aN
@@ -45861,9 +44421,9 @@ mr
YC
MB
Yg
-hV
-hV
-hV
+Kp
+Kp
+Kp
EY
Kb
YC
@@ -46025,7 +44585,7 @@ Oq
sq
aN
aN
-nV
+od
KA
og
og
@@ -46033,19 +44593,19 @@ og
og
og
og
-nV
+od
aN
aN
aN
aN
aN
-HA
-ZT
+od
+od
HH
GU
GU
GY
-ZV
+Ui
Kd
Yn
WN
@@ -46061,7 +44621,7 @@ WN
WN
Yn
Ve
-Fn
+Ui
TY
DW
aN
@@ -46115,15 +44675,15 @@ aN
aN
aN
mr
-dM
-Zg
-Zg
-UU
+VN
+VN
+VN
+YC
fw
-UU
-Zg
-Zg
-Jj
+YC
+VN
+VN
+VN
mr
yF
zj
@@ -46282,7 +44842,7 @@ Oq
sq
aN
aN
-nV
+od
og
og
og
@@ -46290,23 +44850,23 @@ og
og
og
og
-nV
+od
aN
-HA
-Fa
+od
+od
Ui
-Fa
-JA
-ZT
+od
+od
+od
Kx
GU
GU
GY
-Fn
+Ui
Kd
Yn
TT
-zg
+PM
Nx
Dx
TT
@@ -46318,7 +44878,7 @@ TU
Nx
Yn
Ve
-Jl
+od
Sf
Sf
aN
@@ -46539,27 +45099,27 @@ Oq
sq
aN
aN
-oe
-ox
-ox
-ox
-ox
-ox
-ox
-ox
-pU
+od
+od
+od
+od
+od
+od
+od
+od
+od
aN
-Jl
+od
Zd
Hq
TA
FJ
-Jl
+od
EX
Tn
GU
DB
-Jl
+od
Kd
Yn
Rb
@@ -46575,7 +45135,7 @@ Rb
Rb
Yn
Ve
-Jl
+od
TY
DW
aN
@@ -46811,12 +45371,12 @@ Rw
Vs
Rs
Eh
-HT
-Fa
+od
+od
Ui
HP
-Fa
-ZT
+od
+od
iQ
Yn
Yn
@@ -47089,7 +45649,7 @@ WN
WN
Yn
Ve
-Jl
+od
Sf
Sf
aN
@@ -47152,17 +45712,17 @@ at
at
at
TD
-PY
-PY
-PY
-Ko
-Ko
+TD
+TD
+TD
+TD
+TD
NN
-Mm
-pi
-PY
-PY
-DO
+NN
+NN
+TD
+TD
+TD
aN
aN
aN
@@ -47342,11 +45902,11 @@ Yn
Nx
Dx
TT
-zg
+PM
Nx
Yn
Ve
-ZV
+Ui
TY
DW
aN
@@ -47603,7 +46163,7 @@ Rb
Rb
Yn
Ve
-Fn
+Ui
TY
DW
aN
@@ -47669,8 +46229,8 @@ zG
ZH
PG
Cw
-Ko
-Ko
+TD
+TD
EW
Fq
KD
@@ -47860,7 +46420,7 @@ Yn
Yn
Yn
Ve
-Jl
+od
Sf
Sf
aN
@@ -47922,18 +46482,18 @@ at
at
at
at
-Er
-PY
-PY
-ux
+TD
+TD
+TD
+TD
aN
-Ko
+TD
EW
Fr
KD
qi
-Ko
-ux
+TD
+TD
aN
aN
aN
@@ -48096,12 +46656,12 @@ Zx
Vs
Vq
OJ
-HT
-Fa
+od
+od
Of
Of
-Fa
-ZT
+od
+od
EE
Ij
Oe
@@ -48184,12 +46744,12 @@ aN
aN
aN
aN
-Ko
+TD
EW
Qh
KD
No
-Ko
+TD
aN
aN
aN
@@ -48348,33 +46908,33 @@ aN
aN
aN
aN
-Jl
+od
QG
Gy
pR
VS
-Jl
+od
Vn
ct
RL
OA
-HT
-Fa
-Fa
+od
+od
+od
MP
MP
-Fa
-Fa
-Fa
-Ix
-Se
+od
+od
+od
+od
+ZQ
Ui
QD
QD
Ui
-zg
-Fa
-ZT
+PM
+od
+od
TY
DW
aN
@@ -48440,13 +47000,13 @@ aN
aN
TD
NN
-pi
-Ko
+NN
+TD
EW
Po
KT
TE
-Ko
+TD
aN
aN
aN
@@ -48605,17 +47165,17 @@ aN
aN
aN
aN
-QO
-Fa
+od
+od
Ui
-Fa
-Ix
-ZT
+od
+od
+od
EV
Kd
FZ
Ub
-Jl
+od
Qa
QH
Oe
@@ -48623,7 +47183,7 @@ Oe
Fy
EM
Pg
-Jl
+od
DH
YX
Ef
@@ -48631,7 +47191,7 @@ Ef
cP
GL
LH
-Jl
+od
Sf
Sf
aN
@@ -48695,21 +47255,21 @@ aN
at
aN
TD
-Ko
+TD
Jz
Jz
-Ko
+TD
EW
-PY
-PY
-PY
-PY
-PY
-PY
-PY
-PY
-PY
-DO
+TD
+TD
+TD
+TD
+TD
+TD
+TD
+TD
+TD
+TD
aN
at
aN
@@ -48866,13 +47426,13 @@ aN
aN
aN
aN
-QO
-ZT
+od
+od
Fk
Kd
FZ
YU
-Jl
+od
CH
id
RJ
@@ -48951,11 +47511,11 @@ aN
aN
at
TD
-PY
+TD
KD
KD
KD
-Ko
+TD
EW
IX
KD
@@ -48966,8 +47526,8 @@ DE
Fi
OG
mJ
-Ko
-DO
+TD
+TD
at
aN
aN
@@ -49129,7 +47689,7 @@ Fk
Kd
FZ
Ve
-Jl
+od
St
Dk
Cz
@@ -49212,19 +47772,19 @@ Fm
Ed
KD
Fu
-Ko
-PY
-Ko
+TD
+TD
+TD
KD
KD
KD
KD
KD
-NK
+Fi
Vw
XY
hU
-Ko
+TD
at
aN
aN
@@ -49381,12 +47941,12 @@ aN
aN
aN
aN
-Jl
+od
EE
NA
VQ
EE
-Jl
+od
Wm
Jw
eF
@@ -49402,7 +47962,7 @@ Lp
IH
Sp
CV
-Jl
+od
TY
DW
aN
@@ -49465,7 +48025,7 @@ aN
aN
at
aN
-WB
+Fm
SA
YH
Wb
@@ -49477,11 +48037,11 @@ KD
KD
KD
KD
-IX
+Vk
KD
KD
ZI
-Ko
+TD
at
aN
aN
@@ -49638,29 +48198,29 @@ aN
aN
aN
aN
-QO
+od
Ui
Yk
Yk
Ui
-JA
-Fa
-PL
-OO
-OO
-OO
-ki
-Fa
-JA
-Fa
-Fa
-PL
-OO
-OO
-ki
-Fa
-JA
-SW
+od
+od
+Ui
+Ui
+Ui
+Ui
+Ui
+od
+od
+od
+od
+Ui
+Ui
+Ui
+Ui
+od
+od
+od
aN
aN
aN
@@ -49722,13 +48282,13 @@ aN
aN
at
aN
-er
+Fm
Zk
KD
KD
-Ko
-PY
-Ko
+TD
+TD
+TD
KD
KD
KD
@@ -49738,7 +48298,7 @@ Fi
MY
Rq
KO
-Ko
+TD
at
aN
aN
@@ -49978,12 +48538,12 @@ at
aN
aN
at
-Er
-PY
+TD
+TD
KD
KD
KD
-Ko
+TD
EW
IX
KD
@@ -49991,11 +48551,11 @@ Xw
PF
ht
ht
-NK
+Fi
CT
FO
-Ko
-ux
+TD
+TD
at
aN
aN
@@ -50236,22 +48796,22 @@ aN
aN
at
aN
-Er
-Ko
+TD
+TD
Sl
Sl
-Ko
+TD
EW
-PY
-PY
-PY
-PY
-PY
-PY
-PY
-PY
-PY
-ux
+TD
+TD
+TD
+TD
+TD
+TD
+TD
+TD
+TD
+TD
aN
at
aN
@@ -50494,15 +49054,15 @@ aN
at
aN
aN
-Er
+TD
Lm
-KV
-Ko
+Lm
+TD
EW
mE
KD
JE
-Ko
+TD
aN
aN
aN
@@ -50754,12 +49314,12 @@ aN
aN
aN
aN
-Ko
+TD
EW
Mw
KD
KD
-Ko
+TD
aN
aN
aN
@@ -51007,17 +49567,17 @@ at
at
at
TD
-PY
-PY
-DO
+TD
+TD
+TD
aN
-Ko
+TD
EW
MN
Gi
hR
-Ko
-DO
+TD
+TD
aN
aN
aN
@@ -51267,8 +49827,8 @@ zT
Zs
Rx
KC
-Ko
-Ko
+TD
+TD
EW
GQ
KD
@@ -51777,18 +50337,18 @@ at
at
at
at
-Er
-PY
-PY
-PY
-Ko
-Ko
+TD
+TD
+TD
+TD
+TD
+TD
Lm
-IB
-KV
-PY
-PY
-ux
+Lm
+Lm
+TD
+TD
+TD
aN
aN
aN
@@ -54461,15 +53021,15 @@ ab
ab
ab
ab
-Tw
-Cq
-Cq
-Cq
-Cq
-Cq
-Cq
-Cq
-MO
+HM
+HM
+HM
+HM
+HM
+HM
+HM
+HM
+HM
ab
nj
aN
@@ -54712,12 +53272,12 @@ ab
ab
ab
ab
-Tw
-Cq
-Cq
-Cq
-Cq
-Cq
+HM
+HM
+HM
+HM
+HM
+HM
HM
TR
DC
@@ -55477,10 +54037,10 @@ ab
ae
ab
NL
-Cq
-Cq
-Cq
-MO
+HM
+HM
+HM
+HM
ab
ab
HM
@@ -55494,10 +54054,10 @@ Ge
YR
DC
Vc
-Cq
-Cq
-Cq
-Vz
+Mu
+HM
+HM
+HM
ab
nj
aN
@@ -55995,22 +54555,22 @@ DC
DC
VY
HM
-Cq
-Cq
-Cq
-Cq
-Cq
-Cq
+HM
+HM
+HM
+HM
+HM
+HM
Fc
CO
+Mu
HM
-Cq
jH
UD
-Cq
-Cq
-Cq
-MO
+HM
+HM
+HM
+HM
ab
ab
nj
@@ -56247,7 +54807,7 @@ hj
hj
hj
ag
-Iy
+QU
Oj
DC
DC
@@ -56504,7 +55064,7 @@ nj
nj
nj
hE
-Iy
+QU
Uw
NZ
DC
@@ -56761,7 +55321,7 @@ hB
hn
hu
hE
-Iy
+QU
mH
DC
Lb
@@ -57018,27 +55578,27 @@ hn
hn
hz
hE
-Rz
+QU
Dg
DC
DC
HM
-Cq
-Cq
-DJ
-Cq
-Cq
+HM
+HM
+NL
+HM
+HM
Sv
eE
VU
+Mu
HM
-Cq
Vd
Qm
-Cq
-Cq
-Cq
-Vz
+HM
+HM
+HM
+HM
ab
ab
nj
@@ -57532,11 +56092,11 @@ hn
hn
hz
hI
-XN
-Cq
-Cq
-Cq
-Vz
+NL
+HM
+HM
+HM
+HM
bz
hz
pz
@@ -57550,10 +56110,10 @@ FP
YR
DC
IO
-Cq
-Cq
-Cq
-MO
+Mu
+HM
+HM
+HM
ab
nj
aN
@@ -58055,10 +56615,10 @@ bz
hz
pz
hz
-Mv
-Cq
-Cq
-Cq
+HM
+HM
+HM
+HM
HM
Cl
YR
@@ -58124,10 +56684,10 @@ aN
aN
aN
rI
-rQ
-rQ
-rQ
-sk
+rI
+rI
+rI
+rI
aN
aN
aN
@@ -58384,8 +56944,8 @@ rL
rR
yv
yv
-se
-sk
+rI
+rI
aN
aN
aN
@@ -58573,15 +57133,15 @@ ab
ab
ab
ab
-Mv
-Cq
-Cq
-Cq
-Cq
-Cq
-Cq
-Cq
-Vz
+HM
+HM
+HM
+HM
+HM
+HM
+HM
+HM
+HM
ab
nj
aN
@@ -58642,7 +57202,7 @@ rR
yv
yv
yv
-rT
+rI
aN
aN
aN
@@ -58896,20 +57456,20 @@ aN
aN
rN
rR
-rY
-sh
+rI
+rI
yT
-rU
-rQ
-rQ
-rQ
-rS
-rQ
-zV
-rQ
-rQ
-rQ
-sk
+rI
+rI
+rI
+rI
+rI
+rI
+zQ
+rI
+rI
+rI
+rI
aN
aN
aN
@@ -59151,23 +57711,23 @@ aN
aN
aN
aN
-rM
-rS
-rX
+rI
+rI
+rI
sg
yM
yW
zh
sy
zx
-rT
+rI
zO
zW
no
sS
no
-tr
-sk
+rI
+rI
aN
aN
aN
@@ -59409,7 +57969,7 @@ aN
aN
aN
aN
-rT
+rI
yy
yM
rZ
@@ -59417,17 +57977,17 @@ yX
Wk
zr
zr
-rT
+rI
zO
zW
zW
zW
zW
-tr
-rU
-rQ
-rQ
-sk
+rI
+rI
+rI
+rI
+rI
aN
aN
aN
@@ -59674,17 +58234,17 @@ yY
Wl
zr
zr
-rT
+rI
sG
zW
zW
zW
zW
-rT
+rI
Bb
AM
tF
-Bq
+zQ
aN
aN
aN
@@ -59923,7 +58483,7 @@ aN
aN
aN
aN
-rT
+rI
sb
yM
rZ
@@ -59933,15 +58493,15 @@ yZ
sC
rU
zQ
-zX
+zQ
sL
zQ
-zX
-rT
+zQ
+rI
WI
yM
Bi
-tI
+zQ
aN
aN
aN
@@ -60180,7 +58740,7 @@ aN
aN
aN
aN
-rT
+rI
sa
Wf
rZ
@@ -60198,7 +58758,7 @@ ts
rZ
WU
Bj
-tI
+zQ
aN
aN
aN
@@ -60437,7 +58997,7 @@ aN
aN
aN
aN
-rT
+rI
sc
yM
rZ
@@ -60451,11 +59011,11 @@ WI
rZ
yM
AM
-rT
+rI
sn
yM
Bk
-tI
+zQ
aN
aN
aN
@@ -60708,11 +59268,11 @@ sn
rZ
yM
AN
-rT
+rI
Bc
Bf
Bl
-Bs
+zQ
aN
aN
aN
@@ -60951,7 +59511,7 @@ aN
aN
aN
aN
-rT
+rI
yy
yM
rZ
@@ -60965,11 +59525,11 @@ rZ
rZ
yM
tk
-tr
-rS
-rQ
-rQ
-sl
+rI
+rI
+rI
+rI
+rI
aN
aN
aN
@@ -61208,8 +59768,8 @@ aN
aN
aN
rI
-rU
-sd
+rI
+rI
si
yM
zc
@@ -61222,8 +59782,8 @@ yM
rZ
si
yy
-tr
-sl
+rI
+rI
aN
aN
aN
@@ -61466,20 +60026,20 @@ aN
aN
rL
rR
-se
-sh
+rI
+rI
yT
-rS
-rQ
-rQ
+rI
+rI
+rI
aB
-rQ
-rQ
-rQ
+rI
+rI
+rI
aB
-rQ
-rQ
-sl
+rI
+rI
+rI
aN
aN
aN
@@ -61726,7 +60286,7 @@ rR
yv
yv
yv
-rT
+rI
aN
aN
sD
@@ -61982,8 +60542,8 @@ rN
rR
yv
yv
-rY
-sl
+rI
+rI
aN
aN
aN
@@ -62235,11 +60795,11 @@ aN
aN
aN
aN
-rM
-rQ
-rQ
-rQ
-sl
+rI
+rI
+rI
+rI
+rI
aN
aN
aN
@@ -62384,19 +60944,19 @@ aN
aN
nj
ab
-ef
-it
-it
-it
-it
-it
-it
-it
-it
-it
-it
-it
-ge
+nj
+nj
+nj
+nj
+nj
+nj
+nj
+nj
+nj
+nj
+nj
+nj
+nj
ab
nj
nj
@@ -62641,19 +61201,19 @@ aN
aN
nj
ab
-it
+nj
GA
-Jk
-Jk
-Jk
-Jk
-Jk
-Jk
-Jk
-Jk
-Fh
-MD
-it
+GA
+GA
+GA
+GA
+GA
+GA
+GA
+GA
+GA
+GA
+nj
hM
nj
kn
@@ -62898,7 +61458,7 @@ aN
aN
nj
ab
-it
+nj
EF
Rg
Mi
@@ -62909,8 +61469,8 @@ Qy
Nb
Sq
PU
-Fh
-it
+GA
+nj
kr
nj
kp
@@ -63155,7 +61715,7 @@ aN
aN
nj
ab
-it
+nj
RF
Rg
Ud
@@ -63167,7 +61727,7 @@ Mi
Mi
Mi
Xs
-it
+nj
kr
hA
kr
@@ -63197,7 +61757,7 @@ bD
iv
iP
iv
-bF
+bD
ju
jv
nj
@@ -63412,7 +61972,7 @@ aN
aN
nj
ab
-it
+nj
Vi
Rg
Mi
@@ -63423,8 +61983,8 @@ Ph
Mi
Sq
JH
-Fh
-it
+GA
+nj
mv
nj
kK
@@ -63455,7 +62015,7 @@ KX
iS
KX
iv
-bF
+bD
jJ
nj
aN
@@ -63669,19 +62229,19 @@ aN
aN
nj
ab
-it
-Aq
-Jk
-Jk
-Jk
-Jk
-Jk
-Jk
+nj
+GA
+GA
+GA
+GA
+GA
+GA
+GA
eV
-Jk
-Fh
-NX
-it
+GA
+GA
+GA
+nj
kr
nj
hO
@@ -63926,19 +62486,19 @@ aN
aN
nj
ab
-eg
-it
-it
-it
-it
-it
-it
-it
+nj
+nj
+nj
+nj
+nj
+nj
+nj
+nj
ej
-it
-it
-it
-gh
+nj
+nj
+nj
+nj
kr
nj
nj
@@ -64477,13 +63037,13 @@ aN
aN
nj
gx
-bE
+bD
iv
KY
iS
iS
iv
-bG
+bD
jJ
nj
aN
@@ -64735,11 +63295,11 @@ aN
nj
hx
iG
-bE
+bD
iv
iP
iv
-bG
+bD
jx
jy
nj
@@ -66496,19 +65056,19 @@ aN
aN
nj
ab
-ef
-it
-it
-it
-it
-it
-it
-it
+nj
+nj
+nj
+nj
+nj
+nj
+nj
+nj
eZ
-it
-it
-it
-gm
+nj
+nj
+nj
+nj
kr
nj
nj
@@ -66753,19 +65313,19 @@ aN
aN
nj
ab
-it
+nj
+So
+So
+So
+So
+So
+So
So
-Pc
-Pc
-Pc
-Pc
-Pc
-Pc
fc
-Pc
-Fs
-eA
-it
+So
+So
+gj
+nj
kr
nj
zL
@@ -67010,7 +65570,7 @@ aN
aN
nj
ab
-it
+nj
Lx
Ax
SN
@@ -67020,9 +65580,9 @@ Hx
ZK
KQ
GD
-LY
-Fs
-it
+So
+So
+nj
mv
nj
gg
@@ -67267,7 +65827,7 @@ aN
aN
nj
ab
-it
+nj
eG
Ax
ci
@@ -67279,7 +65839,7 @@ ci
ci
Mq
Ap
-it
+nj
kr
hA
kr
@@ -67524,7 +66084,7 @@ aN
aN
nj
ab
-it
+nj
Qe
Ax
EL
@@ -67534,9 +66094,9 @@ OQ
Qf
KQ
UJ
-LY
-CU
-it
+So
+So
+nj
kr
nj
gg
@@ -67781,19 +66341,19 @@ aN
aN
nj
ab
-it
-CC
-Pc
-Pc
-Pc
-Pc
-Pc
-Pc
-Pc
-Pc
-CU
-eA
-it
+nj
+So
+So
+So
+So
+So
+So
+So
+So
+So
+So
+gj
+nj
hM
nj
ix
@@ -68038,19 +66598,19 @@ aN
aN
nj
ab
-eg
-it
-it
-it
-it
-it
-it
-it
-it
-it
-it
-it
-gB
+nj
+nj
+nj
+nj
+nj
+nj
+nj
+nj
+nj
+nj
+nj
+nj
+nj
ab
nj
nj
@@ -71800,7 +70360,7 @@ vr
vD
vJ
uA
-vU
+xM
uT
uA
uE
@@ -74373,7 +72933,7 @@ vh
uT
uT
uA
-vV
+xN
uT
uT
uA
@@ -75141,7 +73701,7 @@ uT
vn
uT
uA
-vV
+xN
uT
uT
uT
diff --git a/_maps/map_files/shuttles/admin_admin.dmm b/_maps/map_files/shuttles/admin_admin.dmm
index 6e494e0b85b..f84d6a2940b 100644
--- a/_maps/map_files/shuttles/admin_admin.dmm
+++ b/_maps/map_files/shuttles/admin_admin.dmm
@@ -2,17 +2,8 @@
"aa" = (
/turf/space,
/area/space)
-"ab" = (
-/turf/space,
-/turf/simulated/shuttle/wall{
- dir = 8;
- icon_state = "diagonalWall3"
- },
-/area/shuttle/administration)
"ac" = (
-/turf/simulated/shuttle/wall{
- icon_state = "wall3"
- },
+/turf/simulated/wall/mineral/plastitanium/nodiagonal,
/area/shuttle/administration)
"ad" = (
/obj/machinery/door/airlock/external{
@@ -21,9 +12,7 @@
req_access_txt = "101"
},
/obj/structure/fans/tiny,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/plating,
/area/shuttle/administration)
"ae" = (
/obj/machinery/door/airlock/external{
@@ -42,49 +31,26 @@
width = 18
},
/obj/structure/fans/tiny,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
-/area/shuttle/administration)
-"af" = (
-/turf/space,
-/turf/simulated/shuttle/wall{
- dir = 1;
- icon_state = "diagonalWall3"
- },
+/turf/simulated/floor/plating,
/area/shuttle/administration)
"ag" = (
/obj/machinery/vending/boozeomat,
-/turf/simulated/shuttle/wall{
- icon_state = "wall3"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"ah" = (
/obj/structure/table/reinforced,
/obj/machinery/chem_dispenser/beer,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"ai" = (
/obj/structure/table/reinforced,
/obj/item/storage/box/drinkingglasses,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"aj" = (
/obj/structure/table/reinforced,
/obj/machinery/chem_dispenser/soda,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
-/area/shuttle/administration)
-"ak" = (
-/turf/simulated/shuttle/wall{
- dir = 4;
- icon_state = "wall3"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"al" = (
/obj/machinery/door_control{
@@ -97,38 +63,28 @@
icon_state = "tube1";
dir = 8
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"am" = (
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"an" = (
/obj/machinery/cell_charger,
/obj/structure/table,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"ao" = (
/obj/item/storage/toolbox/mechanical,
/obj/item/multitool,
/obj/structure/table,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"ap" = (
/obj/structure/table,
/obj/machinery/recharger{
pixel_y = 4
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"aq" = (
/obj/machinery/light/spot{
@@ -136,9 +92,7 @@
icon_state = "tube1";
dir = 4
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"ar" = (
/obj/machinery/door/poddoor/preopen{
@@ -152,9 +106,7 @@
opacity = 1;
req_access_txt = "101"
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"as" = (
/obj/machinery/light/spot{
@@ -162,9 +114,7 @@
icon_state = "tube1";
dir = 8
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"at" = (
/obj/item/stack/sheet/metal,
@@ -173,43 +123,31 @@
pixel_x = 4;
pixel_y = 4
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"au" = (
/obj/machinery/mecha_part_fabricator/upgraded,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"av" = (
/obj/machinery/kitchen_machine/microwave/upgraded,
/obj/structure/table,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"aw" = (
/obj/machinery/door/window/northright{
name = "bar"
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"ax" = (
/obj/structure/table,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"ay" = (
/obj/item/ashtray/glass,
/obj/structure/table,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"az" = (
/obj/item/storage/fancy/cigarettes/dromedaryco,
@@ -217,9 +155,7 @@
pixel_x = 5
},
/obj/structure/table,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"aA" = (
/obj/machinery/door_control{
@@ -228,9 +164,7 @@
pixel_x = -30;
req_access_txt = "101"
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"aB" = (
/obj/machinery/door/airlock/centcom{
@@ -239,9 +173,7 @@
opacity = 1;
req_access_txt = "101"
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"aC" = (
/obj/structure/shuttle/engine/propulsion{
@@ -249,7 +181,7 @@
icon_state = "propulsion_l";
tag = "icon-propulsion_l (EAST)"
},
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating/airless,
/area/shuttle/administration)
"aD" = (
/obj/structure/shuttle/engine/heater{
@@ -261,45 +193,33 @@
color = "#FF0000";
dir = 4
},
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating/airless,
/area/shuttle/administration)
"aE" = (
/obj/structure/chair/stool/bar,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"aF" = (
/obj/structure/reagent_dispensers/fueltank,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"aG" = (
/obj/structure/reagent_dispensers/watertank,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"aH" = (
/obj/machinery/recharge_station/upgraded,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"aI" = (
/obj/machinery/autolathe/upgraded{
hacked = 1
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"aJ" = (
/obj/structure/dispenser,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"aK" = (
/obj/structure/shuttle/engine/propulsion{
@@ -307,63 +227,36 @@
icon_state = "propulsion_r";
tag = "icon-propulsion_r (EAST)"
},
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating/airless,
/area/shuttle/administration)
"aL" = (
/obj/machinery/door/airlock/public/glass,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
-/area/shuttle/administration)
-"aM" = (
-/turf/space,
-/turf/simulated/shuttle/wall{
- dir = 4;
- icon_state = "diagonalWall3"
- },
-/area/shuttle/administration)
-"aN" = (
-/turf/space,
-/turf/simulated/shuttle/wall{
- icon_state = "diagonalWall3"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"aO" = (
/obj/machinery/vending/snack,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"aP" = (
/obj/machinery/vending/cola,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"aQ" = (
/obj/machinery/vending/coffee,
/obj/machinery/light/spot,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"aR" = (
/obj/machinery/vending/cigarette,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"aS" = (
/obj/machinery/computer/card,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"aT" = (
/obj/machinery/computer/communications,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"aU" = (
/obj/machinery/door/poddoor/shutters{
@@ -374,13 +267,7 @@
name = "Blast Shutters";
opacity = 0
},
-/obj/structure/grille,
-/obj/structure/shuttle/window{
- tag = "icon-window5_end (WEST)";
- icon = 'icons/turf/shuttle.dmi';
- icon_state = "window5_end";
- dir = 8
- },
+/obj/effect/spawner/window/plastitanium,
/turf/simulated/floor/plating,
/area/shuttle/administration)
"aV" = (
@@ -411,9 +298,7 @@
/obj/structure/chair/comfy/shuttle{
dir = 4
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"aW" = (
/obj/structure/chair/comfy/black{
@@ -422,47 +307,21 @@
/obj/structure/chair/comfy/shuttle{
dir = 4
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"aX" = (
/obj/machinery/computer/shuttle/admin{
name = "NTV Argos shuttle console"
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
-/area/shuttle/administration)
-"aY" = (
-/obj/machinery/door/poddoor/shutters{
- density = 0;
- dir = 4;
- icon_state = "open";
- id_tag = "adminshuttleshutters";
- name = "Blast Shutters";
- opacity = 0
- },
-/obj/structure/grille,
-/obj/structure/shuttle/window{
- dir = 4;
- icon = 'icons/turf/shuttle.dmi';
- icon_state = "window5_mid";
- tag = "icon-window5 (EAST)"
- },
-/turf/simulated/floor/plating,
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"aZ" = (
/obj/machinery/dna_scannernew/upgraded,
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/administration)
"ba" = (
/obj/machinery/computer/cloning,
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/administration)
"bb" = (
/obj/machinery/clonepod/upgraded,
@@ -471,15 +330,11 @@
icon_state = "tube1";
dir = 1
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/administration)
"bc" = (
/obj/machinery/computer/scan_consolenew,
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/administration)
"bd" = (
/obj/machinery/door/airlock/centcom{
@@ -488,40 +343,16 @@
opacity = 1;
req_access_txt = "101"
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"be" = (
/obj/machinery/computer/camera_advanced/shuttle_docker/admin{
name = "NTV Argos shuttle navigation computer"
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
-/area/shuttle/administration)
-"bf" = (
-/obj/machinery/door/poddoor/shutters{
- density = 0;
- dir = 4;
- icon_state = "open";
- id_tag = "adminshuttleshutters";
- name = "Blast Shutters";
- opacity = 0
- },
-/obj/structure/grille,
-/obj/structure/shuttle/window{
- tag = "icon-window5_end (EAST)";
- icon = 'icons/turf/shuttle.dmi';
- icon_state = "window5_end";
- dir = 4
- },
-/turf/simulated/floor/plating,
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"bg" = (
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/administration)
"bh" = (
/obj/machinery/door/airlock/centcom{
@@ -530,24 +361,18 @@
opacity = 1;
req_access_txt = "101"
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/administration)
"bi" = (
/obj/machinery/bodyscanner,
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/administration)
"bk" = (
/obj/structure/window/plasmareinforced{
color = "#FF0000";
dir = 8
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"bl" = (
/obj/machinery/light/spot{
@@ -558,29 +383,21 @@
/obj/structure/chair/comfy/shuttle{
dir = 8
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"bm" = (
/obj/machinery/sleeper/upgraded{
dir = 4
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/administration)
"bn" = (
/obj/machinery/chem_master,
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/administration)
"bo" = (
/obj/machinery/chem_dispenser,
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/administration)
"bp" = (
/obj/machinery/door/airlock/centcom{
@@ -589,32 +406,24 @@
opacity = 1;
req_access_txt = "104"
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"bq" = (
/obj/machinery/door/window/brigdoor/westleft{
color = "#d70000";
req_access_txt = "104"
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"br" = (
/obj/structure/chair/comfy/shuttle{
dir = 8
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"bs" = (
/obj/machinery/iv_drip,
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/administration)
"bt" = (
/obj/machinery/light/spot{
@@ -622,9 +431,7 @@
icon_state = "tube1";
dir = 4
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/administration)
"bu" = (
/obj/structure/table,
@@ -634,9 +441,7 @@
icon_state = "tube1";
dir = 8
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"bv" = (
/obj/structure/window/plasmareinforced{
@@ -646,17 +451,13 @@
/obj/structure/chair/comfy/shuttle{
dir = 1
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"bw" = (
/obj/structure/chair/comfy/shuttle{
dir = 1
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"bx" = (
/obj/structure/table,
@@ -669,34 +470,24 @@
/obj/item/scalpel,
/obj/item/retractor,
/obj/item/FixOVein,
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/administration)
"by" = (
/obj/machinery/optable,
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/administration)
"bz" = (
/obj/machinery/vending/medical,
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/administration)
"bA" = (
/obj/machinery/light,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"bB" = (
/obj/structure/table,
/obj/item/storage/lockbox/mindshield,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"bC" = (
/obj/structure/table,
@@ -705,24 +496,25 @@
pixel_y = 3
},
/obj/item/storage/box/trackimp,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
+/area/shuttle/administration)
+"vg" = (
+/turf/simulated/wall/mineral/plastitanium,
/area/shuttle/administration)
(1,1,1) = {"
aa
aa
aa
-ab
+vg
aC
aK
-aN
+vg
aa
-ab
+vg
aC
aK
-aN
+vg
aa
aa
aa
@@ -733,17 +525,17 @@ aa
(2,1,1) = {"
aa
aa
-ab
-ac
+vg
+vg
aD
aD
-ac
-ac
-ac
+vg
+vg
+vg
aD
aD
-ac
-aN
+vg
+vg
aa
aa
aa
@@ -751,121 +543,121 @@ aa
aa
"}
(3,1,1) = {"
-aa
-ab
-ac
+vg
+vg
+vg
av
am
am
aO
-ac
+vg
aZ
bg
bg
bm
-ac
-aN
+vg
+vg
aa
aa
aa
aa
"}
(4,1,1) = {"
-ab
+vg
ag
am
aw
am
am
aP
-ac
+vg
ba
bg
bg
bg
bs
-ac
-aN
+vg
+vg
aa
aa
aa
"}
(5,1,1) = {"
-ac
+vg
ah
am
ax
aE
am
aQ
-ac
+vg
bb
bg
bg
bg
bg
bx
-ac
+vg
aa
aa
aa
"}
(6,1,1) = {"
-ac
+vg
ai
am
ay
aE
am
aR
-ac
+vg
aZ
bg
bi
bn
bg
by
-ac
+vg
aa
aa
aa
"}
(7,1,1) = {"
-ac
+vg
aj
aq
az
aE
am
am
-ac
+vg
bc
bg
bg
bo
bt
bz
-ac
+vg
aa
aa
aa
"}
(8,1,1) = {"
-ac
-ak
-ak
-ak
-ak
+vg
+vg
+vg
+vg
+vg
aL
-ak
-ak
-ak
+vg
+vg
+vg
bh
-ak
-ak
-ak
-ak
-ac
+vg
+vg
+vg
+vg
+vg
aa
aa
aa
@@ -885,7 +677,7 @@ am
am
am
am
-ac
+vg
aa
aa
aa
@@ -905,126 +697,126 @@ am
am
am
bA
-ac
+vg
aa
aa
aa
"}
(11,1,1) = {"
-ac
-ak
-ak
+vg
+vg
+vg
aB
-ak
-ak
-ak
+vg
+vg
+vg
bd
-ak
-ak
-ak
+vg
+vg
+vg
bp
-ak
-ak
-ac
+vg
+vg
+vg
aa
aa
aa
"}
(12,1,1) = {"
-ac
+vg
an
as
am
aF
-ac
+vg
aS
am
am
-ac
+vg
am
am
bu
bB
-ac
+vg
aa
aa
aa
"}
(13,1,1) = {"
-ac
+vg
ao
am
am
aG
-ac
+vg
aV
aW
aW
-ac
+vg
am
am
am
bC
-ac
+vg
aa
aa
aa
"}
(14,1,1) = {"
-ac
+vg
ap
am
am
aH
-ac
+vg
aT
aX
be
-ac
+vg
am
am
am
am
-ac
+vg
aa
aa
aa
"}
(15,1,1) = {"
-af
-ac
+vg
+vg
at
am
am
-ac
+vg
aU
-aY
-bf
-ac
+aU
+aU
+vg
bk
bq
bv
ac
-aM
+vg
aa
aa
aa
"}
(16,1,1) = {"
aa
-ac
+vg
au
am
aI
-ac
+vg
aa
aa
aa
-ac
+vg
am
am
bw
-ac
+vg
aa
aa
aa
@@ -1032,19 +824,19 @@ aa
"}
(17,1,1) = {"
aa
-af
-ac
+vg
+vg
aq
aJ
-ac
+vg
aa
aa
aa
-ac
+vg
bl
br
-ac
-aM
+vg
+vg
aa
aa
aa
@@ -1053,17 +845,17 @@ aa
(18,1,1) = {"
aa
aa
-af
-ak
-ak
-aM
+vg
+vg
+vg
+vg
aa
aa
aa
-af
-ak
-ak
-aM
+vg
+vg
+vg
+vg
aa
aa
aa
diff --git a/_maps/map_files/shuttles/admin_armory.dmm b/_maps/map_files/shuttles/admin_armory.dmm
index 68bdbe498ce..673aca28604 100644
--- a/_maps/map_files/shuttles/admin_armory.dmm
+++ b/_maps/map_files/shuttles/admin_armory.dmm
@@ -1,21 +1,11 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
-"ae" = (
-/obj/structure/sign/securearea,
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall4";
- tag = "icon-swall14"
- },
-/area/shuttle/administration)
"al" = (
/obj/structure/window/reinforced{
dir = 4
},
/obj/structure/table/reinforced,
/obj/item/folder,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"aI" = (
/obj/structure/table/reinforced,
@@ -23,9 +13,7 @@
dir = 4
},
/obj/machinery/recharger,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"aP" = (
/obj/machinery/vending/security,
@@ -34,7 +22,7 @@
icon_state = "tube1";
tag = "icon-tube1 (WEST)"
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/administration)
"bi" = (
/obj/structure/table/reinforced,
@@ -42,47 +30,28 @@
/obj/item/storage/firstaid/brute,
/obj/item/storage/box/bodybags,
/obj/item/storage/firstaid/surgery,
-/turf/simulated/shuttle/floor,
-/area/shuttle/administration)
-"bm" = (
-/obj/structure/grille,
-/obj/machinery/door/poddoor/shutters/preopen{
- dir = 8;
- id_tag = "adminarmoryshutters"
- },
-/obj/structure/window/full/shuttle,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/administration)
"ce" = (
/obj/machinery/autolathe/upgraded{
hacked = 1
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"cl" = (
/obj/structure/chair/comfy/shuttle{
dir = 4
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"cV" = (
/obj/structure/closet/emcloset,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"de" = (
/obj/machinery/suit_storage_unit/security/secure,
/obj/machinery/light/spot,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"df" = (
/obj/structure/rack,
@@ -92,17 +61,13 @@
},
/obj/item/storage/box/buck,
/obj/structure/window/reinforced,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"dn" = (
/obj/machinery/computer/camera_advanced/shuttle_docker/admin{
name = "NRV Sparta navigation computer"
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"dH" = (
/obj/structure/rack,
@@ -115,13 +80,11 @@
pixel_x = 3;
pixel_y = -3
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"dP" = (
/obj/machinery/recharge_station/upgraded,
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/administration)
"eI" = (
/obj/machinery/turretid/stun{
@@ -130,24 +93,20 @@
pixel_y = 30
},
/obj/machinery/computer/camera_advanced,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"eL" = (
/obj/structure/chair{
dir = 8
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"fo" = (
/obj/structure/chair{
dir = 1
},
/obj/machinery/light/spot,
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/administration)
"fF" = (
/obj/machinery/light/spot{
@@ -155,45 +114,35 @@
icon_state = "tube1";
tag = "icon-tube1 (EAST)"
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"fQ" = (
/obj/structure/chair/comfy/shuttle{
dir = 1
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"gd" = (
-/obj/machinery/door/airlock/shuttle,
-/turf/simulated/shuttle/floor,
+/obj/machinery/door/airlock/titanium,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/administration)
"gh" = (
/obj/structure/chair/comfy/shuttle{
dir = 8
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"gj" = (
/obj/machinery/computer/communications{
name = "NRV Sparta Communications Console"
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"hN" = (
/obj/structure/chair{
dir = 4
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"ir" = (
/obj/structure/closet/emcloset,
@@ -202,7 +151,7 @@
icon_state = "tube1";
tag = "icon-tube1 (NORTH)"
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/administration)
"iz" = (
/obj/machinery/porta_turret{
@@ -216,85 +165,30 @@
dir = 1;
layer = 2.9
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
-/area/shuttle/administration)
-"jn" = (
-/obj/machinery/door/poddoor/shutters{
- density = 0;
- dir = 2;
- icon_state = "open";
- id_tag = "Asclshutters";
- name = "Blast Shutters";
- opacity = 0
- },
-/obj/structure/grille,
-/obj/structure/window/full/shuttle,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"jB" = (
/obj/structure/table/reinforced,
/obj/item/storage/lockbox/mindshield,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"jU" = (
/obj/machinery/suit_storage_unit/security/secure,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"kf" = (
/obj/structure/sign/securearea,
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall8";
- tag = "icon-swall12"
- },
-/area/shuttle/administration)
-"mq" = (
-/obj/structure/grille,
-/obj/machinery/door/poddoor/shutters{
- density = 0;
- dir = 2;
- icon_state = "open";
- id_tag = "Asclshutters";
- name = "Blast Shutters";
- opacity = 0
- },
-/obj/structure/window/full/shuttle,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/wall/mineral/titanium,
/area/shuttle/administration)
"mw" = (
-/turf/simulated/shuttle/floor,
-/area/shuttle/administration)
-"mM" = (
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall13"
- },
-/area/shuttle/administration)
-"nG" = (
-/obj/structure/window/full/shuttle,
-/obj/structure/grille,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/administration)
"oj" = (
/obj/structure/chair/comfy/shuttle{
dir = 1
},
/obj/machinery/light/spot,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"oY" = (
/obj/structure/chair,
@@ -303,26 +197,20 @@
icon_state = "tube1";
tag = "icon-tube1 (NORTH)"
},
-/turf/simulated/shuttle/floor,
-/area/shuttle/administration)
-"pa" = (
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall11"
- },
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/administration)
"pK" = (
/obj/structure/shuttle/engine/propulsion{
dir = 4;
icon_state = "propulsion"
},
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating/airless,
/area/shuttle/administration)
"pQ" = (
/obj/structure/chair{
dir = 8
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/administration)
"qQ" = (
/obj/machinery/recharger/wallcharger{
@@ -342,25 +230,13 @@
pixel_x = 25;
req_access_txt = "19"
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"rb" = (
/obj/machinery/door/window/brigdoor/southleft{
req_one_access_txt = "2;19"
},
-/turf/simulated/shuttle/floor,
-/area/shuttle/administration)
-"rW" = (
-/obj/structure/grille,
-/obj/machinery/door/poddoor/shutters/preopen{
- id_tag = "adminshuttlebridge"
- },
-/obj/structure/window/full/shuttle,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/administration)
"sq" = (
/obj/structure/table/reinforced,
@@ -373,15 +249,13 @@
pixel_x = 3;
pixel_y = -3
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"tx" = (
/obj/machinery/sleeper/upgraded{
dir = 4
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/administration)
"ua" = (
/obj/structure/chair{
@@ -409,16 +283,7 @@
/obj/structure/chair/comfy/shuttle{
dir = 8
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
-/area/shuttle/administration)
-"uz" = (
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall4";
- tag = "icon-swall14"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"uW" = (
/obj/structure/shuttle/engine/heater{
@@ -428,24 +293,21 @@
/obj/structure/window/plasmareinforced{
dir = 8
},
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating/airless,
/area/shuttle/administration)
"uY" = (
/obj/structure/window/reinforced,
/obj/structure/table/reinforced,
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/administration)
"vk" = (
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall_s6"
- },
+/turf/simulated/wall/mineral/titanium,
/area/shuttle/administration)
"vy" = (
/obj/structure/table/reinforced,
/obj/item/stack/sheet/metal/fifty,
/obj/item/stack/sheet/glass/fifty,
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/administration)
"vA" = (
/obj/machinery/light/spot{
@@ -454,9 +316,7 @@
tag = "icon-tube1 (NORTH)"
},
/obj/machinery/portable_atmospherics/canister/oxygen,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"vW" = (
/obj/structure/table/reinforced,
@@ -464,9 +324,7 @@
dir = 4
},
/obj/item/storage/box/handcuffs,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"wG" = (
/obj/structure/rack,
@@ -484,9 +342,7 @@
pixel_y = 0
},
/obj/item/clothing/head/helmet/alt,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"wH" = (
/obj/machinery/light/spot{
@@ -494,21 +350,10 @@
icon_state = "tube1";
tag = "icon-tube1 (WEST)"
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"wQ" = (
-/obj/machinery/door/poddoor/shutters{
- density = 0;
- dir = 8;
- icon_state = "open";
- id_tag = "Asclshutters";
- name = "Blast Shutters";
- opacity = 0
- },
-/obj/structure/grille,
-/obj/structure/window/full/shuttle,
+/obj/effect/spawner/window/shuttle,
/turf/space,
/area/shuttle/administration)
"xm" = (
@@ -523,7 +368,7 @@
pixel_x = -3;
pixel_y = 3
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/administration)
"xF" = (
/obj/structure/rack,
@@ -536,23 +381,11 @@
/obj/structure/window/reinforced{
dir = 4
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"xH" = (
-/obj/machinery/door/airlock/shuttle,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
-/area/shuttle/administration)
-"xK" = (
-/obj/structure/sign/nosmoking_2,
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall3";
- tag = "icon-swall3"
- },
+/obj/machinery/door/airlock/titanium,
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"xQ" = (
/obj/structure/chair{
@@ -563,17 +396,13 @@
icon_state = "tube1";
tag = "icon-tube1 (NORTH)"
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"xU" = (
/obj/structure/table/reinforced,
/obj/item/stack/sheet/metal/fifty,
/obj/item/stack/sheet/glass/fifty,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"xZ" = (
/turf/space,
@@ -591,9 +420,7 @@
dir = 8;
id_tag = "adminarmoryshutters"
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"yu" = (
/obj/structure/table/reinforced,
@@ -603,22 +430,11 @@
/obj/machinery/recharger{
pixel_x = 8
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"yF" = (
/obj/machinery/status_display,
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall3"
- },
-/area/shuttle/administration)
-"zY" = (
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall14"
- },
+/turf/simulated/wall/mineral/titanium,
/area/shuttle/administration)
"AH" = (
/obj/machinery/light/spot,
@@ -632,9 +448,7 @@
/obj/structure/window/reinforced{
dir = 4
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"Bc" = (
/obj/structure/rack,
@@ -650,9 +464,7 @@
pixel_x = 2;
pixel_y = -4
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"Bj" = (
/obj/structure/fans/tiny,
@@ -666,25 +478,17 @@
name = "Blast Door";
opacity = 0
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/plating,
/area/shuttle/administration)
"Bn" = (
/obj/machinery/door/window/brigdoor/southleft{
req_one_access_txt = "2;19"
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"Bq" = (
/obj/structure/sign/nosmoking_2,
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall1";
- tag = "icon-swall1"
- },
+/turf/simulated/wall/mineral/titanium,
/area/shuttle/administration)
"BZ" = (
/obj/machinery/light/spot,
@@ -698,9 +502,7 @@
dir = 1;
layer = 2.9
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"Cl" = (
/obj/structure/table/reinforced,
@@ -709,7 +511,7 @@
pixel_y = 3
},
/obj/item/storage/toolbox/mechanical,
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/administration)
"Du" = (
/obj/structure/rack,
@@ -719,27 +521,16 @@
pixel_x = 3;
pixel_y = -3
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"DZ" = (
/obj/machinery/light/spot,
/obj/structure/closet/emcloset,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
-/area/shuttle/administration)
-"Eq" = (
-/obj/structure/sign/securearea,
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall12"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"EQ" = (
-/obj/machinery/door/airlock/shuttle/glass,
-/turf/simulated/shuttle/floor,
+/obj/machinery/door/airlock/titanium/glass,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/administration)
"Fd" = (
/obj/structure/rack,
@@ -752,9 +543,7 @@
pixel_x = 3;
pixel_y = -3
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"Fo" = (
/obj/structure/rack,
@@ -769,16 +558,11 @@
/obj/item/gun/energy/immolator/multi{
pixel_y = 3
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"FF" = (
/obj/structure/sign/poster/official/enlist,
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall12"
- },
+/turf/simulated/wall/mineral/titanium,
/area/shuttle/administration)
"FT" = (
/obj/structure/rack,
@@ -791,17 +575,13 @@
/obj/structure/window/reinforced{
dir = 8
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"Gf" = (
/obj/structure/sign/vacuum{
pixel_x = -32
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"Gn" = (
/obj/structure/window/reinforced{
@@ -814,9 +594,7 @@
pixel_y = 3
},
/obj/item/gun/projectile/shotgun/riot/buckshot,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"Gx" = (
/obj/structure/fans/tiny,
@@ -838,15 +616,13 @@
name = "Blast Door";
opacity = 0
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/plating,
/area/shuttle/administration)
"Gy" = (
/obj/structure/chair{
dir = 1
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/administration)
"Hc" = (
/obj/machinery/porta_turret{
@@ -859,46 +635,31 @@
/obj/structure/window/reinforced{
dir = 8
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/administration)
"HN" = (
/obj/structure/sign/poster/official/do_not_question,
/obj/item/tank/internals/emergency_oxygen/engi,
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall3"
- },
+/turf/simulated/wall/mineral/titanium,
/area/shuttle/administration)
"Ir" = (
/obj/machinery/computer/shuttle/admin{
name = "NRV Sparta shuttle console"
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
-/area/shuttle/administration)
-"IC" = (
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall3"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"Jt" = (
/obj/machinery/suit_storage_unit/standard_unit,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"Ke" = (
/obj/machinery/door/window/brigdoor/southright{
req_one_access_txt = "2;19"
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/administration)
"Kh" = (
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"Ki" = (
/obj/structure/window/reinforced{
@@ -919,15 +680,7 @@
pixel_y = 0
},
/obj/item/clothing/head/helmet/alt,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
-/area/shuttle/administration)
-"KM" = (
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall7"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"Lh" = (
/obj/structure/rack,
@@ -940,35 +693,23 @@
pixel_y = 3
},
/obj/item/gun/energy/ionrifle,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"LK" = (
/obj/structure/window/reinforced{
dir = 4
},
/obj/machinery/computer/secure_data,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
-/area/shuttle/administration)
-"LP" = (
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall_s9"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"Mi" = (
/obj/structure/table/reinforced,
/obj/machinery/recharger,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"Mj" = (
/obj/machinery/vending/medical,
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/administration)
"Mo" = (
/obj/structure/rack,
@@ -989,22 +730,7 @@
pixel_y = 0
},
/obj/item/clothing/head/helmet/alt,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
-/area/shuttle/administration)
-"MN" = (
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall12"
- },
-/area/shuttle/administration)
-"MZ" = (
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall3";
- tag = "icon-swall3"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"Ni" = (
/obj/structure/window/reinforced{
@@ -1020,58 +746,37 @@
pixel_y = 3
},
/obj/item/gun/projectile/shotgun/riot/buckshot,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"Ns" = (
/obj/machinery/recharger/wallcharger{
pixel_y = 25
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/administration)
"NF" = (
/obj/structure/sign/poster/official/here_for_your_safety,
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall3";
- tag = "icon-swall3"
- },
+/turf/simulated/wall/mineral/titanium,
/area/shuttle/administration)
"NQ" = (
-/obj/machinery/door/poddoor/shutters{
- density = 0;
- dir = 1;
- icon_state = "open";
- id_tag = "Asclshutters";
- name = "Blast Shutters";
- opacity = 0
- },
-/obj/structure/grille,
-/obj/structure/window/full/shuttle,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/obj/effect/spawner/window/shuttle,
+/turf/simulated/floor/plating,
/area/shuttle/administration)
"Op" = (
/obj/structure/dispenser/oxygen,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"Ou" = (
/obj/machinery/autolathe/upgraded{
hacked = 1
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/administration)
"Pe" = (
/obj/machinery/door/window/brigdoor/southright{
req_one_access_txt = "2;19"
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"Pn" = (
/obj/structure/rack,
@@ -1087,15 +792,7 @@
pixel_x = 3;
pixel_y = -3
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
-/area/shuttle/administration)
-"PL" = (
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall_s10"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"PR" = (
/obj/machinery/light/spot{
@@ -1108,9 +805,7 @@
pixel_x = -26;
req_access_txt = "3"
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"PS" = (
/obj/structure/rack,
@@ -1124,9 +819,7 @@
/obj/item/gun/energy/gun/nuclear{
pixel_y = 3
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"PV" = (
/obj/structure/rack,
@@ -1144,16 +837,7 @@
dir = 1;
layer = 2.9
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
-/area/shuttle/administration)
-"RM" = (
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall8";
- tag = "icon-swall12"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"TD" = (
/obj/machinery/door/airlock/command{
@@ -1161,9 +845,7 @@
req_access = null;
req_access_txt = "19"
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"TF" = (
/obj/structure/table/reinforced,
@@ -1172,9 +854,7 @@
},
/obj/structure/window/reinforced,
/obj/item/storage/fancy/donut_box,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"Un" = (
/obj/structure/table/reinforced,
@@ -1201,7 +881,7 @@
pixel_x = 3;
pixel_y = -3
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/administration)
"Ur" = (
/obj/machinery/porta_turret{
@@ -1214,14 +894,7 @@
/obj/structure/window/reinforced{
dir = 4
},
-/turf/simulated/shuttle/floor,
-/area/shuttle/administration)
-"UR" = (
-/obj/machinery/status_display,
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall12"
- },
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/administration)
"UX" = (
/obj/structure/fans/tiny,
@@ -1233,24 +906,14 @@
name = "Blast Door";
opacity = 0
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
-/area/shuttle/administration)
-"Vc" = (
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall_s5"
- },
+/turf/simulated/floor/plating,
/area/shuttle/administration)
"VC" = (
-/obj/machinery/door/airlock/shuttle{
+/obj/machinery/door/airlock/titanium{
name = "Shuttle Armory";
req_access_txt = "3"
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"VQ" = (
/obj/structure/rack,
@@ -1266,9 +929,7 @@
pixel_x = 0;
pixel_y = 0
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"WV" = (
/obj/structure/table/reinforced,
@@ -1286,9 +947,7 @@
icon_state = "tube1";
tag = "icon-tube1 (EAST)"
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"XL" = (
/obj/structure/window/reinforced{
@@ -1304,60 +963,58 @@
pixel_y = 3
},
/obj/item/gun/projectile/shotgun/riot/buckshot,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
(1,1,1) = {"
vk
-MZ
+vk
HN
-IC
-IC
-IC
-IC
-KM
+vk
+vk
+vk
+vk
+vk
+NQ
+NQ
+NQ
wQ
-wQ
-wQ
-wQ
-KM
-IC
-IC
-IC
-IC
-Vc
+vk
+vk
+vk
+vk
+vk
+vk
"}
(2,1,1) = {"
-MN
+vk
Un
xm
Mj
aP
dP
tx
-MN
+vk
eI
Ir
dn
gj
-MN
+vk
vA
cl
cl
DZ
-Eq
+kf
"}
(3,1,1) = {"
-MN
+vk
Ns
mw
mw
mw
mw
mw
-MN
+vk
ua
gh
gh
@@ -1370,19 +1027,19 @@ Kh
Bj
"}
(4,1,1) = {"
-MN
+vk
Ns
mw
mw
mw
mw
Gy
-MN
+vk
qQ
Kh
Kh
Kh
-UR
+yF
Jt
Kh
Kh
@@ -1390,34 +1047,34 @@ Kh
Bj
"}
(5,1,1) = {"
-MN
+vk
Ns
mw
mw
mw
mw
fo
-zY
-MZ
+vk
+vk
TD
-rW
-rW
-pa
-MZ
+NQ
+NQ
+vk
+vk
xH
-nG
-nG
-Eq
+NQ
+NQ
+kf
"}
(6,1,1) = {"
-MN
+vk
bi
Cl
vy
Ou
mw
mw
-MN
+vk
cV
Kh
Kh
@@ -1427,17 +1084,17 @@ Gf
Kh
Mi
Mi
-MN
+vk
"}
(7,1,1) = {"
-zY
-nG
-nG
-nG
-nG
+vk
+NQ
+NQ
+NQ
+NQ
gd
-nG
-MN
+NQ
+vk
xQ
Kh
hN
@@ -1447,10 +1104,10 @@ Kh
Kh
Kh
oj
-MN
+vk
"}
(8,1,1) = {"
-RM
+vk
oY
mw
mw
@@ -1467,7 +1124,7 @@ Kh
Kh
Kh
fQ
-mq
+NQ
"}
(9,1,1) = {"
UX
@@ -1487,7 +1144,7 @@ Kh
Kh
Kh
fQ
-jn
+NQ
"}
(10,1,1) = {"
Gx
@@ -1507,17 +1164,17 @@ Kh
Kh
Kh
Kh
-jn
+NQ
"}
(11,1,1) = {"
-uz
+vk
oY
mw
mw
mw
mw
Hc
-ae
+kf
ir
pQ
pQ
@@ -1527,30 +1184,30 @@ Kh
Kh
Kh
BZ
-MN
+vk
"}
(12,1,1) = {"
-zY
-MZ
+vk
+vk
Bq
yg
VC
yg
yF
-pa
-bm
-bm
-bm
-MZ
-MZ
-xK
+vk
+NQ
+NQ
+NQ
+vk
+vk
+Bq
VC
NF
-MZ
-mM
+vk
+vk
"}
(13,1,1) = {"
-MN
+vk
Kh
wH
eL
@@ -1567,7 +1224,7 @@ Bc
Kh
Kh
AH
-MN
+vk
"}
(14,1,1) = {"
NQ
@@ -1587,7 +1244,7 @@ Pn
Kh
Kh
Kh
-mq
+NQ
"}
(15,1,1) = {"
NQ
@@ -1607,7 +1264,7 @@ Kh
Kh
Kh
Kh
-mq
+NQ
"}
(16,1,1) = {"
NQ
@@ -1627,10 +1284,10 @@ Kh
Kh
Kh
Kh
-mq
+NQ
"}
(17,1,1) = {"
-MN
+vk
fF
Kh
Kh
@@ -1647,45 +1304,45 @@ ce
jB
jU
de
-MN
+vk
"}
(18,1,1) = {"
-PL
-KM
+vk
+vk
uW
uW
-KM
-IC
-IC
-KM
+vk
+vk
+vk
+vk
uW
uW
-KM
-IC
-IC
-KM
+vk
+vk
+vk
+vk
uW
uW
-KM
-LP
+vk
+vk
"}
(19,1,1) = {"
xZ
-PL
+vk
pK
pK
-LP
+vk
xZ
xZ
-PL
+vk
pK
pK
-LP
+vk
xZ
xZ
-PL
+vk
pK
pK
-LP
+vk
xZ
"}
diff --git a/_maps/map_files/shuttles/admin_hospital.dmm b/_maps/map_files/shuttles/admin_hospital.dmm
index 81b233aa2eb..e37b06c17a1 100644
--- a/_maps/map_files/shuttles/admin_hospital.dmm
+++ b/_maps/map_files/shuttles/admin_hospital.dmm
@@ -3,24 +3,9 @@
/turf/space,
/area/space)
"ab" = (
-/turf/simulated/shuttle/wall{
- icon_state = "swall_s6";
- dir = 2
- },
-/area/shuttle/administration)
-"ac" = (
-/turf/simulated/shuttle/wall{
- icon_state = "swall12";
- dir = 2
- },
+/turf/simulated/wall/mineral/titanium,
/area/shuttle/administration)
"ad" = (
-/obj/structure/shuttle/window{
- tag = "icon-window5_end";
- icon = 'icons/turf/shuttle.dmi';
- icon_state = "window5_end";
- dir = 2
- },
/obj/machinery/door/poddoor/shutters{
density = 0;
dir = 1;
@@ -29,60 +14,14 @@
name = "Blast Shutters";
opacity = 0
},
-/obj/structure/grille,
-/turf/space,
-/area/shuttle/administration)
-"ae" = (
-/obj/structure/shuttle/window{
- tag = "icon-window5_mid";
- icon = 'icons/turf/shuttle.dmi';
- icon_state = "window5_mid";
- dir = 2
- },
-/obj/machinery/door/poddoor/shutters{
- density = 0;
- dir = 1;
- icon_state = "open";
- id_tag = "Asclshutters";
- name = "Blast Shutters";
- opacity = 0
- },
-/obj/structure/grille,
-/turf/space,
-/area/shuttle/administration)
-"af" = (
-/obj/structure/shuttle/window{
- tag = "icon-window5_end (NORTH)";
- icon = 'icons/turf/shuttle.dmi';
- icon_state = "window5_end";
- dir = 1
- },
-/obj/machinery/door/poddoor/shutters{
- density = 0;
- dir = 1;
- icon_state = "open";
- id_tag = "Asclshutters";
- name = "Blast Shutters";
- opacity = 0
- },
-/obj/structure/grille,
-/turf/space,
-/area/shuttle/administration)
-"ag" = (
-/turf/simulated/shuttle/wall{
- icon_state = "swall14";
- dir = 2
- },
+/obj/effect/spawner/window/shuttle,
+/turf/simulated/floor/plating,
/area/shuttle/administration)
"ah" = (
/obj/structure/sign/lifestar{
name = "NHV Asclepius"
},
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall8";
- tag = "icon-swall12"
- },
+/turf/simulated/wall/mineral/titanium,
/area/shuttle/administration)
"ai" = (
/obj/structure/fans/tiny,
@@ -94,9 +33,7 @@
name = "Blast Door";
opacity = 0
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/plating,
/area/shuttle/administration)
"aj" = (
/obj/structure/fans/tiny,
@@ -118,80 +55,15 @@
name = "Blast Door";
opacity = 0
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
-/area/shuttle/administration)
-"ak" = (
-/obj/structure/sign/lifestar{
- name = "NHV Asclepius"
- },
-/turf/simulated/shuttle/wall{
- tag = "icon-swall14";
- icon_state = "swall4";
- dir = 2
- },
-/area/shuttle/administration)
-"al" = (
-/obj/machinery/door/poddoor/shutters{
- density = 0;
- dir = 1;
- icon_state = "open";
- id_tag = "Asclshutters";
- name = "Blast Shutters";
- opacity = 0
- },
-/obj/structure/grille,
-/obj/structure/shuttle/window{
- tag = "icon-window5_mid";
- icon = 'icons/turf/shuttle.dmi';
- icon_state = "window5_mid";
- dir = 2
- },
-/turf/space,
-/area/shuttle/administration)
-"am" = (
-/obj/machinery/door/poddoor/shutters{
- density = 0;
- dir = 1;
- icon_state = "open";
- id_tag = "Asclshutters";
- name = "Blast Shutters";
- opacity = 0
- },
-/obj/structure/grille,
-/obj/structure/shuttle/window{
- tag = "icon-window5_end (NORTH)";
- icon = 'icons/turf/shuttle.dmi';
- icon_state = "window5_end";
- dir = 1
- },
-/turf/space,
-/area/shuttle/administration)
-"an" = (
-/turf/simulated/shuttle/wall{
- icon_state = "swall_s10";
- dir = 2
- },
-/area/shuttle/administration)
-"ao" = (
-/turf/simulated/shuttle/wall{
- tag = "icon-swall3";
- icon_state = "swall3";
- dir = 2
- },
+/turf/simulated/floor/plating,
/area/shuttle/administration)
"ap" = (
/obj/machinery/chem_master,
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/administration)
"aq" = (
/obj/machinery/chem_dispenser,
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/administration)
"ar" = (
/obj/machinery/chem_heater,
@@ -200,32 +72,23 @@
icon_state = "tube1";
dir = 1
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/administration)
"as" = (
/obj/structure/closet/secure_closet/reagents,
/obj/item/storage/bag/chemistry,
/obj/item/storage/bag/chemistry,
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/administration)
"at" = (
/obj/structure/closet/secure_closet/chemical,
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/administration)
"au" = (
/obj/structure/sign/chemistry{
pixel_y = 1
},
-/turf/simulated/shuttle/wall{
- icon_state = "swall3";
- dir = 2
- },
+/turf/simulated/wall/mineral/titanium,
/area/shuttle/administration)
"av" = (
/obj/structure/chair{
@@ -236,14 +99,10 @@
/obj/structure/chair/comfy/shuttle{
dir = 4
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/administration)
"aw" = (
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/administration)
"ax" = (
/obj/structure/chair{
@@ -258,24 +117,18 @@
/obj/structure/chair/comfy/shuttle{
dir = 8
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/administration)
"ay" = (
/obj/structure/table/reinforced,
/obj/item/reagent_containers/glass/beaker/cryoxadone,
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/administration)
"az" = (
/obj/machinery/clonepod{
biomass = 300
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/administration)
"aA" = (
/obj/machinery/computer/cloning,
@@ -284,49 +137,27 @@
icon_state = "tube1";
dir = 1
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/administration)
"aB" = (
/obj/machinery/dna_scannernew,
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/administration)
"aC" = (
/obj/machinery/atmospherics/unary/cryo_cell,
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
-/area/shuttle/administration)
-"aD" = (
-/turf/simulated/shuttle/wall{
- icon_state = "swall7";
- dir = 2
- },
-/area/shuttle/administration)
-"aE" = (
-/turf/simulated/shuttle/wall{
- icon_state = "swall3";
- dir = 2
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/administration)
"aF" = (
/obj/structure/reagent_dispensers/fueltank/chem{
pixel_x = -32
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/administration)
"aG" = (
/obj/structure/chair/comfy/shuttle{
dir = 1
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/administration)
"aH" = (
/obj/structure/table/reinforced,
@@ -338,32 +169,22 @@
layer = 2.9
},
/obj/structure/window/reinforced,
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/administration)
"aI" = (
/obj/machinery/light{
dir = 4;
icon_state = "tube1"
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/administration)
"aJ" = (
/obj/structure/sign/nosmoking_2,
-/turf/simulated/shuttle/wall{
- tag = "icon-swall1";
- icon_state = "swall1";
- dir = 2
- },
+/turf/simulated/wall/mineral/titanium,
/area/shuttle/administration)
"aK" = (
/obj/machinery/atmospherics/pipe/simple/hidden,
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/administration)
"aL" = (
/obj/structure/shuttle/engine/heater{
@@ -373,14 +194,14 @@
/obj/structure/window/plasmareinforced{
dir = 8
},
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating/airless,
/area/shuttle/administration)
"aM" = (
/obj/structure/shuttle/engine/propulsion{
dir = 4;
icon_state = "propulsion"
},
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating/airless,
/area/shuttle/administration)
"aN" = (
/obj/structure/table/reinforced,
@@ -393,22 +214,15 @@
/obj/item/reagent_containers/glass/bucket,
/obj/item/reagent_containers/glass/bucket,
/obj/item/reagent_containers/glass/bucket,
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/administration)
"aO" = (
/obj/structure/closet/crate/can,
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/administration)
"aP" = (
-/obj/structure/shuttle/window,
-/obj/structure/grille,
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/obj/effect/spawner/window/shuttle,
+/turf/simulated/floor/plating,
/area/shuttle/administration)
"aQ" = (
/obj/structure/chair{
@@ -417,9 +231,7 @@
/obj/structure/chair/comfy/shuttle{
dir = 4
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/administration)
"aR" = (
/obj/structure/chair{
@@ -428,9 +240,7 @@
/obj/structure/chair/comfy/shuttle{
dir = 8
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/administration)
"aS" = (
/obj/structure/table/reinforced,
@@ -443,24 +253,18 @@
name = "NHV Asclepius Chemistry";
network = list("NHV Asclepius")
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/administration)
"aT" = (
-/obj/machinery/door/airlock/shuttle/glass{
+/obj/machinery/door/airlock/titanium/glass{
name = "Chemistry";
req_access_txt = "33"
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/administration)
"aU" = (
-/obj/machinery/door/airlock/shuttle/glass,
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/obj/machinery/door/airlock/titanium/glass,
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/administration)
"aV" = (
/obj/machinery/camera{
@@ -470,15 +274,7 @@
network = list("NHV Asclepius")
},
/obj/machinery/atmospherics/pipe/simple/hidden,
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
-/area/shuttle/administration)
-"aW" = (
-/turf/simulated/shuttle/wall{
- icon_state = "swall_s9";
- dir = 2
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/administration)
"aX" = (
/obj/machinery/iv_drip,
@@ -486,66 +282,47 @@
/obj/structure/reagent_dispensers/fueltank/chem{
pixel_x = -32
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/administration)
"aY" = (
/obj/structure/chair/comfy/shuttle,
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/administration)
"aZ" = (
/obj/machinery/atmospherics/pipe/simple/hidden{
dir = 6
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/administration)
"ba" = (
/obj/machinery/chem_heater,
/obj/machinery/light,
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/administration)
"bb" = (
/obj/machinery/status_display,
-/turf/simulated/shuttle/wall{
- icon_state = "swall3";
- dir = 2
- },
+/turf/simulated/wall/mineral/titanium,
/area/shuttle/administration)
"bc" = (
/obj/structure/reagent_dispensers/water_cooler,
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/administration)
"bd" = (
/obj/machinery/vending/coffee,
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/administration)
"be" = (
/obj/structure/table/reinforced,
/obj/item/reagent_containers/spray/cleaner,
/obj/item/storage/box/gloves,
/obj/item/storage/box/masks,
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/administration)
"bf" = (
/obj/machinery/atmospherics/pipe/manifold/hidden{
dir = 4
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/administration)
"bg" = (
/obj/structure/table/reinforced,
@@ -553,9 +330,7 @@
/obj/item/storage/firstaid,
/obj/item/storage/firstaid/adv,
/obj/item/storage/firstaid/adv,
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/administration)
"bh" = (
/obj/structure/table/reinforced,
@@ -566,63 +341,19 @@
/obj/item/clothing/glasses/hud/health,
/obj/item/clothing/glasses/hud/health,
/obj/machinery/light,
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/administration)
"bi" = (
/obj/machinery/atmospherics/unary/thermomachine/freezer{
dir = 1
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/administration)
"bj" = (
/obj/machinery/smartfridge/medbay,
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
-/area/shuttle/administration)
-"bk" = (
-/turf/simulated/shuttle/wall{
- tag = "icon-swall13";
- icon_state = "swall13";
- dir = 2
- },
-/area/shuttle/administration)
-"bl" = (
-/obj/structure/shuttle/window,
-/obj/structure/grille,
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall8";
- tag = "icon-swall12"
- },
-/area/shuttle/administration)
-"bm" = (
-/obj/structure/shuttle/window,
-/obj/structure/grille,
-/turf/simulated/shuttle/wall{
- tag = "icon-swall14";
- icon_state = "swall4";
- dir = 2
- },
-/area/shuttle/administration)
-"bn" = (
-/turf/simulated/shuttle/wall{
- tag = "icon-swall15";
- icon_state = "swall15";
- dir = 2
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/administration)
"bo" = (
-/obj/structure/shuttle/window{
- tag = "icon-window5_end (WEST)";
- icon = 'icons/turf/shuttle.dmi';
- icon_state = "window5_end";
- dir = 8
- },
/obj/machinery/door/poddoor/shutters{
density = 0;
dir = 8;
@@ -631,14 +362,12 @@
name = "Blast Shutters";
opacity = 0
},
-/obj/structure/grille,
-/turf/space,
+/obj/effect/spawner/window/shuttle,
+/turf/simulated/floor/plating,
/area/shuttle/administration)
"bp" = (
/obj/machinery/computer/pandemic,
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/administration)
"bq" = (
/obj/machinery/camera{
@@ -675,9 +404,7 @@
/obj/structure/chair/comfy/shuttle{
dir = 8
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/administration)
"br" = (
/obj/machinery/recharger/wallcharger{
@@ -686,16 +413,7 @@
/obj/machinery/recharger/wallcharger{
pixel_y = 35
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
-/area/shuttle/administration)
-"bs" = (
-/turf/simulated/shuttle/wall{
- tag = "icon-swall1";
- icon_state = "swall1";
- dir = 2
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/administration)
"bt" = (
/obj/structure/sink{
@@ -704,9 +422,7 @@
pixel_x = -12;
pixel_y = 2
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/administration)
"bu" = (
/obj/machinery/light{
@@ -717,9 +433,7 @@
/obj/structure/closet/walllocker/emerglocker{
pixel_y = 32
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/administration)
"bv" = (
/obj/machinery/vending/medical,
@@ -728,9 +442,7 @@
icon_state = "tube1";
dir = 1
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/administration)
"bw" = (
/obj/structure/table/tray,
@@ -745,15 +457,11 @@
/obj/item/FixOVein,
/obj/item/surgicaldrill,
/obj/item/storage/backpack/duffel/medical,
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/administration)
"bx" = (
/obj/machinery/optable,
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/administration)
"by" = (
/obj/machinery/computer/operating,
@@ -762,47 +470,21 @@
icon_state = "tube1";
dir = 1
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/administration)
"bz" = (
/obj/structure/closet/secure_closet/medical3,
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/administration)
"bA" = (
/obj/structure/closet/secure_closet/medical2,
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
-/area/shuttle/administration)
-"bB" = (
-/obj/structure/shuttle/window{
- dir = 4;
- icon = 'icons/turf/shuttle.dmi';
- icon_state = "window5_mid";
- tag = "icon-window5 (EAST)"
- },
-/obj/machinery/door/poddoor/shutters{
- density = 0;
- dir = 8;
- icon_state = "open";
- id_tag = "Asclshutters";
- name = "Blast Shutters";
- opacity = 0
- },
-/obj/structure/grille,
-/turf/space,
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/administration)
"bC" = (
/obj/machinery/computer/shuttle/admin{
name = "NHV Asclepius shuttle console"
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/administration)
"bD" = (
/obj/machinery/door/airlock/command{
@@ -810,9 +492,7 @@
req_access = null;
req_access_txt = "19"
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/administration)
"bE" = (
/obj/structure/closet/crate/freezer,
@@ -820,15 +500,7 @@
/obj/item/reagent_containers/iv_bag/blood/OMinus,
/obj/item/reagent_containers/iv_bag/blood/OMinus,
/obj/item/reagent_containers/iv_bag/blood/OMinus,
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
-/area/shuttle/administration)
-"bF" = (
-/turf/simulated/shuttle/wall{
- icon_state = "swall1";
- dir = 2
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/administration)
"bG" = (
/obj/machinery/camera{
@@ -837,27 +509,21 @@
name = "NHV Asclepius OR 1";
network = list("NHV Asclepius")
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/administration)
"bH" = (
/obj/machinery/computer/camera_advanced/shuttle_docker/admin{
name = "NHV Asclepius navigation computer"
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/administration)
"bI" = (
-/obj/machinery/door/airlock/shuttle/glass{
+/obj/machinery/door/airlock/titanium/glass{
name = "Operating Room";
req_access = null;
req_access_txt = "45"
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/administration)
"bJ" = (
/obj/structure/sink{
@@ -866,35 +532,13 @@
pixel_x = 11;
pixel_y = 0
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
-/area/shuttle/administration)
-"bK" = (
-/obj/structure/shuttle/window{
- tag = "icon-window5_end (EAST)";
- icon = 'icons/turf/shuttle.dmi';
- icon_state = "window5_end";
- dir = 4
- },
-/obj/machinery/door/poddoor/shutters{
- density = 0;
- dir = 8;
- icon_state = "open";
- id_tag = "Asclshutters";
- name = "Blast Shutters";
- opacity = 0
- },
-/obj/structure/grille,
-/turf/space,
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/administration)
"bL" = (
/obj/machinery/computer/communications{
name = "NHV Asclepius Communications Console"
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/administration)
"bM" = (
/obj/structure/chair{
@@ -904,51 +548,32 @@
/obj/structure/chair/comfy/shuttle{
dir = 8
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
-/area/shuttle/administration)
-"bN" = (
-/turf/simulated/shuttle/wall{
- tag = "icon-swall2";
- icon_state = "swall2";
- dir = 2
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/administration)
"bO" = (
/obj/machinery/sleeper,
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/administration)
"bP" = (
/obj/machinery/sleeper{
dir = 4
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/administration)
"bQ" = (
/obj/structure/bed{
name = "Triage: High Priority"
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/administration)
"bR" = (
/obj/machinery/bodyscanner,
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/administration)
"bT" = (
/obj/machinery/light,
/obj/structure/closet/crate/can,
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/administration)
"bU" = (
/obj/item/reagent_containers/spray/cleaner{
@@ -956,46 +581,22 @@
name = "Surgery Cleaner"
},
/obj/structure/table/glass,
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/administration)
"bV" = (
/obj/structure/closet/crate/freezer,
/obj/item/reagent_containers/iv_bag/blood/OMinus,
/obj/item/reagent_containers/iv_bag/blood/OMinus,
/obj/machinery/iv_drip,
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
-/area/shuttle/administration)
-"bW" = (
-/obj/machinery/status_display,
-/turf/simulated/shuttle/wall{
- icon_state = "swall12";
- dir = 2
- },
-/area/shuttle/administration)
-"bX" = (
-/turf/simulated/shuttle/wall{
- icon_state = "swall13";
- dir = 2
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/administration)
"bY" = (
/obj/structure/sign/examroom,
-/turf/simulated/shuttle/wall{
- icon_state = "swall12";
- dir = 2
- },
+/turf/simulated/wall/mineral/titanium,
/area/shuttle/administration)
"bZ" = (
/obj/machinery/defibrillator_mount/loaded,
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall8";
- tag = "icon-swall12"
- },
+/turf/simulated/wall/mineral/titanium,
/area/shuttle/administration)
"ca" = (
/obj/machinery/light{
@@ -1007,9 +608,7 @@
name = "NHV Asclepius Central";
network = list("NHV Asclepius")
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/administration)
"cb" = (
/obj/machinery/light{
@@ -1020,22 +619,7 @@
name = "Triage: High Priority"
},
/obj/machinery/iv_drip,
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
-/area/shuttle/administration)
-"cc" = (
-/obj/structure/sign/nosmoking_2,
-/turf/simulated/shuttle/wall{
- icon_state = "swall7";
- dir = 2
- },
-/area/shuttle/administration)
-"cd" = (
-/turf/simulated/shuttle/wall{
- icon_state = "swall11";
- dir = 2
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/administration)
"ce" = (
/obj/machinery/portable_atmospherics/canister/oxygen{
@@ -1044,17 +628,13 @@
/obj/machinery/atmospherics/unary/portables_connector{
dir = 1
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/administration)
"cf" = (
/obj/structure/table/glass,
/obj/item/reagent_containers/glass/beaker/cryoxadone,
/obj/item/reagent_containers/glass/beaker/cryoxadone,
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/administration)
"cg" = (
/obj/machinery/portable_atmospherics/canister/oxygen{
@@ -1072,9 +652,7 @@
network = list("NHV Asclepius")
},
/obj/machinery/atmospherics/unary/portables_connector,
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/administration)
"ch" = (
/obj/structure/table/glass,
@@ -1083,24 +661,18 @@
name = "Surgery Cleaner"
},
/obj/machinery/cell_charger,
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/administration)
"ci" = (
/obj/structure/bed{
name = "Triage: High Priority"
},
/obj/machinery/iv_drip,
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/administration)
"cj" = (
/obj/machinery/atmospherics/unary/thermomachine/freezer,
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/administration)
"ck" = (
/obj/machinery/camera{
@@ -1109,9 +681,7 @@
name = "NHV Asclepius OR 2";
network = list("NHV Asclepius")
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/administration)
"cl" = (
/obj/structure/closet/radiation,
@@ -1121,9 +691,7 @@
/obj/item/clothing/suit/radiation,
/obj/item/clothing/suit/radiation,
/obj/item/clothing/suit/radiation,
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/administration)
"cm" = (
/obj/structure/closet/l3closet,
@@ -1133,112 +701,60 @@
/obj/item/clothing/suit/bio_suit,
/obj/item/clothing/suit/bio_suit,
/obj/item/clothing/suit/bio_suit,
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/administration)
"cn" = (
/obj/structure/closet/secure_closet/medical1,
/obj/item/clothing/head/beret/med,
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/administration)
"co" = (
/obj/machinery/portable_atmospherics/canister/oxygen,
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/administration)
"cp" = (
/obj/machinery/suit_storage_unit/cmo/secure/sec_storage,
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/administration)
"cq" = (
/obj/machinery/light,
/obj/machinery/suit_storage_unit/cmo/secure/sec_storage,
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/administration)
"cr" = (
/obj/structure/dispenser/oxygen,
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/administration)
"cs" = (
/obj/machinery/vending/medical,
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
-/area/shuttle/administration)
-"ct" = (
-/turf/simulated/shuttle/wall{
- icon_state = "swall_s5";
- dir = 2
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/administration)
"cu" = (
/obj/machinery/atmospherics/pipe/simple/hidden{
dir = 5;
icon_state = "intact"
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/administration)
"cv" = (
/obj/machinery/atmospherics/pipe/manifold/hidden,
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/administration)
"cw" = (
/obj/machinery/atmospherics/pipe/simple/hidden{
dir = 4;
level = 1
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/administration)
"cx" = (
/obj/machinery/atmospherics/pipe/simple/hidden{
dir = 9;
icon_state = "intact"
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
-/area/shuttle/administration)
-"hL" = (
-/obj/structure/shuttle/window{
- tag = "icon-window5_mid";
- icon = 'icons/turf/shuttle.dmi';
- icon_state = "window5_mid";
- dir = 2
- },
-/obj/structure/grille,
-/obj/machinery/door/poddoor/shutters{
- density = 0;
- dir = 2;
- icon_state = "open";
- id_tag = "Asclshutters";
- name = "Blast Shutters";
- opacity = 0
- },
-/turf/space,
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/administration)
"qa" = (
-/obj/structure/shuttle/window{
- tag = "icon-window5_end";
- icon = 'icons/turf/shuttle.dmi';
- icon_state = "window5_end";
- dir = 2
- },
/obj/machinery/door/poddoor/shutters{
density = 0;
dir = 2;
@@ -1247,85 +763,53 @@
name = "Blast Shutters";
opacity = 0
},
-/obj/structure/grille,
-/turf/space,
+/obj/effect/spawner/window/shuttle,
+/turf/simulated/floor/plating,
/area/shuttle/administration)
-"Kq" = (
-/obj/structure/shuttle/window{
- tag = "icon-window5_end";
- icon = 'icons/turf/shuttle.dmi';
- icon_state = "window5_end";
- dir = 2
- },
-/obj/structure/grille,
-/obj/machinery/door/poddoor/shutters{
- density = 0;
- dir = 2;
- icon_state = "open";
- id_tag = "Asclshutters";
- name = "Blast Shutters";
- opacity = 0
- },
-/turf/space,
-/area/shuttle/administration)
-"Vi" = (
-/obj/structure/shuttle/window{
- tag = "icon-window5_end (NORTH)";
- icon = 'icons/turf/shuttle.dmi';
- icon_state = "window5_end";
- dir = 1
- },
-/obj/structure/grille,
-/obj/machinery/door/poddoor/shutters{
- density = 0;
- dir = 2;
- icon_state = "open";
- id_tag = "Asclshutters";
- name = "Blast Shutters";
- opacity = 0
- },
-/turf/space,
+"zD" = (
+/obj/effect/spawner/window/shuttle,
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/administration)
(1,1,1) = {"
ab
-ao
-aE
-aE
-aE
-aE
-aE
-aD
+ab
+ab
+ab
+ab
+ab
+ab
+ab
bo
-bB
-bB
-bK
-aD
-aE
-aE
-aE
-aE
-ct
+bo
+bo
+bo
+ab
+ab
+ab
+ab
+ab
+ab
"}
(2,1,1) = {"
-ac
+ab
ap
aF
aN
aS
aX
ap
-ac
+ab
bp
bC
bH
bL
-ac
+ab
cg
cu
aw
cl
-ac
+ab
"}
(3,1,1) = {"
ad
@@ -1335,12 +819,12 @@ aw
aw
aY
aq
-ac
+ab
bq
aR
aR
bM
-ac
+ab
aC
cv
aw
@@ -1348,47 +832,47 @@ cm
qa
"}
(4,1,1) = {"
-ae
+ad
ar
aw
aw
aw
aw
ba
-ac
+ab
br
aw
aw
aw
-bW
+bb
cf
cw
aw
cn
-hL
+qa
"}
(5,1,1) = {"
-af
+ad
as
aw
aw
aw
aw
aw
-ag
-bs
+ab
+ab
bD
-aP
-bN
-bX
+zD
+ab
+ab
aC
cv
aw
co
-Vi
+qa
"}
(6,1,1) = {"
-ac
+ab
at
aw
aO
@@ -1405,17 +889,17 @@ cj
cx
aw
cp
-ac
+ab
"}
(7,1,1) = {"
-ag
+ab
au
aH
aP
aT
aP
bb
-bk
+ab
bu
aw
aw
@@ -1425,7 +909,7 @@ ch
aw
aw
cq
-ac
+ab
"}
(8,1,1) = {"
ah
@@ -1435,7 +919,7 @@ aQ
aw
aQ
bc
-bl
+aP
aw
aw
aw
@@ -1445,7 +929,7 @@ aw
aw
aw
cr
-ac
+ab
"}
(9,1,1) = {"
ai
@@ -1465,7 +949,7 @@ aw
aw
aw
bR
-ac
+ab
"}
(10,1,1) = {"
aj
@@ -1485,17 +969,17 @@ aw
aw
aw
aw
-ac
+ab
"}
(11,1,1) = {"
-ak
+ah
ax
aI
aR
aw
aR
bd
-bm
+aP
bv
bE
aw
@@ -1505,47 +989,47 @@ ci
bQ
aw
cs
-ac
+ab
"}
(12,1,1) = {"
-ag
-ao
+ab
+ab
aJ
aP
aU
aP
bb
-bn
+ab
aP
-bF
+ab
bI
-bN
-cc
+ab
+aJ
aP
-bF
+ab
bI
-bN
-bX
+ab
+ab
"}
(13,1,1) = {"
-ac
+ab
ay
aw
aw
aw
aw
be
-ac
+ab
bw
bG
aw
bR
-ac
+ab
bw
ck
aw
bR
-ac
+ab
"}
(14,1,1) = {"
ad
@@ -1555,115 +1039,115 @@ aw
aw
aw
bg
-ac
+ab
bx
aw
aw
aw
-ac
+ab
bx
aw
aw
aw
-Kq
+qa
"}
(15,1,1) = {"
-al
+ad
aA
aw
aw
aw
aw
bh
-ac
+ab
by
aw
aw
bT
-ac
+ab
by
aw
aw
bT
-hL
+qa
"}
(16,1,1) = {"
-am
+ad
aB
aw
aw
aw
aZ
bi
-ac
+ab
bz
aw
aw
bU
-ac
+ab
bz
aw
aw
bU
-Vi
+qa
"}
(17,1,1) = {"
-ac
+ab
aC
aK
aK
aV
bf
ce
-ac
+ab
bA
aw
bJ
bV
-ac
+ab
bA
aw
bJ
bV
-ac
+ab
"}
(18,1,1) = {"
-an
-aD
+ab
+ab
aL
aL
-aD
-aE
-aE
-bn
+ab
+ab
+ab
+ab
aL
aL
-aD
-aE
-cd
-aD
+ab
+ab
+ab
+ab
aL
aL
-aD
-aW
+ab
+ab
"}
(19,1,1) = {"
aa
-an
+ab
aM
aM
-aW
+ab
aa
aa
-an
+ab
aM
aM
-aW
+ab
aa
aa
-an
+ab
aM
aM
-aW
+ab
aa
"}
diff --git a/_maps/map_files/shuttles/cargo_base.dmm b/_maps/map_files/shuttles/cargo_base.dmm
index d14aa27c38e..49eca02c975 100644
--- a/_maps/map_files/shuttles/cargo_base.dmm
+++ b/_maps/map_files/shuttles/cargo_base.dmm
@@ -1,36 +1,9 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"a" = (
-/turf/space,
-/turf/simulated/shuttle/wall{
- tag = "icon-swall_f6";
- icon_state = "swall_f6";
- dir = 2
- },
-/area/shuttle/supply)
-"b" = (
-/turf/simulated/shuttle/wall{
- tag = "icon-swall12";
- icon_state = "swall12";
- dir = 2
- },
-/area/shuttle/supply)
-"c" = (
-/turf/space,
-/turf/simulated/shuttle/wall{
- tag = "icon-swall_f10";
- icon_state = "swall_f10";
- dir = 2
- },
-/area/shuttle/supply)
-"d" = (
-/turf/simulated/shuttle/wall{
- tag = "icon-swall3";
- icon_state = "swall3";
- dir = 2
- },
+/turf/simulated/wall/mineral/titanium,
/area/shuttle/supply)
"e" = (
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/supply)
"f" = (
/obj/machinery/light/spot{
@@ -38,7 +11,7 @@
icon_state = "tube1";
dir = 1
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/supply)
"g" = (
/obj/machinery/conveyor{
@@ -46,7 +19,7 @@
id = "QMLoad2"
},
/obj/structure/plasticflaps/mining,
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating,
/area/shuttle/supply)
"h" = (
/obj/machinery/door/airlock/external{
@@ -54,7 +27,7 @@
name = "Shuttle Hatch";
req_access_txt = "31"
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/plating,
/area/shuttle/supply)
"i" = (
/obj/machinery/light/spot{
@@ -62,7 +35,7 @@
icon_state = "tube1";
dir = 8
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/supply)
"j" = (
/obj/machinery/light/spot{
@@ -86,7 +59,7 @@
pixel_y = -8;
req_access_txt = "0"
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/supply)
"k" = (
/obj/machinery/door/airlock/external{
@@ -97,7 +70,7 @@
/obj/docking_port/mobile/supply{
timid = 1
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/plating,
/area/shuttle/supply)
"l" = (
/obj/machinery/conveyor{
@@ -105,69 +78,18 @@
id = "QMLoad"
},
/obj/structure/plasticflaps/mining,
-/turf/simulated/shuttle/plating,
-/area/shuttle/supply)
-"m" = (
-/turf/simulated/shuttle/wall{
- tag = "icon-swall7";
- icon_state = "swall7";
- dir = 2
- },
-/area/shuttle/supply)
-"n" = (
-/turf/simulated/shuttle/floor,
-/turf/simulated/shuttle/wall/interior{
- tag = "icon-swall_f10";
- icon_state = "swall_f10"
- },
+/turf/simulated/floor/plating,
/area/shuttle/supply)
"o" = (
/obj/machinery/light/spot,
-/turf/simulated/shuttle/floor,
-/area/shuttle/supply)
-"p" = (
-/turf/simulated/shuttle/floor,
-/turf/simulated/shuttle/wall/interior{
- tag = "icon-swall_f6";
- icon_state = "swall_f6"
- },
-/area/shuttle/supply)
-"q" = (
-/turf/simulated/shuttle/wall{
- tag = "icon-swall11";
- icon_state = "swall11";
- dir = 2
- },
-/area/shuttle/supply)
-"r" = (
-/turf/space,
-/turf/simulated/shuttle/wall{
- tag = "icon-swall_f5";
- icon_state = "swall_f5";
- dir = 2
- },
-/area/shuttle/supply)
-"s" = (
-/turf/simulated/shuttle/wall{
- tag = "icon-swall15";
- icon_state = "swall15";
- dir = 2
- },
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/supply)
"t" = (
/obj/structure/window/reinforced{
dir = 1
},
/obj/structure/shuttle/engine/heater,
-/turf/simulated/shuttle/plating,
-/area/shuttle/supply)
-"u" = (
-/turf/space,
-/turf/simulated/shuttle/wall{
- tag = "icon-swall_f9";
- icon_state = "swall_f9";
- dir = 2
- },
+/turf/simulated/floor/plating/airless,
/area/shuttle/supply)
"v" = (
/turf/space,
@@ -177,36 +99,36 @@
tag = "icon-burst_l";
icon_state = "burst_l"
},
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating/airless,
/area/shuttle/supply)
"x" = (
/obj/structure/shuttle/engine/propulsion,
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating/airless,
/area/shuttle/supply)
"y" = (
/obj/structure/shuttle/engine/propulsion{
tag = "icon-burst_r";
icon_state = "burst_r"
},
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating/airless,
/area/shuttle/supply)
(1,1,1) = {"
a
-d
-d
-d
-d
-d
-d
-d
-d
-m
-r
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
v
"}
(2,1,1) = {"
-b
+a
e
e
e
@@ -215,12 +137,12 @@ i
e
e
e
-n
-s
+a
+a
w
"}
(3,1,1) = {"
-b
+a
e
e
e
@@ -234,7 +156,7 @@ t
x
"}
(4,1,1) = {"
-b
+a
f
e
e
@@ -248,7 +170,7 @@ t
x
"}
(5,1,1) = {"
-b
+a
e
e
e
@@ -262,7 +184,7 @@ t
x
"}
(6,1,1) = {"
-b
+a
e
e
e
@@ -271,21 +193,21 @@ j
e
e
e
-p
-s
+a
+a
y
"}
(7,1,1) = {"
-c
-d
-d
+a
+a
+a
g
h
-d
+a
k
l
-d
-q
-u
+a
+a
+a
v
"}
diff --git a/_maps/map_files/shuttles/emergency_bar.dmm b/_maps/map_files/shuttles/emergency_bar.dmm
index 5d45aa9b206..5839657ec3d 100644
--- a/_maps/map_files/shuttles/emergency_bar.dmm
+++ b/_maps/map_files/shuttles/emergency_bar.dmm
@@ -3,39 +3,16 @@
/turf/space,
/area/space)
"ab" = (
-/turf/space,
-/turf/simulated/shuttle/wall{
- icon_state = "swall_f6";
- dir = 2
- },
+/turf/simulated/wall/mineral/titanium,
/area/shuttle/escape)
"ac" = (
-/obj/structure/grille,
-/obj/structure/window/full/shuttle,
+/obj/effect/spawner/window/shuttle,
/turf/simulated/floor/plating,
/area/shuttle/escape)
-"ad" = (
-/turf/space,
-/turf/simulated/shuttle/wall{
- tag = "icon-swall_f10";
- icon_state = "swall_f10";
- dir = 2
- },
-/area/shuttle/escape)
-"ae" = (
-/turf/simulated/shuttle/wall{
- icon_state = "swallc4"
- },
-/area/shuttle/escape)
"af" = (
/obj/machinery/computer/emergency_shuttle,
/turf/simulated/floor/carpet,
/area/shuttle/escape)
-"ag" = (
-/turf/simulated/shuttle/wall{
- icon_state = "swallc3"
- },
-/area/shuttle/escape)
"ah" = (
/obj/machinery/computer/security{
network = list("SS13","Telecomms","Research Outpost","Mining Outpost")
@@ -80,12 +57,6 @@
},
/turf/simulated/floor/carpet,
/area/shuttle/escape)
-"ap" = (
-/turf/simulated/shuttle/wall{
- icon_state = "swall3";
- dir = 2
- },
-/area/shuttle/escape)
"aq" = (
/obj/machinery/computer/robotics,
/turf/simulated/floor/carpet,
@@ -100,24 +71,12 @@
/obj/machinery/light/spot,
/turf/simulated/floor/carpet,
/area/shuttle/escape)
-"at" = (
-/turf/simulated/shuttle/wall{
- icon_state = "swall12";
- dir = 2
- },
-/area/shuttle/escape)
-"au" = (
-/turf/simulated/shuttle/wall{
- icon_state = "swall13";
- dir = 2
- },
-/area/shuttle/escape)
"av" = (
/obj/machinery/door/airlock/command/glass{
name = "Escape Shuttle Cockpit";
req_access_txt = "19"
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/carpet,
/area/shuttle/escape)
"aw" = (
/obj/structure/chair{
@@ -126,7 +85,7 @@
/obj/structure/chair/comfy/shuttle{
dir = 4
},
-/turf/simulated/shuttle/floor4,
+/turf/simulated/floor/mineral/plastitanium/red/brig,
/area/shuttle/escape)
"ax" = (
/obj/machinery/status_display{
@@ -139,18 +98,7 @@
},
/obj/structure/chair,
/obj/structure/chair/comfy/shuttle,
-/turf/simulated/shuttle/floor4,
-/area/shuttle/escape)
-"ay" = (
-/obj/machinery/door/airlock/shuttle{
- aiControlDisabled = 1;
- hackProof = 1;
- id_tag = "s_docking_airlock";
- name = "Shuttle Hatch"
- },
-/turf/simulated/floor/plasteel{
- icon_state = "freezerfloor"
- },
+/turf/simulated/floor/mineral/plastitanium/red/brig,
/area/shuttle/escape)
"az" = (
/obj/item/twohanded/required/kirbyplants,
@@ -201,17 +149,17 @@
/obj/structure/chair/comfy/shuttle{
dir = 4
},
-/turf/simulated/shuttle/floor4,
+/turf/simulated/floor/mineral/plastitanium/red/brig,
/area/shuttle/escape)
"aF" = (
-/turf/simulated/shuttle/floor4,
+/turf/simulated/floor/mineral/plastitanium/red/brig,
/area/shuttle/escape)
"aG" = (
/obj/machinery/door/airlock/security/glass{
name = "Escape Shuttle Cell";
req_access_txt = "2"
},
-/turf/simulated/floor/plating,
+/turf/simulated/floor/mineral/plastitanium/red/brig,
/area/shuttle/escape)
"aH" = (
/turf/simulated/floor/plasteel{
@@ -219,7 +167,7 @@
},
/area/shuttle/escape)
"aI" = (
-/obj/machinery/door/airlock/shuttle{
+/obj/machinery/door/airlock/titanium{
aiControlDisabled = 1;
hackProof = 1;
id_tag = "s_docking_airlock";
@@ -234,19 +182,12 @@
/obj/structure/chair/comfy/shuttle{
dir = 1
},
-/turf/simulated/shuttle/floor4,
+/turf/simulated/floor/mineral/plastitanium/red/brig,
/area/shuttle/escape)
"aK" = (
/obj/structure/chair,
/obj/structure/chair/comfy/shuttle,
-/turf/simulated/shuttle/floor4,
-/area/shuttle/escape)
-"aL" = (
-/obj/structure/grille,
-/obj/structure/window/full/shuttle{
- icon_state = "16"
- },
-/turf/simulated/floor/plating,
+/turf/simulated/floor/mineral/plastitanium/red/brig,
/area/shuttle/escape)
"aM" = (
/obj/structure/chair/stool/bar,
@@ -280,9 +221,7 @@
/obj/item/bodybag{
pixel_x = 5
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/escape)
"aP" = (
/obj/structure/table/wood,
@@ -292,20 +231,6 @@
dir = 2
},
/area/shuttle/escape)
-"aQ" = (
-/turf/simulated/shuttle/wall{
- tag = "icon-swall7";
- icon_state = "swall7";
- dir = 2
- },
-/area/shuttle/escape)
-"aR" = (
-/obj/structure/grille,
-/obj/structure/window/full/shuttle{
- icon_state = "15"
- },
-/turf/simulated/floor/plating,
-/area/shuttle/escape)
"aS" = (
/obj/machinery/light/spot{
tag = "icon-tube1 (EAST)";
@@ -326,13 +251,13 @@
timid = 1;
width = 24
},
-/obj/machinery/door/airlock/shuttle{
+/obj/machinery/door/airlock/titanium{
aiControlDisabled = 1;
hackProof = 1;
id_tag = "s_docking_airlock";
name = "Shuttle Hatch"
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/plating,
/area/shuttle/escape)
"aU" = (
/obj/structure/table,
@@ -381,13 +306,6 @@
dir = 2
},
/area/shuttle/escape)
-"ba" = (
-/obj/structure/grille,
-/obj/structure/window/full/shuttle{
- icon_state = "8"
- },
-/turf/simulated/floor/plating,
-/area/shuttle/escape)
"bb" = (
/obj/structure/table/wood,
/obj/item/deck/cards,
@@ -435,15 +353,6 @@
dir = 2
},
/area/shuttle/escape)
-"bg" = (
-/obj/machinery/door/airlock/shuttle{
- aiControlDisabled = 1;
- hackProof = 1;
- id_tag = "s_docking_airlock";
- name = "Shuttle Hatch"
- },
-/turf/simulated/shuttle/floor,
-/area/shuttle/escape)
"bh" = (
/obj/machinery/status_display{
pixel_y = -30
@@ -459,24 +368,8 @@
name = "Toilet";
req_access_txt = "0"
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
-/area/shuttle/escape)
-"bj" = (
-/turf/simulated/shuttle/wall{
- tag = "icon-swall14";
- icon_state = "swall14";
- dir = 2
- },
-/area/shuttle/escape)
-"bk" = (
-/obj/structure/grille,
-/obj/structure/window/full/shuttle{
- icon_state = "15"
- },
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
+/turf/simulated/floor/plasteel{
+ icon_state = "freezerfloor"
},
/area/shuttle/escape)
"bl" = (
@@ -499,9 +392,7 @@
name = "Escape Shuttle Infirmary";
req_access_txt = "0"
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/escape)
"bo" = (
/turf/simulated/floor/plasteel{
@@ -529,9 +420,7 @@
},
/area/shuttle/escape)
"br" = (
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/escape)
"bs" = (
/obj/machinery/vending/wallmed{
@@ -542,9 +431,7 @@
req_access_txt = "0"
},
/obj/structure/bed/roller,
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/escape)
"bt" = (
/obj/machinery/door/airlock{
@@ -554,9 +441,6 @@
icon_state = "freezerfloor"
},
/area/shuttle/escape)
-"bu" = (
-/turf/simulated/shuttle/wall,
-/area/shuttle/escape)
"bv" = (
/obj/machinery/door/airlock{
name = "Unit 2"
@@ -583,9 +467,7 @@
icon_state = "tube1";
dir = 8
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/escape)
"by" = (
/obj/item/radio/intercom{
@@ -594,9 +476,7 @@
pixel_x = 28
},
/obj/structure/bed/roller,
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/escape)
"bz" = (
/obj/structure/toilet{
@@ -625,65 +505,29 @@
icon_state = "sleeper";
dir = 1
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/escape)
"bD" = (
/obj/machinery/light/spot,
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
-/area/shuttle/escape)
-"bE" = (
-/turf/space,
-/turf/simulated/shuttle/wall{
- icon_state = "swall_f5";
- dir = 2
- },
-/area/shuttle/escape)
-"bF" = (
-/turf/simulated/shuttle/wall{
- icon_state = "swall14";
- dir = 2
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/escape)
"bG" = (
/obj/structure/window/reinforced{
dir = 1
},
/obj/structure/shuttle/engine/heater,
-/turf/simulated/shuttle/plating,
-/area/shuttle/escape)
-"bH" = (
-/turf/simulated/shuttle/wall{
- icon_state = "swall11";
- dir = 2
- },
-/area/shuttle/escape)
-"bI" = (
-/turf/simulated/shuttle/wall{
- icon_state = "swall7";
- dir = 2
- },
+/turf/simulated/floor/plating/airless,
/area/shuttle/escape)
"bJ" = (
/obj/structure/shuttle/engine/heater,
/obj/structure/window/reinforced{
dir = 1
},
-/turf/simulated/shuttle/plating,
-/area/shuttle/escape)
-"bK" = (
-/turf/space,
-/turf/simulated/shuttle/wall{
- icon_state = "swall_f9";
- dir = 2
- },
+/turf/simulated/floor/plating/airless,
/area/shuttle/escape)
"bL" = (
/obj/structure/shuttle/engine/propulsion,
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating/airless,
/area/shuttle/escape)
(1,1,1) = {"
@@ -694,22 +538,22 @@ aa
aa
aa
ab
-ap
-ap
+ab
+ab
aI
-aQ
+ab
aT
-ap
-aL
-ba
-aR
-ap
-bg
-aQ
-ay
+ab
ac
-ap
-bE
+ac
+ac
+ab
+aI
+ab
+aI
+ac
+ab
+ab
aa
"}
(2,1,1) = {"
@@ -719,11 +563,11 @@ aa
aa
aa
aa
-at
+ab
aw
aE
aF
-at
+ab
aA
aH
aX
@@ -731,12 +575,12 @@ aB
aX
aH
aA
-at
+ab
bo
bt
bz
-bF
-bE
+ab
+ab
"}
(3,1,1) = {"
aa
@@ -744,12 +588,12 @@ aa
aa
aa
ab
-ap
-au
+ab
+ab
ax
aF
aF
-at
+ab
aA
aV
aY
@@ -757,10 +601,10 @@ bb
aY
be
aA
-at
+ab
bo
-bu
-bu
+ab
+ab
bG
bL
"}
@@ -769,13 +613,13 @@ aa
aa
ab
ac
-ae
+ab
aq
-at
+ab
aK
aF
aJ
-at
+ab
aA
aV
aY
@@ -793,15 +637,15 @@ bL
(5,1,1) = {"
aa
ab
-ae
+ab
ak
ai
ar
-at
+ab
aK
aF
aJ
-at
+ab
aA
aH
aH
@@ -809,25 +653,25 @@ aH
aH
aH
aA
-at
+ab
bo
-bu
-bu
+ab
+ab
bG
bL
"}
(6,1,1) = {"
ab
-ae
+ab
ah
ai
al
al
-at
+ab
ac
aG
-aL
-bk
+ac
+ac
aA
aA
aA
@@ -835,12 +679,12 @@ aA
aA
aA
bh
-bj
+ab
bo
bw
bA
-bH
-bK
+ab
+ab
"}
(7,1,1) = {"
ac
@@ -861,21 +705,21 @@ aA
aA
aA
aA
-at
+ab
bp
-bu
+ab
bB
-at
+ab
aa
"}
(8,1,1) = {"
-ad
-ag
+ab
+ab
aj
ai
al
as
-at
+ab
az
aA
aM
@@ -887,21 +731,21 @@ aM
aM
az
bh
-bj
-ap
-ap
-ap
-bI
-bE
+ab
+ab
+ab
+ab
+ab
+ab
"}
(9,1,1) = {"
aa
-ad
-ag
+ab
+ab
am
ao
al
-at
+ab
aA
aA
aN
@@ -923,11 +767,11 @@ bL
(10,1,1) = {"
aa
aa
-ad
+ab
ac
-ag
+ab
ar
-at
+ab
aB
aH
aN
@@ -951,9 +795,9 @@ aa
aa
aa
aa
-ad
-ap
-au
+ab
+ab
+ab
aC
aH
aP
@@ -979,7 +823,7 @@ aa
aa
aa
aa
-at
+ab
aD
aH
bq
@@ -995,8 +839,8 @@ bm
bs
by
bD
-bF
-bK
+ab
+ab
"}
(13,1,1) = {"
aa
@@ -1005,22 +849,22 @@ aa
aa
aa
aa
-ad
-ap
-ap
+ab
+ab
+ab
ac
-ap
-ap
-ap
-aL
-ba
-aR
-ap
+ab
+ab
+ab
ac
-ap
-ap
-ap
-ap
-bK
+ac
+ac
+ab
+ac
+ab
+ab
+ab
+ab
+ab
aa
"}
diff --git a/_maps/map_files/shuttles/emergency_clown.dmm b/_maps/map_files/shuttles/emergency_clown.dmm
index 16150fb8fed..8fb6721df5b 100644
--- a/_maps/map_files/shuttles/emergency_clown.dmm
+++ b/_maps/map_files/shuttles/emergency_clown.dmm
@@ -3,39 +3,16 @@
/turf/space,
/area/space)
"ab" = (
-/turf/space,
-/turf/simulated/shuttle/wall{
- icon_state = "swall_f6";
- dir = 2
- },
+/turf/simulated/wall/mineral/titanium,
/area/shuttle/escape)
"ac" = (
-/obj/structure/grille,
-/obj/structure/window/full/shuttle,
+/obj/effect/spawner/window/shuttle,
/turf/simulated/floor/plating,
/area/shuttle/escape)
-"ad" = (
-/turf/space,
-/turf/simulated/shuttle/wall{
- tag = "icon-swall_f10";
- icon_state = "swall_f10";
- dir = 2
- },
-/area/shuttle/escape)
-"ae" = (
-/turf/simulated/shuttle/wall{
- icon_state = "swallc4"
- },
-/area/shuttle/escape)
"af" = (
/obj/machinery/computer/emergency_shuttle,
/turf/simulated/floor/noslip,
/area/shuttle/escape)
-"ag" = (
-/turf/simulated/shuttle/wall{
- icon_state = "swallc3"
- },
-/area/shuttle/escape)
"ah" = (
/obj/machinery/computer/security{
network = list("SS13","Telecomms","Research Outpost","Mining Outpost")
@@ -95,12 +72,6 @@
},
/turf/simulated/floor/noslip,
/area/shuttle/escape)
-"ar" = (
-/turf/simulated/shuttle/wall{
- icon_state = "swall3";
- dir = 2
- },
-/area/shuttle/escape)
"as" = (
/obj/machinery/computer/robotics,
/turf/simulated/floor/noslip,
@@ -131,30 +102,12 @@
"aw" = (
/turf/simulated/floor/noslip,
/area/shuttle/escape)
-"ax" = (
-/turf/simulated/shuttle/wall{
- icon_state = "swall12";
- dir = 2
- },
-/area/shuttle/escape)
-"ay" = (
-/turf/simulated/shuttle/wall{
- icon_state = "swall13";
- dir = 2
- },
-/area/shuttle/escape)
"az" = (
/obj/machinery/door/airlock/public/glass,
/turf/simulated/floor/plasteel{
icon_state = "white"
},
/area/shuttle/escape)
-"aA" = (
-/turf/simulated/shuttle/wall{
- icon_state = "swall14";
- dir = 2
- },
-/area/shuttle/escape)
"aB" = (
/turf/simulated/floor/chasm,
/area/shuttle/escape)
@@ -174,13 +127,6 @@
/obj/item/bedsheet/rainbow,
/turf/simulated/floor/noslip,
/area/shuttle/escape)
-"aE" = (
-/obj/structure/grille,
-/obj/structure/window/full/shuttle{
- icon_state = "16"
- },
-/turf/simulated/floor/plating,
-/area/shuttle/escape)
"aF" = (
/obj/machinery/status_display{
pixel_y = 30
@@ -208,7 +154,7 @@
name = "greentext"
},
/obj/item/reagent_containers/food/condiment/saltshaker,
-/turf/simulated/shuttle/floor4,
+/turf/simulated/floor/mineral/plastitanium/red/brig,
/area/shuttle/escape)
"aI" = (
/obj/machinery/door/airlock/security/glass{
@@ -217,13 +163,6 @@
},
/turf/simulated/floor/noslip,
/area/shuttle/escape)
-"aJ" = (
-/obj/structure/grille,
-/obj/structure/window/full/shuttle{
- icon_state = "8"
- },
-/turf/simulated/floor/plating,
-/area/shuttle/escape)
"aK" = (
/obj/structure/closet/walllocker/emerglocker{
pixel_x = 28
@@ -240,27 +179,6 @@
},
/turf/simulated/floor/chasm,
/area/shuttle/escape)
-"aM" = (
-/obj/structure/grille,
-/obj/structure/window/full/shuttle{
- icon_state = "16"
- },
-/turf/simulated/floor/noslip,
-/area/shuttle/escape)
-"aN" = (
-/turf/simulated/shuttle/wall{
- tag = "icon-swall7";
- icon_state = "swall7";
- dir = 2
- },
-/area/shuttle/escape)
-"aO" = (
-/obj/structure/grille,
-/obj/structure/window/full/shuttle{
- icon_state = "15"
- },
-/turf/simulated/floor/plating,
-/area/shuttle/escape)
"aP" = (
/obj/docking_port/mobile/emergency{
dir = 4;
@@ -270,13 +188,13 @@
timid = 1;
width = 24
},
-/obj/machinery/door/airlock/shuttle{
+/obj/machinery/door/airlock/titanium{
aiControlDisabled = 1;
hackProof = 1;
id_tag = "s_docking_airlock";
name = "Shuttle Hatch"
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/plating,
/area/shuttle/escape)
"aQ" = (
/obj/item/radio/intercom{
@@ -317,13 +235,13 @@
/turf/simulated/floor/noslip,
/area/shuttle/escape)
"aT" = (
-/obj/machinery/door/airlock/shuttle{
+/obj/machinery/door/airlock/titanium{
aiControlDisabled = 1;
hackProof = 1;
id_tag = "s_docking_airlock";
name = "Shuttle Hatch"
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/plating,
/area/shuttle/escape)
"aU" = (
/obj/machinery/status_display{
@@ -337,31 +255,21 @@
/area/shuttle/escape)
"aV" = (
/obj/structure/noticeboard,
-/turf/simulated/shuttle/wall{
- icon_state = "swall12";
- dir = 2
- },
+/turf/simulated/wall/mineral/titanium,
/area/shuttle/escape)
"aW" = (
-/obj/machinery/door/airlock/shuttle{
+/obj/machinery/door/airlock/titanium{
aiControlDisabled = 1;
hackProof = 1;
id_tag = null;
name = "Shuttle Cargo Hatch"
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
-/area/shuttle/escape)
-"aX" = (
-/turf/simulated/shuttle/wall{
- tag = "icon-swall14";
- icon_state = "swall14";
- dir = 2
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
},
/area/shuttle/escape)
"aY" = (
-/obj/machinery/door/airlock/shuttle{
+/obj/machinery/door/airlock/titanium{
aiControlDisabled = 1;
hackProof = 1;
id_tag = "s_docking_airlock";
@@ -369,20 +277,6 @@
},
/turf/simulated/floor/noslip,
/area/shuttle/escape)
-"aZ" = (
-/obj/structure/grille,
-/obj/structure/window/full/shuttle{
- icon_state = "14"
- },
-/turf/simulated/floor/plating,
-/area/shuttle/escape)
-"ba" = (
-/obj/structure/grille,
-/obj/structure/window/full/shuttle{
- icon_state = "17"
- },
-/turf/simulated/floor/plating,
-/area/shuttle/escape)
"bb" = (
/obj/machinery/door/airlock/medical/glass{
id_tag = null;
@@ -482,13 +376,6 @@
},
/turf/simulated/floor/noslip,
/area/shuttle/escape)
-"bn" = (
-/turf/space,
-/turf/simulated/shuttle/wall{
- icon_state = "swall_f5";
- dir = 2
- },
-/area/shuttle/escape)
"bo" = (
/obj/structure/window/reinforced{
dir = 1
@@ -497,19 +384,7 @@
/obj/structure/window/reinforced,
/obj/item/stack/sheet/mineral/bananium,
/obj/item/bikehorn/rubberducky,
-/turf/simulated/shuttle/plating,
-/area/shuttle/escape)
-"bp" = (
-/turf/simulated/shuttle/wall{
- icon_state = "swall11";
- dir = 2
- },
-/area/shuttle/escape)
-"bq" = (
-/turf/simulated/shuttle/wall{
- icon_state = "swall7";
- dir = 2
- },
+/turf/simulated/floor/plating,
/area/shuttle/escape)
"br" = (
/obj/structure/shuttle/engine/heater,
@@ -519,18 +394,11 @@
/obj/structure/window/reinforced,
/obj/item/stack/sheet/mineral/bananium,
/obj/item/bikehorn/rubberducky,
-/turf/simulated/shuttle/plating,
-/area/shuttle/escape)
-"bs" = (
-/turf/space,
-/turf/simulated/shuttle/wall{
- icon_state = "swall_f9";
- dir = 2
- },
+/turf/simulated/floor/plating,
/area/shuttle/escape)
"bt" = (
/obj/structure/shuttle/engine/propulsion,
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating/airless,
/area/shuttle/escape)
(1,1,1) = {"
@@ -541,22 +409,22 @@ aa
aa
aa
ab
-ar
-ar
-ar
-aN
+ab
+ab
+ab
+ab
aP
-ar
-aE
-aJ
-aO
-ar
+ab
+ac
+ac
+ac
+ab
aT
-aN
+ab
aY
ac
-ar
-bn
+ab
+ab
aa
"}
(2,1,1) = {"
@@ -566,11 +434,11 @@ aa
aa
aa
aa
-ax
+ab
aB
aG
aB
-ax
+ab
am
aQ
aR
@@ -578,12 +446,12 @@ aD
aD
aS
am
-ax
+ab
aw
bf
bj
-aA
-bn
+ab
+ab
"}
(3,1,1) = {"
aa
@@ -591,12 +459,12 @@ aa
aa
aa
ab
-ar
-ay
+ab
+ab
aC
aH
aB
-ax
+ab
am
am
am
@@ -616,13 +484,13 @@ aa
aa
ab
ac
-ae
+ab
as
-ax
+ab
aB
aB
aL
-ax
+ab
am
aD
aD
@@ -640,23 +508,23 @@ bt
(5,1,1) = {"
aa
ab
-ae
+ab
ak
ao
at
-ax
+ab
ac
aI
-aM
-aO
+ac
+ac
am
-aE
-aJ
-aJ
-aO
+ac
+ac
+ac
+ac
am
am
-ax
+ab
bc
bg
bl
@@ -665,12 +533,12 @@ bt
"}
(6,1,1) = {"
ab
-ae
+ab
ah
ai
am
au
-ax
+ab
aD
aw
aD
@@ -682,12 +550,12 @@ aD
aD
am
aU
-aX
-ar
-ar
-ar
-bp
-bs
+ab
+ab
+ab
+ab
+ab
+ab
"}
(7,1,1) = {"
ac
@@ -716,13 +584,13 @@ aa
aa
"}
(8,1,1) = {"
-ad
-ag
+ab
+ab
aj
ai
ap
au
-ax
+ab
aD
aD
aD
@@ -734,30 +602,30 @@ aD
aD
am
aU
-aX
-ar
-ar
-ar
-bq
-bn
+ab
+ab
+ab
+ab
+ab
+ab
"}
(9,1,1) = {"
aa
-ad
-ag
+ab
+ab
an
aq
av
-aA
-aE
-aJ
-aJ
-aO
+ab
+ac
+ac
+ac
+ac
am
-aE
-aJ
-aJ
-aO
+ac
+ac
+ac
+ac
am
am
ac
@@ -770,11 +638,11 @@ bt
(10,1,1) = {"
aa
aa
-ad
+ab
ac
-ag
+ab
aw
-ax
+ab
aD
aD
aD
@@ -798,9 +666,9 @@ aa
aa
aa
aa
-ad
-ar
-ay
+ab
+ab
+ab
aF
am
am
@@ -812,7 +680,7 @@ am
am
am
am
-aZ
+ac
aw
aw
bm
@@ -826,7 +694,7 @@ aa
aa
aa
aa
-ax
+ab
aD
aK
aD
@@ -838,12 +706,12 @@ aD
aD
am
am
-ba
+ac
be
bi
aw
-aA
-bs
+ab
+ab
"}
(13,1,1) = {"
aa
@@ -852,22 +720,22 @@ aa
aa
aa
aa
-ad
-ar
-ar
+ab
+ab
+ab
ac
-ar
-ar
-ar
-aE
-aJ
-aO
-ar
+ab
+ab
+ab
ac
-ar
-ar
-ar
-ar
-bs
+ac
+ac
+ab
+ac
+ab
+ab
+ab
+ab
+ab
aa
"}
diff --git a/_maps/map_files/shuttles/emergency_cramped.dmm b/_maps/map_files/shuttles/emergency_cramped.dmm
index 5cd443121dc..0b263aef6ef 100644
--- a/_maps/map_files/shuttles/emergency_cramped.dmm
+++ b/_maps/map_files/shuttles/emergency_cramped.dmm
@@ -3,43 +3,16 @@
/turf/space,
/area/space)
"b" = (
-/turf/simulated/shuttle/wall{
- icon_state = "swall_s6";
- dir = 2
- },
+/turf/simulated/wall/mineral/titanium,
/area/shuttle/escape)
"c" = (
-/obj/structure/window/full/shuttle,
-/obj/structure/grille,
+/obj/effect/spawner/window/shuttle,
/turf/simulated/floor/plating,
/area/shuttle/escape)
-"d" = (
-/turf/simulated/shuttle/wall{
- icon_state = "swall_s10";
- dir = 2
- },
-/area/shuttle/escape)
-"e" = (
-/turf/simulated/shuttle/wall{
- icon_state = "swallc4"
- },
-/area/shuttle/escape)
"f" = (
/obj/machinery/computer/emergency_shuttle,
/turf/simulated/floor/plating,
/area/shuttle/escape)
-"g" = (
-/turf/simulated/shuttle/wall{
- icon_state = "swallc3"
- },
-/area/shuttle/escape)
-"h" = (
-/turf/simulated/shuttle/wall{
- tag = "icon-swall3";
- icon_state = "swall3";
- dir = 2
- },
-/area/shuttle/escape)
"i" = (
/obj/structure/table,
/obj/item/book/manual,
@@ -57,7 +30,7 @@
/turf/simulated/floor/plating,
/area/shuttle/escape)
"l" = (
-/obj/machinery/door/airlock/shuttle{
+/obj/machinery/door/airlock/titanium{
aiControlDisabled = 1;
hackProof = 1;
id_tag = "s_docking_airlock";
@@ -90,7 +63,7 @@
/turf/simulated/floor/plating,
/area/shuttle/escape)
"q" = (
-/obj/machinery/door/airlock/shuttle{
+/obj/machinery/door/airlock/titanium{
aiControlDisabled = 1;
hackProof = 1;
id_tag = "s_docking_airlock";
@@ -119,38 +92,17 @@
},
/turf/simulated/floor/plating,
/area/shuttle/escape)
-"t" = (
-/obj/structure/window/full/shuttle{
- icon_state = "16"
- },
-/obj/structure/grille,
-/turf/simulated/floor/plating,
-/area/shuttle/escape)
"u" = (
/obj/effect/decal/warning_stripes/yellow/hollow,
/obj/structure/closet/crate,
/obj/effect/spawner/lootdrop/maintenance,
/turf/simulated/floor/plating,
/area/shuttle/escape)
-"v" = (
-/obj/structure/window/full/shuttle{
- icon_state = "8"
- },
-/obj/structure/grille,
-/turf/simulated/floor/plating,
-/area/shuttle/escape)
"w" = (
/obj/effect/decal/warning_stripes/yellow/hollow,
/obj/structure/closet/crate,
/turf/simulated/floor/plating,
/area/shuttle/escape)
-"x" = (
-/obj/structure/window/full/shuttle{
- icon_state = "15"
- },
-/obj/structure/grille,
-/turf/simulated/floor/plating,
-/area/shuttle/escape)
"y" = (
/obj/structure/closet/emcloset,
/turf/simulated/floor/plating,
@@ -162,57 +114,44 @@
dir = 1;
layer = 2.9
},
-/turf/simulated/shuttle/plating,
-/area/shuttle/escape)
-"A" = (
-/turf/simulated/shuttle/wall{
- icon_state = "swall_s5";
- dir = 2
- },
+/turf/simulated/floor/plating,
/area/shuttle/escape)
"B" = (
/obj/structure/shuttle/engine/propulsion{
tag = "icon-burst_l";
icon_state = "burst_l"
},
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating/airless,
/area/shuttle/escape)
"C" = (
/obj/structure/shuttle/engine/propulsion{
tag = "icon-propulsion_r";
icon_state = "propulsion_r"
},
-/turf/simulated/shuttle/plating,
-/area/shuttle/escape)
-"D" = (
-/turf/simulated/shuttle/wall{
- tag = "icon-swall_s9";
- icon_state = "swall_s9";
- dir = 2
- },
+/turf/simulated/floor/plating/airless,
/area/shuttle/escape)
(1,1,1) = {"
a
b
-h
+b
l
-h
+b
q
-h
-t
-v
-x
-h
+b
+c
+c
+c
+b
l
-h
+b
l
-h
-A
+b
+b
"}
(2,1,1) = {"
b
-e
+b
i
m
n
@@ -247,8 +186,8 @@ z
C
"}
(4,1,1) = {"
-d
-g
+b
+b
k
m
p
@@ -266,19 +205,19 @@ C
"}
(5,1,1) = {"
a
-d
-h
-h
-h
-h
-h
-t
-v
-x
-h
-h
-h
-h
-h
-D
+b
+b
+b
+b
+b
+b
+c
+c
+c
+b
+b
+b
+b
+b
+b
"}
diff --git a/_maps/map_files/shuttles/emergency_cyb.dmm b/_maps/map_files/shuttles/emergency_cyb.dmm
index d0bf17f8cba..551a52ccc52 100644
--- a/_maps/map_files/shuttles/emergency_cyb.dmm
+++ b/_maps/map_files/shuttles/emergency_cyb.dmm
@@ -3,24 +3,12 @@
/turf/space,
/area/space)
"ab" = (
-/turf/space,
-/turf/simulated/shuttle/wall{
- icon_state = "swall_f6";
- dir = 2
- },
+/turf/simulated/wall/mineral/titanium,
/area/shuttle/escape)
"ac" = (
-/obj/structure/grille,
-/obj/structure/window/full/shuttle,
+/obj/effect/spawner/window/shuttle,
/turf/simulated/floor/plating,
/area/shuttle/escape)
-"ad" = (
-/turf/space,
-/turf/simulated/shuttle/wall{
- icon_state = "swall_f10";
- dir = 2
- },
-/area/shuttle/escape)
"ae" = (
/obj/structure/table/reinforced,
/obj/item/paper_bin,
@@ -112,12 +100,6 @@
icon_state = "vault"
},
/area/shuttle/escape)
-"aq" = (
-/turf/simulated/shuttle/wall{
- icon_state = "swall3";
- dir = 2
- },
-/area/shuttle/escape)
"ar" = (
/obj/machinery/computer/security{
network = list("SS13","Research Outpost","Mining Outpost","Telecomms")
@@ -158,18 +140,6 @@
icon_state = "dark"
},
/area/shuttle/escape)
-"av" = (
-/turf/simulated/shuttle/wall{
- icon_state = "swall12";
- dir = 2
- },
-/area/shuttle/escape)
-"aw" = (
-/turf/simulated/shuttle/wall{
- icon_state = "swall13";
- dir = 2
- },
-/area/shuttle/escape)
"ax" = (
/obj/machinery/computer/station_alert,
/obj/structure/sign/poster/official/nanotrasen_logo{
@@ -192,7 +162,7 @@
/obj/structure/chair/comfy/shuttle{
dir = 4
},
-/turf/simulated/shuttle/floor4,
+/turf/simulated/floor/mineral/plastitanium/red/brig,
/area/shuttle/escape)
"aA" = (
/obj/machinery/light,
@@ -221,17 +191,7 @@
/area/shuttle/escape)
"aD" = (
/obj/machinery/status_display,
-/turf/simulated/shuttle/wall{
- icon_state = "swall12";
- dir = 2
- },
-/area/shuttle/escape)
-"aE" = (
-/obj/structure/grille,
-/obj/structure/window/full/shuttle{
- icon_state = "16"
- },
-/turf/simulated/floor/plating,
+/turf/simulated/wall/mineral/titanium,
/area/shuttle/escape)
"aF" = (
/obj/machinery/door/airlock/command/glass{
@@ -242,10 +202,10 @@
/area/shuttle/escape)
"aG" = (
/obj/structure/table/reinforced,
-/turf/simulated/shuttle/floor4,
+/turf/simulated/floor/mineral/plastitanium/red/brig,
/area/shuttle/escape)
"aH" = (
-/turf/simulated/shuttle/floor4,
+/turf/simulated/floor/mineral/plastitanium/red/brig,
/area/shuttle/escape)
"aI" = (
/obj/machinery/light{
@@ -253,19 +213,12 @@
on = 1
},
/obj/structure/chair/comfy/shuttle,
-/turf/simulated/shuttle/floor4,
+/turf/simulated/floor/mineral/plastitanium/red/brig,
/area/shuttle/escape)
"aJ" = (
/obj/structure/table/reinforced,
/obj/item/storage/fancy/donut_box,
-/turf/simulated/shuttle/floor4,
-/area/shuttle/escape)
-"aK" = (
-/obj/structure/grille,
-/obj/structure/window/full/shuttle{
- icon_state = "8"
- },
-/turf/simulated/floor/plating,
+/turf/simulated/floor/mineral/plastitanium/red/brig,
/area/shuttle/escape)
"aL" = (
/obj/structure/table/reinforced,
@@ -289,25 +242,11 @@
/obj/structure/chair/comfy/shuttle{
dir = 1
},
-/turf/simulated/shuttle/floor4,
+/turf/simulated/floor/mineral/plastitanium/red/brig,
/area/shuttle/escape)
"aO" = (
/obj/structure/chair/comfy/shuttle,
-/turf/simulated/shuttle/floor4,
-/area/shuttle/escape)
-"aP" = (
-/turf/simulated/shuttle/wall{
- tag = "icon-swall7";
- icon_state = "swall7";
- dir = 2
- },
-/area/shuttle/escape)
-"aQ" = (
-/obj/structure/grille,
-/obj/structure/window/full/shuttle{
- icon_state = "15"
- },
-/turf/simulated/floor/plating,
+/turf/simulated/floor/mineral/plastitanium/red/brig,
/area/shuttle/escape)
"aR" = (
/obj/structure/closet/fireaxecabinet{
@@ -371,13 +310,13 @@
/obj/structure/chair/comfy/shuttle{
dir = 4
},
-/turf/simulated/shuttle/floor4,
+/turf/simulated/floor/mineral/plastitanium/red/brig,
/area/shuttle/escape)
"aX" = (
/obj/structure/chair/comfy/shuttle{
dir = 8
},
-/turf/simulated/shuttle/floor4,
+/turf/simulated/floor/mineral/plastitanium/red/brig,
/area/shuttle/escape)
"aY" = (
/obj/structure/table/reinforced,
@@ -387,33 +326,12 @@
icon_state = "redcorner"
},
/area/shuttle/escape)
-"aZ" = (
-/turf/simulated/shuttle/wall{
- tag = "icon-swall14";
- icon_state = "swall14";
- dir = 2
- },
-/area/shuttle/escape)
"ba" = (
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "neutralfull"
},
/area/shuttle/escape)
-"bb" = (
-/obj/structure/grille,
-/obj/structure/window/full/shuttle{
- icon_state = "14"
- },
-/turf/simulated/floor/plating,
-/area/shuttle/escape)
-"bc" = (
-/obj/structure/grille,
-/obj/structure/window/full/shuttle{
- icon_state = "17"
- },
-/turf/simulated/floor/plating,
-/area/shuttle/escape)
"bd" = (
/turf/simulated/floor/plasteel{
dir = 4;
@@ -421,7 +339,7 @@
},
/area/shuttle/escape)
"be" = (
-/obj/machinery/door/airlock/shuttle/glass{
+/obj/machinery/door/airlock/titanium/glass{
name = "Emergency Airlock Access";
req_one_access_txt = "2;19"
},
@@ -448,14 +366,14 @@
id_tag = "s_docking_airlock"
},
/obj/structure/fans/tiny,
-/turf/simulated/floor/plasteel,
+/turf/simulated/floor/plating,
/area/shuttle/escape)
"bj" = (
/obj/machinery/door/airlock/security/glass{
name = "Escape Shuttle Cell";
req_access_txt = "2"
},
-/turf/simulated/shuttle/floor4,
+/turf/simulated/floor/mineral/plastitanium/red/brig,
/area/shuttle/escape)
"bk" = (
/turf/simulated/floor/plasteel{
@@ -479,25 +397,18 @@
/turf/simulated/floor/mech_bay_recharge_floor,
/area/shuttle/escape)
"bo" = (
-/obj/machinery/door/airlock/shuttle{
+/obj/machinery/door/airlock/titanium{
aiControlDisabled = 1;
hackProof = 1;
id_tag = "s_docking_airlock";
name = "Shuttle Hatch"
},
-/turf/simulated/floor/plasteel,
+/turf/simulated/floor/plating,
/area/shuttle/escape)
"bp" = (
/obj/structure/table/reinforced,
/obj/machinery/recharger,
-/turf/simulated/shuttle/floor4,
-/area/shuttle/escape)
-"bq" = (
-/turf/space,
-/turf/simulated/shuttle/wall{
- icon_state = "swall_f5";
- dir = 2
- },
+/turf/simulated/floor/mineral/plastitanium/red/brig,
/area/shuttle/escape)
"br" = (
/obj/item/twohanded/required/kirbyplants,
@@ -506,35 +417,16 @@
icon_state = "redcorner"
},
/area/shuttle/escape)
-"bs" = (
-/turf/simulated/shuttle/wall{
- icon_state = "swall11";
- dir = 2
- },
-/area/shuttle/escape)
-"bt" = (
-/turf/simulated/shuttle/wall{
- icon_state = "swall7";
- dir = 2
- },
-/area/shuttle/escape)
"bu" = (
/obj/structure/shuttle/engine/heater,
/obj/structure/window/reinforced{
dir = 1
},
-/turf/simulated/shuttle/plating,
-/area/shuttle/escape)
-"bv" = (
-/turf/space,
-/turf/simulated/shuttle/wall{
- icon_state = "swall_f9";
- dir = 2
- },
+/turf/simulated/floor/plating/airless,
/area/shuttle/escape)
"bw" = (
/obj/structure/shuttle/engine/propulsion,
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating/airless,
/area/shuttle/escape)
"bx" = (
/obj/item/twohanded/required/kirbyplants,
@@ -594,7 +486,7 @@
},
/area/shuttle/escape)
"bD" = (
-/obj/machinery/door/airlock/shuttle{
+/obj/machinery/door/airlock/titanium{
aiControlDisabled = 1;
hackProof = 1;
id_tag = "s_docking_airlock";
@@ -607,7 +499,7 @@
timid = 1;
width = 29
},
-/turf/simulated/floor/plasteel,
+/turf/simulated/floor/plating,
/area/shuttle/escape)
"bE" = (
/turf/simulated/floor/plasteel,
@@ -721,7 +613,7 @@
/turf/simulated/floor/grass,
/area/shuttle/escape)
"bS" = (
-/obj/machinery/door/airlock/shuttle/glass{
+/obj/machinery/door/airlock/titanium/glass{
name = "Shuttle Cargo Hatch"
},
/turf/simulated/floor/plasteel,
@@ -745,19 +637,9 @@
dir = 1
},
/area/shuttle/escape)
-"bW" = (
-/obj/machinery/status_display,
-/turf/simulated/shuttle/wall{
- icon_state = "swall3";
- dir = 2
- },
-/area/shuttle/escape)
"bX" = (
/obj/machinery/ai_status_display,
-/turf/simulated/shuttle/wall{
- icon_state = "swall3";
- dir = 2
- },
+/turf/simulated/wall/mineral/titanium,
/area/shuttle/escape)
"bY" = (
/obj/structure/flora/ausbushes/grassybush,
@@ -801,10 +683,7 @@
/area/shuttle/escape)
"cc" = (
/obj/structure/extinguisher_cabinet,
-/turf/simulated/shuttle/wall{
- icon_state = "swall3";
- dir = 2
- },
+/turf/simulated/wall/mineral/titanium,
/area/shuttle/escape)
"cd" = (
/obj/item/radio/intercom{
@@ -906,17 +785,7 @@
/area/shuttle/escape)
"cm" = (
/obj/structure/sign/greencross,
-/turf/simulated/shuttle/wall{
- icon_state = "swall12";
- dir = 2
- },
-/area/shuttle/escape)
-"cn" = (
-/obj/structure/sign/greencross,
-/turf/simulated/shuttle/wall{
- icon_state = "swall3";
- dir = 2
- },
+/turf/simulated/wall/mineral/titanium,
/area/shuttle/escape)
"co" = (
/obj/machinery/sleeper{
@@ -1097,9 +966,7 @@
},
/area/shuttle/escape)
"cH" = (
-/turf/simulated/shuttle/wall{
- icon_state = "wall3"
- },
+/turf/simulated/wall/mineral/plastitanium,
/area/shuttle/escape)
(1,1,1) = {"
@@ -1109,28 +976,28 @@ aa
aa
aa
ab
-aq
-aq
-aq
+ab
+ab
+ab
bo
-aP
+ab
bD
-aq
-aQ
-aK
-aE
-aq
+ab
+ac
+ac
+ac
+ab
bo
-aq
+ab
bo
-aq
-aq
-aQ
-aE
-aq
-aq
-bt
-bq
+ab
+ab
+ac
+ac
+ab
+ab
+ab
+ab
aa
"}
(2,1,1) = {"
@@ -1139,12 +1006,12 @@ aa
aa
aa
aa
-av
+ab
aG
aW
az
aH
-av
+ab
bE
bJ
bP
@@ -1160,7 +1027,7 @@ bP
bP
cA
aV
-av
+ab
bu
bw
"}
@@ -1191,7 +1058,7 @@ ba
ba
ba
bB
-bb
+ac
bu
bw
"}
@@ -1201,12 +1068,12 @@ aa
aa
aa
ab
-aw
+ab
aI
aH
aH
aN
-bb
+ac
bg
ba
bQ
@@ -1222,26 +1089,26 @@ bQ
bQ
ba
bB
-bc
+ac
bu
bw
"}
(5,1,1) = {"
ab
-aq
+ab
ac
-aq
-bs
-aw
+ab
+ab
+ab
aO
aH
aH
aN
-bc
+ac
bg
ba
bR
-bW
+aD
bY
cc
bR
@@ -1253,22 +1120,22 @@ bX
bY
ba
bB
-av
+ab
cH
cH
"}
(6,1,1) = {"
-av
+ab
ae
am
ar
ay
-av
+ab
aJ
aX
aH
bp
-av
+ab
bg
ba
bP
@@ -1284,7 +1151,7 @@ bP
bP
ba
bB
-av
+ab
bu
bw
"}
@@ -1294,12 +1161,12 @@ af
an
as
aA
-aZ
-aq
+ab
+ab
ac
bj
-aq
-aw
+ab
+ab
bF
ba
ba
@@ -1346,7 +1213,7 @@ bQ
bQ
ba
bB
-av
+ab
cH
cH
"}
@@ -1373,11 +1240,11 @@ ba
bY
cc
bR
-bW
+aD
bY
ba
bB
-bb
+ac
bu
bw
"}
@@ -1408,7 +1275,7 @@ bP
bP
ba
bB
-bc
+ac
bu
bw
"}
@@ -1439,7 +1306,7 @@ ba
ba
ba
bB
-av
+ab
cH
cH
"}
@@ -1449,12 +1316,12 @@ ak
an
au
aB
-aZ
-aq
+ab
+ab
be
be
-aq
-aw
+ab
+ab
aV
bK
bE
@@ -1475,48 +1342,48 @@ bu
bw
"}
(13,1,1) = {"
-av
+ab
al
ap
ax
aC
-av
+ab
aS
bf
bd
by
-aZ
-aq
-aq
+ab
+ab
+ab
bS
bS
-aq
-aq
-aq
-aP
-cn
+ab
+ab
+ab
+ab
+cm
ac
cu
cu
ac
-bW
-aq
-aw
+aD
+ab
+ab
bu
bw
"}
(14,1,1) = {"
-ad
-aq
+ab
+ab
ac
-aq
-aP
-aw
+ab
+ab
+ab
aT
bg
bl
bz
-av
+ab
bG
bL
bE
@@ -1524,7 +1391,7 @@ bE
bZ
cd
cf
-av
+ab
co
cs
cv
@@ -1532,7 +1399,7 @@ cv
cy
cB
cD
-av
+ab
cH
cH
"}
@@ -1541,13 +1408,13 @@ aa
aa
aa
aa
-ad
-aw
+ab
+ab
aU
bg
bl
bA
-av
+ab
bn
bM
bT
@@ -1563,7 +1430,7 @@ cv
cy
cp
cE
-bb
+ac
bu
bw
"}
@@ -1578,7 +1445,7 @@ aU
bg
bl
bB
-av
+ab
bH
bN
bU
@@ -1594,7 +1461,7 @@ cv
cy
cp
cF
-bc
+ac
bu
bw
"}
@@ -1604,12 +1471,12 @@ aa
aa
aa
aa
-av
+ab
aV
bh
bm
aV
-av
+ab
bI
bO
bV
@@ -1625,7 +1492,7 @@ cx
cz
cC
cG
-av
+ab
bu
bw
"}
@@ -1635,28 +1502,28 @@ aa
aa
aa
aa
-ad
+ab
ac
bi
bi
ac
-bs
-aq
-aQ
-aK
-aK
-aK
-aE
-aq
-bs
-aq
-aq
-aQ
-aK
-aK
-aE
-aq
-bs
-bv
+ab
+ab
+ac
+ac
+ac
+ac
+ac
+ab
+ab
+ab
+ab
+ac
+ac
+ac
+ac
+ab
+ab
+ab
aa
"}
diff --git a/_maps/map_files/shuttles/emergency_dept.dmm b/_maps/map_files/shuttles/emergency_dept.dmm
index fb479c23995..22cb29655c6 100644
--- a/_maps/map_files/shuttles/emergency_dept.dmm
+++ b/_maps/map_files/shuttles/emergency_dept.dmm
@@ -3,24 +3,12 @@
/turf/space,
/area/space)
"ab" = (
-/turf/space,
-/turf/simulated/shuttle/wall{
- icon_state = "swall_f6";
- dir = 2
- },
+/turf/simulated/wall/mineral/titanium,
/area/shuttle/escape)
"ac" = (
-/obj/structure/grille,
-/obj/structure/window/full/shuttle,
+/obj/effect/spawner/window/shuttle,
/turf/simulated/floor/plating,
/area/shuttle/escape)
-"ad" = (
-/turf/space,
-/turf/simulated/shuttle/wall{
- icon_state = "swall_f10";
- dir = 2
- },
-/area/shuttle/escape)
"ae" = (
/obj/structure/table/reinforced,
/obj/item/paper_bin,
@@ -112,12 +100,6 @@
icon_state = "vault"
},
/area/shuttle/escape)
-"aq" = (
-/turf/simulated/shuttle/wall{
- icon_state = "swall3";
- dir = 2
- },
-/area/shuttle/escape)
"ar" = (
/obj/machinery/computer/security{
network = list("SS13","Research Outpost","Mining Outpost","Telecomms")
@@ -158,18 +140,6 @@
icon_state = "dark"
},
/area/shuttle/escape)
-"av" = (
-/turf/simulated/shuttle/wall{
- icon_state = "swall12";
- dir = 2
- },
-/area/shuttle/escape)
-"aw" = (
-/turf/simulated/shuttle/wall{
- icon_state = "swall13";
- dir = 2
- },
-/area/shuttle/escape)
"ax" = (
/obj/machinery/computer/station_alert,
/obj/structure/sign/poster/official/nanotrasen_logo{
@@ -192,7 +162,7 @@
/obj/structure/chair/comfy/shuttle{
dir = 4
},
-/turf/simulated/shuttle/floor4,
+/turf/simulated/floor/mineral/plastitanium/red/brig,
/area/shuttle/escape)
"aA" = (
/obj/machinery/light,
@@ -221,10 +191,7 @@
/area/shuttle/escape)
"aD" = (
/obj/machinery/status_display,
-/turf/simulated/shuttle/wall{
- icon_state = "swall12";
- dir = 2
- },
+/turf/simulated/wall/mineral/titanium,
/area/shuttle/escape)
"aE" = (
/obj/machinery/door/airlock/command/glass{
@@ -250,10 +217,10 @@
pixel_x = 32;
pixel_y = 0
},
-/turf/simulated/shuttle/floor4,
+/turf/simulated/floor/mineral/plastitanium/red/brig,
/area/shuttle/escape)
"aH" = (
-/turf/simulated/shuttle/floor4,
+/turf/simulated/floor/mineral/plastitanium/red/brig,
/area/shuttle/escape)
"aI" = (
/obj/machinery/door/airlock/medical/glass{
@@ -270,7 +237,7 @@
/obj/structure/table/reinforced,
/obj/item/storage/fancy/donut_box,
/obj/item/restraints/handcuffs,
-/turf/simulated/shuttle/floor4,
+/turf/simulated/floor/mineral/plastitanium/red/brig,
/area/shuttle/escape)
"aL" = (
/obj/machinery/door/airlock/medical/glass{
@@ -302,10 +269,7 @@
dir = 1;
pixel_y = 7
},
-/turf/simulated/shuttle/wall{
- icon_state = "swall12";
- dir = 2
- },
+/turf/simulated/wall/mineral/titanium,
/area/shuttle/escape)
"aO" = (
/mob/living/simple_animal/bot/secbot,
@@ -314,18 +278,11 @@
dir = 2
},
/area/shuttle/escape)
-"aP" = (
-/turf/simulated/shuttle/wall{
- tag = "icon-swall7";
- icon_state = "swall7";
- dir = 2
- },
-/area/shuttle/escape)
"aR" = (
/obj/structure/chair/comfy/shuttle{
dir = 1
},
-/turf/simulated/shuttle/floor4,
+/turf/simulated/floor/mineral/plastitanium/red/brig,
/area/shuttle/escape)
"aS" = (
/turf/simulated/floor/plasteel{
@@ -360,20 +317,13 @@
normalspeed = 0;
req_access_txt = "63"
},
-/turf/simulated/shuttle/floor4,
+/turf/simulated/floor/mineral/plastitanium/red/brig,
/area/shuttle/escape)
"aX" = (
/obj/structure/chair/comfy/shuttle{
dir = 8
},
-/turf/simulated/shuttle/floor4,
-/area/shuttle/escape)
-"aZ" = (
-/turf/simulated/shuttle/wall{
- tag = "icon-swall14";
- icon_state = "swall14";
- dir = 2
- },
+/turf/simulated/floor/mineral/plastitanium/red/brig,
/area/shuttle/escape)
"ba" = (
/turf/simulated/floor/plasteel{
@@ -383,10 +333,7 @@
/area/shuttle/escape)
"bb" = (
/obj/structure/sign/greencross,
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swallc3"
- },
+/turf/simulated/wall/mineral/titanium,
/area/shuttle/escape)
"bc" = (
/obj/structure/bed/roller,
@@ -442,7 +389,7 @@
dir = 1
},
/obj/machinery/light,
-/turf/simulated/shuttle/floor4,
+/turf/simulated/floor/mineral/plastitanium/red/brig,
/area/shuttle/escape)
"bh" = (
/obj/machinery/recharger/wallcharger{
@@ -467,7 +414,7 @@
normalspeed = 0;
req_access_txt = "2"
},
-/turf/simulated/shuttle/floor4,
+/turf/simulated/floor/mineral/plastitanium/red/brig,
/area/shuttle/escape)
"bk" = (
/obj/machinery/door/airlock/mining/glass{
@@ -488,7 +435,7 @@
icon_state = "tube1";
dir = 8
},
-/turf/simulated/shuttle/floor4,
+/turf/simulated/floor/mineral/plastitanium/red/brig,
/area/shuttle/escape)
"bm" = (
/obj/machinery/sleeper/upgraded{
@@ -501,12 +448,10 @@
/area/shuttle/escape)
"bn" = (
/obj/structure/table/reinforced,
-/turf/simulated/shuttle/floor{
- icon_state = "floor2"
- },
+/turf/simulated/floor/mineral/titanium/yellow,
/area/shuttle/escape)
"bo" = (
-/obj/machinery/door/airlock/shuttle{
+/obj/machinery/door/airlock/titanium{
aiControlDisabled = 1;
hackProof = 1;
id_tag = "s_docking_airlock";
@@ -522,52 +467,24 @@
icon_state = "tube1";
dir = 4
},
-/turf/simulated/shuttle/floor4,
-/area/shuttle/escape)
-"bq" = (
-/turf/space,
-/turf/simulated/shuttle/wall{
- icon_state = "swall_f5";
- dir = 2
- },
+/turf/simulated/floor/mineral/plastitanium/red/brig,
/area/shuttle/escape)
"br" = (
/obj/structure/chair/comfy/shuttle{
dir = 1
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor2"
- },
-/area/shuttle/escape)
-"bs" = (
-/turf/simulated/shuttle/wall{
- icon_state = "swall11";
- dir = 2
- },
-/area/shuttle/escape)
-"bt" = (
-/turf/simulated/shuttle/wall{
- icon_state = "swall7";
- dir = 2
- },
+/turf/simulated/floor/mineral/titanium/yellow,
/area/shuttle/escape)
"bu" = (
/obj/structure/shuttle/engine/heater,
/obj/structure/window/reinforced{
dir = 1
},
-/turf/simulated/shuttle/plating,
-/area/shuttle/escape)
-"bv" = (
-/turf/space,
-/turf/simulated/shuttle/wall{
- icon_state = "swall_f9";
- dir = 2
- },
+/turf/simulated/floor/plating/airless,
/area/shuttle/escape)
"bw" = (
/obj/structure/shuttle/engine/propulsion,
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating/airless,
/area/shuttle/escape)
"bx" = (
/obj/structure/bed/roller,
@@ -583,38 +500,27 @@
/obj/structure/chair/comfy/shuttle{
dir = 4
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor2"
- },
+/turf/simulated/floor/mineral/titanium/yellow,
/area/shuttle/escape)
"bz" = (
-/turf/simulated/shuttle/floor{
- icon_state = "floor2"
- },
+/turf/simulated/floor/mineral/titanium/yellow,
/area/shuttle/escape)
"bA" = (
/obj/structure/chair/comfy/shuttle{
dir = 8
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor2"
- },
+/turf/simulated/floor/mineral/titanium/yellow,
/area/shuttle/escape)
"bB" = (
/obj/structure/table/reinforced,
-/turf/simulated/shuttle/floor{
- icon_state = "floor5"
- },
+/turf/simulated/floor/mineral/titanium/purple,
/area/shuttle/escape)
"bC" = (
/obj/structure/sign/directions/engineering,
-/turf/simulated/shuttle/wall{
- icon_state = "swall12";
- dir = 2
- },
+/turf/simulated/wall/mineral/titanium,
/area/shuttle/escape)
"bD" = (
-/obj/machinery/door/airlock/shuttle{
+/obj/machinery/door/airlock/titanium{
aiControlDisabled = 1;
hackProof = 1;
id_tag = "s_docking_airlock";
@@ -633,9 +539,7 @@
/obj/structure/chair/comfy/shuttle{
dir = 1
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor5"
- },
+/turf/simulated/floor/mineral/titanium/purple,
/area/shuttle/escape)
"bF" = (
/obj/structure/chair/comfy/shuttle{
@@ -646,14 +550,6 @@
icon_state = "cmo"
},
/area/shuttle/escape)
-"bG" = (
-/obj/machinery/status_display,
-/turf/simulated/shuttle/wall{
- tag = "icon-swall14";
- icon_state = "swall14";
- dir = 2
- },
-/area/shuttle/escape)
"bH" = (
/obj/structure/chair/comfy/shuttle{
dir = 8
@@ -671,22 +567,16 @@
/obj/structure/chair/comfy/shuttle{
dir = 4
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor5"
- },
+/turf/simulated/floor/mineral/titanium/purple,
/area/shuttle/escape)
"bJ" = (
-/turf/simulated/shuttle/floor{
- icon_state = "floor5"
- },
+/turf/simulated/floor/mineral/titanium/purple,
/area/shuttle/escape)
"bK" = (
/obj/structure/chair/comfy/shuttle{
dir = 8
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor5"
- },
+/turf/simulated/floor/mineral/titanium/purple,
/area/shuttle/escape)
"bL" = (
/obj/structure/chair/comfy/shuttle{
@@ -696,9 +586,7 @@
icon_state = "tube1";
dir = 8
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor2"
- },
+/turf/simulated/floor/mineral/titanium/yellow,
/area/shuttle/escape)
"bM" = (
/obj/structure/chair/comfy/shuttle{
@@ -708,9 +596,7 @@
icon_state = "tube1";
dir = 4
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor2"
- },
+/turf/simulated/floor/mineral/titanium/yellow,
/area/shuttle/escape)
"bO" = (
/obj/structure/chair/comfy/shuttle{
@@ -759,9 +645,7 @@
icon_state = "tube1";
dir = 8
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor5"
- },
+/turf/simulated/floor/mineral/titanium/purple,
/area/shuttle/escape)
"bT" = (
/obj/structure/chair/comfy/shuttle{
@@ -771,23 +655,15 @@
icon_state = "tube1";
dir = 4
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor5"
- },
+/turf/simulated/floor/mineral/titanium/purple,
/area/shuttle/escape)
"bU" = (
/obj/structure/sign/directions/science,
-/turf/simulated/shuttle/wall{
- icon_state = "swall12";
- dir = 2
- },
+/turf/simulated/wall/mineral/titanium,
/area/shuttle/escape)
"bV" = (
/obj/structure/sign/directions/cargo,
-/turf/simulated/shuttle/wall{
- icon_state = "swall12";
- dir = 2
- },
+/turf/simulated/wall/mineral/titanium,
/area/shuttle/escape)
"bW" = (
/obj/structure/chair/comfy/shuttle{
@@ -796,14 +672,11 @@
/obj/machinery/recharger/wallcharger{
pixel_x = -24
},
-/turf/simulated/shuttle/floor4,
+/turf/simulated/floor/mineral/plastitanium/red/brig,
/area/shuttle/escape)
"bX" = (
/obj/machinery/ai_status_display,
-/turf/simulated/shuttle/wall{
- icon_state = "swall3";
- dir = 2
- },
+/turf/simulated/wall/mineral/titanium,
/area/shuttle/escape)
"bY" = (
/obj/structure/flora/ausbushes/grassybush,
@@ -834,16 +707,11 @@
req_access_txt = "32";
req_one_access_txt = "0"
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor2"
- },
+/turf/simulated/floor/mineral/titanium/yellow,
/area/shuttle/escape)
"cc" = (
/obj/structure/extinguisher_cabinet,
-/turf/simulated/shuttle/wall{
- icon_state = "swall3";
- dir = 2
- },
+/turf/simulated/wall/mineral/titanium,
/area/shuttle/escape)
"cd" = (
/obj/machinery/door/airlock/research/glass{
@@ -851,14 +719,7 @@
normalspeed = 0;
req_access_txt = "47"
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor5"
- },
-/area/shuttle/escape)
-"cf" = (
-/turf/simulated/shuttle/wall{
- icon_state = "swallc4"
- },
+/turf/simulated/floor/mineral/titanium/purple,
/area/shuttle/escape)
"ck" = (
/obj/structure/chair/comfy/shuttle{
@@ -927,9 +788,7 @@
},
/area/shuttle/escape)
"cH" = (
-/turf/simulated/shuttle/wall{
- icon_state = "wall3"
- },
+/turf/simulated/wall/mineral/plastitanium,
/area/shuttle/escape)
"sc" = (
/obj/machinery/door/airlock/medical/glass{
@@ -975,14 +834,11 @@
/area/shuttle/escape)
"Qf" = (
/obj/machinery/defibrillator_mount/loaded,
-/turf/simulated/shuttle/wall{
- icon_state = "swall12";
- dir = 2
- },
+/turf/simulated/wall/mineral/titanium,
/area/shuttle/escape)
"UN" = (
/obj/structure/chair/comfy/shuttle,
-/turf/simulated/shuttle/floor4,
+/turf/simulated/floor/mineral/plastitanium/red/brig,
/area/shuttle/escape)
"Wy" = (
/obj/structure/chair/comfy/shuttle,
@@ -990,43 +846,43 @@
dir = 1;
on = 1
},
-/turf/simulated/shuttle/floor4,
+/turf/simulated/floor/mineral/plastitanium/red/brig,
/area/shuttle/escape)
(1,1,1) = {"
aa
ab
-aq
+ab
ac
-aq
-aP
-aq
-aq
-aq
+ab
+ab
+ab
+ab
+ab
bo
-aP
+ab
bD
-aq
+ab
ac
ac
ac
-aq
+ab
bo
-aq
+ab
bo
-bt
-aq
+ab
+ab
ac
ac
-aq
-aq
-bt
-bq
+ab
+ab
+ab
+ab
aa
"}
(2,1,1) = {"
aa
-av
+ab
az
bl
az
@@ -1051,7 +907,7 @@ cA
bP
bP
bP
-av
+ab
cH
cH
"}
@@ -1066,7 +922,7 @@ aH
aH
aH
aH
-av
+ab
ba
ba
ba
@@ -1082,13 +938,13 @@ ba
ba
ba
ba
-av
+ab
bu
bw
"}
(4,1,1) = {"
aa
-av
+ab
aX
bp
aX
@@ -1097,7 +953,7 @@ aH
aH
aH
aR
-av
+ab
ba
bQ
bQ
@@ -1119,16 +975,16 @@ bw
"}
(5,1,1) = {"
ab
-bs
-aq
-aq
-aq
-aw
+ab
+ab
+ab
+ab
+ab
Wy
aH
aH
bg
-av
+ab
ba
bP
bP
@@ -1144,12 +1000,12 @@ ck
bQ
bQ
bQ
-av
+ab
cH
cH
"}
(6,1,1) = {"
-av
+ab
ae
am
ar
@@ -1169,13 +1025,13 @@ ba
ba
ba
ca
-bG
+aD
bY
cc
bR
bX
bY
-aw
+ab
cH
cH
"}
@@ -1185,7 +1041,7 @@ af
an
as
aA
-av
+ab
UN
aG
aH
@@ -1206,7 +1062,7 @@ bL
by
by
bn
-av
+ab
cH
cH
"}
@@ -1216,12 +1072,12 @@ ag
ao
an
bh
-aZ
-aq
-aq
+ab
+ab
+ab
aW
ac
-cf
+ab
ba
bP
bP
@@ -1237,7 +1093,7 @@ bz
bz
bz
br
-av
+ab
bu
bw
"}
@@ -1299,7 +1155,7 @@ bz
bz
bz
br
-av
+ab
bu
bw
"}
@@ -1309,9 +1165,9 @@ aj
ao
at
an
-aZ
-aq
-aq
+ab
+ab
+ab
aL
ac
bb
@@ -1330,7 +1186,7 @@ bM
bA
bA
bn
-av
+ab
bu
bw
"}
@@ -1340,7 +1196,7 @@ ak
an
au
aB
-av
+ab
bm
cp
cp
@@ -1355,18 +1211,18 @@ bP
bP
ba
ca
-bG
+aD
bY
cc
bR
bX
bY
-aw
+ab
cH
cH
"}
(13,1,1) = {"
-av
+ab
al
ap
ax
@@ -1392,22 +1248,22 @@ bS
bI
bI
bB
-av
+ab
cH
cH
"}
(14,1,1) = {"
-ad
-bt
-aq
-aq
-aq
-aw
+ab
+ab
+ab
+ab
+ab
+ab
bc
cp
cp
bx
-av
+ab
ba
aS
aU
@@ -1423,13 +1279,13 @@ bJ
bJ
bJ
bE
-av
+ab
cH
cH
"}
(15,1,1) = {"
aa
-av
+ab
bF
aM
bF
@@ -1438,7 +1294,7 @@ cE
cp
cp
cw
-av
+ab
ba
aO
aV
@@ -1469,7 +1325,7 @@ cp
cp
cp
xD
-av
+ab
ba
aS
aS
@@ -1485,22 +1341,22 @@ bJ
bJ
bJ
bE
-av
+ab
bu
bw
"}
(17,1,1) = {"
aa
-av
+ab
aF
bH
aF
-av
+ab
cG
PY
cD
bf
-av
+ab
aT
aS
bd
@@ -1516,38 +1372,38 @@ bT
bK
bK
bB
-av
+ab
cH
cH
"}
(18,1,1) = {"
aa
-ad
-aq
+ab
+ab
ac
-aq
-bs
-aq
-aq
-aq
-aq
-bs
+ab
+ab
+ab
+ab
+ab
+ab
+ab
ac
ac
ac
ac
ac
ac
-aq
+ab
ac
ac
-bs
+ab
ac
-aq
+ab
ac
ac
ac
-bs
-bv
+ab
+ab
aa
"}
diff --git a/_maps/map_files/shuttles/emergency_meta.dmm b/_maps/map_files/shuttles/emergency_meta.dmm
index 276b404cbf8..9a6f9844e7d 100644
--- a/_maps/map_files/shuttles/emergency_meta.dmm
+++ b/_maps/map_files/shuttles/emergency_meta.dmm
@@ -3,98 +3,34 @@
/turf/space,
/area/space)
"ab" = (
-/turf/space,
-/turf/simulated/shuttle/wall{
- tag = "icon-swall_f6";
- icon_state = "swall_f6";
- dir = 2
- },
+/turf/simulated/wall/mineral/titanium,
/area/shuttle/escape)
"ac" = (
-/obj/structure/grille,
-/obj/structure/shuttle/window,
-/turf/simulated/shuttle/plating,
-/area/shuttle/escape)
-"ad" = (
-/turf/simulated/shuttle/wall{
- icon_state = "swallc2";
- dir = 2
- },
-/area/shuttle/escape)
-"ae" = (
-/turf/simulated/shuttle/wall{
- icon_state = "swall8";
- dir = 2
- },
-/area/shuttle/escape)
-"af" = (
-/turf/simulated/shuttle/wall{
- icon_state = "swall0";
- dir = 2
- },
+/obj/effect/spawner/window/shuttle,
+/turf/simulated/floor/plating,
/area/shuttle/escape)
"ag" = (
-/obj/machinery/door/airlock/shuttle{
+/obj/machinery/door/airlock/titanium{
id_tag = "s_docking_airlock";
name = "Emergency Shuttle Airlock";
req_access_txt = "2"
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/plating,
/area/shuttle/escape)
"ah" = (
/obj/structure/sign/nosmoking_2,
-/turf/simulated/shuttle/wall{
- icon_state = "swall0";
- dir = 2
- },
+/turf/simulated/wall/mineral/titanium,
/area/shuttle/escape)
"ai" = (
-/obj/machinery/door/airlock/shuttle{
+/obj/machinery/door/airlock/titanium{
id_tag = "s_docking_airlock";
name = "Emergency Shuttle Airlock";
req_access_txt = "0"
},
-/turf/simulated/shuttle/floor,
-/area/shuttle/escape)
-"aj" = (
-/turf/simulated/shuttle/wall{
- icon_state = "swall4";
- dir = 2
- },
-/area/shuttle/escape)
-"ak" = (
-/turf/simulated/shuttle/wall{
- tag = "icon-swall12";
- icon_state = "swall12";
- dir = 2
- },
-/area/shuttle/escape)
-"al" = (
-/turf/space,
-/turf/simulated/shuttle/wall{
- tag = "icon-swall_f10";
- icon_state = "swall_f10";
- dir = 2
- },
+/turf/simulated/floor/plating,
/area/shuttle/escape)
"am" = (
-/turf/space,
-/turf/simulated/shuttle/wall{
- tag = "icon-swall_f6";
- icon_state = "swall_f6";
- dir = 2
- },
-/turf/simulated/shuttle/wall{
- dir = 8;
- icon_state = "diagonalWall3"
- },
-/area/shuttle/escape)
-"an" = (
-/turf/simulated/shuttle/wall{
- tag = "icon-swall11";
- icon_state = "swall11";
- dir = 2
- },
+/turf/simulated/wall/mineral/plastitanium,
/area/shuttle/escape)
"ao" = (
/obj/structure/table,
@@ -106,42 +42,31 @@
pixel_x = 5;
pixel_y = -1
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/escape)
"ap" = (
/obj/machinery/computer/crew,
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/escape)
"aq" = (
/obj/machinery/computer/security,
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/escape)
"ar" = (
/obj/structure/table,
/obj/item/storage/firstaid/regular,
-/turf/simulated/shuttle/floor,
-/area/shuttle/escape)
-"as" = (
-/turf/simulated/shuttle/wall{
- tag = "icon-swall3";
- icon_state = "swall3";
- dir = 2
- },
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/escape)
"at" = (
/obj/structure/closet/emcloset,
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/escape)
"au" = (
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/escape)
"av" = (
/obj/structure/chair/comfy/shuttle,
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/escape)
"aw" = (
/obj/machinery/light{
@@ -149,9 +74,7 @@
on = 1
},
/obj/structure/chair/comfy/shuttle,
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/escape)
"ax" = (
/obj/item/radio/intercom{
@@ -161,9 +84,7 @@
pixel_y = 27
},
/obj/structure/chair/comfy/shuttle,
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/escape)
"ay" = (
/obj/structure/closet/crate{
@@ -204,15 +125,7 @@
/obj/item/clothing/head/hardhat,
/obj/item/clothing/head/hardhat,
/obj/item/clothing/head/hardhat,
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
-/area/shuttle/escape)
-"az" = (
-/turf/simulated/shuttle/wall{
- icon_state = "swall1";
- dir = 2
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/escape)
"aA" = (
/obj/structure/shuttle/engine/propulsion{
@@ -220,7 +133,7 @@
icon_state = "propulsion";
tag = "icon-propulsion (EAST)"
},
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating/airless,
/area/shuttle/escape)
"aB" = (
/obj/structure/shuttle/engine/heater{
@@ -231,31 +144,27 @@
/obj/structure/window/reinforced{
dir = 4
},
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating/airless,
/area/shuttle/escape)
"aC" = (
/obj/structure/table,
/obj/item/storage/fancy,
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/escape)
"aD" = (
/obj/structure/chair/comfy/shuttle{
dir = 1
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/escape)
"aE" = (
/obj/structure/table,
/obj/item/restraints/handcuffs,
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/escape)
"aF" = (
/obj/machinery/status_display,
-/turf/simulated/shuttle/wall{
- tag = "icon-swall3";
- icon_state = "swall3";
- dir = 2
- },
+/turf/simulated/wall/mineral/titanium,
/area/shuttle/escape)
"aG" = (
/obj/structure/dispenser/oxygen{
@@ -263,9 +172,7 @@
pixel_x = -1;
pixel_y = 2
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/escape)
"aH" = (
/obj/structure/shuttle/engine/propulsion{
@@ -273,7 +180,7 @@
icon_state = "propulsion_r";
tag = "icon-propulsion_r (EAST)"
},
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating/airless,
/area/shuttle/escape)
"aI" = (
/obj/structure/shuttle/engine/heater{
@@ -288,32 +195,28 @@
icon_state = "tube1";
dir = 4
},
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating/airless,
/area/shuttle/escape)
"aJ" = (
/obj/machinery/computer/communications,
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/escape)
"aK" = (
/obj/structure/chair/comfy/shuttle,
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/escape)
"aL" = (
/obj/structure/chair/comfy/shuttle{
dir = 1
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/escape)
"aM" = (
/obj/machinery/light,
/obj/structure/chair/comfy/shuttle{
dir = 1
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/escape)
"aN" = (
/obj/structure/closet/crate{
@@ -358,36 +261,34 @@
icon_state = "tube1";
dir = 4
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/escape)
"aO" = (
/obj/structure/shuttle/engine/propulsion{
dir = 8;
icon_state = "burst_l"
},
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating/airless,
/area/shuttle/escape)
"aP" = (
/obj/machinery/computer/emergency_shuttle,
/obj/machinery/light{
dir = 8
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/escape)
"aQ" = (
/obj/structure/chair/comfy/shuttle{
dir = 8
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/escape)
"aR" = (
/obj/machinery/door/airlock/command/glass{
name = "Cockpit";
req_access_txt = "19"
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/escape)
"aS" = (
/obj/machinery/vending/wallmed{
@@ -397,36 +298,22 @@
req_access_txt = "0";
use_power = 0
},
-/turf/simulated/shuttle/wall{
- icon_state = "swall0";
- dir = 2
- },
+/turf/simulated/wall/mineral/titanium,
/area/shuttle/escape)
"aT" = (
/obj/structure/extinguisher_cabinet,
-/turf/simulated/shuttle/wall{
- icon_state = "swall0";
- dir = 2
- },
+/turf/simulated/wall/mineral/titanium,
/area/shuttle/escape)
"aU" = (
/obj/machinery/computer/atmos_alert,
-/turf/simulated/shuttle/floor,
-/area/shuttle/escape)
-"aV" = (
-/turf/simulated/shuttle/wall{
- icon_state = "swall2";
- dir = 2
- },
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/escape)
"aW" = (
/obj/machinery/light{
dir = 1
},
/obj/structure/chair/comfy/shuttle,
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/escape)
"aX" = (
/obj/machinery/hologram/holopad,
@@ -436,18 +323,18 @@
pixel_x = 32;
pixel_y = 0
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/escape)
"aY" = (
/obj/structure/table,
/obj/item/storage/toolbox/emergency,
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/escape)
"aZ" = (
/obj/machinery/light{
dir = 8
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/escape)
"ba" = (
/obj/structure/table,
@@ -456,7 +343,7 @@
idle_power_usage = 0;
use_power = 0
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/escape)
"bb" = (
/obj/structure/table,
@@ -470,7 +357,7 @@
pixel_x = -3;
pixel_y = 7
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/escape)
"bc" = (
/obj/structure/table,
@@ -479,7 +366,7 @@
pixel_x = 0;
pixel_y = -30
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/escape)
"bd" = (
/obj/item/radio/intercom{
@@ -492,9 +379,7 @@
/obj/structure/chair/comfy/shuttle{
dir = 1
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/escape)
"be" = (
/obj/structure/table,
@@ -509,24 +394,7 @@
icon_state = "tube1";
dir = 4
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
-/area/shuttle/escape)
-"bf" = (
-/turf/simulated/shuttle/wall{
- tag = "icon-swall15";
- icon_state = "swall15";
- dir = 2
- },
-/area/shuttle/escape)
-"bg" = (
-/obj/structure/extinguisher_cabinet,
-/turf/simulated/shuttle/wall{
- tag = "icon-swall12";
- icon_state = "swall12";
- dir = 2
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/escape)
"bh" = (
/obj/machinery/door/airlock/command{
@@ -534,30 +402,14 @@
req_access = null;
req_access_txt = "19"
},
-/turf/simulated/shuttle/floor,
-/area/shuttle/escape)
-"bi" = (
-/turf/simulated/shuttle/wall{
- tag = "icon-swall7";
- icon_state = "swall7";
- dir = 2
- },
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/escape)
"bj" = (
/obj/machinery/door/airlock/security/glass{
name = "Brig";
req_access_txt = "2"
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
-/area/shuttle/escape)
-"bk" = (
-/turf/simulated/shuttle/wall{
- tag = "icon-swall14";
- icon_state = "swall14";
- dir = 2
- },
+/turf/simulated/floor/mineral/plastitanium/red/brig,
/area/shuttle/escape)
"bl" = (
/obj/machinery/door/airlock/medical/glass{
@@ -565,31 +417,28 @@
name = "Escape Shuttle Infirmary";
req_access_txt = "0"
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/escape)
"bm" = (
/obj/structure/sign/lifestar,
-/turf/simulated/shuttle/wall{
- dir = 1;
- icon_state = "swallc2"
- },
+/turf/simulated/wall/mineral/titanium,
/area/shuttle/escape)
"bn" = (
-/obj/machinery/door/airlock/shuttle{
+/obj/machinery/door/airlock/titanium{
name = "Emergency Shuttle Cargo Bay Airlock"
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/escape)
"bo" = (
/obj/structure/chair/comfy/shuttle{
dir = 4
},
-/turf/simulated/shuttle/plating{
+/turf/simulated/floor/plasteel{
icon_state = "floorgrime"
},
/area/shuttle/escape)
"bp" = (
-/turf/simulated/shuttle/plating{
+/turf/simulated/floor/plasteel{
icon_state = "floorgrime"
},
/area/shuttle/escape)
@@ -597,37 +446,29 @@
/obj/machinery/door/airlock/external{
name = "Emergency Recovery Airlock"
},
-/turf/simulated/shuttle/plating{
- icon_state = "floorgrime"
- },
+/turf/simulated/floor/plating,
/area/shuttle/escape)
"br" = (
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/escape)
"bs" = (
/obj/structure/chair/comfy/shuttle{
dir = 4
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red/brig,
/area/shuttle/escape)
"bt" = (
/obj/structure/chair/comfy/shuttle,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red/brig,
/area/shuttle/escape)
"bu" = (
/obj/structure/table,
/obj/item/defibrillator,
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/escape)
"bv" = (
/obj/machinery/shower,
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/escape)
"bw" = (
/obj/machinery/sleeper,
@@ -635,7 +476,7 @@
icon_state = "tube1";
dir = 4
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/escape)
"bx" = (
/obj/structure/rack,
@@ -644,16 +485,16 @@
/obj/item/weldingtool,
/obj/item/wirecutters,
/obj/item/stack/cable_coil,
-/turf/simulated/shuttle/plating{
- dir = 4;
- icon_state = "warning"
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
},
+/turf/simulated/floor/plasteel,
/area/shuttle/escape)
"by" = (
/obj/structure/reagent_dispensers/watertank,
-/turf/simulated/shuttle/plating{
- dir = 1;
- icon_state = "delivery"
+/obj/effect/turf_decal/delivery,
+/turf/simulated/floor/plasteel{
+ icon_state = "floorgrime"
},
/area/shuttle/escape)
"bz" = (
@@ -662,34 +503,22 @@
dir = 1;
on = 1
},
-/turf/simulated/shuttle/plating{
- dir = 1;
- icon_state = "delivery"
+/obj/effect/turf_decal/delivery,
+/turf/simulated/floor/plasteel{
+ icon_state = "floorgrime"
},
/area/shuttle/escape)
"bA" = (
-/turf/simulated/shuttle/plating{
- dir = 1;
- icon_state = "delivery"
+/obj/effect/turf_decal/delivery,
+/turf/simulated/floor/plasteel{
+ icon_state = "floorgrime"
},
/area/shuttle/escape)
"bB" = (
/obj/machinery/recharge_station,
-/turf/simulated/shuttle/plating{
- dir = 1;
- icon_state = "delivery"
- },
-/area/shuttle/escape)
-"bC" = (
-/turf/simulated/shuttle/wall{
- icon_state = "swall12";
- dir = 2
- },
-/area/shuttle/escape)
-"bD" = (
-/turf/simulated/shuttle/wall{
- icon_state = "swall11";
- dir = 2
+/obj/effect/turf_decal/delivery,
+/turf/simulated/floor/plasteel{
+ icon_state = "floorgrime"
},
/area/shuttle/escape)
"bE" = (
@@ -699,9 +528,7 @@
/obj/structure/chair/comfy/shuttle{
dir = 8
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red/brig,
/area/shuttle/escape)
"bF" = (
/obj/structure/table,
@@ -736,11 +563,11 @@
pixel_x = 2;
pixel_y = 8
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/escape)
"bG" = (
/obj/machinery/sleeper,
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/escape)
"bH" = (
/obj/structure/rack,
@@ -756,10 +583,10 @@
pixel_x = 3;
pixel_y = -5
},
-/turf/simulated/shuttle/plating{
- dir = 4;
- icon_state = "warning"
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
},
+/turf/simulated/floor/plasteel,
/area/shuttle/escape)
"bI" = (
/obj/machinery/light{
@@ -768,13 +595,13 @@
/obj/structure/chair/comfy/shuttle{
dir = 4
},
-/turf/simulated/shuttle/plating{
+/turf/simulated/floor/plasteel{
icon_state = "floorgrime"
},
/area/shuttle/escape)
"bJ" = (
/obj/machinery/suit_storage_unit/standard_unit,
-/turf/simulated/shuttle/plating{
+/turf/simulated/floor/plasteel{
icon_state = "floorgrime"
},
/area/shuttle/escape)
@@ -785,47 +612,30 @@
/obj/structure/chair/comfy/shuttle{
dir = 4
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red/brig,
/area/shuttle/escape)
"bL" = (
/obj/structure/chair/comfy/shuttle{
dir = 8
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red/brig,
/area/shuttle/escape)
"bM" = (
/obj/machinery/optable,
/obj/machinery/light{
dir = 8
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/escape)
"bN" = (
-/turf/simulated/shuttle/plating{
- dir = 4;
- icon_state = "warning"
- },
-/area/shuttle/escape)
-"bO" = (
-/turf/space,
-/turf/simulated/shuttle/wall{
- tag = "icon-swall_f5";
- icon_state = "swall_f5";
- dir = 2
- },
-/turf/simulated/shuttle/wall{
- tag = "icon-diagonalWall3";
- icon_state = "diagonalWall3";
- dir = 2
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
},
+/turf/simulated/floor/plasteel,
/area/shuttle/escape)
"bP" = (
/obj/structure/reagent_dispensers/watertank,
-/turf/simulated/shuttle/plating{
+/turf/simulated/floor/plasteel{
icon_state = "floorgrime"
},
/area/shuttle/escape)
@@ -848,7 +658,7 @@
name = "Station Intercom (General)";
pixel_y = -28
},
-/turf/simulated/shuttle/floor4,
+/turf/simulated/floor/mineral/plastitanium/red/brig,
/area/shuttle/escape)
"bR" = (
/obj/structure/table,
@@ -857,23 +667,17 @@
idle_power_usage = 0;
use_power = 0
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red/brig,
/area/shuttle/escape)
"bS" = (
/obj/structure/table,
/obj/item/restraints/handcuffs,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red/brig,
/area/shuttle/escape)
"bT" = (
/obj/structure/table,
/obj/item/storage/box/handcuffs,
-/turf/simulated/shuttle/floor{
- icon_state = "floor4"
- },
+/turf/simulated/floor/mineral/plastitanium/red/brig,
/area/shuttle/escape)
"bU" = (
/obj/structure/table,
@@ -895,11 +699,11 @@
pixel_x = 0;
pixel_y = -27
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/escape)
"bV" = (
/obj/structure/sink,
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/escape)
"bW" = (
/obj/structure/table,
@@ -908,7 +712,7 @@
pixel_x = 2;
pixel_y = 3
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/escape)
"bX" = (
/obj/structure/table,
@@ -917,15 +721,7 @@
pixel_x = 3;
pixel_y = 3
},
-/turf/simulated/shuttle/floor,
-/area/shuttle/escape)
-"bY" = (
-/obj/structure/sign/lifestar,
-/turf/simulated/shuttle/wall{
- dir = 8;
- icon_state = "swall2";
- tag = "icon-swall2"
- },
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/escape)
"bZ" = (
/obj/structure/rack{
@@ -935,10 +731,10 @@
/obj/item/clothing/suit/fire/firefighter,
/obj/item/clothing/mask/gas,
/obj/item/clothing/head/hardhat/red,
-/turf/simulated/shuttle/plating{
- dir = 4;
- icon_state = "warning"
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
},
+/turf/simulated/floor/plasteel,
/area/shuttle/escape)
"ca" = (
/obj/structure/extinguisher_cabinet{
@@ -946,8 +742,9 @@
pixel_y = -30
},
/obj/machinery/space_heater,
-/turf/simulated/shuttle/plating{
- icon_state = "bot"
+/obj/effect/turf_decal/bot,
+/turf/simulated/floor/plasteel{
+ icon_state = "floorgrime"
},
/area/shuttle/escape)
"cb" = (
@@ -967,8 +764,9 @@
/obj/item/crowbar,
/obj/item/wrench,
/obj/item/radio,
-/turf/simulated/shuttle/plating{
- icon_state = "bot"
+/obj/effect/turf_decal/bot,
+/turf/simulated/floor/plasteel{
+ icon_state = "floorgrime"
},
/area/shuttle/escape)
"cc" = (
@@ -989,13 +787,14 @@
pixel_y = 3
},
/obj/item/lazarus_injector,
+/obj/effect/turf_decal/bot,
/mob/living/simple_animal/bot/medbot{
name = "\improper emergency medibot";
pixel_x = -3;
pixel_y = 2
},
-/turf/simulated/shuttle/plating{
- icon_state = "bot"
+/turf/simulated/floor/plasteel{
+ icon_state = "floorgrime"
},
/area/shuttle/escape)
"cd" = (
@@ -1007,8 +806,9 @@
},
/obj/machinery/portable_atmospherics/canister/oxygen,
/obj/machinery/light,
-/turf/simulated/shuttle/plating{
- icon_state = "bot"
+/obj/effect/turf_decal/bot,
+/turf/simulated/floor/plasteel{
+ icon_state = "floorgrime"
},
/area/shuttle/escape)
"ce" = (
@@ -1016,31 +816,8 @@
/obj/item/clipboard,
/obj/item/folder/yellow,
/obj/item/pen,
-/turf/simulated/shuttle/plating{
- icon_state = "bot"
- },
-/area/shuttle/escape)
-"cf" = (
-/turf/space,
-/turf/simulated/shuttle/wall{
- tag = "icon-swall_f5";
- icon_state = "swall_f5";
- dir = 2
- },
-/area/shuttle/escape)
-"cg" = (
-/turf/simulated/shuttle/wall{
- tag = "icon-swall13";
- icon_state = "swall13";
- dir = 2
- },
-/area/shuttle/escape)
-"ch" = (
-/turf/space,
-/turf/simulated/shuttle/wall{
- tag = "icon-swall_f9";
- icon_state = "swall_f9";
- dir = 2
+/turf/simulated/floor/plasteel{
+ icon_state = "floorgrime"
},
/area/shuttle/escape)
"ci" = (
@@ -1052,12 +829,15 @@
timid = 1;
width = 25
},
-/obj/machinery/door/airlock/shuttle{
+/obj/machinery/door/airlock/titanium{
id_tag = "s_docking_airlock";
name = "Emergency Shuttle Airlock";
req_access_txt = "0"
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/plating,
+/area/shuttle/escape)
+"Rk" = (
+/turf/simulated/floor/mineral/plastitanium/red/brig,
/area/shuttle/escape)
(1,1,1) = {"
@@ -1066,10 +846,10 @@ aa
aO
aA
aH
-aj
+ab
aO
aH
-aj
+ab
aO
aA
aH
@@ -1082,31 +862,31 @@ am
aB
aI
aB
-ak
+ab
aB
aI
-ak
+ab
aB
aI
aB
-bO
+am
aa
"}
(3,1,1) = {"
ab
-an
-as
-as
-as
-an
-as
-as
-bf
-as
-as
-as
-an
-cf
+ab
+ab
+ab
+ab
+ab
+ab
+ab
+ab
+ab
+ab
+ab
+ab
+ab
"}
(4,1,1) = {"
ac
@@ -1117,7 +897,7 @@ aP
aU
aY
ba
-bg
+aT
bo
bo
bI
@@ -1133,7 +913,7 @@ aQ
aD
au
bb
-ak
+ab
bp
bp
bp
@@ -1149,9 +929,9 @@ au
au
aK
bc
-ae
+ab
bq
-aj
+ab
bp
bp
bq
@@ -1167,29 +947,29 @@ au
au
bh
br
-bC
+ab
bJ
bJ
ac
"}
(8,1,1) = {"
-ad
-as
+ab
+ab
aF
-az
+ab
aR
-aV
-as
-as
-bi
-as
-bD
+ab
+ab
+ab
+ab
+ab
+ab
aF
-as
-cg
+ab
+ab
"}
(9,1,1) = {"
-ae
+ab
at
au
au
@@ -1197,12 +977,12 @@ au
au
aZ
at
-ak
+ab
bs
bs
bK
bQ
-ak
+ab
"}
(10,1,1) = {"
ac
@@ -1214,14 +994,14 @@ au
au
au
bj
-br
-br
-br
+Rk
+Rk
+Rk
bR
ac
"}
(11,1,1) = {"
-af
+ab
av
au
aL
@@ -1231,8 +1011,8 @@ au
aL
ac
bt
-br
-br
+Rk
+Rk
bS
ac
"}
@@ -1245,12 +1025,12 @@ aS
aW
au
aL
-aj
+ab
bt
bE
bL
bT
-aj
+ab
"}
(13,1,1) = {"
ac
@@ -1261,12 +1041,12 @@ ac
av
au
bd
-bk
-as
-as
-as
-as
-cg
+ab
+ab
+ab
+ab
+ab
+ab
"}
(14,1,1) = {"
ai
@@ -1277,12 +1057,12 @@ aT
av
au
aL
-ae
+ab
bu
bF
bM
bU
-ae
+ab
"}
(15,1,1) = {"
ah
@@ -1330,7 +1110,7 @@ bw
bG
au
bX
-aj
+ab
"}
(18,1,1) = {"
ac
@@ -1342,14 +1122,14 @@ av
au
aL
bm
-az
+ab
ac
bl
-bY
-cg
+bm
+ab
"}
(19,1,1) = {"
-af
+ab
ax
au
aL
@@ -1357,12 +1137,12 @@ ac
av
au
aM
-ae
+ab
bx
bH
bN
bZ
-ak
+ab
"}
(20,1,1) = {"
ci
@@ -1378,7 +1158,7 @@ by
bp
bp
ca
-ae
+ab
"}
(21,1,1) = {"
ac
@@ -1413,7 +1193,7 @@ cc
ac
"}
(23,1,1) = {"
-aj
+ab
au
au
au
@@ -1426,10 +1206,10 @@ bA
bp
bp
cd
-aj
+ab
"}
(24,1,1) = {"
-ak
+ab
ay
aG
aN
@@ -1437,26 +1217,26 @@ au
aX
au
be
-aj
+ab
bB
bA
bA
ce
-ak
+ab
"}
(25,1,1) = {"
-al
-az
+ab
+ab
ac
-af
+ab
ac
-af
+ab
ac
-aV
-an
-az
+ab
+ab
+ab
ac
ac
-aV
-ch
+ab
+ab
"}
diff --git a/_maps/map_files/shuttles/emergency_mil.dmm b/_maps/map_files/shuttles/emergency_mil.dmm
index 3123416ee2d..482970ba92d 100644
--- a/_maps/map_files/shuttles/emergency_mil.dmm
+++ b/_maps/map_files/shuttles/emergency_mil.dmm
@@ -20,42 +20,12 @@
/turf/simulated/floor/plating/airless,
/area/shuttle/escape)
"ae" = (
-/turf/space,
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swallc2"
- },
-/area/shuttle/escape)
-"af" = (
-/turf/simulated/shuttle/wall{
- icon_state = "swall12";
- dir = 2
- },
+/turf/simulated/wall/mineral/titanium,
/area/shuttle/escape)
"ag" = (
-/obj/structure/grille,
-/obj/structure/window/full/shuttle,
+/obj/effect/spawner/window/shuttle,
/turf/simulated/floor/plating,
/area/shuttle/escape)
-"ah" = (
-/turf/space,
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swallc1"
- },
-/area/shuttle/escape)
-"ai" = (
-/turf/space,
-/turf/simulated/shuttle/wall{
- icon_state = "swall_f6";
- dir = 2
- },
-/area/shuttle/escape)
-"aj" = (
-/turf/simulated/shuttle/wall{
- icon_state = "swallc4"
- },
-/area/shuttle/escape)
"ak" = (
/obj/machinery/computer/communications,
/obj/machinery/light/spot{
@@ -63,15 +33,15 @@
icon_state = "tube1";
dir = 1
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/escape)
"al" = (
/obj/machinery/computer/crew,
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/escape)
"am" = (
/obj/structure/table,
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/escape)
"an" = (
/obj/machinery/computer/security{
@@ -82,77 +52,39 @@
icon_state = "tube1";
dir = 1
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/escape)
"ao" = (
/obj/machinery/computer/emergency_shuttle,
-/turf/simulated/shuttle/floor,
-/area/shuttle/escape)
-"ap" = (
-/turf/simulated/shuttle/wall{
- icon_state = "swallc3"
- },
-/area/shuttle/escape)
-"aq" = (
-/turf/space,
-/turf/simulated/shuttle/wall{
- tag = "icon-swall_f10";
- icon_state = "swall_f10";
- dir = 2
- },
-/area/shuttle/escape)
-"ar" = (
-/turf/simulated/shuttle/wall{
- icon_state = "swall3";
- dir = 2
- },
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/escape)
"as" = (
/obj/machinery/computer/station_alert,
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/escape)
"at" = (
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/escape)
"au" = (
/obj/structure/chair/comfy/shuttle{
dir = 1
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/escape)
"ay" = (
/obj/machinery/computer/robotics,
-/turf/simulated/shuttle/floor,
-/area/shuttle/escape)
-"aB" = (
-/turf/simulated/shuttle/wall{
- tag = "icon-swall7";
- icon_state = "swall7";
- dir = 2
- },
-/area/shuttle/escape)
-"aC" = (
-/turf/simulated/shuttle/wall{
- icon_state = "swall14";
- dir = 2
- },
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/escape)
"aD" = (
/obj/machinery/door/airlock/command/glass{
name = "Escape Shuttle Cockpit";
req_access_txt = "19"
},
-/turf/simulated/shuttle/floor,
-/area/shuttle/escape)
-"aE" = (
-/turf/simulated/shuttle/wall{
- icon_state = "swall11";
- dir = 2
- },
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/escape)
"aF" = (
/obj/structure/chair/comfy/shuttle,
-/turf/simulated/shuttle/floor4,
+/turf/simulated/floor/mineral/plastitanium/red/brig,
/area/shuttle/escape)
"aG" = (
/obj/machinery/status_display{
@@ -164,14 +96,7 @@
dir = 1
},
/obj/structure/chair/comfy/shuttle,
-/turf/simulated/shuttle/floor4,
-/area/shuttle/escape)
-"aH" = (
-/obj/structure/grille,
-/obj/structure/window/full/shuttle{
- icon_state = "16"
- },
-/turf/simulated/floor/plating,
+/turf/simulated/floor/mineral/plastitanium/red/brig,
/area/shuttle/escape)
"aI" = (
/turf/simulated/floor/plating,
@@ -223,17 +148,10 @@
/obj/structure/closet/walllocker/emerglocker{
pixel_x = -28
},
-/turf/simulated/shuttle/floor4,
+/turf/simulated/floor/mineral/plastitanium/red/brig,
/area/shuttle/escape)
"aO" = (
-/turf/simulated/shuttle/floor4,
-/area/shuttle/escape)
-"aP" = (
-/obj/structure/grille,
-/obj/structure/window/full/shuttle{
- icon_state = "8"
- },
-/turf/simulated/floor/plating,
+/turf/simulated/floor/mineral/plastitanium/red/brig,
/area/shuttle/escape)
"aQ" = (
/obj/machinery/atmospherics/pipe/manifold/hidden{
@@ -296,7 +214,7 @@
},
/area/shuttle/escape)
"aW" = (
-/obj/machinery/door/airlock/shuttle{
+/obj/machinery/door/airlock/titanium{
aiControlDisabled = 1;
hackProof = 1;
id_tag = "s_docking_airlock";
@@ -308,7 +226,7 @@
/obj/structure/chair/comfy/shuttle{
dir = 1
},
-/turf/simulated/shuttle/floor4,
+/turf/simulated/floor/mineral/plastitanium/red/brig,
/area/shuttle/escape)
"aY" = (
/obj/machinery/atmospherics/unary/thermomachine/freezer{
@@ -379,17 +297,7 @@
/area/shuttle/escape)
"bd" = (
/obj/structure/noticeboard,
-/turf/simulated/shuttle/wall{
- icon_state = "swall12";
- dir = 2
- },
-/area/shuttle/escape)
-"be" = (
-/obj/structure/grille,
-/obj/structure/window/full/shuttle{
- icon_state = "15"
- },
-/turf/simulated/floor/plating,
+/turf/simulated/wall/mineral/titanium,
/area/shuttle/escape)
"bf" = (
/obj/machinery/door/airlock/command/glass{
@@ -414,13 +322,13 @@
timid = 1;
width = 24
},
-/obj/machinery/door/airlock/shuttle{
+/obj/machinery/door/airlock/titanium{
aiControlDisabled = 1;
hackProof = 1;
id_tag = "s_docking_airlock";
name = "Shuttle Hatch"
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/plating,
/area/shuttle/escape)
"bi" = (
/obj/structure/closet/walllocker/emerglocker{
@@ -478,26 +386,6 @@
},
/turf/simulated/floor/plating,
/area/shuttle/escape)
-"bp" = (
-/obj/machinery/door/airlock/shuttle{
- aiControlDisabled = 1;
- hackProof = 1;
- id_tag = "s_docking_airlock";
- name = "Shuttle Hatch"
- },
-/turf/simulated/shuttle/floor,
-/area/shuttle/escape)
-"bq" = (
-/obj/machinery/door/airlock/shuttle{
- aiControlDisabled = 1;
- hackProof = 1;
- id_tag = "s_docking_airlock";
- name = "Shuttle Hatch"
- },
-/turf/simulated/shuttle/floor{
- icon_state = "floor2"
- },
-/area/shuttle/escape)
"br" = (
/mob/living/simple_animal/bot/secbot,
/turf/simulated/floor/plating,
@@ -506,37 +394,23 @@
/obj/machinery/recharge_station,
/turf/simulated/floor/plating,
/area/shuttle/escape)
-"bt" = (
-/turf/space,
-/turf/simulated/shuttle/wall{
- icon_state = "swall_f5";
- dir = 2
- },
-/area/shuttle/escape)
"bu" = (
/obj/structure/window/reinforced{
dir = 1
},
/obj/structure/shuttle/engine/heater,
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating/airless,
/area/shuttle/escape)
"bv" = (
/obj/structure/shuttle/engine/heater,
/obj/structure/window/reinforced{
dir = 1
},
-/turf/simulated/shuttle/plating,
-/area/shuttle/escape)
-"bw" = (
-/turf/space,
-/turf/simulated/shuttle/wall{
- icon_state = "swall_f9";
- dir = 2
- },
+/turf/simulated/floor/plating/airless,
/area/shuttle/escape)
"bx" = (
/obj/structure/shuttle/engine/propulsion,
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating/airless,
/area/shuttle/escape)
"by" = (
/turf/simulated/floor/plating/airless,
@@ -560,41 +434,41 @@
(1,1,1) = {"
aa
aa
-ai
-ar
-ar
-aB
-ar
-ar
-ar
+ae
+ae
+ae
+ae
+ae
+ae
+ae
aW
-aB
+ae
bh
-ar
-ar
-ar
-ar
-ar
-bp
+ae
+ae
+ae
+ae
+ae
+aW
ag
-bq
-ar
-ar
-bt
+aW
+ae
+ae
+ae
aa
"}
(2,1,1) = {"
aa
ab
-af
+ae
as
au
-af
+ae
aF
aN
aO
aO
-af
+ae
aI
bj
bl
@@ -606,16 +480,16 @@ aI
aI
bl
bn
-aC
-bt
+ae
+ae
"}
(3,1,1) = {"
aa
ad
-af
+ae
at
at
-af
+ae
aG
aO
aO
@@ -638,15 +512,15 @@ bx
(4,1,1) = {"
aa
ae
-aj
+ae
at
at
-af
+ae
aF
aO
aO
aX
-af
+ae
aI
bk
bk
@@ -663,11 +537,11 @@ bx
"}
(5,1,1) = {"
ab
-af
+ae
ak
au
at
-af
+ae
aF
aO
aO
@@ -684,21 +558,21 @@ bl
bl
bl
bl
-aC
-aj
+ae
+ae
"}
(6,1,1) = {"
ac
-af
+ae
al
au
at
-aC
-aH
-aP
-aP
-aP
-be
+ae
+ag
+ag
+ag
+ag
+ag
aI
aI
aI
@@ -710,7 +584,7 @@ aI
aI
aI
aI
-af
+ae
by
"}
(7,1,1) = {"
@@ -736,21 +610,21 @@ aI
aI
bs
bs
-af
+ae
bz
"}
(8,1,1) = {"
ac
-af
+ae
an
au
at
-aC
-aH
-aP
-aP
-aP
-be
+ae
+ag
+ag
+ag
+ag
+ag
aI
aI
aI
@@ -762,21 +636,21 @@ aI
aI
aI
aI
-af
+ae
by
"}
(9,1,1) = {"
ab
-af
+ae
ao
au
at
-af
+ae
aJ
aQ
aU
aY
-af
+ae
aI
bk
bk
@@ -788,21 +662,21 @@ bk
bk
bk
bk
-aC
-ap
+ae
+ae
"}
(10,1,1) = {"
aa
-ah
-ap
+ae
+ae
at
at
-af
+ae
aK
aR
aS
aZ
-af
+ae
aI
bl
bl
@@ -820,10 +694,10 @@ bx
(11,1,1) = {"
aa
ad
-af
+ae
at
at
-af
+ae
aL
aS
aS
@@ -846,15 +720,15 @@ bx
(12,1,1) = {"
aa
ab
-af
+ae
ay
au
-af
+ae
aM
aT
aV
bb
-af
+ae
bi
bm
bk
@@ -866,32 +740,32 @@ aI
br
bk
bm
-aC
-bw
+ae
+ae
"}
(13,1,1) = {"
aa
aa
-aq
-ar
-ar
-aE
-ar
-ar
-ar
+ae
+ae
+ae
+ae
+ae
+ae
+ae
ag
-aE
-ar
-ar
-ar
-ar
-ar
-ar
-ar
+ae
+ae
+ae
+ae
+ae
+ae
+ae
+ae
ag
-ar
-ar
-ar
-bw
+ae
+ae
+ae
+ae
aa
"}
diff --git a/_maps/map_files/shuttles/emergency_narnar.dmm b/_maps/map_files/shuttles/emergency_narnar.dmm
index aefef374d40..2b34425b9d2 100644
--- a/_maps/map_files/shuttles/emergency_narnar.dmm
+++ b/_maps/map_files/shuttles/emergency_narnar.dmm
@@ -289,16 +289,6 @@
/obj/effect/decal/cleanable/blood/writing,
/turf/simulated/floor/engine/cult,
/area/shuttle/escape)
-"aR" = (
-/obj/effect/spawner/window/reinforced{
- color = "red"
- },
-/turf/simulated/shuttle/wall{
- icon_state = "swall3";
- dir = 2
- },
-/turf/simulated/wall/cult,
-/area/shuttle/escape)
"aS" = (
/obj/machinery/status_display{
pixel_y = -30
@@ -306,21 +296,11 @@
/obj/machinery/light/spot,
/turf/simulated/floor/engine/cult,
/area/shuttle/escape)
-"aT" = (
-/obj/machinery/door/airlock/cult/friendly,
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
-/area/shuttle/escape)
"aU" = (
/obj/effect/spawner/window/reinforced{
color = "red"
},
-/turf/simulated/shuttle/wall{
- tag = "icon-swall14";
- icon_state = "swall14";
- dir = 2
- },
+/turf/space,
/area/shuttle/escape)
"aV" = (
/mob/living/simple_animal/hostile/construct/harvester,
@@ -358,10 +338,6 @@
/obj/structure/showcase/horrific_experiment,
/turf/simulated/floor/engine/cult,
/area/shuttle/escape)
-"ba" = (
-/obj/effect/spawner/window/reinforced,
-/turf/simulated/floor/plating,
-/area/shuttle/escape)
"bb" = (
/obj/machinery/light/spot{
tag = "icon-tube1 (EAST)";
@@ -404,7 +380,7 @@
},
/obj/structure/shuttle/engine/heater,
/obj/structure/cult/forge,
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating/airless,
/area/shuttle/escape)
"bi" = (
/obj/structure/shuttle/engine/heater,
@@ -412,11 +388,11 @@
dir = 1
},
/obj/structure/cult/forge,
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating/airless,
/area/shuttle/escape)
"bj" = (
/obj/structure/shuttle/engine/propulsion,
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating/airless,
/area/shuttle/escape)
(1,1,1) = {"
@@ -440,7 +416,7 @@ ab
ar
ab
ar
-ba
+ac
ab
ab
aa
@@ -516,7 +492,7 @@ aF
aj
aj
aj
-aT
+ar
aj
aj
be
@@ -748,7 +724,7 @@ ab
ac
ac
ac
-aR
+aD
ac
ab
ab
diff --git a/_maps/map_files/shuttles/emergency_old.dmm b/_maps/map_files/shuttles/emergency_old.dmm
index b8b49da71e5..29819b7a9ce 100644
--- a/_maps/map_files/shuttles/emergency_old.dmm
+++ b/_maps/map_files/shuttles/emergency_old.dmm
@@ -3,54 +3,31 @@
/turf/space,
/area/space)
"ab" = (
-/turf/space,
-/turf/simulated/shuttle/wall{
- icon_state = "swall_f6";
- dir = 2
- },
+/turf/simulated/wall/mineral/titanium,
/area/shuttle/escape)
"ac" = (
-/obj/structure/grille,
-/obj/structure/window/full/shuttle,
+/obj/effect/spawner/window/shuttle,
/turf/simulated/floor/plating,
/area/shuttle/escape)
-"ad" = (
-/turf/space,
-/turf/simulated/shuttle/wall{
- tag = "icon-swall_f10";
- icon_state = "swall_f10";
- dir = 2
- },
-/area/shuttle/escape)
-"ae" = (
-/turf/simulated/shuttle/wall{
- icon_state = "swallc4"
- },
-/area/shuttle/escape)
"af" = (
/obj/machinery/computer/emergency_shuttle,
-/turf/simulated/shuttle/floor,
-/area/shuttle/escape)
-"ag" = (
-/turf/simulated/shuttle/wall{
- icon_state = "swallc3"
- },
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/escape)
"ah" = (
/obj/machinery/computer/security{
network = list("SS13","Telecomms","Research Outpost","Mining Outpost")
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/escape)
"ai" = (
/obj/structure/chair/comfy/shuttle{
dir = 1
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/escape)
"aj" = (
/obj/machinery/computer/communications,
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/escape)
"ak" = (
/obj/docking_port/mobile/emergency{
@@ -60,27 +37,27 @@
timid = 1;
width = 24
},
-/obj/machinery/door/airlock/shuttle{
+/obj/machinery/door/airlock/titanium{
aiControlDisabled = 1;
hackProof = 1;
id_tag = "s_docking_airlock";
name = "Shuttle Hatch"
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/plating,
/area/shuttle/escape)
"al" = (
/obj/machinery/computer/station_alert,
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/escape)
"an" = (
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/escape)
"ao" = (
/obj/machinery/computer/crew,
/obj/machinery/status_display{
pixel_y = 30
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/escape)
"ap" = (
/obj/structure/closet/walllocker/emerglocker{
@@ -89,7 +66,7 @@
/obj/structure/chair/comfy/shuttle{
dir = 1
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/escape)
"aq" = (
/obj/structure/closet/walllocker/emerglocker{
@@ -98,66 +75,40 @@
/obj/structure/chair/comfy/shuttle{
dir = 1
},
-/turf/simulated/shuttle/floor,
-/area/shuttle/escape)
-"ar" = (
-/turf/simulated/shuttle/wall{
- icon_state = "swall3";
- dir = 2
- },
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/escape)
"as" = (
/obj/machinery/computer/robotics,
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/escape)
"at" = (
/obj/structure/chair/comfy/shuttle{
dir = 8
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/escape)
"au" = (
/obj/machinery/light/spot,
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/escape)
"av" = (
/obj/structure/chair/comfy/shuttle{
dir = 4
},
-/turf/simulated/shuttle/floor,
-/area/shuttle/escape)
-"aw" = (
-/turf/simulated/shuttle/wall{
- icon_state = "swall12";
- dir = 2
- },
-/area/shuttle/escape)
-"ax" = (
-/turf/simulated/shuttle/wall{
- icon_state = "swall13";
- dir = 2
- },
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/escape)
"ay" = (
/obj/machinery/door/airlock/command/glass{
name = "Escape Shuttle Cockpit";
req_access_txt = "19"
},
-/turf/simulated/shuttle/floor,
-/area/shuttle/escape)
-"az" = (
-/turf/simulated/shuttle/wall{
- icon_state = "swall14";
- dir = 2
- },
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/escape)
"aA" = (
/obj/structure/chair/comfy/shuttle{
dir = 4
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/escape)
"aB" = (
/obj/machinery/status_display{
@@ -168,22 +119,13 @@
icon_state = "tube1";
dir = 1
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/escape)
"aC" = (
/obj/structure/chair/comfy/shuttle{
dir = 8
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
-/area/shuttle/escape)
-"aD" = (
-/obj/structure/grille,
-/obj/structure/window/full/shuttle{
- icon_state = "16"
- },
-/turf/simulated/floor/plating,
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/escape)
"aE" = (
/obj/structure/closet/walllocker/emerglocker{
@@ -192,14 +134,7 @@
/obj/structure/chair/comfy/shuttle{
dir = 4
},
-/turf/simulated/shuttle/floor4,
-/area/shuttle/escape)
-"aF" = (
-/obj/structure/grille,
-/obj/structure/window/full/shuttle{
- icon_state = "8"
- },
-/turf/simulated/floor/plating,
+/turf/simulated/floor/mineral/plastitanium/red/brig,
/area/shuttle/escape)
"aG" = (
/obj/structure/closet/walllocker/emerglocker{
@@ -208,27 +143,10 @@
/obj/structure/chair/comfy/shuttle{
dir = 8
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/escape)
"aI" = (
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
-/area/shuttle/escape)
-"aJ" = (
-/obj/structure/grille,
-/obj/structure/window/full/shuttle{
- icon_state = "15"
- },
-/turf/simulated/floor/plating,
-/area/shuttle/escape)
-"aK" = (
-/turf/simulated/shuttle/wall{
- icon_state = "swall7";
- dir = 2
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/escape)
"aL" = (
/obj/item/radio/intercom{
@@ -244,9 +162,7 @@
/obj/structure/chair/comfy/shuttle{
dir = 4
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/escape)
"aM" = (
/obj/structure/closet/walllocker/emerglocker{
@@ -260,9 +176,7 @@
/obj/structure/chair/comfy/shuttle{
dir = 8
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/escape)
"aN" = (
/obj/structure/table,
@@ -278,57 +192,23 @@
icon_state = "tube1";
dir = 8
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
-/area/shuttle/escape)
-"aP" = (
-/obj/machinery/door/airlock/shuttle{
- aiControlDisabled = 1;
- hackProof = 1;
- id_tag = "s_docking_airlock";
- name = "Shuttle Hatch"
- },
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/escape)
"aQ" = (
/obj/machinery/status_display{
pixel_y = -30
},
/obj/machinery/light/spot,
-/turf/simulated/shuttle/floor,
-/area/shuttle/escape)
-"aR" = (
-/obj/structure/grille,
-/obj/structure/window/full/shuttle{
- icon_state = "14"
- },
-/turf/simulated/floor/plating,
-/area/shuttle/escape)
-"aS" = (
-/obj/structure/grille,
-/obj/structure/window/full/shuttle{
- icon_state = "17"
- },
-/turf/simulated/floor/plating,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/escape)
"aT" = (
-/obj/machinery/door/airlock/shuttle{
+/obj/machinery/door/airlock/titanium{
aiControlDisabled = 1;
hackProof = 1;
id_tag = null;
name = "Shuttle Cargo Hatch"
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
-/area/shuttle/escape)
-"aU" = (
-/turf/simulated/shuttle/wall{
- tag = "icon-swall14";
- icon_state = "swall14";
- dir = 2
- },
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/escape)
"aV" = (
/obj/machinery/door/airlock/medical/glass{
@@ -336,10 +216,10 @@
name = "Escape Shuttle Infirmary";
req_access_txt = "0"
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/escape)
"aW" = (
-/obj/machinery/door/airlock/shuttle{
+/obj/machinery/door/airlock/titanium{
aiControlDisabled = 1;
hackProof = 1;
id_tag = "s_docking_airlock";
@@ -349,22 +229,18 @@
/area/shuttle/escape)
"aX" = (
/obj/structure/closet/crate,
-/turf/simulated/shuttle/floor{
- icon_state = "floor2"
- },
+/turf/simulated/floor/mineral/titanium/yellow,
/area/shuttle/escape)
"aZ" = (
/obj/structure/chair/comfy/shuttle,
-/turf/simulated/shuttle/floor4,
+/turf/simulated/floor/mineral/plastitanium/red/brig,
/area/shuttle/escape)
"ba" = (
-/turf/simulated/shuttle/floor4,
+/turf/simulated/floor/mineral/plastitanium/red/brig,
/area/shuttle/escape)
"bb" = (
/obj/structure/closet/cardboard,
-/turf/simulated/shuttle/floor{
- icon_state = "floor2"
- },
+/turf/simulated/floor/mineral/titanium/yellow,
/area/shuttle/escape)
"bc" = (
/obj/machinery/light/spot{
@@ -372,9 +248,7 @@
icon_state = "tube1";
dir = 4
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor2"
- },
+/turf/simulated/floor/mineral/titanium/yellow,
/area/shuttle/escape)
"bd" = (
/obj/machinery/status_display{
@@ -386,9 +260,7 @@
icon_state = "tube1";
dir = 8
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/escape)
"be" = (
/obj/item/radio/intercom{
@@ -397,59 +269,35 @@
pixel_x = 28
},
/obj/structure/bed/roller,
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/escape)
"bf" = (
/obj/machinery/mech_bay_recharge_port,
-/turf/simulated/shuttle/floor{
- icon_state = "floor2"
- },
+/turf/simulated/floor/mineral/titanium/yellow,
/area/shuttle/escape)
"bh" = (
/obj/structure/chair/comfy/shuttle{
dir = 1
},
-/turf/simulated/shuttle/floor4,
-/area/shuttle/escape)
-"bi" = (
-/turf/space,
-/turf/simulated/shuttle/wall{
- icon_state = "swall_f5";
- dir = 2
- },
+/turf/simulated/floor/mineral/plastitanium/red/brig,
/area/shuttle/escape)
"bj" = (
/obj/structure/window/reinforced{
dir = 1
},
/obj/structure/shuttle/engine/heater,
-/turf/simulated/shuttle/plating,
-/area/shuttle/escape)
-"bk" = (
-/turf/simulated/shuttle/wall{
- icon_state = "swall11";
- dir = 2
- },
+/turf/simulated/floor/plating/airless,
/area/shuttle/escape)
"bm" = (
/obj/structure/shuttle/engine/heater,
/obj/structure/window/reinforced{
dir = 1
},
-/turf/simulated/shuttle/plating,
-/area/shuttle/escape)
-"bn" = (
-/turf/space,
-/turf/simulated/shuttle/wall{
- icon_state = "swall_f9";
- dir = 2
- },
+/turf/simulated/floor/plating/airless,
/area/shuttle/escape)
"bo" = (
/obj/structure/shuttle/engine/propulsion,
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating/airless,
/area/shuttle/escape)
"db" = (
/obj/machinery/door/airlock/security/glass{
@@ -464,9 +312,7 @@
icon_state = "sleeper";
dir = 1
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/escape)
"iM" = (
/obj/structure/table,
@@ -486,22 +332,13 @@
/obj/item/bodybag{
pixel_x = 5
},
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
-/area/shuttle/escape)
-"kP" = (
-/turf/simulated/shuttle/wall{
- tag = "icon-swall7";
- icon_state = "swall7";
- dir = 2
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/escape)
"lJ" = (
/obj/structure/chair/comfy/shuttle{
dir = 4
},
-/turf/simulated/shuttle/floor4,
+/turf/simulated/floor/mineral/plastitanium/red/brig,
/area/shuttle/escape)
"mk" = (
/obj/machinery/status_display{
@@ -513,7 +350,7 @@
dir = 1
},
/obj/structure/chair/comfy/shuttle,
-/turf/simulated/shuttle/floor4,
+/turf/simulated/floor/mineral/plastitanium/red/brig,
/area/shuttle/escape)
"rj" = (
/obj/machinery/vending/wallmed{
@@ -524,50 +361,18 @@
req_access_txt = "0"
},
/obj/structure/bed/roller,
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/escape)
"xo" = (
/obj/machinery/recharge_station,
-/turf/simulated/shuttle/floor{
- icon_state = "floor2"
- },
+/turf/simulated/floor/mineral/titanium/yellow,
/area/shuttle/escape)
"zT" = (
/obj/structure/noticeboard,
-/turf/simulated/shuttle/wall{
- icon_state = "swall12";
- dir = 2
- },
-/area/shuttle/escape)
-"Bs" = (
-/obj/machinery/door/airlock/shuttle{
- aiControlDisabled = 1;
- hackProof = 1;
- id_tag = "s_docking_airlock";
- name = "Shuttle Hatch"
- },
-/turf/simulated/shuttle/floor{
- icon_state = "floor2"
- },
+/turf/simulated/wall/mineral/titanium,
/area/shuttle/escape)
"DZ" = (
-/turf/simulated/shuttle/floor{
- icon_state = "floor2"
- },
-/area/shuttle/escape)
-"OC" = (
-/obj/structure/grille,
-/obj/structure/window/full/shuttle{
- icon_state = "15"
- },
-/turf/simulated/shuttle/floor{
- icon_state = "floor3"
- },
-/area/shuttle/escape)
-"XL" = (
-/turf/simulated/floor/mech_bay_recharge_floor,
+/turf/simulated/floor/mineral/titanium/yellow,
/area/shuttle/escape)
(1,1,1) = {"
@@ -578,22 +383,22 @@ aa
aa
aa
ab
-ar
-ar
+ab
+ab
aW
-kP
+ab
ak
-ar
-aD
-aF
-aJ
-ar
-aP
-kP
-Bs
+ab
ac
-ar
-bi
+ac
+ac
+ab
+aW
+ab
+aW
+ac
+ab
+ab
aa
"}
(2,1,1) = {"
@@ -603,11 +408,11 @@ aa
aa
aa
aa
-aw
+ab
lJ
aE
ba
-aw
+ab
an
aL
aA
@@ -615,12 +420,12 @@ aA
aA
aN
an
-aw
+ab
DZ
bb
bf
-az
-bi
+ab
+ab
"}
(3,1,1) = {"
aa
@@ -628,12 +433,12 @@ aa
aa
aa
ab
-ar
-ax
+ab
+ab
mk
ba
ba
-aw
+ab
an
an
an
@@ -644,7 +449,7 @@ an
zT
DZ
DZ
-XL
+DZ
bj
bo
"}
@@ -653,13 +458,13 @@ aa
aa
ab
ac
-ae
+ab
as
-aw
+ab
aZ
ba
bh
-aw
+ab
an
aC
aC
@@ -677,23 +482,23 @@ bo
(5,1,1) = {"
aa
ab
-ae
+ab
al
ap
at
-aw
+ab
aZ
ba
bh
-aw
+ab
an
-aD
-aF
-aF
-aJ
+ac
+ac
+ac
+ac
an
an
-aw
+ab
aX
bc
xo
@@ -702,16 +507,16 @@ bo
"}
(6,1,1) = {"
ab
-ae
+ab
ah
ai
an
an
-aw
+ab
ac
db
-aD
-OC
+ac
+ac
an
aA
aA
@@ -719,12 +524,12 @@ aA
aA
an
aQ
-aU
-ar
-ar
-ar
-bk
-bn
+ab
+ab
+ab
+ab
+ab
+ab
"}
(7,1,1) = {"
ac
@@ -753,13 +558,13 @@ aa
aa
"}
(8,1,1) = {"
-ad
-ag
+ab
+ab
aj
ai
an
au
-aw
+ab
aC
aC
aC
@@ -771,30 +576,30 @@ aC
aC
an
aQ
-aU
-ar
-ar
-ar
-aK
-bi
+ab
+ab
+ab
+ab
+ab
+ab
"}
(9,1,1) = {"
aa
-ad
-ag
+ab
+ab
ao
aq
av
-az
-aD
-aF
-aF
-aJ
+ab
+ac
+ac
+ac
+ac
an
-aD
-aF
-aF
-aJ
+ac
+ac
+ac
+ac
an
an
ac
@@ -807,11 +612,11 @@ bo
(10,1,1) = {"
aa
aa
-ad
+ab
ac
-ag
+ab
an
-aw
+ab
aA
aA
aA
@@ -835,9 +640,9 @@ aa
aa
aa
aa
-ad
-ar
-ax
+ab
+ab
+ab
aB
an
an
@@ -849,7 +654,7 @@ an
an
an
an
-aR
+ac
aI
aI
ev
@@ -863,7 +668,7 @@ aa
aa
aa
aa
-aw
+ab
aC
aG
aC
@@ -875,12 +680,12 @@ aC
aC
an
an
-aS
+ac
rj
be
aI
-az
-bn
+ab
+ab
"}
(13,1,1) = {"
aa
@@ -889,22 +694,22 @@ aa
aa
aa
aa
-ad
-ar
-ar
+ab
+ab
+ab
ac
-ar
-ar
-ar
-aD
-aF
-aJ
-ar
+ab
+ab
+ab
ac
-ar
-ar
-ar
-ar
-bn
+ac
+ac
+ab
+ac
+ab
+ab
+ab
+ab
+ab
aa
"}
diff --git a/_maps/map_files/shuttles/ferry_base.dmm b/_maps/map_files/shuttles/ferry_base.dmm
index 658633d421a..84d89e20639 100644
--- a/_maps/map_files/shuttles/ferry_base.dmm
+++ b/_maps/map_files/shuttles/ferry_base.dmm
@@ -8,41 +8,14 @@
icon_state = "propulsion";
tag = "icon-propulsion (EAST)"
},
-/turf/space,
-/turf/simulated/shuttle/wall{
- icon_state = "swall_f6";
- dir = 2
- },
+/turf/simulated/wall/mineral/titanium,
/area/shuttle/transport)
"c" = (
-/turf/simulated/shuttle/wall{
- icon_state = "swall12";
- dir = 2
- },
+/turf/simulated/wall/mineral/titanium,
/area/shuttle/transport)
"d" = (
-/obj/structure/shuttle/window,
-/obj/structure/grille,
-/turf/simulated/shuttle/plating,
-/area/shuttle/transport)
-"e" = (
-/obj/structure/grille,
-/obj/structure/shuttle/window,
-/turf/simulated/shuttle/plating,
-/area/shuttle/transport)
-"f" = (
-/turf/space,
-/turf/simulated/shuttle/wall{
- icon_state = "swall_f10";
- dir = 2
- },
-/area/shuttle/transport)
-"g" = (
-/turf/simulated/shuttle/floor,
-/turf/simulated/shuttle/wall/interior{
- tag = "icon-swall_f9";
- icon_state = "swall_f9"
- },
+/obj/effect/spawner/window/shuttle,
+/turf/simulated/floor/plating,
/area/shuttle/transport)
"h" = (
/obj/machinery/light/spot{
@@ -53,15 +26,15 @@
/obj/structure/chair/comfy/shuttle{
dir = 4
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/transport)
"i" = (
/obj/machinery/computer/shuttle/ferry/request,
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/transport)
"j" = (
/obj/structure/chair/comfy/shuttle,
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/transport)
"k" = (
/obj/machinery/light/spot{
@@ -70,19 +43,19 @@
dir = 1
},
/obj/structure/chair/comfy/shuttle,
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/transport)
"l" = (
-/obj/machinery/door/airlock/shuttle{
+/obj/machinery/door/airlock/titanium{
id_tag = "s_docking_airlock"
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/plating,
/area/shuttle/transport)
"m" = (
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/transport)
"n" = (
-/obj/machinery/door/airlock/shuttle{
+/obj/machinery/door/airlock/titanium{
id_tag = "s_docking_airlock"
},
/obj/docking_port/mobile{
@@ -95,70 +68,44 @@
timid = 1;
width = 5
},
-/turf/simulated/shuttle/floor,
-/area/shuttle/transport)
-"o" = (
-/obj/structure/shuttle/engine/propulsion{
- dir = 8;
- icon_state = "propulsion";
- tag = "icon-propulsion (EAST)"
- },
-/turf/space,
-/turf/simulated/shuttle/wall{
- icon_state = "swall_f5";
- dir = 2
- },
-/area/shuttle/transport)
-"p" = (
-/turf/simulated/shuttle/floor,
-/turf/simulated/shuttle/wall/interior{
- tag = "icon-swall_f10";
- icon_state = "swall_f10"
- },
+/turf/simulated/floor/plating,
/area/shuttle/transport)
"q" = (
/obj/structure/closet/crate,
/obj/machinery/light/spot,
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/transport)
"r" = (
/obj/structure/closet/crate,
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/transport)
"s" = (
/obj/structure/chair/comfy/shuttle{
dir = 1
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/transport)
"t" = (
/obj/machinery/light/spot,
/obj/structure/chair/comfy/shuttle{
dir = 1
},
-/turf/simulated/shuttle/floor,
-/area/shuttle/transport)
-"u" = (
-/turf/space,
-/turf/simulated/shuttle/wall{
- icon_state = "swall_f9";
- dir = 2
- },
+/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/transport)
(1,1,1) = {"
a
b
l
-o
+b
a
"}
(2,1,1) = {"
b
-g
+c
m
-p
-o
+c
+b
"}
(3,1,1) = {"
c
@@ -203,11 +150,11 @@ s
c
"}
(9,1,1) = {"
-e
+d
j
m
s
-e
+d
"}
(10,1,1) = {"
c
@@ -224,9 +171,9 @@ t
c
"}
(12,1,1) = {"
-f
+c
d
n
d
-u
+c
"}
diff --git a/_maps/map_files/shuttles/ferry_meat.dmm b/_maps/map_files/shuttles/ferry_meat.dmm
index a0935fb04d3..6dcf2379026 100644
--- a/_maps/map_files/shuttles/ferry_meat.dmm
+++ b/_maps/map_files/shuttles/ferry_meat.dmm
@@ -8,43 +8,14 @@
icon_state = "propulsion";
tag = "icon-propulsion (EAST)"
},
-/turf/space,
-/turf/simulated/shuttle/wall{
- icon_state = "swall_f6";
- dir = 2
- },
+/turf/simulated/wall/mineral/titanium,
/area/shuttle/transport)
"c" = (
-/turf/simulated/shuttle/wall{
- icon_state = "swall12";
- dir = 2
- },
+/turf/simulated/wall/mineral/titanium,
/area/shuttle/transport)
"d" = (
-/obj/structure/shuttle/window,
-/obj/structure/grille,
-/turf/simulated/shuttle/plating,
-/area/shuttle/transport)
-"e" = (
-/obj/structure/grille,
-/obj/structure/shuttle/window,
-/turf/simulated/shuttle/plating,
-/area/shuttle/transport)
-"f" = (
-/turf/space,
-/turf/simulated/shuttle/wall{
- icon_state = "swall_f10";
- dir = 2
- },
-/area/shuttle/transport)
-"g" = (
-/turf/simulated/floor/plasteel{
- icon_state = "freezerfloor"
- },
-/turf/simulated/shuttle/wall/interior{
- tag = "icon-swall_f9";
- icon_state = "swall_f9"
- },
+/obj/effect/spawner/window/shuttle,
+/turf/simulated/floor/plating,
/area/shuttle/transport)
"h" = (
/obj/machinery/light/spot{
@@ -120,10 +91,10 @@
},
/area/shuttle/transport)
"p" = (
-/obj/machinery/door/airlock/shuttle{
+/obj/machinery/door/airlock/titanium{
id_tag = "s_docking_airlock"
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/plating,
/area/shuttle/transport)
"q" = (
/obj/item/stack/sheet/animalhide/cat,
@@ -137,7 +108,7 @@
},
/area/shuttle/transport)
"r" = (
-/obj/machinery/door/airlock/shuttle{
+/obj/machinery/door/airlock/titanium{
id_tag = "s_docking_airlock"
},
/obj/docking_port/mobile{
@@ -150,28 +121,7 @@
timid = 1;
width = 5
},
-/turf/simulated/shuttle/floor,
-/area/shuttle/transport)
-"s" = (
-/obj/structure/shuttle/engine/propulsion{
- dir = 8;
- icon_state = "propulsion";
- tag = "icon-propulsion (EAST)"
- },
-/turf/space,
-/turf/simulated/shuttle/wall{
- icon_state = "swall_f5";
- dir = 2
- },
-/area/shuttle/transport)
-"t" = (
-/turf/simulated/floor/plasteel{
- icon_state = "freezerfloor"
- },
-/turf/simulated/shuttle/wall/interior{
- tag = "icon-swall_f10";
- icon_state = "swall_f10"
- },
+/turf/simulated/floor/plating,
/area/shuttle/transport)
"u" = (
/obj/machinery/light/spot,
@@ -201,27 +151,20 @@
icon_state = "freezerfloor"
},
/area/shuttle/transport)
-"y" = (
-/turf/space,
-/turf/simulated/shuttle/wall{
- icon_state = "swall_f9";
- dir = 2
- },
-/area/shuttle/transport)
(1,1,1) = {"
a
b
p
-s
+b
a
"}
(2,1,1) = {"
b
-g
+c
k
-t
-s
+c
+b
"}
(3,1,1) = {"
c
@@ -266,11 +209,11 @@ x
c
"}
(9,1,1) = {"
-e
+d
k
k
k
-e
+d
"}
(10,1,1) = {"
c
@@ -287,9 +230,9 @@ w
c
"}
(12,1,1) = {"
-f
+c
d
r
d
-y
+c
"}
diff --git a/_maps/map_files/templates/medium_shuttle1.dmm b/_maps/map_files/templates/medium_shuttle1.dmm
index 90acb3211a1..dc79e62c111 100644
--- a/_maps/map_files/templates/medium_shuttle1.dmm
+++ b/_maps/map_files/templates/medium_shuttle1.dmm
@@ -8,7 +8,7 @@
icon_state = "burst_l";
tag = "icon-burst_l (EAST)"
},
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating/airless,
/area/ruin/powered{
name = "Shuttle"
})
@@ -23,40 +23,17 @@
icon_state = "rwindow";
dir = 4
},
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating/airless,
/area/ruin/powered{
name = "Shuttle"
})
"d" = (
-/turf/simulated/shuttle/wall{
- tag = "icon-wall3";
- icon_state = "wall3"
- },
-/area/ruin/powered{
- name = "Shuttle"
- })
-"e" = (
-/turf/space,
-/turf/simulated/shuttle{
- tag = "icon-wall3 (NORTHEAST)";
- icon_state = "wall3";
- dir = 5
- },
+/turf/simulated/wall/mineral/plastitanium,
/area/ruin/powered{
name = "Shuttle"
})
"f" = (
-/turf/simulated/shuttle/wall,
-/turf/simulated/shuttle/wall{
- tag = "icon-wall3 (SOUTHEAST)";
- icon_state = "wall3";
- dir = 6
- },
-/area/ruin/powered{
- name = "Shuttle"
- })
-"g" = (
-/turf/simulated/shuttle/wall,
+/turf/simulated/wall/mineral/titanium,
/area/ruin/powered{
name = "Shuttle"
})
@@ -159,7 +136,7 @@
name = "Shuttle"
})
"t" = (
-/obj/effect/spawner/window/reinforced,
+/obj/effect/spawner/window/shuttle,
/turf/simulated/floor/plating,
/area/ruin/powered{
name = "Shuttle"
@@ -174,15 +151,6 @@
/area/ruin/powered{
name = "Shuttle"
})
-"v" = (
-/turf/simulated/floor/plating,
-/turf/simulated/shuttle/wall{
- tag = "icon-window1";
- icon_state = "window1"
- },
-/area/ruin/powered{
- name = "Shuttle"
- })
"w" = (
/obj/machinery/light{
dir = 4
@@ -194,51 +162,13 @@
/area/ruin/powered{
name = "Shuttle"
})
-"x" = (
-/turf/space,
-/turf/simulated/shuttle/wall{
- tag = "icon-diagonalWall (NORTHWEST)";
- icon_state = "diagonalWall";
- dir = 9
- },
-/area/ruin/powered{
- name = "Shuttle"
- })
-"y" = (
-/turf/simulated/shuttle/wall{
- tag = "icon-wall";
- icon_state = "wall"
- },
-/area/ruin/powered{
- name = "Shuttle"
- })
"z" = (
/obj/structure/shuttle/engine/propulsion/burst/right{
dir = 8;
icon_state = "burst_r";
tag = "icon-burst_r (EAST)"
},
-/turf/simulated/shuttle/plating,
-/area/ruin/powered{
- name = "Shuttle"
- })
-"A" = (
-/turf/simulated/shuttle/wall,
-/turf/simulated/shuttle/wall{
- tag = "icon-wall3 (NORTHEAST)";
- icon_state = "wall3";
- dir = 5
- },
-/area/ruin/powered{
- name = "Shuttle"
- })
-"B" = (
-/turf/space,
-/turf/simulated/shuttle{
- tag = "icon-wall3 (SOUTHEAST)";
- icon_state = "wall3";
- dir = 6
- },
+/turf/simulated/floor/plating/airless,
/area/ruin/powered{
name = "Shuttle"
})
@@ -281,16 +211,6 @@
/area/ruin/powered{
name = "Shuttle"
})
-"G" = (
-/turf/space,
-/turf/simulated/shuttle/wall{
- tag = "icon-diagonalWall (SOUTHEAST)";
- icon_state = "diagonalWall";
- dir = 6
- },
-/area/ruin/powered{
- name = "Shuttle"
- })
"H" = (
/obj/machinery/sleeper,
/turf/simulated/floor/plasteel{
@@ -405,12 +325,7 @@
name = "Shuttle"
})
"T" = (
-/turf/space,
-/turf/simulated/shuttle/wall{
- tag = "icon-diagonalWall (SOUTHEAST)";
- icon_state = "diagonalWall";
- dir = 6
- },
+/turf/simulated/wall/mineral/titanium,
/area/space)
"U" = (
/obj/structure/table/reinforced,
@@ -430,11 +345,11 @@ a
a
a
a
-g
+f
h
-g
+f
h
-g
+f
a
a
a
@@ -447,11 +362,11 @@ a
a
a
a
-g
+f
o
o
o
-g
+f
a
a
a
@@ -462,15 +377,15 @@ a
a
a
a
-g
-g
-g
+f
+f
+f
p
-g
+f
p
-g
-g
-y
+f
+f
+f
a
a
a
@@ -479,15 +394,15 @@ a
b
b
b
-g
+f
N
-g
+f
O
o
P
-g
+f
Q
-g
+f
z
z
z
@@ -496,7 +411,7 @@ z
c
c
c
-g
+f
j
k
o
@@ -504,7 +419,7 @@ i
o
p
j
-g
+f
c
c
c
@@ -513,40 +428,40 @@ c
d
d
f
-g
+f
k
-g
-g
-g
-g
-g
+f
+f
+f
+f
+f
k
-g
-A
+f
+f
d
d
"}
(7,1,1) = {"
d
d
-g
+f
l
j
-g
+f
n
n
n
-g
+f
j
j
-g
+f
d
d
"}
(8,1,1) = {"
d
d
-g
+f
C
S
k
@@ -556,41 +471,41 @@ j
k
j
D
-g
+f
+d
d
-B
"}
(9,1,1) = {"
-e
d
-g
+d
+f
u
j
-g
+f
j
w
j
-g
+f
R
j
-g
-B
+f
+d
a
"}
(10,1,1) = {"
a
-e
-g
-g
-g
-g
+d
+f
+f
+f
+f
k
-g
+f
k
-g
-g
-g
-g
+f
+f
+f
+f
a
a
"}
@@ -602,7 +517,7 @@ j
k
j
j
-v
+t
j
j
k
@@ -616,13 +531,13 @@ a
a
h
j
-g
+f
E
j
-v
+t
j
F
-g
+f
j
h
a
@@ -631,17 +546,17 @@ a
(13,1,1) = {"
a
a
-g
-g
-g
-g
+f
+f
+f
+f
k
-g
+f
k
-g
-g
-g
-g
+f
+f
+f
+f
a
a
"}
@@ -649,16 +564,16 @@ a
a
a
T
-g
-g
+f
+f
m
q
-v
+t
j
I
-g
-g
-x
+f
+f
+f
a
a
"}
@@ -666,15 +581,15 @@ a
a
a
a
-G
-g
+f
+f
H
q
-v
+t
j
I
-g
-x
+f
+f
a
a
a
@@ -684,13 +599,13 @@ a
a
a
a
-g
-g
+f
+f
k
-g
+f
k
-g
-g
+f
+f
a
a
a
@@ -701,13 +616,13 @@ a
a
a
a
-g
+f
J
j
-g
+f
j
j
-g
+f
a
a
a
@@ -718,13 +633,13 @@ a
a
a
a
-g
+f
K
j
-g
+f
j
w
-g
+f
a
a
a
@@ -735,13 +650,13 @@ a
a
a
a
-g
-g
+f
+f
k
-g
+f
k
-g
-g
+f
+f
a
a
a
@@ -752,13 +667,13 @@ a
a
a
a
-G
-g
+f
+f
r
r
r
-g
-x
+f
+f
a
a
a
@@ -770,11 +685,11 @@ a
a
a
a
-g
+f
r
L
r
-g
+f
a
a
a
@@ -787,11 +702,11 @@ a
a
a
a
-g
+f
U
M
s
-g
+f
a
a
a
@@ -804,11 +719,11 @@ a
a
a
a
-G
+f
t
t
t
-x
+f
a
a
a
diff --git a/_maps/map_files/templates/medium_shuttle2.dmm b/_maps/map_files/templates/medium_shuttle2.dmm
index 8966fc3ac7a..6dde84a55bf 100644
--- a/_maps/map_files/templates/medium_shuttle2.dmm
+++ b/_maps/map_files/templates/medium_shuttle2.dmm
@@ -8,7 +8,7 @@
icon_state = "burst_l";
tag = "icon-burst_l (EAST)"
},
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating/airless,
/area/ruin/powered{
name = "Shuttle"
})
@@ -23,26 +23,12 @@
icon_state = "rwindow";
dir = 4
},
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating/airless,
/area/ruin/powered{
name = "Shuttle"
})
"d" = (
-/turf/simulated/shuttle{
- tag = "icon-wall3 (EAST)";
- icon_state = "wall3";
- dir = 4
- },
-/area/ruin/powered{
- name = "Shuttle"
- })
-"e" = (
-/turf/space,
-/turf/simulated/shuttle{
- tag = "icon-wall3 (NORTHEAST)";
- icon_state = "wall3";
- dir = 5
- },
+/turf/simulated/wall/mineral/plastitanium,
/area/ruin/powered{
name = "Shuttle"
})
@@ -52,22 +38,12 @@
icon_state = "burst_r";
tag = "icon-burst_r (EAST)"
},
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating/airless,
/area/ruin/powered{
name = "Shuttle"
})
"g" = (
-/turf/simulated/shuttle/wall,
-/turf/simulated/shuttle{
- tag = "icon-wall3 (SOUTHEAST)";
- icon_state = "wall3";
- dir = 6
- },
-/area/ruin/powered{
- name = "Shuttle"
- })
-"h" = (
-/turf/simulated/shuttle/wall,
+/turf/simulated/wall/mineral/titanium,
/area/ruin/powered{
name = "Shuttle"
})
@@ -76,29 +52,10 @@
dir = 1
},
/turf/simulated/floor/plasteel,
-/area/ruin/powered{
- name = "Shuttle"
- })
-"j" = (
-/turf/space,
-/turf/simulated/shuttle{
- tag = "icon-wall3 (NORTHWEST)";
- icon_state = "wall3";
- dir = 9
- },
/area/ruin/powered{
name = "Shuttle"
})
"k" = (
-/turf/simulated/floor/plasteel{
- tag = "icon-dark";
- icon_state = "dark"
- },
-/area/ruin/powered{
- name = "Shuttle"
- })
-"l" = (
-/obj/machinery/door/airlock/external,
/turf/simulated/floor/plasteel{
tag = "icon-dark";
icon_state = "dark"
@@ -148,16 +105,6 @@
/area/ruin/powered{
name = "Shuttle"
})
-"s" = (
-/turf/space,
-/turf/simulated/shuttle{
- tag = "icon-wall3 (SOUTHWEST)";
- icon_state = "wall3";
- dir = 10
- },
-/area/ruin/powered{
- name = "Shuttle"
- })
"t" = (
/obj/structure/table,
/turf/simulated/floor/plasteel,
@@ -197,7 +144,7 @@
name = "Shuttle"
})
"x" = (
-/obj/effect/spawner/window/reinforced,
+/obj/effect/spawner/window/shuttle,
/turf/simulated/floor/plating,
/area/ruin/powered{
name = "Shuttle"
@@ -211,13 +158,6 @@
"z" = (
/obj/machinery/portable_atmospherics/canister/oxygen,
/turf/simulated/floor/plasteel,
-/area/ruin/powered{
- name = "Shuttle"
- })
-"A" = (
-/obj/structure/grille,
-/obj/structure/shuttle/window,
-/turf/simulated/floor/plating,
/area/ruin/powered{
name = "Shuttle"
})
@@ -232,16 +172,6 @@
/area/ruin/powered{
name = "Shuttle"
})
-"C" = (
-/turf/simulated/shuttle/wall,
-/turf/simulated/shuttle{
- tag = "icon-wall3 (NORTHEAST)";
- icon_state = "wall3";
- dir = 5
- },
-/area/ruin/powered{
- name = "Shuttle"
- })
"D" = (
/obj/structure/computerframe,
/obj/item/circuitboard/teleporter,
@@ -262,16 +192,6 @@
/area/ruin/powered{
name = "Shuttle"
})
-"F" = (
-/turf/space,
-/turf/simulated/shuttle{
- tag = "icon-wall3 (SOUTHEAST)";
- icon_state = "wall3";
- dir = 6
- },
-/area/ruin/powered{
- name = "Shuttle"
- })
"G" = (
/obj/item/radio/beacon,
/turf/simulated/floor/plasteel{
@@ -291,12 +211,7 @@
name = "Shuttle"
})
"I" = (
-/turf/space,
-/turf/simulated/shuttle/wall{
- tag = "icon-diagonalWall (SOUTHEAST)";
- icon_state = "diagonalWall";
- dir = 6
- },
+/turf/simulated/wall/mineral/titanium,
/area/space)
"J" = (
/obj/machinery/light{
@@ -319,14 +234,6 @@
/area/ruin/powered{
name = "Shuttle"
})
-"L" = (
-/turf/space,
-/turf/simulated/shuttle/wall{
- tag = "icon-diagonalWall (NORTHWEST)";
- icon_state = "diagonalWall";
- dir = 9
- },
-/area/space)
"M" = (
/obj/structure/bed,
/obj/item/bedsheet/purple,
@@ -367,26 +274,6 @@
/area/ruin/powered{
name = "Shuttle"
})
-"Q" = (
-/turf/space,
-/turf/simulated/shuttle/wall{
- tag = "icon-diagonalWall (SOUTHEAST)";
- icon_state = "diagonalWall";
- dir = 6
- },
-/area/ruin/powered{
- name = "Shuttle"
- })
-"R" = (
-/turf/space,
-/turf/simulated/shuttle/wall{
- tag = "icon-diagonalWall (NORTHWEST)";
- icon_state = "diagonalWall";
- dir = 9
- },
-/area/ruin/powered{
- name = "Shuttle"
- })
"S" = (
/obj/structure/table/reinforced,
/obj/machinery/recharger,
@@ -515,15 +402,15 @@ a
(4,1,1) = {"
b
f
-j
d
d
-s
+d
+d
a
-j
d
d
-s
+d
+d
b
f
"}
@@ -533,10 +420,10 @@ c
d
d
g
-h
+g
y
-h
-C
+g
+g
d
d
c
@@ -546,21 +433,21 @@ c
d
d
g
-h
-h
+g
+g
z
m
t
-h
-h
-C
+g
+g
+g
d
d
"}
(7,1,1) = {"
d
d
-h
+g
i
m
m
@@ -568,28 +455,28 @@ m
m
m
o
-h
+g
d
d
"}
(8,1,1) = {"
d
g
-h
+g
n
-h
-h
-h
-h
-h
+g
+g
+g
+g
+g
n
-h
-C
+g
+g
d
"}
(9,1,1) = {"
d
-h
+g
T
k
k
@@ -599,12 +486,12 @@ E
k
k
N
-h
+g
d
"}
(10,1,1) = {"
-e
-h
+d
+g
T
k
k
@@ -614,96 +501,96 @@ G
k
k
N
-h
-F
+g
+d
"}
(11,1,1) = {"
a
-h
-h
-h
+g
+g
+g
n
-h
+g
n
-h
+g
n
-h
-h
-h
+g
+g
+g
a
"}
(12,1,1) = {"
a
I
-h
+g
J
k
-h
+g
k
-h
+g
k
K
-h
-L
+g
+I
a
"}
(13,1,1) = {"
a
a
-h
+g
H
k
-h
+g
V
-h
+g
k
k
-h
+g
a
a
"}
(14,1,1) = {"
a
a
-h
-h
+g
+g
n
-h
-h
-h
+g
+g
+g
n
-h
-h
+g
+g
a
a
"}
(15,1,1) = {"
a
a
-l
+y
k
k
-h
-h
-h
+g
+g
+g
k
k
-l
+y
a
a
"}
(16,1,1) = {"
a
a
-h
-h
+g
+g
n
-h
-h
-h
+g
+g
+g
n
-h
-h
+g
+g
a
a
"}
@@ -711,14 +598,14 @@ a
a
a
I
-h
+g
k
k
k
k
k
-h
-L
+g
+I
a
a
"}
@@ -726,13 +613,13 @@ a
a
a
a
-h
+g
n
-h
-h
-h
+g
+g
+g
n
-h
+g
a
a
a
@@ -741,13 +628,13 @@ a
a
a
a
-h
+g
W
u
-A
+x
M
K
-h
+g
a
a
a
@@ -756,13 +643,13 @@ a
a
a
a
-h
+g
p
v
-A
+x
M
k
-h
+g
a
a
a
@@ -771,13 +658,13 @@ a
a
a
a
-h
+g
n
-h
-h
-h
+g
+g
+g
n
-h
+g
a
a
a
@@ -786,13 +673,13 @@ a
a
a
a
-h
+g
k
N
-A
+x
P
k
-h
+g
a
a
a
@@ -801,13 +688,13 @@ a
a
a
a
-h
+g
k
N
-A
+x
O
k
-h
+g
a
a
a
@@ -816,13 +703,13 @@ a
a
a
a
-h
+g
q
-h
-h
-h
+g
+g
+g
q
-h
+g
a
a
a
@@ -831,13 +718,13 @@ a
a
a
a
-h
+g
X
r
B
r
Y
-h
+g
a
a
a
@@ -846,13 +733,13 @@ a
a
a
a
-h
+g
r
S
Z
w
r
-h
+g
a
a
a
@@ -861,13 +748,13 @@ a
a
a
a
-Q
-h
+g
+g
x
x
x
-h
-R
+g
+g
a
a
a
@@ -877,11 +764,11 @@ a
a
a
a
-h
+g
a
a
a
-h
+g
a
a
a
diff --git a/_maps/map_files/templates/medium_shuttle3.dmm b/_maps/map_files/templates/medium_shuttle3.dmm
index e87eec1f66b..9f2ce97d6d5 100644
--- a/_maps/map_files/templates/medium_shuttle3.dmm
+++ b/_maps/map_files/templates/medium_shuttle3.dmm
@@ -8,15 +8,12 @@
icon_state = "propulsion";
dir = 1
},
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating/airless,
/area/ruin/powered{
name = "Shuttle"
})
"c" = (
-/turf/simulated/shuttle/wall{
- tag = "icon-wall3";
- icon_state = "wall3"
- },
+/turf/simulated/wall/mineral/plastitanium,
/area/ruin/powered{
name = "Shuttle"
})
@@ -26,52 +23,12 @@
icon_state = "heater";
dir = 1
},
-/turf/simulated/shuttle/plating,
-/area/ruin/powered{
- name = "Shuttle"
- })
-"e" = (
-/turf/space,
-/turf/simulated/shuttle{
- tag = "icon-wall3 (NORTHWEST)";
- icon_state = "wall3";
- dir = 9
- },
-/area/ruin/powered{
- name = "Shuttle"
- })
-"f" = (
-/turf/space,
-/turf/simulated/shuttle{
- tag = "icon-wall3 (NORTHEAST)";
- icon_state = "wall3";
- dir = 5
- },
-/area/ruin/powered{
- name = "Shuttle"
- })
-"g" = (
-/turf/simulated/shuttle/wall,
-/turf/simulated/shuttle{
- tag = "icon-wall3 (SOUTHEAST)";
- icon_state = "wall3";
- dir = 6
- },
+/turf/simulated/floor/plating/airless,
/area/ruin/powered{
name = "Shuttle"
})
"h" = (
-/turf/simulated/shuttle/wall,
-/area/ruin/powered{
- name = "Shuttle"
- })
-"i" = (
-/turf/simulated/shuttle/wall,
-/turf/simulated/shuttle{
- tag = "icon-wall3 (SOUTHWEST)";
- icon_state = "wall3";
- dir = 10
- },
+/turf/simulated/wall/mineral/titanium,
/area/ruin/powered{
name = "Shuttle"
})
@@ -103,7 +60,7 @@
icon_state = "propulsion";
tag = "icon-propulsion (EAST)"
},
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating/airless,
/area/ruin/powered{
name = "Shuttle"
})
@@ -113,7 +70,7 @@
icon_state = "heater";
dir = 8
},
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating/airless,
/area/ruin/powered{
name = "Shuttle"
})
@@ -129,7 +86,7 @@
icon_state = "heater";
dir = 4
},
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating/airless,
/area/ruin/powered{
name = "Shuttle"
})
@@ -139,33 +96,13 @@
icon_state = "propulsion";
tag = "icon-propulsion (WEST)"
},
-/turf/simulated/shuttle/plating,
-/area/ruin/powered{
- name = "Shuttle"
- })
-"s" = (
-/turf/simulated/shuttle/wall,
-/turf/simulated/shuttle{
- tag = "icon-wall3 (NORTHEAST)";
- icon_state = "wall3";
- dir = 5
- },
+/turf/simulated/floor/plating/airless,
/area/ruin/powered{
name = "Shuttle"
})
"t" = (
/obj/effect/spawner/window/reinforced,
/turf/simulated/floor/plating,
-/area/ruin/powered{
- name = "Shuttle"
- })
-"u" = (
-/turf/simulated/shuttle/wall,
-/turf/simulated/shuttle{
- tag = "icon-wall3 (NORTHWEST)";
- icon_state = "wall3";
- dir = 9
- },
/area/ruin/powered{
name = "Shuttle"
})
@@ -197,16 +134,6 @@
/area/ruin/powered{
name = "Shuttle"
})
-"y" = (
-/turf/space,
-/turf/simulated/shuttle{
- tag = "icon-wall3 (SOUTHWEST)";
- icon_state = "wall3";
- dir = 10
- },
-/area/ruin/powered{
- name = "Shuttle"
- })
"z" = (
/obj/machinery/sleeper,
/turf/simulated/floor/plasteel{
@@ -224,16 +151,6 @@
/area/ruin/powered{
name = "Shuttle"
})
-"B" = (
-/turf/space,
-/turf/simulated/shuttle{
- tag = "icon-wall3 (SOUTHEAST)";
- icon_state = "wall3";
- dir = 6
- },
-/area/ruin/powered{
- name = "Shuttle"
- })
"C" = (
/obj/machinery/door/airlock/public/glass,
/turf/simulated/floor/plating,
@@ -260,13 +177,13 @@
})
"F" = (
/obj/structure/shuttle/engine/heater,
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating/airless,
/area/ruin/powered{
name = "Shuttle"
})
"G" = (
/obj/structure/shuttle/engine/propulsion,
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating/airless,
/area/ruin/powered{
name = "Shuttle"
})
@@ -325,18 +242,18 @@ a
a
a
a
-e
+c
o
c
c
-y
+c
a
a
-e
+c
c
c
o
-y
+c
a
a
a
@@ -348,7 +265,7 @@ a
a
a
a
-e
+c
c
c
c
@@ -361,7 +278,7 @@ c
c
c
c
-y
+c
a
a
a
@@ -371,22 +288,22 @@ a
a
a
a
-e
-g
-h
-h
-s
c
-g
+c
+h
+h
+c
+c
+c
j
j
-s
c
-g
+c
+c
h
h
-s
-y
+c
+c
a
a
a
@@ -394,7 +311,7 @@ a
(6,1,1) = {"
a
a
-e
+c
c
h
k
@@ -411,7 +328,7 @@ l
k
h
c
-y
+c
a
a
"}
@@ -444,7 +361,7 @@ a
c
c
c
-i
+c
h
l
l
@@ -457,7 +374,7 @@ l
l
l
h
-u
+c
c
c
c
@@ -490,9 +407,9 @@ G
(10,1,1) = {"
a
a
-f
c
-g
+c
+c
h
p
h
@@ -505,9 +422,9 @@ A
h
p
h
-s
c
-B
+c
+c
a
a
"}
@@ -562,9 +479,9 @@ a
(13,1,1) = {"
a
a
-e
c
-i
+c
+c
h
p
h
@@ -577,9 +494,9 @@ A
h
p
h
-u
c
-y
+c
+c
a
a
"}
@@ -612,7 +529,7 @@ a
c
c
c
-g
+c
h
l
l
@@ -625,7 +542,7 @@ l
l
l
h
-s
+c
c
c
c
@@ -658,7 +575,7 @@ a
(17,1,1) = {"
a
a
-f
+c
c
h
k
@@ -675,7 +592,7 @@ l
k
h
c
-B
+c
a
a
"}
@@ -683,22 +600,22 @@ a
a
a
a
-f
-i
-h
-h
-u
c
-i
+c
+h
+h
+c
+c
+c
j
j
-u
c
-i
+c
+c
h
h
-u
-B
+c
+c
a
a
a
@@ -708,7 +625,7 @@ a
a
a
a
-f
+c
c
c
c
@@ -721,7 +638,7 @@ c
c
c
c
-B
+c
a
a
a
@@ -733,18 +650,18 @@ a
a
a
a
-f
+c
q
c
c
-B
+c
a
a
-f
+c
c
c
q
-B
+c
a
a
a
diff --git a/_maps/map_files/templates/small_shuttle_1.dmm b/_maps/map_files/templates/small_shuttle_1.dmm
index a1fae43e707..261b74c7874 100644
--- a/_maps/map_files/templates/small_shuttle_1.dmm
+++ b/_maps/map_files/templates/small_shuttle_1.dmm
@@ -1,130 +1,90 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"a" = (
-/turf/space,
-/turf/simulated/shuttle/wall{
- tag = "icon-swall_f6";
- icon_state = "swall_f6"
- },
+/turf/simulated/wall/mineral/titanium,
/area/ruin/powered)
"b" = (
/turf/space,
/area/ruin/powered)
-"c" = (
-/turf/simulated/shuttle/wall{
- tag = "icon-swall3";
- icon_state = "swall3"
- },
-/area/ruin/powered)
"d" = (
-/obj/machinery/door/unpowered/shuttle,
-/turf/simulated/shuttle/floor,
-/area/ruin/powered)
-"e" = (
-/turf/space,
-/turf/simulated/shuttle/wall{
- tag = "icon-swall_f5";
- icon_state = "swall_f5"
- },
-/area/ruin/powered)
-"f" = (
-/turf/simulated/shuttle/wall{
- tag = "icon-swall8";
- icon_state = "swall8"
- },
+/obj/machinery/door/airlock/titanium,
+/turf/simulated/floor/mineral/titanium/blue,
/area/ruin/powered)
"g" = (
-/obj/structure/grille,
-/obj/structure/shuttle/window,
-/turf/simulated/floor/plating/airless,
+/obj/effect/spawner/window/shuttle,
+/turf/simulated/floor/plating,
/area/ruin/powered)
"h" = (
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/ruin/powered)
"i" = (
/obj/machinery/light,
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/ruin/powered)
"j" = (
/obj/structure/shuttle/engine/heater,
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating/airless,
/area/ruin/powered)
"k" = (
/obj/structure/shuttle/engine/propulsion,
-/turf/simulated/shuttle/plating,
-/area/ruin/powered)
-"l" = (
-/turf/simulated/shuttle/wall{
- tag = "icon-swall13";
- icon_state = "swall13"
- },
+/turf/simulated/floor/plating/airless,
/area/ruin/powered)
"m" = (
/obj/structure/chair/comfy/shuttle{
dir = 4
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/ruin/powered)
"n" = (
/obj/machinery/light{
icon_state = "tube1";
dir = 8
},
-/turf/simulated/shuttle/floor,
+/obj/structure/window/reinforced,
+/turf/simulated/floor/mineral/titanium/blue,
/area/ruin/powered)
"o" = (
/obj/structure/shuttle/engine/propulsion{
icon_state = "propulsion_l"
},
-/turf/simulated/shuttle/plating,
-/area/ruin/powered)
-"p" = (
-/turf/simulated/shuttle/wall{
- tag = "icon-swall4";
- icon_state = "swall4"
- },
+/turf/simulated/floor/plating/airless,
/area/ruin/powered)
"q" = (
/obj/machinery/computer,
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/ruin/powered)
"r" = (
/obj/structure/chair/comfy/shuttle{
dir = 1
},
-/turf/simulated/shuttle/floor,
-/area/ruin/powered)
-"s" = (
-/turf/space,
-/turf/simulated/shuttle/wall{
- tag = "icon-swall_f10";
- icon_state = "swall_f10"
- },
-/area/ruin/powered)
-"t" = (
-/turf/space,
-/turf/simulated/shuttle/wall{
- tag = "icon-swall_f9";
- icon_state = "swall_f9"
- },
+/turf/simulated/floor/mineral/titanium/blue,
/area/ruin/powered)
"u" = (
/obj/structure/chair/comfy/shuttle{
dir = 8
},
-/turf/simulated/shuttle/floor,
+/turf/simulated/floor/mineral/titanium/blue,
/area/ruin/powered)
"v" = (
/obj/machinery/light{
dir = 4;
icon_state = "tube1"
},
-/turf/simulated/shuttle/floor,
+/obj/structure/window/reinforced,
+/turf/simulated/floor/mineral/titanium/blue,
/area/ruin/powered)
"w" = (
/obj/structure/shuttle/engine/propulsion{
icon_state = "propulsion_r"
},
-/turf/simulated/shuttle/plating,
+/turf/simulated/floor/plating/airless,
+/area/ruin/powered)
+"A" = (
+/obj/structure/window/reinforced,
+/turf/simulated/floor/mineral/titanium/blue,
+/area/ruin/powered)
+"D" = (
+/obj/machinery/door/airlock/titanium,
+/turf/simulated/floor/plating,
/area/ruin/powered)
(1,1,1) = {"
@@ -132,19 +92,19 @@ b
b
b
a
-c
-c
-d
-d
-c
-c
-e
+a
+a
+D
+D
+a
+a
+a
"}
(2,1,1) = {"
a
-c
-c
-l
+a
+a
+a
m
m
h
@@ -157,12 +117,12 @@ o
g
h
i
-f
-h
+a
h
h
h
h
+A
j
k
"}
@@ -175,7 +135,7 @@ h
h
h
h
-h
+A
j
k
"}
@@ -183,20 +143,20 @@ k
g
q
i
-p
-h
+a
h
h
h
h
+A
j
k
"}
(6,1,1) = {"
-s
-c
-c
-l
+a
+a
+a
+a
u
u
h
@@ -209,12 +169,12 @@ w
b
b
b
-s
-c
-c
-d
-d
-c
-c
-t
+a
+a
+a
+D
+D
+a
+a
+a
"}
diff --git a/code/ATMOSPHERICS/pipes/pipe.dm b/code/ATMOSPHERICS/pipes/pipe.dm
index 0b7e3a34723..6dc26b9733e 100644
--- a/code/ATMOSPHERICS/pipes/pipe.dm
+++ b/code/ATMOSPHERICS/pipes/pipe.dm
@@ -16,7 +16,7 @@
/obj/machinery/atmospherics/pipe/New()
..()
//so pipes under walls are hidden
- if(istype(get_turf(src), /turf/simulated/wall) || istype(get_turf(src), /turf/simulated/shuttle/wall) || istype(get_turf(src), /turf/unsimulated/wall))
+ if(istype(get_turf(src), /turf/simulated/wall) || istype(get_turf(src), /turf/unsimulated/wall))
level = 1
/obj/machinery/atmospherics/pipe/Destroy()
diff --git a/code/datums/spells/conjure.dm b/code/datums/spells/conjure.dm
index 306ec8b9987..4c15353e6c4 100644
--- a/code/datums/spells/conjure.dm
+++ b/code/datums/spells/conjure.dm
@@ -13,7 +13,7 @@
var/list/newVars = list() //vars of the summoned objects will be replaced with those where they meet
//should have format of list("emagged" = 1,"name" = "Wizard's Justicebot"), for example
var/delay = 1//Go Go Gadget Inheritance
-
+
var/cast_sound = 'sound/items/welder.ogg'
/obj/effect/proc_holder/spell/aoe_turf/conjure/cast(list/targets,mob/living/user = usr)
@@ -32,9 +32,6 @@
if(summon_ignore_prev_spawn_points)
targets -= spawn_place
if(ispath(summoned_object_type,/turf))
- if(istype(get_turf(user),/turf/simulated/shuttle))
- to_chat(user, "You can't build things on shuttles!")
- break
var/turf/O = spawn_place
var/N = summoned_object_type
O.ChangeTurf(N)
diff --git a/code/game/gamemodes/miniantags/revenant/revenant_abilities.dm b/code/game/gamemodes/miniantags/revenant/revenant_abilities.dm
index 7b7276e7cf7..fc49a534f2c 100644
--- a/code/game/gamemodes/miniantags/revenant/revenant_abilities.dm
+++ b/code/game/gamemodes/miniantags/revenant/revenant_abilities.dm
@@ -250,7 +250,7 @@
human.adjustToxLoss(toxdamage)
human.AdjustConfused(confusion, bound_lower = 0, bound_upper = maxconfusion)
new/obj/effect/temp_visual/revenant(human.loc)
- if(!istype(T, /turf/simulated/shuttle) && !istype(T, /turf/simulated/wall/rust) && !istype(T, /turf/simulated/wall/r_wall) && istype(T, /turf/simulated/wall) && prob(15))
+ if(!istype(T, /turf/simulated/wall/rust) && !istype(T, /turf/simulated/wall/r_wall) && istype(T, /turf/simulated/wall) && prob(15))
new/obj/effect/temp_visual/revenant(T)
T.ChangeTurf(/turf/simulated/wall/rust)
if(!istype(T, /turf/simulated/wall/r_wall/rust) && istype(T, /turf/simulated/wall/r_wall) && prob(15))
diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm
index 7fff788017d..d1622aabd3c 100644
--- a/code/game/gamemodes/objective.dm
+++ b/code/game/gamemodes/objective.dm
@@ -243,7 +243,7 @@ GLOBAL_LIST_INIT(potential_theft_objectives, (subtypesof(/datum/theft_objective)
if(issilicon(player))
continue
if(get_area(player) == A)
- if(player.real_name != owner.current.real_name && !istype(get_turf(player.mind.current), /turf/simulated/shuttle/floor4))
+ if(player.real_name != owner.current.real_name && !istype(get_turf(player.mind.current), /turf/simulated/floor/mineral/plastitanium/red/brig))
return 0
for(var/mob/living/player in GLOB.player_list) //Make sure at least one of you is onboard
@@ -252,7 +252,7 @@ GLOBAL_LIST_INIT(potential_theft_objectives, (subtypesof(/datum/theft_objective)
if(issilicon(player))
continue
if(get_area(player) == A)
- if(player.real_name == owner.current.real_name && !istype(get_turf(player.mind.current), /turf/simulated/shuttle/floor4))
+ if(player.real_name == owner.current.real_name && !istype(get_turf(player.mind.current), /turf/simulated/floor/mineral/plastitanium/red/brig))
return 1
return 0
@@ -300,7 +300,7 @@ GLOBAL_LIST_INIT(potential_theft_objectives, (subtypesof(/datum/theft_objective)
if(!location)
return 0
- if(istype(location, /turf/simulated/shuttle/floor4) || istype(location, /turf/simulated/floor/mineral/plastitanium/red/brig)) // Fails traitors if they are in the shuttle brig -- Polymorph
+ if(istype(location, /turf/simulated/floor/mineral/plastitanium/red/brig)) // Fails traitors if they are in the shuttle brig -- Polymorph
return 0
if(location.onCentcom() || location.onSyndieBase())
diff --git a/code/game/machinery/doors/airlock_types.dm b/code/game/machinery/doors/airlock_types.dm
index 6eaa6a3ae12..9b913dbf148 100644
--- a/code/game/machinery/doors/airlock_types.dm
+++ b/code/game/machinery/doors/airlock_types.dm
@@ -459,23 +459,6 @@
"You hear welding.")
update_icon()
-
-//////////////////////////////////
-/*
- Shuttle Airlocks
-*/
-
-/obj/machinery/door/airlock/shuttle
- name = "shuttle airlock"
- icon = 'icons/obj/doors/airlocks/shuttle/shuttle.dmi'
- overlays_file = 'icons/obj/doors/airlocks/shuttle/overlays.dmi'
- assemblytype = /obj/structure/door_assembly/door_assembly_shuttle
- paintable = FALSE
-
-/obj/machinery/door/airlock/shuttle/glass
- opacity = 0
- glass = TRUE
-
/obj/machinery/door/airlock/abductor
name = "alien airlock"
desc = "With humanity's current technological level, it could take years to hack this advanced airlock... or maybe we should give a screwdriver a try?"
diff --git a/code/game/objects/items/blueprints.dm b/code/game/objects/items/blueprints.dm
index 97e46e3abb5..a8c0165e111 100644
--- a/code/game/objects/items/blueprints.dm
+++ b/code/game/objects/items/blueprints.dm
@@ -269,8 +269,6 @@
/obj/item/areaeditor/proc/check_tile_is_border(var/turf/T2,var/dir)
if(istype(T2, /turf/space))
return BORDER_SPACE //omg hull breach we all going to die here
- if(istype(T2, /turf/simulated/shuttle))
- return BORDER_SPACE
if(get_area_type(T2.loc)!=AREA_SPACE)
return BORDER_BETWEEN
if(istype(T2, /turf/simulated/wall))
diff --git a/code/game/objects/items/devices/traitordevices.dm b/code/game/objects/items/devices/traitordevices.dm
index 9a33dc3a3b1..c4f14c8140e 100644
--- a/code/game/objects/items/devices/traitordevices.dm
+++ b/code/game/objects/items/devices/traitordevices.dm
@@ -267,7 +267,7 @@ effective or pretty fucking useless.
to_chat(C, "The [src] will not work here!")
/obj/item/teleporter/proc/tile_check(turf/T)
- if(istype(T, /turf/simulated/floor) || istype(T, /turf/space) || istype(T, /turf/simulated/shuttle/floor) || istype(T, /turf/simulated/shuttle/floor4) || istype(T, /turf/simulated/shuttle/plating))
+ if(istype(T, /turf/simulated/floor) || istype(T, /turf/space))
return TRUE
/obj/item/teleporter/proc/dir_correction(mob/user) //Direction movement, screws with teleport distance and saving throw, and thus must be removed first
diff --git a/code/game/objects/structures/door_assembly_types.dm b/code/game/objects/structures/door_assembly_types.dm
index d421f24b911..108bffa39b5 100644
--- a/code/game/objects/structures/door_assembly_types.dm
+++ b/code/game/objects/structures/door_assembly_types.dm
@@ -124,14 +124,6 @@
noglass = TRUE
material_type = /obj/item/stack/sheet/plasteel
-/obj/structure/door_assembly/door_assembly_shuttle
- name = "shuttle airlock assembly"
- icon = 'icons/obj/doors/airlocks/shuttle/shuttle.dmi'
- base_name = "shuttle airlock"
- overlays_file = 'icons/obj/doors/airlocks/shuttle/overlays.dmi'
- airlock_type = /obj/machinery/door/airlock/shuttle
- glass_type = /obj/machinery/door/airlock/shuttle/glass
-
/obj/structure/door_assembly/multi_tile
name = "large airlock assembly"
icon = 'icons/obj/doors/airlocks/glass_large/glass_large.dmi'
diff --git a/code/game/objects/structures/false_walls.dm b/code/game/objects/structures/false_walls.dm
index 0fe5d37c95d..78213cc7418 100644
--- a/code/game/objects/structures/false_walls.dm
+++ b/code/game/objects/structures/false_walls.dm
@@ -325,7 +325,7 @@
mineral = /obj/item/stack/sheet/mineral/titanium
walltype = /turf/simulated/wall/mineral/titanium
smooth = SMOOTH_MORE
- canSmoothWith = list(/turf/simulated/wall/mineral/titanium, /obj/machinery/door/airlock/shuttle, /obj/machinery/door/airlock, /obj/structure/window/full/shuttle, /obj/structure/shuttle/engine/heater)
+ canSmoothWith = list(/turf/simulated/wall/mineral/titanium, /obj/machinery/door/airlock/titanium, /obj/machinery/door/airlock, /obj/structure/window/full/shuttle, /obj/structure/shuttle/engine/heater)
/obj/structure/falsewall/plastitanium
desc = "An evil wall of plasma and titanium."
@@ -334,7 +334,7 @@
mineral = /obj/item/stack/sheet/mineral/plastitanium
walltype = /turf/simulated/wall/mineral/plastitanium
smooth = SMOOTH_MORE
- canSmoothWith = list(/turf/simulated/wall/mineral/plastitanium, /turf/simulated/wall/mineral/plastitanium/nodiagonal, /obj/machinery/door/airlock/shuttle, /obj/machinery/door/airlock, /obj/structure/window/full/shuttle, /obj/structure/shuttle/engine/heater)
+ canSmoothWith = list(/turf/simulated/wall/mineral/plastitanium, /turf/simulated/wall/indestructible/syndicate, /turf/simulated/wall/mineral/plastitanium/nodiagonal, /obj/machinery/door/airlock/titanium, /obj/machinery/door/airlock, /obj/structure/window/full/shuttle, /obj/structure/shuttle/engine/heater)
/obj/structure/falsewall/brass
name = "clockwork wall"
diff --git a/code/game/shuttle_engines.dm b/code/game/shuttle_engines.dm
index 415df5d9dde..3e40186623d 100644
--- a/code/game/shuttle_engines.dm
+++ b/code/game/shuttle_engines.dm
@@ -11,23 +11,6 @@
M.Turn(rotation)
transform = M
-/obj/structure/shuttle/window
- name = "shuttle window"
- icon = 'icons/obj/podwindows.dmi'
- icon_state = "1"
- density = 1
- opacity = 0
- anchored = 1
-
-/obj/structure/shuttle/window/CanPass(atom/movable/mover, turf/target, height)
- if(!height)
- return 0
- else
- return ..()
-
-/obj/structure/shuttle/window/CanAtmosPass(turf/T)
- return !density
-
/obj/structure/shuttle/engine
name = "engine"
density = 1
diff --git a/code/game/turfs/simulated/floor/mineral.dm b/code/game/turfs/simulated/floor/mineral.dm
index 6749783c68d..4f62b4dc87b 100644
--- a/code/game/turfs/simulated/floor/mineral.dm
+++ b/code/game/turfs/simulated/floor/mineral.dm
@@ -144,6 +144,11 @@
/turf/simulated/floor/mineral/plastitanium/red/brig
name = "brig floor"
+/turf/simulated/floor/mineral/plastitanium/red/nitrogen
+ oxygen = 0
+ nitrogen = MOLES_N2STANDARD + MOLES_O2STANDARD
+
+
//BANANIUM
/turf/simulated/floor/mineral/bananium
name = "bananium floor"
diff --git a/code/game/turfs/simulated/floor/plating.dm b/code/game/turfs/simulated/floor/plating.dm
index 738275a729c..703b98fd094 100644
--- a/code/game/turfs/simulated/floor/plating.dm
+++ b/code/game/turfs/simulated/floor/plating.dm
@@ -363,3 +363,7 @@
icon_state = "smooth"
smooth = SMOOTH_MORE | SMOOTH_BORDER
canSmoothWith = list(/turf/simulated/floor/plating/ice/smooth, /turf/simulated/floor/plating/ice)
+
+/turf/simulated/floor/plating/nitrogen
+ oxygen = 0
+ nitrogen = MOLES_N2STANDARD + MOLES_O2STANDARD
diff --git a/code/game/turfs/simulated/shuttle.dm b/code/game/turfs/simulated/shuttle.dm
deleted file mode 100644
index acbe2cdf9d8..00000000000
--- a/code/game/turfs/simulated/shuttle.dm
+++ /dev/null
@@ -1,74 +0,0 @@
-/turf/simulated/shuttle
- name = "shuttle"
- icon = 'icons/turf/shuttle.dmi'
- thermal_conductivity = 0.05
- heat_capacity = 0
- layer = 2
-
-/turf/simulated/shuttle/wall
- name = "wall"
- icon_state = "wall1"
- opacity = 1
- density = 1
- blocks_air = 1
- flags_2 = RAD_PROTECT_CONTENTS_2 | RAD_NO_CONTAMINATE_2
- rad_insulation = RAD_MEDIUM_INSULATION
-
-/turf/simulated/shuttle/rpd_act(mob/user, obj/item/rpd/our_rpd)
- if(our_rpd.mode == RPD_DELETE_MODE)//No pipes on shuttles
- our_rpd.delete_all_pipes(user, src)
-
-/turf/simulated/shuttle/narsie_act()
- if(prob(20))
- ChangeTurf(/turf/simulated/wall/cult)
-
-//sub-type to be used for interior shuttle walls
-//won't get an underlay of the destination turf on shuttle move
-/turf/simulated/shuttle/wall/interior/copyTurf(turf/T)
- if(T.type != type)
- T.ChangeTurf(type)
- if(underlays.len)
- T.underlays = underlays
- if(T.icon_state != icon_state)
- T.icon_state = icon_state
- if(T.icon != icon)
- T.icon = icon
- if(T.color != color)
- T.color = color
- if(T.dir != dir)
- T.dir = dir
- T.transform = transform
- return T
-
-/turf/simulated/shuttle/wall/copyTurf(turf/T)
- . = ..()
- T.transform = transform
-
-//why don't shuttle walls habe smoothwall? now i gotta do rotation the dirty way
-/turf/simulated/shuttle/shuttleRotate(rotation)
- ..()
- var/matrix/M = transform
- M.Turn(rotation)
- transform = M
-
-/turf/simulated/shuttle/floor
- name = "floor"
- icon_state = "floor"
-
-/turf/simulated/shuttle/plating
- name = "plating"
- icon = 'icons/turf/floors.dmi'
- icon_state = "plating"
-
-/turf/simulated/shuttle/plating/vox //Vox skipjack plating
- oxygen = 0
- nitrogen = MOLES_N2STANDARD + MOLES_O2STANDARD
-
-/turf/simulated/shuttle/floor4 // Added this floor tile so that I have a seperate turf to check in the shuttle -- Polymorph
- name = "brig floor" // Also added it into the 2x3 brig area of the shuttle.
- icon_state = "floor4"
-
-/turf/simulated/shuttle/floor4/vox //Vox skipjack floors
- name = "skipjack floor"
- oxygen = 0
- nitrogen = MOLES_N2STANDARD + MOLES_O2STANDARD
diff --git a/code/game/turfs/simulated/walls_indestructible.dm b/code/game/turfs/simulated/walls_indestructible.dm
index 661278b2db0..89108ced13d 100644
--- a/code/game/turfs/simulated/walls_indestructible.dm
+++ b/code/game/turfs/simulated/walls_indestructible.dm
@@ -87,3 +87,9 @@
/turf/simulated/wall/indestructible/riveted
icon = 'icons/turf/walls.dmi'
icon_state = "riveted"
+
+/turf/simulated/wall/indestructible/syndicate
+ icon = 'icons/turf/walls/plastitanium_wall.dmi'
+ icon_state = "map-shuttle"
+ smooth = SMOOTH_MORE | SMOOTH_DIAGONAL
+ canSmoothWith = list(/turf/simulated/wall/mineral/plastitanium, /turf/simulated/wall/indestructible/syndicate, /obj/machinery/door/airlock/titanium, /obj/machinery/door/airlock, /obj/structure/shuttle/engine, /obj/structure/falsewall/plastitanium)
diff --git a/code/game/turfs/simulated/walls_mineral.dm b/code/game/turfs/simulated/walls_mineral.dm
index 951cbe792ea..ac690291043 100644
--- a/code/game/turfs/simulated/walls_mineral.dm
+++ b/code/game/turfs/simulated/walls_mineral.dm
@@ -195,7 +195,7 @@
flags_2 = CHECK_RICOCHET_2
sheet_type = /obj/item/stack/sheet/mineral/titanium
smooth = SMOOTH_MORE|SMOOTH_DIAGONAL
- canSmoothWith = list(/turf/simulated/wall/mineral/titanium, /obj/machinery/door/airlock/shuttle, /obj/machinery/door/airlock, /obj/structure/window/full/shuttle, /obj/structure/shuttle/engine/heater, /obj/structure/falsewall/titanium)
+ canSmoothWith = list(/turf/simulated/wall/mineral/titanium, /obj/machinery/door/airlock/titanium, /obj/machinery/door/airlock, /obj/structure/window/full/shuttle, /obj/structure/shuttle/engine/heater, /obj/structure/falsewall/titanium)
/turf/simulated/wall/mineral/titanium/nodiagonal
smooth = SMOOTH_MORE
@@ -221,10 +221,11 @@
T.icon_state = icon_state
if(T.icon != icon)
T.icon = icon
- if(T.color != color)
- T.color = color
+ if(color)
+ T.atom_colours = atom_colours.Copy()
+ T.update_atom_colour()
if(T.dir != dir)
- T.dir = dir
+ T.setDir(dir)
T.transform = transform
return T
@@ -287,7 +288,7 @@
explosion_block = 4
sheet_type = /obj/item/stack/sheet/mineral/plastitanium
smooth = SMOOTH_MORE|SMOOTH_DIAGONAL
- canSmoothWith = list(/turf/simulated/wall/mineral/plastitanium, /obj/machinery/door/airlock/shuttle, /obj/machinery/door/airlock, /obj/structure/shuttle/engine, /obj/structure/falsewall/plastitanium)
+ canSmoothWith = list(/turf/simulated/wall/mineral/plastitanium, /turf/simulated/wall/indestructible/syndicate, /obj/machinery/door/airlock/titanium, /obj/machinery/door/airlock, /obj/structure/shuttle/engine, /obj/structure/falsewall/plastitanium)
/turf/simulated/wall/mineral/plastitanium/nodiagonal
smooth = SMOOTH_MORE
@@ -332,10 +333,11 @@
T.icon_state = icon_state
if(T.icon != icon)
T.icon = icon
- if(T.color != color)
- T.color = color
+ if(color)
+ T.atom_colours = atom_colours.Copy()
+ T.update_atom_colour()
if(T.dir != dir)
- T.dir = dir
+ T.setDir(dir)
T.transform = transform
return T
diff --git a/code/modules/awaymissions/maploader/reader.dm b/code/modules/awaymissions/maploader/reader.dm
index f034c4f39d1..d27ffe70b24 100644
--- a/code/modules/awaymissions/maploader/reader.dm
+++ b/code/modules/awaymissions/maploader/reader.dm
@@ -479,3 +479,4 @@ GLOBAL_DATUM_INIT(_preloader, /datum/dmm_suite/preloader, new())
/turf/template_noop
name = "Turf Passthrough"
+ icon_state = "noop"
diff --git a/code/modules/mining/shelters.dm b/code/modules/mining/shelters.dm
index 2389470e7f5..41b651340f6 100644
--- a/code/modules/mining/shelters.dm
+++ b/code/modules/mining/shelters.dm
@@ -7,7 +7,7 @@
/datum/map_template/shelter/New()
. = ..()
- blacklisted_turfs = typecacheof(list(/turf/simulated/wall, /turf/simulated/mineral, /turf/simulated/shuttle/wall))
+ blacklisted_turfs = typecacheof(list(/turf/simulated/wall, /turf/simulated/mineral))
whitelisted_turfs = list()
banned_areas = typecacheof(/area/shuttle)
diff --git a/code/modules/procedural_mapping/mapGenerators/syndicate.dm b/code/modules/procedural_mapping/mapGenerators/syndicate.dm
index fc762354c32..620d88ca48a 100644
--- a/code/modules/procedural_mapping/mapGenerators/syndicate.dm
+++ b/code/modules/procedural_mapping/mapGenerators/syndicate.dm
@@ -1,10 +1,7 @@
// Modules
-/turf/simulated/shuttle/floor/syndicate //TODO: move to proper file/replace syndie shuttle turfs
- icon_state = "floor4"
-
/datum/mapGeneratorModule/bottomLayer/syndieFloor
- spawnableTurfs = list(/turf/simulated/shuttle/floor/syndicate = 100)
+ spawnableTurfs = list(/turf/simulated/floor/mineral/plastitanium/red = 100)
/datum/mapGeneratorModule/border/syndieWalls
spawnableAtoms = list()
diff --git a/code/modules/shuttle/shuttle.dm b/code/modules/shuttle/shuttle.dm
index 3985c449be5..5caae9905a0 100644
--- a/code/modules/shuttle/shuttle.dm
+++ b/code/modules/shuttle/shuttle.dm
@@ -953,8 +953,9 @@
T.icon_state = icon_state
if(T.icon != icon)
T.icon = icon
- if(T.color != color)
- T.color = color
+ if(color)
+ T.atom_colours = atom_colours.Copy()
+ T.update_atom_colour()
if(T.dir != dir)
- T.dir = dir
+ T.setDir(dir)
return T
diff --git a/icons/turf/floors.dmi b/icons/turf/floors.dmi
index 7eccbce5a7d..223f5ccddd0 100644
Binary files a/icons/turf/floors.dmi and b/icons/turf/floors.dmi differ
diff --git a/paradise.dme b/paradise.dme
index 31aa44476c0..ee7c84af07e 100644
--- a/paradise.dme
+++ b/paradise.dme
@@ -1173,7 +1173,6 @@
#include "code\game\turfs\simulated\floor.dm"
#include "code\game\turfs\simulated\minerals.dm"
#include "code\game\turfs\simulated\river.dm"
-#include "code\game\turfs\simulated\shuttle.dm"
#include "code\game\turfs\simulated\walls.dm"
#include "code\game\turfs\simulated\walls_indestructible.dm"
#include "code\game\turfs\simulated\walls_mineral.dm"