diff --git a/_maps/Prefab/Departments.dmm b/_maps/Prefab/Departments.dmm
index 1744efc1167e4..e160b9107e0e8 100644
--- a/_maps/Prefab/Departments.dmm
+++ b/_maps/Prefab/Departments.dmm
@@ -1182,7 +1182,7 @@
},
/obj/machinery/airalarm/directional/south,
/obj/machinery/light/small,
-/turf/open/floor/goonplaque,
+/turf/open/floor/iron/goonplaque,
/area/space)
"HB" = (
/obj/effect/turf_decal/tile/dark_red/fourcorners/contrasted{
diff --git a/_maps/RandomRooms/10x5/sk_rdm171_dead_bodies.dmm b/_maps/RandomRooms/10x5/sk_rdm171_dead_bodies.dmm
index ae6f85cd0a9f0..dc1c6e7a31b59 100644
--- a/_maps/RandomRooms/10x5/sk_rdm171_dead_bodies.dmm
+++ b/_maps/RandomRooms/10x5/sk_rdm171_dead_bodies.dmm
@@ -93,7 +93,7 @@
"B" = (
/obj/effect/decal/remains/human,
/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/template_noop)
"D" = (
/obj/effect/decal/cleanable/blood/old,
@@ -119,7 +119,7 @@
/obj/effect/decal/cleanable/blood/old,
/obj/effect/decal/remains/human,
/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/template_noop)
"Q" = (
/obj/effect/decal/cleanable/dirt,
@@ -130,7 +130,7 @@
/obj/item/toy/plush/moth/poison,
/obj/structure/table/wood/fancy,
/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/template_noop)
"Y" = (
/obj/effect/decal/cleanable/blood/old,
diff --git a/_maps/RandomRooms/5x4/sk_rdm169_solars.dmm b/_maps/RandomRooms/5x4/sk_rdm169_solars.dmm
index 1c7ca0c916aa5..7c5eaea6eb81a 100644
--- a/_maps/RandomRooms/5x4/sk_rdm169_solars.dmm
+++ b/_maps/RandomRooms/5x4/sk_rdm169_solars.dmm
@@ -96,7 +96,7 @@
/obj/structure/cable{
icon_state = "0-2"
},
-/turf/open/floor/iron/airless/solarpanel,
+/turf/open/floor/iron/solarpanel/airless,
/area/space)
"v" = (
/obj/machinery/power/solar_control{
@@ -163,7 +163,7 @@
/obj/structure/cable{
icon_state = "0-4"
},
-/turf/open/floor/iron/airless/solarpanel,
+/turf/open/floor/iron/solarpanel/airless,
/area/space)
"M" = (
/obj/structure/window/reinforced{
@@ -192,7 +192,7 @@
/obj/structure/cable{
icon_state = "0-4"
},
-/turf/open/floor/iron/airless/solarpanel,
+/turf/open/floor/iron/solarpanel/airless,
/area/space)
"V" = (
/obj/machinery/door/window/westleft{
diff --git a/_maps/RandomRuins/SpaceRuins/DJstation.dmm b/_maps/RandomRuins/SpaceRuins/DJstation.dmm
index 4ee2f21a2c456..d779f127ebae3 100644
--- a/_maps/RandomRuins/SpaceRuins/DJstation.dmm
+++ b/_maps/RandomRuins/SpaceRuins/DJstation.dmm
@@ -8,7 +8,7 @@
/area/ruin/space/djstation/solars)
"ac" = (
/obj/machinery/power/solar/fake,
-/turf/open/floor/iron/airless/solarpanel,
+/turf/open/floor/iron/solarpanel/airless,
/area/ruin/space/djstation/solars)
"ad" = (
/turf/open/floor/plating/airless,
diff --git a/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm b/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm
index 13959fd9cb01b..e7833d088dc3e 100644
--- a/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm
+++ b/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm
@@ -944,7 +944,7 @@
/area/ruin/space/derelict/bridge/access)
"de" = (
/obj/effect/spawner/lootdrop/maintenance,
-/turf/open/floor/iron/airless/solarpanel,
+/turf/open/floor/iron/solarpanel/airless,
/area/space/nearstation)
"df" = (
/obj/structure/cable/yellow{
@@ -977,7 +977,7 @@
/turf/open/floor/plating/airless,
/area/ruin/space/derelict/gravity_generator)
"dj" = (
-/turf/open/floor/iron/airless/solarpanel,
+/turf/open/floor/iron/solarpanel/airless,
/area/space/nearstation)
"dk" = (
/obj/item/stack/cable_coil/cut/red,
@@ -2270,11 +2270,11 @@
/turf/open/floor/iron/dark,
/area/ruin/space/derelict/medical/chapel)
"hI" = (
-/turf/open/floor/iron/airless/white,
+/turf/open/floor/iron/white/airless,
/area/ruin/space/derelict/medical)
"hJ" = (
/obj/item/bot_assembly/medbot,
-/turf/open/floor/iron/airless/white,
+/turf/open/floor/iron/white/airless,
/area/ruin/space/derelict/medical)
"hK" = (
/obj/structure/closet,
@@ -2349,11 +2349,11 @@
/obj/machinery/light{
dir = 8
},
-/turf/open/floor/iron/airless/white,
+/turf/open/floor/iron/white/airless,
/area/ruin/space/derelict/medical)
"hW" = (
/obj/item/stack/medical/bruise_pack,
-/turf/open/floor/iron/airless/white,
+/turf/open/floor/iron/white/airless,
/area/ruin/space/derelict/medical)
"hX" = (
/turf/open/floor/iron/airless{
@@ -2512,7 +2512,7 @@
/obj/machinery/sleeper{
dir = 4
},
-/turf/open/floor/iron/airless/white,
+/turf/open/floor/iron/white/airless,
/area/ruin/space/derelict/medical)
"iB" = (
/obj/structure/table,
@@ -2521,11 +2521,11 @@
},
/obj/structure/window/reinforced,
/obj/item/reagent_containers/glass/beaker,
-/turf/open/floor/iron/airless/white,
+/turf/open/floor/iron/white/airless,
/area/ruin/space/derelict/medical)
"iC" = (
/obj/structure/window/reinforced,
-/turf/open/floor/iron/airless/white,
+/turf/open/floor/iron/white/airless,
/area/ruin/space/derelict/medical)
"iD" = (
/obj/structure/window/reinforced,
@@ -2533,7 +2533,7 @@
/area/ruin/unpowered/no_grav)
"iE" = (
/obj/structure/window/reinforced,
-/turf/open/floor/iron/airless/white,
+/turf/open/floor/iron/white/airless,
/area/ruin/unpowered/no_grav)
"iF" = (
/obj/structure/cable/yellow{
@@ -2578,7 +2578,7 @@
/obj/item/shard{
icon_state = "small"
},
-/turf/open/floor/iron/airless/white,
+/turf/open/floor/iron/white/airless,
/area/ruin/space/derelict/medical)
"iM" = (
/obj/item/stack/medical/bruise_pack,
@@ -2671,11 +2671,11 @@
/obj/structure/window/reinforced{
dir = 8
},
-/turf/open/floor/iron/airless/white,
+/turf/open/floor/iron/white/airless,
/area/ruin/space/derelict/medical)
"iZ" = (
/obj/item/cigbutt,
-/turf/open/floor/iron/airless/white,
+/turf/open/floor/iron/white/airless,
/area/ruin/space/derelict/medical)
"ja" = (
/obj/machinery/door/airlock/public/glass{
@@ -2702,7 +2702,7 @@
/obj/structure/cable/yellow{
icon_state = "2-4"
},
-/turf/open/floor/iron/airless/white,
+/turf/open/floor/iron/white/airless,
/area/ruin/space/derelict/medical)
"jg" = (
/obj/structure/cable/yellow{
@@ -2711,19 +2711,19 @@
/obj/structure/window/reinforced{
dir = 8
},
-/turf/open/floor/iron/airless/white,
+/turf/open/floor/iron/white/airless,
/area/ruin/space/derelict/medical)
"jh" = (
/obj/structure/cable/yellow{
icon_state = "4-8"
},
-/turf/open/floor/iron/airless/white,
+/turf/open/floor/iron/white/airless,
/area/ruin/space/derelict/medical)
"ji" = (
/obj/item/stack/cable_coil/cut/yellow{
amount = 2
},
-/turf/open/floor/iron/airless/white,
+/turf/open/floor/iron/white/airless,
/area/ruin/space/derelict/medical)
"jj" = (
/obj/item/stack/cable_coil/cut/yellow{
@@ -2745,7 +2745,7 @@
lootcount = 2;
name = "2maintenance loot spawner"
},
-/turf/open/floor/iron/airless/white,
+/turf/open/floor/iron/white/airless,
/area/ruin/space/derelict/medical)
"jm" = (
/obj/structure/window/reinforced{
@@ -2767,7 +2767,7 @@
/turf/open/floor/plating/airless,
/area/ruin/unpowered/no_grav)
"jp" = (
-/turf/open/floor/iron/airless/white,
+/turf/open/floor/iron/white/airless,
/area/ruin/unpowered/no_grav)
"jr" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on,
@@ -2823,22 +2823,22 @@
pixel_y = -24
},
/obj/structure/cable,
-/turf/open/floor/iron/airless/white,
+/turf/open/floor/iron/white/airless,
/area/ruin/space/derelict/medical)
"jA" = (
/obj/structure/window/reinforced{
dir = 8
},
/obj/structure/bed,
-/turf/open/floor/iron/airless/white,
+/turf/open/floor/iron/white/airless,
/area/ruin/space/derelict/medical)
"jB" = (
/obj/item/stack/medical/ointment,
-/turf/open/floor/iron/airless/white,
+/turf/open/floor/iron/white/airless,
/area/ruin/space/derelict/medical)
"jC" = (
/obj/structure/bed,
-/turf/open/floor/iron/airless/white,
+/turf/open/floor/iron/white/airless,
/area/ruin/space/derelict/medical)
"jD" = (
/obj/item/stack/cable_coil/cut/yellow{
@@ -2852,7 +2852,7 @@
/obj/machinery/door/airlock/medical{
name = "Medical"
},
-/turf/open/floor/iron/airless/white,
+/turf/open/floor/iron/white/airless,
/area/ruin/space/derelict/medical)
"jF" = (
/obj/structure/window/reinforced{
@@ -2901,11 +2901,11 @@
/obj/structure/cable/yellow{
icon_state = "1-2"
},
-/turf/open/floor/iron/airless/white,
+/turf/open/floor/iron/white/airless,
/area/ruin/space/derelict/medical)
"jO" = (
/obj/machinery/door/window/southright,
-/turf/open/floor/iron/airless/white,
+/turf/open/floor/iron/white/airless,
/area/ruin/space/derelict/medical)
"jP" = (
/obj/structure/cable/yellow{
diff --git a/_maps/RandomRuins/SpaceRuins/bus.dmm b/_maps/RandomRuins/SpaceRuins/bus.dmm
index f9371da28321f..087e462d7f643 100644
--- a/_maps/RandomRuins/SpaceRuins/bus.dmm
+++ b/_maps/RandomRuins/SpaceRuins/bus.dmm
@@ -58,13 +58,13 @@
icon_state = "backseat"
},
/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron/airless/dark{
+/turf/open/floor/iron/dark/airless{
icon_state = "bus"
},
/area/ruin/unpowered/no_grav)
"ao" = (
/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron/airless/dark{
+/turf/open/floor/iron/dark/airless{
icon_state = "bus"
},
/area/ruin/unpowered/no_grav)
@@ -73,7 +73,7 @@
icon_state = "backseat";
pixel_y = 15
},
-/turf/open/floor/iron/airless/dark{
+/turf/open/floor/iron/dark/airless{
icon_state = "bus"
},
/area/ruin/unpowered/no_grav)
@@ -99,27 +99,27 @@
"ax" = (
/obj/structure/fluff/bus/passable,
/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron/airless/dark{
+/turf/open/floor/iron/dark/airless{
icon_state = "bus"
},
/area/ruin/unpowered/no_grav)
"ay" = (
/obj/structure/fluff/bus/passable,
/obj/item/storage/firstaid/regular,
-/turf/open/floor/iron/airless/dark{
+/turf/open/floor/iron/dark/airless{
icon_state = "bus"
},
/area/ruin/unpowered/no_grav)
"az" = (
/obj/structure/fluff/bus/passable,
-/turf/open/floor/iron/airless/dark{
+/turf/open/floor/iron/dark/airless{
icon_state = "bus"
},
/area/ruin/unpowered/no_grav)
"aB" = (
/obj/structure/fluff/bus/passable,
/obj/effect/mine/sound/bwoink,
-/turf/open/floor/iron/airless/dark{
+/turf/open/floor/iron/dark/airless{
icon_state = "bus"
},
/area/ruin/unpowered/no_grav)
@@ -127,7 +127,7 @@
/obj/structure/fluff/bus/passable,
/obj/item/reagent_containers/food/condiment/saltshaker,
/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron/airless/dark{
+/turf/open/floor/iron/dark/airless{
icon_state = "bus"
},
/area/ruin/unpowered/no_grav)
@@ -136,7 +136,7 @@
icon_state = "topdoor"
},
/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron/airless/dark{
+/turf/open/floor/iron/dark/airless{
icon_state = "bus"
},
/area/ruin/unpowered/no_grav)
@@ -222,7 +222,7 @@
icon_state = "backseat"
},
/obj/effect/decal/remains/human,
-/turf/open/floor/iron/airless/dark{
+/turf/open/floor/iron/dark/airless{
icon_state = "bus"
},
/area/ruin/unpowered/no_grav)
@@ -232,7 +232,7 @@
pixel_y = 17
},
/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron/airless/dark{
+/turf/open/floor/iron/dark/airless{
icon_state = "bus"
},
/area/ruin/unpowered/no_grav)
@@ -248,7 +248,7 @@
"ba" = (
/obj/structure/fluff/bus/passable,
/obj/item/banhammer,
-/turf/open/floor/iron/airless/dark{
+/turf/open/floor/iron/dark/airless{
icon_state = "bus"
},
/area/ruin/unpowered/no_grav)
@@ -262,14 +262,14 @@
},
/obj/item/food/meatball,
/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron/airless/dark{
+/turf/open/floor/iron/dark/airless{
icon_state = "bus"
},
/area/ruin/unpowered/no_grav)
"dJ" = (
/obj/structure/fluff/bus/passable,
/obj/item/food/meatball,
-/turf/open/floor/iron/airless/dark{
+/turf/open/floor/iron/dark/airless{
icon_state = "bus"
},
/area/ruin/unpowered/no_grav)
@@ -278,7 +278,7 @@
icon_state = "backseat"
},
/obj/item/food/grown/cherry_bomb,
-/turf/open/floor/iron/airless/dark{
+/turf/open/floor/iron/dark/airless{
icon_state = "bus"
},
/area/ruin/unpowered/no_grav)
@@ -288,7 +288,7 @@
/obj/item/food/meatball,
/obj/item/food/meatball,
/obj/item/food/meatball,
-/turf/open/floor/iron/airless/dark{
+/turf/open/floor/iron/dark/airless{
icon_state = "bus"
},
/area/ruin/unpowered/no_grav)
@@ -297,7 +297,7 @@
icon_state = "backseat"
},
/obj/item/food/meatball,
-/turf/open/floor/iron/airless/dark{
+/turf/open/floor/iron/dark/airless{
icon_state = "bus"
},
/area/ruin/unpowered/no_grav)
@@ -305,7 +305,7 @@
/obj/structure/fluff/bus/passable,
/obj/effect/decal/cleanable/dirt,
/obj/item/food/meatball,
-/turf/open/floor/iron/airless/dark{
+/turf/open/floor/iron/dark/airless{
icon_state = "bus"
},
/area/ruin/unpowered/no_grav)
@@ -315,7 +315,7 @@
},
/obj/effect/decal/cleanable/dirt,
/obj/item/food/meatball,
-/turf/open/floor/iron/airless/dark{
+/turf/open/floor/iron/dark/airless{
icon_state = "bus"
},
/area/ruin/unpowered/no_grav)
@@ -330,7 +330,7 @@
},
/obj/effect/decal/cleanable/dirt,
/obj/item/food/grown/citrus/orange,
-/turf/open/floor/iron/airless/dark{
+/turf/open/floor/iron/dark/airless{
icon_state = "bus"
},
/area/ruin/unpowered/no_grav)
@@ -340,7 +340,7 @@
},
/obj/effect/decal/cleanable/dirt,
/obj/item/toy/plush/awakenedplushie,
-/turf/open/floor/iron/airless/dark{
+/turf/open/floor/iron/dark/airless{
icon_state = "bus"
},
/area/ruin/unpowered/no_grav)
diff --git a/_maps/RandomRuins/SpaceRuins/caravanambush.dmm b/_maps/RandomRuins/SpaceRuins/caravanambush.dmm
index 104c0912db22e..769a3b6cabb6e 100644
--- a/_maps/RandomRuins/SpaceRuins/caravanambush.dmm
+++ b/_maps/RandomRuins/SpaceRuins/caravanambush.dmm
@@ -112,7 +112,7 @@
},
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/shuttle/caravan/freighter3)
"aD" = (
/obj/item/stack/rods,
@@ -155,7 +155,7 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 1
},
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/shuttle/caravan/freighter3)
"aP" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on,
@@ -189,7 +189,7 @@
density = 0;
name = "broken airlock"
},
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/shuttle/caravan/freighter3)
"aY" = (
/obj/effect/turf_decal/bot_white/right,
@@ -213,7 +213,7 @@
/obj/machinery/light/small{
dir = 1
},
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/shuttle/caravan/freighter2)
"aZ" = (
/obj/machinery/door/firedoor,
@@ -226,7 +226,7 @@
density = 0;
name = "broken airlock"
},
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/shuttle/caravan/freighter2)
"bg" = (
/obj/effect/decal/cleanable/dirt,
@@ -377,13 +377,13 @@
"gs" = (
/obj/effect/turf_decal/bot_white,
/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/shuttle/caravan/freighter3)
"gt" = (
/obj/effect/turf_decal/bot_white,
/obj/structure/closet/crate/secure/weapon,
/obj/item/gun/ballistic/revolver/grenadelauncher/unrestricted,
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/shuttle/caravan/freighter3)
"gv" = (
/obj/effect/turf_decal/bot_white,
@@ -396,7 +396,7 @@
/obj/item/clothing/gloves/color/yellow,
/obj/item/multitool,
/obj/item/multitool,
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/shuttle/caravan/freighter3)
"gw" = (
/obj/effect/turf_decal/bot_white,
@@ -408,7 +408,7 @@
name = "Cargo Blast Door Control";
pixel_y = 24
},
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/shuttle/caravan/freighter3)
"gy" = (
/obj/machinery/light/small{
@@ -419,7 +419,7 @@
pixel_y = 32
},
/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/shuttle/caravan/freighter3)
"gP" = (
/obj/structure/shuttle/engine/propulsion/burst{
@@ -475,7 +475,7 @@
dir = 10
},
/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/shuttle/caravan/freighter3)
"hm" = (
/turf/closed/wall/mineral/titanium,
@@ -552,7 +552,7 @@
/obj/effect/turf_decal/box/white/corners{
dir = 1
},
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/shuttle/caravan/freighter3)
"hx" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
@@ -562,14 +562,14 @@
amount = 25
},
/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/shuttle/caravan/freighter3)
"hy" = (
/obj/effect/turf_decal/box/white/corners{
dir = 4
},
/mob/living/simple_animal/hostile/syndicate/ranged/shotgun/space/stormtrooper,
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/shuttle/caravan/freighter3)
"hz" = (
/obj/machinery/firealarm{
@@ -609,7 +609,7 @@
/obj/item/ammo_casing/shotgun/dragonsbreath,
/obj/item/ammo_casing/shotgun/stunslug,
/obj/item/ammo_casing/shotgun/stunslug,
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/shuttle/caravan/freighter2)
"hU" = (
/obj/effect/turf_decal/bot_white,
@@ -623,7 +623,7 @@
/obj/effect/decal/cleanable/dirt,
/obj/structure/closet/crate/secure/gear,
/obj/item/storage/box/rubbershot,
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/shuttle/caravan/freighter2)
"hW" = (
/obj/effect/turf_decal/bot_white,
@@ -641,7 +641,7 @@
pixel_y = 3
},
/obj/item/ammo_box/magazine/m10mm,
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/shuttle/caravan/freighter2)
"hX" = (
/obj/effect/decal/cleanable/dirt,
@@ -705,7 +705,7 @@
"id" = (
/obj/effect/turf_decal/box/white/corners,
/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/shuttle/caravan/freighter3)
"ie" = (
/obj/machinery/airalarm/all_access{
@@ -722,7 +722,7 @@
pixel_x = -26
},
/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/shuttle/caravan/freighter3)
"ig" = (
/obj/structure/chair{
@@ -730,7 +730,7 @@
},
/obj/effect/mob_spawn/human/corpse/cargo_tech,
/obj/effect/decal/cleanable/blood,
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/shuttle/caravan/freighter3)
"ih" = (
/obj/effect/decal/cleanable/dirt,
@@ -842,7 +842,7 @@
/area/shuttle/caravan/freighter3)
"iF" = (
/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/shuttle/caravan/freighter3)
"iL" = (
/obj/effect/decal/cleanable/dirt,
@@ -881,14 +881,14 @@
},
/obj/structure/closet/crate/secure/weapon,
/obj/item/gun/ballistic/shotgun/sc_pump,
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/shuttle/caravan/freighter2)
"iX" = (
/obj/effect/turf_decal/box/white/corners{
dir = 4
},
/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/shuttle/caravan/freighter2)
"iY" = (
/obj/machinery/firealarm{
@@ -908,7 +908,7 @@
/obj/item/organ/cyberimp/arm/toolset,
/obj/item/organ/cyberimp/eyes/hud/medical,
/obj/item/organ/cyberimp/brain/anti_stun,
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/shuttle/caravan/freighter3)
"jb" = (
/obj/effect/turf_decal/bot_white,
@@ -922,7 +922,7 @@
/obj/structure/closet/crate/secure/plasma,
/obj/item/mecha_parts/mecha_equipment/weapon/energy/plasma,
/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/shuttle/caravan/freighter3)
"jd" = (
/obj/effect/turf_decal/bot_white,
@@ -932,7 +932,7 @@
name = "Cargo Blast Door Control";
pixel_y = -24
},
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/shuttle/caravan/freighter3)
"je" = (
/obj/machinery/light/small{
@@ -943,7 +943,7 @@
pixel_y = -32
},
/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/shuttle/caravan/freighter3)
"jp" = (
/obj/effect/decal/cleanable/dirt,
@@ -969,18 +969,18 @@
/obj/effect/decal/cleanable/dirt,
/obj/structure/closet/crate/secure/weapon,
/obj/item/gun/ballistic/automatic/pistol/APS,
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/shuttle/caravan/freighter2)
"js" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/shuttle/caravan/freighter2)
"jt" = (
/obj/effect/turf_decal/box/white/corners,
/obj/structure/closet/crate/secure/weapon,
/obj/item/gun/energy/e_gun/mini,
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/shuttle/caravan/freighter2)
"ju" = (
/obj/effect/decal/cleanable/dirt,
@@ -1013,7 +1013,7 @@
/obj/item/wirecutters/caravan,
/obj/item/crowbar/red/caravan,
/obj/item/screwdriver/caravan,
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/shuttle/caravan/freighter3)
"jH" = (
/obj/machinery/atmospherics/components/unary/tank/air{
@@ -1098,23 +1098,23 @@
pixel_y = -24
},
/obj/machinery/light/small,
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/shuttle/caravan/freighter2)
"jX" = (
/obj/effect/turf_decal/bot_white,
/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/shuttle/caravan/freighter2)
"jY" = (
/obj/effect/turf_decal/bot_white,
/obj/structure/closet/crate/secure/gear,
/obj/item/storage/belt/bandolier,
/obj/item/clothing/accessory/holster,
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/shuttle/caravan/freighter2)
"jZ" = (
/obj/effect/turf_decal/bot_white,
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/shuttle/caravan/freighter2)
"ka" = (
/obj/effect/turf_decal/bot_white,
@@ -1125,7 +1125,7 @@
pixel_y = -24
},
/obj/machinery/light/small,
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/shuttle/caravan/freighter2)
"kb" = (
/obj/effect/decal/cleanable/dirt,
@@ -1136,7 +1136,7 @@
pixel_x = -32;
pixel_y = -32
},
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/shuttle/caravan/freighter2)
"kc" = (
/obj/structure/rack,
diff --git a/_maps/RandomRuins/SpaceRuins/derelict6.dmm b/_maps/RandomRuins/SpaceRuins/derelict6.dmm
index c2261cdc2c059..82c9712e3f4c6 100644
--- a/_maps/RandomRuins/SpaceRuins/derelict6.dmm
+++ b/_maps/RandomRuins/SpaceRuins/derelict6.dmm
@@ -133,23 +133,23 @@
"aI" = (
/obj/structure/table,
/obj/machinery/microwave,
-/turf/open/floor/iron/airless/cafeteria,
+/turf/open/floor/iron/cafeteria/airless,
/area/ruin/unpowered)
"aJ" = (
/obj/structure/table,
/obj/item/storage/box/drinkingglasses,
-/turf/open/floor/iron/airless/cafeteria,
+/turf/open/floor/iron/cafeteria/airless,
/area/ruin/unpowered)
"aK" = (
/obj/structure/closet/secure_closet/freezer/fridge/open,
/obj/machinery/light/broken{
dir = 1
},
-/turf/open/floor/iron/airless/cafeteria,
+/turf/open/floor/iron/cafeteria/airless,
/area/ruin/unpowered)
"aL" = (
/obj/structure/closet/secure_closet/freezer/kitchen,
-/turf/open/floor/iron/airless/cafeteria,
+/turf/open/floor/iron/cafeteria/airless,
/area/ruin/unpowered)
"aP" = (
/obj/machinery/light/broken{
@@ -164,11 +164,11 @@
/turf/open/floor/plating/airless,
/area/ruin/unpowered)
"aR" = (
-/turf/open/floor/iron/airless/cafeteria,
+/turf/open/floor/iron/cafeteria/airless,
/area/ruin/unpowered)
"aS" = (
/obj/structure/table_frame,
-/turf/open/floor/iron/airless/cafeteria,
+/turf/open/floor/iron/cafeteria/airless,
/area/ruin/unpowered)
"aU" = (
/obj/structure/table/wood,
@@ -186,7 +186,7 @@
/area/ruin/unpowered)
"aW" = (
/obj/structure/table,
-/turf/open/floor/iron/airless/cafeteria,
+/turf/open/floor/iron/cafeteria/airless,
/area/ruin/unpowered)
"aY" = (
/obj/structure/lattice,
@@ -200,16 +200,16 @@
/area/space/nearstation)
"ba" = (
/mob/living/simple_animal/hostile/retaliate/ghost,
-/turf/open/floor/iron/airless/cafeteria,
+/turf/open/floor/iron/cafeteria/airless,
/area/ruin/unpowered)
"bb" = (
/obj/item/food/donkpocket,
-/turf/open/floor/iron/airless/cafeteria,
+/turf/open/floor/iron/cafeteria/airless,
/area/ruin/unpowered)
"bc" = (
/obj/structure/table,
/obj/item/shard,
-/turf/open/floor/iron/airless/cafeteria,
+/turf/open/floor/iron/cafeteria/airless,
/area/ruin/unpowered)
"be" = (
/turf/open/floor/plating/airless{
@@ -221,7 +221,7 @@
dir = 8
},
/obj/structure/table_frame,
-/turf/open/floor/iron/airless/cafeteria,
+/turf/open/floor/iron/cafeteria/airless,
/area/ruin/unpowered)
"bi" = (
/obj/item/stack/sheet/iron,
@@ -233,7 +233,7 @@
"bj" = (
/obj/item/trash/plate,
/obj/effect/decal/remains/human,
-/turf/open/floor/iron/airless/cafeteria,
+/turf/open/floor/iron/cafeteria/airless,
/area/ruin/unpowered)
"bk" = (
/obj/structure/table_frame/wood,
diff --git a/_maps/RandomRuins/SpaceRuins/gasthelizards.dmm b/_maps/RandomRuins/SpaceRuins/gasthelizards.dmm
index 2f70ce0423afe..75fe34848238d 100644
--- a/_maps/RandomRuins/SpaceRuins/gasthelizards.dmm
+++ b/_maps/RandomRuins/SpaceRuins/gasthelizards.dmm
@@ -18,7 +18,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 8
},
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/ruin/space/has_grav/gasthelizard)
"e" = (
/obj/structure/window/reinforced{
@@ -27,7 +27,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 4
},
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/ruin/space/has_grav/gasthelizard)
"f" = (
/obj/structure/window/reinforced{
@@ -41,7 +41,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 8
},
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/ruin/space/has_grav/gasthelizard)
"g" = (
/obj/structure/window/reinforced{
@@ -54,19 +54,19 @@
/obj/effect/turf_decal/stripes/line{
dir = 8
},
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/ruin/space/has_grav/gasthelizard)
"h" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
},
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/ruin/space/has_grav/gasthelizard)
"i" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
},
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/ruin/space/has_grav/gasthelizard)
"j" = (
/obj/structure/window/reinforced{
@@ -76,7 +76,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 4
},
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/ruin/space/has_grav/gasthelizard)
"k" = (
/obj/structure/window/reinforced{
@@ -85,14 +85,14 @@
/obj/effect/turf_decal/stripes/line{
dir = 8
},
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/ruin/space/has_grav/gasthelizard)
"l" = (
/obj/machinery/atmospherics/components/unary/outlet_injector,
/obj/effect/turf_decal/stripes/line{
dir = 4
},
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/ruin/space/has_grav/gasthelizard)
"m" = (
/obj/structure/closet/crate/freezer,
@@ -103,7 +103,7 @@
/obj/item/food/meat/slab/human/mutant/lizard,
/obj/item/food/meat/slab/human/mutant/lizard,
/obj/item/food/meat/slab/human/mutant/lizard,
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/ruin/space/has_grav/gasthelizard)
"n" = (
/obj/structure/closet/crate/freezer,
@@ -117,7 +117,7 @@
},
/obj/item/food/meat/slab/human/mutant/lizard,
/obj/item/food/meat/slab/human/mutant/lizard,
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/ruin/space/has_grav/gasthelizard)
"o" = (
/obj/structure/closet/crate/freezer,
@@ -129,10 +129,10 @@
/obj/item/food/meat/slab/human/mutant/lizard,
/obj/item/food/meat/slab/human/mutant/lizard,
/obj/item/food/meat/slab/human/mutant/lizard,
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/ruin/space/has_grav/gasthelizard)
"r" = (
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/ruin/space/has_grav/gasthelizard)
"s" = (
/obj/machinery/atmospherics/components/unary/portables_connector/visible{
@@ -177,14 +177,14 @@
/area/ruin/space/has_grav/gasthelizard)
"x" = (
/obj/structure/kitchenspike,
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/ruin/space/has_grav/gasthelizard)
"y" = (
/obj/structure/table/reinforced,
/obj/item/knife/butcher,
/obj/item/restraints/handcuffs,
/obj/item/reagent_containers/peppercloud_deployer,
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/ruin/space/has_grav/gasthelizard)
"z" = (
/obj/machinery/atmospherics/components/unary/portables_connector/visible{
@@ -204,14 +204,14 @@
/area/ruin/space/has_grav/gasthelizard)
"C" = (
/obj/machinery/gibber,
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/ruin/space/has_grav/gasthelizard)
"D" = (
/obj/structure/table/reinforced,
/obj/item/clothing/suit/jacket/straight_jacket,
/obj/item/reagent_containers/syringe/lethal,
/obj/item/reagent_containers/syringe/lethal/choral,
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/ruin/space/has_grav/gasthelizard)
"E" = (
/obj/machinery/atmospherics/components/unary/portables_connector/visible{
@@ -232,7 +232,7 @@
/area/ruin/space/has_grav/gasthelizard)
"H" = (
/obj/machinery/door/airlock/security,
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/ruin/space/has_grav/gasthelizard)
"I" = (
/obj/item/reagent_containers/glass/bottle/morphine{
@@ -256,7 +256,7 @@
pixel_y = 6
},
/obj/structure/table/reinforced,
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/ruin/space/has_grav/gasthelizard)
"J" = (
/obj/structure/rack,
@@ -302,12 +302,12 @@
/obj/item/cautery,
/obj/item/circular_saw,
/obj/machinery/light,
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/ruin/space/has_grav/gasthelizard)
"Q" = (
/obj/structure/table/optable,
/obj/effect/decal/cleanable/blood/old,
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/ruin/space/has_grav/gasthelizard)
"R" = (
/obj/structure/table/reinforced,
@@ -316,7 +316,7 @@
/obj/item/reagent_containers/glass/bottle/mutagen,
/obj/item/reagent_containers/glass/bottle/mutagen,
/obj/item/razor,
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/ruin/space/has_grav/gasthelizard)
"S" = (
/obj/machinery/suit_storage_unit/security,
diff --git a/_maps/RandomRuins/SpaceRuins/oldAIsat.dmm b/_maps/RandomRuins/SpaceRuins/oldAIsat.dmm
index 7ca5625e75dcb..fda9141b04e7e 100644
--- a/_maps/RandomRuins/SpaceRuins/oldAIsat.dmm
+++ b/_maps/RandomRuins/SpaceRuins/oldAIsat.dmm
@@ -300,18 +300,18 @@
/obj/structure/window/reinforced{
dir = 8
},
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/tcommsat/oldaisat)
"bc" = (
/obj/structure/window/reinforced,
/obj/structure/window/reinforced{
dir = 1
},
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/tcommsat/oldaisat)
"bd" = (
/obj/structure/window/reinforced,
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/tcommsat/oldaisat)
"be" = (
/obj/structure/window/reinforced,
@@ -319,7 +319,7 @@
dir = 1
},
/obj/item/electronics/airlock,
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/tcommsat/oldaisat)
"bf" = (
/obj/structure/door_assembly/door_assembly_hatch,
@@ -385,7 +385,7 @@
/obj/structure/window/reinforced{
dir = 4
},
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/tcommsat/oldaisat)
"bq" = (
/obj/structure/window/reinforced{
@@ -420,14 +420,14 @@
/area/tcommsat/oldaisat)
"bv" = (
/obj/machinery/door/airlock/maintenance_hatch,
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/tcommsat/oldaisat)
"bw" = (
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/tcommsat/oldaisat)
"bx" = (
/obj/machinery/door/airlock/hatch,
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/tcommsat/oldaisat)
"by" = (
/obj/structure/window/reinforced{
@@ -443,7 +443,7 @@
/obj/item/shard{
icon_state = "medium"
},
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/tcommsat/oldaisat)
"bA" = (
/obj/effect/spawner/structure/window/hollow/reinforced/end{
@@ -474,7 +474,7 @@
/obj/structure/window/reinforced{
dir = 8
},
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/tcommsat/oldaisat)
"bF" = (
/obj/structure/window/reinforced{
@@ -491,7 +491,7 @@
dir = 8
},
/obj/item/stack/rods,
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/tcommsat/oldaisat)
"bH" = (
/obj/item/stack/rods,
@@ -504,13 +504,13 @@
/obj/structure/window/reinforced{
dir = 8
},
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/tcommsat/oldaisat)
"bJ" = (
/obj/structure/window/reinforced{
dir = 4
},
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/tcommsat/oldaisat)
"bK" = (
/obj/effect/spawner/structure/window/hollow/reinforced/directional{
@@ -533,7 +533,7 @@
/obj/item/scalpel{
pixel_y = 12
},
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/tcommsat/oldaisat)
"bO" = (
/obj/structure/window/reinforced{
@@ -542,7 +542,7 @@
/obj/item/shard{
icon_state = "medium"
},
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/tcommsat/oldaisat)
"bP" = (
/obj/effect/spawner/structure/window/hollow/reinforced/middle{
@@ -557,7 +557,7 @@
/area/tcommsat/oldaisat)
"bR" = (
/obj/item/radio/off,
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/tcommsat/oldaisat)
"bS" = (
/obj/effect/spawner/structure/window/hollow/reinforced/middle{
@@ -588,11 +588,11 @@
dir = 1
},
/obj/structure/window/reinforced,
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/tcommsat/oldaisat)
"bX" = (
/obj/structure/door_assembly/door_assembly_mhatch,
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/tcommsat/oldaisat)
"bY" = (
/obj/machinery/light/small{
@@ -607,7 +607,7 @@
"ca" = (
/obj/effect/decal/cleanable/blood,
/obj/item/assembly/signaler,
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/tcommsat/oldaisat)
"cb" = (
/obj/structure/table,
@@ -615,7 +615,7 @@
/obj/item/reagent_containers/syringe/lethal{
pixel_y = 4
},
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/tcommsat/oldaisat)
"cc" = (
/obj/effect/spawner/structure/window/hollow/reinforced/end{
@@ -635,12 +635,12 @@
"cf" = (
/obj/structure/table,
/obj/item/hemostat,
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/tcommsat/oldaisat)
"cg" = (
/obj/structure/table,
/obj/item/circular_saw,
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/tcommsat/oldaisat)
"ch" = (
/obj/effect/spawner/structure/window/hollow/reinforced/directional{
@@ -656,7 +656,7 @@
dir = 4
},
/obj/item/stack/rods,
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/tcommsat/oldaisat)
"cj" = (
/obj/structure/window/reinforced{
@@ -706,7 +706,7 @@
/obj/structure/window/reinforced{
dir = 8
},
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/tcommsat/oldaisat)
"cr" = (
/obj/item/paper/crumpled,
@@ -730,7 +730,7 @@
/obj/structure/window/reinforced{
dir = 4
},
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/tcommsat/oldaisat)
"cv" = (
/obj/effect/turf_decal/stripes/line{
diff --git a/_maps/RandomRuins/SpaceRuins/oldstation.dmm b/_maps/RandomRuins/SpaceRuins/oldstation.dmm
index 2e3f4d3a858d5..af6b3a03b62ac 100644
--- a/_maps/RandomRuins/SpaceRuins/oldstation.dmm
+++ b/_maps/RandomRuins/SpaceRuins/oldstation.dmm
@@ -999,7 +999,7 @@
/obj/structure/table,
/obj/item/storage/firstaid/ancient,
/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron/airless/white/side{
+/turf/open/floor/iron/white/side/airless{
dir = 5
},
/area/ruin/space/has_grav/ancientstation/betanorth)
@@ -1148,7 +1148,7 @@
"dD" = (
/obj/effect/decal/cleanable/dirt,
/obj/item/rollerbed,
-/turf/open/floor/iron/airless/white/side{
+/turf/open/floor/iron/white/side/airless{
dir = 4
},
/area/ruin/space/has_grav/ancientstation/betanorth)
@@ -1387,7 +1387,7 @@
/area/ruin/space/has_grav/ancientstation/betanorth)
"eH" = (
/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron/airless/white/side{
+/turf/open/floor/iron/white/side/airless{
dir = 4
},
/area/ruin/space/has_grav/ancientstation/betanorth)
@@ -3844,7 +3844,7 @@
"lv" = (
/obj/effect/decal/cleanable/dirt,
/obj/item/stack/sheet/glass,
-/turf/open/floor/iron/airless/white/side{
+/turf/open/floor/iron/white/side/airless{
dir = 4
},
/area/ruin/space/has_grav/ancientstation/betanorth)
diff --git a/_maps/RandomZLevels/caves.dmm b/_maps/RandomZLevels/caves.dmm
index 66f3c8bf19593..54dc988c2423e 100644
--- a/_maps/RandomZLevels/caves.dmm
+++ b/_maps/RandomZLevels/caves.dmm
@@ -733,6 +733,11 @@
initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/BMP_asteroid/level_two)
+"cf" = (
+/turf/open/floor/iron/dark{
+ initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ },
+/area/awaymission/caves/BMP_asteroid/level_two)
"cg" = (
/turf/closed/wall,
/area/awaymission/caves/research)
@@ -768,6 +773,27 @@
"cm" = (
/turf/closed/mineral/random/low_chance,
/area/awaymission/caves/BMP_asteroid/level_two)
+"cn" = (
+/turf/open/floor/iron{
+ initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ },
+/area/awaymission/caves/research)
+"co" = (
+/obj/machinery/light{
+ dir = 1
+ },
+/obj/structure/filingcabinet,
+/obj/item/paper/fluff/awaymissions/caves/omega,
+/turf/open/floor/iron{
+ initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ },
+/area/awaymission/caves/research)
+"cp" = (
+/obj/structure/table,
+/turf/open/floor/iron{
+ initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ },
+/area/awaymission/caves/research)
"cq" = (
/obj/structure/flora/rock,
/turf/open/floor/plating/asteroid/basalt{
@@ -785,12 +811,37 @@
initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/research)
+"ct" = (
+/obj/item/shard,
+/obj/item/stack/rods,
+/obj/effect/decal/cleanable/blood/old,
+/turf/open/floor/iron{
+ initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ },
+/area/awaymission/caves/research)
+"cu" = (
+/obj/effect/decal/cleanable/blood/gibs,
+/turf/open/floor/iron{
+ initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ },
+/area/awaymission/caves/research)
+"cv" = (
+/obj/effect/decal/cleanable/blood/old,
+/turf/open/floor/iron{
+ initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ },
+/area/awaymission/caves/research)
"cw" = (
/obj/item/stack/rods,
/turf/open/floor/plating{
initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/research)
+"cx" = (
+/turf/open/floor/iron/dark{
+ initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ },
+/area/awaymission/caves/BMP_asteroid)
"cy" = (
/obj/effect/decal/remains/human,
/turf/open/floor/plating/asteroid/basalt{
@@ -818,6 +869,30 @@
initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/research)
+"cC" = (
+/obj/structure/table,
+/obj/item/restraints/handcuffs/cable,
+/obj/item/restraints/handcuffs/cable,
+/turf/open/floor/iron{
+ initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ },
+/area/awaymission/caves/research)
+"cD" = (
+/obj/effect/decal/remains/human,
+/turf/open/floor/iron{
+ initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ },
+/area/awaymission/caves/research)
+"cE" = (
+/obj/structure/sign/warning/vacuum{
+ name = "\improper LOW AIR AREA";
+ pixel_x = 32
+ },
+/obj/item/stack/rods,
+/turf/open/floor/iron{
+ initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ },
+/area/awaymission/caves/research)
"cF" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating{
@@ -944,12 +1019,42 @@
initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/research)
+"cX" = (
+/obj/structure/table,
+/obj/item/melee/baton,
+/turf/open/floor/iron{
+ initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ },
+/area/awaymission/caves/research)
+"cY" = (
+/obj/structure/glowshroom/single,
+/turf/open/floor/iron{
+ initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ },
+/area/awaymission/caves/research)
+"cZ" = (
+/obj/structure/sign/warning/vacuum{
+ name = "\improper LOW AIR AREA";
+ pixel_x = 32
+ },
+/turf/open/floor/iron{
+ initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ },
+/area/awaymission/caves/research)
"da" = (
/obj/structure/barricade/wooden,
/turf/open/floor/plating/asteroid/basalt{
initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/BMP_asteroid)
+"db" = (
+/obj/structure/table,
+/obj/machinery/cell_charger,
+/obj/item/stock_parts/cell/crap,
+/turf/open/floor/iron{
+ initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ },
+/area/awaymission/caves/research)
"dc" = (
/obj/machinery/light/small{
dir = 8
@@ -963,6 +1068,29 @@
initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/BMP_asteroid/level_two)
+"dd" = (
+/obj/structure/closet/emcloset,
+/turf/open/floor/iron{
+ initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ },
+/area/awaymission/caves/research)
+"de" = (
+/obj/machinery/light,
+/turf/open/floor/iron{
+ initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ },
+/area/awaymission/caves/research)
+"df" = (
+/obj/structure/closet/secure_closet/miner{
+ name = "weapon equipment"
+ },
+/obj/item/grenade/syndieminibomb/concussion,
+/obj/item/grenade/syndieminibomb/concussion,
+/obj/item/grenade/syndieminibomb/concussion,
+/turf/open/floor/iron{
+ initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ },
+/area/awaymission/caves/research)
"dg" = (
/obj/effect/bump_teleporter{
id = "mineintrodown";
@@ -976,6 +1104,25 @@
/obj/machinery/door/airlock/external,
/turf/open/floor/plating,
/area/awaymission/caves/BMP_asteroid/level_two)
+"di" = (
+/obj/structure/table,
+/obj/item/paper/fluff/awaymissions/caves/magma,
+/obj/item/pen,
+/obj/effect/decal/cleanable/cobweb,
+/turf/open/floor/iron,
+/area/awaymission/caves/BMP_asteroid/level_two)
+"dj" = (
+/obj/structure/ladder/unbreakable{
+ height = 2;
+ id = "minedeep"
+ },
+/turf/open/floor/iron,
+/area/awaymission/caves/BMP_asteroid/level_two)
+"dk" = (
+/obj/structure/table,
+/obj/machinery/microwave,
+/turf/open/floor/iron,
+/area/awaymission/caves/BMP_asteroid/level_two)
"dl" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
@@ -984,12 +1131,63 @@
/obj/structure/spider/stickyweb,
/turf/open/floor/plating,
/area/awaymission/caves/BMP_asteroid/level_two)
+"dn" = (
+/obj/structure/chair{
+ dir = 1
+ },
+/turf/open/floor/iron,
+/area/awaymission/caves/BMP_asteroid/level_two)
+"do" = (
+/turf/open/floor/iron,
+/area/awaymission/caves/BMP_asteroid/level_two)
+"dp" = (
+/obj/structure/table,
+/obj/item/storage/box/donkpockets,
+/obj/item/clothing/glasses/meson,
+/turf/open/floor/iron,
+/area/awaymission/caves/BMP_asteroid/level_two)
+"dq" = (
+/obj/machinery/light/small/built{
+ dir = 4
+ },
+/obj/structure/spider/stickyweb,
+/turf/open/floor/iron,
+/area/awaymission/caves/BMP_asteroid/level_two)
+"dr" = (
+/obj/structure/spider/stickyweb,
+/turf/open/floor/iron,
+/area/awaymission/caves/BMP_asteroid/level_two)
+"ds" = (
+/obj/structure/closet/secure_closet/personal,
+/obj/item/pickaxe{
+ attack_verb = list("ineffectively hit");
+ desc = "A pickaxe thats been left to rust.";
+ force = 1;
+ name = "rusty pickaxe";
+ pixel_x = 5;
+ throwforce = 1
+ },
+/turf/open/floor/iron,
+/area/awaymission/caves/BMP_asteroid/level_two)
"dt" = (
/turf/closed/wall,
/area/awaymission/caves/northblock)
"du" = (
/turf/closed/wall/rust,
/area/awaymission/caves/northblock)
+"dv" = (
+/obj/machinery/suit_storage_unit/mining{
+ desc = "An industrial unit made to hold space suits. Age has seemed to rust the sliding door mechanisms, making it difficult to open.";
+ name = "rusted suit storage unit"
+ },
+/turf/open/floor/iron,
+/area/awaymission/caves/BMP_asteroid/level_two)
+"dw" = (
+/obj/structure/bed,
+/obj/item/bedsheet,
+/obj/effect/landmark/awaystart,
+/turf/open/floor/iron,
+/area/awaymission/caves/BMP_asteroid/level_two)
"dx" = (
/obj/structure/closet/secure_closet/personal,
/obj/effect/decal/cleanable/cobweb,
@@ -1064,6 +1262,26 @@
/obj/item/stack/sheet/iron,
/turf/open/floor/plating,
/area/awaymission/caves/northblock)
+"dM" = (
+/turf/open/floor/iron,
+/area/awaymission/caves/northblock)
+"dN" = (
+/obj/machinery/light/small{
+ dir = 1
+ },
+/turf/open/floor/iron,
+/area/awaymission/caves/northblock)
+"dO" = (
+/mob/living/simple_animal/hostile/retaliate/bat{
+ desc = "A rare breed of bat which roosts deep in caves.";
+ name = "Cave Bat"
+ },
+/turf/open/floor/iron,
+/area/awaymission/caves/northblock)
+"dP" = (
+/obj/item/stack/rods,
+/turf/open/floor/iron,
+/area/awaymission/caves/northblock)
"dQ" = (
/obj/machinery/door/airlock/mining{
name = "Dorm Access"
@@ -1073,6 +1291,14 @@
"dR" = (
/turf/open/floor/plating,
/area/awaymission/caves/northblock)
+"dS" = (
+/obj/machinery/light/small,
+/turf/open/floor/iron,
+/area/awaymission/caves/northblock)
+"dT" = (
+/obj/structure/spider/stickyweb,
+/turf/open/floor/iron,
+/area/awaymission/caves/northblock)
"dU" = (
/obj/structure/closet/crate/miningcar{
name = "Mining cart"
@@ -1137,6 +1363,16 @@
initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/BMP_asteroid)
+"eg" = (
+/obj/effect/decal/cleanable/robot_debris/old,
+/turf/open/floor/iron,
+/area/awaymission/caves/BMP_asteroid)
+"eh" = (
+/obj/structure/table,
+/obj/item/radio,
+/obj/item/radio,
+/turf/open/floor/iron,
+/area/awaymission/caves/BMP_asteroid)
"ei" = (
/obj/structure/table,
/obj/item/paper_bin,
@@ -1181,6 +1417,12 @@
initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/northblock)
+"eq" = (
+/obj/machinery/light{
+ dir = 8
+ },
+/turf/open/floor/iron,
+/area/awaymission/caves/BMP_asteroid)
"er" = (
/obj/structure/chair/stool,
/turf/open/floor/plating,
@@ -1205,18 +1447,190 @@
initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/BMP_asteroid)
+"ev" = (
+/turf/open/floor/iron,
+/area/awaymission/caves/BMP_asteroid)
+"ew" = (
+/obj/structure/table,
+/obj/item/mining_scanner,
+/obj/item/mining_scanner,
+/turf/open/floor/iron,
+/area/awaymission/caves/BMP_asteroid)
+"ex" = (
+/obj/structure/closet/secure_closet/miner,
+/obj/effect/decal/cleanable/cobweb,
+/obj/item/survivalcapsule,
+/obj/item/extinguisher/mini,
+/turf/open/floor/iron,
+/area/awaymission/caves/BMP_asteroid)
+"ey" = (
+/obj/structure/reagent_dispensers/watertank,
+/turf/open/floor/iron,
+/area/awaymission/caves/BMP_asteroid)
+"ez" = (
+/obj/machinery/light/small/built{
+ dir = 1
+ },
+/obj/machinery/suit_storage_unit/mining{
+ desc = "An industrial unit made to hold space suits. Age has seemed to rust the sliding door mechanisms, making it difficult to open.";
+ name = "rusted suit storage unit"
+ },
+/turf/open/floor/iron,
+/area/awaymission/caves/BMP_asteroid)
+"eA" = (
+/obj/structure/table,
+/obj/item/paper/fluff/awaymissions/caves/work_notice,
+/turf/open/floor/iron,
+/area/awaymission/caves/BMP_asteroid)
+"eB" = (
+/obj/structure/barricade/wooden,
+/turf/open/floor/iron,
+/area/awaymission/caves/BMP_asteroid)
+"eC" = (
+/obj/structure/table,
+/obj/item/gps/mining,
+/obj/item/gps/mining,
+/obj/item/clothing/glasses/meson,
+/obj/item/clothing/glasses/meson,
+/obj/item/clothing/glasses/meson,
+/turf/open/floor/iron,
+/area/awaymission/caves/BMP_asteroid)
+"eD" = (
+/obj/structure/closet/secure_closet/miner,
+/obj/item/survivalcapsule,
+/obj/item/extinguisher/mini,
+/turf/open/floor/iron,
+/area/awaymission/caves/BMP_asteroid)
+"eE" = (
+/obj/effect/landmark/awaystart,
+/turf/open/floor/iron,
+/area/awaymission/caves/BMP_asteroid)
"eF" = (
/turf/closed/wall,
/area/awaymission/caves/listeningpost)
"eG" = (
/turf/closed/wall/rust,
/area/awaymission/caves/listeningpost)
+"eH" = (
+/obj/machinery/vending/sustenance,
+/turf/open/floor/iron,
+/area/awaymission/caves/BMP_asteroid)
+"eI" = (
+/obj/structure/closet/crate/trashcart,
+/obj/item/switchblade,
+/obj/item/switchblade,
+/turf/open/floor/iron,
+/area/awaymission/caves/listeningpost)
+"eJ" = (
+/turf/open/floor/iron,
+/area/awaymission/caves/listeningpost)
+"eK" = (
+/obj/structure/table,
+/obj/item/gun/energy/kinetic_accelerator,
+/obj/item/gun/energy/kinetic_accelerator,
+/obj/effect/decal/cleanable/cobweb/cobweb2,
+/turf/open/floor/iron,
+/area/awaymission/caves/listeningpost)
+"eL" = (
+/obj/machinery/vending/sovietsoda,
+/turf/open/floor/iron,
+/area/awaymission/caves/BMP_asteroid)
+"eM" = (
+/obj/machinery/light/small{
+ dir = 8
+ },
+/obj/structure/table,
+/obj/item/storage/toolbox/electrical,
+/obj/item/multitool,
+/turf/open/floor/iron,
+/area/awaymission/caves/listeningpost)
+"eN" = (
+/obj/effect/decal/cleanable/oil,
+/turf/open/floor/iron,
+/area/awaymission/caves/listeningpost)
+"eO" = (
+/obj/effect/landmark/awaystart,
+/turf/open/floor/iron,
+/area/awaymission/caves/listeningpost)
+"eP" = (
+/obj/structure/table,
+/obj/item/pickaxe{
+ attack_verb = list("ineffectively hit");
+ desc = "A pickaxe thats been left to rust.";
+ force = 1;
+ name = "rusty pickaxe";
+ pixel_x = 5;
+ throwforce = 1
+ },
+/obj/item/pickaxe{
+ attack_verb = list("ineffectively hit");
+ desc = "A pickaxe thats been left to rust.";
+ force = 1;
+ name = "rusty pickaxe";
+ pixel_x = 5;
+ throwforce = 1
+ },
+/turf/open/floor/iron,
+/area/awaymission/caves/listeningpost)
"eQ" = (
/obj/machinery/mineral/mint,
/turf/open/floor/plating/asteroid/basalt{
initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/BMP_asteroid)
+"eR" = (
+/obj/structure/reagent_dispensers/fueltank,
+/turf/open/floor/iron,
+/area/awaymission/caves/BMP_asteroid)
+"eS" = (
+/obj/machinery/light/small/built,
+/obj/machinery/suit_storage_unit/mining{
+ desc = "An industrial unit made to hold space suits. Age has seemed to rust the sliding door mechanisms, making it difficult to open.";
+ name = "rusted suit storage unit"
+ },
+/turf/open/floor/iron,
+/area/awaymission/caves/BMP_asteroid)
+"eT" = (
+/obj/structure/closet/emcloset,
+/turf/open/floor/iron,
+/area/awaymission/caves/BMP_asteroid)
+"eU" = (
+/obj/structure/table,
+/obj/item/storage/toolbox/mechanical,
+/obj/item/storage/toolbox/mechanical,
+/turf/open/floor/iron,
+/area/awaymission/caves/listeningpost)
+"eV" = (
+/obj/structure/closet/crate/bin,
+/turf/open/floor/iron,
+/area/awaymission/caves/listeningpost)
+"eW" = (
+/obj/structure/barricade/wooden,
+/turf/open/floor/iron,
+/area/awaymission/caves/listeningpost)
+"eX" = (
+/obj/structure/table,
+/obj/item/paper/pamphlet/gateway,
+/turf/open/floor/iron,
+/area/awaymission/caves/listeningpost)
+"eY" = (
+/obj/structure/table,
+/turf/open/floor/iron,
+/area/awaymission/caves/listeningpost)
+"eZ" = (
+/obj/machinery/light{
+ dir = 1
+ },
+/turf/open/floor/iron,
+/area/awaymission/caves/listeningpost)
+"fa" = (
+/obj/structure/noticeboard{
+ pixel_y = 32
+ },
+/obj/item/paper/fluff/awaymissions/caves/shipment_notice,
+/obj/item/paper/fluff/awaymissions/caves/safety_notice,
+/turf/open/floor/iron,
+/area/awaymission/caves/listeningpost)
"fb" = (
/obj/structure/spawner/mining/hivelord,
/turf/open/floor/plating/asteroid/basalt{
@@ -1327,6 +1741,37 @@
initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/BMP_asteroid)
+"fq" = (
+/obj/structure/bed,
+/obj/effect/decal/cleanable/cobweb,
+/turf/open/floor/iron,
+/area/awaymission/caves/BMP_asteroid)
+"fr" = (
+/obj/machinery/light/small/built{
+ dir = 1
+ },
+/obj/structure/spider/stickyweb,
+/mob/living/simple_animal/hostile/poison/giant_spider/hunter,
+/turf/open/floor/iron,
+/area/awaymission/caves/BMP_asteroid)
+"fs" = (
+/obj/structure/table,
+/obj/item/storage/firstaid/regular,
+/turf/open/floor/iron,
+/area/awaymission/caves/BMP_asteroid)
+"ft" = (
+/obj/structure/table,
+/obj/item/storage/firstaid/fire,
+/obj/item/storage/firstaid/fire,
+/obj/structure/spider/stickyweb,
+/turf/open/floor/iron,
+/area/awaymission/caves/BMP_asteroid)
+"fu" = (
+/obj/structure/table,
+/obj/item/storage/firstaid/brute,
+/obj/item/reagent_containers/blood/OPlus,
+/turf/open/floor/iron,
+/area/awaymission/caves/BMP_asteroid)
"fv" = (
/obj/structure/glowshroom/single,
/turf/open/floor/plating/asteroid/basalt{
@@ -1359,6 +1804,26 @@
initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/BMP_asteroid)
+"fA" = (
+/obj/structure/bed,
+/turf/open/floor/iron,
+/area/awaymission/caves/BMP_asteroid)
+"fB" = (
+/obj/structure/spider/stickyweb,
+/turf/open/floor/iron,
+/area/awaymission/caves/BMP_asteroid)
+"fC" = (
+/mob/living/simple_animal/hostile/poison/giant_spider/hunter,
+/turf/open/floor/iron,
+/area/awaymission/caves/BMP_asteroid)
+"fD" = (
+/obj/structure/spider/stickyweb,
+/obj/machinery/sleeper{
+ dir = 8
+ },
+/mob/living/simple_animal/hostile/poison/giant_spider/hunter,
+/turf/open/floor/iron,
+/area/awaymission/caves/BMP_asteroid)
"fE" = (
/obj/machinery/light/small,
/turf/open/floor/plating/asteroid/basalt{
@@ -1371,6 +1836,13 @@
initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/BMP_asteroid/level_two)
+"fG" = (
+/obj/machinery/door/airlock/medical{
+ name = "Medical"
+ },
+/obj/structure/barricade/wooden,
+/turf/open/floor/iron,
+/area/awaymission/caves/BMP_asteroid)
"fH" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
@@ -1387,10 +1859,34 @@
/obj/structure/grille,
/turf/open/floor/plating,
/area/awaymission/caves/BMP_asteroid)
+"fK" = (
+/obj/effect/decal/cleanable/cobweb,
+/turf/open/floor/iron,
+/area/awaymission/caves/BMP_asteroid)
+"fL" = (
+/obj/structure/sign/departments/examroom{
+ pixel_y = 32
+ },
+/turf/open/floor/iron,
+/area/awaymission/caves/BMP_asteroid)
+"fM" = (
+/obj/machinery/light/small{
+ dir = 1
+ },
+/turf/open/floor/iron,
+/area/awaymission/caves/BMP_asteroid)
"fN" = (
/obj/machinery/door/airlock/external,
/turf/open/floor/plating,
/area/awaymission/caves/BMP_asteroid)
+"fO" = (
+/obj/machinery/light/small{
+ dir = 4
+ },
+/turf/open/floor/iron/dark{
+ initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ },
+/area/awaymission/caves/BMP_asteroid)
"fP" = (
/obj/structure/grille,
/turf/open/floor/plating/asteroid/basalt{
@@ -1404,6 +1900,17 @@
initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/BMP_asteroid/level_two)
+"fS" = (
+/obj/structure/table,
+/obj/item/storage/firstaid/toxin,
+/obj/item/storage/firstaid/toxin,
+/obj/item/reagent_containers/blood/OPlus,
+/turf/open/floor/iron,
+/area/awaymission/caves/BMP_asteroid)
+"fT" = (
+/obj/machinery/iv_drip,
+/turf/open/floor/iron,
+/area/awaymission/caves/BMP_asteroid)
"fW" = (
/obj/structure/girder,
/turf/open/floor/plating{
@@ -1429,6 +1936,11 @@
initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/BMP_asteroid/level_two)
+"fY" = (
+/obj/structure/table,
+/obj/machinery/microwave,
+/turf/open/floor/iron,
+/area/awaymission/caves/BMP_asteroid)
"ga" = (
/obj/structure/ladder/unbreakable{
height = 2;
@@ -1438,6 +1950,10 @@
initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/BMP_asteroid)
+"gb" = (
+/obj/structure/closet/secure_closet/freezer/kitchen,
+/turf/open/floor/iron,
+/area/awaymission/caves/BMP_asteroid)
"gc" = (
/obj/item/stack/rods,
/turf/open/floor/plating{
@@ -1461,6 +1977,11 @@
initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/BMP_asteroid)
+"gf" = (
+/obj/structure/table/reinforced,
+/obj/item/reagent_containers/food/drinks/drinkingglass,
+/turf/open/floor/iron,
+/area/awaymission/caves/BMP_asteroid)
"gg" = (
/obj/structure/table/reinforced,
/obj/item/storage/box/donkpockets,
@@ -1481,12 +2002,26 @@
initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/BMP_asteroid)
+"gj" = (
+/obj/machinery/door/airlock/mining{
+ name = "Kitchen"
+ },
+/turf/open/floor/iron,
+/area/awaymission/caves/BMP_asteroid)
"gk" = (
/obj/effect/landmark/awaystart,
/turf/open/floor/plating/asteroid/basalt{
initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/BMP_asteroid/level_two)
+"gl" = (
+/obj/item/trash/plate,
+/turf/open/floor/iron,
+/area/awaymission/caves/BMP_asteroid)
+"gm" = (
+/obj/effect/decal/cleanable/blood/old,
+/turf/open/floor/iron,
+/area/awaymission/caves/BMP_asteroid)
"gn" = (
/obj/item/grown/log,
/turf/open/floor/plating/asteroid/basalt{
@@ -1505,30 +2040,111 @@
initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/BMP_asteroid)
+"gq" = (
+/obj/structure/chair/stool,
+/turf/open/floor/iron,
+/area/awaymission/caves/BMP_asteroid)
+"gr" = (
+/obj/structure/table,
+/obj/item/kitchen/fork,
+/turf/open/floor/iron,
+/area/awaymission/caves/BMP_asteroid)
"gs" = (
/obj/item/assembly/igniter,
/turf/open/floor/plating/asteroid/basalt{
initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/BMP_asteroid/level_two)
+"gt" = (
+/obj/structure/table_frame,
+/obj/item/stack/sheet/iron,
+/turf/open/floor/iron,
+/area/awaymission/caves/BMP_asteroid)
+"gu" = (
+/obj/item/stack/rods,
+/turf/open/floor/iron,
+/area/awaymission/caves/BMP_asteroid)
+"gv" = (
+/obj/structure/table_frame,
+/turf/open/floor/iron,
+/area/awaymission/caves/BMP_asteroid)
+"gw" = (
+/obj/structure/reagent_dispensers/beerkeg,
+/turf/open/floor/iron,
+/area/awaymission/caves/BMP_asteroid)
+"gx" = (
+/obj/structure/table,
+/obj/item/kitchen/fork,
+/obj/item/trash/plate,
+/turf/open/floor/iron,
+/area/awaymission/caves/BMP_asteroid)
+"gy" = (
+/obj/item/reagent_containers/food/drinks/drinkingglass,
+/turf/open/floor/iron,
+/area/awaymission/caves/BMP_asteroid)
"gz" = (
/obj/machinery/door/airlock/external{
name = "Mess Hall"
},
/turf/open/floor/plating,
/area/awaymission/caves/BMP_asteroid)
+"gA" = (
+/obj/machinery/light/small{
+ dir = 1
+ },
+/turf/open/floor/iron/dark{
+ initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ },
+/area/awaymission/caves/BMP_asteroid)
+"gB" = (
+/obj/machinery/mech_bay_recharge_port,
+/turf/open/floor/iron{
+ initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ },
+/area/awaymission/caves/BMP_asteroid)
"gD" = (
/obj/structure/spawner/mining/hivelord,
/turf/open/floor/plating/asteroid/basalt{
initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/BMP_asteroid)
+"gE" = (
+/obj/machinery/light/small{
+ dir = 4
+ },
+/turf/open/floor/iron{
+ initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ },
+/area/awaymission/caves/BMP_asteroid)
+"gF" = (
+/obj/structure/table,
+/obj/item/storage/toolbox/mechanical,
+/obj/item/clothing/glasses/material,
+/turf/open/floor/iron{
+ initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ },
+/area/awaymission/caves/BMP_asteroid)
+"gG" = (
+/obj/structure/mecha_wreckage/durand,
+/turf/open/floor/iron/recharge_floor,
+/area/awaymission/caves/BMP_asteroid)
"gH" = (
/obj/structure/table,
/obj/item/mecha_parts/mecha_equipment/drill/diamonddrill,
/obj/item/paper/fluff/awaymissions/caves/mech_notice,
/turf/open/floor/plating,
/area/awaymission/caves/BMP_asteroid)
+"gI" = (
+/obj/structure/chair/stool,
+/turf/open/floor/iron{
+ initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ },
+/area/awaymission/caves/BMP_asteroid)
+"gJ" = (
+/turf/open/floor/iron{
+ initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ },
+/area/awaymission/caves/BMP_asteroid)
"gK" = (
/obj/structure/girder,
/turf/open/floor/plating,
@@ -1537,6 +2153,28 @@
/obj/item/stack/rods,
/turf/open/floor/plating,
/area/awaymission/caves/BMP_asteroid)
+"gM" = (
+/obj/structure/mecha_wreckage/ripley,
+/turf/open/floor/iron/recharge_floor,
+/area/awaymission/caves/BMP_asteroid)
+"gN" = (
+/obj/structure/holohoop,
+/turf/open/floor/iron/dark{
+ initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ },
+/area/awaymission/caves/BMP_asteroid)
+"gO" = (
+/obj/structure/closet/emcloset,
+/turf/open/floor/iron{
+ initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ },
+/area/awaymission/caves/BMP_asteroid)
+"gP" = (
+/obj/item/toy/beach_ball/holoball,
+/turf/open/floor/iron/dark{
+ initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ },
+/area/awaymission/caves/BMP_asteroid)
"gQ" = (
/obj/structure/spawner/mining/basilisk,
/turf/open/floor/plating/asteroid/basalt{
@@ -1555,6 +2193,14 @@
},
/turf/open/floor/plating,
/area/awaymission/caves/BMP_asteroid)
+"gU" = (
+/obj/structure/holohoop{
+ dir = 1
+ },
+/turf/open/floor/iron/dark{
+ initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ },
+/area/awaymission/caves/BMP_asteroid)
"gV" = (
/obj/effect/mine/explosive{
desc = "Rusted mines planted out by the miners before, probably to keep the cave monsters at bay.";
@@ -1588,669 +2234,23 @@
/obj/effect/baseturf_helper/asteroid/basalt,
/turf/closed/wall,
/area/awaymission/caves/northblock)
-"hr" = (
-/obj/machinery/vending/sustenance,
-/turf/open/floor/iron,
-/area/awaymission/caves/BMP_asteroid)
-"hK" = (
-/obj/structure/spider/stickyweb,
-/turf/open/floor/iron,
-/area/awaymission/caves/BMP_asteroid)
-"il" = (
-/obj/structure/table,
-/obj/machinery/microwave,
-/turf/open/floor/iron,
-/area/awaymission/caves/BMP_asteroid)
-"io" = (
-/obj/structure/closet/crate/trashcart,
-/obj/item/switchblade,
-/obj/item/switchblade,
-/turf/open/floor/iron,
-/area/awaymission/caves/listeningpost)
-"iM" = (
-/turf/open/floor/iron,
-/area/awaymission/caves/northblock)
-"jc" = (
-/obj/structure/reagent_dispensers/watertank,
-/turf/open/floor/iron,
-/area/awaymission/caves/BMP_asteroid)
-"jg" = (
-/obj/machinery/light,
-/turf/open/floor/iron{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
- },
-/area/awaymission/caves/research)
-"jI" = (
-/obj/structure/glowshroom/single,
-/turf/open/floor/iron{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
- },
-/area/awaymission/caves/research)
-"kh" = (
-/obj/machinery/light/small/built{
- dir = 1
- },
-/obj/machinery/suit_storage_unit/mining{
- desc = "An industrial unit made to hold space suits. Age has seemed to rust the sliding door mechanisms, making it difficult to open.";
- name = "rusted suit storage unit"
- },
-/turf/open/floor/iron,
-/area/awaymission/caves/BMP_asteroid)
-"kI" = (
-/obj/machinery/door/airlock/mining{
- name = "Kitchen"
- },
-/turf/open/floor/iron,
-/area/awaymission/caves/BMP_asteroid)
-"kP" = (
-/obj/machinery/light/small{
- dir = 4
- },
-/turf/open/floor/iron{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
- },
-/area/awaymission/caves/BMP_asteroid)
-"lp" = (
-/obj/structure/closet/secure_closet/miner{
- name = "weapon equipment"
- },
-/obj/item/grenade/syndieminibomb/concussion,
-/obj/item/grenade/syndieminibomb/concussion,
-/obj/item/grenade/syndieminibomb/concussion,
-/turf/open/floor/iron{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
- },
-/area/awaymission/caves/research)
-"lI" = (
-/obj/structure/table_frame,
-/obj/item/stack/sheet/iron,
-/turf/open/floor/iron,
-/area/awaymission/caves/BMP_asteroid)
-"lZ" = (
-/obj/structure/table,
-/obj/item/storage/firstaid/brute,
-/obj/item/reagent_containers/blood/OPlus,
-/turf/open/floor/iron,
-/area/awaymission/caves/BMP_asteroid)
-"ml" = (
-/obj/structure/holohoop{
- dir = 1
- },
-/turf/open/floor/iron/dark{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
- },
-/area/awaymission/caves/BMP_asteroid)
-"mV" = (
-/obj/structure/table,
-/obj/item/storage/box/donkpockets,
-/obj/item/clothing/glasses/meson,
-/turf/open/floor/iron,
-/area/awaymission/caves/BMP_asteroid/level_two)
-"oD" = (
-/obj/effect/landmark/awaystart,
-/turf/open/floor/iron,
-/area/awaymission/caves/listeningpost)
-"oK" = (
-/obj/structure/chair{
- dir = 1
- },
-/turf/open/floor/iron,
-/area/awaymission/caves/BMP_asteroid/level_two)
-"oX" = (
-/obj/structure/spider/stickyweb,
-/obj/machinery/sleeper{
- dir = 8
- },
-/mob/living/simple_animal/hostile/poison/giant_spider/hunter,
-/turf/open/floor/iron,
-/area/awaymission/caves/BMP_asteroid)
-"pp" = (
-/obj/structure/closet/emcloset,
-/turf/open/floor/iron{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
- },
-/area/awaymission/caves/BMP_asteroid)
-"qg" = (
-/obj/machinery/light/small{
- dir = 4
- },
-/turf/open/floor/iron/dark{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
- },
-/area/awaymission/caves/BMP_asteroid)
-"qi" = (
-/obj/structure/sign/departments/examroom{
- pixel_y = 32
- },
-/turf/open/floor/iron,
-/area/awaymission/caves/BMP_asteroid)
-"qB" = (
-/obj/effect/decal/cleanable/oil,
-/turf/open/floor/iron,
-/area/awaymission/caves/listeningpost)
-"qC" = (
-/obj/structure/table,
-/turf/open/floor/iron{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
- },
-/area/awaymission/caves/research)
-"qG" = (
-/obj/machinery/mech_bay_recharge_port,
-/turf/open/floor/iron{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
- },
-/area/awaymission/caves/BMP_asteroid)
-"qO" = (
-/turf/open/floor/iron,
-/area/awaymission/caves/listeningpost)
-"rm" = (
-/obj/structure/table,
-/obj/item/storage/toolbox/mechanical,
-/obj/item/storage/toolbox/mechanical,
-/turf/open/floor/iron,
-/area/awaymission/caves/listeningpost)
-"sm" = (
-/obj/structure/table_frame,
-/turf/open/floor/iron,
-/area/awaymission/caves/BMP_asteroid)
-"sq" = (
-/obj/machinery/light/small{
- dir = 1
- },
-/turf/open/floor/iron,
-/area/awaymission/caves/BMP_asteroid)
-"sJ" = (
-/obj/structure/reagent_dispensers/fueltank,
-/turf/open/floor/iron,
-/area/awaymission/caves/BMP_asteroid)
-"sT" = (
-/obj/structure/table,
-/obj/item/pickaxe{
- attack_verb = list("ineffectively hit");
- desc = "A pickaxe thats been left to rust.";
- force = 1;
- name = "rusty pickaxe";
- pixel_x = 5;
- throwforce = 1
- },
-/obj/item/pickaxe{
- attack_verb = list("ineffectively hit");
- desc = "A pickaxe thats been left to rust.";
- force = 1;
- name = "rusty pickaxe";
- pixel_x = 5;
- throwforce = 1
- },
-/turf/open/floor/iron,
-/area/awaymission/caves/listeningpost)
-"ti" = (
-/obj/structure/table,
-/obj/item/kitchen/fork,
-/obj/item/trash/plate,
-/turf/open/floor/iron,
-/area/awaymission/caves/BMP_asteroid)
-"uh" = (
-/obj/structure/table,
-/obj/item/storage/firstaid/fire,
-/obj/item/storage/firstaid/fire,
-/obj/structure/spider/stickyweb,
-/turf/open/floor/iron,
-/area/awaymission/caves/BMP_asteroid)
-"vn" = (
-/obj/machinery/light{
- dir = 1
- },
-/obj/structure/filingcabinet,
-/obj/item/paper/fluff/awaymissions/caves/omega,
-/turf/open/floor/iron{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
- },
-/area/awaymission/caves/research)
-"vr" = (
-/obj/vehicle/sealed/mecha/working/ripley/mining,
-/turf/open/floor/iron/recharge_floor,
-/area/awaymission/caves/BMP_asteroid)
-"vQ" = (
-/obj/structure/table,
-/obj/machinery/cell_charger,
-/obj/item/stock_parts/cell/crap,
-/turf/open/floor/iron{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
- },
-/area/awaymission/caves/research)
-"wG" = (
-/obj/structure/closet/emcloset,
-/turf/open/floor/iron{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
- },
-/area/awaymission/caves/research)
-"wO" = (
-/obj/structure/noticeboard{
- pixel_y = 32
- },
-/obj/item/paper/fluff/awaymissions/caves/shipment_notice,
-/obj/item/paper/fluff/awaymissions/caves/safety_notice,
-/turf/open/floor/iron,
-/area/awaymission/caves/listeningpost)
-"xi" = (
-/obj/structure/barricade/wooden,
-/turf/open/floor/iron,
-/area/awaymission/caves/BMP_asteroid)
-"xx" = (
-/obj/machinery/light/small/built{
- dir = 4
- },
-/obj/structure/spider/stickyweb,
-/turf/open/floor/iron,
-/area/awaymission/caves/BMP_asteroid/level_two)
-"xF" = (
-/obj/structure/reagent_dispensers/beerkeg,
-/turf/open/floor/iron,
-/area/awaymission/caves/BMP_asteroid)
-"yf" = (
-/turf/open/floor/iron/dark{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
- },
-/area/awaymission/caves/BMP_asteroid)
-"yo" = (
-/obj/item/stack/rods,
-/turf/open/floor/iron,
-/area/awaymission/caves/BMP_asteroid)
-"yt" = (
-/obj/structure/spider/stickyweb,
-/turf/open/floor/iron,
-/area/awaymission/caves/BMP_asteroid/level_two)
-"yD" = (
-/obj/structure/chair/stool,
-/turf/open/floor/iron,
-/area/awaymission/caves/BMP_asteroid)
-"zf" = (
-/obj/structure/table,
-/obj/item/paper/fluff/awaymissions/caves/magma,
-/obj/item/pen,
-/obj/effect/decal/cleanable/cobweb,
-/turf/open/floor/iron,
-/area/awaymission/caves/BMP_asteroid/level_two)
-"zg" = (
-/obj/structure/table,
-/obj/item/storage/firstaid/regular,
-/turf/open/floor/iron,
-/area/awaymission/caves/BMP_asteroid)
-"zH" = (
-/obj/structure/closet/crate/bin,
-/turf/open/floor/iron,
-/area/awaymission/caves/listeningpost)
-"zI" = (
-/turf/open/floor/iron,
-/area/awaymission/caves/BMP_asteroid/level_two)
-"zN" = (
-/obj/item/stack/rods,
-/turf/open/floor/iron,
-/area/awaymission/caves/northblock)
-"Ak" = (
-/obj/structure/table,
-/obj/item/storage/firstaid/toxin,
-/obj/item/storage/firstaid/toxin,
-/obj/item/reagent_containers/blood/OPlus,
-/turf/open/floor/iron,
-/area/awaymission/caves/BMP_asteroid)
-"Bj" = (
-/obj/structure/table,
-/obj/item/gps/mining,
-/obj/item/gps/mining,
-/obj/item/clothing/glasses/meson,
-/obj/item/clothing/glasses/meson,
-/obj/item/clothing/glasses/meson,
-/turf/open/floor/iron,
-/area/awaymission/caves/BMP_asteroid)
-"Bm" = (
-/obj/structure/bed,
-/turf/open/floor/iron,
-/area/awaymission/caves/BMP_asteroid)
-"Br" = (
+"Eb" = (
/obj/effect/landmark/awaystart,
-/turf/open/floor/iron,
-/area/awaymission/caves/BMP_asteroid)
-"BA" = (
-/obj/structure/closet/secure_closet/personal,
-/obj/item/pickaxe{
- attack_verb = list("ineffectively hit");
- desc = "A pickaxe thats been left to rust.";
- force = 1;
- name = "rusty pickaxe";
- pixel_x = 5;
- throwforce = 1
- },
-/turf/open/floor/iron,
-/area/awaymission/caves/BMP_asteroid/level_two)
-"BW" = (
-/obj/structure/table,
-/obj/item/storage/toolbox/mechanical,
-/obj/item/clothing/glasses/material,
-/turf/open/floor/iron{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
- },
-/area/awaymission/caves/BMP_asteroid)
-"Ca" = (
-/obj/item/trash/plate,
-/turf/open/floor/iron,
-/area/awaymission/caves/BMP_asteroid)
-"Cv" = (
-/obj/effect/decal/remains/human,
-/turf/open/floor/iron{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
- },
-/area/awaymission/caves/research)
-"Dk" = (
-/turf/open/floor/iron{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
- },
-/area/awaymission/caves/research)
-"Em" = (
-/obj/machinery/light/small{
- dir = 1
- },
-/turf/open/floor/iron/dark{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
- },
-/area/awaymission/caves/BMP_asteroid)
-"Ex" = (
-/obj/structure/barricade/wooden,
-/turf/open/floor/iron,
-/area/awaymission/caves/listeningpost)
-"EN" = (
-/mob/living/simple_animal/hostile/retaliate/bat{
- desc = "A rare breed of bat which roosts deep in caves.";
- name = "Cave Bat"
- },
-/turf/open/floor/iron,
-/area/awaymission/caves/northblock)
-"FA" = (
-/obj/structure/table,
-/turf/open/floor/iron,
-/area/awaymission/caves/listeningpost)
-"Gp" = (
-/obj/structure/table,
-/obj/item/paper/fluff/awaymissions/caves/work_notice,
-/turf/open/floor/iron,
-/area/awaymission/caves/BMP_asteroid)
-"He" = (
-/obj/machinery/iv_drip,
-/turf/open/floor/iron,
-/area/awaymission/caves/BMP_asteroid)
-"Ib" = (
-/obj/structure/holohoop,
-/turf/open/floor/iron/dark{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
- },
-/area/awaymission/caves/BMP_asteroid)
-"Id" = (
-/obj/effect/decal/cleanable/blood/old,
-/turf/open/floor/iron,
-/area/awaymission/caves/BMP_asteroid)
-"IS" = (
-/obj/effect/decal/cleanable/blood/gibs,
-/turf/open/floor/iron{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
- },
-/area/awaymission/caves/research)
-"JH" = (
-/obj/machinery/door/airlock/medical{
- name = "Medical"
- },
-/obj/structure/barricade/wooden,
-/turf/open/floor/iron,
-/area/awaymission/caves/BMP_asteroid)
-"JM" = (
-/obj/structure/closet/secure_closet/freezer/kitchen,
-/turf/open/floor/iron,
-/area/awaymission/caves/BMP_asteroid)
-"Kb" = (
-/mob/living/simple_animal/hostile/poison/giant_spider/hunter,
-/turf/open/floor/iron,
-/area/awaymission/caves/BMP_asteroid)
-"Kd" = (
-/turf/open/floor/iron/elevatorshaft{
+/turf/open/floor/plating/elevatorshaft{
initial_gas_mix = "n2=23;o2=14;TEMP=2.7";
name = "elevator flooring"
},
/area/awaymission/caves/BMP_asteroid)
-"Kr" = (
-/obj/structure/closet/emcloset,
-/turf/open/floor/iron,
-/area/awaymission/caves/BMP_asteroid)
-"KG" = (
-/obj/machinery/suit_storage_unit/mining{
- desc = "An industrial unit made to hold space suits. Age has seemed to rust the sliding door mechanisms, making it difficult to open.";
- name = "rusted suit storage unit"
- },
-/turf/open/floor/iron,
-/area/awaymission/caves/BMP_asteroid/level_two)
-"Lc" = (
-/obj/structure/sign/warning/vacuum{
- name = "\improper LOW AIR AREA";
- pixel_x = 32
- },
-/obj/item/stack/rods,
-/turf/open/floor/iron{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
- },
-/area/awaymission/caves/research)
-"Lv" = (
-/obj/structure/closet/secure_closet/miner,
-/obj/item/survivalcapsule,
-/obj/item/extinguisher/mini,
-/turf/open/floor/iron,
-/area/awaymission/caves/BMP_asteroid)
-"My" = (
-/obj/machinery/light/small{
- dir = 8
- },
-/obj/structure/table,
-/obj/item/storage/toolbox/electrical,
-/obj/item/multitool,
-/turf/open/floor/iron,
-/area/awaymission/caves/listeningpost)
-"MG" = (
-/obj/effect/decal/cleanable/cobweb,
-/turf/open/floor/iron,
-/area/awaymission/caves/BMP_asteroid)
-"NB" = (
-/obj/structure/table,
-/obj/item/radio,
-/obj/item/radio,
-/turf/open/floor/iron,
-/area/awaymission/caves/BMP_asteroid)
-"NX" = (
-/obj/item/toy/beach_ball/holoball,
-/turf/open/floor/iron/dark{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
- },
-/area/awaymission/caves/BMP_asteroid)
-"NY" = (
-/obj/structure/spider/stickyweb,
-/turf/open/floor/iron,
-/area/awaymission/caves/northblock)
-"Ou" = (
-/obj/structure/bed,
-/obj/effect/decal/cleanable/cobweb,
-/turf/open/floor/iron,
-/area/awaymission/caves/BMP_asteroid)
-"Ov" = (
-/obj/machinery/vending/sovietsoda,
-/turf/open/floor/iron,
-/area/awaymission/caves/BMP_asteroid)
-"PF" = (
-/obj/structure/table,
-/obj/item/gun/energy/kinetic_accelerator,
-/obj/item/gun/energy/kinetic_accelerator,
-/obj/effect/decal/cleanable/cobweb/cobweb2,
-/turf/open/floor/iron,
-/area/awaymission/caves/listeningpost)
-"QM" = (
-/obj/structure/table,
-/obj/item/melee/baton,
-/turf/open/floor/iron{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
- },
-/area/awaymission/caves/research)
-"QW" = (
-/obj/structure/table,
-/obj/item/mining_scanner,
-/obj/item/mining_scanner,
-/turf/open/floor/iron,
-/area/awaymission/caves/BMP_asteroid)
-"Rr" = (
-/obj/machinery/light/small{
- dir = 1
- },
-/turf/open/floor/iron,
-/area/awaymission/caves/northblock)
-"RG" = (
-/obj/structure/bed,
-/obj/item/bedsheet,
-/obj/effect/landmark/awaystart,
-/turf/open/floor/iron,
-/area/awaymission/caves/BMP_asteroid/level_two)
-"RM" = (
-/obj/structure/mecha_wreckage/ripley,
+"KD" = (
+/obj/vehicle/sealed/mecha/working/ripley/mining,
/turf/open/floor/iron/recharge_floor,
/area/awaymission/caves/BMP_asteroid)
-"RZ" = (
-/obj/machinery/light{
- dir = 8
- },
-/turf/open/floor/iron,
-/area/awaymission/caves/BMP_asteroid)
-"Sn" = (
-/obj/structure/table/reinforced,
-/obj/item/reagent_containers/food/drinks/drinkingglass,
-/turf/open/floor/iron,
-/area/awaymission/caves/BMP_asteroid)
-"SZ" = (
-/obj/effect/decal/cleanable/blood/old,
-/turf/open/floor/iron{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
- },
-/area/awaymission/caves/research)
-"Tc" = (
-/obj/item/reagent_containers/food/drinks/drinkingglass,
-/turf/open/floor/iron,
-/area/awaymission/caves/BMP_asteroid)
-"TC" = (
-/turf/open/floor/iron/dark{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
- },
-/area/awaymission/caves/BMP_asteroid/level_two)
-"TU" = (
-/obj/structure/closet/secure_closet/miner,
-/obj/effect/decal/cleanable/cobweb,
-/obj/item/survivalcapsule,
-/obj/item/extinguisher/mini,
-/turf/open/floor/iron,
-/area/awaymission/caves/BMP_asteroid)
-"Ue" = (
-/obj/effect/landmark/awaystart,
-/turf/open/floor/iron/elevatorshaft{
+"SX" = (
+/turf/open/floor/plating/elevatorshaft{
initial_gas_mix = "n2=23;o2=14;TEMP=2.7";
name = "elevator flooring"
},
/area/awaymission/caves/BMP_asteroid)
-"Uu" = (
-/obj/structure/chair/stool,
-/turf/open/floor/iron{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
- },
-/area/awaymission/caves/BMP_asteroid)
-"UE" = (
-/obj/structure/ladder/unbreakable{
- height = 2;
- id = "minedeep"
- },
-/turf/open/floor/iron,
-/area/awaymission/caves/BMP_asteroid/level_two)
-"Vl" = (
-/obj/machinery/light{
- dir = 1
- },
-/turf/open/floor/iron,
-/area/awaymission/caves/listeningpost)
-"Vq" = (
-/obj/structure/table,
-/obj/machinery/microwave,
-/turf/open/floor/iron,
-/area/awaymission/caves/BMP_asteroid/level_two)
-"Vt" = (
-/obj/machinery/light/small/built,
-/obj/machinery/suit_storage_unit/mining{
- desc = "An industrial unit made to hold space suits. Age has seemed to rust the sliding door mechanisms, making it difficult to open.";
- name = "rusted suit storage unit"
- },
-/turf/open/floor/iron,
-/area/awaymission/caves/BMP_asteroid)
-"VA" = (
-/obj/structure/table,
-/obj/item/restraints/handcuffs/cable,
-/obj/item/restraints/handcuffs/cable,
-/turf/open/floor/iron{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
- },
-/area/awaymission/caves/research)
-"VV" = (
-/obj/structure/mecha_wreckage/durand,
-/turf/open/floor/iron/recharge_floor,
-/area/awaymission/caves/BMP_asteroid)
-"WK" = (
-/obj/machinery/light/small,
-/turf/open/floor/iron,
-/area/awaymission/caves/northblock)
-"WR" = (
-/obj/structure/table,
-/obj/item/paper/pamphlet/gateway,
-/turf/open/floor/iron,
-/area/awaymission/caves/listeningpost)
-"XG" = (
-/obj/structure/table,
-/obj/item/kitchen/fork,
-/turf/open/floor/iron,
-/area/awaymission/caves/BMP_asteroid)
-"XJ" = (
-/obj/effect/decal/cleanable/robot_debris/old,
-/turf/open/floor/iron,
-/area/awaymission/caves/BMP_asteroid)
-"XX" = (
-/obj/item/shard,
-/obj/item/stack/rods,
-/obj/effect/decal/cleanable/blood/old,
-/turf/open/floor/iron{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
- },
-/area/awaymission/caves/research)
-"Yn" = (
-/turf/open/floor/iron,
-/area/awaymission/caves/BMP_asteroid)
-"YU" = (
-/obj/machinery/light/small/built{
- dir = 1
- },
-/obj/structure/spider/stickyweb,
-/mob/living/simple_animal/hostile/poison/giant_spider/hunter,
-/turf/open/floor/iron,
-/area/awaymission/caves/BMP_asteroid)
-"ZF" = (
-/turf/open/floor/iron{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
- },
-/area/awaymission/caves/BMP_asteroid)
-"ZI" = (
-/obj/structure/sign/warning/vacuum{
- name = "\improper LOW AIR AREA";
- pixel_x = 32
- },
-/turf/open/floor/iron{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
- },
-/area/awaymission/caves/research)
(1,1,1) = {"
aa
@@ -5524,8 +5524,8 @@ dt
dx
dE
dI
-iM
-zN
+dM
+dP
dI
dG
dA
@@ -5781,8 +5781,8 @@ du
dy
dy
dJ
-iM
-iM
+dM
+dM
dt
dy
dB
@@ -6038,8 +6038,8 @@ du
dz
dF
du
-iM
-iM
+dM
+dM
dt
dY
dz
@@ -6295,8 +6295,8 @@ du
du
du
dt
-Rr
-iM
+dN
+dM
du
du
du
@@ -6552,8 +6552,8 @@ du
dA
dG
dI
-EN
-zN
+dO
+dP
dI
dZ
el
@@ -6809,8 +6809,8 @@ du
dB
dy
dK
-zN
-iM
+dP
+dM
dR
ea
dy
@@ -7066,8 +7066,8 @@ dt
dz
dH
dt
-iM
-zN
+dM
+dP
dK
dF
dz
@@ -7323,8 +7323,8 @@ dt
dt
du
du
-iM
-WK
+dM
+dS
dt
dt
dt
@@ -7580,8 +7580,8 @@ dt
dC
dE
dI
-iM
-NY
+dM
+dT
dI
eb
em
@@ -7597,11 +7597,11 @@ bM
bL
bL
dW
-Ou
-Bm
+fq
+fA
dW
-MG
-Ak
+fK
+fS
dX
bL
bL
@@ -7854,11 +7854,11 @@ bL
bL
bL
dW
-YU
-hK
+fr
+fB
dW
-qi
-Yn
+fL
+ev
dX
bL
bL
@@ -8111,11 +8111,11 @@ bL
bL
bL
dX
-zg
-Kb
-JH
-hK
-He
+fs
+fC
+fG
+fB
+fT
dX
bL
bL
@@ -8368,11 +8368,11 @@ bL
bL
bL
dW
-uh
-Yn
+ft
+ev
dW
-sq
-Yn
+fM
+ev
dW
bL
bL
@@ -8607,9 +8607,9 @@ bV
bV
bV
bV
-yf
-yf
-yf
+cx
+cx
+cx
bV
bV
ef
@@ -8625,11 +8625,11 @@ bL
bL
bL
dX
-lZ
-oX
+fu
+fD
dX
-Yn
-hK
+ev
+fB
dW
bL
bL
@@ -8865,9 +8865,9 @@ bM
bV
bV
bV
-yf
-yf
-yf
+cx
+cx
+cx
cj
bV
bM
@@ -8876,11 +8876,11 @@ bM
bV
bV
cj
-yf
-yf
-yf
-yf
-yf
+cx
+cx
+cx
+cx
+cx
dW
dX
dX
@@ -9134,12 +9134,12 @@ bV
bV
bV
bV
-yf
-yf
-yf
-yf
-yf
-yf
+cx
+cx
+cx
+cx
+cx
+cx
bV
fH
ej
@@ -9395,9 +9395,9 @@ bV
bV
bV
ff
-yf
-yf
-yf
+cx
+cx
+cx
dW
fN
dX
@@ -9653,8 +9653,8 @@ bL
bL
dW
bV
-yf
-yf
+cx
+cx
fI
bV
bV
@@ -9910,8 +9910,8 @@ bL
bL
bL
bV
-yf
-yf
+cx
+cx
bV
bV
bV
@@ -10136,12 +10136,12 @@ bL
bL
cg
cg
-XX
-VA
+ct
+cC
cO
cT
-QM
-vQ
+cX
+db
cg
cg
bL
@@ -10167,10 +10167,10 @@ bL
bL
fg
bV
-yf
-yf
-yf
-yf
+cx
+cx
+cx
+cx
bV
bV
bV
@@ -10392,14 +10392,14 @@ bL
bL
bL
cg
-Dk
-IS
-Cv
-IS
-Dk
-jI
-Dk
-wG
+cn
+cu
+cD
+cu
+cn
+cY
+cn
+dd
cg
bL
bL
@@ -10413,11 +10413,11 @@ bL
bL
bL
dX
-TU
-Lv
-Lv
-Lv
-Lv
+ex
+eD
+eD
+eD
+eD
dX
bL
bL
@@ -10425,10 +10425,10 @@ bL
fg
bV
bV
-yf
-yf
-yf
-yf
+cx
+cx
+cx
+cx
bV
bV
bL
@@ -10445,7 +10445,7 @@ bL
bL
bL
bL
-yf
+cx
ej
bV
bM
@@ -10649,14 +10649,14 @@ bL
bL
bL
ch
-vn
-SZ
-SZ
-Dk
-Dk
-Dk
-Dk
-jg
+co
+cv
+cv
+cn
+cn
+cn
+cn
+de
ch
bL
bL
@@ -10670,11 +10670,11 @@ bL
bL
bL
dW
-jc
-Yn
-Yn
-Yn
-sJ
+ey
+ev
+ev
+ev
+eR
dX
bL
bL
@@ -10684,8 +10684,8 @@ bV
bV
bV
bV
-yf
-yf
+cx
+cx
bV
bV
bV
@@ -10702,8 +10702,8 @@ bL
bL
bL
bL
-yf
-yf
+cx
+cx
ej
bV
bM
@@ -10906,14 +10906,14 @@ bL
bL
bL
ch
-qC
-Dk
-Lc
-Dk
-Dk
-ZI
-Dk
-lp
+cp
+cn
+cE
+cn
+cn
+cZ
+cn
+df
ch
bV
bL
@@ -10927,11 +10927,11 @@ bL
bL
bL
dX
-kh
-Br
-Yn
-Yn
-Vt
+ez
+eE
+ev
+ev
+eS
dX
bL
bL
@@ -10941,12 +10941,12 @@ bV
bV
bV
bV
-yf
-yf
-yf
-yf
-yf
-yf
+cx
+cx
+cx
+cx
+cx
+cx
bV
bV
bV
@@ -10959,16 +10959,16 @@ bL
bL
bL
dW
-Ib
-yf
+gN
+cx
ej
bV
bM
bM
bM
bV
-yf
-ml
+cx
+gU
dW
bM
bM
@@ -11184,11 +11184,11 @@ bL
bL
bL
dX
-Gp
-Yn
-Yn
-Yn
-Kr
+eA
+ev
+ev
+ev
+eT
dW
bL
bV
@@ -11198,11 +11198,11 @@ bV
bV
bV
bV
-qg
-yf
-yf
-yf
-yf
+fO
+cx
+cx
+cx
+cx
bV
bV
ff
@@ -11216,16 +11216,16 @@ bL
bL
bL
bL
-yf
-NX
-yf
+cx
+gP
+cx
ej
bV
bV
bV
ej
-yf
-yf
+cx
+cx
bL
bM
bM
@@ -11441,11 +11441,11 @@ bL
bL
bL
dX
-Yn
-Yn
-Yn
-Yn
-Yn
+ev
+ev
+ev
+ev
+ev
eF
eG
eG
@@ -11456,8 +11456,8 @@ bV
bV
bV
dW
-yf
-yf
+cx
+cx
bV
bV
bV
@@ -11473,16 +11473,16 @@ bL
bL
bL
bL
-yf
-yf
-yf
-qg
-yf
+cx
+cx
+cx
+fO
+cx
bV
gT
-yf
-yf
-yf
+cx
+cx
+cx
bL
bM
bM
@@ -11698,23 +11698,23 @@ dW
dX
dX
dX
-xi
+eB
dW
-hr
-Ov
-Yn
-Ex
-qB
-qO
-oD
+eH
+eL
+ev
+eW
+eN
+eJ
+eO
fh
bV
bV
bV
bV
bV
-yf
-yf
+cx
+cx
bV
bV
bV
@@ -11734,8 +11734,8 @@ fP
fP
fP
dW
-yf
-yf
+cx
+cx
dW
fP
bL
@@ -11937,8 +11937,8 @@ bV
bV
bV
cG
-yf
-yf
+cx
+cx
cG
bV
bV
@@ -11952,26 +11952,26 @@ bV
bV
bL
dW
-XJ
-RZ
-Yn
-Yn
+eg
+eq
+ev
+ev
eF
eF
eF
eG
eG
-WR
-qO
-qO
+eX
+eJ
+eJ
fh
bV
bV
bV
bV
bV
-yf
-yf
+cx
+cx
bV
cj
bV
@@ -11991,8 +11991,8 @@ bV
bV
bV
cG
-yf
-yf
+cx
+cx
cG
bV
bL
@@ -12194,8 +12194,8 @@ bV
bV
bV
bV
-yf
-yf
+cx
+cx
bV
bV
bV
@@ -12209,26 +12209,26 @@ bV
bV
bL
dX
-NB
+eh
ej
-XJ
-Yn
+eg
+ev
eF
-io
-My
-rm
+eI
+eM
+eU
eG
-FA
-qO
-qO
+eY
+eJ
+eJ
eF
fh
eF
bV
bV
bV
-yf
-yf
+cx
+cx
bV
bV
bV
@@ -12248,8 +12248,8 @@ bV
gQ
bV
bV
-yf
-yf
+cx
+cx
bV
bV
bL
@@ -12451,8 +12451,8 @@ bV
bV
bV
bV
-yf
-yf
+cx
+cx
bV
bV
bV
@@ -12469,23 +12469,23 @@ dX
ei
er
ej
-Yn
+ev
eG
-qO
-qB
-qO
+eJ
+eN
+eJ
eF
-Vl
-qO
-qO
+eZ
+eJ
+eJ
fi
fm
fi
-yf
-yf
-yf
-yf
-yf
+cx
+cx
+cx
+cx
+cx
bV
bV
bV
@@ -12500,13 +12500,13 @@ bV
bV
bV
bV
-yf
-yf
-yf
-yf
-yf
-yf
-yf
+cx
+cx
+cx
+cx
+cx
+cx
+cx
bV
bL
bL
@@ -12707,9 +12707,9 @@ bV
bV
bV
bV
-yf
-yf
-yf
+cx
+cx
+cx
bV
bV
bV
@@ -12725,44 +12725,44 @@ bL
dX
ej
ej
-Yn
-Yn
+ev
+ev
eG
-qO
-oD
-qO
+eJ
+eO
+eJ
eF
-wO
-qO
-qO
+fa
+eJ
+eJ
eF
fh
eF
bV
bV
bV
-yf
-yf
-yf
-yf
-yf
-yf
-yf
-yf
+cx
+cx
+cx
+cx
+cx
+cx
+cx
+cx
bV
-yf
-yf
-yf
-yf
-yf
-yf
-yf
-yf
-yf
-yf
-yf
-yf
-yf
+cx
+cx
+cx
+cx
+cx
+cx
+cx
+cx
+cx
+cx
+cx
+cx
+cx
bV
bV
bV
@@ -12964,8 +12964,8 @@ bV
bV
bV
bV
-yf
-yf
+cx
+cx
bV
bV
bV
@@ -12982,39 +12982,39 @@ bL
dW
ek
es
-QW
-Bj
+ew
+eC
eF
-qO
-qO
-qO
-qO
-qO
-qO
-qB
+eJ
+eJ
+eJ
+eJ
+eJ
+eJ
+eN
fh
bV
bV
bV
bV
bV
-yf
-yf
-yf
-yf
-yf
-yf
-yf
-yf
-yf
-yf
-yf
-yf
-yf
-yf
-yf
-yf
-yf
+cx
+cx
+cx
+cx
+cx
+cx
+cx
+cx
+cx
+cx
+cx
+cx
+cx
+cx
+cx
+cx
+cx
bV
fg
fg
@@ -13221,8 +13221,8 @@ bV
bV
bV
bV
-yf
-yf
+cx
+cx
bV
bV
bV
@@ -13242,28 +13242,28 @@ dX
dX
dW
eF
-PF
-sT
-zH
+eK
+eP
+eV
eF
-qO
-qO
-qO
+eJ
+eJ
+eJ
fh
bV
bV
bV
ff
bV
-yf
-yf
+cx
+cx
bV
ff
bV
bV
bV
-yf
-yf
+cx
+cx
bV
bV
bV
@@ -13477,9 +13477,9 @@ bZ
bV
bV
bV
-yf
-yf
-yf
+cx
+cx
+cx
bV
bV
bV
@@ -13512,15 +13512,15 @@ bV
bV
dW
fP
-yf
-yf
+cx
+cx
fJ
dW
bV
bV
bV
-yf
-yf
+cx
+cx
bV
bL
bL
@@ -13734,8 +13734,8 @@ bV
bV
cj
bV
-yf
-yf
+cx
+cx
bV
bV
bZ
@@ -13768,16 +13768,16 @@ bV
cj
bV
fJ
-Kd
-Kd
-Kd
-Kd
+SX
+SX
+SX
+SX
fJ
bV
bV
bV
-yf
-yf
+cx
+cx
bV
bL
bL
@@ -13991,8 +13991,8 @@ bV
bV
bV
bV
-yf
-yf
+cx
+cx
bV
bV
bV
@@ -14025,17 +14025,17 @@ bV
bV
bV
fJ
-Kd
-Kd
-Kd
-Kd
+SX
+SX
+SX
+SX
fJ
bV
bV
bV
bV
-yf
-yf
+cx
+cx
bV
bV
bL
@@ -14248,8 +14248,8 @@ bV
bV
bV
bV
-yf
-yf
+cx
+cx
bV
bV
bV
@@ -14282,19 +14282,19 @@ bV
bV
bV
fJ
-Kd
-Ue
-Kd
-Kd
+SX
+Eb
+SX
+SX
fJ
bV
bV
bV
bV
-yf
-yf
-yf
-yf
+cx
+cx
+cx
+cx
bV
bL
bL
@@ -14505,7 +14505,7 @@ bL
bV
bV
bV
-yf
+cx
bV
bV
bV
@@ -14539,10 +14539,10 @@ cj
bV
bV
fJ
-Kd
-Kd
-Kd
-Kd
+SX
+SX
+SX
+SX
fJ
bV
bV
@@ -14550,8 +14550,8 @@ bV
bL
dW
ge
-yf
-yf
+cx
+cx
bV
bL
bL
@@ -14808,8 +14808,8 @@ bL
bL
bV
bV
-yf
-yf
+cx
+cx
bV
bL
bL
@@ -15065,8 +15065,8 @@ bL
bL
bL
bV
-yf
-yf
+cx
+cx
bV
bL
bL
@@ -15322,8 +15322,8 @@ bL
bL
bL
bV
-yf
-yf
+cx
+cx
bV
bL
bL
@@ -15579,8 +15579,8 @@ dW
dX
dW
dW
-yf
-yf
+cx
+cx
bV
bL
bL
@@ -15827,17 +15827,17 @@ bL
bL
bL
dX
-il
-JM
+fY
+gb
dX
-Ca
-Yn
-Yn
+gl
+ev
+ev
fN
ej
gz
-yf
-yf
+cx
+cx
bV
bL
bL
@@ -16085,16 +16085,16 @@ bM
bM
fW
fy
-Yn
-Sn
-Id
-Yn
-Yn
+ev
+gf
+gm
+ev
+ev
fN
ej
gz
-yf
-yf
+cx
+cx
bV
bL
bL
@@ -16345,13 +16345,13 @@ fy
gc
gg
fy
-Yn
-Id
+ev
+gm
dW
dX
dW
-Em
-yf
+gA
+cx
bV
bV
bM
@@ -16603,13 +16603,13 @@ fy
gh
bM
go
-yD
-xF
+gq
+gw
fH
bV
bV
-yf
-yf
+cx
+cx
bV
bM
bM
@@ -16860,13 +16860,13 @@ bM
bM
bM
gp
-lI
-ti
+gt
+gx
fH
bV
bV
-yf
-yf
+cx
+cx
bM
bM
bM
@@ -17117,15 +17117,15 @@ fy
gi
fy
fy
-yD
-Tc
+gq
+gy
fH
cj
bV
bV
-yf
-yf
-yf
+cx
+cx
+cx
bM
bM
bM
@@ -17373,9 +17373,9 @@ bM
fy
dW
fy
-yD
-yo
-yD
+gq
+gu
+gq
dX
bL
bL
@@ -17628,11 +17628,11 @@ bM
bM
bM
fy
-kI
-Yn
-XG
-sm
-lI
+gj
+ev
+gr
+gv
+gt
dW
bL
bL
@@ -17886,10 +17886,10 @@ bM
bM
fy
fW
-Yn
-yD
-Id
-yD
+ev
+gq
+gm
+gq
dW
bL
bL
@@ -18408,7 +18408,7 @@ bL
bV
bV
fy
-BW
+gF
gH
ej
ej
@@ -18666,7 +18666,7 @@ bV
bV
bV
fy
-Uu
+gI
fy
gD
eu
@@ -19177,10 +19177,10 @@ bL
bL
bV
fW
-qG
+gB
fy
-qG
-ZF
+gB
+gJ
fy
fy
bM
@@ -19434,11 +19434,11 @@ bL
bL
bL
dX
-vr
-kP
-VV
-ZF
-qG
+KD
+gE
+gG
+gJ
+gB
fy
bM
bV
@@ -19694,10 +19694,10 @@ dW
dW
dW
dX
-ZF
-RM
-ZF
-pp
+gJ
+gM
+gJ
+gO
dX
gK
dW
@@ -53566,7 +53566,7 @@ bK
bJ
bR
bJ
-TC
+cf
ck
bR
bJ
@@ -53823,8 +53823,8 @@ bK
bJ
bW
bJ
-TC
-TC
+cf
+cf
bW
bJ
bJ
@@ -54080,11 +54080,11 @@ bK
bJ
bJ
bJ
-TC
-TC
-TC
-TC
-TC
+cf
+cf
+cf
+cf
+cf
bJ
bK
bK
@@ -54337,12 +54337,12 @@ bK
bK
bX
cb
-TC
-TC
-TC
-TC
-TC
-TC
+cf
+cf
+cf
+cf
+cf
+cf
bK
bK
bJ
@@ -54598,8 +54598,8 @@ bJ
bJ
bJ
bJ
-TC
-TC
+cf
+cf
bK
bK
bJ
@@ -57433,8 +57433,8 @@ bJ
dh
dm
dh
-zI
-KG
+do
+dv
bR
bK
bK
@@ -57690,8 +57690,8 @@ bQ
bR
dl
bR
-yt
-zI
+dr
+do
bR
bK
bK
@@ -57944,11 +57944,11 @@ bJ
bJ
cc
bR
-zf
-oK
-zI
-zI
-yt
+di
+dn
+do
+do
+dr
bQ
bK
bK
@@ -58201,11 +58201,11 @@ bJ
bJ
cc
bQ
-UE
-zI
-zI
-zI
-zI
+dj
+do
+do
+do
+do
bR
bK
bK
@@ -58458,11 +58458,11 @@ cd
bJ
cm
bQ
-Vq
-mV
-xx
-BA
-RG
+dk
+dp
+dq
+ds
+dw
bR
bK
bK
diff --git a/_maps/RandomZLevels/snowdin.dmm b/_maps/RandomZLevels/snowdin.dmm
index 3ce0f8f47dab3..d6a54b3619525 100644
--- a/_maps/RandomZLevels/snowdin.dmm
+++ b/_maps/RandomZLevels/snowdin.dmm
@@ -400,15 +400,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
/area/awaymission/snowdin/post/research)
-"bq" = (
-/obj/structure/statue/snow/snowman{
- name = "Snow-Luc Price"
- },
-/obj/item/clothing/head/hats/hos{
- pixel_y = 10
- },
-/turf/open/floor/plating/asteroid/snow,
-/area/awaymission/snowdin/outside)
"bs" = (
/turf/open/floor/plating,
/area/awaymission/snowdin/post/research)
@@ -5558,6 +5549,16 @@
},
/turf/open/floor/iron,
/area/awaymission/snowdin/post/engineering)
+"qd" = (
+/obj/structure/reagent_dispensers/fueltank,
+/obj/item/clothing/head/utility/welding,
+/obj/item/weldingtool/largetank,
+/obj/effect/turf_decal/bot,
+/obj/machinery/atmospherics/pipe/simple/supply/visible{
+ dir = 8
+ },
+/turf/open/floor/iron,
+/area/awaymission/snowdin/post/engineering)
"qe" = (
/obj/machinery/atmospherics/pipe/simple/supply/visible{
dir = 8
@@ -5848,15 +5849,6 @@
broken = 1
},
/area/awaymission/snowdin/post/engineering)
-"qT" = (
-/obj/structure/statue/snow/snowman{
- anchored = 1
- },
-/obj/item/clothing/head/hats/bowler{
- pixel_y = 13
- },
-/turf/open/floor/plating/asteroid/snow,
-/area/awaymission/snowdin/outside)
"qX" = (
/obj/machinery/computer/atmos_control/tank{
dir = 1;
@@ -6538,6 +6530,15 @@
},
/turf/open/floor/iron/dark/snowdin,
/area/awaymission/snowdin/outside)
+"sV" = (
+/obj/structure/statue/snow/snowman{
+ anchored = 1
+ },
+/obj/item/clothing/head/hats/bowler{
+ pixel_y = 13
+ },
+/turf/open/floor/plating/asteroid/snow,
+/area/awaymission/snowdin/outside)
"sW" = (
/obj/machinery/power/turbine{
dir = 2;
@@ -6637,6 +6638,9 @@
/mob/living/simple_animal/hostile/asteroid/basilisk,
/turf/open/floor/plating/asteroid/snow/ice,
/area/awaymission/snowdin/cave/cavern)
+"tn" = (
+/turf/open/floor/plating/elevatorshaft,
+/area/awaymission/snowdin/post/mining_main)
"tp" = (
/turf/closed/wall/mineral/snow,
/area/awaymission/snowdin/cave/cavern)
@@ -7715,11 +7719,6 @@
},
/turf/open/floor/plating/snowed,
/area/awaymission/snowdin/cave)
-"xl" = (
-/turf/open/floor/iron/elevatorshaft{
- initial_gas_mix = "o2=22;n2=82;TEMP=180"
- },
-/area/awaymission/snowdin/cave)
"xp" = (
/obj/effect/turf_decal/stripes/white/line{
dir = 8
@@ -10065,6 +10064,15 @@
/obj/structure/lattice/catwalk,
/turf/open/floor/plating/snowed/smoothed,
/area/awaymission/snowdin/outside)
+"FF" = (
+/obj/structure/statue/snow/snowman{
+ name = "Snow-Luc Price"
+ },
+/obj/item/clothing/head/hats/hos{
+ pixel_y = 10
+ },
+/turf/open/floor/plating/asteroid/snow,
+/area/awaymission/snowdin/outside)
"FG" = (
/obj/structure/cable/yellow{
icon_state = "1-2"
@@ -10347,6 +10355,15 @@
"Gx" = (
/turf/closed/wall,
/area/awaymission/snowdin/post/mining_main/robotics)
+"Gy" = (
+/obj/structure/table,
+/obj/item/clothing/head/utility/welding{
+ pixel_x = -3;
+ pixel_y = 5
+ },
+/obj/item/clothing/glasses/welding,
+/turf/open/floor/iron,
+/area/awaymission/snowdin/post/mining_main/robotics)
"Gz" = (
/turf/open/floor/plating,
/area/awaymission/snowdin/post/mining_main/robotics)
@@ -10815,6 +10832,11 @@
broken = 1
},
/area/awaymission/snowdin/post/mining_dock)
+"Ig" = (
+/obj/vehicle/sealed/mecha/working/ripley/mining,
+/obj/effect/turf_decal/bot,
+/turf/open/floor/mech_bay_recharge_floor,
+/area/awaymission/snowdin/post/mining_main/mechbay)
"Ii" = (
/obj/machinery/mech_bay_recharge_port,
/obj/machinery/light,
@@ -11171,16 +11193,6 @@
},
/turf/open/floor/carpet/grimy,
/area/awaymission/snowdin/post/mining_main)
-"JM" = (
-/obj/structure/reagent_dispensers/fueltank,
-/obj/item/clothing/head/utility/welding,
-/obj/item/weldingtool/largetank,
-/obj/effect/turf_decal/bot,
-/obj/machinery/atmospherics/pipe/simple/supply/visible{
- dir = 8
- },
-/turf/open/floor/iron,
-/area/awaymission/snowdin/post/engineering)
"JN" = (
/obj/structure/closet/crate{
opened = 1
@@ -11197,9 +11209,6 @@
/obj/machinery/space_heater,
/turf/open/floor/plating,
/area/awaymission/snowdin/post/mining_main)
-"JQ" = (
-/turf/open/floor/iron/elevatorshaft,
-/area/awaymission/snowdin/post/mining_main)
"JV" = (
/obj/machinery/power/port_gen/pacman,
/obj/structure/cable{
@@ -11844,11 +11853,6 @@
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
/turf/open/floor/iron/dark,
/area/awaymission/snowdin/cave)
-"Nc" = (
-/obj/vehicle/sealed/mecha/working/ripley/mining,
-/obj/effect/turf_decal/bot,
-/turf/open/floor/mech_bay_recharge_floor,
-/area/awaymission/snowdin/post/mining_main/mechbay)
"Nd" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/tile/neutral/half/contrasted{
@@ -12142,6 +12146,11 @@
heat_capacity = 1e+006
},
/area/awaymission/snowdin/post/mining_dock)
+"OF" = (
+/turf/open/floor/plating/elevatorshaft{
+ initial_gas_mix = "o2=22;n2=82;TEMP=180"
+ },
+/area/awaymission/snowdin/cave)
"OJ" = (
/obj/item/shard,
/obj/item/stack/cable_coil/red{
@@ -13542,15 +13551,6 @@
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
/turf/open/floor/iron/dark,
/area/awaymission/snowdin/cave)
-"Wh" = (
-/obj/structure/table,
-/obj/item/clothing/head/utility/welding{
- pixel_x = -3;
- pixel_y = 5
- },
-/obj/item/clothing/glasses/welding,
-/turf/open/floor/iron,
-/area/awaymission/snowdin/post/mining_main/robotics)
"Wi" = (
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 1
@@ -13999,14 +13999,14 @@
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
/turf/open/floor/iron/dark/snowdin,
/area/awaymission/snowdin/cave)
+"Yq" = (
+/turf/open/floor/plating/elevatorshaft,
+/area/awaymission/snowdin/post/mining_dock)
"Yr" = (
/obj/effect/decal/cleanable/vomit/old,
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
/turf/open/floor/iron/dark,
/area/awaymission/snowdin/cave)
-"Ys" = (
-/turf/open/floor/iron/elevatorshaft,
-/area/awaymission/snowdin/post/mining_dock)
"YB" = (
/obj/structure/closet/emcloset,
/obj/item/clothing/suit/hooded/wintercoat,
@@ -26414,7 +26414,7 @@ af
af
ak
af
-qT
+sV
af
af
af
@@ -28406,11 +28406,11 @@ II
IY
Go
xv
-JQ
-JQ
-JQ
-JQ
-JQ
+tn
+tn
+tn
+tn
+tn
ME
Go
ac
@@ -28663,11 +28663,11 @@ Gq
Gq
Go
xv
-JQ
-JQ
-JQ
-JQ
-JQ
+tn
+tn
+tn
+tn
+tn
ME
GP
ac
@@ -28920,11 +28920,11 @@ Iy
Iy
Go
Qf
-JQ
-JQ
-JQ
-JQ
-JQ
+tn
+tn
+tn
+tn
+tn
VP
GP
ac
@@ -29177,11 +29177,11 @@ GP
GP
GP
xv
-JQ
-JQ
-JQ
-JQ
-JQ
+tn
+tn
+tn
+tn
+tn
ME
GP
ac
@@ -29434,11 +29434,11 @@ ae
ae
Go
xv
-JQ
-JQ
-JQ
-JQ
-JQ
+tn
+tn
+tn
+tn
+tn
ME
GP
ac
@@ -30004,7 +30004,7 @@ nY
ov
oV
nN
-JM
+qd
qB
Xs
rt
@@ -30353,12 +30353,12 @@ ae
ae
aj
xa
-xl
-xl
-xl
-xl
-xl
-xl
+OF
+OF
+OF
+OF
+OF
+OF
an
ii
ii
@@ -30610,12 +30610,12 @@ ae
ae
aj
xa
-xl
-xl
-xl
-xl
-xl
-xl
+OF
+OF
+OF
+OF
+OF
+OF
yp
ii
wS
@@ -30867,12 +30867,12 @@ ae
wQ
ai
xb
-xl
-xl
-xl
-xl
-xl
-xl
+OF
+OF
+OF
+OF
+OF
+OF
yq
ii
wS
@@ -31124,12 +31124,12 @@ ae
wQ
ai
xb
-xl
-xl
-xl
-xl
-xl
-xl
+OF
+OF
+OF
+OF
+OF
+OF
yq
an
ii
@@ -31381,12 +31381,12 @@ ae
wQ
wS
xa
-xl
-xl
-xl
-xl
-xl
-xl
+OF
+OF
+OF
+OF
+OF
+OF
yp
an
ii
@@ -31638,12 +31638,12 @@ ae
wQ
wS
xa
-xl
-xl
-xl
-xl
-xl
-xl
+OF
+OF
+OF
+OF
+OF
+OF
ai
an
an
@@ -43811,7 +43811,7 @@ af
af
am
sf
-bq
+FF
af
am
ae
@@ -58722,7 +58722,7 @@ oZ
oZ
oZ
Ge
-Wh
+Gy
GV
Hs
HJ
@@ -62587,11 +62587,11 @@ IO
wL
wE
WX
-Ys
-Ys
-Ys
-Ys
-Ys
+Yq
+Yq
+Yq
+Yq
+Yq
xw
wE
bh
@@ -62844,11 +62844,11 @@ IQ
wL
wE
WX
-Ys
-Ys
-Ys
-Ys
-Ys
+Yq
+Yq
+Yq
+Yq
+Yq
xw
wE
bh
@@ -63101,11 +63101,11 @@ wL
wL
wE
MC
-Ys
-Ys
-Ys
-Ys
-Ys
+Yq
+Yq
+Yq
+Yq
+Yq
Tc
wE
bh
@@ -63352,17 +63352,17 @@ GJ
He
HA
HO
-Nc
+Ig
GH
wL
wL
wE
WX
-Ys
-Ys
-Ys
-Ys
-Ys
+Yq
+Yq
+Yq
+Yq
+Yq
xw
wE
bh
@@ -63615,11 +63615,11 @@ wL
wL
wD
WX
-Ys
-Ys
-Ys
-Ys
-Ys
+Yq
+Yq
+Yq
+Yq
+Yq
xw
wD
bh
@@ -65562,12 +65562,12 @@ eJ
wE
Wj
ym
-Ys
-Ys
-Ys
-Ys
-Ys
-Ys
+Yq
+Yq
+Yq
+Yq
+Yq
+Yq
yz
yR
wD
@@ -65819,12 +65819,12 @@ eJ
wD
wW
ym
-Ys
-Ys
-Ys
-Ys
-Ys
-Ys
+Yq
+Yq
+Yq
+Yq
+Yq
+Yq
yA
wM
zm
@@ -66076,12 +66076,12 @@ wD
wP
RF
ym
-Ys
-Ys
-Ys
-Ys
-Ys
-Ys
+Yq
+Yq
+Yq
+Yq
+Yq
+Yq
yB
xy
zn
@@ -66334,11 +66334,11 @@ wP
wW
xh
wW
-Ys
-Ys
-Ys
-Ys
-Ys
+Yq
+Yq
+Yq
+Yq
+Yq
yB
xy
zn
@@ -66592,10 +66592,10 @@ wW
xh
wW
wW
-Ys
-Ys
-Ys
-Ys
+Yq
+Yq
+Yq
+Yq
OD
TG
zm
@@ -66850,9 +66850,9 @@ xi
wW
wW
wW
-Ys
-Ys
-Ys
+Yq
+Yq
+Yq
RK
Qw
wE
diff --git a/_maps/RandomZLevels/spacebattle.dmm b/_maps/RandomZLevels/spacebattle.dmm
index 916076b38d395..09a8d1c437889 100644
--- a/_maps/RandomZLevels/spacebattle.dmm
+++ b/_maps/RandomZLevels/spacebattle.dmm
@@ -139,13 +139,6 @@
},
/turf/open/floor/mineral/plastitanium/red,
/area/awaymission/spacebattle/syndicate2)
-"aM" = (
-/obj/structure/table/reinforced,
-/obj/item/hemostat,
-/turf/open/floor/iron/white/side{
- dir = 2
- },
-/area/awaymission/spacebattle/cruiser)
"aP" = (
/obj/structure/shuttle/engine/propulsion/right{
dir = 1
@@ -164,12 +157,6 @@
},
/turf/open/space,
/area/awaymission/spacebattle/syndicate1)
-"aS" = (
-/obj/structure/closet/secure_closet/freezer/kitchen,
-/turf/open/floor/iron/cafeteria{
- dir = 2
- },
-/area/awaymission/spacebattle/cruiser)
"aT" = (
/obj/machinery/sleeper,
/turf/open/floor/mineral/plastitanium/red,
@@ -432,6 +419,17 @@
},
/turf/open/floor/engine,
/area/awaymission/spacebattle/cruiser)
+"bZ" = (
+/obj/machinery/computer/telecomms/monitor{
+ dir = 4
+ },
+/turf/open/floor/iron,
+/area/awaymission/spacebattle/cruiser)
+"ca" = (
+/turf/open/floor/iron{
+ icon_state = "damaged5"
+ },
+/area/awaymission/spacebattle/cruiser)
"cb" = (
/obj/machinery/computer/pod{
dir = 1;
@@ -440,12 +438,23 @@
},
/turf/open/floor/mineral/plastitanium/red,
/area/awaymission/spacebattle/cruiser)
+"cc" = (
+/turf/open/floor/iron,
+/area/awaymission/spacebattle/cruiser)
+"cd" = (
+/obj/machinery/door/unpowered/shuttle,
+/turf/open/floor/iron,
+/area/awaymission/spacebattle/cruiser)
"cf" = (
/obj/structure/shuttle/engine/propulsion{
dir = 8
},
/turf/open/space,
/area/awaymission/spacebattle/cruiser)
+"cg" = (
+/obj/structure/table/reinforced,
+/turf/open/floor/iron,
+/area/awaymission/spacebattle/cruiser)
"ci" = (
/obj/machinery/door/poddoor/preopen{
id = "spacebattlepod";
@@ -457,9 +466,122 @@
/mob/living/simple_animal/hostile/syndicate,
/turf/open/floor/mineral/plastitanium/red,
/area/awaymission/spacebattle/syndicate1)
+"cm" = (
+/turf/open/floor/iron{
+ icon_state = "damaged4"
+ },
+/area/awaymission/spacebattle/cruiser)
+"cn" = (
+/turf/open/floor/iron{
+ icon_state = "damaged3"
+ },
+/area/awaymission/spacebattle/cruiser)
+"cp" = (
+/turf/open/floor/iron{
+ icon_state = "damaged1"
+ },
+/area/awaymission/spacebattle/cruiser)
+"cq" = (
+/obj/effect/mob_spawn/human/engineer{
+ mob_name = "Rosen Miller";
+ name = "Rosen Miller"
+ },
+/obj/effect/decal/cleanable/blood,
+/turf/open/floor/iron,
+/area/awaymission/spacebattle/cruiser)
+"cr" = (
+/obj/effect/decal/cleanable/blood,
+/turf/open/floor/iron,
+/area/awaymission/spacebattle/cruiser)
"ct" = (
/turf/closed/wall/mineral/titanium/nodiagonal,
/area/awaymission/spacebattle/cruiser)
+"cv" = (
+/obj/machinery/power/smes/magical{
+ desc = "A high-capacity superconducting magnetic energy storage (SMES) unit.";
+ name = "power storage unit"
+ },
+/turf/open/floor/iron,
+/area/awaymission/spacebattle/cruiser)
+"cw" = (
+/obj/item/ammo_casing/c10mm,
+/obj/item/ammo_casing/c10mm,
+/turf/open/floor/iron{
+ icon_state = "damaged2"
+ },
+/area/awaymission/spacebattle/cruiser)
+"cx" = (
+/obj/item/stack/sheet/iron,
+/obj/item/ammo_casing/c10mm,
+/turf/open/floor/iron,
+/area/awaymission/spacebattle/cruiser)
+"cy" = (
+/obj/item/ammo_casing/c10mm,
+/obj/item/ammo_casing/c10mm,
+/obj/item/ammo_casing/c10mm,
+/obj/item/ammo_casing/c10mm,
+/turf/open/floor/iron,
+/area/awaymission/spacebattle/cruiser)
+"cz" = (
+/obj/structure/closet/cabinet,
+/turf/open/floor/iron,
+/area/awaymission/spacebattle/cruiser)
+"cA" = (
+/obj/structure/bed,
+/obj/item/bedsheet,
+/turf/open/floor/iron,
+/area/awaymission/spacebattle/cruiser)
+"cB" = (
+/obj/machinery/vending/cigarette,
+/turf/open/floor/iron,
+/area/awaymission/spacebattle/cruiser)
+"cC" = (
+/obj/structure/table/reinforced,
+/obj/item/food/sausage,
+/turf/open/floor/iron/cafeteria{
+ dir = 2
+ },
+/area/awaymission/spacebattle/cruiser)
+"cD" = (
+/obj/structure/table/reinforced,
+/obj/item/reagent_containers/food/condiment/enzyme,
+/turf/open/floor/iron/cafeteria{
+ dir = 2
+ },
+/area/awaymission/spacebattle/cruiser)
+"cE" = (
+/obj/structure/table/reinforced,
+/obj/item/knife/kitchen,
+/turf/open/floor/iron/cafeteria{
+ dir = 2
+ },
+/area/awaymission/spacebattle/cruiser)
+"cF" = (
+/obj/structure/table/reinforced,
+/obj/item/kitchen/rollingpin,
+/turf/open/floor/iron/cafeteria{
+ dir = 2
+ },
+/area/awaymission/spacebattle/cruiser)
+"cG" = (
+/obj/structure/closet/secure_closet/freezer/kitchen,
+/turf/open/floor/iron/cafeteria{
+ dir = 2
+ },
+/area/awaymission/spacebattle/cruiser)
+"cH" = (
+/obj/structure/closet/secure_closet/freezer/fridge/open,
+/turf/open/floor/iron/cafeteria{
+ dir = 2
+ },
+/area/awaymission/spacebattle/cruiser)
+"cI" = (
+/obj/structure/table/reinforced,
+/obj/machinery/microwave,
+/turf/open/floor/iron/cafeteria{
+ dir = 2
+ },
+/area/awaymission/spacebattle/cruiser)
"cJ" = (
/obj/machinery/door/unpowered/shuttle,
/turf/open/floor/plating,
@@ -467,6 +589,67 @@
"cK" = (
/turf/open/floor/plating,
/area/awaymission/spacebattle/cruiser)
+"cL" = (
+/obj/item/ammo_casing/c10mm,
+/obj/item/ammo_casing/c10mm,
+/turf/open/floor/iron,
+/area/awaymission/spacebattle/cruiser)
+"cM" = (
+/obj/item/ammo_casing/c10mm,
+/turf/open/floor/iron,
+/area/awaymission/spacebattle/cruiser)
+"cN" = (
+/turf/open/floor/iron{
+ icon_state = "damaged2"
+ },
+/area/awaymission/spacebattle/cruiser)
+"cO" = (
+/obj/effect/landmark/awaystart,
+/turf/open/floor/iron,
+/area/awaymission/spacebattle/cruiser)
+"cP" = (
+/turf/open/floor/iron/cafeteria{
+ dir = 2
+ },
+/area/awaymission/spacebattle/cruiser)
+"cQ" = (
+/obj/item/stack/sheet/iron,
+/turf/open/floor/iron,
+/area/awaymission/spacebattle/cruiser)
+"cS" = (
+/obj/effect/mob_spawn/human/engineer{
+ mob_name = "Bill Sanchez";
+ name = "Bill Sanchez"
+ },
+/obj/effect/decal/cleanable/blood,
+/turf/open/floor/iron,
+/area/awaymission/spacebattle/cruiser)
+"cT" = (
+/obj/machinery/door/unpowered/shuttle,
+/turf/open/floor/iron/cafeteria{
+ dir = 2
+ },
+/area/awaymission/spacebattle/cruiser)
+"cU" = (
+/obj/structure/table/reinforced,
+/obj/item/food/fries,
+/turf/open/floor/iron/cafeteria{
+ dir = 2
+ },
+/area/awaymission/spacebattle/cruiser)
+"cV" = (
+/obj/structure/table/reinforced,
+/obj/item/food/soup/stew,
+/turf/open/floor/iron/cafeteria{
+ dir = 2
+ },
+/area/awaymission/spacebattle/cruiser)
+"cW" = (
+/obj/structure/table/reinforced,
+/turf/open/floor/iron/cafeteria{
+ dir = 2
+ },
+/area/awaymission/spacebattle/cruiser)
"cY" = (
/obj/effect/spawner/structure/window/hollow/reinforced/end{
dir = 1
@@ -507,6 +690,42 @@
},
/turf/open/space,
/area/awaymission/spacebattle/cruiser)
+"dg" = (
+/obj/effect/mob_spawn/human/engineer{
+ mob_name = "John Locke";
+ name = "John Locke"
+ },
+/obj/effect/decal/cleanable/blood,
+/turf/open/floor/iron,
+/area/awaymission/spacebattle/cruiser)
+"dh" = (
+/obj/structure/rack,
+/turf/open/floor/iron,
+/area/awaymission/spacebattle/cruiser)
+"di" = (
+/obj/structure/closet/secure_closet/engineering_electrical,
+/turf/open/floor/iron,
+/area/awaymission/spacebattle/cruiser)
+"dj" = (
+/obj/structure/closet/secure_closet/engineering_welding,
+/turf/open/floor/iron,
+/area/awaymission/spacebattle/cruiser)
+"dk" = (
+/obj/structure/closet/wardrobe/engineering_yellow,
+/turf/open/floor/iron,
+/area/awaymission/spacebattle/cruiser)
+"dl" = (
+/obj/structure/closet/toolcloset,
+/turf/open/floor/iron,
+/area/awaymission/spacebattle/cruiser)
+"dm" = (
+/obj/effect/mob_spawn/human/doctor{
+ mob_name = "Daniel Kalla";
+ name = "Daniel Kalla"
+ },
+/obj/effect/decal/cleanable/blood,
+/turf/open/floor/iron,
+/area/awaymission/spacebattle/cruiser)
"dr" = (
/obj/machinery/door/poddoor/preopen{
id = "spacebattlepod2";
@@ -518,6 +737,12 @@
/obj/effect/decal/cleanable/blood,
/turf/closed/wall/mineral/titanium,
/area/awaymission/spacebattle/cruiser)
+"dC" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 5
+ },
+/turf/open/floor/iron,
+/area/awaymission/spacebattle/cruiser)
"dD" = (
/obj/effect/decal/cleanable/blood,
/turf/open/floor/plating/airless,
@@ -544,6 +769,10 @@
},
/turf/open/floor/engine,
/area/awaymission/spacebattle/cruiser)
+"dJ" = (
+/obj/item/stack/rods,
+/turf/open/floor/iron,
+/area/awaymission/spacebattle/cruiser)
"dM" = (
/obj/structure/closet/crate{
name = "Gold Crate"
@@ -565,12 +794,11 @@
/obj/structure/reagent_dispensers/fueltank,
/turf/open/floor/plating,
/area/awaymission/spacebattle/cruiser)
-"dV" = (
-/obj/structure/table/reinforced,
-/obj/machinery/microwave,
-/turf/open/floor/iron/cafeteria{
- dir = 2
+"dW" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
},
+/turf/open/floor/iron,
/area/awaymission/spacebattle/cruiser)
"dX" = (
/obj/effect/mob_spawn/human/engineer/rig{
@@ -595,6 +823,15 @@
},
/turf/open/floor/engine,
/area/awaymission/spacebattle/cruiser)
+"ea" = (
+/obj/effect/mob_spawn/human/engineer{
+ mob_name = "Clay Dawson";
+ name = "Clay Dawson"
+ },
+/turf/open/floor/iron{
+ icon_state = "damaged5"
+ },
+/area/awaymission/spacebattle/cruiser)
"eb" = (
/obj/effect/spawner/structure/window/hollow/reinforced/middle{
dir = 4
@@ -634,6 +871,13 @@
/mob/living/simple_animal/hostile/syndicate/melee/spacebattle,
/turf/open/floor/mineral/plastitanium/red,
/area/awaymission/spacebattle/syndicate1)
+"ej" = (
+/obj/machinery/portable_atmospherics/canister/oxygen,
+/obj/effect/turf_decal/stripes/line{
+ dir = 6
+ },
+/turf/open/floor/iron,
+/area/awaymission/spacebattle/cruiser)
"ek" = (
/obj/effect/spawner/structure/window/hollow/reinforced/end,
/turf/open/floor/engine,
@@ -682,6 +926,18 @@
/obj/structure/chair,
/turf/open/floor/mineral/plastitanium/red,
/area/awaymission/spacebattle/syndicate3)
+"ey" = (
+/obj/effect/mob_spawn/human/bridgeofficer{
+ mob_name = "Davis Hume";
+ name = "Davis Hume"
+ },
+/obj/item/gun/ballistic/shotgun/automatic/combat,
+/turf/open/floor/iron,
+/area/awaymission/spacebattle/cruiser)
+"ez" = (
+/obj/item/ammo_casing/shotgun,
+/turf/open/floor/iron,
+/area/awaymission/spacebattle/cruiser)
"eA" = (
/mob/living/simple_animal/hostile/syndicate/ranged/spacebattle,
/turf/open/floor/mineral/plastitanium/red,
@@ -706,8 +962,14 @@
/obj/machinery/computer/shuttle_flight,
/turf/open/floor/mineral/plastitanium/red,
/area/awaymission/spacebattle/syndicate4)
-"eM" = (
-/obj/structure/closet/secure_closet/engineering_electrical,
+"eN" = (
+/obj/item/shield/energy,
+/turf/open/floor/iron,
+/area/awaymission/spacebattle/cruiser)
+"eO" = (
+/obj/structure/chair{
+ dir = 4
+ },
/turf/open/floor/iron,
/area/awaymission/spacebattle/cruiser)
"eR" = (
@@ -725,11 +987,24 @@
/obj/structure/closet/crate,
/turf/open/floor/plating,
/area/awaymission/spacebattle/cruiser)
-"eZ" = (
-/obj/machinery/computer/shuttle_flight{
- dir = 8
+"eW" = (
+/obj/effect/mob_spawn/human/syndicatesoldier,
+/obj/item/melee/transforming/energy/sword/saber/red,
+/obj/effect/decal/cleanable/blood,
+/turf/open/floor/iron,
+/area/awaymission/spacebattle/cruiser)
+"eX" = (
+/obj/effect/mob_spawn/human/bridgeofficer{
+ mob_name = "Kurt Kliest";
+ name = "Kurt Kliest"
},
-/obj/effect/turf_decal/tile/blue/fourcorners/contrasted,
+/obj/item/gun/ballistic/shotgun/automatic/combat,
+/obj/item/ammo_casing/shotgun,
+/turf/open/floor/iron,
+/area/awaymission/spacebattle/cruiser)
+"eY" = (
+/obj/item/ammo_casing/shotgun,
+/obj/effect/decal/cleanable/blood,
/turf/open/floor/iron,
/area/awaymission/spacebattle/cruiser)
"fa" = (
@@ -753,10 +1028,26 @@
/mob/living/simple_animal/hostile/syndicate,
/turf/open/floor/mineral/plastitanium/red,
/area/awaymission/spacebattle/cruiser)
+"ff" = (
+/obj/machinery/button/door{
+ dir = 2;
+ id = "spacebattlestorage";
+ name = "Secure Storage";
+ pixel_x = 32
+ },
+/turf/open/floor/iron,
+/area/awaymission/spacebattle/cruiser)
"fg" = (
/obj/item/hand_labeler,
/turf/open/floor/plating,
/area/awaymission/spacebattle/cruiser)
+"fh" = (
+/obj/machinery/door/poddoor{
+ id = "spacebattlestorage";
+ name = "Secure Storage"
+ },
+/turf/open/floor/iron,
+/area/awaymission/spacebattle/cruiser)
"fi" = (
/obj/structure/chair{
dir = 8
@@ -772,6 +1063,10 @@
/obj/machinery/door/airlock/external,
/turf/open/floor/plating,
/area/awaymission/spacebattle/syndicate4)
+"fm" = (
+/mob/living/simple_animal/hostile/syndicate/melee/sword,
+/turf/open/floor/iron,
+/area/awaymission/spacebattle/cruiser)
"fn" = (
/obj/structure/closet/crate,
/obj/item/light/tube,
@@ -779,13 +1074,36 @@
/obj/item/light/tube,
/turf/open/floor/plating,
/area/awaymission/spacebattle/cruiser)
-"fo" = (
-/mob/living/simple_animal/hostile/syndicate/melee/sword,
-/obj/effect/turf_decal/tile/blue/half/contrasted{
+"fr" = (
+/obj/effect/mob_spawn/human/nanotrasensoldier,
+/obj/item/gun/ballistic/automatic/wt550,
+/turf/open/floor/iron,
+/area/awaymission/spacebattle/cruiser)
+"fs" = (
+/obj/item/ammo_casing/shotgun,
+/obj/effect/turf_decal/tile/blue{
dir = 1
},
/turf/open/floor/iron,
/area/awaymission/spacebattle/cruiser)
+"ft" = (
+/obj/item/ammo_casing/a357,
+/obj/item/ammo_casing/a357,
+/obj/item/gun/ballistic/revolver/mateba,
+/obj/effect/mob_spawn/human/commander{
+ mob_name = "Aaron Bowden";
+ name = "Aaron Bowden"
+ },
+/obj/effect/decal/cleanable/blood,
+/turf/open/floor/iron,
+/area/awaymission/spacebattle/cruiser)
+"fu" = (
+/obj/structure/chair{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/blood,
+/turf/open/floor/iron,
+/area/awaymission/spacebattle/cruiser)
"fw" = (
/obj/structure/artilleryplaceholder{
icon_state = "1"
@@ -858,6 +1176,25 @@
},
/turf/open/floor/plating/airless,
/area/awaymission/spacebattle/cruiser)
+"fI" = (
+/obj/effect/landmark/awaystart,
+/turf/open/floor/iron/cafeteria{
+ dir = 2
+ },
+/area/awaymission/spacebattle/cruiser)
+"fL" = (
+/obj/item/stack/sheet/iron,
+/turf/open/floor/iron{
+ icon_state = "damaged1"
+ },
+/area/awaymission/spacebattle/cruiser)
+"fO" = (
+/obj/item/ammo_casing/c10mm,
+/obj/effect/turf_decal/tile/blue{
+ dir = 8
+ },
+/turf/open/floor/iron,
+/area/awaymission/spacebattle/cruiser)
"fQ" = (
/obj/structure/artilleryplaceholder{
icon_state = "13"
@@ -935,6 +1272,15 @@
/obj/item/poster/random_contraband,
/turf/open/floor/plating,
/area/awaymission/spacebattle/cruiser)
+"gd" = (
+/obj/effect/mob_spawn/human/bridgeofficer{
+ mob_name = "Robert Faver";
+ name = "Robert Faver"
+ },
+/obj/item/ammo_casing/shotgun,
+/obj/effect/decal/cleanable/blood,
+/turf/open/floor/iron,
+/area/awaymission/spacebattle/cruiser)
"ge" = (
/obj/structure/artilleryplaceholder/decorative{
icon_state = "25"
@@ -1022,6 +1368,41 @@
},
/turf/open/floor/plating,
/area/awaymission/spacebattle/cruiser)
+"gs" = (
+/obj/machinery/computer/operating,
+/turf/open/floor/iron/white/side{
+ dir = 2
+ },
+/area/awaymission/spacebattle/cruiser)
+"gt" = (
+/obj/structure/table/reinforced,
+/obj/item/scalpel,
+/obj/item/circular_saw,
+/turf/open/floor/iron/white/side{
+ dir = 2
+ },
+/area/awaymission/spacebattle/cruiser)
+"gu" = (
+/obj/structure/table/reinforced,
+/obj/item/retractor,
+/turf/open/floor/iron/white/side{
+ dir = 2
+ },
+/area/awaymission/spacebattle/cruiser)
+"gv" = (
+/obj/structure/table/reinforced,
+/obj/item/hemostat,
+/turf/open/floor/iron/white/side{
+ dir = 2
+ },
+/area/awaymission/spacebattle/cruiser)
+"gw" = (
+/obj/structure/table/reinforced,
+/obj/item/scalpel,
+/turf/open/floor/iron/white/side{
+ dir = 2
+ },
+/area/awaymission/spacebattle/cruiser)
"gx" = (
/obj/machinery/vending/cigarette,
/turf/open/floor/wood,
@@ -1029,6 +1410,10 @@
"gy" = (
/turf/open/floor/wood,
/area/awaymission/spacebattle/cruiser)
+"gz" = (
+/obj/item/gun/ballistic/shotgun/automatic/combat,
+/turf/open/floor/iron,
+/area/awaymission/spacebattle/cruiser)
"gC" = (
/obj/structure/closet/crate/secure/weapon,
/obj/item/gun/energy/laser,
@@ -1040,6 +1425,21 @@
/obj/item/stack/spacecash/c10,
/turf/open/floor/plating,
/area/awaymission/spacebattle/cruiser)
+"gF" = (
+/obj/effect/mob_spawn/human/doctor{
+ mob_name = "Adam Smith";
+ name = "Adam Smith"
+ },
+/obj/effect/decal/cleanable/blood,
+/turf/open/floor/iron,
+/area/awaymission/spacebattle/cruiser)
+"gG" = (
+/obj/structure/table/optable,
+/turf/open/floor/iron/white,
+/area/awaymission/spacebattle/cruiser)
+"gH" = (
+/turf/open/floor/iron/white,
+/area/awaymission/spacebattle/cruiser)
"gI" = (
/obj/machinery/vending/coffee,
/turf/open/floor/wood,
@@ -1093,6 +1493,22 @@
/obj/structure/closet/crate,
/turf/open/floor/plating,
/area/awaymission/spacebattle/cruiser)
+"gU" = (
+/obj/machinery/computer/operating,
+/turf/open/floor/iron/white,
+/area/awaymission/spacebattle/cruiser)
+"gV" = (
+/obj/effect/mob_spawn/human/doctor{
+ mob_name = "Allan Yoshimaru";
+ name = "Allan Yoshimaru"
+ },
+/obj/effect/decal/cleanable/blood,
+/turf/open/floor/iron/white,
+/area/awaymission/spacebattle/cruiser)
+"gW" = (
+/obj/effect/decal/cleanable/blood,
+/turf/open/floor/iron/white,
+/area/awaymission/spacebattle/cruiser)
"gX" = (
/obj/structure/chair{
dir = 8
@@ -1116,6 +1532,10 @@
/obj/structure/closet/crate,
/turf/open/floor/plating,
/area/awaymission/spacebattle/cruiser)
+"hf" = (
+/obj/item/circular_saw,
+/turf/open/floor/iron/white,
+/area/awaymission/spacebattle/cruiser)
"hg" = (
/obj/structure/table/wood,
/obj/item/paper_bin,
@@ -1172,6 +1592,19 @@
/obj/item/storage/firstaid/fire,
/turf/open/floor/plating,
/area/awaymission/spacebattle/cruiser)
+"hq" = (
+/obj/structure/rack,
+/obj/item/clothing/suit/space/hardsuit,
+/obj/item/clothing/head/helmet/space/hardsuit,
+/turf/open/floor/iron,
+/area/awaymission/spacebattle/cruiser)
+"hr" = (
+/obj/machinery/portable_atmospherics/canister/oxygen,
+/obj/effect/turf_decal/stripes/line{
+ dir = 5
+ },
+/turf/open/floor/iron,
+/area/awaymission/spacebattle/cruiser)
"hs" = (
/obj/structure/girder,
/turf/open/floor/plating,
@@ -1214,11 +1647,30 @@
/obj/structure/closet/crate/medical,
/turf/open/floor/plating,
/area/awaymission/spacebattle/cruiser)
+"hB" = (
+/obj/machinery/door/unpowered/shuttle,
+/turf/open/floor/iron/white,
+/area/awaymission/spacebattle/cruiser)
+"hD" = (
+/obj/structure/table/reinforced,
+/obj/item/storage/firstaid/regular,
+/turf/open/floor/iron/white,
+/area/awaymission/spacebattle/cruiser)
"hE" = (
/obj/structure/table/wood,
/obj/item/instrument/violin,
/turf/open/floor/wood,
/area/awaymission/spacebattle/cruiser)
+"hF" = (
+/obj/item/stack/sheet/iron,
+/turf/open/floor/iron{
+ icon_state = "damaged3"
+ },
+/area/awaymission/spacebattle/cruiser)
+"hI" = (
+/obj/structure/table/reinforced,
+/turf/open/floor/iron/white,
+/area/awaymission/spacebattle/cruiser)
"hJ" = (
/obj/structure/bed,
/obj/item/bedsheet/captain,
@@ -1228,6 +1680,20 @@
/obj/structure/closet/secure_closet/captains,
/turf/open/floor/wood,
/area/awaymission/spacebattle/cruiser)
+"hL" = (
+/obj/effect/mob_spawn/human/engineer{
+ id_job = "Gunner";
+ mob_name = "William Gannon";
+ name = "William Gannon"
+ },
+/turf/open/floor/iron,
+/area/awaymission/spacebattle/cruiser)
+"hM" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 6
+ },
+/turf/open/floor/iron,
+/area/awaymission/spacebattle/cruiser)
"hN" = (
/obj/structure/rack,
/obj/structure/window/reinforced{
@@ -1246,11 +1712,11 @@
/obj/structure/rack,
/turf/open/floor/engine,
/area/awaymission/spacebattle/cruiser)
-"hR" = (
-/mob/living/simple_animal/hostile/syndicate/mecha_pilot{
- spawn_mecha_type = /obj/vehicle/sealed/mecha/combat/gygax/dark/loaded
+"hQ" = (
+/obj/item/stack/sheet/iron,
+/turf/open/floor/iron{
+ icon_state = "damaged4"
},
-/turf/open/floor/plating/airless,
/area/awaymission/spacebattle/cruiser)
"hS" = (
/obj/machinery/computer/shuttle_flight{
@@ -1269,9 +1735,57 @@
/obj/machinery/door/airlock/external,
/turf/open/floor/plating,
/area/awaymission/spacebattle/syndicate7)
-"ic" = (
-/turf/open/floor/iron/rockvault/alien,
-/area/awaymission/spacebattle/secret)
+"hV" = (
+/obj/machinery/shower{
+ dir = 4
+ },
+/obj/item/bikehorn/rubberducky,
+/turf/open/floor/iron/freezer,
+/area/awaymission/spacebattle/cruiser)
+"hW" = (
+/turf/open/floor/iron/freezer,
+/area/awaymission/spacebattle/cruiser)
+"hX" = (
+/obj/machinery/shower{
+ dir = 8
+ },
+/turf/open/floor/iron/freezer,
+/area/awaymission/spacebattle/cruiser)
+"hY" = (
+/obj/structure/toilet,
+/turf/open/floor/iron/freezer,
+/area/awaymission/spacebattle/cruiser)
+"hZ" = (
+/obj/structure/table/reinforced,
+/obj/item/storage/firstaid/fire,
+/turf/open/floor/iron/white,
+/area/awaymission/spacebattle/cruiser)
+"ib" = (
+/obj/machinery/door/unpowered/shuttle,
+/turf/open/floor/iron/freezer,
+/area/awaymission/spacebattle/cruiser)
+"id" = (
+/obj/item/storage/firstaid/regular,
+/turf/open/floor/iron/white,
+/area/awaymission/spacebattle/cruiser)
+"ie" = (
+/obj/structure/table/reinforced,
+/obj/item/storage/firstaid/o2,
+/turf/open/floor/iron/white,
+/area/awaymission/spacebattle/cruiser)
+"if" = (
+/obj/machinery/shower{
+ dir = 4
+ },
+/turf/open/floor/iron/freezer,
+/area/awaymission/spacebattle/cruiser)
+"ig" = (
+/obj/machinery/shower{
+ dir = 8
+ },
+/obj/item/soap,
+/turf/open/floor/iron/freezer,
+/area/awaymission/spacebattle/cruiser)
"ih" = (
/obj/structure/rack,
/obj/structure/window/reinforced{
@@ -1281,6 +1795,22 @@
/obj/item/gun/energy/laser,
/turf/open/floor/engine,
/area/awaymission/spacebattle/cruiser)
+"ii" = (
+/obj/effect/mob_spawn/human/doctor{
+ mob_name = "Herbert West";
+ name = "Herbert West"
+ },
+/obj/effect/decal/cleanable/blood,
+/turf/open/floor/iron/white,
+/area/awaymission/spacebattle/cruiser)
+"ij" = (
+/obj/effect/mob_spawn/human/engineer{
+ mob_name = "Carth Robinson";
+ name = "Carth Robinson"
+ },
+/obj/effect/decal/cleanable/blood,
+/turf/open/floor/iron/freezer,
+/area/awaymission/spacebattle/cruiser)
"ik" = (
/obj/structure/rack,
/obj/structure/window/reinforced{
@@ -1288,12 +1818,62 @@
},
/turf/open/floor/engine,
/area/awaymission/spacebattle/cruiser)
+"il" = (
+/obj/machinery/sleeper,
+/turf/open/floor/iron/white,
+/area/awaymission/spacebattle/cruiser)
+"io" = (
+/obj/structure/sink{
+ dir = 4;
+ pixel_x = 11
+ },
+/turf/open/floor/iron/freezer,
+/area/awaymission/spacebattle/cruiser)
+"ip" = (
+/obj/machinery/sleeper,
+/turf/open/floor/iron/white/side{
+ dir = 1
+ },
+/area/awaymission/spacebattle/cruiser)
+"ir" = (
+/turf/open/floor/iron/white/side{
+ dir = 1
+ },
+/area/awaymission/spacebattle/cruiser)
+"is" = (
+/obj/effect/mob_spawn/human/engineer{
+ mob_name = "Cyrion";
+ name = "Cyrion"
+ },
+/obj/item/flamethrower/full,
+/obj/effect/decal/cleanable/blood,
+/turf/open/floor/iron,
+/area/awaymission/spacebattle/cruiser)
+"it" = (
+/mob/living/simple_animal/hostile/syndicate/ranged/smg,
+/turf/open/floor/iron,
+/area/awaymission/spacebattle/cruiser)
+"iu" = (
+/obj/effect/mob_spawn/human/syndicatesoldier,
+/obj/item/gun/ballistic/automatic/c20r,
+/turf/open/floor/iron{
+ icon_state = "damaged2"
+ },
+/area/awaymission/spacebattle/cruiser)
"iv" = (
/obj/structure/shuttle/engine/propulsion/burst/right{
dir = 8
},
/turf/open/space,
/area/awaymission/spacebattle/cruiser)
+"iw" = (
+/obj/effect/mob_spawn/human/engineer{
+ mob_name = "Mercutio";
+ name = "Mercutio"
+ },
+/obj/effect/decal/cleanable/blood,
+/turf/open/floor/iron,
+/area/awaymission/spacebattle/cruiser)
"ix" = (
/obj/structure/lattice,
/turf/open/space,
@@ -1330,13 +1910,6 @@
"iI" = (
/turf/closed/wall/mineral/plastitanium,
/area/awaymission/spacebattle/syndicate5)
-"iJ" = (
-/obj/effect/mob_spawn/human/syndicatesoldier,
-/obj/item/gun/ballistic/automatic/c20r,
-/turf/open/floor/iron{
- icon_state = "damaged2"
- },
-/area/awaymission/spacebattle/cruiser)
"iL" = (
/turf/open/floor/mineral/plastitanium/red,
/area/awaymission/spacebattle/syndicate5)
@@ -1344,12 +1917,6 @@
/obj/machinery/computer/shuttle_flight,
/turf/open/floor/mineral/plastitanium/red,
/area/awaymission/spacebattle/syndicate5)
-"iN" = (
-/obj/structure/rack,
-/obj/item/clothing/suit/space/hardsuit,
-/obj/item/clothing/head/helmet/space/hardsuit,
-/turf/open/floor/iron,
-/area/awaymission/spacebattle/cruiser)
"iP" = (
/obj/machinery/sleeper,
/turf/open/floor/mineral/plastitanium/red,
@@ -1514,6 +2081,19 @@
},
/turf/open/floor/engine,
/area/awaymission/spacebattle/cruiser)
+"jM" = (
+/obj/effect/mob_spawn/human/bridgeofficer{
+ mob_name = "Walter Strider";
+ name = "Walter Strider"
+ },
+/obj/item/gun/ballistic/shotgun/automatic/combat,
+/obj/item/ammo_casing/c10mm,
+/obj/item/ammo_casing/c10mm,
+/obj/effect/decal/cleanable/blood,
+/turf/open/floor/iron{
+ icon_state = "damaged3"
+ },
+/area/awaymission/spacebattle/cruiser)
"jN" = (
/obj/structure/closet/crate,
/obj/item/ammo_box/magazine/recharge,
@@ -1535,6 +2115,17 @@
/obj/item/stack/sheet/iron,
/turf/open/floor/wood,
/area/awaymission/spacebattle/cruiser)
+"jS" = (
+/turf/open/floor/iron/airless,
+/area/awaymission/spacebattle/cruiser)
+"jT" = (
+/obj/item/stack/sheet/iron,
+/turf/open/floor/iron/airless,
+/area/awaymission/spacebattle/cruiser)
+"jU" = (
+/mob/living/simple_animal/hostile/syndicate/ranged/smg/space,
+/turf/open/floor/iron/airless,
+/area/awaymission/spacebattle/cruiser)
"jX" = (
/obj/structure/rack,
/obj/structure/window/reinforced{
@@ -1585,6 +2176,10 @@
/obj/structure/window/reinforced,
/turf/open/floor/engine,
/area/awaymission/spacebattle/cruiser)
+"kh" = (
+/mob/living/simple_animal/hostile/syndicate,
+/turf/open/floor/iron/white,
+/area/awaymission/spacebattle/cruiser)
"ki" = (
/obj/effect/spawner/structure/window/hollow/reinforced/end{
dir = 1
@@ -1598,6 +2193,12 @@
/obj/item/shard,
/turf/open/floor/engine/vacuum,
/area/awaymission/spacebattle/cruiser)
+"kl" = (
+/obj/effect/mob_spawn/human/nanotrasensoldier,
+/obj/item/gun/ballistic/automatic/wt550,
+/obj/effect/decal/cleanable/blood,
+/turf/open/floor/iron,
+/area/awaymission/spacebattle/cruiser)
"km" = (
/obj/structure/closet/crate{
name = "Gold Crate"
@@ -1641,6 +2242,10 @@
/obj/structure/barricade/security,
/turf/open/floor/plating,
/area/awaymission/spacebattle/cruiser)
+"ku" = (
+/mob/living/simple_animal/hostile/syndicate/ranged/smg,
+/turf/open/floor/iron/white,
+/area/awaymission/spacebattle/cruiser)
"kv" = (
/obj/effect/spawner/structure/window/hollow/reinforced/middle,
/turf/open/floor/engine/vacuum,
@@ -1665,6 +2270,29 @@
},
/turf/open/floor/engine/vacuum,
/area/awaymission/spacebattle/cruiser)
+"kA" = (
+/obj/effect/mob_spawn/human/engineer{
+ mob_name = "Javier Wismer";
+ name = "Javier Wismer"
+ },
+/turf/open/floor/iron/airless,
+/area/awaymission/spacebattle/cruiser)
+"kB" = (
+/obj/structure/rack,
+/obj/item/storage/toolbox/electrical,
+/turf/open/floor/iron,
+/area/awaymission/spacebattle/cruiser)
+"kC" = (
+/obj/structure/rack,
+/obj/item/storage/toolbox/mechanical,
+/obj/item/storage/toolbox/electrical,
+/turf/open/floor/iron,
+/area/awaymission/spacebattle/cruiser)
+"kD" = (
+/obj/structure/rack,
+/obj/item/storage/toolbox/mechanical,
+/turf/open/floor/iron,
+/area/awaymission/spacebattle/cruiser)
"kE" = (
/obj/item/shard,
/turf/open/space,
@@ -1673,6 +2301,14 @@
/obj/item/stack/rods,
/turf/open/space,
/area/space/nearstation)
+"kG" = (
+/obj/item/ammo_casing/c10mm,
+/obj/item/ammo_casing/c10mm,
+/obj/item/ammo_casing/c10mm,
+/obj/item/ammo_casing/c10mm,
+/mob/living/simple_animal/hostile/syndicate/ranged/smg,
+/turf/open/floor/iron/freezer,
+/area/awaymission/spacebattle/cruiser)
"kH" = (
/obj/machinery/mech_bay_recharge_port{
dir = 1
@@ -1700,1021 +2336,385 @@
/obj/item/mecha_parts/mecha_equipment/weapon/energy/ion,
/turf/open/floor/plating,
/area/awaymission/spacebattle/cruiser)
-"kP" = (
-/obj/effect/turf_decal/tile/red/anticorner/contrasted{
- dir = 8
- },
-/turf/open/floor/iron,
-/area/awaymission/spacebattle/cruiser)
-"ln" = (
-/obj/structure/chair,
-/obj/effect/landmark/awaystart,
-/obj/effect/turf_decal/tile/bar/opposingcorners,
-/turf/open/floor/iron,
-/area/awaymission/spacebattle/cruiser)
-"lr" = (
-/obj/structure/table/reinforced,
-/obj/effect/turf_decal/tile/blue/half/contrasted{
+"ld" = (
+/obj/machinery/computer/shuttle_flight{
dir = 8
},
+/obj/effect/turf_decal/tile/blue/fourcorners/contrasted,
/turf/open/floor/iron,
/area/awaymission/spacebattle/cruiser)
-"lx" = (
-/obj/structure/closet/secure_closet/security,
-/obj/effect/turf_decal/tile/red/anticorner/contrasted{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/awaymission/spacebattle/cruiser)
-"lG" = (
-/mob/living/simple_animal/hostile/syndicate/mecha_pilot{
- spawn_mecha_type = /obj/vehicle/sealed/mecha/combat/gygax/dark/loaded
- },
-/turf/open/floor/iron/airless,
-/area/awaymission/spacebattle/cruiser)
-"lJ" = (
-/turf/open/floor/iron/airless,
-/area/awaymission/spacebattle/cruiser)
-"lU" = (
-/obj/structure/closet/toolcloset,
-/turf/open/floor/iron,
-/area/awaymission/spacebattle/cruiser)
-"mh" = (
-/obj/structure/closet/secure_closet/freezer/fridge/open,
-/turf/open/floor/iron/cafeteria{
- dir = 2
- },
-/area/awaymission/spacebattle/cruiser)
-"mN" = (
-/obj/effect/mob_spawn/human/doctor{
- mob_name = "Allan Yoshimaru";
- name = "Allan Yoshimaru"
- },
-/obj/effect/decal/cleanable/blood,
-/turf/open/floor/iron/white,
-/area/awaymission/spacebattle/cruiser)
-"nv" = (
+"mP" = (
/obj/structure/table/reinforced,
-/obj/item/reagent_containers/food/condiment/peppermill,
+/obj/item/kitchen/fork,
/obj/effect/turf_decal/tile/bar/opposingcorners,
/turf/open/floor/iron,
/area/awaymission/spacebattle/cruiser)
-"nE" = (
-/obj/machinery/shower{
- dir = 4
- },
-/turf/open/floor/iron/freezer,
-/area/awaymission/spacebattle/cruiser)
-"nK" = (
-/obj/effect/mob_spawn/human/engineer{
- id_job = "Gunner";
- mob_name = "William Gannon";
- name = "William Gannon"
- },
-/turf/open/floor/iron,
-/area/awaymission/spacebattle/cruiser)
-"nO" = (
-/obj/machinery/computer/secure_data{
- dir = 8
- },
-/obj/effect/turf_decal/tile/blue/fourcorners/contrasted,
-/turf/open/floor/iron,
-/area/awaymission/spacebattle/cruiser)
-"oh" = (
-/mob/living/simple_animal/hostile/syndicate/ranged/smg,
-/turf/open/floor/iron/white,
-/area/awaymission/spacebattle/cruiser)
-"oi" = (
-/obj/effect/mob_spawn/human/engineer{
- mob_name = "Mercutio";
- name = "Mercutio"
- },
-/obj/effect/decal/cleanable/blood,
-/turf/open/floor/iron,
-/area/awaymission/spacebattle/cruiser)
-"os" = (
-/obj/machinery/door/poddoor{
- id = "spacebattlestorage";
- name = "Secure Storage"
- },
-/turf/open/floor/iron,
-/area/awaymission/spacebattle/cruiser)
-"oZ" = (
-/obj/structure/bed,
-/obj/item/bedsheet,
-/turf/open/floor/iron,
-/area/awaymission/spacebattle/cruiser)
-"px" = (
+"nh" = (
/obj/structure/rack,
/obj/effect/turf_decal/tile/red/anticorner/contrasted{
dir = 1
},
/turf/open/floor/iron,
/area/awaymission/spacebattle/cruiser)
-"pN" = (
-/obj/effect/mob_spawn/human/engineer{
- mob_name = "John Locke";
- name = "John Locke"
+"nG" = (
+/obj/structure/table/reinforced,
+/obj/effect/turf_decal/tile/blue/half/contrasted{
+ dir = 8
},
-/obj/effect/decal/cleanable/blood,
/turf/open/floor/iron,
/area/awaymission/spacebattle/cruiser)
-"pR" = (
-/obj/effect/mob_spawn/human/engineer{
- mob_name = "Clay Dawson";
- name = "Clay Dawson"
- },
-/turf/open/floor/iron{
- icon_state = "damaged5"
- },
-/area/awaymission/spacebattle/cruiser)
-"qh" = (
+"nQ" = (
/obj/structure/table/reinforced,
-/obj/item/kitchen/fork,
-/obj/effect/turf_decal/tile/bar/opposingcorners,
-/turf/open/floor/iron,
-/area/awaymission/spacebattle/cruiser)
-"qj" = (
-/obj/effect/mob_spawn/human/syndicatesoldier,
-/obj/item/gun/ballistic/automatic/c20r,
-/obj/item/ammo_casing/c10mm,
-/obj/item/ammo_casing/c10mm,
-/obj/effect/decal/cleanable/blood,
+/obj/machinery/button/door{
+ dir = 2;
+ id = "spacebattlearmory2";
+ name = "Weapon Cache"
+ },
/obj/effect/turf_decal/tile/blue/half/contrasted{
dir = 4
},
/turf/open/floor/iron,
/area/awaymission/spacebattle/cruiser)
-"qn" = (
-/obj/item/ammo_casing/shotgun,
-/turf/open/floor/iron,
-/area/awaymission/spacebattle/cruiser)
-"qu" = (
-/obj/machinery/door/unpowered/shuttle,
-/turf/open/floor/iron/white,
-/area/awaymission/spacebattle/cruiser)
-"rb" = (
-/obj/structure/chair{
+"om" = (
+/obj/effect/landmark/awaystart,
+/obj/effect/turf_decal/tile/red/half/contrasted{
dir = 4
},
-/obj/effect/decal/cleanable/blood,
-/turf/open/floor/iron,
-/area/awaymission/spacebattle/cruiser)
-"ru" = (
-/obj/item/stack/sheet/iron,
-/turf/open/floor/iron,
-/area/awaymission/spacebattle/cruiser)
-"rE" = (
-/obj/effect/decal/cleanable/blood,
-/turf/open/floor/iron,
-/area/awaymission/spacebattle/cruiser)
-"rL" = (
-/obj/effect/mob_spawn/human/doctor{
- mob_name = "Daniel Kalla";
- name = "Daniel Kalla"
- },
-/obj/effect/decal/cleanable/blood,
/turf/open/floor/iron,
/area/awaymission/spacebattle/cruiser)
-"rO" = (
-/obj/effect/turf_decal/tile/bar/opposingcorners,
-/turf/open/floor/iron,
-/area/awaymission/spacebattle/cruiser)
-"rW" = (
+"ow" = (
/obj/structure/table/reinforced,
-/turf/open/floor/iron/white,
-/area/awaymission/spacebattle/cruiser)
-"sg" = (
-/obj/structure/rack,
-/turf/open/floor/iron,
-/area/awaymission/spacebattle/cruiser)
-"si" = (
-/obj/item/ammo_casing/c10mm,
-/obj/item/ammo_casing/c10mm,
-/obj/effect/turf_decal/tile/blue/half/contrasted{
- dir = 8
- },
-/turf/open/floor/iron,
-/area/awaymission/spacebattle/cruiser)
-"sj" = (
-/obj/effect/mob_spawn/human/engineer{
- mob_name = "Cyrion";
- name = "Cyrion"
+/obj/machinery/button/door{
+ dir = 2;
+ id = "spacebattlearmory1";
+ name = "Weapon Cache"
},
-/obj/item/flamethrower/full,
-/obj/effect/decal/cleanable/blood,
-/turf/open/floor/iron,
-/area/awaymission/spacebattle/cruiser)
-"sk" = (
-/obj/effect/landmark/awaystart,
-/turf/open/floor/iron,
-/area/awaymission/spacebattle/cruiser)
-"sm" = (
-/obj/effect/turf_decal/stripes/line{
+/obj/effect/turf_decal/tile/blue/half/contrasted{
dir = 4
},
/turf/open/floor/iron,
/area/awaymission/spacebattle/cruiser)
-"sr" = (
-/obj/structure/chair{
- dir = 8
- },
-/obj/effect/turf_decal/tile/bar/opposingcorners,
-/turf/open/floor/iron,
-/area/awaymission/spacebattle/cruiser)
-"sV" = (
-/obj/machinery/vending/cigarette,
-/turf/open/floor/iron,
-/area/awaymission/spacebattle/cruiser)
-"sW" = (
-/obj/structure/closet/secure_closet/security,
-/obj/effect/turf_decal/tile/red/half/contrasted,
-/turf/open/floor/iron,
-/area/awaymission/spacebattle/cruiser)
-"tb" = (
+"oS" = (
/obj/structure/table/reinforced,
/obj/item/reagent_containers/food/condiment/saltshaker,
/obj/effect/turf_decal/tile/bar/opposingcorners,
/turf/open/floor/iron,
/area/awaymission/spacebattle/cruiser)
-"tD" = (
-/obj/structure/table/reinforced,
-/obj/item/storage/firstaid/fire,
-/turf/open/floor/iron/white,
-/area/awaymission/spacebattle/cruiser)
-"tU" = (
-/obj/structure/table/reinforced,
-/obj/effect/turf_decal/tile/blue/anticorner/contrasted{
- dir = 1
- },
-/turf/open/floor/iron,
-/area/awaymission/spacebattle/cruiser)
-"ub" = (
-/obj/structure/closet/cabinet,
-/turf/open/floor/iron,
-/area/awaymission/spacebattle/cruiser)
-"un" = (
-/obj/machinery/door/unpowered/shuttle,
-/turf/open/floor/iron/cafeteria{
- dir = 2
- },
-/area/awaymission/spacebattle/cruiser)
-"uv" = (
-/obj/structure/table/reinforced,
-/obj/item/retractor,
-/turf/open/floor/iron/white/side{
- dir = 2
- },
-/area/awaymission/spacebattle/cruiser)
-"uy" = (
-/obj/effect/mob_spawn/human/engineer{
- mob_name = "Javier Wismer";
- name = "Javier Wismer"
- },
-/turf/open/floor/iron/airless,
-/area/awaymission/spacebattle/cruiser)
-"uD" = (
-/obj/item/stack/sheet/iron,
-/turf/open/floor/iron{
- icon_state = "damaged3"
- },
-/area/awaymission/spacebattle/cruiser)
-"uE" = (
-/obj/effect/mob_spawn/human/bridgeofficer{
- mob_name = "Davis Hume";
- name = "Davis Hume"
- },
-/obj/item/gun/ballistic/shotgun/automatic/combat,
-/turf/open/floor/iron,
+"pS" = (
+/obj/vehicle/sealed/mecha/combat/gygax,
+/turf/open/floor/plating,
/area/awaymission/spacebattle/cruiser)
-"uS" = (
-/obj/item/clothing/suit/space/hardsuit/wizard,
-/turf/open/floor/iron/rockvault/alien,
-/area/awaymission/spacebattle/secret)
-"vd" = (
-/obj/machinery/computer/communications{
+"qg" = (
+/obj/machinery/computer/crew{
dir = 8
},
/obj/effect/turf_decal/tile/blue/fourcorners/contrasted,
/turf/open/floor/iron,
/area/awaymission/spacebattle/cruiser)
-"vi" = (
-/obj/item/ammo_casing/c10mm,
-/obj/item/ammo_casing/c10mm,
-/turf/open/floor/iron,
-/area/awaymission/spacebattle/cruiser)
-"vo" = (
-/obj/effect/turf_decal/tile/red/half/contrasted{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/awaymission/spacebattle/cruiser)
-"vt" = (
-/obj/structure/table/reinforced,
-/obj/item/storage/firstaid/o2,
-/turf/open/floor/iron/white,
-/area/awaymission/spacebattle/cruiser)
-"vw" = (
-/turf/closed/wall/mineral/plastitanium/nodiagonal,
-/area/awaymission/spacebattle/syndicate5)
-"vA" = (
-/obj/item/ammo_casing/shotgun,
+"ue" = (
+/obj/effect/mob_spawn/human/syndicatesoldier,
+/obj/item/gun/ballistic/automatic/c20r,
/obj/item/ammo_casing/c10mm,
/obj/item/ammo_casing/c10mm,
-/obj/item/stack/sheet/iron,
+/obj/effect/decal/cleanable/blood,
/obj/effect/turf_decal/tile/blue/half/contrasted{
dir = 8
},
/turf/open/floor/iron,
/area/awaymission/spacebattle/cruiser)
-"vK" = (
-/obj/machinery/computer/crew{
- dir = 8
+"uk" = (
+/obj/structure/rack,
+/obj/effect/turf_decal/tile/red/half/contrasted{
+ dir = 1
},
-/obj/effect/turf_decal/tile/blue/fourcorners/contrasted,
/turf/open/floor/iron,
/area/awaymission/spacebattle/cruiser)
-"vS" = (
-/obj/item/ammo_casing/c10mm,
-/obj/effect/turf_decal/tile/blue{
+"ux" = (
+/obj/machinery/computer/secure_data{
dir = 8
},
-/turf/open/floor/iron,
-/area/awaymission/spacebattle/cruiser)
-"vZ" = (
-/obj/structure/table/reinforced,
/obj/effect/turf_decal/tile/blue/fourcorners/contrasted,
/turf/open/floor/iron,
/area/awaymission/spacebattle/cruiser)
-"wk" = (
-/obj/structure/toilet,
-/turf/open/floor/iron/freezer,
-/area/awaymission/spacebattle/cruiser)
-"wl" = (
-/obj/machinery/shower{
- dir = 8
- },
-/obj/item/soap,
-/turf/open/floor/iron/freezer,
-/area/awaymission/spacebattle/cruiser)
-"wx" = (
-/obj/machinery/door/unpowered/shuttle,
-/turf/open/floor/iron/freezer,
-/area/awaymission/spacebattle/cruiser)
-"wE" = (
-/obj/effect/mob_spawn/human/syndicatesoldier,
-/obj/item/melee/transforming/energy/sword/saber/red,
-/obj/effect/decal/cleanable/blood,
-/turf/open/floor/iron,
-/area/awaymission/spacebattle/cruiser)
-"wJ" = (
-/obj/structure/table/reinforced,
-/obj/item/knife/kitchen,
-/turf/open/floor/iron/cafeteria{
- dir = 2
- },
-/area/awaymission/spacebattle/cruiser)
-"wL" = (
-/obj/effect/mob_spawn/human/doctor{
- mob_name = "Adam Smith";
- name = "Adam Smith"
- },
+"uF" = (
/obj/effect/decal/cleanable/blood,
+/obj/effect/turf_decal/tile/bar/opposingcorners,
/turf/open/floor/iron,
/area/awaymission/spacebattle/cruiser)
-"xw" = (
+"vw" = (
+/turf/closed/wall/mineral/plastitanium/nodiagonal,
+/area/awaymission/spacebattle/syndicate5)
+"vH" = (
/obj/structure/table/reinforced,
-/obj/item/scalpel,
-/turf/open/floor/iron/white/side{
- dir = 2
- },
-/area/awaymission/spacebattle/cruiser)
-"xG" = (
-/obj/vehicle/sealed/mecha/combat/gygax,
-/turf/open/floor/plating,
-/area/awaymission/spacebattle/cruiser)
-"yr" = (
-/turf/open/floor/iron{
- icon_state = "damaged3"
- },
-/area/awaymission/spacebattle/cruiser)
-"yE" = (
-/turf/open/floor/iron{
- icon_state = "damaged5"
- },
-/area/awaymission/spacebattle/cruiser)
-"yK" = (
-/obj/structure/closet/l3closet/security,
-/obj/effect/turf_decal/tile/red/half/contrasted,
+/obj/item/reagent_containers/food/condiment/peppermill,
+/obj/effect/turf_decal/tile/bar/opposingcorners,
/turf/open/floor/iron,
/area/awaymission/spacebattle/cruiser)
-"zh" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 6
+"wc" = (
+/mob/living/simple_animal/hostile/syndicate/mecha_pilot{
+ spawn_mecha_type = /obj/vehicle/sealed/mecha/combat/gygax/dark/loaded
},
-/turf/open/floor/iron,
+/turf/open/floor/plating/airless,
/area/awaymission/spacebattle/cruiser)
-"zr" = (
-/obj/effect/mob_spawn/human/bridgeofficer{
- mob_name = "Robert Faver";
- name = "Robert Faver"
+"xd" = (
+/obj/effect/turf_decal/tile/blue/half/contrasted{
+ dir = 8
},
-/obj/item/ammo_casing/shotgun,
-/obj/effect/decal/cleanable/blood,
/turf/open/floor/iron,
/area/awaymission/spacebattle/cruiser)
-"zw" = (
-/obj/item/ammo_casing/shotgun,
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
+"xn" = (
+/obj/structure/table/reinforced,
+/obj/effect/turf_decal/tile/bar/opposingcorners,
/turf/open/floor/iron,
/area/awaymission/spacebattle/cruiser)
-"zB" = (
-/obj/effect/mob_spawn/human/bridgeofficer{
- mob_name = "Kurt Kliest";
- name = "Kurt Kliest"
- },
-/obj/item/gun/ballistic/shotgun/automatic/combat,
-/obj/item/ammo_casing/shotgun,
-/turf/open/floor/iron,
+"xq" = (
+/obj/vehicle/sealed/mecha/medical/odysseus,
+/turf/open/floor/plating,
/area/awaymission/spacebattle/cruiser)
-"zC" = (
-/obj/effect/turf_decal/tile/red/half/contrasted{
- dir = 8
+"xx" = (
+/obj/structure/table/reinforced,
+/obj/effect/turf_decal/tile/blue/half/contrasted{
+ dir = 4
},
/turf/open/floor/iron,
/area/awaymission/spacebattle/cruiser)
-"zL" = (
-/turf/open/floor/iron,
-/area/awaymission/spacebattle/cruiser)
"zS" = (
/turf/closed/wall/mineral/plastitanium/nodiagonal,
/area/awaymission/spacebattle/syndicate6)
-"zT" = (
-/obj/item/shield/energy,
-/turf/open/floor/iron,
-/area/awaymission/spacebattle/cruiser)
-"Ao" = (
-/obj/structure/rack,
-/obj/effect/turf_decal/tile/red/half/contrasted{
- dir = 1
- },
-/turf/open/floor/iron,
-/area/awaymission/spacebattle/cruiser)
-"Bc" = (
-/obj/machinery/power/smes/magical{
- desc = "A high-capacity superconducting magnetic energy storage (SMES) unit.";
- name = "power storage unit"
- },
+"Ae" = (
+/obj/structure/chair,
+/obj/effect/turf_decal/tile/bar/opposingcorners,
/turf/open/floor/iron,
/area/awaymission/spacebattle/cruiser)
-"Bw" = (
-/obj/structure/table/reinforced,
-/obj/item/food/soup/stew,
-/turf/open/floor/iron/cafeteria{
- dir = 2
+"Bp" = (
+/obj/effect/mob_spawn/human/syndicatesoldier,
+/obj/item/gun/ballistic/automatic/c20r,
+/obj/item/ammo_casing/c10mm,
+/obj/item/ammo_casing/c10mm,
+/obj/effect/decal/cleanable/blood,
+/obj/effect/turf_decal/tile/blue/half/contrasted{
+ dir = 4
},
-/area/awaymission/spacebattle/cruiser)
-"BE" = (
-/obj/machinery/door/unpowered/shuttle,
/turf/open/floor/iron,
/area/awaymission/spacebattle/cruiser)
"BO" = (
/turf/closed/wall/mineral/plastitanium/nodiagonal,
/area/awaymission/spacebattle/syndicate2)
-"BR" = (
-/obj/machinery/sleeper,
-/turf/open/floor/iron/white,
-/area/awaymission/spacebattle/cruiser)
-"Cr" = (
-/obj/effect/mob_spawn/human/engineer{
- mob_name = "Carth Robinson";
- name = "Carth Robinson"
- },
-/obj/effect/decal/cleanable/blood,
-/turf/open/floor/iron/freezer,
-/area/awaymission/spacebattle/cruiser)
-"Dc" = (
-/obj/item/stack/sheet/iron,
-/turf/open/floor/iron{
- icon_state = "damaged1"
- },
-/area/awaymission/spacebattle/cruiser)
-"Dl" = (
-/turf/open/floor/iron/freezer,
-/area/awaymission/spacebattle/cruiser)
-"Dv" = (
-/turf/closed/wall/mineral/plastitanium/nodiagonal,
-/area/awaymission/spacebattle/syndicate3)
-"DD" = (
-/obj/structure/closet/wardrobe/engineering_yellow,
-/turf/open/floor/iron,
-/area/awaymission/spacebattle/cruiser)
-"DO" = (
-/obj/item/storage/firstaid/regular,
-/turf/open/floor/iron/white,
-/area/awaymission/spacebattle/cruiser)
-"DQ" = (
-/obj/structure/table/reinforced,
-/obj/item/reagent_containers/food/condiment/enzyme,
-/turf/open/floor/iron/cafeteria{
- dir = 2
- },
-/area/awaymission/spacebattle/cruiser)
-"DT" = (
-/obj/effect/mob_spawn/human/nanotrasensoldier,
-/obj/item/gun/ballistic/automatic/wt550,
+"Ck" = (
+/obj/structure/closet/l3closet/security,
+/obj/effect/turf_decal/tile/red/half/contrasted,
/turf/open/floor/iron,
/area/awaymission/spacebattle/cruiser)
-"Eb" = (
-/turf/open/floor/iron{
- icon_state = "damaged2"
- },
-/area/awaymission/spacebattle/cruiser)
-"ES" = (
-/obj/structure/table/reinforced,
-/turf/open/floor/iron/cafeteria{
- dir = 2
- },
-/area/awaymission/spacebattle/cruiser)
-"EW" = (
-/obj/item/ammo_casing/c10mm,
-/obj/item/ammo_casing/c10mm,
-/obj/item/ammo_casing/c10mm,
-/obj/item/ammo_casing/c10mm,
-/mob/living/simple_animal/hostile/syndicate/ranged/smg,
-/turf/open/floor/iron/freezer,
-/area/awaymission/spacebattle/cruiser)
-"Fj" = (
-/obj/structure/table/reinforced,
-/obj/item/food/fries,
-/turf/open/floor/iron/cafeteria{
- dir = 2
- },
-/area/awaymission/spacebattle/cruiser)
-"FB" = (
-/mob/living/simple_animal/hostile/syndicate/mecha_pilot{
- spawn_mecha_type = /obj/vehicle/sealed/mecha/combat/gygax/dark/loaded
+"Cv" = (
+/obj/effect/turf_decal/tile/blue/half/contrasted{
+ dir = 1
},
/turf/open/floor/iron,
/area/awaymission/spacebattle/cruiser)
-"FH" = (
-/turf/open/floor/iron{
- icon_state = "damaged4"
- },
-/area/awaymission/spacebattle/cruiser)
-"FN" = (
-/obj/item/ammo_casing/c10mm,
-/obj/item/ammo_casing/c10mm,
+"CL" = (
+/obj/item/ammo_casing/shotgun,
/obj/effect/turf_decal/tile/blue/half/contrasted{
- dir = 4
+ dir = 8
},
/turf/open/floor/iron,
/area/awaymission/spacebattle/cruiser)
-"Gx" = (
-/obj/vehicle/sealed/mecha/medical/odysseus,
-/turf/open/floor/plating,
-/area/awaymission/spacebattle/cruiser)
-"GF" = (
+"Dv" = (
+/turf/closed/wall/mineral/plastitanium/nodiagonal,
+/area/awaymission/spacebattle/syndicate3)
+"EG" = (
+/mob/living/simple_animal/hostile/syndicate/melee/sword,
/obj/effect/turf_decal/tile/blue/half/contrasted{
dir = 1
},
/turf/open/floor/iron,
/area/awaymission/spacebattle/cruiser)
-"Hc" = (
-/obj/structure/table/reinforced,
-/obj/item/storage/firstaid/regular,
-/turf/open/floor/iron/white,
-/area/awaymission/spacebattle/cruiser)
-"Hw" = (
-/obj/structure/table/reinforced,
+"ER" = (
+/obj/machinery/computer/security{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/blue/fourcorners/contrasted,
/turf/open/floor/iron,
/area/awaymission/spacebattle/cruiser)
-"HM" = (
+"FV" = (
/obj/structure/chair{
dir = 4
},
/obj/effect/turf_decal/tile/bar/opposingcorners,
/turf/open/floor/iron,
/area/awaymission/spacebattle/cruiser)
-"HS" = (
-/obj/structure/table/reinforced,
-/obj/machinery/button/door{
- dir = 2;
- id = "spacebattlearmory2";
- name = "Weapon Cache"
- },
-/obj/effect/turf_decal/tile/blue/half/contrasted{
+"Gy" = (
+/obj/structure/closet/secure_closet/security,
+/obj/effect/turf_decal/tile/red/anticorner/contrasted{
dir = 4
},
/turf/open/floor/iron,
/area/awaymission/spacebattle/cruiser)
-"Ih" = (
-/obj/structure/sink{
- dir = 4;
- pixel_x = 11
- },
-/turf/open/floor/iron/freezer,
-/area/awaymission/spacebattle/cruiser)
-"IN" = (
+"Hn" = (
/obj/structure/chair{
- dir = 1
+ dir = 8
},
+/obj/effect/landmark/awaystart,
/obj/effect/turf_decal/tile/bar/opposingcorners,
/turf/open/floor/iron,
/area/awaymission/spacebattle/cruiser)
-"JO" = (
-/obj/effect/mob_spawn/human/syndicatesoldier,
-/obj/item/gun/ballistic/automatic/c20r,
-/obj/item/ammo_casing/c10mm,
-/obj/item/ammo_casing/c10mm,
-/obj/effect/decal/cleanable/blood,
-/obj/effect/turf_decal/tile/blue/half/contrasted{
+"HI" = (
+/obj/machinery/computer/communications{
dir = 8
},
+/obj/effect/turf_decal/tile/blue/fourcorners/contrasted,
/turf/open/floor/iron,
/area/awaymission/spacebattle/cruiser)
-"JR" = (
-/turf/open/floor/iron/cafeteria{
- dir = 2
- },
-/area/awaymission/spacebattle/cruiser)
-"JZ" = (
+"Id" = (
+/obj/item/ammo_casing/shotgun,
/obj/item/ammo_casing/c10mm,
/obj/item/ammo_casing/c10mm,
-/turf/open/floor/iron{
- icon_state = "damaged2"
- },
-/area/awaymission/spacebattle/cruiser)
-"Ku" = (
-/turf/open/floor/iron{
- icon_state = "damaged1"
- },
-/area/awaymission/spacebattle/cruiser)
-"KE" = (
-/obj/item/ammo_casing/shotgun,
-/obj/effect/turf_decal/tile/blue/half/contrasted{
- dir = 8
- },
-/turf/open/floor/iron,
-/area/awaymission/spacebattle/cruiser)
-"KJ" = (
-/obj/structure/rack,
-/obj/item/storage/toolbox/mechanical,
-/obj/item/storage/toolbox/electrical,
-/turf/open/floor/iron,
-/area/awaymission/spacebattle/cruiser)
-"KO" = (
+/obj/item/stack/sheet/iron,
/obj/effect/turf_decal/tile/blue/half/contrasted{
dir = 8
},
/turf/open/floor/iron,
/area/awaymission/spacebattle/cruiser)
-"Ln" = (
-/obj/machinery/button/door{
- dir = 2;
- id = "spacebattlestorage";
- name = "Secure Storage";
- pixel_x = 32
- },
-/turf/open/floor/iron,
-/area/awaymission/spacebattle/cruiser)
-"Lx" = (
-/obj/structure/table/reinforced,
-/obj/machinery/button/door{
- dir = 2;
- id = "spacebattlearmory1";
- name = "Weapon Cache"
- },
-/obj/effect/turf_decal/tile/blue/half/contrasted{
+"IG" = (
+/obj/effect/turf_decal/tile/red/half/contrasted{
dir = 4
},
/turf/open/floor/iron,
/area/awaymission/spacebattle/cruiser)
-"LC" = (
-/obj/machinery/portable_atmospherics/canister/oxygen,
-/obj/effect/turf_decal/stripes/line{
- dir = 6
+"IP" = (
+/obj/item/ammo_casing/c10mm,
+/obj/item/ammo_casing/c10mm,
+/obj/effect/turf_decal/tile/blue/half/contrasted{
+ dir = 8
},
/turf/open/floor/iron,
/area/awaymission/spacebattle/cruiser)
-"Mw" = (
-/obj/machinery/computer/operating,
-/turf/open/floor/iron/white,
-/area/awaymission/spacebattle/cruiser)
-"MM" = (
-/obj/structure/table/reinforced,
-/obj/machinery/button/door{
- dir = 2;
- id = "spacebattlearmory";
- name = "Weapon Cache"
- },
+"IS" = (
+/obj/item/clothing/suit/space/hardsuit/wizard,
+/turf/open/floor/vault/alien,
+/area/awaymission/spacebattle/secret)
+"JP" = (
/obj/effect/turf_decal/tile/blue/half/contrasted{
dir = 4
},
/turf/open/floor/iron,
/area/awaymission/spacebattle/cruiser)
-"Nf" = (
+"Ls" = (
+/turf/open/floor/vault/alien,
+/area/awaymission/spacebattle/secret)
+"NZ" = (
/obj/structure/table/reinforced,
-/obj/item/scalpel,
-/obj/item/circular_saw,
-/turf/open/floor/iron/white/side{
- dir = 2
+/obj/effect/turf_decal/tile/blue/anticorner/contrasted{
+ dir = 8
},
-/area/awaymission/spacebattle/cruiser)
-"Nl" = (
-/obj/item/ammo_casing/c10mm,
/turf/open/floor/iron,
/area/awaymission/spacebattle/cruiser)
-"Nt" = (
-/obj/machinery/computer/security{
+"On" = (
+/obj/effect/turf_decal/tile/red/anticorner/contrasted{
dir = 8
},
-/obj/effect/turf_decal/tile/blue/fourcorners/contrasted,
/turf/open/floor/iron,
/area/awaymission/spacebattle/cruiser)
-"Nx" = (
-/obj/item/stack/rods,
+"OJ" = (
+/obj/effect/turf_decal/tile/bar/opposingcorners,
/turf/open/floor/iron,
/area/awaymission/spacebattle/cruiser)
-"Od" = (
-/obj/machinery/portable_atmospherics/canister/oxygen,
-/obj/effect/turf_decal/stripes/line{
- dir = 5
+"PV" = (
+/mob/living/simple_animal/hostile/syndicate/mecha_pilot{
+ spawn_mecha_type = /obj/vehicle/sealed/mecha/combat/gygax/dark/loaded
},
-/turf/open/floor/iron,
-/area/awaymission/spacebattle/cruiser)
-"OH" = (
-/mob/living/simple_animal/hostile/syndicate/ranged/smg/space,
/turf/open/floor/iron/airless,
/area/awaymission/spacebattle/cruiser)
-"OM" = (
-/obj/structure/closet/secure_closet/engineering_welding,
-/turf/open/floor/iron,
-/area/awaymission/spacebattle/cruiser)
-"Ps" = (
-/turf/open/floor/iron/white/side{
+"Qt" = (
+/obj/structure/chair{
dir = 1
},
-/area/awaymission/spacebattle/cruiser)
-"PB" = (
-/obj/effect/landmark/awaystart,
-/obj/effect/turf_decal/tile/red/half/contrasted{
- dir = 4
- },
+/obj/effect/turf_decal/tile/bar/opposingcorners,
/turf/open/floor/iron,
/area/awaymission/spacebattle/cruiser)
-"PK" = (
-/obj/item/ammo_casing/c10mm,
-/obj/item/ammo_casing/c10mm,
-/obj/item/ammo_casing/c10mm,
-/obj/item/ammo_casing/c10mm,
+"QT" = (
+/obj/structure/chair,
+/obj/effect/landmark/awaystart,
+/obj/effect/turf_decal/tile/bar/opposingcorners,
/turf/open/floor/iron,
/area/awaymission/spacebattle/cruiser)
-"PL" = (
-/obj/item/circular_saw,
-/turf/open/floor/iron/white,
-/area/awaymission/spacebattle/cruiser)
-"Qg" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 5
+"Rz" = (
+/mob/living/simple_animal/hostile/syndicate/mecha_pilot{
+ spawn_mecha_type = /obj/vehicle/sealed/mecha/combat/gygax/dark/loaded
},
/turf/open/floor/iron,
/area/awaymission/spacebattle/cruiser)
-"Qn" = (
-/obj/item/stack/sheet/iron,
-/turf/open/floor/iron/airless,
-/area/awaymission/spacebattle/cruiser)
-"Qr" = (
+"RG" = (
/obj/structure/table/reinforced,
/obj/effect/turf_decal/tile/blue/anticorner/contrasted{
- dir = 8
- },
-/turf/open/floor/iron,
-/area/awaymission/spacebattle/cruiser)
-"Qs" = (
-/obj/structure/chair{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/awaymission/spacebattle/cruiser)
-"QF" = (
-/obj/structure/chair{
- dir = 8
+ dir = 1
},
-/obj/effect/landmark/awaystart,
-/obj/effect/turf_decal/tile/bar/opposingcorners,
/turf/open/floor/iron,
/area/awaymission/spacebattle/cruiser)
-"QI" = (
-/turf/open/floor/iron/white,
-/area/awaymission/spacebattle/cruiser)
-"QK" = (
+"Sm" = (
/obj/structure/table/reinforced,
-/obj/effect/turf_decal/tile/bar/opposingcorners,
-/turf/open/floor/iron,
-/area/awaymission/spacebattle/cruiser)
-"Rd" = (
-/obj/item/stack/sheet/iron,
-/turf/open/floor/iron{
- icon_state = "damaged4"
- },
-/area/awaymission/spacebattle/cruiser)
-"Re" = (
-/obj/structure/chair,
-/obj/effect/turf_decal/tile/bar/opposingcorners,
-/turf/open/floor/iron,
-/area/awaymission/spacebattle/cruiser)
-"Rn" = (
-/mob/living/simple_animal/hostile/syndicate/melee/sword,
-/turf/open/floor/iron,
-/area/awaymission/spacebattle/cruiser)
-"Ry" = (
-/obj/effect/decal/cleanable/blood,
-/obj/effect/turf_decal/tile/bar/opposingcorners,
-/turf/open/floor/iron,
-/area/awaymission/spacebattle/cruiser)
-"RX" = (
-/obj/item/gun/ballistic/shotgun/automatic/combat,
-/turf/open/floor/iron,
-/area/awaymission/spacebattle/cruiser)
-"Sd" = (
-/mob/living/simple_animal/hostile/syndicate/ranged/smg,
+/obj/effect/turf_decal/tile/blue/fourcorners/contrasted,
/turf/open/floor/iron,
/area/awaymission/spacebattle/cruiser)
-"Sj" = (
-/obj/effect/mob_spawn/human/doctor{
- mob_name = "Herbert West";
- name = "Herbert West"
+"St" = (
+/obj/effect/turf_decal/tile/red/half/contrasted{
+ dir = 1
},
-/obj/effect/decal/cleanable/blood,
-/turf/open/floor/iron/white,
-/area/awaymission/spacebattle/cruiser)
-"Sq" = (
-/obj/structure/rack,
-/obj/item/storage/toolbox/mechanical,
/turf/open/floor/iron,
/area/awaymission/spacebattle/cruiser)
-"SG" = (
-/obj/effect/mob_spawn/human/engineer{
- mob_name = "Bill Sanchez";
- name = "Bill Sanchez"
+"SH" = (
+/obj/structure/chair{
+ dir = 8
},
-/obj/effect/decal/cleanable/blood,
+/obj/effect/turf_decal/tile/bar/opposingcorners,
/turf/open/floor/iron,
/area/awaymission/spacebattle/cruiser)
-"SU" = (
+"TH" = (
/obj/machinery/computer/med_data{
dir = 8
},
/obj/effect/turf_decal/tile/blue/fourcorners/contrasted,
/turf/open/floor/iron,
/area/awaymission/spacebattle/cruiser)
-"Th" = (
-/obj/effect/turf_decal/tile/red/half/contrasted{
- dir = 1
- },
-/turf/open/floor/iron,
-/area/awaymission/spacebattle/cruiser)
-"Ur" = (
-/obj/machinery/computer/operating,
-/turf/open/floor/iron/white/side{
- dir = 2
- },
-/area/awaymission/spacebattle/cruiser)
-"UV" = (
-/obj/effect/landmark/awaystart,
-/turf/open/floor/iron/cafeteria{
- dir = 2
- },
-/area/awaymission/spacebattle/cruiser)
-"UY" = (
-/obj/structure/table/reinforced,
-/obj/item/kitchen/rollingpin,
-/turf/open/floor/iron/cafeteria{
- dir = 2
- },
-/area/awaymission/spacebattle/cruiser)
"UZ" = (
/turf/closed/wall/mineral/plastitanium/nodiagonal,
/area/awaymission/spacebattle/syndicate1)
-"Vc" = (
-/obj/effect/mob_spawn/human/nanotrasensoldier,
-/obj/item/gun/ballistic/automatic/wt550,
-/obj/effect/decal/cleanable/blood,
-/turf/open/floor/iron,
+"Wv" = (
+/turf/closed/wall/mineral/plastitanium/nodiagonal,
/area/awaymission/spacebattle/cruiser)
-"Vu" = (
-/obj/machinery/shower{
+"WP" = (
+/obj/effect/turf_decal/tile/red/half/contrasted{
dir = 8
},
-/turf/open/floor/iron/freezer,
-/area/awaymission/spacebattle/cruiser)
-"VS" = (
-/obj/structure/table/reinforced,
-/obj/item/food/sausage,
-/turf/open/floor/iron/cafeteria{
- dir = 2
- },
-/area/awaymission/spacebattle/cruiser)
-"Wi" = (
-/obj/item/ammo_casing/a357,
-/obj/item/ammo_casing/a357,
-/obj/item/gun/ballistic/revolver/mateba,
-/obj/effect/mob_spawn/human/commander{
- mob_name = "Aaron Bowden";
- name = "Aaron Bowden"
- },
-/obj/effect/decal/cleanable/blood,
/turf/open/floor/iron,
/area/awaymission/spacebattle/cruiser)
-"Wv" = (
-/turf/closed/wall/mineral/plastitanium/nodiagonal,
-/area/awaymission/spacebattle/cruiser)
-"WW" = (
-/obj/structure/table/optable,
-/turf/open/floor/iron/white,
+"Xk" = (
+/obj/structure/closet/secure_closet/security,
+/obj/effect/turf_decal/tile/red/half/contrasted,
+/turf/open/floor/iron,
/area/awaymission/spacebattle/cruiser)
-"Xo" = (
+"XU" = (
/obj/structure/table/reinforced,
-/obj/effect/turf_decal/tile/blue/half/contrasted{
- dir = 4
+/obj/machinery/button/door{
+ dir = 2;
+ id = "spacebattlearmory";
+ name = "Weapon Cache"
},
-/turf/open/floor/iron,
-/area/awaymission/spacebattle/cruiser)
-"Xp" = (
/obj/effect/turf_decal/tile/blue/half/contrasted{
dir = 4
},
/turf/open/floor/iron,
/area/awaymission/spacebattle/cruiser)
-"Xs" = (
-/obj/machinery/sleeper,
-/turf/open/floor/iron/white/side{
- dir = 1
- },
-/area/awaymission/spacebattle/cruiser)
-"XE" = (
-/obj/item/stack/sheet/iron,
-/obj/item/ammo_casing/c10mm,
-/turf/open/floor/iron,
-/area/awaymission/spacebattle/cruiser)
-"XM" = (
-/obj/effect/mob_spawn/human/bridgeofficer{
- mob_name = "Walter Strider";
- name = "Walter Strider"
- },
-/obj/item/gun/ballistic/shotgun/automatic/combat,
+"XY" = (
/obj/item/ammo_casing/c10mm,
/obj/item/ammo_casing/c10mm,
-/obj/effect/decal/cleanable/blood,
-/turf/open/floor/iron{
- icon_state = "damaged3"
+/obj/effect/turf_decal/tile/blue/half/contrasted{
+ dir = 4
},
+/turf/open/floor/iron,
/area/awaymission/spacebattle/cruiser)
"Yq" = (
/turf/closed/wall/mineral/plastitanium/nodiagonal,
/area/awaymission/spacebattle/syndicate4)
-"Yr" = (
-/obj/machinery/computer/telecomms/monitor{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/awaymission/spacebattle/cruiser)
-"YB" = (
-/obj/machinery/shower{
- dir = 4
- },
-/obj/item/bikehorn/rubberducky,
-/turf/open/floor/iron/freezer,
-/area/awaymission/spacebattle/cruiser)
-"YK" = (
-/obj/item/ammo_casing/shotgun,
-/obj/effect/decal/cleanable/blood,
-/turf/open/floor/iron,
-/area/awaymission/spacebattle/cruiser)
-"YX" = (
-/obj/effect/mob_spawn/human/engineer{
- mob_name = "Rosen Miller";
- name = "Rosen Miller"
- },
-/obj/effect/decal/cleanable/blood,
-/turf/open/floor/iron,
-/area/awaymission/spacebattle/cruiser)
-"Zc" = (
-/mob/living/simple_animal/hostile/syndicate,
-/turf/open/floor/iron/white,
-/area/awaymission/spacebattle/cruiser)
-"Ze" = (
-/obj/structure/rack,
-/obj/item/storage/toolbox/electrical,
-/turf/open/floor/iron,
-/area/awaymission/spacebattle/cruiser)
-"ZR" = (
-/obj/effect/decal/cleanable/blood,
-/turf/open/floor/iron/white,
-/area/awaymission/spacebattle/cruiser)
(1,1,1) = {"
aa
@@ -21844,15 +21844,15 @@ ab
ab
ab
bT
-Yr
-Hw
-Hw
-Bc
-Bc
-Bc
-Hw
-Hw
-Hw
+bZ
+cg
+cg
+cv
+cv
+cv
+cg
+cg
+cg
bT
ab
ab
@@ -21873,15 +21873,15 @@ ab
ab
ab
bT
-Hw
-Hw
-Hw
-Bc
-Bc
-Bc
-Hw
-Hw
-Yr
+cg
+cg
+cg
+cv
+cv
+cv
+cg
+cg
+bZ
bT
ab
ab
@@ -22101,15 +22101,15 @@ ab
ab
ab
bT
-yE
-zL
-zL
-zL
-zL
-zL
-zL
-ru
-zL
+ca
+cc
+cc
+cc
+cc
+cc
+cc
+cQ
+cc
bT
ab
ab
@@ -22130,15 +22130,15 @@ ab
ab
ab
bT
-zL
-zL
-zL
-zL
-zL
-zL
-zL
-zL
-oi
+cc
+cc
+cc
+cc
+cc
+cc
+cc
+cc
+iw
bT
ab
ab
@@ -22360,13 +22360,13 @@ bM
bM
bM
bM
-zL
-Ku
-zL
-rE
-Vc
-zL
-pN
+cc
+cp
+cc
+cr
+kl
+cc
+dg
du
ab
ab
@@ -22387,15 +22387,15 @@ ab
ab
ab
bT
-zL
-zL
-zL
-zL
-zL
-zL
-zL
-zL
-zL
+cc
+cc
+cc
+cc
+cc
+cc
+cc
+cc
+cc
bT
ab
ab
@@ -22618,12 +22618,12 @@ bO
cb
Wv
bM
-zL
-vi
-zL
-rE
-rE
-rE
+cc
+cL
+cc
+cr
+cr
+cr
bT
ab
ab
@@ -22644,15 +22644,15 @@ ab
ab
ab
bT
-zL
-zL
-zL
-zL
-zL
-zL
-zL
-zL
-zL
+cc
+cc
+cc
+cc
+cc
+cc
+cc
+cc
+cc
bT
ab
ab
@@ -22874,13 +22874,13 @@ bO
bO
bO
ci
-FH
-JZ
-Ku
-zL
-ru
-zL
-sg
+cm
+cw
+cp
+cc
+cQ
+cc
+dh
bT
ab
ab
@@ -22901,15 +22901,15 @@ ab
ab
ab
bT
-Ze
-zL
-zL
-zL
-zL
-zL
-zL
-zL
-zL
+kB
+cc
+cc
+cc
+cc
+cc
+cc
+cc
+cc
bT
ab
ab
@@ -23131,13 +23131,13 @@ hy
bO
bO
ci
-yr
-FH
-Nl
-zL
-zL
-zL
-sg
+cn
+cm
+cM
+cc
+cc
+cc
+dh
bT
ab
ab
@@ -23158,15 +23158,15 @@ ab
ab
ab
bT
-Sq
-zL
-zL
-zL
-zL
-zL
-zL
-zL
-zL
+kD
+cc
+cc
+cc
+cc
+cc
+cc
+cc
+cc
bT
ab
ab
@@ -23389,12 +23389,12 @@ bO
bO
Wv
bM
-XE
-Eb
-Nl
-zL
-zL
-sg
+cx
+cN
+cM
+cc
+cc
+dh
bT
ab
ab
@@ -23415,15 +23415,15 @@ ab
ab
ab
bT
-KJ
-zL
-zL
-zL
-zL
-zL
-zL
-zL
-zL
+kC
+cc
+cc
+cc
+cc
+cc
+cc
+cc
+cc
bT
ab
ab
@@ -23645,13 +23645,13 @@ bM
bM
bM
bM
-Ku
-zL
-Eb
-zL
-zL
-rE
-eM
+cp
+cc
+cN
+cc
+cc
+cr
+di
bT
ab
ab
@@ -23672,15 +23672,15 @@ ab
ab
ab
bT
-eM
-zL
-zL
-zL
-zL
-zL
-zL
-zL
-zL
+di
+cc
+cc
+cc
+cc
+cc
+cc
+cc
+cc
bT
ab
ab
@@ -23900,15 +23900,15 @@ ab
ab
ab
bT
-zL
-zL
-zL
-zL
-zL
-zL
-SG
-zL
-eM
+cc
+cc
+cc
+cc
+cc
+cc
+cS
+cc
+di
bT
ab
ab
@@ -23929,15 +23929,15 @@ ab
ab
ab
bT
-eM
-zL
-zL
-zL
-zL
-rE
-zL
-zL
-zL
+di
+cc
+cc
+cc
+cc
+cr
+cc
+cc
+cc
bT
ab
ab
@@ -24157,15 +24157,15 @@ ab
ab
ab
bT
-zL
-zL
-zL
-zL
-vi
-ru
-zL
-zL
-OM
+cc
+cc
+cc
+cc
+cL
+cQ
+cc
+cc
+dj
ht
ht
ht
@@ -24186,15 +24186,15 @@ ht
ht
ht
ht
-OM
-zL
-zL
-zL
-zL
-zL
-zL
-zL
-zL
+dj
+cc
+cc
+cc
+cc
+cc
+cc
+cc
+cc
bT
ab
ab
@@ -24414,15 +24414,15 @@ ab
ab
ab
bT
-zL
-zL
-Vc
-PK
-Nl
-zL
-zL
-zL
-OM
+cc
+cc
+kl
+cy
+cM
+cc
+cc
+cc
+dj
ht
el
ih
@@ -24443,15 +24443,15 @@ kc
kf
el
ht
-OM
-zL
-zL
-zL
-zL
-zL
-sj
-zL
-zL
+dj
+cc
+cc
+cc
+cc
+cc
+is
+cc
+cc
bT
ab
ab
@@ -24671,15 +24671,15 @@ ab
ab
ab
bT
-zL
-rE
-zL
-zL
-zL
-zL
-zL
-zL
-DD
+cc
+cr
+cc
+cc
+cc
+cc
+cc
+cc
+dk
ht
el
el
@@ -24700,15 +24700,15 @@ el
el
el
ht
-DD
-zL
-zL
-zL
-zL
-zL
-zL
-Sd
-zL
+dk
+cc
+cc
+cc
+cc
+cc
+cc
+it
+cc
bT
ab
ab
@@ -24928,15 +24928,15 @@ ab
ab
ab
bT
-zL
-zL
-zL
-zL
-zL
-zL
-zL
-zL
-DD
+cc
+cc
+cc
+cc
+cc
+cc
+cc
+cc
+dk
ht
hN
el
@@ -24957,15 +24957,15 @@ el
el
hN
ht
-DD
-zL
-zL
-zL
-zL
-zL
-zL
-zL
-vi
+dk
+cc
+cc
+cc
+cc
+cc
+cc
+cc
+cL
bT
ab
ab
@@ -25185,15 +25185,15 @@ ab
ab
ab
bT
-zL
-zL
-zL
-zL
-zL
-sk
-sk
-sk
-DD
+cc
+cc
+cc
+cc
+cc
+cO
+cO
+cO
+dk
ht
hP
el
@@ -25214,15 +25214,15 @@ el
el
kp
ht
-DD
-zL
-zL
-zL
-zL
-zL
-Eb
-zL
-vi
+dk
+cc
+cc
+cc
+cc
+cc
+cN
+cc
+cL
bT
ab
ab
@@ -25442,15 +25442,15 @@ ab
ab
ab
bT
-zL
-zL
-zL
-rE
-zL
-sk
-sk
-sk
-lU
+cc
+cc
+cc
+cr
+cc
+cO
+cO
+cO
+dl
ht
hO
el
@@ -25471,15 +25471,15 @@ el
el
hO
ht
-lU
-zL
-zL
-zL
-zL
-Rn
-Nl
-Eb
-Eb
+dl
+cc
+cc
+cc
+cc
+fm
+cM
+cN
+cN
bT
ab
ab
@@ -25699,15 +25699,15 @@ ab
ab
ab
bT
-zL
-zL
-YX
-zL
-zL
-zL
-zL
-zL
-lU
+cc
+cc
+cq
+cc
+cc
+cc
+cc
+cc
+dl
ht
el
el
@@ -25728,15 +25728,15 @@ el
el
el
ht
-lU
-zL
-zL
-zL
-zL
-zL
-zL
-iJ
-Ku
+dl
+cc
+cc
+cc
+cc
+cc
+cc
+iu
+cp
bT
ab
ab
@@ -25956,15 +25956,15 @@ ab
ab
ab
bT
-zL
-zL
-rE
-zL
-zL
-zL
-zL
-zL
-lU
+cc
+cc
+cr
+cc
+cc
+cc
+cc
+cc
+dl
ht
el
ik
@@ -25985,15 +25985,15 @@ hP
kg
el
ht
-lU
-zL
-zL
-zL
-zL
-zL
-Ku
-Eb
-Eb
+dl
+cc
+cc
+cc
+cc
+cc
+cp
+cN
+cN
bT
ab
ab
@@ -26213,8 +26213,8 @@ ab
ab
ab
bT
-BE
-BE
+cd
+cd
bT
bT
bT
@@ -26249,8 +26249,8 @@ bT
bT
bT
bT
-BE
-BE
+cd
+cd
bT
ab
ab
@@ -26470,15 +26470,15 @@ ab
ab
ab
bT
-zL
-zL
+cc
+cc
bT
-ub
-ub
-ub
-ub
-ub
-ub
+cz
+cz
+cz
+cz
+cz
+cz
bT
cK
cK
@@ -26499,15 +26499,15 @@ gS
hn
hw
bT
-YB
-Dl
-nE
-Dl
-nE
-Dl
+hV
+hW
+if
+hW
+if
+hW
bT
-zL
-zL
+cc
+cc
bT
ab
ab
@@ -26727,15 +26727,15 @@ ab
ab
ab
bT
-zL
-zL
+cc
+cc
bT
-zL
-zL
-zL
-zL
-zL
-zL
+cc
+cc
+cc
+cc
+cc
+cc
bT
cK
ec
@@ -26756,15 +26756,15 @@ gS
hn
hn
bT
-Dl
-Dl
-Dl
-Dl
-Dl
-Dl
+hW
+hW
+hW
+hW
+hW
+hW
bT
-zL
-zL
+cc
+cc
bT
ab
ab
@@ -26984,15 +26984,15 @@ ab
ab
ab
bT
-zL
-zL
+cc
+cc
bT
-oZ
-zL
-oZ
-zL
-oZ
-zL
+cA
+cc
+cA
+cc
+cA
+cc
bT
cK
ed
@@ -27013,15 +27013,15 @@ he
hn
hn
bT
-Vu
-Dl
-wl
-Dl
-Vu
-Dl
+hX
+hW
+ig
+hW
+hX
+hW
bT
-zL
-zL
+cc
+cc
bT
ab
ab
@@ -27241,15 +27241,15 @@ ab
ab
ab
bT
-zL
-zL
+cc
+cc
bT
-zL
-zL
-zL
-zL
-zL
-zL
+cc
+cc
+cc
+cc
+cc
+cc
bT
cK
ee
@@ -27275,10 +27275,10 @@ bT
bT
du
bT
-wx
+ib
bT
-zL
-zL
+cc
+cc
bT
ab
ab
@@ -27498,15 +27498,15 @@ ab
ab
ab
bT
-zL
-zL
+cc
+cc
bT
-oZ
-zL
-oZ
-zL
-oZ
-zL
+cA
+cc
+cA
+cc
+cA
+cc
bT
cK
cK
@@ -27527,15 +27527,15 @@ ka
hn
hn
bT
-wk
-wx
-Dl
-Cr
-Dl
-Dl
+hY
+ib
+hW
+ij
+hW
+hW
bT
-zL
-zL
+cc
+cc
bT
ab
ab
@@ -27755,18 +27755,18 @@ ab
ab
ab
bT
-zL
-zL
+cc
+cc
bT
-zL
-zL
-zL
-zL
-zL
-zL
+cc
+cc
+cc
+cc
+cc
+cc
bT
-Gx
-xG
+xq
+pS
cK
cK
cK
@@ -27786,13 +27786,13 @@ ho
bT
bT
bT
-Dl
-Dl
-Dl
-Dl
+hW
+hW
+hW
+hW
bT
-zL
-zL
+cc
+cc
bT
ab
ab
@@ -28012,15 +28012,15 @@ ab
ab
ab
bT
-zL
-zL
+cc
+cc
bT
-oZ
-sk
-oZ
-zL
-oZ
-zL
+cA
+cO
+cA
+cc
+cA
+cc
bT
cK
cK
@@ -28041,15 +28041,15 @@ cK
ho
ho
bT
-wk
-wx
-Dl
-Dl
-Dl
-Dl
+hY
+ib
+hW
+hW
+hW
+hW
bT
-zL
-zL
+cc
+cc
bT
ab
ab
@@ -28269,15 +28269,15 @@ ab
ab
ab
bT
-zL
-zL
+cc
+cc
bT
-zL
-zL
-zL
-zL
-zL
-zL
+cc
+cc
+cc
+cc
+cc
+cc
bT
dM
jq
@@ -28300,13 +28300,13 @@ hx
bT
bT
bT
-Dl
-Dl
-Dl
-Dl
+hW
+hW
+hW
+hW
bT
-zL
-zL
+cc
+cc
bT
ab
ab
@@ -28526,15 +28526,15 @@ ab
ab
ab
bT
-zL
-zL
+cc
+cc
bT
-oZ
-zL
-oZ
-zL
-oZ
-zL
+cA
+cc
+cA
+cc
+cA
+cc
bT
km
eg
@@ -28555,15 +28555,15 @@ cK
eT
kL
bT
-wk
-wx
-Dl
-Dl
-Dl
-Dl
+hY
+ib
+hW
+hW
+hW
+hW
bT
-zL
-zL
+cc
+cc
bT
ab
ab
@@ -28783,15 +28783,15 @@ ab
ab
ab
bT
-zL
-zL
+cc
+cc
bT
-zL
-zL
-zL
-zL
-zL
-zL
+cc
+cc
+cc
+cc
+cc
+cc
bT
dO
dO
@@ -28814,13 +28814,13 @@ eT
bT
bT
bT
-Dl
-Dl
-Dl
-Dl
+hW
+hW
+hW
+hW
bT
-zL
-zL
+cc
+cc
bT
ab
ab
@@ -29040,15 +29040,15 @@ ab
ab
ab
bT
-zL
-zL
+cc
+cc
bT
-oZ
-zL
-oZ
-zL
-oZ
-rE
+cA
+cc
+cA
+cc
+cA
+cr
bT
dO
dO
@@ -29069,15 +29069,15 @@ cK
eT
hz
bT
-wk
-wx
-Dl
-EW
-Dl
-Dl
+hY
+ib
+hW
+kG
+hW
+hW
bT
-zL
-zL
+cc
+cc
bT
ab
ab
@@ -29297,15 +29297,15 @@ ab
ab
ab
bT
-zL
-zL
+cc
+cc
bT
-zL
-zL
-zL
-zL
-zL
-rL
+cc
+cc
+cc
+cc
+cc
+dm
bT
dP
dP
@@ -29328,13 +29328,13 @@ hz
bT
bT
bT
-Dl
-Dl
-Dl
-Dl
+hW
+hW
+hW
+hW
bT
-zL
-zL
+cc
+cc
bT
ab
ab
@@ -29554,15 +29554,15 @@ ab
ab
ab
bT
-zL
-zL
+cc
+cc
bT
-sV
-zL
-zL
-zL
-zL
-rE
+cB
+cc
+cc
+cc
+cc
+cr
bT
dP
dP
@@ -29583,15 +29583,15 @@ cK
hp
hA
bT
-wk
-wx
-Dl
-Dl
-Ih
-Ih
+hY
+ib
+hW
+hW
+io
+io
bT
-zL
-zL
+cc
+cc
bT
ab
ab
@@ -29811,13 +29811,13 @@ ab
ab
ab
bT
-zL
-zL
+cc
+cc
ct
bT
bT
-BE
-BE
+cd
+cd
bT
bT
bT
@@ -29828,10 +29828,10 @@ bT
bT
bT
bT
-os
-os
-os
-os
+fh
+fh
+fh
+fh
bT
du
bT
@@ -29842,13 +29842,13 @@ bT
bT
bT
bT
-BE
-BE
+cd
+cd
bT
bT
ct
-zL
-zL
+cc
+cc
bT
ab
ab
@@ -30068,44 +30068,44 @@ ab
ab
ab
bT
-zL
-Rn
-zL
-zL
-zL
-zL
-zL
-zL
-zL
-zL
-DT
-zL
-zL
-zL
-zL
-zL
-zL
-zL
-zL
-zL
-zL
-zL
-wL
-rE
-zL
-zL
-zL
-zL
-zL
-zL
-zL
-zL
-zL
-zL
-zL
-zL
-zL
-Rn
+cc
+fm
+cc
+cc
+cc
+cc
+cc
+cc
+cc
+cc
+fr
+cc
+cc
+cc
+cc
+cc
+cc
+cc
+cc
+cc
+cc
+cc
+gF
+cr
+cc
+cc
+cc
+cc
+cc
+cc
+cc
+cc
+cc
+cc
+cc
+cc
+cc
+fm
bT
ab
ab
@@ -30325,44 +30325,44 @@ ab
ab
ab
bT
-zL
-zL
-zL
-zL
-zL
-zL
-zL
-zL
-zL
-zL
-zL
-zL
-zL
-zL
-zL
-zL
-zL
-zL
-Rn
-zL
-zL
-zL
-zL
-zL
-zL
-zL
-zL
-zL
-zL
-zL
-zL
-zL
-zL
-zL
-zL
-zL
-zL
-zL
+cc
+cc
+cc
+cc
+cc
+cc
+cc
+cc
+cc
+cc
+cc
+cc
+cc
+cc
+cc
+cc
+cc
+cc
+fm
+cc
+cc
+cc
+cc
+cc
+cc
+cc
+cc
+cc
+cc
+cc
+cc
+cc
+cc
+cc
+cc
+cc
+cc
+cc
bT
ab
ab
@@ -30582,8 +30582,8 @@ ab
ab
ab
bT
-zL
-zL
+cc
+cc
ct
bT
bT
@@ -30591,8 +30591,8 @@ bT
bT
bT
bT
-BE
-BE
+cd
+cd
bT
bT
bT
@@ -30600,8 +30600,8 @@ bT
bT
bT
ct
-zL
-zL
+cc
+cc
ct
bT
bT
@@ -30609,8 +30609,8 @@ bT
bT
bT
bT
-qu
-qu
+hB
+hB
bT
bT
bT
@@ -30618,8 +30618,8 @@ bT
bT
bT
ct
-zL
-zL
+cc
+cc
bT
ab
ab
@@ -30839,44 +30839,44 @@ ab
ab
ab
bT
-zL
-zL
+cc
+cc
bT
-VS
-JR
-JR
+cC
+cP
+cP
bT
-rO
-rO
-rO
-rO
-rO
-rO
-rO
-HM
-HM
-rO
+OJ
+OJ
+OJ
+OJ
+OJ
+OJ
+OJ
+FV
+FV
+OJ
bT
-zL
-zL
+cc
+cc
bT
-Ur
-WW
-QI
-Mw
-WW
-QI
-QI
-QI
-QI
-QI
-QI
-BR
-QI
-Xs
+gs
+gG
+gH
+gU
+gG
+gH
+gH
+gH
+gH
+gH
+gH
+il
+gH
+ip
bT
-zL
-zL
+cc
+cc
bT
ab
ab
@@ -31096,44 +31096,44 @@ ab
ab
ab
bT
-zL
-zL
+cc
+cc
bT
-DQ
-JR
-JR
-un
-rO
-rO
-rO
-rO
-rO
-rO
-Re
-QK
-tb
-IN
+cD
+cP
+cP
+cT
+OJ
+OJ
+OJ
+OJ
+OJ
+OJ
+Ae
+xn
+oS
+Qt
bT
-zL
-zL
+cc
+cc
bT
-Nf
-QI
-QI
-QI
-QI
-QI
-QI
-QI
-QI
-Zc
-QI
-BR
-QI
-Xs
+gt
+gH
+gH
+gH
+gH
+gH
+gH
+gH
+gH
+kh
+gH
+il
+gH
+ip
bT
-zL
-zL
+cc
+cc
bT
ab
ab
@@ -31353,44 +31353,44 @@ ab
ab
ab
bT
-zL
-zL
+cc
+cc
bT
-wJ
-JR
-UV
+cE
+cP
+fI
bT
-rO
-Ry
-rO
-rO
-rO
-rO
-Re
-QK
-QK
-IN
+OJ
+uF
+OJ
+OJ
+OJ
+OJ
+Ae
+xn
+xn
+Qt
bT
-zL
-zL
+cc
+cc
bT
-Nf
-QI
-QI
-QI
-QI
-QI
-QI
-QI
-QI
-QI
-QI
-QI
-QI
-Ps
+gt
+gH
+gH
+gH
+gH
+gH
+gH
+gH
+gH
+gH
+gH
+gH
+gH
+ir
bT
-zL
-zL
+cc
+cc
bT
ab
ab
@@ -31610,44 +31610,44 @@ ab
ab
ab
bT
-zL
-zL
+cc
+cc
bT
-UY
-JR
-JR
-Fj
-rO
-Ry
-Ry
-rO
-rO
-rO
-rO
-QF
-QF
-rO
+cF
+cP
+cP
+cU
+OJ
+uF
+uF
+OJ
+OJ
+OJ
+OJ
+Hn
+Hn
+OJ
bT
-zL
-zL
+cc
+cc
bT
-uv
-QI
-QI
-QI
-QI
-QI
-QI
-oh
-QI
-QI
-QI
-BR
-QI
-Xs
+gu
+gH
+gH
+gH
+gH
+gH
+gH
+ku
+gH
+gH
+gH
+il
+gH
+ip
bT
-zL
-zL
+cc
+cc
bT
ab
ab
@@ -31867,44 +31867,44 @@ ab
ab
ab
bT
-zL
-zL
+cc
+cc
bT
-aS
-JR
-JR
-Fj
-rO
-rO
-rO
-HM
-HM
-rO
-rO
-HM
-HM
-rO
+cG
+cP
+cP
+cU
+OJ
+OJ
+OJ
+FV
+FV
+OJ
+OJ
+FV
+FV
+OJ
bT
-zL
-zL
+cc
+cc
bT
-aM
-QI
-QI
-mN
-PL
-QI
-QI
-QI
-QI
-QI
-QI
-BR
-QI
-Xs
+gv
+gH
+gH
+gV
+hf
+gH
+gH
+gH
+gH
+gH
+gH
+il
+gH
+ip
bT
-zL
-zL
+cc
+cc
bT
ab
ab
@@ -32124,44 +32124,44 @@ ab
ab
ab
bT
-zL
-zL
+cc
+cc
bT
-mh
-JR
-JR
-Bw
-rO
-rO
-ln
-nv
-QK
-IN
-Re
-nv
-QK
-IN
+cH
+cP
+cP
+cV
+OJ
+OJ
+QT
+vH
+xn
+Qt
+Ae
+vH
+xn
+Qt
bT
-zL
-zL
+cc
+cc
bT
-xw
-QI
-QI
-ZR
-ZR
-Zc
-QI
-QI
-QI
-QI
-Sj
-QI
-QI
-Ps
+gw
+gH
+gH
+gW
+gW
+kh
+gH
+gH
+gH
+gH
+ii
+gH
+gH
+ir
bT
-zL
-zL
+cc
+cc
bT
ab
ab
@@ -32381,44 +32381,44 @@ ab
ab
ab
bT
-zL
-zL
+cc
+cc
bT
-dV
-JR
-JR
-ES
-rO
-rO
-ln
-QK
-QK
-IN
-Re
-QK
-qh
-IN
+cI
+cP
+cP
+cW
+OJ
+OJ
+QT
+xn
+xn
+Qt
+Ae
+xn
+mP
+Qt
bT
-zL
-zL
+cc
+cc
bT
-Nf
-QI
-QI
-QI
-QI
-QI
-QI
-QI
-QI
-DO
-ZR
-BR
-QI
-Xs
+gt
+gH
+gH
+gH
+gH
+gH
+gH
+gH
+gH
+id
+gW
+il
+gH
+ip
bT
-zL
-zL
+cc
+cc
bT
ab
ab
@@ -32638,44 +32638,44 @@ ab
ab
ab
bT
-zL
-zL
+cc
+cc
bT
-dV
-JR
-JR
-ES
-rO
-rO
-rO
-sr
-sr
-rO
-rO
-sr
-sr
-rO
+cI
+cP
+cP
+cW
+OJ
+OJ
+OJ
+SH
+SH
+OJ
+OJ
+SH
+SH
+OJ
bT
-zL
-zL
+cc
+cc
bT
-Ur
-WW
-QI
-Mw
-WW
-QI
-Hc
-rW
-tD
-vt
-QI
-BR
-QI
-Xs
+gs
+gG
+gH
+gU
+gG
+gH
+hD
+hI
+hZ
+ie
+gH
+il
+gH
+ip
bT
-zL
-zL
+cc
+cc
bT
ab
ab
@@ -32895,8 +32895,8 @@ ab
ab
ab
bT
-zL
-zL
+cc
+cc
ct
bT
bT
@@ -32913,8 +32913,8 @@ bT
bT
bT
ct
-zL
-zL
+cc
+cc
ct
bT
bT
@@ -32931,8 +32931,8 @@ bT
bT
bT
ct
-zL
-zL
+cc
+cc
bT
ab
ab
@@ -33152,44 +33152,44 @@ ab
ab
ab
bT
-zL
-zL
-zL
-zL
-zL
-zL
-zL
-zL
-zL
-zL
-zL
-zL
-zL
-zL
-yr
-zL
-zL
-zL
-zL
-zL
-zL
-zL
-zL
-zL
-zL
-zL
-zL
-zL
-zL
-zL
-zL
-zL
-zL
-zL
-zL
-zL
-zL
-zL
+cc
+cc
+cc
+cc
+cc
+cc
+cc
+cc
+cc
+cc
+cc
+cc
+cc
+cc
+cn
+cc
+cc
+cc
+cc
+cc
+cc
+cc
+cc
+cc
+cc
+cc
+cc
+cc
+cc
+cc
+cc
+cc
+cc
+cc
+cc
+cc
+cc
+cc
bT
ab
ab
@@ -33409,44 +33409,44 @@ ab
ab
ab
bT
-zL
-zL
-zL
-zL
-zL
-zL
-zL
-zL
-zL
-zL
-zL
-Sd
-zL
-Dc
-yr
-yr
-zL
-zL
-zL
-zL
-zL
-zL
-zL
-zL
-zL
-zL
-zL
-zL
-zL
-zL
-zL
-FB
-zL
-zL
-zL
-zL
-zL
-zL
+cc
+cc
+cc
+cc
+cc
+cc
+cc
+cc
+cc
+cc
+cc
+it
+cc
+fL
+cn
+cn
+cc
+cc
+cc
+cc
+cc
+cc
+cc
+cc
+cc
+cc
+cc
+cc
+cc
+cc
+cc
+Rz
+cc
+cc
+cc
+cc
+cc
+cc
bT
ab
ab
@@ -33672,8 +33672,8 @@ bT
cJ
cJ
ct
-zL
-zL
+cc
+cc
ct
bT
bT
@@ -33684,8 +33684,8 @@ cK
hs
bT
bT
-BE
-BE
+cd
+cd
bT
bT
bT
@@ -33696,8 +33696,8 @@ bT
bT
bT
ct
-zL
-zL
+cc
+cc
ct
cJ
cJ
@@ -33929,20 +33929,20 @@ bT
cK
cK
bT
-zL
-zL
+cc
+cc
bT
-px
-Ao
-Ao
-Ao
-Th
-Ku
-Dc
-kP
+nh
+uk
+uk
+uk
+St
+cp
+fL
+On
bT
-Xp
-KO
+JP
+xd
bT
gx
gI
@@ -33953,8 +33953,8 @@ gy
hE
hJ
bT
-zL
-zL
+cc
+cc
bT
cK
cK
@@ -34186,20 +34186,20 @@ bT
cK
cK
bT
-zL
-zL
+cc
+cc
bT
-vo
-zL
-zL
-zL
-uE
-ru
-zL
-zC
+IG
+cc
+cc
+cc
+ey
+cQ
+cc
+WP
bT
-qj
-si
+Bp
+IP
bT
gy
gy
@@ -34210,8 +34210,8 @@ gy
gy
gy
bT
-Ku
-zL
+cp
+cc
bT
cK
cK
@@ -34443,21 +34443,21 @@ bT
cK
cK
bT
-zL
-zL
-bT
-vo
-zL
-zL
-zL
-qn
-zL
-zL
-Ku
-BE
-FN
-vA
-BE
+cc
+cc
+bT
+IG
+cc
+cc
+cc
+ez
+cc
+cc
+cp
+cd
+XY
+Id
+cd
jR
gy
gy
@@ -34467,8 +34467,8 @@ gy
gy
gy
cK
-Ku
-Ku
+cp
+cp
bT
cK
cK
@@ -34700,20 +34700,20 @@ bT
cK
cK
bT
-zL
-zL
-bT
-PB
-zL
-zL
-zL
-zL
-zL
-ru
-yr
+cc
+cc
+bT
+om
+cc
+cc
+cc
+cc
+cc
+cQ
+cn
hs
-XM
-Ku
+jM
+cp
cK
gy
gy
@@ -34724,8 +34724,8 @@ gy
gy
gy
hs
-ru
-zL
+cQ
+cc
bT
cK
cK
@@ -34957,20 +34957,20 @@ bT
cK
cK
bT
-zL
-zL
-bT
-lx
-sW
-yK
-yK
-yr
-FH
-FH
-yr
+cc
+cc
+bT
+Gy
+Xk
+Ck
+Ck
+cn
+cm
+cm
+cn
cK
-uD
-KE
+hF
+CL
bT
gy
gy
@@ -34981,8 +34981,8 @@ gy
gy
hK
bT
-zL
-ru
+cc
+cQ
bT
cK
cK
@@ -35214,8 +35214,8 @@ bT
cK
cK
bT
-zL
-zL
+cc
+cc
bT
bT
bT
@@ -35226,8 +35226,8 @@ hs
cK
bT
ct
-Xp
-JO
+JP
+ue
ct
bT
bT
@@ -35238,8 +35238,8 @@ bT
bT
bT
bT
-zL
-zL
+cc
+cc
bT
cK
cK
@@ -35471,32 +35471,32 @@ bS
cJ
cJ
bT
-zL
-zL
-bT
-sg
-sg
-sg
-bT
-tU
-yr
-Dc
-Ku
-fo
-zw
-vS
-fo
-GF
-GF
-GF
-Qr
-bT
-iN
-sg
-sg
-bT
-Ku
-zL
+cc
+cc
+bT
+dh
+dh
+dh
+bT
+RG
+cn
+fL
+cp
+EG
+fs
+fO
+EG
+Cv
+Cv
+Cv
+NZ
+bT
+hq
+dh
+dh
+bT
+cp
+cc
bT
cJ
cJ
@@ -35728,32 +35728,32 @@ ab
ab
ab
bT
-zL
-FH
+cc
+cm
cK
-FH
-zL
-zL
-bT
-MM
-zT
-wE
-zL
-vi
-Nl
-zL
-Nl
-zL
-rE
-zL
-lr
-bT
-zL
-ru
-yr
+cm
+cc
+cc
+bT
+XU
+eN
+eW
+cc
+cL
+cM
+cc
+cM
+cc
+cr
+cc
+nG
+bT
+cc
+cQ
+cn
hs
-yr
-zL
+cn
+cc
bT
ab
ab
@@ -35985,32 +35985,32 @@ ab
ab
ab
bT
-Dc
-Ku
+fL
+cp
hs
-FH
-Rd
-zL
+cm
+hQ
+cc
bT
-Lx
-zL
-zL
-rE
-Nl
-vi
-Nl
-Nl
-zL
-zL
-zL
-lr
+ow
+cc
+cc
+cr
+cM
+cL
+cM
+cM
+cc
+cc
+cc
+nG
bT
-zL
-zL
-Ku
+cc
+cc
+cp
bT
-yr
-zL
+cn
+cc
bT
ab
ab
@@ -36242,32 +36242,32 @@ ab
ab
ab
bT
-zL
-Ku
+cc
+cp
hs
-uD
-zL
-zL
+hF
+cc
+cc
bT
-HS
-zL
-zL
-zL
-zL
-rE
-zL
-zr
-RX
-zL
-Sd
-lr
+nQ
+cc
+cc
+cc
+cc
+cr
+cc
+gd
+gz
+cc
+it
+nG
bT
-zL
-zL
-nK
+cc
+cc
+hL
bT
-zL
-zL
+cc
+cc
bT
ab
ab
@@ -36499,32 +36499,32 @@ ab
ab
ab
bT
-zL
-zL
-BE
-zL
-zL
-zL
+cc
+cc
+cd
+cc
+cc
+cc
bT
-Xo
-zL
-zL
-zL
-zL
-zL
-zL
-YK
-zL
-zL
-zL
-lr
+xx
+cc
+cc
+cc
+cc
+cc
+cc
+eY
+cc
+cc
+cc
+nG
bT
-zL
-zL
-zL
-BE
-zL
-zL
+cc
+cc
+cc
+cd
+cc
+cc
bT
ab
ab
@@ -36756,32 +36756,32 @@ ab
ab
ab
bT
-zL
-zL
+cc
+cc
bT
-zL
-zL
-zL
+cc
+cc
+cc
bT
-Xo
-rE
-zB
-qn
-zL
-rE
-zL
-zL
-zL
-zL
-zL
-lr
+xx
+cr
+eX
+ez
+cc
+cr
+cc
+cc
+cc
+cc
+cc
+nG
bT
-zL
-zL
-zL
+cc
+cc
+cc
bT
-zL
-zL
+cc
+cc
bT
ab
ab
@@ -37013,32 +37013,32 @@ ab
ab
ab
bT
-zL
-zL
+cc
+cc
bT
-zL
-zL
-zL
+cc
+cc
+cc
bT
-Xo
-zL
-YK
-zL
-Sd
-Wi
-zL
-zL
-zL
-zL
-zL
-lr
+xx
+cc
+eY
+cc
+it
+ft
+cc
+cc
+cc
+cc
+cc
+nG
bT
-zL
-zL
-zL
+cc
+cc
+cc
bT
-zL
-zL
+cc
+cc
bT
ab
ab
@@ -37270,32 +37270,32 @@ ab
ab
ab
bT
-zL
-zL
+cc
+cc
bT
-zL
-zL
-zL
+cc
+cc
+cc
bT
-Xo
-Qs
-Qs
-Ln
-Qs
-rb
-Qs
-Qs
-zL
-Qs
-Qs
-lr
+xx
+eO
+eO
+ff
+eO
+fu
+eO
+eO
+cc
+eO
+eO
+nG
bT
-zL
-zL
-zL
+cc
+cc
+cc
bT
-zL
-zL
+cc
+cc
bT
ab
ab
@@ -37527,32 +37527,32 @@ ab
ab
ab
bT
-zL
-zL
+cc
+cc
bT
-Qg
-sm
-LC
+dC
+dW
+ej
bT
-vZ
-SU
-vK
-vZ
+Sm
+TH
+qg
+Sm
fj
-eZ
-vd
+ld
+HI
fj
-vZ
-Nt
-nO
-vZ
+Sm
+ER
+ux
+Sm
bT
-Od
-sm
-zh
+hr
+dW
+hM
bT
-zL
-zL
+cc
+cc
bT
ab
ab
@@ -37784,11 +37784,11 @@ ab
ab
ab
bT
-zL
-zL
+cc
+cc
bT
bT
-BE
+cd
bT
bT
cY
@@ -37805,11 +37805,11 @@ eb
ha
bT
bT
-BE
+cd
bT
bT
-zL
-zL
+cc
+cc
bT
ab
ab
@@ -38041,8 +38041,8 @@ ab
ab
ab
bT
-zL
-zL
+cc
+cc
bT
cZ
cZ
@@ -38065,8 +38065,8 @@ cZ
cZ
cZ
bT
-zL
-zL
+cc
+cc
bT
ab
ab
@@ -38298,8 +38298,8 @@ ab
ab
ab
bT
-zL
-zL
+cc
+cc
bT
cZ
cZ
@@ -38322,8 +38322,8 @@ cZ
cZ
cZ
bT
-zL
-zL
+cc
+cc
bT
ab
ab
@@ -38555,8 +38555,8 @@ ab
ab
ab
bT
-zL
-zL
+cc
+cc
bT
cZ
cZ
@@ -38579,8 +38579,8 @@ cZ
cZ
cZ
bT
-zL
-zL
+cc
+cc
bT
ab
ab
@@ -38812,8 +38812,8 @@ ab
ab
ab
bT
-zL
-zL
+cc
+cc
bT
cZ
cZ
@@ -38836,8 +38836,8 @@ cZ
cZ
cZ
bT
-zL
-zL
+cc
+cc
bT
ab
ab
@@ -39069,8 +39069,8 @@ ab
ab
ab
bT
-zL
-zL
+cc
+cc
bT
dD
dX
@@ -39093,8 +39093,8 @@ cZ
cZ
cZ
bT
-zL
-zL
+cc
+cc
bT
ab
ab
@@ -39326,8 +39326,8 @@ ab
ab
ab
bT
-zL
-zL
+cc
+cc
bT
cZ
cZ
@@ -39350,8 +39350,8 @@ cZ
cZ
cZ
bT
-zL
-zL
+cc
+cc
bT
ab
ab
@@ -39583,8 +39583,8 @@ ab
ab
ab
bT
-zL
-zL
+cc
+cc
bT
cZ
cZ
@@ -39607,8 +39607,8 @@ cZ
jr
cZ
bT
-zL
-zL
+cc
+cc
bT
ab
ab
@@ -39840,8 +39840,8 @@ ab
ab
ab
bT
-zL
-Sd
+cc
+it
bT
cZ
cZ
@@ -39856,7 +39856,7 @@ fA
fU
gh
cZ
-hR
+wc
cZ
cZ
hh
@@ -39864,8 +39864,8 @@ dD
cZ
cZ
bT
-Sd
-zL
+it
+cc
bT
ab
ab
@@ -40097,8 +40097,8 @@ ab
ab
ab
bT
-zL
-zL
+cc
+cc
bT
cZ
cZ
@@ -40121,8 +40121,8 @@ dD
cZ
cZ
bT
-zL
-zL
+cc
+cc
bT
ab
ab
@@ -40354,8 +40354,8 @@ ab
ab
ab
bT
-zL
-zL
+cc
+cc
bT
cZ
cZ
@@ -40378,8 +40378,8 @@ cZ
cZ
cZ
bT
-zL
-zL
+cc
+cc
bT
ab
ab
@@ -40611,8 +40611,8 @@ ab
ab
ab
bT
-zL
-zL
+cc
+cc
bT
cZ
cZ
@@ -40635,8 +40635,8 @@ cZ
cZ
cZ
bT
-zL
-zL
+cc
+cc
bT
ab
ab
@@ -40868,8 +40868,8 @@ ab
ab
ab
bT
-zL
-zL
+cc
+cc
bT
cZ
cZ
@@ -40892,8 +40892,8 @@ cZ
cZ
cZ
bT
-zL
-zL
+cc
+cc
bT
ab
ab
@@ -41125,8 +41125,8 @@ ab
ab
ab
bT
-zL
-zL
+cc
+cc
bT
cZ
cZ
@@ -41149,8 +41149,8 @@ cZ
cZ
cZ
bT
-zL
-zL
+cc
+cc
bT
ab
ab
@@ -41382,8 +41382,8 @@ ab
ab
ab
bT
-zL
-zL
+cc
+cc
bT
cZ
cZ
@@ -41406,8 +41406,8 @@ cZ
cZ
cZ
bT
-zL
-zL
+cc
+cc
bT
ab
ab
@@ -41639,8 +41639,8 @@ ab
ab
ab
bT
-zL
-zL
+cc
+cc
bT
cZ
cZ
@@ -41663,8 +41663,8 @@ cZ
cZ
cZ
bT
-zL
-zL
+cc
+cc
bT
ab
ab
@@ -41896,8 +41896,8 @@ ab
ab
ab
bT
-zL
-zL
+cc
+cc
bT
cZ
cZ
@@ -41920,8 +41920,8 @@ cZ
cZ
cZ
bT
-zL
-zL
+cc
+cc
bT
ab
ab
@@ -42153,8 +42153,8 @@ ab
ab
ab
bT
-zL
-zL
+cc
+cc
ct
bT
bT
@@ -42177,8 +42177,8 @@ bT
bT
bT
ct
-zL
-zL
+cc
+cc
bT
ab
ab
@@ -42410,32 +42410,32 @@ ab
ab
ab
bT
-zL
-zL
-BE
-zL
-zL
-zL
-zL
-zL
-zL
-zL
-zL
+cc
+cc
+cd
+cc
+cc
+cc
+cc
+cc
+cc
+cc
+cc
bT
ab
ab
bT
-lJ
-lJ
-lJ
-lJ
-lJ
-lJ
-lJ
-lJ
-BE
-zL
-zL
+jS
+jS
+jS
+jS
+jS
+jS
+jS
+jS
+cd
+cc
+cc
bT
ab
ab
@@ -42667,32 +42667,32 @@ ab
ab
ab
bT
-zL
-zL
-BE
-zL
-zL
-zL
-zL
-zL
-zL
-zL
-zL
+cc
+cc
+cd
+cc
+cc
+cc
+cc
+cc
+cc
+cc
+cc
bT
ab
ab
bT
-lJ
-lJ
-lJ
-lJ
-lJ
-lJ
-lJ
-lJ
-BE
-zL
-zL
+jS
+jS
+jS
+jS
+jS
+jS
+jS
+jS
+cd
+cc
+cc
bT
ab
ab
@@ -42932,16 +42932,16 @@ bT
bT
bT
ct
-zL
-zL
-zL
+cc
+cc
+cc
bT
ab
ab
bT
-lJ
-lJ
-lJ
+jS
+jS
+jS
ct
bT
bT
@@ -43189,16 +43189,16 @@ bT
bT
bT
bT
-zL
-zL
-zL
+cc
+cc
+cc
bT
ab
ab
bT
-lJ
-lJ
-lJ
+jS
+jS
+jS
bT
bT
bT
@@ -43446,16 +43446,16 @@ bT
bT
bT
bT
-zL
-zL
-zL
+cc
+cc
+cc
bT
ab
ab
bT
-lJ
-lJ
-lJ
+jS
+jS
+jS
bT
bT
bT
@@ -43703,16 +43703,16 @@ dY
ek
el
bT
-zL
-zL
-zL
+cc
+cc
+cc
bT
ab
ab
bT
-lJ
-lJ
-lJ
+jS
+jS
+jS
bT
kd
ki
@@ -43960,16 +43960,16 @@ dZ
el
el
bT
-zL
-zL
-zL
+cc
+cc
+cc
bT
ab
ab
bT
-lJ
-lJ
-lJ
+jS
+jS
+jS
bT
kd
kd
@@ -44217,16 +44217,16 @@ dY
ek
el
bT
-zL
-zL
-zL
+cc
+cc
+cc
bT
ab
ab
bT
-lJ
-lJ
-lJ
+jS
+jS
+jS
bT
kd
ki
@@ -44474,16 +44474,16 @@ dZ
el
el
bT
-zL
-zL
-zL
+cc
+cc
+cc
bT
ab
ab
bT
-lJ
-OH
-lJ
+jS
+jU
+jS
bT
kd
kd
@@ -44731,16 +44731,16 @@ dY
ek
el
bT
-zL
-rE
-zL
+cc
+cr
+cc
bT
ab
ab
bT
-Qn
-lJ
-lJ
+jT
+jS
+jS
bT
kd
ki
@@ -44988,16 +44988,16 @@ dZ
el
el
bT
-zL
-Vc
-rE
+cc
+kl
+cr
bT
ab
ab
bT
-lJ
-lJ
-lJ
+jS
+jS
+jS
bT
kd
kd
@@ -45245,16 +45245,16 @@ dY
ek
el
bT
-zL
-zL
-zL
+cc
+cc
+cc
bT
ab
ab
bT
-lJ
-Qn
-lJ
+jS
+jT
+jS
kb
kd
kk
@@ -45502,16 +45502,16 @@ dZ
el
el
bT
-zL
-zL
-zL
+cc
+cc
+cc
bT
ab
ab
bT
-lJ
-lJ
-lJ
+jS
+jS
+jS
cZ
kd
kI
@@ -45759,16 +45759,16 @@ dY
ek
el
bT
-zL
-Sd
-zL
+cc
+it
+cc
bT
ab
ab
bT
-lJ
-lG
-lJ
+jS
+PV
+jS
cZ
ke
ix
@@ -46016,16 +46016,16 @@ dZ
el
el
bT
-zL
-zL
-zL
+cc
+cc
+cc
bT
ab
ab
bT
-lJ
-lJ
-lJ
+jS
+jS
+jS
kb
kd
ix
@@ -46273,16 +46273,16 @@ dY
ek
el
bT
-zL
-zL
-zL
+cc
+cc
+cc
bT
ab
ab
bT
-lJ
-Qn
-lJ
+jS
+jT
+jS
kb
kd
ix
@@ -46529,18 +46529,18 @@ dF
dZ
el
el
-BE
-zL
-zL
-zL
+cd
+cc
+cc
+cc
bT
ab
ab
bT
-lJ
-lJ
-lJ
-BE
+jS
+jS
+jS
+cd
kd
kJ
ab
@@ -46787,16 +46787,16 @@ dY
ek
el
bT
-zL
-zL
-zL
+cc
+cc
+cc
bT
ab
ab
bT
-OH
-lJ
-lJ
+jU
+jS
+jS
bT
kd
ix
@@ -47044,16 +47044,16 @@ dZ
el
el
bT
-zL
-zL
-zL
+cc
+cc
+cc
bT
ab
ab
bT
-lJ
-Qn
-lJ
+jS
+jT
+jS
bT
kd
kK
@@ -47301,16 +47301,16 @@ dY
ek
el
bT
-zL
-zL
-zL
+cc
+cc
+cc
bT
ab
ab
bT
-lJ
-lJ
-lJ
+jS
+jS
+jS
bT
kd
kd
@@ -47558,16 +47558,16 @@ dZ
el
el
bT
-zL
-zL
-zL
+cc
+cc
+cc
bT
ab
ab
bT
-lJ
-lJ
-lJ
+jS
+jS
+jS
bT
kd
kk
@@ -47815,16 +47815,16 @@ dY
ek
el
bT
-zL
-zL
-zL
+cc
+cc
+cc
bT
ab
ab
bT
-lJ
-lJ
-lJ
+jS
+jS
+jS
bT
kd
ki
@@ -48072,16 +48072,16 @@ dZ
el
el
bT
-zL
-zL
-zL
+cc
+cc
+cc
bT
ab
ab
bT
-lJ
-lJ
-lJ
+jS
+jS
+jS
bT
kd
kd
@@ -48329,16 +48329,16 @@ dY
ek
el
bT
-zL
-zL
-zL
+cc
+cc
+cc
bT
ab
ab
bT
-lJ
-lJ
-lJ
+jS
+jS
+jS
bT
kd
ki
@@ -48586,16 +48586,16 @@ dZ
el
el
bT
-zL
-zL
-zL
+cc
+cc
+cc
bT
ab
ab
bT
-lJ
-lJ
-lJ
+jS
+jS
+jS
bT
kd
kd
@@ -48843,16 +48843,16 @@ dY
ek
el
bT
-zL
-zL
-zL
+cc
+cc
+cc
bT
ab
ab
bT
-lJ
-lJ
-lJ
+jS
+jS
+jS
bT
kd
ki
@@ -49100,16 +49100,16 @@ dZ
el
el
bT
-zL
-zL
-zL
+cc
+cc
+cc
bT
ab
ab
bT
-lJ
-lJ
-lJ
+jS
+jS
+jS
bT
kd
kd
@@ -49357,16 +49357,16 @@ dY
ek
el
bT
-zL
-zL
-zL
+cc
+cc
+cc
bT
ab
ab
bT
-lJ
-lJ
-lJ
+jS
+jS
+jS
bT
kd
ki
@@ -49614,16 +49614,16 @@ bT
bT
bT
bT
-zL
-zL
-zL
+cc
+cc
+cc
bT
ab
ab
bT
-lJ
-lJ
-lJ
+jS
+jS
+jS
bT
bT
bT
@@ -49871,16 +49871,16 @@ bT
bT
bT
bT
-zL
-zL
-zL
+cc
+cc
+cc
bT
ab
ab
bT
-lJ
-lJ
-lJ
+jS
+jS
+jS
bT
bT
bT
@@ -50128,16 +50128,16 @@ bT
bT
bT
ct
-zL
-zL
-zL
+cc
+cc
+cc
bT
ab
ab
bT
-lJ
-lJ
-lJ
+jS
+jS
+jS
ct
bT
bT
@@ -50377,32 +50377,32 @@ ab
ab
ab
bT
-zL
-zL
-zL
-ru
-zL
-zL
-zL
-zL
-zL
-zL
-zL
+cc
+cc
+cc
+cQ
+cc
+cc
+cc
+cc
+cc
+cc
+cc
bT
ab
ab
bT
-lJ
-lJ
-lJ
-lJ
-lJ
-lJ
-lJ
-lJ
-lJ
-lJ
-lJ
+jS
+jS
+jS
+jS
+jS
+jS
+jS
+jS
+jS
+jS
+jS
bT
ab
ab
@@ -50634,32 +50634,32 @@ ab
ab
ab
bT
-zL
-FH
-zL
-zL
-zL
-zL
-zL
-zL
-zL
-zL
-zL
+cc
+cm
+cc
+cc
+cc
+cc
+cc
+cc
+cc
+cc
+cc
bT
ab
ab
bT
-lJ
-lJ
-lJ
-lJ
-lJ
-lJ
-lJ
-lJ
-lJ
-lJ
-lJ
+jS
+jS
+jS
+jS
+jS
+jS
+jS
+jS
+jS
+jS
+jS
bT
ab
ab
@@ -50891,32 +50891,32 @@ ab
ab
ab
bT
-FH
-yr
-Ku
-Ku
-yr
-zL
-Nx
-zL
-zL
-DT
-zL
+cm
+cn
+cp
+cp
+cn
+cc
+dJ
+cc
+cc
+fr
+cc
bT
ab
ab
bT
-lJ
-lJ
-lJ
-lJ
-lJ
-lJ
-lJ
-lJ
-lJ
-lJ
-lJ
+jS
+jS
+jS
+jS
+jS
+jS
+jS
+jS
+jS
+jS
+jS
bT
ab
ab
@@ -51151,29 +51151,29 @@ bM
bM
bM
bM
-FH
-Sd
-zL
-zL
-zL
-zL
-zL
-zL
+cm
+it
+cc
+cc
+cc
+cc
+cc
+cc
bT
ab
ab
bT
-lJ
-lJ
-lJ
-lJ
-lJ
-lJ
-lJ
-lJ
-lJ
-lJ
-lJ
+jS
+jS
+jS
+jS
+jS
+jS
+jS
+jS
+jS
+jS
+jS
bT
ab
ab
@@ -51409,28 +51409,28 @@ bO
dc
Wv
bM
-Ku
-zL
-zL
-ru
-zL
-zL
-zL
+cp
+cc
+cc
+cQ
+cc
+cc
+cc
bT
ab
ab
bT
-lJ
-lJ
-lJ
-lJ
-lJ
-OH
-lJ
-lJ
-lJ
-lJ
-lJ
+jS
+jS
+jS
+jS
+jS
+jU
+jS
+jS
+jS
+jS
+jS
bT
ab
ab
@@ -51665,29 +51665,29 @@ gJ
bO
bO
dr
-yr
-Ku
-yr
-zL
-FB
-zL
-zL
-zL
+cn
+cp
+cn
+cc
+Rz
+cc
+cc
+cc
bT
ab
ab
bT
-lJ
-lJ
-lJ
-lJ
-lJ
-lJ
-lJ
-uy
-lJ
-lJ
-lJ
+jS
+jS
+jS
+jS
+jS
+jS
+jS
+kA
+jS
+jS
+jS
bT
ab
ab
@@ -51922,29 +51922,29 @@ hy
bO
bO
dr
-yE
-pR
-zL
-zL
-zL
-zL
-zL
-ru
+ca
+ea
+cc
+cc
+cc
+cc
+cc
+cQ
bT
ab
ab
bT
-lJ
-lJ
-lJ
-lJ
-lJ
-lJ
-lJ
-lJ
-lJ
-lJ
-lJ
+jS
+jS
+jS
+jS
+jS
+jS
+jS
+jS
+jS
+jS
+jS
bT
ab
ab
@@ -52180,28 +52180,28 @@ bO
bO
Wv
bM
-zL
-yE
-zL
-zL
-Nx
-zL
-zL
+cc
+ca
+cc
+cc
+dJ
+cc
+cc
bT
ab
ab
bT
-lJ
-lJ
-lJ
-lJ
-lJ
-lJ
-lJ
-lJ
-lJ
-lJ
-lJ
+jS
+jS
+jS
+jS
+jS
+jS
+jS
+jS
+jS
+jS
+jS
bT
ab
ab
@@ -52436,29 +52436,29 @@ bM
bM
bM
bM
-zL
-yr
-Ku
-ru
-zL
-zL
-zL
-zL
+cc
+cn
+cp
+cQ
+cc
+cc
+cc
+cc
bT
ab
ab
bT
-lJ
-lJ
-lJ
-lJ
-lJ
-lJ
-lJ
-lJ
-lJ
-lJ
-lJ
+jS
+jS
+jS
+jS
+jS
+jS
+jS
+jS
+jS
+jS
+jS
bT
ab
ab
@@ -52690,32 +52690,32 @@ ab
ab
ab
bT
-zL
-Eb
-zL
-zL
-zL
-zL
-zL
-Sd
-zL
-zL
-zL
+cc
+cN
+cc
+cc
+cc
+cc
+cc
+it
+cc
+cc
+cc
bT
ab
ab
bT
-lJ
-OH
-lJ
-lJ
-lJ
-lJ
-lJ
-lJ
-lJ
-lJ
-lJ
+jS
+jU
+jS
+jS
+jS
+jS
+jS
+jS
+jS
+jS
+jS
bT
ab
ab
@@ -52947,32 +52947,32 @@ ab
ab
ab
bT
-Ku
-zL
-zL
-Nx
-zL
-zL
-zL
-zL
-zL
-zL
-DT
+cp
+cc
+cc
+dJ
+cc
+cc
+cc
+cc
+cc
+cc
+fr
bT
ab
ab
bT
-lJ
-lJ
-lJ
-lJ
-lJ
-lJ
-lJ
-lJ
-lJ
-lJ
-lJ
+jS
+jS
+jS
+jS
+jS
+jS
+jS
+jS
+jS
+jS
+jS
bT
ab
ab
@@ -53204,32 +53204,32 @@ ab
ab
ab
bT
-zL
-zL
-zL
-zL
-zL
-zL
-zL
-zL
-zL
-zL
-zL
+cc
+cc
+cc
+cc
+cc
+cc
+cc
+cc
+cc
+cc
+cc
bT
ab
ab
bT
-lJ
-lJ
-lJ
-lJ
-lJ
-lJ
-lJ
-lJ
-lJ
-lJ
-lJ
+jS
+jS
+jS
+jS
+jS
+jS
+jS
+jS
+jS
+jS
+jS
bT
ab
ab
@@ -64379,15 +64379,15 @@ jk
jk
aa
jn
-ic
-ic
-ic
-ic
-ic
-ic
-ic
-ic
-ic
+Ls
+Ls
+Ls
+Ls
+Ls
+Ls
+Ls
+Ls
+Ls
jn
aa
aa
@@ -64636,15 +64636,15 @@ jk
jk
aa
jn
-ic
-ic
-ic
-ic
-ic
-ic
-ic
-ic
-ic
+Ls
+Ls
+Ls
+Ls
+Ls
+Ls
+Ls
+Ls
+Ls
jn
aa
aa
@@ -64893,15 +64893,15 @@ jk
jk
aa
jn
-ic
-ic
-ic
-ic
-ic
-ic
-ic
-ic
-ic
+Ls
+Ls
+Ls
+Ls
+Ls
+Ls
+Ls
+Ls
+Ls
jn
aa
aa
@@ -65150,15 +65150,15 @@ jk
jk
aa
jn
-ic
-ic
-ic
-ic
-ic
-ic
-ic
-ic
-ic
+Ls
+Ls
+Ls
+Ls
+Ls
+Ls
+Ls
+Ls
+Ls
jn
aa
aa
@@ -65407,15 +65407,15 @@ jk
jk
aa
jn
-ic
-ic
-ic
-ic
-ic
-ic
-ic
-ic
-ic
+Ls
+Ls
+Ls
+Ls
+Ls
+Ls
+Ls
+Ls
+Ls
jn
aa
aa
@@ -65664,15 +65664,15 @@ jk
jk
aa
jn
-ic
-ic
-ic
-ic
-ic
-ic
-ic
-ic
-ic
+Ls
+Ls
+Ls
+Ls
+Ls
+Ls
+Ls
+Ls
+Ls
jn
aa
aa
@@ -65921,15 +65921,15 @@ jk
aa
aa
jn
-ic
-ic
-ic
-ic
-ic
-ic
-ic
-ic
-ic
+Ls
+Ls
+Ls
+Ls
+Ls
+Ls
+Ls
+Ls
+Ls
jn
aa
aa
@@ -66178,15 +66178,15 @@ aa
aa
aa
jn
-ic
-ic
-ic
-ic
-ic
-ic
-ic
-ic
-ic
+Ls
+Ls
+Ls
+Ls
+Ls
+Ls
+Ls
+Ls
+Ls
jn
aa
aa
@@ -66435,15 +66435,15 @@ aa
aa
aa
jn
-ic
-ic
-ic
-ic
-ic
-ic
-ic
-ic
-ic
+Ls
+Ls
+Ls
+Ls
+Ls
+Ls
+Ls
+Ls
+Ls
jn
aa
aa
@@ -66692,15 +66692,15 @@ aa
aa
aa
jn
-ic
-ic
-ic
-ic
-ic
-ic
-ic
-ic
-ic
+Ls
+Ls
+Ls
+Ls
+Ls
+Ls
+Ls
+Ls
+Ls
jn
aa
aa
@@ -66949,15 +66949,15 @@ aa
aa
aa
jn
-ic
-ic
-ic
-ic
-uS
-ic
-ic
-ic
-ic
+Ls
+Ls
+Ls
+Ls
+IS
+Ls
+Ls
+Ls
+Ls
jn
aa
aa
diff --git a/_maps/RuinGeneration/13x17_chapel.dmm b/_maps/RuinGeneration/13x17_chapel.dmm
index ebf55b6c9b591..53cc992d36a30 100644
--- a/_maps/RuinGeneration/13x17_chapel.dmm
+++ b/_maps/RuinGeneration/13x17_chapel.dmm
@@ -182,7 +182,7 @@
/area/ruin/unpowered)
"yP" = (
/obj/item/cult_shift,
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/ruin/unpowered)
"zh" = (
/turf/closed/wall/mineral/cult,
@@ -219,7 +219,7 @@
/area/ruin/unpowered)
"JU" = (
/obj/structure/table/wood,
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/ruin/unpowered)
"Kd" = (
/obj/structure/frame/machine,
@@ -238,7 +238,7 @@
/turf/open/floor/iron,
/area/ruin/unpowered)
"Ma" = (
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/ruin/unpowered)
"MF" = (
/turf/open/floor/iron/chapel{
@@ -257,7 +257,7 @@
/area/ruin/unpowered)
"Ou" = (
/obj/structure/dresser,
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/ruin/unpowered)
"PI" = (
/obj/effect/decal/cleanable/blood/footprints,
@@ -340,7 +340,7 @@
"ZU" = (
/obj/item/bedsheet/cult,
/obj/structure/bed,
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/ruin/unpowered)
(1,1,1) = {"
diff --git a/_maps/RuinGeneration/21x29_solars.dmm b/_maps/RuinGeneration/21x29_solars.dmm
index 20fad9d1fdafc..a358ad90290e9 100644
--- a/_maps/RuinGeneration/21x29_solars.dmm
+++ b/_maps/RuinGeneration/21x29_solars.dmm
@@ -118,7 +118,7 @@
id = "auxsolareast";
name = "Port Auxiliary Solar Array"
},
-/turf/open/floor/iron/airless/solarpanel,
+/turf/open/floor/iron/solarpanel/airless,
/area/template_noop)
"x" = (
/obj/structure/cable,
@@ -199,7 +199,7 @@
id = "auxsolareast";
name = "Port Auxiliary Solar Array"
},
-/turf/open/floor/iron/airless/solarpanel,
+/turf/open/floor/iron/solarpanel/airless,
/area/template_noop)
"N" = (
/obj/structure/lattice/catwalk,
@@ -217,7 +217,7 @@
/obj/structure/cable{
icon_state = "0-2"
},
-/turf/open/floor/iron/airless/solarpanel,
+/turf/open/floor/iron/solarpanel/airless,
/area/template_noop)
"S" = (
/obj/structure/cable/yellow{
diff --git a/_maps/arenas/clockwork.dmm b/_maps/arenas/clockwork.dmm
index 24bb878178de9..8ae5a3b5d9190 100644
--- a/_maps/arenas/clockwork.dmm
+++ b/_maps/arenas/clockwork.dmm
@@ -1,10 +1,10 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"a" = (
-/obj/item/stack/tile/bronze/ten,
+/obj/item/stack/tile/mineral/bronze/ten,
/turf/open/floor/clockwork/reebe,
/area/tdome/arena)
"c" = (
-/obj/item/stack/tile/bronze,
+/obj/item/stack/tile/mineral/bronze,
/turf/open/floor/clockwork/reebe,
/area/tdome/arena)
"d" = (
@@ -15,7 +15,7 @@
/turf/open/floor/clockwork/reebe,
/area/tdome/arena)
"f" = (
-/obj/item/stack/tile/bronze/twenty,
+/obj/item/stack/tile/mineral/bronze/twenty,
/turf/open/floor/clockwork/reebe,
/area/tdome/arena)
"g" = (
diff --git a/_maps/arenas/solars.dmm b/_maps/arenas/solars.dmm
index 6e60cf8426cb6..c1ca5307aa838 100644
--- a/_maps/arenas/solars.dmm
+++ b/_maps/arenas/solars.dmm
@@ -11,7 +11,7 @@
"c" = (
/obj/machinery/power/tracker,
/obj/structure/cable,
-/turf/open/floor/iron/airless/solarpanel,
+/turf/open/floor/iron/solarpanel/airless,
/area/tdome/arena)
"d" = (
/obj/item/stack/rods,
@@ -23,7 +23,7 @@
name = "Port Solar Array"
},
/obj/structure/cable,
-/turf/open/floor/iron/airless/solarpanel,
+/turf/open/floor/iron/solarpanel/airless,
/area/tdome/arena)
"f" = (
/obj/structure/lattice/catwalk{
diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm
index 5595d2496f599..310d46f3d12f4 100644
--- a/_maps/map_files/BoxStation/BoxStation.dmm
+++ b/_maps/map_files/BoxStation/BoxStation.dmm
@@ -95,13 +95,6 @@
/obj/effect/spawner/room/threexthree,
/turf/open/floor/plating,
/area/maintenance/port/aft)
-"abs" = (
-/obj/machinery/power/tracker,
-/obj/structure/cable{
- icon_state = "0-2"
- },
-/turf/open/floor/iron/airless/solarpanel,
-/area/solar/port/fore)
"aby" = (
/obj/effect/spawner/room/threexfive,
/turf/open/floor/plating,
@@ -123,13 +116,6 @@
},
/turf/open/floor/plating,
/area/maintenance/starboard/fore)
-"abX" = (
-/obj/machinery/power/tracker,
-/obj/structure/cable{
- icon_state = "0-2"
- },
-/turf/open/floor/iron/airless/solarpanel,
-/area/solar/starboard/fore)
"abY" = (
/obj/structure/grille,
/turf/open/space,
@@ -184,18 +170,6 @@
/obj/item/stamp/hos,
/turf/open/floor/carpet/red,
/area/crew_quarters/heads/hos)
-"acV" = (
-/obj/machinery/power/solar{
- id = "auxsolareast";
- name = "Port Auxiliary Solar Array"
- },
-/obj/structure/cable/yellow{
- cable_color = "red";
- color = "#ff0000";
- icon_state = "0-2"
- },
-/turf/open/floor/iron/airless/solarpanel,
-/area/solar/port/fore)
"acW" = (
/obj/structure/lattice/catwalk,
/obj/structure/cable,
@@ -236,18 +210,6 @@
},
/turf/open/floor/wood,
/area/crew_quarters/theatre)
-"ads" = (
-/obj/machinery/power/solar{
- id = "auxsolareast";
- name = "Port Auxiliary Solar Array"
- },
-/obj/structure/cable/yellow{
- cable_color = "red";
- color = "#ff0000";
- icon_state = "0-2"
- },
-/turf/open/floor/iron/airless/solarpanel,
-/area/solar/starboard/fore)
"adt" = (
/obj/structure/cable,
/obj/structure/lattice/catwalk,
@@ -384,14 +346,6 @@
},
/turf/open/space,
/area/solar/starboard/fore)
-"adZ" = (
-/obj/machinery/power/solar{
- id = "auxsolareast";
- name = "Port Auxiliary Solar Array"
- },
-/obj/structure/cable,
-/turf/open/floor/iron/airless/solarpanel,
-/area/solar/port/fore)
"aed" = (
/obj/effect/turf_decal/tile/red/half/contrasted{
dir = 4
@@ -426,14 +380,6 @@
/obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted,
/turf/open/floor/iron/dark,
/area/bridge)
-"aeG" = (
-/obj/structure/cable,
-/obj/machinery/power/solar{
- id = "auxsolareast";
- name = "Port Auxiliary Solar Array"
- },
-/turf/open/floor/iron/airless/solarpanel,
-/area/solar/starboard/fore)
"aeK" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 8
@@ -1098,15 +1044,6 @@
/obj/structure/closet/emcloset,
/turf/open/floor/plating,
/area/maintenance/port/fore)
-"apb" = (
-/obj/machinery/telecomms/receiver/preset_exploration,
-/obj/machinery/power/apc/auto_name/east,
-/obj/structure/cable/yellow,
-/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
- dir = 9
- },
-/turf/open/floor/circuit/green/telecomms/mainframe,
-/area/quartermaster/exploration_dock)
"aph" = (
/turf/closed/wall,
/area/lawoffice)
@@ -1960,16 +1897,6 @@
/obj/effect/landmark/start/assistant,
/turf/open/floor/iron,
/area/hydroponics/garden)
-"aBO" = (
-/obj/machinery/camera/autoname{
- dir = 8
- },
-/obj/effect/turf_decal/bot,
-/obj/machinery/atmospherics/components/unary/thermomachine/freezer/on{
- dir = 8
- },
-/turf/open/floor/iron,
-/area/tcommsat/computer)
"aBQ" = (
/turf/closed/wall,
/area/storage/primary)
@@ -9999,6 +9926,19 @@
},
/turf/open/floor/iron,
/area/security/brig)
+"bOo" = (
+/obj/item/radio/intercom{
+ dir = 8;
+ freerange = 1;
+ name = "Station Intercom (Telecomms)";
+ pixel_y = 26
+ },
+/obj/effect/turf_decal/tile/yellow/half/contrasted{
+ dir = 4
+ },
+/obj/machinery/space_heater,
+/turf/open/floor/iron,
+/area/tcommsat/computer)
"bOt" = (
/turf/closed/wall/r_wall,
/area/crew_quarters/heads/cmo)
@@ -10715,6 +10655,16 @@
/obj/structure/reagent_dispensers/watertank,
/turf/open/floor/plating,
/area/maintenance/port/aft)
+"bSt" = (
+/obj/machinery/camera/autoname{
+ dir = 8
+ },
+/obj/effect/turf_decal/bot,
+/obj/machinery/atmospherics/components/unary/thermomachine/freezer/on{
+ dir = 8
+ },
+/turf/open/floor/iron,
+/area/tcommsat/computer)
"bSu" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/turf/open/floor/iron,
@@ -11021,6 +10971,21 @@
/obj/item/book/manual/wiki/xenoarchaeology,
/turf/open/floor/iron,
/area/science/misc_lab)
+"bUc" = (
+/obj/machinery/requests_console{
+ announcementConsole = 1;
+ department = "Telecomms Admin";
+ departmentType = 5;
+ name = "Telecomms RC";
+ pixel_x = 30
+ },
+/obj/machinery/atmospherics/components/unary/portables_connector{
+ dir = 8
+ },
+/obj/machinery/portable_atmospherics/canister/plasma,
+/obj/effect/mapping_helpers/atmos_auto_connect,
+/turf/open/floor/iron,
+/area/tcommsat/computer)
"bUd" = (
/obj/structure/table/reinforced,
/obj/machinery/button/door{
@@ -11495,10 +11460,76 @@
/obj/machinery/telecomms/processor/preset_four,
/turf/open/floor/circuit/green,
/area/tcommsat/server)
+"bWC" = (
+/obj/effect/turf_decal/siding/wideplating_new/dark{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/wideplating_new/dark/corner,
+/obj/effect/turf_decal/tile/neutral/half/contrasted{
+ dir = 4
+ },
+/obj/structure/cable/yellow{
+ icon_state = "2-4"
+ },
+/obj/machinery/light{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
+ dir = 6
+ },
+/turf/open/floor/iron/dark/telecomms,
+/area/tcommsat/server)
"bWD" = (
/obj/machinery/telecomms/server/presets/medical,
/turf/open/floor/circuit/green/telecomms,
/area/tcommsat/server)
+"bWE" = (
+/obj/effect/turf_decal/siding/wideplating_new/dark,
+/obj/effect/turf_decal/tile/neutral/half/contrasted{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
+ dir = 4
+ },
+/turf/open/floor/iron/dark/telecomms,
+/area/tcommsat/server)
+"bWF" = (
+/obj/effect/turf_decal/siding/wideplating_new/dark,
+/obj/effect/turf_decal/tile/neutral/half/contrasted{
+ dir = 4
+ },
+/obj/machinery/power/apc/highcap/five_k{
+ areastring = "/area/tcommsat/server";
+ dir = 1;
+ name = "Telecomms Server APC";
+ pixel_y = 24
+ },
+/obj/structure/cable/yellow{
+ icon_state = "0-8"
+ },
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
+ dir = 4
+ },
+/turf/open/floor/iron/dark/telecomms,
+/area/tcommsat/server)
+"bWG" = (
+/obj/effect/turf_decal/siding/wideplating_new/dark{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/wideplating_new/dark/corner{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/neutral/half/contrasted{
+ dir = 4
+ },
+/obj/machinery/light{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
+ dir = 10
+ },
+/turf/open/floor/iron/dark/telecomms,
+/area/tcommsat/server)
"bWI" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/structure/cable/yellow{
@@ -11656,6 +11687,19 @@
},
/turf/open/floor/iron,
/area/maintenance/disposal/incinerator)
+"bXz" = (
+/obj/effect/turf_decal/siding/wideplating_new/dark{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/wideplating_new/dark{
+ dir = 8
+ },
+/obj/structure/cable/yellow{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple,
+/turf/open/floor/iron/dark/telecomms,
+/area/tcommsat/server)
"bXA" = (
/obj/machinery/telecomms/server/presets/science,
/turf/open/floor/circuit/green/telecomms,
@@ -11851,6 +11895,35 @@
},
/turf/open/floor/plating,
/area/maintenance/port/aft)
+"bYz" = (
+/obj/effect/turf_decal/siding/wideplating_new/dark{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/wideplating_new/dark{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral/half/contrasted{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple,
+/turf/open/floor/iron/dark/telecomms,
+/area/tcommsat/server)
+"bYA" = (
+/obj/effect/turf_decal/siding/wideplating_new/dark{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/wideplating_new/dark{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/neutral/half/contrasted{
+ dir = 8
+ },
+/obj/structure/cable/yellow{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple,
+/turf/open/floor/iron/dark/telecomms,
+/area/tcommsat/server)
"bYB" = (
/obj/machinery/blackbox_recorder,
/turf/open/floor/circuit/green/telecomms,
@@ -11986,6 +12059,29 @@
},
/turf/open/floor/iron,
/area/engine/break_room)
+"bZo" = (
+/obj/effect/turf_decal/siding/wideplating_new/dark{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/wideplating_new/dark/corner{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/wideplating_new/dark/corner,
+/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
+/obj/structure/cable/yellow{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/heat_exchanging/manifold{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 5
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 6
+ },
+/turf/open/floor/iron/dark/telecomms,
+/area/tcommsat/server)
"bZp" = (
/obj/effect/turf_decal/siding/wideplating_new/dark,
/obj/effect/turf_decal/siding/wideplating_new/dark{
@@ -12658,26 +12754,6 @@
},
/turf/open/floor/engine,
/area/science/misc_lab)
-"cca" = (
-/obj/machinery/power/solar{
- id = "portsolar";
- name = "Port Solar Array"
- },
-/obj/structure/cable{
- icon_state = "0-4"
- },
-/turf/open/floor/iron/airless/solarpanel,
-/area/solar/port/aft)
-"ccb" = (
-/obj/machinery/power/solar{
- id = "portsolar";
- name = "Port Solar Array"
- },
-/obj/structure/cable{
- icon_state = "0-8"
- },
-/turf/open/floor/iron/airless/solarpanel,
-/area/solar/port/aft)
"ccc" = (
/obj/structure/lattice/catwalk,
/obj/structure/cable{
@@ -12693,6 +12769,20 @@
/obj/effect/spawner/lootdrop/maintenance,
/turf/open/floor/plating,
/area/maintenance/port/aft)
+"ccf" = (
+/obj/effect/turf_decal/siding/wideplating_new/dark{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/wideplating_new/dark{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/neutral/half/contrasted{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/turf/open/floor/iron/dark/telecomms,
+/area/tcommsat/server)
"ccg" = (
/obj/machinery/telecomms/message_server/preset,
/turf/open/floor/circuit/green/telecomms,
@@ -12785,6 +12875,19 @@
/obj/effect/spawner/lootdrop/maintenance,
/turf/open/floor/plating,
/area/maintenance/port/aft)
+"cdc" = (
+/obj/effect/turf_decal/siding/wideplating_new/dark{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/wideplating_new/dark{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+ dir = 1
+ },
+/turf/open/floor/iron/dark/telecomms,
+/area/tcommsat/server)
"cdd" = (
/obj/machinery/telecomms/server/presets/security,
/turf/open/floor/circuit/green/telecomms,
@@ -12793,6 +12896,16 @@
/obj/machinery/telecomms/processor/preset_two,
/turf/open/floor/circuit/green/telecomms,
/area/tcommsat/server)
+"cdf" = (
+/obj/effect/turf_decal/siding/wideplating_new/dark{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/wideplating_new/dark{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple,
+/turf/open/floor/iron/dark/telecomms,
+/area/tcommsat/server)
"cdh" = (
/obj/structure/disposalpipe/sorting/mail/flip{
dir = 8;
@@ -12892,10 +13005,69 @@
},
/turf/open/floor/plating,
/area/maintenance/port/aft)
+"cdZ" = (
+/obj/effect/turf_decal/siding/wideplating_new/dark{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/wideplating_new/dark/corner{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral/half/contrasted{
+ dir = 8
+ },
+/obj/machinery/light,
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
+ dir = 5
+ },
+/turf/open/floor/iron/dark/telecomms,
+/area/tcommsat/server)
"cea" = (
/obj/machinery/telecomms/server/presets/command,
/turf/open/floor/circuit/green/telecomms,
/area/tcommsat/server)
+"ceb" = (
+/obj/effect/turf_decal/siding/wideplating_new/dark{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/neutral/half/contrasted{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
+ dir = 4
+ },
+/turf/open/floor/iron/dark/telecomms,
+/area/tcommsat/server)
+"cec" = (
+/obj/effect/turf_decal/siding/wideplating_new/dark{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/neutral/half/contrasted{
+ dir = 8
+ },
+/obj/structure/sign/warning/nosmoking{
+ pixel_y = -32
+ },
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
+ dir = 4
+ },
+/turf/open/floor/iron/dark/telecomms,
+/area/tcommsat/server)
+"ced" = (
+/obj/effect/turf_decal/siding/wideplating_new/dark{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/wideplating_new/dark/corner{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/neutral/half/contrasted{
+ dir = 8
+ },
+/obj/machinery/light,
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
+ dir = 9
+ },
+/turf/open/floor/iron/dark/telecomms,
+/area/tcommsat/server)
"cef" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/structure/cable/yellow,
@@ -13540,13 +13712,6 @@
},
/turf/open/space,
/area/solar/port/aft)
-"chJ" = (
-/obj/machinery/power/tracker,
-/obj/structure/cable{
- icon_state = "0-4"
- },
-/turf/open/floor/iron/airless/solarpanel,
-/area/solar/port/aft)
"chK" = (
/obj/structure/lattice/catwalk,
/obj/structure/cable{
@@ -15187,11 +15352,6 @@
},
/turf/open/floor/iron,
/area/medical/genetics)
-"ctB" = (
-/obj/structure/cable,
-/obj/machinery/power/tracker,
-/turf/open/floor/iron/airless/solarpanel,
-/area/solar/starboard/aft)
"ctE" = (
/obj/structure/sign/warning/securearea,
/turf/closed/wall/r_wall,
@@ -17533,18 +17693,6 @@
/obj/effect/spawner/structure/window/plasma/reinforced,
/turf/open/floor/plating,
/area/engine/supermatter)
-"cMQ" = (
-/obj/machinery/power/solar{
- id = "starboardsolar";
- name = "Starboard Solar Array"
- },
-/obj/structure/cable/yellow{
- cable_color = "red";
- color = "#ff0000";
- icon_state = "0-2"
- },
-/turf/open/floor/iron/airless/solarpanel,
-/area/solar/starboard/aft)
"cMU" = (
/obj/effect/turf_decal/trimline/dark_blue/filled/line{
dir = 4
@@ -17554,14 +17702,6 @@
},
/turf/open/floor/iron/dark,
/area/hallway/secondary/command)
-"cNa" = (
-/obj/machinery/power/solar{
- id = "starboardsolar";
- name = "Starboard Solar Array"
- },
-/obj/structure/cable,
-/turf/open/floor/iron/airless/solarpanel,
-/area/solar/starboard/aft)
"cNq" = (
/obj/structure/table/reinforced,
/obj/machinery/recharger{
@@ -17817,6 +17957,24 @@
},
/turf/open/floor/engine,
/area/science/misc_lab)
+"cSE" = (
+/obj/effect/turf_decal/siding/wideplating_new/dark/corner{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/wideplating_new/dark/corner{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/wideplating_new/dark{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
+/obj/structure/cable/yellow{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/turf/open/floor/iron/dark/telecomms,
+/area/tcommsat/server)
"cSG" = (
/obj/machinery/atmospherics/pipe/simple/cyan/visible,
/turf/closed/wall/r_wall,
@@ -18108,13 +18266,6 @@
/obj/effect/spawner/lootdrop/grille_or_trash,
/turf/open/floor/plating,
/area/maintenance/fore/secondary)
-"cXi" = (
-/obj/machinery/telecomms/broadcaster/preset_exploration,
-/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
- dir = 4
- },
-/turf/open/floor/circuit/green/telecomms/mainframe,
-/area/quartermaster/exploration_dock)
"cYa" = (
/obj/machinery/advanced_airlock_controller{
dir = 4;
@@ -18569,6 +18720,24 @@
/obj/effect/turf_decal/bot_white/left,
/turf/open/floor/engine/light,
/area/engine/gravity_generator)
+"dkr" = (
+/obj/structure/cable/yellow{
+ icon_state = "4-8"
+ },
+/obj/structure/cable/yellow{
+ icon_state = "2-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 6
+ },
+/turf/open/floor/iron/goonplaque,
+/area/security/brig)
"dla" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 5
@@ -18606,6 +18775,23 @@
"dlz" = (
/turf/open/floor/iron/dark,
/area/teleporter)
+"dlA" = (
+/obj/machinery/holopad,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/structure/cable/yellow{
+ icon_state = "1-2"
+ },
+/obj/effect/turf_decal/siding/white{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/general/hidden{
+ dir = 5
+ },
+/turf/open/floor/iron,
+/area/tcommsat/computer)
"dlN" = (
/obj/structure/cable/yellow{
icon_state = "4-8"
@@ -19253,22 +19439,6 @@
/obj/machinery/atmospherics/pipe/simple/dark/visible/layer4,
/turf/open/space,
/area/space/nearstation)
-"dxP" = (
-/obj/effect/turf_decal/siding/wideplating_new/dark{
- dir = 4
- },
-/obj/effect/turf_decal/siding/wideplating_new/dark{
- dir = 8
- },
-/obj/effect/turf_decal/tile/neutral/half/contrasted{
- dir = 8
- },
-/obj/structure/cable/yellow{
- icon_state = "1-2"
- },
-/obj/machinery/atmospherics/pipe/heat_exchanging/simple,
-/turf/open/floor/iron/dark/telecomms,
-/area/tcommsat/server)
"dxY" = (
/obj/structure/cable/yellow{
icon_state = "2-8"
@@ -19353,6 +19523,18 @@
},
/turf/open/floor/iron,
/area/crew_quarters/fitness)
+"dAd" = (
+/obj/machinery/power/solar{
+ id = "auxsolareast";
+ name = "Port Auxiliary Solar Array"
+ },
+/obj/structure/cable/yellow{
+ cable_color = "red";
+ color = "#ff0000";
+ icon_state = "0-2"
+ },
+/turf/open/floor/iron/solarpanel/airless,
+/area/solar/starboard/fore)
"dAs" = (
/obj/structure/cable/yellow{
icon_state = "4-8"
@@ -19365,6 +19547,14 @@
},
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
+"dAJ" = (
+/obj/structure/cable,
+/obj/machinery/power/solar{
+ id = "auxsolareast";
+ name = "Port Auxiliary Solar Array"
+ },
+/turf/open/floor/iron/solarpanel/airless,
+/area/solar/starboard/fore)
"dAN" = (
/obj/effect/turf_decal/trimline/dark_blue/filled/line{
dir = 4
@@ -19641,17 +19831,6 @@
/obj/item/clothing/gloves/color/yellow,
/turf/open/floor/iron,
/area/engine/engineering)
-"dHL" = (
-/obj/effect/turf_decal/siding/wideplating_new/dark{
- dir = 8
- },
-/obj/effect/turf_decal/siding/wideplating_new/dark{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/heat_exchanging/simple,
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
-/turf/open/floor/iron/dark/telecomms,
-/area/tcommsat/server)
"dHO" = (
/obj/machinery/door/airlock/engineering{
name = "Port Bow Solar Access";
@@ -21254,6 +21433,16 @@
},
/turf/open/floor/carpet/grimy,
/area/ai_monitored/turret_protected/aisat_interior)
+"equ" = (
+/obj/structure/window/reinforced/spawner{
+ dir = 1
+ },
+/obj/machinery/telecomms/server/presets/exploration,
+/obj/machinery/camera/autoname{
+ dir = 5
+ },
+/turf/open/floor/circuit/telecomms/server,
+/area/quartermaster/exploration_dock)
"eqw" = (
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
dir = 8
@@ -21522,39 +21711,6 @@
},
/turf/open/floor/iron,
/area/engine/engineering)
-"ewa" = (
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
- dir = 4
- },
-/obj/structure/cable/yellow{
- icon_state = "1-2"
- },
-/obj/structure/cable/yellow{
- icon_state = "4-8"
- },
-/obj/machinery/door/firedoor,
-/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
-/obj/effect/turf_decal/siding/wideplating_new/dark/corner{
- dir = 1
- },
-/obj/effect/turf_decal/siding/wideplating_new/dark/corner{
- dir = 8
- },
-/obj/machinery/door/airlock/engineering/glass{
- name = "Server Room";
- req_access_txt = "61"
- },
-/obj/machinery/atmospherics/pipe/heat_exchanging/junction{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 8
- },
-/turf/open/floor/iron/dark,
-/area/tcommsat/computer)
"ewc" = (
/obj/effect/turf_decal/siding/thinplating_new{
dir = 8
@@ -21752,20 +21908,6 @@
/obj/structure/reagent_dispensers/fueltank,
/turf/open/floor/plating,
/area/maintenance/central)
-"ezo" = (
-/obj/effect/turf_decal/siding/wideplating_new/dark{
- dir = 4
- },
-/obj/effect/turf_decal/siding/wideplating_new/dark{
- dir = 8
- },
-/obj/effect/turf_decal/tile/neutral/half/contrasted{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/heat_exchanging/simple,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/turf/open/floor/iron/dark/telecomms,
-/area/tcommsat/server)
"ezu" = (
/obj/effect/turf_decal/bot,
/turf/open/floor/iron,
@@ -22092,14 +22234,6 @@
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
/turf/open/floor/iron/dark,
/area/quartermaster/exploration_prep)
-"eGz" = (
-/obj/machinery/atmospherics/components/unary/portables_connector{
- dir = 1
- },
-/obj/machinery/portable_atmospherics/canister/plasma,
-/obj/effect/mapping_helpers/atmos_auto_connect,
-/turf/open/floor/plating,
-/area/maintenance/starboard)
"eGU" = (
/obj/machinery/light/small{
dir = 8
@@ -22514,30 +22648,15 @@
},
/turf/open/floor/iron/white,
/area/medical/virology)
-"eOD" = (
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
- dir = 8
- },
-/obj/machinery/door/airlock/engineering/glass{
- name = "Server Room";
- req_access_txt = "61"
- },
-/obj/structure/cable/yellow{
- icon_state = "4-8"
- },
-/obj/machinery/door/firedoor,
-/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
-/obj/machinery/atmospherics/pipe/simple/general/hidden{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 8
+"eOJ" = (
+/obj/machinery/telecomms/receiver/preset_exploration,
+/obj/machinery/power/apc/auto_name/east,
+/obj/structure/cable/yellow,
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
+ dir = 9
},
-/turf/open/floor/iron/dark,
-/area/tcommsat/computer)
+/turf/open/floor/circuit/green/telecomms/mainframe,
+/area/quartermaster/exploration_dock)
"ePu" = (
/obj/structure/cable{
icon_state = "1-8"
@@ -22571,6 +22690,17 @@
},
/turf/open/floor/iron,
/area/quartermaster/storage)
+"eQc" = (
+/obj/effect/turf_decal/stripes/line,
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/structure/cable/yellow{
+ icon_state = "2-8"
+ },
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple,
+/turf/open/floor/iron/dark/telecomms,
+/area/quartermaster/exploration_dock)
"eQj" = (
/obj/machinery/computer/secure_data{
dir = 4;
@@ -22808,19 +22938,6 @@
},
/turf/open/floor/iron,
/area/quartermaster/miningdock)
-"eVP" = (
-/obj/item/radio/intercom{
- dir = 8;
- freerange = 1;
- name = "Station Intercom (Telecomms)";
- pixel_y = 26
- },
-/obj/effect/turf_decal/tile/yellow/half/contrasted{
- dir = 4
- },
-/obj/machinery/space_heater,
-/turf/open/floor/iron,
-/area/tcommsat/computer)
"eVR" = (
/obj/structure/table,
/turf/open/floor/iron/showroomfloor,
@@ -23233,13 +23350,6 @@
},
/turf/open/floor/circuit,
/area/ai_monitored/turret_protected/ai_upload)
-"ffa" = (
-/obj/machinery/telecomms/bus/preset_exploration,
-/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
- dir = 4
- },
-/turf/open/floor/circuit/green/telecomms/mainframe,
-/area/quartermaster/exploration_dock)
"ffm" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
@@ -24247,14 +24357,6 @@
},
/turf/open/floor/engine/o2,
/area/engine/atmos)
-"fCK" = (
-/obj/machinery/power/solar{
- id = "auxsolareast";
- name = "Port Auxiliary Solar Array"
- },
-/obj/structure/cable,
-/turf/open/floor/iron/airless/solarpanel,
-/area/solar/starboard/fore)
"fDa" = (
/obj/machinery/atmospherics/pipe/simple/yellow/visible{
dir = 5
@@ -24801,6 +24903,13 @@
},
/turf/open/floor/iron,
/area/engine/atmos)
+"fSt" = (
+/obj/machinery/power/tracker,
+/obj/structure/cable{
+ icon_state = "0-4"
+ },
+/turf/open/floor/iron/solarpanel/airless,
+/area/solar/port/aft)
"fSx" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 4
@@ -25220,6 +25329,17 @@
},
/turf/open/floor/iron,
/area/hallway/primary/central)
+"fZG" = (
+/obj/effect/turf_decal/siding/wideplating_new/dark{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/wideplating_new/dark{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
+/turf/open/floor/iron/dark/telecomms,
+/area/tcommsat/server)
"fZH" = (
/obj/effect/turf_decal/tile/red/half/contrasted,
/obj/effect/landmark/start/security_officer,
@@ -26380,6 +26500,14 @@
},
/turf/open/floor/plating/airless,
/area/space/nearstation)
+"gAZ" = (
+/obj/machinery/power/solar{
+ id = "starboardsolar";
+ name = "Starboard Solar Array"
+ },
+/obj/structure/cable,
+/turf/open/floor/iron/solarpanel/airless,
+/area/solar/starboard/aft)
"gBM" = (
/obj/effect/turf_decal/tile/red/opposingcorners,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
@@ -26860,25 +26988,6 @@
},
/turf/open/floor/iron,
/area/construction/mining/aux_base)
-"gNt" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/obj/effect/turf_decal/stripes/corner,
-/obj/structure/cable/yellow{
- icon_state = "2-8"
- },
-/obj/machinery/atmospherics/pipe/heat_exchanging/manifold{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 10
- },
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
- dir = 8
- },
-/turf/open/floor/iron/dark/telecomms,
-/area/quartermaster/exploration_dock)
"gOf" = (
/obj/effect/landmark/start/station_engineer,
/obj/effect/turf_decal/stripes/corner{
@@ -27671,25 +27780,6 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/turf/open/floor/plating,
/area/maintenance/starboard/fore)
-"hiV" = (
-/obj/effect/turf_decal/siding/wideplating_new/dark,
-/obj/effect/turf_decal/tile/neutral/half/contrasted{
- dir = 4
- },
-/obj/machinery/power/apc/highcap/five_k{
- areastring = "/area/tcommsat/server";
- dir = 1;
- name = "Telecomms Server APC";
- pixel_y = 24
- },
-/obj/structure/cable/yellow{
- icon_state = "0-8"
- },
-/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
- dir = 4
- },
-/turf/open/floor/iron/dark/telecomms,
-/area/tcommsat/server)
"hjj" = (
/obj/machinery/vending/medical,
/turf/open/floor/iron/white,
@@ -27899,14 +27989,6 @@
},
/turf/open/floor/wood,
/area/crew_quarters/heads/captain)
-"hom" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
- dir = 8
- },
-/obj/effect/turf_decal/siding/white,
-/obj/structure/closet/emcloset,
-/turf/open/floor/iron,
-/area/tcommsat/computer)
"hos" = (
/obj/structure/chair/office{
dir = 4
@@ -28306,17 +28388,6 @@
/obj/effect/spawner/lootdrop/maintenance,
/turf/open/floor/prison/dark,
/area/security/prison)
-"hzY" = (
-/obj/effect/turf_decal/siding/wideplating_new/dark,
-/obj/effect/turf_decal/siding/wideplating_new/dark{
- dir = 1
- },
-/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 8
- },
-/turf/open/floor/iron/dark/telecomms,
-/area/tcommsat/server)
"hAh" = (
/obj/structure/cable/yellow{
icon_state = "1-2"
@@ -29260,6 +29331,21 @@
},
/turf/open/floor/iron/white,
/area/medical/medbay/central)
+"hSo" = (
+/obj/effect/turf_decal/siding/wideplating_new/dark{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/wideplating_new/dark/corner,
+/obj/effect/turf_decal/siding/wideplating_new/dark/corner{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 6
+ },
+/turf/open/floor/iron/dark/telecomms,
+/area/tcommsat/server)
"hSv" = (
/obj/machinery/light,
/obj/machinery/airalarm/directional/south,
@@ -29690,24 +29776,6 @@
},
/turf/open/floor/iron,
/area/quartermaster/exploration_dock)
-"icP" = (
-/obj/effect/turf_decal/siding/wideplating_new/dark{
- dir = 4
- },
-/obj/effect/turf_decal/siding/wideplating_new/dark/corner{
- dir = 8
- },
-/obj/effect/turf_decal/tile/neutral/half/contrasted{
- dir = 4
- },
-/obj/machinery/light{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
- dir = 10
- },
-/turf/open/floor/iron/dark/telecomms,
-/area/tcommsat/server)
"icS" = (
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/iron,
@@ -30083,18 +30151,6 @@
},
/turf/open/floor/iron/dark,
/area/ai_monitored/turret_protected/aisat_interior)
-"ikc" = (
-/obj/effect/turf_decal/siding/wideplating_new/dark{
- dir = 1
- },
-/obj/effect/turf_decal/tile/neutral/half/contrasted{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
- dir = 4
- },
-/turf/open/floor/iron/dark/telecomms,
-/area/tcommsat/server)
"ikf" = (
/obj/structure/cable/yellow{
icon_state = "1-2"
@@ -30353,21 +30409,6 @@
/obj/effect/spawner/lootdrop/maintenance,
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
-"ioJ" = (
-/obj/structure/cable/yellow{
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/manifold/general/hidden{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 4
- },
-/turf/open/floor/plating,
-/area/maintenance/starboard)
"ioN" = (
/obj/structure/cable/yellow{
icon_state = "4-8"
@@ -31392,17 +31433,6 @@
},
/turf/open/floor/iron,
/area/hallway/primary/port)
-"iMF" = (
-/obj/effect/turf_decal/stripes/line,
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/obj/structure/cable/yellow{
- icon_state = "2-8"
- },
-/obj/machinery/atmospherics/pipe/heat_exchanging/simple,
-/turf/open/floor/iron/dark/telecomms,
-/area/quartermaster/exploration_dock)
"iMY" = (
/obj/structure/cable/yellow{
icon_state = "2-4"
@@ -32842,21 +32872,6 @@
/obj/structure/transit_tube/horizontal,
/turf/open/floor/plating,
/area/ai_monitored/turret_protected/aisat_interior)
-"juo" = (
-/obj/effect/turf_decal/siding/wideplating_new/dark{
- dir = 1
- },
-/obj/effect/turf_decal/tile/neutral/half/contrasted{
- dir = 8
- },
-/obj/structure/sign/warning/nosmoking{
- pixel_y = -32
- },
-/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
- dir = 4
- },
-/turf/open/floor/iron/dark/telecomms,
-/area/tcommsat/server)
"jus" = (
/obj/effect/turf_decal/tile/red/half/contrasted{
dir = 1
@@ -33832,21 +33847,6 @@
/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
/turf/open/floor/iron,
/area/hallway/primary/aft)
-"jQU" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/obj/effect/turf_decal/stripes/corner{
- dir = 4
- },
-/obj/effect/turf_decal/stripes/corner,
-/obj/structure/cable/yellow{
- icon_state = "1-4"
- },
-/obj/machinery/atmospherics/pipe/heat_exchanging/simple,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/turf/open/floor/iron/dark/telecomms,
-/area/quartermaster/exploration_dock)
"jRJ" = (
/obj/machinery/vending/boozeomat,
/turf/open/floor/iron/cafeteria_red,
@@ -34174,6 +34174,27 @@
},
/turf/open/floor/iron/white,
/area/crew_quarters/heads/cmo)
+"jYJ" = (
+/obj/structure/cable/yellow{
+ icon_state = "4-8"
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/effect/turf_decal/caution{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/general/hidden{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 8
+ },
+/turf/open/floor/iron/dark,
+/area/tcommsat/computer)
"jYS" = (
/obj/structure/cable/yellow{
icon_state = "2-4"
@@ -34687,6 +34708,17 @@
/obj/machinery/airalarm/directional/west,
/turf/open/floor/plating,
/area/maintenance/port/aft)
+"kmA" = (
+/obj/effect/turf_decal/siding/wideplating_new/dark,
+/obj/effect/turf_decal/siding/wideplating_new/dark{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 8
+ },
+/turf/open/floor/iron/dark/telecomms,
+/area/tcommsat/server)
"kmE" = (
/obj/structure/extinguisher_cabinet{
pixel_x = -5;
@@ -35366,24 +35398,6 @@
},
/turf/open/floor/iron/dark,
/area/security/main)
-"kzA" = (
-/obj/effect/turf_decal/siding/wideplating_new/dark{
- dir = 8
- },
-/obj/effect/turf_decal/siding/wideplating_new/dark/corner,
-/obj/effect/turf_decal/siding/wideplating_new/dark/corner{
- dir = 4
- },
-/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
-/obj/structure/cable/yellow{
- icon_state = "4-8"
- },
-/obj/structure/cable/yellow{
- icon_state = "1-8"
- },
-/obj/machinery/atmospherics/pipe/heat_exchanging/simple,
-/turf/open/floor/iron/dark/telecomms,
-/area/tcommsat/server)
"kzD" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/obj/machinery/door/firedoor,
@@ -35512,6 +35526,14 @@
/obj/machinery/door/firedoor,
/turf/open/floor/iron,
/area/security/brig)
+"kCj" = (
+/obj/machinery/atmospherics/components/unary/portables_connector{
+ dir = 1
+ },
+/obj/machinery/portable_atmospherics/canister/plasma,
+/obj/effect/mapping_helpers/atmos_auto_connect,
+/turf/open/floor/plating,
+/area/maintenance/starboard)
"kCJ" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -36156,23 +36178,6 @@
/obj/structure/cable/yellow,
/turf/open/floor/plating,
/area/engine/engineering)
-"kPn" = (
-/obj/machinery/holopad,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/structure/cable/yellow{
- icon_state = "1-2"
- },
-/obj/effect/turf_decal/siding/white{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/simple/general/hidden{
- dir = 5
- },
-/turf/open/floor/iron,
-/area/tcommsat/computer)
"kPo" = (
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
/obj/effect/turf_decal/trimline/dark_blue/filled/line{
@@ -37570,16 +37575,6 @@
/obj/structure/grille,
/turf/open/floor/plating,
/area/maintenance/central)
-"lrC" = (
-/obj/effect/turf_decal/siding/wideplating_new/dark,
-/obj/effect/turf_decal/tile/neutral/half/contrasted{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
- dir = 4
- },
-/turf/open/floor/iron/dark/telecomms,
-/area/tcommsat/server)
"lrH" = (
/obj/effect/turf_decal/trimline/dark_blue/filled/line{
dir = 4
@@ -37899,20 +37894,6 @@
},
/turf/open/floor/iron/dark,
/area/chapel/main)
-"lzh" = (
-/obj/effect/turf_decal/siding/wideplating_new/dark{
- dir = 8
- },
-/obj/effect/turf_decal/siding/wideplating_new/dark{
- dir = 4
- },
-/obj/effect/turf_decal/tile/neutral/half/contrasted{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/heat_exchanging/simple,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/turf/open/floor/iron/dark/telecomms,
-/area/tcommsat/server)
"lzi" = (
/obj/structure/window/reinforced{
dir = 8
@@ -39218,6 +39199,16 @@
},
/turf/open/floor/iron/white,
/area/medical/surgery)
+"meM" = (
+/obj/machinery/power/solar{
+ id = "portsolar";
+ name = "Port Solar Array"
+ },
+/obj/structure/cable{
+ icon_state = "0-8"
+ },
+/turf/open/floor/iron/solarpanel/airless,
+/area/solar/port/aft)
"meO" = (
/obj/structure/cable/yellow{
icon_state = "1-2"
@@ -39630,6 +39621,25 @@
},
/turf/open/space/basic,
/area/space/nearstation)
+"mnE" = (
+/obj/machinery/door/airlock/hatch{
+ name = "Exploration Telecommunications";
+ req_access_txt = "61"
+ },
+/obj/structure/cable/yellow{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/general/hidden{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
+/turf/open/floor/plating,
+/area/quartermaster/exploration_dock)
"mnG" = (
/obj/effect/turf_decal/loading_area{
dir = 8
@@ -40417,22 +40427,6 @@
},
/turf/open/floor/plating,
/area/teleporter)
-"mGR" = (
-/obj/structure/cable/yellow{
- icon_state = "4-8"
- },
-/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
-/obj/machinery/atmospherics/pipe/simple/general/hidden{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 8
- },
-/turf/open/floor/iron/dark,
-/area/tcommsat/computer)
"mGS" = (
/obj/structure/disposalpipe/segment{
dir = 5
@@ -40530,19 +40524,6 @@
},
/turf/open/floor/iron/white,
/area/medical/medbay/central)
-"mLe" = (
-/obj/effect/turf_decal/siding/wideplating_new/dark{
- dir = 4
- },
-/obj/effect/turf_decal/siding/wideplating_new/dark{
- dir = 8
- },
-/obj/structure/cable/yellow{
- icon_state = "1-2"
- },
-/obj/machinery/atmospherics/pipe/heat_exchanging/simple,
-/turf/open/floor/iron/dark/telecomms,
-/area/tcommsat/server)
"mLG" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
@@ -42494,6 +42475,13 @@
/obj/item/kirbyplants/random,
/turf/open/floor/iron/cafeteria_red,
/area/crew_quarters/bar)
+"nAO" = (
+/obj/machinery/power/tracker,
+/obj/structure/cable{
+ icon_state = "0-2"
+ },
+/turf/open/floor/iron/solarpanel/airless,
+/area/solar/port/fore)
"nAP" = (
/obj/structure/cable/yellow{
icon_state = "1-2"
@@ -43156,27 +43144,6 @@
},
/turf/open/floor/iron,
/area/crew_quarters/fitness)
-"nPv" = (
-/obj/structure/cable/yellow{
- icon_state = "4-8"
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/obj/effect/turf_decal/caution{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/general/hidden{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 8
- },
-/turf/open/floor/iron/dark,
-/area/tcommsat/computer)
"nPA" = (
/obj/structure/cable/yellow{
icon_state = "0-4"
@@ -44089,23 +44056,6 @@
},
/turf/open/floor/iron/dark,
/area/medical/morgue)
-"oil" = (
-/obj/machinery/power/terminal{
- dir = 8
- },
-/obj/effect/turf_decal/siding/wideplating_new/dark{
- dir = 4
- },
-/obj/effect/turf_decal/siding/wideplating_new/dark{
- dir = 8
- },
-/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
-/obj/structure/cable/yellow{
- icon_state = "0-4"
- },
-/obj/machinery/atmospherics/pipe/heat_exchanging/simple,
-/turf/open/floor/iron/dark/telecomms,
-/area/tcommsat/server)
"oiT" = (
/obj/machinery/shower{
dir = 8
@@ -44916,6 +44866,11 @@
/obj/machinery/meter,
/turf/open/floor/iron,
/area/engine/atmos)
+"oBV" = (
+/obj/structure/cable,
+/obj/machinery/power/tracker,
+/turf/open/floor/iron/solarpanel/airless,
+/area/solar/starboard/aft)
"oCv" = (
/obj/structure/filingcabinet/chestdrawer,
/obj/effect/turf_decal/tile/red/half/contrasted{
@@ -45370,6 +45325,39 @@
},
/turf/open/floor/iron/dark,
/area/ai_monitored/turret_protected/ai)
+"oSI" = (
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+ dir = 4
+ },
+/obj/structure/cable/yellow{
+ icon_state = "1-2"
+ },
+/obj/structure/cable/yellow{
+ icon_state = "4-8"
+ },
+/obj/machinery/door/firedoor,
+/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
+/obj/effect/turf_decal/siding/wideplating_new/dark/corner{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/wideplating_new/dark/corner{
+ dir = 8
+ },
+/obj/machinery/door/airlock/engineering/glass{
+ name = "Server Room";
+ req_access_txt = "61"
+ },
+/obj/machinery/atmospherics/pipe/heat_exchanging/junction{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 8
+ },
+/turf/open/floor/iron/dark,
+/area/tcommsat/computer)
"oTf" = (
/obj/machinery/door/airlock/virology{
name = "Monkey Pen";
@@ -45458,6 +45446,22 @@
},
/turf/open/floor/iron,
/area/quartermaster/miningdock)
+"oVd" = (
+/obj/structure/cable/yellow{
+ icon_state = "4-8"
+ },
+/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
+/obj/machinery/atmospherics/pipe/simple/general/hidden{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 8
+ },
+/turf/open/floor/iron/dark,
+/area/tcommsat/computer)
"oVe" = (
/obj/machinery/telecomms/hub/preset,
/obj/structure/cable/yellow{
@@ -46160,23 +46164,6 @@
},
/turf/open/floor/iron/white,
/area/medical/virology)
-"pqo" = (
-/obj/effect/turf_decal/siding/wideplating_new/dark/corner{
- dir = 1
- },
-/obj/effect/turf_decal/siding/wideplating_new/dark/corner{
- dir = 8
- },
-/obj/effect/turf_decal/siding/wideplating_new/dark{
- dir = 4
- },
-/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
-/obj/machinery/atmospherics/pipe/heat_exchanging/simple,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 9
- },
-/turf/open/floor/iron/dark/telecomms,
-/area/tcommsat/server)
"pqp" = (
/obj/machinery/camera/autoname{
dir = 8
@@ -46582,6 +46569,30 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
/area/maintenance/fore/secondary)
+"pyy" = (
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+ dir = 8
+ },
+/obj/machinery/door/airlock/engineering/glass{
+ name = "Server Room";
+ req_access_txt = "61"
+ },
+/obj/structure/cable/yellow{
+ icon_state = "4-8"
+ },
+/obj/machinery/door/firedoor,
+/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
+/obj/machinery/atmospherics/pipe/simple/general/hidden{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 8
+ },
+/turf/open/floor/iron/dark,
+/area/tcommsat/computer)
"pyz" = (
/obj/structure/cable/yellow{
icon_state = "0-8"
@@ -46723,13 +46734,6 @@
/obj/effect/landmark/prisonspawn,
/turf/open/floor/prison,
/area/security/prison)
-"pBw" = (
-/obj/machinery/telecomms/hub/preset/exploration,
-/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
- dir = 10
- },
-/turf/open/floor/circuit/green/telecomms/mainframe,
-/area/quartermaster/exploration_dock)
"pBA" = (
/obj/structure/cable/yellow{
icon_state = "1-2"
@@ -47993,21 +47997,6 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/turf/open/floor/plating,
/area/maintenance/starboard/fore)
-"qdh" = (
-/obj/machinery/requests_console{
- announcementConsole = 1;
- department = "Telecomms Admin";
- departmentType = 5;
- name = "Telecomms RC";
- pixel_x = 30
- },
-/obj/machinery/atmospherics/components/unary/portables_connector{
- dir = 8
- },
-/obj/machinery/portable_atmospherics/canister/plasma,
-/obj/effect/mapping_helpers/atmos_auto_connect,
-/turf/open/floor/iron,
-/area/tcommsat/computer)
"qdU" = (
/obj/structure/sign/warning/vacuum/external,
/obj/effect/spawner/structure/window/reinforced,
@@ -48232,6 +48221,14 @@
},
/turf/open/floor/iron/dark,
/area/storage/tech)
+"qkT" = (
+/obj/machinery/power/solar{
+ id = "auxsolareast";
+ name = "Port Auxiliary Solar Array"
+ },
+/obj/structure/cable,
+/turf/open/floor/iron/solarpanel/airless,
+/area/solar/port/fore)
"qlf" = (
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
/turf/open/floor/iron/dark,
@@ -48838,6 +48835,23 @@
},
/turf/open/floor/iron/dark,
/area/medical/morgue)
+"qxY" = (
+/obj/effect/turf_decal/siding/wideplating_new/dark/corner{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/wideplating_new/dark/corner{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/wideplating_new/dark{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 9
+ },
+/turf/open/floor/iron/dark/telecomms,
+/area/tcommsat/server)
"qyw" = (
/obj/machinery/washing_machine,
/obj/machinery/light,
@@ -48958,6 +48972,23 @@
},
/turf/open/floor/iron,
/area/science/robotics/lab)
+"qBN" = (
+/obj/machinery/power/terminal{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/wideplating_new/dark{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/wideplating_new/dark{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
+/obj/structure/cable/yellow{
+ icon_state = "0-4"
+ },
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple,
+/turf/open/floor/iron/dark/telecomms,
+/area/tcommsat/server)
"qCh" = (
/obj/structure/chair/office{
dir = 8
@@ -49011,24 +49042,6 @@
/obj/machinery/light/small,
/turf/open/floor/plating,
/area/ai_monitored/turret_protected/aisat_interior)
-"qDA" = (
-/obj/effect/turf_decal/siding/wideplating_new/dark/corner{
- dir = 1
- },
-/obj/effect/turf_decal/siding/wideplating_new/dark/corner{
- dir = 8
- },
-/obj/effect/turf_decal/siding/wideplating_new/dark{
- dir = 4
- },
-/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
-/obj/structure/cable/yellow{
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/heat_exchanging/simple,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/turf/open/floor/iron/dark/telecomms,
-/area/tcommsat/server)
"qEl" = (
/obj/structure/table,
/obj/item/stack/cable_coil/random,
@@ -49209,16 +49222,6 @@
/obj/effect/turf_decal/tile/neutral/opposingcorners,
/turf/open/floor/iron,
/area/vacant_room/commissary)
-"qIM" = (
-/obj/effect/turf_decal/siding/wideplating_new/dark{
- dir = 8
- },
-/obj/effect/turf_decal/siding/wideplating_new/dark{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/heat_exchanging/simple,
-/turf/open/floor/iron/dark/telecomms,
-/area/tcommsat/server)
"qJm" = (
/obj/structure/disposalpipe/segment,
/obj/structure/cable/yellow{
@@ -49920,6 +49923,22 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/iron/white,
/area/medical/virology)
+"qZW" = (
+/obj/structure/disposalpipe/segment,
+/obj/structure/cable/yellow{
+ icon_state = "1-2"
+ },
+/obj/structure/cable/yellow{
+ icon_state = "1-4"
+ },
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+ dir = 8
+ },
+/turf/open/floor/plating,
+/area/maintenance/starboard)
"rag" = (
/obj/machinery/disposal/bin,
/obj/structure/disposalpipe/trunk{
@@ -50283,22 +50302,6 @@
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
/turf/open/floor/iron/dark,
/area/ai_monitored/nuke_storage)
-"rgm" = (
-/obj/effect/turf_decal/siding/wideplating_new/dark{
- dir = 8
- },
-/obj/effect/turf_decal/siding/wideplating_new/dark/corner{
- dir = 4
- },
-/obj/effect/turf_decal/tile/neutral/half/contrasted{
- dir = 8
- },
-/obj/machinery/light,
-/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
- dir = 5
- },
-/turf/open/floor/iron/dark/telecomms,
-/area/tcommsat/server)
"rgu" = (
/turf/open/floor/engine/light,
/area/engine/gravity_generator)
@@ -50856,27 +50859,6 @@
},
/turf/open/floor/iron,
/area/crew_quarters/dorms)
-"rrj" = (
-/obj/structure/cable/yellow{
- icon_state = "1-2"
- },
-/obj/structure/cable/yellow{
- icon_state = "2-8"
- },
-/obj/effect/turf_decal/siding/white{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/manifold/general/hidden{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/tcommsat/computer)
"rro" = (
/obj/effect/spawner/structure/window/reinforced/prison,
/obj/structure/cable/yellow{
@@ -51318,19 +51300,27 @@
},
/turf/open/floor/iron,
/area/hallway/primary/central)
-"rBK" = (
-/obj/effect/turf_decal/siding/wideplating_new/dark{
+"rCa" = (
+/obj/structure/cable/yellow{
+ icon_state = "1-2"
+ },
+/obj/structure/cable/yellow{
+ icon_state = "2-8"
+ },
+/obj/effect/turf_decal/siding/white{
dir = 8
},
-/obj/effect/turf_decal/siding/wideplating_new/dark{
+/obj/machinery/atmospherics/pipe/manifold/general/hidden{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
dir = 4
},
-/obj/effect/turf_decal/tile/neutral/half/contrasted{
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
dir = 4
},
-/obj/machinery/atmospherics/pipe/heat_exchanging/simple,
-/turf/open/floor/iron/dark/telecomms,
-/area/tcommsat/server)
+/turf/open/floor/iron,
+/area/tcommsat/computer)
"rCK" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 8
@@ -51631,6 +51621,15 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/plating,
/area/maintenance/fore/secondary)
+"rHF" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 8
+ },
+/turf/open/floor/iron/goonplaque,
+/area/hallway/secondary/entry)
"rHU" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
dir = 4
@@ -51727,6 +51726,13 @@
dir = 5
},
/area/science/research)
+"rKw" = (
+/obj/machinery/telecomms/hub/preset/exploration,
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
+ dir = 10
+ },
+/turf/open/floor/circuit/green/telecomms/mainframe,
+/area/quartermaster/exploration_dock)
"rLd" = (
/obj/structure/table/reinforced,
/obj/machinery/door/window/eastright{
@@ -51941,32 +51947,6 @@
/obj/machinery/firealarm/directional/north,
/turf/open/floor/wood,
/area/security/detectives_office)
-"rPs" = (
-/obj/machinery/door/window/brigdoor{
- dir = 4;
- name = "Telecommunications";
- req_access_txt = "61"
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/obj/effect/turf_decal/caution{
- dir = 8
- },
-/obj/structure/cable/yellow{
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/heat_exchanging/junction{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 4
- },
-/turf/open/floor/iron/dark/telecomms,
-/area/quartermaster/exploration_dock)
"rPD" = (
/obj/machinery/airalarm{
dir = 8;
@@ -52252,24 +52232,6 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
/turf/open/floor/iron,
/area/science/mixing)
-"rUb" = (
-/obj/structure/cable/yellow{
- icon_state = "4-8"
- },
-/obj/structure/cable/yellow{
- icon_state = "2-8"
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 4
- },
-/obj/structure/disposalpipe/segment{
- dir = 6
- },
-/turf/open/floor/goonplaque,
-/area/security/brig)
"rUC" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -52441,21 +52403,6 @@
},
/turf/open/floor/plating,
/area/maintenance/port)
-"rYN" = (
-/obj/effect/turf_decal/siding/wideplating_new/dark{
- dir = 8
- },
-/obj/effect/turf_decal/siding/wideplating_new/dark/corner,
-/obj/effect/turf_decal/siding/wideplating_new/dark/corner{
- dir = 4
- },
-/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
-/obj/machinery/atmospherics/pipe/heat_exchanging/simple,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 6
- },
-/turf/open/floor/iron/dark/telecomms,
-/area/tcommsat/server)
"rYU" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
dir = 1
@@ -53069,22 +53016,6 @@
},
/turf/open/floor/iron/dark,
/area/science/nanite)
-"smY" = (
-/obj/structure/disposalpipe/segment,
-/obj/structure/cable/yellow{
- icon_state = "1-2"
- },
-/obj/structure/cable/yellow{
- icon_state = "1-4"
- },
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
- dir = 8
- },
-/turf/open/floor/plating,
-/area/maintenance/starboard)
"snr" = (
/obj/structure/lattice/catwalk/over,
/obj/structure/cable/yellow{
@@ -53134,6 +53065,18 @@
},
/turf/open/floor/carpet/red,
/area/crew_quarters/heads/hos)
+"soh" = (
+/obj/machinery/power/solar{
+ id = "auxsolareast";
+ name = "Port Auxiliary Solar Array"
+ },
+/obj/structure/cable/yellow{
+ cable_color = "red";
+ color = "#ff0000";
+ icon_state = "0-2"
+ },
+/turf/open/floor/iron/solarpanel/airless,
+/area/solar/port/fore)
"soA" = (
/obj/structure/cable/yellow{
icon_state = "1-4"
@@ -53400,25 +53343,6 @@
},
/turf/open/floor/prison/dark,
/area/security/prison)
-"stB" = (
-/obj/effect/turf_decal/siding/wideplating_new/dark{
- dir = 8
- },
-/obj/effect/turf_decal/siding/wideplating_new/dark/corner,
-/obj/effect/turf_decal/tile/neutral/half/contrasted{
- dir = 4
- },
-/obj/structure/cable/yellow{
- icon_state = "2-4"
- },
-/obj/machinery/light{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
- dir = 6
- },
-/turf/open/floor/iron/dark/telecomms,
-/area/tcommsat/server)
"stN" = (
/obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted,
/obj/effect/turf_decal/siding/dark_blue{
@@ -53630,25 +53554,6 @@
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
/turf/open/floor/iron,
/area/engine/engineering)
-"syr" = (
-/obj/machinery/door/airlock/hatch{
- name = "Exploration Telecommunications";
- req_access_txt = "61"
- },
-/obj/structure/cable/yellow{
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/simple/general/hidden{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 4
- },
-/turf/open/floor/plating,
-/area/quartermaster/exploration_dock)
"syA" = (
/obj/effect/turf_decal/siding/wood{
layer = 1
@@ -53748,6 +53653,13 @@
},
/turf/open/floor/iron,
/area/crew_quarters/locker)
+"szx" = (
+/obj/machinery/telecomms/bus/preset_exploration,
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
+ dir = 4
+ },
+/turf/open/floor/circuit/green/telecomms/mainframe,
+/area/quartermaster/exploration_dock)
"szC" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 9
@@ -53805,6 +53717,24 @@
},
/turf/open/floor/iron/white,
/area/medical/medbay/lobby)
+"sAj" = (
+/obj/effect/turf_decal/siding/wideplating_new/dark{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/wideplating_new/dark/corner,
+/obj/effect/turf_decal/siding/wideplating_new/dark/corner{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
+/obj/structure/cable/yellow{
+ icon_state = "4-8"
+ },
+/obj/structure/cable/yellow{
+ icon_state = "1-8"
+ },
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple,
+/turf/open/floor/iron/dark/telecomms,
+/area/tcommsat/server)
"sAt" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/obj/effect/turf_decal/tile/red/opposingcorners,
@@ -54004,6 +53934,32 @@
},
/turf/open/floor/plating,
/area/security/prison)
+"sDn" = (
+/obj/machinery/door/window/brigdoor{
+ dir = 4;
+ name = "Telecommunications";
+ req_access_txt = "61"
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/obj/effect/turf_decal/caution{
+ dir = 8
+ },
+/obj/structure/cable/yellow{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/heat_exchanging/junction{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
+/turf/open/floor/iron/dark/telecomms,
+/area/quartermaster/exploration_dock)
"sDu" = (
/obj/structure/curtain,
/obj/effect/spawner/structure/window,
@@ -54868,6 +54824,13 @@
},
/turf/open/floor/iron/white,
/area/science/robotics/lab)
+"sWW" = (
+/obj/machinery/telecomms/broadcaster/preset_exploration,
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
+ dir = 4
+ },
+/turf/open/floor/circuit/green/telecomms/mainframe,
+/area/quartermaster/exploration_dock)
"sXf" = (
/obj/structure/table/wood,
/obj/item/folder/blue,
@@ -55217,6 +55180,21 @@
},
/turf/open/floor/iron/dark,
/area/bridge)
+"tep" = (
+/obj/structure/cable/yellow{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/manifold/general/hidden{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
+/turf/open/floor/plating,
+/area/maintenance/starboard)
"teF" = (
/obj/machinery/door/airlock/maintenance{
name = "Fitness Maintenance";
@@ -57023,16 +57001,6 @@
"tNE" = (
/turf/open/floor/holofloor/plating,
/area/holodeck/prison)
-"tOH" = (
-/obj/structure/window/reinforced/spawner{
- dir = 1
- },
-/obj/machinery/telecomms/server/presets/exploration,
-/obj/machinery/camera/autoname{
- dir = 5
- },
-/turf/open/floor/circuit/telecomms/server,
-/area/quartermaster/exploration_dock)
"tOU" = (
/obj/structure/table/reinforced,
/obj/machinery/door/window/westleft{
@@ -57867,21 +57835,6 @@
/obj/item/book/manual/wiki/security_space_law,
/turf/open/floor/iron,
/area/security/checkpoint/engineering)
-"uir" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/obj/effect/turf_decal/stripes/corner{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
- dir = 5
- },
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
- dir = 1
- },
-/turf/open/floor/iron/dark/telecomms,
-/area/quartermaster/exploration_dock)
"uis" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -58590,6 +58543,21 @@
},
/turf/open/floor/iron/showroomfloor,
/area/crew_quarters/heads/captain)
+"uAc" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/effect/turf_decal/stripes/corner{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
+ dir = 5
+ },
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+ dir = 1
+ },
+/turf/open/floor/iron/dark/telecomms,
+/area/quartermaster/exploration_dock)
"uAj" = (
/obj/structure/chair/fancy/sofa/old/left{
color = "#742925";
@@ -58667,6 +58635,20 @@
/obj/effect/turf_decal/bot,
/turf/open/floor/iron/dark,
/area/science/nanite)
+"uCW" = (
+/obj/effect/turf_decal/siding/wideplating_new/dark{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/wideplating_new/dark{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral/half/contrasted{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/turf/open/floor/iron/dark/telecomms,
+/area/tcommsat/server)
"uDa" = (
/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
dir = 1
@@ -60410,6 +60392,16 @@
},
/turf/open/floor/iron/dark,
/area/engine/gravity_generator)
+"vAE" = (
+/obj/machinery/power/solar{
+ id = "portsolar";
+ name = "Port Solar Array"
+ },
+/obj/structure/cable{
+ icon_state = "0-4"
+ },
+/turf/open/floor/iron/solarpanel/airless,
+/area/solar/port/aft)
"vBe" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 1
@@ -62373,22 +62365,6 @@
},
/turf/open/floor/iron,
/area/quartermaster/miningdock)
-"wtb" = (
-/obj/effect/turf_decal/siding/wideplating_new/dark{
- dir = 4
- },
-/obj/effect/turf_decal/siding/wideplating_new/dark/corner{
- dir = 1
- },
-/obj/effect/turf_decal/tile/neutral/half/contrasted{
- dir = 8
- },
-/obj/machinery/light,
-/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
- dir = 9
- },
-/turf/open/floor/iron/dark/telecomms,
-/area/tcommsat/server)
"wts" = (
/obj/structure/table,
/obj/item/stack/sheet/glass/fifty{
@@ -62966,6 +62942,13 @@
},
/turf/open/floor/iron/dark,
/area/ai_monitored/turret_protected/aisat_interior)
+"wIW" = (
+/obj/machinery/power/tracker,
+/obj/structure/cable{
+ icon_state = "0-2"
+ },
+/turf/open/floor/iron/solarpanel/airless,
+/area/solar/starboard/fore)
"wIY" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 4
@@ -63317,15 +63300,6 @@
/obj/structure/transit_tube/station/reverse,
/turf/open/floor/plating,
/area/ai_monitored/turret_protected/aisat_interior)
-"wQN" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 8
- },
-/turf/open/floor/goonplaque,
-/area/hallway/secondary/entry)
"wRj" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 9
@@ -63556,6 +63530,14 @@
},
/turf/open/floor/plating,
/area/ai_monitored/turret_protected/aisat/service)
+"wWA" = (
+/obj/machinery/power/solar{
+ id = "auxsolareast";
+ name = "Port Auxiliary Solar Array"
+ },
+/obj/structure/cable,
+/turf/open/floor/iron/solarpanel/airless,
+/area/solar/starboard/fore)
"wWU" = (
/obj/structure/disposalpipe/segment,
/obj/effect/turf_decal/tile/yellow{
@@ -63803,29 +63785,6 @@
},
/turf/open/floor/iron,
/area/maintenance/disposal/incinerator)
-"xbI" = (
-/obj/effect/turf_decal/siding/wideplating_new/dark{
- dir = 8
- },
-/obj/effect/turf_decal/siding/wideplating_new/dark/corner{
- dir = 4
- },
-/obj/effect/turf_decal/siding/wideplating_new/dark/corner,
-/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
-/obj/structure/cable/yellow{
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/heat_exchanging/manifold{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 5
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 6
- },
-/turf/open/floor/iron/dark/telecomms,
-/area/tcommsat/server)
"xbP" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -64618,6 +64577,14 @@
},
/turf/open/floor/plating,
/area/maintenance/starboard/fore)
+"xtu" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/white,
+/obj/structure/closet/emcloset,
+/turf/open/floor/iron,
+/area/tcommsat/computer)
"xtS" = (
/obj/machinery/door/airlock/public/glass{
name = "Central Access"
@@ -64917,19 +64884,6 @@
},
/turf/open/floor/iron,
/area/quartermaster/qm)
-"xyS" = (
-/obj/effect/turf_decal/siding/wideplating_new/dark{
- dir = 4
- },
-/obj/effect/turf_decal/siding/wideplating_new/dark{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/heat_exchanging/simple,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
- dir = 1
- },
-/turf/open/floor/iron/dark/telecomms,
-/area/tcommsat/server)
"xyW" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 9
@@ -65932,6 +65886,25 @@
},
/turf/open/floor/plating,
/area/maintenance/starboard)
+"xXx" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/effect/turf_decal/stripes/corner,
+/obj/structure/cable/yellow{
+ icon_state = "2-8"
+ },
+/obj/machinery/atmospherics/pipe/heat_exchanging/manifold{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 10
+ },
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+ dir = 8
+ },
+/turf/open/floor/iron/dark/telecomms,
+/area/quartermaster/exploration_dock)
"xXF" = (
/obj/effect/turf_decal/stripes/corner{
dir = 8
@@ -66385,6 +66358,18 @@
/obj/machinery/door/firedoor,
/turf/open/floor/iron,
/area/storage/primary)
+"yic" = (
+/obj/machinery/power/solar{
+ id = "starboardsolar";
+ name = "Starboard Solar Array"
+ },
+/obj/structure/cable/yellow{
+ cable_color = "red";
+ color = "#ff0000";
+ icon_state = "0-2"
+ },
+/turf/open/floor/iron/solarpanel/airless,
+/area/solar/starboard/aft)
"yiw" = (
/obj/structure/reflector/box/anchored{
dir = 1
@@ -66415,6 +66400,21 @@
},
/turf/open/floor/plating,
/area/maintenance/aft)
+"yjs" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/effect/turf_decal/stripes/corner{
+ dir = 4
+ },
+/obj/effect/turf_decal/stripes/corner,
+/obj/structure/cable/yellow{
+ icon_state = "1-4"
+ },
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/turf/open/floor/iron/dark/telecomms,
+/area/quartermaster/exploration_dock)
"yjY" = (
/obj/machinery/light/small,
/turf/open/floor/engine/air,
@@ -80755,7 +80755,7 @@ aaa
aaa
aaS
aaf
-chJ
+fSt
aaf
aaS
aaa
@@ -81169,17 +81169,17 @@ aaa
aaa
abY
aaa
-acV
+soh
adv
-adZ
+qkT
aaa
-acV
+soh
adv
-adZ
+qkT
aaa
-acV
+soh
adv
-adZ
+qkT
aaa
aaS
aaf
@@ -81426,17 +81426,17 @@ aaa
aaa
abY
aaf
-acV
+soh
adu
-adZ
+qkT
aaa
-acV
+soh
adu
-adZ
+qkT
aaa
-acV
+soh
adu
-adZ
+qkT
aaf
aaf
aaa
@@ -81520,19 +81520,19 @@ aaa
aaa
aaS
aaf
-cca
-cca
-cca
-cca
-cca
+vAE
+vAE
+vAE
+vAE
+vAE
aaa
chK
aaa
-cca
-cca
-cca
-cca
-cca
+vAE
+vAE
+vAE
+vAE
+vAE
aaf
aaS
aaa
@@ -81683,17 +81683,17 @@ aaa
aaa
abY
aaa
-acV
+soh
adu
-adZ
+qkT
aaf
-acV
+soh
adu
-adZ
+qkT
aaf
-acV
+soh
adu
-adZ
+qkT
aaa
aaf
aaa
@@ -81723,7 +81723,7 @@ azF
aIR
ayl
ayl
-wQN
+rHF
ayl
ayl
ayl
@@ -81940,17 +81940,17 @@ aaa
aaa
aaf
aaf
-acV
+soh
adu
-adZ
+qkT
aaa
-acV
+soh
adu
-adZ
+qkT
aaa
-acV
+soh
adu
-adZ
+qkT
aaf
aaf
aaf
@@ -82034,19 +82034,19 @@ aaa
aaf
aaS
aaf
-ccb
-ccb
-ccb
-ccb
-ccb
+meM
+meM
+meM
+meM
+meM
aaa
chL
aaa
-ccb
-ccb
-ccb
-ccb
-ccb
+meM
+meM
+meM
+meM
+meM
aaf
aaS
aaa
@@ -82197,17 +82197,17 @@ aaS
aaS
aaf
aaa
-acV
+soh
adu
-adZ
+qkT
aaa
-acV
+soh
adu
-adZ
+qkT
aaa
-acV
+soh
adu
-adZ
+qkT
aaa
aaf
aaa
@@ -82548,19 +82548,19 @@ aaa
aaf
aaS
aaf
-cca
-cca
-cca
-cca
-cca
+vAE
+vAE
+vAE
+vAE
+vAE
aaa
chL
aaa
-cca
-cca
-cca
-cca
-cca
+vAE
+vAE
+vAE
+vAE
+vAE
aaf
aaS
aaa
@@ -82708,7 +82708,7 @@ aaa
aaa
aaS
aaf
-abs
+nAO
abZ
abZ
acW
@@ -83062,19 +83062,19 @@ aaa
aaf
aaS
acy
-ccb
-ccb
-ccb
-ccb
-ccb
+meM
+meM
+meM
+meM
+meM
aaa
chL
aaa
-ccb
-ccb
-ccb
-ccb
-ccb
+meM
+meM
+meM
+meM
+meM
aaf
aaS
aaa
@@ -83225,17 +83225,17 @@ aba
aaS
aaf
aaa
-acV
+soh
adz
-adZ
+qkT
aaa
-acV
+soh
adz
-adZ
+qkT
aaa
-acV
+soh
adz
-adZ
+qkT
aaa
aaf
aaa
@@ -83482,17 +83482,17 @@ aaa
aaa
aaf
aaf
-acV
+soh
adz
-adZ
+qkT
aaa
-acV
+soh
adz
-adZ
+qkT
aaa
-acV
+soh
adz
-adZ
+qkT
aaf
aaf
aaa
@@ -83576,19 +83576,19 @@ aaa
aaf
aaS
aaf
-cca
-cca
-cca
-cca
-cca
+vAE
+vAE
+vAE
+vAE
+vAE
aaa
chL
aaa
-cca
-cca
-cca
-cca
-cca
+vAE
+vAE
+vAE
+vAE
+vAE
aaf
aaS
aaa
@@ -83739,17 +83739,17 @@ aaa
aaa
aaS
aaa
-acV
+soh
adz
-adZ
+qkT
aaf
-acV
+soh
adz
-adZ
+qkT
aaf
-acV
+soh
adz
-adZ
+qkT
aaa
aaf
aaf
@@ -83996,17 +83996,17 @@ aaa
aaa
aaS
aaf
-acV
+soh
adz
-adZ
+qkT
aaa
-acV
+soh
adz
-adZ
+qkT
aaa
-acV
+soh
adz
-adZ
+qkT
aaf
aaf
aaa
@@ -84090,19 +84090,19 @@ aoV
aaa
aaS
aaf
-ccb
-ccb
-ccb
-ccb
-ccb
+meM
+meM
+meM
+meM
+meM
aaa
chL
aaa
-ccb
-ccb
-ccb
-ccb
-ccb
+meM
+meM
+meM
+meM
+meM
aaf
aaS
aaa
@@ -84253,17 +84253,17 @@ aaa
aaa
aaS
aaa
-acV
+soh
adA
-adZ
+qkT
aaa
-acV
+soh
adA
-adZ
+qkT
aaa
-acV
+soh
adA
-adZ
+qkT
aaa
aaS
aaa
@@ -91537,15 +91537,15 @@ bCq
klY
lRI
bVI
-stB
-mLe
-dxP
-kzA
-oil
-rYN
-ezo
-xyS
-rgm
+bWC
+bXz
+bYA
+sAj
+qBN
+hSo
+ccf
+cdc
+cdZ
bVI
caz
gui
@@ -91794,15 +91794,15 @@ bCq
bHE
lRI
bVI
-hiV
+bWF
rSr
bXC
bZp
tGF
-hzY
+kmA
pAC
cmj
-juo
+cec
bVI
cay
ccw
@@ -92051,15 +92051,15 @@ bCq
bCq
lRI
bVI
-lrC
+bWE
bXB
bYC
bZp
oVe
-hzY
+kmA
cch
cde
-ikc
+ceb
bVI
cay
ccw
@@ -92308,15 +92308,15 @@ bCq
bLu
jfW
bVI
-icP
-dHL
-lzh
-qDA
-xbI
-pqo
-rBK
-qIM
-wtb
+bWG
+fZG
+uCW
+cSE
+bZo
+qxY
+bYz
+cdf
+ced
bVI
cay
ccw
@@ -92569,7 +92569,7 @@ kcG
hQg
fBP
bZq
-ewa
+oSI
cbm
mlV
rTt
@@ -92826,7 +92826,7 @@ bWI
bXF
bXF
bZs
-mGR
+oVd
cbo
bXF
bXF
@@ -93083,7 +93083,7 @@ woM
led
dfd
bZr
-eOD
+pyy
cbn
wuV
myM
@@ -93336,11 +93336,11 @@ fkt
ayG
jfW
bVJ
-eVP
+bOo
bOD
odj
bZv
-nPv
+jYJ
bJC
wMu
jhG
@@ -93597,8 +93597,8 @@ bOl
jJK
iHS
vPI
-rrj
-kPn
+rCa
+dlA
lXQ
fTO
ceg
@@ -93854,9 +93854,9 @@ bVJ
cPO
ndh
bZv
-aBO
-qdh
-hom
+bSt
+bUc
+xtu
eYp
cei
bVJ
@@ -95306,7 +95306,7 @@ fha
ipF
tEy
rvt
-rUb
+dkr
uav
vom
vbv
@@ -106098,17 +106098,17 @@ aaa
aaa
aaS
aaa
-ads
+dAd
adS
-aeG
+dAJ
aaa
-ads
+dAd
adS
-fCK
+wWA
aaa
-ads
+dAd
adS
-fCK
+wWA
aaa
aaS
aaf
@@ -106355,17 +106355,17 @@ aaa
aaa
aaS
aaf
-ads
+dAd
adT
-aeG
+dAJ
aaa
-ads
+dAd
adT
-fCK
+wWA
aaa
-ads
+dAd
adT
-fCK
+wWA
aaf
aaf
aaa
@@ -106612,17 +106612,17 @@ aaa
aaa
aaS
aaa
-ads
+dAd
adT
-aeG
+dAJ
aaf
-ads
+dAd
adT
-fCK
+wWA
aaf
-ads
+dAd
adT
-fCK
+wWA
aaa
aaf
aaa
@@ -106869,17 +106869,17 @@ aaa
aaa
aaf
aaf
-ads
+dAd
adT
-aeG
+dAJ
aaa
-ads
+dAd
adT
-fCK
+wWA
aaa
-ads
+dAd
adT
-fCK
+wWA
aaf
aaf
aaf
@@ -107126,17 +107126,17 @@ aaS
aaS
aaf
aaa
-ads
+dAd
adT
-aeG
+dAJ
aaa
-ads
+dAd
adT
-fCK
+wWA
aaa
-ads
+dAd
adT
-fCK
+wWA
aaa
aaf
aaa
@@ -107637,7 +107637,7 @@ aaa
aaa
aaS
aaf
-abX
+wIW
acx
acx
adt
@@ -108154,17 +108154,17 @@ aba
aaS
acy
aaa
-ads
+dAd
adW
-aeG
+dAJ
aaa
-ads
+dAd
adW
-fCK
+wWA
aaa
-ads
+dAd
adW
-fCK
+wWA
aaa
aaf
aaa
@@ -108411,17 +108411,17 @@ aaa
aaa
aaf
aaf
-ads
+dAd
adW
-aeG
+dAJ
aaa
-ads
+dAd
adW
-fCK
+wWA
aaa
-ads
+dAd
adW
-fCK
+wWA
aaf
aaf
aaf
@@ -108668,17 +108668,17 @@ aaa
aaa
aaS
aaa
-ads
+dAd
adW
-aeG
+dAJ
aaf
-ads
+dAd
adW
-fCK
+wWA
aaf
-ads
+dAd
adW
-fCK
+wWA
aaa
aaf
aaa
@@ -108925,17 +108925,17 @@ aaa
aaa
aaS
aaf
-ads
+dAd
adW
-aeG
+dAJ
aaa
-ads
+dAd
adW
-fCK
+wWA
aaa
-ads
+dAd
adW
-fCK
+wWA
aaf
aaf
aaa
@@ -109182,17 +109182,17 @@ aaa
aaa
aaS
aaa
-ads
+dAd
adY
-aeG
+dAJ
aaa
-ads
+dAd
adY
-fCK
+wWA
aaa
-ads
+dAd
adY
-fCK
+wWA
aaa
aaS
aaf
@@ -114948,17 +114948,17 @@ aaa
aaa
aaS
aaa
-cMQ
+yic
crB
-cNa
+gAZ
aaa
-cMQ
+yic
crB
-cNa
+gAZ
aaa
-cMQ
+yic
crB
-cNa
+gAZ
aaa
aaS
aaa
@@ -115205,17 +115205,17 @@ aaa
aaa
aba
aaf
-cMQ
+yic
crC
-cNa
+gAZ
aaa
-cMQ
+yic
crC
-cNa
+gAZ
aaa
-cMQ
+yic
crC
-cNa
+gAZ
aaf
aaS
aaa
@@ -115462,17 +115462,17 @@ aaa
aaa
aaf
aaa
-cMQ
+yic
crC
-cNa
+gAZ
aaf
-cMQ
+yic
crC
-cNa
+gAZ
aaf
-cMQ
+yic
crC
-cNa
+gAZ
aaa
aaS
aaa
@@ -115719,17 +115719,17 @@ aaf
aaf
aaf
aaf
-cMQ
+yic
crC
-cNa
+gAZ
aaa
-cMQ
+yic
crC
-cNa
+gAZ
aaa
-cMQ
+yic
crC
-cNa
+gAZ
aaf
aaf
aaa
@@ -115976,17 +115976,17 @@ aaa
aaa
aaf
aaa
-cMQ
+yic
crC
-cNa
+gAZ
aaa
-cMQ
+yic
crC
-cNa
+gAZ
aaa
-cMQ
+yic
crC
-cNa
+gAZ
aaa
aaf
aaS
@@ -116503,7 +116503,7 @@ crk
crk
cpi
cpi
-ctB
+oBV
aaf
aaS
aaa
@@ -117004,17 +117004,17 @@ aaa
aaa
aaf
aaa
-cMQ
+yic
crE
-cNa
+gAZ
aaa
-cMQ
+yic
crE
-cNa
+gAZ
aaa
-cMQ
+yic
crE
-cNa
+gAZ
aaa
aaf
aaS
@@ -117261,17 +117261,17 @@ aaf
aaf
aaf
aaf
-cMQ
+yic
crE
-cNa
+gAZ
aaa
-cMQ
+yic
crE
-cNa
+gAZ
aaa
-cMQ
+yic
crE
-cNa
+gAZ
aaf
aaf
aaa
@@ -117467,7 +117467,7 @@ aaf
aaf
bky
eIi
-smY
+qZW
cJR
hJR
jvu
@@ -117518,17 +117518,17 @@ aaa
aaa
aaf
aaa
-cMQ
+yic
crE
-cNa
+gAZ
aaf
-cMQ
+yic
crE
-cNa
+gAZ
aaf
-cMQ
+yic
crE
-cNa
+gAZ
aaa
aaS
aaa
@@ -117724,8 +117724,8 @@ aaa
aaa
bky
gpn
-ioJ
-eGz
+tep
+kCj
bky
dnB
kEM
@@ -117775,17 +117775,17 @@ aaf
aaf
aaf
aaf
-cMQ
+yic
crE
-cNa
+gAZ
aaa
-cMQ
+yic
crE
-cNa
+gAZ
aaa
-cMQ
+yic
crE
-cNa
+gAZ
aaf
aaS
aaa
@@ -117981,7 +117981,7 @@ aaa
aaa
bky
bky
-syr
+mnE
gQd
gQd
gQd
@@ -118032,17 +118032,17 @@ aaa
aaa
aba
aaa
-cMQ
+yic
crG
-cNa
+gAZ
aaa
-cMQ
+yic
crG
-cNa
+gAZ
aaa
-cMQ
+yic
crG
-cNa
+gAZ
aaa
aaS
aaa
@@ -118238,8 +118238,8 @@ aaa
aaa
aaa
xkR
-rPs
-tOH
+sDn
+equ
dLB
gQd
xcE
@@ -118495,9 +118495,9 @@ aaa
aaa
aaa
xkR
-gNt
-jQU
-uir
+xXx
+yjs
+uAc
xkR
duR
jjp
@@ -118752,9 +118752,9 @@ aaa
aaa
aaa
xkR
-ffa
+szx
miD
-cXi
+sWW
xkR
pqr
pqr
@@ -119009,9 +119009,9 @@ aaa
aaa
aaa
xkR
-pBw
-iMF
-apb
+rKw
+eQc
+eOJ
gQd
wOv
pqr
diff --git a/_maps/map_files/CorgStation/CorgStation.dmm b/_maps/map_files/CorgStation/CorgStation.dmm
index 6fe89f9910421..7029437a4a873 100644
--- a/_maps/map_files/CorgStation/CorgStation.dmm
+++ b/_maps/map_files/CorgStation/CorgStation.dmm
@@ -3981,13 +3981,6 @@
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/security/main)
-"aWj" = (
-/obj/machinery/power/solar,
-/obj/structure/cable/white{
- icon_state = "0-8"
- },
-/turf/open/floor/iron/airless/solarpanel,
-/area/solar/port/aft)
"aWm" = (
/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
dir = 8
@@ -10034,13 +10027,6 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/turf/open/floor/wood,
/area/crew_quarters/bar)
-"daS" = (
-/obj/machinery/power/solar,
-/obj/structure/cable/white{
- icon_state = "0-4"
- },
-/turf/open/floor/iron/airless/solarpanel,
-/area/solar/port/aft)
"daX" = (
/obj/effect/turf_decal/stripes/line,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
@@ -11290,13 +11276,6 @@
},
/turf/open/floor/iron,
/area/hallway/secondary/exit)
-"dun" = (
-/obj/structure/cable/white{
- icon_state = "0-2"
- },
-/obj/machinery/power/solar,
-/turf/open/floor/iron/airless/solarpanel,
-/area/solar/port/fore)
"duF" = (
/turf/closed/wall/r_wall,
/area/security/brig)
@@ -11892,13 +11871,6 @@
/obj/effect/turf_decal/tile/green/half/contrasted,
/turf/open/floor/iron/white,
/area/medical/virology)
-"dGg" = (
-/obj/structure/cable/white{
- icon_state = "0-2"
- },
-/obj/machinery/power/solar,
-/turf/open/floor/iron/airless/solarpanel,
-/area/solar/starboard/aft)
"dGx" = (
/obj/structure/cable/yellow{
icon_state = "1-2"
@@ -16552,15 +16524,6 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/plating,
/area/maintenance/department/science)
-"fjD" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/item/toy/plush/lizard_plushie{
- name = "Eats-The-Rubbish"
- },
-/turf/open/floor/plating,
-/area/maintenance/disposal)
"fjJ" = (
/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
@@ -16856,6 +16819,11 @@
},
/turf/open/floor/iron,
/area/engine/engineering)
+"fon" = (
+/obj/machinery/power/tracker,
+/obj/structure/cable/white,
+/turf/open/floor/iron/solarpanel/airless,
+/area/solar/starboard/aft)
"fow" = (
/obj/structure/sign/poster/random{
pixel_x = 32
@@ -20717,6 +20685,13 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/space/basic,
/area/space/nearstation)
+"gCk" = (
+/obj/machinery/power/tracker,
+/obj/structure/cable/white{
+ icon_state = "0-2"
+ },
+/turf/open/floor/iron/solarpanel/airless,
+/area/solar/port/fore)
"gCn" = (
/obj/effect/turf_decal/tile/red/half/contrasted{
dir = 1
@@ -33896,10 +33871,6 @@
/obj/effect/landmark/carpspawn,
/turf/open/space/basic,
/area/space/nearstation)
-"kQr" = (
-/obj/effect/decal/cleanable/cobweb/cobweb2,
-/turf/open/floor/plating,
-/area/maintenance/fore)
"kQW" = (
/obj/effect/turf_decal/tile/red/fourcorners/contrasted,
/obj/effect/turf_decal/tile/black/opposingcorners,
@@ -39110,6 +39081,13 @@
},
/turf/open/floor/carpet/green,
/area/crew_quarters/bar)
+"mvP" = (
+/obj/structure/cable/white{
+ icon_state = "0-2"
+ },
+/obj/machinery/power/solar,
+/turf/open/floor/iron/solarpanel/airless,
+/area/solar/starboard/aft)
"mvT" = (
/obj/machinery/atmospherics/pipe/simple/general/visible,
/obj/machinery/light_switch{
@@ -43322,13 +43300,6 @@
},
/turf/open/floor/iron/white,
/area/quartermaster/exploration_prep)
-"nMP" = (
-/obj/machinery/power/tracker,
-/obj/structure/cable/white{
- icon_state = "0-4"
- },
-/turf/open/floor/iron/airless/solarpanel,
-/area/solar/port/aft)
"nNi" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 4
@@ -46185,11 +46156,6 @@
/obj/machinery/telecomms/server/presets/service,
/turf/open/floor/circuit/telecomms/server,
/area/tcommsat/server)
-"oIq" = (
-/obj/structure/cable/white,
-/obj/machinery/power/solar,
-/turf/open/floor/iron/airless/solarpanel,
-/area/solar/port/fore)
"oID" = (
/turf/open/floor/iron,
/area/medical/morgue)
@@ -48553,6 +48519,11 @@
/obj/machinery/door/firedoor,
/turf/open/floor/carpet/royalblue,
/area/crew_quarters/theatre)
+"pAJ" = (
+/obj/structure/cable/white,
+/obj/machinery/power/solar,
+/turf/open/floor/iron/solarpanel/airless,
+/area/solar/port/fore)
"pAN" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -49793,6 +49764,11 @@
/obj/effect/turf_decal/tile/neutral/half/contrasted,
/turf/open/floor/iron,
/area/hallway/primary/central)
+"pWu" = (
+/obj/structure/cable/white,
+/obj/machinery/power/solar,
+/turf/open/floor/iron/solarpanel/airless,
+/area/solar/starboard/aft)
"pWC" = (
/obj/structure/bed/roller,
/obj/machinery/iv_drip,
@@ -50402,11 +50378,6 @@
},
/turf/open/floor/iron,
/area/crew_quarters/fitness/recreation)
-"qhU" = (
-/obj/structure/cable/white,
-/obj/machinery/power/solar,
-/turf/open/floor/iron/airless/solarpanel,
-/area/solar/starboard/aft)
"qhV" = (
/obj/machinery/conveyor{
dir = 1;
@@ -51937,6 +51908,13 @@
/obj/machinery/door/firedoor,
/turf/open/floor/iron,
/area/ai_monitored/turret_protected/ai)
+"qGx" = (
+/obj/machinery/power/tracker,
+/obj/structure/cable/white{
+ icon_state = "0-4"
+ },
+/turf/open/floor/iron/solarpanel/airless,
+/area/solar/port/aft)
"qGC" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 4
@@ -59915,6 +59893,15 @@
},
/turf/open/floor/iron/dark,
/area/chapel/main/monastery)
+"tmv" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/item/toy/plush/lizard_plushie{
+ name = "Eats-The-Rubbish"
+ },
+/turf/open/floor/plating,
+/area/maintenance/disposal)
"tmC" = (
/obj/machinery/atmospherics/components/unary/passive_vent,
/turf/open/floor/plating,
@@ -59972,6 +59959,13 @@
},
/turf/open/floor/iron/dark,
/area/security/brig)
+"tnO" = (
+/obj/structure/cable/white{
+ icon_state = "0-2"
+ },
+/obj/machinery/power/solar,
+/turf/open/floor/iron/solarpanel/airless,
+/area/solar/port/fore)
"tod" = (
/obj/structure/disposalpipe/segment,
/turf/open/floor/iron,
@@ -60007,6 +60001,13 @@
/obj/machinery/suit_storage_unit/rd,
/turf/open/floor/iron,
/area/science/misc_lab/range)
+"tos" = (
+/obj/machinery/power/solar,
+/obj/structure/cable/white{
+ icon_state = "0-8"
+ },
+/turf/open/floor/iron/solarpanel/airless,
+/area/solar/port/aft)
"tov" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/obj/machinery/firealarm{
@@ -60602,6 +60603,10 @@
},
/turf/open/floor/iron,
/area/hallway/secondary/exit/departure_lounge)
+"tzO" = (
+/obj/effect/decal/cleanable/cobweb/cobweb2,
+/turf/open/floor/plating,
+/area/maintenance/fore)
"tzW" = (
/obj/structure/table/reinforced,
/obj/item/book/manual/wiki/cooking_to_serve_man,
@@ -66190,11 +66195,6 @@
},
/turf/open/floor/wood,
/area/crew_quarters/bar)
-"voK" = (
-/obj/machinery/power/tracker,
-/obj/structure/cable/white,
-/turf/open/floor/iron/airless/solarpanel,
-/area/solar/starboard/aft)
"voP" = (
/obj/machinery/door/airlock/maintenance_hatch{
name = "Warehouse Maintenance";
@@ -69589,13 +69589,6 @@
},
/turf/open/floor/iron,
/area/quartermaster/storage)
-"wqZ" = (
-/obj/machinery/power/tracker,
-/obj/structure/cable/white{
- icon_state = "0-2"
- },
-/turf/open/floor/iron/airless/solarpanel,
-/area/solar/port/fore)
"wre" = (
/obj/effect/turf_decal/tile/purple/half/contrasted,
/turf/open/floor/iron,
@@ -73408,6 +73401,13 @@
/obj/effect/turf_decal/tile/yellow/opposingcorners,
/turf/open/floor/iron,
/area/engine/atmos)
+"xEX" = (
+/obj/machinery/power/solar,
+/obj/structure/cable/white{
+ icon_state = "0-4"
+ },
+/turf/open/floor/iron/solarpanel/airless,
+/area/solar/port/aft)
"xFs" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/atmospherics/pipe/layer_manifold/visible,
@@ -89449,7 +89449,7 @@ aMT
anT
anT
anT
-nMP
+qGx
anT
anT
anT
@@ -89957,19 +89957,19 @@ aMT
iaD
aMT
aMT
-daS
-daS
-daS
-daS
-daS
+xEX
+xEX
+xEX
+xEX
+xEX
aMT
pcH
aMT
-daS
-daS
-daS
-daS
-daS
+xEX
+xEX
+xEX
+xEX
+xEX
aMT
aMT
aMT
@@ -90471,19 +90471,19 @@ aMT
iaD
aMT
aMT
-aWj
-aWj
-aWj
-aWj
-aWj
+tos
+tos
+tos
+tos
+tos
aMT
kwL
aMT
-aWj
-aWj
-aWj
-aWj
-aWj
+tos
+tos
+tos
+tos
+tos
anT
iaD
aMT
@@ -90985,19 +90985,19 @@ aMT
iaD
aMT
aMT
-daS
-daS
-daS
-daS
-daS
+xEX
+xEX
+xEX
+xEX
+xEX
aMT
kwL
aMT
-daS
-daS
-daS
-daS
-daS
+xEX
+xEX
+xEX
+xEX
+xEX
aMT
iaD
aMT
@@ -91499,19 +91499,19 @@ aMT
iaD
aMT
aMT
-aWj
-aWj
-aWj
-aWj
-aWj
+tos
+tos
+tos
+tos
+tos
aMT
kwL
aMT
-aWj
-aWj
-aWj
-aWj
-aWj
+tos
+tos
+tos
+tos
+tos
aMT
iaD
aMT
@@ -92013,19 +92013,19 @@ aMT
aMT
aMT
aMT
-daS
-daS
-daS
-daS
-daS
+xEX
+xEX
+xEX
+xEX
+xEX
aMT
kwL
aMT
-daS
-daS
-daS
-daS
-daS
+xEX
+xEX
+xEX
+xEX
+xEX
aMT
aMT
aMT
@@ -92527,19 +92527,19 @@ aMT
aMT
aMT
aMT
-aWj
-aWj
-aWj
-aWj
-aWj
+tos
+tos
+tos
+tos
+tos
aMT
kwL
aMT
-aWj
-aWj
-aWj
-aWj
-aWj
+tos
+tos
+tos
+tos
+tos
aMT
aMT
aMT
@@ -101408,17 +101408,17 @@ aMT
iaD
aMT
aMT
-dun
+tnO
kME
-oIq
+pAJ
aMT
-dun
+tnO
kME
-oIq
+pAJ
aMT
-dun
+tnO
kME
-oIq
+pAJ
aMT
anT
gzj
@@ -101665,17 +101665,17 @@ aMT
iaD
anT
anT
-dun
+tnO
dcJ
-oIq
+pAJ
aMT
-dun
+tnO
dcJ
-oIq
+pAJ
aMT
-dun
+tnO
dcJ
-oIq
+pAJ
aMT
anT
iut
@@ -101922,17 +101922,17 @@ aMT
iaD
aMT
aMT
-dun
+tnO
dcJ
-oIq
+pAJ
aMT
-dun
+tnO
dcJ
-oIq
+pAJ
aMT
-dun
+tnO
dcJ
-oIq
+pAJ
aMT
anT
anT
@@ -102179,17 +102179,17 @@ aMT
iaD
anT
anT
-dun
+tnO
dcJ
-oIq
+pAJ
aMT
-dun
+tnO
dcJ
-oIq
+pAJ
aMT
-dun
+tnO
dcJ
-oIq
+pAJ
aMT
aMT
aMT
@@ -102436,17 +102436,17 @@ iaD
iaD
aMT
aMT
-dun
+tnO
dcJ
-oIq
+pAJ
aMT
-dun
+tnO
dcJ
-oIq
+pAJ
aMT
-dun
+tnO
dcJ
-oIq
+pAJ
aMT
aMT
aMT
@@ -102948,7 +102948,7 @@ aMT
aMT
anT
anT
-wqZ
+gCk
cdk
gLD
bOE
@@ -103464,17 +103464,17 @@ aMT
iaD
anT
anT
-dun
+tnO
kEH
-oIq
+pAJ
aMT
-dun
+tnO
uDs
-oIq
+pAJ
aMT
-dun
+tnO
uDs
-oIq
+pAJ
aMT
aMT
aMT
@@ -103721,17 +103721,17 @@ aMT
aMT
aMT
aMT
-dun
+tnO
uDs
-oIq
+pAJ
aMT
-dun
+tnO
uDs
-oIq
+pAJ
aMT
-dun
+tnO
uDs
-oIq
+pAJ
aMT
aMT
aMT
@@ -103978,17 +103978,17 @@ aMT
aMT
aMT
aMT
-dun
+tnO
uDs
-oIq
+pAJ
aMT
-dun
+tnO
uDs
-oIq
+pAJ
aMT
-dun
+tnO
uDs
-oIq
+pAJ
aMT
aMT
aMT
@@ -104235,17 +104235,17 @@ aMT
aMT
aMT
aMT
-dun
+tnO
uDs
-oIq
+pAJ
aMT
-dun
+tnO
uDs
-oIq
+pAJ
aMT
-dun
+tnO
uDs
-oIq
+pAJ
aMT
aMT
aMT
@@ -104492,17 +104492,17 @@ aMT
aMT
aMT
anT
-dun
+tnO
hTD
-oIq
+pAJ
aMT
-dun
+tnO
vud
-oIq
+pAJ
aMT
-dun
+tnO
vud
-oIq
+pAJ
aMT
aMT
aMT
@@ -107877,7 +107877,7 @@ hoR
vlr
vlr
mma
-kQr
+tzO
scI
ejN
jsC
@@ -114394,17 +114394,17 @@ anT
anT
anT
anT
-dGg
+mvP
gIO
-qhU
+pWu
aMT
-dGg
+mvP
gIO
-qhU
+pWu
aMT
-dGg
+mvP
gIO
-qhU
+pWu
aMT
aMT
aMT
@@ -114651,17 +114651,17 @@ aMT
aMT
anT
aMT
-dGg
+mvP
vkA
-qhU
+pWu
aMT
-dGg
+mvP
vkA
-qhU
+pWu
aMT
-dGg
+mvP
vkA
-qhU
+pWu
aMT
aMT
aMT
@@ -114908,17 +114908,17 @@ aMT
aMT
anT
aMT
-dGg
+mvP
vkA
-qhU
+pWu
aMT
-dGg
+mvP
vkA
-qhU
+pWu
aMT
-dGg
+mvP
vkA
-qhU
+pWu
anT
anT
anT
@@ -115165,17 +115165,17 @@ aMT
aMT
anT
aMT
-dGg
+mvP
vkA
-qhU
+pWu
aMT
-dGg
+mvP
vkA
-qhU
+pWu
aMT
-dGg
+mvP
vkA
-qhU
+pWu
aMT
anT
aMT
@@ -115422,17 +115422,17 @@ anT
anT
anT
anT
-dGg
+mvP
vkA
-qhU
+pWu
aMT
-dGg
+mvP
vkA
-qhU
+pWu
aMT
-dGg
+mvP
vkA
-qhU
+pWu
aMT
anT
anT
@@ -115948,7 +115948,7 @@ bOc
bOc
ggY
wOe
-voK
+fon
aMT
aMT
aMT
@@ -116450,17 +116450,17 @@ aMT
anT
aMT
aMT
-dGg
+mvP
pHN
-qhU
+pWu
aMT
-dGg
+mvP
xqd
-qhU
+pWu
aMT
-dGg
+mvP
xqd
-qhU
+pWu
aMT
anT
anT
@@ -116707,17 +116707,17 @@ anT
anT
anT
anT
-dGg
+mvP
xqd
-qhU
+pWu
aMT
-dGg
+mvP
xqd
-qhU
+pWu
aMT
-dGg
+mvP
xqd
-qhU
+pWu
aMT
anT
aMT
@@ -116964,17 +116964,17 @@ aMT
anT
qiD
aMT
-dGg
+mvP
xqd
-qhU
+pWu
aMT
-dGg
+mvP
xqd
-qhU
+pWu
aMT
-dGg
+mvP
xqd
-qhU
+pWu
anT
anT
anT
@@ -117221,17 +117221,17 @@ anT
anT
anT
anT
-dGg
+mvP
xqd
-qhU
+pWu
aMT
-dGg
+mvP
xqd
-qhU
+pWu
aMT
-dGg
+mvP
xqd
-qhU
+pWu
aMT
aMT
aMT
@@ -117478,17 +117478,17 @@ aMT
anT
aMT
aMT
-dGg
+mvP
lSw
-qhU
+pWu
aMT
-dGg
+mvP
rkK
-qhU
+pWu
aMT
-dGg
+mvP
rkK
-qhU
+pWu
aMT
aMT
aMT
@@ -127194,7 +127194,7 @@ nqK
eJe
iAW
uRZ
-fjD
+tmv
rbw
ntM
hor
diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm
index d4bb02ac8736a..f40123c9fa229 100644
--- a/_maps/map_files/Deltastation/DeltaStation2.dmm
+++ b/_maps/map_files/Deltastation/DeltaStation2.dmm
@@ -15,13 +15,6 @@
/obj/structure/lattice,
/turf/open/space,
/area/space/nearstation)
-"aae" = (
-/obj/machinery/power/tracker,
-/obj/structure/cable{
- icon_state = "0-2"
- },
-/turf/open/floor/iron/airless/solarpanel,
-/area/solar/starboard/fore)
"aaf" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -29,16 +22,6 @@
/obj/structure/lattice/catwalk,
/turf/open/space,
/area/solar/starboard/fore)
-"aag" = (
-/obj/structure/cable{
- icon_state = "0-2"
- },
-/obj/machinery/power/solar{
- id = "forestarboard";
- name = "Fore-Starboard Solar Array"
- },
-/turf/open/floor/iron/airless/solarpanel,
-/area/solar/starboard/fore)
"aah" = (
/obj/structure/cable{
icon_state = "2-4"
@@ -99,14 +82,6 @@
/obj/structure/lattice/catwalk,
/turf/open/space,
/area/solar/starboard/fore)
-"aan" = (
-/obj/structure/cable,
-/obj/machinery/power/solar{
- id = "forestarboard";
- name = "Fore-Starboard Solar Array"
- },
-/turf/open/floor/iron/airless/solarpanel,
-/area/solar/starboard/fore)
"aao" = (
/obj/structure/lattice/catwalk,
/obj/structure/cable,
@@ -1753,13 +1728,6 @@
},
/turf/open/floor/iron,
/area/maintenance/port)
-"alS" = (
-/obj/machinery/power/tracker,
-/obj/structure/cable{
- icon_state = "0-2"
- },
-/turf/open/floor/iron/airless/solarpanel,
-/area/solar/port/fore)
"alT" = (
/turf/closed/wall/r_wall,
/area/engine/atmospherics_engine)
@@ -1946,6 +1914,16 @@
"anc" = (
/turf/open/floor/wood,
/area/vacant_room/office)
+"ane" = (
+/obj/structure/cable{
+ icon_state = "0-2"
+ },
+/obj/machinery/power/solar{
+ id = "forestarboard";
+ name = "Fore-Starboard Solar Array"
+ },
+/turf/open/floor/iron/solarpanel/airless,
+/area/solar/starboard/fore)
"anf" = (
/turf/open/floor/carpet,
/area/vacant_room/office)
@@ -2124,16 +2102,6 @@
"aoF" = (
/turf/closed/wall,
/area/maintenance/disposal)
-"aoG" = (
-/obj/structure/cable{
- icon_state = "0-2"
- },
-/obj/machinery/power/solar{
- id = "foreport";
- name = "Fore-Port Solar Array"
- },
-/turf/open/floor/iron/airless/solarpanel,
-/area/solar/port/fore)
"aoW" = (
/obj/machinery/light/small{
dir = 8
@@ -2412,34 +2380,6 @@
},
/turf/open/floor/plating,
/area/maintenance/disposal)
-"aqF" = (
-/obj/machinery/button/door{
- id = "Disposal Exit";
- name = "Disposal Vent Control";
- pixel_x = -25;
- pixel_y = 4;
- req_access_txt = "12"
- },
-/obj/machinery/button/massdriver{
- id = "trash";
- name = "Trash Ejector Control";
- pixel_x = -26;
- pixel_y = -6
- },
-/obj/structure/chair/stool,
-/obj/machinery/light/small{
- dir = 8
- },
-/obj/structure/disposalpipe/segment{
- dir = 6
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/delivery,
-/obj/item/toy/plush/lizard_plushie{
- name = "Eats-The-Rubbish"
- },
-/turf/open/floor/iron,
-/area/maintenance/disposal)
"aqG" = (
/obj/machinery/conveyor_switch/oneway{
dir = 8;
@@ -2473,14 +2413,6 @@
/obj/effect/turf_decal/bot,
/turf/open/floor/iron,
/area/maintenance/disposal)
-"aqJ" = (
-/obj/structure/cable,
-/obj/machinery/power/solar{
- id = "foreport";
- name = "Fore-Port Solar Array"
- },
-/turf/open/floor/iron/airless/solarpanel,
-/area/solar/port/fore)
"aqV" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
@@ -7566,13 +7498,6 @@
/obj/machinery/door/firedoor,
/turf/open/floor/iron,
/area/crew_quarters/bar/atrium)
-"aSd" = (
-/obj/structure/cable/yellow{
- icon_state = "1-2"
- },
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/goonplaque,
-/area/hallway/primary/fore)
"aSg" = (
/obj/structure/disposalpipe/segment{
dir = 5
@@ -16267,6 +16192,13 @@
/obj/item/storage/box/silver_ids,
/turf/open/floor/wood,
/area/crew_quarters/heads/hop)
+"bWW" = (
+/obj/machinery/power/tracker,
+/obj/structure/cable{
+ icon_state = "0-2"
+ },
+/turf/open/floor/iron/solarpanel/airless,
+/area/solar/starboard/fore)
"bWX" = (
/turf/open/floor/circuit/green/telecomms/mainframe,
/area/tcommsat/server)
@@ -30544,16 +30476,6 @@
"dFe" = (
/turf/closed/wall,
/area/crew_quarters/heads/cmo)
-"dFy" = (
-/obj/structure/cable{
- icon_state = "0-2"
- },
-/obj/machinery/power/solar{
- id = "aftstarboard";
- name = "Aft-Starboard Solar Array"
- },
-/turf/open/floor/iron/airless/solarpanel,
-/area/solar/starboard/aft)
"dFz" = (
/obj/structure/chair/office{
dir = 8
@@ -31063,14 +30985,6 @@
},
/turf/open/floor/iron,
/area/maintenance/starboard/aft)
-"dIh" = (
-/obj/structure/cable,
-/obj/machinery/power/solar{
- id = "aftstarboard";
- name = "Aft-Starboard Solar Array"
- },
-/turf/open/floor/iron/airless/solarpanel,
-/area/solar/starboard/aft)
"dIi" = (
/obj/structure/window/reinforced,
/obj/item/target,
@@ -31114,6 +31028,14 @@
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
/turf/open/floor/iron/dark,
/area/aisat)
+"dIC" = (
+/obj/structure/cable,
+/obj/machinery/power/solar{
+ id = "forestarboard";
+ name = "Fore-Starboard Solar Array"
+ },
+/turf/open/floor/iron/solarpanel/airless,
+/area/solar/starboard/fore)
"dID" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/cable/yellow{
@@ -32541,11 +32463,6 @@
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/hallway/secondary/exit/departure_lounge)
-"dTk" = (
-/obj/structure/cable,
-/obj/machinery/power/tracker,
-/turf/open/floor/iron/airless/solarpanel,
-/area/solar/starboard/aft)
"dTm" = (
/obj/structure/table/reinforced,
/obj/effect/turf_decal/delivery,
@@ -33783,16 +33700,6 @@
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
/turf/open/floor/iron,
/area/crew_quarters/locker)
-"efe" = (
-/obj/structure/cable{
- icon_state = "0-2"
- },
-/obj/machinery/power/solar{
- id = "aftport";
- name = "Aft-Port Solar Array"
- },
-/turf/open/floor/iron/airless/solarpanel,
-/area/solar/port/aft)
"efg" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/door/poddoor/shutters/preopen{
@@ -33954,14 +33861,6 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/turf/open/floor/iron,
/area/engine/break_room)
-"egB" = (
-/obj/structure/cable,
-/obj/machinery/power/solar{
- id = "aftport";
- name = "Aft-Port Solar Array"
- },
-/turf/open/floor/iron/airless/solarpanel,
-/area/solar/port/aft)
"egD" = (
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 1
@@ -34076,11 +33975,6 @@
/obj/structure/lattice/catwalk,
/turf/open/space,
/area/solar/port/aft)
-"ehs" = (
-/obj/structure/cable,
-/obj/machinery/power/tracker,
-/turf/open/floor/iron/airless/solarpanel,
-/area/solar/port/aft)
"ehv" = (
/obj/effect/turf_decal/tile/yellow{
dir = 8
@@ -34248,6 +34142,34 @@
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
/turf/open/floor/iron,
/area/engine/atmos)
+"ejH" = (
+/obj/machinery/button/door{
+ id = "Disposal Exit";
+ name = "Disposal Vent Control";
+ pixel_x = -25;
+ pixel_y = 4;
+ req_access_txt = "12"
+ },
+/obj/machinery/button/massdriver{
+ id = "trash";
+ name = "Trash Ejector Control";
+ pixel_x = -26;
+ pixel_y = -6
+ },
+/obj/structure/chair/stool,
+/obj/machinery/light/small{
+ dir = 8
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 6
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/delivery,
+/obj/item/toy/plush/lizard_plushie{
+ name = "Eats-The-Rubbish"
+ },
+/turf/open/floor/iron,
+/area/maintenance/disposal)
"ejL" = (
/turf/closed/wall,
/area/medical/medbay/aft)
@@ -36947,6 +36869,14 @@
},
/turf/open/floor/iron,
/area/quartermaster/storage)
+"feb" = (
+/obj/structure/cable,
+/obj/machinery/power/solar{
+ id = "aftport";
+ name = "Aft-Port Solar Array"
+ },
+/turf/open/floor/iron/solarpanel/airless,
+/area/solar/port/aft)
"fes" = (
/obj/effect/turf_decal/delivery,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
@@ -39340,6 +39270,11 @@
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
/turf/open/floor/iron/dark,
/area/security/detectives_office)
+"fQa" = (
+/obj/structure/cable,
+/obj/machinery/power/tracker,
+/turf/open/floor/iron/solarpanel/airless,
+/area/solar/port/aft)
"fQd" = (
/obj/structure/cable/yellow{
icon_state = "1-2"
@@ -40431,6 +40366,14 @@
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
/turf/open/floor/iron/dark,
/area/engine/atmospherics_engine)
+"gjL" = (
+/obj/structure/cable,
+/obj/machinery/power/solar{
+ id = "foreport";
+ name = "Fore-Port Solar Array"
+ },
+/turf/open/floor/iron/solarpanel/airless,
+/area/solar/port/fore)
"gkv" = (
/obj/machinery/computer/bank_machine,
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
@@ -64698,6 +64641,16 @@
},
/turf/open/floor/iron,
/area/hallway/secondary/command)
+"oqG" = (
+/obj/structure/cable{
+ icon_state = "0-2"
+ },
+/obj/machinery/power/solar{
+ id = "foreport";
+ name = "Fore-Port Solar Array"
+ },
+/turf/open/floor/iron/solarpanel/airless,
+/area/solar/port/fore)
"oqL" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
@@ -66283,6 +66236,13 @@
},
/turf/open/floor/wood,
/area/quartermaster/exploration_prep)
+"oRK" = (
+/obj/machinery/power/tracker,
+/obj/structure/cable{
+ icon_state = "0-2"
+ },
+/turf/open/floor/iron/solarpanel/airless,
+/area/solar/port/fore)
"oRX" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
@@ -66888,6 +66848,16 @@
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
/turf/open/floor/iron/dark,
/area/engine/gravity_generator)
+"pea" = (
+/obj/structure/cable{
+ icon_state = "0-2"
+ },
+/obj/machinery/power/solar{
+ id = "aftstarboard";
+ name = "Aft-Starboard Solar Array"
+ },
+/turf/open/floor/iron/solarpanel/airless,
+/area/solar/starboard/aft)
"per" = (
/obj/machinery/light{
light_color = "#7AC3FF"
@@ -71524,6 +71494,11 @@
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
/turf/open/floor/iron,
/area/hallway/primary/starboard)
+"qIL" = (
+/obj/structure/cable,
+/obj/machinery/power/tracker,
+/turf/open/floor/iron/solarpanel/airless,
+/area/solar/starboard/aft)
"qIZ" = (
/obj/structure/cable/yellow{
icon_state = "4-8"
@@ -75793,6 +75768,13 @@
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
/turf/open/floor/iron,
/area/engine/atmos)
+"sal" = (
+/obj/structure/cable/yellow{
+ icon_state = "1-2"
+ },
+/obj/structure/disposalpipe/segment,
+/turf/open/floor/iron/goonplaque,
+/area/hallway/primary/fore)
"saq" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/delivery,
@@ -76082,6 +76064,14 @@
},
/turf/open/floor/iron/white,
/area/medical/genetics)
+"sgr" = (
+/obj/structure/cable,
+/obj/machinery/power/solar{
+ id = "aftstarboard";
+ name = "Aft-Starboard Solar Array"
+ },
+/turf/open/floor/iron/solarpanel/airless,
+/area/solar/starboard/aft)
"sgR" = (
/obj/effect/landmark/start/shaft_miner,
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
@@ -80463,6 +80453,16 @@
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
/turf/open/floor/iron/dark,
/area/ai_monitored/turret_protected/aisat_interior)
+"tJw" = (
+/obj/structure/cable{
+ icon_state = "0-2"
+ },
+/obj/machinery/power/solar{
+ id = "aftport";
+ name = "Aft-Port Solar Array"
+ },
+/turf/open/floor/iron/solarpanel/airless,
+/area/solar/port/aft)
"tJK" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
@@ -111943,9 +111943,9 @@ aad
aaa
aad
aaa
-aoG
+oqG
apH
-aqJ
+gjL
aaa
aad
aaa
@@ -112196,17 +112196,17 @@ aaa
aaa
aac
aaa
-aoG
+oqG
apH
-aqJ
+gjL
aaa
-aoG
+oqG
apI
-aqJ
+gjL
aaa
-aoG
+oqG
apH
-aqJ
+gjL
aaa
aad
aaa
@@ -112453,17 +112453,17 @@ aaa
aaa
aad
aaa
-aoG
+oqG
apI
-aqJ
+gjL
aaa
-aoG
+oqG
apI
-aqJ
+gjL
aaa
-aoG
+oqG
apI
-aqJ
+gjL
aaa
aac
aaa
@@ -112710,17 +112710,17 @@ aaa
aaa
aac
aad
-aoG
+oqG
apI
-aqJ
+gjL
aad
-aoG
+oqG
apI
-aqJ
+gjL
aad
-aoG
+oqG
apI
-aqJ
+gjL
aad
aac
aaa
@@ -112967,17 +112967,17 @@ aaa
aaa
aac
aaa
-aoG
+oqG
apI
-aqJ
+gjL
aaa
-aoG
+oqG
apI
-aqJ
+gjL
aaa
-aoG
+oqG
apI
-aqJ
+gjL
aaa
aad
aaa
@@ -113224,17 +113224,17 @@ aad
aac
aac
aaa
-aoG
+oqG
apI
-aqJ
+gjL
aaa
aad
apJ
aad
aaa
-aoG
+oqG
apI
-aqJ
+gjL
aaa
aad
aaa
@@ -113735,7 +113735,7 @@ aaa
aaa
aac
aad
-alS
+oRK
amF
amF
amF
@@ -114252,17 +114252,17 @@ aac
aad
aad
aaa
-aoG
+oqG
apL
-aqJ
+gjL
aaa
aad
apK
aad
aaa
-aoG
+oqG
apL
-aqJ
+gjL
aaa
aad
aaa
@@ -114509,17 +114509,17 @@ aaa
aaa
aac
aaa
-aoG
+oqG
apL
-aqJ
+gjL
aaa
-aoG
+oqG
apL
-aqJ
+gjL
aaa
-aoG
+oqG
apL
-aqJ
+gjL
aaa
wiQ
aaa
@@ -114766,17 +114766,17 @@ aaa
aaa
aac
aad
-aoG
+oqG
apL
-aqJ
+gjL
aad
-aoG
+oqG
apL
-aqJ
+gjL
aad
-aoG
+oqG
apL
-aqJ
+gjL
aad
wiQ
aad
@@ -115023,17 +115023,17 @@ aaa
aaa
aac
aaa
-aoG
+oqG
apL
-aqJ
+gjL
aaa
-aoG
+oqG
apL
-aqJ
+gjL
aaa
-aoG
+oqG
apL
-aqJ
+gjL
aaa
wiQ
aaa
@@ -115280,17 +115280,17 @@ aaa
aaa
aad
aaa
-aoG
+oqG
apM
-aqJ
+gjL
aaa
-aoG
+oqG
apL
-aqJ
+gjL
aaa
-aoG
+oqG
apM
-aqJ
+gjL
aaa
aad
aaa
@@ -115541,9 +115541,9 @@ aad
aaa
aad
aaa
-aoG
+oqG
apM
-aqJ
+gjL
aaa
aad
aaa
@@ -118767,9 +118767,9 @@ aaa
aad
aaa
aaa
-efe
+tJw
efQ
-egB
+feb
aaa
aaa
aad
@@ -119020,17 +119020,17 @@ aaa
aaa
aac
aaa
-efe
+tJw
efQ
-egB
+feb
aaa
-efe
+tJw
efR
-egB
+feb
aaa
-efe
+tJw
efQ
-egB
+feb
aaa
aFo
aaa
@@ -119277,17 +119277,17 @@ aaa
aaa
aad
aaa
-efe
+tJw
efR
-egB
+feb
aaa
-efe
+tJw
efR
-egB
+feb
aaa
-efe
+tJw
efR
-egB
+feb
aaa
aac
aaa
@@ -119534,17 +119534,17 @@ aaa
aaa
aad
aad
-efe
+tJw
efR
-egB
+feb
aad
-efe
+tJw
efR
-egB
+feb
aad
-efe
+tJw
efR
-egB
+feb
aad
aac
aaa
@@ -119791,17 +119791,17 @@ aaa
aaa
aac
aaa
-efe
+tJw
efR
-egB
+feb
aaa
-efe
+tJw
efR
-egB
+feb
aaa
-efe
+tJw
efR
-egB
+feb
aaa
aad
aaa
@@ -120048,17 +120048,17 @@ wiQ
aaa
aac
aaa
-efe
+tJw
efR
-egB
+feb
aaa
aad
efS
aad
aaa
-efe
+tJw
efR
-egB
+feb
aaa
aad
aac
@@ -120575,7 +120575,7 @@ ehq
ehr
ehr
ehr
-ehs
+fQa
aad
aad
aaa
@@ -121076,17 +121076,17 @@ aaa
aaa
aac
aaa
-efe
+tJw
efU
-egB
+feb
aaa
aad
efT
aad
aaa
-efe
+tJw
efU
-egB
+feb
aaa
aFo
aac
@@ -121333,17 +121333,17 @@ aaa
aaa
aac
aaa
-efe
+tJw
efU
-egB
+feb
aaa
-efe
+tJw
efU
-egB
+feb
aaa
-efe
+tJw
efU
-egB
+feb
aaa
aad
aaa
@@ -121590,17 +121590,17 @@ aad
aaa
aac
aad
-efe
+tJw
efU
-egB
+feb
aad
-efe
+tJw
efU
-egB
+feb
aad
-efe
+tJw
efU
-egB
+feb
aad
aac
aaa
@@ -121847,17 +121847,17 @@ aad
aaa
aac
aaa
-efe
+tJw
efU
-egB
+feb
aaa
-efe
+tJw
efU
-egB
+feb
aaa
-efe
+tJw
efU
-egB
+feb
aaa
aac
aaa
@@ -122104,17 +122104,17 @@ aad
aad
aFo
aaa
-efe
+tJw
efV
-egB
+feb
aaa
-efe
+tJw
efU
-egB
+feb
aaa
-efe
+tJw
efV
-egB
+feb
aaa
aFo
aaa
@@ -122365,9 +122365,9 @@ aaa
aad
aaa
aaa
-efe
+tJw
efV
-egB
+feb
aaa
aaa
aad
@@ -133550,7 +133550,7 @@ kqm
kqm
kqm
nKt
-aSd
+sal
sJP
exK
jhO
@@ -139660,9 +139660,9 @@ aaa
aad
aaa
aaa
-aag
+ane
aah
-aan
+dIC
aaa
aaa
aad
@@ -139913,17 +139913,17 @@ aaa
aaa
aad
aaa
-aag
+ane
aah
-aan
+dIC
aaa
-aag
+ane
aai
-aan
+dIC
aaa
-aag
+ane
aah
-aan
+dIC
aaa
aad
acQ
@@ -140170,17 +140170,17 @@ aaa
aaa
aac
aaa
-aag
+ane
aai
-aan
+dIC
aaa
-aag
+ane
aai
-aan
+dIC
aaa
-aag
+ane
aai
-aan
+dIC
aaa
aad
acQ
@@ -140427,17 +140427,17 @@ aaa
aaa
aac
aad
-aag
+ane
aai
-aan
+dIC
aad
-aag
+ane
aai
-aan
+dIC
aad
-aag
+ane
aai
-aan
+dIC
aad
aad
acQ
@@ -140684,17 +140684,17 @@ aaa
aaa
aad
aaa
-aag
+ane
aai
-aan
+dIC
aaa
-aag
+ane
aai
-aan
+dIC
aaa
-aag
+ane
aai
-aan
+dIC
aaa
aad
aaj
@@ -140941,17 +140941,17 @@ aad
aac
aac
aad
-aag
+ane
aai
-aan
+dIC
aaa
aad
aaj
aad
aaa
-aag
+ane
aai
-aan
+dIC
aaa
aad
aaE
@@ -140981,7 +140981,7 @@ aad
aad
aoF
apE
-aqF
+ejH
arf
asf
atD
@@ -141452,7 +141452,7 @@ aaa
aaa
aad
aad
-aae
+bWW
aaf
aaf
aaf
@@ -141969,17 +141969,17 @@ aac
aac
aac
aad
-aag
+ane
aal
-aan
+dIC
aaa
aad
aak
aad
aaa
-aag
+ane
aal
-aan
+dIC
aad
aac
aad
@@ -142226,17 +142226,17 @@ aaa
aaa
aac
aaa
-aag
+ane
aal
-aan
+dIC
aaa
-aag
+ane
aal
-aan
+dIC
aaa
-aag
+ane
aal
-aan
+dIC
aaa
aac
aad
@@ -142483,17 +142483,17 @@ aaa
aaa
aad
aad
-aag
+ane
aal
-aan
+dIC
aad
-aag
+ane
aal
-aan
+dIC
aad
-aag
+ane
aal
-aan
+dIC
aad
aac
aaa
@@ -142740,17 +142740,17 @@ aaa
aaa
aac
aaa
-aag
+ane
aal
-aan
+dIC
aaa
-aag
+ane
aal
-aan
+dIC
aaa
-aag
+ane
aal
-aan
+dIC
aaa
aac
aaa
@@ -142997,17 +142997,17 @@ aaa
aaa
aac
aaa
-aag
+ane
aam
-aan
+dIC
aaa
-aag
+ane
aal
-aan
+dIC
aaa
-aag
+ane
aam
-aan
+dIC
aaa
aad
aaa
@@ -143258,9 +143258,9 @@ aaa
aad
aaa
aaa
-aag
+ane
aam
-aan
+dIC
aaa
aaa
aad
@@ -149319,9 +149319,9 @@ aaa
aad
aaa
aaa
-dFy
+pea
dGR
-dIh
+sgr
aaa
aaa
aad
@@ -149572,17 +149572,17 @@ aad
dBO
aad
aaa
-dFy
+pea
dGR
-dIh
+sgr
aaa
-dFy
+pea
dGS
-dIh
+sgr
aaa
-dFy
+pea
dGR
-dIh
+sgr
aaa
aad
aaa
@@ -149829,17 +149829,17 @@ aaa
dBO
aad
aad
-dFy
+pea
dGS
-dIh
+sgr
aaa
-dFy
+pea
dGS
-dIh
+sgr
aaa
-dFy
+pea
dGS
-dIh
+sgr
aaa
wiQ
aaa
@@ -150086,17 +150086,17 @@ aad
dBO
aad
aaa
-dFy
+pea
dGS
-dIh
+sgr
aad
-dFy
+pea
dGS
-dIh
+sgr
aad
-dFy
+pea
dGS
-dIh
+sgr
aad
aad
aaa
@@ -150343,17 +150343,17 @@ aaa
dBO
aad
aad
-dFy
+pea
dGS
-dIh
+sgr
aaa
-dFy
+pea
dGS
-dIh
+sgr
aaa
-dFy
+pea
dGS
-dIh
+sgr
aaa
wiQ
aaa
@@ -150600,17 +150600,17 @@ aad
dBO
aad
aaa
-dFy
+pea
dGS
-dIh
+sgr
aaa
aad
dBN
aad
aaa
-dFy
+pea
dGS
-dIh
+sgr
aaa
wiQ
aad
@@ -151127,7 +151127,7 @@ dDf
dEm
dEm
dEm
-dTk
+qIL
aad
wiQ
aaa
@@ -151628,17 +151628,17 @@ wiQ
aad
aad
aaa
-dFy
+pea
dGU
-dIh
+sgr
aaa
aad
dGT
aad
aaa
-dFy
+pea
dGU
-dIh
+sgr
aaa
wiQ
wiQ
@@ -151885,17 +151885,17 @@ aaa
aaa
aad
aad
-dFy
+pea
dGU
-dIh
+sgr
aaa
-dFy
+pea
dGU
-dIh
+sgr
aaa
-dFy
+pea
dGU
-dIh
+sgr
aaa
wiQ
aaa
@@ -152142,17 +152142,17 @@ aaa
aaa
wiQ
aaa
-dFy
+pea
dGU
-dIh
+sgr
aad
-dFy
+pea
dGU
-dIh
+sgr
aad
-dFy
+pea
dGU
-dIh
+sgr
aad
wiQ
aaa
@@ -152399,17 +152399,17 @@ aaa
aaa
wiQ
aad
-dFy
+pea
dGU
-dIh
+sgr
aaa
-dFy
+pea
dGU
-dIh
+sgr
aaa
-dFy
+pea
dGU
-dIh
+sgr
aaa
aad
aaa
@@ -152656,17 +152656,17 @@ aaa
aaa
wiQ
aaa
-dFy
+pea
dGV
-dIh
+sgr
aaa
-dFy
+pea
dGU
-dIh
+sgr
aaa
-dFy
+pea
dGV
-dIh
+sgr
aaa
wiQ
aaa
@@ -152917,9 +152917,9 @@ aaa
aaa
aaa
aaa
-dFy
+pea
dGV
-dIh
+sgr
aaa
aaa
aaa
diff --git a/_maps/map_files/EchoStation/EchoStation.dmm b/_maps/map_files/EchoStation/EchoStation.dmm
index 0afd814aaf07d..8105723071ebc 100644
--- a/_maps/map_files/EchoStation/EchoStation.dmm
+++ b/_maps/map_files/EchoStation/EchoStation.dmm
@@ -3272,7 +3272,9 @@
dir = 8
},
/obj/machinery/rnd/production/techfab/department/cargo,
-/obj/machinery/power/apc/auto_name/east,
+/obj/machinery/power/apc/auto_name/east{
+ pixel_x = 24
+ },
/obj/structure/cable/yellow{
icon_state = "0-8"
},
@@ -5502,6 +5504,21 @@
/obj/effect/turf_decal/bot,
/turf/open/floor/iron,
/area/bridge)
+"cne" = (
+/obj/machinery/airalarm/directional/west,
+/obj/item/radio/intercom{
+ dir = 1;
+ pixel_x = 1;
+ pixel_y = 23
+ },
+/obj/structure/disposalpipe/trunk{
+ dir = 2
+ },
+/obj/structure/disposaloutlet{
+ dir = 4
+ },
+/turf/open/floor/plating,
+/area/maintenance/disposal)
"cnh" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
@@ -10688,7 +10705,9 @@
dir = 4
},
/obj/effect/turf_decal/stripes/line,
-/obj/machinery/power/apc/auto_name/east,
+/obj/machinery/power/apc/auto_name/east{
+ pixel_x = 24
+ },
/obj/structure/cable/yellow,
/turf/open/floor/iron/tech,
/area/science/mixing/chamber)
@@ -16876,7 +16895,9 @@
/area/medical/medbay/central)
"idv" = (
/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/power/apc/auto_name/east,
+/obj/machinery/power/apc/auto_name/east{
+ pixel_x = 24
+ },
/obj/structure/cable/yellow{
icon_state = "0-8"
},
@@ -18083,7 +18104,9 @@
"iOV" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/machinery/power/apc/auto_name/east,
+/obj/machinery/power/apc/auto_name/east{
+ pixel_x = 24
+ },
/obj/structure/cable/yellow,
/obj/structure/cable/yellow{
icon_state = "1-2"
@@ -19093,6 +19116,22 @@
},
/turf/open/floor/carpet/green,
/area/crew_quarters/cafeteria)
+"jsJ" = (
+/obj/machinery/atmospherics/components/trinary/mixer/airmix/flipped/inverse{
+ dir = 8;
+ piping_layer = 2
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral/half/contrasted{
+ dir = 4
+ },
+/obj/structure/window/plasma/reinforced{
+ dir = 1
+ },
+/turf/open/floor/iron,
+/area/engine/atmos)
"jsW" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
@@ -23312,7 +23351,9 @@
icon_state = "2-8"
},
/obj/effect/spawner/lootdrop/aimodule_harmless,
-/obj/machinery/power/apc/auto_name/east,
+/obj/machinery/power/apc/auto_name/east{
+ pixel_x = 24
+ },
/obj/structure/cable{
icon_state = "0-2"
},
@@ -26738,7 +26779,9 @@
pixel_x = 32;
pixel_y = 31
},
-/obj/machinery/power/apc/auto_name/east,
+/obj/machinery/power/apc/auto_name/east{
+ pixel_x = 24
+ },
/obj/structure/cable/yellow{
icon_state = "0-2"
},
@@ -27338,8 +27381,8 @@
pixel_x = 4
},
/obj/item/food/dough{
- pixel_y = 2;
- pixel_x = 9
+ pixel_x = 9;
+ pixel_y = 2
},
/obj/item/reagent_containers/food/condiment/enzyme{
pixel_x = -5;
@@ -27948,22 +27991,6 @@
/obj/effect/decal/cleanable/blood/splatter,
/turf/open/floor/iron,
/area/maintenance/department/crew_quarters/dorms)
-"okn" = (
-/obj/machinery/atmospherics/components/trinary/mixer/airmix/flipped{
- dir = 8;
- piping_layer = 2
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 4
- },
-/obj/effect/turf_decal/tile/neutral/half/contrasted{
- dir = 4
- },
-/obj/structure/window/plasma/reinforced{
- dir = 1
- },
-/turf/open/floor/iron,
-/area/engine/atmos)
"okx" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -32845,7 +32872,9 @@
/obj/machinery/light{
dir = 4
},
-/obj/machinery/power/apc/auto_name/east,
+/obj/machinery/power/apc/auto_name/east{
+ pixel_x = 24
+ },
/obj/structure/chair/office/light{
dir = 1;
pixel_y = 3
@@ -40447,8 +40476,8 @@
name = "Chef window"
},
/obj/item/toy/figure/chef{
- pixel_y = -1;
- pixel_x = -4
+ pixel_x = -4;
+ pixel_y = -1
},
/turf/open/floor/iron/white,
/area/crew_quarters/kitchen)
@@ -41498,7 +41527,9 @@
/obj/machinery/light/small{
dir = 4
},
-/obj/machinery/power/apc/auto_name/east,
+/obj/machinery/power/apc/auto_name/east{
+ pixel_x = 24
+ },
/obj/structure/cable/yellow,
/turf/open/floor/pod/dark,
/area/maintenance/department/medical/morgue)
@@ -41835,21 +41866,6 @@
/area/engineering/hallway{
name = "Engineering Viewing Platform"
})
-"uTm" = (
-/obj/machinery/airalarm/directional/west,
-/obj/item/radio/intercom{
- dir = 1;
- pixel_x = 1;
- pixel_y = 23
- },
-/obj/structure/disposalpipe/trunk{
- dir = 2
- },
-/obj/machinery/disposal/deliveryChute{
- dir = 4
- },
-/turf/open/floor/plating,
-/area/maintenance/disposal)
"uTt" = (
/obj/machinery/camera/autoname{
dir = 1;
@@ -47190,7 +47206,9 @@
/obj/item/radio/intercom{
pixel_y = 29
},
-/obj/machinery/power/apc/auto_name/east,
+/obj/machinery/power/apc/auto_name/east{
+ pixel_x = 24
+ },
/obj/structure/cable/yellow{
icon_state = "0-8"
},
@@ -47461,7 +47479,9 @@
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 1
},
-/obj/machinery/power/apc/auto_name/east,
+/obj/machinery/power/apc/auto_name/east{
+ pixel_x = 24
+ },
/obj/structure/cable/yellow{
icon_state = "0-8"
},
@@ -57521,7 +57541,7 @@ hbl
uli
mgL
bKc
-okn
+jsJ
cnW
qdc
tIa
@@ -134866,7 +134886,7 @@ auW
fcC
jsb
aqu
-uTm
+cne
wHe
swz
piQ
diff --git a/_maps/map_files/FlandStation/FlandStation.dmm b/_maps/map_files/FlandStation/FlandStation.dmm
index d3883c3bd9ae7..1f5e45ce00a2e 100644
--- a/_maps/map_files/FlandStation/FlandStation.dmm
+++ b/_maps/map_files/FlandStation/FlandStation.dmm
@@ -217,13 +217,6 @@
},
/turf/open/floor/iron/dark,
/area/security/courtroom)
-"acK" = (
-/obj/machinery/power/tracker,
-/obj/structure/cable{
- icon_state = "0-2"
- },
-/turf/open/floor/iron/airless/solarpanel,
-/area/solar/port/fore)
"acO" = (
/obj/structure/lattice,
/obj/structure/grille,
@@ -1219,11 +1212,6 @@
/obj/structure/sign/plaques/atmos,
/turf/closed/wall,
/area/engine/atmos)
-"aqU" = (
-/obj/structure/cable,
-/obj/machinery/power/tracker,
-/turf/open/floor/iron/airless/solarpanel,
-/area/solar/port/aft)
"arb" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -1722,6 +1710,16 @@
heat_capacity = 1e+006
},
/area/asteroid/nearstation)
+"awC" = (
+/obj/machinery/power/solar{
+ id = "starboardsolar";
+ name = "Starboard Solar Array"
+ },
+/obj/structure/cable{
+ icon_state = "0-8"
+ },
+/turf/open/floor/iron/solarpanel/airless,
+/area/solar/starboard/fore)
"awD" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/girder/reinforced,
@@ -6379,16 +6377,6 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/iron/grid/steel,
/area/science/lobby)
-"bzD" = (
-/obj/structure/cable{
- icon_state = "0-2"
- },
-/obj/machinery/power/solar{
- id = "forestarboard";
- name = "Fore-Starboard Solar Array"
- },
-/turf/open/floor/iron/airless/solarpanel,
-/area/solar/port/fore)
"bzH" = (
/obj/structure/sign/poster/contraband/random,
/turf/closed/wall,
@@ -8354,12 +8342,6 @@
},
/turf/open/floor/iron/techmaint,
/area/security/checkpoint/auxiliary)
-"cdA" = (
-/obj/item/reagent_containers/food/drinks/bottle/vodka{
- desc = "Aah, vodka. Prime choice of drink AND fuel by Russians worldwide. This one used to hold many secrets..."
- },
-/turf/open/floor/iron/cult,
-/area/chapel/office)
"cdD" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
@@ -11432,17 +11414,6 @@
},
/turf/open/floor/iron/sepia,
/area/science/shuttle)
-"cTu" = (
-/obj/structure/table/wood/fancy,
-/obj/item/soulstone/anybody/chaplain,
-/obj/item/organ/heart{
- pixel_x = 8;
- pixel_y = 7
- },
-/obj/item/reagent_containers/food/drinks/bottle/holywater,
-/obj/item/book/granter/spell/smoke/lesser,
-/turf/open/floor/iron/cult,
-/area/chapel/office)
"cTx" = (
/obj/effect/turf_decal/guideline/guideline_in/red{
dir = 4
@@ -11680,6 +11651,17 @@
dir = 5
},
/area/quartermaster/warehouse)
+"cWa" = (
+/obj/structure/table/wood,
+/obj/item/flashlight/lamp/green{
+ pixel_x = 1;
+ pixel_y = 5
+ },
+/obj/machinery/newscaster{
+ pixel_y = 31
+ },
+/turf/open/floor/cult,
+/area/library)
"cWh" = (
/obj/structure/cable/yellow{
icon_state = "0-4"
@@ -13338,6 +13320,16 @@
},
/turf/open/floor/iron/dark,
/area/hallway/primary/aft)
+"dun" = (
+/obj/machinery/power/solar{
+ id = "portsolar";
+ name = "Port Solar Array"
+ },
+/obj/structure/cable{
+ icon_state = "0-8"
+ },
+/turf/open/floor/iron/solarpanel/airless,
+/area/solar/port)
"dut" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 8
@@ -15226,10 +15218,6 @@
},
/turf/open/floor/iron/techmaint,
/area/medical/surgery)
-"dTp" = (
-/obj/effect/spawner/structure/window/reinforced/tinted,
-/turf/open/floor/iron/cult,
-/area/library)
"dTQ" = (
/obj/structure/rack,
/obj/item/crowbar,
@@ -17403,14 +17391,6 @@
},
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
-"eAl" = (
-/obj/structure/chair/fancy/comfy{
- buildstackamount = 0;
- color = "#742925";
- dir = 4
- },
-/turf/open/floor/iron/cult,
-/area/library)
"eAm" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/grille,
@@ -18808,6 +18788,12 @@
},
/turf/open/floor/plating,
/area/maintenance/department/security/brig)
+"ePp" = (
+/obj/item/reagent_containers/food/drinks/bottle/vodka{
+ desc = "Aah, vodka. Prime choice of drink AND fuel by Russians worldwide. This one used to hold many secrets..."
+ },
+/turf/open/floor/cult,
+/area/chapel/office)
"ePI" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/door/poddoor/shutters{
@@ -19981,6 +19967,14 @@
/obj/effect/turf_decal/trimline/blue/corner,
/turf/open/floor/iron/white,
/area/medical/medbay/central)
+"fcB" = (
+/obj/structure/cable,
+/obj/machinery/power/solar{
+ id = "aftstarboard";
+ name = "Aft-Starboard Solar Array"
+ },
+/turf/open/floor/iron/solarpanel/airless,
+/area/solar/port/aft)
"fcH" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/obj/structure/disposalpipe/junction{
@@ -22160,9 +22154,6 @@
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
/turf/open/floor/iron/dark,
/area/hallway/primary/aft)
-"fFg" = (
-/turf/open/floor/iron/cult,
-/area/library)
"fFj" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/door/poddoor/shutters/preopen{
@@ -24090,18 +24081,6 @@
},
/turf/open/floor/iron/techmaint,
/area/quartermaster/storage)
-"gcX" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/disposalpipe/segment,
-/obj/structure/table/reinforced,
-/obj/item/paper_bin,
-/obj/item/pen,
-/obj/effect/turf_decal/stripes/line,
-/obj/item/toy/plush/lizard_plushie{
- name = "Eats-The-Rubbish"
- },
-/turf/open/floor/iron/dark/side,
-/area/quartermaster/sorting)
"gda" = (
/turf/closed/wall,
/area/security/checkpoint/escape)
@@ -28317,14 +28296,6 @@
},
/turf/open/floor/plating,
/area/bridge)
-"hhd" = (
-/obj/structure/cable,
-/obj/machinery/power/solar{
- id = "forestarboard";
- name = "Fore-Starboard Solar Array"
- },
-/turf/open/floor/iron/airless/solarpanel,
-/area/solar/port/fore)
"hhg" = (
/obj/machinery/vending/wardrobe/det_wardrobe,
/obj/machinery/firealarm/directional/east,
@@ -35644,6 +35615,16 @@
},
/turf/open/floor/iron/techmaint,
/area/ai_monitored/storage/eva)
+"iYf" = (
+/obj/structure/cable{
+ icon_state = "0-2"
+ },
+/obj/machinery/power/solar{
+ id = "forestarboard";
+ name = "Fore-Starboard Solar Array"
+ },
+/turf/open/floor/iron/solarpanel/airless,
+/area/solar/port/fore)
"iYl" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 8
@@ -38997,13 +38978,6 @@
},
/turf/open/floor/plating,
/area/maintenance/port)
-"jRc" = (
-/obj/machinery/power/tracker,
-/obj/structure/cable{
- icon_state = "0-4"
- },
-/turf/open/floor/iron/airless/solarpanel,
-/area/solar/port)
"jRk" = (
/obj/item/kirbyplants/random,
/turf/open/floor/iron/dark,
@@ -43031,6 +43005,13 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/carpet/orange,
/area/quartermaster/qm)
+"kTs" = (
+/obj/machinery/power/tracker,
+/obj/structure/cable{
+ icon_state = "0-4"
+ },
+/turf/open/floor/iron/solarpanel/airless,
+/area/solar/port)
"kTz" = (
/obj/effect/turf_decal/stripes/line{
dir = 10
@@ -46624,17 +46605,6 @@
/obj/structure/sign/departments/minsky/security/security,
/turf/closed/wall/r_wall,
/area/security/prison)
-"lJv" = (
-/obj/structure/table/wood,
-/obj/item/flashlight/lamp/green{
- pixel_x = 1;
- pixel_y = 5
- },
-/obj/machinery/newscaster{
- pixel_y = 31
- },
-/turf/open/floor/iron/cult,
-/area/library)
"lJz" = (
/obj/effect/turf_decal/siding/wood/corner{
dir = 4
@@ -47568,6 +47538,16 @@
/obj/structure/window/reinforced,
/turf/open/floor/grass,
/area/hallway/secondary/exit/departure_lounge)
+"lWQ" = (
+/obj/machinery/power/solar{
+ id = "portsolar";
+ name = "Port Solar Array"
+ },
+/obj/structure/cable{
+ icon_state = "0-4"
+ },
+/turf/open/floor/iron/solarpanel/airless,
+/area/solar/port)
"lWR" = (
/obj/item/hand_labeler,
/obj/item/crowbar,
@@ -48697,14 +48677,6 @@
},
/turf/open/floor/iron/techmaint,
/area/security/checkpoint/auxiliary)
-"mou" = (
-/obj/machinery/newscaster{
- pixel_y = 31
- },
-/obj/item/folder,
-/obj/structure/table/wood,
-/turf/open/floor/iron/cult,
-/area/library)
"mow" = (
/obj/effect/turf_decal/trimline/purple/filled/line,
/obj/structure/disposalpipe/segment{
@@ -49119,6 +49091,13 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/turf/open/floor/plating,
/area/security/brig)
+"muD" = (
+/obj/structure/lattice,
+/obj/item/toy/plush/lizard_plushie/space{
+ name = "Embraces-the-Void"
+ },
+/turf/open/space/basic,
+/area/space/nearstation)
"muH" = (
/obj/effect/turf_decal/loading_area,
/obj/effect/turf_decal/tile/brown/opposingcorners{
@@ -50256,14 +50235,6 @@
/obj/machinery/light/small,
/turf/open/floor/plating,
/area/maintenance/aft/secondary)
-"mIu" = (
-/obj/structure/table/wood,
-/obj/item/flashlight/lamp/green{
- pixel_x = 1;
- pixel_y = 5
- },
-/turf/open/floor/iron/cult,
-/area/library)
"mIB" = (
/obj/structure/cable/yellow{
icon_state = "4-8"
@@ -51784,6 +51755,17 @@
},
/turf/open/floor/iron/dark/side,
/area/quartermaster/warehouse)
+"ndu" = (
+/obj/structure/table/wood/fancy,
+/obj/item/soulstone/anybody/chaplain,
+/obj/item/organ/heart{
+ pixel_x = 8;
+ pixel_y = 7
+ },
+/obj/item/reagent_containers/food/drinks/bottle/holywater,
+/obj/item/book/granter/spell/smoke/lesser,
+/turf/open/floor/cult,
+/area/chapel/office)
"ndM" = (
/obj/effect/turf_decal/guideline/guideline_in/red{
dir = 4
@@ -52629,16 +52611,6 @@
},
/turf/open/floor/iron/dark,
/area/security/brig)
-"npj" = (
-/obj/machinery/power/solar{
- id = "portsolar";
- name = "Port Solar Array"
- },
-/obj/structure/cable{
- icon_state = "0-8"
- },
-/turf/open/floor/iron/airless/solarpanel,
-/area/solar/starboard/fore)
"npk" = (
/obj/machinery/computer/cargo/request{
dir = 4
@@ -52756,6 +52728,14 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/turf/open/floor/iron/techmaint,
/area/maintenance/starboard/aft)
+"nrb" = (
+/obj/machinery/newscaster{
+ pixel_y = 31
+ },
+/obj/item/folder,
+/obj/structure/table/wood,
+/turf/open/floor/cult,
+/area/library)
"nrL" = (
/obj/machinery/atmospherics/components/binary/pump{
dir = 4;
@@ -53601,16 +53581,6 @@
},
/turf/open/floor/iron,
/area/medical/cryo)
-"nBM" = (
-/obj/machinery/power/solar{
- id = "portsolar";
- name = "Port Solar Array"
- },
-/obj/structure/cable{
- icon_state = "0-4"
- },
-/turf/open/floor/iron/airless/solarpanel,
-/area/solar/starboard/fore)
"nBP" = (
/obj/structure/cable/yellow{
icon_state = "2-8"
@@ -54404,6 +54374,14 @@
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/security/checkpoint/engineering)
+"nLG" = (
+/obj/structure/table/wood,
+/obj/item/folder,
+/obj/machinery/computer/security/telescreen/entertainment{
+ pixel_y = -32
+ },
+/turf/open/floor/cult,
+/area/library)
"nLL" = (
/obj/structure/flora/grass/jungle/b,
/obj/structure/flora/ausbushes/brflowers,
@@ -55208,16 +55186,6 @@
},
/turf/open/floor/iron/dark,
/area/medical/storage)
-"nZw" = (
-/obj/machinery/power/solar{
- id = "starboardsolar";
- name = "Starboard Solar Array"
- },
-/obj/structure/cable{
- icon_state = "0-8"
- },
-/turf/open/floor/iron/airless/solarpanel,
-/area/solar/starboard/fore)
"nZA" = (
/obj/effect/turf_decal/siding/wood/corner,
/turf/open/floor/wood,
@@ -56477,6 +56445,23 @@
},
/turf/open/floor/plating,
/area/engine/gravity_generator)
+"oqs" = (
+/obj/structure/cable/yellow{
+ icon_state = "1-8"
+ },
+/obj/structure/cable/yellow{
+ icon_state = "1-4"
+ },
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 9
+ },
+/obj/machinery/navbeacon{
+ codes_txt = "patrol;next_patrol=21-LobbyCorner";
+ location = "20-Lobby"
+ },
+/turf/open/floor/iron/goonplaque,
+/area/hallway/primary/port)
"oqu" = (
/obj/structure/cable/yellow{
icon_state = "2-4"
@@ -56984,6 +56969,16 @@
},
/turf/open/floor/plating,
/area/maintenance/department/medical)
+"oya" = (
+/obj/machinery/power/solar{
+ id = "portsolar";
+ name = "Port Solar Array"
+ },
+/obj/structure/cable{
+ icon_state = "0-4"
+ },
+/turf/open/floor/iron/solarpanel/airless,
+/area/solar/starboard/fore)
"oyj" = (
/obj/machinery/door/airlock{
id_tag = "Toilet2a";
@@ -57294,6 +57289,13 @@
/obj/effect/turf_decal/delivery,
/turf/open/floor/iron/dark,
/area/engine/atmos)
+"oDl" = (
+/obj/machinery/power/tracker,
+/obj/structure/cable{
+ icon_state = "0-2"
+ },
+/turf/open/floor/iron/solarpanel/airless,
+/area/solar/port/fore)
"oDs" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/closet/cardboard,
@@ -62420,14 +62422,6 @@
},
/turf/open/floor/carpet/blue,
/area/crew_quarters/heads/cmo)
-"pYX" = (
-/obj/structure/table/wood,
-/obj/item/folder,
-/obj/machinery/computer/security/telescreen/entertainment{
- pixel_y = -32
- },
-/turf/open/floor/iron/cult,
-/area/library)
"pYZ" = (
/obj/structure/disposalpipe/segment{
dir = 6
@@ -65105,6 +65099,16 @@
/obj/effect/turf_decal/tile/yellow/opposingcorners,
/turf/open/floor/iron/sepia,
/area/engine/engineering)
+"qGv" = (
+/obj/machinery/power/solar{
+ id = "starboardsolar";
+ name = "Starboard Solar Array"
+ },
+/obj/structure/cable{
+ icon_state = "0-8"
+ },
+/turf/open/floor/iron/solarpanel/airless,
+/area/solar/port)
"qGw" = (
/obj/structure/closet/crate,
/obj/item/coin/silver,
@@ -68638,6 +68642,16 @@
},
/turf/open/floor/iron/white,
/area/science/xenobiology)
+"rBx" = (
+/obj/machinery/power/solar{
+ id = "portsolar";
+ name = "Port Solar Array"
+ },
+/obj/structure/cable{
+ icon_state = "0-8"
+ },
+/turf/open/floor/iron/solarpanel/airless,
+/area/solar/starboard/fore)
"rBB" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/obj/effect/turf_decal/tile/bar/opposingcorners,
@@ -68710,13 +68724,6 @@
/obj/structure/lattice/catwalk,
/turf/open/space,
/area/solar/starboard/fore)
-"rCm" = (
-/obj/machinery/power/tracker,
-/obj/structure/cable{
- icon_state = "0-8"
- },
-/turf/open/floor/iron/airless/solarpanel,
-/area/solar/starboard/fore)
"rCE" = (
/obj/effect/turf_decal/trimline/red/filled/warning{
dir = 4
@@ -69419,6 +69426,11 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/iron/dark,
/area/chapel/main)
+"rKI" = (
+/obj/structure/cable,
+/obj/machinery/power/tracker,
+/turf/open/floor/iron/solarpanel/airless,
+/area/solar/port/aft)
"rKK" = (
/obj/structure/chair/foldable{
dir = 8
@@ -72345,6 +72357,18 @@
},
/turf/open/floor/iron/dark,
/area/lawoffice)
+"svn" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/disposalpipe/segment,
+/obj/structure/table/reinforced,
+/obj/item/paper_bin,
+/obj/item/pen,
+/obj/effect/turf_decal/stripes/line,
+/obj/item/toy/plush/lizard_plushie{
+ name = "Eats-The-Rubbish"
+ },
+/turf/open/floor/iron/dark/side,
+/area/quartermaster/sorting)
"svu" = (
/obj/machinery/door/airlock/maintenance{
name = "Storage Room";
@@ -72757,6 +72781,14 @@
},
/turf/open/floor/plating,
/area/gateway)
+"szW" = (
+/obj/structure/table/wood,
+/obj/item/flashlight/lamp/green{
+ pixel_x = 1;
+ pixel_y = 5
+ },
+/turf/open/floor/cult,
+/area/library)
"sAh" = (
/obj/effect/turf_decal/siding/wood,
/turf/open/floor/wood,
@@ -76380,6 +76412,10 @@
},
/turf/closed/wall/r_wall,
/area/engine/supermatter)
+"twT" = (
+/obj/effect/spawner/structure/window/reinforced/tinted,
+/turf/open/floor/cult,
+/area/library)
"txe" = (
/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/red/line,
@@ -76716,6 +76752,14 @@
burnt = 1
},
/area/maintenance/central/secondary)
+"tCd" = (
+/obj/structure/chair/fancy/comfy{
+ buildstackamount = 0;
+ color = "#742925";
+ dir = 4
+ },
+/turf/open/floor/cult,
+/area/library)
"tCk" = (
/obj/machinery/atmospherics/pipe/simple/general/hidden{
dir = 4
@@ -79135,16 +79179,6 @@
/obj/effect/turf_decal/tile/blue/fourcorners/contrasted,
/turf/open/floor/iron/grid,
/area/medical/surgery)
-"uiN" = (
-/obj/machinery/power/solar{
- id = "portsolar";
- name = "Port Solar Array"
- },
-/obj/structure/cable{
- icon_state = "0-4"
- },
-/turf/open/floor/iron/airless/solarpanel,
-/area/solar/port)
"uiZ" = (
/obj/machinery/atmospherics/components/unary/portables_connector/visible{
dir = 1
@@ -79346,23 +79380,6 @@
},
/turf/open/floor/iron,
/area/hallway/primary/central)
-"ulN" = (
-/obj/structure/cable/yellow{
- icon_state = "1-8"
- },
-/obj/structure/cable/yellow{
- icon_state = "1-4"
- },
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 9
- },
-/obj/machinery/navbeacon{
- codes_txt = "patrol;next_patrol=21-LobbyCorner";
- location = "20-Lobby"
- },
-/turf/open/floor/goonplaque,
-/area/hallway/primary/port)
"ulQ" = (
/turf/closed/wall/r_wall,
/area/hallway/primary/central)
@@ -80756,13 +80773,6 @@
},
/turf/open/floor/carpet,
/area/crew_quarters/bar/atrium)
-"uBv" = (
-/obj/structure/lattice,
-/obj/item/toy/plush/lizard_plushie/space{
- name = "Embraces-the-Void"
- },
-/turf/open/space/basic,
-/area/space/nearstation)
"uBw" = (
/obj/structure/table/reinforced,
/obj/item/storage/toolbox/electrical,
@@ -81134,6 +81144,9 @@
},
/turf/open/floor/plating,
/area/medical/genetics)
+"uGf" = (
+/turf/open/floor/cult,
+/area/library)
"uGj" = (
/obj/effect/turf_decal{
dir = 1
@@ -87531,6 +87544,14 @@
/obj/machinery/door/window/westleft,
/turf/open/floor/iron/ridged/steel,
/area/science/breakroom)
+"wbA" = (
+/obj/structure/cable,
+/obj/machinery/power/solar{
+ id = "forestarboard";
+ name = "Fore-Starboard Solar Array"
+ },
+/turf/open/floor/iron/solarpanel/airless,
+/area/solar/port/fore)
"wbE" = (
/obj/machinery/portable_atmospherics/canister/air,
/turf/open/floor/plating,
@@ -89764,6 +89785,16 @@
/obj/machinery/vending/cigarette,
/turf/open/floor/iron,
/area/hallway/secondary/entry)
+"wFi" = (
+/obj/structure/cable{
+ icon_state = "0-2"
+ },
+/obj/machinery/power/solar{
+ id = "aftstarboard";
+ name = "Aft-Starboard Solar Array"
+ },
+/turf/open/floor/iron/solarpanel/airless,
+/area/solar/port/aft)
"wFo" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/tile/neutral/half/contrasted{
@@ -90277,16 +90308,6 @@
},
/turf/open/floor/iron/sepia,
/area/construction/mining/aux_base)
-"wLw" = (
-/obj/machinery/power/solar{
- id = "portsolar";
- name = "Port Solar Array"
- },
-/obj/structure/cable{
- icon_state = "0-8"
- },
-/turf/open/floor/iron/airless/solarpanel,
-/area/solar/port)
"wLC" = (
/turf/open/floor/iron,
/area/construction)
@@ -90447,16 +90468,6 @@
"wMZ" = (
/turf/closed/wall,
/area/quartermaster/sorting)
-"wNg" = (
-/obj/machinery/power/solar{
- id = "starboardsolar";
- name = "Starboard Solar Array"
- },
-/obj/structure/cable{
- icon_state = "0-8"
- },
-/turf/open/floor/iron/airless/solarpanel,
-/area/solar/port)
"wNh" = (
/obj/machinery/newscaster{
pixel_x = 28;
@@ -91434,14 +91445,6 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/turf/open/floor/carpet,
/area/chapel/main)
-"wXD" = (
-/obj/structure/cable,
-/obj/machinery/power/solar{
- id = "aftstarboard";
- name = "Aft-Starboard Solar Array"
- },
-/turf/open/floor/iron/airless/solarpanel,
-/area/solar/port/aft)
"wXE" = (
/obj/effect/turf_decal/trimline/purple/filled/line{
dir = 1
@@ -93580,16 +93583,6 @@
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
/turf/open/floor/iron,
/area/maintenance/central/secondary)
-"xsQ" = (
-/obj/structure/cable{
- icon_state = "0-2"
- },
-/obj/machinery/power/solar{
- id = "aftstarboard";
- name = "Aft-Starboard Solar Array"
- },
-/turf/open/floor/iron/airless/solarpanel,
-/area/solar/port/aft)
"xsR" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 8
@@ -94218,6 +94211,13 @@
/obj/machinery/atmospherics/pipe/simple/cyan/visible,
/turf/open/floor/iron/dark,
/area/engine/atmos)
+"xAq" = (
+/obj/machinery/power/tracker,
+/obj/structure/cable{
+ icon_state = "0-8"
+ },
+/turf/open/floor/iron/solarpanel/airless,
+/area/solar/starboard/fore)
"xAs" = (
/obj/machinery/atmospherics/pipe/simple/general/hidden,
/turf/open/floor/circuit/green/telecomms/mainframe,
@@ -103917,7 +103917,7 @@ nnx
nnx
csJ
nnx
-jRc
+kTs
nnx
csJ
nnx
@@ -104678,27 +104678,27 @@ nnx
nnx
xJu
nnx
-uiN
-uiN
-uiN
-uiN
-uiN
-uiN
-uiN
-uiN
-uiN
+lWQ
+lWQ
+lWQ
+lWQ
+lWQ
+lWQ
+lWQ
+lWQ
+lWQ
csJ
vwI
csJ
-uiN
-uiN
-uiN
-uiN
-uiN
-uiN
-uiN
-uiN
-uiN
+lWQ
+lWQ
+lWQ
+lWQ
+lWQ
+lWQ
+lWQ
+lWQ
+lWQ
nnx
xJu
nnx
@@ -105192,27 +105192,27 @@ nnx
nnx
xJu
nnx
-wLw
-wLw
-wLw
-wLw
-wLw
-wLw
-wLw
-wLw
-wLw
+dun
+dun
+dun
+dun
+dun
+dun
+dun
+dun
+dun
csJ
kPA
csJ
-wNg
-wNg
-wNg
-wNg
-wNg
-wNg
-wNg
-wNg
-wLw
+qGv
+qGv
+qGv
+qGv
+qGv
+qGv
+qGv
+qGv
+dun
nnx
xJu
nnx
@@ -105706,27 +105706,27 @@ nnx
nnx
xJu
nnx
-uiN
-uiN
-uiN
-uiN
-uiN
-uiN
-uiN
-uiN
-uiN
+lWQ
+lWQ
+lWQ
+lWQ
+lWQ
+lWQ
+lWQ
+lWQ
+lWQ
csJ
kPA
csJ
-uiN
-uiN
-uiN
-uiN
-uiN
-uiN
-uiN
-uiN
-uiN
+lWQ
+lWQ
+lWQ
+lWQ
+lWQ
+lWQ
+lWQ
+lWQ
+lWQ
nnx
csJ
nnx
@@ -106220,27 +106220,27 @@ nnx
nnx
csJ
nnx
-wLw
-wLw
-wLw
-wLw
-wLw
-wLw
-wLw
-wLw
-wLw
+dun
+dun
+dun
+dun
+dun
+dun
+dun
+dun
+dun
csJ
kPA
csJ
-wNg
-wNg
-wNg
-wNg
-wNg
-wNg
-wNg
-wNg
-wLw
+qGv
+qGv
+qGv
+qGv
+qGv
+qGv
+qGv
+qGv
+dun
nnx
xJu
nnx
@@ -106734,27 +106734,27 @@ nnx
nnx
csJ
nnx
-uiN
-uiN
-uiN
-uiN
-uiN
-uiN
-uiN
-uiN
-uiN
+lWQ
+lWQ
+lWQ
+lWQ
+lWQ
+lWQ
+lWQ
+lWQ
+lWQ
csJ
kPA
csJ
-uiN
-uiN
-uiN
-uiN
-uiN
-uiN
-uiN
-uiN
-uiN
+lWQ
+lWQ
+lWQ
+lWQ
+lWQ
+lWQ
+lWQ
+lWQ
+lWQ
nnx
xJu
nnx
@@ -107248,27 +107248,27 @@ nnx
nnx
xJu
nnx
-wNg
-wNg
-wNg
-wNg
-wNg
-wNg
-wNg
-wNg
-wLw
+qGv
+qGv
+qGv
+qGv
+qGv
+qGv
+qGv
+qGv
+dun
csJ
kPA
csJ
-wNg
-wNg
-wNg
-wNg
-wNg
-wNg
-wNg
-wNg
-wLw
+qGv
+qGv
+qGv
+qGv
+qGv
+qGv
+qGv
+qGv
+dun
nnx
wMM
nnx
@@ -107762,27 +107762,27 @@ nnx
nnx
xJu
nnx
-uiN
-uiN
-uiN
-uiN
-uiN
-uiN
-uiN
-uiN
-uiN
+lWQ
+lWQ
+lWQ
+lWQ
+lWQ
+lWQ
+lWQ
+lWQ
+lWQ
csJ
kPA
csJ
-uiN
-uiN
-uiN
-uiN
-uiN
-uiN
-uiN
-uiN
-uiN
+lWQ
+lWQ
+lWQ
+lWQ
+lWQ
+lWQ
+lWQ
+lWQ
+lWQ
nnx
xJu
nnx
@@ -108276,27 +108276,27 @@ nnx
nnx
xJu
nnx
-wNg
-wNg
-wNg
-wNg
-wNg
-wNg
-wNg
-wNg
-wLw
+qGv
+qGv
+qGv
+qGv
+qGv
+qGv
+qGv
+qGv
+dun
csJ
kPA
csJ
-wNg
-wNg
-wNg
-wNg
-wNg
-wNg
-wNg
-wNg
-wLw
+qGv
+qGv
+qGv
+qGv
+qGv
+qGv
+qGv
+qGv
+dun
nnx
xJu
nnx
@@ -116949,8 +116949,8 @@ abN
abN
kHH
yjW
-cdA
-cTu
+ePp
+ndu
yjW
aMO
byH
@@ -117478,7 +117478,7 @@ sJo
oQZ
yfU
dPk
-dTp
+twT
dVt
yfU
dLn
@@ -119029,11 +119029,11 @@ esb
iuH
jgb
yfU
-eAl
-fFg
+tCd
+uGf
yfU
-fFg
-eAl
+uGf
+tCd
yfU
jKy
une
@@ -119286,11 +119286,11 @@ hiR
bMo
lKq
yfU
-mou
-mIu
+nrb
+szW
yfU
-lJv
-pYX
+cWa
+nLG
yfU
wZn
gFf
@@ -122417,7 +122417,7 @@ oUH
tUE
ylD
ceL
-ulN
+oqs
hmI
xTG
cnU
@@ -127834,7 +127834,7 @@ kGa
iiW
dat
dVE
-gcX
+svn
iEg
vEK
sNI
@@ -133377,17 +133377,17 @@ nnx
nnx
xJu
nnx
-bzD
+iYf
tIf
-hhd
+wbA
nnx
-bzD
+iYf
tIf
-hhd
+wbA
nnx
-bzD
+iYf
tIf
-hhd
+wbA
nnx
xJu
nnx
@@ -133634,17 +133634,17 @@ nnx
nnx
xJu
nnx
-bzD
+iYf
vfe
-hhd
+wbA
nnx
-bzD
+iYf
vfe
-hhd
+wbA
nnx
-bzD
+iYf
vfe
-hhd
+wbA
nnx
xJu
nnx
@@ -133891,17 +133891,17 @@ nnx
nnx
xJu
nnx
-bzD
+iYf
vfe
-hhd
+wbA
nnx
-bzD
+iYf
vfe
-hhd
+wbA
nnx
-bzD
+iYf
vfe
-hhd
+wbA
nnx
xJu
nnx
@@ -134148,17 +134148,17 @@ nnx
nnx
xJu
nnx
-bzD
+iYf
vfe
-hhd
+wbA
nnx
-bzD
+iYf
vfe
-hhd
+wbA
nnx
-bzD
+iYf
vfe
-hhd
+wbA
nnx
xJu
nnx
@@ -134405,17 +134405,17 @@ nnx
nnx
xJu
nnx
-bzD
+iYf
vfe
-hhd
+wbA
nnx
-bzD
+iYf
vfe
-hhd
+wbA
nnx
-bzD
+iYf
vfe
-hhd
+wbA
nnx
xJu
nnx
@@ -134662,17 +134662,17 @@ nnx
nnx
xJu
nnx
-bzD
+iYf
vfe
-hhd
+wbA
nnx
-bzD
+iYf
vfe
-hhd
+wbA
nnx
-bzD
+iYf
vfe
-hhd
+wbA
nnx
xJu
nnx
@@ -134919,17 +134919,17 @@ nnx
nnx
xJu
nnx
-bzD
+iYf
vfe
-hhd
+wbA
nnx
-bzD
+iYf
vfe
-hhd
+wbA
nnx
-bzD
+iYf
vfe
-hhd
+wbA
nnx
xJu
nnx
@@ -135176,17 +135176,17 @@ nnx
nnx
xJu
nnx
-bzD
+iYf
vfe
-hhd
+wbA
nnx
-bzD
+iYf
vfe
-hhd
+wbA
nnx
-bzD
+iYf
vfe
-hhd
+wbA
nnx
xJu
nnx
@@ -135433,17 +135433,17 @@ xJu
csJ
csJ
nnx
-bzD
+iYf
vfe
-hhd
+wbA
nnx
-bzD
+iYf
vfe
-hhd
+wbA
nnx
-bzD
+iYf
vfe
-hhd
+wbA
nnx
xJu
csJ
@@ -135632,7 +135632,7 @@ tsW
gud
gud
wvI
-uBv
+muD
nnx
nnx
nnx
@@ -135944,7 +135944,7 @@ nnx
nnx
wMM
nnx
-acK
+oDl
adg
adg
agV
@@ -136461,17 +136461,17 @@ xJu
csJ
csJ
nnx
-bzD
+iYf
aka
-hhd
+wbA
nnx
-bzD
+iYf
aka
-hhd
+wbA
nnx
-bzD
+iYf
aka
-hhd
+wbA
nnx
xJu
csJ
@@ -136718,17 +136718,17 @@ nnx
nnx
csJ
nnx
-bzD
+iYf
aka
-hhd
+wbA
nnx
-bzD
+iYf
aka
-hhd
+wbA
nnx
-bzD
+iYf
aka
-hhd
+wbA
nnx
xJu
nnx
@@ -136975,17 +136975,17 @@ nnx
nnx
xJu
nnx
-bzD
+iYf
aka
-hhd
+wbA
nnx
-bzD
+iYf
aka
-hhd
+wbA
nnx
-bzD
+iYf
aka
-hhd
+wbA
nnx
xJu
nnx
@@ -137232,17 +137232,17 @@ nnx
nnx
xJu
nnx
-bzD
+iYf
aka
-hhd
+wbA
nnx
-bzD
+iYf
aka
-hhd
+wbA
nnx
-bzD
+iYf
aka
-hhd
+wbA
nnx
xJu
nnx
@@ -137489,17 +137489,17 @@ nnx
nnx
xJu
nnx
-bzD
+iYf
aka
-hhd
+wbA
nnx
-bzD
+iYf
aka
-hhd
+wbA
nnx
-bzD
+iYf
aka
-hhd
+wbA
nnx
xJu
nnx
@@ -137746,17 +137746,17 @@ nnx
nnx
xJu
nnx
-bzD
+iYf
aka
-hhd
+wbA
nnx
-bzD
+iYf
aka
-hhd
+wbA
nnx
-bzD
+iYf
aka
-hhd
+wbA
nnx
xJu
nnx
@@ -138003,17 +138003,17 @@ nnx
nnx
xJu
nnx
-bzD
+iYf
aka
-hhd
+wbA
nnx
-bzD
+iYf
aka
-hhd
+wbA
nnx
-bzD
+iYf
aka
-hhd
+wbA
nnx
xJu
nnx
@@ -138260,17 +138260,17 @@ nnx
nnx
xJu
nnx
-bzD
+iYf
aka
-hhd
+wbA
nnx
-bzD
+iYf
aka
-hhd
+wbA
nnx
-bzD
+iYf
aka
-hhd
+wbA
nnx
xJu
nnx
@@ -138517,17 +138517,17 @@ nnx
nnx
xJu
nnx
-bzD
+iYf
akb
-hhd
+wbA
nnx
-bzD
+iYf
akb
-hhd
+wbA
nnx
-bzD
+iYf
akb
-hhd
+wbA
nnx
xJu
nnx
@@ -147162,17 +147162,17 @@ nnx
nnx
csJ
nnx
-xsQ
+wFi
anf
-wXD
+fcB
nnx
-xsQ
+wFi
anf
-wXD
+fcB
nnx
-xsQ
+wFi
anf
-wXD
+fcB
nnx
xJu
nnx
@@ -147419,17 +147419,17 @@ nnx
nnx
csJ
nnx
-xsQ
+wFi
vMV
-wXD
+fcB
nnx
-xsQ
+wFi
vMV
-wXD
+fcB
nnx
-xsQ
+wFi
vMV
-wXD
+fcB
nnx
xJu
nnx
@@ -147676,17 +147676,17 @@ nnx
nnx
csJ
nnx
-xsQ
+wFi
vMV
-wXD
+fcB
nnx
-xsQ
+wFi
vMV
-wXD
+fcB
nnx
-xsQ
+wFi
vMV
-wXD
+fcB
nnx
xJu
nnx
@@ -147933,17 +147933,17 @@ nnx
nnx
csJ
nnx
-xsQ
+wFi
vMV
-wXD
+fcB
nnx
-xsQ
+wFi
vMV
-wXD
+fcB
nnx
-xsQ
+wFi
vMV
-wXD
+fcB
nnx
xJu
nnx
@@ -148190,17 +148190,17 @@ nnx
nnx
csJ
nnx
-xsQ
+wFi
vMV
-wXD
+fcB
nnx
-xsQ
+wFi
vMV
-wXD
+fcB
nnx
-xsQ
+wFi
vMV
-wXD
+fcB
nnx
xJu
nnx
@@ -148447,17 +148447,17 @@ nnx
nnx
csJ
nnx
-xsQ
+wFi
vMV
-wXD
+fcB
nnx
-xsQ
+wFi
vMV
-wXD
+fcB
nnx
-xsQ
+wFi
vMV
-wXD
+fcB
nnx
xJu
nnx
@@ -148704,17 +148704,17 @@ nnx
nnx
csJ
nnx
-xsQ
+wFi
vMV
-wXD
+fcB
nnx
-xsQ
+wFi
vMV
-wXD
+fcB
nnx
-xsQ
+wFi
vMV
-wXD
+fcB
nnx
csJ
nnx
@@ -148961,17 +148961,17 @@ abN
nnx
csJ
nnx
-xsQ
+wFi
vMV
-wXD
+fcB
nnx
-xsQ
+wFi
vMV
-wXD
+fcB
nnx
-xsQ
+wFi
vMV
-wXD
+fcB
nnx
csJ
nnx
@@ -149218,17 +149218,17 @@ abN
nnx
csJ
nnx
-xsQ
+wFi
vMV
-wXD
+fcB
nnx
-xsQ
+wFi
vMV
-wXD
+fcB
nnx
-xsQ
+wFi
vMV
-wXD
+fcB
nnx
csJ
csJ
@@ -149745,7 +149745,7 @@ lus
bii
xIL
xIL
-aqU
+rKI
csJ
wMM
nnx
@@ -150246,17 +150246,17 @@ nnx
nnx
csJ
nnx
-xsQ
+wFi
wZr
-wXD
+fcB
nnx
-xsQ
+wFi
wZr
-wXD
+fcB
nnx
-xsQ
+wFi
wZr
-wXD
+fcB
nnx
csJ
csJ
@@ -150503,17 +150503,17 @@ nnx
nnx
csJ
nnx
-xsQ
+wFi
wZr
-wXD
+fcB
nnx
-xsQ
+wFi
wZr
-wXD
+fcB
nnx
-xsQ
+wFi
wZr
-wXD
+fcB
nnx
csJ
nnx
@@ -150760,17 +150760,17 @@ csJ
csJ
csJ
nnx
-xsQ
+wFi
wZr
-wXD
+fcB
nnx
-xsQ
+wFi
wZr
-wXD
+fcB
nnx
-xsQ
+wFi
wZr
-wXD
+fcB
nnx
csJ
nnx
@@ -151017,17 +151017,17 @@ nnx
nnx
csJ
nnx
-xsQ
+wFi
wZr
-wXD
+fcB
nnx
-xsQ
+wFi
wZr
-wXD
+fcB
nnx
-xsQ
+wFi
wZr
-wXD
+fcB
nnx
xJu
nnx
@@ -151274,17 +151274,17 @@ nnx
nnx
csJ
nnx
-xsQ
+wFi
wZr
-wXD
+fcB
nnx
-xsQ
+wFi
wZr
-wXD
+fcB
nnx
-xsQ
+wFi
wZr
-wXD
+fcB
nnx
xJu
nnx
@@ -151531,17 +151531,17 @@ nnx
nnx
csJ
nnx
-xsQ
+wFi
wZr
-wXD
+fcB
nnx
-xsQ
+wFi
wZr
-wXD
+fcB
nnx
-xsQ
+wFi
wZr
-wXD
+fcB
nnx
xJu
nnx
@@ -151788,17 +151788,17 @@ nnx
nnx
csJ
nnx
-xsQ
+wFi
wZr
-wXD
+fcB
nnx
-xsQ
+wFi
wZr
-wXD
+fcB
nnx
-xsQ
+wFi
wZr
-wXD
+fcB
nnx
xJu
nnx
@@ -152045,17 +152045,17 @@ nnx
nnx
csJ
nnx
-xsQ
+wFi
wZr
-wXD
+fcB
nnx
-xsQ
+wFi
wZr
-wXD
+fcB
nnx
-xsQ
+wFi
wZr
-wXD
+fcB
nnx
xJu
nnx
@@ -152302,17 +152302,17 @@ nnx
nnx
csJ
nnx
-xsQ
+wFi
wZr
-wXD
+fcB
nnx
-xsQ
+wFi
wZr
-wXD
+fcB
nnx
-xsQ
+wFi
xkE
-wXD
+fcB
nnx
cZO
nnx
@@ -153484,27 +153484,27 @@ dyJ
nnx
nnx
nnx
-nBM
-nBM
-nBM
-nBM
-nBM
-nBM
-nBM
-nBM
-nBM
+oya
+oya
+oya
+oya
+oya
+oya
+oya
+oya
+oya
qYE
qYE
qYE
-nBM
-nBM
-nBM
-nBM
-nBM
-nBM
-nBM
-nBM
-nBM
+oya
+oya
+oya
+oya
+oya
+oya
+oya
+oya
+oya
nnx
wDO
qgi
@@ -153998,27 +153998,27 @@ abN
abN
csJ
nnx
-npj
-npj
-npj
-npj
-npj
-npj
-npj
-npj
-npj
+rBx
+rBx
+rBx
+rBx
+rBx
+rBx
+rBx
+rBx
+rBx
qYE
qYE
qYE
-nZw
-nZw
-nZw
-nZw
-nZw
-nZw
-nZw
-nZw
-npj
+awC
+awC
+awC
+awC
+awC
+awC
+awC
+awC
+rBx
nnx
wDO
nnx
@@ -154512,27 +154512,27 @@ abN
nnx
csJ
nnx
-nBM
-nBM
-nBM
-nBM
-nBM
-nBM
-nBM
-nBM
-nBM
+oya
+oya
+oya
+oya
+oya
+oya
+oya
+oya
+oya
qYE
qYE
qYE
-nBM
-nBM
-nBM
-nBM
-nBM
-nBM
-nBM
-nBM
-nBM
+oya
+oya
+oya
+oya
+oya
+oya
+oya
+oya
+oya
nnx
wMM
vLM
@@ -155026,27 +155026,27 @@ abN
nnx
csJ
nnx
-npj
-npj
-npj
-npj
-npj
-npj
-npj
-npj
-npj
+rBx
+rBx
+rBx
+rBx
+rBx
+rBx
+rBx
+rBx
+rBx
qYE
qYE
qYE
-nZw
-nZw
-nZw
-nZw
-nZw
-nZw
-nZw
-nZw
-npj
+awC
+awC
+awC
+awC
+awC
+awC
+awC
+awC
+rBx
nnx
csJ
nnx
@@ -155540,27 +155540,27 @@ abN
nnx
csJ
nnx
-nBM
-nBM
-nBM
-nBM
-nBM
-nBM
-nBM
-nBM
-nBM
+oya
+oya
+oya
+oya
+oya
+oya
+oya
+oya
+oya
qYE
qYE
qYE
-nBM
-nBM
-nBM
-nBM
-nBM
-nBM
-nBM
-nBM
-nBM
+oya
+oya
+oya
+oya
+oya
+oya
+oya
+oya
+oya
nnx
csJ
nnx
@@ -156054,27 +156054,27 @@ nnx
nnx
csJ
nnx
-nZw
-nZw
-nZw
-nZw
-nZw
-nZw
-nZw
-nZw
-npj
+awC
+awC
+awC
+awC
+awC
+awC
+awC
+awC
+rBx
qYE
qYE
qYE
-nZw
-nZw
-nZw
-nZw
-nZw
-nZw
-nZw
-nZw
-npj
+awC
+awC
+awC
+awC
+awC
+awC
+awC
+awC
+rBx
nnx
csJ
nnx
@@ -156568,27 +156568,27 @@ nnx
nnx
csJ
nnx
-nBM
-nBM
-nBM
-nBM
-nBM
-nBM
-nBM
-nBM
-nBM
+oya
+oya
+oya
+oya
+oya
+oya
+oya
+oya
+oya
qYE
qYE
qYE
-nBM
-nBM
-nBM
-nBM
-nBM
-nBM
-nBM
-nBM
-nBM
+oya
+oya
+oya
+oya
+oya
+oya
+oya
+oya
+oya
nnx
csJ
nnx
@@ -157082,27 +157082,27 @@ nnx
nnx
xJu
nnx
-nZw
-nZw
-nZw
-nZw
-nZw
-nZw
-nZw
-nZw
-npj
+awC
+awC
+awC
+awC
+awC
+awC
+awC
+awC
+rBx
qYE
rBQ
qYE
-nZw
-nZw
-nZw
-nZw
-nZw
-nZw
-nZw
-nZw
-npj
+awC
+awC
+awC
+awC
+awC
+awC
+awC
+awC
+rBx
nnx
xJu
nnx
@@ -157863,7 +157863,7 @@ nnx
nnx
csJ
nnx
-rCm
+xAq
nnx
csJ
nnx
diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm
index 2db41d7365e51..038ab36f92f63 100644
--- a/_maps/map_files/KiloStation/KiloStation.dmm
+++ b/_maps/map_files/KiloStation/KiloStation.dmm
@@ -268,43 +268,6 @@
"abq" = (
/turf/closed/wall/rust,
/area/quartermaster/warehouse)
-"abs" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/obj/effect/turf_decal/stripes/corner{
- dir = 8
- },
-/obj/machinery/light/small{
- dir = 4
- },
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
- dir = 10
- },
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
- dir = 8
- },
-/turf/open/floor/iron/dark/telecomms,
-/area/quartermaster/exploration_prep)
-"abt" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/obj/machinery/camera/autoname{
- dir = 5
- },
-/obj/effect/turf_decal/stripes/corner{
- dir = 1
- },
-/obj/machinery/airalarm/server{
- dir = 4;
- pixel_x = -28
- },
-/obj/machinery/atmospherics/pipe/heat_exchanging/simple,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/turf/open/floor/iron/dark/telecomms,
-/area/quartermaster/exploration_prep)
"abv" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/sign/poster/official/safety_eye_protection,
@@ -1726,33 +1689,6 @@
},
/turf/open/floor/iron/dark,
/area/medical/chemistry)
-"agv" = (
-/obj/effect/turf_decal/caution{
- dir = 8
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/cobweb/cobweb2,
-/obj/effect/turf_decal/stripes/corner{
- dir = 1
- },
-/obj/structure/sign/warning/explosives{
- pixel_y = 31
- },
-/obj/machinery/camera/autoname,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
- dir = 8
- },
-/turf/open/floor/iron/showroomfloor,
-/area/maintenance/department/science)
"agw" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -1789,23 +1725,6 @@
/obj/item/clothing/mask/breath,
/turf/open/floor/plating,
/area/maintenance/fore)
-"agB" = (
-/obj/machinery/door/airlock/hatch{
- name = "Exploration Telecommunications";
- req_access_txt = "61"
- },
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/atmospherics/pipe/heat_exchanging/junction{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 4
- },
-/turf/open/floor/iron/dark/telecomms,
-/area/quartermaster/exploration_prep)
"agC" = (
/obj/effect/turf_decal/bot,
/obj/effect/decal/cleanable/dirt,
@@ -1817,23 +1736,6 @@
/obj/item/cardboard_cutout,
/turf/open/floor/plating,
/area/maintenance/fore)
-"agD" = (
-/obj/effect/turf_decal/stripes/corner,
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/turf_decal/stripes/line{
- dir = 9
- },
-/obj/machinery/atmospherics/pipe/heat_exchanging/manifold{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 10
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 4
- },
-/turf/open/floor/iron/dark/telecomms,
-/area/quartermaster/exploration_prep)
"agG" = (
/obj/docking_port/stationary{
dir = 2;
@@ -2086,17 +1988,6 @@
},
/turf/open/floor/iron/dark,
/area/science/xenobiology)
-"ahS" = (
-/obj/effect/turf_decal/box,
-/obj/machinery/power/solar{
- id = "foreport";
- name = "Fore-Port Solar Array"
- },
-/obj/structure/cable{
- icon_state = "0-4"
- },
-/turf/open/floor/iron/airless/solarpanel,
-/area/solar/port/fore)
"ahV" = (
/obj/effect/turf_decal/bot,
/obj/structure/closet/crate{
@@ -2190,22 +2081,6 @@
},
/turf/open/floor/grass,
/area/chapel/main)
-"air" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/manifold/cyan/hidden{
- dir = 8
- },
-/turf/open/floor/iron/dark,
-/area/maintenance/department/science)
"ais" = (
/obj/machinery/door/airlock/medical{
id_tag = "Shower_2";
@@ -2765,17 +2640,6 @@
},
/turf/open/floor/iron/dark,
/area/security/courtroom)
-"akO" = (
-/obj/effect/turf_decal/box,
-/obj/machinery/power/solar{
- id = "foreport";
- name = "Fore-Port Solar Array"
- },
-/obj/structure/cable{
- icon_state = "0-8"
- },
-/turf/open/floor/iron/airless/solarpanel,
-/area/solar/port/fore)
"akR" = (
/obj/structure/lattice/catwalk,
/obj/structure/cable{
@@ -3248,17 +3112,6 @@
},
/turf/open/floor/iron/dark,
/area/crew_quarters/heads/hos)
-"amK" = (
-/obj/effect/turf_decal/box,
-/obj/machinery/power/solar{
- id = "foreport";
- name = "Fore-Port Solar Array"
- },
-/obj/structure/cable{
- icon_state = "0-4"
- },
-/turf/open/floor/iron/airless/solarpanel,
-/area/space/nearstation)
"amL" = (
/obj/effect/decal/cleanable/dirt,
/turf/closed/wall/r_wall,
@@ -3456,14 +3309,6 @@
"aoh" = (
/turf/closed/wall,
/area/lawoffice)
-"aoi" = (
-/obj/machinery/power/tracker,
-/obj/effect/turf_decal/box,
-/obj/structure/cable{
- icon_state = "0-4"
- },
-/turf/open/floor/iron/airless/solarpanel,
-/area/space/nearstation)
"aol" = (
/obj/structure/noticeboard{
pixel_y = 32
@@ -5501,28 +5346,6 @@
/obj/effect/spawner/structure/window/plasma/reinforced,
/turf/open/floor/plating,
/area/engine/supermatter)
-"ayc" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/obj/effect/turf_decal/stripes/corner,
-/obj/effect/turf_decal/stripes/corner{
- dir = 8
- },
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
- dir = 10
- },
-/turf/open/floor/engine{
- initial_gas_mix = "n2=100;TEMP=80";
- name = "mainframe floor"
- },
-/area/tcommsat/server)
"ayf" = (
/obj/effect/landmark/start/assistant,
/obj/structure/cable/yellow{
@@ -5815,28 +5638,6 @@
/obj/machinery/power/emitter,
/turf/open/floor/iron/dark,
/area/engine/engineering)
-"azA" = (
-/obj/effect/turf_decal/stripes/line,
-/obj/effect/turf_decal/stripes/corner{
- dir = 1
- },
-/obj/effect/turf_decal/stripes/corner{
- dir = 4
- },
-/obj/structure/cable{
- icon_state = "1-4"
- },
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
- dir = 9
- },
-/turf/open/floor/engine{
- initial_gas_mix = "n2=100;TEMP=80";
- name = "mainframe floor"
- },
-/area/tcommsat/server)
"azB" = (
/obj/effect/turf_decal/stripes/line,
/obj/machinery/atmospherics/pipe/simple/cyan/visible{
@@ -6012,28 +5813,6 @@
},
/turf/open/floor/engine,
/area/engine/engineering)
-"aAk" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/obj/effect/turf_decal/stripes/corner,
-/obj/effect/turf_decal/stripes/corner{
- dir = 8
- },
-/obj/structure/cable/yellow{
- icon_state = "2-4"
- },
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
- dir = 6
- },
-/turf/open/floor/engine{
- initial_gas_mix = "n2=100;TEMP=80";
- name = "mainframe floor"
- },
-/area/tcommsat/server)
"aAp" = (
/obj/machinery/computer/mech_bay_power_console{
dir = 4
@@ -6222,28 +6001,6 @@
/obj/effect/turf_decal/caution/stand_clear,
/turf/open/floor/iron/dark,
/area/engine/engineering)
-"aBh" = (
-/obj/effect/turf_decal/stripes/line,
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/obj/machinery/power/terminal{
- dir = 1
- },
-/obj/structure/cable/yellow{
- icon_state = "0-8"
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
- dir = 4
- },
-/turf/open/floor/engine{
- initial_gas_mix = "n2=100;TEMP=80";
- name = "mainframe floor"
- },
-/area/tcommsat/server)
"aBl" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
@@ -6955,45 +6712,6 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/turf/open/floor/iron/dark,
/area/security/nuke_storage)
-"aEZ" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/obj/structure/cable/yellow{
- icon_state = "1-2"
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/machinery/atmospherics/pipe/heat_exchanging/simple,
-/turf/open/floor/engine{
- initial_gas_mix = "n2=100;TEMP=80";
- name = "mainframe floor"
- },
-/area/tcommsat/server)
-"aFa" = (
-/obj/effect/turf_decal/stripes/line,
-/obj/effect/turf_decal/stripes/corner{
- dir = 1
- },
-/obj/effect/turf_decal/stripes/corner{
- dir = 4
- },
-/obj/structure/cable/yellow{
- icon_state = "1-4"
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 5
- },
-/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
- dir = 5
- },
-/turf/open/floor/engine{
- initial_gas_mix = "n2=100;TEMP=80";
- name = "mainframe floor"
- },
-/area/tcommsat/server)
"aFc" = (
/turf/open/floor/engine/co2,
/area/engine/atmos)
@@ -7066,28 +6784,6 @@
},
/turf/open/floor/iron/dark,
/area/engine/engineering)
-"aFD" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/obj/effect/turf_decal/stripes/corner,
-/obj/effect/turf_decal/stripes/corner{
- dir = 8
- },
-/obj/structure/cable/yellow{
- icon_state = "2-8"
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 10
- },
-/obj/machinery/atmospherics/pipe/heat_exchanging/manifold{
- dir = 1
- },
-/turf/open/floor/engine{
- initial_gas_mix = "n2=100;TEMP=80";
- name = "mainframe floor"
- },
-/area/tcommsat/server)
"aFF" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/bot,
@@ -7100,27 +6796,6 @@
"aFJ" = (
/turf/closed/wall/rust,
/area/maintenance/disposal/incinerator)
-"aFK" = (
-/obj/effect/turf_decal/stripes/corner{
- dir = 1
- },
-/obj/effect/turf_decal/stripes/corner{
- dir = 4
- },
-/obj/effect/turf_decal/stripes/line,
-/obj/structure/cable/yellow{
- icon_state = "1-2"
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/heat_exchanging/simple,
-/turf/open/floor/engine{
- initial_gas_mix = "n2=100;TEMP=80";
- name = "mainframe floor"
- },
-/area/tcommsat/server)
"aFM" = (
/turf/closed/wall/r_wall,
/area/engine/atmos)
@@ -7147,22 +6822,6 @@
},
/turf/open/floor/iron/dark,
/area/chapel/main)
-"aFX" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/machinery/atmospherics/pipe/heat_exchanging/simple,
-/turf/open/floor/engine{
- initial_gas_mix = "n2=100;TEMP=80";
- name = "mainframe floor"
- },
-/area/tcommsat/server)
"aFY" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/structure/cable{
@@ -7173,32 +6832,6 @@
},
/turf/open/floor/plating,
/area/tcommsat/server)
-"aFZ" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 10
- },
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/general/hidden{
- dir = 9
- },
-/turf/open/floor/engine,
-/area/tcommsat/computer)
-"aGb" = (
-/obj/effect/turf_decal/box,
-/obj/structure/cable/yellow{
- icon_state = "1-2"
- },
-/obj/machinery/advanced_airlock_controller{
- dir = 8;
- pixel_x = 24
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/machinery/atmospherics/pipe/simple/general/hidden,
-/turf/open/floor/engine,
-/area/tcommsat/computer)
"aGc" = (
/obj/structure/sign/warning/vacuum/external,
/obj/effect/spawner/structure/window/reinforced,
@@ -7780,20 +7413,6 @@
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/security/checkpoint/engineering)
-"aKC" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/engineering/glass{
- name = "Server Room";
- req_access_txt = "61"
- },
-/obj/structure/cable/yellow{
- icon_state = "1-2"
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/machinery/atmospherics/pipe/simple/general/hidden,
-/turf/open/floor/iron/dark,
-/area/tcommsat/computer)
"aKD" = (
/obj/structure/lattice,
/obj/machinery/atmospherics/components/unary/outlet_injector/on{
@@ -8554,67 +8173,21 @@
"aQW" = (
/turf/closed/wall,
/area/medical/chemistry)
-"aRk" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 9
- },
-/obj/structure/chair/office{
- dir = 1
- },
-/obj/structure/cable/yellow{
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/manifold/general/hidden{
- dir = 1
- },
-/turf/open/floor/engine,
-/area/tcommsat/computer)
-"aRl" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/obj/machinery/light{
- dir = 1
- },
-/obj/structure/cable/yellow{
- icon_state = "2-8"
- },
-/obj/structure/cable/yellow{
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 6
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 6
- },
-/obj/machinery/atmospherics/pipe/simple/general/hidden{
- dir = 4
- },
-/turf/open/floor/engine,
-/area/tcommsat/computer)
-"aRm" = (
-/obj/effect/turf_decal/stripes/corner{
- dir = 1
- },
-/obj/effect/turf_decal/stripes/corner{
- dir = 4
- },
-/obj/effect/turf_decal/stripes/corner,
-/obj/structure/cable/yellow{
- icon_state = "1-8"
- },
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
-/obj/machinery/atmospherics/pipe/simple/general/hidden{
- dir = 9
- },
-/turf/open/floor/engine,
-/area/tcommsat/computer)
"aRn" = (
/obj/machinery/smartfridge/chemistry/preloaded,
/turf/closed/wall,
/area/medical/chemistry)
+"aRv" = (
+/obj/effect/turf_decal/box,
+/obj/machinery/power/solar{
+ id = "foreport";
+ name = "Fore-Port Solar Array"
+ },
+/obj/structure/cable{
+ icon_state = "0-8"
+ },
+/turf/open/floor/iron/solarpanel/airless,
+/area/solar/port/fore)
"aRI" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
dir = 1
@@ -9021,22 +8594,6 @@
},
/turf/open/floor/iron/dark,
/area/science/mixing/chamber)
-"aUS" = (
-/obj/effect/turf_decal/stripes/corner,
-/obj/effect/turf_decal/stripes/corner{
- dir = 8
- },
-/obj/structure/cable/yellow{
- icon_state = "1-2"
- },
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
- dir = 4
- },
-/turf/open/floor/engine,
-/area/tcommsat/computer)
"aUT" = (
/obj/machinery/newscaster{
pixel_x = 30
@@ -11995,6 +11552,17 @@
"bmy" = (
/turf/closed/wall,
/area/crew_quarters/bar/atrium)
+"bmz" = (
+/obj/effect/turf_decal/box,
+/obj/machinery/power/solar{
+ id = "forestarboard";
+ name = "Fore-Starboard Solar Array"
+ },
+/obj/structure/cable{
+ icon_state = "0-8"
+ },
+/turf/open/floor/iron/solarpanel/airless,
+/area/solar/starboard/fore)
"bmA" = (
/obj/machinery/smartfridge,
/turf/closed/wall,
@@ -16362,6 +15930,25 @@
"bIV" = (
/turf/closed/wall,
/area/crew_quarters/locker)
+"bIW" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+ dir = 4
+ },
+/obj/structure/cable/yellow{
+ icon_state = "1-2"
+ },
+/obj/effect/turf_decal/tile/purple/half/contrasted{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
+ dir = 9
+ },
+/turf/open/floor/iron/showroomfloor,
+/area/maintenance/department/science)
"bJa" = (
/obj/machinery/status_display/ai,
/turf/closed/wall,
@@ -19278,6 +18865,19 @@
/obj/structure/sign/warning/vacuum/external,
/turf/closed/wall,
/area/maintenance/starboard)
+"cbn" = (
+/obj/effect/turf_decal/stripes/line,
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+ dir = 4
+ },
+/turf/open/floor/engine{
+ initial_gas_mix = "n2=100;TEMP=80";
+ name = "mainframe floor"
+ },
+/area/tcommsat/server)
"cbu" = (
/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
@@ -19628,23 +19228,6 @@
initial_gas_mix = "o2=14;n2=23;TEMP=300"
},
/area/maintenance/fore)
-"cda" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/obj/effect/turf_decal/stripes/line,
-/obj/machinery/status_display/ai{
- pixel_x = -32;
- pixel_y = 32
- },
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
- dir = 4
- },
-/turf/open/floor/engine{
- initial_gas_mix = "n2=100;TEMP=80";
- name = "mainframe floor"
- },
-/area/tcommsat/server)
"cdc" = (
/turf/closed/wall,
/area/ai_monitored/turret_protected/ai_upload)
@@ -19676,23 +19259,6 @@
/obj/structure/lattice,
/turf/open/space/basic,
/area/space/nearstation)
-"cdm" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/obj/effect/turf_decal/stripes/line,
-/obj/machinery/status_display/ai{
- pixel_x = 32;
- pixel_y = 32
- },
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
- dir = 8
- },
-/turf/open/floor/engine{
- initial_gas_mix = "n2=100;TEMP=80";
- name = "mainframe floor"
- },
-/area/tcommsat/server)
"cdn" = (
/obj/machinery/telecomms/server/presets/command,
/turf/open/floor/circuit/green/telecomms/mainframe,
@@ -20108,25 +19674,6 @@
name = "mainframe floor"
},
/area/tcommsat/server)
-"ceP" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/engineering/glass{
- name = "Server Room";
- req_access_txt = "61"
- },
-/obj/structure/cable/yellow{
- icon_state = "1-2"
- },
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/machinery/atmospherics/pipe/heat_exchanging/junction{
- dir = 1
- },
-/turf/open/floor/engine,
-/area/tcommsat/server)
"ceQ" = (
/obj/structure/cable{
icon_state = "0-8"
@@ -20244,22 +19791,6 @@
name = "mainframe floor"
},
/area/tcommsat/server)
-"cfq" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/obj/effect/turf_decal/stripes/corner{
- dir = 8
- },
-/obj/effect/turf_decal/stripes/corner,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 8
- },
-/turf/open/floor/engine{
- initial_gas_mix = "n2=100;TEMP=80";
- name = "mainframe floor"
- },
-/area/tcommsat/server)
"cft" = (
/obj/effect/turf_decal/stripes/line{
dir = 10
@@ -20512,20 +20043,6 @@
},
/turf/open/floor/iron,
/area/hallway/secondary/exit/departure_lounge)
-"cgt" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 6
- },
-/obj/machinery/airalarm{
- dir = 1;
- pixel_y = -22
- },
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
- dir = 8
- },
-/obj/machinery/space_heater,
-/turf/open/floor/engine,
-/area/tcommsat/computer)
"cgu" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
@@ -21677,17 +21194,6 @@
"clb" = (
/turf/closed/wall/rust,
/area/maintenance/solars/starboard/aft)
-"clc" = (
-/obj/effect/turf_decal/box,
-/obj/machinery/power/solar{
- id = "aftport";
- name = "Aft-Port Solar Array"
- },
-/obj/structure/cable{
- icon_state = "0-4"
- },
-/turf/open/floor/iron/airless/solarpanel,
-/area/solar/port/aft)
"clh" = (
/obj/effect/turf_decal/stripes/corner{
dir = 1
@@ -22496,6 +22002,12 @@
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/engine/break_room)
+"cpv" = (
+/obj/machinery/telecomms/receiver/preset_exploration,
+/obj/effect/turf_decal/box,
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple,
+/turf/open/floor/circuit/green/telecomms/mainframe,
+/area/quartermaster/exploration_prep)
"cpx" = (
/obj/structure/lattice,
/obj/structure/disposalpipe/segment,
@@ -22809,17 +22321,6 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/turf/open/floor/plating,
/area/maintenance/port/aft)
-"cra" = (
-/obj/effect/turf_decal/box,
-/obj/machinery/power/solar{
- id = "aftport";
- name = "Aft-Port Solar Array"
- },
-/obj/structure/cable{
- icon_state = "0-8"
- },
-/turf/open/floor/iron/airless/solarpanel,
-/area/solar/port/aft)
"crb" = (
/obj/structure/lattice/catwalk,
/turf/open/space/basic,
@@ -22883,17 +22384,6 @@
},
/turf/open/space/basic,
/area/solar/port/fore)
-"crj" = (
-/obj/effect/turf_decal/box,
-/obj/machinery/power/solar{
- id = "forestarboard";
- name = "Fore-Starboard Solar Array"
- },
-/obj/structure/cable{
- icon_state = "0-8"
- },
-/turf/open/floor/iron/airless/solarpanel,
-/area/solar/starboard/fore)
"crn" = (
/turf/open/floor/plating{
broken = 1
@@ -24547,17 +24037,6 @@
},
/turf/open/floor/engine,
/area/engine/gravity_generator)
-"cyg" = (
-/obj/machinery/power/solar{
- id = "aftstarboard";
- name = "Aft-Starboard Solar Array"
- },
-/obj/effect/turf_decal/box,
-/obj/structure/cable{
- icon_state = "0-4"
- },
-/turf/open/floor/iron/airless/solarpanel,
-/area/solar/starboard/aft)
"cyh" = (
/obj/machinery/atmospherics/pipe/simple/dark/visible{
dir = 4
@@ -24805,17 +24284,6 @@
},
/turf/open/floor/iron/dark,
/area/engine/engineering)
-"czw" = (
-/obj/machinery/power/solar{
- id = "aftstarboard";
- name = "Aft-Starboard Solar Array"
- },
-/obj/effect/turf_decal/box,
-/obj/structure/cable{
- icon_state = "0-8"
- },
-/turf/open/floor/iron/airless/solarpanel,
-/area/solar/starboard/aft)
"czy" = (
/obj/effect/turf_decal/stripes/corner{
dir = 4
@@ -26341,17 +25809,6 @@
/obj/machinery/atmospherics/components/unary/portables_connector/visible,
/turf/open/floor/iron/dark,
/area/maintenance/starboard)
-"cGw" = (
-/obj/effect/turf_decal/box,
-/obj/machinery/power/solar{
- id = "forestarboard";
- name = "Fore-Starboard Solar Array"
- },
-/obj/structure/cable{
- icon_state = "0-4"
- },
-/turf/open/floor/iron/airless/solarpanel,
-/area/solar/starboard/fore)
"cGx" = (
/obj/structure/sign/warning/electricshock,
/turf/closed/wall,
@@ -27959,6 +27416,28 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
+"cNC" = (
+/obj/effect/turf_decal/stripes/line,
+/obj/effect/turf_decal/stripes/corner{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes/corner{
+ dir = 4
+ },
+/obj/structure/cable{
+ icon_state = "1-4"
+ },
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
+ dir = 9
+ },
+/turf/open/floor/engine{
+ initial_gas_mix = "n2=100;TEMP=80";
+ name = "mainframe floor"
+ },
+/area/tcommsat/server)
"cND" = (
/obj/effect/turf_decal/stripes/corner{
dir = 4
@@ -28550,14 +28029,6 @@
},
/turf/open/space/basic,
/area/solar/starboard/aft)
-"cPF" = (
-/obj/machinery/power/tracker,
-/obj/effect/turf_decal/box,
-/obj/structure/cable{
- icon_state = "0-8"
- },
-/turf/open/floor/iron/airless/solarpanel,
-/area/solar/starboard/aft)
"cPH" = (
/obj/structure/lattice/catwalk,
/obj/structure/cable{
@@ -29028,13 +28499,6 @@
},
/turf/open/floor/iron,
/area/hallway/primary/aft)
-"cWX" = (
-/obj/effect/turf_decal/tile/purple/half/contrasted,
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
- dir = 8
- },
-/turf/open/floor/iron/showroomfloor,
-/area/maintenance/department/science)
"cWY" = (
/obj/effect/turf_decal/stripes/corner{
dir = 4
@@ -29197,6 +28661,28 @@
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
/turf/open/floor/iron,
/area/hallway/primary/starboard)
+"cZE" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes/corner,
+/obj/effect/turf_decal/stripes/corner{
+ dir = 8
+ },
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
+ dir = 10
+ },
+/turf/open/floor/engine{
+ initial_gas_mix = "n2=100;TEMP=80";
+ name = "mainframe floor"
+ },
+/area/tcommsat/server)
"dab" = (
/obj/structure/girder,
/obj/effect/decal/cleanable/dirt,
@@ -29281,6 +28767,23 @@
/area/security/checkpoint/auxiliary{
name = "Security Aft"
})
+"dbr" = (
+/obj/effect/turf_decal/stripes/line,
+/obj/effect/turf_decal/stripes/corner{
+ dir = 1
+ },
+/obj/machinery/light/small{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
+ dir = 9
+ },
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+ dir = 8
+ },
+/turf/open/floor/iron/dark/telecomms,
+/area/quartermaster/exploration_prep)
"dbD" = (
/obj/structure/cable/yellow{
icon_state = "4-8"
@@ -30347,6 +29850,22 @@
},
/turf/open/floor/iron/showroomfloor,
/area/science/explab)
+"dtP" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes/corner{
+ dir = 8
+ },
+/obj/effect/turf_decal/stripes/corner,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 8
+ },
+/turf/open/floor/engine{
+ initial_gas_mix = "n2=100;TEMP=80";
+ name = "mainframe floor"
+ },
+/area/tcommsat/server)
"dtS" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
@@ -30905,6 +30424,14 @@
},
/turf/open/floor/iron/dark,
/area/security/execution/transfer)
+"dEx" = (
+/obj/machinery/power/tracker,
+/obj/effect/turf_decal/box,
+/obj/structure/cable{
+ icon_state = "0-8"
+ },
+/turf/open/floor/iron/solarpanel/airless,
+/area/solar/starboard/aft)
"dEI" = (
/obj/structure/cable/yellow{
icon_state = "1-4"
@@ -31950,6 +31477,17 @@
/area/security/checkpoint/auxiliary{
name = "Security Aft"
})
+"dYH" = (
+/obj/effect/turf_decal/box,
+/obj/machinery/power/solar{
+ id = "foreport";
+ name = "Fore-Port Solar Array"
+ },
+/obj/structure/cable{
+ icon_state = "0-4"
+ },
+/turf/open/floor/iron/solarpanel/airless,
+/area/space/nearstation)
"dZd" = (
/obj/structure/table,
/obj/machinery/cell_charger,
@@ -33610,6 +33148,23 @@
"eAT" = (
/turf/closed/wall/r_wall/rust,
/area/security/execution/transfer)
+"eAX" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes/line,
+/obj/machinery/status_display/ai{
+ pixel_x = -32;
+ pixel_y = 32
+ },
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+ dir = 4
+ },
+/turf/open/floor/engine{
+ initial_gas_mix = "n2=100;TEMP=80";
+ name = "mainframe floor"
+ },
+/area/tcommsat/server)
"eAZ" = (
/obj/machinery/airalarm{
dir = 8;
@@ -33655,6 +33210,30 @@
/obj/machinery/modular_fabricator/autolathe,
/turf/open/floor/iron/dark,
/area/science/lab)
+"eDa" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/machinery/light{
+ dir = 1
+ },
+/obj/structure/cable/yellow{
+ icon_state = "2-8"
+ },
+/obj/structure/cable/yellow{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 6
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 6
+ },
+/obj/machinery/atmospherics/pipe/simple/general/hidden{
+ dir = 4
+ },
+/turf/open/floor/engine,
+/area/tcommsat/computer)
"eDh" = (
/obj/structure/chair/fancy/bench/pew/right{
dir = 8
@@ -34818,6 +34397,28 @@
},
/turf/open/floor/iron/dark,
/area/crew_quarters/bar/atrium)
+"eUA" = (
+/obj/effect/turf_decal/stripes/line,
+/obj/effect/turf_decal/stripes/corner{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes/corner{
+ dir = 4
+ },
+/obj/structure/cable/yellow{
+ icon_state = "1-4"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 5
+ },
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
+ dir = 5
+ },
+/turf/open/floor/engine{
+ initial_gas_mix = "n2=100;TEMP=80";
+ name = "mainframe floor"
+ },
+/area/tcommsat/server)
"eUR" = (
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
/obj/structure/disposalpipe/segment{
@@ -35035,32 +34636,6 @@
burnt = 1
},
/area/maintenance/port/fore)
-"eYq" = (
-/obj/machinery/light_switch{
- name = "Control Room light switch";
- pixel_x = -20;
- pixel_y = -5
- },
-/obj/machinery/power/apc{
- areastring = "/area/tcommsat/computer";
- name = "Telecomms Monitoring APC";
- pixel_y = -24
- },
-/obj/effect/turf_decal/bot,
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/cable/yellow,
-/obj/effect/turf_decal/tile/neutral/half/contrasted,
-/obj/machinery/light_switch/tcomms{
- pixel_x = -20;
- pixel_y = 5
- },
-/obj/machinery/atmospherics/components/unary/portables_connector{
- dir = 4
- },
-/obj/machinery/portable_atmospherics/canister/plasma,
-/obj/effect/mapping_helpers/atmos_auto_connect,
-/turf/open/floor/iron/dark,
-/area/tcommsat/computer)
"eYR" = (
/obj/structure/chair/office/light{
dir = 8
@@ -35227,6 +34802,33 @@
broken = 1
},
/area/quartermaster/warehouse)
+"fdn" = (
+/obj/effect/turf_decal/caution{
+ dir = 8
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/cobweb/cobweb2,
+/obj/effect/turf_decal/stripes/corner{
+ dir = 1
+ },
+/obj/structure/sign/warning/explosives{
+ pixel_y = 31
+ },
+/obj/machinery/camera/autoname,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
+ dir = 8
+ },
+/turf/open/floor/iron/showroomfloor,
+/area/maintenance/department/science)
"fdJ" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -35801,6 +35403,23 @@
},
/turf/open/floor/iron/dark,
/area/ai_monitored/storage/satellite)
+"flF" = (
+/obj/machinery/telecomms/broadcaster/preset_exploration,
+/obj/effect/turf_decal/box,
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple,
+/turf/open/floor/circuit/green/telecomms/mainframe,
+/area/quartermaster/exploration_prep)
+"flR" = (
+/obj/effect/turf_decal/box,
+/obj/machinery/power/solar{
+ id = "aftport";
+ name = "Aft-Port Solar Array"
+ },
+/obj/structure/cable{
+ icon_state = "0-4"
+ },
+/turf/open/floor/iron/solarpanel/airless,
+/area/solar/port/aft)
"flU" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
dir = 4
@@ -38558,6 +38177,20 @@
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
/turf/open/floor/iron,
/area/engine/break_room)
+"giz" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 6
+ },
+/obj/machinery/airalarm{
+ dir = 1;
+ pixel_y = -22
+ },
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+ dir = 8
+ },
+/obj/machinery/space_heater,
+/turf/open/floor/engine,
+/area/tcommsat/computer)
"giB" = (
/obj/structure/mopbucket,
/obj/item/reagent_containers/glass/bucket,
@@ -39432,12 +39065,6 @@
burnt = 1
},
/area/maintenance/starboard)
-"gzx" = (
-/obj/machinery/telecomms/broadcaster/preset_exploration,
-/obj/effect/turf_decal/box,
-/obj/machinery/atmospherics/pipe/heat_exchanging/simple,
-/turf/open/floor/circuit/green/telecomms/mainframe,
-/area/quartermaster/exploration_prep)
"gzN" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/stripes/corner{
@@ -39633,6 +39260,20 @@
/obj/machinery/door/poddoor/incinerator_atmos_aux,
/turf/open/floor/engine/vacuum,
/area/maintenance/disposal/incinerator)
+"gFf" = (
+/obj/effect/turf_decal/box,
+/obj/structure/cable/yellow{
+ icon_state = "1-2"
+ },
+/obj/machinery/advanced_airlock_controller{
+ dir = 8;
+ pixel_x = 24
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/general/hidden,
+/turf/open/floor/engine,
+/area/tcommsat/computer)
"gFh" = (
/obj/structure/lattice/catwalk,
/obj/structure/cable{
@@ -41478,6 +41119,17 @@
},
/turf/open/floor/iron/showroomfloor,
/area/medical/chemistry)
+"hkR" = (
+/obj/effect/turf_decal/box,
+/obj/machinery/power/solar{
+ id = "foreport";
+ name = "Fore-Port Solar Array"
+ },
+/obj/structure/cable{
+ icon_state = "0-4"
+ },
+/turf/open/floor/iron/solarpanel/airless,
+/area/solar/port/fore)
"hkY" = (
/obj/effect/turf_decal/stripes/corner,
/obj/machinery/airalarm{
@@ -44202,6 +43854,14 @@
/obj/effect/turf_decal/tile/neutral/half/contrasted,
/turf/open/floor/iron/dark,
/area/engine/break_room)
+"ieg" = (
+/obj/machinery/power/tracker,
+/obj/effect/turf_decal/box,
+/obj/structure/cable{
+ icon_state = "0-8"
+ },
+/turf/open/floor/iron/solarpanel/airless,
+/area/solar/starboard/fore)
"ieY" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -44602,6 +44262,25 @@
/obj/effect/turf_decal/tile/blue/half/contrasted,
/turf/open/floor/iron/showroomfloor,
/area/medical/surgery)
+"ilp" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes/corner,
+/obj/effect/turf_decal/stripes/corner{
+ dir = 8
+ },
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 8
+ },
+/turf/open/floor/engine{
+ initial_gas_mix = "n2=100;TEMP=80";
+ name = "mainframe floor"
+ },
+/area/tcommsat/server)
"ils" = (
/obj/effect/turf_decal/delivery,
/obj/machinery/vending/wardrobe/hydro_wardrobe,
@@ -48555,6 +48234,28 @@
},
/turf/open/floor/iron,
/area/engine/engineering)
+"juR" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes/corner,
+/obj/effect/turf_decal/stripes/corner{
+ dir = 8
+ },
+/obj/structure/cable/yellow{
+ icon_state = "2-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 10
+ },
+/obj/machinery/atmospherics/pipe/heat_exchanging/manifold{
+ dir = 1
+ },
+/turf/open/floor/engine{
+ initial_gas_mix = "n2=100;TEMP=80";
+ name = "mainframe floor"
+ },
+/area/tcommsat/server)
"jve" = (
/obj/structure/rack,
/obj/effect/turf_decal/bot,
@@ -50481,6 +50182,25 @@
burnt = 1
},
/area/maintenance/port/fore)
+"jZY" = (
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/engineering/glass{
+ name = "Server Room";
+ req_access_txt = "61"
+ },
+/obj/structure/cable/yellow{
+ icon_state = "1-2"
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/heat_exchanging/junction{
+ dir = 1
+ },
+/turf/open/floor/engine,
+/area/tcommsat/server)
"kal" = (
/obj/effect/landmark/event_spawn,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
@@ -50498,23 +50218,6 @@
/obj/effect/turf_decal/tile/neutral/half/contrasted,
/turf/open/floor/iron/dark,
/area/chapel/office)
-"kaA" = (
-/obj/structure/table,
-/obj/machinery/firealarm{
- dir = 4;
- pixel_x = -26
- },
-/obj/item/clipboard{
- pixel_x = 4
- },
-/obj/effect/decal/cleanable/cobweb,
-/obj/item/book/manual/wiki/tcomms,
-/obj/item/radio,
-/obj/effect/turf_decal/tile/neutral,
-/obj/item/storage/toolbox/mechanical,
-/obj/item/multitool,
-/turf/open/floor/iron/dark,
-/area/tcommsat/computer)
"kaO" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/obj/item/clothing/neck/stethoscope{
@@ -51440,6 +51143,15 @@
},
/turf/open/floor/iron/showroomfloor,
/area/science/explab)
+"ktR" = (
+/obj/effect/turf_decal/box,
+/obj/machinery/atmospherics/components/unary/portables_connector{
+ dir = 1
+ },
+/obj/machinery/portable_atmospherics/canister/plasma,
+/obj/effect/mapping_helpers/atmos_auto_connect,
+/turf/open/floor/iron/dark,
+/area/maintenance/department/science)
"ktS" = (
/turf/closed/wall,
/area/science/shuttledock)
@@ -52115,14 +51827,6 @@
/obj/effect/turf_decal/bot,
/turf/open/floor/plating,
/area/maintenance/aft)
-"kHf" = (
-/obj/machinery/power/tracker,
-/obj/effect/turf_decal/box,
-/obj/structure/cable{
- icon_state = "0-8"
- },
-/turf/open/floor/iron/airless/solarpanel,
-/area/solar/starboard/fore)
"kHg" = (
/obj/machinery/portable_atmospherics/pump,
/obj/effect/turf_decal/bot,
@@ -52201,6 +51905,17 @@
burnt = 1
},
/area/maintenance/port/aft)
+"kJA" = (
+/obj/effect/turf_decal/box,
+/obj/machinery/power/solar{
+ id = "forestarboard";
+ name = "Fore-Starboard Solar Array"
+ },
+/obj/structure/cable{
+ icon_state = "0-4"
+ },
+/turf/open/floor/iron/solarpanel/airless,
+/area/solar/starboard/fore)
"kJI" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/disposalpipe/segment{
@@ -52269,6 +51984,17 @@
/obj/effect/turf_decal/tile/neutral/opposingcorners,
/turf/open/floor/iron/dark,
/area/crew_quarters/bar)
+"kLG" = (
+/obj/machinery/power/solar{
+ id = "aftstarboard";
+ name = "Aft-Starboard Solar Array"
+ },
+/obj/effect/turf_decal/box,
+/obj/structure/cable{
+ icon_state = "0-8"
+ },
+/turf/open/floor/iron/solarpanel/airless,
+/area/solar/starboard/aft)
"kLS" = (
/obj/structure/cable/yellow{
icon_state = "1-2"
@@ -52489,6 +52215,14 @@
/obj/structure/cable/yellow,
/turf/open/floor/plating,
/area/security/checkpoint/medical)
+"kRC" = (
+/obj/machinery/power/tracker,
+/obj/effect/turf_decal/box,
+/obj/structure/cable{
+ icon_state = "0-4"
+ },
+/turf/open/floor/iron/solarpanel/airless,
+/area/space/nearstation)
"kRJ" = (
/obj/effect/turf_decal/stripes/corner{
dir = 4
@@ -53636,6 +53370,24 @@
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
/turf/open/floor/iron,
/area/hallway/primary/starboard)
+"ljJ" = (
+/obj/effect/turf_decal/stripes/corner{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes/corner{
+ dir = 4
+ },
+/obj/effect/turf_decal/stripes/corner,
+/obj/structure/cable/yellow{
+ icon_state = "1-8"
+ },
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/general/hidden{
+ dir = 9
+ },
+/turf/open/floor/engine,
+/area/tcommsat/computer)
"ljR" = (
/obj/structure/closet/emcloset/anchored,
/obj/machinery/light/small{
@@ -54075,14 +53827,6 @@
burnt = 1
},
/area/maintenance/fore)
-"lqU" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/heat_exchanging/simple,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/turf/open/floor/iron/dark/telecomms,
-/area/quartermaster/exploration_prep)
"lrk" = (
/obj/machinery/atmospherics/pipe/manifold/yellow/visible{
dir = 4
@@ -56616,6 +56360,21 @@
/obj/item/pickaxe,
/turf/open/floor/plating/asteroid/airless,
/area/space/nearstation)
+"mkh" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 9
+ },
+/obj/structure/chair/office{
+ dir = 1
+ },
+/obj/structure/cable/yellow{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/manifold/general/hidden{
+ dir = 1
+ },
+/turf/open/floor/engine,
+/area/tcommsat/computer)
"mkn" = (
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
@@ -58525,6 +58284,20 @@
/obj/effect/turf_decal/tile/neutral/anticorner/contrasted,
/turf/open/floor/iron/dark,
/area/hydroponics)
+"mRU" = (
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/engineering/glass{
+ name = "Server Room";
+ req_access_txt = "61"
+ },
+/obj/structure/cable/yellow{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/general/hidden,
+/turf/open/floor/iron/dark,
+/area/tcommsat/computer)
"mRV" = (
/obj/effect/turf_decal/stripes/corner{
dir = 1
@@ -58786,6 +58559,23 @@
},
/turf/open/floor/iron/dark,
/area/lawoffice)
+"mXT" = (
+/obj/effect/turf_decal/stripes/corner,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/turf_decal/stripes/line{
+ dir = 9
+ },
+/obj/machinery/atmospherics/pipe/heat_exchanging/manifold{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 10
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
+/turf/open/floor/iron/dark/telecomms,
+/area/quartermaster/exploration_prep)
"mYg" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
@@ -59931,6 +59721,18 @@
},
/turf/open/floor/prison,
/area/security/prison)
+"nuz" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 10
+ },
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/general/hidden{
+ dir = 9
+ },
+/turf/open/floor/engine,
+/area/tcommsat/computer)
"nuA" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
@@ -60518,6 +60320,23 @@
},
/turf/open/floor/iron,
/area/engine/engineering)
+"nFw" = (
+/obj/structure/table,
+/obj/machinery/firealarm{
+ dir = 4;
+ pixel_x = -26
+ },
+/obj/item/clipboard{
+ pixel_x = 4
+ },
+/obj/effect/decal/cleanable/cobweb,
+/obj/item/book/manual/wiki/tcomms,
+/obj/item/radio,
+/obj/effect/turf_decal/tile/neutral,
+/obj/item/storage/toolbox/mechanical,
+/obj/item/multitool,
+/turf/open/floor/iron/dark,
+/area/tcommsat/computer)
"nFE" = (
/obj/effect/turf_decal/stripes/corner{
dir = 4
@@ -61566,14 +61385,6 @@
/obj/effect/turf_decal/tile/red,
/turf/open/floor/iron,
/area/security/main)
-"nWL" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/stripes/corner{
- dir = 4
- },
-/obj/effect/turf_decal/tile/purple/half/contrasted,
-/turf/open/floor/iron/showroomfloor,
-/area/maintenance/department/science)
"nWN" = (
/obj/effect/turf_decal/tile/yellow/half/contrasted{
dir = 1
@@ -62277,25 +62088,6 @@
},
/turf/open/floor/iron/dark,
/area/bridge)
-"ogM" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
- dir = 4
- },
-/obj/structure/cable/yellow{
- icon_state = "1-2"
- },
-/obj/effect/turf_decal/tile/purple/half/contrasted{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
- dir = 9
- },
-/turf/open/floor/iron/showroomfloor,
-/area/maintenance/department/science)
"ogW" = (
/turf/closed/wall/r_wall,
/area/security/prison{
@@ -62583,6 +62375,27 @@
},
/turf/open/floor/iron/dark,
/area/medical/morgue)
+"omd" = (
+/obj/effect/turf_decal/stripes/corner{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes/corner{
+ dir = 4
+ },
+/obj/effect/turf_decal/stripes/line,
+/obj/structure/cable/yellow{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple,
+/turf/open/floor/engine{
+ initial_gas_mix = "n2=100;TEMP=80";
+ name = "mainframe floor"
+ },
+/area/tcommsat/server)
"omi" = (
/obj/effect/landmark/event_spawn,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
@@ -63253,12 +63066,6 @@
},
/turf/open/floor/iron/showroomfloor,
/area/medical/surgery)
-"oyI" = (
-/obj/machinery/telecomms/receiver/preset_exploration,
-/obj/effect/turf_decal/box,
-/obj/machinery/atmospherics/pipe/heat_exchanging/simple,
-/turf/open/floor/circuit/green/telecomms/mainframe,
-/area/quartermaster/exploration_prep)
"oyV" = (
/obj/machinery/airalarm{
dir = 8;
@@ -63315,6 +63122,20 @@
broken = 1
},
/area/maintenance/aft)
+"ozG" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable/yellow{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/effect/turf_decal/tile/purple/half/contrasted{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+ dir = 8
+ },
+/turf/open/floor/iron/showroomfloor,
+/area/maintenance/department/science)
"oAA" = (
/obj/effect/turf_decal/loading_area,
/obj/effect/turf_decal/stripes/line{
@@ -64011,25 +63832,6 @@
initial_gas_mix = "o2=14;n2=23;TEMP=300"
},
/area/maintenance/port/aft)
-"oOn" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/obj/effect/turf_decal/stripes/corner,
-/obj/effect/turf_decal/stripes/corner{
- dir = 8
- },
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 8
- },
-/turf/open/floor/engine{
- initial_gas_mix = "n2=100;TEMP=80";
- name = "mainframe floor"
- },
-/area/tcommsat/server)
"oOW" = (
/obj/effect/turf_decal/tile/red/half/contrasted,
/obj/effect/turf_decal/stripes/corner,
@@ -64485,29 +64287,6 @@
/obj/effect/turf_decal/tile/purple/half/contrasted,
/turf/open/floor/iron/showroomfloor,
/area/science/xenobiology)
-"oXt" = (
-/obj/machinery/camera{
- c_tag = "Telecomms Monitoring";
- dir = 4;
- name = "telecomms camera";
- network = list("ss13","tcomms")
- },
-/obj/machinery/requests_console{
- announcementConsole = 1;
- department = "Telecomms Admin";
- departmentType = 5;
- name = "Telecomms RC";
- pixel_x = -32
- },
-/obj/structure/cable/yellow{
- icon_state = "2-4"
- },
-/obj/effect/turf_decal/tile/neutral/half/contrasted,
-/obj/machinery/atmospherics/components/unary/thermomachine/freezer/on{
- dir = 4
- },
-/turf/open/floor/iron/dark,
-/area/tcommsat/computer)
"oXu" = (
/obj/machinery/atmospherics/pipe/manifold/supply/visible{
dir = 1
@@ -65085,6 +64864,29 @@
},
/turf/open/floor/iron,
/area/quartermaster/storage)
+"peE" = (
+/obj/machinery/camera{
+ c_tag = "Telecomms Monitoring";
+ dir = 4;
+ name = "telecomms camera";
+ network = list("ss13","tcomms")
+ },
+/obj/machinery/requests_console{
+ announcementConsole = 1;
+ department = "Telecomms Admin";
+ departmentType = 5;
+ name = "Telecomms RC";
+ pixel_x = -32
+ },
+/obj/structure/cable/yellow{
+ icon_state = "2-4"
+ },
+/obj/effect/turf_decal/tile/neutral/half/contrasted,
+/obj/machinery/atmospherics/components/unary/thermomachine/freezer/on{
+ dir = 4
+ },
+/turf/open/floor/iron/dark,
+/area/tcommsat/computer)
"peO" = (
/obj/structure/table/wood,
/obj/machinery/light/small{
@@ -66840,20 +66642,6 @@
},
/turf/closed/wall,
/area/medical/storage)
-"pDW" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/cable/yellow{
- icon_state = "1-2"
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/effect/turf_decal/tile/purple/half/contrasted{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
- dir = 8
- },
-/turf/open/floor/iron/showroomfloor,
-/area/maintenance/department/science)
"pEh" = (
/obj/structure/sign/warning/securearea,
/turf/closed/wall/r_wall,
@@ -68387,6 +68175,24 @@
},
/turf/open/floor/iron,
/area/hallway/primary/central)
+"qhq" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/obj/machinery/camera/autoname{
+ dir = 5
+ },
+/obj/effect/turf_decal/stripes/corner{
+ dir = 1
+ },
+/obj/machinery/airalarm/server{
+ dir = 4;
+ pixel_x = -28
+ },
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/turf/open/floor/iron/dark/telecomms,
+/area/quartermaster/exploration_prep)
"qhM" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/cable/yellow{
@@ -68556,6 +68362,13 @@
},
/turf/open/floor/engine/vacuum,
/area/maintenance/disposal/incinerator)
+"qks" = (
+/obj/effect/turf_decal/tile/purple/half/contrasted,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+ dir = 8
+ },
+/turf/open/floor/iron/showroomfloor,
+/area/maintenance/department/science)
"qlg" = (
/obj/effect/turf_decal/delivery,
/obj/machinery/space_heater,
@@ -70729,20 +70542,6 @@
},
/turf/open/floor/iron,
/area/bridge)
-"qYK" = (
-/obj/effect/turf_decal/stripes/line,
-/obj/effect/turf_decal/stripes/corner{
- dir = 4
- },
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
- dir = 5
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 5
- },
-/turf/open/floor/iron/dark/telecomms,
-/area/quartermaster/exploration_prep)
"qYQ" = (
/obj/effect/turf_decal/stripes/corner{
dir = 1
@@ -72588,6 +72387,22 @@
},
/turf/open/floor/iron/dark,
/area/maintenance/starboard/fore)
+"rGq" = (
+/obj/effect/turf_decal/stripes/corner,
+/obj/effect/turf_decal/stripes/corner{
+ dir = 8
+ },
+/obj/structure/cable/yellow{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+ dir = 4
+ },
+/turf/open/floor/engine,
+/area/tcommsat/computer)
"rGy" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/door/poddoor/preopen{
@@ -74988,23 +74803,6 @@
},
/turf/open/floor/iron,
/area/hallway/secondary/exit/departure_lounge)
-"sxa" = (
-/obj/effect/turf_decal/stripes/line,
-/obj/effect/turf_decal/stripes/corner{
- dir = 1
- },
-/obj/machinery/light/small{
- dir = 4
- },
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
- dir = 9
- },
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
- dir = 8
- },
-/turf/open/floor/iron/dark/telecomms,
-/area/quartermaster/exploration_prep)
"sxb" = (
/obj/structure/disposalpipe/sorting/mail{
dir = 4;
@@ -75145,6 +74943,32 @@
},
/turf/open/floor/iron/dark,
/area/science/research)
+"syO" = (
+/obj/machinery/light_switch{
+ name = "Control Room light switch";
+ pixel_x = -20;
+ pixel_y = -5
+ },
+/obj/machinery/power/apc{
+ areastring = "/area/tcommsat/computer";
+ name = "Telecomms Monitoring APC";
+ pixel_y = -24
+ },
+/obj/effect/turf_decal/bot,
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable/yellow,
+/obj/effect/turf_decal/tile/neutral/half/contrasted,
+/obj/machinery/light_switch/tcomms{
+ pixel_x = -20;
+ pixel_y = 5
+ },
+/obj/machinery/atmospherics/components/unary/portables_connector{
+ dir = 4
+ },
+/obj/machinery/portable_atmospherics/canister/plasma,
+/obj/effect/mapping_helpers/atmos_auto_connect,
+/turf/open/floor/iron/dark,
+/area/tcommsat/computer)
"syT" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
@@ -76367,6 +76191,25 @@
/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/prison,
/area/security/prison)
+"sVp" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes/corner{
+ dir = 8
+ },
+/obj/machinery/light/small{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
+ dir = 10
+ },
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+ dir = 8
+ },
+/turf/open/floor/iron/dark/telecomms,
+/area/quartermaster/exploration_prep)
"sVy" = (
/obj/structure/cable/yellow{
icon_state = "2-8"
@@ -77665,6 +77508,23 @@
},
/turf/open/floor/iron/dark,
/area/construction/mining/aux_base)
+"trh" = (
+/obj/machinery/door/airlock/hatch{
+ name = "Exploration Telecommunications";
+ req_access_txt = "61"
+ },
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/atmospherics/pipe/heat_exchanging/junction{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
+/turf/open/floor/iron/dark/telecomms,
+/area/quartermaster/exploration_prep)
"trO" = (
/obj/effect/turf_decal/tile/black/fourcorners,
/obj/effect/turf_decal/stripes/line{
@@ -77861,6 +77721,17 @@
/obj/effect/turf_decal/tile/neutral/opposingcorners,
/turf/open/floor/iron,
/area/hallway/primary/central)
+"tuD" = (
+/obj/effect/turf_decal/box,
+/obj/machinery/power/solar{
+ id = "aftport";
+ name = "Aft-Port Solar Array"
+ },
+/obj/structure/cable{
+ icon_state = "0-8"
+ },
+/turf/open/floor/iron/solarpanel/airless,
+/area/solar/port/aft)
"tuX" = (
/obj/machinery/light_switch{
pixel_x = 24;
@@ -78990,6 +78861,23 @@
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
/turf/open/floor/iron,
/area/hallway/primary/fore)
+"tPd" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes/line,
+/obj/machinery/status_display/ai{
+ pixel_x = 32;
+ pixel_y = 32
+ },
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+ dir = 8
+ },
+/turf/open/floor/engine{
+ initial_gas_mix = "n2=100;TEMP=80";
+ name = "mainframe floor"
+ },
+/area/tcommsat/server)
"tPn" = (
/turf/open/floor/plating{
burnt = 1
@@ -80025,6 +79913,14 @@
/obj/item/pen,
/turf/open/floor/wood,
/area/security/prison)
+"ukR" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/stripes/corner{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/purple/half/contrasted,
+/turf/open/floor/iron/showroomfloor,
+/area/maintenance/department/science)
"ulf" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -80276,6 +80172,19 @@
burnt = 1
},
/area/maintenance/starboard/aft)
+"uqg" = (
+/obj/effect/turf_decal/stripes/line,
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+ dir = 8
+ },
+/turf/open/floor/engine{
+ initial_gas_mix = "n2=100;TEMP=80";
+ name = "mainframe floor"
+ },
+/area/tcommsat/server)
"uqj" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
@@ -81527,6 +81436,20 @@
/obj/item/clothing/head/cone,
/turf/open/floor/plating/airless,
/area/space/nearstation)
+"uLJ" = (
+/obj/effect/turf_decal/stripes/line,
+/obj/effect/turf_decal/stripes/corner{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
+ dir = 5
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 5
+ },
+/turf/open/floor/iron/dark/telecomms,
+/area/quartermaster/exploration_prep)
"uLL" = (
/obj/structure/table/reinforced,
/obj/item/assembly/timer{
@@ -81765,15 +81688,6 @@
},
/turf/open/floor/iron/dark,
/area/engine/break_room)
-"uQa" = (
-/obj/effect/turf_decal/box,
-/obj/machinery/atmospherics/components/unary/portables_connector{
- dir = 1
- },
-/obj/machinery/portable_atmospherics/canister/plasma,
-/obj/effect/mapping_helpers/atmos_auto_connect,
-/turf/open/floor/iron/dark,
-/area/maintenance/department/science)
"uQc" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
@@ -82147,6 +82061,23 @@
broken = 1
},
/area/maintenance/central)
+"uXH" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/structure/cable/yellow{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple,
+/turf/open/floor/engine{
+ initial_gas_mix = "n2=100;TEMP=80";
+ name = "mainframe floor"
+ },
+/area/tcommsat/server)
"uXI" = (
/obj/structure/closet/emcloset,
/obj/effect/turf_decal/delivery,
@@ -83671,6 +83602,22 @@
},
/turf/open/floor/iron,
/area/engine/break_room)
+"vvS" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/manifold/cyan/hidden{
+ dir = 8
+ },
+/turf/open/floor/iron/dark,
+/area/maintenance/department/science)
"vvV" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
@@ -83728,28 +83675,6 @@
/area/security/checkpoint/auxiliary{
name = "Security Aft"
})
-"vwx" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/cable/yellow{
- icon_state = "1-2"
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/obj/effect/turf_decal/tile/purple/half/contrasted{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
- dir = 6
- },
-/turf/open/floor/iron/showroomfloor,
-/area/maintenance/department/science)
"vwM" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -84733,6 +84658,28 @@
burnt = 1
},
/area/maintenance/starboard/fore)
+"vLs" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes/corner,
+/obj/effect/turf_decal/stripes/corner{
+ dir = 8
+ },
+/obj/structure/cable/yellow{
+ icon_state = "2-4"
+ },
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
+ dir = 6
+ },
+/turf/open/floor/engine{
+ initial_gas_mix = "n2=100;TEMP=80";
+ name = "mainframe floor"
+ },
+/area/tcommsat/server)
"vLu" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/girder/displaced,
@@ -85111,19 +85058,6 @@
/area/security/checkpoint/auxiliary{
name = "Security Aft"
})
-"vTf" = (
-/obj/effect/turf_decal/stripes/line,
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
- dir = 8
- },
-/turf/open/floor/engine{
- initial_gas_mix = "n2=100;TEMP=80";
- name = "mainframe floor"
- },
-/area/tcommsat/server)
"vTt" = (
/obj/machinery/door/airlock/highsecurity,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
@@ -85149,6 +85083,28 @@
dir = 4
},
/area/hallway/primary/port)
+"vTw" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable/yellow{
+ icon_state = "1-2"
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/purple/half/contrasted{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
+ dir = 6
+ },
+/turf/open/floor/iron/showroomfloor,
+/area/maintenance/department/science)
"vTy" = (
/obj/structure/table,
/obj/item/paper_bin{
@@ -86585,6 +86541,22 @@
/obj/effect/turf_decal/tile/neutral/half/contrasted,
/turf/open/floor/iron/dark,
/area/teleporter)
+"wos" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple,
+/turf/open/floor/engine{
+ initial_gas_mix = "n2=100;TEMP=80";
+ name = "mainframe floor"
+ },
+/area/tcommsat/server)
"wou" = (
/obj/structure/chair/fancy/sofa/old/right{
color = "#742925"
@@ -88767,19 +88739,6 @@
},
/turf/open/floor/iron,
/area/hallway/primary/port)
-"wXy" = (
-/obj/effect/turf_decal/stripes/line,
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
- dir = 4
- },
-/turf/open/floor/engine{
- initial_gas_mix = "n2=100;TEMP=80";
- name = "mainframe floor"
- },
-/area/tcommsat/server)
"wXD" = (
/obj/structure/table,
/obj/item/stack/medical/gauze,
@@ -90051,6 +90010,17 @@
},
/turf/open/floor/iron/showroomfloor,
/area/science/shuttledock)
+"xtP" = (
+/obj/machinery/power/solar{
+ id = "aftstarboard";
+ name = "Aft-Starboard Solar Array"
+ },
+/obj/effect/turf_decal/box,
+/obj/structure/cable{
+ icon_state = "0-4"
+ },
+/turf/open/floor/iron/solarpanel/airless,
+/area/solar/starboard/aft)
"xtZ" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
@@ -91399,6 +91369,14 @@
},
/turf/open/floor/iron/dark,
/area/chapel/office)
+"xTk" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/turf/open/floor/iron/dark/telecomms,
+/area/quartermaster/exploration_prep)
"xTB" = (
/obj/machinery/computer/med_data{
dir = 8
@@ -91713,6 +91691,28 @@
dir = 1
},
/area/maintenance/aft)
+"xZy" = (
+/obj/effect/turf_decal/stripes/line,
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/machinery/power/terminal{
+ dir = 1
+ },
+/obj/structure/cable/yellow{
+ icon_state = "0-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
+ dir = 4
+ },
+/turf/open/floor/engine{
+ initial_gas_mix = "n2=100;TEMP=80";
+ name = "mainframe floor"
+ },
+/area/tcommsat/server)
"xZz" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/security/glass{
@@ -102864,7 +102864,7 @@ koJ
aaa
acm
aaa
-aoi
+kRC
aaa
aeo
aeo
@@ -103305,7 +103305,7 @@ aeo
aeo
acm
aaQ
-aoi
+kRC
acm
acm
coy
@@ -103373,17 +103373,17 @@ aeu
aeu
coy
cmU
-clc
-clc
-clc
-clc
-clc
+flR
+flR
+flR
+flR
+flR
bDa
-clc
-clc
-clc
-clc
-clc
+flR
+flR
+flR
+flR
+flR
acm
aeo
aaa
@@ -103814,17 +103814,17 @@ aeo
aaa
aaQ
acm
-ahS
-ahS
-ahS
-amK
-ahS
+hkR
+hkR
+hkR
+dYH
+hkR
ade
-ahS
-ahS
-ahS
-ahS
-ahS
+hkR
+hkR
+hkR
+hkR
+hkR
cmU
aeU
aeu
@@ -103887,17 +103887,17 @@ aeU
aeU
aeU
cmU
-cra
-cra
-cra
-cra
-cra
+tuD
+tuD
+tuD
+tuD
+tuD
ckj
-cra
-cra
-cra
-cra
-cra
+tuD
+tuD
+tuD
+tuD
+tuD
acm
acm
aeo
@@ -104328,17 +104328,17 @@ aeo
aaa
aaQ
acm
-akO
-akO
-akO
-akO
-akO
+aRv
+aRv
+aRv
+aRv
+aRv
ctE
-akO
-akO
-akO
-akO
-akO
+aRv
+aRv
+aRv
+aRv
+aRv
cmU
aeU
aeU
@@ -104400,19 +104400,19 @@ aUz
aeU
aeU
cmU
-clc
-clc
-clc
-clc
-clc
+flR
+flR
+flR
+flR
+flR
ckj
ckj
ckj
-clc
-clc
-clc
-clc
-clc
+flR
+flR
+flR
+flR
+flR
acm
aeo
aaa
@@ -104841,19 +104841,19 @@ acm
aeo
aaa
cmU
-ahS
-ahS
-ahS
-ahS
-ahS
+hkR
+hkR
+hkR
+hkR
+hkR
cFs
ctE
ctE
-ahS
-ahS
-ahS
-ahS
-ahS
+hkR
+hkR
+hkR
+hkR
+hkR
cmU
aeU
aeU
@@ -104914,19 +104914,19 @@ aeU
aeU
aeU
cmU
-cra
-cra
-cra
-cra
-cra
+tuD
+tuD
+tuD
+tuD
+tuD
ckj
ckj
ckj
-cra
-cra
-cra
-cra
-cra
+tuD
+tuD
+tuD
+tuD
+tuD
acm
acm
aaa
@@ -105355,19 +105355,19 @@ aaa
aaQ
aeU
cmU
-akO
-akO
-akO
-akO
-akO
+aRv
+aRv
+aRv
+aRv
+aRv
ctE
ctE
ctE
-akO
-akO
-akO
-akO
-akO
+aRv
+aRv
+aRv
+aRv
+aRv
cmU
aeU
aeu
@@ -105429,17 +105429,17 @@ ajd
ajd
ajd
cmU
-clc
-clc
-clc
-clc
-clc
+flR
+flR
+flR
+flR
+flR
ckj
-clc
-clc
-clc
-clc
-clc
+flR
+flR
+flR
+flR
+flR
cmU
aaa
aeo
@@ -105870,17 +105870,17 @@ aeu
aeU
aeU
cmU
-ahS
-ahS
-ahS
-ahS
-ahS
+hkR
+hkR
+hkR
+hkR
+hkR
ctE
-ahS
-ahS
-ahS
-ahS
-ahS
+hkR
+hkR
+hkR
+hkR
+hkR
cmU
aeU
aeU
@@ -105943,17 +105943,17 @@ clt
cmf
sUA
cmU
-cra
-cra
-cra
-cra
-cra
+tuD
+tuD
+tuD
+tuD
+tuD
ckj
-cra
-cra
-cra
-cra
-cra
+tuD
+tuD
+tuD
+tuD
+tuD
cmU
aUz
acm
@@ -106384,17 +106384,17 @@ aeu
aeu
aeu
cmU
-akO
-akO
-akO
-akO
-akO
+aRv
+aRv
+aRv
+aRv
+aRv
ctE
-akO
-akO
-akO
-akO
-akO
+aRv
+aRv
+aRv
+aRv
+aRv
cmU
aeu
aeu
@@ -122077,9 +122077,9 @@ cfc
cfp
cfA
aCH
-kaA
-oXt
-eYq
+nFw
+peE
+syO
cfM
dLQ
voT
@@ -122326,17 +122326,17 @@ tkU
agx
ahh
ajP
-cda
+eAX
cdo
cdK
ceO
cfd
-wXy
+cbn
cfB
cNO
pFm
-aRk
-aFZ
+mkh
+nuz
aCV
ppN
tOV
@@ -122583,17 +122583,17 @@ eYj
agA
ajC
aoF
-aAk
-aEZ
-aEZ
-aFa
+vLs
+uXH
+uXH
+eUA
cfe
-cfq
+dtP
aFY
cNQ
aoD
-aRl
-aUS
+eDa
+rGq
aZM
cNJ
moA
@@ -122840,17 +122840,17 @@ pfD
cBc
ahh
asc
-aBh
+xZy
cdq
cdL
-aFD
-aEZ
-aFK
-ceP
-aGb
-aKC
-aRm
-cgt
+juR
+uXH
+omd
+jZY
+gFf
+mRU
+ljJ
+giz
cfM
jen
gGz
@@ -123097,12 +123097,12 @@ irf
agC
ahh
arG
-ayc
-aFX
-aFX
-azA
+cZE
+wos
+wos
+cNC
aBd
-oOn
+ilp
ceQ
cNR
cge
@@ -123354,12 +123354,12 @@ eYj
jng
ahh
ccU
-cdm
+tPd
cdB
cdM
cNK
cfg
-vTf
+uqg
cfF
gOF
ltS
@@ -132335,8 +132335,8 @@ alB
alB
alB
aRK
-air
-uQa
+vvS
+ktR
abv
cmW
abx
@@ -132591,9 +132591,9 @@ nhS
wAI
mFy
abi
-vwx
-ogM
-pDW
+vTw
+bIW
+ozG
eTq
ipS
dmv
@@ -132848,9 +132848,9 @@ iZp
tmh
cEH
aWY
-agv
-nWL
-cWX
+fdn
+ukR
+qks
hSa
hSa
okO
@@ -133105,7 +133105,7 @@ sPa
kvl
uSg
pYn
-agB
+trh
cEm
btR
btR
@@ -133362,10 +133362,10 @@ lNK
rVa
btR
agg
-agD
-abt
-lqU
-qYK
+mXT
+qhq
+xTk
+uLJ
dRT
ayw
fWg
@@ -133619,10 +133619,10 @@ lNK
hSs
btR
feL
-abs
-gzx
-oyI
-sxa
+sVp
+flF
+cpv
+dbr
wcC
uSg
qrk
@@ -134483,17 +134483,17 @@ aeu
aeu
aUz
cmU
-cyg
-cyg
-cyg
-cyg
-cyg
+xtP
+xtP
+xtP
+xtP
+xtP
ckA
-cyg
-cyg
-cyg
-cyg
-cyg
+xtP
+xtP
+xtP
+xtP
+xtP
acm
aeo
aaa
@@ -134997,17 +134997,17 @@ aeu
aeU
cPR
cmU
-czw
-czw
-czw
-czw
-czw
+kLG
+kLG
+kLG
+kLG
+kLG
ckA
-czw
-czw
-czw
-czw
-czw
+kLG
+kLG
+kLG
+kLG
+kLG
acm
aeo
acm
@@ -135510,19 +135510,19 @@ aeu
aeU
aeU
cmU
-cyg
-cyg
-cyg
-cyg
-cyg
+xtP
+xtP
+xtP
+xtP
+xtP
ckA
ckA
ckA
-cyg
-cyg
-cyg
-cyg
-cyg
+xtP
+xtP
+xtP
+xtP
+xtP
acm
aeo
aaa
@@ -136024,19 +136024,19 @@ aaa
acm
aaa
cmU
-czw
-czw
-czw
-czw
-czw
+kLG
+kLG
+kLG
+kLG
+kLG
ckA
ckA
ckA
-czw
-czw
-czw
-czw
-czw
+kLG
+kLG
+kLG
+kLG
+kLG
acm
acm
aaa
@@ -136539,17 +136539,17 @@ aeo
acm
aeo
acm
-cyg
-cyg
-cyg
-cyg
-cyg
+xtP
+xtP
+xtP
+xtP
+xtP
ckA
-cyg
-cyg
-cyg
-cyg
-cyg
+xtP
+xtP
+xtP
+xtP
+xtP
acm
aeo
aeo
@@ -137053,17 +137053,17 @@ aeo
acm
aeo
acm
-czw
-czw
-czw
-czw
-czw
+kLG
+kLG
+kLG
+kLG
+kLG
czr
-czw
-czw
-czw
-czw
-czw
+kLG
+kLG
+kLG
+kLG
+kLG
acm
aaQ
aaa
@@ -137572,7 +137572,7 @@ aeo
aeo
acm
acm
-cPF
+dEx
acm
aaQ
acm
@@ -138764,17 +138764,17 @@ wRr
mMY
bkd
efK
-cGw
-cGw
-cGw
-cGw
-cGw
+kJA
+kJA
+kJA
+kJA
+kJA
cjl
-cGw
-cGw
-cGw
-cGw
-cGw
+kJA
+kJA
+kJA
+kJA
+kJA
cmU
cmU
aeU
@@ -139278,17 +139278,17 @@ bkd
bkd
bkd
aeu
-crj
-crj
-crj
-crj
-crj
+bmz
+bmz
+bmz
+bmz
+bmz
crb
-crj
-crj
-crj
-crj
-crj
+bmz
+bmz
+bmz
+bmz
+bmz
aaa
aeU
aeU
@@ -139791,19 +139791,19 @@ aeu
aeu
aeu
aeu
-cGw
-cGw
-cGw
-cGw
-cGw
+kJA
+kJA
+kJA
+kJA
+kJA
crb
crb
crb
-cGw
-cGw
-cGw
-cGw
-cGw
+kJA
+kJA
+kJA
+kJA
+kJA
aeU
aeU
ktS
@@ -140305,19 +140305,19 @@ aeu
aeu
aeU
cmU
-crj
-crj
-crj
-crj
-crj
+bmz
+bmz
+bmz
+bmz
+bmz
crb
crb
crb
-crj
-crj
-crj
-crj
-crj
+bmz
+bmz
+bmz
+bmz
+bmz
aaa
aeU
ktS
@@ -140820,17 +140820,17 @@ aaa
aeU
aeU
cmU
-cGw
-cGw
-cGw
-cGw
-cGw
+kJA
+kJA
+kJA
+kJA
+kJA
crb
-cGw
-cGw
-cGw
-cGw
-cGw
+kJA
+kJA
+kJA
+kJA
+kJA
aaa
aeU
coy
@@ -141334,17 +141334,17 @@ aaa
aaa
aeU
aeU
-crj
-crj
-crj
-crj
-crj
+bmz
+bmz
+bmz
+bmz
+bmz
fnp
-crj
-crj
-crj
-crj
-crj
+bmz
+bmz
+bmz
+bmz
+bmz
cmU
aeU
aeU
@@ -141853,7 +141853,7 @@ aaa
aaa
aaa
aaa
-kHf
+ieg
aaa
aaa
aaa
diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm
index 28b7c05f29510..30382fda6dde0 100644
--- a/_maps/map_files/MetaStation/MetaStation.dmm
+++ b/_maps/map_files/MetaStation/MetaStation.dmm
@@ -49,16 +49,6 @@
/obj/structure/lattice/catwalk,
/turf/open/space,
/area/solar/port/fore)
-"aal" = (
-/obj/structure/cable{
- icon_state = "0-2"
- },
-/obj/machinery/power/solar{
- id = "foreport";
- name = "Fore-Port Solar Array"
- },
-/turf/open/floor/iron/airless/solarpanel,
-/area/solar/port/fore)
"aam" = (
/obj/structure/cable,
/obj/structure/lattice/catwalk,
@@ -128,14 +118,6 @@
/obj/structure/lattice/catwalk,
/turf/open/space,
/area/solar/port/fore)
-"aau" = (
-/obj/structure/cable,
-/obj/machinery/power/solar{
- id = "foreport";
- name = "Fore-Port Solar Array"
- },
-/turf/open/floor/iron/airless/solarpanel,
-/area/solar/port/fore)
"aav" = (
/turf/open/space,
/area/space)
@@ -304,16 +286,6 @@
/obj/structure/fans/tiny/invisible,
/turf/open/space/basic,
/area/space)
-"abv" = (
-/obj/structure/cable{
- icon_state = "0-2"
- },
-/obj/machinery/power/solar{
- id = "forestarboard";
- name = "Fore-Starboard Solar Array"
- },
-/turf/open/floor/iron/airless/solarpanel,
-/area/solar/starboard/fore)
"abw" = (
/obj/structure/cable,
/obj/structure/lattice/catwalk,
@@ -437,14 +409,6 @@
/obj/structure/lattice/catwalk,
/turf/open/space,
/area/space/nearstation)
-"acl" = (
-/obj/structure/cable,
-/obj/machinery/power/solar{
- id = "forestarboard";
- name = "Fore-Starboard Solar Array"
- },
-/turf/open/floor/iron/airless/solarpanel,
-/area/solar/starboard/fore)
"acm" = (
/obj/effect/turf_decal/stripes/line{
dir = 10
@@ -1549,6 +1513,16 @@
},
/turf/open/floor/iron,
/area/security/brig)
+"alV" = (
+/obj/structure/table/wood,
+/obj/machinery/newscaster{
+ pixel_y = 32
+ },
+/obj/item/folder,
+/obj/item/folder,
+/obj/effect/decal/cleanable/cobweb/cobweb2,
+/turf/open/floor/cult,
+/area/library)
"amb" = (
/obj/machinery/light/small{
dir = 8
@@ -3364,18 +3338,6 @@
},
/turf/open/floor/iron/white,
/area/medical/medbay/lobby)
-"aAz" = (
-/obj/structure/table/wood,
-/obj/item/flashlight/lamp/green{
- pixel_x = 1;
- pixel_y = 5
- },
-/obj/machinery/computer/security/telescreen/entertainment{
- pixel_y = 30
- },
-/obj/effect/decal/cleanable/cobweb,
-/turf/open/floor/iron/cult,
-/area/library)
"aAA" = (
/obj/docking_port/stationary{
dir = 8;
@@ -4303,16 +4265,6 @@
/obj/machinery/atmospherics/pipe/manifold/cyan/visible,
/turf/open/floor/engine,
/area/engine/engineering)
-"aFE" = (
-/obj/structure/table/wood,
-/obj/machinery/newscaster{
- pixel_y = 32
- },
-/obj/item/folder,
-/obj/item/folder,
-/obj/effect/decal/cleanable/cobweb/cobweb2,
-/turf/open/floor/iron/cult,
-/area/library)
"aFK" = (
/obj/machinery/door/poddoor/shutters{
id = "qm_warehouse";
@@ -11695,26 +11647,6 @@
"bwc" = (
/turf/open/floor/carpet/green,
/area/library)
-"bwf" = (
-/obj/structure/table/wood,
-/obj/item/flashlight/lamp/green{
- pixel_x = 1;
- pixel_y = 5
- },
-/obj/machinery/computer/security/telescreen/entertainment{
- pixel_y = 30
- },
-/turf/open/floor/iron/cult,
-/area/library)
-"bwg" = (
-/obj/structure/table/wood,
-/obj/machinery/newscaster{
- pixel_y = 32
- },
-/obj/item/folder,
-/obj/item/folder,
-/turf/open/floor/iron/cult,
-/area/library)
"bwl" = (
/obj/machinery/door/airlock/external{
name = "MiniSat Space Access Airlock";
@@ -11873,15 +11805,6 @@
/obj/effect/landmark/xeno_spawn,
/turf/open/floor/plating,
/area/crew_quarters/toilet/auxiliary)
-"bxW" = (
-/turf/open/floor/iron/cult,
-/area/library)
-"bxX" = (
-/obj/structure/chair/fancy/comfy{
- dir = 1
- },
-/turf/open/floor/iron/cult,
-/area/library)
"bxZ" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/structure/cable/yellow,
@@ -12207,18 +12130,6 @@
},
/turf/open/floor/carpet/green,
/area/library)
-"bzG" = (
-/obj/machinery/door/morgue{
- name = "Study #1"
- },
-/turf/open/floor/iron/cult,
-/area/library)
-"bzH" = (
-/obj/machinery/door/morgue{
- name = "Study #2"
- },
-/turf/open/floor/iron/cult,
-/area/library)
"bzJ" = (
/turf/closed/wall,
/area/hallway/secondary/command)
@@ -12653,17 +12564,6 @@
},
/turf/open/floor/wood,
/area/library)
-"bBG" = (
-/obj/structure/cable/yellow{
- icon_state = "4-8"
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/goonplaque{
- desc = "\"This is a plaque in honour of our comrades on the G4407 Stations. Hopefully TG4407 model can live up to your fame and fortune.\" Scratched in beneath that is a crude image of sentient postcards in a realm of darkness. The station model number is MSv42A-160516"
- },
-/area/hallway/primary/port)
"bBH" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/door/poddoor/preopen{
@@ -19554,16 +19454,6 @@
dir = 8
},
/area/science/server)
-"cue" = (
-/obj/structure/cable{
- icon_state = "0-2"
- },
-/obj/machinery/power/solar{
- id = "aftport";
- name = "Aft-Port Solar Array"
- },
-/turf/open/floor/iron/airless/solarpanel,
-/area/solar/port/aft)
"cuC" = (
/obj/machinery/portable_atmospherics/canister/air,
/obj/effect/spawner/lootdrop/maintenance,
@@ -19756,14 +19646,6 @@
},
/turf/open/floor/circuit/green/telecomms/mainframe,
/area/science/server)
-"cwe" = (
-/obj/structure/cable,
-/obj/machinery/power/solar{
- id = "aftport";
- name = "Aft-Port Solar Array"
- },
-/turf/open/floor/iron/airless/solarpanel,
-/area/solar/port/aft)
"cwA" = (
/turf/open/floor/iron/white,
/area/medical/genetics)
@@ -21261,24 +21143,6 @@
/obj/item/kirbyplants/random,
/turf/open/floor/iron/dark,
/area/medical/morgue)
-"cLZ" = (
-/obj/machinery/door/morgue{
- name = "Relic Closet";
- req_access_txt = "22"
- },
-/turf/open/floor/iron/cult,
-/area/chapel/office)
-"cMa" = (
-/obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/bottle/holywater{
- pixel_x = -2;
- pixel_y = 2
- },
-/obj/item/organ/heart,
-/obj/item/soulstone/anybody/chaplain,
-/obj/item/book/granter/spell/smoke/lesser,
-/turf/open/floor/iron/cult,
-/area/chapel/office)
"cMe" = (
/obj/effect/turf_decal/stripes/corner,
/turf/open/floor/iron,
@@ -22057,12 +21921,6 @@
dir = 1
},
/area/chapel/main)
-"cRF" = (
-/obj/machinery/door/morgue{
- name = "Chapel Garden"
- },
-/turf/open/floor/iron/cult,
-/area/chapel/main)
"cRK" = (
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/iron/dark,
@@ -24033,6 +23891,14 @@
},
/turf/open/floor/plating,
/area/maintenance/department/science/central)
+"diU" = (
+/obj/structure/cable,
+/obj/machinery/power/solar{
+ id = "forestarboard";
+ name = "Fore-Starboard Solar Array"
+ },
+/turf/open/floor/iron/solarpanel/airless,
+/area/solar/starboard/fore)
"djh" = (
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 8
@@ -26229,6 +26095,14 @@
},
/turf/open/floor/iron,
/area/medical/storage)
+"dVN" = (
+/obj/structure/cable,
+/obj/machinery/power/solar{
+ id = "foreport";
+ name = "Fore-Port Solar Array"
+ },
+/turf/open/floor/iron/solarpanel/airless,
+/area/solar/port/fore)
"dWb" = (
/obj/machinery/computer/shuttle_flight/mining{
dir = 4
@@ -31435,6 +31309,14 @@
},
/turf/open/floor/iron,
/area/hallway/primary/fore)
+"fYb" = (
+/obj/structure/cable,
+/obj/machinery/power/solar{
+ id = "aftport";
+ name = "Aft-Port Solar Array"
+ },
+/turf/open/floor/iron/solarpanel/airless,
+/area/solar/port/aft)
"fYo" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 4
@@ -32095,16 +31977,6 @@
"gnd" = (
/turf/closed/wall,
/area/maintenance/department/science/central)
-"gnu" = (
-/obj/structure/cable{
- icon_state = "0-8"
- },
-/obj/machinery/power/solar{
- id = "aftstarboard";
- name = "Aft-Starboard Solar Array"
- },
-/turf/open/floor/iron/airless/solarpanel,
-/area/solar/starboard/aft)
"gnA" = (
/obj/structure/sign/painting/library{
pixel_y = 32
@@ -36289,6 +36161,9 @@
},
/turf/open/floor/iron,
/area/hydroponics/garden)
+"hXg" = (
+/turf/open/floor/cult,
+/area/library)
"hXn" = (
/obj/structure/cable/yellow{
icon_state = "1-2"
@@ -38744,19 +38619,6 @@
},
/turf/open/floor/plating,
/area/maintenance/aft/secondary)
-"iTy" = (
-/obj/machinery/hydroponics/soil{
- pixel_y = 8
- },
-/obj/item/food/grown/flower/harebell,
-/obj/item/food/grown/flower/harebell,
-/obj/item/food/grown/flower/harebell,
-/obj/item/food/grown/flower/harebell,
-/obj/machinery/light/small{
- dir = 1
- },
-/turf/open/floor/iron/cult,
-/area/chapel/main)
"iTz" = (
/obj/structure/disposalpipe/segment{
dir = 1
@@ -41091,6 +40953,13 @@
/obj/effect/decal/cleanable/blood/old,
/turf/open/floor/iron,
/area/maintenance/aft)
+"jRr" = (
+/obj/machinery/door/morgue{
+ name = "Relic Closet";
+ req_access_txt = "22"
+ },
+/turf/open/floor/cult,
+/area/chapel/office)
"jRt" = (
/obj/structure/cable/yellow{
icon_state = "4-8"
@@ -42451,6 +42320,12 @@
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
/turf/open/floor/iron/dark,
/area/crew_quarters/fitness/recreation)
+"ksU" = (
+/obj/machinery/door/morgue{
+ name = "Chapel Garden"
+ },
+/turf/open/floor/cult,
+/area/chapel/main)
"ksZ" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
@@ -45221,6 +45096,12 @@
},
/turf/open/floor/iron,
/area/science/shuttledock)
+"lwO" = (
+/obj/machinery/door/morgue{
+ name = "Study #2"
+ },
+/turf/open/floor/cult,
+/area/library)
"lwX" = (
/obj/effect/landmark/xeno_spawn,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
@@ -45679,6 +45560,29 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/turf/open/floor/iron,
/area/hallway/secondary/exit/departure_lounge)
+"lHA" = (
+/obj/machinery/button/door{
+ id = "Disposal Exit";
+ name = "Disposal Vent Control";
+ pixel_x = -25;
+ pixel_y = 4;
+ req_access_txt = "12"
+ },
+/obj/machinery/button/massdriver{
+ id = "trash";
+ pixel_x = -26;
+ pixel_y = -6
+ },
+/obj/structure/chair/stool,
+/obj/machinery/light/small{
+ dir = 8
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/item/toy/plush/lizard_plushie{
+ name = "Eats-The-Rubbish"
+ },
+/turf/open/floor/iron,
+/area/maintenance/disposal)
"lHH" = (
/obj/machinery/firealarm{
dir = 1;
@@ -46676,6 +46580,18 @@
dir = 1
},
/area/engine/atmos)
+"mbU" = (
+/obj/structure/table/wood,
+/obj/item/flashlight/lamp/green{
+ pixel_x = 1;
+ pixel_y = 5
+ },
+/obj/machinery/computer/security/telescreen/entertainment{
+ pixel_y = 30
+ },
+/obj/effect/decal/cleanable/cobweb,
+/turf/open/floor/cult,
+/area/library)
"mcg" = (
/obj/machinery/light{
dir = 8
@@ -47786,6 +47702,17 @@
/obj/effect/turf_decal/bot,
/turf/open/floor/iron/showroomfloor,
/area/security/main)
+"mzV" = (
+/obj/structure/table/wood,
+/obj/item/flashlight/lamp/green{
+ pixel_x = 1;
+ pixel_y = 5
+ },
+/obj/machinery/computer/security/telescreen/entertainment{
+ pixel_y = 30
+ },
+/turf/open/floor/cult,
+/area/library)
"mAd" = (
/obj/structure/cable/yellow{
icon_state = "4-8"
@@ -49872,6 +49799,16 @@
},
/turf/open/floor/iron/dark,
/area/bridge)
+"nmb" = (
+/obj/structure/cable{
+ icon_state = "0-8"
+ },
+/obj/machinery/power/solar{
+ id = "aftstarboard";
+ name = "Aft-Starboard Solar Array"
+ },
+/turf/open/floor/iron/solarpanel/airless,
+/area/solar/starboard/aft)
"nml" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
@@ -50481,6 +50418,12 @@
/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/iron,
/area/hallway/primary/central)
+"nzy" = (
+/obj/structure/chair/fancy/comfy{
+ dir = 1
+ },
+/turf/open/floor/cult,
+/area/library)
"nzP" = (
/obj/effect/turf_decal/tile/yellow{
dir = 1
@@ -52660,6 +52603,17 @@
},
/turf/open/floor/wood,
/area/bridge/showroom/corporate)
+"olM" = (
+/obj/structure/cable/yellow{
+ icon_state = "4-8"
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/open/floor/iron/goonplaque{
+ desc = "\"This is a plaque in honour of our comrades on the G4407 Stations. Hopefully TG4407 model can live up to your fame and fortune.\" Scratched in beneath that is a crude image of sentient postcards in a realm of darkness. The station model number is MSv42A-160516"
+ },
+/area/hallway/primary/port)
"olU" = (
/obj/effect/landmark/start/clown,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
@@ -61596,6 +61550,16 @@
},
/turf/open/floor/iron,
/area/hallway/primary/central)
+"rKP" = (
+/obj/structure/cable{
+ icon_state = "0-2"
+ },
+/obj/machinery/power/solar{
+ id = "forestarboard";
+ name = "Fore-Starboard Solar Array"
+ },
+/turf/open/floor/iron/solarpanel/airless,
+/area/solar/starboard/fore)
"rKV" = (
/obj/structure/cable/yellow{
icon_state = "2-4"
@@ -63043,6 +63007,16 @@
},
/turf/open/floor/iron,
/area/maintenance/department/science)
+"snk" = (
+/obj/structure/cable{
+ icon_state = "0-4"
+ },
+/obj/machinery/power/solar{
+ id = "aftstarboard";
+ name = "Aft-Starboard Solar Array"
+ },
+/turf/open/floor/iron/solarpanel/airless,
+/area/solar/starboard/aft)
"snA" = (
/obj/machinery/status_display/supply{
pixel_y = 32
@@ -64848,6 +64822,17 @@
},
/turf/open/floor/iron,
/area/medical/break_room)
+"sXt" = (
+/obj/structure/table/wood,
+/obj/item/reagent_containers/food/drinks/bottle/holywater{
+ pixel_x = -2;
+ pixel_y = 2
+ },
+/obj/item/organ/heart,
+/obj/item/soulstone/anybody/chaplain,
+/obj/item/book/granter/spell/smoke/lesser,
+/turf/open/floor/cult,
+/area/chapel/office)
"sXR" = (
/obj/structure/cable/yellow{
icon_state = "1-2"
@@ -65213,16 +65198,6 @@
},
/turf/open/floor/iron,
/area/hallway/primary/fore)
-"tfK" = (
-/obj/structure/cable{
- icon_state = "0-4"
- },
-/obj/machinery/power/solar{
- id = "aftstarboard";
- name = "Aft-Starboard Solar Array"
- },
-/turf/open/floor/iron/airless/solarpanel,
-/area/solar/starboard/aft)
"tfQ" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -68776,29 +68751,6 @@
/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2,
/turf/open/floor/iron,
/area/engine/engineering)
-"uxs" = (
-/obj/machinery/button/door{
- id = "Disposal Exit";
- name = "Disposal Vent Control";
- pixel_x = -25;
- pixel_y = 4;
- req_access_txt = "12"
- },
-/obj/machinery/button/massdriver{
- id = "trash";
- pixel_x = -26;
- pixel_y = -6
- },
-/obj/structure/chair/stool,
-/obj/machinery/light/small{
- dir = 8
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/item/toy/plush/lizard_plushie{
- name = "Eats-The-Rubbish"
- },
-/turf/open/floor/iron,
-/area/maintenance/disposal)
"uxG" = (
/obj/structure/closet/crate/rcd{
pixel_y = 4
@@ -69193,6 +69145,19 @@
},
/turf/open/floor/iron/techmaint,
/area/science/shuttledock)
+"uFe" = (
+/obj/machinery/hydroponics/soil{
+ pixel_y = 8
+ },
+/obj/item/food/grown/flower/harebell,
+/obj/item/food/grown/flower/harebell,
+/obj/item/food/grown/flower/harebell,
+/obj/item/food/grown/flower/harebell,
+/obj/machinery/light/small{
+ dir = 1
+ },
+/turf/open/floor/cult,
+/area/chapel/main)
"uFK" = (
/obj/structure/extinguisher_cabinet{
pixel_x = 27
@@ -70959,6 +70924,16 @@
/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/iron,
/area/hallway/primary/central)
+"vrr" = (
+/obj/structure/cable{
+ icon_state = "0-2"
+ },
+/obj/machinery/power/solar{
+ id = "aftport";
+ name = "Aft-Port Solar Array"
+ },
+/turf/open/floor/iron/solarpanel/airless,
+/area/solar/port/aft)
"vrF" = (
/obj/structure/cable/yellow{
icon_state = "1-2"
@@ -72268,6 +72243,16 @@
},
/turf/open/floor/iron/white,
/area/medical/genetics/cloning)
+"vPd" = (
+/obj/structure/cable{
+ icon_state = "0-2"
+ },
+/obj/machinery/power/solar{
+ id = "foreport";
+ name = "Fore-Port Solar Array"
+ },
+/turf/open/floor/iron/solarpanel/airless,
+/area/solar/port/fore)
"vPl" = (
/obj/machinery/holopad,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
@@ -72775,6 +72760,15 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron,
/area/maintenance/port)
+"wad" = (
+/obj/structure/table/wood,
+/obj/machinery/newscaster{
+ pixel_y = 32
+ },
+/obj/item/folder,
+/obj/item/folder,
+/turf/open/floor/cult,
+/area/library)
"wak" = (
/turf/open/floor/carpet,
/area/crew_quarters/theatre)
@@ -78212,6 +78206,12 @@
/obj/item/cigbutt,
/turf/open/floor/iron,
/area/maintenance/starboard)
+"xVc" = (
+/obj/machinery/door/morgue{
+ name = "Study #1"
+ },
+/turf/open/floor/cult,
+/area/library)
"xVl" = (
/turf/closed/wall,
/area/hallway/secondary/service)
@@ -91421,17 +91421,17 @@ aaa
anT
aaa
aaa
-cue
+vrr
cvd
-cwe
+fYb
aaf
-cue
+vrr
cvd
-cwe
+fYb
aaf
-cue
+vrr
cvd
-cwe
+fYb
aaa
aaf
aaa
@@ -91678,17 +91678,17 @@ aaa
anT
aaf
aaf
-cue
+vrr
cve
-cwe
+fYb
aaf
-cue
+vrr
cve
-cwe
+fYb
aaa
-cue
+vrr
cve
-cwe
+fYb
aaa
aaa
aaa
@@ -91935,17 +91935,17 @@ aaa
anT
aaa
aaf
-cue
+vrr
cve
-cwe
+fYb
aaf
-cue
+vrr
cve
-cwe
+fYb
aaf
-cue
+vrr
cve
-cwe
+fYb
aaa
aaf
aaa
@@ -92192,17 +92192,17 @@ aaa
aaa
aaa
aaa
-cue
+vrr
cve
-cwe
+fYb
aaa
-cue
+vrr
cve
-cwe
+fYb
aaa
-cue
+vrr
cve
-cwe
+fYb
aaf
aaf
aaa
@@ -92449,17 +92449,17 @@ anT
aaa
aaa
aaa
-cue
+vrr
cve
-cwe
+fYb
aaf
-cue
+vrr
cve
-cwe
+fYb
aaf
-cue
+vrr
cve
-cwe
+fYb
aaa
aaf
aaa
@@ -93477,17 +93477,17 @@ anT
aaa
aaa
aaa
-cue
+vrr
cvh
-cwe
+fYb
aaf
-cue
+vrr
cvh
-cwe
+fYb
aaf
-cue
+vrr
cvh
-cwe
+fYb
aaa
aaa
aaa
@@ -93734,17 +93734,17 @@ cJh
cJh
aaa
aaf
-cue
+vrr
cvh
-cwe
+fYb
aaa
-cue
+vrr
cvh
-cwe
+fYb
aaf
-cue
+vrr
cvh
-cwe
+fYb
aaa
anT
aaa
@@ -93991,17 +93991,17 @@ aup
cJh
aaa
aaf
-cue
+vrr
cvh
-cwe
+fYb
aaf
-cue
+vrr
cvh
-cwe
+fYb
aaf
-cue
+vrr
cvh
-cwe
+fYb
aaf
aai
aaa
@@ -94248,17 +94248,17 @@ bXE
cJh
aaa
aaf
-cue
+vrr
cvh
-cwe
+fYb
aaa
-cue
+vrr
cvh
-cwe
+fYb
aaa
-cue
+vrr
cvh
-cwe
+fYb
aaa
aaf
aaa
@@ -94505,17 +94505,17 @@ bXE
cJh
aaa
aaa
-cue
+vrr
cvi
-cwe
+fYb
aaf
-cue
+vrr
cvi
-cwe
+fYb
aaf
-cue
+vrr
cvi
-cwe
+fYb
aaa
anT
aaf
@@ -94661,17 +94661,17 @@ aaa
aaa
aaj
aaa
-aal
+vPd
aan
-aau
+dVN
aaa
-aal
+vPd
aan
-aau
+dVN
aaa
-aal
+vPd
aan
-aau
+dVN
aaf
aag
aaf
@@ -94918,17 +94918,17 @@ aaa
aaa
aag
aaf
-aal
+vPd
aao
-aau
+dVN
aaa
-aal
+vPd
aao
-aau
+dVN
aaa
-aal
+vPd
aao
-aau
+dVN
aaf
aaf
aaf
@@ -95175,17 +95175,17 @@ aaa
aaf
aag
aaf
-aal
+vPd
aao
-aau
+dVN
aaf
-aal
+vPd
aao
-aau
+dVN
aaf
-aal
+vPd
aao
-aau
+dVN
aaf
aaa
aaf
@@ -95432,17 +95432,17 @@ aaa
aaf
aaa
aaa
-aal
+vPd
aao
-aau
+dVN
aaa
-aal
+vPd
aao
-aau
+dVN
aaa
-aal
+vPd
aao
-aau
+dVN
aaf
aaa
aaf
@@ -95689,17 +95689,17 @@ aag
aaj
aaa
aaa
-aal
+vPd
aao
-aau
+dVN
aaa
-aal
+vPd
aao
-aau
+dVN
aaa
-aal
+vPd
aao
-aau
+dVN
aaf
aaf
aaf
@@ -96270,7 +96270,7 @@ biD
bkg
bme
fRZ
-bBG
+olM
tMI
dod
bvW
@@ -96485,7 +96485,7 @@ aaf
aaa
ahq
ica
-uxs
+lHA
rah
aly
amP
@@ -96717,17 +96717,17 @@ aaj
aaj
aaa
aaf
-aal
+vPd
aas
-aau
+dVN
aaa
-aal
+vPd
aas
-aau
+dVN
aaa
-aal
+vPd
aas
-aau
+dVN
aaa
aaf
aaa
@@ -96974,17 +96974,17 @@ aaa
aaa
aaa
aaa
-aal
+vPd
aas
-aau
+dVN
aaf
-aal
+vPd
aas
-aau
+dVN
aaa
-aal
+vPd
aas
-aau
+dVN
aaa
aaf
aaa
@@ -97231,17 +97231,17 @@ aaa
aaa
aag
aaf
-aal
+vPd
aas
-aau
+dVN
aaa
-aal
+vPd
aas
-aau
+dVN
aaf
-aal
+vPd
aas
-aau
+dVN
aaf
aaf
aaf
@@ -97488,17 +97488,17 @@ aaa
aaa
aai
aaf
-aal
+vPd
aas
-aau
+dVN
aaf
-aal
+vPd
aas
-aau
+dVN
aaa
-aal
+vPd
aas
-aau
+dVN
aaa
aaf
aaa
@@ -97745,17 +97745,17 @@ aaa
aaa
aaj
aaa
-aal
+vPd
aat
-aau
+dVN
aaa
-aal
+vPd
aat
-aau
+dVN
aaa
-aal
+vPd
aat
-aau
+dVN
aaa
aaf
aaa
@@ -99165,7 +99165,7 @@ cPB
cPZ
cQT
cMI
-iTy
+uFe
cPA
aaa
aaa
@@ -99422,7 +99422,7 @@ cPC
djX
cPC
cMI
-cRF
+ksU
cMI
aaa
aaa
@@ -99871,9 +99871,9 @@ lhn
tnN
bsH
bue
-aAz
-bxW
-bzG
+mbU
+hXg
+xVc
lAz
bwc
kOK
@@ -100128,8 +100128,8 @@ hJL
bql
tMI
bue
-bwg
-bxX
+wad
+nzy
bue
pAL
bwc
@@ -100642,9 +100642,9 @@ hJL
bqw
tMI
bue
-bwf
-bxW
-bzH
+mzV
+hXg
+lwO
lAz
dCX
kOK
@@ -100899,8 +100899,8 @@ fRZ
bqw
tMI
bue
-aFE
-bxX
+alV
+nzy
bue
opm
bwc
@@ -101211,7 +101211,7 @@ cCe
sub
kbc
cLa
-cLZ
+jRr
cLa
cLa
cLa
@@ -101468,7 +101468,7 @@ cCe
eEV
jRz
cLa
-cMa
+sXt
cLa
oUI
cOh
@@ -117399,19 +117399,19 @@ aaa
aaa
aaa
lMJ
-tfK
-tfK
-tfK
-tfK
-tfK
+snk
+snk
+snk
+snk
+snk
aaa
dbR
aaa
-tfK
-tfK
-tfK
-tfK
-tfK
+snk
+snk
+snk
+snk
+snk
aaa
aqB
aaa
@@ -117913,19 +117913,19 @@ aaa
aaa
lMJ
lMJ
-gnu
-gnu
-gnu
-gnu
-gnu
+nmb
+nmb
+nmb
+nmb
+nmb
aav
tgz
aaf
-gnu
-gnu
-gnu
-gnu
-gnu
+nmb
+nmb
+nmb
+nmb
+nmb
aaa
anT
aaa
@@ -118427,19 +118427,19 @@ lMJ
aaa
lMJ
lMJ
-tfK
-tfK
-tfK
-tfK
-tfK
+snk
+snk
+snk
+snk
+snk
aaf
vwy
aaa
-tfK
-tfK
-tfK
-tfK
-tfK
+snk
+snk
+snk
+snk
+snk
aaf
anT
aaa
@@ -118941,19 +118941,19 @@ aaa
aaa
aaa
lMJ
-gnu
-gnu
-gnu
-gnu
-gnu
+nmb
+nmb
+nmb
+nmb
+nmb
aav
vwy
aav
-gnu
-gnu
-gnu
-gnu
-gnu
+nmb
+nmb
+nmb
+nmb
+nmb
aaa
anT
aaa
@@ -119455,19 +119455,19 @@ aaa
aaa
aaa
lMJ
-tfK
-tfK
-tfK
-tfK
-tfK
+snk
+snk
+snk
+snk
+snk
aav
vwy
aaa
-tfK
-tfK
-tfK
-tfK
-tfK
+snk
+snk
+snk
+snk
+snk
aaf
anT
aaa
@@ -119969,19 +119969,19 @@ aaa
aaa
lMJ
aaf
-gnu
-gnu
-gnu
-gnu
-gnu
+nmb
+nmb
+nmb
+nmb
+nmb
lMJ
pCg
aaf
-gnu
-gnu
-gnu
-gnu
-gnu
+nmb
+nmb
+nmb
+nmb
+nmb
aaa
aaa
aaa
@@ -121914,17 +121914,17 @@ aaa
aaa
aag
aaa
-abv
+rKP
abO
-acl
+diU
aaa
-abv
+rKP
abO
-acl
+diU
aaa
-abv
+rKP
abO
-acl
+diU
aaa
aaf
ajb
@@ -122171,17 +122171,17 @@ aaa
aaa
aag
aaf
-abv
+rKP
abP
-acl
+diU
aaa
-abv
+rKP
abP
-acl
+diU
aaa
-abv
+rKP
abP
-acl
+diU
aaa
aaf
ajb
@@ -122428,17 +122428,17 @@ aaa
aaa
aag
aaf
-abv
+rKP
abP
-acl
+diU
aaf
-abv
+rKP
abP
-acl
+diU
aaf
-abv
+rKP
abP
-acl
+diU
aaf
aaf
ajb
@@ -122685,17 +122685,17 @@ aaa
aaa
aag
aaf
-abv
+rKP
abP
-acl
+diU
aaa
-abv
+rKP
abP
-acl
+diU
aaa
-abv
+rKP
abP
-acl
+diU
aaa
aaf
aaf
@@ -122942,17 +122942,17 @@ aai
aaj
aag
aaa
-abv
+rKP
abP
-acl
+diU
aaa
-abv
+rKP
abP
-acl
+diU
aaa
-abv
+rKP
abP
-acl
+diU
aaa
aaa
aaf
@@ -123970,17 +123970,17 @@ aaj
aai
aaj
aaf
-abv
+rKP
abT
-acl
+diU
aaa
-abv
+rKP
abT
-acl
+diU
aaa
-abv
+rKP
abT
-acl
+diU
aaa
aaa
aaf
@@ -124227,17 +124227,17 @@ aaa
aaa
aag
aaa
-abv
+rKP
abT
-acl
+diU
aaa
-abv
+rKP
abT
-acl
+diU
aaa
-abv
+rKP
abT
-acl
+diU
aaf
aaa
aaf
@@ -124484,17 +124484,17 @@ aaa
aaa
aag
aaf
-abv
+rKP
abT
-acl
+diU
aaf
-abv
+rKP
abT
-acl
+diU
aaf
-abv
+rKP
abT
-acl
+diU
aaa
aaa
aaf
@@ -124741,17 +124741,17 @@ aaa
aaa
aag
aaf
-abv
+rKP
abT
-acl
+diU
aaa
-abv
+rKP
abT
-acl
+diU
aaa
-abv
+rKP
abT
-acl
+diU
aaa
aaa
aaf
@@ -124998,17 +124998,17 @@ aaa
aaa
aaj
aaa
-abv
+rKP
abU
-acl
+diU
aaa
-abv
+rKP
abU
-acl
+diU
aaa
-abv
+rKP
abU
-acl
+diU
aaf
aaf
aag
diff --git a/_maps/map_files/RadStation/RadStation.dmm b/_maps/map_files/RadStation/RadStation.dmm
index 2fa6367989ace..4e14c81063bdb 100644
--- a/_maps/map_files/RadStation/RadStation.dmm
+++ b/_maps/map_files/RadStation/RadStation.dmm
@@ -276,6 +276,27 @@
},
/turf/open/floor/engine,
/area/engine/atmospherics_engine)
+"acF" = (
+/obj/effect/turf_decal/guideline/guideline_in/darkblue{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/dark_blue/half/contrasted{
+ alpha = 180;
+ dir = 1
+ },
+/obj/structure/cable/yellow{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+ dir = 8
+ },
+/obj/structure/disposalpipe/sorting/mail{
+ dir = 1;
+ name = "Janie";
+ sortType = 22
+ },
+/turf/open/floor/iron/large,
+/area/hallway/primary/central)
"acJ" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
/obj/structure/cable/yellow{
@@ -672,23 +693,6 @@
},
/turf/open/floor/iron,
/area/hallway/secondary/entry)
-"alv" = (
-/obj/effect/turf_decal/guideline/guideline_in/neutral{
- alpha = 255;
- dir = 1
- },
-/obj/effect/turf_decal/tile/neutral/half/contrasted{
- alpha = 140;
- color = "#FFFFFF";
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/hallway/primary/central)
"alH" = (
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 8
@@ -802,6 +806,21 @@
/obj/structure/lattice,
/turf/open/space/basic,
/area/space/nearstation)
+"anK" = (
+/obj/structure/railing/corner{
+ dir = 8
+ },
+/turf/open/floor/iron/dark/smooth_large,
+/area/hallway/primary/central)
+"anN" = (
+/obj/structure/disposalpipe/segment{
+ dir = 2
+ },
+/obj/structure/railing/corner{
+ dir = 4
+ },
+/turf/open/floor/iron/dark/smooth_large,
+/area/hallway/primary/central)
"anZ" = (
/obj/effect/decal/cleanable/dirt,
/obj/item/toy/toy_dagger,
@@ -1298,6 +1317,23 @@
},
/turf/open/floor/iron,
/area/crew_quarters/dorms)
+"awk" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+ dir = 1
+ },
+/obj/structure/railing/corner,
+/turf/open/floor/iron/dark/smooth_large,
+/area/hallway/primary/central)
+"awC" = (
+/obj/structure/cable{
+ icon_state = "0-4"
+ },
+/obj/machinery/power/solar{
+ id = "portsolar";
+ name = "Port Solar Array"
+ },
+/turf/open/floor/iron/solarpanel/airless,
+/area/solar/starboard/fore)
"awG" = (
/obj/structure/chair{
dir = 1
@@ -1460,6 +1496,25 @@
burnt = 1
},
/area/maintenance/port/central)
+"ayA" = (
+/obj/effect/turf_decal/tile/brown/half/contrasted{
+ dir = 8
+ },
+/obj/effect/turf_decal/guideline/guideline_in/brown,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/structure/cable/yellow{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
+/turf/open/floor/iron/half,
+/area/hallway/primary/central)
"ayF" = (
/obj/structure/disposalpipe/segment{
dir = 1
@@ -1673,6 +1728,17 @@
},
/turf/open/floor/wood,
/area/lawoffice)
+"aBR" = (
+/obj/structure/window/reinforced{
+ dir = 4;
+ layer = 2.9
+ },
+/obj/structure/window/reinforced{
+ dir = 1;
+ layer = 2.9
+ },
+/turf/open/floor/iron/dark/smooth_large,
+/area/hallway/primary/central)
"aCk" = (
/obj/effect/turf_decal/stripes/line,
/obj/machinery/telecomms/receiver/preset_left{
@@ -1719,15 +1785,6 @@
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/iron,
/area/engine/engine_room)
-"aDb" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/structure/railing/corner{
- dir = 8
- },
-/turf/open/floor/iron/dark,
-/area/hallway/primary/central)
"aDq" = (
/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{
dir = 8
@@ -1913,12 +1970,6 @@
},
/turf/open/floor/iron,
/area/hallway/primary/port)
-"aGJ" = (
-/obj/structure/railing/corner{
- dir = 1
- },
-/turf/open/floor/iron/dark,
-/area/hallway/primary/central)
"aHc" = (
/obj/machinery/suit_storage_unit/mining,
/obj/effect/turf_decal/delivery,
@@ -1994,23 +2045,6 @@
},
/turf/open/floor/iron,
/area/hallway/primary/fore)
-"aIF" = (
-/obj/effect/turf_decal/guideline/guideline_in/red{
- dir = 4
- },
-/obj/effect/turf_decal/tile/dark_red/half/contrasted{
- alpha = 180;
- color = "#DE3A3A"
- },
-/obj/structure/disposalpipe/segment{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
- dir = 8
- },
-/turf/open/floor/iron,
-/area/hallway/primary/central)
"aIM" = (
/obj/effect/turf_decal/tile/purple/fourcorners/contrasted,
/obj/structure/cable/yellow{
@@ -2324,18 +2358,6 @@
"aNU" = (
/turf/closed/wall/r_wall,
/area/ai_monitored/storage/satellite)
-"aOb" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 10
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 10
- },
-/obj/structure/disposalpipe/segment{
- dir = 2
- },
-/turf/open/floor/iron/dark,
-/area/hallway/primary/central)
"aOc" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
@@ -2573,6 +2595,19 @@
},
/turf/open/floor/iron/white,
/area/medical/apothecary)
+"aRe" = (
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+ dir = 8
+ },
+/obj/machinery/navbeacon{
+ codes_txt = "patrol;next_patrol=16-EHall";
+ location = "15-CenterSE"
+ },
+/turf/open/floor/iron/dark/smooth_large,
+/area/hallway/primary/central)
"aRf" = (
/obj/machinery/telecomms/server/presets/service,
/obj/effect/turf_decal/stripes/line{
@@ -2603,18 +2638,6 @@
/obj/machinery/door/firedoor,
/turf/open/floor/iron,
/area/science/storage)
-"aSe" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 6
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 6
- },
-/obj/structure/disposalpipe/segment{
- dir = 2
- },
-/turf/open/floor/iron/dark,
-/area/hallway/primary/central)
"aSr" = (
/obj/machinery/door/airlock/maintenance_hatch{
id_tag = "commissarydoor";
@@ -2664,6 +2687,15 @@
},
/turf/open/floor/iron/dark,
/area/quartermaster/miningdock)
+"aSV" = (
+/obj/structure/window/reinforced{
+ dir = 8;
+ pixel_y = 1
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/turf/open/floor/iron/dark/smooth_large,
+/area/hallway/primary/central)
"aSW" = (
/obj/structure/cable/yellow{
icon_state = "1-2"
@@ -3338,6 +3370,16 @@
/obj/structure/lattice/catwalk/over,
/turf/open/floor/iron/tech,
/area/engine/engine_room)
+"bcX" = (
+/obj/structure/cable{
+ icon_state = "0-8"
+ },
+/obj/machinery/power/solar{
+ id = "portsolar";
+ name = "Port Solar Array"
+ },
+/turf/open/floor/iron/solarpanel/airless,
+/area/solar/port/fore)
"bdB" = (
/obj/effect/turf_decal/loading_area{
dir = 8
@@ -3595,6 +3637,20 @@
/obj/structure/lattice,
/turf/open/space/basic,
/area/space/nearstation)
+"bhZ" = (
+/obj/structure/disposalpipe/segment{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/yellow/half/contrasted{
+ alpha = 180
+ },
+/obj/effect/turf_decal/guideline/guideline_in/yellow{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/turf/open/floor/iron/large,
+/area/hallway/primary/central)
"bia" = (
/obj/effect/turf_decal/bot,
/obj/structure/disposalpipe/trunk{
@@ -3617,18 +3673,6 @@
/mob/living/basic/cockroach,
/turf/open/floor/plating,
/area/maintenance/central)
-"bin" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 9
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 9
- },
-/obj/structure/disposalpipe/segment{
- dir = 2
- },
-/turf/open/floor/iron/dark,
-/area/hallway/primary/central)
"biX" = (
/obj/structure/table/optable{
name = "Robotics Operating Table"
@@ -3673,18 +3717,6 @@
/obj/effect/turf_decal/tile/red/fourcorners/contrasted,
/turf/open/floor/prison,
/area/security/prison)
-"bjT" = (
-/obj/structure/disposalpipe/segment{
- dir = 8
- },
-/obj/effect/turf_decal/tile/purple/half/contrasted{
- dir = 4
- },
-/obj/effect/turf_decal/guideline/guideline_in/purple{
- dir = 1
- },
-/turf/open/floor/iron,
-/area/hallway/primary/central)
"bka" = (
/obj/structure/cable/yellow{
icon_state = "4-8"
@@ -3860,23 +3892,6 @@
},
/turf/open/floor/engine,
/area/science/xenobiology)
-"bmF" = (
-/obj/structure/railing{
- dir = 8
- },
-/obj/effect/turf_decal/siding/wideplating/dark{
- dir = 8
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/disposal/bin,
-/obj/effect/turf_decal/bot,
-/obj/structure/disposalpipe/trunk{
- dir = 4
- },
-/turf/open/floor/iron/dark/side{
- dir = 8
- },
-/area/hallway/primary/central)
"bmN" = (
/obj/structure/cable/yellow{
icon_state = "4-8"
@@ -4017,6 +4032,15 @@
dir = 1
},
/area/hallway/primary/central)
+"bpY" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 6
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 6
+ },
+/turf/open/floor/iron/dark/smooth_large,
+/area/hallway/primary/central)
"bqh" = (
/obj/machinery/button/door{
id = "meetingshutter";
@@ -4223,18 +4247,6 @@
/obj/machinery/firealarm/directional/west,
/turf/open/floor/carpet/royalblack,
/area/library)
-"bsP" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 5
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 5
- },
-/obj/structure/disposalpipe/segment{
- dir = 2
- },
-/turf/open/floor/iron/dark,
-/area/hallway/primary/central)
"bsT" = (
/obj/effect/turf_decal/bot,
/turf/open/floor/iron/techmaint,
@@ -5061,22 +5073,6 @@
/obj/machinery/space_heater,
/turf/open/floor/plating,
/area/ai_monitored/storage/satellite)
-"bJx" = (
-/obj/structure/closet/emcloset,
-/obj/effect/turf_decal/bot,
-/obj/structure/window/reinforced{
- dir = 1;
- layer = 2.9
- },
-/turf/open/floor/iron/dark,
-/area/hallway/primary/central)
-"bJF" = (
-/obj/effect/turf_decal/siding/wideplating/dark{
- dir = 4
- },
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron/dark,
-/area/hallway/primary/central)
"bJV" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/structure/cable/yellow,
@@ -5151,6 +5147,23 @@
},
/turf/open/floor/iron/dark,
/area/ai_monitored/turret_protected/aisat_interior)
+"bKA" = (
+/obj/structure/window/reinforced{
+ dir = 4;
+ layer = 2.9
+ },
+/obj/structure/window/reinforced{
+ dir = 1;
+ layer = 2.9
+ },
+/obj/machinery/light/floor{
+ brightness = 15;
+ bulb_emergency_brightness_mul = 2;
+ bulb_vacuum_brightness = 15;
+ nightshift_brightness = 10
+ },
+/turf/open/floor/iron/dark/smooth_large,
+/area/hallway/primary/central)
"bKM" = (
/obj/effect/turf_decal/delivery,
/obj/machinery/conveyor_switch/oneway{
@@ -5159,15 +5172,6 @@
},
/turf/open/floor/iron/sepia,
/area/quartermaster/office)
-"bKN" = (
-/obj/structure/disposalpipe/segment{
- dir = 2
- },
-/obj/structure/railing/corner{
- dir = 4
- },
-/turf/open/floor/iron/dark,
-/area/hallway/primary/central)
"bKW" = (
/obj/structure/table,
/obj/machinery/recharger{
@@ -5395,16 +5399,6 @@
/obj/structure/girder,
/turf/open/floor/iron,
/area/maintenance/department/security)
-"bNH" = (
-/obj/structure/cable{
- icon_state = "0-4"
- },
-/obj/machinery/power/solar{
- id = "portsolar";
- name = "Port Solar Array"
- },
-/turf/open/floor/iron/airless/solarpanel,
-/area/solar/port/fore)
"bNL" = (
/obj/structure/cable/yellow{
icon_state = "1-2"
@@ -5445,27 +5439,6 @@
},
/turf/open/floor/carpet/royalblue,
/area/crew_quarters/heads/captain)
-"bOl" = (
-/obj/effect/turf_decal/tile/dark_green/half/contrasted{
- dir = 8
- },
-/obj/structure/cable/yellow{
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 4
- },
-/obj/structure/disposalpipe/junction/flip{
- dir = 8
- },
-/obj/effect/turf_decal/guideline/guideline_in/green{
- color = "#439C1E"
- },
-/turf/open/floor/iron,
-/area/hallway/primary/central)
"bOq" = (
/obj/effect/turf_decal/tile/neutral{
dir = 8
@@ -5547,19 +5520,6 @@
/obj/structure/sign/poster/random,
/turf/closed/wall,
/area/security/brig/medbay)
-"bQv" = (
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
- dir = 1
- },
-/obj/machinery/navbeacon{
- codes_txt = "patrol;next_patrol=12-SSci";
- location = "11-CenterSW"
- },
-/turf/open/floor/iron/dark,
-/area/hallway/primary/central)
"bQA" = (
/obj/structure/disposalpipe/segment{
dir = 8
@@ -6190,19 +6150,6 @@
"caY" = (
/turf/open/floor/iron/sepia,
/area/quartermaster/sorting)
-"cbd" = (
-/obj/structure/railing{
- dir = 6
- },
-/obj/machinery/light/floor{
- brightness = 15;
- bulb_colour = "#FFE4CE";
- bulb_vacuum_brightness = 15;
- nightshift_brightness = 10;
- nightshift_light_color = "#E6EBFF"
- },
-/turf/open/floor/iron/dark,
-/area/hallway/primary/central)
"cbf" = (
/turf/open/floor/iron/dark,
/area/quartermaster/miningdock)
@@ -7584,16 +7531,6 @@
},
/turf/open/floor/iron,
/area/engine/engine_room)
-"cwu" = (
-/obj/structure/window/reinforced{
- dir = 4;
- layer = 2.9
- },
-/obj/structure/closet/emcloset,
-/obj/effect/turf_decal/bot,
-/obj/structure/window/reinforced,
-/turf/open/floor/iron/dark,
-/area/hallway/primary/central)
"cwJ" = (
/obj/machinery/door/airlock/grunge{
name = "Chapel Morgue";
@@ -7998,6 +7935,18 @@
},
/turf/open/floor/iron,
/area/crew_quarters/cafeteria)
+"cBW" = (
+/obj/structure/railing/corner{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 1
+ },
+/turf/open/floor/iron/dark/smooth_large,
+/area/hallway/primary/central)
"cCl" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
@@ -8509,6 +8458,27 @@
"cKB" = (
/turf/closed/wall,
/area/medical/apothecary)
+"cKE" = (
+/obj/effect/turf_decal/tile/dark_green/half/contrasted{
+ dir = 8
+ },
+/obj/structure/cable/yellow{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 4
+ },
+/obj/structure/disposalpipe/junction/flip{
+ dir = 8
+ },
+/obj/effect/turf_decal/guideline/guideline_in/green{
+ color = "#439C1E"
+ },
+/turf/open/floor/iron/half,
+/area/hallway/primary/central)
"cLa" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 5
@@ -8600,10 +8570,6 @@
},
/turf/open/space/basic,
/area/space/nearstation)
-"cLZ" = (
-/obj/structure/window/reinforced,
-/turf/open/floor/iron/dark,
-/area/hallway/primary/central)
"cMi" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 4
@@ -8831,17 +8797,6 @@
"cPB" = (
/turf/closed/wall/r_wall/rust,
/area/science/misc_lab/range)
-"cPS" = (
-/obj/structure/window/reinforced{
- dir = 4;
- layer = 2.9
- },
-/obj/structure/window/reinforced{
- dir = 1;
- layer = 2.9
- },
-/turf/open/floor/iron/dark,
-/area/hallway/primary/central)
"cPU" = (
/obj/effect/turf_decal/siding/wood,
/turf/open/floor/wood,
@@ -9162,20 +9117,6 @@
},
/turf/open/floor/carpet/royalblack,
/area/lawoffice)
-"cWq" = (
-/obj/structure/window/reinforced{
- dir = 4;
- layer = 2.9
- },
-/obj/structure/window/reinforced{
- dir = 1;
- layer = 2.9
- },
-/obj/structure/disposalpipe/segment{
- dir = 10
- },
-/turf/open/floor/iron/dark,
-/area/hallway/primary/central)
"cWL" = (
/obj/effect/turf_decal/bot,
/obj/item/clothing/suit/armor/riot{
@@ -10381,6 +10322,19 @@
},
/turf/open/floor/iron/white,
/area/science/xenobiology)
+"dpw" = (
+/obj/structure/window/reinforced{
+ dir = 1;
+ layer = 2.9
+ },
+/obj/structure/window/reinforced{
+ dir = 8;
+ pixel_y = 1
+ },
+/obj/effect/turf_decal/bot,
+/obj/machinery/vending/snack/blue,
+/turf/open/floor/iron/dark/smooth_large,
+/area/hallway/primary/central)
"dpz" = (
/obj/machinery/vending/dinnerware,
/turf/open/floor/iron/dark,
@@ -10528,11 +10482,6 @@
},
/turf/open/floor/iron/dark,
/area/engine/engine_room)
-"dsD" = (
-/obj/structure/railing,
-/obj/effect/turf_decal/siding/wideplating/dark,
-/turf/open/floor/iron/dark,
-/area/hallway/primary/central)
"dsS" = (
/obj/machinery/door/airlock/maintenance_hatch{
id_tag = "commissarydoor";
@@ -10915,6 +10864,15 @@
},
/turf/open/floor/iron/dark,
/area/vacant_room/commissary/commissary2)
+"dxR" = (
+/obj/effect/turf_decal/bot,
+/obj/structure/window/reinforced{
+ dir = 1;
+ layer = 2.9
+ },
+/obj/structure/closet/emcloset,
+/turf/open/floor/iron/dark/smooth_large,
+/area/hallway/primary/central)
"dxU" = (
/obj/structure/cable/yellow{
icon_state = "1-8"
@@ -10972,6 +10930,15 @@
"dyM" = (
/turf/open/floor/wood,
/area/vacant_room/office)
+"dyS" = (
+/obj/structure/disposalpipe/segment{
+ dir = 2
+ },
+/obj/structure/railing/corner{
+ dir = 8
+ },
+/turf/open/floor/iron/dark/smooth_large,
+/area/hallway/primary/central)
"dzf" = (
/obj/effect/turf_decal/tile/purple/fourcorners/contrasted,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
@@ -11294,15 +11261,6 @@
/obj/effect/turf_decal/bot,
/turf/open/floor/carpet/royalblack,
/area/library)
-"dDv" = (
-/obj/effect/turf_decal/bot,
-/obj/structure/window/reinforced{
- dir = 1;
- layer = 2.9
- },
-/obj/structure/closet/emcloset,
-/turf/open/floor/iron/dark,
-/area/hallway/primary/central)
"dDR" = (
/obj/machinery/status_display/evac{
pixel_x = 32
@@ -11471,6 +11429,21 @@
/obj/structure/reflector/box,
/turf/open/floor/iron/tech/grid,
/area/engine/engineering)
+"dGe" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/purple/half/contrasted{
+ dir = 4
+ },
+/obj/effect/turf_decal/guideline/guideline_in/purple{
+ dir = 1
+ },
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+ dir = 1
+ },
+/turf/open/floor/iron/half,
+/area/hallway/primary/central)
"dGh" = (
/obj/effect/spawner/structure/window,
/obj/structure/curtain/directional{
@@ -11796,25 +11769,6 @@
/obj/effect/turf_decal/tile/neutral/half/contrasted,
/turf/open/floor/iron,
/area/engine/atmos)
-"dKe" = (
-/obj/structure/railing{
- dir = 8
- },
-/obj/effect/turf_decal/siding/thinplating/light{
- dir = 8
- },
-/obj/machinery/light/floor{
- brightness = 15;
- bulb_colour = "#FFE4CE";
- bulb_vacuum_brightness = 15;
- nightshift_brightness = 10;
- nightshift_light_color = "#E6EBFF"
- },
-/obj/effect/turf_decal/siding/wideplating/dark{
- dir = 8
- },
-/turf/open/floor/iron/dark,
-/area/hallway/primary/central)
"dKh" = (
/obj/effect/turf_decal/tile/red/half/contrasted{
alpha = 180;
@@ -12306,27 +12260,6 @@
},
/turf/open/floor/carpet/red,
/area/crew_quarters/theatre/backstage)
-"dQG" = (
-/obj/effect/turf_decal/guideline/guideline_in/neutral{
- alpha = 255;
- dir = 1
- },
-/obj/effect/turf_decal/tile/neutral/half/contrasted{
- alpha = 140;
- color = "#FFFFFF";
- dir = 4
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
- dir = 1
- },
-/obj/structure/disposalpipe/segment{
- dir = 2
- },
-/turf/open/floor/iron,
-/area/hallway/primary/central)
"dQV" = (
/obj/machinery/atmospherics/pipe/simple/dark/visible,
/obj/machinery/light{
@@ -12393,18 +12326,6 @@
},
/turf/open/space/basic,
/area/solar/starboard/fore)
-"dSE" = (
-/obj/structure/railing/corner{
- dir = 8
- },
-/obj/effect/turf_decal/stripes/line,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/iron/dark/side{
- dir = 6
- },
-/area/hallway/primary/central)
"dSJ" = (
/obj/structure/chair{
dir = 4
@@ -12482,6 +12403,18 @@
},
/turf/open/floor/iron,
/area/hallway/primary/port)
+"dUg" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 5
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 5
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 2
+ },
+/turf/open/floor/iron/dark/smooth_large,
+/area/hallway/primary/central)
"dUi" = (
/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{
dir = 1
@@ -12537,22 +12470,6 @@
/obj/structure/lattice/catwalk,
/turf/open/space/basic,
/area/space/nearstation)
-"dUw" = (
-/obj/machinery/light/floor{
- brightness = 15;
- bulb_colour = "#FFE4CE";
- bulb_vacuum_brightness = 15;
- nightshift_brightness = 10;
- nightshift_light_color = "#E6EBFF"
- },
-/obj/effect/turf_decal/siding/wideplating/dark{
- dir = 8
- },
-/obj/structure/railing/corner{
- dir = 1
- },
-/turf/open/floor/iron/dark,
-/area/hallway/primary/central)
"dUx" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
@@ -12618,16 +12535,6 @@
/obj/effect/turf_decal/bot,
/turf/open/floor/iron,
/area/bridge)
-"dVs" = (
-/obj/structure/cable{
- icon_state = "0-8"
- },
-/obj/machinery/power/solar{
- id = "portsolar";
- name = "Port Solar Array"
- },
-/turf/open/floor/iron/airless/solarpanel,
-/area/solar/starboard/aft)
"dVy" = (
/obj/effect/turf_decal/bot,
/obj/item/storage/secure/safe{
@@ -12754,6 +12661,17 @@
},
/turf/open/floor/iron/tech,
/area/engine/atmos)
+"dXa" = (
+/obj/structure/window/reinforced{
+ dir = 4;
+ layer = 2.9
+ },
+/obj/structure/chair/fancy/comfy{
+ color = "#596479";
+ dir = 8
+ },
+/turf/open/floor/iron/dark/smooth_large,
+/area/hallway/primary/central)
"dXe" = (
/obj/structure/railing{
dir = 4
@@ -13107,6 +13025,31 @@
},
/turf/open/floor/iron/dark,
/area/bridge)
+"edV" = (
+/obj/structure/cable{
+ icon_state = "0-8"
+ },
+/obj/machinery/power/solar{
+ id = "portsolar";
+ name = "Port Solar Array"
+ },
+/turf/open/floor/iron/solarpanel/airless,
+/area/solar/starboard/aft)
+"eeg" = (
+/obj/effect/turf_decal/guideline/guideline_in/red{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/dark_red/half/contrasted{
+ alpha = 180;
+ color = "#DE3A3A"
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/turf/open/floor/iron/large,
+/area/hallway/primary/central)
"een" = (
/obj/structure/chair/office/light{
dir = 4
@@ -13317,6 +13260,17 @@
},
/turf/open/floor/iron/dark,
/area/engine/engine_room)
+"eho" = (
+/obj/structure/window/reinforced,
+/obj/structure/window/reinforced{
+ dir = 8;
+ pixel_y = 1
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 5
+ },
+/turf/open/floor/iron/dark/smooth_large,
+/area/hallway/primary/central)
"ehV" = (
/obj/effect/turf_decal/stripes/line{
dir = 5
@@ -13472,19 +13426,6 @@
/obj/effect/decal/cleanable/oil,
/turf/open/floor/plating,
/area/quartermaster/warehouse)
-"ekq" = (
-/obj/structure/railing{
- dir = 5
- },
-/obj/machinery/light/floor{
- brightness = 15;
- bulb_colour = "#FFE4CE";
- bulb_vacuum_brightness = 15;
- nightshift_brightness = 10;
- nightshift_light_color = "#E6EBFF"
- },
-/turf/open/floor/iron/dark,
-/area/hallway/primary/central)
"eku" = (
/obj/effect/turf_decal/delivery,
/obj/structure/cable/yellow{
@@ -13649,6 +13590,26 @@
dir = 4
},
/area/science/research)
+"eoa" = (
+/obj/effect/turf_decal/tile/brown/half/contrasted{
+ dir = 8
+ },
+/obj/effect/turf_decal/guideline/guideline_in/brown,
+/obj/structure/cable/yellow{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/turf/open/floor/iron/half,
+/area/hallway/primary/central)
"eog" = (
/obj/effect/turf_decal/stripes/line{
dir = 10
@@ -13749,24 +13710,6 @@
/obj/effect/turf_decal/stripes/box,
/turf/open/floor/iron/dark,
/area/hallway/primary/fore)
-"epK" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/obj/structure/cable/yellow{
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 4
- },
-/obj/structure/disposalpipe/segment{
- dir = 5
- },
-/turf/open/floor/iron/dark,
-/area/hallway/primary/central)
"epO" = (
/obj/structure/cable/yellow{
icon_state = "1-4"
@@ -13886,6 +13829,15 @@
},
/turf/open/floor/iron,
/area/hallway/primary/aft)
+"erk" = (
+/obj/effect/turf_decal/siding/wideplating/dark{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/iron/dark/smooth_edge{
+ dir = 8
+ },
+/area/hallway/primary/central)
"ero" = (
/obj/effect/landmark/blobstart,
/turf/open/floor/iron,
@@ -14249,6 +14201,18 @@
/obj/effect/turf_decal/bot,
/turf/open/floor/iron/tech,
/area/engine/atmos)
+"exU" = (
+/obj/structure/railing/corner{
+ dir = 8
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 1
+ },
+/turf/open/floor/iron/dark/smooth_large,
+/area/hallway/primary/central)
"exY" = (
/obj/structure/cable/yellow{
icon_state = "4-8"
@@ -14464,15 +14428,6 @@
},
/turf/open/floor/iron,
/area/medical/break_room)
-"eBu" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
- dir = 4
- },
-/obj/structure/railing/corner{
- dir = 1
- },
-/turf/open/floor/iron/dark,
-/area/hallway/primary/central)
"eBC" = (
/obj/effect/turf_decal/tile/red/anticorner/contrasted{
alpha = 180;
@@ -14812,6 +14767,15 @@
},
/turf/open/floor/circuit,
/area/ai_monitored/turret_protected/aisat/foyer)
+"eGV" = (
+/obj/effect/turf_decal/bot,
+/obj/structure/window/reinforced{
+ dir = 8;
+ pixel_y = 1
+ },
+/obj/machinery/vending/coffee,
+/turf/open/floor/iron/dark/smooth_large,
+/area/hallway/primary/central)
"eGX" = (
/obj/structure/lattice/catwalk/over,
/obj/structure/cable{
@@ -14939,24 +14903,6 @@
},
/turf/open/floor/iron/tech/grid,
/area/engine/engine_room)
-"eIt" = (
-/obj/effect/turf_decal/guideline/guideline_in/neutral{
- alpha = 255;
- dir = 1
- },
-/obj/effect/turf_decal/tile/neutral/half/contrasted{
- alpha = 140;
- color = "#FFFFFF";
- dir = 4
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
- dir = 1
- },
-/turf/open/floor/iron,
-/area/hallway/primary/central)
"eIx" = (
/obj/effect/turf_decal/tile/brown/half/contrasted{
dir = 8
@@ -15378,6 +15324,29 @@
},
/turf/open/floor/iron/sepia,
/area/quartermaster/sorting)
+"eOX" = (
+/obj/structure/railing{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/thinplating/light{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/wideplating/dark{
+ dir = 8
+ },
+/turf/open/floor/iron/dark/smooth_edge{
+ dir = 4
+ },
+/area/hallway/primary/central)
+"eOY" = (
+/obj/effect/turf_decal/bot,
+/obj/structure/window/reinforced{
+ dir = 4;
+ layer = 2.9
+ },
+/obj/machinery/vending/cola,
+/turf/open/floor/iron/dark/smooth_large,
+/area/hallway/primary/central)
"ePp" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 10
@@ -15758,18 +15727,6 @@
/obj/effect/decal/cleanable/glass,
/turf/open/floor/plating,
/area/maintenance/port/aft)
-"eTP" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/obj/structure/cable/yellow{
- icon_state = "1-2"
- },
-/obj/structure/disposalpipe/segment{
- dir = 6
- },
-/turf/open/floor/iron/dark,
-/area/hallway/primary/central)
"eUb" = (
/obj/structure/lattice/catwalk,
/obj/machinery/camera/autoname{
@@ -16175,18 +16132,6 @@
/obj/effect/decal/cleanable/glass,
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
-"eYZ" = (
-/obj/structure/window/reinforced{
- dir = 4;
- layer = 2.9
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/structure/disposalpipe/segment{
- dir = 2
- },
-/turf/open/floor/iron/dark,
-/area/hallway/primary/central)
"eZm" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 4
@@ -16334,6 +16279,18 @@
/mob/living/simple_animal/chick,
/turf/open/floor/grass,
/area/hallway/primary/central)
+"fbl" = (
+/obj/structure/railing/corner{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 8
+ },
+/turf/open/floor/iron/dark/smooth_large,
+/area/hallway/primary/central)
"fbn" = (
/obj/structure/lattice/catwalk,
/obj/structure/cable{
@@ -16640,12 +16597,6 @@
"fft" = (
/turf/closed/wall,
/area/maintenance/disposal)
-"ffD" = (
-/obj/structure/railing/corner{
- dir = 8
- },
-/turf/open/floor/iron/dark,
-/area/hallway/primary/central)
"fgd" = (
/obj/machinery/holopad{
pixel_y = 16
@@ -17091,13 +17042,6 @@
/obj/structure/chair/office,
/turf/open/floor/carpet/blue,
/area/crew_quarters/heads/hop)
-"flV" = (
-/obj/effect/turf_decal/siding/wideplating/dark{
- dir = 4
- },
-/obj/structure/railing/corner,
-/turf/open/floor/iron/dark,
-/area/hallway/primary/central)
"fme" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -17248,16 +17192,6 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/turf/open/floor/plating,
/area/engine/atmos)
-"fow" = (
-/obj/structure/window/reinforced{
- dir = 8;
- pixel_y = 1
- },
-/obj/structure/window/reinforced,
-/obj/structure/closet/emcloset,
-/obj/effect/turf_decal/bot,
-/turf/open/floor/iron/dark,
-/area/hallway/primary/central)
"foH" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
dir = 4
@@ -17314,18 +17248,6 @@
},
/turf/open/floor/wood,
/area/maintenance/central)
-"fpE" = (
-/obj/effect/turf_decal/tile/yellow/half/contrasted{
- alpha = 180
- },
-/obj/effect/turf_decal/guideline/guideline_in/yellow{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/iron,
-/area/hallway/primary/central)
"fpG" = (
/obj/structure/table/wood,
/obj/item/folder/blue{
@@ -17420,23 +17342,6 @@
"frc" = (
/turf/open/floor/engine/vacuum,
/area/science/mixing/chamber)
-"frj" = (
-/obj/effect/turf_decal/tile/dark_green/half/contrasted{
- dir = 8
- },
-/obj/structure/cable/yellow{
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4,
-/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2,
-/obj/structure/disposalpipe/junction{
- dir = 8
- },
-/obj/effect/turf_decal/guideline/guideline_in/green{
- color = "#439C1E"
- },
-/turf/open/floor/iron,
-/area/hallway/primary/central)
"frm" = (
/obj/machinery/atmospherics/pipe/manifold/yellow/visible,
/obj/machinery/meter,
@@ -17446,21 +17351,6 @@
},
/turf/open/floor/iron/dark,
/area/engine/atmos)
-"fro" = (
-/obj/structure/window/reinforced{
- dir = 8;
- pixel_y = 1
- },
-/obj/structure/window/reinforced,
-/obj/machinery/light/floor{
- brightness = 15;
- bulb_colour = "#FFE4CE";
- bulb_vacuum_brightness = 15;
- nightshift_brightness = 10;
- nightshift_light_color = "#E6EBFF"
- },
-/turf/open/floor/iron/dark,
-/area/hallway/primary/central)
"frq" = (
/obj/machinery/light_switch{
pixel_y = -25
@@ -17520,6 +17410,21 @@
/area/security/prison{
name = "Prison Processing"
})
+"fss" = (
+/obj/structure/window/reinforced{
+ dir = 4;
+ layer = 2.9
+ },
+/obj/structure/window/reinforced,
+/obj/machinery/light/floor{
+ brightness = 15;
+ bulb_colour = "#FFE4CE";
+ bulb_vacuum_brightness = 15;
+ nightshift_brightness = 10;
+ nightshift_light_color = "#E6EBFF"
+ },
+/turf/open/floor/iron/dark/smooth_large,
+/area/hallway/primary/central)
"fsy" = (
/turf/closed/wall/rust,
/area/vacant_room/office)
@@ -17583,6 +17488,18 @@
},
/turf/open/floor/carpet/orange,
/area/quartermaster/qm)
+"ftd" = (
+/obj/effect/turf_decal/tile/yellow/half/contrasted{
+ alpha = 180
+ },
+/obj/effect/turf_decal/guideline/guideline_in/yellow{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/structure/disposalpipe/segment,
+/turf/open/floor/iron/large,
+/area/hallway/primary/central)
"ftP" = (
/obj/effect/turf_decal/siding/wideplating/dark/corner{
dir = 4
@@ -17674,13 +17591,6 @@
/obj/structure/table/wood/fancy/purple,
/turf/open/floor/iron/dark,
/area/chapel/main)
-"fvZ" = (
-/obj/structure/disposalpipe/segment{
- dir = 2
- },
-/obj/structure/railing/corner,
-/turf/open/floor/iron/dark,
-/area/hallway/primary/central)
"fwx" = (
/obj/structure/altar_of_gods,
/obj/effect/turf_decal/siding/wideplating/dark{
@@ -18023,6 +17933,12 @@
},
/turf/open/floor/iron/cafeteria_red,
/area/crew_quarters/cafeteria)
+"fBw" = (
+/obj/structure/railing/corner{
+ dir = 4
+ },
+/turf/open/floor/iron/dark/smooth_large,
+/area/hallway/primary/central)
"fBx" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 10
@@ -18100,18 +18016,6 @@
},
/turf/open/floor/plating,
/area/maintenance/department/bridge)
-"fCf" = (
-/obj/structure/railing{
- layer = 3.1
- },
-/obj/structure/chair/fancy/comfy{
- buildstackamount = 0;
- color = "#742925";
- dir = 1
- },
-/obj/effect/turf_decal/siding/wideplating/dark,
-/turf/open/floor/iron/dark/side,
-/area/hallway/primary/central)
"fCz" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
dir = 1
@@ -18233,6 +18137,10 @@
},
/turf/open/floor/iron,
/area/crew_quarters/cafeteria)
+"fEG" = (
+/obj/structure/window/reinforced,
+/turf/open/floor/iron/dark/smooth_large,
+/area/hallway/primary/central)
"fET" = (
/obj/effect/turf_decal/guideline/guideline_edge/purple{
dir = 1
@@ -18630,23 +18538,6 @@
},
/turf/open/floor/circuit,
/area/science/robotics/mechbay)
-"fLE" = (
-/obj/machinery/light/floor{
- brightness = 15;
- bulb_colour = "#FFE4CE";
- bulb_vacuum_brightness = 15;
- nightshift_brightness = 10;
- nightshift_light_color = "#E6EBFF"
- },
-/obj/effect/turf_decal/siding/wideplating/dark{
- dir = 4
- },
-/obj/structure/railing/corner{
- dir = 4
- },
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron/dark,
-/area/hallway/primary/central)
"fLO" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/structure/cable/yellow{
@@ -18893,6 +18784,15 @@
},
/turf/open/floor/iron/dark,
/area/ai_monitored/turret_protected/aisat_interior)
+"fOW" = (
+/obj/effect/turf_decal/siding/wideplating/dark{
+ dir = 4
+ },
+/obj/structure/railing/corner,
+/turf/open/floor/iron/dark/smooth_edge{
+ dir = 8
+ },
+/area/hallway/primary/central)
"fPe" = (
/obj/effect/landmark/xeno_spawn,
/obj/machinery/light_switch{
@@ -18942,16 +18842,6 @@
},
/turf/open/floor/iron/dark,
/area/engine/engineering)
-"fPZ" = (
-/obj/structure/window/reinforced{
- dir = 4
- },
-/obj/structure/window/reinforced,
-/obj/structure/disposalpipe/segment{
- dir = 2
- },
-/turf/open/floor/iron/dark,
-/area/hallway/primary/central)
"fQg" = (
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/iron,
@@ -19311,13 +19201,6 @@
},
/turf/open/floor/iron,
/area/security/brig)
-"fWh" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
- dir = 8
- },
-/obj/structure/railing/corner,
-/turf/open/floor/iron/dark,
-/area/hallway/primary/central)
"fWm" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
/obj/structure/disposalpipe/segment{
@@ -19362,6 +19245,27 @@
"fXJ" = (
/turf/closed/wall/r_wall/rust,
/area/engine/engine_room)
+"fXY" = (
+/obj/effect/turf_decal/tile/dark_green/half/contrasted{
+ dir = 8
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/structure/cable/yellow{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+ dir = 1
+ },
+/obj/effect/turf_decal/guideline/guideline_in/green{
+ color = "#439C1E"
+ },
+/turf/open/floor/iron/half,
+/area/hallway/primary/central)
"fYm" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/turf_decal/guideline/guideline_edge/purple{
@@ -19779,6 +19683,18 @@
/obj/machinery/suit_storage_unit/standard_unit,
/turf/open/floor/iron/tech,
/area/ai_monitored/storage/eva)
+"gcy" = (
+/obj/structure/railing{
+ dir = 6;
+ layer = 3.1
+ },
+/obj/effect/turf_decal/siding/wideplating/dark{
+ dir = 6
+ },
+/obj/effect/turf_decal/bot,
+/obj/machinery/vending/hydroseeds,
+/turf/open/floor/iron/dark/smooth_large,
+/area/hallway/primary/central)
"gde" = (
/obj/effect/turf_decal/tile/yellow/half/contrasted{
alpha = 180;
@@ -20116,6 +20032,19 @@
broken = 1
},
/area/maintenance/port/central)
+"ggi" = (
+/obj/structure/railing{
+ dir = 5
+ },
+/obj/machinery/light/floor{
+ brightness = 15;
+ bulb_colour = "#FFE4CE";
+ bulb_vacuum_brightness = 15;
+ nightshift_brightness = 10;
+ nightshift_light_color = "#E6EBFF"
+ },
+/turf/open/floor/iron/dark/smooth_large,
+/area/hallway/primary/central)
"ggn" = (
/obj/machinery/door/airlock/external{
req_one_access_txt = "49;47"
@@ -20726,6 +20655,15 @@
/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible,
/turf/open/floor/iron/dark,
/area/engine/atmos)
+"gpQ" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+ dir = 4
+ },
+/obj/structure/railing/corner{
+ dir = 1
+ },
+/turf/open/floor/iron/dark/smooth_large,
+/area/hallway/primary/central)
"gpR" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -20846,15 +20784,6 @@
/obj/structure/lattice,
/turf/open/space/basic,
/area/space/nearstation)
-"gsB" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
- dir = 4
- },
-/obj/structure/railing/corner{
- dir = 8
- },
-/turf/open/floor/iron/dark,
-/area/hallway/primary/central)
"gsK" = (
/obj/structure/table/reinforced,
/obj/effect/turf_decal/stripes{
@@ -21390,12 +21319,6 @@
},
/turf/open/floor/iron/grid/steel,
/area/medical/virology)
-"gCb" = (
-/obj/structure/window/reinforced,
-/obj/structure/closet/firecloset/full,
-/obj/effect/turf_decal/bot,
-/turf/open/floor/iron/dark,
-/area/hallway/primary/central)
"gCh" = (
/obj/structure/window/reinforced{
dir = 1;
@@ -21696,14 +21619,6 @@
burnt = 1
},
/area/maintenance/department/medical)
-"gGk" = (
-/obj/structure/window/reinforced{
- dir = 1;
- layer = 2.9
- },
-/obj/effect/landmark/start/assistant,
-/turf/open/floor/iron/dark,
-/area/hallway/primary/central)
"gGz" = (
/obj/machinery/firealarm{
dir = 4;
@@ -21819,22 +21734,6 @@
/obj/effect/turf_decal/stripes/corner,
/turf/open/floor/iron,
/area/hallway/primary/port)
-"gGU" = (
-/obj/structure/railing{
- dir = 1
- },
-/obj/machinery/light/floor{
- brightness = 15;
- bulb_colour = "#FFE4CE";
- bulb_vacuum_brightness = 15;
- nightshift_brightness = 10;
- nightshift_light_color = "#E6EBFF"
- },
-/obj/effect/turf_decal/siding/wideplating/dark{
- dir = 1
- },
-/turf/open/floor/iron/dark,
-/area/hallway/primary/central)
"gGZ" = (
/obj/effect/turf_decal/tile/dark_green/fourcorners/contrasted,
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
@@ -21952,18 +21851,6 @@
},
/turf/open/floor/iron,
/area/hallway/primary/aft)
-"gJw" = (
-/obj/structure/railing{
- dir = 8
- },
-/obj/effect/turf_decal/siding/wideplating/dark{
- dir = 8
- },
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron/dark/side{
- dir = 8
- },
-/area/hallway/primary/central)
"gJX" = (
/obj/effect/turf_decal/tile/neutral/anticorner{
dir = 1
@@ -22035,6 +21922,23 @@
/obj/effect/turf_decal/bot,
/turf/open/floor/iron/dark,
/area/security/brig/dock)
+"gKx" = (
+/obj/effect/turf_decal/guideline/guideline_in/red{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/dark_red/half/contrasted{
+ alpha = 180;
+ color = "#DE3A3A"
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+ dir = 8
+ },
+/turf/open/floor/iron/large,
+/area/hallway/primary/central)
"gKy" = (
/turf/closed/wall,
/area/quartermaster/warehouse)
@@ -22104,6 +22008,16 @@
/obj/item/stack/sheet/wood/ten,
/turf/open/floor/wood,
/area/library)
+"gLw" = (
+/obj/structure/window/reinforced{
+ dir = 4;
+ layer = 2.9
+ },
+/obj/structure/closet/emcloset,
+/obj/effect/turf_decal/bot,
+/obj/structure/window/reinforced,
+/turf/open/floor/iron/dark/smooth_large,
+/area/hallway/primary/central)
"gLV" = (
/obj/effect/turf_decal/bot,
/obj/machinery/computer/card/minor/ce{
@@ -22397,6 +22311,17 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/turf/open/floor/carpet/purple,
/area/chapel/main)
+"gPb" = (
+/obj/structure/window/reinforced{
+ dir = 8;
+ pixel_y = 1
+ },
+/obj/structure/window/reinforced,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/open/floor/iron/dark/smooth_large,
+/area/hallway/primary/central)
"gPh" = (
/obj/structure/cable/yellow{
icon_state = "4-8"
@@ -22614,14 +22539,6 @@
},
/turf/open/floor/plating,
/area/crew_quarters/heads/hop)
-"gTf" = (
-/obj/structure/chair/fancy/plastic,
-/obj/structure/lattice/catwalk,
-/obj/item/toy/plush/lizard_plushie/space{
- name = "Taksh-Vrac"
- },
-/turf/open/space/basic,
-/area/space/nearstation)
"gTh" = (
/obj/machinery/power/terminal{
dir = 4
@@ -22886,16 +22803,6 @@
},
/turf/open/floor/iron/dark,
/area/ai_monitored/turret_protected/aisat/foyer)
-"gVL" = (
-/obj/effect/turf_decal/siding/wideplating/dark{
- dir = 8
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/railing/corner{
- dir = 8
- },
-/turf/open/floor/iron/dark,
-/area/hallway/primary/central)
"gVP" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
dir = 8
@@ -22942,40 +22849,6 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/turf/open/floor/iron,
/area/hallway/primary/aft)
-"gWV" = (
-/obj/effect/turf_decal/tile/dark_green/half/contrasted{
- dir = 8
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/structure/cable/yellow{
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
- dir = 1
- },
-/obj/effect/turf_decal/guideline/guideline_in/green{
- color = "#439C1E"
- },
-/turf/open/floor/iron,
-/area/hallway/primary/central)
-"gWW" = (
-/obj/effect/turf_decal/tile/blue/half/contrasted{
- dir = 1
- },
-/obj/effect/turf_decal/guideline/guideline_in/blue{
- dir = 8
- },
-/obj/structure/cable/yellow{
- icon_state = "1-2"
- },
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/iron,
-/area/hallway/primary/central)
"gXs" = (
/obj/effect/decal/cleanable/oil,
/turf/open/floor/wood,
@@ -23101,6 +22974,19 @@
/obj/machinery/air_sensor/atmos/oxygen_tank,
/turf/open/floor/engine/o2,
/area/engine/atmos)
+"gZG" = (
+/obj/structure/window/reinforced{
+ dir = 4;
+ layer = 2.9
+ },
+/obj/structure/window/reinforced{
+ dir = 1;
+ layer = 2.9
+ },
+/obj/effect/turf_decal/bot,
+/obj/structure/closet/firecloset/full,
+/turf/open/floor/iron/dark/smooth_large,
+/area/hallway/primary/central)
"gZP" = (
/obj/machinery/computer/bounty{
dir = 8
@@ -23309,6 +23195,17 @@
},
/turf/open/floor/engine,
/area/science/explab)
+"hch" = (
+/obj/structure/window/reinforced{
+ dir = 4;
+ layer = 2.9
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/turf/open/floor/iron/dark/smooth_large,
+/area/hallway/primary/central)
"hcm" = (
/obj/machinery/light/small,
/obj/structure/cable{
@@ -23468,14 +23365,6 @@
/obj/effect/turf_decal/tile/neutral/opposingcorners,
/turf/open/floor/iron,
/area/maintenance/starboard/aft)
-"hfA" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/structure/railing/corner{
- dir = 1
- },
-/turf/open/floor/iron/dark,
-/area/hallway/primary/central)
"hfC" = (
/obj/machinery/door/airlock/maintenance_hatch{
id_tag = "commissarydoor";
@@ -23563,6 +23452,20 @@
},
/turf/open/floor/iron,
/area/hallway/primary/starboard)
+"hgu" = (
+/obj/structure/window/reinforced{
+ dir = 1;
+ layer = 2.9
+ },
+/obj/structure/window/reinforced{
+ dir = 8;
+ pixel_y = 1
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 2
+ },
+/turf/open/floor/iron/dark/smooth_large,
+/area/hallway/primary/central)
"hgw" = (
/obj/effect/turf_decal/tile/blue/half,
/obj/machinery/atmospherics/pipe/manifold/general/visible{
@@ -23711,13 +23614,6 @@
},
/turf/open/floor/iron,
/area/medical/cryo)
-"hjC" = (
-/obj/structure/window/reinforced{
- dir = 1;
- layer = 2.9
- },
-/turf/open/floor/iron/dark,
-/area/hallway/primary/central)
"hjL" = (
/obj/effect/turf_decal/guideline/guideline_in/darkblue{
dir = 8
@@ -23924,6 +23820,21 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/turf/open/floor/iron/cafeteria,
/area/crew_quarters/kitchen)
+"hnm" = (
+/obj/structure/window/reinforced{
+ dir = 8;
+ pixel_y = 1
+ },
+/obj/structure/window/reinforced,
+/obj/machinery/light/floor{
+ brightness = 15;
+ bulb_colour = "#FFE4CE";
+ bulb_vacuum_brightness = 15;
+ nightshift_brightness = 10;
+ nightshift_light_color = "#E6EBFF"
+ },
+/turf/open/floor/iron/dark/smooth_large,
+/area/hallway/primary/central)
"hnA" = (
/obj/machinery/power/solar_control,
/obj/structure/cable{
@@ -23952,24 +23863,6 @@
/obj/structure/frame/machine,
/turf/open/floor/iron,
/area/maintenance/port/aft)
-"hog" = (
-/obj/structure/window/reinforced{
- dir = 8;
- pixel_y = 1
- },
-/obj/structure/window/reinforced{
- dir = 1;
- layer = 2.9
- },
-/obj/machinery/light/floor{
- brightness = 15;
- bulb_colour = "#FFE4CE";
- bulb_vacuum_brightness = 15;
- nightshift_brightness = 10;
- nightshift_light_color = "#E6EBFF"
- },
-/turf/open/floor/iron/dark,
-/area/hallway/primary/central)
"hoj" = (
/obj/machinery/vending/coffee,
/obj/machinery/button/door{
@@ -24110,21 +24003,12 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
/turf/open/floor/iron/dark,
/area/crew_quarters/bar)
-"hsi" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 5
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 5
- },
+"hsc" = (
/obj/structure/cable/yellow{
icon_state = "4-8"
},
-/obj/machinery/light_switch{
- pixel_x = 21;
- pixel_y = 22
- },
-/turf/open/floor/iron/dark,
+/obj/structure/railing/corner,
+/turf/open/floor/iron/dark/smooth_large,
/area/hallway/primary/central)
"hsm" = (
/turf/closed/wall/r_wall,
@@ -25029,6 +24913,21 @@
/obj/structure/lattice,
/turf/open/space/basic,
/area/space/nearstation)
+"hGR" = (
+/obj/structure/railing{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/wideplating/dark{
+ dir = 8
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/disposal/bin,
+/obj/effect/turf_decal/bot,
+/obj/structure/disposalpipe/trunk{
+ dir = 4
+ },
+/turf/open/floor/iron/dark/smooth_large,
+/area/hallway/primary/central)
"hGU" = (
/obj/effect/decal/cleanable/generic,
/obj/structure/lattice/catwalk/over,
@@ -25160,15 +25059,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/tech,
/area/engine/atmos)
-"hKl" = (
-/obj/effect/turf_decal/bot,
-/obj/structure/window/reinforced{
- dir = 8;
- pixel_y = 1
- },
-/obj/machinery/vending/coffee,
-/turf/open/floor/iron/dark,
-/area/hallway/primary/central)
"hKt" = (
/obj/effect/turf_decal/stripes/line,
/obj/effect/decal/cleanable/dirt,
@@ -25497,6 +25387,15 @@
},
/turf/open/floor/iron/dark,
/area/security/courtroom)
+"hOL" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 9
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 9
+ },
+/turf/open/floor/iron/dark/smooth_large,
+/area/hallway/primary/central)
"hOY" = (
/obj/effect/turf_decal/tile/blue/fourcorners/contrasted{
alpha = 200;
@@ -25717,22 +25616,6 @@
/obj/effect/turf_decal/tile/blue/fourcorners/contrasted,
/turf/open/floor/engine,
/area/engine/atmos)
-"hRW" = (
-/obj/structure/railing{
- dir = 4
- },
-/obj/machinery/light/floor{
- brightness = 15;
- bulb_colour = "#FFE4CE";
- bulb_vacuum_brightness = 15;
- nightshift_brightness = 10;
- nightshift_light_color = "#E6EBFF"
- },
-/obj/effect/turf_decal/siding/wideplating/dark{
- dir = 4
- },
-/turf/open/floor/iron/dark,
-/area/hallway/primary/central)
"hRZ" = (
/obj/machinery/status_display/door_timer{
id = "cell";
@@ -25796,6 +25679,15 @@
},
/turf/open/floor/iron,
/area/security/checkpoint/escape)
+"hTs" = (
+/obj/structure/disposalpipe/segment{
+ dir = 2
+ },
+/obj/structure/railing/corner{
+ dir = 1
+ },
+/turf/open/floor/iron/dark/smooth_large,
+/area/hallway/primary/central)
"hTv" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 4
@@ -26286,19 +26178,6 @@
},
/turf/open/floor/iron,
/area/science/storage)
-"idZ" = (
-/obj/effect/turf_decal/guideline/guideline_in/red{
- dir = 4
- },
-/obj/effect/turf_decal/tile/dark_red/half/contrasted{
- alpha = 180;
- color = "#DE3A3A"
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/iron,
-/area/hallway/primary/central)
"iee" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 4
@@ -26333,20 +26212,6 @@
/obj/structure/flora/ausbushes/sunnybush,
/turf/open/floor/grass,
/area/hallway/primary/central)
-"iev" = (
-/obj/structure/window/reinforced{
- dir = 1;
- layer = 2.9
- },
-/obj/structure/window/reinforced{
- dir = 8;
- pixel_y = 1
- },
-/obj/structure/disposalpipe/segment{
- dir = 2
- },
-/turf/open/floor/iron/dark,
-/area/hallway/primary/central)
"ieD" = (
/obj/machinery/power/apc/auto_name/south{
pixel_y = -24
@@ -26644,17 +26509,6 @@
},
/turf/open/floor/iron,
/area/engine/engine_room)
-"ikk" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/structure/disposalpipe/segment{
- dir = 10
- },
-/turf/open/floor/iron/dark,
-/area/hallway/primary/central)
"iks" = (
/obj/structure/sign/departments/minsky/supply/hydroponics2,
/turf/closed/wall,
@@ -26870,6 +26724,17 @@
},
/turf/open/floor/iron,
/area/crew_quarters/dorms)
+"iot" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/structure/disposalpipe/segment{
+ dir = 2
+ },
+/obj/structure/railing/corner{
+ dir = 1
+ },
+/turf/open/floor/iron/dark/smooth_large,
+/area/hallway/primary/central)
"iov" = (
/obj/structure/railing/corner{
dir = 1
@@ -27147,22 +27012,6 @@
/obj/structure/window/reinforced,
/turf/open/floor/engine,
/area/science/xenobiology)
-"irW" = (
-/obj/structure/disposalpipe/segment{
- dir = 1
- },
-/obj/effect/turf_decal/tile/yellow/half/contrasted{
- alpha = 180
- },
-/obj/effect/turf_decal/guideline/guideline_in/yellow{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/turf/open/floor/iron,
-/area/hallway/primary/central)
"isp" = (
/obj/machinery/door/poddoor/preopen{
id = "detectivewindows";
@@ -27591,6 +27440,13 @@
},
/turf/open/floor/iron/dark,
/area/science/mixing)
+"izC" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
+/obj/structure/railing/corner{
+ dir = 4
+ },
+/turf/open/floor/iron/dark/smooth_large,
+/area/hallway/primary/central)
"izF" = (
/turf/open/floor/plating{
broken = 1
@@ -27606,6 +27462,20 @@
},
/turf/open/floor/iron,
/area/science/storage)
+"iAk" = (
+/obj/effect/turf_decal/guideline/guideline_in/darkblue{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/dark_blue/half/contrasted{
+ alpha = 180;
+ dir = 1
+ },
+/obj/structure/disposalpipe/segment,
+/obj/structure/cable/yellow{
+ icon_state = "1-2"
+ },
+/turf/open/floor/iron/large,
+/area/hallway/primary/central)
"iAx" = (
/obj/effect/turf_decal/stripes/corner,
/obj/structure/cable{
@@ -28583,17 +28453,6 @@
/obj/structure/lattice/catwalk/over,
/turf/open/floor/plating,
/area/maintenance/disposal)
-"iSM" = (
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
- dir = 4
- },
-/obj/machinery/navbeacon{
- codes_txt = "patrol;next_patrol=5-WHall";
- location = "4-CenterNW"
- },
-/turf/open/floor/iron/dark,
-/area/hallway/primary/central)
"iST" = (
/turf/closed/wall/r_wall,
/area/tcommsat/computer)
@@ -28776,6 +28635,18 @@
/obj/effect/turf_decal/bot,
/turf/open/floor/iron/dark,
/area/security/checkpoint/auxiliary)
+"iWM" = (
+/obj/structure/railing{
+ layer = 3.1
+ },
+/obj/structure/chair/fancy/comfy{
+ buildstackamount = 0;
+ color = "#742925";
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/wideplating/dark,
+/turf/open/floor/iron/dark/smooth_large,
+/area/hallway/primary/central)
"iXg" = (
/obj/structure/cable/yellow{
icon_state = "0-8"
@@ -29791,19 +29662,6 @@
lighting_overlay_colour = "#DDE6FF";
power_light = 0
})
-"jnT" = (
-/obj/structure/window/reinforced{
- dir = 1;
- layer = 2.9
- },
-/obj/structure/window/reinforced{
- dir = 8;
- pixel_y = 1
- },
-/obj/structure/closet/firecloset/full,
-/obj/effect/turf_decal/bot,
-/turf/open/floor/iron/dark,
-/area/hallway/primary/central)
"joH" = (
/obj/structure/table/reinforced,
/obj/item/reagent_containers/food/condiment/saltshaker{
@@ -29990,18 +29848,6 @@
},
/turf/open/floor/iron,
/area/hallway/primary/aft)
-"jrF" = (
-/obj/structure/window/reinforced{
- dir = 8;
- pixel_y = 1
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/structure/disposalpipe/segment{
- dir = 2
- },
-/turf/open/floor/iron/dark,
-/area/hallway/primary/central)
"jrO" = (
/obj/effect/turf_decal/tile/brown/half/contrasted{
dir = 1
@@ -30067,6 +29913,21 @@
/obj/item/wirebrush,
/turf/open/floor/wood,
/area/maintenance/port/aft)
+"jsa" = (
+/obj/effect/turf_decal/guideline/guideline_in/neutral{
+ alpha = 255;
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/neutral/half/contrasted{
+ alpha = 140;
+ color = "#FFFFFF";
+ dir = 4
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/open/floor/iron/half,
+/area/hallway/primary/central)
"jsd" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/light{
@@ -30256,20 +30117,6 @@
/obj/machinery/light,
/turf/open/floor/carpet/green,
/area/security/courtroom)
-"juB" = (
-/obj/structure/railing/corner{
- dir = 4
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/iron/dark/side{
- dir = 9
- },
-/area/hallway/primary/central)
"juC" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 5
@@ -30398,21 +30245,6 @@
},
/turf/open/floor/iron/dark/side,
/area/hallway/primary/central)
-"jwG" = (
-/obj/effect/turf_decal/guideline/guideline_in/neutral{
- alpha = 255;
- dir = 1
- },
-/obj/effect/turf_decal/tile/neutral/half/contrasted{
- alpha = 140;
- color = "#FFFFFF";
- dir = 4
- },
-/obj/structure/disposalpipe/segment{
- dir = 8
- },
-/turf/open/floor/iron,
-/area/hallway/primary/central)
"jwV" = (
/obj/effect/turf_decal/stripes/line,
/obj/machinery/firealarm{
@@ -30689,10 +30521,6 @@
/obj/effect/spawner/lootdrop/grille_or_trash,
/turf/open/floor/iron/sepia,
/area/maintenance/port/central)
-"jBi" = (
-/obj/structure/railing/corner,
-/turf/open/floor/iron/dark,
-/area/hallway/primary/central)
"jBw" = (
/turf/closed/wall,
/area/maintenance/department/security)
@@ -31264,6 +31092,13 @@
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/engine/atmos)
+"jIN" = (
+/obj/structure/railing,
+/obj/effect/turf_decal/siding/wideplating/dark,
+/turf/open/floor/iron/dark/smooth_edge{
+ dir = 1
+ },
+/area/hallway/primary/central)
"jJw" = (
/obj/structure/window/reinforced{
dir = 1
@@ -31535,6 +31370,23 @@
dir = 8
},
/area/medical/medbay/central)
+"jOD" = (
+/obj/effect/turf_decal/tile/dark_green/half/contrasted{
+ dir = 8
+ },
+/obj/structure/cable/yellow{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2,
+/obj/structure/disposalpipe/junction{
+ dir = 8
+ },
+/obj/effect/turf_decal/guideline/guideline_in/green{
+ color = "#439C1E"
+ },
+/turf/open/floor/iron/half,
+/area/hallway/primary/central)
"jOP" = (
/obj/machinery/atmospherics/pipe/simple/cyan/visible{
dir = 1
@@ -31880,6 +31732,24 @@
},
/turf/open/floor/wood,
/area/security/prison)
+"jTt" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/obj/structure/cable/yellow{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 9
+ },
+/turf/open/floor/iron/dark/smooth_large,
+/area/hallway/primary/central)
"jTQ" = (
/obj/effect/turf_decal/loading_area{
dir = 1
@@ -31924,21 +31794,6 @@
},
/turf/open/floor/circuit/green,
/area/science/robotics/mechbay)
-"jUL" = (
-/obj/effect/turf_decal/guideline/guideline_in/red{
- dir = 4
- },
-/obj/effect/turf_decal/tile/dark_red/half/contrasted{
- alpha = 180;
- color = "#DE3A3A"
- },
-/obj/structure/disposalpipe/segment,
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/turf/open/floor/iron,
-/area/hallway/primary/central)
"jVj" = (
/obj/structure/grille/broken,
/turf/open/floor/plating,
@@ -32020,6 +31875,16 @@
/obj/item/book/manual/wiki/sopengineering,
/turf/open/floor/iron/dark,
/area/engine/engineering)
+"jWX" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/structure/railing/corner{
+ dir = 4
+ },
+/turf/open/floor/iron/dark/smooth_large,
+/area/hallway/primary/central)
"jXt" = (
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
/obj/effect/turf_decal/tile/dark_red/fourcorners/contrasted{
@@ -32548,36 +32413,6 @@
/obj/structure/cable/yellow,
/turf/open/floor/iron,
/area/science/robotics)
-"kgg" = (
-/obj/structure/table/reinforced,
-/obj/item/paper/guides/recycler,
-/obj/machinery/button/massdriver{
- id = "TrashDisp";
- pixel_x = -29;
- pixel_y = 8
- },
-/obj/machinery/button/door{
- id = "TrashDoor";
- name = "Disposal Vent Control";
- pixel_x = -39;
- pixel_y = 7;
- req_access_txt = "12"
- },
-/obj/structure/lattice/catwalk/over,
-/obj/item/radio/intercom{
- dir = 1;
- pixel_x = -34;
- pixel_y = -7
- },
-/obj/machinery/light_switch{
- pixel_x = -21;
- pixel_y = 8
- },
-/obj/item/toy/plush/lizard_plushie{
- name = "Eats-The-Rubbish"
- },
-/turf/open/floor/plating,
-/area/maintenance/disposal)
"kgx" = (
/obj/structure/window/reinforced{
dir = 4
@@ -32887,6 +32722,18 @@
},
/turf/open/floor/iron,
/area/crew_quarters/dorms)
+"kkP" = (
+/obj/effect/turf_decal/siding/wideplating/dark{
+ dir = 8
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/railing/corner{
+ dir = 8
+ },
+/turf/open/floor/iron/dark/smooth_edge{
+ dir = 4
+ },
+/area/hallway/primary/central)
"kkV" = (
/obj/effect/turf_decal/tile/dark_red/half/contrasted{
alpha = 180;
@@ -33015,20 +32862,6 @@
},
/turf/open/floor/iron/dark,
/area/quartermaster/sorting)
-"kmo" = (
-/obj/structure/railing/corner{
- dir = 1
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/obj/structure/disposalpipe/segment{
- dir = 8
- },
-/turf/open/floor/iron/dark/side{
- dir = 5
- },
-/area/hallway/primary/central)
"kmp" = (
/obj/effect/turf_decal/tile/yellow{
dir = 4
@@ -33077,16 +32910,6 @@
},
/turf/open/floor/iron/dark,
/area/storage/primary)
-"knE" = (
-/obj/structure/cable{
- icon_state = "0-4"
- },
-/obj/machinery/power/solar{
- id = "portsolar";
- name = "Port Solar Array"
- },
-/turf/open/floor/iron/airless/solarpanel,
-/area/solar/starboard/fore)
"knW" = (
/obj/effect/turf_decal/tile/dark_red/fourcorners/contrasted{
alpha = 180;
@@ -33104,6 +32927,25 @@
},
/turf/open/floor/iron,
/area/security/brig)
+"knY" = (
+/obj/effect/turf_decal/tile/brown/half/contrasted{
+ dir = 8
+ },
+/obj/effect/turf_decal/guideline/guideline_in/brown,
+/obj/structure/disposalpipe/segment{
+ dir = 8
+ },
+/obj/structure/cable/yellow{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+ dir = 1
+ },
+/turf/open/floor/iron/half,
+/area/hallway/primary/central)
"kob" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/door/poddoor/shutters/preopen{
@@ -33244,17 +33086,6 @@
},
/turf/open/floor/iron,
/area/security/checkpoint/medical)
-"kqy" = (
-/obj/structure/window/reinforced,
-/obj/structure/window/reinforced{
- dir = 8;
- pixel_y = 1
- },
-/obj/structure/disposalpipe/segment{
- dir = 5
- },
-/turf/open/floor/iron/dark,
-/area/hallway/primary/central)
"krf" = (
/obj/effect/turf_decal/stripes/corner{
dir = 1
@@ -33411,6 +33242,14 @@
/obj/effect/landmark/xeno_spawn,
/turf/open/floor/plating,
/area/maintenance/port/aft)
+"ksJ" = (
+/obj/structure/window/reinforced{
+ dir = 1;
+ layer = 2.9
+ },
+/obj/effect/landmark/start/assistant,
+/turf/open/floor/iron/dark/smooth_large,
+/area/hallway/primary/central)
"ksT" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
dir = 4
@@ -33422,6 +33261,22 @@
/mob/living/carbon/monkey,
/turf/open/floor/iron/grid/steel,
/area/medical/virology)
+"kts" = (
+/obj/effect/turf_decal/tile/blue/half/contrasted{
+ dir = 1
+ },
+/obj/effect/turf_decal/guideline/guideline_in/blue{
+ dir = 8
+ },
+/obj/structure/disposalpipe/segment,
+/obj/structure/cable/yellow{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+ dir = 8
+ },
+/turf/open/floor/iron/large,
+/area/hallway/primary/central)
"ktu" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/wood,
@@ -33570,11 +33425,6 @@
"kwh" = (
/turf/closed/wall,
/area/engine/engineering)
-"kwm" = (
-/obj/item/clothing/suit/hooded/cultrobes/alt,
-/obj/item/toy/toy_dagger,
-/turf/open/floor/iron/cult,
-/area/chapel/office)
"kwv" = (
/obj/machinery/meter,
/obj/machinery/atmospherics/pipe/manifold/general/visible{
@@ -33647,6 +33497,18 @@
},
/turf/open/floor/wood,
/area/security/courtroom)
+"kxA" = (
+/obj/structure/disposalpipe/segment{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/purple/half/contrasted{
+ dir = 4
+ },
+/obj/effect/turf_decal/guideline/guideline_in/purple{
+ dir = 1
+ },
+/turf/open/floor/iron/half,
+/area/hallway/primary/central)
"kxM" = (
/obj/structure/lattice/catwalk/over,
/obj/effect/turf_decal/guideline/guideline_out/brown{
@@ -33666,6 +33528,16 @@
},
/turf/open/floor/plating,
/area/maintenance/central)
+"kxO" = (
+/obj/structure/cable{
+ icon_state = "0-8"
+ },
+/obj/machinery/power/solar{
+ id = "portsolar";
+ name = "Port Solar Array"
+ },
+/turf/open/floor/iron/solarpanel/airless,
+/area/solar/starboard/fore)
"kxQ" = (
/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/mix_output{
dir = 8
@@ -34204,17 +34076,6 @@
},
/turf/open/floor/iron,
/area/hallway/primary/port)
-"kHH" = (
-/obj/structure/railing{
- layer = 3.1
- },
-/obj/structure/chair/fancy/comfy{
- color = "#596479";
- dir = 1
- },
-/obj/effect/turf_decal/siding/wideplating/dark,
-/turf/open/floor/iron/dark/side,
-/area/hallway/primary/central)
"kIg" = (
/obj/item/soap/nanotrasen,
/obj/effect/turf_decal/delivery,
@@ -34379,6 +34240,21 @@
},
/turf/open/floor/iron/dark,
/area/quartermaster/storage)
+"kJY" = (
+/obj/effect/turf_decal/guideline/guideline_in/neutral{
+ alpha = 255;
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/neutral/half/contrasted{
+ alpha = 140;
+ color = "#FFFFFF";
+ dir = 4
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 8
+ },
+/turf/open/floor/iron/half,
+/area/hallway/primary/central)
"kKf" = (
/obj/structure/cable/yellow{
icon_state = "4-8"
@@ -34770,6 +34646,16 @@
/obj/machinery/power/tesla_coil,
/turf/open/floor/iron/tech/grid,
/area/engine/engineering)
+"kRy" = (
+/obj/structure/railing/corner,
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 1
+ },
+/turf/open/floor/iron/dark/smooth_large,
+/area/hallway/primary/central)
"kRI" = (
/obj/machinery/status_display/evac,
/turf/closed/wall,
@@ -35298,19 +35184,6 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/turf/open/floor/iron,
/area/bridge)
-"kYQ" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/structure/disposalpipe/segment{
- dir = 5
- },
-/obj/structure/railing/corner{
- dir = 4
- },
-/turf/open/floor/iron/dark,
-/area/hallway/primary/central)
"kZd" = (
/obj/machinery/door/poddoor/preopen{
id = "Engineering";
@@ -35598,6 +35471,18 @@
/obj/effect/turf_decal/tile/red/fourcorners/contrasted,
/turf/open/floor/prison,
/area/security/prison)
+"lct" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/structure/cable/yellow{
+ icon_state = "1-2"
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 6
+ },
+/turf/open/floor/iron/dark/smooth_large,
+/area/hallway/primary/central)
"lcG" = (
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
dir = 4
@@ -35777,14 +35662,6 @@
/obj/machinery/pdapainter,
/turf/open/floor/wood,
/area/crew_quarters/heads/hop)
-"lfo" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/structure/railing/corner{
- dir = 8
- },
-/turf/open/floor/iron/dark,
-/area/hallway/primary/central)
"lfw" = (
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 8
@@ -36176,6 +36053,19 @@
},
/turf/open/floor/plating,
/area/crew_quarters/heads/captain)
+"lnP" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/structure/disposalpipe/segment{
+ dir = 5
+ },
+/obj/structure/railing/corner{
+ dir = 4
+ },
+/turf/open/floor/iron/dark/smooth_large,
+/area/hallway/primary/central)
"lnW" = (
/obj/structure/cable/yellow{
icon_state = "1-2"
@@ -36219,17 +36109,6 @@
/obj/effect/turf_decal/siding/wideplating/dark,
/turf/open/floor/iron/dark,
/area/crew_quarters/bar)
-"loC" = (
-/obj/structure/window/reinforced{
- dir = 4
- },
-/obj/structure/chair/fancy/comfy{
- color = "#596479";
- dir = 8
- },
-/obj/structure/window/reinforced,
-/turf/open/floor/iron/dark,
-/area/hallway/primary/central)
"loD" = (
/obj/structure/chair/office/light{
dir = 4
@@ -36338,6 +36217,24 @@
},
/turf/open/floor/iron,
/area/engine/engine_room)
+"lpW" = (
+/obj/structure/window/reinforced{
+ dir = 8;
+ pixel_y = 1
+ },
+/obj/structure/window/reinforced{
+ dir = 1;
+ layer = 2.9
+ },
+/obj/machinery/light/floor{
+ brightness = 15;
+ bulb_colour = "#FFE4CE";
+ bulb_vacuum_brightness = 15;
+ nightshift_brightness = 10;
+ nightshift_light_color = "#E6EBFF"
+ },
+/turf/open/floor/iron/dark/smooth_large,
+/area/hallway/primary/central)
"lqc" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
@@ -36445,21 +36342,6 @@
/obj/structure/cable/yellow,
/turf/open/floor/plating,
/area/quartermaster/miningdock)
-"lsf" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/effect/turf_decal/tile/purple/half/contrasted{
- dir = 4
- },
-/obj/effect/turf_decal/guideline/guideline_in/purple{
- dir = 1
- },
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
- dir = 1
- },
-/turf/open/floor/iron,
-/area/hallway/primary/central)
"lsB" = (
/obj/effect/turf_decal/tile/blue/half/contrasted{
alpha = 200;
@@ -36690,6 +36572,17 @@
/obj/structure/closet/crate,
/turf/open/floor/iron/dark,
/area/quartermaster/storage)
+"lvh" = (
+/obj/structure/railing{
+ dir = 9
+ },
+/obj/machinery/vending/custom,
+/obj/effect/turf_decal/siding/wideplating/dark{
+ dir = 9
+ },
+/obj/effect/turf_decal/bot,
+/turf/open/floor/iron/dark/smooth_large,
+/area/hallway/primary/central)
"lvs" = (
/obj/effect/turf_decal/siding/wood,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
@@ -36700,6 +36593,16 @@
},
/turf/open/floor/wood,
/area/crew_quarters/dorms)
+"lvA" = (
+/obj/structure/cable{
+ icon_state = "0-4"
+ },
+/obj/machinery/power/solar{
+ id = "portsolar";
+ name = "Port Solar Array"
+ },
+/turf/open/floor/iron/solarpanel/airless,
+/area/solar/port/aft)
"lvJ" = (
/obj/effect/turf_decal/stripes/line{
dir = 6
@@ -36777,18 +36680,6 @@
dir = 1
},
/area/science/research)
-"lxB" = (
-/obj/structure/railing{
- dir = 1
- },
-/obj/effect/turf_decal/siding/wideplating/dark{
- dir = 1
- },
-/obj/structure/disposalpipe/segment{
- dir = 2
- },
-/turf/open/floor/iron/dark,
-/area/hallway/primary/central)
"lxE" = (
/obj/machinery/newscaster{
pixel_y = 33
@@ -36878,17 +36769,21 @@
/obj/structure/chair,
/turf/open/floor/plating,
/area/maintenance/department/bridge)
-"lzC" = (
-/obj/structure/railing{
- dir = 6;
- layer = 3.1
+"lzr" = (
+/obj/effect/turf_decal/tile/blue/half/contrasted{
+ dir = 1
},
-/obj/effect/turf_decal/siding/wideplating/dark{
- dir = 6
+/obj/effect/turf_decal/guideline/guideline_in/blue{
+ dir = 8
},
-/obj/effect/turf_decal/bot,
-/obj/machinery/vending/hydroseeds,
-/turf/open/floor/iron/dark,
+/obj/structure/disposalpipe/segment,
+/obj/structure/cable/yellow{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+ dir = 8
+ },
+/turf/open/floor/iron/large,
/area/hallway/primary/central)
"lzD" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
@@ -36949,15 +36844,6 @@
},
/turf/open/floor/carpet/blue,
/area/medical/exam_room)
-"lAD" = (
-/obj/effect/turf_decal/bot,
-/obj/structure/window/reinforced{
- dir = 4;
- layer = 2.9
- },
-/obj/machinery/vending/cola,
-/turf/open/floor/iron/dark,
-/area/hallway/primary/central)
"lAP" = (
/obj/structure/cable/yellow{
icon_state = "4-8"
@@ -37401,14 +37287,6 @@
/obj/effect/turf_decal/tile/neutral/half/contrasted,
/turf/open/floor/iron,
/area/engine/atmos)
-"lJE" = (
-/obj/structure/window/reinforced{
- dir = 4;
- layer = 2.9
- },
-/obj/structure/window/reinforced,
-/turf/open/floor/iron/dark,
-/area/hallway/primary/central)
"lKh" = (
/turf/open/floor/engine/airless,
/area/engine/atmos)
@@ -37850,18 +37728,6 @@
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/hallway/secondary/entry)
-"lSY" = (
-/obj/structure/railing{
- dir = 10;
- layer = 3.1
- },
-/obj/effect/spawner/randomvend/cola,
-/obj/effect/turf_decal/siding/wideplating/dark{
- dir = 10
- },
-/obj/effect/turf_decal/bot,
-/turf/open/floor/iron/dark,
-/area/hallway/primary/central)
"lSZ" = (
/obj/structure/chair/office,
/obj/effect/decal/cleanable/dirt/dust,
@@ -38386,6 +38252,16 @@
},
/turf/open/floor/iron,
/area/hallway/primary/aft)
+"lZt" = (
+/obj/structure/railing{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/wideplating/dark{
+ dir = 8
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/iron/dark/smooth_large,
+/area/hallway/primary/central)
"lZw" = (
/obj/structure/destructible/cult/tome,
/obj/item/book/codex_gigas,
@@ -38470,6 +38346,14 @@
/area/security/brig/dock{
name = "Security E.V.A. Storage"
})
+"mbh" = (
+/obj/effect/turf_decal/siding/wideplating/dark{
+ dir = 8
+ },
+/turf/open/floor/iron/dark/smooth_edge{
+ dir = 4
+ },
+/area/hallway/primary/central)
"mbi" = (
/obj/effect/turf_decal/guideline/guideline_out/brown{
dir = 1
@@ -38718,6 +38602,17 @@
},
/turf/open/floor/iron/dark,
/area/medical/virology)
+"met" = (
+/obj/structure/railing{
+ dir = 5
+ },
+/obj/machinery/vending/cigarette,
+/obj/effect/turf_decal/siding/wideplating/dark{
+ dir = 5
+ },
+/obj/effect/turf_decal/bot,
+/turf/open/floor/iron/dark/smooth_large,
+/area/hallway/primary/central)
"mev" = (
/obj/machinery/computer/secure_data{
dir = 8
@@ -38743,22 +38638,6 @@
/obj/machinery/firealarm/directional/north,
/turf/open/floor/iron,
/area/hallway/primary/starboard)
-"meK" = (
-/obj/effect/turf_decal/tile/blue/half/contrasted{
- dir = 1
- },
-/obj/effect/turf_decal/guideline/guideline_in/blue{
- dir = 8
- },
-/obj/structure/disposalpipe/segment,
-/obj/structure/cable/yellow{
- icon_state = "1-2"
- },
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
- dir = 8
- },
-/turf/open/floor/iron,
-/area/hallway/primary/central)
"mfj" = (
/obj/structure/bookcase/random/reference,
/obj/structure/disposalpipe/segment{
@@ -38922,15 +38801,6 @@
},
/turf/open/floor/iron/dark,
/area/quartermaster/office)
-"mhh" = (
-/obj/structure/disposalpipe/segment{
- dir = 2
- },
-/obj/structure/railing/corner{
- dir = 1
- },
-/turf/open/floor/iron/dark,
-/area/hallway/primary/central)
"mhj" = (
/obj/effect/turf_decal/guideline/guideline_edge/neutral{
alpha = 255;
@@ -39384,15 +39254,6 @@
/obj/structure/table/reinforced,
/turf/open/floor/iron/dark,
/area/vacant_room/commissary/commissary1)
-"mpV" = (
-/obj/structure/railing{
- dir = 4
- },
-/obj/effect/turf_decal/siding/wideplating/dark{
- dir = 4
- },
-/turf/open/floor/iron/dark,
-/area/hallway/primary/central)
"mpX" = (
/obj/effect/turf_decal/tile/blue/fourcorners/contrasted{
alpha = 200;
@@ -39696,6 +39557,14 @@
},
/turf/open/floor/iron,
/area/medical/storage)
+"mug" = (
+/obj/structure/railing/corner,
+/obj/effect/turf_decal/stripes/line,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/open/floor/iron/dark/smooth_large,
+/area/hallway/primary/central)
"muj" = (
/obj/effect/decal/cleanable/generic,
/turf/open/floor/iron,
@@ -39839,13 +39708,6 @@
},
/turf/open/floor/iron/freezer,
/area/crew_quarters/kitchen/coldroom)
-"mwM" = (
-/obj/structure/cable/yellow{
- icon_state = "4-8"
- },
-/obj/structure/railing/corner,
-/turf/open/floor/iron/dark,
-/area/hallway/primary/central)
"mwN" = (
/obj/structure/cable/yellow{
icon_state = "4-8"
@@ -40081,15 +39943,6 @@
broken = 1
},
/area/maintenance/department/engine)
-"mzP" = (
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
- dir = 4
- },
-/turf/open/floor/iron/dark,
-/area/hallway/primary/central)
"mzS" = (
/obj/machinery/computer/mech_bay_power_console,
/obj/machinery/airalarm/directional/north,
@@ -40143,14 +39996,15 @@
/obj/effect/turf_decal/box,
/turf/open/floor/iron/dark,
/area/ai_monitored/security/armory)
-"mAE" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
- dir = 8
- },
-/obj/structure/railing/corner{
- dir = 4
+"mAM" = (
+/obj/structure/window/reinforced{
+ dir = 8;
+ pixel_y = 1
},
-/turf/open/floor/iron/dark,
+/obj/structure/window/reinforced,
+/obj/structure/closet/emcloset,
+/obj/effect/turf_decal/bot,
+/turf/open/floor/iron/dark/smooth_large,
/area/hallway/primary/central)
"mAO" = (
/obj/structure/sign/poster/random,
@@ -40172,16 +40026,6 @@
},
/turf/open/floor/wood,
/area/library)
-"mBc" = (
-/obj/structure/cable{
- icon_state = "0-8"
- },
-/obj/machinery/power/solar{
- id = "portsolar";
- name = "Port Solar Array"
- },
-/turf/open/floor/iron/airless/solarpanel,
-/area/solar/port/aft)
"mBh" = (
/obj/machinery/atmospherics/pipe/simple/general/visible{
dir = 9
@@ -40248,6 +40092,15 @@
},
/turf/open/floor/plating,
/area/ai_monitored/storage/satellite)
+"mCn" = (
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+ dir = 4
+ },
+/turf/open/floor/iron/dark/smooth_large,
+/area/hallway/primary/central)
"mCE" = (
/obj/effect/turf_decal/tile/neutral/half{
dir = 1
@@ -40260,16 +40113,6 @@
},
/turf/open/floor/iron/dark,
/area/chapel/office)
-"mCI" = (
-/obj/structure/cable{
- icon_state = "0-8"
- },
-/obj/machinery/power/solar{
- id = "portsolar";
- name = "Port Solar Array"
- },
-/turf/open/floor/iron/airless/solarpanel,
-/area/solar/starboard/fore)
"mCQ" = (
/turf/open/floor/iron/white,
/area/medical/chemistry)
@@ -40347,6 +40190,11 @@
},
/turf/open/floor/iron,
/area/hallway/primary/port)
+"mDx" = (
+/obj/item/clothing/suit/hooded/cultrobes/alt,
+/obj/item/toy/toy_dagger,
+/turf/open/floor/cult,
+/area/chapel/office)
"mDG" = (
/obj/structure/chair{
dir = 8
@@ -40885,6 +40733,16 @@
},
/turf/open/floor/iron/white,
/area/medical/sleeper)
+"mKV" = (
+/obj/structure/cable{
+ icon_state = "0-4"
+ },
+/obj/machinery/power/solar{
+ id = "portsolar";
+ name = "Port Solar Array"
+ },
+/turf/open/floor/iron/solarpanel/airless,
+/area/solar/port/fore)
"mLj" = (
/obj/machinery/portable_atmospherics/scrubber,
/obj/effect/turf_decal/bot{
@@ -41000,14 +40858,6 @@
"mMV" = (
/turf/open/floor/iron/dark,
/area/bridge)
-"mNa" = (
-/obj/structure/window/reinforced,
-/obj/structure/cable/yellow{
- icon_state = "4-8"
- },
-/obj/effect/landmark/start/assistant,
-/turf/open/floor/iron/dark,
-/area/hallway/primary/central)
"mNb" = (
/obj/structure/chair/fancy/corp{
dir = 8
@@ -41089,6 +40939,17 @@
dir = 8
},
/area/hallway/primary/central)
+"mPB" = (
+/obj/structure/railing{
+ layer = 3.1
+ },
+/obj/structure/chair/fancy/comfy{
+ color = "#596479";
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/wideplating/dark,
+/turf/open/floor/iron/dark/smooth_large,
+/area/hallway/primary/central)
"mPQ" = (
/obj/effect/spawner/structure/window/reinforced/tinted,
/obj/structure/cable/yellow{
@@ -41137,19 +40998,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron,
/area/maintenance/department/science)
-"mQS" = (
-/obj/structure/railing{
- dir = 10
- },
-/obj/machinery/light/floor{
- brightness = 15;
- bulb_colour = "#FFE4CE";
- bulb_vacuum_brightness = 15;
- nightshift_brightness = 10;
- nightshift_light_color = "#E6EBFF"
- },
-/turf/open/floor/iron/dark,
-/area/hallway/primary/central)
"mRi" = (
/obj/structure/disposalpipe/segment{
dir = 10
@@ -41238,6 +41086,18 @@
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/bridge)
+"mRU" = (
+/obj/structure/disposalpipe/segment,
+/obj/effect/turf_decal/tile/yellow/half/contrasted{
+ alpha = 180
+ },
+/obj/effect/turf_decal/guideline/guideline_in/yellow{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/turf/open/floor/iron/large,
+/area/hallway/primary/central)
"mRV" = (
/turf/closed/wall/mineral/plastitanium,
/area/security/brig/medbay)
@@ -41683,6 +41543,23 @@
/obj/effect/decal/cleanable/glass,
/turf/open/floor/plating,
/area/maintenance/department/engine)
+"mYl" = (
+/obj/effect/turf_decal/tile/purple/half/contrasted{
+ dir = 4
+ },
+/obj/effect/turf_decal/guideline/guideline_in/purple{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 2
+ },
+/turf/open/floor/iron/half,
+/area/hallway/primary/central)
"mYz" = (
/obj/structure/table,
/obj/item/book/manual/wiki/sopsecurity,
@@ -41864,19 +41741,6 @@
},
/turf/open/floor/iron,
/area/medical/surgery)
-"ncn" = (
-/obj/structure/window/reinforced,
-/obj/structure/window/reinforced{
- dir = 8;
- pixel_y = 1
- },
-/obj/structure/chair/fancy/comfy{
- buildstackamount = 0;
- color = "#742925";
- dir = 4
- },
-/turf/open/floor/iron/dark,
-/area/hallway/primary/central)
"ncI" = (
/obj/structure/bookcase/random/nonfiction,
/turf/open/floor/wood,
@@ -42300,21 +42164,26 @@
"nif" = (
/turf/closed/wall/r_wall,
/area/science/test_area)
-"nim" = (
-/obj/effect/turf_decal/tile/blue/half/contrasted{
+"nik" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
dir = 1
},
-/obj/effect/turf_decal/guideline/guideline_in/blue{
+/obj/structure/railing/corner{
dir = 8
},
-/obj/structure/disposalpipe/segment,
-/obj/structure/cable/yellow{
- icon_state = "1-2"
+/turf/open/floor/iron/dark/smooth_large,
+/area/hallway/primary/central)
+"nix" = (
+/obj/structure/window/reinforced{
+ dir = 4;
+ layer = 2.9
},
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
- dir = 8
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/structure/disposalpipe/segment{
+ dir = 2
},
-/turf/open/floor/iron,
+/turf/open/floor/iron/dark/smooth_large,
/area/hallway/primary/central)
"niE" = (
/obj/effect/decal/cleanable/insectguts,
@@ -42497,6 +42366,34 @@
burnt = 1
},
/area/maintenance/port/central)
+"nkR" = (
+/obj/structure/railing{
+ dir = 1
+ },
+/obj/machinery/light/floor{
+ brightness = 15;
+ bulb_colour = "#FFE4CE";
+ bulb_vacuum_brightness = 15;
+ nightshift_brightness = 10;
+ nightshift_light_color = "#E6EBFF"
+ },
+/obj/effect/turf_decal/siding/wideplating/dark{
+ dir = 1
+ },
+/turf/open/floor/iron/dark/smooth_edge,
+/area/hallway/primary/central)
+"nkT" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 6
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 6
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 2
+ },
+/turf/open/floor/iron/dark/smooth_large,
+/area/hallway/primary/central)
"nld" = (
/obj/effect/turf_decal/tile/dark_red/fourcorners/contrasted{
alpha = 180;
@@ -43356,6 +43253,19 @@
/obj/effect/decal/cleanable/blood/footprints,
/turf/open/floor/iron/dark,
/area/medical/morgue)
+"nvp" = (
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+ dir = 1
+ },
+/obj/machinery/navbeacon{
+ codes_txt = "patrol;next_patrol=12-SSci";
+ location = "11-CenterSW"
+ },
+/turf/open/floor/iron/dark/smooth_large,
+/area/hallway/primary/central)
"nvC" = (
/obj/machinery/atmospherics/pipe/simple/cyan/visible,
/obj/machinery/atmospherics/pipe/simple/cyan/visible/layer2,
@@ -43426,27 +43336,6 @@
},
/turf/open/floor/iron,
/area/hallway/primary/port)
-"nxu" = (
-/obj/structure/window/reinforced{
- dir = 1;
- layer = 2.9
- },
-/obj/structure/window/reinforced{
- dir = 8;
- pixel_y = 1
- },
-/turf/open/floor/iron/dark,
-/area/hallway/primary/central)
-"nxy" = (
-/obj/structure/cable{
- icon_state = "0-4"
- },
-/obj/machinery/power/solar{
- id = "portsolar";
- name = "Port Solar Array"
- },
-/turf/open/floor/iron/airless/solarpanel,
-/area/solar/starboard/aft)
"nxD" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
@@ -43552,6 +43441,15 @@
},
/turf/open/floor/iron/dark,
/area/quartermaster/sorting)
+"nzq" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+ dir = 8
+ },
+/obj/structure/railing/corner{
+ dir = 4
+ },
+/turf/open/floor/iron/dark/smooth_large,
+/area/hallway/primary/central)
"nzy" = (
/obj/effect/turf_decal/tile/dark_green/anticorner/contrasted,
/obj/effect/decal/cleanable/dirt,
@@ -43647,27 +43545,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron,
/area/engine/atmos)
-"nAM" = (
-/obj/effect/turf_decal/guideline/guideline_in/darkblue{
- dir = 8
- },
-/obj/effect/turf_decal/tile/dark_blue/half/contrasted{
- alpha = 180;
- dir = 1
- },
-/obj/structure/cable/yellow{
- icon_state = "1-2"
- },
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
- dir = 8
- },
-/obj/structure/disposalpipe/sorting/mail{
- dir = 1;
- name = "Janie";
- sortType = 22
- },
-/turf/open/floor/iron,
-/area/hallway/primary/central)
"nAP" = (
/obj/machinery/nanite_chamber,
/obj/effect/turf_decal/guideline/guideline_edge/purple{
@@ -43941,27 +43818,6 @@
},
/turf/open/floor/iron/dark,
/area/ai_monitored/turret_protected/aisat/foyer)
-"nDB" = (
-/obj/effect/turf_decal/guideline/guideline_in/green{
- color = "#439C1E"
- },
-/obj/effect/turf_decal/tile/dark_green/half/contrasted{
- dir = 8
- },
-/obj/structure/disposalpipe/segment{
- dir = 8
- },
-/obj/structure/cable/yellow{
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/hallway/primary/central)
"nDD" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
@@ -44319,6 +44175,17 @@
},
/turf/open/floor/iron/tech,
/area/engine/atmos)
+"nII" = (
+/obj/structure/railing{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/wideplating/dark{
+ dir = 4
+ },
+/turf/open/floor/iron/dark/smooth_edge{
+ dir = 8
+ },
+/area/hallway/primary/central)
"nIM" = (
/obj/effect/turf_decal/siding/wideplating/dark{
dir = 1
@@ -44346,15 +44213,6 @@
/obj/effect/turf_decal/bot,
/turf/open/floor/iron/dark,
/area/storage/primary)
-"nJC" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/obj/structure/disposalpipe/segment{
- dir = 10
- },
-/turf/open/floor/iron/dark,
-/area/hallway/primary/central)
"nJD" = (
/obj/structure/closet,
/obj/effect/spawner/lootdrop/maintenance/two,
@@ -44944,6 +44802,19 @@
},
/turf/open/floor/plating,
/area/maintenance/central)
+"nTU" = (
+/obj/structure/railing{
+ dir = 9
+ },
+/obj/machinery/light/floor{
+ brightness = 15;
+ bulb_colour = "#FFE4CE";
+ bulb_vacuum_brightness = 15;
+ nightshift_brightness = 10;
+ nightshift_light_color = "#E6EBFF"
+ },
+/turf/open/floor/iron/dark/smooth_large,
+/area/hallway/primary/central)
"nTZ" = (
/obj/structure/chair{
dir = 4
@@ -45939,6 +45810,19 @@
initial_gas_mix = "o2=22;n2=82;TEMP=293.15"
},
/area/tcommsat/computer)
+"omx" = (
+/obj/effect/turf_decal/tile/blue/half/contrasted{
+ dir = 1
+ },
+/obj/effect/turf_decal/guideline/guideline_in/blue{
+ dir = 8
+ },
+/obj/structure/cable/yellow{
+ icon_state = "1-2"
+ },
+/obj/structure/disposalpipe/segment,
+/turf/open/floor/iron/large,
+/area/hallway/primary/central)
"omR" = (
/obj/structure/table/reinforced,
/obj/effect/turf_decal/siding/wideplating/dark{
@@ -46211,6 +46095,15 @@
},
/turf/open/floor/iron/tech,
/area/engine/atmos)
+"osg" = (
+/obj/effect/turf_decal/siding/wideplating/dark{
+ dir = 8
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/iron/dark/smooth_edge{
+ dir = 4
+ },
+/area/hallway/primary/central)
"osm" = (
/obj/effect/turf_decal/tile/purple/fourcorners/contrasted,
/obj/effect/decal/cleanable/dirt,
@@ -46419,13 +46312,6 @@
/obj/structure/sign/departments/minsky/security/evac,
/turf/closed/wall,
/area/hallway/secondary/exit/departure_lounge)
-"ouU" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
-/obj/structure/railing/corner{
- dir = 4
- },
-/turf/open/floor/iron/dark,
-/area/hallway/primary/central)
"ouV" = (
/obj/structure/disposalpipe/segment{
dir = 9
@@ -46693,23 +46579,6 @@
},
/turf/open/floor/iron/tech,
/area/engine/atmos)
-"ozN" = (
-/obj/effect/turf_decal/guideline/guideline_in/darkblue{
- dir = 8
- },
-/obj/effect/turf_decal/tile/dark_blue/half/contrasted{
- alpha = 180;
- dir = 1
- },
-/obj/structure/cable/yellow{
- icon_state = "1-2"
- },
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
- dir = 8
- },
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/iron,
-/area/hallway/primary/central)
"oAv" = (
/obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted{
alpha = 180
@@ -47500,21 +47369,6 @@
/obj/structure/girder/displaced,
/turf/open/space/basic,
/area/solar/port/fore)
-"oNo" = (
-/obj/effect/turf_decal/tile/brown/half/contrasted{
- dir = 8
- },
-/obj/effect/turf_decal/guideline/guideline_in/brown,
-/obj/structure/cable/yellow{
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4,
-/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2,
-/obj/structure/disposalpipe/junction/flip{
- dir = 8
- },
-/turf/open/floor/iron,
-/area/hallway/primary/central)
"oNv" = (
/obj/machinery/light{
dir = 4;
@@ -47800,15 +47654,6 @@
},
/turf/open/floor/iron/tech,
/area/engine/engine_room)
-"oQN" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 10
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 10
- },
-/turf/open/floor/iron/dark,
-/area/hallway/primary/central)
"oQV" = (
/obj/structure/disposalpipe/segment{
dir = 2
@@ -48762,6 +48607,17 @@
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/iron/tech,
/area/ai_monitored/storage/eva)
+"pgR" = (
+/obj/structure/window/reinforced{
+ dir = 1;
+ layer = 2.9
+ },
+/obj/structure/window/reinforced{
+ dir = 8;
+ pixel_y = 1
+ },
+/turf/open/floor/iron/dark/smooth_large,
+/area/hallway/primary/central)
"pgT" = (
/obj/structure/table/wood,
/obj/effect/turf_decal/siding/wood,
@@ -49174,19 +49030,6 @@
/obj/machinery/light/very_dim/directional/west,
/turf/open/floor/iron/dark,
/area/security/execution/education)
-"pnj" = (
-/obj/structure/window/reinforced{
- dir = 1;
- layer = 2.9
- },
-/obj/structure/window/reinforced{
- dir = 8;
- pixel_y = 1
- },
-/obj/effect/turf_decal/bot,
-/obj/machinery/vending/snack/blue,
-/turf/open/floor/iron/dark,
-/area/hallway/primary/central)
"pnv" = (
/obj/machinery/portable_atmospherics/canister/nitrous_oxide,
/obj/effect/turf_decal/bot,
@@ -49487,6 +49330,24 @@
"prv" = (
/turf/closed/wall,
/area/crew_quarters/heads/captain)
+"prw" = (
+/obj/effect/turf_decal/guideline/guideline_in/neutral{
+ alpha = 255;
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/neutral/half/contrasted{
+ alpha = 140;
+ color = "#FFFFFF";
+ dir = 4
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+ dir = 1
+ },
+/turf/open/floor/iron/half,
+/area/hallway/primary/central)
"prX" = (
/obj/effect/landmark/start/warden,
/obj/item/bedsheet/dorms,
@@ -49494,19 +49355,22 @@
/obj/item/toy/batong,
/turf/open/floor/iron/dark,
/area/security/prison/shielded)
-"psh" = (
-/obj/structure/railing/corner{
- dir = 1
- },
-/obj/effect/turf_decal/stripes/line{
+"psg" = (
+/obj/effect/turf_decal/guideline/guideline_in/darkblue{
dir = 8
},
-/obj/structure/disposalpipe/segment{
+/obj/effect/turf_decal/tile/dark_blue/half/contrasted{
+ alpha = 180;
dir = 1
},
-/turf/open/floor/iron/dark/side{
- dir = 10
+/obj/structure/disposalpipe/segment,
+/obj/structure/cable/yellow{
+ icon_state = "1-4"
+ },
+/obj/structure/cable/yellow{
+ icon_state = "2-4"
},
+/turf/open/floor/iron/large,
/area/hallway/primary/central)
"psm" = (
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
@@ -49706,6 +49570,18 @@
/obj/structure/cable/yellow,
/turf/open/floor/iron/tech,
/area/engine/engine_room)
+"pvU" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 9
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 9
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 2
+ },
+/turf/open/floor/iron/dark/smooth_large,
+/area/hallway/primary/central)
"pvW" = (
/obj/structure/lattice/catwalk,
/obj/structure/cable{
@@ -49773,14 +49649,6 @@
/obj/effect/decal/cleanable/generic,
/turf/open/floor/iron,
/area/maintenance/port/aft)
-"pxc" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/structure/disposalpipe/segment{
- dir = 10
- },
-/turf/open/floor/iron/dark,
-/area/hallway/primary/central)
"pxh" = (
/obj/structure/cable/yellow{
icon_state = "2-8"
@@ -49953,6 +49821,15 @@
/obj/effect/decal/cleanable/vomit/old,
/turf/open/floor/iron/white,
/area/maintenance/port/aft)
+"pAM" = (
+/obj/effect/turf_decal/stripes/line,
+/obj/structure/disposalpipe/segment{
+ dir = 9
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/turf/open/floor/iron/dark/smooth_large,
+/area/hallway/primary/central)
"pAR" = (
/obj/machinery/processor,
/turf/open/floor/iron/dark,
@@ -50129,6 +50006,27 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/turf/open/floor/iron/stairs/medium,
/area/chapel/main)
+"pDp" = (
+/obj/structure/railing{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/thinplating/light{
+ dir = 8
+ },
+/obj/machinery/light/floor{
+ brightness = 15;
+ bulb_colour = "#FFE4CE";
+ bulb_vacuum_brightness = 15;
+ nightshift_brightness = 10;
+ nightshift_light_color = "#E6EBFF"
+ },
+/obj/effect/turf_decal/siding/wideplating/dark{
+ dir = 8
+ },
+/turf/open/floor/iron/dark/smooth_edge{
+ dir = 4
+ },
+/area/hallway/primary/central)
"pDO" = (
/obj/machinery/nanite_program_hub,
/obj/effect/turf_decal/stripes/line{
@@ -50172,6 +50070,13 @@
},
/turf/open/floor/iron,
/area/crew_quarters/cafeteria)
+"pEq" = (
+/obj/structure/window/reinforced{
+ dir = 1;
+ layer = 2.9
+ },
+/turf/open/floor/iron/dark/smooth_large,
+/area/hallway/primary/central)
"pEs" = (
/obj/structure/disposalpipe/sorting/mail/flip{
dir = 4;
@@ -50313,6 +50218,14 @@
/mob/living/carbon/monkey,
/turf/open/floor/iron/grid/steel,
/area/medical/virology)
+"pFQ" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/structure/disposalpipe/segment{
+ dir = 10
+ },
+/turf/open/floor/iron/dark/smooth_large,
+/area/hallway/primary/central)
"pGd" = (
/obj/structure/closet/emcloset,
/obj/effect/turf_decal/box,
@@ -50372,17 +50285,6 @@
},
/turf/open/floor/iron/dark,
/area/science/nanite)
-"pGu" = (
-/obj/structure/railing{
- dir = 4
- },
-/obj/effect/turf_decal/siding/wideplating/dark{
- dir = 4
- },
-/turf/open/floor/iron/dark/side{
- dir = 4
- },
-/area/hallway/primary/central)
"pGO" = (
/obj/structure/sign/departments/minsky/engineering/telecommmunications{
pixel_x = 32
@@ -50590,6 +50492,16 @@
/obj/item/storage/fancy/donut_box,
/turf/open/floor/carpet/royalblue,
/area/crew_quarters/heads/captain)
+"pKr" = (
+/obj/structure/window/reinforced{
+ dir = 4
+ },
+/obj/structure/window/reinforced,
+/obj/structure/disposalpipe/segment{
+ dir = 2
+ },
+/turf/open/floor/iron/dark/smooth_large,
+/area/hallway/primary/central)
"pKz" = (
/obj/structure/cable/yellow{
icon_state = "1-8"
@@ -50690,6 +50602,13 @@
},
/turf/open/floor/wood,
/area/library)
+"pLL" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
+/obj/structure/railing/corner{
+ dir = 1
+ },
+/turf/open/floor/iron/dark/smooth_large,
+/area/hallway/primary/central)
"pLM" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 5
@@ -50729,18 +50648,6 @@
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/iron/dark,
/area/engine/storage)
-"pLX" = (
-/obj/structure/railing,
-/obj/machinery/light/floor{
- brightness = 15;
- bulb_colour = "#FFE4CE";
- bulb_vacuum_brightness = 15;
- nightshift_brightness = 10;
- nightshift_light_color = "#E6EBFF"
- },
-/obj/effect/turf_decal/siding/wideplating/dark,
-/turf/open/floor/iron/dark,
-/area/hallway/primary/central)
"pMv" = (
/turf/open/floor/plating{
burnt = 1
@@ -50757,35 +50664,11 @@
/obj/effect/turf_decal/bot,
/turf/open/floor/iron/dark,
/area/engine/engine_room)
-"pMJ" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
- dir = 1
- },
-/obj/structure/railing/corner,
-/turf/open/floor/iron/dark,
-/area/hallway/primary/central)
"pMQ" = (
/obj/effect/turf_decal/box/white,
/obj/machinery/atmospherics/pipe/simple/general/hidden,
/turf/open/floor/circuit/telecomms/server,
/area/science/server)
-"pMW" = (
-/obj/effect/turf_decal/guideline/guideline_in/darkblue{
- dir = 8
- },
-/obj/effect/turf_decal/tile/dark_blue/half/contrasted{
- alpha = 180;
- dir = 1
- },
-/obj/structure/disposalpipe/segment,
-/obj/structure/cable/yellow{
- icon_state = "1-4"
- },
-/obj/structure/cable/yellow{
- icon_state = "2-4"
- },
-/turf/open/floor/iron,
-/area/hallway/primary/central)
"pMZ" = (
/obj/machinery/door/airlock/maintenance_hatch{
id_tag = "commissarydoor";
@@ -50845,6 +50728,21 @@
/obj/machinery/air_sensor/atmos/nitrogen_tank,
/turf/open/floor/engine/n2,
/area/engine/atmos)
+"pNW" = (
+/obj/effect/turf_decal/tile/brown/half/contrasted{
+ dir = 8
+ },
+/obj/effect/turf_decal/guideline/guideline_in/brown,
+/obj/structure/cable/yellow{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2,
+/obj/structure/disposalpipe/junction/flip{
+ dir = 8
+ },
+/turf/open/floor/iron/half,
+/area/hallway/primary/central)
"pOg" = (
/obj/machinery/light{
dir = 4
@@ -50883,6 +50781,18 @@
/obj/effect/turf_decal/tile/dark_green/half/contrasted,
/turf/open/floor/iron/dark,
/area/bridge)
+"pOJ" = (
+/obj/structure/railing{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/wideplating/dark{
+ dir = 1
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 2
+ },
+/turf/open/floor/iron/dark/smooth_edge,
+/area/hallway/primary/central)
"pOL" = (
/obj/machinery/atmospherics/pipe/simple/general/visible{
dir = 4
@@ -50933,18 +50843,6 @@
dir = 4
},
/area/medical/surgery)
-"pPi" = (
-/obj/structure/disposalpipe/segment,
-/obj/effect/turf_decal/tile/yellow/half/contrasted{
- alpha = 180
- },
-/obj/effect/turf_decal/guideline/guideline_in/yellow{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/turf/open/floor/iron,
-/area/hallway/primary/central)
"pPm" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 6
@@ -50970,13 +50868,6 @@
"pPA" = (
/turf/closed/wall/r_wall,
/area/science/storage)
-"pQj" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/turf/open/floor/iron/dark,
-/area/hallway/primary/central)
"pQm" = (
/obj/machinery/light{
dir = 4
@@ -50999,6 +50890,19 @@
},
/turf/open/floor/iron/dark,
/area/ai_monitored/turret_protected/aisat_interior)
+"pQI" = (
+/obj/effect/turf_decal/guideline/guideline_in/red{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/dark_red/half/contrasted{
+ alpha = 180;
+ color = "#DE3A3A"
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/structure/disposalpipe/segment,
+/turf/open/floor/iron/large,
+/area/hallway/primary/central)
"pQZ" = (
/obj/machinery/atmospherics/components/unary/cryo_cell{
dir = 4;
@@ -51324,25 +51228,6 @@
dir = 4
},
/area/hallway/primary/central)
-"pUK" = (
-/obj/structure/railing/corner,
-/obj/effect/turf_decal/stripes/line,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/iron/dark/side{
- dir = 10
- },
-/area/hallway/primary/central)
-"pUT" = (
-/obj/structure/cable/yellow{
- icon_state = "4-8"
- },
-/obj/structure/railing/corner{
- dir = 8
- },
-/turf/open/floor/iron/dark,
-/area/hallway/primary/central)
"pVo" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
@@ -52014,6 +51899,22 @@
},
/turf/open/floor/iron,
/area/security/checkpoint/auxiliary)
+"qeG" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 5
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 5
+ },
+/obj/structure/cable/yellow{
+ icon_state = "4-8"
+ },
+/obj/machinery/light_switch{
+ pixel_x = 21;
+ pixel_y = 22
+ },
+/turf/open/floor/iron/dark/smooth_large,
+/area/hallway/primary/central)
"qeK" = (
/obj/effect/turf_decal/tile/purple/half/contrasted{
dir = 4
@@ -52812,6 +52713,15 @@
},
/turf/open/floor/iron/white,
/area/medical/chemistry)
+"qtN" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/structure/railing/corner{
+ dir = 8
+ },
+/turf/open/floor/iron/dark/smooth_large,
+/area/hallway/primary/central)
"qtW" = (
/obj/effect/turf_decal/guideline/guideline_half_edge/purple{
dir = 6
@@ -52844,16 +52754,6 @@
/obj/structure/disposalpipe/junction/flip,
/turf/open/floor/iron,
/area/crew_quarters/cafeteria)
-"qui" = (
-/obj/structure/cable{
- icon_state = "0-4"
- },
-/obj/machinery/power/solar{
- id = "portsolar";
- name = "Port Solar Array"
- },
-/turf/open/floor/iron/airless/solarpanel,
-/area/solar/port/aft)
"quk" = (
/obj/machinery/door/airlock/grunge{
name = "Court Lounge"
@@ -52942,21 +52842,6 @@
},
/turf/open/floor/iron,
/area/crew_quarters/cafeteria)
-"qvB" = (
-/obj/structure/railing{
- dir = 10;
- layer = 3.1
- },
-/obj/structure/chair/fancy/comfy{
- buildstackamount = 0;
- color = "#742925";
- dir = 1
- },
-/obj/effect/turf_decal/siding/wideplating/dark{
- dir = 10
- },
-/turf/open/floor/iron/dark,
-/area/hallway/primary/central)
"qvD" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/structure/cable/yellow,
@@ -53110,15 +52995,6 @@
},
/turf/open/floor/iron,
/area/maintenance/department/security)
-"qyT" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/structure/disposalpipe/segment{
- dir = 2
- },
-/obj/structure/railing/corner,
-/turf/open/floor/iron/dark,
-/area/hallway/primary/central)
"qza" = (
/obj/effect/turf_decal/guideline/guideline_out_arrow/brown{
dir = 1
@@ -53142,16 +53018,6 @@
/obj/effect/decal/cleanable/glass,
/turf/open/floor/wood,
/area/vacant_room/office)
-"qzF" = (
-/obj/structure/cable{
- icon_state = "0-8"
- },
-/obj/machinery/power/solar{
- id = "portsolar";
- name = "Port Solar Array"
- },
-/turf/open/floor/iron/airless/solarpanel,
-/area/solar/port/fore)
"qAe" = (
/obj/structure/table/reinforced,
/obj/item/stack/sheet/glass/fifty{
@@ -53431,22 +53297,6 @@
},
/turf/open/floor/iron,
/area/hallway/primary/starboard)
-"qEi" = (
-/obj/effect/turf_decal/siding/wideplating/dark{
- dir = 4
- },
-/obj/structure/railing{
- dir = 4
- },
-/obj/machinery/disposal/bin,
-/obj/effect/turf_decal/bot,
-/obj/structure/disposalpipe/trunk{
- dir = 8
- },
-/turf/open/floor/iron/dark/side{
- dir = 4
- },
-/area/hallway/primary/central)
"qEl" = (
/obj/effect/spawner/lootdrop/grille_or_trash,
/obj/effect/decal/cleanable/dirt,
@@ -53557,14 +53407,6 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/turf/open/floor/iron/freezer,
/area/crew_quarters/kitchen/coldroom)
-"qGE" = (
-/obj/structure/railing,
-/obj/effect/turf_decal/siding/wideplating/dark,
-/obj/structure/disposalpipe/segment{
- dir = 2
- },
-/turf/open/floor/iron/dark,
-/area/hallway/primary/central)
"qGG" = (
/obj/structure/lattice,
/obj/effect/landmark/xeno_spawn,
@@ -53814,6 +53656,21 @@
},
/turf/open/floor/iron/white,
/area/science/research)
+"qKC" = (
+/obj/effect/turf_decal/guideline/guideline_in/red{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/dark_red/half/contrasted{
+ alpha = 180;
+ color = "#DE3A3A"
+ },
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/turf/open/floor/iron/large,
+/area/hallway/primary/central)
"qKG" = (
/obj/structure/cable/yellow{
icon_state = "4-8"
@@ -53830,6 +53687,16 @@
},
/turf/open/floor/iron/dark,
/area/ai_monitored/storage/eva)
+"qKT" = (
+/obj/structure/cable{
+ icon_state = "0-8"
+ },
+/obj/machinery/power/solar{
+ id = "portsolar";
+ name = "Port Solar Array"
+ },
+/turf/open/floor/iron/solarpanel/airless,
+/area/solar/port/aft)
"qKX" = (
/obj/structure/bed{
dir = 4
@@ -53845,22 +53712,6 @@
/obj/item/pen,
/turf/open/floor/iron/white,
/area/medical/medbay/lobby)
-"qLh" = (
-/obj/structure/disposalpipe/segment{
- dir = 1
- },
-/obj/effect/turf_decal/tile/yellow/half/contrasted{
- alpha = 180
- },
-/obj/effect/turf_decal/guideline/guideline_in/yellow{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/turf/open/floor/iron,
-/area/hallway/primary/central)
"qLt" = (
/obj/effect/turf_decal/tile/purple/half/contrasted{
dir = 4
@@ -54036,6 +53887,17 @@
},
/turf/open/floor/iron,
/area/engine/atmos)
+"qOy" = (
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
+/obj/machinery/navbeacon{
+ codes_txt = "patrol;next_patrol=25-NHall";
+ location = "24-CenterNE"
+ },
+/turf/open/floor/iron/dark/smooth_large,
+/area/hallway/primary/central)
"qOG" = (
/obj/effect/landmark/event_spawn,
/obj/structure/cable/yellow{
@@ -54169,6 +54031,21 @@
/obj/machinery/power/tracker,
/turf/open/space/basic,
/area/solar/port/fore)
+"qQU" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/purple/half/contrasted{
+ dir = 4
+ },
+/obj/effect/turf_decal/guideline/guideline_in/purple{
+ dir = 1
+ },
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+ dir = 1
+ },
+/turf/open/floor/iron/half,
+/area/hallway/primary/central)
"qQY" = (
/obj/machinery/door/airlock/research{
name = "Mech Bay";
@@ -54555,6 +54432,19 @@
/obj/machinery/vending/snack/orange,
/turf/open/floor/iron/dark,
/area/medical/medbay/central)
+"qWO" = (
+/obj/structure/window/reinforced,
+/obj/structure/window/reinforced{
+ dir = 8;
+ pixel_y = 1
+ },
+/obj/structure/chair/fancy/comfy{
+ buildstackamount = 0;
+ color = "#742925";
+ dir = 4
+ },
+/turf/open/floor/iron/dark/smooth_large,
+/area/hallway/primary/central)
"qWU" = (
/obj/effect/turf_decal/bot,
/obj/effect/turf_decal/tile/neutral/half/contrasted{
@@ -54894,6 +54784,17 @@
/obj/machinery/airalarm/directional/north,
/turf/open/floor/wood,
/area/chapel/office)
+"rca" = (
+/obj/structure/window/reinforced{
+ dir = 4
+ },
+/obj/structure/chair/fancy/comfy{
+ color = "#596479";
+ dir = 8
+ },
+/obj/structure/window/reinforced,
+/turf/open/floor/iron/dark/smooth_large,
+/area/hallway/primary/central)
"rcc" = (
/obj/effect/turf_decal/tile/yellow/anticorner,
/obj/effect/decal/cleanable/dirt,
@@ -55095,6 +54996,21 @@
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/iron,
/area/ai_monitored/security/armory)
+"reO" = (
+/obj/structure/railing{
+ dir = 10;
+ layer = 3.1
+ },
+/obj/structure/chair/fancy/comfy{
+ buildstackamount = 0;
+ color = "#742925";
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/wideplating/dark{
+ dir = 10
+ },
+/turf/open/floor/iron/dark/smooth_large,
+/area/hallway/primary/central)
"reS" = (
/obj/effect/landmark/start/janitor,
/turf/open/floor/iron,
@@ -55244,6 +55160,17 @@
/obj/item/kirbyplants/random,
/turf/open/floor/iron,
/area/hallway/secondary/entry)
+"rhe" = (
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+ dir = 4
+ },
+/obj/machinery/navbeacon{
+ codes_txt = "patrol;next_patrol=5-WHall";
+ location = "4-CenterNW"
+ },
+/turf/open/floor/iron/dark/smooth_large,
+/area/hallway/primary/central)
"rhh" = (
/obj/effect/turf_decal/siding/wood{
dir = 8
@@ -55502,17 +55429,6 @@
},
/turf/open/floor/carpet/purple,
/area/chapel/main)
-"rmw" = (
-/obj/structure/window/reinforced{
- dir = 8;
- pixel_y = 1
- },
-/obj/structure/window/reinforced,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/iron/dark,
-/area/hallway/primary/central)
"rmy" = (
/obj/structure/cable/yellow{
icon_state = "4-8"
@@ -56593,6 +56509,10 @@
},
/turf/open/floor/iron,
/area/crew_quarters/dorms)
+"rDO" = (
+/obj/structure/railing/corner,
+/turf/open/floor/iron/dark/smooth_large,
+/area/hallway/primary/central)
"rDS" = (
/obj/effect/turf_decal/siding/wideplating/dark,
/obj/structure/extinguisher_cabinet{
@@ -56758,15 +56678,6 @@
},
/turf/open/floor/iron/tech,
/area/engine/atmos)
-"rGw" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
- dir = 1
- },
-/obj/structure/railing/corner{
- dir = 8
- },
-/turf/open/floor/iron/dark,
-/area/hallway/primary/central)
"rGQ" = (
/obj/effect/turf_decal/tile/dark_red/fourcorners/contrasted{
alpha = 180;
@@ -56809,6 +56720,12 @@
},
/turf/open/floor/iron/dark,
/area/ai_monitored/turret_protected/aisat/foyer)
+"rHJ" = (
+/obj/structure/railing/corner{
+ dir = 1
+ },
+/turf/open/floor/iron/dark/smooth_large,
+/area/hallway/primary/central)
"rHP" = (
/obj/effect/turf_decal/tile/yellow/half/contrasted{
alpha = 180
@@ -57622,18 +57539,6 @@
},
/turf/open/floor/iron/dark,
/area/quartermaster/qm)
-"rXC" = (
-/obj/structure/railing{
- dir = 4
- },
-/obj/effect/turf_decal/siding/wideplating/dark{
- dir = 4
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/iron/dark,
-/area/hallway/primary/central)
"rXF" = (
/obj/structure/lattice/catwalk,
/obj/machinery/atmospherics/pipe/simple/cyan/visible{
@@ -57844,6 +57749,13 @@
},
/turf/open/floor/plating,
/area/maintenance/central)
+"saB" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+ dir = 8
+ },
+/obj/structure/railing/corner,
+/turf/open/floor/iron/dark/smooth_large,
+/area/hallway/primary/central)
"saH" = (
/obj/structure/cable/yellow{
icon_state = "4-8"
@@ -57894,6 +57806,27 @@
},
/turf/open/floor/iron/dark,
/area/science/nanite)
+"sbt" = (
+/obj/effect/turf_decal/guideline/guideline_in/neutral{
+ alpha = 255;
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/neutral/half/contrasted{
+ alpha = 140;
+ color = "#FFFFFF";
+ dir = 4
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+ dir = 1
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 2
+ },
+/turf/open/floor/iron/half,
+/area/hallway/primary/central)
"scb" = (
/turf/closed/wall/r_wall,
/area/storage/tech)
@@ -58421,6 +58354,15 @@
},
/turf/open/floor/plating,
/area/quartermaster/sorting)
+"sjU" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 10
+ },
+/turf/open/floor/iron/dark/smooth_large,
+/area/hallway/primary/central)
"skr" = (
/obj/machinery/portable_atmospherics/canister/nitrous_oxide,
/obj/effect/turf_decal/bot,
@@ -58434,6 +58376,23 @@
},
/turf/open/floor/iron,
/area/engine/atmos)
+"skw" = (
+/obj/effect/turf_decal/guideline/guideline_in/darkblue{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/dark_blue/half/contrasted{
+ alpha = 180;
+ dir = 1
+ },
+/obj/structure/cable/yellow{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+ dir = 8
+ },
+/obj/structure/disposalpipe/segment,
+/turf/open/floor/iron/large,
+/area/hallway/primary/central)
"skD" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/lattice/catwalk/over,
@@ -58606,20 +58565,14 @@
/obj/machinery/portable_atmospherics/pump,
/turf/open/floor/iron,
/area/science/storage)
-"smq" = (
+"smi" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/effect/turf_decal/tile/purple/half/contrasted{
- dir = 4
- },
-/obj/effect/turf_decal/guideline/guideline_in/purple{
- dir = 1
- },
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
- dir = 1
+ dir = 2
},
-/turf/open/floor/iron,
+/obj/structure/railing/corner,
+/turf/open/floor/iron/dark/smooth_large,
/area/hallway/primary/central)
"smH" = (
/obj/effect/turf_decal/tile/dark_red/fourcorners/contrasted{
@@ -58656,15 +58609,6 @@
"smT" = (
/turf/open/floor/grass,
/area/hallway/primary/central)
-"sna" = (
-/obj/structure/disposalpipe/segment{
- dir = 2
- },
-/obj/structure/railing/corner{
- dir = 8
- },
-/turf/open/floor/iron/dark,
-/area/hallway/primary/central)
"sng" = (
/obj/structure/disposalpipe/sorting/mail/flip{
dir = 4;
@@ -58784,16 +58728,6 @@
/obj/item/toy/plush/crossed,
/turf/open/floor/plating,
/area/maintenance/disposal)
-"srd" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/structure/railing/corner{
- dir = 4
- },
-/turf/open/floor/iron/dark,
-/area/hallway/primary/central)
"sre" = (
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 8
@@ -58912,17 +58846,6 @@
dir = 1
},
/area/hallway/primary/central)
-"stA" = (
-/obj/structure/railing{
- dir = 9
- },
-/obj/machinery/vending/custom,
-/obj/effect/turf_decal/siding/wideplating/dark{
- dir = 9
- },
-/obj/effect/turf_decal/bot,
-/turf/open/floor/iron/dark,
-/area/hallway/primary/central)
"sud" = (
/obj/machinery/computer/security/telescreen/entertainment{
network = list("thunder","court");
@@ -59049,6 +58972,19 @@
},
/turf/open/floor/iron/dark,
/area/crew_quarters/bar)
+"swI" = (
+/obj/structure/window/reinforced{
+ dir = 4;
+ layer = 2.9
+ },
+/obj/structure/window/reinforced{
+ dir = 1;
+ layer = 2.9
+ },
+/obj/machinery/vending/snack/orange,
+/obj/effect/turf_decal/bot,
+/turf/open/floor/iron/dark/smooth_large,
+/area/hallway/primary/central)
"swK" = (
/obj/effect/turf_decal/bot,
/obj/machinery/computer/card{
@@ -59200,6 +59136,13 @@
},
/turf/open/floor/iron,
/area/hallway/secondary/entry)
+"syr" = (
+/obj/structure/disposalpipe/segment{
+ dir = 2
+ },
+/obj/structure/railing/corner,
+/turf/open/floor/iron/dark/smooth_large,
+/area/hallway/primary/central)
"syy" = (
/obj/machinery/power/port_gen/pacman,
/turf/open/floor/iron/tech/grid,
@@ -59350,6 +59293,27 @@
},
/turf/open/floor/iron/sepia,
/area/quartermaster/sorting)
+"sBB" = (
+/obj/effect/turf_decal/tile/dark_green/half/contrasted{
+ dir = 8
+ },
+/obj/structure/cable/yellow{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/effect/turf_decal/guideline/guideline_in/green{
+ color = "#439C1E"
+ },
+/turf/open/floor/iron/half,
+/area/hallway/primary/central)
"sBD" = (
/obj/structure/chair/fancy/bench/pew/right{
dir = 8
@@ -59365,17 +59329,6 @@
"sBR" = (
/turf/open/floor/iron,
/area/maintenance/department/science)
-"sCf" = (
-/obj/structure/window/reinforced{
- dir = 4;
- layer = 2.9
- },
-/obj/structure/chair/fancy/comfy{
- color = "#596479";
- dir = 8
- },
-/turf/open/floor/iron/dark,
-/area/hallway/primary/central)
"sCm" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -59399,6 +59352,16 @@
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
/turf/open/floor/iron,
/area/construction/mining/aux_base)
+"sDh" = (
+/obj/structure/cable{
+ icon_state = "0-4"
+ },
+/obj/machinery/power/solar{
+ id = "portsolar";
+ name = "Port Solar Array"
+ },
+/turf/open/floor/iron/solarpanel/airless,
+/area/solar/starboard/aft)
"sDs" = (
/obj/structure/chair/stool/bar{
dir = 8
@@ -59418,14 +59381,6 @@
},
/turf/open/floor/circuit,
/area/ai_monitored/storage/satellite)
-"sDE" = (
-/obj/structure/chair/fancy/plastic,
-/obj/structure/lattice/catwalk,
-/obj/item/toy/plush/lizard_plushie/space{
- name = "Drkh-Hlyt"
- },
-/turf/open/space/basic,
-/area/space/nearstation)
"sDJ" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 4
@@ -59483,6 +59438,27 @@
/area/security/prison{
name = "Prison Processing"
})
+"sEW" = (
+/obj/effect/turf_decal/guideline/guideline_in/green{
+ color = "#439C1E"
+ },
+/obj/effect/turf_decal/tile/dark_green/half/contrasted{
+ dir = 8
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 8
+ },
+/obj/structure/cable/yellow{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
+/turf/open/floor/iron/half,
+/area/hallway/primary/central)
"sEY" = (
/obj/machinery/computer/holodeck{
dir = 4
@@ -60268,6 +60244,14 @@
/obj/effect/turf_decal/bot,
/turf/open/floor/iron,
/area/engine/atmos)
+"sQg" = (
+/obj/structure/window/reinforced{
+ dir = 4;
+ layer = 2.9
+ },
+/obj/structure/window/reinforced,
+/turf/open/floor/iron/dark/smooth_large,
+/area/hallway/primary/central)
"sQy" = (
/obj/docking_port/stationary/random{
dir = 8;
@@ -60402,6 +60386,27 @@
},
/turf/open/floor/iron,
/area/construction/mining/aux_base)
+"sSs" = (
+/obj/effect/turf_decal/tile/dark_green/half/contrasted{
+ dir = 8
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/structure/cable/yellow{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
+/obj/effect/turf_decal/guideline/guideline_in/green{
+ color = "#439C1E"
+ },
+/turf/open/floor/iron/half,
+/area/hallway/primary/central)
"sSv" = (
/obj/structure/table/wood,
/turf/open/floor/wood,
@@ -60667,6 +60672,24 @@
/obj/machinery/space_heater,
/turf/open/floor/iron,
/area/maintenance/port/aft)
+"sXn" = (
+/obj/machinery/light/floor{
+ brightness = 15;
+ bulb_colour = "#FFE4CE";
+ bulb_vacuum_brightness = 15;
+ nightshift_brightness = 10;
+ nightshift_light_color = "#E6EBFF"
+ },
+/obj/effect/turf_decal/siding/wideplating/dark{
+ dir = 8
+ },
+/obj/structure/railing/corner{
+ dir = 1
+ },
+/turf/open/floor/iron/dark/smooth_edge{
+ dir = 4
+ },
+/area/hallway/primary/central)
"sXu" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
dir = 5
@@ -60804,16 +60827,6 @@
/obj/effect/spawner/structure/window,
/turf/open/floor/plating,
/area/medical/chemistry)
-"sZv" = (
-/obj/effect/turf_decal/stripes/line,
-/obj/structure/cable/yellow{
- icon_state = "1-2"
- },
-/obj/structure/disposalpipe/segment{
- dir = 5
- },
-/turf/open/floor/iron/dark,
-/area/hallway/primary/central)
"sZS" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 4
@@ -60884,6 +60897,15 @@
name = "mainframe floor"
},
/area/tcommsat/server)
+"tam" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 10
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 10
+ },
+/turf/open/floor/iron/dark/smooth_large,
+/area/hallway/primary/central)
"tar" = (
/obj/machinery/cryopod,
/obj/effect/turf_decal/bot,
@@ -60907,6 +60929,25 @@
},
/turf/closed/wall/r_wall,
/area/security/warden)
+"taD" = (
+/obj/effect/turf_decal/tile/brown/half/contrasted{
+ dir = 8
+ },
+/obj/effect/turf_decal/guideline/guideline_in/brown,
+/obj/structure/disposalpipe/segment{
+ dir = 8
+ },
+/obj/structure/cable/yellow{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
+/turf/open/floor/iron/half,
+/area/hallway/primary/central)
"taL" = (
/obj/machinery/light,
/obj/structure/table/reinforced,
@@ -61008,6 +61049,20 @@
},
/turf/open/floor/iron/white/side,
/area/science/research)
+"tbP" = (
+/obj/effect/turf_decal/siding/wideplating/dark{
+ dir = 4
+ },
+/obj/structure/railing{
+ dir = 4
+ },
+/obj/machinery/disposal/bin,
+/obj/effect/turf_decal/bot,
+/obj/structure/disposalpipe/trunk{
+ dir = 8
+ },
+/turf/open/floor/iron/dark/smooth_large,
+/area/hallway/primary/central)
"tbQ" = (
/obj/structure/disposalpipe/segment{
dir = 1
@@ -61135,20 +61190,6 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/turf/open/floor/iron/tech,
/area/engine/atmos)
-"tdT" = (
-/obj/structure/railing/corner{
- dir = 8
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/obj/structure/disposalpipe/segment{
- dir = 1
- },
-/turf/open/floor/iron/dark/side{
- dir = 9
- },
-/area/hallway/primary/central)
"teh" = (
/obj/structure/rack,
/obj/effect/spawner/lootdrop/techstorage/service,
@@ -61281,6 +61322,24 @@
"tfZ" = (
/turf/open/floor/plating,
/area/maintenance/solars/starboard/fore)
+"tgc" = (
+/obj/structure/railing{
+ dir = 4
+ },
+/obj/machinery/light/floor{
+ brightness = 15;
+ bulb_colour = "#FFE4CE";
+ bulb_vacuum_brightness = 15;
+ nightshift_brightness = 10;
+ nightshift_light_color = "#E6EBFF"
+ },
+/obj/effect/turf_decal/siding/wideplating/dark{
+ dir = 4
+ },
+/turf/open/floor/iron/dark/smooth_edge{
+ dir = 8
+ },
+/area/hallway/primary/central)
"tgE" = (
/obj/machinery/firealarm/directional/west,
/obj/effect/turf_decal/tile/neutral/half/contrasted{
@@ -61378,17 +61437,6 @@
},
/turf/open/floor/iron/tech,
/area/ai_monitored/storage/eva)
-"tio" = (
-/obj/structure/window/reinforced{
- dir = 4;
- layer = 2.9
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/turf/open/floor/iron/dark,
-/area/hallway/primary/central)
"tiq" = (
/obj/machinery/camera/autoname{
dir = 1;
@@ -61912,6 +61960,15 @@
/obj/item/book/manual/wiki/sopcommand,
/turf/open/floor/wood,
/area/crew_quarters/heads/captain)
+"tpk" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+ dir = 4
+ },
+/obj/structure/railing/corner{
+ dir = 8
+ },
+/turf/open/floor/iron/dark/smooth_large,
+/area/hallway/primary/central)
"tpl" = (
/obj/effect/turf_decal/tile/neutral/anticorner{
dir = 6
@@ -62337,6 +62394,19 @@
},
/turf/open/floor/iron,
/area/security/brig/dock)
+"tvr" = (
+/obj/structure/window/reinforced{
+ dir = 1;
+ layer = 2.9
+ },
+/obj/structure/window/reinforced{
+ dir = 8;
+ pixel_y = 1
+ },
+/obj/structure/closet/firecloset/full,
+/obj/effect/turf_decal/bot,
+/turf/open/floor/iron/dark/smooth_large,
+/area/hallway/primary/central)
"tvG" = (
/obj/machinery/door/airlock/maintenance_hatch{
name = "Maintenance Hatch";
@@ -62683,6 +62753,15 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/turf/open/floor/iron,
/area/quartermaster/miningdock)
+"tzR" = (
+/obj/structure/railing{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/wideplating/dark{
+ dir = 1
+ },
+/turf/open/floor/iron/dark/smooth_edge,
+/area/hallway/primary/central)
"tzV" = (
/obj/effect/spawner/structure/window,
/obj/structure/curtain/directional{
@@ -63356,6 +63435,36 @@
"tKm" = (
/turf/closed/wall/r_wall,
/area/crew_quarters/heads/captain/private)
+"tKt" = (
+/obj/structure/table/reinforced,
+/obj/item/paper/guides/recycler,
+/obj/machinery/button/massdriver{
+ id = "TrashDisp";
+ pixel_x = -29;
+ pixel_y = 8
+ },
+/obj/machinery/button/door{
+ id = "TrashDoor";
+ name = "Disposal Vent Control";
+ pixel_x = -39;
+ pixel_y = 7;
+ req_access_txt = "12"
+ },
+/obj/structure/lattice/catwalk/over,
+/obj/item/radio/intercom{
+ dir = 1;
+ pixel_x = -34;
+ pixel_y = -7
+ },
+/obj/machinery/light_switch{
+ pixel_x = -21;
+ pixel_y = 8
+ },
+/obj/item/toy/plush/lizard_plushie{
+ name = "Eats-The-Rubbish"
+ },
+/turf/open/floor/plating,
+/area/maintenance/disposal)
"tKB" = (
/obj/machinery/door/airlock/highsecurity{
name = "Emergency Access";
@@ -63519,15 +63628,6 @@
},
/turf/open/floor/iron/white,
/area/medical/apothecary)
-"tNx" = (
-/obj/effect/turf_decal/stripes/line,
-/obj/structure/disposalpipe/segment{
- dir = 9
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/turf/open/floor/iron/dark,
-/area/hallway/primary/central)
"tNU" = (
/obj/machinery/ai_slipper{
uses = 10
@@ -63599,6 +63699,18 @@
dir = 5
},
/area/science/research)
+"tPY" = (
+/obj/structure/railing{
+ dir = 10;
+ layer = 3.1
+ },
+/obj/effect/spawner/randomvend/cola,
+/obj/effect/turf_decal/siding/wideplating/dark{
+ dir = 10
+ },
+/obj/effect/turf_decal/bot,
+/turf/open/floor/iron/dark/smooth_large,
+/area/hallway/primary/central)
"tQd" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
@@ -63676,15 +63788,6 @@
dir = 8
},
/area/science/mixing/chamber)
-"tQt" = (
-/obj/structure/window/reinforced{
- dir = 8;
- pixel_y = 1
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/turf/open/floor/iron/dark,
-/area/hallway/primary/central)
"tQv" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -63995,13 +64098,6 @@
},
/turf/open/floor/iron/white,
/area/crew_quarters/heads/cmo)
-"tWu" = (
-/obj/effect/turf_decal/siding/wideplating/dark{
- dir = 8
- },
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron/dark,
-/area/hallway/primary/central)
"tWD" = (
/obj/structure/cable/yellow{
icon_state = "1-2"
@@ -64537,6 +64633,19 @@
},
/turf/open/floor/iron/dark,
/area/medical/morgue)
+"ufh" = (
+/obj/structure/railing{
+ dir = 10
+ },
+/obj/machinery/light/floor{
+ brightness = 15;
+ bulb_colour = "#FFE4CE";
+ bulb_vacuum_brightness = 15;
+ nightshift_brightness = 10;
+ nightshift_light_color = "#E6EBFF"
+ },
+/turf/open/floor/iron/dark/smooth_large,
+/area/hallway/primary/central)
"ufl" = (
/obj/effect/turf_decal/stripes/line{
dir = 10
@@ -64834,18 +64943,6 @@
},
/turf/open/space/basic,
/area/space/nearstation)
-"uiK" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 5
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 5
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/iron/dark,
-/area/hallway/primary/central)
"uiP" = (
/obj/machinery/air_sensor/atmos/nitrous_tank,
/turf/open/floor/engine/n2o,
@@ -65001,23 +65098,6 @@
},
/turf/open/space/basic,
/area/space/nearstation)
-"ulm" = (
-/obj/structure/window/reinforced{
- dir = 4;
- layer = 2.9
- },
-/obj/structure/window/reinforced{
- dir = 1;
- layer = 2.9
- },
-/obj/machinery/light/floor{
- brightness = 15;
- bulb_emergency_brightness_mul = 2;
- bulb_vacuum_brightness = 15;
- nightshift_brightness = 10
- },
-/turf/open/floor/iron/dark,
-/area/hallway/primary/central)
"uls" = (
/obj/effect/turf_decal/tile/purple/fourcorners/contrasted,
/obj/structure/disposalpipe/segment{
@@ -65062,6 +65142,13 @@
},
/turf/open/floor/iron,
/area/engine/engineering)
+"ulD" = (
+/obj/structure/lattice,
+/obj/item/toy/plush/lizard_plushie/space{
+ name = "Embraces-the-Void"
+ },
+/turf/open/space/basic,
+/area/space/nearstation)
"ulH" = (
/obj/structure/sign/warning/vacuum,
/turf/closed/wall,
@@ -65344,6 +65431,13 @@
/obj/item/book/manual/wiki/sopcommand,
/turf/open/floor/carpet/purple,
/area/crew_quarters/heads/hor)
+"urn" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/turf/open/floor/iron/dark/smooth_large,
+/area/hallway/primary/central)
"urD" = (
/obj/structure/railing/corner,
/obj/structure/disposalpipe/segment{
@@ -65664,6 +65758,16 @@
},
/turf/open/floor/iron/dark,
/area/bridge/meeting_room)
+"uwt" = (
+/obj/effect/turf_decal/stripes/line,
+/obj/structure/cable/yellow{
+ icon_state = "1-2"
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 5
+ },
+/turf/open/floor/iron/dark/smooth_large,
+/area/hallway/primary/central)
"uwF" = (
/obj/structure/chair/office{
dir = 8
@@ -66712,6 +66816,22 @@
},
/turf/open/floor/iron/dark,
/area/security/nuke_storage)
+"uLI" = (
+/obj/structure/disposalpipe/segment{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/yellow/half/contrasted{
+ alpha = 180
+ },
+/obj/effect/turf_decal/guideline/guideline_in/yellow{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/turf/open/floor/iron/large,
+/area/hallway/primary/central)
"uLR" = (
/obj/structure/cable/yellow{
icon_state = "4-8"
@@ -66841,14 +66961,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/closed/wall,
/area/maintenance/department/science)
-"uOI" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/structure/railing/corner,
-/turf/open/floor/iron/dark,
-/area/hallway/primary/central)
"uOK" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/machinery/firealarm/directional/east,
@@ -67063,19 +67175,6 @@
},
/turf/open/floor/iron,
/area/hallway/primary/fore)
-"uSQ" = (
-/obj/structure/window/reinforced{
- dir = 4;
- layer = 2.9
- },
-/obj/structure/window/reinforced{
- dir = 1;
- layer = 2.9
- },
-/obj/effect/turf_decal/bot,
-/obj/structure/closet/firecloset/full,
-/turf/open/floor/iron/dark,
-/area/hallway/primary/central)
"uTj" = (
/obj/effect/turf_decal/stripes/line{
dir = 9
@@ -67209,24 +67308,6 @@
/obj/structure/filingcabinet/chestdrawer,
/turf/open/floor/carpet/orange,
/area/quartermaster/qm)
-"uWp" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/obj/structure/cable/yellow{
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 4
- },
-/obj/structure/disposalpipe/segment{
- dir = 9
- },
-/turf/open/floor/iron/dark,
-/area/hallway/primary/central)
"uWs" = (
/obj/structure/chair/fancy/comfy{
color = "#596479";
@@ -67553,6 +67634,25 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/sepia,
/area/maintenance/port/central)
+"uZJ" = (
+/obj/effect/turf_decal/tile/brown/half/contrasted{
+ dir = 8
+ },
+/obj/effect/turf_decal/guideline/guideline_in/brown,
+/obj/structure/cable/yellow{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
+/obj/structure/disposalpipe/junction{
+ dir = 8
+ },
+/turf/open/floor/iron/half,
+/area/hallway/primary/central)
"vat" = (
/obj/structure/bookcase/random/fiction,
/obj/machinery/airalarm{
@@ -67690,20 +67790,6 @@
},
/turf/open/floor/iron/tech,
/area/engine/engine_room)
-"vcA" = (
-/obj/structure/railing/corner{
- dir = 4
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/obj/structure/disposalpipe/segment{
- dir = 1
- },
-/turf/open/floor/iron/dark/side{
- dir = 6
- },
-/area/hallway/primary/central)
"vcG" = (
/obj/effect/turf_decal/stripes/closeup,
/obj/machinery/pipedispenser/disposal,
@@ -68073,6 +68159,25 @@
/obj/machinery/griddle,
/turf/open/floor/iron/white,
/area/crew_quarters/kitchen)
+"vjE" = (
+/obj/machinery/light/floor{
+ brightness = 15;
+ bulb_colour = "#FFE4CE";
+ bulb_vacuum_brightness = 15;
+ nightshift_brightness = 10;
+ nightshift_light_color = "#E6EBFF"
+ },
+/obj/effect/turf_decal/siding/wideplating/dark{
+ dir = 4
+ },
+/obj/structure/railing/corner{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/iron/dark/smooth_edge{
+ dir = 8
+ },
+/area/hallway/primary/central)
"vjG" = (
/obj/structure/disposalpipe/segment,
/obj/structure/cable/yellow{
@@ -68447,6 +68552,19 @@
/obj/item/kirbyplants/random,
/turf/open/floor/iron/tech,
/area/engine/engine_room)
+"vpc" = (
+/obj/effect/turf_decal/tile/blue/half/contrasted{
+ dir = 1
+ },
+/obj/effect/turf_decal/guideline/guideline_in/blue{
+ dir = 8
+ },
+/obj/structure/disposalpipe/segment,
+/obj/structure/cable/yellow{
+ icon_state = "1-2"
+ },
+/turf/open/floor/iron/large,
+/area/hallway/primary/central)
"vpe" = (
/obj/machinery/light{
dir = 1
@@ -68496,6 +68614,17 @@
/obj/effect/turf_decal/guideline/guideline_in/blue,
/turf/open/floor/iron/white,
/area/medical/medbay/lobby)
+"vpU" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/structure/disposalpipe/segment{
+ dir = 10
+ },
+/turf/open/floor/iron/dark/smooth_large,
+/area/hallway/primary/central)
"vqq" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
@@ -68603,17 +68732,6 @@
},
/turf/open/floor/iron/dark,
/area/ai_monitored/storage/satellite)
-"vrM" = (
-/obj/structure/railing{
- dir = 5
- },
-/obj/machinery/vending/cigarette,
-/obj/effect/turf_decal/siding/wideplating/dark{
- dir = 5
- },
-/obj/effect/turf_decal/bot,
-/turf/open/floor/iron/dark,
-/area/hallway/primary/central)
"vrT" = (
/obj/structure/chair,
/obj/effect/turf_decal/stripes/line,
@@ -68683,6 +68801,20 @@
},
/turf/open/floor/iron/dark,
/area/security/warden)
+"vtC" = (
+/obj/structure/railing{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/wideplating/dark{
+ dir = 4
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/open/floor/iron/dark/smooth_edge{
+ dir = 8
+ },
+/area/hallway/primary/central)
"vtI" = (
/turf/closed/wall,
/area/chapel/main)
@@ -68819,36 +68951,6 @@
},
/turf/open/floor/iron,
/area/hallway/primary/fore)
-"vwx" = (
-/obj/effect/turf_decal/tile/brown/half/contrasted{
- dir = 8
- },
-/obj/effect/turf_decal/guideline/guideline_in/brown,
-/obj/structure/cable/yellow{
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 4
- },
-/obj/structure/disposalpipe/junction{
- dir = 8
- },
-/turf/open/floor/iron,
-/area/hallway/primary/central)
-"vwR" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/structure/disposalpipe/segment{
- dir = 2
- },
-/obj/structure/railing/corner{
- dir = 1
- },
-/turf/open/floor/iron/dark,
-/area/hallway/primary/central)
"vwY" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
dir = 8
@@ -68859,6 +68961,19 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
/turf/open/floor/iron/dark,
/area/ai_monitored/storage/eva)
+"vxg" = (
+/obj/structure/railing{
+ dir = 6
+ },
+/obj/machinery/light/floor{
+ brightness = 15;
+ bulb_colour = "#FFE4CE";
+ bulb_vacuum_brightness = 15;
+ nightshift_brightness = 10;
+ nightshift_light_color = "#E6EBFF"
+ },
+/turf/open/floor/iron/dark/smooth_large,
+/area/hallway/primary/central)
"vxi" = (
/obj/structure/closet/bombcloset,
/obj/effect/turf_decal/bot,
@@ -69014,21 +69129,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
/area/maintenance/department/security)
-"vAx" = (
-/obj/structure/window/reinforced{
- dir = 4;
- layer = 2.9
- },
-/obj/structure/window/reinforced,
-/obj/machinery/light/floor{
- brightness = 15;
- bulb_colour = "#FFE4CE";
- bulb_vacuum_brightness = 15;
- nightshift_brightness = 10;
- nightshift_light_color = "#E6EBFF"
- },
-/turf/open/floor/iron/dark,
-/area/hallway/primary/central)
"vAC" = (
/obj/structure/sign/warning/biohazard,
/turf/closed/wall,
@@ -69098,6 +69198,14 @@
},
/turf/open/floor/carpet,
/area/library)
+"vBA" = (
+/obj/structure/window/reinforced,
+/obj/structure/cable/yellow{
+ icon_state = "4-8"
+ },
+/obj/effect/landmark/start/assistant,
+/turf/open/floor/iron/dark/smooth_large,
+/area/hallway/primary/central)
"vBI" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
dir = 8
@@ -69113,6 +69221,18 @@
},
/turf/open/floor/iron,
/area/engine/engine_room)
+"vBM" = (
+/obj/structure/window/reinforced{
+ dir = 8;
+ pixel_y = 1
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/structure/disposalpipe/segment{
+ dir = 2
+ },
+/turf/open/floor/iron/dark/smooth_large,
+/area/hallway/primary/central)
"vCl" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/rack,
@@ -69167,15 +69287,6 @@
},
/turf/open/floor/iron/dark,
/area/quartermaster/office)
-"vCO" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/obj/structure/disposalpipe/segment{
- dir = 6
- },
-/turf/open/floor/iron/dark,
-/area/hallway/primary/central)
"vCR" = (
/obj/structure/lattice/catwalk/over,
/obj/structure/cable/yellow{
@@ -69726,6 +69837,20 @@
/obj/machinery/digital_clock/directional/north,
/turf/open/floor/iron/cafeteria,
/area/crew_quarters/kitchen)
+"vKI" = (
+/obj/structure/railing{
+ dir = 6;
+ layer = 3.1
+ },
+/obj/structure/chair/fancy/comfy{
+ color = "#596479";
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/wideplating/dark{
+ dir = 6
+ },
+/turf/open/floor/iron/dark/smooth_large,
+/area/hallway/primary/central)
"vLA" = (
/obj/structure/disposalpipe/segment{
dir = 2
@@ -69894,25 +70019,6 @@
/area/security/prison{
name = "Prison Processing"
})
-"vMU" = (
-/obj/effect/turf_decal/tile/brown/half/contrasted{
- dir = 8
- },
-/obj/effect/turf_decal/guideline/guideline_in/brown,
-/obj/structure/disposalpipe/segment{
- dir = 8
- },
-/obj/structure/cable/yellow{
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/hallway/primary/central)
"vMV" = (
/obj/effect/turf_decal/guideline/guideline_edge/blue{
dir = 1
@@ -70079,20 +70185,6 @@
},
/turf/open/floor/iron/dark,
/area/science/misc_lab)
-"vPJ" = (
-/obj/structure/railing{
- dir = 6;
- layer = 3.1
- },
-/obj/structure/chair/fancy/comfy{
- color = "#596479";
- dir = 1
- },
-/obj/effect/turf_decal/siding/wideplating/dark{
- dir = 6
- },
-/turf/open/floor/iron/dark,
-/area/hallway/primary/central)
"vPT" = (
/obj/machinery/light{
dir = 8
@@ -70532,6 +70624,15 @@
/obj/machinery/suit_storage_unit/standard_unit,
/turf/open/floor/iron/tech,
/area/ai_monitored/storage/eva)
+"vXk" = (
+/obj/structure/cable/yellow{
+ icon_state = "4-8"
+ },
+/obj/structure/railing/corner{
+ dir = 8
+ },
+/turf/open/floor/iron/dark/smooth_large,
+/area/hallway/primary/central)
"vXn" = (
/obj/structure/cable/yellow{
icon_state = "1-2"
@@ -70758,13 +70859,20 @@
},
/turf/open/floor/iron,
/area/hallway/primary/fore)
-"wbs" = (
-/obj/structure/lattice,
-/obj/item/toy/plush/lizard_plushie/space{
- name = "Embraces-the-Void"
+"wbB" = (
+/obj/structure/window/reinforced{
+ dir = 4;
+ layer = 2.9
},
-/turf/open/space/basic,
-/area/space/nearstation)
+/obj/structure/window/reinforced{
+ dir = 1;
+ layer = 2.9
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 10
+ },
+/turf/open/floor/iron/dark/smooth_large,
+/area/hallway/primary/central)
"wbE" = (
/obj/effect/turf_decal/bot,
/obj/machinery/disposal/bin,
@@ -70859,6 +70967,19 @@
"wdk" = (
/turf/open/floor/iron/dark,
/area/engine/engine_room)
+"wdo" = (
+/obj/effect/turf_decal/tile/purple/half/contrasted{
+ dir = 4
+ },
+/obj/effect/turf_decal/guideline/guideline_in/purple{
+ dir = 1
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/turf/open/floor/iron/half,
+/area/hallway/primary/central)
"wdq" = (
/obj/structure/lattice,
/obj/structure/railing{
@@ -71171,23 +71292,6 @@
dir = 4
},
/area/science/research)
-"whp" = (
-/obj/effect/turf_decal/tile/purple/half/contrasted{
- dir = 4
- },
-/obj/effect/turf_decal/guideline/guideline_in/purple{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/structure/disposalpipe/segment{
- dir = 2
- },
-/turf/open/floor/iron,
-/area/hallway/primary/central)
"whX" = (
/obj/machinery/atmospherics/pipe/simple/orange/visible{
dir = 10
@@ -71420,6 +71524,18 @@
/obj/structure/reagent_dispensers/watertank,
/turf/open/floor/plating,
/area/maintenance/port/central)
+"wlL" = (
+/obj/structure/chair/fancy/comfy{
+ buildstackamount = 0;
+ color = "#742925";
+ dir = 4
+ },
+/obj/structure/window/reinforced{
+ dir = 8;
+ pixel_y = 1
+ },
+/turf/open/floor/iron/dark/smooth_large,
+/area/hallway/primary/central)
"wlO" = (
/obj/structure/cable/yellow{
icon_state = "4-8"
@@ -71489,18 +71605,6 @@
/obj/structure/table/wood,
/turf/open/floor/carpet/green,
/area/hallway/secondary/exit/departure_lounge)
-"wnc" = (
-/obj/structure/railing{
- dir = 8
- },
-/obj/effect/turf_decal/siding/thinplating/light{
- dir = 8
- },
-/obj/effect/turf_decal/siding/wideplating/dark{
- dir = 8
- },
-/turf/open/floor/iron/dark,
-/area/hallway/primary/central)
"wng" = (
/obj/machinery/door/firedoor,
/obj/structure/cable/yellow{
@@ -71672,12 +71776,17 @@
dir = 4
},
/area/hallway/primary/central)
-"wqa" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
-/obj/structure/railing/corner{
- dir = 1
+"wpW" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 10
},
-/turf/open/floor/iron/dark,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 10
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 2
+ },
+/turf/open/floor/iron/dark/smooth_large,
/area/hallway/primary/central)
"wqd" = (
/obj/effect/turf_decal/tile/neutral/anticorner/contrasted,
@@ -71815,17 +71924,6 @@
},
/turf/open/floor/iron,
/area/science/storage)
-"wvx" = (
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
-/obj/machinery/navbeacon{
- codes_txt = "patrol;next_patrol=25-NHall";
- location = "24-CenterNE"
- },
-/turf/open/floor/iron/dark,
-/area/hallway/primary/central)
"wvK" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
@@ -71916,6 +72014,22 @@
},
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
+"wyf" = (
+/obj/structure/disposalpipe/segment{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/yellow/half/contrasted{
+ alpha = 180
+ },
+/obj/effect/turf_decal/guideline/guideline_in/yellow{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/turf/open/floor/iron/large,
+/area/hallway/primary/central)
"wyg" = (
/obj/structure/chair/fancy/bench/pew/right{
dir = 8
@@ -72098,15 +72212,6 @@
"wAF" = (
/turf/closed/wall,
/area/security/checkpoint/auxiliary)
-"wAH" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 9
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 9
- },
-/turf/open/floor/iron/dark,
-/area/hallway/primary/central)
"wAP" = (
/obj/structure/table,
/obj/item/stock_parts/subspace/filter,
@@ -72602,6 +72707,16 @@
"wII" = (
/turf/closed/wall,
/area/crew_quarters/dorms)
+"wIO" = (
+/obj/structure/railing,
+/obj/effect/turf_decal/siding/wideplating/dark,
+/obj/structure/disposalpipe/segment{
+ dir = 2
+ },
+/turf/open/floor/iron/dark/smooth_edge{
+ dir = 1
+ },
+/area/hallway/primary/central)
"wIQ" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 4
@@ -72708,6 +72823,20 @@
},
/turf/open/floor/plating,
/area/engine/break_room)
+"wKQ" = (
+/obj/effect/turf_decal/guideline/guideline_in/darkblue{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/dark_blue/half/contrasted{
+ alpha = 180;
+ dir = 1
+ },
+/obj/structure/cable/yellow{
+ icon_state = "1-2"
+ },
+/obj/structure/disposalpipe/segment,
+/turf/open/floor/iron/large,
+/area/hallway/primary/central)
"wKX" = (
/obj/effect/turf_decal/tile/blue,
/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{
@@ -72915,6 +73044,18 @@
},
/turf/open/floor/plating,
/area/maintenance/department/science)
+"wMU" = (
+/obj/structure/railing/corner{
+ dir = 4
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 1
+ },
+/turf/open/floor/iron/dark/smooth_large,
+/area/hallway/primary/central)
"wNt" = (
/obj/machinery/door/window/northright{
name = "Library Desk Door";
@@ -72970,6 +73111,14 @@
dir = 8
},
/area/hallway/secondary/exit/departure_lounge)
+"wOc" = (
+/obj/structure/chair/fancy/plastic,
+/obj/structure/lattice/catwalk,
+/obj/item/toy/plush/lizard_plushie/space{
+ name = "Drkh-Hlyt"
+ },
+/turf/open/space/basic,
+/area/space/nearstation)
"wOk" = (
/obj/effect/spawner/randomvend/snack,
/obj/effect/turf_decal/tile/neutral/half/contrasted,
@@ -73057,6 +73206,14 @@
/obj/effect/turf_decal/delivery,
/turf/open/floor/iron/dark,
/area/ai_monitored/security/armory)
+"wPY" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/structure/railing/corner,
+/turf/open/floor/iron/dark/smooth_large,
+/area/hallway/primary/central)
"wQc" = (
/obj/structure/sign/warning/securearea,
/turf/closed/wall/r_wall,
@@ -73078,18 +73235,6 @@
/obj/effect/landmark/start/chief_engineer,
/turf/open/floor/iron/dark,
/area/crew_quarters/heads/chief)
-"wQA" = (
-/obj/structure/railing/corner,
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/obj/structure/disposalpipe/segment{
- dir = 1
- },
-/turf/open/floor/iron/dark/side{
- dir = 5
- },
-/area/hallway/primary/central)
"wQC" = (
/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/box/corners{
@@ -73175,6 +73320,24 @@
},
/turf/open/floor/iron/white,
/area/science/xenobiology)
+"wSl" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/structure/cable/yellow{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 5
+ },
+/turf/open/floor/iron/dark/smooth_large,
+/area/hallway/primary/central)
"wSs" = (
/obj/machinery/suit_storage_unit/cmo,
/obj/machinery/computer/security/telescreen{
@@ -73369,18 +73532,19 @@
},
/turf/open/floor/plating,
/area/maintenance/department/bridge)
-"wVM" = (
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
- dir = 8
+"wVO" = (
+/obj/structure/railing,
+/obj/machinery/light/floor{
+ brightness = 15;
+ bulb_colour = "#FFE4CE";
+ bulb_vacuum_brightness = 15;
+ nightshift_brightness = 10;
+ nightshift_light_color = "#E6EBFF"
},
-/obj/machinery/navbeacon{
- codes_txt = "patrol;next_patrol=16-EHall";
- location = "15-CenterSE"
+/obj/effect/turf_decal/siding/wideplating/dark,
+/turf/open/floor/iron/dark/smooth_edge{
+ dir = 1
},
-/turf/open/floor/iron/dark,
/area/hallway/primary/central)
"wVX" = (
/obj/structure/cable/yellow{
@@ -74032,6 +74196,23 @@
/obj/effect/turf_decal/stripes/box,
/turf/open/floor/iron/dark,
/area/quartermaster/storage)
+"xiq" = (
+/obj/effect/turf_decal/guideline/guideline_in/neutral{
+ alpha = 255;
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/neutral/half/contrasted{
+ alpha = 140;
+ color = "#FFFFFF";
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/open/floor/iron/half,
+/area/hallway/primary/central)
"xis" = (
/obj/machinery/dna_scannernew,
/obj/structure/window/reinforced,
@@ -74136,6 +74317,18 @@
/obj/effect/turf_decal/tile/neutral/half/contrasted,
/turf/open/floor/iron/dark,
/area/security/nuke_storage)
+"xke" = (
+/obj/structure/railing/corner{
+ dir = 4
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/open/floor/iron/dark/smooth_large,
+/area/hallway/primary/central)
"xkg" = (
/obj/machinery/atmospherics/pipe/simple/general/visible{
dir = 4
@@ -74205,6 +74398,14 @@
},
/turf/open/floor/carpet/blue,
/area/crew_quarters/heads/hos)
+"xlL" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/structure/railing/corner{
+ dir = 1
+ },
+/turf/open/floor/iron/dark/smooth_large,
+/area/hallway/primary/central)
"xlS" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -74456,6 +74657,12 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/turf/open/floor/iron,
/area/hallway/primary/central)
+"xox" = (
+/obj/structure/window/reinforced,
+/obj/structure/closet/firecloset/full,
+/obj/effect/turf_decal/bot,
+/turf/open/floor/iron/dark/smooth_large,
+/area/hallway/primary/central)
"xoD" = (
/obj/structure/window/reinforced{
dir = 1
@@ -74511,25 +74718,6 @@
},
/turf/open/floor/iron/sepia,
/area/quartermaster/office)
-"xpT" = (
-/obj/effect/turf_decal/tile/brown/half/contrasted{
- dir = 8
- },
-/obj/effect/turf_decal/guideline/guideline_in/brown,
-/obj/structure/disposalpipe/segment{
- dir = 8
- },
-/obj/structure/cable/yellow{
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
- dir = 1
- },
-/turf/open/floor/iron,
-/area/hallway/primary/central)
"xpW" = (
/obj/structure/reflector/double{
dir = 5
@@ -74897,19 +75085,6 @@
},
/turf/open/floor/iron/dark,
/area/quartermaster/miningdock)
-"xve" = (
-/obj/structure/railing{
- dir = 9
- },
-/obj/machinery/light/floor{
- brightness = 15;
- bulb_colour = "#FFE4CE";
- bulb_vacuum_brightness = 15;
- nightshift_brightness = 10;
- nightshift_light_color = "#E6EBFF"
- },
-/turf/open/floor/iron/dark,
-/area/hallway/primary/central)
"xvi" = (
/obj/effect/turf_decal/tile/dark_red/fourcorners/contrasted{
alpha = 180;
@@ -75002,6 +75177,16 @@
},
/turf/open/floor/iron/dark,
/area/quartermaster/storage)
+"xwg" = (
+/obj/structure/railing/corner{
+ dir = 8
+ },
+/obj/effect/turf_decal/stripes/line,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/open/floor/iron/dark/smooth_large,
+/area/hallway/primary/central)
"xwj" = (
/obj/structure/table/wood,
/obj/item/paper_bin,
@@ -75268,12 +75453,6 @@
/obj/effect/landmark/xeno_spawn,
/turf/open/floor/engine,
/area/science/xenobiology)
-"xyH" = (
-/obj/effect/turf_decal/siding/wideplating/dark{
- dir = 8
- },
-/turf/open/floor/iron/dark,
-/area/hallway/primary/central)
"xyJ" = (
/obj/effect/landmark/blobstart,
/turf/open/floor/plating,
@@ -75555,18 +75734,6 @@
/obj/effect/turf_decal/tile/blue/anticorner,
/turf/open/floor/iron,
/area/maintenance/starboard/aft)
-"xDi" = (
-/obj/structure/chair/fancy/comfy{
- buildstackamount = 0;
- color = "#742925";
- dir = 4
- },
-/obj/structure/window/reinforced{
- dir = 8;
- pixel_y = 1
- },
-/turf/open/floor/iron/dark,
-/area/hallway/primary/central)
"xDu" = (
/obj/effect/turf_decal/stripes/line{
dir = 5
@@ -75693,6 +75860,18 @@
dir = 1
},
/area/hallway/secondary/exit/departure_lounge)
+"xFW" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 5
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 5
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/open/floor/iron/dark/smooth_large,
+/area/hallway/primary/central)
"xGh" = (
/obj/structure/table,
/obj/item/assembly/signaler{
@@ -75726,15 +75905,6 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/turf/open/floor/iron/dark,
/area/science/robotics)
-"xGM" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 6
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 6
- },
-/turf/open/floor/iron/dark,
-/area/hallway/primary/central)
"xGP" = (
/obj/structure/lattice/catwalk,
/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
@@ -76028,14 +76198,14 @@
},
/turf/open/floor/iron/white,
/area/medical/office)
-"xKO" = (
+"xKS" = (
/obj/structure/railing{
- dir = 1
+ dir = 4
},
/obj/effect/turf_decal/siding/wideplating/dark{
- dir = 1
+ dir = 4
},
-/turf/open/floor/iron/dark,
+/turf/open/floor/iron/dark/smooth_large,
/area/hallway/primary/central)
"xKW" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
@@ -76295,6 +76465,18 @@
"xPA" = (
/turf/closed/wall,
/area/medical/break_room)
+"xPB" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/purple/half/contrasted{
+ dir = 4
+ },
+/obj/effect/turf_decal/guideline/guideline_in/purple{
+ dir = 1
+ },
+/turf/open/floor/iron/half,
+/area/hallway/primary/central)
"xPE" = (
/obj/structure/table,
/obj/machinery/power/apc/auto_name/north{
@@ -76368,6 +76550,15 @@
},
/turf/open/floor/iron,
/area/science/mixing)
+"xRw" = (
+/obj/structure/closet/emcloset,
+/obj/effect/turf_decal/bot,
+/obj/structure/window/reinforced{
+ dir = 1;
+ layer = 2.9
+ },
+/turf/open/floor/iron/dark/smooth_large,
+/area/hallway/primary/central)
"xRL" = (
/obj/structure/table/wood,
/obj/structure/mirror{
@@ -76518,12 +76709,6 @@
burnt = 1
},
/area/maintenance/port/central)
-"xVZ" = (
-/obj/structure/railing/corner{
- dir = 4
- },
-/turf/open/floor/iron/dark,
-/area/hallway/primary/central)
"xWd" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 4
@@ -76654,6 +76839,15 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/turf/open/floor/wood,
/area/security/detectives_office)
+"xYz" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 6
+ },
+/turf/open/floor/iron/dark/smooth_large,
+/area/hallway/primary/central)
"xYK" = (
/obj/machinery/atmospherics/pipe/simple/cyan/visible{
dir = 4
@@ -76950,6 +77144,14 @@
/obj/effect/turf_decal/bot,
/turf/open/floor/iron/grid/steel,
/area/hydroponics)
+"ycN" = (
+/obj/structure/chair/fancy/plastic,
+/obj/structure/lattice/catwalk,
+/obj/item/toy/plush/lizard_plushie/space{
+ name = "Taksh-Vrac"
+ },
+/turf/open/space/basic,
+/area/space/nearstation)
"ycR" = (
/obj/structure/table/reinforced,
/obj/item/storage/firstaid/fire{
@@ -77168,19 +77370,6 @@
/area/security/main{
name = "Security Locker Room"
})
-"ygO" = (
-/obj/structure/window/reinforced{
- dir = 4;
- layer = 2.9
- },
-/obj/structure/window/reinforced{
- dir = 1;
- layer = 2.9
- },
-/obj/machinery/vending/snack/orange,
-/obj/effect/turf_decal/bot,
-/turf/open/floor/iron/dark,
-/area/hallway/primary/central)
"ygW" = (
/obj/effect/turf_decal/stripes/line{
dir = 9
@@ -77233,6 +77422,14 @@
/obj/item/bedsheet/green,
/turf/open/floor/circuit/telecomms/server,
/area/science/xenobiology)
+"yhB" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/structure/railing/corner{
+ dir = 8
+ },
+/turf/open/floor/iron/dark/smooth_large,
+/area/hallway/primary/central)
"yie" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 4
@@ -91486,15 +91683,15 @@ yeA
yeA
ewB
yeA
-bNH
-bNH
-bNH
+mKV
+mKV
+mKV
odm
eEg
tbt
-bNH
-bNH
-bNH
+mKV
+mKV
+mKV
yeA
ewB
yeA
@@ -92000,15 +92197,15 @@ yeA
gsA
ewB
gsA
-qzF
-qzF
-qzF
+bcX
+bcX
+bcX
odm
eEg
tbt
-qzF
-qzF
-qzF
+bcX
+bcX
+bcX
iDN
cjc
yeA
@@ -92514,15 +92711,15 @@ yeA
gsA
gsA
gsA
-bNH
-bNH
-bNH
+mKV
+mKV
+mKV
odm
vUL
tbt
-bNH
-bNH
-bNH
+mKV
+mKV
+mKV
yeA
gsA
gsA
@@ -93028,15 +93225,15 @@ yeA
ewB
gsA
yeA
-qzF
-qzF
-qzF
+bcX
+bcX
+bcX
odm
eEg
yeA
iDO
-qzF
-qzF
+bcX
+bcX
yeA
rRD
wAW
@@ -93541,9 +93738,9 @@ yeA
gsA
cjc
roh
-bNH
-bNH
-bNH
+mKV
+mKV
+mKV
fHH
yeA
fHH
@@ -94055,8 +94252,8 @@ yeA
ewB
gsA
yeA
-qzF
-qzF
+bcX
+bcX
iDO
lAb
yeA
@@ -94568,9 +94765,9 @@ ewB
gsA
wAW
gsA
-bNH
-bNH
-bNH
+mKV
+mKV
+mKV
tSx
fHH
yeA
@@ -95082,8 +95279,8 @@ gsA
gsA
gsA
gsA
-qzF
-qzF
+bcX
+bcX
vUL
fHH
fHH
@@ -95683,15 +95880,15 @@ gsA
yeA
yeA
yeA
-qui
-qui
-qui
+lvA
+lvA
+lvA
odm
tBB
tbt
-qui
-qui
-qui
+lvA
+lvA
+lvA
yeA
ewB
yeA
@@ -96197,15 +96394,15 @@ gsA
yeA
yeA
yeA
-mBc
-mBc
-mBc
+qKT
+qKT
+qKT
odm
tBB
tbt
-mBc
-mBc
-mBc
+qKT
+qKT
+qKT
gsA
ewB
yeA
@@ -96711,15 +96908,15 @@ ewB
gsA
gsA
yeA
-qui
-qui
-qui
+lvA
+lvA
+lvA
odm
tBB
tbt
-qui
-qui
-qui
+lvA
+lvA
+lvA
gsA
yeA
gsA
@@ -97225,15 +97422,15 @@ jGx
gsA
gsA
yeA
-mBc
-mBc
-mBc
+qKT
+qKT
+qKT
odm
tBB
tbt
-mBc
-mBc
-mBc
+qKT
+qKT
+qKT
yeA
gsA
ewB
@@ -97738,17 +97935,17 @@ yeA
gsA
gsA
gsA
-qui
-qui
-qui
-qui
+lvA
+lvA
+lvA
+lvA
odm
nxQ
tbt
-qui
-qui
-qui
-qui
+lvA
+lvA
+lvA
+lvA
gsA
ewB
gsA
@@ -98252,17 +98449,17 @@ yeA
gsA
gsA
yeA
-mBc
-mBc
-mBc
-mBc
+qKT
+qKT
+qKT
+qKT
odm
sBb
tbt
-mBc
-mBc
-mBc
-mBc
+qKT
+qKT
+qKT
+qKT
yeA
gsA
gsA
@@ -98438,7 +98635,7 @@ nEb
vIF
pOq
vxS
-kgg
+tKt
sNa
vDo
jut
@@ -98765,19 +98962,19 @@ sLX
sxX
lfC
gsA
-qui
-qui
-qui
-qui
-qui
+lvA
+lvA
+lvA
+lvA
+lvA
odm
tBB
tbt
-qui
-qui
-qui
-qui
-qui
+lvA
+lvA
+lvA
+lvA
+lvA
yeA
gsA
ewB
@@ -99279,19 +99476,19 @@ mfz
hvo
lfC
gsA
-mBc
-mBc
-mBc
-mBc
-mBc
+qKT
+qKT
+qKT
+qKT
+qKT
odm
sBb
tbt
-mBc
-mBc
-mBc
-mBc
-mBc
+qKT
+qKT
+qKT
+qKT
+qKT
gsA
yeA
ewB
@@ -107699,16 +107896,16 @@ dbJ
wap
jEw
pHU
-mzP
-uOI
-tio
-srd
-oNo
-whp
-qyT
-eYZ
-kYQ
-pQj
+mCn
+wPY
+hch
+jWX
+pNW
+mYl
+smi
+nix
+lnP
+urn
wzY
oiI
oiI
@@ -107955,18 +108152,18 @@ hdp
mqz
cmj
iLp
-bin
-fvZ
-fPZ
+pvU
+syr
+pKr
cUv
-lxB
-vwx
-smq
-dsD
+pOJ
+uZJ
+dGe
+jIN
hCu
-cWq
-bKN
-aOb
+wbB
+anN
+wpW
iLp
aJZ
uhy
@@ -108210,22 +108407,22 @@ gHo
nQL
taf
dcw
-iSM
-pMJ
-sCf
-loC
+rhe
+awk
+dXa
+rca
odf
wlS
-xKO
-xpT
-lsf
-dsD
+tzR
+knY
+qQU
+jIN
wlS
iDQ
-ygO
-lAD
-ouU
-bQv
+swI
+eOY
+izC
+nvp
bpQ
qRk
fRc
@@ -108467,22 +108664,22 @@ seT
hdp
hdp
xgv
-fWh
-vAx
+saB
+fss
hVF
sTd
ylB
wlS
-xKO
-eIx
-wjO
-dsD
+tzR
+ayA
+xPB
+jIN
wlS
jvs
hCu
qsq
-ulm
-mAE
+bKA
+nzq
oeh
eXl
eXl
@@ -108723,24 +108920,24 @@ nAt
seT
gqH
gep
-wAH
-gCb
+hOL
+xox
bCz
iDQ
wlS
gky
wlS
-gGU
-hUK
-tpU
-pLX
+nkR
+eoa
+wdo
+wVO
wlS
wlS
wlS
iDQ
wlS
-dDv
-oQN
+dxR
+tam
chV
eXl
bzO
@@ -108979,26 +109176,26 @@ iis
uZs
alb
pHU
-wAH
-jBi
-cwu
+hOL
+rDO
+gLw
fbi
wlS
wlS
-stA
-gJw
+lvh
+lZt
inc
-vMU
-bjT
+taD
+kxA
fhX
-bmF
-lSY
+hGR
+tPY
wlS
wlS
roY
-uSQ
-xVZ
-oQN
+gZG
+fBw
+tam
cFD
ppw
jSx
@@ -109236,26 +109433,26 @@ cfg
aoG
aBO
jwn
-jBi
-lJE
+rDO
+sQg
iek
wlS
wlS
hXo
aKe
urD
-vcA
-uWp
-nJC
-wQA
+wMU
+jTt
+sjU
+kRy
uek
nFf
-qvB
+reO
wlS
sTd
smT
-cPS
-xVZ
+aBR
+fBw
qBR
ppw
jSx
@@ -109493,26 +109690,26 @@ seT
rwm
seT
wzd
-cLZ
+fEG
iDQ
qKa
wlS
wlS
vSd
eDS
-cbd
+vxg
iZt
vdT
bxa
iKK
-ekq
+ggi
pUp
-fCf
+iWM
eOD
cYH
jgD
tmM
-gGk
+ksJ
vdZ
bzO
aDC
@@ -109601,7 +109798,7 @@ yeA
yeA
yeA
yeA
-wbs
+ulD
yeA
yeA
yeA
@@ -109750,26 +109947,26 @@ bGs
nOQ
laA
wIQ
-ffD
-wnc
-wnc
-wnc
-dKe
+anK
+eOX
+eOX
+eOX
+pDp
inc
-dSE
+xwg
tWU
qcJ
oMR
qlu
bLa
hTQ
-kmo
+fbl
xOP
-dUw
-tWu
-xyH
-gVL
-aGJ
+sXn
+osg
+mbh
+kkP
+rHJ
uME
laA
nOQ
@@ -110007,26 +110204,26 @@ epS
xaS
xzx
tnC
-xaS
-aIF
-jUL
-xaS
-idZ
-xaS
-tNx
+eeg
+gKx
+qKC
+eeg
+pQI
+eeg
+pAM
bKt
wod
vRm
jnI
noO
vTe
-ikk
-pPi
-fpE
-sGG
-qLh
-irW
-sGG
+vpU
+mRU
+ftd
+bhZ
+wyf
+uLI
+bhZ
keJ
sGG
sGG
@@ -110264,26 +110461,26 @@ oao
qkS
rUQ
blK
-pMW
-nAM
-ozN
-rUQ
-rUQ
-qkS
-sZv
+psg
+acF
+skw
+wKQ
+wKQ
+iAk
+uwt
fiQ
rXe
rmX
ciF
cYr
gkL
-eTP
-aVu
-gWW
-aVu
-meK
-nim
-aVu
+lct
+vpc
+omx
+vpc
+kts
+lzr
+vpc
kJB
aVu
aVu
@@ -110521,26 +110718,26 @@ bGs
tfV
vUy
fNR
-mwM
-rXC
-mpV
-mpV
-hRW
+hsc
+vtC
+nII
+nII
+tgc
wpL
-pUK
+mug
hsJ
iQW
tYH
bVJ
kfw
stl
-juB
+xke
qcI
-fLE
-bJF
-bJF
-flV
-xVZ
+vjE
+erk
+erk
+fOW
+fBw
uVt
vUy
ybW
@@ -110778,26 +110975,26 @@ oxQ
rgh
oxQ
oVP
-mNa
+vBA
ahD
smT
wlS
wlS
toW
ruI
-mQS
+ufh
pEA
ixP
nlx
nfS
-xve
+nTU
aEW
-kHH
+mPB
nQW
tLv
tmM
jgD
-hjC
+pEq
mxy
dFC
dFC
@@ -111035,26 +111232,26 @@ xlV
fNs
mlR
xgv
-pUT
-rmw
+vXk
+gPb
spz
wlS
wlS
hXo
qwm
jbN
-psh
-epK
-vCO
-tdT
+cBW
+wSl
+xYz
+exU
siz
vRw
-vPJ
+vKI
wlS
qKa
iDQ
-nxu
-aGJ
+pgR
+rHJ
oeh
dFC
wYg
@@ -111292,26 +111489,26 @@ wuz
iBJ
heA
eRL
-hsi
-aDb
-fow
+qeG
+qtN
+mAM
xMW
wlS
wlS
-vrM
-qEi
+met
+tbP
wpL
-nDB
-jwG
+sEW
+kJY
qcI
-pGu
-lzC
+xKS
+gcy
wlS
fcL
wlS
-jnT
-aGJ
-xGM
+tvr
+rHJ
+bpY
pBg
dFC
wYg
@@ -111550,24 +111747,24 @@ tGT
tGT
tGT
ePp
-uiK
-gCb
+xFW
+xox
qsq
smT
tib
dWQ
wlS
-gGU
-jFh
-wAc
-pLX
+nkR
+sBB
+jsa
+wVO
wlS
wlS
wlS
kPT
odf
-bJx
-xGM
+xRw
+bpY
nQt
dFC
dFC
@@ -111808,22 +112005,22 @@ xZT
tGT
mNf
tEG
-gsB
-fro
+tpk
+hnm
smT
odf
qHl
wlS
-xKO
-krU
-wAc
-dsD
+tzR
+sSs
+jsa
+jIN
wlS
wlS
cGr
iDQ
-hog
-eBu
+lpW
+gpQ
igJ
dFC
dFC
@@ -112065,22 +112262,22 @@ xWy
bpm
hQf
sTz
-wvx
-rGw
-xDi
-ncn
+qOy
+nik
+wlL
+qWO
olO
fqN
-xKO
-gWV
-eIt
-dsD
+tzR
+fXY
+prw
+jIN
smT
smT
-pnj
-hKl
-wqa
-wVM
+dpw
+eGV
+pLL
+aRe
nQt
aQm
wYg
@@ -112324,18 +112521,18 @@ ntf
wkt
oGS
qeL
-bsP
-sna
-kqy
+dUg
+dyS
+eho
smT
-xKO
-bOl
-dQG
-qGE
+tzR
+cKE
+sbt
+wIO
nVO
-iev
-mhh
-aSe
+hgu
+hTs
+nkT
gNV
pVM
uhy
@@ -112582,16 +112779,16 @@ hdp
czh
hdp
cnY
-pQj
-pxc
-jrF
-vwR
-frj
-alv
-lfo
-tQt
-hfA
-pQj
+urn
+pFQ
+vBM
+iot
+jOD
+xiq
+yhB
+aSV
+xlL
+urn
pBg
vAC
ugI
@@ -113839,7 +114036,7 @@ rNr
rBT
sgc
rNr
-kwm
+mDx
rNr
kMF
yeA
@@ -120863,19 +121060,19 @@ egp
eNg
bhN
yeA
-nxy
-nxy
-nxy
-nxy
-nxy
+sDh
+sDh
+sDh
+sDh
+sDh
odm
lHv
tbt
-nxy
-nxy
-nxy
-nxy
-nxy
+sDh
+sDh
+sDh
+sDh
+sDh
gsA
ewB
gsA
@@ -121135,7 +121332,7 @@ gjW
muk
gsA
ewB
-sDE
+wOc
gsA
yeA
yeA
@@ -121377,19 +121574,19 @@ bhN
gsA
gsA
yeA
-dVs
-dVs
-dVs
-dVs
-dVs
+edV
+edV
+edV
+edV
+edV
odm
jxz
tbt
-dVs
-dVs
-dVs
-dVs
-dVs
+edV
+edV
+edV
+edV
+edV
gsA
ewB
oHE
@@ -121649,7 +121846,7 @@ yeA
yeA
gsA
ewB
-gTf
+ycN
gsA
yeA
yeA
@@ -121892,17 +122089,17 @@ gsA
gsA
gsA
yeA
-nxy
-nxy
-nxy
-nxy
+sDh
+sDh
+sDh
+sDh
odm
jxz
tbt
-nxy
-nxy
-nxy
-nxy
+sDh
+sDh
+sDh
+sDh
gsA
gsA
ewB
@@ -122406,17 +122603,17 @@ gsA
gsA
ewB
gsA
-dVs
-dVs
-dVs
-dVs
+edV
+edV
+edV
+edV
odm
omU
tbt
-dVs
-dVs
-dVs
-dVs
+edV
+edV
+edV
+edV
gsA
ewB
gsA
@@ -122921,15 +123118,15 @@ gsA
ewB
gsA
yeA
-nxy
-nxy
-nxy
+sDh
+sDh
+sDh
odm
jxz
tbt
-nxy
-nxy
-nxy
+sDh
+sDh
+sDh
yeA
gsA
ewB
@@ -123435,15 +123632,15 @@ yeA
gsA
gsA
gsA
-dVs
-dVs
-dVs
+edV
+edV
+edV
odm
nBj
tbt
-dVs
-dVs
-dVs
+edV
+edV
+edV
gsA
gsA
gsA
@@ -123949,15 +124146,15 @@ yeA
yeA
ewB
gsA
-nxy
-nxy
-nxy
+sDh
+sDh
+sDh
odm
jxz
tbt
-nxy
-nxy
-nxy
+sDh
+sDh
+sDh
gsA
ewB
yeA
@@ -124463,15 +124660,15 @@ yeA
yeA
ewB
yeA
-dVs
-dVs
-dVs
+edV
+edV
+edV
odm
jxz
tbt
-dVs
-dVs
-dVs
+edV
+edV
+edV
yeA
ewB
yeA
@@ -125408,19 +125605,19 @@ gsA
gsA
gsA
gsA
-knE
-knE
-knE
-knE
-knE
+awC
+awC
+awC
+awC
+awC
odm
pft
tbt
-knE
-knE
-knE
-knE
-knE
+awC
+awC
+awC
+awC
+awC
yeA
gsA
gsA
@@ -125922,19 +126119,19 @@ gsA
gsA
ewB
gsA
-mCI
-mCI
-mCI
-mCI
-mCI
+kxO
+kxO
+kxO
+kxO
+kxO
odm
rYv
tbt
-mCI
-mCI
-mCI
-mCI
-mCI
+kxO
+kxO
+kxO
+kxO
+kxO
yeA
gsA
ewB
@@ -126437,17 +126634,17 @@ yeA
ewB
gsA
yeA
-knE
-knE
-knE
-knE
+awC
+awC
+awC
+awC
odm
pft
tbt
-knE
-knE
-knE
-knE
+awC
+awC
+awC
+awC
yeA
gsA
gsA
@@ -126951,17 +127148,17 @@ yeA
gsA
ewB
gsA
-mCI
-mCI
-mCI
-mCI
+kxO
+kxO
+kxO
+kxO
odm
fbn
tbt
-mCI
-mCI
-mCI
-mCI
+kxO
+kxO
+kxO
+kxO
yeA
ewB
gsA
@@ -127466,15 +127663,15 @@ yeA
ewB
gsA
yeA
-knE
-knE
-knE
+awC
+awC
+awC
odm
rYv
tbt
-knE
-knE
-knE
+awC
+awC
+awC
yeA
gsA
ewB
@@ -127980,15 +128177,15 @@ yeA
gsA
gsA
gsA
-mCI
-mCI
-mCI
+kxO
+kxO
+kxO
odm
pft
tbt
-mCI
-mCI
-mCI
+kxO
+kxO
+kxO
yeA
gsA
gsA
@@ -128494,15 +128691,15 @@ yeA
gsA
ewB
gsA
-knE
-knE
-knE
+awC
+awC
+awC
odm
rYv
tbt
-knE
-knE
-knE
+awC
+awC
+awC
yeA
ewB
yeA
@@ -129008,15 +129205,15 @@ yeA
yeA
ewB
yeA
-mCI
-mCI
-mCI
+kxO
+kxO
+kxO
odm
rYv
tbt
-mCI
-mCI
-mCI
+kxO
+kxO
+kxO
yeA
ewB
yeA
diff --git a/_maps/shuttles/emergency/emergency_discoinferno.dmm b/_maps/shuttles/emergency/emergency_discoinferno.dmm
index 52e3242b0a9ba..2629b06e99961 100644
--- a/_maps/shuttles/emergency/emergency_discoinferno.dmm
+++ b/_maps/shuttles/emergency/emergency_discoinferno.dmm
@@ -8,7 +8,7 @@
"c" = (
/obj/effect/spawner/structure/window/plasma/reinforced,
/obj/machinery/door/firedoor/window,
-/turf/open/floor/iron/elevatorshaft,
+/turf/open/floor/plating/elevatorshaft,
/area/shuttle/escape)
"d" = (
/obj/structure/table/wood,
diff --git a/_maps/shuttles/emergency/emergency_narnar.dmm b/_maps/shuttles/emergency/emergency_narnar.dmm
index 0605ba2951089..70fa1732dc903 100644
--- a/_maps/shuttles/emergency/emergency_narnar.dmm
+++ b/_maps/shuttles/emergency/emergency_narnar.dmm
@@ -12,17 +12,17 @@
"d" = (
/obj/structure/table,
/obj/item/storage/firstaid/fire,
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/shuttle/escape)
"e" = (
/obj/structure/chair/fancy/shuttle{
dir = 1
},
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/shuttle/escape)
"f" = (
/obj/machinery/computer/emergency_shuttle,
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/shuttle/escape)
"g" = (
/obj/structure/table,
@@ -31,40 +31,40 @@
pixel_y = 3
},
/obj/item/crowbar,
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/shuttle/escape)
"h" = (
/obj/machinery/computer/atmos_alert{
dir = 4
},
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/shuttle/escape)
"i" = (
/obj/structure/chair/fancy/shuttle{
dir = 8
},
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/shuttle/escape)
"j" = (
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/shuttle/escape)
"k" = (
/obj/structure/chair/fancy/shuttle{
dir = 4
},
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/shuttle/escape)
"l" = (
/obj/machinery/computer/security{
dir = 8
},
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/shuttle/escape)
"m" = (
/obj/machinery/computer/crew{
dir = 4
},
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/shuttle/escape)
"n" = (
/obj/structure/chair/fancy/shuttle{
@@ -73,29 +73,29 @@
/obj/structure/extinguisher_cabinet{
pixel_y = -30
},
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/shuttle/escape)
"o" = (
/obj/item/radio/intercom{
name = "Station Intercom (General)";
pixel_y = -29
},
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/shuttle/escape)
"p" = (
/obj/machinery/computer/communications{
dir = 8
},
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/shuttle/escape)
"q" = (
/obj/item/stack/sheet/iron,
/obj/effect/decal/remains/human,
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/shuttle/escape)
"r" = (
/obj/machinery/door/airlock/cult/unruned/glass/friendly,
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/shuttle/escape)
"s" = (
/obj/machinery/status_display/evac,
@@ -103,7 +103,7 @@
/area/shuttle/escape)
"t" = (
/obj/structure/closet/emcloset,
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/shuttle/escape)
"u" = (
/obj/structure/table,
@@ -113,15 +113,15 @@
pixel_y = 3
},
/obj/item/crowbar,
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/shuttle/escape)
"v" = (
/obj/effect/decal/cleanable/blood,
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/shuttle/escape)
"w" = (
/mob/living/simple_animal/hostile/construct/artificer,
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/shuttle/escape)
"x" = (
/obj/machinery/door/airlock/cult/friendly,
@@ -130,31 +130,31 @@
"y" = (
/obj/effect/decal/cleanable/blood/gibs/up,
/obj/item/candle/infinite,
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/shuttle/escape)
"z" = (
/obj/effect/rune/raise_dead,
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/shuttle/escape)
"A" = (
/obj/item/candle/infinite,
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/shuttle/escape)
"B" = (
/obj/effect/rune/convert,
/obj/effect/decal/remains/human,
/obj/effect/decal/cleanable/blood/gibs/body,
/obj/effect/decal/cleanable/blood/gibs/core,
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/shuttle/escape)
"C" = (
/mob/living/simple_animal/hostile/construct/juggernaut,
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/shuttle/escape)
"D" = (
/obj/effect/rune/convert,
/obj/effect/decal/remains/human,
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/shuttle/escape)
"E" = (
/obj/machinery/door/airlock/cult/friendly,
@@ -165,7 +165,7 @@
/area/shuttle/escape)
"F" = (
/obj/effect/decal/cleanable/blood/gibs/down,
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/shuttle/escape)
"G" = (
/obj/structure/extinguisher_cabinet{
@@ -174,11 +174,11 @@
/obj/item/extinguisher{
safety = 0
},
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/shuttle/escape)
"H" = (
/mob/living/simple_animal/hostile/construct/wraith,
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/shuttle/escape)
"I" = (
/obj/effect/rune/narsie,
@@ -186,43 +186,43 @@
effect_range = 5;
group_name = "horrible monsters on Shuttle 667"
},
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/shuttle/escape)
"J" = (
/mob/living/simple_animal/hostile/carp/eyeball{
faction = list("cult");
name = "left eyeball"
},
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/shuttle/escape)
"K" = (
/mob/living/simple_animal/hostile/carp/eyeball{
faction = list("cult");
name = "right eyeball"
},
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/shuttle/escape)
"L" = (
/obj/effect/decal/cleanable/blood/drip,
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/shuttle/escape)
"M" = (
/obj/structure/extinguisher_cabinet{
pixel_x = 27
},
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/shuttle/escape)
"N" = (
/obj/machinery/door/airlock/cult/glass/friendly,
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/shuttle/escape)
"O" = (
/obj/structure/dresser,
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/shuttle/escape)
"P" = (
/obj/structure/showcase/horrific_experiment,
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/shuttle/escape)
"Q" = (
/obj/item/storage/firstaid/fire,
@@ -235,21 +235,21 @@
pixel_x = 27
},
/obj/item/stack/sheet/iron,
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/shuttle/escape)
"R" = (
/obj/item/stack/sheet/iron,
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/shuttle/escape)
"S" = (
/obj/structure/table/wood,
/obj/item/tome,
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/shuttle/escape)
"T" = (
/obj/structure/bed,
/obj/item/bedsheet/cult,
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/shuttle/escape)
"U" = (
/obj/structure/window/reinforced{
diff --git a/_maps/shuttles/emergency/emergency_wabbajack.dmm b/_maps/shuttles/emergency/emergency_wabbajack.dmm
index bc3089bf323df..3d71a8948f4e4 100644
--- a/_maps/shuttles/emergency/emergency_wabbajack.dmm
+++ b/_maps/shuttles/emergency/emergency_wabbajack.dmm
@@ -27,14 +27,14 @@
"an" = (
/obj/structure/table/wood,
/obj/item/candle/infinite,
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/shuttle/escape)
"ao" = (
/obj/structure/barricade/wooden,
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/shuttle/escape)
"ap" = (
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/shuttle/escape)
"aq" = (
/turf/open/floor/mineral/titanium,
@@ -71,7 +71,7 @@
/area/shuttle/escape)
"au" = (
/obj/structure/chair/wood,
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/shuttle/escape)
"av" = (
/obj/structure/chair/fancy/shuttle,
@@ -219,7 +219,7 @@
/obj/machinery/light{
dir = 8
},
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/shuttle/escape)
"bl" = (
/obj/machinery/light{
@@ -339,7 +339,7 @@
/obj/structure/barricade/wooden,
/obj/machinery/door/airlock/titanium,
/obj/machinery/door/firedoor,
-/turf/open/floor/iron/cult,
+/turf/open/floor/cult,
/area/shuttle/escape)
"wf" = (
/obj/effect/turf_decal/stripes/line{
diff --git a/_maps/shuttles/hunter/hunter_bounty.dmm b/_maps/shuttles/hunter/hunter_bounty.dmm
index 3a88c51829ceb..757f683745125 100644
--- a/_maps/shuttles/hunter/hunter_bounty.dmm
+++ b/_maps/shuttles/hunter/hunter_bounty.dmm
@@ -471,7 +471,7 @@
layer = 3;
color = "#808080"
},
-/turf/open/floor/iron/elevatorshaft{
+/turf/open/floor/plating/elevatorshaft{
color = "#808080"
},
/area/shuttle/hunter)
@@ -1093,7 +1093,7 @@
layer = 3;
color = "#808080"
},
-/turf/open/floor/iron/elevatorshaft{
+/turf/open/floor/plating/elevatorshaft{
color = "#808080"
},
/area/shuttle/hunter)
diff --git a/_maps/shuttles/ruin/ruin_caravan_victim.dmm b/_maps/shuttles/ruin/ruin_caravan_victim.dmm
index 2d7ba4e08843f..a9fb24106db26 100644
--- a/_maps/shuttles/ruin/ruin_caravan_victim.dmm
+++ b/_maps/shuttles/ruin/ruin_caravan_victim.dmm
@@ -15,7 +15,7 @@
/obj/item/stack/sheet/mineral/silver{
amount = 25
},
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/shuttle/caravan/freighter1)
"aM" = (
/obj/effect/decal/cleanable/dirt,
@@ -74,7 +74,7 @@
/obj/item/stack/sheet/mineral/diamond{
amount = 5
},
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/shuttle/caravan/freighter1)
"bR" = (
/obj/structure/toilet{
@@ -197,7 +197,7 @@
/area/shuttle/caravan/freighter1)
"hk" = (
/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/shuttle/caravan/freighter1)
"if" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -329,7 +329,7 @@
/obj/effect/turf_decal/box/white/corners{
dir = 4
},
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/shuttle/caravan/freighter1)
"oN" = (
/obj/structure/table,
@@ -340,7 +340,7 @@
/turf/open/floor/iron/dark/airless,
/area/shuttle/caravan/freighter1)
"oS" = (
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/shuttle/caravan/freighter1)
"qC" = (
/obj/effect/turf_decal/bot_white,
@@ -356,7 +356,7 @@
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/blood,
/obj/machinery/atmospherics/components/unary/vent_pump/on,
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/shuttle/caravan/freighter1)
"rF" = (
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
@@ -420,7 +420,7 @@
dir = 8
},
/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/shuttle/caravan/freighter1)
"tM" = (
/obj/structure/table,
@@ -546,7 +546,7 @@
/obj/machinery/door/airlock/command{
name = "Bridge"
},
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/shuttle/caravan/freighter1)
"AX" = (
/obj/effect/turf_decal/box/white/corners,
@@ -554,7 +554,7 @@
/obj/item/stack/sheet/glass/fifty,
/obj/item/stack/sheet/glass/fifty,
/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/shuttle/caravan/freighter1)
"Bu" = (
/obj/item/stack/sheet/mineral/titanium,
@@ -602,7 +602,7 @@
/obj/item/stack/sheet/mineral/gold{
amount = 25
},
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/shuttle/caravan/freighter1)
"El" = (
/turf/closed/wall/mineral/titanium/nodiagonal,
@@ -857,7 +857,7 @@
amount = 10
},
/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/shuttle/caravan/freighter1)
"Qk" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -898,7 +898,7 @@
/obj/effect/turf_decal/box/white/corners{
dir = 8
},
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/shuttle/caravan/freighter1)
"Su" = (
/obj/effect/decal/cleanable/dirt,
@@ -925,7 +925,7 @@
opened = 1
},
/obj/item/stack/sheet/iron/fifty,
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/shuttle/caravan/freighter1)
"Ua" = (
/obj/structure/girder,
@@ -1018,7 +1018,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 9
},
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/shuttle/caravan/freighter1)
"Zw" = (
/mob/living/simple_animal/hostile/syndicate/ranged/smg/space,
@@ -1036,7 +1036,7 @@
/obj/item/stack/sheet/rglass{
amount = 20
},
-/turf/open/floor/iron/airless/dark,
+/turf/open/floor/iron/dark/airless,
/area/shuttle/caravan/freighter1)
(1,1,1) = {"
diff --git a/_maps/templates/heretic_sacrifice_template.dmm b/_maps/templates/heretic_sacrifice_template.dmm
index cb263c0c2162f..f27c89ab42d32 100644
--- a/_maps/templates/heretic_sacrifice_template.dmm
+++ b/_maps/templates/heretic_sacrifice_template.dmm
@@ -27,7 +27,7 @@
/obj/effect/decal/fakelattice{
density = 0
},
-/turf/open/floor/iron/rockvault/sandstone,
+/turf/open/floor/vault/sandstone,
/area/heretic_sacrifice/rust)
"fh" = (
/obj/structure/cable/yellow{
@@ -69,7 +69,7 @@
"mb" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/remains/human,
-/turf/open/floor/iron/rockvault/sandstone,
+/turf/open/floor/vault/sandstone,
/area/heretic_sacrifice/rust)
"mG" = (
/obj/effect/turf_decal/weather,
@@ -135,7 +135,7 @@
/obj/effect/decal/fakelattice{
density = 0
},
-/turf/open/floor/iron/rockvault/sandstone,
+/turf/open/floor/vault/sandstone,
/area/heretic_sacrifice/rust)
"pN" = (
/obj/effect/decal/cleanable/oil,
@@ -244,7 +244,7 @@
/obj/effect/decal/fakelattice{
density = 0
},
-/turf/open/floor/iron/rockvault/sandstone,
+/turf/open/floor/vault/sandstone,
/area/heretic_sacrifice/rust)
"AO" = (
/turf/open/floor/fakespace,
@@ -300,7 +300,7 @@
},
/area/heretic_sacrifice/ash)
"ER" = (
-/turf/open/floor/iron/rockvault/sandstone,
+/turf/open/floor/vault/sandstone,
/area/heretic_sacrifice/rust)
"Fd" = (
/turf/closed/indestructible/riveted,
@@ -341,7 +341,7 @@
/area/heretic_sacrifice/ash)
"Je" = (
/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron/rockvault/sandstone,
+/turf/open/floor/vault/sandstone,
/area/heretic_sacrifice/rust)
"Jy" = (
/obj/structure/stone_tile/cracked{
diff --git a/_maps/templates/shelter_6.dmm b/_maps/templates/shelter_6.dmm
index 79a6fd9b3df96..83af7b9a4bb8a 100644
--- a/_maps/templates/shelter_6.dmm
+++ b/_maps/templates/shelter_6.dmm
@@ -45,7 +45,7 @@
/area/survivalpod)
"m" = (
/obj/machinery/power/solar,
-/turf/open/floor/iron/airless/solarpanel,
+/turf/open/floor/iron/solarpanel/airless,
/area/template_noop)
"n" = (
/obj/structure/bed/pod,
diff --git a/beestation.dme b/beestation.dme
index 034ee92f39fe2..cb6fca60b024d 100644
--- a/beestation.dme
+++ b/beestation.dme
@@ -196,12 +196,12 @@
#include "code\__DEFINES\dcs\helpers.dm"
#include "code\__DEFINES\dcs\signals.dm"
#include "code\__DEFINES\dcs\signals\signals_area.dm"
-#include "code\__DEFINES\dcs\signals\signals_atom\signals_atom.dm"
-#include "code\__DEFINES\dcs\signals\signals_atom\signals_atom_attack.dm"
#include "code\__DEFINES\dcs\signals\signals_global.dm"
#include "code\__DEFINES\dcs\signals\signals_lighting.dm"
#include "code\__DEFINES\dcs\signals\signals_movable.dm"
#include "code\__DEFINES\dcs\signals\signals_turf.dm"
+#include "code\__DEFINES\dcs\signals\signals_atom\signals_atom.dm"
+#include "code\__DEFINES\dcs\signals\signals_atom\signals_atom_attack.dm"
#include "code\__DEFINES\dcs\signals\signals_datum\signals_circuit.dm"
#include "code\__DEFINES\dcs\signals\signals_datum\signals_datum.dm"
#include "code\__DEFINES\dcs\signals\signals_datum\signals_moveloop.dm"
@@ -225,8 +225,8 @@
#include "code\__DEFINES\dcs\signals\signals_obj\signals_item\signals_food.dm"
#include "code\__DEFINES\dcs\signals\signals_obj\signals_item\signals_grenade.dm"
#include "code\__DEFINES\dcs\signals\signals_obj\signals_item\signals_implant.dm"
-#include "code\__DEFINES\dcs\signals\signals_obj\signals_item\signals_itemattack.dm"
#include "code\__DEFINES\dcs\signals\signals_obj\signals_item\signals_item.dm"
+#include "code\__DEFINES\dcs\signals\signals_obj\signals_item\signals_itemattack.dm"
#include "code\__DEFINES\dcs\signals\signals_obj\signals_item\signals_organs.dm"
#include "code\__DEFINES\dcs\signals\signals_obj\signals_machine\signals_airlock.dm"
#include "code\__DEFINES\dcs\signals\signals_obj\signals_machine\signals_aquarium.dm"
@@ -1512,6 +1512,7 @@
#include "code\game\objects\items\stacks\sheets\organic\wood.dm"
#include "code\game\objects\items\stacks\sheets\organic\wood_recipes.dm"
#include "code\game\objects\items\stacks\tiles\light.dm"
+#include "code\game\objects\items\stacks\tiles\tile_iron.dm"
#include "code\game\objects\items\stacks\tiles\tile_mineral.dm"
#include "code\game\objects\items\stacks\tiles\tile_reskinning.dm"
#include "code\game\objects\items\stacks\tiles\tile_types.dm"
@@ -1676,10 +1677,10 @@
#include "code\game\turfs\open\water.dm"
#include "code\game\turfs\open\floor\dock_floor.dm"
#include "code\game\turfs\open\floor\fancy_floor.dm"
+#include "code\game\turfs\open\floor\iron_floor.dm"
#include "code\game\turfs\open\floor\light_floor.dm"
#include "code\game\turfs\open\floor\mineral_floor.dm"
#include "code\game\turfs\open\floor\misc_floor.dm"
-#include "code\game\turfs\open\floor\plasteel_floor.dm"
#include "code\game\turfs\open\floor\plating.dm"
#include "code\game\turfs\open\floor\prison_floor.dm"
#include "code\game\turfs\open\floor\reinf_floor.dm"
@@ -1690,8 +1691,8 @@
#include "code\game\turfs\open\space\transit.dm"
#include "code\modules\actionspeed\_actionspeed_modifier.dm"
#include "code\modules\actionspeed\modifiers\base.dm"
-#include "code\modules\actionspeed\modifiers\race.dm"
#include "code\modules\actionspeed\modifiers\hunger.dm"
+#include "code\modules\actionspeed\modifiers\race.dm"
#include "code\modules\actionspeed\modifiers\status_effects.dm"
#include "code\modules\admin\admin.dm"
#include "code\modules\admin\admin_fax_panel.dm"
@@ -2414,8 +2415,8 @@
#include "code\modules\clothing\head\costume.dm"
#include "code\modules\clothing\head\crown.dm"
#include "code\modules\clothing\head\fedora.dm"
-#include "code\modules\clothing\head\frenchberet.dm"
#include "code\modules\clothing\head\flowercrown.dm"
+#include "code\modules\clothing\head\frenchberet.dm"
#include "code\modules\clothing\head\hardhat.dm"
#include "code\modules\clothing\head\hat.dm"
#include "code\modules\clothing\head\helmet.dm"
@@ -2465,8 +2466,8 @@
#include "code\modules\clothing\suits\armor.dm"
#include "code\modules\clothing\suits\bio.dm"
#include "code\modules\clothing\suits\chaplainsuits.dm"
-#include "code\modules\clothing\suits\costume.dm"
#include "code\modules\clothing\suits\cloaks.dm"
+#include "code\modules\clothing\suits\costume.dm"
#include "code\modules\clothing\suits\donator.dm"
#include "code\modules\clothing\suits\ghostsheet.dm"
#include "code\modules\clothing\suits\hoodies.dm"
diff --git a/code/__DEFINES/atmospherics.dm b/code/__DEFINES/atmospherics.dm
index 033b608bfe17e..f508d854b1c86 100644
--- a/code/__DEFINES/atmospherics.dm
+++ b/code/__DEFINES/atmospherics.dm
@@ -1,19 +1,35 @@
//ATMOS
//stuff you should probably leave well alone!
-#define R_IDEAL_GAS_EQUATION 8.31 //! kPa*L/(K*mol)
-#define ONE_ATMOSPHERE 101.325 //! kPa
-#define TCMB 2.7 //! -270.3degC
-#define TCRYO 225 //! -48.15degC
-#define T0C 273.15 //! 0degC
-#define T20C 293.15 //! 20degC
-
-#define MOLES_CELLSTANDARD (ONE_ATMOSPHERE*CELL_VOLUME/(T20C*R_IDEAL_GAS_EQUATION)) //! moles in a 2.5 m^3 cell at 101.325 Pa and 20 degC
-#define M_CELL_WITH_RATIO (MOLES_CELLSTANDARD * 0.005) //! compared against for superconductivity
-#define O2STANDARD 0.21 //! percentage of oxygen in a normal mixture of air
-#define N2STANDARD 0.79 //! percentage of nitrogen in a normal mixture of air
-#define MOLES_O2STANDARD (MOLES_CELLSTANDARD*O2STANDARD) //! O2 standard value (21%)
-#define MOLES_N2STANDARD (MOLES_CELLSTANDARD*N2STANDARD) //! N2 standard value (79%)
-#define CELL_VOLUME 2500 //! liters in a cell
+/// kPa*L/(K*mol)
+#define R_IDEAL_GAS_EQUATION 8.31
+/// kPa
+#define ONE_ATMOSPHERE 101.325
+/// -270.3degC
+#define TCMB 2.7
+/// -48.15degC
+#define TCRYO 225
+/// 0degC
+#define T0C 273.15
+/// 20degC
+#define T20C 293.15
+/// -14C - Temperature used for kitchen cold room, medical freezer, etc.
+#define COLD_ROOM_TEMP 259.15
+
+///moles in a 2.5 m^3 cell at 101.325 Pa and 20 degC (103 or so)
+#define MOLES_CELLSTANDARD (ONE_ATMOSPHERE*CELL_VOLUME/(T20C*R_IDEAL_GAS_EQUATION))
+///compared against for superconductivity
+#define M_CELL_WITH_RATIO (MOLES_CELLSTANDARD * 0.005)
+/// percentage of oxygen in a normal mixture of air
+#define O2STANDARD 0.21
+/// same but for nitrogen
+#define N2STANDARD 0.79
+/// O2 standard value (21%)
+#define MOLES_O2STANDARD (MOLES_CELLSTANDARD*O2STANDARD)
+/// N2 standard value (79%)
+#define MOLES_N2STANDARD (MOLES_CELLSTANDARD*N2STANDARD)
+/// liters in a cell
+#define CELL_VOLUME 2500
+
#define BREATH_VOLUME 0.5 //! liters in a normal breath
#define BREATH_PERCENTAGE (BREATH_VOLUME/CELL_VOLUME) //! Amount of air to take a from a tile
@@ -181,12 +197,19 @@
#define CANVERTICALATMOSPASS(A, O) ( A.CanAtmosPassVertical == ATMOS_PASS_PROC ? A.CanAtmosPass(O, TRUE) : ( A.CanAtmosPassVertical == ATMOS_PASS_DENSITY ? !A.density : A.CanAtmosPassVertical ) )
//OPEN TURF ATMOS
-#define OPENTURF_DEFAULT_ATMOS "o2=22;n2=82;TEMP=293.15" //the default air mix that open turfs spawn
-#define OPENTURF_LOW_PRESSURE "o2=14;n2=30;TEMP=293.15"
-#define TCOMMS_ATMOS "n2=100;TEMP=80" //-193,15°C telecommunications. also used for xenobiology slime killrooms
-#define AIRLESS_ATMOS "TEMP=2.7" //space
-#define FROZEN_ATMOS "o2=22;n2=82;TEMP=180" //-93.15°C snow and ice turfs
-#define BURNMIX_ATMOS "o2=100;plasma=200;TEMP=370" //used in the holodeck burn test program
+/// the default air mix that open turfs spawn
+#define OPENTURF_DEFAULT_ATMOS "o2=22;n2=82;TEMP=293.15"
+#define OPENTURF_LOW_PRESSURE "o2=14;n2=30;TEMP=293.15"
+/// -193,15°C telecommunications. also used for xenobiology slime killrooms
+#define TCOMMS_ATMOS "n2=100;TEMP=80"
+/// space
+#define AIRLESS_ATMOS "TEMP=2.7"
+/// -93.15°C snow and ice turfs
+#define FROZEN_ATMOS "o2=22;n2=82;TEMP=180"
+/// -14°C kitchen coldroom, just might lose your tail; higher amount of mol to reach about 101.3 kpA
+#define KITCHEN_COLDROOM_ATMOS "o2=26;n2=97;TEMP=[COLD_ROOM_TEMP]"
+/// used in the holodeck burn test program
+#define BURNMIX_ATMOS "o2=100;plasma=200;TEMP=370" //used in the holodeck burn test program
//ATMOSPHERICS DEPARTMENT GAS TANK TURFS
#define ATMOS_TANK_N2O "n2o=6000;TEMP=293.15"
diff --git a/code/__DEFINES/dcs/signals/signals_obj/signals_item/signals_item.dm b/code/__DEFINES/dcs/signals/signals_obj/signals_item/signals_item.dm
index 82c20ff033b3f..555630211a3a4 100644
--- a/code/__DEFINES/dcs/signals/signals_obj/signals_item/signals_item.dm
+++ b/code/__DEFINES/dcs/signals/signals_obj/signals_item/signals_item.dm
@@ -27,7 +27,7 @@
#define COMSIG_ITEM_IMBUE_SOUL "item_imbue_soul" //! return a truthy value to prevent ensouling, checked in /obj/effect/proc_holder/spell/targeted/lichdom/cast(): (mob/user)
#define COMSIG_ITEM_MARK_RETRIEVAL "item_mark_retrieval" //! called before marking an object for retrieval, checked in /obj/effect/proc_holder/spell/targeted/summonitem/cast() : (mob/user)
#define COMPONENT_BLOCK_MARK_RETRIEVAL 1
-#define COMSIG_ITEM_HIT_REACT "item_hit_react" //! from base of obj/item/hit_reaction(): (list/args)
+#define COMSIG_ITEM_HIT_REACT "item_hit_react" //! from base of obj/item/hit_reaction(): (mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", damage = 0, attack_type = MELEE_ATTACK)
#define COMPONENT_HIT_REACTION_BLOCK (1<<0)
#define COMSIG_ITEM_SHARPEN_ACT "sharpen_act" //! from base of item/sharpener/attackby(): (amount, max)
#define COMPONENT_BLOCK_SHARPEN_APPLIED 1
diff --git a/code/__DEFINES/mobs.dm b/code/__DEFINES/mobs.dm
index 9d8e16b6d5e88..651d5cbf9e3b7 100644
--- a/code/__DEFINES/mobs.dm
+++ b/code/__DEFINES/mobs.dm
@@ -465,6 +465,8 @@ GLOBAL_LIST_INIT(available_random_trauma_list, list(
#define THROW_MODE_TOGGLE 1
#define THROW_MODE_HOLD 2
+#define MOB_OVERLAY_LAYER_ABSOLUTE(_mob_layer, _overlay_layer) (_mob_layer - (_overlay_layer) * ((MOB_MAX_CLOTHING_LAYER - MOB_LAYER) / TOTAL_LAYERS))
+
/// Converts the layer into a float layer that is within the bounds of the defined maximum mob clothing layer
/// The bigger the input layer, the deeper it will be (mutations layer is at the bottom, so has a float layer of FLOAT_LAYER - 0.1).
#define CALCULATE_MOB_OVERLAY_LAYER(_layer) (FLOAT_LAYER - (_layer) * ((MOB_MAX_CLOTHING_LAYER - MOB_LAYER) / TOTAL_LAYERS))
diff --git a/code/__DEFINES/robots.dm b/code/__DEFINES/robots.dm
index c0e58ca1a33a7..9225dafa88bd1 100644
--- a/code/__DEFINES/robots.dm
+++ b/code/__DEFINES/robots.dm
@@ -59,3 +59,5 @@
#define ASSEMBLY_THIRD_STEP 2
#define ASSEMBLY_FOURTH_STEP 3
#define ASSEMBLY_FIFTH_STEP 4
+
+#define FLASHED_COOLDOWN 30 SECONDS
diff --git a/code/__DEFINES/traits.dm b/code/__DEFINES/traits.dm
index 7126b42f33e1f..9eefb8ab2227d 100644
--- a/code/__DEFINES/traits.dm
+++ b/code/__DEFINES/traits.dm
@@ -200,8 +200,7 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
#define TRAIT_TOXINLOVER "toxinlover"
#define TRAIT_NOHAIRLOSS "no_hair_loss"
#define TRAIT_NOBREATH "no_breath"
-#define TRAIT_ANTIMAGIC "anti_magic"
-#define TRAIT_HOLY "holy"
+#define TRAIT_SEE_ANTIMAGIC "see_anti_magic"
#define TRAIT_DEPRESSION "depression"
#define TRAIT_JOLLY "jolly"
#define TRAIT_NOCRITDAMAGE "no_crit"
diff --git a/code/_globalvars/traits.dm b/code/_globalvars/traits.dm
index bc9f72a931a6c..0b7dc05d69e64 100644
--- a/code/_globalvars/traits.dm
+++ b/code/_globalvars/traits.dm
@@ -65,8 +65,6 @@ GLOBAL_LIST_INIT(traits_by_type, list(
"TRAIT_EASYLIMBDISABLE" = TRAIT_EASYLIMBDISABLE,
"TRAIT_TOXINLOVER" = TRAIT_TOXINLOVER,
"TRAIT_NOBREATH" = TRAIT_NOBREATH,
- "TRAIT_ANTIMAGIC" = TRAIT_ANTIMAGIC,
- "TRAIT_HOLY" = TRAIT_HOLY,
"TRAIT_DEPRESSION" = TRAIT_DEPRESSION,
"TRAIT_JOLLY" = TRAIT_JOLLY,
"TRAIT_NOCRITDAMAGE" = TRAIT_NOCRITDAMAGE,
diff --git a/code/_globalvars/turf.dm b/code/_globalvars/turf.dm
index 270571e8381fd..21a6f3348692e 100644
--- a/code/_globalvars/turf.dm
+++ b/code/_globalvars/turf.dm
@@ -10,7 +10,7 @@ GLOBAL_LIST_INIT(wood_big_turf_damage, list("damaged_woodbig1", "damaged_woodbig
GLOBAL_LIST_INIT(turf_texture_hallway, list(/datum/turf_texture/hallway))
GLOBAL_LIST_INIT(turf_texture_maint, list(/datum/turf_texture/maint, /datum/turf_texture/hallway, /datum/turf_texture/maint/tile))
-GLOBAL_LIST_INIT(turf_texture_plasteel, list(/datum/turf_texture/hallway, /datum/turf_texture/maint/tile))
+GLOBAL_LIST_INIT(turf_texture_iron, list(/datum/turf_texture/hallway, /datum/turf_texture/maint/tile))
GLOBAL_LIST_INIT(turf_texture_plating, list(/datum/turf_texture/maint))
/*
diff --git a/code/controllers/subsystem/traumas.dm b/code/controllers/subsystem/traumas.dm
index 802344e28a31b..120348053d590 100644
--- a/code/controllers/subsystem/traumas.dm
+++ b/code/controllers/subsystem/traumas.dm
@@ -160,8 +160,8 @@ SUBSYSTEM_DEF(traumas)
"the supernatural" = typecacheof(list(
/obj/structure/destructible/cult, /obj/item/tome,
- /obj/item/melee/cultblade, /obj/item/cult_bastard, /obj/item/restraints/legcuffs/bola/cult,
- /obj/item/clothing/suit/hooded/cultrobes, /obj/item/clothing/suit/hooded/cultrobes/hardened,
+ /obj/item/melee/cultblade, /obj/item/restraints/legcuffs/bola/cult,
+ /obj/item/clothing/suit/hooded/cultrobes,
/obj/item/clothing/suit/hooded/cultrobes, /obj/item/clothing/head/hooded/cult_hoodie, /obj/effect/rune,
/obj/item/stack/sheet/runed_metal, /obj/machinery/door/airlock/cult, /obj/eldritch/narsie,
/obj/item/soulstone, /obj/item/clockwork,
@@ -224,7 +224,7 @@ SUBSYSTEM_DEF(traumas)
phobia_turfs = list("space" = typecacheof(list(/turf/open/space, /turf/open/floor/holofloor/space, /turf/open/floor/fakespace)),
"the supernatural" = typecacheof(list(/turf/open/floor/clockwork, /turf/closed/wall/clockwork,
- /turf/open/floor/iron/cult, /turf/closed/wall/mineral/cult)),
+ /turf/open/floor/cult, /turf/closed/wall/mineral/cult)),
"aliens" = typecacheof(list(/turf/open/floor/plating/abductor, /turf/open/floor/plating/abductor2,
/turf/open/floor/mineral/abductor, /turf/closed/wall/mineral/abductor)),
"falling" = typecacheof(list(/turf/open/chasm, /turf/open/floor/fakepit))
diff --git a/code/datums/brain_damage/magic.dm b/code/datums/brain_damage/magic.dm
index 0109f1f546a25..005717eec8d8e 100644
--- a/code/datums/brain_damage/magic.dm
+++ b/code/datums/brain_damage/magic.dm
@@ -53,11 +53,13 @@
lose_text = "You realize that magic might be real."
/datum/brain_trauma/magic/antimagic/on_gain()
- ADD_TRAIT(owner, TRAIT_ANTIMAGIC, TRAUMA_TRAIT)
+ owner.AddComponent(/datum/component/anti_magic, TRAUMA_TRAIT, _magic = TRUE, _holy = FALSE)
..()
/datum/brain_trauma/magic/antimagic/on_lose()
- REMOVE_TRAIT(owner, TRAIT_ANTIMAGIC, TRAUMA_TRAIT)
+ for (var/datum/component/anti_magic/anti_magic in owner.GetComponents(/datum/component/anti_magic))
+ if (anti_magic.source == TRAUMA_TRAIT)
+ qdel(anti_magic)
..()
/datum/brain_trauma/magic/stalker
diff --git a/code/datums/brain_damage/special.dm b/code/datums/brain_damage/special.dm
index 4603c003d694b..64932f19e2c9b 100644
--- a/code/datums/brain_damage/special.dm
+++ b/code/datums/brain_damage/special.dm
@@ -23,11 +23,13 @@
speak("neutral", prob(25))
/datum/brain_trauma/special/godwoken/on_gain()
- ADD_TRAIT(owner, TRAIT_HOLY, TRAUMA_TRAIT)
+ owner.AddComponent(/datum/component/anti_magic, TRAUMA_TRAIT, _magic = FALSE, _holy = TRUE)
..()
/datum/brain_trauma/special/godwoken/on_lose()
- REMOVE_TRAIT(owner, TRAIT_HOLY, TRAUMA_TRAIT)
+ for (var/datum/component/anti_magic/anti_magic in owner.GetComponents(/datum/component/anti_magic))
+ if (anti_magic.source == TRAUMA_TRAIT)
+ qdel(anti_magic)
..()
/datum/brain_trauma/special/godwoken/proc/speak(type, include_owner = FALSE)
diff --git a/code/datums/components/_component.dm b/code/datums/components/_component.dm
index ddcd92cefab97..320bb2ec0eb42 100644
--- a/code/datums/components/_component.dm
+++ b/code/datums/components/_component.dm
@@ -365,7 +365,7 @@
old_comp = GetExactComponent(nt)
else
old_comp = GetComponent(dt)
-
+
if(old_comp)
switch(dm)
if(COMPONENT_DUPE_UNIQUE)
diff --git a/code/datums/components/anti_magic.dm b/code/datums/components/anti_magic.dm
index 0fe6ccc2bc326..2bb6e66788fb2 100644
--- a/code/datums/components/anti_magic.dm
+++ b/code/datums/components/anti_magic.dm
@@ -1,4 +1,6 @@
/datum/component/anti_magic
+ dupe_mode = COMPONENT_DUPE_ALLOWED
+ var/source
var/magic = FALSE
var/holy = FALSE
var/charges = INFINITY
@@ -6,16 +8,27 @@
var/allowed_slots = ~ITEM_SLOT_BACKPACK
var/datum/callback/reaction
var/datum/callback/expire
+ var/static/identifier_current = 0
+ var/identifier
-/datum/component/anti_magic/Initialize(_magic = FALSE, _holy = FALSE, _charges, _blocks_self = TRUE, datum/callback/_reaction, datum/callback/_expire, _allowed_slots)
+/datum/component/anti_magic/Initialize(_source, _magic = FALSE, _holy = FALSE, _charges, _blocks_self = TRUE, datum/callback/_reaction, datum/callback/_expire, _allowed_slots)
if(isitem(parent))
RegisterSignal(parent, COMSIG_ITEM_EQUIPPED, PROC_REF(on_equip))
RegisterSignal(parent, COMSIG_ITEM_DROPPED, PROC_REF(on_drop))
else if(ismob(parent))
RegisterSignal(parent, COMSIG_MOB_RECEIVE_MAGIC, PROC_REF(protect))
+ var/mob/mob_parent = parent
+ ADD_TRAIT(mob_parent, TRAIT_SEE_ANTIMAGIC, identifier)
+ var/image/forbearance = image('icons/effects/genetics.dmi', mob_parent, "servitude", MOB_OVERLAY_LAYER_ABSOLUTE(mob_parent.layer, MUTATIONS_LAYER))
+ forbearance.plane = mob_parent.plane
+ mob_parent.add_alt_appearance(/datum/atom_hud/alternate_appearance/basic/blessedAware, "magic_protection_[identifier]", forbearance)
+ mob_parent.update_alt_appearances()
else
return COMPONENT_INCOMPATIBLE
+ // Random enough that it will never conflict, and avoids having a static variable
+ identifier = identifier_current++
+ source = _source
magic = _magic
holy = _holy
if(!isnull(_charges))
@@ -31,13 +44,25 @@
if(!(allowed_slots & slot)) //Check that the slot is valid for antimagic
UnregisterSignal(equipper, COMSIG_MOB_RECEIVE_MAGIC)
+ REMOVE_TRAIT(equipper, TRAIT_SEE_ANTIMAGIC, identifier)
+ equipper.remove_alt_appearance("magic_protection_[identifier]")
+ equipper.update_alt_appearances()
return
RegisterSignal(equipper, COMSIG_MOB_RECEIVE_MAGIC, PROC_REF(protect), TRUE)
+ // Gain a protection aura
+ ADD_TRAIT(equipper, TRAIT_SEE_ANTIMAGIC, identifier)
+ var/image/forbearance = image('icons/effects/genetics.dmi', equipper, "servitude", MOB_OVERLAY_LAYER_ABSOLUTE(equipper.layer, MUTATIONS_LAYER))
+ forbearance.plane = equipper.plane
+ equipper.add_alt_appearance(/datum/atom_hud/alternate_appearance/basic/blessedAware, "magic_protection_[identifier]", forbearance)
+ equipper.update_alt_appearances()
/datum/component/anti_magic/proc/on_drop(datum/source, mob/user)
SIGNAL_HANDLER
UnregisterSignal(user, COMSIG_MOB_RECEIVE_MAGIC)
+ REMOVE_TRAIT(user, TRAIT_SEE_ANTIMAGIC, identifier)
+ user.remove_alt_appearance("magic_protection_[identifier]")
+ user.update_alt_appearances()
/datum/component/anti_magic/proc/protect(datum/source, mob/user, _magic, _holy, major, self, list/protection_sources)
SIGNAL_HANDLER
@@ -50,4 +75,3 @@
if(charges <= 0)
expire?.Invoke(user)
return COMPONENT_BLOCK_MAGIC
-
diff --git a/code/datums/status_effects/buffs.dm b/code/datums/status_effects/buffs.dm
index 7d8e81b5d5088..301848bb247a2 100644
--- a/code/datums/status_effects/buffs.dm
+++ b/code/datums/status_effects/buffs.dm
@@ -603,13 +603,15 @@
/datum/status_effect/antimagic/on_apply()
owner.visible_message("[owner] is coated with a dull aura!")
- ADD_TRAIT(owner, TRAIT_ANTIMAGIC, MAGIC_TRAIT)
+ owner.AddComponent(/datum/component/anti_magic, MAGIC_TRAIT, _magic = TRUE, _holy = FALSE)
//glowing wings overlay
playsound(owner, 'sound/weapons/fwoosh.ogg', 75, 0)
return ..()
/datum/status_effect/antimagic/on_remove()
- REMOVE_TRAIT(owner, TRAIT_ANTIMAGIC, MAGIC_TRAIT)
+ for (var/datum/component/anti_magic/anti_magic in owner.GetComponents(/datum/component/anti_magic))
+ if (anti_magic.source == MAGIC_TRAIT)
+ qdel(anti_magic)
owner.visible_message("[owner]'s dull aura fades away...")
/datum/status_effect/crucible_soul
diff --git a/code/game/alternate_appearance.dm b/code/game/alternate_appearance.dm
index c721323a5ea5d..06328694134a1 100644
--- a/code/game/alternate_appearance.dm
+++ b/code/game/alternate_appearance.dm
@@ -20,6 +20,15 @@ GLOBAL_LIST_EMPTY(active_alternate_appearances)
var/list/arguments = args.Copy(2)
return new type(arglist(arguments))
+/mob/proc/update_alt_appearances()
+ for (var/datum/atom_hud/alternate_appearance/alt_appearance in GLOB.active_alternate_appearances)
+ if (alt_appearance.mobShouldSee(src))
+ // If we don't see it already, then add it
+ if (!alt_appearance.hudusers[src])
+ alt_appearance.add_hud_to(src)
+ else
+ alt_appearance.remove_hud_from(src)
+
/datum/atom_hud/alternate_appearance
var/appearance_key
var/transfer_overlays = FALSE
@@ -174,10 +183,12 @@ GLOBAL_LIST_EMPTY(active_alternate_appearances)
/datum/atom_hud/alternate_appearance/basic/blessedAware/mobShouldSee(mob/M)
if(M.mind && M.mind?.holy_role)
return TRUE
- if (istype(M, /mob/living/simple_animal/hostile/construct/wraith))
+ if (iscultist(M))
return TRUE
if(isrevenant(M) || iswizard(M))
return TRUE
+ if (HAS_TRAIT(M, TRAIT_SEE_ANTIMAGIC))
+ return TRUE
return FALSE
/datum/atom_hud/alternate_appearance/basic/one_person
diff --git a/code/game/gamemodes/objectives/_objective.dm b/code/game/gamemodes/objectives/_objective.dm
index bdafe5ef3bbad..4f6ebea4e7ec0 100644
--- a/code/game/gamemodes/objectives/_objective.dm
+++ b/code/game/gamemodes/objectives/_objective.dm
@@ -82,7 +82,7 @@ GLOBAL_LIST(admin_objective_list) //Prefilled admin assignable objective list
if(SSshuttle.emergency.mode != SHUTTLE_ENDGAME)
return FALSE
var/turf/location = get_turf(M.current)
- if(!location || istype(location, /turf/open/floor/iron/shuttle/red) || istype(location, /turf/open/floor/mineral/plastitanium/red/brig)) // Fails if they are in the shuttle brig
+ if(!location || istype(location, /turf/open/floor/mineral/plastitanium/red/brig)) // Fails if they are in the shuttle brig
return FALSE
return location.onCentCom() || location.onSyndieBase()
diff --git a/code/game/objects/effects/decals/turfdecal/tilecoloring.dm b/code/game/objects/effects/decals/turfdecal/tilecoloring.dm
index 75074c2d1bb98..62e36d0324d5d 100644
--- a/code/game/objects/effects/decals/turfdecal/tilecoloring.dm
+++ b/code/game/objects/effects/decals/turfdecal/tilecoloring.dm
@@ -874,6 +874,10 @@
icon_state = "tile_anticorner_contrasted_ramp"
name = "contrasted dark anticorner ramp"
+/obj/effect/turf_decal/tile/dark
+ name = "dark corner"
+ color = "#0e0f0f"
+
/// Random tiles
/obj/effect/turf_decal/tile/random // so many colors
diff --git a/code/game/objects/items/devices/laserpointer.dm b/code/game/objects/items/devices/laserpointer.dm
index 9120bd0c79ea6..dc48ec35dff31 100644
--- a/code/game/objects/items/devices/laserpointer.dm
+++ b/code/game/objects/items/devices/laserpointer.dm
@@ -117,14 +117,18 @@
//robots
else if(iscyborg(target))
- var/mob/living/silicon/S = target
+ var/mob/living/silicon/robot/S = target
log_combat(user, S, "shone in the sensors", src)
//chance to actually hit the eyes depends on internal component
if(prob(effectchance * diode.rating))
S.flash_act(affect_silicon = 1)
- S.Paralyze(rand(100,200))
- to_chat(S, "Your sensors were overloaded by a laser!")
- outmsg = "You overload [S] by shining [src] at [S.p_their()] sensors."
+ if(S.last_flashed + FLASHED_COOLDOWN < world.time)
+ S.last_flashed = world.time
+ S.Paralyze(5 SECONDS)
+ to_chat(S, "Your sensors were overloaded by a laser!")
+ outmsg = "You overload [S] by shining [src] at [S.p_their()] sensors."
+ else
+ outmsg = "You attempt to overload [S]'s sensors with the flash, but their defense protocols mitigate the effect!"
else
outmsg = "You fail to overload [S] by shining [src] at [S.p_their()] sensors!"
diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm
index 883339c5037b3..93241ea271168 100644
--- a/code/game/objects/items/devices/radio/radio.dm
+++ b/code/game/objects/items/devices/radio/radio.dm
@@ -390,10 +390,6 @@
var/curremp = emped //Remember which EMP this was
if (listening && ismob(loc)) // if the radio is turned on and on someone's person they notice
to_chat(loc, "\The [src] overloads.")
- broadcasting = FALSE
- listening = FALSE
- for (var/ch_name in channels)
- channels[ch_name] = 0
on = FALSE
addtimer(CALLBACK(src, PROC_REF(end_emp_effect), curremp), 200)
diff --git a/code/game/objects/items/holy_weapons.dm b/code/game/objects/items/holy_weapons.dm
index d211704bdd166..01b6d227c4b43 100644
--- a/code/game/objects/items/holy_weapons.dm
+++ b/code/game/objects/items/holy_weapons.dm
@@ -2,11 +2,11 @@
/obj/item/clothing/suit/chaplainsuit/armor/templar/Initialize(mapload)
. = ..()
- AddComponent(/datum/component/anti_magic, TRUE, TRUE, null, FALSE)
+ AddComponent(/datum/component/anti_magic, INNATE_TRAIT, TRUE, TRUE, null, FALSE)
/obj/item/clothing/suit/hooded/chaplain_hoodie/leader/Initialize(mapload)
. = ..()
- AddComponent(/datum/component/anti_magic, TRUE, TRUE, null, FALSE) //makes the leader hoodie immune without giving the follower hoodies immunity
+ AddComponent(/datum/component/anti_magic, INNATE_TRAIT, TRUE, TRUE, null, FALSE) //makes the leader hoodie immune without giving the follower hoodies immunity
/obj/item/choice_beacon/radial/holy
name = "armaments beacon"
@@ -161,7 +161,7 @@
/obj/item/nullrod/Initialize(mapload)
. = ..()
- AddComponent(/datum/component/anti_magic, TRUE, TRUE, null, FALSE)
+ AddComponent(/datum/component/anti_magic, INNATE_TRAIT, TRUE, TRUE, null, FALSE)
AddComponent(/datum/component/effect_remover, \
success_feedback = "You disrupt the magic of %THEEFFECT with %THEWEAPON.", \
success_forcesay = "BEGONE FOUL MAGIKS!!", \
diff --git a/code/game/objects/items/stacks/cash.dm b/code/game/objects/items/stacks/cash.dm
index 4054f1dca00a3..c1faa1abc1218 100644
--- a/code/game/objects/items/stacks/cash.dm
+++ b/code/game/objects/items/stacks/cash.dm
@@ -37,38 +37,46 @@
icon_state = "spacecash"
singular_name = "one credit bill"
value = 1
+ merge_type = /obj/item/stack/spacecash/c1
/obj/item/stack/spacecash/c10
icon_state = "spacecash10"
singular_name = "ten credit bill"
value = 10
+ merge_type = /obj/item/stack/spacecash/c10
/obj/item/stack/spacecash/c20
icon_state = "spacecash20"
singular_name = "twenty credit bill"
value = 20
+ merge_type = /obj/item/stack/spacecash/c20
/obj/item/stack/spacecash/c50
icon_state = "spacecash50"
singular_name = "fifty credit bill"
value = 50
+ merge_type = /obj/item/stack/spacecash/c50
/obj/item/stack/spacecash/c100
icon_state = "spacecash100"
singular_name = "one hundred credit bill"
value = 100
+ merge_type = /obj/item/stack/spacecash/c100
/obj/item/stack/spacecash/c200
icon_state = "spacecash200"
singular_name = "two hundred credit bill"
value = 200
+ merge_type = /obj/item/stack/spacecash/c200
/obj/item/stack/spacecash/c500
icon_state = "spacecash500"
singular_name = "five hundred credit bill"
value = 500
+ merge_type = /obj/item/stack/spacecash/c500
/obj/item/stack/spacecash/c1000
icon_state = "spacecash1000"
singular_name = "one thousand credit bill"
value = 1000
+ merge_type = /obj/item/stack/spacecash/c1000
diff --git a/code/game/objects/items/stacks/medical.dm b/code/game/objects/items/stacks/medical.dm
index 99831b56c35c7..08ad341ece0bd 100644
--- a/code/game/objects/items/stacks/medical.dm
+++ b/code/game/objects/items/stacks/medical.dm
@@ -15,6 +15,7 @@
item_flags = NOBLUDGEON
cost = 250
source = /datum/robot_energy_storage/medical
+ merge_type = /obj/item/stack/medical
///What reagent does it apply?
var/list/reagent
///Is this for bruises?
@@ -145,6 +146,7 @@
heal_brute = TRUE
reagent = list(/datum/reagent/medicine/styptic_powder = REAGENT_AMOUNT_PER_ITEM)
grind_results = list(/datum/reagent/medicine/styptic_powder = REAGENT_AMOUNT_PER_ITEM)
+ merge_type = /obj/item/stack/medical/bruise_pack
/obj/item/stack/medical/bruise_pack/one
amount = 1
@@ -162,6 +164,7 @@
heal_burn = TRUE
reagent = list(/datum/reagent/medicine/silver_sulfadiazine = REAGENT_AMOUNT_PER_ITEM)
grind_results = list(/datum/reagent/medicine/silver_sulfadiazine = REAGENT_AMOUNT_PER_ITEM)
+ merge_type = /obj/item/stack/medical/ointment
/obj/item/stack/medical/ointment/one
amount = 1
@@ -177,6 +180,7 @@
stop_bleeding = 1800
heal_brute = TRUE //Enables gauze to be used on simplemobs for healing
max_amount = 12
+ merge_type = /obj/item/stack/medical/gauze
/obj/item/stack/medical/gauze/attackby(obj/item/I, mob/user, params)
if(I.tool_behaviour == TOOL_WIRECUTTER || I.is_sharp())
@@ -201,12 +205,14 @@
desc = "A roll of cloth roughly cut from something that can stop bleeding, but does not heal wounds."
stop_bleeding = 900
heal_brute = 0
+ merge_type = /obj/item/stack/medical/gauze/improvised
/obj/item/stack/medical/gauze/adv
name = "sterilized medical gauze"
desc = "A roll of elastic sterilized cloth that is extremely effective at stopping bleeding, heals minor wounds and cleans them."
singular_name = "sterilized medical gauze"
self_delay = 0.5 SECONDS
+ merge_type = /obj/item/stack/medical/gauze/adv
/obj/item/stack/medical/gauze/adv/one
amount = 1
diff --git a/code/game/objects/items/stacks/ores/bscrystal.dm b/code/game/objects/items/stacks/ores/bscrystal.dm
index 4cb861491217b..da47cb103adef 100644
--- a/code/game/objects/items/stacks/ores/bscrystal.dm
+++ b/code/game/objects/items/stacks/ores/bscrystal.dm
@@ -13,6 +13,7 @@
refined_type = /obj/item/stack/ore/bluespace_crystal/refined
grind_results = list(/datum/reagent/bluespace = 20)
scan_state = "rock_BScrystal"
+ merge_type = /obj/item/stack/ore/bluespace_crystal
novariants = FALSE
max_amount = 50
@@ -64,6 +65,7 @@ STACKSIZE_MACRO(/obj/item/stack/ore/bluespace_crystal)
points = 1 //nice try, unfortunateley, they're cheap imitations, have a point for your effort.
refined_type = null
grind_results = list(/datum/reagent/bluespace = 10, /datum/reagent/silicon = 20)
+ merge_type = /obj/item/stack/ore/bluespace_crystal/artificial
STACKSIZE_MACRO(/obj/item/stack/ore/bluespace_crystal/artificial)
@@ -73,5 +75,6 @@ STACKSIZE_MACRO(/obj/item/stack/ore/bluespace_crystal/artificial)
icon_state = "refined_bluespace_crystal"
points = 1
refined_type = null
+ merge_type = /obj/item/stack/ore/bluespace_crystal/refined
STACKSIZE_MACRO(/obj/item/stack/ore/bluespace_crystal/refined)
diff --git a/code/game/objects/items/stacks/ores/ore_type.dm b/code/game/objects/items/stacks/ores/ore_type.dm
index 8220463da6814..61aaf9273e805 100644
--- a/code/game/objects/items/stacks/ores/ore_type.dm
+++ b/code/game/objects/items/stacks/ores/ore_type.dm
@@ -15,6 +15,7 @@
refined_type = /obj/item/stack/sheet/mineral/uranium
scan_state = "rock_Uranium"
spreadChance = 5
+ merge_type = /obj/item/stack/ore/uranium
STACKSIZE_MACRO(/obj/item/stack/ore/uranium)
@@ -31,6 +32,7 @@ STACKSIZE_MACRO(/obj/item/stack/ore/uranium)
refined_type = /obj/item/stack/sheet/iron
scan_state = "rock_Iron"
spreadChance = 20
+ merge_type = /obj/item/stack/ore/iron
STACKSIZE_MACRO(/obj/item/stack/ore/iron)
@@ -46,6 +48,7 @@ STACKSIZE_MACRO(/obj/item/stack/ore/iron)
mats_per_unit = list(/datum/material/glass=MINERAL_MATERIAL_AMOUNT)
refined_type = /obj/item/stack/sheet/glass
w_class = WEIGHT_CLASS_TINY
+ merge_type = /obj/item/stack/ore/glass
/obj/item/stack/ore/glass/get_recipes()
return GLOB.sand_recipes
@@ -83,6 +86,7 @@ STACKSIZE_MACRO(/obj/item/stack/ore/glass)
icon_state = "volcanic_sand"
icon_state = "volcanic_sand"
singular_name = "volcanic ash pile"
+ merge_type = /obj/item/stack/ore/glass/basalt
STACKSIZE_MACRO(/obj/item/stack/ore/glass/basalt)
@@ -99,6 +103,7 @@ STACKSIZE_MACRO(/obj/item/stack/ore/glass/basalt)
refined_type = /obj/item/stack/sheet/mineral/plasma
scan_state = "rock_Plasma"
spreadChance = 8
+ merge_type = /obj/item/stack/ore/plasma
/obj/item/stack/ore/plasma/welder_act(mob/living/user, obj/item/I)
to_chat(user, "You can't hit a high enough temperature to smelt [src] properly!")
@@ -119,6 +124,7 @@ STACKSIZE_MACRO(/obj/item/stack/ore/plasma)
refined_type = /obj/item/stack/sheet/mineral/copper
scan_state = "rock_Copper"
spreadChance = 5
+ merge_type = /obj/item/stack/ore/copper
STACKSIZE_MACRO(/obj/item/stack/ore/copper)
@@ -135,6 +141,7 @@ STACKSIZE_MACRO(/obj/item/stack/ore/copper)
refined_type = /obj/item/stack/sheet/mineral/silver
scan_state = "rock_Silver"
spreadChance = 5
+ merge_type = /obj/item/stack/ore/silver
STACKSIZE_MACRO(/obj/item/stack/ore/silver)
@@ -151,6 +158,7 @@ STACKSIZE_MACRO(/obj/item/stack/ore/silver)
refined_type = /obj/item/stack/sheet/mineral/gold
scan_state = "rock_Gold"
spreadChance = 5
+ merge_type = /obj/item/stack/ore/gold
STACKSIZE_MACRO(/obj/item/stack/ore/gold)
@@ -166,6 +174,7 @@ STACKSIZE_MACRO(/obj/item/stack/ore/gold)
mats_per_unit = list(/datum/material/diamond=MINERAL_MATERIAL_AMOUNT)
refined_type = /obj/item/stack/sheet/mineral/diamond
scan_state = "rock_Diamond"
+ merge_type = /obj/item/stack/ore/diamond
STACKSIZE_MACRO(/obj/item/stack/ore/diamond)
@@ -181,6 +190,7 @@ STACKSIZE_MACRO(/obj/item/stack/ore/diamond)
mats_per_unit = list(/datum/material/bananium=MINERAL_MATERIAL_AMOUNT)
refined_type = /obj/item/stack/sheet/mineral/bananium
scan_state = "rock_Bananium"
+ merge_type = /obj/item/stack/ore/bananium
STACKSIZE_MACRO(/obj/item/stack/ore/bananium)
@@ -197,6 +207,7 @@ STACKSIZE_MACRO(/obj/item/stack/ore/bananium)
refined_type = /obj/item/stack/sheet/mineral/titanium
scan_state = "rock_Titanium"
spreadChance = 5
+ merge_type = /obj/item/stack/ore/titanium
STACKSIZE_MACRO(/obj/item/stack/ore/titanium)
@@ -208,5 +219,6 @@ STACKSIZE_MACRO(/obj/item/stack/ore/titanium)
icon_state = "slag"
item_state = "slag"
singular_name = "slag chunk"
+ merge_type = /obj/item/stack/ore/slag
STACKSIZE_MACRO(/obj/item/stack/ore/slag)
diff --git a/code/game/objects/items/stacks/sheets/organic/hides.dm b/code/game/objects/items/stacks/sheets/organic/hides.dm
index 0914e09bec9c5..634ed54d691a0 100644
--- a/code/game/objects/items/stacks/sheets/organic/hides.dm
+++ b/code/game/objects/items/stacks/sheets/organic/hides.dm
@@ -7,6 +7,7 @@
item_state = "sheet-hide"
icon = 'icons/obj/stacks/organic.dmi'
novariants = TRUE
+ merge_type = /obj/item/stack/sheet/animalhide
/* Generic hide */
@@ -15,6 +16,7 @@
desc = "A piece of skin."
singular_name = "skin piece"
novariants = FALSE
+ merge_type = /obj/item/stack/sheet/animalhide/generic
/* Human hide */
@@ -23,6 +25,7 @@
desc = "The by-product of human farming."
singular_name = "human skin piece"
novariants = FALSE
+ merge_type = /obj/item/stack/sheet/animalhide/human
/obj/item/stack/sheet/animalhide/human/get_recipes()
return GLOB.human_recipes
@@ -35,6 +38,7 @@
singular_name = "corgi hide piece"
icon_state = "sheet-corgi"
item_state = "sheet-corgi"
+ merge_type = /obj/item/stack/sheet/animalhide/corgi
/obj/item/stack/sheet/animalhide/corgi/get_recipes()
return GLOB.corgi_recipes
@@ -47,6 +51,7 @@
singular_name = "mothroach hide piece"
icon_state = "sheet-mothroach"
item_state = "sheet-mothroach"
+ merge_type = /obj/item/stack/sheet/animalhide/mothroach
/* Gondola hide */
@@ -56,6 +61,7 @@
singular_name = "gondola hide piece"
icon_state = "sheet-gondola"
item_state = "sheet-gondola"
+ merge_type = /obj/item/stack/sheet/animalhide/gondola
/obj/item/stack/sheet/animalhide/gondola/get_recipes()
return GLOB.gondola_recipes
@@ -68,6 +74,7 @@
singular_name = "cat hide piece"
icon_state = "sheet-cat"
item_state = "sheet-cat"
+ merge_type = /obj/item/stack/sheet/animalhide/cat
/* Monkey hide */
@@ -77,6 +84,7 @@
singular_name = "monkey hide piece"
icon_state = "sheet-monkey"
icon_state = "sheet-monkey"
+ merge_type = /obj/item/stack/sheet/animalhide/monkey
/obj/item/stack/sheet/animalhide/monkey/get_recipes()
return GLOB.monkey_recipes
@@ -89,6 +97,7 @@
singular_name = "lizard hide"
icon_state = "sheet-lizard"
item_state = "sheet-lizard"
+ merge_type = /obj/item/stack/sheet/animalhide/lizard
/* Xeno hide */
@@ -114,6 +123,7 @@
item_flags = NOBLUDGEON
w_class = WEIGHT_CLASS_NORMAL
layer = MOB_LAYER
+ merge_type = /obj/item/stack/sheet/animalhide/ashdrake
/* Goliath Plates */
/obj/item/stack/sheet/animalhide/goliath_hide
@@ -126,6 +136,7 @@
item_flags = NOBLUDGEON
w_class = WEIGHT_CLASS_NORMAL
layer = MOB_LAYER
+ merge_type = /obj/item/stack/sheet/animalhide/goliath_hide
/* Generic functions for hides, fun for all the family! */
diff --git a/code/game/objects/items/stacks/sheets/organic/leather.dm b/code/game/objects/items/stacks/sheets/organic/leather.dm
index d12dbd471445a..92b2e83b53e15 100644
--- a/code/game/objects/items/stacks/sheets/organic/leather.dm
+++ b/code/game/objects/items/stacks/sheets/organic/leather.dm
@@ -7,6 +7,7 @@
icon_state = "sheet-leather"
item_state = "sheet-leather"
icon = 'icons/obj/stacks/organic.dmi'
+ merge_type = /obj/item/stack/sheet/leather
/obj/item/stack/sheet/leather/get_recipes()
return GLOB.leather_recipes
@@ -18,6 +19,7 @@
icon_state = "sheet-hairlesshide"
item_state = "sheet-hairlesshide"
icon = 'icons/obj/stacks/organic.dmi'
+ merge_type = /obj/item/stack/sheet/leather/hairlesshide
/obj/item/stack/sheet/leather/wetleather
name = "wet leather"
@@ -26,6 +28,7 @@
icon_state = "sheet-wetleather"
item_state = "sheet-wetleather"
icon = 'icons/obj/stacks/organic.dmi'
+ merge_type = /obj/item/stack/sheet/leather/wetleather
var/wetness = 30 //Reduced when exposed to high temperautres
var/drying_threshold_temperature = 500 //Kelvin to start drying
diff --git a/code/game/objects/items/stacks/sheets/organic/miscellaneous_organics.dm b/code/game/objects/items/stacks/sheets/organic/miscellaneous_organics.dm
index 27ebf2701b5f3..432a43d97eb7b 100644
--- a/code/game/objects/items/stacks/sheets/organic/miscellaneous_organics.dm
+++ b/code/game/objects/items/stacks/sheets/organic/miscellaneous_organics.dm
@@ -6,6 +6,7 @@
icon = 'icons/mob/alien.dmi'
icon_state = "chitin"
novariants = TRUE
+ merge_type = /obj/item/stack/sheet/xenochitin
/obj/item/xenos_claw
name = "alien claw"
@@ -46,6 +47,7 @@
singular_name = "watcher sinew"
icon_state = "sinew"
novariants = TRUE
+ merge_type = /obj/item/stack/sheet/sinew
GLOBAL_LIST_INIT(sinew_recipes, list ( \
diff --git a/code/game/objects/items/stacks/tape.dm b/code/game/objects/items/stacks/tape.dm
index dc668431d989f..029dd64a3dceb 100644
--- a/code/game/objects/items/stacks/tape.dm
+++ b/code/game/objects/items/stacks/tape.dm
@@ -10,6 +10,7 @@
item_flags = NOBLUDGEON
amount = 5
max_amount = 5
+ merge_type = /obj/item/stack/sticky_tape
var/list/conferred_embed = EMBED_HARMLESS
var/overwrite_existing = FALSE
@@ -42,6 +43,7 @@
icon_state = "tape_y"
prefix = "super sticky"
conferred_embed = EMBED_HARMLESS_SUPERIOR
+ merge_type = /obj/item/stack/sticky_tape
/obj/item/stack/sticky_tape/pointy
name = "pointy tape"
@@ -50,6 +52,7 @@
icon_state = "tape_evil"
prefix = "pointy"
conferred_embed = EMBED_POINTY
+ merge_type = /obj/item/stack/sticky_tape/pointy
/obj/item/stack/sticky_tape/pointy/super
name = "super pointy tape"
@@ -58,3 +61,4 @@
icon_state = "tape_spikes"
prefix = "super pointy"
conferred_embed = EMBED_POINTY_SUPERIOR
+ merge_type = /obj/item/stack/sticky_tape/pointy/super
diff --git a/code/game/objects/items/stacks/tiles/light.dm b/code/game/objects/items/stacks/tiles/light.dm
index 3eccf53ec49d0..2e65481727d2b 100644
--- a/code/game/objects/items/stacks/tiles/light.dm
+++ b/code/game/objects/items/stacks/tiles/light.dm
@@ -14,6 +14,7 @@
flags_1 = CONDUCT_1
max_amount = 60
grind_results = list(/datum/reagent/silicon = 20, /datum/reagent/copper = 5)
+ merge_type = /obj/item/stack/light_w
/obj/item/stack/light_w/attackby(obj/item/O, mob/user, params)
if(!istype(O, /obj/item/stack/sheet/iron))
@@ -43,6 +44,7 @@
attack_verb = list("bashed", "battered", "bludgeoned", "thrashed", "smashed")
turf_type = /turf/open/floor/light
var/state = 0
+ merge_type = /obj/item/stack/tile/light
/obj/item/stack/tile/light/Initialize(mapload, new_amount, merge = TRUE)
. = ..()
@@ -74,6 +76,7 @@
custom_materials = null
is_cyborg = 1
cost = 125
+ merge_type = /obj/item/stack/tile/light/cyborg
/obj/item/stack/tile/light/cyborg/attackby(obj/item/O, mob/user, params)
return
diff --git a/code/game/objects/items/stacks/tiles/tile_iron.dm b/code/game/objects/items/stacks/tiles/tile_iron.dm
new file mode 100644
index 0000000000000..f3cabe7210fe5
--- /dev/null
+++ b/code/game/objects/items/stacks/tiles/tile_iron.dm
@@ -0,0 +1,478 @@
+//Plasteel (normal)
+/obj/item/stack/tile/iron
+ name = "floor tile"
+ singular_name = "floor tile"
+ desc = "The ground you walk on."
+ icon_state = "tile"
+ item_state = "tile"
+ force = 6
+ mats_per_unit = list(/datum/material/iron=500)
+ throwforce = 10
+ flags_1 = CONDUCT_1
+ turf_type = /turf/open/floor/iron
+ armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 100, ACID = 70, STAMINA = 0)
+ resistance_flags = FIRE_PROOF
+ matter_amount = 1
+ cost = 125
+ source = /datum/robot_energy_storage/metal
+ merge_type = /obj/item/stack/tile/iron
+ tile_reskin_types = list(
+ /obj/item/stack/tile/iron,
+ /obj/item/stack/tile/iron/edge,
+ /obj/item/stack/tile/iron/half,
+ /obj/item/stack/tile/iron/corner,
+ /obj/item/stack/tile/iron/large,
+ /obj/item/stack/tile/iron/textured,
+ /obj/item/stack/tile/iron/textured_edge,
+ /obj/item/stack/tile/iron/textured_half,
+ /obj/item/stack/tile/iron/textured_corner,
+ /obj/item/stack/tile/iron/textured_large,
+ /obj/item/stack/tile/iron/dark,
+ /obj/item/stack/tile/iron/dark/smooth_edge,
+ /obj/item/stack/tile/iron/dark/smooth_half,
+ /obj/item/stack/tile/iron/dark/smooth_corner,
+ /obj/item/stack/tile/iron/dark/smooth_large,
+ /obj/item/stack/tile/iron/dark_side,
+ /obj/item/stack/tile/iron/dark_corner,
+ /obj/item/stack/tile/iron/checker,
+ /obj/item/stack/tile/iron/dark/textured,
+ /obj/item/stack/tile/iron/dark/textured_edge,
+ /obj/item/stack/tile/iron/dark/textured_half,
+ /obj/item/stack/tile/iron/dark/textured_corner,
+ /obj/item/stack/tile/iron/dark/textured_large,
+ /obj/item/stack/tile/iron/white,
+ /obj/item/stack/tile/iron/white/smooth_edge,
+ /obj/item/stack/tile/iron/white/smooth_half,
+ /obj/item/stack/tile/iron/white/smooth_corner,
+ /obj/item/stack/tile/iron/white/smooth_large,
+ /obj/item/stack/tile/iron/white_side,
+ /obj/item/stack/tile/iron/white_corner,
+ /obj/item/stack/tile/iron/cafeteria,
+ /obj/item/stack/tile/iron/white/textured,
+ /obj/item/stack/tile/iron/white/textured_edge,
+ /obj/item/stack/tile/iron/white/textured_half,
+ /obj/item/stack/tile/iron/white/textured_corner,
+ /obj/item/stack/tile/iron/white/textured_large,
+ /obj/item/stack/tile/iron/recharge_floor,
+ /obj/item/stack/tile/iron/smooth,
+ /obj/item/stack/tile/iron/smooth_edge,
+ /obj/item/stack/tile/iron/smooth_half,
+ /obj/item/stack/tile/iron/smooth_corner,
+ /obj/item/stack/tile/iron/smooth_large,
+ /obj/item/stack/tile/iron/chapel,
+ /obj/item/stack/tile/iron/showroomfloor,
+ /obj/item/stack/tile/iron/solarpanel,
+ /obj/item/stack/tile/iron/freezer,
+ /obj/item/stack/tile/iron/grimy,
+ /obj/item/stack/tile/iron/sepia,
+ )
+
+/obj/item/stack/tile/iron/attackby(obj/item/W, mob/user, params)
+ if(W.tool_behaviour == TOOL_WELDER)
+ if(get_amount() < 4)
+ to_chat(user, "You need at least four tiles to do this!")
+ return
+ if(W.use_tool(src, user, 0, volume=40))
+ var/obj/item/stack/sheet/iron/new_item = new(user.loc)
+ user.visible_message("[user] shaped [src] into [new_item] with [W].", \
+ "You shaped [src] into [new_item] with [W].", \
+ "You hear welding.")
+ var/holding = user.is_holding(src)
+ use(4)
+ if(holding && QDELETED(src))
+ user.put_in_hands(new_item)
+ else
+ return ..()
+
+/obj/item/stack/tile/iron/base //this subtype should be used for most stuff
+ merge_type = /obj/item/stack/tile/iron/base
+
+/obj/item/stack/tile/iron/base/cyborg //cant reskin these, fucks with borg code
+ merge_type = /obj/item/stack/tile/iron/base/cyborg
+ tile_reskin_types = null
+
+/obj/item/stack/tile/iron/edge
+ name = "edge tile"
+ singular_name = "edge floor tile"
+ icon_state = "tile_edge"
+ turf_type = /turf/open/floor/iron/edge
+ merge_type = /obj/item/stack/tile/iron/edge
+ tile_rotate_dirs = list(SOUTH, NORTH, EAST, WEST)
+
+/obj/item/stack/tile/iron/half
+ name = "half tile"
+ singular_name = "half floor tile"
+ icon_state = "tile_half"
+ turf_type = /turf/open/floor/iron/half
+ merge_type = /obj/item/stack/tile/iron/half
+ tile_rotate_dirs = list(SOUTH, NORTH)
+
+/obj/item/stack/tile/iron/corner
+ name = "corner tile"
+ singular_name = "corner floor tile"
+ icon_state = "tile_corner"
+ turf_type = /turf/open/floor/iron/corner
+ merge_type = /obj/item/stack/tile/iron/corner
+ tile_rotate_dirs = list(SOUTH, NORTH, EAST, WEST)
+
+/obj/item/stack/tile/iron/large
+ name = "large tile"
+ singular_name = "large floor tile"
+ icon_state = "tile_large"
+ turf_type = /turf/open/floor/iron/large
+ merge_type = /obj/item/stack/tile/iron/large
+
+/obj/item/stack/tile/iron/textured
+ name = "textured tile"
+ singular_name = "textured floor tile"
+ icon_state = "tile_textured"
+ turf_type = /turf/open/floor/iron/textured
+ merge_type = /obj/item/stack/tile/iron/textured
+
+/obj/item/stack/tile/iron/textured_edge
+ name = "textured edge tile"
+ singular_name = "edged textured floor tile"
+ icon_state = "tile_textured_edge"
+ turf_type = /turf/open/floor/iron/textured_edge
+ merge_type = /obj/item/stack/tile/iron/textured_edge
+ tile_rotate_dirs = list(SOUTH, NORTH, EAST, WEST)
+
+/obj/item/stack/tile/iron/textured_half
+ name = "textured half tile"
+ singular_name = "halved textured floor tile"
+ icon_state = "tile_textured_half"
+ turf_type = /turf/open/floor/iron/textured_half
+ merge_type = /obj/item/stack/tile/iron/textured_half
+ tile_rotate_dirs = list(SOUTH, NORTH)
+
+/obj/item/stack/tile/iron/textured_corner
+ name = "textured corner tile"
+ singular_name = "cornered textured floor tile"
+ icon_state = "tile_textured_corner"
+ turf_type = /turf/open/floor/iron/textured_corner
+ merge_type = /obj/item/stack/tile/iron/textured_corner
+ tile_rotate_dirs = list(SOUTH, NORTH, EAST, WEST)
+
+/obj/item/stack/tile/iron/textured_large
+ name = "textured large tile"
+ singular_name = "large textured floor tile"
+ icon_state = "tile_textured_large"
+ turf_type = /turf/open/floor/iron/textured_large
+ merge_type = /obj/item/stack/tile/iron/textured_large
+
+/obj/item/stack/tile/iron/dark
+ name = "dark tile"
+ singular_name = "dark floor tile"
+ icon_state = "tile_dark"
+ turf_type = /turf/open/floor/iron/dark
+ merge_type = /obj/item/stack/tile/iron/dark
+
+/obj/item/stack/tile/iron/dark/smooth_edge
+ name = "dark edge tile"
+ singular_name = "edged dark floor tile"
+ icon_state = "tile_dark_edge"
+ turf_type = /turf/open/floor/iron/dark/smooth_edge
+ merge_type = /obj/item/stack/tile/iron/dark/smooth_edge
+ tile_rotate_dirs = list(SOUTH, NORTH, EAST, WEST)
+
+/obj/item/stack/tile/iron/dark/smooth_half
+ name = "dark half tile"
+ singular_name = "halved dark floor tile"
+ icon_state = "tile_dark_half"
+ turf_type = /turf/open/floor/iron/dark/smooth_half
+ merge_type = /obj/item/stack/tile/iron/dark/smooth_half
+ tile_rotate_dirs = list(SOUTH, NORTH)
+
+/obj/item/stack/tile/iron/dark/smooth_corner
+ name = "dark corner tile"
+ singular_name = "cornered dark floor tile"
+ icon_state = "tile_dark_corner"
+ turf_type = /turf/open/floor/iron/dark/smooth_corner
+ merge_type = /obj/item/stack/tile/iron/dark/smooth_corner
+ tile_rotate_dirs = list(SOUTH, NORTH, EAST, WEST)
+
+/obj/item/stack/tile/iron/dark/smooth_large
+ name = "dark large tile"
+ singular_name = "large dark floor tile"
+ icon_state = "tile_dark_large"
+ turf_type = /turf/open/floor/iron/dark/smooth_large
+ merge_type = /obj/item/stack/tile/iron/dark/smooth_large
+
+/obj/item/stack/tile/iron/dark_side
+ name = "half dark tile"
+ singular_name = "half dark floor tile"
+ icon_state = "tile_darkside"
+ turf_type = /turf/open/floor/iron/dark/side
+ merge_type = /obj/item/stack/tile/iron/dark_side
+ tile_rotate_dirs = list(SOUTH, NORTH, EAST, WEST, SOUTHEAST, SOUTHWEST, NORTHEAST, NORTHWEST)
+
+/obj/item/stack/tile/iron/dark_corner
+ name = "quarter dark tile"
+ singular_name = "quarter dark floor tile"
+ icon_state = "tile_darkcorner"
+ turf_type = /turf/open/floor/iron/dark/corner
+ merge_type = /obj/item/stack/tile/iron/dark_corner
+ tile_rotate_dirs = list(SOUTH, NORTH, EAST, WEST)
+
+/obj/item/stack/tile/iron/checker
+ name = "checker tile"
+ singular_name = "checker floor tile"
+ icon_state = "tile_checker"
+ turf_type = /turf/open/floor/iron/checker
+ merge_type = /obj/item/stack/tile/iron/checker
+ tile_rotate_dirs = list(SOUTH, NORTH)
+
+/obj/item/stack/tile/iron/dark/textured
+ name = "dark textured tile"
+ singular_name = "dark textured floor tile"
+ icon_state = "tile_textured_dark"
+ turf_type = /turf/open/floor/iron/dark/textured
+ merge_type = /obj/item/stack/tile/iron/dark/textured
+
+/obj/item/stack/tile/iron/dark/textured_edge
+ name = "dark textured edge tile"
+ singular_name = "edged dark textured floor tile"
+ icon_state = "tile_textured_dark_edge"
+ turf_type = /turf/open/floor/iron/dark/textured_edge
+ merge_type = /obj/item/stack/tile/iron/dark/textured_edge
+ tile_rotate_dirs = list(SOUTH, NORTH, EAST, WEST)
+
+/obj/item/stack/tile/iron/dark/textured_half
+ name = "dark textured half tile"
+ singular_name = "halved dark textured floor tile"
+ icon_state = "tile_textured_dark_half"
+ turf_type = /turf/open/floor/iron/dark/textured_half
+ merge_type = /obj/item/stack/tile/iron/dark/textured_half
+ tile_rotate_dirs = list(SOUTH, NORTH)
+
+/obj/item/stack/tile/iron/dark/textured_corner
+ name = "dark textured corner tile"
+ singular_name = "cornered dark textured floor tile"
+ icon_state = "tile_textured_dark_corner"
+ turf_type = /turf/open/floor/iron/dark/textured_corner
+ merge_type = /obj/item/stack/tile/iron/dark/textured_corner
+ tile_rotate_dirs = list(SOUTH, NORTH, EAST, WEST)
+
+/obj/item/stack/tile/iron/dark/textured_large
+ name = "dark textured large tile"
+ singular_name = "large dark textured floor tile"
+ icon_state = "tile_textured_dark_large"
+ turf_type = /turf/open/floor/iron/dark/textured_large
+ merge_type = /obj/item/stack/tile/iron/dark/textured_large
+
+/obj/item/stack/tile/iron/white
+ name = "white tile"
+ singular_name = "white floor tile"
+ icon_state = "tile_white"
+ turf_type = /turf/open/floor/iron/white
+ merge_type = /obj/item/stack/tile/iron/white
+
+/obj/item/stack/tile/iron/white/smooth_edge
+ name = "white edge tile"
+ singular_name = "edged white floor tile"
+ icon_state = "tile_white_edge"
+ turf_type = /turf/open/floor/iron/white/smooth_edge
+ merge_type = /obj/item/stack/tile/iron/white/smooth_edge
+ tile_rotate_dirs = list(SOUTH, NORTH, EAST, WEST)
+
+/obj/item/stack/tile/iron/white/smooth_half
+ name = "white half tile"
+ singular_name = "halved white floor tile"
+ icon_state = "tile_white_half"
+ turf_type = /turf/open/floor/iron/white/smooth_half
+ merge_type = /obj/item/stack/tile/iron/white/smooth_half
+ tile_rotate_dirs = list(SOUTH, NORTH)
+
+/obj/item/stack/tile/iron/white/smooth_corner
+ name = "white corner tile"
+ singular_name = "cornered white floor tile"
+ icon_state = "tile_white_corner"
+ turf_type = /turf/open/floor/iron/white/smooth_corner
+ merge_type = /obj/item/stack/tile/iron/white/smooth_corner
+ tile_rotate_dirs = list(SOUTH, NORTH, EAST, WEST)
+
+/obj/item/stack/tile/iron/white/smooth_large
+ name = "white large tile"
+ singular_name = "large white floor tile"
+ icon_state = "tile_white_large"
+ turf_type = /turf/open/floor/iron/white/smooth_large
+ merge_type = /obj/item/stack/tile/iron/white/smooth_large
+
+/obj/item/stack/tile/iron/white_side
+ name = "half white tile"
+ singular_name = "half white floor tile"
+ icon_state = "tile_whiteside"
+ turf_type = /turf/open/floor/iron/white/side
+ merge_type = /obj/item/stack/tile/iron/white_side
+ tile_rotate_dirs = list(SOUTH, NORTH, EAST, WEST, SOUTHEAST, SOUTHWEST, NORTHEAST, NORTHWEST)
+
+/obj/item/stack/tile/iron/white_corner
+ name = "quarter white tile"
+ singular_name = "quarter white floor tile"
+ icon_state = "tile_whitecorner"
+ turf_type = /turf/open/floor/iron/white/corner
+ merge_type = /obj/item/stack/tile/iron/white_corner
+ tile_rotate_dirs = list(SOUTH, NORTH, EAST, WEST)
+
+/obj/item/stack/tile/iron/cafeteria
+ name = "cafeteria tile"
+ singular_name = "cafeteria floor tile"
+ icon_state = "tile_cafeteria"
+ turf_type = /turf/open/floor/iron/cafeteria
+ merge_type = /obj/item/stack/tile/iron/cafeteria
+ tile_rotate_dirs = list(SOUTH, NORTH)
+
+/obj/item/stack/tile/iron/white/textured
+ name = "white textured tile"
+ singular_name = "white textured floor tile"
+ icon_state = "tile_textured_white"
+ turf_type = /turf/open/floor/iron/white/textured
+ merge_type = /obj/item/stack/tile/iron/white/textured
+
+/obj/item/stack/tile/iron/white/textured_edge
+ name = "white textured edge tile"
+ singular_name = "edged white textured floor tile"
+ icon_state = "tile_textured_white_edge"
+ turf_type = /turf/open/floor/iron/white/textured_edge
+ merge_type = /obj/item/stack/tile/iron/white/textured_edge
+ tile_rotate_dirs = list(SOUTH, NORTH, EAST, WEST)
+
+/obj/item/stack/tile/iron/white/textured_half
+ name = "white textured half tile"
+ singular_name = "halved white textured floor tile"
+ icon_state = "tile_textured_white_half"
+ turf_type = /turf/open/floor/iron/white/textured_half
+ merge_type = /obj/item/stack/tile/iron/white/textured_half
+ tile_rotate_dirs = list(SOUTH, NORTH)
+
+/obj/item/stack/tile/iron/white/textured_corner
+ name = "white textured corner tile"
+ singular_name = "cornered white textured floor tile"
+ icon_state = "tile_textured_white_corner"
+ turf_type = /turf/open/floor/iron/white/textured_corner
+ merge_type = /obj/item/stack/tile/iron/white/textured_corner
+ tile_rotate_dirs = list(SOUTH, NORTH, EAST, WEST)
+
+/obj/item/stack/tile/iron/white/textured_large
+ name = "white textured large tile"
+ singular_name = "large white textured floor tile"
+ icon_state = "tile_textured_white_large"
+ turf_type = /turf/open/floor/iron/white/textured_large
+ merge_type = /obj/item/stack/tile/iron/white/textured_large
+
+/obj/item/stack/tile/iron/recharge_floor
+ name = "recharge floor tile"
+ singular_name = "recharge floor tile"
+ icon_state = "tile_recharge"
+ turf_type = /turf/open/floor/iron/recharge_floor
+ merge_type = /obj/item/stack/tile/iron/recharge_floor
+
+/obj/item/stack/tile/iron/smooth
+ name = "smooth tile"
+ singular_name = "smooth floor tile"
+ icon_state = "tile_smooth"
+ turf_type = /turf/open/floor/iron/smooth
+ merge_type = /obj/item/stack/tile/iron/smooth
+
+/obj/item/stack/tile/iron/smooth_edge
+ name = "smooth edge tile"
+ singular_name = "edged smooth floor tile"
+ icon_state = "tile_smooth_edge"
+ turf_type = /turf/open/floor/iron/smooth_edge
+ merge_type = /obj/item/stack/tile/iron/smooth_edge
+ tile_rotate_dirs = list(SOUTH, NORTH, EAST, WEST)
+
+/obj/item/stack/tile/iron/smooth_half
+ name = "smooth half tile"
+ singular_name = "halved smooth floor tile"
+ icon_state = "tile_smooth_half"
+ turf_type = /turf/open/floor/iron/smooth_half
+ merge_type = /obj/item/stack/tile/iron/smooth_half
+ tile_rotate_dirs = list(SOUTH, NORTH)
+
+/obj/item/stack/tile/iron/smooth_corner
+ name = "smooth corner tile"
+ singular_name = "cornered smooth floor tile"
+ icon_state = "tile_smooth_corner"
+ turf_type = /turf/open/floor/iron/smooth_corner
+ merge_type = /obj/item/stack/tile/iron/smooth_corner
+ tile_rotate_dirs = list(SOUTH, NORTH, EAST, WEST)
+
+/obj/item/stack/tile/iron/smooth_large
+ name = "smooth large tile"
+ singular_name = "large smooth floor tile"
+ icon_state = "tile_smooth_large"
+ turf_type = /turf/open/floor/iron/smooth_large
+ merge_type = /obj/item/stack/tile/iron/smooth_large
+
+/obj/item/stack/tile/iron/chapel
+ name = "chapel floor tile"
+ singular_name = "chapel floor tile"
+ icon_state = "tile_chapel"
+ turf_type = /turf/open/floor/iron/chapel
+ merge_type = /obj/item/stack/tile/iron/chapel
+ tile_rotate_dirs = list(SOUTH, NORTH, EAST, WEST, SOUTHEAST, SOUTHWEST, NORTHEAST, NORTHWEST)
+
+/obj/item/stack/tile/iron/showroomfloor
+ name = "showroom floor tile"
+ singular_name = "showroom floor tile"
+ icon_state = "tile_showroom"
+ turf_type = /turf/open/floor/iron/showroomfloor
+ merge_type = /obj/item/stack/tile/iron/showroomfloor
+
+/obj/item/stack/tile/iron/solarpanel
+ name = "solar panel tile"
+ singular_name = "solar panel floor tile"
+ icon_state = "tile_solarpanel"
+ turf_type = /turf/open/floor/iron/solarpanel
+ merge_type = /obj/item/stack/tile/iron/solarpanel
+
+/obj/item/stack/tile/iron/freezer
+ name = "freezer floor tile"
+ singular_name = "freezer floor tile"
+ icon_state = "tile_freezer"
+ turf_type = /turf/open/floor/iron/freezer
+ merge_type = /obj/item/stack/tile/iron/freezer
+
+/obj/item/stack/tile/iron/grimy
+ name = "grimy floor tile"
+ singular_name = "grimy floor tile"
+ icon_state = "tile_grimy"
+ turf_type = /turf/open/floor/iron/grimy
+ merge_type = /obj/item/stack/tile/iron/grimy
+
+/obj/item/stack/tile/iron/sepia
+ name = "sepia floor tile"
+ singular_name = "sepia floor tile"
+ desc = "Well, the flow of time is normal on these tiles, weird."
+ icon_state = "tile_sepia"
+ turf_type = /turf/open/floor/iron/sepia
+ merge_type = /obj/item/stack/tile/iron/sepia
+
+//Tiles below can't be gotten through tile reskinning
+
+/obj/item/stack/tile/iron/bluespace
+ name = "bluespace floor tile"
+ singular_name = "bluespace floor tile"
+ desc = "Sadly, these don't seem to make you faster..."
+ icon_state = "tile_bluespace"
+ turf_type = /turf/open/floor/iron/bluespace
+ merge_type = /obj/item/stack/tile/iron/bluespace
+ tile_reskin_types = null
+
+/obj/item/stack/tile/iron/goonplaque
+ name = "plaqued floor tile"
+ singular_name = "plaqued floor tile"
+ desc = "\"This is a plaque in honour of our comrades on the G4407 Stations. Hopefully TG4407 model can live up to your fame and fortune.\" Scratched in beneath that is a crude image of a meteor and a spaceman. The spaceman is laughing. The meteor is exploding."
+ icon_state = "tile_plaque"
+ turf_type = /turf/open/floor/iron/goonplaque
+ merge_type = /obj/item/stack/tile/iron/goonplaque
+ tile_reskin_types = null
+
+/obj/item/stack/tile/iron/vaporwave
+ name = "vaporwave floor tile"
+ singular_name = "vaporwave floor tile"
+ icon_state = "tile_vaporwave"
+ turf_type = /turf/open/floor/iron/vaporwave
+ merge_type = /obj/item/stack/tile/iron/vaporwave
+ tile_reskin_types = null
diff --git a/code/game/objects/items/stacks/tiles/tile_mineral.dm b/code/game/objects/items/stacks/tiles/tile_mineral.dm
index a1ce759b17e5f..6ca6b833bb8d4 100644
--- a/code/game/objects/items/stacks/tiles/tile_mineral.dm
+++ b/code/game/objects/items/stacks/tiles/tile_mineral.dm
@@ -1,3 +1,29 @@
+/obj/item/stack/tile/mineral
+ /// Determines what stack is gotten out of us when welded.
+ var/mineralType = null
+
+/obj/item/stack/tile/mineral/attackby(obj/item/W, mob/user, params)
+ if(W.tool_behaviour == TOOL_WELDER)
+ if(get_amount() < 4)
+ to_chat(user, "You need at least four tiles to do this!")
+ return
+ if(!mineralType)
+ to_chat(user, "You can not reform this!")
+ stack_trace("A mineral tile of type [type] doesn't have its' mineralType set.")
+ return
+ if(W.use_tool(src, user, 0, volume=40))
+ var/sheet_type = text2path("/obj/item/stack/sheet/mineral/[mineralType]")
+ var/obj/item/stack/sheet/mineral/new_item = new sheet_type(user.loc)
+ user.visible_message("[user] shaped [src] into [new_item] with [W].", \
+ "You shaped [src] into [new_item] with [W].", \
+ "You hear welding.")
+ var/holding = user.is_holding(src)
+ use(4)
+ if(holding && QDELETED(src))
+ user.put_in_hands(new_item)
+ else
+ return ..()
+
/obj/item/stack/tile/mineral/plasma
name = "plasma tile"
singular_name = "plasma floor tile"
@@ -6,7 +32,8 @@
item_state = "tile-plasma"
turf_type = /turf/open/floor/mineral/plasma
mineralType = "plasma"
- mats_per_unit = list(/datum/material/plasma=500)
+ mats_per_unit = list(/datum/material/plasma=MINERAL_MATERIAL_AMOUNT*0.25)
+ merge_type = /obj/item/stack/tile/mineral/plasma
/obj/item/stack/tile/mineral/uranium
name = "uranium tile"
@@ -16,7 +43,8 @@
item_state = "tile-uranium"
turf_type = /turf/open/floor/mineral/uranium
mineralType = "uranium"
- mats_per_unit = list(/datum/material/uranium=500)
+ mats_per_unit = list(/datum/material/uranium=MINERAL_MATERIAL_AMOUNT*0.25)
+ merge_type = /obj/item/stack/tile/mineral/uranium
/obj/item/stack/tile/mineral/gold
name = "gold tile"
@@ -26,7 +54,8 @@
item_state = "tile-gold"
turf_type = /turf/open/floor/mineral/gold
mineralType = "gold"
- mats_per_unit = list(/datum/material/gold=500)
+ mats_per_unit = list(/datum/material/gold=MINERAL_MATERIAL_AMOUNT*0.25)
+ merge_type = /obj/item/stack/tile/mineral/gold
/obj/item/stack/tile/mineral/silver
name = "silver tile"
@@ -36,7 +65,8 @@
item_state = "tile-silver"
turf_type = /turf/open/floor/mineral/silver
mineralType = "silver"
- mats_per_unit = list(/datum/material/silver=500)
+ mats_per_unit = list(/datum/material/silver=MINERAL_MATERIAL_AMOUNT*0.25)
+ merge_type = /obj/item/stack/tile/mineral/silver
/obj/item/stack/tile/mineral/copper
name = "copper tile"
@@ -45,7 +75,8 @@
icon_state = "tile_copper"
turf_type = /turf/open/floor/mineral/copper
mineralType = "copper"
- mats_per_unit = list(/datum/material/copper=500)
+ mats_per_unit = list(/datum/material/copper=MINERAL_MATERIAL_AMOUNT*0.25)
+ merge_type = /obj/item/stack/tile/mineral/copper
/obj/item/stack/tile/mineral/diamond
name = "diamond tile"
@@ -55,7 +86,8 @@
item_state = "tile-diamond"
turf_type = /turf/open/floor/mineral/diamond
mineralType = "diamond"
- mats_per_unit = list(/datum/material/diamond=500)
+ mats_per_unit = list(/datum/material/diamond=MINERAL_MATERIAL_AMOUNT*0.25)
+ merge_type = /obj/item/stack/tile/mineral/diamond
/obj/item/stack/tile/mineral/bananium
name = "bananium tile"
@@ -65,8 +97,9 @@
item_state = "tile-bananium"
turf_type = /turf/open/floor/mineral/bananium
mineralType = "bananium"
- mats_per_unit = list(/datum/material/bananium=500)
+ mats_per_unit = list(/datum/material/bananium=MINERAL_MATERIAL_AMOUNT*0.25)
material_flags = NONE //The slippery comp makes it unpractical for good clown decor. The material tiles should still slip.
+ merge_type = /obj/item/stack/tile/mineral/bananium
/obj/item/stack/tile/mineral/abductor
name = "alien floor tile"
@@ -77,101 +110,125 @@
item_state = "tile-abductor"
turf_type = /turf/open/floor/mineral/abductor
mineralType = "abductor"
+ merge_type = /obj/item/stack/tile/mineral/abductor
/obj/item/stack/tile/mineral/titanium
name = "titanium tile"
singular_name = "titanium floor tile"
- desc = "A tile made of titanium, used for shuttles. Use while in your hand to change what type of titanium tiles you want."
- icon_state = "tile_shuttle"
+ desc = "Sleek titanium tiles, used for shuttles."
+ icon_state = "tile_titanium"
item_state = "tile-shuttle"
turf_type = /turf/open/floor/mineral/titanium
mineralType = "titanium"
- mats_per_unit = list(/datum/material/titanium=500)
+ mats_per_unit = list(/datum/material/titanium=MINERAL_MATERIAL_AMOUNT*0.25)
+ merge_type = /obj/item/stack/tile/mineral/titanium
tile_reskin_types = list(
/obj/item/stack/tile/mineral/titanium,
/obj/item/stack/tile/mineral/titanium/yellow,
/obj/item/stack/tile/mineral/titanium/blue,
/obj/item/stack/tile/mineral/titanium/white,
/obj/item/stack/tile/mineral/titanium/purple,
- /obj/item/stack/tile/mineral/titanium/alt,
- /obj/item/stack/tile/mineral/titanium/alt/yellow,
- /obj/item/stack/tile/mineral/titanium/alt/blue,
- /obj/item/stack/tile/mineral/titanium/alt/white,
- /obj/item/stack/tile/mineral/titanium/alt/purple,
+ /obj/item/stack/tile/mineral/titanium/tiled,
+ /obj/item/stack/tile/mineral/titanium/tiled/yellow,
+ /obj/item/stack/tile/mineral/titanium/tiled/blue,
+ /obj/item/stack/tile/mineral/titanium/tiled/white,
+ /obj/item/stack/tile/mineral/titanium/tiled/purple,
)
/obj/item/stack/tile/mineral/titanium/yellow
name = "yellow titanium tile"
singular_name = "yellow titanium floor tile"
- desc = "Yellow titanium tiles. Use while in your hand to change what type of titanium tiles you want."
+ desc = "Sleek yellow titanium tiles, used for shuttles."
turf_type = /turf/open/floor/mineral/titanium/yellow
icon_state = "tile_titanium_yellow"
+ merge_type = /obj/item/stack/tile/mineral/titanium/yellow
/obj/item/stack/tile/mineral/titanium/blue
name = "blue titanium tile"
singular_name = "blue titanium floor tile"
- desc = "Blue titanium tiles. Use while in your hand to change what type of titanium tiles you want."
+ desc = "Sleek blue titanium tiles, used for shuttles."
turf_type = /turf/open/floor/mineral/titanium/blue
icon_state = "tile_titanium_blue"
+ merge_type = /obj/item/stack/tile/mineral/titanium/blue
/obj/item/stack/tile/mineral/titanium/white
name = "white titanium tile"
singular_name = "white titanium floor tile"
- desc = "White titanium tiles. Use while in your hand to change what type of titanium tiles you want."
+ desc = "Sleek white titanium tiles, used for shuttles."
turf_type = /turf/open/floor/mineral/titanium/white
icon_state = "tile_titanium_white"
+ merge_type = /obj/item/stack/tile/mineral/titanium/white
/obj/item/stack/tile/mineral/titanium/purple
name = "purple titanium tile"
singular_name = "purple titanium floor tile"
- desc = "Purple titanium tiles. Use while in your hand to change what type of titanium tiles you want."
+ desc = "Sleek purple titanium tiles, used for shuttles."
turf_type = /turf/open/floor/mineral/titanium/purple
icon_state = "tile_titanium_purple"
+ merge_type = /obj/item/stack/tile/mineral/titanium/purple
+
+/obj/item/stack/tile/mineral/titanium/tiled
+ name = "tiled titanium tile"
+ singular_name = "tiled titanium floor tile"
+ desc = "Titanium floor tiles, used for shuttles."
+ turf_type = /turf/open/floor/mineral/titanium/tiled
+ icon_state = "tile_titanium_tiled"
+ merge_type = /obj/item/stack/tile/mineral/titanium/tiled
+
+/obj/item/stack/tile/mineral/titanium/tiled/yellow
+ name = "yellow titanium tile"
+ singular_name = "yellow titanium floor tile"
+ desc = "Yellow titanium floor tiles, used for shuttles."
+ turf_type = /turf/open/floor/mineral/titanium/tiled/yellow
+ icon_state = "tile_titanium_tiled_yellow"
+ merge_type = /obj/item/stack/tile/mineral/titanium/tiled/yellow
+
+/obj/item/stack/tile/mineral/titanium/tiled/blue
+ name = "blue titanium tile"
+ singular_name = "blue titanium floor tile"
+ desc = "Blue titanium floor tiles, used for shuttles."
+ turf_type = /turf/open/floor/mineral/titanium/tiled/blue
+ icon_state = "tile_titanium_tiled_blue"
+ merge_type = /obj/item/stack/tile/mineral/titanium/tiled/blue
+
+/obj/item/stack/tile/mineral/titanium/tiled/white
+ name = "white titanium tile"
+ singular_name = "white titanium floor tile"
+ desc = "White titanium floor tiles, used for shuttles."
+ turf_type = /turf/open/floor/mineral/titanium/tiled/white
+ icon_state = "tile_titanium_tiled_white"
+ merge_type = /obj/item/stack/tile/mineral/titanium/tiled/white
-/obj/item/stack/tile/mineral/titanium/alt
- name = "sleek titanium tile"
- singular_name = "sleek titanium floor tile"
- desc = "Sleek titanium floor tiles. Use while in your hand to change what type of titanium tiles you want."
- turf_type = /turf/open/floor/mineral/titanium/alt
- icon_state = "tile_titanium_alt"
-
-/obj/item/stack/tile/mineral/titanium/alt/yellow
- name = "sleek yellow titanium tile"
- singular_name = "sleek yellow titanium floor tile"
- desc = "Sleek yellow titanium floor tiles. Use while in your hand to change what type of titanium tiles you want."
- turf_type = /turf/open/floor/mineral/titanium/alt/yellow
- icon_state = "tile_titanium_yellow_alt"
-
-/obj/item/stack/tile/mineral/titanium/alt/blue
- name = "sleek blue titanium tile"
- singular_name = "sleek blue titanium floor tile"
- desc = "Sleek blue titanium floor tiles. Use while in your hand to change what type of titanium tiles you want."
- turf_type = /turf/open/floor/mineral/titanium/alt/blue
- icon_state = "tile_titanium_blue_alt"
-
-/obj/item/stack/tile/mineral/titanium/alt/white
- name = "sleek white titanium tile"
- singular_name = "sleek white titanium floor tile"
- desc = "Sleek white titanium floor tiles. Use while in your hand to change what type of titanium tiles you want."
- turf_type = /turf/open/floor/mineral/titanium/alt/white
- icon_state = "tile_titanium_white_alt"
-
-/obj/item/stack/tile/mineral/titanium/alt/purple
- name = "sleek purple titanium tile"
- singular_name = "sleek purple titanium floor tile"
- desc = "Sleek purple titanium floor tiles. Use while in your hand to change what type of titanium tiles you want."
- turf_type = /turf/open/floor/mineral/titanium/alt/purple
- icon_state = "tile_titanium_purple_alt"
+/obj/item/stack/tile/mineral/titanium/tiled/purple
+ name = "purple titanium tile"
+ singular_name = "purple titanium floor tile"
+ desc = "Purple titanium floor tiles, used for shuttles."
+ turf_type = /turf/open/floor/mineral/titanium/tiled/purple
+ icon_state = "tile_titanium_tiled_purple"
+ merge_type = /obj/item/stack/tile/mineral/titanium/tiled/purple
/obj/item/stack/tile/mineral/plastitanium
name = "plastitanium tile"
singular_name = "plastitanium floor tile"
desc = "A tile made of plastitanium, used for very evil shuttles."
- icon_state = "tile_darkshuttle"
+ icon_state = "tile_plastitanium"
item_state = "tile-darkshuttle"
turf_type = /turf/open/floor/mineral/plastitanium
mineralType = "plastitanium"
mats_per_unit = list(/datum/material/titanium=500, /datum/material/plasma=500)
+ merge_type = /obj/item/stack/tile/mineral/plastitanium
+ tile_reskin_types = list(
+ /obj/item/stack/tile/mineral/plastitanium,
+ /obj/item/stack/tile/mineral/plastitanium/red,
+ )
+
+/obj/item/stack/tile/mineral/plastitanium/red
+ name = "red plastitanium tile"
+ singular_name = "red plastitanium floor tile"
+ desc = "A tile made of plastitanium, used for very red shuttles."
+ turf_type = /turf/open/floor/mineral/plastitanium/red
+ icon_state = "tile_plastitanium_red"
+ merge_type = /obj/item/stack/tile/mineral/plastitanium/red
/obj/item/stack/tile/mineral/snow
name = "snow tile"
@@ -181,6 +238,7 @@
item_state = "tile-silver"
turf_type = /turf/open/floor/grass/snow/safe
mineralType = "snow"
+ merge_type = /obj/item/stack/tile/mineral/snow
/obj/item/stack/tile/mineral/wax
name = "wax tile"
@@ -190,6 +248,7 @@
item_state = "tile-wax"
turf_type = /turf/open/floor/wax
mineralType = "wax"
+ merge_type = /obj/item/stack/tile/mineral/wax
/obj/item/stack/tile/mineral/brass
name = "brass tiles"
@@ -198,11 +257,41 @@
item_state = "tile_brass"
turf_type = /turf/open/floor/clockwork
mineralType = "brass"
+ merge_type = /obj/item/stack/tile/mineral/brass
/obj/item/stack/tile/mineral/bronze
name = "bronze tiles"
- desc = "An ornante tile made out of... wait this is bronze!"
+ desc = "An ornate tile made out of... wait this is bronze!"
icon_state = "tile_brass"
item_state = "tile_brass"
turf_type = /turf/open/floor/bronze
mineralType = "bronze"
+ merge_type = /obj/item/stack/tile/mineral/bronze
+ tile_reskin_types = list(
+ /obj/item/stack/tile/mineral/bronze,
+ /obj/item/stack/tile/mineral/bronze/flat,
+ /obj/item/stack/tile/mineral/bronze/filled,
+ )
+
+/obj/item/stack/tile/mineral/bronze/flat
+ name = "flat bronze tile"
+ singular_name = "flat bronze floor tile"
+ icon_state = "tile_reebe"
+ turf_type = /turf/open/floor/bronze/flat
+ merge_type = /obj/item/stack/tile/mineral/bronze/flat
+
+/obj/item/stack/tile/mineral/bronze/filled
+ name = "filled bronze tile"
+ singular_name = "filled bronze floor tile"
+ icon_state = "tile_brass_filled"
+ turf_type = /turf/open/floor/bronze/filled
+ merge_type = /obj/item/stack/tile/mineral/bronze/filled
+
+/obj/item/stack/tile/cult
+ name = "engraved tile"
+ singular_name = "engraved floor tile"
+ desc = "A strange tile made from runed metal. Doesn't seem to actually have any paranormal powers."
+ icon_state = "tile_cult"
+ turf_type = /turf/open/floor/cult
+ //mats_per_unit = list(/datum/material/runedmetal=500)
+ merge_type = /obj/item/stack/tile/cult
diff --git a/code/game/objects/items/stacks/tiles/tile_reskinning.dm b/code/game/objects/items/stacks/tiles/tile_reskinning.dm
index bc9331612c6ac..25cb28bd867f1 100644
--- a/code/game/objects/items/stacks/tiles/tile_reskinning.dm
+++ b/code/game/objects/items/stacks/tiles/tile_reskinning.dm
@@ -10,6 +10,8 @@
GLOBAL_LIST_EMPTY(tile_reskin_lists)
+GLOBAL_LIST_EMPTY(tile_dir_lists)
+
/**
* Caches associative lists with type path index keys and images of said type's initial icon state (typepath -> image).
*/
@@ -23,10 +25,35 @@ GLOBAL_LIST_EMPTY(tile_reskin_lists)
values[path] = image(icon = initial(type_cast_path.icon), icon_state = initial(type_cast_path.icon_state))
return GLOB.tile_reskin_lists[string_id] = values
+/obj/item/stack/tile/proc/tile_dir_list(list/values, atom/type_cast_path)
+ . = GLOB.tile_dir_lists[type]
+ if(.)
+ return
+ for(var/set_dir in values)
+ var/image/turf_image = image(icon = initial(type_cast_path.icon), icon_state = initial(type_cast_path.icon_state), dir = text2dir(set_dir))
+ turf_image.transform = turf_image.transform.Scale(0.5, 0.5)
+ values[set_dir] = turf_image
+ return GLOB.tile_dir_lists[type] = values
/obj/item/stack/tile/attack_self(mob/user)
- if(!tile_reskin_types)
- return ..()
+ var/list/radial_options = list()
+ if(tile_reskin_types && tile_rotate_dirs)
+ radial_options["Reskin"] = image(icon = 'icons/mob/radial.dmi', icon_state = "radial_reskin")
+ radial_options["Rotate"] = image(icon = 'icons/mob/radial.dmi', icon_state = "radial_rotate")
+ var/radial_result = show_radial_menu(user, src, radial_options, require_near = TRUE, tooltips = TRUE)
+ switch(radial_result)
+ if("Reskin")
+ return tile_reskin(user)
+ if("Rotate")
+ return tile_rotate(user)
+ return
+ if(tile_reskin_types)
+ return tile_reskin(user)
+ if(tile_rotate_dirs)
+ return tile_rotate(user)
+ return ..()
+
+/obj/item/stack/tile/proc/tile_reskin(mob/user)
var/obj/item/stack/tile/choice = show_radial_menu(user, src, tile_reskin_types, radius = 48, require_near = TRUE)
if(!choice || choice == type)
return
@@ -35,3 +62,9 @@ GLOBAL_LIST_EMPTY(tile_reskin_lists)
if(!QDELETED(choice)) // Tile could have merged with stuff on the ground. The user will have to pick it up if so.
user.put_in_active_hand(choice)
qdel(src)
+
+/obj/item/stack/tile/proc/tile_rotate(mob/user)
+ var/choice = show_radial_menu(user, src, tile_rotate_dirs, radius = 56, require_near = TRUE)
+ if(!choice)
+ return
+ turf_dir = text2dir(choice)
diff --git a/code/game/objects/items/stacks/tiles/tile_types.dm b/code/game/objects/items/stacks/tiles/tile_types.dm
index acbd02ae01b91..a4fb622fa2b69 100644
--- a/code/game/objects/items/stacks/tiles/tile_types.dm
+++ b/code/game/objects/items/stacks/tiles/tile_types.dm
@@ -15,10 +15,12 @@
material_flags = MATERIAL_EFFECTS
/// What type of turf does this tile produce.
var/turf_type = null
- /// Determines certain welder interactions.
- var/mineralType = null
+ /// What dir will the turf have?
+ var/turf_dir = SOUTH
/// Cached associative lazy list to hold the radial options for tile reskinning. See tile_reskinning.dm for more information. Pattern: list[type] -> image
var/list/tile_reskin_types
+ /// Cached associative lazy list to hold the radial options for tile dirs. See tile_reskinning.dm for more information.
+ var/list/tile_rotate_dirs
/obj/item/stack/tile/Initialize(mapload, new_amount, merge = TRUE, mob/user = null)
. = ..()
@@ -26,9 +28,16 @@
pixel_y = rand(-3, 3) //randomize a little
if(tile_reskin_types)
tile_reskin_types = tile_reskin_list(tile_reskin_types)
+ if(tile_rotate_dirs)
+ var/list/values = list()
+ for(var/set_dir in tile_rotate_dirs)
+ values += dir2text(set_dir)
+ tile_rotate_dirs = tile_dir_list(values, turf_type)
/obj/item/stack/tile/examine(mob/user)
. = ..()
+ if(tile_reskin_types || tile_rotate_dirs)
+ . += "Use while in your hand to change what type of [src] you want."
if(throwforce && !is_cyborg) //do not want to divide by zero or show the message to borgs who can't throw
var/verb
switch(CEILING(MAX_LIVING_HEALTH / throwforce, 1)) //throws to crit a human
@@ -46,55 +55,12 @@
return
. += "Those could work as a [verb] throwing weapon."
-/obj/item/stack/tile/attackby(obj/item/W, mob/user, params)
- if (W.tool_behaviour == TOOL_WELDER)
- if(get_amount() < 4)
- to_chat(user, "You need at least four tiles to do this!")
- return
-
- if(!mineralType)
- to_chat(user, "You can not reform this!")
- return
-
- if(W.use_tool(src, user, 0, volume=40))
- if(mineralType == "plasma")
- atmos_spawn_air("plasma=5;TEMP=1000")
- user.visible_message("[user.name] sets the plasma tiles on fire!", \
- "You set the plasma tiles on fire!")
- qdel(src)
- return
-
- if (mineralType == "iron")
- var/obj/item/stack/sheet/iron/new_item = new(user.loc)
- user.visible_message("[user.name] shaped [src] into iron with the welding tool.", \
- "You shaped [src] into iron with the welding tool.", \
- "You hear welding.")
- var/obj/item/stack/rods/R = src
- src = null
- var/replace = (user.get_inactive_held_item()==R)
- R.use(4)
- if (!R && replace)
- user.put_in_hands(new_item)
-
- else
- var/sheet_type = text2path("/obj/item/stack/sheet/mineral/[mineralType]")
- var/obj/item/stack/sheet/mineral/new_item = new sheet_type(user.loc)
- user.visible_message("[user.name] shaped [src] into a sheet with the welding tool.", \
- "You shaped [src] into a sheet with the welding tool.", \
- "You hear welding.")
- var/obj/item/stack/rods/R = src
- src = null
- var/replace = (user.get_inactive_held_item()==R)
- R.use(4)
- if (!R && replace)
- user.put_in_hands(new_item)
- else
- return ..()
-
/obj/item/stack/tile/proc/place_tile(turf/open/T)
if(!turf_type || !use(1))
return
- . = T.PlaceOnTop(turf_type, flags = CHANGETURF_INHERIT_AIR)
+ var/turf/placed_turf = T.PlaceOnTop(turf_type, flags = CHANGETURF_INHERIT_AIR)
+ placed_turf.setDir(turf_dir)
+ return placed_turf
//Grass
/obj/item/stack/tile/grass
@@ -105,6 +71,7 @@
item_state = "tile-grass"
turf_type = /turf/open/floor/grass
resistance_flags = FLAMMABLE
+ merge_type = /obj/item/stack/tile/grass
/obj/item/stack/tile/grass/attackby(obj/item/W, mob/user, params)
if((W.tool_behaviour == TOOL_SHOVEL) && params)
@@ -127,6 +94,7 @@
item_state = "tile-fairygrass"
turf_type = /turf/open/floor/grass/fairy
resistance_flags = FLAMMABLE
+ merge_type = /obj/item/stack/tile/fairygrass
color = "#33CCFF"
/obj/item/stack/tile/fairygrass/white
@@ -134,6 +102,7 @@
singular_name = "white fairygrass floor tile"
desc = "A patch of odd, glowing white grass."
turf_type = /turf/open/floor/grass/fairy/white
+ merge_type = /obj/item/stack/tile/fairygrass/white
color = "#FFFFFF"
/obj/item/stack/tile/fairygrass/red
@@ -141,6 +110,7 @@
singular_name = "red fairygrass floor tile"
desc = "A patch of odd, glowing red grass."
turf_type = /turf/open/floor/grass/fairy/red
+ merge_type = /obj/item/stack/tile/fairygrass/red
color = "#FF3333"
/obj/item/stack/tile/fairygrass/orange
@@ -148,6 +118,7 @@
singular_name = "orange fairygrass floor tile"
desc = "A patch of odd, glowing orange grass."
turf_type = /turf/open/floor/grass/fairy/orange
+ merge_type = /obj/item/stack/tile/fairygrass/orange
color = "#FFA500"
/obj/item/stack/tile/fairygrass/yellow
@@ -155,6 +126,7 @@
singular_name = "yellow fairygrass floor tile"
desc = "A patch of odd, glowing yellow grass."
turf_type = /turf/open/floor/grass/fairy/yellow
+ merge_type = /obj/item/stack/tile/fairygrass/blue
color = "#FFFF66"
/obj/item/stack/tile/fairygrass/green
@@ -162,6 +134,7 @@
singular_name = "green fairygrass floor tile"
desc = "A patch of odd, glowing green grass."
turf_type = /turf/open/floor/grass/fairy/green
+ merge_type = /obj/item/stack/tile/fairygrass/blue
color = "#99FF99"
/obj/item/stack/tile/fairygrass/blue
@@ -169,12 +142,14 @@
singular_name = "blue fairygrass floor tile"
desc = "A patch of odd, glowing blue grass."
turf_type = /turf/open/floor/grass/fairy/blue
+ merge_type = /obj/item/stack/tile/fairygrass/blue
/obj/item/stack/tile/fairygrass/purple
name = "purple fairygrass tile"
singular_name = "purple fairygrass floor tile"
desc = "A patch of odd, glowing purple grass."
turf_type = /turf/open/floor/grass/fairy/purple
+ merge_type = /obj/item/stack/tile/fairygrass/purple
color = "#D966FF"
/obj/item/stack/tile/fairygrass/pink
@@ -182,6 +157,7 @@
singular_name = "pink fairygrass floor tile"
desc = "A patch of odd, glowing pink grass."
turf_type = /turf/open/floor/grass/fairy/pink
+ merge_type = /obj/item/stack/tile/fairygrass/pink
color = "#FFB3DA"
/obj/item/stack/tile/fairygrass/dark
@@ -189,6 +165,7 @@
singular_name = "dark fairygrass floor tile"
desc = "A patch of odd, light consuming grass."
turf_type = /turf/open/floor/grass/fairy/dark
+ merge_type = /obj/item/stack/tile/fairygrass/dark
color = "#410096"
//Wood
@@ -200,6 +177,7 @@
item_state = "tile-wood"
turf_type = /turf/open/floor/wood
resistance_flags = FLAMMABLE
+ merge_type = /obj/item/stack/tile/wood
//Bamboo
/obj/item/stack/tile/bamboo
@@ -209,6 +187,7 @@
icon_state = "tile-bamboo"
item_state = "tile-bamboo"
turf_type = /turf/open/floor/bamboo
+ merge_type = /obj/item/stack/tile/bamboo
resistance_flags = FLAMMABLE
//Basalt
@@ -219,6 +198,7 @@
icon_state = "tile_basalt"
item_state = "tile-basalt"
turf_type = /turf/open/floor/grass/fakebasalt
+ merge_type = /obj/item/stack/tile/basalt
//Carpets
/obj/item/stack/tile/carpet
@@ -230,6 +210,29 @@
turf_type = /turf/open/floor/carpet
resistance_flags = FLAMMABLE
tableVariant = /obj/structure/table/wood/fancy
+ merge_type = /obj/item/stack/tile/carpet
+ tile_reskin_types = list(
+ /obj/item/stack/tile/carpet,
+ /obj/item/stack/tile/carpet/symbol,
+ /obj/item/stack/tile/carpet/star,
+ )
+
+/obj/item/stack/tile/carpet/symbol
+ name = "symbol carpet"
+ singular_name = "symbol carpet tile"
+ icon_state = "tile-carpet-symbol"
+ desc = "A piece of carpet. This one has a symbol on it."
+ turf_type = /turf/open/floor/carpet/lone
+ merge_type = /obj/item/stack/tile/carpet/symbol
+ tile_rotate_dirs = list(SOUTH, NORTH, EAST, WEST, SOUTHEAST)
+
+/obj/item/stack/tile/carpet/star
+ name = "star carpet"
+ singular_name = "star carpet tile"
+ icon_state = "tile-carpet-star"
+ desc = "A piece of carpet. This one has a star on it."
+ turf_type = /turf/open/floor/carpet/lone/star
+ merge_type = /obj/item/stack/tile/carpet/star
/obj/item/stack/tile/carpet/black
name = "black carpet"
@@ -467,6 +470,7 @@
icon_state = "tile_bcircuit"
item_state = "tile-bcircuit"
turf_type = /turf/open/floor/circuit
+ merge_type = /obj/item/stack/tile/circuit
/obj/item/stack/tile/circuit/green
name = "green circuit tile"
@@ -475,9 +479,11 @@
icon_state = "tile_gcircuit"
item_state = "tile-gcircuit"
turf_type = /turf/open/floor/circuit/green
+ merge_type = /obj/item/stack/tile/circuit/green
/obj/item/stack/tile/circuit/green/anim
turf_type = /turf/open/floor/circuit/green/anim
+ merge_type = /obj/item/stack/tile/circuit/green/anim
/obj/item/stack/tile/circuit/red
name = "red circuit tile"
@@ -486,9 +492,11 @@
icon_state = "tile_rcircuit"
item_state = "tile-rcircuit"
turf_type = /turf/open/floor/circuit/red
+ merge_type = /obj/item/stack/tile/circuit/red
/obj/item/stack/tile/circuit/red/anim
turf_type = /turf/open/floor/circuit/red/anim
+ merge_type = /obj/item/stack/tile/circuit/red/anim
//Pod floor
/obj/item/stack/tile/pod
@@ -498,6 +506,12 @@
icon_state = "tile_pod"
item_state = "tile-pod"
turf_type = /turf/open/floor/pod
+ merge_type = /obj/item/stack/tile/pod
+ tile_reskin_types = list(
+ /obj/item/stack/tile/pod,
+ /obj/item/stack/tile/pod/light,
+ /obj/item/stack/tile/pod/dark,
+ )
/obj/item/stack/tile/pod/light
name = "light pod floor tile"
@@ -505,6 +519,7 @@
desc = "A lightly colored grooved floor tile."
icon_state = "tile_podlight"
turf_type = /turf/open/floor/pod/light
+ merge_type = /obj/item/stack/tile/pod/light
/obj/item/stack/tile/pod/dark
name = "dark pod floor tile"
@@ -512,25 +527,7 @@
desc = "A darkly colored grooved floor tile."
icon_state = "tile_poddark"
turf_type = /turf/open/floor/pod/dark
-
-//Plasteel (normal)
-/obj/item/stack/tile/iron
- name = "floor tile"
- singular_name = "floor tile"
- desc = "The ground you walk on."
- icon_state = "tile"
- item_state = "tile"
- force = 6
- mats_per_unit = list(/datum/material/iron=500)
- throwforce = 10
- flags_1 = CONDUCT_1
- turf_type = /turf/open/floor/iron
- mineralType = "iron"
- armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 100, ACID = 70, STAMINA = 0)
- resistance_flags = FIRE_PROOF
- matter_amount = 1
- cost = 125
- source = /datum/robot_energy_storage/metal
+ merge_type = /obj/item/stack/tile/pod/dark
//Monotiles
@@ -541,6 +538,7 @@
icon_state = "tile"
custom_materials = list(/datum/material/iron=500)
turf_type = /turf/open/floor/monotile
+ merge_type = /obj/item/stack/tile/mono
/obj/item/stack/tile/mono/dark
name = "dark mono tile"
@@ -549,6 +547,7 @@
icon_state = "tile"
custom_materials = list(/datum/material/iron=500)
turf_type = /turf/open/floor/monotile/dark
+ merge_type = /obj/item/stack/tile/mono/dark
/obj/item/stack/tile/mono/light
name = "light mono tile"
@@ -557,6 +556,7 @@
icon_state = "tile"
custom_materials = list(/datum/material/iron=500)
turf_type = /turf/open/floor/monotile/light
+ merge_type = /obj/item/stack/tile/mono/light
//Bay grids
/obj/item/stack/tile/grid
@@ -566,6 +566,7 @@
icon_state = "tile_grid"
custom_materials = list(/datum/material/iron=500)
turf_type = /turf/open/floor/iron/grid
+ merge_type = /obj/item/stack/tile/grid
/obj/item/stack/tile/ridge
name = "grey ridge tile"
@@ -574,6 +575,7 @@
icon_state = "tile_ridged"
custom_materials = list(/datum/material/iron=500)
turf_type = /turf/open/floor/iron/ridged
+ merge_type = /obj/item/stack/tile/ridge
//Techtiles
/obj/item/stack/tile/techgrey
@@ -583,7 +585,7 @@
icon_state = "tile_tech_grey"
custom_materials = list(/datum/material/iron=500)
turf_type = /turf/open/floor/iron/tech
-
+ merge_type = /obj/item/stack/tile/techgrey
/obj/item/stack/tile/techgrid
name = "grid techfloor tile"
singular_name = "grid techfloor tile"
@@ -591,6 +593,7 @@
icon_state = "tile_tech_grid"
custom_materials = list(/datum/material/iron=500)
turf_type = /turf/open/floor/iron/tech/grid
+ merge_type = /obj/item/stack/tile/techgrid
/obj/item/stack/tile/techmaint
name = "dark techfloor tile"
@@ -599,6 +602,7 @@
icon_state = "tile_tech_maint"
custom_materials = list(/datum/material/iron=500)
turf_type = /turf/open/floor/iron/techmaint
+ merge_type = /obj/item/stack/tile/techmaint
/obj/item/stack/tile/dock
name = "dock tile"
@@ -607,6 +611,7 @@
icon_state = "tile_dock"
custom_materials = list(/datum/material/iron=500, /datum/material/plasma=500)
turf_type = /turf/open/floor/dock
+ merge_type = /obj/item/stack/tile/dock
/obj/item/stack/tile/drydock
name = "dry dock tile"
@@ -615,6 +620,7 @@
icon_state = "tile_drydock"
custom_materials = list(/datum/material/iron=1000, /datum/material/plasma=1000)
turf_type = /turf/open/floor/dock/drydock
+ merge_type = /obj/item/stack/tile/drydock
/obj/item/stack/tile/material
name = "floor tile"
diff --git a/code/game/objects/items/stacks/wrap.dm b/code/game/objects/items/stacks/wrap.dm
index 4a9742db50677..0f910da5a0a01 100644
--- a/code/game/objects/items/stacks/wrap.dm
+++ b/code/game/objects/items/stacks/wrap.dm
@@ -9,6 +9,7 @@
amount = 25
max_amount = 25
resistance_flags = FLAMMABLE
+ merge_type = /obj/item/stack/wrapping_paper
/obj/item/stack/wrapping_paper/use(used, transfer, check = TRUE)
var/turf/T = get_turf(src)
@@ -29,6 +30,7 @@
amount = 25
max_amount = 25
resistance_flags = FLAMMABLE
+ merge_type = /obj/item/stack/package_wrap
/obj/item/stack/package_wrap/suicide_act(mob/living/user)
user.visible_message("[user] begins wrapping [user.p_them()]self in \the [src]! It looks like [user.p_theyre()] trying to commit suicide!")
diff --git a/code/game/objects/items/storage/backpack.dm b/code/game/objects/items/storage/backpack.dm
index 3f0559cc1073f..14737edcf535c 100644
--- a/code/game/objects/items/storage/backpack.dm
+++ b/code/game/objects/items/storage/backpack.dm
@@ -377,7 +377,7 @@
qdel(C)
/obj/item/storage/backpack/satchel/flat/with_tools/PopulateContents()
- new /obj/item/stack/tile/iron(src)
+ new /obj/item/stack/tile/iron/base(src)
new /obj/item/crowbar(src)
..()
diff --git a/code/game/objects/items/storage/book.dm b/code/game/objects/items/storage/book.dm
index 0c0280a30bb19..9f6e3ab78cc3a 100644
--- a/code/game/objects/items/storage/book.dm
+++ b/code/game/objects/items/storage/book.dm
@@ -38,7 +38,7 @@
/obj/item/storage/book/bible/ComponentInitialize()
. = ..()
- AddComponent(/datum/component/anti_magic, FALSE, TRUE, _allowed_slots = ITEM_SLOT_HANDS)
+ AddComponent(/datum/component/anti_magic, src, FALSE, TRUE, _allowed_slots = ITEM_SLOT_HANDS)
/obj/item/storage/book/bible/suicide_act(mob/living/user)
user.visible_message("[user] is offering [user.p_them()]self to [deity_name]! It looks like [user.p_theyre()] trying to commit suicide!")
@@ -224,23 +224,6 @@
B.name = name
B.icon_state = icon_state
B.item_state = item_state
- if(istype(A, /obj/item/cult_bastard) && !iscultist(user))
- var/obj/item/cult_bastard/sword = A
- to_chat(user, "You begin to exorcise [sword].")
- playsound(src,'sound/hallucinations/veryfar_noise.ogg',40,1)
- if(do_after(user, 40, target = sword))
- playsound(src,'sound/effects/pray_chaplain.ogg',60,1)
- for(var/obj/item/soulstone/SS in sword.contents)
- SS.required_role = null
- for(var/mob/living/simple_animal/shade/EX in SS)
- SSticker.mode.remove_cultist(EX.mind, 1, 0)
- EX.icon_state = "shade_holy"
- EX.name = "Purified [EX.name]"
- SS.release_shades(user)
- qdel(SS)
- new /obj/item/nullrod/claymore(get_turf(sword))
- user.visible_message("[user] has purified [sword]!")
- qdel(sword)
else if(istype(A, /obj/item/soulstone) && !iscultist(user))
var/obj/item/soulstone/SS = A
diff --git a/code/game/turfs/closed/wall/misc_walls.dm b/code/game/turfs/closed/wall/misc_walls.dm
index e559085d5d74b..93ec8a029dd50 100644
--- a/code/game/turfs/closed/wall/misc_walls.dm
+++ b/code/game/turfs/closed/wall/misc_walls.dm
@@ -42,11 +42,27 @@
new /obj/effect/temp_visual/cult/turf(get_turf(src))
/turf/closed/wall/vault
+ name = "strange wall"
icon = 'icons/turf/walls.dmi'
icon_state = "rockvault"
+ base_icon_state = "rockvault"
smoothing_flags = NONE
- base_icon_state = null
canSmoothWith = null
+ smoothing_groups = null
+
+/turf/closed/wall/vault/rock
+ name = "rocky wall"
+ desc = "You feel a strange nostalgia from looking at this..."
+
+/turf/closed/wall/vault/alien
+ name = "alien wall"
+ icon_state = "alienvault"
+ base_icon_state = "alienvault"
+
+/turf/closed/wall/vault/sandstone
+ name = "sandstone wall"
+ icon_state = "sandstonevault"
+ base_icon_state = "sandstonevault"
/turf/closed/wall/ice
icon = 'icons/turf/walls/icedmetal_wall.dmi'
diff --git a/code/game/turfs/open/floor.dm b/code/game/turfs/open/floor.dm
index 8fc40fedaf0ea..c863412c8a0a8 100644
--- a/code/game/turfs/open/floor.dm
+++ b/code/game/turfs/open/floor.dm
@@ -1,7 +1,4 @@
/turf/open/floor
- //NOTE: Floor code has been refactored, many procs were removed and refactored
- //- you should use istype() if you want to find out whether a floor has a certain type
- //- floor_tile is now a path, and not a tile obj
name = "floor"
icon = 'icons/turf/floors.dmi'
base_icon_state = "floor"
@@ -28,6 +25,7 @@
. = ..()
if(mapload && prob(33))
MakeDirty()
+
if(is_station_level(z))
GLOB.station_turfs += src
@@ -102,7 +100,7 @@
return TRUE
/turf/open/floor/proc/try_replace_tile(obj/item/stack/tile/T, mob/user, params)
- if(T.turf_type == type)
+ if(T.turf_type == type && T.turf_dir == dir)
return
var/obj/item/CB = user.is_holding_tool_quality(TOOL_CROWBAR)
if(!CB)
diff --git a/code/game/turfs/open/floor/fancy_floor.dm b/code/game/turfs/open/floor/fancy_floor.dm
index 446027a58fd89..eeb9afba4ebae 100644
--- a/code/game/turfs/open/floor/fancy_floor.dm
+++ b/code/game/turfs/open/floor/fancy_floor.dm
@@ -326,6 +326,15 @@
if(smoothing_flags & (SMOOTH_CORNERS|SMOOTH_BITMASK))
QUEUE_SMOOTH(src)
+/turf/open/floor/carpet/lone
+ icon_state = "carpetsymbol"
+ smoothing_flags = NONE
+ floor_tile = /obj/item/stack/tile/carpet/symbol
+
+/turf/open/floor/carpet/lone/star
+ icon_state = "carpetstar"
+ floor_tile = /obj/item/stack/tile/carpet/star
+
/turf/open/floor/carpet/black
icon = 'icons/turf/floors/carpet_black.dmi'
icon_state = "carpet_black-255"
@@ -447,6 +456,7 @@
canSmoothWith = list(SMOOTH_GROUP_TURF_CHASM)
icon = 'icons/turf/floors/Chasms.dmi'
icon_state = "chasms-0"
+ floor_tile = /obj/item/stack/tile/fakepit
tiled_dirt = FALSE
max_integrity = 100
diff --git a/code/game/turfs/open/floor/iron_floor.dm b/code/game/turfs/open/floor/iron_floor.dm
new file mode 100644
index 0000000000000..65d439c896504
--- /dev/null
+++ b/code/game/turfs/open/floor/iron_floor.dm
@@ -0,0 +1,458 @@
+/turf/open/floor/iron
+ icon_state = "floor"
+ floor_tile = /obj/item/stack/tile/iron/base
+
+/turf/open/floor/iron/get_turf_texture()
+ return GLOB.turf_texture_iron
+
+/turf/open/floor/iron/examine(mob/user)
+ . = ..()
+ . += "There's a small crack on the edge of it."
+
+
+/turf/open/floor/iron/rust_heretic_act()
+ if(prob(70))
+ new /obj/effect/temp_visual/glowing_rune(src)
+ var/atom/changed_turf = ChangeTurf(/turf/open/floor/plating)
+ changed_turf.AddElement(/datum/element/rust)
+ return TRUE
+
+/turf/open/floor/iron/update_icon_state()
+ if(broken || burnt)
+ return
+ icon_state = base_icon_state
+ return ..()
+
+/turf/open/floor/iron/airless
+ initial_gas_mix = AIRLESS_ATMOS
+
+/turf/open/floor/iron/telecomms
+ initial_gas_mix = TCOMMS_ATMOS
+
+/turf/open/floor/iron/edge
+ icon_state = "floor_edge"
+ base_icon_state = "floor_edge"
+ floor_tile = /obj/item/stack/tile/iron/edge
+
+/turf/open/floor/iron/half
+ icon_state = "floor_half"
+ base_icon_state = "floor_half"
+ floor_tile = /obj/item/stack/tile/iron/half
+
+/turf/open/floor/iron/corner
+ icon_state = "floor_corner"
+ base_icon_state = "floor_corner"
+ floor_tile = /obj/item/stack/tile/iron/corner
+
+/turf/open/floor/iron/large
+ icon_state = "floor_large"
+ base_icon_state = "floor_large"
+ floor_tile = /obj/item/stack/tile/iron/large
+
+/turf/open/floor/iron/textured
+ icon_state = "textured"
+ base_icon_state = "textured"
+ floor_tile = /obj/item/stack/tile/iron/textured
+
+/turf/open/floor/iron/textured_edge
+ icon_state = "textured_edge"
+ base_icon_state = "textured_edge"
+ floor_tile = /obj/item/stack/tile/iron/textured_edge
+
+/turf/open/floor/iron/textured_half
+ icon_state = "textured_half"
+ base_icon_state = "textured_half"
+ floor_tile = /obj/item/stack/tile/iron/textured_half
+
+/turf/open/floor/iron/textured_corner
+ icon_state = "textured_corner"
+ base_icon_state = "textured_corner"
+ floor_tile = /obj/item/stack/tile/iron/textured_corner
+
+/turf/open/floor/iron/textured_large
+ icon_state = "textured_large"
+ base_icon_state = "textured_large"
+ floor_tile = /obj/item/stack/tile/iron/textured_large
+
+/turf/open/floor/iron/dark
+ icon_state = "darkfull"
+ base_icon_state = "darkfull"
+ floor_tile = /obj/item/stack/tile/iron/dark
+
+/turf/open/floor/iron/dark/smooth_edge
+ icon_state = "dark_edge"
+ base_icon_state = "dark_edge"
+ floor_tile = /obj/item/stack/tile/iron/dark/smooth_edge
+
+/turf/open/floor/iron/dark/smooth_half
+ icon_state = "dark_half"
+ base_icon_state = "dark_half"
+ floor_tile = /obj/item/stack/tile/iron/dark/smooth_half
+
+/turf/open/floor/iron/dark/smooth_corner
+ icon_state = "dark_corner"
+ base_icon_state = "dark_corner"
+ floor_tile = /obj/item/stack/tile/iron/dark/smooth_corner
+
+/turf/open/floor/iron/dark/smooth_large
+ icon_state = "dark_large"
+ base_icon_state = "dark_large"
+ floor_tile = /obj/item/stack/tile/iron/dark/smooth_large
+
+/turf/open/floor/iron/dark/side
+ icon_state = "darkside"
+ base_icon_state = "darkside"
+ floor_tile = /obj/item/stack/tile/iron/dark_side
+
+/turf/open/floor/iron/dark/corner
+ icon_state = "darkcorner"
+ base_icon_state = "darkcorner"
+ floor_tile = /obj/item/stack/tile/iron/dark_corner
+
+/turf/open/floor/iron/checker
+ icon_state = "checker"
+ base_icon_state = "checker"
+ floor_tile = /obj/item/stack/tile/iron/checker
+
+/turf/open/floor/iron/dark/textured
+ icon_state = "textured_dark"
+ base_icon_state = "textured_dark"
+ floor_tile = /obj/item/stack/tile/iron/dark/textured
+
+/turf/open/floor/iron/dark/textured_edge
+ icon_state = "textured_dark_edge"
+ base_icon_state = "textured_dark_edge"
+ floor_tile = /obj/item/stack/tile/iron/dark/textured_edge
+
+/turf/open/floor/iron/dark/textured_half
+ icon_state = "textured_dark_half"
+ base_icon_state = "textured_dark_half"
+ floor_tile = /obj/item/stack/tile/iron/dark/textured_half
+
+/turf/open/floor/iron/dark/textured_corner
+ icon_state = "textured_dark_corner"
+ base_icon_state = "textured_dark_corner"
+ floor_tile = /obj/item/stack/tile/iron/dark/textured_corner
+
+/turf/open/floor/iron/dark/textured_large
+ icon_state = "textured_dark_large"
+ base_icon_state = "textured_dark_large"
+ floor_tile = /obj/item/stack/tile/iron/dark/textured_large
+
+/turf/open/floor/iron/dark/airless
+ initial_gas_mix = AIRLESS_ATMOS
+
+/turf/open/floor/iron/dark/telecomms
+ initial_gas_mix = TCOMMS_ATMOS
+
+/turf/open/floor/iron/dark/side/airless
+ initial_gas_mix = AIRLESS_ATMOS
+
+/turf/open/floor/iron/dark/corner/airless
+ initial_gas_mix = AIRLESS_ATMOS
+
+/turf/open/floor/iron/checker/airless
+ initial_gas_mix = AIRLESS_ATMOS
+
+/turf/open/floor/iron/white
+ icon_state = "white"
+ base_icon_state = "white"
+ floor_tile = /obj/item/stack/tile/iron/white
+
+/turf/open/floor/iron/white/smooth_edge
+ icon_state = "white_edge"
+ base_icon_state = "white_edge"
+ floor_tile = /obj/item/stack/tile/iron/white/smooth_edge
+
+/turf/open/floor/iron/white/smooth_half
+ icon_state = "white_half"
+ base_icon_state = "white_half"
+ floor_tile = /obj/item/stack/tile/iron/white/smooth_half
+
+/turf/open/floor/iron/white/smooth_corner
+ icon_state = "white_corner"
+ base_icon_state = "white_corner"
+ floor_tile = /obj/item/stack/tile/iron/white/smooth_corner
+
+/turf/open/floor/iron/white/smooth_large
+ icon_state = "white_large"
+ base_icon_state = "white_large"
+ floor_tile = /obj/item/stack/tile/iron/white/smooth_large
+
+/turf/open/floor/iron/white/side
+ icon_state = "whitehall"
+ base_icon_state = "whitehall"
+ floor_tile = /obj/item/stack/tile/iron/white_side
+
+/turf/open/floor/iron/white/corner
+ icon_state = "whitecorner"
+ base_icon_state = "whitecorner"
+ floor_tile = /obj/item/stack/tile/iron/white_corner
+
+/turf/open/floor/iron/cafeteria
+ icon_state = "cafeteria"
+ base_icon_state = "cafeteria"
+ floor_tile = /obj/item/stack/tile/iron/cafeteria
+
+/turf/open/floor/iron/white/textured
+ icon_state = "textured_white"
+ base_icon_state = "textured_white"
+ floor_tile = /obj/item/stack/tile/iron/white/textured
+
+/turf/open/floor/iron/white/textured_edge
+ icon_state = "textured_white_edge"
+ base_icon_state = "textured_white_edge"
+ floor_tile = /obj/item/stack/tile/iron/white/textured_edge
+
+/turf/open/floor/iron/white/textured_half
+ icon_state = "textured_white_half"
+ base_icon_state = "textured_white_half"
+ floor_tile = /obj/item/stack/tile/iron/white/textured_half
+
+/turf/open/floor/iron/white/textured_corner
+ icon_state = "textured_white_corner"
+ base_icon_state = "textured_white_corner"
+ floor_tile = /obj/item/stack/tile/iron/white/textured_corner
+
+/turf/open/floor/iron/white/textured_large
+ icon_state = "textured_white_large"
+ base_icon_state = "textured_white_large"
+ floor_tile = /obj/item/stack/tile/iron/white/textured_large
+
+/turf/open/floor/iron/white/airless
+ initial_gas_mix = AIRLESS_ATMOS
+
+/turf/open/floor/iron/white/telecomms
+ initial_gas_mix = TCOMMS_ATMOS
+
+/turf/open/floor/iron/white/side/airless
+ initial_gas_mix = AIRLESS_ATMOS
+
+/turf/open/floor/iron/white/corner/airless
+ initial_gas_mix = AIRLESS_ATMOS
+
+/turf/open/floor/iron/cafeteria/airless
+ initial_gas_mix = AIRLESS_ATMOS
+
+
+/turf/open/floor/iron/recharge_floor
+ icon_state = "recharge_floor"
+ base_icon_state = "recharge_floor"
+ floor_tile = /obj/item/stack/tile/iron/recharge_floor
+
+/turf/open/floor/iron/recharge_floor/asteroid
+ icon_state = "recharge_floor_asteroid"
+ base_icon_state = "recharge_floor_asteroid"
+
+/turf/open/floor/iron/smooth
+ icon_state = "smooth"
+ base_icon_state = "smooth"
+ floor_tile = /obj/item/stack/tile/iron/smooth
+
+/turf/open/floor/iron/smooth_edge
+ icon_state = "smooth_edge"
+ base_icon_state = "smooth_edge"
+ floor_tile = /obj/item/stack/tile/iron/smooth_edge
+
+/turf/open/floor/iron/smooth_half
+ icon_state = "smooth_half"
+ base_icon_state = "smooth_half"
+ floor_tile = /obj/item/stack/tile/iron/smooth_half
+
+/turf/open/floor/iron/smooth_corner
+ icon_state = "smooth_corner"
+ base_icon_state = "smooth_corner"
+ floor_tile = /obj/item/stack/tile/iron/smooth_corner
+
+/turf/open/floor/iron/smooth_large
+ icon_state = "smooth_large"
+ base_icon_state = "smooth_large"
+ floor_tile = /obj/item/stack/tile/iron/smooth_large
+
+/turf/open/floor/iron/chapel
+ icon_state = "chapel"
+ base_icon_state = "chapel"
+ floor_tile = /obj/item/stack/tile/iron/chapel
+
+/turf/open/floor/iron/showroomfloor
+ icon_state = "showroomfloor"
+ base_icon_state = "showroomfloor"
+ floor_tile = /obj/item/stack/tile/iron/showroomfloor
+
+/turf/open/floor/iron/showroomfloor/airless
+ initial_gas_mix = AIRLESS_ATMOS
+
+/turf/open/floor/iron/solarpanel
+ icon_state = "solarpanel"
+ base_icon_state = "solarpanel"
+ floor_tile = /obj/item/stack/tile/iron/solarpanel
+
+/turf/open/floor/iron/solarpanel/airless
+ initial_gas_mix = AIRLESS_ATMOS
+
+
+/turf/open/floor/iron/freezer
+ icon_state = "freezerfloor"
+ base_icon_state = "freezerfloor"
+ floor_tile = /obj/item/stack/tile/iron/freezer
+
+/turf/open/floor/iron/freezer/airless
+ initial_gas_mix = AIRLESS_ATMOS
+
+/turf/open/floor/iron/kitchen_coldroom
+ name = "cold room floor"
+
+/turf/open/floor/iron/kitchen_coldroom/Initialize(mapload)
+ initial_gas_mix = KITCHEN_COLDROOM_ATMOS
+ return ..()
+
+/turf/open/floor/iron/kitchen_coldroom/freezerfloor
+ icon_state = "freezerfloor"
+ base_icon_state = "freezerfloor"
+ floor_tile = /obj/item/stack/tile/iron/freezer
+
+/turf/open/floor/iron/grimy
+ icon_state = "grimy"
+ base_icon_state = "grimy"
+ tiled_dirt = FALSE
+ floor_tile = /obj/item/stack/tile/iron/grimy
+
+
+/turf/open/floor/cult
+ name = "engraved floor"
+ icon_state = "cult"
+ base_icon_state = "cult"
+
+/turf/open/floor/iron/vaporwave
+ icon_state = "pinkblack"
+ base_icon_state = "pinkblack"
+
+/turf/open/floor/iron/goonplaque
+ name = "commemorative plaque"
+ desc = "\"This is a plaque in honour of our comrades on the G4407 Stations. Hopefully TG4407 model can live up to your fame and fortune.\" Scratched in beneath that is a crude image of a meteor and a spaceman. The spaceman is laughing. The meteor is exploding."
+ icon_state = "plaque"
+ base_icon_state = "plaque"
+ tiled_dirt = FALSE
+ floor_tile = /obj/item/stack/tile/iron/goonplaque
+
+/turf/open/floor/iron/goonplaque/fland
+ desc = "\"This plaque commemorates all the effort that has been put by the construction workers of this station, their department experts advisors, and the many roaming spacemans, that took the effort to walk around this station discovering anomalies that has been found during it's construction. This is a heartfelt thanks from the head developer of this station, hoping that the station will last for as long as possible.\" Beneath the text, you see engraved on the plaque a weird orb like being with a propeller on his head and a smile on it's face."
+
+/turf/open/floor/iron/stairs
+ icon_state = "stairs"
+ base_icon_state = "stairs"
+ tiled_dirt = FALSE
+
+/turf/open/floor/iron/stairs/left
+ icon_state = "stairs-l"
+ base_icon_state = "stairs-l"
+
+/turf/open/floor/iron/stairs/medium
+ icon_state = "stairs-m"
+ base_icon_state = "stairs-m"
+
+/turf/open/floor/iron/stairs/right
+ icon_state = "stairs-r"
+ base_icon_state = "stairs-r"
+
+/turf/open/floor/iron/stairs/old
+ icon_state = "stairs-old"
+ base_icon_state = "stairs-old"
+
+/turf/open/floor/iron/bluespace
+ icon_state = "bluespace"
+ base_icon_state = "bluespace"
+ desc = "Sadly, these don't seem to make you faster..."
+ floor_tile = /obj/item/stack/tile/iron/bluespace
+
+/turf/open/floor/iron/sepia
+ icon_state = "sepia"
+ base_icon_state = "sepia"
+ desc = "Well, the flow of time is normal on these tiles, weird."
+ floor_tile = /obj/item/stack/tile/iron/sepia
+
+/turf/open/floor/iron/yellowsiding
+ icon_state = "yellowsiding"
+ base_icon_state = "yellowsiding"
+
+/turf/open/floor/iron/yellowsiding/corner
+ icon_state = "yellowcornersiding"
+ base_icon_state = "yellowcornersiding"
+
+/turf/open/floor/iron/tech
+ icon_state = "techfloor_grey"
+ base_icon_state = "techfloor_grey"
+ floor_tile = /obj/item/stack/tile/
+
+/turf/open/floor/iron/tech/grid
+ icon_state = "techfloor_grid"
+ base_icon_state = "techfloor_grid"
+ floor_tile = /obj/item/stack/tile/
+
+/turf/open/floor/iron/techmaint
+ icon_state = "techmaint"
+ base_icon_state = "techmaint"
+ floor_tile = /obj/item/stack/tile/
+
+/turf/open/floor/iron/techmaint/planetary
+ baseturfs = /turf/open/floor/plating/asteroid
+ planetary_atmos = TRUE
+
+/turf/open/floor/iron/ridged
+ icon_state = "ridged"
+ base_icon_state = "ridged"
+ floor_tile = /obj/item/stack/tile/ridge
+
+/turf/open/floor/iron/ridged/steel
+ icon_state = "steel_ridged"
+ base_icon_state = "steel_ridged"
+
+/turf/open/floor/iron/grid
+ icon_state = "grid"
+ base_icon_state = "grid"
+ floor_tile = /obj/item/stack/tile/grid
+
+/turf/open/floor/iron/grid/steel
+ icon_state = "steel_grid"
+ base_icon_state = "steel_grid"
+
+/turf/open/floor/iron/ameridiner
+ icon_state = "ameridiner_kitchen"
+ base_icon_state = "ameridiner_kitchen"
+
+/turf/open/floor/iron/tiled
+ icon_state = "tiled"
+ base_icon_state = "tiled"
+/turf/open/floor/iron/tiled/light
+ icon_state = "tiled_light"
+ base_icon_state = "tiled_light"
+
+/turf/open/floor/iron/tech
+ icon_state = "techfloor_grey"
+ base_icon_state = "techfloor_grey"
+ floor_tile = /obj/item/stack/tile/techgrey
+
+/turf/open/floor/iron/tech/grid
+ icon_state = "techfloor_grid"
+ base_icon_state = "techfloor_grid"
+ floor_tile = /obj/item/stack/tile/techgrid
+
+/turf/open/floor/iron/techmaint
+ icon_state = "techmaint"
+ base_icon_state = "techmaint"
+ floor_tile = /obj/item/stack/tile/techmaint
+
+/turf/open/floor/iron/cafeteria_red
+ icon_state = "cafeteria_red"
+ base_icon_state = "cafeteria_red"
+
+/turf/open/floor/iron/greyish
+ icon_state = "floor_light"
+
+/turf/open/floor/iron/cafeteria_dark
+ icon_state = "cafeteria_dark"
+ base_icon_state = "cafeteria_dark"
+
+/turf/open/floor/iron/smart_checker
+ icon_state = "smart_checker"
+ base_icon_state = "smart_checker"
diff --git a/code/game/turfs/open/floor/mineral_floor.dm b/code/game/turfs/open/floor/mineral_floor.dm
index e17c257752676..92b06f0bae1cc 100644
--- a/code/game/turfs/open/floor/mineral_floor.dm
+++ b/code/game/turfs/open/floor/mineral_floor.dm
@@ -126,40 +126,41 @@
/turf/open/floor/mineral/titanium/purple/airless
initial_gas_mix = AIRLESS_ATMOS
-/turf/open/floor/mineral/titanium/alt
+// OLD TITANIUM
+/turf/open/floor/mineral/titanium/tiled
name = "titanium floor"
- icon_state = "titanium_alt"
- floor_tile = /obj/item/stack/tile/mineral/titanium/alt
+ icon_state = "titanium_tiled"
+ floor_tile = /obj/item/stack/tile/mineral/titanium/tiled
-/turf/open/floor/mineral/titanium/alt/airless
+/turf/open/floor/mineral/titanium/tiled/airless
initial_gas_mix = AIRLESS_ATMOS
-/turf/open/floor/mineral/titanium/alt/yellow
- icon_state = "titanium_yellow_alt"
- floor_tile = /obj/item/stack/tile/mineral/titanium/alt/yellow
+/turf/open/floor/mineral/titanium/tiled/yellow
+ icon_state = "titanium_tiled_yellow"
+ floor_tile = /obj/item/stack/tile/mineral/titanium/tiled/yellow
-/turf/open/floor/mineral/titanium/alt/yellow/airless
+/turf/open/floor/mineral/titanium/tiled/yellow/airless
initial_gas_mix = AIRLESS_ATMOS
-/turf/open/floor/mineral/titanium/alt/blue
- icon_state = "titanium_blue_alt"
- floor_tile = /obj/item/stack/tile/mineral/titanium/alt/blue
+/turf/open/floor/mineral/titanium/tiled/blue
+ icon_state = "titanium_tiled_blue"
+ floor_tile = /obj/item/stack/tile/mineral/titanium/tiled/blue
-/turf/open/floor/mineral/titanium/alt/blue/airless
+/turf/open/floor/mineral/titanium/tiled/blue/airless
initial_gas_mix = AIRLESS_ATMOS
-/turf/open/floor/mineral/titanium/alt/white
- icon_state = "titanium_white_alt"
- floor_tile = /obj/item/stack/tile/mineral/titanium/alt/white
+/turf/open/floor/mineral/titanium/tiled/white
+ icon_state = "titanium_tiled_white"
+ floor_tile = /obj/item/stack/tile/mineral/titanium/tiled/white
-/turf/open/floor/mineral/titanium/alt/white/airless
+/turf/open/floor/mineral/titanium/tiled/white/airless
initial_gas_mix = AIRLESS_ATMOS
-/turf/open/floor/mineral/titanium/alt/purple
- icon_state = "titanium_purple_alt"
- floor_tile = /obj/item/stack/tile/mineral/titanium/alt/purple
+/turf/open/floor/mineral/titanium/tiled/purple
+ icon_state = "titanium_tiled_purple"
+ floor_tile = /obj/item/stack/tile/mineral/titanium/tiled/purple
-/turf/open/floor/mineral/titanium/alt/purple/airless
+/turf/open/floor/mineral/titanium/tiled/purple/airless
initial_gas_mix = AIRLESS_ATMOS
//PLASTITANIUM (syndieshuttle)
@@ -173,6 +174,7 @@
/turf/open/floor/mineral/plastitanium/red
icon_state = "plastitanium_red"
+ floor_tile = /obj/item/stack/tile/mineral/plastitanium/red
/turf/open/floor/mineral/plastitanium/red/airless
initial_gas_mix = AIRLESS_ATMOS
diff --git a/code/game/turfs/open/floor/misc_floor.dm b/code/game/turfs/open/floor/misc_floor.dm
index 8564fd9c6c0f5..b585e991efe40 100644
--- a/code/game/turfs/open/floor/misc_floor.dm
+++ b/code/game/turfs/open/floor/misc_floor.dm
@@ -1,21 +1,3 @@
-/turf/open/floor/goonplaque
- name = "commemorative plaque"
- icon_state = "plaque"
- desc = "\"This is a plaque in honour of our comrades on the G4407 Stations. Hopefully TG4407 model can live up to your fame and fortune.\" Scratched in beneath that is a crude image of a meteor and a spaceman. The spaceman is laughing. The meteor is exploding."
- floor_tile = /obj/item/stack/tile/iron
- tiled_dirt = FALSE
-
-/turf/open/floor/goonplaque/fland
- name = "commemorative plaque"
- icon_state = "plaque"
- desc = "\"This plaque commemorates all the effort that has been put by the construction workers of this station, their department experts advisors, and the many roaming spacemans, that took the effort to walk around this station discovering anomalies that has been found during it's construction. This is a heartfelt thanks from the head developer of this station, hoping that the station will last for as long as possible.\" Beneath the text, you see engraved on the plaque a weird orb like being with a propeller on his head and a smile on it's face."
- floor_tile = /obj/item/stack/tile/iron
- tiled_dirt = FALSE
-
-/turf/open/floor/vault
- icon_state = "rockvault"
- floor_tile = /obj/item/stack/tile/iron
-
//Circuit flooring, glows a little
/turf/open/floor/circuit
icon = 'icons/turf/floors.dmi'
@@ -165,7 +147,7 @@
/turf/open/floor/oldshuttle
icon = 'icons/turf/shuttleold.dmi'
icon_state = "floor"
- floor_tile = /obj/item/stack/tile/iron
+ floor_tile = /obj/item/stack/tile/iron/base
/turf/open/floor/bluespace
slowdown = -1
@@ -188,10 +170,21 @@
/turf/open/floor/bronze
name = "bronze floor"
desc = "Some heavy bronze tiles."
- icon = 'icons/obj/clockwork_objects.dmi'
icon_state = "clockwork_floor"
floor_tile = /obj/item/stack/sheet/bronze
+/turf/open/floor/bronze/flat
+ icon_state = "reebe"
+ floor_tile = /obj/item/stack/tile/mineral/bronze/flat
+
+/turf/open/floor/bronze/filled
+ icon = 'icons/obj/clockwork_objects.dmi'
+ floor_tile = /obj/item/stack/tile/mineral/bronze/filled
+
+/turf/open/floor/bronze/filled/lavaland
+ planetary_atmos = TRUE
+ initial_gas_mix = LAVALAND_DEFAULT_ATMOS
+
/turf/open/floor/white
name = "white floor"
desc = "A tile in a pure white color."
@@ -234,3 +227,34 @@
/turf/open/floor/plating/rust/ComponentInitialize()
. = ..()
AddElement(/datum/element/rust)
+
+/turf/open/floor/vault
+ name = "strange floor"
+ desc = "You feel a strange nostalgia from looking at this..."
+ icon_state = "rockvault"
+ base_icon_state = "rockvault"
+
+/turf/open/floor/vault/rock
+ name = "rocky floor"
+
+/turf/open/floor/vault/alien
+ name = "alien floor"
+ icon_state = "alienvault"
+ base_icon_state = "alienvault"
+
+/turf/open/floor/vault/sandstone
+ name = "sandstone floor"
+ icon_state = "sandstonevault"
+ base_icon_state = "sandstonevault"
+
+/turf/open/floor/cult
+ name = "engraved floor"
+ icon_state = "cult"
+ base_icon_state = "cult"
+ floor_tile = /obj/item/stack/tile/cult
+
+/turf/open/floor/cult/narsie_act()
+ return
+
+/turf/open/floor/cult/airless
+ initial_gas_mix = AIRLESS_ATMOS
diff --git a/code/game/turfs/open/floor/plasteel_floor.dm b/code/game/turfs/open/floor/plasteel_floor.dm
deleted file mode 100644
index abfea12bbace3..0000000000000
--- a/code/game/turfs/open/floor/plasteel_floor.dm
+++ /dev/null
@@ -1,285 +0,0 @@
-/turf/open/floor/iron
- icon_state = "floor"
- floor_tile = /obj/item/stack/tile/iron
-
-/turf/open/floor/iron/get_turf_texture()
- return GLOB.turf_texture_plasteel
-
-/turf/open/floor/iron/examine(mob/user)
- . = ..()
- . += "There's a small crack on the edge of it."
-
-
-/turf/open/floor/iron/rust_heretic_act()
- if(prob(70))
- new /obj/effect/temp_visual/glowing_rune(src)
- var/atom/changed_turf = ChangeTurf(/turf/open/floor/plating)
- changed_turf.AddElement(/datum/element/rust)
- return TRUE
-
-/turf/open/floor/iron/update_icon_state()
- if(broken || burnt)
- return
- icon_state = base_icon_state
- return ..()
-
-/turf/open/floor/iron/airless
- initial_gas_mix = AIRLESS_ATMOS
-
-/turf/open/floor/iron/telecomms
- initial_gas_mix = TCOMMS_ATMOS
-
-/turf/open/floor/iron/dark
- icon_state = "darkfull"
- base_icon_state = "darkfull"
-
-/turf/open/floor/iron/dark/airless
- initial_gas_mix = AIRLESS_ATMOS
-
-/turf/open/floor/iron/dark/telecomms
- initial_gas_mix = TCOMMS_ATMOS
-
-/turf/open/floor/iron/airless/dark
- icon_state = "darkfull"
- base_icon_state = "darkfull"
-
-/turf/open/floor/iron/dark/side
- icon_state = "dark"
- base_icon_state = "dark"
-
-/turf/open/floor/iron/dark/corner
- icon_state = "darkcorner"
- base_icon_state = "darkcorner"
-
-/turf/open/floor/iron/checker
- icon_state = "checker"
- base_icon_state = "checker"
-
-
-/turf/open/floor/iron/white
- icon_state = "white"
- base_icon_state = "white"
-
-/turf/open/floor/iron/white/side
- icon_state = "whitehall"
- base_icon_state = "whitehall"
-
-/turf/open/floor/iron/white/corner
- icon_state = "whitecorner"
- base_icon_state = "whitecorner"
-
-/turf/open/floor/iron/airless/white
- icon_state = "white"
- base_icon_state = "white"
-
-/turf/open/floor/iron/airless/white/side
- icon_state = "whitehall"
- base_icon_state = "whitehall"
-
-/turf/open/floor/iron/airless/white/corner
- icon_state = "whitecorner"
- base_icon_state = "whitecorner"
-
-/turf/open/floor/iron/white/telecomms
- initial_gas_mix = TCOMMS_ATMOS
-
-
-/turf/open/floor/iron/yellowsiding
- icon_state = "yellowsiding"
- base_icon_state = "yellowsiding"
-
-/turf/open/floor/iron/yellowsiding/corner
- icon_state = "yellowcornersiding"
- base_icon_state = "yellowcornersiding"
-
-
-/turf/open/floor/iron/recharge_floor
- icon_state = "recharge_floor"
- base_icon_state = "recharge_floor"
-
-/turf/open/floor/iron/recharge_floor/asteroid
- icon_state = "recharge_floor_asteroid"
- base_icon_state = "recharge_floor_asteroid"
-
-
-/turf/open/floor/iron/chapel
- icon_state = "chapel"
- base_icon_state = "chapel"
-
-/turf/open/floor/iron/showroomfloor
- icon_state = "showroomfloor"
- base_icon_state = "showroomfloor"
-
-
-/turf/open/floor/iron/solarpanel
- icon_state = "solarpanel"
- base_icon_state = "solarpanel"
-
-/turf/open/floor/iron/airless/solarpanel
- icon_state = "solarpanel"
- base_icon_state = "solarpanel"
-
-
-/turf/open/floor/iron/freezer
- icon_state = "freezerfloor"
- base_icon_state = "freezerfloor"
-
-/turf/open/floor/iron/freezer/airless
- initial_gas_mix = AIRLESS_ATMOS
-
-/turf/open/floor/iron/cafeteria
- icon_state = "cafeteria"
- base_icon_state = "cafeteria"
-
-/turf/open/floor/iron/airless/cafeteria
- icon_state = "cafeteria"
- base_icon_state = "cafeteria"
-
-
-/turf/open/floor/iron/cult
- name = "engraved floor"
- icon_state = "cult"
- base_icon_state = "cult"
-
-/turf/open/floor/iron/vaporwave
- icon_state = "pinkblack"
- base_icon_state = "pinkblack"
-
-/turf/open/floor/iron/goonplaque
- name = "commemorative plaque"
- desc = "\"This is a plaque in honour of our comrades on the G4407 Stations. Hopefully TG4407 model can live up to your fame and fortune.\" Scratched in beneath that is a crude image of a meteor and a spaceman. The spaceman is laughing. The meteor is exploding."
- icon_state = "plaque"
- base_icon_state = "plaque"
- tiled_dirt = FALSE
-
-/turf/open/floor/iron/cult/narsie_act()
- return
-
-/turf/open/floor/iron/cult/airless
- initial_gas_mix = AIRLESS_ATMOS
-
-
-/turf/open/floor/iron/stairs
- icon_state = "stairs"
- base_icon_state = "stairs"
- tiled_dirt = FALSE
-
-/turf/open/floor/iron/stairs/left
- icon_state = "stairs-l"
- base_icon_state = "stairs-l"
-
-/turf/open/floor/iron/stairs/medium
- icon_state = "stairs-m"
- base_icon_state = "stairs-m"
-
-/turf/open/floor/iron/stairs/right
- icon_state = "stairs-r"
- base_icon_state = "stairs-r"
-
-/turf/open/floor/iron/stairs/old
- icon_state = "stairs-old"
- base_icon_state = "stairs-old"
-
-
-/turf/open/floor/iron/rockvault
- icon_state = "rockvault"
- base_icon_state = "rockvault"
-
-/turf/open/floor/iron/rockvault/alien
- icon_state = "alienvault"
- base_icon_state = "alienvault"
-
-/turf/open/floor/iron/rockvault/sandstone
- icon_state = "sandstonevault"
- base_icon_state = "sandstonevault"
-
-
-/turf/open/floor/iron/elevatorshaft
- icon_state = "elevatorshaft"
- base_icon_state = "elevatorshaft"
-
-/turf/open/floor/iron/bluespace
- icon_state = "bluespace"
- base_icon_state = "bluespace"
-
-/turf/open/floor/iron/sepia
- icon_state = "sepia"
- base_icon_state = "sepia"
-
-/turf/open/floor/iron/tech
- icon_state = "techfloor_grey"
- base_icon_state = "techfloor_grey"
- floor_tile = /obj/item/stack/tile/
-
-/turf/open/floor/iron/tech/grid
- icon_state = "techfloor_grid"
- base_icon_state = "techfloor_grid"
- floor_tile = /obj/item/stack/tile/
-
-/turf/open/floor/iron/techmaint
- icon_state = "techmaint"
- base_icon_state = "techmaint"
- floor_tile = /obj/item/stack/tile/
-
-/turf/open/floor/iron/techmaint/planetary
- baseturfs = /turf/open/floor/plating/asteroid
- planetary_atmos = TRUE
-
-/turf/open/floor/iron/ridged
- icon_state = "ridged"
- base_icon_state = "ridged"
- floor_tile = /obj/item/stack/tile/ridge
-
-/turf/open/floor/iron/ridged/steel
- icon_state = "steel_ridged"
- base_icon_state = "steel_ridged"
-
-/turf/open/floor/iron/grid
- icon_state = "grid"
- base_icon_state = "grid"
- floor_tile = /obj/item/stack/tile/grid
-
-/turf/open/floor/iron/grid/steel
- icon_state = "steel_grid"
- base_icon_state = "steel_grid"
-
-/turf/open/floor/iron/ameridiner
- icon_state = "ameridiner_kitchen"
- base_icon_state = "ameridiner_kitchen"
-
-/turf/open/floor/iron/tiled
- icon_state = "tiled"
- base_icon_state = "tiled"
-/turf/open/floor/iron/tiled/light
- icon_state = "tiled_light"
- base_icon_state = "tiled_light"
-
-/turf/open/floor/iron/tech
- icon_state = "techfloor_grey"
- base_icon_state = "techfloor_grey"
- floor_tile = /obj/item/stack/tile/techgrey
-
-/turf/open/floor/iron/tech/grid
- icon_state = "techfloor_grid"
- base_icon_state = "techfloor_grid"
- floor_tile = /obj/item/stack/tile/techgrid
-
-/turf/open/floor/iron/techmaint
- icon_state = "techmaint"
- base_icon_state = "techmaint"
- floor_tile = /obj/item/stack/tile/techmaint
-
-/turf/open/floor/iron/cafeteria_red
- icon_state = "cafeteria_red"
- base_icon_state = "cafeteria_red"
-
-/turf/open/floor/iron/greyish
- icon_state = "floor_light"
-
-/turf/open/floor/iron/cafeteria_dark
- icon_state = "cafeteria_dark"
- base_icon_state = "cafeteria_dark"
-
-/turf/open/floor/iron/smart_checker
- icon_state = "smart_checker"
- base_icon_state = "smart_checker"
diff --git a/code/game/turfs/open/floor/plating/misc_plating.dm b/code/game/turfs/open/floor/plating/misc_plating.dm
index d62e9663499e6..821f628207fcc 100644
--- a/code/game/turfs/open/floor/plating/misc_plating.dm
+++ b/code/game/turfs/open/floor/plating/misc_plating.dm
@@ -404,3 +404,7 @@
/turf/open/floor/plating/snowed/temperatre
initial_temperature = 255.37
+/turf/open/floor/plating/elevatorshaft
+ name = "elevator shaft"
+ icon_state = "elevatorshaft"
+ base_icon_state = "elevatorshaft"
diff --git a/code/modules/antagonists/clock_cult/enchantments/antimagic.dm b/code/modules/antagonists/clock_cult/enchantments/antimagic.dm
index 677219cd32797..13a6bdff7ec82 100644
--- a/code/modules/antagonists/clock_cult/enchantments/antimagic.dm
+++ b/code/modules/antagonists/clock_cult/enchantments/antimagic.dm
@@ -3,4 +3,4 @@
/datum/component/enchantment/anti_magic/apply_effect(obj/item/target)
examine_description = "It has been blessed with the gift of magic protection, preventing all magic from affecting the wielder."
- target.AddComponent(/datum/component/anti_magic, TRUE, TRUE)
+ target.AddComponent(/datum/component/anti_magic, INNATE_TRAIT, TRUE, TRUE)
diff --git a/code/modules/antagonists/cult/blood_magic.dm b/code/modules/antagonists/cult/blood_magic.dm
index 40c508c539c26..c28d4f4d26fae 100644
--- a/code/modules/antagonists/cult/blood_magic.dm
+++ b/code/modules/antagonists/cult/blood_magic.dm
@@ -449,6 +449,9 @@
C.stuttering += 15
C.cultslurring += 15
C.Jitter(15)
+ // EMP the radio on your ears
+ if (C.ears)
+ C.ears.emp_act(EMP_LIGHT)
else
target.visible_message("You fail to corrupt [L]'s mind!", \
"Your mindshield protects you from the heresy of [user]!")
diff --git a/code/modules/antagonists/cult/cult.dm b/code/modules/antagonists/cult/cult.dm
index 1153b94a20028..692dfd9c2cdd8 100644
--- a/code/modules/antagonists/cult/cult.dm
+++ b/code/modules/antagonists/cult/cult.dm
@@ -69,6 +69,7 @@
if(cult_team.blood_target && cult_team.blood_target_image && current.client)
current.client.images += cult_team.blood_target_image
+ current.update_alt_appearances()
/datum/antagonist/cult/proc/equip_cultist(metal=TRUE)
var/mob/living/carbon/C = owner.current
@@ -175,6 +176,7 @@
owner.current.log_message("has renounced the cult of Nar'Sie!", LOG_ATTACK, color="#960000")
if(cult_team.blood_target && cult_team.blood_target_image && owner.current.client)
owner.current.client.images -= cult_team.blood_target_image
+ owner.current.update_alt_appearances()
. = ..()
/datum/antagonist/cult/admin_add(datum/mind/new_owner,mob/admin)
diff --git a/code/modules/antagonists/cult/cult_items.dm b/code/modules/antagonists/cult/cult_items.dm
index fba19c09f8529..800a3a2d1a02b 100644
--- a/code/modules/antagonists/cult/cult_items.dm
+++ b/code/modules/antagonists/cult/cult_items.dm
@@ -52,10 +52,12 @@ Striking a noncultist, however, will tear their flesh."}
block_level = 1
block_upgrade_walk = 1
block_flags = BLOCKING_ACTIVE | BLOCKING_NASTY
- force = 30
throwforce = 10
hitsound = 'sound/weapons/bladeslice.ogg'
attack_verb = list("attacked", "slashed", "stabbed", "sliced", "tore", "ripped", "diced", "rended")
+ force = 23
+ /// Force dealt to people that have holy protection, including from holding bibles
+ var/holy_force = 16
/obj/item/melee/cultblade/Initialize(mapload)
. = ..()
@@ -67,6 +69,10 @@ Striking a noncultist, however, will tear their flesh."}
"Your arm throbs and your brain hurts!")
user.adjustStaminaLoss(rand(force/2,force))
user.adjustOrganLoss(ORGAN_SLOT_BRAIN, rand(force/10,force/2))
+ if (target.anti_magic_check(magic = FALSE, holy = TRUE))
+ force = 15
+ else
+ force = 22
..()
/obj/item/melee/cultblade/ghost
@@ -84,124 +90,6 @@ Striking a noncultist, however, will tear their flesh."}
if(!iscultist(user))
to_chat(user, "\"I wouldn't advise that.\"")
-/obj/item/cult_bastard
- name = "bloody bastard sword"
- desc = "An enormous sword used by Nar'Sien cultists to rapidly harvest the souls of non-believers."
- w_class = WEIGHT_CLASS_HUGE
- attack_weight = 2
- block_level = 1
- block_upgrade_walk = 1
- block_power = 50
- block_flags = BLOCKING_ACTIVE | BLOCKING_NASTY | BLOCKING_PROJECTILE
- throwforce = 20
- force = 35
- armour_penetration = 45
- throw_speed = 1
- throw_range = 3
- sharpness = IS_SHARP
- light_color = "#ff0000"
- light_system = MOVABLE_LIGHT
- light_range = 4
- attack_verb = list("cleaved", "slashed", "tore", "hacked", "ripped", "diced", "carved")
- icon_state = "cultbastard"
- item_state = "cultbastard"
- hitsound = 'sound/weapons/bladeslice.ogg'
- lefthand_file = 'icons/mob/inhands/64x64_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/64x64_righthand.dmi'
- inhand_x_dimension = 64
- inhand_y_dimension = 64
- actions_types = list()
- item_flags = SLOWS_WHILE_IN_HAND | ISWEAPON
- var/datum/action/innate/dash/cult/jaunt
- var/datum/action/innate/cult/spin2win/linked_action
- var/spinning = FALSE
- var/spin_cooldown = 250
- var/dash_toggled = TRUE
-
-/obj/item/cult_bastard/Initialize(mapload)
- . = ..()
- jaunt = new(src)
- linked_action = new(src)
- AddComponent(/datum/component/butchering, 50, 80)
- AddComponent(/datum/component/two_handed, require_twohands=TRUE)
-
-/obj/item/cult_bastard/Destroy()
- QDEL_NULL(jaunt)
- QDEL_NULL(linked_action)
- return ..()
-
-/obj/item/cult_bastard/examine(mob/user)
- . = ..()
- if(contents.len)
- . += "There are [contents.len] souls trapped within the sword's core."
- else
- . += "The sword appears to be quite lifeless."
-
-/obj/item/cult_bastard/can_be_pulled(user)
- return FALSE
-
-/obj/item/cult_bastard/attack_self(mob/user)
- dash_toggled = !dash_toggled
- if(dash_toggled)
- to_chat(loc, "You raise [src] and prepare to jaunt with it.")
- else
- to_chat(loc, "You lower [src] and prepare to swing it normally.")
-
-/obj/item/cult_bastard/pickup(mob/living/user)
- ..()
- if(!iscultist(user))
- to_chat(user, "\"I wouldn't advise that.\"")
- force = 5
- return
- force = initial(force)
- jaunt.Grant(user, src)
- linked_action.Grant(user, src)
- user.update_icons()
-
-/obj/item/cult_bastard/dropped(mob/user)
- ..()
- linked_action.Remove(user)
- jaunt.Remove(user)
- user.update_icons()
-
-/obj/item/cult_bastard/IsReflect()
- if(spinning)
- playsound(src, pick('sound/weapons/effects/ric1.ogg', 'sound/weapons/effects/ric2.ogg', 'sound/weapons/effects/ric3.ogg', 'sound/weapons/effects/ric4.ogg', 'sound/weapons/effects/ric5.ogg'), 100, TRUE)
- return TRUE
- else
- ..()
-
-/obj/item/cult_bastard/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK)
- if(prob(final_block_chance))
- if(attack_type == PROJECTILE_ATTACK)
- owner.visible_message("[owner] deflects [attack_text] with [src]!")
- playsound(src, pick('sound/weapons/effects/ric1.ogg', 'sound/weapons/effects/ric2.ogg', 'sound/weapons/effects/ric3.ogg', 'sound/weapons/effects/ric4.ogg', 'sound/weapons/effects/ric5.ogg'), 100, 1)
- return TRUE
- else
- playsound(src, 'sound/weapons/parry.ogg', 75, 1)
- owner.visible_message("[owner] parries [attack_text] with [src]!")
- return TRUE
- return FALSE
-
-/obj/item/cult_bastard/afterattack(atom/target, mob/user, proximity, click_parameters)
- . = ..()
- if(dash_toggled && !proximity)
- jaunt.Teleport(user, target)
- return
- if(proximity)
- if(ishuman(target))
- var/mob/living/carbon/human/H = target
- if(H.stat != CONSCIOUS)
- var/obj/item/soulstone/SS = new /obj/item/soulstone(src)
- SS.attack(H, user)
- if(!LAZYLEN(SS.contents))
- qdel(SS)
- if(istype(target, /obj/structure/constructshell) && contents.len)
- var/obj/item/soulstone/SS = contents[1]
- if(istype(SS))
- SS.transfer_soul("CONSTRUCT",target,user)
- qdel(SS)
-
/datum/action/innate/dash/cult
name = "Rend the Veil"
desc = "Use the sword to shear open the flimsy fabric of this reality and teleport to your target."
@@ -219,45 +107,6 @@ Striking a noncultist, however, will tear their flesh."}
else
return FALSE
-
-
-/datum/action/innate/cult/spin2win
- name = "Geometer's Fury"
- desc = "You draw on the power of the sword's ancient runes, spinning it wildly around you as you become immune to most attacks."
- background_icon_state = "bg_demon"
- button_icon_state = "sintouch"
- var/cooldown = 0
- var/mob/living/carbon/human/holder
- var/obj/item/cult_bastard/sword
-
-/datum/action/innate/cult/spin2win/Grant(mob/user, obj/bastard)
- . = ..()
- sword = bastard
- holder = user
-
-/datum/action/innate/cult/spin2win/IsAvailable()
- if(iscultist(holder) && cooldown <= world.time)
- return TRUE
- else
- return FALSE
-
-/datum/action/innate/cult/spin2win/Activate()
- cooldown = world.time + sword.spin_cooldown
- holder.changeNext_move(50)
- holder.apply_status_effect(/datum/status_effect/sword_spin)
- sword.spinning = TRUE
- sword.block_level = 4
- sword.slowdown += 1.5
- addtimer(CALLBACK(src, PROC_REF(stop_spinning)), 50)
- holder.update_action_buttons_icon()
-
-/datum/action/innate/cult/spin2win/proc/stop_spinning()
- sword.spinning = FALSE
- sword.block_level = 1
- sword.slowdown -= 1.5
- sleep(sword.spin_cooldown)
- holder.update_action_buttons_icon()
-
/obj/item/restraints/legcuffs/bola/cult
name = "\improper Nar'Sien bola"
desc = "A strong bola, bound with dark magic that allows it to pass harmlessly through Nar'Sien cultists. Throw it to trip and slow your victim."
@@ -271,7 +120,7 @@ Striking a noncultist, however, will tear their flesh."}
return
if(ismob(hit_atom))
var/mob/M = hit_atom
- if(M.anti_magic_check(holy = TRUE))
+ if(M.anti_magic_check(magic = FALSE, holy = TRUE))
M.visible_message("[src] passes right through [M]!")
return
. = ..()
@@ -353,43 +202,13 @@ Striking a noncultist, however, will tear their flesh."}
armor = list(MELEE = 50, BULLET = 30, LASER = 50, ENERGY = 20, BOMB = 25, BIO = 10, RAD = 0, FIRE = 10, ACID = 10, STAMINA = 50)
flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
-/obj/item/clothing/suit/hooded/cultrobes/hardened
- name = "\improper Nar'Sien hardened armor"
- desc = "A heavily-armored exosuit worn by warriors of the Nar'Sien cult. It can withstand hard vacuum."
- icon_state = "cult_armor"
- item_state = null
- w_class = WEIGHT_CLASS_BULKY
- allowed = list(/obj/item/tome, /obj/item/melee/cultblade, /obj/item/tank/internals)
- armor = list(MELEE = 70, BULLET = 50, LASER = 30, ENERGY = 15, BOMB = 30, BIO = 30, RAD = 30, FIRE = 40, ACID = 75, STAMINA = 50)
- hoodtype = /obj/item/clothing/head/hooded/cult_hoodie/hardened
- clothing_flags = STOPSPRESSUREDAMAGE | THICKMATERIAL
- flags_inv = HIDEGLOVES | HIDEJUMPSUIT
- min_cold_protection_temperature = SPACE_SUIT_MIN_TEMP_PROTECT
- max_heat_protection_temperature = SPACE_SUIT_MAX_TEMP_PROTECT
- resistance_flags = NONE
-
-/obj/item/clothing/head/hooded/cult_hoodie/hardened
- name = "\improper Nar'Sien hardened helmet"
- desc = "A heavily-armored helmet worn by warriors of the Nar'Sien cult. It is reinforced by hard vacuum."
- icon_state = "cult_helmet"
- item_state = null
- armor = list(MELEE = 70, BULLET = 50, LASER = 30, ENERGY = 15, BOMB = 30, BIO = 30, RAD = 30, FIRE = 40, ACID = 75, STAMINA = 50)
- clothing_flags = STOPSPRESSUREDAMAGE | THICKMATERIAL | SNUG_FIT | HEADINTERNALS
- flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR|HIDESNOUT
- min_cold_protection_temperature = SPACE_HELM_MIN_TEMP_PROTECT
- max_heat_protection_temperature = SPACE_HELM_MAX_TEMP_PROTECT
- flash_protect = 2
- flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH
- resistance_flags = NONE
- high_pressure_multiplier = 0.5
-
/obj/item/sharpener/cult
name = "eldritch whetstone"
desc = "A block, empowered by dark magic. Sharp weapons will be enhanced when used on the stone."
icon_state = "cult_sharpener"
used = 0
increment = 5
- max = 40
+ max = 30
prefix = "darkened"
/obj/item/sharpener/cult/update_icon()
@@ -438,16 +257,16 @@ Striking a noncultist, however, will tear their flesh."}
/obj/item/clothing/suit/hooded/cultrobes/berserker
name = "flagellant's robes"
- desc = "Blood-soaked robes infused with dark magic; allows the user to move at inhuman speeds, but at the cost of increased damage."
+ desc = "Blood-soaked robes infused with dark magic; allows the user to move at inhuman speeds, but at the cost of reduced protection."
allowed = list(/obj/item/tome, /obj/item/melee/cultblade)
- armor = list(MELEE = -45, BULLET = -45, LASER = -45, ENERGY = -45, BOMB = -45, BIO = -45, RAD = -45, FIRE = 0, ACID = 0, STAMINA = 40)
- slowdown = -0.6
+ armor = list(MELEE = 10, BULLET = 20, LASER = 10, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 0, ACID = 0, STAMINA = 40)
+ slowdown = -0.4
hoodtype = /obj/item/clothing/head/hooded/cult_hoodie/berserkerhood
/obj/item/clothing/head/hooded/cult_hoodie/berserkerhood
name = "flagellant's hood"
desc = "Blood-soaked hood infused with dark magic."
- armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 0, ACID = 0, STAMINA = 0)
+ armor = list(MELEE = 10, BULLET = 20, LASER = 10, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 0, ACID = 0, STAMINA = 40)
/obj/item/clothing/suit/hooded/cultrobes/berserker/equipped(mob/living/user, slot)
..()
@@ -926,6 +745,12 @@ Striking a noncultist, however, will tear their flesh."}
/obj/item/shield/mirror/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK)
if(iscultist(owner))
+ if (attack_type == MELEE_ATTACK && ishuman(hitby.loc))
+ // Cannot block someone who has the bible on their side
+ var/mob/living/carbon/human/attacker = hitby.loc
+ if (attacker.anti_magic_check(magic = FALSE, holy = TRUE))
+ owner.visible_message("[owner] fails to block the attack from [attacker]!", "You fail to block the empowered attack!")
+ return FALSE
. = ..()
if(.)
if(illusions > 0)
diff --git a/code/modules/assembly/flash.dm b/code/modules/assembly/flash.dm
index a7dcffd0430b3..aad68a0de592c 100644
--- a/code/modules/assembly/flash.dm
+++ b/code/modules/assembly/flash.dm
@@ -295,7 +295,7 @@
log_combat(user, R, "flashed", src)
update_icon(1)
R.flash_act(affect_silicon = 1, type = /atom/movable/screen/fullscreen/flash/static)
- if(R.last_flashed + 30 SECONDS < world.time)
+ if(R.last_flashed + FLASHED_COOLDOWN < world.time)
R.last_flashed = world.time
R.Paralyze(5 SECONDS)
user.visible_message("[user] overloads [R]'s sensors with the flash!", "You overload [R]'s sensors with the flash!")
diff --git a/code/modules/awaymissions/mission_code/stationCollision.dm b/code/modules/awaymissions/mission_code/stationCollision.dm
index 2d7e1b9253f80..aececa433b4cc 100644
--- a/code/modules/awaymissions/mission_code/stationCollision.dm
+++ b/code/modules/awaymissions/mission_code/stationCollision.dm
@@ -133,6 +133,6 @@ GLOBAL_VAR_INIT(sc_safecode5, "[rand(0,9)]")
l_set = 1
new /obj/item/gun/energy/mindflayer(src)
new /obj/item/soulstone(src)
- new /obj/item/clothing/suit/hooded/cultrobes/hardened(src)
+ new /obj/item/clothing/suit/hooded/cultrobes(src)
//new /obj/item/teleportation_scroll(src)
new /obj/item/stack/ore/diamond(src)
diff --git a/code/modules/cargo/exports/lavaland.dm b/code/modules/cargo/exports/lavaland.dm
index 0396ad326da5c..f08aa45471a19 100644
--- a/code/modules/cargo/exports/lavaland.dm
+++ b/code/modules/cargo/exports/lavaland.dm
@@ -12,7 +12,6 @@
/obj/item/katana/cursed,
/obj/item/clothing/glasses/godeye,
/obj/item/melee/ghost_sword,
- /obj/item/clothing/suit/hooded/cultrobes/hardened,
/obj/item/voodoo,
/obj/item/grenade/clusterbuster/inferno,
/obj/item/clothing/neck/necklace/memento_mori,
diff --git a/code/modules/clothing/head/tinfoilhat.dm b/code/modules/clothing/head/tinfoilhat.dm
index 1558deb47e2c0..d7474119fadd2 100644
--- a/code/modules/clothing/head/tinfoilhat.dm
+++ b/code/modules/clothing/head/tinfoilhat.dm
@@ -60,7 +60,7 @@
icon_state = "tinfoil_envirohelm"
item_state = "tinfoil_envirohelm"
strip_delay = 150
- clothing_flags = STOPSPRESSUREDAMAGE | THICKMATERIAL | EFFECT_HAT | SNUG_FIT
+ clothing_flags = STOPSPRESSUREDAMAGE | EFFECT_HAT | SNUG_FIT | HEADINTERNALS
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 100, RAD = 0, FIRE = 50, ACID = 50, STAMINA = 50)
flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR
light_system = MOVABLE_LIGHT
diff --git a/code/modules/clothing/spacesuits/hardsuit.dm b/code/modules/clothing/spacesuits/hardsuit.dm
index 1529b463ebbbf..100f5a28e4450 100644
--- a/code/modules/clothing/spacesuits/hardsuit.dm
+++ b/code/modules/clothing/spacesuits/hardsuit.dm
@@ -631,7 +631,7 @@
/obj/item/clothing/suit/space/hardsuit/wizard/ComponentInitialize()
. = ..()
AddComponent(/datum/component/anti_artifact, INFINITY, FALSE, 100)
- AddComponent(/datum/component/anti_magic, TRUE, FALSE, INFINITY, FALSE)
+ AddComponent(/datum/component/anti_magic, INNATE_TRAIT, TRUE, FALSE, INFINITY, FALSE)
//Medical hardsuit
diff --git a/code/modules/clothing/spacesuits/miscellaneous.dm b/code/modules/clothing/spacesuits/miscellaneous.dm
index 6f58aaed3c468..36bed1c8ae5d9 100644
--- a/code/modules/clothing/spacesuits/miscellaneous.dm
+++ b/code/modules/clothing/spacesuits/miscellaneous.dm
@@ -332,7 +332,7 @@ Contains:
/obj/item/clothing/suit/space/hardsuit/ert/paranormal/Initialize(mapload)
. = ..()
- AddComponent(/datum/component/anti_magic, TRUE, TRUE)
+ AddComponent(/datum/component/anti_magic, INNATE_TRAIT, TRUE, TRUE)
//Lavaland suits
diff --git a/code/modules/elevator/elevator_segment.dm b/code/modules/elevator/elevator_segment.dm
index 55b1c2309c56e..4405b3386cdaf 100644
--- a/code/modules/elevator/elevator_segment.dm
+++ b/code/modules/elevator/elevator_segment.dm
@@ -14,12 +14,12 @@
//Mapping preset - Primary Elevator
/obj/structure/elevator_segment/primary
id = "primary"
- base_turf = /turf/open/floor/iron/elevatorshaft
+ base_turf = /turf/open/floor/plating/elevatorshaft
// Glowstation
/obj/structure/elevator_segment/secure
id = "secure"
- base_turf = /turf/open/floor/iron/elevatorshaft
+ base_turf = /turf/open/floor/plating/elevatorshaft
/obj/structure/elevator_segment/Initialize(mapload)
music_files = list('sound/effects/turbolift/elevatormusic.ogg' = 45, 'sound/effects/turbolift/elevator_loop.ogg' = 25)
diff --git a/code/modules/hydroponics/grown/melon.dm b/code/modules/hydroponics/grown/melon.dm
index f957a48232bc1..06d942315d284 100644
--- a/code/modules/hydroponics/grown/melon.dm
+++ b/code/modules/hydroponics/grown/melon.dm
@@ -97,7 +97,7 @@
var/uses = 1
if(seed)
uses = round(seed.potency / 20)
- AddComponent(/datum/component/anti_magic, TRUE, TRUE, uses, TRUE, CALLBACK(src, PROC_REF(block_magic)), CALLBACK(src, PROC_REF(expire))) //deliver us from evil o melon god
+ AddComponent(/datum/component/anti_magic, INNATE_TRAIT, TRUE, TRUE, uses, TRUE, CALLBACK(src, PROC_REF(block_magic)), CALLBACK(src, PROC_REF(expire))) //deliver us from evil o melon god
/obj/item/food/grown/holymelon/proc/block_magic(mob/user, major)
if(major)
diff --git a/code/modules/language/language_menu.dm b/code/modules/language/language_menu.dm
index f6287696a23b5..bc5d720a6effe 100644
--- a/code/modules/language/language_menu.dm
+++ b/code/modules/language/language_menu.dm
@@ -18,6 +18,27 @@
ui = new(user, src, "LanguageMenu")
ui.open()
+/datum/language_menu/ui_assets(mob/user)
+ return list(
+ get_asset_datum(/datum/asset/spritesheet_batched/chat)
+ )
+
+/datum/language_menu/ui_static_data(mob/user)
+ var/list/data = list()
+
+ data["language_static_data"] = list()
+ for(var/lang in GLOB.all_languages)
+ var/datum/language/language = lang
+ var/list/L = list()
+
+ L["name"] = initial(language.name)
+ L["desc"] = initial(language.desc)
+ L["key"] = initial(language.key)
+ L["icon_state"] = initial(language.icon_state)
+
+ data["language_static_data"][initial(language.name)] = L
+ return data
+
/datum/language_menu/ui_data(mob/user)
var/list/data = list()
@@ -28,7 +49,7 @@
else
data["is_living"] = FALSE
- data["languages"] = list()
+ data["known_languages"] = list()
for(var/lang in GLOB.all_languages)
var/result = language_holder.has_language(lang) || language_holder.has_language(lang, TRUE)
if(!result)
@@ -37,8 +58,6 @@
var/list/L = list()
L["name"] = initial(language.name)
- L["desc"] = initial(language.desc)
- L["key"] = initial(language.key)
L["is_default"] = (language == language_holder.selected_language)
if(AM)
L["can_speak"] = AM.can_speak_language(language)
@@ -48,7 +67,7 @@
if(!(is_admin || HAS_TRAIT(user, TRAIT_METALANGUAGE_KEY_ALLOWED)))
continue
- data["languages"] += list(L)
+ data["known_languages"] += list(L)
if(is_admin || isobserver(AM))
data["admin_mode"] = TRUE
@@ -62,8 +81,6 @@
var/list/L = list()
L["name"] = initial(language.name)
- L["desc"] = initial(language.desc)
- L["key"] = initial(language.key)
data["unknown_languages"] += list(L)
else
diff --git a/code/modules/mining/lavaland/necropolis_chests.dm b/code/modules/mining/lavaland/necropolis_chests.dm
index ab473f28b9af4..01519dca33abd 100644
--- a/code/modules/mining/lavaland/necropolis_chests.dm
+++ b/code/modules/mining/lavaland/necropolis_chests.dm
@@ -468,7 +468,7 @@
/obj/item/immortality_talisman/Initialize(mapload)
. = ..()
- AddComponent(/datum/component/anti_magic, TRUE, TRUE)
+ AddComponent(/datum/component/anti_magic, INNATE_TRAIT, TRUE, TRUE)
/datum/action/item_action/immortality
name = "Immortality"
@@ -637,7 +637,7 @@
C.emote("scream")
if(holycheck)
to_chat(C, "You feel blessed!")
- ADD_TRAIT(C, TRAIT_HOLY, SPECIES_TRAIT)
+ C.AddComponent(/datum/component/anti_magic, SPECIES_TRAIT, _magic = FALSE, _holy = TRUE)
..()
diff --git a/code/modules/mob/living/carbon/human/species_types/golems.dm b/code/modules/mob/living/carbon/human/species_types/golems.dm
index 7e6a820962dc4..95d2a938d0dd5 100644
--- a/code/modules/mob/living/carbon/human/species_types/golems.dm
+++ b/code/modules/mob/living/carbon/human/species_types/golems.dm
@@ -95,10 +95,12 @@
/datum/species/golem/adamantine/on_species_gain(mob/living/carbon/C, datum/species/old_species)
..()
- ADD_TRAIT(C, TRAIT_ANTIMAGIC, SPECIES_TRAIT)
+ C.AddComponent(/datum/component/anti_magic, SPECIES_TRAIT, _magic = TRUE, _holy = FALSE)
/datum/species/golem/adamantine/on_species_loss(mob/living/carbon/C)
- REMOVE_TRAIT(C, TRAIT_ANTIMAGIC, SPECIES_TRAIT)
+ for (var/datum/component/anti_magic/anti_magic in C.GetComponents(/datum/component/anti_magic))
+ if (anti_magic.source == SPECIES_TRAIT)
+ qdel(anti_magic)
..()
//The suicide bombers of golemkind
@@ -196,10 +198,12 @@
/datum/species/golem/silver/on_species_gain(mob/living/carbon/C, datum/species/old_species)
..()
- ADD_TRAIT(C, TRAIT_HOLY, SPECIES_TRAIT)
+ C.AddComponent(/datum/component/anti_magic, SPECIES_TRAIT, _magic = FALSE, _holy = TRUE)
/datum/species/golem/silver/on_species_loss(mob/living/carbon/C)
- REMOVE_TRAIT(C, TRAIT_HOLY, SPECIES_TRAIT)
+ for (var/datum/component/anti_magic/anti_magic in C.GetComponents(/datum/component/anti_magic))
+ if (anti_magic.source == SPECIES_TRAIT)
+ qdel(anti_magic)
..()
// Softer and faster, but conductive
@@ -772,10 +776,12 @@
/datum/species/golem/cloth/on_species_gain(mob/living/carbon/C, datum/species/old_species)
..()
- ADD_TRAIT(C, TRAIT_HOLY, SPECIES_TRAIT)
+ C.AddComponent(/datum/component/anti_magic, SPECIES_TRAIT, _magic = FALSE, _holy = TRUE)
/datum/species/golem/cloth/on_species_loss(mob/living/carbon/C)
- REMOVE_TRAIT(C, TRAIT_HOLY, SPECIES_TRAIT)
+ for (var/datum/component/anti_magic/anti_magic in C.GetComponents(/datum/component/anti_magic))
+ if (anti_magic.source == SPECIES_TRAIT)
+ qdel(anti_magic)
..()
/datum/species/golem/cloth/check_roundstart_eligible()
diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index 2bcc68f1dafee..74c62324b6166 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -1120,8 +1120,6 @@
. = ..()
if(.)
return
- if((magic && HAS_TRAIT(src, TRAIT_ANTIMAGIC)) || (holy && HAS_TRAIT(src, TRAIT_HOLY)))
- return src
/mob/living/proc/fakefireextinguish()
return
diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
index ce3f62090f844..1fbb99af208e1 100644
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -617,7 +617,7 @@
if(stat != DEAD && !(IsUnconscious() || low_power_mode)) //Not dead, not stunned.
if(!eye_lights)
eye_lights = new()
- if(last_flashed && last_flashed + 30 SECONDS >= world.time) //We want to make sure last_flashed isn't zero because otherwise roundstart borgs blink for 30 seconds
+ if(last_flashed && last_flashed + FLASHED_COOLDOWN >= world.time) //We want to make sure last_flashed isn't zero because otherwise roundstart borgs blink for 30 seconds
eye_lights.icon_state = "[module.special_light_key ? "[module.special_light_key]":"[module.cyborg_base_icon]"]_fl"
else if(lamp_enabled)
eye_lights.icon_state = "[module.special_light_key ? "[module.special_light_key]":"[module.cyborg_base_icon]"]_l"
diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm
index 23b3e12040f4b..7030ffef05079 100644
--- a/code/modules/mob/living/silicon/robot/robot_modules.dm
+++ b/code/modules/mob/living/silicon/robot/robot_modules.dm
@@ -244,7 +244,7 @@
/obj/item/crowbar/cyborg,
/obj/item/stack/sheet/iron,
/obj/item/stack/rods/cyborg,
- /obj/item/stack/tile/iron,
+ /obj/item/stack/tile/iron/base/cyborg,
/obj/item/extinguisher,
/obj/item/pickaxe,
/obj/item/t_scanner/adv_mining_scanner,
@@ -324,7 +324,7 @@
/obj/item/stack/sheet/glass,
/obj/item/stack/sheet/rglass/cyborg,
/obj/item/stack/rods/cyborg,
- /obj/item/stack/tile/iron,
+ /obj/item/stack/tile/iron/base/cyborg,
/obj/item/stack/cable_coil,
/obj/item/holosign_creator/atmos)
emag_modules = list(/obj/item/borg/stun)
@@ -436,7 +436,7 @@
/obj/item/assembly/flash/cyborg,
/obj/item/screwdriver/cyborg,
/obj/item/crowbar/cyborg,
- /obj/item/stack/tile/iron,
+ /obj/item/stack/tile/iron/base/cyborg,
/obj/item/soap/nanotrasen,
/obj/item/borg/charger,
/obj/item/weldingtool/cyborg/mini,
@@ -713,7 +713,7 @@
/obj/item/stack/sheet/glass,
/obj/item/stack/sheet/rglass/cyborg,
/obj/item/stack/rods/cyborg,
- /obj/item/stack/tile/iron,
+ /obj/item/stack/tile/iron/base/cyborg,
/obj/item/dest_tagger/borg,
/obj/item/stack/cable_coil,
/obj/item/card/emag,
diff --git a/code/modules/mob/living/simple_animal/bot/floorbot.dm b/code/modules/mob/living/simple_animal/bot/floorbot.dm
index ef5e8dac354c8..e6fa52daaae35 100644
--- a/code/modules/mob/living/simple_animal/bot/floorbot.dm
+++ b/code/modules/mob/living/simple_animal/bot/floorbot.dm
@@ -411,7 +411,7 @@
if(prob(50))
drop_part(robot_arm, Tsec)
- new /obj/item/stack/tile/iron(Tsec, 1)
+ new /obj/item/stack/tile/iron/base(Tsec, 1)
do_sparks(3, TRUE, src)
..()
diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index 65258c08e9bf8..e92f4b0283722 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -900,8 +900,6 @@
return pick(protection_sources)
else
return src
- if((magic && HAS_TRAIT(src, TRAIT_ANTIMAGIC)) || (holy && HAS_TRAIT(src, TRAIT_HOLY)))
- return src
///Return any anti artifact atom on this mob
/mob/proc/anti_artifact_check(self = FALSE)
diff --git a/code/modules/procedural_mapping/mapGenerators/shuttle.dm b/code/modules/procedural_mapping/mapGenerators/shuttle.dm
index 00ac33f2687f0..bbb3926ba6608 100644
--- a/code/modules/procedural_mapping/mapGenerators/shuttle.dm
+++ b/code/modules/procedural_mapping/mapGenerators/shuttle.dm
@@ -1,8 +1,7 @@
/datum/mapGeneratorModule/bottomLayer/shuttleFloor
- spawnableTurfs = list(/turf/open/floor/iron/shuttle = 100)
+ spawnableTurfs = list(/turf/open/floor/mineral/titanium = 100)
/datum/mapGeneratorModule/border/shuttleWalls
- spawnableAtoms = list()
spawnableTurfs = list(/turf/closed/wall/mineral/titanium = 100)
// Generators
diff --git a/code/modules/procedural_mapping/mapGenerators/syndicate.dm b/code/modules/procedural_mapping/mapGenerators/syndicate.dm
index ee013c256e61e..b7a6f0eba7c2e 100644
--- a/code/modules/procedural_mapping/mapGenerators/syndicate.dm
+++ b/code/modules/procedural_mapping/mapGenerators/syndicate.dm
@@ -1,15 +1,12 @@
// Modules
-/turf/open/floor/iron/shuttle/red/syndicate
- name = "floor" //Not Brig Floor
-
/datum/mapGeneratorModule/bottomLayer/syndieFloor
- spawnableTurfs = list(/turf/open/floor/iron/shuttle/red/syndicate = 100)
+ spawnableTurfs = list(/turf/open/floor/mineral/plastitanium/red = 100)
/datum/mapGeneratorModule/border/syndieWalls
spawnableAtoms = list()
- spawnableTurfs = list(/turf/closed/wall/r_wall = 100)
+ spawnableTurfs = list(/turf/closed/wall/r_wall/syndicate = 100)
/datum/mapGeneratorModule/syndieFurniture
diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm
index 79482f58bea95..0fdb0d7b1f881 100644
--- a/code/modules/reagents/chemistry/reagents/other_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm
@@ -248,10 +248,12 @@
/datum/reagent/water/holywater/on_mob_metabolize(mob/living/L)
..()
- ADD_TRAIT(L, TRAIT_HOLY, type)
+ L.AddComponent(/datum/component/anti_magic, type, _magic = FALSE, _holy = TRUE)
/datum/reagent/water/holywater/on_mob_end_metabolize(mob/living/L)
- REMOVE_TRAIT(L, TRAIT_HOLY, type)
+ for (var/datum/component/anti_magic/anti_magic in L.GetComponents(/datum/component/anti_magic))
+ if (anti_magic.source == type)
+ qdel(anti_magic)
if(HAS_TRAIT_FROM(L, TRAIT_DEPRESSION, HOLYWATER_TRAIT))
REMOVE_TRAIT(L, TRAIT_DEPRESSION, HOLYWATER_TRAIT)
to_chat(L, "You cheer up, knowing that everything is going to be ok.")
diff --git a/code/modules/religion/sects/shadow_sect.dm b/code/modules/religion/sects/shadow_sect.dm
index 6132086f2e42e..66413b23d768a 100644
--- a/code/modules/religion/sects/shadow_sect.dm
+++ b/code/modules/religion/sects/shadow_sect.dm
@@ -318,7 +318,8 @@
break
if(!rite_target)
return FALSE
- ADD_TRAIT(rite_target, TRAIT_ANTIMAGIC, MAGIC_TRAIT)
+ rite_target.AddComponent(/datum/component/anti_magic, MAGIC_TRAIT, _magic = TRUE, _holy = FALSE)
+ //glowing wings overlay
to_chat(rite_target, "You are grateful to have been converted to the dark by [user]. Serve [user.real_name], and assist [user.p_them()] in completing [user.p_their()] goals at any cost.")
playsound(rite_target, 'sound/weapons/fwoosh.ogg', 75, 0)
rite_target.visible_message("[rite_target] has been blessed by the rite of [name]!")
diff --git a/code/modules/research/xenobiology/xenobiology.dm b/code/modules/research/xenobiology/xenobiology.dm
index d724b073a3654..684aa2997a534 100644
--- a/code/modules/research/xenobiology/xenobiology.dm
+++ b/code/modules/research/xenobiology/xenobiology.dm
@@ -1119,13 +1119,13 @@
flags_1 = CONDUCT_1
max_amount = 60
turf_type = /turf/open/floor/bluespace
-
+ merge_type = /obj/item/stack/tile/bluespace
/obj/item/stack/tile/sepia
name = "sepia floor tile"
singular_name = "floor tile"
desc = "Time seems to flow very slowly around these tiles."
- icon_state = "tile-sepia"
+ icon_state = "tile_sepia"
item_state = "tile-sepia"
w_class = WEIGHT_CLASS_NORMAL
force = 6
@@ -1137,6 +1137,7 @@
flags_1 = CONDUCT_1
max_amount = 60
turf_type = /turf/open/floor/sepia
+ merge_type = /obj/item/stack/tile/sepia
/obj/item/areaeditor/blueprints/slime
diff --git a/code/modules/shuttle/emergency.dm b/code/modules/shuttle/emergency.dm
index 2e20d5170a10c..495a6bd7bc033 100644
--- a/code/modules/shuttle/emergency.dm
+++ b/code/modules/shuttle/emergency.dm
@@ -398,7 +398,7 @@
has_people = TRUE
var/location = get_turf(player.mind.current)
//Non-antag present. Can't hijack.
- if(!(player.mind.has_antag_datum(/datum/antagonist)) && !istype(location, /turf/open/floor/iron/shuttle/red) && !istype(location, /turf/open/floor/mineral/plastitanium/red/brig))
+ if(!(player.mind.has_antag_datum(/datum/antagonist)) && !istype(location, /turf/open/floor/mineral/plastitanium/red/brig))
return FALSE
//Antag present, doesn't stop but let's see if we actually want to hijack
var/prevent = FALSE
diff --git a/code/modules/shuttle/shuttle.dm b/code/modules/shuttle/shuttle.dm
index fe234ddc2389d..1bbfc0f1b3025 100644
--- a/code/modules/shuttle/shuttle.dm
+++ b/code/modules/shuttle/shuttle.dm
@@ -773,7 +773,7 @@ GLOBAL_LIST_INIT(shuttle_turf_blacklist, typecacheof(list(
var/turf/T = t
for(var/mob/living/M in T.GetAllContents())
// If they have a mind and they're not in the brig, they escaped
- if(M.mind && !istype(t, /turf/open/floor/iron/shuttle/red) && !istype(t, /turf/open/floor/mineral/plastitanium/red/brig))
+ if(M.mind && !istype(t, /turf/open/floor/mineral/plastitanium/red/brig))
M.mind.force_escaped = TRUE
// Ghostize them and put them in nullspace stasis (for stat & possession checks)
M.notransform = TRUE
diff --git a/code/modules/spells/spell.dm b/code/modules/spells/spell.dm
index 333507f33ef05..2fde72224504b 100644
--- a/code/modules/spells/spell.dm
+++ b/code/modules/spells/spell.dm
@@ -224,10 +224,10 @@ GLOBAL_LIST_INIT(spells, typesof(/obj/effect/proc_holder/spell)) //needed for th
to_chat(H, "I don't feel strong enough without my hat.")
return FALSE
if(cult_req) //CULT_REQ CLOTHES CHECK
- if(!istype(H.wear_suit, /obj/item/clothing/suit/magusred) && !istype(H.wear_suit, /obj/item/clothing/suit/hooded/cultrobes/hardened))
+ if(!istype(H.wear_suit, /obj/item/clothing/suit/magusred) && !istype(H.wear_suit, /obj/item/clothing/suit/hooded/cultrobes))
to_chat(H, "I don't feel strong enough without my armor.")
return FALSE
- if(!istype(H.head, /obj/item/clothing/head/wizard/magus) && !istype(H.head, /obj/item/clothing/head/hooded/cult_hoodie/hardened))
+ if(!istype(H.head, /obj/item/clothing/head/wizard/magus) && !istype(H.head, /obj/item/clothing/head/hooded/cult_hoodie))
to_chat(H, "I don't feel strong enough without my helmet.")
return FALSE
else
diff --git a/code/modules/unit_tests/_unit_tests.dm b/code/modules/unit_tests/_unit_tests.dm
index 9887c78dc6dae..89679c50c9ae9 100644
--- a/code/modules/unit_tests/_unit_tests.dm
+++ b/code/modules/unit_tests/_unit_tests.dm
@@ -110,6 +110,7 @@
#include "heretic_knowledge.dm"
#include "heretic_rituals.dm"
#include "icon_smoothing_unit_test.dm"
+#include "merge_type.dm"
#include "metabolizing.dm"
#include "missing_icons.dm"
#include "ntnetwork_tests.dm"
diff --git a/code/modules/unit_tests/merge_type.dm b/code/modules/unit_tests/merge_type.dm
new file mode 100644
index 0000000000000..81b823a753762
--- /dev/null
+++ b/code/modules/unit_tests/merge_type.dm
@@ -0,0 +1,14 @@
+/datum/unit_test/merge_type/Run()
+ var/list/blacklist = list(/obj/item/stack/sheet,
+ /obj/item/stack/sheet/mineral,
+ /obj/item/stack/ore,
+ /obj/item/stack/spacecash,
+ /obj/item/stack/tile/mineral,
+ /obj/item/stack/tile)
+
+ var/list/paths = subtypesof(/obj/item/stack) - blacklist
+
+ for(var/stackpath in paths)
+ var/obj/item/stack/stack = stackpath
+ if(!initial(stack.merge_type))
+ TEST_FAIL("([stack]) lacks set merge_type variable!")
diff --git a/html/changelog.html b/html/changelog.html
index a11fa2086f968..0d61f046f1ee2 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -56,6 +56,48 @@
-->
+
25 June 2024
+
EvilDragonfiend updated:
+
+ - Language menu TGUI now shows language icon, and better readable description layout
+ - Slightly improved language menu code
+
+
Gilgaxx updated:
+
+ - Echostation: replaced disposals' delivery chute (input) with a disposals outlet (output)
+ - Echostation: Inverted the airmixer to distro so it's now 21/79 o2/n2
+
+
HowToLoLu updated:
+
+ - Tinfoil envirosuit helmets act as internals now and no longer block syringes, just like other envirosuit helmets
+
+
Markus Larsson updated:
+
+ - Added almost 20 new maintenance rooms.
+ - Added a chance for a ripley to spawn.
+ - Added a sniffer to the Robotics maintenance room.
+
+
PowerfulBacon updated:
+
+ - Lowers damage of cult sword from 30 to 23. Maximum damage from sharpening reduced from 40 to 30.
+ - Cult stun now EMPs the target's headset.
+ - Holy protection is now visible to anyone with holy protection themselves, and is also visible to cultists.
+ - Flagellant's have postiive armour rather than negative armour, making them somewhat viable.
+ - Holy protection will now allow you to bypass the mirror shield's blocking, and will result in taking reduced damage from cult swords.
+ - EMPs will no longer disable all your channels on radio headsets, instead temporarilly disabling them for 20 seconds similar to other EMP effects.
+
+
XeonMations updated:
+
+ - Renewed Cyborg software to correctly deal with laser pointer spam.
+ - Laser pointers now stunlock a cyborg for 5 seconds instead of the previous 1-2 seconds, now consider cyborg software before flashing a borg.
+
+
rkz, Fikou, twaticus, Pepsiman0, Twaticus, Arkatos1 updated:
+
+ - expanded Tile reskinning to all iron tiles. Tile reskinning now controlled via radial menu when pressing 'Z' while holding the tilestack.
+ - rad edits
+ - adds several new iron tile types, at the moment exclusively in the tile reskinning menu
+
+
23 June 2024
Gilgaxx updated:
@@ -501,16 +543,6 @@ Memendia updated:
- adds a space to the dchat message for split personality
-
- 24 April 2024
- EvilDragonfiend updated:
-
- - fixed wrong usage of signal procs
-
- Tsar-Salat updated:
-
- - removed a 4 year old empty species proc
-