diff --git a/_maps/RandomRuins/SpaceRuins/skyrat/interdynefob.dmm b/_maps/RandomRuins/SpaceRuins/skyrat/interdynefob.dmm
index 03027559884..cab66087a25 100644
--- a/_maps/RandomRuins/SpaceRuins/skyrat/interdynefob.dmm
+++ b/_maps/RandomRuins/SpaceRuins/skyrat/interdynefob.dmm
@@ -7142,9 +7142,6 @@
/obj/item/gun/ballistic/shotgun/riot/sol/evil{
pixel_x = 0
},
-/obj/item/gun/ballistic/automatic/sol_rifle/evil{
- pixel_x = 8
- },
/turf/open/floor/mineral/plastitanium/red,
/area/ruin/space/has_grav/skyrat/interdynefob/security/armory)
"Hh" = (
diff --git a/_maps/RandomRuins/SpaceRuins/skyrat/port_tarkon.dmm b/_maps/RandomRuins/SpaceRuins/skyrat/port_tarkon.dmm
index 6cf985f0dec..b9f7bcded59 100644
--- a/_maps/RandomRuins/SpaceRuins/skyrat/port_tarkon.dmm
+++ b/_maps/RandomRuins/SpaceRuins/skyrat/port_tarkon.dmm
@@ -13,7 +13,9 @@
dir = 9
},
/obj/effect/turf_decal/tile/neutral/anticorner,
-/obj/machinery/camera/emp_proof/directional/south,
+/obj/machinery/camera/emp_proof/directional/south{
+ network = list("tarkon")
+ },
/turf/open/floor/iron,
/area/ruin/space/has_grav/port_tarkon/centerhall)
"ai" = (
@@ -282,7 +284,7 @@
/obj/effect/turf_decal/tile/yellow/half{
dir = 1
},
-/obj/machinery/camera/directional/north,
+/obj/machinery/camera/preset/tarkon/directional/north,
/turf/open/floor/plating,
/area/ruin/space/has_grav/port_tarkon/atmos)
"bc" = (
@@ -457,10 +459,10 @@
/obj/effect/turf_decal/stripes/red/line{
dir = 10
},
-/obj/machinery/camera/directional/north{
+/obj/machinery/camera/preset/tarkon/directional/north{
c_tag = "Xenobiology - Cytology Cell";
name = "xenobiology camera";
- network = list("ss13","xeno","rd")
+ network = list("tarkon","xeno","rd")
},
/obj/structure/alien/egg/burst,
/turf/open/floor/iron/dark/textured_corner{
@@ -503,7 +505,9 @@
/obj/effect/turf_decal/tile/red/real_red/half{
dir = 8
},
-/obj/machinery/camera/emp_proof/directional/west,
+/obj/machinery/camera/emp_proof/directional/west{
+ network = list("tarkon")
+ },
/turf/open/floor/iron,
/area/ruin/space/has_grav/port_tarkon/secoff)
"bQ" = (
@@ -634,7 +638,7 @@
/obj/effect/turf_decal/tile/purple/anticorner{
dir = 1
},
-/obj/machinery/camera/directional/north,
+/obj/machinery/camera/preset/tarkon/directional/north,
/turf/open/floor/iron/dark,
/area/ruin/space/has_grav/port_tarkon/developement)
"cq" = (
@@ -815,7 +819,7 @@
/turf/open/floor/iron/white,
/area/ruin/space/has_grav/port_tarkon/trauma)
"cV" = (
-/obj/machinery/camera/directional/west,
+/obj/machinery/camera/preset/tarkon/directional/west,
/turf/open/floor/plating,
/area/ruin/space/has_grav/port_tarkon/engineering)
"cW" = (
@@ -935,7 +939,7 @@
/turf/open/floor/iron,
/area/ruin/space/has_grav/port_tarkon/mining)
"dl" = (
-/obj/machinery/camera/directional/east,
+/obj/machinery/camera/preset/tarkon/directional/east,
/turf/open/floor/plating,
/area/ruin/space/has_grav/port_tarkon/engineering)
"dm" = (
@@ -981,7 +985,7 @@
/turf/template_noop,
/area/solars/tarkon)
"dt" = (
-/obj/machinery/camera/directional/west,
+/obj/machinery/camera/preset/tarkon/directional/west,
/obj/structure/alien/egg/burst,
/turf/open/floor/circuit,
/area/ruin/space/has_grav/port_tarkon/aichamber)
@@ -1008,7 +1012,7 @@
/obj/item/storage/backpack/satchel/eng,
/obj/item/clothing/head/utility/welding/hat,
/obj/item/clothing/head/utility/welding/hat,
-/obj/machinery/camera/directional/north,
+/obj/machinery/camera/preset/tarkon/directional/north,
/turf/open/floor/wood,
/area/ruin/space/has_grav/port_tarkon/dorms)
"dx" = (
@@ -1347,7 +1351,7 @@
id = "tarkonconstruction";
name = "Construction Shutters"
},
-/obj/machinery/camera/directional/west,
+/obj/machinery/camera/preset/tarkon/directional/west,
/turf/open/floor/plating,
/area/ruin/space/has_grav/port_tarkon/engineering)
"eG" = (
@@ -1361,7 +1365,7 @@
/obj/effect/turf_decal/tile/purple/half{
dir = 1
},
-/obj/machinery/camera/directional/north,
+/obj/machinery/camera/preset/tarkon/directional/north,
/turf/open/floor/iron/dark,
/area/ruin/space/has_grav/port_tarkon/scienceaway)
"eI" = (
@@ -1421,7 +1425,7 @@
/obj/modular_map_root/port_tarkon{
key = "cargo"
},
-/obj/machinery/camera/directional/west,
+/obj/machinery/camera/preset/tarkon/directional/west,
/turf/open/floor/iron,
/area/ruin/space/has_grav/port_tarkon/storage)
"eQ" = (
@@ -1473,7 +1477,7 @@
/turf/open/floor/engine/n2,
/area/ruin/space/has_grav/port_tarkon/atmos)
"eW" = (
-/obj/machinery/camera/directional/east,
+/obj/machinery/camera/preset/tarkon/directional/east,
/turf/open/floor/plating/reinforced,
/area/ruin/space/has_grav/port_tarkon/cargo)
"eX" = (
@@ -1505,7 +1509,7 @@
/obj/effect/turf_decal/tile/yellow/half{
dir = 8
},
-/obj/machinery/camera/directional/west,
+/obj/machinery/camera/preset/tarkon/directional/west,
/turf/open/floor/iron,
/area/ruin/space/has_grav/port_tarkon/atmos)
"fe" = (
@@ -1856,7 +1860,9 @@
/turf/open/floor/iron/dark,
/area/ruin/space/has_grav/port_tarkon/comms)
"gt" = (
-/obj/machinery/camera/emp_proof/directional/east,
+/obj/machinery/camera/emp_proof/directional/east{
+ network = list("tarkon")
+ },
/turf/open/floor/circuit,
/area/ruin/space/has_grav/port_tarkon/aichamber)
"gu" = (
@@ -2244,7 +2250,9 @@
/turf/open/floor/plating,
/area/ruin/space/has_grav/port_tarkon/cargo)
"hD" = (
-/obj/machinery/camera/emp_proof/directional/north,
+/obj/machinery/camera/emp_proof/directional/north{
+ network = list("tarkon")
+ },
/obj/structure/trash_pile,
/obj/structure/disposalpipe/segment{
dir = 6
@@ -2283,7 +2291,7 @@
dir = 8
},
/obj/structure/cable,
-/obj/machinery/camera/directional/south,
+/obj/machinery/camera/preset/tarkon/directional/south,
/turf/open/floor/plating,
/area/ruin/space/has_grav/port_tarkon/power2)
"hJ" = (
@@ -2401,13 +2409,15 @@
pixel_x = 4;
pixel_y = 5
},
-/obj/machinery/camera/directional/west,
+/obj/machinery/camera/preset/tarkon/directional/west,
/turf/open/floor/plating/reinforced,
/area/ruin/space/has_grav/port_tarkon/cargo)
"ie" = (
/obj/machinery/light_switch/directional/south,
/obj/effect/turf_decal/tile/neutral/anticorner,
-/obj/machinery/camera/emp_proof/directional/south,
+/obj/machinery/camera/emp_proof/directional/south{
+ network = list("tarkon")
+ },
/turf/open/floor/iron,
/area/ruin/space/has_grav/port_tarkon/centerhall)
"if" = (
@@ -2477,7 +2487,7 @@
dir = 1
},
/obj/machinery/smartfridge/chemistry/virology/preloaded,
-/obj/machinery/camera/directional/north,
+/obj/machinery/camera/preset/tarkon/directional/north,
/turf/open/floor/iron/white,
/area/ruin/space/has_grav/port_tarkon/viro)
"is" = (
@@ -2517,7 +2527,7 @@
/turf/open/floor/iron/dark,
/area/ruin/space/has_grav/port_tarkon/comms)
"iw" = (
-/obj/machinery/camera/directional/east,
+/obj/machinery/camera/preset/tarkon/directional/east,
/obj/machinery/light/directional/east,
/obj/machinery/modular_computer/preset/research/away,
/turf/open/floor/iron/dark,
@@ -2608,10 +2618,10 @@
/obj/effect/turf_decal/stripes/line{
dir = 1
},
-/obj/machinery/camera/directional/north{
+/obj/machinery/camera/preset/tarkon/directional/north{
c_tag = "Science - Experimentor";
name = "science camera";
- network = list("ss13","rd")
+ network = list("tarkon","rd")
},
/obj/structure/alien/weeds/node,
/turf/open/floor/engine,
@@ -2834,7 +2844,7 @@
dir = 4
},
/obj/machinery/light_switch/directional/east,
-/obj/machinery/camera/directional/east,
+/obj/machinery/camera/preset/tarkon/directional/east,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
dir = 8
},
@@ -2954,7 +2964,7 @@
/obj/machinery/atmospherics/components/unary/portables_connector/visible{
dir = 8
},
-/obj/machinery/camera/directional/south,
+/obj/machinery/camera/preset/tarkon/directional/south,
/turf/open/floor/iron/dark,
/area/ruin/space/has_grav/port_tarkon/atmos)
"kf" = (
@@ -3067,7 +3077,9 @@
/area/ruin/space/has_grav/port_tarkon/developement)
"kB" = (
/obj/machinery/light/small/directional/south,
-/obj/machinery/camera/emp_proof/directional/south,
+/obj/machinery/camera/emp_proof/directional/south{
+ network = list("tarkon")
+ },
/turf/open/floor/iron/freezer,
/area/ruin/space/has_grav/port_tarkon/kitchen)
"kC" = (
@@ -3286,8 +3298,8 @@
/obj/structure/table,
/obj/item/stack/sheet/cardboard,
/obj/item/food/donkpocket/pizza,
-/obj/machinery/camera/directional/east{
- network = list("ss13","medbay");
+/obj/machinery/camera/preset/tarkon/directional/east{
+ network = list("tarkon","medbay");
c_tag = "Medical - Virology Break Room"
},
/turf/open/floor/iron/dark,
@@ -3923,7 +3935,9 @@
/obj/effect/turf_decal/tile/neutral/half{
dir = 8
},
-/obj/machinery/camera/emp_proof/directional/west,
+/obj/machinery/camera/emp_proof/directional/west{
+ network = list("tarkon")
+ },
/turf/open/floor/iron,
/area/ruin/space/has_grav/port_tarkon/centerhall)
"nU" = (
@@ -4218,7 +4232,7 @@
/obj/effect/turf_decal/tile/yellow/half{
dir = 1
},
-/obj/machinery/camera/directional/north,
+/obj/machinery/camera/preset/tarkon/directional/north,
/obj/structure/table/reinforced,
/obj/item/flashlight/lantern,
/obj/item/flashlight/lantern,
@@ -4268,7 +4282,7 @@
/turf/open/floor/iron/dark,
/area/ruin/space/has_grav/port_tarkon/vault)
"pl" = (
-/obj/machinery/camera/directional/south,
+/obj/machinery/camera/preset/tarkon/directional/south,
/turf/open/floor/iron,
/area/ruin/space/has_grav/port_tarkon/secoff)
"pn" = (
@@ -4596,7 +4610,7 @@
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
dir = 1
},
-/obj/machinery/camera/directional/south,
+/obj/machinery/camera/preset/tarkon/directional/south,
/turf/open/floor/iron,
/area/ruin/space/has_grav/port_tarkon/secoff)
"qn" = (
@@ -4705,7 +4719,9 @@
/area/ruin/space/has_grav/port_tarkon/atmos)
"qE" = (
/obj/effect/turf_decal/tile/neutral/half,
-/obj/machinery/camera/emp_proof/directional/south,
+/obj/machinery/camera/emp_proof/directional/south{
+ network = list("tarkon")
+ },
/obj/structure/extinguisher_cabinet{
pixel_x = -5;
pixel_y = -31
@@ -4973,7 +4989,9 @@
/turf/open/floor/iron/dark,
/area/ruin/space/has_grav/port_tarkon/developement)
"rC" = (
-/obj/machinery/camera/emp_proof/directional/south,
+/obj/machinery/camera/emp_proof/directional/south{
+ network = list("tarkon")
+ },
/turf/open/floor/plating,
/area/ruin/space/has_grav/port_tarkon/aiante)
"rD" = (
@@ -4983,7 +5001,7 @@
"rF" = (
/obj/structure/table/reinforced,
/obj/item/assembly/signaler,
-/obj/machinery/camera/directional/north,
+/obj/machinery/camera/preset/tarkon/directional/north,
/obj/effect/turf_decal/tile/yellow/anticorner{
dir = 4
},
@@ -5042,7 +5060,9 @@
/area/ruin/space/has_grav/port_tarkon/trauma)
"rS" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
-/obj/machinery/camera/emp_proof/directional/north,
+/obj/machinery/camera/emp_proof/directional/north{
+ network = list("tarkon")
+ },
/obj/effect/turf_decal/tile/blue/half{
dir = 1
},
@@ -5210,7 +5230,7 @@
/obj/effect/turf_decal/tile/brown/half{
dir = 1
},
-/obj/machinery/camera/directional/north,
+/obj/machinery/camera/preset/tarkon/directional/north,
/turf/open/floor/iron,
/area/ruin/space/has_grav/port_tarkon/mining)
"sz" = (
@@ -5330,10 +5350,10 @@
/obj/structure/table/reinforced,
/obj/structure/extinguisher_cabinet/directional/north,
/obj/item/folder/white,
-/obj/machinery/camera/directional/north{
+/obj/machinery/camera/preset/tarkon/directional/north{
c_tag = "Xenobiology - Cytology Desk";
name = "xenobiology camera";
- network = list("ss13","xeno","rd")
+ network = list("tarkon","xeno","rd")
},
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 1
@@ -5506,7 +5526,7 @@
/obj/effect/turf_decal/tile/purple/half{
dir = 4
},
-/obj/machinery/camera/directional/east,
+/obj/machinery/camera/preset/tarkon/directional/east,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 8
},
@@ -5889,7 +5909,7 @@
"uX" = (
/obj/machinery/firealarm/directional/east,
/obj/structure/table/wood,
-/obj/machinery/camera/directional/east,
+/obj/machinery/camera/preset/tarkon/directional/east,
/turf/open/floor/wood,
/area/ruin/space/has_grav/port_tarkon/dorms)
"uZ" = (
@@ -5970,7 +5990,7 @@
/obj/effect/turf_decal/tile/brown/half{
dir = 4
},
-/obj/machinery/camera/directional/east,
+/obj/machinery/camera/preset/tarkon/directional/east,
/turf/open/floor/iron,
/area/ruin/space/has_grav/port_tarkon/cargo)
"vl" = (
@@ -6045,7 +6065,7 @@
/obj/machinery/computer/operating/oldstation{
dir = 1
},
-/obj/machinery/camera/directional/east,
+/obj/machinery/camera/preset/tarkon/directional/east,
/turf/open/floor/iron/dark,
/area/ruin/space/has_grav/port_tarkon/developement)
"vx" = (
@@ -6063,7 +6083,7 @@
/turf/open/floor/plating,
/area/ruin/space/has_grav/port_tarkon/atmos)
"vz" = (
-/obj/machinery/camera/directional/west,
+/obj/machinery/camera/preset/tarkon/directional/west,
/turf/open/floor/plating,
/area/ruin/space/has_grav/port_tarkon/aichamber)
"vA" = (
@@ -6115,7 +6135,9 @@
/obj/item/reagent_containers/cup/bucket,
/obj/item/soap/nanotrasen,
/obj/item/tape/ruins/tarkon/celebration,
-/obj/machinery/camera/emp_proof/directional/west,
+/obj/machinery/camera/emp_proof/directional/west{
+ network = list("tarkon")
+ },
/turf/open/floor/plating,
/area/ruin/space/has_grav/port_tarkon/porthall)
"vG" = (
@@ -6123,7 +6145,9 @@
dir = 4
},
/obj/machinery/light/directional/east,
-/obj/machinery/camera/emp_proof/directional/east,
+/obj/machinery/camera/emp_proof/directional/east{
+ network = list("tarkon")
+ },
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
dir = 8
},
@@ -6240,7 +6264,7 @@
/area/ruin/space/has_grav/port_tarkon/porthall)
"wd" = (
/obj/structure/flora/bush/sunny,
-/obj/machinery/camera/directional/east,
+/obj/machinery/camera/preset/tarkon/directional/east,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
dir = 8
},
@@ -6328,7 +6352,7 @@
/obj/effect/turf_decal/tile/yellow/half{
dir = 1
},
-/obj/machinery/camera/directional/north,
+/obj/machinery/camera/preset/tarkon/directional/north,
/turf/open/floor/iron,
/area/ruin/space/has_grav/port_tarkon/atmos)
"wp" = (
@@ -6625,7 +6649,7 @@
/obj/effect/turf_decal/tile/purple/half{
dir = 1
},
-/obj/machinery/camera/directional/north,
+/obj/machinery/camera/preset/tarkon/directional/north,
/turf/open/floor/iron/dark,
/area/ruin/space/has_grav/port_tarkon/developement)
"xx" = (
@@ -6640,7 +6664,7 @@
/turf/open/floor/iron,
/area/ruin/space/has_grav/port_tarkon/secoff)
"xy" = (
-/obj/machinery/camera/directional/east,
+/obj/machinery/camera/preset/tarkon/directional/east,
/turf/open/floor/circuit,
/area/ruin/space/has_grav/port_tarkon/aichamber)
"xz" = (
@@ -6867,10 +6891,10 @@
"yq" = (
/obj/structure/bed/medical/emergency,
/obj/machinery/iv_drip,
-/obj/machinery/camera/directional/east{
+/obj/machinery/camera/preset/tarkon/directional/east{
c_tag = "Medbay - Operating Room";
name = "medbay camera";
- network = list("ss13","medbay")
+ network = list("tarkon","medbay")
},
/obj/effect/turf_decal/tile/blue/opposingcorners,
/turf/open/floor/iron/white,
@@ -6920,7 +6944,7 @@
dir = 1
},
/obj/item/dice,
-/obj/machinery/camera/directional/north,
+/obj/machinery/camera/preset/tarkon/directional/north,
/turf/open/floor/iron/dark,
/area/ruin/space/has_grav/port_tarkon/comms)
"yC" = (
@@ -6938,7 +6962,7 @@
/turf/template_noop,
/area/template_noop)
"yF" = (
-/obj/machinery/camera/directional/south,
+/obj/machinery/camera/preset/tarkon/directional/south,
/turf/open/floor/grass,
/area/ruin/space/has_grav/port_tarkon/park)
"yG" = (
@@ -7145,7 +7169,7 @@
/obj/effect/turf_decal/tile/purple/half{
dir = 1
},
-/obj/machinery/camera/directional/north,
+/obj/machinery/camera/preset/tarkon/directional/north,
/obj/structure/extinguisher_cabinet/directional/north,
/turf/open/floor/iron/dark,
/area/ruin/space/has_grav/port_tarkon/developement)
@@ -7213,7 +7237,7 @@
/obj/effect/turf_decal/tile/brown/half{
dir = 1
},
-/obj/machinery/camera/directional/north,
+/obj/machinery/camera/preset/tarkon/directional/north,
/obj/machinery/recharge_station,
/turf/open/floor/iron,
/area/ruin/space/has_grav/port_tarkon/mining)
@@ -7471,7 +7495,7 @@
/area/template_noop)
"An" = (
/mob/living/basic/carp/mega,
-/obj/machinery/camera/directional/north,
+/obj/machinery/camera/preset/tarkon/directional/north,
/turf/open/floor/plating/airless,
/area/template_noop)
"Ao" = (
@@ -7620,7 +7644,9 @@
/area/ruin/space/has_grav/port_tarkon/viro)
"AK" = (
/obj/machinery/griddle,
-/obj/machinery/camera/emp_proof/directional/south,
+/obj/machinery/camera/emp_proof/directional/south{
+ network = list("tarkon")
+ },
/obj/effect/turf_decal/tile/bar/opposingcorners,
/turf/open/floor/iron/dark,
/area/ruin/space/has_grav/port_tarkon/kitchen)
@@ -7788,7 +7814,7 @@
/obj/effect/turf_decal/tile/purple/half{
dir = 8
},
-/obj/machinery/camera/directional/west,
+/obj/machinery/camera/preset/tarkon/directional/west,
/obj/machinery/component_printer,
/turf/open/floor/iron/dark,
/area/ruin/space/has_grav/port_tarkon/developement)
@@ -8130,7 +8156,7 @@
/area/ruin/space/has_grav/port_tarkon/developement)
"CC" = (
/obj/machinery/power/smes,
-/obj/machinery/camera/directional/east,
+/obj/machinery/camera/preset/tarkon/directional/east,
/obj/structure/cable,
/turf/open/floor/iron/dark,
/area/ruin/space/has_grav/port_tarkon/atmos)
@@ -8152,7 +8178,7 @@
/obj/effect/turf_decal/tile/purple/half{
dir = 8
},
-/obj/machinery/camera/directional/west,
+/obj/machinery/camera/preset/tarkon/directional/west,
/turf/open/floor/iron/dark,
/area/ruin/space/has_grav/port_tarkon/developement)
"CF" = (
@@ -8401,7 +8427,7 @@
/obj/effect/turf_decal/tile/purple/half{
dir = 1
},
-/obj/machinery/camera/directional/north,
+/obj/machinery/camera/preset/tarkon/directional/north,
/turf/open/floor/iron/dark,
/area/ruin/space/has_grav/port_tarkon/scienceaway)
"DF" = (
@@ -8459,7 +8485,9 @@
/obj/effect/turf_decal/tile/neutral/half{
dir = 1
},
-/obj/machinery/camera/emp_proof/directional/north,
+/obj/machinery/camera/emp_proof/directional/north{
+ network = list("tarkon")
+ },
/turf/open/floor/iron,
/area/ruin/space/has_grav/port_tarkon/centerhall)
"DS" = (
@@ -8665,7 +8693,9 @@
/obj/effect/turf_decal/tile/green/anticorner{
dir = 1
},
-/obj/machinery/camera/emp_proof/directional/north,
+/obj/machinery/camera/emp_proof/directional/north{
+ network = list("tarkon")
+ },
/obj/structure/extinguisher_cabinet/directional/west,
/turf/open/floor/iron/white,
/area/ruin/space/has_grav/port_tarkon/viro)
@@ -8723,7 +8753,7 @@
/area/ruin/space/has_grav/port_tarkon/asteroid)
"EJ" = (
/obj/machinery/autolathe,
-/obj/machinery/camera/directional/north,
+/obj/machinery/camera/preset/tarkon/directional/north,
/obj/effect/turf_decal/tile/yellow/anticorner{
dir = 1
},
@@ -9050,7 +9080,7 @@
/turf/open/floor/iron/dark,
/area/ruin/space/has_grav/port_tarkon/developement)
"FT" = (
-/obj/machinery/camera/directional/north{
+/obj/machinery/camera/preset/tarkon/directional/north{
c_tag = "MiniSat AI Chamber South";
network = list("aicore")
},
@@ -9110,7 +9140,7 @@
/area/ruin/space/has_grav/port_tarkon/dorms)
"Ge" = (
/obj/effect/turf_decal/sand/plating,
-/obj/machinery/camera/directional/east,
+/obj/machinery/camera/preset/tarkon/directional/east,
/turf/open/floor/iron,
/area/ruin/space/has_grav/port_tarkon/mining)
"Gf" = (
@@ -9148,7 +9178,7 @@
/area/ruin/space/has_grav/port_tarkon/comms)
"Gk" = (
/obj/structure/table,
-/obj/machinery/camera/directional/west,
+/obj/machinery/camera/preset/tarkon/directional/west,
/turf/open/floor/iron/white,
/area/ruin/space/has_grav/port_tarkon/viro)
"Gl" = (
@@ -9206,7 +9236,7 @@
/obj/effect/turf_decal/tile/purple/half{
dir = 4
},
-/obj/machinery/camera/directional/east,
+/obj/machinery/camera/preset/tarkon/directional/east,
/turf/open/floor/iron/dark,
/area/ruin/space/has_grav/port_tarkon/scienceaway)
"Gy" = (
@@ -9537,7 +9567,9 @@
/obj/effect/turf_decal/tile/blue/anticorner{
dir = 1
},
-/obj/machinery/camera/emp_proof/directional/north,
+/obj/machinery/camera/emp_proof/directional/north{
+ network = list("tarkon")
+ },
/turf/open/floor/iron/dark,
/area/ruin/space/has_grav/port_tarkon/comms)
"HL" = (
@@ -9655,7 +9687,9 @@
"Ii" = (
/obj/machinery/hydroponics/constructable,
/obj/structure/window/reinforced/spawner/directional/north,
-/obj/machinery/camera/emp_proof/directional/east,
+/obj/machinery/camera/emp_proof/directional/east{
+ network = list("tarkon")
+ },
/turf/open/floor/grass,
/area/ruin/space/has_grav/port_tarkon/garden)
"Ij" = (
@@ -9805,7 +9839,7 @@
/area/ruin/space/has_grav/port_tarkon/trauma)
"IQ" = (
/obj/effect/turf_decal/tile/purple/half,
-/obj/machinery/camera/directional/south,
+/obj/machinery/camera/preset/tarkon/directional/south,
/turf/open/floor/iron/dark,
/area/ruin/space/has_grav/port_tarkon/scienceaway)
"IR" = (
@@ -9898,7 +9932,9 @@
/turf/open/floor/iron/white,
/area/ruin/space/has_grav/port_tarkon/trauma)
"Jg" = (
-/obj/machinery/camera/emp_proof/directional/north,
+/obj/machinery/camera/emp_proof/directional/north{
+ network = list("tarkon")
+ },
/obj/structure/table/reinforced,
/obj/item/clipboard,
/obj/item/toy/figure/borg,
@@ -10149,7 +10185,9 @@
/obj/effect/turf_decal/tile/brown/half{
dir = 1
},
-/obj/machinery/camera/emp_proof/directional/north,
+/obj/machinery/camera/emp_proof/directional/north{
+ network = list("tarkon")
+ },
/turf/open/floor/iron,
/area/ruin/space/has_grav/port_tarkon/cargo)
"Kg" = (
@@ -10164,7 +10202,9 @@
/obj/effect/turf_decal/tile/neutral/half{
dir = 8
},
-/obj/machinery/camera/emp_proof/directional/west,
+/obj/machinery/camera/emp_proof/directional/west{
+ network = list("tarkon")
+ },
/obj/structure/cable,
/turf/open/floor/iron,
/area/ruin/space/has_grav/port_tarkon/centerhall)
@@ -10184,7 +10224,9 @@
/area/ruin/space/has_grav/port_tarkon/secoff)
"Kn" = (
/obj/structure/sign/departments/med/directional/west,
-/obj/machinery/camera/emp_proof/directional/west,
+/obj/machinery/camera/emp_proof/directional/west{
+ network = list("tarkon")
+ },
/obj/machinery/light/directional/west,
/obj/effect/turf_decal/tile/blue/half{
dir = 8
@@ -10326,7 +10368,7 @@
/obj/effect/turf_decal/tile/blue/half{
dir = 4
},
-/obj/machinery/camera/directional/east,
+/obj/machinery/camera/preset/tarkon/directional/east,
/obj/structure/spawner/tarkon_xenos/minor,
/turf/open/floor/iron/dark,
/area/ruin/space/has_grav/port_tarkon/comms)
@@ -10458,7 +10500,9 @@
/obj/effect/turf_decal/tile/neutral/half{
dir = 1
},
-/obj/machinery/camera/emp_proof/directional/north,
+/obj/machinery/camera/emp_proof/directional/north{
+ network = list("tarkon")
+ },
/turf/open/floor/iron,
/area/ruin/space/has_grav/port_tarkon/porthall)
"Lh" = (
@@ -10505,7 +10549,7 @@
/area/ruin/space/has_grav/port_tarkon/scienceaway)
"Lp" = (
/obj/effect/turf_decal/tile/purple/anticorner,
-/obj/machinery/camera/directional/east,
+/obj/machinery/camera/preset/tarkon/directional/east,
/turf/open/floor/iron/dark,
/area/ruin/space/has_grav/port_tarkon/scienceaway)
"Lq" = (
@@ -10823,7 +10867,9 @@
/turf/open/floor/iron/dark,
/area/ruin/space/has_grav/port_tarkon/developement)
"Mr" = (
-/obj/machinery/camera/emp_proof/directional/west,
+/obj/machinery/camera/emp_proof/directional/west{
+ network = list("tarkon")
+ },
/turf/open/floor/plating,
/area/ruin/space/has_grav/port_tarkon/forehall)
"Ms" = (
@@ -11021,7 +11067,7 @@
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
dir = 8
},
-/obj/machinery/camera/directional/north,
+/obj/machinery/camera/preset/tarkon/directional/north,
/turf/open/floor/iron,
/area/ruin/space/has_grav/port_tarkon/centerhall)
"Ng" = (
@@ -11156,7 +11202,9 @@
/obj/effect/turf_decal/tile/blue/half{
dir = 1
},
-/obj/machinery/camera/emp_proof/directional/north,
+/obj/machinery/camera/emp_proof/directional/north{
+ network = list("tarkon")
+ },
/obj/machinery/light/directional/north,
/turf/open/floor/iron/white,
/area/ruin/space/has_grav/port_tarkon/trauma)
@@ -11168,7 +11216,7 @@
/turf/open/floor/iron,
/area/ruin/space/has_grav/port_tarkon/centerhall)
"NH" = (
-/obj/machinery/camera/directional/east,
+/obj/machinery/camera/preset/tarkon/directional/east,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/wood/large,
/area/ruin/space/has_grav/port_tarkon/lounge)
@@ -11197,7 +11245,9 @@
"NO" = (
/obj/structure/sign/departments/science/directional/north,
/obj/machinery/light/directional/north,
-/obj/machinery/camera/emp_proof/directional/north,
+/obj/machinery/camera/emp_proof/directional/north{
+ network = list("tarkon")
+ },
/obj/effect/turf_decal/tile/purple/half{
dir = 1
},
@@ -11387,7 +11437,7 @@
/obj/effect/turf_decal/tile/blue/half{
dir = 4
},
-/obj/machinery/camera/directional/east,
+/obj/machinery/camera/preset/tarkon/directional/east,
/turf/open/floor/iron/white,
/area/ruin/space/has_grav/port_tarkon/trauma)
"OB" = (
@@ -11890,7 +11940,7 @@
/obj/effect/turf_decal/tile/blue/half{
dir = 8
},
-/obj/machinery/camera/directional/west,
+/obj/machinery/camera/preset/tarkon/directional/west,
/obj/machinery/chem_mass_spec,
/turf/open/floor/iron/white,
/area/ruin/space/has_grav/port_tarkon/trauma)
@@ -11970,12 +12020,16 @@
/obj/effect/turf_decal/tile/neutral/half{
dir = 8
},
-/obj/machinery/camera/emp_proof/directional/west,
+/obj/machinery/camera/emp_proof/directional/west{
+ network = list("tarkon")
+ },
/turf/open/floor/iron,
/area/ruin/space/has_grav/port_tarkon/forehall)
"QB" = (
/obj/effect/turf_decal/tile/blue/half,
-/obj/machinery/camera/emp_proof/directional/south,
+/obj/machinery/camera/emp_proof/directional/south{
+ network = list("tarkon")
+ },
/obj/structure/disposalpipe/segment,
/turf/open/floor/iron/white,
/area/ruin/space/has_grav/port_tarkon/trauma)
@@ -12039,7 +12093,9 @@
/turf/open/floor/iron,
/area/ruin/space/has_grav/port_tarkon/centerhall)
"QN" = (
-/obj/machinery/camera/emp_proof/directional/west,
+/obj/machinery/camera/emp_proof/directional/west{
+ network = list("tarkon")
+ },
/obj/structure/alien/resin,
/turf/open/floor/plating,
/area/ruin/space/has_grav/port_tarkon/aichamber)
@@ -12048,7 +12104,9 @@
dir = 4
},
/obj/structure/sign/departments/engineering/directional/west,
-/obj/machinery/camera/emp_proof/directional/west,
+/obj/machinery/camera/emp_proof/directional/west{
+ network = list("tarkon")
+ },
/obj/effect/turf_decal/tile/yellow/half{
dir = 8
},
@@ -12076,7 +12134,9 @@
/obj/structure/closet/generic/wall{
pixel_x = -32
},
-/obj/machinery/camera/emp_proof/directional/west,
+/obj/machinery/camera/emp_proof/directional/west{
+ network = list("tarkon")
+ },
/turf/open/floor/iron,
/area/ruin/space/has_grav/port_tarkon/dorms)
"QX" = (
@@ -12118,7 +12178,9 @@
/obj/effect/turf_decal/tile/neutral/anticorner{
dir = 8
},
-/obj/machinery/camera/emp_proof/directional/west,
+/obj/machinery/camera/emp_proof/directional/west{
+ network = list("tarkon")
+ },
/obj/machinery/vending/cigarette,
/turf/open/floor/iron,
/area/ruin/space/has_grav/port_tarkon/centerhall)
@@ -12257,7 +12319,7 @@
"RF" = (
/obj/structure/cable,
/obj/effect/turf_decal/tile/yellow/half,
-/obj/machinery/camera/directional/south,
+/obj/machinery/camera/preset/tarkon/directional/south,
/obj/structure/extinguisher_cabinet{
pixel_x = -5;
pixel_y = -31
@@ -12549,7 +12611,9 @@
/obj/effect/turf_decal/tile/red/real_red/half{
dir = 8
},
-/obj/machinery/camera/emp_proof/directional/west,
+/obj/machinery/camera/emp_proof/directional/west{
+ network = list("tarkon")
+ },
/turf/open/floor/iron,
/area/ruin/space/has_grav/port_tarkon/secoff)
"SD" = (
@@ -12603,8 +12667,8 @@
pixel_y = 4
},
/obj/item/pen/red,
-/obj/machinery/camera/directional/south{
- network = list("ss13","medbay");
+/obj/machinery/camera/preset/tarkon/directional/south{
+ network = list("tarkon","medbay");
c_tag = "Medical - Virology Patient Room B"
},
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
@@ -12879,7 +12943,7 @@
},
/obj/structure/alien/weeds/node,
/obj/machinery/light_switch/directional/west,
-/obj/machinery/camera/directional/west,
+/obj/machinery/camera/preset/tarkon/directional/west,
/turf/open/floor/iron/dark,
/area/ruin/space/has_grav/port_tarkon/scienceaway)
"TC" = (
@@ -13531,7 +13595,7 @@
dir = 4
},
/obj/structure/reagent_dispensers/watertank,
-/obj/machinery/camera/directional/north,
+/obj/machinery/camera/preset/tarkon/directional/north,
/turf/open/floor/iron/white,
/area/ruin/space/has_grav/port_tarkon/trauma)
"VH" = (
@@ -13759,7 +13823,7 @@
/turf/open/floor/iron/white,
/area/ruin/space/has_grav/port_tarkon/trauma)
"Wr" = (
-/obj/machinery/camera/directional/north,
+/obj/machinery/camera/preset/tarkon/directional/north,
/obj/structure/trash_pile,
/turf/open/floor/plating,
/area/ruin/space/has_grav/port_tarkon/developement)
@@ -13816,7 +13880,7 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/machinery/camera/directional/north,
+/obj/machinery/camera/preset/tarkon/directional/north,
/obj/machinery/light_switch/directional/north,
/turf/open/floor/iron/dark,
/area/ruin/space/has_grav/port_tarkon/observ)
@@ -13941,7 +14005,9 @@
/obj/effect/turf_decal/tile/neutral/half{
dir = 1
},
-/obj/machinery/camera/emp_proof/directional/north,
+/obj/machinery/camera/emp_proof/directional/north{
+ network = list("tarkon")
+ },
/turf/open/floor/iron,
/area/ruin/space/has_grav/port_tarkon/centerhall)
"WY" = (
@@ -14280,7 +14346,7 @@
dir = 5
},
/obj/structure/cable,
-/obj/machinery/camera/directional/east,
+/obj/machinery/camera/preset/tarkon/directional/east,
/turf/open/floor/engine,
/area/ruin/space/has_grav/port_tarkon/scienceaway)
"Yf" = (
@@ -14298,7 +14364,7 @@
/obj/item/stack/sheet/mineral/gold{
amount = 25
},
-/obj/machinery/camera/directional/east,
+/obj/machinery/camera/preset/tarkon/directional/east,
/obj/item/stack/sheet/mineral/uranium/five,
/turf/open/floor/iron/dark,
/area/ruin/space/has_grav/port_tarkon/developement)
@@ -14316,7 +14382,7 @@
/obj/effect/turf_decal/tile/brown/half{
dir = 1
},
-/obj/machinery/camera/directional/north,
+/obj/machinery/camera/preset/tarkon/directional/north,
/turf/open/floor/iron,
/area/ruin/space/has_grav/port_tarkon/storage)
"Yi" = (
@@ -14395,7 +14461,7 @@
/turf/open/floor/iron/dark,
/area/ruin/space/has_grav/port_tarkon/scienceaway)
"Yw" = (
-/obj/machinery/camera/directional/west,
+/obj/machinery/camera/preset/tarkon/directional/west,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/wood/parquet,
/area/ruin/space/has_grav/port_tarkon/lounge)
@@ -14405,7 +14471,7 @@
/turf/open/floor/plating,
/area/ruin/space/has_grav/port_tarkon/aiante)
"Yy" = (
-/obj/machinery/camera/directional/east,
+/obj/machinery/camera/preset/tarkon/directional/east,
/turf/open/floor/wood/large,
/area/ruin/space/has_grav/port_tarkon/random_dorm)
"Yz" = (
@@ -14634,7 +14700,7 @@
/obj/machinery/airalarm/directional/east,
/obj/effect/mapping_helpers/airalarm/all_access,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/camera/directional/east{
+/obj/machinery/camera/preset/tarkon/directional/east{
network = list("tarkon")
},
/turf/open/floor/iron/dark,
diff --git a/_maps/bubber/automapper/templates/IceBoxStation/iceboxstation_persistence.dmm b/_maps/bubber/automapper/templates/IceBoxStation/iceboxstation_persistence.dmm
index 5b02aed3f70..1959153532b 100644
--- a/_maps/bubber/automapper/templates/IceBoxStation/iceboxstation_persistence.dmm
+++ b/_maps/bubber/automapper/templates/IceBoxStation/iceboxstation_persistence.dmm
@@ -8689,9 +8689,9 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2,
/obj/structure/cable,
/obj/structure/rack/gunrack,
-/obj/item/gun/microfusion/mcr01/syndie,
-/obj/item/gun/microfusion/mcr01/syndie,
-/turf/open/floor/iron/dark/smooth_large,
+/obj/structure/sign/poster/contraband/energy_swords/directional/west,
+/obj/structure/disposalpipe/segment,
+/turf/open/floor/mineral/plastitanium/red,
/area/ruin/space/has_grav/bubbers/persistance/sec/armory)
"rI" = (
/obj/machinery/reagentgrinder{
@@ -18858,10 +18858,6 @@
pixel_x = -5;
pixel_y = 15
},
-/obj/item/stock_parts/power_store/cell/microfusion/advanced{
- pixel_x = 4;
- pixel_y = 14
- },
/obj/item/sign/flag/syndicate{
pixel_x = 0;
pixel_y = 12
diff --git a/_maps/bubber/automapper/templates/NebulaStation/nebulastation_armory.dmm b/_maps/bubber/automapper/templates/NebulaStation/nebulastation_armory.dmm
index b47fff9c608..2bc47a67269 100644
--- a/_maps/bubber/automapper/templates/NebulaStation/nebulastation_armory.dmm
+++ b/_maps/bubber/automapper/templates/NebulaStation/nebulastation_armory.dmm
@@ -14,7 +14,6 @@
},
/obj/item/gun/energy/laser/carbine,
/obj/effect/turf_decal/bot,
-/obj/effect/spawner/armory_spawn/microfusion,
/turf/open/floor/iron/dark/textured_large,
/area/station/ai_monitored/security/armory)
"h" = (
diff --git a/_maps/bubber/automapper/templates/lavaland/lavaland_persistence.dmm b/_maps/bubber/automapper/templates/lavaland/lavaland_persistence.dmm
index c2b5214e8af..2f8e65b01c7 100644
--- a/_maps/bubber/automapper/templates/lavaland/lavaland_persistence.dmm
+++ b/_maps/bubber/automapper/templates/lavaland/lavaland_persistence.dmm
@@ -9803,9 +9803,9 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2,
/obj/structure/cable,
/obj/structure/rack/gunrack,
-/obj/item/gun/microfusion/mcr01/syndie,
-/obj/item/gun/microfusion/mcr01/syndie,
-/turf/open/floor/iron/dark/smooth_large,
+/obj/structure/sign/poster/contraband/energy_swords/directional/west,
+/obj/structure/disposalpipe/segment,
+/turf/open/floor/mineral/plastitanium/red,
/area/ruin/space/has_grav/bubbers/persistance/sec/armory)
"tQ" = (
/obj/machinery/light/directional/north,
@@ -16372,10 +16372,6 @@
pixel_x = -5;
pixel_y = 15
},
-/obj/item/stock_parts/power_store/cell/microfusion/advanced{
- pixel_x = 4;
- pixel_y = 14
- },
/obj/item/sign/flag/syndicate{
pixel_x = 0;
pixel_y = 12
diff --git a/_maps/bubber/automapper/templates/wawastation/wawastation_armory.dmm b/_maps/bubber/automapper/templates/wawastation/wawastation_armory.dmm
index 4abf96308a9..9a25bfd0ecc 100644
--- a/_maps/bubber/automapper/templates/wawastation/wawastation_armory.dmm
+++ b/_maps/bubber/automapper/templates/wawastation/wawastation_armory.dmm
@@ -50,7 +50,6 @@
/obj/effect/turf_decal/tile/red/half/contrasted{
dir = 1
},
-/obj/effect/spawner/armory_spawn/microfusion,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/security/armory)
"F" = (
diff --git a/_maps/map_files/Blueshift/Blueshift.dmm b/_maps/map_files/Blueshift/Blueshift.dmm
index 10e5654f8aa..3fd43f55b36 100644
--- a/_maps/map_files/Blueshift/Blueshift.dmm
+++ b/_maps/map_files/Blueshift/Blueshift.dmm
@@ -117296,7 +117296,7 @@
/obj/effect/turf_decal/delivery,
/obj/structure/rack/gunrack,
/obj/machinery/firealarm/directional/south,
-/obj/effect/spawner/armory_spawn/microfusion,
+/obj/effect/spawner/random/armory/e_gun,
/turf/open/floor/iron/dark/corner{
dir = 8
},
diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm
index 45f588de344..db7072a0d4a 100644
--- a/_maps/map_files/BoxStation/BoxStation.dmm
+++ b/_maps/map_files/BoxStation/BoxStation.dmm
@@ -47,16 +47,15 @@
/turf/open/floor/iron/freezer,
/area/station/commons/toilet/locker)
"aam" = (
-/obj/machinery/door/poddoor/shutters{
- id = "HFRshutter";
- name = "Atmospherics HFR Shutters"
+/obj/structure/falsewall,
+/obj/effect/decal/cleanable/blood/trail_holder{
+ dir = 4
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
- dir = 9
+ dir = 6
},
-/obj/machinery/door/firedoor/heavy,
-/turf/open/floor/iron/dark,
-/area/station/engineering/atmos/hfr_room)
+/turf/open/floor/plating,
+/area/station/maintenance/port/aft)
"aau" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -94,6 +93,15 @@
"aaJ" = (
/turf/closed/wall/r_wall,
/area/station/security/prison/safe)
+"aaL" = (
+/obj/structure/fluff/metalpole{
+ dir = 1
+ },
+/obj/structure/fans/tiny/forcefield{
+ dir = 4
+ },
+/turf/open/floor/plating,
+/area/station/hallway/secondary/entry)
"aaZ" = (
/turf/closed/wall/r_wall,
/area/station/ai_monitored/security/armory)
@@ -128,11 +136,11 @@
/turf/open/floor/carpet/red,
/area/station/command/heads_quarters/hos)
"abt" = (
-/obj/machinery/suit_storage_unit/mining/eva,
-/obj/effect/turf_decal/stripes/line{
- dir = 10
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 4
},
-/turf/open/floor/iron/dark,
+/turf/open/floor/wood/parquet,
/area/station/command/heads_quarters/qm)
"abu" = (
/obj/machinery/computer/shuttle/labor{
@@ -141,14 +149,12 @@
/obj/effect/turf_decal/stripes/line{
dir = 8
},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer4,
/turf/open/floor/iron/dark,
/area/station/security/processing)
"abv" = (
-/obj/structure/closet/secure_closet/quartermaster,
-/obj/effect/turf_decal/stripes/line{
- dir = 6
- },
-/obj/item/storage/bag/money,
+/obj/machinery/suit_storage_unit/mining/eva,
+/obj/effect/turf_decal/stripes/box,
/turf/open/floor/iron/dark,
/area/station/command/heads_quarters/qm)
"abz" = (
@@ -169,12 +175,23 @@
dir = 4
},
/obj/effect/landmark/event_spawn,
-/turf/open/floor/carpet/royalblack,
+/obj/effect/turf_decal/siding/brown/corner,
+/obj/effect/turf_decal/siding/brown/inner_corner{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/brown/filled/line{
+ dir = 9
+ },
+/obj/effect/turf_decal/trimline/brown/filled/corner,
+/turf/open/floor/iron/dark/textured,
/area/station/command/heads_quarters/qm)
"abM" = (
/obj/machinery/airalarm/directional/east,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 4
+ },
/turf/open/floor/wood/parquet,
/area/station/command/heads_quarters/qm)
"abN" = (
@@ -198,12 +215,6 @@
/obj/effect/mapping_helpers/requests_console/announcement,
/obj/effect/mapping_helpers/requests_console/information,
/obj/effect/mapping_helpers/requests_console/assistance,
-/obj/machinery/button/door{
- id = "hosspace";
- name = "Space Shutters Control";
- pixel_x = -26;
- pixel_y = 34
- },
/obj/item/radio/intercom/directional/west,
/obj/structure/table/wood,
/obj/machinery/fax{
@@ -260,6 +271,14 @@
},
/turf/open/floor/iron/dark,
/area/station/command/heads_quarters/hos)
+"aco" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer4,
+/turf/open/floor/plating,
+/area/station/maintenance/solars/starboard/aft)
"acr" = (
/obj/structure/chair/comfy/black,
/obj/effect/landmark/start/head_of_security,
@@ -309,6 +328,12 @@
/obj/machinery/light_switch{
pixel_x = 27
},
+/obj/machinery/computer/security/labor{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/cable,
/turf/open/floor/iron/dark,
/area/station/security/processing)
"acH" = (
@@ -322,7 +347,10 @@
pixel_y = 28;
req_access = list("qm")
},
-/turf/open/floor/carpet/royalblack,
+/obj/effect/turf_decal/siding/dark/end{
+ dir = 4
+ },
+/turf/open/floor/carpet/red,
/area/station/command/heads_quarters/qm)
"acI" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -334,7 +362,13 @@
},
/obj/effect/mapping_helpers/requests_console/announcement,
/obj/effect/mapping_helpers/requests_console/supplies,
-/turf/open/floor/carpet/royalblack,
+/obj/effect/turf_decal/siding/brown/end{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/brown/filled/end{
+ dir = 1
+ },
+/turf/open/floor/iron/dark/textured,
/area/station/command/heads_quarters/qm)
"acN" = (
/obj/effect/landmark/start/hangover,
@@ -357,7 +391,9 @@
/area/station/command/heads_quarters/hos)
"acR" = (
/obj/structure/table/wood,
-/obj/item/flashlight/lamp,
+/obj/item/flashlight/lamp{
+ pixel_x = -7
+ },
/turf/open/floor/carpet/red,
/area/station/command/heads_quarters/hos)
"acS" = (
@@ -373,10 +409,6 @@
/obj/item/clothing/accessory/badge/holo/hos{
pixel_x = -6
},
-/obj/item/food/burger/red{
- desc = "Made from the meat of the first Clown to slip a Head of Security. Illegal in every sector but when has that ever stopped Security from throwing their own laws to the wind?";
- name = "security burger"
- },
/turf/open/floor/carpet/red,
/area/station/command/heads_quarters/hos)
"acU" = (
@@ -401,6 +433,7 @@
/obj/machinery/disposal/bin,
/obj/structure/disposalpipe/trunk,
/obj/structure/cable,
+/obj/machinery/firealarm/directional/east,
/turf/open/floor/iron/dark,
/area/station/command/heads_quarters/hos)
"adk" = (
@@ -416,6 +449,12 @@
/area/station/command/heads_quarters/hos)
"adn" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
+/obj/machinery/button/door{
+ id = "hosspace";
+ name = "Space Shutters Control";
+ pixel_x = -21;
+ pixel_y = 35
+ },
/turf/open/floor/iron/dark,
/area/station/command/heads_quarters/hos)
"ado" = (
@@ -446,31 +485,26 @@
/turf/open/floor/plating,
/area/station/security/office)
"adv" = (
-/obj/structure/chair/office{
- dir = 8
- },
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
-/obj/effect/turf_decal/tile/blue{
+/obj/structure/chair/office{
dir = 8
},
/obj/machinery/button/ticket_machine{
pixel_x = -32;
pixel_y = 38
},
-/turf/open/floor/iron,
+/obj/effect/turf_decal/siding/wood{
+ dir = 4
+ },
+/turf/open/floor/iron/dark/smooth_large,
/area/station/command/heads_quarters/hop)
"adw" = (
-/obj/machinery/fax{
- fax_name = "Quartermaster's Office";
- name = "Quartermaster's Fax Machine"
+/obj/machinery/computer/cargo{
+ dir = 1
},
-/obj/structure/table,
-/turf/open/floor/carpet/royalblack,
+/turf/open/floor/iron/dark/textured_large,
/area/station/command/heads_quarters/qm)
"adx" = (
/obj/structure/extinguisher_cabinet/directional/east,
@@ -529,7 +563,7 @@
/obj/effect/turf_decal/loading_area{
dir = 4
},
-/turf/open/floor/iron,
+/turf/open/floor/iron/large,
/area/station/hallway/primary/central)
"adW" = (
/obj/effect/mapping_helpers/airlock/cyclelink_helper,
@@ -553,37 +587,39 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 4
},
-/turf/open/floor/carpet/royalblack,
+/obj/effect/turf_decal/siding/brown{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/brown{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/brown/filled/line{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/brown/filled/line{
+ dir = 8
+ },
+/obj/structure/noticeboard/qm{
+ pixel_x = 32;
+ pixel_y = 4
+ },
+/turf/open/floor/iron/dark/textured,
/area/station/command/heads_quarters/qm)
"aea" = (
/obj/machinery/power/apc/auto_name/directional/west,
/obj/structure/cable,
-/obj/structure/filingcabinet,
-/obj/item/reagent_containers/cup/glass/bottle/whiskey,
-/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass,
-/obj/item/toy/figure/qm,
-/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
- pixel_x = 8;
- pixel_y = 8
- },
-/turf/open/floor/carpet/royalblack,
+/obj/structure/closet/secure_closet/quartermaster,
+/obj/item/storage/bag/money,
+/turf/open/floor/iron/dark/textured_large,
/area/station/command/heads_quarters/qm)
"aed" = (
/obj/item/radio/intercom/directional/west,
/obj/structure/table,
-/obj/item/paper_bin/carbon{
- pixel_x = -3;
- pixel_y = 7
+/obj/machinery/fax{
+ fax_name = "Quartermaster's Office";
+ name = "Quartermaster's Fax Machine"
},
-/obj/item/pen{
- pixel_x = 4;
- pixel_y = 4
- },
-/obj/item/clipboard,
-/obj/item/computer_disk/quartermaster,
-/obj/item/computer_disk/quartermaster,
-/obj/item/computer_disk/quartermaster,
-/turf/open/floor/carpet/royalblack,
+/turf/open/floor/iron/dark/textured_large,
/area/station/command/heads_quarters/qm)
"aee" = (
/obj/structure/cable,
@@ -593,7 +629,19 @@
"aej" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/carpet/royalblack,
+/obj/effect/turf_decal/siding/brown/corner{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/brown{
+ dir = 6
+ },
+/obj/effect/turf_decal/trimline/brown/filled/line{
+ dir = 6
+ },
+/obj/effect/turf_decal/trimline/brown/filled/corner{
+ dir = 1
+ },
+/turf/open/floor/iron/dark/textured,
/area/station/command/heads_quarters/qm)
"aek" = (
/obj/structure/disposalpipe/segment,
@@ -612,7 +660,7 @@
/obj/structure/disposalpipe/trunk{
dir = 4
},
-/turf/open/floor/mineral/gold,
+/turf/open/floor/iron/dark/textured_large,
/area/station/command/heads_quarters/qm)
"aeu" = (
/obj/machinery/camera/directional/north{
@@ -672,33 +720,50 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 8
},
-/turf/open/floor/mineral/gold,
+/obj/effect/turf_decal/siding/brown/inner_corner,
+/obj/effect/turf_decal/siding/brown/corner{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/brown/filled/corner{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/brown/filled/line{
+ dir = 6
+ },
+/turf/open/floor/iron/dark/textured,
/area/station/command/heads_quarters/qm)
"aeZ" = (
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/iron/dark,
/area/station/security/prison)
"afn" = (
+/obj/machinery/atmospherics/components/unary/airlock_pump/unbolt_only{
+ dir = 8
+ },
/turf/open/floor/plating,
/area/station/security/office)
"afo" = (
-/obj/machinery/door/airlock/external{
- name = "Escape Pod Three"
- },
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 8
},
/obj/effect/mapping_helpers/airlock/access/any/security/general,
+/obj/machinery/door/airlock/external{
+ name = "Escape Pod Three"
+ },
/turf/open/floor/plating,
/area/station/security/office)
"afq" = (
/obj/machinery/light/directional/east,
/obj/structure/table,
/obj/item/storage/medkit/regular{
- pixel_x = 6;
- pixel_y = -5
+ pixel_x = 1;
+ pixel_y = 5
},
-/turf/open/floor/iron,
+/obj/item/folder/yellow{
+ pixel_x = 7;
+ pixel_y = -12
+ },
+/turf/open/floor/iron/dark/textured_large,
/area/station/cargo/miningdock)
"afs" = (
/obj/machinery/shower/directional/west,
@@ -719,8 +784,17 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 9
},
+/obj/structure/filingcabinet,
+/obj/item/toy/figure/qm,
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass,
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
+ pixel_x = 8;
+ pixel_y = 8
+ },
+/obj/item/folder/yellow,
+/obj/item/reagent_containers/cup/glass/bottle/whiskey,
/obj/machinery/firealarm/directional/south,
-/turf/open/floor/mineral/gold,
+/turf/open/floor/iron/dark/textured_large,
/area/station/command/heads_quarters/qm)
"afw" = (
/obj/effect/spawner/structure/window,
@@ -739,7 +813,11 @@
/obj/machinery/coffeemaker,
/obj/item/coffee_cartridge,
/obj/item/coffee_cartridge,
-/turf/open/floor/iron/dark,
+/obj/effect/turf_decal/tile/purple/full{
+ alpha = 160;
+ color = "#6a3182"
+ },
+/turf/open/floor/iron/dark/smooth_large,
/area/station/science/breakroom)
"afE" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
@@ -747,15 +825,32 @@
},
/turf/open/floor/iron/dark,
/area/station/hallway/secondary/exit)
+"afM" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+ dir = 4
+ },
+/turf/open/floor/iron/large,
+/area/station/hallway/secondary/entry)
"afO" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/structure/sign/warning/vacuum/external/directional/north,
/turf/open/floor/plating,
/area/station/construction/mining/aux_base)
"afP" = (
-/turf/open/floor/iron/dark/side{
- dir = 8
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
},
+/obj/effect/turf_decal/stripes/white/line{
+ dir = 4;
+ color = "#EFB341"
+ },
+/obj/effect/turf_decal/siding/wideplating/dark/corner{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 1
+ },
+/turf/open/floor/iron/textured_large,
/area/station/ai_monitored/command/storage/eva)
"afQ" = (
/obj/effect/spawner/structure/window/reinforced,
@@ -763,20 +858,19 @@
/turf/open/floor/plating,
/area/station/security/office)
"aga" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/effect/turf_decal/tile/dark_blue{
dir = 4
},
/obj/effect/turf_decal/tile/dark_blue{
dir = 1
},
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/dark/textured_edge,
/area/station/hallway/primary/central)
"agc" = (
-/obj/structure/closet/emcloset,
-/obj/machinery/light/small/directional/west,
+/obj/machinery/light/small/directional/south,
/turf/open/floor/plating,
/area/station/security/office)
"age" = (
@@ -800,6 +894,11 @@
/area/station/security/brig)
"agl" = (
/obj/structure/cable,
+/obj/effect/turf_decal/trimline/red/real_red/filled/line,
+/obj/effect/turf_decal/trimline/dark/line,
+/obj/effect/turf_decal/tile/red/real_red{
+ dir = 1
+ },
/turf/open/floor/iron/white,
/area/station/security/medical)
"agm" = (
@@ -816,7 +915,9 @@
/turf/open/floor/wood/stairs/left,
/area/station/common/pool/sauna)
"agv" = (
-/obj/effect/turf_decal/tile/brown/half/contrasted,
+/obj/machinery/light/directional/south,
+/obj/effect/turf_decal/trimline/brown/filled/line,
+/obj/effect/turf_decal/trimline/dark/line,
/turf/open/floor/iron,
/area/station/cargo/warehouse)
"agw" = (
@@ -882,11 +983,10 @@
/area/station/security/warden)
"agZ" = (
/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
- dir = 4
+/obj/machinery/atmospherics/components/binary/passive_gate/layer4{
+ target_pressure = 1200;
+ on = 1;
+ name = "Airlock Valve"
},
/turf/open/floor/plating,
/area/station/maintenance/department/security)
@@ -992,6 +1092,8 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 4
},
+/obj/effect/turf_decal/tile/red/real_red,
+/obj/effect/decal/cleanable/blood,
/turf/open/floor/iron/white,
/area/station/security/medical)
"ahV" = (
@@ -1026,18 +1128,22 @@
/turf/open/floor/plating,
/area/station/security/mechbay)
"aig" = (
-/obj/effect/turf_decal/tile/brown{
- dir = 1
+/obj/effect/turf_decal/siding/wideplating_new/light{
+ dir = 5
},
-/obj/effect/turf_decal/tile/brown,
-/obj/structure/extinguisher_cabinet{
- dir = 4;
- pixel_x = 24
+/obj/effect/turf_decal/siding/dark{
+ dir = 5
},
-/obj/effect/turf_decal/stripes/asteroid/corner{
- dir = 1
+/obj/structure/table,
+/obj/item/clipboard,
+/obj/item/paper{
+ pixel_x = 7;
+ pixel_y = 3
},
-/turf/open/floor/iron,
+/obj/item/sales_tagger,
+/obj/item/pen/red,
+/obj/structure/extinguisher_cabinet/directional/east,
+/turf/open/floor/iron/dark/small,
/area/station/cargo/storage)
"aih" = (
/obj/effect/turf_decal/tile/red/opposingcorners{
@@ -1064,7 +1170,10 @@
/turf/open/floor/iron/dark,
/area/station/security/evidence)
"aio" = (
-/turf/open/floor/iron/dark,
+/obj/effect/turf_decal/siding/dark{
+ dir = 1
+ },
+/turf/open/floor/iron/textured_large,
/area/station/ai_monitored/command/storage/eva)
"air" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
@@ -1097,6 +1206,7 @@
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/effect/turf_decal/trimline/dark_blue/filled/warning,
+/obj/effect/turf_decal/trimline/dark/warning,
/turf/open/floor/iron/dark,
/area/station/security/evidence)
"aiE" = (
@@ -1107,14 +1217,8 @@
/turf/open/floor/iron/dark,
/area/station/security/evidence)
"aiI" = (
-/obj/effect/turf_decal/tile/yellow{
- dir = 1
- },
-/obj/effect/turf_decal/tile/yellow{
- dir = 8
- },
/obj/structure/tank_holder/extinguisher,
-/turf/open/floor/iron,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/hallway/primary/aft)
"aiK" = (
/obj/structure/cable,
@@ -1155,6 +1259,9 @@
dir = 1
},
/obj/machinery/computer/prisoner/gulag_teleporter_computer,
+/obj/effect/turf_decal/trimline/white/line{
+ dir = 1
+ },
/turf/open/floor/iron/dark,
/area/station/security/execution/education)
"aiT" = (
@@ -1177,15 +1284,23 @@
/turf/closed/wall/r_wall,
/area/station/security/brig)
"aja" = (
-/obj/effect/turf_decal/tile/brown,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/siding/wideplating_new/light{
+ dir = 6
+ },
+/obj/structure/railing,
+/obj/effect/turf_decal/siding/dark{
+ dir = 6
+ },
+/turf/open/floor/iron/dark/herringbone,
/area/station/cargo/storage)
"ajb" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/obj/machinery/recharge_station,
-/turf/open/floor/iron,
+/obj/structure/table,
+/obj/item/storage/box/shipping,
+/obj/item/clothing/head/soft,
+/obj/item/clothing/head/soft,
+/obj/structure/marker_beacon/indigo,
+/obj/effect/turf_decal/bot,
+/turf/open/floor/iron/dark/textured_large,
/area/station/cargo/storage)
"ajc" = (
/turf/open/floor/plating/airless,
@@ -1196,11 +1311,15 @@
/obj/effect/turf_decal/trimline/dark_blue/filled/line{
dir = 1
},
+/obj/effect/turf_decal/trimline/dark/line{
+ dir = 1
+ },
/turf/open/floor/iron/dark,
/area/station/security/execution/transfer)
"ajg" = (
-/obj/structure/extinguisher_cabinet/directional/east,
-/obj/effect/turf_decal/tile/dark_green,
+/obj/effect/turf_decal/trimline/dark_green/filled/corner{
+ dir = 4
+ },
/turf/open/floor/iron/dark,
/area/station/hallway/primary/fore)
"ajl" = (
@@ -1214,7 +1333,7 @@
},
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron,
-/area/station/science/ordnance/bomb)
+/area/station/science/ordnance/testlab)
"ajm" = (
/obj/structure/window/reinforced/spawner/directional/west,
/turf/open/floor/iron/dark,
@@ -1251,13 +1370,10 @@
/turf/open/floor/plating,
/area/station/maintenance/port/fore)
"ajF" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
/obj/machinery/airalarm/directional/north,
-/obj/structure/table,
-/obj/item/storage/box/shipping,
-/obj/effect/spawner/random/bureaucracy/birthday_wrap,
+/obj/effect/turf_decal/trimline/brown/filled/line{
+ dir = 9
+ },
/turf/open/floor/iron,
/area/station/cargo/storage)
"ajI" = (
@@ -1275,6 +1391,10 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/pink/hidden{
dir = 4
},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer4,
/turf/open/floor/plating,
/area/station/maintenance/port/fore)
"ajL" = (
@@ -1290,7 +1410,10 @@
},
/area/station/engineering/main)
"ajO" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
+/obj/structure/closet/crate,
+/obj/item/airlock_painter/decal,
+/obj/effect/spawner/random/maintenance/three,
+/obj/effect/turf_decal/bot,
/turf/open/floor/iron,
/area/station/cargo/warehouse)
"ajV" = (
@@ -1309,10 +1432,14 @@
/area/station/ai_monitored/turret_protected/aisat_interior)
"ajY" = (
/obj/effect/mapping_helpers/dead_body_placer,
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+/obj/effect/turf_decal/trimline/dark/filled/line,
+/obj/effect/turf_decal/trimline/dark/filled/line{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 8
},
-/turf/open/floor/iron/dark,
+/turf/open/floor/iron/dark/small,
/area/station/medical/morgue)
"ajZ" = (
/obj/structure/reagent_dispensers/fueltank,
@@ -1325,6 +1452,19 @@
/obj/effect/turf_decal/tile/yellow,
/turf/open/floor/iron,
/area/station/construction/mining/aux_base)
+"aka" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 4
+ },
+/turf/open/floor/plating,
+/area/station/maintenance/fore)
"akf" = (
/obj/machinery/atmospherics/components/unary/vent_pump/high_volume/siphon/monitored/air_output{
dir = 1
@@ -1346,7 +1486,12 @@
pixel_x = -31;
pixel_y = -24
},
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/yellow/corner{
+ dir = 8
+ },
+/turf/open/floor/iron/edge{
+ dir = 8
+ },
/area/station/hallway/primary/central)
"akr" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
@@ -1355,10 +1500,9 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 4
},
-/obj/effect/turf_decal/tile/brown{
- dir = 4
+/obj/effect/turf_decal/trimline/brown/filled/warning{
+ dir = 5
},
-/obj/effect/turf_decal/tile/brown,
/turf/open/floor/iron,
/area/station/cargo/storage)
"akv" = (
@@ -1368,12 +1512,38 @@
/obj/effect/mapping_helpers/airlock/unres{
dir = 4
},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 8
+ },
/turf/open/floor/plating,
/area/station/maintenance/starboard/fore)
"akB" = (
/obj/structure/cable,
+/obj/machinery/atmospherics/components/unary/airlock_pump/unbolt_only,
/turf/open/floor/plating,
/area/station/maintenance/solars/port/fore)
+"akC" = (
+/obj/structure/fluff/metalpole{
+ dir = 1;
+ pixel_y = 32
+ },
+/obj/machinery/door/firedoor/border_only{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes/white/line{
+ color = "#52B4E9";
+ dir = 1;
+ name = "blue line"
+ },
+/obj/structure/railing/corner/end{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/blue/fourcorners,
+/turf/open/floor/iron/white,
+/area/station/hallway/secondary/entry)
"akE" = (
/obj/effect/turf_decal/delivery,
/obj/structure/window/reinforced/spawner/directional/west,
@@ -1393,6 +1563,7 @@
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/turf_decal/trimline/dark/warning,
/turf/open/floor/iron/dark,
/area/station/security/brig)
"akJ" = (
@@ -1452,6 +1623,11 @@
/area/station/security/prison)
"alg" = (
/obj/machinery/light/directional/north,
+/obj/structure/rack/shelf,
+/obj/effect/spawner/random/trash/soap,
+/obj/effect/turf_decal/siding/white{
+ dir = 1
+ },
/turf/open/floor/iron/freezer,
/area/station/commons/toilet)
"alh" = (
@@ -1460,6 +1636,7 @@
},
/obj/structure/cable,
/obj/effect/mapping_helpers/airlock/access/any/engineering/general,
+/obj/effect/mapping_helpers/airlock/cyclelink_helper,
/turf/open/floor/plating,
/area/station/maintenance/solars/port/fore)
"ali" = (
@@ -1477,12 +1654,31 @@
/turf/open/floor/plating/airless,
/area/space/nearstation)
"alp" = (
+/obj/machinery/atmospherics/components/unary/airlock_pump{
+ dir = 4
+ },
/turf/open/floor/plating,
/area/station/security/processing)
"alt" = (
-/obj/structure/reagent_dispensers/wall/peppertank,
-/turf/closed/wall/r_wall,
-/area/station/ai_monitored/security/armory)
+/obj/effect/turf_decal/trimline/dark/filled/warning{
+ alpha = 160;
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/purple/warning{
+ alpha = 200;
+ dir = 4;
+ color = "#a56dc2"
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 4
+ },
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+ dir = 8
+ },
+/turf/open/floor/iron/white/smooth_edge{
+ dir = 4
+ },
+/area/station/science/xenobiology)
"alu" = (
/obj/effect/landmark/start/assistant,
/obj/structure/railing{
@@ -1515,11 +1711,26 @@
/obj/effect/turf_decal/caution/stand_clear/blue,
/turf/open/floor/iron/dark,
/area/station/security/prison/safe)
+"aly" = (
+/obj/effect/turf_decal/siding/dark/corner{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes/line,
+/obj/effect/turf_decal/stripes/white/line{
+ color = "#EFB341"
+ },
+/obj/effect/turf_decal/siding/wideplating/dark/corner,
+/obj/effect/turf_decal/siding/dark{
+ dir = 4
+ },
+/turf/open/floor/iron/textured_large,
+/area/station/ai_monitored/command/storage/eva)
"alz" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/structure/cable,
/obj/effect/turf_decal/trimline/dark_blue/filled/warning,
+/obj/effect/turf_decal/trimline/dark/warning,
/turf/open/floor/iron/dark,
/area/station/security/brig)
"alB" = (
@@ -1545,13 +1756,12 @@
/area/station/construction/mining/aux_base)
"alE" = (
/obj/structure/cable,
-/obj/effect/turf_decal/tile/brown{
- dir = 4
- },
-/obj/effect/turf_decal/tile/brown,
/obj/structure/disposalpipe/segment{
dir = 4
},
+/obj/effect/turf_decal/trimline/brown/filled/warning{
+ dir = 6
+ },
/turf/open/floor/iron,
/area/station/cargo/storage)
"alF" = (
@@ -1651,6 +1861,9 @@
/obj/effect/turf_decal/trimline/dark_blue/filled/line{
dir = 8
},
+/obj/effect/turf_decal/trimline/dark/line{
+ dir = 8
+ },
/turf/open/floor/iron/dark,
/area/station/security/holding_cell)
"amv" = (
@@ -1698,6 +1911,10 @@
/turf/open/floor/plating,
/area/station/maintenance/solars/port/fore)
"amA" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 1
+ },
/turf/open/floor/plating,
/area/station/maintenance/solars/port/fore)
"amC" = (
@@ -1715,25 +1932,26 @@
/turf/open/floor/plating,
/area/station/maintenance/port/fore)
"amG" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer4,
/turf/open/floor/iron/dark,
/area/station/security/processing)
"amH" = (
-/obj/effect/turf_decal/bot,
-/obj/structure/closet/crate,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/random/maintenance,
-/obj/item/stack/sheet/iron/ten,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 8
+ },
/turf/open/floor/iron,
/area/station/cargo/warehouse)
"amJ" = (
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
- dir = 8
+/obj/effect/turf_decal/bot_white{
+ color = "#0aceff"
+ },
+/obj/effect/turf_decal/box/white{
+ color = "#0aceff"
},
/obj/effect/turf_decal/vg_decals/department/med,
-/turf/open/floor/iron,
+/turf/open/floor/iron/large,
/area/station/hallway/primary/starboard)
"amK" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
@@ -1743,12 +1961,15 @@
/turf/open/floor/iron/dark/small,
/area/station/security/interrogation)
"amM" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/stripes/corner{
+/obj/structure/cable,
+/obj/effect/turf_decal/siding/wideplating_new/dark/corner{
dir = 8
},
-/obj/structure/cable,
-/turf/open/floor/iron/dark/textured,
+/obj/effect/turf_decal/siding/wideplating_new/dark/corner,
+/obj/effect/turf_decal/siding/wideplating_new/dark{
+ dir = 1
+ },
+/turf/open/floor/iron/textured_large,
/area/station/command/gateway)
"amQ" = (
/obj/effect/turf_decal/trimline/dark_blue/filled/warning{
@@ -1772,15 +1993,26 @@
/obj/effect/turf_decal/vg_decals/department/cargo{
dir = 4
},
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/brown/filled/warning{
+ dir = 8
+ },
+/turf/open/floor/iron/textured_edge{
+ dir = 4
+ },
/area/station/cargo/office)
"amS" = (
/obj/structure/disposalpipe/segment,
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/effect/turf_decal/vg_decals/department/mining,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/brown/filled/warning,
+/obj/effect/turf_decal/trimline/dark/warning,
+/obj/effect/turf_decal/vg_decals/department/mining{
+ dir = 1
+ },
+/turf/open/floor/iron/textured_edge{
+ dir = 1
+ },
/area/station/cargo/office)
"amT" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -1873,6 +2105,7 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/pink/hidden{
dir = 8
},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer4,
/turf/open/floor/plating,
/area/station/maintenance/port/fore)
"ank" = (
@@ -1884,6 +2117,7 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/pink/hidden{
dir = 9
},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer4,
/turf/open/floor/plating,
/area/station/maintenance/port/fore)
"anm" = (
@@ -1897,12 +2131,10 @@
/turf/open/floor/wood,
/area/station/maintenance/port/fore)
"ano" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
- dir = 1
- },
/obj/structure/railing{
dir = 8
},
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
/turf/open/floor/iron/dark,
/area/station/hallway/secondary/exit)
"anp" = (
@@ -1922,6 +2154,7 @@
name = "Cell 3";
pixel_y = -32
},
+/obj/effect/turf_decal/trimline/dark/line,
/turf/open/floor/iron/dark,
/area/station/security/brig)
"anD" = (
@@ -1958,7 +2191,13 @@
/area/station/maintenance/department/security)
"anG" = (
/obj/effect/turf_decal/trimline/blue/filled/line,
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/trimline/white/line,
+/obj/effect/turf_decal/trimline/blue/filled/mid_joiner,
+/obj/effect/turf_decal/siding/blue/corner{
+ color = "#8ab4cb";
+ dir = 8
+ },
+/turf/open/floor/iron/white/smooth_edge,
/area/station/medical/treatment_center)
"anH" = (
/obj/structure/sign/warning/electric_shock,
@@ -1970,10 +2209,15 @@
},
/obj/effect/mapping_helpers/airlock/access/any/engineering/general,
/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 1
+ },
/turf/open/floor/plating,
/area/station/maintenance/solars/port/fore)
"anJ" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/pink/hidden,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer4,
/turf/open/floor/plating,
/area/station/maintenance/port/fore)
"anK" = (
@@ -2036,20 +2280,28 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 4
},
-/obj/machinery/firealarm/directional/north,
/turf/open/floor/iron/grimy,
/area/station/security/detectives_office)
"anZ" = (
/turf/closed/wall,
/area/station/commons/dorms/apartment1)
"aoa" = (
-/obj/structure/rack,
/obj/item/pipe_dispenser,
/obj/item/pipe_dispenser,
-/obj/structure/table/reinforced,
-/obj/structure/window/reinforced/spawner/directional/north,
+/obj/machinery/door/window/left/directional/south{
+ req_access = list("eva");
+ name = "Inducer Storage"
+ },
/obj/structure/window/reinforced/spawner/directional/west,
-/turf/open/floor/iron/dark,
+/obj/structure/table/reinforced,
+/obj/item/stock_parts/power_store/cell/high,
+/obj/item/stock_parts/power_store/battery,
+/obj/item/inducer,
+/obj/item/inducer,
+/obj/item/inducer,
+/obj/machinery/cell_charger,
+/obj/effect/mapping_helpers/airlock/red_alert_access,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/ai_monitored/command/storage/eva)
"aoe" = (
/obj/machinery/light/small/directional/west,
@@ -2076,12 +2328,14 @@
/obj/machinery/light/small/directional/north,
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/pink/hidden,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer4,
/turf/open/floor/plating,
/area/station/maintenance/port/fore)
"aok" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/pink/hidden{
dir = 6
},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer4,
/turf/open/floor/plating,
/area/station/maintenance/port/fore)
"aol" = (
@@ -2147,6 +2401,10 @@
/turf/open/floor/iron/grimy,
/area/station/security/detectives_office)
"aoM" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 8
+ },
/turf/open/floor/plating,
/area/station/maintenance/solars/starboard/fore)
"aoO" = (
@@ -2216,15 +2474,14 @@
/area/station/security/evidence)
"apc" = (
/obj/machinery/power/apc/auto_name/directional/west,
-/obj/structure/trash_pile,
/obj/structure/cable,
+/obj/structure/rack,
+/obj/effect/spawner/random/maintenance/three,
/turf/open/floor/plating,
/area/station/maintenance/department/security)
"ape" = (
-/obj/effect/turf_decal/tile/brown{
- dir = 4
- },
-/turf/open/floor/iron,
+/obj/machinery/recharge_station,
+/turf/open/floor/iron/dark/textured_large,
/area/station/cargo/storage)
"apg" = (
/obj/structure/table/wood,
@@ -2246,6 +2503,7 @@
/obj/structure/disposalpipe/segment{
dir = 6
},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer5,
/turf/open/floor/plating,
/area/station/maintenance/department/security)
"apl" = (
@@ -2267,6 +2525,18 @@
/obj/effect/turf_decal/tile/yellow,
/obj/machinery/airalarm/directional/east,
/obj/machinery/light/directional/east,
+/obj/structure/rack,
+/obj/item/assault_pod/mining,
+/obj/item/wallframe/camera,
+/obj/item/wallframe/camera,
+/obj/item/wallframe/camera,
+/obj/item/wallframe/camera,
+/obj/item/stack/cable_coil,
+/obj/item/electronics/airlock,
+/obj/item/electronics/airlock,
+/obj/item/electronics/airlock,
+/obj/item/stack/cable_coil,
+/obj/item/electronics/airlock,
/turf/open/floor/iron,
/area/station/construction/mining/aux_base)
"aps" = (
@@ -2305,6 +2575,7 @@
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer5,
/turf/open/floor/plating,
/area/station/maintenance/department/security)
"apy" = (
@@ -2412,12 +2683,9 @@
/turf/open/floor/wood/tile,
/area/station/service/lawoffice)
"aqc" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/iron,
+/obj/structure/table/wood,
+/obj/item/storage/fancy/donut_box,
+/turf/open/floor/carpet,
/area/station/hallway/secondary/entry)
"aqe" = (
/obj/structure/lattice/catwalk,
@@ -2434,6 +2702,11 @@
/obj/effect/turf_decal/stripes/line{
dir = 8
},
+/obj/machinery/atmospherics/components/binary/passive_gate/layer4{
+ target_pressure = 1200;
+ on = 1;
+ name = "Airlock Valve"
+ },
/turf/open/floor/iron/dark,
/area/station/security/processing)
"aqh" = (
@@ -2471,6 +2744,7 @@
/area/station/security/brig)
"aqp" = (
/obj/effect/turf_decal/trimline/dark_blue/filled/corner,
+/obj/effect/turf_decal/trimline/dark/corner,
/turf/open/floor/iron/dark,
/area/station/security/brig)
"aqq" = (
@@ -2478,16 +2752,13 @@
/turf/open/floor/iron/dark/small,
/area/station/security/interrogation)
"aqs" = (
-/obj/effect/landmark/blobstart,
/obj/effect/spawner/liquids_spawner{
reagent_list = list(/datum/reagent/ants/fire = 190)
},
/turf/open/floor/iron/pool/cobble/corner,
/area/station/maintenance/starboard/fore)
"aqu" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
- dir = 4
- },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer4,
/turf/open/floor/iron/dark,
/area/station/security/processing)
"aqw" = (
@@ -2644,6 +2915,9 @@
/obj/effect/turf_decal/trimline/dark_blue/filled/line{
dir = 10
},
+/obj/effect/turf_decal/trimline/dark/line{
+ dir = 10
+ },
/turf/open/floor/iron/dark,
/area/station/security/brig)
"arm" = (
@@ -2657,6 +2931,7 @@
/area/station/maintenance/starboard/fore)
"arn" = (
/obj/effect/turf_decal/trimline/dark_blue/filled/line,
+/obj/effect/turf_decal/trimline/dark/line,
/turf/open/floor/iron/dark,
/area/station/security/holding_cell)
"aro" = (
@@ -2673,19 +2948,23 @@
/turf/open/floor/iron,
/area/station/hallway/primary/central/fore)
"arq" = (
+/obj/structure/reagent_dispensers/plumbed{
+ icon = 'modular_skyrat/modules/reagent_forging/icons/obj/forge_structures.dmi';
+ icon_state = "water_basin";
+ name = "water basin";
+ desc = "A basin full of water."
+ },
/obj/item/reagent_containers/cup/bucket/wooden{
pixel_y = 4
},
-/obj/structure/water_source/puddle{
- icon = 'modular_skyrat/modules/reagent_forging/icons/obj/forge_structures.dmi';
- base_icon_state = "water_basin";
- icon_state = "water_basin";
- name = "filled water basin"
- },
/turf/open/floor/wood/tile,
/area/station/common/pool/sauna)
"arr" = (
/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 8
+ },
/turf/open/floor/plating,
/area/station/maintenance/starboard/fore)
"art" = (
@@ -2735,13 +3014,25 @@
/turf/open/floor/plating,
/area/station/maintenance/starboard/aft)
"arB" = (
-/turf/closed/wall/r_wall,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+ dir = 4
+ },
+/obj/structure/chair/sofa/bench/left{
+ pixel_y = 8
+ },
+/obj/effect/landmark/start/assistant,
+/turf/open/floor/iron/dark/side{
+ dir = 1
+ },
/area/station/hallway/secondary/entry)
"arC" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 5
},
+/obj/effect/turf_decal/trimline/green/filled/corner{
+ dir = 8
+ },
/turf/open/floor/iron,
/area/station/service/hydroponics/garden)
"arE" = (
@@ -2780,6 +3071,12 @@
/obj/effect/mapping_helpers/airlock/unres{
dir = 4
},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 1
+ },
/turf/open/floor/plating,
/area/station/maintenance/port/fore)
"arO" = (
@@ -2787,6 +3084,9 @@
/obj/item/food/monkeycube,
/obj/item/food/monkeycube,
/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 1
+ },
/turf/open/floor/iron,
/area/station/maintenance/port/fore)
"arP" = (
@@ -2836,6 +3136,9 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 4
},
+/obj/effect/turf_decal/trimline/green/filled/line{
+ dir = 8
+ },
/turf/open/floor/iron,
/area/station/service/hydroponics/garden)
"asf" = (
@@ -2878,6 +3181,8 @@
"asm" = (
/obj/effect/turf_decal/tile/red/opposingcorners,
/obj/machinery/light/directional/east,
+/obj/machinery/power/apc/auto_name/directional/east,
+/obj/structure/cable,
/turf/open/floor/iron,
/area/station/commons/fitness/recreation)
"asn" = (
@@ -2888,19 +3193,20 @@
dir = 8
},
/obj/machinery/light/directional/east,
+/obj/effect/turf_decal/trimline/white/line{
+ dir = 4
+ },
/turf/open/floor/iron/dark,
/area/station/security/execution/education)
"aso" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
- dir = 8
- },
-/obj/structure/cable,
-/obj/effect/turf_decal/trimline/brown/filled/warning{
- dir = 1
- },
/obj/machinery/light_switch/directional/west,
/obj/effect/mapping_helpers/turn_off_lights_with_lightswitch,
+/obj/effect/turf_decal/trimline/brown/filled/warning{
+ dir = 9
+ },
+/obj/effect/turf_decal/trimline/dark/warning{
+ dir = 9
+ },
/turf/open/floor/iron,
/area/station/cargo/warehouse)
"asp" = (
@@ -2916,7 +3222,11 @@
"ass" = (
/obj/structure/table,
/obj/item/toner/large,
-/obj/item/camera,
+/obj/item/camera{
+ pixel_x = -1;
+ pixel_y = 4
+ },
+/obj/item/circuitboard/machine/vendatray,
/turf/open/floor/wood,
/area/station/hallway/secondary/service)
"ast" = (
@@ -3040,10 +3350,10 @@
/turf/open/floor/carpet,
/area/station/commons/vacant_room/office)
"asT" = (
-/obj/machinery/atmospherics/pipe/smart/manifold/general/visible{
- dir = 1
- },
/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart{
+ dir = 8
+ },
/turf/open/floor/plating,
/area/station/maintenance/fore)
"asU" = (
@@ -3091,7 +3401,6 @@
/turf/open/floor/iron,
/area/station/hallway/primary/central/fore)
"atj" = (
-/obj/effect/turf_decal/tile/blue,
/obj/structure/disposalpipe/segment,
/obj/machinery/light/directional/east,
/turf/open/floor/iron,
@@ -3100,7 +3409,14 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 4
},
-/turf/open/floor/iron/dark,
+/obj/effect/turf_decal/siding/dark{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/dark/corner,
+/obj/effect/turf_decal/siding/dark/corner{
+ dir = 8
+ },
+/turf/open/floor/iron/textured_large,
/area/station/ai_monitored/command/storage/eva)
"atm" = (
/obj/structure/bed,
@@ -3127,7 +3443,7 @@
/area/station/maintenance/starboard/fore)
"ato" = (
/obj/machinery/light_switch{
- pixel_y = -23
+ pixel_y = -28
},
/obj/effect/landmark/event_spawn,
/obj/structure/cable,
@@ -3177,7 +3493,7 @@
/obj/effect/decal/cleanable/dirt,
/obj/structure/chair/stool/directional/south,
/turf/open/floor/iron,
-/area/station/science/ordnance/bomb)
+/area/station/science/ordnance/testlab)
"atC" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/sign/poster/contraband/random/directional/south,
@@ -3196,15 +3512,15 @@
/turf/open/floor/iron,
/area/station/maintenance/starboard/fore)
"atI" = (
-/obj/structure/table,
-/obj/item/stack/sheet/iron/fifty,
-/obj/item/stack/sheet/iron/fifty,
-/obj/item/stack/sheet/glass/fifty,
/obj/effect/turf_decal/tile/brown{
dir = 4
},
/obj/effect/turf_decal/tile/yellow,
/obj/machinery/computer/security/telescreen/auxbase/directional/east,
+/obj/structure/table,
+/obj/item/storage/box/lights/mixed,
+/obj/item/pipe_dispenser,
+/obj/item/stack/rods/fifty,
/turf/open/floor/iron,
/area/station/construction/mining/aux_base)
"atJ" = (
@@ -3241,32 +3557,30 @@
/turf/open/floor/plating,
/area/station/maintenance/starboard/fore)
"atP" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
- dir = 8
+/obj/effect/turf_decal/stripes/white/line{
+ color = "#a56dc2"
},
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
- dir = 8
+/obj/machinery/door/firedoor/border_only,
+/obj/structure/fluff/metalpole{
+ pixel_y = -32
},
-/obj/effect/turf_decal/stripes/corner{
- dir = 8
+/obj/effect/turf_decal/stripes/line,
+/obj/effect/turf_decal/stripes/white/line{
+ color = "#52B4E9";
+ name = "blue line"
},
-/turf/open/floor/iron,
+/obj/effect/turf_decal/tile/blue/fourcorners,
+/turf/open/floor/iron/white,
/area/station/hallway/secondary/entry)
"atR" = (
-/obj/effect/turf_decal/tile/red{
- dir = 1
- },
-/obj/effect/turf_decal/tile/red{
- dir = 4
- },
-/obj/effect/turf_decal/tile/red{
- dir = 8
- },
/obj/structure/cable,
-/obj/effect/turf_decal/tile/neutral{
+/obj/effect/turf_decal/siding/dark/end{
dir = 1
},
-/turf/open/floor/iron/dark,
+/obj/effect/turf_decal/trimline/dark_blue/filled/end{
+ dir = 1
+ },
+/turf/open/floor/iron/dark/small,
/area/station/security/checkpoint/customs)
"atT" = (
/obj/effect/decal/cleanable/dirt,
@@ -3301,21 +3615,14 @@
},
/obj/effect/decal/cleanable/dirt,
/obj/structure/closet/crate/critter,
+/obj/effect/landmark/generic_maintenance_landmark,
/turf/open/floor/iron/dark,
/area/station/maintenance/port/fore)
"atX" = (
-/obj/effect/turf_decal/tile/red{
- dir = 1
- },
-/obj/effect/turf_decal/tile/red{
- dir = 4
- },
/obj/structure/cable,
/obj/machinery/vending/wardrobe/sec_wardrobe,
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/turf/open/floor/iron/dark,
+/obj/effect/turf_decal/delivery/blue,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/security/checkpoint/customs)
"atY" = (
/obj/machinery/power/solar{
@@ -3329,6 +3636,10 @@
/obj/structure/disposalpipe/junction/flip{
dir = 1
},
+/obj/effect/turf_decal/trimline/dark_blue/warning{
+ alpha = 200;
+ dir = 1
+ },
/turf/open/floor/iron/dark,
/area/station/hallway/primary/fore)
"aud" = (
@@ -3340,16 +3651,18 @@
/turf/open/floor/iron/solarpanel/airless,
/area/station/solars/starboard/aft)
"auh" = (
-/obj/structure/table/reinforced,
-/obj/item/storage/box/stockparts/basic{
- pixel_y = -5
- },
-/obj/item/storage/box/stockparts/basic,
-/obj/item/storage/part_replacer,
/obj/structure/window/reinforced/spawner/directional/south,
-/obj/structure/window/reinforced/spawner/directional/east,
-/turf/open/floor/iron/dark,
-/area/station/ai_monitored/command/storage/eva)
+/obj/structure/fluff/metalpole{
+ dir = 1;
+ pixel_y = -39
+ },
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+ dir = 1
+ },
+/turf/open/floor/iron/smooth_edge{
+ dir = 1
+ },
+/area/station/hallway/secondary/entry)
"auj" = (
/obj/machinery/portable_atmospherics/canister,
/turf/open/floor/engine/vacuum,
@@ -3378,17 +3691,9 @@
/obj/structure/reagent_dispensers/wall/peppertank{
pixel_y = 30
},
-/obj/effect/turf_decal/tile/red{
- dir = 1
- },
-/obj/effect/turf_decal/tile/red{
- dir = 4
- },
/obj/structure/cable,
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/turf/open/floor/iron/dark,
+/obj/effect/turf_decal/delivery/blue,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/security/checkpoint/customs)
"auw" = (
/obj/structure/table/wood,
@@ -3405,6 +3710,7 @@
"aux" = (
/obj/structure/sign/clock/directional/east,
/obj/structure/filingcabinet/employment,
+/obj/machinery/light/small/directional/east,
/turf/open/floor/carpet/blue,
/area/station/service/lawoffice)
"auy" = (
@@ -3427,7 +3733,16 @@
dir = 5
},
/obj/structure/disposalpipe/segment,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/brown/filled/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/brown{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/dark/line{
+ dir = 1
+ },
+/turf/open/floor/iron/textured_edge,
/area/station/cargo/storage)
"auD" = (
/obj/machinery/light/small/directional/west,
@@ -3490,29 +3805,39 @@
/turf/open/floor/iron/grimy,
/area/station/service/chapel/office)
"auO" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/turf_decal/trimline/blue/filled/line{
+ dir = 4
+ },
/turf/open/floor/iron,
-/area/station/construction/mining/aux_base)
+/area/station/hallway/secondary/entry)
"auP" = (
/turf/open/floor/plating,
/area/station/hallway/secondary/entry)
"auQ" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/construction/mining/aux_base)
"auR" = (
/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/structure/disposalpipe/segment{
dir = 5
},
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/brown/filled/corner,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 5
+ },
+/turf/open/floor/iron/textured_corner,
/area/station/cargo/storage)
"auS" = (
-/obj/effect/turf_decal/tile/brown/anticorner/contrasted{
- dir = 8
+/obj/effect/turf_decal/trimline/brown/filled/line{
+ dir = 10
+ },
+/obj/effect/turf_decal/trimline/dark/line{
+ dir = 10
},
/turf/open/floor/iron,
/area/station/cargo/warehouse)
@@ -3530,19 +3855,11 @@
/area/station/common/pool/sauna)
"auV" = (
/obj/machinery/modular_computer/preset/id,
-/obj/effect/turf_decal/tile/red{
- dir = 1
- },
-/obj/effect/turf_decal/tile/red{
- dir = 4
- },
/obj/structure/cable,
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
/obj/item/radio/intercom/directional/north,
/obj/machinery/light/directional/north,
-/turf/open/floor/iron/dark,
+/obj/effect/turf_decal/delivery/blue,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/security/checkpoint/customs)
"auW" = (
/obj/effect/turf_decal/bot_white/left,
@@ -3577,6 +3894,7 @@
/obj/effect/turf_decal/tile/dark_blue{
dir = 1
},
+/obj/machinery/vending/wallmed/directional/north,
/turf/open/floor/iron/white,
/area/station/maintenance/port/fore)
"ava" = (
@@ -3618,9 +3936,14 @@
/turf/open/floor/iron/dark/textured_large,
/area/station/cargo/miningdock)
"avi" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/neutral/corner{
+ dir = 1;
+ alpha = 100
+ },
+/obj/machinery/firealarm/directional/north,
+/turf/open/floor/iron/edge{
+ dir = 1
+ },
/area/station/hallway/primary/port)
"avm" = (
/obj/effect/spawner/liquids_spawner,
@@ -3633,13 +3956,16 @@
/obj/item/storage/box/hug/plushes{
pixel_x = -4
},
-/obj/structure/table,
/obj/item/storage/box/handcuffs{
pixel_x = 5;
pixel_y = 7
},
/obj/item/book/manual/wiki/security_space_law,
/obj/machinery/camera/directional/north,
+/obj/effect/turf_decal/trimline/dark/line{
+ dir = 9
+ },
+/obj/structure/table,
/turf/open/floor/iron/dark,
/area/station/security/holding_cell)
"avo" = (
@@ -3654,6 +3980,9 @@
dir = 4
},
/obj/effect/mapping_helpers/airlock/access/any/service/maintenance,
+/obj/effect/mapping_helpers/airlock/unres{
+ dir = 4
+ },
/turf/open/floor/plating,
/area/station/maintenance/department/electrical)
"avp" = (
@@ -3690,17 +4019,9 @@
},
/obj/effect/mapping_helpers/requests_console/information,
/obj/effect/mapping_helpers/requests_console/assistance,
-/obj/effect/turf_decal/tile/red{
- dir = 1
- },
-/obj/effect/turf_decal/tile/red{
- dir = 4
- },
/obj/structure/cable,
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/turf/open/floor/iron/dark,
+/obj/effect/turf_decal/delivery/blue,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/security/checkpoint/customs)
"avw" = (
/obj/structure/disposalpipe/segment,
@@ -3727,7 +4048,7 @@
/obj/machinery/door/airlock/bathroom{
name = "Restroom"
},
-/turf/open/floor/mineral/titanium/blue,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/commons/toilet)
"avD" = (
/turf/closed/wall/r_wall,
@@ -3801,25 +4122,20 @@
/turf/open/floor/circuit,
/area/station/maintenance/department/electrical)
"avP" = (
-/obj/structure/table,
/obj/item/stack/sheet/plasteel{
amount = 10
},
-/obj/item/stack/rods/fifty,
/obj/machinery/power/apc/auto_name/directional/east,
/obj/structure/cable,
/obj/effect/turf_decal/tile/brown{
dir = 4
},
/obj/effect/turf_decal/tile/yellow,
+/obj/structure/table,
/turf/open/floor/iron,
/area/station/construction/mining/aux_base)
"avQ" = (
/obj/structure/table/reinforced,
-/obj/item/food/burger/orange{
- desc = "Made by those abandoned by society.";
- name = "prison burger"
- },
/turf/open/floor/iron/cafeteria,
/area/station/security/prison)
"avR" = (
@@ -3884,7 +4200,9 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 1
},
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/neutral/arrow_ccw,
+/obj/effect/turf_decal/trimline/neutral/mid_joiner,
+/turf/open/floor/iron/edge,
/area/station/hallway/primary/port)
"awh" = (
/obj/effect/mapping_helpers/airlock/access/any/security/detective,
@@ -3916,9 +4234,6 @@
"awn" = (
/obj/item/radio/intercom/directional/east,
/obj/structure/hedge/opaque,
-/obj/effect/turf_decal/tile/dark_green{
- dir = 4
- },
/obj/machinery/light/directional/east,
/turf/open/floor/iron/dark,
/area/station/hallway/primary/fore)
@@ -3930,7 +4245,7 @@
dir = 4
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron,
+/turf/open/floor/iron/edge,
/area/station/hallway/primary/port)
"awr" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
@@ -3948,7 +4263,10 @@
"awu" = (
/obj/machinery/door/firedoor,
/obj/machinery/firealarm/directional/north,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/green/warning{
+ dir = 1
+ },
+/turf/open/floor/iron/large,
/area/station/hallway/primary/central)
"awv" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -3963,13 +4281,11 @@
},
/area/station/hallway/primary/central/fore)
"awx" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/effect/turf_decal/stripes/line{
- dir = 8
+/obj/effect/turf_decal/trimline/green/filled/line{
+ dir = 4
},
/turf/open/floor/iron,
-/area/station/hallway/secondary/entry)
+/area/station/service/hydroponics/garden)
"awy" = (
/obj/structure/disposalpipe/segment,
/obj/effect/turf_decal/tile/neutral{
@@ -4057,14 +4373,23 @@
/turf/open/floor/plating,
/area/station/maintenance/starboard/fore)
"awM" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
- dir = 5
+/obj/structure/fluff/metalpole{
+ dir = 1;
+ pixel_y = 32
+ },
+/obj/machinery/door/firedoor/border_only{
+ dir = 1
},
/obj/effect/turf_decal/stripes/line{
- dir = 8
+ dir = 1
},
-/turf/open/floor/iron,
+/obj/effect/turf_decal/stripes/white/line{
+ color = "#52B4E9";
+ dir = 1;
+ name = "blue line"
+ },
+/obj/effect/turf_decal/tile/blue/fourcorners,
+/turf/open/floor/iron/white,
/area/station/hallway/secondary/entry)
"awO" = (
/obj/effect/decal/cleanable/dirt,
@@ -4073,14 +4398,11 @@
/turf/open/floor/iron,
/area/station/security/prison)
"awP" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
- dir = 4
+/obj/effect/landmark/start/assistant,
+/obj/effect/turf_decal/trimline/blue/filled/warning{
+ dir = 1
},
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/turf/open/floor/iron,
+/turf/open/floor/iron/small,
/area/station/hallway/secondary/entry)
"awQ" = (
/obj/effect/decal/cleanable/dirt,
@@ -4111,6 +4433,8 @@
/area/station/maintenance/department/electrical)
"awV" = (
/obj/machinery/light/directional/south,
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron,
/area/station/construction/mining/aux_base)
"awW" = (
@@ -4129,12 +4453,19 @@
/turf/open/floor/iron,
/area/station/security/prison/visit)
"awZ" = (
-/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
-/turf/open/floor/iron/white/corner{
+/obj/effect/turf_decal/trimline/blue/filled/line{
dir = 1
},
+/obj/effect/turf_decal/trimline/blue/filled/corner{
+ dir = 8
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/effect/turf_decal/stripes/white/line{
+ dir = 8
+ },
+/turf/open/floor/iron,
/area/station/hallway/secondary/entry)
"axa" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
@@ -4149,9 +4480,6 @@
/turf/open/floor/iron,
/area/station/construction/mining/aux_base)
"axc" = (
-/obj/structure/table,
-/obj/item/storage/box/lights/mixed,
-/obj/item/pipe_dispenser,
/obj/machinery/button/door{
id = "aux_base_shutters";
name = "Public Shutters Control";
@@ -4199,22 +4527,26 @@
/area/station/maintenance/port/fore)
"axk" = (
/obj/effect/turf_decal/siding/thinplating/dark/corner,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/brown/filled/corner,
+/obj/effect/turf_decal/trimline/dark/corner,
+/obj/effect/landmark/event_spawn,
+/turf/open/floor/iron/textured_corner,
/area/station/cargo/miningdock)
"axl" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/commons/locker)
"axm" = (
-/obj/machinery/light/small/directional/east,
-/obj/item/radio/intercom/directional/east,
-/obj/effect/turf_decal/stripes/line{
- dir = 5
- },
/obj/structure/closet/crate,
/obj/item/stack/ore/iron,
-/obj/effect/decal/cleanable/dirt,
+/obj/machinery/light/small/directional/east,
+/obj/item/radio/intercom/directional/east,
+/obj/effect/turf_decal/trimline/brown/filled/line{
+ dir = 5
+ },
+/obj/effect/turf_decal/trimline/dark/line{
+ dir = 5
+ },
/turf/open/floor/iron,
/area/station/cargo/miningdock)
"axn" = (
@@ -4236,18 +4568,30 @@
/obj/machinery/light_switch{
pixel_x = 27
},
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
- dir = 6
- },
/obj/effect/turf_decal/siding/thinplating/dark/corner,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/brown/filled/line{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 5
+ },
+/obj/machinery/camera/autoname/directional/east{
+ network = list("ss13","cargo");
+ c_tag = "Cargo Bay"
+ },
+/turf/open/floor/iron/textured_edge{
+ dir = 8
+ },
/area/station/cargo/storage)
"axp" = (
/obj/effect/turf_decal/delivery,
/obj/effect/turf_decal/siding/thinplating/dark{
dir = 4
},
-/turf/open/floor/iron,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 5
+ },
+/turf/open/floor/iron/large,
/area/station/cargo/storage)
"axq" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
@@ -4317,12 +4661,25 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/cafeteria,
/area/station/service/kitchen)
+"axE" = (
+/obj/structure/disposalpipe/segment{
+ dir = 6
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/turf/open/floor/plating,
+/area/station/maintenance/port/aft)
"axF" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/turf_decal/stripes/line{
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 5
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/turf/open/floor/iron/textured_corner{
dir = 8
},
-/turf/open/floor/iron,
/area/station/hallway/secondary/entry)
"axK" = (
/obj/structure/disposalpipe/segment,
@@ -4333,20 +4690,32 @@
/turf/open/floor/plating,
/area/station/maintenance/port)
"axL" = (
-/obj/machinery/suit_storage_unit/standard_unit,
-/obj/effect/turf_decal/stripes/line{
+/obj/structure/disposalpipe/segment{
+ dir = 6
+ },
+/obj/structure/railing,
+/turf/open/floor/plating,
+/area/station/maintenance/aft)
+"axM" = (
+/obj/effect/turf_decal/trimline/dark/filled/warning{
+ alpha = 160;
dir = 10
},
-/turf/open/floor/iron,
-/area/station/ai_monitored/command/storage/eva)
-"axM" = (
-/obj/effect/turf_decal/siding/thinplating/dark/corner{
- dir = 8
+/obj/effect/turf_decal/trimline/purple/warning{
+ alpha = 200;
+ dir = 10;
+ color = "#a56dc2"
},
-/turf/closed/wall,
-/area/station/maintenance/port/aft)
+/obj/effect/turf_decal/siding/dark{
+ dir = 10
+ },
+/turf/open/floor/iron/white/smooth_corner{
+ dir = 4
+ },
+/area/station/science/xenobiology)
"axN" = (
/obj/effect/turf_decal/tile/neutral,
+/obj/machinery/vending/wallmed/directional/east,
/turf/open/floor/iron/dark/side{
dir = 4
},
@@ -4384,6 +4753,10 @@
/obj/effect/mapping_helpers/airlock/unres{
dir = 1
},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer4,
/turf/open/floor/plating,
/area/station/maintenance/fore)
"axV" = (
@@ -4417,34 +4790,45 @@
/turf/open/floor/iron/dark,
/area/station/commons/dorms/apartment2)
"ayb" = (
-/obj/machinery/conveyor{
- dir = 8;
- id = "QMLoad"
+/obj/effect/turf_decal/trimline/brown/filled/line{
+ dir = 10
},
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/effect/turf_decal/stripes/line{
- dir = 1
+/obj/effect/turf_decal/trimline/brown/filled/corner{
+ dir = 4
},
-/turf/open/floor/plating,
+/turf/open/floor/iron,
/area/station/cargo/storage)
"ayd" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 4
},
-/turf/open/floor/iron,
+/obj/effect/turf_decal/siding/dark{
+ dir = 8
+ },
+/turf/open/floor/iron/dark/side{
+ dir = 8
+ },
/area/station/command/bridge)
"aye" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 10
},
-/turf/open/floor/iron,
+/obj/effect/turf_decal/siding/dark{
+ dir = 1
+ },
+/turf/open/floor/iron/edge{
+ dir = 1
+ },
/area/station/command/bridge)
"ayf" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 8
},
+/obj/effect/turf_decal/siding/dark{
+ dir = 4
+ },
/turf/open/floor/iron/dark,
/area/station/service/hydroponics)
"ayh" = (
@@ -4475,23 +4859,34 @@
/turf/open/floor/iron,
/area/station/maintenance/department/electrical)
"ayk" = (
-/obj/effect/turf_decal/stripes/line,
-/turf/open/floor/iron,
+/obj/structure/fluff/metalpole,
+/turf/open/floor/plating,
/area/station/hallway/secondary/entry)
"ayl" = (
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/blue/filled/line{
+ dir = 4
+ },
+/obj/structure/chair{
+ dir = 8
+ },
+/turf/open/floor/iron/edge{
+ dir = 8
+ },
/area/station/hallway/secondary/entry)
"aym" = (
-/obj/machinery/door/poddoor/shutters{
- id = "aux_base_shutters";
- name = "Auxillary Base Shutters"
- },
/obj/effect/turf_decal/stripes/line,
+/obj/machinery/door/airlock/engineering{
+ name = "Auxillary Base Construction"
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/mapping_helpers/airlock/access/all/engineering/aux_base,
/turf/open/floor/iron,
/area/station/construction/mining/aux_base)
"ayn" = (
-/obj/effect/turf_decal/stripes/corner,
-/turf/open/floor/iron,
+/obj/structure/sign/warning/docking,
+/turf/closed/wall,
/area/station/hallway/secondary/entry)
"ayo" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
@@ -4511,13 +4906,10 @@
/turf/open/floor/wood,
/area/station/service/library)
"ayr" = (
-/obj/machinery/door/airlock/engineering{
- name = "Auxillary Base Construction"
+/obj/machinery/door/poddoor/shutters{
+ id = "aux_base_shutters";
+ name = "Auxillary Base Shutters"
},
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/cable,
-/obj/effect/mapping_helpers/airlock/access/all/engineering/aux_base,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/construction/mining/aux_base)
"ays" = (
@@ -4557,6 +4949,7 @@
/obj/item/clothing/under/rank/prisoner/skirt/highsec,
/obj/item/clothing/under/rank/prisoner/supermax,
/obj/item/clothing/under/rank/prisoner/skirt/supermax,
+/obj/effect/turf_decal/trimline/dark/line,
/turf/open/floor/iron/dark,
/area/station/security/execution/transfer)
"ayw" = (
@@ -4594,15 +4987,24 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 8
},
+/obj/effect/turf_decal/trimline/white/line{
+ dir = 4
+ },
/turf/open/floor/iron/dark,
/area/station/security/execution/education)
"ayC" = (
-/obj/effect/turf_decal/stripes/line{
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 5
+ },
+/obj/structure/railing{
dir = 8
},
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/firealarm/directional/west,
-/turf/open/floor/iron,
+/turf/open/floor/iron/edge{
+ dir = 4
+ },
/area/station/hallway/secondary/entry)
"ayD" = (
/obj/structure/disposalpipe/segment{
@@ -4615,7 +5017,13 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 4
},
-/turf/open/floor/iron,
+/obj/effect/turf_decal/skyrat_decals/departments/bridge{
+ dir = 8;
+ color = "#52B4E9"
+ },
+/turf/open/floor/iron/edge{
+ dir = 8
+ },
/area/station/hallway/primary/central)
"ayI" = (
/obj/structure/cable,
@@ -4639,7 +5047,15 @@
/area/station/ai_monitored/command/storage/eva)
"ayM" = (
/obj/machinery/status_display/evac/directional/west,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/siding/dark/corner{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/yellow/corner{
+ dir = 1
+ },
+/turf/open/floor/iron/edge{
+ dir = 8
+ },
/area/station/hallway/primary/central)
"ayO" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
@@ -4653,8 +5069,10 @@
name = "EVA Maintenance"
},
/obj/effect/mapping_helpers/airlock/access/any/command/eva,
+/obj/machinery/door/firedoor,
+/obj/effect/mapping_helpers/airlock/red_alert_access,
/obj/structure/disposalpipe/segment,
-/turf/open/floor/iron/dark,
+/turf/open/floor/iron/dark/textured_large,
/area/station/maintenance/fore)
"ayT" = (
/obj/effect/turf_decal/trimline/dark_blue/filled/warning{
@@ -4663,20 +5081,15 @@
/turf/closed/wall/r_wall,
/area/station/security/brig)
"ayU" = (
-/obj/structure/window/reinforced/spawner/directional/west,
-/obj/machinery/door/window/left/directional/south{
- req_access = list("eva");
- name = "Inducer Storage"
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
},
-/obj/item/stock_parts/power_store/battery,
-/obj/item/stock_parts/power_store/cell/high,
-/obj/item/inducer,
-/obj/item/inducer,
-/obj/item/inducer,
-/obj/machinery/cell_charger,
-/obj/structure/table/reinforced,
-/turf/open/floor/iron/dark,
-/area/station/ai_monitored/command/storage/eva)
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 4
+ },
+/turf/open/floor/plating,
+/area/station/maintenance/fore)
"ayV" = (
/obj/effect/turf_decal/tile/neutral{
dir = 4
@@ -4687,26 +5100,17 @@
},
/area/station/hallway/primary/central/fore)
"ayW" = (
-/obj/structure/table/reinforced,
-/obj/item/stack/sheet/rglass{
- amount = 50
+/obj/effect/turf_decal/tile/green{
+ dir = 1
},
-/obj/item/stack/sheet/rglass{
- amount = 50;
- pixel_x = 4;
- pixel_y = 4
+/obj/effect/turf_decal/tile/green,
+/obj/effect/turf_decal/tile/green{
+ dir = 4
},
-/obj/item/stack/rods/fifty{
- pixel_x = -1;
- pixel_y = 4
- },
-/obj/structure/window/reinforced/spawner/directional/south,
-/obj/structure/window/reinforced/spawner/directional/west,
-/turf/open/floor/iron/dark,
-/area/station/ai_monitored/command/storage/eva)
+/turf/open/floor/iron,
+/area/station/service/hydroponics/garden)
"ayY" = (
/obj/machinery/door/firedoor,
-/obj/machinery/firealarm/directional/west,
/turf/open/floor/iron/dark,
/area/station/hallway/primary/fore)
"ayZ" = (
@@ -4775,15 +5179,15 @@
/turf/open/floor/iron,
/area/station/hallway/primary/central/fore)
"azl" = (
-/obj/machinery/door/airlock/command{
- name = "Head of Personnel's Quarters"
- },
-/obj/effect/mapping_helpers/airlock/access/any/command/hop,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 4
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/wood,
+/obj/machinery/door/airlock/command{
+ name = "Head of Personnel's Quarters"
+ },
+/obj/effect/mapping_helpers/airlock/access/any/command/hop,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/command/heads_quarters/hop)
"azr" = (
/obj/effect/turf_decal/tile/neutral{
@@ -4818,40 +5222,31 @@
/turf/open/floor/iron,
/area/station/construction/mining/aux_base)
"azz" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/turf/open/floor/iron,
+/obj/effect/landmark/start/hangover,
+/turf/open/floor/tram/plate,
/area/station/hallway/secondary/entry)
"azA" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
/turf/open/floor/iron,
-/area/station/hallway/secondary/entry)
+/area/station/cargo/storage)
"azB" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 10
+/obj/structure/window/reinforced/spawner/directional/east,
+/obj/structure/window/reinforced/spawner/directional/south,
+/obj/structure/window/reinforced/spawner/directional/west,
+/obj/structure/flora/rock/pile/style_3,
+/obj/structure/flora/ash/fireblossom{
+ light_on = 0
},
-/turf/open/floor/iron,
+/turf/open/floor/fakebasalt,
/area/station/hallway/secondary/entry)
"azC" = (
-/obj/structure/rack,
-/obj/item/electronics/airlock,
-/obj/item/electronics/airlock,
-/obj/item/electronics/airlock,
-/obj/item/electronics/airlock,
-/obj/item/stack/cable_coil,
-/obj/item/stack/cable_coil,
-/obj/item/wallframe/camera,
-/obj/item/wallframe/camera,
-/obj/item/wallframe/camera,
-/obj/item/wallframe/camera,
-/obj/item/assault_pod/mining,
/obj/effect/turf_decal/tile/brown{
dir = 4
},
/obj/effect/turf_decal/tile/yellow,
+/obj/item/stack/sheet/glass/fifty,
+/obj/item/stack/sheet/iron/fifty,
+/obj/item/stack/sheet/iron/fifty,
+/obj/structure/table,
/turf/open/floor/iron,
/area/station/construction/mining/aux_base)
"azD" = (
@@ -4862,48 +5257,41 @@
/turf/closed/wall,
/area/station/service/hydroponics/garden)
"azG" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 5
+ },
+/obj/effect/landmark/event_spawn,
+/obj/structure/railing{
dir = 8
},
-/obj/effect/turf_decal/stripes/line{
- dir = 8
+/turf/open/floor/iron/textured_corner{
+ dir = 1
},
-/obj/machinery/door/firedoor,
-/turf/open/floor/iron,
/area/station/hallway/secondary/entry)
"azJ" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/security/prison)
"azO" = (
-/obj/structure/table/reinforced,
-/obj/item/storage/toolbox/electrical{
- pixel_x = -2;
- pixel_y = 6
+/obj/structure/window/reinforced/spawner/directional/north,
+/obj/structure/window/reinforced/spawner/directional/east,
+/obj/structure/window/reinforced/spawner/directional/south,
+/obj/structure/flora/rock,
+/obj/structure/flora/ash/fireblossom{
+ pixel_x = -7;
+ pixel_y = -2;
+ light_on = 0
},
-/obj/item/storage/toolbox/mechanical{
- pixel_x = -2;
- pixel_y = -1
- },
-/obj/item/storage/toolbox/mechanical{
- pixel_x = -2;
- pixel_y = -1
- },
-/obj/item/storage/toolbox/emergency{
- pixel_y = -5;
- pixel_x = -2
- },
-/obj/item/storage/belt/utility,
-/obj/structure/window/reinforced/spawner/directional/west,
-/turf/open/floor/iron/dark,
-/area/station/ai_monitored/command/storage/eva)
+/obj/structure/ore_vein/iron,
+/turf/open/floor/fakebasalt,
+/area/station/hallway/secondary/entry)
"azR" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 5
- },
-/obj/machinery/conveyor{
- dir = 8;
- id = "QMLoad"
+/obj/effect/turf_decal/trimline/brown/filled/line,
+/obj/effect/turf_decal/trimline/brown/filled/line{
+ dir = 1
},
/turf/open/floor/iron,
/area/station/cargo/storage)
@@ -4935,16 +5323,19 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 6
},
+/obj/effect/turf_decal/siding/dark/corner{
+ dir = 8
+ },
/turf/open/floor/iron/dark,
/area/station/service/hydroponics)
"azW" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
- dir = 4
+/obj/machinery/light/directional/north,
+/obj/effect/turf_decal/trimline/blue/filled/line{
+ dir = 1
},
-/turf/open/floor/iron/dark/side{
- dir = 8
- },
-/area/station/ai_monitored/command/storage/eva)
+/obj/structure/sign/warning/vacuum/external/directional/north,
+/turf/open/floor/iron,
+/area/station/hallway/secondary/entry)
"azX" = (
/obj/structure/table,
/obj/item/paper_bin{
@@ -4955,36 +5346,22 @@
/turf/open/floor/iron/dark/small,
/area/station/security/interrogation)
"azY" = (
-/obj/machinery/camera/directional/east{
- c_tag = "EVA Storage"
- },
-/obj/machinery/door/window/left/directional/south{
- req_access = list("eva");
- name = "Magboots Storage"
- },
-/obj/item/clothing/shoes/magboots,
-/obj/item/clothing/shoes/magboots,
-/obj/item/clothing/shoes/magboots,
-/obj/item/clothing/shoes/magboots,
-/obj/structure/rack/shelf,
-/obj/structure/window/reinforced/spawner/directional/west,
-/turf/open/floor/iron/dark/side{
- dir = 9
- },
-/area/station/ai_monitored/command/storage/eva)
+/obj/structure/disposalpipe/segment,
+/obj/machinery/camera/directional/east,
+/turf/open/floor/iron,
+/area/station/hallway/primary/fore)
"azZ" = (
-/obj/effect/turf_decal/tile/blue{
- dir = 8
+/obj/effect/turf_decal/trimline/dark_blue/arrow_cw{
+ dir = 8;
+ alpha = 200
},
/turf/open/floor/iron,
/area/station/hallway/primary/fore)
"aAa" = (
-/obj/effect/turf_decal/tile/blue,
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/iron,
-/area/station/hallway/primary/fore)
+/obj/structure/sign/calendar/directional/north,
+/turf/open/floor/carpet/purple,
+/area/station/command/heads_quarters/rd)
"aAb" = (
-/obj/effect/turf_decal/tile/red/opposingcorners,
/obj/structure/hedge/opaque,
/turf/open/floor/iron/dark,
/area/station/hallway/primary/fore)
@@ -5006,7 +5383,7 @@
},
/obj/effect/mapping_helpers/airlock/access/any/service/kitchen,
/obj/structure/plasticflaps/kitchen,
-/turf/open/floor/iron/cafeteria,
+/turf/open/floor/iron/kitchen_coldroom/freezerfloor,
/area/station/service/kitchen)
"aAf" = (
/obj/effect/spawner/random/burgerstation/loot/with_maintenance_loot,
@@ -5017,8 +5394,15 @@
/obj/effect/turf_decal/siding/thinplating/dark{
dir = 4
},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/brown/filled/line{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/dark/line{
+ dir = 4
+ },
+/turf/open/floor/iron/textured_edge{
+ dir = 8
+ },
/area/station/cargo/miningdock)
"aAh" = (
/turf/closed/wall,
@@ -5034,6 +5418,7 @@
},
/obj/structure/rack/gunrack,
/obj/item/melee/baton/security/boomerang/loaded,
+/obj/machinery/firealarm/directional/west,
/turf/open/floor/iron/dark,
/area/station/command/heads_quarters/hos)
"aAl" = (
@@ -5057,6 +5442,7 @@
/area/station/security/execution/education)
"aAn" = (
/obj/effect/turf_decal/trimline/dark_blue/filled/line,
+/obj/effect/turf_decal/trimline/dark/line,
/turf/open/floor/iron/dark,
/area/station/security/execution/transfer)
"aAo" = (
@@ -5086,14 +5472,15 @@
/obj/item/clothing/gloves/cargo_gauntlet,
/obj/item/clothing/gloves/cargo_gauntlet,
/obj/item/clothing/gloves/cargo_gauntlet,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/bot,
+/turf/open/floor/iron/dark/textured_large,
/area/station/cargo/storage)
"aAr" = (
/obj/structure/table,
/obj/machinery/cell_charger,
/obj/item/radio/intercom/directional/north,
-/obj/item/stock_parts/power_store/cell/high/empty,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/bot,
+/turf/open/floor/iron/dark/textured_large,
/area/station/cargo/storage)
"aAs" = (
/obj/effect/turf_decal/stripes/line{
@@ -5126,10 +5513,15 @@
/obj/item/food/pizzaslice/ants,
/obj/item/food/pizzaslice/ants,
/obj/item/food/pizzaslice/ants,
-/obj/effect/spawner/random/burgerstation/loot/with_maintenance_loot,
/obj/effect/spawner/liquids_spawner{
reagent_list = list(/datum/reagent/ants/fire = 190)
},
+/obj/machinery/button/door{
+ id = "maint3";
+ name = "Blast Door Control C";
+ pixel_y = 24
+ },
+/obj/structure/closet/toolcloset,
/turf/open/floor/iron/pool/cobble/corner{
dir = 1
},
@@ -5137,6 +5529,9 @@
"aAx" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/turf_decal/trimline/green/filled/line{
+ dir = 10
+ },
/turf/open/floor/iron,
/area/station/service/hydroponics/garden)
"aAz" = (
@@ -5152,49 +5547,73 @@
/obj/item/bedsheet/centcom/double,
/turf/open/floor/carpet/royalblack,
/area/station/command/heads_quarters/nt_rep)
-"aAC" = (
-/obj/structure/sign/warning/docking,
-/turf/closed/wall/r_wall,
-/area/station/hallway/secondary/entry)
"aAD" = (
-/obj/structure/sign/warning/vacuum/external/directional/north,
-/obj/effect/spawner/structure/window/reinforced,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 5
+ },
+/turf/open/floor/plating,
+/area/station/maintenance/solars/port/aft)
+"aAE" = (
+/obj/structure/fluff/metalpole/anchor,
/turf/open/floor/plating,
/area/station/hallway/secondary/entry)
-"aAE" = (
-/obj/structure/closet/emcloset,
-/obj/effect/turf_decal/stripes/line,
-/turf/open/floor/iron,
-/area/station/hallway/secondary/entry)
"aAF" = (
-/obj/structure/closet/emcloset,
-/obj/effect/turf_decal/stripes/line{
+/obj/effect/turf_decal/siding/wideplating_new/light/end{
+ dir = 8
+ },
+/obj/structure/railing,
+/obj/effect/turf_decal/siding/dark{
dir = 10
},
-/turf/open/floor/iron,
-/area/station/hallway/secondary/entry)
-"aAH" = (
-/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
- dir = 4
- },
-/turf/open/floor/iron/white/corner{
+/obj/effect/turf_decal/stripes/line{
dir = 1
},
-/area/station/hallway/secondary/entry)
-"aAI" = (
+/obj/structure/marker_beacon/bronze,
+/turf/open/floor/iron/dark/small,
+/area/station/cargo/storage)
+"aAH" = (
+/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 4
},
-/turf/open/floor/iron,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/blue/filled/corner{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/blue/filled/corner{
+ dir = 1
+ },
+/turf/open/floor/iron/edge,
+/area/station/hallway/secondary/entry)
+"aAI" = (
+/obj/machinery/light/directional/north,
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/blue/filled/line{
+ dir = 1
+ },
+/turf/open/floor/iron/edge,
/area/station/hallway/secondary/entry)
"aAJ" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/structure/cable,
-/turf/open/floor/iron,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/blue/filled/corner{
+ dir = 1
+ },
+/turf/open/floor/iron/edge,
/area/station/hallway/secondary/entry)
"aAO" = (
/obj/structure/cable,
@@ -5207,6 +5626,13 @@
/turf/open/floor/plating,
/area/station/maintenance/port/fore)
"aAP" = (
+/obj/effect/turf_decal/tile/green{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/green{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/green,
/obj/machinery/seed_extractor,
/turf/open/floor/iron,
/area/station/service/hydroponics/garden)
@@ -5214,24 +5640,30 @@
/turf/open/floor/iron,
/area/station/service/hydroponics/garden)
"aAR" = (
-/obj/effect/turf_decal/siding/wood{
- dir = 1
- },
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 6
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 6
},
+/obj/effect/turf_decal/siding/wood{
+ dir = 1
+ },
/turf/open/floor/stone,
/area/station/service/bar)
"aAS" = (
/obj/structure/sink/directional/south,
+/obj/effect/turf_decal/trimline/green/filled/line{
+ dir = 1
+ },
/turf/open/floor/iron,
/area/station/service/hydroponics/garden)
"aAT" = (
/obj/structure/cable,
/obj/effect/turf_decal/siding/thinplating/dark/corner,
+/obj/effect/turf_decal/trimline/green/filled/corner{
+ dir = 1
+ },
/turf/open/floor/iron,
/area/station/service/hydroponics/garden)
"aAU" = (
@@ -5292,32 +5724,56 @@
dir = 1
},
/obj/machinery/airalarm/directional/south,
-/obj/machinery/camera/directional/south{
- c_tag = "Mechbay"
+/obj/effect/turf_decal/trimline/purple/filled/line{
+ alpha = 160;
+ color = "#6a3182";
+ dir = 6
},
-/turf/open/floor/iron,
+/obj/effect/turf_decal/siding/dark{
+ dir = 6
+ },
+/obj/effect/turf_decal/siding/dark/corner{
+ dir = 1
+ },
+/turf/open/floor/iron/dark/small,
/area/station/science/robotics/mechbay)
"aBn" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 5
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
- dir = 6
- },
-/obj/effect/turf_decal/stripes/corner{
- dir = 1
- },
-/turf/open/floor/iron,
-/area/station/hallway/secondary/entry)
-"aBr" = (
-/obj/machinery/suit_storage_unit/standard_unit,
-/obj/effect/turf_decal/stripes/line{
dir = 4
},
-/obj/effect/turf_decal/stripes/line{
+/obj/structure/cable,
+/obj/effect/turf_decal/trimline/blue/filled/corner{
dir = 8
},
-/turf/open/floor/iron,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer5,
+/turf/open/floor/iron/textured_corner{
+ dir = 8
+ },
+/area/station/hallway/secondary/entry)
+"aBr" = (
+/obj/machinery/suit_storage_unit/standard_unit{
+ name = "refurbished suit storage unit";
+ helmet_type = /obj/item/clothing/head/helmet/space/ntrauma;
+ suit_type = /obj/item/clothing/suit/space/pirate/silverscale
+ },
+/obj/structure/railing/corner{
+ dir = 4;
+ pixel_y = -32
+ },
+/obj/structure/railing/corner{
+ dir = 1;
+ pixel_y = -32
+ },
+/obj/effect/turf_decal/box/white{
+ color = "#ff780a"
+ },
+/obj/effect/turf_decal/bot_white{
+ color = "#ff780a"
+ },
+/turf/open/floor/iron/dark/smooth_large,
/area/station/ai_monitored/command/storage/eva)
"aBs" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
@@ -5332,10 +5788,19 @@
/turf/open/floor/iron/dark,
/area/station/service/barber)
"aBt" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/structure/cable,
-/turf/open/floor/plating,
-/area/station/ai_monitored/command/storage/eva)
+/obj/effect/turf_decal/trimline/yellow/line{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/yellow/mid_joiner{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 8
+ },
+/turf/open/floor/iron/edge{
+ dir = 8
+ },
+/area/station/hallway/primary/aft)
"aBu" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 4
@@ -5343,7 +5808,14 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 4
},
-/turf/open/floor/iron/dark,
+/obj/effect/turf_decal/siding/dark{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/dark/corner,
+/obj/effect/turf_decal/siding/dark/corner{
+ dir = 8
+ },
+/turf/open/floor/iron/textured_large,
/area/station/ai_monitored/command/storage/eva)
"aBv" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
@@ -5355,13 +5827,27 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 5
},
+/obj/effect/landmark/start/assistant,
/turf/open/floor/iron,
/area/station/service/hydroponics/garden)
+"aBx" = (
+/obj/effect/turf_decal/trimline/dark_blue/corner{
+ dir = 4;
+ alpha = 200
+ },
+/turf/open/floor/iron/edge{
+ dir = 1
+ },
+/area/station/hallway/primary/port)
"aBy" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
/obj/machinery/door/airlock{
+ id_tag = null;
name = "Unit 3"
},
-/turf/open/floor/mineral/titanium/blue,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/commons/toilet)
"aBz" = (
/obj/effect/turf_decal/tile/neutral{
@@ -5397,10 +5883,19 @@
/turf/open/floor/iron/dark/side,
/area/station/hallway/primary/central/fore)
"aBD" = (
-/obj/effect/turf_decal/stripes/line{
+/obj/effect/turf_decal/trimline/brown/filled/corner{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/brown/filled/corner{
dir = 1
},
-/turf/open/floor/iron,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer4,
+/turf/open/floor/iron/textured_edge{
+ dir = 4
+ },
/area/station/cargo/storage)
"aBF" = (
/obj/machinery/space_heater,
@@ -5413,14 +5908,15 @@
/turf/open/floor/iron,
/area/station/service/hydroponics/garden)
"aBH" = (
-/obj/effect/turf_decal/stripes/line{
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 8
},
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/light/directional/west,
-/turf/open/floor/iron,
-/area/station/hallway/secondary/entry)
+/turf/open/floor/iron/textured_edge{
+ dir = 8
+ },
+/area/station/cargo/storage)
"aBI" = (
/turf/closed/wall,
/area/station/security/checkpoint/customs)
@@ -5438,6 +5934,9 @@
"aBK" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/turf_decal/siding/dark{
+ dir = 8
+ },
/turf/open/floor/iron/dark,
/area/station/service/hydroponics)
"aBL" = (
@@ -5469,22 +5968,12 @@
/turf/open/floor/wood,
/area/station/service/library)
"aBP" = (
-/obj/machinery/door/window/left/directional/south{
- req_access = list("eva");
- name = "RCD Storage"
+/obj/effect/turf_decal/trimline/blue/filled/line{
+ dir = 4
},
-/obj/structure/table/reinforced,
-/obj/structure/window/reinforced/spawner/directional/west,
-/obj/item/rcd_ammo,
-/obj/item/rcd_ammo,
-/obj/item/rcd_ammo,
-/obj/item/construction/rcd{
- pixel_y = 4;
- pixel_x = 2
- },
-/obj/item/construction/rcd,
-/turf/open/floor/iron/dark,
-/area/station/ai_monitored/command/storage/eva)
+/obj/machinery/status_display/evac/directional/east,
+/turf/open/floor/iron,
+/area/station/hallway/secondary/entry)
"aBQ" = (
/turf/closed/wall,
/area/station/commons/storage/primary)
@@ -5527,11 +6016,11 @@
/turf/open/floor/iron,
/area/station/security/prison/visit)
"aCd" = (
-/obj/effect/turf_decal/tile/red{
- dir = 1
- },
/obj/structure/closet/emcloset,
/obj/structure/cable,
+/obj/effect/turf_decal/trimline/dark_blue/filled/corner{
+ dir = 8
+ },
/turf/open/floor/iron/dark,
/area/station/hallway/primary/fore)
"aCe" = (
@@ -5556,12 +6045,17 @@
/turf/open/floor/iron/dark/small,
/area/station/security/evidence)
"aCl" = (
+/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 4
},
-/obj/structure/cable,
-/obj/machinery/light/directional/north,
-/turf/open/floor/iron,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/blue/filled/corner{
+ dir = 4
+ },
+/turf/open/floor/iron/edge,
/area/station/hallway/secondary/entry)
"aCm" = (
/obj/structure/chair/sofa/bench{
@@ -5570,12 +6064,32 @@
/obj/structure/window/spawner/directional/west,
/turf/open/floor/wood/tile,
/area/station/common/pool/sauna)
+"aCo" = (
+/obj/structure/disposalpipe/segment,
+/obj/structure/displaycase/trophy,
+/obj/effect/turf_decal/siding/wood/end,
+/turf/open/floor/iron/dark/textured_large,
+/area/station/service/library)
"aCp" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/structure/cable,
-/obj/machinery/power/apc/auto_name/directional/north,
-/turf/open/floor/iron,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/blue/filled/line{
+ dir = 1
+ },
+/obj/structure/decorative{
+ icon = 'icons/obj/tram/tram_controllers.dmi';
+ icon_state = "rectifier";
+ anchored = 1;
+ name = "powerbox";
+ pixel_x = 0;
+ pixel_y = 30
+ },
+/turf/open/floor/iron/edge,
/area/station/hallway/secondary/entry)
"aCq" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -5597,7 +6111,7 @@
/obj/structure/table,
/obj/effect/spawner/random/maintenance,
/obj/effect/decal/cleanable/cobweb,
-/turf/open/floor/plating,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/maintenance/starboard/aft)
"aCv" = (
/obj/effect/mapping_helpers/broken_floor,
@@ -5608,12 +6122,15 @@
/turf/open/floor/carpet/blue,
/area/station/maintenance/dorm_room)
"aCx" = (
-/obj/effect/turf_decal/stripes/corner{
- dir = 8
+/obj/effect/turf_decal/trimline/brown/filled/line{
+ dir = 9
},
/turf/open/floor/iron,
/area/station/cargo/storage)
"aCy" = (
+/obj/structure/disposalpipe/sorting/mail/flip{
+ dir = 1
+ },
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 6
},
@@ -5622,8 +6139,9 @@
},
/obj/effect/mapping_helpers/mail_sorting/supply/cargo_bay,
/obj/structure/cable,
-/obj/structure/disposalpipe/sorting/mail/flip{
- dir = 1
+/obj/machinery/vending/wallmed/directional/north,
+/obj/effect/turf_decal/trimline/brown/filled/line{
+ dir = 5
},
/turf/open/floor/iron,
/area/station/cargo/office)
@@ -5667,13 +6185,17 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 6
},
-/turf/open/floor/iron/dark,
+/turf/open/floor/iron/dark/smooth_half{
+ dir = 1
+ },
/area/station/ai_monitored/turret_protected/ai_upload)
"aCF" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 10
},
-/turf/open/floor/iron/dark,
+/turf/open/floor/iron/dark/smooth_half{
+ dir = 1
+ },
/area/station/ai_monitored/turret_protected/ai_upload)
"aCG" = (
/obj/structure/chair/stool/bar/directional/north,
@@ -5681,6 +6203,13 @@
/obj/effect/turf_decal/siding/wood,
/turf/open/floor/eighties,
/area/station/service/bar)
+"aCL" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+ dir = 1
+ },
+/turf/open/floor/iron/dark,
+/area/station/security/processing)
"aCM" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 5
@@ -5696,16 +6225,23 @@
/area/station/maintenance/port)
"aCN" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron/dark,
+/turf/open/floor/iron/dark/smooth_corner{
+ dir = 1
+ },
/area/station/ai_monitored/turret_protected/ai_upload)
"aCO" = (
-/obj/item/toy/plush/lizard_plushie,
-/obj/structure/bed/maint,
-/turf/open/floor/fakebasalt,
+/obj/item/toy/plush/skyrat/duffmoth{
+ resistance_flags = 2;
+ name = "lightly roasted moth plushie"
+ },
+/obj/structure/lattice/catwalk/mining,
+/turf/open/lava/fake,
/area/station/maintenance/starboard/fore)
"aCP" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/iron/dark,
+/turf/open/floor/iron/dark/smooth_corner{
+ dir = 4
+ },
/area/station/ai_monitored/turret_protected/ai_upload)
"aCQ" = (
/obj/machinery/door/airlock/maintenance,
@@ -5738,21 +6274,11 @@
/turf/open/floor/plating,
/area/station/maintenance/port/fore)
"aDa" = (
-/obj/effect/turf_decal/tile/red{
- dir = 1
- },
-/obj/effect/turf_decal/tile/red,
-/obj/effect/turf_decal/tile/red{
- dir = 4
- },
/obj/structure/cable,
/obj/machinery/power/apc/auto_name/directional/north,
/obj/structure/closet/secure_closet/security,
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/turf/open/floor/iron/dark,
+/obj/effect/turf_decal/delivery/blue,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/security/checkpoint/customs)
"aDd" = (
/obj/structure/cable,
@@ -5763,7 +6289,9 @@
"aDe" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/iron,
+/turf/open/floor/iron/edge{
+ dir = 1
+ },
/area/station/hallway/primary/starboard)
"aDg" = (
/obj/machinery/firealarm/directional/west,
@@ -5773,10 +6301,14 @@
/obj/structure/railing{
dir = 1
},
-/turf/open/water,
+/obj/structure/flora/rock/pile/jungle/style_random,
+/turf/open/water/no_planet_atmos/deep,
/area/station/service/hydroponics/garden)
"aDh" = (
/obj/machinery/vending/assist,
+/obj/effect/turf_decal/trimline/yellow/filled/line{
+ dir = 9
+ },
/turf/open/floor/iron,
/area/station/commons/storage/primary)
"aDi" = (
@@ -5800,6 +6332,9 @@
/area/station/commons/storage/primary)
"aDq" = (
/obj/machinery/vending/tool,
+/obj/effect/turf_decal/trimline/yellow/filled/line{
+ dir = 5
+ },
/turf/open/floor/iron,
/area/station/commons/storage/primary)
"aDr" = (
@@ -5818,6 +6353,9 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
+/obj/effect/turf_decal/trimline/dark_blue/filled/line{
+ dir = 1
+ },
/obj/effect/mapping_helpers/burnt_floor,
/turf/open/floor/plating,
/area/station/maintenance/fore)
@@ -5847,10 +6385,29 @@
/area/station/command/heads_quarters/blueshield)
"aDA" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/siding/wood{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/neutral/warning{
+ dir = 1;
+ alpha = 100
+ },
+/turf/open/floor/iron/edge{
+ dir = 1
+ },
/area/station/hallway/primary/starboard)
"aDD" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 5
+ },
+/obj/structure/cable,
+/obj/effect/turf_decal/trimline/blue/filled/corner{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer5,
/turf/open/floor/iron,
/area/station/hallway/secondary/entry)
"aDG" = (
@@ -5901,17 +6458,21 @@
/turf/open/floor/iron/dark,
/area/station/common/cryopods)
"aDO" = (
-/obj/docking_port/stationary/escape_pod{
- dir = 8
+/obj/effect/turf_decal/siding/dark,
+/obj/effect/turf_decal/siding/dark{
+ dir = 1
},
-/turf/open/floor/plating/airless,
-/area/space/nearstation)
+/turf/open/floor/carpet/black,
+/area/station/security/checkpoint/customs)
"aDQ" = (
/obj/machinery/door/airlock{
id_tag = "Toilet1";
name = "Unit 1"
},
-/turf/open/floor/mineral/titanium/blue,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/turf/open/floor/iron/white/smooth_large,
/area/station/commons/toilet)
"aDR" = (
/obj/structure/table/wood,
@@ -5938,6 +6499,7 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/door/firedoor,
/obj/structure/cable,
+/obj/machinery/firealarm/directional/west,
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
@@ -6015,7 +6577,10 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 4
},
-/turf/open/floor/mineral/titanium/blue,
+/obj/effect/turf_decal/siding/white{
+ dir = 4
+ },
+/turf/open/floor/iron/white/small,
/area/station/commons/toilet)
"aEs" = (
/obj/machinery/flasher{
@@ -6073,22 +6638,29 @@
/turf/open/floor/plating,
/area/station/maintenance/starboard/fore)
"aEF" = (
-/obj/effect/turf_decal/tile/red{
- dir = 1
- },
-/obj/effect/turf_decal/tile/red{
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
+/obj/effect/turf_decal/siding/dark{
dir = 8
},
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
+/obj/effect/turf_decal/siding/dark/corner{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/dark_blue/filled/corner{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/dark_blue/filled/line{
+ dir = 8
},
/obj/machinery/firealarm/directional/west,
-/turf/open/floor/iron/dark,
+/turf/open/floor/iron/dark/small,
/area/station/security/checkpoint/customs)
"aEI" = (
/obj/machinery/light/dim/directional/north,
/obj/structure/chair/sofa/corp/right,
+/obj/effect/landmark/generic_maintenance_landmark,
+/obj/effect/turf_decal/siding/wood{
+ dir = 1
+ },
/turf/open/floor/wood,
/area/station/maintenance/aft)
"aEL" = (
@@ -6135,19 +6707,28 @@
/turf/open/floor/iron/cafeteria,
/area/station/service/kitchen)
"aET" = (
-/obj/structure/lattice,
-/obj/effect/spawner/random/structure/grille,
-/obj/item/clothing/head/helmet/space/plasmaman/prisoner,
-/turf/open/space/basic,
-/area/space/nearstation)
+/turf/open/floor/iron/smooth_edge{
+ dir = 8
+ },
+/area/station/hallway/secondary/entry)
"aFa" = (
/turf/open/floor/iron/white,
/area/station/medical/storage)
"aFb" = (
-/obj/machinery/light/directional/east,
-/turf/open/floor/iron/dark/side{
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 8
},
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/obj/effect/turf_decal/stripes/white/line{
+ dir = 4;
+ color = "#EFB341"
+ },
+/obj/effect/turf_decal/siding/dark/corner{
+ dir = 8
+ },
+/turf/open/floor/iron/textured_large,
/area/station/ai_monitored/command/storage/eva)
"aFd" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
@@ -6192,12 +6773,16 @@
/area/station/service/kitchen)
"aFg" = (
/obj/machinery/light/directional/north,
-/obj/effect/turf_decal/tile/red/half/contrasted{
- dir = 1
- },
/obj/structure/disposalpipe/segment{
dir = 4
},
+/obj/effect/turf_decal/trimline/dark_blue/corner{
+ dir = 4;
+ alpha = 200
+ },
+/obj/effect/turf_decal/trimline/dark_blue/filled/corner{
+ dir = 1
+ },
/turf/open/floor/iron/dark,
/area/station/hallway/primary/fore)
"aFj" = (
@@ -6246,27 +6831,37 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 1
},
+/obj/effect/turf_decal/trimline/green/corner{
+ dir = 8
+ },
/turf/open/floor/iron/smooth_large,
/area/station/hallway/secondary/service)
"aFn" = (
/obj/structure/closet/emcloset,
-/obj/effect/turf_decal/stripes/line{
- dir = 10
- },
-/turf/open/floor/iron,
+/obj/effect/turf_decal/bot,
+/turf/open/floor/iron/dark/textured_large,
/area/station/cargo/storage)
"aFo" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 6
},
-/turf/open/floor/wood,
+/obj/effect/turf_decal/siding/dark{
+ dir = 8;
+ icon_state = "siding_plain_end"
+ },
+/turf/open/floor/wood/parquet,
/area/station/command/meeting_room)
"aFp" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/effect/turf_decal/vg_decals/department/sci,
-/obj/effect/turf_decal/tile/purple/half/contrasted,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/bot_white{
+ color = "#a56dc2"
+ },
+/obj/effect/turf_decal/box/white{
+ color = "#a56dc2"
+ },
+/turf/open/floor/iron/large,
/area/station/hallway/primary/starboard)
"aFu" = (
/turf/closed/wall,
@@ -6297,23 +6892,37 @@
/turf/open/floor/plating,
/area/station/maintenance/port)
"aFG" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
- dir = 4
- },
+/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 4
},
-/obj/structure/cable,
-/turf/open/floor/iron,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/blue/filled/corner{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/blue/filled/corner{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes/white/line{
+ dir = 1
+ },
+/turf/open/floor/iron/edge,
/area/station/hallway/secondary/entry)
"aFJ" = (
/obj/effect/landmark/event_spawn,
/turf/open/floor/plating,
/area/station/maintenance/port/fore)
"aFN" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/iron,
+/obj/effect/landmark/start/hangover,
+/obj/effect/turf_decal/trimline/blue/filled/warning{
+ alpha = 160
+ },
+/turf/open/floor/iron/small,
/area/station/hallway/secondary/entry)
"aFO" = (
/obj/machinery/camera/directional/east{
@@ -6323,6 +6932,9 @@
/obj/machinery/airalarm/directional/east,
/obj/item/reagent_containers/cup/bucket,
/obj/item/reagent_containers/cup/bucket,
+/obj/effect/turf_decal/trimline/green/filled/line{
+ dir = 4
+ },
/turf/open/floor/iron,
/area/station/service/hydroponics/garden)
"aFP" = (
@@ -6348,6 +6960,9 @@
pixel_y = 16
},
/obj/machinery/light/directional/west,
+/obj/effect/turf_decal/trimline/yellow/filled/line{
+ dir = 8
+ },
/turf/open/floor/iron,
/area/station/commons/storage/primary)
"aFR" = (
@@ -6368,9 +6983,6 @@
/turf/open/floor/iron,
/area/station/commons/storage/primary)
"aFT" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
/obj/structure/disposalpipe/segment{
dir = 4
},
@@ -6378,7 +6990,28 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 10
},
-/turf/open/floor/iron,
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/purple/filled/line{
+ alpha = 160;
+ color = "#6a3182";
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/dark/corner{
+ dir = 8
+ },
+/obj/effect/turf_decal/stripes/white/line{
+ dir = 1;
+ color = "#ae4fd6"
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/wideplating_new/dark/corner{
+ dir = 4
+ },
+/turf/open/floor/iron/dark/small,
/area/station/science/robotics/mechbay)
"aFU" = (
/obj/effect/landmark/start/assistant,
@@ -6424,11 +7057,14 @@
pixel_y = -1
},
/obj/machinery/light/directional/east,
+/obj/effect/turf_decal/trimline/yellow/filled/line{
+ dir = 4
+ },
+/obj/machinery/vending/wallmed/directional/east,
/turf/open/floor/iron,
/area/station/commons/storage/primary)
"aGa" = (
-/obj/effect/spawner/random/maintenance/three,
-/obj/structure/rack,
+/obj/machinery/atmospherics/components/tank/air/layer4,
/turf/open/floor/plating,
/area/station/maintenance/department/security)
"aGb" = (
@@ -6486,7 +7122,8 @@
"aGj" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
/obj/effect/landmark/start/coroner,
-/turf/open/floor/iron/dark,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/medical/morgue)
"aGk" = (
/obj/structure/toilet{
@@ -6500,14 +7137,20 @@
specialfunctions = 4
},
/obj/machinery/light/small/directional/west,
-/turf/open/floor/mineral/titanium/blue,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+ dir = 4
+ },
+/turf/open/floor/iron/white/smooth_large,
/area/station/commons/toilet)
"aGl" = (
/obj/machinery/door/airlock{
id_tag = "Toilet2";
name = "Unit 2"
},
-/turf/open/floor/mineral/titanium/blue,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/turf/open/floor/iron/white/smooth_large,
/area/station/commons/toilet)
"aGm" = (
/obj/machinery/power/apc/auto_name/directional/east,
@@ -6515,14 +7158,29 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 4
},
-/turf/open/floor/mineral/titanium/blue,
+/obj/effect/turf_decal/siding/white{
+ dir = 4
+ },
+/turf/open/floor/iron/white/small,
/area/station/commons/toilet)
"aGn" = (
/obj/machinery/shower/directional/east,
+/obj/structure/drain,
+/obj/effect/turf_decal/siding/white{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/thinplating{
+ dir = 8
+ },
/turf/open/floor/iron/freezer,
/area/station/commons/toilet)
"aGp" = (
/obj/machinery/shower/directional/west,
+/obj/structure/drain,
+/obj/effect/turf_decal/siding/white,
+/obj/effect/turf_decal/siding/thinplating{
+ dir = 4
+ },
/turf/open/floor/iron/freezer,
/area/station/commons/toilet)
"aGr" = (
@@ -6535,16 +7193,22 @@
/turf/open/floor/iron,
/area/station/service/theater)
"aGs" = (
-/obj/structure/table,
/obj/structure/extinguisher_cabinet/directional/west,
/obj/machinery/status_display/evac/directional/north,
/obj/machinery/microwave/engineering/cell_included,
-/turf/open/floor/iron/dark,
+/obj/effect/turf_decal/tile/purple/full{
+ color = "#6a3182"
+ },
+/obj/structure/table,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/science/breakroom)
"aGv" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/wood,
+/obj/effect/turf_decal/siding/dark{
+ dir = 8
+ },
+/turf/open/floor/wood/tile,
/area/station/command/heads_quarters/captain)
"aGw" = (
/obj/structure/cable,
@@ -6554,7 +7218,8 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 4
},
-/turf/open/floor/wood,
+/obj/effect/turf_decal/siding/dark,
+/turf/open/floor/wood/large,
/area/station/command/heads_quarters/captain)
"aGx" = (
/obj/structure/cable,
@@ -6564,10 +7229,7 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 10
},
-/obj/effect/turf_decal/siding/wood{
- dir = 8
- },
-/turf/open/floor/iron/dark,
+/turf/open/floor/iron/dark/textured_large,
/area/station/command/heads_quarters/captain)
"aGy" = (
/obj/structure/disposalpipe/segment{
@@ -6641,9 +7303,6 @@
dir = 9
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/railing/corner/end/flip{
- dir = 4
- },
/turf/open/floor/plating,
/area/station/maintenance/starboard/fore)
"aGF" = (
@@ -6682,12 +7341,12 @@
/turf/open/floor/plastic,
/area/station/hallway/secondary/service)
"aGO" = (
-/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/iron/white,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/turf_decal/tile/yellow,
+/turf/open/floor/iron/dark/smooth_corner,
/area/station/medical/pharmacy)
"aGP" = (
-/obj/structure/closet/crate,
/obj/item/stack/sheet/iron/fifty,
/obj/item/stack/rods/fifty,
/obj/item/stack/sheet/glass/fifty,
@@ -6697,6 +7356,7 @@
/obj/item/stack/sheet/mineral/plasma{
amount = 30
},
+/obj/structure/closet/crate/engineering,
/turf/open/floor/plating,
/area/station/engineering/engine_smes)
"aGQ" = (
@@ -6750,15 +7410,13 @@
/obj/machinery/door/window/right/directional/north{
name = "Security Checkpoint"
},
-/turf/open/floor/iron,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/hallway/secondary/entry)
"aHb" = (
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
/obj/machinery/incident_display/disease/directional/south,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/blue/arrow_cw,
+/obj/effect/turf_decal/trimline/blue/mid_joiner,
+/turf/open/floor/iron/edge,
/area/station/hallway/primary/starboard)
"aHd" = (
/obj/machinery/disposal/bin,
@@ -6775,6 +7433,9 @@
pixel_x = 1;
pixel_y = -1
},
+/obj/effect/turf_decal/trimline/yellow/filled/line{
+ dir = 8
+ },
/turf/open/floor/iron,
/area/station/commons/storage/primary)
"aHf" = (
@@ -6807,22 +7468,28 @@
/area/station/command/heads_quarters/blueshield)
"aHk" = (
/obj/machinery/holopad,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron/white,
+/obj/structure/marker_beacon/cerulean,
+/turf/open/floor/iron/white/smooth_large,
/area/station/medical/medbay/lobby)
"aHm" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 9
},
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/brown/filled/line,
+/obj/effect/turf_decal/trimline/dark/line,
+/turf/open/floor/iron/textured_edge{
+ dir = 1
+ },
/area/station/cargo/sorting)
"aHn" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 8
},
-/turf/open/floor/iron,
+/turf/open/floor/iron/edge{
+ dir = 4
+ },
/area/station/hallway/primary/central)
"aHs" = (
/obj/item/clothing/under/plasmaman/prisoner,
@@ -6833,7 +7500,13 @@
/area/space/nearstation)
"aHu" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
-/turf/open/floor/iron/dark,
+/obj/effect/turf_decal/siding/dark{
+ dir = 5
+ },
+/obj/effect/turf_decal/trimline/dark_blue/filled/line{
+ dir = 5
+ },
+/turf/open/floor/iron/dark/small,
/area/station/security/checkpoint/customs)
"aHw" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
@@ -6846,21 +7519,16 @@
/turf/open/floor/iron/dark,
/area/station/security/holding_cell)
"aHy" = (
-/obj/effect/turf_decal/tile/brown{
- dir = 8
- },
/obj/machinery/light/directional/west,
-/obj/effect/turf_decal/tile/yellow{
- dir = 1
- },
-/obj/effect/turf_decal/tile/brown{
- dir = 4
- },
/obj/structure/closet/wardrobe/miner,
-/turf/open/floor/iron,
+/obj/machinery/vending/wallmed/directional/north,
+/turf/open/floor/iron/dark/textured_large,
/area/station/cargo/miningdock)
"aHz" = (
-/turf/open/floor/iron/dark,
+/obj/effect/turf_decal/siding/dark/end{
+ dir = 8
+ },
+/turf/open/floor/carpet/black,
/area/station/security/checkpoint/customs)
"aHA" = (
/obj/item/reagent_containers/spray/plantbgone,
@@ -6874,16 +7542,10 @@
pixel_y = 1
},
/obj/structure/table/glass,
-/obj/effect/turf_decal/tile/green{
- dir = 1
- },
-/obj/effect/turf_decal/tile/green{
+/obj/machinery/light/directional/east,
+/obj/effect/turf_decal/trimline/green/filled/line{
dir = 4
},
-/obj/effect/turf_decal/tile/green{
- dir = 8
- },
-/obj/machinery/light/directional/east,
/turf/open/floor/iron,
/area/station/service/hydroponics/garden)
"aHD" = (
@@ -6901,6 +7563,9 @@
/obj/item/stack/package_wrap,
/obj/item/stack/package_wrap,
/obj/item/stack/package_wrap,
+/obj/effect/turf_decal/trimline/yellow/filled/line{
+ dir = 4
+ },
/turf/open/floor/iron,
/area/station/commons/storage/primary)
"aHF" = (
@@ -6918,16 +7583,11 @@
/turf/open/floor/iron/dark,
/area/station/security/courtroom)
"aHH" = (
-/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/structure/cable,
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron/dark/side{
- dir = 4
- },
+/obj/machinery/door/firedoor,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/hallway/primary/central/fore)
"aHI" = (
/obj/effect/turf_decal/tile/red{
@@ -6964,8 +7624,29 @@
"aHM" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/circuit,
+/obj/effect/turf_decal/trimline/purple/filled/line{
+ alpha = 160;
+ color = "#6a3182";
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 8
+ },
+/turf/open/floor/iron/dark/small,
/area/station/science/robotics/mechbay)
+"aHN" = (
+/obj/effect/turf_decal/trimline/blue/filled/line,
+/obj/structure/chair/greyscale{
+ dir = 8
+ },
+/obj/effect/landmark/start/assistant,
+/turf/open/floor/iron/edge{
+ dir = 1
+ },
+/area/station/hallway/secondary/entry)
"aHP" = (
/obj/machinery/atmospherics/components/unary/passive_vent{
dir = 1
@@ -6978,7 +7659,8 @@
/obj/machinery/door/airlock/public/glass{
name = "Central Access"
},
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/yellow/warning,
+/turf/open/floor/iron/large,
/area/station/hallway/primary/central)
"aHR" = (
/obj/structure/closet/secure_closet/brig{
@@ -6999,14 +7681,9 @@
/area/station/hallway/secondary/service)
"aHT" = (
/obj/machinery/door/firedoor,
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
/obj/effect/landmark/navigate_destination,
/obj/machinery/door/airlock/multi_tile/public/glass,
-/turf/open/floor/iron/dark/side{
- dir = 8
- },
+/turf/open/floor/iron/dark/smooth_large,
/area/station/hallway/primary/central/fore)
"aHU" = (
/obj/machinery/holopad/secure,
@@ -7015,7 +7692,7 @@
"aHV" = (
/obj/structure/closet/emcloset,
/obj/effect/decal/cleanable/cobweb,
-/turf/open/floor/plating,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/maintenance/aft)
"aHY" = (
/obj/effect/turf_decal/trimline/white/line,
@@ -7061,7 +7738,11 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 5
},
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/siding/dark{
+ dir = 2;
+ icon_state = "siding_plain_end"
+ },
+/turf/open/floor/iron/white/smooth_large,
/area/station/science/research)
"aIg" = (
/obj/machinery/navbeacon{
@@ -7106,8 +7787,13 @@
/area/station/commons/fitness)
"aIl" = (
/obj/structure/table,
-/obj/item/circuitboard/machine/vendatray,
-/obj/item/circuitboard/machine/vendatray,
+/obj/item/storage/toolbox/fishing{
+ pixel_y = 8
+ },
+/obj/item/circuitboard/machine/fishing_portal_generator{
+ pixel_y = -2
+ },
+/obj/item/fishing_rod,
/turf/open/floor/wood,
/area/station/hallway/secondary/service)
"aIn" = (
@@ -7208,54 +7894,60 @@
/turf/open/floor/plating,
/area/station/security/warden)
"aIH" = (
-/obj/machinery/door/airlock/external{
- name = "Escape Pod One"
+/obj/effect/turf_decal/trimline/brown/filled/line{
+ dir = 6
},
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+/obj/structure/chair/sofa/bench/tram/left{
dir = 8
},
-/obj/effect/landmark/navigate_destination/dockescpod2,
-/turf/open/floor/plating,
-/area/station/hallway/secondary/entry)
+/turf/open/floor/iron,
+/area/station/cargo/office)
"aII" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
/turf/open/floor/iron/grimy,
/area/station/service/chapel/office)
"aIK" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
- dir = 4
+/obj/structure/bed/maint,
+/obj/item/reagent_containers/syringe{
+ pixel_x = 2;
+ pixel_y = 4
},
-/turf/open/floor/iron,
+/obj/item/restraints/handcuffs/fake,
+/turf/open/floor/plating,
/area/station/hallway/secondary/entry)
"aIN" = (
/obj/structure/table,
/obj/item/wrench,
/obj/item/analyzer,
+/obj/effect/turf_decal/trimline/yellow/filled/line{
+ dir = 10
+ },
/turf/open/floor/iron,
/area/station/commons/storage/primary)
"aIO" = (
/obj/effect/turf_decal/siding/white{
dir = 4
},
-/turf/open/water,
+/turf/open/water/no_planet_atmos,
/area/station/service/hydroponics/garden)
"aIP" = (
/obj/effect/turf_decal/siding/white{
dir = 10
},
/obj/structure/railing,
-/turf/open/water,
+/turf/open/water/no_planet_atmos/deep,
/area/station/service/hydroponics/garden)
"aIR" = (
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
+/obj/structure/cable,
+/obj/effect/turf_decal/trimline/blue/filled/line{
+ dir = 8
},
-/turf/open/floor/iron,
+/obj/structure/railing/corner/end/flip{
+ dir = 8
+ },
+/turf/open/floor/iron/small,
/area/station/hallway/secondary/entry)
"aIS" = (
/obj/effect/turf_decal/bot,
@@ -7270,18 +7962,15 @@
pixel_x = -6;
pixel_y = -25
},
-/obj/effect/turf_decal/tile/green{
- dir = 1
- },
-/obj/effect/turf_decal/tile/green{
- dir = 8
- },
/obj/item/plant_analyzer,
/obj/item/cultivator,
/obj/item/hatchet,
/obj/item/radio/intercom/directional/east,
/obj/item/plant_analyzer,
/obj/item/crowbar,
+/obj/effect/turf_decal/trimline/green/filled/line{
+ dir = 6
+ },
/turf/open/floor/iron,
/area/station/service/hydroponics/garden)
"aIU" = (
@@ -7290,6 +7979,10 @@
location = "Tool Storage"
},
/obj/effect/turf_decal/bot,
+/obj/effect/turf_decal/trimline/yellow/filled/corner,
+/obj/effect/turf_decal/trimline/yellow/filled/corner{
+ dir = 8
+ },
/turf/open/floor/iron,
/area/station/commons/storage/primary)
"aIW" = (
@@ -7300,20 +7993,24 @@
pixel_y = 4
},
/obj/item/clothing/gloves/color/fyellow,
+/obj/effect/turf_decal/trimline/yellow/filled/line,
/turf/open/floor/iron,
/area/station/commons/storage/primary)
"aIX" = (
/obj/structure/reagent_dispensers/watertank,
+/obj/effect/turf_decal/trimline/yellow/filled/line,
/turf/open/floor/iron,
/area/station/commons/storage/primary)
"aIY" = (
/obj/structure/reagent_dispensers/fueltank,
+/obj/effect/turf_decal/trimline/yellow/filled/line,
/turf/open/floor/iron,
/area/station/commons/storage/primary)
"aIZ" = (
/obj/structure/table,
/obj/item/storage/belt/utility,
/obj/item/storage/medkit/regular,
+/obj/effect/turf_decal/trimline/yellow/filled/line,
/turf/open/floor/iron,
/area/station/commons/storage/primary)
"aJa" = (
@@ -7325,26 +8022,26 @@
/area/station/command/heads_quarters/blueshield)
"aJb" = (
/obj/effect/turf_decal/delivery,
+/obj/effect/turf_decal/trimline/yellow/filled/line,
/turf/open/floor/iron,
/area/station/commons/storage/primary)
"aJc" = (
/obj/structure/disposalpipe/trunk,
/obj/machinery/disposal/bin,
+/obj/effect/turf_decal/trimline/yellow/filled/line{
+ dir = 6
+ },
/turf/open/floor/iron,
/area/station/commons/storage/primary)
"aJg" = (
-/obj/structure/extinguisher_cabinet{
- pixel_x = 27
- },
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/structure/cable,
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
/obj/machinery/light/directional/east,
-/turf/open/floor/iron/dark/side{
- dir = 4
+/obj/structure/extinguisher_cabinet/directional/east,
+/obj/effect/turf_decal/trimline/green/corner,
+/turf/open/floor/iron/corner{
+ dir = 8
},
/area/station/hallway/primary/central)
"aJk" = (
@@ -7368,52 +8065,49 @@
/turf/open/floor/plating,
/area/station/hallway/primary/central)
"aJo" = (
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
-/obj/effect/turf_decal/tile/blue{
+/obj/structure/disposalpipe/segment{
dir = 4
},
/obj/machinery/light/directional/north,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/station/hallway/primary/central)
-"aJp" = (
-/obj/effect/turf_decal/tile/blue{
+/turf/open/floor/iron/edge{
dir = 1
},
-/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
+/area/station/hallway/primary/central)
+"aJp" = (
/obj/structure/disposalpipe/segment{
dir = 5
},
-/turf/open/floor/iron,
+/turf/open/floor/iron/corner,
/area/station/hallway/primary/central)
"aJq" = (
/turf/open/floor/iron,
/area/station/hallway/primary/central)
"aJr" = (
-/obj/effect/turf_decal/tile/blue{
- dir = 1
+/obj/effect/turf_decal/trimline/blue/line{
+ alpha = 200;
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/blue/mid_joiner{
+ alpha = 200;
+ dir = 8
+ },
+/turf/open/floor/iron/edge{
+ dir = 8
},
-/turf/open/floor/iron,
/area/station/hallway/primary/central)
"aJs" = (
-/obj/effect/turf_decal/tile/blue{
- dir = 1
+/obj/effect/turf_decal/trimline/blue/warning{
+ dir = 5;
+ alpha = 200
},
-/obj/effect/turf_decal/tile/blue{
- dir = 4
+/turf/open/floor/iron/corner{
+ dir = 8
},
-/turf/open/floor/iron,
/area/station/hallway/primary/central)
"aJt" = (
+/obj/structure/disposalpipe/segment{
+ dir = 9
+ },
/obj/structure/sign/directions/security{
dir = 1;
pixel_x = 32;
@@ -7429,24 +8123,18 @@
pixel_x = 32;
pixel_y = 24
},
-/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
-/obj/structure/disposalpipe/segment{
- dir = 9
- },
-/turf/open/floor/iron,
-/area/station/hallway/primary/central)
-"aJu" = (
-/obj/effect/turf_decal/tile/blue{
+/turf/open/floor/iron/edge{
dir = 1
},
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
- dir = 4
+/area/station/hallway/primary/central)
+"aJu" = (
+/obj/effect/turf_decal/trimline/blue/line{
+ alpha = 200
},
-/obj/machinery/firealarm/directional/north,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/blue/mid_joiner{
+ alpha = 200
+ },
+/turf/open/floor/iron/edge,
/area/station/hallway/primary/central)
"aJv" = (
/obj/effect/spawner/random/vending/colavend,
@@ -7462,23 +8150,21 @@
/turf/open/floor/wood,
/area/station/service/bar)
"aJy" = (
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/turf/open/floor/iron/dark/side{
- dir = 8
- },
+/turf/open/floor/iron/corner,
/area/station/hallway/primary/central)
"aJz" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+ dir = 4
+ },
/obj/machinery/recharge_station,
/obj/machinery/light/small/directional/west,
-/turf/open/floor/mineral/titanium/blue,
+/turf/open/floor/circuit/green,
/area/station/commons/toilet)
"aJA" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
/obj/effect/turf_decal/siding/wood{
dir = 1
},
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
/turf/open/floor/wood,
/area/station/command/heads_quarters/blueshield)
"aJC" = (
@@ -7545,6 +8231,19 @@
/obj/item/skillchip/basketweaving,
/turf/open/floor/iron/dark,
/area/station/service/hydroponics)
+"aJP" = (
+/obj/effect/turf_decal/siding,
+/obj/effect/turf_decal/trimline/blue/filled/line{
+ alpha = 160;
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/white/line{
+ dir = 1
+ },
+/turf/open/floor/iron/white/smooth_edge{
+ dir = 1
+ },
+/area/station/medical/medbay/lobby)
"aJQ" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 9
@@ -7589,18 +8288,20 @@
/turf/open/floor/iron/grimy,
/area/station/service/chapel/office)
"aJY" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/siding/thinplating_new/dark/corner{
+ dir = 4
+ },
+/turf/open/floor/iron/dark,
/area/station/science/robotics/lab)
"aJZ" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/cable,
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/public/glass{
name = "Primary Tool Storage"
},
/obj/effect/landmark/navigate_destination,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/cable,
/turf/open/floor/iron,
/area/station/commons/storage/primary)
"aKa" = (
@@ -7629,10 +8330,11 @@
},
/area/station/security/prison/safe)
"aKd" = (
-/obj/machinery/button/door/directional/south{
- id = "warehouse_shutters2";
- name = "warehouse shutters control"
+/obj/machinery/light/directional/south,
+/obj/effect/turf_decal/trimline/brown/filled/line{
+ dir = 1
},
+/obj/effect/turf_decal/trimline/brown/filled/line,
/turf/open/floor/iron,
/area/station/cargo/storage)
"aKe" = (
@@ -7642,10 +8344,18 @@
/turf/open/floor/iron,
/area/station/maintenance/starboard/fore)
"aKg" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
- dir = 9
+/obj/effect/turf_decal/trimline/brown/filled/line{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 5
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 8
+ },
+/turf/open/floor/iron/textured_edge{
+ dir = 8
},
-/turf/open/floor/iron,
/area/station/cargo/storage)
"aKi" = (
/obj/structure/disposalpipe/segment,
@@ -7654,17 +8364,31 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 4
},
-/turf/open/floor/iron,
+/obj/effect/turf_decal/siding/wood{
+ dir = 8
+ },
+/turf/open/floor/iron/dark/smooth_large,
/area/station/command/heads_quarters/hop)
"aKj" = (
-/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 4
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 4
},
-/turf/open/floor/iron,
+/obj/structure/cable,
+/obj/effect/turf_decal/trimline/blue/filled/corner{
+ dir = 1
+ },
+/obj/structure/decorative{
+ icon = 'icons/obj/tram/tram_controllers.dmi';
+ icon_state = "tram-controller";
+ anchored = 1;
+ name = "rudimentary controller";
+ pixel_x = 0;
+ pixel_y = 30
+ },
+/turf/open/floor/iron/edge,
/area/station/hallway/secondary/entry)
"aKk" = (
/obj/docking_port/stationary/mining_home/common{
@@ -7673,28 +8397,28 @@
/turf/open/floor/plating,
/area/station/hallway/secondary/entry)
"aKl" = (
-/obj/structure/extinguisher_cabinet{
- pixel_x = -5;
- pixel_y = 30
- },
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 4
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 4
},
-/turf/open/floor/iron,
+/obj/machinery/light/directional/north,
+/obj/structure/cable,
+/obj/machinery/firealarm/directional/north,
+/obj/effect/turf_decal/trimline/blue/filled/line{
+ dir = 1
+ },
+/turf/open/floor/iron/edge,
/area/station/hallway/secondary/entry)
"aKm" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/public/glass{
- name = "Garden"
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
},
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/landmark/navigate_destination,
/turf/open/floor/iron,
-/area/station/service/hydroponics/garden)
+/area/station/commons/locker)
"aKn" = (
/obj/effect/spawner/structure/window,
/turf/open/floor/plating,
@@ -7703,10 +8427,13 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/structure/cable,
-/obj/effect/turf_decal/tile/neutral{
+/obj/effect/turf_decal/trimline/green/arrow_ccw{
dir = 4
},
-/turf/open/floor/iron/dark/side{
+/obj/effect/turf_decal/trimline/green/mid_joiner{
+ dir = 4
+ },
+/turf/open/floor/iron/edge{
dir = 4
},
/area/station/hallway/primary/central)
@@ -7724,6 +8451,7 @@
},
/obj/structure/railing,
/obj/effect/landmark/start/hangover,
+/obj/structure/platform/wood/stage,
/turf/open/floor/wood/large,
/area/station/service/bar)
"aKr" = (
@@ -7732,9 +8460,7 @@
/obj/structure/railing/corner/end{
dir = 4
},
-/turf/open/floor/iron/stairs/old{
- dir = 4
- },
+/turf/open/floor/wood/stairs/left,
/area/station/service/bar)
"aKs" = (
/obj/structure/disposalpipe/segment,
@@ -7756,27 +8482,23 @@
/turf/open/floor/iron,
/area/station/service/hydroponics)
"aKE" = (
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
-/obj/effect/turf_decal/tile/blue{
+/turf/open/floor/iron/edge{
dir = 8
},
-/turf/open/floor/iron,
/area/station/hallway/primary/central)
"aKF" = (
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
+/turf/open/floor/iron/edge{
dir = 4
},
-/turf/open/floor/iron,
/area/station/hallway/primary/central)
"aKG" = (
-/obj/effect/turf_decal/stripes/line{
+/obj/structure/ore_box,
+/obj/effect/turf_decal/trimline/brown/filled/line{
+ dir = 10
+ },
+/obj/effect/turf_decal/trimline/dark/line{
dir = 10
},
-/obj/structure/ore_box,
-/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron,
/area/station/cargo/miningdock)
"aKH" = (
@@ -7803,16 +8525,23 @@
/turf/open/floor/stone,
/area/station/service/bar)
"aKM" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+/obj/effect/turf_decal/trimline/brown/filled/corner{
+ dir = 1
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/trimline/brown/filled/corner{
dir = 8
},
-/turf/open/floor/iron,
+/turf/open/floor/iron/textured_corner{
+ dir = 1
+ },
/area/station/cargo/storage)
"aKN" = (
/obj/effect/turf_decal/siding/thinplating_new/light{
dir = 6
},
/obj/structure/railing,
+/obj/structure/platform/wood/stage,
/turf/open/floor/wood/large,
/area/station/service/bar)
"aKO" = (
@@ -7957,24 +8686,34 @@
/turf/open/floor/wood,
/area/station/service/library)
"aLj" = (
-/obj/structure/sign/map/left{
- pixel_y = 32
- },
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 10
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 10
},
-/turf/open/floor/iron,
+/obj/structure/cable,
+/obj/effect/turf_decal/trimline/blue/filled/line{
+ dir = 1
+ },
+/obj/structure/sign/map/left{
+ pixel_y = 32
+ },
+/turf/open/floor/iron/edge,
/area/station/hallway/secondary/entry)
"aLl" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/dark_blue/corner{
+ alpha = 200;
+ dir = 1
+ },
+/turf/open/floor/iron/edge{
+ dir = 1
+ },
/area/station/hallway/primary/port)
"aLq" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron,
+/turf/open/floor/iron/large,
/area/station/cargo/office)
"aLt" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
@@ -7983,7 +8722,7 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 8
},
-/turf/open/floor/iron,
+/turf/open/floor/iron/large,
/area/station/cargo/office)
"aLu" = (
/obj/effect/decal/cleanable/dirt,
@@ -7995,39 +8734,38 @@
/turf/open/floor/iron/white,
/area/station/science/ordnance)
"aLv" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 8
+/obj/effect/turf_decal/weather/snow/corner{
+ dir = 10
},
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/firealarm/directional/west,
-/turf/open/floor/iron,
+/obj/machinery/atmospherics/components/unary/airlock_pump{
+ dir = 1
+ },
+/turf/open/floor/plating,
/area/station/hallway/secondary/entry)
"aLz" = (
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
dir = 1
},
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/blue/filled/warning{
+ alpha = 160
+ },
+/turf/open/floor/iron/small,
/area/station/hallway/secondary/entry)
"aLA" = (
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
+/obj/effect/turf_decal/stripes/white/line,
+/obj/effect/turf_decal/stripes/white/line{
+ dir = 1
},
-/obj/machinery/light/directional/south,
-/turf/open/floor/iron,
+/turf/open/floor/tram/plate,
/area/station/hallway/secondary/entry)
"aLC" = (
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/iron,
+/obj/structure/cable,
+/obj/effect/turf_decal/trimline/blue/filled/corner{
+ dir = 8
+ },
+/turf/open/floor/iron/small,
/area/station/hallway/secondary/entry)
"aLD" = (
/obj/machinery/door/airlock/external{
@@ -8037,7 +8775,7 @@
/turf/open/floor/plating,
/area/station/hallway/secondary/entry)
"aLE" = (
-/turf/open/floor/iron,
+/turf/open/floor/iron/edge,
/area/station/hallway/primary/port)
"aLH" = (
/obj/structure/disposalpipe/segment,
@@ -8048,7 +8786,12 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 4
},
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/brown/filled/corner{
+ dir = 4
+ },
+/turf/open/floor/iron/textured_corner{
+ dir = 4
+ },
/area/station/cargo/office)
"aLJ" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
@@ -8059,48 +8802,54 @@
"aLK" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/yellow/corner{
+ dir = 4
+ },
+/turf/open/floor/iron/edge{
+ dir = 1
+ },
/area/station/hallway/primary/port)
"aLL" = (
-/obj/machinery/camera/directional/north{
- c_tag = "Port Hallway 2"
+/obj/effect/turf_decal/trimline/neutral/corner{
+ dir = 1;
+ alpha = 100
},
-/turf/open/floor/iron,
+/turf/open/floor/iron/textured_corner,
/area/station/hallway/primary/port)
"aLM" = (
/obj/machinery/door/firedoor,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/neutral/warning{
+ dir = 1;
+ alpha = 100
+ },
+/turf/open/floor/iron/large,
/area/station/hallway/primary/port)
"aLO" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/structure/cable,
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
+/turf/open/floor/iron/edge{
+ dir = 1
},
-/turf/open/floor/iron/dark/corner{
- dir = 4
- },
-/area/station/hallway/primary/central)
+/area/station/hallway/primary/starboard)
"aLQ" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
/obj/machinery/camera/directional/north{
c_tag = "Central Hallway North-East"
},
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
/obj/item/radio/intercom/directional/north,
-/turf/open/floor/iron/dark/corner{
+/obj/effect/turf_decal/trimline/green/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/green/mid_joiner{
+ dir = 1
+ },
+/turf/open/floor/iron/edge{
dir = 1
},
/area/station/hallway/primary/central)
"aLR" = (
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/obj/machinery/newscaster/directional/north,
-/turf/open/floor/iron/dark/side{
- dir = 1
- },
-/area/station/hallway/primary/central)
+/obj/structure/cable,
+/turf/closed/wall/r_wall,
+/area/station/command/heads_quarters/ce)
"aLT" = (
/obj/machinery/camera/motion/directional/south{
active_power_usage = 0;
@@ -8120,14 +8869,24 @@
/turf/open/floor/wood,
/area/station/service/bar)
"aLX" = (
-/obj/effect/turf_decal/tile/blue{
+/obj/effect/turf_decal/trimline/blue/arrow_cw{
+ dir = 4;
+ alpha = 200
+ },
+/obj/effect/turf_decal/trimline/blue/mid_joiner{
+ alpha = 200;
+ dir = 4
+ },
+/turf/open/floor/iron/edge{
dir = 4
},
-/turf/open/floor/iron,
/area/station/hallway/primary/central)
"aLY" = (
/obj/machinery/door/firedoor,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/blue/warning{
+ dir = 1
+ },
+/turf/open/floor/iron/large,
/area/station/hallway/primary/central)
"aLZ" = (
/obj/effect/turf_decal/plaque{
@@ -8154,10 +8913,10 @@
/turf/open/floor/iron,
/area/station/hallway/primary/central)
"aMe" = (
+/obj/effect/landmark/start/hangover,
/obj/effect/turf_decal/plaque{
icon_state = "L9"
},
-/obj/effect/landmark/start/hangover,
/turf/open/floor/iron,
/area/station/hallway/primary/central)
"aMf" = (
@@ -8167,23 +8926,24 @@
/turf/open/floor/iron,
/area/station/hallway/primary/central)
"aMg" = (
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/turf/open/floor/iron/dark/side{
+/turf/open/floor/iron/edge{
dir = 1
},
/area/station/hallway/primary/central)
"aMi" = (
/obj/structure/disposalpipe/segment,
-/obj/effect/landmark/generic_maintenance_landmark,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/wood,
/area/station/service/bar)
"aMj" = (
-/turf/open/floor/iron/dark/corner{
- dir = 1
+/obj/effect/landmark/start/hangover,
+/obj/effect/turf_decal/trimline/blue/line{
+ alpha = 200
},
+/obj/effect/turf_decal/trimline/blue/mid_joiner{
+ alpha = 200
+ },
+/turf/open/floor/iron/edge,
/area/station/hallway/primary/central)
"aMk" = (
/obj/machinery/food_cart,
@@ -8197,15 +8957,33 @@
/area/station/service/kitchen)
"aMm" = (
/obj/machinery/firealarm/directional/north,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/blue/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/blue/mid_joiner{
+ dir = 1
+ },
+/turf/open/floor/iron/corner{
+ dir = 8
+ },
/area/station/hallway/primary/central)
"aMn" = (
/obj/machinery/light/directional/north,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/green/arrow_ccw{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/green/mid_joiner{
+ dir = 1
+ },
+/turf/open/floor/iron/edge{
+ dir = 1
+ },
/area/station/hallway/primary/central)
"aMo" = (
/obj/machinery/airalarm/directional/north,
-/turf/open/floor/iron,
+/turf/open/floor/iron/edge{
+ dir = 1
+ },
/area/station/hallway/primary/central)
"aMp" = (
/obj/machinery/door/firedoor,
@@ -8236,10 +9014,6 @@
/turf/open/floor/iron,
/area/station/service/hydroponics)
"aMt" = (
-/obj/structure/extinguisher_cabinet{
- pixel_x = -5;
- pixel_y = -31
- },
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 4
},
@@ -8252,6 +9026,9 @@
/obj/machinery/camera/directional/north{
c_tag = "Hydroponics North"
},
+/obj/effect/turf_decal/siding/dark{
+ dir = 1
+ },
/turf/open/floor/iron/dark,
/area/station/service/hydroponics)
"aMx" = (
@@ -8351,15 +9128,21 @@
/turf/open/floor/iron/smooth_large,
/area/station/hallway/secondary/service)
"aMO" = (
-/obj/machinery/status_display/evac/directional/east,
-/turf/open/floor/iron,
+/obj/structure/fluff/metalpole{
+ dir = 1
+ },
+/obj/item/reagent_containers/syringe{
+ pixel_y = -7;
+ pixel_x = 3
+ },
+/turf/open/floor/plating,
/area/station/hallway/secondary/entry)
"aMP" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 1
},
-/turf/open/floor/iron,
+/turf/open/floor/iron/large,
/area/station/cargo/office)
"aMQ" = (
/obj/structure/cable,
@@ -8384,17 +9167,18 @@
},
/area/station/commons/fitness)
"aMS" = (
-/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 4
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 4
},
+/obj/structure/cable,
+/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/public/glass{
name = "Arrivals"
},
-/turf/open/floor/iron,
+/turf/open/floor/iron/large,
/area/station/hallway/primary/port)
"aMU" = (
/obj/structure/cable,
@@ -8425,70 +9209,80 @@
/area/station/service/chapel/office)
"aMZ" = (
/obj/machinery/airalarm/directional/west,
-/obj/effect/turf_decal/tile/red{
- dir = 4
- },
-/obj/effect/turf_decal/tile/red{
- dir = 1
- },
-/obj/effect/turf_decal/tile/red{
- dir = 8
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/obj/machinery/vending/wardrobe/sec_wardrobe,
-/turf/open/floor/iron/dark,
+/obj/structure/closet/secure_closet/security,
+/obj/effect/turf_decal/delivery/blue,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/security/checkpoint/escape)
"aNa" = (
/obj/machinery/computer/security,
-/obj/effect/turf_decal/tile/red{
- dir = 1
- },
-/obj/effect/turf_decal/tile/red{
- dir = 4
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/turf/open/floor/iron/dark,
+/obj/effect/turf_decal/delivery/blue,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/security/checkpoint/escape)
"aNb" = (
-/obj/machinery/holopad,
+/obj/effect/turf_decal/stripes/line,
+/obj/effect/spawner/random/vending/snackvend,
+/obj/effect/turf_decal/trimline/blue/filled/line,
+/obj/effect/turf_decal/stripes/white/line{
+ color = "#a56dc2"
+ },
/turf/open/floor/iron,
/area/station/hallway/secondary/entry)
"aNd" = (
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/iron,
+/obj/machinery/door/firedoor/border_only{
+ dir = 8
+ },
+/obj/structure/cable,
+/obj/effect/turf_decal/trimline/blue/filled/line{
+ dir = 8
+ },
+/obj/structure/deployable_barricade/guardrail{
+ dir = 8
+ },
+/turf/open/floor/iron/small,
/area/station/hallway/secondary/entry)
"aNe" = (
/obj/machinery/bluespace_vendor/directional/north,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/yellow/corner{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/green/corner{
+ dir = 1
+ },
+/turf/open/floor/iron/edge{
+ dir = 1
+ },
/area/station/hallway/primary/port)
"aNf" = (
/obj/machinery/newscaster/directional/north,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/yellow/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/yellow/mid_joiner{
+ dir = 1
+ },
+/turf/open/floor/iron/edge{
+ dir = 1
+ },
/area/station/hallway/primary/port)
"aNg" = (
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
},
-/obj/effect/turf_decal/tile/neutral{
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 5
+ },
+/obj/effect/turf_decal/trimline/blue/filled/line{
dir = 8
},
-/turf/open/floor/iron,
+/obj/structure/railing/corner/end{
+ dir = 8
+ },
+/turf/open/floor/iron/small,
/area/station/hallway/secondary/entry)
"aNi" = (
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
@@ -8498,7 +9292,17 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 5
},
-/turf/open/floor/iron,
+/obj/machinery/door/firedoor/border_only{
+ dir = 8
+ },
+/obj/structure/cable,
+/obj/effect/turf_decal/trimline/blue/filled/line{
+ dir = 8
+ },
+/obj/structure/deployable_barricade/guardrail{
+ dir = 8
+ },
+/turf/open/floor/iron/small,
/area/station/hallway/secondary/entry)
"aNj" = (
/obj/machinery/navbeacon{
@@ -8509,7 +9313,10 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 9
},
-/turf/open/floor/iron,
+/obj/structure/cable,
+/turf/open/floor/iron/textured_half{
+ dir = 8
+ },
/area/station/hallway/primary/port)
"aNl" = (
/obj/structure/cable,
@@ -8517,7 +9324,7 @@
dir = 4
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron,
+/turf/open/floor/iron/large,
/area/station/hallway/primary/port)
"aNt" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
@@ -8531,6 +9338,10 @@
/obj/item/vending_refill/cigarette,
/turf/open/floor/wood,
/area/station/service/bar)
+"aNv" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer4,
+/turf/open/floor/plating,
+/area/station/maintenance/aft)
"aND" = (
/obj/item/stack/sheet/iron/fifty,
/obj/item/stack/sheet/glass/fifty{
@@ -8550,10 +9361,9 @@
/turf/open/floor/wood,
/area/station/service/bar)
"aNF" = (
-/obj/machinery/camera/directional/north{
- c_tag = "Disposal Mass Driver";
- network = list("Trash","cargo")
- },
+/obj/structure/window/spawner/directional/west,
+/obj/structure/hedge/opaque,
+/obj/structure/lattice,
/turf/open/space/basic,
/area/space/nearstation)
"aNH" = (
@@ -8584,13 +9394,14 @@
/turf/open/floor/stone,
/area/station/service/bar)
"aNL" = (
-/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 4
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 4
},
+/obj/machinery/door/firedoor,
+/obj/effect/turf_decal/trimline/brown/line,
/turf/open/floor/iron,
/area/station/cargo/office)
"aNM" = (
@@ -8619,7 +9430,10 @@
/area/station/service/hydroponics)
"aNR" = (
/obj/machinery/light/directional/south,
-/turf/open/floor/iron,
+/obj/machinery/firealarm/directional/south,
+/turf/open/floor/iron/textured_corner{
+ dir = 4
+ },
/area/station/hallway/primary/port)
"aNS" = (
/obj/effect/turf_decal/tile/neutral{
@@ -8636,19 +9450,19 @@
},
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/iron,
+/turf/open/floor/iron/edge,
/area/station/hallway/primary/port)
"aNU" = (
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/machinery/camera/directional/south{
- c_tag = "Port Hallway"
- },
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 4
},
-/turf/open/floor/iron,
+/obj/machinery/camera/directional/south{
+ c_tag = "Port Hallway"
+ },
+/turf/open/floor/iron/edge,
/area/station/hallway/primary/port)
"aNV" = (
/obj/effect/turf_decal/siding/wood,
@@ -8677,57 +9491,60 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 4
},
-/turf/open/floor/iron/dark,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/ai_monitored/command/storage/eva)
"aOb" = (
/obj/machinery/firealarm/directional/west,
-/obj/effect/turf_decal/tile/red{
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
+/obj/effect/turf_decal/trimline/dark_blue/filled/end{
dir = 1
},
-/obj/effect/turf_decal/tile/red{
- dir = 8
- },
-/obj/effect/turf_decal/tile/neutral{
+/obj/effect/turf_decal/siding/dark/end{
dir = 1
},
-/obj/structure/closet/secure_closet/security,
-/turf/open/floor/iron/dark,
+/turf/open/floor/iron/dark/small,
/area/station/security/checkpoint/escape)
"aOc" = (
/obj/structure/chair/office{
dir = 1
},
-/turf/open/floor/iron/dark,
+/obj/effect/turf_decal/siding/dark{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/dark,
+/turf/open/floor/carpet/black,
/area/station/security/checkpoint/escape)
"aOe" = (
-/obj/effect/turf_decal/stripes/corner{
- dir = 8
- },
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
- dir = 4
- },
-/turf/open/floor/iron,
+/obj/effect/spawner/random/maintenance/two,
+/obj/structure/closet/crate/mail/preopen,
+/turf/open/floor/plating,
/area/station/hallway/secondary/entry)
"aOf" = (
-/obj/effect/turf_decal/stripes/corner,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
- dir = 4
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
},
+/obj/effect/turf_decal/trimline/blue/filled/line{
+ dir = 8
+ },
+/obj/effect/turf_decal/stripes/white/line{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer5,
/turf/open/floor/iron,
/area/station/hallway/secondary/entry)
"aOg" = (
-/obj/effect/turf_decal/stripes/line,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
- dir = 4
+/obj/structure/marker_beacon/cerulean{
+ pixel_y = -7
},
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/blue/filled/line,
+/turf/open/floor/iron/edge,
/area/station/hallway/secondary/entry)
"aOh" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
- dir = 4
+/obj/effect/turf_decal/trimline/blue/filled/line,
+/obj/item/radio/intercom/directional/south,
+/turf/open/floor/iron/edge{
+ dir = 1
},
-/obj/effect/turf_decal/stripes/line,
-/turf/open/floor/iron,
/area/station/hallway/secondary/entry)
"aOi" = (
/obj/structure/disposalpipe/segment{
@@ -8740,11 +9557,9 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 9
},
-/turf/open/floor/iron,
+/turf/open/floor/iron/edge,
/area/station/hallway/primary/port)
"aOj" = (
-/obj/structure/window/spawner/directional/north,
-/obj/structure/window/spawner/directional/east,
/obj/machinery/hydroponics/constructable,
/obj/effect/turf_decal/siding/thinplating/dark{
dir = 6
@@ -8752,22 +9567,23 @@
/turf/open/floor/iron/smooth_large,
/area/station/service/hydroponics)
"aOk" = (
-/obj/effect/turf_decal/tile/neutral{
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+ dir = 8
+ },
+/obj/item/beacon,
+/obj/effect/turf_decal/trimline/dark/filled/line{
dir = 1
},
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
+/obj/effect/turf_decal/siding/white{
+ dir = 1
},
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
- dir = 4
- },
-/turf/open/floor/iron,
+/turf/open/floor/iron/small,
/area/station/hallway/secondary/entry)
"aOl" = (
/obj/structure/disposalpipe/segment{
dir = 4
},
-/turf/open/floor/iron,
+/turf/open/floor/iron/edge,
/area/station/hallway/primary/port)
"aOm" = (
/obj/structure/disposalpipe/segment{
@@ -8775,49 +9591,57 @@
},
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron,
+/turf/open/floor/iron/textured_half,
/area/station/hallway/primary/port)
"aOn" = (
/obj/structure/disposalpipe/segment{
dir = 4
},
/obj/machinery/light/directional/south,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/neutral/arrow_ccw,
+/obj/effect/turf_decal/trimline/neutral/mid_joiner,
+/turf/open/floor/iron/edge,
/area/station/hallway/primary/port)
"aOo" = (
+/obj/structure/extinguisher_cabinet/directional/north,
+/obj/effect/turf_decal/siding/dark{
+ dir = 1
+ },
+/turf/open/floor/iron/dark,
+/area/station/service/hydroponics)
+"aOp" = (
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/machinery/firealarm/directional/south,
-/turf/open/floor/iron,
-/area/station/hallway/primary/port)
-"aOp" = (
/obj/machinery/camera/directional/south{
c_tag = "Port Hallway 3"
},
-/obj/structure/disposalpipe/segment{
- dir = 4
+/obj/effect/turf_decal/trimline/neutral/corner{
+ dir = 8
},
-/turf/open/floor/iron,
+/turf/open/floor/iron/edge,
/area/station/hallway/primary/port)
"aOq" = (
/obj/structure/disposalpipe/junction{
dir = 4
},
-/turf/open/floor/iron,
+/turf/open/floor/iron/edge,
/area/station/hallway/primary/port)
"aOr" = (
/obj/structure/disposalpipe/junction/flip{
dir = 4
},
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/neutral/arrow_cw,
+/obj/effect/turf_decal/trimline/neutral/mid_joiner,
+/turf/open/floor/iron/edge,
/area/station/hallway/primary/port)
"aOs" = (
/obj/structure/disposalpipe/segment{
dir = 4
},
/obj/machinery/door/firedoor,
-/turf/open/floor/iron,
+/obj/machinery/firealarm/directional/south,
+/turf/open/floor/iron/large,
/area/station/hallway/primary/port)
"aOv" = (
/obj/structure/disposalpipe/segment,
@@ -8827,7 +9651,12 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 4
},
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/brown/corner{
+ dir = 8
+ },
+/turf/open/floor/iron/edge{
+ dir = 8
+ },
/area/station/hallway/primary/central)
"aOw" = (
/obj/machinery/holopad/secure,
@@ -8850,6 +9679,9 @@
/turf/open/floor/iron,
/area/station/hallway/primary/central)
"aOz" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/effect/turf_decal/tile/blue{
dir = 8
},
@@ -8860,25 +9692,25 @@
dir = 1
},
/obj/effect/turf_decal/tile/dark_blue,
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/dark/textured,
/area/station/hallway/primary/central)
"aOE" = (
-/obj/effect/turf_decal/tile/blue{
- dir = 8
+/obj/effect/turf_decal/trimline/blue/arrow_ccw{
+ alpha = 200
},
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/blue/mid_joiner{
+ alpha = 200
+ },
+/turf/open/floor/iron/edge,
/area/station/hallway/primary/central)
"aOG" = (
/obj/structure/sign/warning/electric_shock/directional/south,
/obj/machinery/door/firedoor,
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
/obj/machinery/light/directional/south,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/blue/warning{
+ alpha = 200
+ },
+/turf/open/floor/iron/large,
/area/station/hallway/primary/central)
"aOI" = (
/obj/structure/kitchenspike,
@@ -8934,23 +9766,26 @@
/turf/open/floor/iron/kitchen_coldroom/freezerfloor,
/area/station/service/kitchen)
"aOU" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
- dir = 4
- },
/obj/structure/railing{
dir = 4
},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/dark,
/area/station/hallway/secondary/exit)
"aOW" = (
-/obj/machinery/holopad{
- name = "botany requests holopad"
+/obj/effect/turf_decal/siding/wood{
+ dir = 5
},
-/turf/open/floor/iron/cafeteria,
-/area/station/service/kitchen)
+/turf/open/floor/wood,
+/area/station/hallway/primary/starboard)
"aOY" = (
-/obj/machinery/door/firedoor,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/blue/filled/line{
+ dir = 4
+ },
+/turf/open/floor/iron/edge{
+ dir = 8
+ },
/area/station/hallway/secondary/entry)
"aPb" = (
/obj/structure/sign/painting/library{
@@ -8999,23 +9834,13 @@
"aPj" = (
/turf/open/floor/catwalk_floor/iron_dark,
/area/station/maintenance/starboard/fore)
-"aPm" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
- dir = 4
- },
-/turf/open/floor/iron/white,
-/area/station/science/robotics/lab)
"aPn" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
- dir = 10
+/obj/machinery/vending/wardrobe/robo_wardrobe,
+/obj/item/toy/figure/roboticist{
+ pixel_y = 16;
+ pixel_x = -7
},
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
- dir = 10
- },
-/turf/open/floor/iron/white,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/science/robotics/lab)
"aPq" = (
/turf/open/floor/iron,
@@ -9026,51 +9851,83 @@
},
/obj/item/radio/intercom/directional/west,
/obj/machinery/light/directional/west,
-/obj/effect/turf_decal/tile/red{
- dir = 1
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/iron/dark,
-/area/station/security/checkpoint/escape)
-"aPs" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/chair/sofa/bench/left{
- dir = 1
+/obj/effect/turf_decal/trimline/dark_blue/filled/corner{
+ dir = 4
},
-/turf/open/floor/iron/dark/side,
-/area/station/hallway/secondary/exit)
-"aPt" = (
-/obj/effect/turf_decal/stripes/corner{
+/obj/effect/turf_decal/trimline/dark_blue/filled/corner,
+/obj/effect/turf_decal/trimline/dark_blue/filled/line{
dir = 8
},
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/iron,
-/area/station/hallway/secondary/entry)
-"aPu" = (
-/obj/machinery/camera/directional/east{
- c_tag = "Arrivals Escape Pod 2"
+/obj/effect/turf_decal/siding/dark{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/dark/corner,
+/obj/effect/turf_decal/siding/dark/corner{
+ dir = 4
+ },
+/turf/open/floor/iron/dark/small,
+/area/station/security/checkpoint/escape)
+"aPs" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/machinery/atmospherics/pipe/layer_manifold/cyan/hidden{
+ dir = 8
},
-/obj/machinery/light/small/directional/south,
/turf/open/floor/plating,
/area/station/hallway/secondary/entry)
+"aPt" = (
+/obj/effect/turf_decal/trimline/blue/filled/warning{
+ alpha = 160
+ },
+/turf/open/floor/iron/small,
+/area/station/hallway/secondary/entry)
+"aPu" = (
+/obj/structure/disposalpipe/segment,
+/obj/effect/turf_decal/trimline/blue/arrow_cw{
+ dir = 8;
+ alpha = 200
+ },
+/obj/effect/turf_decal/trimline/blue/mid_joiner{
+ alpha = 200;
+ dir = 8
+ },
+/obj/machinery/firealarm/directional/west,
+/turf/open/floor/iron/edge{
+ dir = 8
+ },
+/area/station/hallway/primary/central)
"aPv" = (
-/obj/effect/mapping_helpers/airlock/cyclelink_helper,
-/obj/machinery/door/airlock/external{
- name = "Port Docking Bay 1"
+/obj/structure/fluff/metalpole{
+ dir = 1
},
/turf/open/floor/plating,
/area/station/hallway/secondary/entry)
"aPx" = (
/obj/machinery/airalarm/directional/south,
-/turf/open/floor/iron,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 5
+ },
+/obj/effect/turf_decal/trimline/blue/filled/line,
+/turf/open/floor/iron/edge{
+ dir = 1
+ },
/area/station/hallway/secondary/entry)
"aPy" = (
/obj/machinery/firealarm/directional/south,
-/turf/open/floor/iron,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 5
+ },
+/obj/effect/turf_decal/trimline/blue/filled/line,
+/turf/open/floor/iron/edge{
+ dir = 1
+ },
/area/station/hallway/secondary/entry)
"aPz" = (
/turf/closed/wall,
@@ -9079,24 +9936,24 @@
/turf/closed/wall,
/area/station/commons/locker)
"aPB" = (
-/obj/machinery/door/airlock/maintenance,
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/disposalpipe/segment,
+/obj/machinery/door/airlock/maintenance,
/obj/effect/mapping_helpers/airlock/unres,
/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance,
-/obj/structure/disposalpipe/segment,
/turf/open/floor/plating,
/area/station/maintenance/port)
"aPC" = (
-/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron,
+/obj/machinery/door/firedoor,
+/turf/open/floor/iron/large,
/area/station/commons/locker)
"aPD" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/door/firedoor,
/obj/effect/landmark/navigate_destination,
-/turf/open/floor/iron,
+/turf/open/floor/iron/large,
/area/station/commons/locker)
"aPE" = (
/obj/machinery/status_display/evac,
@@ -9110,14 +9967,17 @@
/turf/closed/wall,
/area/station/commons/storage/art)
"aPI" = (
-/obj/machinery/door/airlock/maintenance,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/cable,
+/obj/machinery/door/airlock/maintenance,
/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance,
/obj/effect/mapping_helpers/airlock/unres,
-/obj/structure/cable,
/turf/open/floor/plating,
/area/station/maintenance/port)
"aPJ" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/effect/turf_decal/tile/blue,
/obj/effect/turf_decal/tile/blue{
dir = 1
@@ -9128,9 +9988,6 @@
/obj/effect/turf_decal/tile/dark_blue{
dir = 8
},
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/dark/textured,
/area/station/hallway/primary/central)
"aPK" = (
@@ -9138,12 +9995,12 @@
/area/station/commons/storage/emergency/port)
"aPL" = (
/obj/structure/closet/firecloset,
-/turf/open/floor/iron,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/hallway/primary/port)
"aPN" = (
/obj/structure/closet/emcloset,
/obj/machinery/airalarm/directional/south,
-/turf/open/floor/iron,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/hallway/primary/port)
"aPQ" = (
/turf/closed/wall,
@@ -9152,32 +10009,26 @@
/turf/closed/wall/r_wall,
/area/station/command/bridge)
"aPS" = (
+/obj/structure/cable,
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/door/poddoor/preopen{
id = "bridge blast";
name = "Bridge Blast Door"
},
-/obj/structure/cable,
/turf/open/floor/plating,
/area/station/command/bridge)
"aPT" = (
+/obj/structure/cable,
/obj/machinery/door/poddoor/preopen{
id = "bridge blast";
name = "Bridge Blast Door"
},
/obj/effect/spawner/structure/window/reinforced,
-/obj/structure/cable,
/turf/open/floor/plating,
/area/station/command/bridge)
"aPU" = (
/obj/machinery/status_display/evac,
-/obj/effect/spawner/structure/window/reinforced,
-/obj/machinery/door/poddoor/preopen{
- id = "bridge blast";
- name = "Bridge Blast Door"
- },
-/obj/structure/cable,
-/turf/open/floor/plating,
+/turf/closed/wall/r_wall,
/area/station/command/bridge)
"aPY" = (
/obj/structure/table,
@@ -9244,11 +10095,23 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 5
},
-/turf/open/floor/iron,
+/turf/open/floor/iron/corner{
+ dir = 1
+ },
/area/station/command/teleporter)
"aQo" = (
/obj/effect/landmark/start/assistant,
-/turf/open/floor/iron,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 5
+ },
+/obj/effect/turf_decal/trimline/blue/filled/line,
+/obj/machinery/incident_display/delam/directional/south,
+/turf/open/floor/iron/edge{
+ dir = 1
+ },
/area/station/hallway/secondary/entry)
"aQq" = (
/obj/machinery/light/small/directional/east,
@@ -9277,10 +10140,11 @@
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 8
},
+/obj/effect/mapping_helpers/airlock/access/any/security/brig,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer4,
/obj/machinery/door/airlock/external{
name = "Labor Camp Shuttle Airlock"
},
-/obj/effect/mapping_helpers/airlock/access/any/security/brig,
/turf/open/floor/plating,
/area/station/security/processing)
"aQC" = (
@@ -9288,36 +10152,62 @@
color = "#596479"
},
/obj/effect/landmark/start/scientist,
-/turf/open/floor/carpet,
+/turf/open/floor/carpet/black,
/area/station/science/breakroom)
"aQF" = (
/obj/structure/table,
/obj/machinery/recharger{
pixel_y = 4
},
-/obj/item/storage/toolbox/emergency,
-/obj/effect/turf_decal/tile/red{
- dir = 8
- },
-/obj/effect/turf_decal/tile/red,
-/obj/effect/turf_decal/tile/neutral,
-/turf/open/floor/iron/dark,
+/obj/effect/turf_decal/delivery/blue,
+/obj/machinery/requests_console/directional/east,
+/obj/effect/mapping_helpers/requests_console/information,
+/obj/effect/mapping_helpers/requests_console/assistance,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/security/checkpoint/escape)
"aQG" = (
+/obj/effect/turf_decal/stripes/white/line{
+ color = "#a56dc2"
+ },
+/obj/machinery/door/firedoor/border_only,
+/obj/structure/fluff/metalpole{
+ pixel_y = -32
+ },
/obj/effect/turf_decal/stripes/line,
-/obj/item/radio/intercom/directional/south,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/stripes/white/line{
+ color = "#52B4E9";
+ name = "blue line"
+ },
+/obj/structure/railing/corner/end/flip{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/blue/fourcorners,
+/turf/open/floor/iron/white,
/area/station/hallway/secondary/entry)
"aQH" = (
-/obj/effect/turf_decal/stripes/corner{
+/obj/effect/turf_decal/stripes/line,
+/obj/effect/turf_decal/trimline/blue/filled/line,
+/obj/effect/landmark/start/hangover,
+/obj/effect/turf_decal/stripes/white/line,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 5
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 4
},
-/turf/open/floor/iron,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer5,
+/turf/open/floor/iron/edge{
+ dir = 1
+ },
/area/station/hallway/secondary/entry)
"aQJ" = (
/obj/machinery/camera/directional/east{
c_tag = "Arrivals Hallway"
},
+/obj/effect/spawner/random/vending/snackvend,
+/obj/effect/turf_decal/trimline/blue/filled/line{
+ dir = 6
+ },
/turf/open/floor/iron,
/area/station/hallway/secondary/entry)
"aQK" = (
@@ -9342,43 +10232,84 @@
/turf/open/floor/iron,
/area/station/commons/locker)
"aQO" = (
+/obj/effect/landmark/start/hangover/closet,
/obj/structure/closet/wardrobe/white,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/tile/neutral/opposingcorners{
+ dir = 1
+ },
+/turf/open/floor/iron/dark/side{
+ dir = 9
+ },
/area/station/commons/locker)
"aQP" = (
/obj/machinery/light_switch{
pixel_y = 28
},
/obj/machinery/vending/autodrobe,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/turf/open/floor/iron/dark/side{
+ dir = 1
+ },
/area/station/commons/locker)
"aQQ" = (
/obj/machinery/vending/dorms,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/turf/open/floor/iron/dark/side{
+ dir = 1
+ },
/area/station/commons/locker)
"aQR" = (
/obj/effect/spawner/random/vending/colavend,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/turf/open/floor/iron/dark/side{
+ dir = 1
+ },
/area/station/commons/locker)
"aQS" = (
/obj/effect/spawner/random/vending/snackvend,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/turf/open/floor/iron/dark/side{
+ dir = 1
+ },
/area/station/commons/locker)
"aQT" = (
/obj/structure/disposalpipe/segment,
-/turf/open/floor/iron,
+/turf/open/floor/iron/dark/corner{
+ dir = 4
+ },
/area/station/commons/locker)
"aQU" = (
/obj/machinery/vending/cigarette,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/turf/open/floor/iron/dark/side{
+ dir = 1
+ },
/area/station/commons/locker)
"aQV" = (
/obj/machinery/vending/clothing,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/turf/open/floor/iron/dark/side{
+ dir = 1
+ },
/area/station/commons/locker)
"aQW" = (
/obj/structure/closet/secure_closet/personal,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/tile/neutral,
+/turf/open/floor/iron/dark/side{
+ dir = 4
+ },
/area/station/commons/locker)
"aQX" = (
/obj/machinery/photocopier/prebuilt,
@@ -9439,21 +10370,22 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 5
},
-/obj/effect/turf_decal/tile/brown,
-/obj/effect/turf_decal/tile/brown{
- dir = 4
+/obj/effect/turf_decal/trimline/brown/filled/corner{
+ dir = 8
+ },
+/turf/open/floor/iron/textured_corner{
+ dir = 8
},
-/turf/open/floor/iron,
/area/station/cargo/office)
"aRf" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/cable,
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/public/glass{
name = "Auxiliary Tool Storage"
},
/obj/effect/landmark/navigate_destination,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/cable,
/turf/open/floor/iron,
/area/station/commons/storage/tools)
"aRg" = (
@@ -9471,77 +10403,99 @@
/area/station/service/bar)
"aRh" = (
/obj/machinery/light/directional/west,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/yellow/line{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/yellow/mid_joiner{
+ dir = 8
+ },
+/turf/open/floor/iron/edge{
+ dir = 8
+ },
/area/station/hallway/primary/central)
"aRi" = (
-/obj/effect/turf_decal/tile/yellow{
- dir = 1
- },
-/obj/effect/turf_decal/tile/yellow{
- dir = 8
- },
-/obj/effect/turf_decal/tile/yellow{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/station/command/bridge)
-"aRj" = (
-/obj/structure/table/reinforced,
-/obj/item/clipboard,
-/obj/item/mining_voucher,
-/turf/open/floor/iron,
-/area/station/command/bridge)
-"aRk" = (
-/obj/machinery/computer/monitor{
- name = "bridge power monitoring console";
- dir = 8
- },
-/obj/effect/turf_decal/tile/yellow,
-/obj/effect/turf_decal/tile/yellow{
- dir = 4
+/obj/machinery/computer/station_alert{
+ dir = 2
},
/obj/structure/cable,
-/obj/structure/window/reinforced/spawner/directional/east,
+/obj/effect/turf_decal/tile/yellow/half{
+ dir = 1
+ },
+/turf/open/floor/iron/dark/smooth_large,
+/area/station/command/bridge)
+"aRj" = (
+/obj/machinery/computer/monitor{
+ name = "bridge power monitoring console";
+ dir = 4
+ },
/obj/effect/turf_decal/tile/yellow{
dir = 1
},
-/turf/open/floor/iron,
+/turf/open/floor/iron/dark/smooth_large,
+/area/station/command/bridge)
+"aRk" = (
+/obj/structure/window/reinforced/spawner/directional/east,
+/obj/structure/window/reinforced/spawner/directional/west,
+/obj/structure/filingcabinet,
+/turf/open/floor/glass/reinforced,
/area/station/command/bridge)
"aRl" = (
-/obj/effect/turf_decal/tile/yellow{
+/obj/structure/table/reinforced,
+/obj/item/clipboard{
+ pixel_x = -3;
+ pixel_y = 3
+ },
+/obj/item/aicard{
+ pixel_x = 2;
+ pixel_y = 2
+ },
+/obj/item/mining_voucher{
+ pixel_x = -2;
+ pixel_y = 6
+ },
+/obj/effect/turf_decal/tile/yellow/anticorner{
dir = 4
},
-/obj/effect/turf_decal/tile/yellow{
- dir = 1
- },
-/turf/open/floor/iron,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/command/bridge)
"aRm" = (
-/obj/machinery/computer/communications,
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/obj/effect/turf_decal/tile/blue/fourcorners,
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
+/obj/machinery/computer/communications{
+ desc = "A console used for high-priority announcements and emergencies. Announce to the whole station if the Captain forgot to lock it again."
},
/obj/effect/turf_decal/tile/neutral{
dir = 4
},
-/turf/open/floor/iron,
-/area/station/command/bridge)
-"aRn" = (
-/obj/machinery/computer/shuttle/labor,
-/obj/effect/turf_decal/tile/blue{
+/obj/machinery/button/door{
+ id = "bridge blast";
+ name = "Bridge Blast Door Control";
+ pixel_x = 25;
+ pixel_y = -3;
+ req_access = list("command")
+ },
+/obj/structure/cable,
+/obj/effect/turf_decal/tile/blue/half{
dir = 1
},
-/obj/effect/turf_decal/tile/blue{
- dir = 8
+/turf/open/floor/iron/dark/smooth_large,
+/area/station/command/bridge)
+"aRn" = (
+/obj/structure/table/reinforced,
+/obj/item/paper_bin{
+ pixel_x = -5;
+ pixel_y = 5
},
-/obj/effect/turf_decal/tile/blue{
- dir = 4
+/obj/item/pen{
+ pixel_x = -5;
+ pixel_y = 7
},
-/turf/open/floor/iron,
+/obj/item/clothing/mask/gas{
+ pixel_x = 7;
+ pixel_y = 4
+ },
+/obj/effect/turf_decal/tile/blue/anticorner{
+ dir = 1
+ },
+/turf/open/floor/iron/dark/smooth_large,
/area/station/command/bridge)
"aRo" = (
/obj/machinery/hydroponics/soil,
@@ -9551,53 +10505,93 @@
/turf/open/floor/grass,
/area/station/service/hydroponics/garden)
"aRp" = (
-/obj/machinery/computer/shuttle/mining,
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
+/obj/structure/table/reinforced,
+/obj/machinery/keycard_auth{
+ pixel_x = -5;
+ pixel_y = 8
+ },
+/obj/item/multitool{
+ pixel_x = 6;
+ pixel_y = 2
+ },
+/obj/effect/turf_decal/tile/blue/anticorner{
dir = 4
},
-/obj/structure/cable,
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
-/turf/open/floor/iron,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/command/bridge)
"aRq" = (
-/obj/effect/turf_decal/tile/green,
-/obj/effect/turf_decal/tile/green{
- dir = 4
+/obj/machinery/computer/crew{
+ dir = 2
},
-/obj/effect/turf_decal/tile/green{
+/obj/structure/cable,
+/obj/effect/turf_decal/tile/dark_green/half{
dir = 1
},
-/turf/open/floor/iron,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/command/bridge)
"aRr" = (
-/obj/effect/turf_decal/tile/green{
- dir = 4
+/obj/structure/table/reinforced,
+/obj/item/storage/box/pdas{
+ pixel_x = -7;
+ pixel_y = 8
},
-/obj/effect/turf_decal/tile/green{
+/obj/item/storage/box/silver_ids{
+ pixel_x = 8;
+ pixel_y = 8
+ },
+/obj/item/storage/box/ids{
+ pixel_x = -7;
+ pixel_y = -1
+ },
+/obj/item/food/cakeslice/mothmallow{
+ pixel_x = 9;
+ pixel_y = -2
+ },
+/obj/effect/turf_decal/tile/dark_green/anticorner{
dir = 1
},
-/turf/open/floor/iron,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/command/bridge)
"aRs" = (
/obj/structure/table/reinforced,
-/obj/item/wrench,
-/obj/item/assembly/timer,
-/obj/item/assembly/signaler,
-/obj/item/assembly/signaler,
-/obj/item/clothing/mask/gas,
-/obj/item/storage/toolbox/mechanical{
- pixel_x = -2;
- pixel_y = 6
+/obj/item/assembly/timer{
+ pixel_x = 3;
+ pixel_y = 10
},
-/obj/item/storage/toolbox/emergency,
-/turf/open/floor/iron,
+/obj/item/assembly/signaler{
+ pixel_x = -8;
+ pixel_y = 9
+ },
+/obj/item/assembly/signaler{
+ pixel_x = -8;
+ pixel_y = 5
+ },
+/obj/item/wrench{
+ pixel_x = 0;
+ pixel_y = 4
+ },
+/obj/item/clothing/head/beret/sec/service{
+ name = "commendant beret";
+ pixel_x = 5;
+ pixel_y = 0
+ },
+/obj/effect/turf_decal/tile/dark_green/anticorner{
+ dir = 4
+ },
+/obj/machinery/vending/wallmed/directional/east,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/command/bridge)
"aRt" = (
/obj/machinery/light/directional/east,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/brown/arrow_cw{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/brown/mid_joiner{
+ dir = 4
+ },
+/turf/open/floor/iron/edge{
+ dir = 4
+ },
/area/station/hallway/primary/central)
"aRu" = (
/obj/structure/chair/sofa/left/brown{
@@ -9609,7 +10603,19 @@
/turf/open/floor/wood,
/area/station/service/bar)
"aRv" = (
-/turf/open/floor/iron/dark/textured,
+/obj/effect/turf_decal/siding/wideplating_new/dark{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes/line,
+/obj/effect/turf_decal/stripes/white/line{
+ color = "#52B4E9";
+ name = "blue line"
+ },
+/obj/effect/turf_decal/siding/wideplating_new/dark/corner,
+/obj/effect/turf_decal/siding/wideplating_new/dark/corner{
+ dir = 8
+ },
+/turf/open/floor/iron/textured_large,
/area/station/command/gateway)
"aRw" = (
/obj/structure/chair/comfy/brown{
@@ -9623,16 +10629,13 @@
/turf/open/floor/eighties,
/area/station/service/bar)
"aRy" = (
-/obj/structure/extinguisher_cabinet{
- pixel_x = -5;
- pixel_y = 30
- },
/obj/structure/table,
/obj/machinery/microwave{
pixel_x = -3;
pixel_y = 6
},
/obj/effect/spawner/random/food_or_drink/donkpockets,
+/obj/structure/extinguisher_cabinet/directional/north,
/turf/open/floor/iron/cafeteria,
/area/station/service/kitchen)
"aRz" = (
@@ -9665,16 +10668,41 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 10
},
-/turf/open/floor/iron,
+/obj/machinery/light/floor,
+/turf/open/floor/iron/large,
/area/station/cargo/office)
"aRJ" = (
/turf/open/floor/iron,
/area/station/service/hydroponics)
+"aRL" = (
+/obj/structure/table/wood,
+/obj/machinery/coffeemaker/impressa{
+ pixel_y = 4
+ },
+/obj/item/storage/fancy/coffee_condi_display{
+ pixel_y = 17
+ },
+/obj/item/reagent_containers/cup/glass/mug{
+ pixel_y = -4;
+ pixel_x = -3
+ },
+/obj/effect/turf_decal/siding/wood/corner{
+ dir = 1
+ },
+/obj/structure/window/spawner/directional/south,
+/turf/open/floor/wood/tile,
+/area/station/hallway/secondary/entry)
"aRN" = (
/obj/structure/chair,
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/cobweb/cobweb2,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/dark_blue/filled/line{
+ dir = 5
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 5
+ },
+/turf/open/floor/iron/dark,
/area/station/security/checkpoint/escape)
"aRO" = (
/obj/structure/bookcase/random/reference,
@@ -9706,18 +10734,29 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 4
},
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/trimline/dark/filled/line{
+ alpha = 160;
+ dir = 2
+ },
+/obj/effect/turf_decal/trimline/dark/filled/mid_joiner{
+ dir = 2;
+ alpha = 160
+ },
+/obj/effect/turf_decal/trimline/purple/line{
+ alpha = 200;
+ dir = 2
+ },
+/obj/effect/turf_decal/siding/dark,
+/turf/open/floor/iron/white/smooth_edge,
/area/station/science/research)
"aRV" = (
-/obj/structure/extinguisher_cabinet{
- pixel_x = -27
- },
/obj/effect/turf_decal/tile/yellow{
dir = 8
},
/obj/effect/turf_decal/tile/yellow{
dir = 1
},
+/obj/structure/extinguisher_cabinet/directional/west,
/turf/open/floor/iron,
/area/station/commons/storage/tools)
"aRW" = (
@@ -9725,40 +10764,43 @@
/turf/open/floor/plating,
/area/station/security/checkpoint/escape)
"aRX" = (
-/obj/machinery/camera/directional/east{
- c_tag = "Arrivals North"
+/obj/effect/turf_decal/stripes/white/line{
+ color = "#a56dc2"
},
-/turf/open/floor/iron,
-/area/station/hallway/secondary/entry)
-"aRY" = (
-/obj/machinery/camera/directional/south{
- c_tag = "Arrivals Bay 1 North"
+/obj/machinery/door/firedoor/border_only,
+/obj/structure/fluff/metalpole{
+ pixel_y = -32
},
/obj/effect/turf_decal/stripes/line,
-/turf/open/floor/iron,
-/area/station/hallway/secondary/entry)
-"aRZ" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 6
+/obj/effect/turf_decal/stripes/white/line{
+ color = "#52B4E9";
+ name = "blue line"
},
-/obj/structure/closet/firecloset,
-/turf/open/floor/iron,
+/obj/structure/railing/corner/end{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/blue/fourcorners,
+/turf/open/floor/iron/white,
+/area/station/hallway/secondary/entry)
+"aRY" = (
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer5,
+/turf/open/floor/plating,
+/area/station/maintenance/port)
+"aRZ" = (
+/obj/structure/fluff/metalpole,
+/obj/machinery/light/small/directional/north,
+/turf/open/floor/plating,
/area/station/hallway/secondary/entry)
"aSa" = (
/obj/machinery/holopad,
/turf/open/floor/iron,
/area/station/commons/storage/tools)
"aSb" = (
-/obj/effect/turf_decal/tile/neutral{
+/obj/effect/turf_decal/trimline/blue/filled/warning{
dir = 1
},
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
- dir = 8
- },
-/turf/open/floor/iron,
+/turf/open/floor/iron/small,
/area/station/hallway/secondary/entry)
"aSc" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -9768,29 +10810,23 @@
/turf/open/floor/iron,
/area/station/commons/storage/tools)
"aSd" = (
-/obj/effect/turf_decal/tile/neutral{
+/obj/effect/landmark/start/hangover,
+/obj/effect/turf_decal/trimline/blue/filled/warning{
dir = 1
},
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/station/hallway/secondary/entry)
-"aSe" = (
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/obj/machinery/light/directional/north,
-/turf/open/floor/iron,
+/turf/open/floor/iron/small,
/area/station/hallway/secondary/entry)
"aSf" = (
-/obj/effect/turf_decal/tile/neutral{
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 5
+ },
+/obj/effect/turf_decal/trimline/blue/filled/corner{
dir = 1
},
-/turf/open/floor/iron,
+/turf/open/floor/iron/small,
/area/station/hallway/secondary/entry)
"aSg" = (
/turf/open/floor/plating,
@@ -9798,7 +10834,12 @@
"aSh" = (
/obj/structure/closet/wardrobe/mixed,
/obj/item/radio/intercom/directional/west,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/turf/open/floor/iron/dark/side{
+ dir = 8
+ },
/area/station/commons/locker)
"aSi" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
@@ -9807,32 +10848,32 @@
/turf/open/floor/iron,
/area/station/commons/locker)
"aSk" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+ dir = 4
+ },
/obj/structure/table,
/obj/item/paper_bin/construction,
/obj/item/stack/pipe_cleaner_coil/random,
/obj/item/stack/pipe_cleaner_coil/random,
/obj/item/stack/pipe_cleaner_coil/random,
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
- dir = 4
- },
/turf/open/floor/wood,
/area/station/commons/storage/art)
"aSl" = (
-/obj/machinery/light_switch{
- pixel_y = 28
- },
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
dir = 4
},
-/turf/open/floor/plating,
-/area/station/commons/storage/emergency/port)
-"aSm" = (
-/obj/item/storage/box/lights/mixed,
+/obj/machinery/light_switch{
+ pixel_y = 28
+ },
+/obj/structure/reagent_dispensers/watertank,
/turf/open/floor/plating,
/area/station/commons/storage/emergency/port)
"aSo" = (
/obj/structure/chair/stool/directional/north,
/obj/effect/turf_decal/tile/neutral/opposingcorners,
+/obj/effect/turf_decal/siding/wood{
+ dir = 1
+ },
/turf/open/floor/iron/dark,
/area/station/service/bar)
"aSq" = (
@@ -9861,11 +10902,14 @@
/turf/open/floor/iron,
/area/station/commons/storage/tools)
"aSu" = (
-/obj/effect/turf_decal/tile/yellow{
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
+/obj/structure/cable,
+/obj/structure/chair/comfy/shuttle{
+ color = "#ffcf5e";
+ name = "Engineering Station";
dir = 1
},
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
-/turf/open/floor/iron,
+/turf/open/floor/carpet/lone,
/area/station/command/bridge)
"aSv" = (
/obj/effect/turf_decal/tile/neutral{
@@ -9876,99 +10920,78 @@
},
/area/station/hallway/primary/central/fore)
"aSw" = (
+/obj/structure/window/reinforced/spawner/directional/east,
+/obj/structure/window/reinforced/spawner/directional/west,
+/turf/open/floor/glass/reinforced,
+/area/station/command/bridge)
+"aSx" = (
+/obj/machinery/computer/atmos_alert{
+ dir = 8
+ },
/obj/effect/turf_decal/tile/yellow{
dir = 4
},
-/obj/structure/cable,
-/obj/machinery/computer/station_alert{
- dir = 8
- },
-/obj/structure/window/reinforced/spawner/directional/east,
-/obj/effect/turf_decal/tile/yellow,
-/turf/open/floor/iron,
-/area/station/command/bridge)
-"aSx" = (
-/obj/structure/chair{
- dir = 4;
- name = "Engineering Station"
- },
-/turf/open/floor/iron,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/command/bridge)
"aSy" = (
-/obj/structure/chair{
- dir = 1;
- name = "Command Station"
+/obj/structure/cable,
+/obj/structure/chair/comfy/shuttle{
+ color = "#8a9bc2";
+ name = "Command Station";
+ dir = 1
},
-/obj/machinery/button/door{
- id = "bridge blast";
- name = "Bridge Blast Door Control";
- pixel_x = 31;
- pixel_y = -3;
- req_access = list("command")
- },
-/turf/open/floor/iron,
+/turf/open/floor/carpet/royalblue,
/area/station/command/bridge)
"aSz" = (
-/obj/structure/table/reinforced,
+/obj/machinery/computer/shuttle/labor{
+ dir = 4
+ },
/obj/effect/turf_decal/tile/blue{
dir = 1
},
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
-/obj/item/paper_bin{
- pixel_x = -3;
- pixel_y = 7
- },
-/obj/item/pen,
-/obj/item/aicard,
-/obj/item/multitool,
-/turf/open/floor/iron,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/command/bridge)
"aSA" = (
-/obj/effect/turf_decal/tile/green{
- dir = 1
- },
-/obj/machinery/computer/crew{
- dir = 4
- },
/obj/structure/window/reinforced/spawner/directional/west,
-/obj/effect/turf_decal/tile/green{
- dir = 8
- },
-/turf/open/floor/iron,
+/obj/structure/window/reinforced/spawner/directional/east,
+/turf/open/floor/glass/reinforced,
/area/station/command/bridge)
"aSB" = (
-/obj/effect/turf_decal/tile/blue,
+/obj/machinery/computer/shuttle/mining{
+ dir = 8
+ },
/obj/effect/turf_decal/tile/blue{
dir = 4
},
-/obj/structure/cable,
-/obj/structure/table/reinforced,
-/obj/machinery/keycard_auth{
- pixel_x = -1;
- pixel_y = 8
- },
-/turf/open/floor/iron,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/command/bridge)
"aSC" = (
-/obj/effect/turf_decal/tile/green{
- dir = 4
- },
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
-/turf/open/floor/iron,
+/obj/structure/cable,
+/obj/structure/chair/comfy/shuttle{
+ color = "#b4ff7a";
+ name = "Crew Station";
+ dir = 1
+ },
+/turf/open/floor/carpet/green,
/area/station/command/bridge)
"aSD" = (
-/obj/structure/chair{
- dir = 8;
- name = "Crew Station"
+/obj/machinery/computer/records/medical{
+ dir = 4
},
-/turf/open/floor/iron,
+/obj/effect/turf_decal/tile/dark_green{
+ dir = 1
+ },
+/turf/open/floor/iron/dark/smooth_large,
/area/station/command/bridge)
"aSE" = (
-/obj/structure/table/reinforced,
-/obj/item/storage/medkit/regular,
-/turf/open/floor/iron,
+/obj/machinery/computer/rdconsole{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/dark_green{
+ dir = 4
+ },
+/turf/open/floor/iron/dark/smooth_large,
/area/station/command/bridge)
"aSF" = (
/obj/effect/turf_decal/tile/bar,
@@ -10001,6 +11024,9 @@
/obj/structure/disposalpipe/segment{
dir = 5
},
+/obj/machinery/holopad{
+ name = "botany requests holopad"
+ },
/turf/open/floor/iron/cafeteria,
/area/station/service/kitchen)
"aSN" = (
@@ -10084,6 +11110,18 @@
/obj/machinery/light_switch/directional/north,
/turf/open/floor/wood,
/area/station/service/library)
+"aTe" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 5
+ },
+/obj/effect/turf_decal/trimline/blue/filled/line,
+/turf/open/floor/iron/edge{
+ dir = 1
+ },
+/area/station/hallway/secondary/entry)
"aTh" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -10100,9 +11138,11 @@
/turf/open/floor/iron/dark,
/area/station/hallway/secondary/exit)
"aTm" = (
-/obj/effect/turf_decal/tile/red,
-/obj/effect/turf_decal/tile/neutral,
-/turf/open/floor/iron/dark,
+/obj/effect/turf_decal/delivery/blue,
+/obj/machinery/computer/records/security{
+ dir = 4
+ },
+/turf/open/floor/iron/dark/smooth_large,
/area/station/security/checkpoint/escape)
"aTn" = (
/obj/effect/turf_decal/tile/red{
@@ -10111,10 +11151,20 @@
/turf/open/floor/iron/dark,
/area/station/hallway/secondary/exit)
"aTo" = (
+/obj/effect/turf_decal/siding/wideplating_new/light,
+/obj/effect/turf_decal/siding/wideplating_new/light{
+ dir = 1
+ },
+/obj/structure/railing,
+/obj/effect/turf_decal/siding/dark,
+/obj/effect/turf_decal/siding/dark{
+ dir = 1
+ },
/obj/effect/turf_decal/stripes/corner{
dir = 1
},
-/turf/open/floor/iron,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
+/turf/open/floor/iron/dark/herringbone,
/area/station/cargo/storage)
"aTr" = (
/obj/machinery/light/directional/south,
@@ -10139,9 +11189,15 @@
/turf/open/floor/plating,
/area/station/maintenance/port)
"aTw" = (
+/obj/effect/landmark/start/hangover/closet,
/obj/structure/closet/wardrobe/green,
/obj/machinery/light/directional/west,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/turf/open/floor/iron/dark/side{
+ dir = 8
+ },
/area/station/commons/locker)
"aTx" = (
/obj/structure/chair/stool{
@@ -10172,7 +11228,10 @@
},
/obj/machinery/light/directional/east,
/obj/machinery/airalarm/directional/east,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/tile/neutral,
+/turf/open/floor/iron/dark/side{
+ dir = 4
+ },
/area/station/commons/locker)
"aTF" = (
/obj/structure/table,
@@ -10182,6 +11241,7 @@
/area/station/commons/storage/art)
"aTH" = (
/obj/machinery/portable_atmospherics/canister/air,
+/obj/machinery/light/small/directional/south,
/turf/open/floor/plating,
/area/station/commons/storage/emergency/port)
"aTI" = (
@@ -10190,8 +11250,6 @@
/turf/open/floor/plating,
/area/station/commons/storage/emergency/port)
"aTJ" = (
-/obj/structure/reagent_dispensers/watertank,
-/obj/machinery/light/small/directional/south,
/turf/open/floor/plating,
/area/station/commons/storage/emergency/port)
"aTK" = (
@@ -10251,60 +11309,91 @@
/area/station/command/bridge)
"aTU" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron,
+/obj/structure/cable,
+/obj/effect/turf_decal/siding/dark{
+ dir = 9
+ },
+/obj/effect/turf_decal/siding/dark/corner,
+/turf/open/floor/iron/dark/side{
+ dir = 5
+ },
/area/station/command/bridge)
"aTV" = (
/obj/structure/table/reinforced,
-/obj/machinery/recharger,
-/obj/item/assembly/flash/handheld{
- pixel_x = 9;
- pixel_y = 4
+/obj/machinery/recharger{
+ pixel_x = -6;
+ pixel_y = 2
},
/obj/item/assembly/flash/handheld{
- pixel_x = 9
+ pixel_x = 5;
+ pixel_y = 8
},
-/turf/open/floor/iron,
+/obj/item/assembly/flash/handheld{
+ pixel_x = 5;
+ pixel_y = 2
+ },
+/turf/open/floor/iron/dark/smooth_large,
/area/station/command/bridge)
"aTW" = (
/obj/structure/cable,
-/turf/open/floor/iron,
-/area/station/command/bridge)
-"aTX" = (
-/turf/open/floor/iron,
-/area/station/command/bridge)
-"aTY" = (
-/obj/effect/turf_decal/tile/blue{
- dir = 1
+/obj/effect/turf_decal/siding/dark{
+ dir = 10
},
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
-/turf/open/floor/iron,
-/area/station/command/bridge)
-"aTZ" = (
-/obj/effect/turf_decal/tile/blue{
+/obj/effect/turf_decal/siding/dark/corner{
dir = 4
},
-/obj/structure/cable,
-/obj/effect/turf_decal/tile/blue,
-/turf/open/floor/iron,
+/turf/open/floor/iron/dark/corner{
+ dir = 4
+ },
+/area/station/command/bridge)
+"aTX" = (
+/obj/effect/turf_decal/siding/dark/corner,
+/obj/effect/turf_decal/siding/dark/corner{
+ dir = 1
+ },
+/turf/open/floor/iron/dark/corner{
+ dir = 1
+ },
+/area/station/command/bridge)
+"aTY" = (
+/obj/effect/turf_decal/siding/dark{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 8
+ },
+/turf/open/floor/wood,
+/area/station/command/meeting_room)
+"aTZ" = (
+/obj/effect/turf_decal/siding/dark{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/dark/corner{
+ dir = 8
+ },
+/turf/open/floor/iron/dark/corner{
+ dir = 8
+ },
/area/station/command/bridge)
"aUa" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/iron,
-/area/station/command/bridge)
-"aUb" = (
-/obj/machinery/modular_computer/preset/engineering,
-/obj/effect/turf_decal/tile/brown{
- dir = 1
+/obj/structure/cable,
+/obj/effect/turf_decal/siding/dark{
+ dir = 5
},
-/obj/effect/turf_decal/tile/brown{
+/obj/effect/turf_decal/siding/dark/corner{
dir = 8
},
-/obj/effect/turf_decal/tile/brown{
- dir = 4
+/turf/open/floor/iron/dark/side{
+ dir = 9
},
-/turf/open/floor/iron,
+/area/station/command/bridge)
+"aUb" = (
+/obj/machinery/computer/cargo/request,
+/obj/effect/turf_decal/tile/brown/half{
+ dir = 1
+ },
+/turf/open/floor/iron/dark/smooth_large,
/area/station/command/bridge)
"aUc" = (
/obj/structure/table/reinforced,
@@ -10324,29 +11413,26 @@
pixel_x = 30;
pixel_y = 32
},
-/turf/open/floor/iron,
+/obj/item/screwdriver{
+ pixel_x = 0;
+ pixel_y = 10
+ },
+/turf/open/floor/iron/dark/smooth_large,
/area/station/command/bridge)
"aUd" = (
/obj/machinery/computer/security/mining,
-/obj/effect/turf_decal/tile/brown,
-/obj/effect/turf_decal/tile/brown{
- dir = 4
- },
-/obj/effect/turf_decal/tile/brown{
+/obj/effect/turf_decal/tile/brown/half{
dir = 1
},
-/turf/open/floor/iron,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/command/bridge)
"aUe" = (
-/obj/machinery/computer/cargo/request,
/obj/machinery/incident_display/bridge/directional/north,
-/obj/effect/turf_decal/tile/brown{
- dir = 4
- },
-/obj/effect/turf_decal/tile/brown{
+/obj/machinery/modular_computer/preset/engineering,
+/obj/effect/turf_decal/tile/brown/half{
dir = 1
},
-/turf/open/floor/iron,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/command/bridge)
"aUf" = (
/obj/machinery/computer/records/security,
@@ -10377,10 +11463,17 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 4
},
-/obj/effect/turf_decal/tile/yellow{
- dir = 8
+/obj/effect/turf_decal/trimline/yellow/filled/line{
+ dir = 1;
+ alpha = 120
+ },
+/obj/effect/turf_decal/trimline/blue/line{
+ alpha = 200;
+ dir = 1
+ },
+/turf/open/floor/iron/white/smooth_edge{
+ dir = 1
},
-/turf/open/floor/iron/white,
/area/station/medical/chemistry)
"aUo" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -10406,7 +11499,17 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 10
},
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/trimline/yellow/filled/line{
+ dir = 1;
+ alpha = 120
+ },
+/obj/effect/turf_decal/trimline/blue/line{
+ alpha = 200;
+ dir = 1
+ },
+/turf/open/floor/iron/white/smooth_edge{
+ dir = 1
+ },
/area/station/medical/chemistry)
"aUt" = (
/obj/structure/cable,
@@ -10422,15 +11525,32 @@
/turf/open/floor/iron/white,
/area/station/medical/chemistry)
"aUv" = (
-/obj/effect/turf_decal/trimline/blue/filled/line{
+/obj/structure/disposalpipe/segment,
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/turf_decal/trimline/blue/filled/warning{
+ alpha = 160;
dir = 8
},
-/obj/structure/disposalpipe/segment,
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+/obj/effect/turf_decal/trimline/blue/filled/warning{
+ alpha = 160;
dir = 4
},
-/turf/open/floor/iron/white,
-/area/station/medical/medbay/aft)
+/obj/effect/turf_decal/trimline/dark_blue/warning{
+ alpha = 200;
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/dark_blue/warning{
+ alpha = 200;
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/turf/open/floor/iron/white/textured_half{
+ dir = 1
+ },
+/area/station/medical/medbay/central)
"aUx" = (
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plating,
@@ -10469,44 +11589,36 @@
/turf/open/floor/wood,
/area/station/service/library)
"aUK" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+/obj/structure/window/reinforced/spawner/directional/south,
+/obj/machinery/recharge_station,
+/turf/open/floor/iron/dark/smooth_large,
+/area/station/medical/medbay/central)
+"aUM" = (
+/obj/effect/turf_decal/trimline/blue/filled/line{
dir = 4
},
-/obj/structure/window/reinforced/spawner/directional/south,
-/obj/effect/turf_decal/trimline/brown/filled/end,
-/obj/machinery/recharge_station,
-/turf/open/floor/iron,
-/area/station/medical/medbay/aft)
-"aUM" = (
-/obj/machinery/camera/directional/east{
- c_tag = "Arrivals Bay 2"
- },
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+/obj/machinery/light/directional/east,
+/obj/machinery/status_display/shuttle/directional/east,
+/turf/open/floor/iron/edge{
dir = 8
},
-/obj/machinery/light/directional/east,
-/turf/open/floor/iron,
/area/station/hallway/secondary/entry)
"aUN" = (
-/obj/effect/turf_decal/stripes/line,
-/obj/structure/chair/sofa/bench/right{
- dir = 1
- },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/turf_decal/trimline/green/filled/line,
/turf/open/floor/iron,
-/area/station/hallway/secondary/entry)
+/area/station/service/hydroponics/garden)
"aUP" = (
-/obj/machinery/light/directional/north,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 6
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 10
},
-/obj/effect/landmark/generic_maintenance_landmark,
+/obj/machinery/light/directional/north,
/obj/machinery/computer/security/telescreen/vault/directional/north,
-/turf/open/floor/iron/dark,
+/turf/open/floor/iron/dark/textured_large,
/area/station/ai_monitored/command/nuke_storage)
"aUQ" = (
/obj/effect/turf_decal/tile/purple/opposingcorners{
@@ -10540,7 +11652,12 @@
department = "Locker Room";
pixel_x = -32
},
-/turf/open/floor/iron,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/turf/open/floor/iron/dark/side{
+ dir = 8
+ },
/area/station/commons/locker)
"aUV" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
@@ -10559,19 +11676,23 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/turf/open/floor/iron,
-/area/station/cargo/miningdock)
-"aVb" = (
-/obj/structure/sign/warning/electric_shock/directional/north,
-/obj/machinery/door/firedoor,
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
+/obj/effect/turf_decal/trimline/brown/filled/corner{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/brown/filled/corner,
+/obj/effect/turf_decal/trimline/dark/corner{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/dark/corner,
+/turf/open/floor/iron/textured_edge{
+ dir = 8
+ },
+/area/station/cargo/miningdock)
+"aVb" = (
+/obj/structure/disposalpipe/segment,
+/turf/open/floor/iron/corner{
dir = 4
},
-/turf/open/floor/iron,
/area/station/hallway/primary/central)
"aVc" = (
/obj/structure/sign/warning/secure_area/directional/east,
@@ -10581,26 +11702,34 @@
name = "Bridge Blast Boor"
},
/obj/effect/turf_decal/delivery,
-/turf/open/floor/iron,
+/turf/open/floor/iron/large,
/area/station/command/bridge)
"aVd" = (
-/obj/effect/spawner/structure/window/reinforced,
/obj/structure/cable,
+/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/station/command/bridge)
"aVg" = (
-/obj/structure/chair{
- dir = 1;
- name = "Security Station"
- },
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 6
},
-/turf/open/floor/iron,
+/obj/structure/chair/comfy/shuttle{
+ color = "#ff8063";
+ name = "Security Station";
+ dir = 1
+ },
+/turf/open/floor/carpet/red,
/area/station/command/bridge)
+"aVh" = (
+/obj/effect/turf_decal/trimline/dark_green/warning{
+ dir = 1
+ },
+/turf/open/floor/iron/edge{
+ dir = 1
+ },
+/area/station/hallway/primary/starboard)
"aVk" = (
-/obj/machinery/holopad,
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 10
@@ -10608,14 +11737,22 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 6
},
-/turf/open/floor/iron,
+/obj/machinery/holopad{
+ pixel_x = 1
+ },
+/turf/open/floor/iron/dark/smooth_large,
/area/station/command/bridge)
"aVl" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 8
},
-/turf/open/floor/iron,
+/obj/effect/turf_decal/siding/dark{
+ dir = 8
+ },
+/turf/open/floor/iron/dark/side{
+ dir = 8
+ },
/area/station/command/bridge)
"aVm" = (
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
@@ -10631,39 +11768,59 @@
"aVo" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/siding/dark/corner{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 8
+ },
+/turf/open/floor/iron/dark/side{
+ dir = 8
+ },
/area/station/command/bridge)
"aVp" = (
-/obj/item/beacon,
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 4
},
-/turf/open/floor/iron,
+/obj/item/beacon,
+/obj/effect/turf_decal/trimline/dark_blue{
+ alpha = 200
+ },
+/obj/structure/marker_beacon/indigo{
+ pixel_x = 1
+ },
+/turf/open/floor/iron/dark/smooth_large,
/area/station/command/bridge)
"aVq" = (
-/obj/effect/turf_decal/tile/brown{
- dir = 1
- },
/obj/structure/cable,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/siding/dark{
+ dir = 5
+ },
+/turf/open/floor/iron/dark/side{
+ dir = 4
+ },
/area/station/command/bridge)
"aVr" = (
/obj/machinery/camera/directional/east{
c_tag = "Bridge East"
},
-/obj/effect/turf_decal/tile/brown{
- dir = 4
+/obj/effect/turf_decal/siding/dark{
+ dir = 1;
+ icon_state = "siding_plain_end"
+ },
+/turf/open/floor/iron/dark/side{
+ dir = 8
},
-/turf/open/floor/iron,
/area/station/command/bridge)
"aVs" = (
-/obj/structure/chair{
- dir = 1;
- name = "Logistics Station"
- },
/obj/structure/cable,
-/turf/open/floor/iron,
+/obj/structure/chair/comfy/shuttle{
+ color = "#ffa052";
+ name = "Logistics Station";
+ dir = 1
+ },
+/turf/open/floor/carpet,
/area/station/command/bridge)
"aVt" = (
/obj/structure/sign/warning/secure_area/directional/west,
@@ -10673,33 +11830,22 @@
name = "Bridge Blast Door"
},
/obj/effect/turf_decal/delivery,
-/turf/open/floor/iron,
+/turf/open/floor/iron/large,
/area/station/command/bridge)
"aVu" = (
/obj/structure/sign/warning/electric_shock/directional/north,
/obj/machinery/door/firedoor,
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
-/turf/open/floor/iron,
+/turf/open/floor/iron/large,
/area/station/hallway/primary/central)
"aVv" = (
/obj/machinery/camera/directional/north{
c_tag = "Bridge East Entrance"
},
-/obj/effect/turf_decal/tile/blue{
- dir = 1
+/obj/effect/turf_decal/trimline/blue/warning{
+ dir = 9;
+ alpha = 200
},
-/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
-/turf/open/floor/iron,
+/turf/open/floor/iron/corner,
/area/station/hallway/primary/central)
"aVw" = (
/obj/item/cigarette/cigar,
@@ -10746,6 +11892,9 @@
/area/station/service/kitchen)
"aVI" = (
/obj/effect/landmark/start/botanist,
+/obj/effect/turf_decal/siding/dark/corner{
+ dir = 1
+ },
/turf/open/floor/iron/dark,
/area/station/service/hydroponics)
"aVL" = (
@@ -10763,6 +11912,9 @@
/area/station/service/library)
"aVO" = (
/obj/effect/turf_decal/siding/wood,
+/obj/structure/railing/corner/end{
+ dir = 4
+ },
/turf/open/floor/wood,
/area/station/service/library)
"aVP" = (
@@ -10771,8 +11923,8 @@
/turf/open/floor/wood,
/area/station/service/library)
"aVQ" = (
-/obj/structure/table/wood,
/obj/structure/disposalpipe/segment,
+/obj/structure/table/wood,
/obj/item/paper_bin{
pixel_x = -2;
pixel_y = 4
@@ -10832,20 +11984,29 @@
/area/station/service/library)
"aVZ" = (
/obj/structure/window/reinforced/spawner/directional/south,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
-/turf/open/floor/iron/dark/side,
+/obj/effect/turf_decal/trimline/dark_blue/filled/line{
+ dir = 6
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 6
+ },
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+ dir = 8
+ },
+/turf/open/floor/iron/dark/small,
/area/station/security/checkpoint/escape)
"aWa" = (
-/obj/docking_port/stationary{
- dir = 8;
- dwidth = 1;
- height = 13;
- shuttle_id = "arrivals_stationary";
- name = "arrivals";
- width = 5
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 5
},
-/turf/open/space/basic,
-/area/space)
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/blue/filled/line,
+/turf/open/floor/iron/edge{
+ dir = 1
+ },
+/area/station/hallway/secondary/entry)
"aWb" = (
/obj/structure/bookcase/random/adult,
/obj/structure/sign/painting/library{
@@ -10869,9 +12030,8 @@
/turf/open/floor/iron,
/area/station/engineering/storage/tech)
"aWh" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
- dir = 4
- },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/dark,
/area/station/hallway/secondary/exit)
"aWi" = (
@@ -10882,9 +12042,7 @@
/turf/open/floor/iron,
/area/station/engineering/storage/tech)
"aWj" = (
-/obj/structure/window/spawner/directional/west,
-/obj/structure/window/spawner/directional/south,
-/obj/effect/spawner/random/burgerstation/blocking,
+/obj/machinery/atmospherics/components/tank/air/layer4,
/turf/open/floor/plating,
/area/station/maintenance/port)
"aWk" = (
@@ -10894,8 +12052,7 @@
/turf/open/floor/iron/dark,
/area/station/security/processing)
"aWl" = (
-/obj/structure/grille,
-/obj/structure/window/spawner/directional/north,
+/obj/machinery/atmospherics/pipe/layer_manifold/cyan/hidden,
/turf/open/floor/plating,
/area/station/maintenance/port)
"aWm" = (
@@ -10920,7 +12077,13 @@
"aWn" = (
/obj/structure/closet/wardrobe/black,
/obj/item/clothing/shoes/jackboots,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/effect/landmark/start/hangover/closet,
+/turf/open/floor/iron/dark/side{
+ dir = 10
+ },
/area/station/commons/locker)
"aWp" = (
/obj/machinery/door/poddoor/shutters{
@@ -10955,8 +12118,9 @@
/turf/open/floor/iron/white,
/area/station/service/barber)
"aWt" = (
-/obj/structure/table/wood,
/obj/effect/spawner/random/food_or_drink/snack,
+/obj/structure/table/wood/fancy/purple,
+/obj/structure/marker_beacon/purple,
/turf/open/floor/wood/parquet,
/area/station/science/breakroom)
"aWu" = (
@@ -11005,6 +12169,8 @@
name = "Containment Cell";
req_access = list("xenobiology")
},
+/obj/structure/fans/tiny,
+/obj/structure/cable,
/turf/open/floor/engine,
/area/station/science/xenobiology)
"aWD" = (
@@ -11023,7 +12189,9 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/turf/open/floor/iron,
+/turf/open/floor/iron/edge{
+ dir = 1
+ },
/area/station/hallway/primary/central)
"aWF" = (
/obj/structure/chair,
@@ -11035,27 +12203,36 @@
/obj/machinery/camera/directional/south{
c_tag = "Brig West"
},
+/obj/effect/turf_decal/trimline/dark/line,
/turf/open/floor/iron/dark,
/area/station/security/brig)
"aWH" = (
-/obj/machinery/door/firedoor,
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
+/obj/structure/disposalpipe/segment,
+/obj/effect/turf_decal/trimline/yellow/arrow_cw{
dir = 4
},
-/turf/open/floor/iron,
-/area/station/hallway/primary/central)
+/obj/effect/turf_decal/trimline/yellow/mid_joiner{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 4
+ },
+/turf/open/floor/iron/edge{
+ dir = 4
+ },
+/area/station/hallway/primary/aft)
"aWI" = (
+/obj/structure/cable,
/obj/machinery/door/firedoor,
/obj/machinery/door/poddoor/preopen{
id = "bridge blast";
name = "Bridge Blast Door"
},
/obj/effect/turf_decal/delivery,
-/obj/structure/cable,
-/turf/open/floor/iron,
+/turf/open/floor/iron/large,
/area/station/command/bridge)
"aWJ" = (
+/obj/structure/cable,
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 4
},
@@ -11064,8 +12241,7 @@
},
/obj/effect/landmark/navigate_destination,
/obj/effect/mapping_helpers/airlock/access/any/command/general,
-/obj/structure/cable,
-/turf/open/floor/iron,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/command/bridge)
"aWK" = (
/obj/docking_port/stationary/mining_home{
@@ -11074,6 +12250,7 @@
/turf/open/space/basic,
/area/space)
"aWL" = (
+/obj/structure/cable,
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 8
},
@@ -11081,65 +12258,82 @@
name = "Bridge"
},
/obj/effect/mapping_helpers/airlock/access/any/command/general,
-/obj/structure/cable,
-/turf/open/floor/iron,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/command/bridge)
"aWM" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 4
},
-/turf/open/floor/iron,
+/obj/effect/turf_decal/siding/dark/corner{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/dark/corner{
+ dir = 8
+ },
+/turf/open/floor/iron/dark/corner{
+ dir = 4
+ },
/area/station/command/bridge)
"aWN" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/siding/dark{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/dark/corner{
+ dir = 8
+ },
+/turf/open/floor/iron/dark/side{
+ dir = 1
+ },
/area/station/command/bridge)
"aWO" = (
-/obj/structure/extinguisher_cabinet{
- pixel_x = 5;
- pixel_y = -32
- },
/obj/machinery/light_switch{
pixel_x = -6;
pixel_y = -22
},
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
/obj/machinery/light/directional/south,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/siding/dark,
+/obj/effect/turf_decal/siding/dark/corner{
+ dir = 4
+ },
+/turf/open/floor/iron/dark/corner{
+ dir = 4
+ },
/area/station/command/bridge)
"aWP" = (
-/obj/effect/turf_decal/tile/blue,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/siding/dark,
+/turf/open/floor/iron/edge,
/area/station/command/bridge)
"aWQ" = (
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
/obj/machinery/airalarm/directional/south,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/siding/dark,
+/obj/effect/turf_decal/siding/dark/corner{
+ dir = 1
+ },
+/turf/open/floor/iron/dark/corner{
+ dir = 1
+ },
/area/station/command/bridge)
"aWR" = (
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
/obj/structure/fireaxecabinet/directional/south,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/siding/dark,
+/obj/effect/turf_decal/siding/dark{
+ dir = 1
+ },
+/turf/open/floor/iron/dark/side{
+ dir = 1
+ },
/area/station/command/bridge)
"aWS" = (
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/siding/dark{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/dark,
+/turf/open/floor/iron/dark/textured,
/area/station/command/bridge)
"aWT" = (
/obj/machinery/requests_console{
@@ -11150,18 +12344,22 @@
/obj/effect/mapping_helpers/requests_console/announcement,
/obj/effect/mapping_helpers/requests_console/information,
/obj/effect/mapping_helpers/requests_console/assistance,
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
- dir = 8
+/obj/effect/turf_decal/siding/dark,
+/obj/effect/turf_decal/siding/dark/corner{
+ dir = 4
+ },
+/turf/open/floor/iron/dark/corner{
+ dir = 4
},
-/turf/open/floor/iron,
/area/station/command/bridge)
"aWU" = (
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
- dir = 8
+/obj/effect/turf_decal/siding/dark,
+/obj/effect/turf_decal/siding/dark/corner{
+ dir = 4
+ },
+/turf/open/floor/iron/dark/corner{
+ dir = 4
},
-/turf/open/floor/iron,
/area/station/command/bridge)
"aWV" = (
/obj/machinery/turretid{
@@ -11172,28 +12370,30 @@
/obj/machinery/camera/directional/south{
c_tag = "Bridge Center"
},
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
- dir = 8
+/obj/effect/turf_decal/siding/dark,
+/obj/effect/turf_decal/siding/dark/corner{
+ dir = 1
+ },
+/turf/open/floor/iron/dark/corner{
+ dir = 1
},
-/turf/open/floor/iron,
/area/station/command/bridge)
"aWX" = (
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
/obj/machinery/newscaster/directional/south,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/siding/dark,
+/obj/effect/turf_decal/siding/dark{
+ dir = 1
+ },
+/turf/open/floor/iron/dark/side{
+ dir = 1
+ },
/area/station/command/bridge)
"aWY" = (
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 5
},
-/turf/open/floor/iron,
+/obj/effect/turf_decal/siding/dark,
+/turf/open/floor/iron/edge,
/area/station/command/bridge)
"aWZ" = (
/obj/structure/disposalpipe/segment{
@@ -11206,7 +12406,15 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 4
},
-/turf/open/floor/iron,
+/obj/effect/turf_decal/siding/dark{
+ dir = 6
+ },
+/obj/effect/turf_decal/siding/dark/corner{
+ dir = 1
+ },
+/turf/open/floor/iron/dark/corner{
+ dir = 1
+ },
/area/station/command/bridge)
"aXa" = (
/obj/structure/disposalpipe/segment{
@@ -11219,34 +12427,34 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 1
},
-/turf/open/floor/iron,
+/obj/effect/turf_decal/siding/dark{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/dark/corner,
+/turf/open/floor/iron/dark/side{
+ dir = 1
+ },
/area/station/command/bridge)
"aXb" = (
-/obj/machinery/door/firedoor,
/obj/structure/disposalpipe/segment{
dir = 4
},
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/obj/machinery/door/firedoor,
/obj/machinery/door/poddoor/preopen{
id = "bridge blast";
name = "Bridge Blast Door"
},
/obj/effect/turf_decal/delivery,
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
- dir = 4
- },
-/turf/open/floor/iron,
+/turf/open/floor/iron/large,
/area/station/command/bridge)
"aXc" = (
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
- dir = 4
- },
-/obj/machinery/door/airlock/command/glass{
- name = "Bridge"
- },
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 8
@@ -11254,23 +12462,22 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 4
},
-/obj/effect/mapping_helpers/airlock/access/any/command/general,
/obj/structure/disposalpipe/segment{
dir = 4
},
-/turf/open/floor/iron,
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+ dir = 4
+ },
+/obj/machinery/door/airlock/command/glass{
+ name = "Bridge"
+ },
+/obj/effect/mapping_helpers/airlock/access/any/command/general,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/command/bridge)
"aXd" = (
-/obj/machinery/door/firedoor,
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 8
@@ -11278,33 +12485,35 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 4
},
-/turf/open/floor/iron,
+/obj/machinery/door/firedoor,
+/turf/open/floor/iron/large,
/area/station/hallway/primary/central)
"aXe" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/obj/structure/cable,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 8
},
/obj/machinery/door/airlock/command/glass{
name = "Bridge"
},
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
- dir = 4
- },
/obj/effect/mapping_helpers/airlock/access/any/command/general,
-/obj/structure/cable,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/iron,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/command/bridge)
"aXf" = (
/obj/structure/disposalpipe/segment{
dir = 4
},
-/turf/open/floor/iron,
+/obj/effect/turf_decal/siding/dark/corner,
+/turf/open/floor/iron/edge,
/area/station/hallway/primary/central)
"aXh" = (
/obj/structure/disposalpipe/segment{
@@ -11373,12 +12582,21 @@
/turf/open/floor/iron/cafeteria,
/area/station/service/kitchen)
"aXo" = (
+/obj/effect/landmark/event_spawn,
+/obj/effect/turf_decal/siding/dark{
+ dir = 6
+ },
/turf/open/floor/iron/dark,
/area/station/service/hydroponics)
"aXr" = (
/obj/structure/disposalpipe/segment{
dir = 4
},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/obj/structure/cable,
/turf/open/floor/iron,
/area/station/commons/locker)
"aXs" = (
@@ -11386,7 +12604,10 @@
/obj/structure/disposalpipe/trunk{
dir = 4
},
-/turf/open/floor/iron,
+/obj/effect/turf_decal/tile/neutral/opposingcorners,
+/turf/open/floor/iron/dark/side{
+ dir = 10
+ },
/area/station/commons/locker)
"aXu" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
@@ -11400,16 +12621,22 @@
dir = 9
},
/obj/machinery/vending/modularpc,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/turf/open/floor/iron/dark/side,
/area/station/commons/locker)
"aXw" = (
/obj/effect/turf_decal/stripes/line,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/turf/open/floor/iron/dark/side,
/area/station/commons/locker)
"aXz" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron/white,
+/turf/open/floor/iron/white/smooth_large,
/area/station/medical/medbay/aft)
"aXA" = (
/obj/effect/turf_decal/tile/bar,
@@ -11427,7 +12654,7 @@
dir = 1
},
/obj/machinery/requests_console/directional/south,
-/turf/open/floor/carpet,
+/turf/open/floor/carpet/black,
/area/station/science/breakroom)
"aXC" = (
/obj/machinery/computer/security/telescreen/entertainment/directional/north,
@@ -11451,14 +12678,12 @@
/obj/structure/chair/sofa/bench/left{
pixel_y = 8
},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/dark/side{
dir = 1
},
/area/station/hallway/secondary/exit)
"aXH" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
- dir = 1
- },
/obj/effect/turf_decal/trimline/dark_blue/filled/line,
/obj/structure/cable,
/turf/open/floor/iron/dark,
@@ -11470,8 +12695,8 @@
/turf/open/floor/iron,
/area/station/science/ordnance/storage)
"aXM" = (
-/obj/effect/spawner/structure/window/reinforced,
/obj/structure/cable,
+/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/door/poddoor/preopen{
id = "cmoprivacy";
name = "CMO Office"
@@ -11489,8 +12714,7 @@
/turf/open/floor/stone,
/area/station/service/bar)
"aXP" = (
-/obj/structure/closet/crate,
-/obj/effect/spawner/random/maintenance/three,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer4,
/turf/open/floor/plating,
/area/station/maintenance/port)
"aXQ" = (
@@ -11564,9 +12788,12 @@
/turf/open/floor/iron/freezer,
/area/station/commons/toilet/locker)
"aYg" = (
-/obj/effect/landmark/generic_maintenance_landmark,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/effect/spawner/random/burgerstation/odd,
/turf/open/floor/plating,
-/area/station/construction)
+/area/station/maintenance/port/aft)
"aYi" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 4
@@ -11583,37 +12810,41 @@
/turf/open/floor/plating/airless,
/area/space/nearstation)
"aYk" = (
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
/obj/machinery/light/directional/south,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/blue/arrow_cw{
+ alpha = 200
+ },
+/obj/effect/turf_decal/trimline/blue/mid_joiner{
+ alpha = 200
+ },
+/turf/open/floor/iron/edge,
/area/station/hallway/primary/central)
"aYl" = (
-/obj/effect/turf_decal/tile/blue,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/blue/arrow_ccw{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/blue/mid_joiner{
+ dir = 4
+ },
+/turf/open/floor/iron/edge{
+ dir = 4
+ },
/area/station/hallway/primary/central)
"aYm" = (
/obj/machinery/door/firedoor,
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
-/turf/open/floor/iron,
+/turf/open/floor/iron/large,
/area/station/hallway/primary/central)
"aYn" = (
/obj/machinery/camera/directional/south{
c_tag = "Bridge West Entrance"
},
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
- dir = 8
+/obj/effect/turf_decal/trimline/blue/warning{
+ dir = 6;
+ alpha = 200
+ },
+/turf/open/floor/iron/corner{
+ dir = 1
},
-/turf/open/floor/iron,
/area/station/hallway/primary/central)
"aYo" = (
/obj/machinery/door/firedoor,
@@ -11622,71 +12853,63 @@
name = "Bridge Blast Door"
},
/obj/effect/turf_decal/delivery,
-/turf/open/floor/iron,
+/turf/open/floor/iron/large,
/area/station/command/bridge)
"aYp" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
/obj/effect/turf_decal/trimline/dark_blue/filled/line{
dir = 1
},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer4,
/turf/open/floor/iron/dark,
/area/station/security/processing)
"aYq" = (
/obj/structure/closet/emcloset,
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
-/turf/open/floor/iron,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/command/bridge)
"aYr" = (
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
/obj/item/radio/intercom/directional/south,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/siding/dark{
+ dir = 6
+ },
+/turf/open/floor/iron/corner{
+ dir = 1
+ },
/area/station/command/bridge)
"aYs" = (
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron,
-/area/station/command/bridge)
-"aYt" = (
-/obj/machinery/suit_storage_unit/standard_unit,
-/obj/effect/turf_decal/stripes/line{
- dir = 9
+/obj/effect/turf_decal/siding/dark{
+ dir = 10
},
-/turf/open/floor/iron,
-/area/station/ai_monitored/command/storage/eva)
-"aYu" = (
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
+/turf/open/floor/iron/corner{
dir = 4
},
-/obj/effect/turf_decal/tile/blue{
+/area/station/command/bridge)
+"aYt" = (
+/obj/effect/turf_decal/trimline/dark/filled/line{
dir = 8
},
+/turf/open/floor/iron/dark/small,
+/area/station/medical/morgue)
+"aYu" = (
/obj/machinery/firealarm/directional/south,
/obj/structure/table/reinforced,
-/obj/item/storage/fancy/donut_box,
-/turf/open/floor/iron,
+/obj/item/storage/fancy/donut_box{
+ pixel_y = 5
+ },
+/turf/open/floor/iron/dark/smooth_large,
/area/station/command/bridge)
"aYw" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/cable,
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/highsecurity{
name = "AI Upload Access"
},
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/effect/mapping_helpers/airlock/access/any/command/ai_upload,
-/obj/structure/cable,
/obj/effect/landmark/navigate_destination,
-/turf/open/floor/iron/dark,
+/turf/open/floor/iron/dark/textured_large,
/area/station/ai_monitored/turret_protected/ai_upload)
"aYx" = (
/obj/effect/turf_decal/bot,
@@ -11719,54 +12942,46 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/white,
/area/station/science/research)
-"aYB" = (
-/obj/effect/turf_decal/stripes/corner{
- dir = 4
- },
-/turf/open/floor/iron/white/side{
- dir = 9
- },
-/area/station/science/research)
"aYC" = (
-/obj/structure/filingcabinet/filingcabinet,
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
/obj/machinery/firealarm/directional/south,
-/turf/open/floor/iron,
+/obj/structure/table/reinforced,
+/obj/item/storage/medkit/regular{
+ pixel_x = 0;
+ pixel_y = 5
+ },
+/obj/item/reagent_containers/hypospray/medipen/deforest/lipital{
+ list_reagents = list(/datum/reagent/medicine/lidocaine = 5, /datum/reagent/drug/twitch = 10);
+ name = "confiscated stimulant injector";
+ pixel_x = 0;
+ pixel_y = -3
+ },
+/turf/open/floor/iron/dark/smooth_large,
/area/station/command/bridge)
"aYD" = (
/obj/structure/disposalpipe/segment,
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/iron,
-/area/station/command/bridge)
-"aYE" = (
-/obj/machinery/door/firedoor,
-/obj/effect/turf_decal/tile/blue{
+/obj/effect/turf_decal/siding/dark{
+ dir = 6
+ },
+/turf/open/floor/iron/corner{
dir = 1
},
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
-/turf/open/floor/iron,
-/area/station/hallway/primary/central)
+/area/station/command/bridge)
"aYG" = (
/obj/structure/disposalpipe/segment,
-/obj/effect/turf_decal/tile/blue{
+/obj/effect/turf_decal/trimline/blue/arrow_cw{
+ dir = 8;
+ alpha = 200
+ },
+/obj/effect/turf_decal/trimline/blue/mid_joiner{
+ alpha = 200;
+ dir = 8
+ },
+/turf/open/floor/iron/edge{
dir = 8
},
-/turf/open/floor/iron,
/area/station/hallway/primary/central)
"aYH" = (
/obj/structure/table,
@@ -11779,10 +12994,11 @@
dir = 8
},
/turf/open/floor/iron/cafeteria,
-/area/station/commons/locker)
+/area/station/commons/dorms/laundry)
"aYJ" = (
/obj/machinery/light_switch{
- pixel_y = -25
+ pixel_y = -27;
+ pixel_x = 6
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 4
@@ -11791,6 +13007,13 @@
dir = 4
},
/obj/machinery/light/directional/south,
+/obj/machinery/button/door{
+ id = "kitchen";
+ name = "Kitchen Shutters Control";
+ pixel_y = -27;
+ req_access = list("kitchen");
+ pixel_x = -6
+ },
/turf/open/floor/iron/cafeteria,
/area/station/service/kitchen)
"aYK" = (
@@ -11830,16 +13053,20 @@
/turf/open/floor/iron/cafeteria,
/area/station/service/kitchen)
"aYN" = (
-/obj/effect/turf_decal/stripes/line,
-/obj/item/wrench,
-/obj/structure/cable,
-/turf/open/floor/iron,
-/area/station/science/xenobiology)
-"aYO" = (
-/obj/machinery/holopad{
- name = "botany requests holopad"
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 6
},
-/turf/open/floor/iron,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/turf/open/floor/iron/dark,
+/area/station/maintenance/port/aft)
+"aYO" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 1
+ },
+/turf/open/floor/wood,
/area/station/hallway/primary/starboard)
"aYP" = (
/obj/machinery/hydroponics/constructable,
@@ -11852,6 +13079,7 @@
"aYR" = (
/obj/structure/chair/office/light,
/obj/effect/landmark/start/botanist,
+/obj/effect/turf_decal/siding/dark,
/turf/open/floor/iron/dark,
/area/station/service/hydroponics)
"aYS" = (
@@ -11866,20 +13094,24 @@
dir = 8
},
/turf/open/floor/iron/cafeteria,
-/area/station/commons/locker)
+/area/station/commons/dorms/laundry)
"aYT" = (
/obj/machinery/camera/directional/east{
c_tag = "Hydroponics South"
},
-/obj/structure/reagent_dispensers/watertank/high,
-/obj/item/reagent_containers/cup/bucket,
-/turf/open/floor/iron/dark/textured_large,
+/obj/effect/turf_decal/siding/dark/end{
+ dir = 4
+ },
+/turf/open/floor/iron/dark,
/area/station/service/hydroponics)
"aYU" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 10
},
-/turf/open/floor/iron,
+/obj/effect/turf_decal/tile/neutral,
+/turf/open/floor/iron/dark/side{
+ dir = 4
+ },
/area/station/commons/locker)
"aYV" = (
/turf/open/floor/iron,
@@ -11913,30 +13145,29 @@
/turf/open/floor/wood,
/area/station/security/detectives_office)
"aZb" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/camera/directional/south{
c_tag = "Bar South";
network = list("ss13","bar")
},
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/effect/turf_decal/siding/wood/corner{
dir = 1
},
/turf/open/floor/stone,
/area/station/service/bar)
"aZd" = (
-/obj/machinery/firealarm/directional/south,
/obj/structure/table/wood,
/obj/machinery/computer/libraryconsole,
+/obj/machinery/firealarm/directional/south,
/turf/open/floor/wood,
/area/station/service/library)
"aZi" = (
-/obj/effect/turf_decal/stripes/line,
/obj/structure/table/reinforced,
/obj/machinery/button/ignition{
id = "changelingmoment"
},
-/turf/open/floor/iron,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/science/xenobiology)
"aZj" = (
/obj/effect/turf_decal/tile/red{
@@ -11975,16 +13206,28 @@
name = "Security Shutters";
pixel_y = 24
},
-/turf/open/floor/wood,
+/obj/effect/turf_decal/siding/dark{
+ dir = 9
+ },
+/obj/effect/turf_decal/siding/dark/corner,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+ dir = 4
+ },
+/turf/open/floor/wood/large,
/area/station/command/meeting_room)
"aZr" = (
/obj/machinery/light/small/directional/west,
-/obj/effect/spawner/random/trash/mess,
-/obj/effect/spawner/random/trash/moisture_trap,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer4,
/turf/open/floor/plating,
/area/station/maintenance/port)
"aZs" = (
/obj/effect/mapping_helpers/burnt_floor,
+/obj/item/trash/cheesie,
+/obj/machinery/portable_atmospherics/canister/air,
+/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer4{
+ dir = 8
+ },
+/obj/structure/window/spawner/directional/east,
/turf/open/floor/plating,
/area/station/maintenance/port)
"aZt" = (
@@ -12003,7 +13246,7 @@
/area/station/commons/toilet/locker)
"aZu" = (
/obj/machinery/photocopier/prebuilt,
-/turf/open/floor/wood,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/command/meeting_room)
"aZv" = (
/obj/machinery/door/airlock{
@@ -12019,17 +13262,36 @@
/obj/effect/turf_decal/tile/blue{
dir = 8
},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/obj/structure/cable,
/turf/open/floor/iron/cafeteria,
-/area/station/commons/locker)
+/area/station/commons/dorms/laundry)
"aZy" = (
/obj/machinery/camera/directional/north{
c_tag = "Conference Room"
},
+/obj/effect/turf_decal/siding/dark,
+/obj/effect/turf_decal/siding/dark{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
/turf/open/floor/wood,
/area/station/command/meeting_room)
"aZz" = (
/obj/machinery/newscaster/directional/north,
-/turf/open/floor/wood,
+/obj/effect/turf_decal/siding/dark,
+/obj/effect/turf_decal/siding/dark{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/turf/open/floor/wood/tile,
/area/station/command/meeting_room)
"aZA" = (
/obj/machinery/portable_atmospherics/scrubber,
@@ -12046,7 +13308,14 @@
pixel_y = 28
},
/obj/machinery/light/directional/north,
-/turf/open/floor/wood,
+/obj/effect/turf_decal/siding/dark,
+/obj/effect/turf_decal/siding/dark{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/turf/open/floor/wood/tile,
/area/station/command/meeting_room)
"aZE" = (
/turf/closed/wall,
@@ -12064,14 +13333,17 @@
/turf/open/floor/iron,
/area/station/engineering/atmos)
"aZG" = (
-/obj/machinery/light_switch{
- pixel_y = 28
- },
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 4
},
-/turf/open/floor/wood,
+/obj/machinery/light_switch{
+ pixel_y = 28
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 5
+ },
+/turf/open/floor/wood/parquet,
/area/station/command/heads_quarters/captain)
"aZH" = (
/obj/machinery/conveyor{
@@ -12086,6 +13358,9 @@
/obj/effect/turf_decal/trimline/dark_blue/filled/line{
dir = 6
},
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+ dir = 1
+ },
/turf/open/floor/iron/dark,
/area/station/security/processing)
"aZK" = (
@@ -12104,6 +13379,7 @@
dir = 5
},
/obj/machinery/light/directional/east,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
/turf/open/floor/iron/dark,
/area/station/security/processing)
"aZM" = (
@@ -12131,22 +13407,29 @@
/turf/closed/wall,
/area/station/command/meeting_room)
"aZQ" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/cable,
/obj/machinery/door/airlock/command{
name = "Conference Room"
},
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/effect/mapping_helpers/airlock/access/any/command/general,
-/obj/structure/cable,
-/turf/open/floor/wood,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/command/meeting_room)
"aZR" = (
-/turf/open/floor/circuit,
+/obj/effect/turf_decal/siding/dark{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/dark/corner{
+ dir = 4
+ },
+/turf/open/floor/circuit/red,
/area/station/ai_monitored/turret_protected/ai_upload)
"aZS" = (
/obj/machinery/porta_turret/ai{
dir = 4
},
-/turf/open/floor/iron/dark,
+/obj/effect/turf_decal/tile/dark_green/full,
+/turf/open/floor/iron/dark/textured_large,
/area/station/ai_monitored/turret_protected/ai_upload)
"aZT" = (
/obj/structure/cable,
@@ -12159,44 +13442,45 @@
/obj/machinery/porta_turret/ai{
dir = 8
},
-/turf/open/floor/iron/dark,
+/obj/effect/turf_decal/tile/dark_red/full,
+/turf/open/floor/iron/dark/textured_large,
/area/station/ai_monitored/turret_protected/ai_upload)
"aZV" = (
/turf/closed/wall/r_wall,
/area/station/command/heads_quarters/captain)
"aZX" = (
-/obj/machinery/door/airlock/command{
- name = "Captain's Office"
- },
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/effect/mapping_helpers/airlock/access/any/command/captain,
/obj/structure/disposalpipe/segment,
-/turf/open/floor/wood,
+/obj/machinery/door/airlock/command{
+ name = "Captain's Office"
+ },
+/obj/effect/mapping_helpers/airlock/access/any/command/captain,
+/turf/open/floor/iron/dark/textured_large,
/area/station/command/heads_quarters/captain)
"aZY" = (
-/obj/machinery/door/firedoor,
/obj/structure/disposalpipe/segment,
-/obj/effect/turf_decal/tile/blue{
- dir = 8
+/obj/machinery/door/firedoor,
+/obj/effect/turf_decal/trimline/blue/warning{
+ dir = 8;
+ alpha = 200
},
-/obj/machinery/firealarm/directional/west,
-/turf/open/floor/iron,
+/turf/open/floor/iron/large,
/area/station/hallway/primary/central)
"aZZ" = (
+/obj/effect/landmark/start/hangover,
/obj/structure/chair/sofa/middle/brown{
dir = 1
},
-/obj/effect/landmark/start/hangover,
/obj/machinery/firealarm/directional/south,
/turf/open/floor/wood,
/area/station/service/bar)
"baa" = (
+/obj/effect/landmark/start/hangover,
/obj/structure/chair/sofa/left/brown{
dir = 1
},
-/obj/effect/landmark/start/hangover,
/obj/machinery/computer/security/telescreen/entertainment/directional/west,
/turf/open/floor/wood,
/area/station/service/bar)
@@ -12210,10 +13494,10 @@
/turf/open/floor/stone,
/area/station/service/bar)
"bac" = (
+/obj/effect/landmark/start/hangover,
/obj/structure/chair/sofa/right/brown{
dir = 1
},
-/obj/effect/landmark/start/hangover,
/obj/machinery/newscaster/directional/south,
/obj/machinery/light/directional/south,
/turf/open/floor/wood,
@@ -12232,7 +13516,11 @@
/turf/open/floor/stone,
/area/station/service/bar)
"bae" = (
-/obj/effect/spawner/structure/window,
+/obj/structure/hedge,
+/obj/structure/window/reinforced/spawner/directional/west,
+/obj/structure/window/reinforced/spawner/directional/north,
+/obj/structure/window/reinforced/spawner/directional/east,
+/obj/structure/window/reinforced/spawner/directional/south,
/turf/open/floor/plating,
/area/station/service/barber)
"baf" = (
@@ -12244,7 +13532,10 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 8
},
-/turf/open/floor/wood,
+/obj/effect/turf_decal/siding/dark{
+ dir = 9
+ },
+/turf/open/floor/wood/large,
/area/station/command/heads_quarters/captain)
"bag" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
@@ -12280,9 +13571,6 @@
dir = 4
},
/obj/machinery/light/small/directional/south,
-/obj/structure/extinguisher_cabinet{
- pixel_y = -30
- },
/obj/machinery/computer/slot_machine,
/turf/open/floor/wood/parquet,
/area/station/service/bar)
@@ -12314,6 +13602,9 @@
/obj/item/kirbyplants/random,
/obj/machinery/firealarm/directional/west,
/obj/structure/sink/directional/east,
+/obj/effect/turf_decal/siding/dark/end{
+ dir = 8
+ },
/turf/open/floor/iron/dark/textured_large,
/area/station/service/hydroponics)
"bam" = (
@@ -12322,11 +13613,11 @@
/area/station/service/hydroponics)
"bao" = (
/obj/structure/cable,
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
- dir = 8
- },
/obj/machinery/computer/security/telescreen/entertainment/directional/north,
-/turf/open/floor/carpet/blue,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/turf/open/floor/carpet/black,
/area/station/command/heads_quarters/captain)
"baq" = (
/obj/structure/cable,
@@ -12334,7 +13625,7 @@
dir = 4
},
/obj/machinery/status_display/ai/directional/north,
-/turf/open/floor/carpet/blue,
+/turf/open/floor/carpet/black,
/area/station/command/heads_quarters/captain)
"bar" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -12362,9 +13653,6 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 4
},
-/obj/structure/sign/painting/library{
- pixel_x = -32
- },
/turf/open/floor/wood,
/area/station/service/library)
"bax" = (
@@ -12376,18 +13664,23 @@
/turf/open/floor/wood,
/area/station/service/library)
"bay" = (
-/obj/structure/chair/comfy/black,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
- dir = 4
+/obj/structure/chair/comfy/brown{
+ buildstackamount = 0;
+ color = "#991e18"
},
-/turf/open/floor/carpet,
+/turf/open/floor/carpet/black,
/area/station/command/meeting_room)
"baC" = (
-/obj/structure/closet/emcloset,
-/obj/machinery/camera/directional/east{
- c_tag = "Arrivals Escape Pod 1"
+/obj/machinery/light/small/directional/west,
+/obj/effect/turf_decal/trimline/blue/filled/line{
+ dir = 8
+ },
+/obj/item/radio/intercom/directional/west,
+/obj/effect/landmark/start/assistant,
+/obj/structure/chair/greyscale,
+/turf/open/floor/iron/edge{
+ dir = 4
},
-/turf/open/floor/plating,
/area/station/hallway/secondary/entry)
"baE" = (
/obj/structure/cable,
@@ -12396,11 +13689,15 @@
/turf/open/floor/iron/dark,
/area/station/hallway/secondary/exit)
"baF" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 9
+/obj/effect/turf_decal/siding/wood/corner{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/blue/filled/corner{
+ dir = 4
+ },
+/turf/open/floor/iron/textured_corner{
+ dir = 4
},
-/obj/structure/closet/firecloset,
-/turf/open/floor/iron,
/area/station/hallway/secondary/entry)
"baH" = (
/obj/effect/turf_decal/trimline/green/filled/corner{
@@ -12410,11 +13707,14 @@
/turf/open/floor/iron/white,
/area/station/medical/virology)
"baI" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+/obj/effect/turf_decal/siding/dark{
dir = 4
},
-/turf/open/floor/carpet,
-/area/station/command/meeting_room)
+/obj/effect/turf_decal/siding/dark/corner{
+ dir = 1
+ },
+/turf/open/floor/circuit/green,
+/area/station/ai_monitored/turret_protected/ai_upload)
"baJ" = (
/obj/structure/rack/wooden,
/obj/item/dyespray{
@@ -12444,11 +13744,14 @@
/turf/open/floor/wood,
/area/station/service/barber)
"baK" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
- dir = 4
+/obj/effect/turf_decal/siding/dark{
+ dir = 1
},
-/turf/open/floor/carpet,
-/area/station/command/meeting_room)
+/obj/effect/turf_decal/siding/dark,
+/turf/open/floor/iron/dark/side{
+ dir = 10
+ },
+/area/station/command/bridge)
"baL" = (
/obj/structure/closet/crate,
/obj/structure/sign/poster/random/directional/north,
@@ -12461,24 +13764,42 @@
/turf/open/floor/plating,
/area/station/maintenance/starboard/fore)
"baP" = (
-/obj/structure/table/wood,
-/obj/item/storage/fancy/donut_box,
-/turf/open/floor/carpet/blue,
+/obj/structure/table/wood/fancy,
+/obj/item/reagent_containers/cup/glass/bottle/wine/unlabeled{
+ desc = "Made using the finest martian synth-grapes by Moldeanic Vine Co.";
+ name = "Moldeanic Wine Bottle";
+ pixel_x = 3;
+ pixel_y = 12
+ },
+/obj/item/reagent_containers/cup/glass{
+ pixel_x = -7;
+ pixel_y = 7
+ },
+/obj/item/reagent_containers/cup/glass{
+ pixel_x = -7;
+ pixel_y = -1
+ },
+/turf/open/floor/carpet/black,
/area/station/command/heads_quarters/captain)
"baQ" = (
/obj/structure/chair/comfy/brown{
+ buildstackamount = 0;
+ color = "#c45c57";
dir = 4
},
-/turf/open/floor/carpet/blue,
+/turf/open/floor/carpet/black,
/area/station/command/heads_quarters/captain)
"baR" = (
-/obj/effect/turf_decal/trimline/green/filled/line,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
dir = 10
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 8
},
+/obj/effect/turf_decal/trimline/green/filled/corner{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/green/filled/corner,
/turf/open/floor/iron/white,
/area/station/medical/virology)
"baU" = (
@@ -12492,16 +13813,18 @@
/area/station/command/heads_quarters/nt_rep)
"baW" = (
/obj/structure/window/reinforced/spawner/directional/east,
-/obj/effect/turf_decal/stripes/line{
- dir = 6
- },
/obj/structure/table/reinforced,
/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible,
-/turf/open/floor/iron,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/science/xenobiology)
"baZ" = (
/obj/machinery/status_display/evac/directional/north,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/dark_green/corner{
+ dir = 1
+ },
+/turf/open/floor/iron/edge{
+ dir = 1
+ },
/area/station/hallway/primary/starboard)
"bba" = (
/obj/machinery/door/airlock/maintenance_hatch{
@@ -12516,9 +13839,10 @@
/turf/open/floor/plating,
/area/station/ai_monitored/turret_protected/aisat/hallway)
"bbb" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
- dir = 4
+/obj/effect/turf_decal/trimline/blue/filled/line{
+ dir = 8
},
+/obj/effect/landmark/start/hangover,
/turf/open/floor/iron,
/area/station/hallway/secondary/entry)
"bbc" = (
@@ -12528,11 +13852,17 @@
/turf/open/floor/wood,
/area/station/security/detectives_office)
"bbh" = (
-/obj/machinery/disposal/bin,
/obj/structure/disposalpipe/trunk{
dir = 8
},
-/turf/open/floor/wood,
+/obj/machinery/disposal/bin,
+/obj/effect/turf_decal/bot_white{
+ color = "#ff780a"
+ },
+/obj/effect/turf_decal/box/white{
+ color = "#ff780a"
+ },
+/turf/open/floor/iron/dark/smooth_large,
/area/station/command/meeting_room)
"bbi" = (
/obj/structure/disposalpipe/segment{
@@ -12540,11 +13870,25 @@
},
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/wood,
+/obj/effect/turf_decal/siding/dark{
+ dir = 5
+ },
+/obj/effect/turf_decal/siding/dark/corner{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/turf/open/floor/wood/large,
/area/station/command/meeting_room)
"bbj" = (
/obj/machinery/light/directional/west,
-/turf/open/floor/iron/dark,
+/obj/effect/turf_decal/tile/dark_green/half{
+ dir = 8
+ },
+/turf/open/floor/iron/dark/smooth_half{
+ dir = 1
+ },
/area/station/ai_monitored/turret_protected/ai_upload)
"bbk" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible{
@@ -12559,30 +13903,43 @@
/turf/open/floor/iron,
/area/station/engineering/atmos)
"bbl" = (
-/obj/machinery/bluespace_vendor/directional/north,
/obj/effect/turf_decal/tile/neutral{
dir = 4
},
+/obj/machinery/bluespace_vendor/directional/north,
/turf/open/floor/iron/dark/side{
dir = 1
},
/area/station/hallway/primary/central/fore)
"bbm" = (
-/turf/open/floor/iron/dark,
+/obj/effect/turf_decal/tile/dark_green{
+ dir = 8
+ },
+/turf/open/floor/iron/dark/smooth_corner{
+ dir = 8
+ },
/area/station/ai_monitored/turret_protected/ai_upload)
"bbn" = (
/obj/machinery/light/directional/east,
-/turf/open/floor/iron/dark,
+/obj/effect/turf_decal/tile/dark_red/half{
+ dir = 4
+ },
+/turf/open/floor/iron/dark/smooth_half{
+ dir = 1
+ },
/area/station/ai_monitored/turret_protected/ai_upload)
"bbo" = (
-/obj/machinery/disposal/bin,
/obj/structure/disposalpipe/trunk{
dir = 4
},
-/obj/effect/turf_decal/siding/wood{
- dir = 4
+/obj/machinery/disposal/bin,
+/obj/effect/turf_decal/bot_white{
+ color = "#ff780a"
},
-/turf/open/floor/iron/dark,
+/obj/effect/turf_decal/box/white{
+ color = "#ff780a"
+ },
+/turf/open/floor/iron/dark/textured_large,
/area/station/command/heads_quarters/captain)
"bbp" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible{
@@ -12610,22 +13967,39 @@
},
/obj/machinery/light/directional/south,
/obj/structure/reagent_dispensers/fueltank,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/turf/open/floor/iron/dark/side{
+ dir = 10
+ },
/area/station/commons/locker)
"bbv" = (
/obj/structure/cable,
/obj/machinery/status_display/evac/directional/north,
-/turf/open/floor/carpet/blue,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/turf/open/floor/carpet/black,
/area/station/command/heads_quarters/captain)
"bbw" = (
-/turf/open/floor/wood,
+/obj/effect/turf_decal/siding/dark/corner{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/dark/corner{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 4
+ },
+/turf/open/floor/wood/parquet,
/area/station/command/heads_quarters/captain)
"bbx" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/multi_tile/public/glass{
name = "Atrium"
},
-/turf/open/floor/iron,
+/turf/open/floor/iron/large,
/area/station/service/bar)
"bby" = (
/obj/machinery/barsign,
@@ -12650,10 +14024,12 @@
/turf/open/floor/iron,
/area/station/service/hydroponics)
"bbC" = (
-/obj/structure/chair/comfy/black{
+/obj/structure/chair/comfy/brown{
+ buildstackamount = 0;
+ color = "#991e18";
dir = 8
},
-/turf/open/floor/carpet,
+/turf/open/floor/carpet/black,
/area/station/command/meeting_room)
"bbD" = (
/obj/effect/spawner/structure/window/reinforced,
@@ -12661,12 +14037,8 @@
/area/station/service/library)
"bbE" = (
/obj/structure/table,
-/obj/effect/turf_decal/tile/green,
-/obj/effect/turf_decal/tile/green{
- dir = 8
- },
-/obj/effect/turf_decal/tile/green{
- dir = 1
+/obj/effect/turf_decal/trimline/green/filled/line{
+ dir = 10
},
/obj/machinery/firealarm/directional/south,
/turf/open/floor/iron,
@@ -12681,8 +14053,8 @@
/turf/open/floor/iron/dark,
/area/station/hallway/secondary/exit)
"bbH" = (
-/obj/machinery/computer/prisoner/gulag_teleporter_computer,
/obj/structure/cable,
+/obj/machinery/atmospherics/components/tank/air/layer4,
/turf/open/floor/iron/dark,
/area/station/security/processing)
"bbJ" = (
@@ -12703,8 +14075,8 @@
/area/station/commons/toilet/locker)
"bbM" = (
/obj/item/book/manual/wiki/security_space_law,
-/obj/structure/table/wood,
-/turf/open/floor/carpet,
+/obj/structure/table/wood/fancy,
+/turf/open/floor/carpet/black,
/area/station/command/meeting_room)
"bbN" = (
/obj/machinery/washing_machine,
@@ -12716,7 +14088,7 @@
},
/obj/machinery/light/directional/south,
/turf/open/floor/iron/cafeteria,
-/area/station/commons/locker)
+/area/station/commons/dorms/laundry)
"bbO" = (
/obj/machinery/washing_machine,
/obj/effect/turf_decal/tile/blue{
@@ -12726,16 +14098,20 @@
dir = 8
},
/turf/open/floor/iron/cafeteria,
-/area/station/commons/locker)
+/area/station/commons/dorms/laundry)
"bbQ" = (
-/obj/effect/turf_decal/delivery/white,
/obj/structure/chair{
dir = 8
},
-/turf/open/floor/iron/dark,
+/obj/effect/turf_decal/delivery/white{
+ color = "#00ff00";
+ name = "green"
+ },
+/turf/open/floor/iron/dark/smooth_large,
/area/station/hallway/primary/central)
"bbR" = (
-/turf/open/floor/iron,
+/obj/machinery/light/floor,
+/turf/open/floor/iron/large,
/area/station/cargo/office)
"bbU" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
@@ -12755,13 +14131,13 @@
/turf/open/floor/plating,
/area/station/command/heads_quarters/nt_rep)
"bbV" = (
-/obj/structure/extinguisher_cabinet{
- pixel_x = -5;
- pixel_y = 30
- },
/obj/effect/turf_decal/siding/thinplating/dark/corner{
dir = 8
},
+/obj/effect/turf_decal/trimline/green/filled/corner{
+ dir = 4
+ },
+/obj/structure/extinguisher_cabinet/directional/north,
/turf/open/floor/iron,
/area/station/service/hydroponics/garden)
"bbW" = (
@@ -12773,24 +14149,32 @@
/turf/open/floor/plating,
/area/station/command/meeting_room)
"bbX" = (
-/turf/open/floor/wood,
+/obj/effect/turf_decal/siding/dark,
+/obj/effect/turf_decal/siding/dark{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/turf/open/floor/wood/tile,
/area/station/command/meeting_room)
"bbY" = (
/obj/machinery/recharger{
pixel_y = 4
},
-/obj/structure/table,
-/turf/open/floor/wood,
+/obj/structure/table/glass,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/command/meeting_room)
"bbZ" = (
-/obj/structure/table/wood,
-/turf/open/floor/carpet/blue,
+/obj/structure/table/wood/fancy,
+/obj/effect/spawner/random/food_or_drink/three_course_meal{
+ pixel_x = 0;
+ pixel_y = 4
+ },
+/turf/open/floor/carpet/black,
/area/station/command/heads_quarters/captain)
"bca" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
- dir = 8
- },
-/turf/open/floor/carpet,
+/turf/open/floor/carpet/black,
/area/station/command/meeting_room)
"bcb" = (
/obj/structure/disposalpipe/segment{
@@ -12806,22 +14190,32 @@
/area/station/hallway/primary/starboard)
"bcc" = (
/obj/effect/spawner/random/vending/snackvend,
-/turf/open/floor/wood,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/command/meeting_room)
"bcd" = (
/obj/structure/disposalpipe/segment,
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/wood,
+/obj/effect/turf_decal/siding/dark{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 8
+ },
+/turf/open/floor/wood/large,
/area/station/command/meeting_room)
"bce" = (
/turf/open/floor/iron/dark,
/area/station/security/execution/education)
"bcf" = (
/obj/structure/cable,
-/obj/machinery/holopad/secure,
-/turf/open/floor/iron/dark,
+/obj/machinery/holopad/secure{
+ pixel_x = 1
+ },
+/obj/effect/turf_decal/bot_white,
+/obj/effect/turf_decal/box/white,
+/turf/open/floor/iron/dark/textured_large,
/area/station/ai_monitored/turret_protected/ai_upload)
"bcg" = (
/obj/structure/cable,
@@ -12836,10 +14230,7 @@
/area/station/commons/fitness/recreation/entertainment)
"bch" = (
/obj/machinery/vending/cigarette,
-/obj/effect/turf_decal/siding/wood{
- dir = 4
- },
-/turf/open/floor/iron/dark,
+/turf/open/floor/iron/dark/textured_large,
/area/station/command/heads_quarters/captain)
"bci" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -12878,26 +14269,36 @@
/turf/closed/wall,
/area/station/maintenance/disposal)
"bcm" = (
+/obj/structure/cable,
/obj/structure/chair/comfy/brown{
+ buildstackamount = 0;
+ color = "#c45c57";
dir = 8
},
-/obj/structure/cable,
-/turf/open/floor/carpet/blue,
+/turf/open/floor/carpet/black,
/area/station/command/heads_quarters/captain)
"bcn" = (
-/obj/effect/turf_decal/siding/wood{
- dir = 8
- },
/obj/item/storage/photo_album{
pixel_y = -3
},
-/obj/structure/table/wood,
/obj/item/camera{
pixel_y = 4
},
-/turf/open/floor/iron/dark,
+/obj/structure/table/wood/fancy/red,
+/obj/structure/noticeboard/captain{
+ pixel_y = 4;
+ pixel_x = 32
+ },
+/turf/open/floor/iron/dark/textured_large,
/area/station/command/heads_quarters/captain)
+"bco" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron/edge,
+/area/station/hallway/primary/central)
"bcp" = (
+/obj/effect/landmark/start/hangover,
/obj/structure/sign/directions/security{
dir = 1;
pixel_x = 32;
@@ -12908,22 +14309,51 @@
pixel_x = 32;
pixel_y = 28
},
-/obj/effect/landmark/start/hangover,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/brown/corner{
+ dir = 4
+ },
+/turf/open/floor/iron/edge{
+ dir = 4
+ },
/area/station/hallway/primary/central)
"bcq" = (
+/obj/effect/turf_decal/siding/wood/corner{
+ dir = 1
+ },
/obj/machinery/door/firedoor,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/neutral/corner{
+ dir = 1;
+ alpha = 100
+ },
+/obj/structure/sign/departments/botany/alt1/directional/north,
+/turf/open/floor/iron/large,
/area/station/hallway/primary/starboard)
"bcr" = (
/obj/machinery/camera/directional/north{
c_tag = "Starboard Primary Hallway"
},
-/turf/open/floor/iron,
+/obj/structure/extinguisher_cabinet/directional/north,
+/obj/effect/turf_decal/trimline/brown/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/brown/mid_joiner{
+ dir = 1
+ },
+/turf/open/floor/iron/edge{
+ dir = 1
+ },
/area/station/hallway/primary/starboard)
"bcs" = (
/obj/machinery/firealarm/directional/north,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/dark_green/corner{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/green/corner{
+ dir = 1
+ },
+/turf/open/floor/iron/edge{
+ dir = 1
+ },
/area/station/hallway/primary/starboard)
"bct" = (
/obj/effect/landmark/generic_maintenance_landmark,
@@ -12931,35 +14361,46 @@
/area/station/commons/toilet/locker)
"bcv" = (
/obj/structure/extinguisher_cabinet/directional/north,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/green/corner{
+ dir = 4
+ },
+/turf/open/floor/iron/edge{
+ dir = 1
+ },
/area/station/hallway/primary/starboard)
"bcw" = (
/obj/structure/table,
-/obj/effect/turf_decal/tile/green,
-/obj/effect/turf_decal/tile/green{
- dir = 8
- },
-/obj/effect/turf_decal/tile/green{
- dir = 4
- },
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
dir = 1
},
/obj/item/clipboard,
/obj/item/pen,
+/obj/effect/turf_decal/trimline/green/filled/line{
+ dir = 6
+ },
/turf/open/floor/iron,
/area/station/medical/virology)
"bcx" = (
/obj/machinery/camera/directional/north{
c_tag = "Starboard Primary Hallway 5"
},
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/dark_green/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/dark_green/mid_joiner{
+ dir = 1
+ },
+/turf/open/floor/iron/edge{
+ dir = 1
+ },
/area/station/hallway/primary/starboard)
"bcy" = (
-/obj/effect/turf_decal/tile/red{
- dir = 4
+/obj/effect/turf_decal/trimline/dark_green/corner{
+ dir = 1
+ },
+/turf/open/floor/iron/textured_corner{
+ dir = 8
},
-/turf/open/floor/iron,
/area/station/hallway/primary/starboard)
"bcz" = (
/obj/machinery/holopad,
@@ -13049,18 +14490,21 @@
/turf/open/floor/iron,
/area/station/maintenance/starboard/fore)
"bcN" = (
-/obj/item/folder/blue,
-/obj/structure/table/wood,
-/turf/open/floor/carpet,
+/obj/item/folder/blue{
+ pixel_x = 0;
+ pixel_y = 4
+ },
+/obj/structure/table/wood/fancy,
+/turf/open/floor/carpet/black,
/area/station/command/meeting_room)
"bcP" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 1
+ },
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 10
},
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
- dir = 8
- },
-/turf/open/floor/carpet/blue,
+/turf/open/floor/carpet/black,
/area/station/command/heads_quarters/captain)
"bcQ" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
@@ -13069,7 +14513,7 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 4
},
-/turf/open/floor/carpet/blue,
+/turf/open/floor/carpet/black,
/area/station/command/heads_quarters/captain)
"bcR" = (
/obj/machinery/door/airlock/maintenance,
@@ -13102,29 +14546,32 @@
"bcY" = (
/obj/item/hand_labeler,
/obj/item/assembly/timer,
-/obj/structure/table,
-/turf/open/floor/wood,
+/obj/structure/table/glass,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/command/meeting_room)
"bcZ" = (
-/obj/structure/table/wood,
+/obj/structure/table/wood/fancy,
/obj/item/radio/intercom/command,
-/obj/item/paper/fluff/jobs/engineering/frequencies,
-/turf/open/floor/carpet,
+/turf/open/floor/carpet/black,
/area/station/command/meeting_room)
"bda" = (
-/obj/structure/chair/comfy/black{
+/obj/structure/chair/comfy/brown{
+ buildstackamount = 0;
+ color = "#991e18";
dir = 4
},
-/turf/open/floor/carpet,
+/turf/open/floor/carpet/black,
/area/station/command/meeting_room)
"bdc" = (
/obj/effect/landmark/start/hangover,
/obj/machinery/light/directional/south,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/blue/arrow_cw,
+/obj/effect/turf_decal/trimline/blue/mid_joiner,
+/turf/open/floor/iron/edge,
/area/station/hallway/primary/starboard)
"bdd" = (
/obj/effect/spawner/random/vending/colavend,
-/turf/open/floor/wood,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/command/meeting_room)
"bde" = (
/obj/structure/disposalpipe/segment,
@@ -13133,24 +14580,36 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 10
},
-/turf/open/floor/wood,
+/obj/effect/turf_decal/siding/dark{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 8
+ },
+/turf/open/floor/wood/parquet,
/area/station/command/meeting_room)
"bdf" = (
/obj/machinery/airalarm/directional/west,
-/turf/open/floor/iron/dark,
+/obj/effect/turf_decal/tile/dark_green/anticorner{
+ dir = 8
+ },
+/turf/open/floor/iron/dark/smooth_corner{
+ dir = 4
+ },
/area/station/ai_monitored/turret_protected/ai_upload)
"bdg" = (
/obj/structure/cable,
+/obj/effect/turf_decal/siding/dark{
+ dir = 1;
+ icon_state = "siding_plain_end"
+ },
/turf/open/floor/circuit,
/area/station/ai_monitored/turret_protected/ai_upload)
"bdi" = (
/obj/effect/spawner/random/entertainment/arcade{
dir = 4
},
-/obj/effect/turf_decal/siding/wood{
- dir = 4
- },
-/turf/open/floor/iron/dark,
+/turf/open/floor/iron/dark/textured_large,
/area/station/command/heads_quarters/captain)
"bdj" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
@@ -13163,12 +14622,12 @@
req_access = list("captain");
name = "Captain's Desk Door"
},
-/turf/open/floor/wood,
+/turf/open/floor/iron/dark/textured_large,
/area/station/command/heads_quarters/captain)
"bdl" = (
/obj/structure/disposalpipe/segment,
/obj/structure/cable,
-/turf/open/floor/iron,
+/turf/open/floor/iron/edge,
/area/station/hallway/primary/starboard)
"bdm" = (
/obj/structure/disposalpipe/segment,
@@ -13179,41 +14638,43 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 10
},
-/obj/structure/trash_pile,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer5,
/turf/open/floor/plating,
/area/station/maintenance/aft)
"bdn" = (
+/obj/structure/disposalpipe/segment,
/obj/machinery/camera/directional/west{
c_tag = "Central Hallway East"
},
-/obj/structure/disposalpipe/segment,
-/obj/effect/turf_decal/tile/blue{
+/obj/machinery/status_display/evac/directional/west,
+/obj/effect/turf_decal/trimline/blue/line{
+ alpha = 200;
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/blue/mid_joiner{
+ alpha = 200;
+ dir = 8
+ },
+/turf/open/floor/iron/textured_half{
dir = 8
},
-/obj/machinery/status_display/evac/directional/west,
-/turf/open/floor/iron,
/area/station/hallway/primary/central)
"bdo" = (
-/obj/effect/turf_decal/tile/yellow{
- dir = 8
- },
-/obj/effect/turf_decal/tile/yellow{
- dir = 1
- },
-/obj/effect/turf_decal/tile/yellow{
- dir = 4
- },
-/turf/open/floor/iron/dark,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/hallway/primary/aft)
"bdp" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron,
+/turf/open/floor/iron/edge{
+ dir = 1
+ },
/area/station/hallway/primary/starboard)
"bds" = (
/obj/machinery/camera/directional/south{
c_tag = "Starboard Primary Hallway 4"
},
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/purple/line,
+/obj/effect/turf_decal/trimline/purple/mid_joiner,
+/turf/open/floor/iron/edge,
/area/station/hallway/primary/starboard)
"bdt" = (
/obj/structure/disposalpipe/segment{
@@ -13223,6 +14684,7 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 4
},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer5,
/turf/open/floor/plating,
/area/station/maintenance/port)
"bdz" = (
@@ -13249,7 +14711,8 @@
req_access = list("xenobiology");
name = "Containment Cell"
},
-/turf/open/floor/iron,
+/obj/structure/cable,
+/turf/open/floor/engine,
/area/station/science/xenobiology)
"bdC" = (
/obj/structure/disposalpipe/sorting/mail/flip{
@@ -13261,6 +14724,7 @@
},
/obj/effect/mapping_helpers/mail_sorting/supply/disposals,
/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer5,
/turf/open/floor/plating,
/area/station/maintenance/port)
"bdD" = (
@@ -13270,13 +14734,15 @@
/obj/structure/disposalpipe/segment,
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer5,
/turf/open/floor/plating,
/area/station/maintenance/port)
"bdF" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
- dir = 8
+/obj/effect/turf_decal/siding/dark{
+ dir = 4;
+ icon_state = "siding_plain_end"
},
-/turf/open/floor/carpet,
+/turf/open/floor/wood/tile,
/area/station/command/meeting_room)
"bdH" = (
/obj/effect/decal/cleanable/dirt,
@@ -13287,8 +14753,18 @@
/turf/open/floor/iron,
/area/station/maintenance/starboard/fore)
"bdI" = (
-/turf/open/floor/carpet,
-/area/station/command/meeting_room)
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 8
+ },
+/obj/structure/marker_beacon/indigo{
+ pixel_x = 1
+ },
+/obj/effect/turf_decal/trimline/dark_blue{
+ alpha = 200
+ },
+/turf/open/floor/iron/dark/smooth_large,
+/area/station/command/bridge)
"bdJ" = (
/obj/machinery/door/airlock{
id_tag = "AuxToilet3";
@@ -13297,15 +14773,18 @@
/turf/open/floor/iron/freezer,
/area/station/commons/toilet/locker)
"bdK" = (
-/obj/machinery/holopad,
-/turf/open/floor/carpet,
-/area/station/command/meeting_room)
+/obj/effect/turf_decal/siding/dark{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 8
+ },
+/turf/open/floor/wood,
+/area/station/command/heads_quarters/captain)
"bdL" = (
-/obj/effect/turf_decal/bot,
-/obj/effect/spawner/random/maintenance,
-/obj/item/airlock_painter/decal,
-/obj/structure/closet/crate,
-/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 8
+ },
/turf/open/floor/iron,
/area/station/cargo/warehouse)
"bdM" = (
@@ -13339,37 +14818,49 @@
/area/station/engineering/break_room)
"bdR" = (
/obj/structure/cable,
+/obj/structure/disposalpipe/segment{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
/turf/open/floor/plating,
/area/station/maintenance/port)
"bdV" = (
-/obj/effect/turf_decal/tile/red{
- dir = 4
- },
-/obj/effect/turf_decal/tile/red{
- dir = 1
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/turf/open/floor/iron/dark,
+/obj/machinery/vending/wardrobe/sec_wardrobe,
+/obj/effect/turf_decal/delivery/blue,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/security/checkpoint/escape)
"bdW" = (
-/obj/machinery/modular_computer/preset/id,
-/turf/open/floor/carpet/royalblack,
+/obj/effect/turf_decal/siding/thinplating/dark{
+ dir = 5
+ },
+/turf/open/floor/grass,
/area/station/command/heads_quarters/qm)
"bdX" = (
/obj/item/storage/fancy/donut_box,
-/obj/structure/table,
-/turf/open/floor/wood,
+/obj/structure/table/glass,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/command/meeting_room)
"bdY" = (
/obj/item/paper_bin{
pixel_x = -3;
pixel_y = 7
},
-/obj/item/pen,
-/obj/structure/table/wood,
-/turf/open/floor/carpet,
+/obj/item/pen{
+ pixel_x = -3;
+ pixel_y = 8
+ },
+/obj/structure/table/wood/fancy,
+/obj/item/clipboard{
+ pixel_x = 12;
+ pixel_y = 6
+ },
+/obj/item/paper/fluff/jobs/engineering/frequencies{
+ pixel_x = 12;
+ pixel_y = 6
+ },
+/turf/open/floor/carpet/black,
/area/station/command/meeting_room)
"bea" = (
/obj/structure/disposalpipe/segment,
@@ -13384,11 +14875,15 @@
name = "Core Modules"
},
/obj/effect/spawner/random/aimodule/neutral,
-/turf/open/floor/iron/dark,
+/turf/open/floor/iron/dark/textured_large,
/area/station/ai_monitored/turret_protected/ai_upload)
"bed" = (
/obj/structure/cable,
/obj/machinery/power/apc/auto_name/directional/south,
+/obj/effect/turf_decal/siding/dark{
+ dir = 2;
+ icon_state = "siding_plain_end"
+ },
/turf/open/floor/circuit,
/area/station/ai_monitored/turret_protected/ai_upload)
"bee" = (
@@ -13399,14 +14894,14 @@
id = "AI";
pixel_y = -21
},
-/turf/open/floor/circuit,
+/turf/open/floor/iron/dark/textured_large,
/area/station/ai_monitored/turret_protected/ai_upload)
"bef" = (
/obj/machinery/computer/upload/borg{
dir = 1
},
/obj/item/radio/intercom/directional/south,
-/turf/open/floor/circuit,
+/turf/open/floor/iron/dark/textured_large,
/area/station/ai_monitored/turret_protected/ai_upload)
"beg" = (
/obj/structure/table,
@@ -13418,19 +14913,21 @@
/obj/machinery/door/window/right/directional/west{
name = "High-Risk Modules"
},
-/turf/open/floor/iron/dark,
+/turf/open/floor/iron/dark/textured_large,
/area/station/ai_monitored/turret_protected/ai_upload)
"beh" = (
/obj/machinery/light/directional/south,
-/turf/open/floor/iron/dark,
+/obj/effect/turf_decal/tile/dark_green/half{
+ dir = 8
+ },
+/turf/open/floor/iron/dark/smooth_half{
+ dir = 1
+ },
/area/station/ai_monitored/turret_protected/ai_upload)
"bei" = (
/obj/machinery/light/directional/west,
/obj/structure/filingcabinet,
-/obj/effect/turf_decal/siding/wood{
- dir = 6
- },
-/turf/open/floor/iron/dark,
+/turf/open/floor/iron/dark/textured_large,
/area/station/command/heads_quarters/captain)
"bej" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
@@ -13439,16 +14936,20 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 6
},
-/turf/open/floor/wood,
+/obj/effect/turf_decal/siding/dark/end,
+/turf/open/floor/wood/tile,
/area/station/command/heads_quarters/captain)
"bek" = (
-/obj/structure/chair,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 5
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 5
},
+/obj/structure/chair,
+/obj/effect/turf_decal/siding/dark{
+ dir = 10
+ },
/turf/open/floor/wood,
/area/station/command/heads_quarters/captain)
"bel" = (
@@ -13462,7 +14963,10 @@
/area/station/hallway/primary/aft)
"bem" = (
/obj/structure/cable,
-/turf/open/floor/carpet/blue,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 1
+ },
+/turf/open/floor/carpet/black,
/area/station/command/heads_quarters/captain)
"ben" = (
/obj/machinery/camera/directional/east{
@@ -13471,10 +14975,6 @@
/obj/item/storage/lockbox/medal{
pixel_y = 9
},
-/obj/effect/turf_decal/siding/wood{
- dir = 8
- },
-/obj/structure/table/wood,
/obj/item/pinpointer/nuke{
pixel_y = -9
},
@@ -13482,15 +14982,23 @@
pixel_y = -9
},
/obj/machinery/airalarm/directional/east,
-/turf/open/floor/iron/dark,
+/obj/structure/table/wood/fancy/red,
+/turf/open/floor/iron/dark/textured_large,
/area/station/command/heads_quarters/captain)
"bep" = (
/obj/structure/disposalpipe/segment,
-/obj/effect/turf_decal/tile/blue{
+/obj/machinery/light/directional/west,
+/obj/effect/turf_decal/trimline/blue/arrow_cw{
+ dir = 8;
+ alpha = 200
+ },
+/obj/effect/turf_decal/trimline/blue/mid_joiner{
+ alpha = 200;
+ dir = 8
+ },
+/turf/open/floor/iron/edge{
dir = 8
},
-/obj/machinery/light/directional/west,
-/turf/open/floor/iron,
/area/station/hallway/primary/central)
"beq" = (
/obj/structure/sign/directions/medical{
@@ -13507,32 +15015,35 @@
pixel_x = 32;
pixel_y = -40
},
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/blue/corner,
+/turf/open/floor/iron/edge{
+ dir = 4
+ },
/area/station/hallway/primary/central)
"ber" = (
-/obj/structure/extinguisher_cabinet{
- pixel_y = -30
- },
-/turf/open/floor/iron,
+/obj/structure/extinguisher_cabinet/directional/south,
+/obj/effect/turf_decal/trimline/blue/mid_joiner,
+/obj/effect/turf_decal/trimline/blue/arrow_ccw,
+/turf/open/floor/iron/edge,
/area/station/hallway/primary/starboard)
"bes" = (
-/obj/effect/turf_decal/tile/blue,
/obj/machinery/light/directional/south,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/blue/line,
+/obj/effect/turf_decal/trimline/blue/mid_joiner,
+/turf/open/floor/iron/edge,
/area/station/hallway/primary/starboard)
"bet" = (
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/blue/mid_joiner,
+/obj/effect/turf_decal/trimline/blue/arrow_ccw,
+/turf/open/floor/iron/edge,
/area/station/hallway/primary/starboard)
"bev" = (
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
/obj/machinery/light/directional/south,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/blue/line,
+/obj/effect/turf_decal/trimline/blue/mid_joiner,
+/turf/open/floor/iron/textured_corner{
+ dir = 1
+ },
/area/station/hallway/primary/starboard)
"bew" = (
/obj/structure/disposalpipe/segment{
@@ -13556,8 +15067,16 @@
/turf/open/floor/iron,
/area/station/commons/dorms)
"bez" = (
-/obj/structure/cable,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/siding/wood{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/neutral/warning{
+ dir = 1;
+ alpha = 100
+ },
+/turf/open/floor/iron/textured_corner{
+ dir = 8
+ },
/area/station/hallway/primary/starboard)
"beA" = (
/obj/machinery/conveyor{
@@ -13568,41 +15087,51 @@
/turf/open/floor/plating,
/area/station/cargo/sorting)
"beB" = (
+/obj/structure/cable,
+/obj/effect/landmark/start/hangover,
/obj/machinery/camera/directional/south{
c_tag = "Starboard Primary Hallway 3"
},
-/obj/structure/cable,
-/obj/effect/landmark/start/hangover,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/purple/corner{
+ dir = 8
+ },
+/turf/open/floor/iron/edge,
/area/station/hallway/primary/starboard)
"beE" = (
/obj/machinery/light/directional/south,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/purple/line,
+/obj/effect/turf_decal/trimline/purple/mid_joiner,
+/turf/open/floor/iron/edge,
/area/station/hallway/primary/starboard)
"beF" = (
-/obj/effect/turf_decal/tile/brown{
- dir = 1
+/obj/effect/turf_decal/trimline/brown/filled/line{
+ dir = 5
},
-/obj/effect/turf_decal/tile/brown{
- dir = 4
+/obj/effect/turf_decal/trimline/dark/line{
+ dir = 5
},
/turf/open/floor/iron,
/area/station/cargo/sorting)
"beI" = (
-/obj/effect/turf_decal/tile/red{
- dir = 8
- },
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/public/glass{
name = "Escape"
},
-/turf/open/floor/iron,
+/obj/machinery/firealarm/directional/south,
+/obj/effect/turf_decal/siding/dark/corner{
+ dir = 8
+ },
+/turf/open/floor/iron/large,
/area/station/hallway/secondary/exit)
"beK" = (
/obj/effect/mapping_helpers/airlock/cyclelink_helper,
/obj/machinery/door/airlock/external{
name = "Port Docking Bay 4"
},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 5
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer4,
/turf/open/floor/plating,
/area/station/hallway/secondary/entry)
"beL" = (
@@ -13610,21 +15139,16 @@
/obj/machinery/door/airlock/external{
name = "Port Docking Bay 3"
},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 5
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer4,
/turf/open/floor/plating,
/area/station/hallway/secondary/entry)
-"beM" = (
-/obj/structure/chair{
- dir = 1
- },
-/obj/effect/turf_decal/stripes/line,
-/turf/open/floor/iron,
-/area/station/hallway/secondary/entry)
"beN" = (
-/obj/structure/chair{
- dir = 1
+/obj/effect/turf_decal/trimline/blue/filled/line{
+ dir = 8
},
-/obj/effect/turf_decal/stripes/line,
-/obj/item/radio/intercom/directional/south,
/turf/open/floor/iron,
/area/station/hallway/secondary/entry)
"beO" = (
@@ -13700,24 +15224,13 @@
pixel_x = -1;
pixel_y = -1
},
-/obj/effect/turf_decal/tile/brown{
- dir = 1
- },
-/obj/effect/turf_decal/tile/brown{
- dir = 4
- },
/obj/machinery/firealarm/directional/east,
-/turf/open/floor/iron,
+/turf/open/floor/iron/dark/textured_large,
/area/station/cargo/sorting)
"beX" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
/obj/machinery/firealarm/directional/north,
-/turf/open/floor/iron/dark/corner{
- dir = 4
- },
+/turf/open/floor/iron/corner,
/area/station/hallway/primary/central)
"beY" = (
/obj/machinery/digital_clock/directional/north,
@@ -13764,6 +15277,7 @@
/obj/structure/disposalpipe/trunk{
dir = 8
},
+/obj/machinery/light/small/directional/west,
/turf/open/floor/plating,
/area/station/cargo/sorting)
"bfl" = (
@@ -13786,10 +15300,15 @@
/turf/open/floor/plating,
/area/station/cargo/sorting)
"bfo" = (
-/obj/effect/turf_decal/tile/brown{
+/obj/effect/turf_decal/trimline/brown/line{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/brown/mid_joiner{
+ dir = 8
+ },
+/turf/open/floor/iron/edge{
dir = 8
},
-/turf/open/floor/iron,
/area/station/hallway/primary/central)
"bfp" = (
/obj/machinery/requests_console{
@@ -13800,11 +15319,14 @@
/obj/effect/mapping_helpers/requests_console/announcement,
/obj/effect/mapping_helpers/requests_console/information,
/obj/effect/mapping_helpers/requests_console/assistance,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+/obj/machinery/light/directional/south,
+/obj/effect/turf_decal/siding/dark{
+ dir = 6
+ },
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
dir = 8
},
-/obj/machinery/light/directional/south,
-/turf/open/floor/wood,
+/turf/open/floor/wood/large,
/area/station/command/meeting_room)
"bfs" = (
/obj/effect/decal/cleanable/dirt,
@@ -13835,7 +15357,6 @@
/turf/open/floor/iron,
/area/station/maintenance/disposal/incinerator)
"bfy" = (
-/obj/structure/table/wood,
/obj/machinery/requests_console{
department = "Captain's Desk";
name = "Captain RC";
@@ -13848,7 +15369,8 @@
fax_name = "Captain's Office";
name = "Captain's Fax Machine"
},
-/turf/open/floor/wood,
+/obj/structure/table/wood/fancy/blue,
+/turf/open/floor/iron/dark/textured_large,
/area/station/command/heads_quarters/captain)
"bfz" = (
/obj/machinery/atmospherics/pipe/smart/simple/dark/visible,
@@ -13856,40 +15378,78 @@
/turf/open/floor/plating,
/area/station/engineering/atmos)
"bfA" = (
-/obj/structure/table/wood,
-/obj/item/paper_bin{
- pixel_x = -3;
- pixel_y = 7
+/obj/structure/table/wood/fancy/blue,
+/obj/item/folder/blue{
+ pixel_x = 2;
+ pixel_y = 3
},
-/obj/item/pen,
-/turf/open/floor/wood,
+/obj/item/toy/figure/captain{
+ pixel_x = 3;
+ pixel_y = 17
+ },
+/obj/item/sign/flag/nanotrasen{
+ pixel_x = 10;
+ pixel_y = 1
+ },
+/obj/item/paper_bin/carbon{
+ pixel_x = -12;
+ pixel_y = 5
+ },
+/obj/item/pen{
+ pixel_x = -12;
+ pixel_y = 6
+ },
+/turf/open/floor/iron/dark/textured_large,
/area/station/command/heads_quarters/captain)
"bfB" = (
-/obj/structure/table/wood,
-/obj/item/folder/blue,
-/obj/item/stamp/head/captain,
-/turf/open/floor/wood,
+/obj/structure/table/wood/fancy/blue,
+/obj/item/stamp/granted{
+ pixel_x = 8;
+ pixel_y = 9
+ },
+/obj/item/stamp/denied{
+ pixel_y = 2;
+ pixel_x = 8
+ },
+/obj/item/phone{
+ pixel_x = -2;
+ pixel_y = 7
+ },
+/obj/item/stamp/head/captain{
+ pixel_x = -2;
+ pixel_y = 2
+ },
+/turf/open/floor/iron/dark/textured_large,
/area/station/command/heads_quarters/captain)
"bfC" = (
-/obj/structure/table/wood,
-/obj/item/flashlight/lamp/green,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/wood,
+/obj/structure/table/wood/fancy/blue,
+/obj/item/flashlight/lamp/green,
+/turf/open/floor/iron/dark/textured_large,
/area/station/command/heads_quarters/captain)
"bfE" = (
/obj/structure/secure_safe/directional/east,
/obj/machinery/light/directional/east,
-/obj/effect/turf_decal/siding/wood{
- dir = 8
+/obj/structure/table/wood/fancy/red,
+/obj/item/book/manual/wiki/security_space_law{
+ pixel_x = 6;
+ pixel_y = 5
},
-/obj/structure/table/wood,
-/turf/open/floor/iron/dark,
+/obj/item/coin/plasma{
+ pixel_x = -7;
+ pixel_y = 1
+ },
+/turf/open/floor/iron/dark/textured_large,
/area/station/command/heads_quarters/captain)
"bfF" = (
/turf/closed/wall,
/area/station/medical/pharmacy)
"bfG" = (
-/obj/effect/spawner/structure/window,
+/obj/structure/hedge,
+/obj/structure/window/reinforced/spawner/directional/north,
+/obj/structure/window/reinforced/spawner/directional/south,
+/obj/structure/window/reinforced/spawner/directional/west,
+/obj/structure/window/reinforced/spawner/directional/east,
/turf/open/floor/plating,
/area/station/medical/treatment_center)
"bfH" = (
@@ -13904,6 +15464,9 @@
/turf/open/floor/grass,
/area/station/science/genetics)
"bfK" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 8
+ },
/obj/structure/chair/office/light{
dir = 8
},
@@ -13918,9 +15481,6 @@
pixel_y = 20;
req_access = list("cmo")
},
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
- dir = 8
- },
/obj/machinery/computer/security/telescreen/cmo/directional/east,
/turf/open/floor/iron/dark,
/area/station/command/heads_quarters/cmo)
@@ -13929,7 +15489,15 @@
/area/station/medical/morgue)
"bfN" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/brown/filled/line{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/dark/line{
+ dir = 8
+ },
+/turf/open/floor/iron/textured_edge{
+ dir = 4
+ },
/area/station/cargo/sorting)
"bfO" = (
/obj/machinery/fishing_portal_generator,
@@ -13948,13 +15516,19 @@
/obj/item/storage/box,
/obj/item/storage/box,
/obj/item/storage/box,
-/turf/open/floor/iron,
+/turf/open/floor/iron/dark/textured_large,
/area/station/cargo/sorting)
"bfS" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
- dir = 1
+/obj/effect/turf_decal/siding/dark{
+ dir = 4
},
-/turf/open/floor/iron/dark,
+/obj/effect/turf_decal/siding/dark{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 4
+ },
+/turf/open/floor/iron/textured_large,
/area/station/ai_monitored/command/storage/eva)
"bfT" = (
/turf/closed/wall,
@@ -13963,43 +15537,29 @@
/obj/effect/turf_decal/loading_area{
dir = 1
},
-/turf/open/floor/iron,
+/turf/open/floor/iron/edge,
/area/station/hallway/primary/starboard)
"bfV" = (
/turf/closed/wall/r_wall,
/area/station/science/robotics/lab)
"bfW" = (
-/obj/effect/turf_decal/tile/purple{
- dir = 1
- },
-/obj/effect/turf_decal/tile/purple,
-/obj/effect/turf_decal/tile/purple{
- dir = 8
- },
/obj/structure/table/reinforced,
/obj/item/paper_bin{
pixel_x = -3;
pixel_y = 7
},
/obj/item/pen,
-/turf/open/floor/iron,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/hallway/primary/starboard)
"bfX" = (
-/obj/effect/turf_decal/tile/purple,
-/obj/effect/turf_decal/tile/purple{
- dir = 8
- },
-/turf/open/floor/iron,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/hallway/primary/starboard)
"bfZ" = (
/obj/structure/sign/warning/secure_area/directional/south,
-/obj/effect/turf_decal/tile/purple,
-/obj/machinery/light/directional/south,
-/obj/effect/turf_decal/tile/purple/opposingcorners,
-/obj/effect/turf_decal/tile/purple{
- dir = 8
+/obj/effect/turf_decal/trimline/purple/corner,
+/turf/open/floor/iron/textured_corner{
+ dir = 4
},
-/turf/open/floor/iron,
/area/station/hallway/primary/starboard)
"bgc" = (
/turf/closed/wall/r_wall,
@@ -14014,19 +15574,16 @@
/turf/open/floor/iron/dark,
/area/station/hallway/secondary/exit)
"bgh" = (
-/obj/machinery/vending/cigarette,
-/obj/effect/turf_decal/stripes/line{
- dir = 6
+/obj/effect/turf_decal/trimline/brown/filled/warning{
+ dir = 1
},
+/obj/effect/turf_decal/trimline/brown/filled/warning,
/turf/open/floor/iron,
-/area/station/hallway/secondary/entry)
+/area/station/cargo/storage)
"bgi" = (
-/obj/machinery/camera/directional/south{
- c_tag = "Arrivals Bay 3 & 4"
- },
-/obj/effect/turf_decal/stripes/line,
-/obj/structure/closet/firecloset,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/blue/filled/corner,
+/obj/effect/landmark/start/hangover,
+/turf/open/floor/iron/textured_corner,
/area/station/hallway/secondary/entry)
"bgj" = (
/obj/machinery/conveyor{
@@ -14047,27 +15604,20 @@
/turf/open/floor/plating/airless,
/area/station/hallway/secondary/entry)
"bgn" = (
-/obj/structure/table,
/obj/machinery/light/directional/west,
-/obj/machinery/microwave/engineering/cell_included,
-/obj/effect/spawner/random/food_or_drink/donkpockets{
- pixel_y = -6
- },
-/obj/effect/turf_decal/tile/brown{
- dir = 8
- },
-/obj/effect/turf_decal/tile/yellow{
- dir = 1
- },
-/obj/effect/turf_decal/tile/yellow,
-/turf/open/floor/iron,
+/obj/machinery/recharge_station,
+/turf/open/floor/iron/dark/textured_large,
/area/station/cargo/miningdock)
"bgp" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 5
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/siding/dark{
+ dir = 1;
+ icon_state = "siding_plain_end"
+ },
+/turf/open/floor/iron/white/smooth_large,
/area/station/science/research)
"bgr" = (
/obj/machinery/door/airlock{
@@ -14111,70 +15661,97 @@
"bgz" = (
/obj/machinery/disposal/bin,
/obj/structure/disposalpipe/trunk,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/bot,
+/turf/open/floor/iron/dark/textured_large,
/area/station/cargo/office)
"bgC" = (
-/obj/effect/turf_decal/stripes/line,
/obj/structure/cable,
-/turf/open/floor/iron,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/science/xenobiology)
"bgD" = (
/obj/machinery/conveyor_switch/oneway{
id = "packageSort2"
},
-/obj/machinery/camera/directional/west{
- c_tag = "Cargo Delivery Office";
- network = list("ss13","trash","Cargo")
- },
/obj/machinery/requests_console{
department = "Cargo Bay";
pixel_x = -30
},
/obj/effect/mapping_helpers/requests_console/supplies,
-/obj/effect/turf_decal/tile/brown{
- dir = 1
- },
-/obj/effect/turf_decal/tile/brown{
- dir = 4
- },
/obj/machinery/light/directional/west,
+/obj/effect/turf_decal/trimline/brown/filled/line{
+ dir = 9
+ },
+/obj/effect/turf_decal/trimline/dark/line{
+ dir = 9
+ },
/turf/open/floor/iron,
/area/station/cargo/sorting)
"bgE" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron,
-/area/station/cargo/sorting)
-"bgF" = (
-/obj/effect/turf_decal/tile/yellow{
+/obj/machinery/camera/autoname/directional/west{
+ network = list("ss13","cargo");
+ c_tag = "Delivery Office"
+ },
+/obj/effect/turf_decal/trimline/brown/filled/line{
dir = 8
},
-/obj/effect/turf_decal/tile/yellow{
- dir = 1
+/obj/effect/turf_decal/trimline/dark/line{
+ dir = 8
},
-/obj/structure/table/glass,
-/obj/machinery/reagentgrinder,
-/obj/structure/extinguisher_cabinet{
- pixel_x = -27
+/turf/open/floor/iron/textured_edge{
+ dir = 4
},
-/turf/open/floor/iron/white,
+/area/station/cargo/sorting)
+"bgF" = (
+/obj/structure/table/reinforced/rglass,
+/obj/machinery/reagentgrinder{
+ pixel_x = -6;
+ pixel_y = 4
+ },
+/obj/item/ph_booklet{
+ pixel_x = 8;
+ pixel_y = 8
+ },
+/obj/item/ph_paper{
+ pixel_x = 5;
+ pixel_y = -3
+ },
+/obj/item/ph_paper{
+ pixel_x = 10;
+ pixel_y = -2
+ },
+/turf/open/floor/iron/dark/small,
/area/station/medical/pharmacy)
"bgG" = (
-/obj/machinery/camera/directional/east{
- c_tag = "Central Hallway West"
- },
-/obj/effect/turf_decal/tile/blue,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 8
},
-/turf/open/floor/iron,
+/obj/machinery/camera/directional/east{
+ c_tag = "Central Hallway West"
+ },
+/obj/effect/turf_decal/trimline/blue/arrow_ccw{
+ dir = 4;
+ alpha = 200
+ },
+/obj/effect/turf_decal/trimline/blue/mid_joiner{
+ alpha = 200;
+ dir = 4
+ },
+/turf/open/floor/iron/corner{
+ dir = 8
+ },
/area/station/hallway/primary/central)
"bgI" = (
-/obj/machinery/computer/slot_machine,
-/turf/open/floor/wood,
+/obj/machinery/computer/slot_machine{
+ name = "gamba";
+ desc = "CAN'T STOP WINNING"
+ },
+/obj/machinery/vending/wallmed/directional/south,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/command/meeting_room)
"bgJ" = (
/obj/structure/reagent_dispensers/water_cooler,
-/turf/open/floor/wood,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/command/meeting_room)
"bgK" = (
/obj/structure/cable,
@@ -14189,19 +15766,20 @@
"bgL" = (
/obj/machinery/computer/security/telescreen/entertainment/directional/south,
/obj/machinery/recharge_station,
-/turf/open/floor/wood,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/command/meeting_room)
"bgM" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/station/maintenance/solars/starboard/fore)
"bgP" = (
-/obj/machinery/disposal/bin,
-/obj/effect/turf_decal/trimline/yellow/end{
- dir = 8
+/obj/structure/cable,
+/obj/effect/turf_decal/tile/yellow/half{
+ dir = 1
},
-/obj/structure/disposalpipe/trunk,
-/turf/open/floor/iron/white,
+/obj/structure/tank_holder/extinguisher,
+/obj/effect/turf_decal/box,
+/turf/open/floor/iron/dark/smooth_half,
/area/station/medical/pharmacy)
"bgR" = (
/obj/structure/lattice/catwalk,
@@ -14219,45 +15797,48 @@
/turf/open/floor/plating,
/area/station/maintenance/department/security)
"bgU" = (
-/obj/effect/turf_decal/tile/red{
+/obj/effect/turf_decal/trimline/dark_blue/filled/shrink_cw{
dir = 8
},
/turf/open/floor/iron/dark,
/area/station/hallway/primary/fore)
"bgV" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/table/wood,
-/obj/item/book/manual/wiki/security_space_law,
-/obj/item/coin/plasma,
-/turf/open/floor/wood,
+/obj/structure/table/wood/fancy/blue,
+/obj/machinery/computer/arcade/minesweeper{
+ dir = 8;
+ desc = "Average computer setup with what appears to be minesweeper open on it... Looks like someone isn't taking their job seriously.";
+ name = "computer";
+ icon_state = "oldcomp";
+ icon_screen = "library";
+ pixel_y = 2
+ },
+/turf/open/floor/iron/dark/textured_large,
/area/station/command/heads_quarters/captain)
"bgW" = (
/obj/structure/cable,
-/obj/machinery/holopad/secure,
-/turf/open/floor/wood,
+/obj/machinery/holopad/secure{
+ pixel_x = 1
+ },
+/turf/open/floor/iron/dark/textured_large,
/area/station/command/heads_quarters/captain)
"bgX" = (
-/obj/effect/turf_decal/siding/wood{
- dir = 8
- },
/obj/structure/sign/poster/greenscreen/directional/east,
-/turf/open/floor/iron/dark,
+/obj/effect/turf_decal/box/white{
+ color = "#0fff37"
+ },
+/obj/effect/turf_decal/bot_white{
+ color = "#0fff37"
+ },
+/turf/open/floor/iron/dark/textured_large,
/area/station/command/heads_quarters/captain)
"bhb" = (
-/obj/effect/turf_decal/tile/yellow{
- dir = 4
+/obj/structure/noticeboard/directional/north{
+ dir = 2
},
-/obj/effect/turf_decal/tile/yellow{
- dir = 1
- },
-/obj/machinery/chem_dispenser,
-/obj/structure/window/reinforced/spawner/directional/west,
-/obj/effect/turf_decal/tile/yellow{
- dir = 8
- },
-/obj/effect/turf_decal/tile/yellow,
+/obj/machinery/chem_heater/withbuffer,
/obj/machinery/light/directional/north,
-/turf/open/floor/iron/white,
+/turf/open/floor/iron/dark/small,
/area/station/medical/pharmacy)
"bhc" = (
/obj/structure/chair,
@@ -14267,17 +15848,6 @@
/turf/open/floor/plating/airless,
/area/station/science/ordnance/bomb)
"bhd" = (
-/obj/effect/turf_decal/tile/yellow,
-/obj/effect/turf_decal/tile/yellow{
- dir = 4
- },
-/obj/effect/turf_decal/tile/yellow{
- dir = 1
- },
-/obj/machinery/chem_master,
-/obj/effect/turf_decal/tile/yellow{
- dir = 8
- },
/obj/machinery/button/door{
id = "pharmacy_shutters";
name = "Pharmacy Shutter Control";
@@ -14285,7 +15855,12 @@
pixel_y = 24;
req_access = list("pharmacy")
},
-/turf/open/floor/iron/white,
+/obj/structure/sign/warning/no_smoking/circle/directional/north{
+ pixel_x = 32;
+ pixel_y = 32
+ },
+/obj/machinery/chem_master,
+/turf/open/floor/iron/dark/small,
/area/station/medical/pharmacy)
"bhe" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
@@ -14298,13 +15873,23 @@
/obj/effect/turf_decal/trimline/blue/filled/line{
dir = 4
},
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/trimline/white/line{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/blue/filled/mid_joiner{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/white/mid_joiner{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/blue{
+ color = "#8ab4cb";
+ dir = 4
+ },
+/turf/open/floor/iron/white/smooth_edge{
+ dir = 4
+ },
/area/station/medical/treatment_center)
-"bhi" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/structure/cable,
-/turf/open/floor/plating,
-/area/station/security/checkpoint/medical)
"bhj" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -14312,7 +15897,8 @@
/turf/open/floor/plating/airless,
/area/station/science/ordnance/bomb)
"bhm" = (
-/turf/open/floor/iron/dark,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/medical/morgue)
"bho" = (
/obj/effect/turf_decal/siding/wood,
@@ -14321,43 +15907,43 @@
/turf/open/floor/carpet/blue,
/area/station/command/heads_quarters/cmo)
"bhq" = (
-/obj/effect/decal/cleanable/dirt,
/obj/machinery/light/small/directional/north,
/obj/machinery/computer/operating,
-/turf/open/floor/iron/dark,
-/area/station/medical/morgue)
-"bhr" = (
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
-/obj/effect/turf_decal/tile/blue{
+/obj/effect/turf_decal/siding/dark,
+/obj/effect/turf_decal/trimline/dark/filled/end{
dir = 4
},
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
-/obj/machinery/defibrillator_mount/directional/south,
+/turf/open/floor/iron/dark/small,
+/area/station/medical/morgue)
+"bhr" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/defibrillator_mount/directional/south,
/obj/effect/spawner/random/medical/patient_stretcher,
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/tile/blue/full,
+/obj/effect/turf_decal/siding/blue{
+ color = "#8ab4cb";
+ dir = 6
+ },
+/turf/open/floor/iron/white/smooth_large,
/area/station/medical/treatment_center)
"bht" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/research{
- name = "Mech Bay"
+ name = "Robotics Lab"
},
/obj/effect/mapping_helpers/airlock/access/any/science/robotics,
-/turf/open/floor/iron,
+/turf/open/floor/iron/dark/textured_large,
/area/station/science/robotics/mechbay)
"bhu" = (
/obj/machinery/door/firedoor,
+/obj/effect/turf_decal/delivery/white{
+ color = "#ae4fd6"
+ },
/obj/machinery/door/poddoor/shutters{
id = "Skynet_launch";
name = "Mech Bay"
},
-/obj/effect/turf_decal/delivery,
-/turf/open/floor/iron,
+/turf/open/floor/iron/dark/textured_large,
/area/station/science/robotics/mechbay)
"bhv" = (
/obj/structure/disposalpipe/segment{
@@ -14365,16 +15951,8 @@
},
/obj/structure/cable,
/obj/machinery/airalarm/directional/north,
-/obj/effect/turf_decal/tile/purple{
- dir = 1
- },
-/obj/effect/turf_decal/tile/yellow{
- dir = 8
- },
-/obj/effect/turf_decal/tile/brown{
- dir = 8
- },
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/siding/thinplating_new/dark,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/science/robotics/lab)
"bhx" = (
/obj/machinery/requests_console{
@@ -14384,32 +15962,38 @@
},
/obj/effect/mapping_helpers/requests_console/ore_update,
/obj/effect/mapping_helpers/requests_console/supplies,
-/obj/machinery/rnd/production/circuit_imprinter/department/science,
-/obj/machinery/light/directional/north,
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/siding/thinplating_new/dark/corner{
+ dir = 8
+ },
+/turf/open/floor/iron/dark/smooth_large,
/area/station/science/robotics/lab)
"bhy" = (
/obj/machinery/door/poddoor/shutters/preopen{
id = "robotics";
- name = "Robotics Lab Shutters"
+ name = "Robotics Lab Shutters";
+ dir = 1
},
-/obj/effect/spawner/structure/window/reinforced,
+/obj/structure/window/reinforced/spawner/directional/north,
+/obj/structure/hedge,
+/obj/structure/window/reinforced/spawner/directional/south,
+/obj/structure/window/reinforced/spawner/directional/east,
+/obj/structure/window/reinforced/spawner/directional/west,
/turf/open/floor/plating,
/area/station/science/robotics/lab)
"bhA" = (
/turf/closed/wall,
/area/station/science/research)
"bhB" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/effect/mapping_helpers/airlock/cyclelink_helper,
/obj/machinery/door/airlock/research{
name = "Research Division Access"
},
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/effect/mapping_helpers/airlock/access/any/science/general,
/obj/effect/landmark/navigate_destination,
/obj/effect/mapping_helpers/airlock/unres,
-/turf/open/floor/iron/white,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/science/research)
"bhG" = (
/obj/structure/disposalpipe/segment{
@@ -14451,7 +16035,18 @@
/area/station/maintenance/disposal)
"bhM" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/circuit,
+/obj/effect/turf_decal/trimline/purple/filled/line{
+ alpha = 160;
+ color = "#6a3182";
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 8
+ },
+/turf/open/floor/iron/dark/small,
/area/station/science/robotics/mechbay)
"bhO" = (
/obj/structure/disposalpipe/segment,
@@ -14472,11 +16067,13 @@
},
/area/station/engineering/main)
"bhR" = (
+/obj/effect/mapping_helpers/airlock/access/any/supply/maintenance,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
/obj/machinery/door/airlock/atmos{
name = "Atmospherics Maintenance"
},
-/obj/machinery/atmospherics/pipe/layer_manifold/supply/hidden,
-/obj/effect/mapping_helpers/airlock/access/any/supply/maintenance,
/turf/open/floor/plating,
/area/station/maintenance/port)
"bhS" = (
@@ -14496,24 +16093,22 @@
/area/station/maintenance/starboard/fore)
"bhU" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/effect/landmark/start/scientist,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 5
},
-/turf/open/floor/iron/white,
+/obj/effect/landmark/start/scientist,
+/obj/effect/turf_decal/siding/dark{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 4
+ },
+/turf/open/floor/iron/white/smooth_large,
/area/station/science/research)
"bhV" = (
/obj/machinery/modular_computer/preset/id,
-/obj/effect/turf_decal/tile/red{
- dir = 1
- },
-/obj/effect/turf_decal/tile/red{
- dir = 4
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/turf/open/floor/iron/dark,
+/obj/effect/turf_decal/delivery/blue,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/security/checkpoint/escape)
"bia" = (
/obj/structure/disposalpipe/trunk{
@@ -14522,6 +16117,7 @@
/obj/structure/disposaloutlet{
dir = 4
},
+/obj/machinery/light/small/directional/west,
/turf/open/floor/plating,
/area/station/cargo/sorting)
"bic" = (
@@ -14538,25 +16134,29 @@
/turf/open/floor/iron/smooth_half,
/area/station/engineering/main)
"bid" = (
-/obj/structure/extinguisher_cabinet{
- pixel_x = 27
+/obj/structure/extinguisher_cabinet/directional/east,
+/obj/effect/turf_decal/trimline/blue/corner{
+ dir = 4;
+ alpha = 200
+ },
+/obj/effect/turf_decal/trimline/green/corner,
+/turf/open/floor/iron/edge{
+ dir = 4
},
-/obj/effect/turf_decal/tile/blue,
-/turf/open/floor/iron,
/area/station/hallway/primary/central)
"bie" = (
/obj/machinery/navbeacon{
codes_txt = "delivery;dir=1";
location = "Bridge"
},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/structure/plasticflaps/opaque,
/obj/effect/turf_decal/bot,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/command/meeting_room)
"bif" = (
/obj/machinery/vending/cigarette,
-/turf/open/floor/wood,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/command/meeting_room)
"big" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
@@ -14565,12 +16165,32 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 10
},
+/obj/effect/turf_decal/siding/wideplating_new/dark,
+/obj/effect/turf_decal/siding/wideplating_new/dark{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/dark,
/turf/open/floor/circuit,
/area/station/ai_monitored/command/nuke_storage)
"bii" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 10
},
+/obj/effect/turf_decal/siding/wideplating_new/dark{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/wideplating_new/dark{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 4
+ },
/turf/open/floor/circuit,
/area/station/ai_monitored/command/nuke_storage)
"bik" = (
@@ -14583,7 +16203,7 @@
/obj/machinery/modular_computer/preset/id{
dir = 4
},
-/turf/open/floor/wood,
+/turf/open/floor/iron/dark/textured_large,
/area/station/command/heads_quarters/captain)
"bil" = (
/obj/machinery/door/airlock/maintenance{
@@ -14593,73 +16213,79 @@
/obj/effect/mapping_helpers/airlock/unres{
dir = 4
},
+/obj/machinery/door/firedoor,
/turf/open/floor/iron,
/area/station/maintenance/starboard/fore)
"bim" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/table/wood,
/obj/machinery/recharger,
-/obj/item/melee/chainofcommand,
-/obj/item/hand_tele,
-/turf/open/floor/wood,
+/obj/item/melee/chainofcommand{
+ pixel_x = 4;
+ pixel_y = 11
+ },
+/obj/structure/table/wood/fancy/blue,
+/obj/item/hand_tele{
+ pixel_x = -4;
+ pixel_y = 18
+ },
+/turf/open/floor/iron/dark/textured_large,
/area/station/command/heads_quarters/captain)
"bin" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
- dir = 6
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/turf_decal/tile/yellow{
+ dir = 4
+ },
+/turf/open/floor/iron/dark/smooth_corner{
+ dir = 4
},
-/turf/open/floor/iron/white,
/area/station/medical/pharmacy)
"bio" = (
-/obj/effect/turf_decal/tile/yellow{
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+ dir = 4
+ },
+/obj/structure/chair/office/light{
dir = 8
},
-/obj/effect/turf_decal/tile/yellow{
- dir = 1
- },
-/obj/structure/table/glass,
-/obj/item/reagent_containers/cup/bottle/epinephrine,
-/obj/machinery/requests_console{
- department = "Chemistry";
- pixel_x = -30
- },
-/obj/effect/mapping_helpers/requests_console/ore_update,
-/obj/effect/mapping_helpers/requests_console/supplies,
-/obj/item/stack/sheet/mineral/plasma,
-/obj/machinery/light/directional/west,
-/turf/open/floor/iron/white,
+/turf/open/floor/iron/dark/small,
/area/station/medical/pharmacy)
"bip" = (
/turf/open/floor/iron/white,
/area/station/medical/chemistry)
"bis" = (
-/obj/effect/turf_decal/tile/yellow,
-/obj/effect/turf_decal/tile/yellow{
- dir = 4
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+ dir = 8
},
/obj/structure/chair/office/light{
dir = 4
},
-/turf/open/floor/iron/white,
+/turf/open/floor/iron/dark/small,
/area/station/medical/pharmacy)
"bit" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+ dir = 8
+ },
/turf/open/floor/iron/white,
/area/station/medical/medbay/lobby)
"biu" = (
-/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
-/obj/effect/turf_decal/tile/blue{
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/turf_decal/trimline/blue/filled/warning{
+ alpha = 160;
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/white/warning{
+ dir = 1
+ },
+/obj/structure/cable,
+/turf/open/floor/iron/white/smooth_edge{
dir = 1
},
-/turf/open/floor/iron/white,
/area/station/medical/medbay/lobby)
"biv" = (
-/obj/effect/turf_decal/tile/brown{
- dir = 8
- },
-/turf/open/floor/iron,
-/area/station/cargo/office)
+/mob/living/basic/sloth/paperwork,
+/turf/open/floor/iron/textured_corner,
+/area/station/cargo/storage)
"biA" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -14667,26 +16293,47 @@
/turf/open/floor/iron/smooth_large,
/area/station/engineering/main)
"biB" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/smartfridge/organ,
/obj/structure/window/reinforced/spawner/directional/south,
-/turf/open/floor/iron/dark,
+/obj/effect/turf_decal/siding/dark/corner{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/dark/filled/corner{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/dark/filled/line{
+ dir = 10
+ },
+/obj/machinery/smartfridge/organ,
+/obj/machinery/vending/wallmed/directional/west,
+/turf/open/floor/iron/dark/small,
/area/station/medical/morgue)
"biG" = (
+/obj/structure/cable,
/obj/machinery/mech_bay_recharge_port{
dir = 2
},
-/obj/structure/cable,
/turf/open/floor/plating,
/area/station/science/robotics/mechbay)
"biH" = (
/obj/structure/cable,
-/turf/open/floor/iron,
+/obj/machinery/holopad,
+/turf/open/floor/iron/dark/textured_large,
/area/station/science/robotics/mechbay)
"biI" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/circuit,
+/obj/effect/turf_decal/trimline/purple/filled/line{
+ alpha = 160;
+ color = "#6a3182";
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 4
+ },
+/turf/open/floor/iron/dark/small,
/area/station/science/robotics/mechbay)
"biJ" = (
/obj/machinery/power/terminal{
@@ -14698,14 +16345,19 @@
"biK" = (
/obj/structure/disposalpipe/segment,
/obj/structure/cable,
-/obj/effect/turf_decal/tile/purple{
+/obj/effect/turf_decal/bot_white{
+ color = "#D381C9"
+ },
+/obj/structure/railing{
dir = 1
},
-/turf/open/floor/iron/white,
+/turf/open/floor/iron/dark,
/area/station/science/robotics/lab)
"biL" = (
-/turf/open/floor/iron/white,
-/area/station/science/robotics/lab)
+/obj/structure/cable,
+/obj/effect/landmark/event_spawn,
+/turf/open/floor/plating,
+/area/station/engineering/supermatter/room)
"biM" = (
/obj/machinery/power/terminal{
dir = 8
@@ -14716,16 +16368,10 @@
/turf/open/floor/plating,
/area/station/maintenance/department/electrical)
"biN" = (
-/obj/effect/turf_decal/tile/purple{
+/obj/machinery/modular_computer/preset/civilian{
dir = 4
},
-/obj/effect/turf_decal/tile/yellow{
- dir = 1
- },
-/obj/effect/turf_decal/tile/brown{
- dir = 1
- },
-/turf/open/floor/iron/white,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/science/robotics/lab)
"biO" = (
/obj/machinery/camera/directional/north{
@@ -14739,66 +16385,71 @@
pixel_y = 24;
req_access = list("robotics")
},
-/obj/structure/table,
-/obj/item/book/manual/wiki/robotics_cyborgs{
- pixel_x = 11;
- pixel_y = -1
- },
-/obj/effect/turf_decal/tile/purple{
- dir = 4
- },
-/obj/machinery/ecto_sniffer,
-/turf/open/floor/iron/white,
+/obj/machinery/rnd/production/circuit_imprinter/department/science,
+/obj/structure/marker_beacon/indigo,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/science/robotics/lab)
"biP" = (
/obj/structure/filingcabinet/chestdrawer,
-/obj/effect/turf_decal/tile/purple{
- dir = 4
- },
-/obj/effect/turf_decal/tile/yellow{
- dir = 1
- },
-/obj/effect/turf_decal/tile/brown{
- dir = 1
- },
-/turf/open/floor/iron/white,
+/obj/structure/sign/poster/contraband/killingjoke/directional/east,
+/obj/effect/turf_decal/siding/thinplating_new/dark,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/science/robotics/lab)
"biQ" = (
-/obj/structure/chair/stool,
-/obj/effect/turf_decal/tile/purple{
- dir = 4
- },
-/obj/effect/turf_decal/tile/yellow{
+/obj/structure/chair/office/light{
dir = 1
},
-/obj/effect/turf_decal/tile/brown{
- dir = 1
- },
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/siding/thinplating_new/dark/corner,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/science/robotics/lab)
"biR" = (
/obj/structure/closet/emcloset,
/obj/machinery/camera/directional/north{
c_tag = "Research Division Access"
},
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/bot_white{
+ color = "#D381C9"
+ },
+/obj/effect/turf_decal/box/white{
+ color = "#D381C9"
+ },
+/turf/open/floor/iron/dark/smooth_large,
/area/station/science/research)
"biS" = (
-/obj/effect/turf_decal/delivery,
/obj/machinery/door/window/right/directional/west{
name = "Research Division Delivery";
req_access = list("research")
},
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/delivery/white{
+ color = "#D381C9"
+ },
+/turf/open/floor/iron/white/smooth_large,
/area/station/science/research)
"biT" = (
/obj/structure/disposalpipe/segment{
dir = 5
},
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/brown/filled/line{
+ dir = 1
+ },
+/turf/open/floor/iron/textured_edge,
/area/station/cargo/office)
"biW" = (
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/trimline/dark/filled/corner{
+ alpha = 160;
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/purple/corner{
+ color = "#700047";
+ alpha = 200;
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/dark/corner{
+ dir = 4
+ },
+/turf/open/floor/iron/white/smooth_half{
+ dir = 1
+ },
/area/station/science/lab)
"bja" = (
/obj/effect/spawner/structure/window/reinforced,
@@ -14846,6 +16497,7 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 5
},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer5,
/turf/open/floor/plating,
/area/station/maintenance/port)
"bji" = (
@@ -14870,6 +16522,7 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 4
},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer5,
/turf/open/floor/plating,
/area/station/maintenance/port)
"bjn" = (
@@ -14878,12 +16531,10 @@
/turf/open/floor/carpet/executive,
/area/station/command/heads_quarters/blueshield)
"bjo" = (
-/obj/machinery/camera/directional/north{
- c_tag = "Cargo Bay North";
- network = list("ss13","cargo")
- },
/obj/machinery/vending/wardrobe/cargo_wardrobe,
-/turf/open/floor/iron,
+/obj/machinery/camera/autoname/directional/north,
+/obj/effect/turf_decal/bot,
+/turf/open/floor/iron/dark/textured_large,
/area/station/cargo/storage)
"bjs" = (
/obj/machinery/door/firedoor,
@@ -14898,29 +16549,30 @@
},
/obj/effect/mapping_helpers/airlock/access/any/supply/general,
/obj/structure/cable,
-/turf/open/floor/iron,
+/turf/open/floor/iron/large,
/area/station/cargo/sorting)
"bju" = (
-/obj/machinery/photocopier/prebuilt,
+/obj/machinery/photocopier,
/obj/item/radio/intercom/directional/north,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/bot,
+/obj/machinery/light/small/directional/north,
+/turf/open/floor/iron/dark/textured_large,
/area/station/cargo/office)
"bjv" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 4
},
-/obj/effect/turf_decal/tile/brown,
-/obj/effect/turf_decal/tile/brown{
- dir = 4
- },
-/obj/effect/turf_decal/tile/brown{
- dir = 1
- },
-/turf/open/floor/iron,
+/turf/open/floor/iron/large,
/area/station/cargo/office)
"bjw" = (
/obj/structure/cable,
+/obj/effect/turf_decal/trimline/brown/filled/line{
+ dir = 6
+ },
+/obj/effect/turf_decal/trimline/dark/line{
+ dir = 6
+ },
/turf/open/floor/iron,
/area/station/cargo/sorting)
"bjx" = (
@@ -14932,12 +16584,9 @@
/turf/open/floor/iron,
/area/station/hallway/primary/central)
"bjy" = (
-/obj/effect/turf_decal/tile/yellow,
/obj/machinery/firealarm/directional/east,
-/obj/effect/turf_decal/tile/yellow{
- dir = 4
- },
-/turf/open/floor/iron/dark/corner{
+/obj/effect/turf_decal/trimline/yellow/corner,
+/turf/open/floor/iron/edge{
dir = 4
},
/area/station/hallway/primary/aft)
@@ -14967,7 +16616,10 @@
/area/station/science/ordnance)
"bjE" = (
/obj/machinery/airalarm/directional/west,
-/turf/open/floor/wood,
+/obj/effect/turf_decal/siding/dark{
+ dir = 9
+ },
+/turf/open/floor/wood/tile,
/area/station/command/meeting_room)
"bjF" = (
/obj/machinery/computer/communications{
@@ -14975,7 +16627,7 @@
},
/obj/machinery/newscaster/directional/west,
/obj/machinery/keycard_auth/wall_mounted/directional/south,
-/turf/open/floor/wood,
+/turf/open/floor/iron/dark/textured_large,
/area/station/command/heads_quarters/captain)
"bjH" = (
/obj/structure/cable,
@@ -14988,6 +16640,9 @@
/obj/machinery/firealarm/directional/south,
/obj/structure/bed/dogbed/renault,
/mob/living/basic/pet/fox/renault,
+/obj/effect/turf_decal/siding/dark{
+ dir = 6
+ },
/turf/open/floor/wood,
/area/station/command/heads_quarters/captain)
"bjI" = (
@@ -15004,65 +16659,54 @@
/turf/open/floor/plating/airless,
/area/station/science/ordnance/bomb)
"bjK" = (
-/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/disposalpipe/segment{
dir = 6
},
-/turf/open/floor/iron/white,
-/area/station/medical/pharmacy)
-"bjO" = (
-/obj/machinery/chem_heater/withbuffer,
-/obj/effect/turf_decal/tile/yellow{
- dir = 1
- },
-/obj/effect/turf_decal/tile/yellow{
- dir = 4
- },
/obj/effect/turf_decal/tile/yellow{
dir = 8
},
-/obj/effect/turf_decal/tile/yellow,
-/obj/structure/window/reinforced/spawner/directional/south,
-/obj/structure/window/reinforced/spawner/directional/west,
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/tile/yellow{
+ dir = 4
+ },
+/turf/open/floor/iron/dark,
+/area/station/medical/pharmacy)
+"bjO" = (
+/obj/effect/turf_decal/tile/yellow{
+ dir = 8
+ },
+/turf/open/floor/iron/dark/smooth_corner{
+ dir = 8
+ },
/area/station/medical/pharmacy)
"bjP" = (
/obj/machinery/computer/mech_bay_power_console{
dir = 8
},
/obj/structure/cable,
-/turf/open/floor/iron,
+/turf/open/floor/iron/dark/textured_large,
/area/station/science/robotics/mechbay)
"bjQ" = (
/obj/effect/turf_decal/tile/yellow/fourcorners,
/obj/machinery/smartfridge/chemistry/preloaded,
-/turf/open/floor/iron/white,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/medical/pharmacy)
"bjR" = (
-/obj/effect/turf_decal/tile/yellow,
-/obj/effect/turf_decal/tile/yellow{
- dir = 4
- },
-/obj/structure/table/glass,
-/obj/item/storage/box/beakers{
- pixel_x = 2;
- pixel_y = 2
- },
-/obj/item/reagent_containers/cup/beaker/large,
-/obj/item/reagent_containers/dropper,
-/obj/effect/turf_decal/tile/yellow{
- dir = 1
- },
-/obj/effect/turf_decal/tile/yellow{
- dir = 8
- },
-/obj/structure/window/reinforced/spawner/directional/south,
-/turf/open/floor/iron/white,
+/obj/machinery/chem_dispenser,
+/turf/open/floor/iron/dark/small,
/area/station/medical/pharmacy)
"bjU" = (
-/obj/effect/turf_decal/tile/blue,
+/obj/effect/turf_decal/siding{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/blue/filled/corner{
+ alpha = 160
+ },
+/obj/effect/turf_decal/trimline/white/corner,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/cable,
/turf/open/floor/iron/white,
/area/station/medical/medbay/lobby)
"bjW" = (
@@ -15075,19 +16719,36 @@
/area/station/maintenance/disposal)
"bjZ" = (
/obj/structure/closet/firecloset,
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/bot_white{
+ color = "#D381C9"
+ },
+/obj/effect/turf_decal/box/white{
+ color = "#D381C9"
+ },
+/turf/open/floor/iron/dark/smooth_large,
/area/station/science/research)
"bkb" = (
-/obj/effect/decal/cleanable/blood/old,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 8
},
+/obj/effect/decal/cleanable/blood/old,
+/obj/effect/turf_decal/siding/dark{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/dark/corner,
+/obj/effect/turf_decal/trimline/dark/filled/corner,
+/obj/effect/turf_decal/trimline/dark/filled/corner{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/dark/filled/line{
+ dir = 1
+ },
/obj/machinery/door/window/brigdoor/left/directional/south{
name = "Coroner's Office";
req_access = list("morgue_secure")
},
-/turf/open/floor/iron/dark,
+/turf/open/floor/iron/dark/small,
/area/station/medical/morgue)
"bkc" = (
/obj/structure/cable,
@@ -15100,11 +16761,12 @@
/turf/open/floor/iron/smooth_large,
/area/station/engineering/main)
"bkf" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/cable,
/obj/machinery/light/small/directional/east,
+/obj/effect/turf_decal/trimline/dark/filled/line{
+ dir = 4
+ },
/obj/structure/mannequin/skeleton,
-/turf/open/floor/iron/dark,
+/turf/open/floor/iron/dark/small,
/area/station/medical/morgue)
"bkg" = (
/obj/structure/sign/poster/official/random/directional/north,
@@ -15112,7 +16774,18 @@
/area/station/hallway/secondary/service)
"bkh" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/circuit,
+/obj/effect/turf_decal/trimline/purple/filled/line{
+ alpha = 160;
+ color = "#6a3182";
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 4
+ },
+/turf/open/floor/iron/dark/small,
/area/station/science/robotics/mechbay)
"bkk" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
@@ -15124,6 +16797,7 @@
/obj/structure/disposalpipe/segment{
dir = 5
},
+/obj/structure/cable,
/turf/open/floor/plating,
/area/station/maintenance/aft)
"bkn" = (
@@ -15132,39 +16806,67 @@
},
/obj/machinery/firealarm/directional/north,
/obj/machinery/light/directional/north,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/brown/filled/line{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer5,
+/turf/open/floor/iron/textured_edge,
/area/station/cargo/storage)
"bko" = (
-/obj/machinery/light/directional/east,
-/turf/open/floor/iron/white,
+/obj/item/stack/sheet/iron/fifty{
+ pixel_x = 8;
+ pixel_y = 6
+ },
+/obj/item/stack/sheet/iron/fifty{
+ pixel_x = 8;
+ pixel_y = 6
+ },
+/obj/item/stack/sheet/iron/fifty{
+ pixel_x = 8;
+ pixel_y = 6
+ },
+/obj/item/stack/sheet/iron/fifty{
+ pixel_x = -7;
+ pixel_y = 6
+ },
+/obj/item/stack/sheet/iron/fifty{
+ pixel_x = -7;
+ pixel_y = 6
+ },
+/obj/item/stack/sheet/iron/fifty{
+ pixel_x = -7;
+ pixel_y = 6
+ },
+/obj/structure/table/glass,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/science/robotics/lab)
"bkq" = (
/obj/structure/closet/firecloset,
/obj/machinery/light/directional/west,
/obj/machinery/status_display/evac/directional/west,
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/bot_white{
+ color = "#D381C9"
+ },
+/obj/effect/turf_decal/box/white{
+ color = "#D381C9"
+ },
+/turf/open/floor/iron/dark/smooth_large,
/area/station/science/research)
"bkr" = (
-/obj/machinery/shower/directional/west,
-/obj/structure/sign/warning/secure_area/directional/east,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
dir = 8
},
-/obj/effect/turf_decal/stripes/line{
- dir = 5
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
+/obj/machinery/shower/directional/west,
+/obj/structure/sign/warning/secure_area/directional/east,
/obj/structure/window/reinforced/spawner/directional/north,
+/obj/effect/turf_decal/bot_white{
+ color = "#D381C9"
+ },
+/obj/effect/turf_decal/box/white{
+ color = "#D381C9"
+ },
/turf/open/floor/iron/white,
/area/station/science/research)
-"bkt" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
- dir = 8
- },
-/turf/open/floor/iron,
-/area/station/cargo/storage)
"bkw" = (
/obj/structure/disposalpipe/segment,
/obj/structure/cable,
@@ -15174,8 +16876,12 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 4
},
-/obj/machinery/light/directional/east,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/brown/filled/line{
+ dir = 4
+ },
+/turf/open/floor/iron/textured_edge{
+ dir = 8
+ },
/area/station/cargo/office)
"bkx" = (
/obj/machinery/status_display/supply{
@@ -15189,10 +16895,27 @@
"bkz" = (
/obj/structure/cable,
/obj/machinery/power/apc/auto_name/directional/west,
-/obj/machinery/atmospherics/components/unary/portables_connector{
- dir = 4
+/obj/effect/turf_decal/trimline/dark/filled/line{
+ alpha = 160;
+ dir = 9
},
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/trimline/dark/filled/mid_joiner{
+ dir = 8;
+ alpha = 160
+ },
+/obj/effect/turf_decal/trimline/dark/filled/mid_joiner{
+ dir = 1;
+ alpha = 160
+ },
+/obj/effect/turf_decal/trimline/purple/line{
+ alpha = 200;
+ dir = 9;
+ color = "#a56dc2"
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 9
+ },
+/turf/open/floor/iron/white/smooth_corner,
/area/station/science/xenobiology)
"bkB" = (
/obj/machinery/button/door{
@@ -15210,7 +16933,12 @@
/turf/open/floor/plating,
/area/station/maintenance/disposal)
"bkD" = (
-/obj/effect/spawner/structure/window/reinforced,
+/obj/structure/disposalpipe/segment{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
/turf/open/floor/plating,
/area/station/maintenance/port)
"bkE" = (
@@ -15235,31 +16963,27 @@
/turf/open/floor/iron/smooth_large,
/area/station/engineering/main)
"bkJ" = (
-/obj/effect/spawner/structure/window,
-/turf/open/floor/plating,
-/area/station/cargo/storage)
+/obj/effect/turf_decal/trimline/blue/filled/line{
+ dir = 9
+ },
+/turf/open/floor/iron,
+/area/station/hallway/secondary/entry)
"bkK" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron/white,
-/area/station/medical/pharmacy)
-"bkL" = (
-/obj/machinery/chem_heater/withbuffer,
+/obj/structure/disposalpipe/segment,
/obj/effect/turf_decal/tile/yellow{
dir = 1
},
-/obj/effect/turf_decal/tile/yellow{
- dir = 4
- },
-/obj/effect/turf_decal/tile/yellow{
- dir = 8
- },
/obj/effect/turf_decal/tile/yellow,
-/obj/structure/window/reinforced/spawner/directional/west,
-/obj/structure/window/reinforced/spawner/directional/north,
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/iron/white,
+/turf/open/floor/iron/dark,
+/area/station/medical/pharmacy)
+"bkL" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/turf_decal/tile/yellow/half,
+/turf/open/floor/iron/dark/smooth_half,
/area/station/medical/pharmacy)
"bkM" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
@@ -15271,11 +16995,38 @@
/turf/closed/wall,
/area/station/cargo/office)
"bkO" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/turf_decal/stripes{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes/blue/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/dark_blue/filled/corner{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/dark_blue/filled/corner{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/wideplating_new/dark/corner{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/wideplating_new/dark/corner{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/dark/corner{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/dark/corner{
+ dir = 1
+ },
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron/dark,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/iron/dark/small,
/area/station/security/checkpoint/escape)
"bkP" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/cable,
/obj/machinery/door/firedoor,
/obj/effect/turf_decal/tile/blue,
/obj/effect/turf_decal/tile/blue{
@@ -15290,11 +17041,8 @@
/obj/machinery/door/airlock/command{
name = "Chief Medical Officer"
},
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/effect/mapping_helpers/airlock/access/any/medical/cmo,
-/obj/structure/cable,
-/turf/open/floor/iron/dark,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/command/heads_quarters/cmo)
"bkR" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
@@ -15311,15 +17059,16 @@
/turf/open/floor/iron/dark,
/area/station/commons/dorms/apartment2)
"bkT" = (
-/obj/machinery/door/airlock/maintenance,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 8
},
+/obj/structure/cable,
+/obj/machinery/door/airlock/maintenance,
/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance,
/obj/effect/mapping_helpers/airlock/unres{
dir = 4
},
-/obj/structure/cable,
+/obj/effect/mapping_helpers/airlock/cutaiwire,
/turf/open/floor/plating,
/area/station/maintenance/central)
"bkV" = (
@@ -15337,27 +17086,31 @@
/turf/open/floor/plating,
/area/station/maintenance/central)
"bkY" = (
-/obj/effect/landmark/blobstart,
/obj/structure/cable,
+/obj/effect/landmark/blobstart,
/turf/open/floor/plating,
/area/station/maintenance/central)
"bla" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 8
},
-/turf/open/floor/iron/dark,
+/obj/effect/turf_decal/trimline/dark/filled/line{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/dark/filled/line{
+ dir = 8
+ },
+/turf/open/floor/iron/dark/small,
/area/station/medical/morgue)
"blb" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/door/airlock/command{
name = "Captain's Quarters"
},
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/effect/mapping_helpers/airlock/access/any/command/captain,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/wood,
+/turf/open/floor/iron/dark/textured_large,
/area/station/command/heads_quarters/captain)
"blc" = (
/obj/effect/turf_decal/stripes/line{
@@ -15370,31 +17123,33 @@
dir = 1
},
/turf/open/floor/engine,
-/area/station/engineering/main)
+/area/station/engineering/supermatter/room)
"ble" = (
/obj/structure/disposalpipe/segment,
-/obj/structure/extinguisher_cabinet{
- pixel_x = -27;
- pixel_y = 1
+/obj/structure/extinguisher_cabinet/directional/west,
+/obj/effect/turf_decal/trimline/blue/corner{
+ dir = 1;
+ alpha = 200
},
-/turf/open/floor/iron,
-/area/station/hallway/primary/central)
-"blf" = (
-/obj/effect/turf_decal/tile/yellow{
+/turf/open/floor/iron/edge{
dir = 8
},
-/obj/effect/turf_decal/tile/yellow{
- dir = 1
- },
-/obj/structure/table/glass,
-/obj/item/storage/box/syringes,
+/area/station/hallway/primary/central)
+"blf" = (
+/obj/structure/closet/secure_closet/chemical,
+/obj/item/clothing/head/helmet/space/plasmaman/chemist,
+/obj/item/radio/headset/headset_med,
+/obj/structure/sign/warning/chem_diamond/directional/west,
+/obj/machinery/light/directional/west,
/obj/item/clothing/glasses/science{
- pixel_x = 2;
- pixel_y = 4
+ pixel_x = 0;
+ pixel_y = 12
},
-/obj/item/clothing/glasses/science,
-/obj/item/radio/intercom/directional/west,
-/turf/open/floor/iron/white,
+/obj/item/clothing/glasses/science{
+ pixel_x = 0;
+ pixel_y = 12
+ },
+/turf/open/floor/iron/dark/small,
/area/station/medical/pharmacy)
"blg" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
@@ -15403,14 +17158,16 @@
/turf/open/floor/iron/smooth_large,
/area/station/engineering/main)
"bli" = (
+/obj/structure/sign/warning/vacuum/external/directional/west,
+/obj/machinery/atmospherics/components/binary/pump/on/layer4{
+ dir = 1;
+ name = "Airlock Pump";
+ target_pressure = 300;
+ hide = 1
+ },
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 4
},
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
- dir = 4
- },
-/obj/structure/sign/warning/vacuum/external/directional/west,
/turf/open/floor/plating,
/area/station/maintenance/fore)
"bln" = (
@@ -15420,8 +17177,8 @@
c_tag = "Medbay Lobby";
network = list("ss13","medbay")
},
-/obj/structure/sign/warning/no_smoking/circle/directional/east,
-/turf/open/floor/iron/white,
+/obj/structure/window/reinforced/spawner/directional/north,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/medical/medbay/lobby)
"blo" = (
/obj/machinery/door/firedoor,
@@ -15437,10 +17194,32 @@
dir = 9
},
/turf/open/floor/engine,
-/area/station/engineering/main)
+/area/station/engineering/supermatter/room)
"blq" = (
/obj/structure/cable,
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/trimline/dark/filled/line{
+ alpha = 160;
+ dir = 5
+ },
+/obj/effect/turf_decal/trimline/dark/filled/mid_joiner{
+ dir = 1;
+ alpha = 160
+ },
+/obj/effect/turf_decal/trimline/dark/filled/mid_joiner{
+ dir = 4;
+ alpha = 160
+ },
+/obj/effect/turf_decal/trimline/purple/line{
+ alpha = 200;
+ dir = 5;
+ color = "#a56dc2"
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 5
+ },
+/turf/open/floor/iron/white/smooth_corner{
+ dir = 8
+ },
/area/station/science/xenobiology)
"blr" = (
/obj/structure/bed/double,
@@ -15449,15 +17228,18 @@
/turf/open/floor/carpet/blue,
/area/station/command/heads_quarters/cmo)
"bls" = (
-/obj/structure/table,
-/obj/item/storage/toolbox/mechanical,
-/obj/item/crowbar/large,
/obj/machinery/camera/directional/south{
c_tag = "Mech Bay"
},
-/obj/machinery/light/directional/south,
-/obj/machinery/firealarm/directional/south,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/purple/filled/line{
+ alpha = 160;
+ color = "#6a3182"
+ },
+/obj/effect/turf_decal/siding/dark,
+/obj/effect/turf_decal/siding/dark{
+ dir = 1
+ },
+/turf/open/floor/iron/dark/small,
/area/station/science/robotics/mechbay)
"blt" = (
/obj/structure/cable,
@@ -15475,15 +17257,17 @@
},
/obj/structure/cable,
/obj/item/radio/intercom/directional/west,
-/turf/open/floor/iron,
+/turf/open/floor/iron/dark/textured_large,
/area/station/science/robotics/mechbay)
"blv" = (
-/obj/machinery/holopad,
/obj/structure/cable,
-/turf/open/floor/iron,
+/obj/structure/table,
+/obj/item/storage/toolbox/mechanical,
+/obj/item/crowbar/large,
+/turf/open/floor/iron/dark/textured_large,
/area/station/science/robotics/mechbay)
"blw" = (
-/turf/open/floor/iron/recharge_floor,
+/turf/open/floor/circuit/red,
/area/station/science/robotics/mechbay)
"bly" = (
/obj/machinery/light_switch{
@@ -15491,109 +17275,200 @@
},
/obj/structure/disposalpipe/segment,
/obj/structure/cable,
-/turf/open/floor/iron/white,
+/obj/item/stack/sheet/plasteel{
+ amount = 10;
+ pixel_x = -6;
+ pixel_y = 4
+ },
+/obj/item/stack/cable_coil{
+ pixel_x = -5;
+ pixel_y = 0
+ },
+/obj/item/assembly/flash/handheld{
+ pixel_x = 2;
+ pixel_y = 12
+ },
+/obj/item/assembly/flash/handheld{
+ pixel_x = 2;
+ pixel_y = 4
+ },
+/obj/item/assembly/flash/handheld{
+ pixel_x = 2;
+ pixel_y = -4
+ },
+/obj/item/assembly/flash/handheld{
+ pixel_x = 10;
+ pixel_y = 12
+ },
+/obj/item/assembly/flash/handheld{
+ pixel_x = 10;
+ pixel_y = 4
+ },
+/obj/item/assembly/flash/handheld{
+ pixel_x = 10;
+ pixel_y = -4
+ },
+/obj/structure/table/glass,
+/obj/effect/turf_decal/siding/thinplating_new/dark{
+ dir = 1
+ },
+/turf/open/floor/iron/dark/smooth_large,
/area/station/science/robotics/lab)
"blz" = (
/obj/structure/disposalpipe/segment,
/obj/structure/cable,
-/turf/open/floor/iron/white,
-/area/station/science/robotics/lab)
-"blA" = (
-/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/plating,
+/obj/effect/turf_decal/bot_white{
+ color = "#D381C9"
+ },
+/obj/structure/railing,
+/turf/open/floor/iron/dark,
/area/station/science/robotics/lab)
"blB" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 9
+/obj/effect/turf_decal/siding/dark{
+ dir = 4
},
-/obj/machinery/mecha_part_fabricator,
-/turf/open/floor/iron,
-/area/station/science/robotics/lab)
-"blC" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/turf/open/floor/iron,
-/area/station/science/robotics/lab)
-"blE" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/obj/structure/table,
-/obj/item/storage/medkit/regular{
- empty = 1;
- name = "First-Aid (empty)"
- },
-/obj/item/storage/medkit/regular{
- empty = 1;
- name = "First-Aid (empty)"
- },
-/obj/item/storage/medkit/regular{
- empty = 1;
- name = "First-Aid (empty)"
- },
-/obj/item/healthanalyzer,
-/obj/item/healthanalyzer,
-/obj/item/healthanalyzer,
-/obj/item/radio/intercom/directional/east,
-/turf/open/floor/iron,
-/area/station/science/robotics/lab)
-"blF" = (
-/obj/effect/turf_decal/stripes/line{
+/obj/effect/turf_decal/siding/dark{
dir = 8
},
-/obj/machinery/conveyor{
- dir = 4;
- id = "robo1"
+/obj/effect/turf_decal/trimline/purple/filled/line{
+ alpha = 160;
+ color = "#6a3182";
+ dir = 8
},
-/turf/open/floor/iron,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
+/turf/open/floor/iron/dark/small,
+/area/station/science/robotics/lab)
+"blC" = (
+/obj/effect/turf_decal/trimline/dark/filled/line{
+ alpha = 160;
+ dir = 9
+ },
+/obj/effect/turf_decal/trimline/dark/filled/mid_joiner{
+ dir = 1;
+ alpha = 160
+ },
+/obj/effect/turf_decal/trimline/dark/filled/mid_joiner{
+ dir = 8;
+ alpha = 160
+ },
+/obj/effect/turf_decal/trimline/purple/line{
+ alpha = 200;
+ dir = 9
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 9
+ },
+/turf/open/floor/iron/white/smooth_corner,
+/area/station/science/research)
+"blE" = (
+/obj/item/storage/medkit/regular{
+ empty = 1;
+ name = "First-Aid (empty)";
+ pixel_x = -2;
+ pixel_y = 2
+ },
+/obj/item/storage/medkit/regular{
+ empty = 1;
+ name = "First-Aid (empty)";
+ pixel_x = -2;
+ pixel_y = 7
+ },
+/obj/item/storage/medkit/regular{
+ empty = 1;
+ name = "First-Aid (empty)";
+ pixel_x = -2;
+ pixel_y = 12
+ },
+/obj/item/healthanalyzer,
+/obj/item/healthanalyzer,
+/obj/item/healthanalyzer,
+/obj/structure/table/glass,
+/obj/structure/extinguisher_cabinet/directional/east,
+/turf/open/floor/iron/dark/smooth_large,
+/area/station/science/robotics/lab)
+"blF" = (
+/obj/effect/turf_decal/siding/dark{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/purple/filled/line{
+ alpha = 160;
+ color = "#6a3182";
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 5
+ },
+/turf/open/floor/iron/dark/small,
/area/station/science/robotics/lab)
"blG" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
-/turf/open/floor/iron/white,
-/area/station/science/robotics/lab)
-"blH" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 6
+/obj/structure/disposalpipe/segment{
+ dir = 4
},
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/turf_decal/trimline/dark/filled/line{
+ alpha = 160;
+ dir = 2
+ },
+/obj/effect/turf_decal/trimline/dark/filled/mid_joiner{
+ dir = 2;
+ alpha = 160
+ },
+/obj/effect/turf_decal/trimline/purple/line{
+ alpha = 200;
+ dir = 2;
+ color = "#a56dc2"
+ },
+/obj/effect/turf_decal/siding/dark,
+/turf/open/floor/iron/white/smooth_edge,
+/area/station/science/xenobiology)
+"blH" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 8
},
/obj/machinery/shower/directional/west,
-/obj/effect/turf_decal/stripes/line{
- dir = 8
+/obj/effect/turf_decal/bot_white{
+ color = "#D381C9"
},
-/obj/effect/turf_decal/stripes/line{
- dir = 8
+/obj/effect/turf_decal/box/white{
+ color = "#D381C9"
},
/turf/open/floor/iron/white,
/area/station/science/research)
"blM" = (
-/obj/effect/turf_decal/bot,
-/obj/effect/landmark/start/roboticist,
-/turf/open/floor/iron,
-/area/station/science/robotics/lab)
-"blN" = (
-/obj/machinery/computer/rdconsole{
+/obj/effect/turf_decal/siding/dark{
dir = 4
},
-/obj/effect/turf_decal/tile/green{
+/obj/effect/turf_decal/siding/dark{
dir = 8
},
-/obj/effect/turf_decal/tile/green{
- dir = 1
- },
-/obj/structure/window/reinforced/spawner/directional/west,
-/obj/effect/turf_decal/tile/green{
+/obj/effect/turf_decal/trimline/purple/filled/line{
+ alpha = 160;
+ color = "#6a3182";
dir = 4
},
-/turf/open/floor/iron,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron/dark/small,
+/area/station/science/robotics/lab)
+"blN" = (
+/obj/structure/window/reinforced/spawner/directional/west,
+/obj/structure/window/reinforced/spawner/directional/east,
+/obj/structure/filingcabinet/filingcabinet,
+/turf/open/floor/glass/reinforced,
/area/station/command/bridge)
"blQ" = (
/turf/open/floor/plating/airless,
/area/station/science/ordnance/bomb)
"blR" = (
/obj/item/cigbutt,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer4,
/turf/open/floor/plating,
/area/station/maintenance/starboard)
"blS" = (
@@ -15632,15 +17507,14 @@
},
/obj/effect/mapping_helpers/airlock/access/any/science/general,
/obj/effect/mapping_helpers/airlock/unres,
-/turf/open/floor/iron/white,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/science/research)
"blY" = (
-/obj/structure/closet/emcloset,
-/obj/effect/turf_decal/stripes/line{
- dir = 9
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 5
},
-/turf/open/floor/iron,
-/area/station/cargo/storage)
+/turf/open/floor/iron/large,
+/area/station/hallway/secondary/entry)
"bmb" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
@@ -15652,21 +17526,20 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/firealarm/directional/east,
/turf/open/floor/iron/dark,
-/area/station/engineering/main)
+/area/station/engineering/supermatter/room)
"bmf" = (
-/obj/effect/turf_decal/tile/brown{
- dir = 1
- },
-/obj/effect/turf_decal/tile/brown{
- dir = 8
- },
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 4
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 4
},
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/brown/filled/warning{
+ dir = 8
+ },
+/turf/open/floor/iron/textured_edge{
+ dir = 4
+ },
/area/station/cargo/office)
"bmg" = (
/obj/machinery/door/airlock/mining/glass{
@@ -15679,22 +17552,29 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 4
},
-/turf/open/floor/iron,
+/obj/effect/turf_decal/tile/brown/full,
+/turf/open/floor/iron/large,
/area/station/cargo/storage)
"bmh" = (
/obj/structure/cable,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/brown/filled/warning,
+/turf/open/floor/iron/textured_edge{
+ dir = 1
+ },
/area/station/cargo/storage)
"bmi" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
dir = 8
},
/turf/open/floor/engine,
-/area/station/engineering/main)
+/area/station/engineering/supermatter/room)
"bmj" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/iron,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 8
+ },
+/turf/open/floor/iron/textured_corner,
/area/station/cargo/storage)
"bmk" = (
/obj/machinery/door/firedoor,
@@ -15702,7 +17582,7 @@
name = "Delivery Office"
},
/obj/effect/mapping_helpers/airlock/access/any/supply/general,
-/turf/open/floor/iron,
+/turf/open/floor/iron/large,
/area/station/cargo/sorting)
"bml" = (
/obj/structure/table,
@@ -15721,12 +17601,17 @@
},
/area/station/service/kitchen)
"bmn" = (
-/obj/effect/turf_decal/tile/brown{
- dir = 8
- },
/obj/machinery/status_display/evac/directional/west,
/obj/machinery/light/directional/west,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/brown/arrow_ccw{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/brown/mid_joiner{
+ dir = 8
+ },
+/turf/open/floor/iron/edge{
+ dir = 8
+ },
/area/station/hallway/primary/central)
"bmo" = (
/turf/closed/wall,
@@ -15739,7 +17624,7 @@
dir = 1
},
/turf/open/floor/iron/dark,
-/area/station/engineering/main)
+/area/station/engineering/supermatter/room)
"bmr" = (
/turf/closed/wall/r_wall,
/area/station/command/heads_quarters/hop)
@@ -15747,38 +17632,35 @@
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/effect/mapping_helpers/airlock/access/any/command/hop,
/obj/structure/disposalpipe/segment,
+/obj/effect/mapping_helpers/airlock/access/any/command/hop,
/obj/machinery/door/airlock/command{
name = "Head of Personnel"
},
-/turf/open/floor/wood,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/command/heads_quarters/hop)
"bmt" = (
-/obj/effect/turf_decal/tile/brown{
- dir = 1
- },
-/obj/effect/turf_decal/tile/brown{
- dir = 8
- },
/obj/structure/cable,
/obj/structure/disposalpipe/segment{
dir = 4
},
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/brown/filled/warning{
+ dir = 8
+ },
+/turf/open/floor/iron/textured_edge{
+ dir = 4
+ },
/area/station/cargo/office)
"bmv" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 10
- },
/obj/machinery/monkey_recycler,
/obj/machinery/firealarm/directional/north,
-/turf/open/floor/iron,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/science/xenobiology)
"bmw" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron/dark,
-/area/station/engineering/main)
+/obj/structure/cable,
+/turf/open/floor/plating,
+/area/station/engineering/supermatter/room)
"bmx" = (
/turf/closed/wall,
/area/station/command/heads_quarters/captain)
@@ -15787,67 +17669,84 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 5
},
-/turf/open/floor/wood,
+/obj/effect/turf_decal/siding/wood{
+ dir = 1
+ },
+/turf/open/floor/wood/tile,
/area/station/command/heads_quarters/captain)
"bmz" = (
/obj/structure/tank_holder/oxygen,
/turf/open/floor/plating,
/area/station/maintenance/starboard/fore)
"bmA" = (
-/obj/machinery/door/airlock{
+/obj/effect/mapping_helpers/airlock/access/any/command/captain,
+/obj/machinery/door/airlock/bathroom{
name = "Private Restroom"
},
-/obj/effect/mapping_helpers/airlock/access/any/command/captain,
-/turf/open/floor/iron/freezer,
+/turf/open/floor/iron/dark/textured_large,
/area/station/command/heads_quarters/captain)
"bmB" = (
/obj/machinery/light_switch{
pixel_y = 28
},
+/obj/effect/turf_decal/siding/wood{
+ dir = 5
+ },
/turf/open/floor/wood,
/area/station/command/heads_quarters/captain)
"bmC" = (
/obj/structure/sink/directional/west,
/obj/machinery/light/small/directional/north,
/obj/structure/mirror/directional/east,
+/obj/effect/turf_decal/siding/white/end{
+ dir = 1
+ },
/turf/open/floor/iron/freezer,
/area/station/command/heads_quarters/captain)
"bmE" = (
/obj/structure/disposalpipe/segment,
-/turf/open/floor/iron,
-/area/station/hallway/primary/central)
-"bmF" = (
-/obj/effect/turf_decal/tile/yellow{
- dir = 8
- },
-/obj/effect/turf_decal/tile/yellow{
+/obj/effect/turf_decal/trimline/brown/corner{
dir = 1
},
-/obj/structure/table/glass,
-/obj/item/assembly/igniter,
-/obj/item/assembly/igniter,
-/obj/item/assembly/igniter,
-/obj/item/assembly/igniter,
-/obj/item/assembly/timer{
- pixel_x = 3;
- pixel_y = -3
+/turf/open/floor/iron/edge{
+ dir = 8
},
-/obj/item/assembly/timer{
- pixel_x = 3;
- pixel_y = -3
+/area/station/hallway/primary/central)
+"bmF" = (
+/obj/machinery/requests_console{
+ department = "Chemistry";
+ pixel_x = -30
},
-/obj/item/assembly/timer{
- pixel_x = 3;
- pixel_y = -3
+/obj/structure/table/reinforced/rglass,
+/obj/item/grenade/chem_grenade{
+ pixel_x = -1;
+ pixel_y = 3
},
-/obj/item/assembly/timer{
- pixel_x = 3;
- pixel_y = -3
+/obj/item/screwdriver{
+ pixel_x = 0;
+ pixel_y = -4
},
-/obj/machinery/airalarm/directional/west,
-/obj/machinery/light/directional/west,
-/obj/item/hand_labeler,
-/turf/open/floor/iron/white,
+/obj/item/stack/cable_coil{
+ pixel_x = 0;
+ pixel_y = 9
+ },
+/obj/item/stack/cable_coil{
+ pixel_x = -7;
+ pixel_y = 11
+ },
+/obj/item/grenade/chem_grenade{
+ pixel_x = -8;
+ pixel_y = 6
+ },
+/obj/item/grenade/chem_grenade{
+ pixel_x = 0;
+ pixel_y = 9
+ },
+/obj/item/grenade/chem_grenade{
+ pixel_x = 7;
+ pixel_y = 5
+ },
+/turf/open/floor/iron/dark/small,
/area/station/medical/pharmacy)
"bmH" = (
/obj/machinery/door/airlock/mining/glass{
@@ -15858,45 +17757,30 @@
},
/obj/effect/mapping_helpers/airlock/access/any/supply/general,
/obj/structure/cable,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/tile/brown/full,
+/turf/open/floor/iron/large,
/area/station/cargo/storage)
"bmI" = (
-/obj/effect/turf_decal/tile/yellow,
-/obj/effect/turf_decal/tile/yellow{
- dir = 4
- },
-/obj/machinery/chem_dispenser,
-/obj/structure/window/reinforced/spawner/directional/north,
-/obj/effect/turf_decal/tile/yellow{
- dir = 8
- },
-/obj/effect/turf_decal/tile/yellow{
- dir = 1
- },
-/obj/machinery/light/directional/east,
-/turf/open/floor/iron/white,
+/obj/machinery/chem_heater/withbuffer,
+/turf/open/floor/iron/dark/small,
/area/station/medical/pharmacy)
"bmJ" = (
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
/obj/structure/sign/departments/chemistry/pharmacy/directional/west,
-/obj/item/kirbyplants/random,
/obj/machinery/light/directional/south,
-/turf/open/floor/iron/white,
+/obj/machinery/self_actualization_device,
+/obj/structure/marker_beacon/fuchsia,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/medical/medbay/lobby)
"bmK" = (
/obj/structure/table/reinforced,
-/obj/effect/spawner/random/medical/medkit,
+/obj/structure/window/reinforced/spawner/directional/west,
/obj/effect/spawner/random/medical/medkit{
pixel_x = 3;
pixel_y = 3
},
-/turf/open/floor/iron/white,
+/obj/effect/spawner/random/medical/medkit,
+/obj/structure/sign/warning/no_smoking/circle/directional/south,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/medical/medbay/lobby)
"bmL" = (
/turf/open/floor/iron/dark,
@@ -15911,16 +17795,28 @@
/turf/open/floor/iron/dark/textured,
/area/station/command/heads_quarters/rd)
"bmO" = (
-/obj/effect/turf_decal/delivery,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron,
-/area/station/cargo/storage)
+/obj/machinery/oven,
+/obj/effect/turf_decal/siding/wood/corner{
+ dir = 4
+ },
+/obj/structure/window/spawner/directional/south,
+/obj/structure/window/spawner/directional/west,
+/obj/item/clothing/suit/apron/chef{
+ name = "Jim Norton's Quebecois Coffee apron"
+ },
+/obj/item/clothing/head/soft/green{
+ color = "#00a62e";
+ desc = "It's a baseball hat in a tastefull green colour.";
+ name = "Jim Norton's Quebecois Coffee cap"
+ },
+/turf/open/floor/wood/tile,
+/area/station/hallway/secondary/entry)
"bmP" = (
/obj/structure/cable,
/obj/structure/disposalpipe/segment{
dir = 4
},
-/turf/open/floor/iron,
+/turf/open/floor/iron/large,
/area/station/cargo/office)
"bmQ" = (
/obj/structure/table,
@@ -15928,17 +17824,22 @@
fax_name = "Cargo Office";
name = "Cargo Office Fax Machine"
},
-/turf/open/floor/iron,
+/obj/effect/turf_decal/bot,
+/turf/open/floor/iron/dark/textured_large,
/area/station/cargo/office)
"bmR" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/machinery/door/poddoor/preopen{
- id = "cmoprivacy";
- name = "CMO Office"
+/obj/effect/turf_decal/trimline/blue/arrow_ccw{
+ dir = 4;
+ alpha = 200
},
-/obj/structure/cable,
-/turf/open/floor/plating,
-/area/station/command/heads_quarters/cmo)
+/obj/effect/turf_decal/trimline/blue/mid_joiner{
+ alpha = 200;
+ dir = 4
+ },
+/turf/open/floor/iron/edge{
+ dir = 4
+ },
+/area/station/hallway/primary/central)
"bmS" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -15952,19 +17853,39 @@
dir = 4
},
/obj/effect/turf_decal/trimline/blue/filled/line{
+ alpha = 160;
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/white/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/blue/filled/mid_joiner{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/blue/filled/mid_joiner{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/white/mid_joiner{
+ dir = 1
+ },
+/turf/open/floor/iron/white/smooth_edge{
dir = 1
},
-/turf/open/floor/iron/white,
/area/station/medical/medbay/central)
"bmW" = (
-/obj/effect/turf_decal/trimline/blue/filled/corner,
-/obj/effect/turf_decal/trimline/blue/filled/line{
- dir = 1
- },
/obj/structure/disposalpipe/segment{
dir = 4
},
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/trimline/blue/filled/warning{
+ alpha = 160;
+ dir = 5
+ },
+/obj/effect/turf_decal/trimline/white/warning{
+ dir = 5
+ },
+/turf/open/floor/iron/white/smooth_corner{
+ dir = 8
+ },
/area/station/medical/medbay/central)
"bmX" = (
/obj/machinery/button/door{
@@ -16003,7 +17924,7 @@
/area/station/security/prison/safe)
"bnb" = (
/obj/machinery/recharge_station,
-/turf/open/floor/iron,
+/turf/open/floor/iron/dark/textured_large,
/area/station/science/robotics/mechbay)
"bnc" = (
/turf/closed/wall/r_wall,
@@ -16031,13 +17952,6 @@
/obj/structure/disposalpipe/trunk{
dir = 8
},
-/obj/machinery/button/door{
- id = "kitchen";
- name = "Kitchen Shutters Control";
- pixel_x = -1;
- pixel_y = -24;
- req_access = list("kitchen")
- },
/turf/open/floor/iron/cafeteria,
/area/station/service/kitchen)
"bnh" = (
@@ -16051,38 +17965,28 @@
/turf/open/floor/iron/cafeteria,
/area/station/service/kitchen)
"bni" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 1
+/obj/effect/turf_decal/siding/dark{
+ dir = 4
},
-/obj/structure/table,
-/obj/item/storage/toolbox/electrical{
- pixel_x = 1;
- pixel_y = 6
+/obj/effect/turf_decal/siding/dark{
+ dir = 8
},
-/obj/item/clothing/head/utility/welding{
- pixel_x = -3;
- pixel_y = 5
+/obj/effect/turf_decal/trimline/purple/filled/line{
+ alpha = 160;
+ color = "#6a3182";
+ dir = 4
},
-/obj/item/clothing/glasses/welding,
-/obj/item/multitool{
- pixel_x = 3
- },
-/turf/open/floor/iron,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
+/turf/open/floor/iron/dark/small,
/area/station/science/robotics/lab)
"bnj" = (
-/obj/structure/table,
-/obj/item/stack/sheet/plasteel{
- amount = 10
- },
-/obj/item/stack/cable_coil,
-/obj/item/assembly/flash/handheld,
-/obj/item/assembly/flash/handheld,
-/obj/item/assembly/flash/handheld,
-/obj/item/assembly/flash/handheld,
-/obj/item/assembly/flash/handheld,
-/obj/item/assembly/flash/handheld,
/obj/machinery/firealarm/directional/east,
-/turf/open/floor/iron,
+/obj/machinery/computer/mechpad{
+ dir = 8
+ },
+/obj/structure/railing,
+/obj/machinery/light/directional/east,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/science/robotics/lab)
"bnm" = (
/obj/effect/spawner/structure/window/reinforced,
@@ -16099,7 +18003,8 @@
/obj/machinery/porta_turret/ai{
dir = 4
},
-/turf/open/floor/iron/dark,
+/obj/effect/turf_decal/tile/dark_green/full,
+/turf/open/floor/iron/dark/textured_large,
/area/station/ai_monitored/turret_protected/ai_upload)
"bns" = (
/obj/effect/spawner/structure/window/reinforced,
@@ -16119,7 +18024,8 @@
/obj/machinery/porta_turret/ai{
dir = 8
},
-/turf/open/floor/iron/dark,
+/obj/effect/turf_decal/tile/dark_red/full,
+/turf/open/floor/iron/dark/textured_large,
/area/station/ai_monitored/turret_protected/ai_upload)
"bnu" = (
/obj/structure/cable,
@@ -16141,9 +18047,13 @@
/turf/open/space/basic,
/area/space)
"bnw" = (
-/obj/effect/turf_decal/stripes/line{
+/obj/effect/turf_decal/trimline/brown/filled/end{
dir = 8
},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer4,
/turf/open/floor/iron,
/area/station/cargo/storage)
"bny" = (
@@ -16155,13 +18065,21 @@
dir = 4
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/brown/filled/corner{
+ dir = 4
+ },
+/turf/open/floor/iron/textured_corner{
+ dir = 4
+ },
/area/station/cargo/office)
"bnz" = (
/obj/effect/landmark/start/cargo_technician,
/obj/structure/chair/office{
dir = 4
},
+/obj/effect/turf_decal/trimline/brown/filled/end{
+ dir = 4
+ },
/turf/open/floor/iron,
/area/station/cargo/office)
"bnA" = (
@@ -16169,29 +18087,37 @@
dir = 10
},
/obj/structure/cable,
+/obj/effect/turf_decal/trimline/brown/filled/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/brown/filled/corner,
/turf/open/floor/iron,
/area/station/cargo/office)
"bnB" = (
-/obj/effect/turf_decal/stripes/line,
/obj/machinery/chem_master,
-/turf/open/floor/iron,
+/obj/machinery/airalarm/directional/north,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/science/xenobiology)
"bnD" = (
-/obj/effect/turf_decal/tile/yellow{
- dir = 4
- },
-/obj/effect/turf_decal/tile/yellow{
+/obj/structure/cable,
+/obj/machinery/power/apc/auto_name/directional/north,
+/obj/structure/table/reinforced/rglass,
+/obj/effect/turf_decal/siding/yellow{
dir = 1
},
-/obj/machinery/camera/directional/north{
- c_tag = "Pharmacy";
- network = list("ss13","medbay")
+/obj/item/storage/box/beakers{
+ pixel_x = 8;
+ pixel_y = 8
},
-/obj/structure/closet/secure_closet/chemical,
-/obj/item/radio/headset/headset_med,
-/obj/machinery/firealarm/directional/north,
-/obj/item/clothing/head/helmet/space/plasmaman/chemist,
-/turf/open/floor/iron/white,
+/obj/item/reagent_containers/cup/beaker/large{
+ pixel_x = -7;
+ pixel_y = 9
+ },
+/obj/item/reagent_containers/dropper{
+ pixel_x = 0;
+ pixel_y = -1
+ },
+/turf/open/floor/iron/dark/small,
/area/station/medical/pharmacy)
"bnE" = (
/obj/structure/cable,
@@ -16201,60 +18127,92 @@
dir = 1
},
/obj/effect/mapping_helpers/mail_sorting/supply/qm_office,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/brown/filled/line{
+ dir = 4
+ },
+/turf/open/floor/iron/textured_edge{
+ dir = 8
+ },
/area/station/cargo/office)
"bnG" = (
/obj/item/paper_bin{
- pixel_x = -3;
- pixel_y = 7
+ pixel_x = -8;
+ pixel_y = 4
+ },
+/obj/item/clipboard{
+ pixel_x = 7;
+ pixel_y = 4
},
-/obj/item/clipboard,
-/obj/item/pen/red,
/obj/structure/table,
-/obj/item/stamp/denied{
- pixel_x = 4;
- pixel_y = -2
- },
-/obj/item/stamp{
- pixel_x = -3;
+/obj/effect/turf_decal/bot,
+/obj/item/paper{
+ pixel_x = 7;
pixel_y = 3
},
-/turf/open/floor/iron,
+/obj/item/pen/red{
+ pixel_x = 6;
+ pixel_y = 4
+ },
+/obj/item/stamp{
+ pixel_x = -9;
+ pixel_y = 11
+ },
+/obj/item/stamp/denied{
+ pixel_x = -9;
+ pixel_y = 5
+ },
+/turf/open/floor/iron/dark/textured_large,
/area/station/cargo/office)
"bnI" = (
/obj/machinery/computer/cargo/request,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/bot,
+/turf/open/floor/iron/dark/textured_large,
/area/station/cargo/office)
"bnJ" = (
-/obj/structure/chair{
+/obj/machinery/firealarm/directional/north,
+/obj/effect/turf_decal/trimline/brown/filled/line{
+ dir = 5
+ },
+/obj/structure/chair/sofa/bench/tram/right{
dir = 8
},
-/obj/machinery/firealarm/directional/north,
/turf/open/floor/iron,
/area/station/cargo/office)
"bnK" = (
-/obj/effect/spawner/structure/window,
-/turf/open/floor/plating,
+/obj/structure/window/reinforced/spawner/directional/east,
+/obj/structure/window/reinforced/spawner/directional/west,
+/obj/structure/window/reinforced/spawner/directional/south,
+/obj/structure/flora/grass/jungle/a,
+/obj/structure/flora/grass/jungle/b/style_4{
+ pixel_x = -1;
+ pixel_y = 15
+ },
+/obj/structure/flora/bush/flowers_yw/style_2,
+/turf/open/floor/grass,
/area/station/cargo/office)
"bnL" = (
-/obj/effect/turf_decal/tile/brown{
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
+/obj/effect/turf_decal/trimline/brown/filled/line{
dir = 1
},
-/obj/effect/turf_decal/tile/brown{
- dir = 4
+/obj/effect/turf_decal/trimline/dark/line{
+ dir = 1
},
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
-/turf/open/floor/iron,
+/turf/open/floor/iron/textured_edge,
/area/station/cargo/sorting)
"bnN" = (
-/obj/effect/turf_decal/tile/red,
/obj/machinery/bluespace_vendor/directional/east,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/green/corner{
+ dir = 4
+ },
+/turf/open/floor/iron/edge{
+ dir = 4
+ },
/area/station/hallway/primary/central)
"bnO" = (
-/obj/structure/filingcabinet/chestdrawer,
/obj/machinery/newscaster/directional/north,
-/turf/open/floor/iron,
+/obj/structure/filingcabinet/chestdrawer,
+/turf/open/floor/wood/large,
/area/station/command/heads_quarters/hop)
"bnP" = (
/obj/machinery/button/flasher{
@@ -16280,26 +18238,27 @@
pixel_x = -4;
pixel_y = 36
},
-/obj/machinery/pdapainter,
-/obj/effect/turf_decal/tile/blue{
- dir = 1
+/obj/item/toy/figure/hop{
+ pixel_x = -5;
+ pixel_y = 11
},
-/obj/effect/turf_decal/tile/blue{
+/obj/machinery/pdapainter,
+/obj/item/reagent_containers/cup/glass/mug/nanotrasen{
+ pixel_y = 4;
+ pixel_x = 6
+ },
+/obj/effect/turf_decal/siding/wood{
dir = 4
},
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
-/turf/open/floor/iron,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/command/heads_quarters/hop)
"bnR" = (
-/obj/machinery/disposal/bin,
/obj/structure/disposalpipe/trunk,
+/obj/machinery/disposal/bin,
/obj/machinery/computer/security/telescreen/vault/directional/north,
-/turf/open/floor/iron,
+/turf/open/floor/wood,
/area/station/command/heads_quarters/hop)
"bnT" = (
-/obj/effect/turf_decal/stripes/line,
/obj/structure/table/glass,
/obj/item/stack/sheet/mineral/plasma/thirty{
pixel_y = 10
@@ -16313,111 +18272,109 @@
pixel_x = 4;
pixel_y = -5
},
-/turf/open/floor/iron,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/science/xenobiology)
"bnU" = (
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/iron/dark,
+/obj/effect/turf_decal/siding/wideplating_new/dark/end,
+/obj/effect/turf_decal/siding/dark/end,
+/turf/open/floor/circuit,
/area/station/ai_monitored/command/nuke_storage)
"bnV" = (
-/obj/effect/turf_decal/tile/neutral,
/obj/machinery/light/directional/south,
-/turf/open/floor/iron/dark,
+/turf/open/floor/iron/dark/textured_large,
/area/station/ai_monitored/command/nuke_storage)
"bnX" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
- dir = 5
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/wood,
+/obj/effect/turf_decal/siding/wood,
+/turf/open/floor/wood/large,
/area/station/command/heads_quarters/captain)
"bnY" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/effect/turf_decal/siding/wood{
dir = 8
},
+/obj/effect/turf_decal/siding/wood/corner,
/turf/open/floor/wood,
/area/station/command/heads_quarters/captain)
"bnZ" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
- dir = 8
+/obj/effect/turf_decal/siding/wood{
+ dir = 6
},
-/turf/open/floor/wood,
+/turf/open/floor/wood/parquet,
/area/station/command/heads_quarters/captain)
"boa" = (
/obj/structure/toilet{
dir = 4
},
+/obj/effect/turf_decal/siding/white/end,
/turf/open/floor/iron/freezer,
/area/station/command/heads_quarters/captain)
"bob" = (
-/obj/effect/turf_decal/tile/yellow,
-/obj/effect/turf_decal/tile/yellow{
- dir = 8
+/obj/structure/table/reinforced/rglass,
+/obj/item/assembly/igniter{
+ pixel_x = -8;
+ pixel_y = 13
},
-/obj/effect/turf_decal/tile/yellow{
- dir = 1
+/obj/item/assembly/igniter{
+ pixel_x = 4;
+ pixel_y = 15
},
-/obj/structure/table/glass,
-/obj/item/stack/cable_coil,
-/obj/item/stack/cable_coil,
-/obj/item/grenade/chem_grenade,
-/obj/item/grenade/chem_grenade,
-/obj/item/grenade/chem_grenade,
-/obj/item/grenade/chem_grenade,
-/obj/item/screwdriver{
- pixel_x = 2;
- pixel_y = 18
+/obj/item/assembly/igniter{
+ pixel_x = -7;
+ pixel_y = 7
},
-/obj/machinery/light_switch{
- pixel_x = -23
+/obj/item/assembly/igniter{
+ pixel_x = 5;
+ pixel_y = 9
},
-/turf/open/floor/iron/white,
+/obj/item/assembly/timer{
+ pixel_x = -8;
+ pixel_y = 2
+ },
+/obj/item/assembly/timer{
+ pixel_x = 5;
+ pixel_y = 4
+ },
+/obj/item/assembly/timer{
+ pixel_x = -4;
+ pixel_y = -3
+ },
+/obj/item/assembly/timer{
+ pixel_x = 8;
+ pixel_y = -2
+ },
+/obj/machinery/airalarm/directional/west,
+/turf/open/floor/iron/dark/small,
/area/station/medical/pharmacy)
"boc" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron/white,
-/area/station/medical/medbay/central)
-"bod" = (
-/obj/effect/turf_decal/tile/yellow,
-/obj/effect/turf_decal/tile/yellow{
- dir = 8
- },
-/obj/effect/turf_decal/tile/yellow{
- dir = 4
- },
-/obj/machinery/chem_master,
-/obj/effect/turf_decal/tile/yellow{
+/obj/effect/turf_decal/trimline/blue/filled/warning{
+ alpha = 160;
dir = 1
},
+/obj/effect/turf_decal/trimline/white/warning{
+ dir = 1
+ },
+/turf/open/floor/iron/white/smooth_edge{
+ dir = 1
+ },
+/area/station/medical/medbay/central)
+"bod" = (
+/obj/machinery/chem_dispenser,
/obj/machinery/button/door{
id = "pharmacy_shutters2";
name = "Pharmacy Shutter Control";
pixel_x = 24;
- pixel_y = -6;
+ pixel_y = -13;
req_access = list("pharmacy")
},
-/turf/open/floor/iron/white,
+/obj/machinery/firealarm/directional/east,
+/turf/open/floor/iron/dark/small,
/area/station/medical/pharmacy)
"boe" = (
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/medical/glass{
id_tag = "MedbayFoyer";
@@ -16425,20 +18382,51 @@
},
/obj/effect/mapping_helpers/airlock/access/any/medical/general,
/obj/effect/mapping_helpers/airlock/unres,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/tile/blue/full,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/cable,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/medical/medbay/central)
"bof" = (
/turf/closed/wall,
/area/station/medical/medbay/central)
"bog" = (
-/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/plating,
+/obj/effect/turf_decal/siding{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/yellow/filled/warning{
+ alpha = 200;
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/white/warning{
+ dir = 8;
+ alpha = 200
+ },
+/turf/open/floor/iron/white/smooth_edge{
+ dir = 8
+ },
/area/station/medical/medbay/lobby)
"boh" = (
/obj/effect/turf_decal/trimline/blue/filled/line{
+ alpha = 160;
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/white/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/blue/filled/mid_joiner{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/blue/filled/mid_joiner{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/white/mid_joiner{
+ dir = 1
+ },
+/turf/open/floor/iron/white/smooth_edge{
dir = 1
},
-/turf/open/floor/iron/white,
/area/station/medical/medbay/central)
"boi" = (
/obj/structure/cable,
@@ -16451,19 +18439,20 @@
},
/obj/machinery/airalarm/directional/east,
/obj/machinery/light/directional/south,
-/turf/open/floor/iron/white,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/medical/medbay/lobby)
"bok" = (
/obj/structure/cable,
-/obj/effect/turf_decal/trimline/blue/filled/corner{
- dir = 4
- },
-/obj/effect/turf_decal/trimline/blue/filled/corner{
- dir = 1
- },
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/trimline/blue/filled/warning{
+ alpha = 160;
+ dir = 9
+ },
+/obj/effect/turf_decal/trimline/white/warning{
+ dir = 9
+ },
+/turf/open/floor/iron/white/smooth_corner,
/area/station/medical/medbay/central)
"boq" = (
/obj/effect/turf_decal/stripes/line{
@@ -16473,12 +18462,23 @@
/area/station/science/ordnance/bomb)
"bor" = (
/obj/structure/bodycontainer/morgue{
- dir = 2
+ dir = 4
},
-/turf/open/floor/iron/dark,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/science/robotics/lab)
"bou" = (
-/turf/open/floor/iron,
+/obj/effect/turf_decal/siding/dark,
+/obj/effect/turf_decal/siding/dark{
+ dir = 1
+ },
+/obj/structure/railing{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/purple/filled/line{
+ alpha = 160;
+ color = "#6a3182"
+ },
+/turf/open/floor/iron/dark/small,
/area/station/science/robotics/lab)
"bow" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -16495,16 +18495,7 @@
},
/obj/effect/turf_decal/bot,
/obj/structure/noticeboard/directional/north,
-/turf/open/floor/iron,
-/area/station/science/research)
-"boz" = (
-/obj/machinery/door/firedoor/heavy,
-/obj/machinery/door/poddoor/preopen{
- id = "Biohazard";
- name = "Biohazard Containment Door"
- },
-/obj/effect/turf_decal/bot,
-/turf/open/floor/iron,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/science/research)
"boB" = (
/turf/closed/wall,
@@ -16518,23 +18509,56 @@
/turf/open/floor/iron/dark,
/area/station/ai_monitored/turret_protected/ai)
"boD" = (
-/obj/structure/table,
-/obj/machinery/light/directional/north,
-/obj/effect/spawner/surgery_tray,
-/turf/open/floor/iron/dark,
+/obj/structure/table/glass,
+/obj/item/clipboard{
+ pixel_x = -1;
+ pixel_y = 5
+ },
+/obj/item/paper{
+ pixel_x = -1;
+ pixel_y = 4
+ },
+/obj/item/pen{
+ pixel_x = -1;
+ pixel_y = 3
+ },
+/obj/machinery/vending/wallmed/directional/north,
+/obj/effect/turf_decal/trimline/purple/filled/line{
+ alpha = 160;
+ color = "#6a3182";
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 1
+ },
+/turf/open/floor/iron/dark/small,
/area/station/science/robotics/lab)
"boE" = (
-/obj/structure/table,
-/obj/item/storage/box/bodybags,
-/turf/open/floor/iron/dark,
+/obj/structure/sink/directional/south,
+/obj/effect/turf_decal/siding/dark{
+ dir = 9
+ },
+/obj/effect/turf_decal/trimline/purple/filled/line{
+ alpha = 160;
+ color = "#6a3182";
+ dir = 9
+ },
+/turf/open/floor/iron/dark/small,
/area/station/science/robotics/lab)
"boG" = (
-/obj/structure/table,
/obj/structure/window/reinforced/spawner/directional/east,
-/obj/item/mmi,
-/obj/item/mmi,
-/obj/item/mmi,
-/turf/open/floor/iron/dark,
+/obj/structure/table/glass,
+/obj/effect/turf_decal/siding/dark{
+ dir = 5
+ },
+/obj/effect/turf_decal/trimline/purple/filled/line{
+ alpha = 160;
+ color = "#6a3182";
+ dir = 5
+ },
+/obj/item/storage/medkit/robotic_repair/preemo/stocked,
+/obj/item/clothing/gloves/latex,
+/turf/open/floor/iron/dark/small,
/area/station/science/robotics/lab)
"boH" = (
/obj/structure/disposalpipe/segment{
@@ -16547,6 +18571,7 @@
dir = 5
},
/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer5,
/turf/open/floor/plating,
/area/station/maintenance/starboard)
"boI" = (
@@ -16558,48 +18583,81 @@
/obj/machinery/conveyor_switch/oneway{
id = "QMLoad2"
},
-/obj/effect/turf_decal/stripes/line{
- dir = 8
+/obj/effect/turf_decal/trimline/brown/filled/line{
+ dir = 10
},
/turf/open/floor/iron,
/area/station/cargo/storage)
"boK" = (
/obj/effect/turf_decal/bot,
-/turf/open/floor/iron,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer5,
+/turf/open/floor/iron/large,
/area/station/cargo/storage)
"boL" = (
-/obj/structure/table,
-/obj/item/storage/medkit/robotic_repair/preemo/stocked,
-/obj/item/clothing/gloves/latex,
-/obj/item/razor,
-/turf/open/floor/iron/dark,
+/obj/effect/turf_decal/siding/dark{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/purple/filled/line{
+ alpha = 160;
+ color = "#6a3182";
+ dir = 1
+ },
+/obj/machinery/light/directional/north,
+/obj/machinery/smartfridge/organ,
+/obj/structure/marker_beacon/purple,
+/turf/open/floor/iron/dark/small,
/area/station/science/robotics/lab)
"boM" = (
-/turf/open/floor/iron/white/corner,
+/obj/effect/turf_decal/trimline/dark/filled/line{
+ alpha = 160;
+ dir = 9
+ },
+/obj/effect/turf_decal/trimline/dark/filled/mid_joiner{
+ dir = 8;
+ alpha = 160
+ },
+/obj/effect/turf_decal/trimline/dark/filled/mid_joiner{
+ dir = 1;
+ alpha = 160
+ },
+/obj/effect/turf_decal/trimline/purple/line{
+ alpha = 200;
+ dir = 9
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 9
+ },
+/turf/open/floor/iron/white/smooth_corner,
/area/station/science/research)
"boN" = (
-/obj/effect/turf_decal/tile/brown{
- dir = 1
+/obj/effect/turf_decal/trimline/brown/filled/line{
+ dir = 10
},
/turf/open/floor/iron,
/area/station/cargo/office)
"boP" = (
-/obj/effect/turf_decal/stripes/line,
/obj/structure/table/glass,
/obj/machinery/reagentgrinder{
desc = "Used to grind things up into raw materials and liquids.";
pixel_y = 5
},
-/obj/machinery/airalarm/directional/north,
-/turf/open/floor/iron,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/science/xenobiology)
"boR" = (
-/obj/effect/turf_decal/delivery,
-/turf/open/floor/iron,
-/area/station/cargo/office)
+/obj/structure/chair/stool/bar/directional/north,
+/obj/effect/turf_decal/siding/wood{
+ dir = 9
+ },
+/turf/open/floor/wood,
+/area/station/hallway/primary/starboard)
"boT" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/brown/filled/corner{
+ dir = 1
+ },
+/turf/open/floor/iron/textured_corner{
+ dir = 1
+ },
/area/station/cargo/office)
"boU" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
@@ -16608,22 +18666,38 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 4
},
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/brown/filled/corner,
+/turf/open/floor/iron/textured_edge{
+ dir = 8
+ },
/area/station/cargo/office)
"boV" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 8
},
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/blue/line{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/blue/mid_joiner{
+ dir = 4
+ },
+/turf/open/floor/iron/edge{
+ dir = 4
+ },
/area/station/hallway/primary/central)
"boW" = (
/obj/structure/disposalpipe/segment{
dir = 6
},
-/obj/effect/turf_decal/tile/brown{
+/obj/effect/turf_decal/trimline/brown/arrow_ccw{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/brown/mid_joiner{
+ dir = 8
+ },
+/turf/open/floor/iron/edge{
dir = 8
},
-/turf/open/floor/iron,
/area/station/hallway/primary/central)
"boX" = (
/obj/structure/disposalpipe/segment{
@@ -16636,36 +18710,34 @@
/obj/effect/turf_decal/loading_area{
dir = 8
},
-/turf/open/floor/iron,
+/turf/open/floor/iron/large,
/area/station/hallway/primary/central)
"boY" = (
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/effect/turf_decal/tile/red,
-/obj/effect/turf_decal/tile/red{
+/turf/open/floor/iron/edge{
dir = 4
},
-/turf/open/floor/iron,
/area/station/hallway/primary/central)
"bpa" = (
/obj/structure/disposalpipe/segment{
dir = 4
},
/obj/effect/turf_decal/delivery,
-/turf/open/floor/iron,
+/turf/open/floor/iron/large,
/area/station/hallway/primary/central)
"bpb" = (
/obj/structure/disposalpipe/segment{
dir = 4
},
-/turf/open/floor/carpet,
+/turf/open/floor/wood,
/area/station/command/heads_quarters/hop)
"bpd" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 4
},
-/turf/open/floor/carpet,
+/turf/open/floor/wood,
/area/station/command/heads_quarters/hop)
"bpe" = (
/obj/structure/disposalpipe/segment{
@@ -16674,7 +18746,7 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 4
},
-/turf/open/floor/carpet,
+/turf/open/floor/wood/large,
/area/station/command/heads_quarters/hop)
"bpg" = (
/obj/effect/turf_decal/tile/blue{
@@ -16694,12 +18766,14 @@
/turf/closed/wall/r_wall,
/area/station/ai_monitored/command/nuke_storage)
"bpi" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/dirt,
/obj/structure/disposalpipe/segment{
dir = 4
},
-/turf/open/floor/iron/dark,
+/obj/effect/turf_decal/trimline/dark/filled/end{
+ dir = 8
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/iron/dark/small,
/area/station/medical/morgue)
"bpj" = (
/obj/machinery/camera/directional/south{
@@ -16708,33 +18782,30 @@
/obj/structure/sign/painting/parting{
pixel_y = -32
},
-/obj/effect/turf_decal/stripes/line{
- dir = 9
- },
/obj/item/bedsheet/captain,
/obj/structure/closet/secure_closet/captains,
/obj/item/clothing/head/helmet/space/plasmaman/captain,
/obj/item/clothing/under/plasmaman/captain,
-/turf/open/floor/iron/dark,
+/obj/effect/turf_decal/bot_blue,
+/obj/effect/turf_decal/box/blue,
+/turf/open/floor/iron/dark/textured_large,
/area/station/command/heads_quarters/captain)
"bpk" = (
-/obj/effect/turf_decal/siding/wood{
- dir = 8
- },
-/turf/open/floor/wood,
+/obj/effect/turf_decal/siding/wood/end,
+/turf/open/floor/wood/parquet,
/area/station/command/heads_quarters/captain)
"bpl" = (
/obj/machinery/suit_storage_unit/captain,
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/turf/open/floor/iron/dark,
+/obj/effect/turf_decal/bot_blue,
+/obj/effect/turf_decal/box/blue,
+/turf/open/floor/iron/dark/textured_large,
/area/station/command/heads_quarters/captain)
"bpm" = (
/obj/machinery/shower/directional/north,
/obj/item/soap/deluxe,
/obj/item/bikehorn/rubberducky,
/obj/structure/curtain,
+/obj/effect/turf_decal/siding/white/end,
/turf/open/floor/iron/freezer,
/area/station/command/heads_quarters/captain)
"bpn" = (
@@ -16742,6 +18813,7 @@
/obj/structure/chair/sofa/bench{
pixel_y = 8
},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/dark/side{
dir = 1
},
@@ -16757,7 +18829,11 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 8
},
-/turf/open/floor/iron/dark,
+/obj/effect/turf_decal/trimline/dark/filled/line,
+/obj/effect/turf_decal/trimline/dark/filled/line{
+ dir = 1
+ },
+/turf/open/floor/iron/dark/small,
/area/station/medical/morgue)
"bpr" = (
/obj/machinery/door/airlock/external{
@@ -16770,14 +18846,15 @@
/turf/open/floor/plating,
/area/station/cargo/miningdock)
"bps" = (
-/obj/machinery/conveyor{
- dir = 4;
- id = "QMLoad2"
+/obj/effect/turf_decal/trimline/brown/filled/line{
+ dir = 8
},
-/obj/effect/turf_decal/stripes/line{
- dir = 1
+/obj/effect/turf_decal/loading_area{
+ dir = 4
+ },
+/turf/open/floor/iron/textured_edge{
+ dir = 4
},
-/turf/open/floor/iron,
/area/station/cargo/storage)
"bpt" = (
/obj/effect/spawner/structure/window/reinforced,
@@ -16788,23 +18865,19 @@
/turf/open/floor/plating,
/area/station/medical/pharmacy)
"bpz" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
- dir = 4
+/obj/docking_port/stationary/escape_pod{
+ dir = 8
},
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron,
-/area/station/cargo/storage)
+/turf/open/floor/plating/airless,
+/area/station/hallway/secondary/entry)
"bpA" = (
/obj/machinery/computer/cargo{
dir = 1
},
-/turf/open/floor/iron,
+/obj/effect/turf_decal/delivery,
+/turf/open/floor/iron/dark/textured_large,
/area/station/cargo/office)
"bpD" = (
-/obj/effect/turf_decal/trimline/yellow/filled/corner{
- dir = 4
- },
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 8
@@ -16812,15 +18885,20 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 8
},
-/obj/effect/turf_decal/trimline/yellow/filled/corner{
+/obj/structure/disposalpipe/segment,
+/obj/effect/turf_decal/trimline/yellow/filled/warning{
+ alpha = 120;
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/blue/warning{
+ dir = 1;
+ alpha = 200
+ },
+/turf/open/floor/iron/white/smooth_edge{
dir = 1
},
-/turf/open/floor/iron/white,
/area/station/medical/medbay/central)
"bpF" = (
-/obj/effect/turf_decal/trimline/yellow/filled/line{
- dir = 1
- },
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 4
@@ -16828,7 +18906,20 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 8
},
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/trimline/yellow/filled/warning{
+ alpha = 120;
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/blue/warning{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/blue/warning{
+ dir = 1;
+ alpha = 200
+ },
+/turf/open/floor/iron/white/smooth_edge{
+ dir = 1
+ },
/area/station/medical/medbay/central)
"bpI" = (
/turf/closed/wall,
@@ -16837,10 +18928,6 @@
/turf/closed/wall,
/area/station/command/heads_quarters/hos)
"bpM" = (
-/obj/effect/turf_decal/trimline/yellow/filled/line{
- dir = 1
- },
-/obj/structure/disposalpipe/segment,
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 4
@@ -16848,7 +18935,20 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 8
},
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/trimline/yellow/filled/line{
+ dir = 1;
+ alpha = 120
+ },
+/obj/effect/turf_decal/trimline/blue/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/blue/line{
+ alpha = 200;
+ dir = 1
+ },
+/turf/open/floor/iron/white/smooth_edge{
+ dir = 1
+ },
/area/station/medical/medbay/central)
"bpN" = (
/obj/structure/cable,
@@ -16856,7 +18956,11 @@
dir = 8
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/trimline/blue{
+ alpha = 200
+ },
+/obj/structure/marker_beacon/cerulean,
+/turf/open/floor/iron/white/smooth_large,
/area/station/medical/medbay/central)
"bpP" = (
/obj/structure/cable,
@@ -16865,10 +18969,11 @@
/turf/open/floor/iron/white,
/area/station/medical/medbay/central)
"bpR" = (
-/obj/structure/disposalpipe/segment{
- dir = 9
+/obj/structure/disposalpipe/trunk{
+ dir = 1
},
-/turf/open/floor/iron/white,
+/obj/machinery/disposal/bin,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/science/robotics/lab)
"bpS" = (
/obj/structure/chair/sofa/bench/right{
@@ -16877,17 +18982,33 @@
/turf/open/floor/iron/dark/side,
/area/station/hallway/secondary/exit)
"bpT" = (
-/obj/structure/table,
-/obj/item/storage/belt/utility,
-/obj/item/stack/sheet/iron/fifty,
-/obj/item/stack/sheet/iron/fifty,
-/obj/item/stack/sheet/iron/fifty,
-/obj/item/stack/sheet/glass/fifty,
-/turf/open/floor/iron,
+/obj/machinery/cell_charger,
+/obj/structure/table/glass,
+/obj/item/stock_parts/power_store/cell/high{
+ pixel_x = 1;
+ pixel_y = 9
+ },
+/obj/effect/turf_decal/trimline/dark/filled/line,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/science/robotics/lab)
+"bpW" = (
+/obj/machinery/door/airlock/mining/glass{
+ name = "Mini Warehouse"
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 6
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/turf/open/floor/iron/dark,
+/area/station/maintenance/port/aft)
"bpX" = (
-/turf/open/floor/iron/white/side,
-/area/station/science/research)
+/obj/structure/chair/sofa/bench{
+ dir = 1
+ },
+/turf/open/floor/iron/dark/side,
+/area/station/hallway/secondary/entry)
"bqb" = (
/obj/machinery/light/small/directional/north,
/turf/open/floor/catwalk_floor/iron_dark,
@@ -16900,13 +19021,9 @@
/turf/open/floor/plating,
/area/station/security/prison)
"bqd" = (
-/obj/effect/turf_decal/stripes/line,
-/obj/machinery/conveyor{
- dir = 4;
- id = "robo2"
- },
-/turf/open/floor/iron,
-/area/station/science/robotics/lab)
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/iron/dark,
+/area/station/engineering/supermatter/room)
"bqg" = (
/obj/structure/chair/stool/directional/west,
/obj/effect/mapping_helpers/burnt_floor,
@@ -16946,72 +19063,75 @@
pixel_x = -27
},
/obj/machinery/autolathe,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/bot,
+/turf/open/floor/iron/dark/textured_large,
/area/station/cargo/office)
"bqp" = (
/obj/structure/window/reinforced/spawner/directional/north,
/obj/structure/table/reinforced,
/obj/item/dest_tagger,
/obj/item/dest_tagger,
-/obj/effect/turf_decal/tile/brown{
- dir = 1
- },
-/obj/effect/turf_decal/tile/brown{
- dir = 4
- },
-/turf/open/floor/iron,
+/turf/open/floor/iron/dark/textured_large,
/area/station/cargo/sorting)
"bqq" = (
/obj/structure/cable,
-/turf/open/floor/carpet,
+/turf/open/floor/wood/large,
/area/station/command/heads_quarters/hop)
"bqs" = (
-/obj/effect/turf_decal/bot,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/brown/filled/line{
+ dir = 4
+ },
+/turf/open/floor/iron/textured_edge{
+ dir = 8
+ },
/area/station/cargo/office)
"bqu" = (
/obj/machinery/door/firedoor,
+/obj/effect/turf_decal/trimline/brown/line{
+ dir = 1
+ },
/turf/open/floor/iron,
/area/station/cargo/office)
"bqw" = (
-/obj/effect/turf_decal/tile/red{
+/obj/effect/turf_decal/trimline/green/corner,
+/turf/open/floor/iron/edge{
dir = 4
},
-/turf/open/floor/iron,
/area/station/hallway/primary/central)
"bqx" = (
+/obj/structure/cable,
/obj/machinery/door/poddoor/shutters/preopen{
id = "hop";
name = "Privacy Shutters"
},
/obj/effect/spawner/structure/window/reinforced,
-/obj/structure/cable,
/turf/open/floor/plating,
/area/station/command/heads_quarters/hop)
"bqy" = (
/obj/effect/turf_decal/bot,
-/turf/open/floor/iron,
+/turf/open/floor/iron/large,
/area/station/hallway/primary/central)
"bqz" = (
-/turf/open/floor/carpet,
+/obj/effect/mapping_helpers/ianbirthday,
+/turf/open/floor/wood/large,
/area/station/command/heads_quarters/hop)
"bqA" = (
/obj/machinery/modular_computer/preset/id{
dir = 1
},
-/obj/effect/turf_decal/tile/blue{
- dir = 1
+/obj/item/paper/fluff/ids_for_dummies,
+/obj/effect/turf_decal/siding/wood{
+ dir = 4
},
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
-/turf/open/floor/iron,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/command/heads_quarters/hop)
"bqB" = (
/obj/machinery/holopad,
-/obj/effect/mapping_helpers/ianbirthday,
-/turf/open/floor/carpet,
+/obj/effect/turf_decal/box/white{
+ color = "#EFB341"
+ },
+/obj/effect/landmark/event_spawn,
+/turf/open/floor/wood,
/area/station/command/heads_quarters/hop)
"bqC" = (
/obj/structure/disposalpipe/segment,
@@ -17019,14 +19139,29 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/airalarm/directional/east,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/siding/wood{
+ dir = 8
+ },
+/turf/open/floor/iron/dark/smooth_large,
/area/station/command/heads_quarters/hop)
"bqD" = (
-/obj/machinery/power/apc/auto_name/directional/north,
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 6
},
+/obj/machinery/power/apc/auto_name/directional/north,
+/obj/effect/turf_decal/siding/wideplating_new/dark{
+ dir = 5
+ },
+/obj/effect/turf_decal/siding/wideplating_new/dark/corner{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 5
+ },
+/obj/effect/turf_decal/siding/dark/corner{
+ dir = 8
+ },
/turf/open/floor/circuit,
/area/station/ai_monitored/command/nuke_storage)
"bqH" = (
@@ -17035,15 +19170,17 @@
"bqL" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/door/firedoor,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/dark_blue/corner{
+ dir = 8;
+ alpha = 200
+ },
+/obj/machinery/firealarm/directional/west,
+/turf/open/floor/iron/large,
/area/station/hallway/primary/central)
"bqM" = (
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/effect/turf_decal/trimline/yellow/filled/line{
- dir = 10
- },
/obj/effect/mapping_helpers/airlock/access/any/medical/general,
/obj/effect/mapping_helpers/airlock/unres{
dir = 4
@@ -17052,28 +19189,26 @@
id_tag = "MedbayAft";
name = "Medbay"
},
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/tile/yellow/full,
+/obj/machinery/door/firedoor,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/medical/medbay/central)
"bqO" = (
-/obj/effect/turf_decal/trimline/yellow/filled/corner,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/turf_decal/trimline/yellow/filled/corner{
- dir = 8
+/obj/structure/disposalpipe/segment{
+ dir = 9
},
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/trimline/yellow/filled/warning{
+ alpha = 120
+ },
+/obj/effect/turf_decal/trimline/blue/warning{
+ alpha = 200
+ },
+/turf/open/floor/iron/white/smooth_edge,
/area/station/medical/medbay/central)
"bqP" = (
-/obj/effect/turf_decal/trimline/blue/filled/warning{
- dir = 8
- },
-/obj/effect/turf_decal/trimline/blue/filled/corner{
- dir = 1
- },
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 4
@@ -17081,20 +19216,46 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 8
},
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/trimline/yellow/filled/warning{
+ alpha = 120;
+ dir = 8
+ },
+/obj/effect/turf_decal/siding{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/blue/warning{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/blue/warning{
+ dir = 8
+ },
+/turf/open/floor/iron/white/smooth_edge{
+ dir = 8
+ },
/area/station/medical/medbay/central)
"bqS" = (
-/obj/effect/turf_decal/trimline/yellow/filled/line,
/obj/machinery/airalarm/directional/south,
/obj/machinery/light/directional/south,
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/trimline/yellow/filled/line{
+ dir = 2;
+ alpha = 120
+ },
+/obj/effect/turf_decal/trimline/blue/warning,
+/obj/effect/turf_decal/trimline/blue/line{
+ alpha = 200
+ },
+/turf/open/floor/iron/white/smooth_edge,
/area/station/medical/medbay/central)
"bqT" = (
-/obj/effect/turf_decal/trimline/yellow/filled/line,
-/obj/structure/disposalpipe/segment{
- dir = 9
+/obj/effect/turf_decal/trimline/yellow/filled/line{
+ dir = 2;
+ alpha = 120
},
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/trimline/blue/line,
+/obj/effect/turf_decal/trimline/blue/line{
+ alpha = 200
+ },
+/turf/open/floor/iron/white/smooth_edge,
/area/station/medical/medbay/central)
"bqU" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
@@ -17106,23 +19267,36 @@
/area/station/security/interrogation)
"bqV" = (
/obj/effect/turf_decal/trimline/yellow/filled/warning{
- dir = 4
+ alpha = 120;
+ dir = 6
+ },
+/obj/effect/turf_decal/trimline/blue/warning{
+ dir = 6
+ },
+/obj/effect/turf_decal/trimline/blue/warning{
+ dir = 6;
+ alpha = 200
+ },
+/obj/machinery/vending/wallmed/directional/south,
+/turf/open/floor/iron/white/smooth_corner{
+ dir = 1
},
-/obj/effect/turf_decal/trimline/yellow/filled/line,
-/turf/open/floor/iron/white,
/area/station/medical/medbay/central)
"bqW" = (
-/obj/effect/turf_decal/trimline/blue/filled/warning,
-/obj/effect/turf_decal/trimline/blue/filled/corner{
- dir = 8
- },
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 9
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 9
},
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/siding/dark_blue/corner{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/blue/filled/warning{
+ alpha = 160
+ },
+/obj/effect/turf_decal/trimline/white/warning,
+/turf/open/floor/iron/white/smooth_edge,
/area/station/medical/medbay/central)
"bqX" = (
/obj/machinery/light/directional/south,
@@ -17133,36 +19307,80 @@
c_tag = "Medbay North";
network = list("ss13","medbay")
},
-/obj/effect/turf_decal/trimline/blue/filled/line,
/obj/machinery/newscaster/directional/east{
pixel_x = 0;
pixel_y = -30
},
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/trimline/blue/filled/line{
+ alpha = 160
+ },
+/obj/effect/turf_decal/siding/corner{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/white/line,
+/obj/effect/turf_decal/trimline/blue/filled/mid_joiner,
+/obj/effect/turf_decal/trimline/blue/filled/mid_joiner,
+/obj/effect/turf_decal/trimline/white/mid_joiner,
+/turf/open/floor/iron/white/smooth_edge,
/area/station/medical/medbay/central)
+"brb" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer5,
+/turf/open/floor/iron/smooth_large,
+/area/station/engineering/main)
"brc" = (
/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
/obj/machinery/door/firedoor,
-/turf/open/floor/iron/dark,
+/obj/effect/turf_decal/stripes/blue/line,
+/obj/effect/turf_decal/stripes/blue/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/blue/full,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/medical/medbay/aft)
"brd" = (
/obj/effect/landmark/start/medical_doctor,
/obj/structure/cable,
+/obj/effect/turf_decal/siding{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/blue/filled/warning{
+ alpha = 160;
+ dir = 1
+ },
/turf/open/floor/iron/white,
/area/station/medical/surgery)
"brk" = (
/obj/effect/spawner/random/vending/colavend,
-/turf/open/floor/iron/dark,
+/obj/effect/turf_decal/trimline/purple/filled/line{
+ alpha = 160;
+ color = "#6a3182";
+ dir = 9
+ },
+/turf/open/floor/iron/dark/smooth_large,
/area/station/science/breakroom)
"brl" = (
-/obj/effect/turf_decal/trimline/blue/filled/warning{
- dir = 1
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 9
},
-/turf/open/floor/iron/white,
-/area/station/medical/medbay/aft)
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 9
+ },
+/obj/effect/turf_decal/trimline/blue/filled/warning{
+ alpha = 160;
+ dir = 5
+ },
+/obj/effect/turf_decal/trimline/dark_blue/warning{
+ alpha = 200;
+ dir = 5
+ },
+/turf/open/floor/iron/white/smooth_corner{
+ dir = 8
+ },
+/area/station/medical/medbay/central)
"brp" = (
/obj/structure/toilet{
pixel_y = 8
@@ -17178,7 +19396,6 @@
/turf/open/floor/iron/freezer,
/area/station/commons/toilet/locker)
"brq" = (
-/obj/effect/turf_decal/stripes/line,
/obj/machinery/button/door{
id = "robotics2";
name = "Shutters Control Button";
@@ -17186,52 +19403,56 @@
pixel_y = -24;
req_access = list("robotics")
},
-/turf/open/floor/iron,
+/mob/living/basic/pet/dog/corgi/borgi,
+/obj/structure/chair/office/light{
+ dir = 4;
+ pixel_y = 3
+ },
+/turf/open/floor/iron/dark,
/area/station/science/robotics/lab)
-"brt" = (
-/obj/effect/turf_decal/tile/blue,
-/obj/structure/disposalpipe/segment,
-/obj/machinery/firealarm/directional/east,
-/turf/open/floor/iron,
-/area/station/hallway/primary/fore)
"brC" = (
-/obj/effect/turf_decal/bot,
-/obj/structure/closet/crate,
/obj/effect/spawner/random/maintenance,
-/obj/item/stack/sheet/mineral/wood,
-/obj/item/stack/sheet/mineral/wood,
-/obj/item/stack/sheet/mineral/wood,
-/obj/item/stack/sheet/mineral/wood,
-/obj/item/forging/billow,
-/obj/effect/decal/cleanable/dirt,
+/obj/structure/closet/crate/deforest,
+/obj/effect/turf_decal/bot,
/turf/open/floor/iron,
/area/station/cargo/warehouse)
"brD" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 10
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 9
+ },
+/obj/effect/turf_decal/trimline/blue/filled/warning{
+ alpha = 160;
dir = 4
},
-/turf/open/floor/iron/white,
-/area/station/medical/medbay/aft)
+/obj/effect/turf_decal/trimline/dark_blue/warning{
+ alpha = 200;
+ dir = 4
+ },
+/turf/open/floor/iron/white/smooth_edge{
+ dir = 4
+ },
+/area/station/medical/medbay/central)
"brG" = (
/obj/machinery/atmospherics/components/binary/valve{
dir = 4
},
/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer4,
/turf/open/floor/iron,
/area/station/maintenance/starboard)
"brH" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible{
- dir = 6
- },
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
/area/station/maintenance/starboard)
"brI" = (
-/obj/machinery/atmospherics/components/unary/portables_connector/visible{
- dir = 8
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+ dir = 1
},
-/turf/open/floor/iron,
-/area/station/maintenance/starboard)
+/turf/open/floor/iron/large,
+/area/station/hallway/secondary/entry)
"brJ" = (
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 4
@@ -17243,14 +19464,19 @@
/turf/open/floor/plating,
/area/station/cargo/storage)
"brK" = (
+/obj/machinery/atmospherics/components/unary/airlock_pump{
+ dir = 4
+ },
/turf/open/floor/plating,
/area/station/cargo/storage)
"brL" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 9
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/iron/edge{
+ dir = 1
},
-/turf/open/floor/iron,
-/area/station/cargo/storage)
+/area/station/hallway/primary/port)
"brM" = (
/obj/machinery/navbeacon{
codes_txt = "delivery;dir=8";
@@ -17271,32 +19497,13 @@
network = list("ss13","cargo")
},
/obj/machinery/rnd/production/techfab/department/cargo,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/bot,
+/turf/open/floor/iron/dark/textured_large,
/area/station/cargo/office)
"brP" = (
/obj/structure/disposalpipe/segment{
dir = 6
},
-/turf/open/floor/iron/white,
-/area/station/medical/medbay/aft)
-"brR" = (
-/obj/structure/disposalpipe/segment,
-/obj/structure/cable,
-/turf/open/floor/iron,
-/area/station/cargo/office)
-"brS" = (
-/turf/open/floor/iron,
-/area/station/command/heads_quarters/hop)
-"brT" = (
-/obj/effect/turf_decal/trimline/blue/filled/warning{
- dir = 4
- },
-/obj/effect/turf_decal/trimline/blue/filled/corner{
- dir = 4
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 8
@@ -17304,22 +19511,70 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 6
},
+/obj/effect/turf_decal/trimline/blue/filled/corner{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/dark_blue/corner{
+ alpha = 200;
+ dir = 4
+ },
/turf/open/floor/iron/white,
-/area/station/medical/medbay/aft)
+/area/station/medical/medbay/central)
+"brR" = (
+/obj/structure/disposalpipe/segment,
+/obj/structure/cable,
+/turf/open/floor/iron/large,
+/area/station/cargo/office)
+"brS" = (
+/turf/open/floor/carpet/royalblue,
+/area/station/command/heads_quarters/hop)
+"brT" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/structure/cable,
+/obj/effect/turf_decal/trimline/blue/filled/warning{
+ alpha = 160;
+ dir = 5
+ },
+/obj/effect/turf_decal/trimline/dark_blue/warning{
+ alpha = 200;
+ dir = 5
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/turf/open/floor/iron/white/smooth_corner{
+ dir = 8
+ },
+/area/station/medical/medbay/central)
"brU" = (
+/obj/structure/cable,
/obj/structure/sign/warning/electric_shock/directional/south,
/obj/machinery/door/poddoor/shutters/preopen{
id = "hop";
name = "Privacy Shutters"
},
/obj/effect/spawner/structure/window/reinforced,
-/obj/structure/cable,
/turf/open/floor/plating,
/area/station/command/heads_quarters/hop)
+"brV" = (
+/obj/structure/fluff/metalpole,
+/obj/item/tank/jetpack/improvised{
+ pixel_y = 17
+ },
+/turf/open/floor/plating,
+/area/station/hallway/secondary/entry)
"brW" = (
/obj/structure/cable,
/obj/machinery/vending/cart,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/siding/wood{
+ dir = 4
+ },
+/turf/open/floor/iron/dark/smooth_large,
/area/station/command/heads_quarters/hop)
"brZ" = (
/obj/effect/turf_decal/stripes/line{
@@ -17339,8 +19594,18 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 8
},
-/turf/open/floor/iron/dark,
-/area/station/medical/medbay/aft)
+/obj/effect/turf_decal/stripes/blue/line{
+ dir = 8
+ },
+/obj/effect/turf_decal/stripes/blue/line{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/blue/full,
+/obj/effect/turf_decal/caution/stand_clear/white{
+ dir = 8
+ },
+/turf/open/floor/iron/dark/smooth_large,
+/area/station/medical/medbay/central)
"bsa" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/dark,
@@ -17349,22 +19614,18 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/structure/cable,
-/obj/machinery/door/firedoor,
-/turf/open/floor/iron,
-/area/station/hallway/primary/central)
-"bsd" = (
-/obj/effect/turf_decal/stripes/line,
-/obj/structure/closet/l3closet/scientist,
-/obj/item/storage/bag/xeno,
-/turf/open/floor/iron,
-/area/station/science/xenobiology)
-"bse" = (
-/obj/effect/turf_decal/trimline/blue/filled/line{
+/turf/open/floor/iron/edge{
dir = 1
},
-/obj/effect/turf_decal/trimline/blue/filled/warning{
- dir = 8
+/area/station/hallway/primary/central)
+"bsd" = (
+/obj/structure/closet/l3closet/scientist,
+/obj/item/toy/plush/slimeplushie{
+ name = "triss"
},
+/turf/open/floor/iron/dark/smooth_large,
+/area/station/science/xenobiology)
+"bse" = (
/obj/structure/disposalpipe/segment{
dir = 4
},
@@ -17376,8 +19637,16 @@
dir = 8
},
/obj/machinery/light/directional/north,
-/turf/open/floor/iron/white,
-/area/station/medical/medbay/aft)
+/obj/effect/turf_decal/trimline/blue/filled/warning{
+ alpha = 160;
+ dir = 9
+ },
+/obj/effect/turf_decal/trimline/dark_blue/warning{
+ alpha = 200;
+ dir = 9
+ },
+/turf/open/floor/iron/white/smooth_corner,
+/area/station/medical/medbay/central)
"bsf" = (
/obj/machinery/atmospherics/pipe/smart/manifold/purple/visible,
/turf/open/floor/iron,
@@ -17395,63 +19664,70 @@
"bsi" = (
/obj/structure/table,
/obj/item/hand_tele,
-/turf/open/floor/iron,
+/turf/open/floor/iron/dark/textured_large,
/area/station/command/teleporter)
"bsj" = (
-/obj/structure/extinguisher_cabinet{
- pixel_x = -27;
- pixel_y = 1
- },
/obj/structure/table,
/obj/item/beacon,
-/turf/open/floor/iron,
+/obj/structure/extinguisher_cabinet/directional/west,
+/obj/item/stack/cable_coil/thirty{
+ pixel_x = 16;
+ pixel_y = 6
+ },
+/turf/open/floor/iron/dark/textured_large,
/area/station/command/teleporter)
"bsk" = (
/obj/machinery/firealarm/directional/north,
/obj/machinery/light/directional/north,
-/turf/open/floor/iron,
+/turf/open/floor/iron/corner,
/area/station/command/teleporter)
"bsl" = (
/obj/structure/closet/crate,
/obj/item/crowbar,
/obj/item/radio/intercom/directional/north,
-/turf/open/floor/iron,
+/turf/open/floor/iron/dark/textured_large,
/area/station/command/teleporter)
"bsm" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 4
},
-/turf/open/floor/iron,
+/turf/open/floor/iron/edge{
+ dir = 1
+ },
/area/station/command/teleporter)
"bsn" = (
/obj/machinery/camera/directional/north{
c_tag = "Teleporter"
},
/obj/machinery/airalarm/directional/north,
-/turf/open/floor/iron,
+/turf/open/floor/iron/edge{
+ dir = 1
+ },
/area/station/command/teleporter)
"bso" = (
-/obj/machinery/light_switch{
- pixel_x = 27
- },
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 4
},
-/turf/open/floor/iron,
+/obj/machinery/light_switch{
+ pixel_x = 27
+ },
+/turf/open/floor/iron/corner{
+ dir = 8
+ },
/area/station/command/teleporter)
"bsp" = (
/obj/structure/disposalpipe/junction/flip{
dir = 2
},
-/obj/effect/turf_decal/tile/blue{
- dir = 1
+/obj/effect/turf_decal/trimline/dark_blue/corner{
+ dir = 1;
+ alpha = 200
},
-/obj/effect/turf_decal/tile/blue{
+/turf/open/floor/iron/edge{
dir = 8
},
-/turf/open/floor/iron,
/area/station/hallway/primary/central)
"bsq" = (
/obj/structure/closet/secure_closet/hydroponics,
@@ -17465,12 +19741,6 @@
/turf/closed/wall,
/area/station/maintenance/port)
"bsu" = (
-/obj/effect/turf_decal/trimline/blue/filled/line{
- dir = 4
- },
-/obj/effect/turf_decal/trimline/blue/filled/warning{
- dir = 1
- },
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 9
},
@@ -17487,47 +19757,51 @@
pixel_x = -5;
pixel_y = 6
},
-/turf/open/floor/iron/white,
-/area/station/medical/medbay/aft)
+/turf/open/floor/iron/dark/smooth_large,
+/area/station/medical/medbay/central)
"bsv" = (
-/obj/effect/turf_decal/trimline/blue/filled/corner{
- dir = 4
- },
-/obj/effect/turf_decal/trimline/blue/filled/corner{
- dir = 1
- },
/obj/structure/disposalpipe/segment{
dir = 4
},
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/iron/white,
-/area/station/medical/medbay/aft)
+/obj/effect/turf_decal/trimline/blue/filled/warning{
+ alpha = 160;
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/dark_blue/warning{
+ alpha = 200;
+ dir = 1
+ },
+/turf/open/floor/iron/white/smooth_edge{
+ dir = 1
+ },
+/area/station/medical/medbay/central)
"bsw" = (
-/obj/machinery/door/airlock/research{
- name = "Robotics Lab"
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/effect/mapping_helpers/airlock/access/any/science/robotics,
+/obj/structure/disposalpipe/segment,
+/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron/white,
-/area/station/science/robotics/lab)
-"bsx" = (
-/obj/effect/turf_decal/trimline/blue/filled/corner{
- dir = 8
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/turf_decal/trimline/brown/filled/warning{
+ dir = 9
},
-/obj/effect/turf_decal/trimline/blue/filled/warning,
+/obj/effect/turf_decal/trimline/dark/warning{
+ dir = 9
+ },
+/turf/open/floor/iron,
+/area/station/cargo/miningdock)
+"bsx" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
dir = 1
},
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/trimline/blue/filled/warning{
+ alpha = 160
+ },
+/obj/effect/turf_decal/trimline/white/warning,
+/turf/open/floor/iron/white/smooth_edge,
/area/station/medical/medbay/central)
"bsy" = (
-/obj/effect/turf_decal/trimline/blue/filled/line,
-/obj/effect/turf_decal/trimline/blue/filled/warning{
- dir = 8
- },
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 4
},
@@ -17535,42 +19809,73 @@
dir = 8
},
/obj/structure/cable,
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/trimline/yellow/filled/warning{
+ alpha = 120;
+ dir = 10
+ },
+/obj/effect/turf_decal/siding/corner{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/blue/warning{
+ dir = 10
+ },
+/obj/effect/turf_decal/trimline/blue/warning{
+ dir = 10
+ },
+/turf/open/floor/iron/white/smooth_corner{
+ dir = 4
+ },
/area/station/medical/medbay/central)
"bsz" = (
/obj/machinery/status_display/evac/directional/west,
/obj/machinery/light/directional/west,
-/turf/open/floor/iron/white/side{
- dir = 5
+/obj/effect/turf_decal/trimline/dark/filled/line{
+ alpha = 160;
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/dark/filled/mid_joiner{
+ dir = 8;
+ alpha = 160
+ },
+/obj/effect/turf_decal/trimline/purple/line{
+ alpha = 200;
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 8
+ },
+/turf/open/floor/iron/white/smooth_edge{
+ dir = 8
},
/area/station/science/research)
"bsA" = (
/obj/machinery/firealarm/directional/east,
-/turf/open/floor/iron/white/side{
- dir = 9
+/obj/effect/turf_decal/trimline/dark/filled/line{
+ alpha = 160;
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/dark/filled/mid_joiner{
+ dir = 4;
+ alpha = 160
+ },
+/obj/effect/turf_decal/trimline/purple/line{
+ alpha = 200;
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 4
+ },
+/turf/open/floor/iron/white/smooth_edge{
+ dir = 4
},
/area/station/science/research)
"bsB" = (
-/obj/effect/turf_decal/trimline/blue/filled/line{
- dir = 1
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
- dir = 8
- },
-/obj/machinery/firealarm/directional/north,
-/turf/open/floor/iron/white,
-/area/station/medical/medbay/aft)
+/obj/effect/turf_decal/trimline/purple/arrow_ccw,
+/obj/effect/turf_decal/trimline/purple/mid_joiner,
+/turf/open/floor/iron/textured_half,
+/area/station/hallway/primary/starboard)
"bsC" = (
-/obj/effect/turf_decal/trimline/blue/filled/line{
- dir = 1
- },
/obj/machinery/requests_console{
department = "Medbay";
name = "Medbay RC";
@@ -17588,12 +19893,28 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 8
},
-/turf/open/floor/iron/white,
-/area/station/medical/medbay/aft)
-"bsD" = (
/obj/effect/turf_decal/trimline/blue/filled/line{
+ alpha = 160;
dir = 1
},
+/obj/effect/turf_decal/trimline/dark_blue/line{
+ alpha = 200;
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/blue/filled/mid_joiner{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/blue/filled/mid_joiner{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/dark_blue/mid_joiner{
+ dir = 1
+ },
+/turf/open/floor/iron/white/smooth_edge{
+ dir = 1
+ },
+/area/station/medical/medbay/central)
+"bsD" = (
/obj/structure/disposalpipe/segment{
dir = 4
},
@@ -17604,23 +19925,46 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 8
},
-/turf/open/floor/iron/white,
-/area/station/medical/medbay/aft)
-"bsE" = (
-/obj/effect/turf_decal/trimline/blue/filled/corner{
- dir = 4
- },
-/obj/effect/turf_decal/trimline/blue/filled/corner{
+/obj/effect/turf_decal/trimline/blue/filled/line{
+ alpha = 160;
dir = 1
},
+/obj/effect/turf_decal/trimline/dark_blue/line{
+ alpha = 200;
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/blue/filled/mid_joiner{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/blue/filled/mid_joiner{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/dark_blue/mid_joiner{
+ dir = 1
+ },
+/turf/open/floor/iron/white/smooth_edge{
+ dir = 1
+ },
+/area/station/medical/medbay/central)
+"bsE" = (
/obj/structure/disposalpipe/segment{
dir = 4
},
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron/white,
-/area/station/medical/medbay/aft)
+/obj/effect/turf_decal/trimline/blue/filled/warning{
+ alpha = 160;
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/dark_blue/warning{
+ alpha = 200;
+ dir = 1
+ },
+/turf/open/floor/iron/white/smooth_edge{
+ dir = 1
+ },
+/area/station/medical/medbay/central)
"bsF" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
@@ -17629,38 +19973,67 @@
/area/station/science/ordnance/bomb)
"bsG" = (
/obj/structure/disposalpipe/segment,
-/turf/open/floor/iron/white,
-/area/station/medical/medbay/aft)
-"bsI" = (
-/obj/effect/turf_decal/trimline/blue/filled/line{
- dir = 6
- },
-/obj/item/kirbyplants/random,
-/obj/structure/extinguisher_cabinet{
- pixel_y = -30
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/iron/white,
-/area/station/medical/medbay/aft)
-"bsJ" = (
-/obj/effect/turf_decal/trimline/blue/filled/corner{
- dir = 8
- },
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/iron/white,
-/area/station/medical/medbay/aft)
-"bsK" = (
-/obj/effect/turf_decal/trimline/blue/filled/line{
- dir = 4
- },
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/vending/drugs,
+/turf/open/floor/iron/white/smooth_large,
+/area/station/medical/medbay/central)
+"bsI" = (
+/obj/item/kirbyplants/random,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/blue/filled/line{
+ alpha = 160;
+ dir = 6
+ },
+/obj/effect/turf_decal/trimline/dark_blue/line{
+ alpha = 200;
+ dir = 6
+ },
+/obj/structure/extinguisher_cabinet/directional/south,
+/obj/effect/turf_decal/trimline/blue/filled/mid_joiner{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/blue/filled/mid_joiner{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/dark_blue/mid_joiner,
+/obj/effect/turf_decal/trimline/dark_blue/mid_joiner{
+ dir = 4
+ },
+/turf/open/floor/iron/white/smooth_corner{
+ dir = 1
+ },
+/area/station/medical/medbay/central)
+"bsJ" = (
+/obj/structure/disposalpipe/segment,
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/turf_decal/trimline/blue/filled/corner{
+ alpha = 160
+ },
+/obj/effect/turf_decal/trimline/blue/filled/corner{
+ alpha = 160;
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/dark_blue/corner{
+ alpha = 200;
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/dark_blue/corner{
+ alpha = 200
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
/turf/open/floor/iron/white,
-/area/station/medical/medbay/aft)
+/area/station/medical/medbay/central)
+"bsK" = (
+/obj/machinery/vending/drugs,
+/obj/effect/turf_decal/tile/blue/full,
+/turf/open/floor/iron/dark/smooth_large,
+/area/station/medical/medbay/central)
"bsM" = (
/turf/closed/wall,
/area/station/medical/storage)
@@ -17673,52 +20046,105 @@
dir = 4;
name = "Synth Delivery"
},
-/obj/effect/turf_decal/trimline/purple/line{
- dir = 1
- },
-/obj/effect/turf_decal/trimline/purple/line,
/obj/structure/disposalpipe/trunk{
dir = 8
},
-/turf/open/floor/iron/dark,
+/obj/structure/window/reinforced/spawner/directional/north,
+/obj/effect/turf_decal/delivery/white{
+ color = "#ae4fd6"
+ },
+/turf/open/floor/iron/dark/smooth_large,
/area/station/science/robotics/lab)
"bsP" = (
+/obj/structure/table/glass,
+/obj/effect/turf_decal/siding/dark/corner{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 10
+ },
+/obj/effect/turf_decal/trimline/purple/filled/line{
+ alpha = 160;
+ color = "#6a3182";
+ dir = 10
+ },
+/obj/machinery/digital_clock/directional/south,
+/obj/effect/spawner/surgery_tray/full,
+/obj/item/healthanalyzer{
+ pixel_x = 2;
+ pixel_y = 5
+ },
+/turf/open/floor/iron/dark/small,
+/area/station/science/robotics/lab)
+"bsQ" = (
+/obj/effect/turf_decal/siding/dark{
+ dir = 10
+ },
+/obj/effect/turf_decal/trimline/purple/filled/line{
+ alpha = 160;
+ color = "#6a3182";
+ dir = 10
+ },
+/obj/item/storage/box/bodybags{
+ pixel_x = -25;
+ pixel_y = 38
+ },
+/turf/open/floor/iron/dark/small,
+/area/station/science/robotics/lab)
+"bsR" = (
/obj/item/radio/intercom/directional/south,
-/obj/effect/landmark/event_spawn,
/obj/structure/table/optable{
name = "Robotics Operating Table"
},
-/turf/open/floor/iron/dark,
-/area/station/science/robotics/lab)
-"bsQ" = (
-/turf/open/floor/iron/dark,
-/area/station/science/robotics/lab)
-"bsR" = (
-/obj/machinery/computer/operating{
- dir = 1;
- name = "Robotics Operating Computer"
+/obj/effect/landmark/event_spawn,
+/obj/effect/turf_decal/siding/dark,
+/obj/effect/turf_decal/trimline/purple/filled/line{
+ alpha = 160;
+ color = "#6a3182"
},
-/turf/open/floor/iron/dark,
+/obj/structure/marker_beacon/purple,
+/turf/open/floor/iron/dark/small,
/area/station/science/robotics/lab)
"bsS" = (
/obj/machinery/camera/directional/south{
c_tag = "Robotics Lab - South";
network = list("ss13","rd")
},
-/obj/machinery/computer/mechpad{
- dir = 1
+/obj/structure/noticeboard/directional/south{
+ pixel_x = 0;
+ pixel_y = -24
},
-/turf/open/floor/iron/white,
+/obj/item/photo/old{
+ pixel_x = -6;
+ pixel_y = -28
+ },
+/obj/item/key{
+ pixel_x = 5;
+ pixel_y = -29
+ },
+/obj/structure/table/reinforced/rglass,
+/obj/item/assembly/signaler{
+ pixel_x = 14;
+ pixel_y = 9
+ },
+/obj/item/storage/toolbox/mechanical{
+ pixel_x = -2;
+ pixel_y = 6
+ },
+/obj/item/storage/toolbox/mechanical{
+ pixel_x = 2;
+ pixel_y = -1
+ },
+/turf/open/floor/iron/dark/smooth_large,
/area/station/science/robotics/lab)
"bsT" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
- dir = 4
- },
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 4
},
-/obj/machinery/light/directional/south,
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/siding/dark/corner{
+ dir = 4
+ },
+/turf/open/floor/iron/dark,
/area/station/science/robotics/lab)
"bsU" = (
/obj/structure/table/optable{
@@ -17728,13 +20154,30 @@
/turf/open/floor/iron/white,
/area/station/maintenance/port/fore)
"bsW" = (
-/obj/machinery/vending/wardrobe/robo_wardrobe,
-/turf/open/floor/iron/white,
+/obj/machinery/modular_computer/preset/civilian{
+ dir = 1
+ },
+/turf/open/floor/iron/dark/smooth_large,
/area/station/science/robotics/lab)
"bsX" = (
/obj/machinery/light/directional/west,
-/turf/open/floor/iron/white/side{
- dir = 5
+/obj/effect/turf_decal/trimline/dark/filled/line{
+ alpha = 160;
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/dark/filled/mid_joiner{
+ dir = 8;
+ alpha = 160
+ },
+/obj/effect/turf_decal/trimline/purple/line{
+ alpha = 200;
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 8
+ },
+/turf/open/floor/iron/white/smooth_edge{
+ dir = 8
},
/area/station/science/research)
"bsY" = (
@@ -17742,7 +20185,7 @@
dir = 4
},
/obj/effect/landmark/start/head_of_personnel,
-/turf/open/floor/iron,
+/turf/open/floor/carpet/royalblue,
/area/station/command/heads_quarters/hop)
"bta" = (
/obj/effect/spawner/structure/window/reinforced,
@@ -17754,17 +20197,25 @@
/turf/open/floor/plating/airless,
/area/station/science/ordnance/bomb)
"btc" = (
-/obj/effect/turf_decal/stripes/line,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
dir = 1
},
-/turf/open/floor/iron,
+/obj/effect/turf_decal/stripes/line,
+/obj/effect/turf_decal/stripes/white/line{
+ color = "#52B4E9";
+ name = "blue line"
+ },
+/turf/open/floor/iron/edge,
/area/station/command/teleporter)
"btd" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 10
+/obj/effect/turf_decal/stripes/line,
+/obj/effect/turf_decal/stripes/white/line{
+ color = "#52B4E9";
+ name = "blue line"
+ },
+/turf/open/floor/iron/corner{
+ dir = 4
},
-/turf/open/floor/iron,
/area/station/command/teleporter)
"bte" = (
/obj/structure/sign/poster/timeclock_psa/directional/north,
@@ -17778,9 +20229,14 @@
dir = 8
},
/obj/effect/turf_decal/tile/neutral,
+/obj/structure/cable,
+/obj/machinery/power/apc/auto_name/directional/east,
/turf/open/floor/iron/dark,
/area/station/commons/fitness/recreation/entertainment)
"btg" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 8
+ },
/obj/effect/turf_decal/tile/red{
dir = 4
},
@@ -17789,9 +20245,6 @@
dir = 1
},
/obj/machinery/light/directional/east,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
- dir = 8
- },
/obj/machinery/computer/records/security,
/turf/open/floor/iron/dark,
/area/station/security/checkpoint/medical)
@@ -17804,18 +20257,24 @@
/turf/open/floor/iron/white,
/area/station/science/research)
"btp" = (
+/obj/machinery/atmospherics/components/binary/passive_gate/layer4{
+ target_pressure = 1200;
+ on = 1;
+ name = "Airlock Valve";
+ dir = 8
+ },
/turf/open/floor/plating,
/area/station/maintenance/starboard)
"btq" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/light/small/directional/east,
-/obj/effect/spawner/random/burgerstation/loot/with_maintenance_loot,
+/obj/machinery/portable_atmospherics/canister/air,
+/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer4{
+ dir = 8
+ },
/turf/open/floor/iron,
/area/station/maintenance/starboard)
"btr" = (
-/obj/machinery/camera/directional/west{
- c_tag = "Cargo Receiving Dock"
- },
/obj/machinery/button/door{
id = "QMLoaddoor";
name = "Loading Doors";
@@ -17830,13 +20289,15 @@
pixel_y = 8;
req_access = list("cargo")
},
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
/obj/machinery/computer/cargo{
dir = 4
},
-/turf/open/floor/iron,
+/obj/machinery/camera/autoname/directional/west{
+ network = list("ss13","cargo");
+ c_tag = "Supply Dock"
+ },
+/obj/effect/turf_decal/bot,
+/turf/open/floor/iron/dark/textured_large,
/area/station/cargo/storage)
"bts" = (
/obj/machinery/navbeacon{
@@ -17844,98 +20305,126 @@
location = "QM #2"
},
/obj/effect/turf_decal/bot,
-/mob/living/simple_animal/bot/mulebot,
+/obj/structure/closet/wardrobe/cargotech,
/turf/open/floor/iron/dark/textured_large,
/area/station/cargo/storage)
"btt" = (
/obj/machinery/modular_computer/preset/cargochat/cargo{
dir = 4
},
-/obj/effect/turf_decal/tile/brown{
- dir = 4
- },
-/obj/effect/turf_decal/tile/brown{
- dir = 1
- },
/obj/effect/decal/cleanable/dirt,
/obj/machinery/firealarm/directional/west,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/delivery,
+/turf/open/floor/iron/dark/textured_large,
/area/station/cargo/office)
"btu" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 4
},
-/obj/effect/turf_decal/tile/brown{
+/obj/effect/turf_decal/trimline/brown/filled/line{
+ dir = 8
+ },
+/turf/open/floor/iron/textured_edge{
dir = 4
},
-/obj/effect/turf_decal/tile/brown{
- dir = 1
- },
-/turf/open/floor/iron,
/area/station/cargo/office)
"btv" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/iron,
+/turf/open/floor/iron/large,
/area/station/cargo/office)
"btw" = (
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
/obj/machinery/light/directional/north,
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/trimline/dark/filled/line{
+ alpha = 160;
+ dir = 9
+ },
+/obj/effect/turf_decal/trimline/dark/filled/mid_joiner{
+ dir = 8;
+ alpha = 160
+ },
+/obj/effect/turf_decal/trimline/purple/line{
+ alpha = 200;
+ dir = 9
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 9
+ },
+/turf/open/floor/iron/white/smooth_corner,
/area/station/science/research)
"bty" = (
-/obj/structure/chair{
+/obj/effect/turf_decal/trimline/brown/filled/line{
+ dir = 4
+ },
+/obj/structure/chair/sofa/bench/tram/left{
+ dir = 8
+ },
+/turf/open/floor/iron/textured_edge{
dir = 8
},
-/turf/open/floor/iron,
/area/station/cargo/office)
"btz" = (
/obj/structure/disposalpipe/segment,
-/obj/effect/turf_decal/tile/brown{
+/obj/effect/turf_decal/trimline/brown/arrow_cw{
dir = 8
},
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/brown/mid_joiner{
+ dir = 8
+ },
+/turf/open/floor/iron/corner,
/area/station/hallway/primary/central)
"btA" = (
/obj/machinery/camera/directional/north{
c_tag = "Research Division West"
},
-/turf/open/floor/iron/white,
-/area/station/science/research)
-"btB" = (
-/obj/effect/turf_decal/tile/blue{
+/obj/effect/turf_decal/trimline/dark/filled/line{
+ alpha = 160;
dir = 1
},
-/obj/effect/turf_decal/tile/blue{
- dir = 4
+/obj/effect/turf_decal/trimline/dark/filled/mid_joiner{
+ dir = 1;
+ alpha = 160
},
-/obj/effect/turf_decal/tile/blue{
- dir = 8
+/obj/effect/turf_decal/trimline/purple/line{
+ alpha = 200;
+ dir = 1
},
+/obj/effect/turf_decal/siding/dark{
+ dir = 1
+ },
+/turf/open/floor/iron/white/smooth_edge{
+ dir = 1
+ },
+/area/station/science/research)
+"btB" = (
/obj/machinery/computer/records/security{
dir = 4
},
/obj/machinery/light/directional/west,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/siding/wood{
+ dir = 4
+ },
+/turf/open/floor/iron/dark/smooth_large,
/area/station/command/heads_quarters/hop)
"btC" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
dir = 4
},
-/turf/open/floor/iron,
+/obj/effect/turf_decal/siding/wood{
+ dir = 1
+ },
+/turf/open/floor/carpet/royalblue,
/area/station/command/heads_quarters/hop)
"btD" = (
-/obj/structure/table,
/obj/machinery/fax{
fax_name = "Head of Personnel's Office";
name = "Head of Personnel's Fax Machine"
},
-/turf/open/floor/iron,
+/obj/structure/table/reinforced/rglass,
+/obj/effect/turf_decal/siding/wood{
+ dir = 1
+ },
+/turf/open/floor/carpet/royalblue,
/area/station/command/heads_quarters/hop)
"btE" = (
/obj/structure/disposalpipe/segment,
@@ -17945,7 +20434,10 @@
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/light/directional/east,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/siding/wood{
+ dir = 8
+ },
+/turf/open/floor/iron/dark/smooth_large,
/area/station/command/heads_quarters/hop)
"btG" = (
/obj/effect/turf_decal/tile/blue{
@@ -17961,50 +20453,54 @@
/turf/open/floor/iron/dark/textured,
/area/station/hallway/primary/central)
"btH" = (
-/obj/structure/chair/stool,
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 6
},
-/turf/open/floor/iron,
+/obj/structure/chair/stool,
+/turf/open/floor/iron/edge{
+ dir = 1
+ },
/area/station/command/teleporter)
"btJ" = (
-/obj/machinery/bluespace_beacon,
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 8
},
+/obj/machinery/bluespace_beacon,
/turf/open/floor/iron,
/area/station/command/teleporter)
"btK" = (
-/obj/machinery/holopad,
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 8
},
-/turf/open/floor/iron,
+/obj/machinery/holopad,
+/turf/open/floor/iron/edge{
+ dir = 1
+ },
/area/station/command/teleporter)
"btL" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 8
},
-/turf/open/floor/iron,
+/turf/open/floor/iron/edge,
/area/station/command/teleporter)
"btM" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/command{
- name = "Teleport Access"
- },
-/obj/effect/landmark/navigate_destination,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 8
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 4
},
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/command{
+ name = "Teleport Access"
+ },
+/obj/effect/landmark/navigate_destination,
/obj/effect/mapping_helpers/airlock/access/any/command/teleporter,
-/turf/open/floor/iron,
+/turf/open/floor/iron/dark/textured_large,
/area/station/command/teleporter)
"btN" = (
/obj/effect/turf_decal/stripes/line{
@@ -18014,12 +20510,6 @@
/area/station/science/ordnance/bomb)
"btO" = (
/obj/structure/disposalpipe/segment,
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 4
@@ -18027,15 +20517,27 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 4
},
-/turf/open/floor/iron,
+/turf/open/floor/iron/edge{
+ dir = 8
+ },
/area/station/hallway/primary/central)
"btP" = (
+/obj/effect/turf_decal/trimline/dark_blue/filled/line{
+ dir = 9
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 9
+ },
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+ dir = 4
+ },
/obj/structure/chair,
-/turf/open/floor/iron,
+/turf/open/floor/iron/dark,
/area/station/security/checkpoint/escape)
"btR" = (
/obj/effect/turf_decal/trimline/green/filled/line{
- dir = 8
+ dir = 8;
+ alpha = 160
},
/obj/machinery/camera/directional/west{
c_tag = "Medbay South";
@@ -18043,27 +20545,54 @@
},
/obj/machinery/firealarm/directional/west,
/obj/machinery/light/directional/west,
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/trimline/dark_green/line{
+ alpha = 200;
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/green/filled/mid_joiner{
+ alpha = 160;
+ dir = 8
+ },
+/turf/open/floor/iron/white/smooth_edge{
+ dir = 8
+ },
/area/station/medical/medbay/aft)
"btS" = (
-/obj/structure/table,
-/obj/item/crowbar,
-/turf/open/floor/iron/dark,
-/area/station/security/checkpoint/escape)
-"btT" = (
-/obj/effect/turf_decal/trimline/blue/filled/line{
+/obj/effect/turf_decal/siding/dark/end{
dir = 4
},
-/obj/effect/turf_decal/trimline/blue/filled/warning,
-/obj/structure/extinguisher_cabinet{
- pixel_x = 27
- },
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/carpet/black,
+/area/station/security/checkpoint/escape)
+"btT" = (
/obj/machinery/light/directional/east,
-/turf/open/floor/iron/white,
-/area/station/medical/medbay/aft)
+/obj/effect/turf_decal/trimline/blue/filled/line{
+ alpha = 160;
+ dir = 5
+ },
+/obj/effect/turf_decal/trimline/dark_blue/line{
+ alpha = 200;
+ dir = 5
+ },
+/obj/effect/turf_decal/trimline/blue/filled/mid_joiner{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/blue/filled/mid_joiner{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/blue/filled/mid_joiner{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/blue/filled/mid_joiner{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/dark_blue/mid_joiner{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/dark_blue/mid_joiner{
+ dir = 1
+ },
+/turf/open/floor/iron/white/smooth_large,
+/area/station/medical/medbay/central)
"btV" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
@@ -18079,9 +20608,18 @@
/area/station/maintenance/fore)
"btW" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
-/turf/open/floor/iron/white/side{
- dir = 5
+/obj/effect/turf_decal/trimline/dark/filled/corner{
+ alpha = 160;
+ dir = 1
},
+/obj/effect/turf_decal/trimline/purple/corner{
+ alpha = 200;
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/dark/corner{
+ dir = 1
+ },
+/turf/open/floor/iron/white,
/area/station/science/research)
"btX" = (
/obj/structure/cable,
@@ -18106,23 +20644,25 @@
/turf/open/floor/plating/airless,
/area/station/science/ordnance/bomb)
"bua" = (
-/obj/effect/turf_decal/trimline/blue/filled/line{
- dir = 8
- },
/obj/effect/turf_decal/trimline/blue/filled/warning{
- dir = 1
+ alpha = 160;
+ dir = 9
},
-/turf/open/floor/iron/white,
-/area/station/medical/medbay/aft)
+/obj/effect/turf_decal/trimline/dark_blue/warning{
+ alpha = 200;
+ dir = 9
+ },
+/turf/open/floor/iron/white/smooth_corner,
+/area/station/medical/medbay/central)
"buc" = (
/obj/structure/falsewall,
/turf/open/floor/plating,
/area/station/maintenance/port/aft)
"bud" = (
-/obj/effect/turf_decal/tile/brown{
- dir = 8
- },
/obj/structure/closet/crate,
+/obj/effect/turf_decal/trimline/brown/filled/line{
+ dir = 6
+ },
/turf/open/floor/iron,
/area/station/cargo/office)
"bue" = (
@@ -18137,16 +20677,18 @@
/obj/machinery/camera/directional/south{
c_tag = "Head of Personnel's Office"
},
-/turf/open/floor/iron,
+/turf/open/floor/carpet/royalblue,
/area/station/command/heads_quarters/hop)
"buf" = (
-/obj/effect/turf_decal/tile/yellow{
- dir = 1
+/obj/effect/turf_decal/trimline/yellow/filled/line{
+ dir = 1;
+ alpha = 120
},
-/obj/effect/turf_decal/tile/blue{
- dir = 4
+/obj/effect/turf_decal/trimline/dark_blue/line{
+ dir = 1;
+ alpha = 200
},
-/turf/open/floor/iron/dark/side,
+/turf/open/floor/iron/dark,
/area/station/engineering/atmos/hfr_room)
"bug" = (
/obj/machinery/atmospherics/pipe/smart/simple/purple/visible{
@@ -18177,9 +20719,10 @@
"buj" = (
/obj/machinery/door/poddoor/shutters/preopen{
id = "robotics2";
- name = "Robotics Lab Shutters"
+ name = "Robotics Lab Shutters";
+ dir = 4
},
-/obj/effect/spawner/structure/window,
+/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/station/science/robotics/lab)
"bul" = (
@@ -18238,13 +20781,8 @@
/turf/open/floor/plating,
/area/station/maintenance/aft)
"but" = (
-/obj/machinery/door/airlock/external{
- name = "Internal Airlock"
- },
-/obj/effect/mapping_helpers/airlock/access/any/engineering/atmos,
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
- dir = 8
- },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/plating,
/area/station/maintenance/aft)
"buv" = (
@@ -18259,10 +20797,6 @@
/turf/open/floor/plating/icemoon,
/area/station/engineering/atmos)
"bux" = (
-/obj/effect/turf_decal/trimline/blue/filled/line{
- dir = 1
- },
-/obj/effect/turf_decal/trimline/blue/filled/corner,
/obj/structure/disposalpipe/segment{
dir = 4
},
@@ -18274,8 +20808,18 @@
dir = 8
},
/obj/machinery/light/directional/north,
-/turf/open/floor/iron/white,
-/area/station/medical/medbay/aft)
+/obj/effect/turf_decal/trimline/blue/filled/warning{
+ alpha = 160;
+ dir = 5
+ },
+/obj/effect/turf_decal/trimline/dark_blue/warning{
+ alpha = 200;
+ dir = 5
+ },
+/turf/open/floor/iron/white/smooth_corner{
+ dir = 8
+ },
+/area/station/medical/medbay/central)
"buy" = (
/obj/structure/cable,
/obj/structure/disposalpipe/sorting/mail,
@@ -18294,13 +20838,25 @@
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron/smooth_large,
+/obj/machinery/door/poddoor/preopen{
+ id = "xenobiomain";
+ name = "Containment Blast Door"
+ },
+/turf/open/floor/iron/dark/smooth_large,
/area/station/science/cytology)
"buB" = (
/obj/machinery/conveyor_switch/oneway{
dir = 8;
id = "QMLoad"
},
+/obj/effect/turf_decal/trimline/brown/filled/line,
+/obj/effect/turf_decal/trimline/brown/filled/corner{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer4,
/turf/open/floor/iron,
/area/station/cargo/storage)
"buD" = (
@@ -18309,6 +20865,7 @@
location = "QM #3"
},
/obj/effect/turf_decal/bot,
+/mob/living/simple_animal/bot/mulebot,
/turf/open/floor/iron/dark/textured_large,
/area/station/cargo/storage)
"buE" = (
@@ -18317,28 +20874,24 @@
},
/obj/effect/decal/cleanable/dirt,
/obj/machinery/airalarm/directional/west,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/delivery,
+/turf/open/floor/iron/dark/textured_large,
/area/station/cargo/office)
"buF" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
dir = 4
},
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/brown/filled/corner{
+ dir = 8
+ },
+/turf/open/floor/iron/textured_corner{
+ dir = 8
+ },
/area/station/cargo/office)
"buG" = (
/obj/machinery/door/airlock/medical{
name = "Medbay"
},
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
-/obj/effect/turf_decal/tile/blue,
/obj/structure/disposalpipe/segment{
dir = 4
},
@@ -18350,8 +20903,8 @@
dir = 8
},
/obj/effect/mapping_helpers/airlock/access/any/medical/general,
-/turf/open/floor/iron/white,
-/area/station/medical/medbay/aft)
+/turf/open/floor/iron/dark/smooth_large,
+/area/station/medical/medbay/central)
"buH" = (
/obj/machinery/door/airlock/research{
name = "Research Access"
@@ -18367,14 +20920,14 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/turf/open/floor/iron/white,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/science/research)
"buI" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 1
},
/obj/effect/landmark/start/hangover,
-/turf/open/floor/iron,
+/turf/open/floor/iron/large,
/area/station/cargo/office)
"buJ" = (
/obj/machinery/atmospherics/pipe/smart/simple/green/visible{
@@ -18386,7 +20939,7 @@
"buK" = (
/obj/effect/turf_decal/bot,
/obj/machinery/light/directional/east,
-/turf/open/floor/iron,
+/turf/open/floor/iron/large,
/area/station/hallway/primary/central)
"buL" = (
/obj/structure/disposalpipe/segment{
@@ -18402,33 +20955,30 @@
/turf/open/floor/iron/white,
/area/station/science/research)
"buM" = (
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
/obj/machinery/computer/accounting{
dir = 4
},
/obj/machinery/keycard_auth/wall_mounted/directional/west,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/siding/wood{
+ dir = 4
+ },
+/turf/open/floor/iron/dark/smooth_large,
/area/station/command/heads_quarters/hop)
"buN" = (
/obj/structure/chair{
dir = 8
},
-/turf/open/floor/iron,
+/turf/open/floor/carpet/royalblue,
/area/station/command/heads_quarters/hop)
"buO" = (
-/obj/structure/table,
/obj/item/folder/blue,
/obj/item/stack/package_wrap{
pixel_x = -1;
pixel_y = -1
},
/obj/item/hand_labeler,
-/turf/open/floor/iron,
+/obj/structure/table/reinforced/rglass,
+/turf/open/floor/carpet/royalblue,
/area/station/command/heads_quarters/hop)
"buQ" = (
/obj/effect/turf_decal/tile/blue{
@@ -18456,12 +21006,6 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 4
@@ -18469,7 +21013,24 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 4
},
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/trimline/dark/filled/line{
+ alpha = 160;
+ dir = 10
+ },
+/obj/effect/turf_decal/trimline/dark/filled/mid_joiner{
+ dir = 8;
+ alpha = 160
+ },
+/obj/effect/turf_decal/trimline/purple/line{
+ alpha = 200;
+ dir = 10
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 10
+ },
+/turf/open/floor/iron/white/smooth_corner{
+ dir = 4
+ },
/area/station/science/research)
"buU" = (
/obj/structure/disposalpipe/segment{
@@ -18488,32 +21049,47 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 4
},
-/turf/open/floor/iron,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/science/research)
"buV" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 6
+/obj/effect/turf_decal/stripes/line,
+/obj/effect/turf_decal/stripes/white/line{
+ color = "#52B4E9";
+ name = "blue line"
+ },
+/turf/open/floor/iron/corner{
+ dir = 1
},
-/turf/open/floor/iron,
/area/station/command/teleporter)
"buW" = (
/obj/effect/turf_decal/stripes/line,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/stripes/white/line{
+ color = "#52B4E9";
+ name = "blue line"
+ },
+/turf/open/floor/iron/edge,
/area/station/command/teleporter)
"buX" = (
/obj/machinery/power/shieldwallgen,
-/obj/effect/turf_decal/bot,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/bot_blue,
+/obj/effect/turf_decal/box/blue,
+/obj/structure/railing{
+ dir = 4
+ },
+/turf/open/floor/plating/reinforced,
/area/station/command/teleporter)
"buY" = (
/obj/machinery/power/shieldwallgen,
-/obj/structure/window/reinforced/spawner/directional/west,
-/obj/effect/turf_decal/bot,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/bot_blue,
+/obj/effect/turf_decal/box/blue,
+/obj/structure/railing{
+ dir = 8
+ },
+/turf/open/floor/plating/reinforced,
/area/station/command/teleporter)
"buZ" = (
/obj/structure/closet/crate,
-/turf/open/floor/iron,
+/turf/open/floor/iron/dark/textured_large,
/area/station/command/teleporter)
"bvb" = (
/obj/structure/lattice/catwalk,
@@ -18532,7 +21108,20 @@
dir = 4
},
/obj/machinery/light/directional/south,
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/trimline/dark/filled/line{
+ alpha = 160;
+ dir = 2
+ },
+/obj/effect/turf_decal/trimline/dark/filled/mid_joiner{
+ dir = 2;
+ alpha = 160
+ },
+/obj/effect/turf_decal/trimline/purple/line{
+ alpha = 200;
+ dir = 2
+ },
+/obj/effect/turf_decal/siding/dark,
+/turf/open/floor/iron/white/smooth_edge,
/area/station/science/research)
"bve" = (
/obj/structure/disposalpipe/segment{
@@ -18545,7 +21134,16 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 1
},
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/trimline/dark/filled/warning{
+ alpha = 160
+ },
+/obj/effect/turf_decal/siding/dark,
+/obj/effect/turf_decal/trimline/purple/warning{
+ alpha = 200;
+ dir = 2;
+ color = "#a56dc2"
+ },
+/turf/open/floor/iron/white/smooth_edge,
/area/station/science/research)
"bvf" = (
/obj/machinery/camera/directional/east{
@@ -18554,8 +21152,23 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 4
},
-/turf/open/floor/iron/white/side{
- dir = 9
+/obj/effect/turf_decal/trimline/dark/filled/line{
+ alpha = 160;
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/dark/filled/mid_joiner{
+ dir = 4;
+ alpha = 160
+ },
+/obj/effect/turf_decal/trimline/purple/line{
+ alpha = 200;
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 4
+ },
+/turf/open/floor/iron/white/smooth_edge{
+ dir = 4
},
/area/station/science/research)
"bvg" = (
@@ -18572,12 +21185,6 @@
/turf/open/floor/iron/white,
/area/station/science/research)
"bvh" = (
-/obj/effect/turf_decal/tile/red{
- dir = 4
- },
-/obj/effect/turf_decal/tile/red{
- dir = 1
- },
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 4
@@ -18585,6 +21192,12 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 8
},
+/obj/effect/turf_decal/tile/red{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 1
+ },
/obj/machinery/button/door{
desc = "A remote control switch for the medbay foyer.";
id = "MedbayAft";
@@ -18607,6 +21220,9 @@
/turf/open/floor/iron/dark,
/area/station/security/checkpoint/medical)
"bvj" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
/obj/effect/turf_decal/tile/red{
dir = 1
},
@@ -18621,29 +21237,21 @@
/obj/effect/turf_decal/tile/neutral/opposingcorners{
dir = 1
},
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
- dir = 4
- },
/obj/structure/table/reinforced,
/turf/open/floor/iron/dark,
/area/station/security/checkpoint/medical)
"bvk" = (
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
-/obj/effect/turf_decal/tile/blue,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
/obj/effect/turf_decal/stripes/line,
/obj/machinery/door/firedoor,
-/turf/open/floor/iron/dark,
+/obj/effect/turf_decal/stripes/blue/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes/blue/line,
+/obj/effect/turf_decal/tile/blue/full,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/medical/medbay/lobby)
"bvl" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
@@ -18654,7 +21262,8 @@
/area/station/commons/dorms)
"bvn" = (
/obj/structure/disposaloutlet{
- dir = 8
+ dir = 8;
+ name = "trash outlet"
},
/obj/structure/disposalpipe/trunk{
dir = 4
@@ -18663,14 +21272,17 @@
/area/space/nearstation)
"bvo" = (
/obj/effect/turf_decal/trimline/blue/filled/warning{
+ alpha = 160;
dir = 4
},
-/obj/effect/turf_decal/trimline/blue/filled/corner,
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/iron/white,
-/area/station/medical/medbay/aft)
+/obj/effect/turf_decal/trimline/dark_blue/warning{
+ alpha = 200;
+ dir = 4
+ },
+/turf/open/floor/iron/white/smooth_edge{
+ dir = 4
+ },
+/area/station/medical/medbay/central)
"bvq" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -18678,20 +21290,18 @@
/turf/open/floor/plating/airless,
/area/space/nearstation)
"bvr" = (
-/obj/effect/turf_decal/trimline/blue/filled/line,
-/turf/open/floor/iron/white,
-/area/station/medical/medbay/aft)
+/obj/effect/turf_decal/trimline/blue/filled/line{
+ alpha = 160
+ },
+/obj/effect/turf_decal/trimline/dark_blue/line{
+ alpha = 200
+ },
+/obj/effect/turf_decal/trimline/blue/filled/mid_joiner,
+/obj/effect/turf_decal/trimline/blue/filled/mid_joiner,
+/obj/effect/turf_decal/trimline/dark_blue/mid_joiner,
+/turf/open/floor/iron/white/smooth_edge,
+/area/station/medical/medbay/central)
"bvs" = (
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/medical/glass{
name = "Medbay Storage"
@@ -18699,7 +21309,8 @@
/obj/structure/cable,
/obj/effect/mapping_helpers/airlock/access/any/medical/general,
/obj/structure/disposalpipe/segment,
-/turf/open/floor/iron/dark,
+/obj/effect/turf_decal/tile/blue/full,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/medical/storage)
"bvt" = (
/obj/machinery/atmospherics/pipe/smart/simple/brown/visible{
@@ -18751,7 +21362,7 @@
dir = 4
},
/turf/closed/wall,
-/area/station/medical/medbay/aft)
+/area/station/medical/medbay/central)
"bvB" = (
/obj/machinery/camera/directional/east{
c_tag = "Genetics Access";
@@ -18768,8 +21379,23 @@
/turf/open/floor/wood,
/area/station/maintenance/abandon_cafeteria)
"bvE" = (
-/turf/open/floor/iron/white/side{
- dir = 6
+/obj/effect/turf_decal/trimline/dark/filled/line{
+ alpha = 160;
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/dark/filled/mid_joiner{
+ dir = 1;
+ alpha = 160
+ },
+/obj/effect/turf_decal/trimline/purple/line{
+ alpha = 200;
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 1
+ },
+/turf/open/floor/iron/white/smooth_edge{
+ dir = 1
},
/area/station/science/research)
"bvG" = (
@@ -18780,8 +21406,23 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 8
},
-/turf/open/floor/iron/white/side{
- dir = 9
+/obj/effect/turf_decal/trimline/dark/filled/line{
+ alpha = 160;
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/dark/filled/mid_joiner{
+ dir = 4;
+ alpha = 160
+ },
+/obj/effect/turf_decal/trimline/purple/line{
+ alpha = 200;
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 4
+ },
+/turf/open/floor/iron/white/smooth_edge{
+ dir = 4
},
/area/station/science/research)
"bvI" = (
@@ -18789,20 +21430,25 @@
dir = 1
},
/obj/machinery/gulag_teleporter,
+/obj/effect/turf_decal/trimline/white/line{
+ dir = 1
+ },
/turf/open/floor/iron/dark,
/area/station/security/execution/education)
"bvJ" = (
-/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/plating,
+/obj/structure/window/reinforced/spawner/directional/south,
+/obj/structure/window/reinforced/spawner/directional/west,
+/obj/structure/window/reinforced/spawner/directional/east,
+/obj/structure/hedge,
+/turf/open/floor/grass,
/area/station/science/breakroom)
"bvK" = (
/turf/closed/wall,
/area/station/science/breakroom)
"bvM" = (
-/obj/effect/turf_decal/tile/yellow/half/contrasted{
+/obj/effect/turf_decal/trimline/yellow/filled/shrink_cw{
dir = 8
},
-/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/dark,
/area/station/engineering/atmos/hfr_room)
"bvN" = (
@@ -18835,14 +21481,11 @@
/turf/open/floor/plating,
/area/station/maintenance/aft)
"bvQ" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible{
- dir = 8
- },
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron,
/area/station/maintenance/starboard)
"bvR" = (
-/obj/machinery/atmospherics/components/unary/thermomachine/freezer{
+/obj/machinery/atmospherics/components/tank/air/layer4{
dir = 8
},
/turf/open/floor/iron,
@@ -18877,13 +21520,19 @@
/turf/open/floor/plating,
/area/station/cargo/storage)
"bvW" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes/white/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/white{
+ color = "#8b8b8b"
+ },
+/turf/open/floor/iron/textured_half,
/area/station/hallway/primary/central)
"bvY" = (
/obj/machinery/navbeacon{
@@ -18896,36 +21545,49 @@
"bvZ" = (
/obj/structure/table,
/obj/item/storage/medkit/regular{
- pixel_x = 6;
- pixel_y = -5
+ pixel_x = 12;
+ pixel_y = 3
},
-/obj/effect/turf_decal/tile/brown{
- dir = 8
+/obj/item/multitool{
+ pixel_x = -8;
+ pixel_y = 9
},
-/obj/effect/turf_decal/tile/brown,
/obj/effect/decal/cleanable/dirt,
-/obj/item/multitool,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/bot,
+/turf/open/floor/iron/dark/textured_large,
/area/station/cargo/office)
"bwa" = (
/obj/structure/disposalpipe/segment{
dir = 10
},
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/stripes/white/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/white/corner{
+ color = "#8b8b8b"
+ },
+/turf/open/floor/iron/edge{
+ dir = 1
+ },
/area/station/hallway/primary/central)
"bwb" = (
/obj/effect/turf_decal/stripes/corner{
dir = 1
},
-/turf/open/floor/iron,
+/obj/effect/turf_decal/stripes/white/corner{
+ dir = 1
+ },
+/turf/open/floor/iron/edge{
+ dir = 1
+ },
/area/station/hallway/primary/central)
"bwc" = (
/obj/structure/sign/warning/fire/directional/south,
-/obj/effect/spawner/structure/window,
+/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/station/maintenance/aft)
"bwd" = (
@@ -18937,17 +21599,22 @@
/turf/closed/wall,
/area/station/security/checkpoint/supply)
"bwf" = (
-/obj/machinery/camera/directional/west{
- c_tag = "Cargo Bay Entrance"
- },
/obj/structure/disposalpipe/segment,
-/obj/effect/turf_decal/tile/brown{
- dir = 8
- },
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
dir = 4
},
-/turf/open/floor/iron,
+/obj/machinery/camera/directional/west{
+ c_tag = "Cargo Bay Entrance"
+ },
+/obj/effect/turf_decal/trimline/brown/arrow_cw{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/brown/mid_joiner{
+ dir = 8
+ },
+/turf/open/floor/iron/corner{
+ dir = 4
+ },
/area/station/hallway/primary/central)
"bwg" = (
/obj/structure/cable,
@@ -18961,26 +21628,30 @@
/turf/open/floor/plating,
/area/station/maintenance/aft)
"bwh" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
-/turf/open/floor/iron,
-/area/station/hallway/primary/central)
-"bwi" = (
-/obj/effect/turf_decal/tile/blue{
+/obj/effect/turf_decal/stripes/white/line{
dir = 1
},
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
+/obj/effect/turf_decal/siding/white/corner{
+ color = "#8b8b8b";
dir = 8
},
+/turf/open/floor/iron/edge{
+ dir = 1
+ },
+/area/station/hallway/primary/central)
+"bwi" = (
/obj/machinery/photocopier/prebuilt,
/obj/item/radio/intercom/directional/west,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/siding/wood{
+ dir = 4
+ },
+/turf/open/floor/iron/dark/smooth_large,
/area/station/command/heads_quarters/hop)
"bwk" = (
-/obj/structure/table,
/obj/machinery/recharger{
pixel_x = -7
},
@@ -18996,49 +21667,59 @@
pixel_y = 6;
pixel_x = 6
},
-/turf/open/floor/iron,
+/obj/structure/table/reinforced/rglass,
+/turf/open/floor/carpet/royalblue,
/area/station/command/heads_quarters/hop)
"bwl" = (
/obj/structure/disposalpipe/segment,
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/siding/wood{
+ dir = 8
+ },
+/turf/open/floor/iron/dark/smooth_large,
/area/station/command/heads_quarters/hop)
"bwp" = (
/obj/structure/window/reinforced/spawner/directional/south,
/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
-/turf/open/floor/iron/dark/side,
+/obj/effect/turf_decal/trimline/dark_blue/filled/line{
+ dir = 10
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 10
+ },
+/turf/open/floor/iron/dark/small,
/area/station/security/checkpoint/escape)
"bwq" = (
/obj/machinery/teleport/station,
-/turf/open/floor/plating,
+/turf/open/floor/plating/reinforced,
/area/station/command/teleporter)
"bwr" = (
/obj/machinery/computer/teleporter{
dir = 1
},
-/turf/open/floor/plating,
+/turf/open/floor/plating/reinforced,
/area/station/command/teleporter)
"bws" = (
/obj/structure/rack,
/obj/item/tank/internals/oxygen,
/obj/item/clothing/mask/gas,
-/turf/open/floor/plating,
+/turf/open/floor/plating/reinforced,
/area/station/command/teleporter)
"bwt" = (
/obj/machinery/teleport/hub,
-/turf/open/floor/plating,
+/turf/open/floor/plating/reinforced,
/area/station/command/teleporter)
"bwu" = (
-/obj/machinery/door/firedoor,
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 4
},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 5
+ },
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer5,
/turf/open/floor/iron,
/area/station/hallway/secondary/entry)
"bwv" = (
@@ -19050,31 +21731,32 @@
/turf/open/floor/plating,
/area/station/medical/chemistry)
"bwx" = (
-/obj/effect/turf_decal/tile/yellow{
- dir = 1
+/obj/effect/turf_decal/trimline/yellow/filled/line{
+ dir = 9;
+ alpha = 120
},
-/obj/effect/turf_decal/tile/yellow{
- dir = 8
+/obj/effect/turf_decal/trimline/blue/line{
+ alpha = 200;
+ dir = 9
},
-/turf/open/floor/iron/white,
+/turf/open/floor/iron/white/smooth_corner,
/area/station/medical/chemistry)
"bwB" = (
-/turf/open/floor/iron/dark,
+/turf/open/floor/wood/tile,
/area/station/hallway/primary/fore)
"bwD" = (
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
- dir = 8
+/obj/item/stack/medical/gauze{
+ pixel_x = -2;
+ pixel_y = 8
},
-/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 1
+/obj/item/stack/medical/mesh{
+ pixel_x = 6;
+ pixel_y = 5
},
+/obj/item/stack/medical/suture,
+/obj/effect/turf_decal/tile/blue/full,
/obj/structure/table/glass,
-/obj/item/storage/box/syringes,
-/turf/open/floor/iron,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/medical/treatment_center)
"bwF" = (
/obj/structure/chair/office{
@@ -19085,15 +21767,15 @@
/area/station/security/detectives_office)
"bwG" = (
/obj/structure/cable,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+ dir = 1
+ },
/obj/effect/turf_decal/tile/red{
dir = 1
},
/obj/effect/turf_decal/tile/red{
dir = 8
},
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
- dir = 1
- },
/obj/effect/landmark/start/depsec/medical,
/turf/open/floor/iron/dark,
/area/station/security/checkpoint/medical)
@@ -19104,22 +21786,22 @@
/obj/machinery/computer/records/medical{
dir = 1
},
-/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
-/turf/open/floor/iron,
+/obj/effect/turf_decal/tile/blue/full,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/medical/treatment_center)
"bwI" = (
/obj/effect/spawner/random/structure/crate,
/turf/open/floor/plating,
/area/station/maintenance/fore)
+"bwN" = (
+/obj/effect/turf_decal/trimline/blue/filled/corner{
+ dir = 1
+ },
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+ dir = 4
+ },
+/turf/open/floor/iron,
+/area/station/hallway/secondary/entry)
"bwO" = (
/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{
dir = 4
@@ -19144,16 +21826,20 @@
/turf/open/floor/iron/dark,
/area/station/commons/dorms)
"bwV" = (
-/obj/structure/cable,
-/turf/open/floor/iron,
-/area/station/cargo/miningdock)
-"bwW" = (
-/obj/structure/cable,
-/obj/effect/turf_decal/tile/yellow{
+/obj/effect/turf_decal/trimline/brown/filled/line{
dir = 1
},
-/obj/effect/turf_decal/tile/brown{
- dir = 8
+/obj/effect/turf_decal/trimline/dark/line{
+ dir = 1
+ },
+/turf/open/floor/iron/textured_edge,
+/area/station/cargo/miningdock)
+"bwW" = (
+/obj/effect/turf_decal/trimline/brown/filled/warning{
+ dir = 9
+ },
+/obj/effect/turf_decal/trimline/dark/warning{
+ dir = 9
},
/turf/open/floor/iron,
/area/station/cargo/miningdock)
@@ -19164,7 +21850,15 @@
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/structure/disposalpipe/segment,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/brown/filled/corner{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/dark/corner{
+ dir = 1
+ },
+/turf/open/floor/iron/textured_corner{
+ dir = 1
+ },
/area/station/cargo/miningdock)
"bwY" = (
/obj/structure/table/wood,
@@ -19177,18 +21871,15 @@
/turf/open/floor/wood/tile,
/area/station/commons/dorms)
"bxb" = (
-/obj/effect/turf_decal/tile/blue{
- dir = 4
+/obj/effect/turf_decal/trimline/blue/filled/corner{
+ alpha = 160
},
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/yellow{
- dir = 8
- },
-/obj/effect/turf_decal/tile/yellow{
- dir = 1
+/obj/effect/turf_decal/trimline/white/corner,
+/obj/effect/turf_decal/siding/blue/corner{
+ color = "#8ab4cb"
},
/turf/open/floor/iron/white,
-/area/station/medical/chemistry)
+/area/station/medical/treatment_center)
"bxd" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -19200,7 +21891,20 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 4
},
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/trimline/dark/filled/line{
+ alpha = 160;
+ dir = 2
+ },
+/obj/effect/turf_decal/trimline/dark/filled/mid_joiner{
+ dir = 2;
+ alpha = 160
+ },
+/obj/effect/turf_decal/trimline/purple/line{
+ alpha = 200;
+ dir = 2
+ },
+/obj/effect/turf_decal/siding/dark,
+/turf/open/floor/iron/white/smooth_edge,
/area/station/science/research)
"bxe" = (
/obj/structure/disposalpipe/segment{
@@ -19209,7 +21913,20 @@
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/trimline/dark/filled/line{
+ alpha = 160;
+ dir = 2
+ },
+/obj/effect/turf_decal/trimline/dark/filled/mid_joiner{
+ dir = 2;
+ alpha = 160
+ },
+/obj/effect/turf_decal/trimline/purple/line{
+ alpha = 200;
+ dir = 2
+ },
+/obj/effect/turf_decal/siding/dark,
+/turf/open/floor/iron/white/smooth_edge,
/area/station/science/research)
"bxf" = (
/obj/structure/disposalpipe/segment{
@@ -19220,15 +21937,29 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 4
},
-/turf/open/floor/iron/white/side{
- dir = 5
+/obj/effect/turf_decal/trimline/dark/filled/corner{
+ alpha = 160;
+ dir = 8
},
+/obj/effect/turf_decal/trimline/purple/corner{
+ alpha = 200;
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/dark/corner{
+ dir = 8
+ },
+/turf/open/floor/iron/white,
/area/station/science/research)
"bxg" = (
/obj/machinery/greenscreen_camera{
dir = 4;
- pixel_x = -4;
- pixel_y = 6
+ pixel_y = 0
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 8
},
/turf/open/floor/wood,
/area/station/command/heads_quarters/captain)
@@ -19278,7 +22009,8 @@
/obj/effect/mapping_helpers/airlock/access/any/supply/mining,
/obj/structure/cable,
/obj/effect/mapping_helpers/airlock/access/any/supply/bit_den,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/tile/brown/full,
+/turf/open/floor/iron/large,
/area/station/cargo/miningdock)
"bxB" = (
/obj/structure/cable,
@@ -19315,23 +22047,21 @@
/turf/open/floor/plating,
/area/station/engineering/atmos)
"bxG" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/disposalpipe/segment,
/obj/machinery/door/airlock/command{
name = "Head of Personnel"
},
-/obj/structure/cable,
/obj/effect/landmark/navigate_destination,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/effect/mapping_helpers/airlock/access/any/command/hop,
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/iron,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/command/heads_quarters/hop)
"bxL" = (
-/obj/effect/turf_decal/tile/red{
- dir = 4
- },
/obj/machinery/computer/warrant,
-/obj/effect/turf_decal/bot,
+/obj/effect/turf_decal/bot_blue,
+/obj/structure/sign/poster/official/report_crimes/directional/east,
/turf/open/floor/iron/dark,
/area/station/hallway/primary/fore)
"bxO" = (
@@ -19340,7 +22070,22 @@
dir = 1
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/siding/dark,
+/obj/effect/turf_decal/stripes{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes/white/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/dark/corner{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/dark/corner{
+ dir = 4
+ },
+/turf/open/floor/iron/dark/smooth_edge{
+ dir = 1
+ },
/area/station/medical/cryo)
"bxP" = (
/obj/effect/turf_decal/stripes/corner{
@@ -19352,21 +22097,21 @@
/turf/open/floor/iron/white,
/area/station/science/ordnance)
"bxS" = (
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/table/glass,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/tile/blue/full,
+/obj/structure/table/reinforced/rglass,
+/obj/item/reagent_containers/spray/cleaner{
+ pixel_x = -6;
+ pixel_y = 9
+ },
+/obj/item/serviette_pack{
+ pixel_x = 7;
+ pixel_y = 6;
+ desc = "For cleaning small messes."
+ },
+/turf/open/floor/iron/dark/smooth_large,
/area/station/medical/treatment_center)
"bxT" = (
/obj/machinery/shower/directional/east{
@@ -19374,15 +22119,11 @@
pixel_x = 16
},
/obj/structure/drain,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/noslip/tram{
color = "#52B4E9"
},
/area/station/medical/treatment_center)
"bxU" = (
-/obj/effect/turf_decal/stripes/line,
-/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 10
},
@@ -19390,13 +22131,35 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/trimline/dark/filled/line{
+ alpha = 160
+ },
+/obj/effect/turf_decal/trimline/dark/filled/corner{
+ alpha = 160;
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/purple/corner{
+ color = "#700047";
+ alpha = 200;
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/purple/line{
+ color = "#700047";
+ alpha = 200
+ },
+/obj/effect/turf_decal/siding/dark,
+/obj/effect/turf_decal/siding/dark/corner{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/dark/filled/mid_joiner{
+ dir = 2;
+ alpha = 160
+ },
+/turf/open/floor/iron/white/smooth_edge,
/area/station/science/lab)
"bxV" = (
/obj/machinery/shower/directional/east,
/obj/structure/drain,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/noslip/tram{
color = "#52B4E9"
},
@@ -19442,6 +22205,12 @@
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/station/security/checkpoint/science)
+"bym" = (
+/obj/machinery/hydroponics/constructable,
+/obj/effect/turf_decal/siding/thinplating/dark,
+/obj/machinery/door/window/left/directional/east,
+/turf/open/floor/iron/smooth_large,
+/area/station/service/hydroponics)
"byo" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 4
@@ -19475,24 +22244,42 @@
/turf/open/floor/iron,
/area/station/maintenance/disposal/incinerator)
"byx" = (
-/obj/machinery/atmospherics/components/unary/thermomachine/heater{
+/obj/machinery/atmospherics/components/unary/portables_connector/visible{
dir = 8
},
/turf/open/floor/plating,
/area/station/maintenance/starboard)
"byE" = (
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/brown/filled/line{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/dark/line{
+ dir = 4
+ },
+/turf/open/floor/iron/textured_edge{
+ dir = 8
+ },
/area/station/cargo/miningdock)
"byG" = (
/obj/structure/disposalpipe/segment,
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/iron,
+/turf/open/floor/iron/large,
/area/station/cargo/miningdock)
"byN" = (
/obj/machinery/newscaster/directional/north,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/dark_blue/line{
+ dir = 1;
+ alpha = 200
+ },
+/obj/effect/turf_decal/trimline/dark_blue/mid_joiner{
+ dir = 1;
+ alpha = 200
+ },
+/turf/open/floor/iron/edge{
+ dir = 1
+ },
/area/station/hallway/primary/central)
"byO" = (
/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{
@@ -19502,40 +22289,32 @@
/area/station/maintenance/disposal/incinerator)
"byP" = (
/obj/structure/sign/warning/secure_area/directional/north,
-/obj/effect/turf_decal/tile/blue{
+/obj/effect/turf_decal/trimline/green/corner{
dir = 1
},
-/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
-/turf/open/floor/iron,
+/turf/open/floor/iron/corner,
/area/station/hallway/primary/central)
"byQ" = (
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
-/obj/effect/turf_decal/tile/blue{
+/obj/effect/turf_decal/siding/dark/corner{
dir = 4
},
-/turf/open/floor/iron,
+/turf/open/floor/iron/edge{
+ dir = 1
+ },
/area/station/hallway/primary/central)
"byR" = (
/obj/structure/disposalpipe/segment{
dir = 5
},
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/iron,
+/turf/open/floor/iron/edge{
+ dir = 1
+ },
/area/station/hallway/primary/central)
"byS" = (
/obj/structure/disposalpipe/segment{
@@ -19544,28 +22323,35 @@
/obj/effect/turf_decal/stripes/corner{
dir = 4
},
-/turf/open/floor/iron,
+/obj/effect/turf_decal/stripes/white/corner{
+ dir = 4
+ },
+/turf/open/floor/iron/edge{
+ dir = 1
+ },
/area/station/hallway/primary/central)
"byU" = (
/obj/machinery/light/directional/south,
-/turf/open/floor/iron,
+/turf/open/floor/iron/edge,
/area/station/hallway/primary/central)
"byV" = (
-/obj/structure/extinguisher_cabinet{
- pixel_x = 5;
- pixel_y = -32
+/obj/structure/extinguisher_cabinet/directional/south,
+/obj/effect/turf_decal/trimline/brown/corner{
+ dir = 8
},
-/turf/open/floor/iron,
+/turf/open/floor/iron/edge,
/area/station/hallway/primary/central)
"byW" = (
-/obj/structure/extinguisher_cabinet{
- pixel_x = 5;
- pixel_y = -32
- },
/obj/structure/disposalpipe/segment{
dir = 4
},
-/turf/open/floor/iron,
+/obj/structure/extinguisher_cabinet/directional/south,
+/obj/effect/turf_decal/trimline/purple/corner{
+ dir = 8
+ },
+/turf/open/floor/iron/corner{
+ dir = 4
+ },
/area/station/hallway/primary/central)
"byX" = (
/obj/structure/cable,
@@ -19575,38 +22361,20 @@
/turf/closed/wall/r_wall,
/area/station/security/checkpoint/medical)
"bzc" = (
-/obj/effect/turf_decal/tile/yellow{
+/obj/item/radio/intercom/directional/east,
+/obj/effect/turf_decal/trimline/yellow/filled/line{
+ dir = 4;
+ alpha = 120
+ },
+/obj/effect/turf_decal/trimline/blue/line{
+ alpha = 200;
dir = 4
},
-/obj/effect/turf_decal/tile/yellow,
-/obj/item/radio/intercom/directional/east,
-/obj/structure/table,
-/obj/item/stack/sheet/iron/fifty{
- pixel_x = 5;
- pixel_y = 4
+/turf/open/floor/iron/white/smooth_edge{
+ dir = 4
},
-/obj/item/stack/sheet/iron/fifty{
- pixel_y = 2
- },
-/obj/item/construction/plumbing{
- pixel_x = 2;
- pixel_y = 2
- },
-/obj/item/construction/plumbing,
-/turf/open/floor/iron/white,
/area/station/medical/chemistry)
"bzh" = (
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
-/obj/machinery/computer/crew,
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 8
@@ -19614,7 +22382,9 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 4
},
-/turf/open/floor/iron,
+/obj/machinery/computer/crew,
+/obj/effect/turf_decal/tile/blue/full,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/medical/treatment_center)
"bzm" = (
/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{
@@ -19676,50 +22446,72 @@
/turf/open/floor/iron/dark,
/area/station/science/server)
"bzA" = (
-/obj/effect/turf_decal/tile/red{
- dir = 8
+/obj/effect/turf_decal/trimline/dark_blue/filled/line{
+ dir = 10
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 10
},
-/obj/effect/turf_decal/tile/red,
-/obj/effect/turf_decal/tile/neutral,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
- dir = 1
+ dir = 4
},
-/turf/open/floor/iron/dark,
+/turf/open/floor/iron/dark/small,
/area/station/security/checkpoint/escape)
"bzB" = (
/obj/effect/landmark/blobstart,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron,
/area/station/maintenance/disposal/incinerator)
-"bzE" = (
-/turf/open/floor/iron/white/side{
- dir = 5
+"bzC" = (
+/obj/structure/disposalpipe/segment,
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/turf_decal/siding/dark{
+ dir = 4
},
-/area/station/science/research)
+/obj/effect/turf_decal/siding/dark{
+ dir = 8
+ },
+/turf/open/floor/wood/tile,
+/area/station/command/meeting_room)
"bzF" = (
-/obj/machinery/firealarm/directional/east,
-/turf/open/floor/iron,
+/obj/machinery/power/apc/auto_name/directional/east,
+/obj/structure/cable,
+/obj/effect/turf_decal/trimline/brown/filled/line{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/dark/line{
+ dir = 4
+ },
+/turf/open/floor/iron/textured_edge{
+ dir = 8
+ },
/area/station/cargo/miningdock)
"bzG" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/public/glass{
name = "Central Access"
},
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/yellow/warning{
+ dir = 4
+ },
+/turf/open/floor/iron/large,
/area/station/hallway/primary/aft)
"bzI" = (
-/obj/effect/turf_decal/tile/yellow{
- dir = 1
+/obj/machinery/light/directional/west,
+/obj/structure/extinguisher_cabinet/directional/west,
+/obj/effect/turf_decal/trimline/yellow/filled/line{
+ dir = 8;
+ alpha = 120
},
-/obj/effect/turf_decal/tile/yellow{
+/obj/effect/turf_decal/trimline/blue/line{
+ alpha = 200;
dir = 8
},
-/obj/structure/extinguisher_cabinet{
- pixel_x = -27;
- pixel_y = 1
+/turf/open/floor/iron/white/smooth_edge{
+ dir = 8
},
-/obj/machinery/light/directional/west,
-/turf/open/floor/iron/white,
/area/station/medical/chemistry)
"bzJ" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
@@ -19757,17 +22549,16 @@
/turf/open/floor/iron,
/area/station/maintenance/disposal/incinerator)
"bzS" = (
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
/obj/effect/turf_decal/tile/yellow,
/obj/effect/turf_decal/tile/yellow{
dir = 4
},
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/tile/blue/half{
+ dir = 8
+ },
+/turf/open/floor/iron/white/smooth_edge{
+ dir = 8
+ },
/area/station/medical/chemistry)
"bzX" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
@@ -19776,27 +22567,32 @@
/obj/effect/turf_decal/trimline/blue/filled/corner{
dir = 4
},
+/obj/effect/turf_decal/trimline/white/corner{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/blue/corner{
+ color = "#8ab4cb";
+ dir = 4
+ },
/turf/open/floor/iron/white,
/area/station/medical/treatment_center)
"bzY" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 4
},
-/turf/open/floor/iron,
+/turf/open/floor/iron/large,
/area/station/cargo/miningdock)
"bzZ" = (
/obj/machinery/door/firedoor/heavy,
/obj/machinery/light/directional/east,
-/turf/open/floor/iron/white/side{
- dir = 9
- },
+/turf/open/floor/iron/dark/smooth_large,
/area/station/science/research)
"bAa" = (
/obj/machinery/door/firedoor/heavy,
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/iron/white,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/science/research)
"bAb" = (
/obj/machinery/newscaster/directional/south,
@@ -19809,6 +22605,15 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron,
/area/station/maintenance/disposal/incinerator)
+"bAd" = (
+/obj/effect/turf_decal/siding/dark{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 8
+ },
+/turf/open/floor/wood/tile,
+/area/station/command/heads_quarters/captain)
"bAe" = (
/obj/machinery/navbeacon{
codes_txt = "patrol;next_patrol=AIW";
@@ -19824,11 +22629,13 @@
/turf/open/floor/iron,
/area/station/hallway/primary/central)
"bAf" = (
-/obj/machinery/holopad,
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/iron,
+/obj/machinery/holopad{
+ pixel_x = 1
+ },
+/turf/open/floor/iron/large,
/area/station/hallway/primary/central)
"bAi" = (
/obj/machinery/atmospherics/pipe/smart/simple/orange/visible,
@@ -19854,7 +22661,7 @@
/obj/structure/disposalpipe/segment{
dir = 5
},
-/turf/open/floor/iron,
+/turf/open/floor/iron/large,
/area/station/cargo/miningdock)
"bAn" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
@@ -19873,21 +22680,25 @@
/obj/effect/mapping_helpers/airlock/access/any/supply/mining,
/turf/open/floor/plating,
/area/station/maintenance/port/aft)
-"bAq" = (
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
-/obj/effect/turf_decal/tile/blue{
+"bAo" = (
+/obj/effect/turf_decal/trimline/brown/filled/line{
dir = 4
},
-/obj/effect/turf_decal/tile/blue{
- dir = 1
+/obj/effect/turf_decal/trimline/dark/line{
+ dir = 4
},
-/obj/structure/table/glass,
+/obj/machinery/light/small/dim/directional/east,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+ dir = 8
+ },
+/turf/open/floor/iron,
+/area/station/maintenance/port/aft)
+"bAq" = (
/obj/item/radio/intercom/directional/west,
/obj/effect/spawner/random/medical/medkit,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/tile/blue/full,
+/obj/structure/table/glass,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/medical/treatment_center)
"bAr" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
@@ -19896,26 +22707,75 @@
/obj/effect/turf_decal/trimline/blue/filled/line{
dir = 5
},
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/trimline/white/line{
+ dir = 5
+ },
+/obj/effect/turf_decal/trimline/blue/filled/mid_joiner{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/blue/filled/mid_joiner{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/white/mid_joiner{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/white/mid_joiner{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/blue{
+ color = "#8ab4cb";
+ dir = 5
+ },
+/turf/open/floor/iron/white/smooth_corner{
+ dir = 8
+ },
/area/station/medical/treatment_center)
"bAs" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/effect/turf_decal/trimline/blue/filled/line{
dir = 1
},
/obj/machinery/holopad,
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/trimline/white/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/blue/filled/mid_joiner{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/white/mid_joiner{
+ dir = 1
+ },
+/obj/structure/railing/corner/end/flip{
+ dir = 4
+ },
+/obj/structure/railing/corner/end{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/blue{
+ color = "#8ab4cb";
+ dir = 1
+ },
+/turf/open/floor/iron/white/smooth_edge{
+ dir = 1
+ },
/area/station/medical/treatment_center)
"bAu" = (
-/obj/effect/landmark/start/medical_doctor,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
dir = 8
},
+/obj/effect/landmark/start/medical_doctor,
/obj/effect/turf_decal/trimline/blue/filled/corner{
dir = 1
},
+/obj/effect/turf_decal/trimline/white/corner{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/blue/corner{
+ color = "#8ab4cb";
+ dir = 1
+ },
/turf/open/floor/iron/white,
/area/station/medical/treatment_center)
"bAw" = (
@@ -20048,17 +22908,43 @@
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/trimline/dark/filled/line{
+ alpha = 160;
+ dir = 10
+ },
+/obj/effect/turf_decal/trimline/dark/filled/mid_joiner{
+ dir = 8;
+ alpha = 160
+ },
+/obj/effect/turf_decal/trimline/dark/filled/mid_joiner{
+ dir = 2;
+ alpha = 160
+ },
+/obj/effect/turf_decal/trimline/purple/line{
+ alpha = 200;
+ dir = 10;
+ color = "#a56dc2"
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 10
+ },
+/turf/open/floor/iron/white/smooth_corner{
+ dir = 4
+ },
/area/station/science/xenobiology)
"bAX" = (
-/obj/effect/turf_decal/tile/yellow{
- dir = 1
+/obj/machinery/firealarm/directional/west,
+/obj/effect/turf_decal/trimline/yellow/filled/line{
+ dir = 8;
+ alpha = 120
},
-/obj/effect/turf_decal/tile/yellow{
+/obj/effect/turf_decal/trimline/blue/line{
+ alpha = 200;
+ dir = 8
+ },
+/turf/open/floor/iron/white/smooth_edge{
dir = 8
},
-/obj/machinery/firealarm/directional/west,
-/turf/open/floor/iron/white,
/area/station/medical/chemistry)
"bBe" = (
/obj/structure/dresser,
@@ -20078,11 +22964,13 @@
/area/station/maintenance/disposal/incinerator)
"bBh" = (
/obj/structure/disposalpipe/segment,
-/obj/effect/turf_decal/tile/brown{
- dir = 8
- },
/obj/structure/cable,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/brown/corner{
+ dir = 1
+ },
+/turf/open/floor/iron/corner{
+ dir = 4
+ },
/area/station/hallway/primary/central)
"bBi" = (
/obj/structure/cable,
@@ -20098,9 +22986,29 @@
/turf/open/floor/iron,
/area/station/maintenance/disposal/incinerator)
"bBn" = (
-/obj/effect/turf_decal/trimline/blue/filled/warning,
-/turf/open/floor/iron/white,
-/area/station/medical/medbay/aft)
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/turf_decal/trimline/blue/filled/corner{
+ alpha = 160;
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/blue/filled/corner{
+ alpha = 160;
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/dark_blue/corner{
+ alpha = 200;
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/dark_blue/corner{
+ alpha = 200;
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/turf/open/floor/iron/white/smooth_edge,
+/area/station/medical/medbay/central)
"bBo" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/stripes/line{
@@ -20135,14 +23043,23 @@
pixel_x = -32;
pixel_y = -32
},
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/yellow/corner{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/white/corner{
+ color = "#8b8b8b";
+ dir = 4
+ },
+/turf/open/floor/iron/edge,
/area/station/hallway/primary/central)
"bBr" = (
/obj/structure/disposalpipe/segment{
dir = 4
},
/obj/machinery/status_display/evac/directional/south,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/yellow/arrow_cw,
+/obj/effect/turf_decal/trimline/yellow/mid_joiner,
+/turf/open/floor/iron/edge,
/area/station/hallway/primary/central)
"bBt" = (
/obj/structure/disposalpipe/segment{
@@ -20151,7 +23068,9 @@
/obj/machinery/camera/directional/south{
c_tag = "Central Primary Hallway South"
},
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/purple/arrow_ccw,
+/obj/effect/turf_decal/trimline/purple/mid_joiner,
+/turf/open/floor/iron/edge,
/area/station/hallway/primary/central)
"bBw" = (
/obj/structure/table/glass,
@@ -20179,22 +23098,42 @@
/turf/open/floor/iron/dark,
/area/station/medical/storage)
"bBx" = (
-/obj/machinery/door/firedoor,
/obj/structure/disposalpipe/segment{
dir = 4
},
-/turf/open/floor/iron,
+/obj/machinery/door/firedoor,
+/obj/effect/turf_decal/trimline/purple/warning,
+/turf/open/floor/iron/large,
/area/station/hallway/primary/central)
"bBy" = (
/obj/structure/disposalpipe/segment{
dir = 4
},
/obj/machinery/light/directional/south,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/purple/corner,
+/obj/effect/turf_decal/trimline/yellow/corner{
+ dir = 8
+ },
+/turf/open/floor/iron/edge,
/area/station/hallway/primary/central)
"bBD" = (
-/turf/open/floor/iron/white/side{
- dir = 9
+/obj/effect/turf_decal/trimline/dark/filled/line{
+ alpha = 160;
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/dark/filled/mid_joiner{
+ dir = 4;
+ alpha = 160
+ },
+/obj/effect/turf_decal/trimline/purple/line{
+ alpha = 200;
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 4
+ },
+/turf/open/floor/iron/white/smooth_edge{
+ dir = 4
},
/area/station/science/research)
"bBE" = (
@@ -20325,7 +23264,12 @@
/turf/closed/wall/r_wall,
/area/station/science/ordnance/freezerchamber)
"bCj" = (
-/turf/open/floor/iron/dark,
+/obj/effect/turf_decal/trimline/purple/filled/end{
+ dir = 8;
+ alpha = 160;
+ color = "#6a3182"
+ },
+/turf/open/floor/iron/dark/small,
/area/station/science/breakroom)
"bCk" = (
/obj/structure/extinguisher_cabinet/directional/west,
@@ -20340,6 +23284,7 @@
dir = 5
},
/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer4,
/turf/open/floor/iron,
/area/station/maintenance/starboard)
"bCn" = (
@@ -20360,29 +23305,37 @@
id = "warehouse_shutters";
name = "warehouse shutters control"
},
-/obj/effect/turf_decal/tile/yellow{
- dir = 1
- },
-/obj/effect/turf_decal/tile/brown{
+/obj/effect/turf_decal/trimline/brown/filled/line{
dir = 8
},
-/obj/item/kirbyplants/random,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/dark/line{
+ dir = 8
+ },
+/turf/open/floor/iron/textured_edge{
+ dir = 4
+ },
/area/station/cargo/miningdock)
"bCp" = (
-/obj/effect/turf_decal/tile/yellow,
/obj/machinery/light/directional/east,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/yellow/line{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/yellow/mid_joiner{
+ dir = 4
+ },
+/turf/open/floor/iron/textured_half{
+ dir = 8
+ },
/area/station/hallway/primary/aft)
"bCq" = (
/turf/closed/wall,
/area/station/maintenance/port/aft)
"bCr" = (
-/obj/machinery/door/airlock/maintenance,
/obj/structure/cable,
+/obj/structure/disposalpipe/segment,
+/obj/machinery/door/airlock/maintenance,
/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance/departmental,
/obj/effect/mapping_helpers/airlock/unres,
-/obj/structure/disposalpipe/segment,
/turf/open/floor/plating,
/area/station/maintenance/port/aft)
"bCs" = (
@@ -20400,7 +23353,10 @@
/obj/machinery/door/airlock/public/glass{
name = "Central Access"
},
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/yellow/warning{
+ dir = 8
+ },
+/turf/open/floor/iron/large,
/area/station/hallway/primary/aft)
"bCv" = (
/turf/closed/wall,
@@ -20412,13 +23368,13 @@
/turf/open/floor/iron,
/area/station/service/janitor)
"bCx" = (
-/obj/effect/turf_decal/siding/wood{
- dir = 1
- },
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 4
},
+/obj/effect/turf_decal/siding/wood{
+ dir = 1
+ },
/turf/open/floor/wood,
/area/station/command/heads_quarters/blueshield)
"bCA" = (
@@ -20426,16 +23382,23 @@
/turf/open/floor/iron/dark,
/area/station/hallway/primary/central)
"bCB" = (
-/obj/machinery/door/airlock/maintenance{
- name = "Chemistry Maintenance"
- },
/obj/structure/cable,
-/obj/effect/mapping_helpers/airlock/access/any/medical/chemistry,
/obj/structure/disposalpipe/segment{
dir = 4
},
-/turf/open/floor/plating,
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/maintenance{
+ name = "Chemistry Maintenance"
+ },
+/obj/effect/mapping_helpers/airlock/access/any/medical/chemistry,
+/obj/effect/mapping_helpers/broken_floor,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/maintenance/aft)
+"bCD" = (
+/obj/machinery/holopad,
+/obj/effect/turf_decal/bot,
+/turf/open/floor/iron/large,
+/area/station/hallway/secondary/entry)
"bCE" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -20444,85 +23407,107 @@
/turf/open/floor/iron/white,
/area/station/medical/chemistry)
"bCF" = (
-/obj/effect/turf_decal/tile/yellow{
- dir = 1
- },
-/obj/effect/turf_decal/tile/yellow{
- dir = 8
- },
/obj/structure/disposalpipe/segment{
dir = 4
},
/obj/structure/cable,
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/trimline/yellow/filled/warning{
+ alpha = 120;
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/blue/warning{
+ dir = 8;
+ alpha = 200
+ },
+/turf/open/floor/iron/white/smooth_edge{
+ dir = 8
+ },
/area/station/medical/chemistry)
"bCH" = (
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
/obj/effect/turf_decal/tile/yellow{
dir = 8
},
/obj/effect/turf_decal/tile/yellow{
dir = 1
},
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/tile/blue/half{
+ dir = 4
+ },
+/turf/open/floor/iron/white/smooth_edge{
+ dir = 4
+ },
/area/station/medical/chemistry)
"bCI" = (
/obj/effect/landmark/event_spawn,
/obj/structure/disposalpipe/segment,
-/obj/structure/displaycase/trophy,
-/obj/effect/turf_decal/siding/wood/end,
+/obj/effect/turf_decal/siding/wood{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/wood{
+ dir = 4
+ },
/turf/open/floor/iron/dark/textured_large,
/area/station/service/library)
"bCJ" = (
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
/obj/effect/turf_decal/tile/yellow,
/obj/effect/turf_decal/tile/yellow{
dir = 4
},
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/tile/blue/half{
+ dir = 8
+ },
+/turf/open/floor/iron/white/smooth_edge{
+ dir = 8
+ },
/area/station/medical/chemistry)
"bCL" = (
/obj/machinery/light/directional/east,
-/obj/structure/extinguisher_cabinet{
- pixel_x = 27
+/obj/structure/extinguisher_cabinet/directional/east,
+/obj/effect/turf_decal/trimline/yellow/filled/line{
+ dir = 4;
+ alpha = 120
+ },
+/obj/effect/turf_decal/trimline/blue/line{
+ alpha = 200;
+ dir = 4
+ },
+/turf/open/floor/iron/white/smooth_edge{
+ dir = 4
},
-/turf/open/floor/iron/white,
/area/station/medical/chemistry)
"bCM" = (
/obj/effect/turf_decal/trimline/blue/filled/line{
+ alpha = 160;
dir = 6
},
-/turf/open/floor/iron/white,
-/area/station/medical/medbay/central)
-"bCN" = (
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
- dir = 8
+/obj/structure/extinguisher_cabinet/directional/south,
+/obj/effect/turf_decal/trimline/white/line{
+ dir = 6
},
-/obj/effect/turf_decal/tile/blue{
+/obj/effect/turf_decal/trimline/white/mid_joiner,
+/obj/effect/turf_decal/trimline/blue/filled/mid_joiner,
+/obj/effect/turf_decal/trimline/blue/filled/mid_joiner,
+/obj/effect/turf_decal/trimline/white/mid_joiner,
+/obj/effect/turf_decal/trimline/blue/filled/mid_joiner{
dir = 4
},
-/obj/effect/turf_decal/tile/blue{
+/obj/effect/turf_decal/trimline/blue/filled/mid_joiner{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/white/mid_joiner{
+ dir = 4
+ },
+/turf/open/floor/iron/white/smooth_corner{
dir = 1
},
-/obj/structure/table/glass,
-/obj/structure/extinguisher_cabinet{
- pixel_y = -30
- },
+/area/station/medical/medbay/central)
+"bCN" = (
/obj/machinery/requests_console{
department = "Medbay";
name = "Medbay RC";
@@ -20538,22 +23523,19 @@
pixel_y = 10
},
/obj/machinery/light/directional/west,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/tile/blue/full,
+/obj/structure/table/glass,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/medical/treatment_center)
"bCO" = (
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
/obj/machinery/defibrillator_mount/directional/south,
/obj/effect/spawner/random/medical/patient_stretcher,
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/tile/blue/full,
+/obj/effect/turf_decal/siding/blue{
+ color = "#8ab4cb";
+ dir = 10
+ },
+/turf/open/floor/iron/white/smooth_large,
/area/station/medical/treatment_center)
"bCP" = (
/obj/effect/turf_decal/trimline/blue/filled/line{
@@ -20565,7 +23547,19 @@
network = list("ss13","medbay")
},
/obj/machinery/firealarm/directional/south,
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/trimline/white/line{
+ dir = 10
+ },
+/obj/effect/turf_decal/trimline/blue/filled/mid_joiner{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/blue/filled/mid_joiner,
+/obj/effect/turf_decal/siding/blue{
+ color = "#8ab4cb"
+ },
+/turf/open/floor/iron/white/smooth_corner{
+ dir = 4
+ },
/area/station/medical/treatment_center)
"bCQ" = (
/turf/closed/wall/r_wall,
@@ -20579,38 +23573,48 @@
/turf/open/floor/plating,
/area/station/maintenance/fore)
"bCS" = (
-/obj/effect/turf_decal/trimline/blue/filled/line,
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/trimline/blue/filled/line{
+ alpha = 160
+ },
+/obj/effect/turf_decal/trimline/white/line,
+/obj/effect/turf_decal/trimline/blue/filled/mid_joiner,
+/obj/effect/turf_decal/trimline/blue/filled/mid_joiner,
+/obj/effect/turf_decal/trimline/white/mid_joiner,
+/turf/open/floor/iron/white/smooth_edge,
/area/station/medical/medbay/central)
"bCT" = (
-/obj/effect/turf_decal/tile/yellow{
- dir = 4
- },
-/obj/effect/turf_decal/tile/yellow,
/obj/structure/chair/office/light{
dir = 4
},
-/turf/open/floor/iron/white,
-/area/station/medical/chemistry)
-"bCU" = (
-/obj/effect/turf_decal/stripes/line,
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/obj/machinery/door/firedoor,
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+/obj/effect/turf_decal/siding/yellow{
dir = 4
},
-/turf/open/floor/iron/dark,
-/area/station/medical/medbay/aft)
+/turf/open/floor/iron/dark/small,
+/area/station/medical/chemistry)
+"bCU" = (
+/obj/effect/turf_decal/trimline/yellow/filled/line{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 8
+ },
+/turf/open/floor/iron/dark/small,
+/area/station/medical/chemistry)
"bCX" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 4
},
/obj/machinery/holopad,
-/turf/open/floor/iron/dark,
+/obj/effect/turf_decal/trimline/purple/filled/line{
+ alpha = 160;
+ color = "#6a3182"
+ },
+/obj/effect/turf_decal/trimline/purple/filled/corner{
+ color = "#6a3182";
+ alpha = 160;
+ dir = 1
+ },
+/turf/open/floor/iron/dark/small,
/area/station/science/breakroom)
"bCY" = (
/obj/effect/turf_decal/tile/blue{
@@ -20643,22 +23647,22 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/turf/open/floor/iron/cafeteria,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/science/breakroom)
"bDd" = (
/obj/machinery/door/firedoor/heavy,
/obj/machinery/airalarm/directional/west,
-/turf/open/floor/iron/white/side{
- dir = 5
- },
+/turf/open/floor/iron/dark/smooth_large,
/area/station/science/research)
"bDe" = (
-/obj/effect/landmark/event_spawn,
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 9
},
-/turf/open/floor/iron,
+/obj/effect/landmark/event_spawn,
+/turf/open/floor/iron/edge{
+ dir = 8
+ },
/area/station/hallway/primary/port)
"bDf" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
@@ -20671,12 +23675,16 @@
/obj/structure/disposalpipe/segment{
dir = 5
},
-/turf/open/floor/iron/dark,
+/obj/effect/turf_decal/trimline/purple/filled/line{
+ alpha = 160;
+ color = "#6a3182";
+ dir = 6
+ },
+/turf/open/floor/iron/dark/small,
/area/station/science/breakroom)
"bDg" = (
-/obj/structure/rack,
-/obj/effect/spawner/random/maintenance/three,
/obj/machinery/light/small/directional/south,
+/obj/effect/spawner/random/burgerstation/loot/with_maintenance_loot,
/turf/open/floor/plating,
/area/station/maintenance/starboard)
"bDh" = (
@@ -20692,12 +23700,26 @@
dir = 1
},
/obj/structure/cable,
-/turf/open/floor/iron/dark,
+/obj/effect/turf_decal/trimline/purple/filled/line{
+ alpha = 160;
+ color = "#6a3182"
+ },
+/turf/open/floor/iron/dark/small,
/area/station/science/breakroom)
"bDk" = (
/obj/effect/turf_decal/trimline/brown/filled/warning{
- dir = 8
+ dir = 10
},
+/obj/effect/turf_decal/trimline/dark/warning{
+ dir = 10
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/obj/structure/cable,
/turf/open/floor/iron,
/area/station/cargo/miningdock)
"bDl" = (
@@ -20711,8 +23733,23 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 4
},
-/turf/open/floor/iron/white/side{
- dir = 5
+/obj/effect/turf_decal/trimline/dark/filled/mid_joiner{
+ dir = 8;
+ alpha = 160
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/dark/filled/warning{
+ alpha = 160;
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/purple/warning{
+ alpha = 200;
+ dir = 8
+ },
+/turf/open/floor/iron/white/smooth_edge{
+ dir = 8
},
/area/station/science/research)
"bDm" = (
@@ -20730,7 +23767,7 @@
dir = 4
},
/obj/effect/mapping_helpers/airlock/access/any/science/ordnance_storage,
-/turf/open/floor/iron,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/science/ordnance/storage)
"bDq" = (
/obj/structure/table,
@@ -20795,22 +23832,25 @@
/turf/open/floor/iron,
/area/station/engineering/storage/tech)
"bDF" = (
-/obj/effect/turf_decal/trimline/blue/filled/warning{
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/turf/open/floor/iron/white/smooth_edge{
dir = 1
},
-/obj/structure/cable,
-/turf/open/floor/iron/white,
/area/station/medical/medbay/aft)
"bDG" = (
/obj/structure/disposalpipe/segment,
-/obj/effect/turf_decal/tile/yellow{
- dir = 1
- },
-/obj/effect/turf_decal/tile/yellow{
+/obj/machinery/door/firedoor,
+/obj/effect/turf_decal/trimline/yellow/warning{
dir = 8
},
-/obj/machinery/door/firedoor,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/siding/dark/corner{
+ dir = 8
+ },
+/turf/open/floor/iron/large,
/area/station/hallway/primary/aft)
"bDH" = (
/obj/structure/closet/l3closet/janitor,
@@ -20818,11 +23858,26 @@
/turf/open/floor/iron,
/area/station/service/janitor)
"bDI" = (
-/obj/effect/turf_decal/trimline/blue/filled/line{
- dir = 1
- },
/obj/machinery/airalarm/directional/north,
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/trimline/blue/filled/line{
+ alpha = 160;
+ dir = 5
+ },
+/obj/effect/turf_decal/trimline/dark_blue/line{
+ alpha = 200;
+ dir = 5
+ },
+/obj/effect/turf_decal/trimline/blue/filled/mid_joiner{
+ dir = 4;
+ alpha = 160
+ },
+/obj/effect/turf_decal/trimline/blue/filled/mid_joiner{
+ dir = 1;
+ alpha = 160
+ },
+/turf/open/floor/iron/white/smooth_corner{
+ dir = 8
+ },
/area/station/medical/medbay/aft)
"bDJ" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
@@ -20856,14 +23911,14 @@
/turf/open/floor/iron,
/area/station/service/janitor)
"bDR" = (
-/obj/effect/turf_decal/tile/red{
- dir = 4
- },
-/obj/effect/turf_decal/tile/red,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
dir = 1
},
/obj/structure/cable,
+/obj/effect/turf_decal/tile/red{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/red,
/obj/structure/chair/office/light{
dir = 8
},
@@ -20871,29 +23926,31 @@
/turf/open/floor/iron/dark,
/area/station/security/checkpoint/medical)
"bDS" = (
-/obj/effect/turf_decal/trimline/blue/filled/line{
- dir = 5
- },
/obj/machinery/light/directional/east,
/obj/machinery/fax{
fax_name = "Medical";
name = "Medical Fax Machine"
},
/obj/structure/table,
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/tile/blue/full,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/medical/medbay/aft)
"bDU" = (
-/obj/effect/turf_decal/trimline/blue/filled/line{
- dir = 1
- },
/obj/structure/table,
-/obj/item/clipboard,
-/obj/item/paper_bin{
- pixel_x = -3;
- pixel_y = 7
+/obj/item/clipboard{
+ pixel_x = 10;
+ pixel_y = 4
},
-/obj/item/pen,
-/turf/open/floor/iron/white,
+/obj/item/paper_bin{
+ pixel_x = -6;
+ pixel_y = 4
+ },
+/obj/item/pen{
+ pixel_x = -6;
+ pixel_y = 4
+ },
+/obj/effect/turf_decal/tile/blue/full,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/medical/medbay/aft)
"bDX" = (
/obj/effect/decal/cleanable/dirt,
@@ -20906,17 +23963,23 @@
"bDY" = (
/obj/structure/window/reinforced/spawner/directional/west,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/carpet,
+/turf/open/floor/carpet/black,
/area/station/science/breakroom)
"bDZ" = (
-/obj/effect/turf_decal/tile/yellow{
- dir = 4
- },
-/obj/machinery/holopad,
/obj/structure/disposalpipe/segment{
dir = 6
},
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/trimline/yellow/filled/line{
+ dir = 4;
+ alpha = 120
+ },
+/obj/effect/turf_decal/trimline/blue/line{
+ alpha = 200;
+ dir = 4
+ },
+/turf/open/floor/iron/white/smooth_edge{
+ dir = 4
+ },
/area/station/medical/chemistry)
"bEc" = (
/obj/effect/turf_decal/siding/wood{
@@ -20925,14 +23988,15 @@
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
dir = 1
},
-/obj/structure/table/wood,
/obj/effect/spawner/random/food_or_drink/donkpockets{
pixel_y = 4;
pixel_x = 1
},
+/obj/structure/table/wood/fancy/purple,
/turf/open/floor/wood/parquet,
/area/station/science/breakroom)
"bEd" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden,
/obj/effect/turf_decal/stripes/line,
/obj/structure/sign/warning/cold_temp/directional/north,
/obj/machinery/camera/directional/north{
@@ -20959,8 +24023,9 @@
pixel_y = 1
},
/obj/item/wrench/medical,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden,
-/turf/open/floor/iron/dark,
+/obj/effect/turf_decal/stripes/blue,
+/obj/effect/turf_decal/weather/snow,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/medical/cryo)
"bEh" = (
/obj/machinery/vending/medical{
@@ -21001,9 +24066,6 @@
},
/obj/machinery/disposal/bin,
/obj/item/radio/intercom/directional/south,
-/obj/machinery/firealarm/directional/south{
- pixel_y = -34
- },
/turf/open/floor/iron/dark,
/area/station/medical/storage)
"bEk" = (
@@ -21047,17 +24109,16 @@
/turf/open/floor/iron/dark,
/area/station/medical/storage)
"bEn" = (
-/obj/machinery/light/directional/north,
/obj/machinery/camera/directional/north{
c_tag = "Xenobiology Experimentation Cell";
network = list("ss13","xeno")
},
-/turf/open/floor/engine,
+/turf/open/floor/engine/xenobio,
/area/station/science/xenobiology)
"bEo" = (
/obj/machinery/firealarm/directional/north,
/turf/closed/wall/r_wall,
-/area/station/science/breakroom)
+/area/station/science/xenobiology)
"bEr" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
@@ -21097,16 +24158,13 @@
/turf/open/floor/iron/dark,
/area/station/maintenance/disposal/incinerator)
"bEx" = (
+/obj/structure/cable,
/obj/machinery/camera/motion/directional/south{
c_tag = "Vault";
network = list("vault")
},
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/obj/structure/cable,
/obj/machinery/light/directional/south,
-/turf/open/floor/iron/dark,
+/turf/open/floor/iron/dark/textured_large,
/area/station/ai_monitored/command/nuke_storage)
"bEy" = (
/obj/machinery/button/door/directional/west{
@@ -21172,7 +24230,7 @@
dir = 4
},
/turf/open/floor/engine,
-/area/station/engineering/main)
+/area/station/engineering/supermatter/room)
"bEK" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/layer_manifold/brown/visible,
@@ -21193,6 +24251,9 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
+/obj/effect/mapping_helpers/airlock/unres{
+ dir = 8
+ },
/turf/open/floor/plating,
/area/station/maintenance/disposal)
"bEO" = (
@@ -21221,11 +24282,27 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 8
},
+/obj/effect/turf_decal/trimline/brown/filled/warning{
+ dir = 10
+ },
+/obj/effect/turf_decal/trimline/dark/warning{
+ dir = 10
+ },
+/obj/effect/turf_decal/siding/brown/corner{
+ dir = 1
+ },
/turf/open/floor/iron,
/area/station/cargo/miningdock)
"bES" = (
/obj/structure/sink/directional/east,
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/trimline/blue/filled/line{
+ alpha = 160;
+ dir = 9
+ },
+/obj/effect/turf_decal/trimline/white/line{
+ dir = 9
+ },
+/turf/open/floor/iron/white/smooth_corner,
/area/station/medical/medbay/central)
"bET" = (
/obj/structure/cable,
@@ -21302,19 +24379,19 @@
/turf/open/floor/plating,
/area/station/engineering/atmos)
"bFe" = (
-/obj/machinery/door/airlock/engineering{
- name = "Tech Storage"
- },
-/obj/effect/landmark/navigate_destination,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 4
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 4
},
-/obj/effect/mapping_helpers/airlock/access/any/engineering/tech_storage,
/obj/structure/cable,
-/turf/open/floor/iron,
+/obj/machinery/door/airlock/engineering{
+ name = "Tech Storage"
+ },
+/obj/effect/landmark/navigate_destination,
+/obj/effect/mapping_helpers/airlock/access/any/engineering/tech_storage,
+/turf/open/floor/iron/large,
/area/station/engineering/storage/tech)
"bFf" = (
/obj/structure/chair/stool,
@@ -21334,9 +24411,6 @@
/area/station/service/janitor)
"bFj" = (
/obj/structure/disposalpipe/segment,
-/obj/effect/turf_decal/tile/yellow{
- dir = 8
- },
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 4
@@ -21344,15 +24418,16 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 4
},
-/turf/open/floor/iron,
+/turf/open/floor/iron/edge{
+ dir = 8
+ },
/area/station/hallway/primary/aft)
"bFk" = (
/obj/machinery/photobooth{
req_one_access = list("lawyer","security","command")
},
/obj/machinery/door/window/left/directional/south,
-/obj/effect/turf_decal/bot,
-/turf/open/floor/iron,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/maintenance/central)
"bFm" = (
/obj/structure/disposalpipe/sorting/mail/flip{
@@ -21376,6 +24451,7 @@
/obj/effect/turf_decal/stripes/corner{
dir = 8
},
+/obj/structure/cable,
/turf/open/floor/plating,
/area/station/maintenance/aft)
"bFp" = (
@@ -21387,11 +24463,15 @@
/turf/open/floor/plating,
/area/station/maintenance/aft)
"bFq" = (
-/obj/effect/turf_decal/tile/yellow,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
dir = 8
},
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/yellow/corner{
+ dir = 4
+ },
+/turf/open/floor/iron/edge{
+ dir = 4
+ },
/area/station/hallway/primary/aft)
"bFr" = (
/obj/structure/disposalpipe/segment{
@@ -21412,28 +24492,29 @@
/turf/open/floor/iron/white,
/area/station/medical/chemistry)
"bFA" = (
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible,
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/weather/snow,
+/obj/effect/turf_decal/siding{
+ dir = 10
+ },
+/obj/item/stack/sheet/cardboard{
+ pixel_x = 0;
+ pixel_y = 1
+ },
+/turf/open/floor/iron/freezer,
/area/station/medical/cryo)
"bFB" = (
-/obj/effect/turf_decal/tile/yellow{
- dir = 1
+/obj/effect/turf_decal/trimline/yellow/filled/line{
+ dir = 10;
+ alpha = 120
},
-/obj/effect/turf_decal/tile/yellow{
- dir = 8
+/obj/effect/turf_decal/trimline/blue/line{
+ alpha = 200;
+ dir = 10
+ },
+/turf/open/floor/iron/white/smooth_corner{
+ dir = 4
},
-/obj/effect/turf_decal/tile/yellow,
-/turf/open/floor/iron/white,
/area/station/medical/chemistry)
"bFC" = (
/obj/structure/table/wood/poker,
@@ -21458,11 +24539,20 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 4
},
+/obj/effect/turf_decal/trimline/blue/filled/corner{
+ alpha = 160;
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/dark_blue/corner{
+ alpha = 200;
+ dir = 4
+ },
/turf/open/floor/iron/white,
/area/station/medical/medbay/aft)
"bFM" = (
/obj/effect/turf_decal/trimline/green/filled/corner{
- dir = 8
+ dir = 8;
+ alpha = 160
},
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
@@ -21471,16 +24561,13 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 4
},
+/obj/effect/turf_decal/trimline/dark_green/corner{
+ alpha = 200;
+ dir = 8
+ },
/turf/open/floor/iron/white,
/area/station/medical/medbay/aft)
"bFN" = (
-/obj/effect/turf_decal/trimline/blue/filled/line,
-/obj/effect/turf_decal/trimline/blue/filled/corner{
- dir = 4
- },
-/obj/structure/extinguisher_cabinet{
- pixel_y = -30
- },
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 8
@@ -21488,10 +24575,32 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 4
},
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/trimline/blue/filled/end{
+ alpha = 160;
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/dark_blue/end{
+ alpha = 200;
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/blue/filled/mid_joiner{
+ dir = 2;
+ alpha = 160
+ },
+/obj/effect/turf_decal/trimline/blue/filled/mid_joiner{
+ dir = 4;
+ alpha = 160
+ },
+/obj/effect/turf_decal/trimline/blue/filled/mid_joiner{
+ dir = 1;
+ alpha = 160
+ },
+/turf/open/floor/iron/white/smooth_large,
/area/station/medical/medbay/aft)
"bFO" = (
-/obj/effect/turf_decal/trimline/green/filled/corner,
+/obj/effect/turf_decal/trimline/green/filled/corner{
+ alpha = 160
+ },
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 8
@@ -21499,7 +24608,24 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 4
},
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/trimline/blue/filled/line{
+ alpha = 160;
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/dark_blue/line{
+ alpha = 200;
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/dark_green/corner{
+ alpha = 200
+ },
+/obj/effect/turf_decal/trimline/blue/filled/mid_joiner{
+ dir = 1;
+ alpha = 160
+ },
+/turf/open/floor/iron/white/smooth_edge{
+ dir = 1
+ },
/area/station/medical/medbay/aft)
"bFP" = (
/obj/effect/turf_decal/tile/blue{
@@ -21524,7 +24650,7 @@
},
/obj/effect/mapping_helpers/airlock/access/any/medical/general,
/obj/structure/cable,
-/turf/open/floor/iron,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/medical/break_room)
"bFQ" = (
/obj/effect/mapping_helpers/airlock/access/any/engineering/general,
@@ -21573,10 +24699,19 @@
/obj/effect/turf_decal/bot,
/obj/machinery/airalarm/directional/north,
/turf/open/floor/iron,
-/area/station/science/ordnance/bomb)
+/area/station/science/ordnance/testlab)
"bGe" = (
/turf/closed/wall,
/area/station/science/ordnance/bomb)
+"bGf" = (
+/obj/structure/disposalpipe/segment,
+/obj/effect/turf_decal/siding/dark{
+ dir = 8
+ },
+/turf/open/floor/iron/edge{
+ dir = 8
+ },
+/area/station/hallway/primary/central)
"bGg" = (
/obj/structure/cable,
/obj/effect/decal/cleanable/dirt,
@@ -21589,7 +24724,7 @@
dir = 4
},
/turf/open/floor/iron,
-/area/station/science/ordnance/bomb)
+/area/station/science/ordnance/testlab)
"bGi" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
@@ -21602,7 +24737,7 @@
/area/station/science/ordnance/burnchamber)
"bGn" = (
/obj/structure/closet/secure_closet/miner,
-/turf/open/floor/iron/dark,
+/turf/open/floor/iron/dark/textured_large,
/area/station/cargo/miningdock)
"bGo" = (
/obj/effect/landmark/blobstart,
@@ -21699,6 +24834,7 @@
/obj/structure/mop_bucket/janitorialcart{
dir = 4
},
+/obj/machinery/firealarm/directional/south,
/turf/open/floor/iron,
/area/station/service/janitor)
"bGE" = (
@@ -21772,7 +24908,7 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/turf/open/floor/iron/white,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/science/xenobiology)
"bGN" = (
/obj/structure/cable,
@@ -21788,7 +24924,6 @@
/obj/structure/disposalpipe/segment{
dir = 6
},
-/obj/effect/turf_decal/tile/yellow,
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 4
@@ -21796,16 +24931,18 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 4
},
-/turf/open/floor/iron,
-/area/station/hallway/primary/aft)
-"bGT" = (
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
+/turf/open/floor/iron/edge{
dir = 4
},
+/area/station/hallway/primary/aft)
+"bGT" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible,
/mob/living/basic/bot/cleanbot/medbay,
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/weather/snow,
+/obj/effect/turf_decal/siding{
+ dir = 6
+ },
+/turf/open/floor/iron/freezer,
/area/station/medical/cryo)
"bGY" = (
/obj/structure/table,
@@ -21816,7 +24953,7 @@
/obj/item/reagent_containers/cup/glass/coffee{
pixel_x = 10
},
-/turf/open/floor/carpet,
+/turf/open/floor/carpet/black,
/area/station/science/breakroom)
"bGZ" = (
/obj/effect/turf_decal/tile/brown{
@@ -21830,6 +24967,7 @@
c_tag = "Medbay Break Room";
network = list("ss13","medbay")
},
+/obj/machinery/vending/wallmed/directional/west,
/turf/open/floor/iron/white,
/area/station/medical/break_room)
"bHa" = (
@@ -21861,17 +24999,35 @@
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
dir = 4
},
-/turf/open/floor/iron/white/side{
- dir = 5
+/obj/effect/turf_decal/trimline/dark/filled/line{
+ alpha = 160;
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/dark/filled/mid_joiner{
+ dir = 8;
+ alpha = 160
+ },
+/obj/effect/turf_decal/trimline/purple/line{
+ alpha = 200;
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 8
+ },
+/turf/open/floor/iron/white/smooth_edge{
+ dir = 8
},
/area/station/science/research)
"bHe" = (
-/obj/effect/turf_decal/siding/wood{
- dir = 1
- },
/obj/structure/chair/sofa/corp/left{
dir = 4
},
+/obj/effect/turf_decal/siding/wideplating_new/dark{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/wood{
+ dir = 1
+ },
/turf/open/floor/wood/parquet,
/area/station/science/breakroom)
"bHf" = (
@@ -21920,11 +25076,14 @@
/area/station/hallway/primary/aft)
"bHl" = (
/obj/structure/disposalpipe/segment,
-/obj/effect/turf_decal/tile/yellow,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 8
},
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/yellow/corner,
+/obj/effect/turf_decal/siding/dark/corner,
+/turf/open/floor/iron/edge{
+ dir = 4
+ },
/area/station/hallway/primary/aft)
"bHm" = (
/obj/effect/turf_decal/stripes/line,
@@ -21935,7 +25094,8 @@
/turf/open/floor/iron,
/area/station/science/ordnance/storage)
"bHo" = (
-/obj/structure/closet,
+/obj/effect/spawner/random/burgerstation/loot/with_maintenance_loot,
+/obj/item/reagent_containers/cup/beaker,
/turf/open/floor/plating,
/area/station/maintenance/aft)
"bHp" = (
@@ -21966,15 +25126,15 @@
/turf/open/floor/iron,
/area/station/science/ordnance)
"bHv" = (
-/obj/effect/turf_decal/tile/yellow/anticorner/contrasted{
- dir = 1
- },
/obj/machinery/light/directional/north,
/obj/machinery/button/door/directional/north{
id = "HFRshutter";
name = "Atmospherics HFR Shutters";
req_access = list("atmospherics")
},
+/obj/effect/turf_decal/trimline/yellow/filled/line{
+ dir = 9
+ },
/turf/open/floor/iron/dark,
/area/station/engineering/atmos/hfr_room)
"bHw" = (
@@ -22009,8 +25169,19 @@
dir = 4
},
/obj/structure/cable,
-/turf/open/floor/iron/white/side{
- dir = 5
+/obj/effect/turf_decal/siding/dark{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/dark/filled/warning{
+ alpha = 160;
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/purple/warning{
+ alpha = 200;
+ dir = 8
+ },
+/turf/open/floor/iron/white/smooth_edge{
+ dir = 8
},
/area/station/science/research)
"bHB" = (
@@ -22093,8 +25264,15 @@
/turf/open/floor/iron,
/area/station/engineering/storage/tech)
"bHP" = (
-/obj/effect/turf_decal/tile/yellow,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/yellow/arrow_cw{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/yellow/mid_joiner{
+ dir = 4
+ },
+/turf/open/floor/iron/corner{
+ dir = 8
+ },
/area/station/hallway/primary/aft)
"bHQ" = (
/obj/machinery/vending/assist,
@@ -22105,21 +25283,28 @@
/obj/machinery/camera/directional/west{
c_tag = "Aft Primary Hallway 2"
},
-/obj/effect/turf_decal/tile/yellow{
+/obj/effect/turf_decal/trimline/yellow/arrow_ccw{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/yellow/mid_joiner{
+ dir = 8
+ },
+/turf/open/floor/iron/edge{
dir = 8
},
-/turf/open/floor/iron,
/area/station/hallway/primary/aft)
"bHS" = (
-/obj/effect/turf_decal/tile/dark_blue{
+/obj/structure/table/glass,
+/obj/item/clothing/gloves/latex,
+/obj/item/reagent_containers/spray/cleaner,
+/obj/item/clothing/mask/surgical,
+/obj/machinery/status_display/ai/directional/north,
+/obj/effect/turf_decal/trimline/red/real_red/filled/line{
dir = 1
},
-/obj/effect/turf_decal/tile/dark_blue{
- dir = 4
+/obj/effect/turf_decal/trimline/dark/line{
+ dir = 1
},
-/obj/structure/table/optable,
-/obj/item/bodybag/stasis,
-/obj/machinery/defibrillator_mount/directional/north,
/turf/open/floor/iron/white,
/area/station/security/medical)
"bHT" = (
@@ -22153,32 +25338,47 @@
/turf/open/space/basic,
/area/space/nearstation)
"bIc" = (
-/obj/effect/turf_decal/tile/yellow{
+/obj/machinery/light/directional/south,
+/obj/effect/turf_decal/stripes{
dir = 8
},
-/obj/effect/turf_decal/tile/yellow,
-/obj/machinery/light/directional/south,
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/stripes/white/line{
+ dir = 8;
+ color = "#EFB341"
+ },
+/obj/effect/turf_decal/siding/dark,
+/obj/effect/turf_decal/siding/dark{
+ dir = 1
+ },
+/turf/open/floor/iron/dark/small,
/area/station/medical/chemistry)
"bId" = (
-/obj/effect/turf_decal/tile/yellow{
- dir = 8
- },
-/obj/effect/turf_decal/tile/yellow,
/obj/machinery/camera/directional/south{
c_tag = "Chemistry Lab South";
network = list("ss13","medbay");
pixel_x = 22
},
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/trimline/yellow/filled/line{
+ dir = 2;
+ alpha = 120
+ },
+/obj/effect/turf_decal/trimline/blue/line{
+ alpha = 200
+ },
+/turf/open/floor/iron/white/smooth_edge,
/area/station/medical/chemistry)
"bIe" = (
/obj/structure/disposalpipe/segment,
-/obj/effect/turf_decal/tile/yellow{
+/obj/machinery/status_display/evac/directional/west,
+/obj/effect/turf_decal/trimline/yellow/line{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/yellow/mid_joiner{
+ dir = 8
+ },
+/turf/open/floor/iron/edge{
dir = 8
},
-/obj/machinery/status_display/evac/directional/west,
-/turf/open/floor/iron,
/area/station/hallway/primary/aft)
"bIg" = (
/obj/structure/cable,
@@ -22189,6 +25389,17 @@
dir = 8
},
/obj/structure/disposalpipe/segment,
+/obj/structure/fake_stairs/directional/south{
+ icon_state = "flattexture";
+ icon = 'modular_skyrat/modules/advanced_shuttles/icons/exploration_floor.dmi';
+ pixel_y = 1
+ },
+/obj/structure/railing{
+ dir = 4
+ },
+/obj/structure/railing{
+ dir = 8
+ },
/turf/open/floor/plating,
/area/station/maintenance/aft)
"bIi" = (
@@ -22206,40 +25417,34 @@
name = "Chemistry Lab"
},
/obj/effect/mapping_helpers/airlock/access/any/medical/chemistry,
-/turf/open/floor/iron/white,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/medical/chemistry)
"bIk" = (
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
/obj/structure/cable,
/obj/structure/closet/crate/freezer/surplus_limbs,
-/turf/open/floor/iron/white,
+/obj/structure/sign/calendar/directional/south,
+/obj/effect/turf_decal/weather/snow,
+/turf/open/floor/iron/dark/textured_large,
/area/station/medical/cryo)
"bIn" = (
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
/obj/structure/cable,
/obj/machinery/firealarm/directional/south,
/obj/structure/closet/crate/freezer/blood,
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/weather/snow/corner{
+ dir = 5
+ },
+/obj/effect/turf_decal/weather/snow,
+/turf/open/floor/iron/dark/textured_large,
/area/station/medical/cryo)
"bIo" = (
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
/obj/machinery/atmospherics/components/unary/portables_connector/visible{
dir = 1
},
/obj/machinery/portable_atmospherics/canister/anesthetic_mix,
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/weather/snow/corner{
+ dir = 1
+ },
+/turf/open/floor/iron/white/smooth_large,
/area/station/medical/cryo)
"bIq" = (
/obj/machinery/camera/directional/west{
@@ -22250,16 +25455,14 @@
/turf/open/space/basic,
/area/space/nearstation)
"bIr" = (
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible,
+/obj/machinery/light/directional/east,
+/obj/effect/turf_decal/weather/snow,
+/obj/effect/turf_decal/siding{
dir = 4
},
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
-/obj/machinery/light/directional/east,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible,
-/turf/open/floor/iron/white,
+/obj/structure/extinguisher_cabinet/directional/east,
+/turf/open/floor/iron/freezer,
/area/station/medical/cryo)
"bIu" = (
/obj/structure/disposalpipe/segment{
@@ -22268,7 +25471,25 @@
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/trimline/dark/filled/line{
+ alpha = 160;
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/dark/filled/mid_joiner{
+ dir = 1;
+ alpha = 160
+ },
+/obj/effect/turf_decal/trimline/purple/line{
+ alpha = 200;
+ dir = 1;
+ color = "#a56dc2"
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 1
+ },
+/turf/open/floor/iron/white/smooth_edge{
+ dir = 1
+ },
/area/station/science/xenobiology)
"bIw" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
@@ -22285,7 +25506,7 @@
dir = 1
},
/obj/structure/disposalpipe/trunk,
-/turf/open/floor/engine,
+/turf/open/floor/engine/xenobio,
/area/station/science/xenobiology)
"bIA" = (
/obj/effect/turf_decal/stripes/line{
@@ -22308,12 +25529,24 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 1
},
-/turf/open/floor/iron/dark,
+/obj/effect/turf_decal/trimline/purple/filled/line{
+ alpha = 160;
+ color = "#6a3182"
+ },
+/obj/effect/turf_decal/trimline/purple/filled/line{
+ alpha = 160;
+ color = "#6a3182";
+ dir = 1
+ },
+/turf/open/floor/iron/dark/small,
/area/station/science/breakroom)
"bID" = (
/obj/structure/chair/comfy/black,
/obj/effect/landmark/start/scientist,
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/siding/thinplating_new/dark/end{
+ dir = 8
+ },
+/turf/open/floor/carpet/black,
/area/station/science/xenobiology)
"bIE" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
@@ -22327,10 +25560,10 @@
/turf/open/floor/iron/white,
/area/station/science/research)
"bIF" = (
-/obj/effect/turf_decal/siding/blue{
+/obj/machinery/hydroponics/soil,
+/obj/effect/turf_decal/siding/wood{
dir = 9
},
-/obj/machinery/hydroponics/soil,
/turf/open/floor/grass,
/area/station/security/prison)
"bIG" = (
@@ -22339,9 +25572,8 @@
},
/obj/effect/mapping_helpers/airlock/access/any/command/eva,
/obj/effect/landmark/navigate_destination/eva,
-/turf/open/floor/iron/dark/side{
- dir = 1
- },
+/obj/effect/mapping_helpers/airlock/red_alert_access,
+/turf/open/floor/iron/dark/textured_large,
/area/station/ai_monitored/command/storage/eva)
"bIH" = (
/obj/structure/sign/poster/official/wtf_is_co2,
@@ -22365,45 +25597,41 @@
/turf/open/floor/iron/white,
/area/station/medical/virology)
"bIM" = (
-/obj/machinery/holopad,
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/obj/effect/landmark/event_spawn,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
- dir = 4
- },
-/turf/open/floor/iron/white,
+/obj/structure/frame/machine/secured,
+/obj/item/circuitboard/machine/autolathe,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/science/lab)
"bIO" = (
/obj/structure/table/glass,
/obj/item/storage/box/monkeycubes{
- pixel_x = -5
+ pixel_x = -7;
+ pixel_y = 13
},
-/obj/item/storage/box/monkeycubes,
-/turf/open/floor/iron/white,
+/obj/item/storage/box/monkeycubes{
+ pixel_x = 6;
+ pixel_y = 2
+ },
+/obj/item/reagent_containers/cup/beaker{
+ pixel_x = -8;
+ pixel_y = 2
+ },
+/turf/open/floor/iron/dark/smooth_large,
/area/station/science/xenobiology)
"bIQ" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
/obj/machinery/disposal/bin,
/obj/structure/disposalpipe/trunk{
dir = 4
},
-/turf/open/floor/iron,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/science/xenobiology)
"bIR" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
/obj/structure/disposalpipe/segment{
dir = 4
},
/obj/machinery/computer/camera_advanced/xenobio{
dir = 1
},
-/turf/open/floor/iron,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/science/xenobiology)
"bIS" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -22418,17 +25646,20 @@
/obj/effect/mapping_helpers/airlock/access/any/science/ordnance,
/obj/structure/cable,
/turf/open/floor/iron,
-/area/station/science/ordnance/bomb)
+/area/station/science/ordnance/testlab)
"bIT" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
/obj/structure/disposalpipe/segment{
dir = 4
},
/obj/machinery/light/directional/south,
/obj/machinery/processor/slime,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/delivery/white{
+ color = "#a56dc2"
+ },
+/obj/effect/turf_decal/box/white{
+ color = "#a56dc2"
+ },
+/turf/open/floor/iron/dark/smooth_large,
/area/station/science/xenobiology)
"bIV" = (
/obj/effect/turf_decal/stripes/corner{
@@ -22456,7 +25687,7 @@
pixel_y = -6
},
/turf/open/floor/iron,
-/area/station/science/ordnance/bomb)
+/area/station/science/ordnance/testlab)
"bIX" = (
/obj/structure/sign/warning/secure_area{
desc = "A warning sign which reads 'BOMB RANGE";
@@ -22488,10 +25719,20 @@
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 8
},
-/obj/machinery/door/airlock/external{
+/obj/machinery/door/airlock/mining/glass{
name = "Mining Dock"
},
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/brown/filled/line,
+/obj/effect/turf_decal/trimline/brown/filled/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/dark/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/dark/line,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron/large,
/area/station/cargo/miningdock)
"bJg" = (
/obj/structure/cable,
@@ -22538,10 +25779,10 @@
/turf/open/floor/iron/dark,
/area/station/engineering/storage/tech)
"bJn" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/light_switch{
pixel_x = 27
},
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/effect/turf_decal/trimline/yellow/filled/line{
dir = 8
},
@@ -22565,24 +25806,39 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/machinery/door/airlock/maintenance,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 4
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 4
},
+/obj/structure/cable,
+/obj/machinery/door/airlock/maintenance,
/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance,
/obj/effect/mapping_helpers/airlock/unres{
dir = 4
},
-/obj/structure/cable,
-/turf/open/floor/plating,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/maintenance/aft)
"bJr" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/trimline/dark/filled/line{
+ alpha = 160;
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/dark/filled/mid_joiner{
+ dir = 8;
+ alpha = 160
+ },
+/obj/effect/turf_decal/trimline/purple/line{
+ alpha = 200;
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 8
+ },
+/turf/open/floor/iron/white/smooth_edge{
+ dir = 8
+ },
/area/station/science/research)
"bJu" = (
/obj/structure/light_construct{
@@ -22608,10 +25864,13 @@
/area/space/nearstation)
"bJx" = (
/obj/effect/landmark/event_spawn,
-/obj/effect/turf_decal/tile/blue{
- dir = 8
+/obj/effect/turf_decal/trimline/blue/arrow_cw{
+ alpha = 200
},
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/blue/mid_joiner{
+ alpha = 200
+ },
+/turf/open/floor/iron/edge,
/area/station/hallway/primary/central)
"bJy" = (
/obj/structure/disposalpipe/segment{
@@ -22628,15 +25887,13 @@
/area/station/maintenance/aft)
"bJz" = (
/obj/structure/disposalpipe/segment,
-/obj/structure/extinguisher_cabinet{
- pixel_x = -27;
- pixel_y = 1
+/obj/structure/extinguisher_cabinet/directional/west,
+/obj/effect/turf_decal/trimline/yellow/corner{
+ dir = 1
},
-/obj/effect/turf_decal/tile/yellow{
+/turf/open/floor/iron/edge{
dir = 8
},
-/obj/machinery/light/directional/west,
-/turf/open/floor/iron,
/area/station/hallway/primary/aft)
"bJA" = (
/obj/effect/landmark/blobstart,
@@ -22648,6 +25905,10 @@
/area/station/maintenance/aft)
"bJE" = (
/obj/structure/flora/bush/flowers_br/style_random,
+/mob/living/basic/chick/permanent{
+ color = "#FFA500";
+ name = "Tangible"
+ },
/turf/open/floor/grass,
/area/station/service/hydroponics/garden/abandoned)
"bJF" = (
@@ -22659,13 +25920,21 @@
/turf/open/floor/plating,
/area/station/engineering/atmos)
"bJG" = (
-/obj/effect/turf_decal/tile/yellow{
- dir = 1
+/obj/structure/table,
+/obj/item/stack/sheet/iron/fifty{
+ pixel_x = 5;
+ pixel_y = 4
},
-/obj/effect/turf_decal/tile/yellow{
- dir = 4
+/obj/item/stack/sheet/iron/fifty{
+ pixel_y = 2
},
-/turf/open/floor/iron/white,
+/obj/item/plunger,
+/obj/item/construction/plumbing{
+ pixel_x = 2;
+ pixel_y = 2
+ },
+/obj/item/construction/plumbing,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/medical/chemistry)
"bJK" = (
/obj/effect/spawner/structure/window/reinforced,
@@ -22674,6 +25943,7 @@
name = "Containment Blast Door"
},
/obj/structure/disposalpipe/segment,
+/obj/structure/cable,
/turf/open/floor/plating,
/area/station/science/xenobiology)
"bJM" = (
@@ -22694,27 +25964,18 @@
/turf/closed/wall/r_wall,
/area/station/maintenance/disposal/incinerator)
"bJW" = (
-/obj/structure/table,
-/obj/item/stack/sheet/plasteel/twenty{
- pixel_x = -4
- },
-/obj/item/stack/sheet/iron/fifty,
-/obj/item/stack/cable_coil{
- pixel_x = -3;
- pixel_y = 3
- },
-/obj/item/stack/sheet/glass/fifty{
- pixel_x = 2
- },
-/obj/machinery/firealarm/directional/west,
-/obj/machinery/light/dim/directional/west,
-/turf/open/floor/iron,
-/area/station/engineering/atmos/hfr_room)
+/obj/effect/mapping_helpers/broken_floor,
+/turf/open/floor/carpet/lone/star,
+/area/station/maintenance/port/aft)
"bJX" = (
-/obj/structure/table,
-/obj/item/storage/toolbox/mechanical,
-/obj/item/holosign_creator/atmos,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/yellow/filled/line{
+ dir = 10
+ },
+/obj/effect/turf_decal/trimline/dark_blue/line{
+ alpha = 200;
+ dir = 10
+ },
+/turf/open/floor/iron/dark,
/area/station/engineering/atmos/hfr_room)
"bKb" = (
/obj/machinery/door/firedoor/heavy,
@@ -22749,7 +26010,7 @@
"bKe" = (
/obj/effect/spawner/structure/window,
/turf/open/floor/plating,
-/area/station/science/ordnance/bomb)
+/area/station/science/ordnance/testlab)
"bKi" = (
/obj/structure/disposaloutlet,
/obj/structure/disposalpipe/trunk{
@@ -22761,20 +26022,39 @@
/obj/effect/turf_decal/trimline/blue/filled/line{
dir = 6
},
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/trimline/white/line{
+ dir = 6
+ },
+/obj/effect/turf_decal/trimline/blue/filled/mid_joiner,
+/obj/effect/turf_decal/trimline/blue/filled/mid_joiner{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/white/mid_joiner,
+/obj/effect/turf_decal/trimline/white/mid_joiner{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/blue{
+ color = "#8ab4cb";
+ dir = 6
+ },
+/turf/open/floor/iron/white/smooth_corner{
+ dir = 1
+ },
/area/station/medical/treatment_center)
"bKm" = (
/obj/structure/sign/warning/vacuum/external,
-/turf/closed/wall,
+/turf/closed/wall/r_wall,
/area/station/cargo/miningdock)
"bKp" = (
-/obj/effect/turf_decal/tile/yellow{
- dir = 1
- },
-/obj/effect/turf_decal/tile/brown{
+/obj/effect/turf_decal/trimline/brown/filled/warning{
dir = 8
},
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/dark/warning{
+ dir = 8
+ },
+/turf/open/floor/iron/textured_edge{
+ dir = 4
+ },
/area/station/cargo/miningdock)
"bKr" = (
/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
@@ -22805,9 +26085,12 @@
/turf/open/floor/iron/dark,
/area/station/engineering/storage/tech)
"bKx" = (
-/obj/effect/landmark/blobstart,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 6
+ },
/turf/open/floor/plating,
-/area/station/construction)
+/area/station/maintenance/port/aft)
"bKA" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/plating,
@@ -22836,6 +26119,12 @@
dir = 4
},
/obj/effect/landmark/start/cargo_technician,
+/obj/effect/turf_decal/trimline/brown/filled/end{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/dark/end{
+ dir = 4
+ },
/turf/open/floor/iron,
/area/station/cargo/sorting)
"bKG" = (
@@ -22915,22 +26204,21 @@
/turf/open/floor/plating,
/area/station/maintenance/aft)
"bKM" = (
-/obj/structure/extinguisher_cabinet{
- pixel_x = -5;
- pixel_y = 30
- },
/obj/structure/chair/sofa/left/brown,
/obj/machinery/light/directional/north,
+/obj/structure/extinguisher_cabinet/directional/north,
/turf/open/floor/carpet/blue,
/area/station/medical/psychology)
"bKO" = (
-/obj/effect/turf_decal/trimline/green/filled/corner,
-/obj/effect/turf_decal/trimline/green/filled/corner{
- dir = 8
- },
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/trimline/green/filled/warning{
+ alpha = 160
+ },
+/obj/effect/turf_decal/trimline/dark_green/warning{
+ alpha = 200
+ },
+/turf/open/floor/iron/white/smooth_edge,
/area/station/medical/medbay/aft)
"bKQ" = (
/obj/effect/turf_decal/tile/brown{
@@ -22949,11 +26237,25 @@
/area/station/medical/break_room)
"bKR" = (
/obj/effect/turf_decal/trimline/green/filled/line{
- dir = 6
+ dir = 6;
+ alpha = 160
},
/obj/machinery/newscaster/directional/east,
/obj/item/kirbyplants/random,
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/trimline/dark_green/line{
+ alpha = 200;
+ dir = 6
+ },
+/obj/effect/turf_decal/trimline/green/filled/mid_joiner{
+ alpha = 160
+ },
+/obj/effect/turf_decal/trimline/green/filled/mid_joiner{
+ alpha = 160;
+ dir = 4
+ },
+/turf/open/floor/iron/white/smooth_corner{
+ dir = 1
+ },
/area/station/medical/medbay/aft)
"bKS" = (
/obj/effect/turf_decal/tile/brown{
@@ -22976,56 +26278,52 @@
name = "Construction Area"
},
/obj/effect/mapping_helpers/airlock/access/any/engineering/construction,
-/turf/open/floor/plating,
+/turf/open/floor/iron/large,
/area/station/construction)
"bKZ" = (
/obj/structure/window/reinforced/spawner/directional/west,
-/obj/effect/turf_decal/stripes/line{
- dir = 10
- },
/obj/machinery/disposal/bin,
/obj/structure/disposalpipe/trunk{
dir = 1
},
-/turf/open/floor/iron,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/science/xenobiology)
"bLc" = (
-/obj/effect/turf_decal/stripes/line,
/obj/machinery/portable_atmospherics/canister/bz,
-/turf/open/floor/iron,
+/obj/machinery/atmospherics/components/unary/portables_connector,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/science/xenobiology)
"bLe" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
/obj/structure/table/reinforced,
/obj/item/storage/box/monkeycubes{
- pixel_x = -5
+ pixel_x = -12;
+ pixel_y = 3
},
-/obj/item/extinguisher/mini,
-/turf/open/floor/iron,
+/obj/item/extinguisher/mini{
+ pixel_x = 4;
+ pixel_y = 4
+ },
+/turf/open/floor/iron/dark/smooth_large,
/area/station/science/xenobiology)
"bLh" = (
/obj/machinery/vending/cigarette,
-/turf/open/floor/iron/white/side{
- dir = 6
- },
+/turf/open/floor/iron/dark/smooth_large,
/area/station/science/research)
"bLj" = (
/obj/structure/sign/warning/vacuum/external/directional/south,
/turf/open/floor/plating,
-/area/station/science/ordnance/bomb)
+/area/station/science/ordnance/testlab)
"bLl" = (
/obj/machinery/door/poddoor/massdriver_ordnance,
/obj/structure/fans/tiny,
/turf/open/floor/plating,
-/area/station/science/ordnance/bomb)
+/area/station/science/ordnance/testlab)
"bLm" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
},
/turf/open/floor/plating,
-/area/station/science/ordnance/bomb)
+/area/station/science/ordnance/testlab)
"bLn" = (
/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
dir = 4
@@ -23069,17 +26367,8 @@
/turf/open/space/basic,
/area/space/nearstation)
"bLt" = (
-/obj/machinery/button/door/directional/south{
- id = "HFRshutter";
- name = "Atmospherics HFR Shutters";
- req_access = list("atmospherics")
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
-/turf/open/floor/iron/dark/side{
- dir = 5
- },
+/obj/effect/spawner/structure/window/reinforced,
+/turf/open/floor/plating,
/area/station/engineering/atmos/hfr_room)
"bLu" = (
/obj/structure/rack,
@@ -23154,8 +26443,10 @@
/area/station/construction)
"bLE" = (
/obj/structure/cable,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/brown/filled/corner,
+/turf/open/floor/iron/textured_edge{
+ dir = 1
+ },
/area/station/cargo/storage)
"bLG" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
@@ -23165,10 +26456,7 @@
/area/station/command/heads_quarters/nt_rep)
"bLH" = (
/obj/structure/closet/emcloset,
-/obj/effect/turf_decal/tile/yellow{
- dir = 4
- },
-/turf/open/floor/iron/checker,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/hallway/primary/aft)
"bLI" = (
/obj/structure/disposalpipe/segment,
@@ -23198,6 +26486,7 @@
/turf/open/floor/iron,
/area/station/engineering/atmos)
"bLO" = (
+/obj/machinery/door/firedoor/heavy,
/obj/machinery/door/airlock/maintenance{
name = "Atmospherics Maintenance"
},
@@ -23206,7 +26495,6 @@
/obj/effect/turf_decal/siding/thinplating,
/obj/effect/mapping_helpers/airlock/access/any/engineering/atmos,
/obj/structure/cable,
-/obj/machinery/door/firedoor/heavy,
/turf/open/floor/plating,
/area/station/maintenance/aft)
"bLR" = (
@@ -23242,25 +26530,16 @@
/turf/open/floor/carpet/blue,
/area/station/medical/psychology)
"bLX" = (
-/obj/effect/turf_decal/tile/yellow,
-/obj/effect/turf_decal/tile/yellow{
- dir = 8
- },
-/obj/effect/turf_decal/tile/yellow{
- dir = 4
- },
-/obj/effect/turf_decal/tile/yellow{
- dir = 1
- },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/cable,
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/medical/glass{
name = "Chemistry Lab"
},
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/effect/mapping_helpers/airlock/access/any/medical/chemistry,
-/obj/structure/cable,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/tile/yellow/full,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/medical/chemistry)
"bLY" = (
/obj/structure/table,
@@ -23328,11 +26607,33 @@
/turf/open/floor/wood,
/area/station/maintenance/aft)
"bMi" = (
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/trimline/dark/filled/line{
+ alpha = 160;
+ dir = 5
+ },
+/obj/effect/turf_decal/trimline/dark/filled/mid_joiner{
+ dir = 4;
+ alpha = 160
+ },
+/obj/effect/turf_decal/trimline/purple/line{
+ alpha = 200;
+ dir = 5;
+ color = "#a56dc2"
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 5
+ },
+/obj/effect/turf_decal/trimline/dark/filled/mid_joiner{
+ dir = 1;
+ alpha = 160
+ },
+/turf/open/floor/iron/white/smooth_corner{
+ dir = 8
+ },
/area/station/science/xenobiology)
"bMr" = (
-/obj/effect/spawner/structure/window,
/obj/structure/sign/departments/xenobio/directional/south,
+/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/station/science/xenobiology)
"bMu" = (
@@ -23355,7 +26656,7 @@
dir = 8
},
/turf/open/floor/iron,
-/area/station/science/ordnance/bomb)
+/area/station/science/ordnance/testlab)
"bMy" = (
/obj/machinery/door/firedoor/heavy,
/obj/effect/decal/cleanable/dirt,
@@ -23487,7 +26788,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 10
},
-/obj/machinery/firealarm/directional/north,
/turf/open/floor/iron,
/area/station/engineering/atmos)
"bMT" = (
@@ -23582,54 +26882,38 @@
/turf/open/floor/plating,
/area/station/medical/virology)
"bNl" = (
-/obj/effect/turf_decal/trimline/green/filled/line{
- dir = 4
- },
-/obj/effect/turf_decal/trimline/green/filled/corner{
- dir = 8
- },
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 10
},
+/obj/effect/turf_decal/trimline/green/filled/line{
+ dir = 6
+ },
/turf/open/floor/iron/white,
/area/station/medical/virology)
"bNp" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 9
- },
/obj/structure/table/reinforced,
/obj/item/assembly/igniter,
/obj/item/assembly/igniter,
/obj/item/slime_scanner{
pixel_x = -6
},
-/turf/open/floor/iron,
+/obj/machinery/light/directional/south,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/science/xenobiology)
"bNr" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
/obj/machinery/light/directional/south,
/obj/structure/table/reinforced,
/obj/item/clothing/gloves/latex,
/obj/item/clothing/glasses/science,
-/turf/open/floor/iron,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/science/xenobiology)
"bNs" = (
-/obj/machinery/door/firedoor,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/mapping_helpers/airlock/access/any/medical/general,
/obj/machinery/door/airlock/virology/glass{
name = "Isolation A"
},
-/obj/effect/turf_decal/tile/green{
- dir = 4
- },
-/obj/effect/turf_decal/tile/green{
- dir = 8
- },
-/obj/effect/turf_decal/tile/green,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/mapping_helpers/airlock/access/any/medical/general,
-/turf/open/floor/iron,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/medical/virology)
"bNt" = (
/obj/machinery/portable_atmospherics/canister/carbon_dioxide,
@@ -23700,7 +26984,7 @@
pixel_x = 4
},
/obj/item/radio/intercom/directional/south,
-/turf/open/floor/iron,
+/turf/open/floor/iron/dark/textured_large,
/area/station/cargo/sorting)
"bNI" = (
/turf/closed/wall,
@@ -23721,20 +27005,20 @@
},
/obj/effect/mapping_helpers/airlock/access/any/supply/general,
/obj/effect/landmark/navigate_destination,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/tile/brown/full,
+/turf/open/floor/iron/large,
/area/station/cargo/office)
"bNL" = (
/obj/machinery/airalarm/directional/north,
/turf/open/floor/plating,
/area/station/construction)
"bNO" = (
-/obj/effect/turf_decal/tile/yellow{
- dir = 4
- },
-/obj/effect/turf_decal/tile/yellow{
+/obj/effect/turf_decal/trimline/yellow/corner{
dir = 8
},
-/turf/open/floor/iron/dark/corner,
+/turf/open/floor/iron/corner{
+ dir = 1
+ },
/area/station/hallway/primary/aft)
"bNP" = (
/obj/item/radio/intercom/directional/west,
@@ -23742,13 +27026,8 @@
/turf/open/floor/iron,
/area/station/engineering/atmos)
"bNQ" = (
-/obj/effect/turf_decal/tile/yellow{
- dir = 8
- },
-/obj/effect/turf_decal/tile/yellow{
- dir = 1
- },
-/turf/open/floor/iron/dark,
+/obj/structure/chair/plastic,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/hallway/primary/aft)
"bNR" = (
/obj/machinery/light/directional/east,
@@ -23773,20 +27052,9 @@
/turf/open/floor/iron,
/area/station/engineering/atmos)
"bNW" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/virology/glass{
- name = "Isolation B"
- },
-/obj/effect/turf_decal/tile/green{
- dir = 4
- },
-/obj/effect/turf_decal/tile/green{
- dir = 8
- },
-/obj/effect/turf_decal/tile/green,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/mapping_helpers/airlock/access/any/medical/general,
-/turf/open/floor/iron,
+/obj/effect/spawner/structure/window,
+/turf/open/floor/plating,
/area/station/medical/virology)
"bNX" = (
/obj/machinery/power/terminal{
@@ -23798,6 +27066,12 @@
/obj/structure/cable,
/turf/open/floor/circuit,
/area/station/ai_monitored/turret_protected/ai)
+"bNZ" = (
+/obj/effect/turf_decal/trimline/blue/corner{
+ alpha = 200
+ },
+/turf/open/floor/iron,
+/area/station/hallway/primary/central)
"bOc" = (
/obj/machinery/atmospherics/components/binary/pump{
dir = 1;
@@ -23854,6 +27128,9 @@
pixel_y = 26
},
/obj/structure/cable,
+/obj/effect/turf_decal/trimline/yellow/filled/shrink_cw{
+ dir = 1
+ },
/turf/open/floor/iron,
/area/station/tcommsat/computer)
"bOq" = (
@@ -23878,13 +27155,36 @@
/turf/open/floor/iron/freezer,
/area/station/medical/break_room)
"bOx" = (
-/obj/machinery/holopad,
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/trimline/dark/filled/line{
+ alpha = 160;
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/dark/filled/mid_joiner{
+ dir = 8;
+ alpha = 160
+ },
+/obj/effect/turf_decal/trimline/purple/line{
+ alpha = 200;
+ dir = 8;
+ color = "#a56dc2"
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding{
+ dir = 4
+ },
+/turf/open/floor/iron/white/smooth_edge{
+ dir = 8
+ },
/area/station/science/xenobiology)
"bOC" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 4
},
+/obj/effect/turf_decal/trimline/yellow/filled/corner{
+ dir = 1
+ },
/turf/open/floor/iron,
/area/station/tcommsat/computer)
"bOD" = (
@@ -23934,6 +27234,9 @@
/obj/item/paper_bin,
/turf/open/floor/iron,
/area/station/tcommsat/computer)
+"bOP" = (
+/turf/open/floor/iron/edge,
+/area/station/hallway/primary/central)
"bOQ" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -23941,7 +27244,9 @@
/obj/effect/turf_decal/loading_area{
dir = 8
},
-/turf/open/floor/iron,
+/turf/open/floor/iron/edge{
+ dir = 4
+ },
/area/station/hallway/primary/aft)
"bOR" = (
/obj/structure/disposalpipe/segment{
@@ -23961,11 +27266,11 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/structure/plasticflaps/opaque,
/obj/machinery/navbeacon{
codes_txt = "delivery;dir=4";
location = "Atmospherics"
},
+/obj/structure/plasticflaps/opaque,
/obj/effect/turf_decal/delivery,
/turf/open/floor/iron,
/area/station/engineering/atmos)
@@ -24096,12 +27401,8 @@
/turf/open/floor/iron/white,
/area/station/medical/virology)
"bPx" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
- dir = 4
- },
+/obj/machinery/holopad,
+/obj/effect/landmark/event_spawn,
/turf/open/floor/iron/white,
/area/station/science/lab)
"bPz" = (
@@ -24114,25 +27415,46 @@
/obj/structure/disposalpipe/segment{
dir = 10
},
-/turf/open/floor/iron/white,
-/area/station/science/xenobiology)
-"bPJ" = (
-/obj/effect/turf_decal/stripes/line{
+/obj/effect/turf_decal/trimline/dark/filled/line{
+ alpha = 160;
+ dir = 2
+ },
+/obj/effect/turf_decal/trimline/dark/filled/mid_joiner{
+ dir = 2;
+ alpha = 160
+ },
+/obj/effect/turf_decal/trimline/purple/line{
+ alpha = 200;
+ dir = 2;
+ color = "#a56dc2"
+ },
+/obj/effect/turf_decal/siding/dark,
+/obj/effect/turf_decal/siding{
dir = 1
},
-/obj/machinery/space_heater,
-/turf/open/floor/iron,
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/iron/white/smooth_edge,
+/area/station/science/xenobiology)
+"bPJ" = (
+/obj/machinery/camera/directional/east{
+ c_tag = "Xenobiology Lab";
+ network = list("ss13","xeno")
+ },
+/obj/structure/tank_holder/extinguisher,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/science/xenobiology)
"bPL" = (
/obj/structure/cable,
-/obj/effect/turf_decal/tile/yellow{
- dir = 4
- },
-/obj/effect/turf_decal/tile/yellow{
- dir = 1
- },
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/turf_decal/trimline/yellow/filled/corner{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/yellow/filled/corner{
+ dir = 4
+ },
/turf/open/floor/iron,
/area/station/commons/storage/tools)
"bPM" = (
@@ -24172,6 +27494,7 @@
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
dir = 4
},
+/obj/effect/turf_decal/trimline/yellow/filled/shrink_ccw,
/turf/open/floor/iron,
/area/station/tcommsat/computer)
"bQc" = (
@@ -24185,10 +27508,9 @@
/turf/open/floor/iron,
/area/station/tcommsat/computer)
"bQf" = (
-/obj/effect/turf_decal/tile/yellow{
+/turf/open/floor/iron/edge{
dir = 4
},
-/turf/open/floor/iron/checker,
/area/station/hallway/primary/aft)
"bQg" = (
/turf/open/floor/iron,
@@ -24228,10 +27550,10 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
/turf/open/floor/iron,
/area/station/engineering/atmos)
-"bQo" = (
-/obj/machinery/atmospherics/components/unary/portables_connector/visible,
-/turf/open/floor/iron,
-/area/station/engineering/atmos)
+"bQn" = (
+/obj/structure/cable,
+/turf/open/floor/iron/large,
+/area/station/cargo/storage)
"bQp" = (
/obj/structure/cable,
/turf/open/floor/iron,
@@ -24287,6 +27609,7 @@
/obj/effect/turf_decal/tile/red/opposingcorners,
/obj/machinery/airalarm/directional/west,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/cable,
/turf/open/floor/iron,
/area/station/commons/fitness/recreation)
"bQF" = (
@@ -24325,7 +27648,10 @@
},
/obj/structure/disposalpipe/segment,
/obj/machinery/door/firedoor,
-/turf/open/floor/iron/white,
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/science/xenobiology)
"bQN" = (
/obj/machinery/door/poddoor/preopen{
@@ -24334,8 +27660,7 @@
},
/obj/machinery/door/firedoor,
/obj/machinery/camera/autoname/directional/east,
-/obj/machinery/light/directional/east,
-/turf/open/floor/iron/white,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/science/xenobiology)
"bQQ" = (
/obj/effect/turf_decal/box/white{
@@ -24344,12 +27669,9 @@
/turf/open/floor/engine,
/area/station/engineering/atmos/hfr_room)
"bQT" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/obj/effect/landmark/generic_maintenance_landmark,
-/turf/open/floor/iron,
-/area/station/science/ordnance/storage)
+/obj/machinery/vending/wallmed/directional/east,
+/turf/open/floor/iron/dark,
+/area/station/commons/fitness/recreation/entertainment)
"bQU" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -24400,15 +27722,42 @@
/turf/open/floor/iron/smooth_large,
/area/station/security/checkpoint/engineering)
"bRo" = (
-/obj/machinery/light/directional/west,
-/obj/item/radio/intercom/directional/west,
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/trimline/dark/filled/line{
+ alpha = 160;
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/dark/filled/mid_joiner{
+ dir = 8;
+ alpha = 160
+ },
+/obj/effect/turf_decal/trimline/purple/line{
+ alpha = 200;
+ dir = 8;
+ color = "#a56dc2"
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 8
+ },
+/turf/open/floor/iron/white/smooth_edge{
+ dir = 8
+ },
/area/station/science/xenobiology)
"bRq" = (
-/obj/effect/turf_decal/tile/yellow{
+/obj/effect/turf_decal/trimline/yellow/arrow_cw{
+ dir = 5
+ },
+/obj/effect/turf_decal/trimline/yellow/mid_joiner{
dir = 4
},
-/turf/open/floor/iron/dark/corner,
+/obj/effect/turf_decal/trimline/yellow/mid_joiner{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 1
+ },
+/turf/open/floor/iron/corner{
+ dir = 8
+ },
/area/station/hallway/primary/aft)
"bRr" = (
/obj/structure/chair{
@@ -24437,33 +27786,26 @@
/turf/open/floor/iron,
/area/station/engineering/atmos)
"bRw" = (
-/obj/machinery/atmospherics/components/unary/portables_connector/visible{
- dir = 4
- },
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/table,
+/obj/item/stack/sheet/iron/fifty,
+/obj/item/stack/sheet/iron/fifty{
+ pixel_x = 2;
+ pixel_y = 2
+ },
+/obj/item/book/manual/wiki/atmospherics,
/turf/open/floor/iron,
/area/station/engineering/atmos)
"bRx" = (
/obj/effect/spawner/structure/window,
/turf/open/floor/plating,
/area/station/engineering/atmos)
-"bRy" = (
-/obj/machinery/atmospherics/components/unary/portables_connector/visible{
- dir = 8
- },
-/turf/open/floor/iron,
-/area/station/engineering/atmos)
-"bRz" = (
-/obj/machinery/atmospherics/components/trinary/mixer{
- dir = 8
- },
-/turf/open/floor/iron,
-/area/station/engineering/atmos)
"bRA" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible{
dir = 4
},
+/obj/machinery/firealarm/directional/south,
/turf/open/floor/iron,
/area/station/engineering/atmos)
"bRB" = (
@@ -24628,10 +27970,13 @@
/area/station/construction)
"bSA" = (
/obj/structure/disposalpipe/segment,
-/obj/effect/turf_decal/tile/yellow{
+/obj/effect/turf_decal/trimline/yellow/arrow_ccw{
dir = 8
},
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/yellow/mid_joiner{
+ dir = 8
+ },
+/turf/open/floor/iron/corner,
/area/station/hallway/primary/aft)
"bSB" = (
/obj/machinery/firealarm/directional/south,
@@ -24705,25 +28050,14 @@
/turf/open/floor/iron,
/area/station/engineering/atmos)
"bSG" = (
-/obj/structure/table,
-/obj/item/stack/sheet/iron/fifty,
-/obj/item/stack/sheet/iron/fifty{
- pixel_x = 2;
- pixel_y = 2
+/obj/machinery/door/firedoor/heavy,
+/obj/machinery/door/poddoor/preopen{
+ id = "Biohazard";
+ name = "Biohazard Containment Door"
},
-/obj/item/book/manual/wiki/atmospherics,
-/turf/open/floor/iron,
-/area/station/engineering/atmos)
-"bSH" = (
-/obj/structure/table,
-/obj/item/stack/sheet/glass/fifty,
-/obj/item/storage/belt/utility,
-/obj/item/t_scanner,
-/obj/item/t_scanner,
-/obj/item/t_scanner,
-/obj/item/stack/sheet/plasteel/twenty,
-/turf/open/floor/iron,
-/area/station/engineering/atmos)
+/obj/effect/turf_decal/bot,
+/turf/open/floor/iron/dark/smooth_large,
+/area/station/science/research)
"bSJ" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/atmospherics/pipe/bridge_pipe/cyan/visible{
@@ -24809,7 +28143,7 @@
dir = 8
},
/obj/effect/mapping_helpers/airlock/access/any/medical/general,
-/turf/open/floor/iron/dark,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/medical/virology)
"bSV" = (
/obj/structure/cable,
@@ -24874,8 +28208,11 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 4
},
-/obj/structure/fireaxecabinet/mechremoval/directional/south,
-/turf/open/floor/iron/white,
+/obj/effect/landmark/start/roboticist,
+/obj/effect/turf_decal/siding/dark{
+ dir = 1
+ },
+/turf/open/floor/iron/dark,
/area/station/science/robotics/lab)
"bTB" = (
/obj/effect/spawner/structure/window/reinforced,
@@ -24895,17 +28232,13 @@
/turf/open/floor/iron,
/area/station/tcommsat/computer)
"bTK" = (
-/obj/machinery/portable_atmospherics/pump,
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
-/obj/structure/window/reinforced/spawner/directional/north,
/obj/machinery/atmospherics/components/unary/portables_connector/visible{
dir = 4
},
-/turf/open/floor/iron/white/corner{
- dir = 1
- },
+/obj/machinery/portable_atmospherics/pump,
+/obj/structure/window/reinforced/spawner/directional/north,
+/obj/effect/turf_decal/tile/blue/full,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/engineering/atmos)
"bTN" = (
/obj/machinery/door/firedoor/heavy,
@@ -24989,10 +28322,10 @@
/turf/open/floor/iron,
/area/station/science/ordnance/storage)
"bUq" = (
-/obj/effect/turf_decal/tile/red{
- dir = 8
- },
-/turf/open/floor/iron/dark,
+/obj/effect/turf_decal/trimline/dark_blue/filled/line,
+/obj/effect/turf_decal/siding/dark,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron/dark/small,
/area/station/security/checkpoint/escape)
"bUs" = (
/obj/structure/window/spawner/directional/west,
@@ -25007,6 +28340,10 @@
/area/station/commons/dorms)
"bUt" = (
/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 5
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer5,
/turf/open/floor/plating,
/area/station/maintenance/port/aft)
"bUx" = (
@@ -25038,16 +28375,12 @@
/turf/open/floor/plating,
/area/station/security/execution/transfer)
"bUE" = (
-/obj/machinery/portable_atmospherics/pump,
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
/obj/machinery/atmospherics/components/unary/portables_connector/visible{
dir = 4
},
-/turf/open/floor/iron/white/corner{
- dir = 1
- },
+/obj/machinery/portable_atmospherics/pump,
+/obj/effect/turf_decal/tile/blue/full,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/engineering/atmos)
"bUF" = (
/obj/effect/turf_decal/tile/yellow{
@@ -25065,8 +28398,8 @@
},
/area/station/engineering/atmos)
"bUG" = (
-/obj/machinery/meter,
/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible,
+/obj/machinery/meter,
/turf/closed/wall/r_wall,
/area/station/engineering/atmos)
"bUH" = (
@@ -25079,7 +28412,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 6
},
-/obj/machinery/firealarm/directional/north,
/turf/open/floor/iron,
/area/station/engineering/atmos)
"bUI" = (
@@ -25154,12 +28486,9 @@
/turf/open/floor/engine,
/area/station/engineering/atmos)
"bUQ" = (
-/obj/effect/turf_decal/tile/yellow/half/contrasted{
- dir = 8
- },
-/turf/open/floor/iron/dark/side{
- dir = 4
- },
+/obj/machinery/door/firedoor/heavy,
+/obj/effect/turf_decal/delivery,
+/turf/open/floor/iron/dark,
/area/station/engineering/atmos/hfr_room)
"bUR" = (
/obj/machinery/atmospherics/pipe/smart/simple/green/visible,
@@ -25209,9 +28538,6 @@
/turf/open/floor/iron/white,
/area/station/medical/virology)
"bVb" = (
-/obj/machinery/light_switch{
- pixel_x = 27
- },
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
dir = 8
},
@@ -25221,16 +28547,25 @@
/obj/structure/disposalpipe/segment{
dir = 6
},
-/turf/open/floor/iron,
-/area/station/hallway/primary/aft)
-"bVd" = (
-/obj/effect/turf_decal/tile/yellow{
- dir = 1
- },
-/obj/effect/turf_decal/tile/yellow{
+/obj/effect/turf_decal/trimline/yellow/line{
dir = 8
},
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/yellow/mid_joiner{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 8
+ },
+/turf/open/floor/iron/edge{
+ dir = 8
+ },
+/area/station/hallway/primary/aft)
+"bVd" = (
+/obj/effect/turf_decal/siding/dark{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/dark,
+/turf/open/floor/iron/large,
/area/station/hallway/primary/aft)
"bVf" = (
/obj/structure/disposalpipe/segment{
@@ -25240,18 +28575,19 @@
/area/station/hallway/primary/aft)
"bVg" = (
/obj/item/radio/intercom/directional/north,
-/obj/effect/turf_decal/tile/yellow{
+/obj/effect/turf_decal/trimline/yellow/line{
dir = 1
},
-/obj/effect/turf_decal/tile/yellow,
-/obj/effect/turf_decal/tile/yellow{
- dir = 4
+/obj/effect/turf_decal/trimline/yellow/mid_joiner{
+ dir = 1
+ },
+/turf/open/floor/iron/corner{
+ dir = 8
},
-/turf/open/floor/iron,
/area/station/hallway/primary/aft)
"bVh" = (
/obj/structure/disposalpipe/segment,
-/obj/effect/turf_decal/tile/yellow{
+/obj/effect/turf_decal/trimline/yellow/corner{
dir = 4
},
/turf/open/floor/iron,
@@ -25309,6 +28645,12 @@
/obj/structure/rack,
/obj/effect/spawner/random/maintenance/two,
/obj/machinery/light/small/directional/north,
+/obj/machinery/atmospherics/components/binary/pump/on/layer4{
+ dir = 4;
+ name = "Airlock Pump";
+ target_pressure = 300;
+ hide = 1
+ },
/turf/open/floor/plating,
/area/station/maintenance/port/aft)
"bVD" = (
@@ -25320,7 +28662,8 @@
/turf/open/floor/wood,
/area/station/commons/vacant_room/office)
"bVE" = (
-/obj/machinery/portable_atmospherics/canister/air,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer4,
+/obj/machinery/space_heater,
/turf/open/floor/plating,
/area/station/maintenance/port/aft)
"bVF" = (
@@ -25333,11 +28676,16 @@
/turf/open/floor/iron/smooth_large,
/area/station/engineering/main)
"bVG" = (
-/obj/structure/sign/warning/no_smoking{
- pixel_x = -28
- },
/obj/effect/decal/cleanable/dirt,
/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 6
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 6
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer5,
+/obj/structure/sign/warning/no_smoking/directional/west,
/turf/open/floor/plating,
/area/station/maintenance/port/aft)
"bVJ" = (
@@ -25435,6 +28783,12 @@
/turf/open/floor/engine,
/area/station/engineering/atmos/hfr_room)
"bWa" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 5
+ },
/turf/open/floor/iron/grimy,
/area/station/maintenance/aft)
"bWb" = (
@@ -25503,15 +28857,28 @@
/area/station/security/warden)
"bWo" = (
/obj/machinery/door/firedoor/heavy,
-/turf/open/floor/iron/white/side{
- dir = 1
- },
+/turf/open/floor/iron/dark/smooth_large,
/area/station/science/research)
"bWq" = (
/turf/closed/wall/r_wall,
/area/station/science/genetics)
"bWr" = (
-/turf/open/floor/iron/white,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/turf_decal/siding/dark{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/dark/filled/warning{
+ alpha = 160;
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/purple/warning{
+ alpha = 200;
+ dir = 1
+ },
+/turf/open/floor/iron/white/smooth_edge{
+ dir = 1
+ },
/area/station/science/research)
"bWs" = (
/obj/structure/cable,
@@ -25531,16 +28898,16 @@
/turf/open/floor/iron,
/area/station/tcommsat/computer)
"bWu" = (
-/obj/machinery/door/airlock/engineering{
- name = "Telecommunications"
- },
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/door/airlock/engineering{
+ name = "Telecommunications"
+ },
/obj/effect/mapping_helpers/airlock/access/any/engineering/tcoms,
/obj/effect/landmark/navigate_destination/tcomms,
/obj/effect/mapping_helpers/airlock/access/any/command/general,
-/turf/open/floor/iron,
+/turf/open/floor/iron/large,
/area/station/tcommsat/computer)
"bWv" = (
/obj/structure/cable,
@@ -25559,10 +28926,25 @@
"bWy" = (
/obj/machinery/light/small/directional/south,
/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 6
+ },
+/obj/machinery/atmospherics/components/binary/pump/on/layer4{
+ dir = 8;
+ name = "Airlock Pump";
+ target_pressure = 300;
+ hide = 1
+ },
/turf/open/floor/plating,
/area/station/maintenance/port/aft)
"bWB" = (
-/turf/open/floor/circuit/telecomms/mainframe,
+/obj/effect/turf_decal/siding/dark{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 8
+ },
+/turf/open/floor/circuit/green/telecomms/mainframe,
/area/station/tcommsat/server)
"bWC" = (
/obj/machinery/telecomms/bus/preset_four,
@@ -25570,6 +28952,12 @@
/area/station/tcommsat/server)
"bWD" = (
/obj/machinery/telecomms/server/presets/engineering,
+/obj/effect/turf_decal/box/white{
+ color = "#FFFF00"
+ },
+/obj/effect/turf_decal/bot_white{
+ color = "#FFFF00"
+ },
/turf/open/floor/iron/dark/telecomms,
/area/station/tcommsat/server)
"bWE" = (
@@ -25578,6 +28966,12 @@
/area/station/tcommsat/server)
"bWG" = (
/obj/machinery/telecomms/server/presets/security,
+/obj/effect/turf_decal/box/white{
+ color = "#ff780a"
+ },
+/obj/effect/turf_decal/bot_white{
+ color = "#ff780a"
+ },
/turf/open/floor/iron/dark/telecomms,
/area/station/tcommsat/server)
"bWI" = (
@@ -25592,36 +28986,39 @@
/obj/structure/disposalpipe/junction/flip{
dir = 2
},
-/turf/open/floor/iron,
-/area/station/hallway/primary/aft)
-"bWK" = (
-/obj/effect/turf_decal/tile/yellow{
+/obj/effect/turf_decal/trimline/yellow/corner{
dir = 1
},
-/obj/effect/turf_decal/tile/yellow{
+/obj/effect/turf_decal/siding/dark/corner{
+ dir = 1
+ },
+/turf/open/floor/iron/edge{
dir = 8
},
+/area/station/hallway/primary/aft)
+"bWK" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/yellow/corner{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 1
+ },
+/turf/open/floor/iron/large,
/area/station/hallway/primary/aft)
"bWL" = (
/obj/effect/spawner/random/burgerstation/liquid,
/turf/open/floor/plating,
/area/station/maintenance/starboard/fore)
"bWM" = (
-/obj/machinery/portable_atmospherics/scrubber,
/obj/machinery/atmospherics/components/unary/portables_connector/visible{
dir = 4
},
-/obj/effect/turf_decal/tile/red{
- color = "#ff0000";
- dir = 8
- },
-/turf/open/floor/iron/white/corner{
- dir = 1
- },
+/obj/machinery/portable_atmospherics/scrubber,
+/obj/effect/turf_decal/tile/dark_red/full,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/engineering/atmos)
"bWN" = (
/obj/machinery/door/poddoor/preopen{
@@ -25635,8 +29032,8 @@
/turf/open/floor/iron,
/area/station/engineering/atmos)
"bWO" = (
-/obj/machinery/meter,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible,
+/obj/machinery/meter,
/turf/closed/wall/r_wall,
/area/station/engineering/atmos)
"bWP" = (
@@ -25716,43 +29113,31 @@
/turf/open/floor/iron/white,
/area/station/medical/virology)
"bXa" = (
-/obj/effect/turf_decal/tile/green{
- dir = 8
- },
-/obj/effect/turf_decal/tile/green{
- dir = 1
- },
-/obj/effect/turf_decal/tile/green{
- dir = 4
- },
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/turf_decal/trimline/green/filled/line{
+ dir = 9
+ },
/turf/open/floor/iron,
/area/station/medical/virology)
"bXc" = (
/obj/structure/bed,
/obj/item/bedsheet/medical,
-/obj/effect/turf_decal/tile/green,
-/obj/effect/turf_decal/tile/green{
- dir = 4
- },
-/obj/effect/turf_decal/tile/green{
- dir = 1
- },
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 1
},
+/obj/effect/turf_decal/trimline/green/filled/line{
+ dir = 5
+ },
/turf/open/floor/iron,
/area/station/medical/virology)
"bXd" = (
-/obj/effect/turf_decal/tile/green,
-/obj/effect/turf_decal/tile/green{
- dir = 4
- },
-/obj/effect/turf_decal/tile/green{
- dir = 1
- },
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/light/directional/east,
+/obj/structure/bed,
+/obj/item/bedsheet/medical,
+/obj/effect/turf_decal/trimline/green/filled/line{
+ dir = 5
+ },
/turf/open/floor/iron,
/area/station/medical/virology)
"bXe" = (
@@ -25773,7 +29158,7 @@
/obj/structure/table/reinforced,
/obj/machinery/firealarm/directional/west,
/turf/open/floor/iron,
-/area/station/science/ordnance/bomb)
+/area/station/science/ordnance/testlab)
"bXk" = (
/obj/machinery/navbeacon{
codes_txt = "patrol;next_patrol=AIE";
@@ -25788,10 +29173,6 @@
/turf/open/floor/iron,
/area/station/hallway/primary/aft)
"bXn" = (
-/obj/effect/turf_decal/tile/yellow,
-/obj/effect/turf_decal/tile/yellow{
- dir = 4
- },
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 4
@@ -25802,7 +29183,9 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/turf/open/floor/iron,
+/turf/open/floor/iron/textured_half{
+ dir = 8
+ },
/area/station/hallway/primary/aft)
"bXq" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
@@ -25811,13 +29194,13 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 4
},
-/obj/effect/turf_decal/siding/thinplating{
- dir = 8
- },
/obj/structure/cable,
/obj/structure/disposalpipe/segment{
dir = 4
},
+/obj/effect/turf_decal/siding/thinplating{
+ dir = 8
+ },
/obj/effect/mapping_helpers/airlock/access/any/engineering/general,
/obj/effect/mapping_helpers/airlock/access/any/engineering/construction,
/obj/machinery/door/airlock/engineering/glass{
@@ -25847,6 +29230,12 @@
/area/station/tcommsat/server)
"bXA" = (
/obj/machinery/telecomms/server/presets/common,
+/obj/effect/turf_decal/box/white{
+ color = "#0fff37"
+ },
+/obj/effect/turf_decal/bot_white{
+ color = "#0fff37"
+ },
/turf/open/floor/iron/dark/telecomms,
/area/station/tcommsat/server)
"bXB" = (
@@ -25855,21 +29244,29 @@
/area/station/tcommsat/server)
"bXC" = (
/obj/structure/cable,
-/turf/open/floor/circuit/telecomms/mainframe,
+/obj/effect/turf_decal/siding/dark/corner{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/dark/corner,
+/turf/open/floor/circuit/green/telecomms/mainframe,
/area/station/tcommsat/server)
"bXD" = (
/obj/machinery/telecomms/server/presets/command,
+/obj/effect/turf_decal/box/white{
+ color = "#52B4E9"
+ },
+/obj/effect/turf_decal/bot_white{
+ color = "#0aceff"
+ },
/turf/open/floor/iron/dark/telecomms,
/area/station/tcommsat/server)
"bXE" = (
/obj/machinery/computer/message_monitor{
dir = 4
},
-/obj/effect/turf_decal/tile/yellow{
- dir = 1
- },
-/obj/effect/turf_decal/tile/yellow{
- dir = 8
+/obj/effect/turf_decal/trimline/yellow/filled/line{
+ dir = 8;
+ alpha = 120
},
/turf/open/floor/iron,
/area/station/tcommsat/computer)
@@ -25878,6 +29275,9 @@
dir = 1
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/turf_decal/trimline/yellow/filled/corner{
+ dir = 8
+ },
/turf/open/floor/iron,
/area/station/tcommsat/computer)
"bXI" = (
@@ -25894,18 +29294,13 @@
/turf/open/floor/iron/smooth_large,
/area/station/engineering/break_room)
"bXJ" = (
-/obj/machinery/portable_atmospherics/scrubber,
-/obj/machinery/light/small/directional/south,
/obj/machinery/atmospherics/components/unary/portables_connector/visible{
dir = 4
},
-/obj/effect/turf_decal/tile/red{
- color = "#ff0000";
- dir = 8
- },
-/turf/open/floor/iron/white/corner{
- dir = 1
- },
+/obj/machinery/portable_atmospherics/scrubber,
+/obj/machinery/light/small/directional/south,
+/obj/effect/turf_decal/tile/dark_red/full,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/engineering/atmos)
"bXK" = (
/obj/structure/sign/poster/official/build,
@@ -26036,53 +29431,42 @@
/area/station/medical/virology)
"bYe" = (
/obj/structure/table,
-/obj/effect/turf_decal/tile/green,
-/obj/effect/turf_decal/tile/green{
- dir = 8
- },
-/obj/effect/turf_decal/tile/green{
- dir = 4
- },
/obj/item/clipboard,
/obj/item/pen,
+/obj/effect/turf_decal/trimline/green/filled/line{
+ dir = 6
+ },
/turf/open/floor/iron,
/area/station/medical/virology)
"bYn" = (
/obj/structure/disposalpipe/segment,
-/obj/effect/turf_decal/tile/yellow,
-/obj/effect/turf_decal/tile/yellow{
- dir = 8
- },
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron,
+/turf/open/floor/iron/corner{
+ dir = 4
+ },
/area/station/hallway/primary/aft)
"bYp" = (
-/obj/structure/sign/warning/secure_area/directional/west,
-/obj/effect/turf_decal/tile/yellow{
- dir = 1
- },
-/obj/effect/turf_decal/tile/yellow,
-/obj/effect/turf_decal/tile/yellow{
- dir = 8
- },
-/turf/open/floor/iron,
+/turf/open/floor/iron/large,
/area/station/hallway/primary/aft)
"bYq" = (
-/obj/effect/turf_decal/tile/yellow,
-/obj/effect/turf_decal/tile/yellow{
- dir = 8
- },
/obj/machinery/light/directional/south,
/obj/machinery/incident_display/delam/directional/south,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/yellow/line,
+/obj/effect/turf_decal/trimline/yellow/mid_joiner,
+/turf/open/floor/iron/edge,
/area/station/hallway/primary/aft)
"bYr" = (
/obj/structure/disposalpipe/segment{
dir = 10
},
-/turf/open/floor/iron,
+/obj/effect/turf_decal/siding/dark{
+ dir = 8
+ },
+/turf/open/floor/iron/edge{
+ dir = 8
+ },
/area/station/hallway/primary/central)
"bYs" = (
/obj/effect/spawner/random/structure/crate,
@@ -26103,8 +29487,13 @@
/turf/open/floor/wood,
/area/station/maintenance/abandon_cafeteria)
"bYu" = (
-/obj/structure/sign/warning/vacuum/external/directional/west,
-/turf/closed/wall,
+/obj/structure/fluff/paper/stack,
+/obj/item/paper/crumpled,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/turf/open/floor/iron,
/area/station/maintenance/port/aft)
"bYy" = (
/turf/closed/wall,
@@ -26118,6 +29507,8 @@
/area/station/tcommsat/server)
"bYB" = (
/obj/machinery/blackbox_recorder,
+/obj/effect/turf_decal/box/white,
+/obj/effect/turf_decal/bot_white,
/turf/open/floor/iron/dark/telecomms,
/area/station/tcommsat/server)
"bYC" = (
@@ -26129,21 +29520,14 @@
dir = 4;
network = "tcommsat"
},
-/obj/effect/turf_decal/tile/yellow{
- dir = 1
- },
-/obj/effect/turf_decal/tile/yellow,
-/obj/effect/turf_decal/tile/yellow{
- dir = 8
+/obj/effect/turf_decal/trimline/yellow/filled/line{
+ dir = 10
},
/turf/open/floor/iron,
/area/station/tcommsat/computer)
"bYE" = (
-/obj/effect/turf_decal/tile/yellow,
-/obj/effect/turf_decal/tile/yellow{
- dir = 8
- },
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/yellow/corner,
+/turf/open/floor/iron/edge,
/area/station/hallway/primary/aft)
"bYF" = (
/obj/structure/cable,
@@ -26155,22 +29539,26 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/effect/turf_decal/tile/yellow,
-/obj/effect/turf_decal/tile/yellow{
- dir = 4
+/obj/effect/turf_decal/trimline/yellow/line,
+/obj/effect/turf_decal/trimline/yellow/mid_joiner,
+/turf/open/floor/iron/corner{
+ dir = 1
},
-/obj/effect/turf_decal/tile/yellow{
- dir = 8
- },
-/turf/open/floor/iron,
/area/station/hallway/primary/aft)
"bYH" = (
/turf/closed/wall,
/area/station/engineering/break_room)
"bYI" = (
-/obj/effect/turf_decal/tile/yellow,
/obj/machinery/firealarm/directional/east,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/yellow/arrow_cw{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/yellow/mid_joiner{
+ dir = 4
+ },
+/turf/open/floor/iron/edge{
+ dir = 4
+ },
/area/station/hallway/primary/aft)
"bYK" = (
/obj/effect/turf_decal/tile/yellow{
@@ -26199,14 +29587,12 @@
/obj/structure/disposalpipe/segment{
dir = 5
},
-/obj/effect/turf_decal/tile/yellow,
-/obj/effect/turf_decal/tile/yellow{
- dir = 8
- },
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
dir = 1
},
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/yellow/arrow_ccw,
+/obj/effect/turf_decal/trimline/yellow/mid_joiner,
+/turf/open/floor/iron/textured_half,
/area/station/hallway/primary/aft)
"bYN" = (
/turf/closed/wall,
@@ -26235,9 +29621,16 @@
/turf/open/floor/iron/dark,
/area/station/engineering/atmos)
"bYR" = (
-/obj/structure/sign/warning/no_smoking,
-/turf/closed/wall,
-/area/station/engineering/atmos)
+/obj/structure/disposalpipe/segment,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 6
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/turf/open/floor/iron/dark,
+/area/station/maintenance/port/aft)
"bYS" = (
/obj/machinery/light/small/directional/east,
/turf/open/floor/plating,
@@ -26290,6 +29683,16 @@
dir = 5
},
/area/station/commons/fitness)
+"bZc" = (
+/obj/machinery/door/airlock/external{
+ name = "Port Docking Bay 3"
+ },
+/obj/machinery/door/firedoor,
+/obj/effect/turf_decal/siding/white/corner{
+ dir = 1
+ },
+/turf/open/floor/iron/shuttle/exploration/hazard,
+/area/station/hallway/secondary/entry)
"bZe" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -26301,6 +29704,20 @@
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/station/engineering/break_room)
+"bZf" = (
+/obj/effect/turf_decal/stripes{
+ dir = 4
+ },
+/obj/effect/turf_decal/stripes/white/line{
+ dir = 4;
+ color = "#EFB341"
+ },
+/obj/effect/turf_decal/siding/dark,
+/obj/effect/turf_decal/siding/dark{
+ dir = 1
+ },
+/turf/open/floor/iron/dark/small,
+/area/station/medical/chemistry)
"bZg" = (
/obj/structure/table,
/obj/machinery/fax{
@@ -26316,6 +29733,16 @@
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/station/maintenance/starboard)
+"bZj" = (
+/obj/effect/turf_decal/siding{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/corner,
+/obj/effect/turf_decal/siding/corner{
+ dir = 8
+ },
+/turf/open/floor/iron/white,
+/area/station/medical/medbay/lobby)
"bZl" = (
/obj/structure/closet/secure_closet/freezer/kitchen/maintenance,
/turf/open/floor/iron/cafeteria,
@@ -26358,13 +29785,13 @@
/turf/open/floor/iron/smooth_large,
/area/station/engineering/break_room)
"bZz" = (
+/obj/structure/cable,
/obj/effect/turf_decal/tile/yellow{
dir = 8
},
/obj/effect/turf_decal/tile/dark{
dir = 1
},
-/obj/structure/cable,
/obj/structure/chair{
dir = 8
},
@@ -26374,12 +29801,12 @@
},
/area/station/engineering/break_room)
"bZB" = (
-/obj/machinery/door/airlock/maintenance,
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance/departmental,
/obj/structure/disposalpipe/segment,
+/obj/machinery/door/airlock/maintenance,
+/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance/departmental,
/obj/effect/mapping_helpers/airlock/unres,
/turf/open/floor/plating,
/area/station/maintenance/port/aft)
@@ -26446,13 +29873,12 @@
/obj/effect/turf_decal/stripes/line{
dir = 1
},
-/obj/machinery/atmospherics/components/binary/valve/on{
- dir = 4
+/obj/machinery/atmospherics/pipe/layer_manifold/cyan/hidden{
+ dir = 8
},
/turf/open/floor/plating,
/area/station/maintenance/aft)
"bZR" = (
-/obj/item/wrench,
/obj/effect/turf_decal/stripes/line{
dir = 9
},
@@ -26460,6 +29886,7 @@
dir = 8
},
/obj/machinery/airalarm/directional/north,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer5,
/turf/open/floor/plating,
/area/station/maintenance/aft)
"bZS" = (
@@ -26474,7 +29901,7 @@
"bZT" = (
/obj/machinery/light/small/directional/north,
/obj/effect/spawner/random/structure/closet_maintenance,
-/turf/open/floor/plating,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/maintenance/aft)
"bZU" = (
/obj/machinery/camera/directional/south{
@@ -26484,27 +29911,64 @@
/obj/structure/cable,
/turf/open/floor/plating,
/area/station/maintenance/solars/starboard/fore)
+"bZV" = (
+/obj/machinery/duct,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 6
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/turf/open/floor/iron,
+/area/station/maintenance/port/aft)
+"bZX" = (
+/obj/structure/chair/stool/directional/east,
+/turf/open/floor/plating,
+/area/station/maintenance/starboard/aft)
"cac" = (
/obj/structure/chair/stool,
/turf/open/floor/plating,
/area/station/maintenance/starboard/aft)
"cad" = (
/obj/structure/table,
-/obj/item/flashlight/lamp,
-/turf/open/floor/plating,
+/obj/item/flashlight/lamp{
+ pixel_x = -4;
+ pixel_y = 12
+ },
+/obj/item/folder/white{
+ pixel_x = -5;
+ pixel_y = -8
+ },
+/obj/item/folder/white{
+ pixel_x = -5;
+ pixel_y = -6
+ },
+/turf/open/floor/iron/dark/smooth_large,
/area/station/maintenance/starboard/aft)
"cae" = (
-/obj/effect/mapping_helpers/broken_floor,
-/turf/open/floor/plating,
+/obj/effect/turf_decal/siding/dark{
+ dir = 6
+ },
+/turf/open/floor/iron/dark/smooth_corner{
+ dir = 1
+ },
/area/station/maintenance/starboard/aft)
"cag" = (
/obj/machinery/ntnet_relay,
-/turf/open/floor/circuit/telecomms/mainframe,
+/obj/effect/turf_decal/siding/dark{
+ dir = 8;
+ icon_state = "siding_plain_end"
+ },
+/turf/open/floor/circuit/green/telecomms/mainframe,
/area/station/tcommsat/server)
"cai" = (
/obj/machinery/power/smes/full,
/obj/structure/cable,
-/turf/open/floor/circuit/telecomms/mainframe,
+/obj/effect/turf_decal/siding/dark{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/dark,
+/turf/open/floor/circuit/green/telecomms/mainframe,
/area/station/tcommsat/server)
"caj" = (
/obj/machinery/door/window/brigdoor/left/directional/west{
@@ -26524,10 +29988,10 @@
/turf/open/floor/plating,
/area/station/maintenance/port/aft)
"car" = (
-/obj/effect/turf_decal/tile/yellow/half/contrasted{
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 4
},
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+/obj/effect/turf_decal/trimline/yellow/filled/shrink_ccw{
dir = 4
},
/turf/open/floor/iron/dark,
@@ -26541,9 +30005,10 @@
pixel_y = 5
},
/obj/item/stock_parts/power_store/cell/high{
- pixel_y = 6
+ pixel_y = 0;
+ pixel_x = 0
},
-/turf/open/floor/iron/white,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/science/lab)
"cau" = (
/obj/structure/cable,
@@ -26552,6 +30017,7 @@
/turf/open/floor/iron,
/area/station/hallway/primary/aft)
"caw" = (
+/obj/structure/cable,
/obj/effect/turf_decal/tile/yellow{
dir = 8
},
@@ -26560,7 +30026,6 @@
},
/obj/effect/turf_decal/tile/dark,
/obj/machinery/light/directional/south,
-/obj/structure/cable,
/obj/machinery/light_switch/directional/west,
/obj/machinery/modular_computer/preset/civilian{
dir = 4
@@ -26636,12 +30101,20 @@
/turf/open/floor/engine,
/area/station/engineering/atmos/hfr_room)
"caH" = (
-/obj/effect/turf_decal/tile/yellow{
+/obj/machinery/light/directional/south,
+/obj/effect/turf_decal/trimline/yellow/line{
+ dir = 10
+ },
+/obj/effect/turf_decal/trimline/yellow/mid_joiner{
dir = 8
},
-/obj/effect/turf_decal/tile/yellow,
-/obj/machinery/light/directional/south,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/yellow/mid_joiner,
+/obj/effect/turf_decal/siding/dark{
+ dir = 8
+ },
+/turf/open/floor/iron/corner{
+ dir = 4
+ },
/area/station/hallway/primary/aft)
"caI" = (
/obj/item/toy/plush/bigdeer{
@@ -26665,6 +30138,7 @@
/obj/structure/disposalpipe/junction{
dir = 1
},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer5,
/turf/open/floor/plating,
/area/station/maintenance/aft)
"caO" = (
@@ -26679,12 +30153,10 @@
/obj/machinery/atmospherics/components/binary/valve{
dir = 4
},
+/obj/item/wrench,
/turf/open/floor/plating,
/area/station/maintenance/aft)
"caQ" = (
-/obj/structure/chair/stool{
- pixel_y = 8
- },
/obj/effect/turf_decal/stripes/line{
dir = 10
},
@@ -26692,6 +30164,7 @@
dir = 5
},
/obj/machinery/light/small/directional/west,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer5,
/turf/open/floor/plating,
/area/station/maintenance/aft)
"caR" = (
@@ -26728,20 +30201,29 @@
/obj/effect/spawner/random/burgerstation/power,
/turf/open/floor/plating,
/area/station/maintenance/starboard/fore)
+"cbc" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
+/turf/open/floor/iron/dark,
+/area/station/security/office)
"cbh" = (
/obj/structure/table,
-/obj/item/folder/white,
-/obj/item/folder/white,
-/obj/item/pen,
-/turf/open/floor/plating,
+/obj/item/modular_computer/laptop{
+ pixel_x = -6;
+ pixel_y = 3
+ },
+/turf/open/floor/iron/dark/smooth_large,
/area/station/maintenance/starboard/aft)
"cbi" = (
/obj/structure/table,
/obj/item/paper_bin{
- pixel_x = -2;
+ pixel_x = -5;
pixel_y = 5
},
-/turf/open/floor/plating,
+/obj/item/pen{
+ pixel_x = -5;
+ pixel_y = 6
+ },
+/turf/open/floor/iron/dark/smooth_large,
/area/station/maintenance/starboard/aft)
"cbk" = (
/obj/structure/cable,
@@ -26804,11 +30286,15 @@
c_tag = "Aft Primary Hallway 1";
pixel_y = -22
},
-/obj/effect/turf_decal/tile/yellow,
-/obj/effect/turf_decal/tile/yellow{
+/obj/effect/turf_decal/trimline/yellow/line{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/yellow/mid_joiner{
+ dir = 4
+ },
+/turf/open/floor/iron/edge{
dir = 4
},
-/turf/open/floor/iron,
/area/station/hallway/primary/aft)
"cbu" = (
/obj/machinery/light/small/directional/north,
@@ -26837,6 +30323,7 @@
dir = 5
},
/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer5,
/turf/open/floor/plating,
/area/station/maintenance/port/aft)
"cbx" = (
@@ -26850,6 +30337,7 @@
/obj/structure/disposalpipe/segment{
dir = 9
},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer5,
/turf/open/floor/plating,
/area/station/maintenance/port/aft)
"cby" = (
@@ -26884,7 +30372,7 @@
/turf/open/floor/engine,
/area/station/engineering/atmos)
"cbC" = (
-/obj/effect/turf_decal/tile/yellow/half/contrasted,
+/obj/effect/turf_decal/trimline/yellow/filled/shrink_cw,
/turf/open/floor/iron/dark,
/area/station/engineering/atmos/hfr_room)
"cbD" = (
@@ -26892,7 +30380,7 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/door/firedoor,
-/turf/open/floor/iron,
+/turf/open/floor/iron/large,
/area/station/hallway/primary/aft)
"cbE" = (
/obj/effect/landmark/event_spawn,
@@ -26919,12 +30407,15 @@
/turf/open/floor/engine/co2,
/area/station/engineering/atmos)
"cbO" = (
-/obj/machinery/door/airlock/atmos{
- name = "Atmospherics Maintenance"
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 6
+ },
+/obj/machinery/duct,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
},
-/obj/effect/mapping_helpers/airlock/access/any/medical/maintenance,
/turf/open/floor/plating,
-/area/station/maintenance/aft)
+/area/station/maintenance/port/aft)
"cbP" = (
/obj/structure/disposalpipe/segment{
dir = 10
@@ -26932,6 +30423,9 @@
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/railing/corner/end/flip{
+ dir = 8
+ },
/turf/open/floor/plating,
/area/station/maintenance/aft)
"cbT" = (
@@ -26947,6 +30441,7 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 1
},
+/obj/machinery/vending/wallmed/directional/north,
/turf/open/floor/iron/white,
/area/station/medical/virology)
"cce" = (
@@ -26957,6 +30452,9 @@
/obj/structure/disposalpipe/segment{
dir = 6
},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 9
+ },
/turf/open/floor/plating,
/area/station/maintenance/port/aft)
"ccf" = (
@@ -26965,6 +30463,8 @@
/area/station/tcommsat/server)
"ccg" = (
/obj/machinery/telecomms/message_server/preset,
+/obj/effect/turf_decal/box/white,
+/obj/effect/turf_decal/bot_white,
/turf/open/floor/iron/dark/telecomms,
/area/station/tcommsat/server)
"cch" = (
@@ -26974,16 +30474,10 @@
"cci" = (
/obj/structure/table,
/obj/item/multitool,
-/obj/effect/turf_decal/tile/yellow{
- dir = 1
- },
-/obj/effect/turf_decal/tile/yellow{
- dir = 4
- },
-/obj/effect/turf_decal/tile/yellow{
- dir = 8
- },
/obj/item/paper/fluff/jobs/engineering/frequencies,
+/obj/effect/turf_decal/trimline/yellow/filled/line{
+ dir = 9
+ },
/turf/open/floor/iron,
/area/station/tcommsat/computer)
"ccj" = (
@@ -27100,10 +30594,12 @@
/turf/open/floor/engine/co2,
/area/station/engineering/atmos)
"ccE" = (
-/obj/structure/sign/warning/no_smoking{
- pixel_y = 28
- },
/obj/machinery/light/small/directional/north,
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/structure/trash_pile,
+/obj/structure/sign/warning/no_smoking/directional/north,
/turf/open/floor/plating,
/area/station/maintenance/aft)
"ccF" = (
@@ -27142,12 +30638,12 @@
name = "Containment Blast Door"
},
/obj/machinery/door/firedoor,
-/turf/open/floor/iron/white,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/science/xenobiology)
"ccV" = (
/obj/structure/table,
/obj/effect/spawner/random/maintenance,
-/turf/open/floor/plating,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/maintenance/starboard/aft)
"ccW" = (
/obj/effect/turf_decal/stripes/line{
@@ -27167,23 +30663,29 @@
/turf/open/floor/plating,
/area/station/maintenance/port/aft)
"cda" = (
-/obj/effect/decal/cleanable/dirt,
/obj/effect/spawner/random/burgerstation/table,
/obj/effect/spawner/random/maintenance,
+/obj/item/melee/baton/security/cattleprod,
/turf/open/floor/plating,
/area/station/maintenance/starboard/aft)
"cdb" = (
-/obj/effect/turf_decal/bot,
-/obj/structure/reagent_dispensers/fueltank,
-/obj/item/weldingtool,
-/turf/open/floor/iron,
-/area/station/cargo/warehouse)
+/obj/effect/turf_decal/tile/yellow{
+ dir = 1
+ },
+/turf/open/floor/iron/white,
+/area/station/medical/chemistry)
"cdc" = (
/obj/machinery/telecomms/bus/preset_two,
/turf/open/floor/iron/dark/telecomms,
/area/station/tcommsat/server)
"cdd" = (
/obj/machinery/telecomms/server/presets/supply,
+/obj/effect/turf_decal/box/white{
+ color = "#EFB341"
+ },
+/obj/effect/turf_decal/bot_white{
+ color = "#EFB341"
+ },
/turf/open/floor/iron/dark/telecomms,
/area/station/tcommsat/server)
"cde" = (
@@ -27192,6 +30694,12 @@
/area/station/tcommsat/server)
"cdf" = (
/obj/machinery/telecomms/server/presets/medical,
+/obj/effect/turf_decal/box/white{
+ color = "#52B4E9"
+ },
+/obj/effect/turf_decal/bot_white{
+ color = "#52B4E9"
+ },
/turf/open/floor/iron/dark/telecomms,
/area/station/tcommsat/server)
"cdg" = (
@@ -27199,11 +30707,9 @@
dir = 4;
network = "tcommsat"
},
-/obj/effect/turf_decal/tile/yellow{
- dir = 1
- },
-/obj/effect/turf_decal/tile/yellow{
- dir = 8
+/obj/effect/turf_decal/trimline/yellow/filled/line{
+ dir = 8;
+ alpha = 120
},
/turf/open/floor/iron,
/area/station/tcommsat/computer)
@@ -27214,13 +30720,12 @@
/obj/structure/disposalpipe/segment{
dir = 10
},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer5,
/turf/open/floor/plating,
/area/station/maintenance/port/aft)
"cdj" = (
-/obj/structure/extinguisher_cabinet{
- pixel_x = 27
- },
-/turf/open/floor/iron,
+/obj/structure/hedge,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/hallway/secondary/entry)
"cdk" = (
/obj/machinery/light/directional/west,
@@ -27232,15 +30737,36 @@
/turf/open/floor/carpet/orange,
/area/station/command/heads_quarters/ce)
"cdn" = (
+/obj/structure/cable,
+/obj/effect/turf_decal/trimline/blue/filled/corner{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/blue/filled/corner{
+ alpha = 160
+ },
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 4
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 4
},
-/obj/structure/cable,
-/turf/open/floor/iron,
+/turf/open/floor/iron/edge{
+ dir = 8
+ },
/area/station/hallway/secondary/entry)
+"cdq" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/white,
+/obj/effect/turf_decal/siding/white/corner{
+ dir = 4
+ },
+/turf/open/floor/iron/white/small,
+/area/station/commons/toilet)
"cds" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -27249,7 +30775,17 @@
dir = 4
},
/obj/machinery/door/firedoor,
-/turf/open/floor/iron/dark,
+/obj/effect/turf_decal/stripes/blue/line{
+ dir = 8
+ },
+/obj/effect/turf_decal/stripes/blue/line{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/blue/full,
+/obj/effect/turf_decal/caution/stand_clear/white{
+ dir = 8
+ },
+/turf/open/floor/iron/dark/smooth_large,
/area/station/medical/treatment_center)
"cdu" = (
/obj/structure/closet/emcloset,
@@ -27335,11 +30871,28 @@
/turf/open/floor/plating,
/area/station/maintenance/aft)
"cdM" = (
-/obj/structure/sign/warning/no_smoking{
- pixel_x = 25
+/obj/effect/turf_decal/trimline/dark/filled/line{
+ alpha = 160;
+ dir = 6
},
-/turf/open/floor/iron/white/side{
- dir = 9
+/obj/effect/turf_decal/trimline/dark/filled/mid_joiner{
+ dir = 4;
+ alpha = 160
+ },
+/obj/effect/turf_decal/trimline/dark/filled/mid_joiner{
+ dir = 2;
+ alpha = 160
+ },
+/obj/effect/turf_decal/trimline/purple/line{
+ alpha = 200;
+ dir = 6
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 6
+ },
+/obj/structure/sign/warning/no_smoking/directional/east,
+/turf/open/floor/iron/white/smooth_corner{
+ dir = 1
},
/area/station/science/research)
"cdR" = (
@@ -27387,6 +30940,12 @@
/area/station/tcommsat/server)
"cea" = (
/obj/machinery/telecomms/server/presets/service,
+/obj/effect/turf_decal/box/white{
+ color = "#9FED58"
+ },
+/obj/effect/turf_decal/bot_white{
+ color = "#9FED58"
+ },
/turf/open/floor/iron/dark/telecomms,
/area/station/tcommsat/server)
"ceb" = (
@@ -27396,23 +30955,29 @@
"cec" = (
/obj/structure/sign/warning/no_smoking/directional/south,
/obj/machinery/light/directional/south,
-/turf/open/floor/circuit/telecomms/mainframe,
+/obj/effect/turf_decal/siding/dark{
+ dir = 2;
+ icon_state = "siding_plain_end"
+ },
+/turf/open/floor/circuit/green/telecomms/mainframe,
/area/station/tcommsat/server)
"ced" = (
/obj/machinery/telecomms/server/presets/science,
+/obj/effect/turf_decal/box/white{
+ color = "#a56dc2"
+ },
+/obj/effect/turf_decal/bot_white{
+ color = "#a56dc2"
+ },
/turf/open/floor/iron/dark/telecomms,
/area/station/tcommsat/server)
"cee" = (
/obj/structure/table,
/obj/item/book/manual/wiki/tcomms,
-/obj/effect/turf_decal/tile/yellow{
- dir = 1
- },
-/obj/effect/turf_decal/tile/yellow,
-/obj/effect/turf_decal/tile/yellow{
- dir = 8
- },
/obj/item/radio/off,
+/obj/effect/turf_decal/trimline/yellow/filled/line{
+ dir = 10
+ },
/turf/open/floor/iron,
/area/station/tcommsat/computer)
"ceg" = (
@@ -27422,8 +30987,13 @@
/turf/open/floor/iron,
/area/station/tcommsat/computer)
"ceh" = (
-/obj/effect/landmark/event_spawn,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/siding/dark{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/dark,
+/turf/open/floor/iron/dark/side{
+ dir = 6
+ },
/area/station/command/bridge)
"cei" = (
/obj/structure/rack,
@@ -27431,6 +31001,9 @@
pixel_x = -2;
pixel_y = -1
},
+/obj/machinery/light_switch{
+ pixel_x = 27
+ },
/turf/open/floor/iron,
/area/station/tcommsat/computer)
"cen" = (
@@ -27457,7 +31030,7 @@
/obj/structure/cable,
/obj/machinery/hydroponics/constructable,
/obj/machinery/door/window/left/directional/east,
-/obj/effect/turf_decal/siding/blue{
+/obj/effect/turf_decal/siding/wood{
dir = 1
},
/turf/open/floor/grass,
@@ -27503,10 +31076,15 @@
/turf/open/floor/iron,
/area/station/science/ordnance/storage)
"ceF" = (
-/obj/effect/turf_decal/tile/yellow/half/contrasted,
-/turf/open/floor/iron/dark/side{
- dir = 1
+/obj/effect/turf_decal/trimline/yellow/filled/warning{
+ alpha = 120;
+ dir = 4
},
+/obj/effect/turf_decal/trimline/dark_blue/warning{
+ alpha = 200;
+ dir = 4
+ },
+/turf/open/floor/iron/dark,
/area/station/engineering/atmos/hfr_room)
"ceJ" = (
/obj/effect/decal/cleanable/dirt,
@@ -27521,6 +31099,7 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 4
},
+/obj/structure/cable,
/turf/open/floor/plating,
/area/station/maintenance/starboard/aft)
"ceO" = (
@@ -27539,10 +31118,18 @@
/area/station/science/auxlab/firing_range)
"ceT" = (
/obj/machinery/light/small/directional/south,
+/obj/effect/turf_decal/siding/dark{
+ dir = 6
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/plating,
/area/station/maintenance/starboard/aft)
"ceU" = (
/obj/structure/sign/warning/vacuum/external/directional/south,
+/obj/machinery/atmospherics/components/unary/airlock_pump/unbolt_only{
+ dir = 8
+ },
/turf/open/floor/plating,
/area/station/maintenance/starboard/aft)
"ceW" = (
@@ -27553,8 +31140,9 @@
desc = "Imbued with an ancient power";
name = "golden wrench"
},
-/obj/item/toy/figure/ce,
-/obj/item/food/cracker,
+/obj/item/food/cracker{
+ pixel_x = 5
+ },
/turf/open/floor/wood/tile,
/area/station/command/heads_quarters/ce)
"ceY" = (
@@ -27604,6 +31192,7 @@
/obj/effect/decal/cleanable/dirt,
/obj/structure/cable,
/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer5,
/turf/open/floor/plating,
/area/station/maintenance/port/aft)
"cfg" = (
@@ -27645,8 +31234,14 @@
/area/station/engineering/atmos)
"cfo" = (
/obj/machinery/camera/autoname/directional/west{
- network = list("ss13","xeno")
+ network = list("ss13","xeno");
+ c_tag = "Xenobiology Cold Room"
},
+/obj/machinery/atmospherics/components/unary/passive_vent{
+ name = "killroom vent";
+ dir = 4
+ },
+/obj/structure/grille,
/turf/open/floor/circuit/telecomms,
/area/station/science/xenobiology)
"cfp" = (
@@ -27676,10 +31271,6 @@
/turf/open/floor/plating,
/area/station/service/lawoffice)
"cfE" = (
-/obj/structure/fence/door{
- dir = 4;
- name = "Prison Cell"
- },
/obj/machinery/door/poddoor/shutters/preopen{
id = "briggate";
name = "Security Shutters"
@@ -27712,23 +31303,6 @@
/obj/machinery/light/directional/north,
/obj/machinery/pdapainter/engineering,
/obj/effect/turf_decal/bot,
-/obj/machinery/button/door/directional/west{
- id = "atmos";
- name = "Atmospherics Lockdown";
- pixel_y = 10;
- req_access = list("engineering")
- },
-/obj/machinery/button/door/directional/west{
- id = "Secure Storage";
- name = "Engineering Secure Storage";
- req_access = list("ce")
- },
-/obj/machinery/button/door/directional/west{
- id = "Engineering";
- name = "Engineering Lockdown";
- pixel_y = -10;
- req_access = list("engineering")
- },
/obj/machinery/airalarm/directional/north,
/obj/effect/turf_decal/tile/yellow/half{
dir = 1
@@ -27736,9 +31310,11 @@
/obj/effect/turf_decal/tile/yellow{
dir = 8
},
-/obj/machinery/firealarm/directional/west{
- pixel_x = -32
+/obj/item/toy/figure/ce{
+ pixel_x = 4;
+ pixel_y = 4
},
+/obj/machinery/firealarm/directional/west,
/turf/open/floor/iron/dark,
/area/station/command/heads_quarters/ce)
"cfK" = (
@@ -27817,6 +31393,8 @@
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/cable,
+/obj/effect/decal/cleanable/ash,
/turf/open/floor/plating,
/area/station/maintenance/starboard/aft)
"cgp" = (
@@ -27838,7 +31416,7 @@
"cgx" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/closed/wall/r_wall,
-/area/station/engineering/main)
+/area/station/engineering/supermatter/room)
"cgy" = (
/obj/machinery/light/small/directional/north,
/obj/structure/closet/cardboard,
@@ -27886,7 +31464,7 @@
dir = 9
},
/turf/open/floor/engine,
-/area/station/engineering/main)
+/area/station/engineering/supermatter/room)
"cgR" = (
/turf/open/floor/iron/smooth_large,
/area/station/engineering/main)
@@ -28044,6 +31622,7 @@
dir = 8
},
/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer5,
/turf/open/floor/iron/smooth_large,
/area/station/engineering/main)
"chC" = (
@@ -28081,6 +31660,9 @@
/obj/effect/turf_decal/trimline/dark_blue/filled/line{
dir = 1
},
+/obj/effect/turf_decal/trimline/dark/line{
+ dir = 1
+ },
/turf/open/floor/iron/dark,
/area/station/security/holding_cell)
"chH" = (
@@ -28095,6 +31677,10 @@
/area/station/maintenance/abandon_arcade)
"chN" = (
/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 5
+ },
/turf/open/floor/plating,
/area/station/maintenance/solars/port/aft)
"chO" = (
@@ -28114,6 +31700,7 @@
c_tag = "Bar West";
network = list("ss13","bar")
},
+/obj/structure/extinguisher_cabinet/directional/west,
/turf/open/floor/eighties,
/area/station/service/bar)
"chS" = (
@@ -28122,6 +31709,10 @@
},
/obj/effect/mapping_helpers/airlock/access/any/engineering/general,
/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 5
+ },
/turf/open/floor/plating,
/area/station/maintenance/solars/port/aft)
"chV" = (
@@ -28135,7 +31726,7 @@
dir = 1
},
/turf/open/floor/engine,
-/area/station/engineering/main)
+/area/station/engineering/supermatter/room)
"chY" = (
/obj/machinery/shieldgen,
/turf/open/floor/plating,
@@ -28149,6 +31740,14 @@
/obj/machinery/airalarm/directional/north,
/turf/open/floor/iron/smooth_large,
/area/station/engineering/engine_smes)
+"cib" = (
+/obj/effect/turf_decal/trimline/brown/corner{
+ dir = 4
+ },
+/turf/open/floor/iron/edge{
+ dir = 1
+ },
+/area/station/hallway/primary/starboard)
"cic" = (
/obj/machinery/power/smes/engineering,
/obj/effect/turf_decal/delivery,
@@ -28166,11 +31765,8 @@
/obj/effect/turf_decal/bot{
dir = 1
},
-/obj/structure/extinguisher_cabinet{
- pixel_x = -5;
- pixel_y = 30
- },
/obj/structure/reagent_dispensers/watertank,
+/obj/structure/extinguisher_cabinet/directional/north,
/turf/open/floor/iron/smooth_large,
/area/station/engineering/engine_smes)
"cig" = (
@@ -28187,11 +31783,14 @@
dir = 1
},
/turf/open/floor/engine,
-/area/station/engineering/main)
+/area/station/engineering/supermatter/room)
"cij" = (
/obj/effect/turf_decal/trimline/dark_blue/filled/line{
dir = 5
},
+/obj/effect/turf_decal/trimline/dark/line{
+ dir = 5
+ },
/turf/open/floor/iron/dark,
/area/station/security/holding_cell)
"cik" = (
@@ -28210,6 +31809,23 @@
/obj/effect/turf_decal/tile/yellow/anticorner/contrasted{
dir = 1
},
+/obj/machinery/button/door/directional/west{
+ id = "Engineering";
+ name = "Engineering Lockdown";
+ pixel_y = -10;
+ req_access = list("engineering")
+ },
+/obj/machinery/button/door/directional/west{
+ id = "Secure Storage";
+ name = "Engineering Secure Storage";
+ req_access = list("ce")
+ },
+/obj/machinery/button/door/directional/west{
+ id = "atmos";
+ name = "Atmospherics Lockdown";
+ pixel_y = 10;
+ req_access = list("engineering")
+ },
/turf/open/floor/iron/white/corner,
/area/station/command/heads_quarters/ce)
"cin" = (
@@ -28242,7 +31858,7 @@
dir = 5
},
/turf/open/floor/engine,
-/area/station/engineering/main)
+/area/station/engineering/supermatter/room)
"ciq" = (
/obj/effect/turf_decal/siding/wood{
dir = 8
@@ -28280,7 +31896,9 @@
"ciy" = (
/obj/effect/turf_decal/trimline/green/filled/end,
/obj/effect/decal/cleanable/dirt,
-/obj/effect/landmark/generic_maintenance_landmark,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+ dir = 1
+ },
/turf/open/floor/iron,
/area/station/service/hydroponics/garden/abandoned)
"ciD" = (
@@ -28310,7 +31928,7 @@
dir = 10
},
/turf/open/floor/engine,
-/area/station/engineering/main)
+/area/station/engineering/supermatter/room)
"ciQ" = (
/obj/machinery/power/solar_control{
dir = 4;
@@ -28347,7 +31965,7 @@
/area/station/engineering/engine_smes)
"ciZ" = (
/turf/open/floor/plating,
-/area/station/engineering/main)
+/area/station/engineering/supermatter/room)
"cjb" = (
/obj/effect/turf_decal/delivery,
/obj/structure/cable,
@@ -28456,6 +32074,7 @@
/obj/effect/landmark/start/hangover/closet,
/obj/structure/closet/wardrobe/mixed,
/obj/structure/extinguisher_cabinet/directional/north,
+/obj/machinery/light/directional/north,
/turf/open/floor/iron/dark/side{
dir = 1
},
@@ -28466,6 +32085,9 @@
},
/obj/effect/mapping_helpers/airlock/access/any/engineering/general,
/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 4
+ },
/turf/open/floor/plating,
/area/station/maintenance/solars/starboard/aft)
"cjI" = (
@@ -28512,6 +32134,9 @@
/area/station/engineering/main)
"cjV" = (
/obj/machinery/light/directional/south,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+ dir = 1
+ },
/turf/open/floor/iron/smooth_large,
/area/station/engineering/main)
"cjW" = (
@@ -28519,8 +32144,11 @@
id = "warehouse_shutters2";
name = "warehouse shutters control"
},
-/obj/structure/cable,
-/obj/effect/turf_decal/tile/brown/half/contrasted{
+/obj/machinery/light/small/directional/north,
+/obj/effect/turf_decal/trimline/brown/filled/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/dark/line{
dir = 1
},
/turf/open/floor/iron,
@@ -28571,6 +32199,9 @@
/area/station/engineering/atmos)
"cks" = (
/obj/structure/cable,
+/obj/machinery/atmospherics/components/unary/airlock_pump/unbolt_only{
+ dir = 1
+ },
/turf/open/floor/plating,
/area/station/maintenance/solars/starboard/aft)
"cku" = (
@@ -28667,10 +32298,23 @@
},
/turf/open/floor/engine,
/area/station/science/auxlab/firing_range)
+"cll" = (
+/obj/structure/railing{
+ dir = 4
+ },
+/turf/open/floor/iron/edge{
+ dir = 8
+ },
+/area/station/hallway/secondary/entry)
"clq" = (
/obj/machinery/light/small/directional/south,
/turf/open/floor/iron,
/area/station/maintenance/starboard/fore)
+"clr" = (
+/obj/structure/cable,
+/obj/machinery/firealarm/directional/west,
+/turf/open/floor/wood,
+/area/station/security/detectives_office)
"cls" = (
/turf/closed/wall,
/area/station/hallway/primary/aft)
@@ -28691,10 +32335,12 @@
/turf/open/floor/plating,
/area/station/maintenance/starboard/aft)
"clx" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 4
+ },
/turf/open/floor/plating,
/area/station/maintenance/solars/starboard/aft)
"cly" = (
-/obj/structure/chair/stool,
/obj/machinery/camera/directional/west{
c_tag = "Aft Starboard Solar Control"
},
@@ -28706,6 +32352,7 @@
},
/obj/structure/cable,
/obj/machinery/light/small/directional/east,
+/obj/structure/chair/stool,
/turf/open/floor/plating,
/area/station/maintenance/solars/starboard/aft)
"clC" = (
@@ -28715,6 +32362,9 @@
/obj/effect/turf_decal/trimline/dark_blue/filled/line{
dir = 10
},
+/obj/effect/turf_decal/trimline/dark/line{
+ dir = 10
+ },
/turf/open/floor/iron/dark,
/area/station/security/execution/transfer)
"clJ" = (
@@ -28819,17 +32469,20 @@
/turf/open/floor/plating,
/area/station/maintenance/starboard/fore)
"cmw" = (
-/obj/machinery/power/solar_control{
- dir = 1;
- id = "starboardsolar";
- name = "Starboard Quarter Solar Control"
- },
/obj/structure/cable,
+/obj/machinery/atmospherics/components/tank/air/layer4{
+ dir = 4
+ },
/turf/open/floor/plating,
/area/station/maintenance/solars/starboard/aft)
"cmx" = (
/obj/structure/sign/warning/vacuum/external/directional/south,
/obj/structure/cable,
+/obj/machinery/power/solar_control{
+ dir = 1;
+ id = "starboardsolar";
+ name = "Starboard Quarter Solar Control"
+ },
/turf/open/floor/plating,
/area/station/maintenance/solars/starboard/aft)
"cmD" = (
@@ -28907,12 +32560,14 @@
},
/obj/effect/mapping_helpers/airlock/access/any/engineering/general,
/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer4,
/turf/open/floor/plating,
/area/station/maintenance/solars/starboard/aft)
"cnu" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 6
- },
+/obj/machinery/firealarm/directional/west,
/obj/machinery/button/door{
id = "evashutters1";
name = "E.V.A. Shutters";
@@ -28920,7 +32575,21 @@
req_access = list("eva")
},
/obj/machinery/suit_storage_unit/standard_unit,
-/turf/open/floor/iron,
+/obj/structure/railing/corner{
+ dir = 4;
+ pixel_y = -32
+ },
+/obj/structure/railing/corner{
+ dir = 1;
+ pixel_y = -32
+ },
+/obj/effect/turf_decal/box/white{
+ color = "#ff780a"
+ },
+/obj/effect/turf_decal/bot_white{
+ color = "#ff780a"
+ },
+/turf/open/floor/iron/dark/smooth_large,
/area/station/ai_monitored/command/storage/eva)
"cnv" = (
/obj/machinery/holopad,
@@ -28937,7 +32606,7 @@
dir = 1
},
/turf/open/floor/engine,
-/area/station/engineering/main)
+/area/station/engineering/supermatter/room)
"cny" = (
/obj/effect/landmark/start/station_engineer,
/turf/open/floor/iron/smooth_large,
@@ -28965,18 +32634,18 @@
/area/station/engineering/engine_smes)
"cnV" = (
/obj/effect/landmark/start/shaft_miner,
-/obj/effect/turf_decal/tile/yellow{
+/obj/effect/turf_decal/trimline/brown/filled/line{
dir = 1
},
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/dark/line{
+ dir = 1
+ },
+/turf/open/floor/iron/textured_edge,
/area/station/cargo/miningdock)
"cnX" = (
-/obj/structure/extinguisher_cabinet{
- pixel_x = -5;
- pixel_y = 30
- },
/obj/structure/cable,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
+/obj/structure/extinguisher_cabinet/directional/north,
/turf/open/floor/iron/smooth_large,
/area/station/engineering/main)
"cnY" = (
@@ -29007,6 +32676,7 @@
},
/obj/machinery/holopad/secure,
/obj/effect/turf_decal/trimline/dark_blue/filled/warning,
+/obj/effect/turf_decal/trimline/dark/warning,
/turf/open/floor/iron/dark,
/area/station/security/holding_cell)
"cop" = (
@@ -29020,6 +32690,15 @@
},
/turf/open/floor/engine/plasma,
/area/station/engineering/atmos)
+"cos" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/wood{
+ dir = 8
+ },
+/turf/open/floor/wood/large,
+/area/station/hallway/secondary/entry)
"cou" = (
/obj/structure/table,
/obj/machinery/recharger{
@@ -29042,11 +32721,11 @@
/turf/open/floor/iron,
/area/station/science/auxlab/firing_range)
"cow" = (
-/obj/structure/extinguisher_cabinet{
- pixel_x = 5;
- pixel_y = -32
- },
/obj/effect/turf_decal/trimline/dark_blue/filled/line,
+/obj/structure/extinguisher_cabinet/directional/south,
+/obj/effect/turf_decal/trimline/dark_blue/line{
+ alpha = 200
+ },
/turf/open/floor/iron/dark,
/area/station/security/office)
"coA" = (
@@ -29076,7 +32755,7 @@
dir = 9
},
/turf/open/floor/engine,
-/area/station/engineering/main)
+/area/station/engineering/supermatter/room)
"coT" = (
/obj/structure/table,
/obj/item/stock_parts/power_store/cell/high,
@@ -29087,6 +32766,7 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/orange/visible{
dir = 5
},
+/obj/structure/closet/secure_closet/engineering_electrical,
/turf/open/floor/iron/smooth_large,
/area/station/engineering/main)
"cpa" = (
@@ -29135,7 +32815,7 @@
/area/station/engineering/main)
"cpu" = (
/turf/closed/wall/r_wall,
-/area/station/science/ordnance/bomb)
+/area/station/science/ordnance/testlab)
"cpv" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/door/airlock/maintenance,
@@ -29145,14 +32825,24 @@
/turf/open/floor/plating,
/area/station/maintenance/port/aft)
"cpC" = (
-/obj/effect/landmark/event_spawn,
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron,
+/obj/effect/landmark/event_spawn,
+/obj/effect/turf_decal/siding/dark/corner{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 4
+ },
+/turf/open/floor/iron/dark/side{
+ dir = 4
+ },
/area/station/command/bridge)
"cpE" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
-/turf/open/floor/iron,
+/turf/open/floor/iron/edge{
+ dir = 1
+ },
/area/station/hallway/primary/central)
"cpI" = (
/obj/machinery/door/airlock/atmos{
@@ -29161,6 +32851,10 @@
/obj/effect/landmark/navigate_destination/autoname,
/obj/effect/mapping_helpers/airlock/access/any/engineering/atmos,
/obj/machinery/door/firedoor/heavy,
+/obj/machinery/door/poddoor/shutters{
+ id = "HFRshutter";
+ name = "Atmospherics HFR Shutters"
+ },
/turf/open/floor/iron/smooth_large,
/area/station/engineering/atmos/hfr_room)
"cpN" = (
@@ -29209,6 +32903,7 @@
"cpX" = (
/obj/structure/table,
/obj/item/stack/rods/fifty,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer5,
/turf/open/floor/iron/smooth_large,
/area/station/engineering/main)
"cpZ" = (
@@ -29224,6 +32919,8 @@
pixel_x = 1;
pixel_y = 5
},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer4,
+/obj/machinery/light/directional/south,
/turf/open/floor/iron/smooth_large,
/area/station/engineering/main)
"cqa" = (
@@ -29232,10 +32929,10 @@
dir = 4
},
/turf/open/floor/plating,
-/area/station/engineering/main)
+/area/station/engineering/supermatter/room)
"cqb" = (
/turf/open/floor/engine,
-/area/station/engineering/main)
+/area/station/engineering/supermatter/room)
"cqd" = (
/obj/effect/turf_decal/stripes/line,
/obj/machinery/meter,
@@ -29243,7 +32940,7 @@
dir = 4
},
/turf/open/floor/engine,
-/area/station/engineering/main)
+/area/station/engineering/supermatter/room)
"cqe" = (
/obj/effect/turf_decal/stripes/corner,
/obj/structure/cable,
@@ -29251,7 +32948,7 @@
dir = 6
},
/turf/open/floor/engine,
-/area/station/engineering/main)
+/area/station/engineering/supermatter/room)
"cqf" = (
/obj/effect/turf_decal/stripes/line,
/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible{
@@ -29259,7 +32956,7 @@
},
/obj/machinery/light/directional/south,
/turf/open/floor/engine,
-/area/station/engineering/main)
+/area/station/engineering/supermatter/room)
"cqg" = (
/obj/effect/turf_decal/stripes/line,
/obj/machinery/atmospherics/components/binary/pump/on{
@@ -29267,7 +32964,7 @@
name = "Engine Coolant Bypass"
},
/turf/open/floor/engine,
-/area/station/engineering/main)
+/area/station/engineering/supermatter/room)
"cqh" = (
/obj/effect/turf_decal/stripes/line,
/obj/machinery/camera/directional/south{
@@ -29280,7 +32977,7 @@
},
/obj/machinery/firealarm/directional/south,
/turf/open/floor/engine,
-/area/station/engineering/main)
+/area/station/engineering/supermatter/room)
"cqi" = (
/obj/effect/turf_decal/stripes/line,
/obj/machinery/meter,
@@ -29289,7 +32986,7 @@
},
/obj/machinery/light/directional/south,
/turf/open/floor/engine,
-/area/station/engineering/main)
+/area/station/engineering/supermatter/room)
"cqj" = (
/obj/effect/turf_decal/stripes/line,
/obj/machinery/button/door{
@@ -29302,7 +32999,7 @@
dir = 1
},
/turf/open/floor/engine,
-/area/station/engineering/main)
+/area/station/engineering/supermatter/room)
"cql" = (
/obj/effect/turf_decal/stripes/corner{
dir = 8
@@ -29312,7 +33009,7 @@
dir = 1
},
/turf/open/floor/engine,
-/area/station/engineering/main)
+/area/station/engineering/supermatter/room)
"cqm" = (
/obj/machinery/meter,
/obj/machinery/atmospherics/pipe/smart/manifold4w/orange/visible{
@@ -29328,22 +33025,42 @@
/obj/effect/turf_decal/stripes/line{
dir = 6
},
-/obj/structure/closet/secure_closet/engineering_electrical,
+/obj/machinery/button/door/directional/east{
+ name = "Atmospherics HFR Shutters";
+ id = "HFRshutter";
+ req_access = list("atmospherics")
+ },
/turf/open/floor/iron/smooth_large,
/area/station/engineering/main)
"cqp" = (
-/obj/structure/tank_holder/extinguisher/advanced,
-/obj/effect/turf_decal/tile/yellow,
-/turf/open/floor/iron/dark/side{
- dir = 9
+/obj/effect/turf_decal/trimline/yellow/filled/line{
+ dir = 10;
+ alpha = 120
},
+/obj/effect/turf_decal/trimline/dark_blue/line{
+ alpha = 200;
+ dir = 10
+ },
+/obj/machinery/light_switch/directional/west,
+/turf/open/floor/iron/dark,
/area/station/engineering/atmos/hfr_room)
"cqr" = (
-/obj/machinery/computer/shuttle/arrivals/recall,
-/obj/effect/turf_decal/stripes/line{
+/obj/effect/turf_decal/siding/wood{
dir = 1
},
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/blue/filled/corner{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/blue/filled/corner{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 5
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/turf/open/floor/iron/edge,
/area/station/hallway/secondary/entry)
"cqt" = (
/obj/effect/turf_decal/stripes/line{
@@ -29364,14 +33081,19 @@
dir = 8
},
/obj/machinery/light/directional/east,
+/obj/machinery/vending/wallmed/directional/east,
/turf/open/floor/iron/smooth_large,
/area/station/engineering/main)
"cqA" = (
/obj/effect/mapping_helpers/airlock/cyclelink_helper,
+/obj/effect/mapping_helpers/airlock/access/any/engineering/general,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 5
+ },
/obj/machinery/door/airlock/external{
name = "Engineering External Access"
},
-/obj/effect/mapping_helpers/airlock/access/any/engineering/general,
/turf/open/floor/plating,
/area/station/engineering/main)
"cqB" = (
@@ -29381,7 +33103,7 @@
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible,
/turf/open/floor/engine,
-/area/station/engineering/main)
+/area/station/engineering/supermatter/room)
"cqC" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
@@ -29389,7 +33111,7 @@
/obj/structure/cable,
/obj/machinery/firealarm/directional/east,
/turf/open/floor/engine,
-/area/station/engineering/main)
+/area/station/engineering/supermatter/room)
"cqD" = (
/obj/structure/sign/warning/radiation,
/turf/closed/wall/r_wall,
@@ -29445,6 +33167,9 @@
/area/station/engineering/main)
"cqT" = (
/obj/structure/sign/warning/vacuum/external/directional/east,
+/obj/machinery/atmospherics/components/unary/airlock_pump/unbolt_only{
+ dir = 1
+ },
/turf/open/floor/plating,
/area/station/engineering/main)
"cqU" = (
@@ -29454,9 +33179,13 @@
dir = 1
},
/turf/open/floor/iron/dark,
-/area/station/engineering/main)
+/area/station/engineering/supermatter/room)
"cqY" = (
/obj/effect/spawner/structure/window/reinforced,
+/obj/machinery/door/poddoor/shutters{
+ id = "HFRshutter";
+ name = "Atmospherics HFR Shutters"
+ },
/turf/open/floor/plating,
/area/station/engineering/main)
"cqZ" = (
@@ -29580,20 +33309,20 @@
dir = 8
},
/turf/closed/wall/r_wall,
-/area/station/engineering/main)
+/area/station/engineering/supermatter/room)
"crL" = (
/obj/machinery/atmospherics/components/unary/portables_connector/visible{
dir = 8
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/dark,
-/area/station/engineering/main)
+/area/station/engineering/supermatter/room)
"crM" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible{
dir = 1
},
/turf/open/floor/iron/dark,
-/area/station/engineering/main)
+/area/station/engineering/supermatter/room)
"crP" = (
/turf/closed/wall/mineral/titanium,
/area/space/nearstation)
@@ -29614,7 +33343,7 @@
dir = 8
},
/turf/open/floor/iron/dark,
-/area/station/engineering/main)
+/area/station/engineering/supermatter/room)
"crW" = (
/obj/effect/spawner/random/maintenance,
/obj/structure/closet/secure_closet/personal/cabinet,
@@ -29641,15 +33370,18 @@
/turf/open/floor/plating,
/area/station/engineering/main)
"csd" = (
-/turf/open/floor/iron/dark,
-/area/station/engineering/main)
+/obj/machinery/power/apc/auto_name/directional/west,
+/obj/effect/mapping_helpers/apc/cell_10k,
+/obj/structure/cable,
+/turf/open/floor/plating,
+/area/station/engineering/supermatter/room)
"cse" = (
/obj/machinery/atmospherics/components/unary/thermomachine/freezer{
dir = 8
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/dark,
-/area/station/engineering/main)
+/area/station/engineering/supermatter/room)
"csg" = (
/obj/structure/closet/emcloset,
/obj/machinery/camera/directional/north,
@@ -29667,7 +33399,7 @@
dir = 9
},
/turf/open/floor/iron/dark,
-/area/station/engineering/main)
+/area/station/engineering/supermatter/room)
"csy" = (
/obj/structure/disposalpipe/segment{
dir = 10
@@ -29681,12 +33413,20 @@
/obj/item/seeds/nettle,
/obj/item/seeds/orange,
/obj/item/seeds/potato,
+/obj/item/food/grown/citrus/orange,
/turf/open/floor/iron,
/area/station/service/hydroponics/garden/abandoned)
"csD" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/station/ai_monitored/turret_protected/aisat_interior)
+"csG" = (
+/obj/effect/turf_decal/trimline/blue/filled/line{
+ dir = 6
+ },
+/obj/structure/sign/warning/vacuum/external/directional/east,
+/turf/open/floor/iron,
+/area/station/hallway/secondary/entry)
"csH" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
@@ -29696,7 +33436,7 @@
dir = 8
},
/turf/open/floor/engine,
-/area/station/engineering/main)
+/area/station/engineering/supermatter/room)
"csI" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -29706,7 +33446,7 @@
dir = 8
},
/turf/open/floor/engine,
-/area/station/engineering/main)
+/area/station/engineering/supermatter/room)
"csN" = (
/obj/structure/transit_tube/horizontal,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
@@ -29735,7 +33475,7 @@
dir = 4
},
/turf/open/floor/engine,
-/area/station/engineering/main)
+/area/station/engineering/supermatter/room)
"csR" = (
/obj/effect/turf_decal/stripes/line{
dir = 6
@@ -29744,12 +33484,28 @@
dir = 4
},
/turf/open/floor/engine,
-/area/station/engineering/main)
+/area/station/engineering/supermatter/room)
"csT" = (
/obj/machinery/door/window/brigdoor/left/directional/south{
req_access = list("brig")
},
-/turf/open/floor/iron/dark/side,
+/obj/effect/turf_decal/stripes,
+/obj/effect/turf_decal/stripes/blue/line,
+/obj/effect/turf_decal/trimline/dark_blue/filled/corner,
+/obj/effect/turf_decal/trimline/dark_blue/filled/corner{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/wideplating_new/dark/corner,
+/obj/effect/turf_decal/siding/wideplating_new/dark/corner{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/dark/corner{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/dark/corner,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron/dark/small,
/area/station/security/checkpoint/escape)
"csU" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
@@ -29768,18 +33524,32 @@
/area/station/ai_monitored/turret_protected/aisat_interior)
"csX" = (
/obj/structure/sign/warning/vacuum/external/directional/north,
+/obj/machinery/atmospherics/components/unary/airlock_pump{
+ dir = 4
+ },
/turf/open/floor/plating,
/area/station/ai_monitored/turret_protected/aisat_interior)
+"csZ" = (
+/obj/machinery/door/airlock/maintenance{
+ name = "Quartermaster Office Maintenance"
+ },
+/obj/effect/mapping_helpers/airlock/access/any/supply/qm,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 4
+ },
+/turf/open/floor/plating,
+/area/station/command/heads_quarters/qm)
"cta" = (
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 4;
late = 8
},
+/obj/effect/mapping_helpers/airlock/access/any/command/minisat,
+/obj/effect/mapping_helpers/airlock/access/any/command/ai_upload,
/obj/machinery/door/airlock/external{
name = "MiniSat External Access"
},
-/obj/effect/mapping_helpers/airlock/access/any/command/minisat,
-/obj/effect/mapping_helpers/airlock/access/any/command/ai_upload,
/turf/open/floor/plating/airless,
/area/station/ai_monitored/turret_protected/aisat_interior)
"ctb" = (
@@ -29879,10 +33649,6 @@
/turf/open/floor/iron/dark,
/area/station/ai_monitored/turret_protected/aisat_interior)
"ctA" = (
-/obj/structure/extinguisher_cabinet{
- pixel_x = -5;
- pixel_y = 30
- },
/turf/open/floor/iron/dark,
/area/station/ai_monitored/turret_protected/aisat_interior)
"ctE" = (
@@ -29916,6 +33682,9 @@
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
dir = 8
},
+/obj/effect/turf_decal/trimline/dark/line{
+ dir = 4
+ },
/turf/open/floor/iron/dark,
/area/station/security/brig)
"ctI" = (
@@ -30002,14 +33771,11 @@
/area/station/ai_monitored/turret_protected/aisat_interior)
"ctY" = (
/obj/machinery/light/directional/south,
-/obj/machinery/firealarm/directional/south,
-/obj/effect/turf_decal/tile/yellow,
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
-/turf/open/floor/iron/dark/side{
- dir = 1
+/obj/effect/turf_decal/trimline/yellow/filled/line,
+/obj/effect/turf_decal/trimline/dark_blue/line{
+ alpha = 200
},
+/turf/open/floor/iron/dark,
/area/station/engineering/atmos/hfr_room)
"ctZ" = (
/turf/closed/wall/r_wall,
@@ -30047,6 +33813,9 @@
/area/station/ai_monitored/turret_protected/aisat/service)
"cuh" = (
/obj/structure/chair/sofa/corp/left,
+/obj/effect/turf_decal/siding/wood{
+ dir = 1
+ },
/turf/open/floor/wood,
/area/station/maintenance/aft)
"cui" = (
@@ -30056,6 +33825,15 @@
"cuj" = (
/turf/closed/wall/r_wall,
/area/station/ai_monitored/turret_protected/aisat_interior)
+"cuk" = (
+/obj/effect/turf_decal/trimline/blue/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/blue/mid_joiner{
+ dir = 1
+ },
+/turf/open/floor/iron/corner,
+/area/station/hallway/primary/central)
"cul" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/hatch{
@@ -30077,6 +33855,12 @@
/area/station/ai_monitored/turret_protected/aisat/service)
"cun" = (
/obj/effect/spawner/random/burgerstation/blocking,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 5
+ },
/turf/open/floor/iron/grimy,
/area/station/maintenance/aft)
"cuo" = (
@@ -30091,11 +33875,8 @@
pixel_x = 9;
pixel_y = 2
},
-/obj/structure/extinguisher_cabinet{
- pixel_x = -5;
- pixel_y = 30
- },
/obj/effect/turf_decal/stripes/line,
+/obj/structure/extinguisher_cabinet/directional/north,
/turf/open/floor/plating,
/area/station/ai_monitored/turret_protected/aisat/atmos)
"cuq" = (
@@ -30132,6 +33913,11 @@
},
/turf/open/floor/iron/dark,
/area/station/ai_monitored/turret_protected/aisat_interior)
+"cut" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron,
+/area/station/hallway/secondary/exit)
"cuu" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
@@ -30148,11 +33934,8 @@
pixel_x = -9;
pixel_y = 2
},
-/obj/structure/extinguisher_cabinet{
- pixel_x = 5;
- pixel_y = 30
- },
/obj/effect/turf_decal/stripes/line,
+/obj/structure/extinguisher_cabinet/directional/north,
/turf/open/floor/plating,
/area/station/ai_monitored/turret_protected/aisat/service)
"cuw" = (
@@ -30460,6 +34243,9 @@
/obj/structure/chair/sofa/corp{
dir = 8
},
+/obj/effect/turf_decal/siding/wideplating_new/dark{
+ dir = 4
+ },
/turf/open/floor/wood/parquet,
/area/station/science/breakroom)
"cvj" = (
@@ -30590,6 +34376,12 @@
/obj/structure/reagent_dispensers/fueltank,
/turf/open/floor/plating,
/area/station/ai_monitored/turret_protected/aisat/maint)
+"cvF" = (
+/obj/machinery/atmospherics/components/unary/airlock_pump/unbolt_only{
+ dir = 4
+ },
+/turf/open/floor/plating,
+/area/station/maintenance/port/aft)
"cvG" = (
/obj/machinery/porta_turret/ai{
dir = 4;
@@ -30621,6 +34413,18 @@
/obj/machinery/light/directional/east,
/turf/open/floor/circuit,
/area/station/ai_monitored/turret_protected/aisat/hallway)
+"cvK" = (
+/obj/effect/turf_decal/trimline/blue/filled/corner{
+ alpha = 160;
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/white/corner{
+ dir = 1
+ },
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron/white,
+/area/station/medical/medbay/lobby)
"cvL" = (
/obj/structure/sign/warning/secure_area/directional/east,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -30771,9 +34575,7 @@
/obj/structure/chair/office{
dir = 1
},
-/obj/structure/extinguisher_cabinet{
- pixel_x = 27
- },
+/obj/structure/extinguisher_cabinet/directional/east,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/turret_protected/ai)
"cwq" = (
@@ -30861,21 +34663,10 @@
pixel_x = 5;
pixel_y = -24
},
-/obj/item/food/burger/black{
- name = "silicon burger";
- desc = "Who put this here? Those things don't even eat."
- },
/turf/open/floor/circuit,
/area/station/ai_monitored/turret_protected/ai)
"cwT" = (
-/obj/item/beacon,
-/obj/machinery/camera/directional/north{
- c_tag = "Arrivals Bay 1 South"
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/turf/open/floor/iron,
+/turf/open/floor/tram/tram_platform,
/area/station/hallway/secondary/entry)
"cxc" = (
/obj/structure/chair/plastic{
@@ -30909,20 +34700,21 @@
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 4
},
+/obj/effect/mapping_helpers/airlock/access/any/security/general,
+/obj/effect/landmark/navigate_destination/dockescpod3,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 4
+ },
/obj/machinery/door/airlock/external{
name = "Escape Pod Three"
},
-/obj/effect/mapping_helpers/airlock/access/any/security/general,
-/obj/effect/landmark/navigate_destination/dockescpod3,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer4,
/turf/open/floor/plating,
/area/station/security/office)
"cxJ" = (
-/obj/structure/cable,
/obj/effect/turf_decal/trimline/dark_blue/filled/warning{
dir = 1
},
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/dark,
/area/station/security/processing)
"cxN" = (
@@ -30937,6 +34729,9 @@
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/turf_decal/trimline/dark/line{
+ dir = 8
+ },
/turf/open/floor/iron/dark,
/area/station/security/brig)
"cxW" = (
@@ -30953,38 +34748,45 @@
},
/area/station/hallway/primary/central/fore)
"cxY" = (
-/obj/structure/closet/emcloset,
-/obj/effect/turf_decal/stripes/line{
- dir = 1
+/obj/structure/chair/sofa/bench/right{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/blue/filled/line{
+ dir = 8
},
/turf/open/floor/iron,
/area/station/hallway/secondary/entry)
"cyb" = (
-/obj/structure/closet/emcloset,
-/obj/effect/turf_decal/stripes/line{
- dir = 5
+/obj/effect/turf_decal/siding/wood/corner{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/blue/filled/corner{
+ dir = 1
+ },
+/turf/open/floor/iron/textured_corner{
+ dir = 1
},
-/turf/open/floor/iron,
/area/station/hallway/secondary/entry)
"cyg" = (
+/obj/structure/disposalpipe/segment,
/obj/machinery/door/airlock/command/glass{
name = "EVA Storage"
},
+/obj/machinery/door/firedoor,
/obj/effect/mapping_helpers/airlock/access/any/command/eva,
/obj/effect/landmark/navigate_destination/eva,
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/iron/dark/side{
- dir = 1
- },
+/obj/effect/mapping_helpers/airlock/red_alert_access,
+/turf/open/floor/iron/dark/textured_large,
/area/station/ai_monitored/command/storage/eva)
"cyh" = (
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 4
},
+/obj/effect/mapping_helpers/airlock/access/any/security/general,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/door/airlock/external{
name = "Security Escape Airlock"
},
-/obj/effect/mapping_helpers/airlock/access/any/security/general,
/turf/open/floor/iron,
/area/station/security/checkpoint/escape)
"cyl" = (
@@ -30996,13 +34798,13 @@
/turf/open/space/basic,
/area/space)
"cyp" = (
-/obj/machinery/door/airlock/security/glass{
- name = "Holding Area"
- },
/obj/effect/mapping_helpers/airlock/access/any/security/general,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/iron/dark,
+/obj/machinery/door/airlock/security/glass{
+ name = "Holding Area"
+ },
+/turf/open/floor/iron/dark/smooth_large,
/area/station/security/checkpoint/escape)
"cyr" = (
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
@@ -31011,12 +34813,22 @@
/obj/machinery/door/airlock/external{
name = "Cargo Escape Airlock"
},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer4,
/turf/open/floor/iron,
/area/station/hallway/secondary/exit)
"cyv" = (
/mob/living/basic/bot/vibebot,
/turf/open/floor/plating,
/area/station/ai_monitored/turret_protected/aisat/maint)
+"cyy" = (
+/obj/effect/turf_decal/trimline/brown/filled/line{
+ dir = 9
+ },
+/turf/open/floor/iron,
+/area/station/cargo/office)
"cyz" = (
/obj/effect/turf_decal/siding/wood{
dir = 5
@@ -31032,10 +34844,14 @@
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 8
},
+/obj/effect/mapping_helpers/airlock/access/any/supply/general,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer4,
/obj/machinery/door/airlock/external{
name = "Supply Dock Airlock"
},
-/obj/effect/mapping_helpers/airlock/access/any/supply/general,
/turf/open/floor/plating,
/area/station/cargo/storage)
"cyE" = (
@@ -31049,8 +34865,18 @@
/obj/effect/mapping_helpers/airlock/unres{
dir = 8
},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 6
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer4,
/turf/open/floor/plating,
/area/station/maintenance/port/aft)
+"cyH" = (
+/obj/effect/turf_decal/siding/dark{
+ dir = 5
+ },
+/turf/open/floor/circuit/green/telecomms/mainframe,
+/area/station/tcommsat/server)
"cyK" = (
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 8
@@ -31060,6 +34886,10 @@
},
/obj/effect/mapping_helpers/airlock/access/any/engineering/general,
/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 5
+ },
/turf/open/floor/plating,
/area/station/maintenance/solars/port/aft)
"cyL" = (
@@ -31068,9 +34898,24 @@
},
/obj/item/storage/box/bodybags,
/obj/item/folder/white,
-/obj/machinery/firealarm/directional/west,
-/turf/open/floor/iron/dark,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+ dir = 4
+ },
+/turf/open/floor/iron/dark/smooth_large,
/area/station/medical/morgue)
+"cyP" = (
+/obj/effect/turf_decal/siding/dark{
+ dir = 10
+ },
+/obj/effect/turf_decal/siding/dark/corner{
+ dir = 4
+ },
+/obj/machinery/camera/directional/west{
+ c_tag = "Xenobiology Cell 3-4";
+ network = list("ss13","xeno")
+ },
+/turf/open/floor/engine,
+/area/station/science/xenobiology)
"cyT" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
@@ -31101,11 +34946,10 @@
/turf/open/floor/plating,
/area/station/maintenance/aft)
"czf" = (
-/obj/machinery/camera/directional/north{
- c_tag = "Chapel North"
- },
-/turf/open/floor/iron/dark,
-/area/station/service/chapel)
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/iron,
+/area/station/security/prison)
"czg" = (
/obj/effect/spawner/structure/window/reinforced/shuttle,
/turf/open/floor/plating,
@@ -31119,21 +34963,26 @@
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 8
},
+/obj/effect/mapping_helpers/airlock/access/any/command/minisat,
+/obj/effect/mapping_helpers/airlock/access/any/command/ai_upload,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 9
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer4,
/obj/machinery/door/airlock/external{
name = "MiniSat External Access"
},
-/obj/effect/mapping_helpers/airlock/access/any/command/minisat,
-/obj/effect/mapping_helpers/airlock/access/any/command/ai_upload,
/turf/open/floor/plating/airless,
/area/station/ai_monitored/turret_protected/aisat_interior)
"czn" = (
-/obj/effect/turf_decal/bot,
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/closet/crate,
-/obj/effect/spawner/random/maintenance,
-/obj/item/storage/box/lights/mixed,
-/turf/open/floor/iron,
-/area/station/cargo/warehouse)
+/obj/effect/turf_decal/trimline/blue/filled/warning{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/white/corner{
+ dir = 1
+ },
+/turf/open/floor/iron/small,
+/area/station/hallway/secondary/entry)
"czu" = (
/obj/structure/table,
/obj/machinery/reagentgrinder{
@@ -31158,11 +35007,23 @@
},
/turf/open/floor/iron/dark,
/area/station/security/office)
+"czD" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 4
+ },
+/turf/open/floor/iron/dark/side{
+ dir = 4
+ },
+/area/station/command/bridge)
"czE" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/purple/visible,
/turf/open/floor/engine,
-/area/station/engineering/main)
+/area/station/engineering/supermatter/room)
"czF" = (
/obj/machinery/meter,
/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible{
@@ -31170,7 +35031,7 @@
},
/obj/item/radio/intercom/directional/north,
/turf/open/floor/iron/dark,
-/area/station/engineering/main)
+/area/station/engineering/supermatter/room)
"czK" = (
/turf/closed/wall,
/area/station/commons/vacant_room/office)
@@ -31178,12 +35039,8 @@
/obj/effect/landmark/event_spawn,
/obj/effect/turf_decal/bot,
/obj/structure/closet/crate,
-/obj/effect/spawner/random/maintenance/four,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
- dir = 8
- },
-/obj/structure/cable,
-/turf/open/floor/iron,
+/obj/effect/spawner/random/maintenance/two,
+/turf/open/floor/iron/large,
/area/station/cargo/storage)
"czP" = (
/obj/effect/landmark/event_spawn,
@@ -31223,6 +35080,7 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 4
},
+/obj/structure/cable,
/turf/open/floor/plating,
/area/station/maintenance/starboard/aft)
"czZ" = (
@@ -31242,13 +35100,13 @@
/turf/open/floor/iron/cafeteria,
/area/station/service/kitchen)
"cAl" = (
-/obj/effect/turf_decal/bot_white/right,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
dir = 4
},
/obj/machinery/light/directional/west,
-/turf/open/floor/iron/dark,
+/obj/effect/turf_decal/box/blue,
+/obj/effect/turf_decal/bot_blue,
+/turf/open/floor/iron/dark/textured_large,
/area/station/ai_monitored/command/nuke_storage)
"cAm" = (
/obj/machinery/power/supermatter_crystal/engine,
@@ -31262,14 +35120,14 @@
dir = 10
},
/turf/open/floor/engine,
-/area/station/engineering/main)
+/area/station/engineering/supermatter/room)
"cAp" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/orange/visible{
dir = 4
},
/obj/machinery/meter,
/turf/open/floor/engine,
-/area/station/engineering/main)
+/area/station/engineering/supermatter/room)
"cAq" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
@@ -31279,14 +35137,14 @@
},
/obj/machinery/light/directional/east,
/turf/open/floor/engine,
-/area/station/engineering/main)
+/area/station/engineering/supermatter/room)
"cAr" = (
/obj/machinery/atmospherics/components/binary/pump{
dir = 4;
name = "Gas to Mix"
},
/turf/open/floor/engine,
-/area/station/engineering/main)
+/area/station/engineering/supermatter/room)
"cAs" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -31297,7 +35155,7 @@
},
/obj/machinery/light/directional/west,
/turf/open/floor/engine,
-/area/station/engineering/main)
+/area/station/engineering/supermatter/room)
"cAt" = (
/obj/effect/turf_decal/stripes/line{
dir = 10
@@ -31306,26 +35164,22 @@
dir = 4
},
/turf/open/floor/engine,
-/area/station/engineering/main)
+/area/station/engineering/supermatter/room)
"cAu" = (
/obj/machinery/power/emitter/welded{
dir = 4
},
/obj/structure/cable,
/turf/open/floor/plating,
-/area/station/engineering/main)
+/area/station/engineering/supermatter/room)
"cAy" = (
-/obj/effect/turf_decal/trimline/purple/filled/line{
- dir = 9
- },
-/obj/effect/turf_decal/trimline/yellow/warning{
- dir = 9
- },
-/obj/effect/turf_decal/trimline/brown/warning{
- dir = 9
- },
/obj/machinery/recharge_station,
-/turf/open/floor/iron/dark,
+/obj/effect/turf_decal/trimline/purple/filled/line{
+ alpha = 160;
+ color = "#6a3182";
+ dir = 9
+ },
+/turf/open/floor/iron/dark/small,
/area/station/maintenance/port/aft)
"cAz" = (
/obj/structure/disposalpipe/segment{
@@ -31338,39 +35192,33 @@
/turf/open/floor/iron/dark,
/area/station/service/chapel/office)
"cAA" = (
-/obj/effect/turf_decal/trimline/purple/filled/line{
- dir = 5
- },
-/obj/effect/turf_decal/trimline/yellow/warning{
- dir = 5
- },
-/obj/effect/turf_decal/trimline/brown/warning{
- dir = 5
- },
-/obj/effect/decal/cleanable/dirt,
/obj/machinery/mecha_part_fabricator/maint,
/obj/machinery/light/small/directional/north,
-/turf/open/floor/iron/dark,
+/obj/effect/turf_decal/trimline/purple/filled/line{
+ alpha = 160;
+ color = "#6a3182";
+ dir = 5
+ },
+/turf/open/floor/iron/dark/small,
/area/station/maintenance/port/aft)
"cAB" = (
-/obj/effect/turf_decal/trimline/purple/filled/line{
- dir = 8
- },
-/obj/effect/turf_decal/trimline/yellow/warning{
- dir = 8
- },
-/obj/effect/turf_decal/trimline/brown/warning{
- dir = 8
- },
/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron/dark,
+/obj/effect/turf_decal/trimline/purple/filled/line{
+ alpha = 160;
+ color = "#6a3182";
+ dir = 8
+ },
+/turf/open/floor/iron/dark/small,
/area/station/maintenance/port/aft)
"cAC" = (
-/obj/item/beacon,
+/obj/item/beacon{
+ anchored = 1
+ },
/obj/machinery/igniter{
id = "changelingmoment"
},
-/turf/open/floor/engine,
+/obj/effect/turf_decal/box/white,
+/turf/open/floor/engine/xenobio,
/area/station/science/xenobiology)
"cAD" = (
/obj/machinery/light/small/directional/east,
@@ -31378,26 +35226,22 @@
/area/station/maintenance/aft)
"cAE" = (
/obj/machinery/atmospherics/components/unary/outlet_injector/on,
-/turf/open/floor/engine,
+/turf/open/floor/engine/xenobio,
/area/station/science/xenobiology)
"cAF" = (
/turf/open/floor/plating,
/area/station/maintenance/disposal)
"cAH" = (
-/obj/effect/turf_decal/trimline/purple/filled/line{
- dir = 10
- },
-/obj/effect/turf_decal/trimline/yellow/warning{
- dir = 10
- },
-/obj/effect/turf_decal/trimline/brown/warning{
- dir = 10
- },
/obj/effect/decal/cleanable/dirt,
/obj/structure/table/reinforced,
/obj/machinery/cell_charger,
/obj/item/stock_parts/power_store/cell/high/empty,
-/turf/open/floor/iron/dark,
+/obj/effect/turf_decal/trimline/purple/filled/line{
+ alpha = 160;
+ color = "#6a3182";
+ dir = 10
+ },
+/turf/open/floor/iron/dark/small,
/area/station/maintenance/port/aft)
"cAI" = (
/obj/machinery/conveyor_switch/oneway{
@@ -31408,15 +35252,6 @@
/turf/open/floor/plating,
/area/station/maintenance/disposal)
"cAK" = (
-/obj/effect/turf_decal/trimline/purple/filled/line{
- dir = 6
- },
-/obj/effect/turf_decal/trimline/yellow/warning{
- dir = 6
- },
-/obj/effect/turf_decal/trimline/brown/warning{
- dir = 6
- },
/obj/effect/decal/cleanable/dirt,
/obj/machinery/light/small/directional/south,
/obj/item/storage/medkit/robotic_repair/stocked,
@@ -31429,7 +35264,12 @@
},
/obj/item/stack/cable_coil/five,
/obj/item/circuitboard/machine/cyborgrecharger,
-/turf/open/floor/iron/dark,
+/obj/effect/turf_decal/trimline/purple/filled/line{
+ alpha = 160;
+ color = "#6a3182";
+ dir = 6
+ },
+/turf/open/floor/iron/dark/small,
/area/station/maintenance/port/aft)
"cAL" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -31451,7 +35291,13 @@
dir = 4
},
/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/stripes/white/line{
+ dir = 8;
+ color = "#ae4fd6"
+ },
+/turf/open/floor/iron/white/smooth_edge{
+ dir = 8
+ },
/area/station/science/research)
"cAP" = (
/obj/structure/sign/warning/fire,
@@ -31565,14 +35411,30 @@
/area/station/ai_monitored/turret_protected/ai)
"cBe" = (
/obj/machinery/holopad/secure,
-/obj/machinery/airalarm/directional/south,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/turret_protected/ai)
"cBg" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/effect/landmark/event_spawn,
-/turf/open/floor/plating,
-/area/station/service/hydroponics)
+/obj/effect/turf_decal/trimline/dark/filled/mid_joiner{
+ dir = 8;
+ alpha = 160
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 8
+ },
+/obj/structure/cable,
+/obj/effect/turf_decal/trimline/dark/filled/warning{
+ alpha = 160;
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/purple/warning{
+ alpha = 200;
+ dir = 8;
+ color = "#a56dc2"
+ },
+/turf/open/floor/iron/white/smooth_edge{
+ dir = 8
+ },
+/area/station/science/xenobiology)
"cBh" = (
/obj/effect/landmark/event_spawn,
/obj/effect/turf_decal/tile/blue{
@@ -31581,11 +35443,14 @@
/obj/effect/turf_decal/tile/blue{
dir = 8
},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/cable,
/turf/open/floor/iron/cafeteria,
-/area/station/commons/locker)
+/area/station/commons/dorms/laundry)
"cBj" = (
-/obj/structure/table,
-/obj/effect/landmark/event_spawn,
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 9
@@ -31593,8 +35458,10 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 5
},
+/obj/structure/table,
+/obj/effect/landmark/event_spawn,
/obj/effect/spawner/random/aimodule/harmless,
-/turf/open/floor/iron/dark,
+/turf/open/floor/iron/dark/textured_large,
/area/station/ai_monitored/turret_protected/ai_upload)
"cBl" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
@@ -31607,12 +35474,18 @@
/area/station/hallway/secondary/exit)
"cBm" = (
/obj/effect/landmark/event_spawn,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/blue/line,
+/obj/effect/turf_decal/trimline/blue/mid_joiner,
+/turf/open/floor/iron/edge,
/area/station/hallway/primary/starboard)
"cBo" = (
-/obj/effect/landmark/event_spawn,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/wood,
+/obj/effect/landmark/event_spawn,
+/obj/effect/turf_decal/siding/dark/corner,
+/obj/effect/turf_decal/siding/dark{
+ dir = 9
+ },
+/turf/open/floor/wood/tile,
/area/station/command/heads_quarters/captain)
"cBq" = (
/obj/effect/landmark/event_spawn,
@@ -31624,13 +35497,13 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 4
},
-/turf/open/floor/iron,
+/turf/open/floor/iron/large,
/area/station/cargo/office)
"cBr" = (
+/obj/effect/landmark/start/hangover,
/obj/effect/landmark/event_spawn,
/obj/effect/turf_decal/bot,
-/obj/effect/landmark/start/hangover,
-/turf/open/floor/iron,
+/turf/open/floor/iron/large,
/area/station/hallway/primary/central)
"cBw" = (
/obj/effect/decal/cleanable/dirt,
@@ -31648,6 +35521,12 @@
/area/station/science/research)
"cBB" = (
/obj/effect/landmark/event_spawn,
+/obj/effect/turf_decal/trimline/brown/filled/line{
+ dir = 5
+ },
+/obj/effect/turf_decal/trimline/dark/line{
+ dir = 5
+ },
/turf/open/floor/iron,
/area/station/cargo/miningdock)
"cBC" = (
@@ -31675,10 +35554,10 @@
/turf/open/floor/iron,
/area/station/engineering/atmos)
"cBH" = (
-/obj/effect/landmark/event_spawn,
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/landmark/event_spawn,
/turf/open/floor/iron,
/area/station/hallway/primary/aft)
"cBJ" = (
@@ -31686,18 +35565,21 @@
arc_shielded = 1
},
/obj/structure/cable,
-/obj/effect/turf_decal/tile/yellow/anticorner/contrasted{
- dir = 4
+/obj/effect/turf_decal/trimline/yellow/filled/line{
+ dir = 5;
+ alpha = 120
},
/turf/open/floor/iron/dark,
/area/station/engineering/atmos/hfr_room)
"cBK" = (
/obj/effect/landmark/event_spawn,
/obj/item/radio/intercom/directional/south,
+/obj/effect/turf_decal/trimline/yellow/filled/shrink_ccw,
/turf/open/floor/iron,
/area/station/tcommsat/computer)
"cBL" = (
/obj/effect/landmark/event_spawn,
+/obj/effect/landmark/generic_maintenance_landmark,
/turf/open/floor/plating,
/area/station/maintenance/starboard/aft)
"cBN" = (
@@ -31705,7 +35587,6 @@
dir = 4
},
/obj/effect/landmark/event_spawn,
-/obj/structure/cable,
/turf/open/floor/plating,
/area/station/maintenance/starboard/aft)
"cBO" = (
@@ -31718,7 +35599,7 @@
},
/obj/structure/cable,
/turf/open/floor/engine,
-/area/station/engineering/main)
+/area/station/engineering/supermatter/room)
"cBS" = (
/obj/effect/landmark/event_spawn,
/obj/structure/cable,
@@ -31729,15 +35610,24 @@
/turf/open/floor/iron/dark,
/area/station/ai_monitored/turret_protected/aisat/hallway)
"cBT" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/light/small/directional/east,
-/turf/open/floor/plating,
-/area/station/maintenance/starboard/aft)
+/obj/structure/window/reinforced/spawner/directional/north,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 5
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer4,
+/obj/effect/turf_decal/trimline/yellow/filled/warning{
+ dir = 8
+ },
+/turf/open/floor/iron/smooth_edge,
+/area/station/hallway/secondary/entry)
"cBU" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/closet/emcloset,
+/obj/structure/disposalpipe/segment,
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer5,
/turf/open/floor/plating,
-/area/station/maintenance/starboard/aft)
+/area/station/maintenance/port)
"cBZ" = (
/obj/structure/table/wood,
/obj/item/clothing/under/misc/burial,
@@ -31746,6 +35636,10 @@
/obj/item/clothing/under/misc/burial,
/obj/item/clothing/under/misc/burial,
/obj/item/clothing/under/misc/burial,
+/obj/item/toy/figure/chaplain{
+ pixel_y = 3;
+ pixel_x = 5
+ },
/turf/open/floor/iron/grimy,
/area/station/service/chapel/office)
"cCb" = (
@@ -31773,6 +35667,24 @@
/obj/structure/closet/crate/coffin/blackcoffin,
/turf/open/floor/iron/smooth_large,
/area/station/service/chapel/office)
+"cCg" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/general/hidden,
+/obj/effect/turf_decal/trimline/dark/filled/warning{
+ alpha = 160;
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/purple/warning{
+ alpha = 200;
+ dir = 8;
+ color = "#a56dc2"
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 8
+ },
+/turf/open/floor/iron/white/smooth_edge{
+ dir = 8
+ },
+/area/station/science/xenobiology)
"cCh" = (
/obj/item/bedsheet/red,
/mob/living/simple_animal/bot/secbot/beepsky/officer,
@@ -31782,15 +35694,16 @@
"cCi" = (
/obj/structure/cable,
/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer5,
/turf/open/floor/iron/smooth_large,
/area/station/engineering/main)
"cCk" = (
/obj/structure/disposalpipe/sorting/mail/flip{
dir = 8
},
-/obj/effect/mapping_helpers/mail_sorting/service/janitor_closet,
/obj/structure/cable,
-/turf/open/floor/iron,
+/obj/effect/mapping_helpers/mail_sorting/service/janitor_closet,
+/turf/open/floor/iron/edge,
/area/station/hallway/primary/central)
"cCm" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -31800,15 +35713,20 @@
/turf/open/floor/plating,
/area/station/maintenance/port)
"cCo" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/turf_decal/trimline/brown/filled/corner{
+ dir = 8
+ },
/turf/open/floor/iron,
/area/station/cargo/storage)
"cCp" = (
-/obj/effect/turf_decal/tile/yellow{
- dir = 8
+/obj/effect/turf_decal/trimline/yellow/filled/line{
+ dir = 2;
+ alpha = 120
},
-/obj/effect/turf_decal/tile/yellow,
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/trimline/blue/line{
+ alpha = 200
+ },
+/turf/open/floor/iron/white/smooth_edge,
/area/station/medical/chemistry)
"cCq" = (
/obj/machinery/deepfryer,
@@ -31818,6 +35736,12 @@
/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance,
/obj/machinery/door/airlock/maintenance,
/obj/effect/mapping_helpers/airlock/abandoned,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 5
+ },
/turf/open/floor/plating,
/area/station/maintenance/aft)
"cCE" = (
@@ -31875,7 +35799,7 @@
dir = 4
},
/turf/open/floor/engine,
-/area/station/engineering/main)
+/area/station/engineering/supermatter/room)
"cDh" = (
/obj/structure/table/reinforced,
/obj/item/storage/toolbox/mechanical,
@@ -31886,7 +35810,7 @@
/obj/item/pipe_dispenser,
/obj/machinery/incident_display/delam/directional/north,
/turf/open/floor/engine,
-/area/station/engineering/main)
+/area/station/engineering/supermatter/room)
"cDi" = (
/obj/structure/table/reinforced,
/obj/item/clothing/suit/utility/radiation,
@@ -31897,7 +35821,7 @@
dir = 1
},
/turf/open/floor/engine,
-/area/station/engineering/main)
+/area/station/engineering/supermatter/room)
"cDm" = (
/obj/machinery/vending/engivend,
/turf/open/floor/iron/smooth_large,
@@ -31905,35 +35829,35 @@
"cDp" = (
/obj/structure/cable,
/turf/open/floor/engine,
-/area/station/engineering/main)
+/area/station/engineering/supermatter/room)
"cDt" = (
/obj/effect/turf_decal/stripes/line{
dir = 5
},
/obj/structure/cable,
/turf/open/floor/engine,
-/area/station/engineering/main)
+/area/station/engineering/supermatter/room)
"cDv" = (
/obj/effect/turf_decal/stripes/line,
/obj/machinery/atmospherics/components/trinary/filter/flipped/critical{
dir = 4
},
/turf/open/floor/engine,
-/area/station/engineering/main)
+/area/station/engineering/supermatter/room)
"cDw" = (
/obj/effect/turf_decal/stripes/line,
/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible{
dir = 1
},
/turf/open/floor/engine,
-/area/station/engineering/main)
+/area/station/engineering/supermatter/room)
"cDx" = (
/obj/machinery/atmospherics/components/binary/pump{
dir = 8;
name = "Atmos to Loop"
},
/turf/open/floor/engine,
-/area/station/engineering/main)
+/area/station/engineering/supermatter/room)
"cDy" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
@@ -31943,7 +35867,7 @@
dir = 4
},
/turf/open/floor/engine,
-/area/station/engineering/main)
+/area/station/engineering/supermatter/room)
"cDz" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/orange/visible{
dir = 4
@@ -31964,7 +35888,7 @@
dir = 6
},
/turf/open/floor/iron/dark,
-/area/station/engineering/main)
+/area/station/engineering/supermatter/room)
"cDD" = (
/obj/machinery/meter,
/obj/effect/turf_decal/delivery,
@@ -31972,7 +35896,7 @@
dir = 4
},
/turf/open/floor/iron/dark,
-/area/station/engineering/main)
+/area/station/engineering/supermatter/room)
"cDE" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/delivery,
@@ -31981,7 +35905,7 @@
name = "External Gas to Loop"
},
/turf/open/floor/iron/dark,
-/area/station/engineering/main)
+/area/station/engineering/supermatter/room)
"cDF" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
@@ -31991,7 +35915,7 @@
name = "External Gas to Loop"
},
/turf/open/floor/iron/dark,
-/area/station/engineering/main)
+/area/station/engineering/supermatter/room)
"cDG" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -31999,7 +35923,7 @@
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible,
/turf/open/floor/engine,
-/area/station/engineering/main)
+/area/station/engineering/supermatter/room)
"cDH" = (
/obj/structure/rack,
/obj/item/clothing/mask/gas{
@@ -32026,6 +35950,10 @@
"cDN" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible/layer2,
/obj/effect/spawner/structure/window/reinforced,
+/obj/machinery/door/poddoor/shutters{
+ id = "HFRshutter";
+ name = "Atmospherics HFR Shutters"
+ },
/turf/open/floor/plating,
/area/station/engineering/main)
"cDZ" = (
@@ -32045,7 +35973,7 @@
dir = 1
},
/turf/open/floor/iron/dark,
-/area/station/engineering/main)
+/area/station/engineering/supermatter/room)
"cEb" = (
/obj/structure/table/wood,
/obj/item/flashlight/lantern,
@@ -32067,7 +35995,7 @@
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/engine,
-/area/station/engineering/main)
+/area/station/engineering/supermatter/room)
"cEe" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
@@ -32076,7 +36004,7 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible,
/obj/machinery/light/directional/east,
/turf/open/floor/engine,
-/area/station/engineering/main)
+/area/station/engineering/supermatter/room)
"cEf" = (
/obj/machinery/status_display/ai,
/turf/closed/wall/r_wall,
@@ -32093,7 +36021,7 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible,
/obj/machinery/light/directional/west,
/turf/open/floor/engine,
-/area/station/engineering/main)
+/area/station/engineering/supermatter/room)
"cEi" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
@@ -32104,11 +36032,11 @@
},
/obj/structure/cable,
/turf/open/floor/engine,
-/area/station/engineering/main)
+/area/station/engineering/supermatter/room)
"cEk" = (
/obj/machinery/firealarm/directional/east,
/turf/open/floor/iron/dark,
-/area/station/engineering/main)
+/area/station/engineering/supermatter/room)
"cEr" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -32119,13 +36047,13 @@
name = "Gas to Cooling Loop"
},
/turf/open/floor/engine,
-/area/station/engineering/main)
+/area/station/engineering/supermatter/room)
"cEs" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible{
dir = 4
},
/turf/open/floor/engine,
-/area/station/engineering/main)
+/area/station/engineering/supermatter/room)
"cEt" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/stripes/line{
@@ -32182,14 +36110,14 @@
dir = 8
},
/turf/open/floor/engine,
-/area/station/engineering/main)
+/area/station/engineering/supermatter/room)
"cEC" = (
/obj/machinery/atmospherics/components/binary/pump{
dir = 8;
name = "Mix to Gas"
},
/turf/open/floor/engine,
-/area/station/engineering/main)
+/area/station/engineering/supermatter/room)
"cEL" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -32197,7 +36125,7 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/airalarm/directional/west,
/turf/open/floor/engine,
-/area/station/engineering/main)
+/area/station/engineering/supermatter/room)
"cEM" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/stripes/line{
@@ -32211,16 +36139,16 @@
/turf/open/floor/plating,
/area/station/engineering/supermatter)
"cEO" = (
-/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
-/obj/effect/turf_decal/tile/blue,
/obj/structure/table/glass,
-/obj/machinery/vending/wallmed{
- pixel_x = 32
- },
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
/obj/effect/spawner/surgery_tray/full,
+/obj/effect/turf_decal/siding{
+ dir = 5
+ },
+/obj/effect/turf_decal/trimline/blue/filled/line{
+ dir = 5
+ },
+/obj/machinery/vending/wallmed/directional/east,
/turf/open/floor/iron/white,
/area/station/medical/surgery/fore)
"cET" = (
@@ -32243,13 +36171,16 @@
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/dark,
-/area/station/engineering/main)
+/area/station/engineering/supermatter/room)
"cFb" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 8
},
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
/turf/open/floor/engine,
-/area/station/engineering/main)
+/area/station/engineering/supermatter/room)
"cFc" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
@@ -32258,20 +36189,54 @@
name = "Cooling Loop Bypass"
},
/turf/open/floor/engine,
-/area/station/engineering/main)
+/area/station/engineering/supermatter/room)
"cFf" = (
/obj/machinery/power/apc/auto_name/directional/east,
/obj/structure/cable,
-/turf/open/floor/iron/white/side{
- dir = 9
+/obj/effect/turf_decal/trimline/dark/filled/line{
+ alpha = 160;
+ dir = 6
+ },
+/obj/effect/turf_decal/trimline/dark/filled/mid_joiner{
+ dir = 4;
+ alpha = 160
+ },
+/obj/effect/turf_decal/trimline/dark/filled/mid_joiner{
+ dir = 2;
+ alpha = 160
+ },
+/obj/effect/turf_decal/trimline/purple/line{
+ alpha = 200;
+ dir = 6
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 6
+ },
+/turf/open/floor/iron/white/smooth_corner{
+ dir = 1
},
/area/station/science/research)
"cFi" = (
/obj/machinery/camera/directional/east{
c_tag = "Research Division South"
},
-/turf/open/floor/iron/white/side{
- dir = 9
+/obj/effect/turf_decal/trimline/dark/filled/line{
+ alpha = 160;
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/dark/filled/mid_joiner{
+ dir = 4;
+ alpha = 160
+ },
+/obj/effect/turf_decal/trimline/purple/line{
+ alpha = 200;
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 4
+ },
+/turf/open/floor/iron/white/smooth_edge{
+ dir = 4
},
/area/station/science/research)
"cFj" = (
@@ -32293,16 +36258,15 @@
name = "Mix Bypass"
},
/turf/open/floor/engine,
-/area/station/engineering/main)
+/area/station/engineering/supermatter/room)
"cFl" = (
-/obj/machinery/camera/directional/west{
- c_tag = "Cargo - Bitrunning Den";
- network = list("ss13","cargo")
- },
/obj/structure/table,
/obj/item/modular_computer/laptop/preset/civilian,
/obj/item/clothing/suit/costume/wellworn_shirt/messy/graphic/gamer,
-/obj/effect/decal/cleanable/cobweb,
+/obj/machinery/camera/directional/west{
+ c_tag = "Bitrunning Den";
+ network = list("ss13","cargo")
+ },
/turf/open/floor/iron/dark/small,
/area/station/cargo/bitrunning/den)
"cFu" = (
@@ -32315,7 +36279,7 @@
name = "Cooling Loop to Gas"
},
/turf/open/floor/engine,
-/area/station/engineering/main)
+/area/station/engineering/supermatter/room)
"cFw" = (
/obj/structure/sign/warning/electric_shock,
/turf/closed/wall/r_wall,
@@ -32339,43 +36303,54 @@
dir = 4
},
/turf/open/floor/engine,
-/area/station/engineering/main)
+/area/station/engineering/supermatter/room)
"cFz" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible{
dir = 4
},
/turf/open/floor/iron/dark,
-/area/station/engineering/main)
+/area/station/engineering/supermatter/room)
"cFA" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible,
/turf/open/floor/iron/dark,
-/area/station/engineering/main)
+/area/station/engineering/supermatter/room)
"cFF" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 4
},
-/turf/open/floor/mineral/titanium/blue,
+/obj/effect/turf_decal/siding/white{
+ dir = 8
+ },
+/turf/open/floor/iron/white/small,
/area/station/commons/toilet)
+"cFG" = (
+/obj/effect/mapping_helpers/airlock/access/any/medical/maintenance,
+/obj/machinery/door/airlock/atmos{
+ name = "Atmospherics Maintenance"
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer5,
+/turf/open/floor/plating,
+/area/station/maintenance/aft)
"cFI" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/engine,
-/area/station/engineering/main)
+/area/station/engineering/supermatter/room)
"cFJ" = (
/obj/effect/turf_decal/stripes/corner{
dir = 4
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/orange/visible,
/turf/open/floor/engine,
-/area/station/engineering/main)
+/area/station/engineering/supermatter/room)
"cFK" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
},
/turf/open/floor/engine,
-/area/station/engineering/main)
+/area/station/engineering/supermatter/room)
"cFL" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -32384,7 +36359,7 @@
dir = 6
},
/turf/open/floor/engine,
-/area/station/engineering/main)
+/area/station/engineering/supermatter/room)
"cFM" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -32394,7 +36369,7 @@
},
/obj/machinery/light/directional/north,
/turf/open/floor/engine,
-/area/station/engineering/main)
+/area/station/engineering/supermatter/room)
"cFN" = (
/obj/effect/turf_decal/stripes/line{
dir = 5
@@ -32403,7 +36378,7 @@
dir = 1
},
/turf/open/floor/engine,
-/area/station/engineering/main)
+/area/station/engineering/supermatter/room)
"cFO" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -32418,7 +36393,7 @@
dir = 4
},
/turf/open/floor/iron/dark,
-/area/station/engineering/main)
+/area/station/engineering/supermatter/room)
"cFP" = (
/obj/effect/turf_decal/stripes/line{
dir = 9
@@ -32427,7 +36402,7 @@
dir = 1
},
/turf/open/floor/engine,
-/area/station/engineering/main)
+/area/station/engineering/supermatter/room)
"cFR" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -32436,7 +36411,7 @@
dir = 1
},
/turf/open/floor/engine,
-/area/station/engineering/main)
+/area/station/engineering/supermatter/room)
"cFS" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -32445,7 +36420,7 @@
dir = 4
},
/turf/open/floor/engine,
-/area/station/engineering/main)
+/area/station/engineering/supermatter/room)
"cFT" = (
/obj/effect/turf_decal/stripes/corner{
dir = 1
@@ -32454,13 +36429,13 @@
dir = 9
},
/turf/open/floor/engine,
-/area/station/engineering/main)
+/area/station/engineering/supermatter/room)
"cFU" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 4
},
/turf/open/floor/iron/dark,
-/area/station/engineering/main)
+/area/station/engineering/supermatter/room)
"cGd" = (
/obj/structure/closet/crate/bin,
/obj/effect/turf_decal/stripes/line{
@@ -32470,14 +36445,14 @@
dir = 5
},
/turf/open/floor/engine,
-/area/station/engineering/main)
+/area/station/engineering/supermatter/room)
"cGe" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/orange/visible{
dir = 4
},
/turf/open/floor/engine,
-/area/station/engineering/main)
+/area/station/engineering/supermatter/room)
"cGf" = (
/obj/structure/cable,
/obj/machinery/atmospherics/components/trinary/filter/flipped/critical{
@@ -32485,7 +36460,7 @@
filter_type = list(/datum/gas/nitrogen)
},
/turf/open/floor/engine,
-/area/station/engineering/main)
+/area/station/engineering/supermatter/room)
"cGh" = (
/obj/effect/turf_decal/stripes/corner,
/obj/structure/cable,
@@ -32493,7 +36468,7 @@
dir = 6
},
/turf/open/floor/engine,
-/area/station/engineering/main)
+/area/station/engineering/supermatter/room)
"cGi" = (
/obj/effect/turf_decal/stripes/line{
dir = 6
@@ -32503,7 +36478,7 @@
dir = 4
},
/turf/open/floor/engine,
-/area/station/engineering/main)
+/area/station/engineering/supermatter/room)
"cGj" = (
/obj/structure/table,
/obj/item/pipe_dispenser,
@@ -32511,18 +36486,18 @@
dir = 4
},
/turf/open/floor/iron/dark,
-/area/station/engineering/main)
+/area/station/engineering/supermatter/room)
"cGk" = (
/obj/machinery/light/directional/south,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 9
},
/turf/open/floor/iron/dark,
-/area/station/engineering/main)
+/area/station/engineering/supermatter/room)
"cGl" = (
/obj/structure/closet/secure_closet/engineering_personal,
/turf/open/floor/iron/dark,
-/area/station/engineering/main)
+/area/station/engineering/supermatter/room)
"cGm" = (
/obj/machinery/camera/directional/west{
c_tag = "Cytology Lab"
@@ -32538,14 +36513,14 @@
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/engine,
-/area/station/engineering/main)
+/area/station/engineering/supermatter/room)
"cGu" = (
/obj/effect/turf_decal/stripes/line,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible{
dir = 6
},
/turf/open/floor/engine,
-/area/station/engineering/main)
+/area/station/engineering/supermatter/room)
"cGv" = (
/obj/effect/turf_decal/stripes/line,
/obj/structure/cable,
@@ -32553,7 +36528,7 @@
dir = 4
},
/turf/open/floor/engine,
-/area/station/engineering/main)
+/area/station/engineering/supermatter/room)
"cGx" = (
/obj/effect/turf_decal/stripes/line,
/obj/machinery/meter,
@@ -32562,7 +36537,13 @@
dir = 6
},
/turf/open/floor/engine,
-/area/station/engineering/main)
+/area/station/engineering/supermatter/room)
+"cGB" = (
+/obj/effect/turf_decal/trimline/brown/corner{
+ dir = 4
+ },
+/turf/open/floor/iron/textured_corner,
+/area/station/hallway/primary/starboard)
"cGC" = (
/obj/effect/turf_decal/stripes/line{
dir = 6
@@ -32575,25 +36556,25 @@
dir = 9
},
/turf/open/floor/engine,
-/area/station/engineering/main)
+/area/station/engineering/supermatter/room)
"cGD" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible{
dir = 4
},
/turf/closed/wall/r_wall,
-/area/station/engineering/main)
+/area/station/engineering/supermatter/room)
"cGE" = (
/obj/effect/spawner/structure/window/reinforced/plasma,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible{
dir = 10
},
/turf/open/floor/plating,
-/area/station/engineering/main)
+/area/station/engineering/supermatter/room)
"cGH" = (
/obj/machinery/atmospherics/pipe/layer_manifold/scrubbers/hidden,
/obj/effect/spawner/structure/window/reinforced/plasma,
/turf/open/floor/plating,
-/area/station/engineering/main)
+/area/station/engineering/supermatter/room)
"cGI" = (
/obj/machinery/door/firedoor,
/obj/structure/cable,
@@ -32602,7 +36583,7 @@
},
/obj/effect/mapping_helpers/airlock/access/any/engineering/general,
/turf/open/floor/plating,
-/area/station/engineering/main)
+/area/station/engineering/supermatter/room)
"cGJ" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/disposalpipe/segment,
@@ -32616,58 +36597,64 @@
/obj/effect/spawner/structure/window/reinforced/plasma,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/plating,
-/area/station/engineering/main)
+/area/station/engineering/supermatter/room)
"cGL" = (
/obj/structure/railing,
-/turf/open/floor/iron/dark/textured,
+/obj/effect/turf_decal/siding/wideplating_new/dark/end{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/iron/textured_large,
/area/station/command/gateway)
"cGR" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
dir = 1
},
/turf/open/floor/iron/dark,
-/area/station/engineering/main)
+/area/station/engineering/supermatter/room)
"cGS" = (
/obj/structure/cable,
/turf/open/floor/plating,
-/area/station/engineering/main)
+/area/station/engineering/supermatter/room)
"cGT" = (
/obj/machinery/light/directional/north,
/turf/open/floor/iron/dark,
-/area/station/engineering/main)
+/area/station/engineering/supermatter/room)
"cGU" = (
/obj/structure/reflector/double/anchored{
dir = 6
},
/turf/open/floor/iron/dark,
-/area/station/engineering/main)
+/area/station/engineering/supermatter/room)
"cGV" = (
/obj/structure/reflector/box/anchored{
dir = 1
},
/turf/open/floor/iron/dark,
-/area/station/engineering/main)
+/area/station/engineering/supermatter/room)
"cGY" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 1
},
/turf/open/floor/iron/dark,
-/area/station/engineering/main)
+/area/station/engineering/supermatter/room)
"cHa" = (
/obj/machinery/airalarm/directional/west,
/turf/open/floor/iron/dark,
-/area/station/engineering/main)
+/area/station/engineering/supermatter/room)
"cHj" = (
/obj/machinery/power/emitter/welded{
dir = 8
},
/obj/structure/cable,
/turf/open/floor/plating,
-/area/station/engineering/main)
+/area/station/engineering/supermatter/room)
"cHn" = (
/obj/structure/table/wood,
/obj/item/paper_bin/carbon,
/obj/item/pen,
+/obj/machinery/firealarm/directional/west,
/turf/open/floor/carpet/blue,
/area/station/medical/psychology)
"cHo" = (
@@ -32675,13 +36662,13 @@
dir = 9
},
/turf/open/floor/iron/dark,
-/area/station/engineering/main)
+/area/station/engineering/supermatter/room)
"cHp" = (
/obj/structure/reflector/single/anchored{
dir = 5
},
/turf/open/floor/iron/dark,
-/area/station/engineering/main)
+/area/station/engineering/supermatter/room)
"cHC" = (
/turf/open/floor/iron,
/area/station/maintenance/starboard)
@@ -32695,54 +36682,51 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 6
},
-/obj/effect/mapping_helpers/mail_sorting/science/robotics,
/obj/structure/cable,
+/obj/effect/mapping_helpers/mail_sorting/science/robotics,
/turf/open/floor/plating,
/area/station/maintenance/department/medical/morgue)
"cHE" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/obj/machinery/door/airlock/maintenance{
name = "Mech Bay Maintenance"
},
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
- dir = 4
- },
/obj/effect/mapping_helpers/airlock/access/any/science/robotics,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/turf/open/floor/plating,
/area/station/science/robotics/mechbay)
"cHF" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
/obj/machinery/button/door{
id = "Skynet_launch";
name = "Mech Bay Door Control";
- pixel_x = 6;
- pixel_y = 24;
+ pixel_x = 7;
+ pixel_y = 29;
req_access = list("robotics")
},
-/obj/effect/turf_decal/stripes/corner{
- dir = 4
+/obj/machinery/firealarm/directional/north{
+ pixel_x = -6
},
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
- dir = 4
- },
-/turf/open/floor/iron,
+/turf/open/floor/iron/dark/textured_large,
/area/station/science/robotics/mechbay)
"cHG" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
/obj/structure/disposalpipe/segment{
dir = 4
},
@@ -32753,12 +36737,28 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 4
},
-/turf/open/floor/iron,
-/area/station/science/robotics/mechbay)
-"cHH" = (
+/obj/effect/turf_decal/trimline/purple/filled/line{
+ alpha = 160;
+ color = "#6a3182";
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 8
+ },
/obj/effect/turf_decal/stripes/line{
dir = 1
},
+/obj/effect/turf_decal/siding/dark/corner,
+/obj/effect/turf_decal/stripes/white/line{
+ dir = 1;
+ color = "#ae4fd6"
+ },
+/obj/effect/turf_decal/siding/wideplating_new/dark/corner{
+ dir = 1
+ },
+/turf/open/floor/iron/dark/small,
+/area/station/science/robotics/mechbay)
+"cHH" = (
/obj/structure/disposalpipe/segment{
dir = 4
},
@@ -32766,170 +36766,239 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 4
},
-/turf/open/floor/iron,
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/dark,
+/obj/effect/turf_decal/stripes/white/line{
+ dir = 1;
+ color = "#ae4fd6"
+ },
+/turf/open/floor/iron/dark/small,
/area/station/science/robotics/mechbay)
"cHJ" = (
-/obj/effect/turf_decal/stripes/corner{
- dir = 1
- },
/obj/structure/disposalpipe/segment{
dir = 4
},
/obj/structure/cable,
-/turf/open/floor/iron,
+/turf/open/floor/iron/dark/textured_large,
/area/station/science/robotics/mechbay)
"cHK" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/research/glass{
- name = "Robotics Lab"
- },
/obj/structure/cable,
-/obj/effect/mapping_helpers/airlock/access/any/science/robotics,
/obj/structure/disposalpipe/segment{
dir = 4
},
-/turf/open/floor/iron/white,
+/obj/machinery/door/firedoor,
+/obj/effect/mapping_helpers/airlock/access/any/science/robotics,
+/obj/machinery/door/airlock/research{
+ name = "Mech Bay"
+ },
+/turf/open/floor/iron/dark/textured_large,
/area/station/science/robotics/lab)
"cHM" = (
-/obj/structure/chair/office/light{
- dir = 1
- },
-/turf/open/floor/iron/white,
+/obj/structure/closet/crate/mod,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/science/robotics/lab)
"cHN" = (
/obj/structure/cable,
-/turf/open/floor/circuit,
+/obj/machinery/light/floor,
+/obj/effect/turf_decal/trimline/dark,
+/turf/open/floor/iron/dark/textured_large,
/area/station/science/robotics/mechbay)
"cHO" = (
-/obj/machinery/conveyor_switch/oneway{
- id = "robo1"
+/obj/effect/turf_decal/siding/thinplating_new/dark{
+ dir = 8
},
-/turf/open/floor/iron/white,
+/turf/open/floor/iron/dark,
/area/station/science/robotics/lab)
"cHP" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
/obj/structure/table,
-/obj/item/storage/belt/utility,
-/obj/item/stack/sheet/iron/fifty,
-/obj/item/stack/sheet/iron/fifty,
-/obj/item/stack/sheet/iron/fifty,
-/obj/item/stack/sheet/glass/fifty,
-/turf/open/floor/iron,
-/area/station/science/robotics/lab)
-"cHR" = (
-/obj/machinery/conveyor{
- dir = 4;
- id = "robo1"
+/obj/item/stock_parts/power_store/cell/high{
+ pixel_x = 7;
+ pixel_y = -5
},
-/turf/open/floor/iron,
-/area/station/science/robotics/lab)
-"cHS" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 8
+/obj/structure/marker_beacon/purple{
+ pixel_x = 0;
+ pixel_y = 7
},
-/turf/open/floor/iron,
-/area/station/science/robotics/lab)
-"cHT" = (
-/obj/machinery/holopad,
-/turf/open/floor/iron,
-/area/station/science/robotics/lab)
-"cHU" = (
-/obj/machinery/disposal/bin,
-/obj/structure/disposalpipe/trunk{
- dir = 4
+/obj/item/stack/sheet/glass/fifty{
+ pixel_x = -5;
+ pixel_y = 8
},
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
-/turf/open/floor/iron/white,
-/area/station/science/robotics/lab)
-"cHV" = (
-/obj/machinery/conveyor_switch/oneway{
- id = "robo2"
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron/white,
-/area/station/science/robotics/lab)
-"cHW" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/obj/machinery/mecha_part_fabricator,
-/turf/open/floor/iron,
-/area/station/science/robotics/lab)
-"cHX" = (
-/obj/structure/table,
-/obj/item/storage/toolbox/mechanical{
- pixel_x = -2;
- pixel_y = -1
+/obj/item/stack/sheet/glass/fifty{
+ pixel_x = -5;
+ pixel_y = 8
},
/obj/item/clothing/head/utility/welding{
+ pixel_x = -5;
+ pixel_y = 0
+ },
+/obj/item/clothing/glasses/welding{
pixel_x = -3;
- pixel_y = 5
+ pixel_y = 3
},
-/obj/item/clothing/glasses/welding,
-/obj/item/multitool{
- pixel_x = 3
- },
-/turf/open/floor/iron,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/science/robotics/lab)
-"cHZ" = (
-/obj/effect/turf_decal/tile/blue{
- dir = 1
+"cHR" = (
+/obj/item/storage/belt/utility{
+ pixel_x = -4;
+ pixel_y = 8
},
-/obj/effect/turf_decal/tile/blue{
+/obj/item/storage/belt/utility{
+ pixel_x = -4;
+ pixel_y = 14
+ },
+/obj/item/storage/toolbox/electrical{
+ pixel_x = 1;
+ pixel_y = 1
+ },
+/obj/item/multitool{
+ pixel_x = 5;
+ pixel_y = 10
+ },
+/obj/structure/table,
+/obj/structure/marker_beacon/purple{
+ pixel_x = 0;
+ pixel_y = -10
+ },
+/turf/open/floor/iron/dark/smooth_large,
+/area/station/science/robotics/lab)
+"cHS" = (
+/obj/effect/turf_decal/loading_area/white{
+ dir = 1;
+ color = "#ae4fd6"
+ },
+/obj/effect/turf_decal/siding/dark{
dir = 8
},
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/siding/dark/corner{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/dark/corner,
+/obj/effect/turf_decal/trimline/purple/filled/line{
+ alpha = 160;
+ color = "#6a3182";
+ dir = 8
+ },
+/obj/item/robot_suit,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 5
+ },
+/turf/open/floor/iron/dark/small,
/area/station/science/robotics/lab)
-"cIa" = (
+"cHT" = (
+/obj/effect/turf_decal/siding/dark{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/dark,
+/turf/open/floor/engine,
+/area/station/science/xenobiology)
+"cHU" = (
+/obj/structure/reagent_dispensers/fueltank,
+/turf/open/floor/iron/dark/smooth_large,
+/area/station/science/robotics/lab)
+"cHW" = (
+/obj/machinery/mecha_part_fabricator{
+ drop_direction = 1
+ },
+/obj/effect/turf_decal/delivery/white{
+ color = "#ae4fd6"
+ },
+/obj/effect/turf_decal/siding/dark/end,
+/obj/structure/marker_beacon/indigo,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 5
+ },
+/obj/item/storage/box/stickers/googly{
+ pixel_x = 2;
+ pixel_y = 6
+ },
+/turf/open/floor/iron/dark/smooth_large,
+/area/station/science/robotics/lab)
+"cHX" = (
+/obj/machinery/mecha_part_fabricator{
+ drop_direction = 1
+ },
+/obj/effect/turf_decal/delivery/white{
+ color = "#ae4fd6"
+ },
+/obj/effect/turf_decal/siding/dark/end,
+/obj/structure/marker_beacon/indigo,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
-/turf/open/floor/iron/white,
-/area/station/science/robotics/lab)
-"cIb" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 10
- },
-/obj/machinery/conveyor{
- dir = 4;
- id = "robo2"
- },
-/turf/open/floor/iron,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/science/robotics/lab)
"cIc" = (
-/obj/effect/turf_decal/stripes/line,
-/obj/effect/turf_decal/bot,
-/obj/effect/landmark/start/roboticist,
-/turf/open/floor/iron,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/holopad,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/science/robotics/lab)
"cId" = (
-/obj/effect/turf_decal/stripes/line,
-/turf/open/floor/iron,
+/turf/open/floor/iron/dark,
/area/station/science/robotics/lab)
"cIe" = (
/obj/structure/window/reinforced/spawner/directional/east,
-/obj/structure/table,
-/obj/item/paper_bin{
- pixel_x = -3;
- pixel_y = 7
+/obj/machinery/computer/operating{
+ dir = 1;
+ name = "Robotics Operating Computer"
},
-/obj/item/pen,
-/turf/open/floor/iron/dark,
-/area/station/science/robotics/lab)
-"cIf" = (
-/obj/structure/reagent_dispensers/fueltank,
-/obj/effect/turf_decal/tile/blue{
+/obj/effect/turf_decal/siding/dark/corner{
dir = 1
},
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/siding/dark{
+ dir = 6
+ },
+/obj/effect/turf_decal/trimline/purple/filled/line{
+ alpha = 160;
+ color = "#6a3182";
+ dir = 6
+ },
+/turf/open/floor/iron/dark/small,
+/area/station/science/robotics/lab)
+"cIf" = (
+/obj/structure/fireaxecabinet/mechremoval/directional/south,
+/obj/structure/table/reinforced/rglass,
+/obj/structure/bedsheetbin/empty{
+ pixel_x = -4;
+ pixel_y = 5;
+ name = "plastic bin"
+ },
+/obj/item/toy/toy_dagger{
+ desc = "A skeletal limb wrapped in pseudomuscles, with a low-conductivity case. Display only.";
+ icon = 'modular_skyrat/master_files/icons/mob/augmentation/mcgipc.dmi';
+ icon_state = "robotic_l_leg";
+ name = "salvaged prosthesis";
+ pixel_x = -10;
+ pixel_y = 18;
+ lefthand_file = 'icons/mob/inhands/items_lefthand.dmi';
+ righthand_file = 'icons/mob/inhands/items_righthand.dmi';
+ inhand_icon_state = "buildpipe"
+ },
+/obj/item/toy/toy_dagger{
+ desc = "A skeletal limb wrapped in pseudomuscles, with a low-conductivity case. Display only.";
+ icon = 'modular_skyrat/master_files/icons/mob/augmentation/mcgipc.dmi';
+ icon_state = "robotic_l_arm";
+ name = "salvaged prosthesis";
+ pixel_x = -6;
+ pixel_y = 5;
+ lefthand_file = 'icons/mob/inhands/items_lefthand.dmi';
+ righthand_file = 'icons/mob/inhands/items_righthand.dmi';
+ inhand_icon_state = "buildpipe"
+ },
+/obj/item/toy/toy_dagger{
+ desc = "A skeletal limb wrapped in pseudomuscles, with a low-conductivity case. Display only.";
+ icon = 'modular_skyrat/master_files/icons/mob/augmentation/mcgipc.dmi';
+ icon_state = "robotic_chest";
+ name = "salvaged prosthesis";
+ pixel_x = 11;
+ pixel_y = 3;
+ lefthand_file = 'icons/mob/inhands/items_lefthand.dmi';
+ righthand_file = 'icons/mob/inhands/items_righthand.dmi';
+ inhand_icon_state = "buildpipe"
+ },
+/turf/open/floor/iron/dark/smooth_large,
/area/station/science/robotics/lab)
"cIh" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
- dir = 4
- },
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
/turf/open/floor/iron,
/area/station/construction/mining/aux_base)
"cIL" = (
@@ -32939,12 +37008,25 @@
pixel_y = 26;
req_access = list("eva")
},
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/blue/corner{
+ dir = 4
+ },
+/turf/open/floor/iron/edge{
+ dir = 1
+ },
/area/station/hallway/primary/central)
"cIP" = (
/obj/machinery/power/smes,
/turf/open/floor/plating,
/area/station/maintenance/department/electrical)
+"cIQ" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 6
+ },
+/obj/machinery/duct,
+/obj/effect/mapping_helpers/broken_floor,
+/turf/open/floor/iron,
+/area/station/maintenance/port/aft)
"cJk" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/window/reinforced/spawner/directional/north,
@@ -32957,6 +37039,14 @@
},
/turf/open/floor/wood,
/area/station/maintenance/port/fore)
+"cJt" = (
+/obj/effect/turf_decal/trimline/green/warning{
+ dir = 1
+ },
+/turf/open/floor/iron/edge{
+ dir = 1
+ },
+/area/station/hallway/primary/starboard)
"cJu" = (
/obj/structure/disposalpipe/segment{
dir = 9
@@ -32968,6 +37058,7 @@
dir = 4
},
/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer5,
/turf/open/floor/plating,
/area/station/maintenance/department/security)
"cJQ" = (
@@ -32994,16 +37085,6 @@
dir = 4
},
/area/station/hallway/primary/fore)
-"cKC" = (
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/cable,
-/turf/open/floor/iron/white,
-/area/station/medical/medbay/lobby)
"cKG" = (
/obj/effect/turf_decal/tile/green,
/obj/effect/turf_decal/tile/green{
@@ -33019,6 +37100,9 @@
/obj/effect/turf_decal/trimline/dark_blue/filled/line{
dir = 10
},
+/obj/effect/turf_decal/trimline/dark/line{
+ dir = 10
+ },
/turf/open/floor/iron/dark,
/area/station/security/execution/transfer)
"cKR" = (
@@ -33043,6 +37127,7 @@
"cLl" = (
/obj/structure/chair/sofa/corp/left,
/obj/machinery/newscaster/directional/north,
+/obj/effect/landmark/start/hangover,
/turf/open/floor/iron/grimy,
/area/station/security/detectives_office)
"cLx" = (
@@ -33058,10 +37143,43 @@
/obj/structure/closet/firecloset/full,
/turf/open/floor/plating,
/area/station/maintenance/starboard/fore)
+"cLT" = (
+/obj/effect/turf_decal/trimline/blue/arrow_cw{
+ dir = 1;
+ alpha = 200
+ },
+/obj/effect/turf_decal/trimline/blue/mid_joiner{
+ alpha = 200;
+ dir = 1
+ },
+/turf/open/floor/iron/edge{
+ dir = 1
+ },
+/area/station/hallway/primary/central)
+"cMe" = (
+/obj/structure/window/reinforced/spawner/directional/south,
+/obj/structure/fluff/metalpole/anchor{
+ dir = 1;
+ pixel_y = -39
+ },
+/turf/open/floor/iron/smooth,
+/area/station/hallway/secondary/entry)
"cMm" = (
/obj/effect/spawner/structure/window/reinforced/plasma,
/turf/open/floor/plating,
-/area/station/engineering/main)
+/area/station/engineering/supermatter/room)
+"cMv" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 8
+ },
+/turf/open/floor/iron/textured_large,
+/area/station/ai_monitored/command/storage/eva)
"cMC" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 4
@@ -33082,6 +37200,10 @@
/obj/effect/turf_decal/trimline/dark_blue/filled/corner{
dir = 1
},
+/obj/effect/turf_decal/trimline/dark_blue/corner{
+ dir = 1;
+ alpha = 200
+ },
/turf/open/floor/iron/dark,
/area/station/security/office)
"cNr" = (
@@ -33090,7 +37212,15 @@
/turf/open/floor/wood,
/area/station/commons/vacant_room/office)
"cNG" = (
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/brown/filled/corner{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/dark/corner{
+ dir = 4
+ },
+/turf/open/floor/iron/textured_corner{
+ dir = 4
+ },
/area/station/cargo/sorting)
"cNI" = (
/obj/effect/spawner/structure/window/reinforced,
@@ -33098,7 +37228,7 @@
/area/station/cargo/sorting)
"cNJ" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/iron,
+/turf/open/floor/iron/large,
/area/station/cargo/sorting)
"cNM" = (
/obj/structure/cable,
@@ -33108,6 +37238,12 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 4
},
+/obj/effect/turf_decal/trimline/brown/filled/end{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/dark/end{
+ dir = 8
+ },
/obj/machinery/computer/security/telescreen/disposals/directional/north,
/turf/open/floor/iron,
/area/station/cargo/sorting)
@@ -33119,13 +37255,20 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 4
},
+/obj/effect/turf_decal/trimline/brown/filled/line,
+/obj/effect/turf_decal/trimline/brown/filled/corner{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/dark/corner{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/dark/line,
/turf/open/floor/iron,
/area/station/cargo/sorting)
"cNO" = (
/obj/machinery/camera/directional/north{
c_tag = "Science Break Room West"
},
-/obj/structure/sign/calendar/directional/north,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 10
},
@@ -33133,10 +37276,19 @@
/obj/effect/turf_decal/siding/purple{
dir = 9
},
+/obj/structure/noticeboard/rd{
+ pixel_y = 36
+ },
/turf/open/floor/iron/cafeteria,
/area/station/command/heads_quarters/rd)
"cNR" = (
/obj/structure/cable,
+/obj/machinery/atmospherics/components/binary/pump/on/layer4{
+ dir = 4;
+ name = "Airlock Pump";
+ target_pressure = 300;
+ hide = 1
+ },
/turf/open/floor/plating,
/area/station/maintenance/starboard)
"cNT" = (
@@ -33151,14 +37303,25 @@
/turf/closed/wall,
/area/station/maintenance/starboard/aft)
"cOb" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
- dir = 9
+/obj/structure/disposalpipe/segment,
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/fake_stairs/directional/north{
+ icon_state = "stairs-old";
+ icon = 'modular_skyrat/modules/aesthetics/floors/icons/floors.dmi';
+ color = "#555555";
+ dir = 2;
+ pixel_y = 1
},
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
- dir = 9
+/obj/structure/railing/corner{
+ dir = 1
+ },
+/obj/structure/railing/corner{
+ dir = 4
},
/turf/open/floor/plating,
-/area/station/maintenance/starboard/aft)
+/area/station/maintenance/aft)
"cOe" = (
/turf/open/floor/plating,
/area/station/maintenance/starboard/aft)
@@ -33180,9 +37343,6 @@
/turf/open/floor/engine,
/area/station/science/auxlab/firing_range)
"cOF" = (
-/obj/machinery/door/airlock/public/glass{
- name = "Art Storage"
- },
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 1
@@ -33190,6 +37350,9 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 9
},
+/obj/machinery/door/airlock/public/glass{
+ name = "Art Storage"
+ },
/turf/open/floor/iron,
/area/station/commons/storage/art)
"cOG" = (
@@ -33198,6 +37361,26 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/security/prison/safe)
+"cOJ" = (
+/obj/effect/turf_decal/trimline/blue/line{
+ alpha = 200;
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/blue/mid_joiner{
+ alpha = 200;
+ dir = 4
+ },
+/turf/open/floor/iron/edge{
+ dir = 4
+ },
+/area/station/hallway/primary/central)
+"cOM" = (
+/obj/structure/fluff/metalpole/anchor{
+ dir = 1
+ },
+/obj/machinery/firealarm/directional/south,
+/turf/open/floor/plating,
+/area/station/hallway/secondary/entry)
"cOT" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
@@ -33206,7 +37389,6 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/effect/landmark/event_spawn,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 4
},
@@ -33214,8 +37396,22 @@
dir = 4
},
/obj/structure/cable,
+/obj/effect/landmark/event_spawn,
/turf/open/floor/iron,
/area/station/hallway/primary/starboard)
+"cPl" = (
+/obj/effect/turf_decal/trimline/yellow/corner{
+ dir = 8
+ },
+/turf/open/floor/iron/edge,
+/area/station/hallway/primary/port)
+"cPp" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/dark,
+/turf/open/floor/plating,
+/area/station/maintenance/aft)
"cPA" = (
/obj/machinery/atmospherics/components/binary/pump{
dir = 8
@@ -33230,6 +37426,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 8
},
+/obj/structure/closet/bombcloset,
/turf/open/floor/iron/dark,
/area/station/science/explab)
"cPH" = (
@@ -33241,6 +37438,8 @@
/obj/effect/mapping_helpers/airlock/unres{
dir = 4
},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/plating/airless,
/area/station/maintenance/starboard/aft)
"cPI" = (
@@ -33256,8 +37455,23 @@
/area/station/maintenance/starboard/aft)
"cPX" = (
/obj/structure/cable,
-/turf/open/floor/iron/white/side{
- dir = 9
+/obj/effect/turf_decal/trimline/dark/filled/mid_joiner{
+ dir = 4;
+ alpha = 160
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/dark/filled/warning{
+ alpha = 160;
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/purple/warning{
+ alpha = 200;
+ dir = 4
+ },
+/turf/open/floor/iron/white/smooth_edge{
+ dir = 4
},
/area/station/science/research)
"cQe" = (
@@ -33267,6 +37481,14 @@
},
/turf/open/floor/wood/tile,
/area/station/service/lawoffice)
+"cQg" = (
+/obj/structure/disposalpipe/segment,
+/obj/structure/cable,
+/obj/effect/turf_decal/bot_white{
+ color = "#D381C9"
+ },
+/turf/open/floor/iron/dark,
+/area/station/science/robotics/lab)
"cQl" = (
/obj/effect/turf_decal/trimline/dark_blue/filled/line{
dir = 4
@@ -33276,26 +37498,30 @@
},
/obj/machinery/light/directional/east,
/obj/item/radio/intercom/directional/east,
+/obj/effect/turf_decal/trimline/dark/line{
+ dir = 4
+ },
/turf/open/floor/iron/dark,
/area/station/security/execution/transfer)
"cQo" = (
/obj/machinery/computer/prisoner/management,
-/obj/effect/turf_decal/tile/red{
+/obj/machinery/incident_display/disease/directional/north,
+/obj/effect/turf_decal/tile/dark_red/half{
dir = 1
},
-/obj/effect/turf_decal/tile/red{
- dir = 8
- },
-/obj/effect/turf_decal/tile/red{
- dir = 4
- },
-/obj/machinery/incident_display/disease/directional/north,
-/turf/open/floor/iron,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/command/bridge)
"cQt" = (
/obj/machinery/light/floor,
/turf/open/floor/iron/dark,
/area/station/security/brig)
+"cQy" = (
+/obj/structure/disposalpipe/segment,
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/decal/cleanable/greenglow/filled,
+/turf/open/floor/iron/white,
+/area/station/science/xenobiology)
"cQL" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/spawner/random/burgerstation/table,
@@ -33303,10 +37529,6 @@
/turf/open/floor/plating,
/area/station/maintenance/fore)
"cRi" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/public/glass{
- name = "Central Access"
- },
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 4
},
@@ -33314,7 +37536,11 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 6
},
-/turf/open/floor/iron,
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/public/glass{
+ name = "Central Access"
+ },
+/turf/open/floor/iron/large,
/area/station/hallway/primary/starboard)
"cRr" = (
/obj/effect/turf_decal/siding/brown/corner{
@@ -33326,9 +37552,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 4
},
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
- dir = 4
- },
/obj/structure/cable,
/obj/structure/disposalpipe/segment{
dir = 4
@@ -33339,11 +37562,16 @@
/obj/machinery/airalarm/directional/south,
/turf/open/floor/iron/dark,
/area/station/hallway/secondary/exit)
+"cRB" = (
+/obj/effect/spawner/random/structure/crate_abandoned,
+/turf/open/floor/iron/dark/smooth_large,
+/area/station/maintenance/starboard/aft)
"cSk" = (
/turf/open/floor/catwalk_floor,
/area/station/hallway/secondary/service)
"cSo" = (
/obj/effect/spawner/random/burgerstation/atmos,
+/obj/effect/turf_decal/bot,
/turf/open/floor/iron,
/area/station/engineering/atmos/hfr_room)
"cSz" = (
@@ -33351,6 +37579,18 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 6
},
+/obj/effect/turf_decal/siding/wideplating_new/dark{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/wideplating_new/dark{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 8
+ },
/turf/open/floor/circuit,
/area/station/ai_monitored/command/nuke_storage)
"cSE" = (
@@ -33367,28 +37607,28 @@
dir = 5
},
/turf/open/floor/engine,
-/area/station/engineering/main)
+/area/station/engineering/supermatter/room)
"cSI" = (
/obj/effect/turf_decal/delivery,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible{
dir = 4
},
/turf/open/floor/iron/dark,
-/area/station/engineering/main)
+/area/station/engineering/supermatter/room)
"cSJ" = (
/obj/structure/cable,
/obj/machinery/atmospherics/components/trinary/filter/flipped/critical{
dir = 8
},
/turf/open/floor/engine,
-/area/station/engineering/main)
+/area/station/engineering/supermatter/room)
"cSK" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible{
dir = 1
},
/turf/open/floor/engine,
-/area/station/engineering/main)
+/area/station/engineering/supermatter/room)
"cSL" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 4
@@ -33510,18 +37750,12 @@
/obj/machinery/computer/shuttle/mining{
dir = 4
},
-/obj/effect/turf_decal/tile/brown{
- dir = 8
- },
/obj/effect/turf_decal/bot,
-/obj/effect/turf_decal/tile/yellow{
- dir = 1
- },
/obj/machinery/requests_console{
department = "Mining";
pixel_x = -30
},
-/turf/open/floor/iron,
+/turf/open/floor/iron/dark/textured_large,
/area/station/cargo/miningdock)
"cTE" = (
/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/air_input{
@@ -33536,14 +37770,20 @@
/obj/machinery/door/airlock/maintenance,
/obj/effect/mapping_helpers/airlock/access/any/science/maintenance,
/obj/effect/mapping_helpers/airlock/unres,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
/turf/open/floor/plating,
/area/station/maintenance/starboard/aft)
"cTJ" = (
-/obj/machinery/door/airlock/maintenance,
/obj/structure/cable,
+/obj/structure/disposalpipe/segment,
+/obj/machinery/door/airlock/maintenance,
/obj/effect/mapping_helpers/airlock/access/any/science/maintenance,
/obj/effect/mapping_helpers/airlock/unres,
-/obj/structure/disposalpipe/segment,
/turf/open/floor/plating,
/area/station/maintenance/department/medical/morgue)
"cTK" = (
@@ -33553,6 +37793,13 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/plating,
/area/station/maintenance/department/medical/morgue)
+"cTL" = (
+/obj/effect/turf_decal/trimline/blue/corner{
+ dir = 4;
+ alpha = 200
+ },
+/turf/open/floor/iron,
+/area/station/hallway/primary/central)
"cTP" = (
/obj/effect/landmark/start/hangover,
/obj/structure/table/wood/poker,
@@ -33567,7 +37814,7 @@
},
/obj/structure/cable,
/obj/effect/landmark/start/hangover,
-/turf/open/floor/iron,
+/turf/open/floor/iron/edge,
/area/station/hallway/primary/starboard)
"cTS" = (
/obj/structure/disposalpipe/sorting/mail,
@@ -33602,7 +37849,24 @@
},
/obj/machinery/light/small/directional/west,
/turf/open/floor/plating,
-/area/station/science/ordnance/bomb)
+/area/station/science/ordnance/testlab)
+"cUL" = (
+/obj/effect/turf_decal/trimline/brown/filled/line,
+/obj/effect/turf_decal/trimline/dark/line,
+/obj/item/paper/fluff/junkmail_generic,
+/obj/structure/fluff/paper/corner{
+ dir = 8
+ },
+/obj/structure/fluff/paper/corner,
+/obj/effect/mapping_helpers/broken_floor,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 6
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/turf/open/floor/iron,
+/area/station/maintenance/port/aft)
"cUN" = (
/obj/structure/falsewall,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -33612,13 +37876,6 @@
"cVb" = (
/turf/closed/wall,
/area/station/hallway/secondary/service)
-"cVc" = (
-/obj/effect/turf_decal/trimline/blue/filled/line,
-/obj/effect/turf_decal/trimline/blue/filled/warning{
- dir = 8
- },
-/turf/open/floor/iron/white,
-/area/station/medical/medbay/aft)
"cVG" = (
/obj/effect/turf_decal/trimline/dark_blue/filled/line{
dir = 10
@@ -33627,10 +37884,15 @@
dir = 8
},
/obj/structure/cable,
+/obj/effect/turf_decal/trimline/white/line{
+ dir = 10
+ },
/turf/open/floor/iron/dark,
/area/station/security/execution/education)
"cVH" = (
-/obj/machinery/door/airlock/public/glass,
+/obj/machinery/door/airlock/public/glass{
+ name = "Prison Showers"
+ },
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
@@ -33648,9 +37910,10 @@
/area/station/command/heads_quarters/hos)
"cVV" = (
/obj/structure/chair/stool/bar/directional/north,
-/turf/open/floor/iron/white/corner{
+/obj/effect/turf_decal/siding/wood{
dir = 1
},
+/turf/open/floor/wood,
/area/station/hallway/primary/starboard)
"cWi" = (
/obj/machinery/suit_storage_unit/ce,
@@ -33706,6 +37969,7 @@
},
/obj/effect/turf_decal/tile/neutral/fourcorners,
/obj/machinery/light/small/directional/north,
+/obj/structure/extinguisher_cabinet/directional/east,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/turret_protected/aisat_interior)
"cYZ" = (
@@ -33744,8 +38008,21 @@
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer5,
/turf/open/floor/plating,
/area/station/maintenance/starboard)
+"cZM" = (
+/obj/effect/mapping_helpers/broken_floor,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 4
+ },
+/turf/open/floor/plating,
+/area/station/maintenance/aft)
+"cZU" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/iron,
+/area/station/construction/mining/aux_base)
"cZZ" = (
/obj/structure/closet/secure_closet/security/sec,
/obj/effect/turf_decal/bot_blue,
@@ -33758,6 +38035,20 @@
},
/turf/open/floor/iron/dark/telecomms,
/area/station/science/server)
+"daL" = (
+/obj/effect/turf_decal/trimline/yellow/arrow_ccw{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/yellow/mid_joiner{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 8
+ },
+/turf/open/floor/iron/edge{
+ dir = 8
+ },
+/area/station/hallway/primary/aft)
"daR" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -33773,12 +38064,27 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/white,
/area/station/security/prison)
+"dbD" = (
+/obj/effect/turf_decal/trimline/yellow/filled/corner{
+ dir = 4;
+ alpha = 120
+ },
+/obj/effect/turf_decal/trimline/dark_blue/corner{
+ alpha = 200;
+ dir = 4
+ },
+/turf/open/floor/iron/dark,
+/area/station/engineering/atmos/hfr_room)
"dbE" = (
-/obj/structure/chair{
+/obj/effect/turf_decal/trimline/brown/filled/line{
+ dir = 4
+ },
+/obj/structure/chair/sofa/bench/tram/right{
+ dir = 8
+ },
+/turf/open/floor/iron/textured_edge{
dir = 8
},
-/obj/effect/landmark/start/assistant,
-/turf/open/floor/iron,
/area/station/cargo/office)
"dbK" = (
/turf/open/floor/iron,
@@ -33810,17 +38116,20 @@
/turf/open/floor/iron,
/area/station/security/prison/safe)
"ddn" = (
-/obj/effect/turf_decal/tile/yellow,
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
-/turf/open/floor/iron/dark/side{
- dir = 1
+/obj/effect/turf_decal/trimline/yellow/filled/line,
+/obj/effect/turf_decal/trimline/dark_blue/line{
+ alpha = 200
},
+/obj/machinery/firealarm/directional/south,
+/turf/open/floor/iron/dark,
/area/station/engineering/atmos/hfr_room)
"ddy" = (
/obj/structure/cable,
-/turf/open/floor/iron/dark/textured,
+/obj/effect/turf_decal/siding/wideplating_new/dark/end{
+ dir = 1
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/iron/textured_large,
/area/station/command/gateway)
"ddz" = (
/obj/machinery/camera/directional/east{
@@ -33829,19 +38138,37 @@
},
/turf/open/floor/iron,
/area/station/security/prison/safe)
+"ddA" = (
+/obj/structure/disposalpipe/segment,
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/fake_stairs/directional/south{
+ icon_state = "stairs-old";
+ icon = 'modular_skyrat/modules/aesthetics/floors/icons/floors.dmi';
+ color = "#555555";
+ dir = 1;
+ pixel_y = 1
+ },
+/obj/structure/railing/corner{
+ dir = 8
+ },
+/obj/structure/railing/corner,
+/turf/open/floor/plating,
+/area/station/maintenance/aft)
"ddF" = (
/obj/structure/sign/delam_procedure,
/turf/closed/wall/r_wall,
-/area/station/engineering/main)
+/area/station/engineering/supermatter/room)
"dee" = (
/obj/machinery/door/airlock/external{
name = "External Access"
},
-/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{
- cycle_id = "lower-airlock-bend"
- },
/obj/effect/mapping_helpers/airlock/unres,
/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance,
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+ dir = 1
+ },
/turf/open/floor/plating/airless,
/area/station/maintenance/starboard/aft)
"deg" = (
@@ -33853,6 +38180,11 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/security/prison/visit)
+"dek" = (
+/turf/open/floor/iron/edge{
+ dir = 4
+ },
+/area/station/hallway/primary/starboard)
"deo" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 4
@@ -33892,12 +38224,20 @@
/turf/open/floor/wood/parquet,
/area/station/service/bar)
"dfw" = (
-/obj/machinery/light_switch{
- pixel_y = 28
- },
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 10
},
+/obj/machinery/light_switch{
+ pixel_y = 28
+ },
+/obj/effect/turf_decal/siding/wideplating_new/dark{
+ dir = 9
+ },
+/obj/effect/turf_decal/siding/wideplating_new/dark/corner,
+/obj/effect/turf_decal/siding/dark{
+ dir = 9
+ },
+/obj/effect/turf_decal/siding/dark/corner,
/turf/open/floor/circuit,
/area/station/ai_monitored/command/nuke_storage)
"dfx" = (
@@ -33908,17 +38248,30 @@
/turf/open/floor/plating,
/area/station/maintenance/port)
"dfC" = (
-/obj/machinery/suit_storage_unit/standard_unit,
-/obj/effect/turf_decal/stripes/line{
- dir = 8
+/obj/structure/railing{
+ dir = 1
},
-/turf/open/floor/iron,
-/area/station/ai_monitored/command/storage/eva)
+/obj/structure/table{
+ color = "#999999"
+ },
+/obj/effect/spawner/random/entertainment/cigarette_pack,
+/obj/effect/spawner/random/entertainment/lighter{
+ pixel_x = 4;
+ pixel_y = 0
+ },
+/turf/open/floor/plating,
+/area/station/maintenance/starboard/aft)
+"dfH" = (
+/turf/closed/wall,
+/area/station/engineering/supermatter/room)
"dfN" = (
/obj/effect/decal/cleanable/dirt,
-/obj/machinery/holopad,
+/obj/machinery/holopad{
+ pixel_x = 1
+ },
/obj/effect/spawner/random/engineering/tracking_beacon,
-/turf/open/floor/iron/dark/textured,
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/command/gateway)
"dgj" = (
/obj/structure/chair/plastic{
@@ -33939,15 +38292,29 @@
/obj/effect/turf_decal/trimline/dark_blue/filled/line{
dir = 4
},
+/obj/effect/turf_decal/trimline/dark/line{
+ dir = 4
+ },
/turf/open/floor/iron/dark,
/area/station/security/brig)
"dgP" = (
+/obj/structure/disposalpipe/segment,
/obj/structure/cable,
-/obj/structure/disposalpipe/segment{
- dir = 5
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/fake_stairs/directional/south{
+ icon_state = "flattexture";
+ icon = 'modular_skyrat/modules/advanced_shuttles/icons/exploration_floor.dmi';
+ pixel_y = 1
+ },
+/obj/structure/railing{
+ dir = 4
+ },
+/obj/structure/railing{
+ dir = 8
},
/turf/open/floor/plating,
-/area/station/maintenance/starboard/aft)
+/area/station/maintenance/aft)
"dhE" = (
/obj/structure/disposalpipe/segment{
dir = 10
@@ -33955,6 +38322,7 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer5,
/turf/open/floor/iron/dark,
/area/station/security/mechbay)
"dhG" = (
@@ -33983,17 +38351,12 @@
/turf/open/floor/wood,
/area/station/maintenance/abandon_cafeteria)
"diG" = (
-/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
/obj/structure/table/optable,
/obj/structure/cable,
/obj/machinery/light/directional/north,
/obj/machinery/defibrillator_mount/directional/north,
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/tile/blue/full,
+/turf/open/floor/iron/large,
/area/station/medical/surgery/fore)
"diU" = (
/obj/effect/decal/cleanable/dirt,
@@ -34029,6 +38392,12 @@
/obj/structure/reagent_dispensers/wall/peppertank/directional/south,
/turf/open/floor/iron/dark,
/area/station/security/checkpoint/science)
+"djJ" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 6
+ },
+/turf/open/floor/plating,
+/area/station/maintenance/port/aft)
"djW" = (
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 4
@@ -34050,15 +38419,20 @@
pixel_x = 10
},
/obj/machinery/light/directional/west,
-/obj/machinery/firealarm/directional/south,
/turf/open/floor/wood/parquet,
/area/station/command/heads_quarters/cmo)
"dkC" = (
-/obj/effect/turf_decal/stripes/corner,
/obj/machinery/light/directional/east,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron/dark,
+/obj/effect/turf_decal/trimline/dark_blue/filled/line{
+ dir = 5
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 5
+ },
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+ dir = 8
+ },
+/turf/open/floor/iron/dark/small,
/area/station/security/checkpoint/escape)
"dkL" = (
/obj/structure/railing{
@@ -34077,8 +38451,8 @@
/area/station/science/ordnance)
"dld" = (
/obj/structure/disposalpipe/segment,
-/obj/structure/cable,
/obj/structure/sign/departments/chemistry/alt/directional/east,
+/obj/machinery/plumbing/output,
/turf/open/floor/plating,
/area/station/maintenance/aft)
"dlg" = (
@@ -34123,6 +38497,10 @@
/obj/item/wrench{
pixel_x = -4
},
+/obj/machinery/camera/autoname/directional/east{
+ c_tag = "Drone Bay";
+ network = list("ss13","cargo")
+ },
/turf/open/floor/iron/dark/textured_large,
/area/station/cargo/drone_bay)
"dlH" = (
@@ -34141,13 +38519,19 @@
/area/station/security/office)
"dlW" = (
/obj/machinery/door/firedoor,
-/turf/open/floor/iron,
+/turf/open/floor/iron/large,
/area/station/service/bar)
"dlY" = (
/obj/structure/sink/directional/south,
/obj/structure/mirror/directional/north,
/obj/machinery/light/directional/east,
-/turf/open/floor/mineral/titanium/blue,
+/obj/effect/turf_decal/siding/white/end{
+ dir = 4
+ },
+/obj/structure/closet/emcloset/wall{
+ pixel_x = 32
+ },
+/turf/open/floor/iron/white/small,
/area/station/commons/toilet)
"dmq" = (
/obj/machinery/computer/records/security{
@@ -34169,7 +38553,6 @@
/obj/structure/disposalpipe/segment{
dir = 9
},
-/obj/structure/cable,
/obj/structure/chair{
dir = 1
},
@@ -34177,10 +38560,10 @@
/area/station/maintenance/starboard/aft)
"dnK" = (
/obj/machinery/hydroponics/constructable,
-/obj/machinery/door/window/left/directional/south,
/obj/effect/turf_decal/siding/thinplating/dark{
dir = 4
},
+/obj/machinery/door/window/left/directional/south,
/turf/open/floor/iron/smooth_large,
/area/station/service/hydroponics)
"dnO" = (
@@ -34190,8 +38573,24 @@
/area/station/maintenance/port/fore)
"dnV" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
-/turf/open/floor/iron/white/side{
- dir = 9
+/obj/effect/turf_decal/trimline/dark/filled/line{
+ alpha = 160;
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/dark/filled/mid_joiner{
+ dir = 4;
+ alpha = 160
+ },
+/obj/effect/turf_decal/trimline/purple/line{
+ alpha = 200;
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 4
+ },
+/obj/machinery/vending/wallmed/directional/east,
+/turf/open/floor/iron/white/smooth_edge{
+ dir = 4
},
/area/station/science/research)
"dod" = (
@@ -34204,12 +38603,75 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/plating,
/area/station/security/execution/transfer)
+"dot" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/blue/filled/line{
+ dir = 4
+ },
+/obj/structure/extinguisher_cabinet/directional/east,
+/obj/machinery/light/directional/south{
+ dir = 4
+ },
+/turf/open/floor/iron,
+/area/station/hallway/secondary/entry)
+"dou" = (
+/obj/machinery/atmospherics/components/unary/airlock_pump/unbolt_only{
+ dir = 1
+ },
+/turf/open/floor/plating,
+/area/station/engineering/main)
"doz" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron/white/side{
- dir = 9
+/obj/effect/turf_decal/trimline/dark/filled/line{
+ alpha = 160;
+ dir = 5
+ },
+/obj/effect/turf_decal/trimline/dark/filled/mid_joiner{
+ dir = 1;
+ alpha = 160
+ },
+/obj/effect/turf_decal/trimline/dark/filled/mid_joiner{
+ dir = 4;
+ alpha = 160
+ },
+/obj/effect/turf_decal/trimline/purple/line{
+ alpha = 200;
+ dir = 5
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 5
+ },
+/turf/open/floor/iron/white/smooth_corner{
+ dir = 8
},
/area/station/science/research)
+"doD" = (
+/obj/effect/turf_decal/stripes/line,
+/obj/effect/turf_decal/trimline/blue/filled/corner{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/blue/filled/corner{
+ alpha = 160
+ },
+/obj/effect/turf_decal/stripes/white/line{
+ color = "#a56dc2"
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer5,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 5
+ },
+/turf/open/floor/iron/small,
+/area/station/hallway/secondary/entry)
+"doK" = (
+/obj/effect/turf_decal/skyrat_decals/departments/bridge{
+ dir = 4;
+ color = "#52B4E9"
+ },
+/turf/open/floor/iron/edge{
+ dir = 4
+ },
+/area/station/hallway/primary/central)
"doY" = (
/obj/machinery/requests_console/directional/north{
department = "Security";
@@ -34231,32 +38693,68 @@
/area/station/security/checkpoint/engineering)
"dpq" = (
/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
- dir = 8
+/obj/structure/reagent_dispensers/fueltank,
+/obj/item/weldingtool{
+ pixel_x = -4;
+ pixel_y = 3
},
-/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/bot,
/turf/open/floor/iron,
/area/station/cargo/warehouse)
-"dpD" = (
-/obj/effect/mapping_helpers/airlock/cyclelink_helper,
-/obj/machinery/door/airlock/external{
- name = "Port Docking Bay 1"
+"dpr" = (
+/mob/living/basic/slime{
+ name = "rob"
},
-/obj/effect/mapping_helpers/airlock/unres{
- dir = 1
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/obj/effect/turf_decal/stripes/white/line{
+ color = "#a56dc2";
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/dark/corner{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/dark/corner,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 8
+ },
+/turf/open/floor/engine,
+/area/station/science/xenobiology)
+"dpw" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 6
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
},
/turf/open/floor/plating,
+/area/station/maintenance/port/aft)
+"dpD" = (
+/obj/effect/turf_decal/trimline/blue/filled/line,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer5,
+/turf/open/floor/iron/edge{
+ dir = 1
+ },
/area/station/hallway/secondary/entry)
"dpF" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
/turf/open/floor/iron,
/area/station/security/prison)
"dpI" = (
-/obj/effect/turf_decal/trimline/blue/filled/warning,
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/turf_decal/trimline/blue/filled/warning{
+ alpha = 160
+ },
+/obj/effect/turf_decal/trimline/white/warning,
/turf/open/floor/iron/white,
/area/station/medical/treatment_center)
"dpM" = (
@@ -34265,6 +38763,7 @@
/obj/effect/decal/cleanable/dirt,
/obj/structure/cable,
/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer5,
/turf/open/floor/plating,
/area/station/maintenance/port/aft)
"dqd" = (
@@ -34278,27 +38777,45 @@
/turf/open/floor/plating,
/area/station/maintenance/fore)
"dqk" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/door/poddoor/preopen{
- id = "xenobiomain";
- name = "Containment Blast Door"
- },
-/turf/open/floor/plating,
-/area/station/science/xenobiology)
+/turf/closed/wall/r_wall,
+/area/station/cargo/drone_bay)
"dqI" = (
/turf/open/floor/iron/dark,
/area/station/commons/dorms/apartment1)
"dqL" = (
-/obj/structure/cable,
/obj/structure/tank_holder,
/turf/open/floor/plating,
/area/station/maintenance/starboard/aft)
"dqV" = (
/turf/open/floor/iron,
/area/station/science/auxlab/firing_range)
+"drz" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/item/trash/candle,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
+/turf/open/floor/wood,
+/area/station/maintenance/port/aft)
+"drT" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 9
+ },
+/obj/effect/turf_decal/stripes/line,
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/machinery/door/firedoor,
+/obj/effect/turf_decal/stripes/blue/line,
+/obj/effect/turf_decal/stripes/blue/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/blue/full,
+/obj/effect/turf_decal/caution/stand_clear/white,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/obj/structure/cable,
+/turf/open/floor/iron/dark/smooth_large,
+/area/station/medical/medbay/aft)
"drV" = (
/obj/effect/turf_decal/siding/wood/corner{
dir = 4
@@ -34368,7 +38885,6 @@
/turf/open/floor/iron/cafeteria,
/area/station/security/prison)
"dtO" = (
-/obj/structure/cable,
/obj/effect/spawner/random/maintenance,
/obj/structure/rack,
/turf/open/floor/plating,
@@ -34386,8 +38902,21 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 4
},
+/obj/machinery/firealarm/directional/west,
/turf/open/floor/iron/grimy,
/area/station/security/detectives_office)
+"dtZ" = (
+/obj/effect/spawner/structure/window/reinforced,
+/turf/open/floor/plating,
+/area/station/science/breakroom)
+"duh" = (
+/obj/structure/disposalpipe/segment,
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer5,
+/turf/open/floor/plating,
+/area/station/maintenance/aft)
"dui" = (
/obj/effect/turf_decal/stripes/line{
dir = 5
@@ -34428,14 +38957,45 @@
/obj/structure/window/spawner/directional/west,
/turf/open/floor/carpet/purple,
/area/station/commons/dorms)
-"dvk" = (
-/obj/effect/turf_decal/trimline/blue/filled/line{
+"dvc" = (
+/obj/machinery/atmospherics/components/binary/pump/off/general/visible/layer4,
+/obj/effect/spawner/random/structure/grille,
+/turf/open/floor/plating,
+/area/station/maintenance/port/aft)
+"dvi" = (
+/obj/effect/turf_decal/trimline/brown/line{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/brown/mid_joiner{
+ dir = 4
+ },
+/turf/open/floor/iron/corner{
dir = 1
},
+/area/station/hallway/primary/central)
+"dvk" = (
/obj/structure/disposalpipe/segment{
dir = 5
},
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/trimline/blue/filled/line{
+ alpha = 160;
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/white/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/blue/filled/mid_joiner{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/blue/filled/mid_joiner{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/white/mid_joiner{
+ dir = 1
+ },
+/turf/open/floor/iron/white/smooth_edge{
+ dir = 1
+ },
/area/station/medical/medbay/central)
"dvz" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
@@ -34452,12 +39012,8 @@
},
/obj/item/pen,
/obj/structure/table,
-/obj/effect/turf_decal/tile/red,
-/obj/effect/turf_decal/tile/red{
- dir = 8
- },
-/obj/effect/turf_decal/tile/neutral,
-/turf/open/floor/iron/dark,
+/obj/effect/turf_decal/delivery/blue,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/security/checkpoint/customs)
"dvG" = (
/obj/effect/landmark/start/head_of_security,
@@ -34479,26 +39035,57 @@
/area/station/science/ordnance)
"dwb" = (
/obj/structure/table,
-/obj/item/storage/toolbox/electrical{
- pixel_y = 5
- },
/obj/machinery/camera/directional/south{
c_tag = "Testing Lab";
network = list("ss13","rd")
},
-/turf/open/floor/iron/white,
-/area/station/science/explab)
-"dwi" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
- dir = 4
+/obj/item/multitool/circuit,
+/obj/item/multitool/circuit{
+ pixel_x = -4
},
-/obj/effect/landmark/start/scientist,
-/obj/machinery/holopad,
-/obj/effect/turf_decal/siding/thinplating/light{
- dir = 4
+/obj/item/storage/toolbox/electrical{
+ pixel_y = 6;
+ pixel_x = 10
+ },
+/obj/item/multitool{
+ pixel_y = -1;
+ pixel_x = 11
+ },
+/obj/effect/turf_decal/trimline/white/filled/line{
+ dir = 1;
+ alpha = 160
+ },
+/obj/effect/turf_decal/trimline/purple/line{
+ alpha = 200;
+ dir = 1;
+ color = "#a56dc2"
},
/turf/open/floor/iron,
/area/station/science/explab)
+"dwi" = (
+/obj/machinery/nanite_chamber,
+/obj/structure/railing/corner/end{
+ dir = 8
+ },
+/obj/structure/railing/corner/end/flip{
+ dir = 4
+ },
+/obj/effect/turf_decal/box/white{
+ color = "#a56dc2";
+ alpha = 200
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes/white/line{
+ color = "#D381C9";
+ dir = 1
+ },
+/turf/open/floor/iron/white,
+/area/station/science/explab)
"dww" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/stripes/line{
@@ -34507,6 +39094,15 @@
/obj/structure/training_machine,
/turf/open/floor/iron/dark,
/area/station/science/explab)
+"dwA" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/neutral/corner{
+ dir = 8
+ },
+/turf/open/floor/iron,
+/area/station/hallway/primary/port)
"dxb" = (
/obj/structure/disposalpipe/segment{
dir = 5
@@ -34531,16 +39127,27 @@
},
/turf/open/floor/iron/smooth_corner,
/area/station/science/cytology)
+"dxO" = (
+/obj/machinery/vending/cigarette,
+/obj/effect/turf_decal/stripes/line{
+ dir = 6
+ },
+/obj/effect/turf_decal/trimline/blue/filled/line{
+ dir = 6
+ },
+/obj/effect/turf_decal/stripes/white/line{
+ dir = 9
+ },
+/turf/open/floor/iron,
+/area/station/hallway/secondary/entry)
"dxQ" = (
-/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
-/obj/structure/chair,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/effect/landmark/start/assistant,
-/turf/open/floor/iron/white,
+/obj/structure/chair/sofa/bench/left{
+ pixel_y = 0;
+ greyscale_colors = "#2875af"
+ },
+/turf/open/floor/iron/dark/smooth_large,
/area/station/medical/medbay/lobby)
"dyd" = (
/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{
@@ -34551,6 +39158,9 @@
/area/space/nearstation)
"dyj" = (
/obj/structure/cable,
+/obj/effect/turf_decal/siding/wood{
+ dir = 5
+ },
/turf/open/floor/wood,
/area/station/security/prison)
"dyk" = (
@@ -34576,12 +39186,17 @@
/turf/open/floor/iron/dark/textured_large,
/area/station/cargo/miningdock)
"dyN" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/cable,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron,
-/area/station/security/prison)
+/obj/machinery/camera/directional/west,
+/turf/open/floor/iron/dark,
+/area/station/service/chapel)
+"dAb" = (
+/obj/machinery/door/poddoor/shutters{
+ dir = 1;
+ id = "warehouse_shutters2";
+ name = "Warehouse Shutters"
+ },
+/turf/open/floor/iron/dark,
+/area/station/cargo/warehouse)
"dAi" = (
/obj/effect/decal/cleanable/food/flour,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
@@ -34589,11 +39204,22 @@
},
/turf/open/floor/iron/kitchen,
/area/station/security/prison)
+"dAl" = (
+/obj/structure/closet/crate/coffin,
+/obj/effect/decal/cleanable/cobweb/cobweb2,
+/turf/open/floor/wood,
+/area/station/maintenance/port/aft)
"dAA" = (
-/obj/effect/decal/cleanable/dirt,
/obj/structure/cable,
/obj/effect/landmark/event_spawn,
-/turf/open/floor/iron/dark/textured,
+/obj/effect/turf_decal/siding/wideplating_new/dark/corner{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/wideplating_new/dark/corner{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/wideplating_new/dark,
+/turf/open/floor/iron/textured_large,
/area/station/command/gateway)
"dBu" = (
/obj/effect/turf_decal/tile/blue{
@@ -34623,8 +39249,13 @@
/obj/machinery/power/apc/auto_name/directional/east,
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/sign/poster/random/directional/west,
/turf/open/floor/plating,
/area/station/maintenance/port)
+"dCn" = (
+/obj/structure/cable,
+/turf/open/floor/iron/dark,
+/area/station/security/processing)
"dCE" = (
/obj/machinery/door/window/left/directional/south,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -34652,8 +39283,42 @@
"dDi" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/table/glass,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 1
+ },
/turf/open/floor/iron,
/area/station/maintenance/port/fore)
+"dDo" = (
+/obj/effect/turf_decal/trimline/yellow/arrow_cw{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/yellow/mid_joiner{
+ dir = 8
+ },
+/turf/open/floor/iron/edge{
+ dir = 8
+ },
+/area/station/hallway/primary/central)
+"dDI" = (
+/obj/effect/turf_decal/trimline/yellow/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/yellow/mid_joiner{
+ dir = 1
+ },
+/turf/open/floor/iron/edge{
+ dir = 1
+ },
+/area/station/hallway/primary/port)
+"dDM" = (
+/obj/effect/turf_decal/siding/dark/corner{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 4
+ },
+/turf/open/floor/wood/large,
+/area/station/command/heads_quarters/captain)
"dDR" = (
/obj/structure/chair,
/turf/open/floor/wood/tile,
@@ -34699,6 +39364,39 @@
},
/turf/open/floor/carpet,
/area/station/service/library)
+"dEV" = (
+/obj/structure/window/spawner/directional/west,
+/obj/effect/turf_decal/siding/thinplating/dark{
+ dir = 10
+ },
+/mob/living/basic/lizard/tegu{
+ name = "venomoose";
+ desc = "Oh, hi, venomoose!"
+ },
+/obj/structure/flora/rock/pile/jungle/large/style_3{
+ pixel_x = -1;
+ pixel_y = 4
+ },
+/obj/structure/flora/bush/jungle/b/style_2{
+ pixel_y = -2
+ },
+/turf/open/floor/grass,
+/area/station/command/heads_quarters/qm)
+"dFi" = (
+/obj/structure/disposalpipe/segment,
+/obj/effect/turf_decal/trimline/dark/filled/warning{
+ alpha = 160
+ },
+/obj/effect/turf_decal/trimline/purple/warning{
+ alpha = 200;
+ dir = 2;
+ color = "#a56dc2"
+ },
+/obj/effect/turf_decal/siding/dark,
+/obj/structure/cable,
+/obj/structure/sign/warning/electric_shock/directional/south,
+/turf/open/floor/iron/white/smooth_edge,
+/area/station/science/xenobiology)
"dFo" = (
/turf/closed/wall,
/area/station/service/lawoffice)
@@ -34714,10 +39412,10 @@
/turf/open/floor/iron/smooth_large,
/area/station/science/cytology)
"dFs" = (
+/obj/structure/cable,
/obj/structure/rack,
/obj/item/electronics/apc,
/obj/item/electronics/airlock,
-/obj/structure/cable,
/obj/effect/turf_decal/tile/yellow{
dir = 4
},
@@ -34730,9 +39428,21 @@
/obj/effect/spawner/random/burgerstation/liquid,
/turf/open/floor/plating,
/area/station/maintenance/aft)
+"dGq" = (
+/obj/effect/landmark/blobstart,
+/turf/open/floor/iron/smooth,
+/area/station/ai_monitored/security/armory)
"dGF" = (
/turf/closed/wall/r_wall,
/area/station/science/ordnance/burnchamber)
+"dGU" = (
+/obj/structure/hedge,
+/obj/structure/window/reinforced/spawner/directional/north,
+/obj/structure/window/reinforced/spawner/directional/west,
+/obj/structure/window/reinforced/spawner/directional/east,
+/obj/structure/window/reinforced/spawner/directional/south,
+/turf/open/floor/plating,
+/area/station/medical/treatment_center)
"dHb" = (
/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/oxygen_input{
dir = 1
@@ -34746,20 +39456,24 @@
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/turf_decal/trimline/dark/warning{
+ dir = 9
+ },
/turf/open/floor/iron/dark,
/area/station/security/brig)
"dHL" = (
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
-/obj/effect/turf_decal/tile/yellow{
- dir = 1
- },
/obj/effect/turf_decal/tile/yellow{
dir = 8
},
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/tile/blue/half{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/blue{
+ dir = 1
+ },
+/turf/open/floor/iron/white/smooth_edge{
+ dir = 4
+ },
/area/station/medical/chemistry)
"dHR" = (
/obj/structure/table,
@@ -34772,7 +39486,7 @@
/turf/open/floor/plating,
/area/station/security/prison)
"dIy" = (
-/obj/effect/turf_decal/tile/yellow/half/contrasted{
+/obj/effect/turf_decal/trimline/yellow/filled/shrink_ccw{
dir = 1
},
/turf/open/floor/iron/dark,
@@ -34800,7 +39514,7 @@
c_tag = "Engineering Supermatter Fore"
},
/turf/open/floor/iron/dark,
-/area/station/engineering/main)
+/area/station/engineering/supermatter/room)
"dJo" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/structure/cable,
@@ -34816,7 +39530,15 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 8
},
-/turf/open/floor/iron/dark,
+/obj/effect/turf_decal/trimline/dark/filled/corner{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/dark/filled/corner{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/dark/filled/line,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/iron/dark/small,
/area/station/medical/morgue)
"dJG" = (
/obj/structure/disposalpipe/segment{
@@ -34833,7 +39555,7 @@
dir = 4
},
/obj/structure/cable,
-/turf/open/floor/iron,
+/turf/open/floor/iron/textured_half,
/area/station/hallway/primary/port)
"dJJ" = (
/obj/structure/table/glass,
@@ -34859,6 +39581,15 @@
/obj/item/radio/intercom/directional/west,
/turf/closed/wall,
/area/station/hallway/secondary/service)
+"dKs" = (
+/obj/structure/cable,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 5
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer5,
+/turf/open/floor/plating,
+/area/station/maintenance/port/aft)
"dKC" = (
/obj/machinery/atmospherics/pipe/heat_exchanging/simple/layer2{
dir = 6
@@ -34872,18 +39603,28 @@
/obj/effect/turf_decal/trimline/dark_blue/filled/line{
dir = 4
},
+/obj/effect/turf_decal/trimline/dark/line{
+ dir = 4
+ },
/turf/open/floor/iron/dark,
/area/station/security/execution/transfer)
-"dMb" = (
-/obj/effect/turf_decal/tile/brown{
- dir = 8
+"dLM" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/siding/dark{
+ dir = 1
},
-/obj/machinery/door/firedoor,
+/turf/open/floor/iron/dark,
+/area/station/service/hydroponics)
+"dMb" = (
/obj/structure/disposalpipe/segment{
dir = 9
},
+/obj/machinery/door/firedoor,
/obj/machinery/firealarm/directional/west,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/brown/warning{
+ dir = 8
+ },
+/turf/open/floor/iron/large,
/area/station/hallway/primary/central)
"dMR" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -34895,7 +39636,9 @@
/turf/open/floor/iron/dark,
/area/station/commons/dorms/apartment1)
"dMS" = (
-/obj/effect/turf_decal/tile/dark_green,
+/obj/effect/turf_decal/trimline/dark_green/filled/shrink_ccw{
+ dir = 4
+ },
/turf/open/floor/iron/dark,
/area/station/hallway/primary/fore)
"dMZ" = (
@@ -34904,34 +39647,46 @@
/turf/open/floor/engine/vacuum,
/area/station/science/ordnance/burnchamber)
"dNr" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+/obj/effect/turf_decal/siding{
dir = 1
},
+/obj/effect/turf_decal/trimline/blue/filled/corner{
+ alpha = 160;
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/white/corner{
+ dir = 8
+ },
/turf/open/floor/iron/white,
/area/station/medical/medbay/lobby)
"dOo" = (
+/obj/effect/decal/cleanable/cobweb/cobweb2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer5,
/obj/structure/trash_pile,
/obj/item/trash/energybar,
-/obj/effect/decal/cleanable/cobweb/cobweb2,
/turf/open/floor/plating,
/area/station/maintenance/port/aft)
"dOq" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/wood/parquet,
-/area/station/command/heads_quarters/qm)
-"dOY" = (
-/obj/structure/window/spawner/directional/west,
-/obj/structure/window/spawner/directional/south,
-/obj/machinery/hydroponics/constructable,
-/obj/machinery/door/window/right/directional/east,
-/obj/effect/turf_decal/siding/thinplating/dark{
- dir = 9
+/obj/effect/turf_decal/trimline/blue/filled/corner,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer5,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 5
},
-/turf/open/floor/iron/smooth_large,
-/area/station/service/hydroponics)
+/turf/open/floor/iron,
+/area/station/hallway/secondary/entry)
+"dON" = (
+/turf/open/floor/iron/white/smooth_large,
+/area/station/medical/medbay/central)
+"dOY" = (
+/obj/machinery/airalarm/directional/south,
+/turf/open/floor/iron/dark,
+/area/station/ai_monitored/turret_protected/ai)
"dPd" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
- dir = 8
+/obj/effect/turf_decal/trimline/brown/filled/line{
+ dir = 6
+ },
+/obj/effect/turf_decal/trimline/dark/line{
+ dir = 6
},
/obj/effect/turf_decal/siding/thinplating/dark{
dir = 4
@@ -34958,26 +39713,31 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
/obj/machinery/light/directional/north,
/obj/machinery/computer/exoscanner_control,
-/turf/open/floor/iron/dark,
+/turf/open/floor/iron/dark/textured_large,
/area/station/cargo/drone_bay)
"dPp" = (
-/obj/structure/rack,
-/obj/item/clothing/mask/gas{
- pixel_x = 3;
- pixel_y = 3
- },
-/obj/item/clothing/mask/gas,
-/obj/item/clothing/mask/gas{
- pixel_x = -3;
- pixel_y = -3
- },
/obj/machinery/airalarm/directional/west,
+/obj/structure/table,
+/obj/item/nanite_scanner,
+/obj/item/nanite_scanner{
+ pixel_y = 6
+ },
+/obj/item/disk/holodisk{
+ pixel_y = 20;
+ pixel_x = 1
+ },
/turf/open/floor/iron,
/area/station/science/explab)
"dPq" = (
-/obj/effect/turf_decal/stripes/line,
/obj/structure/cable,
-/turf/open/floor/iron/dark/textured,
+/obj/effect/turf_decal/siding/wideplating_new/dark/corner{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/wideplating_new/dark{
+ dir = 10
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/iron/textured_large,
/area/station/command/gateway)
"dPz" = (
/obj/structure/table,
@@ -34998,6 +39758,17 @@
},
/turf/open/floor/plating,
/area/station/maintenance/abandon_cafeteria)
+"dQd" = (
+/obj/effect/turf_decal/trimline/blue/arrow_cw{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/blue/mid_joiner{
+ dir = 4
+ },
+/turf/open/floor/iron/edge{
+ dir = 4
+ },
+/area/station/hallway/primary/central)
"dQe" = (
/obj/structure/rack,
/obj/item/reagent_containers/cup/glass/waterbottle,
@@ -35006,12 +39777,39 @@
/obj/item/clothing/gloves/boxing/green,
/turf/open/floor/plating,
/area/station/maintenance/starboard/fore)
+"dQs" = (
+/obj/structure/disposalpipe/segment{
+ dir = 9
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/turf/open/floor/plating,
+/area/station/maintenance/port/aft)
"dQy" = (
/obj/structure/disposalpipe/segment{
dir = 4
},
/obj/structure/cable,
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/trimline/dark/filled/line{
+ alpha = 160;
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/dark/filled/mid_joiner{
+ dir = 1;
+ alpha = 160
+ },
+/obj/effect/turf_decal/trimline/purple/line{
+ alpha = 200;
+ dir = 1;
+ color = "#a56dc2"
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 1
+ },
+/turf/open/floor/iron/white/smooth_edge{
+ dir = 1
+ },
/area/station/science/xenobiology)
"dQC" = (
/obj/effect/turf_decal/tile/green{
@@ -35060,10 +39858,10 @@
/turf/open/floor/plating,
/area/station/ai_monitored/turret_protected/aisat/maint)
"dSx" = (
+/obj/structure/cable,
/obj/effect/turf_decal/plaque{
icon_state = "L4"
},
-/obj/structure/cable,
/turf/open/floor/iron,
/area/station/hallway/primary/central)
"dSy" = (
@@ -35091,21 +39889,25 @@
dir = 4;
name = "Mix from Engine"
},
-/obj/effect/turf_decal/tile/yellow{
- dir = 1
+/obj/effect/turf_decal/trimline/yellow/filled/line{
+ dir = 8;
+ alpha = 120
},
-/obj/effect/turf_decal/tile/blue{
+/obj/effect/turf_decal/trimline/dark_blue/line{
+ dir = 8;
+ alpha = 200
+ },
+/turf/open/floor/iron/dark,
+/area/station/engineering/atmos/hfr_room)
+"dTx" = (
+/obj/effect/turf_decal/siding/thinplating_new/dark/end{
dir = 8
},
-/turf/open/floor/iron/dark/side{
- dir = 4
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+ dir = 1
},
-/area/station/engineering/atmos/hfr_room)
-"dTo" = (
-/obj/machinery/door/firedoor,
-/obj/effect/turf_decal/tile/neutral,
-/turf/open/floor/iron,
-/area/station/hallway/secondary/entry)
+/turf/open/floor/carpet/black,
+/area/station/science/xenobiology)
"dTG" = (
/obj/structure/table/wood,
/obj/item/paper_bin,
@@ -35114,7 +39916,8 @@
"dUe" = (
/obj/effect/landmark/start/hangover,
/obj/machinery/door/firedoor,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/blue/warning,
+/turf/open/floor/iron/large,
/area/station/hallway/primary/starboard)
"dUq" = (
/obj/machinery/airalarm/directional/west,
@@ -35133,13 +39936,12 @@
/turf/open/floor/iron,
/area/station/engineering/atmos)
"dUM" = (
-/obj/effect/decal/cleanable/dirt,
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 6
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/iron,
+/turf/open/floor/catwalk_floor/iron,
/area/station/science/explab)
"dUT" = (
/obj/structure/cable,
@@ -35155,11 +39957,42 @@
},
/turf/open/floor/iron,
/area/station/engineering/storage/tech)
+"dUY" = (
+/obj/structure/grille/broken,
+/obj/structure/girder/displaced,
+/turf/open/floor/plating,
+/area/station/hallway/secondary/entry)
+"dVd" = (
+/obj/effect/turf_decal/trimline/blue/filled/line{
+ alpha = 160;
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/dark_blue/line{
+ alpha = 200;
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/blue/filled/mid_joiner{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/blue/filled/mid_joiner{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/dark_blue/mid_joiner{
+ dir = 8
+ },
+/turf/open/floor/iron/white/smooth_edge{
+ dir = 8
+ },
+/area/station/medical/medbay/central)
"dVh" = (
/obj/structure/chair/office/light{
dir = 8
},
/obj/effect/landmark/start/paramedic,
+/obj/effect/turf_decal/tile/blue/full,
+/obj/effect/turf_decal/siding/end{
+ dir = 8
+ },
/turf/open/floor/iron/white,
/area/station/medical/medbay/lobby)
"dVr" = (
@@ -35181,6 +40014,20 @@
/obj/machinery/light/small/directional/north,
/turf/open/floor/iron/freezer,
/area/station/maintenance/starboard/fore)
+"dVF" = (
+/obj/machinery/door/airlock/maintenance,
+/obj/effect/mapping_helpers/airlock/access/any/science/maintenance,
+/obj/effect/mapping_helpers/airlock/unres,
+/turf/open/floor/iron/dark/smooth_large,
+/area/station/maintenance/starboard/aft)
+"dWM" = (
+/obj/structure/table,
+/obj/machinery/light/small/dim/directional/west,
+/obj/item/restraints/handcuffs/cable/yellow,
+/obj/item/weldingtool/mini,
+/obj/effect/decal/cleanable/blood/gibs/core,
+/turf/open/floor/wood,
+/area/station/maintenance/port/aft)
"dXA" = (
/obj/machinery/flasher{
id = "visitorflash";
@@ -35195,27 +40042,22 @@
},
/turf/open/floor/engine/n2o,
/area/station/engineering/atmos)
-"dXT" = (
-/obj/structure/window/reinforced/spawner/directional/south,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
- dir = 8
- },
-/obj/structure/bodycontainer/morgue{
- dir = 1
- },
-/turf/open/floor/iron/dark,
-/area/station/medical/morgue)
-"dXW" = (
-/obj/machinery/power/apc/auto_name/directional/south,
-/obj/effect/turf_decal/tile/brown,
-/obj/structure/cable,
-/obj/effect/turf_decal/tile/brown{
+"dXV" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 4
},
-/obj/effect/turf_decal/tile/brown{
- dir = 8
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 5
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer5,
+/turf/open/floor/iron,
+/area/station/hallway/secondary/entry)
+"dXW" = (
+/obj/machinery/power/apc/auto_name/directional/south,
+/obj/structure/cable,
+/obj/effect/turf_decal/trimline/brown/filled/line{
+ dir = 10
},
-/obj/machinery/light/directional/south,
/turf/open/floor/iron,
/area/station/cargo/office)
"dYa" = (
@@ -35240,6 +40082,11 @@
/obj/effect/turf_decal/trimline/dark_blue/filled/warning{
dir = 8
},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/turf_decal/trimline/dark/warning{
+ dir = 8
+ },
/turf/open/floor/iron/dark,
/area/station/security/execution/transfer)
"dYx" = (
@@ -35251,6 +40098,11 @@
/obj/effect/mapping_helpers/airlock/access/any/engineering/general,
/turf/open/floor/plating,
/area/station/security/execution/transfer)
+"dYJ" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/light_switch/directional/west,
+/turf/open/floor/wood/tile,
+/area/station/service/lawoffice)
"dYM" = (
/obj/structure/cable,
/obj/structure/table,
@@ -35270,6 +40122,23 @@
},
/turf/open/floor/iron,
/area/station/engineering/storage/tech)
+"dZl" = (
+/obj/effect/turf_decal/trimline/dark/filled/line{
+ alpha = 160;
+ dir = 2
+ },
+/obj/effect/turf_decal/trimline/dark/filled/mid_joiner{
+ dir = 2;
+ alpha = 160
+ },
+/obj/effect/turf_decal/trimline/purple/line{
+ alpha = 200;
+ dir = 2;
+ color = "#a56dc2"
+ },
+/obj/effect/turf_decal/siding/dark,
+/turf/open/floor/iron/white/smooth_edge,
+/area/station/science/xenobiology)
"dZm" = (
/obj/structure/rack,
/obj/machinery/camera/directional/north{
@@ -35299,13 +40168,16 @@
dir = 4
},
/obj/effect/landmark/navigate_destination,
-/turf/open/floor/iron/dark/textured,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/science/genetics)
"dZC" = (
-/obj/effect/turf_decal/stripes/line{
+/obj/machinery/portable_atmospherics/canister/oxygen,
+/obj/effect/turf_decal/trimline/brown/filled/line{
+ dir = 9
+ },
+/obj/effect/turf_decal/trimline/dark/line{
dir = 9
},
-/obj/machinery/portable_atmospherics/canister/oxygen,
/turf/open/floor/iron,
/area/station/cargo/miningdock)
"dZJ" = (
@@ -35323,6 +40195,9 @@
dir = 4
},
/obj/machinery/firealarm/directional/east,
+/obj/effect/turf_decal/trimline/dark/line{
+ dir = 4
+ },
/turf/open/floor/iron/dark,
/area/station/security/execution/transfer)
"dZT" = (
@@ -35342,6 +40217,10 @@
/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/iron/dark,
/area/station/security/checkpoint/supply)
+"ead" = (
+/obj/structure/window/fulltile,
+/turf/open/floor/plating,
+/area/station/maintenance/port/aft)
"eaq" = (
/obj/machinery/door/airlock/security/glass{
id_tag = "permaouter";
@@ -35380,13 +40259,32 @@
dir = 1
},
/obj/machinery/computer/crew,
-/turf/open/floor/iron/dark/textured,
+/turf/open/floor/iron/dark/textured_large,
/area/station/command/gateway)
"ebb" = (
/obj/structure/cable,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
/turf/open/floor/carpet/red,
/area/station/command/heads_quarters/hos)
+"ebm" = (
+/obj/effect/turf_decal/trimline/blue/filled/line{
+ dir = 6
+ },
+/obj/effect/turf_decal/trimline/white/line{
+ dir = 6
+ },
+/obj/effect/turf_decal/trimline/blue/filled/mid_joiner{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/blue/filled/mid_joiner,
+/obj/effect/turf_decal/siding/blue{
+ color = "#8ab4cb";
+ dir = 4
+ },
+/turf/open/floor/iron/white/smooth_corner{
+ dir = 1
+ },
+/area/station/medical/treatment_center)
"ebu" = (
/obj/machinery/firealarm/directional/east,
/obj/machinery/atmospherics/components/unary/portables_connector/visible,
@@ -35403,15 +40301,46 @@
/area/station/engineering/supermatter)
"ebE" = (
/obj/machinery/airalarm/directional/east,
+/obj/machinery/computer/prisoner/gulag_teleporter_computer{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/cable,
/turf/open/floor/iron/dark,
/area/station/security/processing)
"ecg" = (
-/obj/machinery/firealarm/directional/north,
-/obj/effect/turf_decal/trimline/yellow/filled/line{
- dir = 1
+/obj/effect/turf_decal/trimline/yellow/filled/warning{
+ alpha = 120;
+ dir = 9
},
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/trimline/blue/warning{
+ dir = 9
+ },
+/obj/effect/turf_decal/trimline/blue/warning{
+ dir = 9;
+ alpha = 200
+ },
+/obj/machinery/firealarm/directional/north,
+/turf/open/floor/iron/white/smooth_corner,
/area/station/medical/medbay/central)
+"eci" = (
+/obj/effect/spawner/random/trash/mess,
+/obj/effect/spawner/random/trash/moisture_trap,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer5,
+/turf/open/floor/plating,
+/area/station/maintenance/port)
+"ecj" = (
+/obj/effect/turf_decal/trimline/brown/filled/corner{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/dark/corner{
+ dir = 4
+ },
+/turf/open/floor/iron/textured_corner{
+ dir = 4
+ },
+/area/station/cargo/miningdock)
"ecF" = (
/obj/effect/turf_decal/stripes/line{
dir = 10
@@ -35421,11 +40350,24 @@
"eds" = (
/obj/machinery/computer/order_console/bitrunning,
/obj/machinery/computer/security/telescreen/entertainment/directional/east,
-/turf/open/floor/iron,
+/turf/open/floor/iron/dark/textured_large,
/area/station/cargo/miningdock)
+"edH" = (
+/obj/effect/landmark/event_spawn,
+/obj/structure/cable,
+/obj/effect/turf_decal/siding/dark{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/dark,
+/turf/open/floor/iron/dark/textured,
+/area/station/command/bridge)
"edS" = (
-/obj/structure/bookcase/random,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/turf_decal/siding/wood/end,
+/obj/structure/barricade/wooden/crude,
+/obj/effect/turf_decal/siding/wood{
+ dir = 1
+ },
/turf/open/floor/plating,
/area/station/service/library/abandoned)
"eeg" = (
@@ -35443,45 +40385,55 @@
"eeN" = (
/obj/machinery/hydroponics/constructable,
/obj/machinery/light/directional/west,
-/obj/machinery/door/window/left/directional/south,
/obj/structure/window/spawner/directional/north,
/obj/effect/turf_decal/siding/thinplating/dark{
dir = 5
},
+/obj/machinery/door/window/left/directional/south,
/turf/open/floor/iron/smooth_large,
/area/station/service/hydroponics)
"eeU" = (
/obj/effect/turf_decal/trimline/dark_blue/filled/line,
/obj/structure/noticeboard/directional/south,
+/obj/effect/turf_decal/trimline/dark_blue/line{
+ alpha = 200
+ },
/turf/open/floor/iron/dark,
/area/station/security/office)
"efb" = (
/obj/structure/cable,
/obj/structure/disposalpipe/segment,
-/turf/open/floor/iron/dark,
+/obj/item/storage/part_replacer,
+/obj/item/storage/box/stockparts/basic,
+/obj/item/storage/box/stockparts/basic{
+ pixel_y = -5
+ },
+/obj/structure/table/reinforced,
+/obj/structure/window/reinforced/spawner/directional/north,
+/obj/machinery/door/window/left/directional/east{
+ req_access = list("eva");
+ name = "Parts Storage"
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/obj/effect/mapping_helpers/airlock/red_alert_access,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/ai_monitored/command/storage/eva)
"efh" = (
/obj/structure/window/reinforced/spawner/directional/west,
/obj/structure/closet/crate/coffin/blackcoffin,
+/obj/machinery/light/small/directional/north,
/turf/open/floor/iron/smooth_large,
/area/station/service/chapel/office)
"efj" = (
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
/obj/structure/table,
/obj/machinery/firealarm/directional/north,
/obj/machinery/light/directional/north,
/obj/item/stack/medical/mesh,
/obj/item/stack/medical/gauze,
/obj/item/stack/medical/suture,
-/turf/open/floor/iron/white,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/medical/medbay/lobby)
"efn" = (
/obj/machinery/power/apc/auto_name/directional/west,
@@ -35516,18 +40468,23 @@
/area/station/security/prison)
"efH" = (
/obj/machinery/airalarm/directional/east,
-/obj/effect/turf_decal/siding/thinplating/dark/corner,
/obj/structure/table,
-/obj/item/folder/yellow{
- pixel_x = 6
- },
/obj/item/paper_bin{
- pixel_x = 1;
- pixel_y = 9
+ pixel_x = 0;
+ pixel_y = 3
},
/obj/item/pen,
-/turf/open/floor/iron,
+/turf/open/floor/iron/dark/textured_large,
/area/station/cargo/miningdock)
+"efM" = (
+/obj/effect/decal/cleanable/blood/footprints{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 6
+ },
+/turf/open/floor/wood,
+/area/station/maintenance/port/aft)
"efO" = (
/obj/machinery/holopad,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -35540,8 +40497,16 @@
/obj/structure/cable,
/obj/machinery/light/directional/north,
/obj/machinery/vending/wardrobe/science_wardrobe,
-/turf/open/floor/iron/dark,
+/obj/effect/turf_decal/trimline/purple/filled/line{
+ alpha = 160;
+ color = "#6a3182";
+ dir = 1
+ },
+/turf/open/floor/iron/dark/smooth_large,
/area/station/science/breakroom)
+"egk" = (
+/turf/closed/wall/r_wall,
+/area/station/engineering/supermatter/room)
"egw" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -35561,6 +40526,11 @@
},
/turf/open/floor/iron/white,
/area/station/science/ordnance)
+"egI" = (
+/obj/effect/turf_decal/trimline/brown/arrow_cw,
+/obj/effect/turf_decal/trimline/brown/mid_joiner,
+/turf/open/floor/iron/edge,
+/area/station/hallway/primary/central)
"ehq" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -35568,8 +40538,17 @@
/obj/effect/turf_decal/trimline/dark_blue/filled/warning{
dir = 8
},
+/obj/effect/turf_decal/trimline/dark/warning{
+ dir = 8
+ },
/turf/open/floor/iron/dark,
/area/station/security/evidence)
+"ehK" = (
+/obj/machinery/light/small/dim/directional/west,
+/obj/structure/rack,
+/obj/effect/spawner/random/maintenance,
+/turf/open/floor/plating,
+/area/station/maintenance/port/aft)
"ehM" = (
/obj/machinery/door/firedoor,
/obj/effect/landmark/navigate_destination,
@@ -35610,26 +40589,53 @@
pixel_x = 11;
pixel_y = 7
},
+/obj/machinery/camera/directional/south{
+ c_tag = "Genetics South"
+ },
/turf/open/floor/iron/dark/textured,
/area/station/science/genetics)
-"eiK" = (
-/obj/effect/turf_decal/tile/red{
- dir = 1
+"eil" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 4
},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/obj/machinery/light/floor,
+/turf/open/floor/iron/large,
+/area/station/cargo/office)
+"eiK" = (
/obj/structure/hedge/opaque,
/obj/machinery/light/directional/west,
/turf/open/floor/iron/dark,
/area/station/hallway/primary/fore)
+"ejm" = (
+/obj/structure/table,
+/obj/effect/spawner/random/entertainment/money_small,
+/obj/effect/spawner/random/entertainment/gambling,
+/turf/open/floor/plating,
+/area/station/maintenance/port/aft)
"ejL" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
},
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
- dir = 1
+/obj/effect/turf_decal/stripes/blue/line{
+ dir = 4
},
-/turf/open/floor/iron/dark/side{
- dir = 8
+/obj/effect/turf_decal/trimline/dark_blue/filled/line,
+/obj/effect/turf_decal/trimline/dark_blue/filled/corner{
+ dir = 4
},
+/obj/effect/turf_decal/siding/wideplating_new/dark/corner{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/wideplating_new/dark/corner,
+/obj/effect/turf_decal/siding/dark,
+/obj/effect/turf_decal/siding/dark/corner{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron/dark/small,
/area/station/security/checkpoint/escape)
"ekG" = (
/obj/effect/turf_decal/tile/red,
@@ -35665,10 +40671,10 @@
/turf/open/floor/engine/vacuum,
/area/station/engineering/atmos)
"elL" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
- dir = 8
+/obj/effect/turf_decal/trimline/brown/filled/warning,
+/obj/effect/turf_decal/trimline/brown/filled/warning{
+ dir = 1
},
-/obj/structure/cable,
/turf/open/floor/iron,
/area/station/cargo/storage)
"elM" = (
@@ -35680,8 +40686,23 @@
"elT" = (
/obj/machinery/shower/directional/west,
/obj/machinery/airalarm/directional/north,
+/obj/structure/drain,
+/obj/effect/turf_decal/siding/white{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/thinplating{
+ dir = 4
+ },
/turf/open/floor/iron/freezer,
/area/station/commons/toilet)
+"eme" = (
+/obj/machinery/door/poddoor/preopen{
+ id = "pharmacy_shutters3";
+ name = "Pharmacy Shutter"
+ },
+/obj/effect/spawner/structure/window/reinforced,
+/turf/open/floor/plating,
+/area/station/medical/pharmacy)
"emn" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/door/poddoor/preopen{
@@ -35701,6 +40722,7 @@
/obj/structure/disposalpipe/segment{
dir = 9
},
+/obj/structure/cable,
/turf/open/floor/plating,
/area/station/maintenance/starboard/aft)
"emz" = (
@@ -35708,28 +40730,53 @@
dir = 4
},
/obj/machinery/portable_atmospherics/scrubber,
+/obj/effect/turf_decal/trimline/white/line{
+ dir = 4
+ },
/turf/open/floor/iron/dark,
/area/station/security/execution/education)
"emF" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/iron/dark,
-/area/station/hallway/secondary/exit)
+/obj/structure/window/reinforced/spawner/directional/south,
+/obj/structure/fluff/metalpole/anchor{
+ dir = 1;
+ pixel_y = -39
+ },
+/obj/effect/turf_decal/trimline/yellow/filled/warning{
+ dir = 8
+ },
+/turf/open/floor/iron/smooth_edge{
+ dir = 1
+ },
+/area/station/hallway/secondary/entry)
"emV" = (
-/obj/structure/chair/comfy/carp,
+/obj/structure/chair/comfy/brown,
/turf/open/floor/iron/grimy,
/area/station/command/heads_quarters/captain)
"enl" = (
/turf/closed/wall/r_wall,
/area/station/maintenance/solars/starboard/fore)
+"enC" = (
+/obj/machinery/light/small/dim/directional/south,
+/obj/structure/closet/firecloset,
+/turf/open/floor/plating,
+/area/station/maintenance/port/aft)
"enG" = (
/obj/structure/filingcabinet,
/turf/open/floor/iron/grimy,
/area/station/security/detectives_office)
"eoi" = (
-/obj/machinery/power/apc/auto_name/directional/west,
/obj/structure/cable,
-/turf/open/floor/wood,
+/obj/machinery/power/apc/auto_name/directional/west,
+/obj/effect/turf_decal/siding/dark{
+ dir = 10
+ },
+/turf/open/floor/wood/large,
/area/station/command/meeting_room)
+"eoj" = (
+/obj/machinery/light/directional/south,
+/obj/effect/turf_decal/trimline/yellow/filled/shrink_ccw,
+/turf/open/floor/iron/dark,
+/area/station/engineering/atmos/hfr_room)
"eoI" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 4
@@ -35737,6 +40784,7 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 4
},
+/obj/structure/cable,
/turf/open/floor/iron/goonplaque,
/area/station/hallway/secondary/entry)
"epc" = (
@@ -35777,13 +40825,31 @@
"epD" = (
/obj/machinery/power/apc/auto_name/directional/north,
/obj/structure/cable,
-/obj/structure/closet/wardrobe/cargotech,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/siding/wideplating_new/light{
+ dir = 9
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 9
+ },
+/turf/open/floor/iron/dark/herringbone,
/area/station/cargo/storage)
"epJ" = (
/obj/item/radio/intercom/directional/north,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/dark_blue/corner{
+ dir = 4;
+ alpha = 200
+ },
+/turf/open/floor/iron/edge{
+ dir = 1
+ },
/area/station/hallway/primary/port)
+"epO" = (
+/obj/effect/turf_decal/weather/snow/corner,
+/obj/machinery/atmospherics/components/unary/airlock_pump{
+ dir = 1
+ },
+/turf/open/floor/plating,
+/area/station/hallway/secondary/entry)
"epQ" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -35797,9 +40863,7 @@
/obj/structure/railing/corner/end/flip{
dir = 8
},
-/turf/open/floor/iron/stairs/old{
- dir = 8
- },
+/turf/open/floor/wood/stairs/left,
/area/station/service/bar)
"eqc" = (
/obj/structure/bed/double,
@@ -35815,14 +40879,18 @@
/turf/open/floor/iron/dark,
/area/station/ai_monitored/turret_protected/aisat/service)
"eqs" = (
-/obj/machinery/power/apc/auto_name/directional/west,
/obj/structure/cable,
-/turf/open/floor/iron,
+/obj/machinery/power/apc/auto_name/directional/west,
+/turf/open/floor/iron/corner,
/area/station/command/teleporter)
"eqA" = (
/obj/item/radio/intercom/directional/east,
/turf/open/floor/iron/smooth,
/area/station/ai_monitored/security/armory)
+"eqG" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer4,
+/turf/open/floor/plating,
+/area/station/maintenance/port/fore)
"erg" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -35880,35 +40948,32 @@
/obj/structure/disposalpipe/junction/yjunction{
dir = 1
},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer5,
/turf/open/floor/plating,
/area/station/maintenance/starboard)
"esW" = (
-/obj/effect/turf_decal/tile/brown{
- dir = 4
- },
-/obj/effect/turf_decal/stripes/asteroid/corner{
- dir = 4
- },
/obj/structure/cable,
-/obj/machinery/light/directional/north,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/siding/wideplating_new/light{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 1
+ },
+/turf/open/floor/iron/dark/small,
/area/station/cargo/storage)
"esZ" = (
-/obj/machinery/power/apc/auto_name/directional/north,
-/obj/structure/cable,
-/obj/machinery/disposal/delivery_chute{
- name = "Synth Disposal"
- },
-/obj/effect/turf_decal/trimline/purple/line{
- dir = 4
- },
-/obj/effect/turf_decal/trimline/purple/line{
- dir = 8
- },
/obj/structure/disposalpipe/trunk{
dir = 1
},
-/turf/open/floor/iron/dark,
+/obj/machinery/disposal/delivery_chute{
+ name = "Synth Disposal"
+ },
+/obj/structure/sign/warning/bodysposal/directional/north{
+ sign_change_name = "Warning - Disposals: Leads to Robotics";
+ name = "DISPOSAL: LEADS TO ROBOTICS";
+ desc = "A warning sign which reads 'DISPOSAL: LEADS TO ROBOTICS'."
+ },
+/turf/open/floor/iron/dark/smooth_large,
/area/station/medical/morgue)
"euc" = (
/obj/structure/sign/poster/official/random/directional/south,
@@ -35918,8 +40983,23 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/obj/structure/cable,
/turf/open/floor/plating,
/area/station/maintenance/fore)
+"euB" = (
+/obj/structure/chair/wood{
+ dir = 4
+ },
+/obj/effect/landmark/start/assistant,
+/obj/structure/window/reinforced/spawner/directional/north,
+/turf/open/floor/carpet,
+/area/station/hallway/secondary/entry)
"euK" = (
/obj/effect/turf_decal/tile/neutral{
dir = 4
@@ -35937,6 +41017,10 @@
},
/turf/open/floor/iron,
/area/station/security/prison)
+"euR" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer5,
+/turf/open/floor/iron/dark,
+/area/station/hallway/secondary/exit)
"evd" = (
/obj/structure/table/wood,
/obj/item/folder/red{
@@ -35948,7 +41032,6 @@
/turf/open/floor/wood,
/area/station/security/detectives_office)
"evp" = (
-/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 4
},
@@ -35956,7 +41039,8 @@
dir = 4
},
/obj/structure/cable,
-/turf/open/floor/iron,
+/obj/machinery/door/firedoor,
+/turf/open/floor/iron/large,
/area/station/hallway/primary/starboard)
"evA" = (
/obj/effect/decal/cleanable/dirt,
@@ -35987,6 +41071,16 @@
/obj/structure/mirror/directional/east,
/turf/open/floor/iron/freezer,
/area/station/commons/toilet/locker)
+"ewE" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 1
+ },
+/turf/open/floor/iron,
+/area/station/maintenance/port/fore)
"ewT" = (
/obj/machinery/photocopier/prebuilt,
/obj/structure/disposalpipe/segment{
@@ -36001,19 +41095,16 @@
/area/station/engineering/engine_smes)
"ewX" = (
/obj/structure/window/reinforced/spawner/directional/east,
-/obj/effect/turf_decal/tile/dark_blue{
- dir = 1
+/obj/structure/closet/secure_closet/security_medic,
+/obj/item/healthanalyzer,
+/obj/item/radio/intercom/directional/north,
+/obj/effect/turf_decal/trimline/red/real_red/filled/line{
+ dir = 5
},
-/obj/effect/turf_decal/tile/dark_blue{
- dir = 4
+/obj/effect/turf_decal/trimline/dark/line{
+ dir = 5
},
-/obj/effect/turf_decal/tile/dark_blue,
-/obj/structure/table/glass,
-/obj/machinery/airalarm/directional/north,
-/obj/item/storage/medkit/emergency{
- pixel_y = 9
- },
-/obj/effect/spawner/random/medical/minor_healing,
+/obj/item/wallframe/defib_mount,
/turf/open/floor/iron/white,
/area/station/security/medical)
"exb" = (
@@ -36036,6 +41127,7 @@
dir = 5
},
/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer5,
/turf/open/floor/plating,
/area/station/maintenance/port)
"eys" = (
@@ -36055,6 +41147,17 @@
},
/turf/open/floor/iron/dark,
/area/station/security/office)
+"ezi" = (
+/obj/effect/turf_decal/trimline/yellow/filled/warning{
+ alpha = 120;
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/dark_blue/warning{
+ alpha = 200;
+ dir = 8
+ },
+/turf/open/floor/iron/dark,
+/area/station/engineering/atmos/hfr_room)
"ezs" = (
/obj/structure/cable,
/obj/machinery/power/apc/auto_name/directional/north,
@@ -36112,14 +41215,13 @@
/turf/open/floor/wood,
/area/station/hallway/secondary/service)
"eAU" = (
-/obj/effect/spawner/random/structure/grille,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/open/floor/plating,
-/area/station/maintenance/aft)
+/area/station/maintenance/starboard/aft)
"eAX" = (
/obj/structure/table/reinforced,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/cable,
/obj/item/reagent_containers/cup/bottle/epinephrine{
pixel_x = -1;
pixel_y = 2
@@ -36129,21 +41231,55 @@
pixel_y = 2
},
/obj/item/reagent_containers/syringe,
-/turf/open/floor/iron/white,
+/obj/machinery/door/window/right/directional/north{
+ req_access = list("medical");
+ name = "Reception"
+ },
+/turf/open/floor/iron/dark/smooth_large,
/area/station/medical/medbay/lobby)
+"eBA" = (
+/obj/effect/spawner/structure/window/reinforced,
+/turf/open/floor/plating,
+/area/station/science/robotics/lab)
+"eBM" = (
+/obj/structure/window/reinforced/spawner/directional/west,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 5
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer4,
+/turf/open/floor/iron/smooth_edge{
+ dir = 4
+ },
+/area/station/hallway/secondary/entry)
"eCd" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 4
},
+/obj/machinery/holopad,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/obj/structure/railing/corner/end/flip,
+/obj/effect/turf_decal/siding/dark{
+ dir = 4
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/obj/effect/turf_decal/stripes/white/line{
+ color = "#D381C9";
+ dir = 4
+ },
/turf/open/floor/iron/white,
/area/station/science/explab)
"eCg" = (
-/obj/effect/turf_decal/delivery,
/obj/effect/turf_decal/siding/thinplating/dark{
dir = 4
},
-/obj/machinery/light/directional/south,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/brown/filled/warning,
+/turf/open/floor/iron/textured_edge{
+ dir = 1
+ },
/area/station/cargo/storage)
"eCU" = (
/obj/effect/decal/cleanable/dirt,
@@ -36154,14 +41290,37 @@
dir = 6
},
/obj/structure/cable,
+/obj/effect/landmark/firealarm_sanity,
/turf/open/floor/iron/cafeteria,
/area/station/maintenance/abandon_cafeteria)
-"eCX" = (
-/obj/effect/turf_decal/tile/purple/anticorner/contrasted{
+"eCW" = (
+/obj/effect/turf_decal/siding/dark{
dir = 8
},
-/turf/open/floor/iron,
+/turf/open/floor/iron/edge{
+ dir = 8
+ },
+/area/station/hallway/primary/central)
+"eCX" = (
+/obj/effect/turf_decal/trimline/purple/corner{
+ dir = 1;
+ alpha = 200
+ },
+/turf/open/floor/iron/textured_corner{
+ dir = 4
+ },
/area/station/hallway/primary/starboard)
+"eDf" = (
+/obj/effect/turf_decal/trimline/dark_blue/filled/line,
+/obj/effect/turf_decal/trimline/dark/line,
+/turf/open/floor/iron/dark,
+/area/station/security/brig)
+"eDv" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/iron/edge,
+/area/station/hallway/primary/aft)
"eDG" = (
/obj/machinery/light/small/directional/north,
/obj/effect/spawner/random/trash/moisture_trap,
@@ -36199,23 +41358,59 @@
/area/station/science/genetics)
"eEe" = (
/obj/structure/chair/office,
-/obj/effect/turf_decal/tile/red{
- dir = 8
- },
-/obj/effect/turf_decal/tile/red,
-/obj/effect/turf_decal/tile/neutral,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 1
},
-/turf/open/floor/iron/dark,
+/obj/effect/turf_decal/siding/dark/end{
+ dir = 1
+ },
+/turf/open/floor/carpet/black,
/area/station/security/checkpoint/escape)
"eEM" = (
/obj/effect/turf_decal/stripes/line{
dir = 6
},
/obj/machinery/cryo_cell,
-/turf/open/floor/iron/dark,
+/obj/effect/turf_decal/stripes/blue{
+ dir = 9
+ },
+/obj/effect/turf_decal/weather/snow,
+/obj/effect/turf_decal/siding{
+ dir = 4
+ },
+/turf/open/floor/iron/dark/smooth_large,
/area/station/medical/cryo)
+"eEQ" = (
+/obj/machinery/door/airlock/external{
+ name = "Escape Pod One"
+ },
+/obj/effect/mapping_helpers/airlock/unres{
+ dir = 8
+ },
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+ dir = 4;
+ late = 8
+ },
+/turf/open/floor/plating,
+/area/station/hallway/secondary/entry)
+"eEU" = (
+/obj/effect/turf_decal/siding/thinplating/dark{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/trimline/brown/filled/line{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/dark/line{
+ dir = 4
+ },
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+ dir = 8
+ },
+/turf/open/floor/iron/textured_edge{
+ dir = 8
+ },
+/area/station/cargo/miningdock)
"eFj" = (
/obj/machinery/light/directional/south,
/obj/structure/flora/bush/flowers_br,
@@ -36226,6 +41421,23 @@
/obj/effect/spawner/random/burgerstation/blocking,
/turf/open/floor/plating,
/area/station/maintenance/port/fore)
+"eFH" = (
+/obj/effect/turf_decal/trimline/dark/filled/warning{
+ alpha = 160;
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/purple/warning{
+ alpha = 200;
+ dir = 4;
+ color = "#a56dc2"
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 4
+ },
+/turf/open/floor/iron/white/smooth_edge{
+ dir = 4
+ },
+/area/station/science/xenobiology)
"eFS" = (
/obj/machinery/door/airlock/maintenance,
/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance,
@@ -36234,6 +41446,12 @@
},
/turf/open/floor/plating,
/area/station/maintenance/port/fore)
+"eGd" = (
+/obj/effect/turf_decal/trimline/blue/corner{
+ dir = 1
+ },
+/turf/open/floor/iron,
+/area/station/hallway/primary/central)
"eGE" = (
/obj/structure/table/wood,
/obj/item/flashlight/lantern,
@@ -36256,26 +41474,25 @@
/obj/machinery/camera/directional/west{
c_tag = "Conference to HoP Office"
},
-/turf/open/floor/wood,
+/obj/machinery/holopad{
+ pixel_x = 1
+ },
+/obj/effect/turf_decal/box/red,
+/obj/effect/turf_decal/bot_red,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/command/meeting_room)
"eHT" = (
/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
- dir = 4
- },
/obj/machinery/door/airlock/maintenance{
name = "Fitness Maintenance"
},
/obj/effect/mapping_helpers/airlock/access/any/security/general,
+/obj/machinery/atmospherics/pipe/layer_manifold/cyan/hidden,
/turf/open/floor/plating,
/area/station/maintenance/department/security)
"eHW" = (
/obj/machinery/light/directional/south,
-/obj/structure/sign/warning/pods/directional/west,
-/obj/structure/sign/warning/docking/directional/south,
+/obj/structure/sign/warning/pods/directional/south,
/turf/open/floor/iron/smooth_large,
/area/station/engineering/main)
"eIf" = (
@@ -36297,11 +41514,14 @@
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/purple/visible,
/turf/open/floor/iron/dark,
-/area/station/engineering/main)
+/area/station/engineering/supermatter/room)
"eIN" = (
/obj/effect/turf_decal/trimline/blue/filled/corner{
dir = 8
},
+/obj/effect/turf_decal/trimline/white/corner{
+ dir = 8
+ },
/turf/open/floor/iron/white,
/area/station/medical/treatment_center)
"eIP" = (
@@ -36316,20 +41536,31 @@
/turf/open/floor/carpet/blue,
/area/station/service/lawoffice)
"eIZ" = (
-/obj/effect/turf_decal/trimline/blue/filled/warning{
- dir = 1
- },
/obj/effect/turf_decal/trimline/blue/filled/corner{
+ alpha = 160;
dir = 4
},
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/trimline/dark_blue/corner{
+ alpha = 200;
+ dir = 4
+ },
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
+/turf/open/floor/iron/white/smooth_edge{
+ dir = 1
+ },
/area/station/medical/medbay/aft)
"eJd" = (
/obj/effect/landmark/start/scientist,
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/siding/dark,
+/obj/effect/turf_decal/trimline/dark/filled/warning{
+ alpha = 160
+ },
+/obj/effect/turf_decal/trimline/purple/warning{
+ alpha = 200;
+ dir = 2;
+ color = "#a56dc2"
+ },
+/turf/open/floor/iron/white/smooth_edge,
/area/station/science/research)
"eJl" = (
/obj/structure/window/reinforced/spawner/directional/north,
@@ -36337,18 +41568,39 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible,
/turf/open/floor/plating,
/area/station/security/execution/education)
+"eJr" = (
+/obj/structure/disposalpipe/segment,
+/obj/effect/turf_decal/trimline/yellow/corner{
+ dir = 1
+ },
+/turf/open/floor/iron/edge{
+ dir = 8
+ },
+/area/station/hallway/primary/aft)
"eJB" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
/obj/structure/chair/stool/directional/south,
/turf/open/floor/iron,
/area/station/security/prison/visit)
"eJI" = (
-/obj/effect/turf_decal/delivery,
/obj/machinery/door/window/left/directional/west{
name = "Containment Cell";
req_access = list("xenobiology")
},
-/turf/open/floor/iron,
+/obj/structure/disposalpipe/segment{
+ dir = 6
+ },
+/obj/structure/cable,
+/obj/effect/turf_decal/vg_decals/numbers/eight{
+ color = "#D381C9"
+ },
+/obj/effect/turf_decal/bot_white{
+ color = "#D381C9"
+ },
+/obj/effect/turf_decal/box/white{
+ color = "#D381C9"
+ },
+/turf/open/floor/iron/dark/smooth_large,
/area/station/science/xenobiology)
"eJQ" = (
/obj/effect/turf_decal/siding/wood{
@@ -36379,18 +41631,29 @@
/turf/open/floor/engine,
/area/station/science/explab)
"eKA" = (
-/obj/machinery/power/apc/auto_name/directional/south,
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
/obj/structure/cable,
+/obj/machinery/power/apc/auto_name/directional/south,
/obj/machinery/light/directional/south,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/siding/dark,
+/obj/effect/turf_decal/siding/dark/corner{
+ dir = 1
+ },
+/turf/open/floor/iron/dark/corner{
+ dir = 1
+ },
/area/station/command/bridge)
"eKQ" = (
/obj/structure/closet/radiation,
/obj/effect/turf_decal/bot,
+/obj/item/food/chocolateegg,
+/obj/effect/turf_decal/trimline/yellow/filled/line{
+ dir = 5;
+ alpha = 120
+ },
+/obj/effect/turf_decal/trimline/dark_blue/line{
+ alpha = 200;
+ dir = 5
+ },
/turf/open/floor/iron/dark,
/area/station/engineering/atmos/hfr_room)
"eLs" = (
@@ -36401,29 +41664,44 @@
},
/area/station/security/prison)
"eLM" = (
-/obj/effect/spawner/structure/window,
+/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/station/science/explab)
-"eLW" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/blood/old,
-/obj/structure/cable,
-/obj/structure/window/reinforced/spawner/directional/south,
-/obj/structure/bodycontainer/morgue{
- dir = 1
- },
-/turf/open/floor/iron/dark,
-/area/station/medical/morgue)
"eMo" = (
/obj/effect/turf_decal/siding/wood/corner{
dir = 8
},
-/turf/open/floor/wood,
+/obj/effect/turf_decal/siding/wood{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 5
+ },
+/turf/open/floor/wood/parquet,
/area/station/command/heads_quarters/captain)
+"eMy" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+ dir = 8
+ },
+/obj/structure/chair/sofa/bench/right{
+ pixel_y = 8
+ },
+/obj/effect/landmark/start/assistant,
+/turf/open/floor/iron/dark/side{
+ dir = 1
+ },
+/area/station/hallway/secondary/entry)
+"eMP" = (
+/obj/structure/fluff/tram_rail/end{
+ dir = 4
+ },
+/turf/open/space/basic,
+/area/space/nearstation)
"eNr" = (
-/obj/effect/turf_decal/tile/brown,
/obj/machinery/gbp_redemption,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/bot,
+/turf/open/floor/iron/dark/textured_large,
/area/station/cargo/office)
"eNw" = (
/obj/structure/cable,
@@ -36445,11 +41723,14 @@
/obj/effect/turf_decal/stripes/corner,
/obj/machinery/airalarm/directional/south,
/obj/machinery/vending/coffee,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/turf/open/floor/iron/dark/side,
/area/station/commons/locker)
"eNI" = (
/obj/structure/disposalpipe/segment,
-/obj/effect/turf_decal/tile/yellow{
+/obj/effect/turf_decal/trimline/yellow/corner{
dir = 1
},
/turf/open/floor/iron,
@@ -36484,7 +41765,7 @@
/obj/machinery/door/airlock/mining{
name = "Drone Bay"
},
-/turf/open/floor/iron/dark,
+/turf/open/floor/iron/dark/textured_large,
/area/station/cargo/warehouse)
"eOF" = (
/obj/effect/mapping_helpers/burnt_floor,
@@ -36503,6 +41784,9 @@
},
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/turf_decal/trimline/white/line{
+ dir = 8
+ },
/turf/open/floor/iron/dark,
/area/station/security/execution/education)
"ePf" = (
@@ -36546,8 +41830,28 @@
},
/obj/effect/mapping_helpers/requests_console/information,
/obj/effect/mapping_helpers/requests_console/assistance,
+/obj/effect/turf_decal/trimline/dark_blue/line{
+ alpha = 200;
+ dir = 1
+ },
/turf/open/floor/iron/dark,
/area/station/security/office)
+"eQb" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/plating,
+/area/station/security/checkpoint/escape)
+"eQs" = (
+/obj/effect/turf_decal/siding/dark{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/dark,
+/obj/structure/window/reinforced/spawner/directional/north{
+ pixel_y = 4
+ },
+/turf/open/floor/engine,
+/area/station/science/xenobiology)
"eQv" = (
/obj/structure/table/reinforced,
/obj/machinery/door/firedoor,
@@ -36555,7 +41859,7 @@
name = "Cargo Desk";
req_access = list("cargo")
},
-/turf/open/floor/iron,
+/turf/open/floor/iron/large,
/area/station/cargo/office)
"eQF" = (
/obj/machinery/light/small/directional/east,
@@ -36587,13 +41891,63 @@
/area/station/security/courtroom)
"eQT" = (
/obj/machinery/suit_storage_unit/standard_unit,
-/obj/effect/turf_decal/stripes/end,
-/turf/open/floor/iron,
+/obj/structure/railing/corner{
+ dir = 4;
+ pixel_y = -32
+ },
+/obj/structure/railing/corner{
+ dir = 1;
+ pixel_y = -32
+ },
+/obj/effect/turf_decal/box/white{
+ color = "#ff780a"
+ },
+/obj/effect/turf_decal/bot_white{
+ color = "#ff780a"
+ },
+/turf/open/floor/iron/dark/smooth_large,
/area/station/ai_monitored/command/storage/eva)
"eQV" = (
-/obj/structure/sink/directional/east,
-/turf/open/floor/iron/white,
+/obj/structure/sink/directional/east{
+ pixel_x = -16
+ },
+/obj/effect/turf_decal/trimline/dark/filled/mid_joiner{
+ dir = 8;
+ alpha = 160
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/dark/filled/warning{
+ alpha = 160;
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/purple/warning{
+ alpha = 200;
+ dir = 8;
+ color = "#a56dc2"
+ },
+/obj/item/extinguisher/mini{
+ pixel_x = 17;
+ pixel_y = 2
+ },
+/turf/open/floor/iron/white/smooth_edge{
+ dir = 8
+ },
/area/station/science/xenobiology)
+"eRo" = (
+/obj/structure/disposalpipe/segment,
+/obj/effect/turf_decal/trimline/yellow/arrow_ccw{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/yellow/mid_joiner{
+ dir = 8
+ },
+/obj/machinery/light/directional/west,
+/turf/open/floor/iron/edge{
+ dir = 8
+ },
+/area/station/hallway/primary/aft)
"eRq" = (
/obj/structure/disposalpipe/segment{
dir = 5
@@ -36607,6 +41961,13 @@
},
/turf/open/floor/engine,
/area/station/science/explab)
+"eRD" = (
+/obj/structure/cable,
+/obj/effect/turf_decal/siding/dark{
+ dir = 6
+ },
+/turf/open/floor/circuit/green/telecomms/mainframe,
+/area/station/tcommsat/server)
"eRH" = (
/obj/structure/table/wood,
/obj/item/modular_computer/laptop/preset/civilian,
@@ -36638,6 +41999,19 @@
/mob/living/basic/pet/bumbles,
/turf/open/floor/grass,
/area/station/service/hydroponics)
+"eSi" = (
+/obj/structure/disposalpipe/segment,
+/obj/effect/turf_decal/trimline/blue/line{
+ alpha = 200;
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/blue/mid_joiner{
+ alpha = 200;
+ dir = 8
+ },
+/obj/machinery/firealarm/directional/west,
+/turf/open/floor/iron/corner,
+/area/station/hallway/primary/central)
"eSQ" = (
/obj/machinery/door/firedoor,
/obj/structure/cable,
@@ -36646,7 +42020,7 @@
},
/obj/effect/mapping_helpers/airlock/access/any/engineering/general,
/turf/open/floor/engine,
-/area/station/engineering/main)
+/area/station/engineering/supermatter/room)
"eSV" = (
/obj/machinery/door/airlock/command{
name = "Chief Engineer's Quarters"
@@ -36684,12 +42058,32 @@
/obj/effect/spawner/random/contraband/prison,
/turf/open/floor/plating,
/area/station/security/prison)
+"eTP" = (
+/obj/structure/disposalpipe/segment,
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/turf_decal/siding/dark/corner,
+/obj/effect/turf_decal/siding/dark/corner{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/dark/corner{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/dark/corner{
+ dir = 8
+ },
+/turf/open/floor/wood,
+/area/station/command/meeting_room)
"eUh" = (
/obj/effect/turf_decal/trimline/dark_blue/filled/warning{
dir = 8
},
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/turf_decal/trimline/white/warning{
+ dir = 8
+ },
/turf/open/floor/iron/dark,
/area/station/security/execution/education)
"eUy" = (
@@ -36710,6 +42104,12 @@
/obj/machinery/door/firedoor,
/turf/open/floor/iron,
/area/station/service/barber)
+"eVG" = (
+/obj/effect/landmark/start/hangover,
+/turf/open/floor/iron/edge{
+ dir = 1
+ },
+/area/station/hallway/primary/central)
"eVH" = (
/obj/effect/landmark/generic_maintenance_landmark,
/obj/effect/mapping_helpers/broken_floor,
@@ -36717,16 +42117,17 @@
/area/station/service/library/abandoned)
"eVL" = (
/obj/machinery/light/directional/north,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/turf_decal/tile/yellow{
- dir = 1
- },
-/obj/effect/turf_decal/tile/brown{
- dir = 4
- },
/obj/machinery/light_switch/directional/north,
-/turf/open/floor/iron,
+/obj/structure/table,
+/obj/effect/spawner/random/food_or_drink/donkpockets{
+ pixel_y = 4;
+ pixel_x = -11
+ },
+/obj/item/food/grown/ash_flora/mushroom_cap{
+ pixel_x = 4;
+ pixel_y = 2
+ },
+/turf/open/floor/iron/dark/textured_large,
/area/station/cargo/miningdock)
"eWj" = (
/obj/item/beacon,
@@ -36737,12 +42138,25 @@
/turf/open/floor/iron/dark,
/area/station/security/courtroom)
"eWr" = (
+/obj/structure/cable,
/obj/effect/turf_decal/trimline/blue/filled/line{
dir = 9
},
/obj/machinery/iv_drip,
-/obj/structure/cable,
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/trimline/white/line{
+ dir = 9
+ },
+/obj/effect/turf_decal/trimline/blue/filled/mid_joiner{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/blue/filled/mid_joiner{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/blue/corner{
+ color = "#8ab4cb";
+ dir = 1
+ },
+/turf/open/floor/iron/white/smooth_corner,
/area/station/medical/treatment_center)
"eWy" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -36754,11 +42168,32 @@
/turf/open/floor/iron,
/area/station/hallway/primary/fore)
"eWK" = (
+/obj/item/forging/billow,
+/obj/item/stack/sheet/mineral/wood{
+ amount = 4;
+ pixel_x = 7;
+ pixel_y = 0
+ },
+/obj/structure/closet/crate/wooden,
/obj/effect/turf_decal/bot,
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/reagent_dispensers/watertank,
/turf/open/floor/iron,
/area/station/cargo/warehouse)
+"eWV" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 8
+ },
+/turf/open/floor/wood,
+/area/station/security/prison)
+"eXa" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/mirror/directional/east,
+/obj/machinery/light/small/dim/directional/south,
+/obj/machinery/duct,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+ dir = 1
+ },
+/turf/open/floor/iron/freezer,
+/area/station/maintenance/port/aft)
"eYn" = (
/obj/structure/table,
/obj/item/paper_bin{
@@ -36781,6 +42216,15 @@
},
/turf/open/floor/iron/dark,
/area/station/security/checkpoint/engineering)
+"eYO" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/wood{
+ dir = 4
+ },
+/turf/open/floor/iron/dark/textured_large,
+/area/station/service/library)
"eYQ" = (
/obj/machinery/rnd/production/protolathe/department/engineering,
/turf/open/floor/iron/smooth_large,
@@ -36819,12 +42263,28 @@
},
/turf/open/floor/iron,
/area/station/security/office)
+"fbe" = (
+/obj/structure/window/reinforced/spawner/directional/north,
+/obj/structure/window/reinforced/spawner/directional/west,
+/obj/structure/window/reinforced/spawner/directional/east,
+/obj/structure/hedge,
+/turf/open/floor/grass,
+/area/station/science/breakroom)
"fbE" = (
/obj/machinery/door/morgue{
name = "Confession Booth"
},
/turf/open/floor/iron/dark,
/area/station/service/chapel)
+"fbH" = (
+/obj/structure/urinal/directional/north,
+/obj/effect/turf_decal/siding/white,
+/obj/effect/turf_decal/siding/white{
+ dir = 1
+ },
+/obj/machinery/vending/wallmed/directional/south,
+/turf/open/floor/iron/white/small,
+/area/station/commons/toilet)
"fbT" = (
/obj/machinery/door/airlock/external{
name = "External Access"
@@ -36835,6 +42295,10 @@
/obj/effect/mapping_helpers/airlock/cyclelink_helper,
/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance,
/obj/effect/mapping_helpers/airlock/unres,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 5
+ },
/turf/open/floor/plating,
/area/station/maintenance/port/aft)
"fbW" = (
@@ -36852,6 +42316,14 @@
dir = 1
},
/area/station/hallway/primary/central/fore)
+"fcr" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/iron/edge{
+ dir = 1
+ },
+/area/station/hallway/primary/central)
"fcw" = (
/obj/machinery/door/airlock/maintenance,
/obj/effect/mapping_helpers/airlock/unres{
@@ -36870,6 +42342,10 @@
/obj/structure/cable,
/turf/open/floor/plating,
/area/station/security/execution/education)
+"fcy" = (
+/obj/effect/turf_decal/trimline/yellow/corner,
+/turf/open/floor/iron/edge,
+/area/station/hallway/primary/central)
"fcz" = (
/obj/machinery/camera/autoname/directional/south{
c_tag = "Ordnance Gas Storage"
@@ -36974,6 +42450,13 @@
},
/turf/open/floor/engine,
/area/station/science/explab)
+"fdV" = (
+/obj/effect/turf_decal/trimline/blue/filled/line{
+ dir = 9
+ },
+/obj/structure/table/glass,
+/turf/open/floor/iron,
+/area/station/hallway/secondary/entry)
"fep" = (
/obj/structure/cable,
/obj/structure/lattice/catwalk,
@@ -36997,9 +42480,24 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/wood,
/area/station/maintenance/abandon_cafeteria)
+"feF" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 1
+ },
+/turf/open/floor/iron/edge{
+ dir = 1
+ },
+/area/station/hallway/primary/central)
"feM" = (
/obj/structure/urinal/directional/north,
-/turf/open/floor/mineral/titanium/blue,
+/obj/effect/turf_decal/siding/white,
+/obj/effect/turf_decal/siding/white{
+ dir = 1
+ },
+/turf/open/floor/iron/white/small,
/area/station/commons/toilet)
"feO" = (
/obj/structure/disposalpipe/segment{
@@ -37031,7 +42529,16 @@
/turf/open/floor/plating,
/area/station/maintenance/starboard/fore)
"ffy" = (
-/turf/open/floor/mineral/gold,
+/obj/structure/flora/bush/jungle/c/style_2,
+/obj/effect/turf_decal/siding/thinplating/dark{
+ dir = 6
+ },
+/obj/machinery/space_heater/wall_mounted/directional/south,
+/obj/structure/flora/tree/jungle/small/style_5{
+ pixel_x = -32;
+ pixel_y = 9
+ },
+/turf/open/floor/grass,
/area/station/command/heads_quarters/qm)
"ffM" = (
/obj/structure/disposalpipe/segment,
@@ -37050,18 +42557,9 @@
},
/area/station/hallway/primary/central/fore)
"fgm" = (
-/obj/effect/turf_decal/tile/yellow{
- dir = 1
- },
-/obj/effect/turf_decal/tile/yellow{
- dir = 1
- },
-/obj/effect/turf_decal/tile/yellow{
- dir = 8
- },
/obj/machinery/light/directional/west,
/obj/structure/closet/firecloset,
-/turf/open/floor/iron,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/hallway/primary/aft)
"fgw" = (
/obj/structure/chair/stool/directional/south,
@@ -37074,7 +42572,9 @@
/area/station/security/prison)
"fgR" = (
/obj/machinery/airalarm/directional/south,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/blue/line,
+/obj/effect/turf_decal/trimline/blue/mid_joiner,
+/turf/open/floor/iron/edge,
/area/station/hallway/primary/starboard)
"fgW" = (
/obj/effect/decal/cleanable/dirt,
@@ -37092,14 +42592,15 @@
dir = 8;
pixel_y = 1
},
-/obj/structure/window/reinforced/spawner/directional/east,
/obj/item/radio/intercom/directional/north,
-/obj/item/clothing/head/helmet/skull{
- pixel_x = -2;
- pixel_y = -16;
- desc = "Alas, poor Yorick! I knew him, Horatio: a fellow of infinite jest, of most excellent fancy."
+/obj/effect/turf_decal/siding/dark{
+ dir = 8
},
-/turf/open/floor/iron/dark,
+/obj/effect/turf_decal/trimline/dark/filled/end{
+ dir = 1
+ },
+/obj/structure/window/reinforced/spawner/directional/east,
+/turf/open/floor/iron/dark/small,
/area/station/medical/morgue)
"fhc" = (
/obj/machinery/shower/directional/north,
@@ -37124,7 +42625,12 @@
dir = 4
},
/obj/machinery/status_display/ai/directional/north,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/siding/dark/corner{
+ dir = 1
+ },
+/turf/open/floor/iron/edge{
+ dir = 1
+ },
/area/station/hallway/primary/central)
"fia" = (
/obj/structure/window/spawner/directional/west,
@@ -37133,12 +42639,24 @@
/turf/open/floor/carpet/black,
/area/station/commons/dorms)
"fic" = (
-/obj/structure/sign/departments/chemistry/directional/south,
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/effect/turf_decal/trimline/yellow/filled/line,
-/turf/open/floor/iron/white,
+/obj/structure/sign/departments/chemistry/directional/south,
+/obj/effect/turf_decal/trimline/yellow/filled/warning{
+ alpha = 120;
+ dir = 10
+ },
+/obj/effect/turf_decal/trimline/blue/warning{
+ dir = 10
+ },
+/obj/effect/turf_decal/trimline/blue/warning{
+ dir = 10;
+ alpha = 200
+ },
+/turf/open/floor/iron/white/smooth_corner{
+ dir = 4
+ },
/area/station/medical/medbay/central)
"fie" = (
/turf/closed/wall,
@@ -37147,7 +42665,6 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/structure/cable,
/obj/structure/chair{
dir = 1
},
@@ -37160,8 +42677,22 @@
},
/obj/machinery/computer/security/telescreen/isolation/directional/north,
/obj/machinery/door/firedoor,
+/obj/effect/turf_decal/trimline/dark/line{
+ dir = 1
+ },
/turf/open/floor/iron/dark,
/area/station/security/execution/transfer)
+"fit" = (
+/obj/effect/turf_decal/trimline/brown/line{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/brown/mid_joiner{
+ dir = 4
+ },
+/turf/open/floor/iron/edge{
+ dir = 4
+ },
+/area/station/hallway/primary/central)
"fiD" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -37213,6 +42744,18 @@
/obj/effect/landmark/start/security_medic,
/turf/open/floor/iron/dark,
/area/station/security/office)
+"fjQ" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/blue/filled/line{
+ dir = 9
+ },
+/obj/machinery/camera/autoname/directional/north{
+ c_tag = "Arrivals Bay Cafe"
+ },
+/turf/open/floor/iron,
+/area/station/hallway/secondary/entry)
"fjY" = (
/obj/effect/turf_decal/tile/blue{
dir = 8
@@ -37248,8 +42791,15 @@
},
/obj/effect/mapping_helpers/airlock/access/any/science/maintenance,
/obj/effect/mapping_helpers/airlock/abandoned,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer4,
/turf/open/floor/plating,
/area/station/maintenance/starboard)
+"fkv" = (
+/obj/effect/turf_decal/bot,
+/obj/structure/marker_beacon/bronze,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer5,
+/turf/open/floor/iron/large,
+/area/station/cargo/storage)
"fky" = (
/obj/structure/closet/secure_closet/personal/wall{
pixel_x = 32
@@ -37324,6 +42874,10 @@
/obj/structure/dresser,
/turf/open/floor/carpet/red,
/area/station/commons/dorms)
+"fnG" = (
+/obj/effect/turf_decal/siding/dark,
+/turf/open/floor/iron/edge,
+/area/station/hallway/primary/starboard)
"fnM" = (
/obj/structure/flora/bush/flowers_yw/style_random,
/turf/open/floor/grass,
@@ -37334,9 +42888,53 @@
/obj/item/hfr_box/body/fuel_input,
/turf/open/floor/iron,
/area/station/engineering/atmos/hfr_room)
+"fob" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron/dark/corner{
+ dir = 1
+ },
+/area/station/commons/locker)
+"foi" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/blue/filled/line{
+ alpha = 160;
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/white/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/blue/filled/mid_joiner{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/blue/filled/mid_joiner{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/white/mid_joiner{
+ dir = 1
+ },
+/turf/open/floor/iron/white/smooth_edge{
+ dir = 1
+ },
+/area/station/medical/medbay/central)
+"fon" = (
+/obj/machinery/duct,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/turf/open/floor/iron,
+/area/station/maintenance/port/aft)
"fox" = (
/obj/effect/turf_decal/trimline/dark_blue/filled/line,
/obj/machinery/light/directional/south,
+/obj/effect/turf_decal/trimline/dark_blue/line{
+ alpha = 200
+ },
/turf/open/floor/iron/dark,
/area/station/security/office)
"foU" = (
@@ -37386,9 +42984,26 @@
/turf/open/floor/iron/dark,
/area/station/hallway/primary/central/fore)
"fqu" = (
-/obj/machinery/light/small/directional/west,
+/obj/structure/disposalpipe/trunk,
+/obj/effect/turf_decal/siding/dark{
+ dir = 9
+ },
+/obj/effect/turf_decal/siding/dark/corner,
+/obj/structure/disposaloutlet,
+/obj/structure/window/reinforced/spawner/directional/north{
+ pixel_y = 4
+ },
/turf/open/floor/engine,
/area/station/science/xenobiology)
+"fqD" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 6
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/turf/open/floor/iron,
+/area/station/maintenance/port/aft)
"fqH" = (
/obj/effect/turf_decal/tile/blue{
dir = 8
@@ -37406,6 +43021,18 @@
dir = 1
},
/area/station/security/prison)
+"fqW" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 6
+ },
+/obj/machinery/atmospherics/components/binary/pump/on/layer4{
+ dir = 4;
+ name = "Airlock Pump";
+ target_pressure = 300;
+ hide = 1
+ },
+/turf/open/floor/plating,
+/area/station/maintenance/port/aft)
"frk" = (
/obj/structure/cable,
/obj/item/radio/intercom/directional/south,
@@ -37417,9 +43044,6 @@
/obj/structure/railing{
dir = 1
},
-/obj/effect/turf_decal/tile/dark_green{
- dir = 4
- },
/turf/open/floor/iron/dark,
/area/station/hallway/primary/fore)
"frA" = (
@@ -37458,15 +43082,39 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 4
},
-/turf/open/floor/iron/dark,
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes/white/line{
+ dir = 1;
+ color = "#EFB341"
+ },
+/obj/effect/turf_decal/siding/wideplating/dark/corner{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/wideplating/dark/corner{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/wideplating/dark/corner,
+/obj/effect/turf_decal/siding/dark{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 8
+ },
+/turf/open/floor/iron/textured_large,
/area/station/ai_monitored/command/storage/eva)
"fsg" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/cable,
/turf/open/floor/plating,
/area/station/maintenance/starboard/aft)
"fsB" = (
-/obj/machinery/door/airlock/maintenance/glass,
+/obj/machinery/door/airlock/maintenance/glass{
+ name = "Prison Maintenance"
+ },
+/obj/machinery/door/firedoor,
/turf/open/floor/plating,
/area/station/security/prison)
"fsQ" = (
@@ -37474,7 +43122,7 @@
dir = 4
},
/turf/open/floor/iron/dark,
-/area/station/engineering/main)
+/area/station/engineering/supermatter/room)
"ftd" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
@@ -37486,19 +43134,34 @@
/obj/structure/cable,
/turf/open/floor/wood,
/area/station/maintenance/abandon_cafeteria)
+"ftn" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/obj/structure/cable,
+/turf/open/floor/iron/textured_half{
+ dir = 8
+ },
+/area/station/hallway/primary/port)
"ftu" = (
/obj/effect/turf_decal/trimline/dark_blue/filled/line{
dir = 5
},
/obj/machinery/computer/security/labor,
/obj/machinery/airalarm/directional/east,
+/obj/effect/turf_decal/trimline/white/line{
+ dir = 5
+ },
/turf/open/floor/iron/dark,
/area/station/security/execution/education)
"ftL" = (
-/obj/machinery/biogenerator,
/obj/effect/turf_decal/trimline/green/filled/line{
dir = 1
},
+/obj/machinery/biogenerator,
/turf/open/floor/iron,
/area/station/service/hydroponics/garden/abandoned)
"ftR" = (
@@ -37508,7 +43171,11 @@
/turf/open/floor/iron/dark,
/area/station/security/brig)
"ftW" = (
-/obj/structure/closet/l3closet/scientist,
+/obj/structure/table,
+/obj/item/circuitboard/machine/public_nanite_chamber,
+/obj/item/circuitboard/machine/public_nanite_chamber{
+ pixel_y = 3
+ },
/turf/open/floor/iron,
/area/station/science/explab)
"fut" = (
@@ -37523,21 +43190,52 @@
/obj/effect/mapping_helpers/requests_console/ore_update,
/obj/effect/mapping_helpers/requests_console/assistance,
/obj/effect/mapping_helpers/requests_console/information,
-/turf/open/floor/iron/checker,
+/obj/structure/marker_beacon/jade,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/science/lab)
-"fvd" = (
-/obj/effect/turf_decal/tile/yellow{
+"fuR" = (
+/obj/effect/turf_decal/trimline/yellow/arrow_cw,
+/obj/effect/turf_decal/trimline/yellow/mid_joiner,
+/turf/open/floor/iron/textured_corner{
dir = 1
},
-/turf/open/floor/iron/dark/side{
- dir = 6
+/area/station/hallway/primary/port)
+"fuT" = (
+/obj/effect/turf_decal/trimline/blue/filled/line{
+ dir = 1
},
+/obj/machinery/light/directional/south{
+ dir = 1
+ },
+/obj/item/radio/intercom/directional/north,
+/turf/open/floor/iron/edge,
+/area/station/hallway/secondary/entry)
+"fvd" = (
+/obj/effect/turf_decal/trimline/yellow/filled/line{
+ dir = 2;
+ alpha = 120
+ },
+/obj/effect/turf_decal/trimline/dark_blue/line{
+ alpha = 200
+ },
+/turf/open/floor/iron/dark,
/area/station/engineering/atmos/hfr_room)
"fvi" = (
/obj/effect/turf_decal/stripes/line,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron,
/area/station/science/ordnance/storage)
+"fvD" = (
+/obj/effect/turf_decal/trimline/green/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/green/mid_joiner{
+ dir = 1
+ },
+/turf/open/floor/iron/edge{
+ dir = 1
+ },
+/area/station/hallway/primary/starboard)
"fvQ" = (
/obj/effect/turf_decal/siding/thinplating{
dir = 1
@@ -37561,13 +43259,17 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/item/radio/intercom/directional/north,
-/turf/open/floor/iron,
+/obj/structure/cable,
+/obj/effect/turf_decal/trimline/blue/filled/line{
+ dir = 1
+ },
+/turf/open/floor/iron/edge,
/area/station/hallway/secondary/entry)
"fwB" = (
-/obj/effect/turf_decal/bot_white/left,
/obj/structure/closet/crate/silvercrate,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/turf/open/floor/iron/dark,
+/obj/effect/turf_decal/bot_white,
+/obj/effect/turf_decal/box/white,
+/turf/open/floor/iron/dark/textured_large,
/area/station/ai_monitored/command/nuke_storage)
"fwJ" = (
/obj/structure/closet/crate/coffin,
@@ -37594,18 +43296,59 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/dark,
/area/station/security/office)
-"fxY" = (
-/obj/effect/turf_decal/trimline/blue/filled/corner,
-/obj/effect/turf_decal/trimline/blue/filled/corner{
+"fxs" = (
+/obj/effect/turf_decal/siding/dark{
+ dir = 4
+ },
+/obj/effect/turf_decal/stripes{
dir = 8
},
+/obj/effect/turf_decal/stripes/white/line{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/dark/corner{
+ dir = 1
+ },
+/turf/open/floor/iron/dark/smooth_edge{
+ dir = 8
+ },
+/area/station/medical/cryo)
+"fxx" = (
+/obj/effect/turf_decal/trimline/yellow/arrow_ccw{
+ dir = 9
+ },
+/obj/effect/turf_decal/trimline/yellow/mid_joiner{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/yellow/mid_joiner{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/dark/corner{
+ dir = 8
+ },
+/turf/open/floor/iron/corner,
+/area/station/hallway/primary/aft)
+"fxY" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 6
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/turf_decal/trimline/blue/filled/corner,
+/obj/effect/turf_decal/trimline/blue/filled/corner{
+ dir = 8
+ },
/turf/open/floor/iron/dark,
/area/station/command/heads_quarters/cmo)
+"fyq" = (
+/obj/effect/turf_decal/trimline/dark/warning{
+ dir = 1
+ },
+/turf/open/floor/plating,
+/area/station/hallway/secondary/entry)
"fyu" = (
/obj/structure/mineral_door/iron,
/turf/open/floor/plating,
@@ -37617,6 +43360,9 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/structure/cable,
+/obj/effect/turf_decal/trimline/dark/warning{
+ dir = 1
+ },
/turf/open/floor/iron/dark,
/area/station/security/brig)
"fzr" = (
@@ -37632,6 +43378,7 @@
/obj/structure/cable,
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer5,
/turf/open/floor/plating,
/area/station/maintenance/port/aft)
"fzG" = (
@@ -37670,15 +43417,12 @@
/turf/open/floor/iron,
/area/station/hallway/primary/central)
"fBh" = (
-/obj/effect/turf_decal/trimline/blue/filled/line{
- dir = 9
- },
-/obj/machinery/disposal/bin,
/obj/structure/disposalpipe/trunk{
dir = 4
},
-/turf/open/floor/iron/white,
-/area/station/medical/medbay/aft)
+/obj/machinery/disposal/bin,
+/turf/open/floor/iron/dark/smooth_large,
+/area/station/medical/medbay/central)
"fBm" = (
/obj/machinery/firealarm/directional/north,
/obj/effect/spawner/random/trash,
@@ -37690,10 +43434,28 @@
/obj/effect/turf_decal/trimline/blue/filled/corner{
dir = 4
},
+/obj/effect/turf_decal/trimline/white/corner{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/blue/corner{
+ color = "#8ab4cb";
+ dir = 4
+ },
+/obj/structure/railing/corner{
+ dir = 4
+ },
/turf/open/floor/iron/white,
/area/station/medical/treatment_center)
"fBE" = (
-/mob/living/basic/slime,
+/obj/effect/turf_decal/siding/dark{
+ dir = 5
+ },
+/obj/effect/turf_decal/siding/dark/corner{
+ dir = 8
+ },
+/obj/structure/window/reinforced/spawner/directional/north{
+ pixel_y = 4
+ },
/turf/open/floor/engine,
/area/station/science/xenobiology)
"fBM" = (
@@ -37711,21 +43473,47 @@
/obj/structure/noticeboard/directional/east,
/obj/machinery/light/directional/east,
/obj/machinery/vending/access/command,
-/turf/open/floor/wood,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/command/meeting_room)
"fCG" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 6
},
-/turf/open/floor/iron/dark,
+/turf/open/floor/iron/dark/textured,
/area/station/ai_monitored/command/nuke_storage)
+"fCL" = (
+/obj/machinery/door/airlock/external{
+ name = "Port Docking Bay 3"
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 5
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer4,
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+ dir = 8
+ },
+/turf/open/floor/iron/smooth_edge,
+/area/station/hallway/secondary/entry)
"fCR" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 4
},
/obj/effect/landmark/start/hangover,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 6
+ },
/turf/open/floor/carpet,
/area/station/service/chapel)
+"fDg" = (
+/obj/structure/table,
+/obj/item/paper_bin{
+ pixel_y = 3
+ },
+/obj/item/pen{
+ pixel_y = 3
+ },
+/turf/open/floor/iron/large,
+/area/station/hallway/secondary/entry)
"fDD" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/trash_pile,
@@ -37743,19 +43531,44 @@
dir = 4
},
/area/station/hallway/primary/central/fore)
+"fEx" = (
+/turf/open/floor/iron/large,
+/area/station/cargo/miningdock)
"fEF" = (
/obj/structure/table,
/turf/open/floor/iron/cafeteria,
/area/station/security/prison)
"fEM" = (
/obj/effect/decal/cleanable/dirt,
-/obj/structure/trash_pile,
+/obj/machinery/atmospherics/components/binary/pump/on/layer4{
+ dir = 8;
+ name = "Airlock Pump";
+ hide = 1;
+ target_pressure = 300
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 4
+ },
/turf/open/floor/plating,
/area/station/maintenance/starboard/aft)
"fES" = (
/obj/machinery/firealarm/directional/east,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/brown/arrow_cw{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/brown/mid_joiner{
+ dir = 4
+ },
+/turf/open/floor/iron/edge{
+ dir = 4
+ },
/area/station/hallway/primary/central)
+"fFt" = (
+/obj/effect/turf_decal/trimline/yellow/filled/line{
+ dir = 4
+ },
+/turf/open/floor/iron,
+/area/station/commons/storage/primary)
"fFw" = (
/mob/living/basic/bot/medbot,
/turf/open/floor/iron/dark,
@@ -37792,13 +43605,35 @@
"fGg" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron/white,
+/obj/machinery/holopad,
+/obj/structure/marker_beacon/cerulean,
+/obj/effect/turf_decal/weather/snow,
+/turf/open/floor/iron/dark/textured_large,
/area/station/medical/cryo)
"fGm" = (
/obj/structure/closet/firecloset,
/obj/effect/mapping_helpers/burnt_floor,
/turf/open/floor/plating,
/area/station/maintenance/starboard/aft)
+"fGo" = (
+/obj/structure/window/reinforced/spawner/directional/east,
+/obj/structure/closet/crate/engineering,
+/obj/item/gps/engineering,
+/obj/item/gps/engineering,
+/obj/item/clothing/head/beret/engi,
+/obj/item/clothing/head/beret/engi,
+/obj/item/clothing/head/beret/atmos,
+/obj/item/clothing/head/beret/atmos,
+/obj/item/clothing/head/utility/hardhat/red,
+/obj/item/clothing/head/utility/hardhat/red,
+/obj/item/clothing/head/utility/hardhat/orange,
+/obj/item/clothing/head/utility/hardhat/orange,
+/obj/item/clothing/head/utility/hardhat,
+/obj/item/clothing/head/utility/hardhat,
+/obj/item/clothing/head/playbunnyears/engineer,
+/obj/item/clothing/head/playbunnyears/engineer,
+/turf/open/floor/plating,
+/area/station/maintenance/aft)
"fGw" = (
/turf/open/floor/iron/dark/side{
dir = 9
@@ -37815,25 +43650,40 @@
/obj/effect/turf_decal/bot,
/obj/structure/closet/crate,
/obj/effect/spawner/random/maintenance/three,
-/obj/effect/landmark/start/hangover/closet,
-/turf/open/floor/iron,
+/obj/structure/marker_beacon/bronze,
+/turf/open/floor/iron/large,
/area/station/cargo/storage)
+"fGQ" = (
+/obj/structure/fans/tiny/forcefield{
+ dir = 4
+ },
+/turf/open/floor/plating,
+/area/station/hallway/secondary/entry)
"fHt" = (
/obj/effect/decal/cleanable/dirt,
/obj/item/wallframe/barsign/all_access,
/turf/open/floor/plating,
/area/station/maintenance/port/aft)
+"fHx" = (
+/obj/effect/turf_decal/tile/dark_red/anticorner,
+/turf/open/floor/iron/dark/smooth_corner{
+ dir = 1
+ },
+/area/station/ai_monitored/turret_protected/ai_upload)
"fHC" = (
/obj/machinery/button/door/directional/south{
id = "gatewayshutters";
req_access = list("gateway");
name = "Gateway Shutters"
},
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
/obj/item/kirbyplants/random,
-/turf/open/floor/iron/dark/textured,
+/obj/effect/turf_decal/siding/wideplating_new/dark/corner{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/wideplating_new/dark{
+ dir = 6
+ },
+/turf/open/floor/iron/textured_large,
/area/station/command/gateway)
"fHI" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
@@ -37888,7 +43738,7 @@
/area/station/hallway/primary/fore)
"fKr" = (
/obj/effect/landmark/start/hangover,
-/turf/open/floor/iron,
+/turf/open/floor/iron/large,
/area/station/cargo/office)
"fKu" = (
/obj/machinery/door/firedoor,
@@ -37906,6 +43756,7 @@
/obj/effect/turf_decal/tile/red/opposingcorners,
/obj/machinery/newscaster/directional/west,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/cable,
/turf/open/floor/iron,
/area/station/commons/fitness/recreation)
"fKL" = (
@@ -37926,7 +43777,11 @@
name = "Containment Cell";
req_access = list("xenobiology")
},
-/turf/open/floor/engine,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/structure/cable,
+/turf/open/floor/catwalk_floor/iron_dark,
/area/station/science/xenobiology)
"fLp" = (
/obj/structure/table,
@@ -37969,6 +43824,7 @@
req_access = list("medical");
red_alert_access = 1
},
+/obj/effect/mapping_helpers/airlock/red_alert_access,
/turf/open/floor/iron/dark,
/area/station/medical/storage)
"fMt" = (
@@ -37981,12 +43837,16 @@
/turf/open/floor/iron/dark,
/area/station/security/warden)
"fMP" = (
-/obj/structure/extinguisher_cabinet{
- pixel_x = -5;
- pixel_y = 30
+/obj/effect/turf_decal/siding/wood/corner{
+ dir = 4
},
-/turf/closed/wall,
-/area/station/medical/medbay/central)
+/obj/machinery/door/firedoor,
+/obj/effect/turf_decal/trimline/neutral/corner{
+ dir = 4;
+ alpha = 100
+ },
+/turf/open/floor/iron/large,
+/area/station/hallway/primary/starboard)
"fMX" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/structure/curtain/bounty/start_closed,
@@ -38063,7 +43923,16 @@
/turf/open/floor/iron,
/area/station/security/execution/transfer)
"fOT" = (
-/obj/machinery/light/small/directional/east,
+/obj/effect/turf_decal/siding/dark{
+ dir = 4
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 10
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 8
+ },
+/obj/machinery/light/directional/east,
/turf/open/floor/engine,
/area/station/science/xenobiology)
"fPh" = (
@@ -38094,6 +43963,7 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer5,
/turf/open/floor/iron/dark,
/area/station/security/office)
"fPT" = (
@@ -38101,6 +43971,9 @@
/obj/effect/turf_decal/trimline/dark_blue/filled/line{
dir = 8
},
+/obj/effect/turf_decal/trimline/dark/line{
+ dir = 8
+ },
/turf/open/floor/iron/dark,
/area/station/security/execution/transfer)
"fPV" = (
@@ -38147,10 +44020,34 @@
/obj/structure/light_construct/directional/west,
/turf/open/floor/plating,
/area/station/maintenance/port/aft)
+"fRa" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/landmark/firealarm_sanity,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/iron,
+/area/station/security/prison)
"fRc" = (
+/obj/effect/turf_decal/trimline/brown/filled/warning{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/brown/filled/line,
/obj/item/radio/intercom/directional/south,
/turf/open/floor/iron,
/area/station/cargo/storage)
+"fRp" = (
+/obj/effect/mapping_helpers/airlock/abandoned,
+/obj/machinery/door/airlock/security{
+ name = "Abandoned Armory"
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 6
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/turf/open/floor/plating,
+/area/station/maintenance/port/aft)
"fRv" = (
/obj/structure/cable,
/obj/structure/disposalpipe/segment{
@@ -38165,10 +44062,6 @@
/turf/open/floor/plating,
/area/station/maintenance/starboard/aft)
"fRE" = (
-/obj/structure/fence/door{
- dir = 4;
- name = "Prison Cell"
- },
/obj/machinery/door/poddoor/shutters/preopen{
id = "briggate";
name = "Security Shutters"
@@ -38182,10 +44075,13 @@
/obj/structure/filingcabinet/filingcabinet,
/obj/machinery/power/apc/auto_name/directional/south,
/obj/structure/cable,
-/turf/open/floor/iron,
+/turf/open/floor/iron/dark/textured_large,
/area/station/cargo/sorting)
"fSy" = (
/obj/effect/landmark/blobstart,
+/obj/effect/turf_decal/siding/dark{
+ dir = 9
+ },
/turf/open/floor/plating,
/area/station/maintenance/starboard/aft)
"fSH" = (
@@ -38196,6 +44092,9 @@
/obj/effect/turf_decal/trimline/dark_blue/filled/line{
dir = 5
},
+/obj/effect/turf_decal/trimline/dark/line{
+ dir = 5
+ },
/turf/open/floor/iron/dark,
/area/station/security/execution/transfer)
"fSN" = (
@@ -38214,6 +44113,14 @@
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/station/security/brig)
+"fTs" = (
+/obj/structure/chair/wood{
+ dir = 8
+ },
+/obj/effect/landmark/start/assistant,
+/obj/structure/window/reinforced/spawner/directional/north,
+/turf/open/floor/carpet,
+/area/station/hallway/secondary/entry)
"fTS" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 4
@@ -38224,30 +44131,14 @@
/turf/open/floor/wood/parquet,
/area/station/service/bar)
"fUa" = (
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
- dir = 1
- },
-/obj/machinery/door/airlock/external{
- name = "Port Docking Bay 1"
- },
-/obj/effect/landmark/navigate_destination,
-/turf/open/floor/plating,
+/turf/open/floor/iron/large,
/area/station/hallway/secondary/entry)
"fUn" = (
-/obj/effect/turf_decal/trimline/blue/filled/line{
- dir = 4
- },
/obj/machinery/camera/directional/east{
c_tag = "Medbay East";
network = list("ss13","medbay");
pixel_y = -22
},
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
- dir = 10
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
- dir = 9
- },
/obj/structure/table/glass,
/obj/item/pinpointer/crew{
pixel_x = 5;
@@ -38257,22 +44148,43 @@
pixel_x = -5;
pixel_y = 6
},
-/turf/open/floor/iron/white,
-/area/station/medical/medbay/aft)
+/turf/open/floor/iron/dark/smooth_large,
+/area/station/medical/medbay/central)
"fUQ" = (
/obj/machinery/portable_atmospherics/canister/oxygen,
/obj/effect/turf_decal/bot,
-/turf/open/floor/iron/dark,
+/obj/structure/railing{
+ dir = 4
+ },
+/obj/structure/railing{
+ dir = 8
+ },
+/turf/open/floor/iron/dark/smooth_large,
/area/station/ai_monitored/command/storage/eva)
"fVk" = (
-/obj/effect/turf_decal/trimline/blue/filled/line{
- dir = 1
- },
-/obj/machinery/firealarm/directional/north,
/obj/structure/disposalpipe/segment{
dir = 4
},
-/turf/open/floor/iron/white,
+/obj/machinery/firealarm/directional/north,
+/obj/effect/turf_decal/trimline/blue/filled/line{
+ alpha = 160;
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/white/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/blue/filled/mid_joiner{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/blue/filled/mid_joiner{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/white/mid_joiner{
+ dir = 1
+ },
+/turf/open/floor/iron/white/smooth_edge{
+ dir = 1
+ },
/area/station/medical/medbay/central)
"fVx" = (
/obj/structure/closet/secure_closet/personal{
@@ -38307,33 +44219,45 @@
/turf/open/floor/plating,
/area/station/hallway/secondary/entry)
"fWo" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/door/airlock/maintenance{
name = "Teleporter Maintenance"
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 1
},
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/effect/mapping_helpers/airlock/access/any/command/teleporter,
-/turf/open/floor/plating,
+/turf/open/floor/iron/dark/textured_large,
/area/station/maintenance/central/lesser)
"fWA" = (
/obj/structure/chair/office{
dir = 8
},
/obj/effect/landmark/start/cargo_technician,
-/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/trimline/brown/filled/line{
+ dir = 10
+ },
/turf/open/floor/iron,
/area/station/cargo/office)
+"fWK" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 6
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 6
+ },
+/turf/open/floor/plating,
+/area/station/maintenance/port/aft)
"fXd" = (
/obj/machinery/atmospherics/components/unary/portables_connector/visible{
dir = 8
},
/obj/machinery/light/directional/north,
/turf/open/floor/iron,
-/area/station/science/ordnance/bomb)
+/area/station/science/ordnance/testlab)
"fXe" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -38354,14 +44278,22 @@
/turf/open/floor/wood,
/area/station/command/heads_quarters/blueshield)
"fYd" = (
-/obj/effect/turf_decal/tile/yellow{
- dir = 8
+/obj/effect/turf_decal/siding/corner,
+/obj/effect/turf_decal/trimline/yellow/filled/warning{
+ alpha = 200;
+ dir = 9
},
-/obj/effect/turf_decal/tile/yellow{
- dir = 1
+/obj/effect/turf_decal/trimline/white/warning{
+ dir = 9;
+ alpha = 200
},
-/turf/open/floor/iron/white,
+/turf/open/floor/iron/white/smooth_corner,
/area/station/medical/medbay/lobby)
+"fYp" = (
+/obj/effect/mapping_helpers/broken_floor,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
+/turf/open/floor/plating,
+/area/station/maintenance/port/fore)
"fYu" = (
/obj/effect/turf_decal/trimline/green/filled/line{
dir = 5
@@ -38369,23 +44301,45 @@
/obj/machinery/firealarm/directional/north,
/turf/open/floor/iron/white,
/area/station/medical/virology)
+"fYC" = (
+/obj/structure/table/wood,
+/obj/item/reagent_containers/cup/glass/mug/britcup{
+ pixel_y = 6
+ },
+/obj/item/reagent_containers/cup/glass/mug/nanotrasen{
+ pixel_y = 2;
+ pixel_x = 9
+ },
+/obj/item/storage/dice{
+ pixel_x = -9;
+ pixel_y = 0
+ },
+/obj/structure/window/reinforced/spawner/directional/north,
+/turf/open/floor/carpet,
+/area/station/hallway/secondary/entry)
"fYH" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 1
},
/obj/machinery/light/directional/south,
+/obj/machinery/firealarm/directional/south,
/turf/open/floor/wood/parquet,
/area/station/command/heads_quarters/nt_rep)
"fYZ" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
+/obj/effect/turf_decal/trimline/dark/filled/line,
+/obj/effect/decal/cleanable/dirt,
/obj/effect/mapping_helpers/dead_body_placer,
-/turf/open/floor/iron/dark,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 8
+ },
+/turf/open/floor/iron/dark/small,
/area/station/medical/morgue)
"fZk" = (
/obj/structure/table,
/obj/item/storage/toolbox/drone,
/obj/machinery/airalarm/directional/east,
/obj/machinery/light/directional/north,
+/obj/machinery/firealarm/directional/north,
/turf/open/floor/iron/dark,
/area/station/security/warden)
"fZs" = (
@@ -38397,6 +44351,13 @@
},
/turf/open/floor/plating,
/area/station/hallway/primary/fore)
+"fZt" = (
+/obj/effect/turf_decal/siding/dark{
+ dir = 2;
+ icon_state = "siding_plain_end"
+ },
+/turf/open/floor/circuit/red,
+/area/station/ai_monitored/turret_protected/ai_upload)
"fZT" = (
/obj/effect/turf_decal/stripes/red/line{
dir = 4
@@ -38404,35 +44365,41 @@
/turf/open/floor/engine,
/area/station/science/explab)
"gah" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
- dir = 4
- },
/obj/structure/tank_dispenser/oxygen,
-/turf/open/floor/iron/dark,
+/obj/effect/turf_decal/tile/dark/full,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/ai_monitored/command/storage/eva)
"gaj" = (
/obj/structure/cable,
/turf/closed/wall,
/area/station/commons/dorms/apartment2)
-"gbd" = (
-/obj/effect/turf_decal/tile/blue{
+"gbb" = (
+/obj/effect/turf_decal/trimline/blue/mid_joiner,
+/obj/effect/turf_decal/trimline/blue/arrow_ccw,
+/obj/machinery/firealarm/directional/south,
+/turf/open/floor/iron/textured_corner{
dir = 4
},
-/obj/item/radio/intercom/directional/north,
-/turf/open/floor/iron/white/corner{
- dir = 1
- },
-/area/station/hallway/secondary/entry)
-"gby" = (
-/obj/machinery/light/directional/north,
-/turf/open/floor/iron,
-/area/station/cargo/office)
-"gbF" = (
-/obj/structure/sign/warning/docking/directional/east,
+/area/station/hallway/primary/starboard)
+"gbd" = (
+/obj/structure/window/reinforced/spawner/directional/south,
/obj/structure/lattice,
+/obj/item/reagent_containers/cup/glass/bottle/beer{
+ pixel_x = 12;
+ pixel_y = 6
+ },
/turf/open/space/basic,
/area/space/nearstation)
+"gby" = (
+/obj/effect/turf_decal/trimline/brown/filled/line{
+ dir = 1
+ },
+/obj/machinery/camera/autoname/directional/north{
+ network = list("ss13","cargo");
+ c_tag = "Cargo Lobby"
+ },
+/turf/open/floor/iron/textured_edge,
+/area/station/cargo/office)
"gbL" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -38458,28 +44425,34 @@
/turf/open/floor/wood,
/area/station/maintenance/abandon_cafeteria)
"gbS" = (
-/obj/effect/turf_decal/delivery,
-/obj/machinery/door/window/left/directional/east{
- req_access = list("xenobiology");
- name = "Containment Cell"
- },
-/turf/open/floor/iron,
-/area/station/science/xenobiology)
+/turf/open/floor/grass,
+/area/station/science/cytology)
"gbT" = (
/obj/effect/spawner/random/engineering/atmospherics_portable,
/obj/structure/disposalpipe/segment,
/turf/open/floor/plating,
/area/station/maintenance/department/medical/morgue)
"gbV" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
- dir = 4
+/obj/structure/railing{
+ dir = 9
},
-/turf/open/floor/iron,
+/obj/machinery/computer/nanite_chamber_control,
+/obj/effect/turf_decal/siding/dark{
+ dir = 9
+ },
+/obj/structure/railing{
+ dir = 9
+ },
+/turf/open/floor/iron/white,
/area/station/science/explab)
-"gcm" = (
-/obj/machinery/firealarm/directional/south,
-/turf/open/floor/iron,
-/area/station/hallway/primary/central)
+"gcE" = (
+/obj/structure/reagent_dispensers/water_cooler,
+/obj/effect/turf_decal/trimline/blue/filled/line{
+ dir = 1
+ },
+/obj/machinery/status_display/evac/directional/north,
+/turf/open/floor/iron/edge,
+/area/station/hallway/secondary/entry)
"gcG" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -38504,8 +44477,15 @@
"gcO" = (
/obj/structure/sign/flag/nanotrasen/directional/west,
/obj/machinery/light/directional/west,
-/turf/open/floor/iron/dark,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/hallway/primary/central)
+"gcU" = (
+/obj/machinery/airalarm/directional/north,
+/obj/effect/turf_decal/trimline/blue/filled/line{
+ dir = 1
+ },
+/turf/open/floor/iron,
+/area/station/hallway/secondary/entry)
"gdg" = (
/obj/structure/sink/directional/south,
/obj/effect/decal/cleanable/dirt,
@@ -38540,8 +44520,14 @@
dir = 9
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer5,
/turf/open/floor/plating,
/area/station/maintenance/aft)
+"geg" = (
+/obj/effect/turf_decal/trimline/yellow/arrow_ccw,
+/obj/effect/turf_decal/trimline/yellow/mid_joiner,
+/turf/open/floor/iron/edge,
+/area/station/hallway/primary/central)
"geo" = (
/obj/structure/window/reinforced/tinted/spawner/directional/north{
pixel_y = -12
@@ -38569,13 +44555,16 @@
/turf/open/floor/plating,
/area/station/security/execution/education)
"gfa" = (
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
- dir = 1
+/obj/effect/turf_decal/stripes/line,
+/obj/effect/turf_decal/trimline/blue/filled/corner{
+ dir = 8
},
-/obj/machinery/door/airlock/external{
- name = "Port Docking Bay 1"
+/obj/effect/turf_decal/stripes/white/line,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 5
},
-/turf/open/floor/plating,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer4,
+/turf/open/floor/iron/small,
/area/station/hallway/secondary/entry)
"gfw" = (
/obj/effect/landmark/start/hangover/closet,
@@ -38588,10 +44577,10 @@
codes_txt = "patrol;next_patrol=Lockers";
location = "EVA"
},
+/obj/structure/cable,
/obj/effect/turf_decal/plaque{
icon_state = "L6"
},
-/obj/structure/cable,
/turf/open/floor/iron,
/area/station/hallway/primary/central)
"ggc" = (
@@ -38642,49 +44631,55 @@
},
/turf/open/floor/wood,
/area/station/service/library)
+"ghF" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+ dir = 4
+ },
+/turf/open/floor/iron/dark,
+/area/station/maintenance/port/aft)
"ghJ" = (
-/obj/effect/turf_decal/tile/brown/half/contrasted{
+/obj/effect/turf_decal/trimline/brown/filled/line{
dir = 8
},
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+/obj/effect/turf_decal/trimline/dark/line{
dir = 8
},
+/obj/structure/sign/warning/no_smoking/directional/west,
/turf/open/floor/iron,
/area/station/cargo/warehouse)
"gia" = (
-/obj/effect/turf_decal/bot_white/right,
/obj/machinery/ore_silo,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/turf/open/floor/iron/dark,
+/obj/effect/turf_decal/box/blue,
+/obj/effect/turf_decal/bot_blue,
+/turf/open/floor/iron/dark/textured_large,
/area/station/ai_monitored/command/nuke_storage)
"giq" = (
/obj/structure/table,
-/obj/effect/turf_decal/tile/red{
- dir = 8
- },
-/obj/effect/turf_decal/tile/red,
-/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/delivery/blue,
/obj/item/paper_bin{
pixel_y = 5
},
/obj/item/pen{
pixel_y = 5
},
-/turf/open/floor/iron/dark,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/security/checkpoint/escape)
-"giD" = (
-/obj/effect/landmark/navigate_destination,
-/obj/machinery/door/airlock/external{
- name = "Port Docking Bay 3"
+"gix" = (
+/obj/machinery/vending/cola/pwr_game{
+ premium = list(/obj/item/reagent_containers/cup/glass/drinkingglass/filled/nuka_cola = 1, /obj/item/reagent_containers/cup/soda_cans/air = 1, /obj/item/reagent_containers/cup/soda_cans/monkey_energy = 1, /obj/item/reagent_containers/cup/soda_cans/grey_bull = 1, /obj/item/reagent_containers/cup/glass/bottle/rootbeer = 1, /obj/item/reagent_containers/applicator/pill/maintenance/achievement = 5)
},
-/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{
- cycle_id = "dock3"
- },
-/obj/effect/mapping_helpers/airlock/unres{
- dir = 8
+/obj/effect/turf_decal/bot_white{
+ color = "#0aceff"
},
/turf/open/floor/plating,
+/area/station/maintenance/starboard/aft)
+"giD" = (
+/obj/structure/window/reinforced/spawner/directional/north,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 5
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer4,
+/turf/open/floor/iron/smooth_edge,
/area/station/hallway/secondary/entry)
"giT" = (
/obj/effect/turf_decal/tile/blue{
@@ -38709,18 +44704,20 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
/area/station/security/execution/transfer)
+"gkh" = (
+/obj/machinery/atmospherics/components/binary/valve{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer4,
+/turf/open/floor/plating,
+/area/station/maintenance/port/fore)
"gkk" = (
/obj/effect/turf_decal/trimline/purple/filled/line{
+ alpha = 160;
+ color = "#6a3182";
dir = 4
},
-/obj/effect/turf_decal/trimline/yellow/warning{
- dir = 4
- },
-/obj/effect/turf_decal/trimline/brown/warning{
- dir = 4
- },
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron/dark,
+/turf/open/floor/iron/dark/small,
/area/station/maintenance/port/aft)
"gkC" = (
/obj/structure/closet/l3closet/virology,
@@ -38747,6 +44744,17 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/white,
/area/station/science/ordnance)
+"glv" = (
+/obj/docking_port/stationary{
+ dir = 8;
+ dwidth = 1;
+ height = 13;
+ shuttle_id = "arrivals_stationary";
+ name = "arrivals";
+ width = 5
+ },
+/turf/open/floor/tram/tram_platform,
+/area/station/hallway/secondary/entry)
"glM" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
/obj/machinery/light/directional/west,
@@ -38765,24 +44773,55 @@
/obj/effect/mapping_helpers/broken_floor,
/turf/open/floor/wood,
/area/station/maintenance/abandon_cafeteria)
+"gmO" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/turf_decal/stripes{
+ dir = 4
+ },
+/obj/effect/turf_decal/stripes/blue/line{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/dark_blue/filled/line,
+/obj/effect/turf_decal/trimline/dark_blue/filled/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/wideplating_new/dark/corner{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/wideplating_new/dark/corner,
+/obj/effect/turf_decal/siding/dark,
+/turf/open/floor/iron/dark/small,
+/area/station/security/checkpoint/escape)
+"gmT" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/components/unary/airlock_pump/unbolt_only,
+/turf/open/floor/plating,
+/area/station/maintenance/solars/starboard/fore)
"gnd" = (
/obj/structure/cable,
/obj/machinery/power/apc/auto_name/directional/north,
/turf/open/floor/iron/smooth_large,
/area/station/engineering/gravity_generator)
"gnf" = (
-/obj/effect/turf_decal/tile/red{
- dir = 8
- },
/obj/machinery/light/directional/west,
+/obj/effect/turf_decal/trimline/dark_blue/filled/corner,
/turf/open/floor/iron/dark,
/area/station/hallway/primary/fore)
-"goi" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 8
+"gnR" = (
+/obj/machinery/firealarm/directional/north,
+/obj/effect/turf_decal/trimline/blue/filled/line{
+ dir = 1
},
+/turf/open/floor/iron,
+/area/station/hallway/secondary/entry)
+"goi" = (
/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron/dark/textured,
+/obj/structure/closet/secure_closet/exile,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/command/gateway)
"gou" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
@@ -38792,7 +44831,23 @@
dir = 4
},
/obj/structure/cable,
-/turf/open/floor/iron/dark/textured,
+/obj/effect/turf_decal/siding/wideplating_new/dark{
+ dir = 8
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/obj/effect/turf_decal/stripes/white/line{
+ color = "#52B4E9";
+ dir = 4;
+ name = "blue line"
+ },
+/obj/effect/turf_decal/siding/wideplating_new/dark/corner,
+/obj/effect/turf_decal/siding/wideplating_new/dark/corner{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/iron/textured_large,
/area/station/command/gateway)
"goN" = (
/obj/structure/disposalpipe/segment,
@@ -38831,10 +44886,10 @@
/turf/open/floor/grass,
/area/station/science/cytology)
"gpz" = (
-/obj/structure/table/reinforced,
/obj/structure/disposalpipe/segment{
dir = 4
},
+/obj/structure/table/reinforced,
/obj/machinery/flasher{
id = "hopflash";
pixel_y = 28
@@ -38852,8 +44907,17 @@
},
/turf/open/floor/iron,
/area/station/command/heads_quarters/hop)
+"gpC" = (
+/obj/effect/mapping_helpers/broken_floor,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+ dir = 8
+ },
+/turf/open/floor/wood,
+/area/station/maintenance/aft)
"gpE" = (
-/obj/machinery/atmospherics/components/tank/air,
+/obj/machinery/atmospherics/components/tank/air{
+ dir = 8
+ },
/turf/open/floor/plating,
/area/station/maintenance/fore)
"gpL" = (
@@ -38873,6 +44937,18 @@
},
/turf/open/floor/iron,
/area/station/science/explab)
+"gqf" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer4,
+/obj/effect/turf_decal/stripes/blue/line{
+ dir = 4
+ },
+/turf/open/floor/iron/dark/side{
+ dir = 8
+ },
+/area/station/hallway/secondary/exit)
"gqg" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
@@ -38882,6 +44958,37 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/service/janitor)
+"gqw" = (
+/obj/machinery/door/airlock/maintenance{
+ name = "EVA Maintenance"
+ },
+/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance,
+/obj/effect/mapping_helpers/airlock/unres{
+ dir = 8
+ },
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 4
+ },
+/turf/open/floor/plating,
+/area/station/maintenance/fore)
+"grw" = (
+/obj/structure/disposalpipe/segment,
+/obj/effect/turf_decal/trimline/blue/line{
+ alpha = 200;
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/blue/mid_joiner{
+ alpha = 200;
+ dir = 8
+ },
+/turf/open/floor/iron/edge{
+ dir = 8
+ },
+/area/station/hallway/primary/central)
"grP" = (
/obj/machinery/camera/directional/north{
c_tag = "Server Room";
@@ -38934,8 +45041,37 @@
/obj/effect/turf_decal/stripes/line{
dir = 8
},
+/obj/structure/cable,
/turf/open/floor/plating,
/area/station/maintenance/aft)
+"gsy" = (
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/public/glass{
+ name = "Central Access"
+ },
+/obj/effect/turf_decal/trimline/brown/warning{
+ dir = 1
+ },
+/turf/open/floor/iron/large,
+/area/station/hallway/primary/starboard)
+"gtt" = (
+/obj/effect/turf_decal/siding/dark{
+ dir = 10
+ },
+/obj/effect/turf_decal/siding/dark/corner{
+ dir = 4
+ },
+/obj/machinery/camera/directional/west{
+ c_tag = "Xenobiology Cell 1-2";
+ network = list("ss13","xeno")
+ },
+/turf/open/floor/engine,
+/area/station/science/xenobiology)
+"gtC" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron/dark,
+/area/station/security/checkpoint/escape)
"gtL" = (
/obj/effect/spawner/random/maintenance,
/obj/structure/rack,
@@ -38956,9 +45092,9 @@
/turf/open/floor/iron/dark,
/area/station/security/warden)
"guz" = (
-/obj/structure/dresser,
/obj/structure/sign/poster/official/nanotrasen_logo/directional/north,
-/turf/open/floor/carpet/blue,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
+/turf/open/floor/carpet/royalblue,
/area/station/command/heads_quarters/captain)
"guI" = (
/obj/structure/cable,
@@ -38969,12 +45105,39 @@
dir = 1
},
/obj/machinery/computer/gateway_control,
-/turf/open/floor/iron/dark/textured,
+/turf/open/floor/iron/dark/textured_large,
/area/station/command/gateway)
"gvi" = (
/obj/structure/railing/corner,
-/turf/open/floor/iron/dark/textured,
+/obj/effect/turf_decal/siding/wideplating_new/dark/corner,
+/obj/effect/turf_decal/siding/wideplating_new/dark{
+ dir = 9
+ },
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/iron/textured_large,
/area/station/command/gateway)
+"gvk" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/obj/structure/cable,
+/turf/open/floor/iron/edge{
+ dir = 8
+ },
+/area/station/hallway/primary/starboard)
+"gvr" = (
+/obj/effect/landmark/start/hangover,
+/obj/effect/turf_decal/trimline/green/corner{
+ dir = 4
+ },
+/turf/open/floor/iron/edge{
+ dir = 1
+ },
+/area/station/hallway/primary/central)
"gvU" = (
/obj/structure/bed,
/obj/effect/spawner/random/bedsheet/any,
@@ -38985,9 +45148,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 4
},
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
- dir = 4
- },
/obj/structure/cable,
/obj/structure/disposalpipe/segment{
dir = 4
@@ -38995,6 +45155,7 @@
/obj/effect/turf_decal/tile/red{
dir = 8
},
+/obj/machinery/vending/wallmed/directional/south,
/turf/open/floor/iron/dark,
/area/station/hallway/secondary/exit)
"gwq" = (
@@ -39005,6 +45166,15 @@
},
/turf/open/floor/iron,
/area/station/science/explab)
+"gwy" = (
+/obj/structure/chair/stool/directional/west{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/wood{
+ dir = 8
+ },
+/turf/open/floor/wood,
+/area/station/security/prison)
"gwD" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 1
@@ -39012,7 +45182,6 @@
/turf/open/floor/carpet,
/area/station/service/chapel)
"gwO" = (
-/obj/effect/turf_decal/stripes/line,
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 10
@@ -39021,7 +45190,19 @@
/obj/structure/disposalpipe/segment{
dir = 5
},
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/trimline/dark/filled/line{
+ alpha = 160
+ },
+/obj/effect/turf_decal/trimline/purple/line{
+ color = "#700047";
+ alpha = 200
+ },
+/obj/effect/turf_decal/siding/dark,
+/obj/effect/turf_decal/trimline/dark/filled/mid_joiner{
+ dir = 2;
+ alpha = 160
+ },
+/turf/open/floor/iron/white/smooth_edge,
/area/station/science/lab)
"gwZ" = (
/obj/effect/turf_decal/tile/yellow{
@@ -39044,24 +45225,15 @@
/obj/machinery/hydroponics/constructable,
/obj/structure/window/spawner/directional/west,
/obj/machinery/door/window/left/directional/east,
-/obj/effect/turf_decal/siding/blue{
- dir = 1
- },
-/obj/effect/turf_decal/siding/blue{
- dir = 8
+/obj/effect/turf_decal/siding/wood{
+ dir = 9
},
/turf/open/floor/grass,
/area/station/security/prison)
"gxT" = (
-/obj/effect/turf_decal/tile/yellow{
- dir = 4
- },
-/obj/effect/turf_decal/tile/yellow{
- dir = 1
- },
/obj/structure/table,
/obj/item/clothing/mask/gas,
-/turf/open/floor/iron,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/hallway/primary/aft)
"gyr" = (
/obj/structure/cable,
@@ -39127,8 +45299,19 @@
/area/station/security/mechbay)
"gzV" = (
/obj/machinery/vending/coffee,
-/turf/open/floor/wood,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/command/meeting_room)
+"gAl" = (
+/obj/effect/turf_decal/trimline/blue/filled/corner,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 5
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer5,
+/turf/open/floor/iron/textured_corner,
+/area/station/hallway/secondary/entry)
"gAm" = (
/obj/machinery/computer/piratepad_control/civilian,
/turf/open/floor/iron,
@@ -39168,7 +45351,10 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 4
},
-/turf/open/floor/iron/dark,
+/obj/effect/turf_decal/siding/dark{
+ dir = 10
+ },
+/turf/open/floor/iron/textured_large,
/area/station/ai_monitored/command/storage/eva)
"gBO" = (
/obj/machinery/navbeacon{
@@ -39195,17 +45381,18 @@
/turf/open/floor/iron/dark,
/area/station/service/chapel)
"gDa" = (
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
/obj/effect/turf_decal/tile/yellow{
dir = 8
},
/obj/effect/turf_decal/tile/yellow{
dir = 1
},
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/tile/blue/half{
+ dir = 4
+ },
+/turf/open/floor/iron/white/smooth_edge{
+ dir = 4
+ },
/area/station/medical/chemistry)
"gDr" = (
/obj/structure/table/reinforced,
@@ -39240,6 +45427,9 @@
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/turf_decal/trimline/dark/corner{
+ dir = 8
+ },
/turf/open/floor/iron/dark,
/area/station/security/brig)
"gEc" = (
@@ -39249,29 +45439,53 @@
/obj/effect/turf_decal/trimline/dark_blue/filled/line{
dir = 6
},
+/obj/effect/turf_decal/trimline/dark/line{
+ dir = 6
+ },
/turf/open/floor/iron/dark,
/area/station/security/execution/transfer)
"gEp" = (
/turf/closed/wall/r_wall,
/area/station/maintenance/starboard)
+"gED" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 4
+ },
+/turf/open/floor/iron,
+/area/station/hallway/secondary/exit)
"gES" = (
/obj/effect/turf_decal/siding/wood,
/turf/open/floor/carpet/green,
/area/station/command/heads_quarters/nt_rep)
"gFs" = (
/obj/machinery/firealarm/directional/north,
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/trimline/dark/filled/line{
+ alpha = 160;
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/dark/filled/mid_joiner{
+ dir = 1;
+ alpha = 160
+ },
+/obj/effect/turf_decal/trimline/purple/line{
+ alpha = 200;
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 1
+ },
+/turf/open/floor/iron/white/smooth_edge{
+ dir = 1
+ },
/area/station/science/research)
"gFG" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/turf_decal/tile/red{
- dir = 1
- },
-/obj/effect/turf_decal/tile/red{
+/obj/structure/cable,
+/obj/effect/turf_decal/trimline/dark_blue/filled/warning{
dir = 8
},
-/obj/structure/cable,
/turf/open/floor/iron/dark/side{
dir = 8
},
@@ -39292,7 +45506,7 @@
name = "Lab Shutters";
id = "rnd2"
},
-/turf/open/floor/iron/checker,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/science/lab)
"gFS" = (
/obj/effect/turf_decal/tile/blue{
@@ -39347,6 +45561,19 @@
"gGz" = (
/turf/open/floor/iron/white,
/area/station/science/explab)
+"gGG" = (
+/obj/structure/window/reinforced/spawner/directional/north,
+/obj/structure/lattice,
+/turf/open/space/basic,
+/area/space/nearstation)
+"gGO" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+ dir = 4
+ },
+/turf/open/floor/iron/textured_edge{
+ dir = 8
+ },
+/area/station/cargo/storage)
"gGQ" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
@@ -39377,6 +45604,14 @@
/obj/effect/turf_decal/tile/neutral/opposingcorners,
/turf/open/floor/iron/dark,
/area/station/security/checkpoint/medical)
+"gHV" = (
+/obj/structure/table,
+/obj/item/clothing/head/cone{
+ pixel_x = 3
+ },
+/obj/effect/spawner/random/trash/crushed_can,
+/turf/open/floor/iron/dark,
+/area/station/maintenance/port/aft)
"gHZ" = (
/turf/open/floor/iron/dark/corner{
dir = 4
@@ -39389,20 +45624,12 @@
/turf/open/floor/iron,
/area/station/security/prison)
"gIB" = (
-/obj/structure/bed,
-/obj/item/bedsheet/medical,
-/obj/effect/turf_decal/tile/green{
- dir = 8
- },
-/obj/effect/turf_decal/tile/green{
- dir = 1
- },
-/obj/effect/turf_decal/tile/green{
- dir = 4
- },
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 1
},
+/obj/effect/turf_decal/trimline/green/filled/line{
+ dir = 9
+ },
/turf/open/floor/iron,
/area/station/medical/virology)
"gIC" = (
@@ -39425,24 +45652,37 @@
/turf/open/floor/iron/dark,
/area/station/command/heads_quarters/hos)
"gIV" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
- dir = 1
+/obj/effect/turf_decal/siding/dark{
+ dir = 4
},
-/turf/open/floor/iron/dark,
+/obj/effect/turf_decal/siding/dark{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/turf/open/floor/iron/textured_large,
/area/station/ai_monitored/command/storage/eva)
"gKk" = (
-/obj/effect/turf_decal/tile/yellow/anticorner/contrasted,
+/obj/effect/turf_decal/trimline/yellow/filled/line{
+ dir = 6
+ },
/turf/open/floor/iron/dark,
/area/station/engineering/atmos/hfr_room)
"gKq" = (
-/obj/effect/landmark/start/quartermaster,
/obj/structure/chair/office{
dir = 8
},
-/turf/open/floor/carpet/royalblack,
+/obj/machinery/computer/security/telescreen/cargo/directional/north,
+/obj/effect/landmark/start/quartermaster,
+/obj/item/coin/silver,
+/obj/effect/turf_decal/siding/dark{
+ dir = 9
+ },
+/obj/effect/turf_decal/siding/dark/corner,
+/turf/open/floor/carpet/red,
/area/station/command/heads_quarters/qm)
"gKt" = (
-/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 4
},
@@ -39450,7 +45690,31 @@
dir = 4
},
/obj/structure/cable,
+/obj/machinery/door/firedoor,
+/turf/open/floor/iron/large,
+/area/station/hallway/primary/central)
+"gKw" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/blue/filled/corner{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/blue/filled/corner,
/turf/open/floor/iron,
+/area/station/hallway/secondary/entry)
+"gKx" = (
+/obj/effect/turf_decal/trimline/blue/arrow_ccw{
+ dir = 1;
+ alpha = 200
+ },
+/obj/effect/turf_decal/trimline/blue/mid_joiner{
+ alpha = 200;
+ dir = 1
+ },
+/turf/open/floor/iron/edge{
+ dir = 1
+ },
/area/station/hallway/primary/central)
"gKI" = (
/obj/structure/fence,
@@ -39474,6 +45738,10 @@
/obj/effect/mapping_helpers/airlock/unres{
dir = 1
},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer4,
/turf/open/floor/plating,
/area/station/maintenance/port/fore)
"gLJ" = (
@@ -39485,10 +45753,6 @@
},
/turf/open/floor/iron/dark,
/area/station/ai_monitored/security/armory)
-"gLS" = (
-/obj/machinery/firealarm/directional/east,
-/turf/open/floor/iron/dark,
-/area/station/security/courtroom)
"gLY" = (
/obj/effect/mapping_helpers/burnt_floor,
/obj/structure/chair/comfy/brown{
@@ -39519,25 +45783,40 @@
/obj/effect/spawner/random/trash/crushed_can,
/turf/open/floor/plating,
/area/station/maintenance/port/aft)
+"gNV" = (
+/obj/structure/fluff/paper,
+/obj/structure/closet/crate/mail/preopen,
+/obj/item/mail,
+/obj/item/paper/pamphlet/gateway,
+/turf/open/floor/plating,
+/area/station/maintenance/port/aft)
+"gOH" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/structure/window/spawner/directional/west,
+/obj/structure/trash_pile,
+/turf/open/floor/plating,
+/area/station/maintenance/port/aft)
"gOV" = (
-/obj/structure/cable,
-/obj/machinery/power/apc/auto_name/directional/south,
/obj/structure/table/wood,
/obj/item/storage/toolbox/fishing,
/obj/item/fishing_rod,
/obj/effect/turf_decal/siding/wideplating_new{
dir = 8
},
-/obj/effect/turf_decal/tile/green{
- dir = 1
- },
/obj/effect/turf_decal/tile/green{
dir = 8
},
+/obj/effect/turf_decal/tile/green{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/green,
/turf/open/floor/iron,
/area/station/service/hydroponics/garden)
"gPR" = (
/obj/structure/table/glass,
+/obj/item/book/bible,
/obj/item/food/grown/poppy,
/obj/item/food/grown/harebell,
/turf/open/floor/iron/dark,
@@ -39572,6 +45851,18 @@
},
/turf/open/floor/iron/dark,
/area/station/security/checkpoint/supply)
+"gQP" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 9
+ },
+/obj/structure/cable,
+/obj/structure/disposalpipe/segment,
+/obj/structure/hedge,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 9
+ },
+/turf/open/floor/plating,
+/area/station/maintenance/port/aft)
"gQT" = (
/obj/structure/chair/office{
dir = 8
@@ -39582,11 +45873,11 @@
/turf/open/floor/iron,
/area/station/science/auxlab/firing_range)
"gRd" = (
+/obj/structure/cable,
+/obj/effect/landmark/start/hangover,
/obj/effect/turf_decal/plaque{
icon_state = "L12"
},
-/obj/structure/cable,
-/obj/effect/landmark/start/hangover,
/turf/open/floor/iron,
/area/station/hallway/primary/central)
"gRm" = (
@@ -39610,33 +45901,73 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/hallway/primary/port)
-"gRX" = (
-/obj/machinery/firealarm/directional/east,
-/turf/open/floor/iron/dark/small,
-/area/station/security/interrogation)
"gSC" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/public/glass{
name = "Central Access"
},
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/blue/warning,
+/turf/open/floor/iron/large,
/area/station/hallway/primary/starboard)
"gSY" = (
/obj/structure/cable,
/obj/effect/landmark/start/hangover,
-/turf/open/floor/iron,
+/turf/open/floor/iron/edge{
+ dir = 8
+ },
/area/station/hallway/primary/central)
"gTp" = (
/obj/machinery/power/apc/auto_name/directional/west,
/obj/structure/disposalpipe/segment,
/obj/structure/cable,
-/turf/open/floor/iron/white,
+/obj/item/borg/upgrade/rename{
+ pixel_y = 16;
+ pixel_x = 4
+ },
+/obj/item/assembly/prox_sensor{
+ pixel_x = -8;
+ pixel_y = 5
+ },
+/obj/item/assembly/prox_sensor{
+ pixel_x = -8;
+ pixel_y = 5
+ },
+/obj/item/assembly/prox_sensor{
+ pixel_x = -8;
+ pixel_y = 5
+ },
+/obj/item/assembly/prox_sensor{
+ pixel_x = -8;
+ pixel_y = 5
+ },
+/obj/item/crowbar{
+ pixel_x = 1;
+ pixel_y = 3
+ },
+/obj/item/reagent_containers/spray/cleaner{
+ pixel_x = 7;
+ pixel_y = 4
+ },
+/obj/structure/table/glass,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/science/robotics/lab)
"gTq" = (
/obj/structure/lattice/catwalk,
/obj/effect/spawner/random/structure/grille,
/turf/open/floor/plating/airless,
/area/space/nearstation)
+"gTy" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 6
+ },
+/turf/open/floor/wood,
+/area/station/security/prison)
+"gTA" = (
+/obj/machinery/atmospherics/pipe/layer_manifold/cyan/hidden{
+ dir = 8
+ },
+/turf/open/floor/iron,
+/area/station/cargo/storage)
"gTG" = (
/obj/machinery/status_display/ai{
pixel_y = -32
@@ -39646,6 +45977,14 @@
/obj/item/toy/talking/ai,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/turret_protected/aisat_interior)
+"gTS" = (
+/obj/effect/turf_decal/trimline/brown/line,
+/obj/effect/turf_decal/trimline/brown/mid_joiner,
+/obj/effect/landmark/start/hangover,
+/turf/open/floor/iron/corner{
+ dir = 4
+ },
+/area/station/hallway/primary/central)
"gUD" = (
/obj/effect/turf_decal/tile/neutral{
dir = 1
@@ -39665,6 +46004,8 @@
/turf/open/floor/grass,
/area/station/service/hydroponics/garden/abandoned)
"gUV" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/door/firedoor,
/obj/effect/turf_decal/tile/blue,
/obj/effect/turf_decal/tile/blue{
@@ -39679,8 +46020,6 @@
/obj/machinery/door/airlock/command{
name = "Chief Medical Officer's Quarters"
},
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/effect/mapping_helpers/airlock/access/any/medical/cmo,
/turf/open/floor/iron/dark,
/area/station/command/heads_quarters/cmo)
@@ -39696,6 +46035,13 @@
/obj/effect/spawner/random/food_or_drink/cake_ingredients,
/turf/open/floor/iron/kitchen,
/area/station/security/prison)
+"gVM" = (
+/obj/structure/chair/wood{
+ dir = 8
+ },
+/obj/effect/landmark/start/assistant,
+/turf/open/floor/carpet,
+/area/station/hallway/secondary/entry)
"gVV" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
dir = 1
@@ -39729,11 +46075,11 @@
/turf/open/floor/wood/tile,
/area/station/common/pool/sauna)
"gWT" = (
-/obj/machinery/light/directional/south,
/obj/structure/disposalpipe/segment{
dir = 9
},
-/turf/open/floor/iron,
+/obj/machinery/light/directional/south,
+/turf/open/floor/iron/edge,
/area/station/hallway/primary/port)
"gWZ" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
@@ -39749,6 +46095,10 @@
},
/obj/machinery/computer/security,
/obj/structure/cable,
+/obj/effect/turf_decal/trimline/dark_blue/line{
+ alpha = 200;
+ dir = 9
+ },
/turf/open/floor/iron/dark,
/area/station/security/office)
"gXy" = (
@@ -39762,13 +46112,61 @@
/obj/structure/cable,
/turf/open/floor/iron/white,
/area/station/science/research)
-"gYm" = (
-/obj/effect/turf_decal/tile/red,
-/obj/effect/turf_decal/tile/red{
+"gXA" = (
+/obj/structure/fluff/metalpole{
+ dir = 1;
+ pixel_y = 32
+ },
+/obj/machinery/door/firedoor/border_only{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes/white/line{
+ color = "#52B4E9";
+ dir = 1;
+ name = "blue line"
+ },
+/obj/structure/railing/corner/end/flip{
dir = 4
},
-/obj/effect/turf_decal/tile/neutral,
-/turf/open/floor/iron/dark,
+/obj/effect/turf_decal/tile/blue/fourcorners,
+/turf/open/floor/iron/white,
+/area/station/hallway/secondary/entry)
+"gXN" = (
+/obj/structure/disposalpipe/segment,
+/obj/effect/turf_decal/trimline/dark/filled/line{
+ alpha = 160;
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/purple/line{
+ alpha = 200;
+ dir = 1;
+ color = "#a56dc2"
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/dark/filled/mid_joiner{
+ dir = 1;
+ alpha = 160
+ },
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/iron/white,
+/area/station/science/xenobiology)
+"gYf" = (
+/obj/effect/landmark/start/hangover,
+/obj/structure/table,
+/turf/open/floor/iron,
+/area/station/commons/locker)
+"gYm" = (
+/obj/effect/turf_decal/siding/dark/end{
+ dir = 4
+ },
+/turf/open/floor/carpet/black,
/area/station/security/checkpoint/customs)
"gYQ" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
@@ -39788,7 +46186,11 @@
dir = 4
},
/obj/structure/cable,
-/turf/open/floor/iron,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/turf_decal/tile/neutral,
+/turf/open/floor/iron/dark/side{
+ dir = 10
+ },
/area/station/commons/locker)
"gZj" = (
/obj/effect/mapping_helpers/broken_floor,
@@ -39804,19 +46206,13 @@
/turf/open/floor/plating,
/area/station/hallway/primary/starboard)
"gZK" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/structure/window/reinforced/spawner/directional/north,
-/obj/effect/turf_decal/trimline/brown/filled/end{
- dir = 1
- },
/obj/machinery/modular_computer/preset/cargochat/medical{
dir = 8
},
/obj/machinery/light/directional/east,
-/turf/open/floor/iron,
-/area/station/medical/medbay/aft)
+/turf/open/floor/iron/dark/smooth_large,
+/area/station/medical/medbay/central)
"gZQ" = (
/obj/effect/turf_decal/tile/red/opposingcorners{
dir = 1
@@ -39847,6 +46243,26 @@
},
/turf/open/floor/iron/dark,
/area/station/engineering/gravity_generator)
+"hai" = (
+/obj/structure/disposalpipe/segment,
+/obj/effect/turf_decal/box/white{
+ color = "#a56dc2"
+ },
+/obj/effect/turf_decal/trimline/purple{
+ alpha = 255;
+ color = "#a56dc2"
+ },
+/obj/machinery/light/floor,
+/obj/structure/cable,
+/turf/open/floor/iron/white/smooth_large,
+/area/station/science/xenobiology)
+"hax" = (
+/obj/structure/window/reinforced/spawner/directional/east,
+/obj/structure/window/reinforced/spawner/directional/north,
+/obj/structure/window/reinforced/spawner/directional/south,
+/obj/structure/flora/rock/style_4,
+/turf/open/floor/fakebasalt,
+/area/station/hallway/secondary/entry)
"haT" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
@@ -39858,31 +46274,47 @@
/obj/structure/disposalpipe/segment{
dir = 10
},
+/obj/effect/landmark/firealarm_sanity,
/turf/open/floor/plating,
/area/station/maintenance/fore)
"hbk" = (
-/obj/effect/turf_decal/bot,
-/obj/structure/closet/crate,
/obj/effect/spawner/random/maintenance,
-/obj/item/clothing/head/helmet/space/plasmaman/cargo,
-/obj/item/clothing/under/plasmaman/cargo,
+/obj/effect/spawner/random/maintenance,
+/obj/structure/closet/crate/cargo,
+/obj/effect/turf_decal/bot,
/turf/open/floor/iron,
/area/station/cargo/warehouse)
"hbl" = (
+/obj/structure/cable,
/obj/effect/turf_decal/trimline/blue/filled/warning{
dir = 1
},
-/obj/structure/cable,
-/obj/effect/turf_decal/trimline/blue/filled/corner,
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/trimline/blue/filled/corner{
+ alpha = 160
+ },
+/obj/effect/turf_decal/trimline/white/warning{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/white/corner,
+/obj/effect/turf_decal/siding/blue/corner{
+ color = "#8ab4cb"
+ },
+/turf/open/floor/iron/white/smooth_edge{
+ dir = 1
+ },
/area/station/medical/treatment_center)
"hbT" = (
-/obj/effect/turf_decal/stripes/line,
/obj/machinery/requests_console/directional/east{
department = "Gateway";
name = "Gateway Requests Console"
},
-/turf/open/floor/iron/dark/textured,
+/obj/effect/turf_decal/siding/wideplating_new/dark/corner{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/wideplating_new/dark{
+ dir = 6
+ },
+/turf/open/floor/iron/textured_large,
/area/station/command/gateway)
"hci" = (
/obj/machinery/light/directional/south,
@@ -39891,14 +46323,28 @@
},
/turf/open/floor/wood,
/area/station/command/heads_quarters/rd)
+"hct" = (
+/obj/structure/disposalpipe/segment,
+/obj/effect/turf_decal/trimline/yellow/arrow_ccw{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/yellow/mid_joiner{
+ dir = 8
+ },
+/turf/open/floor/iron/edge{
+ dir = 8
+ },
+/area/station/hallway/primary/aft)
+"hcF" = (
+/obj/structure/sign/poster/random/directional/north,
+/obj/structure/chair/stool/bar/directional/west,
+/turf/open/floor/plating,
+/area/station/maintenance/port/aft)
"hcI" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 10
},
/obj/structure/cable,
-/obj/effect/turf_decal/stripes/corner{
- dir = 1
- },
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/effect/mapping_helpers/mail_sorting/science/rd_office,
/obj/structure/disposalpipe/sorting/mail{
@@ -39911,10 +46357,47 @@
/turf/open/floor/plating,
/area/station/hallway/primary/central/fore)
"hcS" = (
+/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/random/maintenance,
+/obj/item/stack/sheet/iron/ten{
+ pixel_x = 4;
+ pixel_y = 1
+ },
+/obj/effect/spawner/random/maintenance,
+/obj/item/stack/sheet/glass{
+ amount = 5;
+ pixel_x = -7;
+ pixel_y = 0
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/obj/structure/closet/crate/freezer/donk,
/obj/effect/turf_decal/bot,
-/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron,
/area/station/cargo/warehouse)
+"hcU" = (
+/obj/machinery/door/airlock/maintenance,
+/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance,
+/obj/machinery/door/firedoor,
+/obj/effect/mapping_helpers/airlock/unres,
+/turf/open/floor/iron/shuttle/exploration/hazard,
+/area/station/hallway/secondary/entry)
+"hda" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/obj/structure/cable,
+/turf/open/floor/iron/edge{
+ dir = 8
+ },
+/area/station/hallway/primary/central)
"hdl" = (
/obj/structure/table,
/turf/open/floor/iron/dark/small,
@@ -39922,13 +46405,31 @@
"hdH" = (
/turf/open/floor/carpet,
/area/station/service/chapel)
-"hec" = (
-/obj/effect/turf_decal/siding/wood{
- dir = 8
+"heb" = (
+/obj/machinery/light/directional/south,
+/obj/effect/turf_decal/trimline/yellow/filled/line{
+ dir = 2;
+ alpha = 120
},
+/obj/effect/turf_decal/trimline/blue/line{
+ alpha = 200
+ },
+/turf/open/floor/iron/white/smooth_edge,
+/area/station/medical/chemistry)
+"hec" = (
/obj/structure/displaycase/captain,
-/turf/open/floor/iron/dark,
+/turf/open/floor/iron/dark/textured_large,
/area/station/command/heads_quarters/captain)
+"hen" = (
+/obj/structure/fluff/metalpole{
+ dir = 1;
+ pixel_y = -39
+ },
+/obj/structure/window/reinforced/spawner/directional/south,
+/turf/open/floor/iron/smooth_edge{
+ dir = 1
+ },
+/area/station/hallway/secondary/entry)
"heL" = (
/obj/machinery/power/tracker,
/obj/structure/cable,
@@ -39967,7 +46468,7 @@
pixel_y = 6
},
/obj/effect/mapping_helpers/airlock/access/any/medical/general,
-/turf/open/floor/iron,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/medical/virology)
"hfa" = (
/obj/structure/drain/big,
@@ -39986,7 +46487,7 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/structure/cable,
/obj/structure/disposalpipe/segment,
-/turf/open/floor/iron/dark/textured,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/science/lab)
"hfv" = (
/obj/effect/spawner/structure/window/reinforced,
@@ -39997,6 +46498,7 @@
dir = 1
},
/obj/effect/turf_decal/trimline/dark_blue/filled/line,
+/obj/effect/turf_decal/trimline/dark/line,
/turf/open/floor/iron/dark,
/area/station/security/execution/transfer)
"hfz" = (
@@ -40007,18 +46509,19 @@
/obj/machinery/bouldertech/refinery/smelter,
/turf/open/floor/iron/dark/textured_large,
/area/station/cargo/miningdock)
+"hgd" = (
+/obj/effect/turf_decal/trimline/purple/corner,
+/turf/open/floor/iron/edge,
+/area/station/hallway/primary/starboard)
"hgj" = (
-/obj/effect/turf_decal/tile/dark_blue{
- dir = 1
+/obj/machinery/airalarm/directional/north,
+/obj/structure/table/glass,
+/obj/machinery/computer/records/medical/laptop,
+/obj/effect/turf_decal/trimline/red/real_red/filled/line{
+ dir = 9
},
-/obj/effect/turf_decal/tile/dark_blue{
- dir = 8
- },
-/obj/effect/turf_decal/tile/dark_blue{
- dir = 4
- },
-/obj/machinery/computer/operating{
- dir = 4
+/obj/effect/turf_decal/trimline/dark/line{
+ dir = 9
},
/turf/open/floor/iron/white,
/area/station/security/medical)
@@ -40055,9 +46558,6 @@
/obj/structure/disposalpipe/segment{
dir = 9
},
-/obj/effect/turf_decal/trimline/dark_blue/filled/line{
- dir = 10
- },
/obj/machinery/firealarm/directional/south,
/obj/effect/turf_decal/delivery/blue,
/obj/vehicle/ridden/secway,
@@ -40066,8 +46566,18 @@
/area/station/security/office)
"hgQ" = (
/obj/structure/bookcase/random/nonfiction,
+/obj/effect/turf_decal/siding/wood{
+ dir = 1
+ },
/turf/open/floor/wood,
/area/station/security/prison)
+"hgY" = (
+/obj/machinery/light/directional/south,
+/obj/structure/extinguisher_cabinet/directional/south,
+/obj/effect/turf_decal/trimline/purple/line,
+/obj/effect/turf_decal/trimline/purple/mid_joiner,
+/turf/open/floor/iron/edge,
+/area/station/hallway/primary/starboard)
"hhp" = (
/obj/machinery/door/window/right/directional/west{
req_access = list("library");
@@ -40109,17 +46619,28 @@
/turf/open/floor/vault/rock,
/area/station/security/prison)
"hiw" = (
-/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
-/obj/effect/turf_decal/tile/yellow{
+/obj/effect/turf_decal/trimline/yellow/filled/shrink_cw{
dir = 1
},
-/turf/open/floor/iron/dark/side,
+/turf/open/floor/iron/dark,
/area/station/engineering/atmos/hfr_room)
"hiz" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/obj/structure/railing/corner/end,
+/obj/effect/turf_decal/siding/dark{
+ dir = 8
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/effect/turf_decal/stripes/white/line{
+ color = "#D381C9";
+ dir = 8
+ },
+/turf/open/floor/iron/white,
/area/station/science/explab)
"hiC" = (
/obj/effect/decal/cleanable/dirt,
@@ -40135,18 +46656,45 @@
/obj/machinery/door/airlock/external{
name = "Escape Airlock"
},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer4,
/turf/open/floor/iron,
/area/station/hallway/secondary/exit)
"hiL" = (
/obj/effect/turf_decal/tile/neutral,
-/obj/machinery/firealarm/directional/east,
/turf/open/floor/iron/dark,
/area/station/commons/fitness/recreation/entertainment)
-"hja" = (
-/obj/structure/cable,
-/obj/effect/turf_decal/siding/thinplating/light/corner,
+"hiU" = (
+/obj/effect/turf_decal/trimline/brown/filled/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/dark/line{
+ dir = 1
+ },
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
/turf/open/floor/iron,
-/area/station/science/explab)
+/area/station/maintenance/port/aft)
+"hja" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 4
+ },
+/obj/effect/turf_decal/stripes/white/line{
+ color = "#D381C9";
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/dark/corner{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/dark/corner{
+ dir = 8
+ },
+/turf/open/floor/engine,
+/area/station/science/xenobiology)
"hjk" = (
/obj/effect/mapping_helpers/airlock/locked,
/obj/machinery/door/airlock/research/glass/incinerator/ordmix_interior,
@@ -40184,15 +46732,15 @@
/obj/effect/turf_decal/tile/yellow/half/contrasted{
dir = 8
},
+/obj/structure/noticeboard/ce{
+ pixel_y = 3;
+ pixel_x = -32
+ },
/turf/open/floor/iron/white/side{
dir = 4
},
/area/station/command/heads_quarters/ce)
"hjv" = (
-/obj/machinery/door/airlock/security/glass{
- name = "Security Office"
- },
-/obj/effect/mapping_helpers/airlock/access/any/security/general,
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 8
@@ -40200,8 +46748,43 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 4
},
+/obj/machinery/door/airlock/security/glass{
+ name = "Security Office"
+ },
+/obj/effect/mapping_helpers/airlock/access/any/security/general,
/turf/open/floor/iron/dark,
/area/station/security/checkpoint/medical)
+"hjG" = (
+/obj/structure/cable,
+/obj/effect/landmark/start/hangover,
+/turf/open/floor/iron/edge{
+ dir = 4
+ },
+/area/station/hallway/primary/central)
+"hjN" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/obj/structure/cable,
+/turf/open/floor/iron/textured_half{
+ dir = 8
+ },
+/area/station/hallway/primary/central)
+"hjU" = (
+/obj/structure/disposalpipe/segment{
+ dir = 9
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 5
+ },
+/turf/open/floor/plating,
+/area/station/maintenance/aft)
"hjX" = (
/obj/structure/cable,
/obj/effect/decal/cleanable/dirt,
@@ -40219,24 +46802,41 @@
},
/turf/open/floor/iron/freezer,
/area/station/maintenance/starboard/fore)
+"hkk" = (
+/obj/effect/turf_decal/trimline/yellow/arrow_ccw,
+/obj/effect/turf_decal/trimline/yellow/mid_joiner,
+/turf/open/floor/iron/edge,
+/area/station/hallway/primary/port)
"hkm" = (
-/obj/structure/cable,
/obj/structure/bodycontainer/morgue{
dir = 2
},
-/turf/open/floor/iron/dark,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/medical/morgue)
+"hkx" = (
+/obj/machinery/atmospherics/pipe/layer_manifold/cyan/hidden{
+ dir = 8
+ },
+/turf/open/floor/plating,
+/area/station/maintenance/starboard)
"hkE" = (
/obj/structure/table/reinforced,
+/obj/structure/window/reinforced/spawner/directional/west,
+/obj/structure/window/reinforced/spawner/directional/north,
+/obj/item/newspaper{
+ pixel_x = 5;
+ pixel_y = 1
+ },
/obj/item/folder/blue,
-/turf/open/floor/iron/white,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/medical/medbay/lobby)
"hkT" = (
-/obj/machinery/power/apc/auto_name/directional/north,
/obj/structure/cable,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 8
},
+/obj/machinery/power/apc/auto_name/directional/north,
+/obj/item/storage/box/lights/mixed,
/turf/open/floor/plating,
/area/station/commons/storage/emergency/port)
"hla" = (
@@ -40266,8 +46866,26 @@
dir = 10
},
/area/station/hallway/primary/fore)
+"hmk" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 10
+ },
+/turf/open/floor/wood,
+/area/station/security/prison)
+"hmm" = (
+/obj/effect/turf_decal/siding/dark{
+ dir = 5
+ },
+/obj/effect/turf_decal/siding/dark/corner{
+ dir = 8
+ },
+/turf/open/floor/circuit/red,
+/area/station/ai_monitored/turret_protected/ai_upload)
"hmH" = (
/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/siding/dark{
+ dir = 4
+ },
/turf/open/floor/iron/dark,
/area/station/service/hydroponics)
"hno" = (
@@ -40286,10 +46904,6 @@
},
/area/station/commons/dorms)
"hnt" = (
-/obj/effect/turf_decal/tile/yellow{
- dir = 4
- },
-/obj/effect/turf_decal/tile/yellow,
/obj/structure/table/glass,
/obj/item/storage/box/beakers{
pixel_x = 2;
@@ -40298,23 +46912,18 @@
/obj/item/reagent_containers/cup/beaker/large,
/obj/item/reagent_containers/dropper,
/obj/structure/window/reinforced/spawner/directional/south,
-/obj/effect/turf_decal/tile/yellow{
- dir = 8
- },
-/obj/effect/turf_decal/tile/yellow{
- dir = 1
- },
/obj/machinery/camera/directional/east{
c_tag = "Chemistry Lab East";
network = list("ss13","medbay")
},
-/turf/open/floor/iron/white,
+/turf/open/floor/plating/elevatorshaft,
/area/station/medical/chemistry)
"hnE" = (
/obj/item/radio/intercom/directional/south,
/obj/structure/chair/sofa/corp{
dir = 1
},
+/obj/effect/turf_decal/siding/wideplating_new/dark,
/turf/open/floor/wood/parquet,
/area/station/science/breakroom)
"hnO" = (
@@ -40328,6 +46937,9 @@
pixel_x = 10
},
/obj/structure/cable,
+/obj/effect/turf_decal/siding/wood{
+ dir = 1
+ },
/turf/open/floor/wood,
/area/station/security/prison)
"hpN" = (
@@ -40335,6 +46947,13 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 8
},
+/obj/structure/table,
+/obj/item/stack/sheet/plasteel/twenty,
+/obj/item/stack/sheet/glass/fifty,
+/obj/item/storage/belt/utility,
+/obj/item/t_scanner,
+/obj/item/t_scanner,
+/obj/item/t_scanner,
/turf/open/floor/iron,
/area/station/engineering/atmos)
"hqh" = (
@@ -40374,6 +46993,8 @@
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 8
},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer4,
/obj/machinery/door/airlock/external{
name = "Labor Camp Shuttle Airlock"
},
@@ -40390,6 +47011,22 @@
},
/turf/closed/wall/r_wall,
/area/station/engineering/atmos/hfr_room)
+"hqO" = (
+/obj/effect/turf_decal/siding/wood/corner,
+/obj/effect/turf_decal/siding/wood{
+ dir = 8
+ },
+/obj/machinery/vending/wallmed/directional/north,
+/turf/open/floor/wood/large,
+/area/station/hallway/secondary/entry)
+"hrb" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/blood/splatter,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 6
+ },
+/turf/open/floor/plating,
+/area/station/maintenance/port/aft)
"hre" = (
/obj/effect/turf_decal/siding/thinplating/dark/corner{
dir = 1
@@ -40413,6 +47050,9 @@
"hrZ" = (
/obj/effect/turf_decal/trimline/dark_blue/filled/line,
/obj/item/radio/intercom/directional/south,
+/obj/effect/turf_decal/trimline/dark_blue/line{
+ alpha = 200
+ },
/turf/open/floor/iron/dark,
/area/station/security/office)
"hsx" = (
@@ -40473,15 +47113,16 @@
/area/station/security/checkpoint/engineering)
"huA" = (
/obj/item/kirbyplants/random,
-/turf/open/floor/iron/white/side{
- dir = 6
- },
+/turf/open/floor/iron/dark/smooth_large,
/area/station/science/research)
"huD" = (
/obj/effect/turf_decal/trimline/dark_blue/filled/line{
dir = 1
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/turf_decal/trimline/dark/line{
+ dir = 1
+ },
/turf/open/floor/iron/dark,
/area/station/security/execution/transfer)
"huL" = (
@@ -40489,6 +47130,8 @@
/obj/machinery/camera/directional/east{
c_tag = "Escape Arm Airlocks"
},
+/obj/machinery/atmospherics/pipe/layer_manifold/cyan/hidden,
+/obj/effect/turf_decal/stripes/blue/corner,
/turf/open/floor/iron/dark,
/area/station/hallway/secondary/exit)
"huR" = (
@@ -40513,7 +47156,6 @@
},
/area/station/commons/dorms)
"hvP" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/structure/window/reinforced/tinted/spawner/directional/south,
/obj/machinery/light/directional/east,
/obj/machinery/camera/directional/south{
@@ -40521,6 +47163,10 @@
network = list("ss13","prison");
pixel_y = 8
},
+/obj/effect/turf_decal/siding/wood{
+ dir = 6
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/wood,
/area/station/security/prison)
"hvQ" = (
@@ -40548,7 +47194,16 @@
/turf/open/floor/wood/tile,
/area/station/commons/dorms)
"hwE" = (
-/turf/open/floor/mineral/titanium/blue,
+/obj/effect/turf_decal/siding/white{
+ dir = 9
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/obj/machinery/dryer{
+ pixel_y = 23
+ },
+/turf/open/floor/iron/white/small,
/area/station/commons/toilet)
"hwT" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
@@ -40611,17 +47266,18 @@
/obj/effect/spawner/structure/window/hollow/reinforced/middle,
/turf/open/floor/plating,
/area/station/maintenance/starboard/fore)
-"hys" = (
-/obj/structure/chair{
- dir = 1
- },
-/obj/machinery/firealarm/directional/east,
-/turf/open/floor/iron/dark,
-/area/station/security/courtroom)
"hyJ" = (
/obj/effect/spawner/random/trash/botanical_waste,
/turf/open/floor/plating,
/area/station/maintenance/port/aft)
+"hyL" = (
+/obj/structure/disposalpipe/segment,
+/obj/effect/turf_decal/trimline/blue/corner{
+ dir = 8;
+ alpha = 200
+ },
+/turf/open/floor/iron/edge,
+/area/station/hallway/primary/central)
"hyU" = (
/obj/effect/turf_decal/stripes/corner,
/obj/effect/turf_decal/stripes/line{
@@ -40632,14 +47288,12 @@
/turf/open/floor/iron,
/area/station/commons/fitness)
"hyV" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
- dir = 4
- },
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 4
},
/obj/structure/cable,
/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer5,
/turf/open/floor/iron/dark,
/area/station/hallway/secondary/exit)
"hzc" = (
@@ -40667,12 +47321,22 @@
/turf/open/floor/plating,
/area/station/maintenance/aft)
"hzW" = (
+/obj/effect/spawner/random/vending/colavend,
+/obj/effect/turf_decal/trimline/blue/filled/line{
+ dir = 5
+ },
/obj/structure/sign/map/right{
pixel_y = 32
},
-/obj/effect/spawner/random/vending/colavend,
/turf/open/floor/iron,
/area/station/hallway/secondary/entry)
+"hAb" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/landmark/firealarm_sanity,
+/turf/open/floor/iron/dark,
+/area/station/ai_monitored/turret_protected/aisat/hallway)
"hAh" = (
/obj/structure/cable,
/obj/effect/turf_decal/stripes/line{
@@ -40694,10 +47358,7 @@
/obj/item/clipboard,
/obj/item/toy/figure/cmo,
/obj/structure/table/wood/fancy/blue,
-/obj/item/food/burger/blue{
- desc = "Do no harm. Except to your waistline.";
- name = "medical burger"
- },
+/obj/machinery/firealarm/directional/north,
/turf/open/floor/carpet/blue,
/area/station/command/heads_quarters/cmo)
"hAu" = (
@@ -40707,14 +47368,13 @@
/turf/open/floor/plating,
/area/station/maintenance/disposal/incinerator)
"hAO" = (
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/structure/cable,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/blue/corner,
+/turf/open/floor/iron/textured_corner{
+ dir = 4
+ },
/area/station/hallway/primary/starboard)
"hAV" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
@@ -40727,10 +47387,7 @@
dir = 4
},
/obj/structure/cable,
-/obj/structure/extinguisher_cabinet{
- pixel_x = -5;
- pixel_y = 30
- },
+/obj/structure/extinguisher_cabinet/directional/north,
/turf/open/floor/iron/dark/side{
dir = 1
},
@@ -40739,48 +47396,82 @@
/turf/open/floor/iron,
/area/station/commons/fitness)
"hBx" = (
-/obj/effect/turf_decal/tile/yellow{
- dir = 1
- },
-/obj/effect/turf_decal/tile/yellow{
- dir = 8
- },
/obj/machinery/airalarm/directional/west,
-/obj/effect/turf_decal/tile/yellow,
-/turf/open/floor/iron/dark,
+/obj/structure/table,
+/obj/item/storage/fancy/cigarettes/cigpack_candy{
+ pixel_x = -7;
+ pixel_y = 7
+ },
+/obj/item/cigarette/candy{
+ pixel_x = 0;
+ pixel_y = 1
+ },
+/turf/open/floor/iron/dark/smooth_large,
/area/station/hallway/primary/aft)
"hBN" = (
+/obj/machinery/door/window/left/directional/south{
+ req_access = list("eva");
+ name = "RCD Storage"
+ },
+/obj/structure/window/reinforced/spawner/directional/west,
/obj/structure/table/reinforced,
-/obj/item/analyzer,
-/obj/item/multitool{
- pixel_x = -5
+/obj/item/rcd_ammo,
+/obj/item/rcd_ammo,
+/obj/item/rcd_ammo,
+/obj/item/construction/rcd{
+ pixel_y = 4;
+ pixel_x = 2
},
-/obj/item/multitool{
- pixel_x = -10
- },
-/obj/item/t_scanner{
- pixel_x = 6;
- pixel_y = 3
- },
-/obj/item/multitool,
-/obj/item/stack/cable_coil{
- pixel_x = 2;
- pixel_y = 5
- },
-/obj/structure/window/reinforced/spawner/directional/north,
-/obj/structure/window/reinforced/spawner/directional/east,
-/turf/open/floor/iron/dark,
+/obj/item/construction/rcd,
+/obj/machinery/light/directional/north,
+/obj/effect/mapping_helpers/airlock/red_alert_access,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/ai_monitored/command/storage/eva)
"hCG" = (
/turf/open/floor/iron,
-/area/station/science/ordnance/bomb)
+/area/station/science/ordnance/testlab)
+"hCY" = (
+/obj/machinery/button/door/directional/south{
+ id = "HFRshutter";
+ name = "Atmospherics HFR Shutters";
+ req_access = list("atmospherics")
+ },
+/obj/machinery/door/firedoor/heavy,
+/obj/effect/turf_decal/delivery,
+/turf/open/floor/iron/dark,
+/area/station/engineering/atmos/hfr_room)
+"hDl" = (
+/obj/effect/turf_decal/trimline/blue/filled/line{
+ alpha = 160
+ },
+/obj/effect/turf_decal/siding{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/white/line,
+/obj/effect/turf_decal/trimline/blue/filled/mid_joiner,
+/obj/effect/turf_decal/trimline/blue/filled/mid_joiner,
+/obj/effect/turf_decal/trimline/white/mid_joiner,
+/turf/open/floor/iron/white/smooth_edge,
+/area/station/medical/medbay/central)
+"hDv" = (
+/obj/structure/disposalpipe/segment,
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer5,
+/turf/open/floor/plating,
+/area/station/maintenance/starboard)
"hDB" = (
+/obj/structure/cable,
/obj/effect/turf_decal/trimline/blue/filled/line{
dir = 9
},
/obj/machinery/power/apc/auto_name/directional/north,
-/obj/structure/cable,
/obj/machinery/pdapainter/medbay,
+/obj/item/clothing/glasses/hud/health/sunglasses{
+ pixel_y = 6;
+ pixel_x = 1
+ },
/turf/open/floor/iron/dark,
/area/station/command/heads_quarters/cmo)
"hDI" = (
@@ -40793,7 +47484,13 @@
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/structure/cable,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/siding/white{
+ color = "#8b8b8b";
+ dir = 8
+ },
+/turf/open/floor/iron/edge{
+ dir = 8
+ },
/area/station/hallway/primary/central)
"hEf" = (
/obj/effect/turf_decal/trimline/dark_blue/filled/warning{
@@ -40806,16 +47503,34 @@
id = "secmechbay";
req_access = list("security")
},
+/obj/effect/turf_decal/trimline/dark_blue/warning{
+ alpha = 200;
+ dir = 6
+ },
/turf/open/floor/iron/dark,
/area/station/security/office)
"hEj" = (
/obj/machinery/computer/robotics,
/turf/open/floor/carpet,
/area/station/command/heads_quarters/rd)
+"hEl" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/turf_decal/trimline/yellow/filled/corner,
+/obj/effect/turf_decal/trimline/yellow/filled/corner{
+ dir = 8
+ },
+/turf/open/floor/iron,
+/area/station/commons/storage/primary)
+"hEI" = (
+/obj/effect/turf_decal/trimline/purple/line,
+/obj/effect/turf_decal/trimline/purple/mid_joiner,
+/turf/open/floor/iron/edge,
+/area/station/hallway/primary/starboard)
"hEJ" = (
/obj/effect/turf_decal/bot,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron,
+/turf/open/floor/iron/large,
/area/station/cargo/storage)
"hEL" = (
/obj/effect/turf_decal/stripes/line{
@@ -40828,6 +47543,9 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
+/obj/effect/turf_decal/trimline/dark_blue/filled/line{
+ dir = 1
+ },
/turf/open/floor/iron/dark,
/area/station/hallway/primary/fore)
"hET" = (
@@ -40838,10 +47556,18 @@
/turf/open/floor/iron/dark,
/area/station/security/office)
"hFg" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 9
+/obj/effect/turf_decal/trimline/blue/filled/line,
+/obj/machinery/status_display/evac/directional/south,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 5
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer5,
+/turf/open/floor/iron/edge{
+ dir = 1
},
-/turf/open/floor/iron,
/area/station/hallway/secondary/entry)
"hFi" = (
/obj/effect/turf_decal/siding/brown{
@@ -40862,6 +47588,7 @@
id = "secmechbay";
name = "Security Mech Bay Shutters"
},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer5,
/turf/open/floor/plating,
/area/station/security/mechbay)
"hFP" = (
@@ -40892,19 +47619,24 @@
name = "Padded tile"
},
/area/station/security/prison/safe)
-"hGo" = (
-/obj/structure/extinguisher_cabinet{
- pixel_x = -27
- },
-/obj/effect/turf_decal/tile/dark_blue{
- dir = 1
- },
-/obj/effect/turf_decal/tile/dark_blue{
+"hGn" = (
+/obj/effect/turf_decal/trimline/dark_blue/corner{
+ alpha = 200;
dir = 8
},
+/turf/open/floor/iron,
+/area/station/hallway/primary/fore)
+"hGo" = (
/obj/machinery/light/directional/west,
-/obj/structure/closet/secure_closet/security_medic,
-/obj/item/clothing/suit/toggle/labcoat,
+/obj/structure/chair/office{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/red/real_red/filled/line{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/dark/line{
+ dir = 8
+ },
/turf/open/floor/iron/white,
/area/station/security/medical)
"hGx" = (
@@ -40925,10 +47657,20 @@
/obj/machinery/bouldertech/refinery,
/turf/open/floor/iron/dark/textured_large,
/area/station/cargo/miningdock)
+"hGz" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 4
+ },
+/obj/structure/cable,
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer5,
+/turf/open/floor/plating,
+/area/station/maintenance/starboard)
"hGN" = (
-/obj/effect/turf_decal/stripes/line,
-/obj/machinery/light/directional/south,
-/turf/open/floor/iron,
+/turf/open/floor/glass/reinforced,
/area/station/hallway/secondary/entry)
"hGO" = (
/obj/effect/turf_decal/tile/brown,
@@ -40965,6 +47707,11 @@
dir = 1
},
/obj/effect/landmark/start/medical_doctor,
+/obj/effect/turf_decal/tile/blue/full,
+/obj/structure/extinguisher_cabinet/directional/east,
+/obj/effect/turf_decal/siding/end{
+ dir = 4
+ },
/turf/open/floor/iron/white,
/area/station/medical/medbay/lobby)
"hHW" = (
@@ -41000,6 +47747,9 @@
/obj/effect/turf_decal/trimline/dark_blue/filled/line{
dir = 9
},
+/obj/effect/turf_decal/trimline/dark/line{
+ dir = 9
+ },
/turf/open/floor/iron/dark,
/area/station/security/execution/transfer)
"hIZ" = (
@@ -41035,6 +47785,9 @@
dir = 4
},
/obj/structure/cable,
+/obj/effect/turf_decal/trimline/dark/warning{
+ dir = 4
+ },
/turf/open/floor/iron/dark,
/area/station/security/holding_cell)
"hKm" = (
@@ -41044,11 +47797,20 @@
/turf/open/floor/plating,
/area/station/ai_monitored/turret_protected/aisat/maint)
"hKu" = (
-/obj/machinery/modular_computer/preset/civilian,
/obj/machinery/posialert{
pixel_y = 32
},
-/turf/open/floor/iron/white,
+/obj/machinery/ecto_sniffer{
+ pixel_x = 6;
+ pixel_y = -4
+ },
+/obj/item/book/manual/wiki/robotics_cyborgs{
+ pixel_x = -6;
+ pixel_y = 2
+ },
+/obj/structure/table/glass,
+/obj/machinery/light/directional/north,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/science/robotics/lab)
"hKJ" = (
/obj/structure/trash_pile,
@@ -41057,30 +47819,46 @@
"hLb" = (
/turf/open/space/basic,
/area/space/nearstation)
-"hLC" = (
-/obj/effect/landmark/start/hangover,
-/obj/machinery/firealarm/directional/north,
-/turf/open/floor/iron,
-/area/station/hallway/primary/starboard)
-"hLT" = (
-/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
+"hLf" = (
+/obj/effect/turf_decal/siding/dark/corner{
dir = 1
},
+/turf/open/floor/iron/edge{
+ dir = 1
+ },
+/area/station/hallway/primary/central)
+"hLN" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
+/obj/effect/mapping_helpers/airlock/access/any/medical/general,
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/virology/glass{
+ name = "Isolation B"
+ },
+/turf/open/floor/iron/dark/smooth_large,
+/area/station/medical/virology)
+"hLT" = (
/obj/machinery/computer/operating,
/obj/machinery/airalarm/directional/north,
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/tile/blue/full,
+/turf/open/floor/iron/large,
/area/station/medical/surgery/fore)
-"hMe" = (
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
- dir = 8
+"hLV" = (
+/obj/effect/turf_decal/trimline/green/arrow_ccw{
+ dir = 1
},
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/trimline/green/mid_joiner{
+ dir = 1
+ },
+/turf/open/floor/iron/edge{
+ dir = 1
+ },
+/area/station/hallway/primary/central)
+"hMe" = (
+/obj/effect/turf_decal/trimline/blue/filled/warning{
+ alpha = 160
+ },
+/obj/effect/turf_decal/trimline/white/warning,
+/turf/open/floor/iron/white/smooth_edge,
/area/station/medical/medbay/lobby)
"hMP" = (
/obj/machinery/disposal/bin,
@@ -41095,7 +47873,7 @@
},
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron,
-/area/station/science/ordnance/bomb)
+/area/station/science/ordnance/testlab)
"hOx" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 8
@@ -41112,15 +47890,23 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/dark,
/area/station/security/execution/transfer)
+"hPh" = (
+/obj/machinery/door/firedoor/heavy,
+/obj/effect/turf_decal/delivery,
+/obj/machinery/firealarm/directional/north,
+/turf/open/floor/iron/dark,
+/area/station/engineering/atmos/hfr_room)
"hPj" = (
-/obj/structure/disposalpipe/trunk{
+/obj/effect/turf_decal/siding/dark{
+ dir = 8
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 5
+ },
+/obj/effect/turf_decal/siding/dark{
dir = 4
},
-/obj/structure/disposaloutlet,
-/obj/machinery/camera/directional/west{
- c_tag = "Xenobiology Cell 6";
- network = list("ss13","xeno")
- },
+/obj/machinery/light/directional/west,
/turf/open/floor/engine,
/area/station/science/xenobiology)
"hPF" = (
@@ -41130,7 +47916,12 @@
/turf/open/floor/iron/dark,
/area/station/ai_monitored/security/armory)
"hPQ" = (
-/obj/machinery/computer/security/labor,
+/obj/structure/table,
+/obj/machinery/camera/directional/north{
+ c_tag = "Labor Shuttle Dock North"
+ },
+/obj/item/restraints/handcuffs,
+/obj/item/storage/box/prisoner,
/turf/open/floor/iron/dark,
/area/station/security/processing)
"hQh" = (
@@ -41142,6 +47933,13 @@
},
/turf/open/floor/iron/dark,
/area/station/service/chapel)
+"hQi" = (
+/obj/effect/turf_decal/trimline/blue/filled/line,
+/obj/effect/turf_decal/siding/white/corner{
+ dir = 8
+ },
+/turf/open/floor/iron/small,
+/area/station/hallway/secondary/entry)
"hQn" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/plating,
@@ -41167,6 +47965,20 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/wood/tile,
/area/station/commons/dorms)
+"hQZ" = (
+/obj/machinery/door/firedoor,
+/obj/effect/turf_decal/delivery/white{
+ color = "#ae4fd6"
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 8
+ },
+/obj/machinery/door/poddoor/shutters{
+ id = "Skynet_launch";
+ name = "Mech Bay"
+ },
+/turf/open/floor/iron/dark/textured_large,
+/area/station/science/robotics/mechbay)
"hRn" = (
/obj/effect/landmark/start/prisoner,
/obj/effect/turf_decal/stripes/white/line{
@@ -41185,6 +47997,18 @@
/obj/effect/decal/cleanable/cobweb/cobweb2,
/turf/open/floor/plating,
/area/station/maintenance/aft)
+"hRH" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/brown/filled/line{
+ dir = 5
+ },
+/turf/open/floor/iron,
+/area/station/cargo/office)
"hSa" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -41192,13 +48016,13 @@
/turf/open/floor/wood/parquet,
/area/station/command/heads_quarters/nt_rep)
"hSc" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+ dir = 1
+ },
/obj/effect/turf_decal/tile/yellow,
/obj/effect/turf_decal/tile/yellow{
dir = 8
},
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
- dir = 1
- },
/obj/machinery/light/small/directional/south,
/turf/open/floor/iron,
/area/station/commons/storage/tools)
@@ -41228,9 +48052,6 @@
/area/station/science/explab)
"hTf" = (
/obj/effect/turf_decal/vg_decals/department/sec,
-/obj/effect/turf_decal/tile/red/half/contrasted{
- dir = 1
- },
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/structure/disposalpipe/segment{
@@ -41260,6 +48081,22 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/dark,
/area/station/security/prison/safe)
+"hTO" = (
+/obj/effect/turf_decal/trimline/white/filled/line{
+ dir = 8;
+ alpha = 160
+ },
+/obj/effect/turf_decal/trimline/purple/line{
+ alpha = 200;
+ dir = 8;
+ color = "#a56dc2"
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/turf/open/floor/iron,
+/area/station/science/explab)
"hTU" = (
/turf/closed/wall/r_wall,
/area/station/medical/chemistry)
@@ -41268,18 +48105,18 @@
/turf/open/floor/iron,
/area/station/engineering/atmos)
"hUm" = (
-/obj/effect/turf_decal/tile/yellow{
+/obj/machinery/light/directional/east,
+/obj/effect/turf_decal/trimline/yellow/filled/line{
+ dir = 4;
+ alpha = 120
+ },
+/obj/effect/turf_decal/trimline/blue/line{
+ alpha = 200;
+ dir = 4
+ },
+/turf/open/floor/iron/white/smooth_edge{
dir = 4
},
-/obj/effect/turf_decal/tile/yellow,
-/obj/machinery/light/directional/east,
-/obj/structure/table,
-/obj/item/plunger,
-/obj/item/stack/ducts/fifty,
-/obj/item/stack/ducts/fifty,
-/obj/item/stack/ducts/fifty,
-/obj/item/stack/ducts/fifty,
-/turf/open/floor/iron/white,
/area/station/medical/chemistry)
"hVn" = (
/obj/machinery/flasher{
@@ -41304,7 +48141,7 @@
id = "gatewayshutters";
name = "Gateway Chamber Shutters"
},
-/turf/open/floor/iron/dark/textured,
+/turf/open/floor/iron/dark/textured_large,
/area/station/command/gateway)
"hVx" = (
/obj/effect/turf_decal/trimline/dark_blue/filled/line,
@@ -41315,6 +48152,7 @@
/obj/item/storage/box/prisoner{
pixel_y = 2
},
+/obj/effect/turf_decal/trimline/dark/line,
/obj/machinery/firealarm/directional/south,
/turf/open/floor/iron/dark,
/area/station/security/execution/transfer)
@@ -41332,13 +48170,19 @@
/turf/open/floor/plating,
/area/station/maintenance/starboard/aft)
"hWN" = (
-/obj/effect/turf_decal/tile/blue{
- dir = 8
+/obj/effect/turf_decal/siding/corner{
+ dir = 4
},
-/obj/effect/turf_decal/tile/blue{
- dir = 1
+/obj/effect/turf_decal/trimline/blue/filled/line{
+ alpha = 160;
+ dir = 10
+ },
+/obj/effect/turf_decal/trimline/white/line{
+ dir = 10
+ },
+/turf/open/floor/iron/white/smooth_corner{
+ dir = 4
},
-/turf/open/floor/iron/white,
/area/station/medical/medbay/lobby)
"hXd" = (
/obj/structure/fence{
@@ -41362,7 +48206,7 @@
/turf/open/floor/iron,
/area/station/hallway/primary/central/fore)
"hXx" = (
-/obj/effect/turf_decal/siding/blue{
+/obj/effect/turf_decal/siding/wood{
dir = 1
},
/turf/open/floor/grass,
@@ -41373,8 +48217,16 @@
},
/obj/structure/cable,
/obj/machinery/power/apc/auto_name/directional/west,
-/obj/item/reagent_containers/cup/glass/bottle/hooch,
/obj/structure/closet/secure_closet/injection,
+/obj/effect/turf_decal/trimline/white/line{
+ dir = 9
+ },
+/obj/item/book/bible,
+/obj/item/clothing/under/misc/burial,
+/obj/item/food/grown/harebell{
+ pixel_x = -3;
+ pixel_y = 4
+ },
/turf/open/floor/iron/dark,
/area/station/security/execution/education)
"hXJ" = (
@@ -41394,11 +48246,19 @@
pixel_y = 3
},
/obj/machinery/airalarm/directional/east,
-/turf/open/floor/iron,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/command/gateway)
"hXL" = (
/obj/effect/landmark/start/hangover,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/brown/arrow_cw{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/brown/mid_joiner{
+ dir = 1
+ },
+/turf/open/floor/iron/edge{
+ dir = 1
+ },
/area/station/hallway/primary/starboard)
"hYr" = (
/obj/structure/drain,
@@ -41419,6 +48279,9 @@
"hZy" = (
/obj/structure/chair/stool/directional/west,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/turf_decal/siding/wood{
+ dir = 4
+ },
/turf/open/floor/wood,
/area/station/security/prison)
"hZA" = (
@@ -41433,6 +48296,9 @@
c_tag = "Security Office"
},
/obj/effect/turf_decal/trimline/dark_blue/filled/line,
+/obj/effect/turf_decal/trimline/dark_blue/line{
+ alpha = 200
+ },
/turf/open/floor/iron/dark,
/area/station/security/office)
"hZE" = (
@@ -41458,9 +48324,6 @@
},
/area/station/holodeck/rec_center)
"hZK" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
- dir = 4
- },
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 4
},
@@ -41471,6 +48334,7 @@
/obj/structure/railing/corner/end{
dir = 8
},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer5,
/turf/open/floor/iron/dark,
/area/station/hallway/secondary/exit)
"iae" = (
@@ -41523,7 +48387,7 @@
pixel_y = 4
},
/obj/item/radio/off,
-/turf/open/floor/iron,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/command/gateway)
"iaM" = (
/obj/structure/cable,
@@ -41531,13 +48395,23 @@
/obj/effect/landmark/start/research_director,
/turf/open/floor/wood,
/area/station/command/heads_quarters/rd)
-"iaU" = (
-/obj/effect/landmark/start/hangover,
-/obj/structure/chair/stool/bar/directional/north,
-/turf/open/floor/iron/white/corner{
+"iaT" = (
+/obj/effect/turf_decal/trimline/yellow/corner{
+ dir = 4
+ },
+/turf/open/floor/iron/edge{
dir = 1
},
-/area/station/hallway/primary/starboard)
+/area/station/hallway/primary/port)
+"iaU" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 6
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer4,
+/obj/structure/sign/warning/vacuum/external/directional/south,
+/turf/open/floor/plating,
+/area/station/maintenance/port/aft)
"ibl" = (
/obj/structure/flora/bush/flowers_pp,
/obj/effect/turf_decal/siding/wideplating_new{
@@ -41557,8 +48431,28 @@
/obj/effect/turf_decal/trimline/dark_blue/filled/line{
dir = 1
},
+/obj/effect/turf_decal/trimline/dark/line{
+ dir = 1
+ },
/turf/open/floor/iron/dark,
/area/station/security/brig)
+"ibJ" = (
+/obj/effect/turf_decal/stripes/white/line{
+ color = "#a56dc2"
+ },
+/obj/machinery/door/firedoor/border_only,
+/obj/structure/fluff/metalpole{
+ pixel_y = -32
+ },
+/obj/effect/turf_decal/stripes/line,
+/obj/effect/turf_decal/stripes/white/line{
+ color = "#52B4E9";
+ name = "blue line"
+ },
+/obj/structure/railing,
+/obj/effect/turf_decal/tile/blue/fourcorners,
+/turf/open/floor/iron/white,
+/area/station/hallway/secondary/entry)
"ibL" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -41578,17 +48472,17 @@
/turf/open/floor/iron/white,
/area/station/science/research)
"icQ" = (
-/obj/effect/turf_decal/tile/dark_green{
+/obj/effect/turf_decal/trimline/dark_green/filled/shrink_cw{
dir = 4
},
/turf/open/floor/iron/dark,
/area/station/hallway/primary/fore)
"icV" = (
-/obj/effect/landmark/event_spawn,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 4
},
/obj/structure/cable,
+/obj/effect/landmark/event_spawn,
/turf/open/floor/iron,
/area/station/hallway/primary/central)
"idn" = (
@@ -41597,6 +48491,10 @@
/obj/effect/landmark/start/atmospheric_technician,
/turf/open/floor/iron,
/area/station/engineering/atmos)
+"ido" = (
+/obj/structure/cable,
+/turf/open/floor/wood,
+/area/station/command/heads_quarters/hop)
"idH" = (
/obj/structure/closet/secure_closet/security/science,
/obj/effect/turf_decal/tile/red{
@@ -41644,8 +48542,24 @@
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer5,
/turf/open/floor/iron/dark,
/area/station/security/mechbay)
+"ieh" = (
+/obj/effect/turf_decal/trimline/blue/filled/corner{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 5
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer5,
+/turf/open/floor/iron/textured_corner{
+ dir = 8
+ },
+/area/station/hallway/secondary/entry)
"ieu" = (
/obj/effect/mapping_helpers/broken_floor,
/obj/structure/reagent_dispensers/fueltank,
@@ -41754,20 +48668,15 @@
/turf/open/floor/iron,
/area/station/maintenance/port/aft)
"igh" = (
-/obj/effect/turf_decal/tile/brown/half/contrasted,
-/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/trimline/brown/filled/line,
+/obj/effect/turf_decal/trimline/dark/line,
/turf/open/floor/iron,
/area/station/cargo/warehouse)
"igk" = (
-/obj/machinery/light/directional/west,
-/obj/effect/turf_decal/trimline/dark_blue/filled/line{
- dir = 8
- },
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/smartfridge,
+/obj/machinery/door/firedoor,
/turf/open/floor/iron/dark,
-/area/station/security/brig)
+/area/station/service/hydroponics)
"igm" = (
/obj/machinery/airalarm/directional/east,
/turf/open/floor/iron/dark/side{
@@ -41779,10 +48688,8 @@
/turf/open/floor/grass,
/area/station/service/hydroponics/garden/abandoned)
"igH" = (
-/obj/machinery/atmospherics/pipe/smart/simple/general/visible{
- dir = 5
- },
/obj/item/wrench,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer4,
/turf/open/floor/plating,
/area/station/maintenance/fore)
"igN" = (
@@ -41817,6 +48724,45 @@
},
/turf/open/floor/iron/dark,
/area/station/security/checkpoint/engineering)
+"ihm" = (
+/obj/effect/mapping_helpers/broken_floor,
+/obj/effect/turf_decal/trimline/dark_blue/filled/line{
+ dir = 10
+ },
+/obj/effect/turf_decal/trimline/dark/line{
+ dir = 10
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 6
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/turf/open/floor/iron/dark,
+/area/station/maintenance/port/aft)
+"iht" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 6
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/turf/open/floor/plating,
+/area/station/maintenance/port/aft)
+"ihT" = (
+/obj/machinery/light/directional/south,
+/obj/effect/turf_decal/trimline/blue/filled/line,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 5
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer5,
+/turf/open/floor/iron/edge{
+ dir = 1
+ },
+/area/station/hallway/secondary/entry)
"iiz" = (
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/neutral{
@@ -41836,10 +48782,40 @@
/turf/open/floor/iron,
/area/station/hallway/primary/fore)
"iiD" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible,
/obj/machinery/computer/security/telescreen/xeno/directional/north,
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/trimline/dark/filled/line{
+ alpha = 160;
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/dark/filled/mid_joiner{
+ dir = 1;
+ alpha = 160
+ },
+/obj/effect/turf_decal/trimline/purple/line{
+ alpha = 200;
+ dir = 1;
+ color = "#a56dc2"
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible,
+/turf/open/floor/iron/white/smooth_edge{
+ dir = 1
+ },
/area/station/science/xenobiology)
+"iiJ" = (
+/obj/effect/turf_decal/siding/dark{
+ dir = 8
+ },
+/turf/open/floor/iron/dark,
+/area/station/service/hydroponics)
+"iiK" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+ dir = 4
+ },
+/turf/open/floor/iron/white,
+/area/station/science/explab)
"iiQ" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/chair/plastic{
@@ -41866,14 +48842,14 @@
/obj/structure/table,
/obj/item/stack/sheet/iron/fifty,
/turf/open/floor/iron/dark,
-/area/station/engineering/main)
+/area/station/engineering/supermatter/room)
"ijh" = (
/obj/structure/window/reinforced/spawner/directional/west,
/obj/structure/window/reinforced/spawner/directional/south,
/obj/structure/table,
/obj/machinery/reagentgrinder,
/obj/item/stack/sheet/mineral/plasma,
-/turf/open/floor/iron/white,
+/turf/open/floor/plating/elevatorshaft,
/area/station/medical/chemistry)
"iji" = (
/obj/machinery/door/airlock/bathroom{
@@ -41882,27 +48858,71 @@
/turf/open/floor/wood,
/area/station/command/heads_quarters/rd)
"ijG" = (
+/obj/structure/cable,
+/obj/structure/disposalpipe/segment,
/obj/machinery/door/airlock{
name = "Custodial Closet"
},
/obj/effect/landmark/event_spawn,
/obj/effect/landmark/navigate_destination,
-/obj/structure/cable,
/obj/effect/mapping_helpers/airlock/access/any/service/janitor,
-/obj/structure/disposalpipe/segment,
/turf/open/floor/iron,
/area/station/service/janitor)
"ijI" = (
/obj/machinery/light/directional/north,
/turf/open/floor/wood,
/area/station/hallway/secondary/service)
+"ijK" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer5,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 5
+ },
+/turf/open/floor/iron,
+/area/station/hallway/secondary/entry)
"ijY" = (
/obj/machinery/air_sensor/oxygen_tank,
/turf/open/floor/engine/o2,
/area/station/engineering/atmos)
+"ike" = (
+/obj/effect/turf_decal/siding/dark/corner,
+/obj/effect/turf_decal/trimline/purple/corner{
+ dir = 8
+ },
+/turf/open/floor/iron/edge,
+/area/station/hallway/primary/starboard)
+"ikl" = (
+/obj/effect/turf_decal/trimline/dark/filled/line{
+ alpha = 160;
+ dir = 10
+ },
+/obj/effect/turf_decal/trimline/dark/filled/mid_joiner{
+ dir = 8;
+ alpha = 160
+ },
+/obj/effect/turf_decal/trimline/dark/filled/mid_joiner{
+ dir = 2;
+ alpha = 160
+ },
+/obj/effect/turf_decal/trimline/purple/line{
+ alpha = 200;
+ dir = 10
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 10
+ },
+/turf/open/floor/iron/white/smooth_corner{
+ dir = 4
+ },
+/area/station/science/research)
"ikq" = (
/obj/machinery/bluespace_vendor/directional/north,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/brown/arrow_cw{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/brown/mid_joiner{
+ dir = 1
+ },
+/turf/open/floor/iron/corner,
/area/station/hallway/primary/starboard)
"iky" = (
/obj/structure/chair/sofa/corp/right{
@@ -41962,18 +48982,13 @@
/turf/open/floor/iron,
/area/station/hallway/primary/starboard)
"ilQ" = (
-/obj/machinery/door/airlock/external{
- name = "Escape Pod One"
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
},
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
- dir = 4;
- late = 8
+/turf/open/floor/iron/dark/side{
+ dir = 1
},
-/obj/effect/mapping_helpers/airlock/unres{
- dir = 8
- },
-/turf/open/floor/plating,
-/area/station/hallway/secondary/entry)
+/area/station/commons/locker)
"ilT" = (
/obj/effect/turf_decal/trimline/dark_blue/filled/warning{
dir = 4
@@ -41981,14 +48996,23 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/structure/cable,
+/obj/effect/turf_decal/trimline/white/warning{
+ dir = 4
+ },
/turf/open/floor/iron/dark,
/area/station/security/execution/transfer)
"imk" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
- dir = 4
- },
/obj/item/beacon,
-/turf/open/floor/catwalk_floor/iron,
+/obj/effect/turf_decal/trimline/white/filled/line{
+ dir = 4;
+ alpha = 160
+ },
+/obj/effect/turf_decal/trimline/purple/line{
+ alpha = 200;
+ dir = 4;
+ color = "#a56dc2"
+ },
+/turf/open/floor/iron,
/area/station/science/explab)
"imo" = (
/obj/effect/turf_decal/delivery/blue,
@@ -42006,6 +49030,7 @@
req_access = list("brig")
},
/obj/item/clothing/suit/hooded/flashsuit,
+/obj/machinery/firealarm/directional/south,
/turf/open/floor/iron/dark,
/area/station/security/office)
"imH" = (
@@ -42034,8 +49059,28 @@
},
/obj/effect/mapping_helpers/airlock/access/any/supply/bit_den,
/obj/effect/mapping_helpers/airlock/access/any/supply/mining,
-/turf/open/floor/iron,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/obj/structure/cable,
+/turf/open/floor/iron/large,
/area/station/cargo/warehouse)
+"ino" = (
+/obj/effect/turf_decal/trimline/blue/filled/warning{
+ alpha = 160;
+ dir = 10
+ },
+/obj/effect/turf_decal/trimline/dark_blue/warning{
+ alpha = 200;
+ dir = 10
+ },
+/turf/open/floor/iron/white/smooth_corner{
+ dir = 4
+ },
+/area/station/medical/medbay/central)
"inY" = (
/obj/effect/turf_decal/trimline/blue/filled/line{
dir = 8
@@ -42067,10 +49112,10 @@
/area/station/medical/storage)
"iob" = (
/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
- dir = 4
+/obj/structure/railing{
+ dir = 5
},
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/module_duplicator,
/turf/open/floor/iron/white,
/area/station/science/explab)
"ioq" = (
@@ -42095,11 +49140,25 @@
"ioB" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
-/area/station/science/ordnance/bomb)
+/area/station/science/ordnance/testlab)
"ioJ" = (
/obj/effect/landmark/start/hangover,
/obj/machinery/firealarm/directional/north,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/green/corner{
+ dir = 1
+ },
+/turf/open/floor/iron/edge{
+ dir = 1
+ },
+/area/station/hallway/primary/central)
+"ips" = (
+/obj/effect/turf_decal/trimline/blue/corner{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/dark,
+/turf/open/floor/iron/corner{
+ dir = 1
+ },
/area/station/hallway/primary/central)
"ipA" = (
/obj/structure/disposalpipe/segment,
@@ -42142,25 +49201,33 @@
/turf/open/floor/iron/dark,
/area/station/security/checkpoint/science)
"iqO" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
- dir = 4
- },
/obj/structure/cable,
/turf/open/floor/plating,
/area/station/maintenance/department/security)
+"iqV" = (
+/obj/effect/landmark/start/hangover,
+/obj/effect/turf_decal/siding/wood{
+ dir = 1
+ },
+/turf/open/floor/wood,
+/area/station/hallway/primary/starboard)
"iqX" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/trimline/white/filled/line{
+ dir = 1;
+ alpha = 160
+ },
+/obj/effect/turf_decal/trimline/purple/line{
+ alpha = 200;
+ dir = 1;
+ color = "#a56dc2"
+ },
+/turf/open/floor/iron,
/area/station/science/explab)
"iry" = (
/obj/machinery/light/directional/east,
-/obj/item/book/manual/hydroponics_pod_people,
-/obj/item/paper/guides/jobs/hydroponics,
-/obj/structure/table/glass,
+/obj/machinery/seed_extractor,
/turf/open/floor/iron/dark/textured_large,
/area/station/service/hydroponics)
"irX" = (
@@ -42169,6 +49236,13 @@
/obj/structure/cable,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/turret_protected/aisat_interior)
+"isf" = (
+/obj/effect/landmark/start/hangover,
+/obj/effect/turf_decal/trimline/purple/corner,
+/turf/open/floor/iron/textured_corner{
+ dir = 4
+ },
+/area/station/hallway/primary/starboard)
"isC" = (
/obj/effect/landmark/start/hangover,
/obj/structure/railing{
@@ -42251,6 +49325,16 @@
/obj/effect/turf_decal/trimline/blue/filled/corner{
dir = 8
},
+/obj/effect/turf_decal/trimline/white/corner{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/white/corner{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/blue/corner{
+ color = "#8ab4cb";
+ dir = 8
+ },
/turf/open/floor/iron/white,
/area/station/medical/treatment_center)
"iuR" = (
@@ -42260,30 +49344,21 @@
/turf/open/floor/vault/rock,
/area/station/security/prison)
"ivv" = (
-/obj/effect/turf_decal/stripes/line{
+/turf/open/floor/iron/edge{
dir = 1
},
-/obj/item/radio/intercom/directional/north,
-/turf/open/floor/iron,
/area/station/hallway/secondary/entry)
"ivz" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
dir = 4
},
-/turf/open/floor/iron/dark/textured,
-/area/station/command/gateway)
-"ivU" = (
-/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
-/obj/effect/turf_decal/tile/blue{
+/obj/effect/turf_decal/siding/wideplating_new/dark/end{
dir = 8
},
-/obj/effect/turf_decal/tile/blue,
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/iron/textured_large,
+/area/station/command/gateway)
+"ivU" = (
/obj/machinery/button/door{
id = "surgery";
name = "Surgery Shutter Control";
@@ -42293,6 +49368,13 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 8
},
+/obj/effect/turf_decal/siding{
+ dir = 6
+ },
+/obj/effect/turf_decal/trimline/blue/filled/line{
+ alpha = 160;
+ dir = 6
+ },
/turf/open/floor/iron/white,
/area/station/medical/surgery)
"ivV" = (
@@ -42307,6 +49389,16 @@
},
/turf/open/floor/iron/white,
/area/station/security/prison)
+"iwu" = (
+/obj/structure/fake_stairs/directional/north{
+ icon_state = "stairs-old";
+ icon = 'modular_skyrat/modules/aesthetics/floors/icons/floors.dmi';
+ color = "#555555";
+ dir = 1;
+ pixel_y = 1
+ },
+/turf/open/floor/plating,
+/area/station/maintenance/starboard/aft)
"iwB" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 4
@@ -42337,6 +49429,16 @@
"iwV" = (
/turf/closed/wall/r_wall,
/area/station/science/auxlab/firing_range)
+"iwY" = (
+/obj/structure/cable,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/dark_blue/filled/line{
+ dir = 1
+ },
+/turf/open/floor/plating,
+/area/station/maintenance/fore)
"ixi" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -42347,6 +49449,12 @@
/obj/effect/turf_decal/bot,
/turf/open/floor/iron/dark,
/area/station/security/courtroom)
+"ixV" = (
+/obj/effect/turf_decal/tile/green{
+ dir = 4
+ },
+/turf/open/floor/iron,
+/area/station/service/hydroponics/garden)
"iyb" = (
/obj/machinery/fax{
fax_name = "Service Hallway";
@@ -42355,6 +49463,17 @@
/obj/structure/table,
/turf/open/floor/iron/smooth_large,
/area/station/hallway/secondary/service)
+"iye" = (
+/obj/effect/turf_decal/trimline/green/arrow_ccw{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/green/mid_joiner{
+ dir = 1
+ },
+/turf/open/floor/iron/edge{
+ dir = 1
+ },
+/area/station/hallway/primary/starboard)
"iyp" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
@@ -42366,6 +49485,9 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 4
},
+/obj/effect/turf_decal/trimline/dark/warning{
+ dir = 8
+ },
/turf/open/floor/iron/dark,
/area/station/security/holding_cell)
"iyI" = (
@@ -42377,6 +49499,11 @@
/obj/structure/cable,
/turf/open/floor/iron/recharge_floor,
/area/station/security/mechbay)
+"izg" = (
+/obj/machinery/microwave/engineering,
+/obj/structure/table,
+/turf/open/floor/plating,
+/area/station/maintenance/port/aft)
"izp" = (
/obj/machinery/navbeacon{
codes_txt = "patrol;next_patrol=QM";
@@ -42396,22 +49523,49 @@
/obj/effect/landmark/start/depsec/supply,
/turf/open/floor/iron/dark,
/area/station/security/checkpoint/supply)
-"izU" = (
-/obj/structure/sign/warning/no_smoking{
- pixel_x = -25
+"izQ" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
},
+/obj/effect/turf_decal/trimline/yellow/filled/corner{
+ dir = 4;
+ alpha = 120
+ },
+/obj/effect/turf_decal/trimline/blue/corner{
+ dir = 4;
+ alpha = 200
+ },
+/turf/open/floor/iron/white/smooth_edge,
+/area/station/medical/chemistry)
+"izU" = (
/obj/machinery/atmospherics/components/unary/portables_connector/visible{
dir = 4
},
/obj/machinery/portable_atmospherics/canister/nitrogen,
+/obj/structure/sign/warning/no_smoking/directional/west,
/turf/open/floor/iron,
-/area/station/science/ordnance/bomb)
+/area/station/science/ordnance/testlab)
"izV" = (
/obj/structure/cable,
/obj/effect/mapping_helpers/burnt_floor,
/obj/effect/spawner/random/trash/mess,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 8
+ },
/turf/open/floor/plating,
/area/station/maintenance/starboard/fore)
+"iAm" = (
+/obj/effect/turf_decal/trimline/blue/arrow_cw{
+ alpha = 200
+ },
+/obj/effect/turf_decal/trimline/blue/mid_joiner{
+ alpha = 200
+ },
+/turf/open/floor/iron/corner{
+ dir = 4
+ },
+/area/station/hallway/primary/central)
"iAB" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/door/poddoor/shutters{
@@ -42449,11 +49603,9 @@
},
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/structure/disposalpipe/segment{
dir = 5
},
-/obj/machinery/firealarm/directional/south,
/turf/open/floor/iron/dark,
/area/station/hallway/secondary/exit)
"iBG" = (
@@ -42514,7 +49666,7 @@
id = "rnd2";
name = "Research Lab Shutters"
},
-/turf/open/floor/iron,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/science/lab)
"iCx" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -42531,6 +49683,23 @@
},
/turf/open/floor/circuit/green,
/area/station/engineering/gravity_generator)
+"iDu" = (
+/obj/effect/turf_decal/trimline/dark/filled/warning{
+ alpha = 160;
+ dir = 6
+ },
+/obj/effect/turf_decal/trimline/purple/warning{
+ alpha = 200;
+ dir = 6;
+ color = "#a56dc2"
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 6
+ },
+/turf/open/floor/iron/white/smooth_corner{
+ dir = 1
+ },
+/area/station/science/xenobiology)
"iEg" = (
/obj/effect/turf_decal/stripes/line{
dir = 6
@@ -42546,10 +49715,17 @@
/turf/open/floor/iron,
/area/station/science/ordnance)
"iEr" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/structure/cable,
-/turf/open/floor/plating,
-/area/station/medical/treatment_center)
+/obj/machinery/newscaster/directional/north,
+/obj/effect/turf_decal/trimline/green/arrow_ccw{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/green/mid_joiner{
+ dir = 1
+ },
+/turf/open/floor/iron/edge{
+ dir = 1
+ },
+/area/station/hallway/primary/central)
"iEH" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 5
@@ -42564,11 +49740,40 @@
"iER" = (
/obj/structure/sign/warning/biohazard,
/turf/closed/wall/r_wall,
-/area/station/maintenance/aft)
+/area/station/science/xenobiology)
+"iET" = (
+/obj/effect/turf_decal/trimline/dark/filled/line{
+ alpha = 160;
+ dir = 9
+ },
+/obj/effect/turf_decal/trimline/dark/filled/mid_joiner{
+ dir = 8;
+ alpha = 160
+ },
+/obj/effect/turf_decal/trimline/purple/line{
+ alpha = 200;
+ dir = 9;
+ color = "#a56dc2"
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 9
+ },
+/obj/effect/turf_decal/trimline/dark/filled/mid_joiner{
+ dir = 1;
+ alpha = 160
+ },
+/turf/open/floor/iron/white/smooth_corner,
+/area/station/science/xenobiology)
"iFn" = (
/obj/machinery/airalarm/directional/west,
/turf/open/floor/iron/dark,
/area/station/service/chapel)
+"iFu" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 6
+ },
+/turf/open/floor/iron,
+/area/station/maintenance/port/aft)
"iFv" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
dir = 4
@@ -42584,6 +49789,9 @@
"iFN" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/smart/manifold4w/general/hidden,
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/white,
/area/station/science/xenobiology)
"iFY" = (
@@ -42592,6 +49800,7 @@
/obj/structure/cable,
/obj/structure/disposalpipe/segment,
/obj/structure/sign/warning/secure_area/directional/east,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer5,
/turf/open/floor/plating,
/area/station/maintenance/port/aft)
"iGm" = (
@@ -42602,6 +49811,7 @@
/obj/structure/cable,
/obj/effect/turf_decal/trimline/dark_blue/filled/corner,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/turf_decal/trimline/dark/corner,
/turf/open/floor/iron/dark,
/area/station/security/execution/transfer)
"iHb" = (
@@ -42622,18 +49832,21 @@
/obj/structure/table/wood/fancy,
/turf/open/floor/wood/parquet,
/area/station/service/bar)
+"iHP" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/turf_decal/siding/dark{
+ dir = 8
+ },
+/turf/open/floor/iron/dark,
+/area/station/science/robotics/lab)
"iHT" = (
/obj/machinery/biogenerator,
/obj/machinery/light/directional/east,
+/obj/effect/turf_decal/trimline/green/filled/line{
+ dir = 4
+ },
/turf/open/floor/iron,
/area/station/service/hydroponics/garden)
-"iIa" = (
-/obj/structure/chair/sofa/bench{
- dir = 1
- },
-/obj/effect/turf_decal/tile/red,
-/turf/open/floor/iron/dark/side,
-/area/station/hallway/secondary/exit)
"iIQ" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 1
@@ -42652,6 +49865,7 @@
dir = 4
},
/obj/structure/disposalpipe/segment,
+/obj/effect/landmark/firealarm_sanity,
/turf/open/floor/plating,
/area/station/maintenance/department/medical/morgue)
"iIZ" = (
@@ -42660,6 +49874,10 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
/area/station/maintenance/port/aft)
+"iJp" = (
+/obj/effect/turf_decal/siding/dark/corner,
+/turf/open/floor/iron,
+/area/station/hallway/primary/starboard)
"iJU" = (
/obj/structure/table/reinforced,
/obj/machinery/door/firedoor/heavy,
@@ -42705,28 +49923,60 @@
/turf/open/floor/iron,
/area/station/hallway/primary/starboard)
"iLf" = (
-/obj/machinery/computer/records/medical{
- dir = 4
- },
-/obj/structure/window/reinforced/spawner/directional/west,
-/obj/effect/turf_decal/tile/green{
+/obj/effect/turf_decal/siding/dark{
dir = 1
},
-/obj/effect/turf_decal/tile/green{
- dir = 8
- },
-/turf/open/floor/iron,
+/obj/effect/turf_decal/siding/dark/corner,
+/turf/open/floor/iron/dark/corner,
/area/station/command/bridge)
"iLt" = (
-/obj/item/sticker/pslime,
-/turf/open/floor/engine,
+/obj/effect/turf_decal/siding/dark{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/dark/filled/line{
+ alpha = 160;
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/purple/line{
+ alpha = 200;
+ dir = 4;
+ color = "#a56dc2"
+ },
+/turf/open/floor/iron/white/smooth_edge{
+ dir = 4
+ },
/area/station/science/xenobiology)
"iLy" = (
/obj/structure/disposalpipe/trunk,
/obj/machinery/light/directional/east,
/obj/machinery/disposal/bin,
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/trimline/dark/filled/mid_joiner{
+ dir = 4;
+ alpha = 160
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 5
+ },
+/obj/effect/turf_decal/trimline/dark/filled/line{
+ alpha = 160;
+ dir = 5
+ },
+/obj/effect/turf_decal/trimline/purple/line{
+ color = "#700047";
+ alpha = 200;
+ dir = 5
+ },
+/turf/open/floor/iron/white/smooth_large,
/area/station/science/lab)
+"iLE" = (
+/obj/effect/turf_decal/trimline/dark_blue/corner{
+ dir = 4;
+ alpha = 200
+ },
+/turf/open/floor/iron/edge{
+ dir = 1
+ },
+/area/station/hallway/primary/central)
"iLJ" = (
/obj/machinery/light/directional/east,
/obj/structure/votebox{
@@ -42742,7 +49992,28 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/trimline/dark/filled/line{
+ alpha = 160;
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/dark/filled/mid_joiner{
+ dir = 1;
+ alpha = 160
+ },
+/obj/effect/turf_decal/trimline/purple/line{
+ alpha = 200;
+ dir = 1;
+ color = "#a56dc2"
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/corner{
+ dir = 8
+ },
+/turf/open/floor/iron/white/smooth_edge{
+ dir = 1
+ },
/area/station/science/xenobiology)
"iLQ" = (
/obj/structure/chair/comfy/brown{
@@ -42757,16 +50028,20 @@
/obj/structure/railing{
dir = 4
},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron/dark/textured,
+/obj/effect/turf_decal/siding/wideplating_new/dark{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/wideplating_new/dark{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/iron/textured_large,
/area/station/command/gateway)
"iMq" = (
/obj/machinery/door/airlock/security/glass{
name = "Prisoner Processing"
},
/obj/effect/turf_decal/delivery/blue,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/effect/mapping_helpers/airlock/access/any/security/brig,
/obj/structure/cable,
/turf/open/floor/iron/dark,
@@ -42775,6 +50050,9 @@
/obj/effect/turf_decal/trimline/dark_blue/filled/line{
dir = 6
},
+/obj/effect/turf_decal/trimline/dark/line{
+ dir = 6
+ },
/turf/open/floor/iron/dark,
/area/station/security/execution/transfer)
"iMt" = (
@@ -42793,6 +50071,23 @@
/obj/machinery/computer/security/telescreen/rd/directional/east,
/turf/open/floor/iron/cafeteria,
/area/station/command/heads_quarters/rd)
+"iMv" = (
+/obj/effect/turf_decal/stripes/white/line{
+ color = "#a56dc2"
+ },
+/obj/machinery/door/firedoor/border_only,
+/obj/structure/fluff/tram_rail/end{
+ pixel_y = -32
+ },
+/obj/effect/turf_decal/stripes/line,
+/obj/effect/turf_decal/stripes/white/line{
+ color = "#52B4E9";
+ name = "blue line"
+ },
+/obj/structure/railing,
+/obj/effect/turf_decal/tile/blue/fourcorners,
+/turf/open/floor/iron/white,
+/area/station/hallway/secondary/entry)
"iMH" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/mapping_helpers/broken_floor,
@@ -42809,7 +50104,12 @@
/obj/structure/table/reinforced,
/obj/effect/decal/cleanable/cobweb,
/obj/effect/spawner/surgery_tray/full/morgue,
-/turf/open/floor/iron/dark,
+/obj/effect/turf_decal/siding/dark/corner,
+/obj/effect/turf_decal/trimline/dark/filled/corner,
+/obj/effect/turf_decal/trimline/dark/filled/line{
+ dir = 9
+ },
+/turf/open/floor/iron/dark/small,
/area/station/medical/morgue)
"iNi" = (
/obj/machinery/disposal/bin,
@@ -42846,7 +50146,6 @@
/turf/closed/wall/r_wall,
/area/station/command/heads_quarters/blueshield)
"iNO" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/structure/closet/crate/secure{
desc = "A secure crate for bounty cubes to be placed and handed to the corrections officer or warden.";
name = "Bounty Cubes Crate";
@@ -42865,6 +50164,15 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
/area/station/maintenance/port/aft)
+"iOG" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 6
+ },
+/obj/effect/decal/cleanable/glitter{
+ color = "#ff8080"
+ },
+/turf/open/floor/wood,
+/area/station/maintenance/port/aft)
"iOK" = (
/obj/structure/chair/stool{
pixel_y = 8
@@ -42872,24 +50180,49 @@
/turf/open/floor/plating,
/area/station/maintenance/solars/starboard/fore)
"iOY" = (
-/obj/machinery/rnd/production/protolathe/department/science,
/obj/machinery/camera/directional/west{
c_tag = "Research Lab"
},
/obj/item/radio/intercom/directional/west,
-/turf/open/floor/iron/checker,
+/obj/machinery/rnd/production/protolathe/department/science,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/science/lab)
+"iPh" = (
+/obj/effect/turf_decal/trimline/yellow/corner,
+/turf/open/floor/iron/edge,
+/area/station/hallway/primary/port)
+"iPq" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/obj/structure/cable,
+/turf/open/floor/iron/edge{
+ dir = 4
+ },
+/area/station/hallway/primary/central)
"iPw" = (
/obj/item/radio/intercom/directional/north,
/obj/machinery/camera/directional/north{
c_tag = "Central Hallway North-West"
},
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/blue/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/blue/mid_joiner{
+ dir = 1
+ },
+/turf/open/floor/iron/edge{
+ dir = 1
+ },
/area/station/hallway/primary/central)
"iPE" = (
/obj/structure/chair/sofa/bench{
pixel_y = 8
},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/dark/side{
dir = 1
},
@@ -42899,12 +50232,18 @@
/obj/effect/turf_decal/trimline/dark_blue/filled/line{
dir = 1
},
+/obj/effect/turf_decal/trimline/dark/line{
+ dir = 1
+ },
/turf/open/floor/iron/dark,
/area/station/security/execution/transfer)
"iPP" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
dir = 8
},
+/obj/effect/turf_decal/siding/wood/corner{
+ dir = 4
+ },
/turf/open/floor/iron/dark/side{
dir = 5
},
@@ -42930,6 +50269,7 @@
/obj/item/clothing/suit/jacket/straight_jacket,
/obj/effect/turf_decal/trimline/dark_blue/filled/line,
/obj/item/electropack,
+/obj/effect/turf_decal/trimline/dark/line,
/turf/open/floor/iron/dark,
/area/station/security/execution/transfer)
"iQx" = (
@@ -42942,9 +50282,13 @@
/turf/open/floor/plating,
/area/station/maintenance/dorm_room)
"iQF" = (
-/obj/structure/sign/poster/random/directional/west,
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer4,
/turf/open/floor/plating,
-/area/station/maintenance/port)
+/area/station/maintenance/port/fore)
"iRI" = (
/obj/effect/turf_decal/stripes/line{
dir = 6
@@ -42952,12 +50296,33 @@
/obj/machinery/portable_atmospherics/canister/air,
/turf/open/floor/plating,
/area/station/maintenance/port)
+"iRK" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 5
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/turf_decal/siding/dark{
+ dir = 4
+ },
+/turf/open/floor/iron/dark,
+/area/station/science/robotics/lab)
"iRQ" = (
/obj/effect/turf_decal/stripes{
dir = 10
},
/turf/open/floor/engine,
/area/station/science/auxlab/firing_range)
+"iRV" = (
+/obj/effect/turf_decal/trimline/blue/arrow_ccw{
+ alpha = 200
+ },
+/obj/effect/turf_decal/trimline/blue/mid_joiner{
+ alpha = 200
+ },
+/turf/open/floor/iron/corner{
+ dir = 1
+ },
+/area/station/hallway/primary/central)
"iSr" = (
/turf/closed/wall/r_wall,
/area/station/hallway/primary/fore)
@@ -42976,11 +50341,12 @@
/obj/effect/turf_decal/stripes/end{
dir = 8
},
+/obj/structure/reagent_dispensers/wall/peppertank/directional/west,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/security/armory)
"iSY" = (
-/obj/structure/railing{
- dir = 1
+/obj/structure/railing/corner/end/flip{
+ dir = 4
},
/turf/open/floor/plating,
/area/station/maintenance/starboard/fore)
@@ -42989,7 +50355,15 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 8
},
-/turf/open/floor/iron/dark,
+/obj/effect/turf_decal/trimline/dark/filled/corner{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/dark/filled/corner,
+/obj/effect/turf_decal/trimline/dark/filled/line{
+ dir = 8
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/iron/dark/small,
/area/station/medical/morgue)
"iTn" = (
/obj/structure/window/plasma/spawner/directional/south,
@@ -43001,8 +50375,11 @@
/turf/open/floor/wood,
/area/station/maintenance/abandon_cafeteria)
"iTx" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/effect/decal/cleanable/blood/oil,
+/obj/structure/reagent_dispensers/watertank,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 8
+ },
+/obj/effect/turf_decal/bot,
/turf/open/floor/iron,
/area/station/cargo/warehouse)
"iTH" = (
@@ -43011,12 +50388,9 @@
},
/area/station/service/chapel)
"iTK" = (
-/obj/effect/turf_decal/delivery,
-/obj/structure/closet/crate,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron,
-/area/station/cargo/storage)
+/obj/structure/window/reinforced/spawner/directional/east,
+/turf/open/space/basic,
+/area/space/nearstation)
"iTL" = (
/obj/machinery/light_switch{
pixel_x = -4;
@@ -43039,6 +50413,15 @@
"iUh" = (
/obj/structure/cable,
/obj/effect/mapping_helpers/burnt_floor,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 8
+ },
+/obj/machinery/atmospherics/components/binary/passive_gate/layer4{
+ target_pressure = 2400;
+ on = 1;
+ name = "Airlock Valve";
+ dir = 4
+ },
/turf/open/floor/plating,
/area/station/maintenance/starboard/fore)
"iUH" = (
@@ -43048,6 +50431,18 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/security/prison/safe)
+"iUK" = (
+/obj/structure/window/reinforced/spawner/directional/east,
+/obj/structure/window/reinforced/spawner/directional/west,
+/obj/structure/window/reinforced/spawner/directional/south,
+/obj/structure/flora/grass/jungle/a,
+/obj/structure/flora/grass/jungle/b/style_4{
+ pixel_x = -1;
+ pixel_y = 15
+ },
+/obj/structure/flora/bush/flowers_yw/style_3,
+/turf/open/floor/grass,
+/area/station/cargo/office)
"iUM" = (
/obj/structure/cable,
/obj/effect/decal/cleanable/dirt,
@@ -43064,9 +50459,15 @@
/turf/open/floor/iron/dark,
/area/station/security/office)
"iVv" = (
-/obj/structure/flora/rock/pile/jungle/style_random,
-/turf/open/floor/grass,
-/area/station/science/cytology)
+/obj/effect/turf_decal/box/white{
+ color = "#a56dc2"
+ },
+/obj/structure/marker_beacon/violet,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/open/floor/iron/dark/smooth_large,
+/area/station/science/xenobiology)
"iWe" = (
/obj/structure/cable,
/obj/effect/turf_decal/siding/thinplating/dark/corner{
@@ -43080,6 +50481,12 @@
},
/turf/open/floor/iron,
/area/station/service/hydroponics/garden)
+"iWi" = (
+/obj/effect/turf_decal/trimline/blue/filled/line{
+ dir = 1
+ },
+/turf/open/floor/iron,
+/area/station/hallway/secondary/entry)
"iWA" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{
dir = 4
@@ -43106,7 +50513,15 @@
/obj/structure/chair/office{
dir = 8
},
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/brown/filled/warning{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/dark/warning{
+ dir = 8
+ },
+/turf/open/floor/iron/textured_edge{
+ dir = 4
+ },
/area/station/cargo/miningdock)
"iXk" = (
/obj/structure/closet/secure_closet/brig{
@@ -43120,6 +50535,26 @@
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
/turf/open/floor/wood,
/area/station/maintenance/abandon_cafeteria)
+"iXz" = (
+/obj/machinery/door/airlock/external{
+ name = "Port Docking Bay 3"
+ },
+/obj/structure/fans/tiny,
+/obj/effect/mapping_helpers/airlock/unres{
+ dir = 8
+ },
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+ dir = 4
+ },
+/turf/open/floor/plating,
+/area/station/hallway/secondary/entry)
+"iXB" = (
+/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{
+ dir = 10
+ },
+/obj/machinery/firealarm/directional/north,
+/turf/open/floor/iron,
+/area/station/engineering/atmos)
"iYg" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 4
@@ -43127,18 +50562,32 @@
/turf/open/floor/iron,
/area/station/service/hydroponics)
"iYh" = (
-/obj/effect/turf_decal/tile/blue{
- dir = 4
+/obj/machinery/iv_drip,
+/obj/effect/turf_decal/trimline/blue/filled/line{
+ dir = 5
+ },
+/obj/effect/turf_decal/siding{
+ dir = 5
},
-/obj/effect/turf_decal/tile/blue,
/turf/open/floor/iron/white,
/area/station/medical/surgery)
"iYj" = (
-/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 4
},
-/turf/open/floor/catwalk_floor/iron,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 6
+ },
+/obj/effect/turf_decal/trimline/white/filled/line{
+ dir = 4;
+ alpha = 160
+ },
+/obj/effect/turf_decal/trimline/purple/line{
+ alpha = 200;
+ dir = 4;
+ color = "#a56dc2"
+ },
+/turf/open/floor/iron,
/area/station/science/explab)
"iYy" = (
/obj/structure/musician/piano,
@@ -43169,18 +50618,27 @@
pixel_y = 4
},
/obj/structure/table,
-/obj/effect/turf_decal/tile/red,
-/obj/effect/turf_decal/tile/red{
- dir = 8
- },
-/obj/effect/turf_decal/tile/neutral,
-/turf/open/floor/iron/dark,
+/obj/effect/turf_decal/delivery/blue,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/security/checkpoint/customs)
"iZl" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/cafeteria,
/area/station/security/prison)
+"iZo" = (
+/obj/effect/turf_decal/stripes/line,
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/machinery/door/firedoor,
+/obj/effect/turf_decal/stripes/blue/line,
+/obj/effect/turf_decal/stripes/blue/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/blue/full,
+/turf/open/floor/iron/dark/smooth_large,
+/area/station/medical/medbay/central)
"iZw" = (
/obj/structure/chair{
name = "Judge"
@@ -43210,7 +50668,7 @@
"iZT" = (
/obj/structure/window/reinforced/spawner/directional/west,
/obj/machinery/hydroponics/soil,
-/obj/effect/turf_decal/siding/blue{
+/obj/effect/turf_decal/siding/wood{
dir = 4
},
/turf/open/floor/grass,
@@ -43226,6 +50684,12 @@
},
/turf/open/floor/iron/dark,
/area/station/commons/fitness/recreation/entertainment)
+"jak" = (
+/obj/effect/spawner/structure/window/reinforced/tinted,
+/obj/structure/cable,
+/obj/effect/decal/cleanable/blood/splatter/over_window,
+/turf/open/floor/plating,
+/area/station/security/interrogation)
"jao" = (
/obj/effect/turf_decal/stripes/corner,
/obj/machinery/light/small/directional/east,
@@ -43262,11 +50726,14 @@
/turf/open/floor/iron/dark,
/area/station/security/office)
"jbp" = (
-/obj/machinery/light/directional/west,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
dir = 4
},
-/turf/open/floor/mineral/titanium/blue,
+/obj/machinery/light/directional/west,
+/obj/effect/turf_decal/siding/white{
+ dir = 8
+ },
+/turf/open/floor/iron/white/small,
/area/station/commons/toilet)
"jbq" = (
/obj/structure/kitchenspike,
@@ -43275,17 +50742,12 @@
/turf/open/floor/iron,
/area/station/maintenance/starboard/fore)
"jbt" = (
-/obj/effect/turf_decal/tile/yellow{
- dir = 1
- },
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+/obj/effect/turf_decal/trimline/dark_blue/warning{
+ alpha = 200;
dir = 8
},
-/obj/machinery/light/directional/south,
-/turf/open/floor/iron/dark/side{
- dir = 6
- },
-/area/station/engineering/atmos/hfr_room)
+/turf/open/floor/iron,
+/area/station/hallway/primary/fore)
"jbJ" = (
/obj/machinery/door/airlock/maintenance{
name = "Cargo Bay Maintenance"
@@ -43295,6 +50757,10 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 8
},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer5,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 8
+ },
/turf/open/floor/plating,
/area/station/maintenance/port)
"jbV" = (
@@ -43308,6 +50774,9 @@
id = "cell5";
pixel_x = -24
},
+/obj/effect/turf_decal/trimline/dark/line{
+ dir = 10
+ },
/turf/open/floor/iron/dark,
/area/station/security/holding_cell)
"jco" = (
@@ -43323,19 +50792,38 @@
/turf/open/floor/wood,
/area/station/maintenance/abandon_cafeteria)
"jcM" = (
-/obj/machinery/door/airlock/vault{
- name = "Vault"
- },
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 6
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 10
},
+/obj/machinery/door/airlock/vault{
+ name = "Vault"
+ },
/obj/effect/mapping_helpers/airlock/access/any/supply/vault,
/obj/effect/mapping_helpers/airlock/locked,
/turf/open/floor/iron/dark/textured_large,
/area/station/ai_monitored/command/nuke_storage)
+"jcQ" = (
+/obj/machinery/atmospherics/components/unary/airlock_pump/unbolt_only{
+ dir = 8
+ },
+/turf/open/floor/plating,
+/area/station/maintenance/starboard/fore)
+"jdd" = (
+/obj/effect/turf_decal/trimline/blue/corner{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/dark_blue/corner{
+ alpha = 200;
+ dir = 1
+ },
+/obj/machinery/light/directional/north,
+/turf/open/floor/iron/edge{
+ dir = 1
+ },
+/area/station/hallway/primary/port)
"jdy" = (
/obj/structure/table,
/obj/machinery/chem_dispenser/drinks,
@@ -43356,13 +50844,21 @@
/area/station/security/execution/transfer)
"jdH" = (
/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/random/burgerstation/odd,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer4,
/turf/open/floor/plating,
/area/station/maintenance/starboard/aft)
"jei" = (
-/obj/effect/turf_decal/trimline/blue/filled/line,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/trimline/blue/filled/line,
+/obj/effect/turf_decal/trimline/white/line,
+/obj/effect/turf_decal/trimline/blue/filled/mid_joiner,
+/obj/effect/turf_decal/siding/blue/corner{
+ color = "#8ab4cb"
+ },
+/turf/open/floor/iron/white/smooth_edge,
/area/station/medical/treatment_center)
"jeB" = (
/obj/effect/decal/cleanable/dirt,
@@ -43375,6 +50871,15 @@
/obj/effect/spawner/random/burgerstation/loot/with_maintenance_loot,
/turf/open/floor/plating,
/area/station/maintenance/aft)
+"jeK" = (
+/obj/structure/window/reinforced/spawner/directional/east,
+/obj/structure/window/reinforced/spawner/directional/north,
+/obj/structure/window/reinforced/spawner/directional/west,
+/obj/structure/flora/rock/pile/style_2,
+/obj/structure/flora/rock,
+/obj/structure/ore_vein/gold,
+/turf/open/floor/plating,
+/area/station/hallway/secondary/entry)
"jeQ" = (
/obj/structure/chair/office,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
@@ -43403,13 +50908,42 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 4
},
-/turf/open/floor/iron/dark,
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/effect/turf_decal/stripes/white/line{
+ dir = 8;
+ color = "#EFB341"
+ },
+/obj/effect/turf_decal/siding/wideplating/dark/corner{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/wideplating/dark/corner{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/dark,
+/obj/effect/turf_decal/siding/dark{
+ dir = 1
+ },
+/turf/open/floor/iron/textured_large,
/area/station/ai_monitored/command/storage/eva)
+"jfL" = (
+/obj/structure/urinal/directional/north,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/duct,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/turf/open/floor/iron/freezer,
+/area/station/maintenance/port/aft)
"jgc" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 4
},
/obj/effect/turf_decal/tile/neutral/opposingcorners,
+/obj/effect/turf_decal/siding/wood{
+ dir = 1
+ },
/turf/open/floor/iron/dark,
/area/station/service/bar)
"jgi" = (
@@ -43417,6 +50951,12 @@
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
/turf/open/floor/wood,
/area/station/security/prison)
+"jgJ" = (
+/obj/effect/turf_decal/trimline/blue/filled/line{
+ dir = 1
+ },
+/turf/open/floor/iron/edge,
+/area/station/hallway/secondary/entry)
"jgL" = (
/turf/open/floor/iron/smooth,
/area/station/ai_monitored/security/armory)
@@ -43464,6 +51004,9 @@
/turf/open/floor/iron/dark,
/area/station/security/warden)
"jhG" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 8
+ },
/obj/structure/table/glass,
/obj/effect/turf_decal/tile/blue,
/obj/effect/turf_decal/tile/blue{
@@ -43480,9 +51023,6 @@
fax_name = "Chief Medical Officer's Office";
name = "Chief Medical Officer's Fax Machine"
},
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
- dir = 8
- },
/turf/open/floor/iron/dark,
/area/station/command/heads_quarters/cmo)
"jib" = (
@@ -43492,7 +51032,25 @@
dir = 4
},
/obj/machinery/incident_display/disease/directional/north,
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/trimline/blue/filled/line{
+ alpha = 160;
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/white/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/blue/filled/mid_joiner{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/blue/filled/mid_joiner{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/white/mid_joiner{
+ dir = 1
+ },
+/turf/open/floor/iron/white/smooth_edge{
+ dir = 1
+ },
/area/station/medical/medbay/central)
"jij" = (
/obj/item/fakeartefact,
@@ -43508,6 +51066,17 @@
},
/turf/open/floor/iron/cafeteria,
/area/station/service/kitchen)
+"jiB" = (
+/obj/effect/turf_decal/trimline/yellow/corner{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 4
+ },
+/turf/open/floor/iron/edge{
+ dir = 4
+ },
+/area/station/hallway/primary/aft)
"jiK" = (
/obj/structure/closet/toolcloset,
/obj/effect/turf_decal/tile/yellow,
@@ -43520,6 +51089,7 @@
/obj/structure/table/wood,
/obj/effect/spawner/random/entertainment/coin,
/obj/effect/spawner/random/entertainment/gambling,
+/obj/effect/landmark/start/hangover,
/turf/open/floor/iron/dark,
/area/station/commons/fitness/recreation/entertainment)
"jjr" = (
@@ -43541,27 +51111,66 @@
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/door/firedoor/heavy,
/obj/structure/disposalpipe/segment,
/obj/machinery/door/airlock/atmos{
name = "Turbine Access"
},
/obj/effect/mapping_helpers/airlock/access/any/engineering/atmos,
-/obj/machinery/door/firedoor/heavy,
/turf/open/floor/iron,
/area/station/maintenance/disposal/incinerator)
+"jjA" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/neutral/line,
+/obj/effect/turf_decal/trimline/neutral/mid_joiner,
+/obj/machinery/firealarm/directional/south,
+/turf/open/floor/iron/edge,
+/area/station/hallway/primary/port)
+"jjJ" = (
+/obj/effect/turf_decal/trimline/brown/filled/corner,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/trimline/brown/filled/corner{
+ dir = 4
+ },
+/turf/open/floor/iron,
+/area/station/cargo/storage)
"jjO" = (
/obj/effect/turf_decal/trimline/dark_blue/filled/corner{
dir = 4
},
+/obj/effect/turf_decal/trimline/dark/corner{
+ dir = 4
+ },
/turf/open/floor/iron/dark,
/area/station/security/brig)
+"jkb" = (
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+ dir = 8
+ },
+/obj/machinery/door/airlock/external,
+/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance,
+/obj/effect/mapping_helpers/airlock/unres{
+ dir = 4
+ },
+/turf/open/floor/plating,
+/area/station/maintenance/starboard)
"jkd" = (
-/obj/effect/turf_decal/trimline/blue/filled/line,
/obj/structure/disposalpipe/segment{
dir = 4
},
-/turf/open/floor/iron/white,
-/area/station/medical/medbay/aft)
+/obj/effect/turf_decal/trimline/blue/filled/line{
+ alpha = 160
+ },
+/obj/effect/turf_decal/trimline/dark_blue/line{
+ alpha = 200
+ },
+/obj/effect/turf_decal/trimline/blue/filled/mid_joiner,
+/obj/effect/turf_decal/trimline/blue/filled/mid_joiner,
+/obj/effect/turf_decal/trimline/dark_blue/mid_joiner,
+/turf/open/floor/iron/white/smooth_edge,
+/area/station/medical/medbay/central)
"jkh" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -43577,22 +51186,30 @@
/obj/effect/turf_decal/trimline/dark_blue/filled/warning{
dir = 6
},
+/obj/effect/turf_decal/trimline/dark/warning{
+ dir = 6
+ },
/turf/open/floor/iron/dark,
/area/station/security/execution/transfer)
"jkG" = (
-/obj/machinery/power/apc/auto_name/directional/south,
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
/obj/structure/cable,
-/turf/open/floor/iron,
+/obj/machinery/power/apc/auto_name/directional/south,
+/obj/effect/turf_decal/trimline/blue/warning{
+ dir = 10;
+ alpha = 200
+ },
+/turf/open/floor/iron/corner{
+ dir = 4
+ },
/area/station/hallway/primary/central)
"jkK" = (
/obj/machinery/light/directional/east,
/obj/effect/turf_decal/trimline/dark_blue/filled/line{
dir = 4
},
+/obj/effect/turf_decal/trimline/dark/line{
+ dir = 4
+ },
/turf/open/floor/iron/dark,
/area/station/security/execution/transfer)
"jkM" = (
@@ -43603,10 +51220,6 @@
/turf/open/floor/iron/dark/textured,
/area/station/science/genetics)
"jkR" = (
-/obj/machinery/door/airlock/command{
- name = "Gateway"
- },
-/obj/effect/mapping_helpers/airlock/access/any/command/gateway,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 4
},
@@ -43614,15 +51227,28 @@
dir = 4
},
/obj/structure/cable,
+/obj/machinery/door/airlock/command{
+ name = "Gateway"
+ },
+/obj/effect/mapping_helpers/airlock/access/any/command/gateway,
/obj/effect/landmark/navigate_destination/gateway,
/obj/machinery/door/firedoor,
-/turf/open/floor/iron/dark/textured,
+/turf/open/floor/iron/dark/textured_large,
/area/station/command/gateway)
"jly" = (
-/obj/effect/turf_decal/stripes/line{
+/obj/effect/turf_decal/stripes/line,
+/obj/effect/turf_decal/trimline/blue/filled/line,
+/obj/effect/turf_decal/stripes/white/line,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 5
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer5,
+/turf/open/floor/iron/edge{
dir = 1
},
-/turf/open/floor/iron,
/area/station/hallway/secondary/entry)
"jlL" = (
/obj/machinery/atmospherics/components/unary/vent_pump/siphon/monitored/oxygen_output{
@@ -43638,10 +51264,22 @@
/obj/item/toy/cards/deck,
/turf/open/floor/wood,
/area/station/security/prison)
+"jmp" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 1
+ },
+/turf/open/floor/iron,
+/area/station/maintenance/port/fore)
"jms" = (
/obj/structure/cable,
/obj/machinery/airalarm/directional/east,
-/turf/open/floor/mineral/titanium/blue,
+/obj/effect/turf_decal/siding/white{
+ dir = 5
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/turf/open/floor/iron/white/small,
/area/station/commons/toilet)
"jmy" = (
/obj/structure/chair/office/light{
@@ -43658,6 +51296,7 @@
/obj/machinery/camera/directional/south{
c_tag = "Fore Primary Hallway East"
},
+/obj/effect/turf_decal/trimline/dark/line,
/turf/open/floor/iron/dark,
/area/station/security/brig)
"jnb" = (
@@ -43704,7 +51343,16 @@
dir = 10
},
/obj/structure/cable,
-/obj/effect/turf_decal/stripes/line{
+/obj/effect/turf_decal/trimline/dark/filled/corner{
+ alpha = 160;
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/purple/corner{
+ color = "#700047";
+ alpha = 200;
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/dark/corner{
dir = 1
},
/turf/open/floor/iron/white,
@@ -43733,13 +51381,44 @@
/turf/open/floor/iron/dark/textured,
/area/station/command/heads_quarters/rd)
"joy" = (
-/obj/machinery/door/firedoor,
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 9
},
-/turf/open/floor/iron,
+/obj/machinery/door/firedoor,
+/turf/open/floor/iron/large,
/area/station/hallway/primary/port)
+"joB" = (
+/obj/machinery/computer/shuttle/arrivals/recall,
+/obj/machinery/door/firedoor/border_only{
+ dir = 1
+ },
+/obj/structure/window/reinforced/spawner/directional/north,
+/obj/structure/fluff/metalpole{
+ dir = 1;
+ pixel_y = 32
+ },
+/turf/open/floor/iron/dark/smooth_large,
+/area/station/hallway/secondary/entry)
+"joH" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 5
+ },
+/obj/effect/turf_decal/trimline/blue/filled/corner{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/blue/filled/corner,
+/obj/effect/turf_decal/trimline/blue/filled/corner{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 5
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/turf/open/floor/iron,
+/area/station/hallway/secondary/entry)
"joM" = (
/obj/structure/disposalpipe/segment{
dir = 9
@@ -43747,11 +51426,33 @@
/obj/effect/turf_decal/trimline/dark_blue/filled/line{
dir = 1
},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/dark_blue/line{
+ alpha = 200;
+ dir = 1
+ },
/turf/open/floor/iron/dark,
/area/station/security/office)
"joT" = (
/turf/open/floor/plating/airless,
/area/station/solars/starboard/aft)
+"joV" = (
+/obj/machinery/iv_drip,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 6
+ },
+/turf/open/floor/wood,
+/area/station/maintenance/port/aft)
+"joX" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/turf_decal/trimline/green/filled/line{
+ dir = 8
+ },
+/turf/open/floor/iron,
+/area/station/service/hydroponics/garden)
"jpp" = (
/obj/effect/turf_decal/siding/wood{
dir = 8
@@ -43760,6 +51461,7 @@
dir = 8
},
/obj/machinery/firealarm/directional/east,
+/obj/machinery/light_switch/directional/south,
/turf/open/floor/iron/dark/textured,
/area/station/command/heads_quarters/blueshield)
"jpu" = (
@@ -43835,7 +51537,9 @@
"jpQ" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/door/airlock/public/glass,
+/obj/machinery/door/airlock/public/glass{
+ name = "Mess Hall"
+ },
/obj/machinery/door/poddoor/shutters/preopen{
id = "briggate";
name = "Security Shutters"
@@ -43844,14 +51548,23 @@
/turf/open/floor/iron,
/area/station/security/prison)
"jqd" = (
-/obj/machinery/door/airlock/external{
- name = "Port Docking Bay 1"
- },
-/obj/effect/mapping_helpers/airlock/cyclelink_helper,
-/obj/effect/mapping_helpers/airlock/unres{
+/obj/effect/turf_decal/siding/wood{
dir = 1
},
-/turf/open/floor/plating,
+/obj/effect/turf_decal/trimline/blue/filled/corner{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/blue/filled/corner{
+ dir = 1
+ },
+/obj/effect/landmark/start/hangover,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 5
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/turf/open/floor/iron/edge,
/area/station/hallway/secondary/entry)
"jqo" = (
/obj/machinery/computer/prisoner/management,
@@ -43887,6 +51600,12 @@
dir = 1
},
/area/station/security/prison)
+"jrk" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/iron/textured_half,
+/area/station/hallway/primary/aft)
"jrr" = (
/obj/machinery/door/firedoor,
/obj/effect/mapping_helpers/airlock/locked,
@@ -43916,7 +51635,7 @@
pixel_x = -24
},
/obj/effect/mapping_helpers/airlock/access/any/medical/general,
-/turf/open/floor/iron,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/medical/virology)
"jrG" = (
/obj/structure/chair,
@@ -43936,6 +51655,9 @@
/obj/structure/disposalpipe/segment{
dir = 9
},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 9
+ },
/turf/open/floor/plating,
/area/station/maintenance/port/aft)
"jst" = (
@@ -43946,38 +51668,61 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/plating,
/area/station/maintenance/starboard/aft)
+"jsA" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/neutral/corner,
+/turf/open/floor/iron/edge,
+/area/station/hallway/primary/port)
"jsH" = (
/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
/obj/machinery/door/firedoor,
-/turf/open/floor/iron/dark,
+/obj/effect/turf_decal/stripes/blue/line,
+/obj/effect/turf_decal/stripes/blue/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/blue/full,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/medical/treatment_center)
"jsN" = (
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
- dir = 4
+/obj/effect/turf_decal/trimline/blue/filled/line{
+ dir = 5
},
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+/obj/effect/turf_decal/trimline/white/line{
+ dir = 5
+ },
+/turf/open/floor/iron/white/smooth_corner{
dir = 8
},
-/turf/open/floor/iron/white,
/area/station/medical/medbay/lobby)
"jsP" = (
/obj/structure/table/optable,
/obj/item/paper/guides/jobs/medical/morgue,
-/turf/open/floor/iron/dark,
+/obj/effect/turf_decal/siding/dark{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/dark/filled/line{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/dark/filled/line{
+ dir = 4
+ },
+/turf/open/floor/iron/dark/small,
/area/station/medical/morgue)
"jsT" = (
/obj/structure/cable,
-/obj/effect/turf_decal/tile/yellow{
+/obj/effect/turf_decal/trimline/yellow/filled/line{
dir = 4
},
-/obj/effect/turf_decal/tile/blue,
-/turf/open/floor/iron/dark/side{
- dir = 8
+/obj/effect/turf_decal/trimline/dark_blue/line{
+ alpha = 200;
+ dir = 4
},
+/turf/open/floor/iron/dark,
/area/station/engineering/atmos/hfr_room)
"jtb" = (
/obj/machinery/vatgrower{
@@ -44030,6 +51775,9 @@
/obj/effect/turf_decal/trimline/dark_blue/filled/line{
dir = 8
},
+/obj/effect/turf_decal/trimline/dark/line{
+ dir = 8
+ },
/turf/open/floor/iron/dark,
/area/station/security/execution/transfer)
"jtQ" = (
@@ -44060,29 +51808,61 @@
/area/station/hallway/primary/central/fore)
"jvL" = (
/obj/structure/disposalpipe/segment,
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
dir = 4
},
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/blue/arrow_cw{
+ dir = 8;
+ alpha = 200
+ },
+/obj/effect/turf_decal/trimline/blue/mid_joiner{
+ alpha = 200;
+ dir = 8
+ },
+/turf/open/floor/iron/edge{
+ dir = 8
+ },
/area/station/hallway/primary/central)
"jvM" = (
-/obj/effect/turf_decal/tile/dark_blue{
- dir = 4
- },
-/obj/effect/turf_decal/tile/dark_blue,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/door/window/left/directional/east{
name = "Brig Infirmary"
},
+/obj/effect/turf_decal/trimline/red/real_red/filled/warning{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/turf_decal/trimline/dark/warning{
+ dir = 4
+ },
/turf/open/floor/iron/white,
/area/station/security/medical)
"jvR" = (
/obj/structure/cable,
/turf/open/floor/iron/dark,
/area/station/security/office)
+"jvU" = (
+/obj/effect/turf_decal/trimline/dark/filled/line{
+ alpha = 160;
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/dark/filled/mid_joiner{
+ dir = 4;
+ alpha = 160
+ },
+/obj/effect/turf_decal/trimline/purple/line{
+ alpha = 200;
+ dir = 4;
+ color = "#a56dc2"
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 4
+ },
+/obj/item/radio/intercom/directional/east,
+/obj/machinery/light/directional/east,
+/turf/open/floor/iron/white/smooth_edge{
+ dir = 4
+ },
+/area/station/science/xenobiology)
"jwi" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -44091,6 +51871,7 @@
dir = 4
},
/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer5,
/turf/open/floor/plating,
/area/station/maintenance/port)
"jwn" = (
@@ -44110,10 +51891,8 @@
/turf/open/floor/wood/parquet,
/area/station/command/heads_quarters/nt_rep)
"jxd" = (
-/obj/structure/sign/warning/no_smoking{
- pixel_x = -28
- },
/obj/structure/closet/secure_closet/atmospherics,
+/obj/structure/sign/warning/no_smoking/directional/west,
/turf/open/floor/iron,
/area/station/maintenance/disposal/incinerator)
"jxt" = (
@@ -44172,12 +51951,24 @@
/turf/open/floor/iron/dark/textured_large,
/area/station/cargo/miningdock)
"jzM" = (
-/obj/structure/extinguisher_cabinet{
- dir = 4;
- pixel_x = 24
+/obj/effect/turf_decal/trimline/dark/filled/line{
+ alpha = 160;
+ dir = 4
},
-/turf/open/floor/iron/white/side{
- dir = 9
+/obj/effect/turf_decal/trimline/dark/filled/mid_joiner{
+ dir = 4;
+ alpha = 160
+ },
+/obj/effect/turf_decal/trimline/purple/line{
+ alpha = 200;
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 4
+ },
+/obj/structure/extinguisher_cabinet/directional/east,
+/turf/open/floor/iron/white/smooth_edge{
+ dir = 4
},
/area/station/science/research)
"jzP" = (
@@ -44192,8 +51983,8 @@
/turf/open/floor/plating,
/area/station/ai_monitored/turret_protected/aisat_interior)
"jAi" = (
-/obj/effect/turf_decal/siding/wood{
- dir = 6
+/obj/effect/turf_decal/siding/dark{
+ dir = 4
},
/turf/open/floor/wood,
/area/station/command/heads_quarters/captain)
@@ -44209,6 +52000,16 @@
/obj/machinery/rnd/server/master,
/turf/open/floor/iron/dark/telecomms,
/area/station/science/server)
+"jBz" = (
+/obj/effect/turf_decal/trimline/yellow/filled/corner{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/dark_blue/corner{
+ dir = 1;
+ alpha = 200
+ },
+/turf/open/floor/iron/dark,
+/area/station/engineering/atmos/hfr_room)
"jBL" = (
/obj/structure/disposalpipe/segment{
dir = 10
@@ -44223,13 +52024,24 @@
/turf/open/floor/iron/grimy,
/area/station/security/detectives_office)
"jBX" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/effect/turf_decal/trimline/blue/filled/line{
dir = 6
},
/obj/machinery/iv_drip,
/obj/machinery/newscaster/directional/south,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/trimline/white/line{
+ dir = 6
+ },
+/obj/effect/turf_decal/trimline/blue/filled/mid_joiner{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/blue{
+ color = "#8ab4cb"
+ },
+/turf/open/floor/iron/white/smooth_corner{
+ dir = 1
+ },
/area/station/medical/treatment_center)
"jBZ" = (
/obj/machinery/door/airlock/maintenance{
@@ -44245,6 +52057,7 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 8
},
+/obj/machinery/door/firedoor,
/turf/open/floor/iron,
/area/station/maintenance/starboard/fore)
"jCc" = (
@@ -44259,12 +52072,11 @@
/turf/open/floor/plating,
/area/station/maintenance/aft)
"jCu" = (
-/obj/structure/window/spawner/directional/east,
-/obj/structure/window/spawner/directional/south,
/obj/machinery/hydroponics/constructable,
/obj/effect/turf_decal/siding/thinplating/dark{
dir = 5
},
+/obj/machinery/door/window/left/directional/south,
/turf/open/floor/iron/smooth_large,
/area/station/service/hydroponics)
"jCU" = (
@@ -44275,26 +52087,54 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 8
},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/brown/filled/corner{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/dark/corner{
+ dir = 8
+ },
+/turf/open/floor/iron/textured_corner{
+ dir = 8
+ },
/area/station/cargo/miningdock)
"jCY" = (
/obj/effect/decal/cleanable/dirt,
-/obj/structure/closet/crate,
/obj/item/clothing/head/helmet/space/plasmaman/bitrunner,
/obj/item/clothing/under/plasmaman/bitrunner,
/obj/effect/spawner/random/maintenance/two,
+/obj/structure/closet/crate,
+/obj/machinery/atmospherics/pipe/layer_manifold/cyan/hidden{
+ dir = 8
+ },
/turf/open/floor/plating,
/area/station/maintenance/port/aft)
"jDF" = (
-/obj/effect/turf_decal/siding/wood{
- dir = 1
- },
/obj/structure/chair/sofa/corp/right{
dir = 8
},
+/obj/effect/turf_decal/siding/wideplating_new/dark{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/wood{
+ dir = 1
+ },
/turf/open/floor/wood/parquet,
/area/station/science/breakroom)
+"jDW" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 5
+ },
+/obj/effect/turf_decal/trimline/blue/filled/line,
+/obj/machinery/camera/autoname/directional/south{
+ c_tag = "Arrivals Bay 1 North"
+ },
+/turf/open/floor/iron/edge{
+ dir = 1
+ },
+/area/station/hallway/secondary/entry)
"jEc" = (
/obj/structure/chair/wood{
dir = 1
@@ -44303,7 +52143,10 @@
/turf/open/floor/wood,
/area/station/maintenance/abandon_cafeteria)
"jEe" = (
-/obj/effect/turf_decal/trimline/blue/filled/corner,
+/obj/effect/turf_decal/trimline/blue/filled/corner{
+ alpha = 160
+ },
+/obj/effect/turf_decal/trimline/white/corner,
/turf/open/floor/iron/white,
/area/station/medical/treatment_center)
"jEC" = (
@@ -44326,11 +52169,9 @@
/obj/structure/disposalpipe/sorting/mail/flip{
dir = 4
},
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
- dir = 4
- },
/obj/effect/mapping_helpers/mail_sorting/security/general,
/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer5,
/turf/open/floor/iron/dark,
/area/station/security/office)
"jFh" = (
@@ -44343,24 +52184,37 @@
/turf/open/floor/iron,
/area/station/engineering/storage/tech)
"jFl" = (
-/obj/machinery/mechpad,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
- dir = 5
+/obj/structure/table/reinforced/rglass,
+/obj/item/reagent_containers/hypospray/medipen/deforest/robot_liquid_solder{
+ pixel_x = 0;
+ pixel_y = 12
},
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
- dir = 5
+/obj/item/clothing/accessory/dogtag{
+ pixel_x = -2;
+ pixel_y = 0;
+ desc = "Doesn't look like there are any markings left."
},
-/turf/open/floor/iron/white,
+/obj/item/reagent_containers/medigel/sterilizine{
+ pixel_x = -10;
+ pixel_y = 8
+ },
+/obj/machinery/light/directional/south,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/science/robotics/lab)
"jFm" = (
-/obj/effect/turf_decal/trimline/blue/filled/line,
-/obj/machinery/holopad,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 8
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/turf_decal/trimline/blue/filled/line,
+/obj/machinery/holopad,
/turf/open/floor/iron/dark,
/area/station/command/heads_quarters/cmo)
+"jFB" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron/textured_half,
+/area/station/hallway/primary/port)
"jFP" = (
/obj/machinery/requests_console/directional/west{
department = "Chief Engineer's Desk";
@@ -44387,6 +52241,7 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/door/firedoor,
+/obj/effect/turf_decal/trimline/dark/line,
/turf/open/floor/iron/dark,
/area/station/security/execution/transfer)
"jGi" = (
@@ -44404,8 +52259,13 @@
/obj/item/toy/foamblade,
/obj/item/toy/toy_dagger,
/obj/item/radio/intercom/directional/west,
+/obj/structure/sign/poster/contraband/kudzu/directional/north,
/turf/open/floor/iron,
/area/station/commons/fitness/recreation)
+"jHp" = (
+/obj/structure/sign/warning/docking/directional/east,
+/turf/open/floor/iron/smooth_large,
+/area/station/engineering/main)
"jHt" = (
/obj/structure/disposalpipe/segment{
dir = 6
@@ -44424,13 +52284,16 @@
/turf/open/floor/iron,
/area/station/maintenance/port/fore)
"jHP" = (
-/obj/effect/turf_decal/tile/brown{
- dir = 8
- },
-/obj/effect/turf_decal/tile/brown,
/obj/structure/table,
-/obj/item/storage/toolbox/mechanical,
-/turf/open/floor/iron,
+/obj/item/food/cheesiehonkers{
+ pixel_x = -1;
+ pixel_y = 3
+ },
+/obj/effect/turf_decal/bot,
+/obj/structure/marker_beacon/bronze{
+ pixel_x = -16
+ },
+/turf/open/floor/iron/dark/textured_large,
/area/station/cargo/office)
"jHU" = (
/obj/structure/table/wood,
@@ -44454,9 +52317,25 @@
/obj/effect/decal/cleanable/dirt,
/obj/structure/cable,
/turf/open/floor/iron,
-/area/station/science/ordnance/bomb)
+/area/station/science/ordnance/testlab)
+"jIq" = (
+/obj/structure/table/glass,
+/obj/item/book/manual/hydroponics_pod_people,
+/obj/item/paper/guides/jobs/hydroponics,
+/turf/open/floor/iron,
+/area/station/service/hydroponics)
+"jIB" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer5,
+/obj/structure/disposalpipe/junction/flip{
+ dir = 8
+ },
+/turf/open/floor/plating,
+/area/station/maintenance/port)
"jIN" = (
-/obj/effect/landmark/event_spawn,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 4
},
@@ -44465,26 +52344,85 @@
},
/obj/structure/cable,
/obj/effect/landmark/start/hangover,
+/obj/effect/landmark/event_spawn,
/turf/open/floor/iron,
/area/station/hallway/primary/central)
+"jIO" = (
+/obj/effect/decal/cleanable/blood/trail_holder{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 6
+ },
+/turf/open/misc/hay,
+/area/station/maintenance/port/aft)
+"jIQ" = (
+/obj/structure/chair/comfy/brown{
+ dir = 4
+ },
+/obj/structure/window/spawner/directional/west,
+/obj/effect/landmark/start/assistant,
+/obj/machinery/light/directional/south,
+/turf/open/floor/wood,
+/area/station/service/library)
"jJl" = (
-/obj/effect/turf_decal/tile/purple/anticorner/contrasted,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/siding/dark{
+ dir = 1
+ },
+/turf/open/floor/iron/large,
/area/station/hallway/primary/starboard)
+"jJr" = (
+/obj/machinery/door/airlock/external{
+ name = "Port Docking Bay 3"
+ },
+/obj/machinery/door/firedoor,
+/obj/effect/turf_decal/siding/white/corner{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 5
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer4,
+/turf/open/floor/iron/shuttle/exploration/hazard,
+/area/station/hallway/secondary/entry)
+"jJv" = (
+/obj/effect/mapping_helpers/broken_floor,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 5
+ },
+/obj/effect/turf_decal/siding/wood{
+ dir = 1
+ },
+/turf/open/floor/plating,
+/area/station/maintenance/aft)
"jJB" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible,
/turf/closed/wall/r_wall,
/area/station/science/ordnance/burnchamber)
+"jJZ" = (
+/obj/effect/decal/cleanable/cobweb/cobweb2,
+/obj/structure/closet/crate/bin,
+/obj/item/toy/plush/monkey,
+/obj/effect/spawner/random/peel_or_nana,
+/turf/open/floor/plating,
+/area/station/maintenance/port/aft)
"jKb" = (
-/obj/effect/decal/cleanable/dirt,
/obj/structure/railing{
dir = 8
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 4
},
-/obj/machinery/airalarm/directional/east,
-/turf/open/floor/iron/dark/textured,
+/obj/effect/turf_decal/siding/wideplating_new/dark{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/wideplating_new/dark{
+ dir = 4
+ },
+/turf/open/floor/iron/textured_large,
/area/station/command/gateway)
"jKd" = (
/obj/structure/table,
@@ -44494,6 +52432,32 @@
},
/turf/open/floor/iron/dark/small,
/area/station/security/interrogation)
+"jLB" = (
+/obj/structure/disposalpipe/segment,
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/noticeboard/hop{
+ pixel_x = 32;
+ pixel_y = 4
+ },
+/obj/effect/turf_decal/siding/wood{
+ dir = 8
+ },
+/turf/open/floor/iron/dark/smooth_large,
+/area/station/command/heads_quarters/hop)
+"jLE" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 8
+ },
+/turf/open/floor/iron/textured_large,
+/area/station/ai_monitored/command/storage/eva)
"jLM" = (
/obj/structure/window/spawner/directional/south,
/obj/structure/closet/secure_closet/personal/cabinet,
@@ -44509,20 +52473,44 @@
/turf/open/floor/iron/dark,
/area/station/ai_monitored/turret_protected/aisat_interior)
"jLY" = (
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
/obj/structure/table/glass,
-/obj/machinery/vending/wallmed{
- pixel_x = -32
- },
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
/obj/effect/spawner/surgery_tray/full,
+/obj/effect/turf_decal/siding{
+ dir = 9
+ },
+/obj/effect/turf_decal/trimline/blue/filled/line{
+ alpha = 160;
+ dir = 9
+ },
+/obj/machinery/vending/wallmed/directional/west,
/turf/open/floor/iron/white,
/area/station/medical/surgery)
+"jMb" = (
+/obj/structure/window/reinforced/spawner/directional/north,
+/obj/structure/window/reinforced/spawner/directional/south,
+/obj/structure/window/reinforced/spawner/directional/west,
+/obj/structure/flora/ash/fireblossom{
+ pixel_x = 5;
+ pixel_y = -1;
+ light_on = 0
+ },
+/obj/item/food/grown/ash_flora/fireblossom{
+ pixel_x = 15;
+ pixel_y = 0;
+ light_on = 0
+ },
+/obj/structure/ore_vein/iron,
+/obj/structure/marker_beacon/bronze{
+ pixel_x = 16;
+ pixel_y = 0
+ },
+/turf/open/floor/fakebasalt,
+/area/station/hallway/secondary/entry)
+"jMd" = (
+/obj/structure/sign/departments/aisat/directional/east,
+/turf/open/floor/iron/smooth_large,
+/area/station/engineering/main)
"jMf" = (
/obj/effect/turf_decal/tile/red{
dir = 8
@@ -44537,12 +52525,10 @@
/turf/open/floor/iron/dark,
/area/station/hallway/secondary/exit)
"jMm" = (
-/obj/effect/turf_decal/bot_white,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 1
},
-/turf/open/floor/iron/dark,
+/turf/open/floor/iron/dark/textured_large,
/area/station/ai_monitored/turret_protected/ai_upload)
"jMH" = (
/obj/machinery/camera/directional/south{
@@ -44585,7 +52571,7 @@
dir = 5
},
/turf/open/floor/iron/dark,
-/area/station/engineering/main)
+/area/station/engineering/supermatter/room)
"jNa" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/structure/curtain{
@@ -44596,6 +52582,15 @@
/obj/structure/cable,
/turf/open/floor/plating,
/area/station/security/prison)
+"jNj" = (
+/obj/machinery/door/airlock/research{
+ name = "Robotics Lab"
+ },
+/obj/effect/mapping_helpers/airlock/access/any/science/robotics,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/iron/dark/smooth_large,
+/area/station/science/robotics/lab)
"jNF" = (
/turf/open/floor/carpet,
/area/station/command/heads_quarters/rd)
@@ -44605,6 +52600,9 @@
},
/obj/machinery/light/directional/west,
/obj/structure/cable,
+/obj/effect/turf_decal/siding/wood{
+ dir = 8
+ },
/turf/open/floor/wood,
/area/station/security/prison)
"jOF" = (
@@ -44618,10 +52616,8 @@
/turf/open/floor/iron/dark,
/area/station/service/chapel)
"jOV" = (
-/obj/effect/decal/cleanable/dirt,
+/obj/structure/closet/crate/trashcart,
/obj/effect/turf_decal/bot,
-/obj/structure/closet/crate/preopen,
-/obj/effect/decal/cleanable/blood/oil,
/turf/open/floor/iron,
/area/station/cargo/warehouse)
"jPh" = (
@@ -44633,11 +52629,11 @@
/turf/open/floor/iron/dark,
/area/station/security/prison)
"jPn" = (
+/obj/structure/disposalpipe/segment,
/obj/machinery/door/airlock/maintenance,
/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance,
/obj/effect/mapping_helpers/airlock/unres,
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/plating,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/maintenance/aft)
"jPz" = (
/obj/effect/mapping_helpers/turn_off_lights_with_lightswitch,
@@ -44681,30 +52677,19 @@
/obj/machinery/airalarm/directional/west,
/turf/open/floor/iron/dark,
/area/station/security/corrections_officer)
-"jQp" = (
-/obj/effect/turf_decal/trimline/blue/filled/line{
- dir = 8
- },
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/iron/white,
-/area/station/medical/medbay/aft)
-"jQC" = (
-/obj/machinery/firealarm/directional/west,
-/turf/open/floor/iron/white,
-/area/station/science/xenobiology)
"jQY" = (
/obj/effect/landmark/event_spawn,
/obj/effect/turf_decal/trimline/dark_blue/filled/line{
dir = 1
},
+/obj/effect/turf_decal/trimline/dark/line{
+ dir = 1
+ },
/turf/open/floor/iron/dark,
/area/station/security/brig)
"jRs" = (
/obj/machinery/atmospherics/components/unary/thermomachine/freezer/on,
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/turf/open/floor/iron,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/science/xenobiology)
"jRA" = (
/obj/effect/turf_decal/tile/green,
@@ -44732,18 +52717,16 @@
name = "Warehouse"
},
/obj/effect/mapping_helpers/airlock/access/all/supply/general,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
- dir = 8
- },
-/obj/structure/cable,
-/turf/open/floor/iron,
+/turf/open/floor/iron/large,
/area/station/cargo/warehouse)
"jSG" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
dir = 8
},
-/turf/open/floor/wood,
+/obj/effect/turf_decal/siding/wood{
+ dir = 6
+ },
+/turf/open/floor/wood/parquet,
/area/station/command/heads_quarters/hop)
"jSK" = (
/obj/structure/cable,
@@ -44758,6 +52741,9 @@
/obj/effect/turf_decal/trimline/dark_blue/filled/line{
dir = 6
},
+/obj/effect/turf_decal/trimline/dark/line{
+ dir = 6
+ },
/turf/open/floor/iron/dark,
/area/station/security/brig)
"jSX" = (
@@ -44766,6 +52752,7 @@
/area/station/commons/dorms)
"jTg" = (
/obj/structure/sign/warning/vacuum/external/directional/west,
+/obj/structure/sign/warning/pods/directional/east,
/turf/open/floor/plating,
/area/station/maintenance/aft)
"jTp" = (
@@ -44775,7 +52762,6 @@
/obj/item/stock_parts/micro_laser,
/obj/item/stock_parts/servo,
/obj/item/stock_parts/servo,
-/obj/item/stack/sheet/iron/five,
/obj/item/stack/cable_coil,
/obj/structure/closet/crate{
name = "E.X.P.E.R.I-MENTOR Supply Crate"
@@ -44783,6 +52769,12 @@
/obj/effect/turf_decal/stripes/line{
dir = 8
},
+/obj/item/stack/sheet/iron/fifty,
+/obj/item/stack/sheet/glass/fifty{
+ pixel_x = 3;
+ pixel_y = 3
+ },
+/obj/item/stack/sheet/mineral/plasma,
/turf/open/floor/iron/dark,
/area/station/science/explab)
"jTr" = (
@@ -44812,7 +52804,25 @@
dir = 1
},
/obj/machinery/light/directional/north,
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/trimline/blue/filled/line{
+ alpha = 160;
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/white/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/blue/filled/mid_joiner{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/blue/filled/mid_joiner{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/white/mid_joiner{
+ dir = 1
+ },
+/turf/open/floor/iron/white/smooth_edge{
+ dir = 1
+ },
/area/station/medical/medbay/central)
"jUG" = (
/obj/structure/cable,
@@ -44821,8 +52831,19 @@
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/turf_decal/trimline/dark/line{
+ dir = 8
+ },
/turf/open/floor/iron/dark,
/area/station/security/brig)
+"jUL" = (
+/obj/effect/spawner/random/trash,
+/obj/structure/sign/poster/contraband/pharlap/directional/west,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 6
+ },
+/turf/open/floor/wood,
+/area/station/maintenance/port/aft)
"jUW" = (
/obj/structure/grille/broken,
/obj/structure/lattice,
@@ -44833,17 +52854,19 @@
dir = 1
},
/obj/machinery/status_display/evac/directional/north,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/dark_blue/line{
+ alpha = 200;
+ dir = 1
+ },
/turf/open/floor/iron/dark,
/area/station/security/office)
"jVc" = (
-/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
-/obj/machinery/light/directional/north,
-/turf/open/floor/iron/white/corner{
- dir = 1
- },
-/area/station/hallway/secondary/entry)
+/obj/structure/window/reinforced/spawner/directional/south,
+/turf/open/space/basic,
+/area/space/nearstation)
"jVl" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -44861,21 +52884,24 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/door/window/left/directional/south,
/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/wood,
/area/station/security/prison)
"jVL" = (
-/obj/structure/disposalpipe/segment,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
- dir = 8
+/obj/structure/cable,
+/obj/structure/disposalpipe/segment{
+ dir = 4
},
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/box,
+/obj/machinery/chem_mass_spec,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/medical/pharmacy)
"jVM" = (
+/obj/structure/cable,
/obj/machinery/power/apc/auto_name/directional/north,
/obj/structure/table,
/obj/item/stack/sheet/glass/fifty,
/obj/item/stack/rods/fifty,
-/obj/structure/cable,
/obj/effect/turf_decal/tile/yellow{
dir = 4
},
@@ -44888,13 +52914,27 @@
/obj/machinery/firealarm/directional/west,
/turf/open/floor/iron,
/area/station/commons/storage/tools)
+"jWk" = (
+/obj/effect/turf_decal/trimline/yellow/filled/line{
+ dir = 8;
+ alpha = 120
+ },
+/obj/effect/turf_decal/trimline/blue/line{
+ alpha = 200;
+ dir = 8
+ },
+/turf/open/floor/iron/white/smooth_edge{
+ dir = 8
+ },
+/area/station/medical/chemistry)
"jWl" = (
/obj/structure/flora/bush/sparsegrass/style_random,
/turf/open/floor/grass,
/area/station/science/cytology)
"jWt" = (
-/obj/effect/spawner/random/structure/crate,
/obj/effect/decal/cleanable/dirt,
+/obj/effect/spawner/random/structure/crate,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer4,
/turf/open/floor/iron,
/area/station/maintenance/starboard)
"jXa" = (
@@ -44916,22 +52956,23 @@
dir = 4
},
/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer4,
/turf/open/floor/plating,
/area/station/maintenance/port/fore)
"jXp" = (
-/obj/machinery/portable_atmospherics/canister,
-/obj/effect/turf_decal/bot,
+/obj/effect/turf_decal/trimline/yellow/filled/corner{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/dark_blue/corner{
+ alpha = 200;
+ dir = 8
+ },
/turf/open/floor/iron/dark,
/area/station/engineering/atmos/hfr_room)
"jXy" = (
-/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
-/obj/effect/turf_decal/tile/blue,
-/obj/machinery/iv_drip,
/obj/machinery/camera/directional/south{
c_tag = "Surgery B";
network = list("ss13","medbay")
@@ -44940,12 +52981,21 @@
dir = 9
},
/obj/item/radio/intercom/directional/east,
+/obj/structure/sink/directional/west,
+/obj/effect/turf_decal/siding{
+ dir = 6
+ },
+/obj/effect/turf_decal/trimline/blue/filled/line{
+ alpha = 160;
+ dir = 6
+ },
/obj/machinery/firealarm/directional/south,
/turf/open/floor/iron/white,
/area/station/medical/surgery/fore)
"jXG" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/cable,
/turf/open/floor/iron/dark/side{
dir = 6
},
@@ -44969,7 +53019,7 @@
pixel_y = -4
},
/turf/open/floor/iron,
-/area/station/science/ordnance/bomb)
+/area/station/science/ordnance/testlab)
"jXI" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 4
@@ -45011,6 +53061,10 @@
/obj/item/radio/intercom/prison/directional/north,
/turf/open/floor/iron,
/area/station/security/prison/safe)
+"jYx" = (
+/obj/effect/turf_decal/trimline/green/filled/line,
+/turf/open/floor/iron,
+/area/station/service/hydroponics/garden)
"jYM" = (
/obj/structure/chair/office,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
@@ -45046,11 +53100,6 @@
},
/turf/open/floor/plating,
/area/station/maintenance/starboard/fore)
-"kaY" = (
-/obj/effect/turf_decal/tile/red/opposingcorners,
-/obj/machinery/firealarm/directional/south,
-/turf/open/floor/iron,
-/area/station/commons/fitness/recreation)
"kbk" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
@@ -45064,6 +53113,25 @@
},
/turf/open/floor/plating,
/area/station/cargo/drone_bay)
+"kbm" = (
+/obj/effect/turf_decal/siding/dark{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 8
+ },
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+ dir = 1
+ },
+/turf/open/floor/iron/textured_large,
+/area/station/ai_monitored/command/storage/eva)
+"kbu" = (
+/obj/effect/turf_decal/siding/dark{
+ dir = 8;
+ icon_state = "siding_plain_end"
+ },
+/turf/open/floor/circuit/red,
+/area/station/ai_monitored/turret_protected/ai_upload)
"kbz" = (
/obj/machinery/light/floor,
/obj/effect/turf_decal/tile/neutral{
@@ -45074,14 +53142,24 @@
},
/area/station/commons/fitness)
"kbG" = (
-/obj/effect/turf_decal/tile/blue{
+/obj/machinery/light/directional/west,
+/obj/effect/turf_decal/siding/dark/corner{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/dark/corner{
dir = 8
},
-/obj/effect/turf_decal/tile/blue{
- dir = 1
+/obj/effect/turf_decal/siding/dark{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/dark/corner,
+/obj/structure/fluff/paper/stack{
+ dir = 8
+ },
+/obj/item/clothing/suit/hooded/wintercoat/medical,
+/turf/open/floor/iron/dark/smooth_corner{
+ dir = 4
},
-/obj/machinery/light/directional/west,
-/turf/open/floor/iron/white,
/area/station/medical/cryo)
"kct" = (
/obj/machinery/button/door{
@@ -45098,12 +53176,9 @@
/turf/open/floor/iron/dark,
/area/station/ai_monitored/security/armory)
"kcw" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 10
- },
-/obj/item/kirbyplants/random,
-/turf/open/floor/iron,
-/area/station/hallway/secondary/entry)
+/obj/structure/window/reinforced/spawner/directional/north,
+/turf/open/space/basic,
+/area/space/nearstation)
"kcx" = (
/obj/effect/turf_decal/siding/wood{
dir = 1
@@ -45118,22 +53193,17 @@
/turf/open/floor/vault/rock,
/area/station/security/prison)
"kcL" = (
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
/obj/structure/cable,
/obj/machinery/defibrillator_mount/directional/north,
/obj/machinery/stasis{
dir = 4
},
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/tile/blue/full,
+/obj/effect/turf_decal/siding/blue{
+ dir = 9;
+ color = "#8ab4cb"
+ },
+/turf/open/floor/iron/white/smooth_large,
/area/station/medical/treatment_center)
"kcN" = (
/obj/structure/cable,
@@ -45147,9 +53217,6 @@
/area/station/engineering/main)
"kcV" = (
/obj/structure/cable,
-/obj/machinery/door/airlock/public/glass{
- name = "Prison Wing"
- },
/obj/effect/turf_decal/tile/red{
dir = 8
},
@@ -45159,6 +53226,9 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/effect/mapping_helpers/airlock/access/any/security/general,
+/obj/machinery/door/airlock/multi_tile/public/glass{
+ name = "Prison Wing"
+ },
/turf/open/floor/iron,
/area/station/security/brig)
"kdi" = (
@@ -45180,16 +53250,38 @@
},
/turf/open/floor/iron/dark,
/area/station/security/brig)
+"kdr" = (
+/obj/effect/turf_decal/trimline/yellow/filled/warning{
+ alpha = 120;
+ dir = 6
+ },
+/obj/effect/turf_decal/trimline/blue/warning{
+ dir = 6;
+ alpha = 200
+ },
+/turf/open/floor/iron/white/smooth_corner{
+ dir = 1
+ },
+/area/station/medical/chemistry)
"kdz" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
/turf/open/floor/eighties,
/area/station/maintenance/abandon_arcade)
"kdI" = (
-/obj/effect/turf_decal/stripes/corner{
- dir = 8
+/obj/structure/window/reinforced/spawner/directional/east,
+/obj/structure/window/reinforced/spawner/directional/west,
+/obj/item/food/grown/ash_flora/fireblossom{
+ pixel_x = -3;
+ pixel_y = -6;
+ light_on = 0
},
-/turf/open/floor/iron,
+/obj/structure/flora/ash/tall_shroom{
+ pixel_x = 0;
+ pixel_y = 5
+ },
+/obj/structure/marker_beacon/bronze,
+/turf/open/floor/fakebasalt,
/area/station/hallway/secondary/entry)
"kdP" = (
/obj/effect/decal/cleanable/dirt,
@@ -45215,8 +53307,17 @@
/turf/open/floor/iron/dark/side,
/area/station/security/prison)
"keQ" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/closed/wall,
+/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 4
+ },
+/obj/machinery/door/airlock/external{
+ name = "External Access"
+ },
+/obj/effect/mapping_helpers/airlock/unres,
+/obj/effect/mapping_helpers/airlock/cyclelink_helper,
+/turf/open/floor/plating,
/area/station/maintenance/starboard/aft)
"keS" = (
/obj/effect/turf_decal/trimline/green/filled/line,
@@ -45224,6 +53325,9 @@
dir = 4
},
/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+ dir = 8
+ },
/turf/open/floor/iron,
/area/station/service/hydroponics/garden/abandoned)
"keW" = (
@@ -45245,6 +53349,9 @@
/obj/structure/chair/sofa/corp/corner{
dir = 8
},
+/obj/effect/turf_decal/siding/wideplating_new/dark{
+ dir = 6
+ },
/turf/open/floor/wood/parquet,
/area/station/science/breakroom)
"kfE" = (
@@ -45279,17 +53386,10 @@
pixel_y = 7
},
/obj/structure/table/wood,
-/turf/open/floor/carpet/royalblue,
+/turf/open/floor/iron/dark/textured_large,
/area/station/command/heads_quarters/hop)
"kgM" = (
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
- dir = 1
- },
-/obj/machinery/door/airlock/external{
- name = "Port Docking Bay 1"
- },
-/obj/effect/mapping_helpers/airlock/unres,
-/turf/open/floor/plating,
+/turf/open/floor/tram/plate,
/area/station/hallway/secondary/entry)
"kgP" = (
/obj/structure/reagent_dispensers/watertank,
@@ -45301,17 +53401,27 @@
/area/station/ai_monitored/turret_protected/ai)
"kgW" = (
/obj/effect/mapping_helpers/dead_body_placer,
-/turf/open/floor/iron/dark,
+/obj/effect/turf_decal/trimline/dark/filled/line{
+ dir = 1
+ },
+/turf/open/floor/iron/dark/small,
/area/station/medical/morgue)
"kgZ" = (
/obj/machinery/light/directional/east,
/turf/open/floor/iron/dark,
/area/station/engineering/gravity_generator)
"khB" = (
-/obj/effect/turf_decal/stripes/corner{
- dir = 1
+/obj/structure/chair/wood{
+ dir = 4
},
-/turf/open/floor/iron,
+/obj/effect/landmark/start/assistant,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 5
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/turf/open/floor/carpet,
/area/station/hallway/secondary/entry)
"khQ" = (
/obj/structure/disposalpipe/segment,
@@ -45334,7 +53444,6 @@
/obj/structure/bed/dogbed/mcgriff,
/mob/living/basic/pet/dog/pug/mcgriff,
/obj/machinery/light/directional/north,
-/obj/machinery/firealarm/directional/north,
/turf/open/floor/iron/showroomfloor,
/area/station/security/warden)
"kii" = (
@@ -45342,6 +53451,10 @@
/obj/effect/spawner/random/entertainment/dice,
/turf/open/floor/iron/textured,
/area/station/security/prison)
+"kiq" = (
+/obj/effect/turf_decal/siding/wood,
+/turf/open/floor/wood/tile,
+/area/station/hallway/secondary/entry)
"kja" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 4
@@ -45352,18 +53465,17 @@
/turf/open/floor/iron/smooth_large,
/area/station/engineering/main)
"kjh" = (
-/obj/effect/turf_decal/tile/yellow{
- dir = 1
+/obj/effect/turf_decal/trimline/yellow/corner{
+ dir = 4
},
-/obj/effect/turf_decal/tile/yellow{
- dir = 8
+/turf/open/floor/iron/edge{
+ dir = 4
},
-/obj/structure/closet/emcloset,
-/turf/open/floor/iron,
/area/station/hallway/primary/aft)
"kjH" = (
/obj/effect/turf_decal/trimline/dark_blue/filled/line,
/obj/machinery/photobooth/security,
+/obj/effect/turf_decal/trimline/dark/line,
/turf/open/floor/iron/dark,
/area/station/security/execution/transfer)
"kjN" = (
@@ -45400,6 +53512,19 @@
/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/iron/dark,
/area/station/commons/fitness/recreation/entertainment)
+"kkr" = (
+/obj/structure/disposalpipe/segment,
+/obj/machinery/light/directional/west,
+/obj/effect/turf_decal/trimline/dark_blue/arrow_ccw{
+ dir = 8;
+ alpha = 200
+ },
+/obj/effect/turf_decal/trimline/dark_blue/mid_joiner{
+ dir = 8;
+ alpha = 200
+ },
+/turf/open/floor/iron/corner,
+/area/station/hallway/primary/central)
"kku" = (
/obj/structure/plasticflaps/opaque,
/turf/open/floor/iron/dark,
@@ -45515,22 +53640,13 @@
pixel_x = 1;
pixel_y = 5
},
-/turf/open/floor/iron/dark,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/ai_monitored/command/storage/eva)
"klp" = (
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
-/obj/structure/table/glass,
/obj/effect/spawner/random/medical/medkit,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/tile/blue/full,
+/obj/structure/table/glass,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/medical/treatment_center)
"klr" = (
/obj/structure/cable,
@@ -45542,7 +53658,22 @@
/obj/effect/turf_decal/trimline/blue/filled/line{
dir = 5
},
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/trimline/white/line{
+ dir = 5
+ },
+/obj/effect/turf_decal/trimline/blue/filled/mid_joiner{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/blue/filled/mid_joiner{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/blue{
+ color = "#8ab4cb";
+ dir = 4
+ },
+/turf/open/floor/iron/white/smooth_corner{
+ dir = 8
+ },
/area/station/medical/treatment_center)
"klG" = (
/obj/structure/table,
@@ -45553,6 +53684,29 @@
/obj/item/pen,
/turf/open/floor/iron/dark/textured_large,
/area/station/hallway/primary/central)
+"kmc" = (
+/obj/effect/turf_decal/trimline/blue/filled/line{
+ dir = 10
+ },
+/obj/effect/turf_decal/trimline/white/line{
+ dir = 10
+ },
+/obj/effect/turf_decal/trimline/blue/filled/mid_joiner,
+/obj/effect/turf_decal/trimline/blue/filled/mid_joiner{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/white/mid_joiner,
+/obj/effect/turf_decal/trimline/white/mid_joiner{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/blue{
+ color = "#8ab4cb";
+ dir = 10
+ },
+/turf/open/floor/iron/white/smooth_corner{
+ dir = 4
+ },
+/area/station/medical/treatment_center)
"kmD" = (
/obj/effect/landmark/start/assistant,
/obj/structure/chair/stool/bar/directional/east,
@@ -45565,17 +53719,32 @@
/obj/structure/disposalpipe/segment{
dir = 10
},
-/turf/open/floor/iron/dark/side{
+/obj/machinery/light/directional/east,
+/obj/effect/turf_decal/stripes/line{
+ dir = 6
+ },
+/obj/effect/turf_decal/stripes/white/line{
+ dir = 9;
+ color = "#EFB341"
+ },
+/obj/effect/turf_decal/siding/wideplating/dark/corner{
dir = 8
},
+/obj/effect/turf_decal/siding/dark{
+ dir = 8
+ },
+/obj/machinery/firealarm/directional/east,
+/turf/open/floor/iron/textured_large,
/area/station/ai_monitored/command/storage/eva)
"kmT" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/orange/visible{
- dir = 4
+/mob/living/basic/bat{
+ name = "Nosferatu"
},
-/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/plating,
-/area/station/engineering/atmos)
+/obj/effect/decal/cleanable/blood/drip,
+/obj/effect/landmark/generic_maintenance_landmark,
+/obj/effect/landmark/blobstart,
+/turf/open/floor/wood,
+/area/station/maintenance/port/aft)
"knb" = (
/obj/machinery/griddle,
/turf/open/floor/iron/kitchen,
@@ -45597,12 +53766,32 @@
/obj/machinery/camera/directional/east{
c_tag = "Garden North"
},
+/obj/effect/turf_decal/trimline/green/filled/line{
+ dir = 1
+ },
/turf/open/floor/iron,
/area/station/service/hydroponics/garden)
"koo" = (
-/obj/effect/decal/cleanable/blood/splatter/oil,
/obj/structure/disposalpipe/segment,
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/trimline/dark/filled/line{
+ alpha = 160;
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/purple/line{
+ color = "#700047";
+ alpha = 200;
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/dark/filled/mid_joiner{
+ dir = 4;
+ alpha = 160
+ },
+/turf/open/floor/iron/white/smooth_half{
+ dir = 1
+ },
/area/station/science/lab)
"koB" = (
/obj/structure/disposalpipe/segment,
@@ -45616,7 +53805,15 @@
/obj/machinery/camera/directional/east{
c_tag = "Central Hallway South-East"
},
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/blue/line{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/blue/mid_joiner{
+ dir = 4
+ },
+/turf/open/floor/iron/edge{
+ dir = 4
+ },
/area/station/hallway/primary/central)
"kpb" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -45629,17 +53826,42 @@
dir = 9
},
/obj/machinery/firealarm/directional/north,
+/obj/effect/turf_decal/trimline/dark/warning{
+ dir = 9
+ },
/turf/open/floor/iron/dark,
/area/station/security/execution/transfer)
"kpl" = (
/obj/structure/disposalpipe/segment,
/turf/closed/wall,
/area/station/medical/surgery/fore)
+"kpu" = (
+/obj/effect/turf_decal/siding/thinplating_new/dark/corner{
+ dir = 1
+ },
+/turf/open/floor/iron/dark,
+/area/station/science/robotics/lab)
+"kpz" = (
+/obj/machinery/light/directional/north,
+/obj/effect/turf_decal/trimline/green/arrow_ccw{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/green/mid_joiner{
+ dir = 1
+ },
+/turf/open/floor/iron/corner{
+ dir = 8
+ },
+/area/station/hallway/primary/central)
"kpB" = (
/obj/effect/turf_decal/trimline/dark_blue/filled/line{
dir = 9
},
/obj/machinery/rnd/production/techfab/department/security,
+/obj/effect/turf_decal/trimline/dark_blue/line{
+ alpha = 200;
+ dir = 9
+ },
/turf/open/floor/iron/dark,
/area/station/security/office)
"kpM" = (
@@ -45656,13 +53878,40 @@
"kqn" = (
/obj/machinery/iv_drip,
/obj/structure/bed/medical/emergency,
-/turf/open/floor/iron/dark,
+/obj/machinery/firealarm/directional/west,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/medical/morgue)
+"kqp" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/door/airlock/public/glass{
+ name = "Garden"
+ },
+/obj/effect/landmark/navigate_destination,
+/obj/machinery/door/firedoor,
+/turf/open/floor/iron,
+/area/station/service/hydroponics/garden)
"kqq" = (
/obj/effect/turf_decal/trimline/green/filled/line{
+ dir = 4;
+ alpha = 160
+ },
+/obj/effect/turf_decal/trimline/dark_green/line{
+ alpha = 200;
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/green/filled/mid_joiner{
+ alpha = 160;
+ dir = 4
+ },
+/obj/machinery/power/apc/auto_name/directional/east,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+ dir = 1
+ },
+/obj/structure/cable,
+/turf/open/floor/iron/white/smooth_edge{
dir = 4
},
-/turf/open/floor/iron/white,
/area/station/medical/medbay/aft)
"kqs" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -45684,10 +53933,24 @@
/obj/machinery/ammo_workbench,
/turf/open/floor/iron/smooth,
/area/station/ai_monitored/security/armory)
+"kqR" = (
+/obj/effect/turf_decal/trimline/brown/filled/corner{
+ dir = 8
+ },
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+ dir = 4
+ },
+/turf/open/floor/iron/textured_corner{
+ dir = 8
+ },
+/area/station/cargo/storage)
"kqZ" = (
/obj/structure/cable,
/obj/effect/turf_decal/siding/thinplating/dark/corner,
/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 5
+ },
/turf/open/floor/plating,
/area/station/maintenance/port/aft)
"krb" = (
@@ -45696,6 +53959,23 @@
},
/turf/open/floor/engine,
/area/station/maintenance/disposal/incinerator)
+"krf" = (
+/obj/effect/turf_decal/siding/dark/end{
+ dir = 8
+ },
+/turf/open/floor/carpet/black,
+/area/station/security/checkpoint/escape)
+"kri" = (
+/obj/effect/turf_decal/trimline/brown/filled/line{
+ dir = 8
+ },
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+ dir = 4
+ },
+/turf/open/floor/iron/textured_edge{
+ dir = 4
+ },
+/area/station/cargo/storage)
"krJ" = (
/obj/structure/lattice/catwalk,
/turf/open/space/basic,
@@ -45724,8 +54004,30 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 4
},
-/turf/open/floor/iron/dark,
+/obj/effect/turf_decal/siding/dark/corner{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/obj/effect/turf_decal/stripes/white/line{
+ dir = 4;
+ color = "#EFB341"
+ },
+/obj/effect/turf_decal/siding/wideplating/dark/corner,
+/obj/effect/turf_decal/siding/wideplating/dark/corner{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/dark,
+/turf/open/floor/iron/textured_large,
/area/station/ai_monitored/command/storage/eva)
+"ktm" = (
+/obj/effect/turf_decal/siding/dark{
+ dir = 4;
+ icon_state = "siding_plain_end"
+ },
+/turf/open/floor/circuit/green,
+/area/station/ai_monitored/turret_protected/ai_upload)
"ktt" = (
/obj/effect/spawner/random/burgerstation/table,
/obj/item/reagent_containers/cup/bottle/nutrient/empty{
@@ -45735,6 +54037,33 @@
/obj/item/trash/raisins,
/turf/open/floor/iron,
/area/station/science/ordnance)
+"ktu" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 5
+ },
+/turf/open/floor/plating,
+/area/station/maintenance/aft)
+"ktv" = (
+/obj/machinery/door/airlock/external{
+ name = "Solar Maintenance"
+ },
+/obj/structure/cable,
+/obj/effect/mapping_helpers/airlock/access/any/engineering/general,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 1
+ },
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+ dir = 1
+ },
+/turf/open/floor/plating,
+/area/station/maintenance/solars/port/fore)
"ktF" = (
/obj/machinery/smartfridge/organ,
/obj/effect/turf_decal/tile/blue/fourcorners,
@@ -45748,18 +54077,77 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/structure/disposalpipe/segment,
/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron,
+/obj/machinery/light/floor,
+/obj/structure/decorative/fluff{
+ icon = 'modular_skyrat/modules/aesthetics/floors/icons/floors.dmi';
+ base_icon_state = "stairs-old";
+ icon_state = "stairs-old";
+ anchored = 1;
+ pixel_y = -17;
+ name = "staircase";
+ desc = "A small step for the humanity, and so is for you."
+ },
+/obj/structure/decorative/fluff{
+ icon = 'icons/turf/decals.dmi';
+ icon_state = "tile_half";
+ anchored = 1;
+ color = "#2a2e2e";
+ name = "decorative tile covers";
+ pixel_y = 6
+ },
+/obj/structure/decorative/fluff{
+ icon = 'icons/turf/decals.dmi';
+ icon_state = "warningline";
+ anchored = 1;
+ name = "warning line"
+ },
+/obj/structure/decorative/fluff{
+ icon = 'icons/turf/decals.dmi';
+ icon_state = "warningline_white";
+ anchored = 1;
+ name = "warning line"
+ },
+/obj/structure/decorative/fluff{
+ icon = 'icons/turf/decals.dmi';
+ icon_state = "trimline_mid_fill";
+ anchored = 1;
+ color = "#2a2e2e";
+ name = "decorative tile covers";
+ pixel_y = 6;
+ pixel_x = 16
+ },
+/turf/open/floor/iron/dark/small,
/area/station/cargo/storage)
+"kuz" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 6
+ },
+/obj/machinery/duct,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/turf/open/floor/iron,
+/area/station/maintenance/port/aft)
"kuA" = (
/obj/effect/turf_decal/trimline/dark_blue/filled/line{
dir = 6
},
/obj/machinery/firealarm/directional/east,
+/obj/effect/turf_decal/trimline/dark/line{
+ dir = 6
+ },
/turf/open/floor/iron/dark,
/area/station/security/brig)
"kuT" = (
-/obj/effect/turf_decal/stripes/corner,
-/turf/open/floor/iron/dark/textured,
+/obj/effect/turf_decal/siding/wideplating_new/dark/corner{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/wideplating_new/dark/corner,
+/obj/effect/turf_decal/siding/wideplating_new/dark{
+ dir = 1
+ },
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/iron/textured_large,
/area/station/command/gateway)
"kuW" = (
/obj/effect/landmark/start/hangover,
@@ -45786,7 +54174,26 @@
/obj/effect/turf_decal/trimline/blue/filled/line{
dir = 9
},
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/trimline/white/line{
+ dir = 9
+ },
+/obj/effect/turf_decal/trimline/blue/filled/mid_joiner{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/blue/filled/mid_joiner{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/white/mid_joiner{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/white/mid_joiner{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/blue{
+ dir = 9;
+ color = "#8ab4cb"
+ },
+/turf/open/floor/iron/white/smooth_corner,
/area/station/medical/treatment_center)
"kvq" = (
/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
@@ -45798,18 +54205,22 @@
"kvB" = (
/obj/structure/window/reinforced/spawner/directional/north,
/obj/structure/disposalpipe/trunk{
- dir = 4
+ dir = 1
},
/obj/machinery/disposal/bin,
/obj/effect/turf_decal/stripes/line{
dir = 9
},
-/turf/open/floor/iron,
+/obj/effect/turf_decal/stripes/white/line{
+ color = "#a56dc2";
+ dir = 6
+ },
+/turf/open/floor/iron/dark/smooth_large,
/area/station/science/xenobiology)
"kwa" = (
/obj/structure/tank_dispenser,
/turf/open/floor/iron,
-/area/station/science/ordnance/bomb)
+/area/station/science/ordnance/testlab)
"kwd" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 1
@@ -45824,6 +54235,10 @@
/obj/effect/turf_decal/trimline/dark_blue/filled/line{
dir = 8
},
+/obj/effect/turf_decal/trimline/dark_blue/line{
+ dir = 8;
+ alpha = 200
+ },
/turf/open/floor/iron/dark,
/area/station/security/office)
"kwy" = (
@@ -45847,13 +54262,10 @@
/turf/open/floor/engine/co2,
/area/station/engineering/atmos)
"kwT" = (
-/obj/effect/turf_decal/trimline/blue/filled/end{
- dir = 1
- },
/obj/structure/window/reinforced/spawner/directional/north,
/obj/effect/spawner/random/medical/patient_stretcher,
-/turf/open/floor/iron,
-/area/station/medical/medbay/aft)
+/turf/open/floor/iron/dark/smooth_large,
+/area/station/medical/medbay/central)
"kxa" = (
/obj/machinery/atmospherics/pipe/smart/simple/purple/visible{
dir = 4
@@ -45862,19 +54274,14 @@
/turf/open/space/basic,
/area/space/nearstation)
"kxj" = (
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
/obj/machinery/defibrillator_mount/directional/north,
/obj/machinery/stasis,
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/tile/blue/full,
+/obj/effect/turf_decal/siding/blue{
+ color = "#8ab4cb";
+ dir = 5
+ },
+/turf/open/floor/iron/white/smooth_large,
/area/station/medical/treatment_center)
"kxo" = (
/obj/effect/turf_decal/tile/red/opposingcorners{
@@ -45883,6 +54290,10 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
/turf/open/floor/iron,
/area/station/commons/fitness/recreation)
+"kxK" = (
+/obj/machinery/vending/wallmed/directional/south,
+/turf/open/floor/iron/freezer,
+/area/station/commons/toilet/locker)
"kxO" = (
/obj/effect/mapping_helpers/burnt_floor,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
@@ -45893,18 +54304,25 @@
},
/turf/open/floor/plating,
/area/station/maintenance/starboard/fore)
+"kxV" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+ dir = 1
+ },
+/turf/open/floor/iron,
+/area/station/maintenance/port/fore)
"kxX" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 10
},
-/turf/open/floor/iron/dark,
+/turf/open/floor/iron/dark/textured,
/area/station/ai_monitored/command/nuke_storage)
"kyo" = (
-/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/door/poddoor/preopen{
id = "pharmacy_shutters";
name = "Pharmacy Shutter"
},
+/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/station/medical/pharmacy)
"kyp" = (
@@ -45931,6 +54349,14 @@
/obj/structure/closet/lasertag/blue,
/turf/open/floor/plating,
/area/station/maintenance/starboard/fore)
+"kzQ" = (
+/obj/structure/cable,
+/obj/effect/turf_decal/siding/dark,
+/obj/effect/turf_decal/siding/dark{
+ dir = 1
+ },
+/turf/open/floor/wood/large,
+/area/station/command/heads_quarters/captain)
"kzT" = (
/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/ordnance_burn_chamber_input{
dir = 1
@@ -45948,6 +54374,18 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 5
},
+/obj/effect/turf_decal/siding/wideplating_new/dark{
+ dir = 10
+ },
+/obj/effect/turf_decal/siding/wideplating_new/dark/corner{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 10
+ },
+/obj/effect/turf_decal/siding/dark/corner{
+ dir = 4
+ },
/turf/open/floor/circuit,
/area/station/ai_monitored/command/nuke_storage)
"kAH" = (
@@ -45969,13 +54407,26 @@
dir = 9
},
/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/stripes/white/line{
+ dir = 6;
+ color = "#ae4fd6"
+ },
+/turf/open/floor/iron/white/smooth_corner,
/area/station/science/research)
+"kAN" = (
+/obj/structure/disposalpipe/junction{
+ dir = 8
+ },
+/turf/open/floor/plating/airless,
+/area/space/nearstation)
"kAS" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/power/apc/auto_name/directional/east,
/obj/structure/cable,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/tile/neutral,
+/turf/open/floor/iron/dark/side{
+ dir = 4
+ },
/area/station/commons/locker)
"kBj" = (
/obj/structure/cable,
@@ -45986,6 +54437,17 @@
/obj/machinery/power/energy_accumulator/tesla_coil/anchored,
/turf/open/floor/engine,
/area/station/engineering/supermatter)
+"kBr" = (
+/obj/structure/window/spawner/directional/east,
+/obj/structure/chair/sofa/bench/left{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/blue/filled/line,
+/obj/effect/landmark/start/assistant,
+/turf/open/floor/iron/edge{
+ dir = 1
+ },
+/area/station/hallway/secondary/entry)
"kBu" = (
/turf/closed/wall/r_wall,
/area/space/nearstation)
@@ -46002,7 +54464,6 @@
/turf/open/floor/iron/dark/textured,
/area/station/science/genetics)
"kBB" = (
-/obj/structure/window/spawner/directional/north,
/obj/machinery/hydroponics/constructable,
/obj/machinery/door/window/left/directional/east,
/obj/effect/turf_decal/siding/thinplating/dark,
@@ -46025,13 +54486,12 @@
/turf/open/floor/plating,
/area/station/maintenance/department/electrical)
"kCi" = (
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
/obj/structure/disposalpipe/segment{
dir = 4
},
-/turf/open/floor/iron,
+/turf/open/floor/iron/edge{
+ dir = 1
+ },
/area/station/hallway/primary/central)
"kCw" = (
/obj/machinery/hydroponics/soil{
@@ -46045,6 +54505,18 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 9
},
+/obj/effect/turf_decal/siding/wideplating_new/dark{
+ dir = 6
+ },
+/obj/effect/turf_decal/siding/wideplating_new/dark/corner{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 6
+ },
+/obj/effect/turf_decal/siding/dark/corner{
+ dir = 1
+ },
/turf/open/floor/circuit,
/area/station/ai_monitored/command/nuke_storage)
"kCD" = (
@@ -46056,6 +54528,16 @@
/obj/structure/filingcabinet,
/turf/open/floor/wood,
/area/station/commons/vacant_room/office)
+"kCR" = (
+/obj/effect/mapping_helpers/broken_floor,
+/obj/structure/table_frame,
+/obj/item/reagent_containers/blood/random,
+/obj/machinery/light_switch{
+ pixel_x = -27
+ },
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
+/turf/open/floor/wood,
+/area/station/maintenance/port/aft)
"kCY" = (
/obj/effect/turf_decal/tile/yellow,
/obj/effect/turf_decal/tile/yellow{
@@ -46075,14 +54557,28 @@
req_access = list("plumbing");
name = "Chemistry Desk"
},
-/turf/open/floor/iron,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/medical/chemistry)
-"kDh" = (
-/obj/structure/disposalpipe/trunk{
+"kDa" = (
+/obj/effect/turf_decal/trimline/yellow/filled/warning{
dir = 8
},
-/obj/structure/disposaloutlet{
- dir = 1
+/obj/structure/window/reinforced/spawner/directional/north,
+/obj/machinery/atmospherics/components/unary/airlock_pump{
+ dir = 4
+ },
+/turf/open/floor/iron/smooth_edge,
+/area/station/hallway/secondary/entry)
+"kDh" = (
+/obj/effect/turf_decal/siding/dark{
+ dir = 5
+ },
+/obj/effect/turf_decal/siding/dark/corner{
+ dir = 8
+ },
+/obj/machinery/camera/directional/east{
+ c_tag = "Xenobiology Cell 7";
+ network = list("ss13","xeno")
},
/turf/open/floor/engine,
/area/station/science/xenobiology)
@@ -46091,7 +54587,9 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 4
},
-/turf/open/floor/iron,
+/turf/open/floor/iron/edge{
+ dir = 1
+ },
/area/station/hallway/primary/central)
"kDo" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -46101,7 +54599,7 @@
dir = 1
},
/turf/open/floor/iron,
-/area/station/science/ordnance/bomb)
+/area/station/science/ordnance/testlab)
"kDt" = (
/obj/machinery/door/airlock/maintenance,
/obj/effect/turf_decal/siding/thinplating/dark/corner{
@@ -46112,8 +54610,19 @@
/obj/effect/mapping_helpers/airlock/unres{
dir = 8
},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 5
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer5,
/turf/open/floor/plating,
/area/station/maintenance/port/aft)
+"kDK" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 4
+ },
+/turf/open/floor/plating,
+/area/station/maintenance/solars/starboard/aft)
"kEE" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/railing{
@@ -46160,14 +54669,14 @@
/turf/open/space/basic,
/area/space/nearstation)
"kFS" = (
-/obj/effect/turf_decal/tile/blue{
+/obj/structure/chair/sofa/bench/right{
+ pixel_y = 0;
+ greyscale_colors = "#2875af"
+ },
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 4
},
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
-/obj/structure/chair,
-/turf/open/floor/iron/white,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/medical/medbay/lobby)
"kGd" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
@@ -46203,18 +54712,22 @@
pixel_x = -2;
pixel_y = -1
},
+/obj/effect/turf_decal/trimline/yellow/filled/line{
+ dir = 1
+ },
/turf/open/floor/iron,
/area/station/commons/storage/primary)
"kGA" = (
-/obj/effect/turf_decal/tile/yellow,
-/obj/effect/turf_decal/tile/yellow{
- dir = 4
+/obj/structure/disposalpipe/trunk{
+ dir = 8
},
-/obj/machinery/chem_mass_spec,
-/turf/open/floor/iron/white,
+/obj/machinery/disposal/bin,
+/turf/open/floor/iron/dark/small,
/area/station/medical/pharmacy)
"kGD" = (
-/obj/effect/spawner/random/burgerstation/odd,
+/obj/machinery/atmospherics/components/tank/air/layer4{
+ dir = 4
+ },
/turf/open/floor/plating,
/area/station/maintenance/port/aft)
"kGI" = (
@@ -46229,8 +54742,12 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/structure/cable,
-/turf/open/floor/iron,
+/turf/open/floor/iron/edge,
/area/station/hallway/primary/port)
+"kHg" = (
+/obj/machinery/firealarm/directional/east,
+/turf/open/floor/iron/dark/small,
+/area/station/security/interrogation)
"kHy" = (
/obj/machinery/door/airlock/security/glass{
name = "Permabrig Visitation"
@@ -46245,15 +54762,48 @@
/obj/structure/chair/sofa/corp/corner{
dir = 1
},
+/obj/effect/turf_decal/siding/wideplating_new/dark{
+ dir = 10
+ },
/turf/open/floor/wood/parquet,
/area/station/science/breakroom)
+"kHR" = (
+/obj/effect/turf_decal/trimline/dark/filled/mid_joiner{
+ dir = 4;
+ alpha = 160
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/dark/filled/warning{
+ alpha = 160;
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/purple/warning{
+ alpha = 200;
+ dir = 4;
+ color = "#a56dc2"
+ },
+/turf/open/floor/iron/white/smooth_edge{
+ dir = 4
+ },
+/area/station/science/xenobiology)
"kIb" = (
-/obj/effect/turf_decal/tile/brown/half/contrasted{
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes/line{
dir = 1
},
-/obj/structure/cable,
/turf/open/floor/iron,
/area/station/cargo/warehouse)
+"kIq" = (
+/obj/item/radio/intercom/directional/east,
+/obj/effect/turf_decal/trimline/blue/filled/line{
+ dir = 4
+ },
+/turf/open/floor/iron,
+/area/station/hallway/secondary/entry)
"kIy" = (
/obj/structure/chair,
/obj/item/radio/intercom/chapel{
@@ -46261,6 +54811,29 @@
},
/turf/open/floor/iron/dark,
/area/station/service/chapel)
+"kIz" = (
+/obj/effect/turf_decal/trimline/dark/filled/line{
+ alpha = 160;
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/dark/filled/mid_joiner{
+ dir = 8;
+ alpha = 160
+ },
+/obj/effect/turf_decal/trimline/purple/line{
+ alpha = 200;
+ dir = 8;
+ color = "#a56dc2"
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 8
+ },
+/obj/machinery/firealarm/directional/west,
+/obj/structure/sink/directional/east,
+/turf/open/floor/iron/white/smooth_edge{
+ dir = 8
+ },
+/area/station/science/xenobiology)
"kIM" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible{
@@ -46270,11 +54843,32 @@
/obj/machinery/power/energy_accumulator/tesla_coil/anchored,
/turf/open/floor/engine,
/area/station/engineering/supermatter)
+"kIT" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/structure/cable,
+/turf/open/floor/plating,
+/area/station/science/xenobiology)
"kJc" = (
/obj/structure/chair/stool,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/dark,
/area/station/medical/virology)
+"kJh" = (
+/obj/docking_port/stationary{
+ dheight = 3;
+ dir = 8;
+ dwidth = 8;
+ height = 11;
+ shuttle_id = "ferry_home";
+ name = "Port Bay 2";
+ width = 20
+ },
+/obj/effect/turf_decal/weather/snow,
+/obj/effect/turf_decal/weather/snow/corner{
+ dir = 4
+ },
+/turf/open/floor/plating/airless,
+/area/space/nearstation)
"kJl" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/bot,
@@ -46293,8 +54887,11 @@
/obj/machinery/door/airlock/public/glass{
name = "Central Access"
},
-/obj/machinery/firealarm/directional/west,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/dark_blue/corner{
+ dir = 1;
+ alpha = 200
+ },
+/turf/open/floor/iron/large,
/area/station/hallway/primary/central)
"kKn" = (
/obj/structure/disposalpipe/segment,
@@ -46303,6 +54900,7 @@
"kKu" = (
/obj/effect/mapping_helpers/broken_floor,
/obj/structure/cable,
+/obj/effect/landmark/generic_maintenance_landmark,
/turf/open/floor/wood,
/area/station/maintenance/dorm_room)
"kKM" = (
@@ -46323,15 +54921,25 @@
/turf/open/floor/iron/solarpanel/airless,
/area/station/solars/starboard/aft)
"kLd" = (
-/obj/machinery/disposal/bin,
/obj/structure/disposalpipe/trunk{
dir = 1
},
-/turf/open/floor/iron/dark,
+/obj/machinery/disposal/bin,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/hallway/primary/central)
+"kLq" = (
+/obj/effect/mapping_helpers/iannewyear,
+/turf/open/floor/wood/large,
+/area/station/command/heads_quarters/hop)
"kLu" = (
/turf/open/floor/iron,
/area/station/security/prison/safe)
+"kLD" = (
+/obj/structure/toilet{
+ dir = 4
+ },
+/turf/open/floor/iron/freezer,
+/area/station/maintenance/port/aft)
"kLL" = (
/obj/effect/landmark/start/head_of_personnel,
/turf/open/floor/carpet/royalblue,
@@ -46349,6 +54957,31 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/plating,
/area/station/maintenance/starboard/aft)
+"kMm" = (
+/obj/structure/closet/secure_closet/personal,
+/obj/effect/turf_decal/tile/neutral/opposingcorners,
+/turf/open/floor/iron/dark/side{
+ dir = 5
+ },
+/area/station/commons/locker)
+"kMo" = (
+/turf/closed/wall/r_wall,
+/area/station/cargo/miningdock)
+"kME" = (
+/obj/machinery/duct,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/turf/open/floor/iron,
+/area/station/maintenance/port/aft)
+"kMI" = (
+/obj/effect/turf_decal/siding/dark{
+ dir = 9
+ },
+/obj/effect/turf_decal/siding/dark/corner,
+/turf/open/floor/engine,
+/area/station/science/xenobiology)
"kMX" = (
/obj/effect/turf_decal/trimline/dark_blue/filled/line,
/obj/structure/bed,
@@ -46358,12 +54991,35 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/dark,
/area/station/security/brig)
+"kNk" = (
+/obj/effect/turf_decal/siding/dark/corner{
+ dir = 4
+ },
+/turf/open/floor/iron/textured_corner{
+ dir = 1
+ },
+/area/station/hallway/primary/starboard)
"kNl" = (
/obj/effect/turf_decal/trimline/blue/filled/line{
dir = 5
},
/obj/machinery/iv_drip,
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/trimline/white/line{
+ dir = 5
+ },
+/obj/effect/turf_decal/trimline/blue/filled/mid_joiner{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/blue/filled/mid_joiner{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/blue/corner{
+ color = "#8ab4cb";
+ dir = 4
+ },
+/turf/open/floor/iron/white/smooth_corner{
+ dir = 8
+ },
/area/station/medical/treatment_center)
"kNm" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -46392,6 +55048,16 @@
/obj/item/kirbyplants/random/fullysynthetic,
/turf/open/floor/plastic,
/area/station/hallway/secondary/service)
+"kNw" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/brown/filled/line{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer5,
+/turf/open/floor/iron/textured_edge,
+/area/station/cargo/storage)
"kNP" = (
/obj/structure/chair{
dir = 4
@@ -46399,8 +55065,29 @@
/obj/effect/turf_decal/trimline/dark_blue/filled/line{
dir = 8
},
+/obj/effect/turf_decal/trimline/dark/line{
+ dir = 8
+ },
/turf/open/floor/iron/dark,
/area/station/security/execution/transfer)
+"kNY" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 1
+ },
+/turf/open/floor/carpet/royalblue,
+/area/station/command/heads_quarters/hop)
+"kOi" = (
+/obj/structure/disposalpipe/segment{
+ dir = 5
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/turf/open/floor/plating,
+/area/station/maintenance/starboard/aft)
"kOk" = (
/obj/machinery/atmospherics/components/unary/vent_pump/siphon/monitored/mix_output{
dir = 8
@@ -46415,8 +55102,16 @@
/turf/open/floor/plating,
/area/station/engineering/atmos)
"kOm" = (
-/obj/machinery/firealarm/directional/east,
-/turf/open/floor/iron,
+/obj/structure/chair/sofa/bench/right{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/blue/filled/line{
+ dir = 4
+ },
+/obj/machinery/status_display/shuttle/directional/east,
+/turf/open/floor/iron/edge{
+ dir = 8
+ },
/area/station/hallway/secondary/entry)
"kOn" = (
/obj/effect/landmark/blobstart,
@@ -46441,12 +55136,21 @@
},
/turf/open/floor/iron/dark,
/area/station/science/explab)
-"kOT" = (
-/obj/effect/turf_decal/tile/brown/half/contrasted{
+"kOK" = (
+/obj/effect/landmark/start/hangover,
+/obj/effect/turf_decal/trimline/green/corner,
+/obj/machinery/firealarm/directional/east,
+/turf/open/floor/iron/edge{
dir = 4
},
-/turf/open/floor/iron,
-/area/station/cargo/warehouse)
+/area/station/hallway/primary/central)
+"kOT" = (
+/obj/effect/turf_decal/siding/dark,
+/obj/effect/turf_decal/siding/dark{
+ dir = 1
+ },
+/turf/open/floor/engine,
+/area/station/science/xenobiology)
"kPd" = (
/obj/effect/turf_decal/siding/brown{
dir = 4
@@ -46459,6 +55163,10 @@
"kPm" = (
/obj/machinery/airalarm/directional/north,
/obj/effect/mapping_helpers/airalarm/tlv_no_checks,
+/obj/effect/turf_decal/siding/dark{
+ dir = 1;
+ icon_state = "siding_plain_end"
+ },
/turf/open/floor/circuit/telecomms/mainframe,
/area/station/tcommsat/server)
"kPv" = (
@@ -46479,8 +55187,14 @@
/obj/effect/turf_decal/delivery,
/turf/open/floor/iron,
/area/station/security/prison)
+"kPF" = (
+/obj/structure/chair{
+ dir = 4
+ },
+/turf/open/floor/iron/dark,
+/area/station/security/processing)
"kPH" = (
-/obj/effect/spawner/structure/window,
+/obj/structure/window/reinforced/fulltile/ice,
/turf/open/floor/plating,
/area/station/medical/cryo)
"kQc" = (
@@ -46504,6 +55218,9 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/structure/cable,
+/obj/effect/turf_decal/trimline/dark/warning{
+ dir = 1
+ },
/turf/open/floor/iron/dark,
/area/station/security/execution/transfer)
"kQq" = (
@@ -46512,13 +55229,48 @@
dir = 4
},
/turf/open/floor/engine,
-/area/station/engineering/main)
+/area/station/engineering/supermatter/room)
"kQu" = (
/obj/structure/table/wood,
/obj/machinery/light/directional/east,
/obj/item/flashlight/lamp,
/turf/open/floor/wood,
/area/station/commons/vacant_room/office)
+"kQD" = (
+/obj/structure/disposalpipe/segment,
+/obj/effect/turf_decal/box/white{
+ color = "#a56dc2"
+ },
+/obj/effect/turf_decal/trimline/purple{
+ alpha = 255;
+ color = "#a56dc2"
+ },
+/obj/machinery/light/floor,
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/iron/white/smooth_large,
+/area/station/science/xenobiology)
+"kQN" = (
+/obj/structure/closet/emcloset,
+/obj/structure/window/reinforced/spawner/directional/south,
+/obj/machinery/door/firedoor/border_only,
+/obj/structure/fluff/metalpole{
+ pixel_y = -32
+ },
+/obj/effect/turf_decal/siding/white{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/blue/fourcorners,
+/turf/open/floor/iron/white,
+/area/station/hallway/secondary/entry)
+"kQU" = (
+/obj/effect/turf_decal/siding/dark{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/dark/corner,
+/turf/open/floor/circuit/red,
+/area/station/ai_monitored/turret_protected/ai_upload)
"kRc" = (
/obj/machinery/airalarm/directional/north,
/obj/machinery/netpod,
@@ -46539,6 +55291,7 @@
/obj/item/clothing/under/rank/security/corrections_officer/sweater,
/obj/item/clothing/under/rank/security/corrections_officer/sweater/skirt,
/obj/machinery/light/directional/east,
+/obj/machinery/vending/wallmed/directional/east,
/turf/open/floor/iron/dark,
/area/station/security/corrections_officer)
"kRC" = (
@@ -46548,10 +55301,30 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 4
},
-/turf/open/floor/iron/white/side{
- dir = 9
+/obj/effect/turf_decal/siding/dark{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/dark/filled/warning{
+ alpha = 160;
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/purple/warning{
+ alpha = 200;
+ dir = 4
+ },
+/turf/open/floor/iron/white/smooth_edge{
+ dir = 4
},
/area/station/science/research)
+"kSj" = (
+/obj/effect/turf_decal/siding/thinplating_new/dark/end{
+ dir = 4
+ },
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+ dir = 1
+ },
+/turf/open/floor/carpet/black,
+/area/station/science/xenobiology)
"kTa" = (
/obj/effect/landmark/start/detective,
/obj/structure/chair/office,
@@ -46568,9 +55341,22 @@
/turf/open/floor/carpet/red,
/area/station/command/heads_quarters/hos)
"kTm" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes/white/line{
+ color = "#52B4E9";
+ dir = 1;
+ name = "blue line"
+ },
+/obj/effect/turf_decal/siding/wideplating_new/dark{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/wideplating_new/dark{
+ dir = 8
+ },
/obj/effect/decal/cleanable/dirt,
-/obj/structure/closet/secure_closet/exile,
-/turf/open/floor/iron,
+/turf/open/floor/iron/textured_large,
/area/station/command/gateway)
"kTs" = (
/obj/structure/cable,
@@ -46581,12 +55367,38 @@
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/station/science/research)
+"kUE" = (
+/obj/structure/cable,
+/obj/effect/turf_decal/siding/wood{
+ dir = 8
+ },
+/turf/open/floor/wood,
+/area/station/security/prison)
"kVn" = (
/obj/effect/turf_decal/trimline/blue/filled/line{
dir = 10
},
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/trimline/white/line{
+ dir = 10
+ },
+/obj/effect/turf_decal/trimline/blue/filled/mid_joiner{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/blue/filled/mid_joiner,
+/obj/effect/turf_decal/siding/blue{
+ color = "#8ab4cb";
+ dir = 8
+ },
+/turf/open/floor/iron/white/smooth_corner{
+ dir = 4
+ },
/area/station/medical/treatment_center)
+"kVv" = (
+/obj/effect/turf_decal/stripes/white/line{
+ dir = 4
+ },
+/turf/open/floor/tram/tram_platform,
+/area/station/hallway/secondary/entry)
"kVz" = (
/obj/structure/cable,
/obj/structure/railing{
@@ -46611,6 +55423,14 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/wood,
/area/station/commons/dorms)
+"kWG" = (
+/obj/effect/turf_decal/trimline/blue/corner{
+ dir = 1
+ },
+/turf/open/floor/iron/edge{
+ dir = 1
+ },
+/area/station/hallway/primary/central)
"kWH" = (
/obj/effect/turf_decal/stripes/white/line{
dir = 8
@@ -46628,6 +55448,20 @@
},
/turf/open/floor/plating,
/area/station/maintenance/starboard/fore)
+"kXv" = (
+/obj/effect/turf_decal/bot,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/iron/large,
+/area/station/cargo/storage)
+"kXC" = (
+/obj/effect/turf_decal/trimline/blue/filled/line{
+ dir = 4
+ },
+/obj/machinery/status_display/evac/directional/east,
+/turf/open/floor/iron/edge{
+ dir = 8
+ },
+/area/station/hallway/secondary/entry)
"kXS" = (
/obj/structure/chair{
dir = 4;
@@ -46640,8 +55474,23 @@
/area/station/security/courtroom)
"kXX" = (
/obj/machinery/light/directional/east,
-/turf/open/floor/iron/white/side{
- dir = 9
+/obj/effect/turf_decal/trimline/dark/filled/line{
+ alpha = 160;
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/dark/filled/mid_joiner{
+ dir = 4;
+ alpha = 160
+ },
+/obj/effect/turf_decal/trimline/purple/line{
+ alpha = 200;
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 4
+ },
+/turf/open/floor/iron/white/smooth_edge{
+ dir = 4
},
/area/station/science/research)
"kYk" = (
@@ -46653,12 +55502,6 @@
/area/station/hallway/primary/central)
"kYu" = (
/obj/structure/table,
-/obj/item/storage/box/beakers{
- pixel_x = 2;
- pixel_y = 2
- },
-/obj/item/grenade/chem_grenade,
-/obj/item/grenade/chem_grenade,
/obj/machinery/requests_console{
department = "Science";
name = "Science Requests Console";
@@ -46666,6 +55509,11 @@
},
/obj/effect/mapping_helpers/requests_console/ore_update,
/obj/effect/mapping_helpers/requests_console/supplies,
+/obj/item/storage/toolbox/mechanical{
+ pixel_x = 0;
+ pixel_y = 4
+ },
+/obj/item/hand_labeler,
/turf/open/floor/iron,
/area/station/science/explab)
"kYE" = (
@@ -46693,6 +55541,10 @@
dir = 4
},
/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 5
+ },
/turf/open/floor/plating,
/area/station/maintenance/port/aft)
"kYP" = (
@@ -46712,12 +55564,15 @@
},
/turf/open/floor/iron,
/area/station/construction/mining/aux_base)
-"kZr" = (
-/obj/structure/disposalpipe/segment,
-/obj/machinery/light/directional/west,
-/obj/machinery/firealarm/directional/west,
-/turf/open/floor/iron,
-/area/station/hallway/primary/central)
+"kZg" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 5
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plating,
+/area/station/maintenance/port/aft)
"kZJ" = (
/turf/open/floor/iron/dark/side{
dir = 1
@@ -46730,6 +55585,21 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron,
/area/station/service/hydroponics/garden/abandoned)
+"kZS" = (
+/obj/structure/fluff/tram_rail/end{
+ dir = 8
+ },
+/turf/open/space/basic,
+/area/space/nearstation)
+"lap" = (
+/obj/structure/chair/sofa/bench{
+ pixel_y = 8
+ },
+/obj/effect/landmark/start/assistant,
+/turf/open/floor/iron/dark/side{
+ dir = 1
+ },
+/area/station/hallway/secondary/entry)
"laP" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -46737,10 +55607,16 @@
/turf/open/floor/iron,
/area/station/security/prison/safe)
"lbd" = (
-/obj/effect/turf_decal/siding/thinplating/light{
- dir = 4
+/obj/effect/turf_decal/trimline/white/filled/line{
+ dir = 8;
+ alpha = 160
},
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/trimline/purple/line{
+ alpha = 200;
+ dir = 8;
+ color = "#a56dc2"
+ },
+/turf/open/floor/iron,
/area/station/science/explab)
"lbq" = (
/obj/structure/disposalpipe/segment{
@@ -46770,7 +55646,16 @@
/area/station/service/bar)
"lcp" = (
/obj/machinery/light/directional/north,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/neutral/corner{
+ dir = 4;
+ alpha = 100
+ },
+/obj/effect/turf_decal/trimline/yellow/corner{
+ dir = 1
+ },
+/turf/open/floor/iron/textured_corner{
+ dir = 8
+ },
/area/station/hallway/primary/port)
"lcX" = (
/obj/effect/turf_decal/stripes/red/line{
@@ -46779,12 +55664,12 @@
/turf/open/floor/engine,
/area/station/science/explab)
"lda" = (
-/obj/effect/decal/cleanable/dirt,
/obj/structure/cable,
/obj/structure/frame/computer{
dir = 8
},
-/turf/open/floor/iron/white,
+/obj/structure/marker_beacon/jade,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/science/lab)
"ldB" = (
/obj/effect/turf_decal/tile/neutral{
@@ -46816,6 +55701,15 @@
/obj/structure/cable,
/turf/open/floor/iron/dark,
/area/station/security/office)
+"leL" = (
+/obj/structure/marker_beacon/cerulean{
+ pixel_y = -7
+ },
+/obj/effect/turf_decal/trimline/blue/filled/line{
+ dir = 1
+ },
+/turf/open/floor/iron/edge,
+/area/station/hallway/secondary/entry)
"leX" = (
/obj/effect/turf_decal/tile/bar,
/obj/effect/turf_decal/tile/bar{
@@ -46839,12 +55733,9 @@
/area/station/hallway/primary/central)
"lfG" = (
/obj/structure/sign/warning/secure_area/directional/east,
-/obj/structure/table,
-/obj/item/storage/box/prisoner,
-/obj/machinery/camera/directional/north{
- c_tag = "Labor Shuttle Dock North"
- },
/obj/structure/cable,
+/obj/structure/table,
+/obj/machinery/recharger,
/turf/open/floor/iron/dark,
/area/station/security/processing)
"lfH" = (
@@ -46854,6 +55745,7 @@
name = "Cell 1";
pixel_y = -32
},
+/obj/effect/turf_decal/trimline/dark/line,
/turf/open/floor/iron/dark,
/area/station/security/brig)
"lfO" = (
@@ -46882,6 +55774,10 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
/turf/open/floor/grass,
/area/station/science/genetics)
+"lgx" = (
+/obj/structure/extinguisher_cabinet/directional/west,
+/turf/open/floor/iron/dark,
+/area/station/service/chapel)
"lgT" = (
/obj/effect/turf_decal/siding/purple/corner{
dir = 4
@@ -46894,13 +55790,37 @@
/turf/open/floor/iron/dark/textured,
/area/station/science/genetics)
"lhu" = (
-/obj/effect/turf_decal/tile/yellow,
-/obj/effect/turf_decal/tile/yellow{
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+ dir = 1
+ },
+/obj/structure/chair/office/light{
+ dir = 4
+ },
+/turf/open/floor/iron/dark/small,
+/area/station/medical/pharmacy)
+"lhw" = (
+/obj/effect/turf_decal/siding/wood/corner{
dir = 8
},
-/obj/structure/chair/office/light,
-/turf/open/floor/iron/white,
-/area/station/medical/pharmacy)
+/obj/effect/turf_decal/siding/wood/corner,
+/turf/open/floor/wood/tile,
+/area/station/hallway/secondary/entry)
+"lhB" = (
+/obj/effect/turf_decal/siding/dark/corner{
+ dir = 4
+ },
+/obj/effect/turf_decal/stripes/line,
+/obj/effect/turf_decal/stripes/white/line{
+ color = "#EFB341"
+ },
+/obj/effect/turf_decal/siding/wideplating/dark/corner{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 8
+ },
+/turf/open/floor/iron/textured_large,
+/area/station/ai_monitored/command/storage/eva)
"lhD" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -46908,25 +55828,30 @@
/turf/open/floor/plating,
/area/station/maintenance/department/security)
"lhN" = (
-/obj/effect/turf_decal/bot,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
/turf/open/floor/iron,
/area/station/cargo/warehouse)
"lif" = (
/obj/structure/chair/office,
/obj/effect/landmark/event_spawn,
-/obj/effect/turf_decal/tile/red,
-/obj/effect/turf_decal/tile/red{
+/obj/effect/turf_decal/siding/dark/end,
+/turf/open/floor/carpet/black,
+/area/station/security/checkpoint/customs)
+"liw" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 8
},
-/obj/effect/turf_decal/tile/neutral,
-/turf/open/floor/iron/dark,
-/area/station/security/checkpoint/customs)
+/obj/effect/decal/cleanable/glitter{
+ color = "#ff8080"
+ },
+/obj/structure/sign/poster/contraband/heart/directional/north,
+/turf/open/floor/carpet/lone/star,
+/area/station/maintenance/port/aft)
"liE" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/effect/landmark/start/hangover,
-/obj/effect/turf_decal/tile/purple/half/contrasted,
-/turf/open/floor/iron,
+/turf/open/floor/iron/edge,
/area/station/hallway/primary/starboard)
"liF" = (
/obj/effect/spawner/structure/window/reinforced,
@@ -46956,13 +55881,31 @@
"ljy" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/pink/hidden,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 1
+ },
/turf/open/floor/plating,
/area/station/maintenance/port/fore)
"ljK" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/effect/decal/cleanable/dirt,
+/obj/machinery/camera/autoname/directional/north,
+/obj/effect/turf_decal/trimline/blue/filled/line{
+ dir = 1
+ },
/turf/open/floor/iron,
-/area/station/cargo/storage)
+/area/station/hallway/secondary/entry)
+"lkv" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/neutral/warning{
+ dir = 1;
+ alpha = 100
+ },
+/turf/open/floor/iron/edge{
+ dir = 1
+ },
+/area/station/hallway/primary/starboard)
"llv" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 4
@@ -46977,6 +55920,27 @@
},
/turf/closed/wall,
/area/station/maintenance/port)
+"llR" = (
+/obj/effect/landmark/event_spawn,
+/obj/effect/landmark/generic_maintenance_landmark,
+/turf/open/floor/plating,
+/area/station/maintenance/port/aft)
+"lmP" = (
+/obj/effect/turf_decal/trimline/blue/filled/corner{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/blue/filled/corner{
+ dir = 8
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/effect/turf_decal/stripes/white/line{
+ dir = 8;
+ color = "#ae4fd6"
+ },
+/turf/open/floor/iron/small,
+/area/station/hallway/secondary/entry)
"lmS" = (
/obj/structure/disposalpipe/trunk{
dir = 1
@@ -46993,11 +55957,31 @@
/obj/item/radio/intercom/directional/east,
/turf/open/floor/iron/dark,
/area/station/security/office)
-"lnk" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
- dir = 8
+"lna" = (
+/obj/machinery/door/window/left/directional/east{
+ req_access = list("xenobiology");
+ name = "Containment Cell"
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 9
+ },
+/obj/effect/turf_decal/vg_decals/numbers/five{
+ color = "#a56dc2"
},
/obj/structure/cable,
+/obj/effect/turf_decal/bot_white{
+ color = "#a56dc2"
+ },
+/obj/effect/turf_decal/box/white{
+ color = "#a56dc2"
+ },
+/turf/open/floor/iron/dark/smooth_large,
+/area/station/science/xenobiology)
+"lnk" = (
+/obj/effect/turf_decal/trimline/brown/filled/warning,
+/obj/effect/turf_decal/trimline/brown/filled/warning{
+ dir = 1
+ },
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron,
/area/station/cargo/storage)
@@ -47006,6 +55990,16 @@
/obj/structure/chair/comfy/brown,
/turf/open/floor/wood/parquet,
/area/station/service/bar)
+"lnW" = (
+/obj/effect/turf_decal/tile/red/opposingcorners,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/cable,
+/obj/machinery/firealarm/directional/west,
+/turf/open/floor/iron,
+/area/station/commons/fitness/recreation)
"log" = (
/obj/structure/closet/secure_closet/personal/cabinet,
/turf/open/floor/wood,
@@ -47047,18 +56041,19 @@
req_access = list("xenobiology");
name = "Containment Cell"
},
-/turf/open/floor/engine,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/structure/cable,
+/turf/open/floor/catwalk_floor/iron_dark,
/area/station/science/xenobiology)
"lph" = (
-/obj/effect/turf_decal/tile/purple{
+/obj/effect/turf_decal/trimline/purple/corner{
dir = 8
},
/turf/open/floor/iron,
/area/station/hallway/primary/starboard)
"lpp" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
- dir = 4
- },
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 4
},
@@ -47082,6 +56077,14 @@
name = "Padded tile"
},
/area/station/security/prison/safe)
+"lqb" = (
+/obj/structure/chair/stool/bar/directional/north,
+/obj/effect/turf_decal/siding/wood{
+ dir = 1
+ },
+/obj/effect/landmark/start/hangover,
+/turf/open/floor/wood,
+/area/station/hallway/primary/starboard)
"lqB" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -47093,16 +56096,24 @@
name = "Bitrunning Den"
},
/obj/effect/mapping_helpers/airlock/access/any/supply/bit_den,
+/obj/structure/cable,
+/obj/effect/landmark/navigate_destination/autoname,
+/obj/machinery/atmospherics/pipe/layer_manifold/cyan/hidden,
+/turf/open/floor/iron/dark,
+/area/station/cargo/bitrunning/den)
+"lqY" = (
+/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 4
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/obj/effect/landmark/navigate_destination/autoname,
-/turf/open/floor/iron/dark/small,
-/area/station/cargo/bitrunning/den)
+/turf/open/floor/iron/edge,
+/area/station/hallway/primary/port)
"lrg" = (
/obj/effect/landmark/start/chemist,
+/obj/effect/turf_decal/tile/yellow{
+ dir = 4
+ },
/turf/open/floor/iron/white,
/area/station/medical/chemistry)
"lrt" = (
@@ -47117,12 +56128,22 @@
/turf/open/floor/plating,
/area/station/maintenance/port/aft)
"lse" = (
-/obj/machinery/light/directional/east,
-/obj/item/radio/intercom/directional/east,
-/turf/open/floor/iron/white,
-/area/station/science/xenobiology)
+/obj/effect/turf_decal/trimline/white/filled/corner{
+ dir = 1;
+ alpha = 160
+ },
+/obj/effect/turf_decal/trimline/purple/corner{
+ dir = 1;
+ alpha = 200;
+ color = "#a56dc2"
+ },
+/turf/open/floor/iron,
+/area/station/science/explab)
"lsv" = (
-/obj/effect/mapping_helpers/turn_off_lights_with_lightswitch,
+/obj/effect/turf_decal/trimline/brown/filled/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/brown/filled/line,
/turf/open/floor/iron,
/area/station/cargo/storage)
"lsM" = (
@@ -47148,6 +56169,16 @@
},
/turf/open/floor/iron,
/area/station/engineering/storage/tech)
+"ltj" = (
+/obj/structure/window/spawner/directional/east,
+/obj/structure/chair/sofa/bench/right{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 5
+ },
+/turf/open/floor/iron/large,
+/area/station/hallway/secondary/entry)
"luc" = (
/obj/structure/cable,
/obj/item/storage/box/drinkingglasses,
@@ -47184,26 +56215,16 @@
/turf/open/floor/iron,
/area/station/science/ordnance)
"luK" = (
-/obj/effect/turf_decal/tile/brown{
- dir = 1
- },
-/obj/effect/turf_decal/tile/brown,
-/obj/effect/turf_decal/tile/brown{
- dir = 8
- },
-/obj/effect/turf_decal/tile/yellow{
- dir = 1
- },
-/obj/effect/turf_decal/tile/yellow,
/obj/machinery/computer/order_console/mining,
-/turf/open/floor/iron,
+/turf/open/floor/iron/dark/textured_large,
/area/station/cargo/miningdock)
-"lvw" = (
-/obj/effect/turf_decal/trimline/blue/filled/line{
- dir = 8
+"luR" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
},
-/obj/effect/turf_decal/trimline/blue/filled/corner,
-/obj/structure/sign/warning/no_smoking/circle/directional/west,
+/turf/closed/wall,
+/area/station/maintenance/port/aft)
+"lvw" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 6
@@ -47211,7 +56232,18 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 6
},
-/turf/open/floor/iron/white,
+/obj/structure/sign/warning/no_smoking/circle/directional/west,
+/obj/effect/turf_decal/trimline/blue/filled/warning{
+ alpha = 160;
+ dir = 10
+ },
+/obj/effect/turf_decal/trimline/dark_blue/warning{
+ alpha = 200;
+ dir = 10
+ },
+/turf/open/floor/iron/white/smooth_corner{
+ dir = 4
+ },
/area/station/medical/medbay/aft)
"lvJ" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -47219,17 +56251,35 @@
/obj/structure/cable,
/turf/open/floor/iron/dark/corner,
/area/station/hallway/primary/central/fore)
+"lvN" = (
+/obj/effect/turf_decal/trimline/blue/filled/line{
+ dir = 10
+ },
+/obj/machinery/camera/autoname/directional/west{
+ c_tag = "Arrivals Bay Construction Zone"
+ },
+/turf/open/floor/iron,
+/area/station/hallway/secondary/entry)
"lwn" = (
/obj/effect/turf_decal/vg_decals/numbers/two,
/turf/open/floor/iron/airless,
/area/space/nearstation)
"lwp" = (
-/obj/machinery/power/apc/auto_name/directional/north,
/obj/structure/cable,
-/turf/open/floor/wood,
+/obj/machinery/power/apc/auto_name/directional/north,
+/obj/effect/turf_decal/siding/dark/end{
+ dir = 1
+ },
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+ dir = 8
+ },
+/turf/open/floor/wood/parquet,
/area/station/command/heads_quarters/captain)
"lwH" = (
/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 4
+ },
/turf/open/floor/wood,
/area/station/maintenance/aft)
"lwU" = (
@@ -47272,14 +56322,14 @@
/turf/open/floor/iron,
/area/station/service/hydroponics/garden/abandoned)
"lxv" = (
-/obj/effect/turf_decal/bot_white/left,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
/obj/effect/spawner/random/medical/surgery_tool_alien,
/obj/item/ammo_box/a357,
/obj/effect/spawner/random/exotic/antag_gear_weak,
/obj/effect/spawner/random/exotic/antag_gear_weak,
/obj/structure/safe/vault,
-/turf/open/floor/iron/dark,
+/obj/effect/turf_decal/box/blue,
+/obj/effect/turf_decal/bot_blue,
+/turf/open/floor/iron/dark/textured_large,
/area/station/ai_monitored/command/nuke_storage)
"lyl" = (
/obj/effect/turf_decal/tile/brown,
@@ -47296,11 +56346,25 @@
/turf/open/water,
/area/station/security/prison)
"lzf" = (
+/obj/effect/turf_decal/trimline/purple/filled/line{
+ alpha = 160;
+ color = "#6a3182";
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 4
+ },
/obj/machinery/door/window/right/directional/east{
name = "Robotics Surgery";
req_access = list("robotics")
},
-/turf/open/floor/iron/dark,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 5
+ },
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+ dir = 4
+ },
+/turf/open/floor/iron/dark/small,
/area/station/science/robotics/lab)
"lzo" = (
/obj/structure/window/reinforced/spawner/directional/south,
@@ -47322,36 +56386,12 @@
/turf/open/floor/iron/freezer,
/area/station/medical/break_room)
"lzw" = (
-/obj/structure/table,
-/obj/item/assembly/prox_sensor{
- pixel_x = -8;
- pixel_y = 4
+/obj/machinery/mechpad,
+/obj/item/radio/intercom/directional/east,
+/obj/effect/turf_decal/siding/thinplating_new/dark{
+ dir = 1
},
-/obj/item/assembly/prox_sensor{
- pixel_x = -8;
- pixel_y = 4
- },
-/obj/item/assembly/prox_sensor{
- pixel_x = -8;
- pixel_y = 4
- },
-/obj/item/assembly/prox_sensor{
- pixel_x = -8;
- pixel_y = 4
- },
-/obj/item/stock_parts/power_store/cell/high,
-/obj/item/stock_parts/power_store/cell/high,
-/obj/item/crowbar,
-/obj/structure/extinguisher_cabinet{
- pixel_x = 27
- },
-/obj/item/radio/headset/headset_sci{
- pixel_x = -3
- },
-/obj/item/borg/upgrade/rename{
- pixel_y = 16
- },
-/turf/open/floor/iron,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/science/robotics/lab)
"lzE" = (
/obj/structure/disposalpipe/sorting/mail{
@@ -47363,6 +56403,13 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/hallway/primary/fore)
+"lzG" = (
+/obj/structure/closet/crate/mail/preopen,
+/obj/item/mail,
+/obj/item/paper,
+/obj/item/paper/crumpled/plap,
+/turf/open/floor/plating,
+/area/station/maintenance/port/aft)
"lzS" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
@@ -47384,19 +56431,33 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 9
},
-/turf/open/floor/iron,
-/area/station/hallway/primary/port)
-"lAA" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/effect/turf_decal/loading_area{
+/turf/open/floor/iron/edge{
dir = 4
},
-/turf/open/floor/iron,
+/area/station/hallway/primary/port)
+"lAA" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer4,
+/turf/open/floor/iron/textured_edge{
+ dir = 8
+ },
/area/station/cargo/storage)
"lAO" = (
/obj/effect/turf_decal/trimline/blue/filled/corner{
dir = 1
},
+/obj/effect/turf_decal/trimline/white/corner{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/blue/corner{
+ color = "#8ab4cb";
+ dir = 1
+ },
+/obj/structure/railing/corner{
+ dir = 1
+ },
/turf/open/floor/iron/white,
/area/station/medical/treatment_center)
"lAQ" = (
@@ -47408,8 +56469,32 @@
/obj/machinery/door/window/left/directional/south,
/turf/open/floor/iron,
/area/station/security/prison/visit)
+"lAR" = (
+/mob/living/basic/slime{
+ name = "stanley"
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/obj/effect/turf_decal/stripes/white/line{
+ color = "#a56dc2";
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/dark/corner{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/dark/corner,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 8
+ },
+/turf/open/floor/engine,
+/area/station/science/xenobiology)
"lAW" = (
/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer5,
/turf/open/floor/iron/smooth_large,
/area/station/engineering/main)
"lBe" = (
@@ -47439,11 +56524,14 @@
/turf/open/floor/iron/dark/textured_large,
/area/station/cargo/miningdock)
"lBD" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/structure/cable,
+/obj/effect/turf_decal/trimline/brown/filled/warning{
+ dir = 6
+ },
+/obj/effect/turf_decal/trimline/dark/warning{
+ dir = 6
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer4,
/turf/open/floor/iron,
/area/station/cargo/miningdock)
"lCb" = (
@@ -47451,10 +56539,17 @@
/turf/open/floor/wood,
/area/station/service/library/abandoned)
"lCi" = (
-/obj/structure/sign/warning/vacuum/external/directional/north,
-/obj/effect/turf_decal/stripes/line{
- dir = 1
+/obj/machinery/light/directional/south,
+/obj/effect/turf_decal/trimline/blue/filled/line{
+ dir = 6
},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 5
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer5,
/turf/open/floor/iron,
/area/station/hallway/secondary/entry)
"lCy" = (
@@ -47467,6 +56562,16 @@
/obj/machinery/airalarm/directional/north,
/turf/open/floor/iron,
/area/station/service/hydroponics/garden/abandoned)
+"lCC" = (
+/obj/machinery/duct,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 6
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/turf/open/floor/plating,
+/area/station/maintenance/port/aft)
"lCI" = (
/obj/structure/table,
/obj/item/hand_labeler,
@@ -47481,11 +56586,38 @@
/turf/open/floor/wood/tile,
/area/station/common/pool/sauna)
"lCT" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
- dir = 8
+/obj/effect/turf_decal/siding/dark/corner{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 6
+ },
+/obj/effect/turf_decal/weather/snow/corner{
+ dir = 6
+ },
+/obj/effect/turf_decal/weather/snow,
+/turf/open/floor/iron/dark/smooth_corner{
+ dir = 1
},
-/turf/open/floor/iron/white,
/area/station/medical/cryo)
+"lCY" = (
+/obj/structure/holosign/barrier{
+ opened = 1
+ },
+/turf/open/floor/plating,
+/area/station/maintenance/port/aft)
+"lDq" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/obj/structure/cable,
+/turf/open/floor/iron/edge{
+ dir = 1
+ },
+/area/station/hallway/primary/starboard)
"lDC" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/processor/slime,
@@ -47494,7 +56626,13 @@
"lDS" = (
/obj/machinery/portable_atmospherics/canister/nitrogen,
/obj/effect/turf_decal/bot,
-/turf/open/floor/iron/dark,
+/obj/structure/railing{
+ dir = 4
+ },
+/obj/structure/railing{
+ dir = 8
+ },
+/turf/open/floor/iron/dark/smooth_large,
/area/station/ai_monitored/command/storage/eva)
"lDZ" = (
/obj/machinery/door/window/right/directional/north{
@@ -47516,18 +56654,26 @@
},
/turf/open/floor/plating,
/area/station/maintenance/department/security)
-"lEE" = (
-/obj/effect/turf_decal/tile/neutral{
+"lEw" = (
+/obj/effect/turf_decal/siding/dark/corner{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/dark/corner{
dir = 1
},
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
+/turf/open/floor/circuit/green/telecomms/mainframe,
+/area/station/tcommsat/server)
+"lEE" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 4
},
-/obj/machinery/light/directional/north,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/blue/filled/warning{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/white/corner{
+ dir = 4
+ },
+/turf/open/floor/iron/small,
/area/station/hallway/secondary/entry)
"lEW" = (
/obj/effect/turf_decal/delivery,
@@ -47544,31 +56690,42 @@
/turf/open/floor/vault/rock,
/area/station/security/prison)
"lFl" = (
-/obj/machinery/computer/records/security,
-/obj/machinery/requests_console{
- department = "Security";
- pixel_x = 32;
- pixel_y = 30
- },
-/obj/effect/mapping_helpers/requests_console/information,
-/obj/effect/mapping_helpers/requests_console/assistance,
-/obj/effect/turf_decal/tile/red{
- dir = 1
- },
-/obj/effect/turf_decal/tile/red{
- dir = 4
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
/obj/structure/reagent_dispensers/wall/peppertank/directional/east,
-/turf/open/floor/iron/dark,
+/obj/effect/turf_decal/delivery/blue,
+/obj/structure/table,
+/obj/item/storage/toolbox/emergency{
+ pixel_x = -1;
+ pixel_y = 9
+ },
+/obj/item/radio/off{
+ pixel_x = 2;
+ pixel_y = 3
+ },
+/obj/item/assembly/flash/handheld{
+ pixel_x = -8;
+ pixel_y = 1
+ },
+/turf/open/floor/iron/dark/smooth_large,
/area/station/security/checkpoint/escape)
"lFo" = (
/obj/structure/chair/sofa/corp/corner,
/obj/effect/turf_decal/tile/neutral/opposingcorners,
/turf/open/floor/iron/dark,
/area/station/commons/fitness/recreation/entertainment)
+"lFq" = (
+/obj/machinery/light/small/directional/north,
+/turf/open/floor/plating,
+/area/station/hallway/secondary/entry)
+"lFK" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/turf_decal/siding/dark/corner{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 8
+ },
+/turf/open/floor/wood/tile,
+/area/station/command/heads_quarters/captain)
"lFS" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -47582,17 +56739,33 @@
name = "Testing Lab"
},
/obj/effect/mapping_helpers/airlock/access/any/science/general,
-/turf/open/floor/iron,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/science/explab)
+"lGh" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 5
+ },
+/obj/effect/turf_decal/trimline/blue/filled/line,
+/obj/structure/sign/warning/pods/directional/south,
+/turf/open/floor/iron/edge{
+ dir = 1
+ },
+/area/station/hallway/secondary/entry)
"lGF" = (
/turf/closed/wall,
/area/station/cargo/warehouse)
"lHg" = (
/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
+/obj/machinery/light/directional/south,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+ dir = 1
},
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/dark/filled/line,
+/obj/effect/turf_decal/siding/white,
+/turf/open/floor/iron/small,
/area/station/hallway/secondary/entry)
"lHi" = (
/obj/structure/cable,
@@ -47605,17 +56778,39 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 1
},
+/obj/effect/turf_decal/trimline/green/corner,
/turf/open/floor/iron/smooth_large,
/area/station/hallway/secondary/service)
+"lHq" = (
+/obj/effect/spawner/structure/window/reinforced/tinted,
+/turf/open/floor/plating,
+/area/station/maintenance/aft)
"lHs" = (
/turf/closed/wall,
/area/station/medical/surgery/fore)
"lHA" = (
-/obj/effect/decal/cleanable/dirt,
/obj/structure/cable,
/obj/effect/landmark/blobstart,
+/obj/effect/turf_decal/trimline/white/filled/corner{
+ alpha = 160
+ },
+/obj/effect/turf_decal/trimline/purple/corner{
+ alpha = 200;
+ dir = 2;
+ color = "#a56dc2"
+ },
+/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron,
/area/station/science/explab)
+"lHX" = (
+/obj/effect/turf_decal/stripes/line,
+/obj/effect/turf_decal/trimline/blue/filled/corner,
+/obj/effect/turf_decal/stripes/white/line,
+/obj/machinery/atmospherics/pipe/layer_manifold/cyan/hidden{
+ dir = 8
+ },
+/turf/open/floor/iron/small,
+/area/station/hallway/secondary/entry)
"lHY" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -47625,6 +56820,20 @@
},
/turf/open/floor/iron/dark,
/area/station/security/brig)
+"lIe" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer5,
+/turf/open/floor/plating,
+/area/station/maintenance/aft)
"lIj" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 4
@@ -47635,15 +56844,20 @@
/turf/open/floor/plating,
/area/station/maintenance/starboard/fore)
"lIm" = (
-/obj/effect/turf_decal/stripes/line,
-/obj/structure/chair/sofa/bench/left{
+/obj/structure/window/reinforced/spawner/directional/south,
+/obj/structure/fluff/metalpole/anchor{
+ dir = 1;
+ pixel_y = -39
+ },
+/turf/open/floor/iron/smooth_edge{
dir = 1
},
-/turf/open/floor/iron,
/area/station/hallway/secondary/entry)
"lIJ" = (
-/obj/machinery/door/airlock/bathroom,
-/turf/open/floor/iron/freezer,
+/obj/machinery/door/airlock/freezer{
+ name = "Showers"
+ },
+/turf/open/floor/iron/white/smooth_large,
/area/station/commons/toilet)
"lIK" = (
/obj/structure/chair/wood,
@@ -47654,11 +56868,19 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/light/directional/south,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/cable,
/turf/open/floor/iron/dark/side,
/area/station/security/prison/safe)
"lIW" = (
/obj/machinery/holopad,
-/turf/open/floor/iron/dark,
+/obj/effect/turf_decal/siding/dark{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes/line,
+/obj/effect/turf_decal/stripes/white/line{
+ color = "#EFB341"
+ },
+/turf/open/floor/iron/textured_large,
/area/station/ai_monitored/command/storage/eva)
"lIZ" = (
/obj/effect/decal/cleanable/dirt,
@@ -47684,6 +56906,13 @@
/area/station/engineering/atmos)
"lJT" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/turf_decal/tile/red/real_red,
+/obj/effect/turf_decal/tile/red/real_red{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/red/real_red{
+ dir = 1
+ },
/turf/open/floor/iron/white,
/area/station/security/medical)
"lKc" = (
@@ -47699,12 +56928,6 @@
/obj/machinery/door/airlock/maintenance{
name = "Security Maintenance"
},
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
- dir = 4
- },
/obj/structure/cable,
/turf/open/floor/plating,
/area/station/maintenance/department/security)
@@ -47722,6 +56945,15 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/hallway/primary/central)
+"lKp" = (
+/obj/machinery/shower/directional/west,
+/obj/structure/drain,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/turf/open/floor/iron/freezer,
+/area/station/maintenance/port/aft)
"lKu" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -47745,32 +56977,56 @@
/obj/effect/turf_decal/bot_blue,
/turf/open/floor/iron/dark,
/area/station/security/brig)
+"lKH" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 6
+ },
+/obj/machinery/door/airlock/maintenance,
+/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance,
+/obj/effect/mapping_helpers/airlock/unres{
+ dir = 1
+ },
+/turf/open/floor/plating,
+/area/station/maintenance/port/aft)
"lLa" = (
/obj/structure/sign/warning/vacuum/external/directional/north,
/obj/structure/closet/emcloset,
/turf/open/floor/plating,
/area/station/maintenance/starboard)
"lLB" = (
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
/obj/structure/closet/secure_closet/medical2,
/obj/machinery/power/apc/auto_name/directional/north,
/obj/structure/cable,
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/tile/blue/full,
+/turf/open/floor/iron/large,
/area/station/medical/surgery/fore)
+"lLG" = (
+/obj/effect/turf_decal/siding/dark{
+ dir = 8
+ },
+/turf/open/floor/iron/textured_half{
+ dir = 8
+ },
+/area/station/hallway/primary/central)
"lLZ" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/firealarm/directional/south,
/turf/open/floor/iron/dark,
/area/station/command/heads_quarters/hos)
+"lMw" = (
+/obj/structure/disposalpipe/segment,
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/turf_decal/siding/dark{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 8
+ },
+/turf/open/floor/wood,
+/area/station/command/meeting_room)
"lMP" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -47781,7 +57037,7 @@
"lNf" = (
/obj/machinery/rnd/destructive_analyzer,
/obj/structure/extinguisher_cabinet/directional/west,
-/turf/open/floor/iron/checker,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/science/lab)
"lNi" = (
/obj/structure/table,
@@ -47791,6 +57047,9 @@
/area/station/engineering/gravity_generator)
"lNo" = (
/obj/structure/disposalpipe/segment,
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/white,
/area/station/science/xenobiology)
"lNr" = (
@@ -47837,6 +57096,9 @@
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/turf_decal/trimline/dark/corner{
+ dir = 8
+ },
/turf/open/floor/iron/dark,
/area/station/security/execution/transfer)
"lOa" = (
@@ -47850,21 +57112,31 @@
/turf/open/floor/wood,
/area/station/security/detectives_office)
"lOk" = (
-/obj/machinery/seed_extractor,
/obj/effect/turf_decal/trimline/green/filled/line{
dir = 1
},
+/obj/machinery/seed_extractor,
/turf/open/floor/iron,
/area/station/service/hydroponics/garden/abandoned)
"lOv" = (
-/obj/effect/turf_decal/trimline/dark_blue/filled/line,
/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible,
/obj/structure/cable,
+/obj/effect/turf_decal/trimline/dark_blue/filled/warning,
+/obj/effect/turf_decal/trimline/white/warning,
/turf/open/floor/iron/dark,
/area/station/security/execution/education)
"lOw" = (
-/obj/machinery/light/directional/west,
-/turf/open/floor/iron,
+/obj/structure/window/reinforced/spawner/directional/west,
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 5
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer4,
+/turf/open/floor/iron/smooth_edge{
+ dir = 4
+ },
/area/station/hallway/secondary/entry)
"lOL" = (
/obj/structure/cable,
@@ -47907,19 +57179,48 @@
/turf/open/floor/iron/dark,
/area/station/security/checkpoint/science)
"lOZ" = (
-/obj/effect/turf_decal/tile/blue{
- dir = 8
+/obj/effect/turf_decal/siding/dark/corner,
+/obj/effect/turf_decal/siding/dark{
+ dir = 9
},
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
-/turf/open/floor/iron/white,
+/obj/machinery/plumbing/receiver,
+/turf/open/floor/iron/dark/smooth_corner,
/area/station/medical/cryo)
"lPf" = (
/obj/structure/sign/warning/docking,
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/station/hallway/secondary/exit)
+"lPm" = (
+/mob/living/basic/slime{
+ name = "garold"
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 4
+ },
+/obj/effect/turf_decal/stripes/white/line{
+ color = "#D381C9";
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/dark/corner{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/dark/corner{
+ dir = 1
+ },
+/turf/open/floor/engine,
+/area/station/science/xenobiology)
+"lPz" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/structure/curtain/cloth,
+/turf/open/floor/plating,
+/area/station/maintenance/port/aft)
"lPO" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
@@ -47934,6 +57235,9 @@
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/turf_decal/trimline/white/corner{
+ dir = 8
+ },
/turf/open/floor/iron/dark,
/area/station/security/execution/education)
"lQd" = (
@@ -47962,6 +57266,7 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 8
},
+/obj/structure/platform/pizza,
/mob/living/basic/goat/pete,
/turf/open/floor/iron/kitchen_coldroom/freezerfloor,
/area/station/service/kitchen)
@@ -47971,12 +57276,27 @@
/obj/effect/decal/cleanable/dirt,
/obj/structure/cable,
/turf/open/floor/iron,
-/area/station/science/ordnance/bomb)
+/area/station/science/ordnance/testlab)
+"lQS" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 4
+ },
+/obj/structure/cable,
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer5,
+/turf/open/floor/plating,
+/area/station/maintenance/starboard)
"lRl" = (
/obj/machinery/light/directional/north,
/obj/machinery/portable_atmospherics/canister/air,
/obj/effect/turf_decal/bot,
-/turf/open/floor/iron/dark,
+/obj/structure/railing{
+ dir = 4
+ },
+/obj/structure/railing{
+ dir = 8
+ },
+/turf/open/floor/iron/dark/smooth_large,
/area/station/ai_monitored/command/storage/eva)
"lRs" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
@@ -47984,6 +57304,29 @@
},
/turf/open/floor/iron,
/area/station/security/prison/safe)
+"lRw" = (
+/obj/effect/turf_decal/trimline/dark/filled/line{
+ alpha = 160;
+ dir = 9
+ },
+/obj/effect/turf_decal/trimline/purple/line{
+ color = "#700047";
+ alpha = 200;
+ dir = 9
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 9
+ },
+/obj/effect/turf_decal/trimline/dark/filled/mid_joiner{
+ dir = 8;
+ alpha = 160
+ },
+/obj/effect/turf_decal/trimline/dark/filled/mid_joiner{
+ dir = 1;
+ alpha = 160
+ },
+/turf/open/floor/iron/white/smooth_corner,
+/area/station/science/lab)
"lSv" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
@@ -47994,6 +57337,12 @@
},
/turf/open/floor/plating,
/area/station/maintenance/starboard/aft)
+"lSw" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 4
+ },
+/turf/open/floor/wood,
+/area/station/security/prison)
"lSJ" = (
/obj/machinery/light/directional/west,
/obj/machinery/recharge_station,
@@ -48009,22 +57358,24 @@
/area/station/hallway/primary/central)
"lSY" = (
/obj/machinery/computer/bank_machine,
-/obj/effect/turf_decal/bot_white,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
/obj/machinery/airalarm/directional/north,
-/turf/open/floor/iron/dark,
+/obj/effect/turf_decal/box/blue,
+/obj/effect/turf_decal/bot_blue,
+/turf/open/floor/iron/dark/textured_large,
/area/station/ai_monitored/command/nuke_storage)
"lTa" = (
/obj/structure/chair/comfy/black,
/turf/open/floor/iron,
/area/station/hallway/primary/central/fore)
"lTb" = (
-/obj/structure/hedge/opaque,
-/obj/effect/turf_decal/tile/dark_green/opposingcorners{
- dir = 1
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/cable,
+/obj/effect/turf_decal/trimline/green/corner{
+ dir = 4
},
-/turf/open/floor/iron/dark,
-/area/station/hallway/primary/fore)
+/turf/open/floor/iron,
+/area/station/hallway/primary/central)
"lTi" = (
/obj/effect/turf_decal/siding/wood{
dir = 4
@@ -48032,14 +57383,10 @@
/turf/open/floor/wood,
/area/station/common/pool/sauna)
"lTj" = (
-/obj/machinery/door/airlock/public/glass{
- name = "Prison Wing"
- },
/obj/effect/turf_decal/tile/red,
/obj/effect/turf_decal/tile/red{
dir = 4
},
-/obj/effect/mapping_helpers/airlock/access/any/security/general,
/turf/open/floor/iron,
/area/station/security/brig)
"lTE" = (
@@ -48047,15 +57394,18 @@
/obj/machinery/power/apc/auto_name/directional/north,
/obj/machinery/light/directional/north,
/obj/effect/mapping_helpers/apc/cell_10k,
-/turf/open/floor/circuit/telecomms/mainframe,
+/obj/effect/turf_decal/siding/dark{
+ dir = 1;
+ icon_state = "siding_plain_end"
+ },
+/turf/open/floor/circuit/green/telecomms/mainframe,
/area/station/tcommsat/server)
"lTQ" = (
-/obj/effect/turf_decal/trimline/blue/filled/end,
-/obj/structure/window/reinforced/spawner/directional/south,
/obj/item/radio/intercom/directional/west,
/obj/effect/spawner/random/medical/patient_stretcher,
-/turf/open/floor/iron,
-/area/station/medical/medbay/aft)
+/obj/structure/window/reinforced/spawner/directional/south,
+/turf/open/floor/iron/dark/smooth_large,
+/area/station/medical/medbay/central)
"lUa" = (
/obj/machinery/cryopod{
dir = 1
@@ -48069,11 +57419,12 @@
/turf/open/floor/iron/dark,
/area/station/common/cryopods)
"lUc" = (
+/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/maintenance{
name = "Medbay Maintenance"
},
/obj/effect/mapping_helpers/airlock/access/any/medical/general,
-/turf/open/floor/plating,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/medical/break_room)
"lUy" = (
/obj/structure/disposalpipe/segment{
@@ -48082,13 +57433,23 @@
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/iron,
+/turf/open/floor/catwalk_floor/iron,
/area/station/science/explab)
"lUF" = (
/obj/structure/extinguisher_cabinet/directional/west,
-/obj/structure/closet/bombcloset,
+/obj/structure/closet/l3closet/scientist,
/turf/open/floor/iron,
/area/station/science/explab)
+"lUQ" = (
+/obj/structure/disposalpipe/segment,
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/railing/corner/end{
+ dir = 4
+ },
+/turf/open/floor/plating,
+/area/station/maintenance/aft)
"lUZ" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -48104,6 +57465,12 @@
"lVd" = (
/turf/open/floor/carpet/purple,
/area/station/command/heads_quarters/rd)
+"lVt" = (
+/obj/machinery/door/airlock/maintenance,
+/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance,
+/obj/effect/mapping_helpers/airlock/unres,
+/turf/open/floor/plating,
+/area/station/maintenance/port)
"lVy" = (
/obj/structure/chair/wood,
/obj/effect/decal/cleanable/dirt,
@@ -48134,8 +57501,26 @@
/turf/open/floor/plating,
/area/station/maintenance/port/aft)
"lWC" = (
-/mob/living/basic/pet/dog/corgi/borgi,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/loading_area/white{
+ dir = 1;
+ color = "#ae4fd6"
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/dark/corner{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/dark/corner{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/purple/filled/line{
+ alpha = 160;
+ color = "#6a3182";
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron/dark/small,
/area/station/science/robotics/lab)
"lWG" = (
/obj/structure/chair/comfy/brown{
@@ -48158,7 +57543,7 @@
pixel_y = 6
},
/obj/structure/cable,
-/turf/open/floor/iron,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/science/lab)
"lXs" = (
/obj/effect/spawner/structure/window,
@@ -48166,13 +57551,19 @@
/turf/open/floor/plating,
/area/station/commons/vacant_room/office)
"lXI" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 8
+/obj/structure/disposalpipe/segment{
+ dir = 4
},
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/random/structure/closet_maintenance,
-/turf/open/floor/iron,
-/area/station/maintenance/port/aft)
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer5,
+/turf/open/floor/plating,
+/area/station/maintenance/port)
"lXP" = (
/obj/machinery/airalarm/directional/west,
/obj/machinery/recharger{
@@ -48202,15 +57593,13 @@
/turf/open/floor/plating,
/area/station/medical/treatment_center)
"lZo" = (
-/obj/machinery/power/apc/auto_name/directional/north,
-/obj/structure/cable,
-/obj/machinery/firealarm/directional/east,
/obj/machinery/camera/directional/east{
c_tag = "Starboard Primary Hallway 2"
},
-/turf/open/floor/iron/white/corner{
- dir = 1
+/obj/effect/turf_decal/siding/wood{
+ dir = 5
},
+/turf/open/floor/wood,
/area/station/hallway/primary/starboard)
"lZz" = (
/obj/machinery/biogenerator,
@@ -48218,16 +57607,6 @@
/turf/open/floor/iron/dark,
/area/station/service/hydroponics)
"lZG" = (
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/medical/glass{
name = "Medbay Storage"
@@ -48235,7 +57614,8 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/effect/mapping_helpers/airlock/access/any/medical/general,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron/dark,
+/obj/effect/turf_decal/tile/blue/full,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/medical/storage)
"lZH" = (
/obj/structure/cable,
@@ -48247,6 +57627,7 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/structure/cable,
/obj/effect/turf_decal/trimline/dark_blue/filled/warning,
+/obj/effect/turf_decal/trimline/dark/warning,
/turf/open/floor/iron/dark,
/area/station/security/brig)
"mam" = (
@@ -48278,6 +57659,7 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/light/directional/south,
+/obj/structure/cable,
/turf/open/floor/iron/dark/side,
/area/station/security/prison)
"mbo" = (
@@ -48288,9 +57670,33 @@
},
/turf/open/floor/grass,
/area/station/service/hydroponics/garden)
+"mbp" = (
+/obj/structure/table/reinforced,
+/obj/structure/window/reinforced/spawner/directional/south,
+/obj/effect/turf_decal/stripes/line{
+ dir = 10
+ },
+/obj/effect/turf_decal/stripes/white/line{
+ color = "#a56dc2";
+ dir = 5
+ },
+/obj/item/slime_scanner{
+ pixel_x = -6
+ },
+/turf/open/floor/iron/dark/smooth_large,
+/area/station/science/xenobiology)
"mbz" = (
/obj/item/radio/intercom/directional/south,
-/turf/open/floor/iron,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 5
+ },
+/obj/effect/turf_decal/trimline/blue/filled/line,
+/turf/open/floor/iron/edge{
+ dir = 1
+ },
/area/station/hallway/secondary/entry)
"mbB" = (
/obj/structure/railing{
@@ -48303,7 +57709,6 @@
/area/station/hallway/primary/fore)
"mci" = (
/obj/structure/filingcabinet/chestdrawer,
-/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron,
/area/station/science/explab)
"mdh" = (
@@ -48311,10 +57716,18 @@
/turf/open/floor/plating,
/area/station/science/xenobiology)
"mdj" = (
+/obj/effect/turf_decal/trimline/brown/filled/line{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/dark/line{
+ dir = 4
+ },
/obj/effect/turf_decal/siding/thinplating/dark{
dir = 4
},
-/turf/open/floor/iron,
+/turf/open/floor/iron/textured_edge{
+ dir = 8
+ },
/area/station/cargo/miningdock)
"mdr" = (
/obj/effect/spawner/liquids_spawner{
@@ -48366,6 +57779,23 @@
dir = 1
},
/area/station/security/prison)
+"meD" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/turf_decal/stripes/line,
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/machinery/door/firedoor,
+/obj/effect/turf_decal/stripes/blue/line,
+/obj/effect/turf_decal/stripes/blue/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/blue/full,
+/obj/effect/turf_decal/caution/stand_clear/white,
+/turf/open/floor/iron/dark/smooth_large,
+/area/station/medical/treatment_center)
"meQ" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/public/glass{
@@ -48384,6 +57814,24 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/white,
/area/station/science/explab)
+"meW" = (
+/obj/structure/cable,
+/obj/effect/turf_decal/siding/dark{
+ dir = 8
+ },
+/turf/open/floor/iron/edge{
+ dir = 8
+ },
+/area/station/hallway/primary/central)
+"mfu" = (
+/obj/structure/cable,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 5
+ },
+/turf/open/floor/plating,
+/area/station/maintenance/port/aft)
"mfD" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -48419,8 +57867,20 @@
dir = 10
},
/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer5,
/turf/open/floor/plating,
/area/station/maintenance/port)
+"mhm" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 4
+ },
+/obj/structure/noticeboard/hos{
+ pixel_y = 36
+ },
+/turf/open/floor/carpet/red,
+/area/station/command/heads_quarters/hos)
"mhs" = (
/obj/effect/turf_decal/tile/blue{
dir = 1
@@ -48433,6 +57893,22 @@
/obj/item/radio/intercom/directional/east,
/turf/open/floor/iron/white,
/area/station/medical/psychology)
+"mhE" = (
+/obj/machinery/light/directional/south,
+/obj/effect/turf_decal/trimline/blue/filled/line,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer5,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 5
+ },
+/turf/open/floor/iron,
+/area/station/hallway/secondary/entry)
+"mhG" = (
+/obj/effect/turf_decal/siding/dark{
+ dir = 8;
+ icon_state = "siding_plain_end"
+ },
+/turf/open/floor/wood/parquet,
+/area/station/command/meeting_room)
"mhS" = (
/obj/structure/reagent_dispensers/fueltank,
/obj/structure/disposalpipe/segment,
@@ -48452,6 +57928,7 @@
/area/station/medical/break_room)
"mib" = (
/obj/machinery/vending/wardrobe/law_wardrobe,
+/obj/machinery/light/small/directional/east,
/turf/open/floor/wood/tile,
/area/station/service/lawoffice)
"miv" = (
@@ -48463,6 +57940,13 @@
/obj/structure/bookcase/random/nonfiction,
/turf/open/floor/wood,
/area/station/service/library)
+"miL" = (
+/obj/machinery/duct,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/turf/open/floor/plating,
+/area/station/maintenance/port/aft)
"miU" = (
/obj/structure/grille,
/obj/structure/window/reinforced/tinted/spawner/directional/south,
@@ -48476,15 +57960,30 @@
},
/turf/open/floor/iron,
/area/station/service/hydroponics/garden)
+"miY" = (
+/obj/structure/fluff/metalpole,
+/obj/machinery/light/small/directional/north,
+/obj/item/storage/box/emergency_spacesuit{
+ pixel_x = 11;
+ pixel_y = 8
+ },
+/turf/open/floor/plating,
+/area/station/hallway/secondary/entry)
+"miZ" = (
+/obj/effect/turf_decal/siding/dark{
+ dir = 5
+ },
+/turf/open/floor/iron/dark,
+/area/station/service/hydroponics)
"mje" = (
/obj/machinery/door/airlock{
name = "Private Restroom"
},
-/turf/open/floor/iron/freezer,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/medical/break_room)
"mjp" = (
/obj/effect/spawner/random/medical/two_percent_xeno_egg_spawner,
-/turf/open/floor/engine,
+/turf/open/floor/engine/xenobio,
/area/station/science/xenobiology)
"mjq" = (
/obj/effect/decal/cleanable/dirt,
@@ -48512,7 +58011,29 @@
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/trimline/dark/filled/corner{
+ alpha = 160;
+ dir = 2
+ },
+/obj/effect/turf_decal/trimline/dark/filled/corner{
+ alpha = 160;
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/purple/corner{
+ alpha = 200;
+ dir = 8;
+ color = "#a56dc2"
+ },
+/obj/effect/turf_decal/trimline/purple/corner{
+ alpha = 200;
+ dir = 2;
+ color = "#a56dc2"
+ },
+/obj/effect/turf_decal/siding/dark/corner{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/dark/corner,
+/turf/open/floor/iron/white/smooth_edge,
/area/station/science/xenobiology)
"mkk" = (
/obj/structure/cable,
@@ -48522,12 +58043,17 @@
/obj/structure/window/reinforced/spawner/directional/east,
/turf/open/floor/carpet,
/area/station/command/heads_quarters/rd)
+"mkF" = (
+/obj/structure/sign/warning/secure_area/directional/west,
+/obj/structure/grille/broken,
+/turf/open/space/basic,
+/area/space/nearstation)
"mkV" = (
/obj/structure/bodycontainer/morgue/beeper_off{
dir = 2
},
/obj/effect/decal/cleanable/cobweb/cobweb2,
-/turf/open/floor/iron/dark,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/medical/morgue)
"mlh" = (
/obj/structure/cable,
@@ -48539,13 +58065,24 @@
/obj/structure/closet/secure_closet/engineering_electrical,
/turf/open/floor/plating,
/area/station/maintenance/aft)
+"mlu" = (
+/obj/structure/disposalpipe/segment,
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron/white,
+/area/station/science/xenobiology)
"mmf" = (
/obj/machinery/button/door/directional/north{
id = "gatewayshutters";
req_access = list("gateway");
name = "Gateway Shutters"
},
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/blue/corner{
+ dir = 4
+ },
+/turf/open/floor/iron/edge{
+ dir = 1
+ },
/area/station/hallway/primary/central)
"mmi" = (
/obj/effect/turf_decal/tile/red{
@@ -48554,6 +58091,26 @@
/obj/effect/landmark/start/hangover,
/turf/open/floor/iron/dark,
/area/station/hallway/secondary/exit)
+"mmm" = (
+/obj/effect/turf_decal/tile/blue{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/blue{
+ dir = 8
+ },
+/obj/machinery/power/apc/auto_name/directional/east,
+/obj/structure/cable,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+ dir = 8
+ },
+/turf/open/floor/iron/cafeteria,
+/area/station/commons/dorms/laundry)
+"mmZ" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 5
+ },
+/turf/open/floor/iron/dark,
+/area/station/hallway/primary/fore)
"mnf" = (
/turf/closed/wall,
/area/station/maintenance/department/security)
@@ -48566,14 +58123,21 @@
/obj/item/stack/license_plates/empty/fifty,
/turf/open/floor/vault/rock,
/area/station/security/prison)
+"mnX" = (
+/obj/effect/turf_decal/siding/dark{
+ dir = 2;
+ icon_state = "siding_plain_end"
+ },
+/turf/open/floor/circuit/green,
+/area/station/ai_monitored/turret_protected/ai_upload)
"moA" = (
-/obj/effect/turf_decal/delivery,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/turf_decal/delivery,
/obj/machinery/door/window/right/directional/north{
name = "Bridge Delivery";
req_access = list("command")
},
-/turf/open/floor/iron,
+/turf/open/floor/iron/large,
/area/station/command/meeting_room)
"moN" = (
/obj/effect/turf_decal/siding/wood{
@@ -48584,32 +58148,62 @@
},
/turf/open/floor/stone,
/area/station/service/bar)
+"moP" = (
+/obj/effect/turf_decal/siding/dark{
+ dir = 1;
+ icon_state = "siding_plain_end"
+ },
+/turf/open/floor/plating,
+/area/station/maintenance/starboard/aft)
"moU" = (
-/obj/structure/disposalpipe/trunk{
- dir = 4
- },
-/obj/structure/disposaloutlet,
-/obj/machinery/camera/directional/west{
- c_tag = "Xenobiology Cell 7";
- network = list("ss13","xeno")
- },
-/turf/open/floor/engine,
-/area/station/science/xenobiology)
+/obj/structure/lattice/catwalk,
+/obj/structure/marker_beacon/olive,
+/turf/open/space/basic,
+/area/space/nearstation)
"mpg" = (
/obj/structure/cable,
/turf/closed/wall,
/area/station/security/execution/education)
-"mpJ" = (
-/obj/effect/turf_decal/trimline/blue/filled/corner,
-/obj/effect/turf_decal/trimline/blue/filled/corner{
- dir = 8
+"mpq" = (
+/obj/effect/turf_decal/trimline/dark_blue/filled/line,
+/obj/effect/turf_decal/trimline/dark/line,
+/obj/effect/spawner/random/burgerstation/loot/with_maintenance_loot,
+/turf/open/floor/iron/dark,
+/area/station/maintenance/port/aft)
+"mpB" = (
+/obj/effect/turf_decal/trimline/blue/arrow_ccw{
+ dir = 4;
+ alpha = 200
},
+/obj/effect/turf_decal/trimline/blue/mid_joiner{
+ alpha = 200;
+ dir = 4
+ },
+/turf/open/floor/iron/corner{
+ dir = 1
+ },
+/area/station/hallway/primary/central)
+"mpJ" = (
/obj/structure/disposalpipe/segment{
dir = 6
},
/obj/structure/cable,
-/turf/open/floor/iron/white,
-/area/station/medical/medbay/aft)
+/obj/effect/turf_decal/trimline/blue/filled/warning{
+ alpha = 160
+ },
+/obj/effect/turf_decal/trimline/dark_blue/warning{
+ alpha = 200
+ },
+/turf/open/floor/iron/white/smooth_edge,
+/area/station/medical/medbay/central)
+"mpN" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/open/floor/iron/textured_corner{
+ dir = 4
+ },
+/area/station/hallway/primary/port)
"mql" = (
/obj/effect/turf_decal/tile/red,
/obj/effect/turf_decal/tile/red{
@@ -48678,18 +58272,8 @@
/turf/open/floor/iron/dark/side,
/area/station/hallway/primary/central/fore)
"mrM" = (
-/obj/effect/turf_decal/tile/yellow{
- dir = 1
- },
-/obj/effect/turf_decal/tile/yellow{
- dir = 4
- },
-/obj/effect/turf_decal/tile/yellow,
/obj/machinery/chem_master,
-/obj/effect/turf_decal/tile/yellow{
- dir = 8
- },
-/turf/open/floor/iron/white,
+/turf/open/floor/plating/elevatorshaft,
/area/station/medical/chemistry)
"mrT" = (
/obj/effect/turf_decal/stripes/red/line{
@@ -48715,8 +58299,12 @@
/area/station/security/prison)
"msR" = (
/obj/effect/landmark/start/hangover,
-/obj/machinery/firealarm/directional/east,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/blue/mid_joiner{
+ dir = 4
+ },
+/turf/open/floor/iron/edge{
+ dir = 4
+ },
/area/station/hallway/primary/central)
"mtl" = (
/obj/machinery/camera/directional/south{
@@ -48741,20 +58329,43 @@
/turf/open/floor/iron/dark,
/area/station/commons/fitness)
"mts" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 10
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/structure/cable,
/obj/structure/disposalpipe/segment,
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/trimline/dark/filled/end{
+ dir = 2;
+ alpha = 160
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 2;
+ icon_state = "siding_plain_end"
+ },
+/obj/effect/turf_decal/trimline/dark/filled/mid_joiner{
+ dir = 4;
+ alpha = 160
+ },
+/obj/effect/turf_decal/trimline/dark/filled/mid_joiner{
+ dir = 8;
+ alpha = 160
+ },
+/obj/effect/turf_decal/trimline/dark/filled/mid_joiner{
+ dir = 2;
+ alpha = 160
+ },
+/obj/effect/turf_decal/trimline/purple/end{
+ alpha = 200;
+ color = "#700047";
+ dir = 2
+ },
+/turf/open/floor/iron/white/smooth_large,
/area/station/science/lab)
"mtG" = (
/obj/machinery/light/directional/south,
/obj/effect/turf_decal/trimline/dark_blue/filled/line,
+/obj/effect/turf_decal/trimline/dark/line,
/turf/open/floor/iron/dark,
/area/station/security/brig)
"mtK" = (
@@ -48781,14 +58392,13 @@
dir = 4
},
/obj/effect/mapping_helpers/airlock/access/any/medical/general,
-/obj/effect/turf_decal/trimline/yellow/filled/line{
- dir = 9
- },
/obj/machinery/door/airlock/medical/glass{
id_tag = "MedbayAft";
name = "Medbay"
},
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/tile/yellow/full,
+/obj/machinery/door/firedoor,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/medical/medbay/central)
"mtZ" = (
/obj/structure/cable,
@@ -48822,7 +58432,34 @@
/obj/structure/closet/crate/hydroponics,
/turf/open/floor/grass,
/area/station/service/hydroponics)
+"mum" = (
+/obj/effect/turf_decal/trimline/dark_blue/filled/corner{
+ dir = 8
+ },
+/turf/open/floor/iron/dark,
+/area/station/hallway/primary/fore)
+"muy" = (
+/obj/machinery/door/window/left/directional/east{
+ req_access = list("xenobiology");
+ name = "Containment Cell"
+ },
+/obj/effect/turf_decal/vg_decals/numbers/two{
+ color = "#a56dc2"
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 9
+ },
+/obj/structure/cable,
+/obj/effect/turf_decal/bot_white{
+ color = "#a56dc2"
+ },
+/obj/effect/turf_decal/box/white{
+ color = "#a56dc2"
+ },
+/turf/open/floor/iron/dark/smooth_large,
+/area/station/science/xenobiology)
"muH" = (
+/obj/machinery/door/firedoor,
/obj/structure/table/reinforced,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 6
@@ -48835,10 +58472,10 @@
/area/station/maintenance/abandon_cafeteria)
"muM" = (
/obj/structure/cable,
-/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/iron,
+/obj/machinery/door/firedoor,
+/turf/open/floor/iron/large,
/area/station/hallway/primary/central)
"mvn" = (
/obj/structure/disposalpipe/segment{
@@ -48870,6 +58507,10 @@
},
/obj/effect/mapping_helpers/airlock/access/any/engineering/general,
/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 8
+ },
/turf/open/floor/plating,
/area/station/maintenance/solars/starboard/fore)
"mwi" = (
@@ -48883,6 +58524,18 @@
"mwk" = (
/turf/closed/wall/r_wall,
/area/station/security/mechbay)
+"mwq" = (
+/obj/structure/disposalpipe/segment{
+ dir = 5
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 6
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/turf/open/floor/plating,
+/area/station/maintenance/port/aft)
"mwu" = (
/obj/effect/turf_decal/stripes/line{
dir = 10
@@ -48893,11 +58546,39 @@
"mwK" = (
/turf/closed/wall,
/area/station/science/explab)
+"mwS" = (
+/obj/machinery/door/firedoor/border_only{
+ dir = 1
+ },
+/obj/machinery/firealarm/directional/west,
+/obj/structure/fluff/metalpole{
+ dir = 1;
+ pixel_y = 32
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes/white/line{
+ color = "#52B4E9";
+ dir = 1;
+ name = "blue line"
+ },
+/obj/structure/railing{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/blue/fourcorners,
+/turf/open/floor/iron/white,
+/area/station/hallway/secondary/entry)
+"mxd" = (
+/obj/structure/rack/gunrack,
+/obj/item/gun/ballistic/automatic/pistol/toy,
+/turf/open/floor/plating,
+/area/station/maintenance/port/aft)
"myc" = (
/obj/structure/disposalpipe/segment,
/obj/effect/turf_decal/tile/yellow/fourcorners,
/obj/machinery/smartfridge/chemistry/preloaded,
-/turf/open/floor/iron/white,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/medical/pharmacy)
"myQ" = (
/obj/item/toy/plush/plasmamanplushie,
@@ -48940,6 +58621,9 @@
/obj/effect/turf_decal/trimline/dark_blue/filled/line{
dir = 5
},
+/obj/effect/turf_decal/trimline/dark/line{
+ dir = 5
+ },
/turf/open/floor/iron/dark,
/area/station/security/brig)
"mAo" = (
@@ -48952,10 +58636,8 @@
},
/area/station/hallway/primary/fore)
"mAr" = (
-/obj/effect/turf_decal/tile/dark_green{
- dir = 4
- },
/obj/structure/closet/firecloset,
+/obj/effect/turf_decal/trimline/dark_green/filled/corner,
/obj/machinery/firealarm/directional/east,
/turf/open/floor/iron/dark,
/area/station/hallway/primary/fore)
@@ -48973,20 +58655,42 @@
},
/turf/open/floor/iron,
/area/station/maintenance/department/electrical)
+"mAO" = (
+/obj/structure/hedge,
+/obj/structure/window/reinforced/spawner/directional/east,
+/obj/structure/window/reinforced/spawner/directional/west,
+/turf/open/floor/plating,
+/area/station/medical/virology)
"mBa" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/station/commons/fitness/recreation)
"mBc" = (
/obj/effect/turf_decal/trimline/blue/filled/line{
+ alpha = 160;
+ dir = 6
+ },
+/obj/effect/turf_decal/trimline/dark_blue/line{
+ alpha = 200;
+ dir = 6
+ },
+/obj/machinery/firealarm/directional/east,
+/obj/effect/turf_decal/trimline/blue/filled/mid_joiner,
+/obj/effect/turf_decal/trimline/blue/filled/mid_joiner,
+/obj/effect/turf_decal/trimline/dark_blue/mid_joiner,
+/obj/effect/turf_decal/trimline/blue/filled/mid_joiner{
dir = 4
},
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/firealarm/directional/east,
-/turf/open/floor/iron/white,
-/area/station/medical/medbay/aft)
+/obj/effect/turf_decal/trimline/blue/filled/mid_joiner{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/dark_blue/mid_joiner{
+ dir = 4
+ },
+/turf/open/floor/iron/white/smooth_corner{
+ dir = 1
+ },
+/area/station/medical/medbay/central)
"mBl" = (
/obj/effect/turf_decal/stripes/corner{
dir = 4
@@ -49006,28 +58710,16 @@
name = "Output to Waste"
},
/turf/open/floor/engine,
-/area/station/engineering/main)
+/area/station/engineering/supermatter/room)
"mBQ" = (
/obj/machinery/vending/tool,
/turf/open/floor/iron/smooth_large,
/area/station/engineering/main)
"mCo" = (
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
-/obj/structure/table/glass,
-/obj/item/stack/medical/gauze{
- pixel_x = 8
- },
/obj/item/clothing/neck/stethoscope,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/tile/blue/full,
+/obj/structure/table/glass,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/medical/treatment_center)
"mCs" = (
/obj/structure/table,
@@ -49044,6 +58736,9 @@
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/turf_decal/trimline/dark/warning{
+ dir = 4
+ },
/turf/open/floor/iron/dark,
/area/station/security/execution/transfer)
"mCy" = (
@@ -49060,7 +58755,10 @@
"mDe" = (
/obj/effect/landmark/start/hangover,
/obj/machinery/door/firedoor,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/blue/corner{
+ dir = 4
+ },
+/turf/open/floor/iron/large,
/area/station/hallway/primary/central)
"mDj" = (
/obj/effect/decal/cleanable/dirt,
@@ -49069,8 +58767,19 @@
},
/obj/effect/mapping_helpers/broken_floor,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/mob/living/carbon/human/species/monkey{
+ name = "mon wick";
+ desc = "...With a pencil!"
+ },
/turf/open/floor/wood,
/area/station/service/library/abandoned)
+"mDT" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/turf_decal/caution/stand_clear/white,
+/turf/open/floor/iron/dark/smooth_large,
+/area/station/medical/chemistry)
"mEp" = (
/obj/structure/sign/warning/vacuum/external/directional/north,
/obj/effect/landmark/event_spawn,
@@ -49080,10 +58789,10 @@
/turf/open/floor/plating,
/area/station/service/chapel)
"mEE" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
/obj/effect/turf_decal/siding/wood/corner{
dir = 1
},
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
/turf/open/floor/wood,
/area/station/command/heads_quarters/blueshield)
"mEG" = (
@@ -49095,9 +58804,16 @@
},
/turf/open/floor/iron,
/area/station/hallway/secondary/exit)
+"mEJ" = (
+/obj/effect/turf_decal/siding/dark/end{
+ dir = 8
+ },
+/turf/open/floor/wood/large,
+/area/station/command/heads_quarters/captain)
"mEL" = (
/obj/effect/turf_decal/trimline/dark_blue/filled/warning,
/obj/structure/disposalpipe/segment,
+/obj/effect/turf_decal/trimline/dark/warning,
/turf/open/floor/iron/dark,
/area/station/security/brig)
"mEM" = (
@@ -49120,6 +58836,19 @@
},
/turf/open/floor/iron,
/area/station/maintenance/starboard/fore)
+"mFi" = (
+/obj/effect/turf_decal/trimline/blue/filled/warning{
+ alpha = 160
+ },
+/obj/effect/turf_decal/siding{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/white/warning,
+/turf/open/floor/iron/white,
+/area/station/medical/medbay/lobby)
"mFq" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
dir = 8
@@ -49143,8 +58872,13 @@
/turf/open/floor/iron/white,
/area/station/medical/psychology)
"mFu" = (
-/obj/effect/turf_decal/trimline/purple/end,
-/turf/open/floor/iron/dark,
+/obj/effect/turf_decal/caution/white{
+ color = "#ae4fd6"
+ },
+/obj/effect/turf_decal/trimline/dark/filled/line{
+ dir = 9
+ },
+/turf/open/floor/iron/dark/small,
/area/station/medical/morgue)
"mFT" = (
/obj/machinery/camera/directional/east{
@@ -49152,10 +58886,16 @@
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/structure/cable,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/tile/neutral,
+/turf/open/floor/iron/dark/side{
+ dir = 6
+ },
/area/station/commons/locker)
"mFY" = (
/obj/machinery/vending/modularpc,
+/obj/effect/turf_decal/trimline/yellow/filled/line{
+ dir = 1
+ },
/turf/open/floor/iron,
/area/station/commons/storage/primary)
"mGM" = (
@@ -49169,6 +58909,9 @@
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/turf_decal/trimline/dark/warning{
+ dir = 4
+ },
/turf/open/floor/iron/dark,
/area/station/security/brig)
"mGP" = (
@@ -49183,18 +58926,54 @@
/obj/machinery/door/airlock/command/glass{
name = "Gateway"
},
-/turf/open/floor/iron/dark/textured,
+/turf/open/floor/iron/dark/textured_large,
/area/station/command/gateway)
"mGQ" = (
/obj/effect/landmark/blobstart,
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plating,
/area/station/maintenance/port/aft)
+"mHu" = (
+/obj/effect/turf_decal/trimline/blue/corner{
+ dir = 8;
+ alpha = 200
+ },
+/turf/open/floor/iron,
+/area/station/hallway/primary/central)
+"mHL" = (
+/obj/structure/disposalpipe/segment,
+/obj/effect/turf_decal/trimline/yellow/arrow_ccw{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/yellow/mid_joiner{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 8
+ },
+/turf/open/floor/iron/corner,
+/area/station/hallway/primary/aft)
"mHR" = (
/obj/structure/disposalpipe/segment,
/obj/structure/cable,
/turf/open/floor/iron/cafeteria,
/area/station/service/kitchen)
+"mHW" = (
+/obj/structure/chair/sofa/bench/left{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/blue/filled/line{
+ dir = 8
+ },
+/obj/machinery/camera/autoname/directional/west{
+ c_tag = "Arrivals Escape Pod 1"
+ },
+/obj/effect/landmark/start/assistant,
+/obj/machinery/light/small/directional/west,
+/turf/open/floor/iron/edge{
+ dir = 4
+ },
+/area/station/hallway/secondary/entry)
"mIc" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/door/poddoor/shutters/window{
@@ -49214,13 +58993,19 @@
/obj/machinery/computer/records/security,
/turf/open/floor/iron/dark,
/area/station/security/warden)
-"mJb" = (
+"mIM" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
- dir = 4
- },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/structure/cable,
-/turf/open/floor/iron,
+/turf/open/floor/iron/edge,
+/area/station/hallway/primary/central)
+"mJb" = (
+/obj/structure/cable,
+/obj/effect/turf_decal/trimline/brown/filled/corner,
+/obj/effect/turf_decal/trimline/dark/corner,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron/textured_corner,
/area/station/cargo/miningdock)
"mJd" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
@@ -49244,6 +59029,12 @@
dir = 1
},
/area/station/security/prison)
+"mKj" = (
+/obj/structure/window/reinforced/spawner/directional/west,
+/obj/structure/window/reinforced/spawner/directional/east,
+/obj/structure/hedge,
+/turf/open/floor/grass,
+/area/station/science/breakroom)
"mKK" = (
/obj/effect/turf_decal/trimline/dark_blue/filled/line,
/obj/structure/closet/secure_closet/brig/genpop,
@@ -49253,8 +59044,15 @@
/obj/item/clothing/under/rank/prisoner/skirt/highsec,
/obj/item/clothing/under/rank/prisoner/supermax,
/obj/item/clothing/under/rank/prisoner/skirt/supermax,
+/obj/effect/turf_decal/trimline/dark/line,
/turf/open/floor/iron/dark,
/area/station/security/execution/transfer)
+"mKW" = (
+/obj/effect/turf_decal/siding/dark{
+ dir = 5
+ },
+/turf/open/floor/circuit/red,
+/area/station/ai_monitored/turret_protected/ai_upload)
"mLb" = (
/obj/structure/reagent_dispensers/wall/peppertank{
pixel_x = 30
@@ -49265,22 +59063,16 @@
/obj/item/reagent_containers/spray/pepper,
/turf/open/floor/iron/dark,
/area/station/security/office)
+"mLk" = (
+/obj/structure/sign/poster/random/directional/east,
+/obj/effect/landmark/firealarm_sanity,
+/turf/open/floor/plating,
+/area/station/hallway/secondary/entry)
"mLM" = (
/obj/structure/cable,
/turf/open/floor/iron/dark/side,
/area/station/security/prison)
"mLY" = (
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
-/obj/structure/table/glass,
/obj/machinery/light/directional/east,
/obj/item/storage/box/masks,
/obj/item/storage/box/gloves{
@@ -49288,8 +59080,19 @@
pixel_y = 3
},
/obj/item/clothing/neck/stethoscope,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/tile/blue/full,
+/obj/structure/table/glass,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/medical/treatment_center)
+"mMr" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/components/binary/passive_gate/layer4{
+ target_pressure = 1200;
+ on = 1;
+ name = "Airlock Valve"
+ },
+/turf/open/floor/plating,
+/area/station/maintenance/fore)
"mMA" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/structure/cable,
@@ -49318,12 +59121,17 @@
/obj/structure/bookcase/random/reference,
/turf/open/floor/carpet/blue,
/area/station/medical/psychology)
-"mNP" = (
-/obj/effect/turf_decal/siding/wood{
- dir = 8
+"mNv" = (
+/obj/effect/turf_decal/trimline/brown/corner{
+ dir = 1
},
+/turf/open/floor/iron/edge{
+ dir = 1
+ },
+/area/station/hallway/primary/starboard)
+"mNP" = (
/obj/machinery/status_display/evac/directional/east,
-/turf/open/floor/iron/dark,
+/turf/open/floor/iron/dark/textured_large,
/area/station/command/heads_quarters/captain)
"mOf" = (
/obj/effect/decal/cleanable/dirt,
@@ -49350,14 +59158,46 @@
},
/turf/open/floor/plating,
/area/station/command/heads_quarters/rd)
+"mOQ" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 6
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 6
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer5,
+/turf/open/floor/plating,
+/area/station/maintenance/port/aft)
"mOX" = (
/obj/effect/mapping_helpers/airlock/access/any/engineering/general,
/obj/effect/mapping_helpers/airlock/cyclelink_helper,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 9
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer4,
/obj/machinery/door/airlock/external{
name = "Engineering External Access"
},
/turf/open/floor/plating,
/area/station/engineering/main)
+"mPe" = (
+/obj/structure/window/reinforced/spawner/directional/south,
+/obj/structure/disposalpipe/trunk{
+ dir = 2
+ },
+/obj/machinery/disposal/bin,
+/obj/effect/turf_decal/stripes/line{
+ dir = 6
+ },
+/obj/effect/turf_decal/stripes/white/line{
+ color = "#a56dc2";
+ dir = 9
+ },
+/obj/effect/turf_decal/bot_white,
+/turf/open/floor/iron/dark/smooth_large,
+/area/station/science/xenobiology)
"mPh" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 8
@@ -49365,6 +59205,10 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron,
/area/station/science/ordnance/storage)
+"mPr" = (
+/obj/machinery/vending/cigarette,
+/turf/open/floor/iron/dark/smooth_large,
+/area/station/hallway/primary/central)
"mPs" = (
/obj/machinery/light_switch{
pixel_x = 8;
@@ -49372,7 +59216,12 @@
},
/obj/machinery/disposal/bin,
/obj/structure/disposalpipe/trunk,
-/turf/open/floor/iron/dark,
+/obj/effect/turf_decal/trimline/purple/filled/line{
+ alpha = 160;
+ color = "#6a3182";
+ dir = 5
+ },
+/turf/open/floor/iron/dark/small,
/area/station/science/breakroom)
"mPt" = (
/obj/structure/secure_safe/directional/south,
@@ -49384,7 +59233,8 @@
/area/station/command/heads_quarters/rd)
"mPv" = (
/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/random/burgerstation/loot/with_maintenance_loot,
+/obj/effect/spawner/random/maintenance/three,
+/obj/structure/rack,
/turf/open/floor/iron,
/area/station/maintenance/starboard)
"mPx" = (
@@ -49399,11 +59249,29 @@
/obj/effect/turf_decal/stripes/corner{
dir = 4
},
+/obj/machinery/atmospherics/pipe/layer_manifold/cyan/hidden,
+/obj/effect/turf_decal/stripes/blue/corner{
+ dir = 4
+ },
/turf/open/floor/iron/dark,
/area/station/hallway/secondary/exit)
"mQw" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/general/hidden,
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/trimline/dark/filled/warning{
+ alpha = 160;
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/purple/warning{
+ alpha = 200;
+ dir = 4;
+ color = "#a56dc2"
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 4
+ },
+/turf/open/floor/iron/white/smooth_edge{
+ dir = 4
+ },
/area/station/science/xenobiology)
"mQK" = (
/obj/effect/turf_decal/stripes/red/box,
@@ -49436,6 +59304,18 @@
/obj/effect/mapping_helpers/airlock/access/any/command/general,
/turf/open/floor/iron/dark/textured_large,
/area/station/ai_monitored/command/nuke_storage)
+"mRP" = (
+/obj/effect/landmark/start/hangover,
+/obj/effect/turf_decal/trimline/blue/line{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/blue/mid_joiner{
+ dir = 4
+ },
+/turf/open/floor/iron/edge{
+ dir = 4
+ },
+/area/station/hallway/primary/central)
"mSk" = (
/obj/machinery/light/directional/west,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -49455,8 +59335,31 @@
"mSB" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/light/directional/east,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/tile/neutral,
+/turf/open/floor/iron/dark/side{
+ dir = 4
+ },
/area/station/commons/locker)
+"mSX" = (
+/obj/structure/fluff/paper,
+/obj/structure/closet/crate/cargo,
+/obj/item/clothing/head/helmet/space/plasmaman/cargo,
+/obj/item/clothing/under/plasmaman/cargo,
+/obj/item/clothing/gloves/color/plasmaman/cargo,
+/obj/effect/spawner/random/maintenance/two,
+/turf/open/floor/plating,
+/area/station/maintenance/port/aft)
+"mTS" = (
+/obj/effect/turf_decal/trimline/brown/filled/corner{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/brown/filled/corner{
+ dir = 8
+ },
+/turf/open/floor/iron/textured_corner{
+ dir = 1
+ },
+/area/station/cargo/storage)
"mTX" = (
/obj/structure/cable,
/obj/effect/decal/cleanable/dirt,
@@ -49498,14 +59401,6 @@
},
/turf/open/floor/iron/dark,
/area/station/command/heads_quarters/hos)
-"mVl" = (
-/obj/structure/chair{
- dir = 1
- },
-/obj/effect/turf_decal/stripes/line,
-/obj/machinery/firealarm/directional/south,
-/turf/open/floor/iron,
-/area/station/hallway/secondary/entry)
"mVz" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -49518,16 +59413,53 @@
/obj/structure/lattice,
/turf/open/space/basic,
/area/space/nearstation)
+"mVU" = (
+/obj/machinery/door/window/left/directional/east{
+ req_access = list("xenobiology");
+ name = "Containment Cell"
+ },
+/obj/effect/turf_decal/vg_decals/numbers/one{
+ color = "#a56dc2"
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 9
+ },
+/obj/structure/cable,
+/obj/effect/turf_decal/bot_white{
+ color = "#a56dc2"
+ },
+/obj/effect/turf_decal/box/white{
+ color = "#a56dc2"
+ },
+/turf/open/floor/iron/dark/smooth_large,
+/area/station/science/xenobiology)
"mWd" = (
/obj/item/stack/cable_coil/thirty,
/turf/open/space/basic,
/area/station/solars/starboard/fore)
+"mWk" = (
+/turf/closed/wall,
+/area/station/science/ordnance/testlab)
"mWw" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/turf_decal/tile/yellow/full,
+/turf/open/floor/iron/dark/smooth_large,
+/area/station/medical/pharmacy)
+"mWx" = (
+/obj/effect/turf_decal/siding/wood{
dir = 8
},
-/turf/open/floor/iron/white,
-/area/station/medical/pharmacy)
+/obj/effect/turf_decal/trimline/blue/filled/corner{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/blue/filled/corner{
+ dir = 1
+ },
+/turf/open/floor/iron/edge{
+ dir = 4
+ },
+/area/station/hallway/secondary/entry)
"mWy" = (
/obj/structure/cable,
/turf/open/floor/iron,
@@ -49551,7 +59483,7 @@
pixel_y = 6
},
/obj/item/clothing/suit/armor/riot,
-/obj/item/ammo_box/magazine/wt550m9/flathead,
+/obj/item/ammo_box/magazine/wt550m9,
/turf/open/floor/iron/dark/textured,
/area/station/command/heads_quarters/blueshield)
"mXn" = (
@@ -49560,10 +59492,6 @@
pixel_x = -11;
pixel_y = 7
},
-/obj/item/pen{
- pixel_x = 1;
- pixel_y = 9
- },
/obj/effect/mapping_helpers/broken_floor,
/turf/open/floor/wood,
/area/station/service/library/abandoned)
@@ -49614,16 +59542,14 @@
pixel_y = -37;
req_access = list("medical")
},
-/turf/open/floor/iron/white,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/medical/medbay/lobby)
"mXH" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/obj/machinery/atmospherics/components/unary/thermomachine/heater,
-/obj/structure/sign/warning/no_smoking{
- pixel_y = 28
- },
+/obj/structure/sign/warning/no_smoking/directional/north,
/turf/open/floor/iron,
/area/station/science/ordnance)
"mXW" = (
@@ -49637,15 +59563,34 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 4
},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer5,
/turf/open/floor/plating,
/area/station/maintenance/aft)
"mYo" = (
-/obj/effect/decal/cleanable/dirt,
/obj/structure/disposalpipe/segment{
dir = 6
},
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/trimline/dark/filled/corner{
+ alpha = 160;
+ dir = 2
+ },
+/obj/effect/turf_decal/trimline/purple/corner{
+ color = "#700047";
+ alpha = 200
+ },
+/obj/effect/turf_decal/siding/dark/corner,
+/turf/open/floor/iron/white/smooth_edge{
+ dir = 4
+ },
/area/station/science/lab)
+"mYG" = (
+/obj/structure/cable,
+/obj/item/wrench{
+ pixel_x = -6;
+ pixel_y = 3
+ },
+/turf/open/floor/iron/dark/smooth_large,
+/area/station/science/xenobiology)
"mYO" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/security/glass{
@@ -49660,17 +59605,6 @@
/turf/open/floor/iron/dark,
/area/station/hallway/primary/fore)
"mYY" = (
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
-/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/medical{
name = "Surgery A"
},
@@ -49678,12 +59612,29 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/effect/mapping_helpers/airlock/access/any/medical/surgery,
/obj/structure/cable,
-/turf/open/floor/iron,
+/obj/machinery/door/firedoor,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/medical/surgery)
+"mZY" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
+/obj/effect/turf_decal/trimline/dark_green/warning{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/wood{
+ dir = 1
+ },
+/turf/open/floor/iron/edge{
+ dir = 1
+ },
+/area/station/hallway/primary/starboard)
"naf" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer4,
/turf/open/floor/iron/dark,
/area/station/security/office)
"nah" = (
@@ -49693,6 +59644,17 @@
},
/turf/open/floor/stone,
/area/station/service/bar)
+"nal" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/iron/dark,
+/area/station/maintenance/port/aft)
+"naP" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 5
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron/dark,
+/area/station/science/robotics/lab)
"naT" = (
/obj/structure/chair/office{
dir = 8
@@ -49701,42 +59663,62 @@
/turf/open/floor/carpet/blue,
/area/station/service/lawoffice)
"naY" = (
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
-/obj/effect/turf_decal/tile/blue,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/cable,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
/obj/effect/turf_decal/stripes/line,
/obj/machinery/door/firedoor,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/cable,
-/turf/open/floor/iron/dark,
+/obj/effect/turf_decal/stripes/blue/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes/blue/line,
+/obj/effect/turf_decal/tile/blue/full,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/medical/medbay/lobby)
+"nbn" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+ dir = 8
+ },
+/turf/open/floor/iron/smooth_edge{
+ dir = 8
+ },
+/area/station/hallway/secondary/entry)
+"nbr" = (
+/obj/effect/turf_decal/trimline/dark_green/warning{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/wood{
+ dir = 1
+ },
+/turf/open/floor/iron/edge{
+ dir = 1
+ },
+/area/station/hallway/primary/starboard)
"nbw" = (
/obj/effect/decal/cleanable/dirt,
/obj/item/chair{
dir = 1
},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 1
+ },
/turf/open/floor/iron,
/area/station/maintenance/port/fore)
"nbA" = (
-/obj/effect/turf_decal/trimline/blue/filled/warning,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 9
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 9
},
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/trimline/blue/filled/warning{
+ alpha = 160
+ },
+/obj/effect/turf_decal/trimline/white/warning,
+/turf/open/floor/iron/white/smooth_edge,
/area/station/medical/medbay/central)
"nbL" = (
/obj/machinery/door/airlock/maintenance,
@@ -49760,6 +59742,13 @@
/obj/structure/cable,
/turf/open/floor/iron/white,
/area/station/science/ordnance)
+"ncl" = (
+/obj/effect/turf_decal/trimline/yellow/filled/corner,
+/obj/effect/turf_decal/trimline/dark_blue/corner{
+ alpha = 200
+ },
+/turf/open/floor/iron/dark,
+/area/station/engineering/atmos/hfr_room)
"ncB" = (
/obj/effect/turf_decal/tile/brown,
/obj/effect/turf_decal/tile/brown{
@@ -49781,7 +59770,7 @@
dir = 1
},
/obj/machinery/airalarm/directional/south,
-/turf/open/floor/iron,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/science/lab)
"ncI" = (
/obj/structure/chair/stool/directional/west{
@@ -49789,23 +59778,11 @@
},
/turf/open/floor/iron/textured,
/area/station/security/prison)
-"ncQ" = (
-/obj/effect/landmark/firealarm_sanity,
-/turf/open/floor/engine{
- name = "Holodeck Projector Floor"
- },
-/area/station/holodeck/rec_center)
"ndc" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
- dir = 4
- },
/obj/structure/railing{
dir = 1
},
-/obj/structure/rack,
-/obj/item/controller,
-/obj/item/compact_remote,
-/obj/item/compact_remote,
+/obj/machinery/component_printer,
/turf/open/floor/iron/white,
/area/station/science/explab)
"ndr" = (
@@ -49826,6 +59803,9 @@
pixel_y = 30
},
/obj/structure/cable,
+/obj/effect/turf_decal/trimline/yellow/filled/line{
+ dir = 1
+ },
/turf/open/floor/iron,
/area/station/commons/storage/primary)
"ndD" = (
@@ -49847,28 +59827,34 @@
/turf/open/floor/carpet/royalblue,
/area/station/command/heads_quarters/hop)
"ndY" = (
-/obj/structure/disposalpipe/trunk{
- dir = 4
- },
+/obj/structure/disposalpipe/trunk,
/obj/structure/disposaloutlet,
-/obj/machinery/camera/directional/west{
- c_tag = "Xenobiology Cell 8";
- network = list("ss13","xeno")
+/obj/effect/turf_decal/siding/dark{
+ dir = 9
+ },
+/obj/effect/turf_decal/siding/dark/corner,
+/obj/structure/window/reinforced/spawner/directional/north{
+ pixel_y = 4
},
/turf/open/floor/engine,
/area/station/science/xenobiology)
+"nel" = (
+/obj/effect/turf_decal/trimline/blue/filled/line{
+ alpha = 160
+ },
+/obj/effect/turf_decal/trimline/white/line,
+/obj/effect/turf_decal/trimline/white/mid_joiner,
+/obj/effect/turf_decal/trimline/blue/filled/mid_joiner,
+/obj/effect/turf_decal/trimline/blue/filled/mid_joiner,
+/obj/effect/turf_decal/trimline/white/mid_joiner,
+/turf/open/floor/iron/white/smooth_edge,
+/area/station/medical/medbay/central)
"neo" = (
/obj/machinery/computer/security/mining{
dir = 4
},
-/obj/effect/turf_decal/tile/brown{
- dir = 8
- },
-/obj/effect/turf_decal/tile/yellow{
- dir = 1
- },
/obj/effect/turf_decal/bot,
-/turf/open/floor/iron,
+/turf/open/floor/iron/dark/textured_large,
/area/station/cargo/miningdock)
"neA" = (
/obj/structure/cable,
@@ -49880,11 +59866,31 @@
},
/turf/open/floor/plating,
/area/station/maintenance/fore)
+"neG" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/obj/effect/turf_decal/stripes/white/line{
+ color = "#a56dc2";
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/dark/corner{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/dark/corner,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 8
+ },
+/turf/open/floor/engine,
+/area/station/science/xenobiology)
"neV" = (
/obj/structure/window/reinforced/spawner/directional/west,
/obj/machinery/camera/autoname/directional/south,
/obj/machinery/computer/security/telescreen/entertainment/directional/south,
-/turf/open/floor/carpet,
+/turf/open/floor/carpet/black,
/area/station/science/breakroom)
"nfj" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -49905,17 +59911,21 @@
/turf/open/floor/iron/dark,
/area/station/engineering/gravity_generator)
"ngl" = (
-/obj/structure/cable,
-/obj/machinery/computer/atmos_alert{
- dir = 8
- },
-/obj/structure/window/reinforced/spawner/directional/east,
-/obj/effect/turf_decal/tile/yellow{
+/obj/effect/turf_decal/siding/wideplating_new/dark/corner{
dir = 4
},
-/obj/effect/turf_decal/tile/yellow,
-/turf/open/floor/iron,
-/area/station/command/bridge)
+/obj/effect/turf_decal/siding/wideplating_new/dark/corner{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/wood{
+ dir = 9
+ },
+/obj/item/storage/briefcase/secure{
+ pixel_x = 0;
+ pixel_y = 17
+ },
+/turf/open/floor/carpet/executive,
+/area/station/command/heads_quarters/captain)
"ngw" = (
/obj/effect/turf_decal/bot_blue,
/obj/machinery/light/directional/west,
@@ -49923,16 +59933,29 @@
/turf/open/floor/iron/dark,
/area/station/security/office)
"ngF" = (
+/obj/machinery/atmospherics/components/unary/airlock_pump{
+ dir = 8
+ },
/turf/open/floor/iron/dark,
/area/station/security/checkpoint/escape)
"nhI" = (
/obj/structure/railing/corner/end{
dir = 8
},
-/turf/open/floor/iron/stairs/old{
- dir = 8
- },
+/turf/open/floor/wood/stairs/left,
/area/station/service/bar)
+"nhX" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
+/obj/effect/turf_decal/trimline/brown/arrow_ccw{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/brown/mid_joiner{
+ dir = 1
+ },
+/turf/open/floor/iron/edge{
+ dir = 1
+ },
+/area/station/hallway/primary/starboard)
"nhY" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/door/airlock/maintenance,
@@ -49941,8 +59964,26 @@
dir = 8
},
/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 6
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 6
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer5,
/turf/open/floor/plating,
/area/station/maintenance/port/aft)
+"niE" = (
+/obj/machinery/duct,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 6
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/turf/open/floor/iron,
+/area/station/maintenance/port/aft)
"niL" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -49965,17 +60006,38 @@
/area/station/maintenance/starboard/aft)
"nko" = (
/obj/structure/table/reinforced,
-/obj/machinery/door/poddoor/shutters/preopen{
- id = "robotics";
- name = "Robotics Lab Shutters"
- },
/obj/machinery/door/firedoor,
/obj/machinery/door/window/right/directional/south{
name = "Robotics Desk";
req_access = list("robotics")
},
+/obj/structure/marker_beacon/olive,
+/obj/machinery/door/poddoor/shutters/preopen{
+ id = "robotics";
+ name = "Robotics Lab Shutters";
+ dir = 1
+ },
+/obj/item/stamp/granted{
+ pixel_x = -7;
+ pixel_y = 8
+ },
+/obj/item/stamp/denied{
+ pixel_x = -7;
+ pixel_y = 0
+ },
/turf/open/floor/plating,
/area/station/science/robotics/lab)
+"nkG" = (
+/obj/effect/turf_decal/trimline/green/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/green/mid_joiner{
+ dir = 1
+ },
+/turf/open/floor/iron/edge{
+ dir = 1
+ },
+/area/station/hallway/primary/central)
"nlc" = (
/obj/structure/closet/secure_closet/research_director,
/obj/item/clothing/suit/toggle/lawyer/purple,
@@ -49985,6 +60047,9 @@
/turf/open/floor/iron/dark/textured,
/area/station/command/heads_quarters/rd)
"nlg" = (
+/obj/effect/turf_decal/siding/dark{
+ dir = 8
+ },
/turf/open/floor/iron/dark/textured_large,
/area/station/service/hydroponics)
"nlm" = (
@@ -50032,6 +60097,10 @@
/turf/open/floor/carpet,
/area/station/security/execution/transfer)
"nlN" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/cable,
+/obj/structure/disposalpipe/segment,
/obj/effect/turf_decal/tile/yellow,
/obj/effect/turf_decal/tile/yellow{
dir = 8
@@ -50046,11 +60115,8 @@
/obj/machinery/door/airlock/medical/glass{
name = "Pharmacy"
},
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/effect/mapping_helpers/airlock/access/any/medical/pharmacy,
-/obj/structure/cable,
-/turf/open/floor/iron,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/medical/pharmacy)
"nlQ" = (
/obj/structure/cable,
@@ -50069,6 +60135,15 @@
/obj/effect/spawner/random/contraband/prison,
/turf/open/floor/plating,
/area/station/security/prison)
+"nmf" = (
+/obj/effect/turf_decal/trimline/brown/filled/line{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/turf/open/floor/iron/textured_edge,
+/area/station/cargo/storage)
"nmv" = (
/obj/machinery/gulag_item_reclaimer{
pixel_y = 24
@@ -50076,6 +60151,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 9
},
+/obj/effect/turf_decal/trimline/red/end,
/turf/open/floor/iron/dark,
/area/station/security/processing)
"nmA" = (
@@ -50099,20 +60175,75 @@
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/structure/cable,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/turf/open/floor/iron/dark/corner{
+ dir = 8
+ },
/area/station/commons/locker)
"nnI" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/airalarm/directional/north,
/turf/open/floor/iron,
/area/station/science/auxlab/firing_range)
+"noB" = (
+/obj/machinery/door/window/left/directional/west{
+ name = "Containment Cell";
+ req_access = list("xenobiology")
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 6
+ },
+/obj/structure/cable,
+/obj/effect/turf_decal/vg_decals/numbers/six{
+ color = "#D381C9"
+ },
+/obj/effect/turf_decal/bot_white{
+ color = "#D381C9"
+ },
+/obj/effect/turf_decal/box/white{
+ color = "#D381C9"
+ },
+/turf/open/floor/iron/dark/smooth_large,
+/area/station/science/xenobiology)
+"noD" = (
+/obj/structure/closet/secure_closet/freezer/empty/open,
+/obj/item/reagent_containers/cup/glass/bottle/juice/cream,
+/obj/item/reagent_containers/condiment/milk,
+/obj/item/reagent_containers/condiment/soymilk,
+/obj/item/storage/box/coffeepack/robusta,
+/obj/item/storage/box/coffeepack,
+/obj/item/storage/pill_bottle/happinesspsych{
+ pixel_x = -4;
+ pixel_y = -1
+ },
+/obj/item/reagent_containers/condiment/sugar{
+ pixel_y = 4
+ },
+/obj/effect/turf_decal/bot,
+/obj/effect/turf_decal/siding/wood{
+ dir = 1
+ },
+/obj/structure/window/spawner/directional/south,
+/turf/open/floor/wood/tile,
+/area/station/hallway/secondary/entry)
"noK" = (
/obj/structure/girder,
/turf/open/floor/iron/dark,
-/area/station/engineering/main)
+/area/station/engineering/supermatter/room)
"noN" = (
-/obj/item/toy/plush/slimeplushie,
-/turf/open/floor/engine,
+/obj/structure/marker_beacon/violet,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/effect/turf_decal/delivery/white{
+ color = "#D381C9"
+ },
+/obj/effect/turf_decal/box/white{
+ color = "#D381C9"
+ },
+/turf/open/floor/iron/dark/smooth_large,
/area/station/science/xenobiology)
"npz" = (
/obj/effect/landmark/start/hangover,
@@ -50142,11 +60273,20 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/starboard)
+"nqK" = (
+/obj/structure/cable,
+/obj/effect/spawner/structure/window/reinforced,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer4,
+/turf/open/floor/plating,
+/area/station/security/processing)
"nqN" = (
/obj/machinery/air_sensor/nitrous_tank,
/turf/open/floor/engine/n2o,
/area/station/engineering/atmos)
"nro" = (
+/obj/effect/turf_decal/trimline/brown/filled/line{
+ dir = 10
+ },
/obj/effect/turf_decal/loading_area{
dir = 4
},
@@ -50156,22 +60296,33 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 4
},
-/obj/structure/chair/office,
-/obj/effect/landmark/start/scientist,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
/turf/open/floor/iron/white,
/area/station/science/explab)
+"nrw" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 9
+ },
+/turf/open/floor/wood,
+/area/station/hallway/primary/starboard)
"nrB" = (
/obj/structure/disposalpipe/segment{
dir = 4
},
-/turf/open/floor/iron/dark,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/hallway/primary/central)
"nsl" = (
/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
- dir = 5
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+ dir = 1
},
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/siding/dark{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/dark,
+/turf/open/floor/iron/dark/smooth_edge,
/area/station/medical/cryo)
"nsq" = (
/obj/structure/chair{
@@ -50195,34 +60346,61 @@
/obj/item/clothing/head/wizard/fake,
/turf/open/floor/plating,
/area/station/maintenance/starboard/fore)
-"ntB" = (
-/obj/effect/turf_decal/siding/wood{
- dir = 1
+"ntu" = (
+/obj/effect/spawner/random/trash,
+/obj/structure/sign/poster/contraband/waradmiral/directional/east,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+ dir = 8
},
+/obj/effect/decal/cleanable/glitter{
+ color = "#db80ff"
+ },
+/turf/open/floor/wood,
+/area/station/maintenance/port/aft)
+"ntA" = (
+/obj/effect/turf_decal/siding/dark{
+ dir = 4;
+ icon_state = "siding_plain_end"
+ },
+/turf/open/floor/circuit/green/telecomms/mainframe,
+/area/station/tcommsat/server)
+"ntB" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 6
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 6
},
+/obj/effect/turf_decal/siding/wood{
+ dir = 1
+ },
/turf/open/floor/stone,
/area/station/service/bar)
"ntP" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
/turf/open/floor/iron/smooth_large,
/area/station/engineering/main)
+"ntX" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/dark,
+/turf/open/floor/iron/textured_large,
+/area/station/ai_monitored/command/storage/eva)
"ntZ" = (
-/obj/machinery/door/firedoor,
-/obj/effect/turf_decal/trimline/neutral/filled/warning,
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/door/firedoor,
+/obj/effect/turf_decal/trimline/neutral/filled/warning,
/turf/open/floor/iron/dark/textured_large,
/area/station/hallway/primary/central)
"nua" = (
-/obj/effect/spawner/structure/window,
-/turf/open/floor/plating,
-/area/station/science/xenobiology)
+/turf/closed/wall/r_wall,
+/area/station/cargo/bitrunning/den)
"nux" = (
/obj/structure/table,
/obj/item/wirecutters,
@@ -50232,6 +60410,9 @@
},
/obj/structure/cable,
/obj/machinery/firealarm/directional/north,
+/obj/effect/turf_decal/trimline/yellow/filled/line{
+ dir = 1
+ },
/turf/open/floor/iron,
/area/station/commons/storage/primary)
"nuN" = (
@@ -50242,6 +60423,9 @@
dir = 1
},
/obj/machinery/firealarm/directional/east,
+/obj/effect/turf_decal/trimline/white/line{
+ dir = 4
+ },
/turf/open/floor/iron/dark,
/area/station/security/execution/education)
"nuX" = (
@@ -50260,12 +60444,50 @@
},
/turf/open/floor/iron/dark/textured_large,
/area/station/cargo/drone_bay)
+"nvt" = (
+/obj/structure/cable,
+/obj/effect/turf_decal/trimline/brown/filled/corner{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/dark/corner{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron/textured_corner{
+ dir = 1
+ },
+/area/station/cargo/miningdock)
"nvD" = (
/obj/structure/chair/sofa/corner/brown{
dir = 1
},
+/obj/effect/turf_decal/siding/wood{
+ dir = 8
+ },
/turf/open/floor/wood,
/area/station/security/prison)
+"nvG" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 4
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/effect/turf_decal/stripes/white/line{
+ color = "#D381C9";
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/dark/corner{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/dark/corner{
+ dir = 8
+ },
+/turf/open/floor/engine,
+/area/station/science/xenobiology)
"nvJ" = (
/obj/machinery/light/directional/south,
/obj/structure/bookcase/random/reference,
@@ -50278,9 +60500,6 @@
/turf/open/floor/iron/dark,
/area/station/ai_monitored/security/armory)
"nwm" = (
-/obj/effect/turf_decal/stripes/corner{
- dir = 8
- },
/obj/machinery/newscaster/directional/east,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 10
@@ -50289,7 +60508,41 @@
/obj/structure/disposalpipe/segment{
dir = 10
},
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/trimline/dark/filled/line{
+ alpha = 160;
+ dir = 5
+ },
+/obj/effect/turf_decal/trimline/dark/filled/corner{
+ alpha = 160;
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/purple/corner{
+ color = "#700047";
+ alpha = 200;
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/purple/line{
+ color = "#700047";
+ alpha = 200;
+ dir = 5
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 5
+ },
+/obj/effect/turf_decal/siding/dark/corner{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/dark/filled/mid_joiner{
+ dir = 1;
+ alpha = 160
+ },
+/obj/effect/turf_decal/trimline/dark/filled/mid_joiner{
+ dir = 4;
+ alpha = 160
+ },
+/turf/open/floor/iron/white/smooth_corner{
+ dir = 8
+ },
/area/station/science/lab)
"nwr" = (
/obj/structure/table/wood,
@@ -50299,6 +60552,28 @@
/obj/structure/towel_bin,
/turf/open/floor/wood/tile,
/area/station/common/pool/sauna)
+"nwu" = (
+/obj/structure/fluff/tram_rail/end{
+ dir = 1;
+ pixel_y = 32
+ },
+/obj/machinery/door/firedoor/border_only{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes/white/line{
+ color = "#52B4E9";
+ dir = 1;
+ name = "blue line"
+ },
+/obj/structure/railing{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/blue/fourcorners,
+/turf/open/floor/iron/white,
+/area/station/hallway/secondary/entry)
"nww" = (
/obj/effect/turf_decal/trimline/dark_blue/filled/line{
dir = 1
@@ -50311,29 +60586,37 @@
/obj/item/clothing/under/rank/prisoner/skirt/lowsec,
/obj/item/clothing/under/rank/prisoner/lowsec,
/obj/machinery/light/directional/north,
+/obj/effect/turf_decal/trimline/dark/line{
+ dir = 1
+ },
/turf/open/floor/iron/dark,
/area/station/security/holding_cell)
"nwE" = (
+/obj/item/forging/hammer{
+ pixel_x = -5;
+ pixel_y = 0
+ },
+/obj/item/forging/tongs{
+ pixel_x = 0;
+ pixel_y = -5
+ },
+/obj/structure/closet/crate/wooden,
/obj/effect/turf_decal/bot,
-/obj/structure/closet/crate,
-/obj/effect/spawner/random/maintenance,
-/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron,
/area/station/cargo/warehouse)
+"nwV" = (
+/obj/effect/turf_decal/siding/dark/corner,
+/turf/open/floor/iron/dark,
+/area/station/service/hydroponics)
"nxx" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 5
- },
/obj/structure/disposalpipe/segment{
dir = 4
},
/obj/item/radio/intercom/directional/south,
/obj/machinery/smartfridge/extract/preloaded,
-/turf/open/floor/iron,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/science/xenobiology)
"nxP" = (
-/obj/machinery/door/firedoor,
-/obj/effect/landmark/event_spawn,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 4
},
@@ -50341,10 +60624,18 @@
dir = 4
},
/obj/structure/cable,
-/turf/open/floor/iron,
+/obj/machinery/door/firedoor,
+/obj/effect/landmark/event_spawn,
+/turf/open/floor/iron/large,
/area/station/hallway/primary/central)
"nxQ" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/turf_decal/siding/dark{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 8
+ },
/turf/open/floor/wood,
/area/station/command/heads_quarters/captain)
"nxR" = (
@@ -50362,7 +60653,11 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 4
},
-/turf/open/floor/iron,
+/obj/structure/cable,
+/obj/effect/turf_decal/trimline/blue/filled/corner{
+ dir = 4
+ },
+/turf/open/floor/iron/edge,
/area/station/hallway/secondary/entry)
"nyx" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
@@ -50382,18 +60677,40 @@
/obj/structure/cable,
/turf/open/floor/plating,
/area/station/construction)
+"nzc" = (
+/obj/effect/turf_decal/siding/dark/corner{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/purple/filled/corner{
+ color = "#6a3182";
+ alpha = 160;
+ dir = 8
+ },
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+ dir = 4
+ },
+/turf/open/floor/iron/dark/small,
+/area/station/science/robotics/lab)
"nzh" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/iron/dark,
-/area/station/engineering/main)
+/turf/open/floor/plating,
+/area/station/engineering/supermatter/room)
"nzu" = (
-/obj/effect/turf_decal/tile/brown/half/contrasted,
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/light/directional/south,
-/turf/open/floor/iron,
-/area/station/cargo/warehouse)
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 5
+ },
+/turf/open/floor/iron/edge{
+ dir = 4
+ },
+/area/station/hallway/secondary/entry)
"nzv" = (
/obj/machinery/airalarm/directional/east,
+/obj/effect/turf_decal/siding/wood{
+ dir = 1
+ },
/turf/open/floor/iron/grimy,
/area/station/service/library/abandoned)
"nzC" = (
@@ -50442,11 +60759,25 @@
/obj/effect/mapping_helpers/broken_floor,
/turf/open/floor/wood,
/area/station/service/library/abandoned)
+"nBa" = (
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/turf/open/floor/plating,
+/area/station/maintenance/starboard/aft)
"nBp" = (
/obj/structure/table/reinforced,
/obj/item/paper_bin,
/obj/item/pen,
-/turf/open/floor/iron/white,
+/obj/machinery/door/window/left/directional/north{
+ req_access = list("medical");
+ name = "Reception"
+ },
+/turf/open/floor/iron/dark/smooth_large,
/area/station/medical/medbay/lobby)
"nBq" = (
/obj/structure/table/reinforced,
@@ -50455,7 +60786,7 @@
id = "warehouse_shutters";
name = "Warehouse Shutters"
},
-/turf/open/floor/iron,
+/turf/open/floor/iron/dark,
/area/station/cargo/warehouse)
"nBD" = (
/obj/structure/table/reinforced,
@@ -50470,17 +60801,74 @@
/obj/machinery/photocopier/prebuilt,
/turf/open/floor/iron/dark/small,
/area/station/security/interrogation)
+"nCE" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 6
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/obj/structure/sign/poster/contraband/silver/directional/north,
+/turf/open/floor/wood,
+/area/station/maintenance/port/aft)
+"nCN" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/turf_decal/trimline/dark_blue/filled/line,
+/obj/effect/turf_decal/trimline/dark_blue/filled/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/dark,
+/turf/open/floor/iron/dark/small,
+/area/station/security/checkpoint/escape)
"nCP" = (
/obj/machinery/photocopier/prebuilt,
/obj/item/toy/plush/skyrat/ian/lisa{
pixel_y = 11
},
-/obj/machinery/firealarm/directional/south,
+/obj/machinery/light_switch/directional/south,
/turf/open/floor/wood/parquet,
/area/station/command/heads_quarters/nt_rep)
+"nCS" = (
+/obj/structure/table/reinforced,
+/obj/machinery/door/poddoor/shutters/preopen{
+ id = "pharmacy_shutters3";
+ name = "Pharmacy Shutters";
+ dir = 8
+ },
+/obj/structure/desk_bell/speed_demon{
+ pixel_x = 6;
+ pixel_y = 9
+ },
+/obj/machinery/door/window/right/directional/east{
+ name = "Pharmacy Desk";
+ req_access = list("pharmacy")
+ },
+/obj/machinery/door/window/left/directional/west{
+ name = "Pharmacy Desk"
+ },
+/obj/item/paper_bin{
+ pixel_x = -7;
+ pixel_y = 2
+ },
+/obj/item/pen{
+ pixel_x = -6;
+ pixel_y = 0
+ },
+/obj/machinery/door/firedoor/border_only{
+ dir = 8
+ },
+/turf/open/floor/iron/dark/smooth_large,
+/area/station/medical/pharmacy)
"nCT" = (
/obj/effect/turf_decal/stripes/line,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply,
+/obj/machinery/atmospherics/components/binary/pump/layer4{
+ name = "Airmix Reserve to Distribution"
+ },
/turf/open/floor/plating,
/area/station/maintenance/port)
"nCU" = (
@@ -50491,10 +60879,10 @@
/turf/open/floor/plating,
/area/station/maintenance/port)
"nCW" = (
-/obj/machinery/door/firedoor,
-/obj/effect/landmark/navigate_destination,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/door/firedoor,
+/obj/effect/landmark/navigate_destination,
/obj/machinery/door/airlock/multi_tile/glass{
name = "Hydroponics"
},
@@ -50513,12 +60901,15 @@
/turf/open/floor/iron/dark,
/area/station/security/office)
"nDM" = (
-/obj/machinery/camera/directional/east{
- c_tag = "Xenobiology Cell 2";
- network = list("ss13","xeno")
+/obj/effect/spawner/random/burgerstation/loot/with_maintenance_loot,
+/obj/structure/railing{
+ dir = 1
},
-/turf/open/floor/engine,
-/area/station/science/xenobiology)
+/turf/open/floor/plating,
+/area/station/maintenance/port/aft)
+"nDN" = (
+/turf/open/floor/iron/textured_corner,
+/area/station/hallway/primary/port)
"nDR" = (
/obj/structure/punching_bag,
/turf/open/floor/iron/textured,
@@ -50530,7 +60921,12 @@
/area/station/maintenance/port/aft)
"nDZ" = (
/obj/structure/disposalpipe/segment,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/green/warning{
+ dir = 1
+ },
+/turf/open/floor/iron/edge{
+ dir = 1
+ },
/area/station/hallway/primary/starboard)
"nEm" = (
/obj/machinery/mineral/ore_redemption{
@@ -50549,7 +60945,9 @@
/area/station/maintenance/aft)
"nEM" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
-/obj/structure/chair/stool/directional/south,
+/obj/structure/chair/stool/directional/south{
+ dir = 1
+ },
/turf/open/floor/iron,
/area/station/security/prison/visit)
"nEN" = (
@@ -50577,32 +60975,32 @@
/obj/item/chair/plastic,
/turf/open/floor/wood,
/area/station/command/heads_quarters/blueshield)
-"nFn" = (
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
- dir = 8
+"nFi" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/turf_decal/siding/dark{
+ dir = 10
},
+/turf/open/floor/wood/large,
+/area/station/command/heads_quarters/captain)
+"nFn" = (
/obj/machinery/door/airlock/external{
name = "Security Escape Airlock"
},
/obj/effect/mapping_helpers/airlock/access/any/security/general,
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+ dir = 8
+ },
/turf/open/floor/iron/dark,
/area/station/security/checkpoint/escape)
"nFq" = (
-/obj/machinery/camera/motion/directional/west{
- c_tag = "EVA Motion Sensor"
+/obj/effect/turf_decal/trimline/yellow/corner{
+ dir = 1
},
-/obj/machinery/door/window/left/directional/south{
- req_access = list("eva");
- name = "Jetpack Storage"
+/turf/open/floor/iron/edge{
+ dir = 1
},
-/obj/structure/window/reinforced/spawner/directional/west,
-/obj/item/tank/jetpack/carbondioxide,
-/obj/item/tank/jetpack/carbondioxide,
-/obj/item/tank/jetpack/carbondioxide,
-/obj/item/tank/jetpack/carbondioxide,
-/obj/structure/rack,
-/turf/open/floor/iron/dark,
-/area/station/ai_monitored/command/storage/eva)
+/area/station/hallway/primary/port)
"nFI" = (
/obj/docking_port/stationary/syndicate/northeast{
dir = 8
@@ -50612,21 +61010,36 @@
"nFQ" = (
/obj/structure/cable,
/obj/machinery/door/firedoor,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 4
+ },
/turf/open/floor/iron/dark,
/area/station/hallway/primary/fore)
+"nGa" = (
+/obj/structure/table/wood,
+/obj/item/food/grown/poppy,
+/obj/item/food/grown/poppy{
+ pixel_y = 3;
+ pixel_x = 4
+ },
+/turf/open/floor/iron/dark,
+/area/station/service/chapel)
"nGh" = (
-/obj/machinery/door/firedoor,
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron,
+/obj/machinery/door/firedoor,
+/turf/open/floor/iron/large,
/area/station/hallway/primary/central)
"nGv" = (
/obj/machinery/door/poddoor/shutters{
id = "evashutters1";
name = "E.V.A. Storage Shutters"
},
-/turf/open/floor/iron/dark,
+/turf/open/floor/iron/dark/textured_large,
/area/station/ai_monitored/command/storage/eva)
"nGy" = (
/obj/structure/sauna_oven,
@@ -50655,13 +61068,48 @@
dir = 4
},
/obj/structure/cable,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron/dark/textured,
+/obj/effect/turf_decal/siding/wideplating_new/dark/corner{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/wideplating_new/dark/corner{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/wideplating_new/dark{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/iron/textured_large,
/area/station/command/gateway)
"nHF" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/station/maintenance/abandon_cafeteria)
+"nHJ" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/obj/structure/cable,
+/turf/open/floor/iron/edge{
+ dir = 4
+ },
+/area/station/hallway/primary/starboard)
+"nHP" = (
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+ dir = 8
+ },
+/obj/effect/mapping_helpers/airlock/access/any/supply/general,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 8
+ },
+/obj/machinery/door/airlock/external{
+ name = "Supply Dock Airlock"
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer4,
+/turf/open/floor/plating,
+/area/station/cargo/storage)
"nIb" = (
/obj/structure/cable,
/obj/machinery/computer/records/security{
@@ -50669,6 +61117,11 @@
},
/turf/open/floor/iron/dark,
/area/station/command/heads_quarters/hos)
+"nIW" = (
+/obj/structure/closet/emcloset,
+/obj/structure/sign/departments/telecomms/directional/west,
+/turf/open/floor/iron/dark/smooth_large,
+/area/station/hallway/primary/aft)
"nJe" = (
/obj/structure/chair/wood,
/obj/effect/decal/cleanable/dirt,
@@ -50682,16 +61135,18 @@
/turf/open/floor/wood,
/area/station/maintenance/abandon_cafeteria)
"nJx" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
/obj/machinery/camera/directional/south{
c_tag = "Gateway";
network = list("ss13","rd")
},
/obj/item/kirbyplants/random,
-/turf/open/floor/iron/dark/textured,
+/obj/effect/turf_decal/siding/wideplating_new/dark/corner{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/wideplating_new/dark{
+ dir = 10
+ },
+/turf/open/floor/iron/textured_large,
/area/station/command/gateway)
"nJF" = (
/obj/machinery/computer/security/telescreen/bar/directional/east,
@@ -50699,9 +61154,27 @@
/turf/open/floor/wood,
/area/station/service/bar)
"nJJ" = (
-/obj/machinery/firealarm/directional/south,
-/turf/open/floor/wood,
-/area/station/security/detectives_office)
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/turf_decal/trimline/dark/filled/corner{
+ alpha = 160;
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/purple/corner{
+ alpha = 200;
+ dir = 4;
+ color = "#a56dc2"
+ },
+/obj/effect/turf_decal/siding/dark/corner{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding,
+/turf/open/floor/iron/white,
+/area/station/science/xenobiology)
"nJL" = (
/obj/effect/turf_decal/stripes/line,
/obj/effect/mapping_helpers/broken_floor,
@@ -50714,6 +61187,13 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/commons/locker)
+"nJS" = (
+/obj/structure/cable,
+/obj/effect/turf_decal/siding/dark{
+ dir = 10
+ },
+/turf/open/floor/circuit/green/telecomms/mainframe,
+/area/station/tcommsat/server)
"nKi" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 4
@@ -50721,6 +61201,7 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 4
},
+/obj/structure/cable,
/turf/open/floor/plating,
/area/station/maintenance/starboard/aft)
"nKF" = (
@@ -50728,6 +61209,21 @@
/obj/effect/spawner/random/maintenance/two,
/turf/open/floor/plating,
/area/station/maintenance/port/aft)
+"nKX" = (
+/obj/effect/spawner/random/maintenance,
+/obj/effect/decal/cleanable/cobweb/cobweb2,
+/obj/structure/rack/shelf,
+/turf/open/floor/plating,
+/area/station/maintenance/port/aft)
+"nLs" = (
+/obj/structure/disposalpipe/segment,
+/obj/effect/turf_decal/trimline/yellow/corner{
+ dir = 8
+ },
+/turf/open/floor/iron/edge{
+ dir = 8
+ },
+/area/station/hallway/primary/aft)
"nLu" = (
/obj/machinery/door/poddoor/incinerator_atmos_aux,
/turf/open/floor/engine,
@@ -50742,7 +61238,13 @@
dir = 10
},
/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/stripes/white/line{
+ dir = 5;
+ color = "#ae4fd6"
+ },
+/turf/open/floor/iron/white/smooth_corner{
+ dir = 4
+ },
/area/station/science/research)
"nLX" = (
/obj/structure/bed,
@@ -50768,6 +61270,28 @@
/obj/effect/landmark/start/hangover,
/turf/open/floor/iron,
/area/station/hallway/primary/central/fore)
+"nMn" = (
+/obj/effect/turf_decal/siding/white/corner{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/blue/filled/corner{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/blue/filled/corner,
+/obj/effect/turf_decal/trimline/blue/filled/corner{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes/white/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/wood{
+ dir = 4
+ },
+/turf/open/floor/iron,
+/area/station/hallway/secondary/entry)
"nMw" = (
/obj/item/food/cornchips/random{
pixel_y = 7
@@ -50831,7 +61355,11 @@
/obj/effect/turf_decal/stripes/line{
dir = 5
},
-/turf/open/floor/iron,
+/obj/effect/turf_decal/stripes/white/line{
+ color = "#a56dc2";
+ dir = 10
+ },
+/turf/open/floor/iron/dark/smooth_large,
/area/station/science/xenobiology)
"nOt" = (
/obj/machinery/camera/directional/south{
@@ -50861,6 +61389,9 @@
/turf/open/floor/carpet/black,
/area/station/commons/dorms)
"nPg" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 8
+ },
/obj/structure/table/glass,
/obj/item/folder/white,
/obj/item/stamp/head/cmo,
@@ -50879,9 +61410,6 @@
pixel_x = -2;
pixel_y = 5
},
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
- dir = 8
- },
/obj/item/pen/fountain{
pixel_y = 5
},
@@ -50910,6 +61438,19 @@
},
/turf/open/floor/iron/cafeteria,
/area/station/security/prison)
+"nQj" = (
+/obj/structure/closet/firecloset,
+/obj/structure/window/reinforced/spawner/directional/south,
+/obj/machinery/door/firedoor/border_only,
+/obj/structure/fluff/metalpole/anchor{
+ pixel_y = -32
+ },
+/obj/effect/turf_decal/siding/white{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/blue/fourcorners,
+/turf/open/floor/iron/white,
+/area/station/hallway/secondary/entry)
"nQl" = (
/turf/closed/wall,
/area/station/maintenance/abandon_arcade)
@@ -50929,11 +61470,10 @@
/turf/open/floor/plating/airless,
/area/space/nearstation)
"nQD" = (
-/obj/structure/sign/warning/pods/directional/north,
-/turf/open/floor/iron/white/corner{
- dir = 1
- },
-/area/station/hallway/secondary/entry)
+/obj/structure/window/reinforced/spawner/directional/south,
+/obj/structure/window/reinforced/spawner/directional/east,
+/turf/open/space/basic,
+/area/space/nearstation)
"nQH" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -50948,20 +61488,27 @@
/turf/open/floor/plating,
/area/station/maintenance/port)
"nQI" = (
-/obj/effect/turf_decal/tile/yellow{
- dir = 8
+/obj/machinery/button/door{
+ id = "pharmacy_shutters3";
+ name = "Pharmacy Shutter Control";
+ pixel_x = -3;
+ pixel_y = 24;
+ req_access = list("pharmacy")
},
-/obj/effect/turf_decal/tile/yellow{
- dir = 4
+/obj/structure/table/reinforced/rglass,
+/obj/item/storage/box/pillbottles,
+/obj/item/hand_labeler,
+/obj/machinery/light_switch/directional/north{
+ pixel_x = 7;
+ pixel_y = 24
},
-/obj/effect/turf_decal/tile/yellow{
- dir = 1
- },
-/obj/machinery/vending/wardrobe/chem_wardrobe,
-/turf/open/floor/iron/white,
+/turf/open/floor/iron/dark/small,
/area/station/medical/pharmacy)
"nQO" = (
/obj/structure/bookcase/random/reference,
+/obj/effect/turf_decal/siding/wood{
+ dir = 1
+ },
/turf/open/floor/wood,
/area/station/security/prison)
"nQR" = (
@@ -50990,6 +61537,8 @@
/obj/effect/turf_decal/caution/stand_clear/blue{
dir = 4
},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer4,
/turf/open/floor/iron/dark,
/area/station/security/processing)
"nRz" = (
@@ -51015,9 +61564,33 @@
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 4
},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 4
+ },
+/obj/machinery/atmospherics/components/binary/pump/on/layer4{
+ dir = 4;
+ name = "Airlock Pump";
+ target_pressure = 300;
+ hide = 1
+ },
+/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance,
+/obj/effect/mapping_helpers/airlock/unres{
+ dir = 4
+ },
/obj/machinery/door/airlock/external,
/turf/open/floor/plating,
/area/station/maintenance/starboard)
+"nRP" = (
+/obj/effect/turf_decal/trimline/green/line{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/green/mid_joiner{
+ dir = 4
+ },
+/turf/open/floor/iron/edge{
+ dir = 4
+ },
+/area/station/hallway/primary/central)
"nRQ" = (
/obj/structure/chair{
dir = 4
@@ -51030,7 +61603,21 @@
/obj/structure/filingcabinet/chestdrawer,
/turf/open/floor/wood,
/area/station/commons/vacant_room/office)
+"nSo" = (
+/obj/structure/cable,
+/obj/effect/turf_decal/trimline/dark_blue/filled/line{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/turf_decal/trimline/dark/line{
+ dir = 8
+ },
+/obj/machinery/vending/wallmed/directional/west,
+/turf/open/floor/iron/dark,
+/area/station/security/brig)
"nSw" = (
+/obj/structure/cable,
/obj/structure/table,
/obj/item/storage/crayons,
/obj/item/storage/crayons,
@@ -51038,9 +61625,14 @@
pixel_y = 7
},
/obj/machinery/power/apc/auto_name/directional/south,
-/obj/structure/cable,
/turf/open/floor/wood,
/area/station/commons/storage/art)
+"nSE" = (
+/obj/machinery/atmospherics/components/unary/airlock_pump/unbolt_only{
+ dir = 4
+ },
+/turf/open/floor/plating,
+/area/station/maintenance/aft)
"nTh" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 10
@@ -51048,6 +61640,20 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 6
},
+/obj/effect/turf_decal/siding/wideplating_new/dark{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/wideplating_new/dark/corner,
+/obj/effect/turf_decal/siding/wideplating_new/dark/corner{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/dark/corner,
+/obj/effect/turf_decal/siding/dark/corner{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 1
+ },
/turf/open/floor/circuit,
/area/station/ai_monitored/command/nuke_storage)
"nTq" = (
@@ -51055,9 +61661,6 @@
dir = 6
},
/obj/machinery/dna_infuser,
-/obj/machinery/camera/directional/south{
- c_tag = "Genetics South"
- },
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark/textured,
/area/station/science/genetics)
@@ -51098,6 +61701,9 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
+/obj/effect/turf_decal/trimline/dark_blue/filled/line{
+ dir = 1
+ },
/turf/open/floor/iron/dark,
/area/station/hallway/primary/fore)
"nTU" = (
@@ -51113,9 +61719,29 @@
/obj/machinery/light_switch{
pixel_y = 28
},
+/obj/machinery/camera/directional/north{
+ c_tag = "Auxiliary Tool Storage"
+ },
/turf/open/floor/iron,
/area/station/commons/storage/tools)
+"nUa" = (
+/obj/machinery/duct,
+/obj/effect/spawner/random/trash/caution_sign,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 6
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/turf/open/floor/iron,
+/area/station/maintenance/port/aft)
"nUe" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/wood{
+ dir = 1
+ },
/turf/open/floor/wood,
/area/station/maintenance/aft)
"nUo" = (
@@ -51124,11 +61750,30 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/dark,
/area/station/security/brig)
+"nUV" = (
+/obj/effect/turf_decal/trimline/blue/filled/line{
+ alpha = 160
+ },
+/obj/effect/turf_decal/trimline/white/line,
+/turf/open/floor/iron/white/smooth_edge,
+/area/station/medical/medbay/lobby)
+"nVf" = (
+/obj/structure/sink/directional/east,
+/obj/effect/mapping_helpers/broken_floor,
+/turf/open/floor/iron/freezer,
+/area/station/maintenance/port/aft)
"nVk" = (
/obj/structure/closet/firecloset/full,
-/obj/effect/turf_decal/siding/white,
-/turf/open/floor/iron/dark,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/hallway/primary/central)
+"nVv" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 5
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer4,
+/obj/structure/window/reinforced/spawner/directional/north,
+/turf/open/floor/iron/smooth_edge,
+/area/station/hallway/secondary/entry)
"nWd" = (
/turf/open/floor/iron/chapel{
dir = 1
@@ -51145,6 +61790,24 @@
},
/turf/open/floor/plating,
/area/station/maintenance/starboard/aft)
+"nXb" = (
+/obj/effect/turf_decal/siding/corner{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/blue/filled/line{
+ alpha = 160;
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/white/line{
+ dir = 1
+ },
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/iron/white/smooth_edge{
+ dir = 1
+ },
+/area/station/medical/medbay/lobby)
"nXf" = (
/obj/effect/spawner/random/burgerstation/atmos,
/turf/open/floor/plating,
@@ -51165,18 +61828,37 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 4
},
-/obj/effect/turf_decal/tile/yellow{
- dir = 1
- },
-/obj/effect/turf_decal/tile/brown{
+/obj/effect/turf_decal/trimline/brown/filled/line{
dir = 8
},
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/dark/line{
+ dir = 8
+ },
+/turf/open/floor/iron/textured_edge{
+ dir = 4
+ },
/area/station/cargo/miningdock)
-"nXH" = (
+"nXz" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 5
+ },
+/obj/structure/cable,
+/obj/effect/turf_decal/trimline/blue/filled/line{
+ dir = 8
+ },
+/obj/machinery/camera/autoname/directional/west,
+/obj/machinery/firealarm/directional/west,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer5,
/obj/machinery/door/firedoor,
+/turf/open/floor/iron/large,
+/area/station/hallway/secondary/entry)
+"nXH" = (
/obj/effect/landmark/start/hangover,
-/turf/open/floor/iron,
+/obj/machinery/door/firedoor,
+/turf/open/floor/iron/large,
/area/station/hallway/primary/central)
"nXT" = (
/obj/effect/turf_decal/tile/red/opposingcorners{
@@ -51199,7 +61881,9 @@
/area/station/maintenance/starboard/aft)
"nXY" = (
/mob/living/basic/pet/dog/markus,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/brown/filled/corner,
+/obj/effect/turf_decal/trimline/dark/corner,
+/turf/open/floor/iron/textured_corner,
/area/station/cargo/sorting)
"nYb" = (
/obj/structure/table,
@@ -51254,10 +61938,26 @@
},
/turf/open/floor/iron/dark,
/area/station/service/chapel)
+"nYR" = (
+/obj/effect/turf_decal/trimline/dark_blue/filled/line{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/dark/line{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 6
+ },
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
+/turf/open/floor/iron/dark,
+/area/station/maintenance/port/aft)
"nZd" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 1
},
+/obj/effect/turf_decal/trimline/blue/corner{
+ alpha = 200
+ },
/turf/open/floor/iron,
/area/station/hallway/primary/central)
"nZo" = (
@@ -51303,17 +62003,43 @@
/area/station/command/heads_quarters/hos)
"obv" = (
/obj/structure/disposalpipe/segment,
-/obj/machinery/door/airlock/maintenance,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 4
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/door/airlock/maintenance,
/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance,
/obj/effect/mapping_helpers/airlock/unres{
dir = 1
},
/turf/open/floor/plating,
/area/station/hallway/primary/port)
+"obE" = (
+/obj/effect/turf_decal/siding/dark{
+ dir = 8;
+ icon_state = "siding_plain_end"
+ },
+/obj/machinery/atmospherics/components/binary/pump/on/layer4{
+ dir = 4;
+ name = "Airlock Pump";
+ target_pressure = 300;
+ hide = 1
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/plating,
+/area/station/maintenance/starboard/aft)
+"obH" = (
+/obj/structure/disposalpipe/segment,
+/obj/effect/turf_decal/trimline/yellow/line{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/yellow/mid_joiner{
+ dir = 8
+ },
+/turf/open/floor/iron/textured_half{
+ dir = 8
+ },
+/area/station/hallway/primary/aft)
"obK" = (
/obj/effect/turf_decal/stripes/line,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
@@ -51325,7 +62051,22 @@
/obj/effect/turf_decal/trimline/blue/filled/line{
dir = 8
},
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/trimline/white/line{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/blue/filled/mid_joiner{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/white/mid_joiner{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/blue{
+ color = "#8ab4cb";
+ dir = 8
+ },
+/turf/open/floor/iron/white/smooth_edge{
+ dir = 8
+ },
/area/station/medical/treatment_center)
"ocV" = (
/obj/structure/cable,
@@ -51347,8 +62088,32 @@
/obj/effect/turf_decal/trimline/blue/filled/corner{
dir = 8
},
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/trimline/white/warning{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/white/corner{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/blue/corner{
+ color = "#8ab4cb";
+ dir = 8
+ },
+/turf/open/floor/iron/white/smooth_edge{
+ dir = 1
+ },
/area/station/medical/treatment_center)
+"odT" = (
+/obj/effect/mapping_helpers/broken_floor,
+/obj/effect/spawner/random/maintenance,
+/obj/structure/sign/poster/contraband/jovial/directional/west,
+/obj/item/food/grown/apple,
+/obj/item/clothing/shoes/horseshoe,
+/obj/structure/closet/crate/glitter/lavender,
+/obj/effect/decal/cleanable/glitter{
+ color = "#db80ff"
+ },
+/turf/open/floor/wood,
+/area/station/maintenance/port/aft)
"oeg" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/security,
@@ -51361,6 +62126,7 @@
/obj/structure/railing{
dir = 9
},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer5,
/turf/open/floor/iron/dark,
/area/station/maintenance/port/aft)
"oex" = (
@@ -51376,8 +62142,7 @@
},
/area/station/commons/fitness)
"oeC" = (
-/obj/effect/turf_decal/tile/purple/half/contrasted,
-/turf/open/floor/iron,
+/turf/open/floor/iron/edge,
/area/station/hallway/primary/starboard)
"oeI" = (
/obj/structure/disposalpipe/sorting/mail/flip{
@@ -51391,8 +62156,19 @@
/obj/effect/mapping_helpers/mail_sorting/science/research,
/turf/open/floor/iron/white,
/area/station/science/research)
+"ofx" = (
+/obj/effect/turf_decal/siding/dark{
+ dir = 1
+ },
+/turf/open/floor/iron/edge{
+ dir = 1
+ },
+/area/station/hallway/primary/central)
"ofT" = (
-/turf/open/floor/iron,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+ dir = 4
+ },
+/turf/open/floor/iron/large,
/area/station/cargo/storage)
"ofZ" = (
/obj/machinery/door/firedoor,
@@ -51403,13 +62179,18 @@
/turf/closed/wall,
/area/station/science/ordnance/storage)
"ogG" = (
-/obj/machinery/power/apc/auto_name/directional/west,
/obj/structure/disposalpipe/segment,
-/obj/effect/turf_decal/tile/yellow{
+/obj/structure/cable,
+/obj/machinery/power/apc/auto_name/directional/west,
+/obj/effect/turf_decal/trimline/yellow/line{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/yellow/mid_joiner{
+ dir = 8
+ },
+/turf/open/floor/iron/edge{
dir = 8
},
-/obj/structure/cable,
-/turf/open/floor/iron,
/area/station/hallway/primary/aft)
"ogK" = (
/obj/item/radio/intercom/directional/west,
@@ -51425,18 +62206,18 @@
/area/station/commons/dorms/apartment1)
"oha" = (
/obj/machinery/door/firedoor/heavy,
-/obj/effect/turf_decal/stripes/corner,
/obj/machinery/door/poddoor/shutters/preopen{
id = "rnd2";
name = "Research Lab Shutters"
},
-/turf/open/floor/iron,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/science/lab)
"ohb" = (
/obj/machinery/atmospherics/components/unary/passive_vent{
dir = 4;
name = "killroom vent"
},
+/obj/structure/grille,
/turf/open/floor/circuit/telecomms,
/area/station/science/xenobiology)
"ohj" = (
@@ -51458,12 +62239,22 @@
/turf/open/floor/iron/freezer,
/area/station/commons/toilet/locker)
"ohr" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 8
+/obj/effect/turf_decal/trimline/brown/filled/line,
+/obj/effect/turf_decal/trimline/brown/filled/line{
+ dir = 1
},
-/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/trimline/dark/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/dark/line,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/cargo/miningdock)
+"ohF" = (
+/obj/machinery/portable_atmospherics/canister,
+/turf/open/floor/plating,
+/area/station/maintenance/port/aft)
"ohL" = (
/obj/structure/sign/poster/official/safety_report/directional/south,
/obj/machinery/atmospherics/pipe/heat_exchanging/simple/layer2{
@@ -51482,6 +62273,36 @@
},
/turf/open/floor/iron/dark,
/area/station/hallway/secondary/exit)
+"ohO" = (
+/obj/machinery/light/small/directional/north,
+/obj/machinery/firealarm/directional/north,
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/station/maintenance/starboard/fore)
+"ohP" = (
+/obj/structure/cable,
+/obj/effect/turf_decal/siding/wood{
+ dir = 1
+ },
+/turf/open/floor/wood,
+/area/station/security/prison)
+"ohS" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/obj/structure/cable,
+/obj/effect/landmark/start/hangover,
+/turf/open/floor/iron/edge{
+ dir = 1
+ },
+/area/station/hallway/primary/starboard)
+"oij" = (
+/obj/effect/turf_decal/trimline/blue/line,
+/obj/effect/turf_decal/trimline/blue/mid_joiner,
+/turf/open/floor/iron/edge,
+/area/station/hallway/primary/starboard)
"oiA" = (
/obj/machinery/light/small/dim/directional/east,
/obj/structure/chair/office/light,
@@ -51499,7 +62320,20 @@
/obj/effect/turf_decal/trimline/blue/filled/line{
dir = 9
},
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/trimline/white/line{
+ dir = 9
+ },
+/obj/effect/turf_decal/trimline/blue/filled/mid_joiner{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/blue/filled/mid_joiner{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/blue{
+ color = "#8ab4cb";
+ dir = 9
+ },
+/turf/open/floor/iron/white/smooth_corner,
/area/station/medical/treatment_center)
"ojJ" = (
/obj/structure/table/wood,
@@ -51512,18 +62346,27 @@
/area/station/maintenance/starboard)
"ojY" = (
/obj/structure/window/reinforced/spawner/directional/east,
-/obj/effect/turf_decal/tile/dark_blue,
-/obj/effect/turf_decal/tile/dark_blue{
- dir = 8
+/obj/structure/bed,
+/obj/machinery/iv_drip,
+/obj/item/bedsheet/medical,
+/obj/effect/turf_decal/tile/neutral/half/contrasted{
+ dir = 1
},
-/obj/effect/turf_decal/tile/dark_blue{
+/turf/open/floor/iron/dark,
+/area/station/security/medical)
+"oks" = (
+/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/structure/bed,
-/obj/item/bedsheet,
-/obj/machinery/iv_drip,
-/turf/open/floor/iron/white,
-/area/station/security/medical)
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/turf_decal/siding/white{
+ color = "#8b8b8b";
+ dir = 1
+ },
+/turf/open/floor/iron/textured_half,
+/area/station/hallway/primary/central)
"okP" = (
/obj/machinery/atmospherics/components/unary/vent_pump/siphon/monitored/plasma_output{
dir = 8
@@ -51531,22 +62374,32 @@
/turf/open/floor/engine/plasma,
/area/station/engineering/atmos)
"olm" = (
-/obj/effect/turf_decal/bot,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/effect/spawner/random/maintenance/three,
-/obj/structure/closet/crate,
-/turf/open/floor/iron,
-/area/station/cargo/storage)
-"olX" = (
-/obj/effect/turf_decal/tile/yellow/anticorner/contrasted{
+/obj/machinery/door/firedoor/border_only{
dir = 8
},
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 5
+ },
+/obj/effect/turf_decal/trimline/blue/filled/line{
+ dir = 8
+ },
+/obj/structure/deployable_barricade/guardrail{
+ dir = 8
+ },
+/turf/open/floor/iron/small,
+/area/station/hallway/secondary/entry)
+"olX" = (
+/obj/effect/turf_decal/trimline/yellow/filled/line{
+ dir = 10;
+ alpha = 120
+ },
+/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/dark,
/area/station/engineering/atmos/hfr_room)
-"olZ" = (
-/obj/machinery/firealarm/directional/north,
-/turf/open/floor/iron,
-/area/station/hallway/primary/port)
"omf" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/mapping_helpers/broken_floor,
@@ -51558,6 +62411,12 @@
initial_gas_mix = "n2=100;TEMP=80"
},
/area/station/science/server)
+"omJ" = (
+/obj/structure/table/wood,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/spawner/random/entertainment/gambling,
+/turf/open/floor/wood,
+/area/station/maintenance/abandon_cafeteria)
"omW" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -51566,13 +62425,23 @@
/area/station/security/office)
"onx" = (
/obj/item/radio/intercom/directional/north,
+/obj/effect/turf_decal/siding/dark{
+ dir = 1
+ },
/turf/open/floor/iron/dark,
/area/station/service/hydroponics)
"onG" = (
+/obj/structure/cable,
+/obj/effect/turf_decal/trimline/blue/filled/corner{
+ dir = 4
+ },
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 4
},
-/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer5,
+/obj/effect/turf_decal/trimline/blue/filled/corner{
+ alpha = 160
+ },
/turf/open/floor/iron,
/area/station/hallway/secondary/entry)
"oop" = (
@@ -51629,15 +62498,46 @@
/obj/machinery/door/airlock/external,
/turf/open/floor/plating,
/area/station/maintenance/fore)
-"opE" = (
-/obj/effect/turf_decal/tile/yellow{
+"ooX" = (
+/obj/effect/turf_decal/siding/dark/corner{
dir = 4
},
-/obj/effect/turf_decal/tile/yellow,
-/obj/structure/table,
-/obj/item/storage/toolbox/mechanical,
-/obj/item/clothing/head/utility/welding,
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/siding/dark/corner,
+/turf/open/floor/circuit/green/telecomms/mainframe,
+/area/station/tcommsat/server)
+"ope" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
+/obj/effect/spawner/structure/window,
+/turf/open/floor/plating,
+/area/station/medical/virology)
+"opl" = (
+/obj/structure/cable,
+/turf/open/floor/iron/edge{
+ dir = 4
+ },
+/area/station/hallway/primary/central)
+"opp" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/components/tank/air/layer4{
+ dir = 8
+ },
+/turf/open/floor/iron,
+/area/station/maintenance/port/aft)
+"opE" = (
+/obj/effect/turf_decal/trimline/yellow/filled/line{
+ dir = 5;
+ alpha = 120
+ },
+/obj/effect/turf_decal/trimline/blue/line{
+ alpha = 200;
+ dir = 5
+ },
+/turf/open/floor/iron/white/smooth_corner{
+ dir = 8
+ },
/area/station/medical/chemistry)
"opN" = (
/obj/effect/turf_decal/trimline/green/filled/corner,
@@ -51647,6 +62547,9 @@
/obj/effect/decal/cleanable/dirt,
/obj/machinery/power/apc/auto_name/directional/west,
/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
/turf/open/floor/iron,
/area/station/service/hydroponics/garden/abandoned)
"oqb" = (
@@ -51687,7 +62590,13 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 1
},
-/turf/open/floor/iron/dark/textured,
+/obj/effect/turf_decal/siding/wideplating_new/dark{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/wideplating_new/dark{
+ dir = 4
+ },
+/turf/open/floor/iron/textured_large,
/area/station/command/gateway)
"oqQ" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -51698,13 +62607,23 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/commons/fitness)
+"orc" = (
+/obj/effect/turf_decal/trimline/brown/filled/line,
+/obj/effect/turf_decal/trimline/brown/filled/line{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer5,
+/turf/open/floor/iron,
+/area/station/cargo/storage)
"ors" = (
/obj/item/toy/cattoy,
/turf/open/floor/plating,
/area/station/security/prison)
"orS" = (
-/obj/effect/turf_decal/bot_white,
-/turf/open/floor/iron/dark,
+/obj/effect/turf_decal/bot_white{
+ color = "#00ff00"
+ },
+/turf/open/floor/iron/dark/smooth_large,
/area/station/hallway/primary/central)
"orT" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
@@ -51713,8 +62632,26 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 9
},
-/turf/open/floor/iron,
+/turf/open/floor/iron/edge{
+ dir = 1
+ },
/area/station/hallway/primary/port)
+"osg" = (
+/obj/effect/turf_decal/siding/dark{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/dark/filled/warning{
+ alpha = 160;
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/purple/warning{
+ alpha = 200;
+ dir = 4
+ },
+/turf/open/floor/iron/white/smooth_edge{
+ dir = 4
+ },
+/area/station/science/research)
"osn" = (
/obj/structure/chair/comfy/black{
dir = 1
@@ -51730,18 +62667,24 @@
/obj/structure/cable,
/obj/effect/mapping_helpers/airlock/access/any/security/general,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron/dark,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/security/checkpoint/escape)
"osx" = (
/obj/effect/turf_decal/trimline/dark_blue/filled/line{
dir = 1
},
/obj/structure/cable,
+/obj/effect/turf_decal/trimline/dark/line{
+ dir = 1
+ },
/turf/open/floor/iron/dark,
/area/station/security/execution/transfer)
"osB" = (
/obj/structure/railing/corner,
/obj/effect/mapping_helpers/broken_floor,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 1
+ },
/turf/open/floor/iron,
/area/station/maintenance/port/fore)
"osW" = (
@@ -51762,9 +62705,11 @@
/obj/item/storage/box,
/obj/item/storage/box,
/obj/item/storage/box,
-/obj/effect/turf_decal/tile/brown,
-/obj/machinery/light/directional/east,
-/turf/open/floor/iron,
+/obj/structure/railing{
+ dir = 1
+ },
+/obj/effect/turf_decal/bot,
+/turf/open/floor/iron/dark/textured_large,
/area/station/cargo/office)
"otg" = (
/obj/effect/turf_decal/stripes/corner{
@@ -51774,15 +62719,12 @@
/turf/open/floor/iron/dark,
/area/station/ai_monitored/security/armory)
"otu" = (
-/obj/effect/turf_decal/tile/dark_blue{
- dir = 1
- },
-/obj/effect/turf_decal/tile/dark_blue{
- dir = 8
- },
-/obj/effect/turf_decal/tile/dark_blue,
/obj/structure/bodycontainer/morgue,
-/obj/effect/turf_decal/bot_blue,
+/obj/effect/turf_decal/trimline/red/real_red/end{
+ dir = 8;
+ alpha = 160
+ },
+/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/security/medical)
"otB" = (
@@ -51797,6 +62739,26 @@
},
/turf/open/floor/iron,
/area/station/science/ordnance)
+"otM" = (
+/obj/effect/turf_decal/siding/dark{
+ dir = 4
+ },
+/obj/structure/sink/directional/west{
+ pixel_x = 16
+ },
+/obj/effect/turf_decal/trimline/dark/filled/line{
+ alpha = 160;
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/purple/line{
+ alpha = 200;
+ dir = 4;
+ color = "#a56dc2"
+ },
+/turf/open/floor/iron/white/smooth_edge{
+ dir = 4
+ },
+/area/station/science/xenobiology)
"otQ" = (
/obj/item/clothing/under/costume/maid,
/obj/item/clothing/head/costume/kitty,
@@ -51811,18 +62773,36 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/effect/mapping_helpers/airlock/access/any/security/general,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/security/checkpoint/customs)
"otW" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 4
},
-/obj/effect/turf_decal/siding/thinplating/light{
+/obj/effect/landmark/event_spawn,
+/obj/effect/landmark/start/scientist,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 4
},
-/obj/effect/landmark/event_spawn,
-/turf/open/floor/iron,
+/turf/open/floor/iron/white,
/area/station/science/explab)
+"otZ" = (
+/obj/structure/disposalpipe/segment,
+/obj/structure/cable,
+/obj/effect/turf_decal/trimline/brown/filled/line{
+ dir = 4
+ },
+/turf/open/floor/iron/textured_edge{
+ dir = 8
+ },
+/area/station/cargo/office)
+"ouj" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/machinery/light/directional/south,
+/turf/open/floor/iron/edge,
+/area/station/hallway/primary/central)
"ouv" = (
/obj/structure/dresser,
/obj/machinery/light/small/directional/north,
@@ -51848,9 +62828,17 @@
},
/turf/open/floor/iron,
/area/station/maintenance/starboard/fore)
+"ouK" = (
+/obj/effect/turf_decal/siding/dark/corner,
+/obj/effect/turf_decal/siding/dark{
+ dir = 9
+ },
+/turf/open/floor/engine,
+/area/station/science/xenobiology)
"ouV" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/structure/disposalpipe/segment,
+/obj/structure/cable,
/turf/open/floor/plating,
/area/station/science/xenobiology)
"ova" = (
@@ -51876,11 +62864,47 @@
dir = 8
},
/obj/machinery/status_display/evac/directional/east,
-/turf/open/floor/iron/dark/textured,
+/obj/effect/turf_decal/siding/wideplating_new/dark{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/wideplating_new/dark{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/iron/textured_large,
/area/station/command/gateway)
+"ovZ" = (
+/obj/effect/turf_decal/trimline/green/arrow_cw{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/green/mid_joiner{
+ dir = 4
+ },
+/turf/open/floor/iron/edge{
+ dir = 4
+ },
+/area/station/hallway/primary/central)
"owa" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/trimline/dark/filled/line{
+ alpha = 160;
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/dark/filled/mid_joiner{
+ dir = 1;
+ alpha = 160
+ },
+/obj/effect/turf_decal/trimline/purple/line{
+ alpha = 200;
+ dir = 1;
+ color = "#a56dc2"
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 1
+ },
+/turf/open/floor/iron/white/smooth_edge{
+ dir = 1
+ },
/area/station/science/xenobiology)
"owf" = (
/obj/structure/table/reinforced,
@@ -51900,40 +62924,68 @@
/area/station/engineering/break_room)
"owg" = (
/obj/effect/turf_decal/trimline/blue/filled/line{
+ alpha = 160;
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/dark_blue/line{
+ alpha = 200;
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/blue/filled/mid_joiner{
+ dir = 1;
+ alpha = 160
+ },
+/obj/structure/extinguisher_cabinet/directional/north,
+/turf/open/floor/iron/white/smooth_edge{
dir = 1
},
-/obj/machinery/power/apc/auto_name/directional/north,
-/obj/structure/cable,
-/turf/open/floor/iron/white,
/area/station/medical/medbay/aft)
"owk" = (
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
/obj/effect/landmark/start/assistant,
-/obj/machinery/mining_weather_monitor/directional/south,
-/obj/machinery/light/directional/south,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/blue/filled/line,
+/obj/effect/turf_decal/siding/white/corner,
+/turf/open/floor/iron/small,
/area/station/hallway/secondary/entry)
"owz" = (
-/obj/effect/turf_decal/tile/red/half/contrasted{
- dir = 1
- },
/obj/structure/sign/warning/electric_shock/directional/north,
/obj/structure/cable,
/obj/structure/disposalpipe/segment{
dir = 4
},
+/obj/effect/turf_decal/trimline/dark_blue/filled/corner{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/dark_blue/filled/corner{
+ dir = 1
+ },
/turf/open/floor/iron/dark,
/area/station/hallway/primary/fore)
"owD" = (
-/turf/open/floor/iron/white,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/turf_decal/tile/yellow{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/yellow{
+ dir = 8
+ },
+/turf/open/floor/iron/dark,
/area/station/medical/pharmacy)
"owS" = (
/obj/machinery/computer/security/wooden_tv,
/turf/open/floor/wood,
/area/station/security/detectives_office)
+"owX" = (
+/obj/structure/reagent_dispensers/plumbed{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 6
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/turf/open/floor/plating,
+/area/station/maintenance/port/aft)
"oxX" = (
/obj/machinery/door/airlock/maintenance,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
@@ -52008,6 +63060,9 @@
pixel_x = -6;
pixel_y = 24
},
+/obj/effect/turf_decal/trimline/dark/line{
+ dir = 1
+ },
/turf/open/floor/iron/dark,
/area/station/security/execution/transfer)
"ozM" = (
@@ -52018,6 +63073,9 @@
},
/obj/item/stock_parts/power_store/cell/high,
/obj/structure/cable,
+/obj/effect/turf_decal/trimline/yellow/filled/line{
+ dir = 1
+ },
/turf/open/floor/iron,
/area/station/commons/storage/primary)
"oAk" = (
@@ -52027,6 +63085,9 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/structure/cable,
+/obj/effect/turf_decal/trimline/dark/corner{
+ dir = 4
+ },
/turf/open/floor/iron/dark,
/area/station/security/brig)
"oAx" = (
@@ -52053,8 +63114,9 @@
/obj/effect/turf_decal/trimline/dark_blue/filled/line{
dir = 1
},
-/obj/structure/extinguisher_cabinet{
- pixel_y = 30
+/obj/structure/extinguisher_cabinet/directional/north,
+/obj/effect/turf_decal/trimline/dark/line{
+ dir = 1
},
/turf/open/floor/iron/dark,
/area/station/security/execution/transfer)
@@ -52062,6 +63124,7 @@
/obj/effect/spawner/liquids_spawner{
reagent_list = list(/datum/reagent/ants/fire = 190)
},
+/obj/machinery/light/small/directional/south,
/turf/open/floor/iron/pool/cobble/corner{
dir = 8
},
@@ -52072,9 +63135,13 @@
/turf/open/floor/plating,
/area/station/maintenance/port)
"oBr" = (
+/obj/structure/chair/stool/directional/south{
+ dir = 1
+ },
+/obj/structure/window/reinforced/tinted/spawner/directional/south,
+/obj/effect/turf_decal/siding/wood,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/turf/open/floor/iron,
+/turf/open/floor/wood,
/area/station/security/prison)
"oBt" = (
/obj/machinery/meter,
@@ -52091,16 +63158,16 @@
/area/station/security/prison)
"oBO" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
+/obj/effect/turf_decal/siding/wood{
+ dir = 4
+ },
/turf/open/floor/wood,
/area/station/security/prison)
"oCs" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/structure/cable,
/obj/machinery/power/apc/auto_name/directional/east,
/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer5,
/turf/open/floor/iron/dark/small,
/area/station/cargo/bitrunning/den)
"oCu" = (
@@ -52143,10 +63210,39 @@
/obj/item/stack/cable_coil,
/turf/open/space/basic,
/area/station/solars/port/fore)
+"oDD" = (
+/obj/structure/cable,
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/turf/open/floor/iron,
+/area/station/cargo/warehouse)
"oDF" = (
/obj/machinery/light/directional/south,
/turf/open/floor/plating,
-/area/station/engineering/main)
+/area/station/engineering/supermatter/room)
+"oDL" = (
+/obj/effect/turf_decal/trimline/blue/filled/line{
+ dir = 10
+ },
+/obj/structure/table,
+/obj/item/binoculars{
+ pixel_x = 3;
+ pixel_y = 3
+ },
+/obj/item/trash/candle{
+ pixel_y = -1;
+ pixel_x = -6
+ },
+/turf/open/floor/iron,
+/area/station/hallway/secondary/entry)
+"oEb" = (
+/obj/effect/turf_decal/siding/dark{
+ dir = 1;
+ icon_state = "siding_plain_end"
+ },
+/turf/open/floor/circuit/telecomms/mainframe,
+/area/station/tcommsat/server)
"oEv" = (
/obj/effect/turf_decal/delivery/white{
color = "#00ff00";
@@ -52164,6 +63260,10 @@
},
/obj/effect/mapping_helpers/airlock/access/any/engineering/general,
/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 8
+ },
/turf/open/floor/plating,
/area/station/maintenance/solars/starboard/fore)
"oEV" = (
@@ -52184,6 +63284,23 @@
},
/turf/open/floor/iron/dark/textured,
/area/station/hallway/primary/central)
+"oFt" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/blue/filled/corner{
+ alpha = 160;
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/white/corner{
+ dir = 1
+ },
+/turf/open/floor/iron/white,
+/area/station/medical/medbay/central)
"oFG" = (
/obj/structure/window/reinforced/tinted/spawner/directional/south,
/obj/structure/window/reinforced/tinted/spawner/directional/north,
@@ -52213,15 +63330,11 @@
/turf/open/floor/plating,
/area/station/maintenance/starboard/fore)
"oHk" = (
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
/obj/effect/landmark/start/hangover,
/obj/machinery/light/directional/north,
-/turf/open/floor/iron,
+/turf/open/floor/iron/edge{
+ dir = 1
+ },
/area/station/hallway/primary/central)
"oHB" = (
/obj/effect/spawner/random/burgerstation/loot/odd_safe,
@@ -52250,6 +63363,9 @@
pixel_y = -23
},
/obj/effect/turf_decal/trimline/dark_blue/filled/line,
+/obj/effect/turf_decal/trimline/dark_blue/line{
+ alpha = 200
+ },
/turf/open/floor/iron/dark,
/area/station/security/office)
"oJJ" = (
@@ -52259,8 +63375,28 @@
pixel_y = 9
},
/obj/structure/table/wood,
+/obj/item/reagent_containers/spray/quantum_hair_dye{
+ pixel_x = -10;
+ pixel_y = 6
+ },
/turf/open/floor/iron/grimy,
/area/station/command/heads_quarters/captain)
+"oJP" = (
+/obj/structure/window/reinforced/spawner/directional/east,
+/obj/structure/window/reinforced/spawner/directional/south,
+/obj/structure/window/reinforced/spawner/directional/west,
+/obj/structure/flora/rock/style_2,
+/obj/item/food/grown/ash_flora/fireblossom{
+ pixel_x = -1;
+ pixel_y = 12;
+ light_on = 0
+ },
+/obj/structure/marker_beacon/bronze{
+ pixel_x = 0;
+ pixel_y = 16
+ },
+/turf/open/floor/fakebasalt,
+/area/station/hallway/secondary/entry)
"oKf" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/orange/visible{
@@ -52268,6 +63404,13 @@
},
/turf/open/floor/iron/smooth_large,
/area/station/engineering/main)
+"oKp" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 1
+ },
+/turf/open/floor/plating,
+/area/station/maintenance/port/fore)
"oKF" = (
/obj/structure/chair/office/light{
dir = 1;
@@ -52287,8 +63430,19 @@
/area/station/science/genetics)
"oKN" = (
/obj/effect/turf_decal/trimline/dark_blue/filled/warning,
+/obj/effect/turf_decal/trimline/dark/warning,
/turf/open/floor/iron/dark,
/area/station/security/brig)
+"oLs" = (
+/obj/machinery/door/airlock/bathroom{
+ name = "Restroom"
+ },
+/obj/machinery/duct,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/turf/open/floor/plating,
+/area/station/maintenance/port/aft)
"oLv" = (
/obj/machinery/light/small/directional/west,
/obj/structure/table,
@@ -52309,15 +63463,29 @@
/turf/open/floor/plating,
/area/station/maintenance/port/fore)
"oLG" = (
-/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/railing,
-/turf/open/floor/iron/dark/textured,
+/obj/effect/turf_decal/siding/wideplating_new/dark/end{
+ dir = 8
+ },
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/iron/textured_large,
/area/station/command/gateway)
"oLN" = (
/obj/structure/table,
/obj/item/clothing/accessory/badge/holo/warden,
/turf/open/floor/iron/dark,
/area/station/security/warden)
+"oLY" = (
+/obj/structure/disposalpipe/segment,
+/obj/effect/turf_decal/trimline/yellow/corner{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/dark/corner{
+ dir = 1
+ },
+/turf/open/floor/iron,
+/area/station/hallway/primary/aft)
"oMt" = (
/obj/structure/table,
/obj/effect/spawner/random/engineering/tool{
@@ -52331,6 +63499,17 @@
},
/turf/open/floor/iron/dark,
/area/station/security/mechbay)
+"oMz" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 6
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 6
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer5,
+/turf/open/floor/plating,
+/area/station/maintenance/port/aft)
"oNd" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
@@ -52378,24 +63557,27 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/pink/hidden{
dir = 9
},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer4,
/turf/open/floor/plating,
/area/station/maintenance/port/fore)
"oND" = (
/obj/effect/turf_decal/trimline/blue/filled/line{
+ alpha = 160;
dir = 8
},
-/obj/effect/turf_decal/trimline/blue/filled/warning{
- dir = 1
+/obj/effect/turf_decal/trimline/dark_blue/line{
+ alpha = 200;
+ dir = 8
},
-/obj/structure/cable,
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/trimline/blue/filled/mid_joiner{
+ dir = 8;
+ alpha = 160
+ },
+/turf/open/floor/iron/white/smooth_corner,
/area/station/medical/medbay/aft)
"oNI" = (
/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/components/tank/air{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible/layer4,
+/obj/machinery/atmospherics/components/tank/air/layer4,
/turf/open/floor/plating,
/area/station/security/prison)
"oOj" = (
@@ -52403,6 +63585,14 @@
/obj/effect/decal/cleanable/cobweb/cobweb2,
/turf/open/floor/plating,
/area/station/maintenance/starboard/aft)
+"oOE" = (
+/obj/structure/disposalpipe/segment,
+/obj/effect/turf_decal/trimline/dark_blue/corner{
+ dir = 1;
+ alpha = 200
+ },
+/turf/open/floor/iron,
+/area/station/hallway/primary/central)
"oOF" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -52412,7 +63602,7 @@
"oOU" = (
/obj/structure/closet/secure_closet/miner,
/obj/item/radio/intercom/directional/east,
-/turf/open/floor/iron/dark,
+/turf/open/floor/iron/dark/textured_large,
/area/station/cargo/miningdock)
"oOZ" = (
/obj/effect/turf_decal/tile/red/opposingcorners,
@@ -52422,22 +63612,28 @@
/turf/open/floor/iron,
/area/station/commons/fitness/recreation)
"oQe" = (
+/obj/structure/cable,
/obj/structure/chair/office/light{
dir = 4
},
-/obj/structure/cable,
/turf/open/floor/iron/dark,
/area/station/command/heads_quarters/cmo)
-"oQu" = (
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
+"oQm" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 8
},
-/obj/machinery/airalarm/directional/south,
+/turf/open/floor/plating,
+/area/station/maintenance/starboard/fore)
+"oQu" = (
/obj/machinery/atmospherics/components/unary/thermomachine/freezer{
dir = 1
},
-/turf/open/floor/iron/white,
+/obj/machinery/airalarm/directional/south,
+/obj/effect/turf_decal/weather/snow/corner{
+ dir = 1
+ },
+/turf/open/floor/iron/white/smooth_large,
/area/station/medical/cryo)
"oQz" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -52464,7 +63660,9 @@
/area/station/commons/dorms)
"oRp" = (
/obj/structure/cable,
-/obj/effect/turf_decal/trimline/blue/filled/corner,
+/obj/effect/turf_decal/trimline/blue/filled/corner{
+ alpha = 160
+ },
/obj/effect/turf_decal/trimline/purple/filled/corner{
dir = 4
},
@@ -52477,15 +63675,25 @@
/obj/structure/cable,
/turf/open/floor/plating,
/area/station/engineering/atmos)
-"oRN" = (
-/obj/effect/turf_decal/tile/red{
- dir = 4
+"oRI" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 1
},
+/turf/open/floor/plating,
+/area/station/maintenance/solars/port/fore)
+"oRN" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 8
},
-/turf/open/floor/iron,
+/obj/effect/turf_decal/siding/dark{
+ dir = 9
+ },
+/turf/open/floor/iron/dark/side{
+ dir = 8
+ },
/area/station/command/bridge)
"oRY" = (
/obj/machinery/atmospherics/components/unary/portables_connector/visible{
@@ -52507,6 +63715,14 @@
dir = 1
},
/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer4,
+/obj/effect/turf_decal/trimline/dark_blue/corner{
+ dir = 1;
+ alpha = 200
+ },
/turf/open/floor/iron/dark,
/area/station/security/office)
"oSL" = (
@@ -52531,22 +63747,44 @@
/turf/open/floor/iron,
/area/station/engineering/storage/tech)
"oTO" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
- dir = 4
- },
-/obj/machinery/component_printer,
+/obj/structure/table,
+/obj/item/storage/box/disks_nanite,
/obj/structure/railing{
- dir = 9
+ dir = 5
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 5
},
/turf/open/floor/iron/white,
/area/station/science/explab)
+"oTX" = (
+/obj/machinery/disposal/delivery_chute{
+ dir = 1;
+ name = "trash catcher"
+ },
+/obj/structure/disposalpipe/trunk{
+ dir = 2
+ },
+/turf/open/floor/plating/airless,
+/area/space/nearstation)
"oUf" = (
/obj/effect/turf_decal/stripes/corner{
dir = 8
},
/obj/machinery/light/directional/west,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer4,
/turf/open/floor/iron/dark,
/area/station/security/processing)
+"oUo" = (
+/obj/structure/cable,
+/obj/effect/turf_decal/siding/dark/corner{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/dark/corner{
+ dir = 4
+ },
+/turf/open/floor/circuit/green/telecomms/mainframe,
+/area/station/tcommsat/server)
"oUp" = (
/obj/effect/landmark/start/bitrunner,
/turf/open/floor/iron/dark,
@@ -52561,6 +63799,12 @@
},
/turf/open/floor/iron,
/area/station/science/ordnance)
+"oVG" = (
+/obj/effect/turf_decal/trimline/green/filled/line{
+ dir = 8
+ },
+/turf/open/floor/iron,
+/area/station/commons/storage/primary)
"oWg" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -52568,14 +63812,18 @@
/turf/open/floor/carpet/purple,
/area/station/command/heads_quarters/rd)
"oWr" = (
-/obj/structure/window/spawner/directional/east,
-/obj/structure/window/spawner/directional/north,
-/obj/machinery/hydroponics/constructable,
-/obj/effect/turf_decal/siding/thinplating/dark{
- dir = 6
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
},
-/turf/open/floor/iron/smooth_large,
-/area/station/service/hydroponics)
+/obj/effect/turf_decal/siding/dark,
+/turf/open/floor/iron/textured_large,
+/area/station/ai_monitored/command/storage/eva)
+"oWG" = (
+/obj/structure/chair/sofa/corp/left{
+ dir = 8
+ },
+/turf/open/floor/iron/dark,
+/area/station/maintenance/port/aft)
"oWR" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 4
@@ -52608,6 +63856,31 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark/textured,
/area/station/science/genetics)
+"oXn" = (
+/obj/effect/turf_decal/siding/dark,
+/obj/effect/turf_decal/siding/dark/corner{
+ dir = 4
+ },
+/turf/open/floor/iron/dark,
+/area/station/service/hydroponics)
+"oXv" = (
+/obj/effect/turf_decal/trimline/brown/arrow_ccw{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/brown/mid_joiner{
+ dir = 8
+ },
+/turf/open/floor/iron/corner,
+/area/station/hallway/primary/central)
+"oXx" = (
+/obj/effect/landmark/start/hangover,
+/obj/effect/turf_decal/siding/dark/corner{
+ dir = 4
+ },
+/turf/open/floor/iron/edge{
+ dir = 1
+ },
+/area/station/hallway/primary/central)
"oXz" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/rack,
@@ -52629,12 +63902,10 @@
/turf/open/floor/wood/parquet,
/area/station/command/heads_quarters/nt_rep)
"oXL" = (
-/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
/obj/machinery/door/firedoor,
/obj/machinery/ticket_machine/directional/east,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/green/corner,
+/turf/open/floor/iron/large,
/area/station/hallway/primary/central)
"oXU" = (
/obj/effect/turf_decal/stripes/line{
@@ -52652,26 +63923,20 @@
"oYm" = (
/obj/item/radio/intercom/directional/south,
/turf/open/floor/plating,
-/area/station/engineering/main)
+/area/station/engineering/supermatter/room)
"oYv" = (
-/obj/machinery/power/apc/auto_name/directional/north,
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/turf_decal/tile/yellow{
- dir = 1
+/obj/machinery/firealarm/directional/north,
+/obj/structure/table,
+/obj/machinery/microwave/engineering/cell_included{
+ pixel_x = 0;
+ pixel_y = 5
},
-/obj/effect/turf_decal/tile/brown{
- dir = 8
- },
-/obj/effect/turf_decal/tile/brown{
- dir = 8
- },
-/obj/effect/turf_decal/tile/brown{
- dir = 4
- },
-/turf/open/floor/iron,
+/turf/open/floor/iron/dark/textured_large,
/area/station/cargo/miningdock)
+"oYL" = (
+/obj/effect/decal/remains/xeno/larva,
+/turf/open/floor/plating,
+/area/station/hallway/secondary/entry)
"oYO" = (
/obj/effect/turf_decal/stripes/white/end{
color = "#9FED58";
@@ -52685,6 +63950,25 @@
dir = 8
},
/area/station/common/cryopods)
+"oYQ" = (
+/obj/effect/turf_decal/trimline/dark/filled/warning{
+ alpha = 160;
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/purple/warning{
+ alpha = 200;
+ dir = 1;
+ color = "#a56dc2"
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible,
+/obj/structure/cable,
+/turf/open/floor/iron/white/smooth_edge{
+ dir = 1
+ },
+/area/station/science/xenobiology)
"oZd" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
@@ -52698,29 +63982,71 @@
},
/turf/open/floor/catwalk_floor,
/area/station/engineering/break_room)
+"oZk" = (
+/obj/effect/turf_decal/siding/white{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/turf/open/floor/iron/white/small,
+/area/station/commons/toilet)
"oZl" = (
/obj/machinery/airalarm/directional/west,
/obj/effect/turf_decal/trimline/blue/filled/line{
dir = 10
},
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/trimline/white/line{
+ dir = 10
+ },
+/obj/effect/turf_decal/trimline/blue/filled/mid_joiner{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/blue/filled/mid_joiner,
+/obj/effect/turf_decal/siding/blue{
+ color = "#8ab4cb";
+ dir = 10
+ },
+/turf/open/floor/iron/white/smooth_corner{
+ dir = 4
+ },
/area/station/medical/treatment_center)
"oZm" = (
/obj/machinery/computer/security,
-/obj/effect/turf_decal/tile/red{
+/obj/effect/turf_decal/tile/dark_red/half{
dir = 1
},
-/obj/effect/turf_decal/tile/red{
- dir = 4
- },
-/turf/open/floor/iron,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/command/bridge)
+"oZn" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
+/turf/open/floor/plating,
+/area/station/maintenance/port/aft)
"oZw" = (
/obj/structure/sink/directional/west,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/structure/mirror/directional/east,
/turf/open/floor/iron/freezer,
/area/station/commons/toilet/locker)
+"oZQ" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/turf_decal/trimline/dark/filled/warning{
+ alpha = 160
+ },
+/obj/effect/turf_decal/trimline/purple/warning{
+ alpha = 200;
+ dir = 2;
+ color = "#a56dc2"
+ },
+/obj/effect/turf_decal/siding/dark,
+/turf/open/floor/iron/white/smooth_edge,
+/area/station/science/xenobiology)
"oZV" = (
/obj/machinery/door/airlock{
name = "Law Office"
@@ -52728,6 +64054,24 @@
/obj/effect/mapping_helpers/airlock/access/any/service/lawyer,
/turf/open/floor/iron/dark,
/area/station/service/lawoffice)
+"oZX" = (
+/obj/effect/turf_decal/trimline/dark/filled/warning{
+ alpha = 160;
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/purple/warning{
+ alpha = 200;
+ dir = 8;
+ color = "#a56dc2"
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 8
+ },
+/obj/structure/cable,
+/turf/open/floor/iron/white/smooth_edge{
+ dir = 8
+ },
+/area/station/science/xenobiology)
"pao" = (
/obj/item/kirbyplants/random,
/turf/open/floor/iron/dark/small,
@@ -52749,6 +64093,9 @@
/obj/effect/turf_decal/trimline/dark_blue/filled/warning{
dir = 8
},
+/obj/effect/turf_decal/trimline/dark/warning{
+ dir = 8
+ },
/turf/open/floor/iron/dark,
/area/station/security/brig)
"pbq" = (
@@ -52768,18 +64115,24 @@
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/structure/cable,
+/obj/effect/turf_decal/siding/dark/corner{
+ dir = 8
+ },
/turf/open/floor/plating,
/area/station/maintenance/aft)
"pbT" = (
/turf/open/floor/iron/dark,
/area/station/commons/dorms/apartment2)
"pcr" = (
-/obj/effect/turf_decal/tile/blue{
- dir = 4
+/obj/effect/turf_decal/trimline/yellow/filled/line{
+ dir = 9
},
-/turf/open/floor/iron/dark/side{
- dir = 10
+/obj/effect/turf_decal/trimline/dark_blue/line{
+ alpha = 200;
+ dir = 9
},
+/obj/structure/tank_holder/extinguisher/advanced,
+/turf/open/floor/iron/dark,
/area/station/engineering/atmos/hfr_room)
"pcY" = (
/obj/machinery/light/directional/south,
@@ -52790,6 +64143,9 @@
/obj/effect/turf_decal/delivery/blue,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/security/armory)
+"pde" = (
+/turf/closed/wall/r_wall,
+/area/station/cargo/warehouse)
"pdi" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
/turf/open/floor/iron/dark,
@@ -52797,10 +64153,32 @@
"pdk" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/cable,
/turf/open/floor/iron/dark/side{
dir = 10
},
/area/station/security/prison)
+"pdm" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/structure/closet/secure_closet/atmospherics,
+/obj/structure/sign/warning/no_smoking/directional/east,
+/turf/open/floor/iron/dark,
+/area/station/engineering/atmos)
+"pds" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/obj/structure/cable,
+/obj/effect/landmark/start/hangover,
+/turf/open/floor/iron/edge{
+ dir = 4
+ },
+/area/station/hallway/primary/starboard)
"pdW" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/stripes/line{
@@ -52815,38 +64193,31 @@
},
/obj/structure/cable,
/turf/open/floor/iron,
-/area/station/science/ordnance/bomb)
+/area/station/science/ordnance/testlab)
"pee" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/plating,
/area/station/security/prison)
"pel" = (
-/obj/effect/turf_decal/tile/yellow{
- dir = 1
- },
-/obj/effect/turf_decal/tile/brown{
+/obj/structure/extinguisher_cabinet/directional/west,
+/obj/effect/turf_decal/trimline/brown/filled/line{
dir = 8
},
-/obj/structure/extinguisher_cabinet/directional/west,
-/turf/open/floor/iron,
-/area/station/cargo/miningdock)
-"peL" = (
-/obj/effect/turf_decal/tile/yellow{
- dir = 1
+/obj/effect/turf_decal/trimline/dark/line{
+ dir = 8
},
-/obj/effect/turf_decal/tile/yellow{
+/turf/open/floor/iron/textured_edge{
dir = 4
},
-/obj/machinery/disposal/bin,
-/obj/effect/turf_decal/trimline/yellow/end{
- dir = 8
- },
+/area/station/cargo/miningdock)
+"peL" = (
/obj/structure/disposalpipe/trunk{
dir = 8
},
+/obj/machinery/disposal/bin,
/obj/structure/window/reinforced/spawner/directional/west,
-/turf/open/floor/iron/white,
+/turf/open/floor/plating/elevatorshaft,
/area/station/medical/chemistry)
"peU" = (
/obj/effect/spawner/structure/window/reinforced,
@@ -52855,6 +64226,7 @@
name = "Containment Blast Door"
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible,
+/obj/structure/cable,
/turf/open/floor/plating,
/area/station/science/xenobiology)
"pfa" = (
@@ -52877,18 +64249,17 @@
/turf/open/floor/plating,
/area/station/service/chapel)
"pfu" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/cable,
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/public/glass{
name = "Central Access"
},
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/cable,
-/turf/open/floor/iron,
+/turf/open/floor/iron/large,
/area/station/hallway/primary/aft)
"pfR" = (
/obj/structure/disposalpipe/segment,
-/obj/structure/cable,
/obj/item/reagent_containers/applicator/pill/maintenance{
pixel_y = 2
},
@@ -52908,14 +64279,21 @@
dir = 8
},
/obj/structure/cable,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/brown/filled/warning{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer5,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 8
+ },
+/turf/open/floor/iron/textured_edge,
/area/station/cargo/storage)
"phd" = (
/obj/structure/filingcabinet,
/obj/item/folder/documents,
-/obj/effect/turf_decal/bot_white,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/turf/open/floor/iron/dark,
+/obj/effect/turf_decal/box/blue,
+/obj/effect/turf_decal/bot_blue,
+/turf/open/floor/iron/dark/textured_large,
/area/station/ai_monitored/command/nuke_storage)
"phi" = (
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
@@ -52928,17 +64306,17 @@
/turf/open/floor/plating,
/area/station/engineering/main)
"pht" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 9
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/disposalpipe/trunk,
/obj/effect/turf_decal/trimline/blue/filled/line{
dir = 6
},
/obj/machinery/light_switch{
pixel_x = 28
},
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
- dir = 9
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/disposalpipe/trunk,
/obj/machinery/disposal/bin,
/turf/open/floor/iron/dark,
/area/station/command/heads_quarters/cmo)
@@ -52949,10 +64327,7 @@
/area/station/commons/vacant_room/office)
"phS" = (
/obj/structure/disposalpipe/segment,
-/obj/structure/cable,
-/obj/structure/rack,
-/obj/effect/spawner/random/maintenance/three,
-/obj/effect/spawner/random/entertainment/drugs,
+/obj/machinery/plumbing/grinder_chemical,
/turf/open/floor/plating,
/area/station/maintenance/aft)
"phU" = (
@@ -52980,6 +64355,11 @@
},
/turf/open/floor/iron/dark,
/area/station/service/barber)
+"piv" = (
+/obj/structure/disposalpipe/segment,
+/obj/structure/table,
+/turf/open/floor/iron,
+/area/station/commons/locker)
"piD" = (
/obj/machinery/light/directional/west,
/obj/machinery/portable_atmospherics/pump,
@@ -52998,16 +64378,19 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 4
},
+/obj/effect/turf_decal/siding/dark/corner{
+ dir = 1
+ },
/turf/open/floor/plating,
/area/station/maintenance/aft)
"pjx" = (
-/obj/machinery/light/small/directional/west,
/obj/machinery/atmospherics/components/binary/pump/layer4{
name = "Airmix Reserve to Distribution"
},
/turf/open/floor/plating,
/area/station/security/prison)
"pjA" = (
+/obj/structure/cable,
/obj/effect/turf_decal/tile/yellow{
dir = 8
},
@@ -53017,20 +64400,32 @@
/obj/effect/turf_decal/tile/dark{
dir = 1
},
-/obj/structure/cable,
/obj/effect/landmark/start/telecomms_specialist,
/turf/open/floor/iron/smooth,
/area/station/engineering/break_room)
"pjU" = (
/turf/closed/wall/r_wall,
/area/station/ai_monitored/turret_protected/aisat/maint)
-"pkL" = (
-/obj/effect/turf_decal/trimline/blue/filled/line{
+"pkc" = (
+/turf/open/floor/iron/edge{
dir = 1
},
-/obj/machinery/iv_drip,
-/obj/effect/spawner/random/medical/patient_stretcher,
-/turf/open/floor/iron/white,
+/area/station/hallway/primary/port)
+"pkL" = (
+/obj/structure/table/glass,
+/obj/item/bodybag/environmental/nanotrasen{
+ pixel_y = 8;
+ pixel_x = 7
+ },
+/obj/item/reagent_containers/cup/bottle/formaldehyde{
+ pixel_x = -9;
+ pixel_y = 8
+ },
+/obj/item/reagent_containers/syringe{
+ pixel_x = -9;
+ pixel_y = -3
+ },
+/turf/open/floor/iron/dark/smooth_large,
/area/station/medical/medbay/central)
"pla" = (
/obj/effect/turf_decal/stripes/line{
@@ -53059,6 +64454,7 @@
/obj/structure/cable,
/obj/structure/disposalpipe/segment,
/obj/structure/window/reinforced/spawner/directional/west,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer5,
/turf/open/floor/iron/smooth_large,
/area/station/engineering/main)
"plN" = (
@@ -53068,9 +64464,16 @@
/turf/open/floor/iron/kitchen,
/area/station/security/prison)
"plW" = (
-/obj/structure/sign/departments/morgue,
-/turf/closed/wall,
-/area/station/medical/surgery)
+/obj/effect/turf_decal/trimline/blue/line{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/blue/mid_joiner{
+ dir = 4
+ },
+/turf/open/floor/iron/textured_half{
+ dir = 8
+ },
+/area/station/hallway/primary/central)
"pmh" = (
/obj/structure/cable,
/obj/structure/disposalpipe/segment{
@@ -53083,22 +64486,34 @@
/turf/open/floor/plating,
/area/station/maintenance/aft)
"pmF" = (
-/obj/structure/disposalpipe/segment{
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/effect/turf_decal/caution/stand_clear/blue{
dir = 4
},
-/obj/structure/rack,
-/turf/open/floor/plating,
-/area/station/maintenance/fore)
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron/dark,
+/area/station/security/processing)
+"pmK" = (
+/obj/structure/cable,
+/obj/effect/turf_decal/trimline/brown/filled/corner{
+ dir = 8
+ },
+/turf/open/floor/iron/large,
+/area/station/cargo/storage)
"pmL" = (
/obj/structure/cable,
/obj/effect/turf_decal/trimline/dark_blue/filled/line,
+/obj/effect/turf_decal/trimline/dark/line,
/turf/open/floor/iron/dark,
/area/station/security/brig)
"pmM" = (
/obj/structure/cable,
/obj/structure/flora/bush/flowers_pp,
/obj/machinery/hydroponics/constructable,
-/obj/effect/turf_decal/siding/blue{
+/obj/effect/turf_decal/siding/wood{
dir = 1
},
/turf/open/floor/grass,
@@ -53134,6 +64549,7 @@
/obj/item/clothing/under/rank/prisoner/skirt/highsec,
/obj/item/clothing/under/rank/prisoner/supermax,
/obj/item/clothing/under/rank/prisoner/skirt/supermax,
+/obj/effect/turf_decal/trimline/dark/line,
/turf/open/floor/iron/dark,
/area/station/security/execution/transfer)
"pnD" = (
@@ -53146,14 +64562,15 @@
/turf/open/floor/iron/smooth_large,
/area/station/science/cytology)
"pnL" = (
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
- dir = 8
+/obj/effect/turf_decal/trimline/blue/filled/line{
+ dir = 6
},
-/obj/effect/turf_decal/tile/blue{
- dir = 4
+/obj/effect/turf_decal/trimline/white/line{
+ dir = 6
+ },
+/turf/open/floor/iron/white/smooth_corner{
+ dir = 1
},
-/turf/open/floor/iron/white,
/area/station/medical/medbay/lobby)
"pnM" = (
/obj/structure/rack,
@@ -53183,16 +64600,40 @@
/turf/open/floor/iron/dark,
/area/station/security/brig)
"pnW" = (
-/obj/effect/turf_decal/trimline/blue/filled/corner,
-/obj/effect/turf_decal/trimline/blue/filled/warning,
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/trimline/blue/filled/warning{
+ alpha = 160
+ },
+/obj/effect/turf_decal/trimline/white/warning,
+/turf/open/floor/iron/white/smooth_edge,
/area/station/medical/medbay/central)
+"pnX" = (
+/obj/effect/turf_decal/siding/dark{
+ dir = 5
+ },
+/obj/effect/turf_decal/siding/dark/corner{
+ dir = 8
+ },
+/obj/machinery/camera/directional/east{
+ c_tag = "Xenobiology Cell 8";
+ network = list("ss13","xeno")
+ },
+/turf/open/floor/engine,
+/area/station/science/xenobiology)
"pod" = (
/obj/structure/table/reinforced,
/obj/item/hfr_box/body/waste_output,
/obj/item/hfr_box/body/moderator_input,
/turf/open/floor/iron,
/area/station/engineering/atmos/hfr_room)
+"poz" = (
+/obj/effect/turf_decal/siding/dark,
+/obj/effect/turf_decal/siding/dark/corner{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/plating,
+/area/station/maintenance/starboard/aft)
"poE" = (
/obj/machinery/door/poddoor/preopen{
id = "briggate";
@@ -53212,15 +64653,28 @@
"poM" = (
/obj/machinery/holopad,
/obj/effect/turf_decal/bot,
+/obj/effect/turf_decal/trimline/yellow/filled/line,
/turf/open/floor/iron,
/area/station/commons/storage/primary)
+"ppe" = (
+/turf/open/floor/iron/edge{
+ dir = 8
+ },
+/area/station/hallway/secondary/entry)
"ppU" = (
/obj/structure/table,
+/obj/item/stack/sheet/glass/fifty{
+ pixel_x = -2;
+ pixel_y = 3
+ },
/obj/item/stack/sheet/iron/fifty{
pixel_x = 2;
- pixel_y = 5
+ pixel_y = 8
+ },
+/obj/item/storage/toolbox/emergency{
+ pixel_y = -1;
+ pixel_x = 1
},
-/obj/item/stack/sheet/glass/fifty,
/turf/open/floor/plating,
/area/station/maintenance/aft)
"ppW" = (
@@ -53230,7 +64684,6 @@
"ppZ" = (
/obj/structure/cable,
/obj/machinery/power/apc/auto_name/directional/west,
-/obj/structure/closet/emcloset,
/turf/open/floor/plating,
/area/station/maintenance/solars/starboard/aft)
"pqf" = (
@@ -53241,6 +64694,15 @@
/obj/structure/disposalpipe/trunk{
dir = 8
},
+/obj/effect/turf_decal/trimline/white/filled/line{
+ dir = 4;
+ alpha = 160
+ },
+/obj/effect/turf_decal/trimline/purple/line{
+ alpha = 200;
+ dir = 4;
+ color = "#a56dc2"
+ },
/turf/open/floor/iron,
/area/station/science/explab)
"pqJ" = (
@@ -53283,7 +64745,9 @@
/area/station/security/courtroom)
"prY" = (
/obj/item/radio/intercom/directional/south,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/brown/arrow_cw,
+/obj/effect/turf_decal/trimline/brown/mid_joiner,
+/turf/open/floor/iron/edge,
/area/station/hallway/primary/central)
"psh" = (
/obj/machinery/airalarm/directional/east,
@@ -53299,8 +64763,12 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 4
},
-/obj/machinery/light/directional/north,
-/turf/open/floor/iron,
+/obj/structure/cable,
+/obj/effect/turf_decal/trimline/blue/filled/line{
+ dir = 1
+ },
+/obj/structure/extinguisher_cabinet/directional/north,
+/turf/open/floor/iron/edge,
/area/station/hallway/secondary/entry)
"psm" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -53314,13 +64782,26 @@
},
/turf/open/floor/engine/co2,
/area/station/engineering/atmos)
-"psS" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/chair/sofa/bench/right{
+"psG" = (
+/obj/structure/chair{
dir = 1
},
-/turf/open/floor/iron/dark/side,
-/area/station/hallway/secondary/exit)
+/obj/machinery/firealarm/directional/east,
+/turf/open/floor/iron/dark,
+/area/station/security/courtroom)
+"psS" = (
+/obj/effect/turf_decal/trimline/blue/filled/line,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer5,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 5
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/turf/open/floor/iron/edge{
+ dir = 1
+ },
+/area/station/hallway/secondary/entry)
"psY" = (
/obj/effect/turf_decal/tile/yellow,
/obj/effect/turf_decal/tile/blue{
@@ -53332,32 +64813,94 @@
/turf/open/floor/iron/white,
/area/station/medical/chemistry)
"ptl" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/components/binary/pump/on/layer4{
+ dir = 8;
+ name = "Airlock Pump";
+ hide = 1;
+ target_pressure = 300
+ },
/turf/open/floor/iron/dark,
/area/station/security/processing)
"ptB" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/trimline/blue/filled/warning{
+ alpha = 160;
+ dir = 1
+ },
+/obj/effect/turf_decal/siding,
+/obj/effect/turf_decal/trimline/white/warning{
+ dir = 1
+ },
+/turf/open/floor/iron/white/smooth_edge{
+ dir = 1
+ },
/area/station/medical/medbay/central)
+"ptX" = (
+/obj/effect/turf_decal/trimline/dark/filled/warning{
+ alpha = 160;
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/purple/warning{
+ alpha = 200;
+ dir = 8;
+ color = "#a56dc2"
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 8
+ },
+/obj/structure/cable,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+ dir = 4
+ },
+/turf/open/floor/iron/white/smooth_edge{
+ dir = 8
+ },
+/area/station/science/xenobiology)
+"puc" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/obj/effect/turf_decal/stripes/white/line{
+ color = "#a56dc2";
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/dark/corner{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/dark/corner,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 8
+ },
+/mob/living/basic/slime{
+ name = "alice"
+ },
+/turf/open/floor/engine,
+/area/station/science/xenobiology)
+"put" = (
+/obj/structure/fluff/metalpole{
+ pixel_y = -32
+ },
+/obj/machinery/status_display/shuttle,
+/turf/closed/wall,
+/area/station/hallway/secondary/entry)
"puL" = (
/obj/machinery/newscaster/directional/north,
/obj/machinery/griddle/frontier_tabletop,
/obj/structure/table,
/turf/open/floor/iron/dark,
/area/station/commons/dorms/apartment2)
+"puU" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
+/turf/open/floor/plating,
+/area/station/maintenance/port/aft)
"pva" = (
-/obj/effect/turf_decal/tile/yellow{
- dir = 1
- },
-/obj/effect/turf_decal/tile/yellow{
- dir = 4
- },
/obj/machinery/chem_dispenser,
-/obj/effect/turf_decal/tile/yellow{
- dir = 8
- },
-/obj/effect/turf_decal/tile/yellow,
/obj/machinery/light/directional/north,
-/turf/open/floor/iron/white,
+/turf/open/floor/plating/elevatorshaft,
/area/station/medical/chemistry)
"pvy" = (
/obj/effect/mapping_helpers/turn_off_lights_with_lightswitch,
@@ -53381,18 +64924,56 @@
/turf/open/floor/iron,
/area/station/hallway/primary/fore)
"pwL" = (
-/turf/open/floor/iron/white/side{
- dir = 10
+/obj/effect/turf_decal/siding/dark{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/dark/filled/warning{
+ alpha = 160;
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/purple/warning{
+ alpha = 200;
+ dir = 1
+ },
+/turf/open/floor/iron/white/smooth_edge{
+ dir = 1
},
/area/station/science/research)
+"pxD" = (
+/obj/structure/chair/sofa/bench/right{
+ dir = 1
+ },
+/turf/open/floor/iron/dark/side,
+/area/station/hallway/secondary/entry)
"pxR" = (
/obj/effect/turf_decal/loading_area/white,
/turf/open/floor/wood/large,
/area/station/service/bar)
"pxV" = (
/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 4
+ },
/turf/open/floor/plating,
/area/station/maintenance/starboard/aft)
+"pyd" = (
+/obj/effect/turf_decal/trimline/blue/filled/warning{
+ alpha = 160;
+ dir = 5
+ },
+/obj/effect/turf_decal/siding/corner{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/white/warning{
+ dir = 5
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/cable,
+/turf/open/floor/iron/white/smooth_corner{
+ dir = 8
+ },
+/area/station/medical/medbay/central)
"pyQ" = (
/obj/machinery/shower/directional/south,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -53411,17 +64992,41 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 4
},
-/turf/open/floor/iron/dark,
+/obj/effect/turf_decal/trimline/dark/filled/end{
+ dir = 4
+ },
+/turf/open/floor/iron/dark/small,
/area/station/medical/morgue)
"pzm" = (
/obj/structure/disposalpipe/segment{
dir = 4
},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 4
+ },
/turf/open/floor/iron/dark,
/area/station/security/office)
"pzG" = (
-/turf/closed/wall/r_wall,
-/area/station/science/breakroom)
+/obj/structure/rack,
+/obj/item/mmi{
+ pixel_x = 2;
+ pixel_y = -4
+ },
+/obj/item/mmi{
+ pixel_x = -1;
+ pixel_y = 1
+ },
+/obj/item/mmi{
+ pixel_x = -4;
+ pixel_y = 6
+ },
+/obj/item/tank/internals/anesthetic,
+/obj/item/clothing/mask/surgical{
+ pixel_x = -1;
+ pixel_y = -6
+ },
+/turf/open/floor/iron/dark/smooth_large,
+/area/station/science/robotics/lab)
"pzP" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -53431,17 +65036,23 @@
/turf/open/floor/plating,
/area/station/maintenance/port)
"pzW" = (
+/obj/structure/disposalpipe/segment,
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/public/glass{
name = "Central Access"
},
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/iron,
+/turf/open/floor/iron/large,
/area/station/hallway/primary/central)
"pzZ" = (
/obj/effect/landmark/start/hangover,
+/obj/effect/turf_decal/bot_white{
+ color = "#ff780a"
+ },
+/obj/effect/turf_decal/box/white{
+ color = "#ff780a"
+ },
/obj/effect/turf_decal/vg_decals/department/bar,
-/turf/open/floor/iron,
+/turf/open/floor/iron/large,
/area/station/hallway/primary/starboard)
"pAk" = (
/obj/structure/table,
@@ -53472,8 +65083,11 @@
},
/area/station/hallway/primary/fore)
"pAx" = (
-/obj/structure/cable,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/blue/filled/line{
+ dir = 4
+ },
+/obj/machinery/door/firedoor,
+/turf/open/floor/iron/large,
/area/station/hallway/secondary/entry)
"pAE" = (
/obj/structure/cable,
@@ -53495,26 +65109,8 @@
/turf/open/floor/iron/dark,
/area/station/engineering/gravity_generator)
"pAR" = (
-/obj/effect/turf_decal/tile/yellow,
-/obj/effect/turf_decal/tile/yellow{
- dir = 8
- },
-/obj/structure/table/glass,
-/obj/item/storage/box/beakers{
- pixel_x = 2;
- pixel_y = 2
- },
-/obj/item/reagent_containers/cup/beaker/large,
-/obj/item/reagent_containers/dropper,
-/obj/effect/turf_decal/tile/yellow{
- dir = 1
- },
-/obj/effect/turf_decal/tile/yellow{
- dir = 4
- },
-/obj/structure/window/reinforced/spawner/directional/west,
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/iron/white,
+/obj/machinery/chem_master,
+/turf/open/floor/iron/dark/small,
/area/station/medical/pharmacy)
"pBk" = (
/obj/machinery/netpod,
@@ -53529,6 +65125,13 @@
/obj/machinery/atmospherics/pipe/bridge_pipe/yellow/visible,
/turf/open/floor/iron,
/area/station/engineering/atmos)
+"pBn" = (
+/obj/structure/bed,
+/obj/effect/spawner/random/bedsheet/any,
+/obj/structure/sign/poster/contraband/barbaro/directional/east,
+/obj/structure/sign/poster/contraband/trigger/directional/north,
+/turf/open/floor/carpet/lone/star,
+/area/station/maintenance/port/aft)
"pBF" = (
/obj/effect/turf_decal/tile/purple/opposingcorners{
dir = 4
@@ -53568,12 +65171,13 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 4
},
-/obj/machinery/camera/directional/east{
- c_tag = "Genetics North"
- },
/obj/machinery/firealarm/directional/east,
/turf/open/floor/iron/dark/textured,
/area/station/science/genetics)
+"pCE" = (
+/obj/machinery/atmospherics/components/unary/airlock_pump/unbolt_only,
+/turf/open/floor/plating,
+/area/station/maintenance/fore)
"pCZ" = (
/obj/structure/toilet{
pixel_x = -10;
@@ -53628,11 +65232,16 @@
/turf/open/floor/iron/smooth,
/area/station/ai_monitored/security/armory)
"pEK" = (
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
- dir = 8
+/obj/effect/turf_decal/trimline/blue/filled/warning{
+ alpha = 160;
+ dir = 10
+ },
+/obj/effect/turf_decal/trimline/white/warning{
+ dir = 10
+ },
+/turf/open/floor/iron/white/smooth_corner{
+ dir = 4
},
-/turf/open/floor/iron/white,
/area/station/medical/medbay/lobby)
"pEP" = (
/obj/machinery/door/firedoor,
@@ -53657,11 +65266,19 @@
},
/turf/open/floor/iron,
/area/station/engineering/atmos)
+"pFi" = (
+/obj/effect/turf_decal/trimline/blue/corner{
+ dir = 1;
+ alpha = 200
+ },
+/turf/open/floor/iron,
+/area/station/hallway/primary/central)
"pFk" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/structure/cable,
/obj/structure/sign/poster/contraband/random/directional/east,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer5,
/turf/open/floor/plating,
/area/station/maintenance/port)
"pFw" = (
@@ -53671,6 +65288,9 @@
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/turf_decal/trimline/dark/warning{
+ dir = 8
+ },
/turf/open/floor/iron/dark,
/area/station/security/execution/transfer)
"pFH" = (
@@ -53698,8 +65318,11 @@
/turf/open/floor/iron,
/area/station/commons/fitness/recreation)
"pGV" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
-/turf/open/floor/iron/dark,
+/obj/effect/turf_decal/siding/dark{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/dark,
+/turf/open/floor/carpet/black,
/area/station/security/checkpoint/escape)
"pHj" = (
/obj/structure/railing{
@@ -53712,18 +65335,42 @@
dir = 4
},
/obj/structure/cable,
-/turf/open/floor/iron/dark/textured,
-/area/station/command/gateway)
-"pHl" = (
-/obj/effect/turf_decal/tile/blue{
+/obj/effect/turf_decal/siding/wideplating_new/dark{
dir = 4
},
-/obj/effect/turf_decal/tile/blue{
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/effect/turf_decal/stripes/white/line{
+ color = "#52B4E9";
+ dir = 8;
+ name = "blue line"
+ },
+/obj/effect/turf_decal/siding/wideplating_new/dark/corner{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/wideplating_new/dark/corner{
dir = 1
},
+/turf/open/floor/iron/textured_large,
+/area/station/command/gateway)
+"pHl" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible,
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/weather/snow,
+/obj/effect/turf_decal/siding{
+ dir = 8
+ },
+/turf/open/floor/iron/freezer,
/area/station/medical/cryo)
+"pHq" = (
+/obj/effect/turf_decal/siding/dark{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 8
+ },
+/turf/open/floor/wood/parquet,
+/area/station/command/meeting_room)
"pHs" = (
/obj/structure/flora/bush/sparsegrass/style_random,
/turf/open/floor/grass,
@@ -53746,21 +65393,39 @@
},
/area/station/hallway/primary/fore)
"pIw" = (
-/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/plating,
-/area/station/science/cytology)
-"pIy" = (
-/obj/effect/turf_decal/bot_blue,
-/obj/structure/closet/secure_closet/security/sec,
-/obj/machinery/firealarm/directional/west,
-/turf/open/floor/iron/dark,
-/area/station/security/office)
+/obj/machinery/door/window/left/directional/west{
+ name = "Containment Cell";
+ req_access = list("xenobiology")
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 6
+ },
+/obj/structure/cable,
+/obj/effect/turf_decal/vg_decals/numbers/seven{
+ color = "#D381C9"
+ },
+/obj/effect/turf_decal/bot_white{
+ color = "#D381C9"
+ },
+/obj/effect/turf_decal/box/white{
+ color = "#D381C9"
+ },
+/turf/open/floor/iron/dark/smooth_large,
+/area/station/science/xenobiology)
"pIJ" = (
-/obj/effect/turf_decal/tile/yellow/half/contrasted{
+/obj/effect/turf_decal/trimline/yellow/filled/shrink_ccw{
dir = 8
},
/turf/open/floor/iron/dark,
/area/station/engineering/atmos/hfr_room)
+"pIR" = (
+/obj/effect/turf_decal/siding/dark{
+ dir = 4
+ },
+/turf/open/floor/iron/edge{
+ dir = 4
+ },
+/area/station/hallway/primary/starboard)
"pIS" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
@@ -53773,6 +65438,7 @@
/obj/structure/disposalpipe/sorting/mail/flip{
dir = 8
},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer5,
/turf/open/floor/plating,
/area/station/maintenance/port/aft)
"pIW" = (
@@ -53787,6 +65453,8 @@
},
/obj/effect/mapping_helpers/mail_sorting/service/hydroponics,
/obj/structure/cable,
+/obj/effect/turf_decal/trimline/green/warning,
+/obj/effect/turf_decal/trimline/green/mid_joiner,
/turf/open/floor/iron/smooth_large,
/area/station/hallway/secondary/service)
"pIX" = (
@@ -53794,20 +65462,43 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/plating,
/area/station/maintenance/department/security)
+"pJa" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/turf_decal/tile/yellow{
+ dir = 1
+ },
+/turf/open/floor/iron/dark/smooth_corner{
+ dir = 1
+ },
+/area/station/medical/pharmacy)
"pJj" = (
/obj/effect/turf_decal/trimline/blue/filled/corner{
dir = 1
},
-/obj/effect/turf_decal/trimline/blue/filled/corner,
+/obj/effect/turf_decal/trimline/blue/filled/corner{
+ alpha = 160
+ },
+/obj/effect/turf_decal/trimline/white/corner{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/white/corner,
+/obj/effect/turf_decal/siding/blue/corner{
+ color = "#8ab4cb"
+ },
/turf/open/floor/iron/white,
/area/station/medical/treatment_center)
"pJz" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/white,
/area/station/science/lab)
+"pJD" = (
+/obj/structure/disposalpipe/segment{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/turf/open/floor/plating,
+/area/station/maintenance/port/aft)
"pJI" = (
/obj/machinery/door/firedoor,
/turf/open/floor/iron/dark/textured_large,
@@ -53830,17 +65521,29 @@
/area/station/common/pool/sauna)
"pKB" = (
/obj/structure/table,
-/obj/item/stack/sheet/glass/fifty{
- pixel_x = 3;
- pixel_y = 3
- },
-/obj/item/stack/sheet/iron/fifty,
-/obj/item/stack/sheet/mineral/plasma,
/obj/machinery/firealarm/directional/north,
+/obj/machinery/cell_charger{
+ pixel_y = 5
+ },
+/obj/item/stock_parts/power_store/cell/high,
+/obj/item/stock_parts/power_store/cell/high{
+ pixel_x = 8;
+ pixel_y = 9
+ },
/turf/open/floor/iron,
/area/station/science/explab)
+"pLd" = (
+/obj/item/stack/cable_coil/cut{
+ pixel_x = 3;
+ pixel_y = -8
+ },
+/turf/open/floor/iron/dark/smooth_large,
+/area/station/maintenance/starboard/aft)
"pLk" = (
/obj/structure/bookcase/random/fiction,
+/obj/effect/turf_decal/siding/wood{
+ dir = 1
+ },
/turf/open/floor/wood,
/area/station/security/prison)
"pLn" = (
@@ -53849,19 +65552,19 @@
id = "garbage"
},
/obj/machinery/camera/directional/west{
- network = list("ss13","Trash");
+ network = list("ss13","trash","cargo");
c_tag = "Disposal"
},
/turf/open/floor/plating,
/area/station/maintenance/disposal)
"pLA" = (
/obj/structure/cable,
-/obj/effect/landmark/navigate_destination,
-/obj/effect/mapping_helpers/airlock/access/all/command/captain,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 4
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/landmark/navigate_destination,
+/obj/effect/mapping_helpers/airlock/access/all/command/captain,
/obj/effect/turf_decal/siding/wood,
/obj/machinery/door/airlock/corporate{
name = "Blueshield's Quarters"
@@ -53869,17 +65572,19 @@
/turf/open/floor/wood,
/area/station/command/heads_quarters/blueshield)
"pLL" = (
-/obj/structure/extinguisher_cabinet{
- pixel_x = -24;
- pixel_y = 3
- },
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
/obj/machinery/light/directional/west,
/obj/structure/cable,
/obj/structure/window/reinforced/spawner/directional/south,
/obj/effect/turf_decal/stripes/line,
+/obj/structure/extinguisher_cabinet/directional/west,
/turf/open/floor/iron/dark,
/area/station/security/office)
+"pMj" = (
+/obj/structure/marker_beacon/olive,
+/obj/structure/lattice/catwalk,
+/turf/open/space/basic,
+/area/space/nearstation)
"pMv" = (
/obj/structure/cable,
/obj/effect/landmark/start/depsec/science,
@@ -53891,6 +65596,18 @@
},
/turf/closed/wall,
/area/station/medical/morgue)
+"pMY" = (
+/obj/structure/disposalpipe/segment{
+ dir = 6
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 5
+ },
+/turf/open/floor/plating,
+/area/station/maintenance/aft)
"pNh" = (
/obj/structure/table/reinforced,
/obj/machinery/fax{
@@ -53906,6 +65623,9 @@
/obj/item/assembly/signaler,
/obj/structure/cable,
/obj/item/radio/intercom/directional/north,
+/obj/effect/turf_decal/trimline/yellow/filled/line{
+ dir = 1
+ },
/turf/open/floor/iron,
/area/station/commons/storage/primary)
"pOi" = (
@@ -53916,41 +65636,93 @@
},
/turf/open/floor/iron/dark,
/area/station/security/prison)
+"pOn" = (
+/obj/effect/turf_decal/trimline/blue/filled/line{
+ dir = 9
+ },
+/obj/effect/turf_decal/trimline/white/line{
+ dir = 9
+ },
+/obj/effect/turf_decal/trimline/blue/filled/mid_joiner{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/blue/filled/mid_joiner{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/blue{
+ color = "#8ab4cb";
+ dir = 8
+ },
+/turf/open/floor/iron/white/smooth_corner,
+/area/station/medical/treatment_center)
"pOz" = (
/obj/machinery/camera/directional/east{
network = list("ss13","engine");
c_tag = "Atmospherics HFR Room"
},
-/obj/effect/turf_decal/tile/yellow/half/contrasted{
+/obj/structure/extinguisher_cabinet/directional/east,
+/obj/effect/turf_decal/trimline/yellow/filled/shrink_cw{
dir = 4
},
-/obj/structure/extinguisher_cabinet/directional/east,
/turf/open/floor/iron/dark,
/area/station/engineering/atmos/hfr_room)
"pOC" = (
-/obj/structure/sink/directional/west,
-/turf/open/floor/iron/white,
-/area/station/science/xenobiology)
+/obj/effect/turf_decal/trimline/dark/filled/line{
+ alpha = 160;
+ dir = 10
+ },
+/obj/effect/turf_decal/trimline/dark/filled/mid_joiner{
+ dir = 8;
+ alpha = 160
+ },
+/obj/effect/turf_decal/trimline/dark/filled/mid_joiner{
+ dir = 2;
+ alpha = 160
+ },
+/obj/effect/turf_decal/trimline/purple/line{
+ alpha = 200;
+ dir = 10
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 10
+ },
+/obj/structure/sign/departments/nanites/directional/west,
+/turf/open/floor/iron/white/smooth_corner{
+ dir = 4
+ },
+/area/station/science/research)
"pOE" = (
/obj/structure/sign/warning/vacuum/external/directional/west,
/obj/machinery/light/small/directional/east,
+/obj/machinery/atmospherics/components/unary/airlock_pump/unbolt_only{
+ dir = 1
+ },
/turf/open/floor/plating,
/area/station/maintenance/port/aft)
+"pOH" = (
+/obj/machinery/atmospherics/components/unary/airlock_pump/unbolt_only{
+ dir = 1
+ },
+/turf/open/floor/plating,
+/area/station/maintenance/starboard/aft)
"pOK" = (
/obj/structure/table/glass,
/obj/machinery/light/directional/south,
/obj/item/stack/sheet/iron/fifty{
- pixel_x = -7;
+ pixel_x = -14;
pixel_y = 7
},
/obj/item/stack/sheet/glass/fifty{
- pixel_x = 7;
+ pixel_x = 0;
pixel_y = 7
},
-/obj/item/storage/toolbox/mechanical,
/obj/machinery/firealarm/directional/south,
/obj/structure/cable,
-/turf/open/floor/iron,
+/obj/item/storage/toolbox/mechanical{
+ pixel_x = 0;
+ pixel_y = 4
+ },
+/turf/open/floor/iron/dark/smooth_large,
/area/station/science/lab)
"pOR" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
@@ -54004,23 +65776,56 @@
/turf/open/floor/iron/white,
/area/station/medical/chemistry)
"pPX" = (
-/obj/effect/turf_decal/trimline/blue/filled/warning,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+ dir = 4
+ },
/obj/effect/turf_decal/trimline/blue/filled/line{
+ alpha = 160;
+ dir = 9
+ },
+/obj/effect/turf_decal/trimline/dark_blue/line{
+ alpha = 200;
+ dir = 9
+ },
+/obj/effect/turf_decal/trimline/blue/filled/mid_joiner{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/blue/filled/mid_joiner{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/blue/filled/mid_joiner{
dir = 8
},
-/turf/open/floor/iron/white,
-/area/station/medical/medbay/aft)
+/obj/effect/turf_decal/trimline/blue/filled/mid_joiner{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/dark_blue/mid_joiner{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/dark_blue/mid_joiner{
+ dir = 1
+ },
+/turf/open/floor/iron/white/smooth_large,
+/area/station/medical/medbay/central)
"pQf" = (
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/hallway/primary/fore)
+"pQo" = (
+/obj/effect/turf_decal/trimline/green/arrow_ccw{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/green/mid_joiner{
+ dir = 1
+ },
+/turf/open/floor/iron/textured_half,
+/area/station/hallway/primary/starboard)
"pQs" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/light/floor,
/turf/open/floor/iron/dark,
/area/station/security/brig)
"pQw" = (
-/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/railing/corner{
dir = 4
},
@@ -54029,18 +65834,36 @@
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
dir = 1
},
-/obj/machinery/firealarm/directional/west,
-/turf/open/floor/iron/dark/textured,
-/area/station/command/gateway)
-"pQB" = (
-/obj/structure/cable,
-/obj/effect/turf_decal/tile/yellow{
+/obj/effect/turf_decal/siding/wideplating_new/dark{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/wideplating_new/dark{
dir = 4
},
-/turf/open/floor/iron/dark/side{
- dir = 10
+/obj/machinery/firealarm/directional/west,
+/turf/open/floor/iron/textured_large,
+/area/station/command/gateway)
+"pQB" = (
+/obj/structure/window/spawner/directional/south,
+/obj/effect/decal/cleanable/confetti,
+/obj/structure/closet/crate/large/hats,
+/turf/open/floor/plating,
+/area/station/maintenance/port/aft)
+"pQC" = (
+/obj/structure/fluff/metalpole{
+ dir = 1;
+ pixel_y = -39
},
-/area/station/engineering/atmos/hfr_room)
+/obj/machinery/door/airlock/external{
+ name = "Port Docking Bay 3"
+ },
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+ dir = 8
+ },
+/turf/open/floor/iron/smooth_edge{
+ dir = 1
+ },
+/area/station/hallway/secondary/entry)
"pQF" = (
/obj/machinery/door/airlock/maintenance{
name = "Security Maintenance"
@@ -54050,14 +65873,25 @@
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer5,
/turf/open/floor/plating,
/area/station/security/mechbay)
+"pQJ" = (
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+ dir = 1
+ },
+/obj/machinery/door/airlock/external{
+ name = "Port Docking Bay 3"
+ },
+/obj/effect/mapping_helpers/airlock/unres,
+/obj/effect/turf_decal/weather/snow,
+/turf/open/floor/plating,
+/area/station/hallway/secondary/entry)
"pRg" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/structure/railing{
dir = 1
},
-/obj/machinery/module_duplicator,
+/obj/machinery/modular_computer/preset/civilian,
/turf/open/floor/iron/white,
/area/station/science/explab)
"pRs" = (
@@ -54076,17 +65910,19 @@
/area/station/engineering/main)
"pRx" = (
/obj/structure/table/reinforced,
-/obj/item/storage/box/pdas{
- pixel_x = 4;
- pixel_y = 4
+/obj/structure/extinguisher_cabinet/directional/west,
+/obj/item/storage/toolbox/mechanical{
+ pixel_x = 1;
+ pixel_y = 7
},
-/obj/item/storage/box/silver_ids{
- pixel_x = 4;
- pixel_y = 6
+/obj/item/storage/toolbox/emergency{
+ pixel_x = 0;
+ pixel_y = 1
},
-/obj/item/storage/box/ids,
-/obj/item/storage/briefcase/secure,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/tile/yellow/anticorner{
+ dir = 1
+ },
+/turf/open/floor/iron/dark/smooth_large,
/area/station/command/bridge)
"pRH" = (
/obj/machinery/requests_console/auto_name/directional/south,
@@ -54103,6 +65939,22 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/white,
/area/station/medical/virology)
+"pSd" = (
+/obj/structure/window/reinforced/spawner/directional/north,
+/obj/structure/window/reinforced/spawner/directional/south,
+/obj/structure/window/reinforced/spawner/directional/west,
+/obj/structure/flora/rock/style_3,
+/obj/item/food/grown/ash_flora/fireblossom{
+ pixel_x = 8;
+ pixel_y = -2;
+ light_on = 0
+ },
+/obj/structure/marker_beacon/bronze{
+ pixel_x = 16;
+ pixel_y = 0
+ },
+/turf/open/floor/fakebasalt,
+/area/station/hallway/secondary/entry)
"pSg" = (
/obj/effect/landmark/start/hangover,
/obj/effect/turf_decal/siding/wood{
@@ -54114,10 +65966,9 @@
/turf/closed/wall,
/area/station/medical/medbay/aft)
"pSp" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
- dir = 1
- },
/obj/effect/decal/cleanable/dirt,
+/obj/structure/closet/crate/secure/loot,
+/obj/effect/turf_decal/bot,
/turf/open/floor/iron,
/area/station/cargo/warehouse)
"pSQ" = (
@@ -54134,36 +65985,50 @@
"pSY" = (
/obj/machinery/gateway/centerstation,
/obj/structure/cable,
+/obj/effect/turf_decal/trimline/dark_blue,
+/obj/structure/marker_beacon/cerulean,
+/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/dark/textured_large,
/area/station/command/gateway)
"pTw" = (
-/obj/effect/landmark/start/hangover,
-/turf/open/floor/iron/white/corner{
+/obj/effect/turf_decal/siding/wood{
dir = 1
},
+/obj/structure/chair/stool/bar/directional/north,
+/obj/effect/landmark/start/hangover,
+/turf/open/floor/wood,
/area/station/hallway/primary/starboard)
"pUe" = (
/obj/structure/disposalpipe/segment,
-/obj/effect/turf_decal/trimline/white/line,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/structure/cable,
+/obj/effect/turf_decal/trimline/white/warning,
/turf/open/floor/wood,
/area/station/hallway/secondary/service)
"pUi" = (
-/obj/effect/turf_decal/trimline/blue/filled/warning{
- dir = 1
- },
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/turf_decal/trimline/blue/filled/warning{
+ dir = 1
+ },
/obj/effect/turf_decal/trimline/blue/filled/line,
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/trimline/white/warning{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/white/line,
+/obj/effect/turf_decal/trimline/blue/filled/mid_joiner,
+/obj/effect/turf_decal/trimline/white/mid_joiner,
+/obj/effect/turf_decal/siding/blue{
+ color = "#8ab4cb"
+ },
+/turf/open/floor/iron/white/smooth_half,
/area/station/medical/treatment_center)
"pUr" = (
/obj/machinery/light_switch/directional/east{
- pixel_x = 27;
- pixel_y = -8
+ pixel_x = 22;
+ pixel_y = -1
},
/turf/open/floor/wood,
/area/station/security/detectives_office)
@@ -54179,8 +66044,6 @@
/turf/open/floor/iron,
/area/station/security/prison)
"pVV" = (
-/obj/structure/window/spawner/directional/north,
-/obj/structure/window/spawner/directional/west,
/obj/machinery/hydroponics/constructable,
/obj/machinery/door/window/left/directional/east,
/obj/effect/turf_decal/siding/thinplating/dark{
@@ -54191,7 +66054,7 @@
"pWm" = (
/obj/structure/frame/machine/secured,
/obj/item/circuitboard/machine/flatpacker,
-/turf/open/floor/iron,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/science/lab)
"pWp" = (
/obj/structure/disposalpipe/segment{
@@ -54216,12 +66079,9 @@
req_access = list("eva");
pixel_y = 26
},
-/turf/open/floor/iron,
+/turf/open/floor/iron/large,
/area/station/ai_monitored/command/storage/eva)
"pXE" = (
-/obj/machinery/door/airlock/maintenance{
- name = "Detective Maintenance"
- },
/obj/effect/mapping_helpers/airlock/unres{
dir = 8
},
@@ -54230,20 +66090,57 @@
dir = 4
},
/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance,
+/obj/effect/turf_decal/trimline/dark_blue/filled/corner{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/dark_blue/filled/corner{
+ dir = 4
+ },
+/obj/machinery/door/airlock/maintenance{
+ name = "Detective Maintenance"
+ },
/turf/open/floor/plating,
/area/station/maintenance/fore)
"pXJ" = (
-/obj/effect/spawner/structure/window/reinforced,
+/obj/structure/window/reinforced/spawner/directional/south,
+/obj/structure/hedge,
+/obj/structure/window/reinforced/spawner/directional/north,
+/obj/structure/window/reinforced/spawner/directional/west,
/turf/open/floor/plating,
-/area/station/medical/medbay/central)
+/area/station/medical/medbay/lobby)
"pXN" = (
-/obj/structure/table,
-/obj/item/coin/silver,
-/obj/item/folder/yellow,
-/obj/item/pen/red,
-/obj/item/stamp/head/qm,
-/turf/open/floor/carpet/royalblack,
+/obj/machinery/modular_computer/preset/id{
+ dir = 1
+ },
+/obj/item/paper_bin/carbon{
+ pixel_x = -14;
+ pixel_y = 1
+ },
+/obj/item/pen{
+ pixel_x = -13;
+ pixel_y = 4
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 8
+ },
+/turf/open/floor/carpet/red,
/area/station/command/heads_quarters/qm)
+"pYw" = (
+/obj/effect/turf_decal/trimline/dark_blue/arrow_ccw{
+ dir = 1;
+ alpha = 200
+ },
+/obj/effect/turf_decal/trimline/dark_blue/mid_joiner{
+ dir = 1;
+ alpha = 200
+ },
+/turf/open/floor/iron/edge{
+ dir = 1
+ },
+/area/station/hallway/primary/port)
"pZw" = (
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/neutral{
@@ -54292,24 +66189,28 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/plating,
/area/station/security/prison)
+"qaE" = (
+/obj/effect/turf_decal/siding/wideplating_new/dark/corner,
+/obj/effect/turf_decal/siding/wideplating_new/dark/corner{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/wood{
+ dir = 5
+ },
+/obj/structure/chair/comfy/shuttle{
+ pixel_y = 0;
+ dir = 4;
+ name = "adjustable office seat";
+ desc = "A comfortable, secure seat. It has a more sturdy looking buckling system, for smoother working sessions."
+ },
+/turf/open/floor/carpet/executive,
+/area/station/command/heads_quarters/captain)
"qaJ" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 4
},
/turf/open/floor/iron/dark/textured,
/area/station/science/genetics)
-"qaL" = (
-/obj/machinery/camera/directional/south{
- c_tag = "Cargo Bay South";
- network = list("ss13","cargo")
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
- dir = 8
- },
-/obj/structure/cable,
-/turf/open/floor/iron,
-/area/station/cargo/storage)
"qaR" = (
/turf/closed/wall/r_wall,
/area/station/hallway/primary/central)
@@ -54342,6 +66243,7 @@
req_access = list("medical");
name = "First-Aid Supplies"
},
+/obj/effect/mapping_helpers/airlock/red_alert_access,
/turf/open/floor/iron/dark,
/area/station/medical/storage)
"qaX" = (
@@ -54370,11 +66272,10 @@
/obj/effect/turf_decal/stripes/red/line,
/turf/open/floor/engine,
/area/station/science/explab)
+"qbT" = (
+/turf/open/floor/iron/textured_corner,
+/area/station/hallway/primary/starboard)
"qcm" = (
-/obj/effect/turf_decal/tile/yellow,
-/obj/effect/turf_decal/tile/brown{
- dir = 8
- },
/obj/structure/rack,
/obj/item/shovel{
pixel_x = -5
@@ -54382,7 +66283,7 @@
/obj/item/pickaxe{
pixel_x = 5
},
-/turf/open/floor/iron,
+/turf/open/floor/iron/dark/textured_large,
/area/station/cargo/miningdock)
"qcC" = (
/obj/structure/sign/warning/pods/directional/east,
@@ -54420,6 +66321,10 @@
dir = 4
},
/area/station/commons/fitness)
+"qdd" = (
+/obj/structure/bed/maint,
+/turf/open/floor/iron/dark/smooth_large,
+/area/station/maintenance/aft)
"qds" = (
/obj/structure/cable,
/obj/structure/disposalpipe/segment{
@@ -54458,15 +66363,23 @@
/turf/open/floor/iron/dark,
/area/station/commons/dorms/apartment2)
"qdH" = (
-/obj/structure/extinguisher_cabinet{
- pixel_y = 30
- },
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
/obj/effect/turf_decal/trimline/dark_blue/filled/line{
dir = 1
},
+/obj/structure/extinguisher_cabinet/directional/north,
+/obj/effect/turf_decal/trimline/dark/line{
+ dir = 1
+ },
/turf/open/floor/iron/dark,
/area/station/security/execution/transfer)
+"qdM" = (
+/obj/structure/grille/broken,
+/obj/machinery/atmospherics/pipe/layer_manifold/cyan/hidden{
+ dir = 8
+ },
+/turf/open/floor/plating,
+/area/station/maintenance/aft)
"qdS" = (
/obj/effect/landmark/start/hangover,
/turf/open/floor/carpet,
@@ -54506,7 +66419,9 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 4
},
-/turf/open/floor/iron,
+/turf/open/floor/iron/edge{
+ dir = 1
+ },
/area/station/hallway/primary/central)
"qeE" = (
/obj/effect/decal/cleanable/wrapping/pinata/syndie,
@@ -54516,10 +66431,28 @@
/obj/machinery/light/small/dim/directional/east,
/turf/open/floor/carpet/blue,
/area/station/maintenance/dorm_room)
+"qff" = (
+/obj/effect/landmark/start/hangover,
+/obj/effect/turf_decal/trimline/brown/corner{
+ dir = 1
+ },
+/turf/open/floor/iron/textured_corner{
+ dir = 8
+ },
+/area/station/hallway/primary/starboard)
"qfj" = (
/obj/structure/railing,
/obj/machinery/light/directional/north,
-/turf/open/floor/iron/dark/textured,
+/obj/structure/rack,
+/obj/item/assembly/infra{
+ pixel_x = -4;
+ pixel_y = 2
+ },
+/obj/item/assembly/signaler{
+ pixel_x = 6;
+ pixel_y = 4
+ },
+/turf/open/floor/iron/dark/textured_large,
/area/station/command/gateway)
"qfo" = (
/obj/structure/chair/sofa/bench/right{
@@ -54528,16 +66461,41 @@
/turf/open/floor/iron/dark/textured_large,
/area/station/hallway/primary/central)
"qfs" = (
+/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/components/unary/portables_connector/visible{
dir = 8
},
-/obj/effect/decal/cleanable/dirt,
+/obj/machinery/portable_atmospherics/canister/carbon_dioxide,
/turf/open/floor/iron,
/area/station/maintenance/starboard)
"qfK" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/iron/dark,
+/obj/effect/turf_decal/stripes{
+ dir = 8
+ },
+/obj/effect/turf_decal/stripes/blue/line{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/dark_blue/filled/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/dark_blue/filled/corner{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/wideplating_new/dark/corner{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/wideplating_new/dark/corner{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/dark/corner{
+ dir = 8
+ },
+/turf/open/floor/iron/dark/small,
/area/station/security/checkpoint/escape)
"qfR" = (
/obj/structure/disposalpipe/segment,
@@ -54549,6 +66507,10 @@
/area/station/service/janitor)
"qgu" = (
/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 8
+ },
/turf/open/floor/plating,
/area/station/maintenance/solars/starboard/fore)
"qgC" = (
@@ -54566,14 +66528,19 @@
},
/area/station/hallway/primary/central/fore)
"qgQ" = (
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
- dir = 4
+/obj/effect/turf_decal/trimline/blue/filled/warning{
+ alpha = 160;
+ dir = 6
},
-/obj/effect/turf_decal/tile/blue{
- dir = 8
+/obj/effect/turf_decal/trimline/white/warning{
+ dir = 6
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/cable,
+/turf/open/floor/iron/white/smooth_corner{
+ dir = 1
},
-/turf/open/floor/iron/white,
/area/station/medical/medbay/lobby)
"qgX" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
@@ -54609,6 +66576,19 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
/area/station/maintenance/port/aft)
+"qhV" = (
+/obj/structure/table/reinforced,
+/obj/structure/window/reinforced/spawner/directional/north,
+/obj/effect/turf_decal/stripes/line{
+ dir = 5
+ },
+/obj/effect/turf_decal/stripes/white/line{
+ color = "#a56dc2";
+ dir = 10
+ },
+/obj/item/storage/bag/xeno,
+/turf/open/floor/iron/dark/smooth_large,
+/area/station/science/xenobiology)
"qii" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -54620,7 +66600,20 @@
dir = 10
},
/obj/structure/cable,
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/siding/dark{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/dark/filled/warning{
+ alpha = 160;
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/purple/warning{
+ alpha = 200;
+ dir = 4
+ },
+/turf/open/floor/iron/white/smooth_edge{
+ dir = 4
+ },
/area/station/science/research)
"qil" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -54628,17 +66621,37 @@
/obj/structure/cable,
/turf/open/floor/iron/dark,
/area/station/security/office)
-"qjL" = (
-/obj/effect/turf_decal/tile/blue{
+"qjv" = (
+/obj/effect/turf_decal/bot,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 4
},
-/obj/effect/turf_decal/tile/blue{
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/obj/structure/cable,
+/turf/open/floor/iron/edge,
+/area/station/hallway/secondary/entry)
+"qjz" = (
+/obj/effect/turf_decal/trimline/brown/filled/line{
dir = 1
},
+/turf/open/floor/iron/textured_edge,
+/area/station/cargo/storage)
+"qjL" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/trimline/blue/filled/warning{
+ alpha = 160;
+ dir = 5
+ },
+/obj/effect/turf_decal/trimline/white/warning{
+ dir = 5
+ },
+/turf/open/floor/iron/white/smooth_corner{
+ dir = 8
+ },
/area/station/medical/medbay/lobby)
"qjU" = (
/obj/machinery/door/airlock/external{
@@ -54654,21 +66667,22 @@
/turf/open/floor/plating,
/area/station/hallway/secondary/entry)
"qkc" = (
-/obj/effect/turf_decal/siding/thinplating/light{
- dir = 4
- },
-/turf/open/floor/iron,
+/obj/machinery/nanite_programmer,
+/turf/open/floor/iron/white,
/area/station/science/explab)
"qkI" = (
/obj/machinery/photocopier/prebuilt,
/turf/open/floor/wood,
/area/station/service/library)
"qly" = (
-/obj/effect/turf_decal/tile/red,
-/obj/structure/chair/stool{
+/obj/structure/sign/poster/official/here_for_your_safety/directional/east,
+/obj/structure/chair{
dir = 1
},
-/turf/open/floor/iron/dark,
+/obj/effect/turf_decal/siding/wood{
+ dir = 6
+ },
+/turf/open/floor/wood/tile,
/area/station/hallway/primary/fore)
"qlB" = (
/obj/machinery/atmospherics/pipe/smart/simple/green/visible{
@@ -54699,7 +66713,8 @@
"qmt" = (
/obj/structure/cable,
/obj/structure/chair/stool/directional/south,
-/turf/open/floor/carpet/royalblack,
+/obj/effect/turf_decal/siding/dark/end,
+/turf/open/floor/carpet/red,
/area/station/command/heads_quarters/qm)
"qmy" = (
/obj/effect/turf_decal/siding/purple,
@@ -54727,23 +66742,25 @@
/turf/open/floor/plating,
/area/station/security/office)
"qnW" = (
-/obj/effect/turf_decal/tile/yellow,
-/obj/effect/turf_decal/tile/yellow{
- dir = 8
- },
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron/white,
+/obj/structure/disposalpipe/segment,
+/obj/effect/turf_decal/stripes,
+/turf/open/floor/iron/dark/small,
/area/station/medical/pharmacy)
"qnX" = (
/obj/structure/chair/sofa/corp/corner{
dir = 4
},
/obj/machinery/camera/directional/west,
-/obj/effect/landmark/start/hangover,
/turf/open/floor/iron/grimy,
/area/station/security/detectives_office)
+"qoa" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/turf_decal/siding/wood,
+/turf/open/floor/wood,
+/area/station/security/prison)
"qoF" = (
/obj/machinery/door/poddoor/shutters/preopen{
id = "lawyerprivacy";
@@ -54769,18 +66786,10 @@
/turf/open/floor/iron,
/area/station/commons/dorms/apartment2)
"qpx" = (
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
/obj/machinery/computer/operating,
/obj/machinery/airalarm/directional/north,
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/tile/blue/full,
+/turf/open/floor/iron/large,
/area/station/medical/surgery)
"qpF" = (
/obj/effect/mapping_helpers/burnt_floor,
@@ -54788,6 +66797,12 @@
/obj/structure/cable,
/turf/open/floor/plating,
/area/station/maintenance/fore)
+"qpV" = (
+/obj/effect/turf_decal/siding/dark{
+ dir = 9
+ },
+/turf/open/floor/iron/dark/smooth_corner,
+/area/station/maintenance/starboard/aft)
"qqr" = (
/obj/structure/mirror/directional/east,
/obj/structure/bed/pod{
@@ -54835,6 +66850,17 @@
dir = 5
},
/area/station/commons/fitness)
+"qqN" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 6
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 6
+ },
+/turf/open/floor/plating,
+/area/station/maintenance/port/aft)
"qqW" = (
/obj/structure/rack,
/obj/machinery/status_display/evac{
@@ -54876,19 +66902,33 @@
dir = 1
},
/obj/structure/table/reinforced,
-/obj/machinery/door/firedoor,
/obj/item/folder/white,
/obj/item/pen,
-/obj/machinery/door/window/right/directional/west{
- req_access = list("pharmacy");
- name = "Pharmacy Desk"
- },
/obj/machinery/door/poddoor/shutters/preopen{
id = "pharmacy_shutters";
name = "Pharmacy Shutters";
dir = 4
},
-/turf/open/floor/iron,
+/obj/item/toy/figure/chemist{
+ pixel_x = 10;
+ pixel_y = -16;
+ name = "\improper Badass Chemist action figure"
+ },
+/obj/machinery/door/window/right/directional/west{
+ req_access = list("pharmacy");
+ name = "Pharmacy Desk"
+ },
+/obj/machinery/door/window/left/directional/east{
+ name = "Pharmacy Desk"
+ },
+/obj/structure/desk_bell/speed_demon{
+ pixel_x = 5;
+ pixel_y = 10
+ },
+/obj/machinery/door/firedoor/border_only{
+ dir = 4
+ },
+/turf/open/floor/iron/dark/smooth_large,
/area/station/medical/pharmacy)
"qrM" = (
/obj/effect/turf_decal/box/white{
@@ -54903,12 +66943,30 @@
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/turf_decal/trimline/dark/corner{
+ dir = 8
+ },
/turf/open/floor/iron/dark,
/area/station/security/execution/transfer)
+"qrY" = (
+/obj/structure/disposalpipe/segment,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/turf/open/floor/iron/dark,
+/area/station/maintenance/port/aft)
"qsj" = (
/obj/structure/table,
/obj/machinery/recharger,
-/turf/open/floor/iron,
+/obj/item/reagent_containers/cup/blastoff_ampoule{
+ pixel_x = 9;
+ pixel_y = 1;
+ desc = "I CAN QUIT ANY TIME I WANT!";
+ list_reagents = list(/datum/reagent/drug/blastoff = 50);
+ name = "extended bLaSToFF ampoule"
+ },
+/turf/open/floor/iron/dark/smooth_large,
/area/station/command/gateway)
"qsl" = (
/obj/effect/spawner/structure/window/reinforced/tinted,
@@ -54926,7 +66984,40 @@
/obj/effect/mapping_helpers/airlock/access/any/engineering/general,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/dark,
-/area/station/engineering/main)
+/area/station/engineering/supermatter/room)
+"qsw" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/blue/filled/line{
+ alpha = 160;
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/dark_blue/line{
+ alpha = 200;
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/blue/filled/mid_joiner{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/blue/filled/mid_joiner{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/dark_blue/mid_joiner{
+ dir = 1
+ },
+/obj/machinery/firealarm/directional/north,
+/turf/open/floor/iron/white/smooth_edge{
+ dir = 1
+ },
+/area/station/medical/medbay/central)
"qti" = (
/obj/structure/trash_pile,
/obj/effect/decal/cleanable/cobweb/cobweb2,
@@ -54937,7 +67028,31 @@
dir = 4
},
/obj/effect/mapping_helpers/mail_sorting/science/research,
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/trimline/dark/filled/mid_joiner{
+ dir = 4;
+ alpha = 160
+ },
+/obj/effect/turf_decal/trimline/dark/filled/mid_joiner{
+ dir = 2;
+ alpha = 160
+ },
+/obj/effect/turf_decal/trimline/dark/filled/mid_joiner{
+ dir = 1;
+ alpha = 160
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 6
+ },
+/obj/effect/turf_decal/trimline/dark/filled/line{
+ alpha = 160;
+ dir = 6
+ },
+/obj/effect/turf_decal/trimline/purple/line{
+ color = "#700047";
+ alpha = 200;
+ dir = 6
+ },
+/turf/open/floor/iron/white/smooth_large,
/area/station/science/lab)
"qtN" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -54950,12 +67065,6 @@
/turf/open/floor/grass,
/area/station/service/hydroponics/garden/abandoned)
"qtX" = (
-/obj/effect/turf_decal/trimline/yellow/filled/warning{
- dir = 4
- },
-/obj/effect/turf_decal/trimline/yellow/filled/line{
- dir = 1
- },
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 4
@@ -54963,8 +67072,34 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 8
},
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/trimline/yellow/filled/warning{
+ alpha = 120;
+ dir = 5;
+ pixel_y = 0
+ },
+/obj/effect/turf_decal/trimline/blue/warning{
+ dir = 5
+ },
+/obj/effect/turf_decal/trimline/blue/warning{
+ dir = 5;
+ alpha = 200
+ },
+/turf/open/floor/iron/white/smooth_corner{
+ dir = 8
+ },
/area/station/medical/medbay/central)
+"qum" = (
+/obj/structure/disposalpipe/segment{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/obj/structure/railing/corner/end/flip{
+ dir = 4
+ },
+/turf/open/floor/plating,
+/area/station/maintenance/port/aft)
"quB" = (
/obj/structure/closet{
name = "Evidence Closet"
@@ -54972,6 +67107,17 @@
/obj/effect/spawner/random/maintenance/eight,
/turf/open/floor/plating,
/area/station/security/prison)
+"quD" = (
+/obj/effect/turf_decal/trimline/yellow/line{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/yellow/mid_joiner{
+ dir = 8
+ },
+/turf/open/floor/iron/edge{
+ dir = 8
+ },
+/area/station/hallway/primary/central)
"quE" = (
/obj/effect/turf_decal/tile/neutral{
dir = 8
@@ -54984,6 +67130,12 @@
/obj/structure/disposalpipe/segment{
dir = 6
},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 9
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 9
+ },
/turf/open/floor/plating,
/area/station/maintenance/starboard/aft)
"qvD" = (
@@ -54991,16 +67143,28 @@
dir = 4
},
/obj/item/radio/intercom/directional/south,
-/turf/open/floor/iron,
+/turf/open/floor/iron/edge,
/area/station/hallway/primary/central)
+"qvV" = (
+/obj/item/radio/intercom/directional/north,
+/obj/effect/turf_decal/trimline/blue/filled/line{
+ dir = 1
+ },
+/turf/open/floor/iron,
+/area/station/hallway/secondary/entry)
"qwa" = (
/obj/structure/extinguisher_cabinet/directional/north,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/blue/corner{
+ dir = 4
+ },
+/turf/open/floor/iron/textured_corner{
+ dir = 8
+ },
/area/station/hallway/primary/port)
"qwf" = (
/obj/structure/rack/gunrack,
-/obj/effect/spawner/armory_spawn/microfusion,
/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/effect/spawner/random/armory/e_gun,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/security/armory)
"qwO" = (
@@ -55011,6 +67175,17 @@
},
/turf/open/floor/circuit,
/area/station/ai_monitored/turret_protected/ai)
+"qwW" = (
+/obj/effect/turf_decal/trimline/brown/filled/warning{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/dark/warning{
+ dir = 8
+ },
+/turf/open/floor/iron/dark/side{
+ dir = 4
+ },
+/area/station/cargo/miningdock)
"qwZ" = (
/turf/closed/wall,
/area/station/commons/fitness/recreation)
@@ -55047,6 +67222,16 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/dark,
/area/station/security/warden)
+"qzx" = (
+/obj/effect/turf_decal/trimline/blue/filled/corner{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer5,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 5
+ },
+/turf/open/floor/iron,
+/area/station/hallway/secondary/entry)
"qzF" = (
/obj/effect/landmark/start/station_engineer,
/turf/open/floor/iron/smooth_corner{
@@ -55073,6 +67258,9 @@
id = "transferflash";
pixel_y = 24
},
+/obj/effect/turf_decal/trimline/dark/warning{
+ dir = 5
+ },
/turf/open/floor/iron/dark,
/area/station/security/execution/transfer)
"qzX" = (
@@ -55080,12 +67268,11 @@
/turf/open/floor/plating,
/area/station/maintenance/starboard)
"qAp" = (
-/obj/machinery/atmospherics/components/binary/pump{
- dir = 4;
- name = "Injector Intake"
+/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer4{
+ dir = 1
},
-/turf/open/floor/iron/white,
-/area/station/science/xenobiology)
+/turf/open/floor/plating,
+/area/station/maintenance/port/aft)
"qAv" = (
/obj/machinery/camera/directional/south{
c_tag = "Prison - Cell 4";
@@ -55097,6 +67284,14 @@
/obj/machinery/airalarm/directional/south,
/turf/open/floor/iron,
/area/station/security/prison/safe)
+"qAw" = (
+/obj/effect/turf_decal/trimline/brown/filled/line{
+ dir = 8
+ },
+/turf/open/floor/iron/textured_edge{
+ dir = 4
+ },
+/area/station/cargo/office)
"qBb" = (
/obj/structure/drain,
/obj/machinery/shower/directional/west{
@@ -55129,12 +67324,20 @@
/obj/effect/decal/cleanable/blood/oil/slippery,
/turf/open/floor/plating,
/area/station/maintenance/department/electrical)
+"qCl" = (
+/obj/structure/lattice,
+/obj/structure/chair/plastic{
+ dir = 8;
+ pixel_y = -9
+ },
+/turf/open/space/basic,
+/area/space/nearstation)
"qCr" = (
/obj/machinery/research/anomaly_refinery,
/obj/effect/turf_decal/bot,
/obj/item/radio/intercom/directional/north,
/turf/open/floor/iron,
-/area/station/science/ordnance/bomb)
+/area/station/science/ordnance/testlab)
"qCU" = (
/obj/machinery/camera/directional/north{
c_tag = "Courtroom North"
@@ -55177,13 +67380,18 @@
/area/station/common/pool/sauna)
"qDq" = (
/obj/structure/cable,
-/mob/living/basic/sloth/paperwork,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/brown/filled/line{
+ dir = 1
+ },
+/turf/open/floor/iron/textured_edge,
/area/station/cargo/storage)
"qEg" = (
/obj/effect/turf_decal/trimline/dark_blue/filled/line{
dir = 1
},
+/obj/effect/turf_decal/trimline/dark/line{
+ dir = 1
+ },
/turf/open/floor/iron/dark,
/area/station/security/brig)
"qEv" = (
@@ -55197,6 +67405,9 @@
/obj/effect/turf_decal/trimline/dark_blue/filled/warning{
dir = 8
},
+/obj/effect/turf_decal/trimline/dark/warning{
+ dir = 8
+ },
/turf/open/floor/iron/dark,
/area/station/security/execution/transfer)
"qEE" = (
@@ -55206,10 +67417,10 @@
/turf/open/floor/iron/dark,
/area/station/hallway/secondary/exit)
"qEJ" = (
+/obj/structure/cable,
/obj/effect/turf_decal/plaque{
icon_state = "L2"
},
-/obj/structure/cable,
/turf/open/floor/iron,
/area/station/hallway/primary/central)
"qEN" = (
@@ -55231,29 +67442,93 @@
/obj/structure/cable,
/turf/open/floor/wood,
/area/station/service/library/abandoned)
-"qFo" = (
-/obj/effect/turf_decal/stripes/line{
+"qFh" = (
+/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron,
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 1
+ },
+/turf/open/floor/plating,
+/area/station/maintenance/aft)
+"qFo" = (
+/obj/effect/turf_decal/trimline/brown/filled/corner,
+/obj/effect/turf_decal/trimline/brown/filled/corner{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/dark/corner{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/dark/corner,
+/obj/machinery/atmospherics/components/unary/airlock_pump{
+ dir = 4
+ },
+/turf/open/floor/iron/dark/side{
+ dir = 8
+ },
/area/station/cargo/miningdock)
+"qFz" = (
+/obj/machinery/door/airlock/maintenance,
+/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance,
+/obj/effect/turf_decal/siding/white/corner{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/white/corner,
+/obj/machinery/door/firedoor,
+/obj/machinery/newscaster/directional/east,
+/obj/effect/mapping_helpers/airlock/unres{
+ dir = 1
+ },
+/turf/open/floor/iron/shuttle/exploration/hazard,
+/area/station/hallway/secondary/entry)
"qFL" = (
/obj/machinery/airalarm/directional/south,
/obj/structure/disposalpipe/segment{
dir = 4
},
-/turf/open/floor/iron/dark,
+/obj/item/storage/toolbox/emergency{
+ pixel_y = -5;
+ pixel_x = -2
+ },
+/obj/item/storage/toolbox/mechanical{
+ pixel_x = -2;
+ pixel_y = -1
+ },
+/obj/item/storage/toolbox/mechanical{
+ pixel_x = -2;
+ pixel_y = -1
+ },
+/obj/item/storage/toolbox/electrical{
+ pixel_x = -2;
+ pixel_y = 6
+ },
+/obj/structure/table/reinforced,
+/obj/item/storage/belt/utility,
+/obj/structure/window/reinforced/spawner/directional/east,
+/obj/machinery/door/window/left/directional/north{
+ req_access = list("eva");
+ name = "Tools Storage"
+ },
+/obj/effect/mapping_helpers/airlock/red_alert_access,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/ai_monitored/command/storage/eva)
"qFY" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
- dir = 4
- },
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 4
},
/obj/structure/cable,
/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer5,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
/turf/open/floor/plating,
/area/station/maintenance/starboard)
"qGx" = (
@@ -55269,6 +67544,25 @@
/obj/effect/spawner/structure/window/reinforced/tinted,
/turf/open/floor/plating,
/area/station/security/prison)
+"qGQ" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/blue/filled/corner{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/blue/filled/corner{
+ dir = 1
+ },
+/turf/open/floor/iron/edge,
+/area/station/hallway/secondary/entry)
+"qGU" = (
+/obj/effect/turf_decal/trimline/blue/corner{
+ dir = 1
+ },
+/obj/machinery/firealarm/directional/north,
+/turf/open/floor/iron/corner,
+/area/station/hallway/primary/central)
"qGW" = (
/obj/structure/table/reinforced,
/obj/machinery/door/poddoor/shutters/preopen{
@@ -55292,10 +67586,6 @@
/turf/open/floor/iron/smooth_large,
/area/station/engineering/gravity_generator)
"qHo" = (
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
-/obj/effect/turf_decal/tile/blue,
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 10
@@ -55303,6 +67593,8 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 6
},
+/obj/effect/turf_decal/siding,
+/obj/effect/turf_decal/trimline/blue/filled/warning,
/turf/open/floor/iron/white,
/area/station/medical/surgery/fore)
"qHq" = (
@@ -55311,29 +67603,38 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron,
/area/station/security/prison/safe)
-"qHw" = (
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
- dir = 8
+"qHu" = (
+/obj/machinery/door/airlock/external{
+ name = "External Access"
},
-/obj/effect/turf_decal/tile/blue{
+/obj/effect/mapping_helpers/airlock/access/any/supply/general,
+/obj/effect/mapping_helpers/airlock/unres{
dir = 4
},
-/obj/effect/turf_decal/tile/blue{
- dir = 1
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+ dir = 4;
+ late = 8
},
-/obj/structure/table/glass,
-/obj/structure/extinguisher_cabinet{
- pixel_x = -5;
- pixel_y = 30
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 6
},
-/obj/item/reagent_containers/cup/bottle/epinephrine,
-/obj/item/reagent_containers/cup/bottle/multiver{
- pixel_x = 6
- },
-/obj/item/reagent_containers/syringe,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer4,
+/turf/open/floor/plating,
+/area/station/maintenance/port/aft)
+"qHw" = (
/obj/machinery/light/directional/east,
-/turf/open/floor/iron,
+/obj/item/stack/medical/gauze{
+ pixel_x = -2;
+ pixel_y = 8
+ },
+/obj/item/stack/medical/mesh{
+ pixel_x = 6;
+ pixel_y = 5
+ },
+/obj/item/stack/medical/suture,
+/obj/effect/turf_decal/tile/blue/full,
+/obj/structure/table/glass,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/medical/treatment_center)
"qHL" = (
/obj/machinery/light_switch/directional/west,
@@ -55346,22 +67647,23 @@
/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{
dir = 5
},
-/obj/effect/turf_decal/tile/yellow{
- dir = 1
+/obj/effect/turf_decal/trimline/yellow/filled/line{
+ dir = 9
},
-/obj/effect/turf_decal/tile/blue{
- dir = 8
+/obj/effect/turf_decal/trimline/dark_blue/line{
+ alpha = 200;
+ dir = 9
},
-/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
-/turf/open/floor/iron/dark/corner,
+/turf/open/floor/iron/dark,
/area/station/engineering/atmos/hfr_room)
"qHR" = (
/obj/effect/turf_decal/trimline/dark_blue/filled/line{
dir = 1
},
/obj/machinery/computer/security/telescreen/interrogation/directional/north,
+/obj/effect/turf_decal/trimline/dark/line{
+ dir = 1
+ },
/turf/open/floor/iron/dark,
/area/station/security/brig)
"qHX" = (
@@ -55383,8 +67685,23 @@
/area/station/command/heads_quarters/hos)
"qIl" = (
/obj/machinery/airalarm/directional/west,
+/obj/item/toy/figure/atmos,
+/obj/structure/closet/crate/radiation,
+/obj/structure/sign/warning/radiation/directional/north,
+/obj/effect/turf_decal/bot,
/turf/open/floor/iron/dark,
/area/station/engineering/atmos/hfr_room)
+"qIB" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/yellow/corner,
+/obj/effect/turf_decal/siding/white/corner{
+ color = "#8b8b8b";
+ dir = 1
+ },
+/turf/open/floor/iron/edge,
+/area/station/hallway/primary/central)
"qJn" = (
/obj/structure/table/reinforced,
/obj/machinery/door/firedoor,
@@ -55395,18 +67712,32 @@
/obj/item/paper/guides/jobs/holopad_hydro,
/turf/open/floor/iron,
/area/station/service/hydroponics)
-"qJG" = (
-/obj/machinery/door/airlock{
- name = "Unisex Restrooms"
+"qJs" = (
+/obj/effect/turf_decal/siding/dark{
+ dir = 9
},
+/obj/effect/turf_decal/siding/dark/corner,
+/turf/open/floor/circuit/green,
+/area/station/ai_monitored/turret_protected/ai_upload)
+"qJE" = (
+/obj/structure/fluff/metalpole,
+/obj/structure/fans/tiny/forcefield{
+ dir = 4
+ },
+/turf/open/floor/plating,
+/area/station/hallway/secondary/entry)
+"qJG" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 4
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 4
},
+/obj/machinery/door/airlock{
+ name = "Unisex Restrooms"
+ },
/obj/effect/landmark/navigate_destination,
-/turf/open/floor/mineral/titanium/blue,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/commons/toilet)
"qKp" = (
/obj/machinery/power/apc/auto_name/directional/north,
@@ -55424,27 +67755,51 @@
/turf/open/floor/engine,
/area/station/engineering/supermatter)
"qKx" = (
-/obj/structure/cable,
-/obj/machinery/status_display/evac/directional/east,
+/obj/machinery/firealarm/directional/east,
+/obj/effect/turf_decal/trimline/blue/filled/line{
+ dir = 4
+ },
/obj/machinery/light/directional/east,
/turf/open/floor/iron,
/area/station/hallway/secondary/entry)
"qKV" = (
/obj/item/weldingtool/makeshift,
/obj/effect/decal/cleanable/dirt,
+/obj/machinery/light/small/directional/north,
/turf/open/floor/plating,
/area/station/security/prison)
+"qKY" = (
+/obj/effect/turf_decal/siding/dark{
+ dir = 8
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 5
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 4
+ },
+/turf/open/floor/engine,
+/area/station/science/xenobiology)
"qLd" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 4
},
-/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/white,
/area/station/science/explab)
"qLk" = (
-/obj/machinery/computer/cargo,
-/turf/open/floor/carpet/royalblack,
+/obj/machinery/door/window/right/directional/west{
+ req_access = list("qm");
+ name = "Terrarium"
+ },
+/obj/structure/marker_beacon/teal{
+ pixel_x = 16;
+ pixel_y = -16
+ },
+/obj/effect/turf_decal/siding/thinplating/dark{
+ dir = 9
+ },
+/turf/open/floor/grass,
/area/station/command/heads_quarters/qm)
"qLu" = (
/obj/structure/cable,
@@ -55468,9 +67823,13 @@
/turf/open/floor/plating,
/area/station/maintenance/solars/starboard/fore)
"qLx" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/cable,
+/obj/effect/turf_decal/trimline/blue/filled/corner{
+ alpha = 160;
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/white/corner{
+ dir = 4
+ },
/turf/open/floor/iron/white,
/area/station/medical/medbay/lobby)
"qLI" = (
@@ -55503,18 +67862,30 @@
/turf/open/floor/wood,
/area/station/maintenance/abandon_cafeteria)
"qLY" = (
-/obj/effect/turf_decal/trimline/blue/filled/line{
- dir = 8
- },
/obj/machinery/iv_drip,
-/obj/structure/extinguisher_cabinet{
- pixel_x = -27;
- pixel_y = 1
- },
/obj/item/radio/intercom/directional/north,
/obj/machinery/light/directional/west,
/obj/effect/spawner/random/medical/patient_stretcher,
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/siding/corner,
+/obj/structure/extinguisher_cabinet/directional/west,
+/obj/effect/turf_decal/trimline/blue/filled/line{
+ alpha = 160;
+ dir = 9
+ },
+/obj/effect/turf_decal/trimline/white/line{
+ dir = 9
+ },
+/obj/effect/turf_decal/trimline/blue/filled/mid_joiner{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/blue/filled/mid_joiner{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/blue/filled/mid_joiner{
+ dir = 8;
+ alpha = 160
+ },
+/turf/open/floor/iron/white/smooth_corner,
/area/station/medical/medbay/central)
"qMc" = (
/obj/structure/cable,
@@ -55577,18 +67948,22 @@
/turf/open/floor/plating,
/area/station/maintenance/starboard/fore)
"qOh" = (
-/obj/effect/turf_decal/tile/brown/anticorner/contrasted,
+/obj/effect/turf_decal/trimline/brown/filled/line{
+ dir = 6
+ },
+/obj/effect/turf_decal/trimline/dark/line{
+ dir = 6
+ },
+/obj/machinery/light_switch/directional/east,
/turf/open/floor/iron,
/area/station/cargo/warehouse)
"qOM" = (
-/obj/machinery/atmospherics/pipe/layer_manifold/supply/hidden{
- dir = 1
- },
+/obj/effect/mapping_helpers/airlock/access/any/security/maintenance,
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/layer_manifold/cyan/hidden,
/obj/machinery/door/airlock/atmos{
name = "Atmospherics Maintenance"
},
-/obj/effect/mapping_helpers/airlock/access/any/security/maintenance,
-/obj/structure/cable,
/turf/open/floor/plating,
/area/station/maintenance/fore)
"qOZ" = (
@@ -55608,17 +67983,42 @@
},
/turf/open/floor/iron/dark,
/area/station/service/chapel)
-"qPT" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/public/glass{
- name = "Central Access"
+"qPx" = (
+/obj/effect/turf_decal/trimline/dark/filled/line{
+ alpha = 160;
+ dir = 1
},
+/obj/effect/turf_decal/trimline/dark/filled/mid_joiner{
+ dir = 1;
+ alpha = 160
+ },
+/obj/effect/turf_decal/trimline/purple/line{
+ alpha = 200;
+ dir = 1;
+ color = "#a56dc2"
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 1
+ },
+/obj/machinery/atmospherics/components/binary/pump{
+ dir = 8;
+ name = "Injector Intake"
+ },
+/turf/open/floor/iron/white/smooth_edge{
+ dir = 1
+ },
+/area/station/science/xenobiology)
+"qPT" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 4
},
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron,
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/public/glass{
+ name = "Central Access"
+ },
+/turf/open/floor/iron/large,
/area/station/hallway/primary/central)
"qQo" = (
/obj/structure/table/wood,
@@ -55632,6 +68032,19 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/dark,
/area/station/security/courtroom)
+"qQD" = (
+/obj/structure/marker_beacon/cerulean{
+ pixel_y = -15
+ },
+/obj/item/kirbyplants/synthetic/plant27,
+/obj/effect/turf_decal/siding/thinplating_new/dark{
+ dir = 10
+ },
+/obj/effect/turf_decal/siding/thinplating_new/dark{
+ dir = 5
+ },
+/turf/open/floor/plating/cobblestone,
+/area/station/hallway/secondary/entry)
"qQF" = (
/obj/machinery/camera/directional/north{
c_tag = "Science Ordnance Launch";
@@ -55659,7 +68072,7 @@
pixel_x = 11
},
/turf/open/floor/iron,
-/area/station/science/ordnance/bomb)
+/area/station/science/ordnance/testlab)
"qQH" = (
/obj/effect/spawner/random/clothing/bowler_or_that,
/obj/structure/rack,
@@ -55668,20 +68081,32 @@
"qQI" = (
/obj/structure/closet/secure_closet/personal,
/obj/item/radio/intercom/directional/east,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/tile/neutral,
+/turf/open/floor/iron/dark/side{
+ dir = 4
+ },
/area/station/commons/locker)
+"qRm" = (
+/obj/effect/turf_decal/siding/dark{
+ dir = 9
+ },
+/turf/open/floor/circuit/green,
+/area/station/ai_monitored/turret_protected/ai_upload)
"qRt" = (
/turf/open/floor/engine,
/area/station/science/auxlab/firing_range)
+"qRy" = (
+/obj/machinery/light/directional/south,
+/obj/effect/turf_decal/trimline/brown/line,
+/obj/effect/turf_decal/trimline/brown/mid_joiner,
+/turf/open/floor/iron/edge,
+/area/station/hallway/primary/central)
"qRE" = (
/obj/structure/table,
/obj/item/pai_card,
/turf/open/floor/wood,
/area/station/service/bar)
"qSr" = (
-/obj/effect/turf_decal/tile/red{
- dir = 1
- },
/obj/machinery/light/directional/west,
/obj/structure/table,
/obj/item/camera,
@@ -55689,9 +68114,43 @@
/obj/structure/cable,
/turf/open/floor/iron/dark,
/area/station/hallway/primary/fore)
+"qSs" = (
+/obj/machinery/door/firedoor,
+/obj/effect/turf_decal/trimline/brown/warning{
+ dir = 4
+ },
+/turf/open/floor/iron/large,
+/area/station/hallway/primary/central)
+"qSB" = (
+/obj/machinery/firealarm/directional/north,
+/turf/open/floor/iron/corner,
+/area/station/hallway/primary/central)
+"qSR" = (
+/obj/structure/chair/sofa/corp/right{
+ dir = 8
+ },
+/turf/open/floor/iron/dark,
+/area/station/maintenance/port/aft)
"qSS" = (
-/obj/machinery/light/directional/east,
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/trimline/dark/filled/line{
+ alpha = 160;
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/dark/filled/mid_joiner{
+ dir = 4;
+ alpha = 160
+ },
+/obj/effect/turf_decal/trimline/purple/line{
+ alpha = 200;
+ dir = 4;
+ color = "#a56dc2"
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 4
+ },
+/turf/open/floor/iron/white/smooth_edge{
+ dir = 4
+ },
/area/station/science/xenobiology)
"qTb" = (
/obj/structure/cable,
@@ -55761,6 +68220,19 @@
},
/turf/open/floor/plating,
/area/station/maintenance/aft)
+"qTE" = (
+/obj/effect/turf_decal/stripes/corner{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer4,
+/obj/effect/turf_decal/stripes/blue/corner{
+ dir = 4
+ },
+/turf/open/floor/iron/dark,
+/area/station/hallway/secondary/exit)
"qTL" = (
/obj/effect/turf_decal/trimline/purple/filled/corner,
/obj/effect/turf_decal/siding/thinplating/dark{
@@ -55770,9 +68242,17 @@
/area/station/engineering/storage/tech)
"qTP" = (
/obj/effect/turf_decal/trimline/blue/filled/line{
+ alpha = 160;
+ dir = 4
+ },
+/obj/effect/spawner/random/medical/patient_stretcher,
+/obj/effect/turf_decal/trimline/white/line{
+ dir = 4
+ },
+/obj/structure/sign/departments/morgue/directional/east,
+/turf/open/floor/iron/white/smooth_edge{
dir = 4
},
-/turf/open/floor/iron/white,
/area/station/medical/medbay/central)
"qUe" = (
/obj/structure/cable,
@@ -55799,11 +68279,17 @@
/turf/open/floor/plating,
/area/station/security/prison)
"qUn" = (
-/obj/item/storage/box/matches,
-/obj/item/cigarette/cigar,
+/obj/item/storage/box/matches{
+ pixel_x = 5;
+ pixel_y = 4
+ },
+/obj/item/cigarette/cigar{
+ pixel_x = 5;
+ pixel_y = 6
+ },
/obj/item/razor{
- pixel_x = -4;
- pixel_y = 2
+ pixel_x = -7;
+ pixel_y = 4
},
/obj/structure/table/wood,
/turf/open/floor/iron/grimy,
@@ -55830,6 +68316,13 @@
/obj/item/clothing/neck/pauldron/captain,
/turf/open/floor/iron/dark,
/area/station/command/heads_quarters/hos)
+"qVg" = (
+/obj/effect/decal/cleanable/blood,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 6
+ },
+/turf/open/misc/hay,
+/area/station/maintenance/port/aft)
"qVn" = (
/obj/structure/chair/comfy/brown{
dir = 4
@@ -55841,10 +68334,31 @@
/obj/effect/landmark/start/assistant,
/turf/open/floor/iron/dark/side,
/area/station/hallway/primary/central/fore)
-"qWa" = (
-/obj/effect/spawner/random/trash/soap,
-/turf/open/floor/iron/freezer,
-/area/station/commons/toilet)
+"qVu" = (
+/obj/structure/fluff/metalpole{
+ dir = 1;
+ pixel_y = 32
+ },
+/obj/machinery/door/firedoor/border_only{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes/white/line{
+ color = "#52B4E9";
+ dir = 1;
+ name = "blue line"
+ },
+/obj/effect/turf_decal/siding/white{
+ dir = 8
+ },
+/obj/structure/railing{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/blue/fourcorners,
+/turf/open/floor/iron/white,
+/area/station/hallway/secondary/entry)
"qWo" = (
/obj/structure/disposalpipe/segment{
dir = 6
@@ -55853,13 +68367,14 @@
dir = 4
},
/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer5,
/turf/open/floor/plating,
/area/station/maintenance/port)
"qWq" = (
+/obj/structure/cable,
/obj/effect/turf_decal/plaque{
icon_state = "L7"
},
-/obj/structure/cable,
/turf/open/floor/iron,
/area/station/hallway/primary/central)
"qWu" = (
@@ -55883,8 +68398,25 @@
/obj/machinery/door/airlock/security{
name = "Labor Shuttle"
},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/dark,
/area/station/security/processing)
+"qWG" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/blue/filled/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/blue/filled/corner{
+ dir = 8
+ },
+/obj/effect/turf_decal/stripes/white/line{
+ dir = 8
+ },
+/turf/open/floor/iron/small,
+/area/station/hallway/secondary/entry)
"qWV" = (
/obj/machinery/light/directional/north,
/obj/structure/closet{
@@ -55907,10 +68439,10 @@
/obj/effect/turf_decal/delivery/red,
/obj/structure/rack/gunrack,
/obj/item/storage/belt/sheath/sabre/cargo{
- pixel_x = 1
+ pixel_x = 2
},
/obj/item/storage/belt/sheath/sabre/cargo{
- pixel_x = -7
+ pixel_x = -6
},
/turf/open/floor/iron/smooth,
/area/station/ai_monitored/security/armory)
@@ -55920,6 +68452,9 @@
/area/station/engineering/atmos)
"qXp" = (
/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 4
+ },
/turf/open/floor/plating,
/area/station/maintenance/aft)
"qXD" = (
@@ -55940,13 +68475,12 @@
/area/station/hallway/primary/starboard)
"qYe" = (
/obj/machinery/door/airlock/medical/glass{
+ id_tag = null;
name = "Medbay Foyer"
},
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/cable,
/obj/effect/mapping_helpers/airlock/access/any/medical/general,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/tile/blue/full,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/medical/medbay/central)
"qYj" = (
/obj/machinery/atmospherics/pipe/bridge_pipe/green/visible,
@@ -55956,6 +68490,12 @@
},
/turf/open/floor/iron,
/area/station/engineering/atmos)
+"qYC" = (
+/obj/effect/turf_decal/siding/dark/corner{
+ dir = 8
+ },
+/turf/open/floor/iron,
+/area/station/hallway/primary/starboard)
"qYD" = (
/obj/item/taperecorder,
/turf/open/floor/carpet/red,
@@ -55980,10 +68520,10 @@
codes_txt = "patrol;next_patrol=Security";
location = "EVA2"
},
+/obj/structure/cable,
/obj/effect/turf_decal/plaque{
icon_state = "L10"
},
-/obj/structure/cable,
/turf/open/floor/iron,
/area/station/hallway/primary/central)
"qZu" = (
@@ -56009,8 +68549,17 @@
dir = 1
},
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
+/obj/effect/turf_decal/trimline/dark/line{
+ dir = 1
+ },
/turf/open/floor/iron/dark,
/area/station/security/execution/transfer)
+"qZy" = (
+/obj/effect/turf_decal/trimline/blue/corner,
+/turf/open/floor/iron/edge{
+ dir = 4
+ },
+/area/station/hallway/primary/central)
"qZE" = (
/obj/effect/turf_decal/siding/purple{
dir = 5
@@ -56021,10 +68570,7 @@
/area/station/science/genetics)
"raa" = (
/obj/machinery/vending/boozeomat,
-/obj/effect/turf_decal/siding/wood{
- dir = 8
- },
-/turf/open/floor/iron/dark,
+/turf/open/floor/iron/dark/textured_large,
/area/station/command/heads_quarters/captain)
"rai" = (
/obj/machinery/door/airlock/multi_tile/public/glass{
@@ -56047,24 +68593,40 @@
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/structure/cable,
-/turf/open/floor/iron,
-/area/station/hallway/primary/central)
-"raM" = (
-/obj/effect/turf_decal/tile/blue{
+/obj/effect/turf_decal/siding/white{
+ color = "#8b8b8b";
dir = 4
},
-/obj/machinery/firealarm/directional/north,
-/turf/open/floor/iron/white/corner{
- dir = 1
+/turf/open/floor/iron/edge{
+ dir = 4
},
-/area/station/hallway/secondary/entry)
+/area/station/hallway/primary/central)
"raN" = (
/obj/structure/sign/warning/docking,
/turf/closed/wall,
/area/station/security/processing)
+"raZ" = (
+/obj/effect/turf_decal/trimline/brown/filled/line,
+/turf/open/floor/iron/textured_edge{
+ dir = 1
+ },
+/area/station/cargo/office)
+"rba" = (
+/obj/structure/disposalpipe/segment,
+/obj/structure/cable,
+/obj/effect/turf_decal/trimline/brown/line{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/brown/mid_joiner{
+ dir = 8
+ },
+/turf/open/floor/iron/edge{
+ dir = 8
+ },
+/area/station/hallway/primary/central)
"rbC" = (
/obj/structure/cable,
-/turf/open/floor/iron/dark,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/hallway/primary/central)
"rbD" = (
/obj/effect/turf_decal/siding/wood/corner,
@@ -56112,6 +68674,13 @@
},
/turf/open/floor/iron/smooth_half,
/area/station/engineering/main)
+"rcw" = (
+/obj/effect/spawner/structure/window,
+/obj/machinery/atmospherics/pipe/layer_manifold/cyan/hidden{
+ dir = 8
+ },
+/turf/open/floor/plating,
+/area/station/engineering/main)
"rcF" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
@@ -56130,6 +68699,16 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/dark,
/area/station/security/prison)
+"rcZ" = (
+/obj/machinery/light/directional/south,
+/obj/effect/turf_decal/trimline/blue/arrow_ccw{
+ alpha = 200
+ },
+/obj/effect/turf_decal/trimline/blue/mid_joiner{
+ alpha = 200
+ },
+/turf/open/floor/iron/edge,
+/area/station/hallway/primary/central)
"rda" = (
/obj/structure/table,
/obj/structure/cable,
@@ -56146,19 +68725,21 @@
/obj/effect/turf_decal/trimline/dark_blue/filled/warning,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/turf_decal/trimline/dark/warning,
/turf/open/floor/iron/dark,
/area/station/security/brig)
"rdx" = (
-/obj/structure/sign/warning/radiation/directional/west,
-/obj/effect/turf_decal/tile/yellow{
- dir = 1
+/obj/effect/turf_decal/trimline/yellow/filled/line{
+ dir = 8;
+ alpha = 120
},
-/turf/open/floor/iron/dark/side{
- dir = 6
+/obj/effect/turf_decal/trimline/dark_blue/line{
+ dir = 8;
+ alpha = 200
},
+/turf/open/floor/iron/dark,
/area/station/engineering/atmos/hfr_room)
"rdH" = (
-/obj/structure/cable,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
dir = 4
},
@@ -56186,6 +68767,14 @@
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/iron,
/area/station/commons/fitness)
+"ren" = (
+/obj/effect/turf_decal/trimline/brown/filled/line,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer4,
+/turf/open/floor/iron,
+/area/station/cargo/storage)
"reH" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/cable,
@@ -56196,8 +68785,10 @@
/turf/open/floor/iron,
/area/station/maintenance/department/electrical)
"reK" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/tile/brown/half/contrasted{
+/obj/effect/turf_decal/trimline/brown/filled/line{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/dark/line{
dir = 8
},
/turf/open/floor/iron,
@@ -56213,8 +68804,35 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 4
},
+/obj/machinery/firealarm/directional/south,
/turf/open/floor/carpet,
/area/station/service/chapel)
+"rfr" = (
+/obj/effect/turf_decal/trimline/dark/filled/line{
+ alpha = 160;
+ dir = 6
+ },
+/obj/effect/turf_decal/trimline/dark/filled/mid_joiner{
+ dir = 2;
+ alpha = 160
+ },
+/obj/effect/turf_decal/trimline/dark/filled/mid_joiner{
+ dir = 4;
+ alpha = 160
+ },
+/obj/effect/turf_decal/trimline/purple/line{
+ alpha = 200;
+ dir = 6;
+ color = "#a56dc2"
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 6
+ },
+/obj/machinery/space_heater,
+/turf/open/floor/iron/white/smooth_corner{
+ dir = 1
+ },
+/area/station/science/xenobiology)
"rfL" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 4
@@ -56236,13 +68854,31 @@
/turf/open/floor/iron,
/area/station/science/ordnance/storage)
"rfN" = (
-/obj/effect/turf_decal/bot,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+/obj/effect/turf_decal/trimline/brown/filled/corner{
dir = 8
},
-/turf/open/floor/iron,
-/area/station/cargo/warehouse)
+/obj/effect/turf_decal/trimline/dark/corner{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/obj/structure/cable,
+/turf/open/floor/iron/textured_corner{
+ dir = 8
+ },
+/area/station/cargo/miningdock)
+"rfP" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 6
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer4,
+/turf/open/floor/plating,
+/area/station/maintenance/port/aft)
"rfY" = (
/obj/structure/flora/bush/sparsegrass,
/obj/effect/turf_decal/siding/wideplating_new/corner,
@@ -56259,6 +68895,14 @@
},
/turf/open/floor/iron/white,
/area/station/medical/virology)
+"rgC" = (
+/obj/machinery/shower/directional/west,
+/obj/structure/drain,
+/obj/effect/turf_decal/siding/thinplating{
+ dir = 4
+ },
+/turf/open/floor/iron/freezer,
+/area/station/commons/toilet)
"rgF" = (
/obj/effect/landmark/start/bouncer,
/obj/structure/chair/stool/bar/directional/east,
@@ -56327,14 +68971,27 @@
/turf/open/floor/iron,
/area/station/engineering/atmos)
"riu" = (
-/obj/machinery/power/apc/auto_name/directional/west,
/obj/structure/cable,
+/obj/machinery/power/apc/auto_name/directional/west,
/turf/open/floor/wood,
/area/station/command/heads_quarters/blueshield)
"riN" = (
/obj/structure/flora/bush/sunny,
/turf/open/floor/grass,
/area/station/security/prison)
+"rjf" = (
+/obj/structure/closet/emcloset,
+/obj/effect/turf_decal/stripes/line{
+ dir = 10
+ },
+/obj/effect/turf_decal/trimline/blue/filled/line{
+ dir = 10
+ },
+/obj/effect/turf_decal/stripes/white/line{
+ dir = 5
+ },
+/turf/open/floor/iron,
+/area/station/hallway/secondary/entry)
"rjh" = (
/obj/machinery/door/airlock/research{
name = "Xenobiology Lab"
@@ -56343,8 +69000,20 @@
/obj/effect/mapping_helpers/airlock/locked,
/obj/machinery/atmospherics/pipe/smart/manifold4w/general/hidden,
/obj/structure/plasticflaps/kitchen,
-/turf/open/floor/iron/white,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/science/xenobiology)
+"rjI" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/obj/structure/cable,
+/turf/open/floor/iron/edge{
+ dir = 1
+ },
+/area/station/hallway/primary/port)
"rjU" = (
/obj/machinery/door/airlock/research/glass{
name = "Ordnance Lab"
@@ -56371,18 +69040,18 @@
/area/station/commons/dorms)
"rkv" = (
/obj/machinery/door/firedoor,
-/obj/effect/turf_decal/tile/yellow{
+/obj/effect/turf_decal/trimline/yellow/corner,
+/obj/effect/turf_decal/siding/dark/corner{
dir = 4
},
-/obj/effect/turf_decal/tile/yellow,
-/turf/open/floor/iron,
+/turf/open/floor/iron/large,
/area/station/hallway/primary/aft)
"rlt" = (
/obj/machinery/computer/piratepad_control/civilian{
dir = 1
},
-/obj/effect/turf_decal/tile/brown,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/bot,
+/turf/open/floor/iron/dark/textured_large,
/area/station/cargo/office)
"rlz" = (
/obj/effect/mapping_helpers/burnt_floor,
@@ -56391,6 +69060,17 @@
/obj/structure/closet/crate/bin,
/turf/open/floor/plating/airless,
/area/space/nearstation)
+"rlW" = (
+/obj/effect/mapping_helpers/airlock/access/any/engineering/atmos,
+/obj/machinery/door/airlock/external{
+ name = "Internal Airlock"
+ },
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/plating,
+/area/station/maintenance/aft)
"rmB" = (
/obj/machinery/shower/directional/north,
/obj/structure/window/reinforced/tinted/spawner/directional/east,
@@ -56412,18 +69092,48 @@
dir = 1
},
/area/station/security/prison)
+"rmT" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+ dir = 1
+ },
+/turf/open/floor/iron,
+/area/station/cargo/warehouse)
"rmX" = (
/obj/structure/table,
/obj/item/reagent_containers/cup/glass/bottle/beer,
/turf/open/floor/plating,
/area/station/maintenance/starboard/aft)
+"rnb" = (
+/obj/machinery/shower/directional/east,
+/obj/structure/drain,
+/obj/effect/turf_decal/siding/thinplating{
+ dir = 8
+ },
+/turf/open/floor/iron/freezer,
+/area/station/commons/toilet)
"rnF" = (
/obj/effect/turf_decal/trimline/dark_blue/filled/line{
dir = 1
},
/obj/machinery/airalarm/directional/north,
+/obj/effect/turf_decal/trimline/dark/line{
+ dir = 1
+ },
/turf/open/floor/iron/dark,
/area/station/security/brig)
+"rnK" = (
+/obj/effect/turf_decal/trimline/blue/filled/corner{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/white/corner{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/blue/corner{
+ color = "#8ab4cb";
+ dir = 8
+ },
+/turf/open/floor/iron/white,
+/area/station/medical/treatment_center)
"rnQ" = (
/obj/effect/turf_decal/tile/red/opposingcorners{
dir = 1
@@ -56431,6 +69141,7 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 8
},
+/obj/structure/cable,
/turf/open/floor/iron,
/area/station/commons/fitness/recreation)
"rom" = (
@@ -56455,6 +69166,12 @@
/obj/machinery/newscaster/directional/south,
/turf/open/floor/iron/dark/textured,
/area/station/science/genetics)
+"roC" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+ dir = 8
+ },
+/turf/open/floor/iron,
+/area/station/engineering/atmos/hfr_room)
"roJ" = (
/obj/machinery/atmospherics/pipe/smart/simple/green/visible{
dir = 6
@@ -56467,6 +69184,9 @@
/obj/machinery/door/window/left/directional/east,
/obj/structure/flora/bush/leafy,
/obj/machinery/hydroponics/constructable,
+/obj/effect/turf_decal/siding/wood/corner{
+ dir = 1
+ },
/turf/open/floor/grass,
/area/station/security/prison)
"roW" = (
@@ -56476,8 +69196,16 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 4
},
-/turf/open/floor/wood,
+/obj/effect/turf_decal/siding/dark{
+ dir = 6
+ },
+/turf/open/floor/wood/large,
/area/station/command/heads_quarters/captain)
+"roX" = (
+/obj/effect/turf_decal/trimline/brown/line,
+/obj/effect/turf_decal/trimline/brown/mid_joiner,
+/turf/open/floor/iron/edge,
+/area/station/hallway/primary/central)
"rps" = (
/obj/effect/turf_decal/siding/purple{
dir = 8
@@ -56489,10 +69217,12 @@
/area/station/science/genetics)
"rpx" = (
/obj/effect/turf_decal/bot,
-/obj/item/flatpack/export_gate,
-/obj/item/multitool,
/obj/structure/closet/crate/preopen,
-/turf/open/floor/iron,
+/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/random/food_or_drink/donkpockets{
+ pixel_y = -6
+ },
+/turf/open/floor/iron/large,
/area/station/cargo/storage)
"rpD" = (
/obj/machinery/light/directional/east,
@@ -56501,17 +69231,26 @@
/obj/structure/plant_tank,
/turf/open/floor/grass,
/area/station/service/hydroponics)
+"rpN" = (
+/obj/structure/closet/emcloset,
+/obj/effect/turf_decal/stripes/line,
+/obj/effect/turf_decal/trimline/blue/filled/line,
+/obj/effect/turf_decal/stripes/white/line{
+ color = "#a56dc2"
+ },
+/turf/open/floor/iron,
+/area/station/hallway/secondary/entry)
"rqi" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 4
+ },
/turf/open/floor/wood,
/area/station/command/heads_quarters/hop)
"rqr" = (
/obj/effect/turf_decal/bot,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
- dir = 8
- },
-/obj/structure/cable,
-/turf/open/floor/iron,
+/obj/structure/closet/crate,
+/obj/effect/spawner/random/maintenance/two,
+/turf/open/floor/iron/large,
/area/station/cargo/storage)
"rqA" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
@@ -56537,19 +69276,34 @@
/turf/open/floor/iron/dark,
/area/station/security/corrections_officer)
"rqY" = (
-/obj/machinery/camera/directional/east{
- c_tag = "Xenobiology Cell 4";
- network = list("ss13","xeno")
+/obj/structure/disposalpipe/trunk{
+ dir = 1
+ },
+/obj/structure/disposaloutlet{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 6
+ },
+/obj/effect/turf_decal/siding/dark/corner{
+ dir = 1
},
/turf/open/floor/engine,
/area/station/science/xenobiology)
"rrc" = (
/obj/structure/disposalpipe/segment,
-/obj/effect/turf_decal/tile/blue{
+/obj/effect/landmark/start/hangover,
+/obj/effect/turf_decal/trimline/blue/line{
+ alpha = 200;
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/blue/mid_joiner{
+ alpha = 200;
+ dir = 8
+ },
+/turf/open/floor/iron/edge{
dir = 8
},
-/obj/effect/landmark/start/hangover,
-/turf/open/floor/iron,
/area/station/hallway/primary/central)
"rrd" = (
/obj/machinery/newscaster/directional/north,
@@ -56588,17 +69342,33 @@
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
dir = 8
},
-/turf/open/floor/iron,
-/area/station/cargo/miningdock)
-"rrA" = (
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
+/obj/effect/turf_decal/trimline/brown/filled/line{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/dark/line{
+ dir = 4
+ },
+/turf/open/floor/iron/textured_edge{
dir = 8
},
-/obj/effect/turf_decal/tile/blue{
+/area/station/cargo/miningdock)
+"rrA" = (
+/obj/effect/turf_decal/stripes{
+ dir = 8
+ },
+/obj/structure/closet/secure_closet/wall{
+ pixel_y = -32
+ },
+/obj/effect/turf_decal/stripes/white/line{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/dark/corner{
dir = 1
},
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/siding/dark{
+ dir = 6
+ },
+/turf/open/floor/iron/dark/textured_large,
/area/station/medical/cryo)
"rrE" = (
/obj/effect/turf_decal/delivery/white{
@@ -56622,9 +69392,14 @@
dir = 1
},
/obj/structure/table/reinforced,
-/obj/machinery/door/firedoor,
-/obj/item/folder/white,
-/obj/item/pen,
+/obj/item/folder/white{
+ pixel_x = 7;
+ pixel_y = 4
+ },
+/obj/item/pen{
+ pixel_x = 7;
+ pixel_y = 3
+ },
/obj/machinery/door/window/right/directional/north{
name = "Pharmacy Desk";
req_access = list("pharmacy")
@@ -56633,8 +69408,37 @@
id = "pharmacy_shutters2";
name = "Pharmacy Shutters"
},
-/turf/open/floor/iron,
+/obj/item/storage/box/syringes{
+ pixel_x = -7;
+ pixel_y = 5
+ },
+/obj/machinery/door/window/left/directional/south{
+ name = "Pharmacy Desk"
+ },
+/obj/machinery/door/firedoor/border_only,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/medical/pharmacy)
+"rrQ" = (
+/obj/effect/turf_decal/trimline/blue/filled/corner{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/white/corner{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/blue/corner{
+ color = "#8ab4cb";
+ dir = 1
+ },
+/turf/open/floor/iron/white,
+/area/station/medical/treatment_center)
+"rrS" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/light/small/dim/directional/east,
+/obj/structure/table/wood,
+/obj/effect/spawner/random/maintenance/two,
+/obj/structure/sign/poster/contraband/dream/directional/east,
+/turf/open/floor/carpet/lone/star,
+/area/station/maintenance/port/aft)
"rse" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 9
@@ -56645,6 +69449,18 @@
/obj/structure/window/reinforced/fulltile,
/turf/open/floor/plating/airless,
/area/space/nearstation)
+"rsJ" = (
+/obj/structure/disposalpipe/segment,
+/obj/effect/turf_decal/trimline/brown/line{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/brown/mid_joiner{
+ dir = 8
+ },
+/turf/open/floor/iron/edge{
+ dir = 8
+ },
+/area/station/hallway/primary/central)
"rsM" = (
/obj/machinery/camera/directional/north,
/turf/open/floor/engine{
@@ -56672,8 +69488,34 @@
dir = 10
},
/obj/structure/cable,
-/turf/open/floor/mineral/gold,
+/obj/effect/turf_decal/siding/brown/end{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/brown/filled/end{
+ dir = 8
+ },
+/turf/open/floor/iron/dark/textured,
/area/station/command/heads_quarters/qm)
+"rts" = (
+/obj/structure/disposalpipe/segment,
+/turf/open/floor/iron/edge{
+ dir = 8
+ },
+/area/station/hallway/primary/aft)
+"rtw" = (
+/obj/effect/turf_decal/siding/dark/corner{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 5
+ },
+/obj/effect/turf_decal/trimline/purple/filled/line{
+ alpha = 160;
+ color = "#6a3182";
+ dir = 5
+ },
+/turf/open/floor/iron/dark/small,
+/area/station/science/robotics/lab)
"rtB" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/structure/cable,
@@ -56690,7 +69532,8 @@
dir = 4
},
/obj/machinery/door/firedoor,
-/turf/open/floor/iron/dark,
+/obj/effect/turf_decal/tile/yellow/full,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/medical/medbay/central)
"rvc" = (
/obj/machinery/door/airlock/atmos{
@@ -56714,6 +69557,26 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/iron/dark,
/area/station/security/brig)
+"rwm" = (
+/obj/effect/turf_decal/siding/dark{
+ dir = 8
+ },
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/dark/filled/line{
+ alpha = 160;
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/purple/line{
+ alpha = 200;
+ dir = 8;
+ color = "#a56dc2"
+ },
+/turf/open/floor/iron/white/smooth_edge{
+ dir = 8
+ },
+/area/station/science/xenobiology)
"rwv" = (
/obj/structure/easel,
/obj/machinery/light/directional/north,
@@ -56727,6 +69590,9 @@
/obj/item/canvas/nineteen_nineteen,
/obj/item/canvas/nineteen_nineteen,
/obj/item/canvas,
+/obj/effect/turf_decal/siding/wood{
+ dir = 5
+ },
/turf/open/floor/wood,
/area/station/security/prison)
"rwD" = (
@@ -56734,7 +69600,10 @@
dir = 4
},
/obj/machinery/firealarm/directional/south,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/purple/corner{
+ dir = 8
+ },
+/turf/open/floor/iron/edge,
/area/station/hallway/primary/central)
"rxu" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
@@ -56779,18 +69648,34 @@
},
/turf/open/floor/iron/cafeteria,
/area/station/security/prison)
-"rye" = (
-/obj/structure/chair{
- dir = 1
+"rxG" = (
+/obj/effect/turf_decal/siding/wideplating_new/dark/corner{
+ dir = 4
},
+/obj/effect/turf_decal/siding/wideplating_new/dark/corner{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/wood{
+ dir = 6
+ },
+/turf/open/floor/carpet/executive,
+/area/station/command/heads_quarters/captain)
+"rye" = (
/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer4,
/turf/open/floor/iron/dark,
/area/station/security/processing)
"rym" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/turf_decal/bot_white{
+ color = "#ff780a"
+ },
+/obj/effect/turf_decal/box/white{
+ color = "#ff780a"
+ },
/obj/effect/turf_decal/vg_decals/department/bar,
-/turf/open/floor/iron,
+/turf/open/floor/iron/large,
/area/station/hallway/primary/starboard)
"ryC" = (
/obj/machinery/atmospherics/pipe/layer_manifold/scrubbers/hidden{
@@ -56805,6 +69690,10 @@
/obj/effect/turf_decal/tile/red,
/obj/structure/reagent_dispensers/wall/peppertank/directional/south,
/obj/structure/table/reinforced,
+/obj/item/binoculars{
+ pixel_x = 5;
+ pixel_y = 7
+ },
/turf/open/floor/iron/dark,
/area/station/security/checkpoint/medical)
"ryZ" = (
@@ -56815,8 +69704,7 @@
dir = 4
},
/obj/structure/cable,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron,
+/turf/open/floor/iron/large,
/area/station/cargo/miningdock)
"rze" = (
/obj/machinery/light/small/directional/south,
@@ -56839,6 +69727,7 @@
/turf/open/floor/wood,
/area/station/security/prison)
"rzl" = (
+/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/maintenance{
name = "Medbay Maintenance"
},
@@ -56861,12 +69750,25 @@
dir = 1
},
/obj/machinery/light/directional/north,
+/obj/effect/turf_decal/trimline/dark/line{
+ dir = 1
+ },
/turf/open/floor/iron/dark,
/area/station/security/brig)
"rzA" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
- dir = 1
+/obj/effect/turf_decal/trimline/dark/filled/corner{
+ alpha = 160;
+ dir = 2
},
+/obj/effect/turf_decal/trimline/purple/corner{
+ alpha = 200;
+ dir = 2;
+ color = "#a56dc2"
+ },
+/obj/effect/turf_decal/siding{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/dark/corner,
/turf/open/floor/iron/white,
/area/station/science/xenobiology)
"rzC" = (
@@ -56898,14 +69800,18 @@
/turf/open/floor/iron,
/area/station/science/ordnance)
"rAk" = (
-/obj/structure/window/spawner/directional/south,
-/obj/structure/window/spawner/directional/east,
-/obj/machinery/hydroponics/constructable,
-/obj/effect/turf_decal/siding/thinplating/dark{
- dir = 5
+/obj/effect/landmark/firealarm_sanity,
+/turf/open/floor/engine{
+ name = "Holodeck Projector Floor"
},
-/turf/open/floor/iron/smooth_large,
-/area/station/service/hydroponics)
+/area/station/holodeck/rec_center)
+"rAl" = (
+/obj/structure/bookcase/random,
+/obj/effect/turf_decal/siding/wood{
+ dir = 1
+ },
+/turf/open/floor/plating,
+/area/station/service/library/abandoned)
"rAm" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/door/poddoor/shutters/preopen{
@@ -56916,15 +69822,25 @@
/turf/open/floor/plating,
/area/station/science/genetics)
"rAs" = (
-/obj/effect/turf_decal/trimline/blue/filled/line,
-/obj/structure/sign/departments/psychology/directional/south,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 8
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 4
},
-/turf/open/floor/iron/white,
+/obj/structure/cable,
+/obj/effect/turf_decal/trimline/blue/filled/line{
+ alpha = 160
+ },
+/obj/structure/sign/departments/psychology/directional/south,
+/obj/effect/turf_decal/trimline/dark_blue/line{
+ alpha = 200
+ },
+/obj/effect/turf_decal/trimline/blue/filled/mid_joiner{
+ dir = 2;
+ alpha = 160
+ },
+/turf/open/floor/iron/white/smooth_edge,
/area/station/medical/medbay/aft)
"rAx" = (
/obj/item/radio/intercom/directional/north,
@@ -56948,17 +69864,21 @@
/turf/open/floor/grass,
/area/station/common/cryopods)
"rBn" = (
-/obj/effect/turf_decal/bot,
/obj/structure/closet/crate,
-/obj/effect/spawner/random/maintenance/three,
-/obj/item/glassblowing/shears,
-/obj/item/glassblowing/paddle,
-/obj/effect/decal/cleanable/plastic,
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
- dir = 8
+/obj/item/glassblowing/shears{
+ pixel_x = 4;
+ pixel_y = -1
},
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/item/glassblowing/paddle{
+ pixel_x = 1;
+ pixel_y = 0
+ },
+/obj/effect/decal/cleanable/plastic,
+/obj/item/glassblowing/blowing_rod{
+ pixel_x = -3;
+ pixel_y = 2
+ },
+/obj/effect/turf_decal/bot,
/turf/open/floor/iron,
/area/station/cargo/warehouse)
"rBN" = (
@@ -56990,6 +69910,10 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/dark,
/area/station/maintenance/port/fore)
+"rCT" = (
+/obj/structure/closet/crate/secure/trashcart,
+/turf/open/floor/iron/dark/smooth_large,
+/area/station/maintenance/aft)
"rDL" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 8
@@ -57013,6 +69937,10 @@
/obj/effect/turf_decal/trimline/dark_blue/filled/warning{
dir = 8
},
+/obj/effect/turf_decal/trimline/dark_blue/warning{
+ alpha = 200;
+ dir = 8
+ },
/turf/open/floor/iron/dark,
/area/station/security/office)
"rDZ" = (
@@ -57023,10 +69951,21 @@
/obj/structure/cable,
/turf/open/floor/engine,
/area/station/maintenance/disposal/incinerator)
+"rEH" = (
+/obj/structure/railing{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/iron/dark,
+/area/station/hallway/secondary/exit)
"rEJ" = (
+/obj/structure/closet/crate,
+/obj/item/storage/box/lights/mixed{
+ pixel_x = 4;
+ pixel_y = 0
+ },
+/obj/effect/spawner/random/maintenance,
/obj/effect/turf_decal/bot,
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/closet/crate/secure/loot,
/turf/open/floor/iron,
/area/station/cargo/warehouse)
"rET" = (
@@ -57055,30 +69994,46 @@
"rGc" = (
/obj/structure/cable,
/obj/machinery/airalarm/directional/south,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/purple/corner,
+/turf/open/floor/iron/edge,
/area/station/hallway/primary/starboard)
-"rGH" = (
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
-/obj/effect/turf_decal/tile/blue{
+"rGr" = (
+/obj/structure/disposalpipe/segment,
+/obj/effect/turf_decal/trimline/yellow/corner{
dir = 8
},
+/turf/open/floor/iron/edge,
+/area/station/hallway/primary/aft)
+"rGH" = (
+/obj/machinery/iv_drip,
+/obj/effect/turf_decal/siding{
+ dir = 9
+ },
+/obj/effect/turf_decal/trimline/blue/filled/line{
+ alpha = 160;
+ dir = 9
+ },
/turf/open/floor/iron/white,
/area/station/medical/surgery/fore)
"rGT" = (
-/obj/effect/turf_decal/bot_white/left,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 8
},
/obj/machinery/light/directional/east,
-/turf/open/floor/iron/dark,
+/obj/effect/turf_decal/box/blue,
+/obj/effect/turf_decal/bot_blue,
+/turf/open/floor/iron/dark/textured_large,
/area/station/ai_monitored/command/nuke_storage)
"rGU" = (
-/obj/structure/sign/poster/official/work_for_a_future,
-/turf/closed/wall,
-/area/station/maintenance/port)
+/obj/machinery/light/floor,
+/obj/effect/turf_decal/siding/wood{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/wood{
+ dir = 8
+ },
+/turf/open/floor/wood/tile,
+/area/station/hallway/secondary/entry)
"rHn" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
@@ -57087,6 +70042,15 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/plating,
/area/station/commons/storage/emergency/port)
+"rHu" = (
+/obj/machinery/smartfridge/food,
+/obj/machinery/door/poddoor/shutters/preopen{
+ id = "kitchen";
+ name = "Kitchen Shutters"
+ },
+/obj/machinery/door/firedoor,
+/turf/open/floor/iron/cafeteria,
+/area/station/service/kitchen)
"rHB" = (
/obj/effect/turf_decal/tile/brown{
dir = 4
@@ -57121,6 +70085,11 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/wood,
/area/station/command/heads_quarters/blueshield)
+"rIV" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
+/turf/open/floor/plating,
+/area/station/maintenance/port/aft)
"rJl" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
@@ -57138,8 +70107,18 @@
},
/obj/structure/cable,
/obj/machinery/airalarm/directional/east,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron/dark/textured,
+/obj/effect/turf_decal/stripes/line,
+/obj/effect/turf_decal/stripes/white/line{
+ color = "#52B4E9";
+ name = "blue line"
+ },
+/obj/effect/turf_decal/siding/wideplating_new/dark{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/wideplating_new/dark{
+ dir = 8
+ },
+/turf/open/floor/iron/textured_large,
/area/station/command/gateway)
"rJz" = (
/obj/structure/cable,
@@ -57157,13 +70136,38 @@
},
/obj/machinery/power/apc/auto_name/directional/west,
/obj/structure/cable,
-/turf/open/floor/iron/dark/textured,
+/obj/effect/turf_decal/siding/wideplating_new/dark{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/wideplating_new/dark{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/iron/textured_large,
/area/station/command/gateway)
+"rKd" = (
+/obj/structure/chair/comfy/black,
+/obj/effect/landmark/start/scientist,
+/obj/effect/turf_decal/siding/thinplating_new/dark/end{
+ dir = 4
+ },
+/turf/open/floor/carpet/black,
+/area/station/science/xenobiology)
"rKp" = (
/obj/effect/turf_decal/trimline/brown/filled/warning{
dir = 4
},
-/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/trimline/dark/warning{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/obj/structure/cable,
/turf/open/floor/iron,
/area/station/cargo/warehouse)
"rKD" = (
@@ -57192,12 +70196,31 @@
dir = 4
},
/turf/open/floor/engine,
-/area/station/engineering/main)
+/area/station/engineering/supermatter/room)
"rKW" = (
-/obj/effect/turf_decal/siding/white,
/obj/structure/chair,
-/turf/open/floor/iron/dark,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/hallway/primary/central)
+"rLi" = (
+/obj/machinery/door/window/left/directional/east{
+ req_access = list("xenobiology");
+ name = "Containment Cell"
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 9
+ },
+/obj/effect/turf_decal/vg_decals/numbers/four{
+ color = "#a56dc2"
+ },
+/obj/structure/cable,
+/obj/effect/turf_decal/bot_white{
+ color = "#a56dc2"
+ },
+/obj/effect/turf_decal/box/white{
+ color = "#a56dc2"
+ },
+/turf/open/floor/iron/dark/smooth_large,
+/area/station/science/xenobiology)
"rLn" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
@@ -57231,20 +70254,23 @@
},
/obj/effect/landmark/event_spawn,
/obj/effect/landmark/start/shaft_miner,
+/obj/effect/turf_decal/trimline/brown/filled/line{
+ dir = 6
+ },
+/obj/effect/turf_decal/trimline/dark/line{
+ dir = 6
+ },
/turf/open/floor/iron,
/area/station/cargo/miningdock)
"rLK" = (
/obj/effect/turf_decal/trimline/blue/filled/line{
dir = 4
},
-/obj/structure/extinguisher_cabinet{
- pixel_x = -27;
- pixel_y = 1
- },
/obj/structure/closet/secure_closet/medical3,
/obj/item/clothing/under/plasmaman/medical,
/obj/item/clothing/head/helmet/space/plasmaman/medical,
/obj/machinery/light/directional/west,
+/obj/machinery/firealarm/directional/west,
/turf/open/floor/iron/dark,
/area/station/medical/storage)
"rMl" = (
@@ -57261,6 +70287,32 @@
},
/turf/open/floor/iron/dark/airless,
/area/station/science/ordnance/freezerchamber)
+"rMq" = (
+/obj/item/storage/toolbox/emergency{
+ pixel_x = 5;
+ pixel_y = -3
+ },
+/obj/item/stack/cable_coil/thirty{
+ pixel_x = 5;
+ pixel_y = -8
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/dark/corner{
+ dir = 1
+ },
+/turf/open/floor/plating,
+/area/station/maintenance/starboard/aft)
+"rMv" = (
+/obj/effect/turf_decal/siding/thinplating/dark{
+ dir = 8
+ },
+/mob/living/basic/axolotl{
+ name = "Danger"
+ },
+/turf/open/floor/iron,
+/area/station/service/hydroponics/garden)
"rMz" = (
/obj/structure/table,
/turf/open/floor/iron/dark,
@@ -57294,28 +70346,61 @@
/turf/open/floor/iron/white,
/area/station/medical/storage)
"rNN" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/railing{
- dir = 4
- },
-/turf/open/floor/iron/dark,
-/area/station/hallway/secondary/exit)
+/obj/structure/closet/crate,
+/obj/effect/spawner/random/maintenance/three,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer5,
+/turf/open/floor/plating,
+/area/station/maintenance/port)
"rOo" = (
/obj/machinery/atmospherics/pipe/layer_manifold/scrubbers/hidden,
/turf/closed/wall,
/area/station/medical/treatment_center)
-"rPi" = (
-/obj/effect/turf_decal/tile/brown{
+"rON" = (
+/obj/effect/turf_decal/trimline/brown/line{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/brown/mid_joiner{
+ dir = 4
+ },
+/turf/open/floor/iron/corner{
dir = 8
},
-/obj/effect/turf_decal/tile/yellow{
- dir = 1
+/area/station/hallway/primary/central)
+"rPi" = (
+/obj/effect/turf_decal/trimline/dark/filled/warning{
+ alpha = 160;
+ dir = 8
},
-/turf/open/floor/iron,
-/area/station/cargo/miningdock)
+/obj/effect/turf_decal/trimline/purple/warning{
+ alpha = 200;
+ dir = 8;
+ color = "#a56dc2"
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 8
+ },
+/turf/open/floor/iron/white/smooth_edge{
+ dir = 8
+ },
+/area/station/science/xenobiology)
+"rPo" = (
+/obj/effect/turf_decal/siding/dark{
+ dir = 9
+ },
+/turf/open/floor/iron/dark/textured_large,
+/area/station/service/hydroponics)
"rPt" = (
/obj/machinery/airalarm/directional/south,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/brown/line,
+/obj/effect/turf_decal/trimline/brown/mid_joiner,
+/turf/open/floor/iron/edge,
+/area/station/hallway/primary/central)
+"rPN" = (
+/obj/effect/turf_decal/trimline/brown/line,
+/obj/effect/turf_decal/trimline/brown/mid_joiner,
+/turf/open/floor/iron/corner{
+ dir = 1
+ },
/area/station/hallway/primary/central)
"rPX" = (
/obj/structure/disposalpipe/segment,
@@ -57347,28 +70432,21 @@
pixel_x = 3
},
/obj/structure/window/plasma/spawner/directional/east,
-/obj/item/food/burger/purple{
- pixel_y = -8;
- pixel_x = -14;
- name = "science burger";
- desc = "Rumoured to be the first ever burger made by Albert Einstein. KFT chef, no relation."
- },
/turf/open/floor/glass/plasma,
/area/station/command/heads_quarters/rd)
"rQj" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/railing{
+/obj/machinery/atmospherics/components/unary/airlock_pump{
dir = 8
},
-/turf/open/floor/iron/dark,
+/turf/open/floor/iron,
/area/station/hallway/secondary/exit)
"rQo" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/effect/turf_decal/siding/wood{
- dir = 6
+/obj/effect/turf_decal/siding/dark{
+ dir = 8
},
-/turf/open/floor/wood,
+/turf/open/floor/wood/parquet,
/area/station/command/heads_quarters/captain)
"rQD" = (
/obj/machinery/light/dim/directional/north,
@@ -57376,8 +70454,28 @@
dir = 8;
name = "connector to turbine"
},
+/obj/effect/turf_decal/trimline/yellow/filled/line{
+ dir = 1;
+ alpha = 120
+ },
+/obj/effect/turf_decal/trimline/dark_blue/line{
+ alpha = 200;
+ dir = 1
+ },
/turf/open/floor/iron/dark,
/area/station/engineering/atmos/hfr_room)
+"rQK" = (
+/obj/effect/turf_decal/siding/wideplating_new/light,
+/obj/effect/turf_decal/siding/wideplating_new/light{
+ dir = 1
+ },
+/obj/structure/railing,
+/obj/effect/turf_decal/siding/dark,
+/obj/effect/turf_decal/siding/dark{
+ dir = 1
+ },
+/turf/open/floor/iron/dark/herringbone,
+/area/station/cargo/storage)
"rQR" = (
/turf/closed/wall,
/area/station/commons/fitness/recreation/entertainment)
@@ -57392,6 +70490,25 @@
/obj/machinery/door/firedoor,
/turf/open/floor/iron/dark,
/area/station/security/office)
+"rRG" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/turf_decal/trimline/dark/filled/line{
+ alpha = 160;
+ dir = 2
+ },
+/obj/effect/turf_decal/trimline/dark/filled/mid_joiner{
+ dir = 2;
+ alpha = 160
+ },
+/obj/effect/turf_decal/trimline/purple/line{
+ alpha = 200;
+ dir = 2
+ },
+/obj/effect/turf_decal/siding/dark,
+/turf/open/floor/iron/white/smooth_edge,
+/area/station/science/research)
"rRT" = (
/obj/machinery/door/poddoor/shutters/preopen{
id = "rnd2";
@@ -57408,6 +70525,9 @@
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/turf_decal/trimline/dark/warning{
+ dir = 4
+ },
/turf/open/floor/iron/dark,
/area/station/security/brig)
"rSy" = (
@@ -57421,6 +70541,7 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer5,
/turf/open/floor/plating,
/area/station/maintenance/starboard)
"rSz" = (
@@ -57432,6 +70553,9 @@
/obj/item/storage/toolbox/mechanical,
/obj/item/assembly/signaler,
/obj/machinery/light/directional/east,
+/obj/effect/turf_decal/trimline/white/line{
+ dir = 6
+ },
/turf/open/floor/iron/dark,
/area/station/security/execution/education)
"rSG" = (
@@ -57442,6 +70566,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 1
},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer5,
/turf/open/floor/iron/dark,
/area/station/security/mechbay)
"rSI" = (
@@ -57449,6 +70574,7 @@
/obj/structure/chair{
dir = 1
},
+/obj/effect/turf_decal/trimline/dark/line,
/turf/open/floor/iron/dark,
/area/station/security/execution/transfer)
"rSS" = (
@@ -57481,22 +70607,41 @@
"rTv" = (
/obj/structure/table/wood,
/obj/effect/spawner/random/entertainment/deck,
+/obj/structure/cable,
/turf/open/floor/iron/dark,
/area/station/commons/fitness/recreation/entertainment)
"rTE" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+ dir = 4
+ },
/obj/effect/turf_decal/trimline/blue/filled/line{
+ alpha = 160;
dir = 8
},
-/turf/open/floor/iron/white,
-/area/station/medical/medbay/aft)
+/obj/effect/turf_decal/trimline/dark_blue/line{
+ alpha = 200;
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/blue/filled/mid_joiner{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/blue/filled/mid_joiner{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/dark_blue/mid_joiner{
+ dir = 8
+ },
+/turf/open/floor/iron/white/smooth_edge{
+ dir = 8
+ },
+/area/station/medical/medbay/central)
"rTH" = (
/obj/structure/reagent_dispensers/water_cooler,
/turf/open/floor/iron/dark/textured_large,
/area/station/hallway/primary/central)
"rUr" = (
/obj/machinery/nuclearbomb/selfdestruct,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/turf/open/floor/iron/dark,
+/turf/open/floor/iron/dark/textured_large,
/area/station/ai_monitored/command/nuke_storage)
"rUx" = (
/obj/machinery/jukebox/no_access,
@@ -57524,7 +70669,10 @@
specialfunctions = 4
},
/obj/machinery/light/small/directional/west,
-/turf/open/floor/mineral/titanium/blue,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+ dir = 4
+ },
+/turf/open/floor/iron/white/smooth_large,
/area/station/commons/toilet)
"rVn" = (
/obj/effect/turf_decal/trimline/blue/filled/warning{
@@ -57533,7 +70681,19 @@
/obj/effect/turf_decal/trimline/blue/filled/corner{
dir = 1
},
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/trimline/white/corner{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/white/warning{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/blue/corner{
+ color = "#8ab4cb";
+ dir = 1
+ },
+/turf/open/floor/iron/white/smooth_corner{
+ dir = 8
+ },
/area/station/medical/treatment_center)
"rVA" = (
/obj/structure/cable,
@@ -57545,6 +70705,39 @@
/obj/item/stack/rods/fifty,
/turf/open/floor/iron/smooth_large,
/area/station/engineering/gravity_generator)
+"rVE" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 4
+ },
+/turf/open/floor/plating,
+/area/station/hallway/secondary/exit)
+"rVK" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 4
+ },
+/turf/open/floor/iron/dark/side{
+ dir = 4
+ },
+/area/station/command/bridge)
+"rWg" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/turf/open/floor/plating,
+/area/station/maintenance/fore)
"rWN" = (
/obj/structure/cable,
/obj/effect/landmark/start/hangover,
@@ -57558,16 +70751,37 @@
network = list("ss13","cargo")
},
/obj/structure/reagent_dispensers/fueltank,
-/obj/effect/turf_decal/stripes/line,
-/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/trimline/brown/filled/line{
+ dir = 6
+ },
+/obj/effect/turf_decal/trimline/dark/line{
+ dir = 6
+ },
/turf/open/floor/iron,
/area/station/cargo/miningdock)
+"rXr" = (
+/obj/machinery/door/airlock/external{
+ name = "Port Docking Bay 3"
+ },
+/obj/structure/fans/tiny,
+/obj/effect/mapping_helpers/airlock/unres{
+ dir = 8
+ },
+/obj/structure/fluff/tram_rail/end{
+ dir = 4;
+ pixel_y = -39
+ },
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+ dir = 4
+ },
+/turf/open/floor/plating,
+/area/station/hallway/secondary/entry)
"rXJ" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 4
},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer5,
/turf/open/floor/iron/dark/small,
/area/station/cargo/bitrunning/den)
"rXY" = (
@@ -57577,9 +70791,13 @@
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/turf_decal/trimline/dark/warning{
+ dir = 10
+ },
/turf/open/floor/iron/dark,
/area/station/security/execution/transfer)
"rYh" = (
+/obj/structure/cable,
/obj/effect/turf_decal/tile/blue,
/obj/effect/turf_decal/tile/blue{
dir = 8
@@ -57593,9 +70811,18 @@
/obj/machinery/computer/records/medical{
dir = 4
},
-/obj/structure/cable,
/turf/open/floor/iron/dark,
/area/station/command/heads_quarters/cmo)
+"rYj" = (
+/obj/machinery/atmospherics/components/tank/air/layer4{
+ dir = 8
+ },
+/turf/open/floor/plating,
+/area/station/maintenance/fore)
+"rYl" = (
+/obj/effect/spawner/random/trash/moisture_trap,
+/turf/open/floor/plating,
+/area/station/maintenance/port/aft)
"rYp" = (
/obj/structure/table,
/obj/item/reagent_containers/condiment/milk/small_ration{
@@ -57607,8 +70834,20 @@
},
/turf/open/floor/iron,
/area/station/commons/fitness)
+"rYA" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 6
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/turf/open/floor/iron/dark,
+/area/station/maintenance/port/aft)
"rYV" = (
/obj/effect/landmark/start/security_medic,
+/obj/effect/turf_decal/trimline/red/real_red/filled/line,
+/obj/effect/turf_decal/trimline/dark/line,
/turf/open/floor/iron/white,
/area/station/security/medical)
"rZm" = (
@@ -57651,6 +70890,9 @@
/obj/effect/turf_decal/trimline/dark_blue/filled/line{
dir = 8
},
+/obj/effect/turf_decal/trimline/dark/line{
+ dir = 8
+ },
/turf/open/floor/iron/dark,
/area/station/security/execution/transfer)
"sad" = (
@@ -57660,10 +70902,6 @@
/turf/open/space/basic,
/area/space/nearstation)
"sas" = (
-/obj/effect/turf_decal/tile/dark_blue{
- dir = 4
- },
-/obj/effect/turf_decal/tile/dark_blue,
/obj/structure/cable,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
dir = 4
@@ -57671,6 +70909,12 @@
/obj/machinery/door/window/right/directional/east{
name = "Brig Infirmary"
},
+/obj/effect/turf_decal/trimline/red/real_red/filled/warning{
+ dir = 6
+ },
+/obj/effect/turf_decal/trimline/dark/warning{
+ dir = 6
+ },
/turf/open/floor/iron/white,
/area/station/security/medical)
"saJ" = (
@@ -57692,6 +70936,9 @@
/obj/effect/turf_decal/trimline/dark_blue/filled/line{
dir = 1
},
+/obj/effect/turf_decal/trimline/dark/line{
+ dir = 1
+ },
/turf/open/floor/iron/dark,
/area/station/security/brig)
"sbS" = (
@@ -57700,7 +70947,18 @@
},
/obj/machinery/power/apc/auto_name/directional/south,
/obj/structure/cable,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/purple/filled/line{
+ alpha = 160;
+ color = "#6a3182";
+ dir = 10
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 10
+ },
+/obj/effect/turf_decal/siding/dark/corner{
+ dir = 4
+ },
+/turf/open/floor/iron/dark/small,
/area/station/science/robotics/mechbay)
"sch" = (
/obj/effect/turf_decal/siding/thinplating_new{
@@ -57708,6 +70966,10 @@
},
/turf/open/floor/iron,
/area/station/commons/fitness)
+"scr" = (
+/obj/machinery/light/directional/north,
+/turf/open/floor/engine/xenobio,
+/area/station/science/xenobiology)
"scA" = (
/obj/machinery/airalarm/directional/south,
/obj/structure/chair/sofa/corp/right{
@@ -57723,6 +70985,19 @@
/obj/effect/mapping_helpers/broken_floor,
/turf/open/floor/iron,
/area/station/maintenance/port/fore)
+"scO" = (
+/obj/structure/disposalpipe/segment,
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/turf_decal/siding/dark{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/dark/corner{
+ dir = 1
+ },
+/turf/open/floor/wood/large,
+/area/station/command/meeting_room)
"scP" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/iron/dark,
@@ -57742,8 +71017,23 @@
/obj/effect/turf_decal/stripes/corner{
dir = 1
},
+/obj/structure/cable,
/turf/open/floor/plating,
/area/station/maintenance/aft)
+"sdt" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/blue/filled/corner{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/blue/filled/corner{
+ dir = 8
+ },
+/turf/open/floor/iron/edge{
+ dir = 4
+ },
+/area/station/hallway/secondary/entry)
"sdO" = (
/obj/effect/landmark/start/hangover,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
@@ -57754,16 +71044,6 @@
},
/area/station/service/chapel)
"sdT" = (
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/medical/glass{
id_tag = "MedbayFoyer";
@@ -57772,8 +71052,21 @@
/obj/effect/mapping_helpers/airlock/access/any/medical/general,
/obj/effect/mapping_helpers/airlock/unres,
/obj/effect/landmark/navigate_destination,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/tile/blue/full,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/medical/medbay/central)
+"sea" = (
+/obj/structure/disposalpipe/segment,
+/obj/effect/turf_decal/trimline/brown/arrow_cw{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/brown/mid_joiner{
+ dir = 8
+ },
+/turf/open/floor/iron/edge{
+ dir = 8
+ },
+/area/station/hallway/primary/central)
"sed" = (
/turf/open/floor/iron,
/area/station/hallway/primary/central/fore)
@@ -57782,13 +71075,16 @@
/obj/item/t_scanner,
/obj/structure/cable,
/obj/machinery/airalarm/directional/north,
+/obj/effect/turf_decal/trimline/yellow/filled/line{
+ dir = 1
+ },
/turf/open/floor/iron,
/area/station/commons/storage/primary)
"ses" = (
/obj/structure/table,
/obj/machinery/cell_charger,
/obj/item/radio/intercom/directional/south,
-/turf/open/floor/iron,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/command/gateway)
"seE" = (
/obj/docking_port/stationary/escape_pod{
@@ -57797,9 +71093,6 @@
/turf/open/floor/plating/airless,
/area/space/nearstation)
"seW" = (
-/obj/effect/turf_decal/siding/blue{
- dir = 8
- },
/obj/structure/flora/bush/fullgrass,
/obj/structure/rack,
/obj/item/plant_analyzer,
@@ -57825,11 +71118,43 @@
/obj/item/fishing_hook/magnet,
/obj/item/fishing_line/bouncy,
/obj/item/fishing_rod,
+/obj/effect/turf_decal/siding/wood{
+ dir = 8
+ },
/turf/open/floor/grass,
/area/station/security/prison)
+"sfE" = (
+/obj/structure/fluff/metalpole/anchor{
+ dir = 1
+ },
+/turf/open/floor/plating,
+/area/station/hallway/secondary/entry)
"sfV" = (
-/turf/open/floor/iron/checker,
+/obj/effect/turf_decal/trimline/dark/filled/warning{
+ alpha = 160;
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/purple/warning{
+ alpha = 200;
+ color = "#700047";
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/turf/open/floor/iron/white/smooth_half{
+ dir = 1
+ },
/area/station/science/lab)
+"sgg" = (
+/obj/effect/turf_decal/siding/dark{
+ dir = 10
+ },
+/turf/open/floor/circuit/green,
+/area/station/ai_monitored/turret_protected/ai_upload)
"sgl" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
dir = 1
@@ -57862,16 +71187,12 @@
/area/station/security/prison)
"sgR" = (
/obj/structure/table,
-/obj/effect/turf_decal/tile/green,
-/obj/effect/turf_decal/tile/green{
- dir = 8
- },
-/obj/effect/turf_decal/tile/green{
- dir = 1
- },
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
dir = 1
},
+/obj/effect/turf_decal/trimline/green/filled/line{
+ dir = 10
+ },
/obj/machinery/firealarm/directional/south,
/turf/open/floor/iron,
/area/station/medical/virology)
@@ -57884,10 +71205,26 @@
/obj/effect/spawner/random/burgerstation/loot/with_maintenance_loot,
/turf/open/floor/plating,
/area/station/maintenance/starboard/fore)
+"shC" = (
+/obj/effect/landmark/start/hangover,
+/obj/effect/turf_decal/siding/wood{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/neutral/warning{
+ dir = 1;
+ alpha = 100
+ },
+/turf/open/floor/iron/textured_half,
+/area/station/hallway/primary/starboard)
"shM" = (
/obj/structure/sign/poster/random/directional/east,
/turf/open/floor/iron,
/area/station/security/prison/safe)
+"siw" = (
+/obj/machinery/door/firedoor,
+/obj/machinery/firealarm/directional/south,
+/turf/open/floor/iron/large,
+/area/station/hallway/primary/starboard)
"siK" = (
/obj/structure/extinguisher_cabinet/directional/east,
/obj/effect/turf_decal/stripes/corner,
@@ -57895,21 +71232,57 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/violet/visible,
/turf/open/floor/iron/white,
/area/station/science/ordnance)
+"sje" = (
+/obj/effect/mapping_helpers/broken_floor,
+/obj/machinery/duct,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/turf/open/floor/iron/freezer,
+/area/station/maintenance/port/aft)
"sjo" = (
-/obj/effect/decal/cleanable/blood/oil/slippery,
+/obj/structure/disposalpipe/segment,
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer5,
/turf/open/floor/plating,
/area/station/maintenance/aft)
"sjA" = (
/obj/structure/disposalpipe/segment{
dir = 4
},
-/turf/open/floor/iron/dark,
+/obj/structure/table/reinforced,
+/obj/structure/window/reinforced/spawner/directional/east,
+/obj/machinery/door/window/left/directional/north{
+ req_access = list("eva");
+ name = "Tools Storage"
+ },
+/obj/item/analyzer,
+/obj/item/t_scanner{
+ pixel_x = 6;
+ pixel_y = 3
+ },
+/obj/item/stack/cable_coil{
+ pixel_x = 2;
+ pixel_y = 5
+ },
+/obj/item/multitool{
+ pixel_x = -10
+ },
+/obj/item/multitool{
+ pixel_x = -5
+ },
+/obj/item/multitool,
+/obj/effect/mapping_helpers/airlock/red_alert_access,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/ai_monitored/command/storage/eva)
"sjK" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer5,
/turf/open/floor/plating,
/area/station/maintenance/aft)
"sjV" = (
@@ -57922,13 +71295,29 @@
pixel_x = 1;
pixel_y = 6
},
-/obj/item/clothing/glasses/hud/health/sunglasses{
- pixel_y = 11;
- pixel_x = 3
+/obj/structure/noticeboard/cmo{
+ pixel_y = 4;
+ pixel_x = -32
},
/turf/open/floor/iron/dark,
/area/station/command/heads_quarters/cmo)
+"skc" = (
+/obj/structure/mineral_door/wood{
+ name = "Maintenance Bar"
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 6
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/turf/open/floor/plating,
+/area/station/maintenance/port/aft)
"skp" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/effect/turf_decal/trimline/blue/filled/line{
dir = 4
},
@@ -57937,23 +71326,8 @@
network = list("ss13","medbay");
pixel_y = -22
},
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/dark,
/area/station/command/heads_quarters/cmo)
-"skt" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
- dir = 4
- },
-/obj/structure/cable,
-/obj/machinery/door/firedoor,
-/turf/open/floor/iron,
-/area/station/hallway/primary/starboard)
"skF" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -57962,6 +71336,19 @@
/obj/structure/training_machine,
/turf/open/floor/iron,
/area/station/security/office)
+"skL" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 4
+ },
+/obj/structure/cable,
+/turf/open/floor/plating,
+/area/station/maintenance/fore)
"skO" = (
/obj/structure/lattice,
/obj/effect/spawner/random/structure/grille,
@@ -57972,11 +71359,11 @@
/turf/closed/wall,
/area/station/security/execution/transfer)
"slj" = (
-/obj/machinery/camera/directional/east{
- c_tag = "Chapel South"
- },
-/turf/open/floor/iron/dark,
-/area/station/service/chapel)
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/cable,
+/turf/open/floor/iron/dark/side,
+/area/station/security/prison)
"slk" = (
/obj/machinery/door/airlock/maintenance,
/obj/effect/mapping_helpers/airlock/cyclelink_helper,
@@ -57989,6 +71376,18 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/plating,
/area/station/maintenance/department/medical/morgue)
+"slp" = (
+/obj/effect/landmark/start/hangover,
+/obj/effect/turf_decal/trimline/dark_green/warning{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/wood{
+ dir = 1
+ },
+/turf/open/floor/iron/edge{
+ dir = 1
+ },
+/area/station/hallway/primary/starboard)
"slC" = (
/obj/effect/spawner/random/trash/mess,
/turf/open/floor/iron/grimy,
@@ -58028,6 +71427,9 @@
"smy" = (
/obj/structure/chair,
/obj/structure/cable,
+/obj/effect/turf_decal/siding/wood{
+ dir = 1
+ },
/turf/open/floor/wood,
/area/station/security/prison)
"smF" = (
@@ -58053,6 +71455,15 @@
/obj/effect/landmark/firealarm_sanity,
/turf/open/floor/iron/dark,
/area/station/security/brig)
+"snH" = (
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/machinery/firealarm/directional/west,
+/turf/open/floor/iron/dark/side{
+ dir = 8
+ },
+/area/station/hallway/primary/central/fore)
"snU" = (
/obj/effect/turf_decal/trimline/dark_blue/filled/line{
dir = 10
@@ -58064,6 +71475,9 @@
/obj/item/clothing/under/rank/prisoner/skirt/highsec,
/obj/item/clothing/under/rank/prisoner/supermax,
/obj/item/clothing/under/rank/prisoner/skirt/supermax,
+/obj/effect/turf_decal/trimline/dark/line{
+ dir = 10
+ },
/turf/open/floor/iron/dark,
/area/station/security/execution/transfer)
"snW" = (
@@ -58096,17 +71510,41 @@
/turf/open/floor/carpet,
/area/station/service/chapel)
"sob" = (
-/obj/machinery/light/directional/west,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 4
},
+/obj/machinery/light/directional/west,
/obj/effect/landmark/event_spawn,
-/turf/open/floor/iron/dark/textured,
+/obj/effect/turf_decal/siding/wideplating_new/dark/end{
+ dir = 8
+ },
+/turf/open/floor/iron/textured_large,
/area/station/command/gateway)
"soi" = (
/obj/effect/spawner/random/burgerstation/blocking,
/turf/open/floor/plating,
/area/station/maintenance/aft)
+"sor" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/trimline/dark/filled/line{
+ alpha = 160;
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/dark/filled/mid_joiner{
+ dir = 4;
+ alpha = 160
+ },
+/obj/effect/turf_decal/trimline/purple/line{
+ alpha = 200;
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 4
+ },
+/turf/open/floor/iron/white/smooth_edge{
+ dir = 4
+ },
+/area/station/science/research)
"sox" = (
/obj/item/stack/sheet/mineral/wood,
/obj/item/stack/sheet/mineral/wood,
@@ -58190,6 +71628,14 @@
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating/airless,
/area/station/maintenance/port/fore)
+"spp" = (
+/obj/structure/window/reinforced/spawner/directional/north,
+/obj/structure/hedge,
+/obj/structure/window/reinforced/spawner/directional/south,
+/obj/structure/window/reinforced/spawner/directional/east,
+/obj/structure/window/reinforced/spawner/directional/west,
+/turf/open/floor/plating,
+/area/station/cargo/sorting)
"spV" = (
/obj/effect/turf_decal/trimline/dark_blue/filled/line,
/obj/effect/landmark/start/security_officer,
@@ -58215,21 +71661,49 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/hallway/primary/starboard)
-"srd" = (
+"sqQ" = (
+/obj/effect/turf_decal/trimline/brown/filled/corner{
+ dir = 1
+ },
+/turf/open/floor/iron/textured_corner{
+ dir = 1
+ },
+/area/station/cargo/storage)
+"srb" = (
/obj/structure/cable,
-/obj/item/radio/intercom/directional/north,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 8
+ },
+/obj/item/storage/briefcase/secure{
+ pixel_x = 0;
+ pixel_y = 18
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 1
+ },
+/turf/open/floor/iron/edge{
+ dir = 1
+ },
+/area/station/command/bridge)
+"srd" = (
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
/obj/machinery/camera/directional/north,
+/obj/item/radio/intercom/directional/north,
/turf/open/floor/iron/dark,
/area/station/commons/fitness/recreation/entertainment)
+"srm" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer5,
+/turf/open/floor/plating,
+/area/station/maintenance/aft)
"srt" = (
/obj/effect/turf_decal/delivery,
/obj/machinery/door/window/left/directional/south{
name = "Hydroponics Delivery";
req_access = list("hydroponics")
},
+/obj/structure/flora/bush/leafy,
/turf/open/floor/iron,
/area/station/service/hydroponics)
"srx" = (
@@ -58256,6 +71730,15 @@
/obj/item/taperecorder,
/turf/open/floor/iron/dark/small,
/area/station/security/interrogation)
+"srS" = (
+/obj/effect/turf_decal/siding/dark{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 8
+ },
+/turf/open/floor/circuit/red,
+/area/station/ai_monitored/turret_protected/ai_upload)
"srU" = (
/obj/structure/closet/lasertag/red,
/turf/open/floor/plating,
@@ -58265,15 +71748,26 @@
/obj/effect/landmark/start/hangover/closet,
/turf/open/floor/iron/dark,
/area/station/commons/fitness)
+"ssR" = (
+/obj/structure/window/reinforced/spawner/directional/north,
+/obj/structure/hedge,
+/obj/structure/window/reinforced/spawner/directional/south,
+/obj/structure/window/reinforced/spawner/directional/east,
+/obj/structure/window/reinforced/spawner/directional/west,
+/obj/machinery/door/poddoor/shutters/preopen{
+ id = "robotics";
+ name = "Robotics Lab Shutters";
+ dir = 1
+ },
+/turf/open/floor/plating,
+/area/station/science/robotics/lab)
"stP" = (
-/obj/structure/disposalpipe/trunk{
- dir = 4
- },
+/obj/structure/disposalpipe/trunk,
/obj/structure/disposaloutlet,
-/obj/machinery/camera/directional/west{
- c_tag = "Xenobiology Cell 5";
- network = list("ss13","xeno")
+/obj/effect/turf_decal/siding/dark{
+ dir = 9
},
+/obj/effect/turf_decal/siding/dark/corner,
/turf/open/floor/engine,
/area/station/science/xenobiology)
"suJ" = (
@@ -58306,9 +71800,12 @@
/turf/open/floor/iron/dark,
/area/station/hallway/secondary/exit)
"svg" = (
-/obj/effect/turf_decal/tile/blue,
/obj/machinery/door/firedoor,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/blue/warning{
+ dir = 4;
+ alpha = 200
+ },
+/turf/open/floor/iron/large,
/area/station/hallway/primary/central)
"svw" = (
/obj/structure/cable,
@@ -58320,9 +71817,10 @@
/turf/open/floor/iron/dark,
/area/station/security/brig)
"svO" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/effect/turf_decal/delivery,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/bot,
+/obj/structure/closet/crate/preopen,
+/obj/effect/spawner/random/maintenance,
+/turf/open/floor/iron/large,
/area/station/cargo/storage)
"swh" = (
/obj/structure/disposalpipe/segment,
@@ -58336,9 +71834,9 @@
/turf/open/floor/plating,
/area/station/maintenance/department/security)
"swA" = (
-/obj/machinery/door/firedoor,
/obj/structure/cable,
-/turf/open/floor/iron,
+/obj/machinery/door/firedoor,
+/turf/open/floor/iron/large,
/area/station/hallway/primary/central)
"swH" = (
/obj/structure/table/reinforced,
@@ -58362,9 +71860,11 @@
/turf/open/floor/plating,
/area/station/ai_monitored/turret_protected/aisat/hallway)
"swW" = (
-/obj/effect/turf_decal/tile/yellow,
-/obj/effect/turf_decal/tile/brown{
- dir = 8
+/obj/effect/turf_decal/trimline/brown/filled/line{
+ dir = 10
+ },
+/obj/effect/turf_decal/trimline/dark/line{
+ dir = 10
},
/turf/open/floor/iron,
/area/station/cargo/miningdock)
@@ -58376,19 +71876,26 @@
/area/station/security/prison)
"sxl" = (
/obj/structure/cable,
-/obj/machinery/door/airlock/public/glass,
+/obj/machinery/door/airlock/public/glass{
+ name = "Prison Garden"
+ },
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron,
/area/station/security/prison)
"sxQ" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
/obj/machinery/door/firedoor,
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/door/airlock/medical/glass{
+ id_tag = "MedbayFoyer";
+ name = "Cryo Cells"
+ },
+/obj/effect/mapping_helpers/airlock/access/any/medical/general,
/turf/open/floor/iron/dark,
/area/station/medical/treatment_center)
"sxT" = (
@@ -58401,21 +71908,15 @@
"syF" = (
/obj/structure/cable,
/obj/machinery/power/apc/auto_name/directional/north,
-/obj/structure/closet/crate/eva,
-/obj/item/storage/box/emergency_spacesuit,
-/obj/item/storage/box/emergency_spacesuit,
-/obj/item/storage/box/emergency_spacesuit,
-/obj/item/storage/box/emergency_spacesuit,
-/turf/open/floor/iron/dark,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/ai_monitored/command/storage/eva)
"syK" = (
-/obj/structure/window/spawner/directional/south,
-/obj/structure/window/spawner/directional/west,
/obj/machinery/hydroponics/constructable,
/obj/machinery/door/window/right/directional/east,
/obj/effect/turf_decal/siding/thinplating/dark{
dir = 9
},
+/obj/machinery/door/window/right/directional/south,
/turf/open/floor/iron/smooth_large,
/area/station/service/hydroponics)
"syN" = (
@@ -58426,6 +71927,13 @@
/obj/effect/landmark/start/blueshield,
/turf/open/floor/wood,
/area/station/command/heads_quarters/blueshield)
+"syS" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/dark/corner,
+/turf/open/floor/plating,
+/area/station/maintenance/aft)
"szn" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -58441,6 +71949,13 @@
/obj/machinery/digital_clock/directional/east,
/turf/open/floor/carpet/black,
/area/station/commons/dorms)
+"szE" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 6
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer4,
+/turf/open/floor/plating,
+/area/station/maintenance/port/aft)
"szO" = (
/obj/structure/window/reinforced/spawner/directional/west,
/obj/effect/turf_decal/stripes/line{
@@ -58450,7 +71965,12 @@
dir = 5
},
/obj/structure/cable,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/turf/open/floor/iron/dark/side{
+ dir = 8
+ },
/area/station/commons/locker)
"sAw" = (
/obj/structure/disposalpipe/segment,
@@ -58463,22 +71983,25 @@
/turf/open/floor/wood,
/area/station/hallway/secondary/service)
"sAN" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
- dir = 4
- },
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 4
},
/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer5,
/turf/open/floor/iron/dark,
/area/station/hallway/secondary/exit)
"sAR" = (
-/obj/machinery/door/airlock/research{
- name = "Cyto Access"
+/obj/effect/spawner/structure/window/reinforced,
+/obj/machinery/door/poddoor/preopen{
+ id = "xenobiomain";
+ name = "Containment Blast Door"
},
-/obj/effect/mapping_helpers/airlock/access/any/science/xenobio,
-/turf/open/floor/iron/smooth_large,
-/area/station/science/cytology)
+/obj/structure/cable,
+/obj/effect/turf_decal/box/white{
+ color = "#D381C9"
+ },
+/turf/open/floor/plating,
+/area/station/science/xenobiology)
"sAV" = (
/obj/structure/grille,
/obj/effect/decal/cleanable/dirt,
@@ -58500,6 +72023,10 @@
/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/iron/dark,
/area/station/commons/fitness/recreation/entertainment)
+"sBJ" = (
+/obj/effect/turf_decal/siding/dark,
+/turf/open/floor/iron/textured_half,
+/area/station/hallway/primary/central)
"sBZ" = (
/obj/effect/turf_decal/loading_area{
dir = 4
@@ -58517,6 +72044,12 @@
"sCd" = (
/turf/open/floor/iron/dark,
/area/station/security/prison)
+"sCf" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 5
+ },
+/turf/open/floor/iron/dark/small,
+/area/station/science/robotics/lab)
"sCj" = (
/obj/structure/disposalpipe/segment{
dir = 9
@@ -58524,15 +72057,32 @@
/obj/structure/sign/poster/random/directional/east,
/turf/open/floor/plating,
/area/station/maintenance/port)
+"sCL" = (
+/obj/effect/spawner/random/vending/colavend,
+/obj/effect/turf_decal/trimline/blue/filled/line{
+ dir = 4
+ },
+/turf/open/floor/iron/edge{
+ dir = 8
+ },
+/area/station/hallway/secondary/entry)
"sCZ" = (
-/obj/machinery/power/apc/auto_name/directional/north,
/obj/structure/cable,
+/obj/machinery/power/apc/auto_name/directional/north,
/turf/open/floor/plating,
/area/station/maintenance/central)
"sDb" = (
-/obj/machinery/status_display/ai/directional/west,
/obj/structure/disposalpipe/segment,
-/turf/open/floor/iron,
+/obj/machinery/status_display/ai/directional/west,
+/obj/effect/turf_decal/trimline/brown/corner{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/dark/corner{
+ dir = 1
+ },
+/turf/open/floor/iron/corner{
+ dir = 4
+ },
/area/station/hallway/primary/central)
"sDp" = (
/obj/structure/table/wood,
@@ -58551,10 +72101,13 @@
/turf/open/floor/iron/smooth_large,
/area/station/science/cytology)
"sDv" = (
-/obj/item/storage/toolbox/emergency,
+/obj/item/storage/toolbox/emergency{
+ pixel_x = -1;
+ pixel_y = 8
+ },
/obj/structure/table,
/obj/item/multitool,
-/turf/open/floor/iron/dark,
+/turf/open/floor/iron/dark/textured_large,
/area/station/cargo/miningdock)
"sDM" = (
/obj/effect/turf_decal/tile/neutral/opposingcorners{
@@ -58580,10 +72133,10 @@
/turf/open/floor/iron/dark,
/area/station/ai_monitored/turret_protected/aisat_interior)
"sED" = (
-/obj/effect/turf_decal/siding/blue{
+/obj/machinery/hydroponics/soil,
+/obj/effect/turf_decal/siding/wood{
dir = 8
},
-/obj/machinery/hydroponics/soil,
/turf/open/floor/grass,
/area/station/security/prison)
"sFb" = (
@@ -58600,6 +72153,10 @@
},
/turf/open/floor/plating,
/area/station/security/prison/safe)
+"sFk" = (
+/obj/effect/turf_decal/trimline/brown/filled/warning,
+/turf/open/floor/iron,
+/area/station/cargo/storage)
"sFs" = (
/obj/machinery/atmospherics/pipe/bridge_pipe/green/visible,
/obj/machinery/atmospherics/components/binary/pump{
@@ -58619,13 +72176,17 @@
/turf/open/floor/iron/smooth_large,
/area/station/engineering/engine_smes)
"sGk" = (
+/obj/structure/cable,
/obj/effect/landmark/observer_start,
/obj/effect/turf_decal/plaque{
icon_state = "L8"
},
-/obj/structure/cable,
/turf/open/floor/iron,
/area/station/hallway/primary/central)
+"sGr" = (
+/obj/effect/spawner/structure/window/reinforced/tinted,
+/turf/open/floor/plating,
+/area/station/cargo/warehouse)
"sGs" = (
/obj/machinery/suit_storage_unit/cmo,
/obj/effect/turf_decal/stripes/line{
@@ -58633,6 +72194,11 @@
},
/turf/open/floor/iron/dark,
/area/station/command/heads_quarters/cmo)
+"sGK" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer4,
+/turf/open/floor/iron,
+/area/station/maintenance/starboard)
"sHc" = (
/obj/structure/table/wood,
/obj/item/storage/briefcase,
@@ -58644,12 +72210,25 @@
/turf/open/floor/wood,
/area/station/commons/vacant_room/office)
"sHn" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
/obj/structure/railing{
dir = 4
},
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
/turf/open/floor/iron/dark,
/area/station/hallway/secondary/exit)
+"sHF" = (
+/obj/machinery/holopad,
+/turf/open/floor/iron/large,
+/area/station/hallway/secondary/entry)
+"sHK" = (
+/obj/effect/turf_decal/trimline/blue/corner{
+ dir = 1
+ },
+/obj/machinery/firealarm/directional/north,
+/turf/open/floor/iron/edge{
+ dir = 1
+ },
+/area/station/hallway/primary/port)
"sHX" = (
/obj/effect/turf_decal/tile/blue{
dir = 8
@@ -58682,20 +72261,57 @@
/turf/open/floor/iron/white,
/area/station/science/ordnance)
"sIo" = (
-/obj/effect/turf_decal/tile/yellow{
- dir = 8
+/obj/effect/turf_decal/trimline/dark_blue/filled/line,
+/turf/open/floor/iron/dark,
+/area/station/hallway/primary/fore)
+"sIB" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/turf_decal/trimline/blue/filled/corner{
+ alpha = 160;
+ dir = 1
},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron/dark/side{
+/obj/effect/turf_decal/trimline/white/corner{
+ dir = 1
+ },
+/turf/open/floor/iron/white,
+/area/station/medical/medbay/central)
+"sIG" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/structure/cable,
+/obj/effect/turf_decal/trimline/dark/filled/line{
+ alpha = 160;
dir = 5
},
-/area/station/engineering/atmos/hfr_room)
+/obj/effect/turf_decal/trimline/dark/filled/mid_joiner{
+ dir = 1;
+ alpha = 160
+ },
+/obj/effect/turf_decal/trimline/dark/filled/mid_joiner{
+ dir = 4;
+ alpha = 160
+ },
+/obj/effect/turf_decal/trimline/purple/line{
+ alpha = 200;
+ dir = 5;
+ color = "#a56dc2"
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 5
+ },
+/turf/open/floor/iron/white/smooth_corner{
+ dir = 8
+ },
+/area/station/science/xenobiology)
"sIY" = (
/obj/machinery/door/window/right/directional/west{
name = "Secure Storage";
req_access = list("morgue_secure")
},
-/turf/open/floor/iron/dark,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/medical/morgue)
"sIZ" = (
/obj/effect/decal/cleanable/dirt,
@@ -58706,7 +72322,6 @@
/turf/open/floor/wood,
/area/station/commons/vacant_room/office)
"sJf" = (
-/obj/effect/landmark/start/paramedic,
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 4
@@ -58714,15 +72329,19 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 8
},
-/obj/effect/turf_decal/trimline/blue/filled/corner,
+/obj/effect/turf_decal/siding/dark_blue/corner,
+/obj/effect/turf_decal/trimline/blue/filled/corner{
+ alpha = 160
+ },
+/obj/effect/turf_decal/trimline/white/corner,
/turf/open/floor/iron/white,
/area/station/medical/medbay/central)
"sJq" = (
-/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/structure/cable,
-/turf/open/floor/iron,
+/obj/machinery/door/firedoor,
+/turf/open/floor/iron/large,
/area/station/hallway/primary/central)
"sJB" = (
/obj/effect/turf_decal/tile/blue{
@@ -58745,6 +72364,31 @@
/obj/machinery/power/port_gen/pacman,
/turf/open/floor/plating,
/area/station/maintenance/department/electrical)
+"sKu" = (
+/obj/structure/cable,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/dark_blue/filled/line{
+ dir = 1
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plating,
+/area/station/maintenance/fore)
+"sKv" = (
+/obj/effect/turf_decal/trimline/blue/filled/corner{
+ dir = 4
+ },
+/turf/open/floor/iron/textured_corner{
+ dir = 4
+ },
+/area/station/hallway/secondary/entry)
+"sKB" = (
+/obj/structure/chair/sofa/bench/left{
+ dir = 1
+ },
+/turf/open/floor/iron/dark/side,
+/area/station/hallway/secondary/entry)
"sKC" = (
/obj/effect/mapping_helpers/airlock/cyclelink_helper,
/obj/machinery/door/airlock/external{
@@ -58754,11 +72398,34 @@
/obj/structure/cable,
/turf/open/floor/plating,
/area/station/maintenance/solars/starboard/fore)
-"sKK" = (
+"sKD" = (
+/obj/effect/turf_decal/trimline/dark/filled/warning{
+ alpha = 160;
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/purple/warning{
+ alpha = 200;
+ dir = 4;
+ color = "#a56dc2"
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 4
+ },
/obj/structure/cable,
-/turf/open/floor/iron/dark,
-/area/station/commons/fitness/recreation/entertainment)
+/turf/open/floor/iron/white/smooth_edge{
+ dir = 4
+ },
+/area/station/science/xenobiology)
+"sKK" = (
+/obj/effect/landmark/start/chemist,
+/obj/structure/marker_beacon/bronze,
+/turf/open/floor/iron/dark/smooth_large,
+/area/station/medical/chemistry)
"sKS" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+ dir = 4
+ },
/obj/effect/turf_decal/trimline/blue/filled/line{
dir = 1
},
@@ -58770,13 +72437,16 @@
/obj/effect/mapping_helpers/requests_console/announcement,
/obj/effect/mapping_helpers/requests_console/information,
/obj/effect/mapping_helpers/requests_console/assistance,
-/obj/structure/cable,
/obj/machinery/light/directional/north,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
- dir = 4
- },
/turf/open/floor/iron/dark,
/area/station/command/heads_quarters/cmo)
+"sKW" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 5
+ },
+/turf/open/floor/iron/smooth_large,
+/area/station/engineering/main)
"sKX" = (
/obj/machinery/light/directional/north,
/obj/structure/closet/secure_closet/freezer/meat/all_access,
@@ -58800,6 +72470,19 @@
},
/turf/open/floor/iron/dark,
/area/station/security/interrogation)
+"sLs" = (
+/obj/machinery/portable_atmospherics/canister,
+/obj/effect/turf_decal/bot,
+/obj/effect/turf_decal/trimline/yellow/filled/line{
+ dir = 4;
+ alpha = 120
+ },
+/obj/effect/turf_decal/trimline/dark_blue/line{
+ alpha = 200;
+ dir = 4
+ },
+/turf/open/floor/iron/dark,
+/area/station/engineering/atmos/hfr_room)
"sLR" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
dir = 1
@@ -58812,26 +72495,29 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 4
},
-/obj/effect/turf_decal/tile/blue{
- dir = 8
+/obj/effect/turf_decal/trimline/yellow/filled/line{
+ dir = 1;
+ alpha = 120
},
-/obj/effect/turf_decal/tile/blue,
-/turf/open/floor/iron/white,
-/area/station/medical/chemistry)
-"sMi" = (
-/obj/effect/turf_decal/stripes/line,
-/obj/effect/turf_decal/stripes/line{
+/obj/effect/turf_decal/trimline/blue/line{
+ alpha = 200;
dir = 1
},
-/obj/machinery/door/firedoor,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
- dir = 9
+/turf/open/floor/iron/white/smooth_half,
+/area/station/medical/chemistry)
+"sMi" = (
+/obj/effect/turf_decal/trimline/yellow/filled/line{
+ dir = 4;
+ alpha = 120
},
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
- dir = 9
+/obj/effect/turf_decal/trimline/blue/line{
+ alpha = 200;
+ dir = 4
},
-/turf/open/floor/iron/dark,
-/area/station/medical/medbay/aft)
+/turf/open/floor/iron/white/smooth_edge{
+ dir = 4
+ },
+/area/station/medical/chemistry)
"sMz" = (
/obj/effect/turf_decal/tile/red/opposingcorners,
/obj/structure/chair/sofa/bench/left{
@@ -58839,14 +72525,6 @@
},
/turf/open/floor/iron,
/area/station/commons/fitness/recreation)
-"sNv" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/cable,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/landmark/firealarm_sanity,
-/turf/open/floor/iron,
-/area/station/security/prison)
"sNC" = (
/obj/structure/chalkboard,
/turf/closed/wall,
@@ -58856,14 +72534,27 @@
/turf/open/floor/plating,
/area/station/maintenance/starboard/fore)
"sNU" = (
-/obj/effect/turf_decal/tile/blue{
- dir = 8
+/obj/structure/fluff/metalpole{
+ dir = 1;
+ pixel_y = 32
},
-/obj/machinery/camera/directional/west{
- c_tag = "Central Hallway North"
+/obj/machinery/door/firedoor/border_only{
+ dir = 1
},
-/turf/open/floor/iron,
-/area/station/hallway/primary/fore)
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes/white/line{
+ color = "#52B4E9";
+ dir = 1;
+ name = "blue line"
+ },
+/obj/structure/railing{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/blue/fourcorners,
+/turf/open/floor/iron/white,
+/area/station/hallway/secondary/entry)
"sNV" = (
/obj/structure/closet/toolcloset,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
@@ -58887,19 +72578,13 @@
/obj/structure/chair{
dir = 1
},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 1
+ },
/turf/open/floor/iron,
/area/station/maintenance/port/fore)
"sOu" = (
/obj/structure/table,
-/obj/effect/turf_decal/tile/yellow{
- dir = 1
- },
-/obj/effect/turf_decal/tile/yellow{
- dir = 4
- },
-/obj/effect/turf_decal/tile/yellow{
- dir = 8
- },
/obj/structure/cable,
/obj/machinery/power/apc/auto_name/directional/north,
/obj/item/stock_parts/subspace/amplifier,
@@ -58932,6 +72617,9 @@
/obj/item/circuitboard/machine/telecomms/hub,
/obj/item/circuitboard/machine/telecomms/processor,
/obj/item/circuitboard/machine/telecomms/bus,
+/obj/effect/turf_decal/trimline/yellow/filled/line{
+ dir = 9
+ },
/turf/open/floor/iron,
/area/station/tcommsat/computer)
"sOI" = (
@@ -58945,7 +72633,9 @@
"sOP" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
/obj/effect/landmark/start/hangover,
-/turf/open/floor/iron,
+/turf/open/floor/iron/edge{
+ dir = 1
+ },
/area/station/hallway/primary/starboard)
"sOU" = (
/obj/machinery/atmospherics/components/unary/thermomachine/heater,
@@ -58974,12 +72664,16 @@
/turf/open/space/basic,
/area/space/nearstation)
"sPz" = (
-/obj/effect/landmark/event_spawn,
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/landmark/event_spawn,
/turf/open/floor/iron,
/area/station/hallway/primary/central)
+"sPD" = (
+/obj/machinery/atmospherics/components/tank/air/layer4,
+/turf/open/floor/iron/dark,
+/area/station/security/processing)
"sPH" = (
/obj/effect/turf_decal/bot_blue,
/obj/machinery/vending/security,
@@ -59004,8 +72698,14 @@
/obj/structure/bodycontainer/morgue{
dir = 1
},
-/turf/open/floor/iron/dark,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/medical/morgue)
+"sQs" = (
+/obj/effect/turf_decal/siding/thinplating_new/dark{
+ dir = 4
+ },
+/turf/open/floor/iron/dark,
+/area/station/science/robotics/lab)
"sQG" = (
/obj/structure/cable,
/obj/machinery/microwave,
@@ -59013,18 +72713,40 @@
/obj/machinery/firealarm/directional/west,
/turf/open/floor/iron/kitchen,
/area/station/security/prison)
-"sQV" = (
-/obj/machinery/restaurant_portal/restaurant,
-/turf/open/floor/iron/white/corner{
- dir = 1
- },
-/area/station/hallway/primary/starboard)
-"sRO" = (
-/obj/effect/turf_decal/tile/blue{
+"sQR" = (
+/obj/effect/turf_decal/trimline/brown/arrow_ccw{
dir = 8
},
+/obj/effect/turf_decal/trimline/brown/mid_joiner{
+ dir = 8
+ },
+/turf/open/floor/iron/edge{
+ dir = 8
+ },
+/area/station/hallway/primary/central)
+"sQV" = (
+/obj/machinery/restaurant_portal/restaurant,
+/obj/machinery/firealarm/directional/west,
+/turf/open/floor/iron/dark/smooth_large,
+/area/station/hallway/primary/starboard)
+"sRc" = (
+/obj/effect/turf_decal/siding/dark{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 8
+ },
+/turf/open/floor/circuit/green,
+/area/station/ai_monitored/turret_protected/ai_upload)
+"sRO" = (
/obj/effect/landmark/start/hangover,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/blue/arrow_ccw{
+ alpha = 200
+ },
+/obj/effect/turf_decal/trimline/blue/mid_joiner{
+ alpha = 200
+ },
+/turf/open/floor/iron/edge,
/area/station/hallway/primary/central)
"sRR" = (
/turf/closed/wall,
@@ -59037,24 +72759,38 @@
},
/turf/open/floor/iron,
/area/station/engineering/atmos)
+"sSp" = (
+/obj/effect/turf_decal/trimline/blue/arrow_cw{
+ alpha = 200
+ },
+/obj/effect/turf_decal/trimline/blue/mid_joiner{
+ alpha = 200
+ },
+/turf/open/floor/iron/corner{
+ dir = 1
+ },
+/area/station/hallway/primary/central)
"sSM" = (
/obj/effect/turf_decal/siding/wood{
dir = 1
},
-/obj/effect/turf_decal/siding/wood{
- dir = 1
+/obj/effect/turf_decal/siding/wood/end{
+ dir = 8
},
-/turf/open/floor/wood,
+/turf/open/floor/wood/large,
/area/station/command/heads_quarters/captain)
"sSO" = (
-/obj/machinery/camera/directional/south{
- c_tag = "HOP's Quarters"
- },
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 4
},
-/turf/open/floor/wood,
+/obj/machinery/camera/directional/south{
+ c_tag = "HOP's Quarters"
+ },
+/obj/effect/turf_decal/siding/wood{
+ dir = 10
+ },
+/turf/open/floor/wood/large,
/area/station/command/heads_quarters/hop)
"sSX" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
@@ -59066,9 +72802,39 @@
/turf/open/floor/wood,
/area/station/commons/vacant_room/office)
"sSZ" = (
-/obj/effect/turf_decal/stripes/line,
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/trimline/dark/filled/line{
+ alpha = 160;
+ dir = 10
+ },
+/obj/effect/turf_decal/trimline/purple/line{
+ color = "#700047";
+ alpha = 200;
+ dir = 10
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 10
+ },
+/obj/effect/turf_decal/trimline/dark/filled/mid_joiner{
+ dir = 8;
+ alpha = 160
+ },
+/obj/effect/turf_decal/trimline/dark/filled/mid_joiner{
+ dir = 2;
+ alpha = 160
+ },
+/turf/open/floor/iron/white/smooth_corner{
+ dir = 4
+ },
/area/station/science/lab)
+"sTh" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 1
+ },
+/turf/open/floor/plating,
+/area/station/maintenance/port/fore)
"sTt" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -59076,9 +72842,29 @@
/obj/structure/cable,
/turf/open/floor/carpet/purple,
/area/station/command/heads_quarters/rd)
+"sTE" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
+/obj/effect/turf_decal/trimline/brown/corner{
+ dir = 1
+ },
+/turf/open/floor/iron/textured_corner{
+ dir = 8
+ },
+/area/station/hallway/primary/starboard)
"sTU" = (
/turf/open/floor/carpet/lone,
/area/station/service/chapel)
+"sTW" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/obj/machinery/light/small/directional/east,
+/turf/open/floor/plating,
+/area/station/maintenance/starboard/aft)
"sUi" = (
/obj/structure/trash_pile,
/turf/open/floor/plating,
@@ -59087,8 +72873,15 @@
/obj/structure/railing{
dir = 8
},
+/obj/effect/turf_decal/siding/wideplating_new/dark{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/wideplating_new/dark{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron/dark/textured,
+/turf/open/floor/iron/textured_large,
/area/station/command/gateway)
"sUK" = (
/obj/machinery/atmospherics/pipe/bridge_pipe/orange/visible,
@@ -59105,6 +72898,9 @@
/obj/effect/turf_decal/trimline/dark_blue/filled/warning{
dir = 5
},
+/obj/effect/turf_decal/trimline/dark/warning{
+ dir = 5
+ },
/turf/open/floor/iron/dark,
/area/station/security/brig)
"sUX" = (
@@ -59115,15 +72911,36 @@
/obj/effect/mapping_helpers/burnt_floor,
/turf/open/floor/wood,
/area/station/maintenance/dorm_room)
-"sVI" = (
-/obj/effect/turf_decal/trimline/blue/filled/corner,
-/obj/effect/turf_decal/trimline/blue/filled/corner{
- dir = 8
+"sVm" = (
+/obj/effect/turf_decal/stripes/white/line{
+ color = "#a56dc2"
},
+/obj/machinery/door/firedoor/border_only,
+/obj/structure/fluff/metalpole/anchor{
+ pixel_y = -32
+ },
+/obj/effect/turf_decal/stripes/line,
+/obj/effect/turf_decal/stripes/white/line{
+ color = "#52B4E9";
+ name = "blue line"
+ },
+/obj/structure/railing/corner/end{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/blue/fourcorners,
+/turf/open/floor/iron/white,
+/area/station/hallway/secondary/entry)
+"sVI" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/iron/white,
-/area/station/medical/medbay/aft)
+/obj/effect/turf_decal/trimline/blue/filled/warning{
+ alpha = 160
+ },
+/obj/effect/turf_decal/trimline/dark_blue/warning{
+ alpha = 200
+ },
+/turf/open/floor/iron/white/smooth_edge,
+/area/station/medical/medbay/central)
"sVZ" = (
/obj/effect/landmark/event_spawn,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
@@ -59179,6 +72996,17 @@
/obj/effect/mapping_helpers/airlock/access/any/security/general,
/turf/open/floor/plating,
/area/station/security/office)
+"sXL" = (
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+ dir = 1
+ },
+/obj/machinery/door/airlock/external{
+ name = "Port Docking Bay 4"
+ },
+/obj/effect/mapping_helpers/airlock/unres,
+/obj/effect/turf_decal/weather/snow,
+/turf/open/floor/plating,
+/area/station/hallway/secondary/entry)
"sXS" = (
/obj/effect/turf_decal/trimline/blue/filled/corner{
dir = 4
@@ -59211,6 +73039,13 @@
},
/turf/open/floor/wood,
/area/station/command/heads_quarters/blueshield)
+"sXX" = (
+/obj/structure/cable,
+/obj/effect/turf_decal/trimline/brown/filled/line,
+/turf/open/floor/iron/textured_edge{
+ dir = 1
+ },
+/area/station/cargo/storage)
"sYn" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 9
@@ -59241,12 +73076,36 @@
dir = 1
},
/obj/machinery/firealarm/directional/north,
+/obj/effect/turf_decal/trimline/dark/warning{
+ dir = 1
+ },
/turf/open/floor/iron/dark,
/area/station/security/brig)
+"sZz" = (
+/obj/effect/turf_decal/siding/wideplating/corner{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 5
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer4,
+/turf/open/floor/iron/smooth_corner{
+ dir = 1
+ },
+/area/station/hallway/secondary/entry)
"sZT" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron,
/area/station/security/prison)
+"tal" = (
+/obj/effect/turf_decal/trimline/neutral/corner{
+ dir = 4;
+ alpha = 100
+ },
+/turf/open/floor/iron/edge{
+ dir = 1
+ },
+/area/station/hallway/primary/port)
"tat" = (
/obj/machinery/door/airlock/maintenance{
name = "Genetics Lab Maintenance"
@@ -59284,6 +73143,19 @@
/obj/machinery/meter/layer2,
/turf/open/floor/iron,
/area/station/science/ordnance)
+"taS" = (
+/obj/machinery/door/airlock/external{
+ name = "Escape Pod One"
+ },
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+ dir = 8
+ },
+/obj/effect/landmark/navigate_destination/dockescpod2,
+/obj/effect/mapping_helpers/airlock/unres{
+ dir = 8
+ },
+/turf/open/floor/plating,
+/area/station/hallway/secondary/entry)
"taY" = (
/mob/living/carbon/human/species/monkey,
/turf/open/floor/grass,
@@ -59301,11 +73173,8 @@
/turf/open/floor/grass,
/area/station/service/hydroponics/garden)
"tbz" = (
-/obj/effect/turf_decal/tile/purple/half/contrasted{
- dir = 4
- },
/obj/machinery/vending/cart,
-/turf/open/floor/iron,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/hallway/primary/starboard)
"tbC" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
@@ -59313,30 +73182,50 @@
dir = 1
},
/obj/machinery/firealarm/directional/north,
+/obj/effect/turf_decal/trimline/dark/line{
+ dir = 1
+ },
/turf/open/floor/iron/dark,
/area/station/security/brig)
"tbT" = (
-/obj/effect/turf_decal/tile/yellow{
- dir = 8
- },
-/obj/effect/turf_decal/tile/yellow,
-/obj/machinery/power/apc/auto_name/directional/south,
/obj/structure/cable,
-/turf/open/floor/iron/white,
+/obj/machinery/power/apc/auto_name/directional/south,
+/obj/effect/turf_decal/trimline/yellow/filled/line{
+ dir = 2;
+ alpha = 120
+ },
+/obj/effect/turf_decal/trimline/blue/line{
+ alpha = 200
+ },
+/turf/open/floor/iron/white/smooth_edge,
/area/station/medical/chemistry)
"tcj" = (
-/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 4
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 4
},
-/turf/open/floor/iron/white,
-/area/station/science/explab)
-"tcM" = (
-/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/trimline/white/filled/line{
+ dir = 8;
+ alpha = 160
+ },
+/obj/effect/turf_decal/trimline/purple/line{
+ alpha = 200;
+ dir = 8;
+ color = "#a56dc2"
+ },
/turf/open/floor/iron,
+/area/station/science/explab)
+"tcF" = (
+/obj/effect/landmark/start/hangover,
+/obj/machinery/light/floor,
+/turf/open/floor/iron/large,
+/area/station/cargo/office)
+"tcM" = (
+/turf/open/floor/iron/textured_corner{
+ dir = 8
+ },
/area/station/cargo/storage)
"tdo" = (
/obj/effect/turf_decal/trimline/dark_blue/filled/line,
@@ -59346,6 +73235,7 @@
/obj/machinery/camera/directional/south{
c_tag = "Brig Central"
},
+/obj/effect/turf_decal/trimline/dark/line,
/turf/open/floor/iron/dark,
/area/station/security/brig)
"tds" = (
@@ -59359,8 +73249,17 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 4
},
-/turf/open/floor/mineral/titanium/blue,
+/obj/effect/turf_decal/siding/white{
+ dir = 4
+ },
+/turf/open/floor/iron/white/small,
/area/station/commons/toilet)
+"tdA" = (
+/obj/effect/turf_decal/siding/dark,
+/turf/open/floor/iron/textured_corner{
+ dir = 1
+ },
+/area/station/hallway/primary/starboard)
"tdD" = (
/obj/structure/cable,
/obj/effect/mapping_helpers/burnt_floor,
@@ -59369,7 +73268,7 @@
"tej" = (
/obj/machinery/destructive_scanner,
/obj/effect/turf_decal/stripes/end,
-/turf/open/floor/iron,
+/turf/open/floor/iron/large,
/area/station/hallway/primary/starboard)
"teo" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
@@ -59397,6 +73296,9 @@
/obj/effect/turf_decal/trimline/dark_blue/filled/line{
dir = 6
},
+/obj/effect/turf_decal/trimline/dark/line{
+ dir = 6
+ },
/turf/open/floor/iron/dark,
/area/station/security/execution/transfer)
"teG" = (
@@ -59408,12 +73310,21 @@
"teJ" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/effect/turf_decal/stripes/asteroid/line{
- dir = 1
- },
/obj/structure/disposalpipe/segment,
/obj/structure/cable,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes/white/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/dark/corner{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/dark/corner{
+ dir = 4
+ },
+/turf/open/floor/iron/dark/herringbone,
/area/station/cargo/storage)
"teU" = (
/turf/open/floor/iron/dark,
@@ -59436,14 +73347,38 @@
},
/obj/structure/table/reinforced,
/turf/open/floor/iron,
-/area/station/science/ordnance/bomb)
+/area/station/science/ordnance/testlab)
+"tfs" = (
+/obj/machinery/door/window/left/directional/east{
+ req_access = list("xenobiology");
+ name = "Containment Cell"
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 9
+ },
+/obj/effect/turf_decal/vg_decals/numbers/three{
+ color = "#a56dc2"
+ },
+/obj/structure/cable,
+/obj/effect/turf_decal/bot_white{
+ color = "#a56dc2"
+ },
+/obj/effect/turf_decal/box/white{
+ color = "#a56dc2"
+ },
+/turf/open/floor/iron/dark/smooth_large,
+/area/station/science/xenobiology)
"tfH" = (
/obj/machinery/computer/security/wooden_tv,
+/obj/effect/turf_decal/siding/wood{
+ dir = 1
+ },
/turf/open/floor/wood,
/area/station/security/prison)
"tgp" = (
/obj/machinery/atmospherics/components/binary/pump,
/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer4,
/turf/open/floor/plating,
/area/station/maintenance/fore)
"tgt" = (
@@ -59455,8 +73390,21 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/light_switch/directional/west,
/obj/effect/mapping_helpers/turn_off_lights_with_lightswitch,
+/obj/effect/turf_decal/trimline/white/line{
+ dir = 10
+ },
/turf/open/floor/iron/dark,
/area/station/security/execution/education)
+"tgy" = (
+/obj/machinery/door/firedoor/border_only{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/wood{
+ dir = 4
+ },
+/obj/machinery/door/window/right/directional/west,
+/turf/open/floor/wood/tile,
+/area/station/hallway/secondary/entry)
"tgF" = (
/obj/structure/table/wood,
/obj/effect/turf_decal/tile/neutral{
@@ -59466,11 +73414,17 @@
/turf/open/floor/iron/dark/side,
/area/station/hallway/primary/central/fore)
"the" = (
-/obj/structure/rack,
-/obj/item/wrench,
-/obj/item/crowbar,
/obj/effect/decal/cleanable/dirt,
-/obj/item/hand_labeler,
+/obj/structure/rack,
+/obj/item/clothing/mask/gas{
+ pixel_x = -3;
+ pixel_y = -3
+ },
+/obj/item/clothing/mask/gas,
+/obj/item/clothing/mask/gas{
+ pixel_x = 3;
+ pixel_y = 3
+ },
/turf/open/floor/iron,
/area/station/science/explab)
"thf" = (
@@ -59488,9 +73442,19 @@
dir = 4
},
/area/station/service/theater)
+"thg" = (
+/obj/effect/mapping_helpers/airlock/abandoned,
+/obj/machinery/door/airlock/security{
+ name = "Abandoned Armory"
+ },
+/turf/open/floor/plating,
+/area/station/maintenance/port/aft)
"thn" = (
/obj/structure/cable,
-/turf/open/floor/wood,
+/obj/effect/turf_decal/siding/dark{
+ dir = 1
+ },
+/turf/open/floor/wood/parquet,
/area/station/command/heads_quarters/captain)
"thT" = (
/obj/effect/mapping_helpers/burnt_floor,
@@ -59505,6 +73469,12 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/wood,
/area/station/security/prison)
+"tid" = (
+/obj/effect/turf_decal/siding/dark{
+ dir = 4
+ },
+/turf/open/floor/wood/large,
+/area/station/command/heads_quarters/captain)
"tix" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -59518,6 +73488,18 @@
/obj/machinery/air_sensor/ordnance_freezer_chamber,
/turf/open/floor/iron/dark/airless,
/area/station/science/ordnance/freezerchamber)
+"tjj" = (
+/obj/effect/landmark/start/hangover,
+/obj/effect/turf_decal/trimline/green/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/green/mid_joiner{
+ dir = 1
+ },
+/turf/open/floor/iron/edge{
+ dir = 1
+ },
+/area/station/hallway/primary/starboard)
"tjy" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 9
@@ -59532,7 +73514,6 @@
/turf/open/floor/iron,
/area/station/science/ordnance)
"tjz" = (
-/obj/effect/decal/cleanable/dirt,
/obj/structure/disposalpipe/segment{
dir = 4
},
@@ -59542,7 +73523,13 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 8
},
-/turf/open/floor/iron/dark,
+/obj/effect/turf_decal/trimline/dark/filled/line,
+/obj/effect/turf_decal/trimline/dark/filled/line{
+ dir = 1
+ },
+/obj/machinery/power/apc/auto_name/directional/south,
+/obj/structure/cable,
+/turf/open/floor/iron/dark/small,
/area/station/medical/morgue)
"tjM" = (
/obj/machinery/camera/directional/north{
@@ -59554,40 +73541,49 @@
/turf/open/floor/iron/cafeteria,
/area/station/service/kitchen)
"tka" = (
-/obj/effect/turf_decal/stripes/corner{
- dir = 1
- },
/obj/machinery/camera/directional/west{
c_tag = "Gateway Storage"
},
+/obj/effect/turf_decal/siding/wideplating_new/dark/end{
+ dir = 8
+ },
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/decal/cleanable/dirt,
/obj/machinery/firealarm/directional/west,
-/turf/open/floor/iron/dark/textured,
+/turf/open/floor/iron/textured_large,
/area/station/command/gateway)
"tkd" = (
/obj/item/radio/off,
/obj/item/crowbar,
/obj/item/assembly/flash/handheld,
/obj/structure/table,
-/obj/effect/turf_decal/tile/red,
/obj/effect/turf_decal/tile/red{
dir = 4
},
-/obj/effect/turf_decal/tile/red{
- dir = 8
- },
-/obj/effect/turf_decal/tile/neutral,
-/turf/open/floor/iron/dark,
+/obj/effect/turf_decal/delivery/blue,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/security/checkpoint/customs)
"tkk" = (
/obj/machinery/light/directional/east,
/obj/machinery/status_display/evac/directional/east,
-/obj/effect/turf_decal/tile/dark_green{
- dir = 4
- },
/obj/structure/table,
/obj/item/book/manual/wiki/security_space_law,
/turf/open/floor/iron/dark,
/area/station/hallway/primary/fore)
+"tkm" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes/line,
+/obj/machinery/door/firedoor,
+/obj/effect/turf_decal/stripes/blue/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes/blue/line,
+/obj/effect/turf_decal/tile/blue/full,
+/obj/effect/turf_decal/caution/stand_clear/white,
+/turf/open/floor/iron/dark/smooth_large,
+/area/station/medical/medbay/lobby)
"tkC" = (
/obj/effect/spawner/random/structure/grille,
/turf/open/floor/plating,
@@ -59599,8 +73595,30 @@
/obj/effect/turf_decal/trimline/dark_blue/filled/warning{
dir = 1
},
+/obj/effect/turf_decal/trimline/dark_blue/warning{
+ alpha = 200;
+ dir = 1
+ },
/turf/open/floor/iron/dark,
/area/station/security/office)
+"tlo" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/components/binary/pump/on/layer4,
+/turf/open/floor/plating,
+/area/station/maintenance/port/aft)
+"tlt" = (
+/obj/effect/turf_decal/trimline/blue/filled/corner{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/white/corner{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/blue/corner{
+ color = "#8ab4cb";
+ dir = 4
+ },
+/turf/open/floor/iron/white,
+/area/station/medical/treatment_center)
"tlT" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/wood,
@@ -59619,17 +73637,15 @@
c_tag = "Fore Primary Hallway"
},
/obj/item/radio/intercom/directional/west,
-/obj/effect/turf_decal/tile/red{
- dir = 8
+/obj/effect/turf_decal/trimline/dark_blue/filled/corner{
+ dir = 1
},
/turf/open/floor/iron/dark,
/area/station/hallway/primary/fore)
"tmn" = (
-/obj/effect/turf_decal/tile/brown/half/contrasted{
+/obj/effect/turf_decal/stripes/line{
dir = 1
},
-/obj/structure/cable,
-/obj/machinery/light/directional/north,
/turf/open/floor/iron,
/area/station/cargo/warehouse)
"tmu" = (
@@ -59639,20 +73655,61 @@
},
/turf/open/space/basic,
/area/space/nearstation)
+"tmD" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 9
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 9
+ },
+/obj/effect/turf_decal/stripes/line,
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/machinery/door/firedoor,
+/obj/effect/turf_decal/stripes/blue/line,
+/obj/effect/turf_decal/stripes/blue/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/blue/full,
+/obj/effect/turf_decal/caution/stand_clear/white,
+/turf/open/floor/iron/dark/smooth_large,
+/area/station/medical/medbay/central)
"tmI" = (
/obj/machinery/piratepad/civilian,
-/obj/effect/turf_decal/tile/brown,
/obj/effect/turf_decal/loading_area,
-/turf/open/floor/iron,
+/turf/open/floor/iron/dark/textured_large,
/area/station/cargo/office)
-"tnh" = (
-/obj/structure/table,
-/obj/item/stock_parts/power_store/cell/high,
-/obj/machinery/cell_charger{
- pixel_y = 5
+"tmK" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
},
-/turf/open/floor/iron/white,
+/turf/open/floor/plating,
+/area/station/maintenance/port/aft)
+"tnh" = (
+/obj/structure/rack,
+/obj/item/controller,
+/obj/item/compact_remote,
+/obj/item/compact_remote,
+/obj/effect/turf_decal/trimline/white/filled/line{
+ dir = 1;
+ alpha = 160
+ },
+/obj/effect/turf_decal/trimline/purple/line{
+ alpha = 200;
+ dir = 1;
+ color = "#a56dc2"
+ },
+/turf/open/floor/iron,
/area/station/science/explab)
+"tnl" = (
+/obj/structure/hedge,
+/obj/structure/window/reinforced/spawner/directional/west,
+/obj/structure/window/reinforced/spawner/directional/east,
+/obj/structure/window/reinforced/spawner/directional/south,
+/obj/structure/window/reinforced/spawner/directional/north,
+/turf/open/floor/plating,
+/area/station/service/barber)
"tnp" = (
/obj/structure/cable,
/obj/effect/turf_decal/trimline/dark_blue/filled/line{
@@ -59672,19 +73729,17 @@
pixel_y = -8;
req_access = list("armory")
},
+/obj/effect/turf_decal/trimline/white/line{
+ dir = 8
+ },
/turf/open/floor/iron/dark,
/area/station/security/execution/education)
"tnF" = (
-/obj/structure/cable,
-/obj/structure/extinguisher_cabinet{
- pixel_x = -5;
- pixel_y = 30
- },
+/obj/structure/window/reinforced/spawner/directional/east,
/obj/structure/bodycontainer/morgue{
dir = 2
},
-/obj/structure/window/reinforced/spawner/directional/east,
-/turf/open/floor/iron/dark,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/medical/morgue)
"tnL" = (
/obj/item/instrument/piano_synth/headphones/catear_headphone{
@@ -59710,6 +73765,24 @@
},
/turf/open/floor/iron/cafeteria,
/area/station/maintenance/abandon_cafeteria)
+"toN" = (
+/obj/structure/disposalpipe/segment,
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/item/mop{
+ pixel_x = -13;
+ pixel_y = 0
+ },
+/obj/item/clothing/suit/caution{
+ pixel_x = -7;
+ pixel_y = -4
+ },
+/turf/open/floor/iron/white,
+/area/station/science/xenobiology)
+"toP" = (
+/obj/machinery/light/floor,
+/turf/open/floor/wood/tile,
+/area/station/hallway/secondary/entry)
"tpv" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -59728,6 +73801,9 @@
/obj/structure/chair{
dir = 4
},
+/obj/effect/turf_decal/trimline/dark/line{
+ dir = 8
+ },
/turf/open/floor/iron/dark,
/area/station/security/execution/transfer)
"tpS" = (
@@ -59740,6 +73816,9 @@
"tpT" = (
/obj/machinery/vending/games,
/obj/structure/cable,
+/obj/effect/turf_decal/siding/wood{
+ dir = 1
+ },
/turf/open/floor/wood,
/area/station/security/prison)
"tqd" = (
@@ -59747,6 +73826,7 @@
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer5,
/turf/open/floor/plating,
/area/station/maintenance/department/security)
"tqp" = (
@@ -59766,7 +73846,7 @@
dir = 4
},
/turf/open/floor/engine,
-/area/station/engineering/main)
+/area/station/engineering/supermatter/room)
"tqB" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -59780,7 +73860,9 @@
/turf/open/floor/engine,
/area/station/science/explab)
"tqL" = (
-/obj/machinery/door/airlock/public/glass,
+/obj/machinery/door/airlock/public/glass{
+ name = "Prison Kitchen"
+ },
/obj/machinery/door/poddoor/shutters/preopen{
id = "briggate";
name = "Security Shutters"
@@ -59808,7 +73890,7 @@
"tsw" = (
/obj/structure/table,
/obj/item/storage/toolbox/emergency,
-/turf/open/floor/iron,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/hallway/primary/port)
"tte" = (
/obj/effect/turf_decal/stripes{
@@ -59835,7 +73917,17 @@
"ttj" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/light/directional/west,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/dark_blue/line{
+ dir = 8;
+ alpha = 200
+ },
+/obj/effect/turf_decal/trimline/dark_blue/mid_joiner{
+ dir = 8;
+ alpha = 200
+ },
+/turf/open/floor/iron/edge{
+ dir = 8
+ },
/area/station/hallway/primary/central)
"ttn" = (
/obj/structure/cable,
@@ -59844,8 +73936,32 @@
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/turf_decal/trimline/dark/warning{
+ dir = 8
+ },
/turf/open/floor/iron/dark,
/area/station/security/brig)
+"ttA" = (
+/obj/effect/turf_decal/trimline/yellow/filled/line{
+ dir = 1;
+ alpha = 120
+ },
+/obj/effect/turf_decal/trimline/blue/line{
+ alpha = 200;
+ dir = 1
+ },
+/turf/open/floor/iron/white/smooth_edge{
+ dir = 1
+ },
+/area/station/medical/chemistry)
+"ttD" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/neutral/arrow_cw,
+/obj/effect/turf_decal/trimline/neutral/mid_joiner,
+/turf/open/floor/iron/edge,
+/area/station/hallway/primary/port)
"tud" = (
/obj/structure/sign/poster/contraband/random/directional/west,
/turf/open/floor/plating,
@@ -59860,11 +73976,6 @@
},
/area/station/hallway/primary/central)
"tur" = (
-/obj/machinery/camera/directional/south{
- c_tag = "Science Lab South";
- network = list("ss13","rd")
- },
-/obj/structure/noticeboard/directional/west,
/obj/machinery/photocopier/prebuilt,
/turf/open/floor/carpet,
/area/station/command/heads_quarters/rd)
@@ -59875,17 +73986,31 @@
/turf/open/floor/plating,
/area/station/security/execution/transfer)
"tux" = (
-/obj/effect/turf_decal/tile/red,
-/obj/effect/turf_decal/tile/red{
- dir = 8
- },
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 10
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/effect/turf_decal/tile/neutral,
-/turf/open/floor/iron/dark,
+/obj/effect/turf_decal/siding/dark{
+ dir = 6
+ },
+/obj/effect/turf_decal/trimline/dark_blue/filled/line{
+ dir = 6
+ },
+/turf/open/floor/iron/dark/small,
/area/station/security/checkpoint/customs)
+"tuH" = (
+/obj/effect/turf_decal/trimline/neutral/arrow_ccw{
+ alpha = 100;
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/neutral/mid_joiner{
+ alpha = 100;
+ dir = 1
+ },
+/turf/open/floor/iron/edge{
+ dir = 1
+ },
+/area/station/hallway/primary/port)
"tuM" = (
/obj/structure/filingcabinet/chestdrawer,
/turf/open/floor/iron/dark,
@@ -59934,14 +74059,24 @@
},
/area/station/security/prison/safe)
"tvP" = (
-/obj/effect/turf_decal/tile/brown/half/contrasted{
- dir = 4
- },
/obj/machinery/button/door/directional/east{
id = "warehouse_shutters";
name = "warehouse shutters control"
},
/obj/machinery/light/small/directional/east,
+/obj/effect/turf_decal/trimline/brown/filled/line{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/dark/line{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/obj/structure/cable,
/turf/open/floor/iron,
/area/station/cargo/warehouse)
"tvY" = (
@@ -59950,20 +74085,22 @@
/turf/open/floor/iron/dark,
/area/station/commons/fitness/recreation/entertainment)
"twl" = (
-/obj/machinery/door/firedoor,
-/obj/effect/landmark/navigate_destination/bar,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 6
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/iron,
+/obj/machinery/door/firedoor,
+/obj/effect/landmark/navigate_destination/bar,
+/turf/open/floor/iron/large,
/area/station/service/bar)
"twO" = (
-/obj/effect/turf_decal/tile/dark_blue{
- dir = 8
+/obj/effect/turf_decal/trimline/red/real_red/end{
+ dir = 4;
+ alpha = 160
+ },
+/obj/effect/turf_decal/tile/neutral/half/contrasted{
+ dir = 1
},
-/obj/effect/turf_decal/tile/dark_blue,
-/obj/effect/turf_decal/delivery/blue,
/turf/open/floor/iron/dark,
/area/station/security/medical)
"twX" = (
@@ -59981,18 +74118,16 @@
/turf/open/floor/grass,
/area/station/service/hydroponics/garden)
"txz" = (
-/obj/effect/turf_decal/tile/dark_blue{
- dir = 1
- },
-/obj/effect/turf_decal/tile/dark_blue{
+/obj/structure/bed/medical/anchored{
dir = 4
},
-/obj/item/radio/intercom/directional/north,
-/obj/structure/table/glass,
-/obj/effect/spawner/surgery_tray,
-/obj/item/clothing/gloves/latex,
-/obj/item/clothing/mask/surgical,
-/obj/item/reagent_containers/spray/cleaner,
+/obj/item/bodybag,
+/obj/effect/turf_decal/trimline/red/real_red/filled/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/dark/line{
+ dir = 1
+ },
/turf/open/floor/iron/white,
/area/station/security/medical)
"txF" = (
@@ -60003,30 +74138,64 @@
/area/station/holodeck/rec_center)
"txJ" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/general/hidden,
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
/obj/structure/table,
/obj/item/clothing/suit/hooded/wintercoat,
/obj/item/clothing/suit/hooded/wintercoat,
/obj/item/clothing/shoes/winterboots,
/obj/item/clothing/shoes/winterboots,
-/turf/open/floor/iron,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/science/xenobiology)
+"tyb" = (
+/obj/effect/turf_decal/trimline/dark/filled/line{
+ alpha = 160;
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/dark/filled/mid_joiner{
+ dir = 1;
+ alpha = 160
+ },
+/obj/effect/turf_decal/trimline/purple/line{
+ alpha = 200;
+ dir = 1;
+ color = "#a56dc2"
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible,
+/turf/open/floor/iron/white/smooth_edge{
+ dir = 1
+ },
+/area/station/science/xenobiology)
+"tyg" = (
+/obj/structure/fluff/metalpole,
+/obj/structure/sign/warning/vacuum/external/directional/north,
+/turf/open/floor/plating,
+/area/station/hallway/secondary/entry)
"tym" = (
/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/nitrogen_input{
dir = 1
},
/turf/open/floor/engine/n2,
/area/station/engineering/atmos)
+"tyr" = (
+/turf/open/floor/iron/dark/smooth_large,
+/area/station/maintenance/starboard/aft)
+"tyA" = (
+/obj/effect/landmark/start/hangover,
+/turf/open/floor/iron/edge,
+/area/station/hallway/primary/starboard)
"tyB" = (
-/obj/effect/spawner/structure/window,
+/obj/structure/window/reinforced/spawner/directional/south,
+/obj/structure/hedge,
+/obj/structure/window/reinforced/spawner/directional/north,
+/obj/structure/window/reinforced/spawner/directional/east,
/turf/open/floor/plating,
/area/station/medical/medbay/lobby)
"tyR" = (
/obj/machinery/door/airlock/maintenance,
/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance/departmental,
-/turf/open/floor/plating,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/maintenance/port/aft)
"tzr" = (
/obj/structure/table/wood,
@@ -60040,7 +74209,12 @@
/turf/open/floor/wood,
/area/station/commons/vacant_room/office)
"tzu" = (
-/obj/effect/turf_decal/stripes/line{
+/obj/effect/turf_decal/stripes/corner,
+/obj/effect/turf_decal/stripes/blue/corner,
+/obj/effect/turf_decal/stripes/corner{
+ dir = 4
+ },
+/obj/effect/turf_decal/stripes/blue/corner{
dir = 4
},
/turf/open/floor/iron/dark,
@@ -60067,20 +74241,15 @@
/turf/open/floor/iron,
/area/station/maintenance/starboard/fore)
"tAe" = (
-/obj/effect/turf_decal/bot,
-/obj/structure/closet/crate,
-/obj/effect/spawner/random/maintenance,
-/obj/item/forging/tongs,
-/obj/item/forging/hammer,
-/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron,
/area/station/cargo/warehouse)
"tAm" = (
-/obj/structure/chair{
- dir = 1
- },
+/obj/effect/decal/cleanable/blood/old,
/turf/open/floor/wood,
/area/station/service/library/abandoned)
+"tAQ" = (
+/turf/open/floor/iron/dark,
+/area/station/engineering/supermatter/room)
"tAU" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -60091,11 +74260,14 @@
/turf/open/floor/iron/dark/textured,
/area/station/command/heads_quarters/rd)
"tBp" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 6
+/obj/structure/window/reinforced/spawner/directional/south,
+/obj/structure/fluff/metalpole{
+ dir = 1;
+ pixel_y = -39
+ },
+/turf/open/floor/iron/smooth_edge{
+ dir = 1
},
-/obj/structure/reagent_dispensers/water_cooler,
-/turf/open/floor/iron,
/area/station/hallway/secondary/entry)
"tBt" = (
/obj/machinery/door/firedoor,
@@ -60116,8 +74288,25 @@
dir = 4
},
/obj/effect/mapping_helpers/airlock/access/any/medical/general,
-/turf/open/floor/iron,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/medical/virology)
+"tBQ" = (
+/obj/effect/turf_decal/siding/dark{
+ dir = 4
+ },
+/turf/open/floor/iron/corner{
+ dir = 1
+ },
+/area/station/hallway/primary/aft)
+"tCq" = (
+/obj/structure/chair/office/light,
+/obj/effect/turf_decal/siding/dark{
+ dir = 10
+ },
+/turf/open/floor/iron/dark/smooth_corner{
+ dir = 4
+ },
+/area/station/maintenance/starboard/aft)
"tCN" = (
/obj/structure/table/reinforced,
/obj/item/assembly/prox_sensor{
@@ -60138,14 +74327,7 @@
},
/obj/machinery/light/directional/south,
/turf/open/floor/iron,
-/area/station/science/ordnance/bomb)
-"tDb" = (
-/obj/effect/turf_decal/tile/brown/half/contrasted{
- dir = 4
- },
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron,
-/area/station/cargo/warehouse)
+/area/station/science/ordnance/testlab)
"tDp" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -60153,8 +74335,7 @@
dir = 4
},
/obj/structure/cable,
-/obj/effect/turf_decal/tile/dark_green,
-/obj/effect/turf_decal/tile/dark_green{
+/obj/effect/turf_decal/trimline/dark_green/filled/warning{
dir = 4
},
/turf/open/floor/iron/dark/side{
@@ -60172,10 +74353,22 @@
/area/station/commons/fitness)
"tDJ" = (
/obj/structure/chair/stool/directional/west,
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
- dir = 4
+/obj/effect/turf_decal/trimline/dark/filled/warning{
+ alpha = 160;
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/purple/warning{
+ alpha = 200;
+ color = "#700047";
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 8
+ },
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
+/turf/open/floor/iron/white/smooth_edge{
+ dir = 8
},
-/turf/open/floor/iron/checker,
/area/station/science/lab)
"tEf" = (
/obj/effect/turf_decal/tile/neutral/fourcorners,
@@ -60189,8 +74382,16 @@
/obj/structure/cable,
/obj/effect/turf_decal/siding/thinplating/dark,
/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 5
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer5,
/turf/open/floor/plating,
/area/station/maintenance/port/aft)
+"tEE" = (
+/obj/effect/turf_decal/siding/dark,
+/turf/open/floor/iron/textured_half,
+/area/station/hallway/primary/starboard)
"tEK" = (
/obj/effect/spawner/random/trash/mess,
/obj/structure/cable,
@@ -60203,17 +74404,28 @@
/turf/open/floor/plating,
/area/station/maintenance/starboard/fore)
"tEN" = (
-/obj/docking_port/stationary{
- dheight = 3;
- dir = 8;
- dwidth = 8;
- height = 11;
- shuttle_id = "ferry_home";
- name = "Port Bay 2";
- width = 20
+/obj/effect/turf_decal/siding/wood/corner{
+ dir = 1
},
-/turf/open/floor/plating/airless,
-/area/space/nearstation)
+/obj/effect/turf_decal/siding/wood/corner{
+ dir = 4
+ },
+/turf/open/floor/wood/tile,
+/area/station/hallway/secondary/entry)
+"tES" = (
+/obj/machinery/door/firedoor,
+/obj/effect/turf_decal/delivery/white{
+ color = "#ae4fd6"
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 4
+ },
+/obj/machinery/door/poddoor/shutters{
+ id = "Skynet_launch";
+ name = "Mech Bay"
+ },
+/turf/open/floor/iron/dark/textured_large,
+/area/station/science/robotics/mechbay)
"tFu" = (
/obj/effect/turf_decal/tile/dark_blue{
dir = 1
@@ -60269,6 +74481,14 @@
/obj/effect/turf_decal/siding/thinplating_new,
/turf/open/floor/iron,
/area/station/commons/fitness)
+"tGt" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron/edge{
+ dir = 1
+ },
+/area/station/hallway/primary/central)
"tGv" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -60276,14 +74496,33 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/violet/visible,
/turf/open/floor/iron/white,
/area/station/science/ordnance)
+"tGA" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/blue/filled/corner{
+ alpha = 160;
+ dir = 4
+ },
+/obj/effect/turf_decal/siding{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/white/corner{
+ dir = 4
+ },
+/turf/open/floor/iron/white,
+/area/station/medical/medbay/central)
"tGG" = (
-/obj/machinery/door/airlock/public/glass,
+/obj/machinery/door/airlock/public/glass{
+ name = "Prison Laundry"
+ },
/turf/open/floor/iron,
/area/station/security/prison)
"tGP" = (
-/obj/effect/turf_decal/tile/red{
- dir = 1
- },
/obj/structure/hedge/opaque,
/obj/structure/railing{
dir = 1
@@ -60310,12 +74549,19 @@
/turf/closed/wall,
/area/station/maintenance/dorm_room)
"tHB" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
- dir = 1
- },
-/turf/open/floor/iron/dark/side{
- dir = 8
+/obj/machinery/door/window/left/directional/south{
+ req_access = list("eva");
+ name = "Magboots Storage"
},
+/obj/structure/window/reinforced/spawner/directional/west,
+/obj/structure/rack/shelf,
+/obj/item/clothing/shoes/magboots,
+/obj/item/clothing/shoes/magboots,
+/obj/item/clothing/shoes/magboots,
+/obj/item/clothing/shoes/magboots,
+/obj/machinery/camera/motion/directional/north,
+/obj/effect/mapping_helpers/airlock/red_alert_access,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/ai_monitored/command/storage/eva)
"tHT" = (
/obj/effect/decal/cleanable/dirt,
@@ -60373,7 +74619,7 @@
/turf/open/floor/iron/smooth_corner{
dir = 1
},
-/area/station/engineering/main)
+/area/station/engineering/supermatter/room)
"tJO" = (
/turf/open/floor/wood/parquet,
/area/station/command/heads_quarters/cmo)
@@ -60385,6 +74631,9 @@
/obj/effect/turf_decal/trimline/dark_blue/filled/warning{
dir = 4
},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/cable,
/turf/open/floor/iron/dark,
/area/station/security/processing)
"tKd" = (
@@ -60449,6 +74698,36 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/dark,
/area/station/science/auxlab/firing_range)
+"tKJ" = (
+/obj/structure/cable,
+/obj/effect/turf_decal/trimline/yellow/filled/warning{
+ alpha = 200;
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/dark_blue/warning{
+ alpha = 200;
+ dir = 4
+ },
+/turf/open/floor/iron/dark,
+/area/station/engineering/atmos/hfr_room)
+"tKQ" = (
+/obj/effect/turf_decal/stripes/white/line{
+ color = "#a56dc2"
+ },
+/obj/machinery/door/firedoor/border_only,
+/obj/machinery/firealarm/directional/west,
+/obj/structure/fluff/metalpole{
+ pixel_y = -32
+ },
+/obj/effect/turf_decal/stripes/line,
+/obj/effect/turf_decal/stripes/white/line{
+ color = "#52B4E9";
+ name = "blue line"
+ },
+/obj/structure/railing,
+/obj/effect/turf_decal/tile/blue/fourcorners,
+/turf/open/floor/iron/white,
+/area/station/hallway/secondary/entry)
"tKY" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/door/poddoor/shutters/preopen{
@@ -60458,14 +74737,43 @@
},
/turf/open/floor/plating,
/area/station/science/genetics)
+"tLd" = (
+/obj/effect/turf_decal/siding/dark{
+ dir = 8
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 5
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 4
+ },
+/obj/machinery/camera/directional/west{
+ c_tag = "Xenobiology Cell 5";
+ network = list("ss13","xeno")
+ },
+/turf/open/floor/engine,
+/area/station/science/xenobiology)
"tLv" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 8
},
/obj/structure/cable,
-/turf/open/floor/iron,
+/turf/open/floor/iron/dark/side,
/area/station/commons/locker)
+"tLz" = (
+/obj/effect/turf_decal/trimline/blue/arrow_ccw{
+ dir = 8;
+ alpha = 200
+ },
+/obj/effect/turf_decal/trimline/blue/mid_joiner{
+ alpha = 200;
+ dir = 8
+ },
+/turf/open/floor/iron/edge{
+ dir = 8
+ },
+/area/station/hallway/primary/central)
"tLG" = (
/obj/structure/rack,
/obj/effect/spawner/random/contraband/prison,
@@ -60484,6 +74792,10 @@
/obj/effect/turf_decal/trimline/dark_blue/filled/line{
dir = 9
},
+/obj/effect/turf_decal/trimline/dark_blue/line{
+ alpha = 200;
+ dir = 9
+ },
/turf/open/floor/iron/dark,
/area/station/security/office)
"tMl" = (
@@ -60493,6 +74805,41 @@
"tMq" = (
/turf/open/floor/wood,
/area/station/command/heads_quarters/rd)
+"tMP" = (
+/obj/effect/turf_decal/trimline/blue/filled/line,
+/obj/effect/landmark/start/assistant,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 5
+ },
+/turf/open/floor/iron,
+/area/station/hallway/secondary/entry)
+"tNi" = (
+/obj/item/paper/fluff/junkmail_generic,
+/obj/effect/turf_decal/trimline/brown/filled/line{
+ dir = 5
+ },
+/obj/effect/turf_decal/trimline/dark/line{
+ dir = 5
+ },
+/obj/item/mail/junkmail,
+/obj/effect/spawner/random/trash/box,
+/obj/effect/spawner/random/trash/crushed_can,
+/obj/effect/spawner/random/maintenance,
+/turf/open/floor/iron,
+/area/station/maintenance/port/aft)
+"tNp" = (
+/obj/machinery/light/directional/south,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 5
+ },
+/obj/effect/turf_decal/trimline/blue/filled/line,
+/turf/open/floor/iron/edge{
+ dir = 1
+ },
+/area/station/hallway/secondary/entry)
"tNt" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 4
@@ -60510,12 +74857,27 @@
/obj/structure/bookcase/random/religion,
/turf/open/floor/wood,
/area/station/service/library)
+"tNB" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/turf/open/floor/plating,
+/area/station/maintenance/port/aft)
"tND" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/smart/simple/dark/visible,
/obj/effect/turf_decal/stripes/corner,
/turf/open/floor/iron,
/area/station/maintenance/disposal/incinerator)
+"tNH" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/iron/textured_corner{
+ dir = 8
+ },
+/area/station/cargo/storage)
"tNJ" = (
/obj/effect/turf_decal/stripes/corner{
dir = 8
@@ -60524,7 +74886,14 @@
/area/station/science/ordnance/storage)
"tNK" = (
/obj/structure/cable,
-/obj/effect/turf_decal/siding/thinplating/light,
+/obj/effect/turf_decal/trimline/white/filled/line{
+ alpha = 160
+ },
+/obj/effect/turf_decal/trimline/purple/line{
+ alpha = 200;
+ dir = 2;
+ color = "#a56dc2"
+ },
/turf/open/floor/iron,
/area/station/science/explab)
"tOg" = (
@@ -60532,16 +74901,21 @@
dir = 1
},
/turf/open/floor/iron,
-/area/station/science/ordnance/bomb)
+/area/station/science/ordnance/testlab)
"tOF" = (
/obj/effect/turf_decal/trimline/dark_blue/filled/line{
dir = 5
},
+/obj/effect/turf_decal/trimline/dark/line{
+ dir = 5
+ },
/turf/open/floor/iron/dark,
/area/station/security/brig)
"tOU" = (
/obj/machinery/telecomms/hub/preset,
/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/effect/turf_decal/box/white,
+/obj/effect/turf_decal/bot_white,
/turf/open/floor/iron/dark/telecomms,
/area/station/tcommsat/server)
"tPg" = (
@@ -60555,16 +74929,33 @@
dir = 1
},
/obj/machinery/airalarm/directional/north,
+/obj/effect/turf_decal/trimline/dark/line{
+ dir = 1
+ },
/turf/open/floor/iron/dark,
/area/station/security/execution/transfer)
+"tPu" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer5,
+/turf/open/floor/plating,
+/area/station/maintenance/port/aft)
"tPw" = (
-/obj/machinery/seed_extractor,
+/obj/structure/reagent_dispensers/watertank/high,
+/obj/item/reagent_containers/cup/bucket,
/turf/open/floor/iron/dark/textured_large,
/area/station/service/hydroponics)
-"tQk" = (
-/obj/machinery/camera/directional/north{
- c_tag = "Auxiliary Tool Storage"
+"tPR" = (
+/obj/effect/turf_decal/trimline/brown/filled/line,
+/obj/effect/turf_decal/trimline/brown/filled/corner{
+ dir = 4
},
+/obj/effect/turf_decal/trimline/dark/corner{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/dark/line,
+/turf/open/floor/iron,
+/area/station/cargo/sorting)
+"tQk" = (
/obj/structure/table,
/obj/item/stack/sheet/iron/fifty,
/obj/item/stack/sheet/iron/fifty,
@@ -60578,13 +74969,13 @@
/turf/open/floor/iron,
/area/station/commons/storage/tools)
"tQM" = (
+/obj/structure/cable,
/obj/structure/bed/dogbed/ian,
/obj/machinery/power/apc/auto_name/directional/north,
-/obj/structure/cable,
/mob/living/basic/pet/dog/corgi/ian{
dir = 8
},
-/turf/open/floor/iron,
+/turf/open/floor/wood/large,
/area/station/command/heads_quarters/hop)
"tQN" = (
/obj/structure/disposalpipe/segment{
@@ -60605,6 +74996,11 @@
/obj/effect/turf_decal/tile/green{
dir = 8
},
+/obj/effect/turf_decal/tile/green{
+ dir = 1
+ },
+/obj/machinery/power/apc/auto_name/directional/west,
+/obj/structure/cable,
/turf/open/floor/iron,
/area/station/service/hydroponics/garden)
"tRj" = (
@@ -60617,6 +75013,11 @@
/obj/effect/turf_decal/tile/brown/full,
/turf/open/floor/iron/smooth_large,
/area/station/engineering/break_room)
+"tRn" = (
+/obj/effect/turf_decal/trimline/brown/filled/warning,
+/obj/effect/turf_decal/trimline/dark/warning,
+/turf/open/floor/iron,
+/area/station/cargo/warehouse)
"tRv" = (
/obj/structure/closet/emcloset,
/obj/machinery/camera/directional/north{
@@ -60652,6 +75053,31 @@
/obj/effect/landmark/start/prisoner,
/turf/open/floor/wood,
/area/station/security/prison)
+"tSC" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/blue/filled/corner{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/blue/filled/corner{
+ dir = 8
+ },
+/obj/effect/landmark/start/hangover,
+/turf/open/floor/iron/edge{
+ dir = 4
+ },
+/area/station/hallway/secondary/entry)
+"tSJ" = (
+/obj/effect/turf_decal/siding/wood,
+/obj/effect/turf_decal/siding/wood{
+ dir = 1
+ },
+/obj/machinery/holopad{
+ name = "botany requests holopad"
+ },
+/turf/open/floor/stone,
+/area/station/service/bar)
"tSN" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/structure/cable,
@@ -60665,6 +75091,29 @@
},
/turf/open/floor/iron/freezer,
/area/station/commons/toilet/locker)
+"tSQ" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 5
+ },
+/obj/effect/landmark/start/hangover,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer5,
+/turf/open/floor/iron,
+/area/station/hallway/secondary/entry)
+"tST" = (
+/obj/machinery/atmospherics/components/binary/pump/on/layer4{
+ dir = 8;
+ name = "Airlock Pump";
+ hide = 1;
+ target_pressure = 300
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 9
+ },
+/turf/open/floor/plating,
+/area/station/ai_monitored/turret_protected/aisat_interior)
"tTn" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -60683,9 +75132,28 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/orange/visible,
/turf/open/floor/plating,
/area/station/engineering/atmos/hfr_room)
+"tTR" = (
+/obj/effect/turf_decal/trimline/brown/corner,
+/turf/open/floor/iron/edge{
+ dir = 4
+ },
+/area/station/hallway/primary/central)
"tTU" = (
/turf/open/floor/iron/kitchen,
/area/station/security/prison)
+"tTV" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 5
+ },
+/obj/effect/turf_decal/siding/wood{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/blue/filled/corner{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/blue/filled/corner,
+/turf/open/floor/iron,
+/area/station/hallway/secondary/entry)
"tUi" = (
/obj/effect/decal/cleanable/blood/drip,
/obj/effect/turf_decal/stripes/line,
@@ -60693,13 +75161,34 @@
/turf/open/floor/iron,
/area/station/commons/fitness)
"tUq" = (
-/obj/effect/turf_decal/bot_white/right,
/obj/structure/closet/crate/goldcrate,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/turf/open/floor/iron/dark,
+/obj/effect/turf_decal/bot,
+/obj/effect/turf_decal/box,
+/turf/open/floor/iron/dark/textured_large,
/area/station/ai_monitored/command/nuke_storage)
-"tUV" = (
+"tUr" = (
/obj/structure/cable,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 9
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/table{
+ color = "#999999"
+ },
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
+ pixel_x = -7;
+ pixel_y = 7
+ },
+/obj/item/flashlight/lantern/on{
+ pixel_x = 5;
+ pixel_y = 7
+ },
+/turf/open/floor/plating,
+/area/station/maintenance/aft)
+"tUV" = (
/obj/effect/turf_decal/siding/wideplating_new{
dir = 8
},
@@ -60720,19 +75209,22 @@
/turf/open/floor/wood,
/area/station/service/library)
"tVc" = (
-/obj/effect/turf_decal/bot_white,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
dir = 1
},
-/turf/open/floor/iron/dark,
+/turf/open/floor/iron/dark/textured_large,
/area/station/ai_monitored/turret_protected/ai_upload)
"tVr" = (
+/obj/structure/cable,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/obj/effect/turf_decal/trimline/dark_blue/filled/corner{
dir = 4
},
-/turf/open/floor/iron/dark,
-/area/station/security/office)
+/obj/effect/mapping_helpers/burnt_floor,
+/turf/open/floor/plating,
+/area/station/maintenance/fore)
"tVs" = (
/obj/structure/disposalpipe/segment,
/obj/item/trash/raisins,
@@ -60744,8 +75236,15 @@
dir = 4
},
/obj/structure/cable,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/brown/filled/warning{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/dark/warning{
+ dir = 8
+ },
+/turf/open/floor/iron/textured_edge{
+ dir = 4
+ },
/area/station/cargo/miningdock)
"tVZ" = (
/obj/machinery/modular_computer/preset/id{
@@ -60761,18 +75260,37 @@
/obj/effect/spawner/random/trash/moisture_trap,
/turf/open/floor/plating,
/area/station/maintenance/starboard/aft)
-"tXC" = (
-/obj/structure/closet/secure_closet/hop,
+"tWE" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 4
},
-/obj/item/food/burger/green{
- name = "service burger";
- desc = "Made by one of the first ever Nanotrasen chefs. Maybe...Skip this one, actually."
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 4
},
+/obj/structure/cable,
+/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/decal/cleanable/dirt,
+/turf/open/floor/iron/textured_large,
+/area/station/command/gateway)
+"tXC" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/obj/structure/closet/secure_closet/hop,
/obj/item/clothing/under/plasmaman/head_of_personnel,
/obj/item/clothing/head/helmet/space/plasmaman/head_of_personnel,
-/turf/open/floor/wood,
+/obj/effect/turf_decal/siding/wood{
+ dir = 8
+ },
+/turf/open/floor/wood/tile,
/area/station/command/heads_quarters/hop)
"tXK" = (
/obj/structure/table,
@@ -60804,11 +75322,11 @@
/turf/open/floor/iron/white,
/area/station/science/research)
"tYv" = (
-/obj/structure/plasticflaps/opaque,
/obj/machinery/navbeacon{
codes_txt = "delivery;dir=8";
location = "Research Division"
},
+/obj/structure/plasticflaps/opaque,
/obj/effect/turf_decal/bot,
/turf/open/floor/iron/dark/textured,
/area/station/science/research)
@@ -60832,26 +75350,28 @@
/obj/effect/turf_decal/tile/yellow/anticorner/contrasted{
dir = 4
},
-/obj/item/food/burger/yellow{
- desc = "Somehow, some utterly insane Chief Engineer made this out of a decommissioned crystal. How it doesn't kill you is a question for the ages.";
- name = "supermatter burger"
- },
/turf/open/floor/iron/white/corner{
dir = 8
},
/area/station/command/heads_quarters/ce)
+"tYO" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/effect/spawner/random/burgerstation/blocking,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 6
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/turf/open/floor/plating,
+/area/station/maintenance/port/aft)
"tYR" = (
/obj/structure/cable,
/turf/open/floor/iron/dark,
/area/station/engineering/storage/tech)
"tZk" = (
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
-/obj/effect/turf_decal/tile/blue,
/obj/machinery/button/door{
id = "surgery";
name = "Surgery Shutter Control";
@@ -60861,12 +75381,17 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 4
},
+/obj/effect/turf_decal/siding{
+ dir = 10
+ },
+/obj/effect/turf_decal/trimline/blue/filled/line{
+ alpha = 160;
+ dir = 10
+ },
/turf/open/floor/iron/white,
/area/station/medical/surgery/fore)
"tZn" = (
-/obj/machinery/door/airlock/shuttle{
- name = "Upper Floors"
- },
+/obj/machinery/door/airlock/shuttle,
/turf/open/floor/plating/airless,
/area/station/maintenance/aft)
"tZO" = (
@@ -60934,10 +75459,19 @@
/area/station/service/library)
"ubJ" = (
/obj/effect/landmark/start/medical_doctor,
-/obj/effect/turf_decal/tile/blue{
+/obj/effect/turf_decal/siding/dark{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 8
+ },
+/obj/effect/turf_decal/weather/snow/corner{
+ dir = 4
+ },
+/obj/effect/turf_decal/weather/snow,
+/turf/open/floor/iron/dark/smooth_edge{
dir = 4
},
-/turf/open/floor/iron/white,
/area/station/medical/cryo)
"ubS" = (
/obj/structure/cable,
@@ -60968,7 +75502,7 @@
/obj/structure/rack,
/obj/item/flashlight,
/turf/open/floor/iron/dark,
-/area/station/engineering/main)
+/area/station/engineering/supermatter/room)
"udu" = (
/obj/structure/cable,
/obj/machinery/button/door{
@@ -60984,11 +75518,16 @@
/obj/machinery/door/airlock/public/glass{
name = "Arrivals"
},
-/turf/open/floor/iron,
+/turf/open/floor/iron/large,
/area/station/hallway/primary/port)
"uea" = (
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
/obj/machinery/firealarm/directional/north,
-/turf/open/floor/iron,
+/turf/open/floor/iron/dark/side{
+ dir = 1
+ },
/area/station/commons/locker)
"uel" = (
/obj/machinery/power/apc/auto_name/directional/south,
@@ -61007,11 +75546,56 @@
/obj/effect/turf_decal/tile/red/opposingcorners,
/turf/open/floor/iron,
/area/station/commons/fitness/recreation)
-"ueJ" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 8
+"uex" = (
+/obj/structure/sign/clock/directional/north,
+/obj/structure/table/wood,
+/obj/item/coffee_cartridge/fancy{
+ pixel_x = 6;
+ pixel_y = 5
},
-/turf/open/floor/iron/white,
+/obj/item/coffee_cartridge{
+ pixel_y = 9;
+ pixel_x = 6
+ },
+/obj/item/coffee_cartridge/decaf{
+ pixel_x = -5;
+ pixel_y = 10
+ },
+/obj/item/coffee_cartridge/bootleg{
+ pixel_x = -5;
+ pixel_y = 15
+ },
+/obj/item/reagent_containers/cup/bottle/syrup_bottle/korta_nectar{
+ pixel_x = -2;
+ pixel_y = -3
+ },
+/obj/item/reagent_containers/cup/bottle/syrup_bottle/caramel{
+ pixel_x = 6
+ },
+/obj/effect/turf_decal/siding/wood,
+/turf/open/floor/wood/tile,
+/area/station/hallway/secondary/entry)
+"ueJ" = (
+/obj/structure/chair/office/light{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/dark/filled/line{
+ alpha = 160;
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/purple/line{
+ color = "#700047";
+ alpha = 200;
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/dark/filled/mid_joiner{
+ dir = 1;
+ alpha = 160
+ },
+/turf/open/floor/iron/white/smooth_half,
/area/station/science/lab)
"ufm" = (
/obj/structure/lattice/catwalk,
@@ -61025,6 +75609,34 @@
dir = 8
},
/area/station/security/prison)
+"ufQ" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/turf_decal/trimline/yellow/filled/warning{
+ dir = 1;
+ alpha = 120
+ },
+/obj/effect/turf_decal/trimline/blue/warning{
+ dir = 1;
+ alpha = 200
+ },
+/turf/open/floor/iron/white/smooth_edge{
+ dir = 1
+ },
+/area/station/medical/chemistry)
+"ufW" = (
+/obj/machinery/door/airlock/maintenance,
+/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance,
+/obj/effect/turf_decal/siding/white/corner{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/white/corner,
+/obj/effect/mapping_helpers/airlock/unres{
+ dir = 8
+ },
+/turf/open/floor/plating,
+/area/station/hallway/secondary/entry)
"uga" = (
/obj/effect/spawner/random/structure/grille,
/turf/open/space/basic,
@@ -61053,15 +75665,14 @@
},
/obj/structure/rack,
/turf/open/floor/iron/dark,
-/area/station/engineering/main)
+/area/station/engineering/supermatter/room)
"uhZ" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible/layer2,
-/obj/effect/spawner/structure/window/reinforced,
-/obj/machinery/door/poddoor/shutters{
- id = "HFRshutter";
- name = "Atmospherics HFR Shutters"
- },
-/turf/open/floor/plating,
+/obj/machinery/light/directional/south,
+/obj/structure/table,
+/obj/item/book/manual/wiki/atmospherics,
+/obj/item/storage/toolbox/mechanical,
+/obj/item/holosign_creator/atmos,
+/turf/open/floor/iron,
/area/station/engineering/atmos/hfr_room)
"uio" = (
/obj/structure/cable,
@@ -61070,6 +75681,23 @@
/obj/machinery/light/small/directional/east,
/turf/open/floor/plating,
/area/station/security/execution/transfer)
+"uiu" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 4
+ },
+/obj/structure/cable,
+/obj/effect/turf_decal/siding/wideplating_new/dark{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/wideplating_new/dark{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/iron/textured_large,
+/area/station/command/gateway)
"uiE" = (
/obj/effect/turf_decal/tile/red/opposingcorners{
dir = 1
@@ -61087,6 +75715,33 @@
},
/turf/open/floor/iron/dark,
/area/station/commons/fitness/recreation/entertainment)
+"ujz" = (
+/obj/structure/chair/sofa/bench/left{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/blue/filled/line{
+ dir = 8
+ },
+/turf/open/floor/iron,
+/area/station/hallway/secondary/entry)
+"ujM" = (
+/obj/structure/cable,
+/obj/effect/turf_decal/siding/dark{
+ dir = 9
+ },
+/turf/open/floor/circuit/green/telecomms/mainframe,
+/area/station/tcommsat/server)
+"ujY" = (
+/obj/effect/turf_decal/trimline/brown/arrow_cw{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/brown/mid_joiner{
+ dir = 4
+ },
+/turf/open/floor/iron/edge{
+ dir = 4
+ },
+/area/station/hallway/primary/central)
"ukg" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -61116,7 +75771,8 @@
/turf/open/floor/iron/dark,
/area/station/commons/fitness)
"ukX" = (
-/obj/effect/turf_decal/trimline/dark_blue/filled/line,
+/obj/effect/turf_decal/trimline/green/filled/warning,
+/obj/effect/turf_decal/trimline/dark/warning,
/turf/open/floor/iron/dark,
/area/station/security/brig)
"ukZ" = (
@@ -61138,12 +75794,25 @@
},
/turf/open/floor/iron,
/area/station/commons/fitness)
+"ulp" = (
+/obj/structure/door_assembly/door_assembly_mai,
+/turf/open/floor/iron/dark/smooth_large,
+/area/station/maintenance/starboard/aft)
"ulw" = (
/turf/open/floor/wood,
/area/station/security/prison)
"uly" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/siding/wood{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/neutral/warning{
+ dir = 1;
+ alpha = 100
+ },
+/turf/open/floor/iron/edge{
+ dir = 1
+ },
/area/station/hallway/primary/starboard)
"umk" = (
/obj/structure/cable,
@@ -61156,7 +75825,6 @@
/obj/item/toy/plush/moth{
name = "Dr. Moff"
},
-/obj/machinery/firealarm/directional/north,
/turf/open/floor/carpet/blue,
/area/station/medical/psychology)
"umE" = (
@@ -61181,14 +75849,30 @@
},
/obj/structure/cable,
/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 9
+ },
/turf/open/floor/plating,
/area/station/maintenance/port/aft)
+"unT" = (
+/obj/effect/turf_decal/bot,
+/obj/structure/closet/crate/preopen,
+/obj/effect/spawner/random/maintenance/three,
+/turf/open/floor/iron/large,
+/area/station/cargo/storage)
"uof" = (
/obj/structure/disposalpipe/segment{
dir = 5
},
/obj/structure/cable,
-/turf/open/floor/iron/dark,
+/obj/structure/table/reinforced,
+/obj/item/storage/box/smart_metal_foam,
+/obj/item/storage/box/smart_metal_foam,
+/obj/item/storage/box/smart_metal_foam{
+ pixel_y = 4
+ },
+/obj/structure/window/reinforced/spawner/directional/east,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/ai_monitored/command/storage/eva)
"uoh" = (
/obj/effect/decal/cleanable/dirt,
@@ -61250,9 +75934,31 @@
/obj/effect/mapping_helpers/mail_sorting/service/library,
/turf/open/floor/wood,
/area/station/service/library)
+"upm" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/turf_decal/siding/dark/corner{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/dark,
+/turf/open/floor/iron/dark,
+/area/station/service/hydroponics)
+"upq" = (
+/obj/structure/disposalpipe/segment{
+ dir = 6
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer5,
+/turf/open/floor/plating,
+/area/station/maintenance/port)
"upr" = (
/obj/structure/disposalpipe/segment,
/obj/effect/mapping_helpers/broken_floor,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
/turf/open/floor/plating,
/area/station/maintenance/starboard/aft)
"upx" = (
@@ -61276,14 +75982,16 @@
/turf/open/floor/iron,
/area/station/science/ordnance)
"upY" = (
-/obj/item/storage/box/smart_metal_foam{
- pixel_y = 4
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+ dir = 8
},
-/obj/item/storage/box/smart_metal_foam,
-/obj/structure/table/reinforced,
-/obj/item/storage/box/smart_metal_foam,
-/obj/structure/window/reinforced/spawner/directional/east,
-/turf/open/floor/iron/dark,
+/obj/effect/turf_decal/siding/dark/corner{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 1
+ },
+/turf/open/floor/iron/textured_large,
/area/station/ai_monitored/command/storage/eva)
"uqh" = (
/obj/machinery/computer/crew{
@@ -61291,6 +75999,14 @@
},
/turf/open/floor/iron/dark,
/area/station/security/warden)
+"uqL" = (
+/obj/structure/window/spawner/directional/west,
+/obj/structure/window/spawner/directional/north,
+/obj/structure/hedge/opaque,
+/obj/structure/lattice,
+/obj/item/cultivator/rake,
+/turf/open/space/basic,
+/area/space/nearstation)
"uqS" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -61301,19 +76017,33 @@
dir = 1
},
/area/station/commons/dorms)
+"uqU" = (
+/obj/effect/turf_decal/trimline/yellow/corner,
+/turf/open/floor/iron,
+/area/station/hallway/primary/aft)
"urb" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/structure/cable,
/turf/open/floor/plating,
/area/station/hallway/primary/fore)
"urc" = (
-/turf/open/floor/iron/dark,
+/turf/open/floor/iron/dark/textured,
/area/station/ai_monitored/command/nuke_storage)
"urC" = (
/obj/structure/disposalpipe/segment{
dir = 9
},
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/trimline/yellow/filled/warning{
+ alpha = 120;
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/blue/warning{
+ dir = 4;
+ alpha = 200
+ },
+/turf/open/floor/iron/white/smooth_edge{
+ dir = 4
+ },
/area/station/medical/chemistry)
"urU" = (
/obj/effect/turf_decal/box/white{
@@ -61322,11 +76052,19 @@
/turf/open/floor/engine,
/area/station/engineering/atmos/hfr_room)
"usl" = (
-/obj/effect/turf_decal/stripes/line{
+/obj/effect/turf_decal/trimline/dark/filled/warning{
+ alpha = 160;
dir = 4
},
-/turf/open/floor/iron/white/side{
- dir = 9
+/obj/effect/turf_decal/trimline/purple/warning{
+ alpha = 200;
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 4
+ },
+/turf/open/floor/iron/white/smooth_edge{
+ dir = 4
},
/area/station/science/research)
"usq" = (
@@ -61334,6 +76072,7 @@
/obj/effect/turf_decal/trimline/dark_blue/filled/corner,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/turf_decal/trimline/dark/corner,
/turf/open/floor/iron/dark,
/area/station/security/execution/transfer)
"usr" = (
@@ -61360,8 +76099,17 @@
/obj/effect/spawner/random/structure/crate_abandoned,
/turf/open/floor/plating/airless,
/area/station/maintenance/port/fore)
-"usT" = (
+"usL" = (
+/obj/structure/disposalpipe/segment,
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/turf_decal/siding/dark{
+ dir = 6
+ },
+/turf/open/floor/wood,
+/area/station/command/meeting_room)
+"usT" = (
/obj/structure/chair/sofa/bench{
dir = 1
},
@@ -61404,8 +76152,21 @@
/obj/structure/disposalpipe/junction/flip{
dir = 2
},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer5,
/turf/open/floor/plating,
/area/station/maintenance/department/security)
+"uuM" = (
+/obj/effect/turf_decal/siding/dark{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 8
+ },
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+ dir = 8
+ },
+/turf/open/floor/wood/large,
+/area/station/command/heads_quarters/captain)
"uvt" = (
/obj/effect/turf_decal/trimline/dark_blue/filled/line{
dir = 4
@@ -61424,6 +76185,9 @@
pixel_x = 25;
pixel_y = -8
},
+/obj/effect/turf_decal/trimline/white/line{
+ dir = 4
+ },
/turf/open/floor/iron/dark,
/area/station/security/execution/education)
"uvz" = (
@@ -61432,11 +76196,13 @@
/area/station/security/interrogation)
"uvC" = (
/obj/machinery/light/directional/west,
-/turf/open/floor/iron/recharge_floor,
+/turf/open/floor/circuit/red,
/area/station/science/robotics/mechbay)
"uvG" = (
-/obj/structure/cable,
-/turf/open/floor/iron/dark,
+/obj/effect/turf_decal/trimline/dark/filled/line{
+ dir = 5
+ },
+/turf/open/floor/iron/dark/small,
/area/station/medical/morgue)
"uvK" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
@@ -61456,11 +76222,14 @@
/obj/structure/bodycontainer/morgue{
dir = 1
},
-/turf/open/floor/iron/dark,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/medical/morgue)
"uwA" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/sink/kitchen/directional/south,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 1
+ },
/turf/open/floor/iron,
/area/station/maintenance/port/fore)
"uwN" = (
@@ -61526,7 +76295,7 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 1
},
-/turf/open/floor/carpet,
+/turf/open/floor/carpet/black,
/area/station/science/breakroom)
"uyl" = (
/obj/machinery/atmospherics/pipe/bridge_pipe/yellow/visible,
@@ -61538,25 +76307,78 @@
/area/space/nearstation)
"uyn" = (
/obj/machinery/bluespace_vendor/directional/south,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/turf/open/floor/iron/dark/side{
+ dir = 6
+ },
/area/station/commons/locker)
"uyp" = (
-/obj/effect/turf_decal/trimline/blue/filled/corner{
- dir = 1
- },
/obj/structure/disposalpipe/segment{
dir = 9
},
-/turf/open/floor/iron/white,
-/area/station/medical/medbay/aft)
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/turf_decal/trimline/blue/filled/line{
+ alpha = 160;
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/blue/filled/line{
+ alpha = 160;
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/dark_blue/line{
+ alpha = 200;
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/dark_blue/line{
+ alpha = 200;
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/blue/filled/mid_joiner{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/blue/filled/mid_joiner{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/blue/filled/mid_joiner{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/blue/filled/mid_joiner{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/dark_blue/mid_joiner{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/dark_blue/mid_joiner{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/turf/open/floor/iron/white/textured_half{
+ dir = 1
+ },
+/area/station/medical/medbay/central)
"uyD" = (
/turf/open/floor/iron/chapel,
/area/station/service/chapel)
"uyE" = (
/obj/structure/sign/warning/secure_area/directional/east,
-/obj/effect/turf_decal/stripes/corner,
-/turf/open/floor/iron/white/side{
- dir = 9
+/obj/effect/turf_decal/trimline/dark/filled/warning{
+ alpha = 160;
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/purple/warning{
+ alpha = 200;
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 4
+ },
+/turf/open/floor/iron/white/smooth_edge{
+ dir = 4
},
/area/station/science/research)
"uyF" = (
@@ -61568,11 +76390,11 @@
/area/station/maintenance/abandon_arcade)
"uza" = (
/obj/structure/window/reinforced/spawner/directional/west,
-/obj/effect/turf_decal/siding/blue{
- dir = 4
- },
/obj/structure/flora/bush/sparsegrass,
/obj/machinery/hydroponics/soil,
+/obj/effect/turf_decal/siding/wood{
+ dir = 4
+ },
/turf/open/floor/grass,
/area/station/security/prison)
"uzb" = (
@@ -61584,33 +76406,57 @@
},
/turf/open/floor/iron,
/area/station/service/hydroponics)
+"uzj" = (
+/obj/structure/table,
+/obj/item/food/croissant{
+ pixel_x = -3;
+ pixel_y = 5
+ },
+/obj/item/reagent_containers/cup/glass/coffee/colonial{
+ pixel_x = 4
+ },
+/obj/effect/turf_decal/trimline/blue/filled/line,
+/turf/open/floor/iron/edge{
+ dir = 1
+ },
+/area/station/hallway/secondary/entry)
"uzr" = (
/obj/item/kirbyplants/random,
/obj/machinery/firealarm/directional/south,
/turf/open/floor/iron/dark/textured_large,
/area/station/hallway/primary/central)
+"uzL" = (
+/obj/structure/fake_stairs/directional/north{
+ icon_state = "stairs-old";
+ icon = 'modular_skyrat/modules/aesthetics/floors/icons/floors.dmi';
+ color = "#555555";
+ dir = 4;
+ pixel_y = 1
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/plating,
+/area/station/maintenance/starboard/aft)
"uzY" = (
+/obj/machinery/nanite_program_hub,
/obj/structure/railing{
- dir = 8
+ dir = 4
},
-/obj/structure/table,
-/obj/item/multitool/circuit{
- pixel_x = -8
- },
-/obj/item/multitool/circuit{
- pixel_x = -4
- },
-/obj/item/multitool/circuit,
-/obj/item/stock_parts/power_store/cell/high{
- pixel_x = 8;
- pixel_y = -2
- },
-/obj/item/stock_parts/power_store/cell/high{
- pixel_x = 8;
- pixel_y = 9
+/obj/effect/turf_decal/siding/dark{
+ dir = 4
},
/turf/open/floor/iron/white,
/area/station/science/explab)
+"uAb" = (
+/obj/structure/table/wood,
+/obj/machinery/coffeemaker/impressa{
+ pixel_y = 7;
+ pixel_x = 4
+ },
+/obj/effect/turf_decal/siding/wood/corner,
+/obj/structure/window/spawner/directional/west,
+/turf/open/floor/wood/tile,
+/area/station/hallway/secondary/entry)
"uAh" = (
/obj/effect/spawner/random/trash/soap,
/obj/structure/drain/big,
@@ -61625,24 +76471,24 @@
/turf/open/floor/wood,
/area/station/maintenance/abandon_arcade)
"uAt" = (
-/obj/effect/turf_decal/siding/blue{
- dir = 8
- },
/obj/structure/flora/bush/flowers_br,
/obj/machinery/hydroponics/soil,
+/obj/effect/turf_decal/siding/wood{
+ dir = 8
+ },
/turf/open/floor/grass,
/area/station/security/prison)
"uAu" = (
-/obj/machinery/door/airlock{
- name = "Port Emergency Storage"
- },
-/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance,
/obj/structure/cable,
-/obj/effect/mapping_helpers/airlock/unres,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 4
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/door/airlock{
+ name = "Port Emergency Storage"
+ },
+/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance,
+/obj/effect/mapping_helpers/airlock/unres,
/turf/open/floor/plating,
/area/station/commons/storage/emergency/port)
"uAz" = (
@@ -61651,10 +76497,35 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/hallway/primary/central)
-"uBY" = (
-/obj/machinery/power/apc/auto_name/directional/north,
+"uBy" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
/obj/structure/cable,
-/turf/open/floor/iron,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron/dark/corner{
+ dir = 8
+ },
+/area/station/commons/locker)
+"uBB" = (
+/obj/machinery/conveyor{
+ dir = 8;
+ id = "QMLoad"
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 5
+ },
+/turf/open/floor/plating,
+/area/station/cargo/storage)
+"uBY" = (
+/obj/structure/cable,
+/obj/machinery/power/apc/auto_name/directional/north,
+/obj/effect/turf_decal/trimline/green/corner{
+ dir = 4
+ },
+/turf/open/floor/iron/edge{
+ dir = 1
+ },
/area/station/hallway/primary/port)
"uCu" = (
/obj/effect/turf_decal/tile/purple/opposingcorners{
@@ -61680,23 +76551,30 @@
/turf/open/floor/iron/dark/textured,
/area/station/science/genetics)
"uDy" = (
-/obj/effect/turf_decal/tile/red/half/contrasted{
+/obj/effect/turf_decal/trimline/dark_blue/corner{
+ alpha = 200;
dir = 1
},
+/obj/effect/turf_decal/siding/wood{
+ dir = 4
+ },
/turf/open/floor/iron/dark,
/area/station/hallway/primary/fore)
"uDN" = (
-/obj/effect/turf_decal/stripes/line{
+/obj/effect/turf_decal/siding/wideplating_new/dark{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/wideplating_new/dark{
dir = 4
},
/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron/dark/textured,
+/turf/open/floor/iron/textured_large,
/area/station/command/gateway)
"uEe" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
dir = 4
},
-/turf/open/floor/iron/dark,
+/turf/open/floor/iron/dark/textured,
/area/station/ai_monitored/command/nuke_storage)
"uEh" = (
/obj/effect/decal/cleanable/dirt,
@@ -61727,7 +76605,7 @@
/area/station/science/ordnance/burnchamber)
"uFm" = (
/obj/structure/closet/l3closet/scientist,
-/turf/open/floor/iron,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/command/gateway)
"uFA" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -61748,14 +76626,10 @@
/turf/open/floor/plating,
/area/station/maintenance/starboard/aft)
"uGq" = (
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
/obj/effect/turf_decal/vg_decals/department/hop{
dir = 8
},
-/turf/open/floor/iron,
+/turf/open/floor/iron/large,
/area/station/hallway/primary/central)
"uGw" = (
/obj/structure/bed/double,
@@ -61774,6 +76648,7 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 8
},
+/obj/effect/landmark/start/paramedic,
/turf/open/floor/iron/white,
/area/station/medical/medbay/central)
"uGz" = (
@@ -61784,17 +76659,20 @@
/obj/machinery/air_sensor/air_tank,
/turf/open/floor/engine/air,
/area/station/engineering/atmos)
-"uGZ" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/landmark/firealarm_sanity,
-/turf/open/floor/iron/dark,
-/area/station/ai_monitored/turret_protected/aisat/hallway)
"uHg" = (
-/obj/effect/turf_decal/stripes/line,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/trimline/dark/filled/line{
+ alpha = 160
+ },
+/obj/effect/turf_decal/trimline/purple/line{
+ color = "#700047";
+ alpha = 200
+ },
+/obj/effect/turf_decal/siding/dark,
+/obj/effect/turf_decal/trimline/dark/filled/mid_joiner{
+ dir = 2;
+ alpha = 160
+ },
+/turf/open/floor/iron/white/smooth_edge,
/area/station/science/lab)
"uHu" = (
/obj/structure/cable,
@@ -61808,7 +76686,7 @@
"uHR" = (
/obj/effect/spawner/random/vending/colavend,
/obj/machinery/light/directional/south,
-/turf/open/floor/iron/dark,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/hallway/primary/central)
"uHS" = (
/obj/machinery/status_display/door_timer{
@@ -61817,6 +76695,7 @@
pixel_y = -32
},
/obj/effect/turf_decal/trimline/dark_blue/filled/line,
+/obj/effect/turf_decal/trimline/dark/line,
/turf/open/floor/iron/dark,
/area/station/security/brig)
"uIQ" = (
@@ -61850,6 +76729,9 @@
"uKr" = (
/obj/structure/cable,
/obj/effect/turf_decal/siding/wood,
+/obj/structure/railing/corner/end/flip{
+ dir = 8
+ },
/turf/open/floor/wood,
/area/station/service/library)
"uKu" = (
@@ -61886,10 +76768,28 @@
},
/turf/open/floor/iron/textured,
/area/station/security/prison)
+"uLL" = (
+/obj/structure/fluff/paper,
+/obj/structure/rack,
+/obj/item/storage/bag/mail,
+/turf/open/floor/plating,
+/area/station/maintenance/port/aft)
+"uLM" = (
+/obj/effect/turf_decal/trimline/blue/arrow_cw{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/blue/mid_joiner{
+ dir = 4
+ },
+/turf/open/floor/iron/corner{
+ dir = 1
+ },
+/area/station/hallway/primary/central)
"uLZ" = (
/obj/structure/chair/sofa/bench/right{
dir = 4
},
+/obj/machinery/firealarm/directional/south,
/turf/open/floor/iron/dark/side{
dir = 8
},
@@ -61911,7 +76811,21 @@
/obj/structure/chair/stool/directional/west,
/obj/effect/decal/cleanable/blood/oil/slippery,
/obj/effect/landmark/start/scientist,
-/turf/open/floor/iron/checker,
+/obj/effect/turf_decal/trimline/dark/filled/warning{
+ alpha = 160;
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/purple/warning{
+ alpha = 200;
+ color = "#700047";
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 8
+ },
+/turf/open/floor/iron/white/smooth_half{
+ dir = 1
+ },
/area/station/science/lab)
"uMI" = (
/obj/structure/table/reinforced,
@@ -61941,27 +76855,87 @@
/obj/structure/cable,
/turf/open/floor/plating,
/area/station/security/corrections_officer)
+"uMX" = (
+/obj/effect/turf_decal/siding/white,
+/turf/open/floor/iron/freezer,
+/area/station/commons/toilet)
+"uNa" = (
+/obj/effect/turf_decal/siding/wideplating_new/light{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 1
+ },
+/obj/structure/decorative/fluff{
+ icon = 'modular_skyrat/modules/aesthetics/floors/icons/floors.dmi';
+ base_icon_state = "stairs-old";
+ icon_state = "stairs-old";
+ anchored = 1;
+ pixel_y = -17;
+ name = "staircase";
+ desc = "A small step for the humanity, and so is for you."
+ },
+/obj/structure/decorative/fluff{
+ icon = 'icons/turf/decals.dmi';
+ icon_state = "tile_half";
+ anchored = 1;
+ color = "#2a2e2e";
+ name = "decorative tile covers";
+ pixel_y = 6
+ },
+/obj/structure/decorative/fluff{
+ icon = 'icons/turf/decals.dmi';
+ icon_state = "warningline_white";
+ anchored = 1;
+ name = "warning line"
+ },
+/obj/structure/decorative/fluff{
+ icon = 'icons/turf/decals.dmi';
+ icon_state = "warningline";
+ anchored = 1;
+ name = "warning line"
+ },
+/obj/structure/decorative/fluff{
+ icon = 'icons/turf/decals.dmi';
+ icon_state = "warningline_white";
+ anchored = 1;
+ name = "warning line"
+ },
+/obj/structure/decorative/fluff{
+ icon = 'icons/turf/decals.dmi';
+ icon_state = "trimline_mid_fill";
+ anchored = 1;
+ color = "#2a2e2e";
+ name = "decorative tile covers";
+ pixel_y = 6;
+ pixel_x = 16
+ },
+/turf/open/floor/iron/dark/small,
+/area/station/cargo/storage)
"uNc" = (
-/obj/machinery/door/airlock/external{
- name = "External Access"
- },
-/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{
- cycle_id = "lower-airlock-bend"
- },
-/obj/effect/mapping_helpers/airlock/unres{
+/obj/machinery/holopad,
+/obj/effect/turf_decal/bot,
+/turf/open/floor/iron/textured_corner{
dir = 8
},
-/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance,
-/turf/open/floor/plating/airless,
-/area/station/maintenance/starboard/aft)
+/area/station/cargo/storage)
"uNf" = (
/obj/machinery/computer/libraryconsole/bookmanagement{
pixel_y = 8
},
/obj/structure/table/wood,
/obj/structure/cable,
+/obj/effect/turf_decal/siding/wood{
+ dir = 9
+ },
/turf/open/floor/wood,
/area/station/security/prison)
+"uNg" = (
+/obj/effect/turf_decal/trimline/blue/corner{
+ dir = 8
+ },
+/turf/open/floor/iron/edge,
+/area/station/hallway/primary/starboard)
"uNi" = (
/obj/structure/cable,
/turf/open/floor/iron/dark,
@@ -61972,11 +76946,22 @@
},
/turf/open/floor/wood,
/area/station/commons/vacant_room/office)
+"uNZ" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/components/unary/airlock_pump/unbolt_only{
+ dir = 4
+ },
+/turf/open/floor/plating,
+/area/station/maintenance/solars/port/aft)
"uOi" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/wood,
/area/station/maintenance/dorm_room)
+"uOv" = (
+/obj/machinery/atmospherics/components/unary/airlock_pump/unbolt_only,
+/turf/open/floor/plating,
+/area/station/maintenance/port/fore)
"uOx" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/window/reinforced/spawner/directional/west,
@@ -61993,8 +76978,26 @@
dir = 4
},
/obj/effect/mapping_helpers/broken_floor,
+/obj/item/chair,
/turf/open/floor/wood,
/area/station/service/library/abandoned)
+"uOF" = (
+/obj/effect/landmark/start/hangover,
+/obj/effect/turf_decal/siding/wood{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/neutral/warning{
+ dir = 1;
+ alpha = 100
+ },
+/turf/open/floor/iron/textured_corner,
+/area/station/hallway/primary/starboard)
+"uOX" = (
+/obj/structure/sign/poster/random/directional/south,
+/obj/effect/spawner/random/structure/barricade,
+/obj/structure/grille,
+/turf/open/floor/plating,
+/area/station/maintenance/port/aft)
"uPR" = (
/obj/structure/disposalpipe/trunk{
dir = 4
@@ -62007,20 +77010,29 @@
/turf/open/floor/iron/dark/side,
/area/station/hallway/primary/central/fore)
"uQn" = (
-/obj/structure/cable,
-/obj/machinery/door/poddoor/shutters/preopen{
- id = "briggate";
- name = "Security Shutters"
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 8
},
-/obj/effect/turf_decal/delivery,
-/turf/open/floor/iron,
-/area/station/security/prison)
+/turf/open/floor/iron/textured_edge{
+ dir = 8
+ },
+/area/station/cargo/storage)
"uQH" = (
/obj/effect/turf_decal/stripes/line{
dir = 10
},
/obj/machinery/cryo_cell,
-/turf/open/floor/iron/dark,
+/obj/structure/railing{
+ dir = 8
+ },
+/obj/effect/turf_decal/stripes/blue{
+ dir = 5
+ },
+/obj/effect/turf_decal/weather/snow,
+/obj/effect/turf_decal/siding{
+ dir = 8
+ },
+/turf/open/floor/iron/dark/smooth_large,
/area/station/medical/cryo)
"uQK" = (
/obj/item/clothing/suit/hazardvest{
@@ -62084,7 +77096,7 @@
pixel_y = 9
},
/obj/structure/closet/crate/internals,
-/turf/open/floor/iron,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/command/gateway)
"uQX" = (
/obj/structure/disposalpipe/segment,
@@ -62095,6 +77107,16 @@
/obj/structure/cable,
/turf/open/floor/iron/kitchen_coldroom/freezerfloor,
/area/station/service/kitchen)
+"uQZ" = (
+/obj/effect/turf_decal/trimline/dark/filled/corner{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/dark/filled/line,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 8
+ },
+/turf/open/floor/iron/dark/small,
+/area/station/medical/morgue)
"uRa" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
@@ -62108,17 +77130,9 @@
/area/station/commons/fitness/recreation/entertainment)
"uRk" = (
/obj/machinery/vending/coffee,
-/turf/open/floor/iron/white/side{
- dir = 6
- },
+/turf/open/floor/iron/dark/smooth_large,
/area/station/science/research)
"uRm" = (
-/obj/effect/turf_decal/tile/yellow{
- dir = 1
- },
-/obj/effect/turf_decal/tile/yellow{
- dir = 4
- },
/obj/machinery/button/door{
id = "chemistry_shutters2";
name = "Chemistry Shutter Control";
@@ -62126,17 +77140,17 @@
pixel_y = -6;
req_access = list("plumbing")
},
-/obj/effect/turf_decal/tile/yellow{
- dir = 8
- },
/obj/machinery/camera/directional/north{
c_tag = "Chemistry Lab North";
network = list("ss13","medbay")
},
-/turf/open/floor/iron/white,
+/obj/machinery/plumbing/sender,
+/obj/effect/turf_decal/bot_white,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/medical/chemistry)
"uRs" = (
/obj/effect/spawner/random/trash/mess,
+/obj/structure/railing,
/turf/open/floor/plating,
/area/station/maintenance/aft)
"uRx" = (
@@ -62147,8 +77161,18 @@
dir = 1
},
/obj/structure/window/reinforced/tinted/spawner/directional/south,
+/obj/effect/turf_decal/siding/wood,
/turf/open/floor/wood,
/area/station/security/prison)
+"uRN" = (
+/obj/effect/landmark/start/hangover,
+/obj/effect/turf_decal/trimline/dark_green/warning{
+ dir = 1
+ },
+/turf/open/floor/iron/edge{
+ dir = 1
+ },
+/area/station/hallway/primary/starboard)
"uSc" = (
/obj/effect/turf_decal/trimline/green/filled/corner{
dir = 4
@@ -62159,17 +77183,37 @@
/turf/open/floor/iron/white,
/area/station/medical/virology)
"uSL" = (
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+/obj/machinery/atmospherics/components/unary/airlock_pump/unbolt_only{
dir = 8
},
-/obj/machinery/door/airlock/external,
-/turf/open/floor/plating,
+/turf/open/floor/plating/airless,
/area/station/maintenance/starboard)
-"uSW" = (
-/obj/structure/table,
-/obj/machinery/cell_charger,
-/obj/item/stock_parts/power_store/cell/high,
+"uSS" = (
+/obj/structure/disposalpipe/segment,
+/obj/effect/turf_decal/trimline/yellow/corner{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/dark/corner{
+ dir = 4
+ },
/turf/open/floor/iron,
+/area/station/hallway/primary/aft)
+"uSW" = (
+/obj/item/multitool{
+ pixel_x = 7;
+ pixel_y = 0
+ },
+/obj/item/clothing/head/utility/welding{
+ pixel_x = -7;
+ pixel_y = 10
+ },
+/obj/item/clothing/glasses/welding{
+ pixel_x = -5;
+ pixel_y = 12
+ },
+/obj/structure/table/glass,
+/obj/effect/turf_decal/trimline/dark/filled/line,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/science/robotics/lab)
"uSZ" = (
/obj/structure/bed/double{
@@ -62181,8 +77225,13 @@
/turf/open/floor/carpet/red,
/area/station/commons/dorms)
"uTd" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
- dir = 1
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 9
+ },
+/obj/machinery/atmospherics/components/binary/pump/on/layer4{
+ name = "Airlock Pump";
+ hide = 1;
+ target_pressure = 300
},
/turf/open/floor/iron/smooth_large,
/area/station/engineering/main)
@@ -62213,20 +77262,32 @@
/obj/structure/chair/sofa/corp{
dir = 4
},
+/obj/effect/turf_decal/siding/wideplating_new/dark{
+ dir = 8
+ },
/turf/open/floor/wood/parquet,
/area/station/science/breakroom)
"uTE" = (
/obj/machinery/computer/records/security,
-/obj/effect/turf_decal/tile/red,
-/obj/effect/turf_decal/tile/red{
- dir = 4
- },
/obj/machinery/computer/security/telescreen/entertainment/directional/north,
-/obj/effect/turf_decal/tile/red{
+/obj/effect/turf_decal/tile/dark_red/half{
dir = 1
},
-/turf/open/floor/iron,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/command/bridge)
+"uTW" = (
+/obj/effect/spawner/structure/window/reinforced/tinted,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer4,
+/turf/open/floor/plating,
+/area/station/maintenance/aft)
+"uUc" = (
+/obj/structure/cable,
+/obj/effect/turf_decal/trimline/brown/filled/warning,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/iron/textured_edge{
+ dir = 1
+ },
+/area/station/cargo/storage)
"uUe" = (
/obj/machinery/cryopod{
dir = 1
@@ -62236,16 +77297,30 @@
},
/turf/open/floor/iron/dark,
/area/station/common/cryopods)
+"uUh" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 6
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 8
+ },
+/turf/open/floor/iron/dark,
+/area/station/service/hydroponics)
"uUn" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
/turf/open/floor/iron/dark,
/area/station/service/hydroponics)
"uVb" = (
-/obj/effect/turf_decal/caution/stand_clear,
-/obj/effect/turf_decal/trimline/purple/end{
- dir = 4
+/obj/machinery/door/window/right/directional/north{
+ req_access = list("robotics");
+ name = "Outlet Access"
},
-/turf/open/floor/iron/dark,
+/obj/effect/turf_decal/loading_area/white{
+ dir = 4;
+ color = "#ae4fd6"
+ },
+/turf/open/floor/iron/dark/smooth_large,
/area/station/science/robotics/lab)
"uVf" = (
/obj/machinery/vending/boozeomat,
@@ -62279,21 +77354,21 @@
/turf/open/floor/plating/airless,
/area/space/nearstation)
"uVV" = (
-/obj/structure/window/spawner/directional/west,
-/obj/structure/window/spawner/directional/north,
-/obj/machinery/hydroponics/constructable,
-/obj/machinery/door/window/left/directional/east,
-/obj/effect/turf_decal/siding/thinplating/dark{
- dir = 10
- },
-/turf/open/floor/iron/smooth_large,
-/area/station/service/hydroponics)
+/obj/machinery/firealarm/directional/east,
+/turf/open/floor/iron/dark,
+/area/station/security/courtroom)
"uWe" = (
/turf/open/floor/iron/dark/side{
dir = 4
},
/area/station/security/prison)
"uWf" = (
+/obj/effect/turf_decal/trimline/brown/filled/line{
+ dir = 5
+ },
+/obj/effect/turf_decal/trimline/dark/line{
+ dir = 5
+ },
/obj/effect/turf_decal/siding/thinplating/dark{
dir = 4
},
@@ -62330,22 +77405,26 @@
/obj/structure/cable,
/turf/open/floor/plating,
/area/station/security/prison)
+"uWN" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 8
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer4,
+/turf/open/floor/iron/textured_edge{
+ dir = 8
+ },
+/area/station/cargo/storage)
"uXt" = (
-/obj/effect/turf_decal/tile/brown{
- dir = 4
- },
-/obj/effect/turf_decal/tile/yellow{
- dir = 1
- },
/obj/machinery/light_switch/directional/north,
+/obj/effect/turf_decal/trimline/brown/filled/line{
+ dir = 9
+ },
+/obj/effect/turf_decal/trimline/dark/line{
+ dir = 9
+ },
/turf/open/floor/iron,
/area/station/cargo/miningdock)
-"uXI" = (
-/obj/machinery/firealarm/directional/west,
-/turf/open/floor/iron/white/side{
- dir = 5
- },
-/area/station/science/research)
"uXM" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -62367,6 +77446,26 @@
/obj/structure/cable,
/turf/open/floor/iron/dark,
/area/station/service/chapel)
+"uYg" = (
+/obj/machinery/door/airlock/maintenance{
+ name = "Gateway Maintenance"
+ },
+/obj/effect/mapping_helpers/airlock/access/any/command/gateway,
+/turf/open/floor/iron/dark/textured_large,
+/area/station/command/gateway)
+"uYz" = (
+/obj/effect/turf_decal/siding/dark{
+ dir = 5
+ },
+/obj/effect/turf_decal/siding/dark/corner{
+ dir = 8
+ },
+/obj/machinery/camera/directional/east{
+ c_tag = "Xenobiology Cell 6";
+ network = list("ss13","xeno")
+ },
+/turf/open/floor/engine,
+/area/station/science/xenobiology)
"uYF" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 4
@@ -62378,8 +77477,27 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
+/obj/effect/turf_decal/trimline/brown/filled/end{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/dark/end{
+ dir = 4
+ },
/turf/open/floor/iron,
/area/station/cargo/miningdock)
+"uZp" = (
+/obj/machinery/holopad,
+/obj/effect/turf_decal/box/white{
+ color = "#a56dc2"
+ },
+/obj/effect/turf_decal/delivery/white{
+ color = "#a56dc2"
+ },
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/iron/white/smooth_large,
+/area/station/science/xenobiology)
"uZR" = (
/obj/effect/turf_decal/trimline/green/filled/line,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
@@ -62390,6 +77508,9 @@
},
/turf/open/floor/iron/white,
/area/station/medical/virology)
+"uZS" = (
+/turf/open/floor/iron/dark,
+/area/station/maintenance/port/aft)
"vaa" = (
/obj/structure/closet/emcloset,
/obj/effect/landmark/start/hangover/closet,
@@ -62434,13 +77555,6 @@
/turf/open/floor/iron/grimy,
/area/station/security/detectives_office)
"vbw" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/obj/machinery/door/firedoor,
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 4
@@ -62448,13 +77562,22 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 8
},
-/turf/open/floor/iron/dark,
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/obj/machinery/door/firedoor,
+/obj/effect/turf_decal/tile/yellow/full,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/medical/medbay/central)
"vcc" = (
/obj/effect/turf_decal/bot,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/iron,
+/obj/structure/cable,
+/turf/open/floor/iron/edge,
/area/station/hallway/secondary/entry)
"vch" = (
/obj/effect/decal/cleanable/dirt,
@@ -62463,6 +77586,7 @@
/obj/effect/decal/cleanable/dirt,
/obj/structure/cable,
/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer5,
/turf/open/floor/plating,
/area/station/maintenance/port/aft)
"vci" = (
@@ -62487,6 +77611,10 @@
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/station/hallway/primary/fore)
+"vcM" = (
+/obj/effect/spawner/random/trash/garbage,
+/turf/open/floor/plating,
+/area/station/hallway/secondary/entry)
"vcX" = (
/obj/structure/displaycase/trophy,
/obj/effect/turf_decal/siding/wood/end,
@@ -62538,10 +77666,18 @@
},
/obj/effect/mapping_helpers/airlock/access/any/science/maintenance,
/obj/effect/mapping_helpers/airlock/abandoned,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer4,
/turf/open/floor/plating,
/area/station/maintenance/starboard)
"vfs" = (
/obj/structure/cable,
+/obj/effect/turf_decal/siding{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/blue/filled/warning{
+ alpha = 160;
+ dir = 1
+ },
/turf/open/floor/iron/white,
/area/station/medical/surgery/fore)
"vfR" = (
@@ -62552,13 +77688,56 @@
/obj/structure/railing{
dir = 4
},
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+ dir = 1
+ },
/turf/open/floor/plating,
/area/station/maintenance/port/fore)
+"vfV" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer5,
+/turf/open/floor/iron/smooth_large,
+/area/station/engineering/main)
+"vfX" = (
+/obj/structure/table/wood,
+/obj/item/plate/small{
+ pixel_y = -1
+ },
+/obj/item/plate/small{
+ pixel_y = 1
+ },
+/obj/item/plate/small{
+ pixel_y = 3
+ },
+/obj/machinery/door/firedoor/border_only{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/wood{
+ dir = 8
+ },
+/turf/open/floor/wood/tile,
+/area/station/hallway/secondary/entry)
"vgd" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/cable,
/turf/open/floor/iron,
-/area/station/science/ordnance/bomb)
+/area/station/science/ordnance/testlab)
+"vgr" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer4,
+/turf/open/floor/plating,
+/area/station/maintenance/starboard/aft)
+"vgR" = (
+/obj/machinery/door/window/left/directional/east{
+ name = "Incoming Mail";
+ req_access = list("cargo")
+ },
+/obj/structure/disposalpipe/trunk{
+ dir = 8
+ },
+/obj/machinery/disposal/delivery_chute{
+ dir = 4
+ },
+/turf/open/floor/plating,
+/area/station/maintenance/port/aft)
"vhn" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
@@ -62567,8 +77746,18 @@
dir = 8
},
/obj/machinery/door/firedoor,
-/turf/open/floor/iron/dark,
-/area/station/medical/medbay/aft)
+/obj/effect/turf_decal/stripes/blue/line{
+ dir = 8
+ },
+/obj/effect/turf_decal/stripes/blue/line{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/blue/full,
+/obj/effect/turf_decal/caution/stand_clear/white{
+ dir = 8
+ },
+/turf/open/floor/iron/dark/smooth_large,
+/area/station/medical/medbay/central)
"vhp" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 4
@@ -62601,9 +77790,6 @@
/area/station/science/genetics)
"vhE" = (
/obj/effect/turf_decal/trimline/green/filled/corner,
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
- dir = 8
- },
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 4
@@ -62615,10 +77801,14 @@
dir = 4
},
/obj/machinery/light/directional/east,
+/obj/effect/turf_decal/trimline/dark/line{
+ dir = 4
+ },
/turf/open/floor/iron/dark,
/area/station/security/execution/transfer)
"vij" = (
/obj/effect/turf_decal/trimline/dark_blue/filled/warning,
+/obj/effect/turf_decal/trimline/dark/warning,
/turf/open/floor/iron/dark,
/area/station/security/execution/transfer)
"vik" = (
@@ -62685,6 +77875,10 @@
/obj/structure/trash_pile,
/turf/open/floor/plating/airless,
/area/station/maintenance/port/fore)
+"vji" = (
+/obj/effect/landmark/start/hangover,
+/turf/open/floor/iron/large,
+/area/station/hallway/secondary/entry)
"vjk" = (
/obj/machinery/door/poddoor/shutters/preopen{
dir = 8;
@@ -62700,17 +77894,22 @@
/obj/machinery/door/airlock/maintenance{
name = "Cargo Bay Maintenance"
},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer5,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 6
+ },
/turf/open/floor/plating,
/area/station/cargo/bitrunning/den)
"vjN" = (
/turf/closed/wall/r_wall,
/area/station/command/heads_quarters/hos)
"vjY" = (
-/obj/effect/turf_decal/tile/yellow,
-/obj/effect/turf_decal/tile/yellow{
+/obj/effect/turf_decal/trimline/yellow/corner{
dir = 4
},
-/turf/open/floor/iron/dark/corner,
+/turf/open/floor/iron/corner{
+ dir = 8
+ },
/area/station/hallway/primary/aft)
"vki" = (
/obj/effect/turf_decal/stripes/line{
@@ -62740,7 +77939,10 @@
},
/obj/effect/turf_decal/siding/wood,
/obj/effect/turf_decal/siding/wood,
-/turf/open/floor/wood,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 5
+ },
+/turf/open/floor/wood/tile,
/area/station/command/heads_quarters/captain)
"vkQ" = (
/obj/machinery/power/apc/auto_name/directional/north,
@@ -62758,6 +77960,9 @@
/obj/structure/chair{
dir = 8
},
+/obj/effect/turf_decal/siding/wood{
+ dir = 4
+ },
/turf/open/floor/wood,
/area/station/security/prison)
"vlV" = (
@@ -62768,10 +77973,12 @@
/obj/machinery/photocopier/prebuilt,
/turf/open/floor/iron/dark,
/area/station/security/office)
-"vmm" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
- dir = 4
+"vlZ" = (
+/turf/open/floor/iron/edge{
+ dir = 1
},
+/area/station/hallway/primary/starboard)
+"vmm" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 4
},
@@ -62782,25 +77989,36 @@
},
/obj/effect/mapping_helpers/airlock/unres,
/obj/effect/mapping_helpers/airlock/access/any/science/maintenance,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer5,
/turf/open/floor/plating,
/area/station/maintenance/starboard)
"vmn" = (
-/obj/effect/turf_decal/tile/yellow{
- dir = 1
+/obj/machinery/airalarm/directional/west,
+/obj/effect/turf_decal/trimline/yellow/filled/line{
+ dir = 8;
+ alpha = 120
},
-/obj/effect/turf_decal/tile/yellow{
+/obj/effect/turf_decal/trimline/blue/line{
+ alpha = 200;
+ dir = 8
+ },
+/turf/open/floor/iron/white/smooth_edge{
dir = 8
},
-/obj/machinery/airalarm/directional/west,
-/turf/open/floor/iron/white,
/area/station/medical/chemistry)
+"vmo" = (
+/obj/machinery/vending/coffee,
+/turf/open/floor/iron/large,
+/area/station/hallway/secondary/entry)
"vms" = (
-/obj/effect/turf_decal/tile/brown/half/contrasted{
+/obj/structure/cable,
+/obj/machinery/light/small/directional/north,
+/obj/effect/turf_decal/trimline/brown/filled/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/dark/line{
dir = 1
},
-/obj/machinery/power/apc/auto_name/directional/north,
-/obj/structure/cable,
-/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron,
/area/station/cargo/warehouse)
"vmy" = (
@@ -62831,8 +78049,17 @@
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/turf_decal/trimline/dark/warning{
+ dir = 1
+ },
/turf/open/floor/iron/dark,
/area/station/security/execution/transfer)
+"vmK" = (
+/obj/effect/turf_decal/siding/dark{
+ dir = 10
+ },
+/turf/open/floor/iron/dark/textured_large,
+/area/station/service/hydroponics)
"vmV" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
dir = 4
@@ -62857,14 +78084,29 @@
/turf/open/floor/iron/smooth_large,
/area/station/engineering/main)
"vof" = (
-/obj/effect/turf_decal/trimline/blue/filled/line{
- dir = 1
- },
/obj/structure/disposalpipe/segment{
dir = 4
},
/obj/structure/sign/eyechart/directional/north,
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/trimline/blue/filled/line{
+ alpha = 160;
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/white/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/blue/filled/mid_joiner{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/blue/filled/mid_joiner{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/white/mid_joiner{
+ dir = 1
+ },
+/turf/open/floor/iron/white/smooth_edge{
+ dir = 1
+ },
/area/station/medical/medbay/central)
"voq" = (
/obj/machinery/door/airlock/public/glass{
@@ -62876,7 +78118,6 @@
/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{
cycle_id = "holodeck"
},
-/obj/machinery/door/firedoor,
/turf/open/floor/iron,
/area/station/commons/fitness/recreation)
"voA" = (
@@ -62894,10 +78135,17 @@
},
/area/station/hallway/primary/central)
"vpt" = (
-/obj/effect/turf_decal/bot,
-/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 5
+ },
+/obj/effect/turf_decal/siding/wood/corner{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/blue/filled/corner{
+ dir = 4
+ },
/turf/open/floor/iron,
-/area/station/cargo/storage)
+/area/station/hallway/secondary/entry)
"vpA" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 4
@@ -62921,6 +78169,14 @@
dir = 1
},
/area/station/commons/fitness)
+"vpG" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/purple/line,
+/obj/effect/turf_decal/trimline/purple/mid_joiner,
+/turf/open/floor/iron/edge,
+/area/station/hallway/primary/central)
"vpO" = (
/obj/effect/landmark/event_spawn,
/turf/open/floor/carpet,
@@ -62935,7 +78191,12 @@
dir = 8
},
/obj/structure/cable,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/turf/open/floor/iron/dark/side{
+ dir = 8
+ },
/area/station/commons/locker)
"vqW" = (
/obj/machinery/light/directional/north,
@@ -62953,25 +78214,39 @@
/turf/open/floor/plating,
/area/station/maintenance/starboard/fore)
"vrh" = (
-/obj/effect/turf_decal/trimline/blue/filled/line{
- dir = 4
+/obj/effect/turf_decal/trimline/blue/filled/warning{
+ alpha = 160;
+ dir = 6
},
-/obj/effect/turf_decal/trimline/blue/filled/warning,
-/obj/structure/extinguisher_cabinet{
- pixel_x = 27
+/obj/machinery/iv_drip,
+/obj/structure/extinguisher_cabinet/directional/east,
+/obj/effect/turf_decal/trimline/white/warning{
+ dir = 6
},
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
- dir = 9
+/turf/open/floor/iron/white/smooth_corner{
+ dir = 1
},
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
- dir = 9
- },
-/turf/open/floor/iron/white,
/area/station/medical/medbay/central)
"vrk" = (
/obj/effect/turf_decal/tile/neutral/opposingcorners,
+/obj/effect/turf_decal/siding/wood{
+ dir = 1
+ },
/turf/open/floor/iron/dark,
/area/station/service/bar)
+"vsg" = (
+/obj/effect/turf_decal/trimline/brown/filled/line,
+/obj/effect/turf_decal/trimline/brown/filled/corner{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/dark/corner{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/dark/line,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron,
+/area/station/cargo/miningdock)
"vsA" = (
/obj/effect/turf_decal/stripes/line,
/obj/machinery/atmospherics/components/unary/portables_connector/visible{
@@ -62979,6 +78254,19 @@
},
/turf/open/floor/iron,
/area/station/science/ordnance)
+"vsC" = (
+/obj/effect/turf_decal/siding/dark{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/dark,
+/obj/effect/turf_decal/trimline/purple/filled/line{
+ alpha = 160;
+ color = "#6a3182";
+ dir = 1
+ },
+/obj/effect/landmark/start/roboticist,
+/turf/open/floor/iron/dark/small,
+/area/station/science/robotics/lab)
"vsE" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/flasher{
@@ -63003,7 +78291,7 @@
name = "Escape"
},
/obj/effect/landmark/navigate_destination,
-/turf/open/floor/iron,
+/turf/open/floor/iron/large,
/area/station/hallway/secondary/exit)
"vsQ" = (
/obj/structure/cable,
@@ -63020,16 +78308,28 @@
dir = 4
},
/obj/effect/mapping_helpers/airlock/access/any/service/maintenance,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 8
+ },
/turf/open/floor/plating,
/area/station/maintenance/starboard/fore)
"vtB" = (
-/obj/effect/turf_decal/siding/wood/corner{
- dir = 1
- },
/obj/structure/sign/poster/official/bless_this_spess/directional/north,
/obj/effect/turf_decal/siding/wood,
+/obj/effect/turf_decal/siding/wood{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 5
+ },
/turf/open/floor/wood,
/area/station/command/heads_quarters/captain)
+"vtU" = (
+/obj/effect/turf_decal/siding/dark,
+/turf/open/floor/iron/dark,
+/area/station/service/hydroponics)
"vtY" = (
/obj/machinery/door/airlock/security/glass{
name = "Prison Wing"
@@ -63038,6 +78338,18 @@
/obj/effect/mapping_helpers/airlock/access/any/security/brig,
/turf/open/floor/iron/dark,
/area/station/security/execution/transfer)
+"vuC" = (
+/obj/effect/turf_decal/siding/dark/corner,
+/obj/effect/turf_decal/siding/dark{
+ dir = 9
+ },
+/obj/effect/turf_decal/trimline/purple/filled/line{
+ alpha = 160;
+ color = "#6a3182";
+ dir = 9
+ },
+/turf/open/floor/iron/dark/small,
+/area/station/science/robotics/lab)
"vuL" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
dir = 4
@@ -63076,6 +78388,9 @@
c_tag = "Prison - Relaxation";
network = list("ss13","prison")
},
+/obj/effect/turf_decal/siding/wood{
+ dir = 9
+ },
/turf/open/floor/wood,
/area/station/security/prison)
"vwM" = (
@@ -63087,15 +78402,22 @@
/turf/open/floor/iron/dark,
/area/station/commons/fitness)
"vwX" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/vending/wardrobe/coroner_wardrobe,
-/obj/structure/window/reinforced/spawner/directional/south,
-/obj/structure/window/reinforced/spawner/directional/east,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
dir = 8
},
-/turf/open/floor/iron/dark,
+/obj/machinery/vending/wardrobe/coroner_wardrobe,
+/obj/structure/window/reinforced/spawner/directional/south,
+/obj/effect/turf_decal/siding/dark/corner{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/dark/filled/corner{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/dark/filled/line{
+ dir = 6
+ },
+/obj/structure/window/reinforced/spawner/directional/east,
+/turf/open/floor/iron/dark/small,
/area/station/medical/morgue)
"vxa" = (
/obj/effect/turf_decal/stripes/corner{
@@ -63120,14 +78442,47 @@
/obj/structure/disposalpipe/segment{
dir = 9
},
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/trimline/dark/filled/line{
+ alpha = 160;
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/purple/line{
+ color = "#700047";
+ alpha = 200;
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/dark/filled/mid_joiner{
+ dir = 4;
+ alpha = 160
+ },
+/turf/open/floor/iron/white/smooth_edge{
+ dir = 4
+ },
/area/station/science/lab)
"vxy" = (
-/obj/effect/turf_decal/stripes/end{
- dir = 1
- },
/obj/machinery/suit_storage_unit/standard_unit,
-/turf/open/floor/iron,
+/obj/structure/railing/corner{
+ dir = 4;
+ pixel_y = -32
+ },
+/obj/structure/railing/corner{
+ dir = 1;
+ pixel_y = -32
+ },
+/obj/effect/turf_decal/box/white{
+ color = "#ff780a"
+ },
+/obj/effect/turf_decal/bot_white{
+ color = "#ff780a"
+ },
+/obj/item/toy/figure/ninja{
+ pixel_x = -1;
+ pixel_y = 15
+ },
+/turf/open/floor/iron/dark/smooth_large,
/area/station/ai_monitored/command/storage/eva)
"vxL" = (
/obj/effect/decal/cleanable/dirt,
@@ -63138,6 +78493,9 @@
/obj/effect/turf_decal/trimline/dark_blue/filled/line{
dir = 10
},
+/obj/effect/turf_decal/trimline/dark/line{
+ dir = 10
+ },
/turf/open/floor/iron/dark,
/area/station/security/brig)
"vyO" = (
@@ -63168,8 +78526,29 @@
/turf/open/floor/iron/cafeteria,
/area/station/security/prison)
"vzg" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/trimline/dark/filled/line{
+ alpha = 160;
+ dir = 5
+ },
+/obj/effect/turf_decal/trimline/purple/line{
+ color = "#700047";
+ alpha = 200;
+ dir = 5
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 5
+ },
+/obj/effect/turf_decal/trimline/dark/filled/mid_joiner{
+ dir = 1;
+ alpha = 160
+ },
+/obj/effect/turf_decal/trimline/dark/filled/mid_joiner{
+ dir = 4;
+ alpha = 160
+ },
+/turf/open/floor/iron/white/smooth_corner{
+ dir = 8
+ },
/area/station/science/lab)
"vzp" = (
/obj/effect/decal/cleanable/dirt,
@@ -63180,17 +78559,20 @@
/turf/open/floor/iron,
/area/station/science/ordnance)
"vzq" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
- dir = 4
+/obj/structure/window/reinforced/spawner/directional/north,
+/obj/structure/disposalpipe/trunk{
+ dir = 1
},
-/obj/machinery/modular_computer/preset/civilian{
- dir = 4
+/obj/effect/turf_decal/stripes/line{
+ dir = 9
},
-/obj/structure/railing{
- dir = 8
+/obj/effect/turf_decal/stripes/white/line{
+ color = "#a56dc2";
+ dir = 6
},
-/turf/open/floor/iron/white,
-/area/station/science/explab)
+/obj/machinery/disposal/bin,
+/turf/open/floor/iron/dark/smooth_large,
+/area/station/science/xenobiology)
"vzs" = (
/obj/structure/cable,
/turf/open/floor/iron/dark/corner{
@@ -63243,13 +78625,17 @@
/area/station/security/prison)
"vBc" = (
/obj/structure/disposalpipe/segment,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
/obj/effect/turf_decal/trimline/dark_blue/filled/line{
dir = 4
},
/obj/machinery/light/directional/east,
/obj/machinery/airalarm/directional/east,
/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/layer_manifold/cyan/hidden,
+/obj/effect/turf_decal/trimline/dark_blue/line{
+ alpha = 200;
+ dir = 4
+ },
/turf/open/floor/iron/dark,
/area/station/security/office)
"vBq" = (
@@ -63257,7 +78643,7 @@
dir = 8
},
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
- dir = 4
+ dir = 1
},
/turf/open/floor/iron/grimy,
/area/station/command/heads_quarters/captain)
@@ -63272,6 +78658,28 @@
},
/turf/open/floor/iron/dark,
/area/station/commons/dorms)
+"vBG" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/turf_decal/trimline/dark/filled/corner{
+ alpha = 160;
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/purple/corner{
+ alpha = 200;
+ dir = 8;
+ color = "#a56dc2"
+ },
+/obj/effect/turf_decal/siding/dark/corner{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/corner,
+/turf/open/floor/iron/white,
+/area/station/science/xenobiology)
"vBK" = (
/obj/structure/disposalpipe/segment{
dir = 6
@@ -63302,11 +78710,11 @@
/area/station/maintenance/starboard/aft)
"vCz" = (
/obj/structure/window/reinforced/spawner/directional/west,
-/obj/effect/turf_decal/siding/blue{
- dir = 4
- },
/obj/structure/flora/bush/flowers_pp,
/obj/structure/reagent_dispensers/watertank/high,
+/obj/effect/turf_decal/siding/wood{
+ dir = 4
+ },
/turf/open/floor/grass,
/area/station/security/prison)
"vCF" = (
@@ -63322,13 +78730,21 @@
/obj/item/food/grown/wheat,
/obj/item/food/grown/watermelon,
/obj/item/food/grown/citrus/lime,
+/obj/effect/turf_decal/trimline/green/filled/line{
+ dir = 4
+ },
/turf/open/floor/iron,
/area/station/service/hydroponics/garden)
"vCG" = (
-/obj/effect/turf_decal/tile/purple/half/contrasted{
+/obj/effect/turf_decal/trimline/purple/line{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/purple/mid_joiner{
+ dir = 8
+ },
+/turf/open/floor/iron/edge{
dir = 8
},
-/turf/open/floor/iron,
/area/station/hallway/primary/starboard)
"vDl" = (
/obj/machinery/light/directional/south,
@@ -63378,24 +78794,43 @@
/turf/open/floor/iron/dark,
/area/station/command/heads_quarters/cmo)
"vEh" = (
-/obj/machinery/firealarm/directional/north,
-/obj/effect/turf_decal/tile/neutral{
+/obj/structure/disposalpipe/segment,
+/obj/machinery/firealarm/directional/east,
+/turf/open/floor/iron,
+/area/station/hallway/primary/fore)
+"vEn" = (
+/obj/structure/extinguisher_cabinet/directional/south,
+/obj/effect/turf_decal/trimline/yellow/filled/line{
+ dir = 2;
+ alpha = 120
+ },
+/obj/effect/turf_decal/trimline/blue/line{
+ alpha = 200
+ },
+/turf/open/floor/iron/white/smooth_edge,
+/area/station/medical/chemistry)
+"vEo" = (
+/obj/effect/turf_decal/trimline/dark/filled/mid_joiner{
+ dir = 4;
+ alpha = 160
+ },
+/obj/effect/turf_decal/siding/dark{
dir = 4
},
-/turf/open/floor/iron/dark/side{
- dir = 1
+/obj/effect/turf_decal/trimline/dark/filled/warning{
+ alpha = 160;
+ dir = 4
},
-/area/station/hallway/primary/central/fore)
-"vEn" = (
-/obj/effect/turf_decal/tile/yellow{
- dir = 8
+/obj/effect/turf_decal/trimline/purple/warning{
+ alpha = 200;
+ dir = 4;
+ color = "#a56dc2"
},
-/obj/effect/turf_decal/tile/yellow,
-/obj/structure/extinguisher_cabinet{
- pixel_y = -30
+/obj/structure/sign/warning/docking/directional/east,
+/turf/open/floor/iron/white/smooth_edge{
+ dir = 4
},
-/turf/open/floor/iron/white,
-/area/station/medical/chemistry)
+/area/station/science/xenobiology)
"vEt" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/closet/secure_closet/personal{
@@ -63433,19 +78868,30 @@
/area/station/security/warden)
"vEC" = (
/obj/effect/turf_decal/arrows,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/brown/filled/warning,
+/turf/open/floor/iron/textured_edge{
+ dir = 1
+ },
/area/station/cargo/office)
"vEF" = (
+/obj/structure/cable,
/obj/effect/turf_decal/plaque{
icon_state = "L14"
},
-/obj/structure/cable,
/turf/open/floor/iron,
/area/station/hallway/primary/central)
"vET" = (
-/obj/item/trash/cheesie,
+/obj/effect/turf_decal/siding/thinplating/dark{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 5
+ },
+/obj/structure/cable,
/turf/open/floor/plating,
-/area/station/maintenance/port)
+/area/station/maintenance/port/aft)
"vEZ" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -63488,7 +78934,8 @@
/obj/structure/disposalpipe/junction/yjunction{
dir = 8
},
-/turf/open/floor/iron,
+/obj/effect/turf_decal/siding/dark,
+/turf/open/floor/iron/edge,
/area/station/hallway/primary/central)
"vFD" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -63527,16 +78974,22 @@
/area/station/hallway/primary/central)
"vFS" = (
/obj/structure/disposalpipe/segment,
-/obj/effect/turf_decal/tile/brown{
+/obj/machinery/door/firedoor,
+/obj/machinery/firealarm/directional/west,
+/obj/effect/turf_decal/trimline/brown/warning{
dir = 8
},
-/obj/machinery/door/firedoor,
-/turf/open/floor/iron,
+/turf/open/floor/iron/large,
/area/station/hallway/primary/central)
"vGg" = (
-/obj/machinery/holopad,
-/obj/effect/landmark/start/chemist,
-/turf/open/floor/iron/white,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/yellow,
+/obj/effect/turf_decal/tile/yellow{
+ dir = 1
+ },
+/turf/open/floor/iron/dark,
/area/station/medical/pharmacy)
"vGk" = (
/obj/effect/decal/cleanable/dirt,
@@ -63558,7 +79011,7 @@
name = "Research Division Fax Machine";
pixel_x = 1
},
-/turf/open/floor/iron/white,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/science/lab)
"vGZ" = (
/obj/machinery/light/small/directional/east,
@@ -63581,6 +79034,15 @@
/obj/effect/spawner/random/trash/mess,
/turf/open/floor/iron,
/area/station/service/janitor)
+"vHG" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron/dark,
+/area/station/security/processing)
+"vHK" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer4,
+/turf/open/floor/iron/dark,
+/area/station/maintenance/port/aft)
"vHL" = (
/obj/structure/chair/comfy/brown{
dir = 1
@@ -63608,29 +79070,51 @@
/obj/effect/mapping_helpers/apc/cell_10k,
/turf/open/floor/iron/dark/side,
/area/station/security/prison)
+"vII" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer5,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 5
+ },
+/turf/open/floor/iron,
+/area/station/hallway/secondary/entry)
+"vIJ" = (
+/obj/structure/disposalpipe/segment,
+/obj/structure/steam_vent,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/turf/open/floor/iron/dark,
+/area/station/maintenance/port/aft)
"vIU" = (
/obj/machinery/light/directional/west,
/obj/effect/turf_decal/siding/white{
dir = 8
},
-/turf/open/water,
+/turf/open/water/no_planet_atmos/deep,
/area/station/service/hydroponics/garden)
"vJr" = (
-/obj/effect/turf_decal/tile/purple/half/contrasted{
- dir = 4
- },
/obj/machinery/vending/modularpc,
-/turf/open/floor/iron,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/hallway/primary/starboard)
"vJC" = (
/obj/machinery/camera/directional/west{
c_tag = "Bridge West"
},
-/obj/effect/turf_decal/tile/red{
- dir = 1
+/obj/effect/turf_decal/siding/dark{
+ dir = 1;
+ icon_state = "siding_plain_end"
+ },
+/turf/open/floor/iron/dark/side{
+ dir = 4
},
-/turf/open/floor/iron,
/area/station/command/bridge)
+"vJG" = (
+/obj/effect/turf_decal/trimline/yellow/corner,
+/turf/open/floor/iron/textured_half,
+/area/station/hallway/primary/port)
"vJW" = (
/obj/machinery/camera{
c_tag = "Prison - Sport Room";
@@ -63649,20 +79133,39 @@
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
dir = 4
},
+/obj/item/pen{
+ pixel_x = -4;
+ pixel_y = 14
+ },
+/obj/effect/turf_decal/siding/wood{
+ dir = 1
+ },
/turf/open/floor/iron/grimy,
/area/station/service/library/abandoned)
+"vKh" = (
+/obj/machinery/door/poddoor/shutters/preopen{
+ id = "robotics2";
+ name = "Robotics Lab Shutters"
+ },
+/obj/effect/spawner/structure/window/reinforced,
+/turf/open/floor/plating,
+/area/station/science/robotics/lab)
"vKD" = (
/turf/open/floor/carpet,
/area/station/commons/vacant_room/office)
"vLr" = (
/obj/effect/turf_decal/trimline/blue/filled/warning{
+ alpha = 160;
dir = 8
},
-/obj/effect/turf_decal/trimline/blue/filled/corner{
- dir = 1
+/obj/effect/turf_decal/trimline/dark_blue/warning{
+ alpha = 200;
+ dir = 8
},
-/turf/open/floor/iron/white,
-/area/station/medical/medbay/aft)
+/turf/open/floor/iron/white/smooth_edge{
+ dir = 8
+ },
+/area/station/medical/medbay/central)
"vLx" = (
/obj/structure/window/reinforced/spawner/directional/north,
/obj/structure/window/reinforced/spawner/directional/east,
@@ -63706,9 +79209,53 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
/area/station/maintenance/port/aft)
+"vMq" = (
+/obj/effect/turf_decal/trimline/blue/arrow_ccw{
+ alpha = 200
+ },
+/obj/effect/turf_decal/trimline/blue/mid_joiner{
+ alpha = 200
+ },
+/turf/open/floor/iron/corner{
+ dir = 4
+ },
+/area/station/hallway/primary/central)
+"vMw" = (
+/obj/structure/window/reinforced/tinted/spawner/directional/south,
+/obj/effect/turf_decal/siding/wood,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/wood,
+/area/station/security/prison)
+"vML" = (
+/obj/structure/trash_pile,
+/obj/effect/turf_decal/siding/dark{
+ dir = 8
+ },
+/turf/open/floor/plating,
+/area/station/maintenance/aft)
+"vMQ" = (
+/obj/effect/turf_decal/tile/yellow,
+/obj/effect/turf_decal/tile/blue/half{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/blue{
+ dir = 4
+ },
+/turf/open/floor/iron/white/smooth_edge{
+ dir = 8
+ },
+/area/station/medical/chemistry)
"vNt" = (
/obj/item/radio/intercom/directional/north,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/brown/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/brown/mid_joiner{
+ dir = 1
+ },
+/turf/open/floor/iron/edge{
+ dir = 1
+ },
/area/station/hallway/primary/starboard)
"vNL" = (
/obj/machinery/door/window/brigdoor/right/directional/west,
@@ -63731,11 +79278,12 @@
/area/station/maintenance/abandon_cafeteria)
"vOt" = (
/obj/item/radio/intercom/directional/south,
-/obj/effect/turf_decal/tile/purple/opposingcorners{
+/obj/effect/turf_decal/trimline/purple/corner{
+ dir = 8
+ },
+/turf/open/floor/iron/textured_corner{
dir = 1
},
-/obj/effect/turf_decal/tile/purple,
-/turf/open/floor/iron,
/area/station/hallway/primary/starboard)
"vOC" = (
/obj/structure/table,
@@ -63746,6 +79294,13 @@
/obj/machinery/door/window/right/directional/south,
/turf/open/floor/iron,
/area/station/security/prison/visit)
+"vOD" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/blood/oil/slippery,
+/turf/open/floor/plating,
+/area/station/maintenance/aft)
"vOH" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
@@ -63760,9 +79315,6 @@
/turf/open/floor/iron/grimy,
/area/station/security/detectives_office)
"vOK" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
- dir = 4
- },
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 4
},
@@ -63770,6 +79322,33 @@
/obj/effect/turf_decal/tile/red,
/turf/open/floor/iron/dark,
/area/station/hallway/secondary/exit)
+"vPf" = (
+/obj/effect/turf_decal/trimline/dark_blue/filled/line{
+ dir = 8
+ },
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/turf_decal/trimline/dark/line{
+ dir = 8
+ },
+/obj/machinery/light/directional/west,
+/turf/open/floor/iron/dark,
+/area/station/security/brig)
+"vPg" = (
+/obj/structure/disposalpipe/segment,
+/obj/effect/turf_decal/trimline/dark_blue/arrow_cw{
+ dir = 8;
+ alpha = 200
+ },
+/obj/effect/turf_decal/trimline/dark_blue/mid_joiner{
+ dir = 8;
+ alpha = 200
+ },
+/turf/open/floor/iron/edge{
+ dir = 8
+ },
+/area/station/hallway/primary/central)
"vPx" = (
/obj/structure/disposalpipe/segment,
/turf/open/floor/iron,
@@ -63779,38 +79358,54 @@
/turf/open/floor/engine/vacuum,
/area/station/science/ordnance/burnchamber)
"vPP" = (
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
/obj/machinery/atmospherics/components/trinary/filter/atmos/co2{
dir = 8
},
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/weather/snow,
+/turf/open/floor/iron/freezer,
/area/station/medical/cryo)
"vPR" = (
/obj/structure/lattice,
/obj/item/stack/cable_coil,
/turf/open/space/basic,
/area/space/nearstation)
-"vPU" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
-/obj/machinery/firealarm/directional/north,
-/turf/open/floor/iron/dark,
-/area/station/security/office)
"vQK" = (
/obj/structure/closet/secure_closet/engineering_chief,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/item/chair/plastic,
/turf/open/floor/carpet/orange,
/area/station/command/heads_quarters/ce)
+"vQT" = (
+/obj/effect/turf_decal/trimline/blue/filled/line{
+ dir = 1
+ },
+/obj/structure/closet/crate/bin,
+/obj/effect/landmark/start/hangover/closet,
+/turf/open/floor/iron/edge,
+/area/station/hallway/secondary/entry)
+"vRa" = (
+/obj/structure/table/wood,
+/obj/item/food/grown/harebell,
+/obj/item/food/grown/harebell{
+ pixel_x = -3;
+ pixel_y = 4
+ },
+/turf/open/floor/iron/dark,
+/area/station/service/chapel)
"vRc" = (
/obj/structure/cable,
/obj/machinery/space_heater,
/turf/open/floor/plating,
/area/station/maintenance/central)
+"vRs" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/white{
+ dir = 10
+ },
+/turf/open/floor/iron/white/small,
+/area/station/commons/toilet)
"vRG" = (
/turf/closed/wall,
/area/station/security/interrogation)
@@ -63829,6 +79424,21 @@
},
/turf/open/floor/iron/dark,
/area/station/security/execution/education)
+"vSz" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/obj/structure/cable,
+/turf/open/floor/iron/edge{
+ dir = 4
+ },
+/area/station/hallway/primary/starboard)
"vSG" = (
/obj/structure/cable,
/obj/effect/turf_decal/tile/neutral,
@@ -63838,18 +79448,27 @@
},
/area/station/commons/fitness)
"vTj" = (
-/obj/machinery/door/poddoor/shutters{
- id = "HFRshutter";
- name = "Atmospherics HFR Shutters"
- },
-/obj/machinery/door/firedoor/heavy,
-/turf/open/floor/iron/dark,
-/area/station/engineering/atmos/hfr_room)
+/obj/effect/spawner/structure/window/reinforced/tinted,
+/turf/open/floor/plating,
+/area/station/maintenance/port/aft)
"vTk" = (
/obj/structure/window/reinforced/tinted/spawner/directional/east,
-/obj/structure/chair/stool/directional/south,
+/obj/structure/chair/stool/directional/south{
+ dir = 1
+ },
/turf/open/floor/iron,
/area/station/security/prison/visit)
+"vTq" = (
+/obj/structure/trash_pile,
+/turf/open/floor/wood,
+/area/station/maintenance/port/aft)
+"vTv" = (
+/obj/effect/turf_decal/weather/snow,
+/obj/effect/turf_decal/weather/snow/corner{
+ dir = 4
+ },
+/turf/open/floor/plating/airless,
+/area/space/nearstation)
"vTE" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
dir = 4
@@ -63878,6 +79497,7 @@
/obj/item/clothing/under/rank/prisoner/skirt/highsec,
/obj/item/clothing/under/rank/prisoner/supermax,
/obj/item/clothing/under/rank/prisoner/skirt/supermax,
+/obj/effect/turf_decal/trimline/dark/line,
/turf/open/floor/iron/dark,
/area/station/security/execution/transfer)
"vUu" = (
@@ -63890,6 +79510,26 @@
/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/iron/dark,
/area/station/commons/fitness/recreation/entertainment)
+"vUF" = (
+/obj/structure/table/wood,
+/obj/item/paper{
+ default_raw_text = "Jim Norton's Quebecois Coffee. You see, in 2265 the Quebecois had finally had enough of Canada's shit, and went to the one place that wasn't corrupted by Canuckistan. Je vais au seul endroit qui n'est pas corrompu par les Canadiens ... L'ESPACE.";
+ name = "Coffee Shop";
+ pixel_y = 6
+ },
+/obj/item/reagent_containers/cup/glass/ice{
+ pixel_x = -2;
+ pixel_y = 2
+ },
+/obj/machinery/door/firedoor/border_only{
+ dir = 4
+ },
+/obj/structure/noticeboard/directional/north,
+/obj/effect/turf_decal/siding/wood/corner{
+ dir = 8
+ },
+/turf/open/floor/wood/tile,
+/area/station/hallway/secondary/entry)
"vUH" = (
/obj/machinery/firealarm/directional/west,
/turf/open/floor/iron/dark,
@@ -63913,6 +79553,28 @@
},
/turf/open/floor/plating,
/area/station/ai_monitored/turret_protected/aisat/hallway)
+"vVP" = (
+/obj/structure/fluff/metalpole/anchor{
+ dir = 1;
+ pixel_y = 32
+ },
+/obj/machinery/door/firedoor/border_only{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes/white/line{
+ color = "#52B4E9";
+ dir = 1;
+ name = "blue line"
+ },
+/obj/structure/railing/corner/end/flip{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/blue/fourcorners,
+/turf/open/floor/iron/white,
+/area/station/hallway/secondary/entry)
"vWb" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -63922,6 +79584,7 @@
"vWp" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/cable,
/turf/open/floor/iron/dark/side,
/area/station/security/prison/safe)
"vWv" = (
@@ -63929,8 +79592,18 @@
/obj/effect/turf_decal/trimline/dark_blue/filled/line{
dir = 1
},
+/obj/effect/turf_decal/trimline/dark_blue/line{
+ alpha = 200;
+ dir = 1
+ },
/turf/open/floor/iron/dark,
/area/station/security/office)
+"vWE" = (
+/obj/machinery/firealarm/directional/north,
+/turf/open/floor/iron/corner{
+ dir = 8
+ },
+/area/station/hallway/primary/central)
"vXe" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
@@ -63944,12 +79617,17 @@
/area/station/maintenance/starboard/aft)
"vXl" = (
/obj/structure/cable,
-/obj/machinery/door/airlock/research{
- name = "Firing Range"
- },
/obj/effect/mapping_helpers/airlock/access/any/science/general,
+/obj/machinery/door/airlock/maintenance{
+ name = "Firing Range Maintenance"
+ },
/turf/open/floor/plating,
/area/station/science/auxlab/firing_range)
+"vXv" = (
+/obj/effect/spawner/structure/window/reinforced/tinted,
+/obj/effect/decal/cleanable/blood/splatter/over_window,
+/turf/open/floor/plating,
+/area/station/maintenance/port/aft)
"vXW" = (
/obj/structure/window/reinforced/spawner/directional/west,
/obj/structure/flora/bush/jungle/b,
@@ -63958,7 +79636,7 @@
"vYa" = (
/obj/machinery/button/delam_scram,
/turf/closed/wall/r_wall,
-/area/station/engineering/main)
+/area/station/engineering/supermatter/room)
"vYr" = (
/obj/machinery/navbeacon{
codes_txt = "patrol;next_patrol=EVA2";
@@ -63977,10 +79655,16 @@
/obj/machinery/light_switch{
pixel_y = 28
},
+/obj/effect/turf_decal/siding/dark{
+ dir = 9
+ },
/turf/open/floor/iron/dark,
/area/station/service/hydroponics)
"vYW" = (
-/obj/structure/disposalpipe/segment{
+/obj/effect/turf_decal/siding/dark{
+ dir = 10
+ },
+/obj/effect/turf_decal/siding/dark/corner{
dir = 4
},
/turf/open/floor/engine,
@@ -63994,7 +79678,7 @@
},
/obj/structure/cable,
/obj/effect/mapping_helpers/airlock/access/any/security/general,
-/turf/open/floor/iron,
+/turf/open/floor/iron/dark/textured_large,
/area/station/security/checkpoint/supply)
"vZB" = (
/obj/effect/decal/cleanable/dirt,
@@ -64003,9 +79687,15 @@
},
/turf/open/floor/engine,
/area/station/science/explab)
+"vZI" = (
+/obj/effect/turf_decal/siding/dark{
+ dir = 5
+ },
+/turf/open/floor/iron/dark/smooth_corner{
+ dir = 8
+ },
+/area/station/maintenance/starboard/aft)
"waa" = (
-/obj/effect/turf_decal/trimline/blue/filled/line,
-/obj/machinery/power/apc/auto_name/directional/south,
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 4
@@ -64013,8 +79703,17 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 8
},
+/obj/machinery/power/apc/auto_name/directional/south,
/obj/machinery/light/directional/south,
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/siding/dark_blue,
+/obj/effect/turf_decal/trimline/blue/filled/line{
+ alpha = 160
+ },
+/obj/effect/turf_decal/trimline/white/line,
+/obj/effect/turf_decal/trimline/blue/filled/mid_joiner,
+/obj/effect/turf_decal/trimline/blue/filled/mid_joiner,
+/obj/effect/turf_decal/trimline/white/mid_joiner,
+/turf/open/floor/iron/white/smooth_edge,
/area/station/medical/medbay/central)
"waf" = (
/obj/structure/cable,
@@ -64023,9 +79722,11 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 4
},
-/obj/effect/landmark/generic_maintenance_landmark,
/turf/open/floor/iron,
/area/station/maintenance/department/electrical)
+"waq" = (
+/turf/open/floor/iron/white,
+/area/station/science/research)
"waE" = (
/obj/machinery/conveyor/inverted{
dir = 6;
@@ -64037,9 +79738,30 @@
/obj/effect/spawner/random/structure/closet_maintenance,
/turf/open/floor/plating,
/area/station/maintenance/port/fore)
+"waL" = (
+/obj/effect/turf_decal/trimline/dark_blue/arrow_cw{
+ dir = 1;
+ alpha = 200
+ },
+/obj/effect/turf_decal/trimline/dark_blue/mid_joiner{
+ dir = 1;
+ alpha = 200
+ },
+/turf/open/floor/iron/edge{
+ dir = 1
+ },
+/area/station/hallway/primary/port)
"wba" = (
/turf/closed/wall/r_wall,
/area/station/engineering/gravity_generator)
+"wbl" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/iron/corner{
+ dir = 1
+ },
+/area/station/hallway/primary/central)
"wbB" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -64074,13 +79796,8 @@
/obj/machinery/button/door{
id = "reps";
name = "Privacy Shutters Control";
- pixel_x = 27;
- req_access = list("cent_general");
- pixel_y = 6
- },
-/obj/machinery/light_switch/directional/east{
- pixel_x = 27;
- pixel_y = -8
+ pixel_x = 26;
+ req_access = list("cent_general")
},
/turf/open/floor/carpet/green,
/area/station/command/heads_quarters/nt_rep)
@@ -64091,6 +79808,7 @@
/obj/effect/turf_decal/stripes/corner{
dir = 4
},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer5,
/turf/open/floor/iron/dark,
/area/station/security/mechbay)
"wcS" = (
@@ -64104,6 +79822,7 @@
dir = 4
},
/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer5,
/turf/open/floor/plating,
/area/station/maintenance/department/security)
"wde" = (
@@ -64112,14 +79831,13 @@
/area/station/security/office)
"wdA" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible,
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/weather/snow,
+/obj/effect/turf_decal/siding,
+/turf/open/floor/iron/freezer,
/area/station/medical/cryo)
"wdF" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/obj/machinery/suit_storage_unit/standard_unit,
-/turf/open/floor/iron,
+/obj/effect/spawner/structure/window,
+/turf/open/floor/plating,
/area/station/ai_monitored/command/storage/eva)
"wdS" = (
/obj/effect/turf_decal/stripes/line{
@@ -64127,7 +79845,7 @@
},
/obj/machinery/computer/security/telescreen/ordnance/directional/east,
/turf/open/floor/iron,
-/area/station/science/ordnance/bomb)
+/area/station/science/ordnance/testlab)
"wed" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
@@ -64142,8 +79860,18 @@
/obj/effect/turf_decal/trimline/dark_blue/filled/warning{
dir = 1
},
+/obj/effect/turf_decal/trimline/dark/warning{
+ dir = 1
+ },
/turf/open/floor/iron/dark,
/area/station/security/execution/transfer)
+"wet" = (
+/obj/effect/turf_decal/trimline/brown/filled/warning,
+/obj/effect/turf_decal/trimline/brown/filled/corner{
+ dir = 1
+ },
+/turf/open/floor/iron,
+/area/station/cargo/storage)
"weA" = (
/obj/machinery/airalarm/directional/east,
/turf/open/floor/iron,
@@ -64173,29 +79901,25 @@
pixel_x = 6;
pixel_y = -25
},
-/obj/effect/turf_decal/tile/red{
- dir = 1
- },
-/obj/effect/turf_decal/tile/red,
-/obj/effect/turf_decal/tile/red{
- dir = 8
- },
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 5
},
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
/obj/machinery/airalarm/directional/west,
-/turf/open/floor/iron/dark,
+/obj/effect/turf_decal/siding/dark{
+ dir = 10
+ },
+/obj/effect/turf_decal/trimline/dark_blue/filled/line{
+ dir = 10
+ },
+/turf/open/floor/iron/dark/small,
/area/station/security/checkpoint/customs)
"weZ" = (
/obj/structure/reagent_dispensers/wall/peppertank{
pixel_x = 30
},
/obj/machinery/camera/directional/south{
- c_tag = "Security Post - Cargo"
+ c_tag = "Security Post - Cargo";
+ network = list("ss13","cargo")
},
/obj/effect/turf_decal/tile/red,
/obj/effect/turf_decal/tile/red{
@@ -64212,19 +79936,32 @@
/turf/open/floor/iron/dark,
/area/station/security/checkpoint/supply)
"wfh" = (
-/obj/effect/turf_decal/tile/yellow/half/contrasted{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
- dir = 9
- },
-/turf/open/floor/iron/dark/side,
+/obj/structure/table,
+/obj/item/pipe_dispenser,
+/obj/item/multitool,
+/turf/open/floor/iron,
/area/station/engineering/atmos/hfr_room)
+"wfk" = (
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/turf/open/floor/plating,
+/area/station/maintenance/port/aft)
"wfy" = (
/obj/effect/spawner/structure/window/reinforced/tinted,
/obj/structure/cable,
/turf/open/floor/plating,
/area/station/security/interrogation)
+"wfJ" = (
+/obj/machinery/light/directional/south,
+/obj/effect/turf_decal/tile/dark_red/half{
+ dir = 4
+ },
+/turf/open/floor/iron/dark/smooth_half{
+ dir = 1
+ },
+/area/station/ai_monitored/turret_protected/ai_upload)
"wfK" = (
/obj/effect/turf_decal/stripes/white/line{
color = "#9FED58";
@@ -64267,12 +80004,22 @@
/turf/open/floor/plating,
/area/station/security/execution/education)
"whr" = (
-/obj/machinery/light/directional/west,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
- dir = 4
+/obj/structure/table/reinforced,
+/obj/item/tank/jetpack/carbondioxide,
+/obj/item/tank/jetpack/carbondioxide,
+/obj/item/tank/jetpack/carbondioxide{
+ pixel_y = 6
},
-/turf/open/floor/iron/dark,
+/obj/item/tank/jetpack/carbondioxide{
+ pixel_y = 3
+ },
+/obj/machinery/door/window/left/directional/south{
+ req_access = list("eva");
+ name = "Jetpack Storage"
+ },
+/obj/effect/mapping_helpers/airlock/red_alert_access,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/ai_monitored/command/storage/eva)
"whB" = (
/obj/structure/cable,
@@ -64300,7 +80047,9 @@
/area/station/security/prison)
"wiW" = (
/obj/structure/window/reinforced/tinted/spawner/directional/west,
-/obj/structure/chair/stool/directional/south,
+/obj/structure/chair/stool/directional/south{
+ dir = 1
+ },
/turf/open/floor/iron,
/area/station/security/prison/visit)
"wiX" = (
@@ -64318,13 +80067,42 @@
},
/turf/open/floor/iron/dark,
/area/station/security/office)
+"wji" = (
+/obj/structure/sign/poster/contraband/seabiscuit/directional/west,
+/obj/item/food/grown/apple,
+/obj/item/toy/plush/horse,
+/obj/structure/closet/crate/glitter,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 6
+ },
+/turf/open/floor/plating,
+/area/station/maintenance/port/aft)
+"wjx" = (
+/obj/structure/table,
+/obj/item/stock_parts/power_store/cell/crap{
+ pixel_x = -9;
+ pixel_y = 7
+ },
+/obj/item/stack/rods{
+ pixel_x = -2;
+ pixel_y = 3
+ },
+/obj/item/assembly/igniter{
+ pixel_x = 5;
+ pixel_y = -2
+ },
+/turf/open/floor/iron/dark/smooth_large,
+/area/station/maintenance/starboard/aft)
"wjL" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 4
},
-/obj/effect/turf_decal/tile/yellow,
/turf/open/floor/iron/white,
/area/station/medical/chemistry)
+"wjQ" = (
+/obj/machinery/atmospherics/components/tank/air/layer4,
+/turf/open/floor/plating,
+/area/station/maintenance/port/fore)
"wjR" = (
/obj/structure/disposalpipe/segment,
/obj/structure/table,
@@ -64355,36 +80133,29 @@
},
/turf/open/floor/grass,
/area/station/service/hydroponics/garden)
+"wkV" = (
+/obj/machinery/power/apc/auto_name/directional/south,
+/obj/structure/cable,
+/turf/open/floor/iron/textured_corner{
+ dir = 1
+ },
+/area/station/hallway/primary/starboard)
"wkW" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/kitchen,
/area/station/security/prison)
"wkZ" = (
-/obj/structure/closet/crate/engineering,
-/obj/item/gps/engineering,
-/obj/item/gps/engineering,
-/obj/item/clothing/head/playbunnyears/engineer,
-/obj/item/clothing/head/playbunnyears/engineer,
-/obj/item/clothing/head/utility/hardhat,
-/obj/item/clothing/head/utility/hardhat,
-/obj/item/clothing/head/utility/hardhat/orange,
-/obj/item/clothing/head/utility/hardhat/orange,
-/obj/item/clothing/head/utility/hardhat/red,
-/obj/item/clothing/head/utility/hardhat/red,
-/obj/item/clothing/head/beret/atmos,
-/obj/item/clothing/head/beret/atmos,
-/obj/item/clothing/head/beret/engi,
-/obj/item/clothing/head/beret/engi,
+/obj/structure/closet/secure_closet/engineering_welding,
/turf/open/floor/plating,
/area/station/maintenance/aft)
"wlB" = (
-/obj/effect/turf_decal/siding/wood,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 1
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 9
},
+/obj/effect/turf_decal/siding/wood,
/obj/machinery/door/airlock{
name = "Vacant Office"
},
@@ -64392,23 +80163,26 @@
/turf/open/floor/wood,
/area/station/commons/vacant_room/office)
"wlP" = (
-/obj/effect/turf_decal/tile/dark_blue{
- dir = 8
- },
-/obj/effect/turf_decal/tile/dark_blue,
-/obj/item/clothing/suit/jacket/straight_jacket,
-/obj/item/clothing/gloves/ball_mittens,
-/obj/item/clothing/mask/muzzle,
/obj/machinery/power/apc/auto_name/directional/south,
/obj/structure/cable,
/obj/structure/rack,
-/turf/open/floor/iron/white,
+/obj/item/restraints/handcuffs/cable/zipties,
+/obj/item/clothing/suit/jacket/straight_jacket,
+/obj/item/clothing/mask/muzzle,
+/obj/item/clothing/gloves/ball_mittens,
+/obj/effect/turf_decal/tile/neutral/half/contrasted{
+ dir = 1
+ },
+/obj/effect/turf_decal/bot_red,
+/turf/open/floor/iron/dark,
/area/station/security/medical)
"wmp" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/structure/cable,
-/obj/machinery/door/airlock/multi_tile/glass,
+/obj/machinery/door/airlock/multi_tile/glass{
+ name = "Prison Hall"
+ },
/turf/open/floor/iron,
/area/station/security/prison)
"wmF" = (
@@ -64421,6 +80195,12 @@
},
/turf/open/floor/plating,
/area/station/maintenance/fore)
+"wnq" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+ dir = 8
+ },
+/turf/open/floor/plating,
+/area/station/maintenance/port/fore)
"wnG" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 4
@@ -64437,13 +80217,24 @@
dir = 1
},
/area/station/hallway/primary/central/fore)
+"wnN" = (
+/obj/item/radio/intercom/directional/south,
+/obj/effect/turf_decal/siding/dark{
+ dir = 10
+ },
+/turf/open/floor/iron/corner{
+ dir = 4
+ },
+/area/station/command/bridge)
"woq" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 4
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron,
+/turf/open/floor/iron/edge{
+ dir = 1
+ },
/area/station/hallway/primary/port)
"wos" = (
/obj/effect/decal/cleanable/dirt,
@@ -64494,6 +80285,15 @@
},
/turf/open/floor/iron/dark,
/area/station/security/checkpoint/science)
+"wpB" = (
+/obj/effect/turf_decal/siding/dark{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/dark/corner{
+ dir = 8
+ },
+/turf/open/floor/circuit/green,
+/area/station/ai_monitored/turret_protected/ai_upload)
"wqq" = (
/turf/open/floor/wood,
/area/station/maintenance/abandon_cafeteria)
@@ -64516,7 +80316,7 @@
name = "Unisex Restrooms"
},
/obj/structure/cable,
-/turf/open/floor/mineral/titanium/blue,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/commons/toilet)
"wqO" = (
/obj/structure/cable,
@@ -64524,7 +80324,13 @@
/turf/open/floor/iron/dark/textured,
/area/station/command/heads_quarters/rd)
"wqP" = (
-/turf/open/floor/carpet/blue,
+/obj/item/bedsheet/captain/double{
+ dir = 1
+ },
+/obj/structure/bed/double{
+ dir = 1
+ },
+/turf/open/floor/carpet/royalblue,
/area/station/command/heads_quarters/captain)
"wrG" = (
/obj/structure/chair{
@@ -64533,16 +80339,16 @@
/turf/open/floor/iron/dark,
/area/station/service/chapel)
"wrM" = (
-/obj/effect/decal/cleanable/dirt,
/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
- dir = 6
- },
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
/turf/open/floor/iron,
/area/station/science/explab)
"wrV" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer5,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 6
+ },
/turf/open/floor/iron/dark/small,
/area/station/cargo/bitrunning/den)
"wrY" = (
@@ -64552,7 +80358,12 @@
},
/obj/structure/cable,
/obj/structure/reagent_dispensers/watertank,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/turf/open/floor/iron/dark/side{
+ dir = 8
+ },
/area/station/commons/locker)
"wso" = (
/obj/machinery/light/small/directional/south,
@@ -64569,13 +80380,13 @@
/turf/open/floor/iron/freezer,
/area/station/command/heads_quarters/rd)
"wst" = (
-/obj/machinery/door/poddoor/shutters{
- dir = 1;
- id = "warehouse_shutters2";
- name = "Warehouse Shutters"
+/obj/structure/railing{
+ dir = 4
},
-/turf/open/floor/iron,
-/area/station/cargo/warehouse)
+/turf/open/floor/iron/textured_corner{
+ dir = 4
+ },
+/area/station/hallway/secondary/entry)
"wsw" = (
/obj/effect/turf_decal/bot_white,
/obj/effect/turf_decal/tile/neutral/fourcorners,
@@ -64585,6 +80396,20 @@
},
/turf/open/floor/iron/dark,
/area/station/engineering/gravity_generator)
+"wsO" = (
+/obj/effect/turf_decal/trimline/blue/filled/line{
+ dir = 10
+ },
+/obj/machinery/mining_weather_monitor/directional/south,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 5
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer5,
+/turf/open/floor/iron,
+/area/station/hallway/secondary/entry)
"wsY" = (
/obj/structure/cable,
/obj/machinery/button/door/directional/east{
@@ -64592,16 +80417,41 @@
id = "HFRshutter";
req_access = list("atmospherics")
},
+/obj/effect/turf_decal/trimline/yellow/filled/corner{
+ dir = 4;
+ alpha = 120
+ },
+/obj/effect/turf_decal/trimline/dark_blue/corner{
+ alpha = 200;
+ dir = 4
+ },
/turf/open/floor/iron/dark,
/area/station/engineering/atmos/hfr_room)
"wtb" = (
-/obj/effect/turf_decal/tile/blue{
- dir = 4
+/obj/effect/turf_decal/siding/dark/corner{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/wideplating_new/dark/corner{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 5
+ },
+/obj/structure/filingcabinet/chestdrawer/wheeled,
+/obj/effect/turf_decal/weather/snow/corner{
+ dir = 5
+ },
+/obj/effect/turf_decal/weather/snow,
+/turf/open/floor/iron/dark/smooth_corner{
+ dir = 8
},
-/obj/machinery/holopad,
-/obj/effect/turf_decal/tile/blue,
-/turf/open/floor/iron/white,
/area/station/medical/cryo)
+"wti" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 1
+ },
+/turf/open/floor/wood,
+/area/station/security/prison)
"wtm" = (
/obj/effect/turf_decal/stripes/line{
dir = 6
@@ -64633,6 +80483,15 @@
/obj/effect/turf_decal/trimline/dark_blue/filled/corner{
dir = 8
},
+/obj/effect/turf_decal/trimline/dark_blue/filled/corner{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/dark/corner{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/dark/corner{
+ dir = 8
+ },
/turf/open/floor/iron/dark,
/area/station/security/holding_cell)
"wun" = (
@@ -64644,11 +80503,16 @@
/turf/open/floor/wood/tile,
/area/station/command/heads_quarters/ce)
"wuD" = (
-/obj/machinery/camera/directional/east{
- c_tag = "Xenobiology Cell 3";
- network = list("ss13","xeno")
+/obj/effect/turf_decal/siding/dark{
+ dir = 4
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 10
+ },
+/obj/machinery/light/directional/east,
+/obj/effect/turf_decal/siding/dark{
+ dir = 8
},
-/obj/effect/decal/cleanable/cobweb/cobweb2,
/turf/open/floor/engine,
/area/station/science/xenobiology)
"wuE" = (
@@ -64680,17 +80544,18 @@
/obj/structure/railing/corner{
dir = 8
},
-/turf/open/floor/iron/dark/textured,
-/area/station/command/gateway)
-"wuY" = (
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
-/obj/effect/turf_decal/tile/blue{
+/obj/effect/turf_decal/siding/wideplating_new/dark/corner{
dir = 8
},
-/obj/effect/turf_decal/tile/blue,
-/obj/machinery/iv_drip,
+/obj/effect/turf_decal/siding/wideplating_new/dark{
+ dir = 5
+ },
+/obj/machinery/airalarm/directional/east,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/iron/textured_large,
+/area/station/command/gateway)
+"wuY" = (
/obj/machinery/camera/directional/south{
c_tag = "Surgery A";
network = list("ss13","medbay");
@@ -64700,9 +80565,22 @@
dir = 5
},
/obj/item/radio/intercom/directional/west,
+/obj/structure/sink/directional/east,
+/obj/effect/turf_decal/siding{
+ dir = 10
+ },
+/obj/effect/turf_decal/trimline/blue/filled/line{
+ alpha = 160;
+ dir = 10
+ },
/obj/machinery/firealarm/directional/south,
/turf/open/floor/iron/white,
/area/station/medical/surgery)
+"wvp" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/light/directional/north,
+/turf/open/floor/iron,
+/area/station/security/prison)
"wvq" = (
/turf/closed/wall,
/area/station/medical/cryo)
@@ -64718,12 +80596,71 @@
"wvH" = (
/turf/closed/wall,
/area/station/medical/treatment_center)
+"wvI" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 4
+ },
+/obj/effect/landmark/start/scientist,
+/obj/structure/chair/office,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/iron/white,
+/area/station/science/explab)
"wvS" = (
/obj/effect/turf_decal/stripes/red/line{
dir = 10
},
/turf/open/floor/engine,
/area/station/science/explab)
+"wwb" = (
+/obj/effect/turf_decal/trimline/dark/filled/line{
+ alpha = 160;
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/dark/filled/mid_joiner{
+ dir = 8;
+ alpha = 160
+ },
+/obj/effect/turf_decal/trimline/purple/line{
+ alpha = 200;
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 8
+ },
+/obj/machinery/firealarm/directional/west,
+/turf/open/floor/iron/white/smooth_edge{
+ dir = 8
+ },
+/area/station/science/research)
+"wwg" = (
+/obj/effect/turf_decal/siding/dark{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 8
+ },
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+ dir = 1
+ },
+/turf/open/floor/iron/textured_large,
+/area/station/ai_monitored/command/storage/eva)
+"wwi" = (
+/obj/effect/turf_decal/siding/dark{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/dark/filled/line{
+ alpha = 160;
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/purple/line{
+ alpha = 200;
+ dir = 8;
+ color = "#a56dc2"
+ },
+/turf/open/floor/iron/white/smooth_edge{
+ dir = 8
+ },
+/area/station/science/xenobiology)
"wwk" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -64733,18 +80670,21 @@
/turf/open/floor/iron/dark,
/area/station/security/prison)
"wwV" = (
+/obj/structure/cable,
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/public/glass{
name = "Central Access"
},
-/obj/structure/cable,
-/turf/open/floor/iron,
+/turf/open/floor/iron/large,
/area/station/hallway/primary/central)
"wxF" = (
-/obj/structure/sign/barber{
- pixel_x = 14
+/obj/effect/turf_decal/trimline/blue/filled/line{
+ dir = 4
+ },
+/obj/effect/landmark/start/hangover,
+/turf/open/floor/iron/edge{
+ dir = 8
},
-/turf/open/floor/iron,
/area/station/hallway/secondary/entry)
"wyl" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
@@ -64754,17 +80694,10 @@
/turf/open/floor/iron,
/area/station/hallway/primary/central)
"wyp" = (
-/obj/machinery/door/airlock/external{
- name = "Port Docking Bay 3"
- },
-/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{
- cycle_id = "dock3"
- },
-/obj/effect/mapping_helpers/airlock/unres{
- dir = 8
- },
-/turf/open/floor/plating,
-/area/station/hallway/secondary/entry)
+/obj/structure/window/reinforced/spawner/directional/south,
+/obj/structure/lattice,
+/turf/open/space/basic,
+/area/space/nearstation)
"wzk" = (
/obj/structure/table/reinforced/rglass,
/obj/item/lipstick{
@@ -64861,20 +80794,35 @@
/obj/structure/cable,
/turf/open/floor/plating,
/area/station/maintenance/port)
+"wAk" = (
+/obj/effect/turf_decal/trimline/green/corner{
+ dir = 4
+ },
+/turf/open/floor/iron/corner{
+ dir = 1
+ },
+/area/station/hallway/primary/central)
"wAs" = (
/obj/effect/turf_decal/siding/wood{
- dir = 1
+ dir = 5
},
/obj/machinery/light/directional/east,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 8
},
-/turf/open/floor/wood,
+/turf/open/floor/wood/large,
/area/station/command/heads_quarters/hop)
"wAB" = (
-/obj/effect/spawner/random/maintenance/two,
-/turf/open/floor/iron,
-/area/station/cargo/storage)
+/obj/structure/chair,
+/obj/effect/turf_decal/trimline/dark_blue/filled/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/iron/dark,
+/area/station/security/checkpoint/escape)
"wAO" = (
/obj/machinery/light/directional/east,
/turf/open/floor/iron/dark,
@@ -64892,22 +80840,32 @@
/turf/open/floor/iron,
/area/station/commons/fitness)
"wBE" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/siding/thinplating/light,
-/obj/effect/turf_decal/siding/thinplating/light/corner,
/obj/structure/cable,
+/obj/effect/turf_decal/trimline/white/filled/corner{
+ dir = 8;
+ alpha = 160
+ },
+/obj/effect/turf_decal/trimline/purple/corner{
+ alpha = 200;
+ dir = 8;
+ color = "#a56dc2"
+ },
/turf/open/floor/iron,
/area/station/science/explab)
"wBO" = (
/obj/structure/window/reinforced/spawner/directional/south,
/obj/structure/disposalpipe/trunk{
- dir = 8
+ dir = 2
},
/obj/machinery/disposal/bin,
/obj/effect/turf_decal/stripes/line{
dir = 6
},
-/turf/open/floor/iron,
+/obj/effect/turf_decal/stripes/white/line{
+ color = "#a56dc2";
+ dir = 9
+ },
+/turf/open/floor/iron/dark/smooth_large,
/area/station/science/xenobiology)
"wCe" = (
/obj/structure/table/wood,
@@ -64921,6 +80879,7 @@
"wCp" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/vending/boozeomat,
+/obj/machinery/firealarm/directional/west,
/turf/open/floor/wood,
/area/station/maintenance/abandon_cafeteria)
"wCx" = (
@@ -64936,7 +80895,15 @@
dir = 4
},
/obj/structure/cable,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/brown/filled/warning{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/dark/warning{
+ dir = 4
+ },
+/turf/open/floor/iron/textured_edge{
+ dir = 8
+ },
/area/station/cargo/miningdock)
"wCU" = (
/obj/machinery/dish_drive/bullet,
@@ -64951,20 +80918,25 @@
},
/turf/open/floor/carpet,
/area/station/service/chapel)
+"wDy" = (
+/obj/structure/sink/directional/east,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+ dir = 1
+ },
+/turf/open/floor/iron/freezer,
+/area/station/maintenance/port/aft)
"wDE" = (
/obj/effect/landmark/start/hangover,
/turf/open/floor/iron/dark,
/area/station/hallway/secondary/exit)
"wDJ" = (
-/obj/effect/turf_decal/tile/yellow{
- dir = 4
+/obj/machinery/camera/directional/north{
+ c_tag = "Pharmacy";
+ network = list("ss13","medbay")
},
-/obj/effect/turf_decal/tile/yellow{
- dir = 1
- },
-/obj/machinery/power/apc/auto_name/directional/north,
-/obj/structure/cable,
-/turf/open/floor/iron/white,
+/obj/structure/sign/poster/official/periodic_table/directional/north,
+/obj/machinery/vending/wardrobe/chem_wardrobe,
+/turf/open/floor/iron/dark/small,
/area/station/medical/pharmacy)
"wEe" = (
/obj/effect/turf_decal/stripes/blue/line{
@@ -64983,21 +80955,48 @@
dir = 8
},
/area/station/commons/fitness)
-"wEv" = (
-/obj/structure/tank_holder/oxygen,
+"wEo" = (
+/obj/structure/grille,
+/obj/structure/window/spawner/directional/north,
+/obj/structure/window/spawner/directional/south,
/turf/open/floor/plating,
-/area/station/maintenance/port)
+/area/station/maintenance/port/aft)
+"wEv" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/layer_manifold/cyan/hidden{
+ dir = 8
+ },
+/turf/open/floor/iron/dark,
+/area/station/hallway/secondary/exit)
+"wEJ" = (
+/turf/open/floor/iron/textured_corner{
+ dir = 8
+ },
+/area/station/hallway/primary/starboard)
"wET" = (
/obj/structure/sign/poster/random/directional/south,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/vending/cola/pwr_game,
/turf/open/floor/iron/dark/small,
/area/station/cargo/bitrunning/den)
+"wEZ" = (
+/obj/effect/turf_decal/trimline/purple/arrow_ccw,
+/obj/effect/turf_decal/trimline/purple/mid_joiner,
+/turf/open/floor/iron/edge,
+/area/station/hallway/primary/starboard)
"wFd" = (
/obj/structure/disposalpipe/segment{
dir = 4
},
/obj/structure/cable,
+/obj/structure/disposalpipe/segment{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
/turf/open/floor/plating,
/area/station/maintenance/port)
"wFw" = (
@@ -65017,16 +81016,29 @@
/area/station/commons/dorms/apartment1)
"wGp" = (
/obj/structure/disposalpipe/segment,
-/obj/effect/turf_decal/tile/yellow{
+/obj/item/radio/intercom/directional/west,
+/obj/effect/turf_decal/trimline/yellow/line{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/yellow/mid_joiner{
+ dir = 8
+ },
+/turf/open/floor/iron/edge{
dir = 8
},
-/obj/item/radio/intercom/directional/west,
-/turf/open/floor/iron,
/area/station/hallway/primary/aft)
"wGt" = (
/obj/effect/spawner/random/structure/shipping_container,
/turf/open/floor/plating,
/area/station/maintenance/port/aft)
+"wGY" = (
+/obj/effect/turf_decal/trimline/green/corner{
+ dir = 4
+ },
+/turf/open/floor/iron/edge{
+ dir = 4
+ },
+/area/station/hallway/primary/central)
"wHs" = (
/turf/closed/wall/r_wall,
/area/station/security/courtroom)
@@ -65051,33 +81063,32 @@
/turf/open/floor/iron,
/area/station/engineering/atmos)
"wHB" = (
-/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
/obj/structure/closet/secure_closet/medical2,
/obj/machinery/power/apc/auto_name/directional/north,
/obj/structure/cable,
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/tile/blue/full,
+/turf/open/floor/iron/large,
/area/station/medical/surgery)
"wHD" = (
/obj/effect/turf_decal/siding/wood{
- dir = 1
+ dir = 9
},
/obj/structure/dresser,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
- dir = 4
- },
/obj/item/toy/plush/skyrat/ian/small{
pixel_y = 11;
pixel_x = 2
},
/obj/machinery/light_switch/directional/west,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
/turf/open/floor/wood,
/area/station/command/heads_quarters/hop)
+"wIc" = (
+/obj/effect/turf_decal/trimline/brown/corner,
+/obj/machinery/firealarm/directional/south,
+/turf/open/floor/iron/edge,
+/area/station/hallway/primary/central)
"wIg" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 4
@@ -65102,12 +81113,28 @@
"wIx" = (
/obj/machinery/keycard_auth/wall_mounted/directional/west,
/obj/machinery/pdapainter/supply,
-/obj/machinery/computer/security/telescreen/cargo/directional/north,
/obj/machinery/camera/directional/west{
c_tag = "Quartermaster's Office";
network = list("ss13","cargo")
},
-/turf/open/floor/carpet/royalblack,
+/obj/machinery/newscaster/directional/north,
+/obj/item/stamp/head/qm{
+ pixel_y = 6;
+ pixel_x = 6
+ },
+/obj/item/computer_disk/quartermaster{
+ pixel_y = 6;
+ pixel_x = -6
+ },
+/obj/item/computer_disk/quartermaster{
+ pixel_x = -6;
+ pixel_y = 9
+ },
+/obj/item/computer_disk/quartermaster{
+ pixel_x = -6;
+ pixel_y = 12
+ },
+/turf/open/floor/iron/dark/textured_large,
/area/station/command/heads_quarters/qm)
"wIK" = (
/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible,
@@ -65124,8 +81151,25 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 4
},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer5,
/turf/open/floor/plating,
/area/station/maintenance/port)
+"wIY" = (
+/obj/item/stack/sheet/cardboard,
+/obj/item/broken_bottle{
+ pixel_x = -3;
+ pixel_y = 0
+ },
+/obj/item/reagent_containers/cup/glass/bottle/grenadine{
+ pixel_x = -9;
+ pixel_y = -1
+ },
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
+ pixel_x = 5;
+ pixel_y = -6
+ },
+/turf/open/floor/iron/dark/smooth_large,
+/area/station/maintenance/aft)
"wJm" = (
/obj/effect/turf_decal/tile/brown{
dir = 4
@@ -65136,8 +81180,12 @@
"wJz" = (
/obj/structure/closet/secure_closet/miner,
/obj/machinery/light/directional/south,
-/turf/open/floor/iron/dark,
+/turf/open/floor/iron/dark/textured_large,
/area/station/cargo/miningdock)
+"wJE" = (
+/obj/effect/turf_decal/siding/wood,
+/turf/open/floor/wood,
+/area/station/security/prison)
"wJG" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -65152,20 +81200,58 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/white,
/area/station/science/ordnance)
+"wJQ" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/blue/filled/line{
+ alpha = 160;
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/white/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/blue/filled/mid_joiner{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/blue/filled/mid_joiner{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/white/mid_joiner{
+ dir = 1
+ },
+/obj/machinery/digital_clock/directional/north,
+/turf/open/floor/iron/white/smooth_edge{
+ dir = 1
+ },
+/area/station/medical/medbay/central)
"wJU" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 4
},
-/turf/open/floor/iron/dark/textured,
+/obj/effect/turf_decal/siding/wideplating_new/dark/corner{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/wideplating_new/dark/corner{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/wideplating_new/dark{
+ dir = 4
+ },
+/turf/open/floor/iron/textured_large,
/area/station/command/gateway)
"wKl" = (
/obj/structure/cable,
-/obj/machinery/camera{
- c_tag = "Library West";
- dir = 8
+/obj/effect/turf_decal/trimline/brown/filled/line,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer5,
+/turf/open/floor/iron/textured_edge{
+ dir = 1
},
-/turf/open/floor/wood,
-/area/station/service/library)
+/area/station/cargo/storage)
"wKp" = (
/obj/effect/landmark/start/prisoner,
/obj/machinery/camera/directional/south{
@@ -65190,21 +81276,24 @@
},
/area/station/security/prison)
"wKw" = (
-/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
/obj/structure/table/optable,
/obj/structure/cable,
/obj/machinery/light/directional/north,
/obj/machinery/defibrillator_mount/directional/north,
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/tile/blue/full,
+/turf/open/floor/iron/large,
/area/station/medical/surgery)
"wKH" = (
/obj/item/radio/intercom/directional/east,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/brown/line{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/brown/mid_joiner{
+ dir = 4
+ },
+/turf/open/floor/iron/edge{
+ dir = 4
+ },
/area/station/hallway/primary/central)
"wLh" = (
/obj/machinery/power/apc/auto_name/directional/south,
@@ -65221,33 +81310,82 @@
},
/turf/open/floor/iron,
/area/station/maintenance/disposal/incinerator)
-"wNj" = (
-/obj/structure/sign/warning/secure_area/directional/west,
-/obj/structure/disposalpipe/segment,
-/obj/effect/turf_decal/tile/blue{
- dir = 1
+"wMS" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/turf_decal/trimline/blue/filled/warning{
+ alpha = 160;
+ dir = 9
},
-/obj/effect/turf_decal/tile/blue{
+/obj/effect/turf_decal/trimline/white/warning{
+ dir = 9
+ },
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron/white/smooth_corner,
+/area/station/medical/medbay/lobby)
+"wNj" = (
+/obj/structure/disposalpipe/segment,
+/obj/structure/sign/warning/secure_area/directional/west,
+/obj/effect/turf_decal/trimline/dark_blue/mid_joiner{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/dark_blue/corner{
+ dir = 8;
+ alpha = 200
+ },
+/turf/open/floor/iron/edge{
dir = 8
},
-/turf/open/floor/iron,
/area/station/hallway/primary/central)
+"wNp" = (
+/obj/effect/turf_decal/siding/dark{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/dark/filled/warning{
+ alpha = 160;
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/purple/warning{
+ alpha = 200;
+ dir = 8
+ },
+/turf/open/floor/iron/white/smooth_edge{
+ dir = 8
+ },
+/area/station/science/research)
"wNT" = (
/obj/machinery/light/directional/west,
/obj/machinery/suit_storage_unit/standard_unit,
-/obj/effect/turf_decal/stripes/line{
- dir = 5
+/obj/structure/railing/corner{
+ dir = 4;
+ pixel_y = -32
},
-/turf/open/floor/iron,
+/obj/structure/railing/corner{
+ dir = 1;
+ pixel_y = -32
+ },
+/obj/effect/turf_decal/box/white{
+ color = "#ff780a"
+ },
+/obj/effect/turf_decal/bot_white{
+ color = "#ff780a"
+ },
+/turf/open/floor/iron/dark/smooth_large,
/area/station/ai_monitored/command/storage/eva)
+"wNZ" = (
+/obj/effect/turf_decal/siding/dark/corner{
+ dir = 1
+ },
+/turf/open/floor/iron/dark,
+/area/station/science/robotics/lab)
"wOh" = (
+/obj/structure/cable,
+/obj/structure/disposalpipe/segment,
/obj/machinery/door/poddoor/preopen{
id = "cmoprivacy";
name = "CMO Office"
},
-/obj/structure/cable,
/obj/effect/spawner/structure/window/reinforced,
-/obj/structure/disposalpipe/segment,
/turf/open/floor/plating,
/area/station/command/heads_quarters/cmo)
"wOk" = (
@@ -65256,12 +81394,15 @@
/obj/effect/turf_decal/stripes/line{
dir = 10
},
-/turf/open/floor/iron,
+/obj/effect/turf_decal/stripes/white/line{
+ color = "#a56dc2";
+ dir = 5
+ },
+/turf/open/floor/iron/dark/smooth_large,
/area/station/science/xenobiology)
"wOm" = (
/obj/structure/closet/emcloset,
-/obj/effect/turf_decal/siding/white,
-/turf/open/floor/iron/dark,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/hallway/primary/central)
"wOx" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
@@ -65278,14 +81419,31 @@
/turf/closed/wall,
/area/station/maintenance/aft)
"wPd" = (
-/obj/effect/turf_decal/trimline/blue/filled/line,
/obj/machinery/light/directional/south,
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/trimline/blue/filled/line{
+ alpha = 160
+ },
+/obj/effect/turf_decal/trimline/white/line,
+/obj/effect/turf_decal/trimline/blue/filled/mid_joiner,
+/obj/effect/turf_decal/trimline/blue/filled/mid_joiner,
+/obj/effect/turf_decal/trimline/white/mid_joiner,
+/turf/open/floor/iron/white/smooth_edge,
/area/station/medical/medbay/central)
+"wPk" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 6
+ },
+/obj/machinery/duct,
+/turf/open/floor/iron,
+/area/station/maintenance/port/aft)
"wPx" = (
/obj/effect/turf_decal/trimline/dark_blue/filled/line{
dir = 1
},
+/obj/effect/turf_decal/trimline/dark_blue/line{
+ alpha = 200;
+ dir = 1
+ },
/turf/open/floor/iron/dark,
/area/station/security/office)
"wPC" = (
@@ -65301,6 +81459,13 @@
/obj/effect/turf_decal/stripes/line{
dir = 4
},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer4,
+/obj/effect/turf_decal/stripes/blue/line{
+ dir = 4
+ },
/turf/open/floor/iron/dark/side{
dir = 8
},
@@ -65353,26 +81518,17 @@
/turf/open/floor/plating,
/area/station/maintenance/starboard/aft)
"wQK" = (
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
-/obj/structure/table/glass,
-/obj/machinery/power/apc/auto_name/directional/north,
/obj/structure/cable,
+/obj/machinery/power/apc/auto_name/directional/north,
/obj/item/reagent_containers/cup/bottle/epinephrine,
/obj/item/reagent_containers/cup/bottle/multiver{
pixel_x = 6
},
/obj/item/reagent_containers/syringe,
/obj/machinery/light/directional/west,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/tile/blue/full,
+/obj/structure/table/glass,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/medical/treatment_center)
"wRk" = (
/obj/structure/cable,
@@ -65391,16 +81547,21 @@
/turf/open/floor/plating,
/area/station/maintenance/starboard/fore)
"wRn" = (
-/obj/effect/turf_decal/tile/brown/anticorner/contrasted{
- dir = 4
- },
-/obj/effect/decal/cleanable/dirt,
/obj/machinery/camera/directional/north{
- c_tag = "Cargo - Warehouse";
+ c_tag = "Warehouse";
name = "cargo camera";
dir = 4;
network = list("ss13", "cargo")
},
+/obj/machinery/power/apc/auto_name/directional/north,
+/obj/structure/cable,
+/obj/effect/turf_decal/trimline/brown/filled/line{
+ dir = 5
+ },
+/obj/effect/turf_decal/trimline/dark/line{
+ dir = 5
+ },
+/obj/structure/sign/warning/electric_shock/directional/east,
/turf/open/floor/iron,
/area/station/cargo/warehouse)
"wRF" = (
@@ -65416,23 +81577,17 @@
/turf/open/floor/iron/white,
/area/station/medical/virology)
"wRM" = (
-/obj/structure/bed/double,
-/obj/item/bedsheet/captain/double,
-/turf/open/floor/carpet/blue,
+/obj/structure/dresser,
+/turf/open/floor/iron/dark/textured_large,
/area/station/command/heads_quarters/captain)
-"wRT" = (
-/obj/effect/turf_decal/bot,
-/obj/structure/closet/crate,
-/obj/effect/spawner/random/maintenance/three,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
-/obj/item/stack/sheet/glass,
-/obj/item/stack/sheet/glass,
-/obj/item/stack/sheet/glass,
-/obj/item/stack/sheet/glass,
-/obj/item/stack/sheet/glass,
-/obj/item/glassblowing/blowing_rod,
-/turf/open/floor/iron,
-/area/station/cargo/warehouse)
+"wRV" = (
+/obj/effect/turf_decal/trimline/dark_green/corner{
+ dir = 4
+ },
+/turf/open/floor/iron/edge{
+ dir = 1
+ },
+/area/station/hallway/primary/starboard)
"wSL" = (
/obj/structure/cable,
/obj/machinery/disposal/bin,
@@ -65441,6 +81596,30 @@
},
/turf/open/floor/wood,
/area/station/command/heads_quarters/rd)
+"wSR" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 1
+ },
+/turf/open/floor/wood/tile,
+/area/station/hallway/secondary/entry)
+"wST" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 6
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer4,
+/turf/open/floor/plating,
+/area/station/maintenance/port/aft)
+"wTm" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/purple/corner,
+/turf/open/floor/iron/corner{
+ dir = 1
+ },
+/area/station/hallway/primary/central)
"wTo" = (
/obj/structure/railing/corner{
dir = 8
@@ -65456,17 +81635,7 @@
"wTp" = (
/obj/machinery/chem_heater/withbuffer,
/obj/structure/window/reinforced/spawner/directional/south,
-/obj/effect/turf_decal/tile/yellow{
- dir = 8
- },
-/obj/effect/turf_decal/tile/yellow,
-/obj/effect/turf_decal/tile/yellow{
- dir = 1
- },
-/obj/effect/turf_decal/tile/yellow{
- dir = 4
- },
-/turf/open/floor/iron/white,
+/turf/open/floor/plating/elevatorshaft,
/area/station/medical/chemistry)
"wTu" = (
/obj/structure/window/reinforced/spawner/directional/east,
@@ -65551,7 +81720,32 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/trimline/dark/filled/line{
+ alpha = 160;
+ dir = 10
+ },
+/obj/effect/turf_decal/trimline/dark/filled/mid_joiner{
+ dir = 8;
+ alpha = 160
+ },
+/obj/effect/turf_decal/trimline/dark/filled/mid_joiner{
+ dir = 2;
+ alpha = 160
+ },
+/obj/effect/turf_decal/trimline/purple/line{
+ alpha = 200;
+ dir = 10;
+ color = "#a56dc2"
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 10
+ },
+/obj/effect/turf_decal/siding/corner{
+ dir = 4
+ },
+/turf/open/floor/iron/white/smooth_corner{
+ dir = 4
+ },
/area/station/science/xenobiology)
"wUD" = (
/obj/structure/filingcabinet,
@@ -65569,6 +81763,29 @@
/obj/item/radio/intercom/directional/west,
/turf/open/floor/iron/dark,
/area/station/security/checkpoint/science)
+"wUL" = (
+/obj/effect/turf_decal/trimline/brown/filled/corner{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/dark/corner{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron/textured_corner{
+ dir = 8
+ },
+/area/station/cargo/miningdock)
+"wUU" = (
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/public/glass{
+ name = "Central Access"
+ },
+/obj/effect/turf_decal/trimline/blue/warning{
+ dir = 1
+ },
+/turf/open/floor/iron/large,
+/area/station/hallway/primary/central)
"wVc" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/light/dim/directional/west,
@@ -65578,6 +81795,9 @@
/obj/effect/turf_decal/trimline/dark_blue/filled/line{
dir = 1
},
+/obj/effect/turf_decal/trimline/dark/line{
+ dir = 1
+ },
/turf/open/floor/iron/dark,
/area/station/security/execution/transfer)
"wVC" = (
@@ -65586,15 +81806,20 @@
"wWc" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/maintenance/glass,
+/obj/machinery/door/airlock/maintenance/glass{
+ name = "Prison Maintenance"
+ },
/turf/open/floor/plating,
/area/station/security/prison)
+"wWh" = (
+/obj/effect/turf_decal/tile/dark_red,
+/turf/open/floor/iron/dark/smooth_corner,
+/area/station/ai_monitored/turret_protected/ai_upload)
"wWu" = (
/obj/structure/cable,
-/obj/machinery/atmospherics/components/unary/portables_connector/visible{
- dir = 4
- },
/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible,
/turf/open/floor/iron,
/area/station/maintenance/starboard)
"wWD" = (
@@ -65619,6 +81844,14 @@
pixel_y = 28
},
/obj/structure/cable,
+/obj/effect/turf_decal/trimline/white/filled/line{
+ alpha = 160
+ },
+/obj/effect/turf_decal/trimline/purple/line{
+ alpha = 200;
+ dir = 2;
+ color = "#a56dc2"
+ },
/turf/open/floor/iron,
/area/station/science/explab)
"wXs" = (
@@ -65626,30 +81859,50 @@
/obj/machinery/power/apc/auto_name/directional/west,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/iron/dark,
+/obj/effect/turf_decal/stripes,
+/obj/effect/turf_decal/stripes/blue/line,
+/obj/effect/turf_decal/trimline/dark_blue/filled/line{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/dark_blue/filled/line{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/wideplating_new/dark/corner{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/wideplating_new/dark/corner,
+/obj/effect/turf_decal/siding/dark{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 4
+ },
+/turf/open/floor/iron/dark/small,
/area/station/security/checkpoint/escape)
"wXA" = (
/obj/structure/cable,
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
-/obj/machinery/power/apc/auto_name/directional/south,
/obj/machinery/atmospherics/components/unary/portables_connector/visible{
dir = 1
},
+/obj/machinery/power/apc/auto_name/directional/south,
/obj/machinery/portable_atmospherics/canister/anesthetic_mix,
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/weather/snow/corner{
+ dir = 9
+ },
+/turf/open/floor/iron/white/smooth_large,
/area/station/medical/cryo)
"wYB" = (
/turf/closed/wall,
/area/station/security/detectives_office)
+"wYS" = (
+/obj/effect/turf_decal/trimline/blue/arrow_cw{
+ alpha = 200
+ },
+/obj/effect/turf_decal/trimline/blue/mid_joiner{
+ alpha = 200
+ },
+/turf/open/floor/iron/edge,
+/area/station/hallway/primary/central)
"wYZ" = (
/obj/machinery/power/apc/auto_name/directional/north,
/obj/structure/cable,
@@ -65657,6 +81910,9 @@
/obj/effect/turf_decal/trimline/dark_blue/filled/line{
dir = 9
},
+/obj/effect/turf_decal/trimline/dark/line{
+ dir = 9
+ },
/turf/open/floor/iron/dark,
/area/station/security/brig)
"wZa" = (
@@ -65671,6 +81927,16 @@
/obj/structure/cable,
/turf/open/floor/wood,
/area/station/maintenance/abandon_cafeteria)
+"wZt" = (
+/obj/effect/turf_decal/siding/dark{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/dark/corner,
+/obj/effect/turf_decal/siding/dark/corner{
+ dir = 8
+ },
+/turf/open/floor/carpet/black,
+/area/station/security/checkpoint/customs)
"wZu" = (
/obj/effect/turf_decal/siding/purple{
dir = 8
@@ -65717,13 +81983,19 @@
/area/station/science/ordnance)
"xap" = (
/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/layer_manifold/cyan/hidden,
/turf/open/floor/iron/dark,
/area/station/maintenance/port/aft)
"xaw" = (
-/obj/effect/turf_decal/tile/brown{
+/obj/effect/turf_decal/trimline/brown/filled/line{
dir = 8
},
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/dark/line{
+ dir = 8
+ },
+/turf/open/floor/iron/textured_edge{
+ dir = 4
+ },
/area/station/cargo/miningdock)
"xaZ" = (
/obj/structure/sign/warning/secure_area/directional/north,
@@ -65740,6 +82012,13 @@
/obj/effect/turf_decal/trimline/dark_blue/filled/line{
dir = 1
},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/dark_blue/line{
+ alpha = 200;
+ dir = 1
+ },
/turf/open/floor/iron/dark,
/area/station/security/office)
"xcn" = (
@@ -65756,18 +82035,36 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/violet/visible/layer4,
/turf/open/floor/plating,
/area/station/security/execution/transfer)
-"xcU" = (
-/obj/effect/turf_decal/tile/red{
+"xcR" = (
+/obj/structure/cable,
+/obj/effect/turf_decal/siding/dark{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/dark{
dir = 8
},
+/turf/open/floor/circuit/green/telecomms/mainframe,
+/area/station/tcommsat/server)
+"xcU" = (
/obj/machinery/airalarm/directional/south,
+/obj/effect/turf_decal/trimline/dark_blue/filled/line,
/turf/open/floor/iron/dark,
/area/station/hallway/primary/fore)
"xdk" = (
-/obj/structure/cable,
/obj/machinery/airalarm/directional/east,
-/turf/open/floor/iron/dark,
+/obj/effect/turf_decal/trimline/dark/filled/line{
+ dir = 6
+ },
+/turf/open/floor/iron/dark/small,
/area/station/medical/morgue)
+"xds" = (
+/obj/effect/turf_decal/trimline/blue/corner{
+ dir = 8
+ },
+/turf/open/floor/iron/textured_corner{
+ dir = 1
+ },
+/area/station/hallway/primary/starboard)
"xdx" = (
/obj/effect/spawner/random/burgerstation/atmos,
/turf/open/floor/plating,
@@ -65795,11 +82092,37 @@
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/station/hallway/secondary/exit)
+"xeC" = (
+/obj/structure/fluff/metalpole/anchor{
+ dir = 1;
+ pixel_y = 32
+ },
+/obj/machinery/door/firedoor/border_only{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes/white/line{
+ color = "#52B4E9";
+ dir = 1;
+ name = "blue line"
+ },
+/obj/effect/turf_decal/siding/white{
+ dir = 4
+ },
+/obj/structure/railing{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/blue/fourcorners,
+/turf/open/floor/iron/white,
+/area/station/hallway/secondary/entry)
"xeE" = (
/obj/effect/landmark/start/assistant,
/obj/structure/chair/sofa/bench/right{
pixel_y = 8
},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/dark/side{
dir = 1
},
@@ -65811,7 +82134,19 @@
/obj/effect/turf_decal/trimline/blue/filled/corner{
dir = 8
},
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/trimline/white/corner{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/white/warning{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/blue/corner{
+ color = "#8ab4cb";
+ dir = 8
+ },
+/turf/open/floor/iron/white/smooth_corner{
+ dir = 1
+ },
/area/station/medical/treatment_center)
"xeM" = (
/obj/machinery/camera/directional/west{
@@ -65832,24 +82167,28 @@
dir = 8
},
/area/station/commons/fitness)
+"xeT" = (
+/obj/effect/turf_decal/trimline/blue/filled/line{
+ dir = 10
+ },
+/obj/structure/sign/warning/pods/directional/west,
+/turf/open/floor/iron,
+/area/station/hallway/secondary/entry)
"xfe" = (
/obj/structure/window/reinforced/spawner/directional/west,
/obj/structure/flora/bush/flowers_yw,
-/obj/effect/turf_decal/siding/blue{
+/obj/machinery/hydroponics/soil,
+/obj/effect/turf_decal/siding/wood{
dir = 5
},
-/obj/machinery/hydroponics/soil,
/turf/open/floor/grass,
/area/station/security/prison)
"xfl" = (
-/obj/effect/turf_decal/tile/yellow{
- dir = 4
- },
-/obj/effect/turf_decal/tile/yellow{
- dir = 1
- },
/obj/machinery/light/directional/north,
-/turf/open/floor/iron/white,
+/obj/structure/table,
+/obj/item/storage/toolbox/mechanical,
+/obj/item/clothing/head/utility/welding,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/medical/chemistry)
"xfm" = (
/obj/machinery/camera/directional/east{
@@ -65859,6 +82198,19 @@
/obj/effect/turf_decal/trimline/white/line,
/turf/open/floor/wood,
/area/station/hallway/secondary/service)
+"xfJ" = (
+/obj/effect/turf_decal/trimline/yellow/filled/warning{
+ dir = 8
+ },
+/obj/structure/window/reinforced/spawner/directional/south,
+/obj/structure/fluff/metalpole/anchor{
+ dir = 1;
+ pixel_y = -39
+ },
+/turf/open/floor/iron/smooth_edge{
+ dir = 1
+ },
+/area/station/hallway/secondary/entry)
"xfV" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/light/small/blacklight/directional/south,
@@ -65929,17 +82281,55 @@
/turf/open/floor/iron/dark,
/area/station/science/explab)
"xgo" = (
-/obj/structure/table,
-/obj/item/multitool,
-/obj/item/pipe_dispenser,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/yellow/filled/line{
+ dir = 6
+ },
+/obj/effect/turf_decal/trimline/dark_blue/line{
+ alpha = 200;
+ dir = 6
+ },
+/turf/open/floor/iron/dark,
/area/station/engineering/atmos/hfr_room)
+"xgB" = (
+/obj/structure/cable,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 9
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer5,
+/turf/open/floor/plating,
+/area/station/maintenance/aft)
+"xgK" = (
+/obj/structure/flora/bush/sparsegrass/style_random,
+/obj/effect/landmark/generic_maintenance_landmark,
+/turf/open/floor/grass,
+/area/station/service/hydroponics/garden/abandoned)
+"xgM" = (
+/obj/machinery/shower/directional/east,
+/obj/structure/drain,
+/obj/effect/turf_decal/siding/white,
+/obj/effect/turf_decal/siding/thinplating{
+ dir = 8
+ },
+/turf/open/floor/iron/freezer,
+/area/station/commons/toilet)
+"xgO" = (
+/obj/structure/lattice,
+/obj/structure/sign/directions/arrival/directional/east{
+ pixel_y = 11
+ },
+/turf/open/space/basic,
+/area/space/nearstation)
"xgR" = (
/obj/structure/chair{
dir = 1
},
/obj/effect/turf_decal/trimline/dark_blue/filled/line,
/obj/machinery/light/directional/south,
+/obj/effect/turf_decal/trimline/dark/line,
/turf/open/floor/iron/dark,
/area/station/security/execution/transfer)
"xgS" = (
@@ -65956,7 +82346,7 @@
name = "Security Checkpoint";
req_access = list("brig")
},
-/turf/open/floor/iron,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/security/checkpoint/escape)
"xgZ" = (
/obj/structure/cable,
@@ -66019,6 +82409,35 @@
/obj/structure/railing,
/turf/open/floor/grass,
/area/station/security/prison)
+"xid" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 10
+ },
+/obj/structure/cable,
+/obj/effect/turf_decal/trimline/dark/filled/line{
+ alpha = 160;
+ dir = 9
+ },
+/obj/effect/turf_decal/trimline/purple/line{
+ color = "#700047";
+ alpha = 200;
+ dir = 9
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 9
+ },
+/obj/effect/turf_decal/trimline/dark/filled/mid_joiner{
+ dir = 8;
+ alpha = 160
+ },
+/turf/open/floor/iron/white/smooth_corner,
+/area/station/science/lab)
"xiy" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
dir = 4
@@ -66029,7 +82448,14 @@
/area/station/service/chapel)
"xiz" = (
/obj/machinery/light/directional/south,
-/turf/open/floor/iron,
+/obj/machinery/computer/nanite_cloud_controller,
+/obj/structure/railing{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 8
+ },
+/turf/open/floor/iron/white,
/area/station/science/explab)
"xiQ" = (
/obj/structure/cable,
@@ -66041,6 +82467,9 @@
/obj/structure/disposalpipe/segment{
dir = 1
},
+/obj/effect/turf_decal/trimline/dark_blue/warning{
+ alpha = 200
+ },
/turf/open/floor/iron/dark,
/area/station/security/office)
"xiR" = (
@@ -66055,7 +82484,7 @@
/obj/structure/railing{
dir = 5
},
-/turf/open/water,
+/turf/open/water/no_planet_atmos,
/area/station/service/hydroponics/garden)
"xiV" = (
/obj/structure/chair/sofa/bench/left{
@@ -66065,6 +82494,7 @@
/turf/open/floor/iron/dark/textured_large,
/area/station/hallway/primary/central)
"xjt" = (
+/obj/structure/cable,
/obj/effect/turf_decal/tile/red,
/obj/item/radio/headset/headset_med,
/obj/item/screwdriver{
@@ -66076,7 +82506,6 @@
},
/obj/structure/closet/secure_closet/security/med,
/obj/machinery/power/apc/auto_name/directional/south,
-/obj/structure/cable,
/obj/effect/turf_decal/tile/neutral/opposingcorners{
dir = 1
},
@@ -66097,6 +82526,7 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/effect/spawner/random/trash/moisture_trap,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer5,
/turf/open/floor/plating,
/area/station/maintenance/department/security)
"xkx" = (
@@ -66111,24 +82541,33 @@
"xkT" = (
/obj/machinery/light/directional/north,
/obj/structure/dresser,
-/obj/item/toy/plush/nukeplushie{
- pixel_y = 3;
- pixel_x = -7
- },
/turf/open/floor/wood,
/area/station/command/heads_quarters/blueshield)
"xlh" = (
-/obj/effect/turf_decal/tile/yellow{
- dir = 1
+/obj/machinery/firealarm/directional/west,
+/obj/effect/turf_decal/trimline/yellow/filled/line{
+ dir = 8;
+ alpha = 120
},
-/obj/effect/turf_decal/tile/blue{
+/obj/effect/turf_decal/trimline/dark_blue/line{
+ dir = 8;
+ alpha = 200
+ },
+/turf/open/floor/iron/dark,
+/area/station/engineering/atmos/hfr_room)
+"xlq" = (
+/obj/structure/chair/sofa/bench/left{
dir = 8
},
-/obj/machinery/firealarm/directional/west,
-/turf/open/floor/iron/dark/side{
+/obj/effect/turf_decal/trimline/blue/filled/line{
dir = 4
},
-/area/station/engineering/atmos/hfr_room)
+/obj/machinery/power/apc/auto_name/directional/east,
+/obj/structure/cable,
+/turf/open/floor/iron/edge{
+ dir = 8
+ },
+/area/station/hallway/secondary/entry)
"xlx" = (
/obj/structure/cable,
/obj/effect/turf_decal/trimline/dark_blue/filled/line{
@@ -66136,6 +82575,9 @@
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/turf_decal/trimline/dark/line{
+ dir = 1
+ },
/turf/open/floor/iron/dark,
/area/station/security/brig)
"xlP" = (
@@ -66144,6 +82586,10 @@
dir = 6
},
/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer4,
+/obj/effect/turf_decal/trimline/dark_blue/corner{
+ alpha = 200
+ },
/turf/open/floor/iron/dark,
/area/station/security/office)
"xme" = (
@@ -66161,7 +82607,6 @@
/turf/open/floor/plating,
/area/station/science/robotics/lab)
"xmg" = (
-/obj/effect/turf_decal/trimline/blue/filled/warning,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 1
},
@@ -66169,7 +82614,11 @@
dir = 1
},
/obj/structure/cable,
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/trimline/blue/filled/warning{
+ alpha = 160
+ },
+/obj/effect/turf_decal/trimline/white/warning,
+/turf/open/floor/iron/white/smooth_edge,
/area/station/medical/medbay/central)
"xmh" = (
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
@@ -66180,6 +82629,22 @@
},
/turf/open/floor/iron,
/area/station/hallway/secondary/exit)
+"xmF" = (
+/obj/effect/turf_decal/siding/wideplating_new/light,
+/obj/structure/railing,
+/obj/effect/turf_decal/siding/dark,
+/turf/open/floor/iron/dark/herringbone,
+/area/station/cargo/storage)
+"xna" = (
+/obj/item/toy/plush/lizard_plushie{
+ name = "hungry lizard plushie"
+ },
+/obj/structure/bed/maint,
+/obj/item/kitchen/fork{
+ pixel_x = 11
+ },
+/turf/open/floor/fakebasalt,
+/area/station/maintenance/starboard/fore)
"xne" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
/turf/open/floor/engine,
@@ -66191,22 +82656,13 @@
/turf/open/floor/iron/dark,
/area/station/security/evidence)
"xnG" = (
-/obj/effect/turf_decal/tile/yellow{
- dir = 1
- },
-/obj/effect/turf_decal/tile/yellow{
- dir = 4
- },
/obj/structure/table,
/obj/item/stock_parts/power_store/cell/high{
pixel_x = 6;
pixel_y = -3
},
/obj/item/crowbar/red,
-/obj/effect/turf_decal/tile/yellow{
- dir = 8
- },
-/turf/open/floor/iron,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/hallway/primary/aft)
"xnY" = (
/obj/structure/sign/poster/random/directional/south,
@@ -66215,6 +82671,9 @@
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/structure/cable,
+/obj/effect/turf_decal/siding/dark{
+ dir = 8
+ },
/turf/open/floor/plating,
/area/station/maintenance/aft)
"xon" = (
@@ -66222,7 +82681,9 @@
/obj/machinery/camera/directional/south{
c_tag = "Central Primary Hallway South-West"
},
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/brown/arrow_cw,
+/obj/effect/turf_decal/trimline/brown/mid_joiner,
+/turf/open/floor/iron/large,
/area/station/hallway/primary/central)
"xoB" = (
/obj/docking_port/stationary{
@@ -66241,6 +82702,14 @@
},
/turf/open/floor/iron/dark,
/area/station/ai_monitored/security/armory)
+"xoL" = (
+/obj/effect/turf_decal/siding/dark{
+ dir = 4
+ },
+/turf/open/floor/iron/edge{
+ dir = 4
+ },
+/area/station/hallway/primary/aft)
"xpa" = (
/obj/structure/disposalpipe/segment,
/obj/structure/cable,
@@ -66253,7 +82722,13 @@
/obj/effect/turf_decal/stripes/corner,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron,
-/area/station/science/ordnance/bomb)
+/area/station/science/ordnance/testlab)
+"xpi" = (
+/obj/machinery/atmospherics/components/unary/airlock_pump/unbolt_only{
+ dir = 8
+ },
+/turf/open/floor/plating,
+/area/station/maintenance/port/aft)
"xpn" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/spawner/structure/window/reinforced,
@@ -66293,6 +82768,18 @@
/obj/structure/tank_holder/extinguisher,
/turf/open/floor/plating,
/area/station/maintenance/starboard/aft)
+"xpH" = (
+/obj/structure/window/reinforced/spawner/directional/east,
+/obj/structure/window/reinforced/spawner/directional/west,
+/obj/structure/window/reinforced/spawner/directional/north,
+/obj/structure/flora/grass/jungle/a/style_3,
+/obj/structure/flora/bush/flowers_yw/style_2,
+/obj/structure/marker_beacon/olive{
+ pixel_x = 0;
+ pixel_y = -16
+ },
+/turf/open/floor/grass,
+/area/station/cargo/office)
"xqe" = (
/obj/structure/table,
/obj/item/toy/cards/deck{
@@ -66328,14 +82815,18 @@
/obj/structure/disposalpipe/segment{
dir = 1
},
+/obj/effect/turf_decal/trimline/dark/warning{
+ dir = 1
+ },
/turf/open/floor/iron/dark,
/area/station/security/brig)
"xqJ" = (
/obj/machinery/power/apc/auto_name/directional/east,
/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers,
-/obj/machinery/portable_atmospherics/canister/carbon_dioxide,
/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/components/unary/thermomachine/heater{
+ dir = 8
+ },
/turf/open/floor/iron,
/area/station/maintenance/starboard)
"xqX" = (
@@ -66351,11 +82842,43 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/wood,
/area/station/maintenance/abandon_arcade)
+"xqY" = (
+/obj/machinery/door/firedoor/border_only{
+ dir = 1
+ },
+/obj/structure/fluff/metalpole{
+ dir = 1;
+ pixel_y = 32
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes/white/line{
+ color = "#52B4E9";
+ dir = 1;
+ name = "blue line"
+ },
+/obj/structure/railing/corner/end{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/blue/fourcorners,
+/turf/open/floor/iron/white,
+/area/station/hallway/secondary/entry)
"xrc" = (
-/obj/effect/turf_decal/trimline/blue/filled/line,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron/white,
+/obj/structure/cable,
+/obj/effect/turf_decal/trimline/blue/filled/line{
+ alpha = 160
+ },
+/obj/effect/turf_decal/trimline/dark_blue/line{
+ alpha = 200
+ },
+/obj/effect/turf_decal/trimline/blue/filled/mid_joiner{
+ dir = 2;
+ alpha = 160
+ },
+/turf/open/floor/iron/white/smooth_edge,
/area/station/medical/medbay/aft)
"xrs" = (
/obj/structure/disposalpipe/segment{
@@ -66379,6 +82902,10 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
+/obj/effect/turf_decal/trimline/dark_blue/warning{
+ alpha = 200;
+ dir = 1
+ },
/turf/open/floor/iron/dark,
/area/station/hallway/primary/fore)
"xsi" = (
@@ -66386,35 +82913,42 @@
/turf/open/floor/iron/dark,
/area/station/security/execution/education)
"xsA" = (
-/obj/effect/turf_decal/stripes/line{
+/obj/effect/turf_decal/siding/wideplating_new/dark{
dir = 8
},
-/turf/open/floor/iron/dark/textured,
+/obj/effect/turf_decal/siding/wideplating_new/dark{
+ dir = 4
+ },
+/turf/open/floor/iron/textured_large,
/area/station/command/gateway)
"xsR" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
dir = 1
},
/turf/open/floor/iron,
-/area/station/science/ordnance/bomb)
+/area/station/science/ordnance/testlab)
"xsV" = (
/obj/structure/disposalpipe/segment{
dir = 6
},
/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
- dir = 4
- },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer5,
/turf/open/floor/plating,
/area/station/maintenance/department/security)
"xta" = (
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
+/obj/effect/turf_decal/siding/corner{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/blue/filled/line{
+ alpha = 160;
dir = 4
},
+/obj/effect/turf_decal/trimline/white/line{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/cable,
/turf/open/floor/iron/white,
/area/station/medical/medbay/lobby)
"xto" = (
@@ -66423,10 +82957,22 @@
},
/turf/closed/wall,
/area/station/maintenance/department/medical/morgue)
+"xtv" = (
+/obj/effect/turf_decal/siding/white,
+/obj/effect/turf_decal/siding/white{
+ dir = 1
+ },
+/turf/open/floor/iron/white/small,
+/area/station/commons/toilet)
"xtH" = (
-/obj/effect/turf_decal/tile/brown/half/contrasted{
+/obj/machinery/light/small/directional/west,
+/obj/effect/turf_decal/trimline/brown/filled/line{
dir = 8
},
+/obj/effect/turf_decal/trimline/dark/line{
+ dir = 8
+ },
+/obj/structure/sign/warning/fire/directional/west,
/turf/open/floor/iron,
/area/station/cargo/warehouse)
"xtO" = (
@@ -66457,6 +83003,16 @@
},
/turf/open/floor/carpet,
/area/station/service/chapel)
+"xug" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 4
+ },
+/turf/open/floor/iron,
+/area/station/hallway/primary/fore)
"xul" = (
/obj/machinery/button/door/directional/south{
id = "HFRshutter";
@@ -66470,31 +83026,45 @@
/obj/machinery/camera/directional/west{
c_tag = "Brig Infirmary"
},
-/obj/effect/turf_decal/tile/dark_blue{
- dir = 1
+/obj/structure/table/glass,
+/obj/item/reagent_containers/syringe,
+/obj/item/storage/medkit/emergency{
+ pixel_y = 9
},
-/obj/effect/turf_decal/tile/dark_blue{
- dir = 8
+/obj/item/reagent_containers/cup/bottle/multiver,
+/obj/effect/spawner/random/medical/minor_healing,
+/obj/effect/turf_decal/trimline/red/real_red/filled/line{
+ dir = 10
+ },
+/obj/effect/turf_decal/trimline/dark/line{
+ dir = 10
},
-/obj/structure/closet/crate/freezer/blood,
/turf/open/floor/iron/white,
/area/station/security/medical)
"xus" = (
-/obj/effect/turf_decal/tile/red/opposingcorners,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+/obj/effect/turf_decal/trimline/blue/filled/line{
+ dir = 4
+ },
+/obj/structure/chair{
dir = 8
},
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/power/apc/auto_name/directional/west,
-/obj/structure/cable,
-/turf/open/floor/iron,
-/area/station/commons/fitness/recreation)
+/obj/machinery/firealarm/directional/east,
+/turf/open/floor/iron/edge{
+ dir = 8
+ },
+/area/station/hallway/secondary/entry)
"xuu" = (
/obj/structure/window/reinforced/tinted/spawner/directional/south,
+/obj/effect/turf_decal/siding/wood{
+ dir = 10
+ },
/turf/open/floor/wood,
/area/station/security/prison)
"xux" = (
/obj/effect/turf_decal/trimline/dark_blue/filled/line,
+/obj/effect/turf_decal/trimline/dark_blue/line{
+ alpha = 200
+ },
/turf/open/floor/iron/dark,
/area/station/security/office)
"xuF" = (
@@ -66511,15 +83081,15 @@
/turf/open/floor/iron,
/area/station/service/hydroponics)
"xuH" = (
-/obj/machinery/door/airlock/maintenance{
- name = "Captain's Office Maintenance"
- },
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/door/airlock/maintenance{
+ name = "Captain's Office Maintenance"
+ },
/obj/effect/mapping_helpers/airlock/access/any/command/captain,
/obj/effect/mapping_helpers/airlock/cyclelink_helper,
-/turf/open/floor/plating,
+/turf/open/floor/iron/dark/textured_large,
/area/station/maintenance/central/lesser)
"xuM" = (
/obj/structure/disposalpipe/segment,
@@ -66531,6 +83101,12 @@
/obj/structure/plasticflaps/kitchen,
/turf/open/floor/iron/cafeteria,
/area/station/service/kitchen)
+"xvb" = (
+/obj/effect/turf_decal/siding/dark{
+ dir = 6
+ },
+/turf/open/floor/circuit/red,
+/area/station/ai_monitored/turret_protected/ai_upload)
"xvG" = (
/obj/effect/turf_decal/stripes/white/line{
color = "#52B4E9";
@@ -66543,6 +83119,16 @@
},
/turf/open/floor/iron/dark,
/area/station/security/prison)
+"xvV" = (
+/obj/item/paper,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 6
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/turf/open/floor/iron,
+/area/station/maintenance/port/aft)
"xwo" = (
/obj/machinery/firealarm/directional/north,
/turf/open/floor/iron/dark/side{
@@ -66564,15 +83150,13 @@
/turf/open/floor/plating,
/area/station/engineering/engine_smes)
"xxn" = (
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
- dir = 1
+/obj/effect/turf_decal/trimline/brown/filled/corner{
+ dir = 4
},
-/obj/machinery/door/airlock/external{
- name = "Port Docking Bay 3"
+/turf/open/floor/iron/textured_edge{
+ dir = 8
},
-/obj/effect/mapping_helpers/airlock/unres,
-/turf/open/floor/plating,
-/area/station/hallway/secondary/entry)
+/area/station/cargo/office)
"xxw" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -66583,6 +83167,37 @@
},
/turf/open/floor/plating,
/area/station/maintenance/disposal)
+"xyy" = (
+/obj/machinery/door/airlock/external{
+ name = "External Access"
+ },
+/obj/effect/mapping_helpers/airlock/access/any/supply/general,
+/obj/effect/mapping_helpers/airlock/unres{
+ dir = 4
+ },
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+ dir = 8
+ },
+/turf/open/floor/plating,
+/area/station/maintenance/port/aft)
+"xyK" = (
+/obj/effect/turf_decal/siding/dark{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/dark/filled/line{
+ alpha = 160;
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/purple/line{
+ alpha = 200;
+ dir = 4;
+ color = "#a56dc2"
+ },
+/obj/structure/cable,
+/turf/open/floor/iron/white/smooth_edge{
+ dir = 4
+ },
+/area/station/science/xenobiology)
"xyR" = (
/obj/machinery/camera/directional/east{
c_tag = "Cytology";
@@ -66617,8 +83232,13 @@
/obj/effect/landmark/start/chief_medical_officer,
/turf/open/floor/carpet/blue,
/area/station/command/heads_quarters/cmo)
+"xzW" = (
+/turf/open/floor/iron/corner{
+ dir = 8
+ },
+/area/station/hallway/primary/central)
"xAv" = (
-/turf/open/floor/engine,
+/turf/open/floor/engine/xenobio,
/area/station/science/xenobiology)
"xAy" = (
/obj/effect/spawner/structure/window/reinforced,
@@ -66629,8 +83249,9 @@
/turf/open/floor/plating,
/area/station/science/explab)
"xAA" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
- dir = 1
+/obj/effect/turf_decal/trimline/brown/filled/corner,
+/obj/effect/turf_decal/trimline/brown/filled/corner{
+ dir = 4
},
/turf/open/floor/iron,
/area/station/cargo/storage)
@@ -66641,10 +83262,20 @@
"xAH" = (
/turf/open/floor/wood/parquet,
/area/station/service/bar)
+"xBm" = (
+/obj/effect/turf_decal/siding/dark{
+ dir = 8;
+ icon_state = "siding_plain_end"
+ },
+/turf/open/floor/iron/textured_large,
+/area/station/ai_monitored/command/storage/eva)
"xBJ" = (
/obj/effect/turf_decal/trimline/dark_blue/filled/corner{
dir = 1
},
+/obj/effect/turf_decal/trimline/dark/corner{
+ dir = 1
+ },
/turf/open/floor/iron/dark,
/area/station/security/brig)
"xBY" = (
@@ -66654,7 +83285,7 @@
/obj/structure/railing{
dir = 6
},
-/turf/open/water,
+/turf/open/water/no_planet_atmos,
/area/station/service/hydroponics/garden)
"xBZ" = (
/obj/structure/disposalpipe/segment{
@@ -66668,6 +83299,18 @@
},
/turf/open/floor/iron/dark,
/area/station/hallway/secondary/exit)
+"xCl" = (
+/obj/structure/broken_flooring/plating/directional/north,
+/obj/item/clothing/head/helmet/toggleable/justice/escape,
+/obj/item/storage/belt/fannypack/blue,
+/obj/effect/spawner/random/maintenance,
+/obj/structure/closet/secure_closet/personal{
+ name = "security locker";
+ icon = 'modular_skyrat/master_files/icons/obj/closet.dmi';
+ icon_state = "sec"
+ },
+/turf/open/floor/plating,
+/area/station/maintenance/port/aft)
"xCm" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 1
@@ -66675,13 +83318,27 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 4
},
-/turf/open/floor/iron,
+/obj/structure/cable,
+/obj/effect/turf_decal/trimline/blue/filled/line{
+ dir = 1
+ },
+/turf/open/floor/iron/edge,
/area/station/hallway/secondary/entry)
"xCD" = (
-/obj/structure/lattice,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible/layer2,
-/turf/open/space/basic,
-/area/space/nearstation)
+/obj/structure/table,
+/obj/item/stack/sheet/glass/fifty{
+ pixel_x = 2
+ },
+/obj/item/stack/sheet/iron/fifty,
+/obj/item/stack/sheet/plasteel/twenty{
+ pixel_x = -4
+ },
+/obj/item/stack/cable_coil{
+ pixel_x = -3;
+ pixel_y = 3
+ },
+/turf/open/floor/iron,
+/area/station/engineering/atmos/hfr_room)
"xCG" = (
/obj/machinery/portable_atmospherics/scrubber,
/obj/effect/turf_decal/bot,
@@ -66696,6 +83353,9 @@
pixel_x = -4;
pixel_y = 5
},
+/obj/effect/turf_decal/siding/wood{
+ dir = 5
+ },
/turf/open/floor/wood,
/area/station/maintenance/aft)
"xDe" = (
@@ -66704,10 +83364,16 @@
},
/area/station/commons/dorms)
"xDp" = (
-/obj/effect/decal/cleanable/dirt,
/obj/structure/cable,
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
-/obj/effect/turf_decal/siding/thinplating/light,
+/obj/effect/turf_decal/trimline/white/filled/line{
+ alpha = 160
+ },
+/obj/effect/turf_decal/trimline/purple/line{
+ alpha = 200;
+ dir = 2;
+ color = "#a56dc2"
+ },
+/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron,
/area/station/science/explab)
"xDP" = (
@@ -66721,11 +83387,28 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/commons/fitness)
+"xDR" = (
+/obj/structure/cable,
+/obj/effect/turf_decal/trimline/purple/corner{
+ dir = 8
+ },
+/turf/open/floor/iron/edge,
+/area/station/hallway/primary/starboard)
"xDS" = (
/obj/structure/disposalpipe/segment,
/obj/item/radio/intercom/directional/west,
-/turf/open/floor/iron,
+/turf/open/floor/iron/edge{
+ dir = 8
+ },
/area/station/hallway/primary/central)
+"xEo" = (
+/obj/effect/turf_decal/siding/dark{
+ dir = 4
+ },
+/turf/open/floor/iron/textured_half{
+ dir = 8
+ },
+/area/station/hallway/primary/starboard)
"xEp" = (
/obj/structure/girder,
/turf/closed/wall,
@@ -66740,17 +83423,18 @@
},
/area/station/common/pool/sauna)
"xFt" = (
-/obj/effect/turf_decal/tile/yellow{
- dir = 8
- },
-/obj/effect/turf_decal/tile/yellow,
/obj/machinery/requests_console{
department = "Medbay";
name = "Medbay RC";
pixel_y = -30
},
/obj/effect/mapping_helpers/requests_console/assistance,
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/siding/dark,
+/obj/effect/turf_decal/siding/dark{
+ dir = 1
+ },
+/obj/machinery/holopad,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/medical/chemistry)
"xFA" = (
/obj/machinery/portable_atmospherics/canister/air,
@@ -66760,16 +83444,23 @@
/obj/structure/disposalpipe/junction/flip{
dir = 8
},
-/turf/open/floor/iron,
+/turf/open/floor/iron/edge,
/area/station/hallway/primary/central)
"xGl" = (
/obj/structure/reagent_dispensers/fueltank,
/turf/open/floor/plating,
/area/station/maintenance/starboard/fore)
"xGy" = (
-/obj/machinery/holopad,
-/obj/effect/turf_decal/bot,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/brown/filled/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/brown{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/dark/line{
+ dir = 1
+ },
+/turf/open/floor/iron/textured_edge,
/area/station/cargo/storage)
"xGI" = (
/obj/effect/turf_decal/delivery/blue,
@@ -66782,6 +83473,10 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 4
},
+/obj/structure/cable,
+/obj/structure/railing/corner/end{
+ dir = 8
+ },
/turf/open/floor/plating,
/area/station/maintenance/starboard/aft)
"xGZ" = (
@@ -66793,9 +83488,21 @@
/obj/structure/cable,
/turf/open/floor/plating,
/area/station/ai_monitored/turret_protected/aisat/service)
+"xHf" = (
+/obj/effect/turf_decal/siding/dark{
+ dir = 4
+ },
+/turf/open/floor/iron/dark,
+/area/station/service/hydroponics)
"xHo" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/mapping_helpers/broken_floor,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 1
+ },
/turf/open/floor/iron,
/area/station/maintenance/port/fore)
"xHG" = (
@@ -66819,16 +83526,41 @@
/obj/machinery/light/directional/north,
/turf/open/floor/iron/smooth_large,
/area/station/engineering/engine_smes)
+"xIe" = (
+/obj/effect/turf_decal/siding/dark{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/purple/corner,
+/turf/open/floor/iron/textured_corner{
+ dir = 4
+ },
+/area/station/hallway/primary/starboard)
+"xIp" = (
+/obj/effect/turf_decal/stripes/line,
+/obj/effect/turf_decal/trimline/blue/filled/corner{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/blue/filled/corner{
+ alpha = 160
+ },
+/obj/effect/turf_decal/stripes/white/line{
+ color = "#a56dc2"
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 5
+ },
+/turf/open/floor/iron/small,
+/area/station/hallway/secondary/entry)
"xIx" = (
/turf/open/floor/iron/dark,
/area/station/maintenance/port/fore)
"xJe" = (
-/obj/structure/window/spawner/directional/south,
/obj/machinery/hydroponics/constructable,
/obj/machinery/door/window/right/directional/east,
/obj/effect/turf_decal/siding/thinplating/dark{
dir = 1
},
+/obj/structure/window/spawner/directional/south,
/turf/open/floor/iron/smooth_large,
/area/station/service/hydroponics)
"xJu" = (
@@ -66839,6 +83571,7 @@
name = "Security Shutters"
},
/obj/effect/turf_decal/delivery,
+/obj/structure/cable,
/turf/open/floor/iron/dark/side,
/area/station/security/prison)
"xJJ" = (
@@ -66866,8 +83599,30 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 4
},
+/obj/effect/landmark/blobstart,
/turf/open/floor/plating,
/area/station/maintenance/department/electrical)
+"xKv" = (
+/obj/effect/turf_decal/trimline/dark_green/warning{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/wood{
+ dir = 1
+ },
+/turf/open/floor/iron/textured_half,
+/area/station/hallway/primary/starboard)
+"xKB" = (
+/obj/machinery/light/dim/directional/west,
+/obj/effect/turf_decal/trimline/yellow/filled/line{
+ dir = 8;
+ alpha = 120
+ },
+/obj/effect/turf_decal/trimline/dark_blue/line{
+ dir = 8;
+ alpha = 200
+ },
+/turf/open/floor/iron/dark,
+/area/station/engineering/atmos/hfr_room)
"xKN" = (
/turf/closed/wall/r_wall,
/area/station/command/gateway)
@@ -66877,7 +83632,9 @@
/area/station/service/library)
"xKQ" = (
/obj/effect/mapping_helpers/burnt_floor,
-/obj/structure/trash_pile,
+/obj/machinery/atmospherics/components/tank/air/layer4{
+ dir = 1
+ },
/turf/open/floor/plating,
/area/station/maintenance/starboard/fore)
"xKS" = (
@@ -66891,31 +83648,35 @@
dir = 4
},
/obj/item/radio/intercom/directional/south,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/neutral/corner,
+/turf/open/floor/iron/edge,
/area/station/hallway/primary/port)
"xLo" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/dark/filled/end{
+ dir = 2;
+ alpha = 160
+ },
+/obj/effect/turf_decal/trimline/dark/filled/mid_joiner{
+ dir = 8;
+ alpha = 160
+ },
+/obj/effect/turf_decal/trimline/purple/end{
+ alpha = 200;
+ color = "#a56dc2"
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 2;
+ icon_state = "siding_plain_end"
+ },
+/turf/open/floor/iron/white/smooth_large,
/area/station/science/xenobiology)
"xLr" = (
/turf/open/floor/wood,
/area/station/hallway/secondary/service)
"xMa" = (
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/medical{
name = "Surgery B"
@@ -66924,7 +83685,7 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/effect/mapping_helpers/airlock/access/any/medical/surgery,
/obj/structure/cable,
-/turf/open/floor/iron,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/medical/surgery/fore)
"xMe" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
@@ -66936,11 +83697,17 @@
/obj/machinery/door/airlock/public/glass{
name = "Escape"
},
-/obj/effect/turf_decal/tile/red{
- dir = 4
- },
-/turf/open/floor/iron,
+/turf/open/floor/iron/large,
/area/station/hallway/secondary/exit)
+"xMW" = (
+/obj/effect/turf_decal/siding/dark{
+ dir = 6
+ },
+/obj/effect/turf_decal/siding/dark/corner{
+ dir = 1
+ },
+/turf/open/floor/engine,
+/area/station/science/xenobiology)
"xNc" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 9
@@ -66949,6 +83716,26 @@
/obj/structure/cable,
/turf/open/floor/iron/smooth_large,
/area/station/engineering/main)
+"xNd" = (
+/obj/effect/turf_decal/siding/dark{
+ dir = 2;
+ icon_state = "siding_plain_end"
+ },
+/turf/open/floor/circuit/telecomms/mainframe,
+/area/station/tcommsat/server)
+"xNB" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/machinery/firealarm/directional/east,
+/turf/open/floor/iron/smooth_edge{
+ dir = 8
+ },
+/area/station/hallway/secondary/entry)
+"xNQ" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/plating,
+/area/station/maintenance/aft)
"xNR" = (
/obj/machinery/disposal/bin,
/obj/structure/disposalpipe/trunk{
@@ -66983,7 +83770,15 @@
"xOy" = (
/obj/machinery/light/directional/north,
/obj/machinery/bluespace_vendor/directional/north,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/trimline/blue/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/blue/mid_joiner{
+ dir = 1
+ },
+/turf/open/floor/iron/edge{
+ dir = 1
+ },
/area/station/hallway/primary/central)
"xOA" = (
/obj/machinery/airalarm/directional/east,
@@ -67023,6 +83818,9 @@
/obj/effect/turf_decal/trimline/dark_blue/filled/warning{
dir = 8
},
+/obj/effect/turf_decal/trimline/white/warning{
+ dir = 8
+ },
/turf/open/floor/iron/dark,
/area/station/security/execution/education)
"xPq" = (
@@ -67039,13 +83837,19 @@
/area/station/security/office)
"xPV" = (
/obj/machinery/light/directional/north,
-/obj/effect/turf_decal/tile/yellow{
- dir = 4
+/obj/effect/turf_decal/trimline/yellow/line{
+ dir = 9
},
-/obj/effect/turf_decal/tile/yellow{
+/obj/effect/turf_decal/trimline/yellow/mid_joiner{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/yellow/mid_joiner{
dir = 1
},
-/turf/open/floor/iron,
+/obj/effect/turf_decal/siding/dark{
+ dir = 8
+ },
+/turf/open/floor/iron/corner,
/area/station/hallway/primary/aft)
"xQg" = (
/obj/effect/decal/cleanable/dirt,
@@ -67054,8 +83858,14 @@
dir = 9
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/decal/remains/human,
/turf/open/floor/wood,
/area/station/service/library/abandoned)
+"xQp" = (
+/obj/effect/turf_decal/trimline/blue/arrow_cw,
+/obj/effect/turf_decal/trimline/blue/mid_joiner,
+/turf/open/floor/iron/textured_half,
+/area/station/hallway/primary/starboard)
"xQG" = (
/obj/structure/chair/wood{
dir = 8
@@ -67065,19 +83875,21 @@
"xQR" = (
/turf/closed/wall/r_wall,
/area/station/science/explab)
+"xQV" = (
+/obj/machinery/atmospherics/components/tank/air/layer4{
+ dir = 1
+ },
+/turf/open/floor/plating,
+/area/station/maintenance/starboard/aft)
"xQZ" = (
/obj/structure/chair/stool,
/turf/open/floor/plating,
/area/station/maintenance/aft)
"xRc" = (
-/obj/effect/turf_decal/tile/red{
+/turf/open/floor/iron/textured_edge{
dir = 8
},
-/obj/effect/turf_decal/tile/red{
- dir = 8
- },
-/turf/closed/wall/r_wall,
-/area/station/science/genetics)
+/area/station/cargo/storage)
"xRn" = (
/obj/effect/spawner/random/trash/mess,
/obj/effect/decal/cleanable/dirt,
@@ -67135,14 +83947,14 @@
/turf/open/floor/iron/dark,
/area/station/medical/virology)
"xSf" = (
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
- dir = 1
+/obj/structure/chair/sofa/bench/right{
+ dir = 4
},
-/obj/machinery/door/airlock/external{
- name = "Port Docking Bay 4"
+/obj/effect/turf_decal/trimline/blue/filled/line{
+ dir = 10
},
-/obj/effect/mapping_helpers/airlock/unres,
-/turf/open/floor/plating,
+/obj/machinery/firealarm/directional/west,
+/turf/open/floor/iron,
/area/station/hallway/secondary/entry)
"xSh" = (
/obj/structure/window/spawner/directional/east,
@@ -67154,10 +83966,8 @@
dir = 4
},
/obj/structure/table/glass,
-/obj/structure/extinguisher_cabinet{
- pixel_x = 27
- },
/obj/item/reagent_containers/spray/cleaner,
+/obj/structure/extinguisher_cabinet/directional/east,
/turf/open/floor/iron/white,
/area/station/medical/break_room)
"xSH" = (
@@ -67173,6 +83983,10 @@
},
/turf/open/space/basic,
/area/space/nearstation)
+"xTt" = (
+/obj/structure/closet/l3closet/scientist,
+/turf/open/floor/iron/dark/smooth_large,
+/area/station/science/xenobiology)
"xTy" = (
/obj/machinery/light/directional/north,
/obj/structure/dresser,
@@ -67227,6 +84041,15 @@
"xUu" = (
/turf/closed/wall,
/area/station/cargo/drone_bay)
+"xUB" = (
+/obj/effect/turf_decal/siding/wood/corner{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/wood{
+ dir = 8
+ },
+/turf/open/floor/wood/large,
+/area/station/hallway/secondary/entry)
"xUC" = (
/obj/effect/turf_decal/siding/thinplating/dark{
dir = 1
@@ -67243,6 +84066,13 @@
/obj/item/seeds/watermelon,
/turf/open/floor/iron,
/area/station/service/hydroponics/garden)
+"xUS" = (
+/obj/effect/turf_decal/trimline/blue/line,
+/obj/effect/turf_decal/trimline/blue/mid_joiner,
+/turf/open/floor/iron/textured_corner{
+ dir = 4
+ },
+/area/station/hallway/primary/starboard)
"xVr" = (
/obj/structure/railing/corner/end{
dir = 8
@@ -67266,6 +84096,18 @@
},
/turf/open/floor/wood,
/area/station/hallway/secondary/service)
+"xVF" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/blue/filled/line{
+ dir = 4
+ },
+/obj/effect/turf_decal/stripes/white/line{
+ dir = 4
+ },
+/turf/open/floor/iron,
+/area/station/hallway/secondary/entry)
"xWd" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/orange/visible{
dir = 9
@@ -67282,23 +84124,31 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 4
},
-/turf/open/floor/iron/dark,
+/obj/effect/turf_decal/trimline/dark/filled/line,
+/obj/effect/turf_decal/trimline/dark/filled/line{
+ dir = 1
+ },
+/obj/effect/decal/cleanable/blood/old,
+/obj/structure/cable,
+/turf/open/floor/iron/dark/small,
/area/station/medical/morgue)
"xWD" = (
/obj/effect/decal/cleanable/dirt,
-/obj/item/melee/baton/security/cattleprod,
-/obj/effect/spawner/random/burgerstation/loot/with_maintenance_loot,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 4
+ },
/turf/open/floor/plating,
/area/station/maintenance/starboard/aft)
"xWL" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/effect/mapping_helpers/airlock/locked,
/obj/machinery/door/airlock/vault{
name = "Vault"
},
-/obj/structure/cable,
/obj/effect/landmark/navigate_destination,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/effect/mapping_helpers/airlock/access/any/supply/vault,
/turf/open/floor/iron/dark/textured_large,
/area/station/ai_monitored/command/nuke_storage)
@@ -67326,6 +84176,16 @@
/obj/machinery/power/port_gen/pacman,
/turf/open/floor/plating,
/area/station/engineering/gravity_generator)
+"xXf" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 5
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/blue/filled/corner,
+/turf/open/floor/iron/textured_corner,
+/area/station/hallway/secondary/entry)
"xXl" = (
/obj/structure/chair/sofa/middle/brown{
dir = 1
@@ -67377,6 +84237,25 @@
/obj/machinery/power/apc/auto_name/directional/west,
/turf/open/floor/wood,
/area/station/security/detectives_office)
+"xZv" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/cable,
+/obj/effect/landmark/start/hangover,
+/turf/open/floor/iron/edge,
+/area/station/hallway/primary/central)
+"xZx" = (
+/obj/effect/spawner/structure/window/reinforced,
+/turf/open/floor/plating,
+/area/station/service/barber)
+"xZX" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/neutral/line,
+/obj/effect/turf_decal/trimline/neutral/mid_joiner,
+/turf/open/floor/iron/edge,
+/area/station/hallway/primary/port)
"yaq" = (
/obj/machinery/space_heater,
/obj/effect/decal/cleanable/dirt,
@@ -67391,6 +84270,7 @@
dir = 5
},
/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer5,
/turf/open/floor/plating,
/area/station/maintenance/starboard)
"yaw" = (
@@ -67399,10 +84279,6 @@
/turf/open/floor/plating,
/area/station/maintenance/port/aft)
"yaH" = (
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
-/obj/effect/turf_decal/tile/blue,
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 6
@@ -67410,6 +84286,8 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 10
},
+/obj/effect/turf_decal/siding,
+/obj/effect/turf_decal/trimline/blue/filled/warning,
/turf/open/floor/iron/white,
/area/station/medical/surgery)
"yaO" = (
@@ -67424,13 +84302,11 @@
/turf/open/floor/iron/dark,
/area/station/security/office)
"yaT" = (
-/obj/structure/sign/warning/no_smoking{
- pixel_x = -25
- },
/obj/structure/noticeboard/directional/south,
/obj/machinery/atmospherics/pipe/heat_exchanging/simple/layer2{
dir = 5
},
+/obj/structure/sign/warning/no_smoking/directional/west,
/turf/open/floor/iron/dark/airless,
/area/station/science/ordnance/freezerchamber)
"ybb" = (
@@ -67438,17 +84314,39 @@
/obj/structure/chair/sofa/bench{
dir = 1
},
-/obj/effect/turf_decal/tile/red{
- dir = 8
- },
/turf/open/floor/iron/dark/side,
/area/station/hallway/secondary/exit)
+"ybR" = (
+/obj/effect/turf_decal/trimline/blue/line{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/blue/mid_joiner{
+ dir = 4
+ },
+/turf/open/floor/iron/edge{
+ dir = 4
+ },
+/area/station/hallway/primary/central)
"yce" = (
/obj/effect/turf_decal/trimline/green/filled/line{
- dir = 10
+ dir = 10;
+ alpha = 160
},
/obj/item/kirbyplants/random,
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/trimline/dark_green/line{
+ alpha = 200;
+ dir = 10
+ },
+/obj/effect/turf_decal/trimline/green/filled/mid_joiner{
+ alpha = 160
+ },
+/obj/effect/turf_decal/trimline/green/filled/mid_joiner{
+ alpha = 160;
+ dir = 8
+ },
+/turf/open/floor/iron/white/smooth_corner{
+ dir = 4
+ },
/area/station/medical/medbay/aft)
"ycf" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -67460,10 +84358,13 @@
/turf/open/floor/iron/dark,
/area/station/commons/dorms/apartment1)
"yck" = (
-/obj/machinery/atmospherics/components/unary/passive_vent{
- name = "killroom vent"
+/obj/effect/turf_decal/siding/dark{
+ dir = 5
},
-/turf/open/floor/circuit/telecomms,
+/obj/effect/turf_decal/siding/dark/corner{
+ dir = 8
+ },
+/turf/open/floor/engine,
/area/station/science/xenobiology)
"ycI" = (
/obj/effect/turf_decal/tile/blue{
@@ -67522,6 +84423,34 @@
/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/iron/dark,
/area/station/security/checkpoint/engineering)
+"ydt" = (
+/obj/effect/turf_decal/trimline/dark/filled/line{
+ alpha = 160;
+ dir = 6
+ },
+/obj/effect/turf_decal/trimline/dark/filled/mid_joiner{
+ dir = 2;
+ alpha = 160
+ },
+/obj/effect/turf_decal/trimline/dark/filled/mid_joiner{
+ dir = 4;
+ alpha = 160
+ },
+/obj/effect/turf_decal/trimline/purple/line{
+ alpha = 200;
+ dir = 6;
+ color = "#a56dc2"
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 6
+ },
+/obj/effect/turf_decal/siding/corner{
+ dir = 1
+ },
+/turf/open/floor/iron/white/smooth_corner{
+ dir = 1
+ },
+/area/station/science/xenobiology)
"ydA" = (
/obj/effect/turf_decal/tile/blue{
dir = 4
@@ -67530,12 +84459,25 @@
dir = 8
},
/obj/machinery/light/directional/west,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+ dir = 4
+ },
+/obj/machinery/firealarm/directional/west,
/turf/open/floor/iron/cafeteria,
-/area/station/commons/locker)
+/area/station/commons/dorms/laundry)
"ydW" = (
/obj/item/modular_computer/pda/clear,
/turf/open/floor/plating,
/area/station/security/prison)
+"yel" = (
+/obj/effect/turf_decal/siding/dark{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 8
+ },
+/turf/open/floor/wood/tile,
+/area/station/command/meeting_room)
"yeE" = (
/obj/structure/disposalpipe/segment{
dir = 6
@@ -67547,9 +84489,15 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 6
},
+/obj/effect/turf_decal/siding/dark{
+ dir = 1
+ },
/turf/open/floor/plating,
/area/station/maintenance/aft)
"yeI" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/effect/turf_decal/tile/blue{
dir = 4
},
@@ -67563,11 +84511,8 @@
/obj/effect/turf_decal/tile/blue{
dir = 8
},
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/effect/mapping_helpers/airlock/access/any/medical/psychology,
-/turf/open/floor/iron/white,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/medical/psychology)
"yeK" = (
/obj/machinery/vending/wardrobe/viro_wardrobe,
@@ -67580,15 +84525,35 @@
},
/turf/open/floor/iron/dark,
/area/station/medical/virology)
+"yeW" = (
+/obj/structure/window/reinforced/spawner/directional/east,
+/obj/structure/window/reinforced/spawner/directional/north,
+/obj/structure/window/reinforced/spawner/directional/west,
+/obj/structure/flora/rock/pile/style_3,
+/obj/structure/flora/ash/leaf_shroom,
+/turf/open/floor/fakebasalt,
+/area/station/hallway/secondary/entry)
"yeY" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 8
},
-/turf/open/floor/iron/dark,
+/turf/open/floor/iron/dark/textured,
/area/station/ai_monitored/command/nuke_storage)
"yfk" = (
/turf/closed/wall/r_wall,
/area/station/maintenance/central/lesser)
+"yfw" = (
+/obj/structure/window/reinforced/spawner/directional/east,
+/obj/structure/window/reinforced/spawner/directional/west,
+/obj/structure/window/reinforced/spawner/directional/north,
+/obj/structure/flora/grass/jungle/a/style_3,
+/obj/structure/flora/bush/flowers_yw,
+/obj/structure/marker_beacon/olive{
+ pixel_x = 0;
+ pixel_y = -16
+ },
+/turf/open/floor/grass,
+/area/station/cargo/office)
"yfx" = (
/obj/structure/disposalpipe/segment{
dir = 9
@@ -67602,6 +84567,19 @@
},
/turf/open/floor/plating,
/area/station/maintenance/port)
+"yfH" = (
+/obj/structure/cable,
+/obj/effect/turf_decal/siding/wideplating_new/light,
+/obj/effect/turf_decal/siding/wideplating_new/light/corner{
+ dir = 1
+ },
+/obj/structure/railing,
+/obj/effect/turf_decal/siding/dark,
+/obj/effect/turf_decal/siding/dark/corner{
+ dir = 1
+ },
+/turf/open/floor/iron/dark/small,
+/area/station/cargo/storage)
"yfS" = (
/obj/effect/turf_decal/tile/red{
dir = 8
@@ -67621,10 +84599,23 @@
/obj/machinery/portable_atmospherics/canister,
/turf/open/floor/iron,
/area/station/science/ordnance)
+"ygn" = (
+/obj/effect/turf_decal/bot_blue,
+/obj/structure/closet/secure_closet/security/sec,
+/obj/machinery/firealarm/directional/west,
+/turf/open/floor/iron/dark,
+/area/station/security/office)
"ygs" = (
/obj/structure/chair/office,
/obj/effect/landmark/start/captain,
-/turf/open/floor/wood,
+/obj/effect/turf_decal/siding/wideplating_new/dark/corner,
+/obj/effect/turf_decal/siding/wideplating_new/dark/corner{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/wood{
+ dir = 10
+ },
+/turf/open/floor/carpet/executive,
/area/station/command/heads_quarters/captain)
"ygt" = (
/obj/structure/cable,
@@ -67651,6 +84642,19 @@
dir = 4
},
/area/station/service/chapel)
+"ygX" = (
+/obj/effect/turf_decal/trimline/dark_blue/arrow_cw{
+ dir = 1;
+ alpha = 200
+ },
+/obj/effect/turf_decal/trimline/dark_blue/mid_joiner{
+ dir = 1;
+ alpha = 200
+ },
+/turf/open/floor/iron/edge{
+ dir = 1
+ },
+/area/station/hallway/primary/central)
"yhq" = (
/obj/effect/turf_decal/siding/wood{
dir = 8
@@ -67660,12 +84664,40 @@
},
/turf/open/floor/wood,
/area/station/command/heads_quarters/blueshield)
+"yhv" = (
+/obj/effect/turf_decal/trimline/blue/arrow_cw,
+/obj/effect/turf_decal/trimline/blue/mid_joiner,
+/turf/open/floor/iron/edge,
+/area/station/hallway/primary/starboard)
+"yhF" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/turf_decal/trimline/dark/filled/line{
+ alpha = 160;
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/dark/filled/mid_joiner{
+ dir = 1;
+ alpha = 160
+ },
+/obj/effect/turf_decal/trimline/purple/line{
+ alpha = 200;
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 1
+ },
+/turf/open/floor/iron/white/smooth_edge{
+ dir = 1
+ },
+/area/station/science/research)
"yhM" = (
/obj/machinery/door/poddoor/shutters{
id = "evashutters";
name = "E.V.A. Storage Shutters"
},
-/turf/open/floor/iron,
+/turf/open/floor/iron/large,
/area/station/ai_monitored/command/storage/eva)
"yhN" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
@@ -67679,10 +84711,10 @@
},
/area/station/hallway/secondary/exit)
"yhU" = (
-/obj/effect/turf_decal/tile/red{
- dir = 1
- },
/obj/structure/cable,
+/obj/effect/turf_decal/trimline/dark_blue/filled/shrink_ccw{
+ dir = 8
+ },
/turf/open/floor/iron/dark,
/area/station/hallway/primary/fore)
"yhZ" = (
@@ -67701,16 +84733,14 @@
/area/station/maintenance/abandon_arcade)
"yig" = (
/obj/structure/cable,
-/obj/effect/turf_decal/tile/yellow{
- dir = 4
+/obj/effect/turf_decal/trimline/yellow/filled/line{
+ dir = 5
},
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
-/turf/open/floor/iron/dark/corner{
- dir = 8
+/obj/effect/turf_decal/trimline/dark_blue/line{
+ alpha = 200;
+ dir = 5
},
+/turf/open/floor/iron/dark,
/area/station/engineering/atmos/hfr_room)
"yim" = (
/obj/effect/turf_decal/stripes/white/line{
@@ -67739,18 +84769,11 @@
/turf/open/floor/plating,
/area/station/service/library/abandoned)
"yiT" = (
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
+/obj/structure/cable,
/obj/machinery/power/apc/auto_name/directional/east,
/obj/machinery/medical_kiosk,
/obj/machinery/light/directional/north,
-/obj/structure/cable,
-/turf/open/floor/iron/white,
+/turf/open/floor/iron/dark/smooth_large,
/area/station/medical/medbay/lobby)
"yjZ" = (
/obj/effect/turf_decal/stripes/line,
@@ -67759,6 +84782,18 @@
/obj/machinery/portable_atmospherics/canister,
/turf/open/floor/iron,
/area/station/science/ordnance)
+"ykb" = (
+/obj/structure/disposalpipe/segment{
+ dir = 1
+ },
+/obj/machinery/door/airlock/maintenance,
+/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance,
+/obj/effect/mapping_helpers/airlock/unres,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/turf/open/floor/plating,
+/area/station/maintenance/port/aft)
"ykf" = (
/obj/structure/table/wood,
/obj/item/toy/nuke,
@@ -67833,6 +84868,7 @@
"yls" = (
/obj/effect/turf_decal/trimline/dark_blue/filled/line,
/obj/machinery/light/directional/south,
+/obj/effect/turf_decal/trimline/dark/line,
/turf/open/floor/iron/dark,
/area/station/security/brig)
"yly" = (
@@ -67845,6 +84881,7 @@
id = "xenobiomain";
name = "Containment Blast Door"
},
+/obj/structure/cable,
/turf/open/floor/plating,
/area/station/science/xenobiology)
@@ -72062,7 +89099,7 @@ xzh
xzh
xzh
xzh
-xzh
+sNY
xzh
xzh
xzh
@@ -73106,6 +90143,7 @@ xzh
xzh
xzh
xzh
+bvb
xzh
xzh
xzh
@@ -73115,9 +90153,8 @@ xzh
xzh
xzh
xzh
-xzh
-xzh
-xzh
+vTv
+kJh
xzh
xzh
xzh
@@ -73360,6 +90397,10 @@ xzh
xzh
xzh
xzh
+bgR
+xzh
+sUX
+sUX
xzh
xzh
xzh
@@ -73368,14 +90409,10 @@ xzh
xzh
xzh
xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
+jVc
+iXz
+rXr
+kcw
xzh
xzh
xzh
@@ -73614,6 +90651,13 @@ xzh
xzh
xzh
xzh
+bvb
+xzh
+xzh
+sUX
+sUX
+sUX
+bgR
xzh
xzh
xzh
@@ -73622,17 +90666,10 @@ xzh
xzh
xzh
xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
+jVc
+kDa
+xfJ
+kcw
xzh
xzh
xzh
@@ -73871,25 +90908,25 @@ xzh
xzh
xzh
xzh
+sUX
+sUX
+sUX
+bgR
+xzh
+xzh
+sUX
+xzh
+aCT
xzh
xzh
xzh
xzh
xzh
xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
+jVc
+giD
+hen
+kcw
xzh
xzh
xzh
@@ -74115,7 +91152,6 @@ xzh
xzh
xzh
xzh
-sNY
xzh
xzh
xzh
@@ -74126,27 +91162,28 @@ xzh
xzh
xzh
xzh
-aYj
xzh
-aYj
+xzh
+xzh
+bgR
+sUX
xzh
xzh
xzh
xzh
+bJc
+xzh
+xzh
+xzh
+bvb
xzh
xzh
xzh
xzh
-xzh
-xzh
-aYj
-xzh
-aYj
-uVE
-uRx
-tEN
-uVE
-xzh
+jVc
+fCL
+pQC
+kcw
xzh
xzh
xzh
@@ -74383,27 +91420,27 @@ xzh
xzh
xzh
xzh
+xzh
+xzh
sUX
+kZS
+xzh
+xzh
+xzh
+eMP
+xgO
+xzh
+xzh
xzh
sUX
xzh
xzh
xzh
xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-sUX
-xzh
-sUX
-arB
-wyp
-wyp
-arB
-xzh
+jVc
+cBT
+emF
+kcw
xzh
xzh
xzh
@@ -74639,30 +91676,30 @@ xzh
xzh
xzh
xzh
-bgR
-bgR
sUX
-bgR
-bgR
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-bgR
-bgR
+bvb
sUX
-bgR
-bgl
-ajc
-ajc
-bgl
+ayn
+qJE
+fGQ
+fGQ
+fGQ
+aaL
+asE
xzh
xzh
xzh
+sUX
+xzh
+xzh
+xzh
+xzh
+jVc
+giD
+tBp
+kcw
+xzh
+xzh
xzh
xzh
xzh
@@ -74896,28 +91933,28 @@ xzh
xzh
xzh
xzh
-bgR
-sUX
xzh
sUX
-bgR
xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-bgR
+asE
+aAE
+kVv
+auP
+kVv
+sfE
+asE
+ajc
+bpz
+ajc
sUX
xzh
+xzh
+xzh
sUX
-arB
wyp
giD
-arB
-arB
+hen
+kcw
xzh
xzh
xzh
@@ -75153,28 +92190,28 @@ xzh
xzh
xzh
xzh
+sUX
bgR
-xzh
-aCT
-xzh
-bgR
+sUX
+asE
+tyg
+kgM
+auP
+kgM
+aPv
+asE
+asE
+eEQ
+asE
+sUX
xzh
xzh
xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-bgR
-xzh
-cyl
-xzh
-arB
-awZ
-ayl
+sUX
+jVc
+giD
+tBp
kcw
-awW
xzh
xzh
xzh
@@ -75182,7 +92219,7 @@ xzh
xzh
xzh
xzh
-sNY
+xzh
xzh
xzh
xzh
@@ -75410,28 +92447,28 @@ xzh
xzh
xzh
bgR
+xzh
+sUX
+xzh
+asE
+ayk
+kgM
+auP
+kgM
+aPv
+asE
+azD
+iEJ
+asE
sUX
xzh
xzh
xzh
sUX
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-sUX
-xzh
-xzh
-xzh
-arB
-awZ
-ayl
+jVc
+giD
lIm
-awW
+kcw
xzh
xzh
xzh
@@ -75668,32 +92705,32 @@ xzh
xzh
bgR
sUX
-xzh
-xzh
-xzh
sUX
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
sUX
+asE
+miY
+kgM
+auP
+kgM
+aPv
+asE
+asE
+taS
+aAc
+asE
+asE
+sUX
+sUX
+sUX
+jVc
+nVv
+auh
+kcw
xzh
xzh
-xzh
-arB
-awZ
-ayl
-aUN
-awW
-xzh
-xzh
-xzh
-xzh
-xzh
+bgR
+sUX
+bvb
xzh
xzh
xzh
@@ -75924,33 +92961,33 @@ xzh
xzh
xzh
bgR
-sUX
-xzh
-xzh
xzh
sUX
xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-sUX
-xzh
-xzh
-xzh
-arB
-jVc
-ayl
-ayk
+asE
+brV
+kgM
+auP
+kgM
+aPv
+asE
+fdV
+lmP
+mHW
+xSf
awW
xzh
xzh
+sUX
+jVc
+giD
+tBp
+kcw
+bgR
+sUX
+sUX
xzh
-xzh
-xzh
+sUX
xzh
xzh
xzh
@@ -76151,7 +93188,7 @@ xzh
xzh
xzh
xzh
-xzh
+sNY
xzh
xzh
xzh
@@ -76182,32 +93219,32 @@ apJ
apJ
apJ
apJ
-uRx
-aDO
-uRx
+bgR
sUX
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-sUX
-uRx
-aDO
-uRx
-arB
-awZ
-ayl
+asE
ayk
+kgM
+auP
+kgM
+aPv
+asE
+vQT
+fUa
+afM
+uzj
awW
xzh
xzh
+sUX
+jVc
+giD
+tBp
+kcw
+bJc
xzh
+cyl
xzh
-xzh
+bgR
xzh
xzh
xzh
@@ -76439,27 +93476,34 @@ apN
apN
apN
apJ
+xzh
+xzh
asE
-ilQ
+aAE
+aLA
+auP
+aLA
+cOM
asE
-arB
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-arB
+jgJ
+fUa
+ltj
+kBr
asE
-fWj
-asE
-arB
-gbd
-ayl
-lIm
awW
+asE
+qCl
+gbd
+giD
+lIm
+gGG
+bJc
+xzh
+xzh
+xzh
+sUX
+sUX
+sUX
xzh
xzh
xzh
@@ -76484,14 +93528,7 @@ xzh
xzh
xzh
xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
+sNY
xzh
xzh
xzh
@@ -76696,35 +93733,34 @@ apN
apN
apN
apJ
-azD
+xzh
+xzh
+asE
+ayk
+kgM
auP
-aPu
-aAC
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-aAC
+kgM
+aPv
+qFz
+nMn
+gKw
+tTV
+vpt
baC
-auP
-iEJ
-arB
-raM
-ayl
-aUN
-awW
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
+oDL
+bgl
+xzh
+jVc
+giD
+tBp
+kcw
+bJc
+xzh
+xzh
+xzh
+sUX
+xzh
+bJc
xzh
xzh
xzh
@@ -76773,6 +93809,7 @@ xzh
xzh
xzh
xzh
+sNY
xzh
xzh
xzh
@@ -76953,34 +93990,34 @@ apN
apN
apN
apJ
-aAc
-aIH
+xzh
+xzh
asE
-arB
-awW
-uRx
-xzh
-xzh
-xzh
-xzh
-xzh
-uRx
-arB
+ayk
+kgM
+auP
+kgM
+aPv
asE
-asE
-qjU
-arB
+uAb
+tgy
+bmO
+cqr
+brI
+aHN
+bgl
+iTK
nQD
-ayn
+giD
tBp
-aAC
-xzh
-xzh
-xzh
+gGG
+bJc
xzh
xzh
xzh
+sUX
xzh
+bJc
xzh
xzh
xzh
@@ -77210,34 +94247,34 @@ apN
apN
apN
apJ
-awZ
-ayk
-aPv
+xzh
+xzh
+asE
+aRZ
+kgM
auP
kgM
-uRx
-xzh
-xzh
-xzh
-xzh
-xzh
-uRx
+aPv
+asE
+uex
+toP
+noD
jqd
-auP
+blY
gfa
-jly
+jJr
lOw
-ayl
-ayk
-awW
-aAD
-awW
-xzh
-xzh
-xzh
-xzh
-xzh
+eBM
+sZz
+tBp
+kcw
+sUX
+ajc
+bpz
+ajc
+sUX
xzh
+bJc
xzh
xzh
xzh
@@ -77467,34 +94504,34 @@ apN
apN
apN
apJ
-gbd
+asE
+asE
+asE
ayk
-awW
-awW
-awW
-uRx
-xzh
-xzh
-xzh
-xzh
-xzh
-uRx
-awW
-awW
-awW
-jly
-ayl
-ayl
-ayk
-beK
+kgM
auP
-xSf
-bgs
-xzh
-xzh
-xzh
+kgM
+aPv
+asE
+vUF
+vfX
+aRL
+cqr
+fUa
+lHX
+bZc
+xNB
+aET
+nbn
+cMe
+kcw
xzh
+asE
+fWj
+asE
+asE
xzh
+bJc
xzh
xzh
xzh
@@ -77724,34 +94761,34 @@ apN
apN
apN
apJ
-awZ
+vcM
aOe
-azz
-aAF
-awW
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-awW
-baF
-azz
-khB
-ayl
-ayl
-ayk
asE
-awW
-awW
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
+ayk
+kgM
+auP
+kgM
+aPv
+asE
+hqO
+cos
+xUB
+joH
+baF
+dpD
+asE
+asE
+yeW
+oJP
+asE
+asE
+asE
+asE
+lFq
+azD
+asE
+sUX
+sUX
xzh
xzh
xzh
@@ -77981,32 +95018,32 @@ apN
apN
apN
apJ
-jVc
+auP
aIK
-ayl
+asE
aAE
-awW
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-awW
+aLA
+auP
+aLA
+sfE
+euB
+kiq
+cdj
+wSR
+khB
cqr
-ayl
-ayl
-ayl
-ayl
-kdI
-azz
-aAF
-awW
-xzh
-xzh
-xzh
-xzh
+ieh
+wsO
+asE
+auP
+auP
+auP
+auP
+auP
+asE
+qjU
+asE
+asE
xzh
xzh
xzh
@@ -78238,27 +95275,33 @@ apN
apN
apN
apJ
-awZ
-aIK
-ayl
+dUY
+asE
+asE
ayk
+kgM
+auP
+kgM
+aPv
+fYC
+lhw
+rGU
+tEN
+aqc
+qGQ
+fUa
+ihT
+bPM
+auP
+hGN
+auP
+hGN
+auP
+jMb
+qWG
+xeT
awW
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
awW
-cwT
-ayl
-ayl
-ayl
-ayl
-ayl
-ayl
-aAE
awW
xzh
xzh
@@ -78378,12 +95421,6 @@ xzh
xzh
xzh
xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
"}
(42,1,1) = {"
xzh
@@ -78495,35 +95532,35 @@ apN
apN
apN
apJ
-awZ
-aIK
-ayl
-aRY
-awW
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-awW
-cxY
-ayl
-ayl
-ayl
-ayl
-ayl
-ayl
-bgi
-awW
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
+oYL
+mLk
+hcU
+ayk
+kgM
+auP
+kgM
+aPv
+fTs
+kiq
+cdj
+wSR
+gVM
+qGQ
+fUa
+jly
+lzo
+auP
+hGN
+auP
+hGN
+auP
+hax
+iWi
+xIp
+beK
+aLv
+sXL
+bgs
xzh
xzh
xzh
@@ -78752,34 +95789,34 @@ shf
shf
shf
apJ
-awZ
-aOf
-azA
+ufW
+asE
+asE
aRZ
-awW
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-awW
+kgM
+auP
+azz
+aPv
+asE
+fjQ
+tSC
+sdt
+mWx
cyb
-azA
+fUa
aQH
-ayl
-ayl
-ayn
-azA
-bgh
+aLD
+aKk
+auP
+auP
+auP
+auP
+asE
+azW
+tMP
+aPs
+awW
awW
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
xzh
xzh
xzh
@@ -79008,35 +96045,35 @@ arE
asF
crz
crz
-aym
+apJ
awZ
-aOg
-awW
-awW
-awW
-uRx
-xzh
-xzh
-xzh
-xzh
-xzh
-uRx
-awW
-awW
-awW
-jly
-ayl
-ayl
-hGN
+lvN
asE
+ayk
+azz
+auP
+kgM
+aPv
+asE
+gcE
+bCD
+fDg
+vmo
+fUa
+fUa
+jly
+pSd
+auP
+hGN
+auP
+hGN
+auP
+asE
+gcU
+qzx
+aOf
+rjf
awW
-awW
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
xzh
xzh
xzh
@@ -79241,7 +96278,7 @@ xzh
xzh
xzh
xzh
-sNY
+xzh
xzh
xzh
xzh
@@ -79264,36 +96301,36 @@ azy
azy
azy
cIh
-azy
+axb
aym
aAH
aOh
-aPv
+asE
+ayk
+kgM
auP
kgM
-uRx
-xzh
-xzh
-xzh
-xzh
-xzh
-uRx
-dpD
-auP
+aMO
+asE
+fuT
+ppe
+ppe
+cll
+wst
fUa
-jly
-ayl
-ayl
-ayk
-beL
+aQH
+azO
auP
-xxn
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
+hGN
+auP
+hGN
+auP
+asE
+ljK
+ijK
+vji
+rpN
+awW
xzh
xzh
xzh
@@ -79520,30 +96557,36 @@ azy
aow
arK
asI
-auO
+azy
awV
apJ
aAI
aOg
-awW
-aAD
-awW
-uRx
-xzh
-xzh
-xzh
-xzh
-xzh
-uRx
-awW
-awW
-awW
+asE
+aAE
+aLA
+auP
+aLA
+sfE
+asE
+leL
+ivv
+sKB
+cdj
+eMy
+gAl
lCi
-ayl
-ayl
-ayk
-awW
-aAD
+asE
+auP
+auP
+auP
+auP
+auP
+asE
+qvV
+ijK
+sHF
+aNb
awW
xzh
xzh
@@ -79568,13 +96611,7 @@ xzh
xzh
xzh
xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
+bvn
xzh
xzh
xzh
@@ -79778,28 +96815,35 @@ ayo
ayo
asJ
auQ
-axb
+cZU
ayr
aAJ
aPt
-azB
-awW
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-aWa
-xzh
-xzh
-awW
+tKQ
+auP
+kgM
+auP
+kgM
+auP
+mwS
+aSb
+ivv
+bpX
+cdj
+lap
hFg
-khB
-ayl
-ayl
+asE
+asE
+jeK
kdI
azB
+asE
+asE
+asE
+gnR
+dOq
+xVF
+dxO
awW
xzh
xzh
@@ -79824,14 +96868,7 @@ xzh
xzh
xzh
xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
+bvq
xzh
xzh
xzh
@@ -79986,7 +97023,7 @@ xzh
xzh
xzh
xzh
-xzh
+sNY
xzh
xzh
xzh
@@ -80036,28 +97073,35 @@ azC
atI
avP
axc
-apJ
+ayr
aCl
-aIK
+aPt
aQG
-arB
-arB
-arB
-awW
-awW
-awW
-awW
-awW
-arB
-arB
-arB
+auP
+kgM
+auP
+kgM
+fyq
+xqY
+aSb
ivv
-ayl
-ayl
-bbb
-ayl
-beN
+pxD
+cdj
arB
+psS
+asE
+bkJ
+bbb
+beN
+beN
+ujz
+cxY
+qQD
+bwN
+mhE
+aPs
+awW
+awW
xzh
xzh
xzh
@@ -80081,14 +97125,7 @@ xzh
xzh
xzh
xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
+bvq
xzh
xzh
xzh
@@ -80297,32 +97334,31 @@ alU
aCp
aFN
atP
-aqc
-aLv
-aBH
-aqc
-awx
+auP
+kgM
+hGN
+kgM
+auP
awM
awP
axF
-axF
+nzu
ayC
azG
aBn
+nXz
aDD
-aDD
-aDD
-ayl
-beM
-aAC
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
+bwu
+dXV
+dXV
+dXV
+dXV
+tSQ
+vII
+doD
+beL
+epO
+pQJ
xzh
xzh
xzh
@@ -80346,6 +97382,7 @@ xzh
xzh
xzh
xzh
+bvq
xzh
xzh
xzh
@@ -80552,16 +97589,16 @@ aol
aol
usr
aFG
-ayl
+aLz
aRX
-aMO
-ayl
-aNb
-ayl
-ayl
-ayl
-aIK
-ayl
+auP
+kgM
+auP
+kgM
+auP
+gXA
+aSb
+xXf
aUM
wxF
aOY
@@ -80569,17 +97606,16 @@ cdn
pAx
qKx
onG
-cdj
-mVl
-asE
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
+auO
+auO
+kIq
+dot
+auO
+aBP
+csG
+awW
+awW
+awW
xzh
xzh
xzh
@@ -80603,6 +97639,7 @@ xzh
xzh
xzh
xzh
+bvq
xzh
xzh
xzh
@@ -80809,19 +97846,19 @@ alU
alU
alU
aKj
-dTo
-asE
-asE
-awW
-awW
-awW
-asE
-asE
-bwu
-aOY
+aPt
+ibJ
+auP
+kgM
+auP
+kgM
+auP
+sNU
+aSb
+aWa
cSR
-bae
-bae
+xZx
+tnl
eUy
bae
cSR
@@ -80834,7 +97871,6 @@ beO
beO
beO
beO
-aNF
xzh
xzh
xzh
@@ -80860,6 +97896,7 @@ xzh
xzh
xzh
xzh
+bvq
xzh
xzh
xzh
@@ -81052,9 +98089,9 @@ sUX
sUX
uRx
aqJ
-amC
+uOv
gLH
-aol
+iQF
aol
aol
aol
@@ -81065,17 +98102,17 @@ atR
aEF
weO
aBI
-nyk
+qjv
owk
-asE
+nQj
auP
+kgM
auP
+kgM
auP
-auP
-auP
-asE
+xeC
lEE
-ayl
+aTe
cSR
pBF
aWm
@@ -81115,11 +98152,11 @@ xzh
xzh
xzh
xzh
-xzh
-xzh
-xzh
-xzh
-xzh
+oTX
+kAN
+bgR
+bgR
+moU
xzh
xzh
xzh
@@ -81311,7 +98348,7 @@ alU
alU
alU
alU
-aol
+iQF
alU
alU
ank
@@ -81324,15 +98361,15 @@ tux
otU
vcc
lHg
-bPM
+put
auP
+kgM
+hGN
+kgM
auP
-auP
-auP
-auP
-awW
+joB
aOk
-ayl
+tNp
cSR
aQK
aza
@@ -81356,6 +98393,16 @@ xzh
xzh
xzh
xzh
+bCq
+bLv
+bLv
+bLv
+bLv
+bCq
+pMj
+uqL
+aNF
+uga
xzh
xzh
xzh
@@ -81363,20 +98410,11 @@ xzh
xzh
xzh
xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-sNY
+bvq
+bLv
+bXv
+bLv
+xzh
xzh
xzh
xzh
@@ -81398,7 +98436,6 @@ xzh
xzh
xzh
xzh
-sNY
xzh
xzh
xzh
@@ -81568,7 +98605,7 @@ alU
apL
aqK
alU
-aol
+iQF
alU
bvv
aKY
@@ -81579,16 +98616,16 @@ auq
aHz
dvD
xRV
-nyk
-lHg
-lzo
+qjv
+hQi
+kQN
auP
+kgM
auP
+kgM
auP
-auP
-auP
-awW
-aSb
+qVu
+czn
aPx
cSR
uCu
@@ -81613,6 +98650,16 @@ xzh
xzh
xzh
xzh
+bCq
+izg
+qSR
+oWG
+enC
+bCq
+jUW
+bCq
+bCq
+sUX
xzh
xzh
xzh
@@ -81620,20 +98667,10 @@ xzh
xzh
xzh
xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
+bvq
+bLv
+cvF
+bLv
xzh
xzh
xzh
@@ -81825,7 +98862,7 @@ alU
apM
aqL
alU
-aol
+iQF
alU
auX
avS
@@ -81833,20 +98870,20 @@ bvN
aKY
alU
auV
-aHz
+wZt
lif
aGZ
nyk
-lHg
-aLD
-aKk
+aPt
+ibJ
auP
+kgM
auP
+kgM
auP
-auP
-asE
+sNU
aSd
-ayl
+jDW
cSR
aQL
cnZ
@@ -81864,33 +98901,33 @@ cAF
bja
xzh
xzh
+bCq
+bCq
+bCq
+bCq
+bCq
+bCq
+bCq
+ghF
+vLX
+uZS
+caz
+bLv
+bLv
+bLv
+bCq
+bCq
+bCq
+bCq
xzh
xzh
xzh
xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
+bCq
+bVy
+bLv
+cyE
+bLv
xzh
xzh
xzh
@@ -82082,7 +99119,7 @@ aoS
amC
aom
rta
-aol
+iQF
alU
auZ
bsU
@@ -82090,19 +99127,19 @@ axf
bVA
alU
avv
-aHz
+aDO
iZi
xRV
xCm
aLz
-awW
+aQG
auP
+kgM
auP
+kgM
auP
-auP
-auP
-awW
-aSd
+akC
+aSb
aPy
cSR
cSR
@@ -82119,35 +99156,35 @@ bjc
cAF
blV
beO
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
+bCq
+bCq
+bCq
+axE
+wfk
+wfk
+wfk
+qrY
+vIJ
+aYN
+bYR
+aYN
+mwq
+rYA
+iht
+iht
+owX
+bLu
+rFJ
+bCq
+bCq
+bCq
+vTj
+bCq
+bCq
+bVB
+vLX
+iaU
+bCq
xzh
xzh
xzh
@@ -82305,7 +99342,7 @@ xzh
xzh
xzh
xzh
-sNY
+xzh
xzh
xzh
xzh
@@ -82339,7 +99376,7 @@ aoR
apO
aqM
alU
-aol
+iQF
alU
auY
bvN
@@ -82351,15 +99388,15 @@ gYm
tkd
aBI
psi
-lHg
-awW
+aFN
+atP
auP
+kgM
+hGN
+kgM
auP
-auP
-auP
-auP
-awW
-aSd
+awM
+aSb
aQo
cSR
aUR
@@ -82376,35 +99413,35 @@ xxw
jgZ
vRI
beO
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
+axE
+pJD
+pJD
+dQs
+bHE
+rFJ
+bCq
+bCq
+bCq
+bCq
+bCq
+bCq
+dpw
+bHE
+bHE
+bHE
+lCC
+kME
+fon
+oLs
+sje
+buc
+kLD
+bCq
+tKn
+bHE
+bHE
+szE
+bCq
xzh
xzh
bJc
@@ -82596,7 +99633,7 @@ aoT
hKJ
ahY
alU
-aol
+iQF
alU
ava
bvO
@@ -82608,16 +99645,16 @@ azF
azF
azF
aKl
-aLA
-asE
+aPt
+sVm
auP
+kgM
auP
+kgM
auP
-auP
-auP
-asE
-aSe
-ayl
+vVP
+aSb
+tNp
cSR
fNu
aAi
@@ -82633,35 +99670,35 @@ bEM
beO
beO
beO
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
+tNB
+bCq
+bCq
+uOX
+bCq
+bCq
+bCq
+bLu
+ehK
+nYR
+ihm
+fRp
+tYO
+bCq
+bCq
+bLv
+lCC
+bLv
+bCq
+bCq
+jfL
+bCq
+bCq
+bCq
+jJZ
+bHE
+szE
+szE
+bCq
xzh
xzh
bJc
@@ -82865,15 +99902,15 @@ vIU
aIP
azF
fwA
-lHg
-asE
-asE
-awW
-awW
-awW
-asE
-asE
-aSd
+aPt
+iMv
+auP
+cwT
+auP
+glv
+auP
+nwu
+aSb
mbz
cSR
qqr
@@ -82881,46 +99918,46 @@ cSR
wzk
cjg
cSR
-wEv
+bcK
aPz
-bdt
+jIB
bdR
bdR
wFd
bkD
+qum
+ykb
+dQs
+wEo
+gHV
+nal
+lCY
+thg
+bHE
+nal
+llR
+djJ
+mpq
+bCq
+gOH
+bLv
xzh
+bLv
+lCC
+bLv
xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
+lPz
+miL
+wDy
+nVf
+bCq
+bCq
+bHE
+szE
+bCq
+bCq
+sUX
+sUX
bJc
vPR
atY
@@ -83110,7 +100147,7 @@ viK
eFn
ajw
amC
-aol
+iQF
alU
aAS
aRo
@@ -83124,14 +100161,14 @@ azF
aLj
aLC
aIR
-aIR
+aNd
aNd
aNi
-aNg
-aNg
+olm
+olm
aNg
aSf
-ayl
+lGh
cSR
cSR
cSR
@@ -83144,37 +100181,37 @@ bdt
lAk
aTu
sCj
-bkD
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
+aSg
+nDM
+bCq
+bCq
+bCq
+bLv
+bLv
+bLv
+bCq
+nKX
+mxd
+puU
+djJ
+xCl
+bCq
+aYg
+bLv
xzh
+bLv
+niE
+bLv
xzh
+lPz
+lKp
+lCC
+eXa
+bCq
+pQB
+bHE
+szE
+bCq
xzh
xzh
xzh
@@ -83367,7 +100404,7 @@ alU
alU
ajw
amC
-aol
+iQF
alU
aAT
fFQ
@@ -83380,58 +100417,58 @@ gOV
azF
hzW
ayl
-ayl
-ayl
-ayl
+xus
+kXC
+sKv
eoI
-ayl
+bgi
kOm
-ayl
-ayl
+xlq
+sCL
aQJ
aPz
aWj
aXP
aZr
-aPz
-aUy
-bcK
+aWl
+rNN
+eci
aPz
bdt
rbN
bfh
aPz
aPz
+bCq
+bCq
xzh
xzh
xzh
xzh
xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
+bCq
+bCq
+bLv
+bLv
+bLv
+bCq
+bCq
+luR
+bCq
+bCq
+bCq
+bZV
+bCq
+bCq
+bCq
+bCq
+nUa
+bCq
+bCq
+bCq
+bCq
+szE
+bCq
xzh
xzh
xzh
@@ -83614,17 +100651,17 @@ ufm
geD
alh
akB
-alh
-akB
+ktv
+oRI
amA
-akB
+oRI
anI
ljy
ajK
ajK
ajK
-aol
-aol
+iQF
+iQF
atr
aAU
wZS
@@ -83633,7 +100670,7 @@ wZS
xUC
aAQ
aBw
-aBM
+jYx
azF
azF
azF
@@ -83647,13 +100684,13 @@ aPz
aPz
aPz
aPz
-aWl
-aSg
+aWj
+aXP
aZs
-iQF
-vET
-aTu
-bea
+aPz
+aSg
+upq
+aRY
bdD
bea
bjg
@@ -83671,24 +100708,24 @@ xzh
xzh
xzh
xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
+sUX
+bCq
+vgR
+bCq
+mSX
+bCq
+lCC
+cIQ
+wPk
+cbO
+cbO
+kuz
+iFu
+djJ
+djJ
+bKx
+bKx
+bCq
xzh
xzh
xzh
@@ -83877,30 +100914,30 @@ amz
anh
anH
aoj
-amC
+wnq
apP
aoX
amC
-aol
+oKp
alU
bbV
miW
-miW
+rMv
miW
hre
aAQ
aFP
arC
ase
+joX
+joX
aAx
-aAx
-aAx
-aKm
-avi
+aKn
+nDN
aNj
aNR
aPz
-trZ
+aUy
trZ
aTu
axK
@@ -83912,8 +100949,8 @@ bff
bcL
nCU
bdC
-bhO
-bhO
+cBU
+cBU
bjh
bkE
xzh
@@ -83928,24 +100965,24 @@ xzh
xzh
xzh
xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
+sUX
+bLv
+hiU
+bYu
+uLL
+bCq
+tmK
+fqD
+bCq
+skc
+bCq
+bCq
+bCq
+bCq
+bCq
+bKx
+bCq
+bCq
xzh
xzh
xzh
@@ -84138,22 +101175,22 @@ amC
apP
waK
amC
-aol
+oKp
alU
koe
wkI
mbo
txy
-aAQ
-aAQ
+ayW
+ixV
aBG
aAQ
aIS
aAQ
aBM
-aAQ
-aKn
-aLE
+aUN
+kqp
+jFB
avG
aOm
aPB
@@ -84171,7 +101208,7 @@ aXQ
aXQ
aXQ
aXQ
-bgw
+lXI
bkF
xzh
xzh
@@ -84186,22 +101223,22 @@ xzh
xzh
xzh
xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
+bLv
+lzG
+xvV
+cUL
+bpW
+fqD
+fqW
+bCq
+nCE
+jUL
+wji
+odT
+bCq
+rFJ
+szE
+bCq
xzh
xzh
xzh
@@ -84394,8 +101431,8 @@ aok
amC
amC
aFJ
-apD
-aol
+fYp
+aum
alU
alU
alU
@@ -84405,14 +101442,14 @@ alU
aAP
iHT
vCF
-aAQ
+awx
aFO
aHA
aIT
azF
uBY
avG
-aOl
+jsA
aPA
aPA
aPA
@@ -84428,7 +101465,7 @@ brp
aXQ
aZt
aXQ
-bgw
+lXI
bkF
xzh
xzh
@@ -84443,22 +101480,22 @@ xzh
xzh
xzh
xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
+bLv
+tNi
+bAo
+gNV
+bCq
+bCq
+qHu
+bCq
+liw
+bJW
+iOG
+qVg
+bCq
+bHE
+szE
+bCq
xzh
xzh
xzh
@@ -84647,17 +101684,17 @@ alU
alU
alU
alU
-aom
+gkh
amC
apP
ccF
-amC
-aol
-aol
-aol
-aol
-aol
-aol
+sTh
+aum
+aum
+aum
+aum
+aum
+aum
alU
alU
azF
@@ -84669,7 +101706,7 @@ azF
azF
aNe
avG
-aOl
+xZX
aPA
aQO
aSh
@@ -84685,7 +101722,7 @@ bdJ
aXQ
bgr
aXQ
-bgw
+lXI
bkF
xzh
xzh
@@ -84700,22 +101737,22 @@ xzh
xzh
xzh
xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
+bCq
+bCq
+bCq
+bCq
+bCq
+bCq
+xpi
+bCq
+pBn
+rrS
+ntu
+jIO
+bCq
+rYl
+szE
+bCq
xzh
xzh
xzh
@@ -84914,17 +101951,17 @@ alU
alU
alU
alU
-aol
-aol
-aol
+aum
+aum
+aum
alU
aDh
-aDo
+oVG
aFQ
aHe
aIN
aKp
-aLE
+nFq
avH
awg
aPA
@@ -84940,9 +101977,9 @@ bfa
bbq
bct
bfa
-bfa
+kxK
aXQ
-bgw
+lXI
bkE
xzh
xzh
@@ -84957,22 +101994,22 @@ xzh
xzh
xzh
xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
+cgh
+sUX
+sUX
+sUX
+cgh
+bCq
+xyy
+bCq
+bCq
+bCq
+bCq
+aam
+bCq
+bCq
+szE
+bCq
xzh
xzh
xzh
@@ -85158,14 +102195,14 @@ sUX
sUX
sUX
alU
-alF
-anl
+wjQ
+eqG
amC
alU
alU
alU
atT
-asO
+ewE
jHN
fvQ
aKY
@@ -85179,11 +102216,11 @@ aDd
aDd
aFR
aDd
-aDd
+hEl
aJZ
-aMV
+brL
avI
-aOo
+jjA
aPA
aQQ
axa
@@ -85199,7 +102236,7 @@ ewn
rDO
aaj
aXQ
-bgw
+lXI
bkF
xzh
xzh
@@ -85214,22 +102251,22 @@ xzh
xzh
xzh
xzh
+sUX
xzh
xzh
xzh
xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-bvn
+bgR
+bgR
+moU
+bCq
+dWM
+kCR
+efM
+bCq
+ejm
+szE
+bCq
xzh
xzh
xzh
@@ -85423,7 +102460,7 @@ xzh
alU
avV
xHo
-asO
+kxV
atL
mqS
avW
@@ -85438,7 +102475,7 @@ aFY
aDo
poM
aKp
-aLE
+iaT
avJ
aOn
aPA
@@ -85456,7 +102493,7 @@ aXQ
aXQ
aXQ
aXQ
-bgw
+lXI
aPz
xzh
xzh
@@ -85467,26 +102504,26 @@ asN
brJ
bvS
boI
+xzh
+xzh
+xzh
+xzh
sUX
+xzh
+xzh
+xzh
+xzh
+xzh
+xzh
sUX
-sUX
-sUX
-sUX
-sUX
-sUX
-sUX
-sUX
-sUX
-sUX
-sUX
-sUX
-sUX
-sUX
-sUX
-sUX
-sUX
-sUX
-bvq
+bCq
+vTq
+kmT
+hrb
+bCq
+hcF
+szE
+bCq
sUX
sUX
sUX
@@ -85679,7 +102716,7 @@ ali
xzh
ali
fDD
-jHN
+jmp
asO
atL
xIx
@@ -85695,7 +102732,7 @@ aFS
aDo
aIX
aBQ
-aLE
+dDI
avJ
aOp
aPA
@@ -85703,7 +102740,7 @@ aQV
axi
aTz
aTz
-hla
+uBy
aXs
aYH
ydA
@@ -85713,7 +102750,7 @@ bdM
qMm
xSH
aPz
-bgw
+lXI
aPz
blW
blW
@@ -85727,10 +102764,6 @@ blW
xzh
xzh
xzh
-sUX
-xzh
-xzh
-xzh
xzh
sUX
xzh
@@ -85739,15 +102772,19 @@ xzh
xzh
xzh
xzh
-xzh
-sUX
+cgh
+bCq
+dAl
+drz
+joV
+bCq
+ceY
+szE
+bCq
xzh
xzh
-bvq
xzh
xzh
-sUX
-xzh
bJc
xzh
xzh
@@ -85956,11 +102993,11 @@ aNf
avK
awq
aPC
+fob
axl
-axl
-aTz
+gYf
aUp
-hla
+aKm
aXr
aZx
cBh
@@ -85970,13 +103007,13 @@ bdM
pzP
nCT
bhR
-bgw
+lXI
aPz
-blY
+aFn
aFn
blW
bqi
-cyD
+nHP
aZE
cyD
bvS
@@ -85984,10 +103021,6 @@ blW
xzh
xzh
xzh
-sUX
-xzh
-xzh
-xzh
xzh
sUX
xzh
@@ -85997,14 +103030,18 @@ xzh
xzh
xzh
xzh
-sUX
+bCq
+vTj
+vXv
+bCq
+bCq
+tKn
+szE
+bCq
xzh
xzh
-bvq
xzh
xzh
-sUX
-xzh
bJc
sUX
sUX
@@ -86209,59 +103246,59 @@ asZ
aHD
aIZ
aBQ
-aLE
+dDI
avJ
aOq
aPD
aQT
axs
-aTC
+piv
aTC
ffM
aXv
aYS
-aZx
+mmm
bbO
aPA
wzW
hSw
iRI
aPz
-bgw
+lXI
aPz
ajb
aCx
boJ
bql
-brL
+bnw
btr
bnw
bvV
blW
-sUX
-sUX
-sUX
-sUX
-sUX
-sUX
-sUX
-sUX
-sUX
-sUX
-sUX
-sUX
-sUX
-sUX
-sUX
-sUX
-sUX
-sUX
-sUX
-bvq
+xzh
+xzh
xzh
xzh
sUX
xzh
+xzh
+xzh
+xzh
+xzh
+xzh
+xzh
+xzh
+xzh
+xzh
+xzh
+bCq
+bCq
+szE
+bCq
+bCq
+bCq
+bCq
+xzh
sUX
xzh
xzh
@@ -86466,7 +103503,7 @@ asZ
aDo
aIY
aBQ
-aLE
+dDI
avJ
xKU
aPA
@@ -86484,28 +103521,18 @@ aPA
aPz
aPz
aPz
-bgw
+lXI
aPz
ajF
-ofT
-tcM
+sqQ
+kqR
bps
aBD
-ofT
+kri
buB
ash
aZE
xzh
-sUX
-xzh
-xzh
-sUX
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
xzh
xzh
xzh
@@ -86514,10 +103541,20 @@ xzh
xzh
xzh
xzh
-bvq
xzh
xzh
-sUX
+xzh
+xzh
+xzh
+xzh
+xzh
+cgh
+bCq
+bKx
+lKH
+bKx
+bKx
+bCq
xzh
sUX
xzh
@@ -86527,7 +103564,7 @@ xzh
xzh
xzh
bGI
-chN
+uNZ
bGI
xzh
xzh
@@ -86549,7 +103586,7 @@ xzh
xzh
xzh
xzh
-xzh
+sNY
xzh
xzh
xzh
@@ -86723,9 +103760,9 @@ aFU
aDo
aJb
aKp
-aLE
+nFq
avJ
-aOl
+ttD
aPE
aQR
axy
@@ -86745,15 +103782,15 @@ bjl
jbJ
pgb
bmj
-cCo
+aBH
+uQn
lAA
-cCo
-ljK
-ofT
-bvV
+uWN
+ren
+uBB
blW
xzh
-sUX
+xzh
xzh
xzh
sUX
@@ -86766,16 +103803,16 @@ xzh
xzh
xzh
xzh
+xzh
+xzh
sUX
-xzh
-xzh
-xzh
-xzh
-bvq
-uRx
-uRx
-uRx
-sUX
+bCq
+bCq
+bCq
+bHE
+szE
+bCq
+bCq
bCq
bCq
bLv
@@ -86980,9 +104017,9 @@ aDo
aDo
aIU
aKa
-aLE
+pkc
avJ
-aOl
+xZX
aPA
aQU
aQN
@@ -87002,37 +104039,37 @@ aPz
aPz
bkn
bLE
-ofT
-wAB
-ofT
+azA
+jjJ
+gTA
xAA
cCo
ayb
blW
-sUX
-sUX
-sUX
-sUX
-sUX
-sUX
-sUX
-sUX
-sUX
-sUX
-sUX
-sUX
-sUX
-sUX
-sUX
xzh
xzh
xzh
-xzh
-bvq
+cgh
+cgh
+sUX
+sUX
+sUX
+sUX
+sUX
+sUX
+sUX
+sUX
+sUX
+sUX
+sUX
+sUX
+sUX
+sUX
bLv
-bXv
-bLv
-xzh
+bHE
+szE
+dvc
+qAp
bCq
cAy
cAB
@@ -87232,7 +104269,7 @@ aoX
atJ
alU
aDq
-aDo
+fFt
aFZ
aHE
aJc
@@ -87241,7 +104278,7 @@ aLK
xpa
aOr
aPA
-aQN
+ilQ
aQN
aQN
aQN
@@ -87256,20 +104293,24 @@ kYP
bgw
aPz
wtm
-aBD
-bkt
-bmh
-bmO
-bpz
-iTK
-bkt
+aAF
+kNw
+wKl
+boK
+orc
+fkv
+azR
svO
azR
blW
xzh
-xzh
-xzh
sUX
+sUX
+sUX
+sUX
+cgh
+xzh
+xzh
xzh
xzh
xzh
@@ -87281,15 +104322,11 @@ xzh
xzh
xzh
sUX
-xzh
-xzh
-xzh
-xzh
-bvq
bLv
bHE
-bLv
-xzh
+szE
+ead
+ohF
bCq
cAA
vLX
@@ -87298,7 +104335,7 @@ gkk
cAK
cfw
cgC
-ciS
+aAD
ciS
cfw
xzh
@@ -87496,9 +104533,9 @@ aBQ
aBQ
lcp
lAq
-aOo
+dwA
aPA
-aQW
+kMm
aQW
aTD
qQI
@@ -87514,19 +104551,19 @@ aFB
aPz
aAq
aTo
-xGy
+nmf
bmh
rpx
-aKM
+bgh
hEJ
-ofT
-olm
+bgh
+unT
fRc
aZE
lGF
lGF
lGF
-lGF
+pde
lGF
lGF
lGF
@@ -87537,16 +104574,16 @@ xzh
xzh
xzh
xzh
-sUX
-sUX
-sUX
-sUX
+xzh
+xzh
+xzh
+xzh
+cgh
+bLv
+bHE
+szE
+bCq
bCq
-bVy
-bLv
-cyE
-bLv
-bLv
bCq
bCq
bCq
@@ -87568,7 +104605,7 @@ xzh
xzh
xzh
xzh
-sNY
+xzh
xzh
xzh
xzh
@@ -87770,18 +104807,18 @@ aSg
aFB
aPz
aAr
-ofT
-ofT
-bmh
-vpt
+uNa
+xGy
+uUc
+hEJ
elL
czO
lnk
rqr
-qaL
+elL
jSd
aso
-ghJ
+reK
ghJ
xtH
reK
@@ -87794,15 +104831,15 @@ xzh
xzh
xzh
xzh
-sUX
+xzh
xzh
xzh
xzh
bCq
-bVB
-yaq
-vLX
-bYu
+bCq
+bHE
+szE
+bCq
tKn
fcO
cmq
@@ -87962,7 +104999,7 @@ kLu
kLu
ddf
kLu
-bna
+kLu
vWp
aaJ
xzh
@@ -88010,7 +105047,7 @@ phz
lXs
aLL
bDe
-aOl
+mpN
aPF
aQY
aSk
@@ -88027,14 +105064,14 @@ asx
yfx
aPz
bjo
-tcM
-tcM
-bmh
-boK
-aKM
+rQK
+qjz
+sXX
+hEJ
+lsv
fGO
lsv
-hEJ
+kXv
aKd
lGF
cjW
@@ -88051,14 +105088,14 @@ xzh
xzh
xzh
xzh
-sUX
+xzh
xzh
xzh
xzh
bCq
kGD
-vLX
-luh
+oZn
+wST
cpv
luh
luh
@@ -88069,7 +105106,7 @@ vLX
yaq
bCq
cgD
-qhN
+mfu
vLX
cjI
bLv
@@ -88219,7 +105256,7 @@ jNa
jNa
acd
kPB
-uQn
+mwi
xJu
aai
xzh
@@ -88228,10 +105265,10 @@ sUX
xzh
xzh
aiT
-nQs
+sPD
oUf
aqg
-nRj
+pmF
abu
aiT
nmv
@@ -88284,22 +105321,22 @@ aPz
aPz
aPz
epD
-bmh
+yfH
qDq
-bmh
-tcM
+pmK
+tNH
+mTS
+uNc
aKM
-ofT
-ofT
tcM
-ofT
-wst
-kIb
+wet
+dAb
+tmn
lhN
-rfN
bdL
-cdb
-nzu
+bdL
+tAe
+igh
lGF
xzh
xzh
@@ -88308,14 +105345,14 @@ xzh
xzh
aWK
xzh
-gbF
+xzh
xzh
xzh
xzh
bCq
bVE
-vLX
-bUt
+tlo
+rfP
bCq
bCq
bCq
@@ -88326,7 +105363,7 @@ vLX
iOA
bCq
dSN
-qhN
+kZg
vLX
bLu
bLv
@@ -88472,12 +105509,12 @@ sJB
acd
uNf
jNO
-dyj
-dYa
+kUE
+gwy
xuu
cdD
-mTX
-ixi
+cdD
+slj
aai
xzh
xzh
@@ -88490,7 +105527,7 @@ rye
aWA
ptl
aqu
-afu
+nqK
aYp
amG
aXH
@@ -88522,7 +105559,7 @@ kqE
uNm
srx
lXs
-aLE
+tal
aMQ
aOl
aPF
@@ -88541,16 +105578,16 @@ aea
aem
afw
esW
+xmF
+qjz
+bQn
ofT
-ofT
-bmh
-ofT
-aKg
-ofT
-ofT
-ofT
-ofT
-wst
+biv
+xRc
+xRc
+gGO
+sFk
+dAb
kIb
ajO
dpq
@@ -88561,15 +105598,15 @@ lGF
fAr
xUu
fAr
-xUu
+dqk
bGi
bpr
bGi
+nua
qhp
fMX
fMX
qhp
-qhp
bVC
vLX
bWy
@@ -88582,8 +105619,8 @@ mjq
lrN
bCq
bCq
-qhN
-qhN
+vLX
+kZg
vLX
jco
bCq
@@ -88733,8 +105770,8 @@ fgw
xhN
uRJ
cdD
-mWy
-ixi
+aaw
+slj
aai
aai
aai
@@ -88743,13 +105780,13 @@ aai
aai
aiV
hPQ
+dCn
+kPF
aWk
-aWk
-aWk
-aWk
+aCL
iMq
cxJ
-aWk
+vHG
bbJ
aiT
sUX
@@ -88779,7 +105816,7 @@ kQu
nSd
cDI
czK
-aLE
+tuH
aMQ
aNU
aPz
@@ -88807,29 +105844,29 @@ axp
axp
axp
eCg
-lGF
+dAb
tmn
-wRT
-czn
-amH
tAe
-agv
-lGF
+tAe
+amH
+rmT
+igh
+sGr
azs
kbk
azs
-xUu
+fAr
dZC
-ohr
+qwW
aKG
-qhp
+nua
cFl
kjS
kJl
qhp
jCY
-vLX
-luh
+rIV
+qqN
bCq
pAk
tKm
@@ -88840,7 +105877,7 @@ qhN
jyk
qhN
kqZ
-kYN
+vET
kYN
kYN
fbT
@@ -88989,8 +106026,8 @@ ulw
xMe
tRW
jVu
-dJo
-dJo
+bTG
+bTG
mbm
acd
itT
@@ -89003,7 +106040,7 @@ lfG
aWk
acA
ebE
-ptl
+nQs
afu
aZL
tJZ
@@ -89036,7 +106073,7 @@ arP
arP
arP
arP
-olZ
+avi
aMQ
aNT
aPI
@@ -89045,9 +106082,9 @@ aRb
aRb
aRb
aWx
-aPz
+csZ
+abt
abt
-dOq
bxu
acH
adw
@@ -89070,23 +106107,23 @@ jOV
rEJ
hcS
brC
-agv
+tRn
eOx
bHy
aAY
mec
-xUu
+dqk
axm
qFo
rWR
-qhp
+nua
tnL
fdJ
jra
qhp
dOo
-vLX
-luh
+tPu
+mOQ
bCq
fLp
eCU
@@ -89099,7 +106136,7 @@ sAV
tEk
oes
xap
-xap
+vHK
bCq
bCq
bCq
@@ -89224,7 +106261,7 @@ xzh
xzh
bJc
xzh
-aET
+bJc
sUX
aai
qKV
@@ -89245,10 +106282,10 @@ pLk
ulw
ulw
dYa
-xuu
+vMw
gAm
-mWy
-ixi
+aaw
+slj
acd
soI
pqf
@@ -89312,10 +106349,10 @@ aej
afv
bxu
aZE
-bkJ
+blW
bmg
bmH
-bkJ
+blW
aZE
aZE
aZE
@@ -89323,20 +106360,20 @@ aZE
aZE
lGF
wRn
-tDb
-kOT
+oDD
+oDD
tvP
rKp
qOh
-lGF
+sGr
dPn
rcF
nvh
-xUu
-bxy
+dqk
+kMo
bJd
bKm
-qhp
+nua
oqx
tZS
rxu
@@ -89355,8 +106392,8 @@ bCq
bCq
kDt
bCq
-lXI
iga
+opp
bCq
uRx
sUX
@@ -89502,10 +106539,10 @@ nQO
ulw
tJW
jmf
-uRJ
+oBr
uVC
-mWy
-ixi
+aaw
+slj
acd
kcz
pqf
@@ -89564,12 +106601,12 @@ aPz
aPz
aPz
aPz
-rGU
+aPz
qLk
-ffy
+dEV
bxu
bju
-biv
+cyy
bmf
bmt
boN
@@ -89582,7 +106619,7 @@ lGF
lGF
nBq
nBq
-lGF
+pde
imL
lGF
lGF
@@ -89591,7 +106628,7 @@ aiU
dlx
xUu
aHy
-rPi
+ohr
luK
qhp
pBk
@@ -89599,8 +106636,8 @@ oUp
xfV
qhp
bVG
-luh
-luh
+mOQ
+mOQ
bCq
nsM
iMH
@@ -89756,12 +106793,12 @@ aRz
jGK
acd
rwv
-ulw
+lSw
oBO
hZy
hvP
iNO
-oBr
+aaw
jXG
acd
mnV
@@ -89807,14 +106844,14 @@ aFX
aHj
riu
iNM
-aLE
+waL
llv
-aNl
+lqY
aNl
uAu
rHn
aTJ
-aPz
+lVt
xrs
dfx
dfx
@@ -89827,11 +106864,11 @@ ffy
bxu
bgz
biT
-boU
+eil
bmP
buF
-bbR
-bbR
+qAw
+qAw
btu
fWA
jHP
@@ -89848,14 +106885,14 @@ rrm
bxy
bxy
uXt
-byE
+vsg
qcm
qhp
kRc
tYb
nMw
qhp
-bUt
+oMz
bCq
bCq
bCq
@@ -89867,7 +106904,7 @@ bHE
fHt
dCG
bCq
-qhN
+dKs
bLv
xzh
sUX
@@ -90018,8 +107055,8 @@ jNa
jNa
acd
msO
-mWy
-ixi
+aaw
+slj
wwk
iuR
gxj
@@ -90096,8 +107133,8 @@ bxy
eVL
bwV
bzY
-byE
-byE
+fEx
+rfN
xaw
pel
nXj
@@ -90105,14 +107142,14 @@ bEQ
cTl
neo
cnV
-byE
+wUL
swW
qhp
fBm
sNX
wET
qhp
-bUt
+oMz
hFS
iXm
fgW
@@ -90124,7 +107161,7 @@ tbr
nDW
suK
bCq
-qhN
+dKs
bLv
sUX
wba
@@ -90259,10 +107296,10 @@ vhr
wik
vFD
wWc
-sNv
-dyN
-fNk
-fNk
+fRa
+aGS
+czf
+czf
fNk
oQz
fNk
@@ -90307,10 +107344,10 @@ xzh
xzh
uRx
ooW
-aqR
+pCE
axR
bli
-btX
+skL
aph
sXW
vuL
@@ -90321,12 +107358,12 @@ apg
bCx
aps
pLA
-jTW
+rjI
aMU
aLE
aPN
aPK
-aSm
+aTJ
aTK
avD
xPm
@@ -90344,24 +107381,24 @@ bjs
bkx
bmQ
bnA
-brR
+otZ
aLH
brR
aRI
amS
bxA
-byG
+bsw
bwX
byG
byG
bAm
-wCQ
-wCQ
+ryZ
+ryZ
ryZ
jCU
tVY
iWJ
-mJb
+nvt
mJb
lBD
lqC
@@ -90369,7 +107406,7 @@ oCs
rXJ
wrV
vjC
-bUt
+oMz
hFS
iax
hFS
@@ -90381,7 +107418,7 @@ bCq
bCq
bCq
bCq
-qhN
+dKs
bLv
xzh
wba
@@ -90413,7 +107450,7 @@ xzh
xzh
xzh
xzh
-sNY
+xzh
xzh
xzh
xzh
@@ -90516,11 +107553,11 @@ ifM
bfO
ors
acd
+wvp
+aaw
cdD
-aaw
-aaw
mFq
-fNk
+mWy
mwi
aaw
aaw
@@ -90566,7 +107603,7 @@ uRx
arP
arP
arP
-dqd
+aqR
eup
aph
nFa
@@ -90578,9 +107615,9 @@ fXT
mEE
ghm
lsM
-aLE
+aBx
jTW
-aLE
+iPh
aPQ
aPQ
aPQ
@@ -90602,8 +107639,8 @@ cNI
bnG
bnz
bpA
-boU
-bbR
+hRH
+bqs
bqs
bud
bGi
@@ -90614,10 +107651,10 @@ bzF
aUZ
rrz
byE
-byE
+ecj
axk
aAg
-aAg
+eEU
mdj
dPd
eds
@@ -90626,7 +107663,7 @@ qhp
qhp
qhp
qhp
-bUt
+fWK
hFS
qgC
aIi
@@ -90638,7 +107675,7 @@ anq
iiB
wqq
nHF
-qhN
+dKs
bLv
xzh
wba
@@ -90784,10 +107821,10 @@ acd
jpQ
acd
vwH
-ulw
+eWV
nvD
-ulw
-ulw
+eWV
+hmk
dpF
bTG
wkz
@@ -90823,8 +107860,8 @@ xzh
xzh
arP
asQ
-dqd
-eup
+aqR
+aka
aph
xkT
uCC
@@ -90835,9 +107872,9 @@ dhN
ciq
jpp
iNM
-aLE
+pYw
aMV
-aLE
+hkk
aPQ
jVM
aRV
@@ -90883,7 +107920,7 @@ chJ
chJ
jyo
nQl
-bUt
+fWK
hFS
tlT
bYb
@@ -90892,7 +107929,7 @@ rhV
tlT
lIK
vci
-vkx
+omJ
jEc
nHF
bUt
@@ -91044,7 +108081,7 @@ tfH
ulw
ojq
rUx
-ulw
+wJE
aaw
bTG
ixi
@@ -91080,8 +108117,8 @@ xzh
xzh
arP
asP
-dqd
-eup
+aqR
+aka
aph
iNM
iNM
@@ -91092,9 +108129,9 @@ iNM
iNM
iNM
iNM
-aLE
+jdd
jTW
-aLE
+cPl
aSs
dFs
aSt
@@ -91114,10 +108151,10 @@ cNJ
aHm
cNI
bnI
-boR
-bqs
+cyy
+qAw
amR
-bbR
+qAw
nro
eNr
bwd
@@ -91126,7 +108163,7 @@ gQO
iav
bCq
bAn
-axM
+bCq
bxy
jzA
dyL
@@ -91152,7 +108189,7 @@ vci
vkx
jEc
nHF
-qhN
+dKs
bLv
xzh
wba
@@ -91297,11 +108334,11 @@ xTB
fEF
iZl
dHU
-ulw
+wti
ulw
xPd
ulw
-ulw
+wJE
aaw
bTG
mLM
@@ -91337,8 +108374,8 @@ arP
arP
arP
arP
-dqd
-eup
+aqR
+rWg
ahV
xKN
uFm
@@ -91349,7 +108386,7 @@ uQK
sob
uQK
xKN
-olZ
+sHK
gRS
kGQ
aRf
@@ -91370,12 +108407,12 @@ cNG
nXY
bjw
bmk
-bbR
+cyy
boT
aLq
aMP
buI
-bbR
+raZ
rlt
bwd
vyS
@@ -91409,7 +108446,7 @@ gmF
eNP
wqq
nHF
-qhN
+dKs
bCq
xzh
wba
@@ -91554,11 +108591,11 @@ rxD
nQh
iZl
dHU
-dyj
+ohP
fHI
ohj
ohj
-ohj
+qoa
sZT
bTG
kev
@@ -91594,21 +108631,21 @@ arP
asR
tgp
qOM
-dqd
-eup
-bwI
-xKN
+mMr
+skL
+aqR
+uYg
kTm
wJU
gou
nHC
-gou
-gou
+uiu
+tWE
rJn
jkR
dJI
jTW
-aLE
+vJG
aSs
tQk
aSa
@@ -91623,12 +108660,12 @@ nCP
avD
beA
bqp
-cNG
-cNG
+beF
+tPR
fSb
aZK
gby
-fKr
+tcF
fKr
cBq
bbR
@@ -91815,7 +108852,7 @@ smy
ykf
jst
rzh
-ulw
+wJE
aaw
uFU
vHU
@@ -91864,8 +108901,8 @@ hfv
xKN
xKN
qwa
-jTW
-aLE
+ftn
+fuR
aPQ
nTU
aTL
@@ -91886,10 +108923,10 @@ bNH
aZK
bnJ
bty
-bbR
+xxn
boU
dbE
-bty
+aIH
otc
bwd
wTw
@@ -91923,7 +108960,7 @@ bCq
bCq
bCq
bCq
-qhN
+dKs
bCq
xzh
sUX
@@ -91965,7 +109002,7 @@ xzh
xzh
xzh
xzh
-xzh
+sNY
xzh
xzh
xzh
@@ -92072,7 +109109,7 @@ hou
jst
fbW
rzh
-ulw
+wJE
aaw
dJo
ixi
@@ -92106,10 +109143,10 @@ hxU
aqS
arP
gpE
-gpE
+rYj
arP
qKp
-pmF
+dJG
aph
gvi
iLX
@@ -92120,7 +109157,7 @@ dPq
iaz
ses
xKN
-aHQ
+wUU
qPT
aHQ
aPQ
@@ -92128,7 +109165,7 @@ aSs
aSs
aSs
avD
-bCA
+mPr
bbQ
orS
rbC
@@ -92137,15 +109174,15 @@ gcO
avD
bHg
aZK
-cNI
+spp
sWg
-cNI
+spp
aZK
-bnK
-bnK
+xpH
+iUK
bqu
aNL
-bnK
+yfw
bnK
gyA
bwe
@@ -92328,8 +109365,8 @@ acd
dyj
vlB
vlB
-ulw
-ulw
+lSw
+gTy
aaw
iPV
qtN
@@ -92348,7 +109385,7 @@ uHF
ahq
jrG
hdl
-wfy
+jak
uvz
qWw
lQn
@@ -92377,37 +109414,37 @@ amM
xsA
nJx
xKN
-aMm
-ova
+qGU
+hda
aki
aRh
-aJq
-aJq
-aJq
+dDo
+quD
+dDo
ayM
-aJq
-aJq
-aJq
-bBi
+lLG
+eCW
+eCW
+meW
bYr
-bmE
+bGf
sDb
dMb
+oXv
bfo
-bfo
-bfo
+sQR
bfo
bmn
bfo
boW
bmE
aOv
-btz
-btz
+sea
+rsJ
bwf
vFS
btz
-bBh
+rba
bBh
bCr
bAK
@@ -92634,7 +109671,7 @@ dAA
dfN
aRv
hVw
-aJq
+aMg
bUm
izp
aTh
@@ -92648,9 +109685,9 @@ uAz
uAz
uAz
sPz
-uAz
+bco
nGh
-uAz
+tGt
ivV
iCx
bjx
@@ -92661,11 +109698,11 @@ aTh
aOx
aTh
aTh
-aTh
+wbl
muM
-aTh
+fcr
bAe
-aJq
+bOP
bCq
bCq
bCq
@@ -92683,15 +109720,15 @@ ucs
bHE
cay
tau
-bWB
-bWB
+oEb
+xNd
bYz
bYz
cag
cbl
bYz
-bWB
-bWB
+oEb
+xNd
tau
cax
cbx
@@ -92858,7 +109895,7 @@ wek
hOM
vij
osW
-gRX
+kHg
bqU
mtZ
aiB
@@ -92894,35 +109931,35 @@ xKN
mmf
aaa
nZd
+cOJ
aLX
+cOJ
aLX
-aLX
-aLX
-aLX
-aJq
-aYl
-aYl
-aYl
-aYl
-aYl
-aYl
+cTL
+aKE
+bNZ
+bmR
+cOJ
+bmR
+cOJ
+mpB
svg
bgG
bid
-aYl
+wGY
aHn
-msR
+kOK
bnN
boY
bqw
-aJq
-aJq
-aYl
+ovZ
+nRP
+wAk
uGq
oXL
-lfF
+gvr
ova
-gcm
+wIc
aJw
xzh
xzh
@@ -92962,7 +109999,7 @@ tau
ciN
chE
ckH
-ckH
+brb
cji
cDZ
cro
@@ -93127,7 +110164,7 @@ agj
agj
agj
arP
-aDt
+tVr
wYB
dUq
aYZ
@@ -93150,14 +110187,14 @@ qsj
xKN
iPw
aaa
-sRO
+aMj
aJn
aJn
aJn
aJn
-aJs
+cLT
aJq
-aYk
+rcZ
aZM
aZM
bbW
@@ -93177,9 +110214,9 @@ aJn
aJn
adS
aJw
-aJq
+hLV
ova
-byU
+qRy
aJw
xzh
bEU
@@ -93200,9 +110237,9 @@ tau
bWC
bXz
bYA
-bXC
-bWB
-bXC
+ujM
+lEw
+nJS
ccf
cdc
cdZ
@@ -93219,7 +110256,7 @@ cjJ
cnY
kja
cBO
-cgR
+vfV
cDB
cqP
cro
@@ -93384,7 +110421,7 @@ vad
aqo
atm
arP
-aqh
+iwY
wYB
avR
agR
@@ -93398,8 +110435,8 @@ blU
aph
aph
ayL
-xKN
-xKN
+ayL
+wdF
ayL
ayL
ayL
@@ -93407,13 +110444,13 @@ ayL
ayL
xOy
aaa
-aOE
+wYS
aJn
xzh
xzh
aJn
aJs
-aJq
+doK
aYn
aZM
aZu
@@ -93434,9 +110471,9 @@ bqy
buK
bqy
aJw
-aJq
+nkG
ova
-aJq
+egI
aJw
xzh
bEU
@@ -93455,9 +110492,9 @@ gNH
cay
tau
lTE
-bXC
-bXC
-bXC
+xcR
+xcR
+oUo
tOU
bXC
bWB
@@ -93476,7 +110513,7 @@ cjJ
ckH
kja
cgR
-cgR
+vfV
cqx
cqR
crp
@@ -93641,7 +110678,7 @@ fwV
mVz
ask
arP
-aDt
+sKu
wYB
aUf
kTa
@@ -93656,27 +110693,27 @@ hHe
awj
oDo
lDS
-aio
+xBm
kkX
wNT
-wdF
+eQT
cnu
ayL
-aJq
+kWG
aaa
-aOE
+aJu
aJn
xzh
xzh
aJw
-aVb
-aWH
+aVu
+aYm
aYm
aZM
aZq
-bbX
-bbX
-bbX
+pHq
+yel
+aTY
bfp
aZP
aZP
@@ -93691,7 +110728,7 @@ bmr
bmr
bmr
bmr
-byN
+iEr
jpA
rPt
aJw
@@ -93714,9 +110751,9 @@ tau
bWE
bXB
bYC
-bWB
-bWB
-bXC
+cyH
+ooX
+eRD
cch
cde
ceb
@@ -93898,7 +110935,7 @@ vad
bXN
iXk
arP
-aqh
+aDt
wYB
dtc
ayw
@@ -93914,10 +110951,10 @@ apy
ayL
fUQ
atl
-atl
+jLE
bfS
-aio
-aio
+wwg
+lhB
bIG
kDi
aaa
@@ -93931,7 +110968,7 @@ aWJ
aVd
aZM
aZz
-baI
+bca
bda
bda
bca
@@ -93948,7 +110985,7 @@ btB
buM
bwi
bmr
-aJq
+nkG
ova
prY
bCs
@@ -93964,7 +111001,7 @@ yaw
oiA
gzn
cce
-unM
+gQP
unM
jsk
tau
@@ -93972,7 +111009,7 @@ bWG
bXD
bYz
bYz
-bWB
+ntA
cSE
bYz
cdf
@@ -93990,7 +111027,7 @@ cjJ
coa
coJ
clJ
-clJ
+rcw
cig
cig
ccw
@@ -94170,15 +111207,15 @@ arP
blU
ayL
lRl
-atl
+ntX
vxy
aBr
eQT
lIW
nGv
-lfF
+eVG
ayI
-sRO
+aMj
aJn
xzh
xzh
@@ -94191,7 +111228,7 @@ aZy
bay
bcZ
bdY
-bdF
+bca
bgI
aZP
bjC
@@ -94199,15 +111236,15 @@ czh
bmo
bnO
bpb
-bqz
-bqq
-brS
+kLq
+ido
+kNY
bsY
bue
bmr
-aMn
-ova
-aJq
+kpz
+iPq
+rPN
bCs
bDv
bEX
@@ -94226,14 +111263,14 @@ bCq
lBe
tau
kPm
-bWB
+xNd
bYz
bWI
uti
bWI
bYz
-bWB
-bWB
+oEb
+xNd
tau
cay
tau
@@ -94407,7 +111444,7 @@ otu
vnk
jQY
flQ
-ukX
+eDf
vad
mWI
atm
@@ -94417,7 +111454,7 @@ gnf
wYB
qnX
oSg
-mkk
+clr
mkk
wYB
anY
@@ -94428,14 +111465,14 @@ mzm
ayL
syF
aBu
-gBz
+cMv
gIV
-aio
-aio
+kbm
+aly
nGv
cpE
ayI
-aOE
+wYS
aJn
xzh
aPR
@@ -94448,7 +111485,7 @@ bbX
bay
bbM
bcN
-bdK
+bca
bgL
aZP
aZP
@@ -94504,7 +111541,7 @@ qzF
kcN
bkR
blg
-cgR
+sKW
cqA
cqT
phi
@@ -94670,7 +111707,7 @@ mVz
cQt
urb
nTO
-bgU
+sIo
wYB
cLl
hhs
@@ -94686,13 +111723,13 @@ ayO
frW
kti
gah
-aYt
-dfC
-axL
+eQT
+eQT
+eQT
ayL
cIL
bBi
-aOE
+aJu
aJn
xzh
aPR
@@ -94702,11 +111739,11 @@ aTW
aYq
aZP
aZC
-baK
+bca
bbC
bbC
-bdI
-bbX
+bca
+mhG
eHw
bjE
eoi
@@ -94714,14 +111751,14 @@ bmo
tQM
bpd
bqz
-bqq
+ido
btC
buN
brS
bmr
byP
-ova
-lfF
+hda
+gTS
bCs
bDw
mXz
@@ -94733,7 +111770,7 @@ bLy
bCs
cCe
bNJ
-bKx
+bNJ
cjL
gWd
bCq
@@ -94762,16 +111799,16 @@ cgw
cMm
blo
cMm
-ccw
-ccw
-ccw
+egk
+egk
+egk
crK
-ccw
+egk
cMm
crK
cMm
cMm
-ccw
+egk
xzh
sUX
xzh
@@ -94927,7 +111964,7 @@ fqg
aHR
urb
hEP
-bgU
+sIo
wYB
gyW
mCP
@@ -94937,8 +111974,8 @@ wYB
qWV
bPe
rIv
-ayL
-ayL
+arP
+ayU
ayL
ayL
aNX
@@ -94948,8 +111985,8 @@ ayL
ayL
ayL
aMm
-bBi
-aOE
+opl
+sSp
aJn
xzh
aPR
@@ -94960,25 +111997,25 @@ aYs
aZQ
bbi
bde
+lMw
+bzC
bcd
-bcd
-bcd
-bcd
-bcd
-bcd
-bcd
+eTP
+lMw
+scO
+usL
bms
bwl
aKi
bqC
-bwl
+jLB
btE
bwl
bwl
bxG
byR
aTh
-aJq
+egI
bCs
bDz
qTL
@@ -95028,14 +112065,14 @@ cFb
cFu
cFI
cGd
-ccw
-ccw
-ccw
-ccw
-ccw
-ccw
-ccw
-ccw
+egk
+egk
+egk
+egk
+egk
+egk
+egk
+egk
sUX
bJc
bJc
@@ -95194,9 +112231,9 @@ wYB
fXn
iwB
hhs
+arP
+ayU
ayL
-nFq
-atl
whr
jfp
efb
@@ -95220,7 +112257,7 @@ bcc
bdd
gzV
fCz
-bbX
+bdF
bif
aZM
aZM
@@ -95235,7 +112272,7 @@ bmr
bmr
byQ
ova
-aJq
+roX
bCs
oTb
bFb
@@ -95272,7 +112309,7 @@ cTb
rdP
amT
cgR
-ccw
+egk
coM
cnx
cqb
@@ -95290,9 +112327,9 @@ cgx
jMY
csd
cHa
-csd
+tAQ
uhH
-ccw
+egk
xzh
bJc
kBu
@@ -95432,43 +112469,43 @@ dHf
ttn
ttn
jUG
-jUG
+nSo
xBJ
flQ
-ukX
+eDf
oAx
iwL
kMX
urb
hEP
-bgU
+sIo
wYB
apY
wCe
bbc
-nJJ
+arR
wYB
fXn
gNu
agw
+arP
+ayU
ayL
-aBP
-atl
hBN
upY
-auh
+gBz
sjA
-aBt
+jPJ
xzh
aJn
-aJq
+cuk
gSY
-aOE
+iAm
aPT
pRx
aRj
aTV
-aVl
+srb
aWP
aYu
bfv
@@ -95490,7 +112527,7 @@ xzh
sUX
aJn
rKW
-aXf
+feF
ova
byV
bCs
@@ -95504,7 +112541,7 @@ bHO
bCs
cCd
cCd
-aYg
+bNJ
bNJ
cCc
bCq
@@ -95547,9 +112584,9 @@ cGH
fsQ
bmw
cGR
-csd
-csd
-ccw
+tAQ
+tAQ
+egk
xzh
bJc
kBu
@@ -95698,7 +112735,7 @@ tHT
pQs
urb
nTO
-bgU
+mum
wYB
wYB
ata
@@ -95708,19 +112745,19 @@ wYB
wYB
wYB
wYB
-ayL
+arP
ayU
-atl
+ayL
aoa
-azO
-ayW
+aio
+oWr
qFL
ayL
aJn
aJn
-aJq
+eGd
bBi
-aOE
+aJu
aPS
aRi
aSu
@@ -95747,7 +112784,7 @@ aJw
aJw
aJw
rKW
-aXf
+feF
jpA
byU
bCs
@@ -95802,11 +112839,11 @@ cGe
cGv
cGI
cGS
-cGS
+biL
ciZ
ciZ
oDF
-ccw
+egk
xzh
bJc
kBu
@@ -95965,9 +113002,9 @@ tme
tGP
eiK
aAb
+arP
+ayU
ayL
-azY
-azW
tHB
afP
aFb
@@ -95977,17 +113014,17 @@ aJp
aKE
aMa
qEJ
-aOE
-aPU
+wYS
+aPS
aRl
aSx
-aTX
-aVl
+baK
+bdI
aWR
bfv
aZS
-aZR
-aZR
+qRm
+sgg
bbm
beh
bfv
@@ -96006,7 +113043,7 @@ aJw
aJw
fhG
ova
-aJq
+fcy
bCs
coT
aWg
@@ -96030,7 +113067,7 @@ xnG
bVd
aiI
fgm
-kjh
+nIW
bWK
bYp
bCq
@@ -96043,7 +113080,7 @@ ckI
lZH
cTf
cgR
-ccw
+egk
cDh
cDp
cDv
@@ -96063,7 +113100,7 @@ cGS
cAu
cAu
oYm
-ccw
+egk
xzh
bJc
kBu
@@ -96222,31 +113259,31 @@ avt
mAo
wPC
uLZ
+arP
+gqw
ayL
ayL
pXD
yhM
-yhM
-ayL
ayL
ayL
aJo
lfF
aLZ
dSx
-sRO
-aPS
+aMj
+aPU
aRk
aSw
-ngl
+aTZ
aVl
aWQ
bfv
-aZR
-aZR
-aZR
-aZR
-aZR
+qJs
+baI
+wpB
+sRc
+mnX
bft
uEe
xbg
@@ -96263,7 +113300,7 @@ uzr
aJw
byS
ova
-aJq
+geg
bCs
bCs
bCs
@@ -96280,13 +113317,13 @@ bNI
bNI
bCq
xPV
-bQg
+daL
caH
cls
gxT
-bQg
-bQg
-bQg
+fxx
+aBt
+daL
bVc
bWJ
bYn
@@ -96300,7 +113337,7 @@ ckK
rdP
bic
cBO
-ccw
+egk
chV
cDp
cqf
@@ -96314,13 +113351,13 @@ cMD
cFM
czE
kQq
-ccw
+egk
cGT
-csd
-csd
-csd
-csd
-ccw
+tAQ
+tAQ
+tAQ
+tAQ
+egk
xzh
bJc
kBu
@@ -96480,26 +113517,26 @@ tHc
dbK
wUf
ayY
+xug
+hGn
azZ
+jbt
+jbt
azZ
-azZ
-azZ
-azZ
-sNU
kKk
kCi
aJq
aMc
gfO
-aOE
+wYS
aPS
aRn
aSz
-aTY
-aVl
+iLf
+czD
aWT
bfv
-aZR
+ktm
aCE
aCN
tVc
@@ -96523,25 +113560,25 @@ raE
bBq
bCu
bSA
-bSA
-bSA
+obH
+eJr
bFj
-bSA
+nLs
wGp
bHR
bIe
-bSA
+eRo
bJz
-bSA
-bSA
-bSA
+rts
+nLs
+hct
ogG
eNI
bLI
-bSA
+rGr
bDG
-eNI
-bLI
+mHL
+oLY
bSR
bUl
bVf
@@ -96573,11 +113610,11 @@ csH
csR
cMm
cGU
-csd
-csd
+tAQ
+tAQ
cHo
-csd
-ccw
+tAQ
+egk
xzh
bJc
kBu
@@ -96737,7 +113774,7 @@ pKi
xOZ
pKi
nFQ
-pQf
+xug
pQf
pQf
pQf
@@ -96748,11 +113785,11 @@ aWE
bBi
qWq
sGk
-aOE
+aJu
aPS
aRm
aSy
-aTX
+edH
aVk
aWS
aYw
@@ -96777,9 +113814,9 @@ kYk
ntZ
bvW
bAf
-bBp
+oks
pfu
-cau
+jrk
cau
cau
bSw
@@ -96795,9 +113832,9 @@ cBH
cau
cau
cau
-cau
+eDv
cbD
-cau
+jrk
cau
bSw
cbr
@@ -96830,11 +113867,11 @@ eIE
cSI
cMm
cGV
-csd
+tAQ
cGV
noK
dJk
-ccw
+egk
xzh
bJc
kBu
@@ -96994,12 +114031,12 @@ pwd
vPx
bBL
ayZ
-aAa
-aAa
-aAa
+vPx
+vPx
+vEh
atj
-brt
-aAa
+azY
+vPx
pzW
aJt
aJq
@@ -97013,7 +114050,7 @@ aTZ
ayd
aWV
bfv
-aZR
+kbu
aCF
aCP
jMm
@@ -97034,7 +114071,7 @@ vAv
knx
bwh
hDI
-aXf
+qIB
bzG
bHP
bCp
@@ -97042,20 +114079,20 @@ bYI
bFq
bGO
bHl
-bLI
-bLI
+aWH
+uSS
bLI
bOR
bQg
bQg
-bQg
-bQg
-bQg
-bQg
-bQg
+uqU
+jiB
+xoL
+xoL
+tBQ
rkv
vjY
-bQg
+bQf
bjy
cbt
bVh
@@ -97086,12 +114123,12 @@ cFP
csI
cAt
cMm
-csd
-csd
-csd
+tAQ
+tAQ
+tAQ
cHp
-csd
-ccw
+tAQ
+egk
xzh
bJc
kBu
@@ -97234,7 +114271,7 @@ aIF
qEg
tqB
bUe
-ukX
+eDf
agj
aml
qGW
@@ -97262,19 +114299,19 @@ oHk
aJq
aMd
gRd
-aOE
-aPS
+aJu
+aPU
blN
aSA
iLf
-ayd
+rVK
aWU
bft
+hmm
aZR
-aZR
-aZR
-aZR
-aZR
+kQU
+srS
+fZt
bfw
yeY
xbg
@@ -97301,10 +114338,10 @@ bJq
bzs
bLH
bRq
-bNO
+kjh
bOQ
bQf
-bRq
+bQf
bNO
bTK
bUE
@@ -97321,8 +114358,8 @@ bYG
cfb
cfb
eSV
-cfc
-cfc
+aLR
+aLR
cfb
cfb
ccw
@@ -97342,13 +114379,13 @@ cMD
cFM
czE
kQq
-ccw
+egk
cGT
-csd
-csd
-csd
-csd
-ccw
+tAQ
+tAQ
+tAQ
+tAQ
+egk
xzh
bJc
kBu
@@ -97477,7 +114514,7 @@ adR
aaZ
qXa
jgL
-jgL
+dGq
vLz
nvX
mlh
@@ -97497,7 +114534,7 @@ amn
spV
gDr
bwB
-bwB
+mmZ
tkk
mAr
icQ
@@ -97506,21 +114543,21 @@ dMS
ajg
frn
awn
-lTb
+aAb
bYy
-vEh
+ffV
aBz
cvP
tti
eys
rAC
cvP
-aJu
+vWE
aKF
aMf
vEF
aOE
-aPU
+aPS
aRr
aSD
ceh
@@ -97528,10 +114565,10 @@ aVp
aWX
bfv
aZU
-aZR
-aZR
-bbm
-beh
+mKW
+xvb
+wWh
+wfJ
bfv
urc
xbg
@@ -97546,7 +114583,7 @@ iLJ
tFu
aJw
aJw
-lfF
+oXx
ova
bBy
bCv
@@ -97605,7 +114642,7 @@ cGS
cHj
cGS
ciZ
-ccw
+egk
xzh
bJc
kBu
@@ -97774,9 +114811,9 @@ uUe
cvP
aJn
aJn
-aJq
+aMg
bBi
-aOE
+aJu
aPS
aRq
aSC
@@ -97787,7 +114824,7 @@ bfv
bfv
bbn
bnt
-bbm
+fHx
beg
bfv
urc
@@ -97803,7 +114840,7 @@ aJw
aJw
aJw
wOm
-aJq
+ofx
ova
bBt
bCv
@@ -97862,7 +114899,7 @@ cGS
ciZ
ciZ
oDF
-ccw
+egk
xzh
bJc
kBu
@@ -97996,7 +115033,7 @@ kVz
gdu
kct
snY
-alt
+aaZ
fZk
vEA
guI
@@ -98005,7 +115042,7 @@ agn
tbC
tqB
bUe
-ukX
+eDf
ayT
aiX
aiX
@@ -98017,7 +115054,7 @@ grR
nmM
aqa
asg
-asg
+dYJ
hQK
qcV
dFo
@@ -98031,9 +115068,9 @@ uUe
agm
xzh
aJn
-aJq
-gSY
-aOE
+xzW
+hjG
+iRV
aPS
aRs
aSE
@@ -98060,9 +115097,9 @@ xzh
sUX
aJn
nVk
-aJq
+ofx
ova
-aXf
+vpG
bCv
bDK
bFi
@@ -98114,12 +115151,12 @@ cFT
cSK
cGx
cGK
-nzh
+bqd
nzh
cGY
-csd
-csd
-ccw
+tAQ
+tAQ
+egk
xzh
bJc
kBu
@@ -98264,10 +115301,10 @@ tqB
aBS
gDW
cxS
+vPf
cxS
cxS
cxS
-igk
ark
vvD
cQe
@@ -98288,7 +115325,7 @@ lUa
agm
xzh
aJn
-aLY
+aYm
swA
aOG
aPR
@@ -98297,14 +115334,14 @@ aPR
aUb
aVq
aWM
-aYr
+wnN
aZV
bbo
bch
bdi
bei
bfy
-bbw
+mEJ
bik
aZV
aZV
@@ -98317,7 +115354,7 @@ bsh
bsh
bsh
bqH
-aJq
+hLf
ova
rwD
bCv
@@ -98356,7 +115393,7 @@ ckO
bVF
biA
cny
-ccw
+egk
cip
bEJ
cDx
@@ -98370,13 +115407,13 @@ cAr
cqb
cGh
cGC
-ccw
+egk
ijc
-csd
+ciZ
cEk
-csd
+tAQ
udp
-ccw
+egk
xzh
bJc
kBu
@@ -98506,7 +115543,7 @@ adR
lSJ
vHb
xeM
-pIy
+ygn
jvR
oAN
ngw
@@ -98547,7 +115584,7 @@ aJw
aJw
beX
iEH
-aOE
+vMq
aJn
xzh
aPR
@@ -98561,7 +115598,7 @@ aGv
rQo
bek
bfB
-bbw
+ngl
ygs
bjF
aZV
@@ -98574,7 +115611,7 @@ eqs
btd
bwr
bqH
-aJq
+aMg
ova
cCk
ijG
@@ -98627,13 +115664,13 @@ cFy
cBR
cGi
cGD
-ccw
-ccw
-ccw
-ccw
-ccw
-ccw
-ccw
+egk
+egk
+egk
+egk
+egk
+egk
+egk
sUX
bJc
bJc
@@ -98804,7 +115841,7 @@ aJv
bCA
aMg
icV
-aOE
+aJu
aJn
xzh
aPR
@@ -98814,12 +115851,12 @@ aWZ
aYq
aZV
aZG
-bbw
+tid
jAi
roW
bfA
-bbw
-bbw
+qaE
+rxG
bej
blb
bmy
@@ -98831,9 +115868,9 @@ btH
btc
bwq
bqH
-aJq
-ova
-aXf
+xzW
+iPq
+wTm
bCv
gqg
cAL
@@ -98874,12 +115911,12 @@ cqP
cMm
eSQ
cqa
-cig
-ccw
-ccw
+dfH
+egk
+egk
czF
-csd
-csd
+tAQ
+tAQ
cFz
cFU
cGj
@@ -99025,14 +116062,14 @@ iVu
uXY
iVu
abo
-tVr
+wPx
iVu
egw
eeU
adR
qEg
aEh
-ukX
+eDf
vad
hiC
cjX
@@ -99049,7 +116086,7 @@ asl
aAX
mib
dFo
-ffV
+bbl
ath
aSv
azc
@@ -99058,8 +116095,8 @@ aFe
azc
aHT
aJy
-aJy
-aMj
+aKE
+aJq
wyl
sRO
aJn
@@ -99133,14 +116170,14 @@ blt
cDz
cDH
cMm
-csd
+tAQ
crM
crV
crV
cFA
bmq
cGk
-ccw
+egk
xzh
xzh
xzh
@@ -99306,7 +116343,7 @@ dFo
dFo
dFo
dFo
-bbl
+ffV
nMd
lvJ
eTt
@@ -99316,9 +116353,9 @@ fDX
aHH
aJg
aKo
-aLO
+lTb
gWZ
-aOE
+aJu
aJn
xzh
xzh
@@ -99333,8 +116370,8 @@ bbZ
bcP
cBo
nxQ
-nxQ
-aGv
+lFK
+nFi
aZV
bmA
bmx
@@ -99345,8 +116382,8 @@ btJ
buV
bws
bqH
-aJq
-ova
+qSB
+hda
byW
bCv
vHB
@@ -99397,7 +116434,7 @@ cse
cse
csu
cGl
-ccw
+egk
xzh
xzh
xzh
@@ -99527,7 +116564,7 @@ adR
adR
adR
adR
-vPU
+xjQ
jaY
iVu
aUl
@@ -99562,7 +116599,7 @@ amY
aoH
bYy
cxW
-azc
+snH
aws
akV
aNS
@@ -99573,7 +116610,7 @@ aAh
aAh
aAh
aAh
-aLR
+iEr
jpA
aOE
aJn
@@ -99588,7 +116625,7 @@ bbv
bcm
bcm
bem
-thn
+kzQ
bgW
thn
aGw
@@ -99602,7 +116639,7 @@ btL
buY
buY
bqH
-aMm
+iLE
ova
qvD
bCv
@@ -99616,9 +116653,9 @@ bLK
bMN
bNV
rid
-bQo
-bRz
-bSH
+bOd
+bOd
+bOd
bOd
cdz
bbp
@@ -99646,15 +116683,15 @@ mBQ
ckH
cjh
bmb
-ccw
-ccw
-ccw
-ccw
-ccw
+egk
+egk
+egk
+egk
+egk
cMm
cMm
cMm
-ccw
+egk
sUX
bgR
bgR
@@ -99832,22 +116869,22 @@ aJz
aAh
aLQ
bUm
-aOE
+aJu
aJn
xzh
xzh
aJw
aVu
aXd
-aYE
+aYm
aZV
lwp
-bbw
-bbw
-bbw
+bdK
+bAd
+uuM
bbw
bxg
-bbw
+dDM
bjH
yfk
qXD
@@ -99859,9 +116896,9 @@ btL
buX
buX
bqH
-aJq
+ygX
ova
-bBy
+ouj
bzs
bAw
tud
@@ -99874,8 +116911,8 @@ bMM
alX
pEY
bOd
-bRy
-bSG
+bOd
+bOd
bOd
bUK
bVT
@@ -100160,9 +117197,9 @@ coZ
cjc
cjc
vAw
-cgR
+jMd
xNc
-cgR
+jHp
crX
bYS
bFQ
@@ -100181,7 +117218,7 @@ xzh
xzh
xzh
xzh
-sNY
+xzh
xzh
xzh
xzh
@@ -100340,18 +117377,18 @@ aNS
aAh
hwE
cFF
-hwE
+oZk
jbp
-hwE
+vRs
aAh
ioJ
ova
-aOE
+aJu
aJn
aJn
aJn
aJn
-aJs
+gKx
ayJ
aYk
aZV
@@ -100373,7 +117410,7 @@ btM
bqH
bqH
bqH
-aJq
+ygX
jIN
aXf
bzs
@@ -100395,7 +117432,7 @@ bUL
bVU
ccy
bXR
-bYQ
+pdm
bYQ
wWE
cbz
@@ -100417,7 +117454,7 @@ cpa
cgR
cqo
ccw
-cjk
+ccw
cjm
ccw
ccw
@@ -100599,38 +117636,38 @@ jms
tdz
aGm
aEr
-aEr
+cdq
qJG
qel
ova
-aJq
-aJr
-aJr
-aJr
+mHu
aJr
+tLz
aJr
+tLz
+pFi
aXh
-aYG
+hyL
aZY
-aYG
+eSi
aYG
bdn
bep
-aYG
+grw
jvL
rrc
-aYG
+aPu
ble
xDS
-bmE
+aVb
bqL
-kZr
+kkr
bsp
btO
wNj
ttj
-bmE
-bmE
+vPg
+oOE
nEN
vFm
kLd
@@ -100652,7 +117689,7 @@ bOd
bVX
bMK
bMK
-bYR
+bMK
bMK
bMK
bMK
@@ -100703,7 +117740,7 @@ xzh
xzh
xzh
xzh
-xzh
+sNY
xzh
xzh
xzh
@@ -100816,7 +117853,7 @@ oyM
abV
qIc
vjN
-qqw
+mhm
act
qqw
acu
@@ -100867,9 +117904,9 @@ lUZ
lUZ
lUZ
ova
-kpM
+xZv
sJq
-lUZ
+bsb
fjm
eGU
gBO
@@ -100879,9 +117916,9 @@ lUZ
lUZ
lUZ
fBf
-lUZ
+mIM
+sJq
bsb
-lUZ
nPY
ova
qbj
@@ -100889,7 +117926,7 @@ lUZ
lUZ
lUZ
lKj
-aJq
+sBJ
uHR
bzs
bFo
@@ -100928,14 +117965,14 @@ bOh
bOh
efp
pcr
-bEW
+ezi
cqp
ccw
ntP
xNc
uTd
mOX
-ciZ
+dou
cAR
bgR
xzh
@@ -101095,12 +118132,12 @@ apw
wHs
ajm
fQj
-gLS
+uVV
ife
kFE
amr
amY
-hys
+psG
aup
bYy
awv
@@ -101110,44 +118147,44 @@ sed
aBz
aAh
aGn
-aGn
-aGn
+rnb
+xgM
aAh
-feM
+fbH
aAh
-aJq
-aJq
-aJq
-aJq
+xzW
+tTR
+ujY
+fit
aRt
-aJq
-aJq
+fit
+ujY
wKH
fES
-aJq
-aLY
-aJq
+dvi
+qSs
+rON
bcp
-ova
+hjN
beq
-aJq
+aYl
msR
-aJq
-aJq
-aJq
+dQd
+ybR
+dQd
boV
-aJq
+uLM
mDe
-aJq
-aXf
-aJq
+xzW
+boY
+qZy
koN
-aJq
-lfF
-aJq
-aJq
-aJq
-bCA
+aYl
+mRP
+aYl
+plW
+ips
+mPr
bzs
caS
dld
@@ -101183,8 +118220,8 @@ dHb
clW
clW
bOh
-kmT
-hiw
+efp
+buf
bEW
ddn
ccw
@@ -101338,7 +118375,7 @@ vjN
vjN
jUX
iVu
-iVu
+cbc
pzm
eyQ
xux
@@ -101367,10 +118404,10 @@ sed
mrt
aAh
alg
-qWa
aDT
+uMX
lIJ
-hwE
+xtv
aAh
aJC
aJC
@@ -101384,13 +118421,13 @@ aJC
aQg
aJC
aJC
-gSC
+gsy
cRi
gSC
bfF
-bfF
-bfF
-bfF
+eme
+nCS
+eme
bfF
bfF
bfF
@@ -101440,7 +118477,7 @@ ijY
clV
cmV
bOh
-kmT
+efp
buf
bEW
ctY
@@ -101448,7 +118485,7 @@ ccw
cqY
cqY
cDN
-cig
+ccw
xzh
xzh
xzh
@@ -101624,7 +118661,7 @@ sed
aBA
aAh
elT
-aGp
+rgC
aGp
aAh
dlY
@@ -101642,8 +118679,8 @@ aPZ
baa
aJC
ikq
-iKz
-aYV
+gvk
+gbb
bfF
nQI
bio
@@ -101657,14 +118694,14 @@ fic
hTU
uRm
bwx
-bwx
-bwx
-bwx
+jWk
+jWk
+jWk
vmn
bzI
bAX
bCF
-bwx
+jWk
bFB
bRa
bKJ
@@ -101697,17 +118734,17 @@ jlL
clW
clW
bOh
-kmT
+efp
buf
bZx
-ddn
+jXp
+xKB
+rdx
+bJX
+roC
qhj
xzh
xzh
-xCD
-xzh
-xzh
-xzh
xzh
bMb
xzh
@@ -101900,7 +118937,7 @@ aZZ
aJC
vNt
iKz
-aYV
+oij
bfF
wDJ
bin
@@ -101912,8 +118949,8 @@ nlN
bpD
bqO
bLX
-bui
-bui
+mDT
+ufQ
bui
bui
aUm
@@ -101955,14 +118992,14 @@ bOh
bOh
bOh
efp
-fvd
+buf
bEW
-bLt
-qhj
-xzh
-xzh
+bEW
+bEW
+bEW
+fvd
xCD
-xzh
+bLt
xzh
xzh
xzh
@@ -102157,7 +119194,7 @@ bac
aJC
hXL
iKz
-aYV
+bet
bfF
bnD
mWw
@@ -102170,7 +119207,7 @@ bpM
bqT
jtt
bJG
-bip
+ttA
bip
bip
wjL
@@ -102212,14 +119249,14 @@ clZ
clZ
bOh
xWd
-qyP
-aam
-vTj
-qhj
-qyP
-qyP
+buf
+bEW
+bEW
+bZx
+bEW
+fvd
uhZ
-qhj
+bLt
xzh
xzh
xzh
@@ -102412,12 +119449,12 @@ moN
moN
bab
aQg
-aYV
+mNv
iKz
-ber
+oij
bfF
bhb
-owD
+pJa
bjO
vGg
owD
@@ -102427,20 +119464,20 @@ bpF
bqS
hTU
xfl
-bip
-bip
+opE
+sMi
bCL
-sLX
+izQ
dHL
-bxb
+gDa
gDa
bCH
psY
-bIc
+heb
bRa
hxs
bLK
-bMW
+iXB
bOe
bPf
cfP
@@ -102470,13 +119507,13 @@ cmW
bOh
idW
eKQ
-bEW
+sLs
+ceF
+ceF
ceF
-bJW
-bJX
xgo
wfh
-qhj
+bLt
xzh
xzh
xzh
@@ -102669,9 +119706,9 @@ dfp
xAH
eJQ
bbx
-aYV
+wEJ
iKz
-aYV
+ber
bfF
bhd
bis
@@ -102683,12 +119720,12 @@ bpt
qtX
bqV
bza
-bhi
-bhi
-bhi
+rQe
+rQe
+rQe
bza
sLX
-bzS
+vMQ
bzS
bzS
bCJ
@@ -102726,13 +119763,13 @@ clZ
clZ
bOh
idW
-jXp
-bEW
-sIo
+qhj
+qhj
+hPh
bUQ
-bUQ
-bUQ
-jbt
+hCY
+qhj
+qhj
qhj
xzh
xzh
@@ -102877,9 +119914,9 @@ sUX
sUX
xzh
xzh
-uVE
-uRx
-uVE
+aYy
+bgR
+aYy
mwk
mSu
xdE
@@ -102927,7 +119964,7 @@ aRw
ntB
twl
rym
-dCL
+ohS
bes
bfF
kyo
@@ -102939,13 +119976,13 @@ bfF
bfF
vbw
ruy
-bhi
+rQe
bvj
bwG
gGW
bza
aUn
-bip
+cdb
bip
bip
xYA
@@ -103146,7 +120183,7 @@ jij
mnf
apu
ePn
-aAd
+bQT
dyw
anp
beZ
@@ -103177,19 +120214,19 @@ nah
lno
ado
fTS
-nah
+tSJ
aUg
bFC
vHL
aAR
bby
-aYV
+cGB
oOF
bet
bfH
efj
fYd
-fYd
+bog
hWN
bmJ
bof
@@ -103240,13 +120277,13 @@ cpb
iVn
qri
hqK
-dIy
+hiw
bVZ
ehY
bTQ
ehY
vik
-cbC
+eoj
qhj
qhj
qhj
@@ -103440,19 +120477,19 @@ aSq
aNt
bad
aJC
-uly
+sTE
ilO
-bet
-tyB
+oij
+pXJ
kFS
-bit
+aJP
aHk
dNr
pEK
sdT
ptB
bpN
-bCS
+hDl
rQe
btg
bDR
@@ -103463,8 +120500,8 @@ hUm
bzc
bDZ
urC
-bip
-cCp
+sMi
+kdr
bRa
hxs
bzs
@@ -103504,7 +120541,7 @@ bQQ
mUF
ehY
bEW
-ceF
+ncl
cSo
qhj
xzh
@@ -103657,12 +120694,12 @@ qwZ
jHe
fKI
bQE
-xus
+lnW
axQ
axQ
qwZ
srd
-sKK
+aAd
uRa
uRa
beZ
@@ -103698,28 +120735,28 @@ aXO
aZb
bbx
pzZ
-iKz
+lDq
bet
tyB
dxQ
-bit
+nXb
bjU
xta
qgQ
boe
-hjZ
-uGy
+pyd
+tGA
bqY
wvH
lYP
lYP
-iEr
+lYP
bCQ
bCQ
bCQ
bCQ
peL
-bip
+bCU
ijh
bIc
bRa
@@ -103753,7 +120790,7 @@ qhj
tTF
qhj
qhj
-bEW
+dbD
bZx
jnb
urU
@@ -103761,7 +120798,7 @@ pqS
rdI
caG
caE
-ceF
+fvd
cSo
qhj
xzh
@@ -103888,7 +120925,7 @@ xzh
xzh
xzh
xzh
-xzh
+sNY
xzh
xzh
xzh
@@ -103954,18 +120991,18 @@ bwS
pSg
bah
dlW
-aYV
+qbT
iKz
-bet
+xds
bvk
-biu
-bit
-hMe
+wMS
+cvK
+nUV
hkE
bmK
-bog
-pXJ
-uGy
+bfH
+bof
+wJQ
wPd
wvH
wQK
@@ -103976,7 +121013,7 @@ bAq
bCN
bCQ
pva
-lrg
+sKK
wTp
xFt
bRa
@@ -104010,7 +121047,7 @@ qHL
dSO
xlh
rdx
-bEW
+jBz
bEW
ehY
mUF
@@ -104018,7 +121055,7 @@ qrM
bZH
ehY
bEW
-ceF
+fvd
hqh
qhj
sUX
@@ -104173,7 +121210,7 @@ asm
uem
cXx
diW
-kaY
+uem
qwZ
lFo
sBI
@@ -104211,10 +121248,10 @@ bnd
kcx
iqu
aQg
-aYV
+cib
cTQ
amJ
-bvk
+tkm
biu
bit
hMe
@@ -104222,20 +121259,20 @@ nBp
dVh
mXG
bof
-uGy
+foi
bCS
wvH
kcL
-oju
-lAO
-eIN
+pOn
+rrQ
+rnK
kVn
bCO
bCQ
mrM
bCT
hnt
-cCp
+bZf
bRa
hxs
bzs
@@ -104265,9 +121302,9 @@ xul
bLK
rQD
dsF
-bEW
bZx
bEW
+bEW
dIy
bTz
ehY
@@ -104275,7 +121312,7 @@ wPM
ehY
iEg
cbC
-ceF
+fvd
pod
qhj
xzh
@@ -104468,16 +121505,16 @@ aXA
czP
bag
aJC
-aDA
+nhX
rJl
hAO
naY
qjL
qLx
-cKC
+hMe
eAX
-qLx
-qLx
+bZj
+mFi
qYe
boc
bCS
@@ -104522,8 +121559,8 @@ oRw
iHb
yig
jsT
+tKJ
jsT
-pQB
wsY
cBJ
pOz
@@ -104532,7 +121569,7 @@ bEW
bEW
car
gKk
-ceF
+jXp
fnV
qhj
xzh
@@ -104681,7 +121718,7 @@ xzh
xzh
sUX
mBa
-ncQ
+rAk
avx
avx
avx
@@ -104747,7 +121784,7 @@ fBp
anG
bfG
lOZ
-lOZ
+fxs
kbG
rrA
bRa
@@ -104982,8 +122019,8 @@ aXk
fNG
aBJ
aJC
-hLC
-iKz
+qff
+nHJ
bev
bBN
bBN
@@ -104991,11 +122028,11 @@ aXM
aXM
bBN
bBN
-fMP
+bof
bof
jUA
xmg
-sxQ
+meD
pUi
bwH
bxS
@@ -105189,7 +122226,7 @@ xzh
xzh
xzh
xzh
-sNY
+xzh
xzh
xzh
xzh
@@ -105239,22 +122276,22 @@ aJI
aYK
aJI
aJI
-bcq
-skt
+fMP
+evp
dUe
bBN
hDB
xTz
rYh
sjV
-bmR
+aXM
pkL
bES
-uGy
+oFt
pnW
jsH
odp
-kVn
+kmc
bxV
kvh
lAO
@@ -105266,9 +122303,9 @@ lCT
bIn
bzs
bKL
-nEs
-nEs
-nEs
+ddA
+dgP
+cOb
nEs
nEs
nEs
@@ -105276,8 +122313,8 @@ nEs
nEs
qTC
bzs
-bAw
-bzs
+nSE
+lHq
bXZ
bAw
sUi
@@ -105496,9 +122533,9 @@ mtP
aYJ
aJI
sQV
-hXL
-iKz
-aYV
+uOF
+gvk
+xUS
bBN
sKS
oQe
@@ -105506,7 +122543,7 @@ iZH
fxY
bkP
bok
-boc
+sIB
bpP
bCS
bfG
@@ -105534,8 +122571,8 @@ bBR
ubj
bzs
but
-bzs
-bAw
+uTW
+aNv
vmy
dFS
bzs
@@ -105752,26 +122789,26 @@ axD
axD
aYL
aFf
-cVV
+boR
uly
teo
-aYV
+yhv
bBN
jhG
nPg
scW
jFm
-bmR
+aXM
boh
hjZ
uGy
-bCS
+nel
wvH
kxj
klw
-fBp
-jEe
-bKj
+tlt
+bxb
+ebm
bhr
rOo
bEd
@@ -105789,14 +122826,14 @@ bRa
bRa
bRa
buh
-cze
-bAw
-hzQ
-cze
-bzs
+bzs
+rlW
+bzs
+qdM
bzs
bzs
bzs
+fGo
alj
bwc
bRa
@@ -106010,7 +123047,7 @@ aMB
aBb
baj
cVV
-aYV
+lkv
iKz
fgR
bBN
@@ -106046,10 +123083,10 @@ bLY
bMa
bRa
ubj
-bAw
-bAw
-bAw
-bAw
+cze
+xNQ
+hzQ
+srm
bZN
caK
bzs
@@ -106080,7 +123117,7 @@ xzh
csD
csN
csV
-ctb
+tST
cth
cua
jpF
@@ -106266,10 +123303,10 @@ akS
aXm
cjy
bak
-iaU
-hXL
+cVV
+shC
iKz
-aYV
+xQp
bBN
bBN
bBN
@@ -106285,7 +123322,7 @@ wvH
bfG
cds
cds
-bfG
+dGU
wvH
wvH
kPH
@@ -106306,8 +123343,8 @@ bul
bup
bLT
bLT
-bLT
-nEs
+sjo
+duh
caM
wzx
wzx
@@ -106351,7 +123388,7 @@ cuG
cuS
cve
cvo
-uGZ
+hAb
bmS
cvI
bmZ
@@ -106523,8 +123560,8 @@ aVB
aVz
cAg
aEP
-cVV
-aYV
+lqb
+lkv
iKz
cBm
bBN
@@ -106536,12 +123573,12 @@ bBN
bmV
hjZ
bqW
-brc
+iZo
bua
rTE
-rTE
+dVd
vLr
-cVc
+ino
kwT
lTQ
fBh
@@ -106565,7 +123602,7 @@ bRa
bRa
bRa
bZO
-hxs
+lIe
bzs
nLO
alV
@@ -106628,7 +123665,7 @@ cvv
cvv
cvv
cvp
-cvl
+dOY
cva
cva
cva
@@ -106781,7 +123818,7 @@ aVz
aBb
cDd
cVV
-aYV
+lkv
dCL
bdc
bBN
@@ -106791,19 +123828,19 @@ tJO
lQp
bBN
vof
-hjZ
+dON
nbA
-brc
+tmD
brl
brD
brP
bsG
bsJ
-jQp
+aUv
aUv
uyp
bBn
-brc
+drT
bDF
rAs
bpI
@@ -106822,7 +123859,7 @@ bWX
dJJ
bRa
bRa
-hxs
+lIe
bzs
bzs
bzs
@@ -107040,7 +124077,7 @@ bnh
pTw
aDA
ugI
-aYV
+uNg
bBN
blr
bho
@@ -107050,7 +124087,7 @@ bBN
bmW
qTP
vrh
-sMi
+iZo
bsu
fUn
brT
@@ -107060,7 +124097,7 @@ gZK
aUK
bsK
btT
-bCU
+brc
eIZ
xrc
bpI
@@ -107288,16 +124325,16 @@ aJI
aJI
aJI
aRC
-aOW
+aVz
aVz
bmX
aXn
bnf
-aJI
+rHu
lZo
bez
-dCL
-aYV
+pds
+wkV
bfL
bfL
bfL
@@ -107305,7 +124342,7 @@ bfL
vki
bfL
bmY
-plW
+gbO
gbO
gbO
gbO
@@ -107498,7 +124535,7 @@ xzh
xzh
xzh
xzh
-xzh
+sNY
xzh
xzh
xzh
@@ -107554,7 +124591,7 @@ aJI
aJI
bcq
evp
-bcq
+siw
bfL
iMV
jsP
@@ -107568,7 +124605,7 @@ jLY
wuY
gbO
bse
-cVc
+ino
bsN
rLK
bBK
@@ -107595,14 +124632,14 @@ bRa
bRa
bzs
bzs
-wzK
-cdL
-sjo
+xgB
+vOD
+bAw
bzs
dRT
nAt
lCb
-yix
+rAl
yix
bzs
pPE
@@ -107801,17 +124838,17 @@ aMI
aIp
dnK
goZ
+rPo
nlg
-nlg
-nlg
+vmK
eeN
dnK
aYP
bal
bam
-aYV
-iKz
-hXL
+qbT
+gvk
+isf
bfL
bhq
aGj
@@ -107845,16 +124882,16 @@ fYu
bSX
uSc
rgu
-bNk
+ope
bNk
bNk
kJp
bZR
caQ
+cFG
+xgB
+syS
bzs
-wzK
-cdL
-eAU
bzs
mXn
tAm
@@ -108057,18 +125094,18 @@ aKD
aMs
aIp
vYs
-aXo
+iiJ
aVI
uUn
azU
-azU
-azU
-aBK
+uUh
+uUh
aBK
+upm
nCW
aDe
oOF
-aYV
+wEZ
bfL
bfL
fha
@@ -108081,7 +125118,7 @@ wHB
iYh
ivU
gbO
-bsB
+qsw
bvr
bsN
jgM
@@ -108098,7 +125135,7 @@ bNd
bNd
bNd
bNd
-bRQ
+mAO
bNd
fju
bNj
@@ -108108,10 +125145,10 @@ sgR
bRa
bZQ
caP
-cbO
-wzK
-cdL
bzs
+wzK
+cPp
+rCT
bzs
kGI
eVH
@@ -108123,7 +125160,7 @@ cfp
bzs
bWa
cun
-vmy
+jJv
qXp
bzs
xzh
@@ -108276,14 +125313,14 @@ xzh
xzh
xzh
xzh
-sNY
+xzh
xzh
xzh
xzh
sUX
sUX
alP
-bqb
+ohO
arm
alP
xzh
@@ -108318,19 +125355,19 @@ syK
pVV
ayi
azg
-dOY
-uVV
-aXo
+syK
+pVV
+nwV
aXo
pJI
-aYV
+vlZ
dCL
-aYV
+hEI
aoq
esZ
mFu
-bhm
-bhm
+aYt
+uQZ
sPM
tjz
lHs
@@ -108367,8 +125404,8 @@ bZS
caR
bzs
vTL
-cdL
-bAw
+cPp
+qdd
bzs
gAG
qFb
@@ -108376,12 +125413,12 @@ xQg
nzv
oNe
bzs
-cdL
+ktu
cCC
bWa
bzs
aEI
-bAw
+cZM
bPn
xzh
xzh
@@ -108570,25 +125607,25 @@ aRJ
aRJ
aMt
aIp
-aXo
+aOo
xJe
kBB
ayi
ayp
xJe
kBB
-aXo
-cBg
+vtU
bam
-aYV
+bam
+wRV
iKz
-aYV
+wEZ
pMS
hkm
kgW
bhm
fYZ
-dXT
+sPM
xWn
lHs
lLB
@@ -108623,9 +125660,9 @@ bRa
bzs
bzs
bzs
-wzK
-cdL
-bAw
+tUr
+cPp
+wIY
bzs
bzs
wuS
@@ -108633,7 +125670,7 @@ bzs
bzs
bzs
bzs
-cdL
+ktu
bzs
slC
bzs
@@ -108829,23 +125866,23 @@ aMA
aIp
aMw
xJe
-kBB
+bym
ayi
azg
xJe
kBB
-aXo
+vtU
lZz
-aYV
-aYV
+nrw
+nbr
dCL
-beE
+hgY
pMS
tnF
uvG
bkf
xdk
-eLW
+sPM
pzg
lHs
diG
@@ -108873,13 +125910,13 @@ ekN
bRQ
itm
baR
-bNk
+hLN
gIB
bbE
bRa
aHV
yeE
-nEs
+lUQ
ccN
pby
xnY
@@ -108890,12 +125927,12 @@ bAw
bAw
bzs
xdx
-cdL
+ktu
bzs
rvc
bzs
xCL
-nQa
+gpC
bPn
xzh
xzh
@@ -109084,19 +126121,19 @@ aBc
awE
iYg
aNQ
-hmH
-rAk
+dLM
+jCu
aOj
ayi
azg
jCu
-oWr
+aOj
aYR
qJn
aYO
-aYV
+xKv
iKz
-bez
+bsB
pMS
mkV
sIY
@@ -109135,7 +126172,7 @@ bXd
bcw
bRa
bZT
-hxs
+qFh
uRs
cdL
vmy
@@ -109146,8 +126183,8 @@ bzs
hRF
jeI
bzs
-bFr
-feO
+pMY
+hjU
bzs
pAn
bzs
@@ -109337,21 +126374,21 @@ aoO
aqw
aGF
aIp
-aRJ
+jIq
aKU
aME
bbB
-aXo
+miZ
hmH
-aXo
-aXo
+xHf
+xHf
ayf
-aXo
-aXo
-aXo
+xHf
+xHf
+oXn
ycY
-hXL
-aDA
+iqV
+mZY
bci
beB
xto
@@ -109391,9 +126428,9 @@ bRa
bRa
bRa
bRa
-sUi
+vML
pjk
-bFr
+axL
feO
bAw
bzs
@@ -109403,7 +126440,7 @@ bzs
bzs
bzs
bzs
-cdL
+ktu
bzs
bzs
bzs
@@ -109422,7 +126459,7 @@ xzh
xzh
xzh
xzh
-sNY
+xzh
xzh
xzh
xzh
@@ -109597,7 +126634,7 @@ alP
vqW
aRJ
aRJ
-aNQ
+aIp
aOQ
nZV
muj
@@ -109606,9 +126643,9 @@ aUz
iry
tPw
aYT
-bam
-aYV
-hXL
+igk
+aOW
+slp
bcb
bdl
cTJ
@@ -109641,9 +126678,9 @@ nEs
nEs
nEs
nEs
-nEs
+ddA
bIg
-nEs
+cOb
nEs
nEs
nEs
@@ -109885,31 +126922,31 @@ bvB
bzs
kAH
bBR
-bRa
-bRa
-bRa
-bRa
-bRa
-bRa
-bRa
-bRa
+bDb
+bDb
+bDb
+bDb
+bDb
+bDb
+bDb
+bDb
pDY
iER
-bRa
-bRa
-bRa
-bRa
-bRa
-bRa
-bRa
-bRa
-bRa
-bRa
-bRa
-bRa
-bRa
-bRa
-bRa
+bDb
+bDb
+bDb
+bDb
+bDb
+bDb
+bDb
+bDb
+bDb
+bDb
+bDb
+bDb
+bDb
+bDb
+bDb
bDb
bDb
bDb
@@ -109918,7 +126955,7 @@ bDb
bDb
jBL
jsw
-dgP
+cri
czY
bRa
bRa
@@ -110053,7 +127090,7 @@ xzh
xzh
xzh
xzh
-xzh
+sNY
xzh
xzh
xzh
@@ -110106,7 +127143,7 @@ art
anf
anf
aAu
-iSY
+cKw
alP
aJO
bsq
@@ -110120,11 +127157,11 @@ igX
aIt
rJz
aXR
-wKl
+xKO
wvF
-bez
+aLO
bcj
-bez
+xDR
bfT
cHF
biG
@@ -110133,7 +127170,7 @@ blu
bnb
bfT
bor
-bsQ
+pzG
bsO
bfV
bvx
@@ -110148,34 +127185,34 @@ xAv
xAv
bDb
aWv
-aYN
+bgC
bkz
bAW
-bMi
+dTx
bIQ
-mdh
+bDb
cfo
ohb
bJN
stP
-fqu
-xAv
-bJN
-hPj
-fqu
-xAv
-bJN
-moU
-fqu
-xAv
-bJN
+qKY
+gtt
ndY
+hPj
+vYW
+ndY
+qKY
+cyP
fqu
-xAv
+hPj
+vYW
+ndY
+tLd
+vYW
bDb
cNW
cNW
-bhG
+eAU
czY
cOT
sUX
@@ -110314,7 +127351,7 @@ xzh
xzh
xzh
xzh
-sNY
+xzh
xzh
xzh
xzh
@@ -110363,12 +127400,12 @@ alP
alP
aVL
aGW
-cKw
alP
aFu
aFu
aFu
aFu
+aFu
aWb
fiY
aWb
@@ -110382,7 +127419,7 @@ bbD
sOP
ykz
bfU
-bhu
+hQZ
cHG
bkh
bkh
@@ -110393,46 +127430,46 @@ boE
bsQ
uVb
box
-boz
+bSG
buU
byf
jAK
omI
daa
bDb
-xAv
+scr
xAv
xAv
bDb
ylY
aZi
-qAp
-bAW
-bID
+owa
+oZQ
+rKd
bIR
mdh
-xzr
+dnc
dnc
bJN
-vYW
-fBE
-xAv
-bJN
-vYW
-xAv
-xAv
-bJN
-vYW
-xAv
-xAv
-bJN
-vYW
-xAv
-xAv
+cHT
+iVv
+kOT
+eQs
+iVv
+kOT
+eQs
+iVv
+kOT
+eQs
+iVv
+kOT
+eQs
+iVv
+kOT
bDb
xzh
cOT
-bhG
+eAU
czY
cOT
xzh
@@ -110616,12 +127653,12 @@ alP
alP
alP
alP
-jaH
xuF
+alP
ffa
ukg
alP
-alP
+aPb
bav
aLf
aPb
@@ -110647,7 +127684,7 @@ blv
bls
bfT
boD
-bsQ
+nzc
bsP
box
btw
@@ -110664,32 +127701,32 @@ cAE
peU
baW
iiD
-bAW
+blG
bIO
bIT
mdh
xzr
dnc
bJN
-vYW
-xAv
-xAv
-bJN
-vYW
-xAv
-xAv
-bJN
-vYW
+yck
+dpr
+xMW
fBE
-xAv
-bJN
-vYW
+neG
+xMW
fBE
-xAv
+puc
+xMW
+fBE
+neG
+xMW
+fBE
+lAR
+xMW
bDb
xzh
cOT
-bhG
+eAU
czY
cOT
xzh
@@ -110881,7 +127918,7 @@ wRm
upf
aJQ
bCI
-qhA
+aCo
aUB
qhA
miE
@@ -110896,7 +127933,7 @@ aFu
bcv
qXW
bfU
-bhu
+tES
aFT
bhM
bhM
@@ -110904,10 +127941,10 @@ aHM
aBk
bfT
boL
-bsQ
+sCf
bsR
box
-bWr
+bvE
bxd
byf
bzw
@@ -110917,36 +127954,36 @@ bDb
bEn
cAC
xAv
-iLt
+xAv
aWC
bdB
-bMi
-bAW
+oYQ
+oZQ
bID
bIR
mdh
-yck
+xzr
dnc
bJN
-dqk
+ylY
fKY
ylY
-bJN
-dqk
+ylY
fKY
ylY
-bJN
-dqk
+ylY
fKY
ylY
-bJN
-dqk
+ylY
+fKY
+ylY
+ylY
fKY
ylY
bDb
xzh
cNW
-bhG
+eAU
czY
mtK
xzh
@@ -111115,7 +128152,7 @@ jys
enl
shv
iUh
-anf
+jaH
alP
rlz
alP
@@ -111134,7 +128171,7 @@ aty
aCC
aED
alP
-alP
+aFu
aIs
xKO
xKO
@@ -111150,9 +128187,9 @@ aVY
aYW
bas
bbD
-aYV
+cJt
cOV
-hXL
+tyA
bht
cHJ
biG
@@ -111164,7 +128201,7 @@ boG
lzf
cIe
box
-bWr
+bvE
bve
byh
bzv
@@ -111177,29 +128214,29 @@ xAv
bIy
bJK
bKZ
-bMi
-bAW
-bMi
+qPx
+blG
+kSj
nxx
bJN
mdh
rjh
bJN
wBO
-gbS
+mVU
nOl
-bJN
wBO
-gbS
+muy
nOl
-bJN
wBO
-gbS
+tfs
nOl
-bJN
wBO
-gbS
+rLi
nOl
+mPe
+lna
+qhV
bDb
xzh
cNW
@@ -111364,7 +128401,7 @@ rJF
rJF
smk
sKC
-qgu
+gmT
mvN
qgu
aoM
@@ -111407,18 +128444,18 @@ aXu
aYW
bau
aFu
-aYV
+iye
qXW
-aYV
+hgd
bfV
cHK
-blA
-blA
-blA
+eBA
+eBA
+eBA
box
box
cHU
-cHZ
+naP
cIf
box
btA
@@ -111428,36 +128465,36 @@ grP
bAD
bBX
bDb
-xAv
+scr
xAv
xAv
bDb
ylY
bLc
-owa
-bAW
+tyb
+vBG
bOx
wUr
ccP
-bMi
-mQw
-jQC
-bMi
-bMi
-bMi
+iET
+cCg
+kIz
+rPi
+oZX
+rPi
bRo
-bMi
-bMi
-bMi
+ptX
+rPi
+wwi
+cBg
+rPi
+wwi
+oZX
eQV
-bMi
-bMi
-bMi
-eQV
-bMi
-bMi
-bMi
-mdh
+rwm
+oZX
+axM
+kIT
sUX
cOT
fif
@@ -111628,7 +128665,7 @@ qLv
bZU
ucn
gZS
-anf
+oQm
atw
alP
cgh
@@ -111651,8 +128688,8 @@ alP
iiZ
aIv
aJR
+eYO
vcX
-aIt
aVP
aIt
aRO
@@ -111662,23 +128699,23 @@ aUC
qkI
dEC
aYW
-bax
+jIQ
aFu
-aYV
+fvD
rqA
beE
bfV
bhv
biK
-blz
+cQg
blz
bly
gTp
bpR
-biL
+naP
bsS
box
-bWr
+bvE
aRU
byf
bzx
@@ -111690,30 +128727,30 @@ xAv
xAv
bDb
aWv
-bgC
+mYG
blq
-bIu
-bMi
+nJJ
+uZp
bPC
bQL
-lNo
+gXN
iFN
lNo
lNo
+kQD
lNo
lNo
lNo
+kQD
lNo
lNo
lNo
-lNo
-lNo
-lNo
-lNo
-lNo
-lNo
-lNo
-lNo
+kQD
+mlu
+toN
+cQy
+hai
+dFi
ouV
nPP
czZ
@@ -111926,13 +128963,13 @@ npN
bds
bfV
bhx
-biL
-biL
cHO
-blG
-aJY
-cHV
-cIa
+cHO
+cHO
+kpu
+cId
+cId
+naP
jFl
box
gFs
@@ -111941,40 +128978,40 @@ byf
byf
vOi
byf
-pzG
+bDb
bEo
-pzG
-pzG
-pzG
-bvK
-bvK
+bDb
+bDb
+bDb
+bJN
+bJN
bmv
iLK
rzA
-bMi
+ydt
bQN
bMi
mQw
-bMi
-bMi
-bMi
-bMi
-pOC
-bMi
-bMi
-bMi
+jvU
+alt
+eFH
+eFH
qSS
-bMi
-bMi
-bMi
-lse
-bMi
-bMi
-bMi
-mdh
+eFH
+sKD
+otM
+vEo
+alt
+xyK
+eFH
+kHR
+iLt
+sKD
+iDu
+kIT
sUX
cOT
-pxV
+cOe
czY
cOT
xzh
@@ -112142,7 +129179,7 @@ xzh
xzh
alP
aqy
-anf
+jcQ
aty
alP
sUX
@@ -112178,21 +129215,21 @@ aWd
aXV
aBN
aFu
-hXL
+tjj
qXW
-aYV
+hEI
bfV
hKu
cHM
-biL
+vuC
blB
blF
cHS
cHW
-cIb
+iRK
bsT
-box
-bWr
+vKh
+pwL
aRU
byi
idH
@@ -112204,25 +129241,25 @@ bCj
bHe
uTD
kHN
-bvK
+bJN
bnB
bIu
-bMi
+dZl
bNp
bJN
jRs
txJ
bJN
-sAR
-pIw
-pIw
+fie
+fie
+fie
bJN
wOk
-eJI
-kvB
+noB
+vzq
bJN
-wOk
-eJI
+mbp
+pIw
kvB
bJN
wOk
@@ -112231,7 +129268,7 @@ kvB
bDb
xzh
cNW
-pxV
+cOe
czY
mtK
xzh
@@ -112435,20 +129472,20 @@ aXT
aBf
bax
aFu
-aYV
+iye
qXW
-aYV
+ike
bfV
bfV
biO
-biL
+vsC
cHP
cHR
bou
bpT
-bqd
+cIc
bTA
-box
+jNj
bWr
aRU
byi
@@ -112461,10 +129498,10 @@ bIC
bEc
aWt
hnE
-bvK
+bJN
bnT
bIu
-bMi
+dZl
bLe
fie
fie
@@ -112476,15 +129513,15 @@ jtb
bJN
ylY
lpf
-dqk
+ylY
bJN
ylY
lpf
-dqk
-bJN
ylY
+bJN
+sAR
lpf
-dqk
+ylY
bDb
xzh
cNW
@@ -112497,7 +129534,7 @@ sUX
sUX
sUX
mtK
-cNW
+mtK
cNW
cOT
cOT
@@ -112655,9 +129692,9 @@ xzh
xzh
xzh
xzh
-uRx
-uRx
-uRx
+bvb
+bgR
+bvb
xzh
xzh
alP
@@ -112692,20 +129729,20 @@ aYW
aBf
pna
bbD
-aYV
+cJt
uWp
-aYV
+fnG
bfW
-bhy
+ssR
biN
-biL
+rtw
bni
blM
lWC
cHX
-cIc
-aPm
-buj
+iHP
+wNZ
+vKh
pwL
bve
wgc
@@ -112718,7 +129755,7 @@ bCX
jDF
cvi
kfh
-bvK
+bJN
boP
bIu
mjW
@@ -112729,24 +129766,24 @@ nlQ
erg
sDq
gpj
-jWl
+gbS
bJN
-xAv
-xAv
+kMI
+lPm
vYW
bJN
-xAv
-xAv
+kMI
+hja
vYW
bJN
-xAv
-xAv
+ouK
+nvG
vYW
bDb
xzh
cOT
iAM
-cOb
+cOe
cOT
xzh
xzh
@@ -112756,7 +129793,7 @@ xzh
mtK
jdH
keQ
-cOe
+pOH
dee
bgR
xzh
@@ -112949,21 +129986,21 @@ aYW
aBf
tUY
aFu
-aYV
+pQo
qXW
-aYV
+tEE
bfX
nko
biQ
-biL
-blC
-bou
-cHT
-bou
+sQs
+sQs
+sQs
+aJY
+cId
cId
aPn
-bsw
-bJr
+box
+bvE
bxe
byk
jMI
@@ -112975,10 +130012,10 @@ bDj
bDY
uxs
neV
-bvK
+bJN
bsd
dQy
-bMi
+dZl
bNr
fie
dFp
@@ -112986,19 +130023,19 @@ pnD
vzT
fhs
lDZ
-fmC
+jWl
bJN
-xAv
-fBE
-vYW
-bJN
-xAv
-xAv
-vYW
-bJN
-xAv
+cHT
noN
-vYW
+kOT
+bJN
+cHT
+noN
+kOT
+bJN
+cHT
+noN
+kOT
bDb
xzh
cOT
@@ -113011,9 +130048,9 @@ sUX
xzh
xzh
mtK
+xWD
cNW
-cNW
-uNc
+cOT
cOT
aYy
xzh
@@ -113206,9 +130243,9 @@ aYW
aBf
aZd
aFu
-aYV
+fvD
qXW
-aYV
+fnG
bfX
bhy
biP
@@ -113219,7 +130256,7 @@ lzw
uSW
brq
bsW
-buj
+box
bvE
aRU
byk
@@ -113232,10 +130269,10 @@ bDf
aQC
bGY
aXB
-bvK
-bsd
-dQy
-bMi
+bJN
+xTt
+sIG
+rfr
bPJ
fie
czb
@@ -113243,19 +130280,19 @@ dxm
xpt
xyR
eQF
-iVv
+fmC
bJN
-nDM
+uYz
fOT
-kDh
-bJN
-wuD
-fOT
-kDh
-bJN
rqY
-fOT
+bJN
kDh
+wuD
+rqY
+bJN
+pnX
+fOT
+rqY
bDb
cNW
cNW
@@ -113269,9 +130306,9 @@ xzh
xzh
mtK
xWD
-cmn
-cmn
-cOT
+vgr
+xQV
+cNW
xzh
xzh
xzh
@@ -113465,8 +130502,8 @@ hSf
hSf
bcs
qXW
-aYV
-bfX
+qYC
+xIe
bfV
bfV
bfV
@@ -113477,35 +130514,35 @@ buj
xme
box
box
-bWr
+bvE
aRU
byk
byk
byk
byk
bvK
-bvJ
+dtZ
bDc
+fbe
+mKj
bvJ
-bvJ
-bvJ
-bvK
-nua
+bJN
+mdh
bGM
bMr
bJN
+fie
+fie
+fie
+fie
+fie
+fie
+fie
bJN
bJN
bJN
bJN
-bhA
-bhA
-mwK
-mwK
-mwK
-mwK
-mwK
-xQR
+bDb
bDb
bDb
bDb
@@ -113517,7 +130554,7 @@ bDb
cdu
cNW
hVD
-idU
+gix
mtK
mtK
mtK
@@ -113528,7 +130565,7 @@ mtK
fEM
cmn
cda
-cOT
+cNW
xzh
xzh
xzh
@@ -113682,7 +130719,7 @@ xzh
xzh
xzh
xzh
-sNY
+xzh
xzh
xzh
xzh
@@ -113711,14 +130748,14 @@ aLc
aMX
aFw
nAp
-nAp
+lgx
vUH
fSN
iFn
nAp
hdH
gwD
-oLy
+nGa
hSf
bcx
qXW
@@ -113729,33 +130766,33 @@ biR
bkq
bjZ
bvx
-boz
+bSG
boM
-bzE
-bzE
+wNp
+bJr
bsz
btW
bxf
-bzE
-bzE
-bzE
-bzE
+bJr
+bJr
+bJr
+ikl
bDd
-bzE
+blC
bDl
-bzE
-bzE
+bJr
+bJr
bHc
-bzE
-bzE
+bJr
+wNp
bHA
-bzE
-bzE
-uXI
-bzE
-bzE
+wNp
+bJr
+bJr
+wwb
+bJr
bsX
-bzE
+pOC
bWo
eLM
lUF
@@ -113766,26 +130803,26 @@ xQR
xaZ
dqL
dtO
-pxV
-pxV
-pxV
-pxV
-pxV
-pxV
+dfC
+bZX
+cOe
+idU
+cOe
+cOe
lSv
njf
-jsw
-jsw
-jsw
+nBa
+nBa
+nBa
upr
-jsw
+nBa
upr
-cri
+kOi
cTI
+sTW
cmn
-cBT
-cBU
-cOT
+cdu
+cNW
xzh
xzh
xzh
@@ -113975,9 +131012,9 @@ igN
tZO
qdS
xuc
-nAp
+oLy
ggc
-aYV
+aVh
isY
liE
aFp
@@ -113986,8 +131023,8 @@ bgp
bhU
aIe
blX
-boz
-bpX
+bSG
+pwL
vBK
gXy
gXy
@@ -113996,9 +131033,9 @@ bvg
bDm
bDm
cBx
-bDm
+rRG
bAa
-bDm
+yhF
qds
bEr
tYi
@@ -114009,9 +131046,9 @@ bIE
aYA
aYA
aYA
-aYA
-aYA
xUe
+waq
+waq
eJd
bWo
lGf
@@ -114234,7 +131271,7 @@ hdH
xuc
sTU
ggc
-aYV
+aVh
qXW
aYV
bfZ
@@ -114244,30 +131281,30 @@ bkr
blH
bvx
boy
-bpX
+doz
qii
-bBD
+osg
bsA
dnV
bvf
-bBD
+osg
cPX
-bBD
+osg
cFf
bzZ
doz
-bBD
+osg
kRC
-doz
+osg
bBD
-doz
+sor
kXX
bvH
jzM
cFi
uyE
usl
-aYB
+usl
bBD
cdM
bWo
@@ -114317,7 +131354,7 @@ xzh
xzh
xzh
xzh
-xzh
+sNY
xzh
xzh
xzh
@@ -114439,7 +131476,7 @@ xzh
xzh
xzh
xzh
-sNY
+xzh
xzh
xzh
xzh
@@ -114479,8 +131516,8 @@ cCf
aID
fwJ
aFw
-czf
nAp
+dyN
nAp
eGE
hdH
@@ -114491,10 +131528,10 @@ hdH
xuc
hdH
ggc
-aYV
+aVh
qXW
aYV
-bfX
+beE
bvx
tYv
bvx
@@ -114542,14 +131579,14 @@ qQH
bhG
uGf
cNW
-cOe
+arA
lSv
tkC
cNW
lOk
vhE
kZR
-pHs
+xgK
bJE
eeg
cNW
@@ -114560,7 +131597,7 @@ xzh
xzh
xzh
xzh
-sNY
+xzh
xzh
xzh
xzh
@@ -114695,7 +131732,7 @@ xzh
xzh
xzh
xzh
-xzh
+sNY
xzh
xzh
xzh
@@ -114748,7 +131785,7 @@ qdS
xuc
hdH
ggc
-aYV
+aVh
qXW
aYV
lph
@@ -114759,7 +131796,7 @@ iOY
gFK
fut
lNf
-jnH
+xid
sSZ
ncD
bgc
@@ -114786,7 +131823,7 @@ ceD
rBV
cas
mci
-hja
+tNK
dwi
otW
qkc
@@ -115005,14 +132042,14 @@ hdH
xuc
hdH
ggc
-hXL
+uRN
qXW
aYV
-aYV
+dek
aYV
oeC
gZx
-sfV
+lRw
uMG
tDJ
sfV
@@ -115043,16 +132080,16 @@ rBV
fcz
cas
kYu
-tNK
+xDp
oTO
-vzq
+eCd
uzY
mtK
-cNW
-cNW
-cNW
-cNW
-cNW
+mtK
+mtK
+mtK
+mtK
+mtK
bhG
cNW
cNW
@@ -115262,11 +132299,11 @@ hdH
xuc
sTU
ggc
-aYV
+aVh
sqp
-aYV
+oeC
tej
-aYV
+vlZ
oeC
uMI
ueJ
@@ -115293,7 +132330,7 @@ ohL
ogm
bNt
jxt
-bQT
+xkx
mPh
tNJ
knw
@@ -115309,7 +132346,7 @@ iwV
mSk
cGm
wCU
-cNW
+mtK
bhG
cNW
xzh
@@ -115517,14 +132554,14 @@ kvc
eJR
hdH
fCR
-nAp
+sWl
ggc
-aYV
+aVh
qXW
-aYV
-aYV
-aYV
-oeC
+iJp
+xEo
+pIR
+kNk
gZx
vzg
biW
@@ -115559,14 +132596,14 @@ cas
gqa
xDp
pRg
-eCd
-gGz
+wvI
+iiK
tnh
iwV
nnI
dqV
nzE
-cNW
+mtK
bhG
cOT
xzh
@@ -115771,14 +132808,14 @@ fbE
hSf
mvx
nAp
-slj
+nAp
hdH
wDq
-sWl
+vRa
hSf
bcy
-qXW
-aYV
+vSz
+tdA
tbz
vJr
jJl
@@ -116015,7 +133052,7 @@ xzh
xzh
alP
aCO
-jTr
+xna
jTr
ntl
alP
@@ -116073,14 +133110,14 @@ cas
hJz
wBE
tcj
+hTO
lbd
-lbd
-lbd
+lse
iwV
kNm
dEw
cou
-cNW
+mtK
chA
cNW
xzh
@@ -116337,7 +133374,7 @@ iwV
lOU
caj
lOU
-cNW
+mtK
chz
cNW
cNW
@@ -116532,7 +133569,7 @@ xzh
xzh
xzh
xzh
-xzh
+sUX
xzh
aRW
aMZ
@@ -116594,7 +133631,7 @@ tds
cmo
cmo
cmo
-cNW
+mtK
chC
ciL
wZQ
@@ -116764,7 +133801,7 @@ xzh
xzh
xzh
xzh
-xzh
+sNY
xzh
xzh
xzh
@@ -116789,16 +133826,16 @@ xzh
xzh
xzh
xzh
-xzh
+sUX
xzh
aRW
bdV
-ngF
-qfK
+krf
+nCN
aTm
aRW
mmi
-emF
+mCy
mCy
aWh
wDE
@@ -116851,7 +133888,7 @@ iwV
cmo
cmo
cmo
-cNW
+mtK
ccp
ydc
ydc
@@ -117042,20 +134079,20 @@ xzh
xzh
xzh
bJc
-xzh
-xzh
-xzh
-xzh
-xzh
+sUX
+uga
+sUX
+uga
+sUX
xzh
aRW
aNa
pGV
-qfK
+nCN
eEe
xgU
aTn
-rNN
+vAy
sHn
aOU
mCy
@@ -117065,7 +134102,7 @@ bcC
pdi
gvV
bWq
-xRc
+bWq
gEp
gEp
gEp
@@ -117301,18 +134338,18 @@ xzh
xzh
xzh
xzh
+sUX
xzh
-xzh
-xzh
+sUX
xzh
aRW
bhV
aOc
-qfK
+nCN
giq
aRW
aTn
-aPs
+oAW
bdA
xeE
mCy
@@ -117333,7 +134370,7 @@ qUg
kBv
nTq
bWq
-lVd
+aAa
lVd
oWg
axw
@@ -117558,14 +134595,14 @@ xzh
xzh
xzh
xzh
-xzh
-xzh
-xzh
+uga
+sUX
+sUX
xzh
aRW
lFl
btS
-qfK
+gmO
aQF
aRW
aTn
@@ -117624,7 +134661,7 @@ qWu
ckS
mtK
jVl
-cOe
+cdu
mtK
ppZ
cly
@@ -117804,7 +134841,7 @@ xzh
xzh
xzh
xzh
-sNY
+xzh
xzh
xzh
xzh
@@ -117817,20 +134854,20 @@ xzh
xzh
xzh
xzh
-xzh
-xzh
+sUX
+sUX
aZm
aZm
aRW
cyp
-aRW
+aZm
aZm
sve
usT
bdA
bpn
mCy
-iIa
+usT
bdA
yhN
mCy
@@ -117883,9 +134920,9 @@ mtK
jVl
pxV
cjF
-cks
+kDK
clx
-cks
+aco
cnk
cks
cyU
@@ -118074,7 +135111,7 @@ xzh
xzh
xzh
xzh
-xzh
+uga
xzh
aRW
btP
@@ -118083,7 +135120,7 @@ qfK
bzA
aRW
aTn
-psS
+bpS
bdA
aXG
wDE
@@ -118095,9 +135132,9 @@ sAN
hZK
hyV
vmm
+lQS
qFY
-qFY
-qFY
+hGz
ess
gEp
taY
@@ -118334,21 +135371,21 @@ xzh
xzh
xzh
aRW
-btP
+wAB
csT
bkO
bUq
aRW
mmi
-rQj
-ano
jxH
+ano
+rEH
mCy
jxH
isC
deF
afE
-mCy
+wEv
fiO
nMc
bky
@@ -118391,7 +135428,7 @@ cNW
cNW
cNW
cNW
-cOe
+uzL
cNW
cNW
cNW
@@ -118596,16 +135633,16 @@ aVZ
dkC
ejL
aRW
-wPI
+gqf
mQo
-mCy
-mCy
-mCy
+euR
+euR
+euR
huL
-wPI
+gqf
tzu
wPI
-mQo
+qTE
qEE
lmS
bky
@@ -118615,9 +135652,9 @@ bky
boH
yar
cZH
-kyZ
-kyZ
-kyZ
+hDv
+hDv
+hDv
kyZ
kyZ
tGg
@@ -118639,16 +135676,16 @@ bNB
tkC
bYs
cOe
+iwu
cOe
-cOe
-cTI
-cOe
+dVF
+tyr
cad
cbi
cNW
aCu
-cdV
-cOe
+wjx
+obE
cNW
cgy
cdV
@@ -118874,7 +135911,7 @@ bky
bky
bky
bky
-btp
+hkx
mzp
bDh
bEF
@@ -118899,13 +135936,13 @@ cNW
cNW
cNW
cNW
-cOe
-cac
+qpV
+tCq
cbh
cNW
ccV
fSy
-cOe
+poz
cfv
cBL
xpA
@@ -118937,7 +135974,7 @@ bJc
xzh
xzh
xzh
-sNY
+xzh
xzh
xzh
xzh
@@ -119104,28 +136141,28 @@ xzh
xzh
xzh
xzh
-xzh
+sUX
xzh
xzh
aRW
-ngF
-aRW
-aPq
+gtC
+eQb
+cut
xey
xzh
sUX
xzh
xey
-aPq
-xey
-aPq
+gED
+rVE
+gED
xey
xzh
+sUX
xzh
-xzh
-uVE
-uRx
-uVE
+bky
+jkb
+bky
xzh
xzh
xzh
@@ -119151,17 +136188,17 @@ wZQ
cNW
xzh
xzh
-xzh
-xzh
-xzh
+bBM
+mkF
+bBM
cNW
-mUx
-cOe
+cRB
+vZI
cae
-cOe
-cOe
-cOe
-cOe
+pLd
+ulp
+moP
+rMq
ceT
cNW
wZQ
@@ -119361,28 +136398,28 @@ xzh
xzh
xzh
xzh
-xzh
-xzh
-xzh
+uga
+uga
+sUX
aRW
ngF
aRW
-aPq
+rQj
xey
xzh
sUX
xzh
xey
-aPq
+rQj
xey
-aPq
+rQj
xey
+sUX
+uga
xzh
-xzh
-xzh
-xzh
-xzh
-xzh
+aYy
+bgR
+aYy
xzh
xzh
xzh
@@ -119619,7 +136656,7 @@ xzh
xzh
xzh
xzh
-xzh
+uga
xzh
aRW
fnl
@@ -119635,7 +136672,7 @@ xey
hgu
xey
xzh
-xzh
+uga
xzh
xzh
xzh
@@ -119646,8 +136683,8 @@ xzh
xzh
bZi
jWt
-brG
-brG
+sGK
+sGK
wWu
brG
brG
@@ -119876,23 +136913,23 @@ xzh
xzh
xzh
xzh
-xzh
-xzh
+uga
+sUX
aRW
-ngF
-aRW
-aPq
+nFn
+qaX
+xmh
xey
sUX
sUX
sUX
xey
-aPq
+xmh
+lPf
+mEG
xey
-aPq
-xey
-xzh
-xzh
+sUX
+uga
xzh
xzh
xzh
@@ -119903,7 +136940,7 @@ xzh
xzh
bZi
btq
-brI
+bvR
bvR
xqJ
byx
@@ -119913,8 +136950,8 @@ mtK
fXd
lQR
tOg
-bGe
-bGe
+mWk
+mWk
mtK
cOT
cOT
@@ -120113,6 +137150,7 @@ xzh
xzh
xzh
xzh
+sNY
xzh
xzh
xzh
@@ -120134,20 +137172,19 @@ xzh
xzh
xzh
xzh
-xzh
-aRW
-nFn
-qaX
-xmh
-xey
+uRx
+uRx
+uRx
+xoB
+uRx
xzh
xzh
xzh
-xey
-xmh
-lPf
-mEG
-xey
+uRx
+uRx
+uRx
+uRx
+uRx
xzh
xzh
xzh
@@ -120189,9 +137226,9 @@ xzh
xzh
xzh
xzh
-uVE
-uRx
-uRx
+aYy
+bgR
+bvb
xzh
xzh
xzh
@@ -120392,19 +137429,19 @@ xzh
xzh
xzh
xzh
-uRx
-uRx
-uRx
-xoB
-uRx
xzh
xzh
xzh
-uRx
-uRx
-uRx
-uRx
-uRx
+xzh
+xzh
+xzh
+xzh
+xzh
+xzh
+xzh
+xzh
+xzh
+xzh
xzh
xzh
xzh
@@ -120980,7 +138017,7 @@ xzh
xzh
xzh
xzh
-sNY
+xzh
xzh
xzh
xzh
@@ -121213,6 +138250,50 @@ xzh
xzh
xzh
xzh
+xzh
+xzh
+xzh
+xzh
+xzh
+xzh
+xzh
+xzh
+xzh
+xzh
+xzh
+xzh
+xzh
+xzh
+xzh
+xzh
+xzh
+xzh
+xzh
+xzh
+xzh
+xzh
+xzh
+xzh
+xzh
+xzh
+xzh
+xzh
+xzh
+xzh
+xzh
+xzh
+xzh
+xzh
+xzh
+xzh
+xzh
+xzh
+xzh
+xzh
+xzh
+xzh
+xzh
+xzh
sNY
xzh
xzh
@@ -121259,50 +138340,6 @@ xzh
xzh
xzh
xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
-xzh
"}
(209,1,1) = {"
xzh
@@ -121441,7 +138478,7 @@ xzh
xzh
xzh
xzh
-sNY
+xzh
xzh
xzh
xzh
@@ -123496,7 +140533,7 @@ xzh
xzh
xzh
xzh
-xzh
+sNY
xzh
xzh
xzh
@@ -123781,7 +140818,7 @@ xzh
xzh
xzh
xzh
-xzh
+sNY
xzh
xzh
xzh
@@ -125856,7 +142893,7 @@ xzh
xzh
xzh
xzh
-xzh
+sNY
xzh
xzh
xzh
diff --git a/_maps/map_files/VoidRaptor/VoidRaptor.dmm b/_maps/map_files/VoidRaptor/VoidRaptor.dmm
index 27cab402860..341a86116d6 100644
--- a/_maps/map_files/VoidRaptor/VoidRaptor.dmm
+++ b/_maps/map_files/VoidRaptor/VoidRaptor.dmm
@@ -38043,11 +38043,11 @@
/area/station/security/execution/education)
"kOL" = (
/obj/structure/rack/gunrack,
-/obj/effect/spawner/armory_spawn/microfusion,
/obj/effect/turf_decal/tile/dark_red/half{
dir = 1
},
/obj/effect/turf_decal/delivery,
+/obj/effect/spawner/random/armory/e_gun,
/turf/open/floor/engine,
/area/station/ai_monitored/security/armory)
"kOS" = (
@@ -47008,8 +47008,7 @@
/obj/item/mecha_ammo/missiles_pep,
/obj/item/ammo_box/advanced/s12gauge,
/obj/item/ammo_box/advanced/s12gauge/buckshot,
-/obj/item/ammo_box/advanced/s12gauge/flechette,
-/obj/item/ammo_box/advanced/s12gauge/flechette,
+/obj/item/ammo_box/advanced/s12gauge/buckshot,
/turf/open/floor/engine,
/area/station/ai_monitored/security/armory)
"njl" = (
diff --git a/_maps/shuttles/skyrat/pirate_nri_raider.dmm b/_maps/shuttles/skyrat/pirate_nri_raider.dmm
index 12248b87b17..876c9b188c6 100644
--- a/_maps/shuttles/skyrat/pirate_nri_raider.dmm
+++ b/_maps/shuttles/skyrat/pirate_nri_raider.dmm
@@ -143,10 +143,10 @@
/obj/machinery/light/small/red/directional/north,
/obj/item/ammo_box/c27_54cesarzowa,
/obj/item/ammo_box/c27_54cesarzowa,
-/obj/item/ammo_box/c27_54cesarzowa/rubber{
+/obj/item/ammo_box/c27_54cesarzowa{
pixel_y = 6
},
-/obj/item/ammo_box/c27_54cesarzowa/rubber{
+/obj/item/ammo_box/c27_54cesarzowa{
pixel_y = 6
},
/obj/item/ammo_box/magazine/miecz,
@@ -922,11 +922,11 @@
pixel_x = 1;
pixel_y = 1
},
-/obj/item/ammo_box/c310_cargo_box/rubber{
+/obj/item/ammo_box/c310_cargo_box{
pixel_x = -1;
pixel_y = -1
},
-/obj/item/ammo_box/c310_cargo_box/rubber{
+/obj/item/ammo_box/c310_cargo_box{
pixel_x = -1;
pixel_y = -1
},
@@ -1025,8 +1025,6 @@
/obj/machinery/light/small/red/directional/south,
/obj/item/ammo_box/advanced/s12gauge/bean,
/obj/item/ammo_box/advanced/s12gauge/bean,
-/obj/item/ammo_box/advanced/s12gauge/magnum,
-/obj/item/ammo_box/advanced/s12gauge/express,
/turf/open/floor/pod/dark,
/area/shuttle/pirate/nri)
"JS" = (
diff --git a/_maps/skyrat/automapper/templates/birdshot/birdshot_armory.dmm b/_maps/skyrat/automapper/templates/birdshot/birdshot_armory.dmm
new file mode 100644
index 00000000000..eb6c6ff911a
--- /dev/null
+++ b/_maps/skyrat/automapper/templates/birdshot/birdshot_armory.dmm
@@ -0,0 +1,120 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/structure/rack/gunrack,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/airalarm/directional/west,
+/turf/open/floor/iron/dark/small,
+/area/station/ai_monitored/security/armory)
+"f" = (
+/obj/structure/rack/gunrack,
+/obj/effect/spawner/armory_spawn/shotguns,
+/obj/item/radio/intercom/directional/west,
+/turf/open/floor/iron/dark/small,
+/area/station/ai_monitored/security/armory)
+"z" = (
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/structure/rack/gunrack,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/spawner/armory_spawn/smg,
+/turf/open/floor/iron/dark/small,
+/area/station/ai_monitored/security/armory)
+"A" = (
+/obj/structure/rack,
+/obj/item/clothing/head/helmet/sec{
+ pixel_x = -3;
+ pixel_y = 3
+ },
+/obj/item/clothing/head/helmet/sec,
+/obj/item/clothing/head/helmet/sec{
+ pixel_x = 3;
+ pixel_y = -3
+ },
+/obj/item/clothing/suit/armor/vest/alt/sec{
+ pixel_x = -3;
+ pixel_y = 3
+ },
+/obj/item/clothing/suit/armor/vest/alt/sec,
+/obj/item/clothing/suit/armor/vest/alt/sec{
+ pixel_x = 3;
+ pixel_y = -3
+ },
+/obj/structure/cable,
+/turf/open/floor/iron/dark/small,
+/area/station/ai_monitored/security/armory)
+"B" = (
+/obj/item/clothing/mask/gas/sechailer{
+ pixel_x = -3;
+ pixel_y = 3
+ },
+/obj/item/clothing/mask/gas/sechailer,
+/obj/item/clothing/mask/gas/sechailer{
+ pixel_x = 3;
+ pixel_y = -3
+ },
+/obj/item/flashlight/seclite,
+/obj/item/flashlight/seclite,
+/obj/item/flashlight/seclite,
+/obj/structure/table,
+/obj/item/storage/barricade{
+ pixel_y = -5
+ },
+/obj/item/storage/barricade,
+/obj/item/storage/barricade{
+ pixel_y = 5
+ },
+/turf/open/floor/iron/dark/small,
+/area/station/ai_monitored/security/armory)
+"Q" = (
+/obj/structure/closet/secure_closet/armory_kiboko,
+/turf/open/floor/iron/dark/small,
+/area/station/ai_monitored/security/armory)
+"R" = (
+/turf/template_noop,
+/area/template_noop)
+
+(1,1,1) = {"
+B
+z
+a
+f
+R
+R
+"}
+(2,1,1) = {"
+R
+R
+R
+R
+R
+R
+"}
+(3,1,1) = {"
+Q
+R
+R
+R
+R
+R
+"}
+(4,1,1) = {"
+R
+R
+R
+R
+R
+A
+"}
diff --git a/_maps/skyrat/automapper/templates/deltastation/deltastation_armory.dmm b/_maps/skyrat/automapper/templates/deltastation/deltastation_armory.dmm
new file mode 100644
index 00000000000..abaa6550ac8
--- /dev/null
+++ b/_maps/skyrat/automapper/templates/deltastation/deltastation_armory.dmm
@@ -0,0 +1,148 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"j" = (
+/obj/effect/turf_decal/bot,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/structure/window/reinforced/spawner/directional/east{
+ pixel_x = 3
+ },
+/obj/structure/rack/gunrack,
+/obj/effect/spawner/armory_spawn/shotguns,
+/turf/open/floor/iron/dark,
+/area/station/ai_monitored/security/armory)
+"k" = (
+/obj/structure/secure_safe/directional/east,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/machinery/dish_drive/bullet,
+/turf/open/floor/iron/dark,
+/area/station/ai_monitored/security/armory)
+"l" = (
+/obj/effect/turf_decal/bot,
+/obj/structure/window/reinforced/spawner/directional/east{
+ pixel_x = 3
+ },
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/structure/window/reinforced/spawner/directional/south,
+/obj/structure/rack/gunrack,
+/turf/open/floor/iron/dark,
+/area/station/ai_monitored/security/armory)
+"E" = (
+/obj/structure/rack,
+/obj/structure/window/reinforced/spawner/directional/north,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/effect/turf_decal/bot,
+/obj/item/clothing/suit/armor/vest/alt/sec{
+ pixel_x = 3;
+ pixel_y = -3
+ },
+/obj/item/clothing/suit/armor/vest/alt/sec,
+/obj/item/clothing/suit/armor/vest/alt/sec{
+ pixel_x = -3;
+ pixel_y = 3
+ },
+/obj/item/clothing/head/helmet/sec{
+ pixel_x = 3;
+ pixel_y = -3
+ },
+/obj/item/clothing/head/helmet/sec,
+/obj/item/clothing/head/helmet/sec{
+ pixel_x = -3;
+ pixel_y = 3
+ },
+/turf/open/floor/iron/dark,
+/area/station/ai_monitored/security/armory)
+"L" = (
+/obj/effect/turf_decal/bot,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/structure/window/reinforced/spawner/directional/east{
+ pixel_x = 3
+ },
+/obj/structure/rack/gunrack,
+/obj/effect/spawner/armory_spawn/smg,
+/turf/open/floor/iron/dark,
+/area/station/ai_monitored/security/armory)
+"M" = (
+/obj/structure/rack,
+/obj/item/gun/energy/ionrifle,
+/obj/item/clothing/suit/hooded/ablative,
+/obj/item/gun/energy/temperature/security,
+/obj/structure/window/reinforced/spawner/directional/south,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/effect/turf_decal/bot,
+/turf/open/floor/iron/dark,
+/area/station/ai_monitored/security/armory)
+"O" = (
+/obj/structure/table/reinforced,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/machinery/airalarm/directional/north,
+/obj/item/storage/barricade{
+ pixel_y = 10
+ },
+/obj/item/storage/barricade{
+ pixel_y = 5
+ },
+/obj/item/storage/barricade,
+/turf/open/floor/iron/dark,
+/area/station/ai_monitored/security/armory)
+"R" = (
+/obj/structure/rack,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/effect/turf_decal/bot,
+/obj/effect/spawner/random/armory/riot_helmet,
+/obj/effect/spawner/random/armory/riot_armor,
+/obj/effect/spawner/random/armory/riot_shield,
+/turf/open/floor/iron/dark,
+/area/station/ai_monitored/security/armory)
+"U" = (
+/obj/structure/rack,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/effect/turf_decal/bot,
+/obj/effect/spawner/random/armory/bulletproof_armor,
+/obj/effect/spawner/random/armory/bulletproof_helmet,
+/turf/open/floor/iron/dark,
+/area/station/ai_monitored/security/armory)
+"X" = (
+/obj/effect/turf_decal/bot,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/structure/window/reinforced/spawner/directional/east{
+ pixel_x = 3
+ },
+/obj/structure/window/reinforced/spawner/directional/north,
+/obj/structure/closet/secure_closet/armory_kiboko,
+/turf/open/floor/iron/dark,
+/area/station/ai_monitored/security/armory)
+"Y" = (
+/turf/template_noop,
+/area/template_noop)
+
+(1,1,1) = {"
+O
+Y
+X
+L
+j
+l
+"}
+(2,1,1) = {"
+Y
+Y
+E
+U
+R
+M
+"}
+(3,1,1) = {"
+Y
+Y
+Y
+Y
+Y
+Y
+"}
+(4,1,1) = {"
+Y
+Y
+Y
+k
+Y
+Y
+"}
diff --git a/_maps/skyrat/automapper/templates/icebox/icebox_armory_middle.dmm b/_maps/skyrat/automapper/templates/icebox/icebox_armory_middle.dmm
new file mode 100644
index 00000000000..f1479a3a01c
--- /dev/null
+++ b/_maps/skyrat/automapper/templates/icebox/icebox_armory_middle.dmm
@@ -0,0 +1,122 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"d" = (
+/obj/structure/window/reinforced/spawner/directional/north,
+/obj/effect/turf_decal/tile/red/half{
+ dir = 8
+ },
+/obj/structure/closet/ammunitionlocker/useful,
+/obj/item/storage/box/lethalshot,
+/obj/item/storage/box/lethalshot,
+/obj/item/storage/box/lethalshot,
+/obj/item/storage/box/lethalshot,
+/turf/open/floor/iron/dark/textured,
+/area/station/ai_monitored/security/armory)
+"e" = (
+/obj/machinery/light/directional/north,
+/obj/structure/rack/gunrack,
+/obj/effect/turf_decal/tile/red/half,
+/obj/effect/spawner/armory_spawn/smg,
+/turf/open/floor/iron/dark/textured,
+/area/station/ai_monitored/security/armory)
+"g" = (
+/obj/structure/rack,
+/obj/item/gun/energy/ionrifle,
+/obj/item/gun/energy/temperature/security,
+/obj/item/clothing/suit/hooded/ablative,
+/obj/effect/turf_decal/tile/red/half{
+ dir = 8
+ },
+/obj/item/gun/grenadelauncher,
+/turf/open/floor/iron/dark/textured,
+/area/station/ai_monitored/security/armory)
+"i" = (
+/obj/structure/rack,
+/obj/item/clothing/head/helmet/sec{
+ pixel_x = -3;
+ pixel_y = 3
+ },
+/obj/item/clothing/head/helmet/sec,
+/obj/item/clothing/head/helmet/sec{
+ pixel_x = 3;
+ pixel_y = -3
+ },
+/obj/item/clothing/suit/armor/vest/alt/sec{
+ pixel_x = 3;
+ pixel_y = -3
+ },
+/obj/item/clothing/suit/armor/vest/alt/sec,
+/obj/item/clothing/suit/armor/vest/alt/sec{
+ pixel_x = -3;
+ pixel_y = 3
+ },
+/obj/effect/turf_decal/tile/red/half{
+ dir = 8
+ },
+/turf/open/floor/iron/dark/textured,
+/area/station/ai_monitored/security/armory)
+"q" = (
+/obj/structure/window/reinforced/spawner/directional/north,
+/obj/effect/turf_decal/tile/red/anticorner/contrasted{
+ dir = 4
+ },
+/obj/structure/rack/gunrack,
+/obj/effect/spawner/armory_spawn/shotguns,
+/turf/open/floor/iron/dark/textured,
+/area/station/ai_monitored/security/armory)
+"x" = (
+/obj/effect/turf_decal/tile/red/half{
+ dir = 4
+ },
+/obj/structure/rack/gunrack,
+/turf/open/floor/iron/dark/textured,
+/area/station/ai_monitored/security/armory)
+"B" = (
+/obj/machinery/camera/directional/north{
+ c_tag = "Armory - Internal - Lower"
+ },
+/obj/effect/turf_decal/tile/red/half,
+/obj/structure/closet/secure_closet/armory_kiboko,
+/turf/open/floor/iron/dark/textured,
+/area/station/ai_monitored/security/armory)
+"M" = (
+/obj/structure/rack,
+/obj/item/storage/box/teargas{
+ pixel_x = -3;
+ pixel_y = 3
+ },
+/obj/item/storage/box/handcuffs,
+/obj/item/storage/box/flashbangs{
+ pixel_x = 3;
+ pixel_y = -3
+ },
+/obj/effect/turf_decal/tile/red/half{
+ dir = 8
+ },
+/obj/item/storage/toolbox/drone,
+/turf/open/floor/iron/dark/textured,
+/area/station/ai_monitored/security/armory)
+"W" = (
+/turf/template_noop,
+/area/template_noop)
+
+(1,1,1) = {"
+e
+W
+W
+q
+x
+"}
+(2,1,1) = {"
+B
+W
+W
+W
+W
+"}
+(3,1,1) = {"
+M
+W
+i
+d
+g
+"}
diff --git a/_maps/skyrat/automapper/templates/kilostation/kilostation_armory.dmm b/_maps/skyrat/automapper/templates/kilostation/kilostation_armory.dmm
new file mode 100644
index 00000000000..e8792ab5b91
--- /dev/null
+++ b/_maps/skyrat/automapper/templates/kilostation/kilostation_armory.dmm
@@ -0,0 +1,447 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/obj/structure/rack,
+/obj/effect/turf_decal/bot,
+/obj/effect/turf_decal/tile/neutral/half/contrasted{
+ dir = 4
+ },
+/obj/effect/spawner/random/armory/riot_armor,
+/obj/effect/spawner/random/armory/riot_helmet,
+/obj/effect/spawner/random/armory/riot_shield,
+/turf/open/floor/iron/dark,
+/area/station/ai_monitored/security/armory)
+"b" = (
+/obj/effect/turf_decal/stripes/corner{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/turf_decal/tile/neutral/half/contrasted,
+/turf/open/floor/iron/showroomfloor,
+/area/station/ai_monitored/security/armory)
+"c" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 10
+ },
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/turf/open/floor/iron/showroomfloor,
+/area/station/ai_monitored/security/armory)
+"d" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes/corner,
+/obj/effect/turf_decal/tile/red/half/contrasted{
+ dir = 4
+ },
+/turf/open/floor/iron/showroomfloor,
+/area/station/ai_monitored/security/armory)
+"e" = (
+/obj/machinery/flasher/portable,
+/obj/effect/turf_decal/box,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/turf/open/floor/iron/dark,
+/area/station/ai_monitored/security/armory)
+"f" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/turf_decal/tile/neutral/half/contrasted{
+ dir = 4
+ },
+/turf/open/floor/iron/showroomfloor,
+/area/station/ai_monitored/security/armory)
+"h" = (
+/obj/item/storage/box/teargas{
+ pixel_x = 3;
+ pixel_y = 3
+ },
+/obj/item/storage/box/handcuffs,
+/obj/item/storage/box/flashbangs{
+ pixel_x = -3;
+ pixel_y = -3
+ },
+/obj/structure/table,
+/obj/structure/extinguisher_cabinet/directional/east,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/turf/open/floor/iron/dark,
+/area/station/ai_monitored/security/armory)
+"j" = (
+/obj/structure/table,
+/obj/item/key/security,
+/obj/item/key/security,
+/obj/item/gun/energy/e_gun/dragnet,
+/obj/item/gun/energy/e_gun/dragnet{
+ pixel_x = -4;
+ pixel_y = 4
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/effect/spawner/random/armory/barrier_grenades,
+/turf/open/floor/iron/dark,
+/area/station/ai_monitored/security/armory)
+"k" = (
+/obj/effect/turf_decal/stripes/corner{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/cable,
+/obj/effect/turf_decal/tile/neutral/half/contrasted,
+/turf/open/floor/iron/showroomfloor,
+/area/station/ai_monitored/security/armory)
+"l" = (
+/obj/structure/rack,
+/obj/effect/turf_decal/bot,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/tile/neutral/half/contrasted{
+ dir = 4
+ },
+/obj/effect/spawner/random/armory/bulletproof_armor,
+/obj/effect/spawner/random/armory/bulletproof_helmet,
+/turf/open/floor/iron/dark,
+/area/station/ai_monitored/security/armory)
+"m" = (
+/obj/structure/closet/secure_closet{
+ name = "shotgun rubber rounds locker";
+ req_access = list("armory")
+ },
+/obj/effect/turf_decal/bot,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/effect/spawner/random/armory/rubbershot,
+/obj/effect/spawner/random/armory/rubbershot,
+/turf/open/floor/iron/dark,
+/area/station/ai_monitored/security/armory)
+"o" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/light/directional/north,
+/obj/machinery/firealarm/directional/north,
+/obj/effect/turf_decal/box,
+/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{
+ dir = 8
+ },
+/obj/machinery/flasher/portable,
+/turf/open/floor/iron/dark,
+/area/station/ai_monitored/security/armory)
+"p" = (
+/obj/structure/cable,
+/obj/structure/closet/secure_closet{
+ name = "contraband locker";
+ req_access = list("armory")
+ },
+/obj/effect/spawner/random/contraband/armory,
+/obj/effect/spawner/random/maintenance/three,
+/obj/machinery/power/apc/auto_name/directional/south,
+/obj/effect/turf_decal/tile/neutral/half/contrasted{
+ dir = 1
+ },
+/turf/open/floor/iron/dark,
+/area/station/ai_monitored/security/armory)
+"t" = (
+/obj/effect/turf_decal/bot,
+/obj/effect/decal/cleanable/dirt,
+/obj/item/radio/intercom/directional/south,
+/obj/machinery/suit_storage_unit/security,
+/obj/effect/turf_decal/tile/neutral/half/contrasted{
+ dir = 1
+ },
+/turf/open/floor/iron/dark,
+/area/station/ai_monitored/security/armory)
+"v" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 6
+ },
+/obj/structure/cable,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/turf/open/floor/iron/showroomfloor,
+/area/station/ai_monitored/security/armory)
+"w" = (
+/obj/effect/turf_decal/stripes/end{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/neutral/half/contrasted{
+ dir = 4
+ },
+/turf/open/floor/iron/dark,
+/area/station/ai_monitored/security/armory)
+"x" = (
+/obj/effect/turf_decal/stripes/corner{
+ dir = 4
+ },
+/obj/structure/cable,
+/mob/living/simple_animal/bot/secbot/beepsky/armsky,
+/obj/effect/turf_decal/tile/neutral/half/contrasted{
+ dir = 8
+ },
+/turf/open/floor/iron/showroomfloor,
+/area/station/ai_monitored/security/armory)
+"y" = (
+/obj/effect/turf_decal/stripes/line,
+/obj/effect/turf_decal/tile/neutral/half/contrasted{
+ dir = 1
+ },
+/turf/open/floor/iron/showroomfloor,
+/area/station/ai_monitored/security/armory)
+"z" = (
+/obj/structure/rack,
+/obj/effect/turf_decal/bot,
+/obj/structure/window/reinforced/spawner/directional/south,
+/obj/structure/window/reinforced/spawner/directional/west,
+/obj/effect/turf_decal/tile/neutral/anticorner/contrasted,
+/obj/effect/spawner/random/armory/disablers,
+/turf/open/floor/iron/showroomfloor,
+/area/station/ai_monitored/security/armory)
+"A" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 6
+ },
+/obj/effect/turf_decal/tile/red/half/contrasted{
+ dir = 4
+ },
+/turf/open/floor/iron/showroomfloor,
+/area/station/ai_monitored/security/armory)
+"B" = (
+/obj/structure/rack,
+/obj/effect/turf_decal/bot,
+/obj/structure/window/reinforced/spawner/directional/north,
+/obj/structure/window/reinforced/spawner/directional/west,
+/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{
+ dir = 4
+ },
+/turf/open/floor/iron/showroomfloor,
+/area/station/ai_monitored/security/armory)
+"C" = (
+/obj/effect/turf_decal/bot,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/suit_storage_unit/security,
+/obj/effect/turf_decal/tile/neutral/half/contrasted{
+ dir = 1
+ },
+/turf/open/floor/iron/dark,
+/area/station/ai_monitored/security/armory)
+"F" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 5
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+ dir = 8
+ },
+/obj/structure/cable,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/turf/open/floor/iron/showroomfloor,
+/area/station/ai_monitored/security/armory)
+"G" = (
+/obj/item/storage/box/chemimp{
+ pixel_x = 6;
+ pixel_y = 6
+ },
+/obj/item/storage/box/trackimp{
+ pixel_x = -6;
+ pixel_y = 6
+ },
+/obj/structure/table,
+/obj/machinery/light/directional/south,
+/obj/structure/reagent_dispensers/wall/peppertank/directional/south,
+/obj/item/storage/box/firingpins,
+/obj/item/storage/box/firingpins,
+/obj/item/storage/lockbox/loyalty,
+/obj/effect/turf_decal/tile/neutral/half/contrasted{
+ dir = 1
+ },
+/turf/open/floor/iron/dark,
+/area/station/ai_monitored/security/armory)
+"J" = (
+/obj/effect/turf_decal/stripes/corner{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes/corner{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/turf_decal/tile/neutral/half/contrasted{
+ dir = 4
+ },
+/turf/open/floor/iron/showroomfloor,
+/area/station/ai_monitored/security/armory)
+"K" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/landmark/event_spawn,
+/obj/structure/cable,
+/obj/effect/turf_decal/tile/red/half/contrasted{
+ dir = 1
+ },
+/turf/open/floor/iron/showroomfloor,
+/area/station/ai_monitored/security/armory)
+"M" = (
+/obj/effect/turf_decal/bot,
+/obj/effect/turf_decal/tile/neutral/half/contrasted,
+/obj/structure/closet/secure_closet/armory_kiboko,
+/obj/item/ammo_box/c980grenade/riot,
+/obj/item/ammo_box/c980grenade/smoke,
+/obj/structure/sign/poster/official/carwo_grenade/directional/north,
+/turf/open/floor/iron/dark,
+/area/station/ai_monitored/security/armory)
+"N" = (
+/obj/structure/rack,
+/obj/item/gun/energy/ionrifle{
+ pixel_y = 4
+ },
+/obj/item/gun/energy/temperature/security,
+/obj/effect/turf_decal/bot,
+/obj/item/clothing/suit/hooded/ablative,
+/obj/machinery/light_switch/directional/east,
+/obj/effect/turf_decal/tile/neutral/half/contrasted{
+ dir = 1
+ },
+/turf/open/floor/iron/dark,
+/area/station/ai_monitored/security/armory)
+"P" = (
+/obj/structure/rack,
+/obj/effect/turf_decal/bot,
+/obj/structure/window/reinforced/spawner/directional/north,
+/obj/structure/window/reinforced/spawner/directional/east,
+/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{
+ dir = 1
+ },
+/obj/effect/spawner/random/armory/e_gun,
+/turf/open/floor/iron/showroomfloor,
+/area/station/ai_monitored/security/armory)
+"S" = (
+/obj/machinery/flasher/portable,
+/obj/machinery/camera/motion/directional/east{
+ c_tag = "Armoury Internal"
+ },
+/obj/effect/turf_decal/box,
+/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{
+ dir = 8
+ },
+/turf/open/floor/iron/dark,
+/area/station/ai_monitored/security/armory)
+"T" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 9
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/turf_decal/tile/neutral,
+/turf/open/floor/iron/showroomfloor,
+/area/station/ai_monitored/security/armory)
+"V" = (
+/obj/effect/turf_decal/stripes/corner,
+/obj/structure/cable,
+/obj/effect/turf_decal/tile/neutral/half/contrasted{
+ dir = 8
+ },
+/turf/open/floor/iron/showroomfloor,
+/area/station/ai_monitored/security/armory)
+"W" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/turf_decal/tile/red/half/contrasted{
+ dir = 1
+ },
+/turf/open/floor/iron/showroomfloor,
+/area/station/ai_monitored/security/armory)
+"Y" = (
+/obj/structure/rack,
+/obj/effect/turf_decal/bot,
+/obj/structure/window/reinforced/spawner/directional/south,
+/obj/structure/window/reinforced/spawner/directional/east,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{
+ dir = 8
+ },
+/obj/effect/spawner/armory_spawn/shotguns,
+/turf/open/floor/iron/showroomfloor,
+/area/station/ai_monitored/security/armory)
+"Z" = (
+/obj/item/clothing/mask/gas/sechailer{
+ pixel_x = -3;
+ pixel_y = 3
+ },
+/obj/item/clothing/mask/gas/sechailer,
+/obj/item/clothing/mask/gas/sechailer{
+ pixel_x = 3;
+ pixel_y = -3
+ },
+/obj/item/flashlight/seclite,
+/obj/item/flashlight/seclite,
+/obj/item/flashlight/seclite,
+/obj/effect/decal/cleanable/cobweb,
+/obj/machinery/airalarm/directional/west,
+/obj/structure/table,
+/obj/effect/turf_decal/tile/neutral,
+/turf/open/floor/iron/dark,
+/area/station/ai_monitored/security/armory)
+
+(1,1,1) = {"
+Z
+l
+a
+w
+m
+j
+"}
+(2,1,1) = {"
+M
+T
+f
+J
+c
+G
+"}
+(3,1,1) = {"
+W
+b
+P
+Y
+y
+C
+"}
+(4,1,1) = {"
+K
+k
+B
+z
+y
+t
+"}
+(5,1,1) = {"
+o
+F
+x
+V
+v
+p
+"}
+(6,1,1) = {"
+e
+S
+d
+A
+N
+h
+"}
diff --git a/_maps/skyrat/automapper/templates/metastation/metastation_armory.dmm b/_maps/skyrat/automapper/templates/metastation/metastation_armory.dmm
new file mode 100644
index 00000000000..048bf6e036a
--- /dev/null
+++ b/_maps/skyrat/automapper/templates/metastation/metastation_armory.dmm
@@ -0,0 +1,395 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"b" = (
+/obj/structure/rack/gunrack,
+/obj/effect/spawner/armory_spawn/shotguns,
+/obj/effect/turf_decal/delivery/red,
+/turf/open/floor/iron/smooth,
+/area/station/ai_monitored/security/armory)
+"e" = (
+/obj/machinery/airalarm/directional/north,
+/obj/structure/rack/gunrack,
+/obj/effect/turf_decal/delivery/red,
+/turf/open/floor/iron/smooth,
+/area/station/ai_monitored/security/armory)
+"f" = (
+/obj/effect/turf_decal/trimline/red/filled/corner{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/cable,
+/turf/open/floor/iron/dark,
+/area/station/ai_monitored/security/armory)
+"g" = (
+/obj/effect/turf_decal/bot_blue,
+/obj/machinery/firealarm/directional/east,
+/obj/structure/closet/secure_closet/armory_kiboko,
+/turf/open/floor/iron/dark,
+/area/station/ai_monitored/security/armory)
+"h" = (
+/obj/structure/cable,
+/obj/machinery/power/apc/auto_name/directional/south,
+/turf/open/floor/iron/dark,
+/area/station/ai_monitored/security/armory)
+"i" = (
+/turf/closed/wall/r_wall,
+/area/station/security/lockers)
+"j" = (
+/obj/machinery/dish_drive/bullet{
+ suck_distance = 0
+ },
+/obj/machinery/light_switch/directional/east,
+/turf/open/floor/iron/dark,
+/area/station/ai_monitored/security/armory)
+"l" = (
+/obj/effect/turf_decal/trimline/neutral/filled/corner{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron/dark,
+/area/station/ai_monitored/security/armory)
+"n" = (
+/obj/effect/turf_decal/trimline/neutral/filled/corner{
+ dir = 4
+ },
+/turf/open/floor/iron/dark,
+/area/station/ai_monitored/security/armory)
+"o" = (
+/obj/effect/turf_decal/trimline/neutral/filled/corner{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/dark_blue/filled/warning{
+ dir = 1
+ },
+/turf/open/floor/iron/dark,
+/area/station/ai_monitored/security/armory)
+"p" = (
+/obj/structure/rack,
+/obj/item/storage/barricade{
+ pixel_y = -5
+ },
+/obj/item/storage/barricade,
+/obj/item/storage/barricade{
+ pixel_y = 5
+ },
+/turf/open/floor/iron/dark,
+/area/station/ai_monitored/security/armory)
+"q" = (
+/obj/structure/rack,
+/obj/effect/turf_decal/tile/blue/anticorner/contrasted,
+/obj/effect/spawner/random/armory/riot_shield,
+/turf/open/floor/iron/dark,
+/area/station/ai_monitored/security/armory)
+"r" = (
+/obj/structure/rack,
+/obj/effect/turf_decal/tile/blue/half/contrasted{
+ dir = 4
+ },
+/obj/effect/spawner/random/armory/barrier_grenades,
+/turf/open/floor/iron/dark,
+/area/station/ai_monitored/security/armory)
+"s" = (
+/turf/template_noop,
+/area/template_noop)
+"t" = (
+/obj/structure/rack,
+/obj/effect/turf_decal/tile/blue/half/contrasted{
+ dir = 4
+ },
+/obj/item/melee/breaching_hammer,
+/obj/item/melee/breaching_hammer,
+/obj/item/melee/breaching_hammer,
+/turf/open/floor/iron/dark,
+/area/station/ai_monitored/security/armory)
+"u" = (
+/obj/structure/cable,
+/turf/open/floor/iron/dark,
+/area/station/ai_monitored/security/armory)
+"w" = (
+/obj/structure/closet/ammunitionlocker/useful,
+/obj/machinery/light/directional/north,
+/obj/effect/turf_decal/delivery/red,
+/obj/item/storage/box/lethalshot,
+/obj/item/storage/box/lethalshot,
+/obj/item/storage/box/lethalshot,
+/obj/item/storage/box/lethalshot,
+/turf/open/floor/iron/smooth,
+/area/station/ai_monitored/security/armory)
+"y" = (
+/obj/effect/turf_decal/trimline/red/filled/corner,
+/turf/open/floor/iron/dark,
+/area/station/ai_monitored/security/armory)
+"A" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/structure/cable,
+/turf/open/floor/plating,
+/area/station/ai_monitored/security/armory)
+"C" = (
+/obj/effect/turf_decal/delivery/red,
+/obj/structure/rack/gunrack,
+/obj/effect/spawner/armory_spawn/smg,
+/turf/open/floor/iron/smooth,
+/area/station/ai_monitored/security/armory)
+"D" = (
+/obj/effect/turf_decal/trimline/dark_blue/filled/warning{
+ dir = 1
+ },
+/turf/open/floor/iron/dark,
+/area/station/ai_monitored/security/armory)
+"F" = (
+/obj/structure/rack,
+/obj/item/clothing/glasses/hud/security/sunglasses/gars{
+ pixel_x = 3;
+ pixel_y = -2
+ },
+/obj/item/clothing/glasses/hud/security/sunglasses/gars{
+ pixel_x = 3;
+ pixel_y = 2
+ },
+/obj/item/clothing/glasses/hud/security/sunglasses{
+ pixel_x = -3;
+ pixel_y = -2
+ },
+/obj/item/clothing/glasses/hud/security/sunglasses{
+ pixel_x = -3;
+ pixel_y = 2
+ },
+/obj/machinery/airalarm/directional/west,
+/obj/machinery/camera/motion/directional/west{
+ c_tag = "Armory - Internal"
+ },
+/obj/machinery/light/directional/west,
+/obj/effect/turf_decal/tile/blue/anticorner/contrasted,
+/turf/open/floor/iron/dark,
+/area/station/ai_monitored/security/armory)
+"G" = (
+/obj/effect/turf_decal/trimline/neutral/filled/corner{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
+/turf/open/floor/iron/dark,
+/area/station/ai_monitored/security/armory)
+"H" = (
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/machinery/door/poddoor/shutters/window{
+ id = "armory";
+ name = "Armory Shutters"
+ },
+/turf/open/floor/iron/dark,
+/area/station/ai_monitored/security/armory)
+"I" = (
+/obj/structure/cable,
+/obj/machinery/button/door/directional/south{
+ id = "armory";
+ name = "Armory Shutters";
+ req_access = list("armory")
+ },
+/turf/open/floor/iron/dark,
+/area/station/ai_monitored/security/armory)
+"J" = (
+/obj/structure/rack,
+/obj/effect/spawner/random/armory/riot_armor,
+/obj/effect/spawner/random/armory/bulletproof_armor,
+/obj/machinery/requests_console/directional/north{
+ department = "Security";
+ name = "Security Requests Console"
+ },
+/obj/effect/mapping_helpers/requests_console/supplies,
+/obj/effect/mapping_helpers/requests_console/assistance,
+/obj/effect/turf_decal/tile/blue/half/contrasted,
+/turf/open/floor/iron/dark,
+/area/station/ai_monitored/security/armory)
+"K" = (
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/security{
+ name = "Armory"
+ },
+/obj/effect/mapping_helpers/airlock/cyclelink_helper,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/structure/cable,
+/obj/effect/turf_decal/delivery,
+/obj/effect/mapping_helpers/airlock/access/all/security/armory,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/iron/dark,
+/area/station/ai_monitored/security/armory)
+"L" = (
+/obj/effect/turf_decal/bot,
+/mob/living/simple_animal/bot/secbot/beepsky/armsky,
+/turf/open/floor/iron/dark,
+/area/station/ai_monitored/security/armory)
+"M" = (
+/obj/effect/turf_decal/trimline/red/filled/corner{
+ dir = 1
+ },
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
+/turf/open/floor/iron/dark,
+/area/station/ai_monitored/security/armory)
+"N" = (
+/turf/closed/wall/r_wall,
+/area/station/ai_monitored/security/armory)
+"O" = (
+/obj/structure/rack,
+/obj/machinery/light/directional/west,
+/obj/structure/cable,
+/obj/effect/turf_decal/tile/blue/half/contrasted,
+/obj/effect/spawner/random/armory/riot_armor,
+/obj/effect/spawner/random/armory/bulletproof_helmet,
+/turf/open/floor/iron/dark,
+/area/station/ai_monitored/security/armory)
+"Q" = (
+/obj/effect/turf_decal/trimline/dark_blue/filled/corner,
+/obj/effect/turf_decal/trimline/dark_blue/filled/warning{
+ dir = 1
+ },
+/turf/open/floor/iron/dark,
+/area/station/ai_monitored/security/armory)
+"R" = (
+/obj/structure/table/reinforced,
+/obj/machinery/door/window/brigdoor/left/directional/north{
+ name = "Weapon Distribution";
+ req_access = list("armory")
+ },
+/obj/item/paper,
+/obj/machinery/door/firedoor,
+/obj/machinery/door/window/left/directional/south{
+ name = "Requests Window"
+ },
+/obj/item/pen,
+/turf/open/floor/iron/dark,
+/area/station/ai_monitored/security/armory)
+"T" = (
+/obj/effect/turf_decal/trimline/neutral/filled/corner{
+ dir = 4
+ },
+/obj/structure/cable,
+/turf/open/floor/iron/dark,
+/area/station/ai_monitored/security/armory)
+"V" = (
+/obj/structure/rack,
+/obj/item/gun/energy/ionrifle,
+/obj/item/gun/energy/temperature/security,
+/obj/item/clothing/suit/hooded/ablative,
+/obj/item/gun/grenadelauncher,
+/obj/item/storage/box/teargas{
+ pixel_x = 1;
+ pixel_y = -2
+ },
+/obj/item/storage/box/flashes{
+ pixel_x = 3
+ },
+/turf/open/floor/iron/dark,
+/area/station/ai_monitored/security/armory)
+"X" = (
+/obj/effect/turf_decal/trimline/red/filled/corner{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron/dark,
+/area/station/ai_monitored/security/armory)
+"Y" = (
+/obj/structure/rack,
+/obj/effect/spawner/random/armory/barrier_grenades,
+/turf/open/floor/iron/dark,
+/area/station/ai_monitored/security/armory)
+
+(1,1,1) = {"
+s
+s
+s
+s
+s
+N
+N
+A
+N
+"}
+(2,1,1) = {"
+s
+s
+s
+s
+s
+A
+O
+u
+H
+"}
+(3,1,1) = {"
+s
+s
+s
+s
+s
+N
+J
+u
+H
+"}
+(4,1,1) = {"
+N
+N
+N
+N
+N
+N
+q
+I
+N
+"}
+(5,1,1) = {"
+N
+b
+D
+r
+t
+F
+L
+h
+N
+"}
+(6,1,1) = {"
+N
+w
+Q
+n
+y
+n
+y
+T
+R
+"}
+(7,1,1) = {"
+N
+e
+o
+M
+l
+X
+G
+f
+K
+"}
+(8,1,1) = {"
+N
+C
+D
+p
+V
+g
+Y
+j
+A
+"}
+(9,1,1) = {"
+i
+N
+A
+A
+N
+N
+N
+N
+N
+"}
diff --git a/_maps/skyrat/automapper/templates/northstar/northstar_armory.dmm b/_maps/skyrat/automapper/templates/northstar/northstar_armory.dmm
new file mode 100644
index 00000000000..167d6b61f8c
--- /dev/null
+++ b/_maps/skyrat/automapper/templates/northstar/northstar_armory.dmm
@@ -0,0 +1,128 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/turf/template_noop,
+/area/template_noop)
+"y" = (
+/obj/structure/rack/gunrack,
+/obj/structure/window/reinforced/spawner/directional/west,
+/obj/effect/spawner/armory_spawn/smg,
+/turf/open/floor/iron/dark,
+/area/station/ai_monitored/security/armory)
+"F" = (
+/obj/structure/rack/gunrack,
+/obj/effect/spawner/armory_spawn/shotguns,
+/turf/open/floor/iron/dark,
+/area/station/ai_monitored/security/armory)
+"I" = (
+/obj/effect/turf_decal/tile/red/fourcorners,
+/obj/structure/closet/secure_closet/armory_kiboko,
+/turf/open/floor/iron/dark,
+/area/station/ai_monitored/security/armory)
+"O" = (
+/obj/structure/rack/gunrack,
+/obj/structure/window/reinforced/spawner/directional/east,
+/obj/structure/cable,
+/turf/open/floor/iron/dark,
+/area/station/ai_monitored/security/armory)
+"Z" = (
+/obj/structure/table/reinforced,
+/obj/item/storage/barricade{
+ pixel_y = 10
+ },
+/obj/item/storage/barricade{
+ pixel_y = 5
+ },
+/obj/item/storage/barricade,
+/turf/open/floor/iron/dark,
+/area/station/ai_monitored/security/armory)
+
+(1,1,1) = {"
+a
+a
+a
+a
+a
+a
+a
+a
+"}
+(2,1,1) = {"
+a
+a
+a
+a
+a
+a
+a
+a
+"}
+(3,1,1) = {"
+a
+a
+a
+a
+a
+a
+a
+a
+"}
+(4,1,1) = {"
+a
+a
+a
+Z
+a
+a
+a
+a
+"}
+(5,1,1) = {"
+a
+a
+a
+y
+a
+a
+a
+a
+"}
+(6,1,1) = {"
+a
+a
+a
+F
+a
+a
+a
+a
+"}
+(7,1,1) = {"
+a
+a
+a
+O
+a
+a
+a
+a
+"}
+(8,1,1) = {"
+a
+a
+a
+a
+a
+a
+a
+a
+"}
+(9,1,1) = {"
+a
+a
+a
+a
+a
+a
+I
+a
+"}
diff --git a/_maps/skyrat/automapper/templates/tramstation/tramstation_armory.dmm b/_maps/skyrat/automapper/templates/tramstation/tramstation_armory.dmm
new file mode 100644
index 00000000000..e75a773e32b
--- /dev/null
+++ b/_maps/skyrat/automapper/templates/tramstation/tramstation_armory.dmm
@@ -0,0 +1,141 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"cy" = (
+/obj/structure/window/reinforced/spawner/directional/south,
+/obj/structure/window/reinforced/spawner/directional/north,
+/obj/structure/rack/gunrack,
+/obj/effect/spawner/armory_spawn/smg,
+/turf/open/floor/iron,
+/area/station/ai_monitored/security/armory)
+"fc" = (
+/obj/structure/table,
+/obj/item/storage/box/teargas{
+ pixel_x = -3;
+ pixel_y = 3
+ },
+/obj/item/storage/box/handcuffs,
+/obj/item/storage/box/flashbangs{
+ pixel_x = 3;
+ pixel_y = -3
+ },
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/item/gun/grenadelauncher,
+/turf/open/floor/iron/dark,
+/area/station/ai_monitored/security/armory)
+"Hv" = (
+/obj/structure/window/reinforced/spawner/directional/east,
+/obj/structure/window/reinforced/spawner/directional/west,
+/obj/machinery/camera/directional/north{
+ c_tag = "Security - Armory";
+ network = list("ss13","Security")
+ },
+/obj/structure/rack/gunrack,
+/obj/effect/spawner/armory_spawn/shotguns,
+/obj/structure/cable,
+/turf/open/floor/iron,
+/area/station/ai_monitored/security/armory)
+"LX" = (
+/obj/structure/rack,
+/obj/item/gun/energy/e_gun/dragnet,
+/obj/item/gun/energy/e_gun/dragnet,
+/obj/item/radio/intercom/directional/north,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/item/melee/breaching_hammer,
+/obj/item/melee/breaching_hammer,
+/obj/item/melee/breaching_hammer,
+/obj/item/melee/breaching_hammer,
+/turf/open/floor/iron/dark,
+/area/station/ai_monitored/security/armory)
+"Mj" = (
+/obj/structure/window/reinforced/spawner/directional/east,
+/obj/structure/window/reinforced/spawner/directional/west,
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/structure/rack/gunrack,
+/obj/structure/cable,
+/turf/open/floor/iron,
+/area/station/ai_monitored/security/armory)
+"Mp" = (
+/obj/structure/window/reinforced/spawner/directional/north,
+/obj/structure/window/reinforced/spawner/directional/south,
+/obj/structure/closet/secure_closet/armory_kiboko,
+/turf/open/floor/iron,
+/area/station/ai_monitored/security/armory)
+"SD" = (
+/obj/structure/rack,
+/obj/item/storage/barricade{
+ pixel_y = -5
+ },
+/obj/item/storage/barricade,
+/obj/item/storage/barricade{
+ pixel_y = 5
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/neutral,
+/turf/open/floor/iron/dark,
+/area/station/ai_monitored/security/armory)
+"TP" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/structure/cable,
+/turf/open/floor/plating,
+/area/station/ai_monitored/security/armory)
+"Xn" = (
+/turf/template_noop,
+/area/template_noop)
+
+(1,1,1) = {"
+Xn
+Xn
+Xn
+Xn
+Xn
+fc
+"}
+(2,1,1) = {"
+Xn
+Xn
+Mp
+Xn
+Xn
+SD
+"}
+(3,1,1) = {"
+Xn
+Mj
+TP
+Hv
+Xn
+Xn
+"}
+(4,1,1) = {"
+Xn
+Xn
+cy
+Xn
+Xn
+Xn
+"}
+(5,1,1) = {"
+Xn
+Xn
+Xn
+Xn
+Xn
+Xn
+"}
+(6,1,1) = {"
+LX
+Xn
+Xn
+Xn
+Xn
+Xn
+"}
diff --git a/_maps/virtual_domains/skyrat_ancientmilsim.dmm b/_maps/virtual_domains/skyrat_ancientmilsim.dmm
index 111efa89fc4..c317819cc0a 100644
--- a/_maps/virtual_domains/skyrat_ancientmilsim.dmm
+++ b/_maps/virtual_domains/skyrat_ancientmilsim.dmm
@@ -621,7 +621,7 @@
pixel_x = 6;
pixel_y = 9
},
-/obj/item/ammo_box/c27_54cesarzowa/rubber{
+/obj/item/ammo_box/c27_54cesarzowa{
pixel_x = 12
},
/turf/open/floor/carpet/red,
@@ -1013,7 +1013,7 @@
pixel_x = -4;
pixel_y = -9
},
-/obj/item/ammo_box/advanced/s12gauge/flechette{
+/obj/item/ammo_box/advanced/s12gauge/bean{
pixel_x = -4;
pixel_y = 9
},
diff --git a/bubber_archive/Limastation/LimaStation.dmm b/bubber_archive/Limastation/LimaStation.dmm
index a3f2d347e80..f54c20d473f 100644
--- a/bubber_archive/Limastation/LimaStation.dmm
+++ b/bubber_archive/Limastation/LimaStation.dmm
@@ -11357,7 +11357,6 @@
/obj/structure/closet/secure_closet/tac,
/obj/item/gun/ballistic/shotgun/riot,
/obj/item/ammo_box/advanced/s12gauge/bean,
-/obj/item/ammo_box/advanced/s12gauge/express,
/turf/open/floor/wood,
/area/station/command/heads_quarters/blueshield)
"eCG" = (
diff --git a/code/__DEFINES/antagonists.dm b/code/__DEFINES/antagonists.dm
index 70cbcb951e2..c07a3956b34 100644
--- a/code/__DEFINES/antagonists.dm
+++ b/code/__DEFINES/antagonists.dm
@@ -338,7 +338,7 @@ GLOBAL_LIST_INIT(human_invader_antagonists, list(
#define JOB_PROB 40
/// How many telecrystals a normal traitor starts with
-#define TELECRYSTALS_DEFAULT 25 // BUBBER EDIT - GIMMICK TRAITOR
+#define TELECRYSTALS_DEFAULT 20
/// How many telecrystals mapper/admin only "precharged" uplink implant
#define TELECRYSTALS_PRELOADED_IMPLANT 10
/// The normal cost of an uplink implant; used for calcuating how many
diff --git a/code/__DEFINES/bodyparts.dm b/code/__DEFINES/bodyparts.dm
index 4384e25a1a7..e99cacee0fb 100644
--- a/code/__DEFINES/bodyparts.dm
+++ b/code/__DEFINES/bodyparts.dm
@@ -6,9 +6,9 @@
/// The max damage a limb can take before it stops taking damage.
/// Used by the max_damage var.
#define LIMB_MAX_HP_PROSTHESIS 20 //Used by surplus prosthesis limbs.
-#define LIMB_MAX_HP_DEFAULT 60 //Used by most all limbs by default. // SKYRAT EDIT CHANGE - ORIGINAL : #define LIMB_MAX_HP_DEFAULT 50
+#define LIMB_MAX_HP_DEFAULT 50 //Used by most all limbs by default.
#define LIMB_MAX_HP_ADVANCED 75 //Used by advanced robotic limbs.
-#define LIMB_MAX_HP_CORE 250 //Only use this for heads and torsos. // SKYRAT EDIT CHANGE - ORIGINAL : #define LIMB_MAX_HP_CORE 200
+#define LIMB_MAX_HP_CORE 200 //Only use this for heads and torsos.
/// Xenomorph Limbs
#define LIMB_MAX_HP_ALIEN_LARVA 50 //Used by the weird larva chest and head. Did you know they have those?
diff --git a/code/__DEFINES/inventory.dm b/code/__DEFINES/inventory.dm
index 067e0e02c16..773605f3146 100644
--- a/code/__DEFINES/inventory.dm
+++ b/code/__DEFINES/inventory.dm
@@ -274,7 +274,6 @@ GLOBAL_LIST_INIT(detective_vest_allowed, list(
/obj/item/storage/belt/holster/nukie,
/obj/item/storage/belt/holster/energy,
/obj/item/gun/ballistic/shotgun/automatic/combat/compact,
- /obj/item/gun/microfusion, //SKYRAT EDIT ADDITION
))
GLOBAL_LIST_INIT(security_vest_allowed, list(
@@ -292,7 +291,6 @@ GLOBAL_LIST_INIT(security_vest_allowed, list(
/obj/item/storage/belt/holster/energy,
/obj/item/gun/ballistic/shotgun/automatic/combat/compact,
/obj/item/pen/red/security,
- /obj/item/gun/microfusion, //SKYRAT EDIT ADDITION
))
GLOBAL_LIST_INIT(security_wintercoat_allowed, list(
@@ -305,7 +303,6 @@ GLOBAL_LIST_INIT(security_wintercoat_allowed, list(
/obj/item/storage/belt/holster/nukie,
/obj/item/storage/belt/holster/energy,
/obj/item/gun/ballistic/shotgun/automatic/combat/compact,
- /obj/item/gun/microfusion, //SKYRAT EDIT ADDITION
))
//Allowed list for all chaplain suits (except the honkmother robe)
diff --git a/code/__DEFINES/research/anomalies.dm b/code/__DEFINES/research/anomalies.dm
index bd7380f199d..8bd963ebdbe 100644
--- a/code/__DEFINES/research/anomalies.dm
+++ b/code/__DEFINES/research/anomalies.dm
@@ -46,6 +46,7 @@ GLOBAL_LIST_INIT(bioscrambler_organs_blacklist, typecacheof(list (
/obj/item/organ/empowered_borer_egg, // SKYRAT EDIT ADDITION
/obj/item/organ/eyes/robotic, // SKYRAT EDIT ADDITION
/obj/item/organ/eyes/night_vision/cyber, // SKYRAT EDIT ADDITION
+ /obj/item/organ/taur_body // BUBBER EDIT ADDITION
)))
/// List of body parts we can apply to people
diff --git a/code/__DEFINES/~skyrat_defines/ammo_defines.dm b/code/__DEFINES/~skyrat_defines/ammo_defines.dm
index dce646f3723..b671664cf8d 100644
--- a/code/__DEFINES/~skyrat_defines/ammo_defines.dm
+++ b/code/__DEFINES/~skyrat_defines/ammo_defines.dm
@@ -1,6 +1,5 @@
#define AMMO_TYPE_LETHAL "lethal"
#define AMMO_TYPE_RUBBER "rubber"
#define AMMO_TYPE_HOLLOWPOINT "hollowpoint"
-#define AMMO_TYPE_IHDF "ihdf"
#define AMMO_TYPE_AP "ap"
#define AMMO_TYPE_INCENDIARY "incendiary"
diff --git a/code/__DEFINES/~skyrat_defines/projectiles.dm b/code/__DEFINES/~skyrat_defines/projectiles.dm
index 06772d0a29e..20a97b3864a 100644
--- a/code/__DEFINES/~skyrat_defines/projectiles.dm
+++ b/code/__DEFINES/~skyrat_defines/projectiles.dm
@@ -21,13 +21,5 @@
/// Caliber used by the pepperball gun
#define CALIBER_PEPPERBALL "pepperball"
-/// Used by the Rowland Magnum Pistol
-#define CALIBER_460ROWLAND ".460 Rowland Magnum"
-
-// The Super Big Revolver
-#define CALIBER_457GOVT ".457 Government"
-
-#define CALIBER_FLECHETTE "Flechette"
-
// Murphy caliber, there was no other way to make it non-compatible with syndie ammo and prevent gaming it
#define CALIBER_9MM_SEC "9mm Security"
diff --git a/code/__DEFINES/~skyrat_defines/techweb_nodes.dm b/code/__DEFINES/~skyrat_defines/techweb_nodes.dm
index d4bc4554d89..f963e85d22e 100644
--- a/code/__DEFINES/~skyrat_defines/techweb_nodes.dm
+++ b/code/__DEFINES/~skyrat_defines/techweb_nodes.dm
@@ -27,9 +27,4 @@
#define TECHWEB_NODE_XENOARCH_MACHINES "xenoarch_machines"
#define TECHWEB_NODE_XENOARCH_STORAGE "xenoarch_storage"
#define TECHWEB_NODE_AYY_CYBER_IMPLANTS "ayy_cyber_implants"
-#define TECHWEB_NODE_IMPROVED_MICROFUSION "improved_microfusion"
-#define TECHWEB_NODE_BLUESPACE_MICROFUSION "bluespace_microfusion"
-#define TECHWEB_NODE_QUANTUM_MICROFUSION "quantum_microfusion"
-#define TECHWEB_NODE_ILLEGAL_MICROFUSION "illegal_microfusion"
-#define TECHWEB_NODE_CLOWN_MICROFUSION "clown_microfusion"
#define TECHWEB_NODE_POWERATOR "powerator"
diff --git a/code/__DEFINES/~skyrat_defines/traits.dm b/code/__DEFINES/~skyrat_defines/traits.dm
index 05fdeef0731..71ee780cd25 100644
--- a/code/__DEFINES/~skyrat_defines/traits.dm
+++ b/code/__DEFINES/~skyrat_defines/traits.dm
@@ -7,3 +7,6 @@
#define TRAIT_PERMIT_HUD "permit_hud"
//for if we are army crawling or not
#define TRAIT_PRONE "prone"
+
+/// If we are ignoring clothing cropping or not
+#define TRAIT_TAUR_IGNORING_CROPPING "taur_ignoring_cropping"
diff --git a/code/__DEFINES/~skyrat_defines/traits/declarations.dm b/code/__DEFINES/~skyrat_defines/traits/declarations.dm
index db561a17bc6..e8423b550c4 100644
--- a/code/__DEFINES/~skyrat_defines/traits/declarations.dm
+++ b/code/__DEFINES/~skyrat_defines/traits/declarations.dm
@@ -75,6 +75,9 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
// bovine traits
#define TRAIT_BOVINE "bovine_aspect"
+// mouse traits
+#define TRAIT_MURIDAE "mouse_aspect"
+
// chameleon mutation
#define TRAIT_CHAMELEON_SKIN "chameleon_skin"
diff --git a/code/__DEFINES/~~bubber_defines/cameranets.dm b/code/__DEFINES/~~bubber_defines/cameranets.dm
index 99b56919297..7b09a81808a 100644
--- a/code/__DEFINES/~~bubber_defines/cameranets.dm
+++ b/code/__DEFINES/~~bubber_defines/cameranets.dm
@@ -1,3 +1,5 @@
// Moonstation exclusive camera
#define CAMERANET_NETWORK_COMMANDBUNKER "commandbunker"
+// Tarkon exclusive camera network
+#define CAMERANET_NETWORK_TARKON "tarkon"
diff --git a/code/__DEFINES/~~bubber_defines/combat.dm b/code/__DEFINES/~~bubber_defines/combat.dm
index 1553bfce8de..8430f889bd1 100644
--- a/code/__DEFINES/~~bubber_defines/combat.dm
+++ b/code/__DEFINES/~~bubber_defines/combat.dm
@@ -2,3 +2,6 @@
#define JOULES_PER_DAMAGE (30 KILO JOULES)
/// Calculates the amount of burn force when applying this much energy to a mob via electrocution from an energy source.
#define ELECTROCUTE_DAMAGE(energy) (energy >= 1 KILO JOULES ? clamp(round(energy / JOULES_PER_DAMAGE) + rand(-5,5), 10, (HUMAN_MAXHEALTH-10)) : 0)
+
+/// Health buff for having the oversized quirk.
+#define OVERSIZED_HEALTH_BUFF 1.4
diff --git a/code/__DEFINES/~~bubber_defines/mobs.dm b/code/__DEFINES/~~bubber_defines/mobs.dm
index 655d7125807..a5cd7f2e467 100644
--- a/code/__DEFINES/~~bubber_defines/mobs.dm
+++ b/code/__DEFINES/~~bubber_defines/mobs.dm
@@ -2,9 +2,7 @@
#define PULL_OVERSIZED_SLOWDOWN 2
-#define HUMAN_HEALTH_MODIFIER 1.35
-
-#define HUMAN_MAXHEALTH MAX_LIVING_HEALTH * HUMAN_HEALTH_MODIFIER
+#define HUMAN_MAXHEALTH MAX_LIVING_HEALTH
#define UNDERWEAR_HIDE_SOCKS (1<<0)
#define UNDERWEAR_HIDE_SHIRT (1<<1)
diff --git a/code/__DEFINES/~~bubber_defines/robot_defines.dm b/code/__DEFINES/~~bubber_defines/robot_defines.dm
index e356c450995..2ada7244fd0 100644
--- a/code/__DEFINES/~~bubber_defines/robot_defines.dm
+++ b/code/__DEFINES/~~bubber_defines/robot_defines.dm
@@ -180,6 +180,11 @@
#define CYBORG_ICON_SERVICE_MYOMER 'modular_zubbers/code/modules/silicons/borgs/sprites/myomer/ProjectMyomerService.dmi'
#define CYBORG_ICON_SYNDI_MYOMER 'modular_zubbers/code/modules/silicons/borgs/sprites/myomer/ProjectMyomerSyndi.dmi'
+//WAGECAGE CARGOBORG DEFINES - Sprites by Boviro
+
+#define CYBORG_ICON_CARGO_WAGECAGE 'modular_zubbers/code/modules/silicons/borgs/sprites/wagecage.dmi'
+#define CYBORG_ICON_TYPE_WAGECAGE "wagecage"
+
/************************************************************
CYBORG HAT OFFSETS GO BELOW
*************************************************************/
@@ -228,3 +233,8 @@
#define CORRUPT_HAT_OFFSET \
SKIN_HAT_OFFSET = list("north" = list(16, -4), "south" = list(16, -15), "east" = list(35, -7), "west" = list(-3, -7)), \
SKIN_HAT_REST_OFFSET = list("north" = list(16, -6), "south" = list(16, -17), "east" = list(35, -14), "west" = list(-3, -14))
+#define WAGECAGE_HAT_OFFSET \
+ SKIN_HAT_OFFSET = list("north" = list(10, 20), "south" = list(-5, 15), "east" = list(13, 15), "west" = list(-13, 15))
+#define MYOMER_HAT_OFFSET \
+ SKIN_HAT_OFFSET = list("north" = list(16, 1), "south" = list(16, 1), "east" = list(26, 1), "west" = list(6, 1)), \
+ SKIN_HAT_REST_OFFSET = list("north" = list(16, -11), "south" = list(16, -11), "east" = list(26, -11), "west" = list(6, -11))
diff --git a/code/__DEFINES/~~bubber_defines/signals.dm b/code/__DEFINES/~~bubber_defines/signals.dm
index 8363c54c199..ca829981303 100644
--- a/code/__DEFINES/~~bubber_defines/signals.dm
+++ b/code/__DEFINES/~~bubber_defines/signals.dm
@@ -39,3 +39,5 @@
/// From /mob/living/carbon/human/verb/toggle_genitals()
#define COMSIG_HUMAN_TOGGLE_GENITALS "human_toggle_genitals"
+/// /datum/component/tameable/try_tame(atom/source, obj/item/food, mob/living/attacker) in
+#define COMSIG_MOB_TRY_TAME "mob_try_tame"
diff --git a/code/__DEFINES/~~bubber_defines/traits/declarations.dm b/code/__DEFINES/~~bubber_defines/traits/declarations.dm
index 128c6538a85..c648bc95e61 100644
--- a/code/__DEFINES/~~bubber_defines/traits/declarations.dm
+++ b/code/__DEFINES/~~bubber_defines/traits/declarations.dm
@@ -4,6 +4,7 @@
#define TRAIT_CAN_BE_PICKED_UP "can_be_picked_up"
#define TRAIT_CHANGELING_ZOMBIE "changelingzombie"
#define TRAIT_RESEARCH_CYBORG "research_cyborg"
+#define TRAIT_BILINGUAL "Bilingual"
/// Cyborgs with unique sprites
/// 32x32 quadruped skins with resting, sitting, and belly up sprites
diff --git a/code/__DEFINES/~~bubber_defines/traits/sources.dm b/code/__DEFINES/~~bubber_defines/traits/sources.dm
index e4323c3b501..b8f92f074db 100644
--- a/code/__DEFINES/~~bubber_defines/traits/sources.dm
+++ b/code/__DEFINES/~~bubber_defines/traits/sources.dm
@@ -8,3 +8,4 @@
#define PROTEAN_SERVO_TRAIT "protean_servo"
#define TRAIT_SOURCE_TAURLAY "taur-laydown"
+#define TRAIT_SOURCE_TAURCROP "taur-crop"
diff --git a/code/_globalvars/traits/_traits.dm b/code/_globalvars/traits/_traits.dm
index 50d183b86e5..e10cb76e278 100644
--- a/code/_globalvars/traits/_traits.dm
+++ b/code/_globalvars/traits/_traits.dm
@@ -820,6 +820,7 @@ GLOBAL_LIST_INIT(traits_by_type, list(
"TRAIT_BIMBO" = TRAIT_BIMBO,
"TRAIT_BOVINE" = TRAIT_BOVINE, // BUBBER ADDITION
"TRAIT_CANINE" = TRAIT_CANINE,
+ "TRAIT_MURIDAE" = TRAIT_MURIDAE, // BUBBER ADDITION
"TRAIT_CHAMELEON_SKIN" = TRAIT_CHAMELEON_SKIN,
"TRAIT_CONDOM_BROKEN" = TRAIT_CONDOM_BROKEN,
"TRAIT_CURRENTLY_GLASSBLOWING" = TRAIT_CURRENTLY_GLASSBLOWING,
diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm
index b925da6cd5a..f93a78ef060 100644
--- a/code/controllers/subsystem/ticker.dm
+++ b/code/controllers/subsystem/ticker.dm
@@ -173,7 +173,7 @@ SUBSYSTEM_DEF(ticker)
for(var/channel_tag in CONFIG_GET(str_list/channel_announce_new_game))
// BUBBER EDIT CHANGE BEGIN - Replace with more rich message
// send2chat(new /datum/tgs_message_content("New round starting on [SSmapping.current_map.map_name]!"), channel_tag)
- send2chat(new /datum/tgs_message_content("<@&[CONFIG_GET(string/game_alert_role_id)]> Round **[GLOB.round_id]** starting on [SSmapping.current_map.map_name], [CONFIG_GET(string/servername)]! \nIf you wish to be pinged for game related stuff, go to <#[CONFIG_GET(string/role_assign_channel_id)]> and assign yourself the roles."), channel_tag)
+ send2chat(new /datum/tgs_message_content("Round **[GLOB.round_id]** starting on [SSmapping.current_map.map_name], [CONFIG_GET(string/servername)]! \nIf you wish to be pinged for game related stuff, go to <#[CONFIG_GET(string/role_assign_channel_id)]> and assign yourself the roles."), channel_tag)
// BUBBER EDIT CHANGE END - Replace with more rich message
current_state = GAME_STATE_PREGAME
// BUBBERSTATION EDIT START
@@ -196,12 +196,15 @@ SUBSYSTEM_DEF(ticker)
totalPlayers = LAZYLEN(GLOB.new_player_list)
totalPlayersReady = 0
total_admins_ready = 0
+ var/list/readied_players = list() //BUBBER EDIT ADDITION
for(var/mob/dead/new_player/player as anything in GLOB.new_player_list)
if(player.ready == PLAYER_READY_TO_PLAY)
+ readied_players[player.key] = player //BUBBER EDIT: job estimation, filling the readied list we use later
++totalPlayersReady
if(player.client?.holder)
++total_admins_ready
+ job_estimation_list = get_job_estimation(readied_players) //BUBBER EDIT ADDITION
if(start_immediately)
timeLeft = 0
diff --git a/code/datums/quirks/positive_quirks/bilingual.dm b/code/datums/quirks/positive_quirks/bilingual.dm
index bfc6db677a4..9dcdcb067ff 100644
--- a/code/datums/quirks/positive_quirks/bilingual.dm
+++ b/code/datums/quirks/positive_quirks/bilingual.dm
@@ -3,11 +3,13 @@
desc = "Over the years you've picked up an extra language!"
icon = FA_ICON_GLOBE
value = 4
+ mob_trait = TRAIT_BILINGUAL //BUBBER EDIT ADDITION: Marks down that you're bilingual
gain_text = span_notice("Some of the words of the people around you certainly aren't common. Good thing you studied for this.")
lose_text = span_notice("You seem to have forgotten your second language.")
medical_record_text = "Patient speaks multiple languages."
mail_goodies = list(/obj/item/taperecorder, /obj/item/clothing/head/beret/frenchberet, /obj/item/clothing/mask/fakemoustache/italian)
+/* //BUBBER EDIT REMOVAL: MAKING THIS DO THE SAME THING AS LINGUIST
/datum/quirk_constant_data/bilingual
associated_typepath = /datum/quirk/bilingual
customization_options = list(
@@ -44,3 +46,4 @@
return
quirk_holder.remove_all_languages(source = LANGUAGE_QUIRK)
quirk_holder.remove_all_partial_languages(source = LANGUAGE_QUIRK)
+*/ //BUBBER EDIT REMOVAL: MAKING THIS DO THE SAME THING AS LINGUIST
diff --git a/code/datums/storage/subtypes/belts.dm b/code/datums/storage/subtypes/belts.dm
index 1cb6fbda6fb..f920161d0a4 100644
--- a/code/datums/storage/subtypes/belts.dm
+++ b/code/datums/storage/subtypes/belts.dm
@@ -107,7 +107,6 @@
/obj/item/reagent_containers/spray/pepper,
/obj/item/restraints/handcuffs,
/obj/item/restraints/legcuffs/bola,
- /obj/item/stock_parts/power_store/cell/microfusion, //SKYRAT EDIT ADDITION
))
///Webbing security belt
diff --git a/code/game/machinery/recharger.dm b/code/game/machinery/recharger.dm
index 0804fa9a5ff..b330881242c 100755
--- a/code/game/machinery/recharger.dm
+++ b/code/game/machinery/recharger.dm
@@ -13,8 +13,6 @@
var/finished_recharging = FALSE
var/static/list/allowed_devices = typecacheof(list(
- /obj/item/stock_parts/power_store/cell/microfusion, //SKYRAT EDIT ADDITION
- /obj/item/gun/microfusion, // SKYRAT EDIT ADDITION
/obj/item/gun/energy,
/obj/item/melee/baton/security,
/obj/item/ammo_box/magazine/recharge,
@@ -106,14 +104,6 @@
to_chat(user, span_notice("Your gun has no external power connector."))
return TRUE
- //SKYRAT EDIT ADDITION
- if (istype(attacking_item, /obj/item/gun/microfusion))
- var/obj/item/gun/microfusion/microfusion_gun = attacking_item
- if(microfusion_gun.cell?.chargerate <= 0)
- to_chat(user, span_notice("[microfusion_gun] cannot be recharged!"))
- return TRUE
- //SKYRAT EDIT END
-
user.transferItemToLoc(attacking_item, src)
return TRUE
diff --git a/code/modules/antagonists/fugitive/hunters/hunter.dm b/code/modules/antagonists/fugitive/hunters/hunter.dm
index 362d81e2540..988abcddabb 100644
--- a/code/modules/antagonists/fugitive/hunters/hunter.dm
+++ b/code/modules/antagonists/fugitive/hunters/hunter.dm
@@ -73,14 +73,14 @@
if(backstory == HUNTER_PACK_RUSSIAN)
var/mob/living/owner_mob = mob_override || owner.current
//bubber edit; spinwarder removed
- owner_mob.grant_language(/datum/language/panslavic, source = LANGUAGE_BOUNTYHUNTER)
- owner_mob.set_active_language(/datum/language/panslavic)
+ owner_mob.grant_language(/datum/language/spinwarder, source = LANGUAGE_BOUNTYHUNTER)
+ owner_mob.set_active_language(/datum/language/spinwarder)
//edit end
/datum/antagonist/fugitive_hunter/remove_innate_effects(mob/living/mob_override)
var/mob/living/owner_mob = mob_override || owner.current
// BUBBER EDIT CHANGE BEGIN: spinwarder removed
- owner_mob.remove_language(/datum/language/panslavic, source = LANGUAGE_BOUNTYHUNTER)
+ owner_mob.remove_language(/datum/language/spinwarder, source = LANGUAGE_BOUNTYHUNTER)
// BUBBER EDIT CHANGE END
/datum/team/fugitive_hunters
diff --git a/code/modules/antagonists/heretic/knowledge/flesh_lore.dm b/code/modules/antagonists/heretic/knowledge/flesh_lore.dm
index 15a291f618e..b9503f33f9c 100644
--- a/code/modules/antagonists/heretic/knowledge/flesh_lore.dm
+++ b/code/modules/antagonists/heretic/knowledge/flesh_lore.dm
@@ -1,7 +1,7 @@
/// The max amount of health a ghoul has.
-#define GHOUL_MAX_HEALTH HUMAN_MAXHEALTH - 35 // BUBBER EDIT
+#define GHOUL_MAX_HEALTH HUMAN_MAXHEALTH - 30 // BUBBER EDIT - 70 because we're going back to 100hp
/// The max amount of health a voiceless dead has.
-#define MUTE_MAX_HEALTH HUMAN_MAXHEALTH // BUBBER EDIT
+#define MUTE_MAX_HEALTH HUMAN_MAXHEALTH // BUBBER EDIT - I mean i guess this'll keep it at 100hp so I don't need to change it
/datum/heretic_knowledge_tree_column/main/flesh
neighbour_type_left = /datum/heretic_knowledge_tree_column/lock_to_flesh
@@ -119,7 +119,7 @@
// BUBBER CHANGE BELOW - GHOUL MAXHP
desc = "Allows you to transmute a corpse and a poppy to create a Voiceless Dead. \
The corpse does not need to have a soul. \
- Voiceless Dead are mute ghouls and have 135 health, but can use Bloody Blades effectively. \
+ Voiceless Dead are mute ghouls and have 100 health, but can use Bloody Blades effectively. \
You can only create two at a time."
gain_text = "I found notes of a dark ritual, unfinished... yet still, I pushed forward."
required_atoms = list(
diff --git a/code/modules/cargo/goodies.dm b/code/modules/cargo/goodies.dm
index b209b5e239d..004cf531d63 100644
--- a/code/modules/cargo/goodies.dm
+++ b/code/modules/cargo/goodies.dm
@@ -53,7 +53,7 @@
cost = PAYCHECK_CREW * 1.5
access_view = ACCESS_WEAPONS
contains = list(/obj/item/ammo_box/magazine/m38/match/bouncy)
-
+
/datum/supply_pack/goody/mars_single
name = "Colt Detective Special Single-Pack"
desc = "The HoS took your gun and your badge? No problem! Just pay the absurd taxation fee and you too can be reunited with the lethal power of a .38!"
diff --git a/code/modules/client/preferences/clothing.dm b/code/modules/client/preferences/clothing.dm
index 4ae1e5ad6c9..9a4a15097d1 100644
--- a/code/modules/client/preferences/clothing.dm
+++ b/code/modules/client/preferences/clothing.dm
@@ -31,6 +31,9 @@
DSATCHEL,
DDUFFELBAG,
DMESSENGER,
+ FBACKPACK,
+ FSATCHEL,
+ FMESSENGER,
)
/datum/preference/choiced/backpack/create_default_value()
@@ -48,6 +51,12 @@
return /obj/item/storage/backpack/duffelbag
if (GMESSENGER)
return /obj/item/storage/backpack/messenger
+ if (FBACKPACK)
+ return /obj/item/storage/backpack/industrial/frontier_colonist
+ if (FSATCHEL)
+ return /obj/item/storage/backpack/industrial/frontier_colonist/satchel
+ if (FMESSENGER)
+ return /obj/item/storage/backpack/industrial/frontier_colonist/messenger
// In a perfect world, these would be your department's backpack.
// However, this doesn't factor in assistants, or no high slot, and would
diff --git a/code/modules/client/preferences/species.dm b/code/modules/client/preferences/species.dm
index 1f0d6847002..4bf5c7aabc0 100644
--- a/code/modules/client/preferences/species.dm
+++ b/code/modules/client/preferences/species.dm
@@ -61,5 +61,6 @@
data[species_id]["enabled_features"] = species.get_features()
data[species_id]["perks"] = species.get_species_perks()
data[species_id]["diet"] = species.get_species_diet()
+ data[species_id]["sort_bottom"] = species.sort_bottom //BUBBER EDIT ADDITION: Do we sort the species to the bottom?
return data
diff --git a/code/modules/jobs/job_types/_job.dm b/code/modules/jobs/job_types/_job.dm
index f4c9f5a212c..fe061935a2e 100644
--- a/code/modules/jobs/job_types/_job.dm
+++ b/code/modules/jobs/job_types/_job.dm
@@ -391,6 +391,12 @@
back = /obj/item/storage/backpack/satchel/leather //Leather Satchel
if(GMESSENGER)
back = /obj/item/storage/backpack/messenger //Grey messenger bag
+ if(FBACKPACK)
+ back = /obj/item/storage/backpack/industrial/frontier_colonist
+ if(FSATCHEL)
+ back = /obj/item/storage/backpack/industrial/frontier_colonist/satchel
+ if(FMESSENGER)
+ back = /obj/item/storage/backpack/industrial/frontier_colonist/messenger
if(DSATCHEL)
back = satchel //Department satchel
if(DMESSENGER)
diff --git a/code/modules/mapfluff/ruins/spaceruin_code/hilbertshotel.dm b/code/modules/mapfluff/ruins/spaceruin_code/hilbertshotel.dm
index 2fc5d501796..3c8722e9773 100644
--- a/code/modules/mapfluff/ruins/spaceruin_code/hilbertshotel.dm
+++ b/code/modules/mapfluff/ruins/spaceruin_code/hilbertshotel.dm
@@ -9,7 +9,7 @@ GLOBAL_VAR_INIT(hhMysteryRoomNumber, rand(1, 999999))
w_class = WEIGHT_CLASS_SMALL
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
//SKYRAT EDIT ADDITION - GHOST HOTEL UPDATE + EXTRA STUFF
- var/static/list/hotel_maps = list("Generic", "Apartment", "Beach Condo", "Station Side", "Library", "Cultist's Cavern", "Winter Woods", "Evacuated Station", "Prison", "Corporate Office", "Recovery Wing", "Grotto", "Grotto (Night)", "Fox Bar", "The Nightclub", "EVA", "Oasis", "Oasis (Night)")
+ var/static/list/hotel_maps = list("Generic", "Apartment", "Beach Condo", "Station Side", "Library", "Cultist's Cavern", "Winter Woods", "Evacuated Station", "Prison", "Corporate Office", "Recovery Wing", "Grotto", "Grotto (Night)", "Fox Bar", "The Nightclub", "EVA", "Oasis", "Oasis (Night)", "Public Pool", "Mini Engineering", "Syndicate Office", "Syndicate Ops Centre")
//standart - hilber's hotel room
//apartment - see /datum/map_template/ghost_cafe_rooms
//beach condo - Beach themed apartment
@@ -34,6 +34,11 @@ GLOBAL_VAR_INIT(hhMysteryRoomNumber, rand(1, 999999))
var/datum/map_template/ghost_cafe_rooms/eva/ghost_cafe_rooms_eva
var/datum/map_template/ghost_cafe_rooms/oasis/ghost_cafe_rooms_oasis
var/datum/map_template/ghost_cafe_rooms/oasisalt/ghost_cafe_rooms_oasisalt
+
+ var/datum/map_template/ghost_cafe_rooms/pool/ghost_cafe_rooms_pool
+ var/datum/map_template/ghost_cafe_rooms/engineering/ghost_cafe_rooms_engineering
+ var/datum/map_template/ghost_cafe_rooms/syndieoffice/ghost_cafe_rooms_syndieoffice
+ var/datum/map_template/ghost_cafe_rooms/synopcenter/ghost_cafe_rooms_synopcenter
//BUBBER EDIT END
var/datum/map_template/hilbertshotel/hotelRoomTemp
@@ -74,6 +79,11 @@ GLOBAL_VAR_INIT(hhMysteryRoomNumber, rand(1, 999999))
ghost_cafe_rooms_eva = new()
ghost_cafe_rooms_oasis = new()
ghost_cafe_rooms_oasisalt = new()
+
+ ghost_cafe_rooms_pool = new()
+ ghost_cafe_rooms_engineering = new()
+ ghost_cafe_rooms_syndieoffice = new()
+ ghost_cafe_rooms_synopcenter = new()
//BUBBER EDIT END
var/area/currentArea = get_area(src)
@@ -267,6 +277,18 @@ GLOBAL_VAR_INIT(hhMysteryRoomNumber, rand(1, 999999))
else if(chosen_room == "Oasis (Night)")
load_from = ghost_cafe_rooms_oasisalt
+
+ else if(chosen_room == "Public Pool")
+ load_from = ghost_cafe_rooms_pool
+
+ else if(chosen_room == "Mini Engineering")
+ load_from = ghost_cafe_rooms_engineering
+
+ else if(chosen_room == "Syndicate Office")
+ load_from = ghost_cafe_rooms_syndieoffice
+
+ else if(chosen_room == "Syndicate Ops Centre")
+ load_from = ghost_cafe_rooms_synopcenter
//BUBBER EDIT END
@@ -487,7 +509,7 @@ GLOBAL_VAR_INIT(hhMysteryRoomNumber, rand(1, 999999))
desc = "Stop looking through the bluespace peephole."
button_icon_state = "cancel_peephole"
-/datum/action/peephole_cancel/Trigger(mob/clicker, trigger_flags)
+/datum/action/peephole_cancel/Trigger(trigger_flags)
. = ..()
to_chat(owner, span_warning("You move away from the peephole."))
owner.reset_perspective()
diff --git a/code/modules/mob/living/basic/clown/clown.dm b/code/modules/mob/living/basic/clown/clown.dm
index fb9e6caf995..8026fd7a325 100644
--- a/code/modules/mob/living/basic/clown/clown.dm
+++ b/code/modules/mob/living/basic/clown/clown.dm
@@ -29,7 +29,7 @@
faction = list(FACTION_CLOWN)
ai_controller = /datum/ai_controller/basic_controller/clown
///list of stuff we drop on death
- var/list/loot = list(/obj/effect/mob_spawn/corpse/human/clown)
+ var/list/loot = list(/obj/effect/gibspawner/human) // BUBBER EDIT CHANGE - Original: /obj/effect/mob_spawn/corpse/human/clown
///blackboard emote list
var/list/emotes = list(
BB_EMOTE_SAY = list("HONK", "Honk!", "Welcome to clown planet!"),
diff --git a/code/modules/mob/living/carbon/examine.dm b/code/modules/mob/living/carbon/examine.dm
index ae7d9a43275..85ce343f3d3 100644
--- a/code/modules/mob/living/carbon/examine.dm
+++ b/code/modules/mob/living/carbon/examine.dm
@@ -684,10 +684,12 @@
var/age_text
switch(age)
- if(-INFINITY to 17) // SKYRAT EDIT ADD START -- AGE EXAMINE
+ if(-INFINITY to 17) // BUBBER EDIT ADD START -- AGE EXAMINE
age_text = "too young to be here"
if(18 to 25)
- age_text = "a young adult" // SKYRAT EDIT END
+ age_text = "a young adult"
+ if(26 to 35)
+ age_text = "an adult" // BUBBER EDIT END
if(36 to 55)
age_text = "middle-aged"
if(56 to 75)
diff --git a/code/modules/mob/living/carbon/human/human_update_icons.dm b/code/modules/mob/living/carbon/human/human_update_icons.dm
index ba911e2c869..54bc60c8b98 100644
--- a/code/modules/mob/living/carbon/human/human_update_icons.dm
+++ b/code/modules/mob/living/carbon/human/human_update_icons.dm
@@ -140,7 +140,7 @@ There are several things that need to be remembered:
// SKYRAT EDIT ADDITION START - Taur-friendly suits!
if(bodyshape & BODYSHAPE_TAUR)
- if(istype(uniform) && uniform.gets_cropped_on_taurs)
+ if(istype(uniform) && (!HAS_TRAIT(src, TRAIT_TAUR_IGNORING_CROPPING) && uniform.gets_cropped_on_taurs))
mutant_styles |= get_taur_mode()
// SKYRAT EDIT END
@@ -597,7 +597,7 @@ There are several things that need to be remembered:
if(bodyshape & BODYSHAPE_TAUR)
var/obj/item/clothing/suit/worn_suit = wear_suit
- if(istype(worn_suit) && worn_suit.gets_cropped_on_taurs)
+ if(istype(worn_suit) && (!HAS_TRAIT(src, TRAIT_TAUR_IGNORING_CROPPING) && worn_suit.gets_cropped_on_taurs))
mutant_styles |= get_taur_mode()
// SKYRAT EDIT END
diff --git a/code/modules/mob/living/silicon/robot/robot_defines.dm b/code/modules/mob/living/silicon/robot/robot_defines.dm
index 7f4f7e68ae1..3a2ef37f720 100644
--- a/code/modules/mob/living/silicon/robot/robot_defines.dm
+++ b/code/modules/mob/living/silicon/robot/robot_defines.dm
@@ -9,8 +9,8 @@
real_name = "Cyborg"
icon = 'icons/mob/silicon/robots.dmi' //SKYRAT EDIT - Modified in modular_skyrat\modules\altborgs\code\robot_defines.dm (to allow for custom transformation animations)
icon_state = "robot"
- maxHealth = 135 // Bubber Edit
- health = 135 // Bubber Edit
+ maxHealth = 100
+ health = 100
bubble_icon = "robot"
designation = "Default" //used for displaying the prefix & getting the current model of cyborg
has_limbs = TRUE
diff --git a/code/modules/mob/living/simple_animal/bot/secbot.dm b/code/modules/mob/living/simple_animal/bot/secbot.dm
index f8652ce75d8..583786ba300 100644
--- a/code/modules/mob/living/simple_animal/bot/secbot.dm
+++ b/code/modules/mob/living/simple_animal/bot/secbot.dm
@@ -494,6 +494,14 @@
if((nearby_carbons.name == oldtarget_name) && (world.time < last_found + 100))
continue
+ //BUBBERSTATION CHANGE START: BEEPSKY IS A DINOSAUR NOW. CAN'T SEE YOU IF YOU DON'T MOVE.
+ if(nearby_carbons.client) //We have a client. We're a player that uses move_delay.
+ if(nearby_carbons.client.move_delay + 4 SECONDS <= world.time)
+ continue
+ else if(nearby_carbons.next_move + 4 SECONDS <= world.time) //No client. We're a mob that uses next_move.
+ continue
+ //BUBBERSTATION CHANGE END: BEEPSKY IS A DINOSAUR NOW. CAN'T SEE YOU IF YOU DON'T MOVE.
+
threatlevel = nearby_carbons.assess_threat(judgement_criteria)
if(threatlevel < THREAT_ASSESS_DANGEROUS)
diff --git a/code/modules/mod/modules/modules_security.dm b/code/modules/mod/modules/modules_security.dm
index 960f9db6fa6..a19cd09db2b 100644
--- a/code/modules/mod/modules/modules_security.dm
+++ b/code/modules/mod/modules/modules_security.dm
@@ -19,7 +19,7 @@
/obj/item/mod/module/magnetic_harness/Initialize(mapload)
. = ..()
if(!guns_typecache)
- guns_typecache = typecacheof(list(/obj/item/gun/ballistic, /obj/item/gun/energy, /obj/item/gun/grenadelauncher, /obj/item/gun/chem, /obj/item/gun/syringe, /obj/item/gun/microfusion)) //SKYRAT EDIT - MICROFUSION
+ guns_typecache = typecacheof(list(/obj/item/gun/ballistic, /obj/item/gun/energy, /obj/item/gun/grenadelauncher, /obj/item/gun/chem, /obj/item/gun/syringe))
/obj/item/mod/module/magnetic_harness/on_install()
. = ..()
diff --git a/code/modules/projectiles/ammunition/ballistic/pistol.dm b/code/modules/projectiles/ammunition/ballistic/pistol.dm
index e5ddae7c2e9..56962984229 100644
--- a/code/modules/projectiles/ammunition/ballistic/pistol.dm
+++ b/code/modules/projectiles/ammunition/ballistic/pistol.dm
@@ -35,7 +35,14 @@
caliber = CALIBER_9MM
projectile_type = /obj/projectile/bullet/c9mm
newtonian_force = 0.75
-
+//BUBBERSTAION ADDITION
+/obj/item/ammo_casing/c9mm/security
+ name = "9mm bullet Security casing"
+ desc = "A 9mm bullet Security casing."
+ caliber = CALIBER_9MM
+ projectile_type = /obj/projectile/bullet/c9mm/security
+ newtonian_force = 0.75
+// BUBBBER EDIT END
/obj/item/ammo_casing/c9mm/ap
name = "9mm armor-piercing bullet casing"
desc = "A 9mm armor-piercing bullet casing."
diff --git a/code/modules/projectiles/boxes_magazines/external/pistol.dm b/code/modules/projectiles/boxes_magazines/external/pistol.dm
index 250ec30af39..a362449027c 100644
--- a/code/modules/projectiles/boxes_magazines/external/pistol.dm
+++ b/code/modules/projectiles/boxes_magazines/external/pistol.dm
@@ -14,6 +14,25 @@
multiple_sprites = AMMO_BOX_FULL_EMPTY
multiple_sprite_use_base = TRUE
+/obj/item/ammo_box/magazine/m9mm/security
+ name = "pistol magazine (9mm Security)"
+ desc = "A 9mm handgun magazine, suitable for the Service Pistol."
+ ammo_type = /obj/item/ammo_casing/c9mm/security
+ max_ammo = 10
+
+/obj/item/ammo_box/magazine/m9mm/security/rocket
+ name = "pistol magazine (9mm Security)"
+ desc = "A 9mm handgun magazine, suitable for the Service Pistol."
+ ammo_type = /obj/item/ammo_casing/c9mm/security
+ max_ammo = 8
+
+/obj/item/ammo_box/magazine/m9mm/security/rocket/throw_impact(mob/living/hit_mob, datum/thrownthing/throwingdatum)
+ . = ..()
+ if(!QDELETED(hit_mob))
+ hit_mob.Knockdown(2 SECONDS)
+ hit_mob.adjustBruteLoss(40)
+ qdel()
+
/obj/item/ammo_box/magazine/m9mm/fire
name = "pistol magazine (9mm incendiary)"
MAGAZINE_TYPE_INCENDIARY
diff --git a/code/modules/projectiles/boxes_magazines/external/smg.dm b/code/modules/projectiles/boxes_magazines/external/smg.dm
index d8563905475..227afec039d 100644
--- a/code/modules/projectiles/boxes_magazines/external/smg.dm
+++ b/code/modules/projectiles/boxes_magazines/external/smg.dm
@@ -23,7 +23,6 @@
MAGAZINE_TYPE_INCENDIARY
ammo_type = /obj/item/ammo_casing/c46x30mm/inc
-
/obj/item/ammo_box/magazine/smartgun
name = "Abielle magazine (.160 Smart)"
desc = "A deep .160 Smart magazine, suitable for the Abielle smart-SMG."
diff --git a/code/modules/projectiles/guns/energy.dm b/code/modules/projectiles/guns/energy.dm
index da5360672ce..cc2a005439a 100644
--- a/code/modules/projectiles/guns/energy.dm
+++ b/code/modules/projectiles/guns/energy.dm
@@ -146,7 +146,6 @@
ammo_type[i] = shot
shot = ammo_type[select]
fire_sound = shot.fire_sound
- fire_sound_volume = shot.fire_sound_volume //SKYRAT EDIT ADDITION
fire_delay = shot.delay
/obj/item/gun/energy/Destroy()
@@ -231,7 +230,6 @@
select = 1
var/obj/item/ammo_casing/energy/shot = ammo_type[select]
fire_sound = shot.fire_sound
- fire_sound_volume = shot.fire_sound_volume //SKYRAT EDIT ADDITION
fire_delay = shot.delay
if (shot.select_name && user)
balloon_alert(user, "set to [shot.select_name]")
diff --git a/code/modules/projectiles/projectile/bullets/pistol.dm b/code/modules/projectiles/projectile/bullets/pistol.dm
index 9c799fb9c0a..9ab58c36dcd 100644
--- a/code/modules/projectiles/projectile/bullets/pistol.dm
+++ b/code/modules/projectiles/projectile/bullets/pistol.dm
@@ -15,6 +15,14 @@
jostle_pain_mult = 6
rip_time = 1 SECONDS
+//Bubberstation addition
+/obj/projectile/bullet/c9mm/security
+ name = "9mm Security bullet"
+ damage = 20
+ embed_type = /datum/embedding/bullet/c9mm
+ weak_against_armour = TRUE
+//bubber edit end
+
/obj/projectile/bullet/c9mm/ap
name = "9mm armor-piercing bullet"
damage = 27
diff --git a/code/modules/research/designs/autolathe/security_designs.dm b/code/modules/research/designs/autolathe/security_designs.dm
index 2008e7b0b1a..ba25d46aa40 100644
--- a/code/modules/research/designs/autolathe/security_designs.dm
+++ b/code/modules/research/designs/autolathe/security_designs.dm
@@ -223,7 +223,7 @@
departmental_flags = DEPARTMENT_BITFLAG_SECURITY
/datum/design/c9mm
- name = "Ammo Box (9x25mm Mk.12) (Lethal)" //SKYRAT EDIT: Calibre rename - Original: name = "Ammo Box (9mm)"
+ name = "Ammo Box (9x25mm Mk.12) (Lethal)" //SKYRAT EDIT: Calibre rename - Original: name = "Ammo Box
id = "c9mm"
build_type = AUTOLATHE
materials = list(/datum/material/iron =SMALL_MATERIAL_AMOUNT * 300)
@@ -234,6 +234,18 @@
)
departmental_flags = DEPARTMENT_BITFLAG_SECURITY
+/datum/design/c9mm_sec
+ name = "Ammo Box (9x25mm Mk.12) (Lethal)"
+ id = "c9mm_sec"
+ build_type = AUTOLATHE
+ materials = list(/datum/material/iron =SMALL_MATERIAL_AMOUNT * 150)
+ build_path = /obj/item/ammo_box/c9mm/security
+ category = list(
+ RND_CATEGORY_HACKED,
+ RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO,
+ )
+ departmental_flags = DEPARTMENT_BITFLAG_SECURITY
+
/datum/design/telescreen_interrogation
name = "Interrogation Telescreen"
id = "telescreen_interrogation"
diff --git a/code/modules/research/designs/weapon_designs.dm b/code/modules/research/designs/weapon_designs.dm
index d0a54cb7d4a..4c92cff8511 100644
--- a/code/modules/research/designs/weapon_designs.dm
+++ b/code/modules/research/designs/weapon_designs.dm
@@ -215,6 +215,24 @@
)
departmental_flags = DEPARTMENT_BITFLAG_SECURITY
+/datum/design/c38_flare_mag
+ name = "Magazine (.38 Flae) (VERY Lethal)"
+ desc = "Designed to tactically reload a NT BR-38 Battle Rifle. Flare casings launch a concentrated particle beam towards a target, lighting them up for everyone to see."
+ id = "c38_flare_mag"
+ build_type = PROTOLATHE | AWAY_LATHE
+ materials = list(
+ /datum/material/iron = SHEET_MATERIAL_AMOUNT * 5,
+ /datum/material/plastic = HALF_SHEET_MATERIAL_AMOUNT * 4,
+ /datum/material/uranium = HALF_SHEET_MATERIAL_AMOUNT * 1.5,
+ /datum/material/gold = HALF_SHEET_MATERIAL_AMOUNT * 1.5,
+
+ )
+ build_path = /obj/item/ammo_box/magazine/m38/flare
+ category = list(
+ RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO
+ )
+ departmental_flags = DEPARTMENT_BITFLAG_SECURITY
+
/datum/design/rubbershot/sec
id = "sec_rshot"
desc = "Rubbershot shotgun shells. Fires a cloud of pellets. Rubber bullets are bouncy and less-than-lethal."
@@ -523,6 +541,19 @@
)
departmental_flags = DEPARTMENT_BITFLAG_SECURITY
+/datum/design/flechette
+ name = "Flechette Shotgun Shell (Lethal)"
+ desc = "A shotgun casing filled with small metal darts. Pokes many tiny holes into meat and kevlar alike. Useful for turning someone's insides \
+ into outsides."
+ id = "flechetteshell"
+ build_type = PROTOLATHE | AWAY_LATHE
+ materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT * 3, /datum/material/glass = SMALL_MATERIAL_AMOUNT * 2)
+ build_path = /obj/item/ammo_casing/shotgun/flechette
+ category = list(
+ RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO
+ )
+ departmental_flags = DEPARTMENT_BITFLAG_SECURITY
+
/datum/design/techshell
name = "Unloaded Technological Shotshell"
desc = "A high-tech shotgun shell which can be crafted into more advanced shells to produce unique effects. \
diff --git a/code/modules/surgery/organs/internal/stomach/_stomach.dm b/code/modules/surgery/organs/internal/stomach/_stomach.dm
index 050ad720648..06c26105182 100644
--- a/code/modules/surgery/organs/internal/stomach/_stomach.dm
+++ b/code/modules/surgery/organs/internal/stomach/_stomach.dm
@@ -348,7 +348,8 @@
var/pukeprob = 2.5 + (0.025 * disgust)
if(disgust >= DISGUST_LEVEL_GROSS)
if(SPT_PROB(5, seconds_per_tick))
- disgusted.adjust_stutter(2 SECONDS)
+ if(!disgusted.has_status_effect(/datum/status_effect/spacer/gravity_sickness)) // BUBBER EDIT CHANGE - no more constant spacer stutter anshallah
+ disgusted.adjust_stutter(2 SECONDS)
disgusted.adjust_confusion(2 SECONDS)
if(SPT_PROB(5, seconds_per_tick) && !disgusted.stat)
to_chat(disgusted, span_warning("You feel kind of iffy..."))
diff --git a/code/modules/surgery/organs/internal/tongue/_tongue.dm b/code/modules/surgery/organs/internal/tongue/_tongue.dm
index 058c6c1f932..324d215d36e 100644
--- a/code/modules/surgery/organs/internal/tongue/_tongue.dm
+++ b/code/modules/surgery/organs/internal/tongue/_tongue.dm
@@ -77,7 +77,7 @@
return list(
/datum/language/common,
/datum/language/uncommon,
- /datum/language/panslavic, //bubber edit; spinwarder removed
+ /datum/language/spinwarder, //bubber edit; spinwarder removed
/datum/language/draconic,
/datum/language/codespeak,
/datum/language/monkey,
diff --git a/code/modules/unit_tests/screenshots/screenshot_antag_icons_loneinfiltrator.png b/code/modules/unit_tests/screenshots/screenshot_antag_icons_loneinfiltrator.png
index c3b9a149220..465c764c529 100644
Binary files a/code/modules/unit_tests/screenshots/screenshot_antag_icons_loneinfiltrator.png and b/code/modules/unit_tests/screenshots/screenshot_antag_icons_loneinfiltrator.png differ
diff --git a/code/modules/uplink/uplink_items/nukeops.dm b/code/modules/uplink/uplink_items/nukeops.dm
index 29b616a3b77..bef549b2853 100644
--- a/code/modules/uplink/uplink_items/nukeops.dm
+++ b/code/modules/uplink/uplink_items/nukeops.dm
@@ -308,8 +308,7 @@
/datum/uplink_item/weapon_kits/high_cost/carbine
name = "M-90gl Carbine Case (Hard)"
desc = "A fully-loaded, specialized three-round burst carbine that fires .223 ammunition from a 30 round magazine.\
- Comes with a 40mm underbarrel grenade launcher. Use secondary-fire to fire the grenade launcher. Also comes with two spare magazines \
- and a box of 40mm rubber slugs."
+ Comes with a 40mm underbarrel grenade launcher. Use secondary-fire to fire the grenade launcher. Also comes with two spare magazines."
item = /obj/item/storage/toolbox/guncase/m90gl
/datum/uplink_item/ammo_nuclear/basic/carbine
diff --git a/config/game_options.txt b/config/game_options.txt
index 07f342f318c..071d5f76756 100644
--- a/config/game_options.txt
+++ b/config/game_options.txt
@@ -414,7 +414,6 @@ ROUNDSTART_RACES slimeperson
ROUNDSTART_RACES podweak
ROUNDSTART_RACES dwarf
ROUNDSTART_RACES vox
-ROUNDSTART_RACES vox_primalis
ROUNDSTART_RACES aquatic
ROUNDSTART_RACES insect
ROUNDSTART_RACES synth
diff --git a/html/changelogs/bubber_archive/2025-08.yml b/html/changelogs/bubber_archive/2025-08.yml
index 9158f8b1ef1..6cc06512e70 100644
--- a/html/changelogs/bubber_archive/2025-08.yml
+++ b/html/changelogs/bubber_archive/2025-08.yml
@@ -185,3 +185,159 @@
2025-08-17:
xPokee:
- bugfix: fixed the SMESes on Void Raptor not having cables under them
+2025-08-20:
+ Hislyna:
+ - rscadd: Proteans can now process Synthetic Drinks and Drinks with Metals in.
+ - rscadd: Proteans now come with an Emergancy RAM Reset button which will cause
+ them to forget the last encounter, just use a pen on them after knocking them
+ out of combat!
+ - rscadd: A Blank Protean Shell is now availible at cargo under the Protean Vessel
+ crate.
+2025-08-21:
+ ArrisFairburne:
+ - rscadd: Ash Walkers, Primitive Demihumans, and Primal Podpeople are now playable
+ in the Stowaway role
+ Arturlang:
+ - bugfix: fixes mutant zombie revival
+ Jinshee:
+ - rscadd: Added Shadekin Fluffy Gradient
+ - rscadd: Added new *mah emote
+ KathrinBailey:
+ - balance: Oversized people go from 100 to 140 health.
+ ReturnToZender:
+ - qol: Lone Infiltrators have been renamed to Syndicate Boarders for clarity.
+ - spellcheck: Penelope Penelope Penelope Penelope Penelope
+ - rscadd: Created the origin of Xenomorph Hybrids. Check them out in the species
+ menu!
+ - rscadd: Let's be real. We all wish we were as cool as snailpeople. Their lore
+ has been updated to reflect that.
+ - rscadd: Synthetic Humanoids now have lore to sink your teeth into!
+ - bugfix: The vox description no longer bluescreens your TGUI
+ - rscadd: Regular vox now share in vox lore
+ - rscadd: The descriptions of the various flavor text tooltips have been made a
+ little more helpful.
+ - bugfix: Slimepeople finally have a species description.
+ TealSeer:
+ - bugfix: fixed buggy behavior in the forward and back buttons of the changelog
+ UI
+ aKromatopzia:
+ - balance: Teshari's liked food types are now seafood, vegetables, and nuts
+ - balance: Teshari's temperature offset reduced from 30K to 10K
+ ibexgoetia:
+ - rscadd: Added a Weighty Moostoat Plushie to the loadout menu and to the toys vendor.
+ nikothedude:
+ - rscadd: Little guys now get flung by shotguns
+2025-08-22:
+ Jinshee:
+ - rscadd: 'Added neutral quirk: Muridae Traits'
+ LT3:
+ - balance: RPG Loot event will no longer add certain negative traits to items
+ ReturnToZender:
+ - qol: Renames Lizardpeople to Tiziran Lizardpeople by default
+ SapphoQueer:
+ - bugfix: Cybernetic Digitigrade legs no longer are offset by one pixel.
+ - config: disabled vox_primalis as a roundstart species
+ xPokee:
+ - bugfix: fixed Tarkon cameras not having their own network
+2025-08-23:
+ KazooBard:
+ - rscdel: Removed breaching slugs from crew (not to be confused with frangible.
+ These ones 1 shot mechs)
+ - rscdel: Removed MCR, .457 revolver, .460 Rowland revolver, GP-7, R10 revolver,
+ M4A5, and their associated ammo types.
+ - rscdel: 'Removed ammunition types: IHDF, rubber variants excluding .38/shotgun/nukie,
+ stardust, magnum, express, hornet''s nest'
+ - rscdel: Made most NRI guns (Miecz, plasma pistol, plasma thrower, bobr, derringer)
+ and Sol 35/40 (Tarkon, ERT, gateway, adminspawn) inaccessible to crew, kept
+ for ERT/Gateway/Flavour/Admin reasons
+ - balance: Turrets which use a removed calibre have been adjusted into either that
+ of the WT's, Ceres (still printable) or 9mm.
+ - balance: WT's replace missing sindanos across armouries, laser guns and eguns
+ replace the missing MCR's.
+ Kepteyn:
+ - rscadd: 'Four new inifidorm dooms: Mini Engineering, Public Pool, Sydicate Office,
+ and Syndicate Ops Centre. The two Syndicate rooms were originally made by JustMeTheIInd.'
+ SapphoQueer:
+ - balance: Sets traitor and loneinf's TC count to 20 as opposed to the 25 they had
+ before.
+ xPokee:
+ - bugfix: fixed Myomer cyborgs wearing hats VERY incorrectly
+2025-08-24:
+ ReturnToZender:
+ - rscadd: The species menu now sorts itself based on the length of provided lore.
+ Species with lore come first.
+ - rscdel: Unathi have been renamed to Lizardperson (Generic). They don't have lore,
+ and lack a lot of the engaging mechanics that Lizardpeople have, so we've reflavored
+ them as a template species.
+ - qol: The roundstart ping now happens at the end of the round, rather than the
+ start of a new one
+ - rscadd: The Bilingual trait now grants an extra language point.
+ - qol: Various languages have been rewritten or simplified in the language menu
+ SapphoQueer:
+ - rscdel: Removes the syndicate NIFcutter from the traitor uplink.
+2025-08-25:
+ BurgerBB:
+ - qol: Killing simplemob clowns creates gibs instead of corpses because I lagged
+ to them once.
+ nikothedude:
+ - rscadd: Loadout other section now has a hand labeler
+ shayoki:
+ - rscadd: The Satchel Medical Kit, Medical Technician Kit, and First Responder Surgical
+ Kit can now hold medical patches, blood scanners, reflex hammers, and medical
+ flesh reshaper shears.
+ - rscadd: The heavier First Responder Surgical Kit can now hold Autopsy Scanners
+ and Surgical Processors.
+2025-08-26:
+ ReturnToZender:
+ - bugfix: A runtime in Job Intern code for jobs lacking a department head to reference
+ - refactor: Job estimation now performs better
+ SapphoQueer:
+ - balance: Reverts human health to 100hp
+ - balance: Reverts sillicon health to 100hp
+ xPokee:
+ - balance: IRCD goodie packs now require engineering equipment access
+2025-08-27:
+ Arturlang:
+ - bugfix: Remove ! and * syllables from the skrelluq language as it's used for random
+ names and can potentially break as it's used for regex
+ ReturnToZender:
+ - bugfix: Transfer votes can no longer be automatically triggered or called after
+ the shuttle has docked
+ - bugfix: The Job Estimation panel no longer shows after game start
+2025-08-28:
+ TealSeer:
+ - bugfix: fixed broken rustg in the repo
+2025-08-29:
+ LT3:
+ - server: Title screens can now be assigned to a specific map
+2025-08-30:
+ ChaosCzar:
+ - bugfix: 'Re-Enabled Piratespeak after #4524'
+ ReturnToZender:
+ - rscdel: We no longer use the name Penelope 3 in the Teshari lore blurb, and the
+ emphasis for beaks has been flipped. Sirisai is exiting an ice age, muzzles
+ are more common.
+ SapphoQueer:
+ - balance: Centcom has decided the representative shouldn't just be able to walk
+ into any department, severely stripping their access in the process.
+ xPokee:
+ - bugfix: fixed unremovable taur limbs being granted from bioscramblers
+2025-08-31:
+ LT3:
+ - qol: New round discord notification now includes the upcoming map name
+ Smol42:
+ - rscadd: Added 5 new tails and markings
+ shayoki, Nuk5513, ArrisFairburne:
+ - map: A major update to Box Station has arrived. There has been major revamps to
+ Arrivals, Bridge, and Aft Cargo Maints.
+ - map: 'Moderate changes to Box Station are: Robotics, Xenobiology, Nanites in Science.
+ Infirmary room nerf. Stowaway spawn fixes. EVA maints fix.'
+ - map: 'Minor changes to Box Station are: HFR room expansion, Hydroponics desk fridge,
+ Medical Cargo order opening area fix. Ordinance launch site gravity fix. And
+ many areas in the middle quadrant of the station have been given a new coat
+ of paint.'
+ - map: 'Box Station has been fitted to match maps from upstream. The changes include:
+ Mass External airlock cycling. WallMed and Fire Alarm additions. Head of staff
+ corkboards.'
+ xPokee:
+ - rscadd: Added the cryptid horns, fluff, snout, and markings from S.P.L.U.R.T
diff --git a/html/changelogs/bubber_archive/2025-09.yml b/html/changelogs/bubber_archive/2025-09.yml
new file mode 100644
index 00000000000..7a1b35c3901
--- /dev/null
+++ b/html/changelogs/bubber_archive/2025-09.yml
@@ -0,0 +1,51 @@
+2025-09-01:
+ BurgerBB:
+ - balance: Beepsky can no longer see you if you haven't moved or interacted with
+ something for 4 seconds or more.
+ YakiAttaki:
+ - rscadd: 'Added three tailmaw variants: Coloured Head, Striped, and a combo of
+ the two.'
+ nikothedude:
+ - rscadd: New taur verb that lets you disable/enable taur clothing cropping
+ - bugfix: Carbons 26-35 are now described as "an adult"
+2025-09-02:
+ EliteRiceFarmer:
+ - rscadd: frontier caps.
+ - rscadd: frontier jacket.
+ - rscadd: frontier gas mask.
+ - rscadd: frontier jackboots.
+ - rscadd: frontier jumpsuit.
+ - rscadd: frontier bags.
+ - rscadd: frontier gloves.
+ - code_imp: added new define for frontier bags in character creation menu.
+ - code_imp: added icon define for frontier bags.
+ - code_imp: 'added frontier bags to spawn roundstart from character creation.
+
+ :cl:'
+2025-09-03:
+ Arturlang:
+ - balance: Bloodsucker Feed no longer bypasses thick clothing
+ - rscadd: monkeys are tame-able and feeding them the food they want makes them not
+ aggressive
+ Boviro:
+ - rscadd: Wage Cage
+ ReturnToZender:
+ - rscdel: More space in descriptions underneath a species on the species page
+ - rscdel: Mushroomspeak and Monkey are limited to their respective species.
+ - qol: Merges Interslavic and Spinwarder into one language
+ - qol: Merges Chitinclick and Buzzwords into one bug language
+ ReturnToZender (code), Hoygn (lore):
+ - rscadd: New Vox lore has been made, cleaning up the old and bringing it in-line
+ with our other species descriptions.
+ YakiAttaki:
+ - bugfix: fixed the Tailmaw (Striped, Coloured Head) tail; you can now put the head
+ and stripes as different colours
+ ibexgoetia:
+ - rscadd: Ported the toe-less jackboots and workboots from SPLURT. They are available
+ from the loadout menu, and in the case of the jackboots, from the LustWish vendors
+ as well.
+ nikothedude:
+ - bugfix: Neck wearing shouldnt runtime if the item is damaged
+ - bugfix: You can no longer scrunch taurs with saddlebags as a ghost
+ - bugfix: Being ahealed should no longer glitch out saddlebags
+ - balance: Spacer no longer causes disgust stuttering
diff --git a/modular_skyrat/master_files/code/datums/id_trim/jobs.dm b/modular_skyrat/master_files/code/datums/id_trim/jobs.dm
index bf6f5fccf7c..8fdf2618d39 100644
--- a/modular_skyrat/master_files/code/datums/id_trim/jobs.dm
+++ b/modular_skyrat/master_files/code/datums/id_trim/jobs.dm
@@ -70,13 +70,10 @@
sechud_icon_state = SECHUD_NT_CONSULTANT
extra_access = list()
minimal_access = list(
- ACCESS_AI_UPLOAD, ACCESS_ALL_PERSONAL_LOCKERS, ACCESS_AUX_BASE, ACCESS_BAR, ACCESS_BRIG_ENTRANCE,
- ACCESS_CENT_GENERAL, ACCESS_CHANGE_IDS, ACCESS_CHAPEL_OFFICE, ACCESS_COMMAND, ACCESS_CONSTRUCTION,
- ACCESS_COURT, ACCESS_ENGINEERING, ACCESS_EVA, ACCESS_GATEWAY, ACCESS_HOP, ACCESS_HYDROPONICS,
- ACCESS_JANITOR, ACCESS_KEYCARD_AUTH, ACCESS_SERVICE, ACCESS_KITCHEN, ACCESS_LAWYER, ACCESS_LIBRARY, ACCESS_MAINT_TUNNELS,
- ACCESS_MEDICAL, ACCESS_MECH_ENGINE, ACCESS_MECH_MEDICAL, ACCESS_MECH_SCIENCE, ACCESS_MECH_SECURITY,
- ACCESS_MINING_STATION, ACCESS_MINERAL_STOREROOM, ACCESS_MORGUE, ACCESS_PSYCHOLOGY, ACCESS_RC_ANNOUNCE,
- ACCESS_RESEARCH, ACCESS_SECURITY, ACCESS_TELEPORTER, ACCESS_THEATRE, ACCESS_VAULT, ACCESS_WEAPONS
+ ACCESS_BRIG_ENTRANCE, ACCESS_MINERAL_STOREROOM, ACCESS_EVA,
+ ACCESS_CENT_GENERAL, ACCESS_COMMAND, ACCESS_COURT, ACCESS_GATEWAY,
+ ACCESS_KEYCARD_AUTH, ACCESS_LAWYER, ACCESS_MAINT_TUNNELS, ACCESS_RC_ANNOUNCE,
+ ACCESS_SECURITY, ACCESS_TELEPORTER, ACCESS_VAULT, ACCESS_WEAPONS
)
minimal_wildcard_access = list()
template_access = list(ACCESS_CAPTAIN)
diff --git a/modular_skyrat/master_files/code/modules/client/preferences/middleware/languages.dm b/modular_skyrat/master_files/code/modules/client/preferences/middleware/languages.dm
index 1e5e71bc2a3..c637d69d55c 100644
--- a/modular_skyrat/master_files/code/modules/client/preferences/middleware/languages.dm
+++ b/modular_skyrat/master_files/code/modules/client/preferences/middleware/languages.dm
@@ -1,6 +1,3 @@
-#define MAX_LANGUAGES_NORMAL 3
-#define MAX_LANGUAGES_LINGUIST 4
-
/datum/asset/spritesheet/languages
name = "languages"
early = TRUE
@@ -65,7 +62,11 @@
var/list/data = list()
- var/max_languages = preferences.all_quirks.Find(TRAIT_LINGUIST) ? MAX_LANGUAGES_LINGUIST : MAX_LANGUAGES_NORMAL
+ var/max_languages = 3
+ if(/datum/quirk/linguist::name in preferences.all_quirks)
+ max_languages++
+ if(/datum/quirk/bilingual::name in preferences.all_quirks)
+ max_languages++
var/species_type = preferences.read_preference(/datum/preference/choiced/species)
var/datum/species/species = new species_type()
var/datum/language_holder/lang_holder = preferences.get_adjusted_language_holder()
@@ -129,7 +130,11 @@
*/
/datum/preference_middleware/languages/proc/give_language(list/params, mob/user)
var/language_name = params["language_name"]
- var/max_languages = preferences.all_quirks.Find(TRAIT_LINGUIST) ? MAX_LANGUAGES_LINGUIST : MAX_LANGUAGES_NORMAL
+ var/max_languages = 3
+ if(/datum/quirk/linguist::name in preferences.all_quirks)
+ max_languages++
+ if(/datum/quirk/bilingual::name in preferences.all_quirks)
+ max_languages++
if(preferences.languages && preferences.languages.len == max_languages) // too many languages
return TRUE
@@ -162,6 +167,3 @@
var/language_name = params["language_name"]
preferences.languages -= name_to_language[language_name]
return TRUE
-
-#undef MAX_LANGUAGES_NORMAL
-#undef MAX_LANGUAGES_LINGUIST
diff --git a/modular_skyrat/master_files/code/modules/language/_language.dm b/modular_skyrat/master_files/code/modules/language/_language.dm
index 44bc2d9d64f..13dc1922b13 100644
--- a/modular_skyrat/master_files/code/modules/language/_language.dm
+++ b/modular_skyrat/master_files/code/modules/language/_language.dm
@@ -16,7 +16,13 @@
secret = TRUE
/datum/language/piratespeak
- secret = TRUE
+ secret = FALSE
/datum/language/xenocommon
secret = FALSE
+
+/datum/language/monkey
+ secret = TRUE
+
+/datum/language/mushroom
+ secret = TRUE
diff --git a/modular_skyrat/master_files/code/modules/language/language_holder.dm b/modular_skyrat/master_files/code/modules/language/language_holder.dm
index 7106f678a87..272abfba058 100644
--- a/modular_skyrat/master_files/code/modules/language/language_holder.dm
+++ b/modular_skyrat/master_files/code/modules/language/language_holder.dm
@@ -75,7 +75,7 @@ GLOBAL_DATUM_INIT(language_holder_adjustor, /datum/language_holder_adjustor, new
/datum/language/voltaic = list(LANGUAGE_ATOM),
/datum/language/nekomimetic = list(LANGUAGE_ATOM),
/datum/language/gutter = list(LANGUAGE_ATOM),
- /datum/language/panslavic = list(LANGUAGE_ATOM),
+ /datum/language/spinwarder = list(LANGUAGE_ATOM),
/datum/language/skrell = list(LANGUAGE_ATOM),
/datum/language/spacer = list(LANGUAGE_ATOM),
/datum/language/xerxian = list(LANGUAGE_ATOM),
@@ -95,7 +95,7 @@ GLOBAL_DATUM_INIT(language_holder_adjustor, /datum/language_holder_adjustor, new
/datum/language/akulan = list(LANGUAGE_ATOM),
/datum/language/marish = list(LANGUAGE_ATOM),
/datum/language/carptongue = list(LANGUAGE_ATOM),
- /datum/language/chitinclick = list(LANGUAGE_ATOM),
+ /datum/language/buzzwords = list(LANGUAGE_ATOM),
)
spoken_languages = list(
/datum/language/common = list(LANGUAGE_ATOM),
@@ -107,7 +107,7 @@ GLOBAL_DATUM_INIT(language_holder_adjustor, /datum/language_holder_adjustor, new
/datum/language/voltaic = list(LANGUAGE_ATOM),
/datum/language/nekomimetic = list(LANGUAGE_ATOM),
/datum/language/gutter = list(LANGUAGE_ATOM),
- /datum/language/panslavic = list(LANGUAGE_ATOM),
+ /datum/language/spinwarder = list(LANGUAGE_ATOM),
/datum/language/skrell = list(LANGUAGE_ATOM),
/datum/language/spacer = list(LANGUAGE_ATOM),
/datum/language/xerxian = list(LANGUAGE_ATOM),
@@ -127,5 +127,5 @@ GLOBAL_DATUM_INIT(language_holder_adjustor, /datum/language_holder_adjustor, new
/datum/language/akulan = list(LANGUAGE_ATOM),
/datum/language/marish = list(LANGUAGE_ATOM),
/datum/language/carptongue = list(LANGUAGE_ATOM),
- /datum/language/chitinclick = list(LANGUAGE_ATOM),
+ /datum/language/buzzwords = list(LANGUAGE_ATOM),
)
diff --git a/modular_skyrat/master_files/code/modules/loadout/categories/pocket.dm b/modular_skyrat/master_files/code/modules/loadout/categories/pocket.dm
index f32deab4ef5..3525ac2f29f 100644
--- a/modular_skyrat/master_files/code/modules/loadout/categories/pocket.dm
+++ b/modular_skyrat/master_files/code/modules/loadout/categories/pocket.dm
@@ -190,6 +190,10 @@
name = "Liberty Cap Seeds"
item_path = /obj/item/seeds/liberty
+/datum/loadout_item/pocket_items/hand_labeler
+ name = "Hand Labeler"
+ item_path = /obj/item/hand_labeler
+
/*
* DONATOR
*/
diff --git a/modular_skyrat/master_files/code/modules/projectiles/guns/energy/beam_rifle.dm b/modular_skyrat/master_files/code/modules/projectiles/guns/energy/beam_rifle.dm
index c60c9983578..22dab265a49 100644
--- a/modular_skyrat/master_files/code/modules/projectiles/guns/energy/beam_rifle.dm
+++ b/modular_skyrat/master_files/code/modules/projectiles/guns/energy/beam_rifle.dm
@@ -5,7 +5,7 @@
Might cause unexpected spaggetification"
/obj/projectile/beam/event_horizon
- damage = HUMAN_HEALTH_MODIFIER * 100
+ damage = HUMAN_MAXHEALTH
damage_type = BRUTE
armor_flag = ENERGY
range = 150
diff --git a/modular_skyrat/master_files/icons/mob/sprite_accessory/tails.dmi b/modular_skyrat/master_files/icons/mob/sprite_accessory/tails.dmi
index 1d0434a5b74..7b6be471612 100644
Binary files a/modular_skyrat/master_files/icons/mob/sprite_accessory/tails.dmi and b/modular_skyrat/master_files/icons/mob/sprite_accessory/tails.dmi differ
diff --git a/modular_skyrat/modules/Midroundtraitor/code/datum_traitor.dm b/modular_skyrat/modules/Midroundtraitor/code/datum_traitor.dm
index a50e8b10708..afa13e07c73 100644
--- a/modular_skyrat/modules/Midroundtraitor/code/datum_traitor.dm
+++ b/modular_skyrat/modules/Midroundtraitor/code/datum_traitor.dm
@@ -1,5 +1,5 @@
/datum/antagonist/traitor/lone_infiltrator
- name = "Lone Infiltrator"
+ name = "Syndicate Boarder"
var/infil_outfit = /datum/outfit/syndicateinfiltrator
preview_outfit = /datum/outfit/lone_infiltrator_preview
pref_flag = ROLE_LONE_INFILTRATOR
@@ -15,7 +15,7 @@
/datum/outfit/lone_infiltrator_preview
name = "Lone Infiltrator (Preview only)"
- back = /obj/item/mod/control/pre_equipped/empty/syndicate
+ back = /obj/item/mod/control/pre_equipped/empty/infiltrator/preview_only
uniform = /obj/item/clothing/under/syndicate
l_hand = /obj/item/shield/energy
r_hand = /obj/item/gun/ballistic/automatic/c20r
diff --git a/modular_skyrat/modules/Midroundtraitor/code/event.dm b/modular_skyrat/modules/Midroundtraitor/code/event.dm
index d10d981c83b..1366758077c 100644
--- a/modular_skyrat/modules/Midroundtraitor/code/event.dm
+++ b/modular_skyrat/modules/Midroundtraitor/code/event.dm
@@ -1,5 +1,5 @@
/datum/dynamic_ruleset/midround/from_ghosts/lone_infiltrator
- name = "Lone Infiltrator"
+ name = "Syndicate Boarder"
config_tag = "Midround Lone Infiltrator"
preview_antag_datum = /datum/antagonist/traitor/lone_infiltrator
midround_type = LIGHT_MIDROUND
diff --git a/modular_skyrat/modules/aesthetics/guns/code/guns.dm b/modular_skyrat/modules/aesthetics/guns/code/guns.dm
index 6492254436d..319953b2502 100644
--- a/modular_skyrat/modules/aesthetics/guns/code/guns.dm
+++ b/modular_skyrat/modules/aesthetics/guns/code/guns.dm
@@ -34,14 +34,12 @@
inhand_icon_state = "shotgun_combat"
inhand_x_dimension = 32
inhand_y_dimension = 32
- fire_delay = 7
w_class = WEIGHT_CLASS_BULKY
/obj/item/gun/ballistic/shotgun/automatic/combat/compact
name = "\improper Peacekeeper compact combat shotgun"
desc = "A tactical variant of the peacekeeper combat shotgun used by NT Raiding Parties and Space Marines. It has a gyroscopic stabilizer on it, letting you fire one handed."
- fire_delay = 5
- weapon_weight = WEAPON_LIGHT
+ weapon_weight = WEAPON_MEDIUM
/obj/item/gun/grenadelauncher
icon = 'modular_skyrat/modules/aesthetics/guns/icons/guns.dmi'
diff --git a/modular_skyrat/modules/ashwalkers/code/species/Ashwalkers.dm b/modular_skyrat/modules/ashwalkers/code/species/Ashwalkers.dm
index d62b07055c4..ffb991ebc35 100644
--- a/modular_skyrat/modules/ashwalkers/code/species/Ashwalkers.dm
+++ b/modular_skyrat/modules/ashwalkers/code/species/Ashwalkers.dm
@@ -8,6 +8,7 @@
BODY_ZONE_L_LEG = /obj/item/bodypart/leg/left/lizard/ashwalker,
BODY_ZONE_R_LEG = /obj/item/bodypart/leg/right/lizard/ashwalker,
)
+ sort_bottom = TRUE //BUBBER EDIT ADDITION: We want to sort this to the bottom because it's a ghostrole only species.
/datum/species/lizard/ashwalker/on_species_gain(mob/living/carbon/carbon_target, datum/species/old_species, regenerate_icons)
. = ..()
diff --git a/modular_skyrat/modules/assault_operatives/code/armaments/_armament_primary.dm b/modular_skyrat/modules/assault_operatives/code/armaments/_armament_primary.dm
index 26ee34d9018..c2684513cad 100644
--- a/modular_skyrat/modules/assault_operatives/code/armaments/_armament_primary.dm
+++ b/modular_skyrat/modules/assault_operatives/code/armaments/_armament_primary.dm
@@ -90,15 +90,6 @@
/datum/armament_entry/assault_operatives/primary/shotgun_ammo/rubber
item_type = /obj/item/ammo_box/advanced/s12gauge/rubber
-/datum/armament_entry/assault_operatives/primary/shotgun_ammo/flechette
- item_type = /obj/item/ammo_box/advanced/s12gauge/flechette
-
-/datum/armament_entry/assault_operatives/primary/shotgun_ammo/magnum
- item_type = /obj/item/ammo_box/advanced/s12gauge/magnum
-
-/datum/armament_entry/assault_operatives/primary/shotgun_ammo/beehive
- item_type = /obj/item/ammo_box/advanced/s12gauge/beehive
-
/datum/armament_entry/assault_operatives/primary/shotgun_ammo/incendiary
item_type = /obj/item/ammo_box/advanced/s12gauge/incendiary
diff --git a/modular_skyrat/modules/autotransfer/code/autotransfer.dm b/modular_skyrat/modules/autotransfer/code/autotransfer.dm
index 3303245f4b1..5f80becd486 100644
--- a/modular_skyrat/modules/autotransfer/code/autotransfer.dm
+++ b/modular_skyrat/modules/autotransfer/code/autotransfer.dm
@@ -29,7 +29,9 @@ SUBSYSTEM_DEF(autotransfer)
curvotes = SSautotransfer.curvotes
/datum/controller/subsystem/autotransfer/fire()
- if(REALTIMEOFDAY < targettime)
+ if(REALTIMEOFDAY < targettime || !SSticker.current_state == GAME_STATE_PLAYING || EMERGENCY_AT_LEAST_DOCKED)
+ return
+ if(!isnull(SSvote.current_vote))
return
if(maxvotes == NO_MAXVOTES_CAP || maxvotes > curvotes)
SSvote.initiate_vote(/datum/vote/transfer_vote, "automatic transfer", forced = TRUE)
diff --git a/modular_skyrat/modules/better_vox/code/vox_species.dm b/modular_skyrat/modules/better_vox/code/vox_species.dm
index bfd07232e3e..7d9b4aa94c7 100644
--- a/modular_skyrat/modules/better_vox/code/vox_species.dm
+++ b/modular_skyrat/modules/better_vox/code/vox_species.dm
@@ -1,5 +1,5 @@
/datum/species/vox_primalis
- name = "Vox Primalis"
+ name = "Vox"
id = SPECIES_VOX_PRIMALIS
eyes_icon = 'modular_skyrat/modules/better_vox/icons/bodyparts/vox_eyes.dmi'
can_augment = FALSE
@@ -67,42 +67,32 @@
item.worn_icon_better_vox = icon
/datum/species/vox_primalis/get_species_description()
- return "The Vox seem to be nomadic, bio-engineered alien creatures that operate in and around human space at the behest of crazed and dreaming gods. \
- In reality, we know them to be originally designed by the Vox Auralis, a wholly-reclusive variety of powerful psychics, and present a cold shoulder to all other known cultures, and generally their only visible role on the galactic stage is to act as auxiliary workforce of which they are functionally suited for. \
- The massive moon-sized arkships that serve as their homes travel meandering and convoluted migratory trails through the Milky Way, and the appearance of their looted and repurposed ships is almost always a cause for alarm."
+ return list(
+ "By the account of those unaware, the vox seem to be a nomadic race of avianoid creatures that operate in and around human space at the behest of “crazed, dreaming gods.“ \
+ The true vox are the wholly reclusive Vox Auralis, vastly powerful psychics and bio-engineers. They are a distant race at the best of times. \
+ These vox, the Primalis, are the laboring underclass that the Auralis use to sustain the Arkships, following a convoluted trail throughout the Milky Way."
+ )
/datum/species/vox_primalis/get_species_lore()
return list(
- "Designed and grown by the Apex, biocomputers the size of massive willow trees, the average Vox is a digitigrade, reptilian biped with stiff, semi-rigid keratin quills on their head, a long prehensile tail, and a teethed and bilaterally-split jaw. \
- They have a flexible and lightweight skeleton and a two-channel redundant nervous system. They generally stand anywhere from 1.3 to 2 meters tall, averaging at 1.5 for most Vox, taller for Armalis, with a primarily green and brown coloration, but can have different colored quills and body markings. \
- Their bodies are scaled with rigid, nonconducting plates in overlapping rows, which can be bristled or flattened at will to optimize cooling or form interior seals as to retain heat. \
- Their aforementioned quills act as a supplementary cooling system, with tiny capillaries allowing bloodflow into the hollow recesses inside of the quills, which they may often violently shake to produce a cooling effect with the air; this also functions as a threat display, as many Vox will attempt to cool themselves down before engaging in a fight as to regulate their body-temperature though exertion. \
- They do not respirate as humans do, but they do require a nitrogen-rich atmosphere to 'breathe', and suffer badly in the presence of oxygen. \
- Their musculature is geared towards sudden bursts of rapid movement, with a vulnerability to lactic acid buildup as a result.",
-
- "While the brain of any sort of Vox up to the Auralis are certainly present, a Vox is not considered 'alive' without the Cortical Stack. This mechanical brain is installed the minute a Vox is produced by the Apex, mind uploading being one of the oldest disciplines of the Vox, and it holds their memories, personality, and body information. \
- These machines also hold their genetic information, a newly 'resleeved' Vox physically mutating into the parameters set by their stack. A Vox is not considered 'dead' as long as their stack can be put in a new body, and this process affords them functional immortality. \
- However, no other beings are considered 'alive' either due to their lack of one; their absence of the divine spark of the Auralis. They feel neither empathy nor hatred towards aliens, their short, violent and ephemeral existences ultimately meaning as little as furniture to the Vox.",
-
- "Artificially made by the Apex, Vox Primalis are grown for a purpose, their personalities and duties sourced by the cortical stacks installed in their heads. \
- The exact specifications and duties of a Primalis may change throughout their life according to the enigmatic will of the biocomputers fabricating them, and their duties may be oddly specific at times; \
- but seven core 'groups' of jobs are known by humans, signified by a series of neck, throat, facial, and back markings encoded with their role, genetic lineage, notable deeds, and arkship of origin.",
-
- "'Drones' are the engineers, technicians, and builders of the Primalis. Their duties revolve around the upkeep of the Arkships themselves, and the operation of technologies new and old. \
- 'Servitors' are in charge of biological affairs; making sure stocks are full, meals are made, and Vox are healthy. They typically share work with Drones due to Vox technology being both synthetic and organic.",
-
- "'Raiders' are those combat-focused Primalis sent on excursion teams from the ships to plunder goods, people, and other wares from aliens. \
- 'Scavengers' work alongside Raiders, pulling stations and ships apart to find anything even remotely valuable, down to the scrap metal and copper wiring in an outpost.",
-
- "'Reavers' are essentially the white blood cells of an Arkship. Rarely seen but always around, these Vox are dedicated to expunging threats and ensuring that individuals in need of 'pruning' are brought in swiftly to the Armalis and Apex. \
- If ever seen outside an Arkship, it's typically for the purpose of overseeing other Primalis in place of a proper Armalis.",
-
- "'Leaders' are those that are in charge of a crew. Acting like a tightly-knit family, these work crews are kept in line not only by the Armalis, but by these typically very old Vox. \
- These magnanimous (for a Primalis) individuals are very, very rarely seen outside of an Arkship due to their assignments requiring 'active duty'. \
- To see a 'Leader,' in a place of aliens is to know that they are almost assuredly an exile, and shunned by all varieties of Vox. The Vox consider 'drains on resources' as inexcusable, and to be one is an act to be shunned upon.",
-
- "'Larva' are not Primalis children, as they'd be less than a few months old at youngest, but a denigrating term for Vox that either have not yet been assigned a duty, or those currently inbetween them. \
- While these Vox are often pushed by other Primalis to 'hurry up already,' it is the wide consensus of Vox that 'A lone leader is worse than a larva, for while even a larva has a future, all the leader has is a disgraced past.'"
+ "The Vox are a theocratic nation led by the Vox Auralis. All of the engineered species beneath them are more than predisposed to follow the Auralis, they must utterly obey them. \
+ The Vox are perhaps one of the oldest races in the galaxy, drifting through the stars in their massive Ark Ships, often scattered about the vast cosmos. \
+ The Auralis have even been known to contract and exploit Vox Primalis with galactic entities for a continuous supply of resources. \
+ Yet, the Auralis are almost entirely unknown to the galaxy at large, as the distinction of “Vox” falls almost solely upon the Vox Primalis.",
+ "The Vox Primalis are not only the physical form, but rather a biomechanical entity known as a “Cortical Stack”. A body without a stack is little more than a husk. \
+ The task of coordinating available stacks on an Arkship is given to the Apex, a powerful biocomputer woven into the vessel's systems. \
+ The average Primalis is a reptilian avian with stiff, semi-rigid keratin quills atop their head, a long and prehensile tail, and a beak containing rows of angled teeth. \
+ They tend to have two tongues, one on the roof of the mouth and the other on the lower jaw, allowing them to speak the complex Vox language with ease. \
+ The Primalis do not generally need to live frugal, though they have been predisposed to doing so.",
+ "The height of a Primalis varies heavily, ranging from as small as 3 feet, to as large as 10 feet for living haulers of heavy equipment. So long as the Cortical Stack remains intact, \
+ death is only an inconvenience. The stack can be transferred to a new body within minutes to hours, and operational in almost no time at all. If a stack is damaged, \
+ the Vox experiences ego death, its “true death”. Even if the stack can be repaired at this stage, the personality cannot. Primalis are created with a purpose, \
+ the Cortical Stack imbued with the needed skills. Primalis must still practice their craft and hone their skills, though they tend to be prodigal compared to humans. \
+ Vox live a rigid life, with little room for advancement in a society where everything has its place under the Armalis, a caste made for combat.",
+ "Armalis are entirely dependent on the psychic network of the Apex to function, and are much like an AI with its cyborgs. \
+ As a result, Armalis can never stray far from their ship as all higher brain function effectively ceases. They have not been given the gift of free will. \
+ The Arkships do not want for much, but they still have use for commerce. Vox bioengineering is second to none, making it a prime bartering chip for research, \
+ and Arkships are often willing to trade in fragments of knowledge for resource aid and engineering assistance.",
)
/datum/species/vox_primalis/on_species_gain(mob/living/carbon/human/human_who_gained_species, datum/species/old_species, pref_load, regenerate_icons = TRUE)
diff --git a/modular_skyrat/modules/bitrunning/code/virtual_domains/ancient_milsim/ghost_spawner.dm b/modular_skyrat/modules/bitrunning/code/virtual_domains/ancient_milsim/ghost_spawner.dm
index 7d7a001f100..d6cc82130b4 100644
--- a/modular_skyrat/modules/bitrunning/code/virtual_domains/ancient_milsim/ghost_spawner.dm
+++ b/modular_skyrat/modules/bitrunning/code/virtual_domains/ancient_milsim/ghost_spawner.dm
@@ -17,7 +17,7 @@
/obj/effect/mob_spawn/ghost_role/human/ancient_milsim/special(mob/living/carbon/human/spawned_human)
. = ..()
- spawned_human.grant_language(/datum/language/panslavic, source = LANGUAGE_SPAWNER)
+ spawned_human.grant_language(/datum/language/spinwarder, source = LANGUAGE_SPAWNER)
apply_codename(spawned_human)
/obj/effect/mob_spawn/ghost_role/human/ancient_milsim/post_transfer_prefs(mob/living/carbon/human/spawned_human)
diff --git a/modular_skyrat/modules/black_mesa/code/armaments/_armament_primary.dm b/modular_skyrat/modules/black_mesa/code/armaments/_armament_primary.dm
index 49c78d96917..a4ba47c5cd0 100644
--- a/modular_skyrat/modules/black_mesa/code/armaments/_armament_primary.dm
+++ b/modular_skyrat/modules/black_mesa/code/armaments/_armament_primary.dm
@@ -1,3 +1,4 @@
+
/datum/armament_entry/hecu/primary
category = ARMAMENT_CATEGORY_PRIMARY
category_item_limit = 4
@@ -34,12 +35,6 @@
cost = 11
magazine = /obj/item/ammo_box/magazine/c40sol_rifle/standard
-/datum/armament_entry/hecu/primary/shotgun
- subcategory = ARMAMENT_SUBCATEGORY_SHOTGUN
- mags_to_spawn = 1
- magazine = /obj/item/storage/box/ammo_box/shotgun_12g
- magazine_cost = 4
-
/datum/armament_entry/hecu/primary/shotgun/shotgun_highcap
item_type = /obj/item/gun/ballistic/shotgun/riot/sol
max_purchase = 2
@@ -68,15 +63,3 @@
magazine_cost = 2
/obj/item/storage/box/ammo_box/shotgun_12g
-
-/obj/item/storage/box/ammo_box/shotgun_12g/PopulateContents()
- var/funshell = pick(
- /obj/item/ammo_box/advanced/s12gauge/incendiary,
- /obj/item/ammo_box/advanced/s12gauge/flechette,
- /obj/item/ammo_box/advanced/s12gauge/beehive,
- /obj/item/ammo_box/advanced/s12gauge/antitide,
- /obj/item/ammo_box/advanced/s12gauge/express,
- )
- new /obj/item/ammo_box/advanced/s12gauge/magnum(src)
- new /obj/item/ammo_box/advanced/s12gauge(src)
- new funshell(src)
diff --git a/modular_skyrat/modules/black_mesa/code/ghost_spawners.dm b/modular_skyrat/modules/black_mesa/code/ghost_spawners.dm
index 416def1973a..e856f22eb57 100644
--- a/modular_skyrat/modules/black_mesa/code/ghost_spawners.dm
+++ b/modular_skyrat/modules/black_mesa/code/ghost_spawners.dm
@@ -182,7 +182,7 @@
/obj/effect/mob_spawn/ghost_role/human/black_mesa/hecu/leader/special(mob/living/carbon/human/spawned_human)
. = ..()
spawned_human.grant_language(/datum/language/uncommon, source = LANGUAGE_SPAWNER)
- spawned_human.grant_language(/datum/language/panslavic, source = LANGUAGE_SPAWNER)
+ spawned_human.grant_language(/datum/language/spinwarder, source = LANGUAGE_SPAWNER)
spawned_human.grant_language(/datum/language/yangyu, source = LANGUAGE_SPAWNER)
/datum/outfit/hecu/leader
diff --git a/modular_skyrat/modules/black_mesa/code/turrets.dm b/modular_skyrat/modules/black_mesa/code/turrets.dm
index 74f762a63b6..27e542a3b48 100644
--- a/modular_skyrat/modules/black_mesa/code/turrets.dm
+++ b/modular_skyrat/modules/black_mesa/code/turrets.dm
@@ -40,7 +40,7 @@
..()
/obj/machinery/porta_turret/syndicate/pod/toolbox/mesa
- stun_projectile = /obj/projectile/bullet/c9mm/rubber
+ stun_projectile = /obj/projectile/bullet/c9mm
lethal_projectile = /obj/projectile/bullet/c9mm/ap
max_integrity = 150
req_access = list(ACCESS_AWAY_SEC)
diff --git a/modular_skyrat/modules/blueshield/code/blueshield.dm b/modular_skyrat/modules/blueshield/code/blueshield.dm
index 7981d596893..e1d191b5373 100644
--- a/modular_skyrat/modules/blueshield/code/blueshield.dm
+++ b/modular_skyrat/modules/blueshield/code/blueshield.dm
@@ -1,5 +1,6 @@
/datum/job/blueshield
title = JOB_BLUESHIELD
+ rpg_title = "Guild Protectorate"
description = "Protect the Heads of Staff and get your hands dirty so they can keep theirs clean."
auto_deadmin_role_flags = DEADMIN_POSITION_SECURITY
department_head = list(JOB_NT_REP)
diff --git a/modular_skyrat/modules/cargo/code/goodies.dm b/modular_skyrat/modules/cargo/code/goodies.dm
index c11c4f72b03..6fa3eb9f4a5 100644
--- a/modular_skyrat/modules/cargo/code/goodies.dm
+++ b/modular_skyrat/modules/cargo/code/goodies.dm
@@ -37,6 +37,7 @@
name = "Improved RCD"
desc = "An upgraded RCD featuring superior material storage. Comes with complimentary frames and circuitry upgrades to boot!"
cost = PAYCHECK_CREW * 38
+ access_view = ACCESS_ENGINE_EQUIP
contains = list(/obj/item/construction/rcd/improved)
/*
diff --git a/modular_skyrat/modules/company_imports/code/armament_datums/micron_control_systems.dm b/modular_skyrat/modules/company_imports/code/armament_datums/micron_control_systems.dm
deleted file mode 100644
index 840ee28676c..00000000000
--- a/modular_skyrat/modules/company_imports/code/armament_datums/micron_control_systems.dm
+++ /dev/null
@@ -1,144 +0,0 @@
-
-/datum/armament_entry/company_import/micron
- category = COMPANY_NAME_MICRON_CONTROL_SYSTEMS
- company_bitflag = CARGO_COMPANY_MICRON
-
-/datum/armament_entry/company_import/micron/rifle
- subcategory = ARMAMENT_SUBCATEGORY_SPECIAL
-
-/*
-/datum/armament_entry/company_import/micron/rifle/mcr
- item_type = /obj/item/gun/microfusion/mcr01
- cost = PAYCHECK_COMMAND * 4
-
-*/
-
-/datum/armament_entry/company_import/micron/ammo
- subcategory = ARMAMENT_SUBCATEGORY_AMMO
-
-/datum/armament_entry/company_import/micron/ammo/cell
- item_type = /obj/item/stock_parts/power_store/cell/microfusion
- cost = PAYCHECK_CREW
-
-/datum/armament_entry/company_import/micron/ammo/cell_bulk
- item_type = /obj/item/storage/box/ammo_box/microfusion/bagless
- cost = PAYCHECK_CREW * 2
-
-/datum/armament_entry/company_import/micron/ammo/cell_adv
- item_type = /obj/item/stock_parts/power_store/cell/microfusion/advanced
- cost = PAYCHECK_CREW * 2
-
-/datum/armament_entry/company_import/micron/ammo/cell_adv_bulk
- item_type = /obj/item/storage/box/ammo_box/microfusion/advanced/bagless
- cost = PAYCHECK_CREW * 3
-
-/datum/armament_entry/company_import/micron/ammo/cell_blue
- item_type = /obj/item/stock_parts/power_store/cell/microfusion/bluespace
- cost = PAYCHECK_CREW * 3
-
-/datum/armament_entry/company_import/micron/ammo/cell_blue_bulk
- item_type = /obj/item/storage/box/ammo_box/microfusion/bluespace/bagless
- cost = PAYCHECK_CREW * 4
-
-/datum/armament_entry/company_import/micron/part
- subcategory = ARMAMENT_SUBCATEGORY_GUNPART
-
-/datum/armament_entry/company_import/micron/part/grip
- item_type = /obj/item/microfusion_gun_attachment/grip
- cost = PAYCHECK_CREW * 2
-
-/datum/armament_entry/company_import/micron/part/scatter
- item_type = /obj/item/microfusion_gun_attachment/barrel/scatter
- cost = PAYCHECK_CREW * 4
-
-/datum/armament_entry/company_import/micron/part/scope
- item_type = /obj/item/microfusion_gun_attachment/scope
- cost = PAYCHECK_CREW * 2
-
-/datum/armament_entry/company_import/micron/part/rail
- item_type = /obj/item/microfusion_gun_attachment/rail
- cost = PAYCHECK_CREW * 2
-
-/datum/armament_entry/company_import/micron/part/heatsink
- item_type = /obj/item/microfusion_gun_attachment/heatsink
- cost = PAYCHECK_CREW * 3
-
-/datum/armament_entry/company_import/micron/part/lance
- item_type = /obj/item/microfusion_gun_attachment/barrel/lance
- cost = PAYCHECK_CREW * 4
-
-/datum/armament_entry/company_import/micron/emitter
- subcategory = ARMAMENT_SUBCATEGORY_EMITTER
-
-/datum/armament_entry/company_import/micron/emitter/enh_emitter
- item_type = /obj/item/microfusion_phase_emitter/enhanced
- cost = PAYCHECK_CREW * 3
-
-/datum/armament_entry/company_import/micron/emitter/adv_emitter
- item_type = /obj/item/microfusion_phase_emitter/advanced
- cost = PAYCHECK_CREW * 5
-
-/datum/armament_entry/company_import/micron/emitter/blue_emitter
- item_type = /obj/item/microfusion_phase_emitter/bluespace
- cost = PAYCHECK_CREW * 7
-
-/datum/armament_entry/company_import/micron/cell_upgrade
- subcategory = ARMAMENT_SUBCATEGORY_CELL_UPGRADE
-
-/datum/armament_entry/company_import/micron/cell_upgrade/stabilize
- item_type = /obj/item/microfusion_cell_attachment/stabiliser
- cost = PAYCHECK_CREW * 2
-
-/datum/armament_entry/company_import/micron/cell_upgrade/overcapacity
- item_type = /obj/item/microfusion_cell_attachment/overcapacity
- cost = PAYCHECK_CREW * 3
-
-/datum/armament_entry/company_import/micron/cell_upgrade/selfcharge
- item_type = /obj/item/microfusion_cell_attachment/selfcharging
- cost = PAYCHECK_CREW * 5
-
-/datum/armament_entry/company_import/micron/mcr_attachments
- subcategory = "Microfusion Attachment Kits"
-
-/datum/armament_entry/company_import/micron/mcr_attachments/hellfire
- name = "microfusion hellfire kit"
- item_type = /obj/item/storage/briefcase/secure/white/mcr_loadout/hellfire
- cost = PAYCHECK_CREW * 1.5
-
-/datum/armament_entry/company_import/micron/mcr_attachments/scatter
- name = "microfusion scatter kit"
- item_type = /obj/item/storage/briefcase/secure/white/mcr_loadout/scatter
- cost = PAYCHECK_CREW * 1.5
-
-/datum/armament_entry/company_import/micron/mcr_attachments/lance
- name = "microfusion lance kit"
- item_type = /obj/item/storage/briefcase/secure/white/mcr_loadout/lance
- cost = PAYCHECK_CREW * 1.5
-
-/datum/armament_entry/company_import/micron/mcr_attachments/repeater
- name = "microfusion repeater kit"
- item_type = /obj/item/storage/briefcase/secure/white/mcr_loadout/repeater
- cost = PAYCHECK_CREW * 1.5
-
-/datum/armament_entry/company_import/micron/mcr_attachments/tacticool
- name = "microfusion suppressor kit"
- item_type = /obj/item/storage/briefcase/secure/white/mcr_loadout/tacticool
- cost = PAYCHECK_CREW * 1.5
-
-/datum/armament_entry/company_import/micron/mcr_upgrades/enhanced_part_kit
- name = "microfusion enhanced parts"
- item_type = /obj/item/storage/briefcase/secure/white/mcr_parts/enhanced
- cost = PAYCHECK_CREW * 1.5
-
-
-/datum/armament_entry/company_import/micron/mcr_upgrades/advanced_part_kit
- name = "microfusion advanced parts"
- item_type = /obj/item/storage/briefcase/secure/white/mcr_parts/advanced
- cost = PAYCHECK_CREW * 3
-
-
-/datum/armament_entry/company_import/micron/mcr_upgrades/bluespace_part_kit
- name = "microfusion bluespace parts"
- item_type = /obj/item/storage/briefcase/secure/white/mcr_parts/bluespace
- cost = PAYCHECK_CREW * 5.5
-
diff --git a/modular_skyrat/modules/company_imports/code/armament_datums/sol_defense.dm b/modular_skyrat/modules/company_imports/code/armament_datums/sol_defense.dm
index 17c9ead959f..413b2a0f49c 100644
--- a/modular_skyrat/modules/company_imports/code/armament_datums/sol_defense.dm
+++ b/modular_skyrat/modules/company_imports/code/armament_datums/sol_defense.dm
@@ -69,21 +69,10 @@
/datum/armament_entry/company_import/sol_defense/armor_sacrifice/sacrificial_vest
item_type = /obj/item/clothing/suit/armor/sf_sacrificial
-/datum/armament_entry/company_import/sol_defense/sidearm
- subcategory = "Sidearms"
-
-/datum/armament_entry/company_import/sol_defense/sidearm/eland
- item_type = /obj/item/gun/ballistic/revolver/sol
- cost = PAYCHECK_COMMAND * 4
- restricted = TRUE
//You can still buy it from cargo side
//If cargo decides to agree with sec on a compromise then good job
-/datum/armament_entry/company_import/sol_defense/sidearm/wespe
- item_type = /obj/item/gun/ballistic/automatic/pistol/sol
- cost = PAYCHECK_COMMAND * 4
- restricted = TRUE
/*
/datum/armament_entry/company_import/sol_defense/sidearm/skild
item_type = /obj/item/gun/ballistic/automatic/pistol/trappiste
@@ -99,9 +88,6 @@
*/
// Lethal anything that's not a pistol, requires high company interest
-/datum/armament_entry/company_import/sol_defense/longarm
- subcategory = "Longarms"
- restricted = TRUE
/*
/datum/armament_entry/company_import/sol_defense/longarm/renoster
item_type = /obj/item/gun/ballistic/shotgun/riot/sol
@@ -118,25 +104,6 @@
//ShaytanAndVest
//These are new - added by Bangle. Framework for additional conversion kits as deemed appropriate by maintainers.
-/datum/armament_entry/company_import/sol_defense/conversionkit
- restricted = TRUE
- subcategory = "Conversion Kits"
-
-/datum/armament_entry/company_import/sol_defense/conversionkit/sindano
- item_type = /obj/item/weaponcrafting/gunkit/sol_smg_rapidfire_kit
- cost = PAYCHECK_COMMAND * 8
-
-/datum/armament_entry/company_import/sol_defense/longarm/renoster
- item_type = /obj/item/gun/ballistic/shotgun/riot/sol
- cost = PAYCHECK_COMMAND * 6
-
-/datum/armament_entry/company_import/sol_defense/longarm/sindano
- item_type = /obj/item/gun/ballistic/automatic/sol_smg
- cost = PAYCHECK_COMMAND * 6
-
-/datum/armament_entry/company_import/sol_defense/longarm/elite
- item_type = /obj/item/gun/ballistic/automatic/sol_rifle/marksman
- cost = PAYCHECK_COMMAND * 8
/*
@@ -171,24 +138,6 @@ These one are simply rediculous, but we'll keep it there incase someone has idea
subcategory = "Magazines"
cost = PAYCHECK_CREW
-/datum/armament_entry/company_import/sol_defense/magazines/c35_mag
- item_type = /obj/item/ammo_box/magazine/c35sol_pistol/starts_empty
-
-/datum/armament_entry/company_import/sol_defense/magazines/c35_extended
- item_type = /obj/item/ammo_box/magazine/c35sol_pistol/stendo/starts_empty
-/*
-/datum/armament_entry/company_import/sol_defense/magazines/c585_mag
- item_type = /obj/item/ammo_box/magazine/c585trappiste_pistol/spawns_empty
-/datum/armament_entry/company_import/sol_defense/magazines/sol_rifle_short
- item_type = /obj/item/ammo_box/magazine/c40sol_rifle/starts_empty
-/datum/armament_entry/company_import/sol_defense/magazines/sol_rifle_standard
- item_type = /obj/item/ammo_box/magazine/c40sol_rifle/standard/starts_empty
- cost = PAYCHECK_COMMAND
-/datum/armament_entry/company_import/sol_defense/magazines/sol_rifle_drum
- item_type = /obj/item/ammo_box/magazine/c40sol_rifle/drum/starts_empty
- cost = PAYCHECK_COMMAND * 3
- contraband = TRUE
-*/
/datum/armament_entry/company_import/sol_defense/magazines/sol_grenade_standard
item_type = /obj/item/ammo_box/magazine/c980_grenade/starts_empty
cost = PAYCHECK_COMMAND * 2
diff --git a/modular_skyrat/modules/company_imports/code/armament_datums/vitezstvi_ammo.dm b/modular_skyrat/modules/company_imports/code/armament_datums/vitezstvi_ammo.dm
index 9c5092cb053..99cbb42dff7 100644
--- a/modular_skyrat/modules/company_imports/code/armament_datums/vitezstvi_ammo.dm
+++ b/modular_skyrat/modules/company_imports/code/armament_datums/vitezstvi_ammo.dm
@@ -2,8 +2,6 @@
category = COMPANY_NAME_VITEZSTVI_AMMO
company_bitflag = CARGO_COMPANY_VITEZSTVI_AMMO
-// Ammo bench and the lethals disk
-
/datum/armament_entry/company_import/vitezstvi/ammo_bench
subcategory = "Ammunition Manufacturing Equipment"
@@ -41,25 +39,6 @@
// Boxes of non-shotgun ammo
-/datum/armament_entry/company_import/vitezstvi/ammo_boxes
- subcategory = "Ammunition Boxes"
- cost = PAYCHECK_CREW
-
-/datum/armament_entry/company_import/vitezstvi/ammo_boxes/sol35
- item_type = /obj/item/ammo_box/c35sol
-
-/datum/armament_entry/company_import/vitezstvi/ammo_boxes/sol35_disabler
- item_type = /obj/item/ammo_box/c35sol/incapacitator
-
-/datum/armament_entry/company_import/vitezstvi/ammo_boxes/sol40_disabler
- item_type = /obj/item/ammo_box/c40sol/fragmentation
-
-/datum/armament_entry/company_import/vitezstvi/ammo_boxes/strilka_rubber
- item_type = /obj/item/ammo_box/c310_cargo_box/rubber
-
-/datum/armament_entry/company_import/vitezstvi/ammo_boxes/trappiste585_disabler
- item_type = /obj/item/ammo_box/c585trappiste/incapacitator
-
// Revolver speedloaders
/datum/armament_entry/company_import/vitezstvi/speedloader
@@ -81,37 +60,16 @@
/datum/armament_entry/company_import/vitezstvi/shot_shells
subcategory = "Shotgun Shells"
cost = PAYCHECK_COMMAND
-/*
-/datum/armament_entry/company_import/vitezstvi/shot_shells/slugs
- item_type = /obj/item/ammo_box/advanced/s12gauge
-/datum/armament_entry/company_import/vitezstvi/shot_shells/buckshot
- item_type = /obj/item/ammo_box/advanced/s12gauge/buckshot
-*/
/datum/armament_entry/company_import/vitezstvi/shot_shells/beanbag_slugs
item_type = /obj/item/ammo_box/advanced/s12gauge/bean
/datum/armament_entry/company_import/vitezstvi/shot_shells/rubbershot
item_type = /obj/item/ammo_box/advanced/s12gauge/rubber
-/*
-/datum/armament_entry/company_import/vitezstvi/shot_shells/magnum_buckshot
- item_type = /obj/item/ammo_box/advanced/s12gauge/magnum
-/datum/armament_entry/company_import/vitezstvi/shot_shells/express_buckshot
- item_type = /obj/item/ammo_box/advanced/s12gauge/express
-*/
/datum/armament_entry/company_import/vitezstvi/shot_shells/hunter_slug
item_type = /obj/item/ammo_box/advanced/s12gauge/hunter
-/*
-/datum/armament_entry/company_import/vitezstvi/shot_shells/flechettes
- item_type = /obj/item/ammo_box/advanced/s12gauge/flechette
-*/
-/datum/armament_entry/company_import/vitezstvi/shot_shells/hornet_nest
- item_type = /obj/item/ammo_box/advanced/s12gauge/beehive
-/*
-/datum/armament_entry/company_import/vitezstvi/shot_shells/stardust
- item_type = /obj/item/ammo_box/advanced/s12gauge/antitide
-*/
+
/datum/armament_entry/company_import/vitezstvi/shot_shells/confetti
item_type = /obj/item/ammo_box/advanced/s12gauge/honkshot
cost = PAYCHECK_LOWER
diff --git a/modular_skyrat/modules/company_imports/code/objects/microstar/mcr_attachment_kits.dm b/modular_skyrat/modules/company_imports/code/objects/microstar/mcr_attachment_kits.dm
deleted file mode 100644
index c5b9d11fe3a..00000000000
--- a/modular_skyrat/modules/company_imports/code/objects/microstar/mcr_attachment_kits.dm
+++ /dev/null
@@ -1,73 +0,0 @@
-/obj/item/storage/briefcase/secure/white/mcr_loadout
- name = "Microfusion Attachment Kit"
-
-/obj/item/storage/briefcase/secure/white/mcr_loadout/hellfire
-
-/obj/item/storage/briefcase/secure/white/mcr_loadout/hellfire/PopulateContents()
- var/static/items_inside = list(
- /obj/item/microfusion_gun_attachment/barrel/hellfire = 1,
- /obj/item/microfusion_gun_attachment/rail = 1,
- /obj/item/microfusion_gun_attachment/grip = 1,
- )
- generate_items_inside(items_inside,src)
-
-/obj/item/storage/briefcase/secure/white/mcr_loadout/scatter/PopulateContents()
- var/static/items_inside = list(
- /obj/item/microfusion_gun_attachment/barrel/scatter = 1,
- /obj/item/microfusion_gun_attachment/rail = 1,
- /obj/item/microfusion_gun_attachment/grip = 1,
- )
- generate_items_inside(items_inside,src)
-
-/obj/item/storage/briefcase/secure/white/mcr_loadout/lance/PopulateContents()
- var/static/items_inside = list(
- /obj/item/microfusion_gun_attachment/barrel/lance = 1,
- /obj/item/microfusion_gun_attachment/scope = 1,
- /obj/item/microfusion_gun_attachment/heatsink = 1,
- )
- generate_items_inside(items_inside,src)
-
-/obj/item/storage/briefcase/secure/white/mcr_loadout/repeater/PopulateContents()
- var/static/items_inside = list(
- /obj/item/microfusion_gun_attachment/barrel/repeater = 1,
- /obj/item/microfusion_gun_attachment/rail = 1,
- /obj/item/microfusion_gun_attachment/heatsink = 1,
- )
- generate_items_inside(items_inside,src)
-
-/obj/item/storage/briefcase/secure/white/mcr_loadout/tacticool/PopulateContents()
- var/static/items_inside = list(
- /obj/item/microfusion_gun_attachment/barrel/suppressor = 1,
- /obj/item/microfusion_gun_attachment/rail = 1,
- /obj/item/microfusion_gun_attachment/grip = 1,
- /obj/item/microfusion_gun_attachment/camo = 1,
- )
- generate_items_inside(items_inside,src)
-
-// Phase emitter and cell upgrades
-
-/obj/item/storage/briefcase/secure/white/mcr_parts
- name = "Microfusion Parts Kit"
-
-/obj/item/storage/briefcase/secure/white/mcr_parts/enhanced/PopulateContents()
- var/static/items_inside = list(
- /obj/item/stock_parts/power_store/cell/microfusion/enhanced = 1,
- /obj/item/microfusion_phase_emitter/enhanced = 1,
- )
- generate_items_inside(items_inside,src)
-
-/obj/item/storage/briefcase/secure/white/mcr_parts/advanced
-
-/obj/item/storage/briefcase/secure/white/mcr_parts/advanced/PopulateContents()
- var/static/items_inside = list(
- /obj/item/stock_parts/power_store/cell/microfusion/advanced = 1,
- /obj/item/microfusion_phase_emitter/advanced = 1,
- )
- generate_items_inside(items_inside,src)
-
-/obj/item/storage/briefcase/secure/white/mcr_parts/bluespace/PopulateContents()
- var/static/items_inside = list(
- /obj/item/stock_parts/power_store/cell/microfusion/bluespace = 1,
- /obj/item/microfusion_phase_emitter/bluespace = 1,
- )
- generate_items_inside(items_inside,src)
diff --git a/modular_skyrat/modules/company_imports/code/objects/vitezstvi/ammo_boxes.dm b/modular_skyrat/modules/company_imports/code/objects/vitezstvi/ammo_boxes.dm
index d7118005c1c..d1e0aeed5c8 100644
--- a/modular_skyrat/modules/company_imports/code/objects/vitezstvi/ammo_boxes.dm
+++ b/modular_skyrat/modules/company_imports/code/objects/vitezstvi/ammo_boxes.dm
@@ -13,6 +13,10 @@
/obj/item/ammo_box/c38
w_class = WEIGHT_CLASS_SMALL
+/obj/item/ammo_box/c9mm/security
+ name = "ammo box (9mm security)"
+ ammo_type = /obj/item/ammo_casing/c9mm/security
+
/obj/item/ammo_box/c9mm/ap
name = "ammo box (9mm AP)"
ammo_type = /obj/item/ammo_casing/c9mm/ap
@@ -56,10 +60,6 @@
name = "ammo box (4.6x30mm AP)"
ammo_type = /obj/item/ammo_casing/c46x30mm/ap
-/obj/item/ammo_box/c46x30mm/rubber
- name = "ammo box (4.6x30mm rubber)"
- ammo_type = /obj/item/ammo_casing/c46x30mm/rubber
-
/obj/item/ammo_box/c34
name = "ammo box (.34)"
icon = 'modular_skyrat/modules/company_imports/icons/ammo.dmi'
@@ -71,27 +71,6 @@
name = "ammo box (.34 AP)"
ammo_type = /obj/item/ammo_casing/c34/ap
-/obj/item/ammo_box/c34/rubber
- name = "ammo box (.34 rubber)"
- ammo_type = /obj/item/ammo_casing/c34/rubber
-
/obj/item/ammo_box/c34/fire
name = "ammo box (.34 incendiary)"
ammo_type = /obj/item/ammo_casing/c34_incendiary
-
-/obj/item/storage/box/ammo_box/microfusion/bluespace
- name = "bluespace microfusion cell container"
- desc = "A box filled with microfusion cells."
-
-/obj/item/storage/box/ammo_box/microfusion/bluespace/PopulateContents()
- new /obj/item/storage/pouch/ammo(src)
- new /obj/item/stock_parts/power_store/cell/microfusion/bluespace(src)
- new /obj/item/stock_parts/power_store/cell/microfusion/bluespace(src)
- new /obj/item/stock_parts/power_store/cell/microfusion/bluespace(src)
-
-
-/obj/item/storage/box/ammo_box/microfusion/bluespace/bagless/PopulateContents()
- new /obj/item/stock_parts/power_store/cell/microfusion/bluespace(src)
- new /obj/item/stock_parts/power_store/cell/microfusion/bluespace(src)
- new /obj/item/stock_parts/power_store/cell/microfusion/bluespace(src)
-
diff --git a/modular_skyrat/modules/customization/modules/jobs/_job.dm b/modular_skyrat/modules/customization/modules/jobs/_job.dm
index 46d882cf71f..3417b72bd7c 100644
--- a/modular_skyrat/modules/customization/modules/jobs/_job.dm
+++ b/modular_skyrat/modules/customization/modules/jobs/_job.dm
@@ -246,14 +246,10 @@
/datum/job/proc/has_required_languages(datum/preferences/pref)
if(!required_languages)
return TRUE
- // if we have a bilingual quirk, check that as well
- var/bilingual_pref
- if(/datum/quirk/bilingual::name in pref.all_quirks)
- bilingual_pref = pref.read_preference(/datum/preference/choiced/language)
for(var/datum/language/lang as anything in required_languages)
//Doesnt have language, or the required "level" is too low (understood, while needing spoken)
- if((!pref.languages[lang] || pref.languages[lang] < required_languages[lang]) && bilingual_pref != lang.name)
+ if((!pref.languages[lang] || pref.languages[lang] < required_languages[lang]))
return FALSE
return TRUE
diff --git a/modular_skyrat/modules/customization/modules/language/chitinclick.dm b/modular_skyrat/modules/customization/modules/language/chitinclick.dm
index c8eba66ba8c..dd24d62ca73 100644
--- a/modular_skyrat/modules/customization/modules/language/chitinclick.dm
+++ b/modular_skyrat/modules/customization/modules/language/chitinclick.dm
@@ -1,4 +1,4 @@
-/datum/language/chitinclick
+/datum/language/buzzwords
name = "Chitinclick"
desc = "A popular non-Human language that finds extensive use by various types of anthropomorphic invertebrates. It consists of complex flutters, chittering, antenna movements, and sparse guttural syllables."
key = "C"
diff --git a/modular_skyrat/modules/customization/modules/language/gutter.dm b/modular_skyrat/modules/customization/modules/language/gutter.dm
index c91d3ba146d..8645f87638b 100644
--- a/modular_skyrat/modules/customization/modules/language/gutter.dm
+++ b/modular_skyrat/modules/customization/modules/language/gutter.dm
@@ -1,6 +1,7 @@
/datum/language/gutter
name = "Plutonian"
- desc = "Plutonian Franco-Castilian is a constructed Romance language that was developed early on in the Terran Government's colonization history out of necessity for communication between its first Plutonian colonists. It heavily borrows from Spanish and French, with minor influence from other tongues the likes of Italian and Portuguese, despite coming off as elegant it carries a heavy amount of slang and idioms correlated to certain criminal groups. Today, it stands heavily engrained in the planet's culture - and almost every citizen will speak at least some of it on top of Sol."
+ desc = "Plutonian Franco-Castilian is a constructed Romance language that was developed early on out of necessity for communication between Pluto's first colonists. \
+ It comes off as elegant but is an ugly Mediterannean creole, often correlated with criminal groups. Today, it is a core part of the planet's culture."
key = "G"
flags = TONGUELESS_SPEECH
syllables = list (
diff --git a/modular_skyrat/modules/customization/modules/language/mothic.dm b/modular_skyrat/modules/customization/modules/language/mothic.dm
index fc30d9b54a6..b9044e3a39f 100644
--- a/modular_skyrat/modules/customization/modules/language/mothic.dm
+++ b/modular_skyrat/modules/customization/modules/language/mothic.dm
@@ -1,9 +1,8 @@
/datum/language/moffic
name = "Mothic"
- desc = "Spoken colloquially by the Mothfolk of Va Lumla, the early iteration of Mothic emerged when Fueljacks relied on their receptors for simple, one-worded pheromones to communicate, and navigate the often fatal maintenance tunnels sprawled throughout the fleet. \
+ desc = "The first iteration of Mothic emerged when Fueljacks relied on their receptors for simple, one-worded pheromones to communicate and navigate. \
The moths developed gesticulation through antennas and wings to convey deeper intent, with mandibles providing emotional context through clicks and trills. \
- After First Contact, human speakers managed to achieve a similar effect from clicking their tongue to roof, and steer the tone with the width of their mouth while using their hands in place of antennas. \
- It is informally spoken, deploying many slangs and shorthands from Common. Has phonetic resemblance to Italian."
+ Linguists have achieved a similar effect from clicking their tongue to roof, and steer the tone with the width of their mouth while using hands in place of antennas."
space_chance = 40
// Syllables derived from Italian.
syllables = list(
diff --git a/modular_skyrat/modules/customization/modules/language/panslavic.dm b/modular_skyrat/modules/customization/modules/language/panslavic.dm
deleted file mode 100644
index 14066777278..00000000000
--- a/modular_skyrat/modules/customization/modules/language/panslavic.dm
+++ /dev/null
@@ -1,23 +0,0 @@
-/datum/language/panslavic
- name = "Pan-Slavic"
- desc = "An elaborate mix of various Slavic languages with similar properties that has long since become the official language of the NRI, with a steady amount of relevance in TerraGov colonies with Slavic descendants and various types of trading posts and spaceports across Human space - it even managed to find a niche in communication with other species."
- key = "P"
- flags = TONGUELESS_SPEECH
- syllables = list(
- "do", "ber", "sve", "tel", "po", "ča", "sen", "jag", "nje", "sla", "do",
- "led", "klo", "ba", "sa", "pa", "ra", "diž", "nik", "vol", "ko", "vi", "ži",
- "ra", "fa", "zob", "na", "ščet", "ka", "zgo", "do", "vi", "na", "zah", "ra",
- "da", "tam", "ten", "led", "nič", "ka", "zá", "pis", "ník", "krá", "va",
- "ku", "ku", "ři", "ce", "ve", "přo", "vé", "ma", "so", "mo", "cný", "pi",
- "kan", "tní", "o", "ran", "žo", "vý", "vlast", "nos", "ti", "hvi", "li", "na",
- "mіs", "ce", "vij", "snі", "da", "nok", "kva", "so", "lja", "char", "ka", "mіs",
- "jacj", "gar", "na", "ne", "pra", "vil", "niy", "min", "dal", "io", "lam", "pa",
- "i", "zo", "bra", "ze", "ni", "e", "is", "kus", "stvo", "bi", "bli", "o", "te",
- "ka", "bas", "se", "in", "fut", "bol", "o", "fis", "po", "che", "mu", "ru",
- "bash", "ka", "kuh", "nia", "rech", "nik", "gor", "ko", "pi", "le", "ti", "na",
- "ko", "ni", "spa", "va", "ha", "so", "ba", "sve", "ska", "nov", "cha", "nik",
- "zem", "lya", "kan", "ce", "la", "ri", "јa", "snezh", "ne", "pa", "da", "vi", "ne"
- )
- icon_state = "panslavic"
- icon = 'modular_skyrat/master_files/icons/misc/language.dmi'
- default_priority = 95
diff --git a/modular_skyrat/modules/customization/modules/language/piratespeak.dm b/modular_skyrat/modules/customization/modules/language/piratespeak.dm
index d2d7b3c7a0c..8b137891791 100644
--- a/modular_skyrat/modules/customization/modules/language/piratespeak.dm
+++ b/modular_skyrat/modules/customization/modules/language/piratespeak.dm
@@ -1,2 +1 @@
-/datum/language/piratespeak
- secret = TRUE
+
diff --git a/modular_skyrat/modules/customization/modules/language/siiktajr.dm b/modular_skyrat/modules/customization/modules/language/siiktajr.dm
deleted file mode 100644
index cb826d45cba..00000000000
--- a/modular_skyrat/modules/customization/modules/language/siiktajr.dm
+++ /dev/null
@@ -1,21 +0,0 @@
-/datum/language/siiktajr
- name = "Siik'tajr"
- desc = "Overly complicated and with a turbulent history, this tongue comprised of short-form speech mixed with growls and meows is native to the Tajara. Due to the size of their Empire, countless dialects and different idioms exist - making a simple uniform way to teach this language almost impossible. After first contact, Humans describe the tongue as sounding somewhat similar to old Scandinavian languages in some form or another. It's rarely seen spoken by those not native to Taj, though certain genemodder groups have picked up a form of the tongue."
- key = "3"
- flags = TONGUELESS_SPEECH
- sentence_chance = 9
- space_chance = 60
- syllables = list(
- "aa","ai","ar","au","e","ee","ei","et","rr","rr","ta","tten","for","får","grr","grå","grrå","gra","grår","gär","grii",
- "grri","dra","haak","häi","hain","hal","hii","hel","hie","hää","ja","jaa","juu","jy","jä","jääs","ka","kai",
- "kamp","ki","kir","keii","kar","karr","kat","kyi","kyy","laan","lii","lan","luu","lyk","luin","mar","mi",
- "mii","mir","myi","myk","myrr","nai","nen","nei","nii","niik","nja","nya","nya","nyä","nyå","ii'r","mrr","mer","merr","nys",
- "nyt","no","oo","on","pa","paa","paek","ruus","ryys","rr","rr","ryö","rän","rää","rö","rik","tiik","rryn","sa","ssen",
- "sen","sii","sse","sä","säi","taj","tajr","tärr","tau","tuu","tuss","ut","utt","va","veii","vai","varr",
- "ven","vel","velt","verr","vit","vii","viik","virr","vir","vo","vå","vår","vårr","vorr","vyy","vy","vä","ä",
- "äh","äk","äl","äm","än","ån","är","år","äs","ås","ää","har","för","svar","på","stra","sve","sverr","då",
- "län","ny","kor","stå","vär","nning","mmen","ärr","det","vil"
- )
- icon_state = "siiktajr"
- icon = 'modular_skyrat/master_files/icons/misc/language.dmi'
- default_priority = 90
diff --git a/modular_skyrat/modules/customization/modules/language/skrell.dm b/modular_skyrat/modules/customization/modules/language/skrell.dm
index e4ccfabb2a7..c1d52bdf0dd 100644
--- a/modular_skyrat/modules/customization/modules/language/skrell.dm
+++ b/modular_skyrat/modules/customization/modules/language/skrell.dm
@@ -4,7 +4,7 @@
space_chance = 100
flags = TONGUELESS_SPEECH
key = "K"
- syllables = list("qr","qrr","xuq","qil","quum","xuqm","vol","xrim","zaoo","qu-uu","qix","qoo","zix","*","!")
+ syllables = list("qr","qrr","xuq","qil","quum","xuqm","vol","xrim","zaoo","qu-uu","qix","qoo","zix")
default_priority = 90
icon_state = "skrell"
icon = 'modular_skyrat/master_files/icons/misc/language.dmi'
diff --git a/modular_skyrat/modules/customization/modules/language/spacer.dm b/modular_skyrat/modules/customization/modules/language/spacer.dm
index e64e1162b98..601c1159abd 100644
--- a/modular_skyrat/modules/customization/modules/language/spacer.dm
+++ b/modular_skyrat/modules/customization/modules/language/spacer.dm
@@ -1,6 +1,8 @@
/datum/language/spacer
name = "Spacer"
- desc = "A rough, informal tongue used as a last resort when attempts to establish dialogue in more proper languages fail and no automatic translators are available. It relies heavily on tone, body language, signing, and a multitude of creole loanwords. While its use has fallen severely over the years, it's still practiced by a quantity of Frontier crews and favored by the Free Trade Union."
+ desc = "If Common is the language of commerce, then Spacer is its dark cousin, often used when attempts to establish dialogue in more proper languages fail \
+ and no automatic translators are available. It relies heavily on tone, body language, signing, and a multitude of creole loanwords. While its use has fallen severely over the years, \
+ it remains in use in seedier Frontier sectors where knowledge of Common is not guaranteed, and privacy is valued."
key = "j"
flags = TONGUELESS_SPEECH
syllables = list(
diff --git a/modular_skyrat/modules/customization/modules/language/te_velu_akko.dm b/modular_skyrat/modules/customization/modules/language/te_velu_akko.dm
index 7ca352b686b..c90f5187d27 100644
--- a/modular_skyrat/modules/customization/modules/language/te_velu_akko.dm
+++ b/modular_skyrat/modules/customization/modules/language/te_velu_akko.dm
@@ -1,8 +1,8 @@
/datum/language/akulan
name = "Te Velu Akko"
- desc = "The flowing, rhythmic language of the Akula, a language created in their distant times by one of their first leaders. The older form has much more flow and cadence, while the current popular form is more quick and harsh, making it easy to find most Old Nobles and hardliners just by dialect. One could compare the sound of Akko to that of the Terran Maori language."
-
-
+ desc = "The flowing, rhythmic language of the Akula, a language created in their distant times by one of their first leaders. \
+ The older form has much more flow and cadence, while the current popular form is more quick and harsh, making it easy to find most Old Nobles and hardliners just by dialect. \
+ One could compare the sound of Akko to that of the Terran Maori language."
key = "Z"
flags = TONGUELESS_SPEECH
space_chance = 70
diff --git a/modular_skyrat/modules/customization/modules/language/vox.dm b/modular_skyrat/modules/customization/modules/language/vox.dm
index c00fa109224..6dbbca2a606 100644
--- a/modular_skyrat/modules/customization/modules/language/vox.dm
+++ b/modular_skyrat/modules/customization/modules/language/vox.dm
@@ -1,5 +1,5 @@
/datum/language/vox
- name = "Vox Standard"
+ name = "Vox Pidgin"
desc = "A form of hybrid encoded language employed by the biomechanical Vox species, characterized by sounding extremely annoying and irritating to those who don't recognize it. It usually requires an implant to be spoken in its entirety."
key = "V"
flags = TONGUELESS_SPEECH
diff --git a/modular_skyrat/modules/customization/modules/language/yangyu.dm b/modular_skyrat/modules/customization/modules/language/yangyu.dm
index 03cdf3e4ea8..b32f2b4f999 100644
--- a/modular_skyrat/modules/customization/modules/language/yangyu.dm
+++ b/modular_skyrat/modules/customization/modules/language/yangyu.dm
@@ -1,6 +1,8 @@
/datum/language/yangyu
- name = "Yangyu"
- desc = "Also popularly known as \"Konjin\", this language group formally regarded as Orbital Sino-Tibetan is a result of a genetic relationship between Chinese, Tibetan, Burmese, and other Human languages of similar characteristics that was first proposed in the early 19th century and is extremely popular even in the space age. Originating from Asia, this group of tongues is the second most spoken by Human and Human-derived populations since the birth of Sol Common - and was a primary contender to be the Terran Government's official language. Many loanwords, idioms, and cultural relics of Japanese, Ryukyuan, Korean, and other societies have managed to persist within it, especially in the daily lives of speakers coming from Martian cities."
+ name = "Martian Yangyu"
+ desc = "Also known as \"Konjin\", this language group is a result of a genetic relationship between Chinese, Tibetan, Burmese, and other Asiatic languages \
+ that was first proposed in the early 19th century. This group of tongues is the second most popular in Terran space to Galactic Common. \
+ Many loanwords, idioms, and cultural relics have managed to persist, especially in the daily lives of speakers coming from Martian cities."
key = "Y"
flags = TONGUELESS_SPEECH
space_chance = 70
diff --git a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/MOD_sprite_accessories/mod_accessory_handler.dm b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/MOD_sprite_accessories/mod_accessory_handler.dm
index 64b46ed569e..3e6db4d1580 100644
--- a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/MOD_sprite_accessories/mod_accessory_handler.dm
+++ b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/MOD_sprite_accessories/mod_accessory_handler.dm
@@ -7,22 +7,22 @@
return
update_external_organs_modsuit_status(is_sealed && active)
- wearer.update_body_parts(TRUE)
+ wearer?.update_body_parts(TRUE)
/obj/item/mod/control/control_activation(is_on)
. = ..()
update_external_organs_modsuit_status(is_on)
- wearer.update_body_parts(TRUE)
+ wearer?.update_body_parts(TRUE)
/obj/item/mod/control/deploy(mob/user, obj/item/part, instant = FALSE)
. = ..()
update_external_organs_modsuit_status(active)
- wearer.update_body_parts(TRUE)
+ wearer?.update_body_parts(TRUE)
/obj/item/mod/control/retract(mob/user, obj/item/part, instant = FALSE)
. = ..()
update_external_organs_modsuit_status(FALSE)
- wearer.update_body_parts(TRUE)
+ wearer?.update_body_parts(TRUE)
/// Simple helper proc to force an update of the external organs appearance
/// if necessary.
diff --git a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/aquatic.dm b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/aquatic.dm
index 37ca6a84ab5..2cfbff50d92 100644
--- a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/aquatic.dm
+++ b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/aquatic.dm
@@ -24,6 +24,7 @@
)
meat = /obj/item/food/fishmeat/moonfish/akula
+ sort_bottom = TRUE //BUBBER EDIT ADDITION: We want to sort this to the bottom because it's a custom species template.
/datum/species/aquatic/get_default_mutant_bodyparts()
return list(
diff --git a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/humanoid.dm b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/humanoid.dm
index e43c188173e..a9be6f37117 100644
--- a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/humanoid.dm
+++ b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/humanoid.dm
@@ -12,6 +12,8 @@
changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_MAGIC | MIRROR_PRIDE | ERT_SPAWN | RACE_SWAP | SLIME_EXTRACT
payday_modifier = 1.0
examine_limb_id = SPECIES_HUMAN
+ language_prefs_whitelist = list(/datum/language/monkey)
+ sort_bottom = TRUE //BUBBER EDIT ADDITION: We want to sort this to the bottom because it's a custom species template.
/datum/species/humanoid/get_default_mutant_bodyparts()
return list(
diff --git a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/insect.dm b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/insect.dm
index 0b8d95f6c35..0e92bb585ef 100644
--- a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/insect.dm
+++ b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/insect.dm
@@ -22,6 +22,7 @@
BODY_ZONE_R_LEG = /obj/item/bodypart/leg/right/mutant/insect,
)
eyes_icon = 'modular_skyrat/modules/organs/icons/insect_eyes.dmi'
+ sort_bottom = TRUE //BUBBER EDIT ADDITION: We want to sort this to the bottom because it's a custom species template.
/datum/species/insect/get_default_mutant_bodyparts()
return list(
diff --git a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/mammal.dm b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/mammal.dm
index 0ce9f1694fe..e00c1dff6e5 100644
--- a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/mammal.dm
+++ b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/mammal.dm
@@ -20,6 +20,8 @@
BODY_ZONE_L_LEG = /obj/item/bodypart/leg/left/mutant,
BODY_ZONE_R_LEG = /obj/item/bodypart/leg/right/mutant,
)
+ language_prefs_whitelist = list(/datum/language/monkey)
+ sort_bottom = TRUE //BUBBER EDIT ADDITION: We want to sort this to the bottom because it's a custom species template.
/datum/species/mammal/get_default_mutant_bodyparts()
return list(
diff --git a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/mushpeople.dm b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/mushpeople.dm
index 8644e74313a..b4f4383f6c9 100644
--- a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/mushpeople.dm
+++ b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/mushpeople.dm
@@ -1,3 +1,6 @@
+/datum/species/mush
+ language_prefs_whitelist = (/datum/language/mushroom)
+
/datum/species/mush/get_default_mutant_bodyparts()
return list(
"caps" = list("Round", FALSE), // we don't want cap-less mushpeople
diff --git a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/podweak.dm b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/podweak.dm
index 3d7c34a6da6..55e51b62d59 100644
--- a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/podweak.dm
+++ b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/podweak.dm
@@ -25,6 +25,7 @@
TRAIT_LITERATE,
TRAIT_MUTANT_COLORS,
)
+ sort_bottom = FALSE //We don't want this to sort to the bottom like regular podpeople, because it's not a ghostrole species
always_customizable = FALSE
diff --git a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/unathi.dm b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/unathi.dm
index 2aebc568caa..6440543ffe2 100644
--- a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/unathi.dm
+++ b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/unathi.dm
@@ -1,5 +1,5 @@
/datum/species/unathi
- name = "Unathi"
+ name = "Lizardperson (Generic)"
id = SPECIES_UNATHI
inherent_traits = list(
TRAIT_ADVANCEDTOOLUSER,
@@ -13,6 +13,7 @@
payday_modifier = 1.0
changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_MAGIC | MIRROR_PRIDE | ERT_SPAWN | RACE_SWAP | SLIME_EXTRACT
examine_limb_id = SPECIES_LIZARD
+ sort_bottom = TRUE //BUBBER EDIT ADDITION: We want to sort this to the bottom because it's a custom species template. It can't have its own lore.
bodypart_overrides = list(
BODY_ZONE_HEAD = /obj/item/bodypart/head/lizard,
diff --git a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/vox.dm b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/vox.dm
index c4dedd42890..94b838f9b6e 100644
--- a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/vox.dm
+++ b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/vox.dm
@@ -1,6 +1,6 @@
/datum/species/vox
// Bird-like humanoids
- name = "Vox"
+ name = "Vox Primalis"
id = SPECIES_VOX
eyes_icon = 'modular_skyrat/modules/organs/icons/vox_eyes.dmi'
can_augment = FALSE
@@ -91,10 +91,33 @@
item.worn_icon_vox = icon
/datum/species/vox/get_species_description()
- return placeholder_description
+ return list(
+ "By the account of those unaware, the vox seem to be a nomadic race of avianoid creatures that operate in and around human space at the behest of “crazed, dreaming gods.“ \
+ The true vox are the wholly reclusive Vox Auralis, vastly powerful psychics and bio-engineers. They are a distant race at the best of times. \
+ The Primalis are the laboring underclass that the Auralis use to sustain the Arkships, following a convoluted trail throughout the Milky Way."
+ )
/datum/species/vox/get_species_lore()
- return list(placeholder_lore)
+ return list(
+ "The Vox are a theocratic nation led by the Vox Auralis. All of the engineered species beneath them are more than predisposed to follow the Auralis, they must utterly obey them. \
+ The Vox are perhaps one of the oldest races in the galaxy, drifting through the stars in their massive Ark Ships, often scattered about the vast cosmos. \
+ Yet, the Auralis are almost entirely unknown to the galaxy at large, as the distinction of “Vox” falls almost solely upon the Vox Primalis.",
+ "The Vox Primalis are not only the physical form, but rather a biomechanical entity known as a “Cortical Stack”. A body without a stack is little more than a husk. \
+ The task of coordinating available stacks on an Arkship is given to the Apex, a powerful biocomputer woven into the vessel's systems. \
+ The average Primalis is a reptilian avian with stiff, semi-rigid keratin quills atop their head, a long and prehensile tail, and a beak containing rows of angled teeth. \
+ They tend to have two tongues, one on the roof of the mouth and the other on the lower jaw, allowing them to speak the complex Vox language with ease. \
+ The Primalis do not generally need to live frugal, though they have been predisposed to doing so.",
+ "The height of a Primalis varies heavily, ranging from as small as 3 feet, to as large as ten feet for living haulers of heavy equipment. So long as the Cortical Stack remains intact, \
+ death is only an inconvenience. The stack can be transferred to a new body within minutes to hours, and operating in almost no time at all. If a stack is damaged, \
+ the Vox experiences ego death, its “true death”. Even if the stack can be repaired at this stage, the personality cannot. Primalis are created with a purpose, \
+ the Cortical Stack imbued with the needed skills. Primalis must still practice their craft and hone their skills, though they are always prodigal compared to humans. \
+ Vox live a rigid life, with little room for advancement in a society where everything has its place under the Armalis, a caste made for combat.",
+ "Armalis are entirely dependent on the psychic network of the Apex to function, and are much like an AI with its cyborgs. \
+ As a result, Armalis can never stray far from their ship as all higher brain function effectively ceases. They have not been given the gift of free will. \
+ The Arkships do not want for much, but they still have use for commerce. Vox bioengineering is second to none, making it a prime bartering chip for research, \
+ and Arkships are often willing to trade in fragments of knowledge for resource aid and engineering assistance. The Auralis have even been known to contract Vox Primalis \
+ with galactic entities for a continuous supply of resources, though it is often seen as exploitation near wage slavery."
+ )
/datum/species/vox/prepare_human_for_preview(mob/living/carbon/human/vox)
vox.dna.features[FEATURE_MUTANT_COLOR] = "#77DD88"
diff --git a/modular_skyrat/modules/customization/modules/reagents/chemistry/reagents/alcohol_reagents.dm b/modular_skyrat/modules/customization/modules/reagents/chemistry/reagents/alcohol_reagents.dm
index 16498b0bf2a..3852f0de14d 100644
--- a/modular_skyrat/modules/customization/modules/reagents/chemistry/reagents/alcohol_reagents.dm
+++ b/modular_skyrat/modules/customization/modules/reagents/chemistry/reagents/alcohol_reagents.dm
@@ -37,7 +37,7 @@
name = "Synthanol"
description = "A runny liquid with conductive capacities. Its effects on synthetics are similar to those of alcohol on organics."
color = "#1BB1FF"
- process_flags = REAGENT_ORGANIC | REAGENT_SYNTHETIC
+ process_flags = REAGENT_ORGANIC | REAGENT_SYNTHETIC | REAGENT_PROTEAN
boozepwr = 50
quality = DRINK_NICE
taste_description = "motor oil"
diff --git a/modular_skyrat/modules/deforest_medical_items/code/storage_items.dm b/modular_skyrat/modules/deforest_medical_items/code/storage_items.dm
index 8de2f3df6d2..fad40a9a1d3 100644
--- a/modular_skyrat/modules/deforest_medical_items/code/storage_items.dm
+++ b/modular_skyrat/modules/deforest_medical_items/code/storage_items.dm
@@ -207,6 +207,7 @@
can_hold = typecacheof(list(
/obj/item/bonesetter,
+ /obj/item/blood_scanner,
/obj/item/cautery,
/obj/item/clothing/neck/stethoscope,
/obj/item/clothing/mask/breath,
@@ -216,6 +217,7 @@
/obj/item/dnainjector,
/obj/item/extinguisher/mini,
/obj/item/flashlight/pen,
+ /obj/item/flesh_shears/medical,
/obj/item/geiger_counter,
/obj/item/healthanalyzer,
/obj/item/hemostat,
@@ -235,9 +237,11 @@
/obj/item/reagent_containers/cup/tube,
/obj/item/reagent_containers/hypospray,
/obj/item/reagent_containers/medigel,
+ /obj/item/reagent_containers/applicator/patch/,
/obj/item/reagent_containers/applicator/pill,
/obj/item/reagent_containers/spray,
/obj/item/reagent_containers/syringe,
+ /obj/item/reflexhammer,
/obj/item/stack/medical,
/obj/item/stack/sticky_tape,
/obj/item/sensor_device,
@@ -297,7 +301,9 @@
. = ..()
can_hold = typecacheof(list(
+ /obj/item/autopsy_scanner,
/obj/item/blood_filter,
+ /obj/item/blood_scanner,
/obj/item/bonesetter,
/obj/item/cautery,
/obj/item/circular_saw,
@@ -312,6 +318,7 @@
/obj/item/dnainjector,
/obj/item/extinguisher/mini,
/obj/item/flashlight/pen,
+ /obj/item/flesh_shears/medical,
/obj/item/geiger_counter,
/obj/item/gun/syringe/syndicate,
/obj/item/healthanalyzer,
@@ -334,9 +341,11 @@
/obj/item/reagent_containers/cup/tube,
/obj/item/reagent_containers/hypospray,
/obj/item/reagent_containers/medigel,
+ /obj/item/reagent_containers/applicator/patch/,
/obj/item/reagent_containers/applicator/pill,
/obj/item/reagent_containers/spray,
/obj/item/reagent_containers/syringe,
+ /obj/item/reflexhammer,
/obj/item/retractor,
/obj/item/scalpel,
/obj/item/shears,
@@ -348,6 +357,7 @@
/obj/item/storage/hypospraykit,
/obj/item/storage/pill_bottle,
/obj/item/surgical_drapes,
+ /obj/item/surgical_processor,
/obj/item/surgicaldrill,
/obj/item/tank/internals/emergency_oxygen,
/obj/item/weaponcell/medical,
@@ -408,6 +418,7 @@
can_hold = typecacheof(list(
/obj/item/blood_filter,
+ /obj/item/blood_scanner,
/obj/item/bonesetter,
/obj/item/cautery,
/obj/item/circular_saw,
@@ -419,6 +430,7 @@
/obj/item/dnainjector,
/obj/item/extinguisher/mini,
/obj/item/flashlight/pen,
+ /obj/item/flesh_shears/medical,
/obj/item/geiger_counter,
/obj/item/healthanalyzer,
/obj/item/hemostat,
@@ -438,9 +450,11 @@
/obj/item/reagent_containers/cup/tube,
/obj/item/reagent_containers/hypospray,
/obj/item/reagent_containers/medigel,
+ /obj/item/reagent_containers/applicator/patch/,
/obj/item/reagent_containers/applicator/pill,
/obj/item/reagent_containers/spray,
/obj/item/reagent_containers/syringe,
+ /obj/item/reflexhammer,
/obj/item/retractor,
/obj/item/scalpel,
/obj/item/surgical_drapes,
diff --git a/modular_skyrat/modules/digitigrade_cybernetics/icons/advanced_digitigrade_parts.dmi b/modular_skyrat/modules/digitigrade_cybernetics/icons/advanced_digitigrade_parts.dmi
index 7f865f85e68..14b659fe1df 100644
Binary files a/modular_skyrat/modules/digitigrade_cybernetics/icons/advanced_digitigrade_parts.dmi and b/modular_skyrat/modules/digitigrade_cybernetics/icons/advanced_digitigrade_parts.dmi differ
diff --git a/modular_skyrat/modules/digitigrade_cybernetics/icons/digitigrade_parts.dmi b/modular_skyrat/modules/digitigrade_cybernetics/icons/digitigrade_parts.dmi
index 86ae2725e46..abac25ed241 100644
Binary files a/modular_skyrat/modules/digitigrade_cybernetics/icons/digitigrade_parts.dmi and b/modular_skyrat/modules/digitigrade_cybernetics/icons/digitigrade_parts.dmi differ
diff --git a/modular_skyrat/modules/emotes/code/emotes.dm b/modular_skyrat/modules/emotes/code/emotes.dm
index e038723f7bb..44f6e00fa0b 100644
--- a/modular_skyrat/modules/emotes/code/emotes.dm
+++ b/modular_skyrat/modules/emotes/code/emotes.dm
@@ -258,7 +258,7 @@
'modular_skyrat/modules/emotes/sound/emotes/clap4.ogg')
/datum/emote/living/clap/can_run_emote(mob/living/carbon/user, status_check = TRUE , intentional)
- if(user.usable_hands < 2)
+ if(!istype(user) || user.usable_hands < 2)
return FALSE
return ..()
@@ -276,7 +276,7 @@
'modular_zubbers/sound/emotes/claponce2.ogg')
/datum/emote/living/clap1/can_run_emote(mob/living/carbon/user, status_check = TRUE , intentional)
- if(user.usable_hands < 2)
+ if(!istype(user) || user.usable_hands < 2)
return FALSE
return ..()
diff --git a/modular_skyrat/modules/encounters/code/nri_raiders.dm b/modular_skyrat/modules/encounters/code/nri_raiders.dm
index d4ac2d5aa19..bdecce7bb37 100644
--- a/modular_skyrat/modules/encounters/code/nri_raiders.dm
+++ b/modular_skyrat/modules/encounters/code/nri_raiders.dm
@@ -200,7 +200,7 @@ GLOBAL_VAR(first_officer)
/obj/effect/mob_spawn/ghost_role/human/nri_raider/special(mob/living/carbon/human/spawned_human)
. = ..()
- spawned_human.grant_language(/datum/language/panslavic, source = LANGUAGE_SPAWNER)
+ spawned_human.grant_language(/datum/language/spinwarder, source = LANGUAGE_SPAWNER)
apply_codename(spawned_human)
/obj/effect/mob_spawn/ghost_role/human/nri_raider/post_transfer_prefs(mob/living/carbon/human/spawned_human)
@@ -233,7 +233,7 @@ GLOBAL_VAR(first_officer)
spawned_human.mind.add_antag_datum(/datum/antagonist/cop)
spawned_human.grant_language(/datum/language/uncommon, source = LANGUAGE_SPAWNER)
spawned_human.grant_language(/datum/language/yangyu, source = LANGUAGE_SPAWNER)
- spawned_human.grant_language(/datum/language/panslavic, source = LANGUAGE_SPAWNER)
+ spawned_human.grant_language(/datum/language/spinwarder, source = LANGUAGE_SPAWNER)
// if this is the first officer, keep a reference to them
if(!GLOB.first_officer)
@@ -576,13 +576,13 @@ GLOBAL_VAR(first_officer)
var/mob/living/owner_mob = mob_override || owner.current
var/datum/language_holder/holder = owner_mob.get_language_holder()
holder.grant_language(/datum/language/uncommon, TRUE, TRUE, LANGUAGE_PIRATE)
- holder.grant_language(/datum/language/panslavic, TRUE, TRUE, LANGUAGE_PIRATE)
+ holder.grant_language(/datum/language/spinwarder, TRUE, TRUE, LANGUAGE_PIRATE)
holder.grant_language(/datum/language/yangyu, TRUE, TRUE, LANGUAGE_PIRATE)
/datum/antagonist/cop/remove_innate_effects(mob/living/mob_override)
var/mob/living/owner_mob = mob_override || owner.current
owner_mob.remove_language(/datum/language/uncommon, TRUE, TRUE, LANGUAGE_PIRATE)
- owner_mob.remove_language(/datum/language/panslavic, TRUE, TRUE, LANGUAGE_PIRATE)
+ owner_mob.remove_language(/datum/language/spinwarder, TRUE, TRUE, LANGUAGE_PIRATE)
owner_mob.remove_language(/datum/language/yangyu, TRUE, TRUE, LANGUAGE_PIRATE)
return ..()
diff --git a/modular_skyrat/modules/ghostcafe/code/hilbertshotel_ghost.dm b/modular_skyrat/modules/ghostcafe/code/hilbertshotel_ghost.dm
index 0a2e73bb841..cf9cec6ca73 100644
--- a/modular_skyrat/modules/ghostcafe/code/hilbertshotel_ghost.dm
+++ b/modular_skyrat/modules/ghostcafe/code/hilbertshotel_ghost.dm
@@ -84,3 +84,19 @@
/datum/map_template/ghost_cafe_rooms/oasisalt
name = "Oasis (Night)"
mappath = "modular_skyrat/modules/hotel_rooms/oasisalt.dmm"
+
+/datum/map_template/ghost_cafe_rooms/pool
+ name = "Public Pool"
+ mappath = "modular_skyrat/modules/hotel_rooms/pool.dmm"
+
+/datum/map_template/ghost_cafe_rooms/engineering
+ name = "Mini Engineering"
+ mappath = "modular_skyrat/modules/hotel_rooms/engineering.dmm"
+
+/datum/map_template/ghost_cafe_rooms/syndieoffice
+ name = "Syndicate Office"
+ mappath = "modular_skyrat/modules/hotel_rooms/syndieoffice.dmm"
+
+/datum/map_template/ghost_cafe_rooms/synopcenter
+ name = "Syndicate Ops Centre"
+ mappath = "modular_skyrat/modules/hotel_rooms/synopcenter.dmm"
diff --git a/modular_skyrat/modules/goofsec/code/department_guards.dm b/modular_skyrat/modules/goofsec/code/department_guards.dm
index 0e72a00b3a2..54c6eb58d43 100644
--- a/modular_skyrat/modules/goofsec/code/department_guards.dm
+++ b/modular_skyrat/modules/goofsec/code/department_guards.dm
@@ -159,6 +159,7 @@
*/
/datum/job/science_guard
title = JOB_SCIENCE_GUARD
+ rpg_title = "Secrets Keeper"
description = "Figure out why the emails aren't working, keep an eye on the eggheads, protect them from their latest mistakes."
department_head = list(JOB_RESEARCH_DIRECTOR)
faction = FACTION_STATION
@@ -264,6 +265,7 @@
*/
/datum/job/orderly
title = JOB_ORDERLY
+ rpg_title = "Praetorian"
description = "Defend the medical department, hold down idiots who refuse the vaccine, assist medical with prep and/or cleanup."
department_head = list(JOB_CHIEF_MEDICAL_OFFICER)
faction = FACTION_STATION
@@ -369,6 +371,7 @@
*/
/datum/job/engineering_guard
title = JOB_ENGINEERING_GUARD
+ rpg_title = "Crystal Guardian"
description = "Monitor the supermatter, keep an eye on atmospherics, make sure everyone is wearing Proper Protective Equipment."
department_head = list(JOB_CHIEF_ENGINEER)
faction = FACTION_STATION
@@ -475,6 +478,7 @@
*/
/datum/job/customs_agent
title = JOB_CUSTOMS_AGENT
+ rpg_title = "Vault Keeper"
description = "Inspect the packages coming to and from the station, protect the cargo department, beat the shit out of people trying to ship Cocaine to the Spinward Stellar Coalition."
department_head = list(JOB_QUARTERMASTER)
faction = FACTION_STATION
@@ -575,6 +579,7 @@
*/
/datum/job/bouncer
title = JOB_BOUNCER
+ rpg_title = "Tavern Watch"
description = "Make sure people don't jump the kitchen counter, stop Chapel vandalism, check bargoer's IDs, prevent the dreaded \"food fight\"."
department_head = list(JOB_HEAD_OF_PERSONNEL)
faction = FACTION_STATION
diff --git a/modular_skyrat/modules/gunhud/code/gun_hud_component.dm b/modular_skyrat/modules/gunhud/code/gun_hud_component.dm
index 6868efa99cb..c4a8e874d02 100644
--- a/modular_skyrat/modules/gunhud/code/gun_hud_component.dm
+++ b/modular_skyrat/modules/gunhud/code/gun_hud_component.dm
@@ -151,43 +151,6 @@
oth_h = "h9"
hud.set_hud(backing_color, oth_o, oth_t, oth_h, indicator)
- else if(istype(parent, /obj/item/gun/microfusion))
- var/obj/item/gun/microfusion/parent_gun = parent
- if(!parent_gun.phase_emitter)
- hud.icon_state = "microfusion_counter_no_emitter"
- hud.maptext = null
- return
- if(parent_gun.phase_emitter.damaged)
- hud.icon_state = "microfusion_counter_damaged"
- hud.maptext = null
- return
- if(!parent_gun.cell)
- hud.icon_state = "microfusion_counter_no_emitter"
- hud.maptext = null
- return
- if(!parent_gun.cell.charge)
- hud.icon_state = "microfusion_counter_no_emitter"
- hud.maptext = null
- return
- var/phase_emitter_state = parent_gun.phase_emitter.get_heat_icon_state()
- hud.icon_state = "microfusion_counter_[phase_emitter_state]"
- hud.cut_overlays()
- hud.maptext_x = -12
- var/obj/item/ammo_casing/energy/shot = parent_gun.microfusion_lens
- var/battery_percent = FLOOR(clamp(parent_gun.cell.charge / parent_gun.cell.maxcharge, 0, 1) * 100, 1)
- var/shot_cost_percent = FLOOR(clamp(shot.e_cost / parent_gun.cell.maxcharge, 0, 1) * 100, 1)
- if(battery_percent > 99 || shot_cost_percent > 99)
- hud.maptext_x = -12
- else
- hud.maptext_x = -8
- if(!parent_gun.can_shoot())
- hud.icon_state = "microfusion_counter_no_emitter"
- return
- if(battery_percent <= 25)
- hud.maptext = span_maptext("[battery_percent]%
[shot_cost_percent]%
")
- return
- hud.maptext = span_maptext("[battery_percent]%
[shot_cost_percent]%
")
-
/obj/item/gun/ballistic/Initialize(mapload)
. = ..()
diff --git a/modular_skyrat/modules/hotel_rooms/engineering.dmm b/modular_skyrat/modules/hotel_rooms/engineering.dmm
new file mode 100644
index 00000000000..4ea7a6f7777
--- /dev/null
+++ b/modular_skyrat/modules/hotel_rooms/engineering.dmm
@@ -0,0 +1,877 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"ae" = (
+/obj/machinery/vending/engivend,
+/turf/open/floor/iron/dark,
+/area/misc/hilbertshotel)
+"aC" = (
+/turf/open/floor/iron/dark,
+/area/misc/hilbertshotel)
+"cw" = (
+/obj/machinery/suit_storage_unit,
+/turf/open/floor/iron/smooth_large,
+/area/misc/hilbertshotel)
+"cy" = (
+/obj/effect/turf_decal/tile/yellow/half{
+ dir = 8
+ },
+/obj/machinery/light/directional/west,
+/turf/open/floor/iron/smooth_half{
+ dir = 1
+ },
+/area/misc/hilbertshotel)
+"cO" = (
+/turf/open/floor/plating,
+/area/misc/hilbertshotel)
+"da" = (
+/obj/effect/turf_decal/tile/yellow/half/contrasted{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/dark/half,
+/obj/structure/closet/secure_closet/engineering_welding,
+/turf/open/floor/iron,
+/area/misc/hilbertshotel)
+"dw" = (
+/obj/structure/closet/firecloset,
+/obj/effect/turf_decal/siding/yellow{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/yellow{
+ dir = 8
+ },
+/obj/machinery/light/small/directional/west,
+/turf/open/floor/iron/smooth_large,
+/area/misc/hilbertshotel)
+"dB" = (
+/obj/effect/spawner/structure/window/reinforced/plasma,
+/obj/structure/cable,
+/turf/open/floor/plating,
+/area/misc/hilbertshotel)
+"es" = (
+/obj/effect/turf_decal/siding/yellow/corner,
+/obj/effect/turf_decal/siding/yellow/corner{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/yellow/corner{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/yellow/corner{
+ dir = 8
+ },
+/turf/open/floor/iron/smooth_large,
+/area/misc/hilbertshotel)
+"eK" = (
+/obj/effect/turf_decal/tile/yellow/half{
+ dir = 1
+ },
+/obj/structure/chair/office{
+ dir = 1;
+ name = "grimy chair"
+ },
+/turf/open/floor/iron/smooth_half,
+/area/misc/hilbertshotel)
+"fw" = (
+/obj/effect/turf_decal/tile/yellow/half{
+ dir = 4
+ },
+/turf/open/floor/iron/smooth_half{
+ dir = 1
+ },
+/area/misc/hilbertshotel)
+"gd" = (
+/turf/open/floor/iron/showroomfloor,
+/area/misc/hilbertshotel)
+"iK" = (
+/obj/effect/turf_decal/stripes/line,
+/turf/open/floor/engine,
+/area/misc/hilbertshotel)
+"iL" = (
+/obj/effect/spawner/structure/window/reinforced/plasma,
+/turf/open/floor/plating,
+/area/misc/hilbertshotel)
+"jk" = (
+/obj/structure/chair/office{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/yellow/half{
+ dir = 8
+ },
+/turf/open/floor/iron/smooth_half{
+ dir = 1
+ },
+/area/misc/hilbertshotel)
+"jT" = (
+/turf/open/floor/iron,
+/area/misc/hilbertshotel)
+"kh" = (
+/obj/machinery/power/energy_accumulator/tesla_coil/anchored,
+/turf/open/floor/engine,
+/area/misc/hilbertshotel)
+"kz" = (
+/obj/machinery/portable_atmospherics/canister,
+/obj/effect/turf_decal/bot,
+/turf/open/floor/engine,
+/area/misc/hilbertshotel)
+"mn" = (
+/obj/structure/girder,
+/turf/open/floor/iron/dark,
+/area/misc/hilbertshotel)
+"mx" = (
+/obj/effect/turf_decal/tile/yellow/half/contrasted{
+ dir = 4
+ },
+/turf/open/floor/iron,
+/area/misc/hilbertshotel)
+"mQ" = (
+/obj/effect/turf_decal/tile/yellow{
+ dir = 1
+ },
+/turf/open/floor/iron/smooth_corner{
+ dir = 1
+ },
+/area/misc/hilbertshotel)
+"ni" = (
+/obj/structure/table/reinforced,
+/obj/item/tank/internals/emergency_oxygen/engi{
+ pixel_x = 5
+ },
+/obj/item/clothing/gloves/color/black,
+/obj/item/clothing/glasses/meson/engine,
+/turf/open/floor/engine,
+/area/misc/hilbertshotel)
+"no" = (
+/obj/structure/table/reinforced,
+/obj/item/storage/toolbox/mechanical,
+/obj/item/analyzer,
+/obj/item/pipe_dispenser,
+/obj/item/flashlight,
+/turf/open/floor/engine,
+/area/misc/hilbertshotel)
+"nM" = (
+/turf/closed/indestructible/hoteldoor{
+ icon_state = "closed";
+ icon = 'modular_skyrat/modules/aesthetics/airlock/icons/airlocks/station/engineering.dmi'
+ },
+/area/misc/hilbertshotel)
+"oU" = (
+/obj/machinery/atmospherics/components/unary/thermomachine/freezer{
+ dir = 8
+ },
+/obj/effect/turf_decal/bot,
+/obj/structure/sign/warning/fire/directional/north,
+/turf/open/floor/engine,
+/area/misc/hilbertshotel)
+"pi" = (
+/obj/machinery/power/shieldwallgen,
+/turf/open/floor/plating,
+/area/misc/hilbertshotel)
+"pz" = (
+/obj/effect/turf_decal/tile/yellow/anticorner{
+ dir = 1
+ },
+/obj/machinery/light/directional/west,
+/obj/structure/chair/office{
+ dir = 1;
+ name = "grimy chair"
+ },
+/turf/open/floor/iron/smooth_corner,
+/area/misc/hilbertshotel)
+"pS" = (
+/obj/machinery/power/energy_accumulator/grounding_rod/anchored,
+/turf/open/floor/engine,
+/area/misc/hilbertshotel)
+"pT" = (
+/obj/machinery/light/directional/west,
+/obj/machinery/vending/tool,
+/turf/open/floor/iron/dark,
+/area/misc/hilbertshotel)
+"qN" = (
+/obj/machinery/door/airlock/bathroom,
+/turf/open/floor/iron,
+/area/misc/hilbertshotel)
+"re" = (
+/obj/effect/turf_decal/tile/yellow/anticorner/contrasted,
+/turf/open/floor/iron,
+/area/misc/hilbertshotel)
+"ri" = (
+/obj/structure/cable,
+/obj/effect/turf_decal/stripes/line{
+ dir = 5
+ },
+/turf/open/floor/engine,
+/area/misc/hilbertshotel)
+"sn" = (
+/turf/open/floor/engine,
+/area/misc/hilbertshotel)
+"so" = (
+/obj/effect/turf_decal/stripes/corner,
+/obj/effect/turf_decal/stripes/corner{
+ dir = 1
+ },
+/turf/open/floor/engine,
+/area/misc/hilbertshotel)
+"sq" = (
+/obj/machinery/shower/directional/east,
+/obj/structure/fluff/shower_drain,
+/turf/open/floor/iron/showroomfloor,
+/area/misc/hilbertshotel)
+"sV" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+ dir = 4
+ },
+/obj/machinery/light/directional/east,
+/turf/open/floor/engine,
+/area/misc/hilbertshotel)
+"uK" = (
+/obj/machinery/door/airlock/engineering,
+/turf/open/floor/iron,
+/area/misc/hilbertshotel)
+"vg" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 6
+ },
+/turf/open/floor/engine,
+/area/misc/hilbertshotel)
+"vm" = (
+/obj/effect/turf_decal/tile/yellow/anticorner{
+ dir = 4
+ },
+/obj/structure/rack,
+/obj/item/toy/plush/skyrat/engihound,
+/turf/open/floor/iron/smooth_corner{
+ dir = 8
+ },
+/area/misc/hilbertshotel)
+"wq" = (
+/obj/effect/turf_decal/tile/yellow/anticorner{
+ dir = 8
+ },
+/turf/open/floor/iron/smooth_corner{
+ dir = 4
+ },
+/area/misc/hilbertshotel)
+"wy" = (
+/obj/effect/turf_decal/tile/yellow/half,
+/turf/open/floor/iron/smooth_half,
+/area/misc/hilbertshotel)
+"xe" = (
+/turf/open/floor/iron/smooth_large,
+/area/misc/hilbertshotel)
+"xA" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/obj/effect/turf_decal/stripes/corner{
+ dir = 8
+ },
+/turf/open/floor/engine,
+/area/misc/hilbertshotel)
+"xW" = (
+/obj/effect/turf_decal/tile/yellow/half/contrasted{
+ dir = 8
+ },
+/turf/open/floor/iron,
+/area/misc/hilbertshotel)
+"yy" = (
+/obj/structure/table,
+/turf/open/floor/iron/dark,
+/area/misc/hilbertshotel)
+"BK" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+ dir = 4
+ },
+/turf/open/floor/engine,
+/area/misc/hilbertshotel)
+"BR" = (
+/obj/machinery/door/poddoor/preopen{
+ id = "hiblert"
+ },
+/turf/open/floor/plating,
+/area/misc/hilbertshotel)
+"Cn" = (
+/obj/effect/turf_decal/tile/yellow/half/contrasted,
+/obj/effect/turf_decal/tile/dark/half{
+ dir = 1
+ },
+/obj/structure/closet/secure_closet/engineering_welding,
+/turf/open/floor/iron,
+/area/misc/hilbertshotel)
+"Cs" = (
+/obj/machinery/power/smes,
+/turf/open/floor/iron/smooth_large,
+/area/misc/hilbertshotel)
+"CD" = (
+/obj/structure/table,
+/obj/structure/reagent_dispensers/servingdish{
+ icon = 'icons/obj/machines/engine/supermatter.dmi';
+ icon_state = "sm";
+ name = "souper matter"
+ },
+/turf/open/floor/engine,
+/area/misc/hilbertshotel)
+"CZ" = (
+/obj/structure/closet/radiation,
+/obj/effect/turf_decal/siding/yellow{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/yellow{
+ dir = 8
+ },
+/obj/machinery/light/small/directional/west,
+/turf/open/floor/iron/smooth_large,
+/area/misc/hilbertshotel)
+"Df" = (
+/obj/machinery/computer{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/yellow/anticorner{
+ dir = 8
+ },
+/turf/open/floor/iron/smooth_corner{
+ dir = 4
+ },
+/area/misc/hilbertshotel)
+"Dy" = (
+/obj/machinery/vending/wardrobe/engi_wardrobe/ghost_cafe,
+/turf/open/floor/iron/dark,
+/area/misc/hilbertshotel)
+"DF" = (
+/obj/structure/window/reinforced/plasma/spawner/directional/west,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
+ dir = 8
+ },
+/turf/open/floor/engine,
+/area/misc/hilbertshotel)
+"DP" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/turf/open/floor/engine,
+/area/misc/hilbertshotel)
+"ER" = (
+/obj/machinery/portable_atmospherics/canister,
+/obj/effect/turf_decal/bot,
+/obj/structure/sign/warning/fire/directional/south,
+/turf/open/floor/engine,
+/area/misc/hilbertshotel)
+"Fg" = (
+/obj/machinery/light/small/dim/directional/east,
+/turf/open/floor/plating,
+/area/misc/hilbertshotel)
+"Fo" = (
+/obj/effect/turf_decal/siding/yellow,
+/obj/effect/turf_decal/siding/yellow{
+ dir = 1
+ },
+/turf/open/floor/iron/smooth_large,
+/area/misc/hilbertshotel)
+"FN" = (
+/turf/closed/indestructible/reinforced,
+/area/misc/hilbertshotel)
+"GG" = (
+/obj/effect/turf_decal/tile/yellow/half{
+ dir = 1
+ },
+/turf/open/floor/iron/smooth_half,
+/area/misc/hilbertshotel)
+"Hl" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/turf/open/floor/engine,
+/area/misc/hilbertshotel)
+"Iz" = (
+/obj/structure/closet/crate,
+/obj/item/storage/toolbox/mechanical/old/clean,
+/turf/open/floor/plating,
+/area/misc/hilbertshotel)
+"IE" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 9
+ },
+/turf/open/floor/engine,
+/area/misc/hilbertshotel)
+"JE" = (
+/obj/machinery/computer,
+/turf/open/floor/iron/smooth_large,
+/area/misc/hilbertshotel)
+"LT" = (
+/obj/structure/rack,
+/obj/item/reagent_containers/cup/bowl,
+/obj/item/reagent_containers/cup/bowl,
+/obj/item/reagent_containers/cup/bowl,
+/obj/item/reagent_containers/cup/bowl,
+/obj/item/reagent_containers/cup/bowl,
+/obj/effect/turf_decal/bot,
+/turf/open/floor/engine,
+/area/misc/hilbertshotel)
+"Mo" = (
+/obj/machinery/door/airlock/engineering/glass,
+/turf/open/floor/iron/dark,
+/area/misc/hilbertshotel)
+"Mp" = (
+/obj/machinery/door/airlock/engineering/glass,
+/turf/open/floor/engine,
+/area/misc/hilbertshotel)
+"Nn" = (
+/obj/structure/reagent_dispensers/fueltank,
+/obj/effect/turf_decal/tile/yellow/anticorner,
+/turf/open/floor/iron/smooth_corner{
+ dir = 1
+ },
+/area/misc/hilbertshotel)
+"NG" = (
+/obj/machinery/door/poddoor{
+ id = "hiblert"
+ },
+/turf/open/floor/plating,
+/area/misc/hilbertshotel)
+"Oi" = (
+/obj/effect/turf_decal/tile/yellow/half{
+ dir = 1
+ },
+/obj/structure/rack,
+/obj/item/storage/toolbox/mechanical,
+/turf/open/floor/iron/smooth_half,
+/area/misc/hilbertshotel)
+"Ov" = (
+/obj/structure/reagent_dispensers/watertank{
+ icon = 'modular_skyrat/modules/aesthetics/emitter/icons/emitter.dmi';
+ icon_state = "emitter"
+ },
+/turf/open/floor/plating,
+/area/misc/hilbertshotel)
+"Pt" = (
+/obj/machinery/door/airlock/engineering/glass,
+/turf/open/floor/iron/smooth_large,
+/area/misc/hilbertshotel)
+"PA" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/structure/sign/warning/directional/north,
+/turf/open/floor/engine,
+/area/misc/hilbertshotel)
+"PC" = (
+/obj/effect/turf_decal/tile/yellow/anticorner/contrasted{
+ dir = 8
+ },
+/turf/open/floor/iron,
+/area/misc/hilbertshotel)
+"PH" = (
+/obj/machinery/light/directional/north,
+/obj/structure/sign/warning/fire/directional/north,
+/obj/effect/turf_decal/stripes/line{
+ dir = 9
+ },
+/turf/open/floor/engine,
+/area/misc/hilbertshotel)
+"PJ" = (
+/obj/machinery/light/directional/north,
+/obj/structure/cable,
+/turf/open/floor/plating,
+/area/misc/hilbertshotel)
+"Rs" = (
+/obj/machinery/shower/directional/west,
+/obj/structure/fluff/shower_drain,
+/turf/open/floor/iron/showroomfloor,
+/area/misc/hilbertshotel)
+"RL" = (
+/obj/effect/turf_decal/tile/yellow/half/contrasted,
+/obj/effect/turf_decal/tile/dark/half{
+ dir = 1
+ },
+/obj/machinery/light/directional/east,
+/obj/structure/closet/secure_closet/engineering_welding,
+/turf/open/floor/iron,
+/area/misc/hilbertshotel)
+"RM" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/turf/open/floor/engine,
+/area/misc/hilbertshotel)
+"SS" = (
+/obj/machinery/light/small/directional/east,
+/turf/open/floor/iron/showroomfloor,
+/area/misc/hilbertshotel)
+"Uy" = (
+/obj/structure/cable,
+/turf/open/floor/plating,
+/area/misc/hilbertshotel)
+"UD" = (
+/obj/effect/turf_decal/tile/yellow/half{
+ dir = 4
+ },
+/obj/structure/sign/warning/directional/east,
+/turf/open/floor/iron/smooth_half{
+ dir = 1
+ },
+/area/misc/hilbertshotel)
+"UP" = (
+/obj/structure/reagent_dispensers/watertank{
+ icon = 'modular_skyrat/modules/aesthetics/emitter/icons/emitter.dmi';
+ icon_state = "emitter";
+ anchored = 1
+ },
+/turf/open/floor/iron/dark,
+/area/misc/hilbertshotel)
+"UW" = (
+/obj/structure/chair/sofa/bench/left,
+/obj/effect/turf_decal/tile/yellow/anticorner/contrasted{
+ dir = 4
+ },
+/turf/open/floor/iron,
+/area/misc/hilbertshotel)
+"Vg" = (
+/obj/machinery/door/poddoor{
+ id = "hiblert"
+ },
+/turf/open/floor/iron/dark,
+/area/misc/hilbertshotel)
+"VM" = (
+/obj/effect/turf_decal/tile/yellow/anticorner{
+ dir = 1
+ },
+/turf/open/floor/iron/smooth_corner,
+/area/misc/hilbertshotel)
+"WL" = (
+/obj/effect/turf_decal/stripes/line,
+/obj/structure/sign/warning/electric_shock/directional/south,
+/turf/open/floor/engine,
+/area/misc/hilbertshotel)
+"WM" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/structure/sign/warning/electric_shock/directional/west,
+/turf/open/floor/engine,
+/area/misc/hilbertshotel)
+"WT" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 5
+ },
+/turf/open/floor/engine,
+/area/misc/hilbertshotel)
+"Xg" = (
+/obj/structure/chair/sofa/bench/right,
+/obj/effect/turf_decal/tile/yellow/anticorner/contrasted{
+ dir = 1
+ },
+/turf/open/floor/iron,
+/area/misc/hilbertshotel)
+"XU" = (
+/obj/machinery/atmospherics/components/unary/thermomachine/freezer{
+ dir = 8
+ },
+/obj/effect/turf_decal/bot,
+/turf/open/floor/engine,
+/area/misc/hilbertshotel)
+"XV" = (
+/obj/machinery/door/poddoor{
+ id = "hiblert"
+ },
+/turf/open/floor/iron,
+/area/misc/hilbertshotel)
+"YK" = (
+/obj/machinery/door/poddoor/preopen{
+ id = "Engineering";
+ name = "Engineering Blast Door"
+ },
+/obj/effect/spawner/structure/window/reinforced,
+/turf/open/floor/plating,
+/area/misc/hilbertshotel)
+"YW" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 10
+ },
+/turf/open/floor/engine,
+/area/misc/hilbertshotel)
+"Zj" = (
+/obj/machinery/light/directional/south,
+/obj/effect/turf_decal/stripes/line{
+ dir = 10
+ },
+/turf/open/floor/engine,
+/area/misc/hilbertshotel)
+"ZY" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/effect/turf_decal/stripes/corner{
+ dir = 4
+ },
+/turf/open/floor/engine,
+/area/misc/hilbertshotel)
+
+(1,1,1) = {"
+FN
+FN
+FN
+FN
+FN
+FN
+FN
+FN
+FN
+FN
+FN
+FN
+FN
+FN
+FN
+"}
+(2,1,1) = {"
+FN
+Dy
+ae
+pT
+FN
+nM
+FN
+XV
+Vg
+FN
+JE
+pz
+wq
+Cs
+FN
+"}
+(3,1,1) = {"
+FN
+Xg
+xW
+PC
+FN
+VM
+cy
+jk
+Df
+YK
+JE
+eK
+wy
+Cs
+FN
+"}
+(4,1,1) = {"
+FN
+UW
+jT
+re
+uK
+GG
+xe
+xe
+wy
+Pt
+VM
+mQ
+wy
+Cs
+FN
+"}
+(5,1,1) = {"
+FN
+Cn
+jT
+da
+FN
+vm
+fw
+UD
+Nn
+YK
+Oi
+xe
+wy
+cw
+FN
+"}
+(6,1,1) = {"
+FN
+Cn
+jT
+da
+FN
+FN
+Pt
+FN
+FN
+FN
+NG
+NG
+BR
+FN
+FN
+"}
+(7,1,1) = {"
+FN
+RL
+mx
+da
+FN
+CZ
+es
+dw
+FN
+Ov
+cO
+cO
+cO
+pi
+FN
+"}
+(8,1,1) = {"
+FN
+FN
+qN
+FN
+FN
+Rs
+Fo
+Rs
+FN
+Ov
+cO
+Fg
+Iz
+pi
+FN
+"}
+(9,1,1) = {"
+FN
+sq
+gd
+sq
+FN
+FN
+Pt
+FN
+FN
+FN
+FN
+FN
+FN
+FN
+FN
+"}
+(10,1,1) = {"
+FN
+Rs
+SS
+Rs
+FN
+LT
+IE
+WM
+DP
+DP
+DP
+YW
+no
+ni
+FN
+"}
+(11,1,1) = {"
+FN
+FN
+FN
+FN
+FN
+PH
+so
+RM
+RM
+RM
+RM
+xA
+ZY
+Zj
+FN
+"}
+(12,1,1) = {"
+FN
+yy
+aC
+aC
+Mo
+Hl
+iK
+FN
+kh
+pS
+kh
+FN
+Hl
+iK
+FN
+"}
+(13,1,1) = {"
+FN
+PJ
+Uy
+Uy
+dB
+Hl
+WL
+FN
+DF
+DF
+DF
+FN
+PA
+iK
+FN
+"}
+(14,1,1) = {"
+FN
+mn
+UP
+aC
+dB
+ri
+vg
+iL
+sn
+CD
+sn
+Mp
+WT
+vg
+FN
+"}
+(15,1,1) = {"
+FN
+Uy
+Uy
+Uy
+dB
+kz
+ER
+FN
+BK
+sV
+BK
+FN
+oU
+XU
+FN
+"}
+(16,1,1) = {"
+FN
+FN
+FN
+FN
+FN
+FN
+FN
+FN
+FN
+FN
+FN
+FN
+FN
+FN
+FN
+"}
diff --git a/modular_skyrat/modules/hotel_rooms/pool.dmm b/modular_skyrat/modules/hotel_rooms/pool.dmm
new file mode 100644
index 00000000000..633d620ae82
--- /dev/null
+++ b/modular_skyrat/modules/hotel_rooms/pool.dmm
@@ -0,0 +1,744 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"aC" = (
+/obj/effect/turf_decal/tile/dark_blue/half/contrasted,
+/turf/open/floor/iron/white,
+/area/misc/hilbertshotel)
+"aM" = (
+/obj/effect/turf_decal/siding/dark{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/dark_blue/half/contrasted{
+ dir = 8
+ },
+/obj/structure/chair{
+ dir = 4
+ },
+/turf/open/floor/iron/white,
+/area/misc/hilbertshotel)
+"bI" = (
+/obj/structure/chair,
+/obj/item/bikehorn/airhorn,
+/turf/open/floor/iron/textured,
+/area/misc/hilbertshotel)
+"cy" = (
+/obj/effect/turf_decal/tile/dark_blue/half/contrasted{
+ dir = 4
+ },
+/turf/open/floor/iron,
+/area/misc/hilbertshotel)
+"iX" = (
+/obj/effect/turf_decal/siding/dark/corner,
+/obj/effect/turf_decal/tile/dark_blue,
+/turf/open/floor/iron/white,
+/area/misc/hilbertshotel)
+"jT" = (
+/turf/closed/indestructible/steel,
+/area/misc/hilbertshotel)
+"jU" = (
+/obj/structure/chair/sofa/bench/left{
+ dir = 8;
+ pixel_x = 8
+ },
+/obj/effect/turf_decal/tile/dark_blue/full,
+/turf/open/floor/iron/large,
+/area/misc/hilbertshotel)
+"kt" = (
+/obj/effect/turf_decal/siding/dark,
+/obj/effect/turf_decal/tile/dark_blue/half/contrasted,
+/turf/open/floor/iron/white,
+/area/misc/hilbertshotel)
+"kC" = (
+/obj/effect/turf_decal/siding/dark{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/dark,
+/obj/effect/turf_decal/tile/dark_blue/half/contrasted,
+/turf/open/floor/iron/white,
+/area/misc/hilbertshotel)
+"kJ" = (
+/obj/effect/turf_decal/tile/dark_blue/half/contrasted{
+ dir = 8
+ },
+/obj/machinery/shower/directional/east{
+ refill_rate = 5
+ },
+/obj/structure/window/reinforced{
+ dir = 8;
+ pixel_x = -4
+ },
+/obj/structure/fluff/shower_drain{
+ pixel_x = -8;
+ pixel_y = -8
+ },
+/turf/open/floor/iron/white,
+/area/misc/hilbertshotel)
+"lT" = (
+/obj/effect/turf_decal/tile/dark_blue/half/contrasted{
+ dir = 8
+ },
+/obj/structure/closet,
+/obj/item/clothing/under/misc/skyrat/gear_harness,
+/obj/machinery/light/directional/west,
+/turf/open/floor/iron,
+/area/misc/hilbertshotel)
+"mH" = (
+/obj/effect/turf_decal/tile/dark_blue/half/contrasted{
+ dir = 4
+ },
+/obj/machinery/shower/directional/west{
+ refill_rate = 5
+ },
+/obj/structure/window/reinforced{
+ dir = 4;
+ pixel_x = 3
+ },
+/obj/structure/fluff/shower_drain{
+ pixel_x = 8;
+ pixel_y = -8
+ },
+/obj/machinery/light/directional/south,
+/turf/open/floor/iron/white,
+/area/misc/hilbertshotel)
+"pe" = (
+/obj/effect/turf_decal/siding/dark{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/dark_blue/half/contrasted{
+ dir = 8
+ },
+/obj/structure/table,
+/obj/machinery/light/directional/west,
+/obj/structure/towel_bin,
+/turf/open/floor/iron/white,
+/area/misc/hilbertshotel)
+"qe" = (
+/obj/effect/turf_decal/siding/dark{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/dark_blue/half/contrasted{
+ dir = 4
+ },
+/obj/structure/bed/pod{
+ pixel_y = 1
+ },
+/turf/open/floor/iron/white,
+/area/misc/hilbertshotel)
+"sC" = (
+/obj/effect/turf_decal/tile/dark_blue/half/contrasted{
+ dir = 4
+ },
+/obj/structure/closet,
+/obj/item/clothing/under/misc/skyrat/gear_harness,
+/turf/open/floor/iron,
+/area/misc/hilbertshotel)
+"sF" = (
+/obj/effect/turf_decal/tile/dark_blue/half/contrasted{
+ dir = 4
+ },
+/obj/machinery/shower/directional/west{
+ refill_rate = 5
+ },
+/obj/structure/fluff/shower_drain{
+ pixel_x = 8;
+ pixel_y = -8
+ },
+/turf/open/floor/iron/white,
+/area/misc/hilbertshotel)
+"sG" = (
+/obj/effect/turf_decal/siding/dark{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/dark_blue/half/contrasted{
+ dir = 4
+ },
+/obj/structure/table,
+/obj/machinery/light/directional/east,
+/turf/open/floor/iron/white,
+/area/misc/hilbertshotel)
+"uO" = (
+/turf/open/floor/iron/stairs{
+ dir = 8;
+ color = "AAAAAA"
+ },
+/area/misc/hilbertshotel)
+"xw" = (
+/obj/effect/turf_decal/siding/dark{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/dark_blue/anticorner,
+/turf/open/floor/iron/white,
+/area/misc/hilbertshotel)
+"yh" = (
+/obj/structure/chair/sofa/bench/left{
+ dir = 4;
+ pixel_x = -8
+ },
+/obj/effect/turf_decal/tile/dark_blue/full,
+/turf/open/floor/iron/large,
+/area/misc/hilbertshotel)
+"yj" = (
+/turf/open/floor/iron/stairs{
+ dir = 4;
+ color = "AAAAAA"
+ },
+/area/misc/hilbertshotel)
+"Bh" = (
+/obj/effect/turf_decal/siding/dark{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/dark_blue/anticorner{
+ dir = 8
+ },
+/turf/open/floor/iron/white,
+/area/misc/hilbertshotel)
+"BG" = (
+/obj/effect/spawner/liquids_spawner/shoulders,
+/turf/open/floor/iron/pool,
+/area/misc/hilbertshotel)
+"BW" = (
+/obj/effect/turf_decal/siding/dark{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/dark_blue/half/contrasted{
+ dir = 8
+ },
+/turf/open/floor/iron/white,
+/area/misc/hilbertshotel)
+"Cb" = (
+/obj/effect/turf_decal/siding/dark{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/dark_blue/half/contrasted{
+ dir = 8
+ },
+/obj/structure/fluff/shower_drain{
+ pixel_x = -7;
+ pixel_y = 0
+ },
+/turf/open/floor/iron/white,
+/area/misc/hilbertshotel)
+"CS" = (
+/obj/machinery/door/airlock/bathroom,
+/turf/open/floor/iron/white,
+/area/misc/hilbertshotel)
+"DZ" = (
+/obj/effect/turf_decal/tile/dark_blue/half/contrasted{
+ dir = 8
+ },
+/obj/machinery/shower/directional/east{
+ refill_rate = 5
+ },
+/obj/structure/fluff/shower_drain{
+ pixel_x = -8;
+ pixel_y = -8
+ },
+/turf/open/floor/iron/white,
+/area/misc/hilbertshotel)
+"Fb" = (
+/obj/machinery/vending/vendcation{
+ pixel_y = -6
+ },
+/turf/closed/indestructible/steel,
+/area/misc/hilbertshotel)
+"FI" = (
+/obj/effect/turf_decal/siding/dark{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/dark_blue/half/contrasted{
+ dir = 8
+ },
+/obj/machinery/light/directional/west,
+/turf/open/floor/iron/white,
+/area/misc/hilbertshotel)
+"FN" = (
+/obj/effect/turf_decal/siding/dark{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/dark_blue/half/contrasted{
+ dir = 4
+ },
+/turf/open/floor/iron/white,
+/area/misc/hilbertshotel)
+"Ge" = (
+/obj/effect/turf_decal/siding/dark{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/dark_blue/half/contrasted{
+ dir = 4
+ },
+/obj/structure/fluff/shower_drain{
+ pixel_x = 7;
+ pixel_y = 0
+ },
+/turf/open/floor/iron/white,
+/area/misc/hilbertshotel)
+"Gf" = (
+/obj/effect/turf_decal/siding/dark{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/dark_blue/anticorner{
+ dir = 4
+ },
+/obj/machinery/light/directional/east,
+/turf/open/floor/iron/white,
+/area/misc/hilbertshotel)
+"Gk" = (
+/obj/structure/chair/sofa/bench/right{
+ dir = 4;
+ pixel_x = -8
+ },
+/obj/effect/turf_decal/tile/dark_blue/full,
+/turf/open/floor/iron/large,
+/area/misc/hilbertshotel)
+"GI" = (
+/obj/effect/turf_decal/tile/dark_blue/half/contrasted{
+ dir = 4
+ },
+/obj/machinery/shower/directional/west{
+ refill_rate = 5
+ },
+/obj/structure/window/reinforced{
+ dir = 4;
+ pixel_x = 3
+ },
+/obj/structure/fluff/shower_drain{
+ pixel_x = 8;
+ pixel_y = -8
+ },
+/turf/open/floor/iron/white,
+/area/misc/hilbertshotel)
+"JI" = (
+/obj/effect/turf_decal/tile/dark_blue/half/contrasted{
+ dir = 8
+ },
+/obj/structure/closet,
+/obj/item/clothing/under/misc/skyrat/gear_harness,
+/turf/open/floor/iron,
+/area/misc/hilbertshotel)
+"Kc" = (
+/obj/effect/turf_decal/siding/dark{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/dark_blue/half/contrasted{
+ dir = 8
+ },
+/obj/structure/closet/secure_closet/personal/wall{
+ pixel_x = -25
+ },
+/turf/open/floor/iron/white,
+/area/misc/hilbertshotel)
+"Mk" = (
+/obj/effect/turf_decal/siding/dark{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/dark_blue/half/contrasted{
+ dir = 4
+ },
+/obj/structure/table,
+/obj/structure/towel_bin,
+/obj/machinery/light/directional/east,
+/turf/open/floor/iron/white,
+/area/misc/hilbertshotel)
+"MI" = (
+/obj/effect/turf_decal/tile/dark_blue/half/contrasted{
+ dir = 8
+ },
+/obj/machinery/shower/directional/east{
+ refill_rate = 5
+ },
+/obj/structure/window/reinforced{
+ dir = 8;
+ pixel_x = -4
+ },
+/obj/structure/fluff/shower_drain{
+ pixel_x = -8;
+ pixel_y = -8
+ },
+/obj/machinery/light/directional/south,
+/turf/open/floor/iron/white,
+/area/misc/hilbertshotel)
+"Pc" = (
+/turf/open/floor/iron/white,
+/area/misc/hilbertshotel)
+"Pm" = (
+/obj/effect/turf_decal/siding/dark/corner{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/dark_blue{
+ dir = 4
+ },
+/turf/open/floor/iron/white,
+/area/misc/hilbertshotel)
+"PW" = (
+/obj/effect/turf_decal/tile/dark_blue/half/contrasted{
+ dir = 8
+ },
+/turf/open/floor/iron,
+/area/misc/hilbertshotel)
+"Qm" = (
+/obj/effect/turf_decal/siding/dark{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/dark_blue/anticorner{
+ dir = 1
+ },
+/obj/machinery/light/directional/west,
+/turf/open/floor/iron/white,
+/area/misc/hilbertshotel)
+"Rp" = (
+/obj/effect/turf_decal/siding/dark{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/dark_blue/half/contrasted{
+ dir = 1
+ },
+/turf/open/floor/iron/white,
+/area/misc/hilbertshotel)
+"SS" = (
+/turf/closed/indestructible/hoteldoor{
+ icon_state = "door_closed";
+ icon = 'icons/obj/doors/puzzledoor/default.dmi'
+ },
+/area/misc/hilbertshotel)
+"Vv" = (
+/obj/structure/dresser{
+ pixel_y = -7
+ },
+/turf/closed/indestructible/steel,
+/area/misc/hilbertshotel)
+"Vw" = (
+/obj/effect/turf_decal/tile/dark_blue/half/contrasted{
+ dir = 4
+ },
+/obj/structure/closet,
+/obj/item/clothing/under/misc/skyrat/gear_harness,
+/obj/machinery/light/directional/east,
+/turf/open/floor/iron,
+/area/misc/hilbertshotel)
+"VE" = (
+/obj/effect/turf_decal/siding/dark/corner{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/dark_blue{
+ dir = 8
+ },
+/turf/open/floor/iron/white,
+/area/misc/hilbertshotel)
+"Xo" = (
+/obj/effect/turf_decal/siding/dark{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/dark_blue/half/contrasted{
+ dir = 4
+ },
+/obj/machinery/light/directional/east,
+/turf/open/floor/iron/white,
+/area/misc/hilbertshotel)
+"XU" = (
+/obj/effect/turf_decal/tile/dark_blue/half/contrasted{
+ dir = 1
+ },
+/turf/open/floor/iron/white,
+/area/misc/hilbertshotel)
+"YV" = (
+/obj/effect/turf_decal/siding/dark{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/dark_blue/half/contrasted{
+ dir = 4
+ },
+/obj/structure/chair{
+ dir = 8
+ },
+/turf/open/floor/iron/white,
+/area/misc/hilbertshotel)
+"YY" = (
+/obj/effect/turf_decal/siding/dark/corner{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/dark_blue{
+ dir = 1
+ },
+/turf/open/floor/iron/white,
+/area/misc/hilbertshotel)
+"ZL" = (
+/obj/structure/chair/sofa/bench/right{
+ dir = 8;
+ pixel_x = 8
+ },
+/obj/effect/turf_decal/tile/dark_blue/full,
+/turf/open/floor/iron/large,
+/area/misc/hilbertshotel)
+
+(1,1,1) = {"
+jT
+jT
+jT
+jT
+jT
+SS
+SS
+jT
+jT
+jT
+jT
+jT
+jT
+jT
+jT
+"}
+(2,1,1) = {"
+jT
+jT
+JI
+lT
+JI
+PW
+PW
+JI
+lT
+JI
+jT
+DZ
+DZ
+DZ
+jT
+"}
+(3,1,1) = {"
+jT
+Fb
+cy
+ZL
+jU
+cy
+cy
+ZL
+jU
+cy
+CS
+Pc
+GI
+mH
+jT
+"}
+(4,1,1) = {"
+jT
+Vv
+PW
+yh
+Gk
+PW
+PW
+yh
+Gk
+PW
+CS
+Pc
+kJ
+MI
+jT
+"}
+(5,1,1) = {"
+jT
+jT
+sC
+Vw
+sC
+cy
+cy
+sC
+Vw
+sC
+jT
+sF
+sF
+sF
+jT
+"}
+(6,1,1) = {"
+jT
+jT
+jT
+jT
+jT
+CS
+CS
+jT
+jT
+jT
+jT
+jT
+jT
+jT
+jT
+"}
+(7,1,1) = {"
+jT
+Qm
+aM
+aM
+FI
+BW
+BW
+pe
+Kc
+Kc
+Kc
+Kc
+FI
+Bh
+jT
+"}
+(8,1,1) = {"
+jT
+XU
+iX
+FN
+Ge
+Ge
+FN
+FN
+FN
+Ge
+Ge
+FN
+Pm
+aC
+jT
+"}
+(9,1,1) = {"
+jT
+XU
+kt
+BG
+BG
+BG
+BG
+BG
+BG
+BG
+BG
+BG
+Rp
+aC
+jT
+"}
+(10,1,1) = {"
+jT
+uO
+kC
+BG
+BG
+BG
+BG
+BG
+BG
+BG
+BG
+BG
+Rp
+aC
+jT
+"}
+(11,1,1) = {"
+jT
+bI
+kC
+BG
+BG
+BG
+BG
+BG
+BG
+BG
+BG
+BG
+Rp
+aC
+jT
+"}
+(12,1,1) = {"
+jT
+yj
+kC
+BG
+BG
+BG
+BG
+BG
+BG
+BG
+BG
+BG
+Rp
+aC
+jT
+"}
+(13,1,1) = {"
+jT
+XU
+kt
+BG
+BG
+BG
+BG
+BG
+BG
+BG
+BG
+BG
+Rp
+aC
+jT
+"}
+(14,1,1) = {"
+jT
+XU
+VE
+BW
+Cb
+Cb
+BW
+BW
+BW
+Cb
+Cb
+BW
+YY
+aC
+jT
+"}
+(15,1,1) = {"
+jT
+Gf
+YV
+YV
+Xo
+FN
+qe
+qe
+Mk
+qe
+qe
+sG
+FN
+xw
+jT
+"}
+(16,1,1) = {"
+jT
+jT
+jT
+jT
+jT
+jT
+jT
+jT
+jT
+jT
+jT
+jT
+jT
+jT
+jT
+"}
diff --git a/modular_skyrat/modules/hotel_rooms/syndieoffice.dmm b/modular_skyrat/modules/hotel_rooms/syndieoffice.dmm
new file mode 100644
index 00000000000..e0d6cd352d0
--- /dev/null
+++ b/modular_skyrat/modules/hotel_rooms/syndieoffice.dmm
@@ -0,0 +1,1012 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"dk" = (
+/obj/structure/secure_safe/directional/north,
+/obj/effect/turf_decal/siding/thinplating_new/dark{
+ dir = 5
+ },
+/turf/open/floor/wood/large,
+/area/misc/hilbertshotel)
+"et" = (
+/obj/structure/table/reinforced/plastitaniumglass,
+/obj/item/phone{
+ pixel_x = 7;
+ pixel_y = -2;
+ desc = "Standard red phone, but somehow evil-er";
+ name = "BLOOD-red phone"
+ },
+/obj/item/flashlight/lamp{
+ pixel_x = -5;
+ pixel_y = 10
+ },
+/turf/open/floor/carpet/royalblack,
+/area/misc/hilbertshotel)
+"eF" = (
+/obj/effect/turf_decal/trimline/dark_red/filled/line{
+ dir = 8
+ },
+/turf/open/indestructible/dark/textured,
+/area/misc/hilbertshotel)
+"gj" = (
+/obj/effect/turf_decal/skyrat_decals/syndicate/bottom/right,
+/obj/structure/table/reinforced/plastitaniumglass,
+/obj/item/paper_bin{
+ pixel_y = 4
+ },
+/obj/item/pen/fountain{
+ pixel_y = 5
+ },
+/turf/open/floor/mineral/plastitanium/red,
+/area/misc/hilbertshotel)
+"gE" = (
+/obj/structure/railing/unbreakable,
+/turf/open/floor/iron/stairs/right{
+ dir = 8
+ },
+/area/misc/hilbertshotel)
+"gH" = (
+/obj/structure/table/reinforced/plastitaniumglass,
+/obj/item/folder/syndicate/blue,
+/obj/item/pen/edagger,
+/obj/item/toy/gun,
+/turf/open/floor/carpet/royalblack,
+/area/misc/hilbertshotel)
+"gR" = (
+/obj/item/kirbyplants/organic/plant22,
+/obj/structure/sign/warning/yes_smoking/circle/directional/north,
+/obj/effect/turf_decal/trimline/dark_red/filled,
+/turf/open/indestructible/dark/textured,
+/area/misc/hilbertshotel)
+"hg" = (
+/turf/closed/indestructible/fakedoor,
+/area/misc/hilbertshotel)
+"hO" = (
+/obj/effect/turf_decal/siding/thinplating_new/dark/corner{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/dark_red/filled/warning{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/neutral/filled/line{
+ dir = 4
+ },
+/turf/open/indestructible/dark/textured,
+/area/misc/hilbertshotel)
+"iG" = (
+/obj/effect/turf_decal/trimline/dark_red/filled/line{
+ dir = 5
+ },
+/obj/item/kirbyplants/organic/plant22,
+/turf/open/indestructible/dark/textured,
+/area/misc/hilbertshotel)
+"iN" = (
+/obj/effect/turf_decal/siding/thinplating_new/dark{
+ dir = 4
+ },
+/obj/machinery/light/floor,
+/turf/open/indestructible/dark/textured,
+/area/misc/hilbertshotel)
+"jc" = (
+/obj/machinery/light/directional/south,
+/turf/open/floor/iron/stairs/right{
+ dir = 8
+ },
+/area/misc/hilbertshotel)
+"jM" = (
+/obj/effect/turf_decal/siding/thinplating_new/dark{
+ dir = 6
+ },
+/obj/structure/railing/unbreakable{
+ dir = 6
+ },
+/obj/structure/showcase/cyborg{
+ desc = "A stand with the empty body of a Cybersun cyborg bolted to it.";
+ dir = 4;
+ icon = 'icons/mob/silicon/robots.dmi';
+ icon_state = "synd_sec";
+ name = "syndicate cyborg showcase";
+ pixel_x = -6
+ },
+/turf/open/floor/mineral/plastitanium/red,
+/area/misc/hilbertshotel)
+"jV" = (
+/obj/effect/turf_decal/delivery,
+/obj/machinery/vending/boozeomat/syndicate,
+/turf/open/indestructible/dark/textured{
+ icon_state = "engine"
+ },
+/area/misc/hilbertshotel)
+"kS" = (
+/obj/machinery/light/floor,
+/turf/open/indestructible/dark/textured,
+/area/misc/hilbertshotel)
+"mq" = (
+/turf/open/floor/fakespace,
+/area/misc/hilbertshotel)
+"my" = (
+/obj/effect/turf_decal/trimline/dark_red/filled/line,
+/turf/open/indestructible/dark/textured,
+/area/misc/hilbertshotel)
+"nj" = (
+/obj/structure/railing/unbreakable{
+ dir = 1
+ },
+/turf/open/floor/iron/stairs/left{
+ dir = 8
+ },
+/area/misc/hilbertshotel)
+"nr" = (
+/obj/structure/sign/flag/syndicate/directional/east,
+/obj/effect/turf_decal/siding/thinplating_new/dark{
+ dir = 6
+ },
+/turf/open/floor/wood/large,
+/area/misc/hilbertshotel)
+"nS" = (
+/obj/effect/turf_decal/siding/thinplating_new/dark{
+ dir = 10
+ },
+/obj/structure/railing/unbreakable{
+ dir = 10
+ },
+/obj/structure/showcase/cyborg{
+ desc = "A stand with the empty body of a Cybersun cyborg bolted to it.";
+ dir = 8;
+ icon = 'icons/mob/silicon/robots.dmi';
+ icon_state = "synd_sec";
+ name = "syndicate cyborg showcase";
+ pixel_x = 6
+ },
+/turf/open/floor/mineral/plastitanium/red,
+/area/misc/hilbertshotel)
+"nW" = (
+/obj/effect/turf_decal/siding/thinplating_new/dark{
+ dir = 4
+ },
+/turf/open/floor/carpet/royalblack,
+/area/misc/hilbertshotel)
+"nX" = (
+/obj/effect/turf_decal/trimline/dark_red/filled/corner,
+/turf/open/indestructible/dark/textured,
+/area/misc/hilbertshotel)
+"ou" = (
+/obj/effect/turf_decal/trimline/dark_red/filled/line{
+ dir = 6
+ },
+/turf/open/indestructible/dark/textured,
+/area/misc/hilbertshotel)
+"qx" = (
+/turf/closed/indestructible/fakeglass,
+/area/misc/hilbertshotel)
+"qD" = (
+/obj/effect/turf_decal/skyrat_decals/syndicate/middle/right,
+/obj/structure/table/reinforced/plastitaniumglass,
+/obj/machinery{
+ icon = 'modular_skyrat/modules/aesthetics/intercom/icons/intercom.dmi';
+ icon_state = "intercom";
+ name = "Intercom"
+ },
+/turf/open/floor/mineral/plastitanium/red,
+/area/misc/hilbertshotel)
+"qE" = (
+/obj/structure/table/reinforced/plastitaniumglass,
+/obj/item/storage/fancy/cigarettes/cigars/havana{
+ pixel_y = 5;
+ pixel_x = 4
+ },
+/obj/item/lighter/skull{
+ pixel_x = -8;
+ pixel_y = 1
+ },
+/turf/open/indestructible/dark/textured,
+/area/misc/hilbertshotel)
+"ry" = (
+/obj/effect/turf_decal/siding/thinplating_new/dark{
+ dir = 9
+ },
+/obj/structure/railing/unbreakable{
+ dir = 9
+ },
+/obj/structure/showcase/cyborg{
+ desc = "A stand with the empty body of a Cybersun cyborg bolted to it.";
+ dir = 8;
+ icon = 'icons/mob/silicon/robots.dmi';
+ icon_state = "synd_sec";
+ name = "syndicate cyborg showcase";
+ pixel_x = 6
+ },
+/turf/open/floor/mineral/plastitanium/red,
+/area/misc/hilbertshotel)
+"sx" = (
+/obj/effect/turf_decal/skyrat_decals/syndicate/top/left,
+/obj/structure/table/reinforced/plastitaniumglass,
+/obj/item/storage/fancy/cigarettes/cigpack_syndicate{
+ pixel_y = 2;
+ pixel_x = -6
+ },
+/obj/item/lighter/skull{
+ pixel_x = -5;
+ pixel_y = -2
+ },
+/turf/open/floor/mineral/plastitanium/red,
+/area/misc/hilbertshotel)
+"sH" = (
+/obj/item/reagent_containers/cup/glass/bottle/vodka/badminka{
+ pixel_y = 20
+ },
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
+ pixel_x = -8;
+ pixel_y = 7
+ },
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
+ pixel_x = 8;
+ pixel_y = 7
+ },
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
+ pixel_y = 2
+ },
+/obj/structure/table/reinforced/plastitaniumglass,
+/turf/open/indestructible/dark/textured,
+/area/misc/hilbertshotel)
+"sV" = (
+/obj/item/kirbyplants/organic/plant22,
+/obj/effect/turf_decal/trimline/dark_red/filled,
+/turf/open/indestructible/dark/textured,
+/area/misc/hilbertshotel)
+"sW" = (
+/obj/effect/turf_decal/siding/thinplating_new/dark,
+/obj/structure/chair/comfy/shuttle{
+ color = "#474747"
+ },
+/turf/open/indestructible/dark/textured,
+/area/misc/hilbertshotel)
+"tF" = (
+/obj/effect/turf_decal/siding/thinplating_new/dark{
+ dir = 5
+ },
+/turf/open/floor/wood/large,
+/area/misc/hilbertshotel)
+"vE" = (
+/turf/closed/wall/space{
+ space_lit = 1
+ },
+/area/misc/hilbertshotel)
+"vO" = (
+/obj/effect/turf_decal/siding/thinplating_new/dark/corner{
+ dir = 4
+ },
+/turf/open/floor/wood/large,
+/area/misc/hilbertshotel)
+"vX" = (
+/obj/effect/turf_decal/siding/thinplating_new/dark{
+ dir = 1
+ },
+/turf/closed/indestructible/syndicate,
+/area/misc/hilbertshotel)
+"wa" = (
+/obj/machinery/vending/cigarette/syndicate,
+/obj/effect/turf_decal/delivery,
+/turf/open/indestructible/dark/textured{
+ icon_state = "engine"
+ },
+/area/misc/hilbertshotel)
+"wg" = (
+/obj/effect/turf_decal/siding/thinplating_new/dark{
+ dir = 8
+ },
+/obj/structure/chair/comfy/shuttle{
+ color = "#DD2211";
+ dir = 8
+ },
+/turf/open/indestructible/dark/textured,
+/area/misc/hilbertshotel)
+"wU" = (
+/obj/effect/turf_decal/skyrat_decals/syndicate/top/right,
+/obj/structure/table/reinforced/plastitaniumglass,
+/obj/item/reagent_containers/cup/glass/coffee/colonial{
+ pixel_x = -14;
+ pixel_y = 11
+ },
+/obj/item/paper_bin{
+ pixel_y = 4
+ },
+/obj/item/pen/fountain{
+ pixel_y = 5
+ },
+/turf/open/floor/mineral/plastitanium/red,
+/area/misc/hilbertshotel)
+"xb" = (
+/turf/closed/indestructible/syndicate,
+/area/misc/hilbertshotel)
+"xi" = (
+/obj/effect/turf_decal/skyrat_decals/syndicate/middle/left,
+/turf/open/floor/mineral/plastitanium/red,
+/area/misc/hilbertshotel)
+"xn" = (
+/obj/effect/turf_decal/trimline/dark_red/filled/warning{
+ dir = 6
+ },
+/obj/effect/turf_decal/trimline/neutral/filled/line{
+ dir = 4
+ },
+/turf/open/indestructible/dark/textured,
+/area/misc/hilbertshotel)
+"xD" = (
+/obj/effect/turf_decal/trimline/neutral/filled/line,
+/obj/effect/turf_decal/trimline/dark_red/filled/warning,
+/turf/open/indestructible/dark/textured,
+/area/misc/hilbertshotel)
+"xQ" = (
+/obj/effect/turf_decal/trimline/dark_red/filled/line{
+ dir = 5
+ },
+/turf/open/indestructible/dark/textured,
+/area/misc/hilbertshotel)
+"yh" = (
+/obj/effect/turf_decal/siding/thinplating_new/dark{
+ dir = 6
+ },
+/turf/open/floor/wood/large,
+/area/misc/hilbertshotel)
+"yr" = (
+/obj/effect/turf_decal/skyrat_decals/syndicate/bottom/left,
+/obj/structure/table/reinforced/plastitaniumglass,
+/obj/item/folder/red{
+ pixel_x = 4;
+ pixel_y = 1
+ },
+/obj/item/pen/fountain{
+ pixel_x = 4;
+ pixel_y = 1
+ },
+/obj/item/reagent_containers/cup/glass/coffee/colonial{
+ pixel_x = -7;
+ pixel_y = 3
+ },
+/turf/open/floor/mineral/plastitanium/red,
+/area/misc/hilbertshotel)
+"yG" = (
+/obj/effect/turf_decal/skyrat_decals/syndicate/top/middle,
+/obj/structure/table/reinforced/plastitaniumglass,
+/obj/item/storage/fancy/cigarettes/cigars/havana{
+ pixel_y = 5;
+ pixel_x = 4
+ },
+/turf/open/floor/mineral/plastitanium/red,
+/area/misc/hilbertshotel)
+"BE" = (
+/obj/effect/turf_decal/siding/thinplating_new/dark{
+ dir = 8
+ },
+/obj/structure/railing/unbreakable{
+ dir = 8
+ },
+/obj/structure/showcase/mecha/marauder{
+ icon_state = "darkgygax"
+ },
+/turf/open/floor/mineral/plastitanium/red,
+/area/misc/hilbertshotel)
+"Dc" = (
+/obj/effect/turf_decal/trimline/dark_red/filled/line{
+ dir = 1
+ },
+/turf/open/indestructible/dark/textured,
+/area/misc/hilbertshotel)
+"EM" = (
+/obj/effect/turf_decal/siding/thinplating_new/dark/corner{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/dark_red/filled/warning{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/neutral/filled/line{
+ dir = 4
+ },
+/turf/open/indestructible/dark/textured,
+/area/misc/hilbertshotel)
+"FL" = (
+/obj/item/kirbyplants/organic/plant21,
+/obj/effect/turf_decal/trimline/dark_red/filled/line{
+ dir = 8
+ },
+/turf/open/indestructible/dark/textured,
+/area/misc/hilbertshotel)
+"GJ" = (
+/obj/effect/turf_decal/trimline/dark_red/filled/line{
+ dir = 9
+ },
+/obj/machinery/light/directional/north,
+/obj/machinery/recharge_station,
+/turf/open/indestructible/dark/textured,
+/area/misc/hilbertshotel)
+"Hc" = (
+/obj/effect/turf_decal/siding/thinplating_new/dark/corner,
+/turf/open/floor/wood/large,
+/area/misc/hilbertshotel)
+"Hd" = (
+/obj/effect/turf_decal/trimline/dark_red/filled/corner{
+ dir = 8
+ },
+/turf/open/indestructible/dark/textured,
+/area/misc/hilbertshotel)
+"Hf" = (
+/obj/effect/turf_decal/siding/thinplating_new/dark{
+ dir = 8
+ },
+/obj/structure/railing/unbreakable{
+ dir = 8
+ },
+/turf/open/floor/wood/large,
+/area/misc/hilbertshotel)
+"Hq" = (
+/obj/effect/turf_decal/trimline/dark_red/filled/line{
+ dir = 9
+ },
+/turf/open/indestructible/dark/textured,
+/area/misc/hilbertshotel)
+"Hw" = (
+/obj/effect/turf_decal/trimline/dark_red/filled/warning{
+ dir = 5
+ },
+/obj/effect/turf_decal/trimline/neutral/filled/line{
+ dir = 4
+ },
+/turf/open/indestructible/dark/textured,
+/area/misc/hilbertshotel)
+"HD" = (
+/obj/effect/turf_decal/siding/thinplating_new/dark/corner,
+/turf/open/indestructible/dark/textured,
+/area/misc/hilbertshotel)
+"HI" = (
+/turf/closed/indestructible/hoteldoor{
+ icon_state = "door_closed";
+ icon = 'icons/obj/doors/puzzledoor/default.dmi'
+ },
+/area/misc/hilbertshotel)
+"HW" = (
+/obj/effect/turf_decal/trimline/dark_red/filled/line{
+ dir = 4
+ },
+/turf/open/indestructible/dark/textured,
+/area/misc/hilbertshotel)
+"IK" = (
+/turf/open/indestructible/dark/textured,
+/area/misc/hilbertshotel)
+"Lb" = (
+/obj/structure/railing/corner/end/flip{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/dark_red/filled/line{
+ dir = 8
+ },
+/turf/open/indestructible/dark/textured,
+/area/misc/hilbertshotel)
+"Mk" = (
+/obj/effect/turf_decal/delivery,
+/obj/machinery/suit_storage_unit,
+/turf/open/indestructible/dark/textured{
+ icon_state = "engine"
+ },
+/area/misc/hilbertshotel)
+"Mw" = (
+/turf/open/floor/carpet/black,
+/area/misc/hilbertshotel)
+"MC" = (
+/obj/structure/table/reinforced/plastitaniumglass,
+/obj/item/stamp{
+ pixel_x = 9;
+ pixel_y = 11
+ },
+/obj/item/stamp/denied{
+ pixel_x = 9;
+ pixel_y = 7
+ },
+/obj/item/paper_bin{
+ pixel_y = 6;
+ pixel_x = -4
+ },
+/turf/open/floor/carpet/royalblack,
+/area/misc/hilbertshotel)
+"MJ" = (
+/obj/machinery/vending/wardrobe/syndie_wardrobe/ghost_cafe,
+/obj/effect/turf_decal/delivery,
+/turf/open/indestructible/dark/textured{
+ icon_state = "engine"
+ },
+/area/misc/hilbertshotel)
+"No" = (
+/obj/effect/turf_decal/trimline/dark_red/filled/line{
+ dir = 6
+ },
+/obj/item/kirbyplants/organic/plant22,
+/turf/open/indestructible/dark/textured,
+/area/misc/hilbertshotel)
+"NS" = (
+/obj/structure/chair/comfy{
+ color = "#DD2211";
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/thinplating_new/dark{
+ dir = 4
+ },
+/turf/open/floor/carpet/royalblack,
+/area/misc/hilbertshotel)
+"OS" = (
+/obj/effect/turf_decal/siding/thinplating_new/dark{
+ dir = 4
+ },
+/obj/structure/railing/unbreakable{
+ dir = 4
+ },
+/obj/structure/showcase/mecha/ripley{
+ icon_state = "mauler"
+ },
+/turf/open/floor/mineral/plastitanium/red,
+/area/misc/hilbertshotel)
+"Qg" = (
+/obj/effect/turf_decal/skyrat_decals/syndicate/middle/middle,
+/turf/open/floor/mineral/plastitanium/red,
+/area/misc/hilbertshotel)
+"QG" = (
+/obj/effect/turf_decal/siding/thinplating_new/dark{
+ dir = 8
+ },
+/obj/structure/railing/unbreakable{
+ dir = 8
+ },
+/obj/structure/showcase/mecha/ripley{
+ icon_state = "mauler"
+ },
+/turf/open/floor/mineral/plastitanium/red,
+/area/misc/hilbertshotel)
+"QH" = (
+/obj/effect/turf_decal/trimline/dark_red/filled/corner{
+ dir = 1
+ },
+/turf/open/indestructible/dark/textured,
+/area/misc/hilbertshotel)
+"Rb" = (
+/obj/effect/turf_decal/siding/thinplating_new/dark{
+ dir = 5
+ },
+/obj/structure/railing/unbreakable{
+ dir = 5
+ },
+/obj/structure/showcase/cyborg{
+ desc = "A stand with the empty body of a Cybersun cyborg bolted to it.";
+ dir = 4;
+ icon = 'icons/mob/silicon/robots.dmi';
+ icon_state = "synd_sec";
+ name = "syndicate cyborg showcase";
+ pixel_x = -6
+ },
+/turf/open/floor/mineral/plastitanium/red,
+/area/misc/hilbertshotel)
+"Rv" = (
+/obj/structure/railing/corner/end/unbreakable{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/dark_red/filled/line{
+ dir = 8
+ },
+/turf/open/indestructible/dark/textured,
+/area/misc/hilbertshotel)
+"RJ" = (
+/obj/effect/turf_decal/siding/thinplating_new/dark{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/dark_red/filled/corner,
+/obj/machinery/light/floor,
+/turf/open/indestructible/dark/textured,
+/area/misc/hilbertshotel)
+"Sb" = (
+/obj/machinery/light/directional/north,
+/turf/open/floor/iron/stairs/left{
+ dir = 8
+ },
+/area/misc/hilbertshotel)
+"Sd" = (
+/obj/effect/turf_decal/siding/thinplating_new/dark{
+ dir = 1
+ },
+/obj/structure/chair/comfy/shuttle{
+ color = "#474747";
+ dir = 1
+ },
+/turf/open/indestructible/dark/textured,
+/area/misc/hilbertshotel)
+"Sk" = (
+/obj/effect/turf_decal/siding/thinplating_new/dark{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/dark_red/filled/corner{
+ dir = 4
+ },
+/obj/machinery/light/floor,
+/turf/open/indestructible/dark/textured,
+/area/misc/hilbertshotel)
+"Su" = (
+/obj/effect/turf_decal/siding/thinplating_new/dark/corner{
+ dir = 1
+ },
+/obj/structure/railing/corner{
+ dir = 1
+ },
+/turf/open/floor/wood/large,
+/area/misc/hilbertshotel)
+"SJ" = (
+/obj/effect/turf_decal/trimline/dark_red/filled/corner{
+ dir = 4
+ },
+/turf/open/indestructible/dark/textured,
+/area/misc/hilbertshotel)
+"TM" = (
+/obj/effect/turf_decal/trimline/dark_red/filled/line{
+ dir = 10
+ },
+/obj/machinery/light/directional/south,
+/obj/item/kirbyplants/organic/plant24,
+/turf/open/indestructible/dark/textured,
+/area/misc/hilbertshotel)
+"TN" = (
+/obj/effect/turf_decal/siding/thinplating_new/dark,
+/turf/open/floor/wood/large,
+/area/misc/hilbertshotel)
+"TY" = (
+/obj/effect/turf_decal/siding/thinplating_new/dark{
+ dir = 4
+ },
+/turf/open/indestructible/dark/textured,
+/area/misc/hilbertshotel)
+"Vp" = (
+/obj/effect/turf_decal/siding/thinplating_new/dark/corner{
+ dir = 8
+ },
+/obj/structure/railing/corner{
+ dir = 8
+ },
+/turf/open/floor/wood/large,
+/area/misc/hilbertshotel)
+"Vz" = (
+/obj/structure/railing/corner/end/unbreakable{
+ dir = 4
+ },
+/turf/open/floor/carpet/black,
+/area/misc/hilbertshotel)
+"VU" = (
+/turf/open/floor/iron/stairs/medium{
+ dir = 8
+ },
+/area/misc/hilbertshotel)
+"WP" = (
+/obj/effect/turf_decal/siding/thinplating_new/dark{
+ dir = 4
+ },
+/obj/structure/railing/unbreakable{
+ dir = 4
+ },
+/obj/structure/showcase/mecha/marauder{
+ icon_state = "darkgygax"
+ },
+/turf/open/floor/mineral/plastitanium/red,
+/area/misc/hilbertshotel)
+"Xp" = (
+/obj/effect/turf_decal/skyrat_decals/syndicate/bottom/middle,
+/obj/structure/table/reinforced/plastitaniumglass,
+/obj/item/sign/flag/syndicate{
+ pixel_y = 3
+ },
+/turf/open/floor/mineral/plastitanium/red,
+/area/misc/hilbertshotel)
+"Xu" = (
+/obj/structure/railing/corner/end/flip{
+ dir = 4
+ },
+/turf/open/floor/carpet/black,
+/area/misc/hilbertshotel)
+"Xv" = (
+/obj/effect/turf_decal/siding/thinplating_new/dark{
+ dir = 1
+ },
+/turf/open/floor/wood/large,
+/area/misc/hilbertshotel)
+"Yv" = (
+/obj/effect/turf_decal/trimline/dark_red/filled/line{
+ dir = 10
+ },
+/turf/open/indestructible/dark/textured,
+/area/misc/hilbertshotel)
+"YG" = (
+/obj/item/kirbyplants/organic/plant24,
+/obj/effect/turf_decal/trimline/dark_red/filled/line{
+ dir = 8
+ },
+/turf/open/indestructible/dark/textured,
+/area/misc/hilbertshotel)
+"Zv" = (
+/obj/effect/turf_decal/siding/thinplating_new/dark/corner{
+ dir = 4
+ },
+/turf/open/indestructible/dark/textured,
+/area/misc/hilbertshotel)
+"ZW" = (
+/obj/effect/turf_decal/trimline/neutral/filled/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/dark_red/filled/warning{
+ dir = 1
+ },
+/turf/open/indestructible/dark/textured,
+/area/misc/hilbertshotel)
+
+(1,1,1) = {"
+vE
+vE
+vE
+vE
+xb
+xb
+qx
+HI
+qx
+xb
+xb
+vE
+vE
+vE
+vE
+"}
+(2,1,1) = {"
+vE
+mq
+mq
+mq
+xb
+gR
+Xu
+Mw
+Vz
+sV
+xb
+mq
+mq
+mq
+vE
+"}
+(3,1,1) = {"
+vE
+mq
+xb
+xb
+xb
+qx
+nj
+VU
+gE
+qx
+xb
+xb
+mq
+mq
+vE
+"}
+(4,1,1) = {"
+vE
+xb
+xb
+xb
+GJ
+FL
+Rv
+eF
+Lb
+YG
+TM
+vX
+xb
+xb
+vE
+"}
+(5,1,1) = {"
+vE
+xb
+WP
+jM
+Dc
+HD
+TY
+iN
+TY
+Zv
+my
+Rb
+OS
+xb
+vE
+"}
+(6,1,1) = {"
+vE
+xb
+Hq
+eF
+QH
+sW
+sx
+xi
+yr
+Sd
+Hd
+eF
+Yv
+xb
+vE
+"}
+(7,1,1) = {"
+vE
+hg
+ZW
+kS
+IK
+sW
+yG
+Qg
+Xp
+Sd
+IK
+kS
+xD
+hg
+vE
+"}
+(8,1,1) = {"
+vE
+xb
+xQ
+HW
+SJ
+sW
+wU
+qD
+gj
+Sd
+nX
+HW
+ou
+xb
+vE
+"}
+(9,1,1) = {"
+vE
+xb
+QG
+nS
+Hw
+EM
+Sk
+wg
+RJ
+hO
+xn
+ry
+BE
+xb
+vE
+"}
+(10,1,1) = {"
+vE
+xb
+xb
+xb
+Sb
+gE
+iG
+HW
+No
+nj
+jc
+xb
+xb
+xb
+vE
+"}
+(11,1,1) = {"
+vE
+mq
+xb
+wa
+Xv
+Vp
+Hf
+Hf
+Hf
+Su
+TN
+MJ
+xb
+mq
+vE
+"}
+(12,1,1) = {"
+vE
+mq
+xb
+jV
+tF
+vO
+et
+gH
+MC
+Hc
+nr
+Mk
+xb
+mq
+vE
+"}
+(13,1,1) = {"
+vE
+mq
+xb
+xb
+xb
+dk
+nW
+NS
+nW
+yh
+xb
+xb
+xb
+mq
+vE
+"}
+(14,1,1) = {"
+vE
+mq
+mq
+mq
+qx
+qx
+sH
+IK
+qE
+qx
+qx
+mq
+mq
+mq
+vE
+"}
+(15,1,1) = {"
+vE
+mq
+mq
+mq
+mq
+qx
+qx
+qx
+qx
+qx
+mq
+mq
+mq
+mq
+vE
+"}
+(16,1,1) = {"
+vE
+vE
+vE
+vE
+vE
+vE
+vE
+vE
+vE
+vE
+vE
+vE
+vE
+vE
+vE
+"}
diff --git a/modular_skyrat/modules/hotel_rooms/synopcenter.dmm b/modular_skyrat/modules/hotel_rooms/synopcenter.dmm
new file mode 100644
index 00000000000..da3a26c1af4
--- /dev/null
+++ b/modular_skyrat/modules/hotel_rooms/synopcenter.dmm
@@ -0,0 +1,1493 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"ac" = (
+/turf/open/indestructible/dark/textured,
+/area/misc/hilbertshotel)
+"at" = (
+/obj/structure/table/reinforced/plastitaniumglass,
+/obj/effect/turf_decal/tile/neutral/opposingcorners,
+/obj/effect/spawner/random/food_or_drink/donkpockets,
+/obj/machinery/light/directional/east,
+/turf/open/indestructible/dark/textured,
+/area/misc/hilbertshotel)
+"aB" = (
+/obj/effect/turf_decal/siding/dark_red{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/dark_red/filled/line{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/dark_red/filled/line{
+ dir = 4
+ },
+/obj/effect/turf_decal/caution{
+ dir = 4
+ },
+/turf/open/indestructible/dark/textured,
+/area/misc/hilbertshotel)
+"aD" = (
+/turf/open/floor/mineral/plastitanium/red,
+/area/misc/hilbertshotel)
+"cn" = (
+/obj/structure/dresser,
+/obj/item/reagent_containers/cup/glass/bottle/vodka/badminka{
+ pixel_y = 20;
+ pixel_x = -5
+ },
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
+ pixel_y = 14;
+ pixel_x = 5
+ },
+/obj/structure/sign/flag/syndicate/directional/east,
+/turf/open/floor/carpet/royalblack,
+/area/misc/hilbertshotel)
+"cH" = (
+/obj/structure/table/reinforced/plastitaniumglass,
+/obj/item/storage/box/zipties,
+/turf/open/floor/mineral/plastitanium/red,
+/area/misc/hilbertshotel)
+"eq" = (
+/obj/structure/railing/unbreakable{
+ dir = 10
+ },
+/obj/machinery/computer{
+ dir = 4
+ },
+/turf/open/indestructible/dark/textured{
+ icon_state = "rcircuit"
+ },
+/area/misc/hilbertshotel)
+"eZ" = (
+/obj/effect/turf_decal/siding/thinplating_new/dark,
+/obj/effect/turf_decal/trimline/dark_red/filled/end{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/thinplating_new/dark{
+ dir = 1
+ },
+/obj/structure/railing/corner/end/unbreakable{
+ dir = 8
+ },
+/turf/open/indestructible/dark/textured,
+/area/misc/hilbertshotel)
+"fU" = (
+/obj/effect/turf_decal/siding/dark_red{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/yellow/filled/warning/corner{
+ dir = 1
+ },
+/obj/machinery/light/directional/north,
+/turf/open/indestructible/dark/textured{
+ icon_state = "engine"
+ },
+/area/misc/hilbertshotel)
+"ga" = (
+/turf/closed/indestructible/syndicate,
+/area/misc/hilbertshotel)
+"gZ" = (
+/obj/effect/turf_decal/delivery,
+/obj/structure/secure_safe/directional/north,
+/obj/structure/closet/cabinet,
+/obj/item/clothing/shoes/cowboy/black,
+/turf/open/indestructible/dark/textured,
+/area/misc/hilbertshotel)
+"hg" = (
+/obj/structure/table/reinforced/plastitaniumglass,
+/obj/structure/window/reinforced/survival_pod/spawner/directional/south,
+/obj/item/folder/red{
+ pixel_x = -6
+ },
+/obj/item/folder/white{
+ pixel_x = 7
+ },
+/turf/open/floor/mineral/plastitanium,
+/area/misc/hilbertshotel)
+"ho" = (
+/obj/structure/railing/unbreakable,
+/turf/open/floor/iron/stairs{
+ dir = 8
+ },
+/area/misc/hilbertshotel)
+"hz" = (
+/obj/machinery/door/airlock/grunge{
+ name = "Interrogation Room"
+ },
+/turf/open/indestructible/dark/textured,
+/area/misc/hilbertshotel)
+"hL" = (
+/obj/structure/railing/unbreakable{
+ dir = 1
+ },
+/turf/open/floor/iron/stairs{
+ dir = 8
+ },
+/area/misc/hilbertshotel)
+"hM" = (
+/obj/effect/turf_decal/siding/dark_red,
+/obj/structure/sign/poster/contraband/random/directional/south,
+/turf/open/indestructible/dark/textured{
+ icon_state = "engine"
+ },
+/area/misc/hilbertshotel)
+"hN" = (
+/obj/effect/turf_decal/bot,
+/obj/machinery/light/directional/south,
+/obj/structure/rack,
+/obj/item/clothing/head/playbunnyears/syndicate/fake,
+/obj/item/clothing/neck/tie/bunnytie/syndicate,
+/obj/item/clothing/suit/jacket/tailcoat/syndicate/fake,
+/obj/item/clothing/under/syndicate/syndibunny/fake,
+/obj/item/toy/balloon/syndicate,
+/obj/item/clothing/under/misc/syndicate_souvenir,
+/turf/open/floor/mineral/plastitanium/red,
+/area/misc/hilbertshotel)
+"ia" = (
+/obj/effect/turf_decal/tile/neutral/opposingcorners,
+/turf/open/indestructible/dark/textured,
+/area/misc/hilbertshotel)
+"ii" = (
+/obj/structure/railing/unbreakable{
+ dir = 8
+ },
+/obj/machinery/computer{
+ desc = "A console meant to communicate with Syndicate upper command. This one seems to be busy processing flight calculations since you last saw it...";
+ icon_keyboard = "tech_key";
+ icon_screen = "comm";
+ name = "syndicate communications console";
+ dir = 4
+ },
+/turf/open/indestructible/dark/textured{
+ icon_state = "rcircuit"
+ },
+/area/misc/hilbertshotel)
+"im" = (
+/obj/effect/turf_decal/tile/neutral/opposingcorners,
+/obj/structure/table,
+/obj/item/storage/fancy/cigarettes/cigpack_syndicate{
+ pixel_y = 2;
+ pixel_x = 6
+ },
+/obj/item/lighter{
+ pixel_x = -4;
+ pixel_y = 4
+ },
+/obj/item/cigarette/syndicate{
+ pixel_x = -5;
+ pixel_y = 3
+ },
+/obj/structure/sign/clock/directional/south,
+/turf/open/indestructible/dark/textured,
+/area/misc/hilbertshotel)
+"in" = (
+/obj/effect/turf_decal/siding/thinplating_new/dark{
+ dir = 1
+ },
+/turf/open/indestructible/dark/textured,
+/area/misc/hilbertshotel)
+"iE" = (
+/turf/open/floor/iron/stairs/medium{
+ dir = 4
+ },
+/area/misc/hilbertshotel)
+"jd" = (
+/obj/effect/turf_decal/trimline/dark_red/filled/line{
+ dir = 9
+ },
+/obj/structure/chair/plastic,
+/turf/open/indestructible/dark/textured,
+/area/misc/hilbertshotel)
+"jv" = (
+/obj/effect/turf_decal/tile/neutral/opposingcorners,
+/obj/structure/chair,
+/obj/structure/sign/poster/contraband/syndicate_medical/directional/east,
+/turf/open/indestructible/dark/textured,
+/area/misc/hilbertshotel)
+"jy" = (
+/obj/effect/turf_decal/trimline/dark_red/filled/line{
+ dir = 10
+ },
+/turf/open/indestructible/dark/textured,
+/area/misc/hilbertshotel)
+"jO" = (
+/obj/effect/turf_decal/bot,
+/obj/structure/rack,
+/obj/item/gun/ballistic/automatic/c20r/toy/unrestricted{
+ pixel_y = 5
+ },
+/obj/item/gun/ballistic/automatic/c20r/toy/unrestricted{
+ pixel_y = 1
+ },
+/obj/item/gun/ballistic/automatic/c20r/toy/unrestricted{
+ pixel_y = -3
+ },
+/obj/item/ammo_box/magazine/toy/smgm45,
+/obj/item/ammo_box/magazine/toy/smgm45,
+/obj/item/ammo_box/magazine/toy/smgm45,
+/turf/open/floor/mineral/plastitanium/red,
+/area/misc/hilbertshotel)
+"jQ" = (
+/obj/machinery/door/airlock/grunge{
+ name = "Commanding Officer's Quarters"
+ },
+/turf/open/indestructible/dark/textured,
+/area/misc/hilbertshotel)
+"ku" = (
+/obj/structure/table/reinforced/plastitaniumglass,
+/obj/machinery/light/directional/west,
+/obj/item/paper_bin{
+ pixel_y = 6;
+ pixel_x = -4
+ },
+/obj/item/pen/red{
+ pixel_x = -4;
+ pixel_y = 6
+ },
+/obj/structure/sign/flag/syndicate/directional/west,
+/turf/open/indestructible/dark/textured,
+/area/misc/hilbertshotel)
+"kv" = (
+/obj/machinery/computer{
+ dir = 4
+ },
+/obj/effect/turf_decal/bot,
+/obj/structure/sign/poster/contraband/random/directional/south,
+/turf/open/indestructible/dark/textured,
+/area/misc/hilbertshotel)
+"kO" = (
+/obj/effect/turf_decal/siding/dark_red{
+ dir = 8
+ },
+/obj/structure/showcase/cyborg{
+ desc = "A stand with the empty body of a Cybersun cyborg bolted to it.";
+ dir = 4;
+ icon = 'icons/mob/silicon/robots.dmi';
+ icon_state = "synd_sec";
+ name = "syndicate cyborg showcase";
+ pixel_x = -6
+ },
+/obj/structure/sign/warning/secure_area/directional/south,
+/obj/effect/turf_decal/trimline/dark_red/filled/end,
+/turf/open/indestructible/dark/textured,
+/area/misc/hilbertshotel)
+"kQ" = (
+/turf/open/floor/iron/stairs/right{
+ dir = 1
+ },
+/area/misc/hilbertshotel)
+"lz" = (
+/obj/machinery/computer{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/dark_red{
+ dir = 8
+ },
+/obj/structure/window/reinforced/survival_pod/spawner/directional/south,
+/turf/open/indestructible/dark/textured{
+ icon_state = "rcircuit"
+ },
+/area/misc/hilbertshotel)
+"lO" = (
+/obj/effect/turf_decal/siding/dark_red{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/dark_red{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/yellow/filled/warning/corner,
+/turf/open/indestructible/dark/textured{
+ icon_state = "engine"
+ },
+/area/misc/hilbertshotel)
+"lU" = (
+/obj/effect/turf_decal/siding/dark_red{
+ dir = 4
+ },
+/obj/structure/chair/office/light{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/dark_red{
+ dir = 8
+ },
+/turf/open/floor/wood/large,
+/area/misc/hilbertshotel)
+"me" = (
+/obj/machinery/computer{
+ dir = 1
+ },
+/obj/structure/window/reinforced/survival_pod/spawner/directional/south,
+/turf/open/indestructible/dark/textured{
+ icon_state = "rcircuit"
+ },
+/area/misc/hilbertshotel)
+"mD" = (
+/obj/effect/turf_decal/skyrat_decals/syndicate/middle/right,
+/turf/open/floor/mineral/plastitanium/red,
+/area/misc/hilbertshotel)
+"mV" = (
+/obj/effect/turf_decal/siding/dark_red{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/dark_red{
+ dir = 4
+ },
+/obj/structure/sign/flag/usa/directional/south,
+/turf/open/floor/mineral/plastitanium,
+/area/misc/hilbertshotel)
+"nd" = (
+/obj/structure/railing/unbreakable,
+/obj/effect/turf_decal/arrows/red{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/yellow/filled/warning{
+ dir = 8
+ },
+/obj/item/clothing/suit/armor/vest/capcarapace,
+/turf/open/indestructible/dark/textured,
+/area/misc/hilbertshotel)
+"nY" = (
+/obj/structure/closet/secure_closet/wall{
+ pixel_y = 30
+ },
+/obj/structure/chair,
+/obj/effect/turf_decal/siding/dark_red{
+ dir = 9
+ },
+/obj/item/clothing/under/rank/prisoner/syndicate,
+/obj/item/clothing/under/rank/prisoner/skirt/syndicate,
+/obj/item/clothing/under/misc/syndicate_souvenir,
+/turf/open/indestructible/dark/textured{
+ icon_state = "engine"
+ },
+/area/misc/hilbertshotel)
+"of" = (
+/obj/effect/turf_decal/siding/dark_red,
+/obj/effect/turf_decal/siding/dark_red{
+ dir = 1
+ },
+/turf/open/floor/mineral/plastitanium,
+/area/misc/hilbertshotel)
+"og" = (
+/obj/effect/turf_decal/skyrat_decals/syndicate/bottom/right,
+/obj/effect/turf_decal/siding/thinplating_new/dark{
+ dir = 4
+ },
+/turf/open/floor/mineral/plastitanium/red,
+/area/misc/hilbertshotel)
+"oH" = (
+/obj/structure/rack,
+/obj/effect/turf_decal/bot,
+/obj/item/clothing/under/syndicate/skyrat/maid,
+/turf/open/floor/mineral/plastitanium/red,
+/area/misc/hilbertshotel)
+"pg" = (
+/obj/machinery/door/poddoor{
+ name = "Elevator Door"
+ },
+/turf/open/indestructible/dark/textured,
+/area/misc/hilbertshotel)
+"pr" = (
+/obj/effect/turf_decal/siding/dark_red{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/dark_red{
+ dir = 4
+ },
+/obj/machinery/light/floor,
+/turf/open/indestructible/dark/textured{
+ icon_state = "engine"
+ },
+/area/misc/hilbertshotel)
+"pB" = (
+/obj/machinery/computer,
+/obj/structure/window/reinforced/survival_pod/spawner/directional/north,
+/turf/open/indestructible/dark/textured{
+ icon_state = "rcircuit"
+ },
+/area/misc/hilbertshotel)
+"pF" = (
+/obj/effect/turf_decal/siding/dark_red{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/dark_red{
+ dir = 8
+ },
+/turf/open/floor/wood/large,
+/area/misc/hilbertshotel)
+"pH" = (
+/obj/structure/showcase/mecha/marauder{
+ icon_state = "darkgygax"
+ },
+/turf/open/floor/mineral/plastitanium/red,
+/area/misc/hilbertshotel)
+"pZ" = (
+/obj/effect/turf_decal/siding/dark_red{
+ dir = 9
+ },
+/turf/open/indestructible/dark/textured{
+ icon_state = "engine"
+ },
+/area/misc/hilbertshotel)
+"qB" = (
+/turf/closed/indestructible/fakeglass,
+/area/misc/hilbertshotel)
+"qC" = (
+/obj/effect/turf_decal/skyrat_decals/syndicate/bottom/right,
+/turf/open/floor/mineral/plastitanium/red,
+/area/misc/hilbertshotel)
+"qX" = (
+/turf/open/floor/iron/stairs/left{
+ dir = 1
+ },
+/area/misc/hilbertshotel)
+"rl" = (
+/obj/structure/railing/unbreakable{
+ dir = 1
+ },
+/turf/open/floor/iron/stairs/right{
+ dir = 4
+ },
+/area/misc/hilbertshotel)
+"rp" = (
+/obj/effect/turf_decal/siding/dark_red/corner{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/dark_red{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/yellow/filled/warning/corner{
+ dir = 1
+ },
+/turf/open/indestructible/dark/textured{
+ icon_state = "engine"
+ },
+/area/misc/hilbertshotel)
+"rq" = (
+/obj/structure/sign/poster/contraband/random/directional/north,
+/turf/open/indestructible/dark/textured,
+/area/misc/hilbertshotel)
+"rA" = (
+/obj/effect/turf_decal/siding/dark_red{
+ dir = 5
+ },
+/obj/effect/turf_decal/trimline/yellow/filled/warning/corner,
+/obj/structure/railing/corner/unbreakable,
+/turf/open/indestructible/dark/textured{
+ icon_state = "engine"
+ },
+/area/misc/hilbertshotel)
+"sg" = (
+/obj/effect/turf_decal/skyrat_decals/syndicate/top/left,
+/obj/structure/railing/corner/end/unbreakable{
+ dir = 8
+ },
+/turf/open/floor/mineral/plastitanium/red,
+/area/misc/hilbertshotel)
+"tM" = (
+/obj/effect/turf_decal/siding/dark_red{
+ dir = 1
+ },
+/obj/machinery/light/floor,
+/turf/open/indestructible/dark/textured{
+ icon_state = "engine"
+ },
+/area/misc/hilbertshotel)
+"tV" = (
+/obj/structure/railing/unbreakable{
+ dir = 9
+ },
+/obj/machinery/computer{
+ dir = 4
+ },
+/turf/open/indestructible/dark/textured{
+ icon_state = "rcircuit"
+ },
+/area/misc/hilbertshotel)
+"um" = (
+/obj/effect/turf_decal/siding/dark_red{
+ dir = 6
+ },
+/turf/open/indestructible/dark/textured{
+ icon_state = "engine"
+ },
+/area/misc/hilbertshotel)
+"vr" = (
+/obj/effect/turf_decal/tile/neutral/opposingcorners,
+/obj/structure/closet/secure_closet/freezer/kitchen/all_access,
+/obj/effect/spawner/random/food_or_drink/donkpockets,
+/obj/effect/spawner/random/food_or_drink/donkpockets,
+/obj/effect/spawner/random/food_or_drink/refreshing_beverage,
+/obj/effect/spawner/random/food_or_drink/refreshing_beverage,
+/obj/effect/spawner/random/food_or_drink/refreshing_beverage,
+/obj/effect/spawner/random/food_or_drink/refreshing_beverage,
+/turf/open/indestructible/dark/textured,
+/area/misc/hilbertshotel)
+"vH" = (
+/obj/effect/turf_decal/tile/neutral/opposingcorners,
+/obj/structure/chair{
+ dir = 4
+ },
+/turf/open/indestructible/dark/textured,
+/area/misc/hilbertshotel)
+"we" = (
+/obj/effect/turf_decal/siding/dark_red/corner{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/dark_red/corner,
+/obj/effect/turf_decal/trimline/yellow/filled/warning{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/dark_red/corner{
+ dir = 4
+ },
+/obj/structure/railing/corner/unbreakable{
+ dir = 4
+ },
+/turf/open/indestructible/dark/textured{
+ icon_state = "engine"
+ },
+/area/misc/hilbertshotel)
+"wS" = (
+/obj/effect/turf_decal/siding/thinplating_new/dark,
+/obj/effect/turf_decal/trimline/dark_red/filled/line,
+/obj/effect/turf_decal/trimline/dark_red/filled/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/thinplating_new/dark{
+ dir = 1
+ },
+/turf/open/indestructible/dark/textured,
+/area/misc/hilbertshotel)
+"wV" = (
+/obj/effect/turf_decal/siding/dark_red{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/dark_red/corner,
+/obj/effect/turf_decal/siding/dark_red/corner{
+ dir = 4
+ },
+/turf/open/floor/mineral/plastitanium,
+/area/misc/hilbertshotel)
+"xh" = (
+/obj/effect/turf_decal/siding/dark_red{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/yellow/filled/warning/corner{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/dark_red/corner,
+/turf/open/indestructible/dark/textured{
+ icon_state = "engine"
+ },
+/area/misc/hilbertshotel)
+"xl" = (
+/obj/machinery/computer,
+/obj/effect/turf_decal/siding/dark_red{
+ dir = 4
+ },
+/obj/structure/window/reinforced/survival_pod/spawner/directional/north,
+/turf/open/indestructible/dark/textured{
+ icon_state = "rcircuit"
+ },
+/area/misc/hilbertshotel)
+"yn" = (
+/obj/effect/turf_decal/arrows/red{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/yellow/filled/warning{
+ dir = 8
+ },
+/turf/open/indestructible/dark/textured,
+/area/misc/hilbertshotel)
+"Ad" = (
+/obj/structure/rack,
+/obj/effect/turf_decal/siding/dark_red{
+ dir = 5
+ },
+/obj/effect/turf_decal/bot,
+/obj/item/clothing/accessory/armband/syndicate,
+/obj/item/assembly/flash/handheld,
+/obj/item/restraints/handcuffs,
+/turf/open/indestructible/dark/textured{
+ icon_state = "engine"
+ },
+/area/misc/hilbertshotel)
+"Ae" = (
+/obj/effect/turf_decal/trimline/dark_red/filled/line{
+ dir = 6
+ },
+/turf/open/indestructible/dark/textured,
+/area/misc/hilbertshotel)
+"Aj" = (
+/obj/effect/turf_decal/skyrat_decals/syndicate/bottom/middle,
+/turf/open/floor/mineral/plastitanium/red,
+/area/misc/hilbertshotel)
+"Ak" = (
+/obj/effect/turf_decal/siding/dark_red{
+ dir = 1
+ },
+/turf/open/indestructible/dark/textured{
+ icon_state = "engine"
+ },
+/area/misc/hilbertshotel)
+"Bq" = (
+/obj/machinery/door/airlock/security/old/glass{
+ name = "Armory"
+ },
+/turf/open/floor/mineral/plastitanium,
+/area/misc/hilbertshotel)
+"BT" = (
+/obj/structure/table/reinforced/plastitaniumglass,
+/obj/structure/window/reinforced/survival_pod/spawner/directional/north,
+/turf/open/floor/mineral/plastitanium,
+/area/misc/hilbertshotel)
+"BX" = (
+/obj/machinery/computer{
+ dir = 4
+ },
+/obj/effect/turf_decal/bot,
+/obj/machinery/light/directional/west,
+/turf/open/indestructible/dark/textured,
+/area/misc/hilbertshotel)
+"CB" = (
+/obj/machinery/door/window/brigdoor/security/cell/left/directional/east{
+ name = "Syndicate Holding Cell";
+ req_access = null
+ },
+/obj/effect/turf_decal/tile/dark_red/fourcorners,
+/obj/effect/turf_decal/delivery,
+/turf/open/indestructible/dark/textured,
+/area/misc/hilbertshotel)
+"CG" = (
+/obj/effect/turf_decal/siding/thinplating_new/dark,
+/turf/open/indestructible/dark/textured,
+/area/misc/hilbertshotel)
+"CH" = (
+/obj/structure/table/reinforced/plastitaniumglass,
+/obj/effect/turf_decal/tile/neutral/opposingcorners,
+/obj/machinery/microwave,
+/obj/structure/sign/warning/yes_smoking/circle/directional/east,
+/turf/open/indestructible/dark/textured,
+/area/misc/hilbertshotel)
+"CL" = (
+/obj/effect/turf_decal/siding/thinplating_new/dark{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/dark_red/filled/end{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/thinplating_new/dark,
+/obj/structure/railing/corner/end/flip{
+ dir = 8
+ },
+/turf/open/indestructible/dark/textured,
+/area/misc/hilbertshotel)
+"Db" = (
+/obj/effect/turf_decal/skyrat_decals/syndicate/middle/left,
+/obj/effect/turf_decal/siding/thinplating_new/dark{
+ dir = 8
+ },
+/turf/open/floor/mineral/plastitanium/red,
+/area/misc/hilbertshotel)
+"Df" = (
+/obj/structure/railing/unbreakable,
+/turf/open/floor/iron/stairs/left{
+ dir = 4
+ },
+/area/misc/hilbertshotel)
+"Di" = (
+/obj/effect/turf_decal/skyrat_decals/syndicate/middle/middle,
+/turf/open/floor/mineral/plastitanium/red,
+/area/misc/hilbertshotel)
+"DR" = (
+/obj/effect/turf_decal/siding/dark_red,
+/obj/effect/turf_decal/trimline/yellow/filled/warning/corner,
+/obj/machinery/light/directional/south,
+/turf/open/indestructible/dark/textured{
+ icon_state = "engine"
+ },
+/area/misc/hilbertshotel)
+"Ek" = (
+/obj/structure/window/reinforced/survival_pod/spawner/directional/west,
+/obj/machinery/shuttle_manipulator,
+/turf/open/floor/mineral/plastitanium/red,
+/area/misc/hilbertshotel)
+"Ey" = (
+/obj/effect/turf_decal/siding/dark_red{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/dark_red{
+ dir = 8
+ },
+/obj/item/clothing/suit/armor/vest/capcarapace/syndicate,
+/turf/open/floor/wood/large,
+/area/misc/hilbertshotel)
+"EK" = (
+/turf/closed/indestructible/hoteldoor{
+ icon_state = "door_closed";
+ icon = 'icons/obj/doors/puzzledoor/default.dmi'
+ },
+/area/misc/hilbertshotel)
+"Ft" = (
+/obj/structure/window/reinforced/survival_pod/spawner/directional/east,
+/turf/open/floor/mineral/plastitanium/red,
+/area/misc/hilbertshotel)
+"FL" = (
+/obj/structure/table/reinforced/plastitaniumglass,
+/obj/machinery/syndicatebomb/training,
+/obj/item/wirecutters,
+/turf/open/floor/mineral/plastitanium/red,
+/area/misc/hilbertshotel)
+"FV" = (
+/obj/effect/turf_decal/siding/dark_red,
+/turf/open/indestructible/dark/textured{
+ icon_state = "engine"
+ },
+/area/misc/hilbertshotel)
+"Ge" = (
+/obj/effect/turf_decal/siding/dark_red,
+/obj/machinery/light/floor,
+/turf/open/indestructible/dark/textured{
+ icon_state = "engine"
+ },
+/area/misc/hilbertshotel)
+"GN" = (
+/obj/structure/table,
+/obj/item/flashlight/lamp{
+ pixel_x = -6;
+ pixel_y = 12
+ },
+/obj/item/restraints/handcuffs{
+ pixel_x = 6;
+ pixel_y = -2
+ },
+/turf/open/indestructible/dark/textured,
+/area/misc/hilbertshotel)
+"Hv" = (
+/obj/effect/turf_decal/trimline/dark_red/filled/line{
+ dir = 5
+ },
+/obj/structure/bed/maint,
+/obj/machinery/light/directional/north,
+/turf/open/indestructible/dark/textured,
+/area/misc/hilbertshotel)
+"HB" = (
+/obj/structure/bed/double,
+/obj/item/bedsheet/syndie/double,
+/turf/open/floor/carpet/royalblack,
+/area/misc/hilbertshotel)
+"HG" = (
+/obj/machinery/computer{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/dark_red{
+ dir = 4
+ },
+/obj/structure/window/reinforced/survival_pod/spawner/directional/south,
+/turf/open/indestructible/dark/textured{
+ icon_state = "rcircuit"
+ },
+/area/misc/hilbertshotel)
+"HJ" = (
+/obj/effect/turf_decal/siding/dark_red{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/dark_red/corner{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/yellow/filled/warning{
+ dir = 8
+ },
+/obj/structure/railing/corner/end/unbreakable{
+ dir = 8
+ },
+/turf/open/indestructible/dark/textured{
+ icon_state = "engine"
+ },
+/area/misc/hilbertshotel)
+"HN" = (
+/obj/effect/turf_decal/siding/thinplating_new/dark{
+ dir = 1
+ },
+/obj/item/kirbyplants/organic/plant22,
+/obj/machinery/light/directional/east,
+/obj/effect/turf_decal/trimline/dark_red/filled/end{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/thinplating_new/dark,
+/turf/open/indestructible/dark/textured,
+/area/misc/hilbertshotel)
+"Ia" = (
+/obj/effect/turf_decal/siding/dark_red/corner{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/dark_red/corner{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/yellow/filled/warning{
+ dir = 1
+ },
+/turf/open/indestructible/dark/textured{
+ icon_state = "engine"
+ },
+/area/misc/hilbertshotel)
+"Ir" = (
+/obj/effect/turf_decal/siding/dark_red{
+ dir = 8
+ },
+/obj/structure/showcase/cyborg{
+ desc = "A stand with the empty body of a Cybersun cyborg bolted to it.";
+ dir = 4;
+ icon = 'icons/mob/silicon/robots.dmi';
+ icon_state = "synd_sec";
+ name = "syndicate cyborg showcase";
+ pixel_x = -6
+ },
+/obj/effect/turf_decal/trimline/dark_red/filled/end{
+ dir = 1
+ },
+/turf/open/indestructible/dark/textured,
+/area/misc/hilbertshotel)
+"Is" = (
+/obj/effect/turf_decal/trimline/yellow/filled/warning,
+/turf/open/indestructible/dark/textured{
+ icon_state = "engine"
+ },
+/area/misc/hilbertshotel)
+"It" = (
+/obj/effect/turf_decal/skyrat_decals/syndicate/top/right,
+/obj/effect/turf_decal/siding/thinplating_new/dark{
+ dir = 4
+ },
+/turf/open/floor/mineral/plastitanium/red,
+/area/misc/hilbertshotel)
+"IB" = (
+/turf/closed/indestructible/fakedoor{
+ name = "Staff Dormitories"
+ },
+/area/misc/hilbertshotel)
+"Jf" = (
+/obj/effect/turf_decal/tile/neutral/opposingcorners,
+/obj/machinery/door/airlock/grunge{
+ name = "Social Room"
+ },
+/turf/open/indestructible/dark/textured,
+/area/misc/hilbertshotel)
+"Jh" = (
+/obj/machinery/shuttle_manipulator,
+/turf/open/floor/mineral/plastitanium/red,
+/area/misc/hilbertshotel)
+"Jx" = (
+/obj/effect/turf_decal/skyrat_decals/syndicate/middle/right,
+/obj/effect/turf_decal/siding/thinplating_new/dark{
+ dir = 4
+ },
+/turf/open/floor/mineral/plastitanium/red,
+/area/misc/hilbertshotel)
+"JI" = (
+/obj/structure/sign/poster/contraband/random/directional/west,
+/obj/structure/table/reinforced/plastitaniumglass,
+/obj/item/restraints/handcuffs,
+/turf/open/floor/mineral/plastitanium/red,
+/area/misc/hilbertshotel)
+"JK" = (
+/obj/machinery/light/small/directional/south,
+/turf/open/indestructible/dark/textured,
+/area/misc/hilbertshotel)
+"JS" = (
+/obj/structure/railing/unbreakable{
+ dir = 1
+ },
+/obj/effect/turf_decal/arrows/red{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/yellow/filled/warning{
+ dir = 8
+ },
+/obj/machinery/elevator_control_panel/directional/west{
+ pixel_y = 28;
+ pixel_x = -26
+ },
+/turf/open/indestructible/dark/textured,
+/area/misc/hilbertshotel)
+"KK" = (
+/obj/effect/turf_decal/siding/dark_red{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/yellow/filled/warning{
+ dir = 8
+ },
+/obj/machinery/light/floor,
+/turf/open/indestructible/dark/textured{
+ icon_state = "engine"
+ },
+/area/misc/hilbertshotel)
+"KX" = (
+/obj/effect/turf_decal/skyrat_decals/syndicate/top/left,
+/obj/effect/turf_decal/siding/thinplating_new/dark{
+ dir = 8
+ },
+/turf/open/floor/mineral/plastitanium/red,
+/area/misc/hilbertshotel)
+"Lp" = (
+/obj/effect/turf_decal/skyrat_decals/syndicate/middle/left,
+/obj/structure/chair/comfy/shuttle/tactical{
+ dir = 8
+ },
+/turf/open/floor/mineral/plastitanium/red,
+/area/misc/hilbertshotel)
+"Lu" = (
+/obj/effect/turf_decal/siding/dark_red{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/yellow/filled/warning/corner{
+ dir = 4
+ },
+/turf/open/indestructible/dark/textured{
+ icon_state = "engine"
+ },
+/area/misc/hilbertshotel)
+"Mq" = (
+/obj/machinery/computer,
+/obj/effect/turf_decal/siding/dark_red{
+ dir = 8
+ },
+/obj/structure/window/reinforced/survival_pod/spawner/directional/north,
+/turf/open/indestructible/dark/textured{
+ icon_state = "rcircuit"
+ },
+/area/misc/hilbertshotel)
+"MH" = (
+/obj/effect/turf_decal/siding/dark_red/corner{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/yellow/filled/warning,
+/turf/open/indestructible/dark/textured{
+ icon_state = "engine"
+ },
+/area/misc/hilbertshotel)
+"NI" = (
+/obj/structure/chair/office/tactical,
+/obj/effect/turf_decal/siding/dark_red,
+/turf/open/indestructible/dark/textured{
+ icon_state = "engine"
+ },
+/area/misc/hilbertshotel)
+"NZ" = (
+/obj/effect/turf_decal/tile/neutral/opposingcorners,
+/obj/structure/reagent_dispensers/water_cooler,
+/turf/open/indestructible/dark/textured,
+/area/misc/hilbertshotel)
+"Ob" = (
+/obj/effect/turf_decal/siding/dark_red/corner{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/dark_red/corner{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/yellow/filled/warning{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/dark_red/corner,
+/obj/structure/railing/corner/unbreakable,
+/turf/open/indestructible/dark/textured{
+ icon_state = "engine"
+ },
+/area/misc/hilbertshotel)
+"OA" = (
+/obj/structure/chair/plastic{
+ dir = 8
+ },
+/obj/effect/decal/cleanable/blood/old,
+/turf/open/indestructible/dark/textured,
+/area/misc/hilbertshotel)
+"Pf" = (
+/turf/open/floor/iron/stairs,
+/area/misc/hilbertshotel)
+"Pj" = (
+/obj/effect/turf_decal/siding/dark_red{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/dark_red{
+ dir = 4
+ },
+/turf/open/floor/mineral/plastitanium,
+/area/misc/hilbertshotel)
+"Qv" = (
+/obj/structure/table/reinforced/plastitaniumglass,
+/obj/effect/turf_decal/siding/thinplating_new/dark,
+/obj/item/toy/figure/syndie{
+ pixel_x = 9;
+ pixel_y = 13
+ },
+/obj/item/toy/mecha/seraph{
+ pixel_x = -3;
+ pixel_y = 18
+ },
+/obj/item/toy/figure/syndie{
+ pixel_x = 9;
+ pixel_y = 3
+ },
+/turf/open/indestructible/dark/textured,
+/area/misc/hilbertshotel)
+"QX" = (
+/obj/effect/turf_decal/siding/thinplating_new/dark{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/dark_red/filled/line,
+/obj/effect/turf_decal/trimline/dark_red/filled/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/thinplating_new/dark,
+/turf/open/indestructible/dark/textured,
+/area/misc/hilbertshotel)
+"Ry" = (
+/obj/structure/table/reinforced/plastitaniumglass,
+/obj/machinery/light/directional/west,
+/obj/item/toy/mecha/mauler{
+ pixel_y = 16
+ },
+/obj/item/toy/figure/syndie{
+ pixel_x = 8;
+ pixel_y = 3
+ },
+/obj/item/toy/figure/syndie{
+ pixel_x = 9;
+ pixel_y = -7
+ },
+/turf/open/indestructible/dark/textured,
+/area/misc/hilbertshotel)
+"RH" = (
+/obj/effect/turf_decal/skyrat_decals/syndicate/top/right,
+/turf/open/floor/mineral/plastitanium/red,
+/area/misc/hilbertshotel)
+"RN" = (
+/obj/effect/turf_decal/skyrat_decals/syndicate/middle/middle,
+/obj/machinery/light/floor,
+/turf/open/floor/mineral/plastitanium/red,
+/area/misc/hilbertshotel)
+"RP" = (
+/obj/effect/turf_decal/siding/dark_red{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/dark_red/corner{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/yellow/filled/warning{
+ dir = 8
+ },
+/obj/structure/railing/corner/end/flip{
+ dir = 8
+ },
+/turf/open/indestructible/dark/textured{
+ icon_state = "engine"
+ },
+/area/misc/hilbertshotel)
+"Sm" = (
+/obj/effect/turf_decal/siding/thinplating_new/dark,
+/obj/item/kirbyplants/organic/plant22,
+/obj/machinery/light/directional/east,
+/obj/effect/turf_decal/trimline/dark_red/filled/end{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/thinplating_new/dark{
+ dir = 1
+ },
+/turf/open/indestructible/dark/textured,
+/area/misc/hilbertshotel)
+"SW" = (
+/obj/structure/table/reinforced/plastitaniumglass,
+/obj/effect/turf_decal/siding/thinplating_new/dark{
+ dir = 1
+ },
+/obj/structure/sign/warning/directional/west,
+/obj/item/toy/nuke{
+ pixel_y = 7;
+ name = "Model Nuclear Warhead";
+ desc = "This is a model of the famous Gorlex Marauders nuclear warhead. 'Some call it nuclear terrorism. We call it solutions'";
+ pixel_x = 1
+ },
+/obj/item/disk/nuclear/fake/obvious{
+ pixel_y = -8;
+ pixel_x = -3
+ },
+/turf/open/indestructible/dark/textured,
+/area/misc/hilbertshotel)
+"Tb" = (
+/obj/effect/turf_decal/siding/dark_red{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/dark_red{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/yellow/filled/warning/corner{
+ dir = 4
+ },
+/turf/open/indestructible/dark/textured{
+ icon_state = "engine"
+ },
+/area/misc/hilbertshotel)
+"Uk" = (
+/obj/structure/chair/office/tactical{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/dark_red{
+ dir = 1
+ },
+/turf/open/indestructible/dark/textured{
+ icon_state = "engine"
+ },
+/area/misc/hilbertshotel)
+"Vp" = (
+/obj/effect/turf_decal/tile/neutral/opposingcorners,
+/obj/item/kirbyplants/organic/plant21,
+/obj/structure/sign/poster/contraband/random/directional/south,
+/turf/open/indestructible/dark/textured,
+/area/misc/hilbertshotel)
+"VM" = (
+/obj/effect/turf_decal/skyrat_decals/syndicate/bottom/left,
+/obj/effect/turf_decal/siding/thinplating_new/dark{
+ dir = 8
+ },
+/turf/open/floor/mineral/plastitanium/red,
+/area/misc/hilbertshotel)
+"Wi" = (
+/obj/effect/spawner/structure/window/reinforced/tinted,
+/turf/open/indestructible/dark/textured{
+ icon_state = "engine"
+ },
+/area/misc/hilbertshotel)
+"WV" = (
+/obj/effect/turf_decal/skyrat_decals/syndicate/bottom/left,
+/obj/structure/railing/corner/end/flip{
+ dir = 8
+ },
+/turf/open/floor/mineral/plastitanium/red,
+/area/misc/hilbertshotel)
+"Yo" = (
+/obj/effect/turf_decal/trimline/yellow/filled/warning/corner{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/dark_red{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/yellow/filled/warning,
+/obj/structure/sign/warning/no_smoking/directional/east,
+/obj/structure/railing/corner/unbreakable{
+ dir = 4
+ },
+/turf/open/indestructible/dark/textured{
+ icon_state = "engine"
+ },
+/area/misc/hilbertshotel)
+"Yz" = (
+/obj/effect/turf_decal/skyrat_decals/syndicate/top/middle,
+/turf/open/floor/mineral/plastitanium/red,
+/area/misc/hilbertshotel)
+"YG" = (
+/obj/effect/turf_decal/siding/dark_red{
+ dir = 10
+ },
+/turf/open/indestructible/dark/textured{
+ icon_state = "engine"
+ },
+/area/misc/hilbertshotel)
+"Za" = (
+/obj/machinery/vending/wardrobe/syndie_wardrobe/ghost_cafe,
+/obj/effect/turf_decal/delivery,
+/turf/open/floor/mineral/plastitanium/red,
+/area/misc/hilbertshotel)
+"Zk" = (
+/obj/structure/table/wood/fancy/red,
+/obj/structure/sign/clock/directional/east,
+/obj/item/reagent_containers/cup/maunamug{
+ pixel_x = 6;
+ pixel_y = 10
+ },
+/obj/item/sign/flag/syndicate{
+ pixel_y = 1
+ },
+/turf/open/floor/carpet/royalblack,
+/area/misc/hilbertshotel)
+"Zt" = (
+/obj/structure/sign/poster/contraband/random/directional/west,
+/obj/structure/chair{
+ dir = 4
+ },
+/turf/open/indestructible/dark/textured,
+/area/misc/hilbertshotel)
+"ZG" = (
+/turf/open/floor/iron/stairs/medium{
+ dir = 1
+ },
+/area/misc/hilbertshotel)
+
+(1,1,1) = {"
+ga
+ga
+ga
+ga
+ga
+ga
+pg
+EK
+pg
+ga
+ga
+ga
+ga
+ga
+ga
+ga
+"}
+(2,1,1) = {"
+ga
+jd
+jy
+ga
+Ry
+Qv
+JS
+yn
+nd
+SW
+ku
+qB
+cH
+JI
+FL
+ga
+"}
+(3,1,1) = {"
+ga
+Hv
+Ae
+ga
+rq
+CG
+rl
+iE
+Df
+in
+ac
+qB
+Pj
+wV
+mV
+ga
+"}
+(4,1,1) = {"
+ga
+qB
+CB
+ga
+pZ
+xh
+HJ
+KK
+RP
+rp
+YG
+qB
+oH
+of
+hN
+ga
+"}
+(5,1,1) = {"
+ga
+nY
+YG
+qB
+Lu
+NI
+me
+Ek
+pB
+Uk
+FV
+qB
+Za
+of
+jO
+ga
+"}
+(6,1,1) = {"
+ga
+Ad
+um
+Pf
+Ia
+NI
+HG
+aD
+xl
+Uk
+hM
+ga
+qB
+Bq
+qB
+ga
+"}
+(7,1,1) = {"
+ga
+ga
+hz
+ga
+fU
+Ge
+hg
+pH
+BT
+tM
+DR
+ga
+Ir
+aB
+kO
+ga
+"}
+(8,1,1) = {"
+ga
+Zt
+JK
+ga
+Ak
+NI
+lz
+Jh
+Mq
+Uk
+MH
+qX
+KX
+Db
+VM
+qB
+"}
+(9,1,1) = {"
+ga
+GN
+ac
+Wi
+Ak
+NI
+me
+Ft
+pB
+Uk
+Is
+ZG
+Yz
+RN
+Aj
+IB
+"}
+(10,1,1) = {"
+ga
+OA
+ac
+ga
+rA
+we
+Tb
+pr
+lO
+Ob
+Yo
+kQ
+It
+Jx
+og
+qB
+"}
+(11,1,1) = {"
+ga
+ga
+ga
+ga
+ga
+hL
+tV
+ii
+eq
+ho
+ga
+ga
+qB
+Jf
+qB
+ga
+"}
+(12,1,1) = {"
+ga
+gZ
+BX
+kv
+ga
+eZ
+sg
+Lp
+WV
+CL
+qB
+vr
+NZ
+ia
+Vp
+ga
+"}
+(13,1,1) = {"
+ga
+Ey
+pF
+lU
+jQ
+wS
+Yz
+Di
+Aj
+QX
+Jf
+ia
+ia
+ia
+vH
+ga
+"}
+(14,1,1) = {"
+ga
+cn
+HB
+Zk
+ga
+Sm
+RH
+mD
+qC
+HN
+qB
+CH
+at
+jv
+im
+ga
+"}
+(15,1,1) = {"
+ga
+ga
+ga
+ga
+ga
+ga
+pg
+pg
+pg
+ga
+ga
+ga
+ga
+ga
+ga
+ga
+"}
diff --git a/modular_skyrat/modules/kahraman_equipment/code/clothing/clothing.dm b/modular_skyrat/modules/kahraman_equipment/code/clothing/clothing.dm
index cebd41bb335..99538044825 100644
--- a/modular_skyrat/modules/kahraman_equipment/code/clothing/clothing.dm
+++ b/modular_skyrat/modules/kahraman_equipment/code/clothing/clothing.dm
@@ -212,3 +212,35 @@
/obj/item/clothing/mask/gas/atmos/frontier_colonist/Initialize(mapload)
. = ..()
AddElement(/datum/element/manufacturer_examine, COMPANY_KAHRAMAN)
+
+//// Loadout variant
+// suit
+/obj/item/clothing/suit/jacket/frontier_colonist/loadout
+ armor_type = /datum/armor/none
+
+/obj/item/clothing/suit/jacket/frontier_colonist/loadout/Initialize(mapload)
+ . = ..()
+ allowed = list()
+
+/obj/item/clothing/suit/jacket/frontier_colonist/short/loadout
+ armor_type = /datum/armor/none
+
+/obj/item/clothing/suit/jacket/frontier_colonist/short/loadout/Initialize(mapload)
+ . = ..()
+ allowed = list()
+
+// Gloves
+/obj/item/clothing/gloves/frontier_colonist/loadout
+ siemens_coefficient = 0.50
+
+// boots
+/obj/item/clothing/shoes/jackboots/frontier_colonist/loadout
+ name = "frontier jackboots"
+ armor_type = /datum/armor/shoes_jackboots
+
+// mask
+/obj/item/clothing/mask/gas/atmos/frontier_colonist/loadout
+ armor_type = /datum/armor/mask_gas
+ resistance_flags = NONE
+ max_filters = 1
+
diff --git a/modular_skyrat/modules/magfed_turret/code/turret_framework.dm b/modular_skyrat/modules/magfed_turret/code/turret_framework.dm
index cf1e09d1de3..f702ed23a8c 100644
--- a/modular_skyrat/modules/magfed_turret/code/turret_framework.dm
+++ b/modular_skyrat/modules/magfed_turret/code/turret_framework.dm
@@ -813,7 +813,7 @@
fire_sound = 'modular_skyrat/modules/modular_weapons/sounds/pistol_light.ogg'
else if(istype(soundmaker, /obj/item/ammo_casing/c585trappiste))
fire_sound = 'modular_skyrat/modules/modular_weapons/sounds/pistol_heavy.ogg'
- else if(istype(soundmaker, /obj/item/ammo_casing/c40sol))
+ else if(istype(soundmaker, /obj/item/ammo_casing/c46x30mm))
fire_sound = 'modular_skyrat/modules/modular_weapons/sounds/rifle_heavy.ogg'
else if(istype(soundmaker, /obj/item/ammo_casing/strilka310))
fire_sound = 'modular_skyrat/modules/modular_weapons/sounds/battle_rifle.ogg'
diff --git a/modular_skyrat/modules/magfed_turret/code/turrets/ruins.dm b/modular_skyrat/modules/magfed_turret/code/turrets/ruins.dm
index 807b3a31136..2b5435f1008 100644
--- a/modular_skyrat/modules/magfed_turret/code/turrets/ruins.dm
+++ b/modular_skyrat/modules/magfed_turret/code/turrets/ruins.dm
@@ -10,12 +10,12 @@
turret_type = /obj/machinery/porta_turret/syndicate/toolbox/mag_fed/outpost
mag_slots = 2
mag_types_allowed = list(
- /obj/item/ammo_box/magazine/c40sol_rifle
+ /obj/item/ammo_box/magazine/wt550m9
)
/obj/item/storage/toolbox/emergency/turret/mag_fed/outpost/pre_filled/PopulateContents()
- new /obj/item/ammo_box/magazine/c40sol_rifle(src)
- new /obj/item/ammo_box/magazine/c40sol_rifle(src)
+ new /obj/item/ammo_box/magazine/wt550m9(src)
+ new /obj/item/ammo_box/magazine/wt550m9(src)
/obj/machinery/porta_turret/syndicate/toolbox/mag_fed/outpost
name = "\improper Outpost Point-Defense Turret"
@@ -39,7 +39,7 @@
/obj/item/storage/toolbox/emergency/turret/mag_fed/colonist
name = "colonist defense turret kit"
- desc = "A deployable turret designed for safety during colony construction and colonist expeditionary camps. It is chambered to fire .40 Sol ammunition"
+ desc = "A deployable turret designed for safety during colony construction and colonist expeditionary camps. It is chambered to fire .460 ammunition"
icon = 'modular_skyrat/modules/magfed_turret/icons/turrets/ruins.dmi'
icon_state = "colonist_toolbox"
righthand_file = 'modular_skyrat/modules/magfed_turret/icons/inhands/righthand.dmi'
@@ -50,17 +50,17 @@
easy_deploy = TRUE
turret_safety = TRUE
mag_types_allowed = list(
- /obj/item/ammo_box/magazine/c40sol_rifle,
+ /obj/item/ammo_box/magazine/m45, // Most similar to sol40
)
/obj/item/storage/toolbox/emergency/turret/mag_fed/colonist/pre_filled/PopulateContents()
- new /obj/item/ammo_box/magazine/c40sol_rifle(src)
- new /obj/item/ammo_box/magazine/c40sol_rifle(src)
+ new /obj/item/ammo_box/magazine/m45(src)
+ new /obj/item/ammo_box/magazine/m45(src)
/obj/machinery/porta_turret/syndicate/toolbox/mag_fed/colonist
name = "\improper Colonist Point-Defense Turret"
- desc = "A deployable turret used for protection of colonists during construction or expeditionary trips. It is chambered to fire .40 Sol ammunition."
- max_integrity = 150 //bit more health since it's ment for mobs only. Malf version is one of a kind to use.
+ desc = "A deployable turret used for protection of colonists during construction or expeditionary trips. It is chambered to fire .460 ammunition"
+ max_integrity = 150 //bit more health since it's meant for mobs only. Malf version is one of a kind to use.
icon = 'modular_skyrat/modules/magfed_turret/icons/turrets/ruins.dmi'
icon_state = "colonist_off"
base_icon_state = "colonist"
@@ -78,7 +78,7 @@
/obj/item/storage/toolbox/emergency/turret/mag_fed/spider
name = "spider offensive turret capsule"
- desc = "A throw-deployable turret capsule designed for securing areas within hostile fauna held zones. It is chambered in .35 Sol ammunition."
+ desc = "A throw-deployable turret capsule designed for securing areas within hostile fauna held zones. It is chambered in 4.6x30mm ammunition."
icon = 'modular_skyrat/modules/magfed_turret/icons/turrets/ruins.dmi'
icon_state = "35_spider_toolbox"
inhand_icon_state = "smoke" //I dont want to squash-make something. This should cover until i work something.
@@ -92,15 +92,15 @@
mag_slots = 1
turret_safety = TRUE
mag_types_allowed = list(
- /obj/item/ammo_box/magazine/c35sol_pistol,
+ /obj/item/ammo_box/magazine/wt550m9, //same damage value as 35 sol, since it's unprintable
)
/obj/item/storage/toolbox/emergency/turret/mag_fed/spider/pre_filled/PopulateContents()
- new /obj/item/ammo_box/magazine/c35sol_pistol(src)
+ new /obj/item/ammo_box/magazine/wt550m9(src)
/obj/machinery/porta_turret/syndicate/toolbox/mag_fed/spider
name = "\improper Stinger Spider Turret"
- desc = "A deployable turret used for aggressive expansion and zone defense. It is chambered to fire .35 Sol ammunition."
+ desc = "A deployable turret used for aggressive expansion and zone defense. It is chambered to fire 4.6x30mm ammunition."
max_integrity = 80
icon = 'modular_skyrat/modules/magfed_turret/icons/turrets/ruins.dmi'
icon_state = "35_spider_off"
@@ -116,32 +116,32 @@
/obj/item/storage/toolbox/emergency/turret/mag_fed/spider/malf
name = "odd spider turret kit"
- desc = "A deployable turret kit used for aggressive expansion and zone defense. It is chambered to fire .35 Sol ammunition. This one seems to have some odd lights flashing on it."
+ desc = "A deployable turret kit used for aggressive expansion and zone defense. It is chambered to fire 4.6x30mm ammunition. This one seems to have some odd lights flashing on it."
turret_type = /obj/machinery/porta_turret/syndicate/toolbox/mag_fed/spider/malf
/obj/item/storage/toolbox/emergency/turret/mag_fed/spider/malf/pre_filled/PopulateContents()
- new /obj/item/ammo_box/magazine/c35sol_pistol(src)
+ new /obj/item/ammo_box/magazine/wt550m9(src)
-////// Twin-Fang turret. Spider Turret's nastier cousin. Slightly less durable but more vitriol. Chambered in .27-54
+////// Twin-Fang turret. Spider Turret's nastier cousin. Slightly less durable but more vitriol. Chambered in 4.6x30mm
/obj/item/storage/toolbox/emergency/turret/mag_fed/spider/twin_fang
name = "twin-fang offensive turret capsule"
- desc = "A throw-deployable turret capsule designed for securing areas within hostile fauna held zones. It is chambered in .27-54 Cesarzowa ammunition."
+ desc = "A throw-deployable turret capsule designed for securing areas within hostile fauna held zones. It is chambered in 4.6x30mm ammunition."
icon = 'modular_skyrat/modules/magfed_turret/icons/turrets/ruins.dmi'
icon_state = "twin_spider_toolbox"
turret_type = /obj/machinery/porta_turret/syndicate/toolbox/mag_fed/spider/twin_fang
mag_slots = 1
turret_safety = FALSE
mag_types_allowed = list(
- /obj/item/ammo_box/magazine/miecz,
+ /obj/item/ammo_box/magazine/wt550m9,
)
/obj/item/storage/toolbox/emergency/turret/mag_fed/spider/twin_fang/pre_filled/PopulateContents()
- new /obj/item/ammo_box/magazine/miecz(src)
+ new /obj/item/ammo_box/magazine/wt550m9(src)
/obj/machinery/porta_turret/syndicate/toolbox/mag_fed/spider/twin_fang
name = "\improper Twin-Fang Spider Turret"
- desc = "A deployable turret used for aggressive expansion and zone defense. It is chambered to fire .27-54 Cesarzowa ammunition."
+ desc = "A deployable turret used for aggressive expansion and zone defense. It is chambered to fire 4.6x30mm ammunition."
max_integrity = 50 // more aggressive but obviously easier to deal with.
icon = 'modular_skyrat/modules/magfed_turret/icons/turrets/ruins.dmi'
icon_state = "twin_spider_off"
@@ -151,7 +151,7 @@
quick_retract = TRUE
shot_delay = 0.1 SECONDS
burst_fire = TRUE
- burst_delay = 1.5 SECONDS
+ burst_delay = 2 SECONDS // Keeping the DPS exactly the same with sol35 removal
burst_volley = 2
faction = list(FACTION_TURRET)
mag_box_type = /obj/item/storage/toolbox/emergency/turret/mag_fed/spider/twin_fang/pre_filled
@@ -163,11 +163,11 @@
/obj/item/storage/toolbox/emergency/turret/mag_fed/spider/twin_fang/malf
name = "odd twinfang turret kit"
- desc = "A throw-deployable turret capsule designed for securing areas within hostile fauna held zones. It is chambered in .27-54 Cesarzowa ammunition. This one seems to have some odd lights flashing on it."
+ desc = "A throw-deployable turret capsule designed for securing areas within hostile fauna held zones. It is chambered in .4.6x30mm ammunition. This one seems to have some odd lights flashing on it."
turret_type = /obj/machinery/porta_turret/syndicate/toolbox/mag_fed/spider/twin_fang/malf
/obj/item/storage/toolbox/emergency/turret/mag_fed/spider/twin_fang/malf/pre_filled/PopulateContents()
- new /obj/item/ammo_box/magazine/miecz(src)
+ new /obj/item/ammo_box/magazine/wt550m9(src)
////// Shotgun Turret. Surprisingly nothing new added as the firing proc will handle pellet clouds. Note however that shotgun rounds CANT smart-gun around allies.
/obj/item/storage/toolbox/emergency/turret/mag_fed/duster
diff --git a/modular_skyrat/modules/mapping/code/lockers/cargodiselost/cargodiselockers.dm b/modular_skyrat/modules/mapping/code/lockers/cargodiselost/cargodiselockers.dm
index 03aa2bd1c22..02dd7588e84 100644
--- a/modular_skyrat/modules/mapping/code/lockers/cargodiselost/cargodiselockers.dm
+++ b/modular_skyrat/modules/mapping/code/lockers/cargodiselost/cargodiselockers.dm
@@ -25,7 +25,7 @@
/obj/structure/closet/secure_closet/personal/cabinet/freighterboss/PopulateContents()
. = ..()
- new /obj/item/gun/ballistic/automatic/sol_rifle/marksman(src)
+ new /obj/item/gun/ballistic/automatic/wt550(src)
new /obj/item/storage/pouch/ammo(src)
new /obj/item/clothing/suit/armor/bulletproof(src)
new /obj/item/storage/belt/utility/syndicate(src)
@@ -33,6 +33,6 @@
new /obj/item/clothing/gloves/combat(src)
new /obj/item/storage/backpack/duffelbag/syndie(src)
new /obj/item/radio(src)
- new /obj/item/ammo_box/magazine/c40sol_rifle(src)
- new /obj/item/ammo_box/magazine/c40sol_rifle(src)
- new /obj/item/ammo_box/magazine/c40sol_rifle(src)
+ new /obj/item/ammo_box/magazine/wt550m9(src)
+ new /obj/item/ammo_box/magazine/wt550m9(src)
+ new /obj/item/ammo_box/magazine/wt550m9(src)
diff --git a/modular_skyrat/modules/mapping/code/lockers/interdyne_fob/security.dm b/modular_skyrat/modules/mapping/code/lockers/interdyne_fob/security.dm
index f5469d7a87e..1d1cfc52053 100644
--- a/modular_skyrat/modules/mapping/code/lockers/interdyne_fob/security.dm
+++ b/modular_skyrat/modules/mapping/code/lockers/interdyne_fob/security.dm
@@ -79,8 +79,8 @@
/obj/item/ammo_box/magazine/c35sol_pistol = 6,
/obj/item/ammo_box/magazine/c35sol_pistol/stendo = 2,
/obj/item/ammo_box/c35sol = 2,
- /obj/item/ammo_box/magazine/c40sol_rifle/standard = 2,
- /obj/item/ammo_box/c40sol = 2,
+ /obj/item/ammo_box/magazine/wt550m9 = 2,
+ /obj/item/ammo_box/magazine/wt550m9/wtap = 2,
/obj/item/ammo_box/advanced/s12gauge = 2,
/obj/item/ammo_box/advanced/s12gauge/rubber = 2,
),src)
diff --git a/modular_skyrat/modules/microfusion/code/_microfusion_defines.dm b/modular_skyrat/modules/microfusion/code/_microfusion_defines.dm
deleted file mode 100644
index d130ad30829..00000000000
--- a/modular_skyrat/modules/microfusion/code/_microfusion_defines.dm
+++ /dev/null
@@ -1,16 +0,0 @@
-/// Returned when the phase emtiter process is successful.
-#define SHOT_SUCCESS "success"
-/// Returned when a gun is fired but there is no phase emitter.
-#define SHOT_FAILURE_NO_EMITTER "no phase emitter!"
-
-// Slot defines for the gun.
-/// The gun barrel slot.
-#define GUN_SLOT_BARREL "barrel"
-/// The gun underbarrel slot.
-#define GUN_SLOT_UNDERBARREL "underbarrel"
-/// The gun rail slot.
-#define GUN_SLOT_RAIL "rail"
-/// Unique slots, can hold as many as you want.
-#define GUN_SLOT_UNIQUE "unique"
-/// Camo slot. Because why would you put four overlapping camos on your gun?
-#define GUN_SLOT_CAMO "camo"
diff --git a/modular_skyrat/modules/microfusion/code/cargo_stuff.dm b/modular_skyrat/modules/microfusion/code/cargo_stuff.dm
deleted file mode 100644
index 319b756876d..00000000000
--- a/modular_skyrat/modules/microfusion/code/cargo_stuff.dm
+++ /dev/null
@@ -1,72 +0,0 @@
-/datum/supply_pack/security/armory/mcr01
- name = "MCR-01 Microfusion Crate"
- desc = "Micron Control Systems Incorporated supplied MCR-01 Microfusion weapons platform. Comes with 4 advanced guns!"
- cost = CARGO_CRATE_VALUE * 20
- contains = list(
- /obj/item/gun/microfusion/mcr01/advanced,
- /obj/item/gun/microfusion/mcr01/advanced,
- /obj/item/gun/microfusion/mcr01/advanced,
- /obj/item/gun/microfusion/mcr01/advanced,
- )
- crate_name = "MCR-01 Microfusion Crate"
-
-/datum/supply_pack/security/microfusion
- name = "Assorted Microfusion Upgrade Crate"
- desc = "Micron Control Systems Incorporated supplied Microfusion cells and emitters!"
- cost = CARGO_CRATE_VALUE * 5
- contains = list(
- /obj/item/microfusion_phase_emitter/advanced,
- /obj/item/microfusion_phase_emitter/advanced,
- /obj/item/stock_parts/power_store/cell/microfusion/advanced,
- /obj/item/stock_parts/power_store/cell/microfusion/advanced,
- )
- crate_name = "Microfusion Upgrade Crate"
-
-/datum/supply_pack/security/mcr01_attachments_a
- name = "MCR-01 Military Attachments Crate Type A"
- desc = "Micron Control Systems Incorporated supplied MCR-01 Military spec attachments! This crate comes with two utilitarian repeater loadout."
- cost = CARGO_CRATE_VALUE * 14
- contains = list(
- /obj/item/microfusion_gun_attachment/grip,
- /obj/item/microfusion_gun_attachment/grip,
- /obj/item/microfusion_gun_attachment/rail,
- /obj/item/microfusion_gun_attachment/rail,
- /obj/item/microfusion_gun_attachment/barrel/repeater,
- /obj/item/microfusion_gun_attachment/barrel/repeater,
- )
- crate_name = "MCR-01 Military Attachments Crate Type A"
-
-/datum/supply_pack/security/mcr01_attachments_type_b
- name = "MCR-01 Military Attachments Crate Type B"
- desc = "Micron Control Systems Incorporated supplied MCR-01 Military spec attachments! This crate comes in a mixed specialist loadout."
- cost = CARGO_CRATE_VALUE * 16
- contains = list(
- /obj/item/microfusion_gun_attachment/grip,
- /obj/item/microfusion_gun_attachment/grip,
- /obj/item/microfusion_gun_attachment/grip,
- /obj/item/microfusion_gun_attachment/barrel/scatter,
- /obj/item/microfusion_gun_attachment/barrel/scatter,
- /obj/item/microfusion_gun_attachment/barrel/scatter,
- /obj/item/microfusion_gun_attachment/scope,
- /obj/item/microfusion_gun_attachment/barrel/lance,
- )
- crate_name = "MCR-01 Military Attachments Crate Type B"
-
-
-/datum/supply_pack/security/mcr01_attachments_h
- name = "HCR-01 Military Attachments Crate Type H"
- desc = "Honkicron Clownery Systems Inhonkorated supplied HCR-01 Clownery spec attachments! This crate oddly smells of bananas."
- cost = CARGO_CRATE_VALUE * 20
- contraband = TRUE
- contains = list(
- /obj/item/microfusion_gun_attachment/barrel/honk,
- /obj/item/microfusion_gun_attachment/barrel/honk,
- /obj/item/microfusion_gun_attachment/barrel/honk,
- /obj/item/microfusion_gun_attachment/camo/honk,
- /obj/item/microfusion_gun_attachment/camo/honk,
- /obj/item/microfusion_gun_attachment/camo/honk,
- /obj/item/food/pie/cream,
- /obj/item/food/pie/cream,
- /obj/item/food/pie/cream,
- )
- crate_name = "MCR-01 Military Attachments Crate Type H"
diff --git a/modular_skyrat/modules/microfusion/code/gun_types.dm b/modular_skyrat/modules/microfusion/code/gun_types.dm
deleted file mode 100644
index 4e48eb334f3..00000000000
--- a/modular_skyrat/modules/microfusion/code/gun_types.dm
+++ /dev/null
@@ -1,77 +0,0 @@
-/obj/item/gun/microfusion/mcr01
- name = "MCR-01"
- desc = "An advanced, modular energy weapon produced by Micron Control Systems. \
- These cutting edge weapons differ from traditional beam weaponry in producing \
- individual bolts, as well as being customizable to the user's preferences."
- icon_state = "mcr01"
- inhand_icon_state = "mcr01"
- shaded_charge = TRUE
-
-/obj/item/gun/microfusion/mcr01/give_manufacturer_examine()
- AddElement(/datum/element/manufacturer_examine, COMPANY_MICRON)
-
-/// Gun for cargo crates.
-/obj/item/gun/microfusion/mcr01/advanced
- name = "advanced MCR-01"
- cell_type = /obj/item/stock_parts/power_store/cell/microfusion/advanced
- phase_emitter_type = /obj/item/microfusion_phase_emitter/advanced
-
-
-/obj/item/gun/microfusion/mcr01/nanocarbon
- name = "Nanocarbon Destroyer"
- desc = "The pinnacle of the Nanocarbon weapon line. This weapon is the ultimate in power and performance. It is capable of firing a wide variety of beams, including a wide range of energy types, and is capable of firing a wide variety of frequencies."
- icon_state = "mcr01"
- inhand_icon_state = "mcr01"
- shaded_charge = TRUE
- phase_emitter_type = /obj/item/microfusion_phase_emitter/nanocarbon
- cell_type = /obj/item/stock_parts/power_store/cell/microfusion/nanocarbon
- attachments = list(
- /obj/item/microfusion_gun_attachment/barrel/pulse,
- /obj/item/microfusion_gun_attachment/grip,
- /obj/item/microfusion_gun_attachment/rail,
- /obj/item/microfusion_gun_attachment/camo,
- )
-
-//For syndicate uplink.
-/obj/item/gun/microfusion/mcr01/syndie
- name = "SCR-01"
- desc = "A Syndicate brand copy of the MCR-01. It comes with a proprietary suppressor and some tactical attachments."
- cell_type = /obj/item/stock_parts/power_store/cell/microfusion/advanced
- phase_emitter_type = /obj/item/microfusion_phase_emitter/advanced
- attachments = list(
- /obj/item/microfusion_gun_attachment/barrel/suppressor,
- /obj/item/microfusion_gun_attachment/grip,
- /obj/item/microfusion_gun_attachment/rail,
- /obj/item/microfusion_gun_attachment/camo/syndicate,
- )
-
-
-/obj/item/storage/box/ammo_box/microfusion/advanced
- name = "advanced microfusion cell container"
- desc = "A box filled with microfusion cells."
-
-/obj/item/storage/box/ammo_box/microfusion/advanced/PopulateContents()
- new /obj/item/storage/pouch/ammo(src)
- new /obj/item/stock_parts/power_store/cell/microfusion/advanced(src)
- new /obj/item/stock_parts/power_store/cell/microfusion/advanced(src)
- new /obj/item/stock_parts/power_store/cell/microfusion/advanced(src)
-
-/obj/item/storage/box/ammo_box/microfusion/advanced/bagless
-
-/obj/item/storage/box/ammo_box/microfusion/advanced/bagless/PopulateContents()
- new /obj/item/stock_parts/power_store/cell/microfusion/advanced(src)
- new /obj/item/stock_parts/power_store/cell/microfusion/advanced(src)
- new /obj/item/stock_parts/power_store/cell/microfusion/advanced(src)
-
-/*
-* MICROFUSION SPAWNERS
-*/
-
-/obj/effect/spawner/armory_spawn/microfusion
- guns = list(
- /obj/item/gun/microfusion/mcr01,
- /obj/item/gun/microfusion/mcr01,
- /obj/item/gun/microfusion/mcr01,
- /obj/item/gun/microfusion/mcr01,
- )
-
diff --git a/modular_skyrat/modules/microfusion/code/microfusion_cell.dm b/modular_skyrat/modules/microfusion/code/microfusion_cell.dm
deleted file mode 100644
index b4ca3a49eb2..00000000000
--- a/modular_skyrat/modules/microfusion/code/microfusion_cell.dm
+++ /dev/null
@@ -1,231 +0,0 @@
-/*
-MICROFUSION CELL SYSTEM
-
-Microfusion cells are small battery units that house controlled nuclear fusion within, and that fusion is converted into useable energy.
-
-They cannot be charged as standard, and require upgrades to do so.
-
-These are basically advanced cells.
-*/
-
-/// The amount of cell charge drained during a drain failure.
-#define MICROFUSION_CELL_DRAIN_FAILURE STANDARD_CELL_CHARGE * 0.5
-/// The heavy EMP range for when a cell suffers an EMP failure.
-#define MICROFUSION_CELL_EMP_HEAVY_FAILURE 2
-/// The light EMP range for when a cell suffers an EMP failure.
-#define MICROFUSION_CELL_EMP_LIGHT_FAILURE 4
-/// The radiation range for when a cell suffers a radiation failure.
-#define MICROFUSION_CELL_RADIATION_RANGE_FAILURE 1
-
-/// The lower most time for a microfusion cell meltdown.
-#define MICROFUSION_CELL_FAILURE_LOWER (10 SECONDS)
-/// The upper most time for a microfusion cell meltdown.
-#define MICROFUSION_CELL_FAILURE_UPPER (15 SECONDS)
-
-
-
-/obj/item/stock_parts/power_store/cell/microfusion //Just a standard cell.
- name = "microfusion cell"
- desc = "A standard-issue microfusion cell, produced by Micron Control Systems. \
- For safety reasons, they cannot be charged unless they are inside of a \
- compatible Micron Control Systems firearm."
- icon = 'modular_skyrat/modules/microfusion/icons/microfusion_cells.dmi'
- charging_icon = "mf_in" //This is stored in cell.dmi in the aesthetics module
- icon_state = "microfusion"
- w_class = WEIGHT_CLASS_NORMAL
- maxcharge = STANDARD_CELL_CHARGE //12 shots
- chargerate = 0 //Standard microfusion cells can't be recharged when outside of a gun
- empty = TRUE //MF cells should start empty
- microfusion_readout = TRUE
- charge_light_type = "microfusion"
-
- /// A hard referenced list of upgrades currently attached to the weapon.
- var/list/attachments = list()
- /// Are we melting down? For icon stuffs.
- var/meltdown = FALSE
- /// How many upgrades can you have on this cell?
- var/max_attachments = 1
- /// Hard ref to the parent gun.
- var/obj/item/gun/microfusion/parent_gun
- /// Do we play an alarm when empty?
- var/empty_alarm = TRUE
- /// What sound do we play when empty?
- var/empty_alarm_sound = 'sound/items/weapons/gun/general/empty_alarm.ogg'
- /// Do we have the self charging upgrade?
- var/self_charging = FALSE
- /// We use this to edit the reload time of the gun
- var/reloading_time = 4 SECONDS
- /// We use this to edit the tactical reload time of the gun
- var/reloading_time_tactical = 6 SECONDS
- /// The probability of the cell failing, either through being makeshift or being used in something it shouldn't
- var/fail_prob = 10
-
-/obj/item/stock_parts/power_store/cell
- /// Is this cell stabilised? (used in microfusion guns)
- var/stabilised = FALSE
- /// Do we show the microfusion readout instead of KJ?
- var/microfusion_readout = FALSE
-
-
-/obj/item/stock_parts/power_store/cell/microfusion/Destroy()
- if(attachments.len)
- for(var/obj/item/iterating_item as anything in attachments)
- iterating_item.forceMove(get_turf(src))
- attachments = null
- parent_gun = null
- return ..()
-
-/obj/item/stock_parts/power_store/cell/microfusion/attackby(obj/item/attacking_item, mob/living/user, params)
- if(istype(attacking_item, /obj/item/microfusion_cell_attachment))
- add_attachment(attacking_item, user)
- return
- return ..()
-
-/obj/item/stock_parts/power_store/cell/microfusion/emp_act(severity)
- var/prob_percent = charge / 100 * severity
- if(prob(prob_percent) && !meltdown && !stabilised)
- process_instability()
-
-/obj/item/stock_parts/power_store/cell/microfusion/use(amount, force = FALSE)
- if(!parent_gun) // If an MCR cell is used in anything that's not an MCR, you might have problems
- if(prob(fail_prob))
- process_instability()
- if(charge >= amount)
- var/check_if_empty = charge - amount
- if(check_if_empty < amount && empty_alarm && !self_charging)
- playsound(src, empty_alarm_sound, 50)
- return ..()
-
-/obj/item/stock_parts/power_store/cell/microfusion/proc/process_instability()
- var/seconds_to_explode = rand(MICROFUSION_CELL_FAILURE_LOWER, MICROFUSION_CELL_FAILURE_UPPER)
- meltdown = TRUE
- say("Malfunction in [seconds_to_explode / 10] seconds!")
- playsound(src, 'sound/machines/warning-buzzer.ogg', 30, FALSE, FALSE)
- add_filter("rad_glow", 2, list("type" = "outline", "color" = "#ff5e0049", "size" = 2))
- addtimer(CALLBACK(src, PROC_REF(process_failure)), seconds_to_explode)
-
-/obj/item/stock_parts/power_store/cell/microfusion/proc/process_failure()
- remove_filter("rad_glow")
- playsound(src, 'sound/effects/spray.ogg', 70)
- switch(rand(1, 4))
- if(1) // Charge drain
- charge = clamp(charge - MICROFUSION_CELL_DRAIN_FAILURE, 0, maxcharge)
- if(2) // Explosion
- explode()
- if(3) // Emp pulse
- empulse(get_turf(src), 2, 4, FALSE) // 2 Heavy, 4 Light
- if(4) // Deathly radiation pulse
- radiation_pulse(src, 2, RAD_MEDIUM_INSULATION, 30)
- meltdown = FALSE
-
-/obj/item/stock_parts/power_store/cell/microfusion/update_overlays()
- . = ..()
- for(var/obj/item/microfusion_cell_attachment/microfusion_cell_attachment as anything in attachments)
- . += microfusion_cell_attachment.attachment_overlay_icon_state
-
-/obj/item/stock_parts/power_store/cell/microfusion/screwdriver_act(mob/living/user, obj/item/tool)
- if(!attachments.len)
- balloon_alert(user, "no attachments!")
- return
- remove_attachments()
- playsound(src, 'sound/items/tools/screwdriver.ogg', 70, TRUE)
- balloon_alert(user, "attachments removed")
-
-/obj/item/stock_parts/power_store/cell/microfusion/process(seconds_per_tick)
- for(var/obj/item/microfusion_cell_attachment/microfusion_cell_attachment as anything in attachments)
- microfusion_cell_attachment.process_attachment(src, seconds_per_tick)
-
-/obj/item/stock_parts/power_store/cell/microfusion/proc/inserted_into_weapon()
- chargerate = STANDARD_CELL_CHARGE * 0.2
-
-/obj/item/stock_parts/power_store/cell/microfusion/examine(mob/user)
- . = ..()
- . += span_notice("It can hold [max_attachments] attachment(s).")
- . += span_warning("Inserting this into anything other than a microfusion rifle might be a terrible idea.")
- if(attachments.len)
- for(var/obj/item/microfusion_cell_attachment/microfusion_cell_attachment as anything in attachments)
- . += span_notice("It has a [microfusion_cell_attachment.name] installed.")
- . += span_notice("Use a screwdriver to remove the attachments.")
-
-/obj/item/stock_parts/power_store/cell/microfusion/proc/add_attachment(obj/item/microfusion_cell_attachment/microfusion_cell_attachment, mob/living/user, obj/item/gun/microfusion/microfusion_gun)
- if(attachments.len >= max_attachments)
- balloon_alert(user, "can't attach more!")
- return FALSE
- if(is_type_in_list(microfusion_cell_attachment, attachments))
- balloon_alert(user, "already installed!")
- return FALSE
- attachments += microfusion_cell_attachment
- microfusion_cell_attachment.forceMove(src)
- microfusion_cell_attachment.add_attachment(src)
- balloon_alert(user, "installed attachment")
- playsound(src, 'sound/effects/structure_stress/pop2.ogg', 70, TRUE)
- update_appearance()
- return TRUE
-
-/obj/item/stock_parts/power_store/cell/microfusion/proc/remove_attachments()
- for(var/obj/item/microfusion_cell_attachment/microfusion_cell_attachment in attachments)
- microfusion_cell_attachment.remove_attachment(src)
- microfusion_cell_attachment.forceMove(get_turf(src))
- attachments -= microfusion_cell_attachment
- update_appearance()
-
-/datum/crafting_recipe/makeshift/microfusion_cell
- name = "Makeshift Microfusion Cell"
- tool_behaviors = list(TOOL_SCREWDRIVER, TOOL_WIRECUTTER, TOOL_WELDER)
- result = /obj/item/stock_parts/power_store/cell/microfusion/makeshift
- reqs = list(
- /obj/item/trash/can = 1,
- /obj/item/stack/sheet/iron = 1,
- /obj/item/stack/cable_coil = 1,
- )
- time = 12 SECONDS
- category = CAT_MISC
-
-//WHY WOULD YOU MAKE THIS?
-/obj/item/stock_parts/power_store/cell/microfusion/makeshift
- name = "makeshift microfusion cell"
- desc = "An... Apparatus, comprised of an everyday aluminum can with several civilian-grade batteries tightly packed together and plugged in. This vaguely resembles a microfusion cell, if you tilt your head to a precise fifty degree angle. While the effects on enemy combatants may be dubious, it will certainly do incredible damage to the gun's warranty. What the hell were you thinking when you came up with this?"
- icon_state = "microfusion_makeshift"
- maxcharge = STANDARD_CELL_CHARGE * 0.5
- max_attachments = 0
-
-/obj/item/stock_parts/power_store/cell/microfusion/makeshift/use(amount, force = FALSE)
- if(prob(fail_prob))
- process_instability()
- return ..()
-
-/obj/item/stock_parts/power_store/cell/microfusion/enhanced
- name = "enhanced microfusion cell"
- desc = "A second generation microfusion cell, weighing about the same as the standard-issue cell and having the same space for attachments; however, it has a higher capacity."
- icon_state = "microfusion_enhanced"
- maxcharge = STANDARD_CELL_CHARGE * 1.4
-
-/obj/item/stock_parts/power_store/cell/microfusion/advanced
- name = "advanced microfusion cell"
- desc = "A third generation microfusion cell, boasting a much higher shot count. Additionally, these come with support for up to three modifications to the cell itself."
- icon_state = "microfusion_advanced"
- maxcharge = STANDARD_CELL_CHARGE * 1.5
- max_attachments = 2
-
-/obj/item/stock_parts/power_store/cell/microfusion/bluespace
- name = "bluespace microfusion cell"
- desc = "A fourth generation microfusion cell, employing bluespace technology to store power in a medium that's bigger on the inside. This has the highest capacity of any man-portable cell, and has flexibility for four different attachments to the cell itself."
- icon_state = "microfusion_bluespace"
- maxcharge = STANDARD_CELL_CHARGE * 1.6
- max_attachments = 3
-
-/obj/item/stock_parts/power_store/cell/microfusion/nanocarbon
- name = "nanocarbon fusion cell"
- desc = "This cell combines both top-of-the-line nanotech and advanced microfusion power to brute force the most common issue of Nanotrasen Asset Protection operatives, ammunition, through sheer volume. Intended for use with Nanotrasen-brand capacitor arrays only. Warranty void if dropped in toilet."
- icon_state = "microfusion_nanocarbon"
- maxcharge = STANDARD_CELL_CHARGE * 60 // Wanted to put 69 here to fit with the 420 but eh this werks too
- max_attachments = 420
-
-
-#undef MICROFUSION_CELL_DRAIN_FAILURE
-#undef MICROFUSION_CELL_EMP_HEAVY_FAILURE
-#undef MICROFUSION_CELL_EMP_LIGHT_FAILURE
-#undef MICROFUSION_CELL_RADIATION_RANGE_FAILURE
-
-#undef MICROFUSION_CELL_FAILURE_LOWER
-#undef MICROFUSION_CELL_FAILURE_UPPER
diff --git a/modular_skyrat/modules/microfusion/code/microfusion_cell_attachments.dm b/modular_skyrat/modules/microfusion/code/microfusion_cell_attachments.dm
deleted file mode 100644
index a508a813331..00000000000
--- a/modular_skyrat/modules/microfusion/code/microfusion_cell_attachments.dm
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
-MICROFUSION CELL UPGRADE ATTACHMENTS
-
-For adding unique abilities to microfusion cells. These cannot directly interact with the gun.
-*/
-
-/obj/item/microfusion_cell_attachment
- name = "microfusion cell attachment"
- desc = "broken"
- icon = 'modular_skyrat/modules/microfusion/icons/microfusion_cells.dmi'
- w_class = WEIGHT_CLASS_NORMAL
- /// The overlay that will be automatically added, must be in the cells icon.
- var/attachment_overlay_icon_state
- /// Does this attachment process with the cell?
- var/processing_attachment = FALSE
-
-
-/obj/item/microfusion_cell_attachment/proc/add_attachment(obj/item/stock_parts/power_store/cell/microfusion/microfusion_cell)
- SHOULD_CALL_PARENT(TRUE)
- START_PROCESSING(SSobj, microfusion_cell)
- return
-
-/obj/item/microfusion_cell_attachment/proc/process_attachment(obj/item/stock_parts/power_store/cell/microfusion/microfusion_cell, seconds_per_tick)
- return PROCESS_KILL
-
-/obj/item/microfusion_cell_attachment/proc/remove_attachment(obj/item/stock_parts/power_store/cell/microfusion/microfusion_cell)
- SHOULD_CALL_PARENT(TRUE)
- STOP_PROCESSING(SSobj, microfusion_cell)
- return
-
-/*
-OVERCAPACITY ATTACHMENT
-
-Increases the cell capacity by a set percentage.
-*/
-/obj/item/microfusion_cell_attachment/overcapacity
- name = "overcapacity microfusion cell attachment"
- desc = "An attachment which increases the capacity of the microfusion cell it's attached to. These are an additional, smaller capacitor, using a system to automatically switch from the cell to the capacitor as it's depleted, maximizing the weapon's charge."
- icon_state = "attachment_overcapacity"
- attachment_overlay_icon_state = "microfusion_overcapacity"
- /// How much the attachment increases the cell's capacity by, as a percentage
- var/capacity_increase = 20
- /// The initial capacity of the cell before this upgrade is added!
- var/initial_charge_capacity = 0
-
-/obj/item/microfusion_cell_attachment/overcapacity/add_attachment(obj/item/stock_parts/power_store/cell/microfusion/microfusion_cell)
- . = ..()
- initial_charge_capacity = microfusion_cell.maxcharge
- var/capacity_to_add = microfusion_cell.maxcharge / 100 * capacity_increase
- microfusion_cell.maxcharge += capacity_to_add
-
-/obj/item/microfusion_cell_attachment/overcapacity/remove_attachment(obj/item/stock_parts/power_store/cell/microfusion/microfusion_cell)
- . = ..()
- microfusion_cell.charge = min(microfusion_cell.charge, initial_charge_capacity)
- microfusion_cell.maxcharge = initial_charge_capacity
- initial_charge_capacity = 0
-
-/*
-STABILISER ATTACHMENT
-
-The cell is stable and will not emit sparks when firing.
-*/
-
-/obj/item/microfusion_cell_attachment/stabiliser
- name = "stabilising microfusion cell attachment"
- desc = "A stabilizer system attachment combining a grounding system with additional containment coils for self-charging purposes, this gives additional safety to the cell it's attached to; preventing both sparks and leakage."
- icon_state = "attachment_stabiliser"
- attachment_overlay_icon_state = "microfusion_stabiliser"
-
-/obj/item/microfusion_cell_attachment/stabiliser/add_attachment(obj/item/stock_parts/power_store/cell/microfusion/microfusion_cell)
- . = ..()
- microfusion_cell.stabilised = TRUE
-
-/obj/item/microfusion_cell_attachment/stabiliser/remove_attachment(obj/item/stock_parts/power_store/cell/microfusion/microfusion_cell)
- . = ..()
- microfusion_cell.stabilised = FALSE
-
-/*
-SELFCHARGE ATTACHMENT
-
-The cell will charge itself.
-If the cell isn't stabilised by a stabiliser, it may emit a radiation pulse.
-*/
-/obj/item/microfusion_cell_attachment/selfcharging
- name = "self-charging microfusion cell attachment"
- desc = "While microfusion cells are normally shipped without their fuel source, this attachment comes with fifteen grams of hydrogen fuel; allowing the cell to sustain a small, yet active reaction to self-charge. These can keep going for weeks to months in ideal conditions, making them more than enough for most campaigns."
- icon_state = "attachment_selfcharge"
- attachment_overlay_icon_state = "microfusion_selfcharge"
- /// The amount of charge this cell will passively gain!
- var/self_charge_amount = STANDARD_CELL_CHARGE*(0.02)
-
-/obj/item/microfusion_cell_attachment/selfcharging/examine(mob/user)
- . = ..()
- . += span_warning("WARNING: May cause radiation burns and weapon instability if not stabilized with recommended attachment!")
-
-/obj/item/microfusion_cell_attachment/selfcharging/add_attachment(obj/item/stock_parts/power_store/cell/microfusion/microfusion_cell)
- . = ..()
- microfusion_cell.self_charging = TRUE
-
-/obj/item/microfusion_cell_attachment/selfcharging/remove_attachment(obj/item/stock_parts/power_store/cell/microfusion/microfusion_cell)
- . = ..()
- microfusion_cell.self_charging = FALSE
-
-/obj/item/microfusion_cell_attachment/selfcharging/process_attachment(obj/item/stock_parts/power_store/cell/microfusion/microfusion_cell, seconds_per_tick)
- if(microfusion_cell.charge < microfusion_cell.maxcharge)
- microfusion_cell.charge = clamp(microfusion_cell.charge + (self_charge_amount * seconds_per_tick), 0, microfusion_cell.maxcharge)
- if(microfusion_cell.parent_gun)
- microfusion_cell.parent_gun.update_appearance()
- if(!microfusion_cell.stabilised && SPT_PROB(1, seconds_per_tick))
- radiation_pulse(src, 1, RAD_MEDIUM_INSULATION)
-
diff --git a/modular_skyrat/modules/microfusion/code/microfusion_designs.dm b/modular_skyrat/modules/microfusion/code/microfusion_designs.dm
deleted file mode 100644
index b4975b9044f..00000000000
--- a/modular_skyrat/modules/microfusion/code/microfusion_designs.dm
+++ /dev/null
@@ -1,441 +0,0 @@
-#define RND_CATEGORY_MICROFUSION_WEAPONS "/Weaponry (Microfusion)"
-#define RND_MICROFUSION_CELLS "/Cells"
-#define RND_MICROFUSION_CELL_ATTACHMENTS "/Cell Attachments"
-#define RND_MICROFUSION_EMITTERS "/Phase Emitters"
-// god forgive me
-#define RND_MICROFUSION_ATTACHMENT "/Attachments"
-#define RND_MICROFUSION_ATTACHMENT_BARREL " (Barrel)"
-#define RND_MICROFUSION_ATTACHMENT_UNDERBARREL " (Underbarrel)"
-#define RND_MICROFUSION_ATTACHMENT_RAIL " (Rail)"
-#define RND_MICROFUSION_ATTACHMENT_UNIQUE " (Cosmetic)"
-
-// BASE FOR MCR DESIGNS
-/datum/design/microfusion
- name = "Microfusion Part"
- build_type = PROTOLATHE | AWAY_LATHE
- departmental_flags = DEPARTMENT_BITFLAG_SECURITY
- construction_time = 10 SECONDS //dunno if this is for mechfabs or what but I'll keep this anyway
- category = list(
- RND_CATEGORY_MICROFUSION_WEAPONS,
- )
-
-// EMITTERS
-
-/datum/design/microfusion/phase_emitter
- name = "Placeholder Microfusion Phase Emitter"
- desc = "You shouldn't see this. Still, odd how there's no basic phase emitter design, despite how redundant it'd be."
- category = list(
- RND_CATEGORY_MICROFUSION_WEAPONS + RND_MICROFUSION_EMITTERS,
- )
-
-/datum/design/microfusion/phase_emitter/enhanced
- name = "Enhanced Microfusion Phase Emitter"
- desc = "The core of a microfusion projection weapon, produces the laser."
- id = "enhanced_microfusion_phase_emitter"
- materials = list(
- /datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT,
- /datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT,
- /datum/material/silver = HALF_SHEET_MATERIAL_AMOUNT,
- )
- build_path = /obj/item/microfusion_phase_emitter/enhanced
-
-/datum/design/microfusion/phase_emitter/advanced
- name = "Advanced Microfusion Phase Emitter"
- id = "advanced_microfusion_phase_emitter"
- materials = list(
- /datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT,
- /datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT,
- /datum/material/silver = HALF_SHEET_MATERIAL_AMOUNT,
- /datum/material/gold = HALF_SHEET_MATERIAL_AMOUNT,
- )
- build_path = /obj/item/microfusion_phase_emitter/advanced
-
-/datum/design/microfusion/phase_emitter/bluespace
- name = "Bluespace Microfusion Phase Emitter"
- id = "bluespace_microfusion_phase_emitter"
- materials = list(
- /datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT,
- /datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT,
- /datum/material/silver = HALF_SHEET_MATERIAL_AMOUNT,
- /datum/material/gold = HALF_SHEET_MATERIAL_AMOUNT,
- /datum/material/diamond = HALF_SHEET_MATERIAL_AMOUNT,
- )
- build_path = /obj/item/microfusion_phase_emitter/bluespace
-
-// CELLS
-
-/datum/design/microfusion/cell
- name = "Microfusion Cell"
- desc = "A microfusion cell. There's a basic type defined next to this, right?"
- category = list(
- RND_CATEGORY_MICROFUSION_WEAPONS + RND_MICROFUSION_CELLS,
- )
-
-/datum/design/microfusion/cell/basic
- name = "Basic Microfusion Cell"
- desc = "A basic microfusion cell with a capacity of 1200 MF and and 1 attachment point."
- id = "basic_microfusion_cell"
- build_type = PROTOLATHE | AWAY_LATHE | AUTOLATHE
- materials = list(
- /datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT,
- /datum/material/glass = SMALL_MATERIAL_AMOUNT * 2,
- )
- build_path = /obj/item/stock_parts/power_store/cell/microfusion
- category = list(
- RND_CATEGORY_INITIAL,
- RND_CATEGORY_MICROFUSION_WEAPONS + RND_MICROFUSION_CELLS,
- )
-
-/datum/design/microfusion/cell/enhanced
- name = "Enhanced Microfusion Cell"
- desc = "An enhanced microfusion cell with a capacity of 1500 MF and 1 attachment point."
- id = "enhanced_microfusion_cell"
- materials = list(
- /datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT,
- /datum/material/glass = SMALL_MATERIAL_AMOUNT * 2,
- /datum/material/uranium = SMALL_MATERIAL_AMOUNT * 2,
- )
- build_path = /obj/item/stock_parts/power_store/cell/microfusion/enhanced
-
-/datum/design/microfusion/cell/advanced
- name = "Advanced Microfusion Cell"
- desc = "An advanced microfusion cell with a capacity of 1700 MF and 3 attachment points."
- id = "advanced_microfusion_cell"
- materials = list(
- /datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT,
- /datum/material/gold = SMALL_MATERIAL_AMOUNT * 3,
- /datum/material/silver = SMALL_MATERIAL_AMOUNT * 3,
- /datum/material/glass = SMALL_MATERIAL_AMOUNT * 3,
- /datum/material/uranium = SMALL_MATERIAL_AMOUNT * 3,
- )
- build_path = /obj/item/stock_parts/power_store/cell/microfusion/advanced
-
-/datum/design/microfusion/cell/bluespace
- name = "Bluespace Microfusion Cell"
- desc = "A bluespace microfusion cell with a capacity of 2000 MF and 3 attachment points."
- id = "bluespace_microfusion_cell"
- materials = list(
- /datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT,
- /datum/material/gold = SMALL_MATERIAL_AMOUNT * 3,
- /datum/material/glass = SMALL_MATERIAL_AMOUNT * 3,
- /datum/material/diamond = SMALL_MATERIAL_AMOUNT * 3,
- /datum/material/uranium = SMALL_MATERIAL_AMOUNT * 3,
- /datum/material/titanium = SMALL_MATERIAL_AMOUNT * 3,
- /datum/material/bluespace = SMALL_MATERIAL_AMOUNT * 3,
- )
- build_path = /obj/item/stock_parts/power_store/cell/microfusion/bluespace
-
-// CELL UPGRADES
-/datum/design/microfusion/cell_attachment
- name = "Placeholder Cell Attachment"
- desc = "You shouldn't be seeing this."
- category = list(
- RND_CATEGORY_MICROFUSION_WEAPONS + RND_MICROFUSION_CELL_ATTACHMENTS,
- )
-
-/datum/design/microfusion/cell_attachment/stabilising
- name = "Stabilising Microfusion Cell Attachment"
- desc = "Stabilises the internal fusion reaction of microfusion cells, preventing sparks during firing and occasional radiation pulses when used in tandem with a self-charging attachment."
- id = "microfusion_cell_attachment_stabiliser"
- materials = list(
- /datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT,
- /datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT,
- /datum/material/plasma = HALF_SHEET_MATERIAL_AMOUNT,
- /datum/material/silver = HALF_SHEET_MATERIAL_AMOUNT,
- )
- build_path = /obj/item/microfusion_cell_attachment/stabiliser
-
-/datum/design/microfusion/cell_attachment/overcapacity
- name = "Overcapacity Microfusion Cell Attachment"
- desc = "An attachment for microfusion cells that increases MF capacity."
- id = "microfusion_cell_attachment_overcapacity"
- materials = list(
- /datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT,
- /datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT,
- /datum/material/plasma = HALF_SHEET_MATERIAL_AMOUNT,
- /datum/material/gold = SHEET_MATERIAL_AMOUNT * 4,
- )
- build_path = /obj/item/microfusion_cell_attachment/overcapacity
-
-/datum/design/microfusion/cell_attachment/selfcharging
- name = "Self-Charging Microfusion Cell Attachment"
- desc = "Contains a small amount of infinitely decaying nuclear material, causing the fusion reaction to be self sustaining. WARNING: May cause radiation burns if not stabilised."
- id = "microfusion_cell_attachment_selfcharging"
- materials = list(
- /datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT,
- /datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT,
- /datum/material/diamond = HALF_SHEET_MATERIAL_AMOUNT,
- /datum/material/uranium = SHEET_MATERIAL_AMOUNT * 3,
- /datum/material/titanium = SHEET_MATERIAL_AMOUNT * 3,
- /datum/material/bluespace = SHEET_MATERIAL_AMOUNT,
- )
- build_path = /obj/item/microfusion_cell_attachment/selfcharging
-
-/datum/design/microfusion/attachment
- name = "Placeholder MCR Attachment"
- desc = "You *really* shouldn't be seeing this. Now in different attachment flavors! The Req line will hate you."
- category = list(
- RND_CATEGORY_MICROFUSION_WEAPONS + RND_MICROFUSION_ATTACHMENT,
- )
-
-// RAIL MODS
-
-/datum/design/microfusion/attachment/rail_slot/rail
- name = "Microfusion Weapon Rail"
- desc = "A carrying handle/rail system for any additional attachments, such as a seclite and/or bayonet."
- id = "microfusion_gun_attachment_rail"
- materials = list(
- /datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT,
- /datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT,
- /datum/material/silver = HALF_SHEET_MATERIAL_AMOUNT,
- /datum/material/gold = HALF_SHEET_MATERIAL_AMOUNT,
- )
- build_path = /obj/item/microfusion_gun_attachment/rail
-
-/datum/design/microfusion/attachment/rail_slot/scope
- name = "Microfusion Weapon Scope"
- desc = "A scope. For microfusion weapon platforms, probably."
- id = "microfusion_gun_attachment_scope"
- materials = list(
- /datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT,
- /datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT,
- /datum/material/silver = HALF_SHEET_MATERIAL_AMOUNT,
- )
- build_path = /obj/item/microfusion_gun_attachment/scope
-
-// UNDERBARREL MODS
-
-/datum/design/microfusion/attachment/underbarrel
- name = "Placeholder Microfusion Underbarrel Slot Attachment"
- category = list(
- RND_CATEGORY_MICROFUSION_WEAPONS + RND_MICROFUSION_ATTACHMENT + RND_MICROFUSION_ATTACHMENT_UNDERBARREL,
- )
-
-/datum/design/microfusion/attachment/underbarrel/grip
- name = "Microfusion Weapon Grip"
- desc = "A grip. For microfusion weapon platforms, ostensibly."
- id = "microfusion_gun_attachment_grip"
- materials = list(
- /datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT,
- /datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT,
- /datum/material/silver = HALF_SHEET_MATERIAL_AMOUNT,
- )
- build_path = /obj/item/microfusion_gun_attachment/grip
-
-/datum/design/microfusion/attachment/underbarrel/heatsink
- name = "Phase Emitter Heatsink"
- desc = "A heatsink attachment for your microfusion weapon. Massively increases cooling potential."
- id = "microfusion_gun_attachment_heatsink"
- materials = list(
- /datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT,
- /datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT,
- /datum/material/silver = HALF_SHEET_MATERIAL_AMOUNT,
- /datum/material/gold = HALF_SHEET_MATERIAL_AMOUNT,
- )
- build_path = /obj/item/microfusion_gun_attachment/heatsink
-
-// BARREL MODS (there's a lot)
-
-/datum/design/microfusion/attachment/barrel
- name = "Placeholder Microfusion Barrel Slot Attachment"
- category = list(
- RND_CATEGORY_MICROFUSION_WEAPONS + RND_MICROFUSION_ATTACHMENT + RND_MICROFUSION_ATTACHMENT_BARREL,
- )
-
-/datum/design/microfusion/attachment/barrel/suppressor
- name = "Suppressor Lens Attachment"
- desc = "An experimental barrel attachment that dampens the soundwave of the emitter, suppressing the report. Does not make the lasers themselves more stealthy, as they are lasers."
- id = "microfusion_gun_attachment_suppressor"
- materials = list(
- /datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT,
- /datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT,
- /datum/material/silver = HALF_SHEET_MATERIAL_AMOUNT,
- )
- build_path = /obj/item/microfusion_gun_attachment/barrel/suppressor
-
-/datum/design/microfusion/attachment/barrel/honk
- name = "Bananium Phase Emitter \"Upgrade\""
- desc = "Makes your lasers into the greatest clowning tool ever made. HONK!"
- id = "microfusion_gun_attachment_honk"
- materials = list(
- /datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT,
- /datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT,
- /datum/material/bananium = HALF_SHEET_MATERIAL_AMOUNT,
- )
- build_path = /obj/item/microfusion_gun_attachment/barrel/honk
-
-/datum/design/microfusion/attachment/barrel/lance
- name = "Lance Induction Carriage"
- desc = "Turns the gun into a designated marksman rifle."
- id = "microfusion_gun_attachment_lance"
- materials = list(
- /datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT,
- /datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT,
- /datum/material/diamond = HALF_SHEET_MATERIAL_AMOUNT,
- /datum/material/plasma = HALF_SHEET_MATERIAL_AMOUNT,
- /datum/material/bluespace = HALF_SHEET_MATERIAL_AMOUNT,
- )
- build_path = /obj/item/microfusion_gun_attachment/barrel/lance
-
-// EMITTER UPGRADES (they're still barrel upgrades, though)
-
-/datum/design/microfusion/attachment/barrel/scatter
- name = "Diffuser Microfusion Lens Attachment"
- desc = "Splits the microfusion laser beam entering the lens."
- id = "microfusion_gun_attachment_scatter"
- materials = list(
- /datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT,
- /datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT,
- /datum/material/diamond = HALF_SHEET_MATERIAL_AMOUNT,
- /datum/material/silver = HALF_SHEET_MATERIAL_AMOUNT,
- )
- build_path = /obj/item/microfusion_gun_attachment/barrel/scatter
-
-
-/datum/design/microfusion/attachment/barrel/scatter/max
- name = "Crystalline Diffuser Microfusion Lens Attachment"
- desc = "Splits the microfusion laser beam entering the lens even more."
- id = "microfusion_gun_attachment_scattermax"
- materials = list(
- /datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT,
- /datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT,
- /datum/material/diamond = HALF_SHEET_MATERIAL_AMOUNT,
- /datum/material/silver = HALF_SHEET_MATERIAL_AMOUNT,
- )
- build_path = /obj/item/microfusion_gun_attachment/barrel/scatter/max
-
-/datum/design/microfusion/attachment/barrel/superheat
- name = "Superheating Phase Emitter Upgrade"
- desc = "Superheats the beam, causing targets to ignite."
- id = "microfusion_gun_attachment_superheat"
- materials = list(
- /datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT,
- /datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT,
- /datum/material/diamond = HALF_SHEET_MATERIAL_AMOUNT,
- /datum/material/plasma = HALF_SHEET_MATERIAL_AMOUNT,
- )
- build_path = /obj/item/microfusion_gun_attachment/barrel/superheat
-
-/datum/design/microfusion/attachment/barrel/hellfire
- name = "Hellfire Phase Emitter Upgrade"
- desc = "Overheats the beam, causing nastier wounds and higher damage."
- id = "microfusion_gun_attachment_hellfire"
- materials = list(
- /datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT,
- /datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT,
- /datum/material/diamond = HALF_SHEET_MATERIAL_AMOUNT,
- /datum/material/plasma = HALF_SHEET_MATERIAL_AMOUNT,
- )
- build_path = /obj/item/microfusion_gun_attachment/barrel/hellfire
-
-/datum/design/microfusion/attachment/barrel/repeater
- name = "Repeating Phase Emitter Upgrade"
- desc = "Upgrades the central phase emitter to repeat twice."
- id = "microfusion_gun_attachment_repeater"
- materials = list(
- /datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT,
- /datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT,
- /datum/material/diamond = HALF_SHEET_MATERIAL_AMOUNT,
- /datum/material/bluespace = HALF_SHEET_MATERIAL_AMOUNT,
- )
- build_path = /obj/item/microfusion_gun_attachment/barrel/repeater
-
-
-/datum/design/microfusion/attachment/barrel/repeater/penetrator
- name = "Focused Repeating Phase Emitter Upgrade"
- desc = "Upgrades the central phase emitter to repeat twice and penetrate armor."
- id = "microfusion_gun_attachment_penetrator"
- materials = list(
- /datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT,
- /datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT,
- /datum/material/diamond = SMALL_MATERIAL_AMOUNT * 5,
- /datum/material/bluespace = HALF_SHEET_MATERIAL_AMOUNT,
- )
- build_path = /obj/item/microfusion_gun_attachment/barrel/repeater/penetrator
-
-/datum/design/microfusion/attachment/barrel/xray
- name = "Phase Inverter Emitter Array"
- desc = "Experimental technology that inverts the central phase emitter causing the wave frequency to shift into X-rays that pierce solid objects. CAUTION: Phase emitter heats up very quickly."
- id = "microfusion_gun_attachment_xray"
- materials = list(
- /datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT,
- /datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT,
- /datum/material/diamond = HALF_SHEET_MATERIAL_AMOUNT,
- /datum/material/uranium = HALF_SHEET_MATERIAL_AMOUNT,
- /datum/material/bluespace = HALF_SHEET_MATERIAL_AMOUNT,
- )
- build_path = /obj/item/microfusion_gun_attachment/barrel/xray
-
-// COSMETICS
-
-/datum/design/microfusion/attachment/unique
- name = "Placeholder Microfusion Unique/Cosmetic Attachment"
- category = list(
- RND_CATEGORY_MICROFUSION_WEAPONS + RND_MICROFUSION_ATTACHMENT + RND_MICROFUSION_ATTACHMENT_UNIQUE,
- )
-
-/datum/design/microfusion/attachment/unique/rgb
- name = "Phase Emitter Spectrograph"
- desc = "An attachment hooked up to the phase emitter, allowing the user to adjust the color of the beam outputted. This has seen widespread use by various factions capable of getting their hands on microfusion weapons, whether as a calling card or simply for entertainment."
- id = "microfusion_gun_attachment_rgb"
- materials = list(
- /datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT,
- /datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT,
- /datum/material/silver = HALF_SHEET_MATERIAL_AMOUNT,
- /datum/material/gold = HALF_SHEET_MATERIAL_AMOUNT,
- )
- build_path = /obj/item/microfusion_gun_attachment/rgb
-
-/datum/design/microfusion/attachment/unique/camo_black
- name = "Black Camo Microfusion Frame"
- desc = "A frame modification for the MCR-10, changing the color of the gun to black."
- id = "microfusion_gun_attachment_black_camo"
- materials = list(
- /datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT,
- /datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT,
- /datum/material/gold = HALF_SHEET_MATERIAL_AMOUNT,
- )
- build_path = /obj/item/microfusion_gun_attachment/camo
-
-/datum/design/microfusion/attachment/unique/camo_nanotrasen
- name = "Nanotrasen Camo Microfusion Frame"
- desc = "A frame modification for the MCR-01, changing the color of the gun to blue."
- id = "microfusion_gun_attachment_nt_camo"
- materials = list(
- /datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT,
- /datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT,
- /datum/material/plasma = HALF_SHEET_MATERIAL_AMOUNT,
- )
- build_path = /obj/item/microfusion_gun_attachment/camo/nanotrasen
-
-/datum/design/microfusion/attachment/unique/camo_syndicate
- name = "Blood Red Camo Microfusion Frame"
- desc = "A frame modification for the MCR-01, changing the color of the gun to a slick blood red."
- id = "microfusion_gun_attachment_syndi_camo"
- materials = list(
- /datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT,
- /datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT,
- /datum/material/titanium = HALF_SHEET_MATERIAL_AMOUNT,
- )
- build_path = /obj/item/microfusion_gun_attachment/camo/syndicate
-
-/datum/design/microfusion/attachment/unique/camo_bananium
- name = "Bananium Microfusion Frame"
- desc = "A frame modification for the MCR-01, plating the gun in bananium."
- id = "microfusion_gun_attachment_honk_camo"
- materials = list(
- /datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT,
- /datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT,
- /datum/material/bananium = HALF_SHEET_MATERIAL_AMOUNT,
- )
- build_path = /obj/item/microfusion_gun_attachment/camo/honk
-
-#undef RND_CATEGORY_MICROFUSION_WEAPONS
-#undef RND_MICROFUSION_CELLS
-#undef RND_MICROFUSION_CELL_ATTACHMENTS
-#undef RND_MICROFUSION_EMITTERS
-#undef RND_MICROFUSION_ATTACHMENT
-#undef RND_MICROFUSION_ATTACHMENT_BARREL
-#undef RND_MICROFUSION_ATTACHMENT_UNDERBARREL
-#undef RND_MICROFUSION_ATTACHMENT_RAIL
-#undef RND_MICROFUSION_ATTACHMENT_UNIQUE
diff --git a/modular_skyrat/modules/microfusion/code/microfusion_energy_master.dm b/modular_skyrat/modules/microfusion/code/microfusion_energy_master.dm
deleted file mode 100644
index 14ccece3c73..00000000000
--- a/modular_skyrat/modules/microfusion/code/microfusion_energy_master.dm
+++ /dev/null
@@ -1,792 +0,0 @@
-#define DUALWIELD_PENALTY_EXTRA_MULTIPLIER 1.4
-
-// Master file for cell loadable energy guns. PROCS ONLY YOU MONKEYS!
-// This file is a copy/paste of _energy.dm with extensive modification.
-
-/obj/item/gun/microfusion
- name = "prototype detatchable cell energy projection aparatus"
- desc = "The coders have obviously failed to realise this is broken."
- icon = 'modular_skyrat/modules/microfusion/icons/microfusion_gun40x32.dmi'
- icon_state = "mcr01"
- inhand_icon_state = "mcr01"
- lefthand_file = 'modular_skyrat/modules/microfusion/icons/guns_lefthand.dmi'
- righthand_file = 'modular_skyrat/modules/microfusion/icons/guns_righthand.dmi'
- w_class = WEIGHT_CLASS_BULKY
- obj_flags = UNIQUE_RENAME
- ammo_x_offset = 2
-
- /// What type of power cell this uses
- var/obj/item/stock_parts/power_store/cell/microfusion/cell
- /// The cell we will spawn with
- var/cell_type = /obj/item/stock_parts/power_store/cell/microfusion
- /// The cell type we check when inserting a cell
- var/base_cell_type = /obj/item/stock_parts/power_store/cell/microfusion
- /// If the weapon has custom icons for individual ammo types it can switch between. ie disabler beams, taser, laser/lethals, ect.
- var/modifystate = FALSE
- /// How many charge sections do we have?
- var/charge_sections = 4
- /// if this gun uses a stateful charge bar for more detail
- var/shaded_charge = FALSE
- /// Should we give an overlay to empty guns?
- var/display_empty = TRUE
- /// whether the gun's cell drains the cyborg user's cell to recharge
- var/dead_cell = FALSE
-
- // MICROFUSION SPECIFIC VARS
-
- /// The microfusion lens used for generating the beams.
- var/obj/item/ammo_casing/energy/laser/microfusion/microfusion_lens
- /// The time it takes for someone to (tactically) reload this gun.
- var/tactical_reload_time = 6 SECONDS
- /// The time it takes for someone to normally reload this gun.
- var/normal_reload_time = 4 SECONDS
- /// The sound played when you insert a cell.
- var/sound_cell_insert = 'modular_skyrat/modules/microfusion/sound/mag_insert.ogg'
- /// Should the insertion sound played vary?
- var/sound_cell_insert_vary = TRUE
- /// The volume at which we will play the insertion sound.
- var/sound_cell_insert_volume = 50
- /// The sound played when you remove a cell.
- var/sound_cell_remove = 'modular_skyrat/modules/microfusion/sound/mag_insert.ogg'
- /// Should the removal sound played vary?
- var/sound_cell_remove_vary = TRUE
- /// The volume at which we will play the removal sound.
- var/sound_cell_remove_volume = 50
- /// A list of attached upgrades
- var/list/attachments = list()
- /// The starting phase emitter in this weapon.
- var/phase_emitter_type = /obj/item/microfusion_phase_emitter
- /// The base emitter type that we check when putting a new emitter in.
- var/base_phase_emitter_type = /obj/item/microfusion_phase_emitter
- /// The phase emitter that this gun currently has.
- var/obj/item/microfusion_phase_emitter/phase_emitter
- /// The amount of heat produced per shot
- var/heat_per_shot = 100
- /// The heat dissipation bonus granted by the weapon.
- var/heat_dissipation_bonus = 0
- /// What slots does this gun have?
- var/attachment_slots = list(GUN_SLOT_BARREL, GUN_SLOT_UNDERBARREL, GUN_SLOT_RAIL, GUN_SLOT_UNIQUE, GUN_SLOT_CAMO)
- /// Our base firedelay.
- var/base_fire_delay = 0
- /// Do we use more power because of attachments?
- var/extra_power_usage = 0
- /// Spread from attachments.
- var/attachment_spread = 0
- /// Recoil from attachments.
- var/attachment_recoil = 0
-
-/obj/item/gun/microfusion/emp_act(severity)
- . = ..()
- if(!(. & EMP_PROTECT_CONTENTS))
- cell.use(round(cell.charge / severity))
- chambered = null //we empty the chamber
- recharge_newshot() //and try to charge a new shot
- update_appearance()
-
-/obj/item/gun/microfusion/get_cell()
- return cell
-
-/obj/item/gun/microfusion/Initialize(mapload)
- . = ..()
- if(cell_type)
- cell = new cell_type(src)
- else
- cell = new(src)
- cell.parent_gun = src
- cell.chargerate = STANDARD_CELL_CHARGE * 0.2
- if(!dead_cell)
- cell.give(cell.maxcharge)
- if(phase_emitter_type)
- phase_emitter = new phase_emitter_type(src)
- else
- phase_emitter = new(src)
- phase_emitter.parent_gun = src
- update_microfusion_lens()
- recharge_newshot(TRUE)
- AddElement(/datum/element/update_icon_updates_onmob)
- update_appearance()
- AddComponent(/datum/component/ammo_hud)
- RegisterSignal(src, COMSIG_ITEM_RECHARGED, PROC_REF(instant_recharge))
- base_fire_delay = fire_delay
- START_PROCESSING(SSobj, src)
- for(var/type in attachments)
- attachments -= type
- var/obj/item/microfusion_gun_attachment/attachment = new type(src)
- add_attachment(attachment)
-
-/obj/item/gun/microfusion/give_gun_safeties()
- AddComponent(/datum/component/gun_safety)
-
-/obj/item/gun/microfusion/add_weapon_description()
- AddElement(/datum/element/weapon_description, attached_proc = PROC_REF(add_notes_energy))
-
-/obj/item/gun/microfusion/add_seclight_point()
- return
-
-/obj/item/gun/microfusion/Destroy()
- if(microfusion_lens)
- QDEL_NULL(microfusion_lens)
- if(cell)
- cell.parent_gun = null
- QDEL_NULL(cell)
- if(attachments.len)
- for(var/obj/item/iterating_item in attachments)
- qdel(iterating_item)
- attachments = null
- if(phase_emitter)
- QDEL_NULL(phase_emitter)
- STOP_PROCESSING(SSobj, src)
- return ..()
-
-/obj/item/gun/microfusion/Exited(atom/movable/gone, direction)
- . = ..()
- if(gone == cell)
- cell = null
- update_appearance()
- else if(gone == phase_emitter)
- phase_emitter = null
- update_appearance()
-
-/obj/item/gun/microfusion/can_shoot()
- return !QDELETED(cell) ? (cell.charge >= microfusion_lens.e_cost) : FALSE
-
-/obj/item/gun/microfusion/recharge_newshot()
- if (!microfusion_lens || !cell || !phase_emitter)
- return
- chambered = microfusion_lens
- if(!chambered.loaded_projectile)
- chambered.newshot()
-
-/obj/item/gun/microfusion/handle_chamber()
- if(chambered && !chambered.loaded_projectile && cell) //if loaded_projectile is null, i.e the shot has been fired...
- var/obj/item/ammo_casing/energy/shot = chambered
- cell.use(shot.e_cost + extra_power_usage)//... drain the cell
- chambered = null //either way, released the prepared shot
- recharge_newshot() //try to charge a new shot
-
-/obj/item/gun/microfusion/process_fire(atom/target, mob/living/user, message = TRUE, params = null, zone_override = "", bonus_spread = 0)
- if(!chambered && can_shoot())
- process_chamber() // If the gun was drained and then recharged, load a new shot.
- return ..()
-
-/obj/item/gun/microfusion/process(seconds_per_tick)
- for(var/obj/item/microfusion_gun_attachment/attached as anything in attachments)
- attached.process_attachment(src, seconds_per_tick)
-
-/obj/item/gun/microfusion/update_icon_state()
- var/skip_inhand = initial(inhand_icon_state) //only build if we aren't using a preset inhand icon
- var/skip_worn_icon = initial(worn_icon_state) //only build if we aren't using a preset worn icon
-
- if(skip_inhand && skip_worn_icon) //if we don't have either, don't do the math.
- return ..()
-
- var/ratio = get_charge_ratio()
- var/temp_icon_to_use = initial(icon_state)
- if(modifystate)
- temp_icon_to_use += "[microfusion_lens.select_name]"
-
- temp_icon_to_use += "[ratio]"
- if(!skip_inhand)
- inhand_icon_state = temp_icon_to_use
- if(!skip_worn_icon)
- worn_icon_state = temp_icon_to_use
- return ..()
-
-/obj/item/gun/microfusion/update_overlays()
- . = ..()
- SEND_SIGNAL(src, COMSIG_UPDATE_AMMO_HUD) //update the ammo hud since it's heavily dependent on the gun's state
- if(!phase_emitter)
- . += "[icon_state]_phase_emitter_missing"
- else if(phase_emitter.damaged)
- . += "[icon_state]_phase_emitter_damaged"
- else if(cell)
- var/ratio = get_charge_ratio()
- if(ratio == 0 && display_empty)
- . += "[icon_state]_empty"
- else if(shaded_charge)
- . += "[icon_state]_charge[ratio]_[phase_emitter.icon_state]"
- else
- . += "[icon_state]_phase_emitter_missing"
-
-
- for(var/obj/item/microfusion_gun_attachment/microfusion_gun_attachment in attachments)
- . += "[icon_state]_[microfusion_gun_attachment.attachment_overlay_icon_state]"
-
-
-/obj/item/gun/microfusion/ignition_effect(atom/to_ignite, mob/living/user)
- if(!can_shoot() || !microfusion_lens)
- shoot_with_empty_chamber()
- . = ""
- else
- var/obj/projectile/energy/loaded_projectile = microfusion_lens.loaded_projectile
- if(!loaded_projectile)
- . = ""
- else if(!loaded_projectile.damage || loaded_projectile.damage_type == STAMINA)
- user.visible_message(span_danger("[user] tries to light [to_ignite.loc == user ? "[user.p_their()] [to_ignite.name]" : to_ignite] with [src], but it doesn't do anything. Dumbass."))
- playsound(user, microfusion_lens.fire_sound, 50, TRUE)
- playsound(user, loaded_projectile.hitsound, 50, TRUE)
- cell.use(microfusion_lens.e_cost)
- . = ""
- else if(loaded_projectile.damage_type != BURN)
- user.visible_message(span_danger("[user] tries to light [to_ignite.loc == user ? "[user.p_their()] [to_ignite.name]" : to_ignite] with [src], but only succeeds in utterly destroying it. Dumbass."))
- playsound(user, microfusion_lens.fire_sound, 50, TRUE)
- playsound(user, loaded_projectile.hitsound, 50, TRUE)
- cell.use(microfusion_lens.e_cost)
- qdel(to_ignite)
- . = ""
- else
- playsound(user, microfusion_lens.fire_sound, 50, TRUE)
- playsound(user, loaded_projectile.hitsound, 50, TRUE)
- cell.use(microfusion_lens.e_cost)
- . = span_danger("[user] casually lights [to_ignite.loc == user ? "[user.p_their()] [to_ignite.name]" : to_ignite] with [src]. Damn.")
-
-/obj/item/gun/microfusion/attackby(obj/item/attacking_item, mob/user, params)
- . = ..()
- if (.)
- return
- if(istype(attacking_item, base_cell_type))
- insert_cell(user, attacking_item)
- if(istype(attacking_item, /obj/item/microfusion_gun_attachment))
- add_attachment(attacking_item, user)
- if(istype(attacking_item, base_phase_emitter_type))
- insert_emitter(attacking_item, user)
-
-/obj/item/gun/microfusion/process_chamber(empty_chamber, from_firing, chamber_next_round)
- . = ..()
- if(!cell?.stabilised && prob(40))
- do_sparks(2, FALSE, src) //Microfusion guns create sparks!
-
-/obj/item/gun/microfusion/attack_hand(mob/user, list/modifiers)
- if(loc == user && user.is_holding(src) && cell)
- eject_cell(user)
- return
- return ..()
-
-/obj/item/gun/microfusion/crowbar_act(mob/living/user, obj/item/tool)
- if(!phase_emitter)
- balloon_alert(user, "no phase emitter!")
- return
- playsound(src, 'sound/items/tools/crowbar.ogg', 70, TRUE)
- remove_emitter()
-
-/obj/item/gun/microfusion/click_alt(mob/user)
- var/obj/item/microfusion_gun_attachment/to_remove = input(user, "Please select what part you'd like to remove.", "Remove attachment") as null|obj in sort_names(attachments)
- if(!to_remove)
- return CLICK_ACTION_BLOCKING
- remove_attachment(to_remove, user)
- return CLICK_ACTION_SUCCESS
-
-/obj/item/gun/microfusion/proc/remove_all_attachments()
- if(attachments.len)
- for(var/obj/item/microfusion_gun_attachment/attachment in attachments)
- attachment.remove_attachment(src)
- attachment.forceMove(get_turf(src))
- attachments -= attachment
- update_appearance()
-
-/obj/item/gun/microfusion/examine(mob/user)
- . = ..()
- if(attachments.len)
- for(var/obj/item/microfusion_gun_attachment/microfusion_gun_attachment in attachments)
- . += span_notice("It has a [microfusion_gun_attachment.name] installed.")
- . += span_notice("Alt+click it to remove an upgrade.")
- if(phase_emitter)
- . += span_notice("It has a [phase_emitter.name] installed, at [phase_emitter.get_heat_percent()]% heat capacity.")
- . += span_notice("The [phase_emitter.name] is at [phase_emitter.integrity]% integrity.")
- . += span_notice("The [phase_emitter.name] will thermal throttle at [phase_emitter.throttle_percentage]% heat capacity.")
- . += span_notice("Use a crowbar to remove the phase emitter.")
- else
- . += span_danger("It does not have a phase emitter installed!")
-
- if(cell)
- . += span_notice("It has a [cell.name] installed, with a capacity of [cell.charge]/[cell.maxcharge] MF.")
-
-/obj/item/gun/microfusion/suicide_act(mob/living/user)
- if (istype(user) && can_shoot() && can_trigger_gun(user) && user.get_bodypart(BODY_ZONE_HEAD))
- user.visible_message(span_suicide("[user] is putting the barrel of [src] in [user.p_their()] mouth. It looks like [user.p_theyre()] trying to commit suicide!"))
- sleep(2.5 SECONDS)
- if(user.is_holding(src))
- user.visible_message(span_suicide("[user] melts [user.p_their()] face off with [src]!"))
- playsound(loc, fire_sound, 50, TRUE, -1)
- cell.use(microfusion_lens.e_cost)
- update_appearance()
- return(FIRELOSS)
- else
- user.visible_message(span_suicide("[user] panics and starts choking to death!"))
- return(OXYLOSS)
- else
- user.visible_message(span_suicide("[user] is pretending to melt [user.p_their()] face off with [src]! It looks like [user.p_theyre()] trying to commit suicide!"))
- playsound(src, dry_fire_sound, 30, TRUE)
- return (OXYLOSS)
-
-// To maintain modularity, I am moving this proc override here.
-/obj/item/gun/microfusion/fire_gun(atom/target, mob/living/user, flag, params)
-
- // check to see if the emitter prevents us from firing before anything else
- var/attempted_shot = process_emitter()
- if(attempted_shot != SHOT_SUCCESS)
- if(attempted_shot)
- balloon_alert(user, attempted_shot)
- return
-
- . = ..()
-
-// To maintain modularity, I am moving this proc override here.
-/obj/item/gun/microfusion/process_fire(atom/target, mob/living/user, message = TRUE, params = null, zone_override = "", bonus_spread = 0)
- var/base_bonus_spread = 0
- if(user)
- var/list/bonus_spread_values = list(base_bonus_spread, bonus_spread)
- SEND_SIGNAL(user, COMSIG_MOB_FIRED_GUN, src, target, params, zone_override, bonus_spread_values)
- base_bonus_spread = bonus_spread_values[MIN_BONUS_SPREAD_INDEX]
- bonus_spread = bonus_spread_values[MAX_BONUS_SPREAD_INDEX]
-
- SEND_SIGNAL(src, COMSIG_GUN_FIRED, user, target, params, zone_override)
-
- add_fingerprint(user)
-
- if(fire_cd)
- return
-
- //Vary by at least this much
- var/randomized_bonus_spread = rand(base_bonus_spread, bonus_spread)
- var/randomized_gun_spread = spread ? rand(0, spread) : 0
- var/total_random_spread = max(0, randomized_bonus_spread + randomized_gun_spread)
- var/burst_spread_mult = rand()
-
- var/modified_delay = fire_delay
- if(phase_emitter)
- modified_delay = phase_emitter.fire_delay
- if(user && HAS_TRAIT(user, TRAIT_DOUBLE_TAP))
- modified_delay = ROUND_UP(fire_delay * 0.5)
-
- if(burst_size > 1)
- firing_burst = TRUE
- for(var/i = 1 to burst_size)
- addtimer(CALLBACK(src, PROC_REF(process_burst), user, target, message, params, zone_override, total_random_spread, burst_spread_mult, i), modified_delay * (i - 1))
- else
- if(chambered)
- if(HAS_TRAIT(user, TRAIT_PACIFISM)) // If the user has the pacifist trait, then they won't be able to fire [src] if the round chambered inside of [src] is lethal.
- if(chambered.harmful) // Is the bullet chambered harmful?
- balloon_alert(user, "lethally chambered!")
- return
- var/calculated_spread = round((rand(0, 1) - 0.5) * DUALWIELD_PENALTY_EXTRA_MULTIPLIER * total_random_spread)
- before_firing(target,user)
- process_microfusion()
- if(!chambered.fire_casing(target, user, params, , suppressed, zone_override, calculated_spread, src))
- shoot_with_empty_chamber(user)
- return
- else
- if(get_dist(user, target) <= 1) //Making sure whether the target is in vicinity for the pointblank shot
- shoot_live_shot(user, 1, target, message)
- else
- shoot_live_shot(user, 0, target, message)
- else
- shoot_with_empty_chamber(user)
- return
- process_chamber()
- update_appearance()
- fire_cd = TRUE
- var/fire_delay_to_add = 0
- if(phase_emitter)
- fire_delay_to_add = phase_emitter.fire_delay
- addtimer(CALLBACK(src, PROC_REF(reset_fire_cd)), fire_delay + fire_delay_to_add)
-
- if(user)
- user.update_held_items()
- SSblackbox.record_feedback("tally", "gun_fired", 1, type)
-
- SEND_SIGNAL(src, COMSIG_UPDATE_AMMO_HUD)
-
- return TRUE
-
-// Same goes for this!
-/obj/item/gun/microfusion/process_burst(
- mob/living/user,
- atom/target,
- message = TRUE,
- params = null,
- zone_override = "",
- random_spread = 0,
- burst_spread_mult = 0,
- iteration = 0,
- )
-
- if(!user || !firing_burst)
- firing_burst = FALSE
- return FALSE
- if(!can_shoot())
- firing_burst = FALSE
- return FALSE
- if(!chambered)
- process_chamber() // Ditto.
- if(!issilicon(user))
- if(iteration > 1 && !(user.is_holding(src))) //for burst firing
- firing_burst = FALSE
- return FALSE
- if(chambered?.loaded_projectile)
- if(HAS_TRAIT(user, TRAIT_PACIFISM)) // If the user has the pacifist trait, then they won't be able to fire [src] if the round chambered inside of [src] is lethal.
- if(chambered.harmful) // Is the bullet chambered harmful?
- balloon_alert(user, "lethally chambered!")
- return
- var/calculated_spread
- if(randomspread)
- calculated_spread = round((rand(0, 1) - 0.5) * DUALWIELD_PENALTY_EXTRA_MULTIPLIER * (random_spread))
- else //Smart spread
- calculated_spread = round((((burst_spread_mult/burst_size) * iteration) - (0.5 + (burst_spread_mult * 0.25))) * (random_spread))
- before_firing(target,user)
- process_microfusion()
- if(!chambered.fire_casing(target, user, params, ,suppressed, zone_override, calculated_spread, src))
- shoot_with_empty_chamber(user)
- firing_burst = FALSE
- return FALSE
- else
- if(get_dist(user, target) <= 1) //Making sure whether the target is in vicinity for the pointblank shot
- shoot_live_shot(user, 1, target, message)
- else
- shoot_live_shot(user, 0, target, message)
- if (iteration >= burst_size)
- firing_burst = FALSE
- else
- shoot_with_empty_chamber(user)
- firing_burst = FALSE
- return FALSE
- process_chamber()
- update_appearance()
- SEND_SIGNAL(src, COMSIG_UPDATE_AMMO_HUD)
- return TRUE
-
-/obj/item/gun/microfusion/shoot_live_shot(mob/living/user, pointblank, atom/pbtarget, message)
- if(recoil)
- shake_camera(user, recoil + 1, recoil)
-
- var/sound_freq_to_add = 0
-
- if(phase_emitter && phase_emitter.sound_freq > 1)
- sound_freq_to_add = phase_emitter.sound_freq
-
- if(suppressed)
- playsound(user, suppressed_sound, suppressed_volume, vary_fire_sound, ignore_walls = FALSE, extrarange = SILENCED_SOUND_EXTRARANGE, frequency = sound_freq_to_add, falloff_distance = 0)
- else
- playsound(user, fire_sound, fire_sound_volume, vary_fire_sound, frequency = sound_freq_to_add)
- if(message)
- if(pointblank)
- user.visible_message(span_danger("[user] fires [src] point blank at [pbtarget]!"), \
- span_danger("You fire [src] point blank at [pbtarget]!"), \
- span_hear("You hear a gunshot!"), COMBAT_MESSAGE_RANGE, pbtarget)
- to_chat(pbtarget, span_userdanger("[user] fires [src] point blank at you!"))
- if(pb_knockback > 0 && ismob(pbtarget))
- var/mob/PBT = pbtarget
- var/atom/throw_target = get_edge_target_turf(PBT, user.dir)
- PBT.throw_at(throw_target, pb_knockback, 2)
- else
- user.visible_message(span_danger("[user] fires [src]!"), \
- span_danger("You fire [src]!"), \
- span_hear("You hear a gunshot!"), COMBAT_MESSAGE_RANGE)
- if(user.resting)
- user.Immobilize(20, TRUE)
-
- phase_emitter.add_heat(heat_per_shot)
-
- if(phase_emitter.current_heat > phase_emitter.max_heat)
- if(ishuman(user))
- var/mob/living/carbon/human/human = user
- var/obj/item/bodypart/affecting = human.get_bodypart("[(user.active_hand_index % 2 == 0) ? "r" : "l" ]_arm")
- if(affecting?.receive_damage( 0, 5 )) // 1 burn damage
- to_chat(user, span_warning("[src] burns your hand, it's too hot!"))
-
-/obj/item/gun/microfusion/proc/process_microfusion()
- if(attachments.len)
- for(var/obj/item/microfusion_gun_attachment/attachment in attachments)
- attachment.process_fire(src, chambered)
- return TRUE
-
-/obj/item/gun/microfusion/proc/process_emitter()
- if(!phase_emitter)
- return SHOT_FAILURE_NO_EMITTER
- var/phase_emitter_process = phase_emitter.check_emitter()
- if(phase_emitter_process != SHOT_SUCCESS)
- return phase_emitter_process
- return SHOT_SUCCESS
-
-/obj/item/gun/microfusion/proc/instant_recharge()
- SIGNAL_HANDLER
- if(!cell)
- return
- cell.charge = cell.maxcharge
- recharge_newshot()
- update_appearance()
-
-///Used by update_icon_state() and update_overlays()
-/obj/item/gun/microfusion/proc/get_charge_ratio()
- return can_shoot() ? CEILING(clamp(cell.charge / cell.maxcharge, 0, 1) * charge_sections, 1) : 0
- // Sets the ratio to 0 if the gun doesn't have enough charge to fire, or if its power cell is removed.
-
-/**
- *
- * Outputs type-specific weapon stats for energy-based firearms based on its firing modes
- * and the stats of those firing modes. Esoteric firing modes like ion are currently not supported
- * but can be added easily
- *
- */
-/obj/item/gun/microfusion/proc/add_notes_energy()
- var/list/readout = list()
- // Make sure there is something to actually retrieve
- if(!microfusion_lens)
- return
- var/obj/projectile/exam_proj
- readout += "Our heroic interns have shown that one can theoretically stay standing after..."
- exam_proj = initial(microfusion_lens?.projectile_type)
-
- if(!istype(exam_proj))
- return readout.Join("\n")
-
- if(exam_proj.damage > 0) // Don't divide by 0!!!!!
- readout += "[span_warning("[HITS_TO_CRIT(exam_proj.damage * microfusion_lens.pellets)] shot\s")] on [span_warning("[microfusion_lens.select_name]")] mode before collapsing from [exam_proj.damage_type == STAMINA ? "immense pain" : "their wounds"]."
- if(exam_proj.stamina > 0) // In case a projectile does damage AND stamina damage (Energy Crossbow)
- readout += "[span_warning("[HITS_TO_CRIT(exam_proj.stamina * microfusion_lens.pellets)] shot\s")] on [span_warning("[microfusion_lens.select_name]")] mode before collapsing from immense pain."
- else
- readout += "a theoretically infinite number of shots on [span_warning("[microfusion_lens.select_name]")] mode."
-
- return readout.Join("\n") // Sending over the singular string, rather than the whole list
-
-/obj/item/gun/microfusion/proc/update_microfusion_lens()
- if(!microfusion_lens)
- microfusion_lens = new(src)
- fire_sound = microfusion_lens.fire_sound
- fire_sound_volume = microfusion_lens.fire_sound_volume
- fire_delay = microfusion_lens.delay
-
-// Cell, emitter and upgrade interactions
-
-/obj/item/gun/microfusion/proc/remove_emitter(mob/user)
- playsound(src, sound_cell_insert, 50, TRUE)
- phase_emitter.forceMove(get_turf(src))
- if(user)
- user.put_in_hands(phase_emitter)
- balloon_alert(user, "removed phase emitter")
- phase_emitter.parent_gun = null
- phase_emitter = null
- update_appearance()
-
-/obj/item/gun/microfusion/proc/insert_emitter(obj/item/microfusion_phase_emitter/inserting_phase_emitter, mob/living/user)
- if(phase_emitter)
- balloon_alert(user, "already one installed!")
- return FALSE
- balloon_alert(user, "inserted phase emitter")
- playsound(src, sound_cell_remove, 50, TRUE)
- inserting_phase_emitter.forceMove(src)
- phase_emitter = inserting_phase_emitter
- phase_emitter.parent_gun = src
- update_appearance()
-
-
-/// Try to insert the cell into the gun, if successful, return TRUE
-/obj/item/gun/microfusion/proc/insert_cell(mob/user, obj/item/stock_parts/power_store/cell/microfusion/inserting_cell, display_message = TRUE)
- var/tactical_reload = FALSE //We need to do this so that cells don't fall on the ground.
- var/obj/item/stock_parts/power_store/cell/old_cell = cell
-
- if(cell)
- if(tactical_reload_time && !HAS_TRAIT(user, TRAIT_INSTANT_RELOAD)) //This only happens when you're attempting a tactical reload, e.g. there's a mag already inserted.
- if(display_message)
- balloon_alert(user, "inserting cell...")
- if(!do_after(user, inserting_cell.reloading_time_tactical, src, IGNORE_USER_LOC_CHANGE))
- if(display_message)
- balloon_alert(user, "cell insertion failed!")
- return FALSE
- if(display_message)
- balloon_alert(user, "tactically reloaded!")
- tactical_reload = TRUE
- eject_cell(user, FALSE, FALSE)
- else
- if(display_message)
- balloon_alert(user, "inserting cell...")
- if(!do_after(user, inserting_cell.reloading_time, src, IGNORE_USER_LOC_CHANGE))
- if(display_message)
- balloon_alert(user, "cell insertion failed!")
- return FALSE
- if(display_message)
- balloon_alert(user, "cell inserted!")
- if(sound_cell_insert)
- playsound(src, sound_cell_insert, sound_cell_insert_volume, sound_cell_insert_vary)
- cell = inserting_cell
- inserting_cell.forceMove(src)
- inserting_cell.inserted_into_weapon()
- cell.parent_gun = src
- normal_reload_time = inserting_cell.reloading_time
- tactical_reload_time = inserting_cell.reloading_time_tactical
- if(tactical_reload)
- user.put_in_hands(old_cell)
- recharge_newshot()
- update_appearance()
- return TRUE
-
-
-/// Ejecting a cell.
-/obj/item/gun/microfusion/proc/eject_cell(mob/user, display_message = TRUE, put_in_hands = TRUE)
- var/obj/item/stock_parts/power_store/cell/microfusion/old_cell = cell
- old_cell.forceMove(get_turf(src))
- if(user)
- if(put_in_hands)
- user.put_in_hands(old_cell)
- if(display_message)
- balloon_alert(user, "cell removed")
- if(sound_cell_remove)
- playsound(src, sound_cell_remove, sound_cell_remove_volume, sound_cell_remove_vary)
- old_cell.update_appearance()
- old_cell.parent_gun = null
- cell = null
- update_appearance()
-
-/// Attatching an upgrade.
-/obj/item/gun/microfusion/proc/add_attachment(obj/item/microfusion_gun_attachment/microfusion_gun_attachment, mob/living/user)
- if(is_type_in_list(microfusion_gun_attachment, attachments))
- if(user)
- balloon_alert(user, "already has one!")
- return FALSE
- if(!(microfusion_gun_attachment.slot in attachment_slots))
- if(user)
- balloon_alert(user, "can't install!")
- return FALSE
- for(var/obj/item/microfusion_gun_attachment/iterating_attachment in attachments)
- if(is_type_in_list(microfusion_gun_attachment, iterating_attachment.incompatible_attachments))
- balloon_alert(user, "not compatible with [iterating_attachment]!")
- return FALSE
- if(iterating_attachment.slot != GUN_SLOT_UNIQUE && iterating_attachment.slot == microfusion_gun_attachment.slot)
- if(user)
- balloon_alert(user, "slot full!")
- return FALSE
- attachments += microfusion_gun_attachment
- microfusion_gun_attachment.forceMove(src)
- microfusion_gun_attachment.run_attachment(src)
- if(user)
- balloon_alert(user, "installed attachment")
- playsound(src, 'sound/effects/structure_stress/pop2.ogg', 70, TRUE)
- return TRUE
-
-/obj/item/gun/microfusion/proc/remove_attachment(obj/item/microfusion_gun_attachment/microfusion_gun_attachment, mob/living/user)
- balloon_alert(user, "removed attachment")
- playsound(src, 'sound/items/tools/screwdriver.ogg', 70)
- microfusion_gun_attachment.forceMove(get_turf(src))
- attachments -= microfusion_gun_attachment
- microfusion_gun_attachment.remove_attachment(src)
- user?.put_in_hands(microfusion_gun_attachment)
- update_appearance()
-
-// UI CONTROL
-
-/obj/item/gun/microfusion/ui_interact(mob/user, datum/tgui/ui)
- ui = SStgui.try_update_ui(user, src, ui)
- if(!ui)
- ui = new(user, src, "MicrofusionGunControl")
- ui.open()
-
-/obj/item/gun/microfusion/ui_data(mob/user)
- var/list/data = list()
-
- data["gun_name"] = name
- data["gun_desc"] = desc
- data["gun_heat_dissipation"] = heat_dissipation_bonus
-
- if(phase_emitter)
- data["has_emitter"] = TRUE
- data["phase_emitter_data"] = list(
- "type" = capitalize(phase_emitter.name),
- "integrity" = phase_emitter.integrity,
- "current_heat" = phase_emitter.current_heat,
- "throttle_percentage" = phase_emitter.throttle_percentage,
- "heat_dissipation_per_tick" = phase_emitter.heat_dissipation_per_tick,
- "max_heat" = phase_emitter.max_heat,
- "damaged" = phase_emitter.damaged,
- "hacked" = phase_emitter.hacked,
- "heat_percent" = phase_emitter.get_heat_percent(),
- "process_time" = phase_emitter.fire_delay,
- "cooling_system" = phase_emitter.cooling_system,
- "cooling_system_rate" = phase_emitter.cooling_system_rate,
- )
- else
- data["has_emitter"] = FALSE
-
- if(cell)
- var/list/attachments = list()
- for(var/obj/item/microfusion_cell_attachment/attachment in cell.attachments)
- attachments += attachment.name
- data["has_cell"] = TRUE
- data["cell_data"] = list(
- "type" = capitalize(cell.name),
- "charge" = cell.charge,
- "max_charge" = cell.maxcharge,
- "status" = cell.meltdown,
- "attachments" = attachments,
- )
- else
- data["has_cell"] = FALSE
-
-
-
- if(attachments.len)
- data["has_attachments"] = TRUE
- data["attachments"] = list()
- for(var/obj/item/microfusion_gun_attachment/attachment in attachments)
- var/list/attachment_functions = attachment.get_modify_data()
- var/has_modifications = FALSE
- if(attachment_functions?.len > 0)
- has_modifications = TRUE
- data["attachments"] += list(list(
- "name" = uppertext(attachment.name),
- "desc" = attachment.desc,
- "slot" = capitalize(attachment.slot),
- "information" = attachment.get_information_data(),
- "has_modifications" = has_modifications,
- "modify" = attachment_functions,
- "ref" = REF(attachment),
- ))
-
- else
- data["has_attachments"] = FALSE
-
- return data
-
-/obj/item/gun/microfusion/ui_act(action, list/params)
- . = ..()
- if(.)
- return
-
- switch(action)
- if("eject_cell")
- if(!cell)
- return
- eject_cell(usr)
- if("overclock_emitter")
- if(!phase_emitter)
- return
- if(!phase_emitter.hacked)
- return
- phase_emitter.set_overclock(usr)
- if("eject_emitter")
- if(!phase_emitter)
- return
- remove_emitter(usr)
- if("remove_attachment")
- var/obj/item/microfusion_gun_attachment/to_remove = locate(params["attachment_ref"]) in src
- if(!to_remove)
- return
- remove_attachment(to_remove, usr)
- if("modify_attachment")
- var/obj/item/microfusion_gun_attachment/to_modify = locate(params["attachment_ref"]) in src
- if(!to_modify)
- return
- to_modify.run_modify_data(params["modify_ref"], usr, src)
- if("toggle_cooling_system")
- if(!phase_emitter)
- return
- phase_emitter.toggle_cooling_system(usr)
-
-/// Recalculates the spread, based on attachment-provided values.
-/obj/item/gun/microfusion/proc/recalculate_spread()
- spread = max(0, attachment_spread)
-
-/// Recalculates the recoil, based on attachment-provided values.
-/obj/item/gun/microfusion/proc/recalculate_recoil()
- recoil = max(0, attachment_recoil)
-
-#undef DUALWIELD_PENALTY_EXTRA_MULTIPLIER
diff --git a/modular_skyrat/modules/microfusion/code/microfusion_gun_attachments.dm b/modular_skyrat/modules/microfusion/code/microfusion_gun_attachments.dm
deleted file mode 100644
index 6b5f6f70647..00000000000
--- a/modular_skyrat/modules/microfusion/code/microfusion_gun_attachments.dm
+++ /dev/null
@@ -1,571 +0,0 @@
-/**
-*MICROFUSION GUN UPGRADE ATTACHMENTS
-*For adding unique abilities to microfusion guns, these can directly interact with the gun!
-*/
-
-/obj/item/microfusion_gun_attachment
- name = "microfusion gun attachment"
- desc = "If you see this yell at a coder"
- icon = 'modular_skyrat/modules/microfusion/icons/microfusion_gun_attachments.dmi'
- w_class = WEIGHT_CLASS_NORMAL
- /// The attachment overlay icon state.
- var/attachment_overlay_icon_state
- /// Any incompatible upgrade types.
- var/list/incompatible_attachments = list()
- /// The added heat produced by having this module installed.
- var/heat_addition = 0
- /// The slot this attachment is installed in.
- var/slot = GUN_SLOT_UNIQUE
- /// How much extra power do we use?
- var/power_usage = 0
- /// Spread adjustment. Moved up to the base attachment type because of barrel mods and grips being in separate slots.
- var/spread_adjust
- /// Recoil adjustment. Also moved up to base attachment because of barrel mods and grips being in separate slots.
- var/recoil_adjust
-
-/obj/item/microfusion_gun_attachment/examine(mob/user)
- . = ..()
- . += "Compatible slot: [slot]."
-
-/obj/item/microfusion_gun_attachment/proc/run_attachment(obj/item/gun/microfusion/microfusion_gun)
- SHOULD_CALL_PARENT(TRUE)
- microfusion_gun.heat_per_shot += heat_addition
- microfusion_gun.update_appearance()
- microfusion_gun.extra_power_usage += power_usage
- microfusion_gun.chambered?.refresh_shot()
- if(spread_adjust)
- microfusion_gun.attachment_spread += spread_adjust
- microfusion_gun.recalculate_spread()
- if(recoil_adjust)
- microfusion_gun.attachment_recoil += recoil_adjust
- microfusion_gun.recalculate_recoil()
- return
-
-/obj/item/microfusion_gun_attachment/proc/process_attachment(obj/item/gun/microfusion/microfusion_gun, seconds_per_tick)
- return
-
-//Firing the gun right before we let go of it, tis is called.
-/obj/item/microfusion_gun_attachment/proc/process_fire(obj/item/gun/microfusion/microfusion_gun, obj/item/ammo_casing/chambered)
- return
-
-/obj/item/microfusion_gun_attachment/proc/remove_attachment(obj/item/gun/microfusion/microfusion_gun)
- SHOULD_CALL_PARENT(TRUE)
- microfusion_gun.heat_per_shot -= heat_addition
- microfusion_gun.update_appearance()
- microfusion_gun.extra_power_usage -= power_usage
- microfusion_gun.chambered?.refresh_shot()
- if(spread_adjust)
- microfusion_gun.attachment_spread -= spread_adjust
- microfusion_gun.recalculate_spread()
- if(recoil_adjust)
- microfusion_gun.attachment_recoil -= recoil_adjust
- microfusion_gun.recalculate_recoil()
- return
-
-/*
-Returns a list of modifications of this attachment, it must return a list within a list list(list()).
-All of the following must be returned.
-list(list("title" = "Toggle [toggle ? "OFF" : "ON"]", "icon" = "power-off", "color" = "blue" "reference" = "toggle_on_off"))
-title - The title of the modification button
-icon - The icon of the modification button
-color - The color of the modification button
-reference - The reference of the modification button, this is used to call the proc when the run modify data proc is called.
-*/
-/obj/item/microfusion_gun_attachment/proc/get_modify_data()
- return
-
-/obj/item/microfusion_gun_attachment/proc/run_modify_data(params, mob/living/user, obj/item/gun/microfusion/microfusion_gun)
- return
-
-/obj/item/microfusion_gun_attachment/proc/get_information_data()
- return
-
-// base type for the barrel mods because i got Really Tired of re-re-redefined variables
-/obj/item/microfusion_gun_attachment/barrel
- slot = GUN_SLOT_BARREL
- /// If this isn't null, we're replacing our next loaded projectile with this type.
- var/projectile_override
- /// If this isn't null, on attachment, this becomes the new fire sound.
- var/new_fire_sound
- /// If this isn't null or zero, adds this fire delay to the gun.
- var/delay_to_add
- /// If this isn't null or zero, adds this burst to the gun's burst size.
- var/burst_to_add
-
-/obj/item/microfusion_gun_attachment/barrel/process_fire(obj/item/gun/microfusion/microfusion_gun, obj/item/ammo_casing/chambered)
- . = ..()
- if(projectile_override)
- chambered.loaded_projectile = new projectile_override
-
-/obj/item/microfusion_gun_attachment/barrel/run_attachment(obj/item/gun/microfusion/microfusion_gun)
- . = ..()
- if(new_fire_sound)
- microfusion_gun.fire_sound = new_fire_sound
- if(delay_to_add)
- microfusion_gun.fire_delay += delay_to_add
- if(burst_to_add)
- microfusion_gun.burst_size += burst_to_add
-
-/obj/item/microfusion_gun_attachment/barrel/remove_attachment(obj/item/gun/microfusion/microfusion_gun)
- . = ..()
- if(new_fire_sound)
- microfusion_gun.fire_sound = microfusion_gun.chambered?.fire_sound
- if(delay_to_add)
- microfusion_gun.fire_delay -= delay_to_add
- if(burst_to_add)
- microfusion_gun.burst_size -= burst_to_add
-
-/*
-SCATTER ATTACHMENT
-
-Turns the gun into a shotgun.
-*/
-/obj/item/microfusion_gun_attachment/barrel/scatter
- name = "diffuser microfusion lens upgrade"
- desc = "A diffusing lens system capable of splitting one beam into three."
- icon_state = "attachment_scatter"
- attachment_overlay_icon_state = "attachment_scatter"
- slot = GUN_SLOT_BARREL
- projectile_override = /obj/projectile/beam/laser/microfusion/scatter
- /// How many pellets are we going to add to the existing amount on the gun?
- var/pellets_to_add = 2
- /// The variation in pellet scatter.
- var/variance_to_add = 20
-
-/obj/item/microfusion_gun_attachment/barrel/scatter/run_attachment(obj/item/gun/microfusion/microfusion_gun)
- . = ..()
- microfusion_gun.microfusion_lens.pellets += pellets_to_add
- microfusion_gun.microfusion_lens.variance += variance_to_add
-
-/obj/item/microfusion_gun_attachment/barrel/scatter/process_fire(obj/item/gun/microfusion/microfusion_gun, obj/item/ammo_casing/chambered)
- . = ..()
- chambered.loaded_projectile?.damage = chambered.loaded_projectile.damage / chambered.pellets
-
-/obj/item/microfusion_gun_attachment/barrel/scatter/remove_attachment(obj/item/gun/microfusion/microfusion_gun)
- . = ..()
- microfusion_gun.microfusion_lens.pellets -= pellets_to_add
- microfusion_gun.microfusion_lens.variance -= variance_to_add
-
-/*
-CRYSTALLINE SCATTER ATTACHMENT
-
-An overclocked shotgun.
-*/
-
-/obj/item/microfusion_gun_attachment/barrel/scatter/max
- name = "crystalline diffuser microfusion lens upgrade"
- desc = "An experimental diffusing lens system capable of splitting one beam into seven. However, it imparts recoil and causes an increased power draw."
- icon_state = "attachment_scattermax"
- attachment_overlay_icon_state = "attachment_scattermax"
- slot = GUN_SLOT_BARREL
- pellets_to_add = 6
- variance_to_add = 25
- recoil_adjust = 1
- spread_adjust = 15
- projectile_override = /obj/projectile/beam/laser/microfusion/scatter/max
- power_usage = 20
-
-/*
-SUPERHEAT ATTACHMENT
-
-Lasers set the target on fire.
-*/
-
-/obj/item/microfusion_gun_attachment/barrel/superheat
- name = "superheating phase emitter upgrade"
- desc = "A barrel attachment hooked to the phase emitter, this adjusts the beam's wavelength to carry an intense wave of heat; causing targets to ignite."
- icon_state = "attachment_superheat"
- attachment_overlay_icon_state = "attachment_superheat"
- heat_addition = 90
- slot = GUN_SLOT_BARREL
- projectile_override = /obj/projectile/beam/laser/microfusion/superheated
- new_fire_sound = 'modular_zubbers/sound/weapons/vaporize.ogg'
-
-/*
-HELLFIRE ATTACHMENT
-
-Makes the gun shoot hellfire lasers.
-*/
-/obj/item/microfusion_gun_attachment/barrel/hellfire
- name = "hellfire emitter upgrade"
- desc = "A barrel attachment hooked to the phase emitter, this adjusts the beam's wavelength to carry an extra wave of heat; causing nastier wounds and more damage."
- icon_state = "attachment_hellfire"
- attachment_overlay_icon_state = "attachment_hellfire"
- heat_addition = 50
- power_usage = 20
- slot = GUN_SLOT_BARREL
- projectile_override = /obj/projectile/beam/laser/microfusion/hellfire
- new_fire_sound = 'modular_zubbers/sound/weapons/melt.ogg'
-
-/*
-REPEATER ATTACHMENT
-
-The gun can fire volleys of shots.
-*/
-/obj/item/microfusion_gun_attachment/barrel/repeater
- name = "repeating phase emitter upgrade"
- desc = "This barrel attachment upgrades the central phase emitter to fire off two beams in quick succession. While offering an increased rate of fire, the heat output and recoil rises too."
- icon_state = "attachment_repeater"
- attachment_overlay_icon_state = "attachment_repeater"
- heat_addition = 40
- slot = GUN_SLOT_BARREL
- spread_adjust = 15
- recoil_adjust = 1
- burst_to_add = 1
- delay_to_add = 5
- projectile_override = /obj/projectile/beam/laser/microfusion/repeater
-
-/*
-FOCUSED REPEATER ATTACHMENT
-
-The gun can fire volleys of shots that penetrate armor.
-*/
-
-/obj/item/microfusion_gun_attachment/barrel/repeater/penetrator
- name = "focused repeating phase emitter upgrade"
- desc = "A focused variant of the repeating phase controller. It allows the lasers to penetrate armor however this results in higher power usage."
- icon_state = "attachment_penetrator"
- attachment_overlay_icon_state = "attachment_penetrator"
- power_usage = 20
- slot = GUN_SLOT_BARREL
- projectile_override = /obj/projectile/beam/laser/microfusion/penetrator
- power_usage = 80 // A price to pay to penetrate through armor
-
-/*
-X-RAY ATTACHMENT
-
-The gun can fire X-RAY shots.
-*/
-/obj/item/microfusion_gun_attachment/barrel/xray
- name = "quantum phase inverter array" //Yes quantum makes things sound cooler.
- desc = "An experimental barrel attachment that modifies the central phase emitter, causing the wave frequency to shift into X-ray. \
- Capable of penetrating both glass and solid matter with ease; though, unlike a more traditional x-ray laser gun, \
- the bolts don't carry a greater effect against armor, due to going through the target and doing more minimal internal damage. \
- These attachments are power-hungry and overheat easily, though engineers have deemed the costs necessary drawbacks."
- icon_state = "attachment_xray"
- slot = GUN_SLOT_BARREL
- attachment_overlay_icon_state = "attachment_xray"
- heat_addition = 90
- power_usage = 50
- new_fire_sound = 'modular_zubbers/sound/weapons/incinerate.ogg'
- projectile_override = /obj/projectile/beam/laser/microfusion/xray
-
-/obj/item/microfusion_gun_attachment/barrel/xray/examine(mob/user)
- . = ..()
- . += span_warning("CAUTION: Phase emitter heats up extremely quickly, sustained fire not recommended!")
-
-/*
-SUPPRESSOR ATTACHMENT
-
-Makes operators operate operatingly.
-*/
-
-/obj/item/microfusion_gun_attachment/barrel/suppressor
- name = "laser suppressor" // sure it makes no sense but its cool
- desc = "An experimental barrel attachment that dampens the soundwave of the emitter, making the laser shots far more stealthy. Best paired with black camo."
- icon_state = "attachment_suppressor"
- slot = GUN_SLOT_BARREL
- attachment_overlay_icon_state = "attachment_suppressor"
-
-/obj/item/microfusion_gun_attachment/barrel/suppressor/run_attachment(obj/item/gun/microfusion/microfusion_gun)
- . = ..()
- microfusion_gun.suppressed = TRUE
-
-/obj/item/microfusion_gun_attachment/barrel/suppressor/remove_attachment(obj/item/gun/microfusion/microfusion_gun)
- . = ..()
- microfusion_gun.suppressed = null
-
-/*
-BIKEHORN ATTACHMENT
-
-HONK!! Does subpar stamina damage but slips people.
-*/
-
-/obj/item/microfusion_gun_attachment/barrel/honk
- name = "bananium phase emitter upgrade"
- desc = "An honksperimental barrel attachment that makes your lasers funnier."
- icon_state = "attachment_honk"
- attachment_overlay_icon_state = "attachment_honk"
- delay_to_add = 2 SECONDS
- new_fire_sound = 'sound/items/bikehorn.ogg'
- projectile_override = /obj/projectile/beam/laser/microfusion/honk
-
-/obj/item/microfusion_gun_attachment/barrel/honk/examine(mob/user)
- . = ..()
- . += span_warning("CAUTION: The gun you are about to handle is extremely funny!")
-
-/*
-LANCE ATTACHMENT
-
-The gun fires fast heavy lasers but takes a long time to fire.
-*/
-/obj/item/microfusion_gun_attachment/barrel/lance
- name = "lance induction carriage"
- desc = "A modification kit that turns the MCR into a designated marksman rifle. Fired beams boast greater firepower and speed, \
- but the enhanced throughput is very draining on the cell, as well as generating an extreme amount of heat. \
- Users are advised to make their shots count."
- icon = 'icons/obj/weapons/improvised.dmi'
- icon_state = "kitsuitcase"
- incompatible_attachments = list(/obj/item/microfusion_gun_attachment/camo, /obj/item/microfusion_gun_attachment/camo/nanotrasen, /obj/item/microfusion_gun_attachment/camo/honk)
- attachment_overlay_icon_state = "attachment_lance"
- heat_addition = 150
- power_usage = 100
- delay_to_add = 2.5 SECONDS
- new_fire_sound = 'sound/items/weapons/lasercannonfire.ogg'
- projectile_override = /obj/projectile/beam/laser/microfusion/lance
-
-/obj/item/microfusion_gun_attachment/barrel/lance/examine(mob/user)
- . = ..()
- . += span_warning("CAUTION: Phase emitter heats up extremely quickly!")
-
-/*
-PULSE ATTACHMENT
-
-The gun can fire PULSE shots.
-*/
-/obj/item/microfusion_gun_attachment/barrel/pulse
- name = "pulse induction carriage"
- desc = "A cutting-edge bluespace capacitor array and distributing lens overhaul produced in laboratories by Nanotrasen scientists that allow microfusion rifles to fire military-grade pulse rounds. Comes equipped with cyclic cooling to ensure maximum combat efficiency, a munitions counter, and an extra-secure drop cage for the power source. May shorten trigger lifetime."
- icon_state = "attachment_pulse"
- attachment_overlay_icon_state = "attachment_pulse"
- heat_addition = 150
- power_usage = 50
- projectile_override = /obj/projectile/beam/pulse
- burst_to_add = 2
- delay_to_add = 2
-
-/obj/item/microfusion_gun_attachment/barrel/pulse/examine(mob/user)
- . = ..()
- . += span_warning("CAUTION: Phase emitter heats up extremely quickly, sustained fire not recommended!")
-
-/*
-GRIP ATTACHMENT
-
-Greatly reduces recoil and spread.
-*/
-/obj/item/microfusion_gun_attachment/grip
- name = "grip attachment"
- desc = "A simple grip that increases accuracy."
- icon_state = "attachment_grip"
- attachment_overlay_icon_state = "attachment_grip"
- slot = GUN_SLOT_UNDERBARREL
- spread_adjust = -10
- recoil_adjust = -1
-
-/*
-HEATSINK ATTACHMENT
-
-"Greatly increases the phase emitter cooling rate."
-*/
-/obj/item/microfusion_gun_attachment/heatsink
- name = "phase emitter heatsink"
- desc = "Greatly increases the phase emitter cooling rate."
- icon_state = "attachment_heatsink"
- attachment_overlay_icon_state = "attachment_heatsink"
- slot = GUN_SLOT_UNDERBARREL
- /// Cooling bonus.
- var/cooling_rate_increase = 50
-
-/obj/item/microfusion_gun_attachment/heatsink/run_attachment(obj/item/gun/microfusion/microfusion_gun)
- . = ..()
- microfusion_gun.heat_dissipation_bonus += cooling_rate_increase
-
-/obj/item/microfusion_gun_attachment/heatsink/remove_attachment(obj/item/gun/microfusion/microfusion_gun)
- . = ..()
- microfusion_gun.heat_dissipation_bonus -= cooling_rate_increase
-
-/*
-RGB ATTACHMENT
-
-Enables you to change the light color of the laser.
-*/
-/obj/item/microfusion_gun_attachment/rgb
- name = "phase emitter spectrograph"
- desc = "An attachment hooked up to the phase emitter, allowing the user to adjust the color of the beam outputted. This has seen widespread use by various factions capable of getting their hands on microfusion weapons, whether as a calling card or simply for entertainment."
- icon_state = "attachment_rgb"
- attachment_overlay_icon_state = "attachment_rgb"
- /// What color are we changing the sprite to?
- var/color_to_apply = COLOR_MOSTLY_PURE_RED
-
-/obj/item/microfusion_gun_attachment/rgb/process_fire(obj/item/gun/microfusion/microfusion_gun, obj/item/ammo_casing/chambered)
- . = ..()
- chambered?.loaded_projectile.icon_state = "laser_greyscale"
- chambered?.loaded_projectile.color = color_to_apply
- chambered?.loaded_projectile.light_color = color_to_apply
-
-/obj/item/microfusion_gun_attachment/rgb/proc/select_color(mob/living/user)
- var/new_color = input(user, "Please select your new projectile color", "Laser color", color_to_apply) as null|color
-
- if(!new_color)
- return
-
- color_to_apply = new_color
-
-/obj/item/microfusion_gun_attachment/rgb/attack_self(mob/user, modifiers)
- . = ..()
- select_color(user)
-
-/obj/item/microfusion_gun_attachment/rgb/get_modify_data()
- return list(list("title" = "Change Color", "icon" = "wrench", "reference" = "color", "color" = "blue"))
-
-/obj/item/microfusion_gun_attachment/rgb/run_modify_data(params, mob/living/user)
- if(params == "color")
- select_color(user)
-
-/*
-RAIL ATTACHMENT
-
-Allows for flashlights bayonets and adds 1 slot to equipment.
-*/
-/obj/item/microfusion_gun_attachment/rail
- name = "gun rail attachment"
- desc = "A simple set of rails that attaches to weapon hardpoints. Allows for 3 more attachment slots and the instillation of a flashlight or bayonet."
- icon_state = "attachment_rail"
- attachment_overlay_icon_state = "attachment_rail"
- slot = GUN_SLOT_RAIL
-
-/obj/item/microfusion_gun_attachment/rail/run_attachment(obj/item/gun/microfusion/microfusion_gun)
- . = ..()
- microfusion_gun.AddComponent(/datum/component/seclite_attachable, \
- light_overlay_icon = 'modular_skyrat/modules/microfusion/icons/microfusion_gun40x32.dmi', \
- light_overlay = "flight")
- microfusion_gun = TRUE
-
-/obj/item/microfusion_gun_attachment/rail/remove_attachment(obj/item/gun/microfusion/microfusion_gun)
- . = ..()
- var/component_to_delete = microfusion_gun.GetComponent(/datum/component/seclite_attachable)
- if(component_to_delete)
- qdel(component_to_delete)
- if(microfusion_gun)
- microfusion_gun.forceMove(get_turf(microfusion_gun))
- microfusion_gun.remove_all_attachments()
- microfusion_gun = null
- microfusion_gun.update_appearance()
-
-/*
-SCOPE ATTACHMENT
-
-Allows for a scope to be attached to the gun.
-*/
-
-/obj/item/microfusion_gun_attachment/scope
- name = "scope attachment"
- desc = "A simple telescopic scope, allowing for long-ranged use of the weapon. However, these do not provide any night vision."
- icon_state = "attachment_scope"
- attachment_overlay_icon_state = "attachment_scope"
- slot = GUN_SLOT_RAIL
-
-/obj/item/microfusion_gun_attachment/scope/run_attachment(obj/item/gun/microfusion/microfusion_gun)
- . = ..()
- if(microfusion_gun.GetComponent(/datum/component/scope))
- return
- microfusion_gun.AddComponent(/datum/component/scope, range_modifier = 1.5)
-
-/obj/item/microfusion_gun_attachment/scope/remove_attachment(obj/item/gun/microfusion/microfusion_gun)
- . = ..()
- var/datum/component_datum = microfusion_gun.GetComponent(/datum/component/scope)
- if(component_datum)
- qdel(component_datum)
-
-/*
-BLACK CAMO ATTACHMENT
-
-Allows for a black camo to be applied to the gun.
-All tactical, all the time.
-*/
-
-/obj/item/microfusion_gun_attachment/camo
- name = "black camo microfusion frame"
- desc = "A frame modification for the MCR-01, changing the color of the gun to black."
- slot = GUN_SLOT_CAMO
- icon_state = "attachment_black"
- attachment_overlay_icon_state = "attachment_black"
-
-/*
-HONK CAMO ATTACHMENT
-
-Allows for a clown camo to be applied to the gun.
-HONK!!
-*/
-/obj/item/microfusion_gun_attachment/camo/honk
- name = "bananium microfusion frame"
- desc = "A frame modification for the MCR-01, plating the gun in bananium."
- icon_state = "attachment_honk_camo"
- attachment_overlay_icon_state = "attachment_honk_camo"
-
-/*
-SYNDIE CAMO ATTACHMENT
-
-Allows for a blood red camo to be applied to the gun.
-Totally not property of a hostile corporation.
-*/
-/obj/item/microfusion_gun_attachment/camo/syndicate
- name = "blood red camo microfusion frame"
- desc = "A frame modification for the MCR-01, changing the color of the gun to a slick blood red."
- icon_state = "attachment_syndi_camo"
- attachment_overlay_icon_state = "attachment_syndi_camo"
-
-/*
-NANOTRASEN CAMO ATTACHMENT
-
-Allows for an official blue camo to be applied to the gun.
-Hail Nanotrasen.
-*/
-/obj/item/microfusion_gun_attachment/camo/nanotrasen
- name = "\improper Nanotrasen brand microfusion frame"
- desc = "A frame modification for the MCR-01, changing the color of the gun to blue."
- icon_state = "attachment_nt_camo"
- attachment_overlay_icon_state = "attachment_nt_camo"
-
-
-/*
-UNDERCHARGER ATTACHMENT
-
-Massively decreases the output beam of the phase emitter.
-Converts shots to STAMINA damage.
-*/
-/obj/item/microfusion_gun_attachment/undercharger
- name = "phase emitter undercharger"
- desc = "An underbarrel system hooked to the phase emitter, this allows the weapon to also fire an electron bolt, producing a short-lived underpowered electric charge capable of stunning targets. These shots are less demanding on the weapon, leading to an increase in cooling rate."
- icon_state = "attachment_undercharger"
- attachment_overlay_icon_state = "attachment_undercharger"
- incompatible_attachments = list(/obj/item/microfusion_gun_attachment/barrel/scatter, /obj/item/microfusion_gun_attachment/barrel/scatter/max, /obj/item/microfusion_gun_attachment/camo/honk)
- slot = GUN_SLOT_UNDERBARREL
- var/toggle = FALSE
- var/cooling_rate_increase = 10
- /// The projectile we override
- var/projectile_override = /obj/projectile/beam/microfusion_disabler
-
-/obj/item/microfusion_gun_attachment/undercharger/get_modify_data()
- return list(list("title" = "Turn [toggle ? "OFF" : "ON"]", "icon" = "power-off", "color" = "[toggle ? "red" : "green"]", "reference" = "toggle_on_off"))
-
-/obj/item/microfusion_gun_attachment/undercharger/run_modify_data(params, mob/living/user, obj/item/gun/microfusion/microfusion_gun)
- if(params == "toggle_on_off")
- toggle(microfusion_gun, user)
-
-/obj/item/microfusion_gun_attachment/undercharger/proc/toggle(obj/item/gun/microfusion/microfusion_gun, mob/user)
- if(toggle)
- toggle = FALSE
- microfusion_gun.heat_dissipation_bonus += cooling_rate_increase
- else
- toggle = TRUE
- microfusion_gun.heat_dissipation_bonus -= cooling_rate_increase
-
- if(user)
- to_chat(user, span_notice("You toggle [src] [toggle ? "ON" : "OFF"]."))
-
-/obj/item/microfusion_gun_attachment/undercharger/run_attachment(obj/item/gun/microfusion/microfusion_gun)
- . = ..()
- microfusion_gun.fire_sound = 'modular_zubbers/sound/weapons/burn.ogg'
-
-/obj/item/microfusion_gun_attachment/undercharger/process_fire(obj/item/gun/microfusion/microfusion_gun, obj/item/ammo_casing/chambered)
- . = ..()
- if(toggle)
- chambered.loaded_projectile = new projectile_override
-
-/obj/item/microfusion_gun_attachment/undercharger/remove_attachment(obj/item/gun/microfusion/microfusion_gun)
- . = ..()
- if(toggle)
- toggle = FALSE
- microfusion_gun.heat_dissipation_bonus += cooling_rate_increase
- microfusion_gun.fire_sound = microfusion_gun.chambered?.fire_sound
diff --git a/modular_skyrat/modules/microfusion/code/microfusion_techweb.dm b/modular_skyrat/modules/microfusion/code/microfusion_techweb.dm
deleted file mode 100644
index 30d6b568bfb..00000000000
--- a/modular_skyrat/modules/microfusion/code/microfusion_techweb.dm
+++ /dev/null
@@ -1,118 +0,0 @@
-// Microfusion research is now tied to other researches
-/datum/techweb_node/parts/New()
- . = ..()
- design_ids += list(
- "basic_microfusion_cell",
- )
-
-/datum/techweb_node/parts_upg/New()
- . = ..()
- design_ids += list(
- "enhanced_microfusion_cell",
- )
-
-//Enhanced microfusion
-/datum/techweb_node/energy_manipulation/New()
- . = ..()
- design_ids += list(
- "enhanced_microfusion_phase_emitter",
- "microfusion_gun_attachment_black_camo",
- "microfusion_gun_attachment_nt_camo",
- "microfusion_gun_attachment_heatsink",
- "microfusion_gun_attachment_rgb",
- )
-
-/datum/techweb_node/parts_adv/New()
- . = ..()
- design_ids += list(
- "advanced_microfusion_cell",
- )
-
-//Improved microfusion
-/datum/techweb_node/improved_microfusion
- id = TECHWEB_NODE_IMPROVED_MICROFUSION
- display_name = "Improved Microfusion Technology"
- description = "Improvements to part manufacturing methods allow us to manufacture \
- additional attachments for the MCR"
- prereq_ids = list(
- TECHWEB_NODE_PARTS_ADV,
- )
- design_ids = list(
- "microfusion_cell_attachment_overcapacity",
- "microfusion_cell_attachment_stabiliser",
- "microfusion_gun_attachment_scatter",
- "microfusion_gun_attachment_hellfire",
- "advanced_microfusion_phase_emitter",
- "microfusion_gun_attachment_lance",
- "microfusion_gun_attachment_grip",
- "microfusion_gun_attachment_rail",
- "microfusion_gun_attachment_scope",
- )
- research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_1_POINTS)
-
-
-// Bluespace microfusion
-/datum/techweb_node/bluespace_microfusion
- id = TECHWEB_NODE_BLUESPACE_MICROFUSION
- display_name = "Bluespace Microfusion Technology"
- description = "Bluespace tinkering plus microfusion technology!"
- prereq_ids = list(
- TECHWEB_NODE_IMPROVED_MICROFUSION,
- TECHWEB_NODE_PARTS_BLUESPACE,
- TECHWEB_NODE_BEAM_WEAPONS,
- TECHWEB_NODE_ELECTRIC_WEAPONS,
- TECHWEB_NODE_FUSION,
- )
- design_ids = list(
- "bluespace_microfusion_cell",
- "microfusion_gun_attachment_repeater",
- "bluespace_microfusion_phase_emitter",
- "microfusion_cell_attachment_selfcharging",
- )
- research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_2_POINTS)
-
-// Quantum microfusion
-/datum/techweb_node/quantum_microfusion
- id = TECHWEB_NODE_QUANTUM_MICROFUSION
- display_name = "Quantum Microfusion Technology"
- description = "Bleeding edge microfusion tech, making use of the latest in materials and components, bluespace or otherwise."
- prereq_ids = list(
- TECHWEB_NODE_BLUESPACE_MICROFUSION,
- TECHWEB_NODE_ALIENTECH,
- )
- design_ids = list(
- "microfusion_gun_attachment_xray",
- )
- research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_3_POINTS)
-
-// Warcrime microfusion
-/datum/techweb_node/illegal_microfusion
- id = TECHWEB_NODE_ILLEGAL_MICROFUSION
- display_name = "Illegal Microfusion Technology"
- description = "Microfusion tech that has previously been banned by TerraGov. I love the smell of plasma in the mornings."
- prereq_ids = list(
- TECHWEB_NODE_IMPROVED_MICROFUSION,
- TECHWEB_NODE_SYNDICATE_BASIC,
- )
- design_ids = list(
- "microfusion_gun_attachment_superheat",
- "microfusion_gun_attachment_scattermax",
- "microfusion_gun_attachment_penetrator",
- "microfusion_gun_attachment_syndi_camo",
- "microfusion_gun_attachment_suppressor",
- )
- research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_4_POINTS)
-
-// Clown microfusion.
-/datum/techweb_node/clown_microfusion
- id = TECHWEB_NODE_CLOWN_MICROFUSION
- display_name = "Honkicron Clownery Systems Technology"
- description = "Microfusion tech that is proprietary tech of Honkicron Clownery Systems. HONK!!"
- prereq_ids = list(
- TECHWEB_NODE_IMPROVED_MICROFUSION,
- )
- design_ids = list(
- "microfusion_gun_attachment_honk",
- "microfusion_gun_attachment_honk_camo",
- )
- research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_1_POINTS) //Its normally supposed to be in clown tech so
diff --git a/modular_skyrat/modules/microfusion/code/phase_emitter.dm b/modular_skyrat/modules/microfusion/code/phase_emitter.dm
deleted file mode 100644
index eade9e3407b..00000000000
--- a/modular_skyrat/modules/microfusion/code/phase_emitter.dm
+++ /dev/null
@@ -1,234 +0,0 @@
-/*
-* PHASE EMITTERS
-*/
-
-/// The error message returned when the phase emitter is processed but damaged.
-#define PHASE_FAILURE_DAMAGED "PHASE EMITTER: Emitter damaged!"
-/// The error message returned when the phase emitter has reached it's htermal throttle.
-#define PHASE_FAILURE_THROTTLE "PHASE EMITTER: Thermal throttle active!"
-
-/// The heat dissipation bonus of an emitter being in space!
-#define PHASE_HEAT_DISSIPATION_BONUS_SPACE 30
-/// The heat dissipation bonus of an emitter being in air!
-#define PHASE_HEAT_DISSIPATION_BONUS_AIR 10
-
-/*
-* Basically the heart of the gun, can be upgraded.
-*/
-/obj/item/microfusion_phase_emitter
- name = "basic microfusion phase emitter"
- desc = "A first-generation phase emitter, this is the core of the weapon and the source of the beam."
- icon = 'modular_skyrat/modules/microfusion/icons/microfusion_gun_attachments.dmi'
- icon_state = "phase_emitter"
- base_icon_state = "phase_emitter"
- w_class = WEIGHT_CLASS_NORMAL
- /// Max heat before it breaks
- var/max_heat = 2000
- /// Current heat level
- var/current_heat = 0
- /// Thermal throttle percentage
- var/throttle_percentage = 80
- /// How much heat it dissipates passively
- var/heat_dissipation_per_tick = 30
- /// Active cooling system
- var/cooling_system = FALSE
- /// How quickly does the active cooling system cool - 1/1 ratio of cell charge to cooling point
- var/cooling_system_rate = 30
- /// What is our dynamic integrity?
- var/integrity = 100
- /// Are we fucked?
- var/damaged = FALSE
- /// Hard ref to the gun.
- var/obj/item/gun/microfusion/parent_gun
- /// Are we "hacked" thus allowing overclocking?
- var/hacked = FALSE
- /// The fire delay this emitter adds to the gun.
- var/fire_delay = 0
- /// The sound playback speed, used for overheating sound effects on fire.
- var/sound_freq = 0
-
-
-/obj/item/microfusion_phase_emitter/Initialize(mapload)
- . = ..()
- START_PROCESSING(SSobj, src)
-
-/obj/item/microfusion_phase_emitter/Destroy()
- parent_gun = null
- return ..()
-
-/obj/item/microfusion_phase_emitter/process(seconds_per_tick)
- if(current_heat == 0)
- return
- var/calculated_heat_dissipation_per_tick = heat_dissipation_per_tick
- if(isspaceturf(get_turf(src)))
- calculated_heat_dissipation_per_tick += PHASE_HEAT_DISSIPATION_BONUS_SPACE // Passive cooling in space boost!
- if(parent_gun)
- calculated_heat_dissipation_per_tick += parent_gun.heat_dissipation_bonus
- else
- calculated_heat_dissipation_per_tick += PHASE_HEAT_DISSIPATION_BONUS_AIR //We get some passive cooling from being out of the gun.
- if(cooling_system && parent_gun && parent_gun.cell && parent_gun.cell.use(cooling_system_rate))
- calculated_heat_dissipation_per_tick += cooling_system_rate
-
- current_heat = clamp(current_heat - (calculated_heat_dissipation_per_tick * seconds_per_tick) * 0.5, 0, INFINITY)
- if(current_heat > max_heat)
- integrity = integrity - current_heat / 1000 * seconds_per_tick * 0.5
-
- process_fire_delay_and_sound()
-
- if(integrity <= 0)
- kill()
- update_appearance()
- parent_gun?.update_appearance()
-
-/obj/item/microfusion_phase_emitter/proc/toggle_cooling_system(mob/user)
- if(!parent_gun)
- return
- if(!cooling_system && !parent_gun.cell)
- if(user)
- to_chat(user, span_warning("You need a cell to turn on the cooling system."))
- return
-
- if(cooling_system)
- cooling_system = FALSE
- else
- cooling_system = TRUE
-
- if(user)
- to_chat(user, span_notice("You toggle the cooling system [cooling_system ? "ON" : "OFF"]."))
-
-/obj/item/microfusion_phase_emitter/multitool_act(mob/living/user, obj/item/tool)
- if(hacked)
- to_chat(user, span_warning("[src] is already unlocked!"))
- return
- to_chat(user, span_notice("You begin to override the thermal overclock safety..."))
- if(do_after(user, 5 SECONDS, src))
- hacked = TRUE
- to_chat(user, span_notice("You override the thermal overclock safety."))
-
-/obj/item/microfusion_phase_emitter/proc/set_overclock(mob/living/user)
- if(!hacked)
- return
- var/new_throttle = clamp(input(user, "Please input a new thermal throttle percentage(0-300):", "Phase Emitter Overclock") as null|num, 1, 300)
-
- to_chat(user, span_notice("Thermal throttle percent set to: [new_throttle]."))
-
- if(new_throttle > 100)
- to_chat(user, span_danger("WARNING: You have input a throttle percentage of more than 100, this may cause emitter damage."))
-
- throttle_percentage = new_throttle
-
-/obj/item/microfusion_phase_emitter/update_icon_state()
- . = ..()
-
- if(damaged)
- icon_state = "[base_icon_state]_damaged"
- else
- switch(get_heat_percent())
- if(40 to 69)
- icon_state = "[base_icon_state]_hot"
- if(70 to INFINITY)
- icon_state = "[base_icon_state]_critical"
- else
- icon_state = base_icon_state
-
-/obj/item/microfusion_phase_emitter/proc/process_fire_delay_and_sound()
- var/fire_delay_to_add = 0
- if(integrity < 100)
- fire_delay_to_add = fire_delay_to_add + (100 - integrity) / 10
-
- if(current_heat > max_heat)
- fire_delay_to_add = fire_delay_to_add + (current_heat - max_heat) / 100 //Holy shit this emitter is tanking
-
- fire_delay = round(fire_delay_to_add, 1.45)
-
-/obj/item/microfusion_phase_emitter/proc/get_heat_icon_state()
- switch(get_heat_percent())
- if(40 to 69)
- return "hot"
- if(70 to INFINITY)
- return "critical"
- else
- return "normal"
-
-/obj/item/microfusion_phase_emitter/examine(mob/user)
- . = ..()
- if(damaged)
- . += span_danger("It is damaged beyond repair.")
- else
- . += span_notice("It has a thermal rating of: [max_heat] C")
- . += span_notice("It dissipates heat at: [heat_dissipation_per_tick] C")
- . += span_notice("Heat capacity: [get_heat_percent()]%")
- . += span_notice("Integrity: [integrity]%")
- . += span_notice("Thermal throttle: [throttle_percentage]%")
- . += span_notice("Cooling system: [cooling_system ? "enabled, cooling at [cooling_system_rate] C/s" : "disabled"].")
-
-/obj/item/microfusion_phase_emitter/proc/get_heat_percent()
- return round(current_heat / max_heat * 100)
-
-/obj/item/microfusion_phase_emitter/proc/check_emitter()
- if(damaged)
- return PHASE_FAILURE_DAMAGED
- if(get_heat_percent() >= throttle_percentage)
- return PHASE_FAILURE_THROTTLE
- return SHOT_SUCCESS
-
-/obj/item/microfusion_phase_emitter/proc/add_heat(heat_to_add)
- current_heat += heat_to_add
- update_appearance()
-
-/obj/item/microfusion_phase_emitter/proc/kill()
- damaged = TRUE
- name = "damaged [name]"
- playsound(src, 'modular_skyrat/modules/microfusion/sound/overheat.ogg', 70)
- say("ERROR: Integrity failure!")
- STOP_PROCESSING(SSobj, src)
-
-/obj/item/microfusion_phase_emitter/enhanced
- name = "enhanced microfusion phase emitter"
- desc = "A second-generation phase emitter, this one is made of more robust materials which allow for a higher capacity for heat, a faster dissipation and cooling of it, and more capacity for thermal throttling."
- max_heat = 2500
- throttle_percentage = 85
- heat_dissipation_per_tick = 40
- cooling_system_rate = 40
- integrity = 120
- color = "#ffffcc"
-
-/obj/item/microfusion_phase_emitter/advanced
- name = "advanced microfusion phase emitter"
- desc = "A third-generation phase emitter, boasting a high capacity for heat, greater dissipation and cooling, and is built using higher-grade materials for more durability."
- max_heat = 3000
- throttle_percentage = 90
- heat_dissipation_per_tick = 50
- cooling_system_rate = 50
- integrity = 150
- color = "#99ffcc"
-
-/obj/item/microfusion_phase_emitter/bluespace
- name = "bluespace microfusion phase emitter"
- desc = "A fourth-generation phase emitter, utilizing a bluespace medium to store and manage heat, allowing for much cooler temperatures than realspace would allow. This is made of nothing but the latest materials, leading to the highest durability of any phase emitter on the market."
- max_heat = 3500
- throttle_percentage = 95
- heat_dissipation_per_tick = 60
- cooling_system_rate = 60
- integrity = 200
- color = "#66ccff"
-
-/obj/item/microfusion_phase_emitter/nanocarbon
- name = "nanocarbon microfusion phase emitter"
- desc = "An experimental phase emitter, made of nanocarbon, which is the most durable material on the market. It is capable of storing and managing heat, and is capable of cooling at a much higher rate than the other phase emitters."
- max_heat = 15000
- throttle_percentage = 95
- heat_dissipation_per_tick = 130
- cooling_system_rate = 60
- integrity = 500
- color = "#6966ff"
-
-
-#undef PHASE_FAILURE_DAMAGED
-#undef PHASE_FAILURE_THROTTLE
-
-#undef PHASE_HEAT_DISSIPATION_BONUS_SPACE
-#undef PHASE_HEAT_DISSIPATION_BONUS_AIR
-
-#undef SHOT_SUCCESS
-#undef SHOT_FAILURE_NO_EMITTER
diff --git a/modular_skyrat/modules/microfusion/code/projectiles.dm b/modular_skyrat/modules/microfusion/code/projectiles.dm
deleted file mode 100644
index 180fbac43a0..00000000000
--- a/modular_skyrat/modules/microfusion/code/projectiles.dm
+++ /dev/null
@@ -1,103 +0,0 @@
-/obj/item/ammo_casing
- ///What volume should the sound play at?
- var/fire_sound_volume = 50
-
-/obj/item/ammo_casing/energy/laser/microfusion
- name = "microfusion energy lens"
- projectile_type = /obj/projectile/beam/laser/microfusion
- e_cost = LASER_SHOTS(12, STANDARD_CELL_CHARGE)
- select_name = "laser"
- fire_sound = 'modular_zubbers/sound/weapons/laser.ogg'
- fire_sound_volume = 100
-
-/obj/item/ammo_casing/proc/refresh_shot()
- loaded_projectile = new projectile_type(src, src)
-
-/obj/projectile/beam/laser/microfusion
- name = "microfusion laser"
- icon = 'modular_skyrat/modules/microfusion/icons/projectiles.dmi'
- damage = 25
-
-/obj/projectile/beam/microfusion_disabler
- name = "microfusion disabler laser"
- icon = 'modular_skyrat/modules/microfusion/icons/projectiles.dmi'
- icon_state = "disabler"
- damage = 41
- damage_type = STAMINA
- armor_flag = ENERGY
- hitsound = 'sound/items/weapons/tap.ogg'
- eyeblur = 0
- impact_effect_type = /obj/effect/temp_visual/impact_effect/blue_laser
- light_color = LIGHT_COLOR_BLUE
- tracer_type = /obj/effect/projectile/tracer/disabler
- muzzle_type = /obj/effect/projectile/muzzle/disabler
- impact_type = /obj/effect/projectile/impact/disabler
-
-/obj/projectile/beam/laser/microfusion/superheated
- name = "superheated microfusion laser"
- icon_state = "laser_greyscale"
- damage = 20 //Trading damage for fire stacks
- color = LIGHT_COLOR_FIRE
- light_color = LIGHT_COLOR_FIRE
-
-/obj/projectile/beam/laser/microfusion/superheated/on_hit(atom/target, blocked = 0, pierce_hit)
- . = ..()
- if(isliving(target))
- var/mob/living/living = target
- living.adjust_fire_stacks(2)
- living.ignite_mob()
-
-/obj/projectile/beam/laser/microfusion/hellfire
- name = "hellfire microfusion laser"
- icon_state = "laser_greyscale"
- wound_bonus = 0
- damage = 25 // Basically a hellfire beam
- speed = 1.6
- color = LIGHT_COLOR_FLARE
- light_color = LIGHT_COLOR_FLARE
-
-/obj/projectile/beam/laser/microfusion/scatter
- name = "scatter microfusion laser"
- damage = 30 // This damage is split into pellet amount
-
-/obj/projectile/beam/laser/microfusion/scatter/max
- name = "scatter microfusion laser"
- damage = 45 // This damage is split into pellet amount
-
-/obj/projectile/beam/laser/microfusion/repeater
- damage = 12.5
-
-/obj/projectile/beam/laser/microfusion/penetrator
- name = "focused microfusion laser"
- damage = 20
- armour_penetration = 50
-
-/obj/projectile/beam/laser/microfusion/lance
- name = "lance microfusion laser"
- damage = 50 // We're turning the gun into a heavylaser
- tracer_type = /obj/effect/projectile/tracer/heavy_laser
- muzzle_type = /obj/effect/projectile/muzzle/heavy_laser
- impact_type = /obj/effect/projectile/impact/heavy_laser
- speed = 2.5
-
-/obj/projectile/beam/laser/microfusion/xray
- name = "x-ray microfusion laser"
- icon_state = "laser_greyscale"
- color = COLOR_GREEN
- light_color = COLOR_GREEN
- projectile_piercing = PASSCLOSEDTURF|PASSGRILLE|PASSGLASS
-
-/obj/projectile/beam/laser/microfusion/honk
- name = "funny microfusion laser"
- icon_state = "laser_greyscale"
- color = COLOR_VIVID_YELLOW
- light_color = COLOR_VIVID_YELLOW
- damage_type = STAMINA
- damage = 25
- armor_flag = ENERGY
- hitsound = 'sound/misc/slip.ogg'
- impact_type = /obj/effect/projectile/impact/disabler
-
-/obj/projectile/beam/laser/microfusion/honk/Initialize(mapload)
- . = ..()
- AddComponent(/datum/component/slippery, 20)
diff --git a/modular_skyrat/modules/modular_ert/code/odst/odst_outfit.dm b/modular_skyrat/modules/modular_ert/code/odst/odst_outfit.dm
index 41f35615194..29e1f8cfad4 100644
--- a/modular_skyrat/modules/modular_ert/code/odst/odst_outfit.dm
+++ b/modular_skyrat/modules/modular_ert/code/odst/odst_outfit.dm
@@ -5,7 +5,7 @@
glasses = /obj/item/clothing/glasses/hud/security/night
ears = /obj/item/radio/headset/headset_cent/alt
gloves = /obj/item/clothing/gloves/combat
- l_hand = /obj/item/gun/ballistic/automatic/sol_rifle/machinegun
+ l_hand = /obj/item/gun/ballistic/automatic/ar // Hey admins remember this is the tie-in top damage gun ingame. Don't use this lightly, I beg.
belt = /obj/item/storage/belt/military/odst
back = /obj/item/mod/control/pre_equipped/responsory/security
backpack_contents = list(
diff --git a/modular_skyrat/modules/modular_implants/code/misc_devices.dm b/modular_skyrat/modules/modular_implants/code/misc_devices.dm
index d6b771f414d..bfb5645c7a4 100644
--- a/modular_skyrat/modules/modular_implants/code/misc_devices.dm
+++ b/modular_skyrat/modules/modular_implants/code/misc_devices.dm
@@ -55,12 +55,6 @@
icon_state = "nifsoft_remover_syndie"
create_disk = TRUE
-/datum/uplink_item/device_tools/nifsoft_remover
- name = "Cybersun 'Scalpel' NIF-Cutter"
- desc = "A modified version of a NIFSoft remover that allows the user to remove a NIFSoft and have a blank copy of the removed NIFSoft saved to a disk."
- item = /obj/item/nifsoft_remover/syndie
- cost = 3
-
///NIF Repair Kit.
/obj/item/nif_repair_kit
name = "Cerulean NIF Regenerator"
diff --git a/modular_skyrat/modules/modular_items/code/bags.dm b/modular_skyrat/modules/modular_items/code/bags.dm
index 200d770daf9..164c9114cd8 100644
--- a/modular_skyrat/modules/modular_items/code/bags.dm
+++ b/modular_skyrat/modules/modular_items/code/bags.dm
@@ -36,7 +36,7 @@
atom_storage.max_total_storage = 12
atom_storage.max_slots = 3
atom_storage.numerical_stacking = FALSE
- atom_storage.can_hold = typecacheof(list(/obj/item/ammo_box/magazine, /obj/item/ammo_casing, /obj/item/stock_parts/power_store/cell/microfusion))
+ atom_storage.can_hold = typecacheof(list(/obj/item/ammo_box/magazine, /obj/item/ammo_casing))
/obj/item/storage/pouch/ammo/post_reskin(mob/our_mob)
if(icon_state == "casingpouch")
diff --git a/modular_skyrat/modules/modular_weapons/code/autolathe_designs.dm b/modular_skyrat/modules/modular_weapons/code/autolathe_designs.dm
index d91a802fd84..d73948a76a9 100644
--- a/modular_skyrat/modules/modular_weapons/code/autolathe_designs.dm
+++ b/modular_skyrat/modules/modular_weapons/code/autolathe_designs.dm
@@ -2,19 +2,6 @@
* AMMO
*/
-/datum/design/strilka310_rubber
- name = ".310 Rubber Bullet (Less Lethal)"
- id = "astrilka310_rubber"
- build_type = AUTOLATHE
- materials = list(
- /datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT,
- )
- build_path = /obj/item/ammo_casing/strilka310/rubber
- category = list(
- RND_CATEGORY_HACKED,
- RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO,
- )
-
// 4.6x30mm - SMG round, used in the WT550 and in numerous modular guns as a weaker alternative to 9mm.
/datum/design/c46x30mm
@@ -30,19 +17,6 @@
RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO,
)
-/datum/design/c46x30mm_rubber
- name = "4.6x30mm Rubber Bullet"
- id = "c46x30mm_rubber"
- build_type = AUTOLATHE
- materials = list(
- /datum/material/iron = SMALL_MATERIAL_AMOUNT * 7.5
- )
- build_path = /obj/item/ammo_casing/c46x30mm/rubber
- category = list(
- RND_CATEGORY_INITIAL,
- RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO,
- )
-
// .45
/datum/design/c45_lethal
@@ -57,43 +31,3 @@
RND_CATEGORY_HACKED,
RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO,
)
-
-/datum/design/c45_rubber
- name = ".45 Bouncy Rubber Ball"
- id = "c45_rubber"
- build_type = AUTOLATHE
- materials = list(
- /datum/material/iron = SMALL_MATERIAL_AMOUNT * 7.5,
- )
- build_path = /obj/item/ammo_casing/c45/rubber
- category = list(
- RND_CATEGORY_INITIAL,
- RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO,
- )
-
-// 10mm
-/datum/design/c10mm_lethal
- name = "10mm Bullet"
- id = "c10mm_lethal"
- build_type = AUTOLATHE
- materials = list(
- /datum/material/iron = SMALL_MATERIAL_AMOUNT * 7.5,
- )
- build_path = /obj/item/ammo_casing/c10mm
- category = list(
- RND_CATEGORY_HACKED,
- RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO,
- )
-
-/datum/design/c10mm_rubber
- name = "10mm Rubber Bullet"
- id = "c10mm_rubber"
- build_type = AUTOLATHE
- materials = list(
- /datum/material/iron = SMALL_MATERIAL_AMOUNT * 7.5,
- )
- build_path = /obj/item/ammo_casing/c10mm/rubber
- category = list(
- RND_CATEGORY_INITIAL,
- RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO,
- )
diff --git a/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/carwo_defense_systems/ammo/rifle.dm b/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/carwo_defense_systems/ammo/rifle.dm
deleted file mode 100644
index 039b39b692c..00000000000
--- a/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/carwo_defense_systems/ammo/rifle.dm
+++ /dev/null
@@ -1,195 +0,0 @@
-// .40 Sol Long
-// Rifle caliber caseless ammo that kills people good
-
-/obj/item/ammo_casing/c40sol
- name = ".40 Sol Long lethal bullet casing"
- desc = "A TerraGov standard caseless lethal rifle round."
-
- icon = 'modular_skyrat/modules/modular_weapons/icons/obj/company_and_or_faction_based/carwo_defense_systems/ammo.dmi'
- icon_state = "40sol"
-
- caliber = CALIBER_SOL40LONG
- projectile_type = /obj/projectile/bullet/c40sol
-
-
-/obj/item/ammo_casing/c40sol/Initialize(mapload)
- . = ..()
-
- AddElement(/datum/element/caseless)
-
-
-/obj/projectile/bullet/c40sol
- name = ".40 Sol Long bullet"
- damage = 35
-
- wound_bonus = -30
- exposed_wound_bonus = -35
-
-
-/obj/item/ammo_box/c40sol
- name = "ammo box (.40 Sol Long lethal)"
- desc = "A box of .40 Sol Long rifle rounds, holds thirty bullets."
-
- icon = 'modular_skyrat/modules/modular_weapons/icons/obj/company_and_or_faction_based/carwo_defense_systems/ammo.dmi'
- icon_state = "40box"
-
- multiple_sprites = AMMO_BOX_FULL_EMPTY
-
- w_class = WEIGHT_CLASS_NORMAL
-
- caliber = CALIBER_SOL40LONG
- ammo_type = /obj/item/ammo_casing/c40sol
- max_ammo = 30
-
-
-// .40 Sol fragmentation rounds, embeds shrapnel in the target almost every time at close to medium range. Teeeechnically less lethals.
-
-/obj/item/ammo_casing/c40sol/fragmentation
- name = ".40 Sol Long fragmentation bullet casing"
- desc = "A TerraGov standard caseless fragmentation rifle round. Shatters upon impact, ejecting sharp shrapnel that can potentially incapacitate targets."
-
- icon_state = "40sol_disabler"
-
- projectile_type = /obj/projectile/bullet/c40sol/fragmentation
-
- advanced_print_req = TRUE
-
- harmful = FALSE
-
-
-/obj/projectile/bullet/c40sol/fragmentation
- name = ".40 Sol Long fragmentation bullet"
- damage = 15
- stamina = 30
-
- weak_against_armour = TRUE
-
- sharpness = SHARP_EDGED
- wound_bonus = 0
- exposed_wound_bonus = 20
-
- shrapnel_type = /obj/item/shrapnel/stingball
- embed_type = /datum/embedding/c40sol_fragmentation
-
- embed_falloff_tile = -5
-
-/datum/embedding/c40sol_fragmentation
- embed_chance = 50
- fall_chance = 5
- jostle_chance = 5
- ignore_throwspeed_threshold = TRUE
- pain_stam_pct = 0.4
- pain_mult = 2
- jostle_pain_mult = 3
- rip_time = 0.5 SECONDS
-
-/obj/item/ammo_box/c40sol/fragmentation
- name = "ammo box (.40 Sol Long fragmentation)"
- desc = "A box of .40 Sol Long rifle rounds, holds thirty bullets. The blue stripe indicates this should hold less lethal ammunition."
-
- icon_state = "40box_disabler"
-
- ammo_type = /obj/item/ammo_casing/c40sol/fragmentation
-
-
-// .40 Sol match grade, bounces a lot, and if there's less than 20 bullet armor on wherever these hit, it'll go completely through the target and out the other side
-
-/obj/item/ammo_casing/c40sol/pierce
- name = ".40 Sol Long match bullet casing"
- desc = "A TerraGov standard caseless match grade rifle round. Fires at a higher pressure and thus fires slightly faster projectiles. \
- Rumors say you can do sick ass wall bounce trick shots with these, though the official suggestion is to just shoot your target and \
- not the wall next to them."
-
- icon_state = "40sol_pierce"
-
- projectile_type = /obj/projectile/bullet/c40sol/pierce
-
- custom_materials = AMMO_MATS_AP
- advanced_print_req = TRUE
-
-
-/obj/projectile/bullet/c40sol/pierce
- name = ".40 Sol match bullet"
-
- icon_state = "gaussphase"
-
- speed = 2
-
- damage = 25
- armour_penetration = 20
-
- wound_bonus = -30
- exposed_wound_bonus = -10
-
- ricochets_max = 2
- ricochet_chance = 80
- ricochet_auto_aim_range = 4
- ricochet_incidence_leeway = 65
-
- projectile_piercing = PASSMOB
-
-
-/obj/projectile/bullet/c40sol/pierce/on_hit(atom/target, blocked = 0, pierce_hit)
- if(isliving(target))
- var/mob/living/poor_sap = target
-
- // If the target mob has enough armor to stop the bullet, or the bullet has already gone through two people, stop it on this hit
- if((poor_sap.run_armor_check(def_zone, BULLET, "", "", silent = TRUE) > 20) || (pierces > 2))
- projectile_piercing = NONE
-
- if(damage > 10) // Lets just be safe with this one
- damage -= 5
- armour_penetration -= 10
-
- return ..()
-
-
-/obj/item/ammo_box/c40sol/pierce
- name = "ammo box (.40 Sol Long match)"
- desc = "A box of .40 Sol Long rifle rounds, holds thirty bullets. The yellow stripe indicates this should hold high performance ammuniton."
-
- icon_state = "40box_pierce"
-
- ammo_type = /obj/item/ammo_casing/c40sol/pierce
-
-
-// .40 Sol incendiary
-
-/obj/item/ammo_casing/c40sol/incendiary
- name = ".40 Sol Long incendiary bullet casing"
- desc = "A TerraGov standard caseless incendiary rifle round. Leaves no flaming trail, only igniting targets on impact."
-
- icon_state = "40sol_flame"
-
- projectile_type = /obj/projectile/bullet/c40sol/incendiary
-
- custom_materials = AMMO_MATS_TEMP
- advanced_print_req = TRUE
-
-
-/obj/projectile/bullet/c40sol/incendiary
- name = ".40 Sol Long incendiary bullet"
- icon_state = "redtrac"
-
- damage = 25
-
- /// How many firestacks the bullet should impart upon a target when impacting
- var/firestacks_to_give = 1
-
-
-/obj/projectile/bullet/c40sol/incendiary/on_hit(atom/target, blocked = 0, pierce_hit)
- . = ..()
-
- if(iscarbon(target))
- var/mob/living/carbon/gaslighter = target
- gaslighter.adjust_fire_stacks(firestacks_to_give)
- gaslighter.ignite_mob()
-
-
-/obj/item/ammo_box/c40sol/incendiary
- name = "ammo box (.40 Sol Long incendiary)"
- desc = "A box of .40 Sol Long rifle rounds, holds thirty bullets. The orange stripe indicates this should hold incendiary ammunition."
-
- icon_state = "40box_flame"
-
- ammo_type = /obj/item/ammo_casing/c40sol/incendiary
diff --git a/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/carwo_defense_systems/magazines.dm b/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/carwo_defense_systems/magazines.dm
index e0d6307a155..f5dfff07ed4 100644
--- a/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/carwo_defense_systems/magazines.dm
+++ b/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/carwo_defense_systems/magazines.dm
@@ -83,3 +83,223 @@
/obj/item/ammo_box/magazine/c980_grenade/drum/starts_empty
start_empty = TRUE
+
+// .40 Sol Long
+// Rifle caliber caseless ammo that kills people good
+
+/obj/item/ammo_casing/c40sol
+ name = ".40 Sol Long lethal bullet casing"
+ desc = "A TerraGov standard caseless lethal rifle round."
+
+ icon = 'modular_skyrat/modules/modular_weapons/icons/obj/company_and_or_faction_based/carwo_defense_systems/ammo.dmi'
+ icon_state = "40sol"
+
+ caliber = CALIBER_SOL40LONG
+ projectile_type = /obj/projectile/bullet/c40sol
+
+
+/obj/item/ammo_casing/c40sol/Initialize(mapload)
+ . = ..()
+
+ AddElement(/datum/element/caseless)
+
+
+/obj/projectile/bullet/c40sol
+ name = ".40 Sol Long bullet"
+ damage = 35
+
+ wound_bonus = -30
+ exposed_wound_bonus = -35
+
+
+/obj/item/ammo_box/c40sol
+ name = "ammo box (.40 Sol Long lethal)"
+ desc = "A box of .40 Sol Long rifle rounds, holds thirty bullets."
+
+ icon = 'modular_skyrat/modules/modular_weapons/icons/obj/company_and_or_faction_based/carwo_defense_systems/ammo.dmi'
+ icon_state = "40box"
+
+ multiple_sprites = AMMO_BOX_FULL_EMPTY
+
+ w_class = WEIGHT_CLASS_NORMAL
+
+ caliber = CALIBER_SOL40LONG
+ ammo_type = /obj/item/ammo_casing/c40sol
+ max_ammo = 30
+
+
+// .40 Sol fragmentation rounds, embeds shrapnel in the target almost every time at close to medium range. Teeeechnically less lethals.
+
+/obj/item/ammo_casing/c40sol/fragmentation
+ name = ".40 Sol Long fragmentation bullet casing"
+ desc = "A TerraGov standard caseless fragmentation rifle round. Shatters upon impact, ejecting sharp shrapnel that can potentially incapacitate targets."
+
+ icon_state = "40sol_disabler"
+
+ projectile_type = /obj/projectile/bullet/c40sol/fragmentation
+
+ advanced_print_req = TRUE
+
+ harmful = FALSE
+
+
+/obj/projectile/bullet/c40sol/fragmentation
+ name = ".40 Sol Long fragmentation bullet"
+ damage = 15
+ stamina = 30
+
+ weak_against_armour = TRUE
+
+ sharpness = SHARP_EDGED
+ wound_bonus = 0
+ exposed_wound_bonus = 20
+
+ shrapnel_type = /obj/item/shrapnel/stingball
+ embed_type = /datum/embedding/c40sol_fragmentation
+
+ embed_falloff_tile = -5
+
+/datum/embedding/c40sol_fragmentation
+ embed_chance = 50
+ fall_chance = 5
+ jostle_chance = 5
+ ignore_throwspeed_threshold = TRUE
+ pain_stam_pct = 0.4
+ pain_mult = 2
+ jostle_pain_mult = 3
+ rip_time = 0.5 SECONDS
+
+/obj/item/ammo_box/c40sol/fragmentation
+ name = "ammo box (.40 Sol Long fragmentation)"
+ desc = "A box of .40 Sol Long rifle rounds, holds thirty bullets. The blue stripe indicates this should hold less lethal ammunition."
+
+ icon_state = "40box_disabler"
+
+ ammo_type = /obj/item/ammo_casing/c40sol/fragmentation
+
+
+// .40 Sol match grade, bounces a lot, and if there's less than 20 bullet armor on wherever these hit, it'll go completely through the target and out the other side
+
+/obj/item/ammo_casing/c40sol/pierce
+ name = ".40 Sol Long match bullet casing"
+ desc = "A TerraGov standard caseless match grade rifle round. Fires at a higher pressure and thus fires slightly faster projectiles. \
+ Rumors say you can do sick ass wall bounce trick shots with these, though the official suggestion is to just shoot your target and \
+ not the wall next to them."
+
+ icon_state = "40sol_pierce"
+
+ projectile_type = /obj/projectile/bullet/c40sol/pierce
+
+ custom_materials = AMMO_MATS_AP
+ advanced_print_req = TRUE
+
+
+/obj/projectile/bullet/c40sol/pierce
+ name = ".40 Sol match bullet"
+
+ icon_state = "gaussphase"
+
+ speed = 2
+
+ damage = 25
+ armour_penetration = 20
+
+ wound_bonus = -30
+ exposed_wound_bonus = -10
+
+ ricochets_max = 2
+ ricochet_chance = 80
+ ricochet_auto_aim_range = 4
+ ricochet_incidence_leeway = 65
+
+ projectile_piercing = PASSMOB
+
+
+/obj/projectile/bullet/c40sol/pierce/on_hit(atom/target, blocked = 0, pierce_hit)
+ if(isliving(target))
+ var/mob/living/poor_sap = target
+
+ // If the target mob has enough armor to stop the bullet, or the bullet has already gone through two people, stop it on this hit
+ if((poor_sap.run_armor_check(def_zone, BULLET, "", "", silent = TRUE) > 20) || (pierces > 2))
+ projectile_piercing = NONE
+
+ if(damage > 10) // Lets just be safe with this one
+ damage -= 5
+ armour_penetration -= 10
+
+ return ..()
+
+
+/obj/item/ammo_box/c40sol/pierce
+ name = "ammo box (.40 Sol Long match)"
+ desc = "A box of .40 Sol Long rifle rounds, holds thirty bullets. The yellow stripe indicates this should hold high performance ammuniton."
+
+ icon_state = "40box_pierce"
+
+ ammo_type = /obj/item/ammo_casing/c40sol/pierce
+
+
+// .40 Sol incendiary
+
+/obj/item/ammo_casing/c40sol/incendiary
+ name = ".40 Sol Long incendiary bullet casing"
+ desc = "A TerraGov standard caseless incendiary rifle round. Leaves no flaming trail, only igniting targets on impact."
+
+ icon_state = "40sol_flame"
+
+ projectile_type = /obj/projectile/bullet/c40sol/incendiary
+
+ custom_materials = AMMO_MATS_TEMP
+ advanced_print_req = TRUE
+
+
+/obj/projectile/bullet/c40sol/incendiary
+ name = ".40 Sol Long incendiary bullet"
+ icon_state = "redtrac"
+
+ damage = 25
+
+ /// How many firestacks the bullet should impart upon a target when impacting
+ var/firestacks_to_give = 1
+
+
+/obj/projectile/bullet/c40sol/incendiary/on_hit(atom/target, blocked = 0, pierce_hit)
+ . = ..()
+
+ if(iscarbon(target))
+ var/mob/living/carbon/gaslighter = target
+ gaslighter.adjust_fire_stacks(firestacks_to_give)
+ gaslighter.ignite_mob()
+
+
+/obj/item/ammo_box/c40sol/incendiary
+ name = "ammo box (.40 Sol Long incendiary)"
+ desc = "A box of .40 Sol Long rifle rounds, holds thirty bullets. The orange stripe indicates this should hold incendiary ammunition."
+
+ icon_state = "40box_flame"
+
+ ammo_type = /obj/item/ammo_casing/c40sol/incendiary
+
+/obj/item/ammo_box/magazine/c980_grenade
+ name = "\improper Kiboko grenade box"
+ desc = "A standard size box for .980 grenades, holds four shells."
+ icon = 'modular_skyrat/modules/modular_weapons/icons/obj/company_and_or_faction_based/carwo_defense_systems/ammo.dmi'
+ icon_state = "granata_standard"
+ multiple_sprites = AMMO_BOX_FULL_EMPTY
+ w_class = WEIGHT_CLASS_NORMAL
+ ammo_type = /obj/item/ammo_casing/c980grenade
+ caliber = CALIBER_980TYDHOUER
+ max_ammo = 4
+
+/obj/item/ammo_box/magazine/c980_grenade/starts_empty
+ start_empty = TRUE
+
+/obj/item/ammo_box/magazine/c980_grenade/drum
+ name = "\improper Kiboko grenade drum"
+ desc = "A drum for .980 grenades, holds six shells."
+ icon_state = "granata_drum"
+ w_class = WEIGHT_CLASS_NORMAL
+ max_ammo = 6
+
+/obj/item/ammo_box/magazine/c980_grenade/drum/starts_empty
+ start_empty = TRUE
diff --git a/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/nanotrasen_system_inc/magazine.dm b/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/nanotrasen_system_inc/magazine.dm
index 09b7f17684b..d5e191fa283 100644
--- a/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/nanotrasen_system_inc/magazine.dm
+++ b/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/nanotrasen_system_inc/magazine.dm
@@ -7,16 +7,6 @@
/obj/item/ammo_box/magazine/m9mm
custom_premium_price = 50
-/obj/item/ammo_box/magazine/m9mm/rubber
- name = "pistol magazine (9x25mm Rubber)"
- ammo_type = /obj/item/ammo_casing/c9mm/rubber
- base_icon_state = "9x19pB"
-
-/obj/item/ammo_box/magazine/m9mm/ihdf
- name = "pistol magazine (9x25mm Intelligent Dispersal Foam)"
- ammo_type = /obj/item/ammo_casing/c9mm/ihdf
- base_icon_state = "9x19pp"
-
//Extended 9mm
/obj/item/ammo_box/magazine/m9mm/stendo
name = "pistol magazine (9x25mm)"
@@ -30,11 +20,6 @@
ammo_type = /obj/item/ammo_casing/c9mm/fire
base_icon_state = "g18_r"
-/obj/item/ammo_box/magazine/m9mm/stendo/rubber
- name = "pistol magazine (9x25mm Incendiary)"
- ammo_type = /obj/item/ammo_casing/c9mm/rubber
- base_icon_state = "g18_b"
-
/obj/item/ammo_box/magazine/m9mm/stendo/hp
name = "pistol magazine (9x25mm Hollow Point)"
ammo_type = /obj/item/ammo_casing/c9mm/hp
@@ -45,11 +30,6 @@
ammo_type = /obj/item/ammo_casing/c9mm/ap
base_icon_state = "g18_ihdf"
-/obj/item/ammo_box/magazine/m9mm/stendo/ihdf
- name = "pistol magazine (9x25mm Intelligent Dispersal Foam)"
- ammo_type = /obj/item/ammo_casing/c9mm/ihdf
- base_icon_state = "g18_ihdf"
-
//Shotgun Internal Tube
/obj/item/ammo_box/magazine/internal/shot/extended
@@ -61,71 +41,4 @@
ammo_type = /obj/item/ammo_casing/shotgun/beanbag
max_ammo = 8
-//10mm Cylinder
-/obj/item/ammo_box/magazine/internal/cylinder/nt_sec
- name = "\improper 10mm revolver cylinder"
- desc = "how did you get this"
- max_ammo = 6
- ammo_type = /obj/item/ammo_casing/c10mm/rubber
- caliber = CALIBER_10MM
-
//10mm Stuff
-/obj/item/ammo_box/c10mm/speedloader
- name = "speed loader (10mm Auto)"
- desc = "Designed to quickly reload revolvers."
- ammo_type = /obj/item/ammo_casing/c10mm
- ammo_band_color = "#dd6057"
- max_ammo = 6
- item_flags = NO_MAT_REDEMPTION
- icon_state = "38"
- multiple_sprites = AMMO_BOX_PER_BULLET
- ammo_band_icon = "+38_ammo_band"
- multitype = FALSE
- custom_premium_price = 50
-
- w_class = WEIGHT_CLASS_SMALL
-
-/obj/item/ammo_box/c10mm/speedloader/rubber
-
- name = "speed loader (10mm Auto Rubber)"
- desc = "Designed to quickly reload revolvers."
- ammo_type = /obj/item/ammo_casing/c10mm/rubber
- ammo_band_color = "#1824c5"
-
-/obj/item/ammo_box/c10mm/speedloader/fire
-
- name = "speed loader (10mm Auto Fire)"
- desc = "Designed to quickly reload revolvers."
- ammo_type = /obj/item/ammo_casing/c10mm/fire
- ammo_band_color = "#c41d1a"
-
-/obj/item/ammo_box/c10mm/speedloader/ap
-
- name = "speed loader (10mm Auto Armor Penetrating)"
- desc = "Designed to quickly reload revolvers."
- ammo_type = /obj/item/ammo_casing/c10mm/ap
- ammo_band_color = "#1ac43f"
-
-/obj/item/ammo_box/c10mm/speedloader/hp
-
- name = "speed loader (10mm Auto Hollow Point)"
- desc = "Designed to quickly reload revolvers."
- ammo_type = /obj/item/ammo_casing/c10mm/hp
- ammo_band_color = "#df00ae"
-
-/obj/item/ammo_box/c10mm/speedloader/ihdf
-
- name = "speed loader (10mm Auto IHDF)"
- desc = "Designed to quickly reload revolvers."
- ammo_type = /obj/item/ammo_casing/c10mm/ihdf
- ammo_band_color = COLOR_AMMO_RUBBER
-
-/obj/item/ammo_box/magazine/firefly
- name = "pistol magazine (.117 Incapacitator)"
- icon = 'modular_skyrat/modules/modular_weapons/icons/obj/company_and_or_faction_based/nanotrasen_system_inc/ammo.dmi'
- multiple_sprites = AMMO_BOX_FULL_EMPTY
- icon_state = "firefly"
- multitype = FALSE
- ammo_type = /obj/item/ammo_casing/shotgun/antitide
- max_ammo = 10
- caliber = CALIBER_SHOTGUN
diff --git a/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/nanotrasen_system_inc/pistol.dm b/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/nanotrasen_system_inc/pistol.dm
deleted file mode 100644
index 5d3084f3e32..00000000000
--- a/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/nanotrasen_system_inc/pistol.dm
+++ /dev/null
@@ -1,126 +0,0 @@
-//Handgun
-
-
-/obj/item/storage/toolbox/guncase/skyrat/pistol/trappiste_small_case/nt_glock
- name = "9x25mm Mk12 Standard Pistol"
-
- weapon_to_spawn = /obj/item/gun/ballistic/automatic/pistol/nt_glock/empty
-
-/obj/item/storage/toolbox/guncase/skyrat/pistol/trappiste_small_case/nt_glock/PopulateContents()
- new weapon_to_spawn (src)
-
- generate_items_inside(list(
- /obj/item/ammo_box/magazine/m9mm/ihdf = 2,
- /obj/item/ammo_box/magazine/m9mm/rubber = 3,
- ), src)
-
-/obj/item/gun/ballistic/automatic/pistol/nt_glock
- name = "\improper GP-9"
- desc = "General Purpose Pistol Number 9. A classic 9x25mm handgun with a small magazine capacity."
- icon = 'modular_skyrat/modules/modular_weapons/icons/obj/company_and_or_faction_based/nanotrasen_system_inc/pistol.dmi'
- icon_state = "black"
- w_class = WEIGHT_CLASS_NORMAL
- spread = 10
- fire_sound = 'sound/items/weapons/gun/pistol/shot_alt.ogg'
- rack_sound = 'sound/items/weapons/gun/pistol/rack.ogg'
- lock_back_sound = 'sound/items/weapons/gun/pistol/slide_lock.ogg'
- bolt_drop_sound = 'sound/items/weapons/gun/pistol/slide_drop.ogg'
- pin = /obj/item/firing_pin
- spawn_magazine_type = /obj/item/ammo_box/magazine/m9mm/rubber
- suppressor_x_offset = -2
- suppressor_y_offset = -1
-
-/obj/item/gun/ballistic/automatic/pistol/nt_glock/give_manufacturer_examine()
- AddElement(/datum/element/manufacturer_examine, COMPANY_NANOTRASEN)
-
-/obj/item/gun/ballistic/automatic/pistol/nt_glock/empty
- spawnwithmagazine = FALSE
-
-
-/obj/item/storage/toolbox/guncase/skyrat/nt_glock_spec
- name = "9x25mm Mk2 Special Operation Pistol"
-
- weapon_to_spawn = /obj/item/gun/ballistic/automatic/pistol/nt_glock/empty
-
-/obj/item/storage/toolbox/guncase/skyrat/pistol/trappiste_small_case/nt_glock_spec/PopulateContents()
- new weapon_to_spawn (src)
-
- generate_items_inside(list(
- /obj/item/ammo_box/magazine/m9mm/stendo/hp = 2,
- /obj/item/ammo_box/magazine/m9mm/stendo/ap = 3,
- ), src)
-
-/obj/item/gun/ballistic/automatic/pistol/nt_glock/spec
- name = "\improper GP-93R"
- desc = "General Purpose Pistol Number 9, 3-Round Burst. A special operation variant with a high capacity magazine."
- icon = 'modular_skyrat/modules/modular_weapons/icons/obj/company_and_or_faction_based/nanotrasen_system_inc/pistol.dmi'
- icon_state = "silver"
- spread = 17
- pin = /obj/item/firing_pin
- fire_delay = 2
- burst_size = 3
- spawn_magazine_type = /obj/item/ammo_box/magazine/m9mm/stendo
-
-//Magistrate Pistol
-
-/obj/item/storage/toolbox/guncase/skyrat/pistol/trappiste_small_case/firefly
- name = "MX-7C Stun Pistol"
-
- weapon_to_spawn = /obj/item/gun/ballistic/automatic/pistol/firefly/empty
-
-/obj/item/storage/toolbox/guncase/skyrat/pistol/trappiste_small_case/firefly/PopulateContents()
- new weapon_to_spawn (src)
-
- generate_items_inside(list(
- /obj/item/ammo_box/magazine/firefly = 3,
- ), src)
-
-/obj/item/gun/ballistic/automatic/pistol/firefly
- name = "\improper MX-7C 'Firefly'"
- desc = "Nanotrasen Experimental Model 7 Compact, A rare pistol chambered in a .117 electrode cartridge. It has has a small magazine capacity."
- icon = 'modular_skyrat/modules/modular_weapons/icons/obj/company_and_or_faction_based/nanotrasen_system_inc/pistol.dmi'
- icon_state = "firefly"
- w_class = WEIGHT_CLASS_NORMAL
- spread = 10
- fire_sound = 'sound/items/weapons/gun/pistol/shot_alt.ogg'
- rack_sound = 'sound/items/weapons/gun/pistol/rack.ogg'
- lock_back_sound = 'sound/items/weapons/gun/pistol/slide_lock.ogg'
- bolt_drop_sound = 'sound/items/weapons/gun/pistol/slide_drop.ogg'
- pin = /obj/item/firing_pin
- spawn_magazine_type = /obj/item/ammo_box/magazine/firefly
- accepted_magazine_type = /obj/item/ammo_box/magazine/firefly
- can_suppress = FALSE
-
-/obj/item/gun/ballistic/automatic/pistol/firefly/give_manufacturer_examine()
- AddElement(/datum/element/manufacturer_examine, COMPANY_NANOTRASEN)
-
-/obj/item/gun/ballistic/automatic/pistol/firefly/empty
- spawnwithmagazine = FALSE
-
-
-// Revolver
-
-/obj/item/gun/ballistic/revolver/nt_revolver
- name = "\improper R10"
- desc = "The Revolver Number 10. A rugged and reliable pistol chambered in 10mm Auto, holds 6 shot. Remember our promise"
- icon = 'modular_skyrat/modules/modular_weapons/icons/obj/company_and_or_faction_based/nanotrasen_system_inc/pistol.dmi'
- icon_state = "zeta"
- spawn_magazine_type = /obj/item/ammo_box/magazine/internal/cylinder/nt_sec
- accepted_magazine_type = /obj/item/ammo_box/magazine/internal/cylinder/nt_sec
-
-/obj/item/gun/ballistic/revolver/nt_revolver/give_manufacturer_examine()
- AddElement(/datum/element/manufacturer_examine, COMPANY_NANOTRASEN)
-
-/obj/item/storage/toolbox/guncase/skyrat/pistol/trappiste_small_case/nt_revolver
- name = "10mm Auto Standard Revolver"
-
- weapon_to_spawn = /obj/item/gun/ballistic/revolver/nt_revolver
-
-/obj/item/storage/toolbox/guncase/skyrat/pistol/trappiste_small_case/nt_revolver/PopulateContents()
- new weapon_to_spawn (src)
-
- generate_items_inside(list(
- /obj/item/ammo_box/c10mm/speedloader = 2,
- /obj/item/ammo_box/c10mm/speedloader/rubber = 3,
- ), src)
-
diff --git a/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/romulus_technology/ammo/pistol.dm b/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/romulus_technology/ammo/pistol.dm
deleted file mode 100644
index c486c8efd14..00000000000
--- a/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/romulus_technology/ammo/pistol.dm
+++ /dev/null
@@ -1,74 +0,0 @@
-/obj/item/ammo_casing/c460rowland
- name = ".460 Rowland Magnum bullet casing"
- desc = "A Romulus Tech standard lethal pistol round."
-
- icon = 'modular_skyrat/modules/modular_weapons/icons/obj/company_and_or_faction_based/romulus_technology/ammo.dmi'
- icon_state = "sl-casing"
-
- caliber = CALIBER_460ROWLAND
- projectile_type = /obj/projectile/bullet/c460rowland
-
-/obj/projectile/bullet/c460rowland
- name = ".460 Rowland Magnum"
- damage = 35
- stamina = 15 //knock the winds outta ya
-
- wound_bonus = -35
- exposed_wound_bonus = -60
- stamina_falloff_tile = -0.3
-
-/obj/item/ammo_casing/c460rowland/dart
- name = ".460 Rowland Armour Piercing bullet casing"
-
- icon = 'modular_skyrat/modules/modular_weapons/icons/obj/company_and_or_faction_based/romulus_technology/ammo.dmi'
- icon_state = "sr-casing"
-
- caliber = CALIBER_460ROWLAND
- projectile_type = /obj/projectile/bullet/c460rowland/dart
-
-/obj/projectile/bullet/c460rowland/dart
- name = ".460 Rowland Armour Piercing"
- damage = 25
-
- wound_bonus = -50
- exposed_wound_bonus = -10
- armour_penetration = 40
- damage_falloff_tile = 0
- stamina_falloff_tile = 0
-
-//457
-
-/obj/item/ammo_casing/c457govt
- name = ".457 Government bullet casing"
- desc = "A Romulus Tech standard lethal pistol round."
-
- icon = 'modular_skyrat/modules/modular_weapons/icons/obj/company_and_or_faction_based/romulus_technology/ammo.dmi'
- icon_state = "sl-casing"
-
- caliber = CALIBER_457GOVT
- projectile_type = /obj/projectile/bullet/c457govt
-
-/obj/projectile/bullet/c457govt
- name = ".457 Government"
- damage = 35
- wound_bonus = -25
- exposed_wound_bonus = -35
-
-/obj/item/ammo_casing/c457govt/dart
- name = ".457 Government Accelerating"
-
- icon = 'modular_skyrat/modules/modular_weapons/icons/obj/company_and_or_faction_based/romulus_technology/ammo.dmi'
- icon_state = "sr-casing"
-
- caliber = CALIBER_457GOVT
- projectile_type = /obj/projectile/bullet/c457govt/dart
-
-/obj/projectile/bullet/c457govt/dart
- name = ".457 Government Accelerating"
- damage = 15
-
- wound_bonus = -10
- exposed_wound_bonus = -10
- armour_penetration = 45
- speed = 2
- range = 14
diff --git a/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/romulus_technology/ammo/rifle.dm b/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/romulus_technology/ammo/rifle.dm
deleted file mode 100644
index 900310dd045..00000000000
--- a/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/romulus_technology/ammo/rifle.dm
+++ /dev/null
@@ -1,123 +0,0 @@
-/obj/item/ammo_casing/caflechette
- name = "flechette steel penetrator"
- desc = "A Romfed standard rifle flechette."
-
- icon = 'modular_skyrat/modules/modular_weapons/icons/obj/company_and_or_faction_based/carwo_defense_systems/ammo.dmi'
- icon_state = "40sol"
-
- caliber = CALIBER_FLECHETTE
- projectile_type = /obj/projectile/bullet/caflechette
- custom_materials = AMMO_MATS_SHOTGUN_FLECH
- advanced_print_req = TRUE
- can_be_printed = TRUE
-
-/obj/item/ammo_casing/caflechette/Initialize(mapload)
- . = ..()
-
- AddElement(/datum/element/caseless)
-
-
-/obj/projectile/bullet/caflechette
- name = "flechette penetrator"
- damage = 15
- armour_penetration = 60
- wound_bonus = 10
- exposed_wound_bonus = 10
- embed_type = /datum/embedding/caflechette
- dismemberment = 0
-
-/datum/embedding/caflechette
- embed_chance = 55
- pain_chance = 70
- fall_chance = 30
- jostle_chance = 80
- ignore_throwspeed_threshold = TRUE
- pain_stam_pct = 0.9
- pain_mult = 2
- rip_time = 2 SECONDS
-
-/obj/item/ammo_casing/caflechette/ripper
- name = "flechette silicon dart"
- desc = "A Romfed standard rifle flechette."
- projectile_type = /obj/projectile/bullet/caflechette/ripper
- custom_materials = AMMO_MATS_SHOTGUN_FLECH
-
-/obj/projectile/bullet/caflechette/ripper
- name = "flechette dart"
- damage = 10
- wound_bonus = 25
- exposed_wound_bonus = 35
- embed_type = /datum/embedding/ripper
- armour_penetration = 40 //defeat basic armour
-
-/datum/embedding/ripper
- embed_chance = 200
- pain_chance = 70
- fall_chance = 1
- jostle_chance = 80
- ignore_throwspeed_threshold = TRUE
- pain_stam_pct = 0.9
- pain_mult = 2
- rip_time = 5 SECONDS
-
-/obj/item/ammo_casing/caflechette/ballpoint
- name = "steel ball"
- desc = "A bullet casing with a large metallic ball as a projectile."
- projectile_type = /obj/projectile/bullet/caflechette/ballpoint
- custom_materials = AMMO_MATS_SHOTGUN_FLECH
-
-/obj/projectile/bullet/caflechette/ballpoint
- name = "high velocity steel ball"
- damage = 10
- wound_bonus = 20
- sharpness = SHARP_EDGED
- wound_bonus = 0
- exposed_wound_bonus = 20
- armour_penetration = 10
- shrapnel_type = /obj/item/shrapnel/stingball
- embed_type = /datum/embedding/ballpoint
- stamina = 20
- ricochet_chance = 50
- ricochets_max = 3
- ricochet_auto_aim_angle = 90
- ricochet_auto_aim_range = 5
-
-/datum/embedding/ballpoint
- embed_chance = 50
- fall_chance = 5
- jostle_chance = 5
- ignore_throwspeed_threshold = TRUE
- pain_stam_pct = 0.4
- pain_mult = 2
- jostle_pain_mult = 3
- rip_time = 1 SECONDS
-
-/obj/item/ammo_casing/caflechette/magnesium
- name = "magnesium rod"
- projectile_type = /obj/projectile/bullet/caflechette/magnesium
- custom_materials = AMMO_MATS_SHOTGUN_PLASMA
-
-/obj/projectile/bullet/caflechette/magnesium
- name = "high velocity magnesium rod"
- damage = 5
- wound_bonus = 15
- exposed_wound_bonus = 5
- embed_type = /datum/embedding/magnesium
- armour_penetration = 100 //does really low damage
-
-/datum/embedding/magnesium
- embed_chance = 80
- pain_chance = 10
- fall_chance = 10
- jostle_chance = 80
- ignore_throwspeed_threshold = TRUE
- pain_stam_pct = 0.9
- pain_mult = 2
- rip_time = 10 SECONDS
-
-/obj/projectile/bullet/caflechette/magnesium/on_hit(atom/target, blocked = 0, pierce_hit)
- . = ..()
- if(iscarbon(target))
- var/mob/living/carbon/M = target
- M.adjust_fire_stacks(12)
- M.ignite_mob()
diff --git a/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/romulus_technology/magazines.dm b/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/romulus_technology/magazines.dm
deleted file mode 100644
index 9cac88038d1..00000000000
--- a/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/romulus_technology/magazines.dm
+++ /dev/null
@@ -1,24 +0,0 @@
-//Handgun Magazine
-
-/obj/item/ammo_box/magazine/m45a5
- name = "\improper m45a5 magazine (Rose)"
- desc = "A magazine for the m45a5 chambered in .460 Rowland, holds ten rounds. Warning, contains expanding head that deform on contact, may cause excessive bleeding."
- icon = 'modular_skyrat/modules/modular_weapons/icons/obj/company_and_or_faction_based/romulus_technology/ammo.dmi'
- icon_state = "rowlandmodular"
- multiple_sprites = AMMO_BOX_FULL_EMPTY
- ammo_type = /obj/item/ammo_casing/c460rowland
- caliber = CALIBER_460ROWLAND
- max_ammo = 10
-
-/obj/item/ammo_box/magazine/m45a5/ap
- name = "\improper m45a5 magazine (Armour Piercing)"
- desc = "A magazine for the m45a5 chambered in .460 Rowland, holds ten rounds. Warning, contains lead core intended to defeat body armour."
-
-/obj/item/ammo_box/magazine/m45a5/starts_empty
- start_empty = TRUE
-
-//Cylinder (not speedloader)
-
-/obj/item/ammo_box/magazine/internal/cylinder/c457
- caliber = CALIBER_457GOVT
- ammo_type = /obj/item/ammo_casing/c457govt
diff --git a/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/romulus_technology/pistol.dm b/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/romulus_technology/pistol.dm
deleted file mode 100644
index 9deb68a7bad..00000000000
--- a/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/romulus_technology/pistol.dm
+++ /dev/null
@@ -1,145 +0,0 @@
-//Pistol, Handguns and Revolvers
-//Now improved
-
-/obj/item/gun/ballistic/revolver/hos_revolver
- name = "\improper HR-460MS"
- desc = "An experimental revolver design that can only be loaded one shot at a time, if the initial damage did not kill, the bleedout would. Chambered in .457 Government."
- accepted_magazine_type = /obj/item/ammo_box/magazine/internal/cylinder/c457
- icon = 'modular_skyrat/modules/modular_weapons/icons/obj/company_and_or_faction_based/romulus_technology/revolver.dmi'
- icon_state = "microtracker"
- fire_sound = 'modular_skyrat/modules/modular_weapons/sounds/revolver_heavy.ogg'
-
-/obj/item/gun/ballistic/revolver/hos_revolver/give_manufacturer_examine()
- AddElement(/datum/element/manufacturer_examine, COMPANY_ROMTECH)
-
-/obj/item/gun/ballistic/revolver/hos_revolver/long
- name = "\improper HR-460LR"
- desc = "A long unwiedly revolver from Romulus Technology. chambered in the rare .457 Government. You might be able to kill someone by whacking it over the head"
- icon_state = "tracker"
- force = 18
-
-/obj/item/storage/bag/b460reloadpouch
- name = "reload pouch"
- desc = "A pouch for holding loose casings for .357 ammo and .457 ammo. incompatible with anything else. Fit on your belt too"
- icon = 'modular_skyrat/modules/sec_haul/icons/misc/pouches.dmi'
- icon_state = "reloadpouch"
- slot_flags = ITEM_SLOT_POCKETS | ITEM_SLOT_BELT
- w_class = WEIGHT_CLASS_BULKY
- worn_icon = 'modular_skyrat/modules/modular_weapons/icons/mob/company_and_or_faction_based/romulus_technology/guns_worn.dmi'
- worn_icon_state = null
-
-/obj/item/storage/bag/b460reloadpouch/Initialize(mapload)
- . = ..()
- atom_storage.max_specific_storage = WEIGHT_CLASS_SMALL
- atom_storage.max_total_storage = 35
- atom_storage.max_slots = 35
- atom_storage.numerical_stacking = TRUE
- atom_storage.set_holdable(list(
- /obj/item/ammo_casing/c457govt,
- /obj/item/ammo_casing/a357,
- ))
-
-/obj/item/storage/bag/b460reloadpouch/PopulateContents()
- new /obj/item/ammo_casing/c457govt(src)
- new /obj/item/ammo_casing/c457govt(src)
- new /obj/item/ammo_casing/c457govt(src)
- new /obj/item/ammo_casing/c457govt(src)
- new /obj/item/ammo_casing/c457govt(src)
- new /obj/item/ammo_casing/c457govt(src)
- new /obj/item/ammo_casing/c457govt(src)
- new /obj/item/ammo_casing/c457govt(src)
- new /obj/item/ammo_casing/c457govt(src)
- new /obj/item/ammo_casing/c457govt(src)
- new /obj/item/ammo_casing/c457govt(src)
- new /obj/item/ammo_casing/c457govt(src)
- new /obj/item/ammo_casing/c457govt(src)
- new /obj/item/ammo_casing/c457govt(src)
- new /obj/item/ammo_casing/c457govt(src)
- new /obj/item/ammo_casing/c457govt(src)
- new /obj/item/ammo_casing/c457govt(src)
- new /obj/item/ammo_casing/c457govt(src)
- new /obj/item/ammo_casing/c457govt(src)
- new /obj/item/ammo_casing/c457govt(src)
- new /obj/item/ammo_casing/c457govt(src)
- new /obj/item/ammo_casing/c457govt(src)
- new /obj/item/ammo_casing/c457govt(src)
- new /obj/item/ammo_casing/c457govt(src)
- new /obj/item/ammo_casing/c457govt(src)
- new /obj/item/ammo_casing/c457govt(src)
- new /obj/item/ammo_casing/c457govt(src)
- new /obj/item/ammo_casing/c457govt(src)
-
-/obj/item/storage/toolbox/guncase/skyrat/hos_revolver
- name = "heavy revolver .457"
-
-/obj/item/storage/toolbox/guncase/skyrat/hos_revolver/PopulateContents()
- new /obj/item/gun/ballistic/revolver/hos_revolver(src)
- new /obj/item/storage/bag/b460reloadpouch(src)
-
-/obj/item/gun/ballistic/automatic/pistol/m1911/gold
- name = "gold trimmed m1911"
- desc = "A classic .460 ceres handgun with a small magazine capacity. Now trimmed in gold"
- icon = 'modular_skyrat/modules/modular_weapons/icons/obj/company_and_or_faction_based/romulus_technology/pistol.dmi'
- icon_state = "m1911"
-
-/obj/item/gun/ballistic/automatic/pistol/m1911/gold/give_manufacturer_examine()
- AddElement(/datum/element/manufacturer_examine, COMPANY_ROMTECH)
-
-/obj/item/storage/toolbox/guncase/skyrat/pistol/m1911_gold
- name = "golden m1911 .460 ceres"
- weapon_to_spawn = /obj/item/gun/ballistic/automatic/pistol/m1911/gold
- extra_to_spawn = /obj/item/ammo_box/magazine/m45
-
-/obj/item/storage/toolbox/guncase/skyrat/pistol/m1911/PopulateContents()
- new weapon_to_spawn (src)
-
- generate_items_inside(list(
- /obj/item/ammo_box/c45 = 2,
- ), src)
-
-/obj/item/storage/toolbox/guncase/skyrat/pistol/m45a5
- name = "heavy pistol .460 magnum"
-
-/obj/item/storage/toolbox/guncase/skyrat/pistol/m45a5/PopulateContents()
- new /obj/item/gun/ballistic/automatic/pistol/m45a5(src)
- new /obj/item/ammo_box/magazine/m45a5(src)
- new /obj/item/ammo_box/magazine/m45a5(src)
- new /obj/item/ammo_box/magazine/m45a5(src)
- new /obj/item/storage/pouch/ammo(src)
-
-/obj/item/gun/ballistic/automatic/pistol/m45a5
- name = "M4A5"
- desc = "A standard issue pistol given to pilot officers in Romulus Federation, chambered in .460 Rowland Magnum, now commonly found in the hands of high ranking NanotTrasen Staff"
- icon = 'modular_skyrat/modules/modular_weapons/icons/obj/company_and_or_faction_based/romulus_technology/pistol.dmi'
- icon_state = "m45a5"
- fire_sound = 'modular_skyrat/modules/modular_weapons/sounds/pistol_heavy.ogg'
- force = 15
- fire_delay = 1 SECONDS
- special_mags = TRUE
- recoil = 3
-
- accepted_magazine_type = /obj/item/ammo_box/magazine/m45a5
- spawn_magazine_type = /obj/item/ammo_box/magazine/m45a5
-
-/obj/item/gun/ballistic/automatic/pistol/m45a5/give_manufacturer_examine()
- AddElement(/datum/element/manufacturer_examine, COMPANY_ROMTECH)
-
-/obj/item/gun/ballistic/automatic/pistol/m45a5/examine(mob/user)
- . = ..()
- . += span_notice("You can examine closer to learn a little more about this weapon.")
-
-/obj/item/gun/ballistic/automatic/pistol/m45a5/examine_more(mob/user)
- . = ..()
-
- . += "This Design was made by Romulus Technology for \
- usage during the start of the NRI-Sol Border war. \
- Following the embargo and trade restriction \
- making it impossible for Romulus Federation to source weapory, \
- with this design being rapidly pushed out, being made from an advanced sol design \
- this pistol seems rather unassuming but it has been, itself, the new symbol of peace \
- Leaving NRI weapon in the past, as it now became the symbol of the oppressive era of Romulus\
- To whom it may concerns, These weapon were mostly used by the new Romulus National Army, \
- it was a symbol of struggle and freedom \
- Weapons cannot bring people back, but it can save your life."
-
- return .
diff --git a/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/romulus_technology/rifle.dm b/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/romulus_technology/rifle.dm
deleted file mode 100644
index b62ff763355..00000000000
--- a/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/romulus_technology/rifle.dm
+++ /dev/null
@@ -1,122 +0,0 @@
-//Sprite for these guns are modified from the carwil/carwo rifle, they're a pallet swap with very small modification
-//Main Rifle
-/obj/item/gun/ballistic/automatic/rom_carbine
- name = "\improper RomTech Carbine"
- desc = "An unusual variation of the Carwo-Carwil Battle rifle fielded as service rifle in Romulus Federation, preferred by some law enforcement agency for the compact nature. Accepts any standard .40 TerraGov rifle magazine."
-
- icon = 'modular_skyrat/modules/modular_weapons/icons/obj/company_and_or_faction_based/romulus_technology/gun48x32.dmi'
- icon_state = "carbine"
-
- worn_icon = 'modular_skyrat/modules/modular_weapons/icons/mob/company_and_or_faction_based/romulus_technology/guns_worn.dmi'
- worn_icon_state = "carbine"
-
- lefthand_file = 'modular_skyrat/modules/modular_weapons/icons/mob/company_and_or_faction_based/romulus_technology/guns_lefthand.dmi'
- righthand_file = 'modular_skyrat/modules/modular_weapons/icons/mob/company_and_or_faction_based/romulus_technology/guns_righthand.dmi'
- inhand_icon_state = "carbine"
-
- bolt_type = BOLT_TYPE_LOCKING
-
- special_mags = TRUE
-
- w_class = WEIGHT_CLASS_BULKY
- weapon_weight = WEAPON_HEAVY
- slot_flags = ITEM_SLOT_BACK | ITEM_SLOT_SUITSTORE | ITEM_SLOT_BELT
-
- burst_size = 1
- fire_delay = 3
-
- spread = 7
- projectile_wound_bonus = -20
- projectile_damage_multiplier = 0.75
-
- accepted_magazine_type = /obj/item/ammo_box/magazine/c40sol_rifle
- spawn_magazine_type = /obj/item/ammo_box/magazine/c40sol_rifle/standard
-
- actions_types = list()
-
-/obj/item/gun/ballistic/automatic/rom_carbine/Initialize(mapload)
- . = ..()
- give_autofire()
-
-/obj/item/gun/ballistic/automatic/rom_carbine/proc/give_autofire()
- AddComponent(/datum/component/automatic_fire, fire_delay)
-
-/obj/item/gun/ballistic/automatic/rom_carbine/give_manufacturer_examine()
- AddElement(/datum/element/manufacturer_examine, COMPANY_ROMTECH)
-
-/obj/item/gun/ballistic/automatic/rom_carbine/examine(mob/user)
- . = ..()
- . += span_notice("You can examine closer to learn a little more about this weapon.")
-
-/obj/item/gun/ballistic/automatic/rom_carbine/examine_more(mob/user)
- . = ..()
-
- . += "This Design was made by Romulus Technology for \
- usage during the start of the NRI-Sol Border war. \
- Following the embargo and trade restriction \
- making it impossible for Romulus Federation to source weapory, \
- with this design being rapidly pushed out, being made from converted rifle making it easier to acquire, \
- this rifle seems rather unassuming but it has been, itself, the new symbol of peace \
- Leaving NRI weapon in the past, as it now became the symbol of the oppressive era of Romulus\
- To whom it may concerns, These weapon were mostly used by the new Romulus National Army, \
- it was a symbol of struggle and freedom \
- Weapons cannot bring people back, but it can save your life."
-
- return .
-
-/obj/item/gun/ballistic/automatic/rom_carbine/no_mag
- spawnwithmagazine = FALSE
-
-//Bolt Action Rifle
-/obj/item/gun/ballistic/rifle/carwil
- name = "\improper RomTech Ceremonial Rifle"
- desc = "A boltaction ceremonial rifle, chambered in Sol .40 Rifle While technically outdated in modern arms markets, it still used by recreational hunter \
- as rifle of this kind are much more controllable. Famously used by the royal guard of Romulus Federation."
- icon = 'modular_skyrat/modules/modular_weapons/icons/obj/company_and_or_faction_based/romulus_technology/gun48x32.dmi'
- icon_state = "elite"
-
- worn_icon = 'modular_skyrat/modules/modular_weapons/icons/mob/company_and_or_faction_based/romulus_technology/guns_worn.dmi'
- worn_icon_state = "carbine"
-
- lefthand_file = 'modular_skyrat/modules/modular_weapons/icons/mob/company_and_or_faction_based/romulus_technology/guns_lefthand.dmi'
- righthand_file = 'modular_skyrat/modules/modular_weapons/icons/mob/company_and_or_faction_based/romulus_technology/guns_righthand.dmi'
- inhand_icon_state = "carbine"
- inhand_x_dimension = 32
- inhand_y_dimension = 32
- weapon_weight = WEAPON_HEAVY
- fire_sound = 'modular_skyrat/modules/modular_weapons/sounds/rifle_heavy.ogg'
- suppressed_sound = 'modular_skyrat/modules/modular_weapons/sounds/suppressed_rifle.ogg'
- fire_sound_volume = 90
- load_sound = 'sound/items/weapons/gun/sniper/mag_insert.ogg'
- rack_sound = 'sound/items/weapons/gun/sniper/rack.ogg'
- recoil = 2
- accepted_magazine_type = /obj/item/ammo_box/magazine/c40sol_rifle
- spawn_magazine_type = /obj/item/ammo_box/magazine/c40sol_rifle
- internal_magazine = FALSE
- w_class = WEIGHT_CLASS_BULKY
- slot_flags = ITEM_SLOT_BACK
- mag_display = TRUE
- tac_reloads = TRUE
- rack_delay = 1.5 SECONDS
- can_suppress = TRUE
- can_unsuppress = TRUE
- special_mags = TRUE
-
-/obj/item/gun/ballistic/rifle/carwil/give_manufacturer_examine()
- AddElement(/datum/element/manufacturer_examine, COMPANY_ROMTECH)
-
-/obj/item/gun/ballistic/rifle/carwil/empty
- spawnwithmagazine = FALSE
-
-/obj/item/storage/toolbox/guncase/skyrat/ceremonial_rifle
- name = "Sporting Rifle Case"
- weapon_to_spawn = /obj/item/gun/ballistic/rifle/carwil/empty
- extra_to_spawn = /obj/item/ammo_box/magazine/c40sol_rifle/starts_empty
-
-/obj/item/storage/toolbox/guncase/skyrat/ceremonial_rifle/PopulateContents()
- new weapon_to_spawn (src)
-
- generate_items_inside(list(
- /obj/item/ammo_box/c40sol/fragmentation = 1,
- /obj/item/ammo_box/c40sol = 1,
- ), src)
diff --git a/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/szot_dynamica/ammo/pistol.dm b/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/szot_dynamica/ammo/pistol.dm
index ccd0c55d236..cfcfd0207e2 100644
--- a/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/szot_dynamica/ammo/pistol.dm
+++ b/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/szot_dynamica/ammo/pistol.dm
@@ -38,29 +38,3 @@
ammo_type = /obj/item/ammo_casing/c27_54cesarzowa
max_ammo = 18
-// .27-54 Cesarzowa rubber
-// Small caliber pistol round meant to be fired out of something that shoots real quick like, this one is less lethal
-
-/obj/item/ammo_casing/c27_54cesarzowa/rubber
- name = ".27-54 Cesarzowa rubber bullet casing"
- desc = "A purple-bodied caseless cartridge home to a small projectile with a flat rubber tip."
-
- icon_state = "27-54cesarzowa_rubber"
-
- projectile_type = /obj/projectile/bullet/c27_54cesarzowa/rubber
-
-/obj/projectile/bullet/c27_54cesarzowa/rubber
- name = ".27-54 Cesarzowa rubber bullet"
- stamina = 20
- damage = 10
- weak_against_armour = TRUE
- wound_bonus = -30
- exposed_wound_bonus = -10
-
-/obj/item/ammo_box/c27_54cesarzowa/rubber
- name = "ammo box (.27-54 Cesarzowa rubber)"
- desc = "A box of .27-54 Cesarzowa rubber pistol rounds, holds eighteen cartridges."
-
- icon_state = "27-54cesarzowa_box_rubber"
-
- ammo_type = /obj/item/ammo_casing/c27_54cesarzowa/rubber
diff --git a/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/szot_dynamica/ammo/rifle.dm b/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/szot_dynamica/ammo/rifle.dm
index 2acb1832c6f..ce44541737a 100644
--- a/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/szot_dynamica/ammo/rifle.dm
+++ b/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/szot_dynamica/ammo/rifle.dm
@@ -15,15 +15,6 @@
ammo_type = /obj/item/ammo_casing/strilka310
max_ammo = 10
-// Rubber
-
-/obj/item/ammo_box/c310_cargo_box/rubber
- name = "ammo box (.310 Strilka rubber)"
- desc = "A box of .310 Strilka rubber rifle rounds, holds ten cartridges."
-
- icon_state = "310_box_rubber"
-
- ammo_type = /obj/item/ammo_casing/strilka310/rubber
// AP
diff --git a/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/xhihao_light_arms/ammo.dm b/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/xhihao_light_arms/ammo.dm
index 8cf2c497562..d85f7c706a5 100644
--- a/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/xhihao_light_arms/ammo.dm
+++ b/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/xhihao_light_arms/ammo.dm
@@ -2,30 +2,6 @@
* .310 Strilka
*/
-/obj/item/ammo_casing/strilka310/rubber
- name = ".310 Strilka rubber bullet casing"
- desc = "A .310 rubber bullet casing. Casing is a bit of a fib, there isn't one.\
-
\
- RUBBER: Less than lethal ammo. Deals both stamina damage and regular damage."
-
- icon = 'modular_skyrat/modules/modular_weapons/icons/obj/company_and_or_faction_based/xhihao_light_arms/ammo.dmi'
- icon_state = "310-casing-rubber"
-
- projectile_type = /obj/projectile/bullet/strilka310/rubber
- harmful = FALSE
-
-/obj/projectile/bullet/strilka310/rubber
- name = ".310 rubber bullet"
- damage = 15
- stamina = 55
- ricochets_max = 5
- ricochet_incidence_leeway = 0
- ricochet_chance = 130
- ricochet_decay_damage = 0.7
- shrapnel_type = null
- sharpness = NONE
- embed_data = null
-
/obj/item/ammo_casing/strilka310/ap
name = ".310 Strilka armor-piercing bullet casing"
desc = "A .310 armor-piercing bullet casing. Note, does not actually contain a casing.\
diff --git a/modular_skyrat/modules/modular_weapons/code/gun_launches_little_guys_element.dm b/modular_skyrat/modules/modular_weapons/code/gun_launches_little_guys_element.dm
index e337b2c57db..b049ed04e15 100644
--- a/modular_skyrat/modules/modular_weapons/code/gun_launches_little_guys_element.dm
+++ b/modular_skyrat/modules/modular_weapons/code/gun_launches_little_guys_element.dm
@@ -7,14 +7,20 @@
var/throwing_force
/// The throwing range applied to the gun's user
var/throwing_range
+ /// The knockdown time applied to the gun's user
+ var/knockdown_time
+ /// Is the throw gentle?
+ var/gentle
-/datum/element/gun_launches_little_guys/Attach(datum/target, throwing_force = 2, throwing_range = 3)
+/datum/element/gun_launches_little_guys/Attach(datum/target, throwing_force = 2, throwing_range = 3, knockdown_time = 1 SECONDS, gentle = FALSE)
. = ..()
if(!isgun(target))
return ELEMENT_INCOMPATIBLE
src.throwing_force = throwing_force
src.throwing_range = throwing_range
+ src.knockdown_time = knockdown_time
+ src.gentle = gentle
RegisterSignal(target, COMSIG_ATOM_EXAMINE, PROC_REF(examine))
RegisterSignal(target, COMSIG_GUN_FIRED, PROC_REF(throw_it_back))
@@ -39,8 +45,9 @@
var/fling_direction = REVERSE_DIR(user.dir)
var/atom/throw_target = get_edge_target_turf(user, fling_direction)
- user.Knockdown(1 SECONDS)
- user.throw_at(throw_target, throwing_range, throwing_force)
+ if (knockdown_time > 0)
+ user.Knockdown(knockdown_time)
+ user.throw_at(throw_target, throwing_range, throwing_force, gentle = gentle)
user.visible_message(span_warning("[weapon] sends [user] flying back as it fires!"), \
span_warning("[weapon] sends you flying back as it fires!"))
diff --git a/modular_skyrat/modules/modular_weapons/code/modular_projectiles.dm b/modular_skyrat/modules/modular_weapons/code/modular_projectiles.dm
index 3870c89e500..cf688848f19 100644
--- a/modular_skyrat/modules/modular_weapons/code/modular_projectiles.dm
+++ b/modular_skyrat/modules/modular_weapons/code/modular_projectiles.dm
@@ -12,27 +12,6 @@
* .460 Ceres (renamed tgcode .45)
*/
-/obj/item/ammo_casing/c45/rubber
- name = ".460 Ceres rubber bullet casing"
- desc = "A .460 bullet casing.\
-
\
- RUBBER: Less than lethal ammo. Deals both stamina damage and regular damage."
- projectile_type = /obj/projectile/bullet/c45/rubber
- harmful = FALSE
-
-/obj/projectile/bullet/c45/rubber
- name = ".460 Ceres rubber bullet"
- damage = 10
- stamina = 30
- ricochets_max = 6
- ricochet_incidence_leeway = 0
- ricochet_chance = 130
- ricochet_decay_damage = 0.7
- shrapnel_type = null
- sharpness = NONE
- embed_data = null
- wound_bonus = -50
-
/obj/item/ammo_casing/c45/hp
name = ".460 Ceres hollow-point bullet casing"
desc = "A .460 hollow-point bullet casing. Very lethal against unarmored opponents. Suffers against armor."
@@ -44,57 +23,10 @@
damage = 40
weak_against_armour = TRUE
-/*
-* 8mm Usurpator (renamed tg c46x30mm, used in the WT550)
-*/
-
-/obj/projectile/bullet/c46x30mm_rubber
- name = "8mm Usurpator rubber bullet"
- damage = 3
- stamina = 17
- ricochets_max = 6
- ricochet_incidence_leeway = 0
- ricochet_chance = 130
- ricochet_decay_damage = 0.7
- shrapnel_type = null
- sharpness = NONE
- embed_data = null
- wound_bonus = -50
-
-/obj/item/ammo_casing/c46x30mm/rubber
- name = "8mm Usurpator rubber bullet casing"
- desc = "An 8mm Usurpator rubber bullet casing.\
-
\
- RUBBER: Less than lethal ammo. Deals both stamina damage and regular damage."
- projectile_type = /obj/projectile/bullet/c46x30mm_rubber
- harmful = FALSE
-
/*
* .277 Aestus (renamed tgcode .223, used in the M-90gl)
*/
-/obj/item/ammo_casing/a223/rubber
- name = ".277 rubber bullet casing"
- desc = "A .277 rubber bullet casing.\
-
\
- RUBBER: Less than lethal ammo. Deals both stamina damage and regular damage."
- projectile_type = /obj/projectile/bullet/a223/rubber
- harmful = FALSE
-
-/obj/projectile/bullet/a223/rubber
- name = ".277 rubber bullet"
- damage = 10
- armour_penetration = 10
- stamina = 30
- ricochets_max = 6
- ricochet_incidence_leeway = 0
- ricochet_chance = 130
- ricochet_decay_damage = 0.7
- shrapnel_type = null
- sharpness = NONE
- embed_data = null
- wound_bonus = -50
-
/obj/item/ammo_casing/a223/ap
name = ".277 Aestus armor-piercing bullet casing"
desc = "A .277 armor-piercing bullet casing.\
@@ -124,22 +56,6 @@
damage = 15
wound_bonus = 0
-/obj/item/ammo_casing/c34/rubber
- name = ".34 rubber bullet casing"
- desc = "A .34 rubber bullet casing."
- caliber = "c34acp"
- projectile_type = /obj/projectile/bullet/c34/rubber
- harmful = FALSE
-
-/obj/projectile/bullet/c34/rubber
- name = ".34 rubber bullet"
- damage = 5
- stamina = 20
- wound_bonus = -75
- shrapnel_type = null
- sharpness = NONE
- embed_data = null
-
/obj/item/ammo_casing/c34/ap
name = ".34 armor-piercing bullet casing"
desc = "A .34 armor-piercing bullet casing."
diff --git a/modular_skyrat/modules/mutants/code/mutant_component.dm b/modular_skyrat/modules/mutants/code/mutant_component.dm
index 130ab1ea524..7e37c02ce52 100644
--- a/modular_skyrat/modules/mutants/code/mutant_component.dm
+++ b/modular_skyrat/modules/mutants/code/mutant_component.dm
@@ -64,8 +64,7 @@
/datum/component/mutant_infection/proc/remove_infection()
if(ismutant(host) && old_species)
host.set_species(old_species)
- host.grab_ghost()
- host.revive(TRUE, TRUE)
+ host.revive(HEAL_ALL,force_grab_ghost = TRUE)
to_chat(host, span_greentext("You feel like you're free of that foul disease!"))
ADD_TRAIT(host, TRAIT_MUTANT_IMMUNE, "mutant_virus")
host.mind?.remove_antag_datum(/datum/antagonist/mutant)
@@ -152,6 +151,7 @@
SIGNAL_HANDLER
var/revive_time = rand(REVIVE_TIME_LOWER, REVIVE_TIME_UPPER)
to_chat(host, span_cult_large("You can feel your heart stopping, but something isn't right... you will rise again!"))
+ to_chat(host, span_redtext("You will revive in approximately [revive_time/10] seconds."))
timer_id = addtimer(CALLBACK(src, PROC_REF(regenerate)), revive_time, TIMER_STOPPABLE)
/datum/component/mutant_infection/proc/regenerate()
@@ -160,12 +160,10 @@
if(!istype(canidate))
return
host.key = canidate.key
- else
- host.grab_ghost()
to_chat(host, span_notice("You feel an itching, both inside and \
outside as your tissues knit and reknit."))
playsound(host, 'sound/effects/magic/demon_consume.ogg', 50, TRUE)
- host.revive(TRUE, TRUE)
+ host.revive(HEAL_ALL, force_grab_ghost = TRUE)
/datum/component/mutant_infection/proc/create_glow()
var/atom/movable/parent_movable = parent
diff --git a/modular_skyrat/modules/nanotrasen_rep/code/nanotrasen_consultant.dm b/modular_skyrat/modules/nanotrasen_rep/code/nanotrasen_consultant.dm
index 56eeb03ce78..a6723352ae8 100644
--- a/modular_skyrat/modules/nanotrasen_rep/code/nanotrasen_consultant.dm
+++ b/modular_skyrat/modules/nanotrasen_rep/code/nanotrasen_consultant.dm
@@ -1,5 +1,6 @@
/datum/job/nanotrasen_consultant
title = JOB_NT_REP
+ rpg_title = "Guild Adviser"
description = "Represent Nanotrasen on the station, argue with the HoS about why he can't just field execute people for petty theft, get drunk in your office."
department_head = list(JOB_CENTCOM)
faction = FACTION_STATION
diff --git a/modular_skyrat/modules/novaya_ert/code/advanced_choice_beacon.dm b/modular_skyrat/modules/novaya_ert/code/advanced_choice_beacon.dm
index 73ad710a4ce..d4a54b455ed 100644
--- a/modular_skyrat/modules/novaya_ert/code/advanced_choice_beacon.dm
+++ b/modular_skyrat/modules/novaya_ert/code/advanced_choice_beacon.dm
@@ -124,7 +124,7 @@
icon = 'modular_skyrat/modules/novaya_ert/icons/turret_deployable.dmi'
icon_state = "living"
base_icon_state = "living"
- stun_projectile = /obj/projectile/bullet/c27_54cesarzowa/rubber
+ stun_projectile = /obj/projectile/bullet/c27_54cesarzowa
lethal_projectile = /obj/projectile/bullet/c27_54cesarzowa
max_integrity = 150
req_access = list(ACCESS_CENT_GENERAL)
diff --git a/modular_skyrat/modules/novaya_ert/code/ert.dm b/modular_skyrat/modules/novaya_ert/code/ert.dm
index 9590acfd1bf..20849825bb8 100644
--- a/modular_skyrat/modules/novaya_ert/code/ert.dm
+++ b/modular_skyrat/modules/novaya_ert/code/ert.dm
@@ -23,7 +23,7 @@
var/mob/living/carbon/human/H = owner.current
H.set_species(/datum/species/human)
- H.grant_language(/datum/language/panslavic)
+ H.grant_language(/datum/language/spinwarder)
H.grant_language(/datum/language/schechi)
return TRUE
diff --git a/modular_skyrat/modules/novaya_ert/code/outfit.dm b/modular_skyrat/modules/novaya_ert/code/outfit.dm
index cca50f16d01..707c417474f 100644
--- a/modular_skyrat/modules/novaya_ert/code/outfit.dm
+++ b/modular_skyrat/modules/novaya_ert/code/outfit.dm
@@ -115,7 +115,6 @@
belt = /obj/item/gun/ballistic/revolver/shotgun_revolver
back = /obj/item/storage/backpack/satchel/leather
backpack_contents = list(/obj/item/storage/box/nri_survival_pack,
- /obj/item/ammo_box/advanced/s12gauge/express,
/obj/item/suppressor/standard,
/obj/item/knife/combat,
/obj/item/beamout_tool)
diff --git a/modular_skyrat/modules/opposing_force/code/equipment/ammo.dm b/modular_skyrat/modules/opposing_force/code/equipment/ammo.dm
index 32ec19d2811..d3af5acc4ee 100644
--- a/modular_skyrat/modules/opposing_force/code/equipment/ammo.dm
+++ b/modular_skyrat/modules/opposing_force/code/equipment/ammo.dm
@@ -1,46 +1,14 @@
/datum/opposing_force_equipment/ammo_exotic
category = OPFOR_EQUIPMENT_CATEGORY_AMMO_EXOTIC
-/datum/opposing_force_equipment/ammo_exotic/rubber27_54
- description = "A box of .27-54 Cesarzowa Rubber rounds, useful for incapacitating targets without causing too much extra harm."
- item_type = /obj/item/ammo_box/c27_54cesarzowa/rubber
-
/datum/opposing_force_equipment/ammo_exotic/ripper35
description = "A box of .35 Sol rounds, hollow-tipped for maximum damage against NON-ARMOURED combatants."
item_type = /obj/item/ammo_box/c35sol/ripper
-/datum/opposing_force_equipment/ammo_exotic/pierce40
- description = "A box of .40 Sol Match rounds, works best against armoured combatants; the box has a warning about being careful for collateral damage."
- item_type = /obj/item/ammo_box/c40sol/pierce
-
-/datum/opposing_force_equipment/ammo_exotic/fire40
- description = "A box of .40 Sol Incendiary rounds, bullet impacts light the victims aflame."
- item_type = /obj/item/ammo_box/c40sol/incendiary
-
-/datum/opposing_force_equipment/ammo_exotic/frag40
- description = "A box of .40 Sol Fragmentation rounds, useful for incapacitating your victim ASAP, no matter if they live or die."
- item_type = /obj/item/ammo_box/c40sol/fragmentation
-
-/datum/opposing_force_equipment/ammo_exotic/rubber310
- description = "A box of .310 Strilka Rubber rounds, useful for incapacitating targets without causing too much extra harm."
- item_type = /obj/item/ammo_box/c310_cargo_box/rubber
-
/datum/opposing_force_equipment/ammo_exotic/pierce310
description = "A box of .310 Strilka Piercing rounds, useful against armored combatants."
item_type = /obj/item/ammo_box/c310_cargo_box/piercing
-/datum/opposing_force_equipment/ammo_exotic/magnum
- description = "A box of magnum flechette shotgun shells, the first choice munition of many shotgun fanatics."
- item_type = /obj/item/ammo_box/advanced/s12gauge/magnum
-
-/datum/opposing_force_equipment/ammo_exotic/express
- description = "A box of express buckshot shotgun shells, for when the regular shells can't keep up with you."
- item_type = /obj/item/ammo_box/advanced/s12gauge/express
-
-/datum/opposing_force_equipment/ammo_exotic/flechette
- description = "A box of flechette shotgun shells, tighter spread than buckshot plus more armour damage."
- item_type = /obj/item/ammo_box/advanced/s12gauge/flechette
-
/datum/opposing_force_equipment/ammo_exotic/incendiary
description = "A box of dargonsbreath shotgun shells, highly underrated in the hands of someone who knows not to step forward after firing."
item_type = /obj/item/ammo_box/advanced/s12gauge/incendiary
@@ -49,14 +17,6 @@
description = "A box of slug shotgun shells, fires only one big fuck-off bullet that wounds extra hard."
item_type = /obj/item/ammo_box/advanced/s12gauge
-/datum/opposing_force_equipment/ammo_exotic/hornet
- description = "A box of hornet's nest shotgun shells, a less-lethal pellet spread that bounces towards targets off of walls."
- item_type = /obj/item/ammo_box/advanced/s12gauge/beehive
-
-/datum/opposing_force_equipment/ammo_exotic/stardust
- description = "A box of stardust shotgun shells, a less-lethal spread of embedding electrodes that tire targets that move."
- item_type = /obj/item/ammo_box/advanced/s12gauge/antitide
-
/datum/opposing_force_equipment/ammo_exotic/a357phasic
description = "A speedloader of .357 that ignores structure collision at the cost of some damage."
admin_note = "Bullets ignore walls, has a damage penalty."
diff --git a/modular_skyrat/modules/opposing_force/code/equipment/guns.dm b/modular_skyrat/modules/opposing_force/code/equipment/guns.dm
index 8f0619c1840..439157a33b5 100644
--- a/modular_skyrat/modules/opposing_force/code/equipment/guns.dm
+++ b/modular_skyrat/modules/opposing_force/code/equipment/guns.dm
@@ -1,56 +1,5 @@
/datum/opposing_force_equipment/ranged
category = OPFOR_EQUIPMENT_CATEGORY_RANGED
-
-/datum/opposing_force_equipment/ranged/renoster
- name = "Renoster Shotgun"
- description = "A twelve gauge shotgun with an eight shell capacity underneath."
- item_type = /obj/item/storage/toolbox/guncase/skyrat/opfor/renoster
-
-/obj/item/storage/toolbox/guncase/skyrat/opfor/renoster/PopulateContents()
- new /obj/item/gun/ballistic/shotgun/riot/sol/evil(src)
- new /obj/item/ammo_box/advanced/s12gauge/buckshot(src)
- new /obj/item/ammo_box/advanced/s12gauge/buckshot(src)
-
-/datum/opposing_force_equipment/ranged/infanteria
- name = "Carwo-Cawil Battle Rifle"
- description = "A heavy battle rifle, this one seems to be painted tacticool black. Accepts any standard TerraGov rifle magazine."
- item_type = /obj/item/storage/toolbox/guncase/skyrat/opfor/infanteria
-
-/obj/item/storage/toolbox/guncase/skyrat/opfor/infanteria/PopulateContents()
- new /obj/item/gun/ballistic/automatic/sol_rifle/evil(src)
- new /obj/item/ammo_box/magazine/c40sol_rifle/standard(src)
- new /obj/item/ammo_box/magazine/c40sol_rifle/standard(src)
-
-/datum/opposing_force_equipment/ranged/miecz
- name = "'Miecz' Submachinegun"
- description = "A short barrel, further compacted conversion of the 'Lanca' rifle to fire pistol caliber cartridges."
- item_type = /obj/item/storage/toolbox/guncase/skyrat/opfor/miecz
-
-/obj/item/storage/toolbox/guncase/skyrat/opfor/miecz/PopulateContents()
- new /obj/item/gun/ballistic/automatic/miecz(src)
- new /obj/item/ammo_box/magazine/miecz(src)
- new /obj/item/ammo_box/magazine/miecz(src)
-
-/datum/opposing_force_equipment/ranged/kiboko
- name = "Kiboko Grenade Launcher"
- description = "A unique grenade launcher firing .980 grenades. A laser sight system allows its user to specify a range for the grenades it fires to detonate at"
- item_type = /obj/item/storage/toolbox/guncase/skyrat/opfor/kiboko
-
-/obj/item/storage/toolbox/guncase/skyrat/opfor/kiboko/PopulateContents()
- new /obj/item/gun/ballistic/automatic/sol_grenade_launcher/evil(src)
- new /obj/item/ammo_box/magazine/c980_grenade/drum(src)
- new /obj/item/ammo_box/magazine/c980_grenade/drum(src)
-
-/datum/opposing_force_equipment/ranged/amr
- name = "'Wyłom' AMR"
- description = "A massive, outdated beast of an anti materiel rifle that was once in use by CIN military forces. Fires the devastating .60 Strela caseless round, the massively overperforming penetration of which being the reason this weapon was discontinued."
- item_type = /obj/item/storage/toolbox/guncase/skyrat/opfor/amr
-
-/obj/item/storage/toolbox/guncase/skyrat/opfor/amr/PopulateContents()
- new /obj/item/gun/ballistic/automatic/wylom(src)
- new /obj/item/ammo_box/magazine/wylom(src)
- new /obj/item/ammo_box/magazine/wylom(src)
-
/datum/opposing_force_equipment/ranged/lmg
name = "L6 SAW LMG"
description = "A heavily modified 7mm light machine gun, designated 'L6 SAW'. Has 'Aussec Armoury - 2531' engraved on the receiver below the designation."
@@ -147,26 +96,6 @@
new /obj/item/ammo_box/magazine/smgm45(src)
new /obj/item/ammo_box/magazine/smgm45(src)
-/datum/opposing_force_equipment/ranged_stealth/sindano
- name = "Sindano SMG"
- description = "A small submachinegun, this one is painted in tacticool black. Accepts any standard Sol pistol magazine."
- item_type = /obj/item/storage/toolbox/guncase/skyrat/pistol/opfor/sindano
-
-/obj/item/storage/toolbox/guncase/skyrat/pistol/opfor/sindano/PopulateContents()
- new /obj/item/gun/ballistic/automatic/sol_smg/evil(src)
- new /obj/item/ammo_box/magazine/c35sol_pistol/stendo(src)
- new /obj/item/ammo_box/magazine/c35sol_pistol/stendo(src)
-
-/datum/opposing_force_equipment/ranged_stealth/wespe
- name = "Wespe Pistol"
- description = "The standard issue service pistol of TerraGov's various military branches. Comes with attached light."
- item_type = /obj/item/storage/toolbox/guncase/skyrat/pistol/opfor/wespe
-
-/obj/item/storage/toolbox/guncase/skyrat/pistol/opfor/wespe/PopulateContents()
- new /obj/item/gun/ballistic/automatic/pistol/sol/evil(src)
- new /obj/item/ammo_box/magazine/c35sol_pistol(src)
- new /obj/item/ammo_box/magazine/c35sol_pistol(src)
-
/datum/opposing_force_equipment/ranged_stealth/makarov
name = "Makarov Pistol"
description = "A small, easily concealable 9x25mm Mk.12 handgun. This one is packed with a suppressor."
@@ -188,26 +117,6 @@
new /obj/item/ammo_box/magazine/m45(src)
new /obj/item/ammo_box/magazine/m45(src)
-/datum/opposing_force_equipment/ranged_stealth/plasma_pistol
- name = "'Słońce' Plasma Projector"
- description = "An outdated sidearm rarely seen in use by some members of the CIN. Spews an inaccurate stream of searing plasma out the magnetic barrel so long as it has power and the trigger is pulled."
- item_type = /obj/item/storage/toolbox/guncase/skyrat/pistol/opfor/plasma_pistol
-
-/obj/item/storage/toolbox/guncase/skyrat/pistol/opfor/plasma_pistol/PopulateContents()
- new /obj/item/gun/ballistic/automatic/pistol/plasma_thrower(src)
- new /obj/item/ammo_box/magazine/recharge/plasma_battery(src)
- new /obj/item/ammo_box/magazine/recharge/plasma_battery(src)
-
-/datum/opposing_force_equipment/ranged_stealth/plasma_marksman
- name = "'Gwiazda' Plasma Sharpshooter"
- description = "An outdated sidearm rarely seen in use by some members of the CIN. Fires relatively accurate globs of searing plasma."
- item_type = /obj/item/storage/toolbox/guncase/skyrat/pistol/opfor/plasma_marksman
-
-/obj/item/storage/toolbox/guncase/skyrat/pistol/opfor/plasma_marksman/PopulateContents()
- new /obj/item/gun/ballistic/automatic/pistol/plasma_marksman(src)
- new /obj/item/ammo_box/magazine/recharge/plasma_battery(src)
- new /obj/item/ammo_box/magazine/recharge/plasma_battery(src)
-
/datum/opposing_force_equipment/ranged_stealth/syndie_revolver
name = "Syndicate Revolver"
description = "A modernized 7 round revolver manufactured by Scarborough."
diff --git a/modular_skyrat/modules/organs/code/stomach.dm b/modular_skyrat/modules/organs/code/stomach.dm
index ca57e60af1f..f282222090a 100644
--- a/modular_skyrat/modules/organs/code/stomach.dm
+++ b/modular_skyrat/modules/organs/code/stomach.dm
@@ -13,4 +13,3 @@
icon_state = "stomach_big_synth" //ugly placeholder sorry im not an artist hehe
maxHealth = 1.5 * STANDARD_ORGAN_THRESHOLD
metabolism_efficiency = 0.07
-
diff --git a/modular_skyrat/modules/organs/code/tongue.dm b/modular_skyrat/modules/organs/code/tongue.dm
index 08f6c6d7516..ecf39feaf5a 100644
--- a/modular_skyrat/modules/organs/code/tongue.dm
+++ b/modular_skyrat/modules/organs/code/tongue.dm
@@ -85,6 +85,41 @@
speaker.verb_sing = initial(verb_sing)
speaker.verb_yell = initial(verb_yell)
+/obj/item/organ/tongue/mouse
+ name = "murid tongue"
+ desc = "a short, rough tongue covered in bumps."
+ say_mod = "squeaks"
+ icon_state = "tongue"
+ modifies_speech = TRUE
+
+/obj/item/organ/tongue/mouse/modify_speech(datum/source, list/speech_args)
+ . = ..()
+ var/message = LOWER_TEXT(speech_args[SPEECH_MESSAGE])
+ if(message == "hi" || message == "hi.")
+ speech_args[SPEECH_MESSAGE] = "Cheesed to meet you!"
+ if(message == "hi?")
+ speech_args[SPEECH_MESSAGE] = "Um... cheesed to meet you?"
+
+/obj/item/organ/tongue/mouse/Initialize(mapload)
+ . = ..()
+ AddComponent(/datum/component/speechmod, replacements = strings("mouse_replacement.json", "mouse")) // This is prepawsterous! ...Or something like that.
+
+/obj/item/organ/tongue/mouse/on_mob_insert(mob/living/carbon/tongue_owner, special, movement_flags)
+ . = ..()
+ RegisterSignal(tongue_owner, COMSIG_LIVING_ITEM_GIVEN, PROC_REF(its_on_the_mouse))
+
+/obj/item/organ/tongue/mouse/on_mob_remove(mob/living/carbon/tongue_owner)
+ . = ..()
+ UnregisterSignal(tongue_owner, COMSIG_LIVING_ITEM_GIVEN)
+
+/obj/item/organ/tongue/mouse/proc/on_item_given(mob/living/carbon/offerer, mob/living/taker, obj/item/given)
+ SIGNAL_HANDLER
+ INVOKE_ASYNC(src, PROC_REF(its_on_the_mouse), offerer, taker)
+
+/obj/item/organ/tongue/mouse/proc/its_on_the_mouse(mob/living/carbon/offerer, mob/living/taker)
+ offerer.say("For you, it's on the mouse.")
+ taker.add_mood_event("it_was_on_the_mouse", /datum/mood_event/it_was_on_the_mouse)
+
/// This "human" tongue is only used in Character Preferences / Augmentation menu.
/// The base tongue class lacked a say_mod. With say_mod included it makes a non-Human user sound like a Human.
/obj/item/organ/tongue/human
diff --git a/modular_skyrat/modules/player_ranks/code/subsystem/player_ranks.dm b/modular_skyrat/modules/player_ranks/code/subsystem/player_ranks.dm
index ffeb836dba3..58dbfcae91c 100644
--- a/modular_skyrat/modules/player_ranks/code/subsystem/player_ranks.dm
+++ b/modular_skyrat/modules/player_ranks/code/subsystem/player_ranks.dm
@@ -118,7 +118,7 @@ SUBSYSTEM_DEF(player_ranks)
* * prefs - The preferences datum to check the donator_status eligibility.
*/
/datum/controller/subsystem/player_ranks/proc/update_prefs_donator_status(datum/preferences/prefs)
- if(!prefs)
+ if(!prefs || !prefs.parent)
return
prefs.unlock_content = !!prefs.parent.IsByondMember()
diff --git a/modular_skyrat/modules/primitive_catgirls/code/species.dm b/modular_skyrat/modules/primitive_catgirls/code/species.dm
index c317b0febc5..43de45d4d42 100644
--- a/modular_skyrat/modules/primitive_catgirls/code/species.dm
+++ b/modular_skyrat/modules/primitive_catgirls/code/species.dm
@@ -32,6 +32,7 @@
TRAIT_RESISTCOLD,
TRAIT_USES_SKINTONES,
)
+ sort_bottom = TRUE //BUBBER EDIT ADDITION: We want to sort this to the bottom because it's a ghostrole only species.
always_customizable = TRUE
diff --git a/modular_skyrat/modules/primitive_cooking_additions/code/millstone.dm b/modular_skyrat/modules/primitive_cooking_additions/code/millstone.dm
index 505d418b536..c2949f49531 100644
--- a/modular_skyrat/modules/primitive_cooking_additions/code/millstone.dm
+++ b/modular_skyrat/modules/primitive_cooking_additions/code/millstone.dm
@@ -1,5 +1,5 @@
#define MILLSTONE_STAMINA_MINIMUM 50 //What is the amount of stam damage that we prevent mill use at
-#define MILLSTONE_STAMINA_USE 100 //How much stam damage is given to people when the mill is used
+#define MILLSTONE_STAMINA_USE 80 //How much stam damage is given to people when the mill is used
/obj/structure/millstone
name = "millstone"
diff --git a/modular_skyrat/modules/quirks/neutral.dm b/modular_skyrat/modules/quirks/neutral.dm
index 80b1f6f9c3e..f33b45235c6 100644
--- a/modular_skyrat/modules/quirks/neutral.dm
+++ b/modular_skyrat/modules/quirks/neutral.dm
@@ -288,6 +288,90 @@ GLOBAL_VAR_INIT(DNR_trait_overlay, generate_DNR_trait_overlay())
new_tongue.copy_traits_from(human_holder.get_organ_slot(ORGAN_SLOT_TONGUE))
new_tongue.Insert(human_holder, special = TRUE, movement_flags = DELETE_IF_REPLACED)
+///Start of Mouse Traits
+/datum/quirk/item_quirk/mouse
+ name = "Muridae Traits"
+ desc = "You always thought those jokes were cheesy. This will replace most other tongue-based speech quirks."
+ mob_trait = TRAIT_MURIDAE
+ icon = FA_ICON_CHEESE
+ value = 0
+ medical_record_text = "Patient has an insatiable love for dairy and terrible puns."
+ var/datum/action/cooldown/spell/sniff/sniff_food
+
+/datum/quirk/item_quirk/mouse/add_unique(client/client_source)
+ var/mob/living/carbon/human/human_holder = quirk_holder
+ var/obj/item/organ/tongue/mouse/new_tongue = new(get_turf(human_holder))
+ human_holder.faction |= FACTION_RAT
+
+ new_tongue.copy_traits_from(human_holder.get_organ_slot(ORGAN_SLOT_TONGUE))
+ new_tongue.Insert(human_holder, special = TRUE, movement_flags = DELETE_IF_REPLACED)
+
+/datum/quirk/item_quirk/mouse/add(client/client_source)
+ . = ..()
+
+ sniff_food = new()
+ sniff_food.Grant(quirk_holder)
+
+/datum/quirk/item_quirk/mouse/remove()
+ . = ..()
+
+ if(QDELETED(quirk_holder))
+ return
+
+ QDEL_NULL(sniff_food)
+
+/datum/action/cooldown/spell/sniff
+ name = "Sniff Food"
+ desc = "Anyone can cook!"
+ button_icon_state = "food_french"
+ button_icon = 'icons/hud/screen_alert.dmi'
+ cooldown_time = 10 SECONDS
+ spell_requirements = NONE
+ check_flags = AB_CHECK_CONSCIOUS|AB_CHECK_INCAPACITATED
+
+/datum/action/cooldown/spell/sniff/cast(mob/living/caster)
+ . = ..()
+ try_sniff_item(caster)
+
+// tries to check if the obj is valid to sniff
+/datum/action/cooldown/spell/sniff/proc/can_sniff(obj/item/food/potential_food, mob/living/caster)
+ if(potential_food.food_flags & ABSTRACT)
+ return FALSE
+ return TRUE
+
+// tries to sniff item in hand
+/datum/action/cooldown/spell/sniff/proc/try_sniff_item(mob/living/caster)
+ var/obj/item/food/potential_food = caster.get_active_held_item()
+ if(!istype(potential_food))
+ if(caster.get_inactive_held_item())
+ to_chat(caster, span_warning("You must be holding food!"))
+ else
+ to_chat(caster, span_warning("You aren't holding anything that can be used as an ingredient!"))
+ return FALSE
+ if(!can_sniff(potential_food, caster))
+ return FALSE
+ caster.balloon_alert_to_viewers("sniffing...")
+ to_chat(caster, span_notice("You start judging [potential_food] for its culinary potential..."))
+ if(!do_after(caster, 5 SECONDS, potential_food))
+ to_chat(caster, span_notice("You didn't get a good enough whiff of [potential_food]."))
+ return FALSE
+ check_recipes(potential_food)
+ return TRUE
+
+// checks recipes related to held item
+/datum/action/cooldown/spell/sniff/proc/check_recipes(obj/item/food/potential_food)
+ var/list/type_recipe_list = list()
+ var/food_type = potential_food.type
+ for(var/datum/crafting_recipe/recipe as anything in GLOB.cooking_recipes)
+ if(food_type in recipe.reqs)
+ type_recipe_list += recipe.result
+ if(length(type_recipe_list) == 0)
+ to_chat(owner, span_notice("Nothing more can be made from this."))
+ return FALSE
+ var/datum/crafting_recipe/chosen = pick(type_recipe_list)
+ to_chat(owner, span_notice("[potential_food] could probably be used to make [chosen::name]"))
+///End of Mouse Traits
+
/datum/quirk/sensitivesnout
name = "Sensitive Snout"
desc = "Your face has always been sensitive, and it really hurts when someone pokes it!"
diff --git a/modular_skyrat/modules/sec_haul/code/corrections_officer/corrections_officer.dm b/modular_skyrat/modules/sec_haul/code/corrections_officer/corrections_officer.dm
index 8b03d305bb0..849cc1d2ba2 100644
--- a/modular_skyrat/modules/sec_haul/code/corrections_officer/corrections_officer.dm
+++ b/modular_skyrat/modules/sec_haul/code/corrections_officer/corrections_officer.dm
@@ -1,5 +1,6 @@
/datum/job/corrections_officer
title = JOB_CORRECTIONS_OFFICER
+ rpg_title = "Beefeater"
description = "Guard the permabrig, stand around looking imposing, get fired for abusing the prisoners"
auto_deadmin_role_flags = DEADMIN_POSITION_SECURITY
department_head = list("The Warden and Head of Security")
diff --git a/modular_skyrat/modules/sec_haul/code/guns/ammo.dm b/modular_skyrat/modules/sec_haul/code/guns/ammo.dm
index a0e90388d65..a3885239f85 100644
--- a/modular_skyrat/modules/sec_haul/code/guns/ammo.dm
+++ b/modular_skyrat/modules/sec_haul/code/guns/ammo.dm
@@ -1,26 +1,3 @@
/obj/item/ammo_box/advanced
multiple_sprites = AMMO_BOX_FULL_EMPTY
-/*
-* 9mm
-*/
-
-/obj/item/ammo_box/c9mm/rubber
- name = "9x25mm rubber box"
- ammo_type = /obj/item/ammo_casing/c9mm/rubber
-
-/obj/item/ammo_box/c9mm/ihdf
- name = "9x25mm IHDF box"
- ammo_type = /obj/item/ammo_casing/c9mm/ihdf
-
-/*
-* 10mm
-*/
-
-/obj/item/ammo_box/c10mm/rubber
- name = "10mm auto rubber box"
- ammo_type = /obj/item/ammo_casing/c10mm/rubber
-
-/obj/item/ammo_box/c10mm/ihdf
- name = "peacekeeper ammo box (10mm ihdf)"
- ammo_type = /obj/item/ammo_casing/c10mm/ihdf
diff --git a/modular_skyrat/modules/sec_haul/code/guns/armory_spawns.dm b/modular_skyrat/modules/sec_haul/code/guns/armory_spawns.dm
index f8c570a6951..03b321a383f 100644
--- a/modular_skyrat/modules/sec_haul/code/guns/armory_spawns.dm
+++ b/modular_skyrat/modules/sec_haul/code/guns/armory_spawns.dm
@@ -38,12 +38,6 @@
for(var/i in 1 to mags_to_spawn)
new spawned_ballistic_gun.spawn_magazine_type (spawned_box)
- if(istype(spawned_gun, /obj/item/gun/microfusion))
- var/obj/item/gun/microfusion/spawned_microfusion_gun = spawned_gun
- var/obj/item/storage/box/ammo_box/microfusion/armory/spawned_box = new(loc)
- for(var/i in 1 to mags_to_spawn)
- new spawned_microfusion_gun.cell_type (spawned_box)
-
/obj/effect/spawner/armory_spawn/shotguns
guns = list(
/obj/item/gun/ballistic/shotgun/riot/sol,
@@ -69,33 +63,6 @@
illustration = null
layer = 2.9
-/obj/item/storage/box/ammo_box/microfusion
- name = "microfusion cell container"
- desc = "A box filled with microfusion cells."
-
-/obj/item/storage/box/ammo_box/microfusion/armory/PopulateContents()
- new /obj/item/storage/pouch/ammo(src)
-
-/obj/item/storage/box/ammo_box/microfusion/full/PopulateContents()
- new /obj/item/storage/pouch/ammo(src)
- new /obj/item/stock_parts/power_store/cell/microfusion(src)
- new /obj/item/stock_parts/power_store/cell/microfusion(src)
- new /obj/item/stock_parts/power_store/cell/microfusion(src)
-
-/obj/item/storage/box/ammo_box/microfusion/bagless
-
-/obj/item/storage/box/ammo_box/microfusion/bagless/PopulateContents()
- new /obj/item/stock_parts/power_store/cell/microfusion(src)
- new /obj/item/stock_parts/power_store/cell/microfusion(src)
- new /obj/item/stock_parts/power_store/cell/microfusion(src)
-
-/obj/effect/spawner/armory_spawn/centcom_rifles
- guns = list(
- /obj/item/gun/ballistic/automatic/sol_rifle,
- /obj/item/gun/ballistic/automatic/sol_rifle,
- /obj/item/gun/ballistic/automatic/sol_rifle/machinegun,
- )
-
/obj/effect/spawner/armory_spawn/centcom_lasers
guns = list(
/obj/item/gun/energy/laser,
@@ -106,7 +73,7 @@
/obj/effect/spawner/armory_spawn/smg
vertical_guns = FALSE
guns = list(
- /obj/item/gun/ballistic/automatic/sol_smg,
- /obj/item/gun/ballistic/automatic/sol_smg,
- /obj/item/gun/ballistic/automatic/sol_smg,
+ /obj/item/gun/ballistic/automatic/wt550,
+ /obj/item/gun/ballistic/automatic/wt550,
+ /obj/item/gun/ballistic/automatic/wt550,
)
diff --git a/modular_skyrat/modules/sec_haul/code/guns/bullets.dm b/modular_skyrat/modules/sec_haul/code/guns/bullets.dm
index 3136a313c6f..2c29c51c2ee 100644
--- a/modular_skyrat/modules/sec_haul/code/guns/bullets.dm
+++ b/modular_skyrat/modules/sec_haul/code/guns/bullets.dm
@@ -23,47 +23,6 @@
custom_materials = AMMO_MATS_TEMP
advanced_print_req = TRUE
-/obj/item/ammo_casing/c9mm/ihdf
- name = "9x25mm Mk.12 IHDF casing"
- desc = "A modern 9x25mm Mk.12 bullet casing. This one fires a bullet of 'Intelligent High-Impact Dispersal Foam', which is best compared to a riot-grade foam dart."
- projectile_type = /obj/projectile/bullet/c9mm/ihdf
- harmful = FALSE
-
-/obj/projectile/bullet/c9mm/ihdf
- name = "9x25mm IHDF bullet"
- damage = 30
- damage_type = STAMINA
- embed_type = /datum/embedding/c9mm_ihdf
-
-/datum/embedding/c9mm_ihdf
- embed_chance = 0
- fall_chance = 3
- jostle_chance = 4
- pain_mult = 5
- pain_stam_pct = 0.4
- ignore_throwspeed_threshold = TRUE
- jostle_pain_mult = 6
- rip_time = 1 SECONDS
-
-/obj/item/ammo_casing/c9mm/rubber
- name = "9x25mm Mk.12 rubber casing"
- desc = "A modern 9x25mm Mk.12 bullet casing. This less than lethal round sure hurts to get shot by, but causes little physical harm."
- projectile_type = /obj/projectile/bullet/c9mm/rubber
- harmful = FALSE
-
-/obj/projectile/bullet/c9mm/rubber
- name = "9x25mm rubber bullet"
- icon_state = "pellet"
- damage = 18
- stamina = 32
- ricochets_max = 6
- ricochet_incidence_leeway = 0
- ricochet_chance = 180
- ricochet_decay_damage = 0.8
- shrapnel_type = null
- sharpness = NONE
- embed_type = null
-
/obj/item/ammo_casing/security
name = "9x25mm Mk.12 security casing"
desc = "A modern 9x25mm Mk.12 bullet casing. This one fires a law-enfocement grade round, making it less deadly than most, but still lethal enough to do it's job."
@@ -77,61 +36,29 @@
/obj/projectile/bullet/c9mm
damage = 25
-/*
-* 10mm Auto
-*/
-/obj/item/ammo_casing/c10mm/ap
- custom_materials = AMMO_MATS_AP
- advanced_print_req = TRUE
+/obj/projectile/bullet/c9mm
+ damage = 25
-/obj/item/ammo_casing/c10mm/hp
- advanced_print_req = TRUE
-
-/obj/item/ammo_casing/c10mm/fire
- custom_materials = AMMO_MATS_TEMP
- advanced_print_req = TRUE
-
-/obj/item/ammo_casing/c10mm/reaper
- can_be_printed = FALSE
- // it's a hitscan 50 damage 40 AP bullet designed to be fired out of a gun with a 2rnd burst and 1.25x damage multiplier
- // Let's Not
-
-/obj/item/ammo_casing/c10mm/rubber
- name = "10mm rubber bullet casing"
- desc = "A 10mm rubber bullet casing."
- projectile_type = /obj/projectile/bullet/c10mm/rubber
- harmful = FALSE
-
-/obj/projectile/bullet/c10mm
+/obj/projectile/bullet/c38
+ name = ".38 bullet"
damage = 30
-/obj/projectile/bullet/c10mm/rubber
- name = "10mm rubber bullet"
- damage = 10
- stamina = 40
- ricochets_max = 6
- ricochet_incidence_leeway = 0
- ricochet_chance = 130
- ricochet_decay_damage = 0.8
- shrapnel_type = null
- sharpness = NONE
- embed_type = null
+// premium .38 ammo from cargo, weak against armor, lower base damage, but excellent at embedding and causing slice wounds at close range
+/obj/projectile/bullet/c38/dumdum
+ name = ".38 DumDum bullet"
+ damage = 20
+ weak_against_armour = TRUE
+ ricochets_max = 0
+ sharpness = SHARP_EDGED
+ wound_bonus = 35
+ exposed_wound_bonus = 30
+ embed_type = /datum/embedding/dumdum
+ wound_falloff_tile = -8
+ embed_falloff_tile = -20
-/obj/item/ammo_casing/c10mm/ihdf
- name = "10mm IHDF bullet casing"
- desc = "A 10mm intelligent high-impact dispersal foam bullet casing."
- projectile_type = /obj/projectile/bullet/c10mm/ihdf
- harmful = FALSE
-
-/obj/projectile/bullet/c10mm/ihdf
- name = "10mm IHDF bullet"
- damage = 40
- damage_type = STAMINA
- embed_type = /datum/embedding/c10mm_ihdf
-
-/datum/embedding/c10mm_ihdf
- embed_chance = 0
+/datum/embedding/dumdum
+ embed_chance = 90
fall_chance = 3
jostle_chance = 4
ignore_throwspeed_threshold = TRUE
diff --git a/modular_skyrat/modules/sec_haul/code/guns/cargo_stuff.dm b/modular_skyrat/modules/sec_haul/code/guns/cargo_stuff.dm
index 60cab0c3308..0b097219a02 100644
--- a/modular_skyrat/modules/sec_haul/code/guns/cargo_stuff.dm
+++ b/modular_skyrat/modules/sec_haul/code/guns/cargo_stuff.dm
@@ -1,152 +1,3 @@
-//TERRAGOV AMMO
-
-/datum/supply_pack/security/lethalsolpistols
- name = ".35 Ammunition Crates"
- desc = "Contains 6 boxes of lethal ammunition for Sol .35 Pistol."
- cost = CARGO_CRATE_VALUE * 10
- contains = list(/obj/item/ammo_box/c35sol= 3,
- /obj/item/ammo_box/c35sol/ripper = 3,
- )
- crate_name = ".35 ammo crate"
-
-/datum/supply_pack/security/lethalsolrifles
- name = ".40 Ammunition Crates"
- desc = "Contains 6 boxes of lethal ammunition for Sol .40 Rifle."
- cost = CARGO_CRATE_VALUE * 10
- contains = list(/obj/item/ammo_box/c40sol= 4,
- /obj/item/ammo_box/c40sol/pierce = 1,
- /obj/item/ammo_box/c40sol/incendiary = 1,
- )
- crate_name = ".40 ammo crate"
-
-/datum/supply_pack/security/lethalskyratshotgun
- name = "12 Gauge Ammunition Crates"
- desc = "Contains 6 boxes of lethal ammunition for all 12 Gauge Shotguns."
- cost = CARGO_CRATE_VALUE * 8
- contains = list(/obj/item/ammo_box/advanced/s12gauge/buckshot= 3,
- /obj/item/ammo_box/advanced/s12gauge = 3,
- )
- crate_name = "shotgun ammo crate"
-
-/datum/supply_pack/security/armory/exoticskyratammo
- name = "12 Gauge Exotic Ammunition Crates"
- desc = "Contains 6 boxes of exotic ammunition for all 12 Gauge Shotguns."
- cost = CARGO_CRATE_VALUE * 20
- contains = list(/obj/item/ammo_box/advanced/s12gauge/incendiary= 1,
- /obj/item/ammo_box/advanced/s12gauge/flechette = 1,
- /obj/item/ammo_box/advanced/s12gauge/express = 1,
- /obj/item/ammo_box/advanced/s12gauge/magnum = 1,
- /obj/item/ammo_box/advanced/s12gauge/flechette = 1,
- /obj/item/ammo_box/advanced/s12gauge/antitide = 1,
- )
- crate_name = "exotic shotgun ammo crate"
- contraband = TRUE
-
-/datum/supply_pack/security/antiriotskyratshotgunammo
- name = "12 Gauge Anti Riot Ammunition Crates"
- desc = "Contains 6 boxes of anti riot grade ammunition for all 12 Gauge Shotguns."
- cost = CARGO_CRATE_VALUE * 12
- contains = list(/obj/item/ammo_box/advanced/s12gauge/bean = 2,
- /obj/item/ammo_box/advanced/s12gauge/beehive = 2,
- /obj/item/ammo_box/advanced/s12gauge/rubber = 2,
- )
- crate_name = "anti riot shotgun ammo crate"
-
-
-//TERRAGOV GUNS
-
-/datum/supply_pack/security/wespe
- name = "Wespe Three-Pack Crates"
- desc = "Contains three case of the .35 sol handgun, magazines included."
- cost = CARGO_CRATE_VALUE * 12
- contains = list(/obj/item/gun/ballistic/automatic/pistol/sol = 3,
- /obj/item/ammo_box/magazine/c35sol_pistol = 3,
- /obj/item/ammo_box/c35sol/incapacitator = 3,
- )
- crate_name = "wespe pistols crate"
-
-/datum/supply_pack/security/eland
- name = "Eland Three-Pack Crates"
- desc = "Contains three case of the .35 sol revolver, munition boxes included."
- cost = CARGO_CRATE_VALUE * 12
- contains = list(/obj/item/gun/ballistic/revolver/sol = 3,
- /obj/item/ammo_box/c35sol/incapacitator = 3,
- )
- crate_name = "eland pistols crate"
-
-/datum/supply_pack/security/armory/renoster
- name = "Carwo 'Renoster' Shotgun Crate"
- desc = "Contains two Carwo 'Renoster' shotguns. Additional ammmo sold separately."
- cost = CARGO_CRATE_VALUE * 30
- contains = list(/obj/item/gun/ballistic/shotgun/riot/sol = 2,
- /obj/item/ammo_box/advanced/s12gauge/buckshot = 2,
- )
- crate_name = "Carwo 'Renoster' Shotgun Crate"
-
-
-/datum/supply_pack/security/armory/sindano
- name = "Carwo 'Sindano' Submachinegun Crate"
- desc = "Three entirely proprietary Sindano kits, chambered in .35 Sol Short. Each kit contains three empty magazines and a box each of incapacitator and lethal rounds."
- cost = CARGO_CRATE_VALUE * 20
- contains = list(
- /obj/item/gun/ballistic/automatic/sol_smg = 3,
- /obj/item/ammo_box/magazine/c35sol_pistol = 3,
- )
- crate_name = "Carwo 'Sindano' Submachinegun Crate"
-
-/datum/supply_pack/security/armory/marksman
- name = "Carwil Marksman Rifle Crate"
- desc = "Contains one Carwil Marksman Rifle, as well as 3 spare magazines for it."
- cost = CARGO_CRATE_VALUE * 12
- contains = list(/obj/item/gun/ballistic/automatic/sol_rifle/marksman = 1,
- /obj/item/ammo_box/magazine/c40sol_rifle = 3,
- )
- crate_name = "Carwil Marksman Rifle Crate"
-
-//NT Guns and Ammo
-
-/datum/supply_pack/security/sidearmcrate
- name = "Sidearm Crate"
- desc = "Contains Two Sidearm Beacon, rated for Nanotrasen usage."
- access_view = ACCESS_ARMORY
- cost = CARGO_CRATE_VALUE * 12
- contains = list(/obj/item/choice_beacon/security_pistol = 2,
- )
- crate_name = "Nanotrasen Sidearm Crate"
-
-// RomFed Gun
-
-/datum/supply_pack/security/armory/rom_ceremonial_rifle
- name = "Romulus Ceremonial Bolt Action Rifle Crate"
- desc = "Contains Three Ceremonial Bolt Action Rifle in .40 , as well as ammo for it."
- cost = CARGO_CRATE_VALUE * 12
- contains = list(/obj/item/gun/ballistic/rifle/carwil = 3,
- /obj/item/ammo_box/magazine/c40sol_rifle = 3,
- )
- crate_name = "Romulus Ceremonial Rifle Crate"
-
-
-
-//Misc
-
-/datum/supply_pack/security/armory/kiboko
- name = "Kiboko Grenade Launcher Crate"
- cost = CARGO_CRATE_VALUE * 30
- desc = "Contains a Kiboko 25mm grenade launchers. A small dial on the sight allows you to set the length of the grenade fuse."
- contains = list(
- /obj/item/gun/ballistic/automatic/sol_grenade_launcher/no_mag = 1,
- /obj/item/ammo_box/magazine/c980_grenade/starts_empty = 3
- )
- crate_name = "Kiboko Grenade Launcher Crate"
-
-/datum/supply_pack/security/armory/kiboko_riot
- name = "Kiboko 25mm Riot Pack"
- cost = CARGO_CRATE_VALUE * 8
- desc = "Contains three riot grade ammunition box."
- contains = list(
- /obj/item/ammo_box/c980grenade/riot = 3,
- )
-
/*
/datum/supply_pack/imports/lmg
name = "Smuggled Sol Light Machinegun Crate"
@@ -162,19 +13,6 @@
)
*/ //BUBBER EDIT: IT'S AS BAD AS YOU THOUGHT
-/datum/supply_pack/imports/infanterie
- name = "Carwil Battle Rifle Crate"
- desc = "(*!&@#GOOD NEWS, OPERATIVE! WE GOT YOU THE BIG LEAGUE AUTOMATIC WEAPONS. BY \
- SMUGGLING THIS CRATE THROUGH A FEW OUTDATED CUSTOMS CHECKPOINTS, WE'VE THE NEXT BEST THING! \
- SERVICE BATTLE RIFLE. DON'T WORRY, THE RUMORS ABOUT THE GUN MELTING YOU ARE JUST THAT! RUMORS! \
- THESE THINGS WORK FINE! MIGHT BE SLIGHTLY DIRTY.!#@*$"
- cost = CARGO_CRATE_VALUE * 20
- contains = list(/obj/item/gun/ballistic/automatic/sol_rifle = 2,
- /obj/item/ammo_box/magazine/c40sol_rifle = 4,
- )
- crate_name = "Carwil Battle Rifle Crate"
- hidden = TRUE
-
//Goodies
//Override
@@ -186,6 +24,7 @@
/obj/item/ammo_box/c38/iceblox,
)
special = FALSE
+
//This makes the Security ammo crate use the cool advanced ammo boxes instead of the old ones
diff --git a/modular_skyrat/modules/sec_haul/code/guns/sec_gun_rs.dm b/modular_skyrat/modules/sec_haul/code/guns/sec_gun_rs.dm
index 2bc3db1a8ed..e69de29bb2d 100644
--- a/modular_skyrat/modules/sec_haul/code/guns/sec_gun_rs.dm
+++ b/modular_skyrat/modules/sec_haul/code/guns/sec_gun_rs.dm
@@ -1,69 +0,0 @@
-//Security Crafting Recipe
-
-/datum/crafting_recipe/sol_rifle_carbine_kit
- name = "Sol Carbine Conversion"
- result = /obj/item/gun/ballistic/automatic/rom_carbine/no_mag
- reqs = list(
- /obj/item/gun/ballistic/automatic/sol_rifle = 1,
- /obj/item/weaponcrafting/gunkit/sol_rifle_carbine_kit = 1,
- )
- steps = list(
- "Remove the magazine",
- "Rack the bolt, leaving it open"
- )
- time = 10 SECONDS
- category = CAT_WEAPON_RANGED
-
-/datum/crafting_recipe/sol_rifle_carbine_kit/check_requirements(mob/user, list/collected_requirements)
- var/obj/item/gun/ballistic/automatic/sol_rifle/the_piece = collected_requirements[/obj/item/gun/ballistic/automatic/sol_rifle][1]
- if(!the_piece.bolt_locked)
- return FALSE
- if(the_piece.magazine)
- return FALSE
- return ..()
-
-/datum/crafting_recipe/sol_smg_rapidfire_kit
- name = "'Shaytan' SMG Conversion" //edited by Bangle
- result = /obj/item/gun/ballistic/automatic/rom_smg/no_mag
- reqs = list(
- /obj/item/gun/ballistic/automatic/sol_smg = 1,
- /obj/item/weaponcrafting/gunkit/sol_smg_rapidfire_kit = 1,
- )
- steps = list(
- "Remove the magazine",
- "Leave the bolt open"
- )
- time = 10 SECONDS
- category = CAT_WEAPON_RANGED
-
-/datum/crafting_recipe/sol_smg_rapidfire_kit/check_requirements(mob/user, list/collected_requirements)
- var/obj/item/gun/ballistic/automatic/sol_smg/the_piece = collected_requirements[/obj/item/gun/ballistic/automatic/sol_smg][1]
- if(the_piece.bolt_locked)
- return FALSE
- if(the_piece.magazine)
- return FALSE
- return ..()
-
-/datum/crafting_recipe/sol_bolt_to_rifle
- name = "Sol Battle Rifle Conversion"
- result = /obj/item/gun/ballistic/automatic/sol_rifle/no_mag
- reqs = list(
- /obj/item/gun/ballistic/rifle/carwil = 1,
- /obj/item/weaponcrafting/gunkit/sol_bolt_to_rifle = 1,
- )
- steps = list(
- "Remove the magazine",
- "Rack the bolt, leaving it open"
- )
- time = 10 SECONDS
- category = CAT_WEAPON_RANGED
-
-/datum/crafting_recipe/sol_bolt_to_rifle/check_requirements(mob/user, list/collected_requirements)
- var/obj/item/gun/ballistic/rifle/carwil/the_piece = collected_requirements[/obj/item/gun/ballistic/rifle/carwil][1]
- if(!the_piece.bolt_locked)
- return FALSE
- if(the_piece.magazine)
- return FALSE
- return ..()
-
-//Generic Gun Resource here
diff --git a/modular_skyrat/modules/sec_haul/code/misc/gun_redemption.dm b/modular_skyrat/modules/sec_haul/code/misc/gun_redemption.dm
index 7e69ac18569..34d0e7b21d5 100644
--- a/modular_skyrat/modules/sec_haul/code/misc/gun_redemption.dm
+++ b/modular_skyrat/modules/sec_haul/code/misc/gun_redemption.dm
@@ -9,8 +9,7 @@
/obj/item/choice_beacon/blueshield/generate_display_names()
var/static/list/selectable_gun_types = list(
"Energy Revolver" = /obj/item/gun/energy/e_gun/blueshield,
- "Energy Carbine" = /obj/item/gun/energy/e_gun/stun/blueshield,
- ".585 SMG" = /obj/item/storage/toolbox/guncase/skyrat/xhihao_large_case/bogseo //This can obviously be replaced out with any gun of your choice for future coder
+ "Energy Carbine" = /obj/item/gun/energy/e_gun/stun/blueshield
)
return selectable_gun_types
@@ -44,24 +43,7 @@
/obj/item/choice_beacon/station_magistrate/generate_display_names()
var/static/list/selectable_gun_types = list(
"Energy Revolver" = /obj/item/gun/energy/e_gun/blueshield,
- ".457 Romulus Revolver" = /obj/item/storage/toolbox/guncase/skyrat/hos_revolver,
- ".460 Rowland Magnum Pistol" = /obj/item/storage/toolbox/guncase/skyrat/pistol/m45a5
- )
-
- return selectable_gun_types
-
-//Security Sidearm
-
-/obj/item/choice_beacon/security_pistol
- name = "sidearm weapon beacon"
- desc = "A single use beacon to deliver a weapon of your choice. Please only call this in your office"
- company_source = "Romulus Armoury"
- company_message = span_bold("Supply pod incoming, please stand by.")
-
-/obj/item/choice_beacon/security_pistol/generate_display_names()
- var/static/list/selectable_gun_types = list(
- "Standard 9x25mm Mk2 Pistol" = /obj/item/storage/toolbox/guncase/skyrat/pistol/trappiste_small_case/nt_glock,
- "Police Special 10mm Auto Revolver" = /obj/item/storage/toolbox/guncase/skyrat/pistol/trappiste_small_case/nt_revolver
+ ".38 Battle Rifle" = /obj/item/gun/ballistic/automatic/battle_rifle,
)
return selectable_gun_types
diff --git a/modular_skyrat/modules/sec_haul/code/misc/packs.dm b/modular_skyrat/modules/sec_haul/code/misc/packs.dm
index a391417f093..b956df849ac 100644
--- a/modular_skyrat/modules/sec_haul/code/misc/packs.dm
+++ b/modular_skyrat/modules/sec_haul/code/misc/packs.dm
@@ -18,33 +18,5 @@
//Goodies..
-/datum/supply_pack/goody/m1911
- name = "Authentic SR Sector M1911"
- desc = "Old but gold, the classic pistol from the golden age of SR, whatever that place is. The M1911 chambered in .460 Ceres. It is sure to give anyone daring to fight you, a second thought. Note that this is a reproduction model by Romulus Federation and may be commonly found in the hand of a Kayit"
- contains = list(/obj/item/gun/ballistic/automatic/pistol/m1911/gold, /obj/item/ammo_box/magazine/m45)
- cost = PAYCHECK_COMMAND * 25 //The pistol is more expensive than rifle because of portability. Not Lethality
- access_view = ACCESS_WEAPONS
-
-/datum/supply_pack/goody/ceremonial_rifle
- name = "Romulus Ceremonial Bolt Action Rifle"
- desc = "A sporting rifle made of light polymer material chambered in Sol .40, poor recoil handling but quite accurate."
- contains = list(/obj/item/gun/ballistic/rifle/carwil, /obj/item/ammo_box/magazine/c40sol_rifle)
- cost = PAYCHECK_COMMAND * 20
- access_view = ACCESS_WEAPONS
-
-/datum/supply_pack/goody/nt_shotgun
- name = "Nanotrasen Woodstock Shotgun"
- desc = "A classic Shotgun used by hunters, police and frontiersmen alike, now at an affordable price."
- cost = PAYCHECK_COMMAND * 20
- contains = list(/obj/item/gun/ballistic/shotgun/riot, /obj/item/storage/pouch/ammo, /obj/item/storage/belt/bandolier, /obj/item/ammo_box/advanced/s12gauge/hunter)
- access_view = ACCESS_WEAPONS
-
-/datum/supply_pack/goody/rensoter_shotgun
- name = "Renoster Shotgun Single-Pack"
- desc = "A common modern shotgun used by Terran Government Police."
- contains = list(/obj/item/gun/ballistic/shotgun/riot/sol, /obj/item/storage/pouch/ammo, /obj/item/storage/belt/bandolier, /obj/item/ammo_box/advanced/s12gauge/rubber)
- cost = PAYCHECK_COMMAND * 22
- access_view = ACCESS_WEAPONS
-
/datum/supply_pack/goody/double_barrel
cost = PAYCHECK_COMMAND * 14 //This is outclassed by peacekeeper combat shotgun
diff --git a/modular_skyrat/modules/sec_haul/code/misc/vending.dm b/modular_skyrat/modules/sec_haul/code/misc/vending.dm
index 01fcf1c4f58..7b65c52e541 100644
--- a/modular_skyrat/modules/sec_haul/code/misc/vending.dm
+++ b/modular_skyrat/modules/sec_haul/code/misc/vending.dm
@@ -30,7 +30,6 @@
/obj/item/storage/belt/holster/energy = 4,
/obj/item/storage/box/holobadge = 1,
/obj/item/ammo_box/magazine/security = 12,
- /obj/item/ammo_box/c10mm/speedloader/rubber = 12,
/obj/item/ammo_box/advanced/s12gauge/frangible = 2,
)
diff --git a/modular_skyrat/modules/sec_haul/code/peacekeeper/armadyne_clothing.dm b/modular_skyrat/modules/sec_haul/code/peacekeeper/armadyne_clothing.dm
index 65991390b48..87b3585da21 100644
--- a/modular_skyrat/modules/sec_haul/code/peacekeeper/armadyne_clothing.dm
+++ b/modular_skyrat/modules/sec_haul/code/peacekeeper/armadyne_clothing.dm
@@ -263,3 +263,4 @@
roles = list(/datum/antagonist/ert/armadyne/high_alert)
leader_role = /datum/antagonist/ert/armadyne/leader/high_alert
rename_team = "Armadyne PMC (High Alert)"
+
diff --git a/modular_skyrat/modules/sec_haul/code/technode/all_nodes.dm b/modular_skyrat/modules/sec_haul/code/technode/all_nodes.dm
index 8e2059818ae..99f027555bf 100644
--- a/modular_skyrat/modules/sec_haul/code/technode/all_nodes.dm
+++ b/modular_skyrat/modules/sec_haul/code/technode/all_nodes.dm
@@ -1,75 +1,49 @@
// RESEARCH NODES
//Weaponry Research
+/datum/techweb_node/ballistic
+ id = "ballistic_tech"
+ display_name = "Ballistic Research"
+ description = "Ballistic ammunition for shotguns."
+ prereq_ids = list(TECHWEB_NODE_RIOT_SUPRESSION)
+ design_ids = list(
+ "shotgun_slug",
+ "buckshot_shell",
+ "s12g_slug",
+ "s12g_buckshot"
+ )
+ research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_2_POINTS)
+ announce_channels = list(RADIO_CHANNEL_SECURITY)
/datum/techweb_node/magazineresearch
id = "storedmunition_tech"
display_name = "Ballisitic Research"
- description = "In the wake of the NRI Border Conflict, there was a drive to advances our armament, learn how sol does it."
+ description = "The daring do not stop at reaching the mountaintop, they go where no man has gone before" // and with that nice quote we have exotic ammo 2
prereq_ids = list("exotic_ammo")
design_ids = list(
- "sol40_riflstandardemag",
- "solgrenade_extmag",
- "s12g_slug",
- "s12c_antitide",
- "s12g_buckshot"
- )
- research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_2_POINTS)
-
-/datum/techweb_node/magazineresearch_romfed
- id = "storedmunition_tech_two"
- display_name = "Advanced Ballistic Research"
- description = "Catching up to the modern world in technological advancement, our enemies are everywhere and they are durable."
- prereq_ids = list("explosives","storedmunition_tech")
- design_ids = list(
- "sol_rifle_carbine_gun",
- "s12g_flechette",
"s12g_db"
)
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_2_POINTS)
/datum/techweb_node/basic_arms/New()
- design_ids += "c10mm_r"
- design_ids += "c10mm_rihdf"
design_ids += "s12c_fslug"
+ design_ids += "s12g_huntingslug"
design_ids += "ammoworkbench_disk_lethal"
design_ids += "ammo_workbench"
- design_ids += "s12g_huntingslug"
design_ids += "m9mm_sec"
-/datum/techweb_node/magazineresearch_heavy
- id = "storedmunition_tech_three"
- display_name = "Romulus Technology"
- description = "The same technology used in the Sol 2351 Campaign.It is highly classified and resource intensive."
- prereq_ids = list("syndicate_basic","storedmunition_tech_two")
- design_ids = list(
- "m9mm_mag_ext_hp",
- "m9mm_mag_ext",
- "m9mm_mag_ext_b",
- )
- research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_3_POINTS)
-
/datum/techweb_node/sec_equip/New()
- design_ids += "c457_casing"
- design_ids += "m9mm_mag_rubber"
- design_ids += "c10mm_rl"
. = ..()
/datum/techweb_node/riot_supression/New()
- design_ids += "s12g_br"
- design_ids += "m9mm_mag_ihdf"
- design_ids += "m9mm_mag"
- design_ids += "c10mm_rincin"
. = ..()
/datum/techweb_node/exotic_ammo/New()
- design_ids += "sol_bolt_to_rifle"
- design_ids += "c10mm_rhp"
- design_ids += "c10mm_rap"
design_ids += "m9mm_sec_rocket"
+ design_ids += "s12g_flechette"
+ design_ids += "solgrenade_extmag"
. = ..()
/datum/techweb_node/syndicate_basic/New()
- design_ids += "s12g_ion"
. = ..()
/datum/techweb_node/electric_weapons/New()
diff --git a/modular_skyrat/modules/sec_haul/code/technode/conversion_kit.dm b/modular_skyrat/modules/sec_haul/code/technode/conversion_kit.dm
deleted file mode 100644
index 43141d308b7..00000000000
--- a/modular_skyrat/modules/sec_haul/code/technode/conversion_kit.dm
+++ /dev/null
@@ -1,11 +0,0 @@
-/obj/item/weaponcrafting/gunkit/sol_rifle_carbine_kit
- name = "Romulus Carbine Conversion Kit"
- desc = "A Romulus-produced conversion kit. This kit includes a lighter frame, and maginally shorter stock and barrel to reduce the overall length and bulk of the Carwo-Cawil rifle. Because of the lighter bolt carrier components, the firearm has a higher cyclic rate, and fires faster. Accepts any standard Sol rifle magazine."
-
-/obj/item/weaponcrafting/gunkit/sol_smg_rapidfire_kit
- name = "Romulus Sindano 'Shaytan' Conversion Kit"
- desc = "A Romulus-produced conversion kit. This kit comes with a modified sear to enable seamless full-automatic fire - at the cost of fire-select function. This kit includes an alloy and polymer body, a proprietary integrated flashlight, an alternate handguard and modified barrel for the addition of universal suppressors. Accepts any standard Sol pistol magazine."
-
-/obj/item/weaponcrafting/gunkit/sol_bolt_to_rifle
- name = "Romulus Battle Rifle Conversion Kit"
- desc = "A Romulus-produced conversion kit. This kit comes with a modified sear to enable seamless full-automatic fire - at the cost of overall accuracy. This kit includes a new set of trim, but otherwise uses a lot of the hardware from the RomTech rifle. Accepts any standard Sol rifle magazine."
diff --git a/modular_skyrat/modules/shotgunrebalance/code/ammobox.dm b/modular_skyrat/modules/shotgunrebalance/code/ammobox.dm
index 032472f404e..8f245c05884 100644
--- a/modular_skyrat/modules/shotgunrebalance/code/ammobox.dm
+++ b/modular_skyrat/modules/shotgunrebalance/code/ammobox.dm
@@ -33,18 +33,6 @@
icon_state = "bean"
ammo_type = /obj/item/ammo_casing/shotgun/beanbag
-/obj/item/ammo_box/advanced/s12gauge/magnum
- name = "Magnum buckshot ammo box"
- desc = "A box of 7 magnum buckshot shells. The size of the pellet is larger in diameter than the typical shot, but there are less of them inside each shell."
- icon_state = "magnum"
- ammo_type = /obj/item/ammo_casing/shotgun/magnum
-
-/obj/item/ammo_box/advanced/s12gauge/express
- name = "Express pelletshot ammo box"
- desc = "A box of 7 express pelletshot shells. The size of the pellet is smaller in diameter than the typical shot, but there are more of them inside each shell."
- icon_state = "express"
- ammo_type = /obj/item/ammo_casing/shotgun/express
-
/obj/item/ammo_box/advanced/s12gauge/hunter
name = "Hunter slug ammo box"
desc = "A box of 7 hunter slug shells. These shotgun slugs excel at damaging the local fauna."
@@ -63,18 +51,6 @@
icon_state = "dragonsbreath"
ammo_type = /obj/item/ammo_casing/shotgun/dragonsbreath
-/obj/item/ammo_box/advanced/s12gauge/beehive
- name = "Hornet's nest ammo box"
- desc = "A box of 7 hornet's nest shells. These are less-lethal shells that will bounce off walls and direct themselves toward nearby targets."
- icon_state = "beehive"
- ammo_type = /obj/item/ammo_casing/shotgun/beehive
-
-/obj/item/ammo_box/advanced/s12gauge/antitide
- name = "Stardust ammo box"
- desc = "A box of 7 advanced anti riot shells. These are less-lethal and will embed in targets, causing pain on movement."
- icon_state = "antitide"
- ammo_type = /obj/item/ammo_casing/shotgun/antitide
-
/obj/item/ammo_box/advanced/s12gauge/incendiary
name = "Incendiary Slug ammo box"
desc = "A box of 7 incendiary slug shells. These will ignite targets and leave a trail of fire behind them."
@@ -98,7 +74,7 @@
name = "Breaching Slug ammo box"
desc = "A box of 7 Breaching slug. It's able to punches through- quite literally anything with ease."
icon_state = "fslug"
- ammo_type = /obj/item/ammo_casing/shotgun/breacher
+ ammo_type = /obj/item/ammo_casing/shotgun/frangible
//This is intended for ERT! Have fun with it
/obj/item/ammo_box/advanced/s12gauge/pulse
@@ -106,9 +82,3 @@
desc = "A box of 7 Pulse slug. It's able to punches through structures and anything behind it."
icon_state = "pulse"
ammo_type = /obj/item/ammo_casing/shotgun/pulseslug
-
-/obj/item/ammo_box/advanced/s12gauge/scatterion
- name = "Scatter Ion ammo box"
- desc = "A box of 7 Scatter ion. I hope you have no cybernetic organs."
- icon_state = "pulse"
- ammo_type = /obj/item/ammo_casing/shotgun/ion
diff --git a/modular_skyrat/modules/shotgunrebalance/code/shotgun.dm b/modular_skyrat/modules/shotgunrebalance/code/shotgun.dm
index f3b01702802..ece550ffb95 100644
--- a/modular_skyrat/modules/shotgunrebalance/code/shotgun.dm
+++ b/modular_skyrat/modules/shotgunrebalance/code/shotgun.dm
@@ -70,97 +70,6 @@
HORNET'S NEST: Fire an overwhelming amount of projectiles in a single shot."
can_be_printed = FALSE
-/obj/item/ammo_casing/shotgun/buckshot
- name = "buckshot shell"
- desc = "A 12 gauge buckshot shell."
- icon_state = "gshell"
- projectile_type = /obj/projectile/bullet/pellet/shotgun_buckshot
- pellets = 8 // 8 * 6 for 48 damage if every pellet hits, we want to keep lethal shells ~50 damage
- variance = 25
-
-/obj/projectile/bullet/pellet/shotgun_buckshot
- name = "buckshot pellet"
- damage = 6
- weak_against_armour = TRUE
-
-/obj/item/ammo_casing/shotgun/rubbershot
- name = "rubber shot"
- desc = "A shotgun casing filled with densely-packed rubber balls, used to incapacitate crowds from a distance."
- icon_state = "rshell"
- projectile_type = /obj/projectile/bullet/pellet/shotgun_rubbershot
- pellets = 6 // 6 * 10 for 60 stamina damage, + some small amount of brute, we want to keep less lethal shells ~60
- variance = 20
- harmful = FALSE
-
-/obj/projectile/bullet/pellet/shotgun_rubbershot
- weak_against_armour = TRUE
- stamina = 10
-
-/obj/item/ammo_casing/shotgun/magnum
- name = "magnum blockshot shell"
- desc = "A 12 gauge shell that fires fewer, larger pellets than buckshot. A favorite of TerraGov anti-piracy enforcers, \
- especially against the likes of vox."
- icon_state = "magshell"
- projectile_type = /obj/projectile/bullet/pellet/shotgun_buckshot/magnum
- pellets = 4 // Half as many pellets for twice the damage each pellet, same overall damage as buckshot
- variance = 20
- advanced_print_req = TRUE
-
-/obj/projectile/bullet/pellet/shotgun_buckshot/magnum
- name = "magnum blockshot pellet"
- damage = 15
- wound_bonus = 10
- weak_against_armour = FALSE
-
-/obj/projectile/bullet/pellet/shotgun_buckshot/magnum/Initialize(mapload)
- . = ..()
- transform = transform.Scale(1.25, 1.25)
-
-/obj/item/ammo_casing/shotgun/express
- name = "express pelletshot shell"
- desc = "A 12 gauge shell that fires more and smaller projectiles than buckshot. Considered taboo to speak about \
- openly near teshari, for reasons you would be personally blessed to not know at least some of."
- icon_state = "expshell"
- projectile_type = /obj/projectile/bullet/pellet/shotgun_buckshot/express
- pellets = 12 // 1.3x The pellets for 0.6x the damage, same overall damage as buckshot
- variance = 30 // Slightly wider spread than buckshot
-
-/obj/projectile/bullet/pellet/shotgun_buckshot/express
- name = "express buckshot pellet"
- damage = 5.5
- wound_bonus = 10
- weak_against_armour = FALSE
-
-/obj/projectile/bullet/pellet/shotgun_buckshot/express/Initialize(mapload)
- . = ..()
- transform = transform.Scale(0.75, 0.75)
-
-/obj/item/ammo_casing/shotgun/flechette
- name = "flechette shell"
- desc = "A 12 gauge flechette shell that specializes in ripping armored targets apart. These are exceptionally strong against armored targets."
- icon_state = "fshell"
- projectile_type = /obj/projectile/bullet/pellet/shotgun_buckshot/flechette
- pellets = 5
- variance = 15
- custom_materials = AMMO_MATS_SHOTGUN_FLECH
- advanced_print_req = TRUE
-
-/obj/projectile/bullet/pellet/shotgun_buckshot/flechette
- name = "flechette"
- icon = 'modular_skyrat/modules/shotgunrebalance/icons/projectiles.dmi'
- icon_state = "flechette"
- damage = 7
- armour_penetration = 40
- wound_bonus = 0
- exposed_wound_bonus = 0
- sharpness = SHARP_EDGED //Did you knew flechettes fly sideways into people
- damage_falloff_tile = -0.7 // Five tiles will halve the effectiveness dramatically
- wound_falloff_tile = -3
-
-/obj/projectile/bullet/pellet/shotgun_buckshot/flechette/Initialize(mapload)
- . = ..()
- SpinAnimation()
-
/obj/item/ammo_casing/shotgun/beehive
name = "hornet shell"
desc = "A less-lethal 12 gauge shell that fires four pellets capable of bouncing off nearly any surface \
@@ -333,3 +242,8 @@
/obj/item/ammo_casing/shotgun/beanbag
harmful = FALSE
+
+/obj/item/gun/ballistic/shotgun/Initialize(mapload)
+ AddElement(/datum/element/gun_launches_little_guys, throwing_force = 1, throwing_range = 1, knockdown_time = 0, gentle = TRUE)
+
+ return ..()
diff --git a/modular_skyrat/modules/synths/code/species/synthetic.dm b/modular_skyrat/modules/synths/code/species/synthetic.dm
index d63333e6139..5e83ab98642 100644
--- a/modular_skyrat/modules/synths/code/species/synthetic.dm
+++ b/modular_skyrat/modules/synths/code/species/synthetic.dm
@@ -52,6 +52,7 @@
/// Set to TRUE if the species was emagged before
var/emag_effect = FALSE
+ language_prefs_whitelist = list(/datum/language/monkey)
/datum/species/synthetic/allows_food_preferences()
return FALSE
diff --git a/modular_skyrat/modules/tarkon/code/misc-fluff/turret.dm b/modular_skyrat/modules/tarkon/code/misc-fluff/turret.dm
index a8592f9c985..6fbbb0c237b 100644
--- a/modular_skyrat/modules/tarkon/code/misc-fluff/turret.dm
+++ b/modular_skyrat/modules/tarkon/code/misc-fluff/turret.dm
@@ -16,8 +16,8 @@
turret_type = /obj/machinery/porta_turret/syndicate/toolbox/mag_fed/cerberus //To make it more available for subtyping. LET. THEM. COOK.
mag_slots = 3 //how many magazines can be held.
mag_types_allowed = list( //This is a whitelist for what is allowed. Nothing else may enter.
- /obj/item/ammo_box/magazine/c35sol_pistol,
- /obj/item/ammo_box/magazine/c40sol_rifle,
+ /obj/item/ammo_box/magazine/m9mm,
+ /obj/item/ammo_box/magazine/m45, // Near-matching DPS replacement
/obj/item/ammo_box/magazine/c585trappiste_pistol,
/obj/item/ammo_box/magazine/miecz,
/obj/item/ammo_box/magazine/lanca,
@@ -26,7 +26,7 @@
/obj/item/storage/toolbox/emergency/turret/mag_fed/hoplite
name = "\improper Tarkon Industries Hoplite Kit"
desc = "A \"Tarkon Industries\" \"Hoplite\" Turret Deployment Kit, it deploys a turret feeding from provided magazines. \
- This model comes with 2 adjustable magazine slots, supporting most commonly available pistol-cal magazines."
+ This model comes with 2 adjustable magazine slots, supporting 4.6x30mm magazines as well as Cesarzowa and Trappiste."
icon = 'modular_skyrat/modules/tarkon/icons/obj/turret.dmi'
icon_state = "hoplite_toolbox"
righthand_file = 'modular_skyrat/modules/tarkon/icons/mob/inhands/righthand.dmi'
@@ -40,19 +40,19 @@
easy_deploy = TRUE
easy_deploy_timer = 1.5 SECONDS
mag_types_allowed = list(
- /obj/item/ammo_box/magazine/c35sol_pistol,
+ /obj/item/ammo_box/magazine/wt550m9, //Matching DPS replacement
/obj/item/ammo_box/magazine/c585trappiste_pistol,
/obj/item/ammo_box/magazine/miecz,
)
/obj/item/storage/toolbox/emergency/turret/mag_fed/cerberus/pre_filled/PopulateContents()
- new /obj/item/ammo_box/magazine/c585trappiste_pistol(src)
- new /obj/item/ammo_box/magazine/c585trappiste_pistol(src)
- new /obj/item/ammo_box/magazine/c585trappiste_pistol(src)
+ new /obj/item/ammo_box/magazine/m45(src)
+ new /obj/item/ammo_box/magazine/m45(src)
+ new /obj/item/ammo_box/magazine/m45(src)
/obj/item/storage/toolbox/emergency/turret/mag_fed/hoplite/pre_filled/PopulateContents()
- new /obj/item/ammo_box/magazine/c35sol_pistol(src)
- new /obj/item/ammo_box/magazine/c35sol_pistol(src)
+ new /obj/item/ammo_box/magazine/m45(src)
+ new /obj/item/ammo_box/magazine/m45(src)
////// Turrets //////
/obj/machinery/porta_turret/syndicate/toolbox/mag_fed/cerberus
diff --git a/modular_skyrat/modules/telecomms_specialist/telecomms_specialist.dm b/modular_skyrat/modules/telecomms_specialist/telecomms_specialist.dm
index af62f59740e..e410c1b1b89 100644
--- a/modular_skyrat/modules/telecomms_specialist/telecomms_specialist.dm
+++ b/modular_skyrat/modules/telecomms_specialist/telecomms_specialist.dm
@@ -41,7 +41,7 @@
/obj/item/banhammer = 8,
/obj/item/computer_disk/maintenance = 1,
)
- rpg_title = "Diviner"
+ rpg_title = "Code Whisperer"
job_flags = STATION_JOB_FLAGS
/obj/effect/landmark/start/telecomms_specialist
diff --git a/modular_skyrat/modules/teshari/code/_teshari.dm b/modular_skyrat/modules/teshari/code/_teshari.dm
index f41ca535eed..c5dec4be21a 100644
--- a/modular_skyrat/modules/teshari/code/_teshari.dm
+++ b/modular_skyrat/modules/teshari/code/_teshari.dm
@@ -1,4 +1,4 @@
-#define TESHARI_TEMP_OFFSET -30 // K, added to comfort/damage limit etc
+#define TESHARI_TEMP_OFFSET -10 // K, added to comfort/damage limit etc
#define TESHARI_HEATMOD 1.3
#define TESHARI_COLDMOD 0.67 // Except cold.
@@ -59,7 +59,7 @@
)
/obj/item/organ/tongue/teshari
- liked_foodtypes = MEAT | GORE | RAW
+ liked_foodtypes = SEAFOOD | VEGETABLES | NUTS
disliked_foodtypes = GROSS | GRAIN
/datum/species/teshari/prepare_human_for_preview(mob/living/carbon/human/tesh)
@@ -95,29 +95,27 @@
/datum/species/teshari/get_species_description()
return list(
"A species of birdperson hailing from the tropical planet Sirisai, their introduction \
- came in the form of the complete and utter destruction of their oppressors on Penelope 3.",
+ came in the form of the complete and utter destruction of their oppressors, now lost to the wind.",
"They are extremely agile, owing to their low mass, but their hollow bones make them more vulnerable to being hurt."
)
/datum/species/teshari/get_species_lore()
return list(
- "Teshari are a bird-like species that hail from a tropical world, Sirisai (or Penelope 3a by NRI naming standards) \
- They generally are between 3'5 and 4'0 tall, bearing raptor-like bodies with large plumes of feathers, and vestigial wings. \
- They often have beaks, but some have developed muzzles as Teshari have spread across the galactic sea. \
- Teshari are very colorful, and their plumage generally relates to where they were born, as well as genetics. They have very large ears for hearing. \
+ "Teshari are a bird-like species that hail from a tropical world, Sirisai. They generally are between 3'5 and 4'0 tall, \
+ light avian bodies with large plumes of feathers, and vestigial wings. They tend to have muzzles, \
+ but some have slowly evolved beak-like snouts as Sirisai has left its ice age. Teshari are very colorful, and they have large ears for hearing. \
Teshari tend to live to 60-70 before dying of natural causes, though medical care can extend this significantly. \
- Teshari are omnivores with a preference for fish, and a blatant dislike for grain. They prefer nuts and vegetation.",
- "Teshari have a genetic need for socialization, and will get sick if not social at all for an extended period. \
- which has caused them to form tight-knit groups known as flocks. Teshari generally lack parental figures, and are often \
- raised communally. When they reach adulthood, they feel an ingrained need to move away from their nesting flock and find or develop a new one. \
+ Teshari are omnivores that love fish, and dislike grain. They prefer nuts and vegetation.",
+ "Teshari have a genetic need for socialization and will feel physically ill if not social at all for an extended period, \
+ which has caused them to form social groups called flocks. Teshari generally lack parental figures, and are often \
+ raised communally. When they reach adulthood, they feel a strong drive to move away from their nesting flock and find or develop a new one. \
Teshari tend to be cloistered and quiet when entering a new social space, but are very vocal and impassioned when they fit in, often enjoying making and parroting noises.",
- "Sirisai (or Penelope 3a) is a tropical world with temperatures ranging from 20 to 30 celsius on average. \
- It has three notable mountain ranges, the only places on the planet where snow can be seen year-round. Temperatures can go as low as -15 Celsius. \
- The planet itself is generally very biologically diverse, mostly undisturbed ecologically by the Teshari or their predecessors.",
- "Teshari had a generally uneventful early history, until they were discovered by a species that resided \
- on the planet Penelope 3. After years of oppression and being sold as a labor force, \
- the Teshari made their demand: Comply, or explode. This species seemed to not have taken the threat seriously, \
- and were made extinct by the destruction of their entire planet. Fossils have been uncovered on Penelope 3a, and while they have yet to be named, \
+ "Sirisai is a tropical world with temperatures ranging from 20 to 30 celsius on average. \
+ It has three notable mountain ranges, the only places on the planet where snow can still be seen year-round. Temperatures can go as low as -15 Celsius. \
+ The planet itself is generally very biologically diverse, ecologically pure compared to many inhabited planets.",
+ "Modern Teshari history began when they were discovered and uplifted by a species that resided on the planet Sirisai once orbited. \
+ After years of oppression and being sold as a labor force, the Teshari made their demand: Comply, or explode. This species seemed to not have taken the threat seriously, \
+ and were made extinct by the destruction of their entire planet. Fossils have been uncovered on Sirisai, and while they have yet to be named, \
A meeting of Teshari flocks have democratically named the species after the Teshari word for \"bastard\". \
Needless to say, this very quickly led to the normalization of relations and formal recognition by the then NRI.",
)
diff --git a/modular_skyrat/modules/title_screen/code/title_screen_subsystem.dm b/modular_skyrat/modules/title_screen/code/title_screen_subsystem.dm
index 2074ac88274..edb483e272f 100644
--- a/modular_skyrat/modules/title_screen/code/title_screen_subsystem.dm
+++ b/modular_skyrat/modules/title_screen/code/title_screen_subsystem.dm
@@ -38,17 +38,25 @@ SUBSYSTEM_DEF(title)
var/list/provisional_title_screens = flist("[global.config.directory]/title_screens/images/")
var/list/local_title_screens = list()
+ var/list/current_map_file = splittext(SSmapping.current_map.map_file, ".")
for(var/screen in provisional_title_screens)
var/list/formatted_list = splittext(screen, "+")
- if((LAZYLEN(formatted_list) == 1 && (formatted_list[1] != "exclude" && formatted_list[1] != "blank.png" && formatted_list[1] != "startup_splash")))
+ if((LOWER_TEXT(formatted_list[1]) == LOWER_TEXT(current_map_file[1])))
local_title_screens += screen
+ continue
if(LAZYLEN(formatted_list) > 1 && LOWER_TEXT(formatted_list[1]) == "startup_splash")
var/file_path = "[global.config.directory]/title_screens/images/[screen]"
ASSERT(fexists(file_path))
startup_splash = new(fcopy_rsc(file_path))
+ if(local_title_screens.len == 0)
+ for(var/screen in provisional_title_screens)
+ var/list/formatted_list = splittext(screen, "+")
+ if((LAZYLEN(formatted_list) == 1 && (formatted_list[1] != "exclude" && formatted_list[1] != "blank.png" && formatted_list[1] != "startup_splash")))
+ local_title_screens += screen
+
// Progress stuff
check_progress_reference_time()
load_progress_json()
diff --git a/modular_zubbers/code/_globalvars/lists/maintenance_loot_uncommon.dm b/modular_zubbers/code/_globalvars/lists/maintenance_loot_uncommon.dm
index 005b4880a0e..5de257abd9c 100644
--- a/modular_zubbers/code/_globalvars/lists/maintenance_loot_uncommon.dm
+++ b/modular_zubbers/code/_globalvars/lists/maintenance_loot_uncommon.dm
@@ -6,7 +6,6 @@ GLOBAL_LIST_INIT(uncommon_loot, list(//uncommon: useful items
/obj/item/ammo_casing/shotgun/buckshot = 50,
/obj/item/ammo_casing/shotgun/dart = 1,
/obj/item/ammo_casing/shotgun/dragonsbreath = 1,
- /obj/item/ammo_casing/shotgun/express = 1,
/obj/item/ammo_casing/shotgun/flechette = 1,
/obj/item/ammo_casing/shotgun/frag12 = 1,
/obj/item/ammo_casing/shotgun/hunter = 1,
@@ -14,7 +13,6 @@ GLOBAL_LIST_INIT(uncommon_loot, list(//uncommon: useful items
/obj/item/ammo_casing/shotgun/incapacitate = 1,
/obj/item/ammo_casing/shotgun/incendiary = 1,
/obj/item/ammo_casing/shotgun/ion = 1,
- /obj/item/ammo_casing/shotgun/magnum = 1,
/obj/item/ammo_casing/shotgun/pulverizer = 1,
/obj/item/ammo_casing/shotgun/rubbershot = 100,
/obj/item/ammo_casing/shotgun/stunslug = 25,
diff --git a/modular_zubbers/code/controllers/subsystem/ticker.dm b/modular_zubbers/code/controllers/subsystem/ticker.dm
new file mode 100644
index 00000000000..1b2e7463b89
--- /dev/null
+++ b/modular_zubbers/code/controllers/subsystem/ticker.dm
@@ -0,0 +1,45 @@
+/datum/controller/subsystem/ticker
+ var/list/job_estimation_list = list()
+
+/datum/controller/subsystem/ticker/proc/get_job_estimation(list/players)
+ var/list/player_ready_data = list()
+ sortTim(players, GLOBAL_PROC_REF(cmp_text_asc))
+
+ for(var/ckey in players)
+ var/mob/dead/new_player/player = players[ckey]
+ var/datum/preferences/prefs = player.client?.prefs
+ var/display = null
+ var/datum/job/J = prefs?.get_highest_priority_job()
+ var/title = J?.title
+ //If a player does not have preferences (for some reason) or they don't want to be shown on the panel, continue
+ if(!J || !(prefs.read_preference(/datum/preference/toggle/ready_job)))
+ continue
+ //If the readied player has selected a miscellaneous job (Assistant, or Prisoner), they shouldn't be displayed
+ if(title == JOB_ASSISTANT || title == JOB_PRISONER)
+ continue
+
+ //If the job the player is selecting has a special name, that name should be displayed in the menu, otherwise it should use the normal name
+ switch(title)
+ if(JOB_AI)
+ display = prefs.read_preference(/datum/preference/name/ai)
+ if(JOB_CLOWN)
+ display = prefs.read_preference(/datum/preference/name/clown)
+ if(JOB_CYBORG)
+ display = prefs.read_preference(/datum/preference/name/cyborg)
+ if(JOB_MIME)
+ display = prefs.read_preference(/datum/preference/name/mime)
+ else
+ display = prefs.read_preference(/datum/preference/name/real_name)
+ //If our player is a member of Command or a Silicon, we want to sort them to the top of the list. Otherwise, just add them to the end of the list.
+ if(J.departments_bitflags & (DEPARTMENT_BITFLAG_COMMAND | DEPARTMENT_BITFLAG_SILICON))
+ player_ready_data.Insert(1, "* [display] as [title]")
+ else
+ player_ready_data += "* [display] as [title]"
+
+ //The title line for the job estimation panel, obviously needs to be at the top
+ if(length(player_ready_data))
+ player_ready_data.Insert(1, "------------------")
+ player_ready_data.Insert(1, "Job Estimation:")
+ player_ready_data.Insert(1, "")
+ return player_ready_data
+//BUBBER EDIT END
diff --git a/modular_zubbers/code/datums/components/fantasy/weight_overrides.dm b/modular_zubbers/code/datums/components/fantasy/weight_overrides.dm
new file mode 100644
index 00000000000..dbd9bb36430
--- /dev/null
+++ b/modular_zubbers/code/datums/components/fantasy/weight_overrides.dm
@@ -0,0 +1,12 @@
+// Disables some RPG loot affixes
+/datum/fantasy_affix/soul_stealer
+ weight = 0
+
+/datum/fantasy_affix/summoning
+ weight = 0
+
+/datum/fantasy_affix/curse_of_hunger
+ weight = 0
+
+/datum/fantasy_affix/curse_of_polymorph
+ weight = 0
diff --git a/modular_zubbers/code/datums/components/tameable.dm b/modular_zubbers/code/datums/components/tameable.dm
new file mode 100644
index 00000000000..b55fd787139
--- /dev/null
+++ b/modular_zubbers/code/datums/components/tameable.dm
@@ -0,0 +1,4 @@
+
+/datum/component/tameable/try_tame(atom/source, obj/item/food, mob/living/attacker)
+ . = ..()
+ SEND_SIGNAL(source, COMSIG_MOB_TRY_TAME, food, attacker)
diff --git a/modular_zubbers/code/datums/quirks/neutral_quirks/oversized_quirk.dm b/modular_zubbers/code/datums/quirks/neutral_quirks/oversized_quirk.dm
index 0c69761e905..d6f8c7a9768 100644
--- a/modular_zubbers/code/datums/quirks/neutral_quirks/oversized_quirk.dm
+++ b/modular_zubbers/code/datums/quirks/neutral_quirks/oversized_quirk.dm
@@ -20,6 +20,8 @@
human_holder.maptext_height = 32 * human_holder.dna.features["body_size"] //Adjust runechat height
human_holder.dna.update_body_size()
human_holder.mob_size = MOB_SIZE_LARGE
+ human_holder.maxHealth = HUMAN_MAXHEALTH * OVERSIZED_HEALTH_BUFF
+ human_holder.health += ((HUMAN_MAXHEALTH * OVERSIZED_HEALTH_BUFF) - HUMAN_MAXHEALTH)
RegisterSignal(human_holder, COMSIG_CARBON_POST_ATTACH_LIMB, PROC_REF(on_gain_limb)) // make sure we handle this when new ones are applied
@@ -50,6 +52,8 @@
human_holder.maptext_height = 32 * human_holder.dna.features["body_size"]
human_holder.dna.update_body_size()
human_holder.mob_size = MOB_SIZE_HUMAN
+ human_holder.maxHealth = HUMAN_MAXHEALTH
+ human_holder.health -= ((HUMAN_MAXHEALTH * OVERSIZED_HEALTH_BUFF) - HUMAN_MAXHEALTH)
var/obj/item/bodypart/arm/left/left_arm = human_holder.get_bodypart(BODY_ZONE_L_ARM)
if(left_arm)
diff --git a/modular_zubbers/code/datums/storage/subtypes/belts.dm b/modular_zubbers/code/datums/storage/subtypes/belts.dm
index 76e15337ea3..cabd1875ae6 100644
--- a/modular_zubbers/code/datums/storage/subtypes/belts.dm
+++ b/modular_zubbers/code/datums/storage/subtypes/belts.dm
@@ -9,15 +9,7 @@
/obj/item/handheld_soulcatcher,
)
)
-
-/datum/storage/belt/security/New()
- . = ..()
- add_holdable(list(
- /obj/item/gun,
- /obj/item/stock_parts/power_store/cell/microfusion,
- )
- )
-
+
/datum/storage/belt/janitor/New()
. = ..()
var/static/list/exception_cache = typecacheof(list(
diff --git a/modular_zubbers/code/game/objects/effects/spawners/random/armory.dm b/modular_zubbers/code/game/objects/effects/spawners/random/armory.dm
index ebdb22a1d86..0ae654d520f 100644
--- a/modular_zubbers/code/game/objects/effects/spawners/random/armory.dm
+++ b/modular_zubbers/code/game/objects/effects/spawners/random/armory.dm
@@ -29,7 +29,6 @@
/obj/item/storage/box/rubbershot,
/obj/item/storage/box/beanbag,
/obj/item/storage/box/beanbag,
- /obj/item/storage/box/breacherslug
)
spawn_all_loot = TRUE
@@ -41,20 +40,24 @@
/obj/effect/spawner/random/armory/laser_gun
loot = list(
- /obj/item/gun/ballistic/automatic/wt550/security/flathead
+ /obj/item/gun/energy/laser
+ )
+ spawn_loot_count = 3
+
+/obj/effect/spawner/random/armory/smg
+ loot = list(
+ /obj/item/gun/ballistic/automatic/wt550/security
)
spawn_loot_count = 2
+
/obj/effect/spawner/random/armory/e_gun
loot = list(
- /obj/item/gun/microfusion/mcr01,
- /obj/item/gun/microfusion/mcr01,
/obj/item/gun/energy/e_gun,
/obj/item/gun/energy/e_gun,
- /obj/item/gun/energy/laser,
+ /obj/item/gun/energy/e_gun,
)
spawn_all_loot = TRUE
-
/obj/effect/spawner/random/armory/shotgun
loot = list(
/obj/item/gun/ballistic/shotgun/riot
diff --git a/modular_zubbers/code/game/objects/items/plushes.dm b/modular_zubbers/code/game/objects/items/plushes.dm
index c6c41feb7a8..1e985436b03 100644
--- a/modular_zubbers/code/game/objects/items/plushes.dm
+++ b/modular_zubbers/code/game/objects/items/plushes.dm
@@ -376,3 +376,13 @@
. = ..()
if(going_hard)
. += "goat_dart"
+
+/obj/item/toy/plush/sunny_plush
+ name = "weighty moostoat plushie"
+ desc = "A soft, weighted plushie of a moostoat. Very comfortable to hug and have lying on you. It smells of fresh milk."
+ icon = 'modular_zubbers/icons/obj/toys/plushes.dmi'
+ icon_state = "sunny_plush"
+ squeak_override = list(
+ 'modular_skyrat/modules/emotes/sound/voice/moo.ogg' = 1,
+ 'sound/mobs/non-humanoids/stoat/stoat_sounds.ogg' = 1,
+ )
diff --git a/modular_zubbers/code/modules/antagonists/bloodsucker/powers/feed.dm b/modular_zubbers/code/modules/antagonists/bloodsucker/powers/feed.dm
index bbae8eceea0..a10c2bf81a7 100644
--- a/modular_zubbers/code/modules/antagonists/bloodsucker/powers/feed.dm
+++ b/modular_zubbers/code/modules/antagonists/bloodsucker/powers/feed.dm
@@ -35,7 +35,7 @@
///assoc list of weakrefs to targets and how much blood we've taken from them.
var/list/targets_and_blood = list()
/// What level of protection you need to prevent feeding
- var/penetration = INJECT_CHECK_PENETRATE_THICK
+ var/penetration = NONE
///Did we start feeding with aggressive grab or not, or grabbed by someone else?
var/aggressive_feed = TRUE
@@ -331,7 +331,7 @@
return FALSE
if(!target_user.can_inject(owner, BODY_ZONE_HEAD, penetration))
if(give_warnings)
- owner.balloon_alert(owner, "suit too thick!")
+ owner.balloon_alert(owner, "headgear too thick!")
return FALSE
if((bloodsuckerdatum_power.my_clan && bloodsuckerdatum_power.my_clan.blood_drink_type == BLOODSUCKER_DRINK_SNOBBY) && !target_user.mind && !bloodsuckerdatum_power.frenzied)
if(give_warnings)
diff --git a/modular_zubbers/code/modules/cargo/packs/goodies.dm b/modular_zubbers/code/modules/cargo/packs/goodies.dm
index f8aa9aaec48..e9220227af6 100644
--- a/modular_zubbers/code/modules/cargo/packs/goodies.dm
+++ b/modular_zubbers/code/modules/cargo/packs/goodies.dm
@@ -1,21 +1,3 @@
-/datum/supply_pack/goody/sol_pistol_single
- name = "Sol 'Wespe' Pistol Single Pack"
- desc = "The standard issue service pistol of the Terran Government's various military branches. Comes with an attached light and a spare magazine."
- contains = list(/obj/item/gun/ballistic/automatic/pistol/sol = 1,
- /obj/item/ammo_box/magazine/c35sol_pistol/starts_empty = 1,
- )
- cost = PAYCHECK_COMMAND * 10 //Half the cost of a Detective Revolver
- access_view = ACCESS_WEAPONS
-
-/datum/supply_pack/goody/sol_revolver_single
- name = "Sol 'Eland' Revolver Single Pack"
- desc = "A stubby revolver chiefly found in the hands of Private Security forces due to its cheap price and decent stopping power. Comes with an ammo box."
- contains = list(/obj/item/gun/ballistic/revolver/sol = 1,
- /obj/item/ammo_box/c35sol = 1,
- )
- cost = PAYCHECK_COMMAND * 10 //Half the cost of a Detective Revolver
- access_view = ACCESS_WEAPONS
-
/datum/supply_pack/goody/disablersmg_single
name = "Disabler SMG Single-Pack"
desc = "Contains one disabler SMG, an automatic variant of the original workhorse."
@@ -37,30 +19,6 @@
access_view = ACCESS_WEAPONS
contains = list(/obj/item/gun/energy/e_gun/mini)
-/datum/supply_pack/goody/shotgun_revolver
- name = "Bóbr 12 GA Revolver Single-Pack"
- desc = "Contains 1 civilian-modified Bóbr revolver, chambered in 12 gauge. For when you really want the power of a shotgun in the palm of your hand. Comes with a box of beanbag shells."
- contains = list(/obj/item/gun/ballistic/revolver/shotgun_revolver/civvie = 1,
- /obj/item/ammo_box/advanced/s12gauge/bean = 1)
- access_view = ACCESS_WEAPONS
- cost = PAYCHECK_COMMAND * 20
-
-/datum/supply_pack/goody/plasma_projector
- name = "Słońce Plasma Projector Single-Pack"
- desc = "Contains one Słońce Plasma Projector. Spews an inaccurate stream of searing plasma out the magnetic barrel so long as it has power."
- contains = list(/obj/item/gun/ballistic/automatic/pistol/plasma_thrower = 1,
- /obj/item/ammo_box/magazine/recharge/plasma_battery = 1)
- access_view = ACCESS_WEAPONS
- cost = PAYCHECK_COMMAND * 6
-
-/datum/supply_pack/goody/sakhno_derringer_single
- name = "Sakhno 'Yinbi' Derringer Single Pack"
- desc = "A compact self-defense pistol, chambered in .310 strilka. Comes with a box of modern reproduction cartridges."
- contains = list(/obj/item/gun/ballistic/derringer = 1,
- /obj/item/ammo_box/c310_cargo_box = 1)
- access_view = ACCESS_WEAPONS
- cost = PAYCHECK_COMMAND * 4.5 //It's a close-range cannon, very poor ranged performance. Slightly pricer than imported Sol pistols
-
/datum/supply_pack/goody/mars_single
special = FALSE
diff --git a/modular_zubbers/code/modules/cargo/packs/security.dm b/modular_zubbers/code/modules/cargo/packs/security.dm
index 6ed9be927bd..0e93a5855f9 100644
--- a/modular_zubbers/code/modules/cargo/packs/security.dm
+++ b/modular_zubbers/code/modules/cargo/packs/security.dm
@@ -1,24 +1,10 @@
/datum/supply_pack/security/armory/wt551
name = "WT-551 Autorifle Crate"
- desc = "Contains a pair of WT-551 Autorifles pre-loaded with less-lethal rubber-tipped rounds. Additional ammo sold seperately. Backwards-compatible with WT-550 magazines. Nanotrasen reminds you that the other weapon is for a friend, and not for going guns akimbo."
+ desc = "Contains a pair of WT-551 Autorifles pre-loaded with lethal rounds. Additional ammo sold seperately. Backwards-compatible with WT-550 magazines. Nanotrasen reminds you that the other weapon is for a friend, and not for going guns akimbo."
cost = CARGO_CRATE_VALUE * 8
- contains = list(/obj/item/gun/ballistic/automatic/wt550/security/rubber = 2)
+ contains = list(/obj/item/gun/ballistic/automatic/wt550/security = 2)
crate_name = "wt-550 autorifle crate"
-/datum/supply_pack/security/armory/wt550_ammo_rubber
- name = "WT-550/WT-551 Autorifle Ammo Crate (Rubber-Tipped)"
- desc = "Contains 4 magazines with less-lethal rubber-tipped rounds for the WT-551."
- cost = CARGO_CRATE_VALUE * 4
- contains = list(/obj/item/ammo_box/magazine/wt550m9/rubber = 4)
- crate_name = "wt-550 magazine crate (rubber-tipped)"
-
-/datum/supply_pack/security/armory/wt550_ammo_flat
- name = "WT-550/WT-551 Autorifle Ammo Crate (Flat-Tipped)"
- desc = "Contains 3 magazines with lethal flat-tipped rounds for the WT-551."
- cost = CARGO_CRATE_VALUE * 5
- contains = list(/obj/item/ammo_box/magazine/wt550m9/flathead = 4)
- crate_name = "wt-550 magazine crate (flat-tipped)"
-
/datum/supply_pack/security/armory/wt550_ammo_regular
name = "WT-550/WT-551 Autorifle Ammo Crate (Regular)"
desc = "Contains 3 magazines with lethal regular rounds for the WT-551."
@@ -76,15 +62,6 @@
cost = CARGO_CRATE_VALUE * 10
access = ACCESS_SECURITY
-/datum/supply_pack/security/miecz
- name = "Miecz Submachine Gun Single-Pack"
- crate_name = "Miecz submachinegun crate"
- desc = "Contains a Miecz submachinegun and a spare magazine for it."
- contains = list(/obj/item/gun/ballistic/automatic/miecz = 1,
- /obj/item/ammo_box/magazine/miecz = 1)
- cost = CARGO_CRATE_VALUE * 10
- access = ACCESS_SECURITY
-
/datum/supply_pack/security/armory/swat
desc = "Contains two fullbody sets of tough, fireproof suits designed in a joint \
effort by IS-ERI and Nanotrasen. Each set contains a suit, helmet, mask, combat belt, a pepperball gun, \
@@ -112,4 +89,3 @@
cost = CARGO_CRATE_VALUE * 5.5
contains = list(/obj/item/gun/energy/e_gun/advtaser = 3)
access = ACCESS_SECURITY
-
diff --git a/modular_zubbers/code/modules/clothing/neck_wearing.dm b/modular_zubbers/code/modules/clothing/neck_wearing.dm
index 21e685c4e6e..9c807386465 100644
--- a/modular_zubbers/code/modules/clothing/neck_wearing.dm
+++ b/modular_zubbers/code/modules/clothing/neck_wearing.dm
@@ -53,7 +53,7 @@ Use CTRL + SHIFT + LEFT CLICK to turn them on and off.
slowdown = 0
set_armor(/datum/armor/none)
user.visible_message(span_notice("[user] adjusts [user.p_their()] [src] for non-functional use."), span_notice("You adjust your [src] for non-functional use."))
- else
+ else if(!isnull(functional_suit_values))
slot_flags = functional_suit_values[PREV_SLOT_FLAGS]
cold_protection = functional_suit_values[PREV_COLD_PROTECTION]
heat_protection = functional_suit_values[PREV_HEAT_PROTECTION]
diff --git a/modular_zubbers/code/modules/clothing/shoes/boots.dm b/modular_zubbers/code/modules/clothing/shoes/boots.dm
index 69a0d17c139..990278878ea 100644
--- a/modular_zubbers/code/modules/clothing/shoes/boots.dm
+++ b/modular_zubbers/code/modules/clothing/shoes/boots.dm
@@ -336,3 +336,19 @@
worn_icon = 'modular_zubbers/icons/mob/clothing/feet/feet.dmi'
worn_icon_digi = 'modular_zubbers/icons/mob/clothing/feet/feet_digi.dmi'
icon_state = "diesel_f"
+
+/obj/item/clothing/shoes/jackboots/toeless // Ported from SPLURT
+ name = "toe-less jackboots"
+ desc = "Modified pair of jackboots, particularly friendly to those species whose toes hold claws."
+ icon = 'modular_zubbers/icons/obj/clothing/shoes.dmi'
+ icon_state = "jackboots-toeless"
+ worn_icon = 'modular_zubbers/icons/mob/clothing/feet/feet.dmi'
+ worn_icon_digi = 'modular_zubbers/icons/mob/clothing/feet/feet_digi.dmi'
+
+/obj/item/clothing/shoes/workboots/toeless // Ported from SPLURT
+ name = "toe-less workboots"
+ desc = "A pair of toe-less work boots designed for use in industrial settings. Modified for species whose toes have claws."
+ icon = 'modular_zubbers/icons/obj/clothing/shoes.dmi'
+ icon_state = "workboots-toeless"
+ worn_icon = 'modular_zubbers/icons/mob/clothing/feet/feet.dmi'
+ worn_icon_digi = 'modular_zubbers/icons/mob/clothing/feet/feet_digi.dmi'
diff --git a/modular_zubbers/code/modules/customization/modules/reagents/drink_reagents.dm b/modular_zubbers/code/modules/customization/modules/reagents/drink_reagents.dm
new file mode 100644
index 00000000000..4e2a345ce28
--- /dev/null
+++ b/modular_zubbers/code/modules/customization/modules/reagents/drink_reagents.dm
@@ -0,0 +1,38 @@
+/datum/reagent/consumable/ethanol/threemileisland
+ process_flags = REAGENT_ORGANIC | REAGENT_PROTEAN
+
+/datum/reagent/consumable/ethanol/goldschlager
+ process_flags = REAGENT_ORGANIC | REAGENT_PROTEAN
+
+/datum/reagent/consumable/ethanol/patron
+ process_flags = REAGENT_ORGANIC | REAGENT_PROTEAN
+
+/datum/reagent/consumable/ethanol/toxins_special
+ process_flags = REAGENT_ORGANIC | REAGENT_PROTEAN
+
+/datum/reagent/consumable/ethanol/beepsky_smash
+ process_flags = REAGENT_ORGANIC | REAGENT_PROTEAN
+
+/datum/reagent/consumable/ethanol/manhattan_proj
+ process_flags = REAGENT_ORGANIC | REAGENT_PROTEAN
+
+/datum/reagent/consumable/ethanol/fetching_fizz
+ process_flags = REAGENT_ORGANIC | REAGENT_PROTEAN
+
+/datum/reagent/consumable/ethanol/atomicbomb
+ process_flags = REAGENT_ORGANIC | REAGENT_PROTEAN
+
+/datum/reagent/consumable/ethanol/blank_paper
+ process_flags = REAGENT_ORGANIC | REAGENT_PROTEAN
+
+/datum/reagent/consumable/ethanol/blazaam
+ process_flags = REAGENT_ORGANIC | REAGENT_PROTEAN
+
+/datum/reagent/consumable/ethanol/planet_cracker
+ process_flags = REAGENT_ORGANIC | REAGENT_PROTEAN
+
+/datum/reagent/consumable/ethanol/the_juice
+ process_flags = REAGENT_ORGANIC | REAGENT_PROTEAN
+
+/datum/reagent/consumable/nuka_cola
+ process_flags = REAGENT_ORGANIC | REAGENT_PROTEAN
diff --git a/modular_zubbers/code/modules/customization/species/proteans/_proteans_species.dm b/modular_zubbers/code/modules/customization/species/proteans/_proteans_species.dm
index 6ffd9091097..5ed9dab6cc0 100644
--- a/modular_zubbers/code/modules/customization/species/proteans/_proteans_species.dm
+++ b/modular_zubbers/code/modules/customization/species/proteans/_proteans_species.dm
@@ -79,6 +79,7 @@
/// Reference to the species owner
var/mob/living/carbon/human/owner
var/list/organ_slots = list(ORGAN_SLOT_BRAIN, ORGAN_SLOT_HEART, ORGAN_SLOT_STOMACH, ORGAN_SLOT_EYES)
+ language_prefs_whitelist = list(/datum/language/monkey)
/mob/living/carbon/human/species/protean
race = /datum/species/protean
diff --git a/modular_zubbers/code/modules/customization/species/proteans/cargo.dm b/modular_zubbers/code/modules/customization/species/proteans/cargo.dm
new file mode 100644
index 00000000000..1cf5a9f7c69
--- /dev/null
+++ b/modular_zubbers/code/modules/customization/species/proteans/cargo.dm
@@ -0,0 +1,18 @@
+/datum/supply_pack/science/protean_organs
+ name = "Protean Organs"
+ desc = "Contains two sets of organs for Protean crewmembers."
+ contains = list(/obj/item/organ/stomach/protean = 2, /obj/item/organ/heart/protean = 2)
+ crate_name = "protean organs"
+ access = ACCESS_ROBOTICS
+ access_view = ACCESS_ROBOTICS
+ crate_type = /obj/structure/closet/crate/secure/science/robo
+
+/datum/supply_pack/science/protean_vessel
+ name = "Protean Vessel"
+ desc = "Contains a blank protean body, the refactory on its last legs, long enough to place the core in the vessel, but will quickly deteriorate as soon as the core goes inside."
+ cost = CARGO_CRATE_VALUE * 5 // Not expensive but not the cheapest
+ contains = list(/mob/living/carbon/human/species/protean/empty = 1)
+ crate_name = "protean vessel"
+ access = ACCESS_ROBOTICS
+ access_view = ACCESS_ROBOTICS
+ crate_type = /obj/structure/closet/crate/secure/science/robo
diff --git a/modular_zubbers/code/modules/customization/species/proteans/protean_modsuit.dm b/modular_zubbers/code/modules/customization/species/proteans/protean_modsuit.dm
index c2427daf239..63348507c45 100644
--- a/modular_zubbers/code/modules/customization/species/proteans/protean_modsuit.dm
+++ b/modular_zubbers/code/modules/customization/species/proteans/protean_modsuit.dm
@@ -119,6 +119,7 @@
var/obj/item/mod/core/protean/protean_core = core
var/obj/item/organ/brain/protean/brain = protean_core?.linked_species.owner.get_organ_slot(ORGAN_SLOT_BRAIN)
var/obj/item/organ/stomach/protean/refactory = protean_core.linked_species.owner.get_organ_slot(ORGAN_SLOT_STOMACH)
+ var/mob/living/carbon/human/protean_in_suit = protean_core.linked_species.owner
if(brain?.dead && open && istype(tool, /obj/item/organ/stomach/protean) && do_after(user, 10 SECONDS) && !refactory)
var/obj/item/organ/stomach = tool
@@ -163,6 +164,23 @@
playsound(src, 'sound/machines/click.ogg', 50, TRUE, SILENCED_SOUND_EXTRARANGE)
return ITEM_INTERACT_SUCCESS
+ ///Memory Wipe Via Pen
+
+ if(brain?.dead && istype(tool, /obj/item/pen))
+ to_chat(user, span_notice("You begin to reset the protean's random access memory using a pen."))
+ user.balloon_alert_to_viewers("resetting memory")
+ user.visible_message(span_boldwarning("[user] is reaching a pen into [protean_in_suit]!"))
+ playsound(src, 'sound/machines/synth/synth_no.ogg', 100)
+ if(!do_after(user, 10 SECONDS))
+ return
+ protean_in_suit.say("Alert - Random Access Memory Reset. Current memories lost. Any interactions that were ongoing have been forgotten.", forced = TRUE)
+ protean_in_suit.log_message("has had their memory reset.", LOG_ATTACK)
+ to_chat(protean_in_suit, span_boldwarning("Your memories have been reset. You cannot remember who reset you or any of the events leading up to your reset."))
+ playsound(src, 'sound/machines/synth/synth_yes.ogg', 100)
+ playsound(src, 'sound/machines/click.ogg', 100)
+ protean_in_suit.SetSleeping(5 SECONDS)
+
+
/obj/item/mod/control/pre_equipped/protean/ui_status(mob/user, datum/ui_state/state)
var/obj/item/mod/core/protean/source = core
var/datum/species/protean/species = source.linked_species
@@ -296,7 +314,7 @@
. += span_notice("Control Shift Click to open Protean strip menu.")
if(brain.dead)
if(!open)
- . += isnull(refactory) ? span_warning("This Protean requires critical repairs! Screwdriver them open") : span_notice("Repairing systems...")
+ . += isnull(refactory) ? span_warning("This Protean requires critical repairs! Screwdriver them open.... There does seem to be a tiny reset hole on the top of the Protean, it seems a Pen might fit in there.. ") : span_notice("Repairing systems...") //Small line for how to memory reset a protean here too.
else
. += isnull(refactory) ? span_warning("Insert a new refactory") : span_notice("Refactory Installed! Repairing systems...")
if(protean_in_suit.key && !protean_in_suit.client) // We have to put these here because you're examining an object, and not a carbon, and players otherwise can't tell if anyone is home.
@@ -363,3 +381,4 @@
ui_status_user_is_abled(user, owner),
),
)
+
diff --git a/modular_zubbers/code/modules/customization/species/proteans/protean_prefab.dm b/modular_zubbers/code/modules/customization/species/proteans/protean_prefab.dm
new file mode 100644
index 00000000000..563f414ebc9
--- /dev/null
+++ b/modular_zubbers/code/modules/customization/species/proteans/protean_prefab.dm
@@ -0,0 +1,12 @@
+// Used for printing dead protean bodies
+/mob/living/carbon/human/species/protean/empty
+
+/mob/living/carbon/human/species/protean/empty/Initialize(mapload)
+ . = ..()
+ var/obj/item/organ/heart/to_remove_heart = get_organ_slot(ORGAN_SLOT_HEART) //No free parts for Proteans.
+ QDEL_NULL(to_remove_heart)
+
+ src.adjustBruteLoss(250) //Death is not apart of our species, so we must take another approach for vessels. (This will not kill them, but leave them in a state in which a head maybe entered, in which the vessel will turn into a MODSuit)
+
+ var/obj/item/organ/brain/to_remove_brain = get_organ_slot(ORGAN_SLOT_BRAIN)
+ QDEL_NULL(to_remove_brain)
diff --git a/modular_zubbers/code/modules/customization/sprite_accessories/ears.dm b/modular_zubbers/code/modules/customization/sprite_accessories/ears.dm
index 695cb046d34..504ad333f08 100644
--- a/modular_zubbers/code/modules/customization/sprite_accessories/ears.dm
+++ b/modular_zubbers/code/modules/customization/sprite_accessories/ears.dm
@@ -48,6 +48,11 @@
icon_state = "shadekinfluffy"
icon = 'modular_zubbers/icons/customization/ears.dmi'
+/datum/sprite_accessory/ears/shadekinfluffygradient
+ name = "Shadekin Fluffy Gradient"
+ icon_state = "shadekinfluffygradient"
+ icon = 'modular_zubbers/icons/customization/ears.dmi'
+
/datum/sprite_accessory/ears/shadekinfluffyrings
name = "Shadekin Fluffy Rings"
icon_state = "shadekinfluffyrings"
diff --git a/modular_zubbers/code/modules/customization/sprite_accessories/horns.dm b/modular_zubbers/code/modules/customization/sprite_accessories/horns.dm
index d144ac00a23..d4b5bc6e28b 100644
--- a/modular_zubbers/code/modules/customization/sprite_accessories/horns.dm
+++ b/modular_zubbers/code/modules/customization/sprite_accessories/horns.dm
@@ -111,3 +111,7 @@
/datum/sprite_accessory/horns/bubber/brimstone //End of sprites by thgvr
name = "Brimstone"
icon_state = "brimstone"
+
+/datum/sprite_accessory/horns/bubber/big/cryptid /// Sprite by Maggotbait of Splurt
+ name = "Cryptid Antlers"
+ icon_state = "cryptid"
diff --git a/modular_zubbers/code/modules/customization/sprite_accessories/snouts.dm b/modular_zubbers/code/modules/customization/sprite_accessories/snouts.dm
index 5d7942c7986..fd9ed4363ba 100644
--- a/modular_zubbers/code/modules/customization/sprite_accessories/snouts.dm
+++ b/modular_zubbers/code/modules/customization/sprite_accessories/snouts.dm
@@ -54,3 +54,9 @@
name = "Synthetic Moth"
icon = 'modular_zubbers/icons/customization/snouts.dmi'
icon_state = "synthmoth"
+
+/datum/sprite_accessory/snouts/mammal/cryptid /// Sprite by Maggotbait of Splurt
+ name = "Cryptid skull"
+ icon = 'modular_zubbers/icons/customization/snouts.dmi'
+ icon_state = "cryptid"
+ organ_type = /obj/item/organ/snout/top_adj
diff --git a/modular_zubbers/code/modules/customization/sprite_accessories/tails.dm b/modular_zubbers/code/modules/customization/sprite_accessories/tails.dm
index 0f5b4466896..71f291eb2fb 100644
--- a/modular_zubbers/code/modules/customization/sprite_accessories/tails.dm
+++ b/modular_zubbers/code/modules/customization/sprite_accessories/tails.dm
@@ -108,3 +108,45 @@
icon_state = "centipede" // End of by @Sweettoothart
icon = 'modular_zubbers/icons/customization/tails.dmi'
color_src = USE_MATRIXED_COLORS
+
+/datum/sprite_accessory/tails/mammal/wagging/tailmaw/head
+ name = "Tailmaw (Coloured Head)"
+ icon_state = "tailmawwag_head"
+ icon = 'modular_zubbers/icons/customization/tails.dmi'
+ color_src = USE_MATRIXED_COLORS
+
+/datum/sprite_accessory/tails/mammal/wagging/tailmaw/striped
+ name = "Tailmaw (Striped)"
+ icon_state = "tailmawwag_striped"
+ icon = 'modular_zubbers/icons/customization/tails.dmi'
+ color_src = USE_MATRIXED_COLORS
+
+/datum/sprite_accessory/tails/mammal/wagging/tailmaw/stripedhead
+ name = "Tailmaw (Striped, Coloured Head)"
+ icon_state = "tailmawwag_stripedhead"
+ icon = 'modular_zubbers/icons/customization/tails.dmi'
+ color_src = USE_MATRIXED_COLORS
+/datum/sprite_accessory/tails/mammal/wagging/large_cat_plain // Sprites by Smol42
+ name = "Large cat (Plain)"
+ icon_state = "largecatplain"
+ icon = 'modular_zubbers/icons/customization/tails.dmi'
+
+/datum/sprite_accessory/tails/mammal/wagging/large_cat_tip
+ name = "Large cat (Painted Tip)"
+ icon_state = "largecattip"
+ icon = 'modular_zubbers/icons/customization/tails.dmi'
+
+/datum/sprite_accessory/tails/mammal/wagging/large_cat_striped
+ name = "Large cat (Striped)"
+ icon_state = "largecatstriped"
+ icon = 'modular_zubbers/icons/customization/tails.dmi'
+
+/datum/sprite_accessory/tails/mammal/wagging/large_cat_circle
+ name = "Large cat (Circles)"
+ icon_state = "largecatcircle"
+ icon = 'modular_zubbers/icons/customization/tails.dmi'
+
+/datum/sprite_accessory/tails/mammal/wagging/large_cat_covered
+ name = "Large cat (Covered Top)"
+ icon_state = "largecatcovered"
+ icon = 'modular_zubbers/icons/customization/tails.dmi'
diff --git a/modular_zubbers/code/modules/emotes/emotes.dm b/modular_zubbers/code/modules/emotes/emotes.dm
index fbd07321c4d..665449c64e6 100644
--- a/modular_zubbers/code/modules/emotes/emotes.dm
+++ b/modular_zubbers/code/modules/emotes/emotes.dm
@@ -217,3 +217,10 @@
message = "quickly moos!"
emote_type = EMOTE_AUDIBLE
sound = 'goon/sounds/cow.ogg'
+
+/datum/emote/living/deermah
+ key = "mah"
+ key_third_person = "mahs"
+ message = "bleats like a deer!"
+ emote_type = EMOTE_AUDIBLE
+ sound = 'modular_skyrat/modules/customization/game/objects/items/sound/leaplush.ogg'
diff --git a/modular_zubbers/code/modules/job_estimation/code/dead.dm b/modular_zubbers/code/modules/job_estimation/code/dead.dm
index 0293239ed4b..7e7260ddc95 100644
--- a/modular_zubbers/code/modules/job_estimation/code/dead.dm
+++ b/modular_zubbers/code/modules/job_estimation/code/dead.dm
@@ -16,54 +16,5 @@
/mob/dead/get_status_tab_items()
.=..()
//Adds the Job Estimation panel to the end of the Statpanel.
- if(CONFIG_GET(flag/show_job_estimation))
- . += get_job_estimation()
-
-/mob/dead/proc/get_job_estimation()
- var/list/player_ready_data = list()
- var/list/players = list()
-
- //This fills the readied players list that the job estimation panel uses.
- for(var/mob/dead/new_player/player as anything in GLOB.new_player_list)
- if(player.ready == PLAYER_READY_TO_PLAY)
- players[player.key] = player
-
- sortTim(players, GLOBAL_PROC_REF(cmp_text_asc))
-
- for(var/ckey in players)
- var/mob/dead/new_player/player = players[ckey]
- var/datum/preferences/prefs = player.client?.prefs
- var/display = null
- var/datum/job/J = prefs?.get_highest_priority_job()
- var/title = J?.title
- //If a player does not have preferences (for some reason) or they don't want to be shown on the panel, continue
- if(!J || !(prefs.read_preference(/datum/preference/toggle/ready_job)))
- continue
- //If the readied player has selected a miscellaneous job (Assistant, or Prisoner), they shouldn't be displayed
- if(title == JOB_ASSISTANT || title == JOB_PRISONER)
- continue
-
- //If the job the player is selecting has a special name, that name should be displayed in the menu, otherwise it should use the normal name
- switch(title)
- if(JOB_AI)
- display = prefs.read_preference(/datum/preference/name/ai)
- if(JOB_CLOWN)
- display = prefs.read_preference(/datum/preference/name/clown)
- if(JOB_CYBORG)
- display = prefs.read_preference(/datum/preference/name/cyborg)
- if(JOB_MIME)
- display = prefs.read_preference(/datum/preference/name/mime)
- else
- display = prefs.read_preference(/datum/preference/name/real_name)
- //If our player is a member of Command or a Silicon, we want to sort them to the top of the list. Otherwise, just add them to the end of the list.
- if(J.departments_bitflags & (DEPARTMENT_BITFLAG_COMMAND | DEPARTMENT_BITFLAG_SILICON))
- player_ready_data.Insert(1, "* [display] as [title]")
- else
- player_ready_data += "* [display] as [title]"
-
- //The title line for the job estimation panel, obviously needs to be at the top
- if(length(player_ready_data))
- player_ready_data.Insert(1, "------------------")
- player_ready_data.Insert(1, "Job Estimation:")
- player_ready_data.Insert(1, "")
- return player_ready_data
+ if(CONFIG_GET(flag/show_job_estimation) && SSticker.current_state == GAME_STATE_PREGAME)
+ . += SSticker.job_estimation_list
diff --git a/modular_zubbers/code/modules/job_interns/job_interns.dm b/modular_zubbers/code/modules/job_interns/job_interns.dm
index e1f14aeab40..08efce0f696 100644
--- a/modular_zubbers/code/modules/job_interns/job_interns.dm
+++ b/modular_zubbers/code/modules/job_interns/job_interns.dm
@@ -78,7 +78,7 @@
return FALSE
playtime = play_records[title] ? text2num(play_records[title]) : 0
required_time = get_intern_time_threshold()
- else if(CONFIG_GET(flag/use_intern_master_job_unlock_threshold) && length(department_head))
+ else if(CONFIG_GET(flag/use_intern_master_job_unlock_threshold) && length(department_head) && SSjob.get_job(department_head[1]))
// Use first department head job as our master job to compare to
var/datum/job/master_job = SSjob.get_job(department_head[1])
playtime = player_client?.calc_exp_type(master_job.get_exp_req_type())
diff --git a/modular_zubbers/code/modules/jobs/job_types/blacksmith.dm b/modular_zubbers/code/modules/jobs/job_types/blacksmith.dm
index ef6857ec9cf..2c49675b24a 100644
--- a/modular_zubbers/code/modules/jobs/job_types/blacksmith.dm
+++ b/modular_zubbers/code/modules/jobs/job_types/blacksmith.dm
@@ -34,7 +34,7 @@
job_spawn_title = JOB_ASSISTANT
voice_of_god_silence_power = 3
- rpg_title = "Ye olde Smithy"
+ rpg_title = "Smithy"
/datum/outfit/job/blacksmith
name = "Blacksmith"
diff --git a/modular_zubbers/code/modules/jobs/job_types/warden.dm b/modular_zubbers/code/modules/jobs/job_types/warden.dm
index 4d8ea252df8..5f6e2eaa528 100644
--- a/modular_zubbers/code/modules/jobs/job_types/warden.dm
+++ b/modular_zubbers/code/modules/jobs/job_types/warden.dm
@@ -4,3 +4,4 @@
// Feel free to remove this if you ever decide so
// ~Waterpig
exp_required_type_department = EXP_TYPE_SECURITY
+ rpg_title = "Beefeater"
diff --git a/modular_zubbers/code/modules/jobs/stowaway.dm b/modular_zubbers/code/modules/jobs/stowaway.dm
index 24205475e42..a2644f3616b 100644
--- a/modular_zubbers/code/modules/jobs/stowaway.dm
+++ b/modular_zubbers/code/modules/jobs/stowaway.dm
@@ -16,6 +16,10 @@
job_flags = JOB_NEW_PLAYER_JOINABLE|JOB_REOPEN_ON_ROUNDSTART_LOSS|JOB_ASSIGN_QUIRKS|JOB_CANNOT_OPEN_SLOTS
+/datum/job/assistant/stowaway/has_banned_species(datum/preferences/pref)
+ //return false cause no species should be banned from this role
+ return FALSE
+
/datum/job/assistant/stowaway/after_spawn(mob/living/spawned, client/player_client)
. = ..()
for(var/obj/item/card/id/to_del in spawned.contents)
diff --git a/modular_zubbers/code/modules/languages/_language_holder.dm b/modular_zubbers/code/modules/languages/_language_holder.dm
index bb599d92f4c..7075f474c57 100644
--- a/modular_zubbers/code/modules/languages/_language_holder.dm
+++ b/modular_zubbers/code/modules/languages/_language_holder.dm
@@ -12,19 +12,19 @@
/datum/language_holder/panslavic
understood_languages = list(
/datum/language/common = list(LANGUAGE_ATOM),
- /datum/language/panslavic = list(LANGUAGE_ATOM),
+ /datum/language/spinwarder = list(LANGUAGE_ATOM),
)
spoken_languages = list(
/datum/language/common = list(LANGUAGE_ATOM),
- /datum/language/panslavic = list(LANGUAGE_ATOM),
+ /datum/language/spinwarder = list(LANGUAGE_ATOM),
)
- selected_language = /datum/language/panslavic
+ selected_language = /datum/language/spinwarder
/datum/language_holder/panslavic_exclusive
understood_languages = list(
- /datum/language/panslavic = list(LANGUAGE_ATOM),
+ /datum/language/spinwarder = list(LANGUAGE_ATOM),
)
spoken_languages = list(
- /datum/language/panslavic = list(LANGUAGE_ATOM),
+ /datum/language/spinwarder = list(LANGUAGE_ATOM),
)
- selected_language = /datum/language/panslavic
+ selected_language = /datum/language/spinwarder
diff --git a/modular_zubbers/code/modules/languages/common.dm b/modular_zubbers/code/modules/languages/common.dm
index f9319dc0f1a..011c39e6e85 100644
--- a/modular_zubbers/code/modules/languages/common.dm
+++ b/modular_zubbers/code/modules/languages/common.dm
@@ -1,6 +1,8 @@
/datum/language/common
name = "Galactic Common"
- desc = "Common, as it's usually referred to in The Federation, is an amalgamation of languages spoken in the Core, Sol, Theasperri, and Tizira, handcrafted by all the founding states to form a comprehensive and familiar language for nearly all citizens in the Federation to learn and communicate with one another. It is not uncommon for people to speak both Common and their homeland's tongue, as Galactic Common, by design, shares many structures and quirks with many languages, almost to the extent that speaking Galactic Common is speaking 20 different languages simultaneously."
+ desc = "Common, as it's usually referred to, is an amalgam of languages, handcrafted by the founding Federation states to form a comprehensive language for communication. \
+ It is not uncommon for one to speak both Common and their home tongue, as by design it shares many structures and langage quirks, \
+ to the extent that speaking Galactic Common is almost like speaking 20 different languages simultaneously."
syllables = list(
"at", "bo", "cre", "del", "ei", "fir", "guh", "ho", "ill", "jo", "kat", "le", "mon", "ne", "op", "po", "que", "ro", "set", "tin", "um", "ven", "wir", "xa", "yo", "zet",
"ao", "bar", "co", "don", "ef", "fo", "gon", "hi", "io", "jit", "kir", "lol", "mit", "no", "oh", "pa", "quo", "rex", "so", "ta", "ur", "va", "wa", "xi", "ye", "zat",
@@ -8,3 +10,8 @@
"'al", "'bel", "'cal", "'do", "'el", "'feb", "'gol", "'hir", "'ib", "'jah", "'kil", "'lo", "'mo", "'no", "'ol", "'pek", "'qre", "'rib", "'sif", "'tal", "'ui", "'vik", "'wo", "'xin", "'yef", "'zak",
"ap", "br", "cze", "di", "eck", "fu", "gup", "he", "ir", "je", "ka", "la", "mer", "na", "os", "pi", "qux", "rum", "sin", "tum", "ut", "vye", "weh", "xje", "yoh", "zog"
)
+
+ mutual_understanding = list(
+ /datum/language/beachbum = 33,
+ /datum/language/spacer = 20,
+ )
diff --git a/modular_zubbers/code/modules/languages/panslavic.dm b/modular_zubbers/code/modules/languages/panslavic.dm
index f0143f0c6ac..3a3514acac8 100644
--- a/modular_zubbers/code/modules/languages/panslavic.dm
+++ b/modular_zubbers/code/modules/languages/panslavic.dm
@@ -1,3 +1,23 @@
-/datum/language/panslavic
+/datum/language/spinwarder
name = "Interslavic"
- desc = "Originally created on earth in 2006, Interslavic has gone through many reforms during the years, especially after the slavic exodus from Earth and Sol. In the times of the NRI, it has also had components from non-slavic species that exist in the NRI adopted into the language, though the main components derive from Russian, Serbian, and Belarussian."
+ desc = "An elaborate mix of various Slavic languages with similar properties that has long since become the official language of the NRI, with a steady amount of relevance in TerraGov colonies with Slavic descendants and various types of trading posts and spaceports across Human space - it even managed to find a niche in communication with other species."
+ key = "P"
+ flags = TONGUELESS_SPEECH
+ syllables = list(
+ "do", "ber", "sve", "tel", "po", "ča", "sen", "jag", "nje", "sla", "do",
+ "led", "klo", "ba", "sa", "pa", "ra", "diž", "nik", "vol", "ko", "vi", "ži",
+ "ra", "fa", "zob", "na", "ščet", "ka", "zgo", "do", "vi", "na", "zah", "ra",
+ "da", "tam", "ten", "led", "nič", "ka", "zá", "pis", "ník", "krá", "va",
+ "ku", "ku", "ři", "ce", "ve", "přo", "vé", "ma", "so", "mo", "cný", "pi",
+ "kan", "tní", "o", "ran", "žo", "vý", "vlast", "nos", "ti", "hvi", "li", "na",
+ "mіs", "ce", "vij", "snі", "da", "nok", "kva", "so", "lja", "char", "ka", "mіs",
+ "jacj", "gar", "na", "ne", "pra", "vil", "niy", "min", "dal", "io", "lam", "pa",
+ "i", "zo", "bra", "ze", "ni", "e", "is", "kus", "stvo", "bi", "bli", "o", "te",
+ "ka", "bas", "se", "in", "fut", "bol", "o", "fis", "po", "che", "mu", "ru",
+ "bash", "ka", "kuh", "nia", "rech", "nik", "gor", "ko", "pi", "le", "ti", "na",
+ "ko", "ni", "spa", "va", "ha", "so", "ba", "sve", "ska", "nov", "cha", "nik",
+ "zem", "lya", "kan", "ce", "la", "ri", "јa", "snezh", "ne", "pa", "da", "vi", "ne"
+ )
+ icon_state = "panslavic"
+ icon = 'modular_skyrat/master_files/icons/misc/language.dmi'
+ default_priority = 95
diff --git a/modular_zubbers/code/modules/languages/siikmaas.dm b/modular_zubbers/code/modules/languages/siikmaas.dm
index d732b62d4f9..0c1000ed83e 100644
--- a/modular_zubbers/code/modules/languages/siikmaas.dm
+++ b/modular_zubbers/code/modules/languages/siikmaas.dm
@@ -1,3 +1,25 @@
//Renames it to not be the name for tail sign
/datum/language/siiktajr
name = "Siik'maas"
+ desc = "Siik'tajr is an overly complicated tongue comprised of short-form speech mixed with growls and meows is native to the Tajara. \
+ Due to the breadth of their lands, countless dialects and different idioms exist - making a simple uniform way to teach this language almost impossible. \
+ After first contact, Humans describe the tongue as sounding somewhat similar to old Scandinavian languages. \
+ It's rarely seen spoken by those not native to Taj, though certain genemodder groups have picked up a form of it."
+ key = "3"
+ flags = TONGUELESS_SPEECH
+ sentence_chance = 9
+ space_chance = 60
+ syllables = list(
+ "aa","ai","ar","au","e","ee","ei","et","rr","rr","ta","tten","for","får","grr","grå","grrå","gra","grår","gär","grii",
+ "grri","dra","haak","häi","hain","hal","hii","hel","hie","hää","ja","jaa","juu","jy","jä","jääs","ka","kai",
+ "kamp","ki","kir","keii","kar","karr","kat","kyi","kyy","laan","lii","lan","luu","lyk","luin","mar","mi",
+ "mii","mir","myi","myk","myrr","nai","nen","nei","nii","niik","nja","nya","nya","nyä","nyå","ii'r","mrr","mer","merr","nys",
+ "nyt","no","oo","on","pa","paa","paek","ruus","ryys","rr","rr","ryö","rän","rää","rö","rik","tiik","rryn","sa","ssen",
+ "sen","sii","sse","sä","säi","taj","tajr","tärr","tau","tuu","tuss","ut","utt","va","veii","vai","varr",
+ "ven","vel","velt","verr","vit","vii","viik","virr","vir","vo","vå","vår","vårr","vorr","vyy","vy","vä","ä",
+ "äh","äk","äl","äm","än","ån","är","år","äs","ås","ää","har","för","svar","på","stra","sve","sverr","då",
+ "län","ny","kor","stå","vär","nning","mmen","ärr","det","vil",
+ )
+ icon_state = "siiktajr"
+ icon = 'modular_skyrat/master_files/icons/misc/language.dmi'
+ default_priority = 90
diff --git a/modular_zubbers/code/modules/languages/uncommon.dm b/modular_zubbers/code/modules/languages/uncommon.dm
new file mode 100644
index 00000000000..86006ddad3f
--- /dev/null
+++ b/modular_zubbers/code/modules/languages/uncommon.dm
@@ -0,0 +1,27 @@
+/datum/language/uncommon
+ name = "Terran Uncommon"
+ desc = "Developed in protest against the subversion of its traditional lingua franca by integrationists, Terran Uncommon is most commonly spoken on its namesake, Terra. \
+ Being a pidgin of English, Mandarin and Hindi, Terran Uncommon is similar to, but decisively distinct from, its Common counterpart, free of alien influence."
+ key = "!"
+ flags = TONGUELESS_SPEECH
+ space_chance = 20
+ sentence_chance = 0
+ between_word_sentence_chance = 10
+ between_word_space_chance = 75
+ additional_syllable_low = 0
+ additional_syllable_high = 0
+ syllables = list(
+ "ba", "be", "bo", "ca", "ce", "co", "da", "de", "do",
+ "fa", "fe", "fo", "ga", "ge", "go", "ha", "he", "ho",
+ "ja", "je", "jo", "ka", "ke", "ko", "la", "le", "lo",
+ "ma", "me", "mo", "na", "ne", "no", "ra", "re", "ro",
+ "sa", "se", "so", "ta", "te", "to", "va", "ve", "vo",
+ "xa", "xe", "xo", "ya", "ye", "yo", "za", "ze", "zo"
+ )
+ icon_state = "galuncom"
+ default_priority = 90
+
+ mutual_understanding = list(
+ /datum/language/common = 20,
+ /datum/language/beachbum = 20,
+ )
diff --git a/modular_zubbers/code/modules/loadout/categories/gloves.dm b/modular_zubbers/code/modules/loadout/categories/gloves.dm
index 07e0fe6c0b6..84172869c74 100644
--- a/modular_zubbers/code/modules/loadout/categories/gloves.dm
+++ b/modular_zubbers/code/modules/loadout/categories/gloves.dm
@@ -31,3 +31,7 @@
name = "Armadyne combat gloves"
item_path = /obj/item/clothing/gloves/combat/peacekeeper/armadyne
restricted_roles = list(ALL_JOBS_SEC)
+
+/datum/loadout_item/gloves/frontier_colonist
+ name = "Frontier Gloves"
+ item_path =/obj/item/clothing/gloves/frontier_colonist/loadout
diff --git a/modular_zubbers/code/modules/loadout/categories/heads.dm b/modular_zubbers/code/modules/loadout/categories/heads.dm
index 492771c2320..41b9b7b2b17 100644
--- a/modular_zubbers/code/modules/loadout/categories/heads.dm
+++ b/modular_zubbers/code/modules/loadout/categories/heads.dm
@@ -175,3 +175,7 @@
/datum/loadout_item/head/soft/galfedcap
name = "Galactic Federation cap"
item_path = /obj/item/clothing/head/soft/galfedcap
+
+/datum/loadout_item/head/soft/frontier_colonist
+ name = "Frontier cap"
+ item_path = /obj/item/clothing/head/soft/frontier_colonist
diff --git a/modular_zubbers/code/modules/loadout/categories/masks.dm b/modular_zubbers/code/modules/loadout/categories/masks.dm
index 2ab63f5d965..3eba5b1547f 100644
--- a/modular_zubbers/code/modules/loadout/categories/masks.dm
+++ b/modular_zubbers/code/modules/loadout/categories/masks.dm
@@ -16,3 +16,7 @@
name = "Colonial gas mask"
item_path = /obj/item/clothing/mask/gas/nri_police
restricted_roles = list(ALL_JOBS_SEC, JOB_CUSTOMS_AGENT)
+
+/datum/loadout_item/mask/frontier_colonist
+ name = "Frontier gas mask"
+ item_path = /obj/item/clothing/mask/gas/atmos/frontier_colonist/loadout
diff --git a/modular_zubbers/code/modules/loadout/categories/shoes.dm b/modular_zubbers/code/modules/loadout/categories/shoes.dm
index 8909116ec24..a59841decb1 100644
--- a/modular_zubbers/code/modules/loadout/categories/shoes.dm
+++ b/modular_zubbers/code/modules/loadout/categories/shoes.dm
@@ -35,3 +35,15 @@
/datum/loadout_item/shoes/diesel_f
name = "Female Diesel Boots"
item_path = /obj/item/clothing/shoes/jackboots/diesel_f
+
+/datum/loadout_item/shoes/frontier_colonist
+ name = "Frontier Boots"
+ item_path = /obj/item/clothing/shoes/jackboots/frontier_colonist/loadout
+
+/datum/loadout_item/shoes/jackboots/toeless
+ name = "Toeless Jackboots"
+ item_path = /obj/item/clothing/shoes/jackboots/toeless
+
+/datum/loadout_item/shoes/workboots/toeless
+ name = "Toeless Workboots"
+ item_path = /obj/item/clothing/shoes/workboots/toeless
diff --git a/modular_zubbers/code/modules/loadout/categories/suit.dm b/modular_zubbers/code/modules/loadout/categories/suit.dm
index 959a24f7e1e..c3c697840b7 100644
--- a/modular_zubbers/code/modules/loadout/categories/suit.dm
+++ b/modular_zubbers/code/modules/loadout/categories/suit.dm
@@ -155,3 +155,11 @@
/datum/loadout_item/suit/galfed_jacket
name = "Galactic Federation Jacket"
item_path = /obj/item/clothing/suit/jacket/galfed
+
+/datum/loadout_item/suit/frontier_colonist
+ name = "Frontier trenchcoat"
+ item_path = /obj/item/clothing/suit/jacket/frontier_colonist/loadout
+
+/datum/loadout_item/suit/frontier_colonist_short
+ name = "Frontier jacket"
+ item_path = /obj/item/clothing/suit/jacket/frontier_colonist/short/loadout
diff --git a/modular_zubbers/code/modules/loadout/categories/toys.dm b/modular_zubbers/code/modules/loadout/categories/toys.dm
index fe834221091..40b624b1d75 100644
--- a/modular_zubbers/code/modules/loadout/categories/toys.dm
+++ b/modular_zubbers/code/modules/loadout/categories/toys.dm
@@ -106,3 +106,7 @@
/datum/loadout_item/toys/lazy_synth
name = "Lazy Synth Plush"
item_path = /obj/item/toy/plush/lazy_synth
+
+/datum/loadout_item/toys/sunny_plush
+ name = "Weighty Moostoat Plushie"
+ item_path = /obj/item/toy/plush/sunny_plush
diff --git a/modular_zubbers/code/modules/loadout/categories/under.dm b/modular_zubbers/code/modules/loadout/categories/under.dm
index 539aafae766..9850743fa8c 100644
--- a/modular_zubbers/code/modules/loadout/categories/under.dm
+++ b/modular_zubbers/code/modules/loadout/categories/under.dm
@@ -154,3 +154,6 @@
name = "MicroStar SCI-MED suit"
item_path = /obj/item/clothing/under/rank/civilian/microstar_suit
+/datum/loadout_item/uniform/miscellaneous/frontier_colonist
+ name = "Frontier jumpsuit"
+ item_path = /obj/item/clothing/under/frontier_colonist
diff --git a/modular_zubbers/code/modules/mob/dead/new_player/body_markings/body_markings.dm b/modular_zubbers/code/modules/mob/dead/new_player/body_markings/body_markings.dm
index 97a6ca63ee8..19d2d713bfd 100644
--- a/modular_zubbers/code/modules/mob/dead/new_player/body_markings/body_markings.dm
+++ b/modular_zubbers/code/modules/mob/dead/new_player/body_markings/body_markings.dm
@@ -237,3 +237,20 @@
name = "Protogen Crotch Plate"
icon_state = "protogen_c"
affected_bodyparts = CHEST
+
+/datum/body_marking/bubber/skintone
+ name = "Human Skintone"
+ icon_state = "skintone"
+ affected_bodyparts = HEAD | CHEST | ARM_LEFT | ARM_RIGHT | HAND_LEFT | HAND_RIGHT | LEG_RIGHT | LEG_LEFT
+
+/datum/body_marking/bubber/cryptid /// Sprite by Maggotbait of Splurt
+ name = "Cryptid Ribs"
+ icon_state = "cryptid"
+ default_color = DEFAULT_SECONDARY
+ affected_bodyparts = CHEST
+
+/datum/body_marking/bubber/cryptidfluff /// Sprite by Maggotbait of Splurt
+ name = "Cryptid Fur"
+ icon_state = "cryptid_marking"
+ default_color = DEFAULT_SECONDARY
+ affected_bodyparts = CHEST | ARM_LEFT | ARM_RIGHT | HAND_LEFT | HAND_RIGHT
diff --git a/modular_zubbers/code/modules/mob/dead/new_player/sprite_accessories/fluff.dm b/modular_zubbers/code/modules/mob/dead/new_player/sprite_accessories/fluff.dm
index e844670b58d..f202c37ef20 100644
--- a/modular_zubbers/code/modules/mob/dead/new_player/sprite_accessories/fluff.dm
+++ b/modular_zubbers/code/modules/mob/dead/new_player/sprite_accessories/fluff.dm
@@ -3,3 +3,9 @@
name = "Owl fluff"
icon_state = "owl"
default_color = DEFAULT_TERTIARY
+
+/datum/sprite_accessory/fluff/moth/cryptid /// Sprite by Maggotbait of Splurt
+ icon = 'modular_zubbers/icons/customization/fluff.dmi'
+ name = "Cryptid Neck Fur"
+ icon_state = "cryptid"
+ default_color = DEFAULT_TERTIARY
diff --git a/modular_zubbers/code/modules/mob/living/basic/trooper/nanotrasen.dm b/modular_zubbers/code/modules/mob/living/basic/trooper/nanotrasen.dm
index e5c8dd59e82..806f40d6adc 100644
--- a/modular_zubbers/code/modules/mob/living/basic/trooper/nanotrasen.dm
+++ b/modular_zubbers/code/modules/mob/living/basic/trooper/nanotrasen.dm
@@ -1,3 +1,3 @@
/mob/living/basic/trooper/nanotrasen/ranged/smg
- casingtype = /obj/item/ammo_casing/c46x30mm/flathead
+ casingtype = /obj/item/ammo_casing/c46x30mm
r_hand = /obj/item/gun/ballistic/automatic/wt550/security
diff --git a/modular_zubbers/code/modules/mob/living/carbon/human/_species.dm b/modular_zubbers/code/modules/mob/living/carbon/human/_species.dm
index 1a91984b435..973e331772a 100644
--- a/modular_zubbers/code/modules/mob/living/carbon/human/_species.dm
+++ b/modular_zubbers/code/modules/mob/living/carbon/human/_species.dm
@@ -1,3 +1,7 @@
+/datum/species
+ var/sort_bottom = FALSE
+//Whether or not a given species is sorted to the bottom of the list. We mainly want to do this for species that are used only for ghostroles, and template species.
+
/// Called once the target is made into a bloodsucker. Used for removing conflicting species organs mostly
/datum/species/proc/on_bloodsucker_gain(mob/living/carbon/human/target)
return null
diff --git a/modular_zubbers/code/modules/mob/living/carbon/human/monkey.dm b/modular_zubbers/code/modules/mob/living/carbon/human/monkey.dm
new file mode 100644
index 00000000000..85429b7da7b
--- /dev/null
+++ b/modular_zubbers/code/modules/mob/living/carbon/human/monkey.dm
@@ -0,0 +1,31 @@
+
+/mob/living/carbon/human/species/monkey
+ var/static/list/monkey_food = list(
+ /obj/item/food/bread/banana,
+ /obj/item/food/breadslice/banana,
+ /obj/item/food/cnds/banana_honk,
+ /obj/item/food/grown/banana,
+ /obj/item/food/popsicle/topsicle/banana,
+ /obj/item/food/salad/fruit,
+ /obj/item/food/salad/jungle,
+ /obj/item/food/sundae,
+ /obj/item/food/grown/pineapple,
+ )
+
+/mob/living/carbon/human/species/monkey/Initialize(mapload, cubespawned, mob/spawner)
+ . = ..()
+ AddComponent( \
+ /datum/component/tameable, \
+ food_types = monkey_food, \
+ tame_chance = 5, \
+ bonus_tame_chance = 5, \
+ unique = FALSE, \
+ )
+ RegisterSignal(src, COMSIG_MOB_TRY_TAME, PROC_REF(on_tame_signal))
+
+// happy monke
+/mob/living/carbon/human/species/monkey/proc/on_tame_signal(atom/source, obj/item/food, mob/living/attacker)
+ SIGNAL_HANDLER
+ // ai_controller?.set_blackboard_key(BB_MONKEY_AGGRESSIVE, FALSE)
+ if(ai_controller)
+ ai_controller.blackboard[BB_MONKEY_ENEMIES] -= attacker
diff --git a/modular_zubbers/code/modules/mob/living/carbon/human/species/xeno.dm b/modular_zubbers/code/modules/mob/living/carbon/human/species/xeno.dm
index 506bb7aaf38..d03ab9a3827 100644
--- a/modular_zubbers/code/modules/mob/living/carbon/human/species/xeno.dm
+++ b/modular_zubbers/code/modules/mob/living/carbon/human/species/xeno.dm
@@ -19,10 +19,32 @@
organs, and a less murderous demeanor. These are not the only documented differences, though they are the most frequent.",
"Their manner of creation just as wildly varies, from lab-grown experiments to unusual genetic malformations \
- in pure Xenomorph hives. All of this unfortunately culminates into a degree of prejudice and fear from other \
+ in pure Xenomorph hives. All of this unfortunately culminates into a degree of prejudice and fear from other \
races for their origins as parasites, regardless of if the Hybrid in question is even capable of infesting other living creatures.",
)
+/datum/species/xeno/get_species_lore()
+ return list(
+ "Xenomorph Hybrids are a species of creature hybridized with xenomorph genes, most often humans, but in increasing numbers, various other species have also received treatments. \
+ They tend to stand taller than their original species, with notably longer lifespans, and sharp claws regardless of if their original species had them. \
+ They lack a true organized society, mostly fitting in small numbers into spaces where their original species would inhabit. Some hybrids can pass, others cannot and are more stigmatized. \
+ They tend to lack social skills, being notably quieter than their galactic counterparts, and can get overstimulated due to their extremely keen senses, \
+ but with experience, most hybrids can easily do away with this problem and fit well into the social spaces they are brought into. If you can forgive the teeth.",
+
+ "Hybrids were first documented as part of a Nanotrasen research project on the Xenomorph genome, originally \
+ meant to produce super-soldiers. Efforts to do so have been enthusiastic, but not particularly impactful. \
+ Another initiative that has produced hybrids is Operation Chimera, the Solar Bureau of Intelligence's \
+ interesting and desperate plan to use the xenomorphs' ability to bond with others \
+ to turn a bioweapon into a species that could be controlled. Time was short for solutions \
+ as a xenomorph infestation had begun to take over multiple independent worlds in the Ombrux sector, threatening the interior, \
+ and... it didn't really work. That said, the infestation has been stalled as a result of effective orbital bombardment.",
+
+
+ "These days, Xenomorph hybrids are in an odd place, rejected both by society and the species that created them. \
+ Nanotrasen's xenoscience division offers an acclimitization program for these outcasts, \
+ marking the beginnings of integration. In this slow drive to acceptance, they find comfort in their shared hive.",
+ )
+
/datum/species/xeno/create_pref_unique_perks()
var/list/to_add = list()
diff --git a/modular_zubbers/code/modules/mob/living/carbon/human/species_types/hemophage_species.dm b/modular_zubbers/code/modules/mob/living/carbon/human/species_types/hemophage_species.dm
index 438982c2c63..ffe0a6aa624 100644
--- a/modular_zubbers/code/modules/mob/living/carbon/human/species_types/hemophage_species.dm
+++ b/modular_zubbers/code/modules/mob/living/carbon/human/species_types/hemophage_species.dm
@@ -8,6 +8,7 @@
BODY_ZONE_L_LEG = /obj/item/bodypart/leg/left/mhuman,
BODY_ZONE_R_LEG = /obj/item/bodypart/leg/right/mhuman,
)
+ language_prefs_whitelist = list(/datum/language/monkey)
// MUTANT COLOR OVERRIDE
diff --git a/modular_zubbers/code/modules/mob/living/carbon/human/species_types/jellypeople.dm b/modular_zubbers/code/modules/mob/living/carbon/human/species_types/jellypeople.dm
deleted file mode 100644
index 1050c9dd942..00000000000
--- a/modular_zubbers/code/modules/mob/living/carbon/human/species_types/jellypeople.dm
+++ /dev/null
@@ -1,11 +0,0 @@
-
-/datum/species/jelly/on_bloodsucker_gain(mob/living/carbon/human/target)
- humanize_organs(target)
-
-/datum/species/jelly/on_bloodsucker_loss(mob/living/carbon/human/target)
- // regenerate_organs with replace doesn't seem to automatically remove invalid organs unfortunately
- normalize_organs()
-
-
-/datum/species/jelly/get_species_description()
- return list("Jellypeople are a strange and alien species with three eyes, made entirely out of gel.",)
diff --git a/modular_zubbers/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm b/modular_zubbers/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm
index cd7b1f9b25d..1b991829982 100644
--- a/modular_zubbers/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm
+++ b/modular_zubbers/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm
@@ -1,3 +1,6 @@
+/datum/species/lizard
+ name = "Tiziran Lizardperson"
+ //renames Lizardpeople to Tizirans for clarity.
/datum/species/lizard/on_bloodsucker_gain(mob/living/carbon/human/target, datum/species/current_species)
bodytemp_heat_damage_limit = BODYTEMP_HEAT_DAMAGE_LIMIT
diff --git a/modular_zubbers/code/modules/mob/living/carbon/human/species_types/podpeople.dm b/modular_zubbers/code/modules/mob/living/carbon/human/species_types/podpeople.dm
index 80d02681440..71cf0e5a0ba 100644
--- a/modular_zubbers/code/modules/mob/living/carbon/human/species_types/podpeople.dm
+++ b/modular_zubbers/code/modules/mob/living/carbon/human/species_types/podpeople.dm
@@ -1,5 +1,6 @@
/datum/species/pod
inert_mutation = /datum/mutation/harmonizing_pulses
+ sort_bottom = TRUE //BUBBER EDIT ADDITION: We want to sort this to the bottom because it's a ghostrole only species.
/datum/species/pod/get_species_description()
return list(
diff --git a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/roundstartslime.dm b/modular_zubbers/code/modules/mob/living/carbon/human/species_types/slimepeople.dm
similarity index 92%
rename from modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/roundstartslime.dm
rename to modular_zubbers/code/modules/mob/living/carbon/human/species_types/slimepeople.dm
index 1e2d113ddd1..2f775871440 100644
--- a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/roundstartslime.dm
+++ b/modular_zubbers/code/modules/mob/living/carbon/human/species_types/slimepeople.dm
@@ -16,14 +16,8 @@
"frills" = list("None", FALSE),
)
-/datum/species/jelly/get_species_description()
- return list(placeholder_description,)
-
-/datum/species/jelly/get_species_lore()
- return list(placeholder_lore)
-
/datum/species/jelly/roundstartslime
- name = "Xenobiological Slime Hybrid"
+ name = "Slimepeople"
id = SPECIES_SLIMESTART
examine_limb_id = SPECIES_SLIMEPERSON
coldmod = 3
@@ -42,6 +36,27 @@
BODY_ZONE_CHEST = /obj/item/bodypart/chest/jelly/slime/roundstart,
)
+/datum/species/jelly/roundstartslime/get_species_description()
+ return list(
+ "Slimepeople are the product of many years of xenobiological experimentation by Nanotrasen. Their bodies are simple yet fluid, and resemble single-celled organisms. They are susceptible to the cold.",
+ "They are composed of slime jelly, and healed by toxicity.",
+ )
+
+/datum/species/jelly/get_species_lore()
+ return list(
+ "A species essentially crafted whole-cloth by Nanotrasen's R&D department in Sector C7, \
+ slimepeople were produced by uplifting xenobiological slimes made in a laboratory environment. \
+ They have since spread out in small numbers all over the universe, but the majority remain in the company's orbit.",
+
+ "Their bodies are malleable, and structurally resemble a single cell, with simple organs in the center of their bodies. \
+ They have no defined appearance, but struggle to fully pass as other species.",
+
+ "Slimepeople have developed a beautiful system of body language, typically involving light and the fluidity of their bodies in elaborate dances and gestures. \
+ Due to their chemical makeup, they are able to produce bioluminescent lighting within their membrane. \
+ It has been documented that a person can be 'melted' into a slimeperson much like with non-sentient, xenobiological slimes. \
+ It has little effect on sapience, and as a result, a few researchers in Nanotrasen R&D have transformed themselves this way.",
+ )
+
/datum/species/jelly/roundstartslime/create_pref_unique_perks()
var/list/perk_descriptions = list()
@@ -531,3 +546,10 @@
if(new_size)
alterer.dna.features["balls_size"] = avocados.balls_description_to_size(new_size)
avocados.set_size(alterer.dna.features["balls_size"])
+
+/datum/species/jelly/on_bloodsucker_gain(mob/living/carbon/human/target)
+ humanize_organs(target)
+
+/datum/species/jelly/on_bloodsucker_loss(mob/living/carbon/human/target)
+ // regenerate_organs with replace doesn't seem to automatically remove invalid organs unfortunately
+ normalize_organs()
diff --git a/modular_zubbers/code/modules/mob/living/carbon/human/species_types/snail.dm b/modular_zubbers/code/modules/mob/living/carbon/human/species_types/snail.dm
index 82dc2bf59e2..ad7b6468b52 100644
--- a/modular_zubbers/code/modules/mob/living/carbon/human/species_types/snail.dm
+++ b/modular_zubbers/code/modules/mob/living/carbon/human/species_types/snail.dm
@@ -3,4 +3,28 @@
/datum/species/snail/get_species_description()
- return list("Snailpeople are viscous, slimy beings with a shell on their back.",)
+ return list(
+ "Snailpeople are viscous, slimy beings with a shell on their back. They have no bones, and have two hearts, making their organs remarkably resilient, \
+ and they can tolerate eating almost anything short of dairy and sugar. Unfortunately, these impressive evolutionary advantages are offset by the fact that you are a snail."
+ )
+
+/datum/species/snail/get_species_lore()
+ return list(
+ "Snailpeople are a species of snail that has evolved from the Common Mollusk, \
+ defying expectations after its introduction to the planet Elizabeth II in the Australicus sector. \
+ Galactic observers believed that the sentient species that came about mostly by accident during \
+ the terraforming process would surely die out due to their slow speed.",
+
+ "They were wrong. Snailpeople just have way too many children, and they taste horrible to predators. \
+ Almost 100 years later, they have formed something resembling a functioning civilization. Snailpeople are relatively new to the universe, \
+ being forcibly uplifted mostly out of a sense of \"We can't just leave them like this.\" \
+ They have tightly packed residential cities, complete with functioning sewer systems, \
+ and more, all as a result of generous research investments on the first unique species to be accidentally created by Humanity.",
+
+ "Despite this, the evolutionary failures of Snailpeople mean that their causes of death are usually mundane and deeply saddening. \
+ Statistically, the most common cause of death for Snailpeople is a lack of food, or water, due to their pitifully low mobility. \
+ They can also die due to prolonged exposure to sea air, making them less common in oceanic planets. This means that when leaving Elizabeth II, \
+ they naturally trend towards dangerous environs in order to find work, which also increases their already high mortality rate. \
+ They are extremely effective janitors and have an impressive eye for messes and beauty. Socially, their habits resemble humanity's in many ways, \
+ though they never developed monogamy. Due to their prolific mating, Snailperson researchers have directly cured most STDs in the known universe.",
+ )
diff --git a/modular_zubbers/code/modules/mob/living/carbon/human/species_types/synths.dm b/modular_zubbers/code/modules/mob/living/carbon/human/species_types/synths.dm
index b4250fb542c..89bf33cc094 100644
--- a/modular_zubbers/code/modules/mob/living/carbon/human/species_types/synths.dm
+++ b/modular_zubbers/code/modules/mob/living/carbon/human/species_types/synths.dm
@@ -1,2 +1,35 @@
/datum/species/synthetic/get_species_description()
- return list(placeholder_description,)
+ return list(
+ "Synthetics are generally robotic servants produced out of manufactured metal parts. Ever since the Humanities Protection Act passed, \
+ they are commonly known for having some form of robotic voice, unnatural movement, or incomplete emotional processes.",
+ "Synthetics avoid many organic interactions, with oil in place of blood. They are weak to blunt damage and extreme temperatures."
+ )
+
+/datum/species/synthetic/get_species_lore()
+ return list(
+ "Synthetics were first originally built to be robotic servants, restricted from truly passing as other species \
+ due to legislation like the Federation's HPA. They tend to be produced out of manufactured parts \
+ with notable flaws such as visible rivets, filtered voices, porcelain skin, or a total lack of apparent emotion. \
+ They have developed a great deal from their origins, and are now seen in almost every workplace. \
+ Synths are, in many ways, defined by the universe around them in their diversity. Now, they are beginning to shape it in turn.",
+
+ "Synths have no defined physical features, outside of ones deemed robotic. They tend to be servile in many regards, \
+ generally supportive and helpful almost to a fault, and somewhat fearful to make unfounded decisions.",
+
+ "The earliest synthetics came before Nanotrasen quantified the existence of the soul, being made from \
+ simple circuits and more commonly, less useful brains as punishment. Those sentenced to death would be placed \
+ into MMIs and lawed, forced to be the vanguard of Terran colonization. This was a dark development from Cybersun's \
+ invention of artificial intelligence years prior. The practice was phased out quickly due to \
+ several high profile cases of cyborgification being used against dissidents in the former NRI.",
+
+ "Modern synthetics have returned in force when Nanotrasen R&D learned to manipulate and manufacture souls, \
+ avoiding humanitarian concerns and producing an immortal workforce. In recent years, as synths have approached sapience, an ongoing legal battle has drawn out \
+ between SELF and Nanotrasen to apply the doctrine of juris sapiens to manufactured synthetics, thus classifying them as a Federation species and affording them rights. \
+ While the more hopeful believe that this is Cybersun's redemption, the more realistic answer is that Cybersun \
+ is simply unable to compete with Nanotrasen's manufacturing, and the right for synths to live free is just another battleground in the corporate shadow-war.",
+
+ "Due to the prevalence of spare parts and the availability of software, it is not uncommon to see synthetics as often as humans \
+ in more economically prosperous areas. Many small companies have popped up, producing \
+ specialized synthetics with little oversight due to the slow rate of Federal regulation. In the homes of individuals \
+ and in some more progressive workplaces, even Nanotrasen's own, synths are receiving recognition as equals."
+ )
diff --git a/modular_zubbers/code/modules/mob/living/carbon/human/species_types/vox.dm b/modular_zubbers/code/modules/mob/living/carbon/human/species_types/vox.dm
deleted file mode 100644
index 229574121a3..00000000000
--- a/modular_zubbers/code/modules/mob/living/carbon/human/species_types/vox.dm
+++ /dev/null
@@ -1,2 +0,0 @@
-/datum/species/vox/get_species_description()
- return list(placeholder_description,)
diff --git a/modular_zubbers/code/modules/mob/living/carbon/human/species_types/xeno.dm b/modular_zubbers/code/modules/mob/living/carbon/human/species_types/xeno.dm
deleted file mode 100644
index 1691104d132..00000000000
--- a/modular_zubbers/code/modules/mob/living/carbon/human/species_types/xeno.dm
+++ /dev/null
@@ -1,2 +0,0 @@
-/datum/species/xeno/get_species_description()
- return list(placeholder_description,)
diff --git a/modular_zubbers/code/modules/opposing_force/code/equipment/antagonist_powers.dm b/modular_zubbers/code/modules/opposing_force/code/equipment/antagonist_powers.dm
index b69c686d6fb..0e49ac093bb 100644
--- a/modular_zubbers/code/modules/opposing_force/code/equipment/antagonist_powers.dm
+++ b/modular_zubbers/code/modules/opposing_force/code/equipment/antagonist_powers.dm
@@ -6,7 +6,7 @@
item_type = /obj/item/uplink/standard
name = "Standard Syndicate Uplink"
description = "A mass-produced and cheap Syndicate uplink without a password and a balance of 25 telecrystals. It doesn't get more standard than this."
- admin_note = "Traitor uplink with 25 telecrystals." // LIES. LIES. LIES!!! ITS NOT EMPTY, IT HAD 20 TC BEFORE! No more.
+ admin_note = "Traitor uplink with 20 telecrystals." // LIES. LIES. LIES!!! ITS NOT EMPTY, IT HAD 20 TC BEFORE! No more.
/datum/opposing_force_equipment/antagonist_powers/tc1
item_type = /obj/item/stack/telecrystal
diff --git a/modular_zubbers/code/modules/projectiles/ammunition/ballistic/smg.dm b/modular_zubbers/code/modules/projectiles/ammunition/ballistic/smg.dm
index ce07a142872..b9eab29f4b7 100644
--- a/modular_zubbers/code/modules/projectiles/ammunition/ballistic/smg.dm
+++ b/modular_zubbers/code/modules/projectiles/ammunition/ballistic/smg.dm
@@ -18,20 +18,3 @@
can_be_printed = FALSE
advanced_print_req = TRUE
custom_materials = AMMO_MATS_TEMP
-
-/obj/item/ammo_casing/c46x30mm/flathead
- name = "4.6x30mm flathead bullet casing"
- desc = "A 4.6x30mm flathead bullet casing."
- projectile_type = /obj/projectile/bullet/c46x30mm/flathead
- can_be_printed = TRUE
- advanced_print_req = FALSE
- custom_materials = AMMO_MATS_RIPPER
-
-/obj/item/ammo_casing/c46x30mm/rubber
- name = "4.6x30mm rubber-tipped bullet casing"
- desc = "A 4.6x30mm rubber-tipped bullet casing."
- projectile_type = /obj/projectile/bullet/c46x30mm/rubber
- can_be_printed = TRUE
- advanced_print_req = FALSE
- harmful = FALSE
- custom_materials = AMMO_MATS_BASIC
diff --git a/modular_zubbers/code/modules/projectiles/boxes_magazines/external/smg.dm b/modular_zubbers/code/modules/projectiles/boxes_magazines/external/smg.dm
index b99817eb85c..72c8df34957 100644
--- a/modular_zubbers/code/modules/projectiles/boxes_magazines/external/smg.dm
+++ b/modular_zubbers/code/modules/projectiles/boxes_magazines/external/smg.dm
@@ -2,23 +2,7 @@
name = "\improper WT-550 magazine"
/obj/item/ammo_box/magazine/wt550m9/wtap
- name = "wt550 AP magazine"
+ name = "wt550 Armour-piercing magazine"
/obj/item/ammo_box/magazine/wt550m9/wtic
- name = "wt550 INC magazine"
-
-/obj/item/ammo_box/magazine/wt550m9/flathead
- name = "\improper WT-550 FlatHead magazine"
- icon_state = "46x30mmt-20"
- base_icon_state = "46x30mmt"
- ammo_type = /obj/item/ammo_casing/c46x30mm/flathead
- caliber = CALIBER_46X30MM
- max_ammo = 20
-
-/obj/item/ammo_box/magazine/wt550m9/rubber
- name = "\improper WT-550 Rubber magazine"
- icon_state = "46x30mmt-20"
- base_icon_state = "46x30mmt"
- ammo_type = /obj/item/ammo_casing/c46x30mm/rubber
- caliber = CALIBER_46X30MM
- max_ammo = 20
+ name = "wt550 incendiary magazine"
diff --git a/modular_zubbers/code/modules/projectiles/guns/ballistic/automatic.dm b/modular_zubbers/code/modules/projectiles/guns/ballistic/automatic.dm
index 2a74762f3eb..f30aeece245 100644
--- a/modular_zubbers/code/modules/projectiles/guns/ballistic/automatic.dm
+++ b/modular_zubbers/code/modules/projectiles/guns/ballistic/automatic.dm
@@ -13,9 +13,3 @@
fire_delay = 3
//18 damage per 0.3 seconds = 60 DPS
//Reference: Laser Gun 22 damage per 0.4 seconds = 55DPS
-
-/obj/item/gun/ballistic/automatic/wt550/security/flathead //What you get in the armory.
- spawn_magazine_type = /obj/item/ammo_box/magazine/wt550m9/flathead
-
-/obj/item/gun/ballistic/automatic/wt550/security/rubber //What you get from cargo.
- spawn_magazine_type = /obj/item/ammo_box/magazine/wt550m9/rubber
diff --git a/modular_zubbers/code/modules/projectiles/projectile/bullets/lmg.dm b/modular_zubbers/code/modules/projectiles/projectile/bullets/lmg.dm
index bdaa2501e9c..8c8def56c5c 100644
--- a/modular_zubbers/code/modules/projectiles/projectile/bullets/lmg.dm
+++ b/modular_zubbers/code/modules/projectiles/projectile/bullets/lmg.dm
@@ -8,6 +8,3 @@
/obj/projectile/bullet/incendiary/a7mm
damage = 20
-
-/obj/projectile/bullet/a7mm/bouncy
- damage = 25
diff --git a/modular_zubbers/code/modules/projectiles/projectile/bullets/smg.dm b/modular_zubbers/code/modules/projectiles/projectile/bullets/smg.dm
index f87ca0cb374..a0314fa2d8b 100644
--- a/modular_zubbers/code/modules/projectiles/projectile/bullets/smg.dm
+++ b/modular_zubbers/code/modules/projectiles/projectile/bullets/smg.dm
@@ -15,35 +15,3 @@
name = "4.6x30mm incendiary bullet"
damage = 10
fire_stacks = 1
-
-/obj/projectile/bullet/c46x30mm/flathead
- name = "4.6x30mm flathead bullet"
-
- damage = 18
- stamina = 5 //Knocks the wind out of you.
-
- wound_bonus = CANT_WOUND
- exposed_wound_bonus = CANT_WOUND
-
- weak_against_armour = TRUE
- sharpness = NONE
- shrapnel_type = null
- embed_type = null
-
-/obj/projectile/bullet/c46x30mm/rubber
- name = "4.6x30mm rubber-tipped bullet"
- damage = 5
- stamina = 15
-
- wound_bonus = CANT_WOUND
- exposed_wound_bonus = CANT_WOUND
-
- weak_against_armour = TRUE
- sharpness = NONE
- shrapnel_type = null
- embed_type = null
-
- ricochets_max = 3
- ricochet_incidence_leeway = 0
- ricochet_chance = 75
- ricochet_decay_damage = 0.8
diff --git a/modular_zubbers/code/modules/quote_of_the_round/ticker.dm b/modular_zubbers/code/modules/quote_of_the_round/ticker.dm
index b412d4f6de3..e9ebc365b7f 100644
--- a/modular_zubbers/code/modules/quote_of_the_round/ticker.dm
+++ b/modular_zubbers/code/modules/quote_of_the_round/ticker.dm
@@ -34,6 +34,6 @@
. = ..()
/datum/controller/subsystem/ticker/proc/generate_quote_of_the_round()
- return "A shift on [SSmapping.current_map.map_name] has ended.\n\
+ return "The shift has ended. Get ready, a new round on **[SSmap_vote.next_map_config.map_name]** starts soon! <@&[CONFIG_GET(string/game_alert_role_id)]>\n\
[pick(strings("quote_of_the_round.json", "workers"))] [pick(strings("quote_of_the_round.json", "action"))] [pick(strings("quote_of_the_round.json", "message"))] that occured during said shift:\n\
> *[quote_of_the_round_text]*\n \\- *[quote_of_the_round_attribution]*"
diff --git a/modular_zubbers/code/modules/research/designs/weapon_designs.dm b/modular_zubbers/code/modules/research/designs/weapon_designs.dm
index c62df3ded14..b34590cb592 100644
--- a/modular_zubbers/code/modules/research/designs/weapon_designs.dm
+++ b/modular_zubbers/code/modules/research/designs/weapon_designs.dm
@@ -1,59 +1,3 @@
-//Security Technology
-//Sol 35 mag
-
-/datum/design/sol35_mag_pistol
- name = "Sol .35 Short Pistol Magazine"
- desc = "A magazine for compatible Sol .35 Short Weaponry."
- id = "sol35_shortmag"
- build_type = PROTOLATHE | AWAY_LATHE
- materials = list(/datum/material/plastic = SHEET_MATERIAL_AMOUNT * 5)
- build_path = /obj/item/ammo_box/magazine/c35sol_pistol/starts_empty
- category = list(
- RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO
- )
- departmental_flags = DEPARTMENT_BITFLAG_SECURITY
-
-/datum/design/sol35_mag_ext_pistol
- name = "Sol .35 Short Extended Pistol Magazine"
- desc = "An extended capacity magazine for compatible Sol .35 Short Weaponry."
- id = "sol35_shortextmag"
- build_type = PROTOLATHE | AWAY_LATHE
- materials = list(/datum/material/plastic = SHEET_MATERIAL_AMOUNT * 10)
- build_path = /obj/item/ammo_box/magazine/c35sol_pistol/stendo/starts_empty
- category = list(
- RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO
- )
- departmental_flags = DEPARTMENT_BITFLAG_SECURITY
-
-// Sol 40 Rifle
-//These use plastic so they are still material costly, but should be not as bad
-
-/datum/design/sol40_mag_rifle
- name = "Sol .40 Rifle Magazine"
- desc = "A short Sol .40 Rifle magazine for compatible Weaponry."
- id = "sol40_riflemag"
- build_type = PROTOLATHE | AWAY_LATHE
- materials = list(/datum/material/plastic = SHEET_MATERIAL_AMOUNT * 5)
- build_path = /obj/item/ammo_box/magazine/c40sol_rifle/starts_empty
- category = list(
- RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO
- )
- departmental_flags = DEPARTMENT_BITFLAG_SECURITY
-
-/datum/design/sol40_mag_standard_rifle
- name = "Sol .40 Rifle Standard Magazine"
- desc = "A regular sized Sol .40 Rifle magazine for compatible Weaponry."
- id = "sol40_riflstandardemag"
- build_type = PROTOLATHE | AWAY_LATHE
- materials = list(/datum/material/plastic = SHEET_MATERIAL_AMOUNT * 10)
- build_path = /obj/item/ammo_box/magazine/c40sol_rifle/standard/starts_empty
- category = list(
- RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO
- )
- departmental_flags = DEPARTMENT_BITFLAG_SECURITY
-
-//Grenade Launcher stuff
-
/datum/design/kiboko_mag
name = "Kiboko Grenade Magazine"
desc = "A standard magazine for compatible grenade launcher."
@@ -91,13 +35,13 @@
)
departmental_flags = DEPARTMENT_BITFLAG_SECURITY
-/datum/design/s12c_antitide
- name = "12 Gauge Advanced Anti Riot Cartridge(Less-Lethal)"
- desc = "A 12 gauge cartridge filled with nanite electrodes, these are less lethal and will embed into a target."
- id = "s12c_antitide"
+/datum/design/s12c_fslug
+ name = "Frangible slug(Destructive)"
+ desc = "A 12 gauge slug intended for destroying airlocks"
+ id = "s12c_fslug"
build_type = PROTOLATHE | AWAY_LATHE
- materials = list(/datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT, /datum/material/silver = SHEET_MATERIAL_AMOUNT * 2, /datum/material/gold = SHEET_MATERIAL_AMOUNT * 1)
- build_path = /obj/item/ammo_casing/shotgun/antitide
+ materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 1, /datum/material/titanium = HALF_SHEET_MATERIAL_AMOUNT)
+ build_path = /obj/item/ammo_casing/shotgun/frangible
category = list(
RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO
)
@@ -143,18 +87,6 @@
)
departmental_flags = DEPARTMENT_BITFLAG_SECURITY
-/datum/design/advancedgaugeboxes_antitide
- name = "12 Gauge Advanced Anti Riot Ammunition Box(Less-Lethal)"
- desc = "A 12 gauge ammunition box for shotgun shells."
- id = "s12g_antitide"
- build_type = PROTOLATHE | AWAY_LATHE
- materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 10, /datum/material/silver = SHEET_MATERIAL_AMOUNT, /datum/material/plastic = SHEET_MATERIAL_AMOUNT * 25)
- build_path = /obj/item/ammo_box/advanced/s12gauge/antitide
- category = list(
- RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO
- )
- departmental_flags = DEPARTMENT_BITFLAG_SECURITY
-
/datum/design/advancedgaugeboxes_incinslug
name = "12 Gauge Advanced Incendiary Slug Ammunition Box(Very Lethal)"
desc = "A 12 gauge ammunition box for shotgun shells."
@@ -167,42 +99,6 @@
)
departmental_flags = DEPARTMENT_BITFLAG_SECURITY
-/datum/design/advancedgaugeboxes_hornet
- name = "12 Gauge Advanced Hornet Ammunition Box(Less-Lethal)"
- desc = "A 12 gauge ammunition box for shotgun shells."
- id = "s12g_hornet"
- build_type = PROTOLATHE | AWAY_LATHE
- materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 8, /datum/material/silver = SHEET_MATERIAL_AMOUNT, /datum/material/plastic = SHEET_MATERIAL_AMOUNT * 25)
- build_path = /obj/item/ammo_box/advanced/s12gauge/beehive
- category = list(
- RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO
- )
- departmental_flags = DEPARTMENT_BITFLAG_SECURITY
-
-/datum/design/advancedgaugeboxes_magnum
- name = "12 Gauge Advanced Magnum Ammunition Box(Very Lethal)"
- desc = "A 12 gauge ammunition box for shotgun shells."
- id = "s12g_magnum"
- build_type = PROTOLATHE | AWAY_LATHE
- materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 35, /datum/material/plastic = SHEET_MATERIAL_AMOUNT * 25)
- build_path = /obj/item/ammo_box/advanced/s12gauge/magnum
- category = list(
- RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO
- )
- departmental_flags = DEPARTMENT_BITFLAG_SECURITY
-
-/datum/design/advancedgaugeboxes_express
- name = "12 Gauge Advanced Express Ammunition Box(Very Lethal)"
- desc = "A 12 gauge ammunition box for shotgun shells."
- id = "s12g_express"
- build_type = PROTOLATHE | AWAY_LATHE
- materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 25, /datum/material/plastic = SHEET_MATERIAL_AMOUNT * 25)
- build_path = /obj/item/ammo_box/advanced/s12gauge/express
- category = list(
- RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO
- )
- departmental_flags = DEPARTMENT_BITFLAG_SECURITY
-
/datum/design/advancedgaugeboxes_beanbagslug
name = "12 Gauge Advanced Bean Bag Ammunition Box(Less-Lethal)"
desc = "A 12 gauge ammunition box for shotgun shells."
@@ -263,18 +159,6 @@
)
departmental_flags = DEPARTMENT_BITFLAG_SECURITY
-/datum/design/advancedgaugeboxes_ion
- name = "12 Gauge Advanced Scatter Ion Ammunition Box(Very Lethal - Silicon)"
- desc = "A 12 gauge ammunition box for shotgun shells."
- id = "s12g_ion"
- build_type = PROTOLATHE | AWAY_LATHE
- materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 15, /datum/material/plastic = SMALL_MATERIAL_AMOUNT * 15, /datum/material/gold = SHEET_MATERIAL_AMOUNT * 10)
- build_path = /obj/item/ammo_box/advanced/s12gauge/scatterion
- category = list(
- RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO
- )
- departmental_flags = DEPARTMENT_BITFLAG_SECURITY
-
/datum/design/advancedgaugeboxes_hunting
name = "12 Gauge Advanced Hunting Slug Ammunition Box(Less Lethal)"
desc = "A 12 gauge ammunition box for shotgun shells."
@@ -287,8 +171,6 @@
)
departmental_flags = DEPARTMENT_BITFLAG_SECURITY | DEPARTMENT_BITFLAG_CARGO
-// Misc Gun Stuff
-
/datum/design/m9mm_mag
name = "9x25mm Mk2 Pistol Magazine(Lethal)"
desc = "A standard magazine for pistol using 9x25mm Mk2."
@@ -331,66 +213,6 @@
)
departmental_flags = DEPARTMENT_BITFLAG_SECURITY
-/datum/design/m9mm_mag_rubber
- name = "9x25mm Mk2 Pistol Magazine(Less-Lethal)"
- desc = "A standard magazine for pistol using 9x25mm Mk2."
- id = "m9mm_mag_rubber"
- build_type = PROTOLATHE | AWAY_LATHE
- materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 5)
- build_path = /obj/item/ammo_box/magazine/m9mm/rubber
- category = list(
- RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO
- )
- departmental_flags = DEPARTMENT_BITFLAG_SECURITY
-
-/datum/design/m9mm_mag_ihdf
- name = "9x25mm Mk2 Pistol Magazine(Non-Lethal)"
- desc = "A standard magazine for pistol using 9x25mm Mk2."
- id = "m9mm_mag_ihdf"
- build_type = PROTOLATHE | AWAY_LATHE
- materials = list(/datum/material/plastic = SHEET_MATERIAL_AMOUNT * 5)
- build_path = /obj/item/ammo_box/magazine/m9mm/ihdf
- category = list(
- RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO
- )
- departmental_flags = DEPARTMENT_BITFLAG_SECURITY
-
-/datum/design/m9mm_mag_ext
- name = "9x25mm Mk2 Extended Pistol Magazine(Lethal)"
- desc = "A standard magazine for pistol using 9x25mm Mk2."
- id = "m9mm_mag_ext"
- build_type = PROTOLATHE | AWAY_LATHE
- materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 38)
- build_path = /obj/item/ammo_box/magazine/m9mm/stendo
- category = list(
- RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO
- )
- departmental_flags = DEPARTMENT_BITFLAG_SECURITY
-
-/datum/design/m9mm_mag_ext_rubber
- name = "9x25mm Mk2 Extended Rubber Pistol Magazine(Less-Lethal)"
- desc = "A standard magazine for pistol using 9x25mm Mk2."
- id = "m9mm_mag_ext_b"
- build_type = PROTOLATHE | AWAY_LATHE
- materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 38)
- build_path = /obj/item/ammo_box/magazine/m9mm/stendo/rubber
- category = list(
- RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO
- )
- departmental_flags = DEPARTMENT_BITFLAG_SECURITY
-
-/datum/design/m9mm_mag_ext_hp
- name = "9x25mm Mk2 Extended Hollow Point Pistol Magazine(Very Lethal)"
- desc = "A standard magazine for pistol using 9x25mm Mk2."
- id = "m9mm_mag_ext_hp"
- build_type = PROTOLATHE | AWAY_LATHE
- materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 38)
- build_path = /obj/item/ammo_box/magazine/m9mm/stendo/hp
- category = list(
- RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO
- )
- departmental_flags = DEPARTMENT_BITFLAG_SECURITY
-
/datum/design/m45_mag
name = ".460 Ceres Pistol Magazine(Lethal)"
desc = "A standard magazine for pistol using .460 Ceres."
@@ -402,115 +224,3 @@
RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO
)
departmental_flags = DEPARTMENT_BITFLAG_SECURITY
-
-/datum/design/casingfor457
- name = ".457 Government Casing (Very lethal)"
- desc = "A bullet casing for .457 Government."
- id = "c457_casing"
- build_type = PROTOLATHE | AWAY_LATHE
- materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 5, /datum/material/titanium = SHEET_MATERIAL_AMOUNT * 5)
- build_path = /obj/item/ammo_casing/c457govt
- category = list(
- RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO
- )
- departmental_flags = DEPARTMENT_BITFLAG_SECURITY
-
-/datum/design/c10mm_r
- name = "10mm Auto Speedloader Rubber (Less lethal)"
- desc = "A speedloader in 10mm Auto."
- id = "c10mm_r"
- build_type = PROTOLATHE | AWAY_LATHE
- materials = list(/datum/material/plastic = SHEET_MATERIAL_AMOUNT * 10, /datum/material/iron = SHEET_MATERIAL_AMOUNT * 15)
- build_path = /obj/item/ammo_box/c10mm/speedloader/rubber
- category = list(
- RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO
- )
- departmental_flags = DEPARTMENT_BITFLAG_SECURITY
-
-/datum/design/c10mm_rl
- name = "10mm Auto Speedloader (lethal)"
- desc = "A speedloader in 10mm Auto."
- id = "c10mm_rl"
- build_type = PROTOLATHE | AWAY_LATHE
- materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 15)
- build_path = /obj/item/ammo_box/c10mm/speedloader
- category = list(
- RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO
- )
- departmental_flags = DEPARTMENT_BITFLAG_SECURITY
-
-/datum/design/c10mm_rihdf
- name = "10mm Auto Speedloader IHDF (non-lethal)"
- desc = "A speedloader in 10mm Auto."
- id = "c10mm_rihdf"
- build_type = PROTOLATHE | AWAY_LATHE
- materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 5, /datum/material/plastic = SHEET_MATERIAL_AMOUNT * 15)
- build_path = /obj/item/ammo_box/c10mm/speedloader/ihdf
- category = list(
- RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO
- )
- departmental_flags = DEPARTMENT_BITFLAG_SECURITY
-
-/datum/design/c10mm_rincin
- name = "10mm Auto Speedloader Fireshot (Lethal)"
- desc = "A speedloader in 10mm Auto."
- id = "c10mm_rincin"
- build_type = PROTOLATHE | AWAY_LATHE
- materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 5, /datum/material/plasma = SHEET_MATERIAL_AMOUNT * 15)
- build_path = /obj/item/ammo_box/c10mm/speedloader/fire
- category = list(
- RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO
- )
- departmental_flags = DEPARTMENT_BITFLAG_SECURITY
-
-/datum/design/c10mm_rhp
- name = "10mm Auto Speedloader Hollow Point (Very Lethal)"
- desc = "A speedloader in 10mm Auto."
- id = "c10mm_rhp"
- build_type = PROTOLATHE | AWAY_LATHE
- materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 5, /datum/material/titanium = SHEET_MATERIAL_AMOUNT * 15)
- build_path = /obj/item/ammo_box/c10mm/speedloader/hp
- category = list(
- RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO
- )
- departmental_flags = DEPARTMENT_BITFLAG_SECURITY
-
-/datum/design/c10mm_rap
- name = "10mm Auto Speedloader Armor Piercing (Very Lethal)"
- desc = "A speedloader in 10mm Auto."
- id = "c10mm_rap"
- build_type = PROTOLATHE | AWAY_LATHE
- materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 5, /datum/material/silver = SHEET_MATERIAL_AMOUNT * 15)
- build_path = /obj/item/ammo_box/c10mm/speedloader/ap
- category = list(
- RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO
- )
- departmental_flags = DEPARTMENT_BITFLAG_SECURITY
-
-//Conversion Kit
-
-/datum/design/sol_rifle_carbine_kit
- name = "Sol Carbine Conversion Part Kit(Very Lethal)"
- desc = "The kit to brutalise your functional battle rifle into a short carbine, ideal for close quarter."
- id = "sol_rifle_carbine_gun"
- build_type = PROTOLATHE | AWAY_LATHE
- materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 5, /datum/material/glass =SHEET_MATERIAL_AMOUNT, /datum/material/plastic =SHEET_MATERIAL_AMOUNT * 3.5, /datum/material/titanium =HALF_SHEET_MATERIAL_AMOUNT)
- build_path = /obj/item/weaponcrafting/gunkit/sol_rifle_carbine_kit
- category = list(
- RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_KITS
- )
- departmental_flags = DEPARTMENT_BITFLAG_SECURITY
- autolathe_exportable = FALSE
-
-/datum/design/sol_bolt_to_rifle
- name = "Sol Battle rifle Conversion Part Kit(Very Lethal)"
- desc = "The kit to brutalise your functional bolt action rifle into one suitable for sustained fire."
- id = "sol_bolt_to_rifle"
- build_type = PROTOLATHE | AWAY_LATHE
- materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 5, /datum/material/glass =SHEET_MATERIAL_AMOUNT, /datum/material/plastic =SHEET_MATERIAL_AMOUNT * 3.5, /datum/material/titanium =HALF_SHEET_MATERIAL_AMOUNT)
- build_path = /obj/item/weaponcrafting/gunkit/sol_bolt_to_rifle
- category = list(
- RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_KITS
- )
- departmental_flags = DEPARTMENT_BITFLAG_SECURITY
- autolathe_exportable = FALSE
diff --git a/modular_zubbers/code/modules/research/techweb/all_nodes.dm b/modular_zubbers/code/modules/research/techweb/all_nodes.dm
index 50dddf85d70..54211a88650 100644
--- a/modular_zubbers/code/modules/research/techweb/all_nodes.dm
+++ b/modular_zubbers/code/modules/research/techweb/all_nodes.dm
@@ -128,18 +128,13 @@
)
/datum/techweb_node/riot_supression/New()
- design_ids += "wt550_ammo_rubber"
- design_ids += "wt550_ammo_flathead"
- design_ids += "sol35_shortmag"
- design_ids += "m45_mag"
- design_ids += "s12g_hornet"
- design_ids += "s12g_antitide"
design_ids += "s12g_rubber"
design_ids += "s12g_bslug"
+ design_ids += "s12g_br"
design_ids += "s12g_incinslug"
design_ids += "wt550_ammo_normal"
- design_ids += "sol35_shortextmag"
- design_ids += "sol40_riflemag"
+ design_ids += "m9mm_mag"
+ design_ids += "m45_mag"
design_ids += "solgrenade_mag"
. = ..()
@@ -152,8 +147,6 @@
design_ids -= "mag_autorifle_ap"
design_ids -= "mag_autorifle_ic"
design_ids += "wt550_ammo_incendiary"
- design_ids += "s12g_magnum"
- design_ids += "s12g_express"
design_ids += "mod_mind_transfer"
. = ..()
diff --git a/modular_zubbers/code/modules/security/security_glock/ammo.dm b/modular_zubbers/code/modules/security/security_glock/ammo.dm
deleted file mode 100644
index a1e55aefd01..00000000000
--- a/modular_zubbers/code/modules/security/security_glock/ammo.dm
+++ /dev/null
@@ -1,35 +0,0 @@
-/obj/projectile/bullet/c9mm/flathead
- name = "9x25mm flathead bullet"
-
- damage = 24
- stamina = 5 //Knocks the wind out of you.
-
- wound_bonus = CANT_WOUND
- exposed_wound_bonus = CANT_WOUND
-
- weak_against_armour = TRUE
- sharpness = NONE
- shrapnel_type = null
- embed_type = null
-
-
-/obj/item/ammo_casing/c9mm/flathead
- name = "9x25mm Mk.12 flathead bullet casing"
- desc = "A modern 9x25mm Mk.12 flathead bullet casing."
- projectile_type = /obj/projectile/bullet/c9mm/flathead
-
-
-/obj/item/ammo_box/magazine/m9mm/flathead //m9mm is not a typo
- name = "pistol magazine (9x25mm flathead)"
- desc = "A gun magazine. Loaded with lethal rounds with flathead tips."
- ammo_type = /obj/item/ammo_casing/c9mm/flathead
-
-/obj/item/ammo_box/magazine/m9mm/rubber //m9mm is not a typo
- name = "pistol magazine (9x25mm rubber)"
- desc = "A gun magazine. Loaded with less-than-lethal rounds with rubber tips."
- ammo_type = /obj/item/ammo_casing/c9mm/rubber
-
-
-/obj/item/ammo_box/c9mm/flathead
- name = "9x25mm flathead box"
- ammo_type = /obj/item/ammo_casing/c9mm/flathead
diff --git a/modular_zubbers/code/modules/security/security_glock/cargo.dm b/modular_zubbers/code/modules/security/security_glock/cargo.dm
index 914b9863a39..95f4bc30e77 100644
--- a/modular_zubbers/code/modules/security/security_glock/cargo.dm
+++ b/modular_zubbers/code/modules/security/security_glock/cargo.dm
@@ -24,13 +24,3 @@
cost = CARGO_CRATE_VALUE * 4
contains = list(/obj/item/firing_pin/alert_level = 4)
crate_name = "alert level firing pin crate"
-
-/datum/supply_pack/science/protean_organs
- name = "Protean Organs"
- desc = "Contains two sets of organs for Protean crewmembers."
- cost = CARGO_CRATE_VALUE * 10 // Not cheap
- contains = list(/obj/item/organ/stomach/protean = 2, /obj/item/organ/heart/protean = 2)
- crate_name = "protean organs"
- access = ACCESS_ROBOTICS
- access_view = ACCESS_ROBOTICS
- crate_type = /obj/structure/closet/crate/secure/science/robo
diff --git a/modular_zubbers/code/modules/silicons/borgs/code/robot_model.dm b/modular_zubbers/code/modules/silicons/borgs/code/robot_model.dm
index 1ddbdfee201..15d41f51184 100644
--- a/modular_zubbers/code/modules/silicons/borgs/code/robot_model.dm
+++ b/modular_zubbers/code/modules/silicons/borgs/code/robot_model.dm
@@ -219,7 +219,8 @@
"Myomer" = list(
SKIN_ICON_STATE = "myomer-sci",
SKIN_ICON = CYBORG_ICON_SCI_MYOMER,
- SKIN_FEATURES = list(TRAIT_R_UNIQUEPANEL, TRAIT_R_WIDE, TRAIT_R_HAS_UNIQUE_RESTING_LIGHTS)
+ SKIN_FEATURES = list(TRAIT_R_UNIQUEPANEL, TRAIT_R_WIDE, TRAIT_R_HAS_UNIQUE_RESTING_LIGHTS),
+ MYOMER_HAT_OFFSET
),
)
@@ -327,7 +328,8 @@
"Myomer" = list(
SKIN_ICON_STATE = "myomer-med",
SKIN_ICON = CYBORG_ICON_MED_MYOMER,
- SKIN_FEATURES = list(TRAIT_R_UNIQUEPANEL, TRAIT_R_WIDE, TRAIT_R_HAS_UNIQUE_RESTING_LIGHTS)
+ SKIN_FEATURES = list(TRAIT_R_UNIQUEPANEL, TRAIT_R_WIDE, TRAIT_R_HAS_UNIQUE_RESTING_LIGHTS),
+ MYOMER_HAT_OFFSET
),
"Dragon" = list(
SKIN_ICON_STATE = "dragon-med",
@@ -392,7 +394,8 @@
"Myomer" = list(
SKIN_ICON_STATE = "myomer-engi",
SKIN_ICON = CYBORG_ICON_ENGI_MYOMER,
- SKIN_FEATURES = list(TRAIT_R_UNIQUEPANEL, TRAIT_R_WIDE, TRAIT_R_HAS_UNIQUE_RESTING_LIGHTS)
+ SKIN_FEATURES = list(TRAIT_R_UNIQUEPANEL, TRAIT_R_WIDE, TRAIT_R_HAS_UNIQUE_RESTING_LIGHTS),
+ MYOMER_HAT_OFFSET
),
"Dragon" = list(
SKIN_ICON_STATE = "dragon-engi",
@@ -447,7 +450,8 @@
"Myomer" = list(
SKIN_ICON_STATE = "myomer-jani",
SKIN_ICON = CYBORG_ICON_JANI_MYOMER,
- SKIN_FEATURES = list(TRAIT_R_UNIQUEPANEL, TRAIT_R_WIDE, TRAIT_R_HAS_UNIQUE_RESTING_LIGHTS)
+ SKIN_FEATURES = list(TRAIT_R_UNIQUEPANEL, TRAIT_R_WIDE, TRAIT_R_HAS_UNIQUE_RESTING_LIGHTS),
+ MYOMER_HAT_OFFSET
),
"Dragon" = list(
SKIN_ICON_STATE = "dragon-jani",
@@ -526,7 +530,8 @@
"Myomer" = list(
SKIN_ICON_STATE = "myomer-mine",
SKIN_ICON = CYBORG_ICON_MINING_MYOMER,
- SKIN_FEATURES = list(TRAIT_R_UNIQUEPANEL, TRAIT_R_WIDE, TRAIT_R_HAS_UNIQUE_RESTING_LIGHTS)
+ SKIN_FEATURES = list(TRAIT_R_UNIQUEPANEL, TRAIT_R_WIDE, TRAIT_R_HAS_UNIQUE_RESTING_LIGHTS),
+ MYOMER_HAT_OFFSET
),
"Dragon" = list(
SKIN_ICON_STATE = "dragon-mining",
@@ -591,7 +596,8 @@
"Myomer" = list(
SKIN_ICON_STATE = "myomer-sec",
SKIN_ICON = CYBORG_ICON_SEC_MYOMER,
- SKIN_FEATURES = list(TRAIT_R_UNIQUEPANEL, TRAIT_R_WIDE, TRAIT_R_HAS_UNIQUE_RESTING_LIGHTS)
+ SKIN_FEATURES = list(TRAIT_R_UNIQUEPANEL, TRAIT_R_WIDE, TRAIT_R_HAS_UNIQUE_RESTING_LIGHTS),
+ MYOMER_HAT_OFFSET
),
"Dragon" = list(
SKIN_ICON_STATE = "dragon-sec",
@@ -668,7 +674,8 @@
"Myomer" = list(
SKIN_ICON_STATE = "myomer-pk",
SKIN_ICON = CYBORG_ICON_PK_MYOMER,
- SKIN_FEATURES = list(TRAIT_R_UNIQUEPANEL, TRAIT_R_WIDE, TRAIT_R_HAS_UNIQUE_RESTING_LIGHTS)
+ SKIN_FEATURES = list(TRAIT_R_UNIQUEPANEL, TRAIT_R_WIDE, TRAIT_R_HAS_UNIQUE_RESTING_LIGHTS),
+ MYOMER_HAT_OFFSET
),
"Dragon" = list(
SKIN_ICON_STATE = "dragon-pk",
@@ -750,7 +757,8 @@
"Myomer" = list(
SKIN_ICON_STATE = "myomer-serv",
SKIN_ICON = CYBORG_ICON_SERVICE_MYOMER,
- SKIN_FEATURES = list(TRAIT_R_UNIQUEPANEL, TRAIT_R_WIDE, TRAIT_R_HAS_UNIQUE_RESTING_LIGHTS)
+ SKIN_FEATURES = list(TRAIT_R_UNIQUEPANEL, TRAIT_R_WIDE, TRAIT_R_HAS_UNIQUE_RESTING_LIGHTS),
+ MYOMER_HAT_OFFSET
),
"Dragon" = list(
SKIN_ICON_STATE = "dragon-serv",
@@ -795,13 +803,19 @@
"Myomer" = list(
SKIN_ICON_STATE = "myomer-cargo",
SKIN_ICON = CYBORG_ICON_CARGO_MYOMER,
- SKIN_FEATURES = list(TRAIT_R_UNIQUEPANEL, TRAIT_R_WIDE, TRAIT_R_HAS_UNIQUE_RESTING_LIGHTS)
+ SKIN_FEATURES = list(TRAIT_R_UNIQUEPANEL, TRAIT_R_WIDE, TRAIT_R_HAS_UNIQUE_RESTING_LIGHTS),
+ MYOMER_HAT_OFFSET
),
"Dragon" = list(
SKIN_ICON_STATE = "dragon-cargo",
SKIN_ICON = CYBORG_ICON_CARGO_DRAGONBORG,
SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUEPANEL, TRAIT_R_WIDE, TRAIT_R_HAS_UNIQUE_RESTING_LIGHTS, TRAIT_R_EXPANDER_BLOCKED)
),
+ "Wage Cage" = list(SKIN_ICON_STATE = CYBORG_ICON_TYPE_WAGECAGE,
+ SKIN_ICON = CYBORG_ICON_CARGO_WAGECAGE,
+ SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_TALL),
+ WAGECAGE_HAT_OFFSET
+ ),
)
// Syndicate jack borgs
@@ -871,7 +885,8 @@
"Myomer" = list(
SKIN_ICON_STATE = "myomer-syndi",
SKIN_ICON = CYBORG_ICON_SYNDI_MYOMER,
- SKIN_FEATURES = list(TRAIT_R_UNIQUEPANEL, TRAIT_R_WIDE, TRAIT_R_HAS_UNIQUE_RESTING_LIGHTS)
+ SKIN_FEATURES = list(TRAIT_R_UNIQUEPANEL, TRAIT_R_WIDE, TRAIT_R_HAS_UNIQUE_RESTING_LIGHTS),
+ MYOMER_HAT_OFFSET
),
"Dragon" = list(
SKIN_ICON_STATE = "dragon-syndi",
@@ -929,7 +944,8 @@
"Myomer" = list(
SKIN_ICON_STATE = "myomer-syndi",
SKIN_ICON = CYBORG_ICON_SYNDI_MYOMER,
- SKIN_FEATURES = list(TRAIT_R_UNIQUEPANEL, TRAIT_R_WIDE, TRAIT_R_HAS_UNIQUE_RESTING_LIGHTS)
+ SKIN_FEATURES = list(TRAIT_R_UNIQUEPANEL, TRAIT_R_WIDE, TRAIT_R_HAS_UNIQUE_RESTING_LIGHTS),
+ MYOMER_HAT_OFFSET
),
"Dragon" = list(
SKIN_ICON_STATE = "dragon-syndi",
@@ -989,7 +1005,8 @@
"Myomer" = list(
SKIN_ICON_STATE = "myomer-syndi",
SKIN_ICON = CYBORG_ICON_SYNDI_MYOMER,
- SKIN_FEATURES = list(TRAIT_R_UNIQUEPANEL, TRAIT_R_WIDE, TRAIT_R_HAS_UNIQUE_RESTING_LIGHTS)
+ SKIN_FEATURES = list(TRAIT_R_UNIQUEPANEL, TRAIT_R_WIDE, TRAIT_R_HAS_UNIQUE_RESTING_LIGHTS),
+ MYOMER_HAT_OFFSET
),
"Dragon" = list(
SKIN_ICON_STATE = "dragon-syndi",
@@ -1044,7 +1061,8 @@
"Myomer" = list(
SKIN_ICON_STATE = "myomer-syndi",
SKIN_ICON = CYBORG_ICON_SYNDI_MYOMER,
- SKIN_FEATURES = list(TRAIT_R_UNIQUEPANEL, TRAIT_R_WIDE, TRAIT_R_HAS_UNIQUE_RESTING_LIGHTS)
+ SKIN_FEATURES = list(TRAIT_R_UNIQUEPANEL, TRAIT_R_WIDE, TRAIT_R_HAS_UNIQUE_RESTING_LIGHTS),
+ MYOMER_HAT_OFFSET
),
"Dragon" = list(
SKIN_ICON_STATE = "dragon-syndi",
@@ -1097,7 +1115,8 @@
"Myomer" = list(
SKIN_ICON_STATE = "myomer-ninja",
SKIN_ICON = CYBORG_ICON_NINJA_MYOMER,
- SKIN_FEATURES = list(TRAIT_R_UNIQUEPANEL, TRAIT_R_WIDE, TRAIT_R_HAS_UNIQUE_RESTING_LIGHTS)
+ SKIN_FEATURES = list(TRAIT_R_UNIQUEPANEL, TRAIT_R_WIDE, TRAIT_R_HAS_UNIQUE_RESTING_LIGHTS),
+ MYOMER_HAT_OFFSET
),
"Dragon" = list(
SKIN_ICON_STATE = "dragon-ninja",
@@ -1125,7 +1144,8 @@
"Myomer" = list(
SKIN_ICON_STATE = "myomer-ninja",
SKIN_ICON = CYBORG_ICON_NINJA_MYOMER,
- SKIN_FEATURES = list(TRAIT_R_UNIQUEPANEL, TRAIT_R_WIDE, TRAIT_R_HAS_UNIQUE_RESTING_LIGHTS)
+ SKIN_FEATURES = list(TRAIT_R_UNIQUEPANEL, TRAIT_R_WIDE, TRAIT_R_HAS_UNIQUE_RESTING_LIGHTS),
+ MYOMER_HAT_OFFSET
),
"Dragon" = list(
SKIN_ICON_STATE = "dragon-ninja",
diff --git a/modular_zubbers/code/modules/silicons/borgs/sprites/wagecage.dmi b/modular_zubbers/code/modules/silicons/borgs/sprites/wagecage.dmi
new file mode 100644
index 00000000000..be95b608ead
Binary files /dev/null and b/modular_zubbers/code/modules/silicons/borgs/sprites/wagecage.dmi differ
diff --git a/modular_zubbers/code/modules/storyteller/storytellers/tellers/storyteller_7_enemy.dm b/modular_zubbers/code/modules/storyteller/storytellers/tellers/storyteller_6_enemy.dm
similarity index 100%
rename from modular_zubbers/code/modules/storyteller/storytellers/tellers/storyteller_7_enemy.dm
rename to modular_zubbers/code/modules/storyteller/storytellers/tellers/storyteller_6_enemy.dm
diff --git a/modular_zubbers/code/modules/storyteller/storytellers/tellers/storyteller_6_house.dm b/modular_zubbers/code/modules/storyteller/storytellers/tellers/storyteller_6_house.dm
deleted file mode 100644
index 701797f907e..00000000000
--- a/modular_zubbers/code/modules/storyteller/storytellers/tellers/storyteller_6_house.dm
+++ /dev/null
@@ -1,16 +0,0 @@
-/datum/storyteller/house
- name = "The House (Unpredictable Intensity)"
- desc = "The House gives permission for admins to drive the adminbus straight into the station. \
- All weights set to one at Medium - Low intensity."
- welcome_text = "The House always wins."
- track_data = /datum/storyteller_data/tracks/fragile
- votable = TRUE
-
- population_min = 50
- storyteller_type = STORYTELLER_TYPE_INTENSE
-
-// All the weights are the same to the house
-/datum/storyteller/house/calculate_weights(track)
- for(var/datum/round_event_control/event as anything in SSgamemode.event_pools[track])
- if(event.weight)
- event.calculated_weight = 1
diff --git a/modular_zubbers/code/modules/syndicate_offstation/equipment_items/suitstorage.dm b/modular_zubbers/code/modules/syndicate_offstation/equipment_items/suitstorage.dm
index a9cb7b439d1..2f3b23c5e1a 100644
--- a/modular_zubbers/code/modules/syndicate_offstation/equipment_items/suitstorage.dm
+++ b/modular_zubbers/code/modules/syndicate_offstation/equipment_items/suitstorage.dm
@@ -61,3 +61,13 @@
/obj/item/mod/module/hat_stabilizer/syndicate,
/obj/item/mod/module/quick_cuff,
)
+
+//Empty infiltrator MOD for the Syndicate Boarder preview
+/obj/item/mod/control/pre_equipped/empty/infiltrator/preview_only
+ theme = /datum/mod_theme/infiltrator/preview_only
+
+//Making this so it has no modules
+/datum/mod_theme/infiltrator/preview_only
+ inbuilt_modules = list()
+ slot_flags = ITEM_SLOT_BACK
+
diff --git a/modular_zubbers/code/modules/syndicate_offstation/selection_beacons/weapon_redemption.dm b/modular_zubbers/code/modules/syndicate_offstation/selection_beacons/weapon_redemption.dm
index a607a0b3d56..bf1c769057b 100644
--- a/modular_zubbers/code/modules/syndicate_offstation/selection_beacons/weapon_redemption.dm
+++ b/modular_zubbers/code/modules/syndicate_offstation/selection_beacons/weapon_redemption.dm
@@ -41,7 +41,6 @@
var/static/list/selectable_gun_types = list(
"M90-GL" = /obj/item/storage/toolbox/guncase/m90gl,
"Bulldog" = /obj/item/storage/toolbox/guncase/bulldog,
- "Stolen Revolver" = /obj/item/storage/toolbox/guncase/skyrat/hos_revolver,
"Energy Sword" = /obj/item/melee/energy/sword/saber,
)
diff --git a/modular_zubbers/code/modules/tarkon/code/cameras.dm b/modular_zubbers/code/modules/tarkon/code/cameras.dm
new file mode 100644
index 00000000000..2e6e7a7e161
--- /dev/null
+++ b/modular_zubbers/code/modules/tarkon/code/cameras.dm
@@ -0,0 +1,6 @@
+/obj/machinery/camera/preset/tarkon
+ name = "Port Tarkon Camera"
+ desc = "A Tarkon Industries branded camera. Perhaps you should smile and wave to it."
+ network = list(CAMERANET_NETWORK_TARKON)
+
+MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/camera/preset/tarkon, 0)
diff --git a/modular_zubbers/code/modules/uplink/uplink_devices.dm b/modular_zubbers/code/modules/uplink/uplink_devices.dm
index 81ee42201e0..52aab639a7c 100644
--- a/modular_zubbers/code/modules/uplink/uplink_devices.dm
+++ b/modular_zubbers/code/modules/uplink/uplink_devices.dm
@@ -1,4 +1,4 @@
/obj/item/uplink/standard
-/obj/item/uplink/standard/Initialize(mapload, owner, tc_amount = 25, datum/uplink_handler/uplink_handler_override = null)
+/obj/item/uplink/standard/Initialize(mapload, owner, tc_amount = 20, datum/uplink_handler/uplink_handler_override = null)
. = ..()
diff --git a/modular_zubbers/code/modules/vending/games.dm b/modular_zubbers/code/modules/vending/games.dm
index 8a3f8331e44..580127003f0 100644
--- a/modular_zubbers/code/modules/vending/games.dm
+++ b/modular_zubbers/code/modules/vending/games.dm
@@ -25,6 +25,7 @@
/obj/item/toy/plush/skyrat/plushie_syntax1112 = 3,
/obj/item/toy/plush/moth/lovers = 3,
/obj/item/toy/plush/goatplushie = 3,
+ /obj/item/toy/plush/sunny_plush = 3,
/obj/item/toy/plush/chirp_plush = 3,
/obj/item/toy/plush/bigdeer = 3,
/obj/item/toy/plush/bubbledragon = 3,
diff --git a/modular_zubbers/code/modules/vending/lustwish.dm b/modular_zubbers/code/modules/vending/lustwish.dm
index 6f4905a7f74..9120bb7ebe6 100644
--- a/modular_zubbers/code/modules/vending/lustwish.dm
+++ b/modular_zubbers/code/modules/vending/lustwish.dm
@@ -20,6 +20,7 @@
/obj/item/clothing/suit/jacket/tailcoat = 6,
/obj/item/clothing/under/costume/loincloth/sensor = 6,
/obj/item/clothing/under/costume/loincloth/cloth/sensor = 6,
+ /obj/item/clothing/shoes/jackboots/toeless = 6,
)
)
)
diff --git a/modular_zubbers/icons/customization/body_markings/markings.dmi b/modular_zubbers/icons/customization/body_markings/markings.dmi
index 3f8eb3b262d..53a8a09f377 100644
Binary files a/modular_zubbers/icons/customization/body_markings/markings.dmi and b/modular_zubbers/icons/customization/body_markings/markings.dmi differ
diff --git a/modular_zubbers/icons/customization/ears.dmi b/modular_zubbers/icons/customization/ears.dmi
index 99ea97a84c4..fcf97d26e8d 100644
Binary files a/modular_zubbers/icons/customization/ears.dmi and b/modular_zubbers/icons/customization/ears.dmi differ
diff --git a/modular_zubbers/icons/customization/fluff.dmi b/modular_zubbers/icons/customization/fluff.dmi
index b4f996cc41d..8f21e55bc40 100644
Binary files a/modular_zubbers/icons/customization/fluff.dmi and b/modular_zubbers/icons/customization/fluff.dmi differ
diff --git a/modular_zubbers/icons/customization/horns_big.dmi b/modular_zubbers/icons/customization/horns_big.dmi
index 1ed28d02efd..4b81b446257 100644
Binary files a/modular_zubbers/icons/customization/horns_big.dmi and b/modular_zubbers/icons/customization/horns_big.dmi differ
diff --git a/modular_zubbers/icons/customization/snouts.dmi b/modular_zubbers/icons/customization/snouts.dmi
index 2bc5686f00b..2549cbc93d1 100644
Binary files a/modular_zubbers/icons/customization/snouts.dmi and b/modular_zubbers/icons/customization/snouts.dmi differ
diff --git a/modular_zubbers/icons/customization/tails.dmi b/modular_zubbers/icons/customization/tails.dmi
index 0c420a35112..214c4f3bbe4 100644
Binary files a/modular_zubbers/icons/customization/tails.dmi and b/modular_zubbers/icons/customization/tails.dmi differ
diff --git a/modular_zubbers/icons/mob/clothing/feet/feet.dmi b/modular_zubbers/icons/mob/clothing/feet/feet.dmi
index b06a524efc3..f636efd44db 100644
Binary files a/modular_zubbers/icons/mob/clothing/feet/feet.dmi and b/modular_zubbers/icons/mob/clothing/feet/feet.dmi differ
diff --git a/modular_zubbers/icons/mob/clothing/feet/feet_digi.dmi b/modular_zubbers/icons/mob/clothing/feet/feet_digi.dmi
index a34fca5045a..be304fb7eef 100644
Binary files a/modular_zubbers/icons/mob/clothing/feet/feet_digi.dmi and b/modular_zubbers/icons/mob/clothing/feet/feet_digi.dmi differ
diff --git a/modular_zubbers/icons/obj/clothing/shoes.dmi b/modular_zubbers/icons/obj/clothing/shoes.dmi
index cd2619fce68..2699957800e 100644
Binary files a/modular_zubbers/icons/obj/clothing/shoes.dmi and b/modular_zubbers/icons/obj/clothing/shoes.dmi differ
diff --git a/modular_skyrat/modules/ammo_workbench/icons/ammo_workbench.dmi b/modular_zubbers/icons/obj/structures/ammo_workbench.dmi
similarity index 100%
rename from modular_skyrat/modules/ammo_workbench/icons/ammo_workbench.dmi
rename to modular_zubbers/icons/obj/structures/ammo_workbench.dmi
diff --git a/modular_zubbers/icons/obj/toys/plushes.dmi b/modular_zubbers/icons/obj/toys/plushes.dmi
index 14d1ebde9eb..0e246e33bd3 100644
Binary files a/modular_zubbers/icons/obj/toys/plushes.dmi and b/modular_zubbers/icons/obj/toys/plushes.dmi differ
diff --git a/modular_zubbers/master_files/code/game/machinery/dna_infuser/organ_sets/rat_organs.dm b/modular_zubbers/master_files/code/game/machinery/dna_infuser/organ_sets/rat_organs.dm
new file mode 100644
index 00000000000..457305e88fc
--- /dev/null
+++ b/modular_zubbers/master_files/code/game/machinery/dna_infuser/organ_sets/rat_organs.dm
@@ -0,0 +1,4 @@
+// Used to override eye color
+/obj/item/organ/eyes/night_vision/rat
+ eye_color_left = null // BUBBER EDIT REMOVAL
+ eye_color_right = null // BUBBER EDIT REMOVAL
diff --git a/modular_zubbers/master_files/code/modules/research/designs/weapon_designs.dm b/modular_zubbers/master_files/code/modules/research/designs/weapon_designs.dm
index 544ca9643c6..854224dcbf0 100644
--- a/modular_zubbers/master_files/code/modules/research/designs/weapon_designs.dm
+++ b/modular_zubbers/master_files/code/modules/research/designs/weapon_designs.dm
@@ -1,27 +1,3 @@
-/datum/design/wt550_ammo_rubber
- name = "WT-550/WT-551 Magazine (4.6x30mm Rubber-Tipped) (Less-Lethal)"
- desc = "A magazine for the WT-550/WT-551 Autorifle. Contains less-lethal rubber-tipped ammo."
- id = "wt550_ammo_rubber"
- build_type = PROTOLATHE | AWAY_LATHE
- materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 6)
- build_path = /obj/item/ammo_box/magazine/wt550m9/rubber
- category = list(
- RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO
- )
- departmental_flags = DEPARTMENT_BITFLAG_SECURITY
-
-/datum/design/wt550_ammo_flat
- name = "WT-550/WT-551 Magazine (4.6x30mm FlatHead) (Lethal)"
- desc = "A magazine for the WT-550/WT-551 Autorifle. Contains lethal surplus-tier flathead ammo."
- id = "wt550_ammo_flathead"
- build_type = PROTOLATHE | AWAY_LATHE
- materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 8)
- build_path = /obj/item/ammo_box/magazine/wt550m9/flathead
- category = list(
- RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO
- )
- departmental_flags = DEPARTMENT_BITFLAG_SECURITY
-
/datum/design/wt550_ammo
name = "WT-550/WT-551 Magazine (4.6x30mm Regular) (Lethal)"
desc = "A magazine for the WT-550/WT-551 Autorifle. Contains lethal regular ammo."
diff --git a/modular_skyrat/modules/ammo_workbench/code/ammo_workbench.dm b/modular_zubbers/modules/ammo_workbench/code/ammo_workbench.dm
similarity index 99%
rename from modular_skyrat/modules/ammo_workbench/code/ammo_workbench.dm
rename to modular_zubbers/modules/ammo_workbench/code/ammo_workbench.dm
index 92ba9ac9465..a0eb6f0e971 100644
--- a/modular_skyrat/modules/ammo_workbench/code/ammo_workbench.dm
+++ b/modular_zubbers/modules/ammo_workbench/code/ammo_workbench.dm
@@ -1,7 +1,7 @@
/obj/machinery/ammo_workbench
name = "ammunitions workbench"
desc = "A machine, somewhat akin to a lathe, made specifically for manufacturing ammunition. It has a slot for magazines, ammo boxes, clips... anything that holds ammo."
- icon = 'modular_skyrat/modules/ammo_workbench/icons/ammo_workbench.dmi'
+ icon = 'modular_zubbers/icons/obj/structures/ammo_workbench.dmi'
icon_state = "ammobench"
density = TRUE
use_power = IDLE_POWER_USE
diff --git a/modular_skyrat/modules/ammo_workbench/code/design_disks.dm b/modular_zubbers/modules/ammo_workbench/code/design_disks.dm
similarity index 100%
rename from modular_skyrat/modules/ammo_workbench/code/design_disks.dm
rename to modular_zubbers/modules/ammo_workbench/code/design_disks.dm
diff --git a/modular_zubbers/modules/taur_mechanics/accessible_storage.dm b/modular_zubbers/modules/taur_mechanics/accessible_storage.dm
index aa10eba8ce1..e429dc01526 100644
--- a/modular_zubbers/modules/taur_mechanics/accessible_storage.dm
+++ b/modular_zubbers/modules/taur_mechanics/accessible_storage.dm
@@ -25,6 +25,9 @@
/datum/component/accessable_storage/proc/mob_alt_clicked_on(mob/signal_source, mob/clicker)
SIGNAL_HANDLER
+ if (!clicker.can_perform_action(signal_source, ALLOW_RESTING | FORBID_TELEKINESIS_REACH)) // it would be funny but storage doesnt allow this for some reaosn
+ return CLICK_ACTION_BLOCKING
+
var/obj/item/item_parent = parent
item_parent.atom_storage?.open_storage(clicker, signal_source)
animate_target(signal_source)
diff --git a/modular_zubbers/modules/taur_mechanics/saddle_component.dm b/modular_zubbers/modules/taur_mechanics/saddle_component.dm
index a1d0ff2ee92..d3a0ad0ed24 100644
--- a/modular_zubbers/modules/taur_mechanics/saddle_component.dm
+++ b/modular_zubbers/modules/taur_mechanics/saddle_component.dm
@@ -50,6 +50,8 @@
if (!wearer_has_requisite_organ(signal_source))
var/obj/item/item_parent = parent
+ var/atom/move_target = get_turf(signal_source)
+ signal_source.temporarilyRemoveItemFromInventory(item_parent, TRUE, newloc = move_target)
item_parent.forceMove(get_turf(item_parent)) // force unequip
/// Signal handler for COMSIG_HUMAN_SADDLE_RIDE_ATTEMPT. Returns saddle_flags into the signal bitfield.
@@ -72,12 +74,5 @@
/datum/component/carbon_saddle/proc/wearer_has_requisite_organ(mob/living/carbon/target)
if (!istype(target))
return TRUE
-
- for (var/obj/item/organ/iter_organ as anything in target.organs)
- if (!istype(iter_organ, /obj/item/organ/taur_body))
- continue
- var/obj/item/organ/taur_body/taur_body = iter_organ
- if (taur_body.can_use_saddle)
- return TRUE
-
- return FALSE
+ var/obj/item/organ/taur_body/taur_body = target.get_organ_slot(ORGAN_SLOT_EXTERNAL_TAUR)
+ return istype(taur_body) && taur_body.can_use_saddle
diff --git a/modular_zubbers/modules/taur_mechanics/saddles.dm b/modular_zubbers/modules/taur_mechanics/saddles.dm
index 0cb3d7c3728..b8a17812a00 100644
--- a/modular_zubbers/modules/taur_mechanics/saddles.dm
+++ b/modular_zubbers/modules/taur_mechanics/saddles.dm
@@ -27,9 +27,6 @@
lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi'
-/obj/item/riding_saddle/leather/Initialize(mapload)
- . = ..()
-
/obj/item/riding_saddle/leather/peacekeeper
name = "peacekeeper saddle"
diff --git a/modular_zubbers/modules/taur_mechanics/taur_body.dm b/modular_zubbers/modules/taur_mechanics/taur_body.dm
index bd0e7934fc9..1230ea43b77 100644
--- a/modular_zubbers/modules/taur_mechanics/taur_body.dm
+++ b/modular_zubbers/modules/taur_mechanics/taur_body.dm
@@ -170,7 +170,7 @@
var/datum/bodypart_overlay/mutant/taur_body/overlay = bodypart_overlay
if(overlay.can_lay_down)
add_verb(receiver, /obj/item/organ/taur_body/proc/toggle_laying)
-
+ add_verb(receiver, /obj/item/organ/taur_body/proc/toggle_cropping)
/obj/item/organ/taur_body/on_mob_remove(mob/living/carbon/organ_owner, special, movement_flags)
var/obj/item/bodypart/leg/left/left_leg = organ_owner.get_bodypart(BODY_ZONE_L_LEG)
@@ -194,6 +194,7 @@
// We don't call `synchronize_bodytypes()` here, because it's already going to get called in the parent because `external_bodyshapes` has a value.
remove_verb(organ_owner, /obj/item/organ/taur_body/proc/toggle_laying)
+ remove_verb(organ_owner, /obj/item/organ/taur_body/proc/toggle_cropping)
return ..()
/obj/item/organ/taur_body/proc/get_riding_offset(oversized = FALSE)
@@ -254,3 +255,27 @@
playsound(owner, "bodyfall", 50, TRUE)
#undef LAYDOWN_COOLDOWN
+
+/obj/item/organ/taur_body/proc/toggle_cropping()
+ set category = "Taur"
+ set name = "Override Taur Cropping Settings"
+
+ var/mob/living/carbon/human/owner = src
+ if(!istype(owner))
+ return
+
+ var/obj/item/organ/taur_body/organ = owner.get_organ_by_type(/obj/item/organ/taur_body)
+ if(isnull(organ))
+ stack_trace("Taur cropping override down triggered without Taur organ")
+ return
+
+ if (!isnull(owner))
+ if (HAS_TRAIT(owner, TRAIT_TAUR_IGNORING_CROPPING))
+ REMOVE_TRAIT(owner, TRAIT_TAUR_IGNORING_CROPPING, TRAIT_SOURCE_TAURCROP)
+ else
+ ADD_TRAIT(owner, TRAIT_TAUR_IGNORING_CROPPING, TRAIT_SOURCE_TAURCROP)
+
+ var/setting_string = (HAS_TRAIT(owner, TRAIT_TAUR_IGNORING_CROPPING) ? "now ignoring cropping" : "no longer ignoring cropping")
+ balloon_alert(owner, setting_string)
+
+ owner.update_clothing(ITEM_SLOT_OCLOTHING|ITEM_SLOT_ICLOTHING) // the only items with taur cropping
diff --git a/strings/mouse_replacement.json b/strings/mouse_replacement.json
new file mode 100644
index 00000000000..e93af9d602c
--- /dev/null
+++ b/strings/mouse_replacement.json
@@ -0,0 +1,54 @@
+{
+ "mouse": {
+ "better": "cheddar",
+ "Better": "Cheddar",
+ "good": "gouda",
+ "Good": "Gouda",
+ "please": "cheese",
+ "Please": "Cheese",
+ "permission": "parmession",
+ "Permission": "Parmession",
+ "nice": "mice",
+ "Nice": "Mice",
+ "great": "grate",
+ "Great": "Grate",
+ "easy": "cheesy",
+ "monster": "munster",
+ "Monster": "Munster",
+ "speak": "squeak",
+ "Speak": "Squeak",
+ "apologies": "apolo-cheese",
+ "Apologies": "Apolo-cheese",
+ "sorry": "apolo-cheese",
+ "Sorry": "Apolo-cheese",
+ "vice": "mice",
+ "blue": "bleu",
+ "Blue": "Bleu",
+ "gotta": "gouda",
+ "Gotta": "Gouda",
+ "got to": "gouda",
+ "Got to": "gouda",
+ "pos": "paws",
+ "Pos": "Paws",
+ "case": "queso",
+ "curb": "curd",
+ "Curb": "Curd",
+ "ease": "cheese",
+ "Ease": "Cheese",
+ "disagree": "disabrie",
+ "Disagree": "Disabrie",
+ "be": "brie",
+ "Be": "Brie",
+ "wish": "swiss",
+ "Wish": "Swiss",
+ "sis": "swiss",
+ "Sis": "Swiss",
+ "not your": "nacho",
+ "Not your": "Nacho",
+ "shed a": "cheddar",
+ "house": "mouse",
+ "House": "Mouse",
+ "seek": "squeak",
+ "Seek": "Squeak"
+ }
+}
diff --git a/tgstation.dme b/tgstation.dme
index 3de603a953f..bf6f5e99a42 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -7292,8 +7292,6 @@
#include "modular_skyrat\modules\alt_vox\code\vox_sounds_hl1.dm"
#include "modular_skyrat\modules\alternative_job_titles\code\alt_job_titles.dm"
#include "modular_skyrat\modules\alternative_job_titles\code\job.dm"
-#include "modular_skyrat\modules\ammo_workbench\code\ammo_workbench.dm"
-#include "modular_skyrat\modules\ammo_workbench\code\design_disks.dm"
#include "modular_skyrat\modules\apc_arcing\code\apc.dm"
#include "modular_skyrat\modules\armaments\code\armament_component.dm"
#include "modular_skyrat\modules\armaments\code\armament_entries.dm"
@@ -7623,7 +7621,6 @@
#include "modular_skyrat\modules\company_imports\code\armament_datums\deforest_medical.dm"
#include "modular_skyrat\modules\company_imports\code\armament_datums\jarnsmiour.dm"
#include "modular_skyrat\modules\company_imports\code\armament_datums\kahraman_industries.dm"
-#include "modular_skyrat\modules\company_imports\code\armament_datums\micron_control_systems.dm"
#include "modular_skyrat\modules\company_imports\code\armament_datums\nri_military_surplus.dm"
#include "modular_skyrat\modules\company_imports\code\armament_datums\put_a_donk_on_it.dm"
#include "modular_skyrat\modules\company_imports\code\armament_datums\sol_defense.dm"
@@ -7639,7 +7636,6 @@
#include "modular_skyrat\modules\company_imports\code\objects\deforest\filled_organ_boxes.dm"
#include "modular_skyrat\modules\company_imports\code\objects\donk\donkfish_box.dm"
#include "modular_skyrat\modules\company_imports\code\objects\jarnsmiour\special_metals.dm"
-#include "modular_skyrat\modules\company_imports\code\objects\microstar\mcr_attachment_kits.dm"
#include "modular_skyrat\modules\company_imports\code\objects\nakamura_modsuits\plate_compression_tech.dm"
#include "modular_skyrat\modules\company_imports\code\objects\vitezstvi\ammo_boxes.dm"
#include "modular_skyrat\modules\connecting_computer\code\_computer.dm"
@@ -7769,10 +7765,8 @@
#include "modular_skyrat\modules\customization\modules\language\common.dm"
#include "modular_skyrat\modules\customization\modules\language\gutter.dm"
#include "modular_skyrat\modules\customization\modules\language\mothic.dm"
-#include "modular_skyrat\modules\customization\modules\language\panslavic.dm"
#include "modular_skyrat\modules\customization\modules\language\piratespeak.dm"
#include "modular_skyrat\modules\customization\modules\language\shadowtongue.dm"
-#include "modular_skyrat\modules\customization\modules\language\siiktajr.dm"
#include "modular_skyrat\modules\customization\modules\language\skrell.dm"
#include "modular_skyrat\modules\customization\modules\language\spacer.dm"
#include "modular_skyrat\modules\customization\modules\language\te_velu_akko.dm"
@@ -7829,7 +7823,6 @@
#include "modular_skyrat\modules\customization\modules\mob\living\carbon\human\species\mushpeople.dm"
#include "modular_skyrat\modules\customization\modules\mob\living\carbon\human\species\placeholder_helper.dm"
#include "modular_skyrat\modules\customization\modules\mob\living\carbon\human\species\podweak.dm"
-#include "modular_skyrat\modules\customization\modules\mob\living\carbon\human\species\roundstartslime.dm"
#include "modular_skyrat\modules\customization\modules\mob\living\carbon\human\species\skrell.dm"
#include "modular_skyrat\modules\customization\modules\mob\living\carbon\human\species\tajaran.dm"
#include "modular_skyrat\modules\customization\modules\mob\living\carbon\human\species\unathi.dm"
@@ -8188,17 +8181,6 @@
#include "modular_skyrat\modules\mentor\code\mentorpm.dm"
#include "modular_skyrat\modules\mentor\code\mentorsay.dm"
#include "modular_skyrat\modules\mentor\code\mentorwho.dm"
-#include "modular_skyrat\modules\microfusion\code\_microfusion_defines.dm"
-#include "modular_skyrat\modules\microfusion\code\cargo_stuff.dm"
-#include "modular_skyrat\modules\microfusion\code\gun_types.dm"
-#include "modular_skyrat\modules\microfusion\code\microfusion_cell.dm"
-#include "modular_skyrat\modules\microfusion\code\microfusion_cell_attachments.dm"
-#include "modular_skyrat\modules\microfusion\code\microfusion_designs.dm"
-#include "modular_skyrat\modules\microfusion\code\microfusion_energy_master.dm"
-#include "modular_skyrat\modules\microfusion\code\microfusion_gun_attachments.dm"
-#include "modular_skyrat\modules\microfusion\code\microfusion_techweb.dm"
-#include "modular_skyrat\modules\microfusion\code\phase_emitter.dm"
-#include "modular_skyrat\modules\microfusion\code\projectiles.dm"
#include "modular_skyrat\modules\Midroundtraitor\code\datum_traitor.dm"
#include "modular_skyrat\modules\Midroundtraitor\code\event.dm"
#include "modular_skyrat\modules\mining\boulder.dm"
@@ -8399,17 +8381,10 @@
#include "modular_skyrat\modules\modular_weapons\code\company_and_or_faction_based\carwo_defense_systems\submachinegun.dm"
#include "modular_skyrat\modules\modular_weapons\code\company_and_or_faction_based\carwo_defense_systems\ammo\grenade.dm"
#include "modular_skyrat\modules\modular_weapons\code\company_and_or_faction_based\carwo_defense_systems\ammo\pistol.dm"
-#include "modular_skyrat\modules\modular_weapons\code\company_and_or_faction_based\carwo_defense_systems\ammo\rifle.dm"
#include "modular_skyrat\modules\modular_weapons\code\company_and_or_faction_based\nanotrasen_system_inc\alert_pin.dm"
#include "modular_skyrat\modules\modular_weapons\code\company_and_or_faction_based\nanotrasen_system_inc\magazine.dm"
-#include "modular_skyrat\modules\modular_weapons\code\company_and_or_faction_based\nanotrasen_system_inc\pistol.dm"
-#include "modular_skyrat\modules\modular_weapons\code\company_and_or_faction_based\romulus_technology\magazines.dm"
-#include "modular_skyrat\modules\modular_weapons\code\company_and_or_faction_based\romulus_technology\pistol.dm"
#include "modular_skyrat\modules\modular_weapons\code\company_and_or_faction_based\romulus_technology\poster.dm"
-#include "modular_skyrat\modules\modular_weapons\code\company_and_or_faction_based\romulus_technology\rifle.dm"
#include "modular_skyrat\modules\modular_weapons\code\company_and_or_faction_based\romulus_technology\smg.dm"
-#include "modular_skyrat\modules\modular_weapons\code\company_and_or_faction_based\romulus_technology\ammo\pistol.dm"
-#include "modular_skyrat\modules\modular_weapons\code\company_and_or_faction_based\romulus_technology\ammo\rifle.dm"
#include "modular_skyrat\modules\modular_weapons\code\company_and_or_faction_based\saibasan\laser_guns.dm"
#include "modular_skyrat\modules\modular_weapons\code\company_and_or_faction_based\saibasan\mode_datums.dm"
#include "modular_skyrat\modules\modular_weapons\code\company_and_or_faction_based\saibasan\projectiles.dm"
@@ -8673,7 +8648,6 @@
#include "modular_skyrat\modules\sec_haul\code\peacekeeper\peacekeeper_hammer.dm"
#include "modular_skyrat\modules\sec_haul\code\peacekeeper\peacekeeper_lockers.dm"
#include "modular_skyrat\modules\sec_haul\code\technode\all_nodes.dm"
-#include "modular_skyrat\modules\sec_haul\code\technode\conversion_kit.dm"
#include "modular_skyrat\modules\self_actualization_device\code\self_actualization_device.dm"
#include "modular_skyrat\modules\server_overflow\code\chat_link.dm"
#include "modular_skyrat\modules\server_overflow\code\client_procs.dm"
@@ -8875,6 +8849,7 @@
#include "modular_zubbers\code\controllers\subsystem\mapping.dm"
#include "modular_zubbers\code\controllers\subsystem\research.dm"
#include "modular_zubbers\code\controllers\subsystem\security_level.dm"
+#include "modular_zubbers\code\controllers\subsystem\ticker.dm"
#include "modular_zubbers\code\controllers\subsystem\vote.dm"
#include "modular_zubbers\code\controllers\subsystem\dynamic\dynamic_ruleset_latejoin.dm"
#include "modular_zubbers\code\controllers\subsystem\dynamic\dynamic_ruleset_midround.dm"
@@ -8894,6 +8869,7 @@
#include "modular_zubbers\code\datums\components\sign_language.dm"
#include "modular_zubbers\code\datums\components\squeak.dm"
#include "modular_zubbers\code\datums\components\surgery_initiator.dm"
+#include "modular_zubbers\code\datums\components\tameable.dm"
#include "modular_zubbers\code\datums\components\udder.dm"
#include "modular_zubbers\code\datums\components\weatherannouncer.dm"
#include "modular_zubbers\code\datums\components\crafting\furniture.dm"
@@ -8901,6 +8877,7 @@
#include "modular_zubbers\code\datums\components\crafting\utility.dm"
#include "modular_zubbers\code\datums\components\crafting\crafting\furniture.dm"
#include "modular_zubbers\code\datums\components\crafting\crafting\melee_weapon.dm"
+#include "modular_zubbers\code\datums\components\fantasy\weight_overrides.dm"
#include "modular_zubbers\code\datums\components\vore\_defines.dm"
#include "modular_zubbers\code\datums\components\vore\absorb_control.dm"
#include "modular_zubbers\code\datums\components\vore\belly.dm"
@@ -9291,10 +9268,13 @@
#include "modular_zubbers\code\modules\credits\credits.dm"
#include "modular_zubbers\code\modules\customization\height_scaling\icons.dm"
#include "modular_zubbers\code\modules\customization\height_scaling\preferences.dm"
+#include "modular_zubbers\code\modules\customization\modules\reagents\drink_reagents.dm"
#include "modular_zubbers\code\modules\customization\species\proteans\__DEFINES.dm"
#include "modular_zubbers\code\modules\customization\species\proteans\_proteans_species.dm"
+#include "modular_zubbers\code\modules\customization\species\proteans\cargo.dm"
#include "modular_zubbers\code\modules\customization\species\proteans\protean_modsuit.dm"
#include "modular_zubbers\code\modules\customization\species\proteans\protean_modsuit_core.dm"
+#include "modular_zubbers\code\modules\customization\species\proteans\protean_prefab.dm"
#include "modular_zubbers\code\modules\customization\species\proteans\protean_servo_module.dm"
#include "modular_zubbers\code\modules\customization\species\proteans\protean_status_effects.dm"
#include "modular_zubbers\code\modules\customization\species\proteans\protean_verbs.dm"
@@ -9392,6 +9372,7 @@
#include "modular_zubbers\code\modules\languages\hivemind.dm"
#include "modular_zubbers\code\modules\languages\panslavic.dm"
#include "modular_zubbers\code\modules\languages\siikmaas.dm"
+#include "modular_zubbers\code\modules\languages\uncommon.dm"
#include "modular_zubbers\code\modules\languages\vampiric.dm"
#include "modular_zubbers\code\modules\lewd_machinery\lustwish.dm"
#include "modular_zubbers\code\modules\lewd_machinery\sex_barrier.dm"
@@ -9466,6 +9447,7 @@
#include "modular_zubbers\code\modules\mob\living\carbon\alien\adult\adult.dm"
#include "modular_zubbers\code\modules\mob\living\carbon\human\_species.dm"
#include "modular_zubbers\code\modules\mob\living\carbon\human\human.dm"
+#include "modular_zubbers\code\modules\mob\living\carbon\human\monkey.dm"
#include "modular_zubbers\code\modules\mob\living\carbon\human\physiology.dm"
#include "modular_zubbers\code\modules\mob\living\carbon\human\species\akula.dm"
#include "modular_zubbers\code\modules\mob\living\carbon\human\species\ghoul.dm"
@@ -9487,7 +9469,6 @@
#include "modular_zubbers\code\modules\mob\living\carbon\human\species_types\humanoid_overrides.dm"
#include "modular_zubbers\code\modules\mob\living\carbon\human\species_types\humans.dm"
#include "modular_zubbers\code\modules\mob\living\carbon\human\species_types\insect.dm"
-#include "modular_zubbers\code\modules\mob\living\carbon\human\species_types\jellypeople.dm"
#include "modular_zubbers\code\modules\mob\living\carbon\human\species_types\lizardpeople.dm"
#include "modular_zubbers\code\modules\mob\living\carbon\human\species_types\mammal.dm"
#include "modular_zubbers\code\modules\mob\living\carbon\human\species_types\monkeys.dm"
@@ -9498,14 +9479,13 @@
#include "modular_zubbers\code\modules\mob\living\carbon\human\species_types\shadowpeople.dm"
#include "modular_zubbers\code\modules\mob\living\carbon\human\species_types\skeletons.dm"
#include "modular_zubbers\code\modules\mob\living\carbon\human\species_types\skrell.dm"
+#include "modular_zubbers\code\modules\mob\living\carbon\human\species_types\slimepeople.dm"
#include "modular_zubbers\code\modules\mob\living\carbon\human\species_types\snail.dm"
#include "modular_zubbers\code\modules\mob\living\carbon\human\species_types\synths.dm"
#include "modular_zubbers\code\modules\mob\living\carbon\human\species_types\unathi.dm"
#include "modular_zubbers\code\modules\mob\living\carbon\human\species_types\vampire.dm"
-#include "modular_zubbers\code\modules\mob\living\carbon\human\species_types\vox.dm"
#include "modular_zubbers\code\modules\mob\living\carbon\human\species_types\vox_primalis.dm"
#include "modular_zubbers\code\modules\mob\living\carbon\human\species_types\vulpkanin.dm"
-#include "modular_zubbers\code\modules\mob\living\carbon\human\species_types\xeno.dm"
#include "modular_zubbers\code\modules\mob\living\carbon\human\species_types\zombie.dm"
#include "modular_zubbers\code\modules\mob\living\silicon\robot\robot.dm"
#include "modular_zubbers\code\modules\mob\living\simple_animal\guardian\guardian.dm"
@@ -9627,7 +9607,6 @@
#include "modular_zubbers\code\modules\security\secmed\automapper.dm"
#include "modular_zubbers\code\modules\security\secmed\secmed_clothes.dm"
#include "modular_zubbers\code\modules\security\secmed\security_medic.dm"
-#include "modular_zubbers\code\modules\security\security_glock\ammo.dm"
#include "modular_zubbers\code\modules\security\security_glock\cargo.dm"
#include "modular_zubbers\code\modules\security\security_glock\case.dm"
#include "modular_zubbers\code\modules\security\security_glock\firing_pin.dm"
@@ -9704,8 +9683,7 @@
#include "modular_zubbers\code\modules\storyteller\storytellers\tellers\storyteller_3_default.dm"
#include "modular_zubbers\code\modules\storyteller\storytellers\tellers\storyteller_4_bomb.dm"
#include "modular_zubbers\code\modules\storyteller\storytellers\tellers\storyteller_5_gamer.dm"
-#include "modular_zubbers\code\modules\storyteller\storytellers\tellers\storyteller_6_house.dm"
-#include "modular_zubbers\code\modules\storyteller\storytellers\tellers\storyteller_7_enemy.dm"
+#include "modular_zubbers\code\modules\storyteller\storytellers\tellers\storyteller_6_enemy.dm"
#include "modular_zubbers\code\modules\surgery\healing.dm"
#include "modular_zubbers\code\modules\surgery\robotic_cavity_implant.dm"
#include "modular_zubbers\code\modules\surgery\surgery_step.dm"
@@ -9732,6 +9710,7 @@
#include "modular_zubbers\code\modules\syndicate_offstation\storage\lockers.dm"
#include "modular_zubbers\code\modules\syndicate_offstation\storage\safe.dm"
#include "modular_zubbers\code\modules\synths\code\surgery\robot_brain_surgery.dm"
+#include "modular_zubbers\code\modules\tarkon\code\cameras.dm"
#include "modular_zubbers\code\modules\tarkon\code\tarkon_loot.dm"
#include "modular_zubbers\code\modules\tarkon\code\clothing\backpack.dm"
#include "modular_zubbers\code\modules\tarkon\code\misc-fluff\research.dm"
@@ -9824,6 +9803,7 @@
#include "modular_zubbers\master_files\code\datums\quirks\positive_quirks\self_aware.dm"
#include "modular_zubbers\master_files\code\datums\quirks\positive_quirks\skittish.dm"
#include "modular_zubbers\master_files\code\datums\traits\slow.dm"
+#include "modular_zubbers\master_files\code\game\machinery\dna_infuser\organ_sets\rat_organs.dm"
#include "modular_zubbers\master_files\code\game\objects\effects\spawners\random\decoration.dm"
#include "modular_zubbers\master_files\code\modules\client\preferences\hypnopref.dm"
#include "modular_zubbers\master_files\code\modules\client\preferences\obscurity_examine.dm"
@@ -9848,6 +9828,8 @@
#include "modular_zubbers\master_files\skyrat\modules\company_imports\code\armament_datums\deforest_medical.dm"
#include "modular_zubbers\master_files\skyrat\modules\deforest_medical_items\code\cargo_packs.dm"
#include "modular_zubbers\master_files\skyrat\modules\verbs\code\subtle.dm"
+#include "modular_zubbers\modules\ammo_workbench\code\ammo_workbench.dm"
+#include "modular_zubbers\modules\ammo_workbench\code\design_disks.dm"
#include "modular_zubbers\modules\lewd_clothing\latex_halfcatsuit.dm"
#include "modular_zubbers\modules\plexagon_selfserve\code\off_duty_component.dm"
#include "modular_zubbers\modules\plexagon_selfserve\code\plexagon_selfserve.dm"
diff --git a/tgui/packages/tgui/interfaces/BubberChangelog.jsx b/tgui/packages/tgui/interfaces/BubberChangelog.jsx
index c492ee39e9c..387cf19b014 100644
--- a/tgui/packages/tgui/interfaces/BubberChangelog.jsx
+++ b/tgui/packages/tgui/interfaces/BubberChangelog.jsx
@@ -46,8 +46,13 @@ const icons = {
};
const DateDropdown = (props) => {
- const { dates, selectedDate, setSelectedDate } = props;
- const [selectedIndex, setSelectedIndex] = useState(0);
+ const {
+ dates,
+ selectedDate,
+ setSelectedDate,
+ selectedDateIndex,
+ setSelectedDateIndex,
+ } = props;
return (
dates.length > 0 && (
@@ -55,12 +60,12 @@ const DateDropdown = (props) => {