diff --git a/.github/workflows/ci_suite.yml b/.github/workflows/ci_suite.yml
index 6a40438cf7d9e..e49f699d2d20d 100644
--- a/.github/workflows/ci_suite.yml
+++ b/.github/workflows/ci_suite.yml
@@ -86,13 +86,17 @@ jobs:
run: ':'
- name: Run Grep Checks
if: steps.linter-setup.conclusion == 'success' && !cancelled()
- run: bash tools/ci/check_grep.sh
+ run: |
+ bash tools/ci/check_grep.sh
+ bash massmeta/tools/massmeta_check_grep.sh # MASSMETA EDIT ADDITION - checking modular_meta code
- name: Ticked File Enforcement
if: steps.linter-setup.conclusion == 'success' && !cancelled()
run: |
- bash tools/massmeta_check_grep.sh # MASSMETA EDIT ADDITION - checking modular_meta code
tools/bootstrap/python tools/ticked_file_enforcement/ticked_file_enforcement.py < tools/ticked_file_enforcement/schemas/tgstation_dme.json
tools/bootstrap/python tools/ticked_file_enforcement/ticked_file_enforcement.py < tools/ticked_file_enforcement/schemas/unit_tests.json
+ tools/bootstrap/python massmeta/tools/ticked_file_enforcement/ticked_file_enforcement.py < massmeta/tools/ticked_file_enforcement/schemas/modular_meta_defines.json # MASSMETA EDIT ADDITION - modular defines tick enforcement
+ tools/bootstrap/python massmeta/tools/ticked_file_enforcement/ticked_file_enforcement.py < massmeta/tools/ticked_file_enforcement/schemas/modular_meta_master.json # MASSMETA EDIT ADDITION - modular master tick enforcement
+ tools/bootstrap/python massmeta/tools/ticked_file_enforcement/ticked_file_enforcement.py < massmeta/tools/ticked_file_enforcement/schemas/modular_meta.json # MASSMETA EDIT ADDITION - modular tick enforcement
- name: Check Define Sanity
if: steps.linter-setup.conclusion == 'success' && !cancelled()
run: tools/bootstrap/python -m define_sanity.check
diff --git a/_maps/RandomRuins/AnywhereRuins/golem_ship.dmm b/_maps/RandomRuins/AnywhereRuins/golem_ship.dmm
index cddd5a0820659..d910f5d76734c 100644
--- a/_maps/RandomRuins/AnywhereRuins/golem_ship.dmm
+++ b/_maps/RandomRuins/AnywhereRuins/golem_ship.dmm
@@ -686,7 +686,6 @@
"Ro" = (
/obj/structure/table/wood,
/obj/item/bedsheet/rd/royal_cape{
- layer = 3;
pixel_x = 5;
pixel_y = 9
},
diff --git a/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm b/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm
index 6ceb38619a4c5..82f4d3677800a 100644
--- a/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm
+++ b/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm
@@ -549,9 +549,7 @@
/turf/open/misc/beach/sand,
/area/ruin/powered/beach)
"rU" = (
-/obj/item/reagent_containers/condiment/enzyme{
- layer = 5
- },
+/obj/item/reagent_containers/condiment/enzyme,
/obj/item/reagent_containers/cup/beaker{
pixel_x = 5
},
@@ -920,9 +918,7 @@
/area/ruin/powered/beach)
"GA" = (
/obj/structure/window/reinforced/spawner/directional/east,
-/obj/structure/window/reinforced/spawner/directional/north{
- layer = 2.9
- },
+/obj/structure/window/reinforced/spawner/directional/north,
/obj/structure/chair/stool/directional/south,
/obj/item/storage/backpack/duffelbag,
/obj/item/clothing/under/shorts/red,
diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_elephant_graveyard.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_elephant_graveyard.dmm
index 52e9e68ac409c..6156174aaba56 100644
--- a/_maps/RandomRuins/LavaRuins/lavaland_surface_elephant_graveyard.dmm
+++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_elephant_graveyard.dmm
@@ -496,7 +496,6 @@
/obj/structure/flora/rock/style_random,
/obj/structure/cable,
/obj/item/pickaxe{
- layer = 2.5;
pixel_x = -8;
pixel_y = 5
},
diff --git a/_maps/RandomRuins/SpaceRuins/bus.dmm b/_maps/RandomRuins/SpaceRuins/bus.dmm
index 1cd3d0f7ec261..a8a4a968d976d 100644
--- a/_maps/RandomRuins/SpaceRuins/bus.dmm
+++ b/_maps/RandomRuins/SpaceRuins/bus.dmm
@@ -29,7 +29,6 @@
"ao" = (
/obj/machinery/telecomms/server{
pixel_z = 12;
- layer = 2.91;
name = "tgsv3";
desc = "It's, uh... pending an upgrade."
},
@@ -240,8 +239,7 @@
/area/ruin/space)
"ud" = (
/obj/structure/fluff/bus/passable{
- icon_state = "bottomdoor";
- layer = 3
+ icon_state = "bottomdoor"
},
/turf/open/misc/asteroid/airless,
/area/ruin/space)
@@ -308,7 +306,6 @@
},
/obj/machinery/telecomms/server{
pixel_z = 12;
- layer = 2.91;
name = "tgsv3";
desc = "It's, uh... pending an upgrade."
},
diff --git a/_maps/RandomRuins/SpaceRuins/clericden.dmm b/_maps/RandomRuins/SpaceRuins/clericden.dmm
index c6e6bebddb0be..f274f7a23f563 100644
--- a/_maps/RandomRuins/SpaceRuins/clericden.dmm
+++ b/_maps/RandomRuins/SpaceRuins/clericden.dmm
@@ -108,9 +108,7 @@
/turf/open/floor/plating/airless,
/area/ruin/space)
"A" = (
-/obj/structure/table/wood{
- layer = 3.3
- },
+/obj/structure/table/wood,
/turf/open/floor/carpet/royalblack/airless,
/area/ruin/space)
"B" = (
diff --git a/_maps/RandomRuins/SpaceRuins/infested_frigate.dmm b/_maps/RandomRuins/SpaceRuins/infested_frigate.dmm
index 1976a33a4adda..512936958ddf3 100644
--- a/_maps/RandomRuins/SpaceRuins/infested_frigate.dmm
+++ b/_maps/RandomRuins/SpaceRuins/infested_frigate.dmm
@@ -180,6 +180,17 @@
},
/turf/open/floor/mineral/plastitanium,
/area/ruin/space/has_grav/infested_frigate)
+"cI" = (
+/obj/structure/cable,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/blood{
+ icon_state = "floor5-old"
+ },
+/obj/item/ammo_casing/spent,
+/obj/item/gun/ballistic/automatic/plastikov,
+/obj/effect/mob_spawn/corpse/human/syndicatepilot,
+/turf/open/floor/mineral/plastitanium/red,
+/area/ruin/space/has_grav/infested_frigate)
"cP" = (
/obj/machinery/door/poddoor{
id = "brutus exterior bolts"
@@ -348,25 +359,6 @@
/obj/item/ammo_casing/spent,
/turf/open/floor/mineral/plastitanium/red,
/area/ruin/space/has_grav/infested_frigate)
-"er" = (
-/obj/structure/lattice,
-/obj/structure/alien/resin/membrane{
- max_integrity = 1600;
- desc = "Resin just thin enough to let light pass through, but it's congealing in the same way as the thicker stuff.";
- name = "viscous resin membrane"
- },
-/obj/item/ammo_casing/spent,
-/obj/item/ammo_casing/spent,
-/obj/item/ammo_casing/spent,
-/obj/item/ammo_casing/spent,
-/obj/structure/door_assembly/door_assembly_hatch{
- anchored = 1;
- name = "crew quarters";
- desc = "People lived in this place.";
- layer = 2.8
- },
-/turf/template_noop,
-/area/ruin/space/has_grav/infested_frigate)
"eE" = (
/mob/living/basic/alien{
faction = list("syndicate","xenomorph")
@@ -374,22 +366,6 @@
/obj/structure/cable,
/turf/open/floor/mineral/plastitanium,
/area/ruin/space/has_grav/infested_frigate)
-"eX" = (
-/obj/structure/table/glass,
-/obj/item/pen{
- pixel_x = 6;
- pixel_y = 6
- },
-/obj/item/phone{
- layer = 3.1
- },
-/obj/item/paper/crumpled/muddy/fluff/elephant_graveyard/rnd_notes{
- default_raw_text = "STERILIZATION ORDERS Detailed findings: A biological research lab within the HD-10180 system has suffered from a complete containment failure. The SYN-C Brutus is to deliver a nuclear payload via strike team. Everything inside and outside the facility is to be killed on sight, including any research staff. Nuclear authentication codes have been sent via red phone, as have other detailed orders.The rest of the documents are maps and mundane information regarding the crew's destination. ";
- name = "STERILIZATION ORDERS";
- desc = "These are particularly boring for what they entail."
- },
-/turf/open/floor/pod/dark,
-/area/ruin/space/has_grav/infested_frigate)
"eZ" = (
/obj/item/clothing/mask/facehugger/impregnated,
/obj/structure/closet/crate/secure/freezer/pizza,
@@ -588,6 +564,11 @@
},
/turf/open/floor/mineral/plastitanium,
/area/ruin/space/has_grav/infested_frigate)
+"ir" = (
+/obj/effect/decal/cleanable/glass,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
+/turf/open/floor/mineral/plastitanium/red,
+/area/ruin/space/has_grav/infested_frigate)
"iy" = (
/obj/effect/decal/cleanable/blood/gibs{
icon_state = "u_guilty_l"
@@ -637,27 +618,6 @@
},
/turf/open/floor/mineral/plastitanium/airless,
/area/ruin/space/has_grav/infested_frigate)
-"jx" = (
-/obj/effect/decal/cleanable/glass{
- layer = 3.1
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
-/turf/open/floor/mineral/plastitanium/red,
-/area/ruin/space/has_grav/infested_frigate)
-"jy" = (
-/obj/effect/turf_decal{
- icon_state = "warningline_white"
- },
-/obj/structure/showcase/machinery/tv{
- icon_state = "computer_broken";
- desc = "It would have been locked anyway.";
- name = "syndicate navigation console"
- },
-/obj/effect/decal/cleanable/glass{
- layer = 3.1
- },
-/turf/open/floor/pod/dark,
-/area/ruin/space/has_grav/infested_frigate)
"kc" = (
/obj/effect/turf_decal{
dir = 8
@@ -745,6 +705,18 @@
/obj/machinery/light/red/dim/directional/north,
/turf/open/floor/mineral/plastitanium,
/area/ruin/space/has_grav/infested_frigate)
+"ly" = (
+/obj/effect/turf_decal{
+ icon_state = "warningline_white"
+ },
+/obj/structure/showcase/machinery/tv{
+ icon_state = "computer_broken";
+ desc = "It would have been locked anyway.";
+ name = "syndicate navigation console"
+ },
+/obj/effect/decal/cleanable/glass,
+/turf/open/floor/pod/dark,
+/area/ruin/space/has_grav/infested_frigate)
"lU" = (
/obj/effect/decal/cleanable/blood/gibs{
icon_state = "u_madman_l"
@@ -815,6 +787,20 @@
},
/turf/open/floor/plating,
/area/ruin/space/has_grav/infested_frigate)
+"nb" = (
+/obj/structure/table/glass,
+/obj/item/pen{
+ pixel_x = 6;
+ pixel_y = 6
+ },
+/obj/item/phone,
+/obj/item/paper/crumpled/muddy/fluff/elephant_graveyard/rnd_notes{
+ default_raw_text = "STERILIZATION ORDERS Detailed findings: A biological research lab within the HD-10180 system has suffered from a complete containment failure. The SYN-C Brutus is to deliver a nuclear payload via strike team. Everything inside and outside the facility is to be killed on sight, including any research staff. Nuclear authentication codes have been sent via red phone, as have other detailed orders.The rest of the documents are maps and mundane information regarding the crew's destination. ";
+ name = "STERILIZATION ORDERS";
+ desc = "These are particularly boring for what they entail."
+ },
+/turf/open/floor/pod/dark,
+/area/ruin/space/has_grav/infested_frigate)
"nk" = (
/obj/item/storage/medkit/o2,
/obj/item/storage/medkit/toxin,
@@ -856,19 +842,6 @@
},
/turf/open/floor/mineral/plastitanium,
/area/ruin/space/has_grav/infested_frigate)
-"nU" = (
-/obj/structure/cable,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/blood{
- icon_state = "floor5-old"
- },
-/obj/item/ammo_casing/spent{
- layer = 3.1
- },
-/obj/item/gun/ballistic/automatic/plastikov,
-/obj/effect/mob_spawn/corpse/human/syndicatepilot,
-/turf/open/floor/mineral/plastitanium/red,
-/area/ruin/space/has_grav/infested_frigate)
"oj" = (
/obj/structure/fans/tiny,
/obj/machinery/door/poddoor{
@@ -974,18 +947,6 @@
},
/turf/open/floor/mineral/plastitanium,
/area/ruin/space/has_grav/infested_frigate)
-"qu" = (
-/obj/effect/decal/cleanable/blood{
- icon_state = "floor7-old"
- },
-/obj/effect/decal/cleanable/glass,
-/obj/machinery/button/door/directional/north{
- name = "prisoner isolation shutter";
- id = "captivity";
- layer = 3.4
- },
-/turf/open/floor/pod/dark,
-/area/ruin/space/has_grav/infested_frigate)
"qC" = (
/obj/effect/turf_decal/tile/bar{
dir = 1
@@ -1236,16 +1197,6 @@
},
/turf/open/floor/pod/dark,
/area/ruin/space/has_grav/infested_frigate)
-"vj" = (
-/obj/machinery/door/poddoor{
- id = "Brutusexterior";
- closingLayer = 2.65
- },
-/obj/effect/spawner/structure/window/reinforced/plasma/plastitanium{
- layer = 2.9
- },
-/turf/open/floor/plating,
-/area/ruin/space/has_grav/infested_frigate)
"vm" = (
/obj/machinery/door/airlock/external/ruin,
/obj/effect/mapping_helpers/airlock/locked,
@@ -1456,6 +1407,23 @@
},
/turf/closed/wall/mineral/plastitanium,
/area/ruin/space/has_grav/infested_frigate)
+"xc" = (
+/mob/living/basic/bot/firebot{
+ faction = list("syndicate","xenomorph");
+ name = "Mr. Squirtsky";
+ desc = "He seems much happier with the new management!"
+ },
+/obj/effect/turf_decal{
+ icon_state = "warningline_red";
+ dir = 5
+ },
+/obj/effect/turf_decal{
+ icon_state = "warningline_red";
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
+/turf/open/floor/pod/dark,
+/area/ruin/space/has_grav/infested_frigate)
"xi" = (
/obj/effect/mapping_helpers/broken_floor,
/obj/effect/spawner/random/trash,
@@ -1625,12 +1593,6 @@
/obj/effect/decal/cleanable/plastic,
/turf/open/floor/mineral/plastitanium,
/area/ruin/space/has_grav/infested_frigate)
-"yZ" = (
-/obj/effect/spawner/structure/window/reinforced/plasma/plastitanium{
- layer = 2.9
- },
-/turf/open/floor/plating,
-/area/ruin/space/has_grav/infested_frigate)
"zg" = (
/obj/effect/turf_decal/tile/bar{
dir = 1
@@ -1916,27 +1878,6 @@
},
/turf/open/floor/pod/dark,
/area/ruin/space/has_grav/infested_frigate)
-"EQ" = (
-/obj/structure/sign/poster/contraband/random/directional/north,
-/obj/item/restraints/handcuffs/cable/zipties/used,
-/obj/effect/decal/cleanable/blood{
- icon_state = "floor7-old"
- },
-/obj/effect/decal/cleanable/glass,
-/obj/effect/decal/cleanable/blood/gibs{
- icon_state = "gib1-old"
- },
-/obj/machinery/door/window/left/directional/east{
- layer = 3.2
- },
-/obj/machinery/door/poddoor/shutters/window/preopen{
- id = "captivity"
- },
-/mob/living/carbon/alien/larva{
- faction = list("syndicate","xenomorph")
- },
-/turf/open/floor/plating,
-/area/ruin/space/has_grav/infested_frigate)
"ER" = (
/obj/structure/cable,
/mob/living/basic/alien/sentinel{
@@ -1979,23 +1920,6 @@
/obj/item/kirbyplants/random,
/turf/open/floor/mineral/plastitanium,
/area/ruin/space/has_grav/infested_frigate)
-"Fs" = (
-/mob/living/basic/bot/firebot{
- faction = list("syndicate","xenomorph");
- name = "Mr. Squirtsky";
- desc = "He seems much happier with the new management!"
- },
-/obj/effect/turf_decal{
- icon_state = "warningline_red";
- dir = 5
- },
-/obj/effect/turf_decal{
- icon_state = "warningline_red";
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
-/turf/open/floor/pod/dark,
-/area/ruin/space/has_grav/infested_frigate)
"FJ" = (
/obj/machinery/suit_storage_unit/open,
/obj/effect/turf_decal{
@@ -2104,6 +2028,17 @@
/obj/structure/broken_flooring/singular/directional/south,
/turf/template_noop,
/area/template_noop)
+"HJ" = (
+/obj/effect/decal/cleanable/blood{
+ icon_state = "floor7-old"
+ },
+/obj/effect/decal/cleanable/glass,
+/obj/machinery/button/door/directional/north{
+ name = "prisoner isolation shutter";
+ id = "captivity"
+ },
+/turf/open/floor/pod/dark,
+/area/ruin/space/has_grav/infested_frigate)
"HP" = (
/obj/structure/broken_flooring/plating/directional/north,
/obj/structure/broken_flooring/pile/directional/west,
@@ -2155,6 +2090,24 @@
/obj/item/ammo_casing/spent,
/turf/open/floor/mineral/plastitanium,
/area/ruin/space/has_grav/infested_frigate)
+"Jc" = (
+/obj/structure/lattice,
+/obj/structure/alien/resin/membrane{
+ max_integrity = 1600;
+ desc = "Resin just thin enough to let light pass through, but it's congealing in the same way as the thicker stuff.";
+ name = "viscous resin membrane"
+ },
+/obj/item/ammo_casing/spent,
+/obj/item/ammo_casing/spent,
+/obj/item/ammo_casing/spent,
+/obj/item/ammo_casing/spent,
+/obj/structure/door_assembly/door_assembly_hatch{
+ anchored = 1;
+ name = "crew quarters";
+ desc = "People lived in this place."
+ },
+/turf/template_noop,
+/area/ruin/space/has_grav/infested_frigate)
"Jh" = (
/obj/effect/turf_decal{
dir = 4
@@ -2746,6 +2699,25 @@
/obj/effect/spawner/random/trash,
/turf/template_noop,
/area/template_noop)
+"Sm" = (
+/obj/structure/sign/poster/contraband/random/directional/north,
+/obj/item/restraints/handcuffs/cable/zipties/used,
+/obj/effect/decal/cleanable/blood{
+ icon_state = "floor7-old"
+ },
+/obj/effect/decal/cleanable/glass,
+/obj/effect/decal/cleanable/blood/gibs{
+ icon_state = "gib1-old"
+ },
+/obj/machinery/door/window/left/directional/east,
+/obj/machinery/door/poddoor/shutters/window/preopen{
+ id = "captivity"
+ },
+/mob/living/carbon/alien/larva{
+ faction = list("syndicate","xenomorph")
+ },
+/turf/open/floor/plating,
+/area/ruin/space/has_grav/infested_frigate)
"Sr" = (
/obj/effect/turf_decal{
icon_state = "warningline_white";
@@ -2882,6 +2854,10 @@
},
/turf/open/floor/pod/dark,
/area/ruin/space/has_grav/infested_frigate)
+"Uk" = (
+/obj/effect/spawner/structure/window/reinforced/plasma/plastitanium,
+/turf/open/floor/plating,
+/area/ruin/space/has_grav/infested_frigate)
"Ux" = (
/obj/effect/turf_decal/tile/bar{
dir = 1
@@ -3050,6 +3026,13 @@
},
/turf/open/floor/plating,
/area/ruin/space/has_grav/infested_frigate)
+"XF" = (
+/obj/machinery/door/poddoor{
+ id = "Brutusexterior"
+ },
+/obj/effect/spawner/structure/window/reinforced/plasma/plastitanium,
+/turf/open/floor/plating,
+/area/ruin/space/has_grav/infested_frigate)
"XG" = (
/obj/effect/turf_decal{
icon_state = "arrows_red";
@@ -3388,7 +3371,7 @@ fl
fl
fl
wP
-EQ
+Sm
wP
hX
SM
@@ -3415,7 +3398,7 @@ fl
fl
fl
wP
-qu
+HJ
wP
Ru
df
@@ -3478,7 +3461,7 @@ rs
AH
yt
YW
-vj
+XF
fl
fl
fl
@@ -3495,7 +3478,7 @@ fl
fl
fl
fl
-vj
+XF
yJ
wP
wP
@@ -3505,7 +3488,7 @@ Qg
ki
Zp
di
-vj
+XF
fl
fl
fl
@@ -3522,7 +3505,7 @@ fl
fl
fl
fl
-vj
+XF
OC
OC
qE
@@ -3532,7 +3515,7 @@ wP
Et
KA
RG
-vj
+XF
fl
fl
fl
@@ -3549,7 +3532,7 @@ fl
fl
fl
fl
-vj
+XF
xp
ab
Cm
@@ -3559,7 +3542,7 @@ Rw
SX
xT
qC
-vj
+XF
fl
fl
fl
@@ -3576,7 +3559,7 @@ fl
fl
fl
fl
-vj
+XF
Ez
Jx
Cm
@@ -3586,7 +3569,7 @@ Qg
Ml
hB
xB
-vj
+XF
fl
fl
fl
@@ -3739,7 +3722,7 @@ fl
Eg
fl
Qj
-er
+Jc
Qm
wP
NU
@@ -3792,7 +3775,7 @@ fl
fl
fl
fl
-vj
+XF
EL
yP
Fg
@@ -3802,7 +3785,7 @@ mk
Jx
lU
Rx
-vj
+XF
fl
fl
fl
@@ -3819,17 +3802,17 @@ fl
fl
fl
HD
-vj
+XF
ug
Nu
CE
uG
pk
-Fs
+xc
Im
iy
IC
-vj
+XF
fl
fl
fl
@@ -3846,7 +3829,7 @@ fl
fl
fl
fl
-vj
+XF
YV
Er
wP
@@ -3856,7 +3839,7 @@ LF
wP
iL
nm
-vj
+XF
fl
fl
fl
@@ -3878,7 +3861,7 @@ bM
Ne
wP
bE
-nU
+cI
ML
wP
UX
@@ -4036,7 +4019,7 @@ fl
fl
fl
fl
-vj
+XF
Bw
ip
BA
@@ -4044,7 +4027,7 @@ sZ
rz
Ai
KC
-vj
+XF
fl
fl
fl
@@ -4063,7 +4046,7 @@ fl
fl
fl
fl
-vj
+XF
HA
Cm
Td
@@ -4071,7 +4054,7 @@ st
MH
eE
AM
-vj
+XF
fl
fl
fl
@@ -4090,7 +4073,7 @@ fl
fl
fl
fl
-vj
+XF
vM
wP
wP
@@ -4098,7 +4081,7 @@ VV
wP
wP
OK
-vj
+XF
fl
fl
fl
@@ -4117,15 +4100,15 @@ fl
fl
fl
fl
-vj
+XF
cX
wP
-jy
+ly
PV
Gt
wP
OK
-vj
+XF
fl
fl
fl
@@ -4144,7 +4127,7 @@ fl
fl
fl
fl
-vj
+XF
iS
wP
Jp
@@ -4152,7 +4135,7 @@ xo
wO
wP
oV
-vj
+XF
fl
fl
fl
@@ -4171,15 +4154,15 @@ fl
fl
fl
fl
-vj
+XF
KK
wP
-eX
+nb
aA
NX
wP
oo
-vj
+XF
fl
fl
fl
@@ -4200,11 +4183,11 @@ fl
fl
wP
af
-yZ
-yZ
+Uk
+Uk
pl
-yZ
-yZ
+Uk
+Uk
sE
wP
fl
@@ -4256,7 +4239,7 @@ wP
Yd
hA
My
-jx
+ir
yG
nG
UV
diff --git a/_maps/RandomRuins/SpaceRuins/oldstation.dmm b/_maps/RandomRuins/SpaceRuins/oldstation.dmm
index 6062a970205c6..2597a3a4a9985 100644
--- a/_maps/RandomRuins/SpaceRuins/oldstation.dmm
+++ b/_maps/RandomRuins/SpaceRuins/oldstation.dmm
@@ -70,6 +70,7 @@
/obj/item/stack/sheet/plasteel{
amount = 30
},
+/obj/item/stack/sheet/mineral/diamond,
/turf/open/floor/iron/dark,
/area/ruin/space/ancientstation/delta/ai)
"as" = (
@@ -226,7 +227,7 @@
/turf/open/floor/iron,
/area/ruin/space/ancientstation/charlie/bridge)
"bh" = (
-/obj/machinery/computer/old{
+/obj/machinery/modular_computer/preset/research/away{
dir = 4
},
/obj/structure/window/reinforced/spawner/directional/south,
@@ -793,6 +794,15 @@
},
/turf/open/floor/iron,
/area/ruin/space/ancientstation/charlie/hydro)
+"ds" = (
+/obj/structure/window/reinforced/spawner/directional/west,
+/obj/structure/window/reinforced/spawner/directional/north,
+/obj/structure/window/reinforced/spawner/directional/south,
+/obj/structure/table,
+/obj/machinery/door/window/brigdoor/right/directional/east,
+/obj/item/computer_disk,
+/turf/open/floor/iron/dark,
+/area/ruin/space/ancientstation/delta/ai)
"dt" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
@@ -961,8 +971,11 @@
/area/ruin/space/ancientstation/charlie/bridge)
"ek" = (
/obj/effect/decal/cleanable/dirt,
-/obj/structure/reagent_dispensers/fueltank,
/obj/effect/turf_decal/tile/yellow/half/contrasted,
+/obj/structure/closet/crate/bin,
+/obj/effect/spawner/random/trash/garbage,
+/obj/effect/spawner/random/trash/garbage,
+/obj/effect/spawner/random/trash/garbage,
/turf/open/floor/iron,
/area/ruin/space/ancientstation/charlie/engie)
"el" = (
@@ -1088,6 +1101,10 @@
/obj/effect/turf_decal/tile/yellow/half/contrasted{
dir = 8
},
+/obj/item/chair{
+ pixel_y = -8;
+ pixel_x = 13
+ },
/turf/open/floor/iron,
/area/ruin/space/ancientstation/charlie/engie)
"eL" = (
@@ -1527,7 +1544,6 @@
"gM" = (
/obj/machinery/rnd/production/circuit_imprinter/offstation,
/obj/effect/decal/cleanable/dirt,
-/obj/item/reagent_containers/dropper,
/turf/open/floor/iron/white,
/area/ruin/space/ancientstation/delta/rnd)
"gP" = (
@@ -1911,6 +1927,7 @@
/obj/item/folder/white,
/obj/item/reagent_containers/cup/beaker,
/obj/effect/decal/cleanable/dirt,
+/obj/item/reagent_containers/dropper,
/turf/open/floor/iron,
/area/ruin/space/ancientstation/delta/rnd)
"ip" = (
@@ -2252,9 +2269,8 @@
"jP" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
-/obj/item/storage/backpack/duffelbag,
/obj/structure/closet,
-/obj/effect/spawner/random/clothing/backpack,
+/obj/item/storage/backpack/duffelbag/sec,
/turf/open/floor/iron,
/area/ruin/space/ancientstation/charlie/dorms)
"jU" = (
@@ -2673,13 +2689,10 @@
/area/ruin/space/ancientstation/charlie/kitchen)
"lz" = (
/obj/effect/decal/cleanable/dirt,
-/obj/structure/closet/crate/bin,
/obj/effect/turf_decal/tile/yellow/half/contrasted{
dir = 1
},
-/obj/effect/spawner/random/trash/garbage,
-/obj/effect/spawner/random/trash/garbage,
-/obj/effect/spawner/random/trash/garbage,
+/obj/machinery/computer/apc_control/away,
/turf/open/floor/iron,
/area/ruin/space/ancientstation/charlie/engie)
"lB" = (
@@ -2899,9 +2912,9 @@
"mz" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
-/obj/item/storage/backpack/old,
/obj/structure/closet,
-/obj/effect/spawner/random/clothing/backpack,
+/obj/item/storage/backpack/industrial,
+/obj/item/storage/backpack/messenger/eng,
/turf/open/floor/iron,
/area/ruin/space/ancientstation/charlie/dorms)
"mA" = (
@@ -2939,7 +2952,7 @@
/obj/machinery/shower/directional/west{
has_water_reclaimer = 0
},
-/turf/open/floor/vault,
+/turf/open/floor/pod/dark,
/area/ruin/space/ancientstation/delta/biolab)
"mG" = (
/obj/effect/decal/cleanable/dirt,
@@ -3116,16 +3129,30 @@
/turf/open/floor/iron,
/area/ruin/space/ancientstation/beta/hall)
"ng" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/pipedispenser/disposal/transit_tube,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
+/obj/machinery/atmospherics/components/unary/portables_connector/visible{
+ dir = 8
+ },
+/obj/structure/fluff/broken_canister_frame,
+/obj/effect/decal/cleanable/plasma,
/turf/open/floor/iron,
/area/ruin/space/ancientstation/beta/atmos)
"nk" = (
/turf/closed/wall,
/area/ruin/space/ancientstation/charlie/dorms)
+"nm" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible/layer2,
+/obj/effect/turf_decal/tile/yellow/half/contrasted{
+ dir = 8
+ },
+/obj/item/tank/internals/oxygen{
+ pixel_x = 1
+ },
+/turf/open/floor/iron,
+/area/ruin/space/ancientstation/beta/atmos)
"np" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/light/directional/north,
@@ -3193,6 +3220,7 @@
/obj/effect/turf_decal/tile/blue/anticorner/contrasted{
dir = 8
},
+/obj/item/tank/internals/anesthetic/pure,
/turf/open/floor/iron/airless,
/area/ruin/space/ancientstation/beta/medbay)
"nD" = (
@@ -3404,6 +3432,11 @@
/obj/effect/decal/cleanable/xenoblood/xgibs/core,
/turf/open/floor/iron/white,
/area/ruin/space/ancientstation/delta/rnd)
+"oK" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/pipedispenser,
+/turf/open/floor/iron/airless,
+/area/ruin/space/ancientstation/beta/hall)
"oL" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
@@ -3535,9 +3568,7 @@
/turf/open/floor/iron,
/area/ruin/space/ancientstation/beta/atmos)
"pv" = (
-/obj/structure/window/reinforced/spawner/directional/north{
- layer = 2.9
- },
+/obj/structure/window/reinforced/spawner/directional/north,
/turf/open/floor/engine/n2,
/area/ruin/space/ancientstation/beta/atmos)
"pD" = (
@@ -3624,7 +3655,6 @@
/turf/open/floor/iron,
/area/ruin/space/ancientstation/beta/mining)
"qk" = (
-/obj/machinery/pipedispenser,
/obj/effect/turf_decal/stripes/line{
dir = 4
},
@@ -3866,10 +3896,9 @@
/area/ruin/space/ancientstation/charlie/hall)
"se" = (
/obj/effect/decal/cleanable/dirt,
-/obj/structure/window/reinforced/spawner/directional/east{
- layer = 2.9
- },
+/obj/structure/window/reinforced/spawner/directional/east,
/obj/effect/turf_decal/tile/yellow/half/contrasted,
+/obj/structure/reagent_dispensers/fueltank,
/turf/open/floor/iron,
/area/ruin/space/ancientstation/charlie/engie)
"si" = (
@@ -4208,9 +4237,7 @@
/area/ruin/space/ancientstation/beta/hall)
"uC" = (
/obj/structure/window/reinforced/spawner/directional/west,
-/obj/structure/window/reinforced/spawner/directional/north{
- layer = 2.9
- },
+/obj/structure/window/reinforced/spawner/directional/north,
/obj/machinery/atmospherics/components/unary/vent_pump/siphon/monitored{
dir = 8;
chamber_id = "beta-n2"
@@ -4419,7 +4446,7 @@
/obj/structure/closet/crate/secure/weapon{
req_access = list("away_sec")
},
-/obj/item/knife/combat,
+/obj/item/spess_knife,
/obj/item/clothing/suit/armor/vest/old,
/obj/item/gun/ballistic/rifle/boltaction,
/obj/item/ammo_box/strilka310,
@@ -5104,9 +5131,7 @@
"Bq" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/table,
-/obj/item/reagent_containers/condiment/enzyme{
- layer = 5
- },
+/obj/item/reagent_containers/condiment/enzyme,
/turf/open/floor/iron/cafeteria,
/area/ruin/space/ancientstation/charlie/kitchen)
"Bs" = (
@@ -5377,6 +5402,14 @@
/obj/effect/mapping_helpers/broken_floor,
/turf/open/floor/plating/airless,
/area/ruin/space/ancientstation/beta/supermatter)
+"DA" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/closet,
+/obj/item/storage/backpack/science,
+/obj/item/storage/backpack/messenger/science,
+/turf/open/floor/iron,
+/area/ruin/space/ancientstation/charlie/dorms)
"DB" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/cobweb,
@@ -5391,6 +5424,7 @@
dir = 1
},
/obj/machinery/light/small/directional/south,
+/obj/machinery/atmospherics/components/binary/tank_compressor,
/turf/open/floor/iron,
/area/ruin/space/ancientstation/beta/atmos)
"DI" = (
@@ -5723,9 +5757,9 @@
/area/ruin/space/ancientstation/charlie/hall)
"Gb" = (
/obj/effect/decal/cleanable/glass,
-/obj/item/stack/rods,
/obj/effect/mapping_helpers/broken_floor,
/obj/effect/turf_decal/stripes/line,
+/obj/structure/tank_dispenser/plasma,
/turf/open/floor/iron,
/area/ruin/space/ancientstation/beta/atmos)
"Gd" = (
@@ -5809,10 +5843,13 @@
/turf/open/floor/iron/cafeteria,
/area/ruin/space/ancientstation/charlie/kitchen)
"GP" = (
-/obj/machinery/pipedispenser/disposal,
/obj/effect/turf_decal/stripes/corner{
dir = 4
},
+/obj/machinery/atmospherics/components/unary/portables_connector/visible{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron,
/area/ruin/space/ancientstation/beta/atmos)
"GX" = (
@@ -8197,6 +8234,14 @@
dir = 1
},
/obj/effect/decal/cleanable/dirt,
+/obj/item/tank/internals/oxygen{
+ pixel_y = -8;
+ pixel_x = 8
+ },
+/obj/item/tank/internals/oxygen{
+ pixel_x = -4;
+ pixel_y = 4
+ },
/turf/open/floor/iron,
/area/ruin/space/ancientstation/beta/atmos)
"XD" = (
@@ -9963,7 +10008,7 @@ Uu
Yp
Gb
XB
-Ln
+nm
kK
Ln
ny
@@ -10159,7 +10204,7 @@ gJ
Ax
Ax
kQ
-Cj
+oK
Sf
Cj
VF
@@ -12209,7 +12254,7 @@ wb
bR
aG
nk
-mz
+DA
gZ
kN
Mt
@@ -14227,7 +14272,7 @@ ag
aM
NS
bh
-cz
+ds
cz
cz
ad
diff --git a/_maps/RandomRuins/SpaceRuins/spacehotel.dmm b/_maps/RandomRuins/SpaceRuins/spacehotel.dmm
index 3a2d28ba1ee8f..eec1e5a9671a7 100644
--- a/_maps/RandomRuins/SpaceRuins/spacehotel.dmm
+++ b/_maps/RandomRuins/SpaceRuins/spacehotel.dmm
@@ -847,9 +847,7 @@
pixel_x = 6;
pixel_y = 6
},
-/obj/item/reagent_containers/condiment/enzyme{
- layer = 5
- },
+/obj/item/reagent_containers/condiment/enzyme,
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
diff --git a/_maps/RandomRuins/SpaceRuins/the_outlet.dmm b/_maps/RandomRuins/SpaceRuins/the_outlet.dmm
index 327b0f558ca37..f8c540ed3fcb6 100644
--- a/_maps/RandomRuins/SpaceRuins/the_outlet.dmm
+++ b/_maps/RandomRuins/SpaceRuins/the_outlet.dmm
@@ -10,6 +10,18 @@
},
/turf/open/floor/iron/small,
/area/ruin/space/has_grav/the_outlet/storefront)
+"ao" = (
+/obj/structure/rack,
+/obj/item/clothing/head/cowboy/brown,
+/obj/item/clothing/shoes/cowboy,
+/obj/item/clothing/under/costume/dutch,
+/obj/item/clothing/suit/costume/poncho,
+/obj/item/cigarette/cigar,
+/obj/structure/window/reinforced/spawner/directional/south,
+/obj/structure/window/reinforced/spawner/directional/east,
+/obj/structure/window/reinforced/spawner/directional/west,
+/turf/open/floor/eighties,
+/area/ruin/space/has_grav/the_outlet/storefront)
"ar" = (
/obj/effect/decal/cleanable/dirt{
icon_state = "dirt-46"
@@ -85,16 +97,6 @@
},
/turf/open/floor/iron/white,
/area/ruin/space/has_grav/the_outlet/researchrooms)
-"cL" = (
-/obj/effect/rune/apocalypse{
- req_cultists = 999;
- layer = 2
- },
-/obj/structure/destructible/cult/pants_altar{
- layer = 3
- },
-/turf/open/floor/cult,
-/area/ruin/space/has_grav/the_outlet/cultinfluence)
"cZ" = (
/obj/structure/kitchenspike,
/obj/effect/decal/cleanable/blood/gibs{
@@ -558,18 +560,6 @@
/obj/item/clothing/suit/jacket/straight_jacket,
/turf/open/floor/iron/freezer,
/area/ruin/space/has_grav/the_outlet/researchrooms)
-"oI" = (
-/obj/structure/rack,
-/obj/item/clothing/head/cowboy/brown,
-/obj/item/clothing/shoes/cowboy,
-/obj/item/clothing/under/costume/dutch,
-/obj/item/clothing/suit/costume/poncho,
-/obj/item/cigarette/cigar,
-/obj/structure/window/reinforced/spawner/directional/south,
-/obj/structure/window/reinforced/spawner/directional/east,
-/obj/structure/window/reinforced/spawner/directional/west,
-/turf/open/floor/eighties,
-/area/ruin/space/has_grav/the_outlet/storefront)
"ps" = (
/obj/structure/rack,
/obj/item/clothing/under/misc/bouncer,
@@ -1025,6 +1015,13 @@
},
/turf/open/floor/iron/white,
/area/ruin/space/has_grav/the_outlet/researchrooms)
+"yX" = (
+/obj/effect/rune/apocalypse{
+ req_cultists = 999
+ },
+/obj/structure/destructible/cult/pants_altar,
+/turf/open/floor/cult,
+/area/ruin/space/has_grav/the_outlet/cultinfluence)
"zc" = (
/obj/effect/decal/cleanable/crayon,
/obj/effect/decal/cleanable/blood/gibs/old,
@@ -3433,7 +3430,7 @@ HV
xI
TM
nq
-oI
+ao
HH
HH
Kp
@@ -3638,7 +3635,7 @@ qy
wl
RO
PE
-cL
+yX
ML
RO
zc
diff --git a/_maps/RandomRuins/SpaceRuins/transit_booth.dmm b/_maps/RandomRuins/SpaceRuins/transit_booth.dmm
index eaff9f2f073b0..52dbf8149f8e2 100644
--- a/_maps/RandomRuins/SpaceRuins/transit_booth.dmm
+++ b/_maps/RandomRuins/SpaceRuins/transit_booth.dmm
@@ -16,16 +16,6 @@
/obj/structure/sign/warning/vacuum/external/directional/north,
/turf/open/floor/plating,
/area/ruin/space/has_grav/transit_booth)
-"ad" = (
-/obj/effect/turf_decal/siding/dark{
- dir = 4
- },
-/obj/machinery/light/directional/east,
-/obj/effect/turf_decal/siding/dark{
- dir = 8
- },
-/turf/open/floor/iron,
-/area/ruin/space/has_grav/transit_booth)
"ae" = (
/obj/machinery/vending/coffee,
/turf/open/floor/iron/dark,
@@ -93,23 +83,6 @@
/obj/machinery/light/small/directional/west,
/turf/open/floor/iron/dark,
/area/ruin/space/has_grav/transit_booth)
-"an" = (
-/obj/structure/chair/comfy/black{
- dir = 8
- },
-/obj/structure/sign/poster/official/cohiba_robusto_ad/directional/north,
-/turf/open/floor/iron/dark,
-/area/ruin/space/has_grav/transit_booth)
-"ao" = (
-/obj/effect/turf_decal/siding/dark{
- dir = 8
- },
-/obj/machinery/light/directional/west,
-/obj/effect/turf_decal/siding/dark{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/ruin/space/has_grav/transit_booth)
"ap" = (
/obj/machinery/door/airlock/external{
name = "Transit Booth Airlock"
@@ -262,9 +235,7 @@
/turf/open/floor/iron,
/area/ruin/space/has_grav/transit_booth)
"aF" = (
-/obj/structure/window/reinforced/spawner/directional/south{
- layer = 2.9
- },
+/obj/structure/window/reinforced/spawner/directional/south,
/obj/structure/rack,
/obj/item/reagent_containers/cup/glass/bottle/absinthe/premium{
pixel_x = 6
@@ -280,9 +251,7 @@
/turf/open/floor/iron/dark,
/area/ruin/space/has_grav/transit_booth)
"aG" = (
-/obj/structure/window/reinforced/spawner/directional/south{
- layer = 2.9
- },
+/obj/structure/window/reinforced/spawner/directional/south,
/obj/machinery/mass_driver{
dir = 1;
id = "north"
@@ -325,14 +294,6 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/ruin/space/has_grav/transit_booth)
-"aJ" = (
-/obj/structure/table,
-/obj/item/reagent_containers/cup/glass/coffee{
- pixel_x = 6;
- pixel_y = 3
- },
-/turf/open/floor/iron/dark,
-/area/ruin/space/has_grav/transit_booth)
"aK" = (
/obj/machinery/door/poddoor{
id = "south"
@@ -342,17 +303,6 @@
/obj/structure/table/reinforced,
/turf/open/floor/plating,
/area/ruin/space/has_grav/transit_booth)
-"aL" = (
-/obj/structure/table,
-/obj/item/storage/fancy/cigarettes/cigars{
- pixel_y = 11;
- pixel_x = 3
- },
-/obj/item/lighter{
- pixel_x = -8
- },
-/turf/open/floor/iron/dark,
-/area/ruin/space/has_grav/transit_booth)
"aM" = (
/obj/machinery/door/poddoor{
id = "north"
@@ -442,9 +392,7 @@
/turf/open/floor/iron,
/area/ruin/space/has_grav/transit_booth)
"aV" = (
-/obj/structure/window/reinforced/spawner/directional/south{
- layer = 2.9
- },
+/obj/structure/window/reinforced/spawner/directional/south,
/obj/structure/rack,
/obj/item/book/random{
pixel_x = -5;
@@ -461,9 +409,7 @@
/turf/open/floor/iron/dark,
/area/ruin/space/has_grav/transit_booth)
"aW" = (
-/obj/structure/window/reinforced/spawner/directional/west{
- layer = 2.9
- },
+/obj/structure/window/reinforced/spawner/directional/west,
/obj/machinery/mass_driver{
dir = 4;
id = "east"
@@ -486,13 +432,6 @@
},
/turf/open/floor/iron/dark,
/area/ruin/space/has_grav/transit_booth)
-"aY" = (
-/obj/structure/chair/comfy/black{
- dir = 4
- },
-/obj/structure/sign/poster/official/high_class_martini/directional/south,
-/turf/open/floor/iron/dark,
-/area/ruin/space/has_grav/transit_booth)
"aZ" = (
/obj/effect/turf_decal/siding/dark{
dir = 5
diff --git a/_maps/RandomRuins/SpaceRuins/travelers_rest.dmm b/_maps/RandomRuins/SpaceRuins/travelers_rest.dmm
index d36e65ddc2269..af55da5cb4f37 100644
--- a/_maps/RandomRuins/SpaceRuins/travelers_rest.dmm
+++ b/_maps/RandomRuins/SpaceRuins/travelers_rest.dmm
@@ -69,9 +69,7 @@
/obj/effect/turf_decal/trimline/blue/filled/line{
dir = 9
},
-/obj/machinery/chem_dispenser{
- layer = 2.7
- },
+/obj/machinery/chem_dispenser,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/ruin/space/has_grav/travelers_rest)
diff --git a/_maps/RandomRuins/SpaceRuins/waystation.dmm b/_maps/RandomRuins/SpaceRuins/waystation.dmm
index baa77a700d20e..38f8fcbac8cdd 100644
--- a/_maps/RandomRuins/SpaceRuins/waystation.dmm
+++ b/_maps/RandomRuins/SpaceRuins/waystation.dmm
@@ -1105,13 +1105,11 @@
"rF" = (
/obj/machinery/button/door/directional/east{
id = "Blastdoor_load";
- layer = 4;
name = "Loading Doors";
pixel_y = -6
},
/obj/machinery/button/door/directional/east{
id = "Blastdoor_unload";
- layer = 4;
name = "Loading Doors";
pixel_y = 6
},
@@ -2241,9 +2239,7 @@
/area/ruin/space/has_grav/waystation/securestorage)
"NK" = (
/obj/effect/turf_decal/bot,
-/obj/machinery/atmospherics/components/tank/air{
- piping_layer = 4
- },
+/obj/machinery/atmospherics/components/tank/air,
/turf/open/floor/plating,
/area/ruin/space/has_grav/waystation)
"NT" = (
diff --git a/_maps/RandomZLevels/SnowCabin.dmm b/_maps/RandomZLevels/SnowCabin.dmm
index ff38749b2060d..a3e337ca01fe6 100644
--- a/_maps/RandomZLevels/SnowCabin.dmm
+++ b/_maps/RandomZLevels/SnowCabin.dmm
@@ -2051,10 +2051,6 @@
/obj/structure/chair/wood,
/turf/open/floor/wood/freezing,
/area/awaymission/cabin/lumbermill)
-"jV" = (
-/mob/living/basic/bot/firebot,
-/turf/open/floor/wood/freezing,
-/area/awaymission/cabin/lumbermill)
"jW" = (
/obj/structure/table/wood,
/obj/item/gun/energy/floragun,
@@ -2758,36 +2754,6 @@
},
/turf/open/misc/asteroid/snow/snow_cabin,
/area/awaymission/cabin/caves)
-"px" = (
-/obj/structure/statue/snow/snowman{
- anchored = 1;
- name = "Who"
- },
-/obj/item/clothing/head/helmet/knight/yellow{
- desc = "A classic metal helmet. The cold has made it unreliable though.";
- name = "old medieval helmet";
- pixel_y = 7
- },
-/obj/item/claymore/weak/ceremonial{
- desc = "Brought to you by the guys in charge of making replica katana toys!";
- force = 1;
- layer = 3.01;
- name = "replica claymore";
- pixel_x = 5;
- pixel_y = 8;
- throwforce = 2
- },
-/obj/item/shield/roman/fake{
- layer = 3.01;
- pixel_x = -7
- },
-/obj/effect/light_emitter{
- set_cap = 3;
- set_luminosity = 6;
- light_color = "#9bbbff"
- },
-/turf/open/misc/asteroid/snow/snow_cabin,
-/area/awaymission/cabin/snowforest)
"pB" = (
/obj/structure/fluff/fokoff_sign,
/obj/effect/light_emitter{
@@ -3367,29 +3333,6 @@
/obj/effect/decal/cleanable/plasma,
/turf/open/misc/asteroid/snow/snow_cabin,
/area/awaymission/cabin/caves)
-"wf" = (
-/obj/structure/statue/snow/snowman{
- anchored = 1;
- name = "I Don't Know"
- },
-/obj/item/clothing/head/chaplain/bishopmitre{
- pixel_x = -1;
- pixel_y = 16
- },
-/obj/item/gun/magic/wand{
- desc = "It's just a fancy staff so that holy clerics and priests look cool. What? You didn't think someone would leave a REAL magic artifact with a snowman out in the cold, did you?";
- icon_state = "revivewand";
- layer = 3.01;
- name = "holy staff";
- pixel_y = -2
- },
-/obj/effect/light_emitter{
- set_cap = 3;
- set_luminosity = 6;
- light_color = "#9bbbff"
- },
-/turf/open/misc/asteroid/snow/snow_cabin,
-/area/awaymission/cabin/caves)
"wq" = (
/obj/machinery/recycler/lumbermill{
desc = "Is better at killing people than cutting logs, for some reason.";
@@ -4140,6 +4083,28 @@
/obj/structure/light_construct/directional/south,
/turf/open/misc/asteroid/snow/snow_cabin,
/area/awaymission/cabin/caves)
+"FY" = (
+/obj/structure/statue/snow/snowman{
+ anchored = 1;
+ name = "I Don't Know"
+ },
+/obj/item/clothing/head/chaplain/bishopmitre{
+ pixel_x = -1;
+ pixel_y = 16
+ },
+/obj/item/gun/magic/wand{
+ desc = "It's just a fancy staff so that holy clerics and priests look cool. What? You didn't think someone would leave a REAL magic artifact with a snowman out in the cold, did you?";
+ icon_state = "revivewand";
+ name = "holy staff";
+ pixel_y = -2
+ },
+/obj/effect/light_emitter{
+ set_cap = 3;
+ set_luminosity = 6;
+ light_color = "#9bbbff"
+ },
+/turf/open/misc/asteroid/snow/snow_cabin,
+/area/awaymission/cabin/caves)
"Gb" = (
/obj/effect/light_emitter{
name = "outdoor light";
@@ -4408,25 +4373,6 @@
},
/turf/open/floor/plating/snowed/snow_cabin,
/area/awaymission/cabin/snowforest)
-"JZ" = (
-/obj/structure/statue/snow/snowman{
- anchored = 1;
- name = "What"
- },
-/obj/item/clothing/head/wizard/fake{
- pixel_x = -1;
- pixel_y = 13
- },
-/obj/item/staff{
- layer = 3.01
- },
-/obj/effect/light_emitter{
- set_cap = 3;
- set_luminosity = 6;
- light_color = "#9bbbff"
- },
-/turf/open/misc/asteroid/snow/snow_cabin,
-/area/awaymission/cabin/caves)
"Kf" = (
/obj/effect/light_emitter{
set_cap = 3;
@@ -4684,6 +4630,10 @@
},
/turf/open/misc/asteroid/snow/snow_cabin,
/area/awaymission/cabin/snowforest)
+"NU" = (
+/mob/living/basic/bot/firebot,
+/turf/open/floor/wood/freezing,
+/area/awaymission/cabin/lumbermill)
"Oe" = (
/turf/open/misc/asteroid/snow/snow_cabin,
/area/awaymission/cabin/caves)
@@ -5268,6 +5218,34 @@
},
/turf/open/floor/wood,
/area/awaymission/cabin)
+"Vr" = (
+/obj/structure/statue/snow/snowman{
+ anchored = 1;
+ name = "Who"
+ },
+/obj/item/clothing/head/helmet/knight/yellow{
+ desc = "A classic metal helmet. The cold has made it unreliable though.";
+ name = "old medieval helmet";
+ pixel_y = 7
+ },
+/obj/item/claymore/weak/ceremonial{
+ desc = "Brought to you by the guys in charge of making replica katana toys!";
+ force = 1;
+ name = "replica claymore";
+ pixel_x = 5;
+ pixel_y = 8;
+ throwforce = 2
+ },
+/obj/item/shield/roman/fake{
+ pixel_x = -7
+ },
+/obj/effect/light_emitter{
+ set_cap = 3;
+ set_luminosity = 6;
+ light_color = "#9bbbff"
+ },
+/turf/open/misc/asteroid/snow/snow_cabin,
+/area/awaymission/cabin/snowforest)
"VA" = (
/obj/effect/light_emitter{
set_cap = 3;
@@ -5549,6 +5527,23 @@
},
/turf/open/floor/plating/snowed/snow_cabin,
/area/awaymission/cabin/snowforest)
+"Zh" = (
+/obj/structure/statue/snow/snowman{
+ anchored = 1;
+ name = "What"
+ },
+/obj/item/clothing/head/wizard/fake{
+ pixel_x = -1;
+ pixel_y = 13
+ },
+/obj/item/staff,
+/obj/effect/light_emitter{
+ set_cap = 3;
+ set_luminosity = 6;
+ light_color = "#9bbbff"
+ },
+/turf/open/misc/asteroid/snow/snow_cabin,
+/area/awaymission/cabin/caves)
"Zw" = (
/obj/effect/turf_decal/stripes/red/line{
dir = 4
@@ -28559,7 +28554,7 @@ ab
ab
ab
ue
-JZ
+Zh
vh
vh
vh
@@ -28817,7 +28812,7 @@ ab
ue
IX
vh
-px
+Vr
vh
Qi
vh
@@ -29073,7 +29068,7 @@ ab
ab
ab
ue
-wf
+FY
vh
vh
vh
@@ -37570,7 +37565,7 @@ pH
af
af
af
-jV
+NU
af
af
af
diff --git a/_maps/RandomZLevels/TheBeach.dmm b/_maps/RandomZLevels/TheBeach.dmm
index c18eba4fbc266..c3fec8319e4be 100644
--- a/_maps/RandomZLevels/TheBeach.dmm
+++ b/_maps/RandomZLevels/TheBeach.dmm
@@ -327,6 +327,23 @@
},
/turf/open/floor/wood/large,
/area/awaymission/beach)
+"eu" = (
+/obj/structure/window/reinforced/spawner/directional/east,
+/obj/structure/window/reinforced/spawner/directional/north,
+/obj/structure/chair/stool/directional/south,
+/obj/item/clothing/glasses/sunglasses{
+ pixel_y = -2;
+ pixel_x = 2
+ },
+/obj/item/bikehorn/airhorn{
+ pixel_y = -15;
+ pixel_x = -13
+ },
+/obj/effect/turf_decal/siding/wood{
+ dir = 5
+ },
+/turf/open/floor/wood,
+/area/awaymission/beach)
"eE" = (
/obj/structure/table/glass,
/obj/machinery/microwave{
@@ -344,18 +361,21 @@
},
/turf/open/misc/beach/sand,
/area/awaymission/beach)
-"eT" = (
+"eL" = (
/obj/structure/table/wood,
-/obj/item/cigarette/cigar{
- pixel_y = 16;
- pixel_x = -2
+/obj/item/reagent_containers/condiment/enzyme{
+ pixel_x = 9;
+ pixel_y = 5
},
-/obj/item/reagent_containers/cup/glass/coffee{
- pixel_x = 8;
- pixel_y = 9
+/obj/item/food/seaweedsheet{
+ pixel_y = 6;
+ pixel_x = -4
},
-/obj/machinery/cell_charger,
-/turf/open/floor/iron/dark/diagonal,
+/obj/item/food/seaweedsheet{
+ pixel_x = -15;
+ pixel_y = 2
+ },
+/turf/open/floor/wood/large,
/area/awaymission/beach)
"fa" = (
/obj/structure/table/reinforced,
@@ -692,6 +712,19 @@
},
/turf/open/floor/wood/large,
/area/awaymission/beach)
+"iO" = (
+/obj/structure/table/wood,
+/obj/item/cigarette/cigar{
+ pixel_y = 16;
+ pixel_x = -2
+ },
+/obj/item/reagent_containers/cup/glass/coffee{
+ pixel_x = 8;
+ pixel_y = 9
+ },
+/obj/machinery/cell_charger,
+/turf/open/floor/iron/dark/diagonal,
+/area/awaymission/beach)
"iU" = (
/obj/structure/table/wood,
/obj/machinery/chem_dispenser/drinks/fullupgrade{
@@ -2020,23 +2053,6 @@
},
/turf/open/misc/beach/sand,
/area/awaymission/beach)
-"Aa" = (
-/obj/structure/table/wood,
-/obj/item/reagent_containers/condiment/enzyme{
- layer = 5;
- pixel_x = 9;
- pixel_y = 5
- },
-/obj/item/food/seaweedsheet{
- pixel_y = 6;
- pixel_x = -4
- },
-/obj/item/food/seaweedsheet{
- pixel_x = -15;
- pixel_y = 2
- },
-/turf/open/floor/wood/large,
-/area/awaymission/beach)
"Ar" = (
/turf/open/floor/carpet/blue,
/area/awaymission/beach)
@@ -2508,25 +2524,6 @@
/obj/item/toy/seashell,
/turf/open/misc/beach/coast,
/area/awaymission/beach)
-"Ft" = (
-/obj/structure/window/reinforced/spawner/directional/east,
-/obj/structure/window/reinforced/spawner/directional/north{
- layer = 2.9
- },
-/obj/structure/chair/stool/directional/south,
-/obj/item/clothing/glasses/sunglasses{
- pixel_y = -2;
- pixel_x = 2
- },
-/obj/item/bikehorn/airhorn{
- pixel_y = -15;
- pixel_x = -13
- },
-/obj/effect/turf_decal/siding/wood{
- dir = 5
- },
-/turf/open/floor/wood,
-/area/awaymission/beach)
"Fu" = (
/obj/structure/flora/tree/palm{
pixel_y = 31
@@ -14739,7 +14736,7 @@ eE
un
Cb
uJ
-eT
+iO
un
Pk
xv
@@ -18633,7 +18630,7 @@ DF
xv
Cl
Zp
-Aa
+eL
pN
Zp
kB
@@ -20950,7 +20947,7 @@ ls
VY
VY
VY
-Ft
+eu
wC
St
VY
diff --git a/_maps/RandomZLevels/moonoutpost19.dmm b/_maps/RandomZLevels/moonoutpost19.dmm
index 9473a5e3ba09a..0983bd02f3aec 100644
--- a/_maps/RandomZLevels/moonoutpost19.dmm
+++ b/_maps/RandomZLevels/moonoutpost19.dmm
@@ -79,16 +79,6 @@
dir = 5
},
/area/awaymission/moonoutpost19/research)
-"aq" = (
-/obj/effect/turf_decal/siding/purple,
-/obj/effect/turf_decal/tile/dark/opposingcorners{
- dir = 1
- },
-/obj/machinery/computer/security/telescreen/moon_outpost/xenobio/directional/south,
-/turf/open/floor/iron/cafeteria{
- dir = 5
- },
-/area/awaymission/moonoutpost19/research)
"as" = (
/obj/item/stack/rods,
/obj/structure/cable,
@@ -109,15 +99,6 @@
},
/turf/open/floor/iron,
/area/awaymission/moonoutpost19/arrivals)
-"aJ" = (
-/obj/machinery/door/poddoor{
- id = "AwayRD";
- layer = 2.9;
- name = "Privacy Shutter"
- },
-/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/plating,
-/area/awaymission/moonoutpost19/research)
"aK" = (
/obj/structure/table/reinforced,
/obj/structure/window/reinforced/spawner/directional/north,
@@ -315,14 +296,6 @@
/obj/effect/turf_decal/stripes/red/end,
/turf/open/floor/iron/half,
/area/awaymission/moonoutpost19/syndicate)
-"cp" = (
-/obj/structure/table/reinforced,
-/obj/structure/alien/weeds,
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/turf/open/floor/iron,
-/area/awaymission/moonoutpost19/research)
"cq" = (
/obj/machinery/vending/medical{
req_access = "201"
@@ -648,17 +621,6 @@
/obj/machinery/vending/coffee,
/turf/open/floor/iron/dark,
/area/awaymission/moonoutpost19/research)
-"ez" = (
-/obj/structure/table,
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/cell_charger,
-/obj/item/stock_parts/power_store/cell/high,
-/obj/item/radio/off{
- pixel_x = 8;
- pixel_y = 17
- },
-/turf/open/floor/plating,
-/area/awaymission/moonoutpost19/research)
"eA" = (
/obj/structure/flora/lunar_plant,
/turf/open/misc/asteroid/moon{
@@ -924,17 +886,6 @@
},
/turf/open/floor/engine,
/area/awaymission/moonoutpost19/research)
-"ge" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/door/poddoor{
- desc = "A heavy duty blast door that opens mechanically. This one has been applied with an acid-proof coating.";
- id = "Awaybiohazard";
- layer = 2.9;
- name = "Acid-Proof Biohazard Containment Door"
- },
-/obj/effect/turf_decal/delivery,
-/turf/open/floor/iron,
-/area/awaymission/moonoutpost19/research)
"gg" = (
/obj/effect/turf_decal/stripes/asteroid/line,
/obj/structure/lattice/catwalk,
@@ -2116,6 +2067,16 @@
initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
},
/area/awaymission/moonoutpost19/hive)
+"nD" = (
+/obj/item/pickaxe{
+ pixel_x = -12;
+ pixel_y = 6
+ },
+/obj/structure/flora/rock/style_random{
+ pixel_y = -2
+ },
+/turf/open/misc/asteroid/basalt,
+/area/awaymission/moonoutpost19/main)
"nE" = (
/obj/machinery/door/poddoor/preopen{
desc = "A heavy duty blast door that opens mechanically. This one has been applied with an acid-proof coating.";
@@ -2224,22 +2185,6 @@
},
/turf/open/floor/iron/white/corner,
/area/awaymission/moonoutpost19/arrivals)
-"os" = (
-/obj/machinery/door/poddoor/preopen{
- desc = "A heavy duty blast door that opens mechanically. This one has been applied with an acid-proof coating.";
- id = "Awaybiohazard";
- name = "Acid-Proof Biohazard Containment Door"
- },
-/obj/machinery/door/poddoor{
- desc = "A heavy duty blast door that opens mechanically. This one has been applied with an acid-proof coating.";
- id = "Awaybiohazard";
- layer = 2.9;
- name = "Acid-Proof Biohazard Containment Door"
- },
-/obj/effect/spawner/structure/window/reinforced,
-/obj/structure/cable,
-/turf/open/floor/plating,
-/area/awaymission/moonoutpost19/research)
"ot" = (
/obj/machinery/door/airlock{
name = "Private Restroom"
@@ -2375,26 +2320,21 @@
initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
},
/area/awaymission/moonoutpost19/syndicate)
-"pF" = (
-/obj/machinery/light/small/directional/north,
-/obj/structure/window/reinforced/spawner/directional/east{
- layer = 2.9
- },
-/obj/structure/table,
-/obj/structure/bedsheetbin,
-/obj/item/clothing/neck/tie/black,
-/obj/item/clothing/under/costume/buttondown/slacks/service,
-/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 8
+"pG" = (
+/obj/machinery/door/poddoor/preopen{
+ desc = "A heavy duty blast door that opens mechanically. This one has been applied with an acid-proof coating.";
+ id = "Awaybiohazard";
+ name = "Acid-Proof Biohazard Containment Door"
},
-/turf/open/floor/iron/cafeteria{
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
- temperature = 251
+/obj/machinery/door/poddoor{
+ desc = "A heavy duty blast door that opens mechanically. This one has been applied with an acid-proof coating.";
+ id = "Awaybiohazard";
+ name = "Acid-Proof Biohazard Containment Door"
},
-/area/awaymission/moonoutpost19/arrivals)
+/obj/effect/spawner/structure/window/reinforced,
+/obj/structure/cable,
+/turf/open/floor/plating,
+/area/awaymission/moonoutpost19/research)
"pH" = (
/obj/structure/table,
/obj/item/folder/red,
@@ -2577,6 +2517,16 @@
initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
},
/area/awaymission/moonoutpost19/hive)
+"qD" = (
+/obj/machinery/door/firedoor,
+/obj/machinery/door/poddoor{
+ desc = "A heavy duty blast door that opens mechanically. This one has been applied with an acid-proof coating.";
+ id = "Awaybiohazard";
+ name = "Acid-Proof Biohazard Containment Door"
+ },
+/obj/effect/turf_decal/delivery,
+/turf/open/floor/iron,
+/area/awaymission/moonoutpost19/research)
"qI" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/cable,
@@ -3064,6 +3014,13 @@
initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
},
/area/awaymission/moonoutpost19/mines)
+"ty" = (
+/obj/structure/table,
+/obj/machinery/cell_charger,
+/obj/item/stock_parts/power_store/cell/high,
+/obj/effect/turf_decal/siding/thinplating_new/light,
+/turf/open/floor/iron,
+/area/awaymission/moonoutpost19/arrivals)
"tA" = (
/obj/structure/urinal/directional/north,
/obj/machinery/duct,
@@ -3156,6 +3113,14 @@
/obj/effect/turf_decal/lunar_sand,
/turf/open/floor/plating,
/area/awaymission/moonoutpost19/arrivals)
+"uh" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w{
+ dir = 4
+ },
+/obj/structure/cable,
+/obj/machinery/computer/security/telescreen/moon_outpost/xenobio/directional/east,
+/turf/open/floor/iron/white,
+/area/awaymission/moonoutpost19/research)
"ui" = (
/obj/structure/fluff/meteor/sharp,
/turf/open/misc/asteroid/moon{
@@ -3262,13 +3227,6 @@
/obj/item/clothing/under/misc/assistantformal,
/turf/open/floor/carpet/red,
/area/awaymission/moonoutpost19/arrivals)
-"uN" = (
-/obj/structure/table,
-/obj/machinery/cell_charger,
-/obj/item/stock_parts/power_store/cell/high,
-/obj/effect/turf_decal/siding/thinplating_new/light,
-/turf/open/floor/iron,
-/area/awaymission/moonoutpost19/arrivals)
"uR" = (
/obj/structure/table,
/obj/item/storage/toolbox/mechanical{
@@ -3451,21 +3409,6 @@
/obj/structure/cable,
/turf/open/floor/plating,
/area/awaymission/moonoutpost19/research)
-"vR" = (
-/obj/structure/bed,
-/obj/item/bedsheet,
-/obj/effect/decal/remains/human{
- desc = "They look like human remains. The skeleton is laid out on its side and there seems to have been no sign of struggle.";
- layer = 4.1
- },
-/obj/machinery/button/door/directional/west{
- id = "awaydorm3";
- name = "Door Bolt Control";
- normaldoorcontrol = 1;
- specialfunctions = 4
- },
-/turf/open/floor/carpet/royalblue,
-/area/awaymission/moonoutpost19/arrivals)
"vT" = (
/obj/effect/mapping_helpers/burnt_floor,
/turf/open/floor/plating,
@@ -3491,13 +3434,6 @@
initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
},
/area/awaymission/moonoutpost19/mines)
-"wc" = (
-/obj/structure/table,
-/obj/item/stock_parts/power_store/cell/crap/empty{
- pixel_x = -4
- },
-/turf/open/floor/pod/dark,
-/area/awaymission/moonoutpost19/tent)
"wh" = (
/obj/structure/alien/weeds/node,
/obj/structure/alien/resin/wall,
@@ -3565,6 +3501,16 @@
},
/turf/open/floor/plastic,
/area/awaymission/moonoutpost19/arrivals/shed)
+"wR" = (
+/obj/effect/turf_decal/siding/purple,
+/obj/effect/turf_decal/tile/dark/opposingcorners{
+ dir = 1
+ },
+/obj/machinery/computer/security/telescreen/moon_outpost/xenobio/directional/south,
+/turf/open/floor/iron/cafeteria{
+ dir = 5
+ },
+/area/awaymission/moonoutpost19/research)
"wT" = (
/obj/structure/closet/secure_closet/personal/cabinet{
locked = 0;
@@ -3661,6 +3607,14 @@
/obj/effect/spawner/random/medical/surgery_tool_advanced,
/turf/closed/mineral/random,
/area/awaymission/moonoutpost19/mines)
+"xz" = (
+/obj/structure/table/reinforced,
+/obj/structure/alien/weeds,
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/turf/open/floor/iron,
+/area/awaymission/moonoutpost19/research)
"xB" = (
/obj/effect/turf_decal/lunar_sand/plating,
/turf/open/floor/plating{
@@ -3770,21 +3724,6 @@
},
/turf/open/floor/iron,
/area/awaymission/moonoutpost19/arrivals)
-"yx" = (
-/obj/machinery/conveyor_switch/oneway{
- id = "awaysyndie";
- layer = 3.1;
- name = "mining conveyor"
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/obj/effect/decal/cleanable/fuel_pool,
-/turf/open/floor/iron{
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
- temperature = 251
- },
-/area/awaymission/moonoutpost19/syndicate)
"yz" = (
/obj/machinery/portable_atmospherics/scrubber,
/turf/open/floor/plating,
@@ -4116,18 +4055,6 @@
/obj/structure/table/wood,
/turf/open/floor/iron,
/area/awaymission/moonoutpost19/arrivals)
-"Bb" = (
-/obj/effect/turf_decal/tile/bar,
-/obj/effect/turf_decal/tile/bar{
- dir = 1
- },
-/obj/item/crowbar{
- layer = 2.9;
- pixel_x = 7;
- pixel_y = -13
- },
-/turf/open/floor/iron,
-/area/awaymission/moonoutpost19/arrivals)
"Bc" = (
/obj/vehicle/ridden/atv{
dir = 4
@@ -4149,14 +4076,6 @@
/obj/machinery/duct,
/turf/open/floor/iron,
/area/awaymission/moonoutpost19/arrivals)
-"Bg" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w{
- dir = 4
- },
-/obj/structure/cable,
-/obj/machinery/computer/security/telescreen/moon_outpost/xenobio/directional/east,
-/turf/open/floor/iron/white,
-/area/awaymission/moonoutpost19/research)
"Bk" = (
/obj/machinery/door/airlock/maintenance,
/obj/machinery/duct,
@@ -4465,6 +4384,19 @@
},
/turf/open/floor/plating,
/area/awaymission/moonoutpost19/arrivals)
+"Dd" = (
+/obj/structure/table/reinforced,
+/obj/structure/window/reinforced/spawner/directional/north,
+/obj/effect/turf_decal/siding/purple/corner{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/dark/opposingcorners{
+ dir = 1
+ },
+/turf/open/floor/iron/cafeteria{
+ dir = 5
+ },
+/area/awaymission/moonoutpost19/research)
"Df" = (
/obj/structure/grille/broken,
/obj/item/stack/rods,
@@ -4731,6 +4663,20 @@
temperature = 251
},
/area/awaymission/moonoutpost19/arrivals)
+"Fs" = (
+/obj/machinery/conveyor_switch/oneway{
+ id = "awaysyndie";
+ name = "mining conveyor"
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/effect/decal/cleanable/fuel_pool,
+/turf/open/floor/iron{
+ initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
+ temperature = 251
+ },
+/area/awaymission/moonoutpost19/syndicate)
"Ft" = (
/obj/effect/decal/cleanable/robot_debris,
/obj/effect/decal/cleanable/oil,
@@ -4749,17 +4695,6 @@
/obj/item/bodypart/arm/left/robot,
/turf/open/floor/iron/white,
/area/awaymission/moonoutpost19/research)
-"Fw" = (
-/obj/item/pickaxe{
- layer = 2.9;
- pixel_x = -12;
- pixel_y = 6
- },
-/obj/structure/flora/rock/style_random{
- pixel_y = -2
- },
-/turf/open/misc/asteroid/basalt,
-/area/awaymission/moonoutpost19/main)
"FA" = (
/turf/open/lava/airless,
/area/awaymission/moonoutpost19/mines)
@@ -4843,6 +4778,24 @@
temperature = 251
},
/area/awaymission/moonoutpost19/arrivals)
+"FS" = (
+/obj/machinery/light/small/directional/north,
+/obj/structure/window/reinforced/spawner/directional/east,
+/obj/structure/table,
+/obj/structure/bedsheetbin,
+/obj/item/clothing/neck/tie/black,
+/obj/item/clothing/under/costume/buttondown/slacks/service,
+/obj/effect/turf_decal/tile/blue{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/blue{
+ dir = 8
+ },
+/turf/open/floor/iron/cafeteria{
+ initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
+ temperature = 251
+ },
+/area/awaymission/moonoutpost19/arrivals)
"FY" = (
/obj/structure/window/reinforced/spawner/directional/west,
/obj/effect/turf_decal/stripes/line{
@@ -4872,6 +4825,20 @@
initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
},
/area/awaymission/moonoutpost19/main)
+"Gf" = (
+/obj/structure/bed,
+/obj/item/bedsheet,
+/obj/effect/decal/remains/human{
+ desc = "They look like human remains. The skeleton is laid out on its side and there seems to have been no sign of struggle."
+ },
+/obj/machinery/button/door/directional/west{
+ id = "awaydorm3";
+ name = "Door Bolt Control";
+ normaldoorcontrol = 1;
+ specialfunctions = 4
+ },
+/turf/open/floor/carpet/royalblue,
+/area/awaymission/moonoutpost19/arrivals)
"Gh" = (
/obj/structure/closet/l3closet/scientist,
/obj/structure/window/reinforced/spawner/directional/south,
@@ -5429,6 +5396,18 @@
/obj/structure/cable,
/turf/open/floor/plating,
/area/awaymission/moonoutpost19/research)
+"JO" = (
+/obj/structure/table,
+/obj/machinery/cell_charger,
+/obj/machinery/light/small/directional/west,
+/obj/item/stock_parts/power_store/cell/high,
+/obj/item/paper/fluff/awaymissions/moonoutpost19/engineering,
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/structure/cable,
+/turf/open/floor/plating,
+/area/awaymission/moonoutpost19/syndicate)
"JQ" = (
/turf/open/floor/iron{
initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
@@ -5452,18 +5431,6 @@
},
/turf/open/floor/iron/white,
/area/awaymission/moonoutpost19/research)
-"JZ" = (
-/obj/structure/table,
-/obj/machinery/cell_charger,
-/obj/machinery/light/small/directional/west,
-/obj/item/stock_parts/power_store/cell/high,
-/obj/item/paper/fluff/awaymissions/moonoutpost19/engineering,
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/obj/structure/cable,
-/turf/open/floor/plating,
-/area/awaymission/moonoutpost19/syndicate)
"Kb" = (
/obj/structure/alien/weeds,
/obj/structure/bed/nest,
@@ -5729,6 +5696,17 @@
dir = 5
},
/area/awaymission/moonoutpost19/arrivals)
+"MD" = (
+/obj/structure/table,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/cell_charger,
+/obj/item/stock_parts/power_store/cell/high,
+/obj/item/radio/off{
+ pixel_x = 8;
+ pixel_y = 17
+ },
+/turf/open/floor/plating,
+/area/awaymission/moonoutpost19/research)
"MF" = (
/obj/structure/flora/rock/style_random{
pixel_y = -2
@@ -5767,6 +5745,13 @@
},
/turf/open/floor/iron,
/area/awaymission/moonoutpost19/arrivals)
+"MW" = (
+/obj/structure/table,
+/obj/item/stock_parts/power_store/cell/crap/empty{
+ pixel_x = -4
+ },
+/turf/open/floor/pod/dark,
+/area/awaymission/moonoutpost19/tent)
"Nf" = (
/obj/effect/spawner/structure/window,
/turf/open/floor/plating,
@@ -5950,19 +5935,6 @@
initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
},
/area/awaymission/moonoutpost19/syndicate)
-"NY" = (
-/obj/structure/table/reinforced,
-/obj/structure/window/reinforced/spawner/directional/north,
-/obj/effect/turf_decal/siding/purple/corner{
- dir = 4
- },
-/obj/effect/turf_decal/tile/dark/opposingcorners{
- dir = 1
- },
-/turf/open/floor/iron/cafeteria{
- dir = 5
- },
-/area/awaymission/moonoutpost19/research)
"Oa" = (
/obj/structure/sink{
dir = 4;
@@ -6025,13 +5997,6 @@
/obj/effect/turf_decal/lunar_sand/plating,
/turf/open/floor/plating,
/area/awaymission/moonoutpost19/main)
-"Ou" = (
-/obj/structure/table/wood,
-/obj/item/lighter,
-/obj/machinery/newscaster/directional/east,
-/obj/item/cigarette/cigar,
-/turf/open/floor/carpet/orange,
-/area/awaymission/moonoutpost19/arrivals)
"Ov" = (
/turf/open/floor/iron,
/area/awaymission/moonoutpost19/research)
@@ -6167,6 +6132,14 @@
initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
},
/area/awaymission/moonoutpost19/mines)
+"Pa" = (
+/obj/machinery/door/poddoor{
+ id = "AwayRD";
+ name = "Privacy Shutter"
+ },
+/obj/effect/spawner/structure/window/reinforced,
+/turf/open/floor/plating,
+/area/awaymission/moonoutpost19/research)
"Pf" = (
/obj/item/flashlight/flare{
start_on = 1
@@ -6523,6 +6496,17 @@
},
/turf/open/floor/iron/dark,
/area/awaymission/moonoutpost19/arrivals)
+"Ro" = (
+/obj/structure/table,
+/obj/item/stock_parts/power_store/cell/crap/empty,
+/obj/item/stock_parts/power_store/cell/crap/empty,
+/obj/item/stock_parts/power_store/cell/crap/empty{
+ pixel_x = -16;
+ pixel_y = 4
+ },
+/obj/machinery/cell_charger,
+/turf/open/floor/pod/dark,
+/area/awaymission/moonoutpost19/tent)
"Rq" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
@@ -6763,6 +6747,17 @@
initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
},
/area/awaymission/moonoutpost19/main)
+"SN" = (
+/obj/effect/turf_decal/tile/bar,
+/obj/effect/turf_decal/tile/bar{
+ dir = 1
+ },
+/obj/item/crowbar{
+ pixel_x = 7;
+ pixel_y = -13
+ },
+/turf/open/floor/iron,
+/area/awaymission/moonoutpost19/arrivals)
"SX" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/siding/purple{
@@ -7194,17 +7189,6 @@
initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
},
/area/awaymission/moonoutpost19/mines)
-"VY" = (
-/obj/structure/table,
-/obj/item/stock_parts/power_store/cell/crap/empty,
-/obj/item/stock_parts/power_store/cell/crap/empty,
-/obj/item/stock_parts/power_store/cell/crap/empty{
- pixel_x = -16;
- pixel_y = 4
- },
-/obj/machinery/cell_charger,
-/turf/open/floor/pod/dark,
-/area/awaymission/moonoutpost19/tent)
"Wg" = (
/obj/structure/flora/rock/style_random{
pixel_y = -2
@@ -7423,6 +7407,13 @@
},
/turf/open/floor/plating,
/area/awaymission/moonoutpost19/arrivals/shed)
+"Xz" = (
+/obj/structure/table/wood,
+/obj/item/lighter,
+/obj/machinery/newscaster/directional/east,
+/obj/item/cigarette/cigar,
+/turf/open/floor/carpet/orange,
+/area/awaymission/moonoutpost19/arrivals)
"XA" = (
/obj/machinery/door/poddoor/shutters{
id = "awaymission19atvs"
@@ -32896,7 +32887,7 @@ uZ
Nj
nk
nk
-ez
+MD
eJ
eI
eJ
@@ -33933,7 +33924,7 @@ Nt
ap
aK
on
-aq
+wR
dZ
bn
lG
@@ -34445,7 +34436,7 @@ dZ
rH
SX
Sd
-NY
+Dd
ap
Ts
ea
@@ -34699,9 +34690,9 @@ dZ
dZ
ea
ea
-aJ
+Pa
Ay
-aJ
+Pa
Ci
Sd
zx
@@ -34958,7 +34949,7 @@ Rl
Rq
ik
OC
-aJ
+Pa
xK
au
FY
@@ -35215,7 +35206,7 @@ pH
Rq
ik
OC
-aJ
+Pa
tE
PG
tG
@@ -35472,7 +35463,7 @@ iB
Rq
ik
OC
-aJ
+Pa
Um
Tx
vu
@@ -35972,7 +35963,7 @@ My
My
My
My
-os
+pG
kd
Ov
Ky
@@ -35986,7 +35977,7 @@ OC
OC
fk
fk
-ge
+qD
ea
UZ
Oa
@@ -36229,7 +36220,7 @@ My
My
My
xm
-os
+pG
ZA
eR
Za
@@ -36243,7 +36234,7 @@ fk
fk
fk
fP
-ge
+qD
Qq
fc
Ds
@@ -36500,7 +36491,7 @@ Nk
cI
LU
LU
-ge
+qD
ea
TM
Az
@@ -37478,7 +37469,7 @@ xm
Ff
My
IP
-wc
+MW
ZY
CP
qY
@@ -37735,7 +37726,7 @@ xm
Bz
My
IP
-VY
+Ro
Uw
Qx
vj
@@ -38287,7 +38278,7 @@ My
My
dZ
ei
-Bg
+uh
vU
fl
fC
@@ -38544,7 +38535,7 @@ My
My
ea
ef
-cp
+xz
vx
Gh
qy
@@ -39087,7 +39078,7 @@ hI
hI
hJ
hJ
-pF
+FS
RY
dF
WF
@@ -39535,7 +39526,7 @@ My
UO
ZX
aL
-Fw
+nD
aL
wj
aL
@@ -39984,7 +39975,7 @@ aU
uq
jH
VH
-yx
+Fs
do
VH
IW
@@ -40116,7 +40107,7 @@ Sk
hJ
Ue
hJ
-vR
+Gf
yP
YF
hI
@@ -40365,7 +40356,7 @@ cT
hI
LX
fU
-Ou
+Xz
hJ
zy
kZ
@@ -41905,7 +41896,7 @@ hI
qx
RK
bm
-uN
+ty
hJ
Gp
hI
@@ -42808,7 +42799,7 @@ ac
ac
aU
uR
-JZ
+JO
Ew
ZT
aU
@@ -43449,7 +43440,7 @@ xs
LW
pY
xG
-Bb
+SN
Te
hI
hJ
diff --git a/_maps/RandomZLevels/research.dmm b/_maps/RandomZLevels/research.dmm
index 7f862487515fc..1e84014fa0e1b 100644
--- a/_maps/RandomZLevels/research.dmm
+++ b/_maps/RandomZLevels/research.dmm
@@ -2461,9 +2461,7 @@
/turf/open/floor/wood,
/area/awaymission/research/interior/dorm)
"lN" = (
-/obj/structure/window/reinforced/spawner/directional/north{
- layer = 2.9
- },
+/obj/structure/window/reinforced/spawner/directional/north,
/obj/machinery/airalarm/directional/east,
/obj/effect/turf_decal/siding/yellow{
dir = 4
@@ -2707,25 +2705,19 @@
"mK" = (
/obj/structure/flora/bush/flowers_br/style_random,
/obj/structure/window/reinforced/spawner/directional/south,
-/obj/structure/window/reinforced/spawner/directional/north{
- layer = 2.9
- },
+/obj/structure/window/reinforced/spawner/directional/north,
/turf/open/floor/grass,
/area/awaymission/research/interior/escapepods)
"mL" = (
/obj/structure/flora/bush/ferny/style_random,
/obj/structure/window/reinforced/spawner/directional/south,
-/obj/structure/window/reinforced/spawner/directional/north{
- layer = 2.9
- },
+/obj/structure/window/reinforced/spawner/directional/north,
/turf/open/floor/grass,
/area/awaymission/research/interior/escapepods)
"mM" = (
/obj/structure/flora/bush/grassy/style_random,
/obj/structure/window/reinforced/spawner/directional/south,
-/obj/structure/window/reinforced/spawner/directional/north{
- layer = 2.9
- },
+/obj/structure/window/reinforced/spawner/directional/north,
/turf/open/floor/grass,
/area/awaymission/research/interior/escapepods)
"mO" = (
diff --git a/_maps/RandomZLevels/snowdin.dmm b/_maps/RandomZLevels/snowdin.dmm
index ac13cf870c55d..ee207f21e86d6 100644
--- a/_maps/RandomZLevels/snowdin.dmm
+++ b/_maps/RandomZLevels/snowdin.dmm
@@ -11586,7 +11586,6 @@
/obj/machinery/door_buttons/access_button{
idDoor = "snowdin_turbine_interior";
idSelf = "snowdin_turbine_access";
- layer = 3.1;
name = "Turbine Airlock Control";
pixel_x = 8;
pixel_y = -24
diff --git a/_maps/RandomZLevels/undergroundoutpost45.dmm b/_maps/RandomZLevels/undergroundoutpost45.dmm
index d458d3af0f987..5458021bdb122 100644
--- a/_maps/RandomZLevels/undergroundoutpost45.dmm
+++ b/_maps/RandomZLevels/undergroundoutpost45.dmm
@@ -468,11 +468,28 @@
/obj/effect/mapping_helpers/broken_floor,
/turf/open/floor/plating,
/area/awaymission/undergroundoutpost45/central)
+"cr" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+ dir = 8
+ },
+/obj/machinery/computer/security/telescreen/underground_outpost/research/directional/south,
+/turf/open/floor/iron/cafeteria{
+ dir = 5
+ },
+/area/awaymission/undergroundoutpost45/research)
"cs" = (
/obj/machinery/light/small/directional/west,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/awaymission/undergroundoutpost45/central)
+"ct" = (
+/obj/structure/table,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/tile/red/half/contrasted{
+ dir = 4
+ },
+/turf/open/floor/iron,
+/area/awaymission/undergroundoutpost45/research)
"cu" = (
/obj/machinery/portable_atmospherics/canister/air,
/turf/open/floor/plating,
@@ -555,19 +572,6 @@
},
/turf/open/floor/carpet,
/area/awaymission/undergroundoutpost45/central)
-"cM" = (
-/obj/structure/table,
-/obj/machinery/cell_charger,
-/obj/item/stock_parts/power_store/cell/high,
-/obj/item/stack/cable_coil{
- pixel_x = 3;
- pixel_y = -7
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/turf/open/floor/iron/dark,
-/area/awaymission/undergroundoutpost45/gateway)
"cS" = (
/obj/machinery/portable_atmospherics/scrubber,
/obj/structure/window/spawner/directional/west,
@@ -628,14 +632,6 @@
/obj/machinery/light/blacklight/directional/north,
/turf/open/floor/iron,
/area/awaymission/undergroundoutpost45/central)
-"do" = (
-/obj/item/kirbyplants{
- layer = 5
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/tile/green,
-/turf/open/floor/iron,
-/area/awaymission/undergroundoutpost45/central)
"du" = (
/obj/effect/turf_decal/tile/purple{
dir = 4
@@ -1080,6 +1076,14 @@
},
/turf/open/floor/iron,
/area/awaymission/undergroundoutpost45/central)
+"eQ" = (
+/obj/machinery/meter{
+ name = "Mixed Air Tank In"
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/general,
+/obj/effect/spawner/structure/window/reinforced,
+/turf/open/floor/plating,
+/area/awaymission/undergroundoutpost45/engineering)
"eR" = (
/obj/structure/chair/stool/directional/west,
/turf/open/floor/iron,
@@ -1359,14 +1363,6 @@
/obj/item/bedsheet,
/turf/open/floor/carpet,
/area/awaymission/undergroundoutpost45/central)
-"fT" = (
-/obj/item/kirbyplants{
- layer = 5
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron,
-/area/awaymission/undergroundoutpost45/central)
"fU" = (
/obj/machinery/firealarm/directional/south,
/obj/machinery/camera/directional/south{
@@ -1720,16 +1716,6 @@
dir = 5
},
/area/awaymission/undergroundoutpost45/crew_quarters)
-"hq" = (
-/obj/structure/table,
-/obj/item/stack/package_wrap,
-/obj/item/reagent_containers/condiment/enzyme{
- layer = 5
- },
-/turf/open/floor/iron/cafeteria{
- dir = 5
- },
-/area/awaymission/undergroundoutpost45/crew_quarters)
"hr" = (
/obj/structure/table,
/turf/open/floor/iron/cafeteria{
@@ -2171,6 +2157,14 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/white,
/area/awaymission/undergroundoutpost45/gateway)
+"iY" = (
+/obj/structure/table,
+/obj/machinery/cell_charger,
+/obj/item/stock_parts/power_store/cell/high,
+/obj/item/stock_parts/power_store/cell/high,
+/obj/machinery/light/small/directional/west,
+/turf/open/floor/iron/white,
+/area/awaymission/undergroundoutpost45/research)
"iZ" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
@@ -2458,13 +2452,6 @@
dir = 5
},
/area/awaymission/undergroundoutpost45/research)
-"kh" = (
-/obj/item/kirbyplants{
- layer = 5
- },
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron/white,
-/area/awaymission/undergroundoutpost45/research)
"kj" = (
/obj/structure/disposalpipe/segment,
/obj/effect/turf_decal/tile/purple/half/contrasted{
@@ -2627,13 +2614,6 @@
},
/turf/open/floor/iron/white,
/area/awaymission/undergroundoutpost45/gateway)
-"kN" = (
-/obj/structure/table,
-/obj/machinery/cell_charger,
-/obj/item/stock_parts/power_store/cell/high,
-/obj/effect/turf_decal/tile/yellow/anticorner/contrasted,
-/turf/open/floor/iron,
-/area/awaymission/undergroundoutpost45/engineering)
"kO" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -2994,15 +2974,6 @@
/obj/effect/turf_decal/tile/bar/opposingcorners,
/turf/open/floor/iron,
/area/awaymission/undergroundoutpost45/crew_quarters)
-"lV" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
- dir = 8
- },
-/obj/machinery/computer/security/telescreen/underground_outpost/research/directional/south,
-/turf/open/floor/iron/cafeteria{
- dir = 5
- },
-/area/awaymission/undergroundoutpost45/research)
"lW" = (
/obj/machinery/door/firedoor,
/obj/structure/disposalpipe/segment,
@@ -3012,6 +2983,16 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/awaymission/undergroundoutpost45/crew_quarters)
+"lX" = (
+/obj/structure/closet/crate,
+/obj/item/stack/sheet/mineral/plasma{
+ amount = 26
+ },
+/obj/item/stock_parts/power_store/cell/high,
+/obj/item/stock_parts/power_store/cell/high,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plating,
+/area/awaymission/undergroundoutpost45/engineering)
"lY" = (
/obj/machinery/light/small/directional/north,
/obj/machinery/camera/directional/north{
@@ -3027,6 +3008,19 @@
},
/turf/open/floor/plating,
/area/awaymission/undergroundoutpost45/engineering)
+"ma" = (
+/obj/structure/table,
+/obj/machinery/cell_charger,
+/obj/item/stock_parts/power_store/cell/high,
+/obj/item/stack/cable_coil{
+ pixel_x = 3;
+ pixel_y = -7
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/turf/open/floor/iron/dark,
+/area/awaymission/undergroundoutpost45/gateway)
"mb" = (
/turf/open/floor/iron,
/area/awaymission/undergroundoutpost45/gateway)
@@ -3268,15 +3262,6 @@
dir = 5
},
/area/awaymission/undergroundoutpost45/research)
-"mQ" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/item/kirbyplants{
- layer = 5
- },
-/turf/open/floor/iron/cafeteria{
- dir = 5
- },
-/area/awaymission/undergroundoutpost45/research)
"mR" = (
/obj/structure/table,
/obj/item/paper_bin{
@@ -4018,16 +4003,6 @@
/obj/effect/turf_decal/tile/red/half/contrasted,
/turf/open/floor/iron,
/area/awaymission/undergroundoutpost45/research)
-"pl" = (
-/obj/item/kirbyplants{
- layer = 5
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{
- dir = 8
- },
-/turf/open/floor/iron,
-/area/awaymission/undergroundoutpost45/crew_quarters)
"pm" = (
/obj/effect/turf_decal/tile/neutral{
dir = 8
@@ -4230,24 +4205,6 @@
/obj/structure/cable,
/turf/open/floor/iron/dark,
/area/awaymission/undergroundoutpost45/engineering)
-"qd" = (
-/obj/machinery/meter{
- layer = 3.3;
- name = "Mixed Air Tank Out"
- },
-/obj/machinery/atmospherics/pipe/layer_manifold/supply,
-/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/plating,
-/area/awaymission/undergroundoutpost45/engineering)
-"qe" = (
-/obj/machinery/meter{
- layer = 3.3;
- name = "Mixed Air Tank In"
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/general,
-/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/plating,
-/area/awaymission/undergroundoutpost45/engineering)
"qh" = (
/obj/machinery/atmospherics/components/unary/vent_pump/siphon/on{
dir = 4;
@@ -4326,6 +4283,14 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
/area/awaymission/undergroundoutpost45/crew_quarters)
+"qB" = (
+/obj/structure/table,
+/obj/item/stack/package_wrap,
+/obj/item/reagent_containers/condiment/enzyme,
+/turf/open/floor/iron/cafeteria{
+ dir = 5
+ },
+/area/awaymission/undergroundoutpost45/crew_quarters)
"qC" = (
/obj/machinery/vending/cola,
/turf/open/floor/iron/dark,
@@ -4353,19 +4318,6 @@
},
/turf/open/floor/iron,
/area/awaymission/undergroundoutpost45/engineering)
-"qI" = (
-/obj/structure/window/reinforced/spawner/directional/east{
- layer = 2.9
- },
-/obj/structure/closet/secure_closet/engineering_personal{
- req_access = list("away_maintenance")
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/tile/yellow/half/contrasted{
- dir = 1
- },
-/turf/open/floor/iron,
-/area/awaymission/undergroundoutpost45/engineering)
"qJ" = (
/obj/machinery/light/blacklight/directional/north,
/obj/machinery/camera/directional/north{
@@ -4534,15 +4486,6 @@
"rj" = (
/turf/open/floor/iron,
/area/awaymission/undergroundoutpost45/engineering)
-"rk" = (
-/obj/item/kirbyplants{
- layer = 5
- },
-/obj/effect/turf_decal/tile/yellow/anticorner/contrasted{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/awaymission/undergroundoutpost45/engineering)
"rl" = (
/obj/machinery/firealarm/directional/north,
/obj/structure/tank_dispenser{
@@ -4853,17 +4796,6 @@
},
/turf/open/floor/iron,
/area/awaymission/undergroundoutpost45/engineering)
-"sc" = (
-/obj/machinery/computer/security{
- dir = 4;
- network = list("uo45")
- },
-/obj/effect/turf_decal/tile/red/half/contrasted{
- dir = 8
- },
-/obj/machinery/computer/security/telescreen/underground_outpost/research/directional/west,
-/turf/open/floor/iron,
-/area/awaymission/undergroundoutpost45/research)
"sd" = (
/obj/effect/turf_decal/tile/red/half/contrasted{
dir = 8
@@ -4936,14 +4868,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible/layer2,
/turf/open/floor/iron,
/area/awaymission/undergroundoutpost45/engineering)
-"sq" = (
-/obj/machinery/meter{
- layer = 3.3
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/general,
-/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/plating,
-/area/awaymission/undergroundoutpost45/engineering)
"sr" = (
/obj/machinery/atmospherics/components/unary/vent_pump/siphon/monitored{
chamber_id = "uo45mix";
@@ -5107,16 +5031,6 @@
},
/turf/open/floor/iron,
/area/awaymission/undergroundoutpost45/engineering)
-"td" = (
-/obj/machinery/meter{
- layer = 3.3
- },
-/obj/machinery/atmospherics/pipe/layer_manifold/orange{
- dir = 4
- },
-/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/plating,
-/area/awaymission/undergroundoutpost45/engineering)
"te" = (
/obj/machinery/atmospherics/components/unary/outlet_injector/monitored{
chamber_id = "uo45mix";
@@ -5195,22 +5109,6 @@
dir = 1
},
/area/awaymission/undergroundoutpost45/engineering)
-"tw" = (
-/obj/machinery/light/small/directional/south,
-/obj/structure/window/reinforced/spawner/directional/east{
- layer = 2.9
- },
-/obj/machinery/portable_atmospherics/scrubber,
-/obj/effect/turf_decal/tile/red{
- dir = 4
- },
-/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer2{
- dir = 1
- },
-/turf/open/floor/iron/white/corner{
- dir = 1
- },
-/area/awaymission/undergroundoutpost45/engineering)
"tx" = (
/obj/structure/disposalpipe/segment,
/obj/structure/cable,
@@ -5547,22 +5445,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/closed/wall/r_wall,
/area/awaymission/undergroundoutpost45/engineering)
-"uI" = (
-/obj/machinery/meter{
- layer = 3.3
- },
-/obj/machinery/atmospherics/pipe/layer_manifold/orange,
-/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/plating,
-/area/awaymission/undergroundoutpost45/engineering)
-"uJ" = (
-/obj/machinery/meter{
- layer = 3.3
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible,
-/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/plating,
-/area/awaymission/undergroundoutpost45/engineering)
"uK" = (
/obj/machinery/light/small/directional/west,
/obj/effect/decal/cleanable/dirt,
@@ -5919,6 +5801,13 @@
dir = 8
},
/area/awaymission/undergroundoutpost45/engineering)
+"vW" = (
+/obj/structure/table,
+/obj/machinery/cell_charger,
+/obj/item/stock_parts/power_store/cell/high,
+/obj/effect/turf_decal/tile/yellow/anticorner/contrasted,
+/turf/open/floor/iron,
+/area/awaymission/undergroundoutpost45/engineering)
"vY" = (
/obj/structure/closet/emcloset,
/obj/item/clothing/mask/breath,
@@ -5949,31 +5838,12 @@
/obj/item/bedsheet,
/turf/open/floor/carpet,
/area/awaymission/undergroundoutpost45/mining)
-"we" = (
-/obj/structure/closet/crate,
-/obj/item/stack/sheet/mineral/plasma{
- amount = 26
- },
-/obj/item/stock_parts/power_store/cell/high,
-/obj/item/stock_parts/power_store/cell/high,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating,
-/area/awaymission/undergroundoutpost45/engineering)
"wf" = (
/obj/effect/mapping_helpers/burnt_floor,
/turf/open/floor/iron{
dir = 8
},
/area/awaymission/undergroundoutpost45/mining)
-"wg" = (
-/obj/machinery/light/small/directional/north,
-/obj/item/kirbyplants{
- layer = 5
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron,
-/area/awaymission/undergroundoutpost45/mining)
"wl" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/structure/cable,
@@ -6103,13 +5973,16 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/awaymission/undergroundoutpost45/crew_quarters)
-"xd" = (
-/obj/machinery/meter{
- layer = 3.3
+"xf" = (
+/obj/structure/window/reinforced/spawner/directional/east,
+/obj/structure/closet/secure_closet/engineering_personal{
+ req_access = list("away_maintenance")
},
-/obj/machinery/atmospherics/pipe/smart/manifold4w/green,
-/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/plating,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/tile/yellow/half/contrasted{
+ dir = 1
+ },
+/turf/open/floor/iron,
/area/awaymission/undergroundoutpost45/engineering)
"xg" = (
/obj/machinery/door/firedoor,
@@ -6717,14 +6590,6 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron,
/area/awaymission/undergroundoutpost45/engineering)
-"CM" = (
-/obj/structure/table,
-/obj/machinery/cell_charger,
-/obj/item/stock_parts/power_store/cell/high,
-/obj/item/stock_parts/power_store/cell/high,
-/obj/machinery/light/small/directional/west,
-/turf/open/floor/iron/white,
-/area/awaymission/undergroundoutpost45/research)
"CT" = (
/obj/structure/disposalpipe/segment{
dir = 10
@@ -6734,14 +6599,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/awaymission/undergroundoutpost45/engineering)
-"CW" = (
-/obj/structure/table,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/tile/red/half/contrasted{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/awaymission/undergroundoutpost45/research)
"De" = (
/obj/machinery/computer/monitor{
name = "primary power monitoring console"
@@ -6809,6 +6666,13 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/awaymission/undergroundoutpost45/central)
+"DO" = (
+/obj/machinery/light/small/directional/north,
+/obj/item/kirbyplants,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/iron,
+/area/awaymission/undergroundoutpost45/mining)
"DU" = (
/obj/structure/table/reinforced,
/obj/item/storage/fancy/cigarettes{
@@ -6841,6 +6705,20 @@
},
/turf/open/floor/iron,
/area/awaymission/undergroundoutpost45/central)
+"Ee" = (
+/obj/machinery/meter,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/general,
+/obj/effect/spawner/structure/window/reinforced,
+/turf/open/floor/plating,
+/area/awaymission/undergroundoutpost45/engineering)
+"Eg" = (
+/obj/machinery/meter,
+/obj/machinery/atmospherics/pipe/layer_manifold/orange{
+ dir = 4
+ },
+/obj/effect/spawner/structure/window/reinforced,
+/turf/open/floor/plating,
+/area/awaymission/undergroundoutpost45/engineering)
"EJ" = (
/obj/machinery/light/small/directional/north,
/obj/machinery/airalarm/directional/north,
@@ -6877,13 +6755,6 @@
dir = 5
},
/area/awaymission/undergroundoutpost45/crew_quarters)
-"ET" = (
-/obj/structure/table/reinforced,
-/obj/structure/window/reinforced/spawner/directional/north,
-/turf/open/floor/iron/cafeteria{
- dir = 5
- },
-/area/awaymission/undergroundoutpost45/research)
"Fd" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/door/airlock/command/glass{
@@ -6896,6 +6767,13 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/awaymission/undergroundoutpost45/engineering)
+"Fo" = (
+/obj/structure/table/reinforced,
+/obj/structure/window/reinforced/spawner/directional/north,
+/turf/open/floor/iron/cafeteria{
+ dir = 5
+ },
+/area/awaymission/undergroundoutpost45/research)
"Fw" = (
/obj/machinery/airalarm/directional/east,
/obj/effect/mapping_helpers/airalarm/all_access,
@@ -6912,6 +6790,12 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/awaymission/undergroundoutpost45/crew_quarters)
+"FC" = (
+/obj/item/kirbyplants,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/tile/green,
+/turf/open/floor/iron,
+/area/awaymission/undergroundoutpost45/central)
"FS" = (
/obj/machinery/biogenerator,
/obj/effect/turf_decal/tile/neutral/fourcorners,
@@ -6960,6 +6844,13 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/plating,
/area/awaymission/undergroundoutpost45/research)
+"Gy" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/item/kirbyplants,
+/turf/open/floor/iron/cafeteria{
+ dir = 5
+ },
+/area/awaymission/undergroundoutpost45/research)
"GI" = (
/obj/structure/filingcabinet/chestdrawer,
/obj/effect/turf_decal/tile/neutral/fourcorners,
@@ -6992,6 +6883,14 @@
},
/turf/open/floor/iron,
/area/awaymission/undergroundoutpost45/central)
+"HS" = (
+/obj/item/kirbyplants,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{
+ dir = 8
+ },
+/turf/open/floor/iron,
+/area/awaymission/undergroundoutpost45/crew_quarters)
"HW" = (
/obj/structure/alien/weeds,
/obj/structure/glowshroom/single,
@@ -7031,6 +6930,12 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/white,
/area/awaymission/undergroundoutpost45/gateway)
+"Iz" = (
+/obj/machinery/meter,
+/obj/machinery/atmospherics/pipe/layer_manifold/orange,
+/obj/effect/spawner/structure/window/reinforced,
+/turf/open/floor/plating,
+/area/awaymission/undergroundoutpost45/engineering)
"IH" = (
/obj/machinery/door/airlock/external/ruin,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -7097,6 +7002,13 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/white,
/area/awaymission/undergroundoutpost45/research)
+"Jq" = (
+/obj/item/kirbyplants,
+/obj/effect/turf_decal/tile/yellow/anticorner/contrasted{
+ dir = 4
+ },
+/turf/open/floor/iron,
+/area/awaymission/undergroundoutpost45/engineering)
"Jv" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/cafeteria{
@@ -7123,6 +7035,23 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/white,
/area/awaymission/undergroundoutpost45/research)
+"JU" = (
+/obj/item/kirbyplants,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/iron,
+/area/awaymission/undergroundoutpost45/central)
+"Kh" = (
+/obj/machinery/computer/security{
+ dir = 4;
+ network = list("uo45")
+ },
+/obj/effect/turf_decal/tile/red/half/contrasted{
+ dir = 8
+ },
+/obj/machinery/computer/security/telescreen/underground_outpost/research/directional/west,
+/turf/open/floor/iron,
+/area/awaymission/undergroundoutpost45/research)
"Km" = (
/obj/structure/table,
/obj/item/storage/medkit/toxin{
@@ -7163,6 +7092,11 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron,
/area/awaymission/undergroundoutpost45/research)
+"KS" = (
+/obj/item/kirbyplants,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/iron/white,
+/area/awaymission/undergroundoutpost45/research)
"KT" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -7600,6 +7534,14 @@
},
/turf/open/floor/iron,
/area/awaymission/undergroundoutpost45/engineering)
+"RG" = (
+/obj/machinery/meter{
+ name = "Mixed Air Tank Out"
+ },
+/obj/machinery/atmospherics/pipe/layer_manifold/supply,
+/obj/effect/spawner/structure/window/reinforced,
+/turf/open/floor/plating,
+/area/awaymission/undergroundoutpost45/engineering)
"RN" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -7867,6 +7809,20 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/awaymission/undergroundoutpost45/research)
+"WO" = (
+/obj/machinery/light/small/directional/south,
+/obj/structure/window/reinforced/spawner/directional/east,
+/obj/machinery/portable_atmospherics/scrubber,
+/obj/effect/turf_decal/tile/red{
+ dir = 4
+ },
+/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer2{
+ dir = 1
+ },
+/turf/open/floor/iron/white/corner{
+ dir = 1
+ },
+/area/awaymission/undergroundoutpost45/engineering)
"WQ" = (
/obj/structure/bed{
dir = 4
@@ -7968,6 +7924,12 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/awaymission/undergroundoutpost45/engineering)
+"Yj" = (
+/obj/machinery/meter,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible,
+/obj/effect/spawner/structure/window/reinforced,
+/turf/open/floor/plating,
+/area/awaymission/undergroundoutpost45/engineering)
"Yk" = (
/obj/structure/table,
/obj/item/computer_disk/ordnance,
@@ -8007,6 +7969,12 @@
},
/turf/open/floor/plating,
/area/awaymission/undergroundoutpost45/mining)
+"YQ" = (
+/obj/machinery/meter,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/green,
+/obj/effect/spawner/structure/window/reinforced,
+/turf/open/floor/plating,
+/area/awaymission/undergroundoutpost45/engineering)
"YV" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 1
@@ -27474,7 +27442,7 @@ jG
gw
ky
DB
-cM
+ma
mB
gK
ad
@@ -32868,7 +32836,7 @@ gz
hc
gz
gz
-kh
+KS
ha
lE
mf
@@ -33122,7 +33090,7 @@ gX
hB
ig
ze
-CM
+iY
jr
jO
mU
@@ -34418,7 +34386,7 @@ mP
nn
nQ
oz
-lV
+cr
gy
ql
qT
@@ -34673,7 +34641,7 @@ lL
mj
mP
mP
-ET
+Fo
oA
pg
gy
@@ -34928,7 +34896,7 @@ hH
Jo
ON
mj
-mQ
+Gy
mP
nS
oB
@@ -35443,7 +35411,7 @@ Mg
lM
hH
mR
-sc
+Kh
RC
oC
ph
@@ -35957,7 +35925,7 @@ kV
lM
hH
mT
-CW
+ct
nV
WG
lu
@@ -37995,7 +37963,7 @@ LZ
eZ
MJ
IV
-fT
+JU
aC
ad
ad
@@ -38530,7 +38498,7 @@ mV
nw
JD
nD
-pl
+HS
gr
gr
zq
@@ -40299,7 +40267,7 @@ aD
cB
cL
aC
-do
+FC
dB
dX
dB
@@ -42911,7 +42879,7 @@ uz
fO
fN
vK
-wg
+DO
wv
wD
Wk
@@ -43398,7 +43366,7 @@ fZ
gu
gD
gO
-hq
+qB
hR
iq
iK
@@ -46503,7 +46471,7 @@ qD
ri
Qw
Yf
-tw
+WO
ln
rj
uV
@@ -47014,7 +46982,7 @@ zq
RA
ni
ln
-rk
+Jq
sb
sO
Tu
@@ -48050,7 +48018,7 @@ rr
qb
RF
vy
-kN
+vW
ni
ln
ni
@@ -48804,7 +48772,7 @@ ad
ad
ad
ln
-we
+lX
mz
ln
nK
@@ -49583,13 +49551,13 @@ ov
oY
pD
qb
-qI
+xf
rj
tE
rj
tG
um
-uI
+Iz
vd
vD
ln
@@ -49846,7 +49814,7 @@ tE
rj
tb
un
-uJ
+Yj
ve
vE
ln
@@ -50096,7 +50064,7 @@ ad
ln
oZ
pE
-qd
+RG
qK
rv
sn
@@ -50353,14 +50321,14 @@ ad
ln
pa
pF
-qe
+eQ
qL
rw
so
rj
rj
up
-uI
+Iz
vf
vF
ln
@@ -50617,7 +50585,7 @@ OL
YD
tI
uq
-xd
+YQ
vg
vG
ln
@@ -51127,8 +51095,8 @@ ad
ln
ln
ln
-sq
-td
+Ee
+Eg
ln
ni
ni
diff --git a/_maps/deathmatch/OSHA_Violator.dmm b/_maps/deathmatch/OSHA_Violator.dmm
index fc8291d181449..fd00138744733 100644
--- a/_maps/deathmatch/OSHA_Violator.dmm
+++ b/_maps/deathmatch/OSHA_Violator.dmm
@@ -252,9 +252,6 @@
/obj/structure/cable,
/turf/open/indestructible,
/area/deathmatch)
-"sa" = (
-/turf/cordon,
-/area/template_noop)
"sb" = (
/obj/structure/frame/machine/secured,
/turf/open/indestructible,
@@ -1087,34 +1084,6 @@
/area/template_noop)
(1,1,1) = {"
-sa
-sa
-sa
-sa
-sa
-sa
-sa
-sa
-sa
-sa
-sa
-sa
-sa
-sa
-sa
-sa
-sa
-sa
-sa
-sa
-sa
-sa
-sa
-sa
-sa
-"}
-(2,1,1) = {"
-sa
je
je
je
@@ -1138,10 +1107,8 @@ je
je
je
je
-sa
"}
-(3,1,1) = {"
-sa
+(2,1,1) = {"
je
ai
ai
@@ -1165,10 +1132,8 @@ je
je
je
je
-sa
"}
-(4,1,1) = {"
-sa
+(3,1,1) = {"
je
ai
bW
@@ -1192,10 +1157,8 @@ je
je
je
je
-sa
"}
-(5,1,1) = {"
-sa
+(4,1,1) = {"
je
ai
cA
@@ -1219,10 +1182,8 @@ je
je
je
je
-sa
"}
-(6,1,1) = {"
-sa
+(5,1,1) = {"
je
aE
cA
@@ -1246,10 +1207,8 @@ je
je
je
je
-sa
"}
-(7,1,1) = {"
-sa
+(6,1,1) = {"
je
aE
cA
@@ -1273,10 +1232,8 @@ ai
ai
ai
je
-sa
"}
-(8,1,1) = {"
-sa
+(7,1,1) = {"
je
ai
cA
@@ -1300,10 +1257,8 @@ cA
cA
aE
je
-sa
"}
-(9,1,1) = {"
-sa
+(8,1,1) = {"
je
ai
cA
@@ -1327,10 +1282,8 @@ cA
cA
aE
je
-sa
"}
-(10,1,1) = {"
-sa
+(9,1,1) = {"
je
ai
aE
@@ -1354,10 +1307,8 @@ ai
aE
ai
je
-sa
"}
-(11,1,1) = {"
-sa
+(10,1,1) = {"
je
ai
cR
@@ -1381,10 +1332,8 @@ ai
cR
ai
je
-sa
"}
-(12,1,1) = {"
-sa
+(11,1,1) = {"
je
ai
YA
@@ -1408,10 +1357,8 @@ ai
YA
ai
je
-sa
"}
-(13,1,1) = {"
-sa
+(12,1,1) = {"
je
ai
Ea
@@ -1435,10 +1382,8 @@ Xp
yo
ai
je
-sa
"}
-(14,1,1) = {"
-sa
+(13,1,1) = {"
je
ai
do
@@ -1462,10 +1407,8 @@ gN
Px
ai
je
-sa
"}
-(15,1,1) = {"
-sa
+(14,1,1) = {"
je
ai
dt
@@ -1489,10 +1432,8 @@ gN
YY
ai
je
-sa
"}
-(16,1,1) = {"
-sa
+(15,1,1) = {"
je
ai
do
@@ -1516,10 +1457,8 @@ gN
Px
ai
je
-sa
"}
-(17,1,1) = {"
-sa
+(16,1,1) = {"
je
ai
do
@@ -1543,10 +1482,8 @@ gN
Px
ai
je
-sa
"}
-(18,1,1) = {"
-sa
+(17,1,1) = {"
je
ai
dy
@@ -1570,10 +1507,8 @@ gN
Px
ai
je
-sa
"}
-(19,1,1) = {"
-sa
+(18,1,1) = {"
je
bl
do
@@ -1597,10 +1532,8 @@ gN
Px
bl
je
-sa
"}
-(20,1,1) = {"
-sa
+(19,1,1) = {"
je
bl
do
@@ -1624,10 +1557,8 @@ XU
Px
bl
Zr
-sa
"}
-(21,1,1) = {"
-sa
+(20,1,1) = {"
je
bl
do
@@ -1651,10 +1582,8 @@ Yn
Px
bl
Zz
-sa
"}
-(22,1,1) = {"
-sa
+(21,1,1) = {"
je
bl
Bv
@@ -1678,10 +1607,8 @@ Yn
UI
bl
je
-sa
"}
-(23,1,1) = {"
-sa
+(22,1,1) = {"
je
bl
do
@@ -1705,10 +1632,8 @@ Yz
Px
bl
je
-sa
"}
-(24,1,1) = {"
-sa
+(23,1,1) = {"
je
bl
do
@@ -1732,10 +1657,8 @@ YJ
Px
bl
ZD
-sa
"}
-(25,1,1) = {"
-sa
+(24,1,1) = {"
ac
bl
do
@@ -1759,10 +1682,8 @@ gN
Px
bl
je
-sa
"}
-(26,1,1) = {"
-sa
+(25,1,1) = {"
ae
ai
do
@@ -1786,10 +1707,8 @@ gN
Px
ai
je
-sa
"}
-(27,1,1) = {"
-sa
+(26,1,1) = {"
je
ai
do
@@ -1813,10 +1732,8 @@ gN
Zi
ai
je
-sa
"}
-(28,1,1) = {"
-sa
+(27,1,1) = {"
je
ai
do
@@ -1840,10 +1757,8 @@ gN
Px
ai
je
-sa
"}
-(29,1,1) = {"
-sa
+(28,1,1) = {"
je
ai
dt
@@ -1867,10 +1782,8 @@ gN
YY
ai
je
-sa
"}
-(30,1,1) = {"
-sa
+(29,1,1) = {"
je
ai
do
@@ -1894,10 +1807,8 @@ gN
Px
ai
je
-sa
"}
-(31,1,1) = {"
-sa
+(30,1,1) = {"
je
ai
do
@@ -1921,10 +1832,8 @@ ig
Px
ai
je
-sa
"}
-(32,1,1) = {"
-sa
+(31,1,1) = {"
je
ai
do
@@ -1948,10 +1857,8 @@ ig
Px
ai
je
-sa
"}
-(33,1,1) = {"
-sa
+(32,1,1) = {"
je
ai
do
@@ -1975,10 +1882,8 @@ gN
Px
ai
je
-sa
"}
-(34,1,1) = {"
-sa
+(33,1,1) = {"
je
ai
do
@@ -2002,10 +1907,8 @@ YU
Px
ai
je
-sa
"}
-(35,1,1) = {"
-sa
+(34,1,1) = {"
je
ai
bl
@@ -2029,10 +1932,8 @@ ai
bl
ai
je
-sa
"}
-(36,1,1) = {"
-sa
+(35,1,1) = {"
je
ai
cR
@@ -2056,10 +1957,8 @@ gC
cR
ai
je
-sa
"}
-(37,1,1) = {"
-sa
+(36,1,1) = {"
je
aE
cA
@@ -2083,10 +1982,8 @@ gN
cA
aE
je
-sa
"}
-(38,1,1) = {"
-sa
+(37,1,1) = {"
je
ai
fH
@@ -2110,10 +2007,8 @@ gN
fH
ai
je
-sa
"}
-(39,1,1) = {"
-sa
+(38,1,1) = {"
je
ai
ai
@@ -2137,32 +2032,4 @@ ai
ai
ai
je
-sa
-"}
-(40,1,1) = {"
-sa
-sa
-sa
-sa
-sa
-sa
-sa
-sa
-sa
-sa
-sa
-sa
-sa
-sa
-sa
-sa
-sa
-sa
-sa
-sa
-sa
-sa
-sa
-sa
-sa
"}
diff --git a/_maps/deathmatch/meta_brig.dmm b/_maps/deathmatch/meta_brig.dmm
index 501e03e6ec632..e286e3b9df4d8 100644
--- a/_maps/deathmatch/meta_brig.dmm
+++ b/_maps/deathmatch/meta_brig.dmm
@@ -449,15 +449,6 @@
},
/turf/open/floor/iron/white,
/area/deathmatch)
-"hS" = (
-/obj/structure/table/wood,
-/obj/machinery/computer/security/telescreen/prison/directional/north,
-/obj/item/flashlight/lamp/green{
- pixel_x = 1;
- pixel_y = 5
- },
-/turf/open/floor/carpet,
-/area/deathmatch)
"hY" = (
/obj/effect/turf_decal/tile/red{
dir = 4
@@ -1606,6 +1597,16 @@
},
/turf/open/indestructible/hotelwood,
/area/deathmatch)
+"xT" = (
+/obj/structure/chair/stool/directional/east,
+/obj/effect/turf_decal/trimline/red/warning{
+ dir = 4
+ },
+/obj/machinery/flasher/directional/north{
+ id = "visitorflash"
+ },
+/turf/open/floor/iron,
+/area/deathmatch)
"yy" = (
/obj/effect/turf_decal/trimline/red/filled/corner{
dir = 4
@@ -1624,9 +1625,6 @@
},
/turf/open/indestructible/dark,
/area/deathmatch)
-"yN" = (
-/turf/cordon,
-/area/template_noop)
"yO" = (
/obj/effect/turf_decal/trimline/red/filled/line{
dir = 4
@@ -2108,6 +2106,14 @@
/obj/machinery/light/directional/east,
/turf/open/indestructible,
/area/deathmatch)
+"Ff" = (
+/obj/machinery/computer/security/telescreen/prison/directional/south,
+/obj/structure/cable,
+/obj/effect/turf_decal/tile/red{
+ dir = 8
+ },
+/turf/open/indestructible,
+/area/deathmatch)
"Fi" = (
/turf/template_noop,
/area/space)
@@ -2320,6 +2326,14 @@
},
/turf/open/indestructible/dark,
/area/deathmatch)
+"Ic" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/chair/stool/directional/east,
+/obj/effect/turf_decal/trimline/red/warning{
+ dir = 4
+ },
+/turf/open/floor/iron,
+/area/deathmatch)
"Ik" = (
/obj/effect/turf_decal/trimline/red/filled/corner,
/turf/open/indestructible,
@@ -2543,6 +2557,15 @@
},
/turf/open/indestructible,
/area/deathmatch)
+"KE" = (
+/obj/structure/table/wood,
+/obj/machinery/computer/security/telescreen/prison/directional/north,
+/obj/item/flashlight/lamp/green{
+ pixel_x = 1;
+ pixel_y = 5
+ },
+/turf/open/floor/carpet,
+/area/deathmatch)
"KO" = (
/obj/effect/turf_decal/stripes/line{
dir = 10
@@ -2874,14 +2897,6 @@
/obj/structure/cable,
/turf/open/indestructible,
/area/deathmatch)
-"PV" = (
-/obj/machinery/computer/security/telescreen/prison/directional/south,
-/obj/structure/cable,
-/obj/effect/turf_decal/tile/red{
- dir = 8
- },
-/turf/open/indestructible,
-/area/deathmatch)
"Qd" = (
/obj/structure/table,
/obj/item/clothing/glasses/sunglasses{
@@ -3618,9 +3633,9 @@ IJ
Yh
Yh
Yh
-yN
-yN
-yN
+xT
+YW
+Ic
IJ
IJ
IJ
@@ -4381,7 +4396,7 @@ vt
CS
bA
GU
-PV
+Ff
XK
XK
XI
@@ -4500,7 +4515,7 @@ Ik
Os
mE
Yh
-hS
+KE
FY
dp
Pt
diff --git a/_maps/deathmatch/ragecage.dmm b/_maps/deathmatch/ragecage.dmm
index b5871e89c24f1..a96ab76b53829 100644
--- a/_maps/deathmatch/ragecage.dmm
+++ b/_maps/deathmatch/ragecage.dmm
@@ -208,31 +208,8 @@
/obj/item/storage/toolbox/mechanical/old,
/turf/open/indestructible/plating,
/area/deathmatch)
-"Z" = (
-/turf/cordon,
-/area/deathmatch)
(1,1,1) = {"
-Z
-Z
-Z
-Z
-Z
-Z
-Z
-Z
-Z
-Z
-Z
-Z
-Z
-Z
-Z
-Z
-Z
-"}
-(2,1,1) = {"
-Z
G
G
H
@@ -248,10 +225,8 @@ G
H
G
G
-Z
"}
-(3,1,1) = {"
-Z
+(2,1,1) = {"
G
p
u
@@ -267,10 +242,8 @@ U
U
f
G
-Z
"}
-(4,1,1) = {"
-Z
+(3,1,1) = {"
G
U
B
@@ -286,10 +259,8 @@ V
V
X
G
-Z
"}
-(5,1,1) = {"
-Z
+(4,1,1) = {"
G
U
L
@@ -305,10 +276,8 @@ A
g
U
G
-Z
"}
-(6,1,1) = {"
-Z
+(5,1,1) = {"
G
U
d
@@ -324,10 +293,8 @@ U
x
U
G
-Z
"}
-(7,1,1) = {"
-Z
+(6,1,1) = {"
G
X
d
@@ -343,10 +310,8 @@ U
x
U
q
-Z
"}
-(8,1,1) = {"
-Z
+(7,1,1) = {"
G
U
d
@@ -362,10 +327,8 @@ U
R
U
G
-Z
"}
-(9,1,1) = {"
-Z
+(8,1,1) = {"
G
U
d
@@ -381,10 +344,8 @@ U
R
U
o
-Z
"}
-(10,1,1) = {"
-Z
+(9,1,1) = {"
G
D
d
@@ -400,10 +361,8 @@ t
R
D
o
-Z
"}
-(11,1,1) = {"
-Z
+(10,1,1) = {"
G
U
d
@@ -419,10 +378,8 @@ U
R
U
o
-Z
"}
-(12,1,1) = {"
-Z
+(11,1,1) = {"
G
I
d
@@ -438,10 +395,8 @@ U
R
U
G
-Z
"}
-(13,1,1) = {"
-Z
+(12,1,1) = {"
G
U
d
@@ -457,10 +412,8 @@ i
R
I
q
-Z
"}
-(14,1,1) = {"
-Z
+(13,1,1) = {"
G
U
d
@@ -476,10 +429,8 @@ M
R
U
G
-Z
"}
-(15,1,1) = {"
-Z
+(14,1,1) = {"
G
U
z
@@ -495,10 +446,8 @@ P
K
U
G
-Z
"}
-(16,1,1) = {"
-Z
+(15,1,1) = {"
G
U
m
@@ -514,10 +463,8 @@ m
m
U
G
-Z
"}
-(17,1,1) = {"
-Z
+(16,1,1) = {"
G
f
U
@@ -533,10 +480,8 @@ U
U
f
G
-Z
"}
-(18,1,1) = {"
-Z
+(17,1,1) = {"
G
G
H
@@ -552,24 +497,4 @@ G
H
G
G
-Z
-"}
-(19,1,1) = {"
-Z
-Z
-Z
-Z
-Z
-Z
-Z
-Z
-Z
-Z
-Z
-Z
-Z
-Z
-Z
-Z
-Z
"}
diff --git a/_maps/deathmatch/ragin_mages.dmm b/_maps/deathmatch/ragin_mages.dmm
index 8c42ef8665a18..3dcdb966d1147 100644
--- a/_maps/deathmatch/ragin_mages.dmm
+++ b/_maps/deathmatch/ragin_mages.dmm
@@ -761,11 +761,8 @@
/turf/open/floor/engine/cult,
/area/deathmatch/teleport)
"Xv" = (
+/obj/structure/railing,
/obj/structure/railing{
- layer = 3.1
- },
-/obj/structure/railing{
- layer = 3.1;
dir = 1
},
/turf/open/floor/engine/cult,
diff --git a/_maps/deathmatch/underground_arena.dmm b/_maps/deathmatch/underground_arena.dmm
index d407234f0ab2f..4d776acb0b416 100644
--- a/_maps/deathmatch/underground_arena.dmm
+++ b/_maps/deathmatch/underground_arena.dmm
@@ -473,9 +473,6 @@
},
/turf/open/indestructible/vault,
/area/deathmatch)
-"En" = (
-/turf/cordon,
-/area/deathmatch)
"EA" = (
/obj/effect/landmark/deathmatch_player_spawn,
/turf/open/indestructible/dark/smooth_large,
@@ -889,41 +886,6 @@
/area/deathmatch)
(1,1,1) = {"
-En
-En
-En
-En
-En
-En
-En
-En
-En
-En
-En
-En
-En
-En
-En
-En
-En
-En
-En
-En
-En
-En
-En
-En
-En
-En
-En
-En
-En
-En
-En
-En
-"}
-(2,1,1) = {"
-En
qa
qa
qa
@@ -954,10 +916,8 @@ qa
qa
qa
qa
-En
"}
-(3,1,1) = {"
-En
+(2,1,1) = {"
qa
aI
aI
@@ -988,10 +948,8 @@ aI
aI
aI
qa
-En
"}
-(4,1,1) = {"
-En
+(3,1,1) = {"
qa
aI
aI
@@ -1022,10 +980,8 @@ aI
aI
aI
qa
-En
"}
-(5,1,1) = {"
-En
+(4,1,1) = {"
qa
aI
aI
@@ -1056,10 +1012,8 @@ qa
aI
aI
qa
-En
"}
-(6,1,1) = {"
-En
+(5,1,1) = {"
qa
aI
aI
@@ -1090,10 +1044,8 @@ qa
aI
aI
qa
-En
"}
-(7,1,1) = {"
-En
+(6,1,1) = {"
qa
aI
aI
@@ -1124,10 +1076,8 @@ qa
aI
aI
qa
-En
"}
-(8,1,1) = {"
-En
+(7,1,1) = {"
qa
aI
aI
@@ -1158,10 +1108,8 @@ qa
aI
aI
qa
-En
"}
-(9,1,1) = {"
-En
+(8,1,1) = {"
qa
aI
aI
@@ -1192,10 +1140,8 @@ qa
aI
aI
qa
-En
"}
-(10,1,1) = {"
-En
+(9,1,1) = {"
qa
aI
aI
@@ -1226,10 +1172,8 @@ qa
aI
aI
qa
-En
"}
-(11,1,1) = {"
-En
+(10,1,1) = {"
qa
aI
aI
@@ -1260,10 +1204,8 @@ qa
aI
aI
qa
-En
"}
-(12,1,1) = {"
-En
+(11,1,1) = {"
qa
aI
aI
@@ -1294,10 +1236,8 @@ qa
aI
aI
qa
-En
"}
-(13,1,1) = {"
-En
+(12,1,1) = {"
qa
aI
aI
@@ -1328,10 +1268,8 @@ qa
aI
aI
qa
-En
"}
-(14,1,1) = {"
-En
+(13,1,1) = {"
qa
aI
aI
@@ -1362,10 +1300,8 @@ fX
aI
aI
qa
-En
"}
-(15,1,1) = {"
-En
+(14,1,1) = {"
qa
aI
aI
@@ -1396,10 +1332,8 @@ xK
aI
aI
qa
-En
"}
-(16,1,1) = {"
-En
+(15,1,1) = {"
qa
aI
aI
@@ -1430,10 +1364,8 @@ sd
aI
aI
qa
-En
"}
-(17,1,1) = {"
-En
+(16,1,1) = {"
qa
aI
aI
@@ -1464,10 +1396,8 @@ aI
aI
aI
qa
-En
"}
-(18,1,1) = {"
-En
+(17,1,1) = {"
qa
aI
aI
@@ -1498,10 +1428,8 @@ aI
aI
aI
qa
-En
"}
-(19,1,1) = {"
-En
+(18,1,1) = {"
qa
aI
aI
@@ -1532,10 +1460,8 @@ aI
aI
aI
qa
-En
"}
-(20,1,1) = {"
-En
+(19,1,1) = {"
qa
aI
aI
@@ -1566,10 +1492,8 @@ mz
aI
aI
qa
-En
"}
-(21,1,1) = {"
-En
+(20,1,1) = {"
qa
aI
aI
@@ -1600,10 +1524,8 @@ qa
aI
aI
qa
-En
"}
-(22,1,1) = {"
-En
+(21,1,1) = {"
qa
aI
aI
@@ -1634,10 +1556,8 @@ qa
aI
aI
qa
-En
"}
-(23,1,1) = {"
-En
+(22,1,1) = {"
qa
aI
aI
@@ -1668,10 +1588,8 @@ qa
aI
aI
qa
-En
"}
-(24,1,1) = {"
-En
+(23,1,1) = {"
qa
aI
aI
@@ -1702,10 +1620,8 @@ qa
aI
aI
qa
-En
"}
-(25,1,1) = {"
-En
+(24,1,1) = {"
qa
aI
aI
@@ -1736,10 +1652,8 @@ xG
aI
aI
qa
-En
"}
-(26,1,1) = {"
-En
+(25,1,1) = {"
qa
aI
aI
@@ -1770,10 +1684,8 @@ xG
aI
aI
qa
-En
"}
-(27,1,1) = {"
-En
+(26,1,1) = {"
qa
aI
aI
@@ -1804,10 +1716,8 @@ qa
aI
aI
qa
-En
"}
-(28,1,1) = {"
-En
+(27,1,1) = {"
qa
aI
aI
@@ -1838,10 +1748,8 @@ qa
aI
aI
qa
-En
"}
-(29,1,1) = {"
-En
+(28,1,1) = {"
qa
aI
aI
@@ -1872,10 +1780,8 @@ aI
aI
aI
qa
-En
"}
-(30,1,1) = {"
-En
+(29,1,1) = {"
qa
aI
aI
@@ -1906,10 +1812,8 @@ aI
aI
aI
qa
-En
"}
-(31,1,1) = {"
-En
+(30,1,1) = {"
qa
qa
qa
@@ -1940,39 +1844,4 @@ qa
qa
qa
qa
-En
-"}
-(32,1,1) = {"
-En
-En
-En
-En
-En
-En
-En
-En
-En
-En
-En
-En
-En
-En
-En
-En
-En
-En
-En
-En
-En
-En
-En
-En
-En
-En
-En
-En
-En
-En
-En
-En
"}
diff --git a/_maps/map_files/Basketball/ass_blast_usa.dmm b/_maps/map_files/Basketball/ass_blast_usa.dmm
index 4b3354ba6495d..baeb945de7678 100644
--- a/_maps/map_files/Basketball/ass_blast_usa.dmm
+++ b/_maps/map_files/Basketball/ass_blast_usa.dmm
@@ -102,9 +102,7 @@
"jj" = (
/obj/structure/table/reinforced,
/obj/item/book/manual/wiki/cooking_to_serve_man,
-/obj/item/reagent_containers/condiment/enzyme{
- layer = 5
- },
+/obj/item/reagent_containers/condiment/enzyme,
/obj/item/food/bun,
/obj/item/food/bun,
/obj/item/food/bun,
diff --git a/_maps/map_files/Basketball/beach_bums.dmm b/_maps/map_files/Basketball/beach_bums.dmm
index 517e70f2b630a..d13215d7ca835 100644
--- a/_maps/map_files/Basketball/beach_bums.dmm
+++ b/_maps/map_files/Basketball/beach_bums.dmm
@@ -459,7 +459,6 @@
pixel_y = 13
},
/obj/item/fishing_line{
- layer = 4;
pixel_x = 6;
pixel_y = 3
},
diff --git a/_maps/map_files/Birdshot/birdshot.dmm b/_maps/map_files/Birdshot/birdshot.dmm
index 2708d4719af1b..f4c63c0d36e8b 100644
--- a/_maps/map_files/Birdshot/birdshot.dmm
+++ b/_maps/map_files/Birdshot/birdshot.dmm
@@ -1,4 +1,13 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"aac" = (
+/obj/structure/table/wood,
+/obj/machinery/camera/directional/south{
+ c_tag = "Atmospherics - South"
+ },
+/obj/item/stack/cable_coil/five,
+/obj/effect/turf_decal/siding/wideplating_new/terracotta,
+/turf/open/floor/wood/tile,
+/area/station/maintenance/central/lesser)
"aae" = (
/obj/item/kirbyplants/random,
/obj/machinery/camera/directional/north,
@@ -22,6 +31,16 @@
},
/turf/open/floor/iron/small,
/area/station/security/prison/shower)
+"aaz" = (
+/obj/machinery/light/small/directional/south,
+/obj/machinery/firealarm/directional/south,
+/obj/item/kirbyplants/random,
+/obj/effect/turf_decal/siding/wood{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/wood,
+/turf/open/floor/stone,
+/area/station/service/bar)
"aaA" = (
/obj/structure/table/reinforced,
/obj/structure/spider/stickyweb,
@@ -44,12 +63,6 @@
/obj/structure/window/spawner/directional/west,
/turf/open/floor/iron,
/area/station/hallway/secondary/recreation)
-"aaZ" = (
-/obj/structure/closet/firecloset,
-/obj/effect/turf_decal/tile/blue,
-/obj/item/radio/intercom/directional/south,
-/turf/open/floor/iron/dark/side,
-/area/station/hallway/primary/central/fore)
"abh" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -59,16 +72,19 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/aft)
+"abo" = (
+/obj/effect/turf_decal/siding/wood,
+/obj/effect/turf_decal/siding/wood{
+ dir = 1
+ },
+/turf/open/floor/stone,
+/area/station/service/bar)
"abt" = (
/obj/structure/cable,
/obj/structure/lattice/catwalk,
/obj/machinery/power/tracker,
/turf/open/space/basic,
/area/station/solars/aft)
-"abB" = (
-/obj/structure/disposalpipe/segment,
-/turf/closed/wall/r_wall,
-/area/station/hallway/primary/port)
"abJ" = (
/obj/effect/turf_decal/tile/dark_red/opposingcorners,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
@@ -76,6 +92,14 @@
},
/turf/open/floor/iron,
/area/station/security/tram)
+"abP" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/machinery/firealarm/directional/south,
+/obj/effect/turf_decal/tile/neutral,
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/aft)
"abR" = (
/obj/machinery/power/emitter{
dir = 4
@@ -101,6 +125,10 @@
},
/turf/open/space/basic,
/area/space/nearstation)
+"acq" = (
+/obj/structure/flora/tree/jungle/small,
+/turf/open/misc/dirt/jungle,
+/area/station/service/chapel)
"acJ" = (
/obj/structure/reagent_dispensers/watertank,
/turf/open/floor/plating,
@@ -153,21 +181,15 @@
},
/turf/open/floor/catwalk_floor,
/area/station/engineering/hallway)
-"aef" = (
-/obj/structure/flora/bush/flowers_yw/style_3{
- pixel_x = 5;
- pixel_y = -5
- },
-/obj/structure/flora/bush/flowers_br/style_random{
- pixel_y = -5;
- pixel_x = 3
+"aeh" = (
+/obj/effect/turf_decal/tile/blue/anticorner/contrasted{
+ dir = 1
},
-/obj/effect/light_emitter/fake_outdoors,
-/obj/effect/turf_decal/siding/wood{
- dir = 9
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+ dir = 8
},
-/turf/open/floor/grass/Airless,
-/area/station/hallway/primary/central/aft)
+/turf/open/floor/iron/white,
+/area/station/medical/medbay/lobby)
"aeu" = (
/obj/structure/grille,
/turf/open/floor/plating,
@@ -192,6 +214,15 @@
/obj/machinery/light/small/directional/south,
/turf/open/floor/iron/dark,
/area/station/science/genetics)
+"aeE" = (
+/obj/effect/turf_decal/weather/dirt{
+ dir = 1
+ },
+/obj/structure/flora/bush/jungle/a/style_random{
+ pixel_y = -5
+ },
+/turf/open/floor/grass,
+/area/station/service/chapel)
"aeX" = (
/obj/structure/window/spawner/directional/east,
/obj/item/kirbyplants/random,
@@ -242,6 +273,14 @@
dir = 1
},
/area/station/hallway/secondary/entry)
+"afR" = (
+/obj/machinery/light/floor,
+/obj/effect/turf_decal/siding/wood/corner{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/wood/corner,
+/turf/open/floor/stone,
+/area/station/service/chapel)
"agb" = (
/obj/effect/turf_decal/tile/green{
dir = 8
@@ -254,11 +293,6 @@
},
/turf/open/floor/iron/white,
/area/station/medical/virology)
-"agp" = (
-/obj/structure/table/wood,
-/obj/item/cigarette/cigar/cohiba,
-/turf/open/floor/carpet,
-/area/station/commons/dorms)
"agy" = (
/obj/effect/turf_decal/stripes/line,
/obj/machinery/atmospherics/components/tank/oxygen{
@@ -293,39 +327,6 @@
/obj/item/radio/intercom/directional/west,
/turf/open/floor/iron/dark/small,
/area/station/engineering/storage_shared)
-"agY" = (
-/obj/machinery/door/airlock/engineering{
- name = "Main Engineering"
- },
-/obj/machinery/door/firedoor,
-/obj/effect/mapping_helpers/airlock/access/any/engineering/construction,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/catwalk_floor,
-/area/station/engineering/break_room)
-"ahf" = (
-/obj/effect/turf_decal/weather/dirt{
- dir = 10
- },
-/obj/structure/flora/bush/flowers_pp/style_random,
-/turf/open/floor/grass,
-/area/station/service/chapel)
-"ahl" = (
-/obj/structure/flora/tree/jungle/style_5,
-/turf/open/floor/grass,
-/area/station/service/chapel)
-"ahr" = (
-/obj/machinery/door/airlock/maintenance{
- name = "Maintenance"
- },
-/obj/effect/mapping_helpers/airlock/access/all/supply/general,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/disposalpipe/segment,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/cable,
-/turf/open/floor/plating,
-/area/station/maintenance/port/greater)
"ahu" = (
/obj/effect/turf_decal/siding/blue{
dir = 1
@@ -335,6 +336,14 @@
/mob/living/basic/pet/cat/runtime,
/turf/open/floor/iron/white/small,
/area/station/command/heads_quarters/cmo)
+"ahz" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/disposalpipe/segment,
+/turf/open/floor/wood/parquet,
+/area/station/service/library)
"ahD" = (
/obj/structure/flora/bush/flowers_pp/style_random,
/turf/open/floor/grass,
@@ -365,6 +374,15 @@
/obj/structure/sign/poster/official/random/directional/north,
/turf/open/floor/iron/showroomfloor,
/area/station/commons/toilet/auxiliary)
+"aii" = (
+/obj/effect/turf_decal/siding/thinplating{
+ dir = 1
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/open/floor/eighties/red,
+/area/station/hallway/primary/central/fore)
"aiK" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/structure/cable,
@@ -381,24 +399,6 @@
},
/turf/open/floor/engine/airless,
/area/station/engineering/atmos)
-"aiQ" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/obj/machinery/light/small/directional/west,
-/obj/effect/turf_decal/tile/neutral/opposingcorners{
- dir = 1
- },
-/obj/effect/turf_decal/siding/thinplating_new{
- dir = 8
- },
-/turf/open/floor/iron/small,
-/area/station/hallway/secondary/service)
-"ajQ" = (
-/obj/effect/spawner/random/maintenance,
-/obj/effect/spawner/random/structure/closet_maintenance,
-/turf/open/floor/plating,
-/area/station/maintenance/central/greater)
"ako" = (
/obj/effect/turf_decal/stripes/line{
dir = 9
@@ -410,6 +410,13 @@
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plating,
/area/station/maintenance/department/electrical)
+"akp" = (
+/obj/effect/turf_decal/weather/dirt{
+ dir = 6
+ },
+/obj/structure/flora/bush/flowers_yw/style_3,
+/turf/open/floor/grass,
+/area/station/service/chapel)
"akq" = (
/obj/structure/table,
/obj/item/clothing/under/suit/black_really,
@@ -463,9 +470,6 @@
},
/turf/open/floor/iron/dark,
/area/station/engineering/atmos)
-"akZ" = (
-/turf/closed/mineral/random/stationside,
-/area/space)
"alb" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -494,10 +498,16 @@
},
/turf/open/floor/iron/grimy,
/area/station/engineering/main)
-"als" = (
-/obj/machinery/holopad,
-/turf/open/floor/iron/kitchen/small,
-/area/station/service/kitchen)
+"alm" = (
+/obj/effect/turf_decal/tile/dark_red/half/contrasted{
+ dir = 4
+ },
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+ dir = 4
+ },
+/obj/structure/disposalpipe/segment,
+/turf/open/floor/iron,
+/area/station/security)
"alF" = (
/obj/structure/disposalpipe/segment{
dir = 9
@@ -514,18 +524,6 @@
/obj/structure/cable,
/turf/open/floor/iron/small,
/area/station/maintenance/solars/starboard/aft)
-"amh" = (
-/obj/structure/cable,
-/obj/structure/disposalpipe/segment,
-/obj/effect/turf_decal/trimline/neutral/line{
- dir = 8
- },
-/obj/effect/turf_decal/trimline/neutral/line{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/fore)
"amE" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -550,22 +548,20 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/engineering/atmos/pumproom)
-"amK" = (
-/obj/machinery/icecream_vat,
-/obj/effect/turf_decal/weather/snow/corner{
- dir = 1
- },
-/obj/effect/turf_decal/weather/snow,
-/obj/machinery/light/small/directional/north,
-/obj/machinery/power/apc/auto_name/directional/north,
-/obj/structure/cable,
-/turf/open/floor/iron/freezer,
-/area/station/service/kitchen/coldroom)
"amV" = (
/obj/structure/lattice/catwalk,
/obj/structure/railing,
/turf/open/space/basic,
/area/space/nearstation)
+"ana" = (
+/obj/machinery/computer/cargo{
+ dir = 1
+ },
+/obj/machinery/computer/security/telescreen/vault/directional/south,
+/obj/machinery/camera/autoname/directional/south,
+/obj/machinery/light/small/directional/south,
+/turf/open/floor/wood,
+/area/station/command/heads_quarters/qm)
"anb" = (
/obj/effect/turf_decal/siding/thinplating_new/terracotta,
/obj/effect/turf_decal/siding/red/corner{
@@ -576,25 +572,30 @@
},
/turf/open/floor/wood/tile,
/area/station/command/bridge)
-"ani" = (
-/obj/effect/turf_decal/weather/dirt{
+"ano" = (
+/obj/machinery/light/small/directional/south,
+/obj/machinery/camera/autoname/directional/south,
+/obj/effect/turf_decal/siding/wood{
dir = 1
},
-/turf/open/floor/grass,
-/area/station/service/chapel)
-"anD" = (
-/mob/living/basic/goat/pete,
-/obj/effect/turf_decal/weather/snow,
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
- dir = 4
- },
+/obj/effect/turf_decal/siding/wood,
+/turf/open/floor/stone,
+/area/station/service/bar)
+"anr" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/cable,
/obj/structure/disposalpipe/segment{
- dir = 6
+ dir = 9
},
-/obj/structure/cable,
-/obj/effect/turf_decal/weather/snow/corner,
-/turf/open/floor/iron/freezer,
-/area/station/service/kitchen/coldroom)
+/obj/effect/turf_decal/tile/neutral/opposingcorners{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/thinplating_new{
+ dir = 9
+ },
+/turf/open/floor/iron/small,
+/area/station/hallway/secondary/service)
"anJ" = (
/obj/effect/turf_decal/tile/yellow/half/contrasted{
dir = 8
@@ -603,10 +604,6 @@
/obj/machinery/chem_heater/withbuffer,
/turf/open/floor/iron,
/area/station/medical/chemistry)
-"anX" = (
-/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/plating,
-/area/station/ai_monitored/command/nuke_storage)
"aoa" = (
/obj/machinery/telecomms/server/presets/supply,
/turf/open/floor/circuit,
@@ -646,13 +643,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold/yellow/visible,
/turf/open/floor/iron,
/area/station/engineering/atmos)
-"apj" = (
-/obj/effect/turf_decal/sand/plating,
-/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible/layer5{
- dir = 4
- },
-/turf/open/floor/plating/airless,
-/area/space)
"apk" = (
/obj/structure/disposalpipe/segment,
/obj/effect/turf_decal/tile/dark_red{
@@ -679,12 +669,6 @@
/obj/structure/cable,
/turf/open/floor/iron/kitchen/small,
/area/station/security/prison/mess)
-"apq" = (
-/obj/effect/turf_decal/siding/wood{
- dir = 5
- },
-/turf/open/floor/stone,
-/area/station/service/chapel)
"apB" = (
/obj/structure/disposalpipe/junction{
dir = 4
@@ -699,15 +683,6 @@
"apZ" = (
/turf/open/floor/engine/helium,
/area/station/ai_monitored/turret_protected/ai)
-"aqf" = (
-/obj/structure/cable,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/aft)
"aqn" = (
/obj/effect/turf_decal/siding/dark{
dir = 4
@@ -749,6 +724,21 @@
},
/turf/open/floor/iron/white/smooth_large,
/area/station/medical/storage)
+"arx" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/structure/sign/directions/vault/directional/west{
+ dir = 2
+ },
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/fore)
+"arC" = (
+/obj/effect/turf_decal/tile/dark_red/opposingcorners,
+/obj/structure/disposalpipe/segment,
+/turf/open/floor/iron,
+/area/station/security/brig/entrance)
"arH" = (
/obj/effect/turf_decal/siding/thinplating/terracotta{
dir = 8
@@ -875,29 +865,11 @@
},
/turf/open/floor/plating/airless,
/area/station/science/ordnance/bomb)
-"atS" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/turf_decal/tile/neutral,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/station/hallway/primary/port)
"atW" = (
/turf/open/floor/iron/chapel{
dir = 8
},
/area/station/maintenance/starboard/greater)
-"aub" = (
-/obj/structure/sign/departments/botany/alt1/directional/north,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/aft)
"auc" = (
/obj/effect/turf_decal/stripes/white/line{
dir = 5
@@ -914,25 +886,11 @@
/obj/machinery/light/small/dim/directional/south,
/turf/open/floor/iron,
/area/station/maintenance/port/aft)
-"aul" = (
-/obj/structure/cable,
-/obj/effect/turf_decal/tile/dark_red{
- dir = 4
- },
-/obj/structure/disposalpipe/segment{
- dir = 6
- },
-/turf/open/floor/iron,
-/area/station/security/brig/entrance)
"aus" = (
/obj/structure/reagent_dispensers/fueltank,
/obj/effect/turf_decal/bot_white,
/turf/open/floor/iron/smooth,
/area/station/commons/storage/tools)
-"auF" = (
-/obj/item/radio/intercom/directional/west,
-/turf/open/floor/glass,
-/area/station/hallway/primary/central/aft)
"auG" = (
/obj/structure/chair{
dir = 1
@@ -948,17 +906,6 @@
/obj/machinery/light/small/directional/east,
/turf/open/floor/iron/smooth,
/area/station/maintenance/solars/starboard/fore)
-"auP" = (
-/obj/effect/spawner/random/entertainment/arcade{
- dir = 8
- },
-/obj/effect/turf_decal/siding/thinplating{
- dir = 4
- },
-/obj/structure/sign/poster/official/random/directional/east,
-/obj/structure/cable,
-/turf/open/floor/eighties/red,
-/area/station/hallway/primary/central/fore)
"auQ" = (
/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{
dir = 4
@@ -982,22 +929,6 @@
"ave" = (
/turf/open/space,
/area/space)
-"avp" = (
-/obj/structure/cable,
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/plating,
-/area/station/maintenance/central/greater)
-"avr" = (
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/pdapainter/research,
-/obj/machinery/computer/security/telescreen/rd/directional/north,
-/obj/effect/turf_decal/siding/purple{
- dir = 5
- },
-/turf/open/floor/iron/dark,
-/area/station/command/heads_quarters/rd)
"avB" = (
/obj/effect/turf_decal/tile/red{
dir = 4
@@ -1029,26 +960,12 @@
/obj/machinery/airalarm/directional/west,
/turf/open/floor/iron/dark,
/area/station/medical/pharmacy)
-"avY" = (
-/obj/structure/cable,
-/obj/structure/disposalpipe/segment,
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/plating,
-/area/station/maintenance/port/greater)
"awe" = (
/obj/effect/turf_decal/stripes/white/line{
dir = 8
},
/turf/open/floor/tram,
/area/station/security/tram)
-"aww" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/aft)
"awE" = (
/obj/structure/disposalpipe/sorting/mail/flip{
dir = 8
@@ -1092,19 +1009,29 @@
/obj/structure/sign/poster/official/random/directional/north,
/turf/open/misc/sandy_dirt,
/area/station/hallway/secondary/entry)
-"axd" = (
-/obj/effect/turf_decal/tile/neutral{
+"axb" = (
+/obj/structure/toilet{
dir = 8
},
-/obj/structure/sign/directions/vault/directional/south{
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
dir = 8
},
-/turf/closed/wall,
-/area/station/hallway/primary/central/aft)
+/obj/machinery/light_switch/directional/east,
+/turf/open/floor/iron/freezer,
+/area/station/command/heads_quarters/captain/private)
"axj" = (
/obj/item/radio/intercom/directional/east,
/turf/open/floor/iron,
/area/station/cargo/storage)
+"axl" = (
+/obj/effect/turf_decal/weather/dirt{
+ dir = 1
+ },
+/obj/structure/flora/bush/flowers_yw/style_3,
+/obj/structure/extinguisher_cabinet/directional/north,
+/obj/machinery/camera/directional/north,
+/turf/open/floor/grass,
+/area/station/service/chapel)
"axq" = (
/turf/open/floor/plating/airless,
/area/station/science/ordnance/bomb)
@@ -1132,12 +1059,6 @@
},
/turf/open/floor/iron/dark/smooth_large,
/area/station/maintenance/central/lesser)
-"axN" = (
-/obj/machinery/sparker/directional/north{
- id = "Xenobio"
- },
-/turf/open/floor/engine,
-/area/station/science/xenobiology)
"axX" = (
/obj/effect/turf_decal/siding/yellow,
/obj/effect/turf_decal/tile/yellow/diagonal_centre,
@@ -1148,6 +1069,14 @@
/obj/machinery/light/cold/dim/directional/south,
/turf/open/floor/iron/diagonal,
/area/station/engineering/lobby)
+"ayd" = (
+/obj/effect/turf_decal/tile/yellow/half/contrasted{
+ dir = 8
+ },
+/obj/machinery/chem_dispenser,
+/obj/machinery/camera/autoname/directional/west,
+/turf/open/floor/iron,
+/area/station/medical/chemistry)
"ayf" = (
/obj/effect/turf_decal/trimline/blue/filled/corner{
dir = 8
@@ -1260,6 +1189,13 @@
"azz" = (
/turf/open/floor/iron,
/area/station/security/prison/workout)
+"azA" = (
+/obj/effect/turf_decal/weather/dirt{
+ dir = 5
+ },
+/obj/structure/flora/bush/large/style_3,
+/turf/open/floor/grass,
+/area/station/service/chapel)
"azJ" = (
/obj/item/kirbyplants/organic/applebush,
/obj/machinery/light/small/directional/south,
@@ -1286,20 +1222,15 @@
/obj/structure/extinguisher_cabinet/directional/west,
/turf/open/floor/iron,
/area/station/maintenance/hallway/abandoned_command)
-"azV" = (
+"azW" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/door/airlock/security/glass{
- id_tag = "outerbrig";
- name = "Brig"
- },
-/obj/effect/mapping_helpers/airlock/access/all/security/entrance,
-/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{
- cycle_id = "sci-entrance"
+/obj/structure/cable,
+/obj/structure/disposalpipe/segment{
+ dir = 9
},
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/iron/textured_half,
-/area/station/security/brig/entrance)
+/turf/open/floor/plating,
+/area/station/maintenance/central/greater)
"azZ" = (
/obj/machinery/light/small/directional/south,
/turf/open/floor/iron/white/small,
@@ -1377,16 +1308,6 @@
},
/turf/open/floor/iron/white,
/area/station/medical/treatment_center)
-"aBo" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/obj/structure/disposalpipe/segment{
- dir = 5
- },
-/turf/open/floor/iron,
-/area/station/hallway/primary/port)
"aBu" = (
/obj/effect/turf_decal/siding/wood{
dir = 5
@@ -1406,14 +1327,6 @@
/obj/structure/cable,
/turf/open/floor/iron/small,
/area/station/medical/morgue)
-"aBB" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/obj/effect/landmark/start/hangover,
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/fore)
"aBK" = (
/obj/structure/dresser,
/obj/effect/turf_decal/siding/wood{
@@ -1428,6 +1341,11 @@
},
/turf/open/floor/carpet/blue,
/area/station/commons/dorms)
+"aBP" = (
+/obj/item/radio/intercom/directional/south,
+/obj/effect/turf_decal/tile/neutral,
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/aft)
"aBV" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/effect/turf_decal/tile/neutral{
@@ -1445,12 +1363,6 @@
},
/turf/open/floor/iron/dark,
/area/station/medical/chemistry)
-"aCz" = (
-/obj/effect/turf_decal/weather/dirt,
-/obj/machinery/light/small/directional/south,
-/obj/machinery/status_display/evac/directional/south,
-/turf/open/floor/grass,
-/area/station/service/chapel)
"aCM" = (
/obj/effect/spawner/random/structure/crate_abandoned,
/obj/structure/alien/weeds,
@@ -1482,16 +1394,33 @@
},
/turf/open/floor/plating/airless,
/area/station/science/ordnance/bomb)
-"aDJ" = (
+"aDH" = (
+/obj/structure/railing{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/smart/simple/cyan/hidden{
+ dir = 4
+ },
+/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 = 8
+/obj/machinery/requests_console/directional/north{
+ department = "Chief Engineer's Desk";
+ name = "Chief Engineer's Requests Console";
+ pixel_y = -32;
+ pixel_x = 2
},
-/obj/structure/sign/directions/vault/directional/west{
- dir = 2
+/obj/effect/mapping_helpers/requests_console/announcement,
+/obj/effect/mapping_helpers/requests_console/information,
+/turf/open/floor/iron/stairs/old{
+ dir = 4
},
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/fore)
+/area/station/command/heads_quarters/ce)
+"aDK" = (
+/obj/effect/turf_decal/weather/dirt,
+/obj/structure/flora/bush/flowers_yw/style_2,
+/obj/structure/flora/tree/jungle/style_5,
+/turf/open/floor/grass,
+/area/station/service/chapel)
"aEa" = (
/obj/effect/turf_decal/stripes/white/line,
/turf/open/floor/tram,
@@ -1525,18 +1454,6 @@
dir = 8
},
/area/station/hallway/primary/central/fore)
-"aEo" = (
-/obj/effect/turf_decal/tile/blue/half/contrasted{
- dir = 8
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/iron/white,
-/area/station/medical/medbay/lobby)
"aEq" = (
/obj/effect/turf_decal/stripes/line{
dir = 6
@@ -1577,13 +1494,12 @@
/obj/machinery/shower/directional/west,
/turf/open/floor/iron/dark/small,
/area/station/maintenance/department/engine)
-"aFb" = (
-/obj/structure/flora/grass/jungle/b/style_3{
- pixel_y = -6;
- pixel_x = -5
- },
-/turf/open/floor/grass,
-/area/station/service/chapel)
+"aET" = (
+/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/herringbone,
+/area/station/ai_monitored/command/nuke_storage)
"aFh" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -1656,13 +1572,6 @@
/obj/machinery/door/window/right/directional/west,
/turf/open/floor/engine,
/area/station/engineering/supermatter)
-"aGq" = (
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/obj/machinery/camera/autoname/directional/west,
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/fore)
"aGv" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -1740,12 +1649,42 @@
/obj/machinery/light/small/directional/east,
/turf/open/floor/iron,
/area/station/construction/mining/aux_base)
+"aHD" = (
+/obj/machinery/shieldgen,
+/obj/item/clothing/gloves/color/black{
+ pixel_y = -3;
+ pixel_x = -2
+ },
+/obj/item/cigarette{
+ pixel_x = 6;
+ pixel_y = 4
+ },
+/obj/item/clothing/mask/gas{
+ pixel_y = 5
+ },
+/obj/item/clothing/head/cone{
+ pixel_x = 1;
+ pixel_y = 15
+ },
+/turf/open/floor/plating,
+/area/station/maintenance/department/engine)
"aHJ" = (
/obj/structure/window/spawner/directional/north,
/obj/machinery/hydroponics/soil,
/obj/machinery/airalarm/directional/west,
/turf/open/floor/grass,
/area/station/security/prison/garden)
+"aHM" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral/opposingcorners,
+/obj/structure/chair/sofa/bench/left{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/iron,
+/area/station/holodeck/rec_center)
"aHS" = (
/obj/structure/disposalpipe/segment,
/obj/effect/turf_decal/trimline/neutral/line{
@@ -1762,13 +1701,6 @@
},
/turf/open/floor/plating,
/area/station/maintenance/central/lesser)
-"aIi" = (
-/obj/machinery/door/airlock/public/glass{
- name = "Library"
- },
-/obj/machinery/door/firedoor,
-/turf/open/floor/iron/textured_half,
-/area/station/service/library)
"aIk" = (
/obj/structure/cable,
/obj/structure/disposalpipe/segment{
@@ -1816,6 +1748,15 @@
"aJq" = (
/turf/closed/mineral/random/stationside,
/area/space/nearstation)
+"aJB" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/light_switch/directional/north,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/open/floor/wood,
+/area/station/cargo/boutique)
"aJE" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/siding/wood{
@@ -1823,6 +1764,28 @@
},
/turf/open/floor/iron/small,
/area/station/maintenance/port/lesser)
+"aJG" = (
+/obj/structure/cable,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/merge_conflict_marker{
+ name = "---Merge Conflict Marker---";
+
+ desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
+ },
+/obj/structure/cable,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/neutral/line{
+ dir = 10
+ },
+/obj/effect/turf_decal/trimline/neutral/corner{
+ dir = 4
+ },
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/aft)
"aJV" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 8
@@ -1893,6 +1856,15 @@
/obj/effect/landmark/start/atmospheric_technician,
/turf/open/floor/iron/smooth,
/area/station/engineering/atmos/office)
+"aKZ" = (
+/obj/structure/cable,
+/obj/machinery/door/airlock/maintenance{
+ name = "Security Maintenance"
+ },
+/obj/effect/mapping_helpers/airlock/access/all/security/general,
+/obj/structure/disposalpipe/segment,
+/turf/open/floor/plating,
+/area/station/maintenance/port/lesser)
"aLk" = (
/obj/structure/cable,
/obj/effect/turf_decal/siding/dark_red{
@@ -1910,9 +1882,6 @@
/obj/machinery/light/cold/directional/south,
/turf/open/floor/iron/dark/small,
/area/station/ai_monitored/security/armory)
-"aLm" = (
-/turf/closed/wall/rust,
-/area/station/cargo/drone_bay)
"aLr" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
@@ -1942,23 +1911,6 @@
},
/turf/open/floor/iron,
/area/station/hallway/secondary/dock)
-"aLB" = (
-/obj/structure/window/reinforced/spawner/directional/south,
-/obj/machinery/camera/autoname/directional/north,
-/obj/effect/turf_decal/tile/neutral/opposingcorners{
- dir = 1
- },
-/obj/effect/turf_decal/siding/thinplating_new{
- dir = 5
- },
-/obj/machinery/airalarm/directional/east,
-/turf/open/floor/iron/small,
-/area/station/hallway/secondary/service)
-"aLS" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/carpet/lone,
-/area/station/service/chapel/office)
"aLU" = (
/obj/structure/chair{
dir = 4
@@ -1986,13 +1938,6 @@
/obj/machinery/atmospherics/pipe/layer_manifold/supply/visible,
/turf/open/floor/plating,
/area/station/science/ordnance/testlab)
-"aMZ" = (
-/obj/effect/turf_decal/siding/wood{
- dir = 9
- },
-/obj/structure/table/wood,
-/turf/open/floor/iron/grimy,
-/area/station/service/bar)
"aNc" = (
/obj/structure/lattice/catwalk,
/obj/structure/railing/corner{
@@ -2000,16 +1945,6 @@
},
/turf/open/space/basic,
/area/space/nearstation)
-"aNj" = (
-/obj/machinery/door/airlock/public{
- name = "Arcade"
- },
-/obj/effect/turf_decal/siding/thinplating,
-/obj/machinery/door/firedoor,
-/obj/structure/disposalpipe/segment,
-/obj/structure/cable,
-/turf/open/floor/iron/textured_half,
-/area/station/hallway/primary/central/fore)
"aNk" = (
/obj/machinery/suit_storage_unit/security,
/turf/open/floor/iron/small,
@@ -2069,27 +2004,6 @@
/obj/machinery/portable_atmospherics/canister,
/turf/open/floor/iron/dark,
/area/station/engineering/atmos)
-"aOh" = (
-/obj/machinery/status_display/ai/directional/south,
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/obj/item/kirbyplants/random,
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/turf/open/floor/iron/white/side,
-/area/station/hallway/primary/central/aft)
-"aOt" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/light/warm/dim,
-/obj/structure/extinguisher_cabinet/directional/south,
-/obj/machinery/camera/autoname/directional/south,
-/obj/effect/turf_decal/tile/neutral,
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/aft)
"aOz" = (
/obj/structure/cable,
/obj/effect/turf_decal/tile/neutral/fourcorners,
@@ -2100,6 +2014,18 @@
/obj/machinery/light/floor,
/turf/open/floor/iron/dark,
/area/station/science/genetics)
+"aOJ" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/structure/disposalpipe/segment,
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/fore)
+"aOK" = (
+/obj/effect/landmark/start/hangover,
+/turf/open/misc/dirt/jungle,
+/area/station/service/chapel)
"aOS" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/smooth,
@@ -2152,13 +2078,6 @@
},
/turf/open/floor/plating/airless,
/area/station/science/ordnance/bomb)
-"aPK" = (
-/obj/structure/disposalpipe/segment,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/effect/turf_decal/tile/neutral,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/fore)
"aPM" = (
/obj/structure/chair/sofa/bench/right,
/obj/machinery/firealarm/directional/north,
@@ -2166,6 +2085,19 @@
/obj/machinery/incident_display/tram/directional/north,
/turf/open/floor/iron,
/area/station/security/tram)
+"aPU" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/machinery/light/cold/directional/north,
+/obj/machinery/firealarm/directional/north,
+/obj/machinery/camera/directional/north,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/open/floor/iron,
+/area/station/hallway/primary/port)
"aPV" = (
/obj/effect/spawner/random/structure/crate_abandoned,
/obj/effect/decal/cleanable/dirt,
@@ -2176,17 +2108,6 @@
/obj/machinery/holopad,
/turf/open/floor/iron/smooth_large,
/area/station/science/robotics/mechbay)
-"aQc" = (
-/obj/structure/flora/bush/flowers_br/style_random,
-/obj/machinery/status_display/evac/directional/north,
-/obj/effect/turf_decal/weather/dirt{
- dir = 5
- },
-/obj/effect/turf_decal/weather/dirt{
- dir = 6
- },
-/turf/open/floor/grass,
-/area/station/service/chapel)
"aQf" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -2196,6 +2117,19 @@
},
/turf/open/floor/plating,
/area/station/maintenance/hallway/abandoned_command)
+"aQi" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/turf_decal/stripes/corner{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/fore)
"aQm" = (
/obj/structure/window/reinforced/spawner/directional/west,
/turf/open/floor/iron/dark/small,
@@ -2208,6 +2142,15 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible,
/turf/open/floor/iron/dark,
/area/station/medical/cryo)
+"aQC" = (
+/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/siding/thinplating{
+ dir = 4
+ },
+/turf/open/floor/eighties/red,
+/area/station/hallway/primary/central/fore)
"aQF" = (
/obj/effect/turf_decal/tile/dark_red/half/contrasted{
dir = 1
@@ -2227,6 +2170,14 @@
/obj/machinery/light/small/directional/north,
/turf/open/floor/iron/cafeteria,
/area/station/hallway/secondary/exit/departure_lounge)
+"aRf" = (
+/obj/effect/turf_decal/tile/neutral/opposingcorners,
+/obj/machinery/light/small/directional/east,
+/obj/structure/chair/stool/bar/directional/north,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/landmark/start/hangover,
+/turf/open/floor/iron,
+/area/station/holodeck/rec_center)
"aRo" = (
/obj/effect/turf_decal/trimline/white/line{
dir = 4
@@ -2236,6 +2187,11 @@
},
/turf/open/floor/wood,
/area/station/commons/fitness/recreation)
+"aRq" = (
+/obj/structure/flora/bush/jungle/c/style_random,
+/obj/effect/turf_decal/weather/dirt,
+/turf/open/floor/grass,
+/area/station/service/chapel)
"aRv" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -2268,14 +2224,6 @@
/obj/effect/turf_decal/trimline/neutral/end,
/turf/open/floor/iron,
/area/station/hallway/primary/central/fore)
-"aRS" = (
-/obj/effect/turf_decal/stripes/line,
-/obj/machinery/computer/security/telescreen/turbine/directional/south,
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
- dir = 1
- },
-/turf/open/floor/iron/smooth,
-/area/station/maintenance/disposal/incinerator)
"aRT" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/newscaster/directional/west,
@@ -2306,25 +2254,36 @@
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/station/engineering/supermatter/room)
-"aTb" = (
-/obj/structure/toilet{
- dir = 4
- },
-/obj/machinery/light/small/directional/west,
-/obj/structure/sign/poster/official/random/directional/west,
-/obj/machinery/button/door/directional/north{
- id = "Toilet1";
- specialfunctions = 4;
- name = "Lock Control";
- normaldoorcontrol = 1
- },
-/turf/open/floor/iron/white/small,
-/area/station/commons/toilet/restrooms)
"aTc" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron,
/area/station/maintenance/department/medical/central)
-"aTg" = (
+"aTk" = (
+/obj/structure/closet/secure_closet/freezer/empty,
+/obj/item/food/grown/tomato{
+ pixel_y = 2;
+ pixel_x = 2
+ },
+/obj/item/food/grown/tomato{
+ pixel_y = 2;
+ pixel_x = 2
+ },
+/obj/item/food/grown/eggplant{
+ pixel_y = 5;
+ pixel_x = 5
+ },
+/obj/item/food/grown/eggplant{
+ pixel_y = 5;
+ pixel_x = 5
+ },
+/obj/item/storage/fancy/egg_box,
+/obj/item/storage/fancy/egg_box,
+/obj/item/reagent_containers/condiment/milk,
+/obj/item/reagent_containers/condiment/milk,
+/obj/item/reagent_containers/condiment/soymilk,
+/obj/item/reagent_containers/condiment/soymilk,
+/obj/item/reagent_containers/condiment/flour,
+/obj/item/reagent_containers/condiment/flour,
/turf/open/floor/iron/kitchen/small,
/area/station/service/kitchen)
"aTn" = (
@@ -2351,15 +2310,6 @@
},
/turf/open/floor/plating/airless,
/area/station/science/ordnance/bomb)
-"aTz" = (
-/obj/effect/turf_decal/siding/thinplating_new/light{
- dir = 4
- },
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
- dir = 8
- },
-/turf/open/floor/iron/white/small,
-/area/station/service/hydroponics)
"aTG" = (
/obj/structure/table/reinforced,
/obj/machinery/requests_console/directional/east{
@@ -2372,6 +2322,24 @@
/obj/machinery/recharger,
/turf/open/floor/iron/smooth,
/area/station/security/checkpoint/escape)
+"aTK" = (
+/obj/structure/flora/bush/jungle/a/style_random,
+/obj/effect/turf_decal/weather/dirt{
+ dir = 1
+ },
+/turf/open/floor/grass,
+/area/station/service/chapel)
+"aUs" = (
+/obj/machinery/door/airlock{
+ name = "Kitchen"
+ },
+/obj/effect/mapping_helpers/airlock/access/all/service/kitchen,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/cable,
+/obj/structure/disposalpipe/segment,
+/turf/open/floor/plating,
+/area/station/maintenance/central/greater)
"aUA" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -2390,6 +2358,13 @@
},
/turf/open/floor/stone,
/area/station/command/heads_quarters/hos)
+"aUP" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/turf/open/floor/iron,
+/area/station/hallway/primary/fore)
"aUR" = (
/obj/effect/turf_decal/stripes/corner,
/obj/effect/turf_decal/stripes/line{
@@ -2404,13 +2379,24 @@
dir = 1
},
/area/station/engineering/supermatter/room)
-"aVA" = (
+"aVl" = (
+/obj/effect/turf_decal/weather/dirt{
+ dir = 9
+ },
+/obj/structure/flora/bush/flowers_pp/style_random,
+/turf/open/floor/grass,
+/area/station/service/chapel)
+"aVm" = (
+/obj/structure/flora/bush/flowers_br/style_random{
+ pixel_x = -3;
+ pixel_y = 4
+ },
+/obj/effect/light_emitter/fake_outdoors,
/obj/effect/turf_decal/siding/wood{
- dir = 8
+ dir = 6
},
-/obj/machinery/newscaster/directional/west,
-/turf/open/floor/stone,
-/area/station/service/bar)
+/turf/open/floor/grass/Airless,
+/area/station/hallway/primary/central/aft)
"aVF" = (
/obj/structure/cable,
/obj/effect/decal/cleanable/dirt,
@@ -2457,13 +2443,6 @@
"aWc" = (
/turf/open/floor/iron/small,
/area/station/security/tram)
-"aWf" = (
-/obj/machinery/camera/autoname/directional/north,
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/aft)
"aWi" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -2476,9 +2455,14 @@
/obj/effect/mapping_helpers/airlock/access/all/security/general,
/turf/open/floor/iron/textured_half,
/area/station/security/execution/transfer)
-"aWr" = (
-/obj/structure/flora/tree/jungle/small,
-/turf/open/misc/dirt/jungle,
+"aWl" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/wood/corner{
+ dir = 8
+ },
+/turf/open/floor/stone,
/area/station/service/chapel)
"aWt" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -2518,12 +2502,6 @@
},
/turf/open/floor/iron/smooth,
/area/station/engineering/atmos/office)
-"aXC" = (
-/obj/structure/disposalpipe/segment{
- dir = 6
- },
-/turf/closed/wall,
-/area/station/hallway/primary/central/fore)
"aXI" = (
/turf/closed/wall/r_wall,
/area/station/science/lobby)
@@ -2533,16 +2511,13 @@
/obj/item/canvas/twentythree_twentythree,
/turf/open/floor/iron,
/area/station/commons/storage/art)
-"aYj" = (
-/obj/machinery/door/airlock{
- name = "Kitchen"
+"aYh" = (
+/obj/effect/turf_decal/weather/dirt{
+ dir = 1
},
-/obj/effect/mapping_helpers/airlock/access/all/service/kitchen,
-/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/service/bar/backroom)
+/obj/machinery/light/floor,
+/turf/open/floor/grass,
+/area/station/service/chapel)
"aYp" = (
/obj/structure/chair,
/obj/effect/turf_decal/stripes/line{
@@ -2577,16 +2552,44 @@
/obj/structure/tram,
/turf/open/floor/tram,
/area/station/maintenance/port/aft)
+"aYw" = (
+/obj/effect/turf_decal/plaque{
+ icon_state = "L9";
+ pixel_y = -15
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/aft)
+"aYH" = (
+/obj/effect/mapping_helpers/requests_console/supplies,
+/obj/machinery/power/apc/auto_name/directional/north,
+/obj/structure/cable,
+/obj/effect/turf_decal/siding/wood{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/wood,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/requests_console/auto_name/directional/south,
+/turf/open/floor/stone,
+/area/station/service/bar)
"aYR" = (
/obj/structure/broken_flooring/singular/directional/east,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/plating,
/area/station/maintenance/starboard/greater)
-"aYU" = (
-/obj/effect/turf_decal/siding/wood,
-/obj/structure/table/wood,
-/turf/open/floor/iron/grimy,
-/area/station/service/bar)
+"aYW" = (
+/obj/effect/turf_decal/trimline/neutral/line,
+/obj/effect/turf_decal/trimline/neutral/line{
+ dir = 1
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/open/floor/iron,
+/area/station/hallway/primary/port)
"aYY" = (
/obj/structure/flora/bush/flowers_yw/style_random,
/turf/open/misc/sandy_dirt,
@@ -2601,12 +2604,6 @@
},
/turf/open/floor/plating/rust,
/area/station/engineering/supermatter/room)
-"aZh" = (
-/obj/machinery/modular_computer/preset/curator{
- dir = 8
- },
-/turf/open/floor/carpet,
-/area/station/service/library)
"aZu" = (
/obj/machinery/power/emitter{
dir = 4
@@ -2652,6 +2649,13 @@
"bat" = (
/turf/open/floor/engine/n2o,
/area/station/ai_monitored/turret_protected/ai)
+"baD" = (
+/obj/structure/cable,
+/obj/structure/disposalpipe/segment{
+ dir = 6
+ },
+/turf/open/floor/plating,
+/area/station/maintenance/port/lesser)
"baE" = (
/obj/structure/table,
/obj/item/gps/mining{
@@ -2664,22 +2668,14 @@
/obj/structure/alien/weeds,
/turf/open/misc/asteroid,
/area/station/maintenance/starboard/greater)
-"baJ" = (
-/obj/structure/disposalpipe/segment{
- dir = 9
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/effect/turf_decal/tile/neutral/opposingcorners,
-/obj/item/radio/intercom/directional/east,
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/fore)
-"baO" = (
-/obj/effect/turf_decal/tile/neutral/opposingcorners,
-/obj/effect/spawner/random/entertainment/arcade{
- dir = 1
+"baM" = (
+/obj/machinery/door/firedoor,
+/obj/machinery/seed_extractor,
+/obj/machinery/door/window/right/directional/east,
+/turf/open/floor/iron/textured_half{
+ dir = 8
},
-/turf/open/floor/iron,
-/area/station/holodeck/rec_center)
+/area/station/service/hydroponics)
"baP" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -2690,15 +2686,6 @@
/obj/machinery/camera/autoname/directional/north,
/turf/open/floor/iron/dark,
/area/station/medical/medbay/central)
-"baW" = (
-/obj/structure/chair/stool/directional/north,
-/obj/effect/turf_decal/siding/wood{
- dir = 8
- },
-/obj/machinery/camera/autoname/directional/west,
-/obj/effect/landmark/start/assistant,
-/turf/open/floor/stone,
-/area/station/service/bar)
"bba" = (
/obj/effect/turf_decal/siding/blue{
dir = 8
@@ -2743,10 +2730,27 @@
},
/turf/open/floor/iron,
/area/station/maintenance/port/aft)
+"bci" = (
+/obj/structure/chair/comfy/beige{
+ dir = 4
+ },
+/obj/machinery/button/door/directional/north{
+ id = "CabinS";
+ name = "Bolt Control";
+ normaldoorcontrol = 1;
+ specialfunctions = 4
+ },
+/turf/open/floor/carpet/green,
+/area/station/commons/dorms)
"bcr" = (
/obj/effect/turf_decal/stripes/end,
/turf/open/floor/plating/airless,
/area/station/science/ordnance/bomb)
+"bct" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron/kitchen/small,
+/area/station/service/kitchen)
"bcv" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -2754,13 +2758,6 @@
/obj/machinery/door/firedoor,
/turf/open/floor/iron/white/small,
/area/station/medical/medbay/lobby)
-"bcC" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/turf_decal/tile/neutral,
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/iron,
-/area/station/hallway/primary/port)
"bcK" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -2779,6 +2776,14 @@
dir = 4
},
/area/station/science/xenobiology)
+"bcR" = (
+/obj/effect/turf_decal/tile/brown/opposingcorners{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/landmark/start/assistant,
+/turf/open/floor/iron,
+/area/station/commons/vacant_room/commissary)
"bcZ" = (
/obj/effect/turf_decal/stripes/corner{
dir = 4
@@ -2826,13 +2831,6 @@
"beg" = (
/turf/closed/wall/r_wall,
/area/station/engineering/hallway)
-"bej" = (
-/obj/effect/turf_decal/siding/wood,
-/obj/effect/turf_decal/siding/wood/corner{
- dir = 4
- },
-/turf/open/floor/stone,
-/area/station/service/chapel)
"bey" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
dir = 4
@@ -2843,23 +2841,22 @@
"beK" = (
/turf/open/floor/iron/smooth,
/area/station/security/evidence)
-"beN" = (
-/obj/effect/landmark/start/hangover,
-/obj/effect/turf_decal/trimline/neutral/line,
-/obj/effect/turf_decal/trimline/neutral/line{
- dir = 1
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/station/hallway/primary/port)
"bfe" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/camera/autoname/directional/west,
/obj/machinery/light/warm/directional/west,
/turf/open/floor/iron/white,
/area/station/science/cytology)
+"bfn" = (
+/obj/effect/turf_decal/tile/brown/opposingcorners{
+ dir = 1
+ },
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+ dir = 1
+ },
+/obj/structure/cable,
+/turf/open/floor/iron,
+/area/station/commons/vacant_room/commissary)
"bfE" = (
/obj/effect/turf_decal/siding/green/end{
dir = 1
@@ -2898,18 +2895,17 @@
},
/turf/open/floor/iron/dark/small,
/area/station/engineering/lobby)
-"bgx" = (
+"bgv" = (
+/obj/effect/decal/cleanable/dirt,
/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/door/airlock/vault{
- name = "Vault"
+/turf/open/floor/plating,
+/area/station/maintenance/central/lesser)
+"bgw" = (
+/obj/effect/turf_decal/siding/wood/corner{
+ dir = 8
},
-/obj/effect/mapping_helpers/airlock/locked,
-/obj/effect/mapping_helpers/airlock/access/all/supply/vault,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/door/firedoor,
-/turf/open/floor/iron/dark/herringbone,
-/area/station/ai_monitored/command/nuke_storage)
+/turf/open/floor/stone,
+/area/station/service/chapel)
"bgy" = (
/obj/structure/disposalpipe/segment,
/obj/structure/cable,
@@ -2944,6 +2940,16 @@
},
/turf/open/floor/iron/dark/small,
/area/station/tcommsat/server)
+"bgZ" = (
+/obj/effect/turf_decal/trimline/neutral/line,
+/obj/effect/turf_decal/trimline/neutral/line{
+ dir = 1
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 6
+ },
+/turf/open/floor/iron,
+/area/station/hallway/primary/port)
"bhb" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -2970,16 +2976,10 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/cafeteria,
/area/station/security/prison/mess)
-"bie" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/light/small/directional/west,
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/obj/machinery/status_display/ai/directional/west,
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/fore)
+"bic" = (
+/obj/machinery/holopad,
+/turf/open/floor/iron/white/small,
+/area/station/service/hydroponics)
"biB" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
/turf/open/floor/iron/dark/smooth_large,
@@ -2989,6 +2989,12 @@
/obj/machinery/holopad,
/turf/open/floor/iron/white/small,
/area/station/science/lobby)
+"biO" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/mapping_helpers/broken_floor,
+/obj/structure/reagent_dispensers/fueltank,
+/turf/open/floor/plating,
+/area/station/maintenance/port/greater)
"bja" = (
/obj/structure/railing/corner/end/flip{
dir = 8
@@ -3005,21 +3011,6 @@
/obj/structure/cable/multilayer,
/turf/open/floor/plating,
/area/station/science/xenobiology)
-"bje" = (
-/obj/structure/chair/sofa/bench{
- dir = 1
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/turf/open/floor/iron/white/side,
-/area/station/hallway/primary/central/aft)
-"bjh" = (
-/obj/structure/cable,
-/obj/machinery/power/apc/auto_name/directional/west,
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/wood,
-/area/station/cargo/boutique)
"bji" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -3149,25 +3140,6 @@
/obj/structure/closet/crate/miningcar,
/turf/open/floor/iron,
/area/station/hallway/secondary/dock)
-"blB" = (
-/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/wood/end{
- dir = 1
- },
-/turf/open/floor/stone,
-/area/station/service/bar)
-"blC" = (
-/obj/effect/spawner/random/entertainment/arcade{
- dir = 1
- },
-/obj/effect/turf_decal/siding/thinplating{
- dir = 10
- },
-/obj/structure/sign/poster/official/random/directional/south,
-/turf/open/floor/eighties/red,
-/area/station/hallway/primary/central/fore)
"blJ" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -3189,6 +3161,17 @@
},
/turf/open/floor/iron,
/area/station/engineering/atmos)
+"bmp" = (
+/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 = 8
+ },
+/obj/effect/turf_decal/siding/wood{
+ dir = 4
+ },
+/turf/open/floor/stone,
+/area/station/service/bar)
"bmr" = (
/obj/structure/cable,
/obj/machinery/telecomms/broadcaster/preset_right,
@@ -3219,6 +3202,13 @@
/mob/living/basic/bot/medbot/autopatrol,
/turf/open/floor/iron/white,
/area/station/medical/medbay/lobby)
+"bmI" = (
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/camera/directional/east,
+/obj/effect/turf_decal/tile/neutral,
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/fore)
"bmN" = (
/obj/structure/railing{
dir = 4
@@ -3238,27 +3228,6 @@
/obj/effect/spawner/random/maintenance,
/turf/open/floor/tram,
/area/station/security/tram)
-"bmY" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/effect/turf_decal/trimline/neutral/line,
-/obj/effect/turf_decal/trimline/neutral/line{
- dir = 1
- },
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/aft)
-"bnn" = (
-/obj/effect/turf_decal/tile/yellow{
- dir = 1
- },
-/obj/effect/turf_decal/tile/red{
- dir = 8
- },
-/obj/effect/turf_decal/tile/neutral/half/contrasted{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/station/hallway/primary/fore)
"bno" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -3297,23 +3266,6 @@
/obj/machinery/suit_storage_unit/cmo,
/turf/open/floor/wood/parquet,
/area/station/command/heads_quarters/cmo)
-"bnQ" = (
-/obj/effect/turf_decal/weather/dirt{
- dir = 1
- },
-/obj/structure/flora/rock/pile/jungle/style_3,
-/turf/open/floor/grass,
-/area/station/service/chapel)
-"bnU" = (
-/obj/machinery/door/firedoor,
-/obj/effect/turf_decal/stripes/red/line{
- dir = 4
- },
-/obj/effect/turf_decal/stripes/red/line{
- dir = 8
- },
-/turf/open/floor/iron/small,
-/area/station/hallway/primary/central/aft)
"bnV" = (
/obj/machinery/airalarm/directional/east,
/obj/effect/turf_decal/tile/red/half/contrasted{
@@ -3504,6 +3456,29 @@
name = "Holodeck Projector Floor"
},
/area/station/holodeck/rec_center)
+"bqB" = (
+/obj/effect/landmark/start/assistant,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/neutral/end{
+ dir = 4
+ },
+/obj/merge_conflict_marker{
+ name = "---Merge Conflict Marker---";
+
+ desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
+ },
+/obj/effect/landmark/start/assistant,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/neutral/line,
+/obj/effect/turf_decal/trimline/neutral/line{
+ dir = 1
+ },
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/aft)
"bqD" = (
/mob/living/basic/slime,
/turf/open/floor/engine,
@@ -3533,21 +3508,10 @@
},
/turf/open/space/basic,
/area/space/nearstation)
-"brj" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/airalarm/directional/north,
-/turf/open/floor/iron/dark/small,
-/area/station/service/chapel/storage)
"bro" = (
/obj/structure/frame/machine,
/turf/open/floor/tram,
/area/station/security/tram)
-"brw" = (
-/obj/structure/chair{
- pixel_y = -2
- },
-/turf/open/floor/iron/dark/small,
-/area/station/maintenance/central/lesser)
"bry" = (
/obj/structure/table,
/obj/item/storage/toolbox/mechanical{
@@ -3573,6 +3537,10 @@
/obj/vehicle/ridden/scooter/skateboard/hoverboard,
/turf/open/floor/plating,
/area/station/maintenance/starboard/greater)
+"brB" = (
+/obj/structure/extinguisher_cabinet/directional/west,
+/turf/open/floor/glass,
+/area/station/hallway/primary/central/aft)
"brC" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/atmospherics/pipe/layer_manifold/yellow/visible{
@@ -3656,6 +3624,22 @@
/obj/structure/closet/emcloset,
/turf/open/floor/plating,
/area/station/maintenance/department/medical/central)
+"bsW" = (
+/obj/structure/chair/wood{
+ dir = 4
+ },
+/turf/open/floor/iron/grimy,
+/area/station/service/bar)
+"btE" = (
+/obj/effect/turf_decal/tile/green/opposingcorners,
+/obj/effect/turf_decal/tile/blue/opposingcorners{
+ dir = 8
+ },
+/obj/machinery/hydroponics/constructable,
+/obj/machinery/airalarm/directional/west,
+/obj/machinery/light/small/directional/west,
+/turf/open/floor/iron,
+/area/station/service/hydroponics)
"btG" = (
/obj/structure/rack,
/obj/effect/turf_decal/delivery/white,
@@ -3663,6 +3647,12 @@
/obj/item/airlock_painter/decal,
/turf/open/floor/iron/smooth,
/area/station/cargo/sorting)
+"btI" = (
+/obj/effect/turf_decal/weather/dirt{
+ dir = 4
+ },
+/turf/open/floor/grass,
+/area/station/service/chapel)
"btV" = (
/obj/effect/turf_decal/siding/wideplating,
/obj/structure/railing/corner,
@@ -3671,17 +3661,6 @@
},
/turf/open/floor/wood,
/area/station/engineering/main)
-"btY" = (
-/obj/effect/turf_decal/siding/wood{
- dir = 4
- },
-/obj/machinery/holopad,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/disposalpipe/segment{
- dir = 9
- },
-/turf/open/floor/wood/parquet,
-/area/station/service/library)
"bua" = (
/obj/effect/turf_decal/siding/wood{
dir = 6
@@ -3689,33 +3668,15 @@
/obj/machinery/light/small/directional/south,
/turf/open/floor/wood,
/area/station/service/abandoned_gambling_den)
-"buc" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/chair/stool/bamboo,
-/turf/open/floor/carpet/lone,
-/area/station/service/chapel/office)
-"buf" = (
-/obj/effect/turf_decal/tile/dark_red/half/contrasted{
- dir = 4
- },
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
- dir = 4
- },
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/iron,
-/area/station/security)
-"buv" = (
-/obj/structure/disposalpipe/segment{
+"buk" = (
+/obj/machinery/door/firedoor,
+/obj/effect/turf_decal/siding/wood{
dir = 4
},
-/obj/effect/turf_decal/trimline/neutral/line{
- dir = 1
+/turf/open/floor/iron/textured_half{
+ dir = 8
},
-/obj/effect/turf_decal/trimline/neutral/line,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/fore)
+/area/station/service/library)
"buA" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -3734,17 +3695,6 @@
/obj/machinery/bluespace_vendor/directional/south,
/turf/open/floor/iron,
/area/station/commons/fitness/locker_room)
-"buU" = (
-/obj/structure/table,
-/obj/item/stack/sheet/iron/five,
-/obj/item/stack/cable_coil/five,
-/obj/effect/turf_decal/tile/brown/opposingcorners{
- dir = 1
- },
-/obj/item/radio/intercom/directional/east,
-/obj/machinery/light_switch/directional/south,
-/turf/open/floor/iron,
-/area/station/commons/vacant_room/commissary)
"buV" = (
/obj/effect/turf_decal/tile/green/half/contrasted{
dir = 4
@@ -3781,6 +3731,32 @@
/obj/structure/cable,
/turf/open/floor/wood,
/area/station/command/heads_quarters/qm)
+"bwc" = (
+/obj/effect/turf_decal/siding/thinplating{
+ dir = 8
+ },
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+ dir = 4
+ },
+/obj/machinery/firealarm/directional/west,
+/turf/open/floor/eighties/red,
+/area/station/hallway/primary/central/fore)
+"bww" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/window/reinforced/spawner/directional/east,
+/obj/machinery/atmospherics/components/binary/pump,
+/obj/machinery/button/door/directional/north{
+ id = "Xenolab";
+ name = "Test Chamber Blast Doors";
+ pixel_x = 26;
+ pixel_y = -2;
+ req_access = list("xenobiology")
+ },
+/turf/open/floor/iron/white/side{
+ dir = 8
+ },
+/area/station/science/xenobiology)
"bwz" = (
/obj/effect/spawner/random/entertainment/arcade,
/obj/machinery/light/cold/directional/north,
@@ -3797,25 +3773,6 @@
/obj/machinery/light/small/directional/west,
/turf/open/floor/iron,
/area/station/hallway/secondary/dock)
-"bxk" = (
-/obj/effect/turf_decal/tile/neutral/full,
-/obj/structure/rack,
-/obj/item/weldingtool/mini,
-/obj/item/tank/internals/emergency_oxygen/empty,
-/obj/item/cigarette/rollie,
-/turf/open/floor/iron/dark/smooth_large,
-/area/station/maintenance/central/lesser)
-"bxl" = (
-/obj/effect/turf_decal/weather/snow/corner{
- dir = 1
- },
-/obj/effect/turf_decal/weather/snow,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/cable,
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/iron/freezer,
-/area/station/service/kitchen/coldroom)
"bxs" = (
/obj/structure/railing{
dir = 1
@@ -3838,6 +3795,14 @@
dir = 8
},
/area/station/engineering/main)
+"bxy" = (
+/obj/structure/cable,
+/obj/effect/spawner/random/trash,
+/obj/structure/disposalpipe/segment{
+ dir = 9
+ },
+/turf/open/floor/plating,
+/area/station/maintenance/port/lesser)
"bxI" = (
/obj/structure/cable,
/obj/structure/disposalpipe/sorting/mail/flip{
@@ -3850,6 +3815,12 @@
dir = 6
},
/area/station/science/lower)
+"bxM" = (
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/aft)
"bxT" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/landmark/navigate_destination/dockescpod,
@@ -3859,23 +3830,16 @@
},
/turf/open/floor/plating,
/area/station/maintenance/starboard/central)
+"byo" = (
+/obj/machinery/computer/security/telescreen/prison/directional/south,
+/turf/open/floor/iron/dark,
+/area/station/security/office)
"byq" = (
/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/small,
/area/station/medical/morgue)
-"byv" = (
-/obj/effect/turf_decal/tile/dark_red/half/contrasted{
- dir = 1
- },
-/obj/machinery/camera/autoname/directional/south,
-/obj/machinery/firealarm/directional/south,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/station/security/brig/entrance)
"byx" = (
/obj/structure/cable,
/obj/structure/disposalpipe/segment{
@@ -3891,6 +3855,14 @@
dir = 1
},
/area/station/hallway/secondary/dock)
+"byz" = (
+/obj/effect/turf_decal/siding/wideplating/dark{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/dark_red/half/contrasted,
+/obj/structure/disposalpipe/segment,
+/turf/open/floor/iron,
+/area/station/security/brig/entrance)
"byD" = (
/obj/effect/turf_decal/stripes/asteroid/end,
/turf/open/floor/circuit/green,
@@ -3909,30 +3881,17 @@
/obj/effect/gibspawner,
/turf/open/floor/wood,
/area/station/maintenance/starboard/greater)
-"bzj" = (
-/obj/machinery/rnd/production/techfab/department/service,
-/obj/effect/turf_decal/tile/neutral/opposingcorners{
- dir = 1
- },
-/obj/effect/turf_decal/siding/thinplating_new{
- dir = 4
- },
-/obj/effect/turf_decal/delivery,
-/turf/open/floor/iron/small,
-/area/station/hallway/secondary/service)
-"bzJ" = (
-/obj/structure/table/wood,
-/obj/machinery/barsign{
- chosen_sign = "thecavern";
- icon_state = "thecavern";
- pixel_y = 32
+"byV" = (
+/obj/structure/disposalpipe/segment{
+ dir = 5
},
-/obj/effect/turf_decal/siding/wood{
- dir = 10
+/obj/effect/turf_decal/trimline/neutral/line{
+ dir = 1
},
-/obj/machinery/chem_dispenser/drinks/beer,
-/turf/open/floor/iron/dark/textured,
-/area/station/service/bar)
+/obj/effect/turf_decal/trimline/neutral/line,
+/obj/structure/cable,
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/aft)
"bzZ" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/dark,
@@ -3983,14 +3942,6 @@
/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos,
/turf/open/floor/catwalk_floor,
/area/station/maintenance/disposal/incinerator)
-"bBh" = (
-/obj/effect/turf_decal/weather/dirt{
- dir = 1
- },
-/obj/structure/flora/bush/flowers_br/style_3,
-/obj/machinery/firealarm/directional/north,
-/turf/open/floor/grass,
-/area/station/service/chapel)
"bBk" = (
/obj/effect/turf_decal/tile/dark_red,
/obj/structure/cable,
@@ -4016,22 +3967,6 @@
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/station/engineering/atmospherics_engine)
-"bBN" = (
-/obj/structure/window/spawner/directional/east,
-/obj/structure/table/wood,
-/obj/machinery/cell_charger{
- pixel_y = 5
- },
-/obj/item/stock_parts/power_store/cell/crap{
- pixel_y = 5
- },
-/obj/item/cigarette/pipe/cobpipe{
- pixel_x = 1;
- pixel_y = -2
- },
-/obj/structure/sign/poster/official/random/directional/north,
-/turf/open/floor/wood/tile,
-/area/station/command/corporate_showroom)
"bBX" = (
/obj/effect/spawner/random/maintenance,
/turf/open/floor/plating,
@@ -4042,6 +3977,12 @@
},
/turf/open/floor/iron,
/area/station/security/processing)
+"bCg" = (
+/obj/machinery/vending/dinnerware,
+/obj/machinery/requests_console/auto_name/directional/south,
+/obj/effect/mapping_helpers/requests_console/supplies,
+/turf/open/floor/iron/kitchen/small,
+/area/station/service/kitchen)
"bCh" = (
/obj/effect/turf_decal/stripes{
dir = 4
@@ -4082,6 +4023,12 @@
dir = 1
},
/area/station/hallway/secondary/construction)
+"bCx" = (
+/obj/structure/disposalpipe/segment{
+ dir = 10
+ },
+/turf/open/floor/wood,
+/area/station/service/chapel/office)
"bCG" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -4107,6 +4054,19 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/science/lower)
+"bCU" = (
+/obj/structure/cable,
+/obj/machinery/door/airlock{
+ name = "Maintenance"
+ },
+/obj/effect/mapping_helpers/airlock/access/any/service/maintenance,
+/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/central/lesser)
+"bCW" = (
+/turf/open/floor/carpet,
+/area/station/service/library)
"bCZ" = (
/obj/effect/turf_decal/trimline/yellow/filled/line{
dir = 1
@@ -4164,6 +4124,11 @@
/obj/machinery/firealarm/directional/west,
/turf/open/floor/iron/cafeteria,
/area/station/science/circuits)
+"bDI" = (
+/obj/item/flashlight/lantern/on,
+/obj/effect/turf_decal/siding/wood,
+/turf/open/floor/stone,
+/area/station/service/chapel)
"bDN" = (
/obj/structure/disposalpipe/segment,
/obj/effect/turf_decal/tile/brown/half/contrasted{
@@ -4183,6 +4148,21 @@
/obj/effect/mapping_helpers/broken_floor,
/turf/open/floor/plating,
/area/station/maintenance/starboard/aft)
+"bEn" = (
+/obj/effect/turf_decal/weather/dirt{
+ dir = 5
+ },
+/turf/open/floor/grass,
+/area/station/service/chapel)
+"bEs" = (
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/structure/sign/directions/vault/directional/south{
+ dir = 8
+ },
+/turf/closed/wall,
+/area/station/hallway/primary/central/aft)
"bEw" = (
/obj/structure/sign/directions/supply{
dir = 1;
@@ -4218,13 +4198,6 @@
/obj/effect/spawner/structure/window/reinforced/shuttle,
/turf/open/floor/plating,
/area/station/maintenance/department/engine/atmos)
-"bFd" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/chair/wood{
- dir = 4
- },
-/turf/open/floor/iron/grimy,
-/area/station/service/bar)
"bFh" = (
/obj/structure/rack,
/obj/item/binoculars,
@@ -4249,12 +4222,6 @@
/obj/machinery/telecomms/server/presets/science,
/turf/open/floor/circuit,
/area/station/tcommsat/server)
-"bFO" = (
-/obj/effect/spawner/random/trash,
-/obj/structure/cable,
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/plating,
-/area/station/maintenance/central/greater)
"bFR" = (
/obj/machinery/door/airlock/maintenance{
name = "Maintenance"
@@ -4310,13 +4277,6 @@
},
/turf/open/floor/plating,
/area/station/hallway/secondary/construction)
-"bGq" = (
-/obj/machinery/porta_turret/ai,
-/obj/machinery/computer/security/telescreen/minisat/directional/east,
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/status_display/ai/directional/north,
-/turf/open/floor/iron/smooth,
-/area/station/ai_monitored/turret_protected/aisat_interior)
"bGD" = (
/obj/machinery/door/firedoor,
/obj/effect/turf_decal/stripes/red/line{
@@ -4405,21 +4365,6 @@
/obj/structure/window/spawner/directional/south,
/turf/open/misc/sandy_dirt,
/area/station/science/research)
-"bIJ" = (
-/obj/effect/turf_decal/weather/dirt{
- dir = 4
- },
-/turf/open/floor/grass,
-/area/station/service/chapel)
-"bIN" = (
-/obj/structure/chair/stool/bar/directional/north,
-/obj/effect/turf_decal/siding/wood{
- dir = 1
- },
-/obj/effect/landmark/start/assistant,
-/obj/effect/turf_decal/siding/wood,
-/turf/open/floor/wood,
-/area/station/hallway/primary/central/aft)
"bJn" = (
/obj/machinery/light/small/directional/west,
/obj/effect/decal/cleanable/dirt,
@@ -4432,15 +4377,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron,
/area/station/maintenance/starboard/aft)
-"bJx" = (
-/obj/effect/turf_decal/siding/wood/corner{
- dir = 8
- },
-/obj/effect/turf_decal/siding/wood/corner{
- dir = 4
- },
-/turf/open/floor/stone,
-/area/station/service/chapel)
"bJA" = (
/obj/item/kirbyplants/random,
/obj/structure/disposalpipe/segment{
@@ -4473,14 +4409,6 @@
/obj/machinery/incident_display/tram/directional/north,
/turf/open/floor/iron,
/area/station/maintenance/port/aft)
-"bKd" = (
-/obj/structure/window/spawner/directional/west,
-/obj/structure/flora/bush/jungle/a/style_random,
-/obj/structure/flora/bush/flowers_pp/style_random,
-/obj/structure/window/spawner/directional/east,
-/obj/machinery/light/floor,
-/turf/open/floor/grass,
-/area/station/service/hydroponics)
"bKl" = (
/obj/structure/railing/corner{
dir = 8
@@ -4488,11 +4416,6 @@
/obj/effect/turf_decal/siding/wideplating,
/turf/open/floor/wood,
/area/station/engineering/main)
-"bKv" = (
-/obj/structure/flora/tree/jungle/style_4,
-/obj/effect/turf_decal/weather/dirt,
-/turf/open/floor/grass,
-/area/station/service/chapel)
"bKz" = (
/obj/structure/disposalpipe/junction{
dir = 4
@@ -4503,6 +4426,13 @@
/obj/machinery/light/small/directional/north,
/turf/open/floor/iron/smooth,
/area/station/command/heads_quarters/qm)
+"bKC" = (
+/obj/structure/flora/rock/pile/jungle/style_5{
+ pixel_x = -5;
+ pixel_y = 5
+ },
+/turf/open/floor/grass,
+/area/station/service/chapel)
"bKE" = (
/obj/effect/turf_decal/siding/red{
dir = 1
@@ -4524,10 +4454,6 @@
},
/turf/open/floor/iron/small,
/area/station/security/tram)
-"bKO" = (
-/obj/structure/table/wood,
-/turf/open/floor/wood/large,
-/area/station/service/bar)
"bKU" = (
/obj/item/toy/crayon/spraycan{
pixel_x = -7
@@ -4536,6 +4462,17 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
/area/station/maintenance/starboard/greater)
+"bLa" = (
+/obj/effect/turf_decal/weather/dirt{
+ dir = 10
+ },
+/obj/structure/flora/bush/flowers_pp/style_random,
+/turf/open/floor/grass,
+/area/station/service/chapel)
+"bLi" = (
+/obj/machinery/status_display/evac/directional/east,
+/turf/open/floor/glass,
+/area/station/hallway/primary/central/aft)
"bLu" = (
/obj/structure/cable,
/obj/structure/disposalpipe/segment{
@@ -4564,15 +4501,17 @@
},
/turf/open/floor/iron,
/area/station/engineering/storage/tech)
-"bMV" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
+"bMH" = (
+/obj/machinery/space_heater,
+/obj/merge_conflict_marker{
+ name = "---Merge Conflict Marker---";
+
+ desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
},
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/aft)
+/obj/machinery/space_heater,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plating,
+/area/station/maintenance/central/greater)
"bMW" = (
/obj/machinery/iv_drip,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
@@ -4591,6 +4530,36 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/small,
/area/station/engineering/atmos)
+"bNi" = (
+/obj/structure/table/reinforced,
+/obj/structure/displaycase/forsale/kitchen{
+ pixel_y = 5
+ },
+/obj/machinery/door/firedoor/border_only{
+ dir = 4
+ },
+/obj/machinery/door/poddoor/shutters{
+ name = "Kitchen Shutters";
+ id = "kitchenshutters"
+ },
+/obj/merge_conflict_marker{
+ name = "---Merge Conflict Marker---";
+
+ desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
+ },
+/obj/structure/table/reinforced,
+/obj/structure/displaycase/forsale/kitchen{
+ pixel_y = 5
+ },
+/obj/machinery/door/firedoor/border_only{
+ dir = 4
+ },
+/obj/machinery/door/poddoor/shutters/preopen{
+ id = "kitchenshutters";
+ name = "Kitchen Shutters"
+ },
+/turf/open/floor/plating,
+/area/station/service/kitchen)
"bNl" = (
/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{
cycle_id = "sci-entrance"
@@ -4604,18 +4573,34 @@
"bNq" = (
/turf/closed/wall/r_wall,
/area/station/maintenance/department/engine/atmos)
+"bNs" = (
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/machinery/vending/cigarette,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/turf/open/floor/iron/white/side,
+/area/station/hallway/primary/central/aft)
"bNu" = (
/obj/structure/sign/poster/official/random/directional/north,
/turf/open/floor/iron,
/area/station/hallway/secondary/dock)
-"bNL" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/cable,
-/obj/machinery/light/small/directional/south,
-/obj/machinery/status_display/ai/directional/south,
-/obj/effect/turf_decal/tile/neutral,
-/turf/open/floor/iron,
+"bNE" = (
+/obj/structure/flora/bush/flowers_yw/style_3{
+ pixel_x = 5;
+ pixel_y = -5
+ },
+/obj/structure/flora/bush/flowers_br/style_random{
+ pixel_y = -5;
+ pixel_x = 3
+ },
+/obj/effect/light_emitter/fake_outdoors,
+/obj/effect/turf_decal/siding/wood{
+ dir = 9
+ },
+/turf/open/floor/grass/Airless,
/area/station/hallway/primary/central/aft)
"bNP" = (
/obj/structure/cable,
@@ -4657,11 +4642,24 @@
/obj/machinery/atmospherics/pipe/smart/simple/dark/visible,
/turf/open/floor/engine,
/area/station/maintenance/disposal/incinerator)
-"bOG" = (
+"bOy" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/effect/landmark/start/cook,
-/turf/open/floor/iron/kitchen/small,
-/area/station/service/kitchen)
+/obj/machinery/airalarm/directional/west,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/structure/disposalpipe/segment,
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/fore)
+"bOJ" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 1
+ },
+/obj/structure/chair/wood{
+ dir = 8
+ },
+/turf/open/floor/iron/grimy,
+/area/station/service/bar)
"bON" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -4684,13 +4682,6 @@
},
/turf/open/floor/iron,
/area/station/cargo/miningfoundry)
-"bPv" = (
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/neutral/half/contrasted{
- dir = 1
- },
-/turf/closed/wall,
-/area/station/maintenance/central/greater)
"bPU" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/purple/visible,
/turf/open/floor/iron,
@@ -4706,10 +4697,6 @@
/obj/structure/cable,
/turf/open/floor/iron/small,
/area/station/security/office)
-"bQd" = (
-/obj/structure/flora/grass/jungle/b/style_2,
-/turf/open/misc/dirt/jungle,
-/area/station/service/chapel)
"bQi" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/engine,
@@ -4722,17 +4709,6 @@
/obj/machinery/computer/records/security,
/turf/open/floor/wood/tile,
/area/station/command/bridge)
-"bQy" = (
-/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/dark_red/half/contrasted{
- dir = 8
- },
-/obj/machinery/computer/security/telescreen/isolation/directional/east,
-/obj/machinery/photobooth/security,
-/turf/open/floor/iron,
-/area/station/security/execution/transfer)
"bQQ" = (
/obj/effect/turf_decal/tile/neutral,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -4783,12 +4759,17 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/smooth,
/area/station/security/checkpoint/customs/auxiliary)
-"bRK" = (
-/obj/effect/turf_decal/siding/thinplating_new/light{
- dir = 4
+"bRD" = (
+/obj/machinery/camera/directional/east,
+/obj/machinery/light/small/directional/east,
+/obj/effect/turf_decal/weather/dirt{
+ dir = 6
},
-/turf/open/floor/iron/white/small,
-/area/station/service/hydroponics)
+/obj/effect/turf_decal/weather/dirt{
+ dir = 1
+ },
+/turf/open/floor/grass,
+/area/station/service/chapel)
"bRN" = (
/obj/effect/turf_decal/stripes/white/line{
dir = 1
@@ -4841,16 +4822,17 @@
},
/turf/open/space/basic,
/area/space/nearstation)
-"bTo" = (
-/obj/effect/turf_decal/weather/dirt,
-/obj/effect/turf_decal/weather/dirt{
- dir = 1
+"bTp" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
},
-/obj/structure/flora/bush/flowers_yw,
-/obj/machinery/airalarm/directional/north,
-/obj/machinery/camera/directional/north,
-/turf/open/floor/grass,
-/area/station/service/chapel)
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/aft)
"bTE" = (
/obj/effect/turf_decal/tile/brown/half,
/obj/effect/turf_decal/tile/brown/half{
@@ -4925,22 +4907,25 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/white/small,
/area/station/security/execution/education)
-"bVJ" = (
-/obj/effect/turf_decal/plaque{
- icon_state = "L13";
- pixel_y = -15
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/aft)
"bVO" = (
/obj/structure/chair/stool/directional/north,
/obj/effect/turf_decal/siding/red,
/obj/effect/landmark/start/head_of_security,
/turf/open/floor/iron/small,
/area/station/security/office)
+"bVP" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/turf_decal/plaque{
+ icon_state = "L2";
+ pixel_y = -15
+ },
+/obj/effect/turf_decal/trimline/neutral/line,
+/obj/effect/turf_decal/trimline/neutral/line{
+ dir = 1
+ },
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/aft)
"bVR" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
@@ -4948,6 +4933,11 @@
},
/turf/open/floor/iron,
/area/station/maintenance/starboard/greater)
+"bVW" = (
+/obj/effect/turf_decal/weather/dirt,
+/obj/structure/flora/tree/jungle/style_5,
+/turf/open/floor/grass,
+/area/station/service/chapel)
"bWg" = (
/obj/structure/lattice/catwalk,
/obj/structure/railing{
@@ -5011,13 +5001,6 @@
},
/turf/open/space/basic,
/area/space/nearstation)
-"bWp" = (
-/obj/effect/turf_decal/tile/neutral/opposingcorners,
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/station/holodeck/rec_center)
"bWs" = (
/obj/effect/turf_decal/stripes/line{
dir = 6
@@ -5025,23 +5008,35 @@
/obj/machinery/chem_heater/withbuffer,
/turf/open/floor/iron,
/area/station/science/xenobiology)
+"bWO" = (
+/obj/machinery/disposal/bin,
+/obj/effect/turf_decal/siding/thinplating{
+ dir = 5
+ },
+/obj/structure/disposalpipe/trunk{
+ dir = 8
+ },
+/turf/open/floor/eighties/red,
+/area/station/hallway/primary/central/fore)
"bXb" = (
/obj/effect/turf_decal/sand/plating,
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plating,
/area/station/maintenance/department/electrical)
-"bXi" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/door/airlock/maintenance{
- name = "Crematorium"
+"bXd" = (
+/obj/machinery/vending/hydroseeds{
+ slogan_delay = 700
},
-/obj/machinery/door/firedoor,
-/obj/effect/mapping_helpers/airlock/access/all/security/general,
-/turf/open/floor/iron/textured_half{
+/obj/effect/turf_decal/tile/green/opposingcorners,
+/obj/effect/turf_decal/tile/blue/opposingcorners{
dir = 8
},
-/area/station/security/brig/entrance)
+/obj/effect/turf_decal/delivery/white{
+ color = "#52B4E9"
+ },
+/obj/machinery/camera/autoname/directional/north,
+/turf/open/floor/iron,
+/area/station/service/hydroponics)
"bXu" = (
/obj/item/kirbyplants/random,
/obj/machinery/firealarm/directional/south,
@@ -5062,6 +5057,10 @@
/obj/structure/closet/crate/bin,
/turf/open/floor/iron/white,
/area/station/medical/virology)
+"bXL" = (
+/obj/structure/chair/stool/bar/directional/east,
+/turf/open/floor/wood/large,
+/area/station/service/bar)
"bXO" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -5070,13 +5069,6 @@
},
/turf/open/floor/iron/white/small,
/area/station/medical/storage)
-"bXR" = (
-/obj/effect/turf_decal/siding/wood{
- dir = 4
- },
-/obj/structure/table/wood,
-/turf/open/floor/iron/grimy,
-/area/station/service/bar)
"bYe" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -5095,10 +5087,6 @@
},
/turf/open/floor/plating,
/area/station/construction/mining/aux_base)
-"bYh" = (
-/obj/structure/flora/bush/flowers_yw/style_3,
-/turf/open/floor/grass,
-/area/station/service/chapel)
"bYk" = (
/obj/effect/spawner/random/engineering/tracking_beacon,
/turf/open/floor/iron/white/small,
@@ -5112,11 +5100,17 @@
dir = 1
},
/area/station/engineering/hallway)
-"bYE" = (
+"bYr" = (
+/obj/effect/turf_decal/tile/red/opposingcorners,
+/obj/effect/turf_decal/tile/blue/opposingcorners{
+ dir = 8
+ },
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+ dir = 1
+ },
/obj/structure/cable,
-/obj/item/radio/intercom/directional/east,
-/turf/open/floor/wood/parquet,
-/area/station/service/library)
+/turf/open/floor/iron/smooth,
+/area/station/service/greenroom)
"bYK" = (
/obj/effect/spawner/random/maintenance,
/obj/effect/decal/cleanable/dirt,
@@ -5204,6 +5198,15 @@
},
/turf/open/floor/plating,
/area/station/maintenance/department/engine)
+"bZT" = (
+/obj/structure/disposalpipe/segment{
+ dir = 6
+ },
+/obj/effect/mapping_helpers/broken_floor,
+/obj/effect/spawner/random/trash,
+/obj/structure/cable,
+/turf/open/floor/plating,
+/area/station/maintenance/central/greater)
"cam" = (
/obj/machinery/flasher/directional/east{
id = "AI";
@@ -5225,15 +5228,6 @@
},
/turf/open/floor/plating,
/area/station/engineering/supermatter)
-"caD" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
- dir = 8
- },
-/obj/structure/disposalpipe/segment{
- dir = 5
- },
-/turf/open/floor/wood,
-/area/station/service/chapel/office)
"caI" = (
/obj/structure/cable,
/obj/effect/decal/cleanable/glass,
@@ -5244,14 +5238,12 @@
/obj/item/radio/intercom/directional/south,
/turf/open/floor/iron,
/area/station/commons/fitness/locker_room)
-"caW" = (
-/obj/structure/sign/warning/no_smoking/circle/directional/north,
-/obj/machinery/disposal/bin,
-/obj/structure/disposalpipe/trunk{
- dir = 4
- },
-/turf/open/floor/wood/large,
-/area/station/service/bar)
+"caL" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/power/apc/auto_name/directional/north,
+/turf/open/floor/iron/dark/small,
+/area/station/service/chapel/storage)
"cbg" = (
/obj/structure/table/wood,
/obj/item/storage/fancy/candle_box,
@@ -5290,6 +5282,14 @@
"cbm" = (
/turf/closed/wall/rust,
/area/station/ai_monitored/aisat/exterior)
+"cbq" = (
+/obj/machinery/door/poddoor/preopen{
+ id = "Xenolab";
+ name = "Test Chamber Blast Door"
+ },
+/obj/structure/sign/warning/gas_mask/directional/north,
+/turf/open/floor/catwalk_floor/iron,
+/area/station/science/xenobiology)
"cbt" = (
/obj/structure/cable,
/obj/structure/table/bronze,
@@ -5370,17 +5370,6 @@
},
/turf/open/space/basic,
/area/station/engineering/atmos/space_catwalk)
-"ccv" = (
-/obj/effect/turf_decal/siding/wood/corner{
- dir = 4
- },
-/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,
-/turf/open/floor/stone,
-/area/station/service/bar)
"ccx" = (
/obj/structure/lattice/catwalk,
/obj/structure/railing{
@@ -5424,34 +5413,6 @@
},
/turf/open/floor/plating/rust,
/area/station/engineering/supermatter/room)
-"ccO" = (
-/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible,
-/obj/structure/table,
-/obj/effect/turf_decal/siding/thinplating_new/dark{
- dir = 1
- },
-/obj/effect/turf_decal/siding/thinplating_new/dark,
-/obj/item/radio/intercom/directional/south,
-/obj/item/c_tube{
- pixel_x = 20
- },
-/obj/item/clothing/head/cone{
- pixel_y = 5;
- pixel_x = -6
- },
-/obj/item/clothing/head/cone{
- pixel_y = 7;
- pixel_x = -6
- },
-/obj/item/pipe_dispenser{
- pixel_y = 9;
- pixel_x = 14
- },
-/obj/item/cigarette{
- pixel_y = 2
- },
-/turf/open/floor/iron/small,
-/area/station/engineering/atmos/pumproom)
"cdg" = (
/obj/machinery/light/small/directional/west,
/turf/open/floor/grass,
@@ -5469,14 +5430,21 @@
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/iron/smooth,
/area/station/engineering/main)
-"cdB" = (
-/obj/machinery/camera/directional/south,
-/obj/structure/flora/bush/flowers_pp/style_2,
-/obj/effect/turf_decal/weather/dirt{
- dir = 6
+"cdA" = (
+/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/dark_red/half/contrasted{
+ dir = 4
},
-/turf/open/floor/grass,
-/area/station/service/chapel)
+/obj/effect/turf_decal/siding/wideplating/dark{
+ dir = 8
+ },
+/obj/structure/disposalpipe/junction/flip{
+ dir = 1
+ },
+/turf/open/floor/iron,
+/area/station/security)
"cdW" = (
/obj/structure/cable,
/turf/open/floor/catwalk_floor/iron_smooth,
@@ -5517,13 +5485,17 @@
/turf/open/floor/iron,
/area/station/command/heads_quarters/ce)
"ceS" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/effect/turf_decal/tile/neutral,
-/obj/structure/disposalpipe/segment{
- dir = 4
+/obj/effect/turf_decal/weather/dirt{
+ dir = 1
},
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/fore)
+/obj/structure/flora/bush/flowers_br/style_random,
+/obj/structure/flora/bush/flowers_pp,
+/obj/structure/cable,
+/obj/machinery/power/apc/auto_name/directional/north{
+ low_power_nightshift_lights = 1
+ },
+/turf/open/floor/grass,
+/area/station/service/chapel)
"cfa" = (
/obj/structure/closet/lasertag/red,
/obj/effect/turf_decal/stripes/red/line{
@@ -5556,6 +5528,22 @@
},
/turf/open/floor/iron,
/area/station/hallway/secondary/dock)
+"cfU" = (
+/obj/structure/table,
+/obj/machinery/light/small/directional/west,
+/obj/item/clothing/head/costume/paper_hat{
+ pixel_y = 12;
+ pixel_x = -4
+ },
+/obj/item/clothing/head/collectable/petehat{
+ pixel_x = 5;
+ pixel_y = -5
+ },
+/obj/item/cigarette/cigar/cohiba{
+ pixel_y = 4
+ },
+/turf/open/floor/iron/dark/small,
+/area/station/commons/fitness/locker_room)
"cgh" = (
/obj/structure/lattice/catwalk,
/obj/structure/railing{
@@ -5570,6 +5558,23 @@
},
/turf/open/space/basic,
/area/station/engineering/atmos/space_catwalk)
+"cgk" = (
+/obj/effect/mapping_helpers/airlock/access/all/service/bar,
+/obj/machinery/door/airlock/wood{
+ name = "Bar Backroom"
+ },
+/obj/effect/turf_decal/siding/wood{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/wood{
+ dir = 8
+ },
+/turf/open/floor/stone,
+/area/station/service/bar)
+"cgl" = (
+/obj/structure/table/wood,
+/turf/open/floor/iron/grimy,
+/area/station/service/bar)
"cgt" = (
/obj/effect/turf_decal/sand/plating,
/obj/effect/decal/cleanable/garbage,
@@ -5607,14 +5612,12 @@
"cgM" = (
/turf/open/misc/asteroid,
/area/station/maintenance/starboard/greater)
-"cgV" = (
-/obj/effect/turf_decal/weather/dirt{
- dir = 9
- },
-/obj/structure/flora/bush/flowers_yw/style_3,
-/obj/machinery/firealarm/directional/west,
-/turf/open/floor/grass,
-/area/station/service/chapel)
+"cgY" = (
+/obj/effect/turf_decal/delivery,
+/obj/machinery/door/firedoor,
+/obj/machinery/smartfridge,
+/turf/open/floor/plating,
+/area/station/service/hydroponics)
"cgZ" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -5637,17 +5640,6 @@
/obj/effect/decal/cleanable/greenglow,
/turf/open/floor/plating,
/area/station/engineering/atmospherics_engine)
-"chh" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/effect/turf_decal/tile/dark_red/half/contrasted{
- dir = 4
- },
-/obj/effect/turf_decal/siding/wideplating/dark/corner{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/station/security/brig/entrance)
"chj" = (
/obj/structure/grille,
/turf/closed/wall/mineral/titanium/nodiagonal,
@@ -5674,26 +5666,6 @@
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/iron/smooth,
/area/station/engineering/supermatter/room)
-"chC" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/obj/machinery/light/cold/directional/north,
-/obj/machinery/firealarm/directional/north,
-/obj/machinery/camera/directional/north,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/station/hallway/primary/port)
-"chI" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/turf_decal/siding/thinplating{
- dir = 10
- },
-/turf/open/floor/eighties,
-/area/station/hallway/primary/central/fore)
"chO" = (
/obj/structure/cable,
/obj/effect/decal/cleanable/dirt,
@@ -5711,19 +5683,6 @@
/obj/machinery/light/small/directional/east,
/turf/open/floor/iron,
/area/station/security)
-"cib" = (
-/obj/effect/turf_decal/weather/dirt{
- dir = 1
- },
-/mob/living/basic/deer,
-/obj/structure/flora/bush/flowers_pp/style_random,
-/turf/open/floor/grass,
-/area/station/service/chapel)
-"cik" = (
-/obj/structure/bookcase/random,
-/obj/item/radio/intercom/directional/west,
-/turf/open/floor/wood/parquet,
-/area/station/service/library)
"cip" = (
/obj/structure/cable,
/obj/effect/turf_decal/tile/red/opposingcorners{
@@ -5755,11 +5714,6 @@
/obj/machinery/recharger,
/turf/open/floor/iron/white,
/area/station/science/auxlab/firing_range)
-"ciV" = (
-/obj/structure/cable,
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/iron,
-/area/station/commons/fitness/locker_room)
"ciW" = (
/obj/structure/cable,
/obj/effect/turf_decal/tile/purple/opposingcorners,
@@ -5779,6 +5733,16 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/iron/diagonal,
/area/station/engineering/lobby)
+"cjM" = (
+/obj/machinery/door/airlock/public{
+ name = "Arcade"
+ },
+/obj/effect/turf_decal/siding/thinplating,
+/obj/machinery/door/firedoor,
+/obj/structure/disposalpipe/segment,
+/obj/structure/cable,
+/turf/open/floor/iron/textured_half,
+/area/station/hallway/primary/central/fore)
"cjP" = (
/obj/effect/turf_decal/delivery,
/obj/structure/cable,
@@ -5798,18 +5762,18 @@
/obj/machinery/light/cold/directional/east,
/turf/open/floor/iron,
/area/station/hallway/primary/fore)
-"ckb" = (
-/obj/structure/chair/comfy/beige{
+"cjZ" = (
+/obj/structure/disposalpipe/segment,
+/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/machinery/button/door/directional/north{
- id = "CabinS";
- name = "Bolt Control";
- normaldoorcontrol = 1;
- specialfunctions = 4
+/obj/effect/turf_decal/trimline/neutral/line{
+ dir = 1
},
-/turf/open/floor/carpet/green,
-/area/station/commons/dorms)
+/obj/effect/turf_decal/trimline/neutral/line,
+/obj/structure/cable,
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/fore)
"cks" = (
/obj/structure/hedge,
/obj/effect/turf_decal/tile/yellow{
@@ -5851,16 +5815,6 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/security)
-"ckP" = (
-/obj/effect/turf_decal/trimline/neutral/line,
-/obj/effect/turf_decal/trimline/neutral/line{
- dir = 1
- },
-/obj/structure/disposalpipe/segment{
- dir = 6
- },
-/turf/open/floor/iron,
-/area/station/hallway/primary/port)
"ckV" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -5873,6 +5827,15 @@
},
/turf/open/floor/iron/dark/small,
/area/station/medical/chemistry)
+"ckZ" = (
+/obj/effect/turf_decal/tile/dark_red/half/contrasted{
+ dir = 1
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/open/floor/iron,
+/area/station/security/brig/entrance)
"cla" = (
/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible,
/obj/effect/decal/cleanable/dirt/dust,
@@ -5892,6 +5855,38 @@
/obj/structure/chair/stool/directional/north,
/turf/open/floor/iron/kitchen/small,
/area/station/maintenance/aft)
+"cld" = (
+/obj/structure/table/reinforced,
+/obj/structure/desk_bell{
+ pixel_x = 4;
+ pixel_y = 3
+ },
+/obj/machinery/door/firedoor/border_only{
+ dir = 4
+ },
+/obj/machinery/door/poddoor/shutters{
+ name = "Kitchen Shutters";
+ id = "kitchenshutters"
+ },
+/obj/merge_conflict_marker{
+ name = "---Merge Conflict Marker---";
+
+ desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
+ },
+/obj/structure/table/reinforced,
+/obj/structure/desk_bell{
+ pixel_x = 4;
+ pixel_y = 3
+ },
+/obj/machinery/door/firedoor/border_only{
+ dir = 4
+ },
+/obj/machinery/door/poddoor/shutters/preopen{
+ id = "kitchenshutters";
+ name = "Kitchen Shutters"
+ },
+/turf/open/floor/plating,
+/area/station/service/kitchen)
"clf" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -6003,14 +5998,6 @@
/obj/structure/barricade/wooden/crude,
/turf/open/floor/plating,
/area/station/maintenance/department/medical/central)
-"cmB" = (
-/obj/effect/turf_decal/siding/wood{
- dir = 6
- },
-/obj/machinery/light/floor,
-/obj/structure/table/wood,
-/turf/open/floor/iron/grimy,
-/area/station/service/bar)
"cmD" = (
/obj/structure/cable,
/obj/structure/disposalpipe/segment,
@@ -6059,6 +6046,11 @@
/obj/machinery/atmospherics/pipe/layer_manifold/scrubbers/visible,
/turf/open/space/basic,
/area/station/engineering/atmos/space_catwalk)
+"cnW" = (
+/obj/structure/extinguisher_cabinet/directional/west,
+/obj/effect/turf_decal/tile/neutral,
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/aft)
"cob" = (
/obj/effect/turf_decal/tile/brown/opposingcorners,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
@@ -6078,25 +6070,37 @@
/obj/machinery/light_switch/directional/south,
/turf/open/floor/iron/white/small,
/area/station/medical/cryo)
-"cow" = (
-/turf/closed/wall,
-/area/station/engineering/lobby)
-"coC" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/turf_decal/tile/neutral{
+"cou" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 1
+ },
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 8
},
/obj/structure/disposalpipe/segment{
- dir = 6
+ dir = 4
},
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/fore)
+/turf/open/floor/wood/parquet,
+/area/station/service/library)
+"cow" = (
+/turf/closed/wall,
+/area/station/engineering/lobby)
"coO" = (
/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{
dir = 4
},
/turf/open/floor/wood,
/area/station/engineering/atmos)
+"cpx" = (
+/obj/effect/turf_decal/plaque{
+ icon_state = "L3";
+ pixel_y = -15
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/aft)
"cpA" = (
/obj/structure/cable,
/obj/structure/disposalpipe/segment{
@@ -6138,6 +6142,14 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/plating,
/area/station/maintenance/starboard/greater)
+"cpL" = (
+/obj/effect/turf_decal/siding/wood,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+ dir = 1
+ },
+/obj/effect/landmark/start/bartender,
+/turf/open/floor/stone,
+/area/station/service/bar)
"cpP" = (
/obj/structure/cable,
/obj/structure/disposalpipe/segment{
@@ -6186,23 +6198,19 @@
},
/turf/open/floor/plating,
/area/station/science/ordnance/storage)
-"cqD" = (
-/obj/structure/table/wood,
-/obj/item/holosign_creator/robot_seat/bar{
- pixel_x = 2;
- pixel_y = 9
- },
-/obj/structure/sign/picture_frame/portrait/bar{
- pixel_y = 32
- },
-/obj/item/roulette_wheel_beacon,
-/obj/machinery/light/small/directional/north,
+"cqL" = (
+/obj/structure/cable,
/obj/structure/disposalpipe/segment,
-/obj/effect/turf_decal/siding/wood{
+/obj/machinery/door/firedoor,
+/obj/effect/turf_decal/stripes/red/line,
+/obj/effect/turf_decal/stripes/red/line{
dir = 1
},
-/turf/open/floor/stone,
-/area/station/service/bar/backroom)
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/open/floor/iron/small,
+/area/station/hallway/primary/central/fore)
"cqM" = (
/obj/structure/railing{
dir = 8
@@ -6228,19 +6236,28 @@
},
/turf/open/floor/plating,
/area/station/service/janitor)
-"cri" = (
+"crl" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/machinery/camera/autoname/directional/west,
+/obj/machinery/firealarm/directional/west,
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/fore)
+"crn" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron/kitchen/small,
-/area/station/service/kitchen)
-"crm" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/turf_decal/tile/neutral,
-/obj/structure/disposalpipe/segment{
- dir = 9
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/turf_decal/plaque{
+ icon_state = "L12";
+ pixel_y = -15
+ },
+/obj/effect/turf_decal/trimline/neutral/line,
+/obj/effect/turf_decal/trimline/neutral/line{
+ dir = 1
},
/turf/open/floor/iron,
-/area/station/hallway/primary/port)
+/area/station/hallway/primary/central/aft)
"cro" = (
/obj/structure/cable,
/obj/structure/chair/sofa/corp/left{
@@ -6256,12 +6273,6 @@
/obj/machinery/light/cold/directional/north,
/turf/open/floor/iron,
/area/station/hallway/secondary/dock)
-"crx" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/effect/turf_decal/tile/neutral,
-/obj/item/radio/intercom/directional/east,
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/fore)
"crE" = (
/obj/structure/window/spawner/directional/north,
/turf/open/space/basic,
@@ -6286,16 +6297,6 @@
/obj/structure/tram,
/turf/open/floor/tram,
/area/station/maintenance/port/aft)
-"csv" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/turf_decal/tile/red{
- dir = 4
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/iron/white/corner,
-/area/station/hallway/secondary/exit/departure_lounge)
"csw" = (
/obj/structure/window/reinforced/spawner/directional/south,
/obj/effect/turf_decal/stripes/end,
@@ -6343,11 +6344,6 @@
/obj/machinery/power/apc/auto_name/directional/east,
/turf/open/floor/iron/smooth,
/area/station/ai_monitored/turret_protected/aisat/foyer)
-"csZ" = (
-/obj/structure/cable,
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/plating,
-/area/station/maintenance/central/greater)
"ctb" = (
/obj/effect/turf_decal/siding/yellow{
dir = 6
@@ -6366,37 +6362,14 @@
/obj/machinery/airalarm/directional/west,
/turf/open/floor/iron,
/area/station/security/prison/work)
+"cty" = (
+/obj/machinery/light/floor,
+/obj/structure/flora/bush/flowers_br,
+/turf/open/floor/grass,
+/area/station/hallway/primary/central/fore)
"ctH" = (
/turf/open/floor/iron/herringbone,
/area/station/commons/dorms)
-"ctN" = (
-/obj/structure/closet/secure_closet/freezer/empty,
-/obj/item/food/grown/tomato{
- pixel_y = 2;
- pixel_x = 2
- },
-/obj/item/food/grown/tomato{
- pixel_y = 2;
- pixel_x = 2
- },
-/obj/item/food/grown/eggplant{
- pixel_y = 5;
- pixel_x = 5
- },
-/obj/item/food/grown/eggplant{
- pixel_y = 5;
- pixel_x = 5
- },
-/obj/item/storage/fancy/egg_box,
-/obj/item/storage/fancy/egg_box,
-/obj/item/reagent_containers/condiment/milk,
-/obj/item/reagent_containers/condiment/milk,
-/obj/item/reagent_containers/condiment/soymilk,
-/obj/item/reagent_containers/condiment/soymilk,
-/obj/item/reagent_containers/condiment/flour,
-/obj/item/reagent_containers/condiment/flour,
-/turf/open/floor/iron/kitchen/small,
-/area/station/service/kitchen)
"cua" = (
/obj/effect/spawner/random/maintenance,
/obj/effect/spawner/random/structure/crate,
@@ -6420,6 +6393,10 @@
/obj/machinery/light/cold/directional/north,
/turf/open/floor/iron,
/area/station/security/prison/rec)
+"cuJ" = (
+/obj/structure/flora/bush/flowers_yw/style_3,
+/turf/open/floor/grass,
+/area/station/service/chapel)
"cvk" = (
/obj/effect/spawner/random/structure/crate,
/obj/effect/spawner/random/maintenance,
@@ -6466,18 +6443,6 @@
dir = 1
},
/area/station/cargo/bitrunning/den)
-"cvX" = (
-/obj/structure/sign/poster/official/random/directional/south,
-/obj/effect/turf_decal/siding/wood/corner{
- dir = 1
- },
-/obj/effect/turf_decal/siding/wood{
- dir = 6
- },
-/obj/machinery/airalarm/directional/east,
-/obj/item/kirbyplants/random,
-/turf/open/floor/stone,
-/area/station/service/bar)
"cwb" = (
/obj/effect/turf_decal/stripes/white/end{
dir = 1
@@ -6513,6 +6478,18 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/hallway/secondary/entry)
+"cwV" = (
+/obj/structure/cable,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/machinery/power/apc/auto_name/directional/north,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plating,
+/area/station/maintenance/port/greater)
"cwX" = (
/obj/machinery/door/poddoor/shutters/preopen{
id = "aigas"
@@ -6520,6 +6497,10 @@
/obj/effect/spawner/structure/window/survival_pod,
/turf/open/floor/engine,
/area/station/ai_monitored/turret_protected/ai)
+"cxe" = (
+/obj/structure/flora/bush/jungle/a/style_3,
+/turf/open/floor/grass,
+/area/station/service/chapel)
"cxy" = (
/obj/structure/cable,
/obj/structure/disposalpipe/junction{
@@ -6561,6 +6542,14 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/turret_protected/ai)
+"cyw" = (
+/obj/effect/turf_decal/tile/neutral/half/contrasted{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/dark_red/half/contrasted,
+/obj/structure/disposalpipe/segment,
+/turf/open/floor/iron,
+/area/station/hallway/primary/port)
"cyx" = (
/obj/effect/turf_decal/tile/red/opposingcorners{
dir = 1
@@ -6658,18 +6647,6 @@
},
/turf/open/floor/iron/white/small,
/area/station/medical/surgery/theatre)
-"cAl" = (
-/obj/machinery/camera/autoname/directional/east,
-/obj/effect/turf_decal/siding/wood{
- dir = 8
- },
-/obj/machinery/light/small/directional/east,
-/obj/effect/turf_decal/siding/wood{
- dir = 4
- },
-/obj/item/radio/intercom/directional/east,
-/turf/open/floor/stone,
-/area/station/service/bar)
"cAm" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/box/corners{
@@ -6697,14 +6674,21 @@
},
/turf/open/floor/catwalk_floor/iron_smooth,
/area/station/science/robotics/mechbay)
-"cAZ" = (
-/obj/structure/cable,
-/obj/structure/disposalpipe/segment,
+"cBd" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/wood,
+/obj/machinery/vending/cigarette,
+/turf/open/floor/stone,
+/area/station/service/bar)
+"cBj" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/effect/spawner/random/trash,
-/turf/open/floor/plating,
-/area/station/maintenance/port/greater)
+/obj/effect/turf_decal/siding/wood{
+ dir = 1
+ },
+/turf/open/floor/stone,
+/area/station/service/chapel)
"cBw" = (
/obj/effect/turf_decal/tile/yellow/opposingcorners,
/obj/structure/filingcabinet/chestdrawer,
@@ -6754,21 +6738,17 @@
/turf/open/floor/iron/white,
/area/station/science/cytology)
"cCe" = (
-/obj/structure/bed/maint,
-/obj/effect/spawner/random/trash,
-/turf/open/floor/plating,
-/area/station/maintenance/central/greater)
+/obj/effect/landmark/start/hangover,
+/obj/effect/turf_decal/trimline/neutral/line,
+/obj/effect/turf_decal/trimline/neutral/line{
+ dir = 1
+ },
+/turf/open/floor/iron,
+/area/station/hallway/primary/port)
"cCl" = (
/obj/structure/cable,
/turf/open/floor/plating,
/area/station/maintenance/starboard/greater)
-"cCv" = (
-/obj/item/radio/intercom/directional/south,
-/obj/effect/turf_decal/siding/wideplating_new/terracotta,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/mapping_helpers/broken_floor,
-/turf/open/floor/wood/tile,
-/area/station/maintenance/central/lesser)
"cCx" = (
/obj/structure/chair{
pixel_y = -2
@@ -6887,14 +6867,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron,
/area/station/maintenance/starboard/aft)
-"cEo" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/landmark/start/hangover,
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/aft)
"cEs" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/door/window/brigdoor/right/directional/north{
@@ -6908,6 +6880,11 @@
},
/turf/open/floor/circuit/red,
/area/station/ai_monitored/turret_protected/ai)
+"cEx" = (
+/obj/structure/table/wood,
+/obj/item/cigarette/cigar/cohiba,
+/turf/open/floor/carpet,
+/area/station/commons/dorms)
"cED" = (
/obj/structure/railing/corner,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
@@ -6998,6 +6975,15 @@
},
/turf/open/floor/iron,
/area/station/security)
+"cFi" = (
+/obj/structure/flora/bush/flowers_pp{
+ pixel_y = 3
+ },
+/obj/effect/dummy/lighting_obj,
+/obj/effect/light_emitter/fake_outdoors,
+/obj/effect/turf_decal/siding/wood,
+/turf/open/floor/grass/Airless,
+/area/station/hallway/primary/central/aft)
"cFj" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/alien/weeds,
@@ -7048,6 +7034,17 @@
"cGj" = (
/turf/closed/wall/r_wall,
/area/station/security/execution/education)
+"cGu" = (
+/obj/structure/cable,
+/obj/effect/turf_decal/trimline/neutral/line,
+/obj/effect/turf_decal/trimline/neutral/line{
+ dir = 1
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 10
+ },
+/turf/open/floor/iron,
+/area/station/hallway/primary/port)
"cGI" = (
/obj/machinery/firealarm/directional/south,
/obj/structure/closet/secure_closet/medical3,
@@ -7056,6 +7053,15 @@
/obj/item/clothing/mask/surgical,
/turf/open/floor/iron/small,
/area/station/medical/storage)
+"cHe" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/disposalpipe/segment{
+ dir = 9
+ },
+/turf/open/floor/plating,
+/area/station/maintenance/central/greater)
"cHp" = (
/obj/effect/turf_decal/siding/dark_red/corner{
dir = 4
@@ -7120,19 +7126,24 @@
/obj/machinery/light/small/directional/east,
/turf/open/floor/iron/dark/herringbone,
/area/station/ai_monitored/command/nuke_storage)
+"cId" = (
+/obj/effect/turf_decal/tile/dark_red/half/contrasted{
+ dir = 1
+ },
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+ dir = 1
+ },
+/obj/machinery/light/cold/directional/south,
+/obj/machinery/airalarm/directional/south,
+/obj/structure/disposalpipe/segment{
+ dir = 9
+ },
+/turf/open/floor/iron,
+/area/station/security/brig/entrance)
"cIU" = (
/mob/living/carbon/human/species/monkey,
/turf/open/floor/grass,
/area/station/medical/virology)
-"cIX" = (
-/obj/effect/turf_decal/siding/wood{
- dir = 1
- },
-/obj/structure/chair/wood{
- dir = 8
- },
-/turf/open/floor/iron/grimy,
-/area/station/service/bar)
"cJb" = (
/obj/structure/lattice/catwalk,
/obj/structure/railing{
@@ -7140,22 +7151,13 @@
},
/turf/open/space/basic,
/area/station/engineering/atmos/space_catwalk)
-"cJv" = (
-/obj/effect/mapping_helpers/airlock/access/any/service/hydroponics,
-/obj/machinery/door/airlock/hydroponics/glass{
- name = "Hydroponics"
- },
-/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/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/iron/textured_half{
+"cJg" = (
+/obj/effect/turf_decal/weather/dirt{
dir = 8
},
-/area/station/service/hydroponics)
+/obj/structure/flora/bush/sparsegrass,
+/turf/open/floor/grass,
+/area/station/service/chapel)
"cJz" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -7164,6 +7166,20 @@
/obj/machinery/light/small/directional/north,
/turf/open/floor/iron,
/area/station/security/execution/transfer)
+"cJA" = (
+/obj/structure/disposalpipe/segment{
+ dir = 6
+ },
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/neutral/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/neutral/line,
+/obj/structure/cable,
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/fore)
"cJL" = (
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 4
@@ -7200,6 +7216,15 @@
/obj/item/clothing/head/utility/welding,
/turf/open/floor/iron/smooth,
/area/station/commons/storage/tools)
+"cJV" = (
+/obj/effect/turf_decal/tile/neutral/opposingcorners{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/thinplating_new{
+ dir = 4
+ },
+/turf/open/floor/iron/small,
+/area/station/hallway/secondary/service)
"cKa" = (
/turf/open/floor/iron/dark/side{
dir = 4
@@ -7216,13 +7241,6 @@
"cKk" = (
/turf/closed/mineral/random/stationside,
/area/station/ai_monitored/turret_protected/aisat/maint)
-"cKt" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/structure/cable,
-/turf/open/floor/plating,
-/area/station/maintenance/central/greater)
"cKv" = (
/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{
dir = 4
@@ -7235,6 +7253,23 @@
dir = 8
},
/area/station/engineering/supermatter/room)
+"cKI" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/table,
+/obj/merge_conflict_marker{
+ name = "---Merge Conflict Marker---";
+
+ desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
+ },
+/obj/item/book/manual/chef_recipes,
+/obj/item/stack/package_wrap{
+ pixel_y = 2
+ },
+/obj/item/holosign_creator/robot_seat/restaurant,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/table,
+/turf/open/floor/iron/kitchen/small,
+/area/station/service/kitchen)
"cKL" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
dir = 8
@@ -7255,15 +7290,6 @@
/obj/structure/marker_beacon/indigo,
/turf/open/space/basic,
/area/space/nearstation)
-"cLy" = (
-/obj/effect/spawner/random/trash,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/plating,
-/area/station/maintenance/central/greater)
"cLD" = (
/obj/structure/window/spawner/directional/north,
/obj/effect/turf_decal/siding/thinplating_new/dark{
@@ -7280,12 +7306,9 @@
},
/turf/open/floor/wood,
/area/station/service/abandoned_gambling_den)
-"cLL" = (
-/obj/structure/flora/rock/pile/jungle/style_5{
- pixel_x = -5;
- pixel_y = 5
- },
-/turf/open/floor/grass,
+"cLK" = (
+/obj/structure/flora/grass/jungle/b/style_2,
+/turf/open/misc/dirt/jungle,
/area/station/service/chapel)
"cLS" = (
/obj/effect/turf_decal/siding/white{
@@ -7321,19 +7344,6 @@
/obj/structure/lattice,
/turf/open/space/basic,
/area/space/nearstation)
-"cME" = (
-/obj/structure/extinguisher_cabinet/directional/north,
-/obj/machinery/camera/autoname/directional/north,
-/obj/machinery/button/door/directional/east{
- id = "kitchenshutters";
- name = "Kitchen Shutter Control"
- },
-/obj/machinery/disposal/bin,
-/obj/structure/disposalpipe/trunk{
- dir = 8
- },
-/turf/open/floor/iron/kitchen/small,
-/area/station/service/kitchen)
"cMS" = (
/obj/structure/cable,
/obj/structure/chair/stool/directional/north,
@@ -7362,6 +7372,31 @@
/obj/structure/cable,
/turf/open/floor/plating,
/area/station/engineering/engine_smes)
+"cNg" = (
+/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/wood{
+ name = "Bar Backroom"
+ },
+/obj/effect/mapping_helpers/airlock/access/all/service/bar,
+/obj/merge_conflict_marker{
+ name = "---Merge Conflict Marker---";
+
+ desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
+ },
+/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/wood{
+ name = "Bar Backroom"
+ },
+/obj/effect/mapping_helpers/airlock/access/all/service/bar,
+/obj/machinery/door/firedoor,
+/turf/open/floor/iron/textured_half{
+ dir = 8
+ },
+/area/station/service/bar)
"cNk" = (
/obj/structure/sign/departments/restroom/directional/south,
/obj/machinery/camera/autoname/directional/east,
@@ -7433,16 +7468,14 @@
/obj/effect/turf_decal/siding/blue/corner,
/turf/open/floor/iron/white/small,
/area/station/medical/storage)
-"cPj" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/effect/turf_decal/tile/neutral,
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
- dir = 1
+"cPm" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
},
+/obj/machinery/firealarm/directional/west,
/turf/open/floor/iron,
-/area/station/hallway/primary/central/aft)
+/area/station/hallway/primary/central/fore)
"cPp" = (
/obj/structure/urinal/directional/east,
/turf/open/floor/iron/white/small,
@@ -7495,32 +7528,10 @@
/obj/machinery/light/small/dim/directional/west,
/turf/open/floor/iron/dark/small,
/area/station/maintenance/aft)
-"cQG" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/obj/structure/sign/departments/holy/directional/west,
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/fore)
-"cQI" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/item/radio/intercom/directional/south,
-/obj/effect/turf_decal/tile/neutral,
-/obj/structure/disposalpipe/segment{
- dir = 5
- },
-/turf/open/floor/iron,
-/area/station/hallway/primary/port)
-"cQN" = (
-/obj/effect/turf_decal/siding/wood{
- dir = 5
- },
-/obj/structure/table/wood,
-/obj/effect/landmark/start/hangover,
-/turf/open/floor/iron/grimy,
-/area/station/service/bar)
+"cQx" = (
+/obj/effect/turf_decal/siding/wood,
+/turf/open/floor/stone,
+/area/station/service/chapel)
"cQP" = (
/obj/structure/cable,
/obj/structure/disposalpipe/segment{
@@ -7532,14 +7543,6 @@
},
/turf/open/floor/plating,
/area/station/ai_monitored/turret_protected/aisat/maint)
-"cRc" = (
-/obj/structure/disposalpipe/segment,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/effect/turf_decal/tile/neutral,
-/obj/structure/sign/departments/court/directional/east,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/fore)
"cRm" = (
/obj/effect/spawner/random/structure/closet_maintenance,
/obj/effect/spawner/random/maintenance,
@@ -7594,15 +7597,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/dark/textured,
/area/station/ai_monitored/turret_protected/ai)
-"cRL" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/obj/machinery/firealarm/directional/west,
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/fore)
"cRS" = (
/obj/structure/table,
/obj/item/vending_refill/hydroseeds,
@@ -7614,13 +7608,6 @@
},
/turf/open/floor/tram,
/area/station/security/tram)
-"cSb" = (
-/obj/effect/turf_decal/weather/dirt{
- dir = 10
- },
-/obj/structure/flora/bush/sparsegrass,
-/turf/open/floor/grass,
-/area/station/service/chapel)
"cSk" = (
/obj/effect/turf_decal/tile/neutral/fourcorners,
/obj/structure/closet/l3closet,
@@ -7668,15 +7655,6 @@
},
/turf/open/floor/iron,
/area/station/engineering/atmospherics_engine)
-"cTn" = (
-/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{
- dir = 9
- },
-/turf/open/floor/plating,
-/area/station/maintenance/central/greater)
"cTp" = (
/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{
dir = 4
@@ -7712,6 +7690,15 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/aft)
+"cTL" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/structure/sign/departments/holy/directional/west,
+/obj/structure/disposalpipe/segment,
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/fore)
"cTS" = (
/obj/structure/cable,
/turf/open/floor/iron/smooth,
@@ -7733,26 +7720,6 @@
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/iron/dark/small,
/area/station/engineering/supermatter/room)
-"cUf" = (
-/obj/structure/sign/directions/engineering{
- dir = 1;
- pixel_y = 8
- },
-/obj/structure/sign/directions/command{
- dir = 1
- },
-/obj/structure/sign/directions/supply{
- dir = 1;
- pixel_y = -8
- },
-/turf/closed/wall,
-/area/station/service/library)
-"cUB" = (
-/obj/effect/turf_decal/tile/neutral/opposingcorners,
-/obj/structure/chair/stool/bar/directional/south,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron,
-/area/station/holodeck/rec_center)
"cUH" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
dir = 1
@@ -7834,6 +7801,17 @@
dir = 1
},
/area/station/science/lower)
+"cVR" = (
+/obj/effect/turf_decal/delivery,
+/obj/effect/turf_decal/stripes/end{
+ dir = 1
+ },
+/obj/structure/window/reinforced/spawner/directional/east,
+/obj/effect/turf_decal/siding/thinplating_new{
+ dir = 4
+ },
+/turf/open/floor/iron/small,
+/area/station/hallway/secondary/service)
"cVS" = (
/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible,
/obj/effect/decal/cleanable/dirt/dust,
@@ -7855,30 +7833,6 @@
dir = 4
},
/area/station/maintenance/fore/lesser)
-"cWB" = (
-/obj/structure/table/wood,
-/obj/item/reagent_containers/cup/rag{
- pixel_x = -6;
- pixel_y = 6
- },
-/obj/item/reagent_containers/cup/glass/drinkingglass{
- pixel_x = 10;
- pixel_y = 8
- },
-/obj/item/reagent_containers/cup/glass/drinkingglass{
- pixel_x = 5;
- pixel_y = 16
- },
-/obj/item/reagent_containers/cup/glass/drinkingglass{
- pixel_x = 5;
- pixel_y = 5
- },
-/obj/item/reagent_containers/cup/glass/shaker{
- pixel_x = -7;
- pixel_y = 15
- },
-/turf/open/floor/iron/dark/textured,
-/area/station/service/bar)
"cWM" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -7893,6 +7847,18 @@
dir = 1
},
/area/station/hallway/primary/aft)
+"cWN" = (
+/obj/effect/turf_decal/weather/dirt{
+ dir = 9
+ },
+/turf/open/floor/grass,
+/area/station/service/chapel)
+"cWO" = (
+/obj/effect/turf_decal/weather/dirt{
+ dir = 10
+ },
+/turf/open/floor/grass,
+/area/station/service/chapel)
"cWQ" = (
/obj/structure/barricade/wooden,
/turf/open/floor/iron,
@@ -7908,17 +7874,6 @@
dir = 1
},
/area/station/hallway/secondary/entry)
-"cXb" = (
-/obj/machinery/light/small/directional/north,
-/turf/open/misc/dirt/jungle,
-/area/station/service/chapel)
-"cXh" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/structure/cable,
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/fore)
"cXu" = (
/obj/effect/landmark/atmospheric_sanity/ignore_area,
/turf/open/floor/plating,
@@ -7933,10 +7888,6 @@
},
/turf/open/floor/iron/kitchen/small,
/area/station/security/breakroom)
-"cXH" = (
-/obj/effect/landmark/start/cook,
-/turf/open/floor/iron/kitchen/small,
-/area/station/service/kitchen)
"cXJ" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/effect/turf_decal/siding/wood{
@@ -7944,6 +7895,18 @@
},
/turf/open/floor/iron/small,
/area/station/security/prison/shower)
+"cXN" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/structure/disposalpipe/segment,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/open/floor/iron,
+/area/station/hallway/primary/port)
"cYc" = (
/obj/effect/spawner/random/structure/crate,
/obj/machinery/light/small/directional/east,
@@ -7959,16 +7922,6 @@
/obj/structure/sign/departments/telecomms/directional/south,
/turf/open/floor/iron,
/area/station/hallway/secondary/dock)
-"cYp" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/effect/turf_decal/tile/neutral/opposingcorners,
-/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,
-/area/station/holodeck/rec_center)
"cYt" = (
/obj/structure/cable,
/turf/open/floor/plating,
@@ -8008,13 +7961,6 @@
},
/turf/open/floor/iron/dark/small,
/area/station/maintenance/department/engine)
-"cYS" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
- dir = 1
- },
-/obj/effect/landmark/event_spawn,
-/turf/open/floor/iron/smooth,
-/area/station/cargo/drone_bay)
"cYT" = (
/obj/structure/hedge,
/obj/structure/sign/poster/contraband/random/directional/east,
@@ -8029,25 +7975,6 @@
/obj/effect/spawner/random/structure/steam_vent,
/turf/open/floor/plating,
/area/station/ai_monitored/turret_protected/aisat/maint)
-"cYY" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
-/obj/structure/disposalpipe/junction/flip{
- dir = 4
- },
-/turf/open/floor/iron/dark/side{
- dir = 1
- },
-/area/station/hallway/primary/central/fore)
-"cZi" = (
-/obj/structure/extinguisher_cabinet/directional/south,
-/obj/machinery/camera/autoname/directional/south,
-/obj/item/kirbyplants/random,
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/fore)
"cZk" = (
/obj/structure/chair{
dir = 1
@@ -8107,6 +8034,9 @@
},
/turf/open/floor/iron/white/small,
/area/station/service/janitor)
+"dac" = (
+/turf/open/floor/iron/kitchen/small,
+/area/station/service/kitchen)
"dah" = (
/obj/structure/disposalpipe/segment,
/obj/effect/turf_decal/tile/dark_red/half/contrasted{
@@ -8189,6 +8119,13 @@
"dbF" = (
/turf/open/floor/plating/rust,
/area/station/ai_monitored/turret_protected/aisat/maint)
+"dbI" = (
+/obj/machinery/oven/range,
+/obj/machinery/airalarm/directional/north,
+/obj/machinery/power/apc/auto_name/directional/west,
+/obj/structure/cable,
+/turf/open/floor/iron/kitchen/small,
+/area/station/service/kitchen)
"dbN" = (
/obj/effect/turf_decal/stripes/line{
dir = 6
@@ -8202,19 +8139,6 @@
/obj/structure/cable,
/turf/open/floor/iron/smooth,
/area/station/engineering/supermatter/room)
-"dbY" = (
-/obj/structure/railing,
-/turf/open/space/basic,
-/area/space)
-"dbZ" = (
-/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 = 1
- },
-/obj/effect/turf_decal/siding/wood/corner,
-/turf/open/floor/stone,
-/area/station/service/chapel)
"dcc" = (
/obj/item/kirbyplants/random/fullysynthetic,
/obj/machinery/holopad,
@@ -8234,23 +8158,6 @@
/obj/item/clothing/suit/hooded/wintercoat/science,
/turf/open/floor/iron/dark/small,
/area/station/science/xenobiology)
-"dcD" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/door/firedoor,
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/obj/effect/turf_decal/stripes/red/line{
- dir = 4
- },
-/obj/effect/turf_decal/stripes/red/line{
- dir = 8
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/iron/small,
-/area/station/hallway/primary/port)
"dcH" = (
/obj/structure/cable,
/obj/structure/disposalpipe/junction{
@@ -8301,27 +8208,11 @@
/obj/effect/spawner/structure/window,
/turf/open/floor/plating,
/area/station/maintenance/department/engine)
-"ddB" = (
-/obj/structure/closet/secure_closet/personal,
-/obj/effect/turf_decal/tile/brown/opposingcorners{
- dir = 1
- },
-/turf/open/floor/iron,
-/area/station/commons/vacant_room/commissary)
"ddE" = (
/obj/structure/cable,
/obj/structure/chair/stool/directional/west,
/turf/open/floor/carpet/red,
/area/station/command/heads_quarters/hos)
-"ddG" = (
-/obj/structure/disposalpipe/segment,
-/obj/machinery/door/firedoor,
-/obj/effect/turf_decal/stripes/red/line,
-/obj/effect/turf_decal/stripes/red/line{
- dir = 1
- },
-/turf/open/floor/iron/small,
-/area/station/hallway/primary/central/fore)
"ddK" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -8366,23 +8257,6 @@
},
/turf/open/floor/catwalk_floor/iron,
/area/station/science/xenobiology)
-"deR" = (
-/obj/machinery/camera/autoname/directional/west,
-/obj/machinery/status_display/evac/directional/west,
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/aft)
-"deS" = (
-/obj/structure/table/wood,
-/obj/machinery/light/small/directional/south,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/siding/wideplating_new/terracotta{
- dir = 10
- },
-/turf/open/floor/wood/tile,
-/area/station/maintenance/central/lesser)
"dfb" = (
/obj/structure/cable,
/obj/structure/table/glass,
@@ -8390,20 +8264,12 @@
/obj/machinery/power/apc/auto_name/directional/north,
/turf/open/floor/iron/white/small,
/area/station/medical/psychology)
-"dfc" = (
-/obj/effect/turf_decal/siding/wood{
- dir = 10
- },
-/obj/machinery/restaurant_portal/restaurant,
-/turf/open/floor/stone,
-/area/station/service/bar)
-"dff" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/airalarm/directional/east,
-/obj/effect/turf_decal/tile/neutral,
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/fore)
+"dfn" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/cobweb/cobweb2,
+/obj/machinery/light/small/directional/east,
+/turf/open/floor/engine/xenobio,
+/area/station/science/xenobiology)
"dfo" = (
/obj/structure/cable,
/obj/machinery/status_display/ai/directional/north,
@@ -8475,16 +8341,12 @@
},
/turf/open/floor/circuit/red,
/area/station/ai_monitored/turret_protected/ai)
-"dhu" = (
-/obj/effect/turf_decal/weather/dirt{
- dir = 10
- },
-/obj/structure/flora/bush/sparsegrass{
- pixel_x = -5;
- pixel_y = 9
+"dht" = (
+/obj/structure/chair{
+ pixel_y = -2
},
-/turf/open/floor/grass,
-/area/station/service/chapel)
+/turf/open/floor/iron/dark/small,
+/area/station/maintenance/central/lesser)
"dhy" = (
/obj/structure/cable,
/obj/structure/disposalpipe/trunk{
@@ -8520,15 +8382,10 @@
/obj/structure/cable,
/turf/open/floor/plating,
/area/station/maintenance/department/engine)
-"dib" = (
-/obj/effect/turf_decal/siding/thinplating{
- dir = 1
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/eighties/red,
-/area/station/hallway/primary/central/fore)
+"dig" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/wood/tile,
+/area/station/maintenance/central/lesser)
"dim" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -8540,6 +8397,10 @@
},
/turf/open/floor/iron/dark,
/area/station/medical/pharmacy)
+"dir" = (
+/obj/structure/dresser,
+/turf/open/floor/wood,
+/area/station/cargo/boutique)
"dis" = (
/obj/structure/cable,
/obj/structure/disposalpipe/segment{
@@ -8565,22 +8426,6 @@
/obj/machinery/door/firedoor,
/turf/open/floor/iron/textured_half,
/area/station/commons/fitness/locker_room)
-"diG" = (
-/obj/effect/turf_decal/tile/neutral/opposingcorners,
-/obj/machinery/light/small/directional/east,
-/obj/structure/chair/stool/bar/directional/south,
-/obj/effect/landmark/start/hangover,
-/turf/open/floor/iron,
-/area/station/holodeck/rec_center)
-"diI" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/turf_decal/tile/neutral,
-/obj/machinery/camera/autoname/directional/south,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/station/hallway/primary/port)
"diK" = (
/obj/effect/turf_decal/tile/red/opposingcorners,
/obj/effect/turf_decal/tile/blue/opposingcorners{
@@ -8602,9 +8447,6 @@
/obj/machinery/atmospherics/pipe/smart/simple/brown/visible,
/turf/open/space/basic,
/area/station/engineering/atmos/space_catwalk)
-"diP" = (
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/aft)
"diS" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -8617,16 +8459,6 @@
/obj/machinery/light/floor,
/turf/open/floor/iron/smooth,
/area/station/hallway/secondary/command)
-"djf" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/landmark/start/hangover,
-/obj/effect/turf_decal/trimline/neutral/line,
-/obj/effect/turf_decal/trimline/neutral/line{
- dir = 1
- },
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/aft)
"djg" = (
/obj/structure/bed{
dir = 4
@@ -8692,6 +8524,19 @@
/obj/effect/spawner/random/structure/crate,
/turf/open/floor/plating,
/area/station/hallway/secondary/construction)
+"dkU" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/cable,
+/obj/structure/extinguisher_cabinet/directional/west,
+/obj/effect/turf_decal/tile/neutral/opposingcorners{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/thinplating_new{
+ dir = 8
+ },
+/turf/open/floor/iron/small,
+/area/station/hallway/secondary/service)
"dlk" = (
/obj/machinery/atmospherics/pipe/bridge_pipe/yellow/visible,
/obj/machinery/atmospherics/pipe/bridge_pipe/scrubbers/visible{
@@ -8785,6 +8630,16 @@
dir = 1
},
/area/station/security/prison/safe)
+"dnf" = (
+/obj/effect/turf_decal/tile/green/opposingcorners,
+/obj/effect/turf_decal/tile/blue/opposingcorners{
+ dir = 8
+ },
+/obj/machinery/camera/autoname/directional/west,
+/obj/machinery/hydroponics/constructable,
+/obj/item/radio/intercom/directional/west,
+/turf/open/floor/iron,
+/area/station/service/hydroponics)
"dng" = (
/obj/effect/turf_decal/siding/wood{
dir = 10
@@ -8796,6 +8651,23 @@
/obj/machinery/light_switch/directional/south,
/turf/open/floor/stone,
/area/station/service/abandoned_gambling_den)
+"dnw" = (
+/obj/structure/table/wood,
+/obj/item/holosign_creator/robot_seat/bar{
+ pixel_x = 2;
+ pixel_y = 9
+ },
+/obj/structure/sign/picture_frame/portrait/bar{
+ pixel_y = 32
+ },
+/obj/item/roulette_wheel_beacon,
+/obj/machinery/light/small/directional/north,
+/obj/structure/disposalpipe/segment,
+/obj/effect/turf_decal/siding/wood{
+ dir = 1
+ },
+/turf/open/floor/stone,
+/area/station/service/bar/backroom)
"dnK" = (
/obj/item/kirbyplants/random,
/obj/item/storage/briefcase{
@@ -8981,12 +8853,10 @@
/obj/effect/decal/cleanable/cobweb/cobweb2,
/turf/open/floor/iron/showroomfloor,
/area/station/medical/virology)
-"drC" = (
-/obj/machinery/vending/cola,
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
-/obj/machinery/light/small/directional/south,
+"drz" = (
+/obj/structure/closet/firecloset,
+/obj/effect/turf_decal/tile/blue,
+/obj/item/radio/intercom/directional/south,
/turf/open/floor/iron/dark/side,
/area/station/hallway/primary/central/fore)
"drF" = (
@@ -9038,11 +8908,6 @@
/obj/effect/spawner/random/maintenance,
/turf/open/floor/plating,
/area/station/maintenance/department/engine/atmos)
-"dsl" = (
-/obj/item/kirbyplants/random,
-/obj/effect/turf_decal/siding/wood/corner,
-/turf/open/floor/wood/parquet,
-/area/station/service/library)
"dsp" = (
/obj/effect/turf_decal/sand/plating,
/obj/structure/rack,
@@ -9066,29 +8931,26 @@
},
/turf/open/floor/iron/small,
/area/station/medical/morgue)
+"dsw" = (
+/obj/effect/turf_decal/trimline/neutral/line,
+/obj/effect/turf_decal/trimline/neutral/line{
+ dir = 1
+ },
+/obj/structure/disposalpipe/segment,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/open/floor/iron,
+/area/station/hallway/primary/port)
"dsE" = (
/obj/structure/table/reinforced/titaniumglass,
/obj/item/screwdriver,
/turf/open/floor/plating,
/area/station/maintenance/department/engine)
-"dsK" = (
-/obj/effect/turf_decal/tile/red/opposingcorners,
-/obj/effect/turf_decal/tile/blue/opposingcorners{
- dir = 8
- },
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/iron/smooth,
-/area/station/service/greenroom)
"dsN" = (
/obj/effect/spawner/structure/window,
/turf/open/floor/plating,
/area/station/security/lockers)
-"dsP" = (
-/obj/effect/turf_decal/siding/wood{
- dir = 6
- },
-/turf/open/floor/stone,
-/area/station/service/bar/backroom)
"dsU" = (
/obj/effect/turf_decal/stripes/white/line{
dir = 6
@@ -9137,16 +8999,6 @@
/obj/structure/cable,
/turf/open/floor/iron/dark,
/area/station/science/genetics)
-"dtO" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/effect/turf_decal/trimline/neutral/line{
- dir = 1
- },
-/obj/effect/turf_decal/trimline/neutral/line,
-/obj/structure/disposalpipe/segment,
-/obj/structure/cable,
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/fore)
"dua" = (
/obj/machinery/atmospherics/pipe/smart/simple/green/visible{
dir = 4
@@ -9177,18 +9029,12 @@
/obj/machinery/light/small/directional/south,
/turf/open/floor/iron,
/area/station/security/checkpoint/escape)
-"duE" = (
-/obj/effect/landmark/start/assistant,
-/obj/effect/turf_decal/trimline/neutral/line{
- dir = 1
- },
-/obj/effect/turf_decal/trimline/neutral/line,
-/obj/structure/cable,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/aft)
+"duv" = (
+/obj/effect/turf_decal/siding/wood,
+/obj/structure/barricade/wooden/crude,
+/obj/structure/disposalpipe/segment,
+/turf/open/floor/plating,
+/area/station/cargo/boutique)
"duI" = (
/obj/machinery/atmospherics/pipe/smart/simple/green/hidden{
dir = 10
@@ -9245,6 +9091,42 @@
},
/turf/open/floor/iron/small,
/area/station/engineering/supermatter/room)
+"dvV" = (
+/obj/item/holosign_creator/robot_seat/restaurant,
+/obj/item/book/manual/chef_recipes,
+/obj/item/stack/package_wrap{
+ pixel_y = 2
+ },
+/obj/item/reagent_containers/condiment/enzyme{
+ pixel_x = -7;
+ pixel_y = 6
+ },
+/obj/item/reagent_containers/condiment/saltshaker{
+ pixel_x = -3
+ },
+/obj/item/reagent_containers/condiment/peppermill{
+ pixel_x = 3
+ },
+/obj/machinery/light_switch/directional/north,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/structure/table,
+/obj/merge_conflict_marker{
+ name = "---Merge Conflict Marker---";
+
+ desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
+ },
+/obj/machinery/microwave{
+ pixel_y = 5
+ },
+/obj/machinery/light_switch/directional/north,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/structure/table,
+/turf/open/floor/iron/kitchen/small,
+/area/station/service/kitchen)
"dvY" = (
/obj/effect/turf_decal/siding/wood{
dir = 10
@@ -9270,6 +9152,21 @@
},
/turf/open/misc/sandy_dirt,
/area/station/security/tram)
+"dwB" = (
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/merge_conflict_marker{
+ name = "---Merge Conflict Marker---";
+
+ desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
+ },
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/cable,
+/turf/open/floor/plating,
+/area/station/maintenance/central/greater)
"dwC" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -9353,13 +9250,6 @@
/obj/item/stack/rods/fifty,
/turf/open/floor/plating,
/area/station/construction/mining/aux_base)
-"dxV" = (
-/obj/effect/turf_decal/siding/wood,
-/obj/effect/turf_decal/siding/wood{
- dir = 4
- },
-/turf/open/floor/stone,
-/area/station/service/bar)
"dxZ" = (
/obj/structure/cable,
/obj/structure/disposalpipe/segment,
@@ -9487,14 +9377,6 @@
/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/iron,
/area/station/hallway/primary/fore)
-"dAC" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/machinery/door/poddoor/shutters{
- id = "meow";
- name = "Commissary"
- },
-/turf/open/floor/plating,
-/area/station/commons/vacant_room/commissary)
"dAF" = (
/obj/effect/turf_decal/siding/thinplating_new{
dir = 4
@@ -9531,6 +9413,19 @@
/obj/structure/cable,
/turf/open/floor/iron/smooth,
/area/station/security/evidence)
+"dAS" = (
+/obj/effect/turf_decal/weather/dirt{
+ dir = 6
+ },
+/obj/structure/flora/grass/jungle,
+/turf/open/floor/grass,
+/area/station/service/chapel)
+"dBa" = (
+/obj/structure/disposalpipe/segment{
+ dir = 10
+ },
+/turf/open/floor/iron/white,
+/area/station/medical/medbay/lobby)
"dBh" = (
/obj/effect/turf_decal/siding/wood{
dir = 6
@@ -9569,6 +9464,16 @@
/obj/machinery/duct,
/turf/open/floor/plating,
/area/station/maintenance/department/medical/central)
+"dBB" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/machinery/status_display/evac/directional/west,
+/obj/structure/disposalpipe/segment,
+/obj/effect/landmark/start/hangover,
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/fore)
"dBH" = (
/turf/open/floor/iron/white/corner{
dir = 1
@@ -9589,6 +9494,13 @@
/obj/machinery/atmospherics/components/unary/passive_vent,
/turf/open/floor/circuit/red,
/area/station/ai_monitored/turret_protected/ai)
+"dCn" = (
+/obj/structure/chair{
+ dir = 8
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood/tile,
+/area/station/maintenance/central/lesser)
"dCs" = (
/obj/effect/turf_decal/stripes/white/line{
dir = 9
@@ -9597,18 +9509,12 @@
/obj/structure/tram,
/turf/open/floor/tram,
/area/station/maintenance/port/aft)
-"dCu" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
+"dCB" = (
+/obj/effect/turf_decal/siding/thinplating{
+ dir = 8
},
-/turf/open/floor/iron,
+/obj/machinery/holopad,
+/turf/open/floor/eighties,
/area/station/hallway/primary/central/fore)
"dCR" = (
/obj/structure/cable/layer3,
@@ -9625,6 +9531,20 @@
dir = 8
},
/area/station/security/office)
+"dCY" = (
+/obj/structure/statue/sandstone/venus{
+ dir = 8;
+ pixel_y = -15
+ },
+/obj/structure/flora/bush/flowers_pp,
+/obj/structure/flora/bush/flowers_br/style_3,
+/obj/effect/dummy/lighting_obj,
+/obj/effect/light_emitter/fake_outdoors,
+/obj/effect/turf_decal/siding/wood{
+ dir = 1
+ },
+/turf/open/floor/grass/Airless,
+/area/station/hallway/primary/central/aft)
"dDd" = (
/obj/structure/table,
/obj/item/exodrone{
@@ -9632,22 +9552,20 @@
},
/turf/open/floor/iron/smooth,
/area/station/cargo/drone_bay)
-"dDi" = (
-/obj/machinery/door/airlock/maintenance{
- name = "Maintenance"
- },
-/obj/effect/mapping_helpers/airlock/access/any/service/maintenance,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/plating,
-/area/station/maintenance/port/greater)
"dDk" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/chapel{
dir = 1
},
/area/station/maintenance/starboard/greater)
+"dDu" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/turf_decal/tile/dark_red/half/contrasted,
+/obj/machinery/computer/security/telescreen/interrogation/directional/north,
+/obj/structure/cable,
+/turf/open/floor/iron,
+/area/station/security)
"dDB" = (
/turf/open/space/basic,
/area/space)
@@ -9705,13 +9623,19 @@
/obj/machinery/door/firedoor,
/turf/open/floor/iron/textured_half,
/area/station/commons/fitness/recreation/entertainment)
-"dEq" = (
-/obj/effect/turf_decal/siding/thinplating_new/light,
-/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/small,
-/area/station/service/hydroponics)
+"dEi" = (
+/obj/machinery/door/airlock{
+ name = "Maintenance"
+ },
+/obj/effect/mapping_helpers/airlock/access/any/command/maintenance,
+/obj/effect/mapping_helpers/airlock/unres{
+ dir = 4
+ },
+/obj/structure/disposalpipe/junction{
+ dir = 4
+ },
+/turf/open/floor/plating,
+/area/station/maintenance/hallway/abandoned_command)
"dEu" = (
/obj/machinery/vending/cigarette,
/turf/open/floor/iron/kitchen/small,
@@ -9734,38 +9658,28 @@
dir = 1
},
/area/station/science/ordnance/testlab)
-"dEQ" = (
-/obj/structure/cable,
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/plating,
-/area/station/maintenance/port/greater)
+"dFp" = (
+/obj/effect/spawner/random/entertainment/arcade{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/thinplating,
+/obj/structure/sign/poster/official/random/directional/south,
+/turf/open/floor/eighties/red,
+/area/station/hallway/primary/central/fore)
"dFN" = (
/obj/structure/window/spawner/directional/east,
/obj/structure/window/spawner/directional/north,
/turf/open/floor/iron/dark,
/area/station/commons/dorms)
-"dFQ" = (
-/obj/structure/cable,
-/obj/effect/spawner/random/trash,
-/obj/structure/disposalpipe/segment{
- dir = 9
- },
-/turf/open/floor/plating,
-/area/station/maintenance/port/lesser)
-"dGm" = (
-/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/wood{
- name = "Bar Backroom"
- },
-/obj/effect/mapping_helpers/airlock/access/all/service/bar,
-/turf/open/floor/iron/textured_half{
- dir = 8
+"dGi" = (
+/obj/structure/chair/stool/bar/directional/north,
+/obj/effect/turf_decal/siding/wood{
+ dir = 1
},
-/area/station/service/bar)
+/obj/effect/landmark/start/assistant,
+/obj/effect/turf_decal/siding/wood,
+/turf/open/floor/wood,
+/area/station/hallway/primary/central/aft)
"dGV" = (
/obj/effect/turf_decal/stripes/line{
dir = 9
@@ -9787,6 +9701,57 @@
},
/turf/open/floor/tram,
/area/station/security/tram)
+"dHy" = (
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/merge_conflict_marker{
+ name = "---Merge Conflict Marker---";
+
+ desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
+ },
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/cable,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plating,
+/area/station/maintenance/central/greater)
+"dHD" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/structure/sign/departments/holy/directional/north,
+/obj/machinery/camera/directional/north,
+/turf/open/floor/iron,
+/area/station/hallway/primary/port)
+"dHJ" = (
+/obj/effect/turf_decal/tile/blue/opposingcorners{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/green/opposingcorners,
+/obj/structure/table,
+/obj/item/reagent_containers/cup/bottle/mutagen{
+ pixel_x = -5;
+ pixel_y = 8
+ },
+/obj/item/reagent_containers/syringe{
+ pixel_x = -3;
+ pixel_y = -1
+ },
+/obj/item/reagent_containers/cup/watering_can{
+ pixel_x = 7;
+ pixel_y = 13
+ },
+/obj/item/reagent_containers/spray/plantbgone{
+ pixel_x = 6;
+ pixel_y = 1
+ },
+/obj/machinery/light/small/directional/west,
+/obj/structure/sign/poster/official/random/directional/north,
+/turf/open/floor/iron,
+/area/station/service/hydroponics)
"dHL" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -9809,6 +9774,17 @@
},
/turf/open/space/basic,
/area/station/engineering/atmos/space_catwalk)
+"dIp" = (
+/obj/machinery/door/firedoor,
+/obj/effect/turf_decal/stripes/red/line{
+ dir = 8
+ },
+/obj/effect/turf_decal/stripes/red/line{
+ dir = 4
+ },
+/obj/structure/cable,
+/turf/open/floor/iron/small,
+/area/station/hallway/primary/central/fore)
"dIt" = (
/obj/structure/cable,
/obj/machinery/button/door/directional/east{
@@ -9821,29 +9797,6 @@
},
/turf/open/floor/iron/dark/small,
/area/station/ai_monitored/security/armory)
-"dIN" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/effect/turf_decal/trimline/neutral/line{
- dir = 1
- },
-/obj/effect/turf_decal/trimline/neutral/line,
-/obj/machinery/navbeacon{
- codes_txt = "patrol;next_patrol=16.0-CentralFore-CentralPort";
- location = "15.0-CentralStarboard-CentralFore"
- },
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/fore)
-"dIQ" = (
-/obj/effect/turf_decal/weather/dirt,
-/obj/structure/flora/bush/flowers_yw/style_3,
-/obj/machinery/firealarm/directional/south,
-/obj/machinery/light/small/directional/south,
-/obj/machinery/camera/directional/south,
-/obj/machinery/status_display/evac/directional/south,
-/turf/open/floor/grass,
-/area/station/service/chapel)
"dIZ" = (
/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{
dir = 6
@@ -9871,12 +9824,32 @@
/obj/effect/spawner/random/structure/girder,
/turf/open/floor/plating,
/area/station/maintenance/fore/lesser)
-"dJv" = (
-/obj/effect/turf_decal/siding/wood{
- dir = 8
+"dJo" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
},
-/turf/open/floor/wood/tile,
-/area/station/service/bar)
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+ dir = 1
+ },
+/obj/merge_conflict_marker{
+ name = "---Merge Conflict Marker---";
+
+ desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/neutral/line{
+ dir = 6
+ },
+/obj/effect/turf_decal/trimline/neutral/corner{
+ dir = 1
+ },
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/aft)
"dJT" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -9908,14 +9881,6 @@
/obj/effect/spawner/random/engineering/material,
/turf/open/floor/plating,
/area/station/maintenance/department/engine)
-"dKm" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/light/cold/directional/east,
-/obj/effect/turf_decal/tile/neutral,
-/obj/item/radio/intercom/directional/east,
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/fore)
"dKq" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -9982,6 +9947,28 @@
},
/turf/open/floor/iron/dark,
/area/station/security/processing)
+"dLA" = (
+/obj/effect/turf_decal/tile/red/opposingcorners,
+/obj/effect/turf_decal/tile/blue/opposingcorners{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/wood{
+ dir = 8
+ },
+/obj/item/kirbyplants/random,
+/obj/machinery/light/small/directional/west,
+/obj/item/radio/intercom/directional/south,
+/turf/open/floor/iron/smooth,
+/area/station/service/greenroom)
+"dLO" = (
+/obj/machinery/computer/security/telescreen/entertainment/directional/north,
+/obj/effect/landmark/start/hangover,
+/obj/machinery/light/small/directional/north,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/aft)
"dLQ" = (
/obj/structure/cable,
/obj/structure/disposalpipe/segment,
@@ -9994,13 +9981,6 @@
/obj/machinery/light_switch/directional/west,
/turf/open/floor/iron/small,
/area/station/security/office)
-"dLW" = (
-/obj/structure/chair/office{
- dir = 8
- },
-/obj/effect/landmark/start/librarian,
-/turf/open/floor/carpet,
-/area/station/service/library)
"dMg" = (
/obj/machinery/atmospherics/components/binary/pump{
dir = 4;
@@ -10008,19 +9988,6 @@
},
/turf/open/floor/circuit/red,
/area/station/ai_monitored/turret_protected/ai)
-"dMi" = (
-/obj/effect/turf_decal/siding/wood,
-/obj/structure/disposalpipe/segment{
- dir = 5
- },
-/obj/effect/turf_decal/siding/wood/corner{
- dir = 1
- },
-/obj/effect/turf_decal/siding/wood/corner{
- dir = 4
- },
-/turf/open/floor/stone,
-/area/station/service/bar)
"dMm" = (
/obj/effect/spawner/random/structure/crate,
/obj/effect/turf_decal/stripes/line{
@@ -10029,6 +9996,14 @@
/obj/machinery/camera/autoname/directional/east,
/turf/open/floor/plating,
/area/station/construction/mining/aux_base)
+"dMs" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
+/obj/effect/turf_decal/siding/wideplating_new/terracotta{
+ dir = 1
+ },
+/turf/open/floor/wood/tile,
+/area/station/maintenance/central/lesser)
"dMM" = (
/obj/effect/spawner/random/engineering/tracking_beacon,
/turf/open/floor/iron,
@@ -10042,6 +10017,16 @@
/obj/item/wrench,
/turf/open/floor/iron/dark,
/area/station/science/robotics/lab)
+"dNe" = (
+/obj/machinery/computer/slot_machine{
+ pixel_y = 2
+ },
+/obj/effect/turf_decal/siding/wood{
+ dir = 5
+ },
+/obj/machinery/status_display/evac/directional/north,
+/turf/open/floor/stone,
+/area/station/service/bar)
"dNj" = (
/obj/structure/chair{
dir = 4
@@ -10096,6 +10081,14 @@
/obj/machinery/light/small/directional/north,
/turf/open/floor/iron/grimy,
/area/station/hallway/secondary/entry)
+"dNX" = (
+/obj/effect/turf_decal/weather/dirt{
+ dir = 4
+ },
+/obj/structure/flora/bush/flowers_pp/style_random,
+/obj/structure/flora/bush/large/style_3,
+/turf/open/floor/grass,
+/area/station/service/chapel)
"dOb" = (
/obj/structure/broken_flooring/singular/directional/east,
/obj/structure/alien/weeds,
@@ -10106,12 +10099,6 @@
/obj/machinery/airalarm/directional/east,
/turf/open/floor/iron/dark,
/area/station/security/office)
-"dOf" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/turf_decal/tile/neutral,
-/obj/structure/disposalpipe/junction,
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/fore)
"dOz" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
@@ -10166,26 +10153,13 @@
/obj/effect/spawner/structure/window/survival_pod,
/turf/open/floor/engine,
/area/station/ai_monitored/turret_protected/ai)
+"dPg" = (
+/turf/closed/wall,
+/area/station/holodeck/rec_center)
"dPl" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/dark,
/area/station/security/interrogation)
-"dPp" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/turf_decal/trimline/neutral/line,
-/obj/effect/turf_decal/trimline/neutral/line{
- dir = 1
- },
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/aft)
-"dPx" = (
-/obj/effect/turf_decal/siding/wood{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/stone,
-/area/station/service/chapel)
"dQi" = (
/obj/structure/cable,
/obj/structure/disposalpipe/segment{
@@ -10215,20 +10189,17 @@
/turf/open/floor/engine,
/area/station/science/cytology)
"dQY" = (
-/obj/machinery/status_display/evac/directional/north,
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
+/obj/structure/table/wood,
+/obj/item/pen/red{
+ pixel_x = 3;
+ pixel_y = 12
},
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/aft)
-"dRb" = (
-/obj/effect/landmark/start/bartender,
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
- dir = 8
+/obj/item/pen/blue{
+ pixel_x = -6;
+ pixel_y = 12
},
-/obj/effect/turf_decal/siding/wood,
-/turf/open/floor/stone,
-/area/station/service/bar/backroom)
+/turf/open/floor/carpet,
+/area/station/service/library)
"dRk" = (
/obj/structure/flora/bush/lavendergrass/style_random,
/obj/structure/flora/bush/fullgrass/style_random,
@@ -10249,12 +10220,19 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
/area/station/maintenance/port/fore)
-"dRT" = (
-/obj/structure/disposalpipe/segment,
+"dRH" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/aft)
+/obj/effect/turf_decal/tile/blue{
+ dir = 1
+ },
+/obj/structure/disposalpipe/junction/flip{
+ dir = 4
+ },
+/turf/open/floor/iron/dark/side{
+ dir = 1
+ },
+/area/station/hallway/primary/central/fore)
"dSb" = (
/obj/machinery/atmospherics/pipe/smart/simple/general/visible{
dir = 4
@@ -10296,6 +10274,12 @@
},
/turf/open/floor/iron/showroomfloor,
/area/station/commons/toilet/auxiliary)
+"dSB" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 8
+ },
+/turf/open/floor/stone,
+/area/station/service/chapel)
"dSO" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -10325,14 +10309,6 @@
"dTd" = (
/turf/open/floor/stone,
/area/station/service/abandoned_gambling_den)
-"dTg" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/light/floor,
-/obj/effect/turf_decal/tile/neutral,
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/aft)
"dTB" = (
/obj/structure/broken_flooring/pile/directional/east,
/obj/effect/decal/cleanable/dirt,
@@ -10343,18 +10319,17 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/plating,
/area/station/maintenance/starboard/greater)
-"dTH" = (
-/obj/effect/landmark/start/hangover,
-/obj/effect/turf_decal/trimline/neutral/line,
-/obj/effect/turf_decal/trimline/neutral/line{
- dir = 1
- },
-/turf/open/floor/iron,
-/area/station/hallway/primary/port)
"dTI" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron,
/area/station/maintenance/starboard/aft)
+"dTT" = (
+/obj/effect/turf_decal/weather/dirt{
+ dir = 8
+ },
+/obj/structure/flora/bush/flowers_pp/style_2,
+/turf/open/floor/grass,
+/area/station/service/chapel)
"dTW" = (
/obj/effect/turf_decal/tile/brown/opposingcorners,
/obj/machinery/computer/shuttle/mining{
@@ -10405,13 +10380,6 @@
/obj/machinery/holopad,
/turf/open/floor/iron/dark/small,
/area/station/science/xenobiology)
-"dVQ" = (
-/obj/effect/turf_decal/weather/dirt{
- dir = 8
- },
-/obj/structure/flora/bush/sparsegrass,
-/turf/open/floor/grass,
-/area/station/service/chapel)
"dVW" = (
/obj/structure/chair{
dir = 8
@@ -10431,6 +10399,16 @@
/obj/structure/sign/departments/science/directional/north,
/turf/open/floor/iron,
/area/station/hallway/primary/starboard)
+"dWi" = (
+/obj/effect/turf_decal/weather/dirt,
+/obj/effect/turf_decal/weather/dirt{
+ dir = 1
+ },
+/obj/structure/flora/bush/flowers_yw,
+/obj/machinery/airalarm/directional/north,
+/obj/machinery/camera/directional/north,
+/turf/open/floor/grass,
+/area/station/service/chapel)
"dWm" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/eighties/red,
@@ -10482,6 +10460,14 @@
/obj/effect/landmark/start/warden,
/turf/open/floor/iron,
/area/station/security/warden)
+"dWL" = (
+/obj/structure/cable,
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/spawner/random/trash,
+/turf/open/floor/plating,
+/area/station/maintenance/port/greater)
"dWS" = (
/obj/structure/closet/crate/large,
/obj/effect/mapping_helpers/broken_floor,
@@ -10492,6 +10478,11 @@
/obj/machinery/portable_atmospherics/canister/air,
/turf/open/floor/plating,
/area/station/maintenance/central/lesser)
+"dWX" = (
+/obj/structure/table/wood,
+/obj/machinery/fax/auto_name,
+/turf/open/floor/carpet,
+/area/station/service/library)
"dXa" = (
/obj/structure/lattice/catwalk,
/obj/structure/railing,
@@ -10539,6 +10530,15 @@
/obj/machinery/door/firedoor,
/turf/open/floor/catwalk_floor/iron,
/area/station/science/lower)
+"dXp" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/landmark/navigate_destination/chapel,
+/obj/structure/disposalpipe/segment{
+ dir = 10
+ },
+/turf/open/floor/iron,
+/area/station/hallway/primary/port)
"dXO" = (
/obj/effect/spawner/structure/window/reinforced/tinted,
/obj/structure/disposalpipe/segment{
@@ -10556,22 +10556,6 @@
dir = 1
},
/area/station/science/xenobiology)
-"dYc" = (
-/obj/structure/table,
-/obj/machinery/recharger{
- pixel_x = 6;
- pixel_y = 9
- },
-/obj/item/multitool{
- pixel_x = -6;
- pixel_y = 3
- },
-/obj/item/cigarette{
- pixel_x = 5;
- pixel_y = 2
- },
-/turf/open/floor/iron/dark,
-/area/station/security/lockers)
"dYj" = (
/obj/structure/table,
/obj/effect/turf_decal/tile/dark_red,
@@ -10591,11 +10575,6 @@
/obj/effect/spawner/random/maintenance,
/turf/open/floor/plating,
/area/station/maintenance/port/aft)
-"dYu" = (
-/obj/machinery/light/floor,
-/obj/effect/landmark/start/cook,
-/turf/open/floor/iron/kitchen/small,
-/area/station/service/kitchen)
"dYw" = (
/obj/effect/turf_decal/tile/brown/opposingcorners,
/obj/structure/chair{
@@ -10768,33 +10747,12 @@
/turf/open/floor/wood,
/area/station/commons/fitness/recreation)
"ebk" = (
-/obj/effect/turf_decal/siding/wood,
-/obj/effect/turf_decal/siding/wood{
- dir = 1
- },
-/obj/machinery/light/floor,
-/turf/open/floor/stone,
-/area/station/service/bar)
-"ebo" = (
-/obj/machinery/atmospherics/pipe/smart/simple/dark/visible,
-/obj/machinery/camera/autoname/directional/east,
-/obj/machinery/light/cold/directional/east,
-/obj/machinery/power/apc/auto_name/directional/east{
- areastring = "/area/station/science/ordnance/burnchamber"
- },
-/obj/structure/cable,
-/turf/open/floor/iron/dark,
-/area/station/science/ordnance)
-"ebE" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/turf_decal/tile/dark_red/opposingcorners,
-/obj/machinery/flasher/directional/west{
- id = "brigentry"
- },
-/obj/structure/disposalpipe/segment,
/turf/open/floor/iron,
-/area/station/security/brig/entrance)
+/area/station/hallway/primary/central/fore)
+"ebm" = (
+/obj/structure/flora/grass/jungle/b/style_5,
+/turf/open/floor/grass,
+/area/station/service/chapel)
"ebK" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
dir = 4
@@ -10841,6 +10799,24 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/kitchen/small,
/area/station/security/prison/mess)
+"ecw" = (
+/obj/machinery/door/airlock/maintenance{
+ name = "Maintenance"
+ },
+/obj/effect/mapping_helpers/airlock/access/any/service/maintenance,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/open/floor/plating,
+/area/station/maintenance/port/greater)
+"ecB" = (
+/obj/structure/cable,
+/obj/structure/disposalpipe/segment,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/plating,
+/area/station/maintenance/port/greater)
"ecL" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/structure/transit_tube/horizontal,
@@ -10866,6 +10842,51 @@
dir = 1
},
/area/station/science/research)
+"edu" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/machinery/door/firedoor,
+/obj/effect/turf_decal/stripes/red/line{
+ dir = 8
+ },
+/obj/effect/turf_decal/stripes/red/line{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/neutral/line,
+/obj/effect/turf_decal/trimline/neutral/line{
+ dir = 1
+ },
+/obj/merge_conflict_marker{
+ name = "---Merge Conflict Marker---";
+
+ desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/machinery/door/firedoor,
+/obj/effect/turf_decal/stripes/red/line{
+ dir = 8
+ },
+/obj/effect/turf_decal/stripes/red/line{
+ dir = 4
+ },
+/turf/open/floor/iron/small,
+/area/station/hallway/primary/central/aft)
+"edx" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/turf_decal/tile/neutral,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/open/floor/iron,
+/area/station/hallway/primary/port)
+"edA" = (
+/obj/structure/disposalpipe/segment,
+/turf/closed/wall/r_wall,
+/area/station/hallway/primary/port)
"edD" = (
/obj/machinery/light/small/directional/west,
/obj/item/kirbyplants/random,
@@ -10874,19 +10895,6 @@
},
/turf/open/floor/iron,
/area/station/maintenance/starboard/aft)
-"edG" = (
-/obj/machinery/vending/hydronutrients,
-/obj/effect/turf_decal/tile/green/opposingcorners,
-/obj/effect/turf_decal/tile/blue/opposingcorners{
- dir = 8
- },
-/obj/effect/turf_decal/delivery/white{
- color = "#52B4E9"
- },
-/obj/item/radio/intercom/directional/north,
-/obj/machinery/firealarm/directional/east,
-/turf/open/floor/iron,
-/area/station/service/hydroponics)
"edJ" = (
/obj/machinery/teleport/station,
/obj/machinery/airalarm/directional/north,
@@ -10928,12 +10936,22 @@
/obj/structure/broken_flooring/singular/directional/east,
/turf/open/floor/iron,
/area/station/hallway/secondary/dock)
-"eeq" = (
-/obj/structure/railing/corner{
+"eeu" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/door/firedoor,
+/obj/effect/mapping_helpers/airlock/access/all/security/armory,
+/obj/machinery/door/airlock/security{
+ name = "Warden's Office"
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/open/floor/iron/textured_half{
dir = 8
},
-/turf/open/space/basic,
-/area/space)
+/area/station/security/warden)
"eeD" = (
/obj/structure/showcase/cyborg/old{
pixel_y = 20
@@ -10956,13 +10974,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold/yellow/visible,
/turf/open/floor/iron,
/area/station/engineering/atmos)
-"efm" = (
-/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/neutral,
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/aft)
"efy" = (
/obj/item/kirbyplants/organic/plant21,
/obj/machinery/status_display/ai/directional/west,
@@ -10978,10 +10989,20 @@
},
/turf/open/floor/iron/white,
/area/station/medical/medbay/lobby)
-"efC" = (
-/obj/effect/spawner/structure/window,
-/turf/open/floor/plating,
-/area/station/service/bar)
+"efE" = (
+/obj/structure/disposalpipe/segment,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/landmark/event_spawn,
+/obj/effect/turf_decal/trimline/neutral/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/neutral/line,
+/obj/structure/cable,
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/fore)
"efK" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -11010,18 +11031,6 @@
/obj/effect/spawner/structure/window,
/turf/open/floor/plating,
/area/station/security/prison/rec)
-"egc" = (
-/obj/effect/turf_decal/tile/green/opposingcorners,
-/obj/effect/turf_decal/tile/blue/opposingcorners{
- dir = 8
- },
-/obj/structure/table,
-/obj/machinery/reagentgrinder{
- pixel_y = 10;
- pixel_x = -5
- },
-/turf/open/floor/iron,
-/area/station/service/hydroponics)
"egr" = (
/obj/structure/cable,
/obj/effect/decal/cleanable/dirt,
@@ -11068,16 +11077,6 @@
/obj/structure/sign/poster/official/random/directional/east,
/turf/open/floor/iron/smooth,
/area/station/engineering/atmos/office)
-"ehT" = (
-/obj/machinery/door/airlock{
- id_tag = "commiss2";
- name = "Commissary"
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/door/firedoor,
-/turf/open/floor/iron/textured_half,
-/area/station/commons/vacant_room/commissary)
"ehV" = (
/obj/structure/cable,
/obj/structure/chair/sofa/right{
@@ -11153,6 +11152,13 @@
"eiU" = (
/turf/open/floor/plating/rust,
/area/station/maintenance/department/engine/atmos)
+"eiZ" = (
+/obj/machinery/photocopier,
+/obj/structure/sign/painting/library{
+ pixel_y = 32
+ },
+/turf/open/floor/wood/parquet,
+/area/station/service/library)
"ejn" = (
/obj/item/stack/cable_coil/five,
/obj/effect/decal/cleanable/cobweb,
@@ -11168,6 +11174,44 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron,
/area/station/science/ordnance/testlab)
+"ejG" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/effect/landmark/navigate_destination/teleporter,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/merge_conflict_marker{
+ name = "---Merge Conflict Marker---";
+
+ desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/effect/landmark/navigate_destination/teleporter,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/structure/cable,
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/fore)
+"ejJ" = (
+/obj/structure/mannequin/plastic,
+/obj/structure/disposalpipe/segment{
+ dir = 10
+ },
+/turf/open/floor/plating,
+/area/station/cargo/boutique)
"ejL" = (
/obj/machinery/atmospherics/pipe/smart/simple/orange/hidden,
/obj/effect/turf_decal/tile/yellow,
@@ -11206,14 +11250,6 @@
},
/turf/open/floor/catwalk_floor,
/area/station/engineering/main)
-"ejX" = (
-/obj/effect/turf_decal/siding/wood{
- dir = 1
- },
-/obj/effect/turf_decal/siding/wood,
-/obj/machinery/vending/cigarette,
-/turf/open/floor/stone,
-/area/station/service/bar)
"ekf" = (
/obj/structure/lattice/catwalk,
/obj/structure/railing{
@@ -11228,6 +11264,15 @@
},
/turf/open/space/basic,
/area/station/engineering/atmos/space_catwalk)
+"eki" = (
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/turf/open/floor/iron/white,
+/area/station/hallway/primary/central/aft)
"ekr" = (
/obj/effect/turf_decal/siding/dark_red{
dir = 1
@@ -11298,13 +11343,6 @@
/obj/machinery/camera/autoname/directional/west,
/turf/open/floor/iron/dark,
/area/station/science/ordnance)
-"eln" = (
-/obj/effect/turf_decal/weather/dirt{
- dir = 1
- },
-/obj/structure/flora/tree/jungle/small/style_4,
-/turf/open/floor/grass,
-/area/station/service/chapel)
"elv" = (
/obj/machinery/atmospherics/pipe/smart/simple/cyan/hidden{
dir = 4
@@ -11367,15 +11405,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/white,
/area/station/medical/medbay/lobby)
-"elN" = (
-/obj/machinery/computer/security/telescreen/entertainment/directional/north,
-/obj/effect/landmark/start/hangover,
-/obj/machinery/light/small/directional/north,
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/aft)
"elR" = (
/obj/structure/table,
/obj/structure/window/spawner/directional/south,
@@ -11400,13 +11429,17 @@
/obj/machinery/holopad,
/turf/open/floor/iron/dark,
/area/station/command/heads_quarters/rd)
-"emp" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/cable,
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/plating,
-/area/station/maintenance/central/greater)
+"emz" = (
+/obj/machinery/rnd/production/techfab/department/service,
+/obj/effect/turf_decal/tile/neutral/opposingcorners{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/thinplating_new{
+ dir = 4
+ },
+/obj/effect/turf_decal/delivery,
+/turf/open/floor/iron/small,
+/area/station/hallway/secondary/service)
"emB" = (
/obj/machinery/door/airlock/maintenance{
name = "Maintenance"
@@ -11436,6 +11469,19 @@
/obj/effect/landmark/navigate_destination/aiupload,
/turf/open/floor/iron/white,
/area/station/hallway/primary/starboard)
+"ene" = (
+/obj/effect/turf_decal/plaque{
+ icon_state = "L1";
+ pixel_y = -15
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 9
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/aft)
"enq" = (
/obj/structure/cable,
/obj/structure/table/reinforced,
@@ -11469,16 +11515,6 @@
},
/turf/open/floor/iron,
/area/station/security/prison)
-"eof" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/effect/turf_decal/tile/dark_red/fourcorners,
-/obj/effect/turf_decal/siding/wideplating/dark/corner{
- dir = 1
- },
-/obj/machinery/power/apc/auto_name/directional/north,
-/turf/open/floor/iron,
-/area/station/security/brig/entrance)
"eoz" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -11494,10 +11530,14 @@
/obj/structure/broken_flooring/pile/directional/east,
/turf/open/floor/plating,
/area/station/maintenance/starboard/aft)
-"eoM" = (
-/obj/structure/disposalpipe/segment,
-/turf/closed/wall,
-/area/station/maintenance/central/greater)
+"eoS" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 6
+ },
+/obj/machinery/light/floor,
+/obj/structure/table/wood,
+/turf/open/floor/iron/grimy,
+/area/station/service/bar)
"eoU" = (
/obj/structure/lattice/catwalk,
/obj/structure/railing{
@@ -11511,6 +11551,13 @@
/obj/machinery/camera/autoname/directional/east,
/turf/open/floor/circuit,
/area/station/tcommsat/server)
+"eph" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/firealarm/directional/east,
+/obj/effect/turf_decal/tile/neutral,
+/obj/structure/disposalpipe/segment,
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/fore)
"epn" = (
/obj/structure/table,
/obj/effect/turf_decal/tile/blue/full,
@@ -11542,6 +11589,20 @@
/obj/machinery/holopad,
/turf/open/floor/iron,
/area/station/security/prison/rec)
+"epP" = (
+/obj/machinery/light/small/directional/west,
+/turf/open/floor/iron/dark/small,
+/area/station/maintenance/central/lesser)
+"eqd" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+ dir = 1
+ },
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/aft)
"eqg" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -11560,24 +11621,6 @@
/obj/effect/mapping_helpers/airlock/access/all/security/general,
/turf/open/floor/catwalk_floor/flat_white,
/area/station/security/checkpoint/science)
-"equ" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/door/firedoor,
-/obj/effect/turf_decal/stripes/red/line{
- dir = 8
- },
-/obj/effect/turf_decal/stripes/red/line{
- dir = 4
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/turf/open/floor/iron/small,
-/area/station/hallway/primary/central/aft)
"eqz" = (
/obj/effect/turf_decal/siding/white/corner{
dir = 8
@@ -11599,24 +11642,22 @@
/obj/machinery/power/energy_accumulator/tesla_coil/anchored,
/turf/open/floor/engine,
/area/station/engineering/supermatter)
-"eqG" = (
-/obj/machinery/light/small/directional/west,
-/turf/open/floor/iron/dark/small,
-/area/station/maintenance/central/lesser)
"eqS" = (
/obj/effect/spawner/structure/window,
/turf/open/floor/plating,
/area/station/engineering/atmos/storage/gas)
-"erf" = (
-/obj/effect/mapping_helpers/airlock/access/any/service/hydroponics,
-/obj/machinery/door/airlock/hydroponics/glass{
- name = "Hydroponics"
+"ere" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
},
-/obj/machinery/door/firedoor,
-/turf/open/floor/iron/textured_half{
- dir = 8
+/obj/structure/disposalpipe/segment{
+ dir = 4
},
-/area/station/service/hydroponics)
+/obj/structure/disposalpipe/segment,
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/aft)
"erg" = (
/obj/structure/cable,
/obj/structure/disposalpipe/segment,
@@ -11668,11 +11709,6 @@
/obj/machinery/computer/records/security,
/turf/open/floor/iron/small,
/area/station/security/office)
-"esr" = (
-/obj/structure/closet/emcloset,
-/obj/effect/turf_decal/tile/blue,
-/turf/open/floor/iron/dark/side,
-/area/station/hallway/primary/central/fore)
"ess" = (
/obj/structure/filingcabinet/chestdrawer,
/obj/item/radio/intercom/directional/west,
@@ -11721,18 +11757,6 @@
/obj/structure/sign/departments/medbay/directional/east,
/turf/open/floor/iron,
/area/station/hallway/primary/aft)
-"ete" = (
-/obj/structure/cable,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/power/apc/auto_name/directional/north,
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating,
-/area/station/maintenance/port/greater)
"etl" = (
/obj/machinery/atmospherics/pipe/smart/simple/cyan/hidden{
dir = 5
@@ -11803,10 +11827,6 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/security)
-"euz" = (
-/obj/effect/spawner/structure/window/reinforced,
-/turf/closed/wall,
-/area/station/hallway/primary/central/aft)
"euO" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/stripes/white/line{
@@ -11883,6 +11903,13 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/small,
/area/station/maintenance/department/engine)
+"ewc" = (
+/obj/effect/spawner/structure/window,
+/obj/machinery/door/firedoor/border_only{
+ dir = 4
+ },
+/turf/open/floor/plating,
+/area/station/service/bar)
"ewo" = (
/obj/effect/turf_decal/box/corners{
dir = 4
@@ -11917,6 +11944,22 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron,
/area/station/maintenance/department/medical/central)
+"exg" = (
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron/white/side,
+/area/station/hallway/primary/central/aft)
+"exh" = (
+/obj/effect/spawner/random/entertainment/arcade{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/thinplating{
+ dir = 10
+ },
+/obj/structure/sign/poster/official/random/directional/south,
+/turf/open/floor/eighties/red,
+/area/station/hallway/primary/central/fore)
"exr" = (
/obj/effect/turf_decal/siding/blue{
dir = 8
@@ -11944,6 +11987,32 @@
},
/turf/open/floor/iron,
/area/station/engineering/atmos)
+"exF" = (
+/obj/machinery/button/door/directional/west{
+ id = "QMLoaddoor";
+ name = "Loading Doors";
+ pixel_y = -8;
+ req_access = list("cargo")
+ },
+/obj/machinery/button/door/directional/west{
+ id = "QMLoaddoor2";
+ name = "Loading Doors";
+ pixel_y = 8;
+ req_access = list("cargo")
+ },
+/obj/effect/turf_decal/bot,
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/turf/open/floor/iron,
+/area/station/cargo/storage)
+"exJ" = (
+/obj/machinery/camera/directional/east{
+ c_tag = "Xenobiology Lab - Test Chamber";
+ network = list("ss13","rd","xeno")
+ },
+/turf/open/floor/engine/xenobio,
+/area/station/science/xenobiology)
"exM" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -11963,6 +12032,13 @@
/obj/structure/broken_flooring/singular/directional/south,
/turf/open/floor/plating,
/area/station/hallway/secondary/dock)
+"exU" = (
+/obj/machinery/light/small/directional/south,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/status_display/evac/directional/south,
+/obj/effect/turf_decal/tile/neutral,
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/aft)
"exW" = (
/obj/effect/turf_decal/tile/green/half/contrasted{
dir = 8
@@ -11988,6 +12064,13 @@
dir = 1
},
/area/station/ai_monitored/turret_protected/aisat/maint)
+"eyS" = (
+/obj/structure/flora/tree/jungle/small/style_3,
+/obj/effect/turf_decal/weather/dirt,
+/obj/machinery/light/small/directional/south,
+/obj/machinery/status_display/ai/directional/south,
+/turf/open/floor/grass,
+/area/station/service/chapel)
"eyZ" = (
/obj/effect/turf_decal/tile/blue,
/obj/machinery/firealarm/directional/west,
@@ -12065,10 +12148,6 @@
},
/turf/open/floor/iron/smooth,
/area/station/ai_monitored/turret_protected/aisat/teleporter)
-"ezV" = (
-/obj/machinery/computer/security/telescreen/prison/directional/south,
-/turf/open/floor/iron/dark,
-/area/station/security/office)
"eAc" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -12082,14 +12161,6 @@
/obj/machinery/light/floor,
/turf/open/floor/iron,
/area/station/cargo/storage)
-"eAm" = (
-/obj/structure/cable,
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/plating,
-/area/station/maintenance/central/greater)
"eAn" = (
/obj/machinery/computer/mech_bay_power_console,
/obj/effect/turf_decal/siding/thinplating_new/light{
@@ -12104,6 +12175,11 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/grimy,
/area/station/commons/vacant_room/office)
+"eAt" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
+/obj/structure/cable,
+/turf/open/floor/iron/dark,
+/area/station/science/ordnance)
"eAu" = (
/obj/structure/cable,
/obj/machinery/power/tracker,
@@ -12166,17 +12242,6 @@
},
/turf/open/floor/iron,
/area/station/commons/storage/art)
-"eBC" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/obj/item/radio/intercom/directional/south,
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/fore)
"eBH" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -12184,6 +12249,12 @@
/obj/effect/landmark/blobstart,
/turf/open/floor/iron/smooth,
/area/station/ai_monitored/turret_protected/aisat/teleporter)
+"eBL" = (
+/obj/structure/extinguisher_cabinet/directional/south,
+/obj/machinery/camera/autoname/directional/south,
+/obj/item/kirbyplants/random,
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/fore)
"eBN" = (
/obj/structure/cable/layer3,
/obj/structure/cable,
@@ -12238,13 +12309,6 @@
/obj/effect/spawner/structure/window/survival_pod,
/turf/open/floor/engine,
/area/station/ai_monitored/turret_protected/ai)
-"eDi" = (
-/obj/structure/flora/bush/flowers_br,
-/obj/structure/flora/bush/flowers_pp,
-/obj/structure/flora/bush/flowers_yw,
-/obj/structure/flora/bush/pale,
-/turf/open/floor/grass,
-/area/station/hallway/primary/central/fore)
"eDl" = (
/obj/structure/cable/layer3,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -12254,6 +12318,10 @@
/obj/machinery/status_display/evac/directional/east,
/turf/open/floor/circuit/red,
/area/station/ai_monitored/turret_protected/ai)
+"eDm" = (
+/obj/effect/turf_decal/siding/thinplating_new/light,
+/turf/open/floor/iron/white/small,
+/area/station/service/hydroponics)
"eDo" = (
/obj/machinery/door/firedoor,
/obj/effect/mapping_helpers/airlock/access/any/engineering/construction,
@@ -12479,6 +12547,17 @@
dir = 1
},
/area/station/science/lobby)
+"eGd" = (
+/obj/effect/turf_decal/tile/dark_red/half/contrasted{
+ dir = 1
+ },
+/obj/machinery/camera/autoname/directional/south,
+/obj/machinery/firealarm/directional/south,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/open/floor/iron,
+/area/station/security/brig/entrance)
"eGw" = (
/obj/machinery/camera/directional/west{
c_tag = "Engineering - Public Desk"
@@ -12503,6 +12582,16 @@
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/station/security/prison/mess)
+"eGN" = (
+/obj/structure/cable,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/plating,
+/area/station/maintenance/port/greater)
"eGT" = (
/obj/structure/table,
/obj/machinery/fax{
@@ -12516,14 +12605,18 @@
/obj/machinery/airalarm/directional/east,
/turf/open/floor/iron/white,
/area/station/medical/paramedic)
-"eGU" = (
-/obj/structure/chair/stool/bar/directional/north,
-/turf/open/floor/wood/large,
-/area/station/service/bar)
"eHa" = (
/obj/structure/sign/poster/official/random/directional/north,
/turf/open/floor/iron/showroomfloor,
/area/station/service/barber)
+"eHb" = (
+/obj/item/toy/plush/slimeplushie{
+ name = "Nanners"
+ },
+/turf/open/floor/iron/white/corner{
+ dir = 8
+ },
+/area/station/science/xenobiology)
"eHe" = (
/obj/structure/cable,
/obj/structure/disposalpipe/segment{
@@ -12588,6 +12681,10 @@
},
/turf/open/floor/iron/grimy,
/area/station/engineering/main)
+"eIz" = (
+/obj/machinery/chem_master/condimaster,
+/turf/open/floor/iron/kitchen/small,
+/area/station/service/kitchen)
"eIF" = (
/obj/structure/disposalpipe/segment{
dir = 5
@@ -12604,20 +12701,6 @@
/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/iron,
/area/station/hallway/primary/central/fore)
-"eIO" = (
-/obj/structure/chair/sofa/bench/right{
- dir = 1
- },
-/obj/machinery/camera/directional/south{
- c_tag = "Atmospherics - South"
- },
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/landmark/start/hangover,
-/obj/effect/turf_decal/tile/neutral/half/contrasted{
- dir = 1
- },
-/turf/open/floor/iron/dark/side,
-/area/station/hallway/primary/central/fore)
"eIT" = (
/obj/machinery/portable_atmospherics/canister/oxygen,
/obj/effect/turf_decal/stripes/line{
@@ -12627,13 +12710,13 @@
/obj/structure/sign/poster/official/random/directional/north,
/turf/open/floor/plating,
/area/station/engineering/atmos/storage/gas)
-"eIW" = (
-/obj/effect/turf_decal/siding/wood{
- dir = 8
+"eIU" = (
+/obj/structure/flora/bush/jungle/c/style_random,
+/obj/effect/turf_decal/weather/dirt{
+ dir = 6
},
-/obj/structure/sign/poster/official/random/directional/west,
-/turf/open/floor/iron/grimy,
-/area/station/service/library)
+/turf/open/floor/grass,
+/area/station/service/chapel)
"eIX" = (
/obj/machinery/light/cold/directional/south,
/obj/effect/turf_decal/stripes/end{
@@ -12671,6 +12754,19 @@
/obj/structure/urinal/directional/west,
/turf/open/misc/asteroid/airless,
/area/space/nearstation)
+"eJI" = (
+/obj/structure/extinguisher_cabinet/directional/north,
+/obj/machinery/camera/autoname/directional/north,
+/obj/machinery/button/door/directional/east{
+ id = "kitchenshutters";
+ name = "Kitchen Shutter Control"
+ },
+/obj/machinery/disposal/bin,
+/obj/structure/disposalpipe/trunk{
+ dir = 8
+ },
+/turf/open/floor/iron/kitchen/small,
+/area/station/service/kitchen)
"eJP" = (
/obj/machinery/mech_bay_recharge_port{
dir = 1
@@ -12693,19 +12789,17 @@
dir = 4
},
/area/station/maintenance/starboard/greater)
-"eKD" = (
-/obj/structure/disposalpipe/sorting/mail{
- dir = 1
- },
-/obj/effect/mapping_helpers/mail_sorting/service/library,
-/turf/open/floor/wood/parquet,
-/area/station/service/library)
"eKP" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/effect/landmark/start/hangover,
/turf/open/floor/iron,
/area/station/hallway/secondary/entry)
+"eKQ" = (
+/obj/machinery/vending/cigarette,
+/obj/effect/turf_decal/tile/blue,
+/turf/open/floor/iron/dark/side,
+/area/station/hallway/primary/central/fore)
"eKU" = (
/turf/closed/wall/r_wall/rust,
/area/station/engineering/atmos/pumproom)
@@ -12834,15 +12928,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/dark/textured,
/area/station/ai_monitored/turret_protected/ai)
-"eNM" = (
-/obj/structure/table/wood,
-/obj/structure/reagent_dispensers/beerkeg,
-/obj/effect/turf_decal/siding/wood/end{
- dir = 8
- },
-/obj/structure/extinguisher_cabinet/directional/west,
-/turf/open/floor/stone,
-/area/station/service/bar)
"eNU" = (
/obj/structure/table/reinforced,
/obj/item/phone{
@@ -12856,6 +12941,13 @@
/obj/machinery/firealarm/directional/east,
/turf/open/floor/circuit/red,
/area/station/ai_monitored/turret_protected/ai)
+"eOc" = (
+/obj/effect/turf_decal/tile/neutral/opposingcorners,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+ dir = 4
+ },
+/turf/open/floor/iron,
+/area/station/holodeck/rec_center)
"eOh" = (
/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible,
/obj/effect/landmark/event_spawn,
@@ -12886,13 +12978,19 @@
/obj/effect/landmark/start/atmospheric_technician,
/turf/open/floor/iron/small,
/area/station/engineering/atmos)
-"eOX" = (
-/obj/effect/turf_decal/tile/neutral/opposingcorners,
-/obj/item/kirbyplants/random,
-/obj/machinery/airalarm/directional/east,
+"eOV" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron,
-/area/station/holodeck/rec_center)
+/obj/structure/cable,
+/obj/machinery/light/small/directional/west,
+/obj/effect/turf_decal/tile/neutral/opposingcorners{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/thinplating_new{
+ dir = 8
+ },
+/turf/open/floor/iron/small,
+/area/station/hallway/secondary/service)
"eOZ" = (
/obj/machinery/portable_atmospherics/canister/oxygen,
/obj/machinery/airalarm/directional/north,
@@ -12907,10 +13005,6 @@
},
/turf/open/floor/iron,
/area/station/cargo/miningfoundry)
-"ePt" = (
-/obj/structure/flora/grass/jungle/a/style_4,
-/turf/open/floor/grass,
-/area/station/service/chapel)
"ePP" = (
/obj/structure/cable,
/obj/effect/turf_decal/siding/dark_red{
@@ -12960,6 +13054,16 @@
},
/turf/open/floor/wood/tile,
/area/station/science/lower)
+"eQs" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/spawner/random/trash,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/open/floor/plating,
+/area/station/maintenance/port/greater)
"eQt" = (
/turf/closed/wall,
/area/station/command/heads_quarters/rd)
@@ -12989,26 +13093,6 @@
/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance,
/turf/open/floor/plating,
/area/station/maintenance/department/engine)
-"eRa" = (
-/obj/structure/disposalpipe/segment,
-/obj/effect/turf_decal/tile/neutral/opposingcorners{
- dir = 1
- },
-/obj/effect/turf_decal/siding/thinplating_new{
- dir = 8
- },
-/turf/open/floor/iron/small,
-/area/station/hallway/secondary/service)
-"eRy" = (
-/obj/structure/cable,
-/obj/structure/disposalpipe/segment{
- dir = 9
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/effect/spawner/random/structure/steam_vent,
-/turf/open/floor/plating,
-/area/station/maintenance/port/greater)
"eRX" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -13078,13 +13162,6 @@
/obj/item/kirbyplants/random/fullysynthetic,
/turf/open/floor/iron,
/area/station/security/prison)
-"eTJ" = (
-/obj/effect/turf_decal/siding/wood,
-/obj/effect/turf_decal/siding/wood{
- dir = 1
- },
-/turf/open/floor/stone,
-/area/station/service/bar)
"eTT" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -13234,19 +13311,34 @@
/obj/machinery/light/small/directional/south,
/turf/open/floor/iron,
/area/station/hallway/secondary/entry)
-"eVX" = (
-/obj/structure/statue/sandstone/venus{
- dir = 8;
- pixel_y = -15
+"eVR" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+ dir = 1
},
-/obj/structure/flora/bush/flowers_pp,
-/obj/structure/flora/bush/flowers_br/style_3,
-/obj/effect/dummy/lighting_obj,
-/obj/effect/light_emitter/fake_outdoors,
-/obj/effect/turf_decal/siding/wood{
+/obj/effect/turf_decal/trimline/neutral/end{
+ dir = 8
+ },
+/obj/structure/cable,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/merge_conflict_marker{
+ name = "---Merge Conflict Marker---";
+
+ desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
+ },
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 1
},
-/turf/open/floor/grass/Airless,
+/obj/structure/cable,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/neutral/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/neutral/line,
+/turf/open/floor/iron,
/area/station/hallway/primary/central/aft)
"eVY" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -13273,15 +13365,28 @@
/obj/machinery/firealarm/directional/west,
/turf/open/floor/iron/small,
/area/station/engineering/atmos/pumproom)
-"eWk" = (
-/obj/effect/turf_decal/siding/wood/corner{
+"eWm" = (
+/obj/machinery/door/airlock{
+ name = "Maintenance"
+ },
+/obj/effect/mapping_helpers/airlock/access/any/service/maintenance,
+/obj/effect/mapping_helpers/airlock/unres{
dir = 4
},
-/obj/effect/turf_decal/siding/wood/corner{
- dir = 8
+/obj/structure/disposalpipe/segment{
+ dir = 4
},
-/turf/open/floor/stone,
-/area/station/service/chapel)
+/obj/structure/cable,
+/turf/open/floor/plating,
+/area/station/maintenance/central/greater)
+"eWs" = (
+/obj/machinery/processor{
+ pixel_y = 6
+ },
+/obj/machinery/camera/autoname/directional/west,
+/obj/structure/table,
+/turf/open/floor/iron/kitchen/small,
+/area/station/service/kitchen)
"eWB" = (
/obj/effect/turf_decal/tile/dark_red/half/contrasted{
dir = 1
@@ -13290,12 +13395,6 @@
/obj/machinery/light/small/directional/south,
/turf/open/floor/iron,
/area/station/security/tram)
-"eWC" = (
-/obj/structure/disposalpipe/segment,
-/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/central/greater)
"eWD" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/white,
@@ -13335,16 +13434,6 @@
/obj/item/storage/crayons,
/turf/open/floor/iron,
/area/station/security/prison/workout)
-"eXB" = (
-/obj/effect/turf_decal/siding/wood{
- dir = 9
- },
-/obj/item/storage/fancy/candle_box,
-/obj/machinery/light_switch/directional/west,
-/obj/structure/rack/skeletal,
-/obj/machinery/camera/autoname/directional/west,
-/turf/open/floor/iron/grimy,
-/area/station/service/library)
"eXK" = (
/obj/effect/mapping_helpers/broken_floor,
/obj/structure/table/wood,
@@ -13360,14 +13449,6 @@
/obj/effect/landmark/event_spawn,
/turf/open/floor/iron/cafeteria,
/area/station/science/breakroom)
-"eXZ" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/turf_decal/trimline/neutral/end{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/aft)
"eYc" = (
/turf/open/floor/iron/dark/textured,
/area/station/ai_monitored/turret_protected/ai)
@@ -13390,13 +13471,6 @@
},
/turf/open/floor/iron/smooth,
/area/station/ai_monitored/turret_protected/aisat/equipment)
-"eYB" = (
-/obj/effect/turf_decal/siding/wood{
- dir = 8
- },
-/obj/effect/turf_decal/siding/wood/corner,
-/turf/open/floor/stone,
-/area/station/service/chapel)
"eYD" = (
/obj/structure/railing{
dir = 8
@@ -13428,16 +13502,6 @@
},
/turf/open/misc/sandy_dirt,
/area/station/maintenance/port/lesser)
-"eZi" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/effect/turf_decal/trimline/neutral/line,
-/obj/effect/turf_decal/trimline/neutral/line{
- dir = 1
- },
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/aft)
"eZj" = (
/obj/structure/window/spawner/directional/east,
/turf/open/floor/iron/dark,
@@ -13451,13 +13515,11 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/dark/textured,
/area/station/ai_monitored/turret_protected/ai)
-"fap" = (
-/obj/effect/spawner/structure/window,
-/obj/machinery/door/firedoor/border_only{
- dir = 4
- },
-/turf/open/floor/plating,
-/area/station/service/bar)
+"faj" = (
+/obj/effect/turf_decal/siding/wood,
+/obj/structure/cable,
+/turf/open/floor/wood/parquet,
+/area/station/service/library)
"fav" = (
/obj/item/kirbyplants/random/fullysynthetic,
/obj/machinery/computer/security/telescreen/entertainment/directional/west,
@@ -13472,6 +13534,14 @@
dir = 4
},
/area/station/maintenance/starboard/greater)
+"faE" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 8
+ },
+/obj/structure/table/wood,
+/obj/effect/landmark/start/hangover,
+/turf/open/floor/iron/grimy,
+/area/station/service/bar)
"faQ" = (
/obj/effect/turf_decal/tile/yellow{
dir = 1
@@ -13665,6 +13735,10 @@
},
/turf/open/floor/plating,
/area/station/science/robotics/lab)
+"fea" = (
+/obj/machinery/light/floor,
+/turf/open/floor/grass,
+/area/station/service/chapel)
"feo" = (
/obj/machinery/atmospherics/pipe/smart/simple/orange/hidden,
/obj/effect/turf_decal/tile/yellow,
@@ -13672,22 +13746,13 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/iron/smooth,
/area/station/engineering/main)
-"feL" = (
-/obj/effect/turf_decal/weather/dirt{
- dir = 1
+"feT" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 9
},
-/obj/structure/flora/bush/flowers_pp,
-/obj/structure/cable,
-/turf/open/floor/grass,
-/area/station/service/chapel)
-"feR" = (
-/turf/open/floor/carpet,
-/area/station/service/library)
-"ffi" = (
-/obj/structure/cable,
-/obj/machinery/power/apc/auto_name/directional/north,
-/turf/open/floor/iron/dark/small,
-/area/station/maintenance/central/lesser)
+/obj/machinery/light/floor,
+/turf/open/floor/stone,
+/area/station/service/bar)
"ffp" = (
/obj/structure/closet/firecloset,
/obj/effect/spawner/random/maintenance,
@@ -13708,6 +13773,12 @@
/obj/structure/sign/poster/official/random/directional/south,
/turf/open/floor/iron/dark,
/area/station/engineering/atmos)
+"ffS" = (
+/obj/effect/spawner/random/engineering/tracking_beacon,
+/turf/open/floor/iron/white/side{
+ dir = 4
+ },
+/area/station/science/xenobiology)
"fgk" = (
/obj/structure/window/reinforced/spawner/directional/east,
/obj/machinery/status_display/door_timer{
@@ -13735,6 +13806,16 @@
dir = 1
},
/area/station/commons/storage/tools)
+"fgu" = (
+/obj/structure/cable,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/open/floor/plating,
+/area/station/maintenance/port/greater)
"fgG" = (
/obj/effect/turf_decal/siding/yellow{
dir = 4
@@ -13748,27 +13829,6 @@
},
/turf/open/floor/iron/diagonal,
/area/station/engineering/lobby)
-"fgJ" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/turf/open/floor/plating,
-/area/station/maintenance/central/greater)
-"fgT" = (
-/obj/effect/turf_decal/weather/dirt{
- dir = 1
- },
-/obj/structure/flora/bush/flowers_br/style_random,
-/obj/structure/flora/bush/flowers_pp,
-/obj/structure/cable,
-/obj/machinery/power/apc/auto_name/directional/north{
- low_power_nightshift_lights = 1
- },
-/turf/open/floor/grass,
-/area/station/service/chapel)
"fgW" = (
/obj/effect/turf_decal/tile/neutral/fourcorners,
/obj/machinery/vending/drugs,
@@ -13797,6 +13857,38 @@
},
/turf/open/floor/iron/small,
/area/station/security/office)
+"fhp" = (
+/obj/machinery/status_display/ai/directional/west,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/aft)
+"fhH" = (
+/obj/effect/turf_decal/tile/green/opposingcorners,
+/obj/effect/turf_decal/tile/blue/opposingcorners{
+ dir = 8
+ },
+/obj/structure/table,
+/obj/machinery/reagentgrinder{
+ pixel_y = 10;
+ pixel_x = -5
+ },
+/turf/open/floor/iron,
+/area/station/service/hydroponics)
+"fhQ" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/neutral/line,
+/obj/effect/turf_decal/trimline/neutral/line{
+ dir = 1
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/open/floor/iron,
+/area/station/hallway/primary/port)
"fhT" = (
/obj/structure/sink/directional/east,
/obj/structure/mirror/directional/west,
@@ -13884,13 +13976,6 @@
},
/turf/open/floor/carpet/orange,
/area/station/commons/dorms)
-"fjq" = (
-/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,
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/aft)
"fjL" = (
/obj/effect/turf_decal/siding/wood{
dir = 9
@@ -13940,36 +14025,20 @@
/obj/item/mod/module/signlang_radio,
/turf/open/floor/iron/small,
/area/station/medical/storage)
-"fkF" = (
-/obj/structure/table/wood,
-/obj/item/pen/red{
- pixel_x = 3;
- pixel_y = 12
- },
-/obj/item/pen/blue{
- pixel_x = -6;
- pixel_y = 12
- },
-/turf/open/floor/carpet,
-/area/station/service/library)
-"fkN" = (
-/obj/structure/mannequin/plastic,
-/obj/structure/disposalpipe/segment{
- dir = 10
- },
-/turf/open/floor/plating,
-/area/station/cargo/boutique)
-"fkS" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/door/firedoor,
-/obj/effect/turf_decal/stripes/red/line{
+"fkA" = (
+/obj/structure/chair/sofa/bench/right{
dir = 1
},
-/obj/effect/turf_decal/stripes/red/line,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/turf/open/floor/iron/white/side,
+/area/station/hallway/primary/central/aft)
+"fkG" = (
/obj/structure/disposalpipe/segment{
- dir = 5
+ dir = 6
},
-/turf/open/floor/iron/small,
+/turf/closed/wall,
/area/station/hallway/primary/central/fore)
"fkT" = (
/obj/effect/turf_decal/sand/plating,
@@ -13996,11 +14065,6 @@
},
/turf/open/floor/iron/dark,
/area/station/security/interrogation)
-"flw" = (
-/obj/effect/turf_decal/weather/dirt,
-/obj/structure/flora/bush/flowers_yw/style_3,
-/turf/open/floor/grass,
-/area/station/service/chapel)
"flD" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/effect/turf_decal/stripes/corner{
@@ -14015,6 +14079,15 @@
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/iron/small,
/area/station/engineering/atmos/storage/gas)
+"flK" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 1
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/open/floor/wood/parquet,
+/area/station/service/library)
"flM" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -14026,14 +14099,6 @@
/obj/item/flashlight/lantern,
/turf/open/floor/plating/rust,
/area/station/maintenance/starboard/greater)
-"fme" = (
-/obj/effect/turf_decal/weather/dirt{
- dir = 1
- },
-/obj/structure/extinguisher_cabinet/directional/north,
-/obj/structure/flora/bush/sparsegrass,
-/turf/open/floor/grass,
-/area/station/service/chapel)
"fmf" = (
/obj/effect/turf_decal/tile/blue,
/obj/effect/landmark/event_spawn,
@@ -14063,6 +14128,13 @@
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/station/service/chapel/funeral)
+"fmZ" = (
+/mob/living/basic/bot/firebot,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/holopad,
+/turf/open/floor/iron/smooth_large,
+/area/station/engineering/storage_shared)
"fnd" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
/turf/closed/wall/r_wall,
@@ -14089,6 +14161,15 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron,
/area/station/hallway/secondary/entry)
+"fnH" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/structure/disposalpipe/segment,
+/obj/item/radio/intercom/directional/west,
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/fore)
"fnI" = (
/obj/machinery/airalarm/directional/east,
/turf/open/floor/iron/dark/side{
@@ -14147,22 +14228,6 @@
/obj/machinery/vending/security,
/turf/open/floor/iron,
/area/station/security/lockers)
-"foI" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/window/reinforced/spawner/directional/east,
-/obj/machinery/button/door/directional/north{
- id = "Xenolab";
- name = "Test Chamber Blast Doors";
- pixel_x = 26;
- pixel_y = -2;
- req_access = list("xenobiology")
- },
-/obj/machinery/atmospherics/components/binary/pump,
-/turf/open/floor/iron/white/side{
- dir = 8
- },
-/area/station/science/xenobiology)
"foL" = (
/obj/structure/sign/poster/official/random/directional/north,
/obj/structure/lattice,
@@ -14217,16 +14282,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/catwalk_floor,
/area/station/maintenance/disposal/incinerator)
-"fpN" = (
-/obj/effect/decal/cleanable/dirt,
-/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 = 4
- },
-/turf/open/floor/plating,
-/area/station/maintenance/port/greater)
"fpO" = (
/turf/closed/wall/r_wall,
/area/station/command/heads_quarters/ce)
@@ -14238,6 +14293,19 @@
"fpY" = (
/turf/closed/mineral/random/stationside,
/area/station/ai_monitored/aisat/exterior)
+"fqm" = (
+/obj/effect/turf_decal/weather/dirt{
+ dir = 6
+ },
+/turf/open/floor/grass,
+/area/station/service/chapel)
+"fqE" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral,
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/aft)
"fqG" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -14257,6 +14325,16 @@
/obj/machinery/computer/security/telescreen/entertainment/directional/west,
/turf/open/floor/carpet/lone,
/area/station/service/abandoned_gambling_den)
+"fqU" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/open/floor/iron,
+/area/station/hallway/primary/port)
"frf" = (
/obj/structure/table/glass,
/obj/item/defibrillator/loaded{
@@ -14265,15 +14343,12 @@
/obj/item/defibrillator/loaded,
/turf/open/floor/iron/white,
/area/station/medical/treatment_center)
-"fri" = (
-/obj/effect/mapping_helpers/airlock/access/any/service/maintenance,
-/obj/structure/cable,
-/obj/machinery/door/airlock{
- id_tag = "commiss2";
- name = "Commissary"
+"frm" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 1
},
-/turf/open/floor/plating,
-/area/station/maintenance/central/greater)
+/turf/open/floor/stone,
+/area/station/service/chapel)
"frC" = (
/obj/effect/turf_decal/tile/neutral/full,
/turf/open/floor/iron/dark/smooth_large,
@@ -14285,21 +14360,38 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/central/fore)
+"frN" = (
+/obj/item/radio/intercom/directional/north{
+ broadcasting = 1;
+ frequency = 1447;
+ name = "Private Channel";
+ pixel_x = -26
+ },
+/obj/machinery/computer/security/telescreen/aiupload/directional/west,
+/obj/item/radio/intercom/directional/north,
+/turf/open/floor/iron/dark,
+/area/station/ai_monitored/turret_protected/ai_upload_foyer)
"frP" = (
/obj/structure/table/reinforced,
/obj/machinery/door/firedoor,
/obj/machinery/door/window/brigdoor/right/directional/north,
/turf/open/floor/iron/textured_large,
/area/station/security/checkpoint/customs)
-"fsb" = (
-/obj/structure/disposalpipe/segment,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
+"fsh" = (
+/obj/structure/sink/kitchen/directional/south,
+/obj/effect/turf_decal/siding/wood/corner{
+ dir = 8
},
-/turf/open/floor/iron/white,
-/area/station/hallway/primary/central/aft)
+/obj/effect/turf_decal/siding/wood{
+ dir = 1
+ },
+/obj/machinery/camera/autoname/directional/north,
+/obj/machinery/light/floor,
+/obj/structure/disposalpipe/segment{
+ dir = 10
+ },
+/turf/open/floor/stone,
+/area/station/service/bar)
"fsk" = (
/obj/structure/cable,
/obj/effect/decal/cleanable/dirt,
@@ -14380,6 +14472,28 @@
/obj/structure/sign/poster/official/random/directional/south,
/turf/open/floor/iron,
/area/station/engineering/atmos)
+"ftj" = (
+/obj/structure/flora/bush/sparsegrass,
+/obj/structure/flora/bush/flowers_yw,
+/turf/open/floor/grass,
+/area/station/service/chapel)
+"fto" = (
+/obj/item/cigarette,
+/obj/item/storage/fancy/cigarettes/cigpack_robust{
+ pixel_y = 5;
+ pixel_x = 6
+ },
+/obj/item/lighter,
+/obj/structure/sign/poster/official/random/directional/east,
+/obj/structure/table,
+/obj/effect/turf_decal/tile/neutral/opposingcorners{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/thinplating_new{
+ dir = 6
+ },
+/turf/open/floor/iron/small,
+/area/station/hallway/secondary/service)
"fts" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -14415,6 +14529,12 @@
},
/turf/open/floor/iron,
/area/station/security/warden)
+"ftH" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/turf_decal/tile/neutral,
+/obj/structure/disposalpipe/segment,
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/fore)
"ftX" = (
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron,
@@ -14445,17 +14565,16 @@
/obj/effect/mapping_helpers/airlock/access/all/command/minisat,
/turf/open/floor/circuit/red,
/area/station/ai_monitored/turret_protected/ai)
-"fuu" = (
-/obj/effect/turf_decal/tile/dark_red/half/contrasted{
- dir = 1
- },
-/obj/machinery/light/cold/directional/south,
-/obj/structure/disposalpipe/sorting/mail/flip{
+"fuz" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/effect/mapping_helpers/mail_sorting/security/detectives_office,
-/turf/open/floor/iron,
-/area/station/security/brig/entrance)
+/turf/open/floor/plating,
+/area/station/maintenance/port/greater)
"fuB" = (
/obj/structure/railing{
dir = 4
@@ -14543,36 +14662,6 @@
/obj/machinery/newscaster/directional/south,
/turf/open/floor/stone,
/area/station/command/heads_quarters/hos)
-"fvH" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/table,
-/obj/item/electropack,
-/obj/machinery/light/small/directional/east,
-/turf/open/floor/engine,
-/area/station/science/xenobiology)
-"fvK" = (
-/obj/item/holosign_creator/robot_seat/restaurant,
-/obj/item/book/manual/chef_recipes,
-/obj/item/stack/package_wrap{
- pixel_y = 2
- },
-/obj/item/reagent_containers/condiment/enzyme{
- pixel_x = -7;
- pixel_y = 6
- },
-/obj/item/reagent_containers/condiment/saltshaker{
- pixel_x = -3
- },
-/obj/item/reagent_containers/condiment/peppermill{
- pixel_x = 3
- },
-/obj/machinery/light_switch/directional/north,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/structure/table,
-/turf/open/floor/iron/kitchen/small,
-/area/station/service/kitchen)
"fvL" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/structure/cable,
@@ -14660,15 +14749,6 @@
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/iron/small,
/area/station/engineering/atmos)
-"fxW" = (
-/obj/item/kirbyplants/random,
-/obj/structure/extinguisher_cabinet/directional/south,
-/obj/effect/turf_decal/siding/wood{
- dir = 1
- },
-/obj/effect/turf_decal/siding/wood,
-/turf/open/floor/stone,
-/area/station/service/bar)
"fyo" = (
/obj/structure/table,
/obj/machinery/light/small/directional/east,
@@ -14726,18 +14806,6 @@
/obj/machinery/light_switch/directional/north,
/turf/open/floor/iron/dark,
/area/station/science/genetics)
-"fyW" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/effect/turf_decal/trimline/neutral/line,
-/obj/effect/turf_decal/trimline/neutral/line{
- dir = 1
- },
-/obj/structure/disposalpipe/segment,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/station/hallway/primary/port)
"fyZ" = (
/obj/structure/cable,
/obj/structure/disposalpipe/segment{
@@ -14769,12 +14837,6 @@
},
/turf/open/floor/iron/white,
/area/station/medical/virology)
-"fzw" = (
-/obj/effect/turf_decal/siding/wood{
- dir = 10
- },
-/turf/open/floor/stone,
-/area/station/service/bar)
"fzx" = (
/obj/structure/cable,
/obj/structure/disposalpipe/segment{
@@ -14790,19 +14852,6 @@
},
/turf/open/floor/carpet/blue,
/area/station/commons/dorms)
-"fzT" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/effect/turf_decal/plaque{
- icon_state = "L6";
- pixel_y = -15
- },
-/obj/effect/turf_decal/trimline/neutral/line,
-/obj/effect/turf_decal/trimline/neutral/line{
- dir = 1
- },
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/aft)
"fAr" = (
/obj/structure/window/reinforced/spawner/directional/south,
/obj/structure/barricade/wooden/crude,
@@ -14896,26 +14945,6 @@
/obj/effect/spawner/random/maintenance,
/turf/open/floor/plating,
/area/station/maintenance/department/engine)
-"fBB" = (
-/obj/structure/table/wood,
-/obj/item/plate,
-/obj/item/food/cheesynachos{
- pixel_y = 2
- },
-/turf/open/floor/wood/large,
-/area/station/service/bar)
-"fBN" = (
-/obj/structure/flora/bush/flowers_yw/style_3{
- pixel_x = 3;
- pixel_y = 2
- },
-/obj/machinery/light/floor,
-/obj/effect/light_emitter/fake_outdoors,
-/obj/effect/turf_decal/siding/wood{
- dir = 10
- },
-/turf/open/floor/grass/Airless,
-/area/station/hallway/primary/central/aft)
"fBO" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/tank_holder/extinguisher,
@@ -14948,6 +14977,14 @@
/obj/machinery/light/small/directional/south,
/turf/open/floor/iron/small,
/area/station/hallway/secondary/exit/departure_lounge)
+"fCo" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/wood,
+/obj/machinery/restaurant_portal/bar,
+/turf/open/floor/stone,
+/area/station/service/bar)
"fCp" = (
/obj/machinery/computer/pod/old/mass_driver_controller/chapelgun{
pixel_x = 30
@@ -15059,16 +15096,6 @@
},
/turf/open/floor/iron/smooth,
/area/station/engineering/break_room)
-"fDX" = (
-/obj/effect/turf_decal/tile/neutral/full,
-/obj/effect/turf_decal/siding/thinplating_new/light{
- dir = 1
- },
-/obj/effect/turf_decal/siding/thinplating_new/light/corner{
- dir = 8
- },
-/turf/open/floor/iron/white/small,
-/area/station/service/hydroponics)
"fDY" = (
/obj/structure/cable,
/obj/structure/flora/bush/flowers_pp/style_random,
@@ -15110,6 +15137,15 @@
dir = 4
},
/area/station/engineering/supermatter/room)
+"fEm" = (
+/obj/effect/turf_decal/tile/yellow/anticorner/contrasted{
+ dir = 1
+ },
+/obj/machinery/chem_dispenser,
+/obj/effect/decal/cleanable/cobweb,
+/obj/machinery/light/small/directional/north,
+/turf/open/floor/iron/dark,
+/area/station/medical/pharmacy)
"fEq" = (
/obj/machinery/portable_atmospherics/canister/air,
/obj/effect/decal/cleanable/dirt,
@@ -15129,16 +15165,31 @@
/obj/machinery/power/apc/auto_name/directional/east,
/turf/open/floor/iron/smooth,
/area/station/maintenance/disposal/incinerator)
+"fEt" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 8
+ },
+/obj/structure/sign/poster/official/random/directional/west,
+/turf/open/floor/iron/grimy,
+/area/station/service/library)
+"fEw" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 6
+ },
+/turf/open/floor/stone,
+/area/station/service/chapel)
"fEC" = (
/turf/closed/wall,
/area/station/maintenance/port/lesser)
-"fEF" = (
-/obj/effect/turf_decal/siding/thinplating{
- dir = 9
+"fEG" = (
+/obj/effect/turf_decal/tile/green/opposingcorners,
+/obj/effect/turf_decal/tile/blue/opposingcorners{
+ dir = 8
},
-/obj/structure/cable,
-/turf/open/floor/eighties,
-/area/station/hallway/primary/central/fore)
+/obj/structure/extinguisher_cabinet/directional/east,
+/obj/machinery/hydroponics/constructable,
+/turf/open/floor/iron,
+/area/station/service/hydroponics)
"fEU" = (
/obj/structure/table,
/obj/item/multitool{
@@ -15151,14 +15202,6 @@
},
/turf/open/floor/iron/dark,
/area/station/maintenance/department/engine/atmos)
-"fEX" = (
-/obj/structure/table/wood,
-/obj/item/flashlight/lamp/green{
- pixel_x = 1;
- pixel_y = 7
- },
-/turf/open/floor/carpet,
-/area/station/service/library)
"fFe" = (
/obj/structure/lattice/catwalk,
/obj/structure/railing{
@@ -15170,11 +15213,14 @@
/obj/machinery/atmospherics/pipe/smart/simple/green/visible,
/turf/open/space/basic,
/area/station/engineering/atmos/space_catwalk)
-"fFr" = (
-/obj/structure/disposalpipe/segment,
-/obj/effect/turf_decal/trimline/neutral/end,
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/fore)
+"fFo" = (
+/obj/effect/turf_decal/tile/neutral/full,
+/obj/structure/rack,
+/obj/item/weldingtool/mini,
+/obj/item/tank/internals/emergency_oxygen/empty,
+/obj/item/cigarette/rollie,
+/turf/open/floor/iron/dark/smooth_large,
+/area/station/maintenance/central/lesser)
"fFt" = (
/obj/structure/chair/wood{
dir = 8
@@ -15265,16 +15311,12 @@
},
/turf/open/floor/plating/rust,
/area/station/ai_monitored/turret_protected/aisat/maint)
-"fGT" = (
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/obj/machinery/vending/cigarette,
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/turf/open/floor/iron/white/side,
-/area/station/hallway/primary/central/aft)
+"fGB" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/airalarm/directional/south,
+/obj/effect/turf_decal/tile/neutral,
+/turf/open/floor/iron,
+/area/station/hallway/primary/port)
"fGU" = (
/obj/effect/turf_decal/stripes/red/line{
dir = 1
@@ -15285,13 +15327,6 @@
/obj/structure/sign/warning/pods/directional/west,
/turf/open/floor/iron/dark,
/area/station/engineering/hallway)
-"fGW" = (
-/obj/effect/turf_decal/weather/dirt{
- dir = 5
- },
-/obj/structure/flora/bush/large/style_random,
-/turf/open/floor/grass,
-/area/station/service/chapel)
"fHf" = (
/obj/structure/bed/maint,
/obj/effect/spawner/random/maintenance,
@@ -15315,20 +15350,6 @@
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/iron/smooth_large,
/area/station/engineering/storage_shared)
-"fHK" = (
-/obj/structure/toilet{
- dir = 4
- },
-/obj/machinery/button/door/directional/north{
- name = "Lock Control";
- id = "Toilet2";
- specialfunctions = 4;
- normaldoorcontrol = 1
- },
-/obj/machinery/light/small/directional/west,
-/obj/structure/sign/poster/contraband/random/directional/west,
-/turf/open/floor/iron/white/small,
-/area/station/commons/toilet/restrooms)
"fHN" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -15344,6 +15365,10 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/central/fore)
+"fHP" = (
+/obj/structure/flora/tree/jungle/style_3,
+/turf/open/floor/grass,
+/area/station/service/chapel)
"fHT" = (
/obj/machinery/newscaster/directional/south,
/obj/machinery/vending/wardrobe/science_wardrobe,
@@ -15354,19 +15379,18 @@
/obj/machinery/airalarm/directional/west,
/turf/open/floor/iron/grimy,
/area/station/science/cubicle)
-"fIj" = (
-/turf/open/floor/iron/white/side,
-/area/station/hallway/primary/central/aft)
-"fIl" = (
-/obj/structure/chair/wood{
- dir = 8
- },
-/turf/open/floor/wood/tile,
-/area/station/service/bar)
"fIw" = (
/obj/effect/landmark/navigate_destination/dockescpod,
/turf/open/floor/plating,
/area/station/maintenance/department/medical/central)
+"fJk" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/turf_decal/tile/neutral,
+/obj/structure/disposalpipe/segment{
+ dir = 5
+ },
+/turf/open/floor/iron,
+/area/station/hallway/primary/port)
"fJl" = (
/obj/effect/turf_decal/stripes/line{
dir = 9
@@ -15395,6 +15419,17 @@
},
/turf/open/floor/iron,
/area/station/engineering/atmos)
+"fJu" = (
+/obj/effect/mapping_helpers/airlock/access/any/service/maintenance,
+/obj/machinery/door/airlock/maintenance{
+ name = "Maintenance"
+ },
+/obj/structure/cable,
+/obj/effect/mapping_helpers/airlock/unres{
+ dir = 1
+ },
+/turf/open/floor/plating,
+/area/station/maintenance/port/greater)
"fJK" = (
/obj/effect/turf_decal/stripes/line{
dir = 10
@@ -15408,6 +15443,17 @@
},
/turf/open/floor/iron,
/area/station/science/xenobiology)
+"fJO" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/status_display/ai/directional/north,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/fore)
"fJP" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/cable,
@@ -15462,19 +15508,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/smooth,
/area/station/ai_monitored/turret_protected/aisat_interior)
-"fKr" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/security/glass{
- id_tag = "outerbrig";
- name = "Brig"
- },
-/obj/effect/mapping_helpers/airlock/access/all/security/entrance,
-/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{
- cycle_id = "sci-entrance"
- },
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/iron/textured_half,
-/area/station/security/brig/entrance)
"fKx" = (
/obj/structure/transit_tube/horizontal,
/obj/structure/lattice/catwalk,
@@ -15491,13 +15524,6 @@
},
/turf/open/floor/iron,
/area/station/engineering/atmos/pumproom)
-"fKN" = (
-/obj/effect/landmark/event_spawn,
-/obj/machinery/computer/security/telescreen/test_chamber/directional/west,
-/turf/open/floor/iron/white/side{
- dir = 4
- },
-/area/station/science/xenobiology)
"fKP" = (
/obj/structure/disposalpipe/trunk{
dir = 8
@@ -15515,6 +15541,13 @@
/obj/effect/turf_decal/stripes/box,
/turf/open/floor/iron,
/area/station/engineering/hallway)
+"fLb" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/airalarm/directional/east,
+/obj/effect/turf_decal/tile/neutral,
+/obj/structure/disposalpipe/segment,
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/fore)
"fLf" = (
/obj/structure/cable/layer3,
/obj/structure/cable,
@@ -15625,35 +15658,10 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/fore)
-"fLF" = (
-/obj/machinery/navbeacon{
- codes_txt = "delivery;dir=8";
- location = "QM #2"
- },
-/obj/effect/turf_decal/delivery,
-/obj/machinery/camera/autoname/directional/south,
-/obj/machinery/light/small/directional/south,
-/obj/structure/disposalpipe/segment{
- 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,
-/area/station/cargo/storage)
"fLI" = (
/obj/effect/spawner/random/structure/crate,
/turf/open/floor/iron/dark/small,
/area/station/maintenance/aft)
-"fLJ" = (
-/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/dark_red/fourcorners,
-/obj/machinery/holopad,
-/obj/effect/landmark/event_spawn,
-/turf/open/floor/iron,
-/area/station/security/brig/entrance)
"fLK" = (
/obj/structure/disposalpipe/segment{
dir = 9
@@ -15747,10 +15755,6 @@
},
/turf/open/floor/iron/cafeteria,
/area/station/hallway/secondary/exit/departure_lounge)
-"fMX" = (
-/obj/effect/turf_decal/siding/wood/corner,
-/turf/open/floor/stone,
-/area/station/service/chapel)
"fNb" = (
/obj/effect/turf_decal/arrows{
dir = 8
@@ -15778,15 +15782,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/plating,
/area/station/maintenance/starboard/greater)
-"fNC" = (
-/obj/structure/chair/sofa/bench/right{
- dir = 8
- },
-/obj/effect/turf_decal/tile/blue,
-/turf/open/floor/iron/dark/side{
- dir = 4
- },
-/area/station/hallway/primary/central/fore)
"fNF" = (
/obj/machinery/atmospherics/pipe/smart/simple/green/visible{
dir = 4
@@ -15821,32 +15816,6 @@
/obj/effect/turf_decal/bot_white,
/turf/open/floor/iron/small,
/area/station/medical/storage)
-"fNW" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/station/hallway/primary/port)
-"fNZ" = (
-/obj/structure/cable,
-/obj/machinery/door/airlock{
- name = "Maintenance"
- },
-/obj/effect/mapping_helpers/airlock/access/any/service/maintenance,
-/obj/effect/mapping_helpers/airlock/unres{
- dir = 4
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/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/central/lesser)
"fOg" = (
/obj/effect/spawner/random/maintenance,
/obj/effect/turf_decal/sand/plating,
@@ -15859,24 +15828,11 @@
},
/turf/open/floor/iron/smooth,
/area/station/ai_monitored/turret_protected/aisat_interior)
-"fOJ" = (
-/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/dark/herringbone,
-/area/station/ai_monitored/command/nuke_storage)
"fOQ" = (
/obj/structure/cable,
/obj/structure/window/reinforced/spawner/directional/north,
/turf/open/floor/iron,
/area/station/security/prison/workout)
-"fOW" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
- dir = 4
- },
-/obj/effect/turf_decal/tile/neutral,
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/aft)
"fPb" = (
/obj/effect/spawner/structure/window/reinforced/plasma,
/turf/open/floor/engine,
@@ -15887,6 +15843,16 @@
/obj/structure/cable/layer3,
/turf/open/floor/iron/smooth,
/area/station/ai_monitored/turret_protected/aisat_interior)
+"fPv" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/cable,
+/obj/effect/spawner/random/structure/steam_vent,
+/turf/open/floor/plating,
+/area/station/maintenance/central/greater)
"fPO" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 8
@@ -15931,19 +15897,6 @@
/obj/structure/cable,
/turf/open/floor/iron/diagonal,
/area/station/engineering/lobby)
-"fQd" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/disposalpipe/segment,
-/obj/structure/window/reinforced/spawner/directional/north,
-/obj/effect/turf_decal/tile/neutral/opposingcorners{
- dir = 1
- },
-/obj/effect/turf_decal/siding/thinplating_new{
- dir = 4
- },
-/turf/open/floor/iron/small,
-/area/station/hallway/secondary/service)
"fQA" = (
/obj/effect/spawner/random/structure/chair_maintenance{
dir = 8
@@ -15966,6 +15919,17 @@
/obj/machinery/firealarm/directional/east,
/turf/open/floor/iron/smooth,
/area/station/ai_monitored/turret_protected/aisat_interior)
+"fRd" = (
+/obj/effect/turf_decal/siding/white/corner{
+ dir = 4
+ },
+/obj/effect/mapping_helpers/airlock/access/all/service/kitchen,
+/obj/machinery/door/airlock{
+ name = "Kitchen"
+ },
+/obj/machinery/door/firedoor,
+/turf/open/floor/iron/kitchen/small,
+/area/station/service/kitchen)
"fRl" = (
/obj/effect/turf_decal/tile/neutral/fourcorners,
/obj/effect/turf_decal/siding/purple{
@@ -16036,21 +16000,6 @@
/obj/machinery/power/apc/auto_name/directional/west,
/turf/open/floor/iron,
/area/station/commons/fitness/locker_room)
-"fRX" = (
-/obj/machinery/door/airlock/public/glass{
- name = "Study"
- },
-/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,
-/obj/structure/disposalpipe/segment,
-/obj/effect/turf_decal/siding/wood/end,
-/obj/effect/turf_decal/siding/wood{
- dir = 1
- },
-/turf/open/floor/wood/parquet,
-/area/station/service/library)
"fSe" = (
/turf/closed/wall/rust,
/area/station/cargo/miningfoundry)
@@ -16059,12 +16008,22 @@
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/station/security/prison)
-"fSg" = (
-/obj/machinery/atmospherics/pipe/smart/simple/general/visible{
- dir = 4
+"fSi" = (
+/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/wood{
+ dir = 10
},
-/turf/open/floor/engine,
-/area/station/science/xenobiology)
+/turf/open/floor/stone,
+/area/station/service/bar/backroom)
+"fSr" = (
+/obj/effect/turf_decal/weather/dirt{
+ dir = 1
+ },
+/obj/structure/flora/bush/sparsegrass,
+/turf/open/floor/grass,
+/area/station/service/chapel)
"fSx" = (
/obj/structure/cable,
/obj/structure/disposalpipe/segment{
@@ -16125,6 +16084,15 @@
"fTh" = (
/turf/closed/wall/r_wall/rust,
/area/station/ai_monitored/turret_protected/aisat_interior)
+"fTq" = (
+/obj/effect/mapping_helpers/airlock/access/all/service/kitchen,
+/obj/machinery/door/airlock/freezer{
+ name = "Freezer"
+ },
+/obj/structure/disposalpipe/segment,
+/obj/structure/cable,
+/turf/open/floor/iron/freezer,
+/area/station/service/kitchen/coldroom)
"fTt" = (
/obj/effect/spawner/random/structure/crate,
/turf/open/floor/plating,
@@ -16141,12 +16109,30 @@
/obj/effect/spawner/random/structure/closet_maintenance,
/turf/open/floor/plating,
/area/station/ai_monitored/turret_protected/aisat/maint)
+"fTI" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/disposalpipe/segment,
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/fore)
"fTM" = (
/obj/structure/disposalpipe/segment{
dir = 4
},
/turf/open/floor/iron,
/area/station/hallway/primary/starboard)
+"fTV" = (
+/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 = 4
+ },
+/turf/open/floor/plating,
+/area/station/maintenance/port/greater)
"fUb" = (
/obj/effect/turf_decal/arrows{
dir = 8
@@ -16173,20 +16159,6 @@
/obj/effect/mapping_helpers/airlock/access/all/science/general,
/turf/open/floor/plating,
/area/station/maintenance/starboard/aft)
-"fUz" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/disposalpipe/segment{
- dir = 9
- },
-/turf/open/floor/plating,
-/area/station/maintenance/central/greater)
-"fUC" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/turf_decal/tile/neutral,
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/fore)
"fUI" = (
/obj/structure/disposalpipe/segment{
dir = 5
@@ -16194,6 +16166,11 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
/area/station/ai_monitored/turret_protected/aisat/maint)
+"fUM" = (
+/obj/structure/cable,
+/obj/item/radio/intercom/directional/east,
+/turf/open/floor/wood/parquet,
+/area/station/service/library)
"fUO" = (
/obj/machinery/turretid{
control_area = "/area/station/ai_monitored/turret_protected/aisat_interior";
@@ -16240,14 +16217,6 @@
},
/turf/open/floor/plating,
/area/station/construction/mining/aux_base)
-"fVl" = (
-/obj/structure/table/wood,
-/obj/item/storage/fancy/cigarettes/cigars/cohiba{
- pixel_x = 2;
- pixel_y = 10
- },
-/turf/open/floor/wood/large,
-/area/station/service/bar)
"fVy" = (
/obj/effect/turf_decal/tile/purple/opposingcorners,
/obj/effect/turf_decal/siding/green{
@@ -16261,29 +16230,10 @@
/obj/structure/sign/poster/official/random/directional/west,
/turf/open/floor/iron/small,
/area/station/security/checkpoint/engineering)
-"fVF" = (
-/obj/effect/turf_decal/weather/dirt,
-/obj/structure/flora/bush/sparsegrass,
-/turf/open/floor/grass,
-/area/station/service/chapel)
"fVG" = (
/obj/structure/cable,
/turf/open/floor/iron/smooth,
/area/station/security/checkpoint/customs)
-"fVM" = (
-/obj/structure/extinguisher_cabinet/directional/west,
-/obj/effect/turf_decal/tile/neutral,
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/aft)
-"fVQ" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
- dir = 1
- },
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/aft)
"fVU" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -16437,17 +16387,19 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/herringbone,
/area/station/commons/dorms)
-"fYJ" = (
-/obj/structure/table/wood,
-/obj/item/food/lizard_fries,
-/turf/open/floor/wood/large,
-/area/station/service/bar)
"fYU" = (
/obj/effect/spawner/random/structure/crate_loot,
/obj/item/pickaxe,
/obj/effect/spawner/random/maintenance,
/turf/open/misc/asteroid,
/area/station/maintenance/department/engine/atmos)
+"fZj" = (
+/obj/effect/turf_decal/weather/dirt{
+ dir = 10
+ },
+/obj/structure/flora/bush/sparsegrass,
+/turf/open/floor/grass,
+/area/station/service/chapel)
"fZp" = (
/obj/effect/turf_decal/siding/wood{
dir = 4
@@ -16468,14 +16420,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/white/small,
/area/station/science/ordnance/storage)
-"fZK" = (
-/obj/structure/table/wood,
-/obj/machinery/computer/libraryconsole/bookmanagement{
- dir = 1;
- pixel_y = 5
- },
-/turf/open/floor/carpet,
-/area/station/service/library)
"fZL" = (
/obj/effect/turf_decal/stripes/line{
dir = 6
@@ -16493,15 +16437,6 @@
},
/turf/open/floor/iron/smooth,
/area/station/engineering/supermatter/room)
-"fZZ" = (
-/obj/structure/chair/sofa/bench/left{
- dir = 1
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/turf/open/floor/iron/white/side,
-/area/station/hallway/primary/central/aft)
"gad" = (
/obj/structure/table/bronze,
/obj/item/food/grown/cannabis{
@@ -16534,18 +16469,6 @@
},
/turf/open/floor/iron/grimy,
/area/station/command/heads_quarters/hop)
-"gaj" = (
-/obj/effect/landmark/event_spawn,
-/obj/effect/turf_decal/trimline/neutral/line{
- dir = 1
- },
-/obj/effect/turf_decal/trimline/neutral/line,
-/obj/structure/cable,
-/obj/structure/disposalpipe/segment{
- dir = 10
- },
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/aft)
"gan" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/door/airlock/research{
@@ -16570,6 +16493,12 @@
/obj/machinery/airalarm/directional/west,
/turf/open/floor/iron/smooth_large,
/area/station/science/auxlab/firing_range)
+"gaQ" = (
+/obj/effect/turf_decal/siding/thinplating_new/light{
+ dir = 4
+ },
+/turf/open/floor/iron/white/small,
+/area/station/service/hydroponics)
"gaU" = (
/obj/effect/turf_decal/siding{
dir = 9
@@ -16685,6 +16614,19 @@
},
/turf/open/space/basic,
/area/station/engineering/atmos/space_catwalk)
+"gdi" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/turf_decal/plaque{
+ icon_state = "L14";
+ pixel_y = -15
+ },
+/obj/effect/turf_decal/trimline/neutral/line,
+/obj/effect/turf_decal/trimline/neutral/line{
+ dir = 1
+ },
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/aft)
"gdn" = (
/obj/item/kirbyplants/organic/applebush,
/obj/effect/turf_decal/tile/red{
@@ -16744,6 +16686,20 @@
},
/turf/open/floor/iron,
/area/station/commons/dorms)
+"gdO" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+ dir = 1
+ },
+/obj/structure/disposalpipe/segment,
+/obj/effect/turf_decal/tile/neutral/opposingcorners{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/thinplating_new{
+ dir = 8
+ },
+/turf/open/floor/iron/small,
+/area/station/hallway/secondary/service)
"geb" = (
/obj/structure/table/reinforced/plastitaniumglass,
/obj/item/flashlight/lamp/green,
@@ -16774,16 +16730,6 @@
/obj/machinery/light/small/directional/west,
/turf/open/misc/sandy_dirt,
/area/station/hallway/primary/central/fore)
-"geH" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/turf_decal/tile/dark_red,
-/obj/structure/sign/warning/no_smoking/circle/directional/north,
-/obj/structure/disposalpipe/segment{
- dir = 6
- },
-/turf/open/floor/iron,
-/area/station/security)
"geJ" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 8
@@ -16806,6 +16752,13 @@
/obj/machinery/keycard_auth/directional/south,
/turf/open/floor/carpet/red,
/area/station/command/heads_quarters/hos)
+"geX" = (
+/obj/effect/turf_decal/weather/dirt{
+ dir = 1
+ },
+/obj/structure/flora/grass/jungle/b/style_3,
+/turf/open/floor/grass,
+/area/station/service/chapel)
"gfb" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -16816,16 +16769,14 @@
/obj/effect/mapping_helpers/airlock/access/all/command/general,
/turf/open/floor/catwalk_floor/iron_smooth,
/area/station/ai_monitored/turret_protected/aisat/foyer)
-"gfm" = (
-/obj/structure/chair/office{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+"gfq" = (
/obj/structure/cable,
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/wood/parquet,
-/area/station/service/library)
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/open/floor/plating,
+/area/station/maintenance/central/greater)
"gfs" = (
/turf/closed/wall/r_wall,
/area/station/hallway/secondary/command)
@@ -16872,18 +16823,6 @@
/obj/effect/turf_decal/sand/plating,
/turf/open/floor/plating/airless,
/area/space/nearstation)
-"ggc" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/door/airlock/public/glass{
- name = "Departure Lounge"
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/iron/textured_half{
- dir = 1
- },
-/area/station/hallway/secondary/exit/departure_lounge)
"ggh" = (
/obj/effect/turf_decal/stripes/white/line{
dir = 8
@@ -16909,6 +16848,20 @@
},
/turf/open/floor/plating,
/area/station/maintenance/port/fore)
+"ggC" = (
+/obj/effect/turf_decal/weather/dirt{
+ dir = 8
+ },
+/obj/structure/flora/bush/jungle/c/style_3,
+/turf/open/floor/grass,
+/area/station/service/chapel)
+"ggG" = (
+/obj/structure/bookcase/random,
+/obj/structure/sign/painting/library{
+ pixel_x = -30
+ },
+/turf/open/floor/wood/parquet,
+/area/station/service/library)
"ggN" = (
/obj/effect/turf_decal/stripes/white/line{
dir = 9
@@ -16936,15 +16889,13 @@
/obj/effect/mapping_helpers/broken_floor,
/turf/open/floor/plating,
/area/station/maintenance/port/lesser)
-"ghj" = (
-/obj/effect/turf_decal/tile/green/opposingcorners,
-/obj/effect/turf_decal/tile/blue/opposingcorners{
- dir = 8
+"ghm" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
},
-/obj/machinery/hydroponics/constructable,
-/obj/machinery/light/small/directional/east,
+/obj/structure/cable,
/turf/open/floor/iron,
-/area/station/service/hydroponics)
+/area/station/hallway/primary/central/fore)
"ghs" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -16997,15 +16948,6 @@
/obj/item/kirbyplants/random,
/turf/open/floor/iron,
/area/station/science/lower)
-"ghL" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/obj/structure/disposalpipe/segment,
-/obj/item/radio/intercom/directional/west,
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/fore)
"ghQ" = (
/obj/machinery/nuclearbomb/selfdestruct,
/turf/open/floor/circuit/green,
@@ -17032,24 +16974,26 @@
/obj/machinery/nuclearbomb/beer,
/turf/open/floor/iron/freezer,
/area/station/command/corporate_suite)
-"giB" = (
-/obj/effect/turf_decal/trimline/neutral/line{
- dir = 1
+"giz" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
},
-/obj/effect/turf_decal/trimline/neutral/line,
-/obj/structure/cable,
-/obj/structure/disposalpipe/segment{
- dir = 4
+/obj/effect/landmark/start/hangover,
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/fore)
+"giA" = (
+/obj/machinery/camera/autoname/directional/east,
+/obj/effect/turf_decal/siding/wood{
+ dir = 8
},
-/obj/machinery/door/firedoor,
-/obj/effect/turf_decal/stripes/red/line{
+/obj/machinery/light/small/directional/east,
+/obj/effect/turf_decal/siding/wood{
dir = 4
},
-/obj/effect/turf_decal/stripes/red/line{
- dir = 8
- },
-/turf/open/floor/iron/small,
-/area/station/hallway/primary/central/aft)
+/obj/item/radio/intercom/directional/east,
+/turf/open/floor/stone,
+/area/station/service/bar)
"giU" = (
/obj/effect/turf_decal/siding/thinplating_new/terracotta{
dir = 1
@@ -17085,13 +17029,6 @@
},
/turf/open/floor/iron/dark/corner,
/area/station/science/xenobiology)
-"gjn" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/effect/turf_decal/tile/neutral/opposingcorners,
-/turf/open/floor/iron,
-/area/station/holodeck/rec_center)
"gjL" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/heat_exchanging/junction{
@@ -17198,19 +17135,17 @@
"gla" = (
/turf/open/floor/iron/grimy,
/area/station/commons)
-"gls" = (
-/obj/item/radio/intercom/directional/south,
-/obj/effect/turf_decal/siding/wood,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron/grimy,
-/area/station/service/library)
-"glA" = (
+"glk" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+ dir = 8
+ },
/obj/effect/landmark/start/hangover,
-/obj/structure/chair/wood{
+/obj/structure/chair/office{
dir = 8
},
-/turf/open/floor/wood/tile,
-/area/station/service/bar)
+/turf/open/floor/wood/parquet,
+/area/station/service/library)
"glJ" = (
/obj/effect/turf_decal/tile/brown/opposingcorners,
/obj/effect/turf_decal/siding/wideplating,
@@ -17252,6 +17187,15 @@
/obj/item/wrench/medical,
/turf/open/floor/iron/dark,
/area/station/medical/medbay/aft)
+"gma" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/machinery/firealarm/directional/west,
+/obj/structure/disposalpipe/segment,
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/fore)
"gmf" = (
/turf/open/floor/iron/white/small,
/area/station/commons/toilet/restrooms)
@@ -17273,6 +17217,16 @@
},
/turf/open/floor/iron/white/small,
/area/station/medical/cryo)
+"gmU" = (
+/obj/machinery/light/floor,
+/obj/structure/altar_of_gods,
+/obj/item/book/bible,
+/obj/effect/landmark/start/hangover,
+/obj/item/flashlight/lantern{
+ pixel_y = 5
+ },
+/turf/open/floor/wood/tile,
+/area/station/service/chapel)
"gnd" = (
/turf/closed/wall,
/area/station/engineering/atmos/office)
@@ -17304,6 +17258,13 @@
},
/turf/open/floor/light/colour_cycle/dancefloor_b,
/area/station/maintenance/starboard/central)
+"goj" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/wood,
+/turf/open/floor/stone,
+/area/station/service/bar)
"gom" = (
/obj/effect/turf_decal/stripes/white/line{
dir = 6
@@ -17362,13 +17323,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/plating,
/area/station/maintenance/department/medical/central)
-"gpy" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/item/toy/plush/slimeplushie{
- name = "Nanners"
- },
-/turf/open/floor/engine,
-/area/station/science/xenobiology)
"gpA" = (
/obj/effect/turf_decal/siding/thinplating/terracotta,
/obj/effect/decal/cleanable/dirt,
@@ -17429,6 +17383,14 @@
/obj/effect/turf_decal/tile/purple/opposingcorners,
/turf/open/floor/iron/cafeteria,
/area/station/science/circuits)
+"gqk" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/light/cold/directional/east,
+/obj/effect/turf_decal/tile/neutral,
+/obj/item/radio/intercom/directional/east,
+/obj/structure/disposalpipe/segment,
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/fore)
"gqs" = (
/obj/effect/turf_decal/trimline/blue/filled/line{
dir = 10
@@ -17469,29 +17431,40 @@
/obj/item/radio/intercom/directional/south,
/turf/open/floor/iron/small,
/area/station/medical/storage)
+"gry" = (
+/obj/effect/landmark/start/librarian,
+/turf/open/floor/wood/parquet,
+/area/station/service/library)
"grF" = (
/obj/structure/railing,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/catwalk_floor,
/area/station/maintenance/department/engine/atmos)
-"grH" = (
+"grI" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/turf_decal/tile/dark_red/half/contrasted,
-/obj/machinery/computer/security/telescreen/interrogation/directional/north,
-/obj/structure/cable,
-/turf/open/floor/iron,
-/area/station/security)
-"grI" = (
-/obj/effect/turf_decal/siding/wood{
+/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
- dir = 1
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
},
-/turf/open/floor/wood/tile,
-/area/station/service/bar)
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/aft)
+"gsg" = (
+/obj/effect/turf_decal/siding/thinplating_new/light,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/cable,
+/obj/structure/disposalpipe/segment{
+ dir = 5
+ },
+/obj/machinery/light/small/directional/south,
+/obj/machinery/requests_console/auto_name/directional/south,
+/obj/effect/mapping_helpers/requests_console/supplies,
+/turf/open/floor/iron/white/small,
+/area/station/service/hydroponics)
"gsh" = (
/obj/structure/cable,
/obj/structure/disposalpipe/segment,
@@ -17511,6 +17484,15 @@
/obj/effect/landmark/start/scientist,
/turf/open/floor/iron/white/small,
/area/station/science/lab)
+"gsX" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/disposalpipe/segment{
+ dir = 6
+ },
+/turf/open/floor/plating,
+/area/station/maintenance/port/greater)
"gsY" = (
/turf/open/floor/iron/smooth,
/area/station/engineering/break_room)
@@ -17559,6 +17541,14 @@
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
/turf/open/floor/iron/dark,
/area/station/medical/medbay/central)
+"gtS" = (
+/obj/structure/cable,
+/obj/effect/spawner/random/structure/steam_vent,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/open/floor/plating,
+/area/station/maintenance/central/greater)
"gtU" = (
/obj/effect/turf_decal/stripes/white/line{
dir = 10
@@ -17609,6 +17599,16 @@
/obj/machinery/camera/autoname/directional/south,
/turf/open/floor/iron/dark/small,
/area/station/security/brig)
+"guX" = (
+/obj/machinery/door/firedoor,
+/obj/effect/turf_decal/stripes/red/line{
+ dir = 4
+ },
+/obj/effect/turf_decal/stripes/red/line{
+ dir = 8
+ },
+/turf/open/floor/iron/small,
+/area/station/hallway/primary/central/aft)
"guY" = (
/turf/closed/wall,
/area/station/service/chapel/storage)
@@ -17622,6 +17622,13 @@
/obj/machinery/light_switch/directional/south,
/turf/open/floor/iron/smooth,
/area/station/maintenance/disposal/incinerator)
+"gvT" = (
+/obj/effect/turf_decal/weather/dirt{
+ dir = 1
+ },
+/obj/structure/flora/rock/pile/jungle/style_3,
+/turf/open/floor/grass,
+/area/station/service/chapel)
"gvV" = (
/obj/effect/turf_decal/tile/dark_red/opposingcorners,
/obj/structure/chair/office{
@@ -17631,9 +17638,6 @@
/obj/machinery/light/small/directional/east,
/turf/open/floor/iron,
/area/station/security/brig/entrance)
-"gvY" = (
-/turf/closed/wall/r_wall,
-/area/space)
"gwa" = (
/obj/structure/chair{
dir = 1
@@ -17651,19 +17655,6 @@
/obj/effect/landmark/event_spawn,
/turf/open/floor/iron/small,
/area/station/engineering/atmos/storage/gas)
-"gwx" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/obj/structure/disposalpipe/segment,
-/obj/structure/cable,
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/fore)
"gwQ" = (
/obj/effect/decal/cleanable/dirt,
/obj/item/radio/intercom/directional/east,
@@ -17806,12 +17797,6 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/fore)
-"gyc" = (
-/obj/effect/turf_decal/weather/dirt{
- dir = 8
- },
-/turf/open/floor/grass,
-/area/station/service/chapel)
"gyd" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/structure/window/spawner/directional/east,
@@ -17845,21 +17830,6 @@
/obj/structure/cable,
/turf/open/floor/plating,
/area/station/engineering/supermatter/room)
-"gyx" = (
-/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/dark_red/fourcorners,
-/obj/machinery/newscaster/directional/north,
-/turf/open/floor/iron,
-/area/station/security/brig/entrance)
-"gyy" = (
-/obj/effect/turf_decal/siding/wood,
-/obj/structure/chair/wood{
- dir = 4
- },
-/turf/open/floor/iron/grimy,
-/area/station/service/bar)
"gzs" = (
/obj/effect/turf_decal/stripes/white/line{
dir = 5
@@ -17906,6 +17876,21 @@
/obj/structure/lattice/catwalk,
/turf/open/space/basic,
/area/space/nearstation)
+"gAf" = (
+/obj/structure/table,
+/obj/item/stock_parts/matter_bin{
+ pixel_x = 6;
+ pixel_y = 15
+ },
+/obj/item/stock_parts/matter_bin{
+ pixel_y = 5
+ },
+/obj/item/multitool,
+/obj/item/flatpack{
+ board = /obj/item/circuitboard/machine/flatpacker
+ },
+/turf/open/floor/iron/dark,
+/area/station/science/lab)
"gAn" = (
/obj/structure/railing/corner{
dir = 8
@@ -17926,14 +17911,6 @@
dir = 5
},
/area/station/science/research)
-"gAH" = (
-/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/siding/wood/corner,
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/wood/parquet,
-/area/station/service/library)
"gAJ" = (
/obj/structure/reagent_dispensers/watertank,
/turf/open/floor/iron,
@@ -17957,13 +17934,6 @@
},
/turf/open/space/basic,
/area/space/nearstation)
-"gBg" = (
-/obj/effect/turf_decal/tile/blue/half/contrasted{
- dir = 1
- },
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/iron/white,
-/area/station/medical/medbay/lobby)
"gBh" = (
/turf/closed/mineral/random/stationside,
/area/station/maintenance/department/engine/atmos)
@@ -18034,12 +18004,26 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/smooth,
/area/station/engineering/atmos/office)
+"gBP" = (
+/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/siding/wood/corner,
+/obj/structure/disposalpipe/segment,
+/turf/open/floor/wood/parquet,
+/area/station/service/library)
"gBT" = (
/obj/structure/window/reinforced/spawner/directional/east,
/obj/structure/secure_safe/caps_spare,
/obj/structure/table/glass,
/turf/open/floor/glass/reinforced,
/area/station/command/bridge)
+"gBZ" = (
+/obj/structure/cable,
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/disposalpipe/segment,
+/turf/open/floor/plating,
+/area/station/maintenance/central/greater)
"gCe" = (
/obj/structure/cable,
/obj/machinery/portable_atmospherics/canister/oxygen,
@@ -18054,13 +18038,6 @@
/obj/machinery/camera/autoname/directional/east,
/turf/open/floor/wood/tile,
/area/station/command/bridge)
-"gCl" = (
-/obj/machinery/light/floor,
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/aft)
"gCo" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -18197,6 +18174,18 @@
/obj/structure/closet/firecloset,
/turf/open/floor/plating,
/area/station/maintenance/port/fore)
+"gDU" = (
+/obj/effect/landmark/event_spawn,
+/obj/effect/turf_decal/trimline/neutral/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/neutral/line,
+/obj/structure/cable,
+/obj/structure/disposalpipe/segment{
+ dir = 10
+ },
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/aft)
"gEc" = (
/obj/structure/closet/emcloset,
/turf/open/floor/plating,
@@ -18206,15 +18195,11 @@
/obj/machinery/digital_clock/directional/north,
/turf/open/floor/iron,
/area/station/maintenance/port/aft)
-"gEx" = (
+"gEw" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/airalarm/directional/south,
-/obj/effect/turf_decal/tile/neutral,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/station/hallway/primary/port)
+/obj/effect/landmark/event_spawn,
+/turf/open/floor/wood/tile,
+/area/station/service/bar)
"gEy" = (
/obj/structure/lattice/catwalk,
/obj/structure/railing/corner{
@@ -18316,6 +18301,16 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/medical/medbay/aft)
+"gFJ" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 10
+ },
+/turf/open/floor/iron,
+/area/station/hallway/primary/port)
"gFX" = (
/obj/effect/mapping_helpers/broken_floor,
/obj/effect/decal/cleanable/dirt,
@@ -18370,16 +18365,6 @@
/obj/structure/chair,
/turf/open/floor/wood,
/area/station/cargo/miningfoundry)
-"gGx" = (
-/obj/effect/turf_decal/siding/wood/corner{
- dir = 1
- },
-/obj/item/kirbyplants/random,
-/obj/effect/turf_decal/siding/wood{
- dir = 4
- },
-/turf/open/floor/stone,
-/area/station/service/bar)
"gGB" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -18410,10 +18395,6 @@
/obj/item/melee/chainofcommand,
/turf/open/floor/iron/smooth,
/area/station/command/bridge)
-"gHg" = (
-/obj/machinery/status_display/ai/directional/east,
-/turf/open/floor/glass,
-/area/station/hallway/primary/central/aft)
"gHl" = (
/obj/structure/cable,
/obj/effect/turf_decal/tile/dark_red/half/contrasted{
@@ -18443,6 +18424,13 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/smooth,
/area/station/hallway/secondary/command)
+"gHW" = (
+/obj/structure/window/reinforced/spawner/directional/north,
+/obj/structure/window/reinforced/spawner/directional/south,
+/obj/structure/grille,
+/obj/structure/window/reinforced/spawner/directional/east,
+/turf/open/floor/plating,
+/area/station/hallway/primary/central/fore)
"gIb" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -18475,17 +18463,6 @@
/obj/effect/spawner/random/trash,
/turf/open/floor/plating,
/area/station/maintenance/port/fore)
-"gIv" = (
-/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 = 8
- },
-/obj/effect/turf_decal/siding/wood{
- dir = 4
- },
-/turf/open/floor/stone,
-/area/station/service/bar)
"gIx" = (
/obj/structure/cable,
/obj/structure/disposalpipe/segment{
@@ -18581,13 +18558,6 @@
/obj/machinery/light/small/directional/north,
/turf/open/floor/carpet/royalblue,
/area/station/command/corporate_suite)
-"gJQ" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/table,
-/obj/item/stack/spacecash/c1,
-/obj/item/cigarette/cigar/havana,
-/turf/open/floor/light/colour_cycle/dancefloor_b,
-/area/station/maintenance/starboard/central)
"gJS" = (
/obj/machinery/atmospherics/pipe/smart/simple/general/visible,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -18606,6 +18576,20 @@
/obj/machinery/gateway/centerstation,
/turf/open/floor/catwalk_floor/iron_smooth,
/area/station/command/gateway)
+"gKh" = (
+/obj/machinery/door/firedoor,
+/obj/effect/turf_decal/delivery/red,
+/obj/machinery/door/airlock/medical/glass{
+ id_tag = "MedbayFoyer";
+ name = "Medbay Clinic"
+ },
+/obj/machinery/door/poddoor/shutters/preopen{
+ id = "medlock";
+ name = "Lockdown Shutters"
+ },
+/obj/structure/disposalpipe/segment,
+/turf/open/floor/iron/white/small,
+/area/station/medical/medbay/lobby)
"gKi" = (
/obj/structure/rack,
/obj/effect/spawner/random/maintenance,
@@ -18618,6 +18602,16 @@
/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible,
/turf/closed/wall/r_wall,
/area/station/engineering/hallway)
+"gKC" = (
+/obj/structure/cable,
+/obj/structure/disposalpipe/segment{
+ dir = 5
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/plating,
+/area/station/maintenance/port/greater)
"gKE" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/broken_flooring/pile/directional/east,
@@ -18659,24 +18653,6 @@
"gLb" = (
/turf/closed/wall,
/area/station/medical/virology)
-"gLg" = (
-/obj/effect/turf_decal/siding/wood,
-/obj/machinery/camera/autoname/directional/north,
-/obj/structure/cable,
-/obj/structure/sign/painting/large/library{
- dir = 1
- },
-/turf/open/floor/wood/parquet,
-/area/station/service/library)
-"gLo" = (
-/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{
- dir = 6
- },
-/turf/open/floor/plating,
-/area/station/maintenance/central/greater)
"gLr" = (
/obj/structure/disposalpipe/segment{
dir = 6
@@ -18703,6 +18679,41 @@
/obj/effect/turf_decal/siding/wideplating/dark,
/turf/open/floor/iron,
/area/station/security)
+"gLz" = (
+/obj/structure/disposalpipe/segment,
+/obj/effect/turf_decal/trimline/neutral/line{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/neutral/line{
+ dir = 8
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/merge_conflict_marker{
+ name = "---Merge Conflict Marker---";
+
+ desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
+ },
+/obj/structure/disposalpipe/segment,
+/obj/effect/turf_decal/trimline/neutral/line{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/neutral/line{
+ dir = 8
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/structure/cable,
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/fore)
+"gLK" = (
+/obj/effect/turf_decal/tile/neutral/opposingcorners,
+/obj/effect/spawner/random/entertainment/arcade,
+/obj/effect/decal/cleanable/cobweb/cobweb2,
+/turf/open/floor/iron,
+/area/station/holodeck/rec_center)
"gLM" = (
/obj/structure/table/glass,
/obj/effect/turf_decal/tile/neutral/fourcorners,
@@ -18716,29 +18727,6 @@
/obj/machinery/airalarm/directional/east,
/turf/open/floor/iron/smooth,
/area/station/command/bridge)
-"gLO" = (
-/obj/effect/turf_decal/plaque{
- icon_state = "L11";
- pixel_y = -15
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/aft)
-"gLV" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/effect/spawner/random/trash,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/plating,
-/area/station/maintenance/port/greater)
"gLY" = (
/obj/effect/spawner/structure/window/reinforced/tinted,
/turf/open/floor/plating,
@@ -18789,20 +18777,6 @@
/obj/effect/landmark/start/hangover,
/turf/open/floor/iron,
/area/station/hallway/secondary/recreation)
-"gMM" = (
-/obj/machinery/door/firedoor,
-/obj/effect/turf_decal/delivery/red,
-/obj/machinery/door/airlock/medical/glass{
- id_tag = "MedbayFoyer";
- name = "Medbay Clinic"
- },
-/obj/machinery/door/poddoor/shutters/preopen{
- id = "medlock";
- name = "Lockdown Shutters"
- },
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/iron/white/small,
-/area/station/medical/medbay/lobby)
"gMQ" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/displaycase/labcage,
@@ -18824,15 +18798,6 @@
},
/turf/open/floor/catwalk_floor/iron,
/area/station/science/xenobiology)
-"gMX" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/disposalpipe/segment{
- dir = 6
- },
-/turf/open/floor/plating,
-/area/station/maintenance/port/greater)
"gNb" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
@@ -18869,17 +18834,6 @@
/obj/structure/cable,
/turf/open/floor/wood,
/area/station/engineering/atmos)
-"gNP" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/station/hallway/primary/port)
"gNS" = (
/obj/effect/turf_decal/tile/brown/opposingcorners,
/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{
@@ -18898,13 +18852,6 @@
"gOm" = (
/turf/closed/wall/r_wall,
/area/station/ai_monitored/turret_protected/aisat/equipment)
-"gOt" = (
-/obj/structure/flora/tree/jungle/small/style_2,
-/obj/effect/turf_decal/weather/dirt{
- dir = 1
- },
-/turf/open/floor/grass,
-/area/station/service/chapel)
"gOw" = (
/obj/effect/turf_decal/tile/dark_red/opposingcorners,
/obj/structure/chair{
@@ -18955,13 +18902,6 @@
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/engine,
/area/station/engineering/atmos)
-"gPm" = (
-/obj/machinery/computer/monitor{
- dir = 1
- },
-/obj/machinery/computer/security/telescreen/minisat/directional/south,
-/turf/open/floor/iron/smooth,
-/area/station/ai_monitored/turret_protected/aisat/equipment)
"gPN" = (
/obj/structure/fermenting_barrel,
/turf/open/floor/plating,
@@ -19026,11 +18966,6 @@
/obj/structure/cable,
/turf/open/floor/iron/small,
/area/station/engineering/supermatter/room)
-"gRm" = (
-/obj/structure/flora/bush/flowers_br,
-/obj/structure/flora/bush/flowers_pp/style_random,
-/turf/open/floor/grass,
-/area/station/service/chapel)
"gRp" = (
/obj/effect/mapping_helpers/airlock/access/all/security/general,
/obj/machinery/door/airlock/security{
@@ -19040,25 +18975,6 @@
dir = 1
},
/area/station/security/tram)
-"gRG" = (
-/obj/structure/toilet{
- dir = 8
- },
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
- dir = 8
- },
-/obj/machinery/camera/autoname/directional/east,
-/obj/machinery/light_switch/directional/east,
-/turf/open/floor/iron/freezer,
-/area/station/command/heads_quarters/captain/private)
-"gRH" = (
-/obj/machinery/button/door/directional/north{
- id = "Cabin4";
- name = "Cabin Bolt Control";
- normaldoorcontrol = 1
- },
-/turf/closed/wall,
-/area/station/service/abandoned_gambling_den)
"gRL" = (
/obj/structure/disposalpipe/segment{
dir = 6
@@ -19067,6 +18983,43 @@
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/iron,
/area/station/commons/storage/tools)
+"gRR" = (
+/obj/structure/sign/directions/evac/directional/west,
+/obj/structure/sign/directions/science/directional/west{
+ dir = 4;
+ pixel_y = -8
+ },
+/obj/structure/sign/directions/security/directional/west{
+ pixel_y = 8
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/machinery/door/firedoor,
+/obj/effect/turf_decal/stripes/red/line,
+/obj/effect/turf_decal/stripes/red/line{
+ dir = 1
+ },
+/obj/merge_conflict_marker{
+ name = "---Merge Conflict Marker---";
+
+ desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
+ },
+/obj/structure/sign/directions/evac/directional/west,
+/obj/structure/sign/directions/science/directional/west{
+ dir = 4;
+ pixel_y = -8
+ },
+/obj/structure/sign/directions/security/directional/west{
+ pixel_y = 8
+ },
+/obj/machinery/door/firedoor,
+/obj/effect/turf_decal/stripes/red/line,
+/obj/effect/turf_decal/stripes/red/line{
+ dir = 1
+ },
+/turf/open/floor/iron/small,
+/area/station/hallway/primary/central/fore)
"gRX" = (
/obj/machinery/newscaster/directional/south,
/obj/structure/broken_flooring/singular/directional/east,
@@ -19153,6 +19106,42 @@
/obj/effect/landmark/start/scientist,
/turf/open/floor/iron/grimy,
/area/station/science/cubicle)
+"gTd" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/door/airlock{
+ name = "Library Maintenance"
+ },
+/obj/effect/mapping_helpers/airlock/access/any/service/maintenance,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/cable,
+/obj/effect/mapping_helpers/airlock/unres{
+ dir = 4
+ },
+/obj/merge_conflict_marker{
+ name = "---Merge Conflict Marker---";
+
+ desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/door/airlock{
+ name = "Library Maintenance"
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/cable,
+/obj/effect/mapping_helpers/airlock/unres{
+ dir = 4
+ },
+/obj/effect/mapping_helpers/airlock/access/any/service/maintenance,
+/turf/open/floor/plating,
+/area/station/service/library)
"gTe" = (
/obj/structure/cable,
/obj/machinery/power/terminal{
@@ -19274,11 +19263,6 @@
/obj/effect/turf_decal/tile/blue/half/contrasted,
/turf/open/floor/iron/white,
/area/station/security/medical)
-"gUN" = (
-/obj/effect/turf_decal/weather/dirt,
-/obj/structure/flora/tree/jungle/style_5,
-/turf/open/floor/grass,
-/area/station/service/chapel)
"gUV" = (
/obj/structure/cable,
/obj/structure/chair/stool/directional/south{
@@ -19313,26 +19297,22 @@
/obj/effect/spawner/random/structure/grille,
/turf/open/floor/iron,
/area/station/maintenance/port/aft)
-"gVL" = (
-/obj/effect/turf_decal/weather/dirt{
- dir = 1
- },
-/obj/structure/flora/bush/sparsegrass,
-/turf/open/floor/grass,
-/area/station/service/chapel)
"gVW" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/light/small/directional/east,
/turf/open/floor/wood/large,
/area/station/command/corporate_suite)
+"gVX" = (
+/obj/structure/flora/grass/jungle/b/style_3,
+/obj/effect/turf_decal/weather/dirt{
+ dir = 1
+ },
+/obj/structure/cable,
+/turf/open/floor/grass,
+/area/station/service/chapel)
"gWb" = (
/turf/closed/wall,
/area/station/command/heads_quarters/hos)
-"gWf" = (
-/obj/effect/spawner/random/medical/two_percent_xeno_egg_spawner,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/engine,
-/area/station/science/xenobiology)
"gWk" = (
/obj/effect/turf_decal/siding/wood,
/obj/effect/turf_decal/siding/wood{
@@ -19356,6 +19336,15 @@
},
/turf/open/floor/catwalk_floor,
/area/station/engineering/break_room)
+"gWx" = (
+/obj/machinery/disposal/bin,
+/obj/effect/turf_decal/bot,
+/obj/structure/disposalpipe/trunk{
+ dir = 1
+ },
+/obj/machinery/power/apc/auto_name/directional/south,
+/turf/open/floor/iron,
+/area/station/hallway/primary/port)
"gWB" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -19364,6 +19353,13 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/iron,
/area/station/security/processing)
+"gWF" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 4
+ },
+/obj/structure/bookcase/random,
+/turf/open/floor/wood/parquet,
+/area/station/service/library)
"gWJ" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -19400,6 +19396,9 @@
/obj/machinery/status_display/ai/directional/north,
/turf/open/floor/iron/cafeteria,
/area/station/science/breakroom)
+"gXJ" = (
+/turf/open/floor/iron/white/side,
+/area/station/hallway/primary/central/aft)
"gXL" = (
/obj/structure/cable,
/obj/machinery/door/airlock{
@@ -19432,6 +19431,13 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/dark,
/area/station/maintenance/starboard/greater)
+"gYr" = (
+/obj/effect/turf_decal/weather/dirt{
+ dir = 6
+ },
+/obj/structure/flora/bush/sparsegrass,
+/turf/open/floor/grass,
+/area/station/service/chapel)
"gYH" = (
/obj/machinery/vending/wardrobe/robo_wardrobe,
/turf/open/floor/catwalk_floor/flat_white,
@@ -19524,6 +19530,17 @@
},
/turf/open/floor/plating,
/area/station/maintenance/port/fore)
+"haf" = (
+/obj/effect/spawner/structure/window/reinforced,
+/turf/open/floor/plating,
+/area/station/tcommsat/server)
+"hag" = (
+/obj/effect/turf_decal/weather/dirt,
+/obj/machinery/light/small/directional/south,
+/obj/item/radio/intercom/directional/south,
+/obj/structure/flora/bush/flowers_yw,
+/turf/open/floor/grass,
+/area/station/service/chapel)
"haq" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -19536,14 +19553,6 @@
/obj/machinery/light/cold/directional/south,
/turf/open/floor/iron/dark,
/area/station/medical/medbay/central)
-"haH" = (
-/obj/machinery/food_cart,
-/obj/effect/turf_decal/weather/snow/corner{
- dir = 9
- },
-/obj/effect/turf_decal/weather/snow,
-/turf/open/floor/iron/freezer,
-/area/station/service/kitchen/coldroom)
"haO" = (
/obj/effect/turf_decal/stripes/white/end,
/obj/machinery/door/poddoor/shutters{
@@ -19743,6 +19752,22 @@
/obj/effect/turf_decal/siding/yellow,
/turf/open/floor/wood/tile,
/area/station/command/bridge)
+"hcJ" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/turf_decal/siding/wood{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/wood{
+ dir = 4
+ },
+/obj/machinery/door/airlock/maintenance{
+ name = "Crematorium"
+ },
+/obj/effect/mapping_helpers/airlock/access/all/service/chapel_office,
+/turf/open/floor/iron/textured_half{
+ dir = 8
+ },
+/area/station/service/chapel/storage)
"hcT" = (
/obj/machinery/computer/slot_machine{
pixel_y = 2
@@ -19761,6 +19786,18 @@
/obj/machinery/airalarm/directional/east,
/turf/open/floor/iron/dark/small,
/area/station/science/xenobiology)
+"hcX" = (
+/obj/structure/table,
+/obj/item/stack/package_wrap,
+/obj/item/hand_labeler,
+/obj/effect/turf_decal/tile/brown/opposingcorners{
+ dir = 1
+ },
+/obj/machinery/power/apc/auto_name/directional/east,
+/obj/structure/cable,
+/obj/machinery/light/cold/directional/east,
+/turf/open/floor/iron,
+/area/station/commons/vacant_room/commissary)
"hcY" = (
/obj/structure/table,
/obj/item/paper_bin{
@@ -19822,18 +19859,6 @@
},
/turf/open/floor/catwalk_floor/iron_smooth,
/area/station/command/bridge)
-"hdI" = (
-/obj/structure/table/wood,
-/obj/item/pai_card,
-/obj/item/storage/crayons,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/firealarm/directional/north,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/wood/parquet,
-/area/station/service/library)
"hdQ" = (
/obj/effect/turf_decal/tile/yellow/half/contrasted{
dir = 4
@@ -19850,23 +19875,12 @@
/obj/effect/spawner/structure/window/reinforced/plasma,
/turf/open/floor/plating,
/area/station/engineering/supermatter/room)
-"hdW" = (
-/obj/machinery/power/apc/auto_name/directional/east,
-/obj/machinery/camera/autoname/directional/east,
-/obj/effect/spawner/random/entertainment/arcade{
+"hdX" = (
+/obj/effect/turf_decal/siding/wood{
dir = 8
},
-/obj/effect/turf_decal/siding/thinplating{
- dir = 4
- },
-/obj/structure/cable,
-/turf/open/floor/eighties/red,
-/area/station/hallway/primary/central/fore)
-"hdZ" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/cable,
-/turf/open/floor/plating,
-/area/station/maintenance/central/lesser)
+/turf/open/floor/wood/parquet,
+/area/station/service/library)
"hei" = (
/obj/structure/cable,
/obj/effect/spawner/structure/window/reinforced,
@@ -19957,12 +19971,6 @@
},
/turf/open/floor/iron,
/area/station/science/ordnance/testlab)
-"heY" = (
-/obj/effect/turf_decal/tile/dark_red/opposingcorners,
-/obj/machinery/computer/security,
-/obj/machinery/computer/security/telescreen/prison/directional/north,
-/turf/open/floor/iron,
-/area/station/security/warden)
"hfc" = (
/obj/structure/rack,
/obj/effect/spawner/random/maintenance/three,
@@ -19987,6 +19995,16 @@
},
/turf/open/floor/wood/tile,
/area/station/tcommsat/server)
+"hfM" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/light/cold/directional/west,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/machinery/firealarm/directional/west,
+/obj/structure/disposalpipe/segment,
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/fore)
"hfZ" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
/turf/open/floor/iron/dark/side{
@@ -20128,12 +20146,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
/area/station/maintenance/fore/greater)
-"hhZ" = (
-/obj/structure/railing{
- dir = 8
- },
-/turf/open/space/basic,
-/area/space)
"hic" = (
/obj/machinery/holopad,
/turf/open/floor/wood/large,
@@ -20167,22 +20179,6 @@
},
/turf/open/floor/iron/small,
/area/station/security/office)
-"hiD" = (
-/obj/machinery/door/airlock/multi_tile/public{
- dir = 1
- },
-/obj/machinery/door/firedoor,
-/turf/open/floor/iron/textured_half,
-/area/station/service/bar)
-"hiK" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/turf_decal/tile/neutral,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/station/hallway/primary/port)
"hiU" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron,
@@ -20223,6 +20219,24 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/dark/small,
/area/station/medical/morgue)
+"hjC" = (
+/obj/effect/turf_decal/siding/thinplating_new/light{
+ dir = 8
+ },
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+ dir = 4
+ },
+/turf/open/floor/iron/white/small,
+/area/station/service/hydroponics)
+"hjJ" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/cable,
+/obj/structure/disposalpipe/junction{
+ dir = 1
+ },
+/turf/open/floor/wood/parquet,
+/area/station/service/library)
"hjQ" = (
/obj/structure/disposalpipe/segment,
/obj/effect/turf_decal/tile/neutral{
@@ -20230,6 +20244,14 @@
},
/turf/open/floor/iron,
/area/station/engineering/lobby)
+"hka" = (
+/obj/machinery/food_cart,
+/obj/effect/turf_decal/weather/snow/corner{
+ dir = 9
+ },
+/obj/effect/turf_decal/weather/snow,
+/turf/open/floor/iron/freezer,
+/area/station/service/kitchen/coldroom)
"hkk" = (
/obj/machinery/computer/records/medical{
dir = 4
@@ -20261,6 +20283,14 @@
},
/turf/open/floor/iron/small,
/area/station/medical/morgue)
+"hku" = (
+/obj/effect/spawner/random/trash,
+/obj/structure/cable,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/open/floor/plating,
+/area/station/maintenance/central/greater)
"hky" = (
/obj/item/kirbyplants/organic/applebush,
/obj/effect/turf_decal/tile/red{
@@ -20334,20 +20364,20 @@
/obj/machinery/status_display/ai/directional/west,
/turf/open/floor/iron/dark/herringbone,
/area/station/ai_monitored/command/nuke_storage)
-"hla" = (
-/obj/machinery/door/airlock/public/glass{
- name = "Public Shrine"
- },
-/obj/effect/turf_decal/siding/wood/end,
-/obj/machinery/door/firedoor,
-/turf/open/floor/stone,
-/area/station/hallway/primary/port)
"hlE" = (
/obj/effect/turf_decal/siding/wideplating/dark{
dir = 4
},
/turf/open/floor/iron,
/area/station/commons/fitness/locker_room)
+"hlH" = (
+/obj/structure/table/wood,
+/obj/machinery/computer/libraryconsole/bookmanagement{
+ dir = 1;
+ pixel_y = 5
+ },
+/turf/open/floor/carpet,
+/area/station/service/library)
"hlJ" = (
/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{
dir = 4
@@ -20435,12 +20465,9 @@
/turf/open/floor/iron/dark,
/area/station/engineering/atmospherics_engine)
"hmC" = (
-/obj/effect/turf_decal/siding/wood/corner,
-/obj/effect/turf_decal/siding/wood/corner{
- dir = 1
- },
-/turf/open/floor/stone,
-/area/station/service/chapel)
+/obj/effect/spawner/random/trash,
+/turf/open/floor/plating,
+/area/station/maintenance/port/greater)
"hmQ" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/structure/table,
@@ -20462,6 +20489,13 @@
},
/turf/open/floor/iron/dark,
/area/station/commons/storage/tools)
+"hnb" = (
+/obj/machinery/disposal/bin,
+/obj/structure/disposalpipe/trunk{
+ dir = 8
+ },
+/turf/open/floor/wood/parquet,
+/area/station/service/library)
"hnf" = (
/obj/item/bikehorn/rubberducky{
pixel_x = -6;
@@ -20473,13 +20507,6 @@
},
/turf/open/floor/plating,
/area/station/maintenance/starboard/greater)
-"hnn" = (
-/obj/effect/turf_decal/tile/brown/opposingcorners{
- dir = 1
- },
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/iron,
-/area/station/commons/vacant_room/commissary)
"hnG" = (
/obj/machinery/atmospherics/components/unary/thermomachine/heater/on{
dir = 8;
@@ -20531,16 +20558,13 @@
},
/turf/open/floor/plating,
/area/station/engineering/gravity_generator)
-"hoc" = (
-/obj/structure/disposalpipe/segment{
- dir = 6
- },
-/obj/item/radio/intercom/directional/west,
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
+"hoj" = (
+/obj/structure/chair/comfy/black{
+ dir = 1
},
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/aft)
+/obj/effect/landmark/start/chaplain,
+/turf/open/floor/carpet/lone,
+/area/station/service/chapel/office)
"hok" = (
/obj/structure/cable,
/obj/structure/disposalpipe/segment,
@@ -20620,6 +20644,10 @@
},
/turf/open/floor/grass,
/area/station/medical/virology)
+"hpL" = (
+/obj/effect/spawner/structure/window/reinforced,
+/turf/open/floor/plating,
+/area/station/ai_monitored/command/nuke_storage)
"hpM" = (
/obj/effect/turf_decal/siding,
/turf/open/floor/iron/white,
@@ -20639,6 +20667,16 @@
},
/turf/open/floor/stone,
/area/station/command/corporate_suite)
+"hpY" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 6
+ },
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/fore)
"hqc" = (
/obj/structure/cable,
/obj/effect/turf_decal/stripes/line{
@@ -20714,10 +20752,6 @@
},
/turf/open/floor/plating,
/area/station/maintenance/hallway/abandoned_command)
-"hrc" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/aft)
"hrx" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -20795,6 +20829,11 @@
/obj/machinery/door/firedoor,
/turf/open/floor/iron/small,
/area/station/hallway/primary/fore)
+"hsd" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/landmark/start/cook,
+/turf/open/floor/iron/kitchen/small,
+/area/station/service/kitchen)
"hss" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -20802,11 +20841,15 @@
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/iron/small,
/area/station/engineering/break_room)
-"hsx" = (
+"hsw" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/light/floor,
-/turf/open/floor/stone,
-/area/station/service/bar)
+/obj/structure/disposalpipe/segment,
+/turf/open/floor/wood/parquet,
+/area/station/service/library)
"hsy" = (
/obj/structure/railing/corner{
dir = 4
@@ -20846,6 +20889,10 @@
/obj/effect/spawner/structure/window,
/turf/open/floor/plating,
/area/station/hallway/secondary/command)
+"hsY" = (
+/obj/structure/flora/bush/sparsegrass,
+/turf/open/floor/grass,
+/area/station/service/chapel)
"hsZ" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
@@ -20904,6 +20951,14 @@
/obj/structure/cable,
/turf/open/floor/plating,
/area/station/maintenance/department/science/xenobiology)
+"huf" = (
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/turf_decal/tile/neutral,
+/obj/structure/sign/departments/court/directional/east,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/fore)
"huh" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -20917,17 +20972,6 @@
/obj/structure/sign/poster/official/random/directional/west,
/turf/open/floor/iron/smooth,
/area/station/commons/storage/tools)
-"huj" = (
-/obj/structure/disposalpipe/segment{
- dir = 5
- },
-/obj/effect/turf_decal/trimline/neutral/line{
- dir = 1
- },
-/obj/effect/turf_decal/trimline/neutral/line,
-/obj/structure/cable,
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/aft)
"hur" = (
/obj/structure/table/glass,
/obj/item/storage/briefcase/secure,
@@ -21032,6 +21076,12 @@
},
/turf/open/floor/iron/white/small,
/area/station/science/ordnance/storage)
+"hwk" = (
+/obj/structure/chair/wood{
+ dir = 8
+ },
+/turf/open/floor/iron/grimy,
+/area/station/service/bar)
"hwn" = (
/obj/machinery/light_switch/directional/east,
/turf/open/floor/iron/showroomfloor,
@@ -21085,6 +21135,25 @@
"hwJ" = (
/turf/closed/wall/rust,
/area/space/nearstation)
+"hwR" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/merge_conflict_marker{
+ name = "---Merge Conflict Marker---";
+
+ desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/structure/cable,
+/turf/open/floor/plating,
+/area/station/maintenance/central/greater)
"hwZ" = (
/obj/structure/chair/bronze{
dir = 8
@@ -21139,6 +21208,24 @@
dir = 8
},
/area/station/engineering/supermatter/room)
+"hxL" = (
+/obj/structure/disposalpipe/segment,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/merge_conflict_marker{
+ name = "---Merge Conflict Marker---";
+
+ desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
+ },
+/obj/structure/disposalpipe/segment,
+/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,
+/area/station/hallway/primary/central/aft)
"hxQ" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
dir = 4
@@ -21162,6 +21249,19 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/smooth,
/area/station/cargo/warehouse)
+"hyg" = (
+/obj/machinery/vending/hydronutrients,
+/obj/effect/turf_decal/tile/green/opposingcorners,
+/obj/effect/turf_decal/tile/blue/opposingcorners{
+ dir = 8
+ },
+/obj/effect/turf_decal/delivery/white{
+ color = "#52B4E9"
+ },
+/obj/item/radio/intercom/directional/north,
+/obj/machinery/firealarm/directional/east,
+/turf/open/floor/iron,
+/area/station/service/hydroponics)
"hyi" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -21205,16 +21305,6 @@
/obj/structure/steam_vent,
/turf/open/floor/plating,
/area/station/maintenance/port/fore)
-"hyW" = (
-/obj/effect/turf_decal/weather/dirt{
- dir = 10
- },
-/obj/effect/turf_decal/weather/dirt{
- dir = 9
- },
-/obj/structure/flora/bush/flowers_pp/style_random,
-/turf/open/floor/grass,
-/area/station/service/chapel)
"hyX" = (
/obj/structure/window/spawner/directional/north,
/obj/machinery/hydroponics/soil,
@@ -21233,21 +21323,22 @@
"hzm" = (
/turf/closed/wall/rust,
/area/station/cargo/miningoffice)
-"hzp" = (
+"hzK" = (
+/obj/structure/disposalpipe/segment,
+/turf/open/floor/plating,
+/area/station/maintenance/starboard/aft)
+"hzM" = (
+/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/turf_decal/trimline/neutral/line,
/obj/effect/turf_decal/trimline/neutral/line{
- dir = 1
- },
-/obj/structure/disposalpipe/segment{
dir = 4
},
+/obj/effect/turf_decal/trimline/neutral/line{
+ dir = 8
+ },
+/obj/structure/cable,
/turf/open/floor/iron,
-/area/station/hallway/primary/port)
-"hzK" = (
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/plating,
-/area/station/maintenance/starboard/aft)
+/area/station/hallway/primary/central/fore)
"hzV" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/cable,
@@ -21268,12 +21359,6 @@
/obj/effect/mapping_helpers/airlock/access/any/medical/maintenance,
/turf/open/floor/plating,
/area/station/maintenance/department/medical/central)
-"hAB" = (
-/obj/effect/turf_decal/siding/wood{
- dir = 10
- },
-/turf/open/floor/stone,
-/area/station/service/chapel)
"hAC" = (
/obj/machinery/light/small/directional/east,
/turf/open/floor/iron/dark/small,
@@ -21356,17 +21441,6 @@
/obj/machinery/airalarm/directional/west,
/turf/open/floor/iron,
/area/station/maintenance/hallway/abandoned_command)
-"hCd" = (
-/obj/effect/turf_decal/tile/dark_red/half/contrasted{
- dir = 4
- },
-/mob/living/simple_animal/bot/secbot/beepsky/officer,
-/obj/effect/turf_decal/siding/wideplating/dark/corner{
- dir = 8
- },
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/iron,
-/area/station/security)
"hCl" = (
/obj/machinery/firealarm/directional/south,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
@@ -21459,10 +21533,31 @@
},
/turf/open/floor/plating,
/area/station/ai_monitored/command/storage/eva)
+"hDL" = (
+/obj/effect/turf_decal/trimline/neutral/line,
+/obj/effect/turf_decal/trimline/neutral/line{
+ dir = 1
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/structure/disposalpipe/segment,
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/aft)
"hDN" = (
/obj/effect/spawner/structure/window/reinforced/tinted,
/turf/open/floor/plating,
/area/station/security/interrogation)
+"hDO" = (
+/obj/structure/window/spawner/directional/west,
+/obj/structure/flora/bush/large/style_random{
+ pixel_x = -17;
+ pixel_y = 2
+ },
+/obj/structure/flora/bush/flowers_yw/style_random,
+/obj/structure/window/spawner/directional/east,
+/turf/open/floor/grass,
+/area/station/service/hydroponics)
"hDT" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/effect/turf_decal/tile/neutral{
@@ -21514,22 +21609,6 @@
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/iron/smooth,
/area/station/engineering/engine_smes)
-"hEu" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/disposalpipe/segment,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating,
-/area/station/maintenance/port/greater)
-"hEw" = (
-/obj/effect/turf_decal/tile/neutral/opposingcorners,
-/obj/machinery/light/small/directional/east,
-/obj/structure/chair/stool/bar/directional/north,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/landmark/start/hangover,
-/turf/open/floor/iron,
-/area/station/holodeck/rec_center)
"hED" = (
/obj/structure/cable,
/obj/structure/disposalpipe/segment,
@@ -21537,9 +21616,12 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/smooth,
/area/station/hallway/secondary/command)
-"hEJ" = (
-/turf/open/floor/iron/smooth,
-/area/station/service/library)
+"hEW" = (
+/obj/effect/turf_decal/siding/wideplating_new/terracotta{
+ dir = 1
+ },
+/turf/open/floor/wood/tile,
+/area/station/maintenance/central/lesser)
"hFb" = (
/obj/structure/cable,
/obj/structure/disposalpipe/segment{
@@ -21548,6 +21630,15 @@
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plating,
/area/station/maintenance/department/engine)
+"hFl" = (
+/obj/structure/table/wood,
+/obj/machinery/light/small/directional/south,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/siding/wideplating_new/terracotta{
+ dir = 10
+ },
+/turf/open/floor/wood/tile,
+/area/station/maintenance/central/lesser)
"hFp" = (
/obj/structure/chair/sofa/bench/right{
dir = 8
@@ -21557,6 +21648,16 @@
/obj/effect/landmark/start/hangover,
/turf/open/floor/iron,
/area/station/hallway/primary/fore)
+"hFs" = (
+/obj/structure/chair/office{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/cable,
+/obj/structure/disposalpipe/segment,
+/turf/open/floor/wood/parquet,
+/area/station/service/library)
"hFx" = (
/turf/open/floor/iron/chapel{
dir = 1
@@ -21590,6 +21691,16 @@
},
/turf/open/floor/iron/small,
/area/station/engineering/atmos)
+"hFP" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/machinery/light/warm/dim,
+/obj/structure/extinguisher_cabinet/directional/south,
+/obj/machinery/camera/autoname/directional/south,
+/obj/effect/turf_decal/tile/neutral,
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/aft)
"hFR" = (
/obj/effect/turf_decal/siding/red{
dir = 9
@@ -21614,10 +21725,6 @@
},
/turf/open/floor/wood,
/area/station/engineering/main)
-"hGr" = (
-/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/plating,
-/area/station/tcommsat/server)
"hGt" = (
/obj/effect/turf_decal/tile/blue{
dir = 1
@@ -21631,6 +21738,16 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/stairs,
/area/station/medical/medbay/central)
+"hGM" = (
+/obj/structure/disposalpipe/segment,
+/turf/closed/wall,
+/area/station/maintenance/hallway/abandoned_command)
+"hGS" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 5
+ },
+/turf/open/floor/stone,
+/area/station/service/chapel)
"hHf" = (
/obj/structure/table/reinforced,
/obj/item/paper_bin{
@@ -21640,31 +21757,25 @@
/obj/structure/sign/departments/telecomms/directional/south,
/turf/open/floor/iron,
/area/station/science/lobby)
-"hHj" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/disposalpipe/sorting/mail{
- dir = 4
+"hHv" = (
+/obj/machinery/camera/autoname/directional/north,
+/obj/effect/turf_decal/siding/thinplating_new/light{
+ dir = 1
},
-/obj/effect/mapping_helpers/mail_sorting/service/bar,
-/turf/open/floor/plating,
-/area/station/maintenance/central/greater)
-"hHn" = (
-/obj/effect/turf_decal/weather/snow,
-/obj/structure/closet/secure_closet/freezer/fridge,
-/obj/effect/turf_decal/weather/snow/corner,
-/obj/item/food/meat/bacon,
-/obj/item/food/meat/bacon,
-/obj/item/food/meat/slab/monkey,
-/obj/item/food/meat/slab/monkey,
-/obj/item/food/meat/slab/monkey,
-/turf/open/floor/iron/freezer,
-/area/station/service/kitchen/coldroom)
-"hHy" = (
-/obj/effect/turf_decal/siding/wood{
- dir = 8
+/obj/machinery/firealarm/directional/north,
+/obj/machinery/disposal/bin,
+/obj/structure/disposalpipe/trunk,
+/turf/open/floor/iron/white/small,
+/area/station/service/hydroponics)
+"hHB" = (
+/obj/effect/turf_decal/weather/dirt{
+ dir = 10
},
-/turf/open/floor/stone,
+/obj/structure/flora/bush/sparsegrass{
+ pixel_x = -5;
+ pixel_y = 9
+ },
+/turf/open/floor/grass,
/area/station/service/chapel)
"hHE" = (
/obj/effect/turf_decal/bot_white,
@@ -21698,12 +21809,22 @@
},
/turf/open/floor/iron/smooth,
/area/station/command/gateway)
-"hIm" = (
-/obj/machinery/libraryscanner,
-/obj/machinery/camera/autoname/directional/north,
-/obj/machinery/airalarm/directional/north,
-/turf/open/floor/wood/parquet,
-/area/station/service/library)
+"hIk" = (
+/obj/structure/table/reinforced,
+/obj/machinery/door/window/left/directional/south{
+ name = "Hydroponics Desk"
+ },
+/obj/machinery/door/firedoor,
+/obj/item/paper/guides/jobs/hydroponics,
+/obj/item/pen{
+ pixel_x = 4
+ },
+/obj/machinery/door/window/right/directional/north{
+ name = "Hydroponics Desk";
+ req_access = list("hydroponics")
+ },
+/turf/open/floor/plating,
+/area/station/service/hydroponics)
"hIE" = (
/obj/structure/table/glass,
/obj/machinery/light/small/directional/east,
@@ -21805,6 +21926,13 @@
/obj/effect/landmark/start/hangover,
/turf/open/floor/iron/grimy,
/area/station/hallway/secondary/entry)
+"hKD" = (
+/obj/effect/landmark/start/chaplain,
+/obj/effect/turf_decal/siding/wood{
+ dir = 4
+ },
+/turf/open/floor/stone,
+/area/station/service/chapel)
"hKR" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
@@ -21817,21 +21945,9 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/dark/small,
/area/station/security/detectives_office)
-"hKV" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/obj/effect/landmark/start/hangover,
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/fore)
"hKX" = (
/turf/closed/mineral/random/stationside,
/area/station/hallway/primary/fore)
-"hKZ" = (
-/obj/structure/flora/bush/jungle/a/style_random,
-/turf/open/floor/grass,
-/area/station/service/chapel)
"hLa" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -21840,17 +21956,31 @@
/obj/machinery/door/firedoor,
/turf/open/floor/iron/dark,
/area/station/medical/medbay/aft)
-"hLb" = (
-/obj/machinery/holopad,
-/turf/open/floor/iron/white/small,
-/area/station/service/hydroponics)
"hLc" = (
/turf/open/floor/plating,
/area/station/science/xenobiology)
+"hLe" = (
+/obj/machinery/door/airlock{
+ id_tag = "commiss2";
+ name = "Commissary"
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/door/firedoor,
+/turf/open/floor/iron/textured_half,
+/area/station/commons/vacant_room/commissary)
"hLm" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/smooth,
/area/station/cargo/office)
+"hLz" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/turf_decal/siding/thinplating{
+ dir = 6
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/eighties,
+/area/station/hallway/primary/central/fore)
"hLD" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/components/tank/air{
@@ -21920,12 +22050,35 @@
},
/turf/open/floor/wood/tile,
/area/station/command/heads_quarters/hop)
+"hMl" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/turf_decal/tile/neutral,
+/obj/machinery/status_display/evac/directional/south,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/open/floor/iron,
+/area/station/hallway/primary/port)
"hMr" = (
/obj/effect/turf_decal/tile/dark_red/opposingcorners,
/obj/structure/closet/secure_closet/security/sec,
/obj/structure/sign/poster/official/random/directional/north,
/turf/open/floor/iron,
/area/station/security/lockers)
+"hMt" = (
+/obj/structure/table,
+/obj/item/storage/bag/tray,
+/obj/item/knife/kitchen{
+ pixel_y = 2
+ },
+/obj/merge_conflict_marker{
+ name = "---Merge Conflict Marker---";
+
+ desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
+ },
+/obj/structure/table,
+/turf/open/floor/iron/kitchen/small,
+/area/station/service/kitchen)
"hMA" = (
/obj/machinery/status_display/ai/directional/east,
/turf/open/floor/iron,
@@ -21936,25 +22089,11 @@
/obj/machinery/light/cold/directional/west,
/turf/open/floor/iron/smooth,
/area/station/command/bridge)
-"hML" = (
-/obj/effect/landmark/start/hangover,
-/turf/open/floor/glass,
-/area/station/hallway/primary/central/aft)
"hNb" = (
/obj/effect/turf_decal/tile/brown/opposingcorners,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
/turf/open/floor/iron,
/area/station/cargo/miningoffice)
-"hNj" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/turf_decal/tile/neutral/half/contrasted{
- dir = 1
- },
-/obj/effect/turf_decal/tile/dark_red/half/contrasted,
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/iron,
-/area/station/hallway/primary/port)
"hNo" = (
/obj/structure/cable,
/obj/structure/disposalpipe/segment{
@@ -21963,6 +22102,10 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
/area/station/maintenance/port/fore)
+"hNr" = (
+/obj/structure/flora/grass/jungle/a/style_4,
+/turf/open/floor/grass,
+/area/station/service/chapel)
"hNv" = (
/obj/machinery/netpod,
/obj/machinery/light_switch/directional/north,
@@ -21973,6 +22116,10 @@
/obj/effect/turf_decal/tile/brown/opposingcorners,
/turf/open/floor/iron,
/area/station/cargo/miningoffice)
+"hND" = (
+/obj/structure/water_source/puddle,
+/turf/open/floor/grass,
+/area/station/service/chapel)
"hNJ" = (
/obj/effect/turf_decal/tile/yellow/half/contrasted{
dir = 4
@@ -22035,16 +22182,15 @@
dir = 1
},
/area/station/security/execution/transfer)
-"hOO" = (
-/obj/effect/turf_decal/weather/dirt{
- dir = 9
+"hOL" = (
+/obj/structure/chair/sofa/bench/left{
+ dir = 8
},
-/obj/effect/turf_decal/weather/dirt{
- dir = 5
+/obj/effect/turf_decal/tile/blue,
+/turf/open/floor/iron/dark/side{
+ dir = 4
},
-/obj/structure/flora/bush/large/style_random,
-/turf/open/floor/grass,
-/area/station/service/chapel)
+/area/station/hallway/primary/central/fore)
"hOX" = (
/obj/item/chair,
/obj/effect/decal/cleanable/dirt/dust,
@@ -22055,15 +22201,6 @@
/obj/structure/sign/poster/contraband/random/directional/north,
/turf/open/floor/carpet/lone,
/area/station/service/abandoned_gambling_den)
-"hPb" = (
-/obj/effect/mapping_helpers/broken_floor,
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/rack,
-/obj/effect/spawner/random/maintenance,
-/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/central/greater)
"hPd" = (
/obj/structure/hedge,
/obj/effect/turf_decal/tile/brown{
@@ -22129,16 +22266,17 @@
/obj/machinery/firealarm/directional/north,
/turf/open/floor/circuit,
/area/station/tcommsat/server)
-"hQx" = (
-/obj/effect/turf_decal/siding/wideplating/dark/corner,
-/obj/effect/turf_decal/tile/dark_red/half/contrasted{
+"hQj" = (
+/obj/effect/turf_decal/siding/wood{
dir = 1
},
-/obj/structure/disposalpipe/segment{
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/chair/wood{
dir = 4
},
-/turf/open/floor/iron,
-/area/station/security/brig/entrance)
+/obj/effect/landmark/start/assistant,
+/turf/open/floor/iron/grimy,
+/area/station/service/bar)
"hQz" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/stripes/line,
@@ -22248,6 +22386,10 @@
},
/turf/open/floor/iron/diagonal,
/area/station/engineering/lobby)
+"hTq" = (
+/obj/structure/cable,
+/turf/open/floor/iron/dark/small,
+/area/station/maintenance/central/lesser)
"hTr" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/door/airlock/maintenance{
@@ -22301,10 +22443,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/grimy,
/area/station/engineering/main)
-"hUj" = (
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/aft)
"hUq" = (
/obj/structure/table/glass,
/turf/open/floor/iron/smooth,
@@ -22334,6 +22472,14 @@
/obj/item/radio/off,
/turf/open/floor/iron/smooth,
/area/station/command/gateway)
+"hUM" = (
+/obj/effect/turf_decal/weather/snow,
+/obj/machinery/gibber,
+/obj/effect/turf_decal/weather/snow/corner{
+ dir = 6
+ },
+/turf/open/floor/iron/freezer,
+/area/station/service/kitchen/coldroom)
"hUO" = (
/obj/machinery/door/airlock/public/glass{
name = "Lockers"
@@ -22343,6 +22489,28 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/textured_half,
/area/station/commons/fitness/locker_room)
+"hUQ" = (
+/obj/effect/turf_decal/siding/thinplating_new/light{
+ dir = 4
+ },
+/obj/effect/landmark/start/botanist,
+/turf/open/floor/iron/white/small,
+/area/station/service/hydroponics)
+"hUU" = (
+/obj/structure/cable,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/disposalpipe/segment,
+/obj/merge_conflict_marker{
+ name = "---Merge Conflict Marker---";
+
+ desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
+ },
+/obj/structure/cable,
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/disposalpipe/segment,
+/turf/open/floor/plating,
+/area/station/maintenance/central/greater)
"hVb" = (
/obj/machinery/plate_press,
/obj/effect/turf_decal/stripes/line,
@@ -22398,13 +22566,12 @@
},
/turf/open/floor/plating,
/area/station/maintenance/fore/lesser)
-"hVO" = (
-/obj/effect/turf_decal/weather/dirt,
-/obj/machinery/light/small/directional/south,
-/obj/item/radio/intercom/directional/south,
-/obj/structure/flora/bush/flowers_yw,
-/turf/open/floor/grass,
-/area/station/service/chapel)
+"hVU" = (
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/fore)
"hVX" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/effect/turf_decal/tile/neutral{
@@ -22424,18 +22591,16 @@
/obj/machinery/light/small/directional/north,
/turf/open/floor/iron/dark,
/area/station/science/genetics)
+"hWa" = (
+/obj/machinery/computer/security/telescreen/prison/directional/north,
+/obj/machinery/computer/records/security,
+/turf/open/floor/wood,
+/area/station/security/detectives_office)
"hWk" = (
/obj/machinery/vending/coffee,
/obj/structure/extinguisher_cabinet/directional/south,
/turf/open/floor/iron,
/area/station/commons/fitness/locker_room)
-"hWm" = (
-/obj/effect/turf_decal/tile/neutral,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/station/hallway/primary/port)
"hWu" = (
/obj/machinery/door/airlock/medical{
name = "CMO Bedroom"
@@ -22457,15 +22622,6 @@
},
/turf/open/floor/iron/showroomfloor,
/area/station/commons/toilet/auxiliary)
-"hWG" = (
-/obj/structure/disposalpipe/segment,
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/aft)
"hWJ" = (
/obj/structure/cable,
/obj/structure/disposalpipe/segment,
@@ -22485,6 +22641,13 @@
},
/turf/open/floor/iron,
/area/station/maintenance/port/aft)
+"hXc" = (
+/obj/structure/closet/secure_closet/personal,
+/obj/effect/turf_decal/tile/brown/opposingcorners{
+ dir = 1
+ },
+/turf/open/floor/iron,
+/area/station/commons/vacant_room/commissary)
"hXf" = (
/obj/machinery/door/airlock/engineering/glass{
name = "Hull Breach Emergency Storage"
@@ -22493,6 +22656,19 @@
/obj/effect/mapping_helpers/airlock/access/any/engineering/construction,
/turf/open/floor/catwalk_floor/iron,
/area/station/commons/storage/tools)
+"hXk" = (
+/obj/structure/closet/firecloset,
+/obj/effect/turf_decal/tile/blue{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/neutral/half/contrasted{
+ dir = 4
+ },
+/obj/item/radio/intercom/directional/west,
+/turf/open/floor/iron/dark/side{
+ dir = 8
+ },
+/area/station/hallway/primary/central/fore)
"hXl" = (
/obj/structure/cable,
/obj/structure/disposalpipe/segment,
@@ -22514,6 +22690,10 @@
},
/turf/open/floor/engine/air,
/area/station/engineering/atmos/space_catwalk)
+"hXO" = (
+/obj/effect/turf_decal/siding/wood,
+/turf/closed/wall,
+/area/station/service/library)
"hXU" = (
/turf/closed/wall,
/area/station/security/execution/education)
@@ -22538,13 +22718,6 @@
/obj/effect/landmark/navigate_destination/research,
/turf/open/floor/iron/white,
/area/station/hallway/primary/starboard)
-"hYh" = (
-/obj/structure/flora/bush/jungle/c/style_3,
-/obj/effect/turf_decal/weather/dirt{
- dir = 1
- },
-/turf/open/floor/grass,
-/area/station/service/chapel)
"hYn" = (
/obj/effect/spawner/random/structure/crate,
/turf/open/floor/plating,
@@ -22656,6 +22829,13 @@
},
/turf/open/floor/iron,
/area/station/security/tram)
+"iad" = (
+/obj/machinery/status_display/evac/directional/north,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/aft)
"iai" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -22692,6 +22872,16 @@
/obj/machinery/light/small/directional/north,
/turf/open/floor/iron/showroomfloor,
/area/station/medical/surgery/theatre)
+"iaF" = (
+/obj/structure/cable,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+ dir = 1
+ },
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/aft)
"iaH" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -22737,6 +22927,11 @@
/obj/item/emptysandbag,
/turf/open/floor/iron/smooth_large,
/area/station/cargo/warehouse)
+"ibf" = (
+/obj/effect/turf_decal/weather/dirt,
+/obj/structure/flora/bush/flowers_pp/style_2,
+/turf/open/floor/grass,
+/area/station/service/chapel)
"ibo" = (
/obj/structure/bed,
/obj/item/bedsheet/centcom,
@@ -22763,13 +22958,6 @@
/obj/effect/spawner/random/engineering/atmospherics_portable,
/turf/open/floor/plating,
/area/station/maintenance/department/medical/central)
-"ibF" = (
-/obj/effect/turf_decal/tile/neutral/opposingcorners,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/station/holodeck/rec_center)
"ibI" = (
/obj/effect/turf_decal/siding/white/corner{
dir = 8
@@ -22804,18 +22992,6 @@
},
/turf/open/floor/wood,
/area/station/hallway/secondary/entry)
-"icN" = (
-/obj/structure/disposalpipe/segment,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/effect/turf_decal/trimline/neutral/line{
- dir = 4
- },
-/obj/effect/turf_decal/trimline/neutral/line{
- dir = 8
- },
-/obj/structure/cable,
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/fore)
"icT" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -22869,20 +23045,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
/area/station/maintenance/starboard/greater)
-"ids" = (
-/obj/effect/turf_decal/tile/brown/opposingcorners{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/button/door/directional/north{
- name = "Door Bolt Control";
- id = "commiss2";
- normaldoorcontrol = 1;
- specialfunctions = 4
- },
-/turf/open/floor/iron,
-/area/station/commons/vacant_room/commissary)
"idt" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -22947,6 +23109,11 @@
/obj/machinery/digital_clock/directional/south,
/turf/open/floor/iron,
/area/station/maintenance/department/medical/central)
+"ieb" = (
+/obj/structure/bookcase/random,
+/obj/item/radio/intercom/directional/west,
+/turf/open/floor/wood/parquet,
+/area/station/service/library)
"ief" = (
/obj/structure/cable,
/obj/machinery/telecomms/message_server/preset,
@@ -22979,28 +23146,15 @@
/obj/machinery/light/dim/directional/north,
/turf/open/floor/iron/white,
/area/station/science/cytology)
-"ifl" = (
-/obj/structure/cable,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/effect/spawner/random/trash,
-/turf/open/floor/iron/stairs{
- dir = 8
- },
-/area/station/maintenance/port/greater)
"ifH" = (
-/obj/machinery/door/firedoor,
-/obj/effect/turf_decal/stripes/red/line{
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 8
},
-/obj/effect/turf_decal/stripes/red/line{
- dir = 4
+/obj/structure/disposalpipe/segment{
+ dir = 5
},
-/turf/open/floor/iron/small,
-/area/station/hallway/primary/central/aft)
+/turf/open/floor/wood,
+/area/station/service/chapel/office)
"ifI" = (
/obj/effect/turf_decal/tile/neutral/fourcorners,
/obj/effect/turf_decal/stripes/line{
@@ -23025,6 +23179,13 @@
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/iron/smooth,
/area/station/engineering/main)
+"ifR" = (
+/obj/effect/turf_decal/siding/wood,
+/obj/structure/chair/wood{
+ dir = 8
+ },
+/turf/open/floor/iron/grimy,
+/area/station/service/bar)
"ifU" = (
/obj/structure/disposalpipe/segment{
dir = 10
@@ -23058,10 +23219,6 @@
/obj/effect/spawner/random/structure/girder,
/turf/open/floor/tram,
/area/station/maintenance/department/medical/central)
-"ihb" = (
-/obj/effect/spawner/random/trash,
-/turf/open/floor/plating,
-/area/station/maintenance/port/greater)
"ihc" = (
/obj/structure/cable,
/obj/machinery/door/airlock/command/glass{
@@ -23071,12 +23228,6 @@
/obj/effect/mapping_helpers/airlock/access/all/command/teleporter,
/turf/open/floor/iron/dark/textured_half,
/area/station/command/teleporter)
-"ihd" = (
-/obj/structure/disposalpipe/segment{
- dir = 10
- },
-/turf/open/floor/iron/white,
-/area/station/medical/medbay/lobby)
"ihh" = (
/obj/effect/turf_decal/sand/plating,
/obj/effect/decal/cleanable/dirt,
@@ -23143,6 +23294,15 @@
/obj/effect/decal/cleanable/cobweb/cobweb2,
/turf/open/floor/eighties/red,
/area/station/service/abandoned_gambling_den/gaming)
+"ihy" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/firealarm/directional/south,
+/obj/effect/turf_decal/tile/neutral,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/open/floor/iron,
+/area/station/hallway/primary/port)
"ihA" = (
/obj/structure/transit_tube/curved{
dir = 1
@@ -23187,15 +23347,6 @@
},
/turf/open/space/basic,
/area/space)
-"iiI" = (
-/obj/structure/table/reinforced,
-/obj/structure/disposalpipe/segment,
-/obj/machinery/door/poddoor/shutters{
- id = "meow";
- name = "Commissary"
- },
-/turf/open/floor/iron,
-/area/station/commons/vacant_room/commissary)
"iiW" = (
/obj/structure/cable,
/turf/open/floor/catwalk_floor/iron_dark,
@@ -23344,32 +23495,11 @@
},
/turf/open/space/basic,
/area/station/engineering/atmos/space_catwalk)
-"ile" = (
-/obj/structure/chair{
- dir = 1
- },
-/obj/structure/disposalpipe/segment{
- dir = 5
- },
-/turf/open/floor/iron/white,
-/area/station/medical/medbay/lobby)
"ill" = (
/obj/structure/frame/machine,
/obj/item/circuitboard/computer/security,
/turf/open/floor/plating,
/area/station/maintenance/fore/lesser)
-"ilo" = (
-/obj/structure/cable,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/mapping_helpers/broken_floor,
-/obj/effect/spawner/random/trash,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/plating,
-/area/station/maintenance/port/greater)
"ilw" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -23377,17 +23507,6 @@
dir = 4
},
/area/station/science/research)
-"ilx" = (
-/obj/effect/turf_decal/delivery,
-/obj/effect/turf_decal/stripes/end{
- dir = 1
- },
-/obj/structure/window/reinforced/spawner/directional/east,
-/obj/effect/turf_decal/siding/thinplating_new{
- dir = 4
- },
-/turf/open/floor/iron/small,
-/area/station/hallway/secondary/service)
"ilz" = (
/obj/effect/turf_decal/stripes/line,
/obj/effect/decal/cleanable/dirt/dust,
@@ -23453,11 +23572,6 @@
/obj/structure/table,
/turf/open/floor/plating,
/area/station/maintenance/port/greater)
-"ind" = (
-/obj/machinery/light/floor,
-/obj/structure/flora/bush/flowers_br,
-/turf/open/floor/grass,
-/area/station/hallway/primary/central/fore)
"inh" = (
/obj/structure/disposalpipe/segment,
/obj/effect/turf_decal/trimline/neutral/line{
@@ -23468,6 +23582,20 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/fore)
+"inH" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/landmark/navigate_destination/bar,
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/fore)
+"inO" = (
+/obj/item/kirbyplants/random,
+/obj/effect/turf_decal/siding/wood/corner,
+/turf/open/floor/wood/parquet,
+/area/station/service/library)
"inR" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -23481,18 +23609,6 @@
/obj/effect/landmark/start/shaft_miner,
/turf/open/floor/iron,
/area/station/cargo/miningoffice)
-"inU" = (
-/obj/structure/disposalpipe/segment,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron/white/side,
-/area/station/hallway/primary/central/aft)
-"ioa" = (
-/obj/effect/turf_decal/siding/wood{
- dir = 6
- },
-/turf/open/floor/stone,
-/area/station/service/bar)
"iob" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -23517,6 +23633,11 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/commons/dorms)
+"ioH" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/wood,
+/area/station/service/chapel/office)
"ioN" = (
/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible,
/obj/effect/turf_decal/tile/brown{
@@ -23637,6 +23758,12 @@
},
/turf/open/floor/iron/dark,
/area/station/command/heads_quarters/rd)
+"ipB" = (
+/obj/structure/chair/wood{
+ dir = 8
+ },
+/turf/open/floor/wood/tile,
+/area/station/service/bar)
"ipD" = (
/obj/structure/cable,
/obj/structure/disposalpipe/segment{
@@ -23653,12 +23780,6 @@
/obj/machinery/airalarm/directional/south,
/turf/open/floor/iron/dark,
/area/station/medical/medbay/lobby)
-"ipG" = (
-/obj/machinery/deepfryer,
-/obj/structure/sign/poster/official/random/directional/north,
-/obj/structure/cable,
-/turf/open/floor/iron/kitchen/small,
-/area/station/service/kitchen)
"ipP" = (
/obj/effect/turf_decal/bot_white,
/obj/effect/turf_decal/stripes/corner{
@@ -23788,6 +23909,15 @@
dir = 8
},
/area/station/command/heads_quarters/hop)
+"iro" = (
+/obj/effect/turf_decal/weather/dirt{
+ dir = 8
+ },
+/obj/machinery/light/small/directional/west,
+/obj/machinery/camera/directional/west,
+/obj/machinery/status_display/ai/directional/west,
+/turf/open/floor/grass,
+/area/station/service/chapel)
"irp" = (
/obj/machinery/door/airlock/external{
name = "Tram Maintenance"
@@ -23888,19 +24018,6 @@
},
/turf/closed/wall,
/area/station/hallway/primary/port)
-"isO" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/obj/structure/extinguisher_cabinet/directional/west,
-/obj/effect/turf_decal/tile/neutral/opposingcorners{
- dir = 1
- },
-/obj/effect/turf_decal/siding/thinplating_new{
- dir = 8
- },
-/turf/open/floor/iron/small,
-/area/station/hallway/secondary/service)
"isQ" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -23994,18 +24111,6 @@
/obj/effect/mapping_helpers/airlock/access/all/science/research,
/turf/open/floor/plating,
/area/station/maintenance/starboard/aft)
-"iuF" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/light_switch/directional/north,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/wood,
-/area/station/cargo/boutique)
-"iuR" = (
-/turf/closed/wall/r_wall,
-/area/station/hallway/primary/central/aft)
"iuW" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/light/small/directional/west,
@@ -24021,17 +24126,6 @@
/obj/item/melee/baseball_bat,
/turf/open/floor/wood,
/area/station/maintenance/starboard/greater)
-"ivh" = (
-/obj/structure/cable,
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/effect/spawner/random/trash,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/plating,
-/area/station/maintenance/port/greater)
"ivk" = (
/obj/machinery/atmospherics/components/tank/air{
dir = 8
@@ -24049,6 +24143,26 @@
/obj/structure/sign/poster/official/random/directional/south,
/turf/open/floor/iron/smooth,
/area/station/commons/storage/tools)
+"ivu" = (
+/obj/structure/table/reinforced,
+/obj/machinery/door/window/right/directional/south,
+/obj/machinery/door/poddoor/shutters{
+ name = "Kitchen Shutters";
+ id = "kitchenshutters"
+ },
+/obj/merge_conflict_marker{
+ name = "---Merge Conflict Marker---";
+
+ desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
+ },
+/obj/structure/table/reinforced,
+/obj/machinery/door/window/right/directional/south,
+/obj/machinery/door/poddoor/shutters/preopen{
+ id = "kitchenshutters";
+ name = "Kitchen Shutters"
+ },
+/turf/open/floor/iron/kitchen/small,
+/area/station/service/kitchen)
"ivz" = (
/obj/effect/turf_decal/tile/neutral/fourcorners,
/obj/effect/turf_decal/stripes/line{
@@ -24101,11 +24215,9 @@
},
/turf/open/space/basic,
/area/station/engineering/atmos/space_catwalk)
-"iwt" = (
-/obj/effect/turf_decal/siding/wood/corner{
- dir = 8
- },
-/turf/open/floor/wood/parquet,
+"iwy" = (
+/obj/structure/disposalpipe/segment,
+/turf/open/floor/iron/smooth,
/area/station/service/library)
"iwz" = (
/obj/structure/disposalpipe/segment,
@@ -24123,10 +24235,35 @@
/obj/structure/cable,
/turf/open/floor/iron/small,
/area/station/maintenance/solars/port/aft)
+"ixD" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/wood,
+/obj/machinery/door/airlock/public/glass{
+ name = "Chapel Office"
+ },
+/obj/machinery/door/firedoor,
+/obj/effect/mapping_helpers/airlock/access/all/service/chapel_office,
+/obj/structure/disposalpipe/segment,
+/turf/open/floor/iron/textured_half,
+/area/station/service/chapel/office)
"ixG" = (
/obj/machinery/airalarm/directional/north,
/turf/open/floor/iron,
/area/station/engineering/storage/tech)
+"ixJ" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/disposalpipe/segment{
+ dir = 10
+ },
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/fore)
"ixM" = (
/obj/structure/cable,
/obj/structure/disposalpipe/segment{
@@ -24196,16 +24333,6 @@
},
/turf/open/floor/iron/dark,
/area/station/ai_monitored/turret_protected/ai)
-"iyr" = (
-/obj/machinery/atmospherics/components/unary/portables_connector/visible{
- dir = 8
- },
-/obj/machinery/light/cold/directional/north,
-/obj/machinery/newscaster/directional/north,
-/turf/open/floor/iron/dark/side{
- dir = 9
- },
-/area/station/science/ordnance/testlab)
"iyt" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -24215,6 +24342,10 @@
},
/turf/open/floor/iron/white/small,
/area/station/science/lab)
+"iyx" = (
+/obj/effect/turf_decal/tile/neutral/opposingcorners,
+/turf/open/floor/iron,
+/area/station/holodeck/rec_center)
"iyC" = (
/obj/effect/turf_decal/tile/neutral/fourcorners,
/obj/effect/turf_decal/siding/purple{
@@ -24226,12 +24357,6 @@
/obj/item/radio/intercom/directional/east,
/turf/open/floor/iron/dark,
/area/station/science/genetics)
-"iyR" = (
-/obj/effect/turf_decal/weather/dirt{
- dir = 9
- },
-/turf/open/floor/grass,
-/area/station/service/chapel)
"izh" = (
/obj/item/shovel,
/turf/open/floor/plating,
@@ -24249,16 +24374,6 @@
},
/turf/open/floor/engine/co2,
/area/station/engineering/atmos/space_catwalk)
-"izo" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/door/airlock/grunge{
- name = "Vacant Comissary"
- },
-/turf/open/floor/iron/textured_half{
- dir = 1
- },
-/area/station/maintenance/central/lesser)
"izD" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -24293,21 +24408,6 @@
/obj/machinery/field/generator,
/turf/open/floor/iron/dark/small,
/area/station/engineering/storage_shared)
-"iAu" = (
-/obj/structure/bed{
- dir = 4
- },
-/obj/effect/spawner/random/bedsheet{
- dir = 4
- },
-/obj/machinery/button/door/directional/west{
- name = "Cabin Bolt Control";
- normaldoorcontrol = 1;
- specialfunctions = 4;
- id = "Cabin1"
- },
-/turf/open/floor/carpet/orange,
-/area/station/commons/dorms)
"iAv" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/spawner/random/trash,
@@ -24334,6 +24434,16 @@
},
/turf/open/floor/iron/dark,
/area/station/security/execution/transfer)
+"iAC" = (
+/obj/effect/decal/cleanable/dirt,
+/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 = 4
+ },
+/turf/open/floor/plating,
+/area/station/maintenance/port/greater)
"iAD" = (
/obj/machinery/door/poddoor/shutters{
dir = 8;
@@ -24377,14 +24487,6 @@
},
/turf/open/floor/iron/white,
/area/station/security/medical)
-"iBa" = (
-/obj/effect/turf_decal/siding/wood,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/chair/wood{
- dir = 4
- },
-/turf/open/floor/iron/grimy,
-/area/station/service/bar)
"iBc" = (
/obj/effect/turf_decal/siding/thinplating_new/terracotta{
dir = 5
@@ -24415,6 +24517,13 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/iron/smooth,
/area/station/hallway/secondary/command)
+"iBv" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/turf_decal/tile/neutral,
+/obj/structure/extinguisher_cabinet/directional/east,
+/obj/structure/disposalpipe/segment,
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/fore)
"iBE" = (
/obj/effect/turf_decal/sand/plating,
/obj/structure/cable,
@@ -24445,22 +24554,16 @@
},
/turf/open/floor/carpet/royalblue,
/area/station/command/heads_quarters/captain)
-"iCi" = (
-/obj/machinery/computer/security/telescreen/isolation/directional/north{
- name = "reflection room monitor"
- },
-/obj/effect/turf_decal/stripes/white/corner{
- dir = 1
- },
-/obj/item/kirbyplants/random,
-/obj/machinery/firealarm/directional/east,
-/obj/machinery/button/flasher{
- id = "IsolationFlash";
- pixel_x = 28;
- pixel_y = 28
- },
-/turf/open/floor/iron/dark/small,
-/area/station/security/execution/education)
+"iCh" = (
+/obj/structure/window/spawner/directional/east,
+/obj/structure/window/spawner/directional/west,
+/obj/machinery/light/floor,
+/obj/structure/flora/bush/sparsegrass,
+/obj/structure/flora/bush/flowers_br,
+/obj/structure/flora/bush/flowers_pp,
+/obj/structure/flora/bush/flowers_yw,
+/turf/open/floor/grass,
+/area/station/service/hydroponics)
"iCj" = (
/obj/effect/turf_decal/stripes/red/line{
dir = 4
@@ -24572,6 +24675,19 @@
/obj/machinery/airalarm/directional/south,
/turf/open/floor/iron,
/area/station/hallway/primary/fore)
+"iDP" = (
+/obj/structure/table,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/effect/spawner/random/food_or_drink/cake_ingredients,
+/obj/item/kitchen/rollingpin,
+/obj/merge_conflict_marker{
+ name = "---Merge Conflict Marker---";
+
+ desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
+ },
+/obj/structure/table,
+/turf/open/floor/iron/kitchen/small,
+/area/station/service/kitchen)
"iEk" = (
/obj/effect/spawner/structure/window,
/turf/open/floor/plating,
@@ -24585,6 +24701,17 @@
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
/turf/open/floor/engine,
/area/station/science/explab)
+"iEE" = (
+/obj/structure/disposalpipe/segment,
+/obj/effect/turf_decal/trimline/neutral/line{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/neutral/line{
+ dir = 8
+ },
+/obj/structure/cable,
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/fore)
"iEG" = (
/obj/effect/mapping_helpers/broken_floor,
/turf/open/floor/iron/dark/side{
@@ -24630,16 +24757,6 @@
/obj/structure/window/spawner/directional/east,
/turf/open/misc/sandy_dirt,
/area/station/medical/medbay/lobby)
-"iFD" = (
-/obj/effect/turf_decal/plaque{
- icon_state = "L5";
- pixel_y = -15
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/aft)
"iFE" = (
/obj/effect/mapping_helpers/broken_floor,
/obj/structure/chair/office{
@@ -24659,6 +24776,13 @@
/obj/machinery/light/small/directional/west,
/turf/open/floor/iron/smooth_corner,
/area/station/engineering/supermatter/room)
+"iGj" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/table,
+/obj/item/stack/spacecash/c1,
+/obj/item/cigarette/cigar/havana,
+/turf/open/floor/light/colour_cycle/dancefloor_b,
+/area/station/maintenance/starboard/central)
"iGl" = (
/turf/open/floor/plating,
/area/station/maintenance/hallway/abandoned_command)
@@ -24673,10 +24797,6 @@
},
/turf/open/floor/catwalk_floor/iron_smooth,
/area/station/maintenance/solars/port/aft)
-"iGq" = (
-/obj/effect/landmark/start/librarian,
-/turf/open/floor/wood/parquet,
-/area/station/service/library)
"iGt" = (
/obj/structure/cable,
/obj/machinery/duct,
@@ -24722,14 +24842,17 @@
/obj/structure/broken_flooring/pile/directional/east,
/turf/open/floor/plating,
/area/station/maintenance/starboard/aft)
-"iGS" = (
-/obj/effect/turf_decal/tile/brown/opposingcorners{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+"iHe" = (
/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/turf_decal/tile/neutral,
+/obj/machinery/navbeacon{
+ codes_txt = "patrol;next_patrol=1.5-PNexus-Vault";
+ location = "1.0-Security-PNexus"
+ },
+/obj/effect/landmark/start/hangover,
/turf/open/floor/iron,
-/area/station/commons/vacant_room/commissary)
+/area/station/hallway/primary/port)
"iHg" = (
/obj/structure/cable,
/obj/machinery/door/airlock/maintenance/external{
@@ -24739,22 +24862,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/plating,
/area/station/maintenance/fore/lesser)
-"iHq" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/turf_decal/tile/dark_red/opposingcorners,
-/obj/machinery/camera/autoname/directional/west,
-/obj/machinery/light/small/directional/west,
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/iron,
-/area/station/security/brig/entrance)
-"iHv" = (
-/obj/structure/table,
-/obj/machinery/computer/security/telescreen/ordnance/directional/north,
-/turf/open/floor/iron/dark/side{
- dir = 1
- },
-/area/station/science/ordnance/testlab)
"iHw" = (
/obj/effect/spawner/random/structure/barricade,
/turf/open/floor/plating,
@@ -24771,13 +24878,11 @@
dir = 1
},
/area/station/science/lower)
-"iHT" = (
+"iHY" = (
/obj/structure/cable,
/obj/structure/disposalpipe/segment,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/plating,
-/area/station/maintenance/port/greater)
+/area/station/maintenance/central/greater)
"iIs" = (
/obj/effect/turf_decal/tile/neutral{
dir = 4
@@ -24809,6 +24914,25 @@
},
/turf/open/floor/iron/dark/textured_edge,
/area/station/command/heads_quarters/hop)
+"iIJ" = (
+/obj/structure/flora/bush/flowers_yw/style_3{
+ pixel_y = -3
+ },
+/obj/structure/flora/bush/flowers_br/style_random{
+ pixel_x = -6;
+ pixel_y = -6
+ },
+/obj/structure/flora/bush/flowers_pp{
+ pixel_y = -5;
+ pixel_x = -3
+ },
+/obj/machinery/light/floor,
+/obj/effect/light_emitter/fake_outdoors,
+/obj/effect/turf_decal/siding/wood{
+ dir = 5
+ },
+/turf/open/floor/grass/Airless,
+/area/station/hallway/primary/central/aft)
"iIK" = (
/obj/effect/turf_decal/bot,
/obj/structure/rack,
@@ -24841,12 +24965,6 @@
},
/turf/open/floor/iron/smooth,
/area/station/security/checkpoint/escape)
-"iIU" = (
-/obj/machinery/vending/wardrobe/det_wardrobe,
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/computer/security/telescreen/normal/directional/west,
-/turf/open/floor/wood,
-/area/station/security/detectives_office)
"iIW" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
@@ -24870,6 +24988,14 @@
/obj/structure/cable,
/turf/open/floor/iron/textured_half,
/area/station/commons/dorms)
+"iJa" = (
+/obj/effect/turf_decal/tile/red/opposingcorners,
+/obj/effect/turf_decal/tile/blue/opposingcorners{
+ dir = 8
+ },
+/obj/machinery/airalarm/directional/south,
+/turf/open/floor/iron/smooth,
+/area/station/service/greenroom)
"iJb" = (
/obj/structure/cable,
/obj/structure/table/glass,
@@ -25031,10 +25157,6 @@
/obj/effect/turf_decal/siding/red,
/turf/open/floor/iron/white/small,
/area/station/security/warden)
-"iLh" = (
-/obj/effect/landmark/start/hangover,
-/turf/open/floor/iron/smooth,
-/area/station/service/library)
"iLp" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -25047,19 +25169,6 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/hallway/primary/starboard)
-"iLA" = (
-/obj/structure/closet/firecloset,
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
-/obj/effect/turf_decal/tile/neutral/half/contrasted{
- dir = 4
- },
-/obj/item/radio/intercom/directional/west,
-/turf/open/floor/iron/dark/side{
- dir = 8
- },
-/area/station/hallway/primary/central/fore)
"iLC" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -25079,17 +25188,6 @@
dir = 8
},
/area/station/hallway/primary/central/fore)
-"iLH" = (
-/obj/effect/mapping_helpers/airlock/access/any/service/maintenance,
-/obj/machinery/door/airlock/maintenance{
- name = "Maintenance"
- },
-/obj/structure/cable,
-/obj/effect/mapping_helpers/airlock/unres{
- dir = 1
- },
-/turf/open/floor/plating,
-/area/station/maintenance/port/greater)
"iLN" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -25100,6 +25198,12 @@
/obj/effect/mapping_helpers/airlock/access/any/command/hop,
/turf/open/floor/plating,
/area/station/maintenance/department/bridge)
+"iLO" = (
+/obj/structure/disposalpipe/segment{
+ dir = 10
+ },
+/turf/open/floor/iron/white,
+/area/station/hallway/primary/central/aft)
"iLR" = (
/obj/structure/cable,
/obj/structure/lattice/catwalk,
@@ -25188,6 +25292,17 @@
/obj/machinery/power/shieldwallgen,
/turf/open/floor/iron/smooth_large,
/area/station/command/teleporter)
+"iNd" = (
+/obj/machinery/icecream_vat,
+/obj/effect/turf_decal/weather/snow/corner{
+ dir = 1
+ },
+/obj/effect/turf_decal/weather/snow,
+/obj/machinery/light/small/directional/north,
+/obj/machinery/power/apc/auto_name/directional/north,
+/obj/structure/cable,
+/turf/open/floor/iron/freezer,
+/area/station/service/kitchen/coldroom)
"iNg" = (
/obj/structure/chair/sofa/corp{
dir = 4
@@ -25195,6 +25310,11 @@
/obj/machinery/airalarm/directional/west,
/turf/open/floor/iron/smooth,
/area/station/hallway/secondary/command)
+"iNy" = (
+/obj/structure/flora/tree/jungle/small/style_4,
+/obj/effect/turf_decal/weather/dirt,
+/turf/open/floor/grass,
+/area/station/service/chapel)
"iNA" = (
/obj/machinery/light/cold/directional/east,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
@@ -25202,31 +25322,11 @@
},
/turf/open/floor/iron,
/area/station/hallway/secondary/entry)
-"iNC" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/door/firedoor,
-/obj/effect/turf_decal/stripes/red/line{
- dir = 4
- },
-/obj/effect/turf_decal/stripes/red/line{
- dir = 8
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/iron/small,
-/area/station/hallway/secondary/exit/departure_lounge)
"iNE" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/spawner/random/vending/snackvend,
/turf/open/floor/plating,
/area/station/maintenance/port/fore)
-"iNF" = (
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/aft)
"iNO" = (
/obj/effect/turf_decal/stripes/white/line{
dir = 6
@@ -25287,6 +25387,14 @@
},
/turf/open/floor/iron,
/area/station/hallway/secondary/recreation)
+"iOr" = (
+/obj/effect/turf_decal/siding/wood,
+/obj/effect/turf_decal/siding/wood{
+ dir = 8
+ },
+/obj/structure/disposalpipe/segment,
+/turf/open/floor/stone,
+/area/station/service/bar)
"iOs" = (
/obj/structure/table/wood/fancy/royalblue,
/obj/effect/turf_decal/siding/wood{
@@ -25405,20 +25513,33 @@
/obj/structure/curtain,
/turf/open/floor/iron/freezer,
/area/station/command/heads_quarters/captain/private)
-"iQe" = (
-/obj/effect/turf_decal/siding/wood{
- dir = 8
- },
-/turf/open/floor/stone,
-/area/station/service/bar)
+"iQh" = (
+/obj/structure/disposalpipe/segment,
+/turf/closed/wall,
+/area/station/maintenance/central/greater)
"iQl" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron,
/area/station/maintenance/hallway/abandoned_command)
-"iQp" = (
-/obj/structure/flora/bush/sparsegrass,
+"iQm" = (
+/obj/effect/turf_decal/weather/dirt{
+ dir = 9
+ },
+/obj/effect/turf_decal/weather/dirt{
+ dir = 5
+ },
+/obj/structure/flora/bush/large/style_random,
/turf/open/floor/grass,
/area/station/service/chapel)
+"iQn" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/airalarm/directional/south,
+/obj/effect/turf_decal/tile/neutral,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/open/floor/iron,
+/area/station/hallway/primary/port)
"iQr" = (
/obj/effect/turf_decal/tile/brown{
dir = 1
@@ -25436,6 +25557,27 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/plating/elevatorshaft,
/area/station/commons/dorms)
+"iQE" = (
+/obj/machinery/vending/wardrobe/bar_wardrobe,
+/obj/machinery/power/apc/auto_name/directional/north,
+/obj/structure/cable,
+/obj/effect/turf_decal/siding/wood{
+ dir = 9
+ },
+/turf/open/floor/stone,
+/area/station/service/bar/backroom)
+"iQP" = (
+/obj/machinery/status_display/evac/directional/north,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/aft)
"iQT" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/structure/disposalpipe/segment{
@@ -25462,6 +25604,19 @@
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
/turf/open/floor/iron/small,
/area/station/commons/fitness/locker_room)
+"iQW" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/disposalpipe/segment,
+/obj/structure/window/reinforced/spawner/directional/north,
+/obj/effect/turf_decal/tile/neutral/opposingcorners{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/thinplating_new{
+ dir = 4
+ },
+/turf/open/floor/iron/small,
+/area/station/hallway/secondary/service)
"iRl" = (
/obj/structure/table/wood,
/obj/item/food/grown/citrus/lemon{
@@ -25484,6 +25639,18 @@
},
/turf/open/floor/plating,
/area/station/engineering/atmos/office)
+"iRy" = (
+/obj/structure/sign/poster/official/random/directional/south,
+/obj/effect/turf_decal/siding/wood/corner{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/wood{
+ dir = 6
+ },
+/obj/machinery/airalarm/directional/east,
+/obj/item/kirbyplants/random,
+/turf/open/floor/stone,
+/area/station/service/bar)
"iRz" = (
/obj/structure/disposalpipe/segment,
/obj/structure/cable,
@@ -25523,12 +25690,17 @@
/obj/item/stack/cable_coil/five,
/turf/open/floor/plating,
/area/station/maintenance/fore/lesser)
+"iSq" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/camera/directional/east,
+/obj/machinery/status_display/evac/directional/east,
+/obj/effect/turf_decal/tile/neutral,
+/obj/structure/disposalpipe/segment,
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/fore)
"iSr" = (
/turf/open/floor/iron,
/area/station/security/execution/transfer)
-"iSD" = (
-/turf/open/misc/dirt/jungle,
-/area/station/service/chapel)
"iSE" = (
/obj/machinery/atmospherics/pipe/layer_manifold/cyan/visible,
/obj/effect/landmark/start/atmospheric_technician,
@@ -25627,26 +25799,6 @@
/obj/item/crowbar/large/old,
/turf/open/floor/plating,
/area/station/maintenance/hallway/abandoned_command)
-"iUh" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/obj/structure/disposalpipe/segment,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/station/hallway/primary/port)
-"iUH" = (
-/obj/effect/turf_decal/tile/neutral,
-/obj/machinery/camera/autoname/directional/south,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/station/hallway/primary/port)
"iUK" = (
/obj/effect/turf_decal/stripes/white/line{
dir = 8
@@ -25728,23 +25880,6 @@
},
/turf/open/floor/plating,
/area/station/cargo/miningoffice)
-"iVP" = (
-/obj/structure/rack,
-/obj/effect/turf_decal/tile/brown/opposingcorners{
- dir = 1
- },
-/obj/item/storage/toolbox/mechanical{
- pixel_x = 2;
- pixel_y = 3
- },
-/obj/item/storage/toolbox/electrical{
- pixel_x = 4;
- pixel_y = 6
- },
-/obj/item/clothing/head/utility/welding,
-/obj/structure/extinguisher_cabinet/directional/west,
-/turf/open/floor/iron,
-/area/station/commons/vacant_room/commissary)
"iVT" = (
/obj/structure/cable,
/obj/structure/disposalpipe/segment{
@@ -25874,12 +26009,6 @@
dir = 8
},
/area/station/engineering/supermatter/room)
-"iXi" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/closed/wall/r_wall,
-/area/station/hallway/primary/central/aft)
"iXm" = (
/obj/structure/cable,
/obj/structure/disposalpipe/sorting/mail/flip{
@@ -25918,36 +26047,6 @@
/obj/machinery/camera/autoname/directional/east,
/turf/open/floor/iron/dark,
/area/station/science/server)
-"iXW" = (
-/obj/structure/sign/poster/official/random/directional/north,
-/obj/structure/table/wood,
-/obj/item/gun/ballistic/shotgun/doublebarrel,
-/obj/structure/reagent_dispensers/beerkeg,
-/obj/structure/reagent_dispensers/beerkeg{
- pixel_y = 5
- },
-/obj/machinery/camera/autoname/directional/north,
-/obj/effect/turf_decal/siding/wood{
- dir = 1
- },
-/turf/open/floor/stone,
-/area/station/service/bar/backroom)
-"iXZ" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/turf_decal/tile/neutral,
-/obj/structure/disposalpipe/junction/flip{
- dir = 8
- },
-/turf/open/floor/iron,
-/area/station/hallway/primary/port)
-"iYd" = (
-/obj/effect/turf_decal/siding/wood{
- dir = 6
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/iron/grimy,
-/area/station/service/library)
"iYh" = (
/obj/structure/fluff/broken_canister_frame,
/turf/open/floor/plating,
@@ -25984,6 +26083,12 @@
},
/turf/open/floor/iron/small,
/area/station/command/teleporter)
+"iYH" = (
+/obj/effect/turf_decal/siding/thinplating_new/light{
+ dir = 10
+ },
+/turf/open/floor/iron/white/small,
+/area/station/service/hydroponics)
"iYY" = (
/obj/structure/cable,
/turf/open/floor/iron/small,
@@ -26043,28 +26148,12 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/fore)
-"iZM" = (
-/obj/effect/turf_decal/siding/wood,
-/obj/structure/cable,
-/turf/open/floor/wood/parquet,
-/area/station/service/library)
"iZU" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/light/directional/east,
/turf/open/floor/wood/large,
/area/station/command/heads_quarters/captain)
-"iZW" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
-/obj/effect/turf_decal/trimline/neutral/line,
-/obj/effect/turf_decal/trimline/neutral/line{
- dir = 1
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/station/hallway/primary/port)
"jad" = (
/obj/effect/turf_decal/siding/wood{
dir = 1
@@ -26171,27 +26260,13 @@
},
/turf/open/floor/tram,
/area/station/maintenance/department/medical/central)
-"jby" = (
-/obj/structure/cable,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/door/airlock/maintenance{
- name = "Maintenance"
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/mapping_helpers/airlock/access/any/service/maintenance,
-/obj/effect/mapping_helpers/airlock/unres{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/plating,
-/area/station/maintenance/port/greater)
"jbV" = (
/obj/machinery/photocopier,
/turf/open/floor/iron/dark,
/area/station/security/office)
+"jca" = (
+/turf/closed/wall/r_wall,
+/area/station/hallway/primary/central/aft)
"jch" = (
/turf/open/floor/iron/white/corner,
/area/station/hallway/secondary/exit/departure_lounge)
@@ -26232,11 +26307,6 @@
/obj/structure/lattice/catwalk,
/turf/open/space/basic,
/area/space/nearstation)
-"jcG" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/iron/white/small,
-/area/station/service/hydroponics)
"jcU" = (
/obj/structure/chair/wood/wings{
dir = 1
@@ -26260,10 +26330,6 @@
/obj/effect/landmark/start/captain,
/turf/open/floor/iron/freezer,
/area/station/command/heads_quarters/captain/private)
-"jdx" = (
-/obj/structure/table/wood,
-/turf/open/floor/carpet,
-/area/station/service/library)
"jdU" = (
/obj/effect/turf_decal/stripes/corner{
dir = 1
@@ -26278,16 +26344,19 @@
},
/turf/open/floor/iron/smooth,
/area/station/maintenance/disposal/incinerator)
+"jdZ" = (
+/obj/effect/spawner/xmastree,
+/turf/open/misc/dirt/jungle,
+/area/station/service/chapel)
"jeh" = (
/turf/open/floor/noslip,
/area/station/security/tram)
-"jep" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/firealarm/directional/north,
-/obj/machinery/light_switch/directional/south,
-/turf/open/floor/iron/dark/small,
-/area/station/service/chapel/storage)
+"jen" = (
+/obj/effect/turf_decal/weather/dirt,
+/obj/machinery/light/small/directional/south,
+/obj/machinery/status_display/evac/directional/south,
+/turf/open/floor/grass,
+/area/station/service/chapel)
"jeC" = (
/obj/structure/cable,
/obj/structure/disposalpipe/segment{
@@ -26303,6 +26372,12 @@
/obj/machinery/light_switch/directional/west,
/turf/open/floor/iron/smooth_large,
/area/station/science/ordnance/storage)
+"jeO" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 10
+ },
+/turf/open/floor/stone,
+/area/station/service/chapel)
"jeW" = (
/obj/effect/spawner/structure/window,
/obj/structure/sign/departments/medbay/alt/directional/west,
@@ -26352,42 +26427,13 @@
/obj/machinery/light/dim/directional/north,
/turf/open/floor/iron/smooth,
/area/station/security/evidence)
-"jfT" = (
-/obj/structure/closet/secure_closet/hydroponics,
-/obj/effect/turf_decal/siding/thinplating_new/light{
- dir = 1
- },
-/obj/structure/sign/poster/official/random/directional/north,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
-/turf/open/floor/iron/white/small,
-/area/station/service/hydroponics)
-"jgb" = (
-/obj/effect/turf_decal/tile/red/opposingcorners,
-/obj/effect/turf_decal/tile/blue/opposingcorners{
- dir = 8
- },
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
- dir = 1
- },
-/obj/structure/cable,
-/turf/open/floor/iron/smooth,
-/area/station/service/greenroom)
-"jgq" = (
+"jfJ" = (
+/obj/structure/flora/bush/jungle/c/style_3,
/obj/effect/turf_decal/weather/dirt{
- dir = 8
+ dir = 1
},
-/obj/structure/flora/bush/jungle/a/style_3,
-/turf/open/misc/dirt/jungle,
+/turf/open/floor/grass,
/area/station/service/chapel)
-"jgx" = (
-/obj/effect/turf_decal/tile/green/opposingcorners,
-/obj/effect/turf_decal/tile/blue/opposingcorners{
- dir = 8
- },
-/obj/structure/extinguisher_cabinet/directional/east,
-/obj/machinery/hydroponics/constructable,
-/turf/open/floor/iron,
-/area/station/service/hydroponics)
"jgF" = (
/obj/effect/turf_decal/siding/wideplating/dark{
dir = 1
@@ -26404,6 +26450,14 @@
},
/turf/open/floor/iron,
/area/station/security/prison/workout)
+"jgX" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/public/glass{
+ name = "Fore Primary Hallway"
+ },
+/turf/open/floor/iron/textured_half,
+/area/station/hallway/primary/central/fore)
"jhk" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -26582,11 +26636,39 @@
/obj/machinery/firealarm/directional/south,
/turf/open/floor/iron,
/area/station/medical/chemistry)
-"jjZ" = (
+"jjP" = (
+/obj/structure/cable,
/obj/structure/disposalpipe/segment{
dir = 4
},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/aft)
+"jkl" = (
/obj/structure/cable,
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/iron/stairs,
+/area/station/maintenance/port/greater)
+"jku" = (
+/obj/effect/turf_decal/plaque{
+ icon_state = "L5";
+ pixel_y = -15
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/aft)
+"jkx" = (
+/obj/machinery/light/warm/dim,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/item/radio/intercom/directional/south,
+/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/iron,
/area/station/hallway/primary/central/aft)
"jkz" = (
@@ -26616,6 +26698,15 @@
/obj/effect/mapping_helpers/broken_floor,
/turf/open/floor/plating,
/area/station/maintenance/department/medical/central)
+"jkL" = (
+/obj/structure/cable,
+/obj/structure/disposalpipe/segment{
+ dir = 10
+ },
+/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/port/greater)
"jkS" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -26623,11 +26714,6 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/cargo/storage)
-"jkT" = (
-/obj/structure/table/wood,
-/obj/machinery/fax/auto_name,
-/turf/open/floor/carpet,
-/area/station/service/library)
"jkV" = (
/obj/machinery/door/airlock/external/glass{
name = "ATMOS PROJECT Airlock"
@@ -26637,6 +26723,16 @@
/obj/structure/cable,
/turf/open/floor/plating/rust,
/area/station/engineering/supermatter/room)
+"jlf" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/wood/corner,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/light/floor,
+/turf/open/floor/stone,
+/area/station/service/bar)
"jlt" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -26656,12 +26752,6 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/cargo/storage)
-"jlz" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/power/apc/auto_name/directional/north,
-/turf/open/floor/iron/dark/small,
-/area/station/service/chapel/storage)
"jlL" = (
/obj/structure/closet/secure_closet/engineering_chief,
/obj/item/storage/briefcase/secure,
@@ -26695,11 +26785,6 @@
/obj/machinery/duct,
/turf/open/floor/iron/white/small,
/area/station/medical/storage)
-"jlW" = (
-/obj/effect/turf_decal/weather/dirt,
-/obj/structure/flora/bush/flowers_pp/style_2,
-/turf/open/floor/grass,
-/area/station/service/chapel)
"jlZ" = (
/obj/effect/turf_decal/tile/dark_red/half/contrasted{
dir = 1
@@ -26781,6 +26866,17 @@
/obj/machinery/bci_implanter,
/turf/open/floor/iron/cafeteria,
/area/station/science/circuits)
+"jnl" = (
+/obj/effect/turf_decal/siding/wood/corner{
+ dir = 4
+ },
+/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,
+/turf/open/floor/stone,
+/area/station/service/bar)
"jnn" = (
/obj/structure/disposalpipe/segment,
/obj/structure/disposalpipe/segment{
@@ -26791,6 +26887,11 @@
},
/turf/open/floor/iron,
/area/station/cargo/sorting)
+"jnr" = (
+/obj/machinery/door/firedoor,
+/obj/structure/disposalpipe/segment,
+/turf/open/floor/iron/white/small,
+/area/station/medical/medbay/lobby)
"jnB" = (
/obj/structure/chair/plastic{
dir = 8
@@ -26809,10 +26910,6 @@
/obj/machinery/firealarm/directional/south,
/turf/open/floor/iron/smooth,
/area/station/security/evidence)
-"jnO" = (
-/obj/machinery/space_heater,
-/turf/open/floor/plating,
-/area/station/maintenance/central/greater)
"jnZ" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -26824,29 +26921,36 @@
},
/turf/open/floor/plating,
/area/station/command/corporate_showroom)
-"joH" = (
-/obj/structure/table/reinforced,
-/obj/item/paper_bin{
- pixel_x = -2;
- pixel_y = 4
- },
-/obj/item/pen,
-/obj/machinery/door/poddoor/shutters{
- id = "meow";
- name = "Commissary"
- },
-/turf/open/floor/iron,
-/area/station/commons/vacant_room/commissary)
-"joR" = (
+"joa" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/structure/disposalpipe/segment{
dir = 4
},
+/turf/open/floor/wood,
+/area/station/cargo/boutique)
+"jog" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/obj/effect/spawner/random/structure/steam_vent,
-/turf/open/floor/plating,
-/area/station/maintenance/central/greater)
+/obj/effect/turf_decal/trimline/neutral/end{
+ dir = 8
+ },
+/obj/merge_conflict_marker{
+ name = "---Merge Conflict Marker---";
+
+ desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/turf_decal/trimline/neutral/line{
+ dir = 9
+ },
+/obj/effect/turf_decal/trimline/neutral/corner,
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/aft)
+"joB" = (
+/obj/machinery/light/floor,
+/turf/open/floor/iron/kitchen/small,
+/area/station/service/kitchen)
"joS" = (
/obj/machinery/light/broken/directional/north,
/obj/effect/decal/cleanable/dirt,
@@ -26868,6 +26972,11 @@
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/iron/smooth,
/area/station/engineering/engine_smes)
+"jpl" = (
+/obj/effect/spawner/structure/window,
+/obj/machinery/door/firedoor/border_only,
+/turf/open/floor/plating,
+/area/station/service/bar)
"jpm" = (
/obj/structure/chair{
dir = 4;
@@ -27013,20 +27122,6 @@
},
/turf/open/floor/iron/dark,
/area/station/medical/chemistry)
-"jrl" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/obj/effect/landmark/navigate_destination/teleporter,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/fore)
"jrs" = (
/obj/structure/disposalpipe/segment{
dir = 10
@@ -27047,17 +27142,6 @@
/obj/structure/closet/firecloset,
/turf/open/floor/plating/rust,
/area/station/maintenance/fore/lesser)
-"jrN" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/aft)
"jrS" = (
/obj/effect/turf_decal/stripes/white/line{
dir = 10
@@ -27090,6 +27174,11 @@
dir = 4
},
/area/station/science/xenobiology)
+"jsm" = (
+/obj/structure/flora/bush/flowers_br,
+/obj/structure/flora/bush/flowers_pp/style_random,
+/turf/open/floor/grass,
+/area/station/service/chapel)
"jsv" = (
/obj/structure/cable,
/obj/machinery/holopad,
@@ -27113,15 +27202,6 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/central/fore)
-"jsJ" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/obj/machinery/status_display/evac/directional/north,
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/iron,
-/area/station/hallway/primary/port)
"jsN" = (
/obj/structure/hedge,
/obj/effect/decal/cleanable/cobweb/cobweb2,
@@ -27168,6 +27248,17 @@
/obj/machinery/airalarm/directional/east,
/turf/open/floor/iron/diagonal,
/area/station/command/heads_quarters/hop)
+"jtt" = (
+/obj/effect/spawner/random/entertainment/arcade{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/thinplating{
+ dir = 4
+ },
+/obj/structure/sign/poster/official/random/directional/east,
+/obj/structure/cable,
+/turf/open/floor/eighties/red,
+/area/station/hallway/primary/central/fore)
"jtD" = (
/obj/structure/closet/emcloset,
/turf/open/floor/iron/showroomfloor,
@@ -27231,12 +27322,6 @@
/obj/item/storage/box/matches,
/turf/open/floor/iron,
/area/station/cargo/sorting)
-"juP" = (
-/obj/machinery/light/small/directional/south,
-/obj/machinery/status_display/evac/directional/south,
-/obj/effect/turf_decal/siding/wood,
-/turf/open/floor/stone,
-/area/station/service/chapel)
"juS" = (
/obj/structure/bed,
/obj/item/bedsheet/hop,
@@ -27244,21 +27329,45 @@
/obj/machinery/firealarm/directional/south,
/turf/open/floor/iron/grimy,
/area/station/command/heads_quarters/hop)
-"jvd" = (
-/obj/effect/turf_decal/siding/thinplating{
+"jvl" = (
+/obj/machinery/holopad,
+/obj/structure/cable,
+/turf/open/floor/iron/dark/small,
+/area/station/command/heads_quarters/captain/private)
+"jvv" = (
+/obj/effect/turf_decal/trimline/neutral/line{
dir = 1
},
+/obj/effect/turf_decal/trimline/neutral/line,
/obj/structure/cable,
/obj/structure/disposalpipe/segment{
- dir = 5
+ dir = 4
+ },
+/obj/machinery/door/firedoor,
+/obj/effect/turf_decal/stripes/red/line{
+ dir = 4
+ },
+/obj/effect/turf_decal/stripes/red/line{
+ dir = 8
+ },
+/obj/merge_conflict_marker{
+ name = "---Merge Conflict Marker---";
+
+ desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
},
-/turf/open/floor/eighties/red,
-/area/station/hallway/primary/central/fore)
-"jvl" = (
-/obj/machinery/holopad,
/obj/structure/cable,
-/turf/open/floor/iron/dark/small,
-/area/station/command/heads_quarters/captain/private)
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/machinery/door/firedoor,
+/obj/effect/turf_decal/stripes/red/line{
+ dir = 4
+ },
+/obj/effect/turf_decal/stripes/red/line{
+ dir = 8
+ },
+/turf/open/floor/iron/small,
+/area/station/hallway/primary/central/aft)
"jvB" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
@@ -27272,23 +27381,6 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/fore)
-"jvL" = (
-/obj/structure/table/reinforced,
-/obj/item/reagent_containers/condiment/peppermill{
- pixel_x = 3
- },
-/obj/item/reagent_containers/condiment/saltshaker{
- pixel_x = -3
- },
-/obj/machinery/door/firedoor/border_only{
- dir = 4
- },
-/obj/machinery/door/poddoor/shutters{
- name = "Kitchen Shutters";
- id = "kitchenshutters"
- },
-/turf/open/floor/plating,
-/area/station/service/kitchen)
"jvN" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/effect/turf_decal/tile/dark_red/half/contrasted{
@@ -27358,26 +27450,15 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/wood/tile,
/area/station/command/corporate_showroom)
-"jwl" = (
-/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/dark_red/half/contrasted{
- dir = 4
- },
-/obj/effect/turf_decal/siding/wideplating/dark{
- dir = 8
- },
-/obj/structure/disposalpipe/junction/flip{
+"jww" = (
+/obj/item/kirbyplants/random,
+/obj/structure/extinguisher_cabinet/directional/south,
+/obj/effect/turf_decal/siding/wood{
dir = 1
},
-/turf/open/floor/iron,
-/area/station/security)
-"jwt" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/table,
-/turf/open/floor/iron/kitchen/small,
-/area/station/service/kitchen)
+/obj/effect/turf_decal/siding/wood,
+/turf/open/floor/stone,
+/area/station/service/bar)
"jwC" = (
/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible/layer2{
dir = 5
@@ -27523,6 +27604,13 @@
},
/turf/open/floor/iron/grimy,
/area/station/engineering/main)
+"jyr" = (
+/obj/effect/landmark/start/hangover,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+ dir = 1
+ },
+/turf/open/floor/wood/tile,
+/area/station/service/bar)
"jyu" = (
/obj/structure/chair/bronze{
dir = 4
@@ -27583,23 +27671,6 @@
/obj/effect/mapping_helpers/airlock/abandoned,
/turf/open/floor/wood,
/area/station/maintenance/starboard/greater)
-"jzf" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/door/airlock{
- name = "Library Maintenance"
- },
-/obj/effect/mapping_helpers/airlock/access/any/service/maintenance,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/obj/effect/mapping_helpers/airlock/unres{
- dir = 4
- },
-/turf/open/floor/plating,
-/area/station/service/library)
"jzg" = (
/obj/effect/turf_decal/stripes/white/line{
dir = 1
@@ -27633,14 +27704,12 @@
/obj/structure/broken_flooring/singular/directional/south,
/turf/open/floor/iron,
/area/station/hallway/secondary/dock)
-"jzr" = (
-/obj/machinery/holopad,
-/obj/effect/turf_decal/trimline/neutral/line,
-/obj/effect/turf_decal/trimline/neutral/line{
- dir = 1
+"jzv" = (
+/obj/structure/disposalpipe/segment{
+ dir = 9
},
-/turf/open/floor/iron,
-/area/station/hallway/primary/port)
+/turf/open/floor/plating,
+/area/station/maintenance/port/greater)
"jzJ" = (
/obj/effect/turf_decal/tile/brown/opposingcorners,
/obj/structure/closet/firecloset,
@@ -27649,6 +27718,14 @@
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/iron,
/area/station/engineering/hallway)
+"jzQ" = (
+/obj/effect/turf_decal/weather/dirt{
+ dir = 1
+ },
+/obj/structure/flora/bush/flowers_pp,
+/obj/structure/cable,
+/turf/open/floor/grass,
+/area/station/service/chapel)
"jAb" = (
/obj/structure/cable,
/turf/open/floor/iron/stairs{
@@ -27673,6 +27750,33 @@
},
/turf/open/floor/iron,
/area/station/hallway/secondary/construction)
+"jAw" = (
+/obj/structure/disposalpipe/segment,
+/obj/effect/turf_decal/trimline/neutral/line{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/neutral/line{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/merge_conflict_marker{
+ name = "---Merge Conflict Marker---";
+
+ desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
+ },
+/obj/structure/disposalpipe/segment,
+/obj/effect/turf_decal/trimline/neutral/line{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/neutral/line{
+ 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,
+/area/station/hallway/primary/central/fore)
"jAz" = (
/obj/effect/turf_decal/stripes/end,
/obj/effect/landmark/start/hangover,
@@ -27684,6 +27788,22 @@
/obj/machinery/airalarm/directional/east,
/turf/open/floor/iron,
/area/station/security/tram)
+"jAT" = (
+/obj/machinery/button/door/directional/north{
+ id = "Cabin4";
+ name = "Cabin Bolt Control";
+ normaldoorcontrol = 1
+ },
+/turf/closed/wall,
+/area/station/service/abandoned_gambling_den)
+"jBg" = (
+/obj/structure/window/spawner/directional/east,
+/obj/structure/window/spawner/directional/west,
+/obj/structure/flora/bush/large/style_2,
+/obj/structure/flora/bush/sparsegrass,
+/obj/structure/flora/bush/flowers_yw,
+/turf/open/floor/grass,
+/area/station/service/hydroponics)
"jBo" = (
/obj/effect/turf_decal/siding/thinplating_new{
dir = 6
@@ -27722,16 +27842,23 @@
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/iron/dark,
/area/station/engineering/atmos)
+"jCb" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/stone,
+/area/station/service/bar)
+"jCd" = (
+/obj/structure/cable,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/plating,
+/area/station/maintenance/port/greater)
"jCi" = (
/obj/structure/cable,
/obj/machinery/door/airlock/maintenance,
/obj/effect/mapping_helpers/airlock/access/all/supply/general,
/turf/open/floor/plating,
/area/station/maintenance/port/fore)
-"jCm" = (
-/obj/effect/landmark/start/hangover,
-/turf/open/misc/dirt/jungle,
-/area/station/service/chapel)
"jCo" = (
/obj/structure/cable,
/turf/open/floor/plating,
@@ -27743,6 +27870,13 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/smooth,
/area/station/cargo/warehouse)
+"jCW" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 8
+ },
+/obj/effect/landmark/start/assistant,
+/turf/open/floor/wood/tile,
+/area/station/service/bar)
"jCZ" = (
/obj/machinery/door/window/brigdoor/left/directional/west{
id = "Cell 1";
@@ -27900,6 +28034,18 @@
},
/turf/open/floor/iron,
/area/station/cargo/office)
+"jEL" = (
+/obj/effect/landmark/start/assistant,
+/obj/effect/turf_decal/trimline/neutral/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/neutral/line,
+/obj/structure/cable,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/aft)
"jEQ" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -27927,14 +28073,6 @@
},
/turf/open/space/basic,
/area/space/nearstation)
-"jFm" = (
-/obj/effect/turf_decal/siding/wood{
- dir = 1
- },
-/obj/effect/turf_decal/siding/wood,
-/obj/effect/spawner/random/vending/snackvend,
-/turf/open/floor/stone,
-/area/station/service/bar)
"jFw" = (
/obj/item/kirbyplants/random,
/obj/effect/turf_decal/tile/yellow{
@@ -27964,13 +28102,6 @@
/obj/machinery/power/apc/auto_name/directional/north,
/turf/open/floor/plating,
/area/station/maintenance/fore/lesser)
-"jFK" = (
-/obj/effect/turf_decal/siding/wood{
- dir = 1
- },
-/obj/effect/turf_decal/siding/wood,
-/turf/open/floor/stone,
-/area/station/service/bar)
"jGc" = (
/obj/structure/window/spawner/directional/east,
/turf/open/floor/iron/showroomfloor,
@@ -28094,6 +28225,11 @@
/mob/living/basic/sloth/citrus,
/turf/open/floor/iron,
/area/station/cargo/storage)
+"jHG" = (
+/obj/effect/turf_decal/tile/neutral/opposingcorners,
+/obj/effect/spawner/random/entertainment/arcade,
+/turf/open/floor/iron,
+/area/station/holodeck/rec_center)
"jHI" = (
/obj/effect/turf_decal/stripes/white/line{
dir = 5
@@ -28166,6 +28302,12 @@
/obj/structure/window/spawner/directional/south,
/turf/open/floor/plating,
/area/station/maintenance/starboard/greater)
+"jIw" = (
+/obj/effect/turf_decal/siding/thinplating_new/light{
+ dir = 6
+ },
+/turf/open/floor/iron/white/small,
+/area/station/service/hydroponics)
"jIy" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
@@ -28230,20 +28372,6 @@
},
/turf/open/floor/iron,
/area/station/cargo/office)
-"jJd" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/cable,
-/obj/structure/disposalpipe/segment{
- dir = 6
- },
-/obj/effect/turf_decal/tile/neutral/opposingcorners{
- dir = 1
- },
-/obj/effect/turf_decal/siding/thinplating_new{
- dir = 8
- },
-/turf/open/floor/iron/small,
-/area/station/hallway/secondary/service)
"jJg" = (
/obj/effect/turf_decal/siding/wideplating,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -28258,6 +28386,12 @@
/obj/effect/landmark/start/station_engineer,
/turf/open/floor/iron/grimy,
/area/station/engineering/main)
+"jJx" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+ dir = 4
+ },
+/turf/open/floor/stone,
+/area/station/service/chapel)
"jJP" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -28297,6 +28431,14 @@
dir = 1
},
/area/station/science/xenobiology)
+"jKi" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/machinery/door/poddoor/shutters{
+ id = "meow";
+ name = "Commissary"
+ },
+/turf/open/floor/plating,
+/area/station/commons/vacant_room/commissary)
"jKq" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -28322,6 +28464,11 @@
dir = 4
},
/area/station/cargo/office)
+"jKw" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/disposalpipe/segment,
+/turf/open/floor/carpet/lone,
+/area/station/service/chapel/office)
"jKJ" = (
/obj/machinery/door/window/right/directional/north,
/turf/open/floor/iron,
@@ -28337,14 +28484,6 @@
"jKU" = (
/turf/closed/wall,
/area/station/engineering/atmos/storage/gas)
-"jKV" = (
-/obj/machinery/processor{
- pixel_y = 6
- },
-/obj/machinery/camera/autoname/directional/west,
-/obj/structure/table,
-/turf/open/floor/iron/kitchen/small,
-/area/station/service/kitchen)
"jLb" = (
/obj/effect/turf_decal/tile/yellow{
dir = 1
@@ -28396,18 +28535,6 @@
"jLR" = (
/turf/open/floor/iron/small,
/area/station/command/teleporter)
-"jLS" = (
-/obj/structure/table/wood,
-/obj/item/paper_bin{
- pixel_x = -2;
- pixel_y = 4
- },
-/obj/item/pen{
- pixel_x = -2;
- pixel_y = 4
- },
-/turf/open/floor/carpet,
-/area/station/service/library)
"jLV" = (
/obj/effect/turf_decal/tile/blue,
/turf/open/floor/iron/white,
@@ -28426,6 +28553,12 @@
/obj/machinery/light/small/directional/west,
/turf/open/floor/iron/smooth_large,
/area/station/cargo/warehouse)
+"jMw" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/cable,
+/turf/open/floor/plating,
+/area/station/maintenance/central/greater)
"jMy" = (
/obj/machinery/atmospherics/components/binary/pump/on{
dir = 8;
@@ -28440,17 +28573,6 @@
},
/turf/open/floor/iron/small,
/area/station/engineering/atmos/pumproom)
-"jMA" = (
-/obj/structure/chair/stool/bar/directional/east,
-/turf/open/floor/wood/large,
-/area/station/service/bar)
-"jMC" = (
-/obj/machinery/atmospherics/components/unary/outlet_injector/on{
- dir = 8
- },
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/engine,
-/area/station/science/xenobiology)
"jML" = (
/obj/structure/cable,
/obj/structure/disposalpipe/segment,
@@ -28463,6 +28585,11 @@
/obj/structure/spider/stickyweb,
/turf/open/floor/iron/small,
/area/station/maintenance/department/engine/atmos)
+"jMU" = (
+/obj/effect/turf_decal/weather/dirt,
+/obj/structure/flora/rock/pile/jungle/style_2,
+/turf/open/floor/grass,
+/area/station/service/chapel)
"jMX" = (
/obj/structure/disposalpipe/segment{
dir = 9
@@ -28543,6 +28670,16 @@
/obj/machinery/status_display/evac/directional/west,
/turf/open/misc/sandy_dirt,
/area/station/hallway/primary/central/fore)
+"jNY" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral/opposingcorners,
+/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,
+/area/station/holodeck/rec_center)
"jOb" = (
/obj/machinery/firealarm/directional/east,
/obj/effect/turf_decal/siding/wideplating/dark{
@@ -28550,6 +28687,12 @@
},
/turf/open/floor/iron/small,
/area/station/commons/fitness/locker_room)
+"jOd" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/closed/wall,
+/area/station/hallway/primary/central/aft)
"jOh" = (
/obj/structure/cable,
/obj/machinery/door/firedoor,
@@ -28618,20 +28761,21 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
/area/station/maintenance/fore/greater)
-"jPo" = (
-/obj/structure/cable,
-/obj/machinery/door/airlock/maintenance{
- name = "Security Maintenance"
- },
-/obj/effect/mapping_helpers/airlock/access/all/security/general,
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/plating,
-/area/station/maintenance/port/lesser)
"jPq" = (
/obj/structure/disposalpipe/segment,
/obj/effect/spawner/structure/window/reinforced/tinted,
/turf/open/floor/plating,
/area/station/maintenance/fore/greater)
+"jPs" = (
+/obj/structure/chair/stool/directional/north,
+/obj/effect/turf_decal/siding/wood{
+ dir = 4
+ },
+/turf/open/floor/stone,
+/area/station/service/bar)
+"jPz" = (
+/turf/open/floor/carpet/lone,
+/area/station/service/chapel/office)
"jPM" = (
/obj/structure/rack,
/obj/effect/spawner/random/techstorage/security_all,
@@ -28658,16 +28802,6 @@
/obj/effect/mapping_helpers/airlock/access/all/science/research,
/turf/open/floor/catwalk_floor/flat_white,
/area/station/science/research)
-"jQv" = (
-/obj/structure/cable,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/plating,
-/area/station/maintenance/port/greater)
"jQB" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 1
@@ -28691,22 +28825,6 @@
},
/turf/open/floor/iron/smooth,
/area/station/command/corporate_showroom)
-"jRl" = (
-/obj/effect/turf_decal/tile/brown/opposingcorners{
- dir = 1
- },
-/obj/machinery/firealarm/directional/east,
-/obj/machinery/disposal/bin,
-/obj/structure/disposalpipe/trunk{
- dir = 1
- },
-/obj/machinery/button/door/directional/north{
- id = "meow";
- name = "Comissary Shutters";
- pixel_x = 29
- },
-/turf/open/floor/iron,
-/area/station/commons/vacant_room/commissary)
"jRs" = (
/obj/structure/disposalpipe/segment,
/turf/open/floor/iron,
@@ -28732,16 +28850,6 @@
},
/turf/open/floor/iron,
/area/station/security)
-"jRJ" = (
-/obj/structure/cable,
-/obj/structure/disposalpipe/segment,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/plating,
-/area/station/maintenance/port/greater)
"jRR" = (
/obj/machinery/atmospherics/components/binary/crystallizer{
dir = 4
@@ -28774,13 +28882,18 @@
/obj/structure/railing,
/turf/open/floor/catwalk_floor,
/area/station/hallway/secondary/entry)
-"jSJ" = (
-/obj/effect/turf_decal/weather/dirt{
+"jSx" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
+/obj/effect/turf_decal/trimline/neutral/line{
dir = 1
},
+/obj/effect/turf_decal/trimline/neutral/line,
/obj/structure/cable,
-/turf/open/floor/grass,
-/area/station/service/chapel)
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/fore)
"jSQ" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/item/kirbyplants/random,
@@ -28835,13 +28948,15 @@
/obj/machinery/camera/autoname/directional/north,
/turf/open/floor/iron,
/area/station/cargo/storage)
-"jTC" = (
-/obj/effect/turf_decal/tile/neutral/opposingcorners,
-/obj/effect/decal/cleanable/dirt,
+"jTR" = (
+/obj/structure/cable,
+/obj/structure/disposalpipe/segment{
+ dir = 9
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/camera/autoname/directional/east,
-/turf/open/floor/iron,
-/area/station/holodeck/rec_center)
+/turf/open/floor/plating,
+/area/station/maintenance/port/greater)
"jTU" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -28887,35 +29002,20 @@
/obj/item/instrument/harmonica,
/turf/open/floor/iron,
/area/station/security/prison/rec)
-"jUr" = (
-/obj/item/cigarette,
-/obj/item/storage/fancy/cigarettes/cigpack_robust{
- pixel_y = 5;
- pixel_x = 6
- },
-/obj/item/lighter,
-/obj/structure/sign/poster/official/random/directional/east,
-/obj/structure/table,
-/obj/effect/turf_decal/tile/neutral/opposingcorners{
- dir = 1
- },
-/obj/effect/turf_decal/siding/thinplating_new{
- dir = 6
- },
-/turf/open/floor/iron/small,
-/area/station/hallway/secondary/service)
"jUx" = (
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plating,
/area/station/maintenance/department/electrical)
-"jUA" = (
-/obj/structure/table,
-/obj/item/storage/bag/tray,
-/obj/item/knife/kitchen{
- pixel_y = 2
+"jUI" = (
+/obj/effect/turf_decal/siding/thinplating{
+ dir = 1
},
-/turf/open/floor/iron/kitchen/small,
-/area/station/service/kitchen)
+/obj/structure/cable,
+/obj/structure/disposalpipe/segment{
+ dir = 5
+ },
+/turf/open/floor/eighties/red,
+/area/station/hallway/primary/central/fore)
"jUU" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -28929,6 +29029,18 @@
/obj/structure/cable,
/turf/open/floor/iron/smooth,
/area/station/hallway/secondary/command)
+"jVn" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/turf_decal/trimline/neutral/line,
+/obj/effect/turf_decal/trimline/neutral/line{
+ dir = 1
+ },
+/obj/structure/disposalpipe/segment,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/open/floor/iron,
+/area/station/hallway/primary/port)
"jVs" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -28987,14 +29099,6 @@
},
/turf/open/floor/iron/dark/small,
/area/station/maintenance/department/engine/atmos)
-"jWj" = (
-/obj/effect/turf_decal/weather/dirt{
- dir = 4
- },
-/obj/structure/flora/bush/flowers_pp/style_random,
-/obj/structure/flora/bush/large/style_3,
-/turf/open/floor/grass,
-/area/station/service/chapel)
"jWk" = (
/obj/machinery/door/firedoor,
/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos,
@@ -29056,12 +29160,6 @@
/obj/machinery/firealarm/directional/south,
/turf/open/floor/iron/textured_large,
/area/station/cargo/office)
-"jXc" = (
-/obj/structure/disposalpipe/segment{
- dir = 9
- },
-/turf/open/floor/plating,
-/area/station/maintenance/port/greater)
"jXe" = (
/obj/machinery/holopad/secure,
/turf/open/floor/iron/smooth,
@@ -29115,10 +29213,6 @@
/obj/effect/turf_decal/siding/wideplating/dark/corner,
/turf/open/floor/iron,
/area/station/security)
-"jXJ" = (
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/iron/white/side,
-/area/station/hallway/primary/central/aft)
"jXQ" = (
/obj/structure/flora/bush/large/style_random{
pixel_x = -18;
@@ -29208,6 +29302,19 @@
"jZl" = (
/turf/closed/wall/r_wall,
/area/station/engineering/atmospherics_engine)
+"jZm" = (
+/obj/effect/mapping_helpers/airlock/access/any/service/maintenance,
+/obj/machinery/door/airlock{
+ name = "Maintenance"
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/cable,
+/obj/effect/mapping_helpers/airlock/unres{
+ dir = 4
+ },
+/turf/open/floor/plating,
+/area/station/maintenance/central/greater)
"jZn" = (
/obj/machinery/disposal/bin,
/obj/effect/turf_decal/bot,
@@ -29271,6 +29378,17 @@
},
/turf/open/floor/iron,
/area/station/science/xenobiology)
+"kav" = (
+/obj/machinery/airalarm/directional/west,
+/obj/effect/spawner/random/entertainment/arcade{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/thinplating{
+ dir = 8
+ },
+/obj/machinery/light/small/dim/directional/west,
+/turf/open/floor/eighties/red,
+/area/station/hallway/primary/central/fore)
"kaz" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -29325,13 +29443,6 @@
/obj/structure/thermoplastic/light,
/turf/open/floor/tram,
/area/station/maintenance/port/aft)
-"kbk" = (
-/obj/structure/cable,
-/obj/structure/disposalpipe/segment{
- dir = 5
- },
-/turf/open/floor/wood,
-/area/station/cargo/boutique)
"kbm" = (
/obj/item/kirbyplants/random,
/obj/machinery/airalarm/directional/south,
@@ -29365,19 +29476,17 @@
/turf/open/floor/iron/showroomfloor,
/area/station/medical/surgery/theatre)
"kcM" = (
+/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/west,
-/obj/machinery/camera/autoname/directional/west,
-/obj/structure/disposalpipe/segment,
-/obj/machinery/light/small/directional/west,
-/obj/effect/turf_decal/tile/neutral/opposingcorners{
- dir = 1
+/obj/effect/turf_decal/siding/thinplating_new/light{
+ dir = 6
},
-/obj/effect/turf_decal/siding/thinplating_new{
- dir = 8
+/obj/structure/disposalpipe/segment{
+ dir = 4
},
-/turf/open/floor/iron/small,
-/area/station/hallway/secondary/service)
+/turf/open/floor/iron/white/small,
+/area/station/service/hydroponics)
"kcQ" = (
/obj/machinery/atmospherics/pipe/smart/manifold/yellow/visible{
dir = 1
@@ -29390,13 +29499,6 @@
/obj/structure/cable,
/turf/open/floor/circuit,
/area/station/tcommsat/server)
-"kdg" = (
-/obj/effect/turf_decal/siding/wood{
- dir = 8
- },
-/obj/structure/displaycase/trophy,
-/turf/open/floor/wood/parquet,
-/area/station/service/library)
"kdn" = (
/obj/structure/disposalpipe/segment,
/turf/open/floor/plating,
@@ -29426,11 +29528,6 @@
/obj/machinery/light_switch/directional/west,
/turf/open/floor/iron/white/small,
/area/station/science/server)
-"keb" = (
-/obj/structure/cable,
-/obj/effect/spawner/random/structure/girder,
-/turf/open/floor/plating,
-/area/station/maintenance/central/greater)
"kee" = (
/obj/structure/disposalpipe/segment,
/obj/effect/turf_decal/stripes/corner{
@@ -29460,10 +29557,6 @@
"ket" = (
/turf/open/floor/iron,
/area/station/security/prison/work)
-"keL" = (
-/obj/effect/turf_decal/siding/wood,
-/turf/open/floor/stone,
-/area/station/service/chapel)
"keO" = (
/obj/effect/spawner/random/trash,
/obj/effect/turf_decal/siding/white{
@@ -29475,10 +29568,6 @@
/obj/item/kirbyplants/random,
/turf/open/floor/iron,
/area/station/science/lower)
-"keQ" = (
-/obj/structure/flora/grass/jungle/b/style_3,
-/turf/open/floor/grass,
-/area/station/service/chapel)
"keS" = (
/obj/effect/turf_decal/siding/white{
dir = 5
@@ -29536,15 +29625,6 @@
/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/iron,
/area/station/hallway/primary/central/fore)
-"kfO" = (
-/obj/effect/turf_decal/siding/wood{
- dir = 1
- },
-/obj/structure/chair/wood{
- dir = 4
- },
-/turf/open/floor/iron/grimy,
-/area/station/service/bar)
"kfW" = (
/obj/effect/turf_decal/siding/yellow{
dir = 1
@@ -29583,11 +29663,6 @@
dir = 1
},
/area/station/hallway/primary/aft)
-"kgu" = (
-/obj/structure/lattice/catwalk,
-/obj/machinery/atmospherics/components/unary/passive_vent,
-/turf/open/space/basic,
-/area/space)
"kgw" = (
/obj/machinery/door/airlock{
name = "Gambling Den"
@@ -29634,11 +29709,24 @@
/obj/effect/decal/cleanable/glass,
/turf/open/floor/iron,
/area/station/engineering/atmospherics_engine)
+"kgY" = (
+/obj/machinery/vending/wardrobe/chef_wardrobe,
+/turf/open/floor/iron/kitchen/small,
+/area/station/service/kitchen)
"kgZ" = (
/obj/structure/cable,
/obj/machinery/newscaster/directional/east,
/turf/open/floor/wood,
/area/station/service/chapel/funeral)
+"khd" = (
+/obj/structure/chair/sofa/bench/right{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/blue,
+/turf/open/floor/iron/dark/side{
+ dir = 4
+ },
+/area/station/hallway/primary/central/fore)
"khl" = (
/obj/effect/turf_decal/stripes/white/line,
/turf/open/floor/tram,
@@ -29685,6 +29773,16 @@
},
/turf/open/floor/iron,
/area/station/hallway/secondary/construction)
+"khM" = (
+/obj/effect/mapping_helpers/airlock/access/any/service/hydroponics,
+/obj/machinery/door/airlock/hydroponics/glass{
+ name = "Hydroponics"
+ },
+/obj/machinery/door/firedoor,
+/turf/open/floor/iron/textured_half{
+ dir = 8
+ },
+/area/station/service/hydroponics)
"khQ" = (
/obj/structure/transport/linear/tram,
/obj/structure/fluff/tram_rail/floor,
@@ -29704,12 +29802,6 @@
dir = 1
},
/area/station/hallway/primary/central/fore)
-"khY" = (
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/fore)
"khZ" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -29722,25 +29814,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/smooth,
/area/station/cargo/warehouse)
-"kii" = (
-/obj/structure/flora/bush/flowers_yw/style_3{
- pixel_y = -3
- },
-/obj/structure/flora/bush/flowers_br/style_random{
- pixel_x = -6;
- pixel_y = -6
- },
-/obj/structure/flora/bush/flowers_pp{
- pixel_y = -5;
- pixel_x = -3
- },
-/obj/machinery/light/floor,
-/obj/effect/light_emitter/fake_outdoors,
-/obj/effect/turf_decal/siding/wood{
- dir = 5
- },
-/turf/open/floor/grass/Airless,
-/area/station/hallway/primary/central/aft)
"kit" = (
/obj/structure/cable,
/obj/structure/disposalpipe/segment{
@@ -29748,6 +29821,13 @@
},
/turf/open/floor/plating,
/area/station/maintenance/starboard/aft)
+"kiu" = (
+/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/neutral,
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/aft)
"kiB" = (
/obj/structure/disposalpipe/segment{
dir = 10
@@ -29817,6 +29897,14 @@
dir = 8
},
/area/station/hallway/secondary/dock)
+"kjF" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 6
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/iron/grimy,
+/area/station/service/library)
"kjO" = (
/obj/machinery/portable_atmospherics/canister/air,
/obj/effect/turf_decal/siding/white{
@@ -29903,6 +29991,41 @@
/obj/machinery/duct,
/turf/open/floor/iron/kitchen/small,
/area/station/security/prison/mess)
+"kli" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/turf_decal/trimline/neutral/end{
+ dir = 4
+ },
+/obj/merge_conflict_marker{
+ name = "---Merge Conflict Marker---";
+
+ desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/turf_decal/trimline/neutral/corner{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/neutral/line{
+ dir = 5
+ },
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/aft)
+"kll" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/turf_decal/siding/wood{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/wood,
+/obj/machinery/door/airlock/public/glass{
+ name = "Chapel Office"
+ },
+/obj/machinery/door/firedoor,
+/obj/effect/mapping_helpers/airlock/access/all/service/chapel_office,
+/turf/open/floor/iron/textured_half,
+/area/station/service/chapel/office)
"klF" = (
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 4
@@ -29938,15 +30061,20 @@
/obj/effect/landmark/start/atmospheric_technician,
/turf/open/floor/iron/smooth,
/area/station/maintenance/disposal/incinerator)
-"klN" = (
-/obj/effect/turf_decal/weather/dirt{
- dir = 10
+"klR" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/cable,
+/obj/structure/disposalpipe/segment{
+ dir = 6
},
-/obj/structure/flora/bush/large/style_random{
- pixel_y = 0
+/obj/effect/turf_decal/tile/neutral/opposingcorners{
+ dir = 1
},
-/turf/open/floor/grass,
-/area/station/service/chapel)
+/obj/effect/turf_decal/siding/thinplating_new{
+ dir = 8
+ },
+/turf/open/floor/iron/small,
+/area/station/hallway/secondary/service)
"klY" = (
/obj/effect/turf_decal/stripes/white/line,
/obj/effect/spawner/random/maintenance,
@@ -29975,6 +30103,10 @@
},
/turf/open/floor/plating,
/area/station/cargo/storage)
+"kmk" = (
+/obj/structure/flora/rock/pile/jungle/style_4,
+/turf/open/floor/grass,
+/area/station/service/chapel)
"kmn" = (
/obj/structure/plasticflaps,
/obj/machinery/conveyor{
@@ -30008,19 +30140,6 @@
/obj/machinery/firealarm/directional/east,
/turf/open/floor/iron,
/area/station/hallway/secondary/entry)
-"kmz" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
- dir = 1
- },
-/obj/effect/turf_decal/trimline/neutral/end{
- dir = 8
- },
-/obj/structure/cable,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/aft)
"kmC" = (
/obj/structure/cable,
/obj/effect/turf_decal/tile/neutral/fourcorners,
@@ -30066,6 +30185,27 @@
},
/turf/open/floor/iron,
/area/station/cargo/storage)
+"knt" = (
+/obj/effect/turf_decal/tile/neutral/full,
+/obj/effect/turf_decal/siding/thinplating_new/light{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/thinplating_new/light/corner{
+ dir = 8
+ },
+/obj/merge_conflict_marker{
+ name = "---Merge Conflict Marker---";
+
+ desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
+ },
+/obj/effect/turf_decal/siding/thinplating_new/light{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/thinplating_new/light/corner{
+ dir = 8
+ },
+/turf/open/floor/iron/white/small,
+/area/station/service/hydroponics)
"knv" = (
/turf/closed/wall,
/area/station/maintenance/department/engine/atmos)
@@ -30134,6 +30274,24 @@
},
/turf/open/floor/iron/smooth,
/area/station/hallway/secondary/command)
+"koR" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/light/floor,
+/turf/open/floor/stone,
+/area/station/service/bar)
+"koU" = (
+/obj/structure/closet/secure_closet/bar,
+/obj/item/stack/spacecash/c1,
+/obj/item/stack/spacecash/c1,
+/obj/item/stack/spacecash/c1,
+/obj/item/stack/spacecash/c1,
+/obj/item/stack/spacecash/c1,
+/obj/machinery/airalarm/directional/north,
+/obj/effect/turf_decal/siding/wood{
+ dir = 5
+ },
+/turf/open/floor/stone,
+/area/station/service/bar/backroom)
"koV" = (
/obj/effect/turf_decal/delivery,
/obj/machinery/light/small/directional/east,
@@ -30181,6 +30339,11 @@
/obj/machinery/light/directional/north,
/turf/open/floor/iron/small,
/area/station/engineering/supermatter/room)
+"kpv" = (
+/obj/structure/bed/maint,
+/obj/effect/spawner/random/trash,
+/turf/open/floor/plating,
+/area/station/maintenance/central/greater)
"kpF" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/effect/landmark/start/hangover,
@@ -30244,6 +30407,14 @@
/obj/machinery/light/small/directional/east,
/turf/open/floor/iron/smooth,
/area/station/security/checkpoint/engineering)
+"kqs" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/disposalpipe/segment,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plating,
+/area/station/maintenance/port/greater)
"kqy" = (
/obj/structure/cable,
/obj/machinery/duct,
@@ -30328,18 +30499,6 @@
"kqX" = (
/turf/closed/wall,
/area/station/ai_monitored/aisat/exterior)
-"kqZ" = (
-/obj/structure/table,
-/obj/item/stack/package_wrap,
-/obj/item/hand_labeler,
-/obj/effect/turf_decal/tile/brown/opposingcorners{
- dir = 1
- },
-/obj/machinery/power/apc/auto_name/directional/east,
-/obj/structure/cable,
-/obj/machinery/light/cold/directional/east,
-/turf/open/floor/iron,
-/area/station/commons/vacant_room/commissary)
"krd" = (
/obj/machinery/rnd/production/circuit_imprinter/department/science,
/obj/machinery/newscaster/directional/north,
@@ -30408,10 +30567,6 @@
/obj/machinery/telecomms/server/presets/common,
/turf/open/floor/circuit,
/area/station/tcommsat/server)
-"ksm" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/stone,
-/area/station/service/bar)
"kso" = (
/obj/structure/disposalpipe/junction{
dir = 8
@@ -30466,22 +30621,26 @@
},
/turf/open/floor/catwalk_floor/iron,
/area/station/engineering/gravity_generator)
-"ksJ" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/disposalpipe/sorting/mail{
- dir = 4
- },
-/obj/effect/mapping_helpers/mail_sorting/service/hydroponics,
-/turf/open/floor/plating,
-/area/station/maintenance/central/greater)
"ksN" = (
/obj/structure/transit_tube/station/dispenser,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron,
/area/station/maintenance/starboard/greater)
+"ksP" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 9
+ },
+/turf/open/floor/stone,
+/area/station/service/chapel)
+"ksW" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/table/wood,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/open/floor/wood,
+/area/station/cargo/boutique)
"kte" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
@@ -30503,6 +30662,24 @@
/obj/machinery/camera/autoname/directional/south,
/turf/open/floor/iron,
/area/station/engineering/storage/tech)
+"ktz" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 1
+ },
+/obj/structure/table/glass,
+/obj/item/paper_bin{
+ pixel_x = -3;
+ pixel_y = 7
+ },
+/obj/item/pen/invisible{
+ pixel_x = -2;
+ pixel_y = 7
+ },
+/obj/machinery/newscaster/directional/north,
+/obj/item/storage/photo_album/library,
+/obj/item/book/codex_gigas,
+/turf/open/floor/iron/grimy,
+/area/station/service/library)
"ktB" = (
/obj/effect/turf_decal/stripes/line{
dir = 10
@@ -30537,6 +30714,18 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/dark,
/area/station/cargo/office)
+"ktO" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/door/firedoor,
+/obj/effect/turf_decal/stripes/red/line{
+ dir = 4
+ },
+/obj/effect/turf_decal/stripes/red/line{
+ dir = 8
+ },
+/turf/open/floor/iron/small,
+/area/station/hallway/primary/central/aft)
"ktQ" = (
/obj/effect/turf_decal/siding/wood{
dir = 1
@@ -30586,14 +30775,6 @@
},
/turf/open/floor/iron/dark,
/area/station/cargo/office)
-"kuk" = (
-/obj/machinery/light/warm/dim,
-/obj/structure/disposalpipe/segment{
- dir = 9
- },
-/obj/effect/turf_decal/tile/neutral,
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/aft)
"kuq" = (
/obj/machinery/computer/cargo/request,
/turf/open/floor/plating,
@@ -30640,6 +30821,18 @@
/obj/structure/chair,
/turf/open/floor/iron,
/area/station/commons/storage/tools)
+"kuV" = (
+/obj/effect/turf_decal/siding/wideplating/dark/corner{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/dark_red/half/contrasted{
+ dir = 1
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/open/floor/iron,
+/area/station/security/brig/entrance)
"kvb" = (
/turf/closed/wall/r_wall/rust,
/area/station/engineering/atmos)
@@ -30652,16 +30845,18 @@
/obj/effect/turf_decal/trimline/neutral/line,
/turf/open/floor/iron,
/area/station/hallway/primary/central/fore)
-"kvD" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
+"kvo" = (
+/obj/structure/kitchenspike,
+/obj/effect/turf_decal/weather/snow/corner{
+ dir = 5
},
-/obj/structure/disposalpipe/segment{
- dir = 6
+/obj/effect/turf_decal/weather/snow,
+/obj/machinery/airalarm/directional/north,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+ dir = 8
},
-/turf/open/floor/iron,
-/area/station/hallway/primary/port)
+/turf/open/floor/iron/freezer,
+/area/station/service/kitchen/coldroom)
"kvI" = (
/obj/docking_port/stationary/random{
dir = 8;
@@ -30707,16 +30902,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/maintenance/starboard/greater)
-"kwy" = (
-/obj/structure/cable,
-/obj/effect/mapping_helpers/broken_floor,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/plating,
-/area/station/maintenance/port/greater)
"kwA" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 1
@@ -30731,6 +30916,15 @@
},
/turf/open/floor/plating/airless,
/area/space/nearstation)
+"kwU" = (
+/obj/effect/turf_decal/siding/wood/corner{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/wood{
+ dir = 4
+ },
+/turf/open/floor/stone,
+/area/station/service/bar)
"kwW" = (
/obj/machinery/light/small/directional/west,
/turf/open/floor/iron/smooth,
@@ -30762,6 +30956,11 @@
},
/turf/open/floor/catwalk_floor/titanium,
/area/station/command/heads_quarters/ce)
+"kxf" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/chair/stool/bamboo,
+/turf/open/floor/carpet/lone,
+/area/station/service/chapel/office)
"kxm" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/chair/comfy/beige{
@@ -30794,22 +30993,6 @@
/obj/structure/window/spawner/directional/east,
/turf/open/floor/plating/rust,
/area/station/maintenance/fore/lesser)
-"kxY" = (
-/obj/structure/table/reinforced,
-/obj/machinery/door/window/left/directional/south{
- name = "Hydroponics Desk"
- },
-/obj/machinery/door/firedoor,
-/obj/item/paper/guides/jobs/hydroponics,
-/obj/item/pen{
- pixel_x = 4
- },
-/obj/machinery/door/window/right/directional/north{
- name = "Hydroponics Desk";
- req_access = list("hydroponics")
- },
-/turf/open/floor/plating,
-/area/station/service/hydroponics)
"kya" = (
/obj/structure/table/greyscale,
/obj/item/paper{
@@ -30832,13 +31015,6 @@
/obj/structure/sign/warning/no_smoking/circle/directional/west,
/turf/open/floor/iron/smooth,
/area/station/engineering/atmos)
-"kym" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/wood,
-/area/station/cargo/boutique)
"kyr" = (
/obj/structure/window/reinforced/spawner/directional/south,
/obj/machinery/airalarm/directional/west,
@@ -30860,28 +31036,15 @@
/obj/effect/turf_decal/trimline/neutral/line,
/turf/open/floor/iron,
/area/station/hallway/primary/central/fore)
-"kyZ" = (
-/obj/structure/disposalpipe/segment{
- dir = 6
- },
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
- dir = 1
- },
-/obj/effect/turf_decal/trimline/neutral/line{
- dir = 1
- },
-/obj/effect/turf_decal/trimline/neutral/line,
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/fore)
-"kzu" = (
+"kzo" = (
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
-/obj/effect/turf_decal/trimline/neutral/line{
- dir = 1
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
},
-/obj/effect/turf_decal/trimline/neutral/line,
+/obj/item/radio/intercom/directional/south,
/turf/open/floor/iron,
/area/station/hallway/primary/central/fore)
"kzv" = (
@@ -30894,25 +31057,6 @@
},
/turf/open/floor/iron/white/corner,
/area/station/hallway/secondary/exit/departure_lounge)
-"kzx" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/door/firedoor,
-/obj/effect/turf_decal/stripes/red/line{
- dir = 4
- },
-/obj/effect/turf_decal/stripes/red/line{
- dir = 8
- },
-/turf/open/floor/iron/small,
-/area/station/hallway/primary/central/fore)
-"kzz" = (
-/obj/effect/turf_decal/weather/dirt,
-/mob/living/basic/deer,
-/obj/structure/flora/bush/flowers_yw,
-/turf/open/floor/grass,
-/area/station/service/chapel)
"kzI" = (
/obj/effect/turf_decal/bot_white,
/obj/effect/spawner/random/structure/closet_empty/crate,
@@ -30924,13 +31068,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/maintenance/starboard/aft)
-"kzV" = (
-/obj/effect/landmark/start/hangover,
-/obj/effect/turf_decal/siding/wood{
- dir = 8
- },
-/turf/open/floor/stone,
-/area/station/service/chapel)
"kAf" = (
/obj/structure/transit_tube/station/dispenser/flipped{
dir = 1
@@ -30938,6 +31075,15 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron,
/area/station/maintenance/starboard/aft)
+"kAh" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 8
+ },
+/obj/structure/chair/wood{
+ dir = 4
+ },
+/turf/open/floor/wood/tile,
+/area/station/service/bar)
"kAn" = (
/obj/effect/spawner/random/structure/crate,
/turf/open/floor/plating,
@@ -31002,15 +31148,17 @@
/obj/machinery/atmospherics/pipe/smart/manifold/pink/visible,
/turf/closed/wall/mineral/titanium/nodiagonal,
/area/station/engineering/supermatter)
-"kBM" = (
-/obj/effect/turf_decal/siding/thinplating{
- dir = 8
- },
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+"kBO" = (
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/turf_decal/trimline/neutral/line{
dir = 4
},
-/obj/machinery/firealarm/directional/west,
-/turf/open/floor/eighties/red,
+/obj/effect/turf_decal/trimline/neutral/line{
+ dir = 8
+ },
+/obj/structure/cable,
+/turf/open/floor/iron,
/area/station/hallway/primary/central/fore)
"kBZ" = (
/obj/machinery/door/airlock/command{
@@ -31028,16 +31176,6 @@
/obj/effect/spawner/structure/window/reinforced/tinted,
/turf/open/floor/plating,
/area/station/command/heads_quarters/captain)
-"kCB" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/holopad,
-/obj/effect/landmark/event_spawn,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/wood,
-/area/station/cargo/boutique)
"kCC" = (
/obj/structure/sink/directional/west,
/obj/structure/table/bronze,
@@ -31100,6 +31238,20 @@
/obj/structure/chair/stool/directional/north,
/turf/open/floor/carpet/purple,
/area/station/commons/dorms)
+"kDX" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/turf_decal/plaque{
+ icon_state = "L8";
+ pixel_y = -15
+ },
+/obj/effect/turf_decal/trimline/neutral/line,
+/obj/effect/turf_decal/trimline/neutral/line{
+ dir = 1
+ },
+/obj/effect/landmark/observer_start,
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/aft)
"kDY" = (
/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible,
/obj/machinery/door/airlock/public/glass{
@@ -31115,6 +31267,10 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/commons/dorms)
+"kEg" = (
+/obj/machinery/light/floor,
+/turf/open/floor/wood/parquet,
+/area/station/service/library)
"kEs" = (
/obj/machinery/door/airlock/external/glass{
name = "Supply Door Airlock"
@@ -31241,15 +31397,6 @@
},
/turf/open/floor/iron/dark,
/area/station/medical/medbay/central)
-"kGw" = (
-/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/siding/thinplating{
- dir = 4
- },
-/turf/open/floor/eighties/red,
-/area/station/hallway/primary/central/fore)
"kGB" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 1
@@ -31354,17 +31501,19 @@
},
/turf/open/space/basic,
/area/station/engineering/atmos/space_catwalk)
-"kHU" = (
-/obj/effect/turf_decal/siding/thinplating_new/light{
- dir = 8
+"kIi" = (
+/obj/machinery/door/airlock/public/glass{
+ name = "Library"
},
-/obj/effect/landmark/start/botanist,
-/turf/open/floor/iron/white/small,
-/area/station/service/hydroponics)
-"kHX" = (
-/obj/effect/turf_decal/tile/neutral,
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/aft)
+/obj/machinery/door/firedoor,
+/obj/effect/turf_decal/siding/wood{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/wood{
+ dir = 1
+ },
+/turf/open/floor/iron/textured_half,
+/area/station/service/library)
"kIj" = (
/obj/structure/cable,
/obj/structure/disposalpipe/segment,
@@ -31394,6 +31543,14 @@
},
/turf/open/floor/iron/small,
/area/station/engineering/atmos/storage/gas)
+"kIu" = (
+/obj/effect/turf_decal/weather/dirt{
+ dir = 4
+ },
+/obj/structure/flora/bush/flowers_yw/style_2,
+/obj/structure/flora/bush/large/style_random,
+/turf/open/floor/grass,
+/area/station/service/chapel)
"kIv" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -31489,12 +31646,36 @@
/obj/machinery/holopad,
/turf/open/floor/iron/smooth_edge,
/area/station/engineering/supermatter/room)
+"kJv" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/light/small/directional/east,
+/turf/open/floor/engine/xenobio,
+/area/station/science/xenobiology)
"kJJ" = (
/obj/structure/cable,
/obj/effect/mapping_helpers/broken_floor,
/obj/effect/spawner/random/trash,
/turf/open/floor/plating,
/area/station/maintenance/port/lesser)
+"kJO" = (
+/obj/structure/table,
+/obj/machinery/microwave{
+ pixel_y = 5
+ },
+/obj/merge_conflict_marker{
+ name = "---Merge Conflict Marker---";
+
+ desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
+ },
+/obj/structure/table,
+/obj/item/storage/bag/tray,
+/obj/item/knife/kitchen{
+ pixel_y = 2
+ },
+/obj/effect/spawner/random/food_or_drink/cake_ingredients,
+/obj/item/kitchen/rollingpin,
+/turf/open/floor/iron/kitchen/small,
+/area/station/service/kitchen)
"kJR" = (
/obj/structure/disposalpipe/segment{
dir = 9
@@ -31509,45 +31690,52 @@
/obj/structure/cable,
/turf/open/floor/iron/stairs,
/area/station/engineering/storage/tech)
-"kJX" = (
+"kKa" = (
+/obj/structure/reagent_dispensers/fueltank,
+/turf/open/floor/plating,
+/area/station/maintenance/starboard/greater)
+"kKr" = (
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/structure/disposalpipe/segment,
-/obj/effect/turf_decal/trimline/neutral/line{
- dir = 4
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/cable,
+/obj/merge_conflict_marker{
+ name = "---Merge Conflict Marker---";
+
+ desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
},
-/obj/effect/turf_decal/trimline/neutral/line{
- dir = 8
+/obj/structure/disposalpipe/segment{
+ dir = 4
},
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/fore)
-"kKa" = (
-/obj/structure/reagent_dispensers/fueltank,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/cable,
+/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
-/area/station/maintenance/starboard/greater)
-"kKh" = (
+/area/station/maintenance/central/greater)
+"kKK" = (
+/obj/effect/spawner/random/trash,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/security/glass{
- id_tag = "outerbrig";
- name = "Brig"
+/obj/structure/disposalpipe/segment{
+ dir = 4
},
-/obj/effect/mapping_helpers/airlock/access/all/security/entrance,
-/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{
- cycle_id = "sci-entrance"
+/obj/merge_conflict_marker{
+ name = "---Merge Conflict Marker---";
+
+ desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
},
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/iron/textured_half,
-/area/station/security/brig/entrance)
-"kKD" = (
-/obj/structure/chair/comfy/brown,
-/obj/structure/sign/painting/library{
- pixel_x = 30
+/obj/effect/spawner/random/trash,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/disposalpipe/segment{
+ dir = 4
},
-/turf/open/floor/wood/parquet,
-/area/station/service/library)
+/obj/structure/cable,
+/turf/open/floor/plating,
+/area/station/maintenance/central/greater)
"kKT" = (
/obj/machinery/computer/camera_advanced/xenobio{
dir = 4
@@ -31594,16 +31782,6 @@
/obj/machinery/light/small/directional/south,
/turf/open/floor/carpet,
/area/station/medical/psychology)
-"kMA" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/light/warm/dim,
-/obj/machinery/camera/autoname/directional/south,
-/obj/structure/extinguisher_cabinet/directional/south,
-/obj/effect/turf_decal/tile/neutral,
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/aft)
"kMW" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -31674,6 +31852,16 @@
/obj/item/radio/intercom/directional/north,
/turf/open/floor/iron,
/area/station/hallway/secondary/dock)
+"kNN" = (
+/obj/machinery/door/firedoor,
+/obj/effect/turf_decal/stripes/red/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes/red/line,
+/obj/structure/cable,
+/obj/structure/disposalpipe/segment,
+/turf/open/floor/iron/small,
+/area/station/hallway/primary/central/fore)
"kNX" = (
/obj/structure/closet/masks,
/obj/structure/extinguisher_cabinet/directional/north,
@@ -31705,6 +31893,14 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/security/execution/transfer)
+"kOS" = (
+/obj/structure/table/wood,
+/obj/item/plate,
+/obj/item/food/cheesynachos{
+ pixel_y = 2
+ },
+/turf/open/floor/wood/large,
+/area/station/service/bar)
"kOT" = (
/obj/effect/turf_decal/tile/blue/anticorner/contrasted{
dir = 8
@@ -31735,28 +31931,6 @@
},
/turf/open/floor/iron/dark/side,
/area/station/security/execution/transfer)
-"kPo" = (
-/obj/structure/cable,
-/obj/structure/disposalpipe/segment{
- dir = 10
- },
-/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/port/greater)
-"kPp" = (
-/obj/structure/closet/secure_closet/bar,
-/obj/item/stack/spacecash/c1,
-/obj/item/stack/spacecash/c1,
-/obj/item/stack/spacecash/c1,
-/obj/item/stack/spacecash/c1,
-/obj/item/stack/spacecash/c1,
-/obj/machinery/airalarm/directional/north,
-/obj/effect/turf_decal/siding/wood{
- dir = 5
- },
-/turf/open/floor/stone,
-/area/station/service/bar/backroom)
"kPv" = (
/obj/structure/table,
/obj/item/paper_bin{
@@ -31768,6 +31942,16 @@
},
/turf/open/floor/iron/smooth,
/area/station/maintenance/solars/starboard/fore)
+"kPy" = (
+/obj/effect/spawner/random/trash,
+/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{
+ dir = 4
+ },
+/turf/open/floor/plating,
+/area/station/maintenance/central/greater)
"kPH" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -31782,40 +31966,6 @@
"kPW" = (
/turf/open/floor/plating,
/area/station/maintenance/port/fore)
-"kQc" = (
-/obj/structure/disposalpipe/segment,
-/obj/effect/turf_decal/trimline/neutral/line{
- dir = 4
- },
-/obj/effect/turf_decal/trimline/neutral/line{
- dir = 8
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/fore)
-"kQe" = (
-/obj/machinery/button/door/directional/west{
- id = "QMLoaddoor";
- layer = 4;
- name = "Loading Doors";
- pixel_y = -8;
- req_access = list("cargo")
- },
-/obj/machinery/button/door/directional/west{
- id = "QMLoaddoor2";
- layer = 4;
- name = "Loading Doors";
- pixel_y = 8;
- req_access = list("cargo")
- },
-/obj/effect/turf_decal/bot,
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/turf/open/floor/iron,
-/area/station/cargo/storage)
"kQk" = (
/obj/effect/turf_decal/siding/wood{
dir = 5
@@ -31847,14 +31997,6 @@
/obj/machinery/holopad,
/turf/open/floor/iron,
/area/station/cargo/storage)
-"kRs" = (
-/obj/effect/turf_decal/siding/wood{
- dir = 8
- },
-/obj/structure/table/wood,
-/obj/effect/landmark/start/hangover,
-/turf/open/floor/iron/grimy,
-/area/station/service/bar)
"kRt" = (
/obj/machinery/monkey_recycler,
/obj/effect/turf_decal/siding/white{
@@ -31874,17 +32016,6 @@
},
/turf/open/floor/engine/air,
/area/station/engineering/atmos/space_catwalk)
-"kRA" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
- dir = 8
- },
-/obj/effect/landmark/start/hangover,
-/obj/structure/chair/office{
- dir = 8
- },
-/turf/open/floor/wood/parquet,
-/area/station/service/library)
"kRE" = (
/obj/structure/disposalpipe/segment{
dir = 9
@@ -31979,6 +32110,15 @@
/obj/effect/spawner/random/maintenance,
/turf/open/floor/iron,
/area/station/maintenance/hallway/abandoned_command)
+"kSH" = (
+/obj/effect/turf_decal/siding/wood,
+/obj/machinery/camera/autoname/directional/north,
+/obj/structure/cable,
+/obj/structure/sign/painting/large/library{
+ dir = 1
+ },
+/turf/open/floor/wood/parquet,
+/area/station/service/library)
"kSO" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -31987,33 +32127,10 @@
/obj/machinery/photocopier,
/turf/open/floor/wood,
/area/station/command/heads_quarters/qm)
-"kTm" = (
-/obj/machinery/door/firedoor,
-/obj/effect/turf_decal/siding/wood{
- dir = 4
- },
-/turf/open/floor/iron/textured_half{
- dir = 8
- },
-/area/station/service/library)
"kTp" = (
/obj/structure/disposalpipe/segment,
/turf/closed/wall,
/area/station/command/heads_quarters/qm)
-"kTr" = (
-/obj/machinery/door/airlock/wood{
- name = "Bar Backroom"
- },
-/obj/effect/mapping_helpers/airlock/access/all/service/bar,
-/obj/structure/disposalpipe/segment,
-/obj/effect/turf_decal/siding/wood{
- dir = 8
- },
-/obj/effect/turf_decal/siding/wood{
- dir = 4
- },
-/turf/open/floor/stone,
-/area/station/service/bar)
"kTt" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -32045,15 +32162,6 @@
/obj/structure/tank_holder/extinguisher,
/turf/open/floor/catwalk_floor,
/area/station/science/xenobiology)
-"kTF" = (
-/obj/machinery/light/warm/dim,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/item/radio/intercom/directional/south,
-/obj/effect/turf_decal/tile/neutral,
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/aft)
"kTG" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -32065,17 +32173,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/catwalk_floor/iron_smooth,
/area/station/hallway/secondary/command)
-"kTX" = (
-/obj/machinery/door/firedoor,
-/obj/effect/turf_decal/stripes/red/line{
- dir = 8
- },
-/obj/effect/turf_decal/stripes/red/line{
- dir = 4
- },
-/obj/structure/cable,
-/turf/open/floor/iron/small,
-/area/station/hallway/primary/central/fore)
"kUf" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -32089,13 +32186,32 @@
},
/turf/open/floor/plating,
/area/station/maintenance/department/science/xenobiology)
-"kUL" = (
+"kUN" = (
+/obj/structure/toilet{
+ dir = 4
+ },
+/obj/machinery/light/small/directional/west,
+/obj/structure/sign/poster/official/random/directional/west,
+/obj/machinery/button/door/directional/north{
+ id = "Toilet1";
+ specialfunctions = 4;
+ name = "Lock Control";
+ normaldoorcontrol = 1
+ },
+/turf/open/floor/iron/white/small,
+/area/station/commons/toilet/restrooms)
+"kUQ" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/turf_decal/tile/blue{
+ dir = 1
+ },
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/effect/turf_decal/tile/neutral,
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/aft)
+/turf/open/floor/iron/dark/side{
+ dir = 1
+ },
+/area/station/hallway/primary/central/fore)
"kVb" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -32107,14 +32223,6 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/iron/smooth,
/area/station/hallway/secondary/command)
-"kVg" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/landmark/start/hangover,
-/obj/effect/turf_decal/siding/wood{
- dir = 1
- },
-/turf/open/floor/stone,
-/area/station/service/chapel)
"kVn" = (
/obj/structure/disposalpipe/segment,
/obj/structure/table/reinforced,
@@ -32153,6 +32261,15 @@
/obj/effect/mapping_helpers/airlock/abandoned,
/turf/open/floor/wood,
/area/station/maintenance/starboard/greater)
+"kWi" = (
+/obj/effect/turf_decal/tile/green/opposingcorners,
+/obj/effect/turf_decal/tile/blue/opposingcorners{
+ dir = 8
+ },
+/obj/machinery/hydroponics/constructable,
+/obj/machinery/light/small/directional/east,
+/turf/open/floor/iron,
+/area/station/service/hydroponics)
"kWk" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -32166,6 +32283,20 @@
/obj/machinery/firealarm/directional/west,
/turf/open/floor/iron/small,
/area/station/security/office)
+"kWE" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/structure/disposalpipe/segment,
+/obj/effect/turf_decal/trimline/neutral/line{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/neutral/line{
+ dir = 8
+ },
+/obj/structure/cable,
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/fore)
"kWJ" = (
/obj/structure/chair/sofa/bench/left{
dir = 1
@@ -32217,15 +32348,6 @@
},
/turf/open/floor/iron/white/small,
/area/station/security/warden)
-"kXC" = (
-/obj/structure/sign/clock/directional/north,
-/obj/structure/table/wood,
-/obj/machinery/reagentgrinder{
- pixel_x = -5;
- pixel_y = 10
- },
-/turf/open/floor/iron/dark/textured,
-/area/station/service/bar)
"kXM" = (
/obj/effect/spawner/random/structure/girder,
/obj/structure/barricade/wooden,
@@ -32257,6 +32379,13 @@
/obj/effect/landmark/navigate_destination/cargo,
/turf/open/floor/iron,
/area/station/hallway/primary/central/fore)
+"kYm" = (
+/obj/effect/turf_decal/tile/neutral/opposingcorners,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+ dir = 4
+ },
+/turf/open/floor/iron,
+/area/station/holodeck/rec_center)
"kYo" = (
/obj/effect/spawner/structure/window/reinforced/plasma,
/obj/machinery/atmospherics/pipe/layer_manifold/yellow/visible,
@@ -32323,13 +32452,6 @@
/obj/item/modular_computer/laptop,
/turf/open/floor/iron/grimy,
/area/station/science/cubicle)
-"kZj" = (
-/obj/effect/turf_decal/weather/dirt{
- dir = 1
- },
-/obj/structure/flora/grass/jungle/b/style_3,
-/turf/open/floor/grass,
-/area/station/service/chapel)
"kZx" = (
/obj/machinery/button/door/directional/north{
id = "main_surgery";
@@ -32368,13 +32490,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
/turf/open/floor/plating,
/area/station/science/ordnance/testlab)
-"kZI" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/turf_decal/siding/wood{
- dir = 1
- },
-/turf/open/floor/stone,
-/area/station/service/chapel)
"lae" = (
/obj/machinery/atmospherics/components/binary/pump/on{
name = "Cold Loop to Gas"
@@ -32401,19 +32516,6 @@
},
/turf/open/floor/iron/dark/small,
/area/station/maintenance/department/engine/atmos)
-"laK" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/effect/turf_decal/stripes/corner{
- dir = 4
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/fore)
"laL" = (
/obj/effect/turf_decal/tile/brown/half/contrasted{
dir = 4
@@ -32423,6 +32525,10 @@
dir = 8
},
/area/station/hallway/primary/central/fore)
+"laO" = (
+/obj/effect/turf_decal/tile/neutral,
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/aft)
"laU" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -32439,6 +32545,18 @@
/obj/machinery/airalarm/directional/west,
/turf/open/floor/iron/smooth,
/area/station/maintenance/solars/port/aft)
+"lbs" = (
+/obj/machinery/light/small/directional/east,
+/obj/structure/sign/poster/official/random/directional/north,
+/obj/effect/turf_decal/siding/wood/end{
+ dir = 4
+ },
+/turf/open/floor/wood,
+/area/station/hallway/primary/central/aft)
+"lbw" = (
+/obj/structure/flora/tree/jungle/style_5,
+/turf/open/floor/grass,
+/area/station/service/chapel)
"lbF" = (
/obj/effect/turf_decal/siding/thinplating_new/dark{
dir = 1
@@ -32517,30 +32635,6 @@
/obj/machinery/camera/directional/east,
/turf/open/floor/iron,
/area/station/hallway/secondary/entry)
-"lcD" = (
-/obj/effect/landmark/start/hangover,
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/aft)
-"lcF" = (
-/obj/machinery/status_display/evac/directional/east,
-/turf/open/floor/glass,
-/area/station/hallway/primary/central/aft)
-"lcY" = (
-/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/neutral{
- dir = 1
- },
-/obj/effect/landmark/navigate_destination/hop,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/fore)
"lda" = (
/obj/effect/turf_decal/tile/brown/opposingcorners,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -32551,9 +32645,29 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/plating,
/area/station/maintenance/department/engine)
+"ldh" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/turf_decal/trimline/neutral/line,
+/obj/effect/turf_decal/trimline/neutral/line{
+ dir = 1
+ },
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/aft)
"ldq" = (
/turf/closed/wall,
/area/station/maintenance/department/science/xenobiology)
+"lds" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/structure/cable,
+/obj/machinery/duct,
+/obj/effect/decal/cleanable/dirt,
+/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/central/lesser)
"ldx" = (
/obj/effect/turf_decal/tile/neutral/fourcorners,
/obj/effect/decal/cleanable/dirt,
@@ -32587,20 +32701,6 @@
},
/turf/open/floor/iron/cafeteria,
/area/station/science/circuits)
-"lei" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/turf_decal/siding/wood{
- dir = 1
- },
-/obj/effect/turf_decal/siding/wood,
-/obj/machinery/door/airlock/public/glass{
- name = "Chapel Office"
- },
-/obj/machinery/door/firedoor,
-/obj/effect/mapping_helpers/airlock/access/all/service/chapel_office,
-/turf/open/floor/iron/textured_half,
-/area/station/service/chapel/office)
"lek" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/white/corner{
@@ -32614,39 +32714,6 @@
dir = 1
},
/area/station/medical/treatment_center)
-"leB" = (
-/obj/structure/table,
-/obj/effect/turf_decal/tile/dark_red,
-/obj/effect/decal/cleanable/dirt,
-/obj/item/food/gumball{
- pixel_x = 5;
- pixel_y = 9
- },
-/obj/item/cigarette/candy{
- pixel_x = -3;
- pixel_y = 10
- },
-/obj/item/food/gumball{
- pixel_x = 2;
- pixel_y = 5
- },
-/obj/item/weldingtool/mini{
- pixel_x = 5;
- pixel_y = -11
- },
-/obj/item/screwdriver{
- pixel_x = 2;
- pixel_y = -3
- },
-/obj/item/storage/box/prisoner{
- pixel_x = 5;
- pixel_y = -12
- },
-/obj/structure/disposalpipe/segment{
- dir = 10
- },
-/turf/open/floor/iron/dark,
-/area/station/security/processing)
"leC" = (
/obj/structure/cable,
/obj/effect/turf_decal/tile/dark_red/opposingcorners,
@@ -32834,6 +32901,13 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/small,
/area/station/maintenance/department/electrical)
+"lgv" = (
+/obj/structure/flora/bush/jungle/c/style_3{
+ pixel_x = -7;
+ pixel_y = 10
+ },
+/turf/open/floor/grass,
+/area/station/service/chapel)
"lgw" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -32856,6 +32930,14 @@
dir = 1
},
/area/station/hallway/primary/aft)
+"lgy" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/landmark/start/hangover,
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/aft)
"lgG" = (
/obj/structure/chair/sofa/bench/left{
dir = 4
@@ -32869,25 +32951,11 @@
dir = 1
},
/area/station/hallway/secondary/exit/departure_lounge)
-"lgQ" = (
-/obj/machinery/computer/security/telescreen/cmo/directional/west,
-/turf/open/floor/wood/parquet,
-/area/station/command/heads_quarters/cmo)
"lgV" = (
/obj/structure/table,
/obj/item/camera,
/turf/open/floor/iron,
/area/station/security/prison/workout)
-"lhi" = (
-/obj/machinery/airalarm/directional/north,
-/obj/machinery/button/door/directional/north{
- id = "vaco";
- name = "Comissary Shutters";
- pixel_x = 29
- },
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron/dark/small,
-/area/station/maintenance/central/lesser)
"lhl" = (
/obj/effect/spawner/random/trash/graffiti{
pixel_x = 32;
@@ -32943,35 +33011,24 @@
/obj/item/pickaxe,
/turf/open/misc/asteroid,
/area/station/maintenance/starboard/greater)
-"lhT" = (
-/obj/structure/disposalpipe/segment{
- dir = 9
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/aft)
"lhZ" = (
/obj/machinery/suit_storage_unit/engine,
/obj/structure/cable,
/obj/structure/sign/poster/official/random/directional/north,
/turf/open/floor/plating,
/area/station/engineering/supermatter/room)
-"lir" = (
+"lit" = (
+/obj/structure/cable,
+/obj/effect/turf_decal/trimline/neutral/line,
+/obj/effect/turf_decal/trimline/neutral/line{
+ dir = 1
+ },
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/machinery/firealarm/directional/south,
-/obj/effect/turf_decal/tile/neutral,
+/obj/structure/disposalpipe/segment,
/turf/open/floor/iron,
-/area/station/hallway/primary/central/aft)
-"liw" = (
-/obj/effect/turf_decal/siding/wood/end{
- dir = 8
- },
-/obj/effect/landmark/navigate_destination/kitchen,
-/turf/open/floor/wood,
-/area/station/hallway/primary/central/aft)
+/area/station/hallway/primary/port)
"lix" = (
/obj/structure/table/reinforced,
/obj/item/grenade/chem_grenade/cleaner{
@@ -33050,27 +33107,6 @@
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plating/rust,
/area/station/maintenance/department/engine/atmos)
-"ljg" = (
-/obj/structure/kitchenspike,
-/obj/effect/turf_decal/weather/snow/corner{
- dir = 5
- },
-/obj/effect/turf_decal/weather/snow,
-/obj/machinery/airalarm/directional/north,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
- dir = 8
- },
-/turf/open/floor/iron/freezer,
-/area/station/service/kitchen/coldroom)
-"lji" = (
-/obj/effect/turf_decal/weather/dirt{
- dir = 1
- },
-/obj/structure/flora/bush/flowers_yw/style_3,
-/obj/structure/extinguisher_cabinet/directional/north,
-/obj/machinery/camera/directional/north,
-/turf/open/floor/grass,
-/area/station/service/chapel)
"ljl" = (
/obj/structure/lattice,
/obj/structure/railing/corner{
@@ -33131,16 +33167,6 @@
},
/turf/open/floor/iron/white/small,
/area/station/command/heads_quarters/cmo)
-"ljT" = (
-/obj/structure/window/spawner/directional/east,
-/obj/structure/window/spawner/directional/west,
-/obj/machinery/light/floor,
-/obj/structure/flora/bush/sparsegrass,
-/obj/structure/flora/bush/flowers_br,
-/obj/structure/flora/bush/flowers_pp,
-/obj/structure/flora/bush/flowers_yw,
-/turf/open/floor/grass,
-/area/station/service/hydroponics)
"ljZ" = (
/obj/machinery/modular_computer/preset/civilian{
dir = 1
@@ -33202,10 +33228,13 @@
},
/turf/open/floor/iron,
/area/station/cargo/storage)
-"lkJ" = (
-/obj/structure/flora/rock/pile/jungle/style_4,
-/turf/open/floor/grass,
-/area/station/service/chapel)
+"lkO" = (
+/obj/effect/turf_decal/siding/thinplating{
+ dir = 5
+ },
+/obj/structure/cable,
+/turf/open/floor/eighties,
+/area/station/hallway/primary/central/fore)
"lkR" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -33221,6 +33250,13 @@
/obj/effect/turf_decal/stripes/white/line,
/turf/open/floor/iron/dark,
/area/station/cargo/storage)
+"llm" = (
+/obj/effect/spawner/random/entertainment/arcade{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/thinplating,
+/turf/open/floor/eighties/red,
+/area/station/hallway/primary/central/fore)
"llC" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/effect/turf_decal/trimline/blue/filled/line{
@@ -33270,15 +33306,6 @@
"llW" = (
/turf/closed/wall,
/area/station/ai_monitored/security/armory)
-"llY" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/siding/wideplating_new/terracotta{
- dir = 4
- },
-/turf/open/floor/wood/tile,
-/area/station/maintenance/central/lesser)
"lmb" = (
/obj/structure/cable,
/obj/machinery/door/airlock{
@@ -33292,23 +33319,11 @@
/obj/effect/landmark/event_spawn,
/turf/open/floor/carpet/donk,
/area/station/command/heads_quarters/qm)
-"lmm" = (
-/mob/living/basic/frog,
-/obj/effect/turf_decal/weather/dirt{
- dir = 5
- },
-/obj/structure/flora/rock/pile/jungle/style_4,
-/obj/structure/flora/bush/flowers_pp/style_2,
-/turf/open/floor/grass,
-/area/station/service/chapel)
"lmv" = (
/obj/structure/disposalpipe/segment,
/obj/item/kirbyplants/random,
/turf/open/floor/iron/grimy,
/area/station/command/heads_quarters/qm)
-"lmz" = (
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/fore)
"lmR" = (
/obj/structure/dresser,
/obj/structure/sign/poster/contraband/random/directional/east,
@@ -33336,43 +33351,11 @@
dir = 4
},
/area/station/hallway/secondary/construction)
-"lnD" = (
-/obj/effect/turf_decal/siding/wood/corner{
- dir = 8
- },
-/turf/open/floor/stone,
-/area/station/service/bar)
"lnI" = (
/obj/effect/turf_decal/sand/plating,
/obj/structure/ore_box,
/turf/open/floor/plating,
/area/station/maintenance/starboard/greater)
-"lnN" = (
-/obj/effect/turf_decal/tile/blue/opposingcorners{
- dir = 8
- },
-/obj/effect/turf_decal/tile/green/opposingcorners,
-/obj/structure/table,
-/obj/item/reagent_containers/cup/bottle/mutagen{
- pixel_x = -5;
- pixel_y = 8
- },
-/obj/item/reagent_containers/syringe{
- pixel_x = -3;
- pixel_y = -1
- },
-/obj/item/reagent_containers/cup/watering_can{
- pixel_x = 7;
- pixel_y = 13
- },
-/obj/item/reagent_containers/spray/plantbgone{
- pixel_x = 6;
- pixel_y = 1
- },
-/obj/machinery/light/small/directional/west,
-/obj/structure/sign/poster/official/random/directional/north,
-/turf/open/floor/iron,
-/area/station/service/hydroponics)
"lnW" = (
/obj/effect/turf_decal/tile/neutral/full,
/obj/structure/chair{
@@ -33391,6 +33374,16 @@
},
/turf/open/floor/iron/dark,
/area/station/security/processing)
+"loa" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 5
+ },
+/turf/open/floor/iron,
+/area/station/hallway/primary/port)
"loj" = (
/obj/effect/turf_decal/tile/brown/half/contrasted{
dir = 4
@@ -33441,15 +33434,24 @@
/obj/machinery/holopad,
/turf/open/floor/stone,
/area/station/command/heads_quarters/hos)
-"loN" = (
-/obj/effect/turf_decal/tile/neutral{
+"loR" = (
+/obj/machinery/skill_station,
+/obj/structure/sign/painting/library{
+ pixel_x = 30
+ },
+/turf/open/floor/wood/parquet,
+/area/station/service/library)
+"lpf" = (
+/obj/effect/turf_decal/trimline/neutral/line,
+/obj/effect/turf_decal/trimline/neutral/line{
dir = 1
},
-/obj/structure/disposalpipe/segment,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/navbeacon{
+ codes_txt = "patrol;next_patrol=1.0-Security-PNexus";
+ location = "23.2-Evac-Garden"
+ },
/turf/open/floor/iron,
-/area/station/hallway/primary/central/aft)
+/area/station/hallway/primary/port)
"lpC" = (
/turf/open/floor/plating,
/area/station/service/chapel/funeral)
@@ -33529,14 +33531,6 @@
"lql" = (
/turf/open/floor/wood/parquet,
/area/station/service/library)
-"lqq" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/obj/effect/landmark/navigate_destination/chapel,
-/turf/open/floor/iron,
-/area/station/hallway/primary/port)
"lqt" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -33600,6 +33594,10 @@
},
/turf/open/floor/iron/dark,
/area/station/security/office)
+"lsc" = (
+/obj/structure/sign/nanotrasen,
+/turf/closed/wall,
+/area/station/maintenance/central/greater)
"lsd" = (
/obj/machinery/photocopier,
/turf/open/floor/iron/grimy,
@@ -33613,19 +33611,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/small,
/area/station/service/barber)
-"lso" = (
-/obj/effect/mapping_helpers/airlock/access/all/service/bar,
-/obj/machinery/door/airlock/wood{
- name = "Bar Backroom"
- },
-/obj/effect/turf_decal/siding/wood{
- dir = 4
- },
-/obj/effect/turf_decal/siding/wood{
- dir = 8
- },
-/turf/open/floor/stone,
-/area/station/service/bar)
"lsK" = (
/obj/structure/lattice,
/obj/machinery/atmospherics/pipe/smart/simple/brown/visible,
@@ -33637,10 +33622,14 @@
dir = 1
},
/area/station/science/lower)
-"lsP" = (
-/obj/structure/flora/grass/jungle/b/style_5,
-/turf/open/floor/grass,
-/area/station/service/chapel)
+"lsV" = (
+/obj/structure/table/wood,
+/obj/effect/turf_decal/siding/wood{
+ dir = 6
+ },
+/obj/machinery/chem_dispenser/drinks,
+/turf/open/floor/iron/dark/textured,
+/area/station/service/bar)
"lsY" = (
/obj/effect/turf_decal/tile/dark_red/opposingcorners,
/obj/structure/closet/secure_closet/security/sec,
@@ -33648,15 +33637,6 @@
dir = 1
},
/area/station/security/execution/transfer)
-"lte" = (
-/obj/effect/turf_decal/tile/brown/opposingcorners{
- dir = 1
- },
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
- dir = 8
- },
-/turf/open/floor/iron,
-/area/station/commons/vacant_room/commissary)
"lto" = (
/obj/structure/disposalpipe/segment,
/obj/structure/cable,
@@ -33672,12 +33652,6 @@
/obj/structure/holosign/barrier/atmos/tram,
/turf/open/floor/plating,
/area/station/security/tram)
-"ltr" = (
-/obj/effect/turf_decal/siding/thinplating_new/light{
- dir = 6
- },
-/turf/open/floor/iron/white/small,
-/area/station/service/hydroponics)
"ltz" = (
/obj/effect/turf_decal/siding/red{
dir = 4
@@ -33760,39 +33734,12 @@
},
/turf/open/space/basic,
/area/space/nearstation)
-"luD" = (
-/obj/structure/table/reinforced,
-/obj/structure/desk_bell{
- pixel_x = 4;
- pixel_y = 3
- },
-/obj/machinery/door/firedoor/border_only{
- dir = 4
- },
-/obj/machinery/door/poddoor/shutters{
- name = "Kitchen Shutters";
- id = "kitchenshutters"
- },
-/turf/open/floor/plating,
-/area/station/service/kitchen)
-"luE" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/landmark/event_spawn,
-/turf/open/floor/wood/tile,
-/area/station/service/bar)
"luG" = (
/obj/structure/disposalpipe/segment,
/obj/effect/turf_decal/tile/neutral/opposingcorners,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron,
/area/station/commons/fitness/recreation/entertainment)
-"luP" = (
-/obj/effect/landmark/start/hangover,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
- dir = 1
- },
-/turf/open/floor/wood/tile,
-/area/station/service/bar)
"lvc" = (
/turf/open/floor/iron/smooth,
/area/station/security/checkpoint/escape)
@@ -33810,15 +33757,6 @@
/obj/structure/lattice,
/turf/open/space/basic,
/area/space/nearstation)
-"lvr" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/effect/landmark/navigate_destination/bar,
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/fore)
"lvu" = (
/obj/effect/turf_decal/tile/brown{
dir = 4
@@ -33857,10 +33795,6 @@
/obj/machinery/atmospherics/components/trinary/filter/critical,
/turf/open/floor/catwalk_floor/iron_smooth,
/area/station/engineering/supermatter/room)
-"lvJ" = (
-/obj/structure/flora/bush/flowers_br,
-/turf/open/floor/grass,
-/area/station/service/chapel)
"lvK" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/stripes/line{
@@ -33895,6 +33829,11 @@
},
/turf/open/floor/iron/white,
/area/station/medical/medbay/lobby)
+"lwl" = (
+/obj/structure/flora/bush/jungle/c/style_3,
+/obj/effect/turf_decal/weather/dirt,
+/turf/open/floor/grass,
+/area/station/service/chapel)
"lwn" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/door/airlock/hatch,
@@ -33917,15 +33856,6 @@
},
/turf/open/floor/iron/dark,
/area/station/science/ordnance)
-"lwC" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/landmark/generic_maintenance_landmark,
-/obj/structure/table,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/plating,
-/area/station/maintenance/port/greater)
"lwI" = (
/obj/effect/turf_decal/tile/brown/opposingcorners,
/obj/machinery/computer/security/mining{
@@ -33934,6 +33864,20 @@
/obj/machinery/camera/autoname/directional/west,
/turf/open/floor/iron,
/area/station/cargo/miningoffice)
+"lwK" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/door/firedoor,
+/obj/effect/turf_decal/stripes/red/line{
+ dir = 4
+ },
+/obj/effect/turf_decal/stripes/red/line{
+ dir = 8
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/open/floor/iron/small,
+/area/station/hallway/secondary/exit/departure_lounge)
"lwW" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/structure/cable,
@@ -34049,6 +33993,22 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/fore)
+"lyP" = (
+/obj/structure/rack,
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/obj/item/clothing/gloves/color/fyellow{
+ pixel_y = 2
+ },
+/obj/item/wrench,
+/obj/item/cigarette/xeno{
+ pixel_x = -3;
+ pixel_y = -9
+ },
+/obj/item/clothing/head/utility/welding,
+/turf/open/floor/iron/small,
+/area/station/maintenance/department/engine/atmos)
"lyQ" = (
/obj/structure/table,
/obj/item/storage/photo_album/prison,
@@ -34111,22 +34071,6 @@
/obj/effect/landmark/event_spawn,
/turf/open/floor/iron,
/area/station/cargo/storage)
-"lzB" = (
-/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{
- dir = 4
- },
-/turf/open/floor/plating,
-/area/station/maintenance/central/greater)
-"lzG" = (
-/obj/structure/flora/bush/jungle/c/style_3{
- pixel_x = -7;
- pixel_y = 10
- },
-/turf/open/floor/grass,
-/area/station/service/chapel)
"lzM" = (
/turf/closed/wall,
/area/station/security/tram)
@@ -34149,6 +34093,19 @@
/obj/structure/window/spawner/directional/north,
/turf/open/floor/grass,
/area/station/cargo/storage)
+"lAa" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/machinery/door/airlock{
+ name = "Maintenance"
+ },
+/obj/effect/mapping_helpers/airlock/access/any/service/maintenance,
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/plating,
+/area/station/holodeck/rec_center)
"lAk" = (
/obj/effect/turf_decal/siding/white{
dir = 9
@@ -34169,16 +34126,6 @@
},
/turf/open/floor/iron,
/area/station/cargo/office)
-"lAt" = (
-/obj/machinery/door/airlock{
- name = "Kitchen"
- },
-/obj/effect/mapping_helpers/airlock/access/all/service/kitchen,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/door/firedoor,
-/turf/open/floor/iron/kitchen/small,
-/area/station/service/kitchen)
"lAO" = (
/obj/effect/mapping_helpers/broken_floor,
/obj/effect/decal/cleanable/dirt,
@@ -34205,22 +34152,15 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/central/fore)
+"lAT" = (
+/turf/closed/wall/rust,
+/area/station/cargo/drone_bay)
"lAU" = (
/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,
/area/station/maintenance/solars/starboard/aft)
-"lAV" = (
-/obj/structure/table/wood,
-/obj/structure/displaycase/forsale/kitchen{
- pixel_y = 8
- },
-/obj/structure/disposalpipe/segment{
- dir = 9
- },
-/turf/open/floor/wood/large,
-/area/station/service/bar)
"lBf" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/siding/wood{
@@ -34230,6 +34170,13 @@
/obj/structure/chair/stool/directional/west,
/turf/open/floor/iron/small,
/area/station/maintenance/port/lesser)
+"lBk" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral,
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/aft)
"lBm" = (
/obj/effect/turf_decal/stripes/box,
/obj/structure/disposalpipe/trunk,
@@ -34270,19 +34217,6 @@
},
/turf/open/space/basic,
/area/space/nearstation)
-"lBq" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/obj/machinery/airalarm/directional/west,
-/obj/structure/disposalpipe/segment{
- dir = 5
- },
-/turf/open/floor/iron/small,
-/area/station/medical/medbay/lobby)
"lBw" = (
/obj/effect/turf_decal/siding/yellow,
/obj/effect/turf_decal/siding/yellow{
@@ -34315,6 +34249,16 @@
/obj/effect/landmark/navigate_destination/tools,
/turf/open/floor/iron,
/area/station/hallway/primary/fore)
+"lBC" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/fore)
"lBN" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/door/airlock/security{
@@ -34324,6 +34268,18 @@
/obj/effect/mapping_helpers/airlock/access/all/security/detective,
/turf/open/floor/iron/textured_half,
/area/station/security/detectives_office)
+"lBX" = (
+/obj/structure/cable,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/spawner/random/trash,
+/turf/open/floor/iron/stairs{
+ dir = 8
+ },
+/area/station/maintenance/port/greater)
"lCg" = (
/obj/structure/chair{
dir = 4
@@ -34346,6 +34302,18 @@
/obj/machinery/light/small/directional/south,
/turf/open/floor/iron/cafeteria,
/area/station/science/circuits)
+"lCq" = (
+/obj/structure/cable,
+/obj/effect/turf_decal/tile/red{
+ dir = 4
+ },
+/obj/structure/disposalpipe/junction/flip{
+ dir = 2
+ },
+/turf/open/floor/iron/white/corner{
+ dir = 1
+ },
+/area/station/hallway/secondary/exit/departure_lounge)
"lCt" = (
/obj/effect/turf_decal/siding/red{
dir = 1
@@ -34362,13 +34330,6 @@
/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/iron,
/area/station/engineering/lobby)
-"lCK" = (
-/obj/structure/disposalpipe/segment,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/camera/directional/east,
-/obj/effect/turf_decal/tile/neutral,
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/fore)
"lCN" = (
/obj/structure/falsewall,
/turf/open/floor/plating,
@@ -34448,20 +34409,22 @@
/obj/effect/landmark/start/cargo_technician,
/turf/open/floor/iron/dark,
/area/station/cargo/office)
-"lEs" = (
-/obj/structure/extinguisher_cabinet/directional/east,
-/obj/effect/turf_decal/tile/neutral/opposingcorners{
- dir = 1
- },
-/obj/effect/turf_decal/siding/thinplating_new{
- dir = 4
+"lEA" = (
+/obj/machinery/door/morgue{
+ name = "Private Study";
+ req_access = list("library")
},
-/obj/machinery/computer/order_console/cook{
- dir = 8
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/plating,
+/area/station/maintenance/central/greater)
+"lEB" = (
+/obj/effect/turf_decal/weather/dirt{
+ dir = 5
},
-/obj/effect/turf_decal/delivery,
-/turf/open/floor/iron/small,
-/area/station/hallway/secondary/service)
+/obj/structure/flora/bush/large/style_random,
+/turf/open/floor/grass,
+/area/station/service/chapel)
"lEJ" = (
/obj/machinery/door/poddoor{
id = "QMLoaddoor";
@@ -34498,14 +34461,6 @@
},
/turf/open/floor/wood/tile,
/area/station/maintenance/aft)
-"lEO" = (
-/obj/structure/cable,
-/obj/effect/spawner/random/structure/steam_vent,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/plating,
-/area/station/maintenance/central/greater)
"lER" = (
/turf/open/floor/iron/dark,
/area/station/maintenance/department/engine/atmos)
@@ -34515,12 +34470,6 @@
},
/turf/open/floor/plating,
/area/station/maintenance/hallway/abandoned_command)
-"lFq" = (
-/obj/structure/cable,
-/obj/machinery/power/apc/auto_name/directional/east,
-/obj/machinery/exodrone_launcher,
-/turf/open/floor/iron/smooth,
-/area/station/cargo/drone_bay)
"lFE" = (
/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/corner{
@@ -34575,6 +34524,17 @@
/obj/machinery/pdapainter/supply,
/turf/open/floor/wood,
/area/station/command/heads_quarters/qm)
+"lGn" = (
+/obj/structure/flora/bush/flowers_br/style_random,
+/obj/machinery/status_display/evac/directional/north,
+/obj/effect/turf_decal/weather/dirt{
+ dir = 5
+ },
+/obj/effect/turf_decal/weather/dirt{
+ dir = 6
+ },
+/turf/open/floor/grass,
+/area/station/service/chapel)
"lGo" = (
/obj/structure/window/reinforced/spawner/directional/east,
/obj/structure/window/reinforced/spawner/directional/north,
@@ -34676,13 +34636,10 @@
dir = 1
},
/area/station/science/lower)
-"lHp" = (
-/obj/effect/turf_decal/siding/thinplating{
- dir = 9
- },
-/obj/structure/sign/poster/official/tactical_game_cards/directional/west,
-/turf/open/floor/eighties/red,
-/area/station/hallway/primary/central/fore)
+"lHq" = (
+/obj/machinery/vending/games,
+/turf/open/floor/wood/parquet,
+/area/station/service/library)
"lHt" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/effect/turf_decal/tile/blue/fourcorners,
@@ -34692,6 +34649,19 @@
"lHz" = (
/turf/open/floor/iron/smooth,
/area/station/maintenance/solars/port/aft)
+"lHG" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
+/obj/effect/landmark/event_spawn,
+/obj/effect/turf_decal/trimline/neutral/line,
+/obj/effect/turf_decal/trimline/neutral/line{
+ dir = 1
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 5
+ },
+/turf/open/floor/iron,
+/area/station/hallway/primary/port)
"lHJ" = (
/obj/effect/turf_decal/tile/yellow/half/contrasted{
dir = 8
@@ -34822,34 +34792,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/freezer,
/area/station/command/heads_quarters/captain/private)
-"lJg" = (
-/obj/structure/disposalpipe/segment,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/iron/white,
-/area/station/medical/medbay/lobby)
-"lJm" = (
-/obj/effect/turf_decal/siding/wood{
- dir = 1
- },
-/obj/effect/turf_decal/siding/wood,
-/obj/effect/spawner/random/vending/colavend,
-/turf/open/floor/stone,
-/area/station/service/bar)
-"lJB" = (
-/obj/item/radio/intercom/directional/north{
- broadcasting = 1;
- frequency = 1447;
- name = "Private Channel";
- pixel_x = -26
- },
-/obj/machinery/computer/security/telescreen/aiupload/directional/west,
-/obj/item/radio/intercom/directional/north,
-/turf/open/floor/iron/dark,
-/area/station/ai_monitored/turret_protected/ai_upload_foyer)
"lJF" = (
/obj/machinery/meter,
/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible{
@@ -34879,6 +34821,13 @@
},
/turf/open/floor/plating,
/area/station/construction/mining/aux_base)
+"lKw" = (
+/obj/effect/landmark/start/hangover,
+/obj/structure/chair/wood{
+ dir = 8
+ },
+/turf/open/floor/wood/tile,
+/area/station/service/bar)
"lKA" = (
/obj/structure/cable,
/obj/structure/disposalpipe/segment,
@@ -34893,13 +34842,6 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/central/fore)
-"lKB" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
- dir = 4
- },
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/iron/white,
-/area/station/medical/medbay/lobby)
"lKG" = (
/obj/effect/mapping_helpers/broken_floor,
/turf/open/floor/iron,
@@ -34938,17 +34880,6 @@
},
/turf/open/floor/plating,
/area/station/maintenance/department/engine/atmos)
-"lLi" = (
-/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/mining{
- name = "Drone Bay"
- },
-/obj/effect/mapping_helpers/airlock/access/any/supply/maintenance,
-/obj/machinery/door/firedoor,
-/turf/open/floor/plating,
-/area/station/cargo/drone_bay)
"lLq" = (
/obj/machinery/firealarm/directional/east,
/obj/effect/decal/cleanable/oil,
@@ -35070,6 +35001,29 @@
/obj/effect/decal/cleanable/cobweb/cobweb2,
/turf/open/floor/iron/grimy,
/area/station/service/library)
+"lMQ" = (
+/obj/effect/turf_decal/weather/snow,
+/obj/structure/closet/secure_closet/freezer/fridge,
+/obj/effect/turf_decal/weather/snow/corner,
+/obj/item/food/meat/bacon,
+/obj/item/food/meat/bacon,
+/obj/item/food/meat/slab/monkey,
+/obj/item/food/meat/slab/monkey,
+/obj/item/food/meat/slab/monkey,
+/turf/open/floor/iron/freezer,
+/area/station/service/kitchen/coldroom)
+"lMV" = (
+/obj/effect/turf_decal/siding/wood/corner{
+ dir = 8
+ },
+/turf/open/floor/wood/parquet,
+/area/station/service/library)
+"lNa" = (
+/obj/effect/turf_decal/siding/thinplating_new/light{
+ dir = 9
+ },
+/turf/open/floor/iron/white/small,
+/area/station/service/hydroponics)
"lNf" = (
/obj/effect/turf_decal/siding/blue,
/turf/open/floor/iron/white/small,
@@ -35127,19 +35081,6 @@
},
/turf/open/floor/iron/small,
/area/station/engineering/atmos)
-"lNF" = (
-/obj/effect/spawner/random/entertainment/lighter,
-/obj/item/cigarette/rollie/mindbreaker{
- pixel_x = -2;
- pixel_y = 6
- },
-/obj/item/cigarette/rollie/trippy{
- pixel_x = 4
- },
-/obj/effect/mapping_helpers/burnt_floor,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating,
-/area/station/maintenance/starboard/greater)
"lNJ" = (
/obj/effect/turf_decal/siding/yellow{
dir = 6
@@ -35168,6 +35109,16 @@
/obj/effect/landmark/navigate_destination/court,
/turf/open/floor/iron,
/area/station/hallway/primary/starboard)
+"lOd" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/turf_decal/tile/red{
+ dir = 4
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/open/floor/iron/white/corner,
+/area/station/hallway/secondary/exit/departure_lounge)
"lOi" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -35185,6 +35136,10 @@
/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible,
/turf/open/floor/iron/small,
/area/station/engineering/atmos)
+"lOv" = (
+/obj/structure/disposalpipe/segment,
+/turf/open/floor/iron/white/side,
+/area/station/hallway/primary/central/aft)
"lOC" = (
/obj/structure/lattice/catwalk,
/obj/structure/cable,
@@ -35210,6 +35165,16 @@
},
/turf/open/floor/iron/white/small,
/area/station/science/lobby)
+"lOV" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/door/airlock/grunge{
+ name = "Vacant Comissary"
+ },
+/turf/open/floor/iron/textured_half{
+ dir = 1
+ },
+/area/station/maintenance/central/lesser)
"lOY" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -35230,24 +35195,12 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/central/fore)
-"lPq" = (
-/obj/structure/flora/bush/flowers_yw/style_2,
-/turf/open/floor/grass,
-/area/station/service/chapel)
"lPw" = (
/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible/layer2{
dir = 5
},
/turf/open/floor/iron,
/area/station/engineering/atmos/pumproom)
-"lPB" = (
-/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 = 1
- },
-/turf/open/floor/stone,
-/area/station/service/chapel)
"lPC" = (
/obj/structure/bookcase/random,
/obj/effect/turf_decal/tile/neutral/fourcorners,
@@ -35264,12 +35217,6 @@
/obj/machinery/announcement_system,
/turf/open/floor/iron/grimy,
/area/station/tcommsat/server)
-"lPK" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/mapping_helpers/broken_floor,
-/obj/structure/reagent_dispensers/fueltank,
-/turf/open/floor/plating,
-/area/station/maintenance/port/greater)
"lPO" = (
/obj/structure/table,
/obj/item/surgery_tray/full{
@@ -35385,12 +35332,6 @@
},
/turf/open/floor/iron,
/area/station/engineering/atmos/pumproom)
-"lRU" = (
-/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/herringbone,
-/area/station/ai_monitored/command/nuke_storage)
"lRV" = (
/obj/structure/disposalpipe/segment,
/obj/effect/turf_decal/siding/dark_red{
@@ -35448,18 +35389,6 @@
/obj/machinery/chem_heater/withbuffer,
/turf/open/floor/iron/dark,
/area/station/medical/pharmacy)
-"lTa" = (
-/obj/effect/turf_decal/siding/wideplating/dark/corner{
- dir = 8
- },
-/obj/effect/turf_decal/tile/dark_red/half/contrasted{
- dir = 1
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/station/security/brig/entrance)
"lTg" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/mapping_helpers/broken_floor,
@@ -35482,13 +35411,6 @@
},
/turf/open/floor/iron/dark,
/area/station/cargo/storage)
-"lTy" = (
-/obj/effect/turf_decal/siding/wood/corner{
- dir = 1
- },
-/obj/effect/turf_decal/siding/wood,
-/turf/open/floor/stone,
-/area/station/service/bar)
"lTA" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/siding/wood{
@@ -35523,19 +35445,6 @@
},
/turf/open/floor/tram,
/area/station/maintenance/department/medical/central)
-"lUl" = (
-/obj/effect/turf_decal/plaque{
- icon_state = "L1";
- pixel_y = -15
- },
-/obj/structure/disposalpipe/segment{
- dir = 9
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/aft)
"lUo" = (
/turf/open/floor/iron,
/area/station/science/lobby)
@@ -35548,6 +35457,12 @@
/obj/structure/cable,
/turf/open/space/basic,
/area/space/nearstation)
+"lUx" = (
+/obj/machinery/atmospherics/pipe/smart/simple/general/visible{
+ dir = 4
+ },
+/turf/open/floor/engine/xenobio,
+/area/station/science/xenobiology)
"lUz" = (
/obj/structure/disposalpipe/segment{
dir = 6
@@ -35597,6 +35512,14 @@
/obj/structure/window/spawner/directional/west,
/turf/open/floor/plating,
/area/station/cargo/sorting)
+"lUV" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/effect/landmark/start/hangover,
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/fore)
"lVg" = (
/obj/structure/transit_tube/horizontal,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -35646,22 +35569,6 @@
/obj/machinery/light/small/directional/west,
/turf/open/floor/iron/large,
/area/station/hallway/primary/central/fore)
-"lWp" = (
-/obj/structure/table,
-/obj/machinery/light/small/directional/west,
-/obj/item/clothing/head/costume/paper_hat{
- pixel_y = 12;
- pixel_x = -4
- },
-/obj/item/clothing/head/collectable/petehat{
- pixel_x = 5;
- pixel_y = -5
- },
-/obj/item/cigarette/cigar/cohiba{
- pixel_y = 4
- },
-/turf/open/floor/iron/dark/small,
-/area/station/commons/fitness/locker_room)
"lWz" = (
/obj/effect/turf_decal/tile/dark_red/opposingcorners,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
@@ -35713,6 +35620,14 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/catwalk_floor/iron_smooth,
/area/station/security/checkpoint/supply)
+"lXe" = (
+/obj/effect/turf_decal/weather/dirt{
+ dir = 1
+ },
+/obj/structure/extinguisher_cabinet/directional/north,
+/obj/structure/flora/bush/sparsegrass,
+/turf/open/floor/grass,
+/area/station/service/chapel)
"lXf" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/wood,
@@ -35765,6 +35680,16 @@
},
/turf/open/floor/wood/tile,
/area/station/science/lower)
+"lXL" = (
+/obj/machinery/atmospherics/components/unary/portables_connector/visible{
+ dir = 8
+ },
+/obj/machinery/light/cold/directional/north,
+/obj/machinery/newscaster/directional/north,
+/turf/open/floor/iron/dark/side{
+ dir = 9
+ },
+/area/station/science/ordnance/testlab)
"lXR" = (
/obj/structure/disposalpipe/junction,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -35781,16 +35706,17 @@
/turf/open/floor/iron/dark,
/area/station/medical/cryo)
"lXU" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/obj/machinery/light/cold/directional/north,
-/obj/structure/disposalpipe/segment{
- dir = 4
+/obj/effect/turf_decal/weather/snow/corner{
+ dir = 9
},
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/fore)
+/obj/effect/turf_decal/weather/snow,
+/obj/structure/closet/secure_closet/freezer/meat,
+/obj/effect/turf_decal/weather/snow/corner,
+/obj/item/food/meat/slab/monkey,
+/obj/item/food/meat/slab/monkey,
+/obj/item/food/meat/slab/monkey,
+/turf/open/floor/iron/freezer,
+/area/station/service/kitchen/coldroom)
"lXX" = (
/obj/machinery/light/warm/directional/north,
/turf/open/floor/iron,
@@ -35816,34 +35742,6 @@
"lYj" = (
/turf/closed/wall/r_wall,
/area/station/hallway/primary/fore)
-"lYl" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/status_display/ai/directional/north,
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/fore)
-"lYt" = (
-/obj/structure/table/wood/fancy/green,
-/obj/item/storage/wallet{
- pixel_x = -3;
- pixel_y = 10
- },
-/obj/item/cigarette/cigar{
- pixel_x = -1;
- pixel_y = -2
- },
-/obj/item/lighter{
- pixel_x = 11;
- pixel_y = -7
- },
-/obj/machinery/light/directional/south,
-/turf/open/floor/iron/grimy,
-/area/station/command/heads_quarters/qm)
"lYw" = (
/obj/structure/hedge,
/obj/item/radio/intercom/directional/south,
@@ -35867,6 +35765,10 @@
},
/turf/open/floor/plating,
/area/station/maintenance/department/electrical)
+"lYS" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/iron/white/small,
+/area/station/service/hydroponics)
"lYT" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/spawner/random/engineering/atmospherics_portable,
@@ -35894,20 +35796,6 @@
},
/turf/open/floor/iron/grimy,
/area/station/tcommsat/server)
-"lZf" = (
-/obj/machinery/vending/hydroseeds{
- slogan_delay = 700
- },
-/obj/effect/turf_decal/tile/green/opposingcorners,
-/obj/effect/turf_decal/tile/blue/opposingcorners{
- dir = 8
- },
-/obj/effect/turf_decal/delivery/white{
- color = "#52B4E9"
- },
-/obj/machinery/camera/autoname/directional/north,
-/turf/open/floor/iron,
-/area/station/service/hydroponics)
"lZt" = (
/obj/machinery/portable_atmospherics/canister/air,
/turf/open/floor/plating,
@@ -35984,32 +35872,6 @@
/obj/machinery/duct,
/turf/open/floor/iron,
/area/station/maintenance/department/medical/central)
-"lZT" = (
-/obj/structure/flora/bush/flowers_pp/style_random,
-/obj/effect/turf_decal/weather/dirt{
- dir = 4
- },
-/turf/open/floor/grass,
-/area/station/service/chapel)
-"lZW" = (
-/obj/structure/disposalpipe/segment{
- dir = 6
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/fore)
-"mae" = (
-/obj/structure/table/wood,
-/obj/effect/turf_decal/siding/wood{
- dir = 6
- },
-/obj/machinery/chem_dispenser/drinks,
-/turf/open/floor/iron/dark/textured,
-/area/station/service/bar)
"maf" = (
/turf/closed/wall/rust,
/area/station/hallway/primary/fore)
@@ -36031,6 +35893,13 @@
},
/turf/open/floor/iron/white/small,
/area/station/science/cubicle)
+"max" = (
+/obj/structure/cable,
+/obj/structure/disposalpipe/segment{
+ dir = 5
+ },
+/turf/open/floor/wood,
+/area/station/cargo/boutique)
"maE" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -36047,19 +35916,14 @@
},
/turf/open/floor/sepia,
/area/station/maintenance/aft)
-"mbf" = (
-/obj/effect/mapping_helpers/airlock/access/any/service/maintenance,
-/obj/machinery/door/airlock{
- name = "Maintenance"
- },
+"mbm" = (
+/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/turf_decal/tile/neutral,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/obj/effect/mapping_helpers/airlock/unres{
- dir = 4
- },
-/turf/open/floor/plating,
-/area/station/maintenance/central/greater)
+/obj/machinery/light/cold/directional/east,
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/fore)
"mbp" = (
/obj/structure/hedge,
/obj/machinery/light_switch/directional/east,
@@ -36071,20 +35935,6 @@
/obj/machinery/pdapainter/medbay,
/turf/open/floor/wood/parquet,
/area/station/command/heads_quarters/cmo)
-"mbC" = (
-/obj/structure/table/reinforced,
-/obj/structure/displaycase/forsale/kitchen{
- pixel_y = 5
- },
-/obj/machinery/door/firedoor/border_only{
- dir = 4
- },
-/obj/machinery/door/poddoor/shutters{
- name = "Kitchen Shutters";
- id = "kitchenshutters"
- },
-/turf/open/floor/plating,
-/area/station/service/kitchen)
"mbG" = (
/obj/structure/fluff/broken_canister_frame,
/turf/open/floor/plating,
@@ -36093,20 +35943,27 @@
/obj/effect/spawner/random/entertainment/arcade,
/turf/open/floor/eighties/red,
/area/station/service/abandoned_gambling_den/gaming)
+"mbY" = (
+/obj/machinery/door/window/left/directional/south{
+ name = "Bio-Generator";
+ req_access = list("hydroponics")
+ },
+/obj/machinery/biogenerator,
+/obj/effect/turf_decal/delivery,
+/obj/machinery/door/firedoor,
+/turf/open/floor/plating,
+/area/station/service/hydroponics)
"mbZ" = (
/obj/structure/table/glass,
/obj/machinery/cell_charger,
/turf/open/floor/iron/grimy,
/area/station/science/cubicle)
-"mce" = (
-/obj/machinery/computer/slot_machine{
- pixel_y = 2
- },
-/obj/effect/turf_decal/siding/wood{
- dir = 5
+"mca" = (
+/obj/effect/turf_decal/siding/wood,
+/obj/structure/chair/wood{
+ dir = 4
},
-/obj/machinery/status_display/evac/directional/north,
-/turf/open/floor/stone,
+/turf/open/floor/iron/grimy,
/area/station/service/bar)
"mch" = (
/obj/structure/disposalpipe/segment{
@@ -36151,16 +36008,16 @@
/obj/item/phone,
/turf/open/floor/iron/smooth,
/area/station/maintenance/port/aft)
-"mcI" = (
+"mcK" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
+/obj/effect/turf_decal/tile/neutral,
+/obj/structure/cable,
/obj/structure/disposalpipe/segment{
- dir = 10
+ dir = 6
},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
-/area/station/hallway/primary/port)
+/area/station/hallway/primary/central/fore)
"mcP" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -36169,14 +36026,6 @@
/obj/effect/landmark/start/medical_doctor,
/turf/open/floor/iron/dark,
/area/station/medical/medbay/aft)
-"mcS" = (
-/obj/structure/disposalpipe/segment,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/effect/turf_decal/tile/neutral,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/light/cold/directional/east,
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/fore)
"mcT" = (
/obj/effect/turf_decal/bot,
/obj/effect/decal/cleanable/dirt,
@@ -36187,13 +36036,6 @@
/obj/structure/cable,
/turf/open/floor/plating,
/area/station/engineering/supermatter)
-"mcV" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
- dir = 4
- },
-/obj/effect/landmark/start/hangover,
-/turf/open/floor/wood/parquet,
-/area/station/service/library)
"mdm" = (
/obj/structure/chair/office/light{
dir = 8
@@ -36208,14 +36050,6 @@
"mdt" = (
/turf/closed/wall/r_wall,
/area/station/science/robotics/mechbay)
-"mdG" = (
-/obj/structure/chair{
- dir = 1
- },
-/obj/machinery/camera/autoname/directional/south,
-/obj/machinery/light/small/directional/south,
-/turf/open/floor/iron/showroomfloor,
-/area/station/commons/toilet/auxiliary)
"mdX" = (
/obj/machinery/light/small/directional/north,
/obj/machinery/conveyor_switch{
@@ -36262,16 +36096,6 @@
dir = 4
},
/area/station/hallway/secondary/entry)
-"mfa" = (
-/obj/effect/landmark/start/assistant,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/effect/turf_decal/trimline/neutral/end{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/aft)
"mfl" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/firealarm/directional/west,
@@ -36334,6 +36158,31 @@
},
/turf/open/floor/iron,
/area/station/engineering/atmos)
+"mgi" = (
+/obj/structure/disposalpipe/segment{
+ dir = 6
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/merge_conflict_marker{
+ name = "---Merge Conflict Marker---";
+
+ desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 6
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/cable,
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/fore)
"mgt" = (
/obj/machinery/vending/boozeomat,
/obj/machinery/firealarm/directional/south,
@@ -36347,24 +36196,56 @@
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/iron,
/area/station/engineering/atmospherics_engine)
-"mgW" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/cable,
+"mgO" = (
/obj/structure/disposalpipe/segment{
- dir = 9
+ dir = 4
},
-/obj/effect/turf_decal/tile/neutral/opposingcorners{
- dir = 1
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
},
-/obj/effect/turf_decal/siding/thinplating_new{
- dir = 9
+/obj/structure/disposalpipe/segment,
+/obj/structure/cable,
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/fore)
+"mgQ" = (
+/obj/machinery/computer/monitor{
+ dir = 1
},
-/turf/open/floor/iron/small,
-/area/station/hallway/secondary/service)
+/obj/machinery/computer/security/telescreen/minisat/directional/south,
+/turf/open/floor/iron/smooth,
+/area/station/ai_monitored/turret_protected/aisat/equipment)
"mhk" = (
/turf/closed/wall,
/area/station/maintenance/port/greater)
+"mhm" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+ dir = 8
+ },
+/obj/structure/disposalpipe/segment,
+/obj/effect/turf_decal/siding/wood/corner,
+/obj/effect/turf_decal/siding/wood/corner{
+ dir = 8
+ },
+/obj/merge_conflict_marker{
+ name = "---Merge Conflict Marker---";
+
+ desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+ dir = 8
+ },
+/obj/structure/disposalpipe/segment,
+/obj/effect/turf_decal/siding/wood/corner,
+/obj/effect/turf_decal/siding/wood/corner{
+ dir = 8
+ },
+/obj/structure/cable,
+/turf/open/floor/stone,
+/area/station/service/bar/backroom)
"mhn" = (
/obj/structure/disposalpipe/segment{
dir = 6
@@ -36374,6 +36255,23 @@
},
/turf/open/floor/iron/white,
/area/station/medical/medbay/central)
+"mhL" = (
+/obj/structure/rack,
+/obj/effect/turf_decal/tile/brown/opposingcorners{
+ dir = 1
+ },
+/obj/item/storage/toolbox/mechanical{
+ pixel_x = 2;
+ pixel_y = 3
+ },
+/obj/item/storage/toolbox/electrical{
+ pixel_x = 4;
+ pixel_y = 6
+ },
+/obj/item/clothing/head/utility/welding,
+/obj/structure/extinguisher_cabinet/directional/west,
+/turf/open/floor/iron,
+/area/station/commons/vacant_room/commissary)
"mhV" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -36387,12 +36285,6 @@
/obj/structure/sign/poster/official/random/directional/north,
/turf/open/floor/iron/dark/smooth_large,
/area/station/service/lawoffice)
-"mib" = (
-/obj/machinery/door/firedoor,
-/turf/open/floor/iron/textured_half{
- dir = 8
- },
-/area/station/service/bar)
"mid" = (
/obj/effect/spawner/random/structure/crate_loot,
/turf/open/floor/plating,
@@ -36411,6 +36303,16 @@
/obj/structure/reagent_dispensers/wall/virusfood/directional/south,
/turf/open/floor/iron/white,
/area/station/medical/virology)
+"mii" = (
+/obj/effect/turf_decal/weather/dirt{
+ dir = 1
+ },
+/obj/structure/flora/rock/pile/jungle/style_5{
+ pixel_y = -5;
+ pixel_x = -8
+ },
+/turf/open/floor/grass,
+/area/station/service/chapel)
"miz" = (
/obj/structure/table/glass,
/obj/item/wrench,
@@ -36420,9 +36322,22 @@
/obj/structure/cable,
/turf/open/floor/plating,
/area/station/maintenance/department/medical/central)
-"miF" = (
-/turf/open/floor/stone,
-/area/station/service/chapel)
+"miE" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/door/airlock{
+ name = "Theater Greenroom"
+ },
+/obj/effect/mapping_helpers/airlock/access/all/service/theatre,
+/obj/structure/cable,
+/obj/machinery/door/firedoor,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/open/floor/iron/textured_half{
+ dir = 8
+ },
+/area/station/service/greenroom)
"miN" = (
/obj/effect/turf_decal/stripes/white/line{
dir = 4
@@ -36468,12 +36383,6 @@
/obj/item/clothing/under/costume/skeleton,
/turf/open/floor/eighties,
/area/station/service/abandoned_gambling_den/gaming)
-"mjr" = (
-/obj/machinery/vending/dinnerware,
-/obj/machinery/requests_console/auto_name/directional/south,
-/obj/effect/mapping_helpers/requests_console/supplies,
-/turf/open/floor/iron/kitchen/small,
-/area/station/service/kitchen)
"mjF" = (
/obj/structure/table/glass,
/obj/item/clothing/suit/costume/cyborg_suit,
@@ -36515,17 +36424,6 @@
},
/turf/open/floor/iron/smooth,
/area/station/security/checkpoint/supply)
-"mka" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/effect/landmark/navigate_destination/hydro,
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/obj/effect/landmark/start/hangover,
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/aft)
"mkh" = (
/obj/structure/chair{
dir = 8
@@ -36545,15 +36443,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/maintenance/port/aft)
-"mkz" = (
-/obj/effect/turf_decal/siding/wood{
- dir = 4
- },
-/obj/effect/turf_decal/siding/wood/corner{
- dir = 8
- },
-/turf/open/floor/stone,
-/area/station/service/chapel)
"mkA" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -36563,14 +36452,6 @@
/obj/machinery/power/apc/auto_name/directional/north,
/turf/open/floor/iron/white/textured_large,
/area/station/command/heads_quarters/cmo)
-"mkD" = (
-/obj/machinery/vending/boozeomat,
-/obj/effect/turf_decal/siding/wood/end{
- dir = 4
- },
-/obj/machinery/status_display/ai/directional/north,
-/turf/open/floor/iron/dark/textured,
-/area/station/service/bar)
"mkF" = (
/obj/structure/disposalpipe/segment,
/obj/effect/landmark/start/depsec/supply,
@@ -36651,6 +36532,18 @@
},
/turf/open/floor/iron/cafeteria,
/area/station/security/prison/mess)
+"mmd" = (
+/obj/structure/window/reinforced/spawner/directional/south,
+/obj/machinery/camera/autoname/directional/north,
+/obj/effect/turf_decal/tile/neutral/opposingcorners{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/thinplating_new{
+ dir = 5
+ },
+/obj/machinery/airalarm/directional/east,
+/turf/open/floor/iron/small,
+/area/station/hallway/secondary/service)
"mms" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/effect/turf_decal/tile/yellow/opposingcorners,
@@ -36684,6 +36577,16 @@
dir = 1
},
/area/station/science/xenobiology)
+"mmz" = (
+/obj/effect/spawner/random/entertainment/arcade{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/thinplating{
+ dir = 8
+ },
+/obj/item/radio/intercom/directional/west,
+/turf/open/floor/eighties/red,
+/area/station/hallway/primary/central/fore)
"mmE" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -36692,15 +36595,6 @@
},
/turf/open/floor/iron/white,
/area/station/medical/treatment_center)
-"mmL" = (
-/obj/effect/turf_decal/siding/wood{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/wood/parquet,
-/area/station/service/library)
"mmT" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -36746,23 +36640,13 @@
/turf/open/floor/iron,
/area/station/hallway/secondary/exit/departure_lounge)
"mnl" = (
-/obj/structure/table,
-/obj/item/circuitboard/machine/coffeemaker/impressa,
-/obj/item/coffee_cartridge/decaf{
- pixel_y = 9
+/obj/machinery/door/airlock{
+ name = "Maintenance"
},
-/turf/open/floor/iron/dark/small,
+/obj/effect/mapping_helpers/airlock/access/any/security/general,
+/obj/structure/cable,
+/turf/open/floor/plating,
/area/station/maintenance/central/lesser)
-"mno" = (
-/obj/machinery/light/small/directional/south,
-/obj/machinery/firealarm/directional/south,
-/obj/item/kirbyplants/random,
-/obj/effect/turf_decal/siding/wood{
- dir = 1
- },
-/obj/effect/turf_decal/siding/wood,
-/turf/open/floor/stone,
-/area/station/service/bar)
"mnw" = (
/obj/effect/spawner/random/vending/colavend,
/obj/machinery/firealarm/directional/east,
@@ -36828,26 +36712,6 @@
},
/turf/open/floor/plating,
/area/station/cargo/storage)
-"mog" = (
-/obj/structure/disposalpipe/segment{
- dir = 5
- },
-/obj/structure/cable,
-/turf/open/floor/iron/kitchen/small,
-/area/station/service/kitchen)
-"moj" = (
-/obj/machinery/door/airlock{
- name = "Maintenance"
- },
-/obj/effect/mapping_helpers/airlock/access/any/command/maintenance,
-/obj/effect/mapping_helpers/airlock/unres{
- dir = 4
- },
-/obj/structure/disposalpipe/junction{
- dir = 4
- },
-/turf/open/floor/plating,
-/area/station/maintenance/hallway/abandoned_command)
"mom" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/machinery/atmospherics/components/binary/pump{
@@ -36870,14 +36734,6 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/iron,
/area/station/cargo/storage)
-"moG" = (
-/obj/effect/spawner/random/trash,
-/obj/structure/cable,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/plating,
-/area/station/maintenance/central/greater)
"mpk" = (
/obj/machinery/airalarm/directional/south,
/turf/open/floor/circuit/green,
@@ -36889,30 +36745,12 @@
/obj/machinery/light/small/directional/south,
/turf/open/floor/carpet/lone,
/area/station/service/abandoned_gambling_den)
-"mpx" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/turf_decal/siding/thinplating{
- dir = 6
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/eighties,
-/area/station/hallway/primary/central/fore)
"mpy" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
dir = 1
},
/turf/open/floor/wood/parquet,
/area/station/medical/psychology)
-"mpB" = (
-/obj/effect/turf_decal/siding/wood{
- dir = 1
- },
-/obj/effect/turf_decal/siding/wood/corner,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/light/floor,
-/turf/open/floor/stone,
-/area/station/service/bar)
"mpE" = (
/obj/machinery/light/cold/dim/directional/north,
/obj/structure/disposalpipe/segment{
@@ -36962,6 +36800,10 @@
/obj/machinery/vending/wardrobe/curator_wardrobe,
/turf/open/floor/iron/grimy,
/area/station/service/library)
+"mqA" = (
+/obj/structure/flora/bush/flowers_yw/style_2,
+/turf/open/floor/grass,
+/area/station/service/chapel)
"mqH" = (
/obj/structure/cable,
/obj/effect/landmark/generic_maintenance_landmark,
@@ -36988,37 +36830,11 @@
},
/turf/open/floor/plating,
/area/station/maintenance/department/medical/central)
-"mrn" = (
-/obj/structure/cable,
-/obj/structure/disposalpipe/segment{
- dir = 6
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/plating,
-/area/station/maintenance/port/greater)
"mrt" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/light/small/directional/north,
/turf/open/floor/iron,
/area/station/hallway/secondary/dock)
-"mru" = (
-/obj/effect/mapping_helpers/requests_console/supplies,
-/obj/machinery/power/apc/auto_name/directional/north,
-/obj/structure/cable,
-/obj/effect/turf_decal/siding/wood{
- dir = 1
- },
-/obj/effect/turf_decal/siding/wood,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/requests_console/auto_name/directional/south,
-/turf/open/floor/stone,
-/area/station/service/bar)
"mrP" = (
/obj/structure/disposalpipe/segment{
dir = 6
@@ -37051,16 +36867,6 @@
/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/iron,
/area/station/hallway/primary/fore)
-"msk" = (
-/obj/effect/turf_decal/plaque{
- icon_state = "L3";
- pixel_y = -15
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/aft)
"msq" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -37078,15 +36884,25 @@
"msJ" = (
/turf/open/floor/iron,
/area/station/hallway/secondary/dock)
-"mtc" = (
-/obj/structure/table/wood,
-/obj/effect/decal/cleanable/dirt,
-/obj/item/screwdriver,
-/obj/effect/turf_decal/siding/wideplating_new/terracotta{
- dir = 8
+"msU" = (
+/obj/structure/chair/stool/bar/directional/west,
+/turf/open/floor/wood/large,
+/area/station/service/bar)
+"mtv" = (
+/obj/structure/bed{
+ dir = 4
},
-/turf/open/floor/wood/tile,
-/area/station/maintenance/central/lesser)
+/obj/effect/spawner/random/bedsheet{
+ dir = 4
+ },
+/obj/machinery/button/door/directional/north{
+ id = "Cabin3";
+ name = "Cabin Bolt Control";
+ normaldoorcontrol = 1;
+ specialfunctions = 4
+ },
+/turf/open/floor/carpet/blue,
+/area/station/commons/dorms)
"mtP" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -37162,16 +36978,6 @@
/obj/machinery/status_display/ai/directional/north,
/turf/open/floor/wood/tile,
/area/station/command/meeting_room)
-"mvd" = (
-/obj/structure/disposalpipe/segment{
- dir = 5
- },
-/obj/structure/cable,
-/obj/machinery/duct,
-/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/central/lesser)
"mvh" = (
/obj/structure/window/reinforced/spawner/directional/west,
/obj/machinery/holopad,
@@ -37220,6 +37026,12 @@
dir = 1
},
/area/station/hallway/primary/central/fore)
+"mvV" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/turf_decal/tile/neutral,
+/obj/item/radio/intercom/directional/east,
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/fore)
"mwn" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/structure/cable,
@@ -37256,15 +37068,6 @@
/obj/effect/turf_decal/trimline/neutral/end,
/turf/open/floor/iron,
/area/station/hallway/primary/aft)
-"mwJ" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/table,
-/obj/item/stack/cable_coil,
-/obj/item/multitool,
-/obj/effect/decal/cleanable/cobweb/cobweb2,
-/obj/machinery/light/small/directional/east,
-/turf/open/floor/engine,
-/area/station/science/xenobiology)
"mwN" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/effect/turf_decal/tile/neutral{
@@ -37295,11 +37098,27 @@
},
/turf/open/floor/wood/tile,
/area/station/command/bridge)
+"mxf" = (
+/obj/effect/turf_decal/siding/wood,
+/obj/machinery/light/small/directional/west,
+/turf/open/floor/wood/parquet,
+/area/station/service/library)
"mxg" = (
/obj/structure/cable,
/obj/effect/turf_decal/tile/dark_red/opposingcorners,
/turf/open/floor/iron,
/area/station/security/warden)
+"mxJ" = (
+/obj/machinery/button/door/directional/north{
+ name = "Lock Control";
+ id = "Toilet3";
+ specialfunctions = 4;
+ normaldoorcontrol = 1
+ },
+/obj/machinery/recharge_station,
+/obj/structure/sign/poster/official/random/directional/east,
+/turf/open/floor/iron/white/small,
+/area/station/commons/toilet/restrooms)
"mxM" = (
/obj/structure/barricade/wooden/crude,
/turf/open/floor/noslip,
@@ -37313,14 +37132,6 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/aft)
-"mxS" = (
-/obj/item/kirbyplants/random,
-/obj/machinery/camera/autoname/directional/west,
-/obj/structure/disposalpipe/segment{
- dir = 5
- },
-/turf/open/floor/iron/white,
-/area/station/hallway/primary/central/aft)
"mxX" = (
/obj/structure/transit_tube/curved/flipped,
/obj/structure/lattice,
@@ -37336,16 +37147,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/plating,
/area/station/maintenance/starboard/aft)
-"mye" = (
-/obj/effect/turf_decal/weather/dirt{
- dir = 1
- },
-/obj/structure/flora/rock/pile/jungle/style_5{
- pixel_y = -5;
- pixel_x = -8
- },
-/turf/open/floor/grass,
-/area/station/service/chapel)
"myi" = (
/obj/structure/lattice/catwalk,
/obj/machinery/atmospherics/pipe/smart/simple/brown/visible{
@@ -37415,15 +37216,6 @@
/obj/item/paper/fluff/jobs/engineering/frequencies,
/turf/open/floor/carpet/executive,
/area/station/command/meeting_room)
-"mze" = (
-/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 = 4
- },
-/turf/open/floor/plating,
-/area/station/maintenance/port/greater)
"mzf" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/table,
@@ -37500,17 +37292,6 @@
},
/turf/open/floor/iron/showroomfloor,
/area/station/commons/toilet/auxiliary)
-"mAR" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/fore)
"mBo" = (
/obj/structure/cable,
/obj/effect/decal/cleanable/dirt,
@@ -37525,6 +37306,14 @@
},
/turf/open/floor/iron,
/area/station/engineering/atmospherics_engine)
+"mBx" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/landmark/navigate_destination/vault,
+/obj/effect/turf_decal/tile/neutral,
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/aft)
"mBC" = (
/obj/structure/sign/poster/official/soft_cap_pop_art/directional/north,
/turf/open/floor/iron/grimy,
@@ -37544,6 +37333,16 @@
/obj/machinery/light/floor,
/turf/open/floor/noslip,
/area/station/medical/treatment_center)
+"mCu" = (
+/obj/machinery/light/small/directional/south,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/wideplating_new/terracotta{
+ dir = 6
+ },
+/turf/open/floor/wood/tile,
+/area/station/maintenance/central/lesser)
"mCw" = (
/obj/effect/mapping_helpers/broken_floor,
/turf/open/floor/iron/dark/side{
@@ -37565,10 +37364,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/plating,
/area/station/maintenance/department/electrical)
-"mDf" = (
-/obj/structure/table/wood,
-/turf/open/floor/iron/grimy,
-/area/station/service/bar)
"mDh" = (
/obj/structure/cable,
/obj/structure/disposalpipe/segment{
@@ -37585,16 +37380,13 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
/area/station/maintenance/department/medical/central)
-"mDA" = (
-/obj/structure/table/wood,
-/obj/machinery/computer/libraryconsole{
- dir = 1
- },
-/obj/structure/sign/painting/library{
- pixel_x = 30
- },
-/turf/open/floor/wood/parquet,
-/area/station/service/library)
+"mDw" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/plating,
+/area/station/hallway/primary/central/aft)
"mDG" = (
/obj/effect/turf_decal/tile/dark_red/half/contrasted{
dir = 1
@@ -37639,13 +37431,6 @@
/obj/machinery/door/firedoor,
/turf/open/floor/catwalk_floor/flat_white,
/area/station/science/robotics/lab)
-"mEb" = (
-/obj/structure/flora/bush/jungle/c/style_random,
-/obj/effect/turf_decal/weather/dirt{
- dir = 6
- },
-/turf/open/floor/grass,
-/area/station/service/chapel)
"mEq" = (
/obj/structure/closet/crate/wooden{
name = "Alms Box"
@@ -37694,6 +37479,17 @@
/obj/machinery/light/small/directional/east,
/turf/open/floor/iron/showroomfloor,
/area/station/security/prison/shower)
+"mFd" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/machinery/light/cold/directional/north,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/fore)
"mFh" = (
/obj/effect/decal/cleanable/glass,
/obj/structure/table/reinforced/rglass,
@@ -37742,6 +37538,11 @@
/obj/structure/tank_holder/extinguisher/advanced,
/turf/open/floor/iron,
/area/station/engineering/atmos)
+"mFF" = (
+/obj/structure/cable,
+/obj/structure/disposalpipe/segment,
+/turf/open/floor/iron,
+/area/station/commons/fitness/locker_room)
"mFG" = (
/obj/machinery/telecomms/processor/preset_four,
/obj/effect/decal/cleanable/dirt,
@@ -37804,22 +37605,16 @@
},
/turf/open/floor/carpet,
/area/station/medical/psychology)
-"mGn" = (
-/obj/structure/rack,
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/obj/item/clothing/gloves/color/fyellow{
- pixel_y = 2
- },
-/obj/item/wrench,
-/obj/item/cigarette/xeno{
- pixel_x = -3;
- pixel_y = -9
+"mGm" = (
+/obj/structure/disposalpipe/segment{
+ dir = 5
},
-/obj/item/clothing/head/utility/welding,
-/turf/open/floor/iron/small,
-/area/station/maintenance/department/engine/atmos)
+/obj/structure/cable,
+/obj/machinery/duct,
+/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/central/lesser)
"mGp" = (
/obj/structure/table/glass,
/obj/item/gun/ballistic/automatic/c20r/toy/unrestricted,
@@ -37870,10 +37665,18 @@
/obj/item/radio/intercom/directional/west,
/turf/open/floor/iron/white/small,
/area/station/medical/virology)
-"mHh" = (
+"mHR" = (
/obj/structure/cable,
-/turf/open/floor/iron/dark/small,
-/area/station/maintenance/central/lesser)
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/mapping_helpers/broken_floor,
+/obj/effect/spawner/random/trash,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/plating,
+/area/station/maintenance/port/greater)
"mHZ" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -37911,6 +37714,16 @@
dir = 1
},
/area/station/science/lower)
+"mIt" = (
+/obj/structure/table/wood,
+/obj/machinery/computer/libraryconsole{
+ dir = 1
+ },
+/obj/structure/sign/painting/library{
+ pixel_x = 30
+ },
+/turf/open/floor/wood/parquet,
+/area/station/service/library)
"mIA" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -37941,23 +37754,19 @@
/obj/structure/sign/poster/official/random/directional/north,
/turf/open/floor/wood/tile,
/area/station/command/corporate_showroom)
-"mIE" = (
-/obj/machinery/door/airlock/public/glass{
- name = "Public Shrine"
- },
-/obj/effect/turf_decal/siding/wood/end{
- dir = 4
- },
+"mIO" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/door/firedoor,
-/turf/open/floor/stone,
-/area/station/hallway/primary/port)
-"mIP" = (
-/obj/structure/chair{
- dir = 8
+/obj/effect/turf_decal/stripes/red/line{
+ dir = 1
},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/wood/tile,
-/area/station/maintenance/central/lesser)
+/obj/effect/turf_decal/stripes/red/line,
+/obj/structure/extinguisher_cabinet/directional/east,
+/obj/structure/disposalpipe/segment{
+ dir = 10
+ },
+/turf/open/floor/iron/small,
+/area/station/hallway/primary/central/fore)
"mIR" = (
/obj/structure/chair/stool/directional/east,
/obj/effect/landmark/start/hangover,
@@ -38073,18 +37882,14 @@
dir = 1
},
/area/station/hallway/primary/aft)
-"mKm" = (
-/obj/structure/cable,
-/obj/effect/turf_decal/trimline/neutral/line,
-/obj/effect/turf_decal/trimline/neutral/line{
+"mKy" = (
+/obj/machinery/status_display/ai/directional/west,
+/obj/machinery/camera/autoname/directional/north,
+/obj/effect/turf_decal/tile/neutral{
dir = 1
},
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/structure/disposalpipe/segment,
/turf/open/floor/iron,
-/area/station/hallway/primary/port)
+/area/station/hallway/primary/central/aft)
"mKB" = (
/obj/machinery/navbeacon{
codes_txt = "delivery;dir=8";
@@ -38183,24 +37988,6 @@
},
/turf/open/floor/iron,
/area/station/science/cytology)
-"mLT" = (
-/obj/effect/turf_decal/siding/wood{
- dir = 1
- },
-/obj/structure/table/glass,
-/obj/item/paper_bin{
- pixel_x = -3;
- pixel_y = 7
- },
-/obj/item/pen/invisible{
- pixel_x = -2;
- pixel_y = 7
- },
-/obj/machinery/newscaster/directional/north,
-/obj/item/storage/photo_album/library,
-/obj/item/book/codex_gigas,
-/turf/open/floor/iron/grimy,
-/area/station/service/library)
"mLU" = (
/obj/machinery/vending/autodrobe,
/obj/machinery/light/small/directional/west,
@@ -38250,13 +38037,6 @@
},
/turf/open/floor/iron,
/area/station/science/robotics/lab)
-"mMO" = (
-/obj/structure/cable,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/plating,
-/area/station/maintenance/central/greater)
"mMY" = (
/obj/effect/turf_decal/tile/dark_red/half/contrasted{
dir = 1
@@ -38267,6 +38047,18 @@
},
/turf/open/floor/iron,
/area/station/security)
+"mNb" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/door/firedoor,
+/obj/effect/turf_decal/stripes/red/line,
+/obj/effect/turf_decal/stripes/red/line{
+ dir = 1
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 9
+ },
+/turf/open/floor/iron/small,
+/area/station/hallway/primary/central/fore)
"mNu" = (
/obj/effect/turf_decal/tile/neutral/fourcorners,
/obj/effect/turf_decal/stripes/line,
@@ -38346,6 +38138,18 @@
/obj/item/clothing/gloves/color/yellow,
/turf/open/floor/iron/dark/small,
/area/station/engineering/storage_shared)
+"mOH" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 1
+ },
+/obj/machinery/camera/autoname/directional/east,
+/obj/machinery/firealarm/directional/east,
+/obj/machinery/disposal/bin,
+/obj/structure/disposalpipe/trunk{
+ dir = 8
+ },
+/turf/open/floor/wood/parquet,
+/area/station/service/library)
"mOI" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/light/small/directional/south,
@@ -38360,21 +38164,27 @@
/obj/effect/landmark/generic_maintenance_landmark,
/turf/open/floor/light/colour_cycle/dancefloor_b,
/area/station/maintenance/starboard/central)
-"mOV" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/effect/turf_decal/tile/neutral{
+"mOY" = (
+/obj/effect/turf_decal/siding/thinplating_new/light{
dir = 8
},
-/obj/structure/extinguisher_cabinet/directional/west,
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/fore)
+/obj/effect/landmark/start/botanist,
+/turf/open/floor/iron/white/small,
+/area/station/service/hydroponics)
"mPe" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/layer2{
dir = 4
},
/turf/open/floor/engine,
/area/station/maintenance/disposal/incinerator)
+"mPn" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/effect/landmark/navigate_destination/chapel,
+/turf/open/floor/iron,
+/area/station/hallway/primary/port)
"mPq" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -38406,11 +38216,46 @@
},
/turf/open/floor/wood/tile,
/area/station/command/meeting_room)
+"mPB" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/navbeacon{
+ codes_txt = "patrol;next_patrol=23.2-Evac-Garden";
+ location = "23.4-Evac"
+ },
+/obj/structure/disposalpipe/junction/flip{
+ dir = 2
+ },
+/turf/open/floor/iron,
+/area/station/hallway/secondary/exit/departure_lounge)
+"mPG" = (
+/obj/machinery/porta_turret/ai,
+/obj/machinery/computer/security/telescreen/research/directional/west,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/status_display/ai/directional/north,
+/turf/open/floor/iron/smooth,
+/area/station/ai_monitored/turret_protected/aisat_interior)
"mPJ" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/smooth,
/area/station/command/bridge)
+"mPS" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 6
+ },
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/fore)
+"mPW" = (
+/obj/effect/turf_decal/siding/wood/corner,
+/obj/machinery/holopad,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/stone,
+/area/station/service/bar)
"mQh" = (
/obj/effect/turf_decal/stripes/line,
/obj/machinery/conveyor_switch/oneway{
@@ -38493,28 +38338,11 @@
},
/turf/open/space/basic,
/area/station/engineering/atmos/space_catwalk)
-"mSA" = (
-/obj/structure/cable,
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/plating,
-/area/station/maintenance/port/greater)
"mSH" = (
/obj/effect/spawner/random/structure/crate,
/obj/effect/spawner/random/maintenance,
/turf/open/floor/plating,
/area/station/maintenance/starboard/central)
-"mSQ" = (
-/obj/effect/turf_decal/weather/dirt{
- dir = 8
- },
-/obj/structure/extinguisher_cabinet/directional/west,
-/turf/open/floor/grass,
-/area/station/service/chapel)
"mSS" = (
/obj/structure/lattice/catwalk,
/obj/structure/railing{
@@ -38571,6 +38399,18 @@
"mTl" = (
/turf/closed/wall,
/area/station/cargo/sorting)
+"mTr" = (
+/obj/structure/table/wood,
+/obj/item/paper_bin{
+ pixel_x = -2;
+ pixel_y = 4
+ },
+/obj/item/pen{
+ pixel_x = -2;
+ pixel_y = 4
+ },
+/turf/open/floor/carpet,
+/area/station/service/library)
"mTs" = (
/turf/closed/wall/r_wall,
/area/station/security/prison/work)
@@ -38620,6 +38460,13 @@
/obj/machinery/light/small/directional/north,
/turf/open/floor/iron/grimy,
/area/station/cargo/boutique)
+"mTO" = (
+/obj/effect/turf_decal/siding/thinplating{
+ dir = 9
+ },
+/obj/structure/sign/poster/official/tactical_game_cards/directional/west,
+/turf/open/floor/eighties/red,
+/area/station/hallway/primary/central/fore)
"mTP" = (
/obj/machinery/light/small/directional/west,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
@@ -38639,13 +38486,19 @@
},
/turf/open/misc/sandy_dirt,
/area/station/security/tram)
-"mTT" = (
-/obj/effect/spawner/random/entertainment/arcade{
+"mTS" = (
+/obj/effect/turf_decal/tile/dark_red/half/contrasted{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/wideplating/dark/corner{
+ dir = 8
+ },
+/obj/structure/disposalpipe/sorting/mail{
dir = 1
},
-/obj/effect/turf_decal/siding/thinplating,
-/turf/open/floor/eighties/red,
-/area/station/hallway/primary/central/fore)
+/obj/effect/mapping_helpers/mail_sorting/security/general,
+/turf/open/floor/iron,
+/area/station/security)
"mTU" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/structure/transit_tube/horizontal,
@@ -38661,16 +38514,6 @@
/obj/effect/landmark/start/paramedic,
/turf/open/floor/iron/white,
/area/station/medical/medbay/central)
-"mUi" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/effect/turf_decal/siding/wood/corner{
- dir = 4
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/wood/parquet,
-/area/station/service/library)
"mUn" = (
/obj/structure/cable,
/obj/machinery/door/airlock{
@@ -38688,6 +38531,13 @@
/obj/effect/decal/cleanable/cobweb/cobweb2,
/turf/open/floor/iron/grimy,
/area/station/cargo/boutique)
+"mUv" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 4
+ },
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
+/turf/open/floor/iron/grimy,
+/area/station/service/library)
"mUI" = (
/obj/machinery/atmospherics/pipe/smart/simple/orange/hidden,
/obj/effect/turf_decal/tile/yellow,
@@ -38709,18 +38559,6 @@
/obj/machinery/firealarm/directional/west,
/turf/open/floor/iron,
/area/station/hallway/secondary/entry)
-"mVc" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/door/firedoor,
-/obj/effect/turf_decal/stripes/red/line{
- dir = 4
- },
-/obj/effect/turf_decal/stripes/red/line{
- dir = 8
- },
-/turf/open/floor/iron/small,
-/area/station/hallway/primary/central/aft)
"mVm" = (
/obj/effect/turf_decal/tile/green/anticorner/contrasted{
dir = 1
@@ -38775,6 +38613,20 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/science/lower)
+"mWg" = (
+/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/random/structure/closet_maintenance,
+/turf/open/floor/plating,
+/area/station/maintenance/central/greater)
+"mWq" = (
+/obj/structure/window/spawner/directional/north,
+/obj/structure/flora/bush/flowers_yw/style_random,
+/obj/machinery/door/airlock{
+ id_tag = "Toilet1";
+ name = "Unit 1"
+ },
+/turf/open/misc/sandy_dirt,
+/area/station/commons/fitness/locker_room)
"mWs" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -38786,27 +38638,14 @@
/obj/machinery/atmospherics/pipe/heat_exchanging/simple,
/turf/open/floor/iron/dark/small,
/area/station/tcommsat/server)
-"mWF" = (
-/obj/machinery/status_display/evac/directional/north,
+"mWH" = (
+/obj/machinery/light/warm/dim,
/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
+ dir = 9
},
+/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/iron,
/area/station/hallway/primary/central/aft)
-"mWT" = (
-/obj/effect/turf_decal/siding/thinplating_new/light{
- dir = 8
- },
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
- dir = 4
- },
-/turf/open/floor/iron/white/small,
-/area/station/service/hydroponics)
"mWY" = (
/obj/effect/turf_decal/tile/dark_red/opposingcorners,
/obj/structure/chair/sofa/bench/left{
@@ -38815,6 +38654,21 @@
/obj/machinery/airalarm/directional/west,
/turf/open/floor/iron,
/area/station/security/processing)
+"mXb" = (
+/obj/effect/turf_decal/weather/dirt{
+ dir = 1
+ },
+/mob/living/basic/deer,
+/obj/structure/flora/bush/flowers_pp/style_random,
+/turf/open/floor/grass,
+/area/station/service/chapel)
+"mXi" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/wood/corner,
+/turf/open/floor/stone,
+/area/station/service/chapel)
"mXk" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/broken_flooring/singular/directional/east,
@@ -38859,18 +38713,6 @@
/obj/machinery/firealarm/directional/north,
/turf/open/floor/iron/white,
/area/station/medical/medbay/central)
-"mXZ" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/disposalpipe/segment{
- dir = 10
- },
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/fore)
"mYd" = (
/obj/structure/cable,
/obj/structure/disposalpipe/segment{
@@ -38922,26 +38764,6 @@
/obj/effect/turf_decal/tile/dark_red/opposingcorners,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/security/armory)
-"mYT" = (
-/obj/structure/table,
-/obj/item/assembly/igniter{
- pixel_x = -5;
- pixel_y = 3
- },
-/obj/item/assembly/igniter{
- pixel_x = 5;
- pixel_y = -4
- },
-/obj/item/assembly/igniter{
- pixel_x = 2;
- pixel_y = 6
- },
-/obj/item/assembly/igniter{
- pixel_x = 2;
- pixel_y = -1
- },
-/turf/open/floor/engine,
-/area/station/science/xenobiology)
"mYW" = (
/obj/machinery/camera{
c_tag = "Xenobiology - Zoo";
@@ -38979,18 +38801,6 @@
dir = 1
},
/area/station/security/execution/education)
-"mZd" = (
-/obj/structure/disposalpipe/segment,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/turf_decal/trimline/neutral/line{
- dir = 4
- },
-/obj/effect/turf_decal/trimline/neutral/line{
- dir = 8
- },
-/obj/structure/cable,
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/fore)
"mZg" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -39014,6 +38824,15 @@
/obj/structure/alien/weeds,
/turf/open/floor/wood,
/area/station/maintenance/starboard/greater)
+"mZV" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 1
+ },
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+ dir = 4
+ },
+/turf/open/floor/stone,
+/area/station/service/bar)
"mZZ" = (
/obj/structure/table/glass,
/obj/effect/turf_decal/trimline/blue/filled/line{
@@ -39060,6 +38879,10 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/iron,
/area/station/security/brig/entrance)
+"naH" = (
+/obj/effect/landmark/start/cook,
+/turf/open/floor/iron/kitchen/small,
+/area/station/service/kitchen)
"naN" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/door/airlock{
@@ -39068,6 +38891,15 @@
},
/turf/open/floor/iron/showroomfloor,
/area/station/commons/toilet/auxiliary)
+"nbi" = (
+/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
+ },
+/turf/open/floor/plating,
+/area/station/maintenance/port/greater)
"nbj" = (
/obj/structure/railing{
dir = 1
@@ -39130,6 +38962,17 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/checker,
/area/station/security/breakroom)
+"ncm" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/structure/disposalpipe/segment,
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/fore)
"ncr" = (
/obj/structure/cable,
/obj/structure/chair/office{
@@ -39159,6 +39002,15 @@
/obj/effect/turf_decal/trimline/neutral/line,
/turf/open/floor/iron,
/area/station/hallway/primary/central/fore)
+"ncO" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/wood{
+ dir = 4
+ },
+/turf/open/floor/stone,
+/area/station/service/bar)
"ncQ" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -39179,6 +39031,27 @@
/obj/structure/tank_dispenser/oxygen,
/turf/open/floor/iron,
/area/station/security/tram)
+"ndO" = (
+/obj/machinery/door/airlock{
+ name = "Maintenance"
+ },
+/obj/effect/mapping_helpers/airlock/access/any/service/maintenance,
+/obj/structure/cable,
+/turf/open/floor/plating,
+/area/station/maintenance/central/lesser)
+"ndT" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/obj/machinery/airalarm/directional/west,
+/obj/structure/disposalpipe/segment{
+ dir = 5
+ },
+/turf/open/floor/iron/small,
+/area/station/medical/medbay/lobby)
"ndY" = (
/obj/effect/turf_decal/stripes/red/line{
dir = 8
@@ -39199,12 +39072,6 @@
},
/turf/open/floor/iron/dark,
/area/station/medical/chemistry)
-"neF" = (
-/obj/effect/turf_decal/siding/wood{
- dir = 9
- },
-/turf/open/floor/stone,
-/area/station/service/chapel)
"neL" = (
/obj/structure/closet/crate{
name = "Materials Crate"
@@ -39248,10 +39115,6 @@
},
/turf/open/floor/iron,
/area/station/security)
-"ngd" = (
-/obj/effect/turf_decal/tile/neutral/opposingcorners,
-/turf/open/floor/iron,
-/area/station/holodeck/rec_center)
"ngq" = (
/obj/structure/cable,
/obj/structure/disposalpipe/segment{
@@ -39259,13 +39122,6 @@
},
/turf/open/floor/plating,
/area/station/maintenance/department/medical/central)
-"ngv" = (
-/obj/structure/window/reinforced/spawner/directional/north,
-/obj/structure/window/reinforced/spawner/directional/south,
-/obj/structure/grille,
-/obj/structure/window/reinforced/spawner/directional/west,
-/turf/open/floor/plating,
-/area/station/hallway/primary/central/fore)
"ngL" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -39289,6 +39145,14 @@
/obj/effect/landmark/start/atmospheric_technician,
/turf/open/floor/iron/smooth,
/area/station/engineering/atmos)
+"nhi" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/item/flashlight/lantern/on,
+/obj/effect/turf_decal/siding/wood{
+ dir = 1
+ },
+/turf/open/floor/stone,
+/area/station/service/chapel)
"nhl" = (
/obj/structure/cable,
/obj/structure/disposalpipe/segment{
@@ -39373,6 +39237,11 @@
/obj/machinery/vending/wardrobe/chem_wardrobe,
/turf/open/floor/iron,
/area/station/medical/chemistry)
+"nim" = (
+/obj/effect/turf_decal/weather/dirt,
+/obj/structure/flora/bush/flowers_yw/style_3,
+/turf/open/floor/grass,
+/area/station/service/chapel)
"niv" = (
/obj/machinery/portable_atmospherics/canister,
/turf/open/floor/iron,
@@ -39430,10 +39299,32 @@
},
/turf/open/floor/iron/small,
/area/station/service/barber)
+"niX" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/structure/sign/departments/cargo/directional/west,
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/fore)
"niZ" = (
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/maintenance/aft)
+"njd" = (
+/obj/structure/toilet{
+ dir = 4
+ },
+/obj/machinery/button/door/directional/north{
+ name = "Lock Control";
+ id = "Toilet2";
+ specialfunctions = 4;
+ normaldoorcontrol = 1
+ },
+/obj/machinery/light/small/directional/west,
+/obj/structure/sign/poster/contraband/random/directional/west,
+/turf/open/floor/iron/white/small,
+/area/station/commons/toilet/restrooms)
"nje" = (
/obj/structure/railing{
dir = 1
@@ -39454,13 +39345,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
/area/station/maintenance/department/science/xenobiology)
-"njs" = (
-/obj/structure/chair/comfy/black{
- dir = 1
- },
-/obj/effect/landmark/start/chaplain,
-/turf/open/floor/carpet/lone,
-/area/station/service/chapel/office)
"nju" = (
/obj/machinery/duct,
/obj/effect/decal/cleanable/dirt,
@@ -39494,6 +39378,21 @@
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plating,
/area/station/hallway/secondary/construction)
+"njO" = (
+/obj/effect/turf_decal/tile/red/opposingcorners,
+/obj/effect/turf_decal/tile/blue/opposingcorners{
+ dir = 8
+ },
+/obj/machinery/disposal/bin,
+/obj/machinery/light_switch/directional/south,
+/obj/machinery/camera/directional/south{
+ c_tag = "Atmospherics - South"
+ },
+/obj/structure/disposalpipe/trunk{
+ dir = 1
+ },
+/turf/open/floor/iron/smooth,
+/area/station/service/greenroom)
"njW" = (
/obj/effect/spawner/structure/window,
/turf/open/floor/plating,
@@ -39534,6 +39433,13 @@
"nks" = (
/turf/closed/wall/r_wall,
/area/station/engineering/atmos/space_catwalk)
+"nkt" = (
+/obj/effect/turf_decal/tile/neutral/opposingcorners,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/camera/autoname/directional/east,
+/turf/open/floor/iron,
+/area/station/holodeck/rec_center)
"nkw" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/effect/turf_decal/trimline/blue/filled/corner{
@@ -39552,12 +39458,6 @@
/obj/effect/turf_decal/trimline/neutral/line,
/turf/open/floor/iron,
/area/station/hallway/primary/starboard)
-"nkW" = (
-/obj/effect/turf_decal/tile/blue/anticorner/contrasted{
- dir = 8
- },
-/turf/open/floor/iron/white,
-/area/station/medical/medbay/lobby)
"nla" = (
/turf/closed/wall,
/area/station/commons/storage/art)
@@ -39603,13 +39503,6 @@
},
/turf/open/floor/iron/smooth,
/area/station/engineering/atmos)
-"nlQ" = (
-/obj/effect/turf_decal/siding/thinplating{
- dir = 8
- },
-/obj/machinery/holopad,
-/turf/open/floor/eighties,
-/area/station/hallway/primary/central/fore)
"nlS" = (
/turf/open/floor/iron/white/small,
/area/station/medical/virology)
@@ -39624,6 +39517,29 @@
"nlZ" = (
/turf/closed/wall/r_wall,
/area/station/engineering/lobby)
+"nmb" = (
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/structure/rack,
+/obj/item/storage/toolbox/emergency{
+ pixel_x = -2;
+ pixel_y = -3
+ },
+/obj/item/cigarette/cigar,
+/obj/effect/mapping_helpers/broken_floor,
+/obj/machinery/light_switch/directional/south,
+/turf/open/floor/iron/smooth,
+/area/station/command/bridge)
+"nmc" = (
+/obj/machinery/status_display/ai/directional/south,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/item/kirbyplants/random,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/turf/open/floor/iron/white/side,
+/area/station/hallway/primary/central/aft)
"nmh" = (
/obj/effect/turf_decal/siding/green,
/obj/machinery/light/cold/directional/south,
@@ -39636,6 +39552,28 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/iron/small,
/area/station/engineering/break_room)
+"nmw" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 5
+ },
+/obj/structure/table/wood,
+/obj/effect/landmark/start/hangover,
+/turf/open/floor/iron/grimy,
+/area/station/service/bar)
+"nmD" = (
+/obj/structure/chair/sofa/bench/right{
+ dir = 1
+ },
+/obj/machinery/camera/directional/south{
+ c_tag = "Atmospherics - South"
+ },
+/obj/effect/turf_decal/tile/blue,
+/obj/effect/landmark/start/hangover,
+/obj/effect/turf_decal/tile/neutral/half/contrasted{
+ dir = 1
+ },
+/turf/open/floor/iron/dark/side,
+/area/station/hallway/primary/central/fore)
"nmH" = (
/obj/structure/railing,
/obj/effect/turf_decal/siding/wideplating,
@@ -39656,15 +39594,6 @@
/obj/structure/cable,
/turf/open/floor/iron/smooth,
/area/station/command/heads_quarters/qm)
-"nnd" = (
-/obj/effect/turf_decal/tile/dark_red/half/contrasted{
- dir = 1
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/station/security/brig/entrance)
"nne" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/effect/turf_decal/tile/dark_red/opposingcorners,
@@ -39686,6 +39615,14 @@
/obj/structure/bed/maint,
/turf/open/floor/eighties,
/area/station/service/abandoned_gambling_den/gaming)
+"nox" = (
+/obj/effect/turf_decal/weather/dirt{
+ dir = 1
+ },
+/obj/structure/cable,
+/obj/machinery/light/small/directional/north,
+/turf/open/floor/grass,
+/area/station/service/chapel)
"noz" = (
/obj/structure/disposalpipe/trunk{
dir = 8
@@ -39729,6 +39666,17 @@
},
/turf/open/floor/iron/dark/smooth_large,
/area/station/command/meeting_room)
+"noH" = (
+/obj/structure/table,
+/obj/item/stack/sheet/iron/five,
+/obj/item/stack/cable_coil/five,
+/obj/effect/turf_decal/tile/brown/opposingcorners{
+ dir = 1
+ },
+/obj/item/radio/intercom/directional/east,
+/obj/machinery/light_switch/directional/south,
+/turf/open/floor/iron,
+/area/station/commons/vacant_room/commissary)
"noN" = (
/obj/structure/disposalpipe/segment,
/obj/effect/decal/cleanable/dirt,
@@ -39737,6 +39685,12 @@
/obj/structure/steam_vent,
/turf/open/floor/plating,
/area/station/maintenance/starboard/fore)
+"noP" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/open/floor/plating,
+/area/station/maintenance/port/greater)
"noS" = (
/obj/structure/bed,
/obj/item/bedsheet/red,
@@ -39763,10 +39717,29 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/large,
/area/station/service/janitor)
+"npc" = (
+/obj/structure/table/wood,
+/obj/item/cigarette/cigar/premium{
+ pixel_y = 5
+ },
+/turf/open/floor/stone,
+/area/station/service/abandoned_gambling_den)
"npp" = (
/obj/structure/cable,
/turf/open/floor/plating,
/area/station/maintenance/department/prison)
+"nps" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/turf_decal/siding/wideplating/dark,
+/obj/effect/turf_decal/tile/dark_red/half/contrasted{
+ dir = 1
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/open/floor/iron,
+/area/station/security/brig/entrance)
"npA" = (
/obj/effect/spawner/structure/window,
/turf/open/floor/plating,
@@ -39846,13 +39819,6 @@
},
/turf/open/floor/iron/white,
/area/station/medical/virology)
-"nqY" = (
-/obj/effect/landmark/event_spawn,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
- dir = 1
- },
-/turf/open/floor/stone,
-/area/station/service/chapel)
"nra" = (
/obj/effect/turf_decal/siding/wood,
/obj/structure/window/spawner/directional/south,
@@ -39860,21 +39826,14 @@
/obj/effect/turf_decal/bot,
/turf/open/floor/iron,
/area/station/engineering/main)
-"nrg" = (
-/obj/structure/closet/secure_closet/hydroponics,
-/obj/effect/turf_decal/siding/thinplating_new/light{
- dir = 1
- },
-/turf/open/floor/iron/white/small,
-/area/station/service/hydroponics)
-"nrp" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/item/flashlight/lantern/on,
-/obj/effect/turf_decal/siding/wood{
+"nrh" = (
+/obj/effect/turf_decal/trimline/neutral/line{
dir = 1
},
-/turf/open/floor/stone,
-/area/station/service/chapel)
+/obj/effect/turf_decal/trimline/neutral/line,
+/obj/structure/cable,
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/fore)
"nry" = (
/obj/effect/turf_decal/tile/red/anticorner/contrasted{
dir = 8
@@ -39889,6 +39848,30 @@
},
/turf/open/floor/iron/smooth,
/area/station/security/checkpoint/supply)
+"nrC" = (
+/obj/effect/landmark/start/hangover,
+/obj/effect/turf_decal/trimline/neutral/line,
+/obj/effect/turf_decal/trimline/neutral/line{
+ dir = 1
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/open/floor/iron,
+/area/station/hallway/primary/port)
+"nrQ" = (
+/obj/structure/cable,
+/obj/structure/disposalpipe/segment,
+/obj/machinery/door/firedoor,
+/obj/effect/turf_decal/stripes/red/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes/red/line,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/open/floor/iron/small,
+/area/station/hallway/primary/central/fore)
"nsa" = (
/turf/closed/wall,
/area/station/engineering/atmospherics_engine)
@@ -39924,15 +39907,6 @@
"nsy" = (
/turf/closed/wall/r_wall/rust,
/area/station/engineering/hallway)
-"nsz" = (
-/obj/effect/spawner/random/vending/snackvend,
-/obj/structure/cable,
-/obj/machinery/power/apc/auto_name/directional/south,
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/turf/open/floor/iron/white/side,
-/area/station/hallway/primary/central/aft)
"nsL" = (
/obj/structure/disposalpipe/segment,
/obj/effect/turf_decal/tile/red{
@@ -39993,14 +39967,6 @@
/obj/effect/spawner/random/maintenance/two,
/turf/open/floor/plating,
/area/station/maintenance/fore/lesser)
-"ntu" = (
-/obj/effect/turf_decal/siding/thinplating_new/light{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/iron/white/small,
-/area/station/service/hydroponics)
"ntF" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/status_display/ai/directional/south,
@@ -40022,14 +39988,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/cafeteria,
/area/station/science/breakroom)
-"ntP" = (
-/obj/structure/displaycase/trophy,
-/obj/effect/turf_decal/siding/wood{
- dir = 4
- },
-/obj/machinery/camera/autoname/directional/west,
-/turf/open/floor/wood/parquet,
-/area/station/service/library)
"ntW" = (
/obj/machinery/light/small/directional/north,
/obj/machinery/vending/wardrobe/coroner_wardrobe,
@@ -40054,21 +40012,20 @@
},
/turf/open/floor/iron,
/area/station/cargo/storage)
+"nue" = (
+/obj/machinery/door/airlock/engineering{
+ name = "Engine Airlock"
+ },
+/obj/machinery/door/firedoor,
+/obj/effect/mapping_helpers/airlock/access/any/engineering/construction,
+/obj/structure/cable,
+/obj/effect/landmark/navigate_destination,
+/turf/open/floor/catwalk_floor,
+/area/station/engineering/break_room)
"num" = (
/obj/effect/turf_decal/sand/plating,
/turf/closed/wall,
/area/station/maintenance/port/lesser)
-"nun" = (
-/obj/structure/flora/bush/flowers_br/style_random{
- pixel_x = -3;
- pixel_y = 4
- },
-/obj/effect/light_emitter/fake_outdoors,
-/obj/effect/turf_decal/siding/wood{
- dir = 6
- },
-/turf/open/floor/grass/Airless,
-/area/station/hallway/primary/central/aft)
"nuo" = (
/obj/effect/turf_decal/tile/neutral/fourcorners,
/obj/effect/decal/cleanable/dirt,
@@ -40125,17 +40082,6 @@
},
/turf/open/floor/iron/smooth,
/area/station/maintenance/solars/starboard/aft)
-"nuV" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/effect/turf_decal/tile/neutral/opposingcorners,
-/obj/structure/chair/sofa/bench/left{
- dir = 4
- },
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron,
-/area/station/holodeck/rec_center)
"nuY" = (
/obj/structure/broken_flooring/pile/directional/east,
/obj/structure/alien/weeds/node,
@@ -40148,6 +40094,12 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron,
/area/station/hallway/secondary/recreation)
+"nvC" = (
+/obj/effect/turf_decal/weather/dirt,
+/mob/living/basic/deer,
+/obj/structure/flora/bush/flowers_yw,
+/turf/open/floor/grass,
+/area/station/service/chapel)
"nvE" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/effect/turf_decal/tile/neutral,
@@ -40169,6 +40121,22 @@
},
/turf/open/floor/iron/recharge_floor,
/area/station/maintenance/port/aft)
+"nvU" = (
+/obj/structure/disposalpipe/segment,
+/obj/effect/turf_decal/trimline/neutral/line{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/neutral/line{
+ dir = 8
+ },
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/fore)
+"nvX" = (
+/obj/structure/flora/bush/flowers_br,
+/turf/open/floor/grass,
+/area/station/service/chapel)
"nwj" = (
/obj/effect/turf_decal/tile/blue{
dir = 4
@@ -40190,6 +40158,11 @@
},
/turf/open/floor/iron,
/area/station/hallway/secondary/entry)
+"nwX" = (
+/obj/structure/cable,
+/obj/machinery/power/apc/auto_name/directional/north,
+/turf/open/floor/iron/dark/small,
+/area/station/maintenance/central/lesser)
"nxo" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -40198,18 +40171,6 @@
},
/turf/open/floor/iron/dark,
/area/station/cargo/storage)
-"nxy" = (
-/obj/effect/turf_decal/weather/snow/corner{
- dir = 9
- },
-/obj/effect/turf_decal/weather/snow,
-/obj/structure/closet/secure_closet/freezer/meat,
-/obj/effect/turf_decal/weather/snow/corner,
-/obj/item/food/meat/slab/monkey,
-/obj/item/food/meat/slab/monkey,
-/obj/item/food/meat/slab/monkey,
-/turf/open/floor/iron/freezer,
-/area/station/service/kitchen/coldroom)
"nxD" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -40221,16 +40182,6 @@
},
/turf/open/floor/iron/dark/small,
/area/station/medical/morgue)
-"nxI" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/obj/structure/disposalpipe/segment{
- dir = 9
- },
-/turf/open/floor/iron,
-/area/station/hallway/primary/fore)
"nxJ" = (
/obj/effect/mapping_helpers/broken_floor,
/obj/machinery/modular_computer/preset/id{
@@ -40239,11 +40190,17 @@
/obj/machinery/keycard_auth/directional/south,
/turf/open/floor/wood,
/area/station/command/heads_quarters/qm)
-"nxK" = (
-/mob/living/basic/deer,
-/obj/structure/flora/bush/sparsegrass,
-/turf/open/floor/grass,
-/area/station/service/chapel)
+"nxM" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/fore)
"nxO" = (
/obj/effect/spawner/structure/window,
/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible,
@@ -40424,12 +40381,12 @@
/obj/machinery/light/small/broken/directional/west,
/turf/open/misc/sandy_dirt,
/area/station/maintenance/starboard/aft)
-"nAq" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
- dir = 4
- },
-/turf/open/floor/iron/grimy,
-/area/station/service/library)
+"nAp" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/turf_decal/tile/neutral,
+/obj/structure/disposalpipe/junction,
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/fore)
"nAy" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -40445,6 +40402,15 @@
/obj/effect/landmark/start/roboticist,
/turf/open/floor/iron,
/area/station/science/robotics/lab)
+"nAK" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/landmark/generic_maintenance_landmark,
+/obj/structure/table,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/open/floor/plating,
+/area/station/maintenance/port/greater)
"nBd" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -40456,6 +40422,19 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/showroomfloor,
/area/station/commons/toilet/auxiliary)
+"nBs" = (
+/obj/effect/turf_decal/plaque{
+ icon_state = "L11";
+ pixel_y = -15
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/aft)
"nBw" = (
/obj/effect/turf_decal/siding/thinplating_new,
/turf/open/floor/iron/dark/herringbone,
@@ -40487,19 +40466,6 @@
},
/turf/open/floor/plating,
/area/station/maintenance/starboard/central)
-"nBL" = (
-/obj/structure/disposalpipe/segment,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/landmark/event_spawn,
-/obj/effect/turf_decal/trimline/neutral/line{
- dir = 1
- },
-/obj/effect/turf_decal/trimline/neutral/line,
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/fore)
"nBM" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{
@@ -40550,13 +40516,6 @@
/obj/machinery/camera/autoname/directional/south,
/turf/open/floor/iron/dark,
/area/station/medical/medbay/lobby)
-"nCX" = (
-/obj/machinery/light/floor,
-/obj/structure/flora/bush/flowers_pp,
-/obj/structure/flora/bush/flowers_yw,
-/obj/structure/flora/bush/fullgrass,
-/turf/open/floor/grass,
-/area/station/hallway/primary/central/fore)
"nCY" = (
/obj/structure/cable,
/turf/open/floor/iron/kitchen/small,
@@ -40575,29 +40534,21 @@
/turf/open/floor/iron,
/area/station/security)
"nDm" = (
-/obj/structure/table,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/effect/spawner/random/food_or_drink/cake_ingredients,
-/obj/item/kitchen/rollingpin,
-/turf/open/floor/iron/kitchen/small,
-/area/station/service/kitchen)
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/turf_decal/tile/dark_red/fourcorners,
+/obj/effect/turf_decal/siding/wideplating/dark{
+ dir = 1
+ },
+/obj/structure/disposalpipe/segment,
+/turf/open/floor/iron,
+/area/station/security/brig/entrance)
"nDQ" = (
/obj/structure/chair{
dir = 4
},
/turf/open/floor/iron/dark,
/area/station/security/interrogation)
-"nDV" = (
-/obj/structure/disposalpipe/segment,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/effect/turf_decal/trimline/neutral/line{
- dir = 1
- },
-/obj/effect/turf_decal/trimline/neutral/line,
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/fore)
"nEa" = (
/obj/structure/lattice/catwalk,
/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible,
@@ -40614,19 +40565,6 @@
/obj/effect/turf_decal/bot,
/turf/open/floor/iron/dark/textured_large,
/area/station/cargo/bitrunning/den)
-"nEq" = (
-/obj/machinery/door/airlock/public/glass{
- name = "Library"
- },
-/obj/machinery/door/firedoor,
-/obj/effect/turf_decal/siding/wood{
- dir = 1
- },
-/obj/effect/turf_decal/siding/wood{
- dir = 1
- },
-/turf/open/floor/iron/textured_half,
-/area/station/service/library)
"nEx" = (
/obj/structure/disposalpipe/segment{
dir = 9
@@ -40652,6 +40590,22 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/white,
/area/station/science/cytology)
+"nEE" = (
+/obj/structure/cable,
+/obj/machinery/door/airlock{
+ name = "Maintenance"
+ },
+/obj/effect/mapping_helpers/airlock/access/any/service/maintenance,
+/obj/effect/mapping_helpers/airlock/unres{
+ dir = 4
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/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/central/lesser)
"nEL" = (
/obj/structure/transit_tube/station/dispenser/reverse/flipped{
dir = 8
@@ -40702,6 +40656,15 @@
},
/turf/open/floor/iron/grimy,
/area/station/tcommsat/server)
+"nFq" = (
+/obj/effect/turf_decal/weather/dirt{
+ dir = 1
+ },
+/obj/structure/flora/bush/jungle/a,
+/obj/machinery/light/small/directional/north,
+/obj/machinery/status_display/ai/directional/north,
+/turf/open/floor/grass,
+/area/station/service/chapel)
"nFs" = (
/obj/machinery/telecomms/server/presets/command,
/turf/open/floor/circuit,
@@ -40805,6 +40768,13 @@
},
/turf/open/floor/iron/showroomfloor,
/area/station/medical/virology)
+"nGO" = (
+/obj/machinery/camera/autoname/directional/north,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/aft)
"nGP" = (
/obj/effect/turf_decal/tile/yellow{
dir = 1
@@ -40964,32 +40934,6 @@
/obj/structure/cable,
/turf/open/floor/iron/small,
/area/station/maintenance/solars/starboard/fore)
-"nJj" = (
-/obj/effect/spawner/random/vending/snackvend,
-/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
-/obj/effect/turf_decal/tile/neutral/half/contrasted{
- dir = 8
- },
-/obj/machinery/airalarm/directional/east,
-/obj/structure/disposalpipe/segment{
- dir = 9
- },
-/turf/open/floor/iron/dark/side{
- dir = 4
- },
-/area/station/hallway/primary/central/fore)
-"nJo" = (
-/obj/structure/cable,
-/obj/structure/disposalpipe/segment{
- dir = 6
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/effect/spawner/random/structure/steam_vent,
-/turf/open/floor/plating,
-/area/station/maintenance/port/greater)
"nJG" = (
/obj/structure/cable,
/obj/effect/spawner/structure/window/reinforced,
@@ -41039,12 +40983,28 @@
/obj/machinery/portable_atmospherics/canister,
/turf/open/floor/iron/dark,
/area/station/science/ordnance)
+"nLx" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/turf_decal/tile/neutral,
+/obj/structure/disposalpipe/segment{
+ dir = 9
+ },
+/turf/open/floor/iron,
+/area/station/hallway/primary/port)
"nLH" = (
/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,
/area/station/cargo/warehouse)
+"nLJ" = (
+/obj/effect/turf_decal/tile/brown/opposingcorners{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/cable,
+/turf/open/floor/iron,
+/area/station/commons/vacant_room/commissary)
"nLM" = (
/obj/structure/cable,
/obj/structure/table/reinforced,
@@ -41058,6 +41018,12 @@
},
/turf/open/floor/iron,
/area/station/engineering/storage/tech)
+"nMg" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/aft)
"nMn" = (
/obj/structure/disposalpipe/segment{
dir = 6
@@ -41079,6 +41045,16 @@
/obj/effect/mapping_helpers/airlock/access/any/engineering/construction,
/turf/open/floor/iron,
/area/station/maintenance/starboard/aft)
+"nMD" = (
+/obj/structure/table/wood,
+/obj/structure/displaycase/forsale/kitchen{
+ pixel_y = 8
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 9
+ },
+/turf/open/floor/wood/large,
+/area/station/service/bar)
"nMQ" = (
/obj/machinery/computer/atmos_control/oxygen_tank{
dir = 1
@@ -41128,24 +41104,6 @@
},
/turf/open/floor/plating,
/area/station/maintenance/hallway/abandoned_command)
-"nNz" = (
-/obj/structure/disposalpipe/segment,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/effect/turf_decal/trimline/neutral/line{
- dir = 1
- },
-/obj/effect/turf_decal/trimline/neutral/line,
-/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/hallway/primary/central/aft)
-"nNA" = (
-/obj/machinery/light/small/broken/directional/west,
-/turf/open/floor/iron/dark/small,
-/area/station/maintenance/central/lesser)
"nNB" = (
/obj/machinery/door/airlock{
name = "Gardening Supplies"
@@ -41153,6 +41111,24 @@
/obj/structure/cable,
/turf/open/floor/plating,
/area/station/maintenance/department/prison)
+"nNF" = (
+/obj/machinery/smartfridge,
+/obj/machinery/door/poddoor/shutters{
+ name = "Kitchen Shutters";
+ id = "kitchenshutters"
+ },
+/obj/merge_conflict_marker{
+ name = "---Merge Conflict Marker---";
+
+ desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
+ },
+/obj/machinery/smartfridge,
+/obj/machinery/door/poddoor/shutters/preopen{
+ id = "kitchenshutters";
+ name = "Kitchen Shutters"
+ },
+/turf/open/floor/iron/kitchen/small,
+/area/station/service/kitchen)
"nNZ" = (
/obj/structure/tank_dispenser,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/visible,
@@ -41176,13 +41152,6 @@
},
/turf/open/floor/plating,
/area/station/medical/pharmacy)
-"nPe" = (
-/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/dark_red/fourcorners,
-/turf/open/floor/iron,
-/area/station/security/brig/entrance)
"nPt" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -41235,6 +41204,15 @@
/obj/structure/cable,
/turf/open/floor/iron/dark,
/area/station/security/lockers)
+"nQc" = (
+/obj/structure/table/wood,
+/obj/effect/decal/cleanable/dirt,
+/obj/item/screwdriver,
+/obj/effect/turf_decal/siding/wideplating_new/terracotta{
+ dir = 8
+ },
+/turf/open/floor/wood/tile,
+/area/station/maintenance/central/lesser)
"nQj" = (
/obj/structure/toilet/greyscale{
dir = 8
@@ -41260,6 +41238,22 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/cafeteria,
/area/station/science/circuits)
+"nQq" = (
+/obj/effect/turf_decal/tile/brown/opposingcorners{
+ dir = 1
+ },
+/obj/machinery/firealarm/directional/east,
+/obj/machinery/disposal/bin,
+/obj/structure/disposalpipe/trunk{
+ dir = 1
+ },
+/obj/machinery/button/door/directional/north{
+ id = "meow";
+ name = "Comissary Shutters";
+ pixel_x = 29
+ },
+/turf/open/floor/iron,
+/area/station/commons/vacant_room/commissary)
"nQs" = (
/obj/structure/chair{
dir = 8
@@ -41361,25 +41355,18 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
/turf/open/floor/wood,
/area/station/engineering/break_room)
+"nRD" = (
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/aft)
"nRP" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/effect/turf_decal/tile/dark_red/half/contrasted,
/turf/open/floor/iron/smooth,
/area/station/security/checkpoint/customs)
-"nSb" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
- dir = 1
- },
-/obj/effect/turf_decal/trimline/neutral/line,
-/obj/effect/turf_decal/trimline/neutral/line{
- dir = 1
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/station/hallway/primary/port)
"nSd" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -41454,14 +41441,6 @@
},
/turf/open/floor/plating,
/area/station/security/tram)
-"nTz" = (
-/obj/effect/turf_decal/tile/yellow/anticorner/contrasted,
-/obj/machinery/chem_dispenser{
- layer = 2.7
- },
-/obj/machinery/light/small/directional/south,
-/turf/open/floor/iron/dark,
-/area/station/medical/pharmacy)
"nTC" = (
/turf/open/floor/iron/white/small,
/area/station/security/prison/safe)
@@ -41478,12 +41457,35 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/grimy,
/area/station/engineering/main)
-"nUd" = (
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
+"nUa" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/turf_decal/siding/wideplating/dark{
+ dir = 1
},
+/obj/effect/turf_decal/tile/dark_red/half/contrasted,
+/obj/structure/disposalpipe/segment,
/turf/open/floor/iron,
-/area/station/hallway/primary/central/aft)
+/area/station/security/brig/entrance)
+"nUb" = (
+/obj/effect/turf_decal/weather/dirt{
+ dir = 1
+ },
+/obj/structure/flora/bush/flowers_br/style_random,
+/obj/structure/flora/bush/jungle/b/style_2,
+/obj/machinery/light/small/directional/north,
+/obj/item/radio/intercom/directional/north,
+/turf/open/floor/grass,
+/area/station/service/chapel)
+"nUk" = (
+/obj/structure/cable,
+/obj/effect/turf_decal/trimline/neutral/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/neutral/line,
+/obj/structure/disposalpipe/segment,
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/fore)
"nUo" = (
/obj/effect/turf_decal/tile/purple/opposingcorners,
/obj/effect/turf_decal/siding/green{
@@ -41505,6 +41507,28 @@
},
/turf/open/floor/iron/smooth,
/area/station/cargo/warehouse)
+"nUA" = (
+/obj/structure/table/reinforced,
+/obj/machinery/door/firedoor,
+/obj/machinery/door/window/right/directional/west,
+/obj/machinery/door/poddoor/shutters{
+ name = "Kitchen Shutters";
+ id = "kitchenshutters"
+ },
+/obj/merge_conflict_marker{
+ name = "---Merge Conflict Marker---";
+
+ desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
+ },
+/obj/structure/table/reinforced,
+/obj/machinery/door/firedoor,
+/obj/machinery/door/window/right/directional/west,
+/obj/machinery/door/poddoor/shutters/preopen{
+ id = "kitchenshutters";
+ name = "Kitchen Shutters"
+ },
+/turf/open/floor/iron,
+/area/station/service/kitchen)
"nUB" = (
/obj/structure/lattice/catwalk,
/obj/structure/railing{
@@ -41526,12 +41550,6 @@
/obj/machinery/atmospherics/pipe/bridge_pipe/brown/visible,
/turf/open/space/basic,
/area/station/engineering/atmos/space_catwalk)
-"nUK" = (
-/obj/effect/turf_decal/siding/wood,
-/obj/structure/barricade/wooden/crude,
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/plating,
-/area/station/cargo/boutique)
"nUQ" = (
/obj/structure/chair{
dir = 8
@@ -41547,6 +41565,22 @@
},
/turf/open/floor/iron,
/area/station/commons/dorms)
+"nUZ" = (
+/obj/structure/window/spawner/directional/east,
+/obj/structure/table/wood,
+/obj/machinery/cell_charger{
+ pixel_y = 5
+ },
+/obj/item/stock_parts/power_store/cell/crap{
+ pixel_y = 5
+ },
+/obj/item/cigarette/pipe/cobpipe{
+ pixel_x = 1;
+ pixel_y = -2
+ },
+/obj/structure/sign/poster/official/random/directional/north,
+/turf/open/floor/wood/tile,
+/area/station/command/corporate_showroom)
"nVa" = (
/obj/effect/turf_decal/stripes/corner{
dir = 1
@@ -41582,18 +41616,6 @@
/obj/item/wirecutters,
/turf/open/floor/iron/dark,
/area/station/security/office)
-"nVw" = (
-/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/tile/neutral/opposingcorners{
- dir = 1
- },
-/obj/effect/turf_decal/siding/thinplating_new{
- dir = 8
- },
-/turf/open/floor/iron/small,
-/area/station/hallway/secondary/service)
"nVx" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -41618,6 +41640,15 @@
/obj/effect/spawner/structure/window/reinforced/tinted,
/turf/open/floor/plating,
/area/station/tcommsat/server)
+"nVR" = (
+/obj/effect/turf_decal/weather/dirt{
+ dir = 10
+ },
+/obj/structure/flora/bush/large/style_random{
+ pixel_y = 0
+ },
+/turf/open/floor/grass,
+/area/station/service/chapel)
"nWh" = (
/obj/machinery/atmospherics/pipe/smart/simple/dark/visible,
/turf/closed/wall/r_wall,
@@ -41663,20 +41694,6 @@
},
/turf/open/floor/iron/white/textured_large,
/area/station/medical/pharmacy)
-"nXx" = (
-/obj/effect/turf_decal/tile/dark_red/half/contrasted{
- dir = 1
- },
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
- dir = 1
- },
-/obj/machinery/light/cold/directional/south,
-/obj/machinery/airalarm/directional/south,
-/obj/structure/disposalpipe/segment{
- dir = 9
- },
-/turf/open/floor/iron,
-/area/station/security/brig/entrance)
"nXC" = (
/obj/machinery/disposal/bin,
/obj/structure/disposalpipe/trunk,
@@ -41700,6 +41717,16 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/white,
/area/station/science/cytology)
+"nXX" = (
+/obj/machinery/door/airlock/public/glass{
+ name = "Public Shrine"
+ },
+/obj/effect/turf_decal/siding/wood/end{
+ dir = 4
+ },
+/obj/machinery/door/firedoor,
+/turf/open/floor/stone,
+/area/station/hallway/primary/port)
"nYg" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -41760,6 +41787,11 @@
/obj/machinery/light/small/directional/east,
/turf/open/floor/iron/smooth,
/area/station/maintenance/solars/port/aft)
+"nYN" = (
+/obj/machinery/camera/autoname/directional/east,
+/obj/effect/turf_decal/tile/neutral,
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/aft)
"nYP" = (
/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{
dir = 9
@@ -41790,6 +41822,13 @@
},
/turf/open/floor/iron/smooth,
/area/station/cargo/drone_bay)
+"nZo" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+ dir = 4
+ },
+/obj/structure/disposalpipe/segment,
+/turf/open/floor/iron/white,
+/area/station/medical/medbay/lobby)
"nZq" = (
/obj/structure/disposalpipe/segment,
/obj/effect/decal/cleanable/dirt,
@@ -41809,10 +41848,6 @@
/obj/structure/holosign/barrier/atmos/tram,
/turf/open/floor/tram,
/area/station/maintenance/department/medical/central)
-"nZG" = (
-/obj/machinery/vending/wardrobe/chef_wardrobe,
-/turf/open/floor/iron/kitchen/small,
-/area/station/service/kitchen)
"nZQ" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/stripes/white/line{
@@ -41903,15 +41938,6 @@
},
/turf/open/floor/iron/smooth,
/area/station/engineering/break_room)
-"obi" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/obj/structure/disposalpipe/junction/flip{
- dir = 4
- },
-/turf/open/floor/plating,
-/area/station/maintenance/central/greater)
"obq" = (
/obj/structure/cable,
/obj/structure/lattice/catwalk,
@@ -41948,18 +41974,17 @@
"ocb" = (
/turf/open/floor/iron/white/small,
/area/station/science/cubicle)
-"ocv" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
+"ocu" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/landmark/navigate_destination/library,
/obj/effect/turf_decal/tile/neutral{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/open/floor/iron,
-/area/station/hallway/primary/central/aft)
+/area/station/hallway/primary/port)
"ocx" = (
/obj/structure/sign/warning/vacuum/external,
/turf/closed/wall,
@@ -41981,16 +42006,6 @@
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
/turf/open/floor/iron/grimy,
/area/station/commons/vacant_room/office)
-"odD" = (
-/obj/effect/mapping_helpers/broken_floor,
-/obj/structure/table/wood,
-/obj/machinery/light/small/built/directional/north,
-/obj/item/stack/sheet/iron/ten,
-/obj/effect/turf_decal/siding/wideplating_new/terracotta{
- dir = 9
- },
-/turf/open/floor/wood/tile,
-/area/station/maintenance/central/lesser)
"odE" = (
/obj/effect/turf_decal/stripes/line{
dir = 6
@@ -42001,10 +42016,13 @@
/obj/effect/decal/cleanable/leaper_sludge,
/turf/open/floor/plating/rust,
/area/station/engineering/supermatter/room)
-"odH" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/stone,
-/area/station/service/chapel)
+"odK" = (
+/obj/effect/turf_decal/siding/wood/end{
+ dir = 8
+ },
+/obj/effect/landmark/navigate_destination/kitchen,
+/turf/open/floor/wood,
+/area/station/hallway/primary/central/aft)
"odP" = (
/obj/machinery/firealarm/directional/west,
/turf/open/floor/iron/dark/small,
@@ -42064,14 +42082,6 @@
/obj/effect/spawner/structure/window,
/turf/open/floor/plating,
/area/station/medical/storage)
-"oeZ" = (
-/obj/effect/turf_decal/siding/wood,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/chair/wood{
- dir = 8
- },
-/turf/open/floor/iron/grimy,
-/area/station/service/bar)
"off" = (
/obj/effect/turf_decal/siding/wood{
dir = 6
@@ -42079,18 +42089,25 @@
/obj/machinery/vending/coffee,
/turf/open/floor/iron/grimy,
/area/station/hallway/secondary/entry)
+"ofg" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/turf_decal/plaque{
+ icon_state = "L10";
+ pixel_y = -15
+ },
+/obj/effect/turf_decal/trimline/neutral/line,
+/obj/effect/turf_decal/trimline/neutral/line{
+ dir = 1
+ },
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/aft)
"ofu" = (
/obj/effect/turf_decal/stripes/white/end{
dir = 8
},
/turf/open/floor/iron/smooth_large,
/area/station/maintenance/department/medical/central)
-"ofU" = (
-/obj/structure/chair/wood{
- dir = 8
- },
-/turf/open/floor/iron/grimy,
-/area/station/service/bar)
"ofZ" = (
/turf/closed/mineral/random/stationside,
/area/station/maintenance/port/lesser)
@@ -42109,6 +42126,11 @@
},
/turf/open/floor/iron/white,
/area/station/medical/medbay/central)
+"ogs" = (
+/obj/effect/turf_decal/tile/neutral/opposingcorners,
+/obj/structure/chair/stool/bar/directional/north,
+/turf/open/floor/iron,
+/area/station/holodeck/rec_center)
"ogv" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -42226,17 +42248,6 @@
/obj/structure/flora/bush/flowers_yw/style_random,
/turf/open/floor/grass,
/area/station/medical/treatment_center)
-"ohy" = (
-/obj/effect/turf_decal/siding/white/corner{
- dir = 4
- },
-/obj/effect/mapping_helpers/airlock/access/all/service/kitchen,
-/obj/machinery/door/airlock{
- name = "Kitchen"
- },
-/obj/machinery/door/firedoor,
-/turf/open/floor/iron/kitchen/small,
-/area/station/service/kitchen)
"ohz" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/tile/yellow/opposingcorners,
@@ -42256,13 +42267,6 @@
},
/turf/open/floor/iron/dark,
/area/station/science/robotics/lab)
-"ohK" = (
-/obj/structure/chair/stool/directional/north,
-/obj/effect/turf_decal/siding/wood{
- dir = 4
- },
-/turf/open/floor/stone,
-/area/station/service/bar)
"ohM" = (
/obj/structure/chair{
dir = 8
@@ -42331,6 +42335,14 @@
/obj/machinery/light_switch/directional/south,
/turf/open/floor/plating,
/area/station/cargo/office)
+"oiN" = (
+/obj/machinery/camera/autoname/directional/north,
+/obj/machinery/firealarm/directional/north,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/aft)
"oiP" = (
/obj/effect/turf_decal/tile/yellow/half/contrasted{
dir = 1
@@ -42339,6 +42351,22 @@
/obj/machinery/camera/autoname/directional/north,
/turf/open/floor/iron/dark,
/area/station/medical/pharmacy)
+"oiQ" = (
+/obj/machinery/navbeacon{
+ codes_txt = "delivery;dir=8";
+ location = "QM #2"
+ },
+/obj/effect/turf_decal/delivery,
+/obj/machinery/camera/autoname/directional/south,
+/obj/machinery/light/small/directional/south,
+/obj/structure/disposalpipe/segment{
+ 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,
+/area/station/cargo/storage)
"oiT" = (
/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{
dir = 10
@@ -42370,13 +42398,6 @@
},
/turf/open/floor/wood,
/area/station/engineering/main)
-"ojA" = (
-/obj/structure/flora/bush/jungle/a/style_random,
-/obj/effect/turf_decal/weather/dirt{
- dir = 1
- },
-/turf/open/floor/grass,
-/area/station/service/chapel)
"ojD" = (
/obj/structure/cable,
/obj/machinery/light/floor,
@@ -42450,6 +42471,14 @@
/obj/effect/turf_decal/stripes/white/line,
/turf/open/floor/engine,
/area/station/science/xenobiology)
+"okV" = (
+/obj/machinery/door/window/right/directional/north{
+ name = "Library Desk Door";
+ req_access = list("library")
+ },
+/obj/machinery/firealarm/directional/east,
+/turf/open/floor/carpet,
+/area/station/service/library)
"okW" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -42490,6 +42519,12 @@
/obj/structure/alien/weeds,
/turf/open/misc/asteroid,
/area/station/maintenance/starboard/greater)
+"olt" = (
+/obj/machinery/light/small/directional/south,
+/obj/machinery/status_display/evac/directional/south,
+/obj/effect/turf_decal/siding/wood,
+/turf/open/floor/stone,
+/area/station/service/chapel)
"olI" = (
/obj/structure/table,
/obj/item/restraints/handcuffs{
@@ -42512,22 +42547,20 @@
/obj/machinery/light/small/dim/directional/west,
/turf/open/floor/iron,
/area/station/maintenance/port/aft)
-"omb" = (
-/obj/effect/turf_decal/siding/wood,
-/obj/structure/chair/wood{
- dir = 8
- },
-/turf/open/floor/iron/grimy,
-/area/station/service/bar)
-"omk" = (
-/obj/effect/turf_decal/siding/wood{
- dir = 1
- },
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+"oms" = (
+/obj/effect/landmark/event_spawn,
+/obj/machinery/computer/security/telescreen/test_chamber/directional/west,
+/turf/open/floor/iron/white/side{
dir = 4
},
-/turf/open/floor/stone,
-/area/station/service/bar)
+/area/station/science/xenobiology)
+"omy" = (
+/obj/effect/turf_decal/tile/neutral/opposingcorners,
+/obj/item/kirbyplants/random,
+/obj/machinery/airalarm/directional/east,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron,
+/area/station/holodeck/rec_center)
"omW" = (
/obj/structure/reagent_dispensers/watertank,
/turf/open/floor/iron/white/corner,
@@ -42542,20 +42575,6 @@
/obj/structure/lattice,
/turf/open/space/basic,
/area/space/nearstation)
-"onc" = (
-/obj/machinery/door/morgue{
- name = "Private Study";
- req_access = list("library")
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/plating,
-/area/station/maintenance/central/greater)
-"ong" = (
-/obj/item/radio/intercom/directional/south,
-/obj/effect/turf_decal/tile/neutral,
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/aft)
"onv" = (
/obj/effect/turf_decal/tile/brown/opposingcorners,
/obj/machinery/atmospherics/pipe/smart/simple/orange/hidden{
@@ -42625,6 +42644,22 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/iron/dark/small,
/area/station/security/brig)
+"ooa" = (
+/obj/effect/spawner/random/vending/snackvend,
+/obj/effect/turf_decal/tile/blue{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral/half/contrasted{
+ dir = 8
+ },
+/obj/machinery/airalarm/directional/east,
+/obj/structure/disposalpipe/segment{
+ dir = 9
+ },
+/turf/open/floor/iron/dark/side{
+ dir = 4
+ },
+/area/station/hallway/primary/central/fore)
"ooe" = (
/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{
dir = 4
@@ -42652,12 +42687,32 @@
/obj/machinery/airalarm/directional/south,
/turf/open/floor/iron/white,
/area/station/medical/medbay/central)
+"ooM" = (
+/obj/item/kirbyplants/random,
+/obj/machinery/camera/autoname/directional/west,
+/obj/structure/disposalpipe/segment{
+ dir = 5
+ },
+/turf/open/floor/iron/white,
+/area/station/hallway/primary/central/aft)
"ooO" = (
/obj/effect/turf_decal/trimline/blue/warning{
dir = 4
},
/turf/open/floor/iron/white,
/area/station/medical/treatment_center)
+"ooS" = (
+/obj/effect/turf_decal/tile/yellow{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/neutral/half/contrasted{
+ dir = 4
+ },
+/turf/open/floor/iron,
+/area/station/hallway/primary/fore)
"opc" = (
/obj/structure/railing{
dir = 1
@@ -42707,20 +42762,20 @@
},
/turf/open/space/basic,
/area/space/nearstation)
+"opM" = (
+/obj/effect/turf_decal/weather/dirt{
+ dir = 9
+ },
+/obj/structure/flora/bush/flowers_yw/style_3,
+/obj/machinery/firealarm/directional/west,
+/turf/open/floor/grass,
+/area/station/service/chapel)
"opN" = (
/obj/effect/turf_decal/tile/neutral,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron,
/area/station/commons/fitness/locker_room)
-"opV" = (
-/obj/effect/turf_decal/siding/wood,
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
- dir = 1
- },
-/obj/effect/landmark/start/bartender,
-/turf/open/floor/stone,
-/area/station/service/bar)
"opW" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -42753,14 +42808,6 @@
/obj/item/kirbyplants/random,
/turf/open/floor/iron,
/area/station/hallway/secondary/dock)
-"oqT" = (
-/obj/machinery/camera/autoname/directional/north,
-/obj/machinery/firealarm/directional/north,
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/aft)
"oqU" = (
/obj/effect/turf_decal/siding/wideplating/dark{
dir = 9
@@ -42809,17 +42856,17 @@
},
/turf/open/space/basic,
/area/space/nearstation)
-"ose" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/turf_decal/tile/neutral{
+"osd" = (
+/obj/machinery/power/apc/auto_name/directional/east,
+/obj/machinery/camera/autoname/directional/east,
+/obj/effect/spawner/random/entertainment/arcade{
dir = 8
},
-/obj/structure/cable,
-/obj/structure/disposalpipe/segment{
- dir = 9
+/obj/effect/turf_decal/siding/thinplating{
+ dir = 4
},
-/turf/open/floor/iron,
+/obj/structure/cable,
+/turf/open/floor/eighties/red,
/area/station/hallway/primary/central/fore)
"osj" = (
/obj/structure/cable,
@@ -42857,6 +42904,10 @@
/obj/structure/cable,
/turf/open/floor/iron/small,
/area/station/medical/morgue)
+"osG" = (
+/obj/structure/flora/bush/jungle/a/style_random,
+/turf/open/floor/grass,
+/area/station/service/chapel)
"osP" = (
/obj/structure/disposalpipe/segment,
/turf/open/floor/iron,
@@ -42876,6 +42927,41 @@
/obj/structure/broken_flooring/corner/directional/south,
/turf/open/floor/plating,
/area/station/maintenance/starboard/aft)
+"otl" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/machinery/door/firedoor,
+/obj/effect/turf_decal/stripes/red/line{
+ dir = 8
+ },
+/obj/effect/turf_decal/stripes/red/line{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/merge_conflict_marker{
+ name = "---Merge Conflict Marker---";
+
+ desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/machinery/door/firedoor,
+/obj/effect/turf_decal/stripes/red/line{
+ dir = 8
+ },
+/obj/effect/turf_decal/stripes/red/line{
+ dir = 4
+ },
+/turf/open/floor/iron/small,
+/area/station/hallway/primary/central/aft)
"otB" = (
/obj/structure/cable,
/obj/effect/turf_decal/tile/purple/opposingcorners,
@@ -42891,18 +42977,11 @@
},
/turf/open/floor/iron/dark,
/area/station/cargo/office)
-"otJ" = (
-/obj/structure/disposalpipe/segment,
-/obj/effect/turf_decal/trimline/neutral/line{
- dir = 4
- },
-/obj/effect/turf_decal/trimline/neutral/line{
- dir = 8
- },
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+"otV" = (
+/obj/effect/landmark/start/assistant,
+/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/iron,
-/area/station/hallway/primary/central/fore)
+/area/station/hallway/primary/central/aft)
"otX" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -42932,31 +43011,9 @@
"ouj" = (
/turf/closed/wall,
/area/station/engineering/engine_smes)
-"oul" = (
-/obj/effect/turf_decal/weather/dirt,
-/obj/structure/flora/bush/flowers_yw/style_2,
-/obj/structure/flora/tree/jungle/style_5,
-/turf/open/floor/grass,
-/area/station/service/chapel)
-"oun" = (
-/obj/effect/turf_decal/siding/thinplating_new/light{
- dir = 10
- },
-/turf/open/floor/iron/white/small,
-/area/station/service/hydroponics)
"ouz" = (
/turf/open/floor/iron/dark/small,
/area/station/command/heads_quarters/rd)
-"ouF" = (
-/obj/structure/table/reinforced,
-/obj/machinery/door/firedoor,
-/obj/machinery/door/window/right/directional/west,
-/obj/machinery/door/poddoor/shutters{
- name = "Kitchen Shutters";
- id = "kitchenshutters"
- },
-/turf/open/floor/iron,
-/area/station/service/kitchen)
"ouH" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
dir = 1
@@ -42996,11 +43053,6 @@
/obj/machinery/airalarm/directional/west,
/turf/open/floor/iron/smooth,
/area/station/cargo/warehouse)
-"ove" = (
-/obj/effect/spawner/structure/window,
-/obj/machinery/door/firedoor/border_only,
-/turf/open/floor/plating,
-/area/station/service/bar)
"ovf" = (
/obj/structure/lattice/catwalk,
/turf/open/space/basic,
@@ -43026,6 +43078,10 @@
},
/turf/open/floor/plating,
/area/station/maintenance/department/engine/atmos)
+"ovz" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/aft)
"ovB" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/alien/weeds,
@@ -43033,6 +43089,30 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/maintenance/starboard/greater)
+"ovC" = (
+/obj/structure/table/wood,
+/obj/item/reagent_containers/cup/rag{
+ pixel_x = -6;
+ pixel_y = 6
+ },
+/obj/item/reagent_containers/cup/glass/drinkingglass{
+ pixel_x = 10;
+ pixel_y = 8
+ },
+/obj/item/reagent_containers/cup/glass/drinkingglass{
+ pixel_x = 5;
+ pixel_y = 16
+ },
+/obj/item/reagent_containers/cup/glass/drinkingglass{
+ pixel_x = 5;
+ pixel_y = 5
+ },
+/obj/item/reagent_containers/cup/glass/shaker{
+ pixel_x = -7;
+ pixel_y = 15
+ },
+/turf/open/floor/iron/dark/textured,
+/area/station/service/bar)
"ovQ" = (
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/iron,
@@ -43150,18 +43230,6 @@
},
/turf/open/floor/wood/tile,
/area/station/command/corporate_showroom)
-"oxn" = (
-/obj/effect/turf_decal/siding/wood{
- dir = 1
- },
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
- dir = 8
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/wood/parquet,
-/area/station/service/library)
"oxw" = (
/obj/structure/disposalpipe/segment,
/obj/effect/turf_decal/stripes/white/line{
@@ -43169,20 +43237,21 @@
},
/turf/open/floor/iron/dark,
/area/station/cargo/storage)
-"oxy" = (
-/obj/effect/spawner/random/entertainment/arcade{
- dir = 1
- },
-/obj/effect/turf_decal/siding/thinplating,
-/obj/structure/sign/poster/official/random/directional/south,
-/turf/open/floor/eighties/red,
-/area/station/hallway/primary/central/fore)
"oxK" = (
/obj/effect/turf_decal/stripes/white/line{
dir = 8
},
/turf/open/floor/engine,
/area/station/science/cytology)
+"oym" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/aft)
"oyn" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/door/airlock/public/glass{
@@ -43190,26 +43259,10 @@
},
/turf/open/floor/iron/textured_half,
/area/station/maintenance/hallway/abandoned_command)
-"oyp" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/obj/machinery/firealarm/directional/west,
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/fore)
"oyq" = (
/obj/machinery/light/warm/directional/south,
/turf/open/floor/iron,
/area/station/commons/fitness/locker_room)
-"oyz" = (
-/obj/structure/flora/grass/jungle/b/style_3,
-/obj/effect/turf_decal/weather/dirt{
- dir = 1
- },
-/obj/structure/cable,
-/turf/open/floor/grass,
-/area/station/service/chapel)
"oyQ" = (
/turf/closed/wall,
/area/station/science/auxlab/firing_range)
@@ -43310,6 +43363,34 @@
/obj/effect/mapping_helpers/airlock/access/all/security/entrance,
/turf/open/floor/iron/textured_half,
/area/station/security/brig)
+"oBc" = (
+/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible,
+/obj/structure/table,
+/obj/effect/turf_decal/siding/thinplating_new/dark{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/thinplating_new/dark,
+/obj/item/radio/intercom/directional/south,
+/obj/item/c_tube{
+ pixel_x = 20
+ },
+/obj/item/clothing/head/cone{
+ pixel_y = 5;
+ pixel_x = -6
+ },
+/obj/item/clothing/head/cone{
+ pixel_y = 7;
+ pixel_x = -6
+ },
+/obj/item/pipe_dispenser{
+ pixel_y = 9;
+ pixel_x = 14
+ },
+/obj/item/cigarette{
+ pixel_y = 2
+ },
+/turf/open/floor/iron/small,
+/area/station/engineering/atmos/pumproom)
"oBh" = (
/obj/structure/alien/weeds/node,
/turf/open/misc/asteroid,
@@ -43345,21 +43426,12 @@
/turf/open/floor/iron,
/area/station/hallway/primary/central/fore)
"oBT" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/door/firedoor,
-/obj/effect/mapping_helpers/airlock/access/all/security/armory,
-/obj/machinery/door/airlock/security{
- name = "Warden's Office"
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/iron/textured_half{
- dir = 8
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+ dir = 1
},
-/area/station/security/warden)
+/obj/effect/landmark/event_spawn,
+/turf/open/floor/iron/smooth,
+/area/station/cargo/drone_bay)
"oBX" = (
/obj/structure/cable,
/obj/effect/turf_decal/tile/neutral/fourcorners,
@@ -43379,12 +43451,6 @@
/obj/effect/spawner/random/techstorage/medical_all,
/turf/open/floor/iron,
/area/station/engineering/storage/tech)
-"oCi" = (
-/obj/effect/turf_decal/siding/wood,
-/obj/machinery/light/small/directional/east,
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/wood/parquet,
-/area/station/service/library)
"oCq" = (
/obj/structure/cable,
/obj/effect/spawner/structure/window/reinforced,
@@ -43418,17 +43484,6 @@
/obj/structure/broken_flooring/pile/directional/east,
/turf/open/floor/iron,
/area/station/maintenance/starboard/aft)
-"oCV" = (
-/obj/effect/turf_decal/trimline/neutral/line,
-/obj/effect/turf_decal/trimline/neutral/line{
- dir = 1
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/aft)
"oDa" = (
/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible{
dir = 1
@@ -43448,17 +43503,17 @@
},
/turf/open/space/basic,
/area/space/nearstation)
-"oDX" = (
-/obj/effect/turf_decal/siding/wood{
+"oDV" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/status_display/evac/directional/north,
+/obj/effect/turf_decal/tile/neutral{
dir = 1
},
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/chair/wood{
+/obj/structure/disposalpipe/junction{
dir = 4
},
-/obj/effect/landmark/start/assistant,
-/turf/open/floor/iron/grimy,
-/area/station/service/bar)
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/fore)
"oDY" = (
/obj/effect/turf_decal/stripes/corner,
/obj/effect/turf_decal/stripes/corner{
@@ -43473,6 +43528,19 @@
/obj/structure/holosign/barrier/atmos/tram,
/turf/open/floor/tram,
/area/station/security/tram)
+"oEa" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/turf_decal/plaque{
+ icon_state = "L6";
+ pixel_y = -15
+ },
+/obj/effect/turf_decal/trimline/neutral/line,
+/obj/effect/turf_decal/trimline/neutral/line{
+ dir = 1
+ },
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/aft)
"oEb" = (
/obj/structure/table/reinforced/titaniumglass,
/obj/item/reagent_containers/cup/beaker/oldstation{
@@ -43491,25 +43559,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron,
/area/station/hallway/secondary/recreation)
-"oEn" = (
-/obj/structure/cable,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/plating,
-/area/station/maintenance/port/greater)
-"oEz" = (
-/obj/machinery/camera/autoname/directional/north,
-/obj/effect/turf_decal/siding/thinplating_new/light{
- dir = 1
- },
-/obj/machinery/firealarm/directional/north,
-/obj/machinery/disposal/bin,
-/obj/structure/disposalpipe/trunk,
-/turf/open/floor/iron/white/small,
-/area/station/service/hydroponics)
"oEB" = (
/obj/structure/window/reinforced/spawner/directional/east,
/obj/effect/turf_decal/box/red/corners{
@@ -43520,6 +43569,16 @@
},
/turf/open/floor/engine,
/area/station/science/xenobiology)
+"oEC" = (
+/obj/structure/cable,
+/obj/effect/mapping_helpers/broken_floor,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/open/floor/plating,
+/area/station/maintenance/port/greater)
"oED" = (
/obj/effect/turf_decal/tile/blue{
dir = 1
@@ -43561,34 +43620,11 @@
"oFu" = (
/turf/closed/wall,
/area/station/security/office)
-"oFy" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/door/airlock/public/glass{
- name = "Cargo Botique"
- },
-/obj/machinery/door/firedoor,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/iron/textured_half{
- dir = 1
- },
-/area/station/hallway/primary/central/fore)
"oFI" = (
/obj/machinery/airalarm/directional/north,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
/turf/open/floor/iron,
/area/station/engineering/storage/tech)
-"oFM" = (
-/obj/structure/disposalpipe/segment{
- dir = 9
- },
-/obj/effect/decal/cleanable/dirt,
-/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/central/greater)
"oGk" = (
/turf/open/floor/circuit,
/area/station/tcommsat/server)
@@ -43620,13 +43656,13 @@
},
/turf/open/floor/carpet/executive,
/area/station/command/meeting_room)
-"oGJ" = (
-/obj/effect/turf_decal/trimline/neutral/line{
+"oGA" = (
+/obj/effect/turf_decal/siding/wood{
dir = 1
},
-/obj/effect/turf_decal/trimline/neutral/line,
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/fore)
+/obj/structure/table/wood,
+/turf/open/floor/iron/grimy,
+/area/station/service/bar)
"oGL" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -43654,13 +43690,17 @@
/obj/structure/flora/rock/pile/style_2,
/turf/open/misc/sandy_dirt,
/area/station/science/research)
-"oHk" = (
-/obj/structure/cable,
-/obj/structure/disposalpipe/segment,
+"oHn" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/iron/stairs,
-/area/station/maintenance/port/greater)
+/obj/effect/turf_decal/trimline/neutral/line,
+/obj/effect/turf_decal/trimline/neutral/line{
+ dir = 1
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/open/floor/iron,
+/area/station/hallway/primary/port)
"oHw" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -43748,12 +43788,6 @@
/obj/structure/frame/machine,
/turf/open/floor/tram,
/area/station/maintenance/department/medical/central)
-"oIL" = (
-/obj/effect/turf_decal/siding/wood/corner{
- dir = 8
- },
-/turf/open/floor/stone,
-/area/station/service/chapel)
"oIP" = (
/obj/effect/turf_decal/siding/wood{
dir = 8
@@ -43769,24 +43803,11 @@
/obj/effect/spawner/structure/window,
/turf/open/floor/plating,
/area/station/commons/fitness/recreation)
-"oIS" = (
-/obj/machinery/light/small/directional/south,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/status_display/evac/directional/south,
-/obj/effect/turf_decal/tile/neutral,
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/aft)
"oIT" = (
/obj/structure/frame/machine,
/obj/item/circuitboard/machine/biogenerator,
/turf/open/floor/iron,
/area/station/maintenance/starboard/aft)
-"oIY" = (
-/obj/effect/turf_decal/delivery,
-/obj/machinery/door/firedoor,
-/obj/machinery/smartfridge,
-/turf/open/floor/plating,
-/area/station/service/hydroponics)
"oJn" = (
/obj/structure/cable,
/obj/structure/disposalpipe/sorting/mail{
@@ -43807,21 +43828,6 @@
/obj/machinery/firealarm/directional/east,
/turf/open/floor/circuit,
/area/station/tcommsat/server)
-"oJx" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/obj/structure/rack,
-/obj/machinery/door/poddoor/shutters{
- dir = 4;
- id = "vaco";
- name = "Comissary Shutters"
- },
-/turf/open/floor/plating,
-/area/station/maintenance/central/lesser)
"oJz" = (
/obj/structure/bodycontainer/morgue{
dir = 2
@@ -43911,20 +43917,19 @@
},
/turf/open/floor/iron/dark,
/area/station/security/prison/safe)
-"oLg" = (
-/obj/effect/spawner/random/engineering/atmospherics_portable,
-/turf/open/floor/plating,
-/area/station/maintenance/aft)
-"oLo" = (
+"oLb" = (
+/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/wideplating/dark{
- dir = 1
- },
-/obj/effect/turf_decal/tile/dark_red/half/contrasted,
-/obj/structure/disposalpipe/segment,
+/obj/effect/turf_decal/tile/dark_red/fourcorners,
+/obj/machinery/holopad,
+/obj/effect/landmark/event_spawn,
/turf/open/floor/iron,
/area/station/security/brig/entrance)
+"oLg" = (
+/obj/effect/spawner/random/engineering/atmospherics_portable,
+/turf/open/floor/plating,
+/area/station/maintenance/aft)
"oLr" = (
/obj/effect/turf_decal/siding/wood{
dir = 9
@@ -43933,18 +43938,101 @@
/obj/machinery/light/small/directional/north,
/turf/open/floor/wood,
/area/station/service/abandoned_gambling_den)
+"oLA" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/structure/disposalpipe/segment,
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/fore)
"oLD" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
dir = 1
},
/turf/open/floor/iron/white/small,
/area/station/commons/toilet/restrooms)
+"oLJ" = (
+/obj/effect/landmark/start/hangover,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/aft)
"oLN" = (
/obj/effect/turf_decal/stripes/line,
/obj/structure/tank_dispenser,
/obj/machinery/airalarm/directional/north,
/turf/open/floor/plating,
/area/station/engineering/atmos/office)
+"oLY" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/fore)
+"oLZ" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/holopad,
+/obj/effect/landmark/event_spawn,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/open/floor/wood,
+/area/station/cargo/boutique)
+"oMh" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/door/firedoor,
+/obj/effect/turf_decal/stripes/red/line{
+ dir = 8
+ },
+/obj/effect/turf_decal/stripes/red/line{
+ dir = 4
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/open/floor/iron/small,
+/area/station/hallway/primary/central/fore)
+"oMk" = (
+/obj/effect/turf_decal/siding/wood/corner{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/wood/corner{
+ dir = 4
+ },
+/turf/open/floor/stone,
+/area/station/service/chapel)
+"oMo" = (
+/obj/structure/window/spawner/directional/west,
+/obj/structure/flora/bush/jungle/a/style_random,
+/obj/structure/flora/bush/flowers_pp/style_random,
+/obj/structure/window/spawner/directional/east,
+/obj/machinery/light/floor,
+/obj/merge_conflict_marker{
+ name = "---Merge Conflict Marker---";
+
+ desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
+ },
+/obj/structure/window/spawner/directional/west,
+/obj/structure/flora/bush/jungle/a/style_random,
+/obj/structure/flora/bush/flowers_pp/style_random,
+/obj/structure/window/spawner/directional/east,
+/obj/machinery/light/floor,
+/obj/structure/window/spawner/directional/north,
+/turf/open/floor/grass,
+/area/station/service/hydroponics)
"oMy" = (
/obj/structure/lattice/catwalk,
/turf/open/space/basic,
@@ -43991,27 +44079,32 @@
/turf/open/floor/plating,
/area/station/construction/mining/aux_base)
"oNF" = (
-/obj/structure/disposalpipe/segment{
- dir = 9
- },
-/obj/machinery/firealarm/directional/east,
-/obj/effect/turf_decal/tile/neutral/opposingcorners{
- dir = 1
- },
-/obj/effect/turf_decal/siding/thinplating_new{
- dir = 4
- },
-/obj/effect/turf_decal/siding/thinplating_new{
- dir = 4
+/obj/machinery/door/airlock/public/glass{
+ name = "Public Shrine"
},
-/turf/open/floor/iron/small,
-/area/station/hallway/secondary/service)
+/obj/effect/turf_decal/siding/wood/end,
+/obj/machinery/door/firedoor,
+/turf/open/floor/stone,
+/area/station/hallway/primary/port)
"oNH" = (
/obj/structure/cable,
/obj/effect/decal/cleanable/dirt,
/obj/structure/alien/weeds,
/turf/open/floor/iron,
/area/station/maintenance/starboard/greater)
+"oNI" = (
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/security/glass{
+ id_tag = "outerbrig";
+ name = "Brig"
+ },
+/obj/effect/mapping_helpers/airlock/access/all/security/entrance,
+/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{
+ cycle_id = "sci-entrance"
+ },
+/obj/structure/disposalpipe/segment,
+/turf/open/floor/iron/textured_half,
+/area/station/security/brig/entrance)
"oNN" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -44022,6 +44115,11 @@
dir = 8
},
/area/station/science/research)
+"oNP" = (
+/obj/effect/turf_decal/siding/wood,
+/obj/structure/table/wood,
+/turf/open/floor/iron/grimy,
+/area/station/service/bar)
"oNX" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -44059,6 +44157,16 @@
},
/turf/open/floor/plating,
/area/station/construction/mining/aux_base)
+"oOn" = (
+/obj/structure/disposalpipe/segment,
+/obj/effect/turf_decal/tile/neutral/opposingcorners{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/thinplating_new{
+ dir = 8
+ },
+/turf/open/floor/iron/small,
+/area/station/hallway/secondary/service)
"oOp" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/light/cold/directional/east,
@@ -44085,13 +44193,6 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/port)
-"oOC" = (
-/obj/effect/turf_decal/weather/dirt{
- dir = 1
- },
-/obj/structure/flora/bush/flowers_br/style_random,
-/turf/open/floor/grass,
-/area/station/service/chapel)
"oOK" = (
/obj/machinery/atmospherics/components/unary/portables_connector/visible{
dir = 1
@@ -44134,12 +44235,6 @@
/obj/machinery/air_sensor/mix_tank,
/turf/open/floor/engine/airless,
/area/station/engineering/atmos)
-"oPh" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/light/floor,
-/turf/open/floor/iron/kitchen/small,
-/area/station/service/kitchen)
"oPi" = (
/obj/structure/cable,
/obj/structure/disposalpipe/segment{
@@ -44165,13 +44260,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
/area/station/maintenance/port/fore)
-"oPy" = (
-/obj/structure/bookcase/random,
-/obj/structure/sign/painting/library{
- pixel_x = -30
- },
-/turf/open/floor/wood/parquet,
-/area/station/service/library)
"oPG" = (
/obj/machinery/door/airlock/research{
name = "Research Director's Bedroom"
@@ -44206,6 +44294,21 @@
/obj/effect/spawner/structure/window,
/turf/open/floor/plating,
/area/station/security/prison/workout)
+"oQa" = (
+/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{
+ dir = 4
+ },
+/turf/open/floor/plating,
+/area/station/maintenance/central/greater)
+"oQh" = (
+/obj/effect/turf_decal/siding/wideplating_new/terracotta{
+ dir = 5
+ },
+/turf/open/floor/wood/tile,
+/area/station/maintenance/central/lesser)
"oQj" = (
/obj/structure/window/spawner/directional/west,
/obj/structure/window/spawner/directional/east,
@@ -44279,41 +44382,6 @@
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/iron,
/area/station/cargo/storage)
-"oRv" = (
-/obj/effect/turf_decal/tile/red/opposingcorners,
-/obj/effect/turf_decal/tile/blue/opposingcorners{
- dir = 8
- },
-/obj/effect/turf_decal/siding/wood{
- dir = 8
- },
-/obj/item/kirbyplants/random,
-/obj/machinery/light/small/directional/west,
-/obj/item/radio/intercom/directional/south,
-/turf/open/floor/iron/smooth,
-/area/station/service/greenroom)
-"oRw" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/airalarm/directional/south,
-/obj/effect/turf_decal/tile/neutral,
-/turf/open/floor/iron,
-/area/station/hallway/primary/port)
-"oRy" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/turf_decal/siding/wood{
- dir = 8
- },
-/obj/effect/turf_decal/siding/wood{
- dir = 4
- },
-/obj/machinery/door/airlock/maintenance{
- name = "Crematorium"
- },
-/obj/effect/mapping_helpers/airlock/access/all/service/chapel_office,
-/turf/open/floor/iron/textured_half{
- dir = 8
- },
-/area/station/service/chapel/storage)
"oRB" = (
/obj/structure/cable,
/obj/machinery/power/apc/auto_name/directional/east,
@@ -44331,6 +44399,14 @@
},
/turf/open/floor/plating,
/area/station/maintenance/port/aft)
+"oRR" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/structure/disposalpipe/segment,
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/fore)
"oRV" = (
/obj/effect/mapping_helpers/airlock/access/any/service/maintenance,
/obj/machinery/door/airlock/grunge{
@@ -44339,6 +44415,13 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/dark,
/area/station/maintenance/starboard/greater)
+"oRX" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 4
+ },
+/obj/structure/table/wood,
+/turf/open/floor/iron/grimy,
+/area/station/service/bar)
"oRZ" = (
/obj/effect/turf_decal/stripes/line{
dir = 10
@@ -44365,6 +44448,36 @@
},
/turf/open/floor/iron,
/area/station/cargo/storage)
+"oSm" = (
+/obj/structure/flora/rock/pile/jungle/style_4,
+/obj/effect/turf_decal/weather/dirt{
+ dir = 1
+ },
+/turf/open/floor/grass,
+/area/station/service/chapel)
+"oSr" = (
+/obj/structure/disposalpipe/segment,
+/obj/machinery/door/airlock{
+ name = "Maintenance"
+ },
+/obj/effect/mapping_helpers/airlock/access/any/service/maintenance,
+/obj/effect/mapping_helpers/airlock/unres,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/merge_conflict_marker{
+ name = "---Merge Conflict Marker---";
+
+ desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
+ },
+/obj/structure/disposalpipe/segment,
+/obj/machinery/door/airlock{
+ name = "Maintenance"
+ },
+/obj/effect/mapping_helpers/airlock/access/any/service/maintenance,
+/obj/effect/mapping_helpers/airlock/unres,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/cable,
+/turf/open/floor/plating,
+/area/station/maintenance/central/greater)
"oSv" = (
/obj/effect/turf_decal/tile/neutral/fourcorners,
/obj/machinery/computer/rdconsole{
@@ -44391,21 +44504,26 @@
/obj/structure/reagent_dispensers/watertank/high,
/turf/open/floor/plating,
/area/station/engineering/supermatter/room)
-"oTg" = (
-/obj/effect/turf_decal/tile/brown/opposingcorners{
- dir = 1
- },
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
- dir = 1
- },
-/obj/structure/cable,
-/turf/open/floor/iron,
-/area/station/commons/vacant_room/commissary)
"oTj" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/spawner/random/trash,
/turf/open/floor/plating,
/area/station/maintenance/starboard/aft)
+"oTw" = (
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/merge_conflict_marker{
+ name = "---Merge Conflict Marker---";
+
+ desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/aft)
"oTH" = (
/obj/effect/spawner/random/structure/closet_maintenance,
/obj/effect/decal/cleanable/dirt,
@@ -44449,18 +44567,19 @@
},
/turf/open/space/basic,
/area/space/nearstation)
-"oUd" = (
-/turf/open/floor/iron/smooth,
-/area/station/hallway/secondary/command)
-"oUi" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
+"oUa" = (
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/landmark/start/hangover,
+/obj/structure/disposalpipe/segment{
+ dir = 5
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/disposalpipe/segment,
+/obj/structure/cable,
/turf/open/floor/iron,
/area/station/hallway/primary/central/fore)
+"oUd" = (
+/turf/open/floor/iron/smooth,
+/area/station/hallway/secondary/command)
"oUq" = (
/obj/machinery/meter,
/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible,
@@ -44472,6 +44591,12 @@
},
/turf/open/floor/iron,
/area/station/engineering/atmos/pumproom)
+"oUr" = (
+/obj/structure/sign/painting/library{
+ pixel_y = 32
+ },
+/turf/open/floor/iron/smooth,
+/area/station/service/library)
"oUz" = (
/obj/machinery/power/smes/engineering,
/obj/structure/cable,
@@ -44510,23 +44635,6 @@
/obj/structure/cable,
/turf/open/floor/catwalk_floor/iron_smooth,
/area/station/security/evidence)
-"oUV" = (
-/obj/structure/table/reinforced,
-/obj/machinery/door/firedoor,
-/obj/machinery/door/window/right/directional/east,
-/turf/open/floor/iron/textured_half{
- dir = 8
- },
-/area/station/service/hydroponics)
-"oVl" = (
-/obj/machinery/vending/wardrobe/bar_wardrobe,
-/obj/machinery/power/apc/auto_name/directional/north,
-/obj/structure/cable,
-/obj/effect/turf_decal/siding/wood{
- dir = 9
- },
-/turf/open/floor/stone,
-/area/station/service/bar/backroom)
"oVt" = (
/obj/machinery/atmospherics/pipe/smart/simple/orange/hidden,
/obj/effect/turf_decal/tile/yellow,
@@ -44548,13 +44656,18 @@
/obj/machinery/light/cold/directional/north,
/turf/open/floor/iron,
/area/station/security/execution/transfer)
-"oVW" = (
-/obj/effect/turf_decal/weather/dirt{
- dir = 5
+"oVX" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/door/airlock/vault{
+ name = "Vault"
},
-/obj/structure/flora/bush/large/style_3,
-/turf/open/floor/grass,
-/area/station/service/chapel)
+/obj/effect/mapping_helpers/airlock/locked,
+/obj/effect/mapping_helpers/airlock/access/all/supply/vault,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/door/firedoor,
+/turf/open/floor/iron/dark/herringbone,
+/area/station/ai_monitored/command/nuke_storage)
"oVY" = (
/obj/effect/turf_decal/siding/wood{
dir = 10
@@ -44608,6 +44721,13 @@
/obj/structure/cable,
/turf/open/floor/plating,
/area/station/engineering/supermatter/room)
+"oWR" = (
+/obj/structure/closet/secure_closet/hydroponics,
+/obj/effect/turf_decal/siding/thinplating_new/light{
+ dir = 1
+ },
+/turf/open/floor/iron/white/small,
+/area/station/service/hydroponics)
"oXa" = (
/obj/structure/cable,
/obj/structure/disposalpipe/segment{
@@ -44634,32 +44754,13 @@
},
/turf/open/floor/iron,
/area/station/hallway/secondary/entry)
-"oXV" = (
-/obj/structure/disposalpipe/segment{
- dir = 10
- },
-/obj/effect/turf_decal/trimline/neutral/line{
- dir = 5
- },
-/obj/effect/turf_decal/trimline/neutral/corner{
- dir = 8
- },
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/fore)
-"oYi" = (
-/obj/effect/turf_decal/trimline/neutral/line,
-/obj/effect/turf_decal/trimline/neutral/line{
+"oYd" = (
+/obj/effect/landmark/start/assistant,
+/obj/effect/turf_decal/tile/neutral{
dir = 1
},
-/obj/machinery/navbeacon{
- codes_txt = "patrol;next_patrol=23.1-Evac";
- location = "22.0-Porthall-Evac"
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/turf/open/floor/iron,
-/area/station/hallway/primary/port)
+/area/station/hallway/primary/central/aft)
"oYj" = (
/obj/machinery/light_switch/directional/north,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
@@ -44714,16 +44815,6 @@
/obj/effect/mapping_helpers/airlock/access/any/medical/maintenance,
/turf/open/floor/plating,
/area/station/maintenance/department/medical/central)
-"oZy" = (
-/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{
- dir = 6
- },
-/obj/effect/spawner/random/structure/steam_vent,
-/turf/open/floor/plating,
-/area/station/maintenance/central/greater)
"oZz" = (
/obj/machinery/door/airlock/research/glass/incinerator/ordmix_exterior{
name = "Burn Chamber Exterior Airlock"
@@ -44761,6 +44852,9 @@
/obj/machinery/airalarm/directional/north,
/turf/open/floor/iron,
/area/station/maintenance/department/medical/central)
+"pak" = (
+/turf/open/floor/glass,
+/area/station/hallway/primary/central/aft)
"pan" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
@@ -44781,13 +44875,6 @@
/obj/structure/tram,
/turf/open/floor/tram,
/area/station/security/tram)
-"paJ" = (
-/obj/machinery/disposal/bin,
-/obj/structure/disposalpipe/trunk{
- dir = 8
- },
-/turf/open/floor/wood/parquet,
-/area/station/service/library)
"paW" = (
/obj/machinery/atmospherics/pipe/smart/manifold/yellow/visible{
dir = 8
@@ -44814,6 +44901,22 @@
},
/turf/open/floor/iron/smooth,
/area/station/service/greenroom)
+"pbg" = (
+/obj/machinery/door/airlock{
+ name = "Kitchen"
+ },
+/obj/effect/mapping_helpers/airlock/access/any/service/hydroponics,
+/obj/merge_conflict_marker{
+ name = "---Merge Conflict Marker---";
+
+ desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
+ },
+/obj/machinery/door/airlock{
+ name = "Hydroponics Maintenance"
+ },
+/obj/effect/mapping_helpers/airlock/access/any/service/hydroponics,
+/turf/open/floor/plating,
+/area/station/maintenance/central/greater)
"pbj" = (
/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{
dir = 4
@@ -44849,26 +44952,6 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/fore)
-"pbw" = (
-/obj/effect/turf_decal/weather/dirt{
- dir = 9
- },
-/obj/structure/flora/bush/flowers_pp/style_random,
-/turf/open/floor/grass,
-/area/station/service/chapel)
-"pbD" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/effect/turf_decal/plaque{
- icon_state = "L12";
- pixel_y = -15
- },
-/obj/effect/turf_decal/trimline/neutral/line,
-/obj/effect/turf_decal/trimline/neutral/line{
- dir = 1
- },
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/aft)
"pbE" = (
/obj/machinery/firealarm/directional/west,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
@@ -44887,16 +44970,6 @@
/obj/machinery/light/small/directional/east,
/turf/open/floor/iron/smooth,
/area/station/service/greenroom)
-"pbK" = (
-/obj/effect/turf_decal/weather/dirt{
- dir = 1
- },
-/obj/structure/flora/bush/flowers_br/style_random,
-/obj/structure/flora/bush/jungle/b/style_2,
-/obj/machinery/light/small/directional/north,
-/obj/item/radio/intercom/directional/north,
-/turf/open/floor/grass,
-/area/station/service/chapel)
"pbT" = (
/obj/effect/turf_decal/stripes/corner{
dir = 4
@@ -44905,16 +44978,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/engineering/atmospherics_engine)
-"pca" = (
-/obj/machinery/door/firedoor,
-/obj/effect/turf_decal/stripes/red/line{
- dir = 1
- },
-/obj/effect/turf_decal/stripes/red/line,
-/obj/structure/cable,
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/iron/small,
-/area/station/hallway/primary/central/fore)
"pcb" = (
/obj/effect/turf_decal/tile/dark_red{
dir = 4
@@ -45064,11 +45127,6 @@
},
/turf/open/space/basic,
/area/space/nearstation)
-"peU" = (
-/obj/effect/turf_decal/weather/dirt,
-/obj/structure/flora/rock/pile/jungle/style_2,
-/turf/open/floor/grass,
-/area/station/service/chapel)
"peW" = (
/obj/effect/turf_decal/siding/dark{
dir = 5
@@ -45199,11 +45257,6 @@
dir = 8
},
/area/station/commons/fitness/locker_room)
-"pgm" = (
-/obj/machinery/computer/security/telescreen/prison/directional/north,
-/obj/machinery/computer/records/security,
-/turf/open/floor/wood,
-/area/station/security/detectives_office)
"pgq" = (
/obj/structure/chair/stool/directional/north,
/obj/effect/turf_decal/siding/wood{
@@ -45230,6 +45283,12 @@
/obj/item/kirbyplants/fern,
/turf/open/floor/iron/white,
/area/station/science/cytology)
+"pgR" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/light/floor,
+/turf/open/floor/iron/kitchen/small,
+/area/station/service/kitchen)
"pgU" = (
/obj/structure/steam_vent,
/obj/effect/decal/cleanable/dirt/dust,
@@ -45263,6 +45322,37 @@
/obj/machinery/duct,
/turf/open/floor/iron/white/small,
/area/station/medical/storage)
+"phu" = (
+/obj/machinery/door/airlock/wood{
+ name = "Bar Backroom"
+ },
+/obj/effect/mapping_helpers/airlock/access/all/service/bar,
+/obj/structure/disposalpipe/segment,
+/obj/effect/turf_decal/siding/wood{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/wood{
+ dir = 4
+ },
+/obj/merge_conflict_marker{
+ name = "---Merge Conflict Marker---";
+
+ desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
+ },
+/obj/machinery/door/airlock/wood{
+ name = "Bar Backroom"
+ },
+/obj/effect/mapping_helpers/airlock/access/all/service/bar,
+/obj/structure/disposalpipe/segment,
+/obj/effect/turf_decal/siding/wood{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/wood{
+ dir = 4
+ },
+/obj/machinery/door/firedoor,
+/turf/open/floor/stone,
+/area/station/service/bar)
"phC" = (
/obj/machinery/light/cold/dim/directional/west,
/obj/structure/disposalpipe/segment,
@@ -45282,12 +45372,6 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/fore)
-"phG" = (
-/obj/structure/chair/wood{
- dir = 4
- },
-/turf/open/floor/iron/grimy,
-/area/station/service/bar)
"phY" = (
/obj/structure/railing{
dir = 1
@@ -45353,6 +45437,16 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/fore)
+"piQ" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/neutral/line,
+/obj/effect/turf_decal/trimline/neutral/line{
+ dir = 1
+ },
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/aft)
"pjb" = (
/obj/structure/broken_flooring/singular/directional/south,
/turf/open/floor/iron,
@@ -45386,6 +45480,14 @@
/obj/structure/steam_vent,
/turf/open/floor/plating,
/area/station/maintenance/port/lesser)
+"pjx" = (
+/obj/structure/table/wood,
+/obj/item/storage/fancy/cigarettes/cigars/cohiba{
+ pixel_x = 2;
+ pixel_y = 10
+ },
+/turf/open/floor/wood/large,
+/area/station/service/bar)
"pjA" = (
/obj/structure/cable,
/obj/structure/disposalpipe/segment,
@@ -45450,6 +45552,12 @@
},
/turf/open/floor/iron/dark,
/area/station/medical/chemistry)
+"pkv" = (
+/obj/effect/turf_decal/tile/yellow/anticorner/contrasted,
+/obj/machinery/chem_dispenser,
+/obj/machinery/light/small/directional/south,
+/turf/open/floor/iron/dark,
+/area/station/medical/pharmacy)
"pkB" = (
/obj/item/kirbyplants/random,
/obj/item/weldingtool,
@@ -45477,15 +45585,6 @@
/obj/item/book/manual/wiki/security_space_law,
/turf/open/floor/wood/tile,
/area/station/service/lawoffice)
-"pkU" = (
-/obj/effect/mapping_helpers/airlock/access/any/service/general,
-/obj/structure/disposalpipe/segment,
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass{
- name = "Service Hallway"
- },
-/turf/open/floor/iron/textured_half,
-/area/station/hallway/secondary/service)
"plf" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -45522,6 +45621,23 @@
},
/turf/open/floor/wood/tile,
/area/station/service/lawoffice)
+"plQ" = (
+/obj/effect/mapping_helpers/broken_floor,
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/rack,
+/obj/effect/spawner/random/maintenance,
+/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/central/greater)
+"pmd" = (
+/obj/structure/table,
+/obj/item/circuitboard/machine/coffeemaker/impressa,
+/obj/item/coffee_cartridge/decaf{
+ pixel_y = 9
+ },
+/turf/open/floor/iron/dark/small,
+/area/station/maintenance/central/lesser)
"pmg" = (
/obj/structure/table/reinforced/titaniumglass,
/obj/effect/turf_decal/bot,
@@ -45590,25 +45706,6 @@
/obj/machinery/firealarm/directional/south,
/turf/open/floor/plating,
/area/station/maintenance/starboard/greater)
-"pnF" = (
-/obj/effect/turf_decal/tile/green/opposingcorners,
-/obj/effect/turf_decal/tile/blue/opposingcorners{
- dir = 8
- },
-/obj/machinery/hydroponics/constructable,
-/obj/machinery/airalarm/directional/west,
-/obj/machinery/light/small/directional/west,
-/turf/open/floor/iron,
-/area/station/service/hydroponics)
-"pnK" = (
-/obj/effect/turf_decal/siding/wood,
-/obj/effect/turf_decal/weather/dirt{
- dir = 10
- },
-/obj/structure/flora/bush/flowers_yw/style_3,
-/obj/structure/flora/bush/jungle/c/style_random,
-/turf/open/floor/grass,
-/area/station/service/chapel)
"pnQ" = (
/obj/effect/turf_decal/stripes/white/line{
dir = 6
@@ -45629,17 +45726,6 @@
},
/turf/open/floor/iron,
/area/station/science/cytology)
-"pnW" = (
-/obj/machinery/computer/slot_machine{
- pixel_y = 2
- },
-/obj/effect/turf_decal/siding/wood{
- dir = 9
- },
-/obj/structure/extinguisher_cabinet/directional/west,
-/obj/machinery/computer/security/telescreen/entertainment/directional/north,
-/turf/open/floor/stone,
-/area/station/service/bar)
"pnZ" = (
/obj/effect/turf_decal/tile/blue/fourcorners,
/obj/machinery/firealarm/directional/west,
@@ -45654,13 +45740,6 @@
/obj/effect/turf_decal/siding/wood,
/turf/open/floor/iron/freezer,
/area/station/command/corporate_suite)
-"pot" = (
-/obj/structure/table/wood,
-/obj/item/cigarette/cigar/premium{
- pixel_y = 5
- },
-/turf/open/floor/stone,
-/area/station/service/abandoned_gambling_den)
"pox" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -45812,10 +45891,6 @@
name = "Holodeck Projector Floor"
},
/area/station/holodeck/rec_center)
-"pqa" = (
-/obj/structure/window/reinforced/spawner/directional/east,
-/turf/open/space/basic,
-/area/space)
"pqm" = (
/turf/closed/wall/r_wall,
/area/station/engineering/storage/tcomms)
@@ -45902,17 +45977,25 @@
/obj/effect/landmark/start/prisoner,
/turf/open/floor/iron/dark,
/area/station/security/prison/safe)
-"prt" = (
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/aft)
"prI" = (
/turf/closed/wall,
/area/station/engineering/hallway)
+"prT" = (
+/obj/machinery/camera/autoname/directional/east,
+/obj/machinery/status_display/evac/directional/east,
+/obj/structure/disposalpipe/trunk,
+/obj/effect/turf_decal/stripes/end,
+/obj/structure/window/reinforced/spawner/directional/east,
+/obj/structure/disposaloutlet{
+ dir = 1
+ },
+/obj/structure/window/reinforced/spawner/directional/west,
+/obj/effect/turf_decal/tile/green/fourcorners,
+/obj/effect/turf_decal/siding/thinplating_new{
+ dir = 4
+ },
+/turf/open/floor/iron/small,
+/area/station/hallway/secondary/service)
"prV" = (
/obj/effect/turf_decal/tile/brown/opposingcorners,
/obj/effect/turf_decal/tile/yellow/opposingcorners{
@@ -46017,14 +46100,6 @@
/obj/structure/broken_flooring/corner/directional/south,
/turf/open/floor/plating,
/area/station/maintenance/port/aft)
-"ptf" = (
-/obj/machinery/status_display/ai/directional/west,
-/obj/machinery/camera/autoname/directional/north,
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/aft)
"ptj" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -46074,19 +46149,6 @@
},
/turf/open/floor/iron/smooth,
/area/station/maintenance/port/aft)
-"ptT" = (
-/obj/effect/turf_decal/siding/thinplating_new/light,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/cable,
-/obj/structure/disposalpipe/segment{
- dir = 5
- },
-/obj/machinery/light/small/directional/south,
-/obj/machinery/requests_console/auto_name/directional/south,
-/obj/effect/mapping_helpers/requests_console/supplies,
-/turf/open/floor/iron/white/small,
-/area/station/service/hydroponics)
"pus" = (
/obj/effect/turf_decal/box/red/corners,
/obj/effect/turf_decal/stripes/white/line{
@@ -46116,11 +46178,25 @@
/obj/effect/mapping_helpers/airlock/cyclelink_helper,
/turf/open/floor/plating,
/area/station/engineering/atmos/space_catwalk)
-"pvi" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+"puO" = (
+/obj/structure/table,
+/obj/machinery/computer/security/telescreen/ordnance/directional/north,
+/turf/open/floor/iron/dark/side{
+ dir = 1
+ },
+/area/station/science/ordnance/testlab)
+"puZ" = (
+/obj/structure/cable,
+/obj/structure/disposalpipe/segment,
+/obj/effect/turf_decal/trimline/neutral/line{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/neutral/line{
+ dir = 4
+ },
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/wood,
-/area/station/service/chapel/office)
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/fore)
"pvk" = (
/obj/structure/closet/boxinggloves,
/obj/effect/turf_decal/stripes/red/line{
@@ -46133,12 +46209,6 @@
/obj/machinery/camera/autoname/directional/south,
/turf/open/floor/iron/herringbone,
/area/station/commons/dorms)
-"pvC" = (
-/obj/structure/disposalpipe/segment{
- dir = 10
- },
-/turf/open/floor/wood,
-/area/station/service/chapel/office)
"pvE" = (
/obj/effect/turf_decal/siding/wideplating{
dir = 4
@@ -46226,6 +46296,16 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/dark/herringbone,
/area/station/security/execution/education)
+"pxv" = (
+/obj/structure/cable,
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/open/floor/plating,
+/area/station/maintenance/port/greater)
"pxx" = (
/obj/effect/turf_decal/tile/yellow/half/contrasted{
dir = 8
@@ -46250,19 +46330,40 @@
dir = 1
},
/area/station/security/prison/safe)
-"pxW" = (
-/obj/structure/table,
-/obj/machinery/cell_charger{
- pixel_y = 5
+"pxB" = (
+/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{
+ dir = 6
},
-/obj/item/stock_parts/power_store/cell/high,
-/turf/open/floor/engine,
-/area/station/science/xenobiology)
+/obj/effect/spawner/random/structure/steam_vent,
+/turf/open/floor/plating,
+/area/station/maintenance/central/greater)
"pxZ" = (
/obj/structure/rack,
/obj/effect/spawner/random/maintenance,
/turf/open/floor/iron,
/area/station/maintenance/starboard/aft)
+"pyc" = (
+/obj/effect/turf_decal/trimline/neutral/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/neutral/line,
+/obj/effect/landmark/start/hangover,
+/obj/merge_conflict_marker{
+ name = "---Merge Conflict Marker---";
+
+ desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
+ },
+/obj/effect/turf_decal/trimline/neutral/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/neutral/line,
+/obj/effect/landmark/start/hangover,
+/obj/structure/cable,
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/fore)
"pyh" = (
/obj/structure/cable,
/obj/structure/broken_flooring/singular/directional/east,
@@ -46286,17 +46387,6 @@
/obj/structure/cable,
/turf/open/floor/iron/smooth,
/area/station/engineering/atmos/office)
-"pyt" = (
-/obj/machinery/light/floor,
-/turf/open/floor/grass,
-/area/station/service/chapel)
-"pyA" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/plating,
-/area/station/maintenance/port/greater)
"pyF" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -46346,13 +46436,6 @@
/obj/item/stack/sheet/mineral/titanium,
/turf/open/floor/tram,
/area/station/maintenance/department/medical/central)
-"pzW" = (
-/obj/effect/turf_decal/siding/wood{
- dir = 9
- },
-/obj/machinery/light/floor,
-/turf/open/floor/stone,
-/area/station/service/bar)
"pAa" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/effect/spawner/random/structure/barricade,
@@ -46403,6 +46486,22 @@
},
/turf/open/floor/engine,
/area/station/science/xenobiology)
+"pAu" = (
+/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,
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/aft)
+"pAC" = (
+/obj/effect/turf_decal/siding/thinplating_new/light{
+ dir = 4
+ },
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+ dir = 8
+ },
+/turf/open/floor/iron/white/small,
+/area/station/service/hydroponics)
"pAH" = (
/obj/machinery/vending/coffee,
/obj/effect/turf_decal/tile/neutral/fourcorners,
@@ -46422,6 +46521,14 @@
},
/turf/open/floor/iron/smooth,
/area/station/cargo/warehouse)
+"pAW" = (
+/obj/structure/disposalpipe/segment{
+ dir = 9
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/aft)
"pAY" = (
/obj/structure/cable,
/obj/structure/disposalpipe/segment{
@@ -46463,6 +46570,13 @@
"pBO" = (
/turf/open/floor/iron/showroomfloor,
/area/station/service/barber)
+"pBS" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/open/floor/plating,
+/area/station/maintenance/port/greater)
"pBT" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
dir = 4
@@ -46612,6 +46726,12 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/aft)
+"pDW" = (
+/obj/effect/turf_decal/siding/wood,
+/obj/machinery/power/apc/auto_name/directional/east,
+/obj/structure/cable,
+/turf/open/floor/wood/parquet,
+/area/station/service/library)
"pDX" = (
/obj/structure/chair/stool/directional/east,
/turf/open/floor/iron/herringbone,
@@ -46643,6 +46763,13 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/plating,
/area/station/maintenance/starboard/fore)
+"pEr" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 8
+ },
+/obj/machinery/newscaster/directional/west,
+/turf/open/floor/stone,
+/area/station/service/bar)
"pEs" = (
/obj/effect/turf_decal/siding/blue,
/turf/open/floor/iron/white,
@@ -46684,6 +46811,17 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/general/hidden,
/turf/open/floor/iron/white/small,
/area/station/science/server)
+"pEI" = (
+/obj/structure/window/spawner/directional/east,
+/obj/structure/window/spawner/directional/west,
+/obj/structure/flora/bush/sparsegrass,
+/obj/structure/flora/bush/flowers_br,
+/obj/structure/flora/bush/flowers_pp,
+/obj/structure/flora/bush/large/style_random{
+ pixel_y = -1
+ },
+/turf/open/floor/grass,
+/area/station/service/hydroponics)
"pEL" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/effect/turf_decal/tile/blue{
@@ -46691,23 +46829,28 @@
},
/turf/open/floor/iron/white,
/area/station/medical/medbay/central)
-"pEO" = (
-/obj/effect/turf_decal/trimline/neutral/line,
-/obj/effect/turf_decal/trimline/neutral/line{
- dir = 1
- },
-/obj/machinery/navbeacon{
- codes_txt = "patrol;next_patrol=1.0-Security-PNexus";
- location = "23.2-Evac-Garden"
- },
-/turf/open/floor/iron,
-/area/station/hallway/primary/port)
"pFk" = (
/obj/structure/broken_flooring/singular/directional/east,
/obj/effect/decal/cleanable/dirt,
/obj/structure/alien/weeds,
/turf/open/floor/plating,
/area/station/maintenance/starboard/greater)
+"pFn" = (
+/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/wood/end{
+ dir = 1
+ },
+/turf/open/floor/stone,
+/area/station/service/bar)
+"pFF" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/stone,
+/area/station/service/chapel)
"pFI" = (
/obj/structure/cable,
/obj/structure/disposalpipe/segment{
@@ -46778,6 +46921,14 @@
},
/turf/open/floor/iron/small,
/area/station/engineering/atmos)
+"pGA" = (
+/obj/structure/cable,
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plating,
+/area/station/maintenance/port/greater)
"pGD" = (
/obj/structure/cable,
/turf/open/floor/iron,
@@ -46799,15 +46950,27 @@
/obj/structure/flora/rock/pile/jungle/style_random,
/turf/open/misc/sandy_dirt,
/area/station/hallway/secondary/entry)
+"pGN" = (
+/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/merge_conflict_marker{
+ name = "---Merge Conflict Marker---";
+
+ desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
+ },
+/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/decal/cleanable/dirt,
+/turf/open/floor/plating,
+/area/station/maintenance/central/greater)
"pGR" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
/area/station/maintenance/department/prison)
-"pGS" = (
-/obj/machinery/status_display/evac/directional/north,
-/obj/machinery/camera/directional/north,
-/turf/open/misc/dirt/jungle,
-/area/station/service/chapel)
"pGU" = (
/obj/effect/turf_decal/trimline/white/line{
dir = 5
@@ -46854,33 +47017,12 @@
/obj/machinery/firealarm/directional/south,
/turf/open/floor/iron,
/area/station/hallway/secondary/entry)
-"pHs" = (
-/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/red{
- dir = 4
- },
-/obj/structure/disposalpipe/segment{
- dir = 9
- },
-/turf/open/floor/iron,
-/area/station/cargo/storage)
"pHw" = (
/obj/structure/table,
/obj/effect/decal/cleanable/dirt,
/obj/item/airlock_painter,
/turf/open/floor/iron,
/area/station/commons/storage/art)
-"pHA" = (
-/obj/effect/turf_decal/weather/dirt{
- dir = 6
- },
-/mob/living/basic/frog,
-/obj/structure/flora/bush/flowers_br/style_3,
-/obj/structure/flora/tree/jungle/small,
-/turf/open/floor/grass,
-/area/station/service/chapel)
"pHC" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -46915,26 +47057,6 @@
},
/turf/open/floor/wood,
/area/station/commons/fitness/recreation)
-"pHS" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
-/obj/structure/cable,
-/turf/open/floor/iron/dark,
-/area/station/science/ordnance)
-"pHY" = (
-/obj/effect/turf_decal/tile/red/opposingcorners,
-/obj/effect/turf_decal/tile/blue/opposingcorners{
- dir = 8
- },
-/obj/machinery/disposal/bin,
-/obj/machinery/light_switch/directional/south,
-/obj/machinery/camera/directional/south{
- c_tag = "Atmospherics - South"
- },
-/obj/structure/disposalpipe/trunk{
- dir = 1
- },
-/turf/open/floor/iron/smooth,
-/area/station/service/greenroom)
"pId" = (
/obj/structure/reagent_dispensers/plumbed,
/turf/open/floor/iron/kitchen/small,
@@ -47001,12 +47123,6 @@
/obj/structure/extinguisher_cabinet/directional/north,
/turf/open/floor/iron/dark,
/area/station/engineering/atmos)
-"pIC" = (
-/obj/effect/turf_decal/siding/thinplating_new/light{
- dir = 8
- },
-/turf/open/floor/iron/white/small,
-/area/station/service/hydroponics)
"pIS" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/door/poddoor/preopen{
@@ -47015,10 +47131,6 @@
},
/turf/open/floor/plating,
/area/station/command/bridge)
-"pJc" = (
-/obj/effect/turf_decal/siding/wood,
-/turf/open/floor/stone,
-/area/station/service/bar)
"pJj" = (
/obj/structure/chair/sofa/bench/left{
dir = 1
@@ -47027,6 +47139,11 @@
/obj/machinery/light/small/directional/west,
/turf/open/floor/iron,
/area/station/hallway/secondary/dock)
+"pJk" = (
+/obj/structure/table/wood,
+/obj/item/food/lizard_fries,
+/turf/open/floor/wood/large,
+/area/station/service/bar)
"pJm" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -47215,13 +47332,6 @@
/obj/machinery/computer/security/telescreen/entertainment/directional/north,
/turf/open/floor/iron/cafeteria,
/area/station/hallway/secondary/exit/departure_lounge)
-"pMc" = (
-/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,
-/turf/open/floor/plating,
-/area/station/maintenance/central/greater)
"pMs" = (
/obj/structure/transit_tube/horizontal,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -47371,6 +47481,15 @@
},
/turf/open/floor/iron/small,
/area/station/engineering/atmos/storage/gas)
+"pOI" = (
+/obj/structure/sign/clock/directional/north,
+/obj/structure/table/wood,
+/obj/machinery/reagentgrinder{
+ pixel_x = -5;
+ pixel_y = 10
+ },
+/turf/open/floor/iron/dark/textured,
+/area/station/service/bar)
"pOJ" = (
/obj/machinery/atmospherics/components/binary/pump/on{
dir = 4;
@@ -47379,34 +47498,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
/area/station/maintenance/department/prison)
-"pOM" = (
-/obj/machinery/door/firedoor,
-/obj/effect/turf_decal/stripes/red/line{
- dir = 4
- },
-/obj/effect/turf_decal/stripes/red/line{
- dir = 8
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/iron/small,
-/area/station/hallway/primary/port)
-"pOQ" = (
-/obj/effect/turf_decal/siding/wood{
- dir = 1
- },
-/obj/machinery/camera/autoname/directional/east,
-/obj/machinery/firealarm/directional/east,
-/obj/machinery/disposal/bin,
-/obj/structure/disposalpipe/trunk{
- dir = 8
- },
-/turf/open/floor/wood/parquet,
-/area/station/service/library)
-"pOT" = (
-/turf/closed/wall,
-/area/station/holodeck/rec_center)
"pOX" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 1
@@ -47436,12 +47527,26 @@
/obj/item/airlock_painter,
/turf/open/floor/iron/small,
/area/station/engineering/atmos/storage/gas)
+"pPC" = (
+/obj/effect/turf_decal/siding/wood,
+/obj/effect/turf_decal/siding/wood/corner{
+ dir = 4
+ },
+/turf/open/floor/stone,
+/area/station/service/chapel)
"pPH" = (
/obj/machinery/door/airlock/public/glass{
name = "Atmospherics Project Bay"
},
/turf/open/floor/iron,
/area/station/engineering/atmos)
+"pPI" = (
+/obj/machinery/porta_turret/ai,
+/obj/machinery/computer/security/telescreen/minisat/directional/east,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/status_display/ai/directional/north,
+/turf/open/floor/iron/smooth,
+/area/station/ai_monitored/turret_protected/aisat_interior)
"pPK" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -47451,10 +47556,24 @@
/obj/structure/reagent_dispensers/fueltank,
/turf/open/floor/plating,
/area/station/maintenance/aft)
+"pQc" = (
+/obj/structure/cable,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/plating,
+/area/station/maintenance/port/greater)
"pQj" = (
/obj/structure/disposalpipe/segment,
/turf/open/floor/plating,
/area/station/maintenance/department/engine)
+"pQk" = (
+/obj/structure/cable,
+/obj/structure/disposalpipe/segment,
+/turf/closed/wall,
+/area/station/maintenance/port/greater)
"pQn" = (
/obj/structure/sink/kitchen/directional/south,
/turf/open/floor/iron/kitchen/small,
@@ -47481,6 +47600,17 @@
},
/turf/open/floor/engine,
/area/station/hallway/secondary/entry)
+"pQG" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/effect/landmark/navigate_destination/hydro,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/effect/landmark/start/hangover,
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/aft)
"pQY" = (
/obj/structure/cable,
/obj/effect/turf_decal/tile/neutral/half/contrasted,
@@ -47489,15 +47619,6 @@
},
/turf/open/floor/iron/dark/side,
/area/station/science/xenobiology)
-"pRc" = (
-/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
- },
-/turf/open/floor/plating,
-/area/station/maintenance/port/greater)
"pRe" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/structure/table/wood,
@@ -47515,6 +47636,12 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/smooth,
/area/station/hallway/secondary/command)
+"pRC" = (
+/obj/effect/turf_decal/weather/dirt{
+ dir = 1
+ },
+/turf/open/floor/grass,
+/area/station/service/chapel)
"pRF" = (
/obj/structure/cable,
/obj/machinery/light/cold/directional/south,
@@ -47588,19 +47715,6 @@
/obj/machinery/holopad,
/turf/open/floor/iron/dark/smooth_large,
/area/station/service/lawoffice)
-"pSO" = (
-/obj/machinery/portable_atmospherics/canister/air,
-/turf/open/floor/plating,
-/area/station/maintenance/central/greater)
-"pSP" = (
-/obj/structure/cable,
-/obj/structure/disposalpipe/segment{
- dir = 9
- },
-/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/port/greater)
"pSQ" = (
/obj/structure/cable,
/turf/closed/wall,
@@ -47614,19 +47728,16 @@
/obj/machinery/camera/autoname/directional/west,
/turf/open/floor/iron,
/area/station/engineering/storage/tech)
-"pTk" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
+"pTe" = (
/obj/machinery/door/airlock{
- name = "Maintenance"
+ name = "Kitchen"
},
-/obj/effect/mapping_helpers/airlock/access/any/service/maintenance,
-/obj/structure/cable,
+/obj/effect/mapping_helpers/airlock/access/all/service/kitchen,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/plating,
-/area/station/holodeck/rec_center)
+/obj/machinery/door/firedoor,
+/turf/open/floor/iron/kitchen/small,
+/area/station/service/kitchen)
"pTp" = (
/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{
dir = 4
@@ -47663,12 +47774,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/dark/smooth_large,
/area/station/service/lawoffice)
-"pTA" = (
-/obj/effect/turf_decal/tile/neutral/opposingcorners,
-/obj/effect/spawner/random/entertainment/arcade,
-/obj/effect/decal/cleanable/cobweb/cobweb2,
-/turf/open/floor/iron,
-/area/station/holodeck/rec_center)
"pTZ" = (
/obj/effect/turf_decal/siding/wideplating/dark{
dir = 8
@@ -47765,14 +47870,6 @@
/obj/machinery/firealarm/directional/west,
/turf/open/floor/iron/white,
/area/station/science/auxlab/firing_range)
-"pVj" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/fore)
"pVq" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/effect/turf_decal/trimline/neutral/line{
@@ -47816,13 +47913,6 @@
},
/turf/open/floor/iron/dark/side,
/area/station/science/xenobiology)
-"pWj" = (
-/obj/machinery/door/airlock{
- name = "Kitchen"
- },
-/obj/effect/mapping_helpers/airlock/access/any/service/hydroponics,
-/turf/open/floor/plating,
-/area/station/maintenance/central/greater)
"pWl" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -47911,6 +48001,11 @@
},
/turf/open/space/basic,
/area/space/nearstation)
+"pWY" = (
+/obj/structure/flora/tree/jungle/style_4,
+/obj/effect/turf_decal/weather/dirt,
+/turf/open/floor/grass,
+/area/station/service/chapel)
"pWZ" = (
/obj/effect/turf_decal/siding/white{
dir = 9
@@ -47938,10 +48033,6 @@
/obj/effect/spawner/random/structure/girder,
/turf/open/floor/tram,
/area/station/maintenance/department/medical/central)
-"pXk" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/wood/tile,
-/area/station/maintenance/central/lesser)
"pXo" = (
/obj/structure/cable,
/obj/structure/disposalpipe/segment{
@@ -47954,6 +48045,14 @@
},
/turf/open/floor/iron/cafeteria,
/area/station/hallway/secondary/exit/departure_lounge)
+"pXq" = (
+/obj/machinery/camera/directional/south,
+/obj/structure/flora/bush/flowers_pp/style_2,
+/obj/effect/turf_decal/weather/dirt{
+ dir = 6
+ },
+/turf/open/floor/grass,
+/area/station/service/chapel)
"pXu" = (
/obj/effect/turf_decal/siding/wideplating{
dir = 1
@@ -47986,14 +48085,6 @@
/obj/effect/mapping_helpers/broken_floor,
/turf/open/floor/plating,
/area/station/maintenance/port/greater)
-"pXH" = (
-/obj/effect/landmark/event_spawn,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
- dir = 8
- },
-/obj/structure/table,
-/turf/open/floor/iron/kitchen/small,
-/area/station/service/kitchen)
"pXL" = (
/obj/structure/disposalpipe/segment,
/obj/effect/turf_decal/tile/neutral/fourcorners,
@@ -48060,6 +48151,17 @@
/obj/machinery/light_switch/directional/east,
/turf/open/floor/plating/elevatorshaft,
/area/station/engineering/atmos)
+"pYW" = (
+/obj/machinery/door/airlock/multi_tile/public{
+ dir = 8
+ },
+/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/textured_half{
+ dir = 8
+ },
+/area/station/service/bar)
"pYY" = (
/obj/structure/disposalpipe/segment{
dir = 9
@@ -48076,15 +48178,13 @@
/obj/structure/hedge,
/turf/open/floor/plating,
/area/station/cargo/storage)
-"pZv" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/obj/structure/disposalpipe/segment{
+"pZw" = (
+/obj/effect/turf_decal/siding/thinplating{
dir = 6
},
-/turf/open/floor/iron,
+/obj/machinery/light/small/directional/south,
+/obj/structure/sign/poster/official/random/directional/east,
+/turf/open/floor/eighties/red,
/area/station/hallway/primary/central/fore)
"pZz" = (
/obj/structure/rack,
@@ -48109,11 +48209,27 @@
/obj/item/shard/titanium,
/turf/open/floor/plating,
/area/station/maintenance/department/engine/atmos)
+"pZZ" = (
+/obj/effect/turf_decal/tile/neutral,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/open/floor/iron,
+/area/station/hallway/primary/port)
"qaF" = (
/obj/structure/sink/directional/south,
/obj/structure/mirror/directional/north,
/turf/open/floor/iron/white/small,
/area/station/maintenance/port/aft)
+"qaK" = (
+/obj/structure/cable,
+/turf/open/floor/iron/dark,
+/area/station/science/ordnance)
+"qaR" = (
+/obj/structure/flora/bush/flowers_pp/style_2,
+/obj/structure/flora/bush/large/style_3,
+/turf/open/floor/grass,
+/area/station/service/chapel)
"qaV" = (
/obj/structure/disposalpipe/segment{
dir = 10
@@ -48159,19 +48275,6 @@
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/station/security/checkpoint/supply)
-"qbA" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/iron/white/small,
-/area/station/service/hydroponics)
-"qbB" = (
-/obj/effect/turf_decal/siding/wood{
- dir = 1
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/wood/parquet,
-/area/station/service/library)
"qbE" = (
/obj/item/stack/tile/catwalk_tile/iron,
/turf/open/floor/plating,
@@ -48223,10 +48326,6 @@
/obj/effect/landmark/navigate_destination/dockarrival,
/turf/open/floor/iron,
/area/station/hallway/secondary/entry)
-"qcB" = (
-/obj/structure/sign/nanotrasen,
-/turf/closed/wall,
-/area/station/maintenance/central/greater)
"qcC" = (
/obj/effect/turf_decal/tile/neutral/opposingcorners,
/obj/structure/disposalpipe/segment,
@@ -48236,6 +48335,14 @@
/obj/effect/spawner/structure/window,
/turf/open/floor/plating,
/area/station/maintenance/department/electrical)
+"qcL" = (
+/obj/effect/turf_decal/siding/wood,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/chair/wood{
+ dir = 4
+ },
+/turf/open/floor/iron/grimy,
+/area/station/service/bar)
"qcQ" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -48252,6 +48359,10 @@
},
/turf/open/misc/sandy_dirt,
/area/station/security/tram)
+"qdl" = (
+/obj/machinery/status_display/ai/directional/east,
+/turf/open/floor/glass,
+/area/station/hallway/primary/central/aft)
"qdu" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -48326,6 +48437,13 @@
},
/turf/open/floor/iron,
/area/station/maintenance/hallway/abandoned_command)
+"qec" = (
+/obj/effect/turf_decal/weather/dirt{
+ dir = 1
+ },
+/obj/structure/flora/tree/jungle/small/style_4,
+/turf/open/floor/grass,
+/area/station/service/chapel)
"qei" = (
/turf/closed/wall,
/area/station/science/ordnance/storage)
@@ -48475,6 +48593,18 @@
/obj/machinery/firealarm/directional/south,
/turf/open/floor/iron/smooth,
/area/station/commons/storage/tools)
+"qgV" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/door/airlock/maintenance{
+ name = "Crematorium"
+ },
+/obj/machinery/door/firedoor,
+/obj/effect/mapping_helpers/airlock/access/all/security/general,
+/turf/open/floor/iron/textured_half{
+ dir = 8
+ },
+/area/station/security/brig/entrance)
"qhh" = (
/obj/structure/cable,
/obj/structure/table/glass,
@@ -48554,18 +48684,6 @@
},
/turf/open/floor/iron,
/area/station/engineering/atmos/pumproom)
-"qie" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/aft)
"qin" = (
/obj/docking_port/stationary/escape_pod,
/turf/open/space/basic,
@@ -48597,22 +48715,6 @@
/obj/effect/spawner/structure/window,
/turf/open/floor/plating,
/area/station/commons/storage/tools)
-"qiC" = (
-/obj/effect/turf_decal/tile/green/opposingcorners,
-/obj/effect/turf_decal/tile/blue/opposingcorners{
- dir = 8
- },
-/obj/machinery/hydroponics/constructable,
-/turf/open/floor/iron,
-/area/station/service/hydroponics)
-"qiI" = (
-/obj/structure/cable,
-/obj/effect/spawner/random/structure/steam_vent,
-/obj/structure/disposalpipe/segment{
- dir = 9
- },
-/turf/open/floor/plating,
-/area/station/maintenance/central/greater)
"qiL" = (
/obj/structure/disposalpipe/segment,
/turf/open/floor/iron,
@@ -48658,17 +48760,19 @@
/obj/effect/turf_decal/stripes/white/full,
/turf/open/floor/engine,
/area/station/engineering/supermatter)
-"qjt" = (
+"qjs" = (
/obj/structure/cable,
-/obj/effect/turf_decal/trimline/neutral/line,
-/obj/effect/turf_decal/trimline/neutral/line{
- dir = 1
+/obj/structure/disposalpipe/segment{
+ dir = 6
},
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/structure/disposalpipe/segment{
dir = 4
},
-/turf/open/floor/iron,
-/area/station/hallway/primary/port)
+/turf/open/floor/plating,
+/area/station/maintenance/port/greater)
"qju" = (
/obj/structure/cable,
/obj/machinery/door/poddoor/preopen{
@@ -48722,6 +48826,18 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/aft)
+"qkl" = (
+/obj/machinery/door/airlock/multi_tile/public{
+ dir = 4
+ },
+/obj/machinery/door/firedoor,
+/obj/effect/turf_decal/siding/wood{
+ dir = 4
+ },
+/turf/open/floor/iron/textured_half{
+ dir = 8
+ },
+/area/station/service/library)
"qkp" = (
/obj/machinery/door/airlock{
name = "Maintenance"
@@ -48730,6 +48846,15 @@
/obj/structure/cable,
/turf/open/floor/plating,
/area/station/maintenance/starboard/greater)
+"qky" = (
+/obj/effect/mapping_helpers/airlock/access/any/service/maintenance,
+/obj/structure/cable,
+/obj/machinery/door/airlock{
+ id_tag = "commiss2";
+ name = "Commissary"
+ },
+/turf/open/floor/plating,
+/area/station/maintenance/central/greater)
"qkI" = (
/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{
dir = 1
@@ -48741,6 +48866,14 @@
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/station/maintenance/port/lesser)
+"qkP" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 1
+ },
+/obj/structure/bookcase/random/adult,
+/obj/structure/sign/poster/official/random/directional/north,
+/turf/open/floor/iron/grimy,
+/area/station/service/library)
"qlc" = (
/obj/effect/turf_decal/tile/dark_red/half/contrasted{
dir = 1
@@ -48772,6 +48905,13 @@
/obj/machinery/airalarm/directional/east,
/turf/open/floor/iron,
/area/station/hallway/secondary/entry)
+"qlu" = (
+/obj/machinery/vending/wardrobe/hydro_wardrobe,
+/obj/effect/turf_decal/siding/thinplating_new/light{
+ dir = 5
+ },
+/turf/open/floor/iron/white/small,
+/area/station/service/hydroponics)
"qly" = (
/obj/machinery/suit_storage_unit/standard_unit,
/obj/effect/turf_decal/stripes/line{
@@ -48817,6 +48957,16 @@
/obj/structure/cable,
/turf/open/space/basic,
/area/space/nearstation)
+"qmp" = (
+/obj/structure/cable,
+/obj/structure/disposalpipe/segment{
+ dir = 9
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/spawner/random/structure/steam_vent,
+/turf/open/floor/plating,
+/area/station/maintenance/port/greater)
"qmv" = (
/obj/machinery/door/airlock/maintenance{
name = "Atmospherics Maintenance"
@@ -48828,12 +48978,6 @@
/obj/structure/table/wood,
/turf/open/floor/wood,
/area/station/cargo/boutique)
-"qmM" = (
-/obj/structure/sign/painting/library{
- pixel_y = 32
- },
-/turf/open/floor/iron/smooth,
-/area/station/service/library)
"qmZ" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -48842,21 +48986,6 @@
},
/turf/open/floor/iron/dark/small,
/area/station/medical/chemistry)
-"qnb" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/obj/structure/table,
-/obj/machinery/door/poddoor/shutters{
- dir = 4;
- id = "vaco";
- name = "Comissary Shutters"
- },
-/turf/open/floor/plating,
-/area/station/maintenance/central/lesser)
"qnc" = (
/obj/machinery/door/airlock/external{
name = "Labor Camp Shuttle Airlock";
@@ -48868,6 +48997,17 @@
},
/turf/open/floor/iron/dark/small,
/area/station/security/processing)
+"qnk" = (
+/obj/machinery/door/airlock/maintenance{
+ name = "Maintenance"
+ },
+/obj/effect/mapping_helpers/airlock/access/all/supply/general,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/cable,
+/turf/open/floor/plating,
+/area/station/maintenance/port/greater)
"qnt" = (
/obj/structure/cable,
/obj/machinery/power/solar{
@@ -48977,16 +49117,6 @@
/obj/machinery/light/floor,
/turf/open/floor/glass/reinforced,
/area/station/command/bridge)
-"qqH" = (
-/obj/effect/spawner/random/entertainment/arcade{
- dir = 4
- },
-/obj/effect/turf_decal/siding/thinplating{
- dir = 8
- },
-/obj/item/radio/intercom/directional/west,
-/turf/open/floor/eighties/red,
-/area/station/hallway/primary/central/fore)
"qqJ" = (
/obj/effect/turf_decal/stripes/line{
dir = 6
@@ -49000,6 +49130,11 @@
dir = 1
},
/area/station/engineering/supermatter/room)
+"qqY" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/airalarm/directional/north,
+/turf/open/floor/iron/dark/small,
+/area/station/service/chapel/storage)
"qrb" = (
/obj/structure/sign/warning/biohazard,
/turf/closed/wall/r_wall,
@@ -49036,6 +49171,10 @@
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/station/science/xenobiology)
+"qrD" = (
+/obj/machinery/light/small/directional/north,
+/turf/open/floor/engine/xenobio,
+/area/station/science/xenobiology)
"qsa" = (
/obj/effect/turf_decal/stripes/line,
/obj/machinery/camera/directional/south{
@@ -49077,14 +49216,6 @@
},
/turf/open/floor/engine/vacuum,
/area/station/science/ordnance/freezerchamber)
-"qsY" = (
-/obj/effect/turf_decal/siding/wood{
- dir = 10
- },
-/obj/machinery/light/floor,
-/obj/structure/table/wood,
-/turf/open/floor/iron/grimy,
-/area/station/service/bar)
"qtd" = (
/turf/open/floor/wood/tile,
/area/station/command/corporate_showroom)
@@ -49152,6 +49283,10 @@
/obj/structure/cable,
/turf/open/floor/plating,
/area/station/maintenance/fore/lesser)
+"qtV" = (
+/obj/structure/flora/grass/jungle/b/style_3,
+/turf/open/floor/grass,
+/area/station/service/chapel)
"qul" = (
/obj/machinery/light/small/directional/east,
/obj/machinery/light_switch/directional/east,
@@ -49186,6 +49321,11 @@
},
/turf/open/floor/iron/dark/small,
/area/station/maintenance/aft)
+"quC" = (
+/obj/structure/closet/emcloset,
+/obj/effect/turf_decal/tile/blue,
+/turf/open/floor/iron/dark/side,
+/area/station/hallway/primary/central/fore)
"quO" = (
/obj/structure/reagent_dispensers/wall/peppertank/directional/east,
/obj/effect/turf_decal/tile/red/half/contrasted{
@@ -49244,6 +49384,10 @@
/obj/machinery/light/small/directional/east,
/turf/open/floor/iron,
/area/station/security/courtroom)
+"qvI" = (
+/obj/structure/chair/stool/bar/directional/north,
+/turf/open/floor/wood/large,
+/area/station/service/bar)
"qvL" = (
/obj/effect/turf_decal/siding/wood,
/obj/item/kirbyplants/random,
@@ -49275,6 +49419,15 @@
},
/turf/open/floor/iron,
/area/station/security/warden)
+"qwr" = (
+/obj/effect/spawner/random/vending/snackvend,
+/obj/structure/cable,
+/obj/machinery/power/apc/auto_name/directional/south,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/turf/open/floor/iron/white/side,
+/area/station/hallway/primary/central/aft)
"qww" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -49305,9 +49458,13 @@
/obj/effect/turf_decal/siding/wideplating/dark,
/turf/open/floor/iron,
/area/station/security)
-"qwK" = (
-/turf/open/floor/carpet/lone,
-/area/station/service/chapel/office)
+"qwQ" = (
+/obj/structure/disposalpipe/segment{
+ dir = 5
+ },
+/obj/structure/cable,
+/turf/open/floor/iron/kitchen/small,
+/area/station/service/kitchen)
"qwU" = (
/obj/effect/turf_decal/siding/wood,
/obj/structure/table/glass,
@@ -49382,6 +49539,13 @@
/obj/structure/flora/bush/flowers_pp/style_random,
/turf/open/misc/sandy_dirt,
/area/station/science/research)
+"qya" = (
+/obj/effect/turf_decal/siding/wood/corner,
+/obj/effect/turf_decal/siding/wood/corner{
+ dir = 1
+ },
+/turf/open/floor/stone,
+/area/station/service/chapel)
"qyb" = (
/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{
dir = 5
@@ -49407,6 +49571,13 @@
},
/turf/open/floor/iron/small,
/area/station/engineering/atmos/pumproom)
+"qye" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/firealarm/directional/north,
+/obj/machinery/light_switch/directional/south,
+/turf/open/floor/iron/dark/small,
+/area/station/service/chapel/storage)
"qyx" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/structure/chair{
@@ -49480,14 +49651,6 @@
/obj/effect/turf_decal/tile/dark_red/half/contrasted,
/turf/open/floor/iron,
/area/station/security/tram)
-"qzt" = (
-/obj/structure/window/spawner/directional/east,
-/obj/structure/window/spawner/directional/west,
-/obj/structure/flora/bush/large/style_2,
-/obj/structure/flora/bush/sparsegrass,
-/obj/structure/flora/bush/flowers_yw,
-/turf/open/floor/grass,
-/area/station/service/hydroponics)
"qzv" = (
/obj/structure/table,
/obj/item/canvas{
@@ -49536,10 +49699,6 @@
/obj/structure/steam_vent,
/turf/open/floor/plating,
/area/station/maintenance/fore/greater)
-"qzP" = (
-/obj/effect/turf_decal/weather/dirt,
-/turf/open/floor/grass,
-/area/station/service/chapel)
"qzT" = (
/obj/item/bikehorn/rubberducky{
pixel_x = -6;
@@ -49646,6 +49805,14 @@
/obj/machinery/light/small/directional/north,
/turf/open/floor/catwalk_floor/flat_white,
/area/station/science/robotics/augments)
+"qBf" = (
+/obj/structure/displaycase/trophy,
+/obj/effect/turf_decal/siding/wood{
+ dir = 4
+ },
+/obj/machinery/camera/autoname/directional/west,
+/turf/open/floor/wood/parquet,
+/area/station/service/library)
"qBi" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
@@ -49659,13 +49826,6 @@
name = "Holodeck Projector Floor"
},
/area/station/holodeck/rec_center)
-"qBn" = (
-/obj/structure/cable,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/aft)
"qBz" = (
/obj/effect/turf_decal/siding/wood,
/obj/structure/mannequin/plastic,
@@ -49747,13 +49907,6 @@
},
/turf/open/floor/iron/large,
/area/station/command/heads_quarters/hop)
-"qCK" = (
-/obj/effect/turf_decal/siding/thinplating_new/light{
- dir = 5
- },
-/obj/effect/landmark/start/botanist,
-/turf/open/floor/iron/white/small,
-/area/station/service/hydroponics)
"qCT" = (
/obj/effect/turf_decal/siding/wood{
dir = 9
@@ -49788,22 +49941,6 @@
},
/turf/open/floor/wood/tile,
/area/station/tcommsat/server)
-"qDd" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/door/airlock{
- name = "Theater Greenroom"
- },
-/obj/effect/mapping_helpers/airlock/access/all/service/theatre,
-/obj/structure/cable,
-/obj/machinery/door/firedoor,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/iron/textured_half{
- dir = 8
- },
-/area/station/service/greenroom)
"qDi" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -49858,14 +49995,6 @@
},
/turf/open/floor/catwalk_floor,
/area/station/engineering/main)
-"qDC" = (
-/obj/effect/turf_decal/siding/wood{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/wood/parquet,
-/area/station/service/library)
"qDJ" = (
/obj/machinery/door/airlock/maintenance{
name = "Maintenance"
@@ -49885,10 +50014,6 @@
/obj/structure/reagent_dispensers/water_cooler,
/turf/open/floor/wood/parquet,
/area/station/medical/psychology)
-"qDL" = (
-/obj/machinery/chem_master/condimaster,
-/turf/open/floor/iron/kitchen/small,
-/area/station/service/kitchen)
"qDN" = (
/obj/effect/turf_decal/tile/blue,
/obj/machinery/status_display/evac/directional/west,
@@ -49940,22 +50065,6 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/science/lower)
-"qEO" = (
-/obj/machinery/camera/autoname/directional/east,
-/obj/machinery/status_display/evac/directional/east,
-/obj/structure/disposalpipe/trunk,
-/obj/effect/turf_decal/stripes/end,
-/obj/structure/window/reinforced/spawner/directional/east,
-/obj/structure/disposaloutlet{
- dir = 1
- },
-/obj/structure/window/reinforced/spawner/directional/west,
-/obj/effect/turf_decal/tile/green/fourcorners,
-/obj/effect/turf_decal/siding/thinplating_new{
- dir = 4
- },
-/turf/open/floor/iron/small,
-/area/station/hallway/secondary/service)
"qEP" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -49974,19 +50083,6 @@
/obj/machinery/power/apc/auto_name/directional/north,
/turf/open/floor/iron/white/side,
/area/station/science/lower)
-"qFc" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/effect/turf_decal/plaque{
- icon_state = "L10";
- pixel_y = -15
- },
-/obj/effect/turf_decal/trimline/neutral/line,
-/obj/effect/turf_decal/trimline/neutral/line{
- dir = 1
- },
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/aft)
"qFh" = (
/obj/effect/turf_decal/tile/dark_red{
dir = 4
@@ -50014,35 +50110,23 @@
},
/turf/open/floor/plating/elevatorshaft,
/area/station/engineering/atmos)
-"qGc" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/public/glass{
- name = "Fore Primary Hallway"
- },
-/turf/open/floor/iron/textured_half,
-/area/station/hallway/primary/central/fore)
"qGe" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/door/firedoor,
-/obj/effect/turf_decal/stripes/red/line,
-/obj/effect/turf_decal/stripes/red/line{
- dir = 1
+/obj/structure/cable,
+/obj/effect/turf_decal/siding/wood{
+ dir = 4
},
-/obj/structure/disposalpipe/segment{
- dir = 9
+/obj/effect/turf_decal/siding/wood/corner{
+ dir = 8
},
-/turf/open/floor/iron/small,
-/area/station/hallway/primary/central/fore)
-"qGf" = (
-/obj/structure/flora/bush/flowers_pp{
- pixel_y = 3
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/camera/autoname/directional/east,
+/obj/machinery/computer/security/telescreen/entertainment/directional/east,
+/obj/effect/turf_decal/siding/wood/corner{
+ dir = 1
},
-/obj/effect/dummy/lighting_obj,
-/obj/effect/light_emitter/fake_outdoors,
-/obj/effect/turf_decal/siding/wood,
-/turf/open/floor/grass/Airless,
-/area/station/hallway/primary/central/aft)
+/turf/open/floor/stone,
+/area/station/service/bar)
"qGk" = (
/obj/structure/chair/stool/directional/east,
/turf/open/floor/plating,
@@ -50075,15 +50159,6 @@
/obj/effect/turf_decal/siding/wideplating/dark/corner,
/turf/open/floor/iron,
/area/station/security)
-"qHr" = (
-/obj/effect/turf_decal/weather/dirt{
- dir = 8
- },
-/obj/machinery/light/small/directional/west,
-/obj/machinery/camera/directional/west,
-/obj/machinery/status_display/ai/directional/west,
-/turf/open/floor/grass,
-/area/station/service/chapel)
"qHt" = (
/obj/structure/cable,
/turf/open/floor/iron,
@@ -50102,6 +50177,14 @@
},
/turf/open/floor/iron/kitchen/small,
/area/station/security/prison/mess)
+"qHU" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/turf_decal/tile/neutral,
+/obj/structure/disposalpipe/junction/flip{
+ dir = 8
+ },
+/turf/open/floor/iron,
+/area/station/hallway/primary/port)
"qHY" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -50248,6 +50331,18 @@
/obj/effect/mapping_helpers/airlock/access/all/medical/cmo,
/turf/open/floor/iron/white/small,
/area/station/command/heads_quarters/cmo)
+"qKU" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/door/airlock/public/glass{
+ name = "Departure Lounge"
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/open/floor/iron/textured_half{
+ dir = 1
+ },
+/area/station/hallway/secondary/exit/departure_lounge)
"qLj" = (
/obj/structure/bed{
dir = 4
@@ -50290,16 +50385,16 @@
/obj/machinery/airalarm/directional/north,
/turf/open/floor/iron,
/area/station/security/courtroom)
-"qLU" = (
-/obj/effect/turf_decal/tile/green/opposingcorners,
-/obj/effect/turf_decal/tile/blue/opposingcorners{
+"qLJ" = (
+/obj/effect/landmark/start/hangover,
+/turf/open/floor/iron/smooth,
+/area/station/service/library)
+"qLT" = (
+/obj/effect/turf_decal/weather/dirt{
dir = 8
},
-/obj/machinery/camera/autoname/directional/west,
-/obj/machinery/hydroponics/constructable,
-/obj/item/radio/intercom/directional/west,
-/turf/open/floor/iron,
-/area/station/service/hydroponics)
+/turf/open/floor/grass,
+/area/station/service/chapel)
"qMa" = (
/obj/effect/turf_decal/stripes/red/line{
dir = 4
@@ -50359,12 +50454,33 @@
/obj/structure/sign/poster/official/random/directional/north,
/turf/open/floor/iron,
/area/station/hallway/secondary/dock)
+"qMR" = (
+/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/dark_red/half/contrasted{
+ dir = 8
+ },
+/obj/machinery/computer/security/telescreen/isolation/directional/east,
+/obj/machinery/photobooth/security,
+/turf/open/floor/iron,
+/area/station/security/execution/transfer)
"qNj" = (
/turf/open/floor/catwalk_floor/iron,
/area/station/maintenance/department/medical/central)
"qNn" = (
/turf/closed/wall/r_wall,
/area/station/service/abandoned_gambling_den/gaming)
+"qNs" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/turf_decal/siding/wood/corner{
+ dir = 4
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/open/floor/wood/parquet,
+/area/station/service/library)
"qNw" = (
/obj/structure/hedge,
/turf/open/floor/iron/white,
@@ -50396,11 +50512,23 @@
/obj/effect/spawner/random/structure/crate,
/turf/open/floor/iron,
/area/station/maintenance/department/medical/central)
-"qOb" = (
-/obj/structure/flora/bush/sparsegrass,
-/obj/structure/flora/bush/flowers_yw,
-/turf/open/floor/grass,
-/area/station/service/chapel)
+"qOg" = (
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/merge_conflict_marker{
+ name = "---Merge Conflict Marker---";
+
+ desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
+ },
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/aft)
"qOm" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/effect/turf_decal/stripes/corner{
@@ -50408,14 +50536,23 @@
},
/turf/open/floor/plating,
/area/station/commons/storage/tools)
-"qOG" = (
+"qOu" = (
+/obj/structure/cable,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/machinery/door/airlock/maintenance{
+ name = "Maintenance"
+ },
/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
-/obj/effect/turf_decal/siding/wideplating_new/terracotta{
- dir = 1
+/obj/effect/mapping_helpers/airlock/access/any/service/maintenance,
+/obj/effect/mapping_helpers/airlock/unres{
+ dir = 8
},
-/turf/open/floor/wood/tile,
-/area/station/maintenance/central/lesser)
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/plating,
+/area/station/maintenance/port/greater)
"qOJ" = (
/obj/structure/disposalpipe/segment{
dir = 9
@@ -50460,6 +50597,9 @@
},
/turf/open/space/basic,
/area/station/engineering/atmos/space_catwalk)
+"qPp" = (
+/turf/open/floor/iron/smooth,
+/area/station/service/library)
"qPJ" = (
/obj/machinery/status_display/ai/directional/north,
/turf/open/floor/iron,
@@ -50506,6 +50646,16 @@
"qQv" = (
/turf/open/floor/iron,
/area/station/security/prison/rec)
+"qQx" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/turf_decal/tile/dark_red,
+/obj/structure/sign/warning/no_smoking/circle/directional/north,
+/obj/structure/disposalpipe/segment{
+ dir = 6
+ },
+/turf/open/floor/iron,
+/area/station/security)
"qQB" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -50536,17 +50686,6 @@
},
/turf/open/floor/plating,
/area/station/maintenance/port/fore)
-"qQR" = (
-/obj/structure/table/wood,
-/obj/machinery/light/small/directional/south,
-/obj/machinery/computer/security/telescreen/engine/directional/west,
-/obj/machinery/status_display/evac/directional/south,
-/obj/item/radio/off{
- pixel_x = 1;
- pixel_y = 3
- },
-/turf/open/floor/wood,
-/area/station/command/heads_quarters/ce)
"qRh" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 4
@@ -50584,13 +50723,6 @@
/obj/effect/decal/cleanable/cobweb,
/turf/open/floor/iron,
/area/station/security/prison/rec)
-"qRE" = (
-/obj/effect/turf_decal/siding/thinplating_new/light{
- dir = 4
- },
-/obj/effect/landmark/start/botanist,
-/turf/open/floor/iron/white/small,
-/area/station/service/hydroponics)
"qRN" = (
/obj/structure/cable,
/obj/structure/disposalpipe/segment,
@@ -50620,14 +50752,6 @@
/obj/effect/mapping_helpers/broken_floor,
/turf/open/floor/plating,
/area/station/maintenance/port/aft)
-"qSa" = (
-/obj/machinery/door/window/right/directional/north{
- name = "Library Desk Door";
- req_access = list("library")
- },
-/obj/machinery/firealarm/directional/east,
-/turf/open/floor/carpet,
-/area/station/service/library)
"qSh" = (
/obj/structure/cable,
/obj/machinery/firealarm/directional/east,
@@ -50719,6 +50843,16 @@
/obj/effect/spawner/random/structure/crate,
/turf/open/floor/iron,
/area/station/maintenance/port/aft)
+"qTI" = (
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/pdapainter/research,
+/obj/machinery/computer/security/telescreen/rd/directional/north,
+/obj/effect/turf_decal/siding/purple{
+ dir = 5
+ },
+/turf/open/floor/iron/dark,
+/area/station/command/heads_quarters/rd)
"qTJ" = (
/obj/machinery/portable_atmospherics/canister/air,
/turf/open/floor/plating,
@@ -50931,14 +51065,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/white/corner,
/area/station/science/research)
-"qWG" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/fore)
"qWJ" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -50967,17 +51093,6 @@
/obj/effect/mapping_helpers/airlock/access/all/command/general,
/turf/open/floor/catwalk_floor/iron_smooth,
/area/station/ai_monitored/turret_protected/aisat/maint)
-"qWV" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/aft)
"qXb" = (
/obj/effect/turf_decal/siding/wood{
dir = 5
@@ -51056,10 +51171,30 @@
/obj/effect/mapping_helpers/airlock/access/any/medical/maintenance,
/turf/open/floor/plating,
/area/station/maintenance/department/medical/central)
-"qXr" = (
-/obj/structure/water_source/puddle,
-/turf/open/floor/grass,
-/area/station/service/chapel)
+"qXo" = (
+/obj/structure/table,
+/obj/machinery/reagentgrinder{
+ pixel_y = 9;
+ pixel_x = 4
+ },
+/obj/item/reagent_containers/condiment/enzyme{
+ pixel_x = -7;
+ pixel_y = 6
+ },
+/obj/item/reagent_containers/condiment/peppermill{
+ pixel_x = 3
+ },
+/obj/item/reagent_containers/condiment/saltshaker{
+ pixel_x = -3
+ },
+/obj/merge_conflict_marker{
+ name = "---Merge Conflict Marker---";
+
+ desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
+ },
+/obj/structure/table,
+/turf/open/floor/iron/kitchen/small,
+/area/station/service/kitchen)
"qXB" = (
/obj/effect/spawner/structure/window,
/turf/open/floor/plating,
@@ -51082,20 +51217,12 @@
/obj/machinery/camera/autoname/directional/south,
/turf/open/floor/iron/cafeteria,
/area/station/science/breakroom)
-"qXP" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/effect/turf_decal/plaque{
- icon_state = "L8";
- pixel_y = -15
- },
-/obj/effect/turf_decal/trimline/neutral/line,
-/obj/effect/turf_decal/trimline/neutral/line{
- dir = 1
- },
-/obj/effect/landmark/observer_start,
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/aft)
+"qXO" = (
+/obj/machinery/libraryscanner,
+/obj/machinery/camera/autoname/directional/north,
+/obj/machinery/airalarm/directional/north,
+/turf/open/floor/wood/parquet,
+/area/station/service/library)
"qYh" = (
/obj/structure/closet/crate/silvercrate,
/obj/effect/turf_decal/bot_white/left,
@@ -51136,6 +51263,19 @@
/obj/structure/thermoplastic/light,
/turf/open/floor/tram,
/area/station/maintenance/port/aft)
+"qYC" = (
+/mob/living/basic/goat/pete,
+/obj/effect/turf_decal/weather/snow,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+ dir = 4
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 6
+ },
+/obj/structure/cable,
+/obj/effect/turf_decal/weather/snow/corner,
+/turf/open/floor/iron/freezer,
+/area/station/service/kitchen/coldroom)
"qYD" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
/turf/open/floor/iron/showroomfloor,
@@ -51175,21 +51315,6 @@
/obj/effect/landmark/start/scientist,
/turf/open/floor/iron/dark/small,
/area/station/science/xenobiology)
-"qZj" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/item/ammo_casing/spent{
- pixel_x = 5;
- pixel_y = 6
- },
-/obj/item/ammo_casing/spent,
-/obj/item/ammo_casing/spent{
- pixel_x = 4;
- pixel_y = -2
- },
-/obj/effect/turf_decal/tile/neutral,
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/iron,
-/area/station/hallway/primary/port)
"qZm" = (
/obj/structure/lattice/catwalk,
/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
@@ -51215,11 +51340,6 @@
dir = 8
},
/area/station/commons/fitness/locker_room)
-"qZy" = (
-/obj/machinery/door/firedoor,
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/iron/white/small,
-/area/station/medical/medbay/lobby)
"qZE" = (
/obj/machinery/door/airlock/engineering{
name = "Engineering Office"
@@ -51309,6 +51429,13 @@
/obj/effect/mapping_helpers/broken_floor,
/turf/open/floor/wood,
/area/station/service/abandoned_gambling_den)
+"raT" = (
+/obj/machinery/light/floor,
+/obj/structure/flora/bush/flowers_pp,
+/obj/structure/flora/bush/flowers_yw,
+/obj/structure/flora/bush/fullgrass,
+/turf/open/floor/grass,
+/area/station/hallway/primary/central/fore)
"raZ" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -51370,14 +51497,12 @@
},
/turf/open/floor/iron/white,
/area/station/medical/treatment_center)
-"rbW" = (
-/obj/machinery/door/airlock{
- name = "Maintenance"
+"rbY" = (
+/obj/effect/turf_decal/siding/wood/corner{
+ dir = 4
},
-/obj/effect/mapping_helpers/airlock/access/any/security/general,
-/obj/structure/cable,
-/turf/open/floor/plating,
-/area/station/maintenance/central/lesser)
+/turf/open/floor/stone,
+/area/station/service/bar)
"rce" = (
/obj/machinery/camera{
c_tag = "Xenobiology - Cell 3";
@@ -51412,46 +51537,6 @@
/obj/effect/turf_decal/stripes/white/line,
/turf/open/floor/engine,
/area/station/science/xenobiology)
-"rco" = (
-/obj/machinery/shieldgen,
-/obj/item/clothing/gloves/color/black{
- pixel_y = -3;
- pixel_x = -2
- },
-/obj/item/cigarette{
- pixel_x = 6;
- pixel_y = 4
- },
-/obj/item/clothing/mask/gas{
- pixel_y = 5
- },
-/obj/item/clothing/head/cone{
- pixel_x = 1;
- pixel_y = 15
- },
-/turf/open/floor/plating,
-/area/station/maintenance/department/engine)
-"rcE" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/cable,
-/obj/structure/disposalpipe/junction{
- dir = 1
- },
-/turf/open/floor/wood/parquet,
-/area/station/service/library)
-"rcP" = (
-/obj/machinery/door/airlock/public/glass{
- name = "Public Shrine"
- },
-/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/siding/wood/end{
- dir = 4
- },
-/turf/open/floor/stone,
-/area/station/hallway/primary/central/fore)
"rcQ" = (
/obj/item/kirbyplants/random,
/obj/effect/decal/cleanable/dirt,
@@ -51468,16 +51553,6 @@
"rdw" = (
/turf/open/floor/eighties/red,
/area/station/service/abandoned_gambling_den/gaming)
-"rdA" = (
-/obj/machinery/light/small/directional/south,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
- dir = 1
- },
-/obj/effect/turf_decal/siding/wideplating_new/terracotta{
- dir = 6
- },
-/turf/open/floor/wood/tile,
-/area/station/maintenance/central/lesser)
"rdH" = (
/obj/machinery/keycard_auth/directional/south,
/turf/open/floor/mineral/titanium,
@@ -51488,19 +51563,6 @@
},
/turf/open/floor/engine,
/area/station/science/cytology)
-"rdW" = (
-/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/red{
- dir = 6
- },
-/obj/machinery/firealarm/directional/south,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/iron/white/small,
-/area/station/security/warden)
"reg" = (
/obj/structure/cable,
/obj/effect/decal/cleanable/dirt,
@@ -51527,6 +51589,12 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/dark/smooth_large,
/area/station/maintenance/central/lesser)
+"reA" = (
+/obj/effect/spawner/random/trash,
+/obj/structure/cable,
+/obj/structure/disposalpipe/segment,
+/turf/open/floor/plating,
+/area/station/maintenance/central/greater)
"reE" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -51651,10 +51719,6 @@
/obj/item/kirbyplants/random/fullysynthetic,
/turf/open/floor/iron/white,
/area/station/medical/treatment_center)
-"rgM" = (
-/obj/structure/extinguisher_cabinet/directional/west,
-/turf/open/floor/glass,
-/area/station/hallway/primary/central/aft)
"rgS" = (
/obj/structure/railing/corner/end{
dir = 1
@@ -51680,39 +51744,9 @@
/obj/structure/broken_flooring/corner/directional/south,
/turf/open/floor/plating,
/area/station/maintenance/port/aft)
-"rhm" = (
-/obj/machinery/atmospherics/pipe/smart/simple/general/visible{
- dir = 10
- },
-/obj/structure/table,
-/obj/item/cigarette,
-/obj/item/toy/toy_dagger,
-/obj/item/clothing/head/collectable/paper,
-/obj/item/toy/figure/roboticist{
- pixel_x = 6;
- pixel_y = 6
- },
-/obj/item/toy/figure/syndie{
- pixel_y = 5;
- pixel_x = -6
- },
-/obj/item/toy/figure/md{
- pixel_x = 10
- },
-/obj/item/toy/figure/hop{
- pixel_x = 2;
- pixel_y = -2
- },
-/obj/item/toy/figure/ian{
- pixel_x = -5;
- pixel_y = -1
- },
-/obj/item/toy/figure/lawyer{
- pixel_x = -10
- },
-/obj/item/toy/figure/detective,
-/turf/open/floor/plating,
-/area/station/maintenance/port/fore)
+"rhq" = (
+/turf/open/misc/dirt/jungle,
+/area/station/service/chapel)
"rhu" = (
/obj/effect/turf_decal/siding/yellow{
dir = 5
@@ -51764,10 +51798,6 @@
/obj/machinery/door/poddoor/massdriver_chapel,
/turf/open/floor/plating,
/area/station/service/chapel/funeral)
-"rik" = (
-/obj/structure/flora/grass/jungle/b/style_random,
-/turf/open/misc/dirt/jungle,
-/area/station/service/chapel)
"riq" = (
/obj/machinery/atmospherics/pipe/smart/simple/general/visible{
dir = 4
@@ -51782,15 +51812,17 @@
"rir" = (
/turf/open/floor/iron/grimy,
/area/station/commons/vacant_room/office)
-"riS" = (
-/obj/effect/turf_decal/tile/blue/anticorner/contrasted{
- dir = 1
+"riO" = (
+/obj/machinery/computer/slot_machine{
+ pixel_y = 2
},
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
- dir = 8
+/obj/effect/turf_decal/siding/wood{
+ dir = 9
},
-/turf/open/floor/iron/white,
-/area/station/medical/medbay/lobby)
+/obj/structure/extinguisher_cabinet/directional/west,
+/obj/machinery/computer/security/telescreen/entertainment/directional/north,
+/turf/open/floor/stone,
+/area/station/service/bar)
"riV" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -51805,6 +51837,13 @@
/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/iron,
/area/station/hallway/primary/central/fore)
+"rjl" = (
+/obj/structure/cable,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/aft)
"rjo" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -51845,6 +51884,16 @@
},
/turf/open/floor/iron/dark,
/area/station/security/interrogation)
+"rjV" = (
+/obj/effect/turf_decal/weather/dirt{
+ dir = 10
+ },
+/obj/effect/turf_decal/weather/dirt{
+ dir = 9
+ },
+/obj/structure/flora/bush/flowers_pp/style_random,
+/turf/open/floor/grass,
+/area/station/service/chapel)
"rkk" = (
/obj/effect/turf_decal/stripes/line{
dir = 5
@@ -51889,17 +51938,6 @@
/obj/machinery/airalarm/directional/north,
/turf/open/floor/iron/grimy,
/area/station/commons/vacant_room/office)
-"rlh" = (
-/obj/structure/disposalpipe/segment,
-/obj/effect/landmark/start/hangover,
-/obj/effect/turf_decal/trimline/neutral/line{
- dir = 4
- },
-/obj/effect/turf_decal/trimline/neutral/line{
- dir = 8
- },
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/fore)
"rli" = (
/obj/machinery/door/airlock/silver{
name = "Showers"
@@ -51916,21 +51954,6 @@
/obj/structure/sign/warning/directional/north,
/turf/open/floor/iron,
/area/station/engineering/atmospherics_engine)
-"rlq" = (
-/obj/structure/bed{
- dir = 4
- },
-/obj/effect/spawner/random/bedsheet{
- dir = 4
- },
-/obj/machinery/button/door/directional/north{
- id = "Cabin3";
- name = "Cabin Bolt Control";
- normaldoorcontrol = 1;
- specialfunctions = 4
- },
-/turf/open/floor/carpet/blue,
-/area/station/commons/dorms)
"rlr" = (
/turf/closed/wall,
/area/station/medical/storage)
@@ -51952,13 +51975,6 @@
/obj/machinery/camera/autoname/directional/north,
/turf/open/floor/iron/dark,
/area/station/science/ordnance/testlab)
-"rmk" = (
-/obj/effect/turf_decal/weather/dirt,
-/obj/structure/flora/bush/jungle/c/style_3{
- pixel_x = -7
- },
-/turf/open/floor/grass,
-/area/station/service/chapel)
"rmD" = (
/obj/machinery/door/firedoor,
/obj/effect/mapping_helpers/airlock/access/any/engineering/general,
@@ -51991,15 +52007,6 @@
/obj/machinery/firealarm/directional/north,
/turf/open/floor/iron/dark/herringbone,
/area/station/security/courtroom)
-"rnr" = (
-/obj/effect/turf_decal/weather/dirt{
- dir = 1
- },
-/obj/structure/flora/bush/jungle/c/style_3{
- pixel_x = 8
- },
-/turf/open/floor/grass,
-/area/station/service/chapel)
"rnD" = (
/obj/effect/spawner/structure/window,
/turf/open/floor/plating,
@@ -52092,6 +52099,10 @@
},
/turf/open/floor/plating,
/area/station/maintenance/central/greater)
+"rph" = (
+/obj/machinery/holopad,
+/turf/open/floor/iron/kitchen/small,
+/area/station/service/kitchen)
"rpi" = (
/obj/structure/lattice/catwalk,
/turf/open/space/basic,
@@ -52099,47 +52110,11 @@
"rpk" = (
/turf/open/floor/iron/white,
/area/station/science/research)
-"rpo" = (
-/obj/machinery/light/floor,
-/turf/open/floor/iron/kitchen/small,
-/area/station/service/kitchen)
"rpq" = (
/obj/machinery/camera/autoname/directional/east,
/obj/machinery/airalarm/directional/east,
/turf/open/floor/iron/smooth,
/area/station/security/evidence)
-"rpv" = (
-/obj/structure/chair/sofa/bench/left{
- dir = 8
- },
-/obj/effect/turf_decal/tile/blue,
-/turf/open/floor/iron/dark/side{
- dir = 4
- },
-/area/station/hallway/primary/central/fore)
-"rpB" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/obj/structure/sign/departments/holy/directional/north,
-/obj/machinery/camera/directional/north,
-/turf/open/floor/iron,
-/area/station/hallway/primary/port)
-"rpE" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/landmark/navigate_destination/chapel,
-/obj/structure/disposalpipe/segment{
- dir = 10
- },
-/turf/open/floor/iron,
-/area/station/hallway/primary/port)
-"rpF" = (
-/obj/structure/flora/tree/jungle/small/style_4,
-/obj/effect/turf_decal/weather/dirt,
-/turf/open/floor/grass,
-/area/station/service/chapel)
"rpV" = (
/obj/effect/spawner/random/structure/crate,
/obj/effect/spawner/random/maintenance,
@@ -52152,6 +52127,15 @@
/obj/item/radio/intercom/directional/west,
/turf/open/floor/iron/smooth,
/area/station/hallway/secondary/command)
+"rqe" = (
+/obj/structure/sink/directional/west,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+ dir = 8
+ },
+/obj/machinery/camera/autoname/directional/north,
+/obj/machinery/light/cold/directional/north,
+/turf/open/floor/iron/dark/small,
+/area/station/service/chapel/storage)
"rqm" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/dark/small,
@@ -52180,13 +52164,6 @@
},
/turf/open/floor/iron,
/area/station/commons/fitness/locker_room)
-"rqF" = (
-/obj/effect/turf_decal/weather/dirt{
- dir = 1
- },
-/obj/structure/flora/bush/large/style_3,
-/turf/open/floor/grass,
-/area/station/service/chapel)
"rqR" = (
/obj/machinery/door/airlock/external/glass,
/obj/effect/mapping_helpers/airlock/cyclelink_helper,
@@ -52212,6 +52189,21 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/catwalk_floor/iron_dark,
/area/station/science/xenobiology)
+"rri" = (
+/obj/effect/turf_decal/weather/dirt{
+ dir = 6
+ },
+/mob/living/basic/frog,
+/obj/structure/flora/bush/flowers_br/style_3,
+/obj/structure/flora/tree/jungle/small,
+/turf/open/floor/grass,
+/area/station/service/chapel)
+"rrl" = (
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/aft)
"rro" = (
/obj/structure/railing,
/obj/structure/disposalpipe/segment{
@@ -52259,12 +52251,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/dark,
/area/station/service/lawoffice)
-"rrX" = (
-/obj/effect/turf_decal/siding/wood/corner{
- dir = 4
- },
-/turf/open/floor/stone,
-/area/station/service/bar)
"rrZ" = (
/obj/structure/closet/crate/trashcart,
/obj/effect/spawner/random/trash/garbage,
@@ -52348,6 +52334,13 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/wood/large,
/area/station/command/heads_quarters/captain)
+"rtm" = (
+/obj/effect/landmark/start/hangover,
+/obj/effect/turf_decal/siding/wood{
+ dir = 8
+ },
+/turf/open/floor/stone,
+/area/station/service/chapel)
"rto" = (
/obj/effect/turf_decal/siding/thinplating_new/terracotta{
dir = 1
@@ -52356,11 +52349,6 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
/turf/open/floor/iron/small,
/area/station/ai_monitored/command/storage/eva)
-"rtI" = (
-/turf/open/floor/iron/white/corner{
- dir = 8
- },
-/area/station/science/xenobiology)
"rtQ" = (
/turf/closed/wall/r_wall,
/area/station/security/tram)
@@ -52420,37 +52408,49 @@
"ruD" = (
/turf/open/floor/plating,
/area/station/maintenance/starboard/lesser)
+"ruF" = (
+/obj/effect/turf_decal/siding/wood/corner,
+/turf/open/floor/stone,
+/area/station/service/chapel)
"ruS" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/turf_decal/siding/wood/corner{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/wood,
+/turf/open/floor/stone,
+/area/station/service/bar)
+"ruX" = (
+/obj/machinery/door/airlock/public/glass{
+ name = "Public Shrine"
+ },
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/disposalpipe/sorting/mail{
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/door/firedoor,
+/obj/effect/turf_decal/siding/wood/end{
dir = 4
},
-/obj/effect/mapping_helpers/mail_sorting/service/kitchen,
-/turf/open/floor/plating,
-/area/station/maintenance/central/greater)
+/turf/open/floor/stone,
+/area/station/hallway/primary/central/fore)
"ruY" = (
/turf/open/floor/plating,
/area/station/maintenance/fore/lesser)
"rvp" = (
/turf/closed/mineral/random/stationside,
/area/station/maintenance/hallway/abandoned_command)
-"rvr" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/airalarm/directional/west,
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/fore)
"rvs" = (
/obj/effect/turf_decal/stripes/white/line,
/obj/item/stack/sheet/mineral/titanium,
/obj/machinery/light/small/directional/south,
/turf/open/floor/tram,
/area/station/maintenance/department/medical/central)
+"rvx" = (
+/obj/effect/turf_decal/tile/brown/opposingcorners{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron,
+/area/station/commons/vacant_room/commissary)
"rvz" = (
/obj/machinery/gravity_generator/main,
/obj/effect/turf_decal/bot_white,
@@ -52553,13 +52553,6 @@
/obj/machinery/camera/autoname/directional/east,
/turf/open/floor/plating,
/area/station/maintenance/department/prison)
-"rxa" = (
-/obj/effect/turf_decal/siding/wood{
- dir = 6
- },
-/obj/structure/mannequin/plastic,
-/turf/open/floor/carpet/blue,
-/area/station/cargo/boutique)
"rxo" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -52633,12 +52626,6 @@
},
/turf/open/floor/iron/smooth,
/area/station/hallway/secondary/command)
-"rya" = (
-/obj/effect/turf_decal/weather/dirt{
- dir = 10
- },
-/turf/open/floor/grass,
-/area/station/service/chapel)
"ryi" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -52673,11 +52660,23 @@
/obj/machinery/door/firedoor,
/turf/open/floor/iron/dark,
/area/station/medical/medbay/aft)
-"ryW" = (
-/obj/machinery/camera/autoname/directional/east,
-/obj/effect/turf_decal/tile/neutral,
+"ryQ" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/turf_decal/tile/dark_red/fourcorners,
+/obj/effect/turf_decal/siding/wideplating/dark/corner{
+ dir = 1
+ },
+/obj/machinery/power/apc/auto_name/directional/north,
/turf/open/floor/iron,
-/area/station/hallway/primary/central/aft)
+/area/station/security/brig/entrance)
+"ryX" = (
+/obj/structure/cable,
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/plating,
+/area/station/maintenance/port/greater)
"rza" = (
/obj/structure/disposalpipe/junction{
dir = 1
@@ -52698,25 +52697,20 @@
},
/turf/open/floor/iron,
/area/station/commons/dorms)
-"rzy" = (
-/obj/effect/turf_decal/plaque{
- icon_state = "L9";
- pixel_y = -15
+"rzw" = (
+/obj/structure/extinguisher_cabinet/directional/east,
+/obj/effect/turf_decal/tile/neutral/opposingcorners{
+ dir = 1
},
-/obj/effect/turf_decal/tile/neutral{
+/obj/effect/turf_decal/siding/thinplating_new{
dir = 4
},
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/aft)
-"rzH" = (
-/obj/effect/mapping_helpers/airlock/access/all/service/kitchen,
-/obj/machinery/door/airlock/freezer{
- name = "Freezer"
+/obj/machinery/computer/order_console/cook{
+ dir = 8
},
-/obj/structure/disposalpipe/segment,
-/obj/structure/cable,
-/turf/open/floor/iron/freezer,
-/area/station/service/kitchen/coldroom)
+/obj/effect/turf_decal/delivery,
+/turf/open/floor/iron/small,
+/area/station/hallway/secondary/service)
"rzJ" = (
/obj/structure/chair/sofa/bench/left{
dir = 4
@@ -52764,6 +52758,10 @@
/mob/living/carbon/human/species/monkey,
/turf/open/floor/grass,
/area/station/medical/virology)
+"rAB" = (
+/obj/structure/flora/tree/jungle/style_2,
+/turf/open/floor/grass,
+/area/station/service/chapel)
"rAC" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -52805,6 +52803,14 @@
/obj/effect/mapping_helpers/airlock/access/all/security/general,
/turf/open/floor/iron/textured_half,
/area/station/security/brig/entrance)
+"rAV" = (
+/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 = 1
+ },
+/turf/open/floor/stone,
+/area/station/service/chapel)
"rBe" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -52873,6 +52879,10 @@
/obj/machinery/camera/autoname/directional/north,
/turf/open/floor/iron,
/area/station/hallway/primary/starboard)
+"rBL" = (
+/obj/item/radio/intercom/directional/west,
+/turf/open/floor/glass,
+/area/station/hallway/primary/central/aft)
"rBO" = (
/obj/structure/disposalpipe/segment{
dir = 9
@@ -52906,10 +52916,26 @@
dir = 1
},
/area/station/security/execution/transfer)
+"rCm" = (
+/obj/effect/landmark/start/bartender,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/wood,
+/turf/open/floor/stone,
+/area/station/service/bar/backroom)
"rCv" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/station/hallway/secondary/exit/departure_lounge)
+"rCG" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/turf_decal/tile/neutral,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/fore)
"rCS" = (
/obj/structure/chair/stool/bar/directional/west,
/obj/effect/decal/cleanable/dirt,
@@ -52951,16 +52977,6 @@
dir = 4
},
/area/station/hallway/secondary/entry)
-"rDv" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/light/cold/directional/west,
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/obj/machinery/firealarm/directional/west,
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/fore)
"rDD" = (
/obj/structure/railing{
dir = 1
@@ -53010,13 +53026,13 @@
"rEd" = (
/turf/open/floor/iron,
/area/station/maintenance/fore/greater)
-"rEF" = (
-/obj/machinery/photocopier,
-/obj/structure/sign/painting/library{
- pixel_y = 32
+"rEl" = (
+/obj/effect/turf_decal/tile/blue/half/contrasted{
+ dir = 1
},
-/turf/open/floor/wood/parquet,
-/area/station/service/library)
+/obj/structure/disposalpipe/segment,
+/turf/open/floor/iron/white,
+/area/station/medical/medbay/lobby)
"rEH" = (
/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{
dir = 4
@@ -53028,14 +53044,13 @@
/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos,
/turf/open/floor/catwalk_floor,
/area/station/engineering/atmos)
-"rEJ" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/camera/directional/east,
-/obj/machinery/status_display/evac/directional/east,
-/obj/effect/turf_decal/tile/neutral,
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/fore)
+"rEO" = (
+/obj/structure/flora/bush/flowers_pp/style_random,
+/obj/effect/turf_decal/weather/dirt{
+ dir = 4
+ },
+/turf/open/floor/grass,
+/area/station/service/chapel)
"rEY" = (
/obj/effect/turf_decal/tile/blue,
/obj/machinery/pdapainter{
@@ -53078,6 +53093,22 @@
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
/turf/open/floor/iron,
/area/station/hallway/secondary/entry)
+"rFj" = (
+/obj/structure/table,
+/obj/machinery/recharger{
+ pixel_x = 6;
+ pixel_y = 9
+ },
+/obj/item/multitool{
+ pixel_x = -6;
+ pixel_y = 3
+ },
+/obj/item/cigarette{
+ pixel_x = 5;
+ pixel_y = 2
+ },
+/turf/open/floor/iron/dark,
+/area/station/security/lockers)
"rFn" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/effect/turf_decal/tile/neutral,
@@ -53184,6 +53215,14 @@
/obj/effect/turf_decal/delivery/white,
/turf/open/floor/iron,
/area/station/cargo/sorting)
+"rGr" = (
+/obj/effect/turf_decal/stripes/line,
+/obj/machinery/computer/security/telescreen/turbine/directional/south,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+ dir = 1
+ },
+/turf/open/floor/iron/smooth,
+/area/station/maintenance/disposal/incinerator)
"rGB" = (
/obj/structure/cable,
/obj/structure/disposalpipe/segment,
@@ -53192,6 +53231,18 @@
/obj/structure/steam_vent,
/turf/open/floor/plating,
/area/station/maintenance/port/lesser)
+"rGE" = (
+/obj/structure/table/wood,
+/obj/item/pai_card,
+/obj/item/storage/crayons,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/firealarm/directional/north,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/open/floor/wood/parquet,
+/area/station/service/library)
"rGI" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -53234,6 +53285,28 @@
/obj/effect/landmark/generic_maintenance_landmark,
/turf/open/floor/iron/smooth,
/area/station/maintenance/solars/starboard/aft)
+"rHC" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/light/small/directional/west,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/machinery/status_display/ai/directional/west,
+/obj/structure/disposalpipe/segment,
+/obj/merge_conflict_marker{
+ name = "---Merge Conflict Marker---";
+
+ desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/machinery/status_display/ai/directional/west,
+/obj/structure/disposalpipe/segment,
+/obj/machinery/light/cold/directional/west,
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/fore)
"rHD" = (
/obj/structure/chair/office{
dir = 4
@@ -53263,12 +53336,6 @@
/obj/machinery/light/small/directional/west,
/turf/open/floor/iron,
/area/station/maintenance/hallway/abandoned_command)
-"rHY" = (
-/obj/effect/turf_decal/siding/wideplating_new/terracotta{
- dir = 1
- },
-/turf/open/floor/wood/tile,
-/area/station/maintenance/central/lesser)
"rIb" = (
/obj/effect/turf_decal/tile/dark_red/opposingcorners,
/obj/structure/closet/secure_closet/security/sec,
@@ -53277,6 +53344,16 @@
/obj/structure/reagent_dispensers/wall/peppertank/directional/north,
/turf/open/floor/iron,
/area/station/security/lockers)
+"rIe" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/turf_decal/trimline/neutral/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/neutral/line,
+/obj/structure/disposalpipe/segment,
+/obj/structure/cable,
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/fore)
"rIn" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/effect/turf_decal/tile/neutral{
@@ -53303,6 +53380,14 @@
},
/turf/open/floor/carpet/blue,
/area/station/cargo/boutique)
+"rJp" = (
+/obj/effect/turf_decal/weather/dirt{
+ dir = 1
+ },
+/obj/structure/flora/bush/flowers_br/style_3,
+/obj/machinery/firealarm/directional/north,
+/turf/open/floor/grass,
+/area/station/service/chapel)
"rJs" = (
/obj/machinery/atmospherics/pipe/smart/simple/general/visible,
/obj/effect/decal/cleanable/dirt,
@@ -53319,14 +53404,34 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/checker,
/area/station/command/heads_quarters/hos)
-"rJZ" = (
-/obj/effect/turf_decal/trimline/neutral/line{
+"rKo" = (
+/obj/machinery/computer/security/telescreen/isolation/directional/north{
+ name = "reflection room monitor"
+ },
+/obj/effect/turf_decal/stripes/white/corner{
dir = 1
},
-/obj/effect/turf_decal/trimline/neutral/line,
-/obj/structure/cable,
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/fore)
+/obj/item/kirbyplants/random,
+/obj/machinery/firealarm/directional/east,
+/obj/machinery/button/flasher{
+ id = "IsolationFlash";
+ pixel_x = 28;
+ pixel_y = 28
+ },
+/turf/open/floor/iron/dark/small,
+/area/station/security/execution/education)
+"rKu" = (
+/obj/structure/flora/bush/flowers_yw/style_3{
+ pixel_x = 3;
+ pixel_y = 2
+ },
+/obj/machinery/light/floor,
+/obj/effect/light_emitter/fake_outdoors,
+/obj/effect/turf_decal/siding/wood{
+ dir = 10
+ },
+/turf/open/floor/grass/Airless,
+/area/station/hallway/primary/central/aft)
"rKv" = (
/obj/structure/broken_flooring/singular/directional/east,
/turf/open/floor/iron,
@@ -53397,17 +53502,16 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/commons/dorms)
-"rLA" = (
-/obj/structure/disposalpipe/segment,
+"rLz" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/effect/turf_decal/tile/neutral,
-/obj/machinery/door/firedoor,
-/obj/effect/turf_decal/stripes/red/line,
-/obj/effect/turf_decal/stripes/red/line{
- dir = 1
- },
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron/small,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 10
+ },
+/turf/open/floor/iron,
/area/station/hallway/primary/central/fore)
"rLK" = (
/obj/machinery/hydroponics/soil{
@@ -53540,20 +53644,14 @@
/obj/effect/spawner/random/entertainment/arcade,
/turf/open/floor/iron/cafeteria,
/area/station/security/prison/mess)
-"rNL" = (
-/obj/effect/turf_decal/siding/wood{
- dir = 4
- },
-/obj/structure/displaycase/trophy,
-/turf/open/floor/wood/parquet,
-/area/station/service/library)
-"rNN" = (
-/obj/effect/landmark/start/hangover,
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
+"rNP" = (
+/obj/structure/flora/tree/jungle/small/style_4,
+/obj/structure/flora/grass/jungle/b/style_random{
+ pixel_y = -3;
+ pixel_x = 3
},
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/aft)
+/turf/open/floor/grass,
+/area/station/service/chapel)
"rOG" = (
/obj/structure/cable,
/obj/structure/disposalpipe/segment,
@@ -53593,6 +53691,12 @@
},
/turf/open/floor/iron/smooth_large,
/area/station/science/robotics/mechbay)
+"rPu" = (
+/obj/structure/cable,
+/obj/machinery/power/apc/auto_name/directional/east,
+/obj/machinery/exodrone_launcher,
+/turf/open/floor/iron/smooth,
+/area/station/cargo/drone_bay)
"rPx" = (
/obj/effect/turf_decal/siding/thinplating_new/dark{
dir = 1
@@ -53620,26 +53724,6 @@
},
/turf/open/floor/iron/white/small,
/area/station/medical/psychology)
-"rPA" = (
-/obj/structure/cable,
-/obj/structure/disposalpipe/segment,
-/obj/machinery/door/firedoor,
-/obj/effect/turf_decal/stripes/red/line,
-/obj/effect/turf_decal/stripes/red/line{
- dir = 1
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/iron/small,
-/area/station/hallway/primary/central/fore)
-"rPL" = (
-/obj/structure/cable,
-/obj/structure/disposalpipe/segment{
- dir = 6
- },
-/turf/open/floor/plating,
-/area/station/maintenance/port/lesser)
"rPT" = (
/obj/structure/chair/stool/bar/directional/east,
/obj/effect/turf_decal/siding/red/corner{
@@ -53669,19 +53753,6 @@
/obj/structure/sign/poster/official/random/directional/west,
/turf/open/floor/iron,
/area/station/engineering/main)
-"rPW" = (
-/obj/effect/turf_decal/weather/dirt,
-/obj/structure/flora/bush/flowers_br/style_random,
-/turf/open/floor/grass,
-/area/station/service/chapel)
-"rPX" = (
-/obj/effect/turf_decal/siding/wood,
-/obj/effect/turf_decal/siding/wood/corner{
- dir = 4
- },
-/obj/machinery/holopad,
-/turf/open/floor/stone,
-/area/station/service/bar)
"rQi" = (
/turf/closed/wall/r_wall,
/area/station/engineering/main)
@@ -53689,10 +53760,6 @@
/obj/structure/lattice,
/turf/open/space/basic,
/area/station/engineering/atmos/space_catwalk)
-"rQw" = (
-/obj/machinery/light/small/directional/north,
-/turf/open/floor/engine,
-/area/station/science/xenobiology)
"rQA" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -53765,6 +53832,14 @@
dir = 1
},
/area/station/security/courtroom)
+"rRj" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/wood,
+/obj/effect/spawner/random/vending/colavend,
+/turf/open/floor/stone,
+/area/station/service/bar)
"rRq" = (
/obj/structure/cable,
/obj/effect/turf_decal/tile/dark_red/opposingcorners,
@@ -53784,6 +53859,16 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/security/courtroom)
+"rRJ" = (
+/obj/effect/mapping_helpers/airlock/access/any/service/hydroponics,
+/obj/machinery/door/airlock/hydroponics/glass{
+ name = "Hydroponics"
+ },
+/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/textured_half,
+/area/station/service/hydroponics)
"rRQ" = (
/obj/structure/hedge,
/obj/item/radio/intercom/directional/south,
@@ -53799,6 +53884,15 @@
},
/turf/open/floor/iron/smooth,
/area/station/security/checkpoint/escape)
+"rSp" = (
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/open/floor/iron/white,
+/area/station/medical/medbay/lobby)
"rSt" = (
/obj/structure/disposalpipe/segment{
dir = 9
@@ -53843,6 +53937,12 @@
/obj/effect/mapping_helpers/broken_floor,
/turf/open/floor/wood/tile,
/area/station/command/corporate_showroom)
+"rSP" = (
+/obj/structure/cable,
+/obj/machinery/power/apc/auto_name/directional/west,
+/obj/structure/disposalpipe/segment,
+/turf/open/floor/wood,
+/area/station/cargo/boutique)
"rST" = (
/turf/closed/wall,
/area/station/cargo/storage)
@@ -53857,18 +53957,6 @@
},
/turf/open/floor/iron/smooth,
/area/station/engineering/main)
-"rTl" = (
-/obj/structure/disposalpipe/segment,
-/obj/effect/turf_decal/trimline/neutral/line{
- dir = 4
- },
-/obj/effect/turf_decal/trimline/neutral/line{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/fore)
"rTq" = (
/obj/machinery/photocopier,
/obj/effect/decal/cleanable/dirt,
@@ -53907,6 +53995,18 @@
/obj/item/radio/intercom/directional/west,
/turf/open/floor/iron,
/area/station/cargo/sorting)
+"rTG" = (
+/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/tile/neutral/opposingcorners{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/thinplating_new{
+ dir = 8
+ },
+/turf/open/floor/iron/small,
+/area/station/hallway/secondary/service)
"rTJ" = (
/obj/effect/turf_decal/trimline/blue/filled/corner{
dir = 4
@@ -54011,6 +54111,16 @@
dir = 4
},
/area/station/science/lobby)
+"rUO" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/disposalpipe/sorting/mail{
+ dir = 4
+ },
+/obj/effect/mapping_helpers/mail_sorting/service/kitchen,
+/turf/open/floor/plating,
+/area/station/maintenance/central/greater)
"rUR" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/spawner/random/structure/table_or_rack,
@@ -54039,15 +54149,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/dark,
/area/station/security/prison/safe)
-"rVt" = (
-/obj/effect/turf_decal/siding/wood{
- dir = 8
- },
-/obj/structure/chair/wood{
- dir = 4
- },
-/turf/open/floor/wood/tile,
-/area/station/service/bar)
"rVy" = (
/obj/effect/turf_decal/stripes/red/line{
dir = 4
@@ -54101,6 +54202,12 @@
},
/turf/open/floor/iron/dark,
/area/station/security/processing)
+"rWj" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 4
+ },
+/turf/open/floor/stone,
+/area/station/service/chapel)
"rWm" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -54109,17 +54216,6 @@
dir = 4
},
/area/station/science/lobby)
-"rWr" = (
-/obj/structure/table,
-/obj/item/stock_parts/matter_bin{
- pixel_x = 6;
- pixel_y = 15
- },
-/obj/item/stock_parts/matter_bin{
- pixel_y = 5
- },
-/turf/open/floor/iron/dark,
-/area/station/science/lab)
"rWs" = (
/obj/effect/turf_decal/siding/brown{
dir = 5
@@ -54198,6 +54294,22 @@
/obj/effect/spawner/random/maintenance,
/turf/open/floor/iron,
/area/station/maintenance/port/aft)
+"rXh" = (
+/obj/effect/turf_decal/tile/neutral/opposingcorners,
+/obj/effect/spawner/random/entertainment/arcade{
+ dir = 1
+ },
+/turf/open/floor/iron,
+/area/station/holodeck/rec_center)
+"rXm" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/cable,
+/obj/machinery/light/small/directional/south,
+/obj/machinery/status_display/ai/directional/south,
+/obj/effect/turf_decal/tile/neutral,
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/aft)
"rXv" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
/turf/open/floor/iron,
@@ -54206,13 +54318,6 @@
/obj/structure/reagent_dispensers/watertank,
/turf/open/floor/plating,
/area/station/maintenance/port/greater)
-"rXy" = (
-/obj/structure/cable,
-/obj/structure/disposalpipe/segment{
- dir = 6
- },
-/turf/open/floor/plating,
-/area/station/maintenance/central/greater)
"rXM" = (
/obj/structure/cable,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
@@ -54220,14 +54325,33 @@
},
/turf/open/floor/iron,
/area/station/engineering/storage/tech)
-"rXO" = (
-/obj/effect/mapping_helpers/airlock/access/any/service/maintenance,
-/obj/machinery/door/airlock{
- name = "Maintenance"
+"rXN" = (
+/obj/structure/cable,
+/obj/structure/disposalpipe/segment{
+ dir = 6
},
-/obj/effect/mapping_helpers/airlock/unres,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/spawner/random/structure/steam_vent,
/turf/open/floor/plating,
-/area/station/maintenance/central/greater)
+/area/station/maintenance/port/greater)
+"rXP" = (
+/obj/effect/turf_decal/tile/neutral/opposingcorners,
+/obj/structure/chair/stool/bar/directional/south,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/iron,
+/area/station/holodeck/rec_center)
+"rXS" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/turf_decal/tile/dark_red/half/contrasted{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/wideplating/dark/corner{
+ dir = 4
+ },
+/turf/open/floor/iron,
+/area/station/security/brig/entrance)
"rXW" = (
/obj/structure/flora/bush/flowers_yw,
/obj/machinery/door/window/left/directional/west{
@@ -54261,13 +54385,6 @@
"rYp" = (
/turf/open/floor/iron/dark/small,
/area/station/tcommsat/server)
-"rYs" = (
-/obj/effect/turf_decal/weather/dirt{
- dir = 6
- },
-/obj/structure/flora/bush/flowers_yw/style_3,
-/turf/open/floor/grass,
-/area/station/service/chapel)
"rYt" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 8
@@ -54286,13 +54403,6 @@
/obj/machinery/door/firedoor,
/turf/open/floor/iron,
/area/station/security/prison/workout)
-"rYJ" = (
-/obj/machinery/skill_station,
-/obj/structure/sign/painting/library{
- pixel_x = 30
- },
-/turf/open/floor/wood/parquet,
-/area/station/service/library)
"rYL" = (
/obj/effect/turf_decal/tile/yellow/opposingcorners,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -54303,12 +54413,6 @@
/obj/structure/extinguisher_cabinet/directional/south,
/turf/open/floor/iron,
/area/station/command/heads_quarters/ce)
-"rZb" = (
-/obj/structure/disposalpipe/segment{
- dir = 6
- },
-/turf/open/floor/plating,
-/area/station/maintenance/port/greater)
"rZc" = (
/obj/machinery/holopad,
/obj/effect/turf_decal/box/white{
@@ -54344,6 +54448,44 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/central/fore)
+"rZt" = (
+/obj/structure/table/reinforced,
+/obj/machinery/door/firedoor/border_only{
+ dir = 4
+ },
+/obj/item/reagent_containers/cup/bowl{
+ pixel_y = 3
+ },
+/obj/item/reagent_containers/cup/bowl{
+ pixel_y = 8;
+ pixel_x = 3
+ },
+/obj/machinery/door/poddoor/shutters{
+ name = "Kitchen Shutters";
+ id = "kitchenshutters"
+ },
+/obj/merge_conflict_marker{
+ name = "---Merge Conflict Marker---";
+
+ desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
+ },
+/obj/structure/table/reinforced,
+/obj/machinery/door/firedoor/border_only{
+ dir = 4
+ },
+/obj/item/reagent_containers/cup/bowl{
+ pixel_y = 3
+ },
+/obj/item/reagent_containers/cup/bowl{
+ pixel_y = 8;
+ pixel_x = 3
+ },
+/obj/machinery/door/poddoor/shutters/preopen{
+ id = "kitchenshutters";
+ name = "Kitchen Shutters"
+ },
+/turf/open/floor/plating,
+/area/station/service/kitchen)
"rZu" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -54359,17 +54501,6 @@
},
/turf/open/floor/iron/dark,
/area/station/service/lawoffice)
-"rZz" = (
-/obj/structure/cable,
-/obj/effect/turf_decal/trimline/neutral/line,
-/obj/effect/turf_decal/trimline/neutral/line{
- dir = 1
- },
-/obj/structure/disposalpipe/segment{
- dir = 10
- },
-/turf/open/floor/iron,
-/area/station/hallway/primary/port)
"rZG" = (
/obj/structure/closet/crate/trashcart,
/obj/effect/spawner/random/trash/food_packaging,
@@ -54384,15 +54515,6 @@
/obj/item/clothing/glasses/eyepatch/medical,
/turf/open/floor/carpet/orange,
/area/station/commons/dorms)
-"sar" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/obj/machinery/camera/autoname/directional/west,
-/obj/machinery/firealarm/directional/west,
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/fore)
"sas" = (
/obj/effect/turf_decal/siding/wood,
/turf/open/floor/carpet/blue,
@@ -54409,18 +54531,17 @@
},
/turf/open/floor/iron,
/area/station/engineering/atmos/pumproom)
-"saz" = (
-/obj/machinery/status_display/ai/directional/west,
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
+"saT" = (
+/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/mining{
+ name = "Drone Bay"
},
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/aft)
-"saL" = (
-/obj/effect/turf_decal/siding/wood,
-/obj/machinery/light/small/directional/west,
-/turf/open/floor/wood/parquet,
-/area/station/service/library)
+/obj/effect/mapping_helpers/airlock/access/any/supply/maintenance,
+/obj/machinery/door/firedoor,
+/turf/open/floor/plating,
+/area/station/cargo/drone_bay)
"saY" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -54538,21 +54659,25 @@
/obj/machinery/light/small/broken/directional/south,
/turf/open/floor/iron,
/area/station/maintenance/starboard/aft)
-"scR" = (
-/obj/effect/turf_decal/siding/wood{
- dir = 8
- },
-/obj/effect/landmark/start/assistant,
-/turf/open/floor/wood/tile,
-/area/station/service/bar)
-"scY" = (
+"scG" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/cable,
+/obj/structure/extinguisher_cabinet/directional/north,
/obj/structure/disposalpipe/segment{
dir = 4
},
-/turf/open/floor/wood,
-/area/station/cargo/boutique)
+/turf/open/floor/wood/parquet,
+/area/station/service/library)
+"sda" = (
+/obj/structure/chair{
+ dir = 1
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 5
+ },
+/turf/open/floor/iron/white,
+/area/station/medical/medbay/lobby)
"sdf" = (
/obj/item/kirbyplants/random/fullysynthetic,
/obj/machinery/light_switch/directional/east,
@@ -54579,17 +54704,17 @@
/obj/effect/spawner/random/engineering/tracking_beacon,
/turf/open/floor/iron/smooth,
/area/station/engineering/supermatter/room)
-"sem" = (
-/obj/machinery/door/airlock{
- name = "Kitchen"
+"sek" = (
+/obj/effect/turf_decal/tile/dark_red/half/contrasted{
+ dir = 4
+ },
+/mob/living/simple_animal/bot/secbot/beepsky/officer,
+/obj/effect/turf_decal/siding/wideplating/dark/corner{
+ dir = 8
},
-/obj/effect/mapping_helpers/airlock/access/all/service/kitchen,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/cable,
/obj/structure/disposalpipe/segment,
-/turf/open/floor/plating,
-/area/station/maintenance/central/greater)
+/turf/open/floor/iron,
+/area/station/security)
"ser" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -54606,6 +54731,13 @@
/obj/machinery/light/small/directional/north,
/turf/open/floor/wood/parquet,
/area/station/command/heads_quarters/cmo)
+"sez" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/spawner/random/structure/steam_vent,
+/turf/open/floor/plating,
+/area/station/maintenance/port/greater)
"seM" = (
/obj/effect/turf_decal/stripes/red/line{
dir = 4
@@ -54619,12 +54751,28 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/maintenance/fore/greater)
+"seS" = (
+/obj/machinery/door/firedoor,
+/turf/open/floor/iron/textured_half,
+/area/station/service/bar)
"seV" = (
/obj/structure/transit_tube/horizontal,
/obj/structure/lattice/catwalk,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/space/basic,
/area/space/nearstation)
+"seY" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/structure/cable,
+/obj/structure/disposalpipe/segment{
+ dir = 9
+ },
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/fore)
"sfd" = (
/obj/effect/turf_decal/siding/blue{
dir = 10
@@ -54651,11 +54799,6 @@
dir = 1
},
/area/station/science/research)
-"sfu" = (
-/obj/effect/turf_decal/tile/dark_red/opposingcorners,
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/iron,
-/area/station/security/brig/entrance)
"sfF" = (
/obj/machinery/door/airlock/engineering{
name = "Engineering Office"
@@ -54677,20 +54820,47 @@
dir = 8
},
/area/station/engineering/main)
-"sfU" = (
-/obj/machinery/light/small/directional/south,
-/obj/machinery/camera/autoname/directional/south,
-/obj/effect/turf_decal/siding/wood{
- dir = 1
- },
-/obj/effect/turf_decal/siding/wood,
-/turf/open/floor/stone,
-/area/station/service/bar)
+"sgb" = (
+/obj/item/radio/intercom/directional/south,
+/obj/effect/turf_decal/siding/wideplating_new/terracotta,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/mapping_helpers/broken_floor,
+/turf/open/floor/wood/tile,
+/area/station/maintenance/central/lesser)
"sge" = (
/obj/structure/reagent_dispensers/beerkeg,
/obj/item/clothing/head/costume/festive,
/turf/open/floor/plating,
/area/station/maintenance/starboard/greater)
+"sgg" = (
+/obj/structure/table/wood,
+/obj/item/paper_bin{
+ pixel_x = -2;
+ pixel_y = 4
+ },
+/obj/item/pen{
+ pixel_x = -2;
+ pixel_y = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/disposalpipe/segment{
+ dir = 6
+ },
+/obj/machinery/light/small/directional/north,
+/obj/structure/sign/painting/library{
+ pixel_y = 32
+ },
+/turf/open/floor/wood/parquet,
+/area/station/service/library)
+"sgp" = (
+/obj/effect/turf_decal/siding/wood,
+/obj/effect/turf_decal/siding/wood{
+ dir = 1
+ },
+/obj/effect/landmark/start/hangover,
+/turf/open/floor/stone,
+/area/station/service/bar)
"sgw" = (
/obj/machinery/mass_driver/ordnance{
dir = 1
@@ -54761,6 +54931,12 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/hallway/secondary/recreation)
+"shI" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 6
+ },
+/turf/open/floor/stone,
+/area/station/service/bar)
"shK" = (
/obj/effect/turf_decal/tile/brown/opposingcorners,
/obj/effect/spawner/random/vending/snackvend,
@@ -54779,14 +54955,6 @@
},
/turf/open/floor/plating,
/area/station/maintenance/department/medical/central)
-"shR" = (
-/obj/effect/turf_decal/weather/dirt{
- dir = 1
- },
-/obj/structure/cable,
-/obj/machinery/light/small/directional/north,
-/turf/open/floor/grass,
-/area/station/service/chapel)
"sib" = (
/obj/structure/cable,
/obj/machinery/power/apc/auto_name/directional/north,
@@ -54825,11 +54993,6 @@
},
/turf/open/floor/iron,
/area/station/maintenance/port/fore)
-"siN" = (
-/obj/effect/turf_decal/tile/neutral/opposingcorners,
-/obj/structure/chair/stool/bar/directional/north,
-/turf/open/floor/iron,
-/area/station/holodeck/rec_center)
"sjl" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -54845,15 +55008,6 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/plating,
/area/station/maintenance/port/fore)
-"sjL" = (
-/obj/structure/cable,
-/obj/effect/turf_decal/trimline/neutral/line{
- dir = 1
- },
-/obj/effect/turf_decal/trimline/neutral/line,
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/fore)
"sjZ" = (
/obj/effect/turf_decal/delivery,
/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{
@@ -54890,25 +55044,6 @@
/obj/effect/turf_decal/tile/dark_red/opposingcorners,
/turf/open/floor/iron,
/area/station/security/prison)
-"skp" = (
-/obj/effect/turf_decal/tile/yellow/half/contrasted{
- dir = 8
- },
-/obj/machinery/chem_dispenser{
- layer = 2.7
- },
-/obj/machinery/camera/autoname/directional/west,
-/turf/open/floor/iron,
-/area/station/medical/chemistry)
-"skN" = (
-/obj/structure/table/wood,
-/obj/machinery/camera/directional/south{
- c_tag = "Atmospherics - South"
- },
-/obj/item/stack/cable_coil/five,
-/obj/effect/turf_decal/siding/wideplating_new/terracotta,
-/turf/open/floor/wood/tile,
-/area/station/maintenance/central/lesser)
"skP" = (
/obj/effect/spawner/structure/window,
/turf/open/floor/plating,
@@ -55177,18 +55312,6 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/maintenance/port/aft)
-"sot" = (
-/obj/machinery/door/airlock/multi_tile/public{
- dir = 4
- },
-/obj/machinery/door/firedoor,
-/obj/effect/turf_decal/siding/wood{
- dir = 4
- },
-/turf/open/floor/iron/textured_half{
- dir = 8
- },
-/area/station/service/library)
"sox" = (
/obj/effect/turf_decal/stripes/white/line,
/obj/structure/transport/linear/tram,
@@ -55245,25 +55368,6 @@
/obj/machinery/light/small/directional/west,
/turf/open/floor/iron/dark/small,
/area/station/security/checkpoint/customs/auxiliary)
-"spk" = (
-/obj/machinery/camera/directional/east,
-/obj/machinery/light/small/directional/east,
-/obj/effect/turf_decal/weather/dirt{
- dir = 6
- },
-/obj/effect/turf_decal/weather/dirt{
- dir = 1
- },
-/turf/open/floor/grass,
-/area/station/service/chapel)
-"spo" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/obj/structure/extinguisher_cabinet/directional/north,
-/turf/open/floor/iron,
-/area/station/hallway/primary/port)
"spx" = (
/obj/machinery/portable_atmospherics/canister/anesthetic_mix,
/obj/machinery/atmospherics/components/unary/portables_connector/visible,
@@ -55279,6 +55383,17 @@
/obj/effect/mapping_helpers/broken_floor,
/turf/open/floor/plating,
/area/station/maintenance/department/science/xenobiology)
+"spO" = (
+/obj/effect/turf_decal/tile/green/opposingcorners,
+/obj/effect/turf_decal/tile/blue/opposingcorners{
+ dir = 8
+ },
+/obj/machinery/chem_master/condimaster{
+ desc = "Used to separate out liquids - useful for purifying botanical extracts. Also dispenses condiments.";
+ name = "BrewMaster 2199"
+ },
+/turf/open/floor/iron,
+/area/station/service/hydroponics)
"spP" = (
/obj/structure/cable,
/obj/effect/turf_decal/tile/red/half/contrasted{
@@ -55358,6 +55473,10 @@
},
/turf/open/floor/iron,
/area/station/maintenance/department/medical/central)
+"sqW" = (
+/obj/structure/table,
+/turf/open/floor/iron/dark/small,
+/area/station/maintenance/central/lesser)
"sqY" = (
/obj/structure/flora/bush/large/style_random{
pixel_x = -20;
@@ -55366,6 +55485,12 @@
/obj/structure/flora/bush/flowers_pp/style_random,
/turf/open/misc/sandy_dirt,
/area/station/hallway/secondary/recreation)
+"sra" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+ dir = 1
+ },
+/turf/open/floor/iron/kitchen/small,
+/area/station/service/kitchen)
"srb" = (
/obj/effect/turf_decal/box/red/corners{
dir = 4
@@ -55375,20 +55500,42 @@
},
/turf/open/floor/engine,
/area/station/science/xenobiology)
-"srn" = (
-/obj/structure/disposalpipe/segment,
-/turf/closed/wall,
-/area/station/maintenance/port/greater)
-"sry" = (
+"srh" = (
/obj/effect/turf_decal/weather/dirt{
+ dir = 8
+ },
+/obj/structure/flora/bush/jungle/a/style_3,
+/turf/open/misc/dirt/jungle,
+/area/station/service/chapel)
+"srk" = (
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/turf_decal/tile/neutral,
+/obj/machinery/door/firedoor,
+/obj/effect/turf_decal/stripes/red/line,
+/obj/effect/turf_decal/stripes/red/line{
dir = 1
},
-/obj/structure/flora/bush/jungle/c/style_3{
- pixel_x = 6;
- pixel_y = -6
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/merge_conflict_marker{
+ name = "---Merge Conflict Marker---";
+
+ desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
},
-/turf/open/floor/grass,
-/area/station/service/chapel)
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/door/firedoor,
+/obj/effect/turf_decal/stripes/red/line,
+/obj/effect/turf_decal/stripes/red/line{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron/small,
+/area/station/hallway/primary/central/fore)
+"srn" = (
+/obj/structure/disposalpipe/segment,
+/turf/closed/wall,
+/area/station/maintenance/port/greater)
"srA" = (
/obj/structure/chair/sofa/bench/left{
dir = 4
@@ -55465,32 +55612,6 @@
/obj/machinery/atmospherics/pipe/layer_manifold/scrubbers/visible,
/turf/closed/wall/r_wall,
/area/station/engineering/hallway)
-"ssR" = (
-/obj/effect/turf_decal/siding/wood{
- dir = 8
- },
-/obj/structure/chair/stool/directional/west,
-/turf/open/floor/stone,
-/area/station/service/bar)
-"sta" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/effect/turf_decal/stripes/corner{
- dir = 1
- },
-/obj/item/trash/flare{
- pixel_x = 11;
- pixel_y = 21
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/iron/dark/corner{
- dir = 4
- },
-/area/station/hallway/primary/central/fore)
"stj" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -55506,6 +55627,16 @@
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/iron/smooth_large,
/area/station/engineering/break_room)
+"stw" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/disposalpipe/sorting/mail{
+ dir = 4
+ },
+/obj/effect/mapping_helpers/mail_sorting/service/hydroponics,
+/turf/open/floor/plating,
+/area/station/maintenance/central/greater)
"stH" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/effect/turf_decal/tile/brown/half,
@@ -55553,14 +55684,6 @@
},
/turf/open/floor/carpet/purple,
/area/station/commons/dorms)
-"sue" = (
-/obj/effect/turf_decal/tile/neutral/opposingcorners,
-/obj/structure/chair/sofa/bench/right{
- dir = 4
- },
-/obj/effect/landmark/start/hangover,
-/turf/open/floor/iron,
-/area/station/holodeck/rec_center)
"sul" = (
/obj/effect/turf_decal/siding{
dir = 1
@@ -55568,20 +55691,18 @@
/obj/machinery/holopad,
/turf/open/floor/iron/white/small,
/area/station/science/lab)
+"sun" = (
+/obj/effect/turf_decal/siding/wood,
+/obj/effect/turf_decal/siding/wood{
+ dir = 4
+ },
+/turf/open/floor/stone,
+/area/station/service/bar)
"suw" = (
/obj/effect/decal/cleanable/dirt,
/obj/item/radio/intercom/directional/south,
/turf/open/floor/iron/checker,
/area/station/command/heads_quarters/hos)
-"suM" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/firealarm/directional/south,
-/obj/effect/turf_decal/tile/neutral,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/station/hallway/primary/port)
"svh" = (
/obj/structure/cable,
/obj/machinery/door/airlock{
@@ -55590,6 +55711,12 @@
/obj/effect/mapping_helpers/airlock/access/any/service/maintenance,
/turf/open/floor/plating,
/area/station/maintenance/starboard/lesser)
+"svm" = (
+/obj/effect/turf_decal/siding/wood/corner,
+/obj/effect/turf_decal/siding/wood,
+/obj/effect/landmark/start/hangover,
+/turf/open/floor/stone,
+/area/station/service/bar)
"svo" = (
/obj/effect/turf_decal/tile/neutral/fourcorners,
/obj/machinery/dna_scannernew,
@@ -55651,14 +55778,6 @@
/mob/living/carbon/human/species/monkey,
/turf/open/floor/grass,
/area/station/science/genetics)
-"svE" = (
-/obj/effect/turf_decal/siding/wood,
-/obj/effect/turf_decal/siding/wood{
- dir = 8
- },
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/stone,
-/area/station/service/bar)
"svG" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/engine,
@@ -55673,6 +55792,11 @@
/obj/machinery/status_display/evac/directional/south,
/turf/open/floor/iron/small,
/area/station/engineering/break_room)
+"svM" = (
+/obj/machinery/status_display/evac/directional/north,
+/obj/machinery/camera/directional/north,
+/turf/open/misc/dirt/jungle,
+/area/station/service/chapel)
"svQ" = (
/obj/structure/table/reinforced,
/obj/structure/reagent_dispensers/servingdish,
@@ -55758,15 +55882,6 @@
/obj/structure/steam_vent,
/turf/open/floor/plating,
/area/station/maintenance/department/medical/central)
-"swM" = (
-/obj/effect/turf_decal/weather/dirt{
- dir = 1
- },
-/obj/structure/flora/bush/jungle/a/style_random{
- pixel_y = -5
- },
-/turf/open/floor/grass,
-/area/station/service/chapel)
"swO" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -55807,24 +55922,16 @@
},
/turf/open/floor/wood,
/area/station/command/heads_quarters/qm)
-"swW" = (
-/obj/effect/turf_decal/siding/wood{
- dir = 1
- },
-/obj/effect/turf_decal/siding/wood,
-/obj/machinery/restaurant_portal/bar,
-/turf/open/floor/stone,
-/area/station/service/bar)
-"sxl" = (
-/obj/machinery/oven/range,
-/obj/machinery/airalarm/directional/north,
-/obj/machinery/power/apc/auto_name/directional/west,
-/obj/structure/cable,
-/turf/open/floor/iron/kitchen/small,
-/area/station/service/kitchen)
"sxm" = (
/turf/closed/wall,
/area/station/tcommsat/server)
+"sxp" = (
+/obj/effect/turf_decal/siding/thinplating{
+ dir = 9
+ },
+/obj/structure/cable,
+/turf/open/floor/eighties,
+/area/station/hallway/primary/central/fore)
"sxu" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/door/airlock/external{
@@ -55872,13 +55979,6 @@
/obj/structure/lattice/catwalk,
/turf/open/space/basic,
/area/station/solars/aft)
-"sxZ" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/turf/open/floor/iron,
-/area/station/hallway/primary/fore)
"syb" = (
/obj/docking_port/stationary/random{
dir = 4;
@@ -55960,6 +56060,25 @@
},
/turf/open/floor/iron/dark/small,
/area/station/security/brig)
+"szT" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/disposalpipe/segment{
+ dir = 9
+ },
+/obj/merge_conflict_marker{
+ name = "---Merge Conflict Marker---";
+
+ desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/disposalpipe/segment{
+ dir = 9
+ },
+/obj/structure/cable,
+/turf/open/floor/plating,
+/area/station/maintenance/central/greater)
"sAb" = (
/obj/structure/lattice,
/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible/layer1{
@@ -55968,6 +56087,14 @@
/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible/layer2,
/turf/open/space/basic,
/area/space/nearstation)
+"sAi" = (
+/obj/machinery/vending/cola,
+/obj/effect/turf_decal/tile/blue{
+ dir = 8
+ },
+/obj/machinery/light/small/directional/south,
+/turf/open/floor/iron/dark/side,
+/area/station/hallway/primary/central/fore)
"sAM" = (
/obj/effect/turf_decal/tile/brown/opposingcorners,
/obj/effect/turf_decal/siding/wideplating{
@@ -55999,17 +56126,34 @@
},
/turf/open/space/basic,
/area/station/engineering/atmos/space_catwalk)
-"sBf" = (
+"sAY" = (
/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/red{
+ dir = 6
+ },
+/obj/machinery/firealarm/directional/south,
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/effect/spawner/random/structure/steam_vent,
-/turf/open/floor/plating,
-/area/station/maintenance/port/greater)
+/turf/open/floor/iron/white/small,
+/area/station/security/warden)
+"sBc" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/neutral/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/neutral/line,
+/obj/machinery/navbeacon{
+ codes_txt = "patrol;next_patrol=16.0-CentralFore-CentralPort";
+ location = "15.0-CentralStarboard-CentralFore"
+ },
+/obj/structure/cable,
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/fore)
"sBm" = (
/obj/structure/transport/linear/tram,
/obj/structure/fluff/tram_rail/floor,
@@ -56036,6 +56180,13 @@
},
/turf/open/floor/plating,
/area/station/maintenance/fore/greater)
+"sBS" = (
+/obj/effect/turf_decal/weather/dirt,
+/obj/structure/flora/bush/jungle/c/style_3{
+ pixel_x = -7
+ },
+/turf/open/floor/grass,
+/area/station/service/chapel)
"sCc" = (
/obj/effect/spawner/structure/window/reinforced/tinted,
/turf/open/floor/plating,
@@ -56079,14 +56230,6 @@
/obj/effect/mapping_helpers/airlock/access/all/medical/general,
/turf/open/floor/iron/dark/small,
/area/station/medical/medbay/central)
-"sCq" = (
-/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/dark_red/fourcorners,
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/iron,
-/area/station/security/brig/entrance)
"sCu" = (
/obj/machinery/computer/prisoner/management{
dir = 8
@@ -56253,21 +56396,19 @@
},
/turf/open/floor/plating,
/area/station/maintenance/department/prison)
-"sFs" = (
-/obj/structure/cable,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
- dir = 1
- },
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/aft)
"sFz" = (
/obj/structure/chair/stool/directional/east,
/obj/machinery/camera/autoname/directional/south,
/turf/open/floor/iron/cafeteria,
/area/station/security/prison/mess)
+"sFK" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/open/floor/wood,
+/area/station/cargo/boutique)
"sGh" = (
/obj/structure/window/reinforced/spawner/directional/east,
/obj/effect/turf_decal/stripes/white/line{
@@ -56275,11 +56416,6 @@
},
/turf/open/floor/engine,
/area/station/science/xenobiology)
-"sGk" = (
-/obj/structure/flora/bush/jungle/c/style_random,
-/obj/effect/turf_decal/weather/dirt,
-/turf/open/floor/grass,
-/area/station/service/chapel)
"sGp" = (
/obj/structure/flora/rock/pile/style_random,
/obj/structure/window/reinforced/spawner/directional/west,
@@ -56306,20 +56442,6 @@
/obj/effect/mapping_helpers/broken_floor,
/turf/open/floor/plating,
/area/station/science/ordnance/storage)
-"sGN" = (
-/obj/machinery/modular_computer/preset/cargochat/service{
- dir = 8
- },
-/obj/effect/turf_decal/delivery,
-/obj/machinery/requests_console/auto_name/directional/east,
-/obj/effect/turf_decal/tile/neutral/opposingcorners{
- dir = 1
- },
-/obj/effect/turf_decal/siding/thinplating_new{
- dir = 4
- },
-/turf/open/floor/iron/small,
-/area/station/hallway/secondary/service)
"sHe" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -56334,6 +56456,13 @@
/obj/effect/spawner/random/maintenance,
/turf/open/floor/plating,
/area/station/maintenance/department/engine)
+"sHD" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/chair/wood{
+ dir = 8
+ },
+/turf/open/floor/iron/grimy,
+/area/station/service/bar)
"sHH" = (
/obj/effect/turf_decal/stripes/line,
/obj/machinery/portable_atmospherics/canister/plasma,
@@ -56359,6 +56488,28 @@
},
/turf/open/floor/plating/elevatorshaft,
/area/station/engineering/main)
+"sHQ" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/structure/sign/departments/holy/directional/north,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/open/floor/iron,
+/area/station/hallway/primary/port)
+"sHR" = (
+/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/dark_red/fourcorners,
+/obj/effect/landmark/start/security_officer,
+/obj/structure/disposalpipe/segment{
+ dir = 5
+ },
+/turf/open/floor/iron,
+/area/station/security/brig/entrance)
"sHV" = (
/obj/structure/reagent_dispensers/watertank,
/turf/open/floor/plating,
@@ -56370,6 +56521,11 @@
/obj/machinery/camera/autoname/directional/north,
/turf/open/floor/engine,
/area/station/science/cytology)
+"sIi" = (
+/obj/structure/lattice/catwalk,
+/obj/machinery/atmospherics/components/unary/passive_vent,
+/turf/open/space/basic,
+/area/space/nearstation)
"sIj" = (
/obj/structure/cable,
/obj/structure/disposalpipe/segment{
@@ -56413,17 +56569,6 @@
/obj/machinery/holopad,
/turf/open/floor/iron/smooth_large,
/area/station/science/auxlab/firing_range)
-"sJv" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/turf_decal/tile/neutral,
-/obj/machinery/navbeacon{
- codes_txt = "patrol;next_patrol=1.5-PNexus-Vault";
- location = "1.0-Security-PNexus"
- },
-/obj/effect/landmark/start/hangover,
-/turf/open/floor/iron,
-/area/station/hallway/primary/port)
"sJw" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -56449,17 +56594,18 @@
"sJR" = (
/turf/open/floor/plating,
/area/station/maintenance/fore/greater)
-"sJV" = (
-/obj/effect/turf_decal/tile/green/opposingcorners,
-/obj/effect/turf_decal/tile/blue/opposingcorners{
- dir = 8
+"sKg" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
},
-/obj/machinery/chem_master/condimaster{
- desc = "Used to separate out liquids - useful for purifying botanical extracts. Also dispenses condiments.";
- name = "BrewMaster 2199"
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/landmark/navigate_destination/library,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
},
/turf/open/floor/iron,
-/area/station/service/hydroponics)
+/area/station/hallway/primary/central/aft)
"sKk" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -56479,6 +56625,18 @@
/obj/effect/turf_decal/trimline/white/mid_joiner,
/turf/open/floor/wood,
/area/station/commons/fitness/recreation)
+"sKw" = (
+/obj/effect/turf_decal/tile/blue,
+/obj/effect/turf_decal/tile/neutral/half/contrasted{
+ dir = 1
+ },
+/obj/merge_conflict_marker{
+ name = "---Merge Conflict Marker---";
+
+ desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
+ },
+/turf/closed/wall,
+/area/station/maintenance/central/greater)
"sKz" = (
/obj/structure/window/reinforced/spawner/directional/east,
/obj/structure/water_source/puddle,
@@ -56588,27 +56746,26 @@
dir = 1
},
/area/station/science/research)
-"sMj" = (
-/obj/machinery/light/floor,
-/obj/effect/turf_decal/siding/wood/corner{
- dir = 1
+"sMn" = (
+/obj/effect/mapping_helpers/airlock/access/any/service/hydroponics,
+/obj/machinery/door/airlock/hydroponics/glass{
+ name = "Hydroponics"
},
-/obj/effect/turf_decal/siding/wood/corner,
-/turf/open/floor/stone,
-/area/station/service/chapel)
+/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/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/open/floor/iron/textured_half{
+ dir = 8
+ },
+/area/station/service/hydroponics)
"sMq" = (
/obj/machinery/light/warm/directional/west,
/turf/open/floor/iron,
/area/station/security/prison)
-"sMt" = (
-/obj/structure/chair/sofa/bench/right{
- dir = 1
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/turf/open/floor/iron/white/side,
-/area/station/hallway/primary/central/aft)
"sMu" = (
/obj/structure/cable,
/obj/structure/railing,
@@ -56617,6 +56774,14 @@
"sMD" = (
/turf/closed/wall,
/area/station/science/server)
+"sMS" = (
+/obj/machinery/holopad,
+/obj/effect/turf_decal/trimline/neutral/line,
+/obj/effect/turf_decal/trimline/neutral/line{
+ dir = 1
+ },
+/turf/open/floor/iron,
+/area/station/hallway/primary/port)
"sMT" = (
/obj/structure/table,
/obj/item/emergency_bed{
@@ -56685,10 +56850,23 @@
/obj/effect/mapping_helpers/broken_floor,
/turf/open/floor/plating,
/area/station/maintenance/port/fore)
-"sNA" = (
-/obj/effect/spawner/xmastree,
-/turf/open/misc/dirt/jungle,
-/area/station/service/chapel)
+"sNG" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/wood,
+/obj/effect/spawner/random/vending/snackvend,
+/turf/open/floor/stone,
+/area/station/service/bar)
+"sNQ" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 1
+ },
+/obj/structure/chair/wood{
+ dir = 4
+ },
+/turf/open/floor/iron/grimy,
+/area/station/service/bar)
"sNW" = (
/obj/structure/rack,
/obj/effect/spawner/random/maintenance,
@@ -56730,6 +56908,13 @@
/obj/structure/window/spawner/directional/west,
/turf/open/floor/iron/dark,
/area/station/commons/dorms)
+"sOD" = (
+/obj/effect/turf_decal/weather/dirt{
+ dir = 8
+ },
+/obj/machinery/newscaster/directional/west,
+/turf/open/floor/grass,
+/area/station/service/chapel)
"sOF" = (
/obj/item/kirbyplants/random,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
@@ -56801,6 +56986,13 @@
/obj/effect/spawner/random/trash,
/turf/open/floor/plating,
/area/station/maintenance/department/science/xenobiology)
+"sPW" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 10
+ },
+/obj/machinery/restaurant_portal/restaurant,
+/turf/open/floor/stone,
+/area/station/service/bar)
"sQa" = (
/obj/structure/lattice/catwalk,
/obj/structure/railing{
@@ -56816,6 +57008,15 @@
/obj/effect/spawner/structure/window,
/turf/open/floor/plating,
/area/station/science/research)
+"sQc" = (
+/obj/structure/table/reinforced,
+/obj/structure/disposalpipe/segment,
+/obj/machinery/door/poddoor/shutters{
+ id = "meow";
+ name = "Commissary"
+ },
+/turf/open/floor/iron,
+/area/station/commons/vacant_room/commissary)
"sQd" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/firealarm/directional/east,
@@ -56930,6 +57131,16 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/showroomfloor,
/area/station/commons/dorms)
+"sRE" = (
+/obj/machinery/door/firedoor,
+/obj/effect/turf_decal/stripes/red/line{
+ dir = 8
+ },
+/obj/effect/turf_decal/stripes/red/line{
+ dir = 4
+ },
+/turf/open/floor/iron/small,
+/area/station/hallway/primary/central/aft)
"sRL" = (
/turf/closed/wall,
/area/station/service/janitor)
@@ -56942,21 +57153,22 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/cargo/storage)
-"sRT" = (
-/obj/machinery/disposal/bin,
-/obj/effect/turf_decal/siding/thinplating{
- dir = 5
- },
-/obj/structure/disposalpipe/trunk{
- dir = 8
- },
-/turf/open/floor/eighties/red,
-/area/station/hallway/primary/central/fore)
"sRV" = (
/obj/structure/cable,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
/turf/open/floor/stone,
/area/station/command/heads_quarters/hos)
+"sSf" = (
+/obj/machinery/portable_atmospherics/canister/air,
+/obj/merge_conflict_marker{
+ name = "---Merge Conflict Marker---";
+
+ desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
+ },
+/obj/machinery/portable_atmospherics/canister/air,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plating,
+/area/station/maintenance/central/greater)
"sSj" = (
/obj/structure/disposalpipe/sorting/mail/flip{
dir = 8
@@ -56995,6 +57207,21 @@
"sSB" = (
/turf/open/floor/catwalk_floor,
/area/station/engineering/break_room)
+"sSD" = (
+/obj/structure/bed{
+ dir = 4
+ },
+/obj/effect/spawner/random/bedsheet{
+ dir = 4
+ },
+/obj/machinery/button/door/directional/south{
+ id = "Cabin4";
+ name = "Cabin Bolt Control";
+ normaldoorcontrol = 1;
+ specialfunctions = 4
+ },
+/turf/open/floor/carpet,
+/area/station/commons/dorms)
"sSM" = (
/obj/effect/turf_decal/siding/yellow,
/obj/effect/turf_decal/siding/yellow{
@@ -57005,13 +57232,6 @@
/obj/effect/landmark/event_spawn,
/turf/open/floor/iron/textured_half,
/area/station/engineering/atmos)
-"sSN" = (
-/obj/effect/turf_decal/weather/dirt{
- dir = 8
- },
-/obj/structure/flora/bush/flowers_pp/style_2,
-/turf/open/floor/grass,
-/area/station/service/chapel)
"sSQ" = (
/turf/closed/wall,
/area/station/maintenance/department/medical/central)
@@ -57047,19 +57267,6 @@
},
/turf/open/floor/iron/dark,
/area/station/science/genetics)
-"sTb" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/effect/turf_decal/plaque{
- icon_state = "L14";
- pixel_y = -15
- },
-/obj/effect/turf_decal/trimline/neutral/line,
-/obj/effect/turf_decal/trimline/neutral/line{
- dir = 1
- },
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/aft)
"sTi" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -57077,10 +57284,34 @@
},
/turf/open/space/basic,
/area/space/nearstation)
+"sTx" = (
+/obj/effect/turf_decal/tile/green/opposingcorners,
+/obj/effect/turf_decal/tile/blue/opposingcorners{
+ dir = 8
+ },
+/obj/machinery/hydroponics/constructable,
+/turf/open/floor/iron,
+/area/station/service/hydroponics)
"sTK" = (
/obj/machinery/telecomms/bus/preset_one,
/turf/open/floor/circuit,
/area/station/tcommsat/server)
+"sTP" = (
+/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/dark_red/half/contrasted{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/wideplating/dark{
+ dir = 8
+ },
+/obj/structure/disposalpipe/sorting/mail/flip{
+ dir = 1
+ },
+/obj/effect/mapping_helpers/mail_sorting/security/hos_office,
+/turf/open/floor/iron,
+/area/station/security)
"sTR" = (
/obj/structure/cable,
/obj/effect/mapping_helpers/airlock/access/all/medical/general,
@@ -57115,6 +57346,12 @@
},
/turf/open/floor/iron/dark,
/area/station/engineering/atmos)
+"sUv" = (
+/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/dark/herringbone,
+/area/station/ai_monitored/command/nuke_storage)
"sUy" = (
/turf/closed/wall/r_wall,
/area/station/command/meeting_room)
@@ -57141,13 +57378,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/checker,
/area/station/security/breakroom)
-"sUN" = (
-/obj/effect/turf_decal/weather/dirt{
- dir = 1
- },
-/obj/structure/flora/bush/flowers_yw,
-/turf/open/floor/grass,
-/area/station/service/chapel)
"sUV" = (
/obj/structure/table,
/obj/item/folder/yellow,
@@ -57169,6 +57399,12 @@
/obj/structure/cable,
/turf/open/floor/iron/textured_half,
/area/station/security)
+"sVi" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/closed/wall,
+/area/station/maintenance/port/greater)
"sVk" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -57209,14 +57445,6 @@
/obj/machinery/chem_master,
/turf/open/floor/iron,
/area/station/science/xenobiology)
-"sWq" = (
-/obj/structure/chair/stool/bar/directional/north,
-/obj/effect/turf_decal/siding/wood{
- dir = 1
- },
-/obj/effect/turf_decal/siding/wood,
-/turf/open/floor/wood,
-/area/station/hallway/primary/central/aft)
"sWA" = (
/obj/machinery/door/airlock/glass{
name = "Gold Standard Law Firm"
@@ -57238,6 +57466,18 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron,
/area/station/hallway/secondary/recreation)
+"sXg" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/door/firedoor,
+/obj/effect/turf_decal/stripes/red/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes/red/line,
+/obj/structure/disposalpipe/segment{
+ dir = 5
+ },
+/turf/open/floor/iron/small,
+/area/station/hallway/primary/central/fore)
"sXi" = (
/obj/structure/disposalpipe/segment,
/turf/open/floor/iron/white,
@@ -57255,19 +57495,6 @@
/obj/effect/turf_decal/siding/thinplating_new,
/turf/open/floor/iron/dark/herringbone,
/area/station/security/courtroom)
-"sXs" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
-/obj/effect/landmark/event_spawn,
-/obj/effect/turf_decal/trimline/neutral/line,
-/obj/effect/turf_decal/trimline/neutral/line{
- dir = 1
- },
-/obj/structure/disposalpipe/segment{
- dir = 5
- },
-/turf/open/floor/iron,
-/area/station/hallway/primary/port)
"sXw" = (
/obj/machinery/telecomms/receiver/preset_left,
/turf/open/floor/circuit,
@@ -57278,19 +57505,6 @@
},
/turf/open/floor/iron/white,
/area/station/science/cytology)
-"sXD" = (
-/obj/effect/turf_decal/siding/wood,
-/obj/machinery/power/apc/auto_name/directional/east,
-/obj/structure/cable,
-/turf/open/floor/wood/parquet,
-/area/station/service/library)
-"sXE" = (
-/mob/living/basic/bot/firebot,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/holopad,
-/turf/open/floor/iron/smooth_large,
-/area/station/engineering/storage_shared)
"sXG" = (
/obj/machinery/atmospherics/pipe/smart/simple/general/visible{
dir = 4
@@ -57359,23 +57573,6 @@
/obj/machinery/camera/autoname/directional/north,
/turf/open/floor/iron/cafeteria,
/area/station/hallway/secondary/exit/departure_lounge)
-"sYp" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/door/firedoor,
-/obj/effect/turf_decal/stripes/red/line{
- dir = 8
- },
-/obj/effect/turf_decal/stripes/red/line{
- dir = 4
- },
-/obj/effect/turf_decal/trimline/neutral/line,
-/obj/effect/turf_decal/trimline/neutral/line{
- dir = 1
- },
-/turf/open/floor/iron/small,
-/area/station/hallway/primary/central/aft)
"sYs" = (
/obj/structure/closet/firecloset,
/obj/effect/turf_decal/tile/red/opposingcorners{
@@ -57406,18 +57603,23 @@
/obj/machinery/camera/autoname/directional/north,
/turf/open/floor/iron/white/small,
/area/station/medical/cryo)
-"sZo" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
- dir = 4
+"sYI" = (
+/obj/structure/table/wood/fancy/green,
+/obj/item/storage/wallet{
+ pixel_x = -3;
+ pixel_y = 10
},
-/obj/effect/turf_decal/siding/thinplating_new/light{
- dir = 10
+/obj/item/cigarette/cigar{
+ pixel_x = -1;
+ pixel_y = -2
},
-/obj/structure/extinguisher_cabinet/directional/west,
-/obj/machinery/light/small/directional/south,
-/obj/effect/landmark/start/botanist,
-/turf/open/floor/iron/white/small,
-/area/station/service/hydroponics)
+/obj/item/lighter{
+ pixel_x = 11;
+ pixel_y = -7
+ },
+/obj/machinery/light/directional/south,
+/turf/open/floor/iron/grimy,
+/area/station/command/heads_quarters/qm)
"sZx" = (
/obj/structure/cable,
/obj/structure/disposalpipe/trunk{
@@ -57451,6 +57653,10 @@
/obj/effect/spawner/structure/window,
/turf/open/floor/plating,
/area/station/science/robotics/lab)
+"sZL" = (
+/obj/machinery/light/small/directional/south,
+/turf/open/floor/engine/xenobio,
+/area/station/science/xenobiology)
"tab" = (
/obj/structure/rack,
/obj/item/restraints/handcuffs,
@@ -57496,6 +57702,11 @@
},
/turf/open/floor/iron/dark/small,
/area/station/security/checkpoint/customs/auxiliary)
+"taE" = (
+/obj/effect/turf_decal/weather/dirt,
+/obj/structure/flora/bush/flowers_br/style_random,
+/turf/open/floor/grass,
+/area/station/service/chapel)
"taK" = (
/obj/effect/turf_decal/stripes/line{
dir = 5
@@ -57522,6 +57733,19 @@
/obj/effect/mapping_helpers/airlock/access/any/science/maintenance,
/turf/open/floor/plating,
/area/station/maintenance/starboard/central)
+"taM" = (
+/obj/machinery/door/firedoor,
+/obj/effect/turf_decal/stripes/red/line{
+ dir = 4
+ },
+/obj/effect/turf_decal/stripes/red/line{
+ dir = 8
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/open/floor/iron/small,
+/area/station/hallway/primary/port)
"taZ" = (
/obj/structure/flora/bush/large/style_random{
pixel_y = -3
@@ -57616,6 +57840,17 @@
"tca" = (
/turf/open/floor/carpet/donk,
/area/station/command/heads_quarters/qm)
+"tcc" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 4
+ },
+/obj/machinery/holopad,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/disposalpipe/segment{
+ dir = 9
+ },
+/turf/open/floor/wood/parquet,
+/area/station/service/library)
"tcz" = (
/obj/effect/turf_decal/trimline/blue/filled/corner,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
@@ -57636,6 +57871,14 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/iron/dark,
/area/station/security/processing)
+"tcM" = (
+/obj/effect/turf_decal/tile/neutral,
+/obj/machinery/camera/autoname/directional/south,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/open/floor/iron,
+/area/station/hallway/primary/port)
"tcZ" = (
/obj/effect/turf_decal/siding/red{
dir = 6
@@ -57743,18 +57986,6 @@
/obj/structure/steam_vent,
/turf/open/floor/plating,
/area/station/maintenance/starboard/central)
-"tes" = (
-/obj/effect/turf_decal/siding/wood{
- dir = 5
- },
-/obj/machinery/light/floor,
-/turf/open/floor/stone,
-/area/station/service/bar)
-"tev" = (
-/obj/effect/turf_decal/weather/dirt,
-/obj/structure/flora/bush/flowers_pp/style_random,
-/turf/open/floor/grass,
-/area/station/service/chapel)
"tey" = (
/obj/effect/turf_decal/tile/dark_red/opposingcorners,
/obj/machinery/computer/records/security{
@@ -57764,6 +57995,14 @@
dir = 1
},
/area/station/security/execution/transfer)
+"tez" = (
+/obj/machinery/camera/autoname/directional/west,
+/obj/machinery/status_display/evac/directional/west,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/aft)
"teE" = (
/obj/structure/table,
/obj/effect/mapping_helpers/broken_floor,
@@ -57795,6 +58034,16 @@
dir = 1
},
/area/station/hallway/secondary/entry)
+"teS" = (
+/obj/effect/turf_decal/siding/wood/corner{
+ dir = 1
+ },
+/obj/item/kirbyplants/random,
+/obj/effect/turf_decal/siding/wood{
+ dir = 4
+ },
+/turf/open/floor/stone,
+/area/station/service/bar)
"tfc" = (
/obj/structure/reagent_dispensers/beerkeg,
/obj/effect/decal/cleanable/dirt,
@@ -57839,14 +58088,6 @@
/obj/item/clipboard,
/turf/open/floor/iron/white/small,
/area/station/science/server)
-"tfM" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/turf_decal/tile/neutral,
-/obj/structure/disposalpipe/segment{
- dir = 5
- },
-/turf/open/floor/iron,
-/area/station/hallway/primary/port)
"tfX" = (
/obj/structure/disposalpipe/segment,
/obj/effect/turf_decal/tile/brown{
@@ -57882,14 +58123,6 @@
/obj/structure/sign/poster/official/random/directional/north,
/turf/open/floor/wood/tile,
/area/station/command/heads_quarters/hop)
-"tgx" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/obj/structure/extinguisher_cabinet/directional/south,
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/fore)
"tgD" = (
/obj/effect/turf_decal/stripes/line{
dir = 5
@@ -57898,6 +58131,23 @@
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plating,
/area/station/engineering/atmospherics_engine)
+"tgI" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/door/firedoor,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/effect/turf_decal/stripes/red/line{
+ dir = 4
+ },
+/obj/effect/turf_decal/stripes/red/line{
+ dir = 8
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/open/floor/iron/small,
+/area/station/hallway/primary/port)
"tgJ" = (
/obj/machinery/cryo_cell,
/obj/effect/turf_decal/stripes/line{
@@ -57905,6 +58155,10 @@
},
/turf/open/floor/iron/small,
/area/station/medical/cryo)
+"tgL" = (
+/obj/structure/flora/grass/jungle/b/style_random,
+/turf/open/misc/dirt/jungle,
+/area/station/service/chapel)
"thb" = (
/obj/structure/chair/stool/directional/south,
/obj/effect/turf_decal/siding/yellow{
@@ -58070,17 +58324,6 @@
"tjj" = (
/turf/closed/wall/r_wall,
/area/station/ai_monitored/turret_protected/ai_upload)
-"tjs" = (
-/obj/machinery/airalarm/directional/west,
-/obj/effect/spawner/random/entertainment/arcade{
- dir = 4
- },
-/obj/effect/turf_decal/siding/thinplating{
- dir = 8
- },
-/obj/machinery/light/small/dim/directional/west,
-/turf/open/floor/eighties/red,
-/area/station/hallway/primary/central/fore)
"tjH" = (
/obj/effect/turf_decal/stripes/line{
dir = 10
@@ -58089,21 +58332,6 @@
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/iron/small,
/area/station/engineering/supermatter/room)
-"tjT" = (
-/obj/structure/sink/kitchen/directional/south,
-/obj/effect/turf_decal/siding/wood/corner{
- dir = 8
- },
-/obj/effect/turf_decal/siding/wood{
- dir = 1
- },
-/obj/machinery/camera/autoname/directional/north,
-/obj/machinery/light/floor,
-/obj/structure/disposalpipe/segment{
- dir = 10
- },
-/turf/open/floor/stone,
-/area/station/service/bar)
"tjY" = (
/obj/machinery/atmospherics/components/binary/pump/on{
dir = 4;
@@ -58113,16 +58341,12 @@
/obj/item/kirbyplants/random,
/turf/open/floor/iron,
/area/station/maintenance/port/fore)
-"tkm" = (
-/obj/structure/window/spawner/directional/west,
-/obj/structure/flora/bush/large/style_random{
- pixel_x = -17;
- pixel_y = 2
+"tkf" = (
+/obj/machinery/modular_computer/preset/curator{
+ dir = 8
},
-/obj/structure/flora/bush/flowers_yw/style_random,
-/obj/structure/window/spawner/directional/east,
-/turf/open/floor/grass,
-/area/station/service/hydroponics)
+/turf/open/floor/carpet,
+/area/station/service/library)
"tkq" = (
/obj/structure/barricade/wooden/crude,
/turf/open/floor/plating,
@@ -58145,6 +58369,20 @@
},
/turf/open/floor/iron/showroomfloor,
/area/station/commons/toilet/auxiliary)
+"tld" = (
+/obj/structure/cable,
+/obj/machinery/power/apc/auto_name/directional/west,
+/obj/machinery/camera/autoname/directional/west,
+/obj/structure/disposalpipe/segment,
+/obj/machinery/light/small/directional/west,
+/obj/effect/turf_decal/tile/neutral/opposingcorners{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/thinplating_new{
+ dir = 8
+ },
+/turf/open/floor/iron/small,
+/area/station/hallway/secondary/service)
"tlh" = (
/obj/effect/spawner/structure/window,
/obj/structure/sign/warning/cold_temp/directional/north,
@@ -58163,6 +58401,11 @@
/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/iron,
/area/station/hallway/primary/central/fore)
+"tlB" = (
+/obj/effect/turf_decal/weather/dirt,
+/obj/structure/flora/bush/flowers_yw,
+/turf/open/floor/grass,
+/area/station/service/chapel)
"tlC" = (
/obj/structure/cable,
/turf/closed/wall/r_wall,
@@ -58176,23 +58419,19 @@
},
/turf/open/misc/sandy_dirt,
/area/station/security/tram)
-"tlJ" = (
-/obj/effect/turf_decal/tile/neutral/opposingcorners,
-/obj/item/kirbyplants/random,
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/power/apc/auto_name/directional/east,
-/turf/open/floor/iron,
-/area/station/holodeck/rec_center)
+"tlW" = (
+/obj/effect/turf_decal/siding/wood,
+/obj/effect/turf_decal/siding/wood{
+ dir = 1
+ },
+/obj/machinery/light/floor,
+/turf/open/floor/stone,
+/area/station/service/bar)
"tlX" = (
/obj/structure/cable,
/obj/effect/turf_decal/tile/blue/fourcorners,
/turf/open/floor/iron/white,
/area/station/medical/medbay/lobby)
-"tmi" = (
-/obj/structure/flora/bush/flowers_br/style_3,
-/turf/open/floor/grass,
-/area/station/service/chapel)
"tmk" = (
/obj/machinery/power/emitter,
/obj/effect/turf_decal/stripes/line{
@@ -58204,15 +58443,13 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron,
/area/station/hallway/secondary/exit/departure_lounge)
-"tmD" = (
-/obj/effect/turf_decal/tile/neutral/opposingcorners{
- dir = 1
- },
-/obj/effect/turf_decal/siding/thinplating_new{
- dir = 4
+"tmC" = (
+/obj/structure/chair/comfy/brown,
+/obj/structure/sign/painting/library{
+ pixel_x = 30
},
-/turf/open/floor/iron/small,
-/area/station/hallway/secondary/service)
+/turf/open/floor/wood/parquet,
+/area/station/service/library)
"tmL" = (
/obj/structure/lattice,
/obj/structure/transit_tube/curved/flipped{
@@ -58251,10 +58488,6 @@
"tnb" = (
/turf/open/floor/plating,
/area/station/maintenance/central/lesser)
-"tnj" = (
-/obj/machinery/door/firedoor,
-/turf/open/floor/iron/textured_half,
-/area/station/service/bar)
"tns" = (
/obj/effect/mapping_helpers/broken_floor,
/obj/effect/decal/cleanable/dirt,
@@ -58313,14 +58546,6 @@
/obj/effect/landmark/start/atmospheric_technician,
/turf/open/floor/iron/dark,
/area/station/engineering/atmos)
-"tnZ" = (
-/obj/structure/bookcase/random,
-/obj/structure/sign/poster/official/random/directional/west,
-/obj/structure/sign/painting/library{
- pixel_y = 32
- },
-/turf/open/floor/wood/parquet,
-/area/station/service/library)
"tof" = (
/turf/closed/wall/rust,
/area/station/ai_monitored/turret_protected/ai)
@@ -58345,6 +58570,13 @@
},
/turf/open/floor/tram,
/area/station/maintenance/port/aft)
+"tou" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/structure/cable,
+/turf/open/floor/plating,
+/area/station/maintenance/central/greater)
"tov" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -58440,6 +58672,10 @@
/obj/structure/window/reinforced/spawner/directional/west,
/turf/open/floor/noslip,
/area/station/security/tram)
+"tpq" = (
+/obj/structure/table/wood,
+/turf/open/floor/carpet,
+/area/station/service/library)
"tpG" = (
/obj/structure/closet/athletic_mixed,
/obj/effect/turf_decal/stripes/red/line{
@@ -58478,15 +58714,6 @@
},
/turf/open/floor/wood,
/area/station/commons/fitness/recreation)
-"tpQ" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/plating,
-/area/station/maintenance/central/greater)
"tqh" = (
/obj/effect/turf_decal/trimline/white/line{
dir = 8
@@ -58570,9 +58797,6 @@
/obj/machinery/firealarm/directional/east,
/turf/open/floor/iron/dark/small,
/area/station/engineering/supermatter/room)
-"trB" = (
-/turf/open/floor/glass,
-/area/station/hallway/primary/central/aft)
"trI" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -58580,12 +58804,35 @@
/obj/structure/sign/warning/directional/north,
/turf/open/floor/plating,
/area/station/maintenance/port/aft)
+"trP" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/security/glass{
+ id_tag = "outerbrig";
+ name = "Brig"
+ },
+/obj/effect/mapping_helpers/airlock/access/all/security/entrance,
+/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{
+ cycle_id = "sci-entrance"
+ },
+/obj/structure/disposalpipe/segment,
+/turf/open/floor/iron/textured_half,
+/area/station/security/brig/entrance)
"tsb" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/effect/turf_decal/stripes/line,
/obj/structure/sign/departments/aiupload/directional/south,
/turf/open/floor/iron/white,
/area/station/hallway/primary/starboard)
+"tsc" = (
+/obj/structure/table/wood,
+/obj/item/flashlight/lamp/green{
+ pixel_x = 1;
+ pixel_y = 7
+ },
+/turf/open/floor/carpet,
+/area/station/service/library)
"tsl" = (
/obj/effect/landmark/atmospheric_sanity/ignore_area,
/obj/structure/chair/plastic{
@@ -58605,6 +58852,12 @@
},
/turf/open/floor/catwalk_floor/iron,
/area/station/science/xenobiology)
+"tsv" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 10
+ },
+/turf/open/floor/stone,
+/area/station/service/bar)
"tsA" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -58615,33 +58868,20 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/dark/hidden,
/turf/open/floor/iron/grimy,
/area/station/tcommsat/server)
-"tsB" = (
-/obj/effect/turf_decal/tile/brown/opposingcorners{
+"tsE" = (
+/obj/structure/chair{
dir = 1
},
-/obj/machinery/holopad,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/iron,
-/area/station/commons/vacant_room/commissary)
+/obj/machinery/light/small/directional/south,
+/turf/open/floor/iron/showroomfloor,
+/area/station/commons/toilet/auxiliary)
"tsF" = (
/turf/closed/wall/r_wall,
/area/station/hallway/primary/central/fore)
-"tsO" = (
-/obj/effect/turf_decal/trimline/neutral/line{
- dir = 1
- },
-/obj/effect/turf_decal/trimline/neutral/line,
-/obj/effect/landmark/start/hangover,
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/fore)
"tsR" = (
/obj/machinery/electrolyzer,
/turf/open/floor/catwalk_floor,
/area/station/maintenance/disposal/incinerator)
-"ttb" = (
-/obj/structure/flora/grass/jungle/b/style_random,
-/turf/open/floor/grass,
-/area/station/service/chapel)
"ttg" = (
/obj/structure/lattice/catwalk,
/obj/structure/railing{
@@ -58649,16 +58889,6 @@
},
/turf/open/space/basic,
/area/station/engineering/atmos/space_catwalk)
-"tts" = (
-/obj/machinery/light/floor,
-/obj/structure/altar_of_gods,
-/obj/item/book/bible,
-/obj/effect/landmark/start/hangover,
-/obj/item/flashlight/lantern{
- pixel_y = 5
- },
-/turf/open/floor/wood/tile,
-/area/station/service/chapel)
"ttD" = (
/obj/effect/turf_decal/stripes/red/line{
dir = 9
@@ -58773,16 +59003,6 @@
/obj/structure/cable,
/turf/open/floor/plating,
/area/station/maintenance/port/lesser)
-"twe" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/obj/machinery/status_display/evac/directional/west,
-/obj/structure/disposalpipe/segment,
-/obj/effect/landmark/start/hangover,
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/fore)
"twg" = (
/obj/structure/railing{
dir = 5
@@ -58796,12 +59016,6 @@
/obj/structure/steam_vent,
/turf/open/floor/plating,
/area/station/maintenance/starboard/central)
-"twm" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/closed/wall,
-/area/station/maintenance/port/greater)
"two" = (
/obj/structure/table/reinforced,
/obj/structure/desk_bell{
@@ -58813,6 +59027,38 @@
},
/turf/open/floor/iron/textured_large,
/area/station/security/checkpoint/customs/auxiliary)
+"twt" = (
+/obj/effect/landmark/event_spawn,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+ dir = 8
+ },
+/obj/structure/table,
+/obj/merge_conflict_marker{
+ name = "---Merge Conflict Marker---";
+
+ desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
+ },
+/obj/effect/landmark/event_spawn,
+/obj/structure/table,
+/obj/machinery/reagentgrinder{
+ pixel_y = 9;
+ pixel_x = 4
+ },
+/obj/item/reagent_containers/condiment/peppermill{
+ pixel_x = 3
+ },
+/obj/item/reagent_containers/condiment/saltshaker{
+ pixel_x = -3
+ },
+/obj/item/reagent_containers/condiment/enzyme{
+ pixel_x = -7;
+ pixel_y = 6
+ },
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+ dir = 8
+ },
+/turf/open/floor/iron/kitchen/small,
+/area/station/service/kitchen)
"tww" = (
/obj/machinery/suit_storage_unit/security,
/obj/structure/window/reinforced/spawner/directional/west,
@@ -58855,13 +59101,6 @@
/obj/machinery/light/small/directional/south,
/turf/open/floor/iron/grimy,
/area/station/command/heads_quarters/ce)
-"twN" = (
-/obj/effect/turf_decal/weather/dirt{
- dir = 8
- },
-/obj/machinery/newscaster/directional/west,
-/turf/open/floor/grass,
-/area/station/service/chapel)
"twQ" = (
/obj/effect/turf_decal/stripes/white/line{
dir = 9
@@ -58874,6 +59113,14 @@
/obj/effect/landmark/start/assistant,
/turf/open/floor/iron/white,
/area/station/hallway/primary/starboard)
+"txc" = (
+/obj/effect/turf_decal/tile/neutral/opposingcorners,
+/obj/structure/chair/sofa/bench/right{
+ dir = 4
+ },
+/obj/effect/landmark/start/hangover,
+/turf/open/floor/iron,
+/area/station/holodeck/rec_center)
"txd" = (
/obj/effect/turf_decal/siding/dark{
dir = 8
@@ -58921,12 +59168,6 @@
/obj/machinery/light/small/directional/west,
/turf/open/floor/iron/showroomfloor,
/area/station/commons/toilet/auxiliary)
-"txW" = (
-/obj/structure/window/reinforced/spawner/directional/north,
-/obj/structure/window/reinforced/spawner/directional/south,
-/obj/structure/grille,
-/turf/open/floor/plating,
-/area/station/hallway/primary/central/fore)
"tyh" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -58973,12 +59214,6 @@
},
/turf/open/floor/iron/dark/small,
/area/station/engineering/supermatter/room)
-"tyz" = (
-/obj/effect/turf_decal/siding/wood/corner,
-/obj/effect/turf_decal/siding/wood,
-/obj/effect/landmark/start/hangover,
-/turf/open/floor/stone,
-/area/station/service/bar)
"tyA" = (
/obj/machinery/vending/modularpc,
/obj/structure/sign/departments/science/alt/directional/east,
@@ -58988,6 +59223,14 @@
/obj/structure/cable,
/turf/open/floor/iron/smooth,
/area/station/cargo/drone_bay)
+"tyL" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 10
+ },
+/obj/machinery/light/floor,
+/obj/structure/table/wood,
+/turf/open/floor/iron/grimy,
+/area/station/service/bar)
"tyT" = (
/obj/structure/transport/linear/tram,
/obj/structure/thermoplastic,
@@ -59063,18 +59306,36 @@
},
/turf/open/floor/iron/dark,
/area/station/science/genetics)
-"tzN" = (
-/obj/effect/turf_decal/weather/dirt{
+"tzS" = (
+/obj/effect/turf_decal/siding/wideplating/dark/corner,
+/obj/effect/turf_decal/tile/dark_red/half/contrasted{
+ dir = 1
+ },
+/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/structure/flora/bush/flowers_yw/style_2,
-/obj/structure/flora/bush/large/style_random,
-/turf/open/floor/grass,
-/area/station/service/chapel)
+/turf/open/floor/iron,
+/area/station/security/brig/entrance)
"tzZ" = (
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/commons/fitness/locker_room)
+"tAd" = (
+/obj/effect/turf_decal/tile/neutral/opposingcorners,
+/obj/item/kirbyplants/random,
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/power/apc/auto_name/directional/east,
+/turf/open/floor/iron,
+/area/station/holodeck/rec_center)
+"tAi" = (
+/obj/effect/turf_decal/siding/wood,
+/obj/effect/turf_decal/siding/wood/corner{
+ dir = 4
+ },
+/obj/machinery/holopad,
+/turf/open/floor/stone,
+/area/station/service/bar)
"tAm" = (
/obj/effect/turf_decal/tile/brown/opposingcorners,
/obj/effect/decal/cleanable/dirt,
@@ -59141,19 +59402,6 @@
/obj/effect/spawner/random/engineering/flashlight,
/turf/open/floor/catwalk_floor/iron,
/area/station/maintenance/department/medical/central)
-"tAF" = (
-/obj/effect/turf_decal/siding/wood{
- dir = 1
- },
-/obj/effect/turf_decal/siding/wood,
-/obj/machinery/door/airlock/public/glass{
- name = "Chapel Office"
- },
-/obj/machinery/door/firedoor,
-/obj/effect/mapping_helpers/airlock/access/all/service/chapel_office,
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/iron/textured_half,
-/area/station/service/chapel/office)
"tAH" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/effect/turf_decal/trimline/blue/filled/line{
@@ -59161,6 +59409,15 @@
},
/turf/open/floor/iron/white,
/area/station/medical/treatment_center)
+"tAM" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/turf_decal/tile/dark_red/opposingcorners,
+/obj/machinery/camera/autoname/directional/west,
+/obj/machinery/light/small/directional/west,
+/obj/structure/disposalpipe/segment,
+/turf/open/floor/iron,
+/area/station/security/brig/entrance)
"tAP" = (
/obj/effect/landmark/blobstart,
/turf/open/floor/iron/dark/small,
@@ -59184,12 +59441,17 @@
/obj/effect/turf_decal/siding/wood,
/turf/open/floor/iron/grimy,
/area/station/tcommsat/server)
-"tBk" = (
-/obj/effect/turf_decal/siding/wood{
- dir = 1
+"tBg" = (
+/obj/machinery/door/airlock/engineering{
+ name = "Main Engineering"
},
-/turf/open/floor/stone,
-/area/station/service/chapel)
+/obj/machinery/door/firedoor,
+/obj/effect/mapping_helpers/airlock/access/any/engineering/construction,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/disposalpipe/segment,
+/turf/open/floor/catwalk_floor,
+/area/station/engineering/break_room)
"tBm" = (
/obj/machinery/hydroponics/soil,
/turf/open/floor/grass,
@@ -59294,6 +59556,14 @@
/obj/machinery/shower/directional/west,
/turf/open/floor/iron/dark,
/area/station/medical/pharmacy)
+"tDh" = (
+/obj/effect/turf_decal/siding/wood,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/chair/wood{
+ dir = 8
+ },
+/turf/open/floor/iron/grimy,
+/area/station/service/bar)
"tDl" = (
/obj/structure/lattice/catwalk,
/obj/structure/railing{
@@ -59308,9 +59578,31 @@
},
/turf/open/space/basic,
/area/station/engineering/atmos/space_catwalk)
+"tDm" = (
+/obj/structure/table/wood,
+/obj/machinery/barsign{
+ chosen_sign = "thecavern";
+ icon_state = "thecavern";
+ pixel_y = 32
+ },
+/obj/effect/turf_decal/siding/wood{
+ dir = 10
+ },
+/obj/machinery/chem_dispenser/drinks/beer,
+/turf/open/floor/iron/dark/textured,
+/area/station/service/bar)
"tDn" = (
/turf/closed/wall/r_wall,
/area/station/maintenance/department/prison)
+"tDt" = (
+/obj/effect/turf_decal/weather/dirt{
+ dir = 1
+ },
+/obj/structure/flora/bush/jungle/c/style_3{
+ pixel_x = 8
+ },
+/turf/open/floor/grass,
+/area/station/service/chapel)
"tDz" = (
/obj/structure/window/spawner/directional/west,
/obj/structure/chair/sofa/corp/left{
@@ -59322,6 +59614,27 @@
/obj/structure/cable,
/turf/open/floor/plating,
/area/station/maintenance/fore/greater)
+"tDC" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/disposalpipe/sorting/mail{
+ dir = 4
+ },
+/obj/effect/mapping_helpers/mail_sorting/service/bar,
+/obj/merge_conflict_marker{
+ name = "---Merge Conflict Marker---";
+
+ desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/disposalpipe/sorting/mail{
+ dir = 4
+ },
+/obj/effect/mapping_helpers/mail_sorting/service/bar,
+/obj/structure/cable,
+/turf/open/floor/plating,
+/area/station/maintenance/central/greater)
"tDE" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/door/airlock/public/glass{
@@ -59331,17 +59644,6 @@
dir = 1
},
/area/station/hallway/secondary/exit/departure_lounge)
-"tDM" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/obj/structure/disposalpipe/segment{
- dir = 10
- },
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/fore)
"tEg" = (
/obj/structure/transport/linear/tram,
/obj/effect/turf_decal/stripes/white/line{
@@ -59378,6 +59680,20 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/central/fore)
+"tFd" = (
+/obj/structure/sign/poster/official/random/directional/north,
+/obj/structure/table/wood,
+/obj/item/gun/ballistic/shotgun/doublebarrel,
+/obj/structure/reagent_dispensers/beerkeg,
+/obj/structure/reagent_dispensers/beerkeg{
+ pixel_y = 5
+ },
+/obj/machinery/camera/autoname/directional/north,
+/obj/effect/turf_decal/siding/wood{
+ dir = 1
+ },
+/turf/open/floor/stone,
+/area/station/service/bar/backroom)
"tFs" = (
/obj/structure/table/glass,
/obj/item/storage/medkit/regular{
@@ -59419,10 +59735,17 @@
/obj/machinery/chem_master,
/turf/open/floor/iron,
/area/station/medical/chemistry)
-"tGp" = (
-/obj/machinery/light/small/directional/south,
-/turf/open/floor/engine,
-/area/station/science/xenobiology)
+"tGh" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/neutral/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/neutral/line,
+/obj/structure/cable,
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/fore)
"tGq" = (
/turf/closed/wall,
/area/station/service/kitchen/coldroom)
@@ -59459,6 +59782,13 @@
"tGK" = (
/turf/closed/wall/rust,
/area/station/maintenance/department/electrical)
+"tGR" = (
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/machinery/camera/autoname/directional/west,
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/fore)
"tGU" = (
/obj/structure/closet/emcloset,
/obj/effect/turf_decal/tile/blue,
@@ -59466,6 +59796,15 @@
dir = 4
},
/area/station/hallway/secondary/entry)
+"tGY" = (
+/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 = 1
+ },
+/obj/effect/turf_decal/siding/wood/corner,
+/turf/open/floor/stone,
+/area/station/service/chapel)
"tHa" = (
/obj/effect/turf_decal/stripes/line,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
@@ -59553,6 +59892,16 @@
},
/turf/open/floor/iron,
/area/station/security)
+"tJj" = (
+/obj/effect/turf_decal/plaque{
+ icon_state = "L7";
+ pixel_y = -15
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/aft)
"tJo" = (
/obj/structure/closet/lasertag/blue,
/obj/effect/turf_decal/stripes/red/line{
@@ -59562,6 +59911,16 @@
/obj/machinery/firealarm/directional/south,
/turf/open/floor/iron,
/area/station/commons/fitness/recreation/entertainment)
+"tJp" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/machinery/light/warm/dim,
+/obj/machinery/camera/autoname/directional/south,
+/obj/structure/extinguisher_cabinet/directional/south,
+/obj/effect/turf_decal/tile/neutral,
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/aft)
"tJw" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -59582,18 +59941,6 @@
},
/turf/open/floor/plating,
/area/station/security/brig/entrance)
-"tJF" = (
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/structure/rack,
-/obj/item/storage/toolbox/emergency{
- pixel_x = -2;
- pixel_y = -3
- },
-/obj/item/cigarette/cigar,
-/obj/effect/mapping_helpers/broken_floor,
-/obj/machinery/light_switch/directional/south,
-/turf/open/floor/iron/smooth,
-/area/station/command/bridge)
"tJX" = (
/turf/open/floor/plating,
/area/station/maintenance/aft)
@@ -59609,13 +59956,6 @@
/obj/structure/closet/emcloset,
/turf/open/floor/plating,
/area/station/maintenance/port/greater)
-"tKl" = (
-/obj/effect/landmark/start/assistant,
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/aft)
"tKG" = (
/obj/effect/turf_decal/stripes/line,
/obj/effect/mapping_helpers/broken_floor,
@@ -59624,6 +59964,16 @@
},
/turf/open/floor/plating,
/area/station/science/ordnance/storage)
+"tKK" = (
+/obj/structure/cable,
+/obj/effect/turf_decal/tile/dark_red{
+ dir = 4
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 6
+ },
+/turf/open/floor/iron,
+/area/station/security/brig/entrance)
"tKL" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -59669,6 +60019,42 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
/area/station/maintenance/department/medical/central)
+"tLE" = (
+/obj/structure/table/reinforced,
+/obj/item/reagent_containers/condiment/peppermill{
+ pixel_x = 3
+ },
+/obj/item/reagent_containers/condiment/saltshaker{
+ pixel_x = -3
+ },
+/obj/machinery/door/firedoor/border_only{
+ dir = 4
+ },
+/obj/machinery/door/poddoor/shutters{
+ name = "Kitchen Shutters";
+ id = "kitchenshutters"
+ },
+/obj/merge_conflict_marker{
+ name = "---Merge Conflict Marker---";
+
+ desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
+ },
+/obj/structure/table/reinforced,
+/obj/item/reagent_containers/condiment/peppermill{
+ pixel_x = 3
+ },
+/obj/item/reagent_containers/condiment/saltshaker{
+ pixel_x = -3
+ },
+/obj/machinery/door/firedoor/border_only{
+ dir = 4
+ },
+/obj/machinery/door/poddoor/shutters/preopen{
+ id = "kitchenshutters";
+ name = "Kitchen Shutters"
+ },
+/turf/open/floor/plating,
+/area/station/service/kitchen)
"tMh" = (
/obj/structure/fireaxecabinet/directional/south,
/obj/machinery/door/window/brigdoor/left/directional/north{
@@ -59715,16 +60101,14 @@
/turf/open/floor/iron,
/area/station/security/execution/transfer)
"tNf" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
+/obj/structure/chair/sofa/bench{
+ dir = 1
},
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/effect/turf_decal/tile/neutral{
- dir = 8
+ dir = 4
},
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/fore)
+/turf/open/floor/iron/white/side,
+/area/station/hallway/primary/central/aft)
"tNn" = (
/obj/structure/cable,
/obj/machinery/door/airlock{
@@ -59831,10 +60215,6 @@
/obj/structure/reagent_dispensers/fueltank,
/turf/open/floor/plating,
/area/station/maintenance/department/electrical)
-"tOd" = (
-/obj/structure/flora/bush/jungle/a/style_3,
-/turf/open/floor/grass,
-/area/station/service/chapel)
"tOg" = (
/obj/structure/disposalpipe/segment{
dir = 9
@@ -59850,6 +60230,13 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron,
/area/station/hallway/secondary/recreation)
+"tOm" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+ dir = 4
+ },
+/obj/effect/landmark/start/hangover,
+/turf/open/floor/wood/parquet,
+/area/station/service/library)
"tOs" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -59866,11 +60253,6 @@
},
/turf/open/floor/iron,
/area/station/commons/storage/tools)
-"tOK" = (
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/machinery/griddle,
-/turf/open/floor/iron/kitchen/small,
-/area/station/service/kitchen)
"tOO" = (
/obj/structure/flora/bush/large/style_random{
pixel_x = -20;
@@ -59927,16 +60309,6 @@
/obj/machinery/airalarm/directional/south,
/turf/open/floor/wood,
/area/station/commons/fitness/recreation)
-"tPM" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/effect/turf_decal/tile/neutral,
-/obj/structure/cable,
-/obj/structure/disposalpipe/segment{
- dir = 6
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/fore)
"tPP" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -59947,27 +60319,6 @@
/obj/machinery/status_display/evac/directional/south,
/turf/open/floor/iron,
/area/station/commons/fitness/locker_room)
-"tPX" = (
-/obj/structure/table/wood,
-/obj/item/paper_bin{
- pixel_x = -2;
- pixel_y = 4
- },
-/obj/item/pen{
- pixel_x = -2;
- pixel_y = 4
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/disposalpipe/segment{
- dir = 6
- },
-/obj/machinery/light/small/directional/north,
-/obj/structure/sign/painting/library{
- pixel_y = 32
- },
-/turf/open/floor/wood/parquet,
-/area/station/service/library)
"tPZ" = (
/obj/machinery/netpod,
/obj/machinery/power/apc/auto_name/directional/north,
@@ -59999,14 +60350,14 @@
},
/turf/open/floor/iron/white,
/area/station/medical/virology)
-"tQC" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/seed_extractor,
-/obj/machinery/door/window/right/directional/east,
-/turf/open/floor/iron/textured_half{
- dir = 8
+"tQI" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/turf_decal/tile/neutral,
+/obj/structure/disposalpipe/segment{
+ dir = 4
},
-/area/station/service/hydroponics)
+/turf/open/floor/iron,
+/area/station/hallway/primary/port)
"tQQ" = (
/obj/structure/cable,
/obj/effect/turf_decal/tile/neutral/fourcorners,
@@ -60032,6 +60383,13 @@
},
/turf/open/floor/iron/white,
/area/station/medical/medbay/aft)
+"tRd" = (
+/obj/structure/cable,
+/obj/structure/disposalpipe/segment{
+ dir = 6
+ },
+/turf/open/floor/plating,
+/area/station/maintenance/central/greater)
"tRh" = (
/obj/structure/chair{
dir = 8;
@@ -60067,10 +60425,6 @@
/obj/effect/turf_decal/tile/dark_red/fourcorners,
/turf/open/floor/iron,
/area/station/security/tram)
-"tRJ" = (
-/obj/effect/turf_decal/siding/thinplating_new/light,
-/turf/open/floor/iron/white/small,
-/area/station/service/hydroponics)
"tRR" = (
/obj/structure/chair/stool/directional/east,
/turf/open/floor/iron/smooth,
@@ -60119,14 +60473,6 @@
/obj/machinery/light/small/broken/directional/west,
/turf/open/floor/eighties,
/area/station/service/abandoned_gambling_den/gaming)
-"tSA" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/obj/structure/sign/departments/cargo/directional/west,
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/fore)
"tSB" = (
/obj/structure/cable,
/obj/structure/table/reinforced,
@@ -60136,6 +60482,13 @@
},
/turf/open/floor/iron/kitchen/small,
/area/station/security/prison/mess)
+"tSG" = (
+/obj/machinery/door/airlock/multi_tile/public{
+ dir = 1
+ },
+/obj/machinery/door/firedoor,
+/turf/open/floor/iron/textured_half,
+/area/station/service/bar)
"tSN" = (
/obj/effect/spawner/structure/window/reinforced/plasma,
/obj/machinery/atmospherics/pipe/smart/simple/green/visible{
@@ -60267,12 +60620,6 @@
/obj/machinery/light/small/directional/north,
/turf/open/floor/iron/dark/smooth_large,
/area/station/command/meeting_room)
-"tUj" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/turf/open/floor/plating,
-/area/station/maintenance/central/greater)
"tUo" = (
/obj/structure/disposalpipe/segment{
dir = 9
@@ -60315,6 +60662,13 @@
},
/turf/open/floor/plating,
/area/station/maintenance/starboard/aft)
+"tVb" = (
+/obj/structure/window/reinforced/spawner/directional/north,
+/obj/structure/window/reinforced/spawner/directional/south,
+/obj/structure/grille,
+/obj/structure/window/reinforced/spawner/directional/west,
+/turf/open/floor/plating,
+/area/station/hallway/primary/central/fore)
"tVc" = (
/obj/machinery/door/airlock/external{
name = "Escape Pod One";
@@ -60326,12 +60680,6 @@
"tVe" = (
/turf/open/floor/carpet/red,
/area/station/command/heads_quarters/hos)
-"tVp" = (
-/obj/effect/turf_decal/siding/wood/corner,
-/obj/machinery/holopad,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/stone,
-/area/station/service/bar)
"tVt" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/effect/turf_decal/stripes/corner{
@@ -60357,8 +60705,7 @@
},
/turf/open/floor/iron,
/area/station/cargo/storage)
-"tWm" = (
-/obj/structure/flora/bush/jungle/c/style_3,
+"tWh" = (
/obj/effect/turf_decal/weather/dirt,
/turf/open/floor/grass,
/area/station/service/chapel)
@@ -60406,18 +60753,15 @@
dir = 1
},
/area/station/hallway/secondary/exit/departure_lounge)
+"tXa" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/stone,
+/area/station/service/chapel)
"tXl" = (
/obj/effect/turf_decal/sand/plating,
/obj/structure/table/bronze,
/turf/open/floor/wood/tile,
/area/station/maintenance/port/lesser)
-"tXy" = (
-/obj/structure/flora/tree/jungle/small/style_3,
-/obj/effect/turf_decal/weather/dirt,
-/obj/machinery/light/small/directional/south,
-/obj/machinery/status_display/ai/directional/south,
-/turf/open/floor/grass,
-/area/station/service/chapel)
"tXG" = (
/obj/structure/chair{
dir = 8
@@ -60441,6 +60785,19 @@
},
/turf/open/floor/iron/dark,
/area/station/medical/chemistry)
+"tXQ" = (
+/obj/effect/spawner/structure/window,
+/obj/merge_conflict_marker{
+ name = "---Merge Conflict Marker---";
+
+ desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
+ },
+/obj/effect/spawner/structure/window,
+/obj/machinery/door/firedoor/border_only{
+ dir = 4
+ },
+/turf/open/floor/plating,
+/area/station/service/bar)
"tXS" = (
/obj/structure/closet/secure_closet/engineering_personal,
/obj/structure/cable,
@@ -60449,6 +60806,16 @@
/obj/item/clothing/suit/hooded/wintercoat/engineering,
/turf/open/floor/catwalk_floor,
/area/station/engineering/supermatter/room)
+"tYi" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/chair/wood{
+ dir = 8
+ },
+/turf/open/floor/iron/grimy,
+/area/station/service/bar)
"tYj" = (
/obj/item/exodrone,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
@@ -60590,6 +60957,14 @@
},
/turf/open/floor/plating,
/area/station/engineering/atmospherics_engine)
+"uaq" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/structure/extinguisher_cabinet/directional/north,
+/turf/open/floor/iron,
+/area/station/hallway/primary/port)
"uax" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -60701,6 +61076,13 @@
dir = 1
},
/area/station/hallway/primary/central/fore)
+"ubO" = (
+/obj/structure/chair/office{
+ dir = 8
+ },
+/obj/effect/landmark/start/librarian,
+/turf/open/floor/carpet,
+/area/station/service/library)
"ubT" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -60760,6 +61142,17 @@
},
/turf/open/floor/iron/showroomfloor,
/area/station/security/prison/shower)
+"ucX" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
+/obj/effect/turf_decal/trimline/neutral/line,
+/obj/effect/turf_decal/trimline/neutral/line{
+ dir = 1
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/open/floor/iron,
+/area/station/hallway/primary/port)
"ucY" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -60780,16 +61173,6 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron,
/area/station/hallway/primary/aft)
-"udf" = (
-/obj/effect/turf_decal/delivery/white{
- color = "#52B4E9"
- },
-/obj/structure/reagent_dispensers/watertank/high,
-/obj/effect/turf_decal/siding/thinplating/light/end{
- dir = 8
- },
-/turf/open/floor/iron/white/small,
-/area/station/service/hydroponics)
"udv" = (
/obj/machinery/telecomms/receiver/preset_right,
/turf/open/floor/circuit,
@@ -60933,6 +61316,20 @@
"ufn" = (
/turf/open/floor/iron,
/area/station/hallway/secondary/entry)
+"ufx" = (
+/obj/effect/turf_decal/trimline/neutral/line,
+/obj/effect/turf_decal/trimline/neutral/line{
+ dir = 1
+ },
+/obj/machinery/navbeacon{
+ codes_txt = "patrol;next_patrol=23.1-Evac";
+ location = "22.0-Porthall-Evac"
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/open/floor/iron,
+/area/station/hallway/primary/port)
"ufE" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -60967,18 +61364,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/catwalk_floor,
/area/station/engineering/supermatter/room)
-"ugb" = (
-/obj/machinery/door/airlock/security/glass{
- id_tag = "outerbrig";
- name = "Brig"
- },
-/obj/effect/mapping_helpers/airlock/access/all/security/entrance,
-/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{
- cycle_id = "sci-entrance"
- },
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/iron/textured_half,
-/area/station/security/brig/entrance)
"uge" = (
/obj/structure/cable,
/obj/structure/disposalpipe/segment{
@@ -61014,6 +61399,32 @@
},
/turf/open/floor/iron/dark,
/area/station/command/heads_quarters/rd)
+"ugp" = (
+/obj/effect/turf_decal/weather/dirt{
+ dir = 1
+ },
+/obj/structure/flora/bush/flowers_yw,
+/turf/open/floor/grass,
+/area/station/service/chapel)
+"ugs" = (
+/obj/structure/table/reinforced,
+/obj/machinery/door/firedoor,
+/obj/machinery/door/window/right/directional/east,
+/obj/merge_conflict_marker{
+ name = "---Merge Conflict Marker---";
+
+ desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
+ },
+/obj/structure/table/reinforced,
+/obj/machinery/door/firedoor,
+/obj/machinery/door/window/right/directional/east{
+ req_access = list("hydroponics");
+ name = "Hydroponics Service Desk"
+ },
+/turf/open/floor/iron/textured_half{
+ dir = 8
+ },
+/area/station/service/hydroponics)
"ugA" = (
/obj/effect/turf_decal/siding/yellow{
dir = 1
@@ -61048,10 +61459,6 @@
},
/turf/open/floor/iron/dark/herringbone,
/area/station/security/courtroom)
-"ugI" = (
-/obj/structure/flora/tree/jungle/style_3,
-/turf/open/floor/grass,
-/area/station/service/chapel)
"ugJ" = (
/obj/structure/disposalpipe/segment{
dir = 5
@@ -61137,12 +61544,6 @@
/obj/effect/spawner/random/engineering/tracking_beacon,
/turf/open/floor/iron/smooth,
/area/station/command/gateway)
-"uhM" = (
-/obj/structure/disposalpipe/segment{
- dir = 10
- },
-/turf/open/floor/iron/white,
-/area/station/hallway/primary/central/aft)
"uhT" = (
/turf/open/floor/iron,
/area/station/maintenance/aft)
@@ -61185,12 +61586,20 @@
},
/turf/open/floor/plating,
/area/station/construction/mining/aux_base)
-"uiw" = (
-/obj/structure/disposalpipe/segment{
+"uix" = (
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 4
},
-/turf/open/floor/plating,
-/area/station/maintenance/port/greater)
+/obj/effect/turf_decal/trimline/neutral/line{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/neutral/line{
+ dir = 8
+ },
+/obj/structure/cable,
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/fore)
"uiz" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -61225,6 +61634,16 @@
/obj/effect/turf_decal/trimline/neutral/line,
/turf/open/floor/iron,
/area/station/hallway/primary/starboard)
+"uja" = (
+/obj/effect/turf_decal/plaque{
+ icon_state = "L13";
+ pixel_y = -15
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/aft)
"ujq" = (
/obj/structure/disposalpipe/segment,
/obj/structure/closet/emcloset,
@@ -61239,17 +61658,6 @@
"ujA" = (
/turf/closed/wall/r_wall,
/area/station/security/warden)
-"ujB" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/status_display/evac/directional/north,
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/obj/structure/disposalpipe/junction{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/fore)
"ujE" = (
/obj/item/kirbyplants/random/fullysynthetic,
/obj/effect/turf_decal/tile/dark_red/opposingcorners,
@@ -61342,6 +61750,12 @@
/obj/machinery/camera/autoname/directional/north,
/turf/open/floor/iron/dark,
/area/station/security/checkpoint/science)
+"ukZ" = (
+/obj/machinery/sparker/directional/north{
+ id = "Xenobio"
+ },
+/turf/open/floor/engine/xenobio,
+/area/station/science/xenobiology)
"ulb" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/door/firedoor,
@@ -61378,16 +61792,15 @@
/obj/machinery/light_switch/directional/north,
/turf/open/floor/iron/dark/smooth_large,
/area/station/command/meeting_room)
-"ulE" = (
-/obj/effect/spawner/random/trash,
-/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{
- dir = 4
+"ulr" = (
+/obj/structure/closet/secure_closet/hydroponics,
+/obj/effect/turf_decal/siding/thinplating_new/light{
+ dir = 1
},
-/turf/open/floor/plating,
-/area/station/maintenance/central/greater)
+/obj/structure/sign/poster/official/random/directional/north,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
+/turf/open/floor/iron/white/small,
+/area/station/service/hydroponics)
"ulK" = (
/obj/structure/cable,
/obj/machinery/ntnet_relay,
@@ -61445,6 +61858,21 @@
},
/turf/open/floor/sepia,
/area/station/maintenance/aft)
+"umB" = (
+/obj/machinery/door/airlock/public/glass{
+ name = "Study"
+ },
+/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,
+/obj/structure/disposalpipe/segment,
+/obj/effect/turf_decal/siding/wood/end,
+/obj/effect/turf_decal/siding/wood{
+ dir = 1
+ },
+/turf/open/floor/wood/parquet,
+/area/station/service/library)
"umI" = (
/obj/effect/spawner/random/structure/closet_maintenance,
/obj/effect/spawner/random/maintenance,
@@ -61465,6 +61893,14 @@
},
/turf/open/floor/iron/smooth,
/area/station/security/checkpoint/customs/auxiliary)
+"unA" = (
+/obj/structure/chair/comfy/brown{
+ dir = 4
+ },
+/obj/effect/landmark/start/librarian,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron/grimy,
+/area/station/service/library)
"unG" = (
/obj/machinery/atmospherics/components/unary/portables_connector/visible{
dir = 4
@@ -61487,6 +61923,10 @@
},
/turf/open/floor/iron/dark,
/area/station/command/heads_quarters/rd)
+"unV" = (
+/obj/machinery/computer/security/telescreen/cmo/directional/west,
+/turf/open/floor/wood/parquet,
+/area/station/command/heads_quarters/cmo)
"uoh" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/effect/turf_decal/tile/neutral,
@@ -61512,12 +61952,6 @@
/obj/machinery/light/small/directional/east,
/turf/open/floor/iron,
/area/station/maintenance/hallway/abandoned_command)
-"uoR" = (
-/obj/effect/turf_decal/weather/dirt{
- dir = 6
- },
-/turf/open/floor/grass,
-/area/station/service/chapel)
"upe" = (
/obj/structure/cable,
/obj/structure/disposalpipe/segment{
@@ -61612,10 +62046,6 @@
/obj/machinery/light/small/directional/north,
/turf/open/floor/iron/white,
/area/station/medical/medbay/central)
-"uqq" = (
-/obj/structure/table,
-/turf/open/floor/iron/dark/small,
-/area/station/maintenance/central/lesser)
"uqw" = (
/turf/closed/wall/r_wall,
/area/station/commons/fitness/recreation)
@@ -61641,13 +62071,6 @@
},
/turf/open/floor/iron,
/area/station/cargo/sorting)
-"uqF" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/turf_decal/tile/neutral,
-/obj/structure/extinguisher_cabinet/directional/east,
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/fore)
"uqG" = (
/obj/machinery/atmospherics/pipe/bridge_pipe/purple/visible{
dir = 4
@@ -61699,19 +62122,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/cafeteria,
/area/station/science/breakroom)
-"urf" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/turf_decal/plaque{
- icon_state = "L2";
- pixel_y = -15
- },
-/obj/effect/turf_decal/trimline/neutral/line,
-/obj/effect/turf_decal/trimline/neutral/line{
- dir = 1
- },
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/aft)
"urg" = (
/obj/machinery/door/airlock/engineering{
name = "Engineering Office"
@@ -61732,6 +62142,15 @@
dir = 8
},
/area/station/engineering/main)
+"uri" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/machinery/status_display/evac/directional/north,
+/obj/structure/disposalpipe/segment,
+/turf/open/floor/iron,
+/area/station/hallway/primary/port)
"urk" = (
/obj/structure/disposalpipe/junction{
dir = 1
@@ -61768,14 +62187,6 @@
/obj/effect/landmark/start/assistant,
/turf/open/floor/iron/grimy,
/area/station/hallway/secondary/entry)
-"urq" = (
-/obj/effect/turf_decal/tile/brown/opposingcorners{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron,
-/area/station/commons/vacant_room/commissary)
"uru" = (
/obj/machinery/door/airlock/maintenance{
name = "Maintenance"
@@ -61810,15 +62221,6 @@
/obj/machinery/light/cold/dim/directional/west,
/turf/open/floor/iron/grimy,
/area/station/engineering/main)
-"urF" = (
-/obj/machinery/computer/cargo{
- dir = 1
- },
-/obj/machinery/computer/security/telescreen/vault/directional/south,
-/obj/machinery/camera/autoname/directional/south,
-/obj/machinery/light/small/directional/south,
-/turf/open/floor/wood,
-/area/station/command/heads_quarters/qm)
"urK" = (
/obj/machinery/light/warm/directional/south,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -61836,6 +62238,12 @@
/obj/effect/spawner/structure/window,
/turf/open/floor/plating,
/area/station/security/office)
+"urV" = (
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/aft)
"usd" = (
/obj/effect/spawner/random/trash,
/turf/open/floor/plating,
@@ -61849,16 +62257,6 @@
/obj/structure/cable,
/turf/open/floor/iron/smooth,
/area/station/command/heads_quarters/qm)
-"usA" = (
-/obj/machinery/door/window/left/directional/south{
- name = "Bio-Generator";
- req_access = list("hydroponics")
- },
-/obj/machinery/biogenerator,
-/obj/effect/turf_decal/delivery,
-/obj/machinery/door/firedoor,
-/turf/open/floor/plating,
-/area/station/service/hydroponics)
"usF" = (
/obj/effect/mapping_helpers/broken_floor,
/obj/structure/easel,
@@ -61908,6 +62306,15 @@
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plating,
/area/station/engineering/atmos/space_catwalk)
+"utx" = (
+/obj/effect/turf_decal/weather/dirt,
+/obj/structure/flora/bush/flowers_yw/style_3,
+/obj/machinery/firealarm/directional/south,
+/obj/machinery/light/small/directional/south,
+/obj/machinery/camera/directional/south,
+/obj/machinery/status_display/evac/directional/south,
+/turf/open/floor/grass,
+/area/station/service/chapel)
"utD" = (
/obj/machinery/light_switch/directional/west,
/obj/effect/turf_decal/stripes/corner{
@@ -61917,6 +62324,12 @@
dir = 8
},
/area/station/hallway/secondary/construction)
+"utE" = (
+/obj/effect/turf_decal/tile/blue/anticorner/contrasted{
+ dir = 8
+ },
+/turf/open/floor/iron/white,
+/area/station/medical/medbay/lobby)
"utF" = (
/obj/structure/cable,
/obj/structure/disposalpipe/segment{
@@ -61974,16 +62387,6 @@
/obj/item/radio/intercom/directional/west,
/turf/open/floor/iron/dark/small,
/area/station/engineering/supermatter/room)
-"uuz" = (
-/obj/structure/rack,
-/obj/effect/turf_decal/tile/brown/opposingcorners{
- dir = 1
- },
-/obj/item/clothing/mask/gas,
-/obj/machinery/airalarm/directional/west,
-/obj/machinery/camera/directional/west,
-/turf/open/floor/iron,
-/area/station/commons/vacant_room/commissary)
"uuN" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -62010,10 +62413,6 @@
},
/turf/open/floor/iron/white/small,
/area/station/medical/storage)
-"uvb" = (
-/obj/structure/dresser,
-/turf/open/floor/wood,
-/area/station/cargo/boutique)
"uvf" = (
/obj/structure/cable,
/obj/machinery/button/door/directional/south{
@@ -62037,19 +62436,14 @@
/turf/open/floor/iron/small,
/area/station/engineering/atmos/pumproom)
"uvs" = (
-/obj/effect/turf_decal/siding/thinplating{
- dir = 4
+/obj/machinery/door/airlock{
+ name = "Maintenance"
},
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
-/turf/open/floor/eighties,
-/area/station/hallway/primary/central/fore)
-"uvx" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/mapping_helpers/airlock/access/any/service/general,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/disposalpipe/segment{
- dir = 9
- },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/cable,
+/obj/structure/disposalpipe/segment,
/turf/open/floor/plating,
/area/station/maintenance/central/greater)
"uvz" = (
@@ -62073,11 +62467,13 @@
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/iron/smooth,
/area/station/engineering/supermatter/room)
-"uvG" = (
-/obj/effect/turf_decal/tile/neutral/opposingcorners,
-/obj/effect/spawner/random/entertainment/arcade,
+"uvD" = (
+/obj/effect/landmark/start/hangover,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
/turf/open/floor/iron,
-/area/station/holodeck/rec_center)
+/area/station/hallway/primary/central/aft)
"uwB" = (
/obj/effect/turf_decal/tile/dark_red/half/contrasted{
dir = 4
@@ -62103,6 +62499,13 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/maintenance/port/fore)
+"uxq" = (
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/turf_decal/tile/neutral,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/fore)
"uxJ" = (
/obj/machinery/smartfridge/chemistry/preloaded,
/obj/machinery/door/firedoor,
@@ -62123,6 +62526,18 @@
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/station/engineering/storage/tech)
+"uym" = (
+/obj/effect/turf_decal/tile/blue/half/contrasted{
+ dir = 8
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/open/floor/iron/white,
+/area/station/medical/medbay/lobby)
"uyA" = (
/obj/structure/disposalpipe/segment,
/obj/effect/decal/cleanable/dirt,
@@ -62136,6 +62551,15 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/iron,
/area/station/engineering/atmos)
+"uyD" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/turf_decal/tile/neutral,
+/obj/machinery/camera/autoname/directional/south,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/open/floor/iron,
+/area/station/hallway/primary/port)
"uyH" = (
/obj/structure/cable,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
@@ -62151,20 +62575,6 @@
},
/turf/open/floor/iron,
/area/station/engineering/atmos/pumproom)
-"uyV" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
- dir = 1
- },
-/obj/structure/disposalpipe/segment,
-/obj/effect/turf_decal/tile/neutral/opposingcorners{
- dir = 1
- },
-/obj/effect/turf_decal/siding/thinplating_new{
- dir = 8
- },
-/turf/open/floor/iron/small,
-/area/station/hallway/secondary/service)
"uzj" = (
/obj/structure/cable,
/obj/effect/spawner/structure/window/reinforced,
@@ -62216,15 +62626,6 @@
/obj/structure/table/wood,
/turf/open/floor/carpet/lone,
/area/station/service/chapel/office)
-"uAk" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/turf_decal/tile/neutral,
-/obj/structure/sign/departments/holy/directional/south,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/station/hallway/primary/port)
"uAo" = (
/obj/effect/turf_decal/trimline/neutral/line{
dir = 8
@@ -62297,20 +62698,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/stairs,
/area/station/engineering/storage/tech)
-"uBI" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/door/firedoor,
-/obj/effect/turf_decal/stripes/red/line{
- dir = 8
- },
-/obj/effect/turf_decal/stripes/red/line{
- dir = 4
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/iron/small,
-/area/station/hallway/primary/central/fore)
"uBM" = (
/obj/machinery/door/poddoor/preopen{
id = "Engineering";
@@ -62320,15 +62707,6 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/iron,
/area/station/engineering/lobby)
-"uBN" = (
-/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/wood{
- dir = 10
- },
-/turf/open/floor/stone,
-/area/station/service/bar/backroom)
"uBQ" = (
/obj/structure/table/bronze,
/obj/machinery/microwave{
@@ -62341,6 +62719,13 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/white/side,
/area/station/hallway/primary/starboard)
+"uBZ" = (
+/obj/machinery/atmospherics/components/unary/outlet_injector/on{
+ dir = 8
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/engine/xenobio,
+/area/station/science/xenobiology)
"uCa" = (
/obj/structure/lattice/catwalk,
/obj/structure/railing{
@@ -62370,28 +62755,24 @@
/obj/item/mop,
/turf/open/floor/plating,
/area/station/maintenance/department/medical/central)
-"uCo" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/obj/structure/extinguisher_cabinet/directional/north,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/wood/parquet,
-/area/station/service/library)
"uCp" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/firealarm/directional/south,
/turf/open/floor/iron/white/side,
/area/station/hallway/primary/starboard)
-"uCB" = (
-/obj/effect/turf_decal/weather/dirt{
- dir = 6
+"uCt" = (
+/obj/effect/spawner/random/entertainment/lighter,
+/obj/item/cigarette/rollie/mindbreaker{
+ pixel_x = -2;
+ pixel_y = 6
},
-/obj/structure/flora/bush/sparsegrass,
-/turf/open/floor/grass,
-/area/station/service/chapel)
+/obj/item/cigarette/rollie/trippy{
+ pixel_x = 4
+ },
+/obj/effect/mapping_helpers/burnt_floor,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plating,
+/area/station/maintenance/starboard/greater)
"uCE" = (
/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{
dir = 5
@@ -62452,15 +62833,6 @@
dir = 8
},
/area/station/commons/fitness/locker_room)
-"uDE" = (
-/obj/structure/window/spawner/directional/north,
-/obj/structure/flora/bush/flowers_yw/style_random,
-/obj/machinery/door/airlock{
- id_tag = "Toilet1";
- name = "Unit 1"
- },
-/turf/open/misc/sandy_dirt,
-/area/station/commons/fitness/locker_room)
"uDF" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -62519,6 +62891,15 @@
},
/turf/open/floor/engine,
/area/station/science/xenobiology)
+"uEG" = (
+/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{
+ dir = 6
+ },
+/turf/open/floor/plating,
+/area/station/maintenance/central/greater)
"uEI" = (
/obj/structure/flora/bush/lavendergrass/style_random,
/obj/structure/window/reinforced/spawner/directional/west,
@@ -62552,6 +62933,13 @@
},
/turf/open/floor/iron/dark/small,
/area/station/security/brig)
+"uFb" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/structure/cable,
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/aft)
"uFc" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -62579,6 +62967,10 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/starboard)
+"uFs" = (
+/obj/structure/flora/grass/jungle/b/style_random,
+/turf/open/floor/grass,
+/area/station/service/chapel)
"uFt" = (
/obj/structure/cable,
/obj/structure/disposalpipe/segment{
@@ -62621,16 +63013,6 @@
dir = 1
},
/area/station/hallway/primary/starboard)
-"uFG" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/effect/turf_decal/trimline/neutral/line{
- dir = 1
- },
-/obj/effect/turf_decal/trimline/neutral/line,
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/fore)
"uFQ" = (
/obj/structure/closet/crate/coffin,
/obj/structure/window/spawner/directional/south,
@@ -62690,14 +63072,6 @@
},
/turf/open/floor/iron,
/area/station/engineering/hallway)
-"uGD" = (
-/obj/effect/turf_decal/siding/wood{
- dir = 1
- },
-/obj/structure/bookcase/random/adult,
-/obj/structure/sign/poster/official/random/directional/north,
-/turf/open/floor/iron/grimy,
-/area/station/service/library)
"uGH" = (
/obj/machinery/rnd/production/circuit_imprinter,
/obj/effect/turf_decal/bot,
@@ -62814,6 +63188,14 @@
/obj/structure/railing,
/turf/open/space/basic,
/area/space/nearstation)
+"uHu" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/landmark/start/hangover,
+/obj/effect/turf_decal/siding/wood{
+ dir = 1
+ },
+/turf/open/floor/stone,
+/area/station/service/chapel)
"uHv" = (
/obj/structure/rack,
/obj/item/pipe_dispenser,
@@ -62865,6 +63247,16 @@
/obj/structure/flora/bush/fullgrass/style_random,
/turf/open/floor/grass,
/area/station/medical/treatment_center)
+"uIp" = (
+/obj/structure/sign/departments/botany/alt1/directional/north,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/aft)
"uIv" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -62880,26 +63272,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron,
/area/station/hallway/secondary/recreation)
-"uIA" = (
-/obj/effect/turf_decal/siding/thinplating_new/light{
- dir = 9
- },
-/turf/open/floor/iron/white/small,
-/area/station/service/hydroponics)
-"uIP" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/turf_decal/tile/red/opposingcorners,
-/obj/effect/turf_decal/tile/blue/opposingcorners{
- dir = 8
- },
-/obj/machinery/firealarm/directional/north,
-/obj/structure/cable,
-/obj/structure/disposalpipe/segment{
- dir = 6
- },
-/turf/open/floor/iron/smooth,
-/area/station/service/greenroom)
"uIT" = (
/obj/effect/turf_decal/sand/plating,
/obj/effect/decal/cleanable/dirt,
@@ -62917,15 +63289,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold/green/visible,
/turf/open/floor/iron/smooth,
/area/station/engineering/supermatter/room)
-"uJi" = (
-/obj/effect/turf_decal/tile/green/opposingcorners,
-/obj/effect/turf_decal/tile/blue/opposingcorners{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/iron,
-/area/station/service/hydroponics)
"uJq" = (
/obj/effect/spawner/random/structure/crate_abandoned,
/turf/open/floor/plating,
@@ -62961,6 +63324,12 @@
/obj/effect/landmark/event_spawn,
/turf/open/floor/iron,
/area/station/engineering/atmospherics_engine)
+"uKe" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+ dir = 4
+ },
+/turf/open/floor/iron/grimy,
+/area/station/service/library)
"uKh" = (
/obj/structure/closet/emcloset,
/obj/effect/turf_decal/bot,
@@ -62981,6 +63350,15 @@
},
/turf/open/floor/iron/white,
/area/station/medical/treatment_center)
+"uKw" = (
+/obj/structure/disposalpipe/segment{
+ dir = 9
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/turf_decal/tile/neutral/opposingcorners,
+/obj/item/radio/intercom/directional/east,
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/fore)
"uKA" = (
/obj/machinery/computer/warrant{
dir = 1
@@ -63036,36 +63414,15 @@
"uLj" = (
/turf/closed/wall,
/area/station/commons/toilet/auxiliary)
-"uLD" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/structure/cable,
-/obj/machinery/duct,
-/obj/effect/decal/cleanable/dirt,
-/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/central/lesser)
-"uLK" = (
-/obj/structure/sign/directions/evac/directional/west,
-/obj/structure/sign/directions/science/directional/west{
- dir = 4;
- pixel_y = -8
- },
-/obj/structure/sign/directions/security/directional/west{
- pixel_y = 8
+"uLm" = (
+/obj/effect/turf_decal/tile/brown/opposingcorners{
+ dir = 1
},
-/obj/effect/turf_decal/tile/neutral{
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
dir = 8
},
-/obj/machinery/door/firedoor,
-/obj/effect/turf_decal/stripes/red/line,
-/obj/effect/turf_decal/stripes/red/line{
- dir = 1
- },
-/turf/open/floor/iron/small,
-/area/station/hallway/primary/central/fore)
+/turf/open/floor/iron,
+/area/station/commons/vacant_room/commissary)
"uLO" = (
/obj/item/stack/sheet/cardboard{
amount = 14
@@ -63113,6 +63470,13 @@
},
/turf/open/floor/iron/small,
/area/station/medical/cryo)
+"uMp" = (
+/obj/effect/turf_decal/weather/dirt{
+ dir = 1
+ },
+/obj/structure/flora/bush/large/style_3,
+/turf/open/floor/grass,
+/area/station/service/chapel)
"uMu" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -63139,6 +63503,19 @@
/obj/machinery/airalarm/directional/west,
/turf/open/floor/iron/dark,
/area/station/command/corporate_dock)
+"uMO" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/door/firedoor,
+/obj/effect/turf_decal/stripes/red/line,
+/obj/effect/turf_decal/stripes/red/line{
+ dir = 1
+ },
+/obj/structure/disposalpipe/segment,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/open/floor/iron/small,
+/area/station/hallway/primary/central/fore)
"uMT" = (
/obj/machinery/door/poddoor/shutters/window{
dir = 4;
@@ -63180,6 +63557,50 @@
/obj/item/radio/intercom/directional/north,
/turf/open/floor/iron/smooth,
/area/station/security/checkpoint/customs)
+"uNh" = (
+/obj/effect/turf_decal/tile/dark_red/half/contrasted{
+ dir = 1
+ },
+/obj/machinery/light/cold/directional/south,
+/obj/structure/disposalpipe/sorting/mail/flip{
+ dir = 4
+ },
+/obj/effect/mapping_helpers/mail_sorting/security/detectives_office,
+/turf/open/floor/iron,
+/area/station/security/brig/entrance)
+"uNi" = (
+/obj/structure/table,
+/obj/effect/turf_decal/tile/dark_red,
+/obj/effect/decal/cleanable/dirt,
+/obj/item/food/gumball{
+ pixel_x = 5;
+ pixel_y = 9
+ },
+/obj/item/cigarette/candy{
+ pixel_x = -3;
+ pixel_y = 10
+ },
+/obj/item/food/gumball{
+ pixel_x = 2;
+ pixel_y = 5
+ },
+/obj/item/weldingtool/mini{
+ pixel_x = 5;
+ pixel_y = -11
+ },
+/obj/item/screwdriver{
+ pixel_x = 2;
+ pixel_y = -3
+ },
+/obj/item/storage/box/prisoner{
+ pixel_x = 5;
+ pixel_y = -12
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 10
+ },
+/turf/open/floor/iron/dark,
+/area/station/security/processing)
"uNk" = (
/obj/effect/turf_decal/stripes/white/line{
dir = 9
@@ -63230,19 +63651,6 @@
"uOw" = (
/turf/open/floor/iron,
/area/station/maintenance/department/medical/central)
-"uOx" = (
-/obj/effect/turf_decal/siding/wideplating_new/terracotta{
- dir = 5
- },
-/turf/open/floor/wood/tile,
-/area/station/maintenance/central/lesser)
-"uOz" = (
-/obj/structure/flora/rock/pile/jungle/style_4,
-/obj/effect/turf_decal/weather/dirt{
- dir = 1
- },
-/turf/open/floor/grass,
-/area/station/service/chapel)
"uOH" = (
/obj/item/kirbyplants/random,
/obj/machinery/light_switch/directional/west,
@@ -63300,11 +63708,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/closed/wall,
/area/station/engineering/supermatter/room)
-"uPW" = (
-/obj/structure/flora/bush/flowers_pp/style_2,
-/obj/structure/flora/bush/large/style_3,
-/turf/open/floor/grass,
-/area/station/service/chapel)
"uPX" = (
/obj/structure/railing{
dir = 8
@@ -63347,20 +63750,19 @@
},
/turf/open/floor/iron/dark/small,
/area/station/security/brig)
-"uQG" = (
-/obj/machinery/airalarm/directional/east,
-/turf/open/floor/iron,
-/area/station/commons/fitness/locker_room)
-"uQK" = (
+"uQD" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/effect/turf_decal/trimline/neutral/line,
/obj/effect/turf_decal/trimline/neutral/line{
dir = 1
},
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/turf/open/floor/iron,
-/area/station/hallway/primary/port)
+/area/station/hallway/primary/central/aft)
+"uQG" = (
+/obj/machinery/airalarm/directional/east,
+/turf/open/floor/iron,
+/area/station/commons/fitness/locker_room)
"uRe" = (
/obj/structure/reagent_dispensers/water_cooler,
/obj/effect/turf_decal/tile/red{
@@ -63373,6 +63775,19 @@
dir = 1
},
/area/station/hallway/secondary/exit/departure_lounge)
+"uRi" = (
+/obj/structure/disposalpipe/segment{
+ dir = 10
+ },
+/obj/effect/turf_decal/trimline/neutral/line{
+ dir = 5
+ },
+/obj/effect/turf_decal/trimline/neutral/corner{
+ dir = 8
+ },
+/obj/structure/cable,
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/fore)
"uRj" = (
/obj/structure/cable,
/obj/structure/disposalpipe/segment{
@@ -63386,12 +63801,17 @@
dir = 1
},
/area/station/hallway/secondary/exit/departure_lounge)
-"uRv" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
- dir = 1
+"uRo" = (
+/obj/machinery/barsign{
+ chosen_sign = "thecavern";
+ icon_state = "thecavern";
+ pixel_y = 32
},
-/turf/open/floor/iron/kitchen/small,
-/area/station/service/kitchen)
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/aft)
"uRF" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
@@ -63439,19 +63859,6 @@
"uSa" = (
/turf/open/floor/iron,
/area/station/maintenance/department/engine/atmos)
-"uSb" = (
-/obj/effect/turf_decal/siding/wood{
- dir = 4
- },
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
-/turf/open/floor/iron/grimy,
-/area/station/service/library)
-"uSh" = (
-/obj/effect/turf_decal/siding/wood{
- dir = 8
- },
-/turf/open/floor/wood/parquet,
-/area/station/service/library)
"uSi" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -63519,27 +63926,9 @@
/obj/structure/table/glass,
/turf/open/floor/iron/dark,
/area/station/service/lawoffice)
-"uTz" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/turf_decal/siding/wideplating/dark,
-/obj/effect/turf_decal/tile/dark_red/half/contrasted{
- dir = 1
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/station/security/brig/entrance)
"uTA" = (
/turf/closed/wall,
/area/station/ai_monitored/turret_protected/ai)
-"uTE" = (
-/obj/structure/disposalpipe/segment{
- dir = 6
- },
-/turf/open/floor/wood/parquet,
-/area/station/service/library)
"uTK" = (
/obj/structure/table/reinforced,
/obj/machinery/door/firedoor,
@@ -63566,6 +63955,11 @@
},
/turf/open/floor/iron/dark/small,
/area/station/science/xenobiology)
+"uTS" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/wood/tile,
+/area/station/service/bar)
"uUb" = (
/obj/structure/disposalpipe/segment{
dir = 9
@@ -63711,6 +64105,18 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
/turf/open/floor/iron/dark,
/area/station/medical/medbay/lobby)
+"uWX" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/thinplating_new/light{
+ dir = 10
+ },
+/obj/structure/extinguisher_cabinet/directional/west,
+/obj/machinery/light/small/directional/south,
+/obj/effect/landmark/start/botanist,
+/turf/open/floor/iron/white/small,
+/area/station/service/hydroponics)
"uWZ" = (
/obj/machinery/door/airlock/public,
/obj/effect/decal/cleanable/dirt,
@@ -63766,10 +64172,24 @@
/obj/effect/spawner/random/trash,
/turf/open/floor/plating,
/area/station/maintenance/port/lesser)
+"uYc" = (
+/obj/effect/turf_decal/weather/dirt{
+ dir = 1
+ },
+/obj/structure/flora/bush/flowers_br/style_random,
+/turf/open/floor/grass,
+/area/station/service/chapel)
"uYo" = (
/obj/effect/spawner/random/vending/colavend,
/turf/open/floor/iron/white,
/area/station/hallway/primary/starboard)
+"uYy" = (
+/obj/effect/turf_decal/siding/thinplating_new/light{
+ dir = 5
+ },
+/obj/effect/landmark/start/botanist,
+/turf/open/floor/iron/white/small,
+/area/station/service/hydroponics)
"uYD" = (
/obj/structure/table,
/obj/effect/turf_decal/tile/green/fourcorners,
@@ -63814,15 +64234,6 @@
},
/turf/open/floor/iron,
/area/station/security/brig/entrance)
-"uZy" = (
-/obj/effect/turf_decal/weather/snow,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/disposalpipe/segment{
- dir = 9
- },
-/obj/effect/turf_decal/weather/snow/corner,
-/turf/open/floor/iron/freezer,
-/area/station/service/kitchen/coldroom)
"uZA" = (
/obj/structure/chair{
dir = 1;
@@ -63848,6 +64259,25 @@
},
/turf/open/floor/plating,
/area/station/maintenance/central/lesser)
+"vac" = (
+/obj/effect/turf_decal/weather/dirt,
+/obj/structure/flora/bush/flowers_pp/style_random,
+/turf/open/floor/grass,
+/area/station/service/chapel)
+"vad" = (
+/obj/structure/sign/directions/engineering{
+ dir = 1;
+ pixel_y = 8
+ },
+/obj/structure/sign/directions/command{
+ dir = 1
+ },
+/obj/structure/sign/directions/supply{
+ dir = 1;
+ pixel_y = -8
+ },
+/turf/closed/wall,
+/area/station/service/library)
"vaf" = (
/obj/item/kirbyplants/random/fullysynthetic,
/obj/machinery/status_display/ai/directional/south,
@@ -63943,6 +64373,13 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/hallway/secondary/entry)
+"vbV" = (
+/obj/effect/landmark/event_spawn,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+ dir = 1
+ },
+/turf/open/floor/stone,
+/area/station/service/chapel)
"vcd" = (
/obj/structure/chair{
dir = 8
@@ -63961,6 +64398,21 @@
/obj/item/pickaxe,
/turf/open/misc/asteroid,
/area/station/maintenance/department/electrical)
+"vct" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/obj/structure/rack,
+/obj/machinery/door/poddoor/shutters{
+ dir = 4;
+ id = "vaco";
+ name = "Comissary Shutters"
+ },
+/turf/open/floor/plating,
+/area/station/maintenance/central/lesser)
"vcB" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -63976,6 +64428,10 @@
},
/turf/open/floor/iron/white/smooth_large,
/area/station/medical/treatment_center)
+"vcM" = (
+/obj/effect/spawner/structure/window/reinforced,
+/turf/closed/wall,
+/area/station/hallway/primary/central/aft)
"vcN" = (
/obj/structure/chair{
dir = 4
@@ -64001,6 +64457,11 @@
dir = 1
},
/area/station/service/lawoffice)
+"vdb" = (
+/obj/effect/spawner/random/medical/two_percent_xeno_egg_spawner,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/engine/xenobio,
+/area/station/science/xenobiology)
"vdf" = (
/obj/structure/disposalpipe/segment{
dir = 5
@@ -64100,13 +64561,6 @@
},
/turf/open/floor/iron/white,
/area/station/medical/medbay/central)
-"vdL" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/effect/spawner/random/structure/steam_vent,
-/turf/open/floor/plating,
-/area/station/maintenance/port/greater)
"vdS" = (
/obj/structure/closet/firecloset,
/obj/item/clothing/glasses/meson,
@@ -64189,6 +64643,15 @@
},
/turf/open/floor/iron/dark,
/area/station/security/processing)
+"veV" = (
+/obj/effect/turf_decal/weather/snow,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/disposalpipe/segment{
+ dir = 9
+ },
+/obj/effect/turf_decal/weather/snow/corner,
+/turf/open/floor/iron/freezer,
+/area/station/service/kitchen/coldroom)
"vfc" = (
/obj/structure/table,
/obj/item/flashlight/lamp,
@@ -64217,16 +64680,6 @@
/obj/structure/cable,
/turf/open/floor/iron/dark,
/area/station/science/lab)
-"vfo" = (
-/obj/structure/disposalpipe/segment,
-/obj/effect/turf_decal/tile/neutral/opposingcorners{
- dir = 1
- },
-/obj/effect/turf_decal/siding/thinplating_new{
- dir = 10
- },
-/turf/open/floor/iron/small,
-/area/station/hallway/secondary/service)
"vfD" = (
/obj/effect/turf_decal/siding/thinplating_new/light,
/obj/structure/reagent_dispensers/fueltank,
@@ -64250,17 +64703,6 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/aft)
-"vfM" = (
-/obj/machinery/door/airlock/multi_tile/public{
- dir = 8
- },
-/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/textured_half{
- dir = 8
- },
-/area/station/service/bar)
"vfN" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -64285,18 +64727,22 @@
/obj/item/toy/crayon/purple,
/turf/open/floor/iron/white,
/area/station/science/research)
-"vgh" = (
-/obj/structure/cable,
-/obj/effect/turf_decal/tile/red{
- dir = 4
- },
-/obj/structure/disposalpipe/junction/flip{
- dir = 2
- },
-/turf/open/floor/iron/white/corner{
- dir = 1
+"vfU" = (
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/machinery/griddle,
+/obj/merge_conflict_marker{
+ name = "---Merge Conflict Marker---";
+
+ desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
},
-/area/station/hallway/secondary/exit/departure_lounge)
+/obj/machinery/griddle,
+/turf/open/floor/iron/kitchen/small,
+/area/station/service/kitchen)
+"vgf" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/fore)
"vgp" = (
/obj/machinery/door/airlock/maintenance{
name = "Atmospherics Maintenance"
@@ -64353,20 +64799,20 @@
/obj/structure/filingcabinet/chestdrawer,
/turf/open/floor/iron/smooth,
/area/station/cargo/office)
-"vhr" = (
-/obj/structure/sink/directional/west,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
- dir = 8
- },
-/obj/machinery/camera/autoname/directional/north,
-/obj/machinery/light/cold/directional/north,
-/turf/open/floor/iron/dark/small,
-/area/station/service/chapel/storage)
"vht" = (
/obj/effect/turf_decal/tile/dark_red/opposingcorners,
/obj/machinery/holopad,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/security/armory)
+"vhy" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/open/floor/plating,
+/area/station/maintenance/central/greater)
"vhC" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -64400,11 +64846,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/wood,
/area/station/service/chapel/office)
-"vip" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/aft)
"vir" = (
/turf/open/floor/iron/white/side{
dir = 8
@@ -64495,6 +64936,33 @@
/obj/structure/cable,
/turf/open/floor/plating,
/area/station/maintenance/starboard/fore)
+"vjl" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/neutral/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/neutral/line,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/merge_conflict_marker{
+ name = "---Merge Conflict Marker---";
+
+ desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/neutral/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/neutral/line,
+/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,
+/area/station/hallway/primary/central/fore)
"vjp" = (
/obj/structure/cable,
/obj/effect/turf_decal/sand/plating,
@@ -64566,13 +65034,6 @@
},
/turf/open/floor/iron,
/area/station/science/research)
-"vkC" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/firealarm/directional/east,
-/obj/effect/turf_decal/tile/neutral,
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/fore)
"vkD" = (
/obj/structure/table,
/obj/item/stack/ore/gold{
@@ -64584,10 +65045,6 @@
},
/turf/open/floor/plating,
/area/station/maintenance/department/engine)
-"vkI" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/wood/tile,
-/area/station/service/bar)
"vkJ" = (
/obj/item/book/manual/wiki/security_space_law{
pixel_x = 9;
@@ -64665,6 +65122,12 @@
},
/turf/open/floor/light/colour_cycle/dancefloor_b,
/area/station/maintenance/starboard/central)
+"vly" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 8
+ },
+/turf/open/floor/stone,
+/area/station/service/bar)
"vlB" = (
/obj/machinery/atmospherics/pipe/smart/simple/general/visible{
dir = 4
@@ -64709,6 +65172,13 @@
/obj/machinery/power/apc/auto_name/directional/south,
/turf/open/floor/iron/white,
/area/station/medical/medbay/central)
+"vml" = (
+/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/dark_red/fourcorners,
+/turf/open/floor/iron,
+/area/station/security/brig/entrance)
"vmn" = (
/obj/effect/turf_decal/tile/neutral/fourcorners,
/obj/structure/table,
@@ -64731,16 +65201,16 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/science/genetics)
-"vmr" = (
-/obj/structure/cable,
-/obj/machinery/door/airlock{
- name = "Maintenance"
+"vms" = (
+/obj/structure/disposalpipe/segment,
+/obj/effect/turf_decal/tile/neutral/opposingcorners{
+ dir = 1
},
-/obj/effect/mapping_helpers/airlock/access/any/service/maintenance,
-/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/central/lesser)
+/obj/effect/turf_decal/siding/thinplating_new{
+ dir = 10
+ },
+/turf/open/floor/iron/small,
+/area/station/hallway/secondary/service)
"vmt" = (
/obj/structure/chair/stool/bamboo{
dir = 4
@@ -64886,19 +65356,6 @@
},
/turf/open/floor/iron/smooth,
/area/station/security/evidence)
-"vnD" = (
-/obj/effect/turf_decal/tile/dark_red/half/contrasted{
- dir = 4
- },
-/obj/effect/turf_decal/siding/wideplating/dark/corner{
- dir = 8
- },
-/obj/structure/disposalpipe/sorting/mail{
- dir = 1
- },
-/obj/effect/mapping_helpers/mail_sorting/security/general,
-/turf/open/floor/iron,
-/area/station/security)
"vnF" = (
/obj/structure/cable,
/obj/structure/disposalpipe/segment{
@@ -64909,6 +65366,27 @@
"vnI" = (
/turf/closed/mineral/random/stationside,
/area/station/maintenance/department/engine)
+"vnM" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/merge_conflict_marker{
+ name = "---Merge Conflict Marker---";
+
+ desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
+ },
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plating,
+/area/station/maintenance/central/greater)
"vnN" = (
/obj/structure/window/reinforced/spawner/directional/west,
/obj/effect/turf_decal/tile/blue/anticorner/contrasted{
@@ -64920,6 +65398,13 @@
/obj/machinery/medical_kiosk,
/turf/open/floor/iron/white,
/area/station/medical/medbay/lobby)
+"vnW" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 5
+ },
+/obj/machinery/light/floor,
+/turf/open/floor/stone,
+/area/station/service/bar)
"voe" = (
/obj/structure/chair/sofa/bench/right{
dir = 1
@@ -64960,10 +65445,6 @@
/obj/machinery/light/small/directional/west,
/turf/open/floor/iron,
/area/station/security)
-"voN" = (
-/obj/structure/sign/nanotrasen,
-/turf/closed/wall/r_wall,
-/area/station/command/teleporter)
"voO" = (
/obj/structure/lattice/catwalk,
/obj/structure/railing{
@@ -64971,6 +65452,15 @@
},
/turf/open/space/basic,
/area/space/nearstation)
+"voR" = (
+/obj/effect/turf_decal/siding/wood,
+/obj/effect/turf_decal/weather/dirt{
+ dir = 10
+ },
+/obj/structure/flora/bush/flowers_yw/style_3,
+/obj/structure/flora/bush/jungle/c/style_random,
+/turf/open/floor/grass,
+/area/station/service/chapel)
"vpb" = (
/obj/machinery/door/airlock/hatch{
name = "Tool Supply Corridor"
@@ -64978,15 +65468,6 @@
/obj/effect/mapping_helpers/airlock/access/all/supply/general,
/turf/open/floor/catwalk_floor/iron_dark,
/area/station/cargo/office)
-"vpg" = (
-/obj/machinery/disposal/bin,
-/obj/effect/turf_decal/bot,
-/obj/structure/disposalpipe/trunk{
- dir = 1
- },
-/obj/machinery/power/apc/auto_name/directional/south,
-/turf/open/floor/iron,
-/area/station/hallway/primary/port)
"vpk" = (
/obj/structure/cable,
/turf/open/floor/iron/smooth,
@@ -65079,12 +65560,6 @@
/obj/item/stack/rods/two,
/turf/open/floor/plating,
/area/station/maintenance/department/engine/atmos)
-"vqF" = (
-/obj/effect/turf_decal/siding/wood{
- dir = 6
- },
-/turf/open/floor/stone,
-/area/station/service/chapel)
"vqH" = (
/obj/structure/railing{
dir = 8
@@ -65151,19 +65626,13 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/herringbone,
/area/station/commons/dorms)
-"vrH" = (
-/obj/structure/disposalpipe/segment,
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
- dir = 4
- },
-/obj/effect/turf_decal/trimline/neutral/line{
- dir = 4
- },
-/obj/effect/turf_decal/trimline/neutral/line{
- dir = 8
+"vrG" = (
+/obj/structure/disposalpipe/sorting/mail{
+ dir = 1
},
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/fore)
+/obj/effect/mapping_helpers/mail_sorting/service/library,
+/turf/open/floor/wood/parquet,
+/area/station/service/library)
"vrK" = (
/obj/structure/lattice/catwalk,
/obj/structure/cable,
@@ -65182,14 +65651,6 @@
dir = 1
},
/area/station/security/courtroom)
-"vrS" = (
-/obj/effect/turf_decal/tile/neutral/half/contrasted{
- dir = 1
- },
-/obj/effect/turf_decal/tile/dark_red/half/contrasted,
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/iron,
-/area/station/hallway/primary/port)
"vrT" = (
/obj/structure/lattice,
/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
@@ -65220,6 +65681,20 @@
},
/turf/open/floor/wood,
/area/station/commons/fitness/recreation)
+"vsj" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/turf_decal/tile/red/opposingcorners,
+/obj/effect/turf_decal/tile/blue/opposingcorners{
+ dir = 8
+ },
+/obj/machinery/firealarm/directional/north,
+/obj/structure/cable,
+/obj/structure/disposalpipe/segment{
+ dir = 6
+ },
+/turf/open/floor/iron/smooth,
+/area/station/service/greenroom)
"vso" = (
/obj/effect/landmark/start/scientist,
/obj/structure/chair{
@@ -65253,9 +65728,13 @@
},
/turf/open/floor/engine,
/area/station/science/xenobiology)
-"vtr" = (
-/obj/machinery/light/floor,
-/turf/open/floor/wood/parquet,
+"vtf" = (
+/obj/structure/hedge,
+/obj/effect/turf_decal/siding/wood/end,
+/obj/effect/turf_decal/siding/wood/end{
+ dir = 1
+ },
+/turf/open/floor/iron/smooth,
/area/station/service/library)
"vtw" = (
/obj/effect/turf_decal/stripes/line,
@@ -65296,9 +65775,26 @@
/obj/machinery/duct,
/turf/open/floor/plating,
/area/station/maintenance/fore/greater)
-"vtX" = (
-/obj/effect/landmark/start/assistant,
-/obj/effect/turf_decal/tile/neutral,
+"vtP" = (
+/obj/structure/cable,
+/obj/effect/spawner/random/structure/steam_vent,
+/obj/structure/disposalpipe/segment{
+ dir = 9
+ },
+/turf/open/floor/plating,
+/area/station/maintenance/central/greater)
+"vtU" = (
+/obj/structure/disposalpipe/segment,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/neutral/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/neutral/line,
+/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/hallway/primary/central/aft)
"vuj" = (
@@ -65352,6 +65848,16 @@
/obj/effect/mapping_helpers/airlock/access/all/science/xenobio,
/turf/open/floor/catwalk_floor/iron,
/area/station/science/xenobiology)
+"vuD" = (
+/obj/machinery/atmospherics/pipe/smart/simple/dark/visible,
+/obj/machinery/camera/autoname/directional/east,
+/obj/machinery/light/cold/directional/east,
+/obj/machinery/power/apc/auto_name/directional/east{
+ areastring = "/area/station/science/ordnance/burnchamber"
+ },
+/obj/structure/cable,
+/turf/open/floor/iron/dark,
+/area/station/science/ordnance)
"vuH" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/power/apc/auto_name/directional/west,
@@ -65402,27 +65908,19 @@
/obj/item/clothing/shoes/cowboy/lizard/masterwork,
/turf/open/floor/light/colour_cycle/dancefloor_b,
/area/station/maintenance/starboard/central)
-"vvd" = (
-/obj/structure/bed{
- dir = 4
- },
-/obj/effect/spawner/random/bedsheet{
- dir = 4
- },
-/obj/machinery/button/door/directional/south{
- id = "Cabin4";
- name = "Cabin Bolt Control";
- normaldoorcontrol = 1;
- specialfunctions = 4
- },
-/turf/open/floor/carpet,
-/area/station/commons/dorms)
"vve" = (
/obj/machinery/door/airlock/public/glass{
name = "Aft Corridor"
},
/turf/open/floor/iron/textured_half,
/area/station/hallway/primary/aft)
+"vvf" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/cable,
+/obj/structure/disposalpipe/segment,
+/turf/open/floor/plating,
+/area/station/maintenance/central/greater)
"vvg" = (
/obj/structure/lattice/catwalk,
/obj/structure/railing{
@@ -65448,16 +65946,6 @@
},
/turf/open/floor/iron,
/area/station/hallway/secondary/construction)
-"vvC" = (
-/obj/machinery/door/airlock/engineering{
- name = "Engine Airlock"
- },
-/obj/machinery/door/firedoor,
-/obj/effect/mapping_helpers/airlock/access/any/engineering/construction,
-/obj/structure/cable,
-/obj/effect/landmark/navigate_destination,
-/turf/open/floor/catwalk_floor,
-/area/station/engineering/break_room)
"vvK" = (
/obj/structure/table,
/obj/effect/turf_decal/tile/green/fourcorners,
@@ -65507,6 +65995,10 @@
},
/turf/open/floor/iron/textured_half,
/area/station/hallway/primary/aft)
+"vwp" = (
+/obj/machinery/light/small/broken/directional/west,
+/turf/open/floor/iron/dark/small,
+/area/station/maintenance/central/lesser)
"vws" = (
/obj/structure/closet/firecloset,
/turf/open/floor/iron/small,
@@ -65531,6 +66023,21 @@
},
/turf/open/floor/iron/grimy,
/area/station/tcommsat/server)
+"vwF" = (
+/obj/structure/bed{
+ dir = 4
+ },
+/obj/effect/spawner/random/bedsheet{
+ dir = 4
+ },
+/obj/machinery/button/door/directional/west{
+ name = "Cabin Bolt Control";
+ normaldoorcontrol = 1;
+ specialfunctions = 4;
+ id = "Cabin1"
+ },
+/turf/open/floor/carpet/orange,
+/area/station/commons/dorms)
"vwI" = (
/obj/structure/closet/secure_closet/hos,
/obj/item/clothing/shoes/cowboy/black,
@@ -65599,6 +66106,16 @@
"vxM" = (
/turf/open/floor/iron,
/area/station/commons/storage/art)
+"vxN" = (
+/obj/structure/rack,
+/obj/effect/turf_decal/tile/brown/opposingcorners{
+ dir = 1
+ },
+/obj/item/clothing/mask/gas,
+/obj/machinery/airalarm/directional/west,
+/obj/machinery/camera/directional/west,
+/turf/open/floor/iron,
+/area/station/commons/vacant_room/commissary)
"vxR" = (
/obj/machinery/atmospherics/components/unary/thermomachine/freezer{
dir = 4;
@@ -65651,13 +66168,6 @@
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/iron/dark,
/area/station/engineering/atmospherics_engine)
-"vyP" = (
-/obj/machinery/vending/wardrobe/hydro_wardrobe,
-/obj/effect/turf_decal/siding/thinplating_new/light{
- dir = 5
- },
-/turf/open/floor/iron/white/small,
-/area/station/service/hydroponics)
"vyR" = (
/turf/open/floor/glass,
/area/station/command/corporate_dock)
@@ -65713,17 +66223,18 @@
/obj/structure/cable,
/turf/open/floor/iron/cafeteria,
/area/station/security/prison/mess)
-"vzE" = (
-/obj/structure/window/spawner/directional/east,
-/obj/structure/window/spawner/directional/west,
-/obj/structure/flora/bush/sparsegrass,
-/obj/structure/flora/bush/flowers_br,
-/obj/structure/flora/bush/flowers_pp,
-/obj/structure/flora/bush/large/style_random{
- pixel_y = -1
+"vzH" = (
+/obj/structure/disposalpipe/segment,
+/obj/effect/landmark/start/hangover,
+/obj/effect/turf_decal/trimline/neutral/line{
+ dir = 4
},
-/turf/open/floor/grass,
-/area/station/service/hydroponics)
+/obj/effect/turf_decal/trimline/neutral/line{
+ dir = 8
+ },
+/obj/structure/cable,
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/fore)
"vzK" = (
/obj/machinery/light/small/directional/west,
/obj/machinery/atmospherics/components/unary/vent_pump/siphon/monitored/helium_output{
@@ -65774,14 +66285,6 @@
},
/turf/open/floor/iron/dark,
/area/station/engineering/atmos)
-"vAl" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/table/wood,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/wood,
-/area/station/cargo/boutique)
"vAq" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -65825,6 +66328,12 @@
/obj/effect/mapping_helpers/airlock/unres,
/turf/open/floor/plating,
/area/station/maintenance/department/science/xenobiology)
+"vAO" = (
+/obj/effect/turf_decal/siding/thinplating_new/light{
+ dir = 8
+ },
+/turf/open/floor/iron/white/small,
+/area/station/service/hydroponics)
"vAT" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -65847,6 +66356,14 @@
/obj/machinery/door/firedoor,
/turf/open/floor/iron/white/textured_half,
/area/station/science/lobby)
+"vBq" = (
+/obj/effect/mapping_helpers/airlock/access/any/service/maintenance,
+/obj/machinery/door/airlock{
+ name = "Maintenance"
+ },
+/obj/effect/mapping_helpers/airlock/unres,
+/turf/open/floor/plating,
+/area/station/maintenance/central/greater)
"vBG" = (
/obj/structure/table,
/obj/machinery/microwave{
@@ -65855,6 +66372,13 @@
/obj/structure/extinguisher_cabinet/directional/west,
/turf/open/floor/iron/cafeteria,
/area/station/science/breakroom)
+"vBI" = (
+/obj/effect/turf_decal/tile/neutral/opposingcorners,
+/obj/machinery/light/small/directional/east,
+/obj/structure/chair/stool/bar/directional/south,
+/obj/effect/landmark/start/hangover,
+/turf/open/floor/iron,
+/area/station/holodeck/rec_center)
"vBK" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
dir = 1
@@ -65872,6 +66396,16 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/science/research)
+"vCh" = (
+/obj/machinery/airalarm/directional/north,
+/obj/machinery/button/door/directional/north{
+ id = "vaco";
+ name = "Comissary Shutters";
+ pixel_x = 29
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/iron/dark/small,
+/area/station/maintenance/central/lesser)
"vCl" = (
/obj/effect/turf_decal/tile/neutral/fourcorners,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
@@ -66017,27 +66551,9 @@
/obj/effect/landmark/event_spawn,
/turf/open/floor/iron/smooth,
/area/station/engineering/engine_smes)
-"vET" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/fore)
"vEW" = (
/turf/closed/wall/r_wall,
/area/station/security/prison/shower)
-"vEY" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/plating,
-/area/station/maintenance/central/greater)
"vEZ" = (
/obj/structure/railing,
/obj/structure/railing/corner{
@@ -66073,6 +66589,9 @@
},
/turf/open/floor/iron/grimy,
/area/station/maintenance/starboard/central)
+"vFi" = (
+/turf/open/floor/stone,
+/area/station/service/chapel)
"vFm" = (
/obj/effect/turf_decal/siding/blue,
/obj/machinery/duct,
@@ -66194,6 +66713,21 @@
/obj/structure/extinguisher_cabinet/directional/south,
/turf/open/floor/iron/dark/small,
/area/station/medical/morgue)
+"vHn" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/obj/structure/table,
+/obj/machinery/door/poddoor/shutters{
+ dir = 4;
+ id = "vaco";
+ name = "Comissary Shutters"
+ },
+/turf/open/floor/plating,
+/area/station/maintenance/central/lesser)
"vHu" = (
/obj/effect/turf_decal/tile/dark_red/opposingcorners,
/obj/structure/closet/secure_closet/security/sec,
@@ -66263,6 +66797,12 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/maintenance/starboard/aft)
+"vIx" = (
+/obj/machinery/door/firedoor,
+/turf/open/floor/iron/textured_half{
+ dir = 8
+ },
+/area/station/service/bar)
"vIC" = (
/obj/structure/disposalpipe/segment{
dir = 9
@@ -66336,6 +66876,24 @@
},
/turf/open/floor/iron,
/area/station/hallway/secondary/entry)
+"vJE" = (
+/obj/effect/turf_decal/weather/dirt{
+ dir = 8
+ },
+/obj/structure/extinguisher_cabinet/directional/west,
+/turf/open/floor/grass,
+/area/station/service/chapel)
+"vJF" = (
+/obj/structure/cable,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/spawner/random/trash,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/open/floor/plating,
+/area/station/maintenance/port/greater)
"vJG" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/effect/turf_decal/tile/brown/opposingcorners,
@@ -66542,6 +67100,15 @@
},
/turf/open/floor/iron/dark/smooth_large,
/area/station/medical/pharmacy)
+"vLZ" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/cable,
+/obj/structure/disposalpipe/junction/flip{
+ dir = 4
+ },
+/turf/open/floor/plating,
+/area/station/maintenance/central/greater)
"vMo" = (
/obj/effect/turf_decal/stripes/white/line{
dir = 6
@@ -66595,27 +67162,11 @@
dir = 1
},
/area/station/hallway/primary/aft)
-"vMP" = (
-/obj/structure/cable,
-/obj/structure/disposalpipe/segment,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating,
-/area/station/maintenance/port/greater)
"vMT" = (
/obj/machinery/hydroponics/soil,
/obj/item/food/grown/mushroom/libertycap,
/turf/open/misc/asteroid,
/area/station/maintenance/starboard/greater)
-"vMV" = (
-/obj/structure/disposalpipe/segment{
- dir = 6
- },
-/obj/effect/mapping_helpers/broken_floor,
-/obj/effect/spawner/random/trash,
-/turf/open/floor/plating,
-/area/station/maintenance/central/greater)
"vMX" = (
/obj/effect/turf_decal/stripes/white/line{
dir = 5
@@ -66660,6 +67211,12 @@
/obj/machinery/camera/autoname/directional/south,
/turf/open/floor/iron/smooth,
/area/station/cargo/warehouse)
+"vOc" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 6
+ },
+/turf/open/floor/stone,
+/area/station/service/bar/backroom)
"vOf" = (
/obj/structure/cable,
/obj/structure/chair{
@@ -66793,27 +67350,12 @@
/obj/structure/flora/bush/large/style_random,
/turf/open/misc/sandy_dirt,
/area/station/medical/medbay/lobby)
-"vQx" = (
-/obj/effect/turf_decal/siding/thinplating{
- dir = 6
- },
-/obj/machinery/light/small/directional/south,
-/obj/structure/sign/poster/official/random/directional/east,
-/turf/open/floor/eighties/red,
-/area/station/hallway/primary/central/fore)
"vRd" = (
/obj/structure/table,
/obj/effect/turf_decal/tile/dark_red,
/obj/item/flashlight/lamp,
/turf/open/floor/iron,
/area/station/security/tram)
-"vRg" = (
-/obj/machinery/porta_turret/ai,
-/obj/machinery/computer/security/telescreen/research/directional/west,
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/status_display/ai/directional/north,
-/turf/open/floor/iron/smooth,
-/area/station/ai_monitored/turret_protected/aisat_interior)
"vRh" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -66821,11 +67363,14 @@
dir = 1
},
/area/station/science/research)
-"vRn" = (
+"vRi" = (
/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/dark_red/fourcorners,
/obj/structure/disposalpipe/segment,
-/turf/closed/wall,
-/area/station/maintenance/port/greater)
+/turf/open/floor/iron,
+/area/station/security/brig/entrance)
"vRt" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -66841,6 +67386,21 @@
/obj/structure/reagent_dispensers/beerkeg,
/turf/open/floor/plating,
/area/station/maintenance/department/engine)
+"vRW" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/item/ammo_casing/spent{
+ pixel_x = 5;
+ pixel_y = 6
+ },
+/obj/item/ammo_casing/spent,
+/obj/item/ammo_casing/spent{
+ pixel_x = 4;
+ pixel_y = -2
+ },
+/obj/effect/turf_decal/tile/neutral,
+/obj/structure/disposalpipe/segment,
+/turf/open/floor/iron,
+/area/station/hallway/primary/port)
"vSg" = (
/turf/closed/wall/r_wall,
/area/station/hallway/primary/aft)
@@ -66851,14 +67411,6 @@
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/iron,
/area/station/engineering/atmospherics_engine)
-"vSi" = (
-/obj/structure/hedge,
-/obj/effect/turf_decal/siding/wood/end,
-/obj/effect/turf_decal/siding/wood/end{
- dir = 1
- },
-/turf/open/floor/iron/smooth,
-/area/station/service/library)
"vSj" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/firealarm/directional/west,
@@ -66889,6 +67441,16 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/aft)
+"vSR" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 9
+ },
+/turf/open/floor/iron,
+/area/station/hallway/primary/fore)
"vSW" = (
/obj/effect/spawner/random/engineering/atmospherics_portable,
/turf/open/floor/plating,
@@ -66938,15 +67500,6 @@
/obj/machinery/light/small/directional/south,
/turf/open/floor/iron/cafeteria,
/area/station/science/breakroom)
-"vTn" = (
-/obj/effect/turf_decal/weather/dirt,
-/obj/structure/flora/bush/flowers_yw/style_2,
-/obj/structure/flora/bush/large/style_random{
- pixel_x = 0;
- pixel_y = 2
- },
-/turf/open/floor/grass,
-/area/station/service/chapel)
"vTo" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -66995,11 +67548,6 @@
},
/turf/open/floor/iron/dark,
/area/station/command/corporate_dock)
-"vTP" = (
-/obj/structure/sink/kitchen/directional/east,
-/obj/machinery/firealarm/directional/west,
-/turf/open/floor/iron/kitchen/small,
-/area/station/service/kitchen)
"vTV" = (
/turf/closed/wall/r_wall,
/area/station/command/heads_quarters/hos)
@@ -67080,6 +67628,15 @@
/obj/machinery/airalarm/directional/south,
/turf/open/floor/iron/smooth,
/area/station/security/checkpoint/escape)
+"vVv" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/door/window/right/directional/south{
+ name = "Upload Console Window";
+ req_access = list("ai_upload")
+ },
+/turf/open/floor/iron/dark,
+/area/station/ai_monitored/turret_protected/ai_upload)
"vVx" = (
/obj/machinery/hydroponics/soil,
/obj/item/food/grown/mushroom/plumphelmet,
@@ -67171,19 +67728,6 @@
/obj/structure/cable,
/turf/open/floor/iron/smooth,
/area/station/maintenance/solars/starboard/fore)
-"vWw" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/door/firedoor,
-/obj/effect/turf_decal/stripes/red/line,
-/obj/effect/turf_decal/stripes/red/line{
- dir = 1
- },
-/obj/structure/disposalpipe/segment,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/iron/small,
-/area/station/hallway/primary/central/fore)
"vWA" = (
/obj/effect/turf_decal/tile/brown/opposingcorners,
/obj/machinery/firealarm/directional/south,
@@ -67219,6 +67763,15 @@
/obj/structure/barricade/wooden,
/turf/open/floor/iron,
/area/station/hallway/secondary/construction)
+"vWT" = (
+/obj/structure/chair/sofa/bench/left{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/turf/open/floor/iron/white/side,
+/area/station/hallway/primary/central/aft)
"vWU" = (
/obj/structure/disposalpipe/segment,
/obj/effect/decal/cleanable/dirt,
@@ -67231,11 +67784,6 @@
/obj/item/clothing/gloves/boxing/blue,
/turf/open/floor/iron,
/area/station/security/prison/workout)
-"vXd" = (
-/obj/item/flashlight/lantern/on,
-/obj/effect/turf_decal/siding/wood,
-/turf/open/floor/stone,
-/area/station/service/chapel)
"vXi" = (
/obj/structure/table,
/obj/item/reagent_containers/cup/bowl,
@@ -67266,6 +67814,17 @@
dir = 8
},
/area/station/science/lobby)
+"vXC" = (
+/obj/structure/disposalpipe/segment,
+/obj/merge_conflict_marker{
+ name = "---Merge Conflict Marker---";
+
+ desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
+ },
+/obj/structure/disposalpipe/segment,
+/obj/structure/cable,
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/aft)
"vXH" = (
/obj/structure/cable,
/obj/effect/spawner/structure/window/reinforced,
@@ -67329,18 +67888,6 @@
},
/turf/open/floor/iron/dark/herringbone,
/area/station/security/courtroom)
-"vYJ" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
- dir = 8
- },
-/obj/structure/disposalpipe/segment,
-/obj/effect/turf_decal/siding/wood/corner,
-/obj/effect/turf_decal/siding/wood/corner{
- dir = 8
- },
-/turf/open/floor/stone,
-/area/station/service/bar/backroom)
"vYL" = (
/obj/structure/disposalpipe/segment{
dir = 5
@@ -67379,13 +67926,6 @@
/obj/effect/landmark/event_spawn,
/turf/open/floor/iron/white,
/area/station/medical/paramedic)
-"vYW" = (
-/obj/effect/turf_decal/siding/wood{
- dir = 1
- },
-/obj/structure/table/wood,
-/turf/open/floor/iron/grimy,
-/area/station/service/bar)
"vZb" = (
/obj/structure/cable,
/obj/structure/table,
@@ -67469,13 +68009,6 @@
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
/turf/open/floor/iron/smooth,
/area/station/engineering/main)
-"waD" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/plating,
-/area/station/hallway/primary/central/aft)
"waH" = (
/obj/machinery/atmospherics/pipe/smart/simple/cyan/hidden{
dir = 5
@@ -67485,10 +68018,10 @@
/obj/structure/sign/poster/official/random/directional/west,
/turf/open/floor/iron/smooth,
/area/station/engineering/main)
-"waI" = (
-/obj/machinery/vending/games,
-/turf/open/floor/wood/parquet,
-/area/station/service/library)
+"waL" = (
+/obj/effect/landmark/start/hangover,
+/turf/open/floor/glass,
+/area/station/hallway/primary/central/aft)
"waN" = (
/obj/effect/turf_decal/trimline/blue/filled/line{
dir = 4
@@ -67500,6 +68033,18 @@
/obj/structure/bookcase/random/religion,
/turf/open/floor/wood,
/area/station/service/chapel/office)
+"waP" = (
+/obj/machinery/door/airlock/security/glass{
+ id_tag = "outerbrig";
+ name = "Brig"
+ },
+/obj/effect/mapping_helpers/airlock/access/all/security/entrance,
+/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{
+ cycle_id = "sci-entrance"
+ },
+/obj/structure/disposalpipe/segment,
+/turf/open/floor/iron/textured_half,
+/area/station/security/brig/entrance)
"waX" = (
/obj/effect/turf_decal/tile/yellow/opposingcorners,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -67507,25 +68052,6 @@
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/iron,
/area/station/command/heads_quarters/ce)
-"waY" = (
-/obj/effect/turf_decal/weather/snow,
-/obj/machinery/gibber,
-/obj/effect/turf_decal/weather/snow/corner{
- dir = 6
- },
-/turf/open/floor/iron/freezer,
-/area/station/service/kitchen/coldroom)
-"wbd" = (
-/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/dark_red/fourcorners,
-/obj/effect/landmark/start/security_officer,
-/obj/structure/disposalpipe/segment{
- dir = 5
- },
-/turf/open/floor/iron,
-/area/station/security/brig/entrance)
"wbf" = (
/turf/closed/wall,
/area/station/security/prison/safe)
@@ -67661,12 +68187,36 @@
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/station/maintenance/starboard/central)
+"wdx" = (
+/obj/effect/turf_decal/weather/dirt{
+ dir = 1
+ },
+/obj/structure/flora/bush/jungle/c/style_3{
+ pixel_x = 6;
+ pixel_y = -6
+ },
+/turf/open/floor/grass,
+/area/station/service/chapel)
"wdB" = (
/obj/structure/railing{
dir = 4
},
/turf/open/space/basic,
/area/space/nearstation)
+"wdH" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/door/airlock/public/glass{
+ name = "Cargo Botique"
+ },
+/obj/machinery/door/firedoor,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/open/floor/iron/textured_half{
+ dir = 1
+ },
+/area/station/hallway/primary/central/fore)
"wdJ" = (
/obj/structure/lattice,
/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible/layer5,
@@ -67707,6 +68257,10 @@
/obj/machinery/light/small/directional/south,
/turf/open/floor/iron/dark/small,
/area/station/engineering/lobby)
+"weL" = (
+/obj/structure/sign/nanotrasen,
+/turf/closed/wall/r_wall,
+/area/station/command/teleporter)
"weU" = (
/obj/machinery/atmospherics/components/binary/pump/on{
dir = 4;
@@ -67742,6 +68296,14 @@
"wfr" = (
/turf/closed/wall/r_wall,
/area/station/medical/pharmacy)
+"wfw" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/structure/extinguisher_cabinet/directional/south,
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/fore)
"wfD" = (
/obj/machinery/door/airlock/research/glass{
name = "Cubicle"
@@ -67762,6 +68324,19 @@
/obj/machinery/firealarm/directional/west,
/turf/open/floor/iron,
/area/station/maintenance/hallway/abandoned_command)
+"wfQ" = (
+/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/neutral{
+ dir = 1
+ },
+/obj/effect/landmark/navigate_destination/hop,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/fore)
"wgl" = (
/obj/structure/lattice/catwalk,
/obj/structure/railing{
@@ -67805,6 +68380,12 @@
/obj/effect/turf_decal/weather,
/turf/open/floor/plating,
/area/station/service/chapel/office)
+"wgB" = (
+/obj/structure/disposalpipe/segment{
+ dir = 6
+ },
+/turf/open/floor/plating,
+/area/station/maintenance/port/greater)
"wgC" = (
/obj/structure/table/glass,
/obj/item/paper_bin{
@@ -67826,14 +68407,6 @@
/obj/item/reagent_containers/cup/glass/bottle/beer,
/turf/open/floor/wood,
/area/station/maintenance/starboard/greater)
-"wgI" = (
-/obj/effect/turf_decal/tile/brown/opposingcorners{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/effect/landmark/start/assistant,
-/turf/open/floor/iron,
-/area/station/commons/vacant_room/commissary)
"wgL" = (
/turf/closed/wall/r_wall,
/area/station/maintenance/department/medical/central)
@@ -67842,12 +68415,15 @@
/obj/effect/turf_decal/weather,
/turf/open/floor/plating,
/area/station/service/chapel/office)
-"wha" = (
+"wgS" = (
/obj/effect/turf_decal/siding/wood{
dir = 4
},
-/turf/open/floor/stone,
-/area/station/service/chapel)
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+ dir = 1
+ },
+/turf/open/floor/wood/tile,
+/area/station/service/bar)
"whc" = (
/obj/effect/turf_decal/tile/dark_red/anticorner/contrasted{
dir = 1
@@ -67861,11 +68437,33 @@
},
/turf/open/floor/plating,
/area/station/engineering/atmos/storage/gas)
+"whq" = (
+/obj/structure/cable,
+/obj/effect/spawner/random/structure/girder,
+/turf/open/floor/plating,
+/area/station/maintenance/central/greater)
+"whr" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/chair/wood{
+ dir = 4
+ },
+/turf/open/floor/iron/grimy,
+/area/station/service/bar)
"whu" = (
/obj/structure/cable,
/obj/machinery/blackbox_recorder,
/turf/open/floor/circuit,
/area/station/tcommsat/server)
+"whz" = (
+/obj/effect/mapping_helpers/broken_floor,
+/obj/structure/table/wood,
+/obj/machinery/light/small/built/directional/north,
+/obj/item/stack/sheet/iron/ten,
+/obj/effect/turf_decal/siding/wideplating_new/terracotta{
+ dir = 9
+ },
+/turf/open/floor/wood/tile,
+/area/station/maintenance/central/lesser)
"whA" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -67965,16 +68563,17 @@
/obj/structure/filingcabinet,
/turf/open/floor/iron/dark/small,
/area/station/security/detectives_office)
-"wjT" = (
-/obj/machinery/barsign{
- chosen_sign = "thecavern";
- icon_state = "thecavern";
- pixel_y = 32
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
+"wjL" = (
+/obj/machinery/door/airlock/vault{
+ name = "Vault"
},
-/turf/open/floor/iron,
+/obj/effect/mapping_helpers/airlock/access/all/supply/vault,
+/obj/effect/mapping_helpers/airlock/locked,
+/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,
+/turf/open/floor/iron/dark/herringbone,
/area/station/hallway/primary/central/aft)
"wjZ" = (
/obj/structure/cable,
@@ -67996,13 +68595,6 @@
},
/turf/open/floor/wood/tile,
/area/station/command/bridge)
-"wku" = (
-/obj/effect/turf_decal/weather/dirt{
- dir = 1
- },
-/obj/machinery/light/floor,
-/turf/open/floor/grass,
-/area/station/service/chapel)
"wkF" = (
/obj/effect/spawner/structure/window/reinforced/tinted,
/turf/open/floor/plating,
@@ -68017,16 +68609,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/plating,
/area/station/maintenance/starboard/fore)
-"wkK" = (
-/obj/structure/cable,
-/obj/structure/disposalpipe/segment{
- dir = 5
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/plating,
-/area/station/maintenance/port/greater)
"wkU" = (
/obj/structure/lattice/catwalk,
/obj/structure/railing{
@@ -68035,6 +68617,9 @@
/obj/structure/railing,
/turf/open/space/basic,
/area/space/nearstation)
+"wkW" = (
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/aft)
"wla" = (
/obj/effect/landmark/generic_maintenance_landmark,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -68046,6 +68631,16 @@
},
/turf/open/floor/engine,
/area/station/science/xenobiology)
+"wlG" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/turf_decal/tile/dark_red/opposingcorners,
+/obj/machinery/flasher/directional/west{
+ id = "brigentry"
+ },
+/obj/structure/disposalpipe/segment,
+/turf/open/floor/iron,
+/area/station/security/brig/entrance)
"wlS" = (
/obj/effect/turf_decal/stripes/line,
/obj/machinery/atmospherics/pipe/smart/simple/purple/visible{
@@ -68079,6 +68674,17 @@
/obj/effect/spawner/random/structure/crate,
/turf/open/floor/plating,
/area/station/maintenance/aft)
+"wml" = (
+/obj/structure/cable,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/spawner/random/structure/steam_vent,
+/turf/open/floor/plating,
+/area/station/maintenance/port/greater)
"wmu" = (
/obj/structure/disposalpipe/trunk{
dir = 1
@@ -68090,6 +68696,14 @@
},
/turf/open/floor/iron/dark/smooth_large,
/area/station/command/meeting_room)
+"wmv" = (
+/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/dark_red/fourcorners,
+/obj/machinery/newscaster/directional/north,
+/turf/open/floor/iron,
+/area/station/security/brig/entrance)
"wmx" = (
/obj/structure/cable,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
@@ -68141,26 +68755,37 @@
/obj/structure/cable,
/turf/open/floor/plating,
/area/station/maintenance/port/lesser)
-"wmX" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/turf_decal/plaque{
- icon_state = "L4";
- pixel_y = -15
- },
-/obj/effect/turf_decal/trimline/neutral/line,
-/obj/effect/turf_decal/trimline/neutral/line{
- dir = 1
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/aft)
+"wmW" = (
+/obj/structure/table/wood,
+/turf/open/floor/wood/large,
+/area/station/service/bar)
"wnd" = (
/obj/effect/spawner/structure/window,
/turf/open/floor/plating,
/area/station/cargo/office)
+"wng" = (
+/mob/living/basic/frog,
+/obj/effect/turf_decal/weather/dirt{
+ dir = 5
+ },
+/obj/structure/flora/rock/pile/jungle/style_4,
+/obj/structure/flora/bush/flowers_pp/style_2,
+/turf/open/floor/grass,
+/area/station/service/chapel)
+"wnh" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/door/airlock/security/glass{
+ id_tag = "outerbrig";
+ name = "Brig"
+ },
+/obj/effect/mapping_helpers/airlock/access/all/security/entrance,
+/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{
+ cycle_id = "sci-entrance"
+ },
+/obj/structure/disposalpipe/segment,
+/turf/open/floor/iron/textured_half,
+/area/station/security/brig/entrance)
"wnw" = (
/obj/machinery/pdapainter/engineering,
/obj/effect/turf_decal/bot,
@@ -68217,18 +68842,20 @@
"woi" = (
/turf/closed/wall/r_wall,
/area/station/maintenance/solars/starboard/fore)
+"wol" = (
+/obj/effect/turf_decal/weather/dirt,
+/obj/structure/flora/bush/flowers_yw/style_2,
+/obj/structure/flora/bush/large/style_random{
+ pixel_x = 0;
+ pixel_y = 2
+ },
+/turf/open/floor/grass,
+/area/station/service/chapel)
"wos" = (
/obj/structure/cable,
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/station/tcommsat/server)
-"woz" = (
-/obj/effect/turf_decal/siding/thinplating{
- dir = 5
- },
-/obj/structure/cable,
-/turf/open/floor/eighties,
-/area/station/hallway/primary/central/fore)
"woD" = (
/obj/effect/turf_decal/siding/wood{
dir = 4
@@ -68288,6 +68915,13 @@
/obj/effect/turf_decal/tile/dark_red/fourcorners,
/turf/open/floor/iron,
/area/station/security/execution/transfer)
+"wpF" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 9
+ },
+/obj/structure/table/wood,
+/turf/open/floor/iron/grimy,
+/area/station/service/bar)
"wpO" = (
/turf/closed/wall/r_wall,
/area/station/security/processing)
@@ -68318,11 +68952,30 @@
"wqj" = (
/turf/closed/wall,
/area/station/commons/toilet/restrooms)
+"wqk" = (
+/obj/structure/disposalpipe/segment{
+ dir = 6
+ },
+/obj/item/radio/intercom/directional/west,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/aft)
"wqD" = (
/obj/structure/reagent_dispensers/water_cooler,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron,
/area/station/maintenance/port/aft)
+"wqF" = (
+/obj/structure/chair/stool/directional/north,
+/obj/effect/turf_decal/siding/wood{
+ dir = 8
+ },
+/obj/machinery/camera/autoname/directional/west,
+/obj/effect/landmark/start/assistant,
+/turf/open/floor/stone,
+/area/station/service/bar)
"wqI" = (
/obj/structure/disposalpipe/segment{
dir = 5
@@ -68365,31 +69018,12 @@
/obj/machinery/light/small/directional/east,
/turf/open/floor/iron/dark,
/area/station/security/prison/workout)
-"wrk" = (
-/obj/effect/turf_decal/siding/wideplating/dark{
- dir = 1
- },
-/obj/effect/turf_decal/tile/dark_red/half/contrasted,
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/iron,
-/area/station/security/brig/entrance)
"wrw" = (
/obj/machinery/light/small/directional/east,
/obj/structure/disposalpipe/segment,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron,
/area/station/hallway/secondary/recreation)
-"wrx" = (
-/obj/machinery/button/door/directional/north{
- name = "Lock Control";
- id = "Toilet3";
- specialfunctions = 4;
- normaldoorcontrol = 1
- },
-/obj/machinery/recharge_station,
-/obj/structure/sign/poster/official/random/directional/east,
-/turf/open/floor/iron/white/small,
-/area/station/commons/toilet/restrooms)
"wrD" = (
/obj/structure/disposalpipe/segment{
dir = 9
@@ -68435,16 +69069,6 @@
/obj/machinery/power/apc/auto_name/directional/east,
/turf/open/floor/iron/dark,
/area/station/command/corporate_dock)
-"wrZ" = (
-/obj/structure/disposalpipe/segment{
- dir = 10
- },
-/obj/structure/cable,
-/obj/machinery/duct,
-/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/central/lesser)
"wsa" = (
/obj/structure/window/reinforced/spawner/directional/west,
/obj/effect/turf_decal/tile/red/anticorner/contrasted{
@@ -68471,6 +69095,13 @@
/obj/effect/spawner/random/engineering/toolbox,
/turf/open/floor/catwalk_floor/iron,
/area/station/maintenance/department/medical/central)
+"wsD" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 8
+ },
+/obj/structure/displaycase/trophy,
+/turf/open/floor/wood/parquet,
+/area/station/service/library)
"wsG" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -68497,6 +69128,20 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/plating,
/area/station/maintenance/department/medical/central)
+"wsU" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/machinery/door/firedoor,
+/obj/effect/turf_decal/stripes/red/line{
+ dir = 4
+ },
+/obj/effect/turf_decal/stripes/red/line{
+ dir = 8
+ },
+/obj/structure/cable,
+/turf/open/floor/iron/small,
+/area/station/hallway/primary/central/fore)
"wtc" = (
/obj/structure/cable,
/obj/structure/window/reinforced/spawner/directional/north,
@@ -68563,10 +69208,6 @@
},
/turf/open/floor/iron/smooth,
/area/station/service/greenroom)
-"wtw" = (
-/obj/structure/chair/stool/bar/directional/west,
-/turf/open/floor/wood/large,
-/area/station/service/bar)
"wtx" = (
/obj/structure/cannon{
dir = 4
@@ -68595,12 +69236,11 @@
dir = 4
},
/area/station/science/lobby)
-"wtV" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
- dir = 4
- },
-/turf/open/floor/stone,
-/area/station/service/chapel)
+"wtU" = (
+/obj/effect/spawner/random/structure/closet_maintenance,
+/obj/effect/spawner/random/maintenance,
+/turf/open/floor/plating,
+/area/station/maintenance/central/greater)
"wtX" = (
/turf/closed/wall/r_wall,
/area/station/security/checkpoint/customs/auxiliary)
@@ -68669,26 +69309,13 @@
"wuM" = (
/turf/closed/wall,
/area/station/command/heads_quarters/qm)
-"wuY" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/chair/wood{
- dir = 8
- },
-/turf/open/floor/iron/grimy,
-/area/station/service/bar)
-"wvk" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/door/firedoor,
-/obj/effect/turf_decal/stripes/red/line{
- dir = 1
- },
-/obj/effect/turf_decal/stripes/red/line,
-/obj/structure/extinguisher_cabinet/directional/east,
-/obj/structure/disposalpipe/segment{
- dir = 10
+"wuU" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 4
},
-/turf/open/floor/iron/small,
-/area/station/hallway/primary/central/fore)
+/obj/structure/displaycase/trophy,
+/turf/open/floor/wood/parquet,
+/area/station/service/library)
"wvv" = (
/obj/effect/turf_decal/tile/red/opposingcorners,
/obj/effect/turf_decal/tile/blue/opposingcorners{
@@ -68713,6 +69340,13 @@
},
/turf/open/floor/iron/dark,
/area/station/engineering/atmos)
+"wvY" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/turf_decal/siding/thinplating{
+ dir = 10
+ },
+/turf/open/floor/eighties,
+/area/station/hallway/primary/central/fore)
"wwk" = (
/obj/effect/turf_decal/siding/thinplating_new/light{
dir = 8
@@ -68739,6 +69373,27 @@
/obj/machinery/power/apc/auto_name/directional/south,
/turf/open/floor/iron/smooth_large,
/area/station/science/robotics/mechbay)
+"wwH" = (
+/obj/structure/disposalpipe/segment,
+/obj/machinery/door/firedoor,
+/obj/effect/turf_decal/stripes/red/line,
+/obj/effect/turf_decal/stripes/red/line{
+ dir = 1
+ },
+/obj/merge_conflict_marker{
+ name = "---Merge Conflict Marker---";
+
+ desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
+ },
+/obj/structure/disposalpipe/segment,
+/obj/machinery/door/firedoor,
+/obj/effect/turf_decal/stripes/red/line,
+/obj/effect/turf_decal/stripes/red/line{
+ dir = 1
+ },
+/obj/structure/cable,
+/turf/open/floor/iron/small,
+/area/station/hallway/primary/central/fore)
"wwI" = (
/obj/structure/cable,
/obj/structure/disposalpipe/segment,
@@ -68807,6 +69462,16 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/closed/wall/r_wall,
/area/station/maintenance/starboard/central)
+"wxx" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/turf_decal/tile/neutral/half/contrasted{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/dark_red/half/contrasted,
+/obj/structure/disposalpipe/segment,
+/turf/open/floor/iron,
+/area/station/hallway/primary/port)
"wxG" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/machinery/light/small/dim/directional/north,
@@ -68854,17 +69519,6 @@
dir = 1
},
/area/station/science/xenobiology)
-"wya" = (
-/obj/effect/turf_decal/tile/yellow/anticorner/contrasted{
- dir = 1
- },
-/obj/machinery/chem_dispenser{
- layer = 2.7
- },
-/obj/effect/decal/cleanable/cobweb,
-/obj/machinery/light/small/directional/north,
-/turf/open/floor/iron/dark,
-/area/station/medical/pharmacy)
"wyb" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -68939,6 +69593,14 @@
/obj/machinery/newscaster/directional/north,
/turf/open/floor/iron/smooth,
/area/station/engineering/atmos/office)
+"wzh" = (
+/obj/structure/bookcase/random,
+/obj/structure/sign/poster/official/random/directional/west,
+/obj/structure/sign/painting/library{
+ pixel_y = 32
+ },
+/turf/open/floor/wood/parquet,
+/area/station/service/library)
"wzj" = (
/turf/open/floor/plating,
/area/station/maintenance/central/greater)
@@ -68981,11 +69643,6 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/carpet/lone,
/area/station/service/chapel/office)
-"wAa" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/wood/tile,
-/area/station/service/bar)
"wAb" = (
/obj/structure/table,
/obj/effect/spawner/random/food_or_drink/donkpockets,
@@ -69034,13 +69691,6 @@
"wBa" = (
/turf/open/floor/iron/dark/smooth_corner,
/area/station/maintenance/starboard/greater)
-"wBc" = (
-/obj/effect/turf_decal/tile/green/opposingcorners,
-/obj/effect/turf_decal/tile/blue/opposingcorners{
- dir = 8
- },
-/turf/open/floor/iron,
-/area/station/service/hydroponics)
"wBf" = (
/obj/effect/spawner/random/structure/closet_maintenance,
/turf/open/floor/plating/rust,
@@ -69096,6 +69746,13 @@
/obj/effect/spawner/random/structure/grille,
/turf/open/space/basic,
/area/space/nearstation)
+"wCl" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 6
+ },
+/obj/structure/mannequin/plastic,
+/turf/open/floor/carpet/blue,
+/area/station/cargo/boutique)
"wCt" = (
/obj/machinery/flasher/directional/east{
id = "hopflash"
@@ -69151,21 +69808,22 @@
},
/turf/open/floor/iron/dark,
/area/station/medical/pharmacy)
-"wCM" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/iron/dark/side{
- dir = 1
- },
-/area/station/hallway/primary/central/fore)
"wCR" = (
/turf/closed/wall,
/area/station/cargo/boutique)
+"wCV" = (
+/obj/structure/disposalpipe/segment,
+/obj/effect/turf_decal/trimline/neutral/end,
+/obj/merge_conflict_marker{
+ name = "---Merge Conflict Marker---";
+
+ desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
+ },
+/obj/structure/disposalpipe/segment,
+/obj/effect/turf_decal/trimline/neutral/end,
+/obj/structure/cable,
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/fore)
"wCX" = (
/obj/effect/spawner/structure/window,
/turf/open/floor/plating,
@@ -69184,6 +69842,14 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/science/robotics/lab)
+"wDD" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/plating,
+/area/station/maintenance/port/greater)
"wDF" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
dir = 8
@@ -69198,6 +69864,14 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/plating,
/area/station/maintenance/department/engine/atmos)
+"wDX" = (
+/obj/effect/turf_decal/tile/red/opposingcorners,
+/obj/effect/turf_decal/tile/blue/opposingcorners{
+ dir = 8
+ },
+/obj/structure/disposalpipe/segment,
+/turf/open/floor/iron/smooth,
+/area/station/service/greenroom)
"wEc" = (
/obj/effect/turf_decal/stripes/white/line{
dir = 9
@@ -69227,16 +69901,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron,
/area/station/maintenance/hallway/abandoned_command)
-"wEv" = (
-/obj/effect/mapping_helpers/airlock/access/any/service/hydroponics,
-/obj/machinery/door/airlock/hydroponics/glass{
- name = "Hydroponics"
- },
-/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/textured_half,
-/area/station/service/hydroponics)
"wEC" = (
/obj/structure/disposalpipe/segment,
/obj/structure/cable,
@@ -69281,10 +69945,6 @@
/obj/structure/filingcabinet/chestdrawer,
/turf/open/floor/iron/dark,
/area/station/command/heads_quarters/rd)
-"wFd" = (
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/iron/smooth,
-/area/station/service/library)
"wFe" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -69292,6 +69952,16 @@
/obj/machinery/camera/autoname/directional/east,
/turf/open/floor/iron,
/area/station/maintenance/hallway/abandoned_command)
+"wFo" = (
+/obj/structure/disposalpipe/segment{
+ dir = 10
+ },
+/obj/structure/cable,
+/obj/machinery/duct,
+/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/central/lesser)
"wFq" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/cable,
@@ -69315,13 +69985,6 @@
/obj/effect/landmark/generic_maintenance_landmark,
/turf/open/floor/plating,
/area/station/maintenance/department/engine/atmos)
-"wFY" = (
-/obj/effect/turf_decal/weather/dirt{
- dir = 8
- },
-/obj/structure/flora/bush/jungle/c/style_3,
-/turf/open/floor/grass,
-/area/station/service/chapel)
"wGh" = (
/obj/structure/broken_flooring/corner/directional/south,
/turf/open/floor/plating,
@@ -69351,6 +70014,12 @@
},
/turf/open/floor/iron/dark/textured_half,
/area/station/security/courtroom)
+"wGy" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 8
+ },
+/turf/open/floor/wood/tile,
+/area/station/service/bar)
"wGz" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -69466,6 +70135,58 @@
},
/turf/open/floor/iron/grimy,
/area/station/engineering/main)
+"wII" = (
+/obj/machinery/modular_computer/preset/cargochat/service{
+ dir = 8
+ },
+/obj/effect/turf_decal/delivery,
+/obj/machinery/requests_console/auto_name/directional/east,
+/obj/effect/turf_decal/tile/neutral/opposingcorners{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/thinplating_new{
+ dir = 4
+ },
+/turf/open/floor/iron/small,
+/area/station/hallway/secondary/service)
+"wIK" = (
+/obj/structure/disposalpipe/segment{
+ dir = 9
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/merge_conflict_marker{
+ name = "---Merge Conflict Marker---";
+
+ desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 9
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/cable,
+/turf/open/floor/plating,
+/area/station/maintenance/central/greater)
+"wIQ" = (
+/obj/structure/flora/tree/jungle/small/style_2,
+/obj/effect/turf_decal/weather/dirt{
+ dir = 1
+ },
+/turf/open/floor/grass,
+/area/station/service/chapel)
+"wIW" = (
+/obj/machinery/door/airlock/public/glass{
+ name = "Public Shrine"
+ },
+/obj/machinery/door/firedoor,
+/obj/effect/turf_decal/siding/wood/end{
+ dir = 4
+ },
+/turf/open/floor/stone,
+/area/station/hallway/primary/central/fore)
"wIY" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -69534,13 +70255,14 @@
/obj/effect/turf_decal/tile/blue/fourcorners,
/turf/open/floor/iron/white,
/area/station/medical/medbay/lobby)
-"wJT" = (
-/obj/structure/flora/tree/jungle/small/style_4,
-/obj/structure/flora/grass/jungle/b/style_random{
- pixel_y = -3;
- pixel_x = 3
+"wJR" = (
+/obj/effect/turf_decal/siding/wood/corner{
+ dir = 4
},
-/turf/open/floor/grass,
+/obj/effect/turf_decal/siding/wood/corner{
+ dir = 8
+ },
+/turf/open/floor/stone,
/area/station/service/chapel)
"wJX" = (
/obj/structure/closet/secure_closet/personal,
@@ -69569,6 +70291,11 @@
/obj/machinery/duct,
/turf/open/floor/plating,
/area/station/maintenance/department/medical/central)
+"wKb" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/iron/white/small,
+/area/station/service/hydroponics)
"wKc" = (
/obj/structure/table,
/obj/machinery/airalarm/directional/west,
@@ -69620,33 +70347,19 @@
/obj/structure/alien/weeds,
/turf/open/floor/wood,
/area/station/maintenance/starboard/greater)
-"wKH" = (
-/obj/structure/cable,
-/obj/effect/turf_decal/siding/wood{
- dir = 4
- },
-/obj/effect/turf_decal/siding/wood/corner{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/camera/autoname/directional/east,
-/obj/machinery/computer/security/telescreen/entertainment/directional/east,
-/obj/effect/turf_decal/siding/wood/corner{
- dir = 1
+"wKL" = (
+/obj/structure/table/reinforced,
+/obj/item/paper_bin{
+ pixel_x = -2;
+ pixel_y = 4
},
-/turf/open/floor/stone,
-/area/station/service/bar)
-"wKM" = (
-/obj/structure/disposalpipe/segment,
-/obj/machinery/door/airlock{
- name = "Maintenance"
+/obj/item/pen,
+/obj/machinery/door/poddoor/shutters{
+ id = "meow";
+ name = "Commissary"
},
-/obj/effect/mapping_helpers/airlock/access/any/service/maintenance,
-/obj/effect/mapping_helpers/airlock/unres,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/plating,
-/area/station/maintenance/central/greater)
+/turf/open/floor/iron,
+/area/station/commons/vacant_room/commissary)
"wKO" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/camera/directional/east,
@@ -69668,21 +70381,13 @@
/obj/machinery/incident_display/dual/directional/north,
/turf/open/floor/iron/smooth,
/area/station/command/bridge)
-"wKX" = (
-/obj/structure/table,
-/obj/machinery/microwave{
- pixel_y = 5
- },
-/turf/open/floor/iron/kitchen/small,
-/area/station/service/kitchen)
-"wLa" = (
-/obj/machinery/smartfridge,
-/obj/machinery/door/poddoor/shutters{
- name = "Kitchen Shutters";
- id = "kitchenshutters"
+"wKZ" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 8
},
-/turf/open/floor/iron/kitchen/small,
-/area/station/service/kitchen)
+/obj/structure/chair/stool/directional/west,
+/turf/open/floor/stone,
+/area/station/service/bar)
"wLd" = (
/turf/closed/wall/r_wall,
/area/station/maintenance/solars/port/aft)
@@ -69695,11 +70400,16 @@
/obj/effect/mapping_helpers/airlock/access/any/security/court,
/turf/open/floor/plating,
/area/station/security/courtroom)
-"wLo" = (
-/obj/structure/cable,
+"wLr" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/fore)
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/turf_decal/tile/red/opposingcorners,
+/obj/effect/turf_decal/tile/blue/opposingcorners{
+ dir = 8
+ },
+/obj/structure/cable,
+/turf/open/floor/iron/smooth,
+/area/station/service/greenroom)
"wLM" = (
/obj/structure/cable,
/obj/structure/disposalpipe/segment{
@@ -69724,13 +70434,6 @@
/obj/effect/spawner/structure/window,
/turf/open/floor/plating,
/area/station/service/library)
-"wMz" = (
-/obj/effect/turf_decal/siding/wood{
- dir = 4
- },
-/obj/structure/bookcase/random,
-/turf/open/floor/wood/parquet,
-/area/station/service/library)
"wMA" = (
/obj/machinery/camera/directional/west,
/obj/structure/bookcase/random/religion,
@@ -69959,15 +70662,6 @@
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/station/science/genetics)
-"wOt" = (
-/obj/effect/turf_decal/siding/wood{
- dir = 8
- },
-/obj/effect/turf_decal/siding/wood{
- dir = 4
- },
-/turf/open/floor/stone,
-/area/station/service/bar)
"wOz" = (
/obj/effect/landmark/generic_maintenance_landmark,
/obj/effect/turf_decal/stripes/line{
@@ -70012,6 +70706,14 @@
/obj/structure/table,
/turf/open/floor/iron/dark,
/area/station/commons/storage/tools)
+"wPa" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/light/floor,
+/obj/effect/turf_decal/tile/neutral,
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/aft)
"wPd" = (
/turf/closed/wall/r_wall,
/area/station/maintenance/starboard/lesser)
@@ -70027,10 +70729,6 @@
},
/turf/open/floor/iron/dark,
/area/station/security/interrogation)
-"wPf" = (
-/obj/item/clothing/glasses/blindfold,
-/turf/open/space/basic,
-/area/space)
"wPh" = (
/obj/structure/disposalpipe/trunk{
dir = 8
@@ -70079,6 +70777,17 @@
},
/turf/open/floor/iron/smooth,
/area/station/engineering/main)
+"wPO" = (
+/obj/structure/table/wood,
+/obj/machinery/light/small/directional/south,
+/obj/machinery/computer/security/telescreen/engine/directional/west,
+/obj/machinery/status_display/evac/directional/south,
+/obj/item/radio/off{
+ pixel_x = 1;
+ pixel_y = 3
+ },
+/turf/open/floor/wood,
+/area/station/command/heads_quarters/ce)
"wPP" = (
/obj/effect/turf_decal/tile/yellow/anticorner/contrasted{
dir = 1
@@ -70154,6 +70863,18 @@
},
/turf/open/floor/iron/smooth,
/area/station/security/evidence)
+"wQr" = (
+/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/red{
+ dir = 4
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 9
+ },
+/turf/open/floor/iron,
+/area/station/cargo/storage)
"wQx" = (
/obj/effect/spawner/random/structure/closet_maintenance,
/obj/effect/spawner/random/maintenance,
@@ -70179,6 +70900,13 @@
},
/turf/open/floor/iron/grimy,
/area/station/hallway/secondary/entry)
+"wQJ" = (
+/obj/machinery/door/airlock/public/glass{
+ name = "Library"
+ },
+/obj/machinery/door/firedoor,
+/turf/open/floor/iron/textured_half,
+/area/station/service/library)
"wQP" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -70226,6 +70954,12 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/iron,
/area/station/hallway/primary/central/fore)
+"wRj" = (
+/obj/machinery/vending/wardrobe/det_wardrobe,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/computer/security/telescreen/normal/directional/west,
+/turf/open/floor/wood,
+/area/station/security/detectives_office)
"wRo" = (
/obj/machinery/atmospherics/pipe/heat_exchanging/simple/layer2{
dir = 10
@@ -70233,6 +70967,17 @@
/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/ordnance_freezer_chamber_input,
/turf/open/floor/engine/vacuum,
/area/station/science/ordnance/freezerchamber)
+"wRA" = (
+/obj/structure/cable,
+/obj/effect/turf_decal/trimline/neutral/line,
+/obj/effect/turf_decal/trimline/neutral/line{
+ dir = 1
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/open/floor/iron,
+/area/station/hallway/primary/port)
"wRN" = (
/obj/structure/cable,
/obj/structure/disposalpipe/segment,
@@ -70243,20 +70988,6 @@
},
/turf/open/floor/iron,
/area/station/hallway/secondary/exit/departure_lounge)
-"wRO" = (
-/obj/machinery/door/airlock{
- name = "Maintenance"
- },
-/obj/effect/mapping_helpers/airlock/access/any/service/maintenance,
-/obj/effect/mapping_helpers/airlock/unres{
- dir = 4
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/structure/cable,
-/turf/open/floor/plating,
-/area/station/maintenance/central/greater)
"wRP" = (
/obj/machinery/camera/directional/south{
c_tag = "Atmospherics - South"
@@ -70446,6 +71177,22 @@
/obj/machinery/keycard_auth/directional/east,
/turf/open/floor/wood/parquet,
/area/station/command/heads_quarters/cmo)
+"wTV" = (
+/obj/structure/disposalpipe/segment{
+ dir = 9
+ },
+/obj/machinery/firealarm/directional/east,
+/obj/effect/turf_decal/tile/neutral/opposingcorners{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/thinplating_new{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/thinplating_new{
+ dir = 4
+ },
+/turf/open/floor/iron/small,
+/area/station/hallway/secondary/service)
"wTX" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -70465,14 +71212,6 @@
},
/turf/open/floor/iron,
/area/station/security)
-"wUc" = (
-/obj/machinery/light/small/directional/east,
-/obj/structure/sign/poster/official/random/directional/north,
-/obj/effect/turf_decal/siding/wood/end{
- dir = 4
- },
-/turf/open/floor/wood,
-/area/station/hallway/primary/central/aft)
"wUS" = (
/obj/structure/window/reinforced/spawner/directional/north,
/obj/effect/turf_decal/stripes/line{
@@ -70529,24 +71268,6 @@
dir = 1
},
/area/station/hallway/secondary/construction)
-"wWC" = (
-/obj/structure/chair/comfy/brown{
- dir = 4
- },
-/obj/effect/landmark/start/librarian,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron/grimy,
-/area/station/service/library)
-"wWD" = (
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/landmark/start/hangover,
-/obj/structure/disposalpipe/segment{
- dir = 5
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/fore)
"wWP" = (
/obj/effect/turf_decal/stripes/line,
/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{
@@ -70591,16 +71312,6 @@
/obj/structure/reagent_dispensers/wall/peppertank/directional/east,
/turf/open/floor/iron/smooth,
/area/station/security/checkpoint/customs/auxiliary)
-"wXe" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/effect/turf_decal/tile/dark_red/fourcorners,
-/obj/effect/turf_decal/siding/wideplating/dark{
- dir = 1
- },
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/iron,
-/area/station/security/brig/entrance)
"wXg" = (
/obj/structure/disposalpipe/trunk,
/obj/structure/window/reinforced/spawner/directional/east,
@@ -70631,6 +71342,13 @@
},
/turf/open/floor/iron/small,
/area/station/security/brig)
+"wXE" = (
+/obj/effect/turf_decal/tile/brown/opposingcorners{
+ dir = 1
+ },
+/obj/structure/disposalpipe/segment,
+/turf/open/floor/iron,
+/area/station/commons/vacant_room/commissary)
"wXV" = (
/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{
dir = 4
@@ -70651,6 +71369,16 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/engineering/storage/tech)
+"wYp" = (
+/obj/machinery/door/airlock{
+ name = "Kitchen"
+ },
+/obj/effect/mapping_helpers/airlock/access/all/service/kitchen,
+/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/service/bar/backroom)
"wYv" = (
/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{
dir = 9
@@ -70723,18 +71451,14 @@
},
/turf/open/floor/iron/dark/small,
/area/station/maintenance/department/engine/atmos)
-"wZx" = (
-/obj/machinery/door/airlock/vault{
- name = "Vault"
+"wZv" = (
+/obj/effect/turf_decal/tile/brown/opposingcorners{
+ dir = 1
},
-/obj/effect/mapping_helpers/airlock/access/all/supply/vault,
-/obj/effect/mapping_helpers/airlock/locked,
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/holopad,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/door/firedoor,
-/turf/open/floor/iron/dark/herringbone,
-/area/station/hallway/primary/central/aft)
+/turf/open/floor/iron,
+/area/station/commons/vacant_room/commissary)
"wZA" = (
/obj/structure/disposalpipe/segment,
/obj/structure/cable,
@@ -70768,6 +71492,12 @@
/obj/structure/grille,
/turf/closed/wall/mineral/titanium/nodiagonal,
/area/station/engineering/atmos)
+"xag" = (
+/obj/effect/turf_decal/siding/wood/corner{
+ dir = 8
+ },
+/turf/open/floor/stone,
+/area/station/service/bar)
"xam" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -70869,6 +71599,14 @@
"xbg" = (
/turf/closed/wall,
/area/station/commons/fitness/recreation)
+"xbj" = (
+/obj/machinery/vending/boozeomat,
+/obj/effect/turf_decal/siding/wood/end{
+ dir = 4
+ },
+/obj/machinery/status_display/ai/directional/north,
+/turf/open/floor/iron/dark/textured,
+/area/station/service/bar)
"xbl" = (
/turf/open/floor/catwalk_floor/iron_smooth,
/area/station/command/gateway)
@@ -70885,6 +71623,13 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/starboard)
+"xbJ" = (
+/obj/structure/flora/bush/flowers_br,
+/obj/structure/flora/bush/flowers_pp,
+/obj/structure/flora/bush/flowers_yw,
+/obj/structure/flora/bush/pale,
+/turf/open/floor/grass,
+/area/station/hallway/primary/central/fore)
"xbR" = (
/obj/effect/turf_decal/tile/neutral/fourcorners,
/obj/structure/hedge,
@@ -70910,6 +71655,25 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/starboard)
+"xbZ" = (
+/obj/effect/turf_decal/siding/wood,
+/obj/machinery/light/small/directional/east,
+/obj/structure/disposalpipe/segment,
+/turf/open/floor/wood/parquet,
+/area/station/service/library)
+"xcb" = (
+/obj/structure/disposalpipe/segment{
+ dir = 6
+ },
+/turf/open/floor/wood/parquet,
+/area/station/service/library)
+"xcg" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/turf_decal/tile/neutral,
+/obj/structure/disposalpipe/segment,
+/turf/open/floor/iron,
+/area/station/hallway/primary/port)
"xck" = (
/turf/closed/wall/r_wall,
/area/station/engineering/atmos/office)
@@ -70934,12 +71698,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron,
/area/station/maintenance/starboard/greater)
-"xcK" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/closed/wall,
-/area/station/hallway/primary/central/aft)
"xcS" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -71004,24 +71762,6 @@
},
/turf/open/floor/iron/white/corner,
/area/station/hallway/secondary/exit/departure_lounge)
-"xdy" = (
-/obj/structure/table,
-/obj/machinery/reagentgrinder{
- pixel_y = 9;
- pixel_x = 4
- },
-/obj/item/reagent_containers/condiment/enzyme{
- pixel_x = -7;
- pixel_y = 6
- },
-/obj/item/reagent_containers/condiment/peppermill{
- pixel_x = 3
- },
-/obj/item/reagent_containers/condiment/saltshaker{
- pixel_x = -3
- },
-/turf/open/floor/iron/kitchen/small,
-/area/station/service/kitchen)
"xdJ" = (
/obj/machinery/door/airlock/engineering{
name = "Engine Airlock"
@@ -71162,17 +71902,6 @@
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/station/science/research)
-"xfe" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/fore)
"xff" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -71183,22 +71912,13 @@
/obj/machinery/door/firedoor,
/turf/open/floor/catwalk_floor/flat_white,
/area/station/science/server)
-"xfm" = (
-/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/dark_red/half/contrasted{
- dir = 4
- },
-/obj/effect/turf_decal/siding/wideplating/dark{
+"xfr" = (
+/obj/machinery/light/floor,
+/obj/effect/turf_decal/tile/neutral{
dir = 8
},
-/obj/structure/disposalpipe/sorting/mail/flip{
- dir = 1
- },
-/obj/effect/mapping_helpers/mail_sorting/security/hos_office,
/turf/open/floor/iron,
-/area/station/security)
+/area/station/hallway/primary/central/aft)
"xfu" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/simple/general/visible{
@@ -71249,25 +71969,21 @@
},
/turf/open/floor/iron/dark/small,
/area/station/medical/chemistry)
-"xfX" = (
-/obj/structure/cable,
-/obj/structure/disposalpipe/segment,
-/obj/machinery/door/firedoor,
-/obj/effect/turf_decal/stripes/red/line{
- dir = 1
- },
-/obj/effect/turf_decal/stripes/red/line,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/iron/small,
-/area/station/hallway/primary/central/fore)
"xgg" = (
/obj/structure/chair{
pixel_y = -2
},
/turf/open/floor/iron/dark/small,
/area/station/security/checkpoint/customs/auxiliary)
+"xgq" = (
+/obj/structure/table/wood,
+/obj/structure/reagent_dispensers/beerkeg,
+/obj/effect/turf_decal/siding/wood/end{
+ dir = 8
+ },
+/obj/structure/extinguisher_cabinet/directional/west,
+/turf/open/floor/stone,
+/area/station/service/bar)
"xgw" = (
/obj/structure/rack,
/obj/item/storage/medkit/regular,
@@ -71311,16 +72027,6 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/port)
-"xhk" = (
-/obj/machinery/door/airlock/public/glass{
- name = "Public Shrine"
- },
-/obj/machinery/door/firedoor,
-/obj/effect/turf_decal/siding/wood/end{
- dir = 4
- },
-/turf/open/floor/stone,
-/area/station/hallway/primary/central/fore)
"xhD" = (
/obj/structure/table,
/obj/item/clothing/shoes/ducky_shoes{
@@ -71420,17 +72126,6 @@
},
/turf/open/floor/iron/large,
/area/station/ai_monitored/command/storage/eva)
-"xiS" = (
-/obj/effect/turf_decal/trimline/neutral/line,
-/obj/effect/turf_decal/trimline/neutral/line{
- dir = 1
- },
-/obj/structure/disposalpipe/segment,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/station/hallway/primary/port)
"xiT" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -71441,6 +72136,10 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/dark/small,
/area/station/science/xenobiology)
+"xiY" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/engine/xenobio,
+/area/station/science/xenobiology)
"xjb" = (
/turf/open/floor/iron/white/side{
dir = 5
@@ -71455,6 +72154,12 @@
},
/turf/open/floor/plating/airless,
/area/space/nearstation)
+"xjf" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/closed/wall/r_wall,
+/area/station/hallway/primary/central/aft)
"xjg" = (
/turf/open/floor/iron/dark,
/area/station/security/interrogation)
@@ -71533,6 +72238,15 @@
/obj/effect/spawner/random/trash,
/turf/open/floor/plating,
/area/station/maintenance/fore/lesser)
+"xkk" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/turf_decal/tile/neutral,
+/obj/structure/sign/departments/holy/directional/south,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/open/floor/iron,
+/area/station/hallway/primary/port)
"xkn" = (
/obj/structure/steam_vent,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -71550,6 +72264,14 @@
/obj/structure/sign/poster/official/random/directional/north,
/turf/open/floor/iron/small,
/area/station/commons)
+"xkx" = (
+/obj/structure/sign/warning/no_smoking/circle/directional/north,
+/obj/machinery/disposal/bin,
+/obj/structure/disposalpipe/trunk{
+ dir = 4
+ },
+/turf/open/floor/wood/large,
+/area/station/service/bar)
"xkK" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -71615,9 +72337,15 @@
/obj/structure/cable/multilayer,
/turf/open/floor/plating,
/area/station/science/xenobiology)
-"xlP" = (
-/turf/open/floor/engine,
-/area/station/science/xenobiology)
+"xlS" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/structure/extinguisher_cabinet/directional/west,
+/obj/structure/disposalpipe/segment,
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/fore)
"xlZ" = (
/turf/open/floor/iron,
/area/station/maintenance/hallway/abandoned_command)
@@ -71670,18 +72398,6 @@
"xmO" = (
/turf/closed/wall/r_wall,
/area/station/maintenance/fore/greater)
-"xnb" = (
-/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/siding/thinplating_new/light{
- dir = 6
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/iron/white/small,
-/area/station/service/hydroponics)
"xng" = (
/obj/structure/disposalpipe/trunk,
/obj/machinery/disposal/delivery_chute{
@@ -71701,14 +72417,6 @@
/obj/effect/turf_decal/siding/wood,
/turf/open/floor/wood/tile,
/area/station/service/lawoffice)
-"xno" = (
-/obj/effect/turf_decal/tile/red/opposingcorners,
-/obj/effect/turf_decal/tile/blue/opposingcorners{
- dir = 8
- },
-/obj/machinery/airalarm/directional/south,
-/turf/open/floor/iron/smooth,
-/area/station/service/greenroom)
"xnA" = (
/obj/effect/spawner/structure/window/reinforced/plasma,
/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible,
@@ -71868,10 +72576,6 @@
/obj/machinery/camera/autoname/directional/east,
/turf/open/floor/iron,
/area/station/hallway/primary/aft)
-"xpL" = (
-/obj/structure/disposalpipe/segment,
-/turf/closed/wall,
-/area/station/maintenance/hallway/abandoned_command)
"xpR" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/simple/purple/visible{
@@ -71978,14 +72682,25 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/commons/fitness/locker_room)
-"xrc" = (
-/obj/machinery/door/airlock{
- name = "Maintenance"
+"xrd" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/turf_decal/stripes/corner{
+ dir = 1
},
-/obj/effect/mapping_helpers/airlock/access/any/service/maintenance,
-/obj/structure/cable,
-/turf/open/floor/plating,
-/area/station/maintenance/central/lesser)
+/obj/item/trash/flare{
+ pixel_x = 11;
+ pixel_y = 21
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/open/floor/iron/dark/corner{
+ dir = 4
+ },
+/area/station/hallway/primary/central/fore)
"xri" = (
/obj/effect/turf_decal/stripes/corner{
dir = 4
@@ -72032,45 +72747,6 @@
},
/turf/open/floor/iron/white,
/area/station/medical/medbay/central)
-"xrE" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/effect/landmark/navigate_destination/vault,
-/obj/effect/turf_decal/tile/neutral,
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/aft)
-"xrN" = (
-/obj/structure/railing{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/smart/simple/cyan/hidden{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/requests_console/directional/north{
- department = "Chief Engineer's Desk";
- name = "Chief Engineer's Requests Console";
- pixel_y = -32;
- pixel_x = 2
- },
-/obj/effect/mapping_helpers/requests_console/announcement,
-/obj/effect/mapping_helpers/requests_console/information,
-/turf/open/floor/iron/stairs/old{
- dir = 4
- },
-/area/station/command/heads_quarters/ce)
-"xrX" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/door/window/right/directional/south{
- layer = 3.1;
- name = "Upload Console Window";
- req_access = list("ai_upload")
- },
-/turf/open/floor/iron/dark,
-/area/station/ai_monitored/turret_protected/ai_upload)
"xrZ" = (
/obj/structure/disposalpipe/segment{
dir = 9
@@ -72132,16 +72808,6 @@
/obj/structure/cable,
/turf/open/floor/iron/herringbone,
/area/station/commons/dorms)
-"xsD" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/plating,
-/area/station/maintenance/port/greater)
"xsF" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
@@ -72231,15 +72897,6 @@
},
/turf/open/floor/iron/checker,
/area/station/security/breakroom)
-"xtD" = (
-/obj/effect/turf_decal/siding/wood/corner{
- dir = 8
- },
-/obj/effect/turf_decal/siding/wood{
- dir = 4
- },
-/turf/open/floor/stone,
-/area/station/service/bar)
"xtI" = (
/turf/closed/wall/r_wall,
/area/station/science/breakroom)
@@ -72325,12 +72982,6 @@
/obj/structure/window/reinforced/spawner/directional/west,
/turf/open/space/basic,
/area/space/nearstation)
-"xuJ" = (
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/aft)
"xuO" = (
/obj/structure/disposalpipe/segment,
/obj/structure/disposalpipe/segment{
@@ -72419,16 +73070,6 @@
},
/turf/closed/wall,
/area/station/cargo/miningfoundry)
-"xvK" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/turf_decal/tile/red/opposingcorners,
-/obj/effect/turf_decal/tile/blue/opposingcorners{
- dir = 8
- },
-/obj/structure/cable,
-/turf/open/floor/iron/smooth,
-/area/station/service/greenroom)
"xvM" = (
/obj/effect/turf_decal/tile/neutral,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -72493,6 +73134,15 @@
dir = 1
},
/area/station/science/research)
+"xwt" = (
+/obj/effect/turf_decal/tile/green/opposingcorners,
+/obj/effect/turf_decal/tile/blue/opposingcorners{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/iron,
+/area/station/service/hydroponics)
"xwu" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -72537,15 +73187,6 @@
/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/ordnance_burn_chamber_input,
/turf/open/floor/engine/vacuum,
/area/station/science/ordnance/burnchamber)
-"xxj" = (
-/obj/effect/turf_decal/weather/dirt{
- dir = 1
- },
-/obj/structure/flora/bush/jungle/a,
-/obj/machinery/light/small/directional/north,
-/obj/machinery/status_display/ai/directional/north,
-/turf/open/floor/grass,
-/area/station/service/chapel)
"xxo" = (
/obj/structure/lattice/catwalk,
/obj/structure/marker_beacon/yellow,
@@ -72582,14 +73223,6 @@
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/station/command/heads_quarters/hos)
-"xxT" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/plating,
-/area/station/maintenance/port/greater)
"xyh" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -72627,40 +73260,12 @@
},
/turf/open/floor/iron/white/textured_large,
/area/station/medical/medbay/lobby)
-"xym" = (
-/obj/machinery/door/airlock{
- name = "Maintenance"
- },
-/obj/effect/mapping_helpers/airlock/access/any/service/general,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/cable,
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/plating,
-/area/station/maintenance/central/greater)
-"xyt" = (
-/obj/effect/turf_decal/weather/dirt,
-/obj/structure/flora/bush/flowers_yw,
-/turf/open/floor/grass,
-/area/station/service/chapel)
"xyx" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
dir = 8
},
/turf/open/floor/iron/dark,
/area/station/security/interrogation)
-"xyM" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/navbeacon{
- codes_txt = "patrol;next_patrol=23.2-Evac-Garden";
- location = "23.4-Evac"
- },
-/obj/structure/disposalpipe/junction/flip{
- dir = 2
- },
-/turf/open/floor/iron,
-/area/station/hallway/secondary/exit/departure_lounge)
"xyQ" = (
/obj/structure/cable,
/obj/machinery/light_switch/directional/south,
@@ -72682,10 +73287,6 @@
/obj/structure/broken_flooring/pile/directional/east,
/turf/open/floor/plating,
/area/station/maintenance/starboard/aft)
-"xza" = (
-/obj/structure/window/reinforced/spawner/directional/west,
-/turf/open/space/basic,
-/area/space)
"xzd" = (
/obj/structure/lattice,
/obj/structure/railing/corner,
@@ -72763,6 +73364,13 @@
},
/turf/open/space/basic,
/area/station/engineering/atmos/space_catwalk)
+"xAj" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral/opposingcorners,
+/turf/open/floor/iron,
+/area/station/holodeck/rec_center)
"xAm" = (
/obj/structure/reagent_dispensers/fueltank,
/turf/open/floor/plating,
@@ -72837,16 +73445,6 @@
/obj/effect/mapping_helpers/airlock/cyclelink_helper,
/turf/open/floor/plating,
/area/station/engineering/atmos/space_catwalk)
-"xBd" = (
-/obj/effect/turf_decal/plaque{
- icon_state = "L7";
- pixel_y = -15
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/aft)
"xBe" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
@@ -73055,6 +73653,12 @@
/obj/structure/cable,
/turf/open/floor/plating,
/area/station/maintenance/starboard/central)
+"xEr" = (
+/obj/machinery/deepfryer,
+/obj/structure/sign/poster/official/random/directional/north,
+/obj/structure/cable,
+/turf/open/floor/iron/kitchen/small,
+/area/station/service/kitchen)
"xEv" = (
/obj/structure/sign/departments/holy/directional/west,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -73164,15 +73768,6 @@
/obj/structure/hedge,
/turf/open/floor/iron/herringbone,
/area/station/commons/dorms)
-"xFS" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/turf_decal/tile/neutral,
-/obj/machinery/status_display/evac/directional/south,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/station/hallway/primary/port)
"xFT" = (
/obj/structure/table/wood,
/obj/machinery/computer/pod/old,
@@ -73243,10 +73838,6 @@
/obj/effect/spawner/random/trash,
/turf/open/floor/plating,
/area/station/maintenance/department/science/xenobiology)
-"xHb" = (
-/obj/structure/cable,
-/turf/open/floor/iron/dark,
-/area/station/science/ordnance)
"xHc" = (
/obj/effect/turf_decal/siding/wood{
dir = 6
@@ -73274,6 +73865,11 @@
},
/turf/open/floor/carpet/purple,
/area/station/commons/dorms)
+"xHm" = (
+/mob/living/basic/deer,
+/obj/structure/flora/bush/sparsegrass,
+/turf/open/floor/grass,
+/area/station/service/chapel)
"xHD" = (
/obj/effect/spawner/structure/window,
/turf/open/floor/plating,
@@ -73315,6 +73911,13 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on,
/turf/open/floor/iron/smooth,
/area/station/engineering/atmos/office)
+"xHZ" = (
+/obj/effect/turf_decal/siding/thinplating_new/light,
+/obj/structure/cable,
+/obj/machinery/power/apc/auto_name/directional/south,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/iron/white/small,
+/area/station/service/hydroponics)
"xIj" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -73343,16 +73946,6 @@
},
/turf/open/floor/iron/white,
/area/station/medical/treatment_center)
-"xIw" = (
-/obj/structure/disposalpipe/segment,
-/obj/effect/turf_decal/trimline/neutral/line{
- dir = 4
- },
-/obj/effect/turf_decal/trimline/neutral/line{
- dir = 8
- },
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/fore)
"xIA" = (
/obj/effect/turf_decal/arrows{
dir = 8
@@ -73397,23 +73990,14 @@
/turf/open/floor/iron,
/area/station/hallway/secondary/dock)
"xJv" = (
-/obj/structure/table/reinforced,
-/obj/machinery/door/firedoor/border_only{
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/siding/wideplating_new/terracotta{
dir = 4
},
-/obj/item/reagent_containers/cup/bowl{
- pixel_y = 3
- },
-/obj/item/reagent_containers/cup/bowl{
- pixel_y = 8;
- pixel_x = 3
- },
-/obj/machinery/door/poddoor/shutters{
- name = "Kitchen Shutters";
- id = "kitchenshutters"
- },
-/turf/open/floor/plating,
-/area/station/service/kitchen)
+/turf/open/floor/wood/tile,
+/area/station/maintenance/central/lesser)
"xJw" = (
/obj/structure/cable,
/obj/effect/turf_decal/trimline/neutral/line{
@@ -73616,10 +74200,6 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/starboard)
-"xMu" = (
-/obj/effect/turf_decal/siding/wood,
-/turf/closed/wall,
-/area/station/service/library)
"xMv" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -73646,12 +74226,34 @@
},
/turf/open/floor/eighties/red,
/area/station/service/abandoned_gambling_den/gaming)
+"xMQ" = (
+/obj/effect/turf_decal/siding/wood,
+/obj/structure/disposalpipe/segment{
+ dir = 5
+ },
+/obj/effect/turf_decal/siding/wood/corner{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/wood/corner{
+ dir = 4
+ },
+/turf/open/floor/stone,
+/area/station/service/bar)
"xMT" = (
/obj/effect/spawner/random/entertainment/arcade{
dir = 1
},
/turf/open/floor/plating,
/area/station/service/abandoned_gambling_den/gaming)
+"xMU" = (
+/obj/effect/mapping_helpers/airlock/access/any/service/general,
+/obj/structure/disposalpipe/segment,
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/glass{
+ name = "Service Hallway"
+ },
+/turf/open/floor/iron/textured_half,
+/area/station/hallway/secondary/service)
"xMY" = (
/turf/closed/wall/r_wall,
/area/station/command/teleporter)
@@ -73663,23 +74265,6 @@
"xNw" = (
/turf/closed/wall,
/area/station/science/breakroom)
-"xNA" = (
-/obj/effect/turf_decal/siding/wood{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/chair/wood{
- dir = 8
- },
-/turf/open/floor/iron/grimy,
-/area/station/service/bar)
-"xND" = (
-/obj/structure/window/reinforced/spawner/directional/north,
-/obj/structure/window/reinforced/spawner/directional/south,
-/obj/structure/grille,
-/obj/structure/window/reinforced/spawner/directional/east,
-/turf/open/floor/plating,
-/area/station/hallway/primary/central/fore)
"xNE" = (
/obj/structure/steam_vent,
/obj/structure/closet/crate,
@@ -73692,6 +74277,19 @@
/obj/item/clothing/gloves/color/red/insulated,
/turf/open/floor/iron,
/area/station/engineering/atmospherics_engine)
+"xNM" = (
+/obj/effect/turf_decal/siding/thinplating_new/light,
+/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/small,
+/area/station/service/hydroponics)
+"xNR" = (
+/obj/effect/turf_decal/tile/dark_red/opposingcorners,
+/obj/machinery/computer/security,
+/obj/machinery/computer/security/telescreen/prison/directional/north,
+/turf/open/floor/iron,
+/area/station/security/warden)
"xNV" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -73801,12 +74399,6 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron,
/area/station/security/prison/rec)
-"xPs" = (
-/obj/effect/turf_decal/weather/dirt{
- dir = 5
- },
-/turf/open/floor/grass,
-/area/station/service/chapel)
"xPv" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -73821,6 +74413,16 @@
/obj/effect/landmark/start/hangover,
/turf/open/floor/iron,
/area/station/hallway/secondary/recreation)
+"xPG" = (
+/obj/effect/turf_decal/delivery/white{
+ color = "#52B4E9"
+ },
+/obj/structure/reagent_dispensers/watertank/high,
+/obj/effect/turf_decal/siding/thinplating/light/end{
+ dir = 8
+ },
+/turf/open/floor/iron/white/small,
+/area/station/service/hydroponics)
"xPN" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -73910,14 +74512,6 @@
/obj/structure/cable,
/turf/open/floor/stone,
/area/station/command/heads_quarters/captain/private)
-"xQE" = (
-/obj/effect/turf_decal/siding/wood,
-/obj/effect/turf_decal/siding/wood{
- dir = 1
- },
-/obj/effect/landmark/start/hangover,
-/turf/open/floor/stone,
-/area/station/service/bar)
"xQG" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
@@ -74006,6 +74600,11 @@
/obj/machinery/light/small/directional/west,
/turf/open/floor/iron/freezer,
/area/station/command/heads_quarters/captain/private)
+"xRo" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/aft)
"xRq" = (
/obj/machinery/portable_atmospherics/canister/air,
/turf/open/floor/plating,
@@ -74067,6 +74666,17 @@
/obj/structure/barricade/wooden/crude,
/turf/open/floor/plating,
/area/station/service/abandoned_gambling_den/gaming)
+"xSc" = (
+/obj/effect/turf_decal/weather/snow/corner{
+ dir = 1
+ },
+/obj/effect/turf_decal/weather/snow,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/cable,
+/obj/structure/disposalpipe/segment,
+/turf/open/floor/iron/freezer,
+/area/station/service/kitchen/coldroom)
"xSd" = (
/obj/structure/closet/firecloset,
/obj/effect/turf_decal/tile/red,
@@ -74122,6 +74732,10 @@
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/station/medical/medbay/central)
+"xSU" = (
+/obj/structure/flora/bush/flowers_br/style_3,
+/turf/open/floor/grass,
+/area/station/service/chapel)
"xSV" = (
/obj/structure/table,
/obj/effect/turf_decal/tile/blue/full,
@@ -74150,6 +74764,12 @@
/obj/structure/broken_flooring/pile/directional/east,
/turf/open/floor/plating,
/area/station/maintenance/starboard/aft)
+"xTi" = (
+/obj/item/radio/intercom/directional/south,
+/obj/effect/turf_decal/siding/wood,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron/grimy,
+/area/station/service/library)
"xTo" = (
/obj/structure/cable,
/obj/structure/window/spawner/directional/south,
@@ -74211,6 +74831,23 @@
},
/turf/open/floor/iron/dark,
/area/station/ai_monitored/turret_protected/ai)
+"xUa" = (
+/obj/effect/turf_decal/siding/thinplating{
+ dir = 4
+ },
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
+/turf/open/floor/eighties,
+/area/station/hallway/primary/central/fore)
+"xUf" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 9
+ },
+/obj/item/storage/fancy/candle_box,
+/obj/machinery/light_switch/directional/west,
+/obj/structure/rack/skeletal,
+/obj/machinery/camera/autoname/directional/west,
+/turf/open/floor/iron/grimy,
+/area/station/service/library)
"xUg" = (
/obj/structure/cable,
/obj/structure/disposalpipe/segment{
@@ -74236,15 +74873,6 @@
},
/turf/open/floor/iron/white,
/area/station/medical/medbay/lobby)
-"xUp" = (
-/obj/structure/table/reinforced,
-/obj/machinery/door/window/right/directional/south,
-/obj/machinery/door/poddoor/shutters{
- name = "Kitchen Shutters";
- id = "kitchenshutters"
- },
-/turf/open/floor/iron/kitchen/small,
-/area/station/service/kitchen)
"xUr" = (
/obj/structure/rack,
/obj/machinery/flasher/directional/west,
@@ -74358,6 +74986,10 @@
/obj/structure/cable,
/turf/open/floor/iron/white/side,
/area/station/science/research)
+"xVH" = (
+/obj/machinery/light/small/directional/north,
+/turf/open/misc/dirt/jungle,
+/area/station/service/chapel)
"xVV" = (
/obj/effect/spawner/structure/window/reinforced/tinted,
/turf/open/floor/plating,
@@ -74470,11 +75102,6 @@
/obj/effect/turf_decal/tile/blue,
/turf/open/floor/iron/white,
/area/station/medical/medbay/aft)
-"xXe" = (
-/obj/effect/spawner/random/structure/closet_maintenance,
-/obj/effect/spawner/random/maintenance,
-/turf/open/floor/plating,
-/area/station/maintenance/central/greater)
"xXi" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -74484,6 +75111,10 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/plating,
/area/station/maintenance/starboard/aft)
+"xXj" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/wood/tile,
+/area/station/service/bar)
"xXl" = (
/obj/structure/table/reinforced,
/obj/effect/turf_decal/bot,
@@ -74492,6 +75123,13 @@
},
/turf/open/floor/iron/small,
/area/station/engineering/break_room)
+"xXn" = (
+/obj/effect/turf_decal/tile/green/opposingcorners,
+/obj/effect/turf_decal/tile/blue/opposingcorners{
+ dir = 8
+ },
+/turf/open/floor/iron,
+/area/station/service/hydroponics)
"xXr" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -74514,13 +75152,6 @@
/obj/machinery/power/apc/auto_name/directional/north,
/turf/open/floor/plating,
/area/station/maintenance/starboard/aft)
-"xXD" = (
-/obj/effect/turf_decal/siding/thinplating_new/light,
-/obj/structure/cable,
-/obj/machinery/power/apc/auto_name/directional/south,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/iron/white/small,
-/area/station/service/hydroponics)
"xXG" = (
/obj/structure/bed,
/obj/item/bedsheet/cmo,
@@ -74653,13 +75284,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
/area/station/maintenance/port/greater)
-"xZe" = (
-/obj/effect/landmark/start/chaplain,
-/obj/effect/turf_decal/siding/wood{
- dir = 4
- },
-/turf/open/floor/stone,
-/area/station/service/chapel)
"xZg" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/effect/turf_decal/tile/neutral,
@@ -74696,6 +75320,39 @@
/obj/machinery/camera/autoname/directional/east,
/turf/open/floor/iron/dark,
/area/station/command/heads_quarters/rd)
+"xZI" = (
+/obj/machinery/atmospherics/pipe/smart/simple/general/visible{
+ dir = 10
+ },
+/obj/structure/table,
+/obj/item/cigarette,
+/obj/item/toy/toy_dagger,
+/obj/item/clothing/head/collectable/paper,
+/obj/item/toy/figure/roboticist{
+ pixel_x = 6;
+ pixel_y = 6
+ },
+/obj/item/toy/figure/syndie{
+ pixel_y = 5;
+ pixel_x = -6
+ },
+/obj/item/toy/figure/md{
+ pixel_x = 10
+ },
+/obj/item/toy/figure/hop{
+ pixel_x = 2;
+ pixel_y = -2
+ },
+/obj/item/toy/figure/ian{
+ pixel_x = -5;
+ pixel_y = -1
+ },
+/obj/item/toy/figure/lawyer{
+ pixel_x = -10
+ },
+/obj/item/toy/figure/detective,
+/turf/open/floor/plating,
+/area/station/maintenance/port/fore)
"xZJ" = (
/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/incinerator_ordmix{
dir = 8
@@ -74733,11 +75390,27 @@
/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible,
/turf/open/floor/iron/stairs/medium,
/area/station/engineering/atmos)
+"yae" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/landmark/start/hangover,
+/obj/effect/turf_decal/trimline/neutral/line,
+/obj/effect/turf_decal/trimline/neutral/line{
+ dir = 1
+ },
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/aft)
"yag" = (
/obj/structure/cable,
/obj/machinery/power/apc/auto_name/directional/north,
/turf/open/floor/plating,
/area/station/maintenance/port/lesser)
+"yak" = (
+/obj/structure/window/reinforced/spawner/directional/north,
+/obj/structure/window/reinforced/spawner/directional/south,
+/obj/structure/grille,
+/turf/open/floor/plating,
+/area/station/hallway/primary/central/fore)
"yal" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -74763,6 +75436,11 @@
},
/turf/open/space/basic,
/area/station/engineering/atmos/space_catwalk)
+"yaw" = (
+/obj/machinery/light/floor,
+/obj/effect/landmark/start/cook,
+/turf/open/floor/iron/kitchen/small,
+/area/station/service/kitchen)
"yaB" = (
/obj/structure/cable,
/obj/structure/lattice/catwalk,
@@ -74848,13 +75526,6 @@
dir = 8
},
/area/station/hallway/secondary/entry)
-"ybF" = (
-/obj/machinery/atmospherics/pipe/smart/simple/general/visible{
- dir = 4
- },
-/obj/effect/spawner/random/engineering/tracking_beacon,
-/turf/open/floor/engine,
-/area/station/science/xenobiology)
"ybJ" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -74877,13 +75548,6 @@
"ybO" = (
/turf/closed/wall/r_wall,
/area/station/engineering/atmos)
-"ycb" = (
-/obj/effect/turf_decal/weather/dirt{
- dir = 6
- },
-/obj/structure/flora/grass/jungle,
-/turf/open/floor/grass,
-/area/station/service/chapel)
"ycd" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
@@ -74915,6 +75579,9 @@
/obj/structure/broken_flooring/singular/directional/east,
/turf/open/floor/plating,
/area/station/hallway/secondary/dock)
+"yck" = (
+/turf/open/floor/engine/xenobio,
+/area/station/science/xenobiology)
"ycm" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 4
@@ -74934,6 +75601,13 @@
"ycE" = (
/turf/open/floor/plating,
/area/station/construction/mining/aux_base)
+"ycF" = (
+/obj/effect/turf_decal/weather/dirt{
+ dir = 1
+ },
+/obj/structure/cable,
+/turf/open/floor/grass,
+/area/station/service/chapel)
"ycQ" = (
/obj/machinery/newscaster/directional/north,
/obj/structure/chair/sofa/bench/left,
@@ -74987,11 +75661,6 @@
/obj/item/radio/intercom/directional/north,
/turf/open/floor/wood/tile,
/area/station/command/bridge)
-"ydz" = (
-/obj/machinery/vending/cigarette,
-/obj/effect/turf_decal/tile/blue,
-/turf/open/floor/iron/dark/side,
-/area/station/hallway/primary/central/fore)
"ydH" = (
/obj/effect/turf_decal/box/corners,
/obj/effect/turf_decal/box/corners{
@@ -75070,6 +75739,11 @@
/obj/effect/turf_decal/bot,
/turf/open/floor/iron,
/area/station/hallway/primary/port)
+"yeI" = (
+/obj/structure/sink/kitchen/directional/east,
+/obj/machinery/firealarm/directional/west,
+/turf/open/floor/iron/kitchen/small,
+/area/station/service/kitchen)
"yeO" = (
/obj/structure/cable,
/obj/structure/window/reinforced/spawner/directional/south,
@@ -75118,12 +75792,42 @@
dir = 8
},
/area/station/maintenance/starboard/greater)
+"yfk" = (
+/obj/structure/chair/stool/bar/directional/north,
+/obj/effect/turf_decal/siding/wood{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/wood,
+/turf/open/floor/wood,
+/area/station/hallway/primary/central/aft)
"yfs" = (
/obj/structure/closet/l3closet/scientist,
/obj/item/storage/bag/xeno,
/obj/machinery/light/small/directional/north,
/turf/open/floor/iron/white/side,
/area/station/science/xenobiology)
+"yft" = (
+/obj/effect/turf_decal/siding/thinplating_new/light{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/iron/white/small,
+/area/station/service/hydroponics)
+"yfz" = (
+/obj/effect/turf_decal/tile/brown/opposingcorners{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/button/door/directional/north{
+ name = "Door Bolt Control";
+ id = "commiss2";
+ normaldoorcontrol = 1;
+ specialfunctions = 4
+ },
+/turf/open/floor/iron,
+/area/station/commons/vacant_room/commissary)
"yfA" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/structure/disposalpipe/segment,
@@ -75145,14 +75849,6 @@
},
/turf/open/floor/iron/small,
/area/station/commons/fitness/locker_room)
-"yfG" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/turf_decal/trimline/neutral/end{
- dir = 8
- },
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/aft)
"yfJ" = (
/obj/effect/spawner/random/structure/closet_maintenance,
/obj/effect/decal/cleanable/dirt,
@@ -75189,13 +75885,13 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/security)
-"ygf" = (
-/obj/machinery/camera/directional/east{
- c_tag = "Xenobiology Lab - Test Chamber";
- network = list("ss13","rd","xeno")
+"ygg" = (
+/obj/structure/flora/grass/jungle/b/style_3{
+ pixel_y = -6;
+ pixel_x = -5
},
-/turf/open/floor/engine,
-/area/station/science/xenobiology)
+/turf/open/floor/grass,
+/area/station/service/chapel)
"ygu" = (
/turf/open/floor/iron/white,
/area/station/hallway/primary/starboard)
@@ -75390,17 +76086,6 @@
},
/turf/open/floor/iron,
/area/station/science/robotics/lab)
-"yiY" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/obj/structure/sign/departments/holy/directional/north,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/station/hallway/primary/port)
"yjc" = (
/obj/machinery/rnd/production/techfab/department/cargo,
/obj/effect/turf_decal/delivery/white,
@@ -75410,6 +76095,22 @@
"yjd" = (
/turf/open/floor/iron/dark,
/area/station/security/lockers)
+"yjj" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/turf_decal/plaque{
+ icon_state = "L4";
+ pixel_y = -15
+ },
+/obj/effect/turf_decal/trimline/neutral/line,
+/obj/effect/turf_decal/trimline/neutral/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/aft)
"yjt" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -75417,9 +76118,18 @@
/obj/machinery/newscaster/directional/west,
/turf/open/floor/iron/white/small,
/area/station/science/cubicle)
+"yjz" = (
+/obj/effect/turf_decal/siding/wood,
+/turf/open/floor/stone,
+/area/station/service/bar)
"yjE" = (
/turf/closed/wall/r_wall,
/area/station/maintenance/department/engine)
+"yjG" = (
+/obj/effect/turf_decal/weather/dirt,
+/obj/structure/flora/bush/sparsegrass,
+/turf/open/floor/grass,
+/area/station/service/chapel)
"yjN" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -75433,10 +76143,6 @@
/obj/structure/cable,
/turf/open/floor/iron/smooth,
/area/station/engineering/supermatter/room)
-"yjP" = (
-/obj/structure/flora/tree/jungle/style_2,
-/turf/open/floor/grass,
-/area/station/service/chapel)
"yjQ" = (
/obj/structure/window/reinforced/spawner/directional/south,
/obj/machinery/power/apc/auto_name/directional/east,
@@ -75493,6 +76199,16 @@
"ykL" = (
/turf/closed/wall/r_wall,
/area/station/ai_monitored/turret_protected/ai_upload_foyer)
+"ykM" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 6
+ },
+/turf/open/floor/iron,
+/area/station/hallway/primary/port)
"ykT" = (
/obj/structure/extinguisher_cabinet/directional/south,
/turf/open/floor/iron,
@@ -75548,6 +76264,15 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/smooth,
/area/station/maintenance/disposal/incinerator)
+"ylQ" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/item/radio/intercom/directional/south,
+/obj/effect/turf_decal/tile/neutral,
+/obj/structure/disposalpipe/segment{
+ dir = 5
+ },
+/turf/open/floor/iron,
+/area/station/hallway/primary/port)
"ylR" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -84623,7 +85348,7 @@ wBo
giq
wBo
vmL
-apj
+hZf
kwH
nID
vmL
@@ -84905,12 +85630,12 @@ brC
brC
pfx
ybO
-akZ
-akZ
-akZ
-akZ
-akZ
-akZ
+aJq
+aJq
+aJq
+aJq
+aJq
+aJq
gcs
blb
blb
@@ -85134,7 +85859,7 @@ vmL
wBo
mnx
ylK
-aRS
+rGr
gKs
hXt
mXm
@@ -86232,7 +86957,7 @@ jxJ
slw
dDd
vuj
-cYS
+oBT
rhC
pee
qyT
@@ -86240,7 +86965,7 @@ pLZ
pWF
fMQ
qCb
-vgh
+lCq
yaI
qRN
erg
@@ -86248,7 +86973,7 @@ sNg
yaI
wRN
yaI
-xyM
+mPB
yaI
xQy
qRN
@@ -86480,7 +87205,7 @@ mnZ
kdH
nJU
kEA
-kQe
+exF
ouR
oRr
kdH
@@ -86490,7 +87215,7 @@ slw
qtJ
qdu
tyD
-lFq
+rPu
sor
whL
sYs
@@ -86505,7 +87230,7 @@ jch
wZS
tCm
onw
-csv
+lOd
gun
mKD
snZ
@@ -86762,7 +87487,7 @@ gdn
qyT
tDb
ttX
-iNC
+lwK
qyT
nvK
xBe
@@ -87000,12 +87725,12 @@ oRr
poM
uzJ
mKB
-aLm
+lAT
slw
-lLi
+saT
slw
-gMX
-hEu
+gsX
+kqs
ozn
ozn
pXC
@@ -87019,7 +87744,7 @@ qyT
qyT
tDE
tWQ
-ggc
+qKU
qyT
sbx
lgj
@@ -87256,27 +87981,27 @@ owl
oSb
ppk
mjQ
-fLF
-ahr
+oiQ
+qnk
nFX
nFX
ozn
-pSP
+jTR
mhk
mhk
mhk
mhk
mhk
-cgV
-qHr
-gyc
-dVQ
-wFY
-ahf
+opM
+iro
+qLT
+cJg
+ggC
+bLa
wBm
wXk
xKG
-suM
+ihy
yea
yea
yea
@@ -87513,27 +88238,27 @@ lkI
oSg
lWF
mjV
-pHs
+wQr
mhk
-ihb
+hmC
ozt
-dEQ
+jCd
sqz
mhk
-iSD
-pbw
-twN
-mSQ
-jWj
-bIJ
-bIJ
+rhq
+aVl
+sOD
+vJE
+dNX
+btI
+btI
xYD
-yjP
-hVO
+rAB
+hag
wAW
wXk
oOy
-atS
+tQI
uHI
vlY
vGp
@@ -87731,7 +88456,7 @@ oUq
sav
gIM
amH
-ccO
+oBc
bNq
olj
gBh
@@ -87774,23 +88499,23 @@ qby
mhk
mhk
mhk
-xxT
+wDD
mhk
mhk
-pGS
-sUN
-lsP
-pHA
-iSD
-iSD
-iSD
-oVW
-ePt
-jlW
+svM
+ugp
+ebm
+rri
+rhq
+rhq
+rhq
+azA
+hNr
+ibf
wBm
hDT
glM
-atS
+tQI
wEG
wEG
wEG
@@ -88031,23 +88756,23 @@ mLh
nry
qRq
mhk
-vdL
+sez
mhk
mhk
-cXb
-sry
-uoR
-neF
-hHy
-hAB
-jCm
-iSD
-bnQ
-fVF
+xVH
+wdx
+fqm
+ksP
+dSB
+jeO
+aOK
+rhq
+gvT
+yjG
wBm
wXk
jte
-diI
+uyD
yea
vmt
dzi
@@ -88066,7 +88791,7 @@ blb
blb
blb
xkt
-heY
+xNR
xOq
mxg
nPu
@@ -88288,23 +89013,23 @@ mLk
nsL
kVn
srn
-iHT
-pRc
+ryX
+nbi
mhk
-pbw
-rpF
-neF
-hmC
-xZe
-eWk
-hAB
-iSD
-cib
-vTn
+aVl
+iNy
+ksP
+qya
+hKD
+wJR
+jeO
+rhq
+mXb
+wol
wBm
wXk
-dTH
-xFS
+cCe
+hMl
yea
vmH
yea
@@ -88546,22 +89271,22 @@ dVW
qSS
mhk
tKf
-kwy
+oEC
mhk
-bBh
-qzP
-tBk
-keL
-tts
-tBk
-keL
-iSD
-rnr
-aCz
+rJp
+tWh
+frm
+cQx
+gmU
+frm
+cQx
+rhq
+tDt
+jen
wAW
-spo
+uaq
xiF
-gEx
+iQn
yea
vne
wMA
@@ -88803,22 +89528,22 @@ mhk
mhk
mhk
xmI
-ivh
+vJF
mhk
-fme
-flw
-apq
-bJx
-hHy
-sMj
-vqF
-iyR
+lXe
+nim
+hGS
+oMk
+dSB
+afR
+fEw
+cWN
xYD
-tev
+vac
wBm
wXk
glM
-uAk
+xkk
yea
vmX
vij
@@ -88854,7 +89579,7 @@ qVP
kvO
tug
hXU
-iCi
+rKo
pxj
hAC
cVC
@@ -89060,22 +89785,22 @@ mhk
nFY
mhk
mhk
-mze
-iLH
-oyz
-tmi
-klN
-tBk
-miF
-keL
-lvJ
-ahl
-gRm
-rmk
+fTV
+fJu
+gVX
+xSU
+nVR
+frm
+vFi
+cQx
+nvX
+lbw
+jsm
+sBS
wBm
wXk
glM
-atS
+tQI
rQC
vne
vHV
@@ -89317,28 +90042,28 @@ mhk
xYJ
xYJ
tYL
-mSA
+fgu
mhk
-jSJ
-tOd
-qzP
-tBk
-miF
-keL
-xPs
-qOb
-iQp
-xyt
+ycF
+cxe
+tWh
+frm
+vFi
+cQx
+bEn
+ftj
+hsY
+tlB
wBm
vuR
xgA
-hiK
-lei
-pvi
-pvi
-buc
+edx
+kll
+ioH
+ioH
+kxf
uAi
-njs
+hoj
uAi
fEC
rui
@@ -89354,7 +90079,7 @@ sNr
syk
vYD
lox
-rdW
+sAY
vTV
iWj
lRV
@@ -89545,7 +90270,7 @@ dDB
dDB
dDB
slY
-rhm
+xZI
cis
slY
slY
@@ -89569,33 +90294,33 @@ lme
lHe
lWU
tca
-urF
+ana
mhk
xZd
mhk
sNW
-mze
+fTV
mhk
-shR
-ugI
-rYs
-dPx
-nqY
-keL
-iSD
-fGW
-bIJ
-cdB
+nox
+fHP
+akp
+pFF
+vbV
+cQx
+rhq
+lEB
+btI
+pXq
wAW
-rpB
-jzr
-rpE
-tAF
+dHD
+sMS
+dXp
+ixD
vnr
-caD
-buc
+ifH
+kxf
alg
-qwK
+jPz
xjU
fEC
kJJ
@@ -89611,7 +90336,7 @@ xkt
ujA
cDH
fFH
-oBT
+eeu
vTV
vTV
xxO
@@ -89831,26 +90556,26 @@ mhk
qTJ
mhk
rGN
-mze
+fTV
mhk
-feL
-peU
-iSD
-dPx
-miF
-keL
-iSD
-iSD
-iSD
-iSD
+jzQ
+jMU
+rhq
+pFF
+vFi
+cQx
+rhq
+rhq
+rhq
+rhq
wBm
wXk
-pEO
+lpf
xOS
rQC
von
-pvC
-aLS
+bCx
+jKw
wzS
wzS
tAu
@@ -89862,17 +90587,17 @@ qVP
llW
llW
xkt
-geH
-buf
+qQx
+alm
dah
urw
urw
-hCd
-jwl
+sek
+cdA
cFg
hWJ
-vnD
-xfm
+mTS
+sTP
voJ
qxv
apk
@@ -90088,19 +90813,19 @@ mhk
mhk
mhk
mhk
-mze
+fTV
mhk
-fgT
-ycb
-aWr
-dPx
-miF
-oIL
-hHy
-kzV
-hHy
-eYB
-mIE
+ceS
+dAS
+acq
+pFF
+vFi
+bgw
+dSB
+rtm
+dSB
+mXi
+nXX
wXk
glM
oMF
@@ -90345,28 +91070,28 @@ nGu
xYJ
ina
mhk
-gLV
+eQs
mhk
-bTo
-sNA
-iSD
-dPx
-miF
-miF
-miF
-miF
-miF
-juP
+dWi
+jdZ
+rhq
+pFF
+vFi
+vFi
+vFi
+vFi
+vFi
+olt
wAW
-lqq
-ckP
-cQI
+mPn
+bgZ
+ylQ
yea
yea
vJn
wgA
guY
-oRy
+hcJ
guY
fEC
fEC
@@ -90598,32 +91323,32 @@ lIn
lXY
mhk
ina
-pyA
+pBS
ina
xYJ
xYJ
-xsD
+fuz
srn
-xxj
-cSb
-iSD
-dPx
-miF
-fMX
-wha
-wha
-wha
-mkz
-hla
+nFq
+fZj
+rhq
+pFF
+vFi
+ruF
+rWj
+rWj
+rWj
+aWl
+oNF
wXk
-uQK
-iXZ
-vpg
+aYW
+qHU
+gWx
yea
vJA
vKa
guY
-brj
+qqY
iQU
pIw
pIw
@@ -90852,35 +91577,35 @@ yjc
vLP
oyZ
lIq
-lYt
+sYI
mhk
xYJ
-lwC
+nAK
tYL
mhk
mhk
-fpN
+iAC
mhk
-kZj
-kzz
-iSD
-nrp
-miF
-keL
-iSD
-iSD
-iyR
-rya
+geX
+nvC
+rhq
+nhi
+vFi
+cQx
+rhq
+rhq
+cWN
+cWO
wBm
-kvD
-xiS
-crm
+ykM
+dsw
+nLx
dyq
yea
vKa
wgM
guY
-vhr
+rqe
pwN
liJ
pwN
@@ -91051,7 +91776,7 @@ hyx
cDE
fCW
oPa
-sXE
+fmZ
qKx
xed
rbp
@@ -91073,7 +91798,7 @@ lER
hRO
knv
rKZ
-mGn
+lyP
lvK
jiC
vdw
@@ -91112,25 +91837,25 @@ lIw
lYw
mhk
qjn
-uiw
+noP
ina
mhk
ozt
-mrn
-vRn
-wku
-bKv
-jCm
-dPx
-miF
-keL
-iSD
-iSD
-uOz
-qzP
+qjs
+pQk
+aYh
+pWY
+aOK
+pFF
+vFi
+cQx
+rhq
+rhq
+oSm
+tWh
wAW
-yiY
-nSb
+sHQ
+fhQ
xOS
yeF
xle
@@ -91138,7 +91863,7 @@ xle
xle
xle
xle
-jlz
+caL
kte
cVh
fEC
@@ -91160,7 +91885,7 @@ myy
dDQ
utP
bVO
-ezV
+byo
wuc
iiX
sos
@@ -91369,33 +92094,33 @@ lJV
cYT
mhk
mhk
-dDi
+ecw
mhk
mhk
sNW
-jQv
+eGN
mhk
-oOC
-qXr
-dhu
-kZI
-miF
-keL
-jCm
-hOO
-lzG
-tWm
+uYc
+hND
+hHB
+cBj
+vFi
+cQx
+aOK
+iQm
+lgv
+lwl
wBm
-fNW
-beN
-oRw
+fqU
+nrC
+fGB
xle
xle
slZ
-iIU
+wRj
wAj
xle
-jep
+qye
guY
yaW
fEC
@@ -91625,38 +92350,38 @@ slY
mhk
mhk
mhk
-rZb
-jXc
+wgB
+jzv
xYJ
nZW
xYJ
-jQv
+eGN
mhk
-rqF
-aFb
-fVF
-kZI
-miF
-keL
-iSD
-iyR
-cLL
-rPW
+uMp
+ygg
+yjG
+cBj
+vFi
+cQx
+rhq
+cWN
+bKC
+taE
wBm
-fNW
-iZW
+fqU
+ucX
uoh
xle
-pgm
+hWa
swu
iDA
wAS
xle
-bXi
+qgV
tuZ
fEC
fEC
-rPL
+baD
lGd
dAn
cjR
@@ -91882,26 +92607,26 @@ slY
rXw
lYT
mhk
-uiw
+noP
mhk
mhk
mhk
mhk
-ete
+cwV
mhk
-ani
-wJT
-sGk
-kZI
-miF
-keL
-iSD
-iSD
-eln
-jlW
+pRC
+rNP
+aRq
+cBj
+vFi
+cQx
+rhq
+rhq
+qec
+ibf
wBm
-fNW
-uQK
+fqU
+aYW
xOS
yeS
vrz
@@ -91909,11 +92634,11 @@ dxG
wiC
dOT
xle
-chh
-aul
-jPo
+rXS
+tKK
+aKZ
rOG
-dFQ
+bxy
fEq
rpV
qVP
@@ -92136,29 +92861,29 @@ kso
kYG
kYG
pep
-nJo
-avY
-oHk
-jRJ
-cAZ
-iHT
-vMP
-vMP
-eRy
+rXN
+ecB
+jkl
+pxv
+dWL
+ryX
+pGA
+pGA
+qmp
mhk
-pbK
-keQ
-qzP
-kZI
-miF
-keL
-iyR
-sSN
-ttb
-dIQ
+nUb
+qtV
+tWh
+cBj
+vFi
+cQx
+cWN
+dTT
+uFs
+utx
wAW
-fNW
-oYi
+fqU
+ufx
xZg
lBN
hKU
@@ -92166,8 +92891,8 @@ ixl
qyx
vXr
jTh
-wXe
-fuu
+nDm
+uNh
qVP
qVP
qVP
@@ -92179,7 +92904,7 @@ xfN
daq
xFe
lgh
-dYc
+rFj
nlf
yjd
xFe
@@ -92393,29 +93118,29 @@ uxd
xaZ
dZm
slY
-ilo
+mHR
tYL
mhk
-twm
+sVi
mhk
mhk
oaa
mhk
oTH
mhk
-lji
-ttb
-qzP
-kZI
-miF
-keL
-lmm
-lkJ
-nxK
-fVF
+axl
+uFs
+tWh
+cBj
+vFi
+cQx
+wng
+kmk
+xHm
+yjG
wBm
-fNW
-uQK
+fqU
+aYW
qHH
xle
dnK
@@ -92423,8 +93148,8 @@ vKV
wjG
wPh
xle
-eof
-hQx
+ryQ
+tzS
hDN
dcc
vRC
@@ -92494,7 +93219,7 @@ xIj
eoz
eoz
tTW
-bQy
+qMR
tMS
xIj
vfN
@@ -92650,29 +93375,29 @@ ksx
mEB
slY
ueX
-jQv
+eGN
sNW
mhk
-fkN
-nUK
-bjh
-kbk
+ejJ
+duv
+rSP
+max
mhk
mhk
mhk
-oOC
-lPq
-uCB
-kZI
-miF
-keL
-jgq
-hYh
-qXr
-oul
+uYc
+mqA
+gYr
+cBj
+vFi
+cQx
+srh
+jfJ
+hND
+aDK
wBm
-dcD
-pOM
+tgI
+taM
upg
xle
xle
@@ -92680,8 +93405,8 @@ xle
xle
xle
xle
-gyx
-uTz
+wmv
+nps
ybj
uab
rjN
@@ -92907,29 +93632,29 @@ ksA
oJR
oiw
mhk
-jQv
+eGN
sqz
mhk
mTd
qBz
qTR
-kym
+joa
rHD
qVR
wCR
-ani
-gUN
-iSD
-kVg
-miF
-keL
-bQd
-ani
-hKZ
-fVF
+pRC
+bVW
+rhq
+uHu
+vFi
+cQx
+cLK
+pRC
+osG
+yjG
wBm
-fNW
-uQK
+fqU
+aYW
xOS
kWJ
tJz
@@ -92937,8 +93662,8 @@ tIa
mvv
jsS
ocz
-nPe
-lTa
+vml
+kuV
hDN
xyx
xjg
@@ -93119,7 +93844,7 @@ gKL
upG
daC
jBo
-xrN
+aDH
gpI
lhq
cBw
@@ -93164,29 +93889,29 @@ khZ
nSY
nYQ
mhk
-ifl
+lBX
mhk
mhk
wCR
wCR
qUs
-vAl
+ksW
qmz
-uvb
+dir
wCR
-swM
-mEb
-iSD
-kZI
-miF
-vXd
-iSD
-gVL
-pyt
-tXy
+aeE
+eIU
+rhq
+cBj
+vFi
+bDI
+rhq
+fSr
+fea
+eyS
wAW
-chC
-nSb
+aPU
+fhQ
xOS
par
tJz
@@ -93194,8 +93919,8 @@ kql
kql
rAR
ezM
-nPe
-nnd
+vml
+ckZ
hDN
vcl
tPf
@@ -93382,7 +94107,7 @@ hpj
rYL
gpI
jlL
-qQR
+wPO
bNq
neg
wZr
@@ -93421,29 +94146,29 @@ ktM
sOP
otG
mhk
-oEn
-lPK
+pQc
+biO
mhk
mTN
wTO
qVR
-kym
+joa
rHH
oUJ
wCR
-aQc
-iSD
-iSD
-kZI
-wtV
-keL
-iSD
-ojA
-uPW
-rPW
+lGn
+rhq
+rhq
+cBj
+jJx
+cQx
+rhq
+aTK
+qaR
+taE
wBm
-fNW
-uQK
+fqU
+aYW
xOS
uJD
tJz
@@ -93451,8 +94176,8 @@ uZk
gOw
jsS
iAM
-nPe
-byv
+vml
+eGd
vEP
qVV
qVV
@@ -93460,7 +94185,7 @@ qVV
qVV
qVV
qVV
-grH
+dDu
qlc
xur
nGi
@@ -93678,29 +94403,29 @@ kua
lEm
oiL
mhk
-kPo
-wkK
+jkL
+gKC
mhk
wCR
wCR
qVZ
-kCB
+oLZ
rJo
sas
wCR
-cXb
-iSD
-iSD
-lPB
-odH
-keL
-iSD
-gOt
-bYh
-uoR
+xVH
+rhq
+rhq
+rAV
+tXa
+cQx
+rhq
+wIQ
+cuJ
+fqm
wBm
-fNW
-uQK
+fqU
+aYW
xOS
uKA
uBc
@@ -93708,8 +94433,8 @@ tuZ
tuZ
uBc
xjX
-nPe
-nnd
+vml
+ckZ
vEP
gxg
djg
@@ -93729,7 +94454,7 @@ xur
xur
iYY
xur
-leB
+uNi
dYj
wuc
aTn
@@ -93768,8 +94493,8 @@ dDB
dDB
dDB
dDB
-dbY
-kgu
+qyN
+sIi
wOl
dby
ktT
@@ -93936,37 +94661,37 @@ kIO
wnd
mhk
mhk
-sBf
+wml
mhk
mUt
wTO
uSI
-scY
+sFK
rJo
bHU
wCR
-rik
-hyW
-iSD
-lPB
-miF
-keL
-mye
-lZT
-uoR
-iSD
+tgL
+rjV
+rhq
+rAV
+vFi
+cQx
+mii
+rEO
+fqm
+rhq
wBm
-mcI
-fyW
-bcC
-hNj
-kKh
-ebE
-iHq
-azV
-oLo
-sCq
-nXx
+gFJ
+jVn
+xcg
+wxx
+trP
+wlG
+tAM
+wnh
+nUa
+vRi
+cId
vEP
wXC
crJ
@@ -94025,8 +94750,8 @@ dDB
dDB
dDB
dDB
-eeq
-hhZ
+rMm
+uPX
fSf
wRa
xXJ
@@ -94193,36 +94918,36 @@ msq
laD
gSX
mhk
-jQv
+eGN
mhk
wCR
wCR
wCR
-iuF
+aJB
ozO
-rxa
+wCl
wCR
-iSD
-tzN
-pnK
-dbZ
-wha
-bej
-spk
-iSD
-iSD
-iSD
+rhq
+kIu
+voR
+tGY
+rWj
+pPC
+bRD
+rhq
+rhq
+rhq
wAW
wXk
-qjt
-sJv
+wRA
+iHe
slM
tJz
vLC
rRq
jsS
ezM
-fLJ
+oLb
oZi
vEP
uQu
@@ -94432,7 +95157,7 @@ hCX
vwZ
gEM
iCw
-bnn
+ooS
lBz
mJe
iDO
@@ -94450,36 +95175,36 @@ kJb
laL
loj
mhk
-jby
+qOu
mhk
mVM
aSI
xRV
-oFy
+wdH
xZS
xZS
xRV
xZS
xRV
xRV
-rcP
+ruX
xRV
-xhk
+wIW
xRV
xZS
xZS
xRV
-aXC
-jsJ
-mKm
-qZj
-vrS
-fKr
-sfu
-sfu
-ugb
-wrk
-wbd
+fkG
+uri
+lit
+vRW
+cyw
+oNI
+arC
+arC
+waP
+byz
+sHR
lbO
ybJ
fbe
@@ -94656,7 +95381,7 @@ sHM
iqB
fdy
hnS
-vvC
+nue
hxY
vpZ
oRj
@@ -94691,45 +95416,45 @@ wbi
wbi
wbi
hnO
-nxI
-sxZ
-qGc
+vSR
+aUP
+jgX
pfw
-sar
-tSA
+crl
+niX
frI
frI
uIv
frI
-aDJ
-hKV
+arx
+giz
mZg
frI
frI
-oyp
-mXZ
-bie
-mAR
-qWG
-fkS
-tDM
-qWG
-qWG
-rvr
-qWG
-mOV
-cQG
-oUi
-twe
-qWG
-rDv
-qWG
-qWG
-ghL
-vWw
-aBo
-rZz
-tfM
+cPm
+ixJ
+rHC
+ncm
+oRR
+sXg
+rLz
+oRR
+oRR
+bOy
+oRR
+xlS
+cTL
+fTI
+dBB
+oRR
+hfM
+oRR
+oRR
+fnH
+uMO
+loa
+cGu
+fJk
nsO
uBc
tJz
@@ -94913,7 +95638,7 @@ qjx
iqB
phY
jmZ
-agY
+tBg
bDh
fPY
xkX
@@ -94964,11 +95689,11 @@ pWM
foe
jpu
lKA
-amh
+puZ
jpu
qdS
jpu
-xfX
+nrQ
xmu
jpu
jpu
@@ -94976,17 +95701,17 @@ jpu
foe
jpu
lKA
-amh
+puZ
jpu
jpu
fXJ
jpu
aRJ
wRg
-rPA
-iUh
-sXs
-atS
+cqL
+cXN
+lHG
+tQI
ftX
udA
mJB
@@ -95219,31 +95944,31 @@ kfw
yeD
kJj
yjZ
-fUC
+ftH
yjZ
-lCK
+bmI
yjZ
-dOf
-wWD
-wvk
-vkC
-fUC
-dKm
-rEJ
-fUC
-fUC
-fUC
-fUC
-fUC
-fUC
-fUC
-fUC
-uqF
-dff
-qGe
-gNP
-hzp
-atS
+nAp
+oUa
+mIO
+eph
+ftH
+gqk
+iSq
+ftH
+ftH
+ftH
+ftH
+ftH
+ftH
+ftH
+ftH
+iBv
+fLb
+mNb
+ocu
+oHn
+tQI
ftX
fnP
gvV
@@ -95416,7 +96141,7 @@ rrG
gDq
qqJ
yjE
-rco
+aHD
yjE
dGV
fDO
@@ -95476,12 +96201,12 @@ vIJ
kux
wGz
yaL
-dAC
-dAC
+jKi
+jKi
yaL
-fNC
-rpv
-cXh
+khd
+hOL
+ghm
jVM
xeO
wMg
@@ -95489,18 +96214,18 @@ xeO
xeO
xeO
xeO
-kTm
-sot
+buk
+qkl
xeO
wMg
wMg
wMg
xeO
xeO
-cUf
-gNP
-uQK
-iUH
+vad
+ocu
+aYW
+tcM
isK
uBc
uBc
@@ -95730,36 +96455,36 @@ lEa
lWk
xRV
owR
-wLo
-xfe
-ehT
-urq
-ddB
+vgf
+nxM
+hLe
+rvx
+hXc
yaL
yaL
jVM
-wRO
+eWm
jVM
-rEF
+eiZ
kGE
-waI
+lHq
xeO
-tnZ
-oPy
+wzh
+ggG
lql
lql
-cik
+ieb
wKr
-dsl
-wMz
-ntP
-rNL
+inO
+gWF
+qBf
+wuU
xeO
-gNP
-uQK
-hWm
+ocu
+aYW
+pZZ
fvh
-abB
+edA
tCF
ncD
blb
@@ -95990,33 +96715,33 @@ vrn
nzK
wQB
yaL
-ids
-wgI
-uuz
-iVP
+yfz
+bcR
+vxN
+mhL
jVM
-cKt
+tou
jVM
-hIm
+qXO
azq
iTv
wMg
wKr
-vtr
-mcV
-iGq
-uTE
-eKD
-oCi
-wFd
-wFd
-wFd
-nEq
-qie
-oCV
-kuk
-iuR
-iuR
+kEg
+tOm
+gry
+xcb
+vrG
+xbZ
+iwy
+iwy
+iwy
+kIi
+ere
+hDL
+mWH
+jca
+jca
dDB
dDB
dDB
@@ -96246,32 +96971,32 @@ xZS
vrn
ncL
wQB
-joH
-lte
-tsB
-iGS
-oTg
-fri
-moG
+wKL
+uLm
+wZv
+nLJ
+bfn
+qky
+hku
jVM
-tPX
-gfm
-rcE
-fRX
-gAH
-mmL
-mmL
-qDC
-btY
-mUi
-xMu
-qmM
-vSi
-hEJ
+sgg
+hFs
+hjJ
+umB
+gBP
+hsw
+hsw
+ahz
+tcc
+qNs
+hXO
+oUr
+vtf
+qPp
wMg
-ocv
-eZi
-kHX
+sKg
+piQ
+laO
tYX
dDB
dDB
@@ -96500,35 +97225,35 @@ qCJ
xQw
jLI
jYU
-pZv
-sjL
-tNf
-iiI
-hnn
-jRl
-kqZ
-buU
+hpY
+nUk
+oLA
+sQc
+wXE
+nQq
+hcX
+noH
jVM
rpg
jVM
-hdI
-kRA
-paJ
+rGE
+glk
+hnb
wMg
-iZM
-fEX
-fkF
-jLS
-jkT
-oxn
-saL
-iLh
-hEJ
-hEJ
-aIi
-qWV
-eZi
-kHX
+faj
+tsc
+dQY
+mTr
+dWX
+cou
+mxf
+qLJ
+qPp
+qPp
+wQJ
+bTp
+piQ
+laO
tYX
dDB
dDB
@@ -96757,7 +97482,7 @@ eHk
xQw
gtr
xZS
-vET
+lBC
ncL
qwz
jVM
@@ -96766,26 +97491,26 @@ jVM
jVM
jVM
jVM
-eAm
+gfq
jVM
-uCo
-bYE
-rYJ
+scG
+fUM
+loR
xeO
-gLg
-jdx
-dLW
-feR
-fZK
-qbB
-iwt
-uSh
-uSh
-kdg
+kSH
+tpq
+ubO
+bCW
+hlH
+flK
+lMV
+hdX
+hdX
+wsD
xeO
-mWF
-eZi
-kHX
+iQP
+piQ
+laO
tYX
dDB
dDB
@@ -97014,35 +97739,35 @@ iWW
uVT
uVT
uVT
-vET
+lBC
nAy
uIv
jVM
jVM
-rXy
-bFO
-avp
-avp
-qiI
+tRd
+reA
+gBZ
+gBZ
+vtP
jVM
-jzf
+gTd
xeO
xeO
xeO
-sXD
-qSa
-feR
-aZh
-jdx
-pOQ
+pDW
+okV
+bCW
+tkf
+tpq
+mOH
wKr
wKr
-kKD
-mDA
+tmC
+mIt
wMg
-jrN
-eZi
-kHX
+grI
+piQ
+laO
tYX
dDB
dDB
@@ -97271,42 +97996,42 @@ qJq
oIP
azm
xQw
-vET
+lBC
ncL
wQB
-aaZ
+drz
jVM
-eAm
+gfq
jVM
jVM
jVM
jVM
jVM
-lzB
+oQa
jVM
-udf
+xPG
yfC
yfC
yfC
-qzt
-ljT
-vzE
+jBg
+iCh
+pEI
yfC
yfC
yfC
yfC
yfC
xli
-equ
-sYp
-ifH
-iuR
+otl
+edu
+sRE
+jca
tYX
tYX
-iuR
+jca
tYX
tYX
-iuR
+jca
dDB
dDB
dDB
@@ -97528,42 +98253,42 @@ iLC
jts
wzK
eAc
-lcY
+wfQ
kuE
wQB
-esr
+quC
jVM
rpg
jVM
-eXB
-eIW
+xUf
+fEt
mqz
jVM
-fgJ
-pWj
-fDX
-sZo
+kKr
+pbg
+knt
+uWX
yfC
-lnN
-egc
-qiC
-qiC
-qiC
-qLU
-pnF
-qiC
+dHJ
+fhH
+sTx
+sTx
+sTx
+dnf
+btE
+sTx
mKY
-hoc
-lhT
-mfa
-diP
-rgM
-trB
-trB
-saz
-lcD
-gCl
-euz
+wqk
+pAW
+bqB
+wkW
+brB
+pak
+pak
+fhp
+uvD
+xfr
+vcM
dDB
dDB
dDB
@@ -97785,41 +98510,41 @@ eku
uVT
uVT
uVT
-lYl
+fJO
kvl
wQB
-lmz
-rXO
+ebk
+vBq
rpg
jVM
-uGD
-nAq
+qkP
+uKe
pSI
jVM
-fgJ
+kKr
jVM
-nrg
-xXD
+oWR
+xHZ
yfC
-sJV
-uIA
-mWT
-kHU
-pIC
-pIC
-oun
-wBc
-kxY
-mka
-yfG
-fVQ
-diP
-trB
-trB
-trB
-ryW
-diP
-kHX
+spO
+lNa
+hjC
+mOY
+vAO
+vAO
+iYH
+xXn
+hIk
+pQG
+jog
+dJo
+wkW
+pak
+pak
+pak
+nYN
+wkW
+laO
tYX
blb
blb
@@ -98031,7 +98756,7 @@ xMk
xsh
hcc
xGJ
-bBN
+nUZ
jwi
qtd
hOg
@@ -98042,42 +98767,42 @@ ghD
gaf
xQw
mvT
-vET
+lBC
kvT
wQB
-cZi
+eBL
jVM
-moG
+hku
jVM
-mLT
-wWC
-gls
+ktz
+unA
+xTi
jVM
-lzB
+oQa
jVM
-jfT
-dEq
-wEv
-uJi
-ntu
-jcG
-qbA
-qbA
-hLb
-tRJ
-wBc
-oIY
-bMV
-dPp
-kMA
-iuR
+ulr
+xNM
+rRJ
+xwt
+yft
+wKb
+lYS
+lYS
+bic
+eDm
+xXn
+cgY
+oym
+uQD
+tJp
+jca
tYX
tYX
tYX
-iuR
-nUd
-ong
-iuR
+jca
+rrl
+aBP
+jca
tYX
dDB
dDB
@@ -98299,42 +99024,42 @@ hMh
juS
uVT
mvT
-vET
+lBC
kyO
wQB
-drC
+sAi
jVM
-eAm
+gfq
jVM
lMH
-uSb
-iYd
-onc
-lzB
+mUv
+kjF
+lEA
+oQa
jVM
-oEz
-ptT
+hHv
+gsg
yfC
-lZf
-qCK
-bRK
-bRK
-aTz
-qRE
-ltr
-wBc
-usA
-bMV
-dPp
-kUL
+bXd
+uYy
+gaQ
+gaQ
+pAC
+hUQ
+jIw
+xXn
+mbY
+oym
+uQD
+lBk
tYX
blb
blb
dDB
tYX
-trB
-trB
-trB
+pak
+pak
+pak
tYX
dDB
dDB
@@ -98556,42 +99281,42 @@ cpT
xQv
xQw
mvT
-vET
+lBC
ncL
wQB
-ydz
+eKQ
jVM
-lEO
+gtS
jVM
jVM
jVM
jVM
jVM
-joR
+fPv
jVM
-vyP
-xnb
+qlu
+kcM
yfC
-edG
-wBc
-qiC
-qiC
-ghj
-wBc
-wBc
-jgx
+hyg
+xXn
+sTx
+sTx
+kWi
+xXn
+xXn
+fEG
mKY
-bMV
-djf
-kUL
+oym
+yae
+lBk
tYX
dDB
blb
dDB
tYX
-lcF
-trB
-trB
+bLi
+pak
+pak
tYX
dDB
dDB
@@ -98813,43 +99538,43 @@ xYO
xYO
xYO
xYO
-lXU
-rJZ
+mFd
+nrh
wQB
jVM
jVM
pXU
-avp
-bFO
-avp
-csZ
-mMO
-obi
+gBZ
+reA
+gBZ
+iHY
+hUU
+vLZ
jVM
jVM
-cJv
+sMn
yfC
yfC
-erf
-bKd
-tkm
+khM
+oMo
+hDO
yfC
-oUV
-tQC
+ugs
+baM
yfC
yfC
-aub
-dPp
-lir
-iuR
+uIp
+uQD
+abP
+jca
blb
blb
blb
-iuR
-iuR
-bnU
-bnU
-iuR
+jca
+jca
+guX
+guX
+jca
tYX
dDB
blb
@@ -99070,8 +99795,8 @@ oXK
uAY
uAY
xRU
-vET
-rJZ
+lBC
+nrh
wQB
jVM
jVM
@@ -99081,32 +99806,32 @@ jVM
jVM
jVM
jVM
-ksJ
-emp
-xym
-mgW
-isO
-aiQ
-nVw
-jJd
-uyV
-kcM
-eRa
-eRa
-vfo
-pkU
-lUl
-urf
-cPj
+stw
+vvf
+uvs
+anr
+dkU
+eOV
+rTG
+klR
+gdO
+tld
+oOn
+oOn
+vms
+xMU
+ene
+bVP
+eqd
tYX
dDB
dDB
blb
dDB
tYX
-iNF
-diP
-fVM
+urV
+wkW
+cnW
tYX
blb
blb
@@ -99327,43 +100052,43 @@ iYh
lZt
lZt
xYO
-uBI
-kTX
+oMh
+dIp
sbU
xZS
-lHp
-tjs
-qqH
-kBM
-blC
+mTO
+kav
+mmz
+bwc
+exh
jVM
-gLo
-cTn
-ajQ
+uEG
+azW
+mWg
jVM
-aLB
-ilx
-qEO
-fQd
-oNF
-sGN
-bzj
-tmD
-lEs
-jUr
+mmd
+cVR
+prT
+iQW
+wTV
+wII
+emz
+cJV
+rzw
+fto
uMg
-msk
-wmX
-kUL
+cpx
+yjj
+lBk
tYX
blb
blb
blb
blb
tYX
-iNF
-trB
-fOW
+urV
+pak
+fqE
tYX
dDB
dDB
@@ -99584,46 +100309,46 @@ xYO
xYO
xYO
xYO
-ujB
-dtO
-gwx
-aNj
-jvd
-fEF
-nlQ
-chI
-mTT
+oDV
+rIe
+mgO
+cjM
+jUI
+sxp
+dCB
+wvY
+llm
jVM
-tpQ
-keb
+vnM
+whq
jVM
tGq
tGq
xmt
xmt
-lAt
+pTe
xmt
xmt
xmt
-ouF
+nUA
xmt
xmt
xli
-iFD
-fzT
-kUL
+jku
+oEa
+lBk
tYX
blb
-aef
-fBN
+bNE
+rKu
dDB
tYX
-tKl
-trB
-oIS
-iuR
-anX
-anX
+oYd
+pak
+exU
+jca
+hpL
+hpL
uXY
iTn
nBw
@@ -99841,47 +100566,47 @@ iYj
sDp
gZy
kke
-laK
-oGJ
+aQi
+nrh
wQB
xZS
-dib
-woz
-uvs
-mpx
-oxy
+aii
+lkO
+xUa
+hLz
+dFp
jVM
-tpQ
+vnM
jVM
tGq
-nxy
+lXU
tGq
-sxl
-aTg
-oPh
-qDL
-jKV
-vTP
-rpo
-mjr
+dbI
+dac
+pgR
+eIz
+eWs
+yeI
+joB
+bCg
xmt
-ptf
-xBd
-qXP
-kTF
-iuR
-dDB
-eVX
-qGf
-blb
-iuR
-oqT
-trB
-xrE
-wZx
-lRU
-fOJ
-bgx
+mKy
+tJj
+kDX
+jkx
+jca
+dDB
+dCY
+cFi
+blb
+jca
+oiN
+pak
+mBx
+wjL
+aET
+sUv
+oVX
xcv
nBw
ghQ
@@ -100098,46 +100823,46 @@ opn
jwa
opn
jYY
-jrl
-oGJ
+ejG
+nrh
wQB
xZS
-sRT
-hdW
-auP
-kGw
-vQx
+bWO
+osd
+jtt
+aQC
+pZw
jVM
-lzB
+oQa
jVM
-haH
-hHn
+hka
+lMQ
tGq
-ipG
-aTg
-cri
-bOG
-uRv
-als
-cXH
-nZG
+xEr
+dac
+bct
+hsd
+sra
+rph
+naH
+kgY
xmt
-liw
-rzy
-qFc
-cEo
+odK
+aYw
+ofg
+lgy
tYX
dDB
-kii
-nun
+iIJ
+aVm
blb
tYX
-rNN
-trB
-bNL
-iuR
-anX
-anX
+oLJ
+pak
+rXm
+jca
+hpL
+hpL
uXY
hzb
erK
@@ -100355,43 +101080,43 @@ iYD
jLR
jLR
xMY
-dCu
-tsO
-eBC
-bPv
+oLY
+pyc
+kzo
+sKw
jVM
jVM
jVM
-mbf
+jZm
jVM
jVM
-ulE
+kPy
jVM
-amK
-anD
-rzH
-mog
-aTg
-jwt
-xdy
-jUA
-tOK
-aTg
-aTg
-xUp
-sWq
-gLO
-pbD
-kUL
+iNd
+qYC
+fTq
+qwQ
+dac
+cKI
+qXo
+hMt
+vfU
+dac
+dac
+ivu
+yfk
+nBs
+crn
+lBk
tYX
blb
blb
dDB
dDB
tYX
-iNF
-trB
-fjq
+urV
+pak
+pAu
tYX
dDB
dDB
@@ -100587,7 +101312,7 @@ xvT
fAx
fVU
xvT
-gvY
+xvT
blb
blb
blb
@@ -100612,43 +101337,43 @@ qTD
azv
jNe
psc
-dCu
-oGJ
+oLY
+nrh
wQB
xAV
-ngv
-nCX
+tVb
+raT
jVM
-tUj
-xXe
+jMw
+wtU
jVM
-ruS
-sem
-bxl
-uZy
+rUO
+aUs
+xSc
+veV
tGq
-fvK
-aTg
-pXH
-wKX
-nDm
-tOK
-aTg
-aTg
-xUp
-bIN
-bVJ
-sTb
-kUL
+dvV
+dac
+twt
+kJO
+iDP
+vfU
+dac
+dac
+ivu
+dGi
+uja
+gdi
+lBk
tYX
dDB
blb
blb
blb
tYX
-iNF
-hrc
-fjq
+urV
+ovz
+pAu
tYX
blb
blb
@@ -100857,7 +101582,7 @@ ycC
ycC
noq
ueC
-tJF
+nmb
qoD
jnZ
jEx
@@ -100868,44 +101593,44 @@ xMY
xMY
xMY
xMY
-voN
-sta
-oGJ
+weL
+xrd
+nrh
wQB
vpT
-txW
-eDi
+yak
+xbJ
jVM
-tUj
+jMw
jVM
jVM
-tpQ
+vhy
jVM
-ljg
-waY
+kvo
+hUM
tGq
-cME
-aTg
-dYu
-aTg
-aTg
-aTg
-dYu
-ctN
+eJI
+dac
+yaw
+dac
+dac
+dac
+yaw
+aTk
xmt
-wUc
-nUd
-bmY
-lir
-iuR
+lbs
+rrl
+ldh
+abP
+jca
blb
blb
dDB
-iuR
-iuR
-ifH
-ifH
-iXi
+jca
+jca
+sRE
+sRE
+xjf
tYX
dDB
dDB
@@ -101094,7 +101819,7 @@ cRI
dbs
fkj
wct
-vRg
+mPG
fKc
eVz
fTe
@@ -101126,43 +101851,43 @@ hHF
lGo
jNO
geE
-wCM
-oGJ
+kUQ
+nrh
wQB
-eIO
-xND
-ind
+nmD
+gHW
+cty
jVM
-oZy
-pMc
-pMc
-uvx
+pxB
+pGN
+pGN
+cHe
jVM
tGq
tGq
tGq
xmt
-ohy
-wLa
-xJv
-luD
-jvL
-mbC
+fRd
+nNF
+rZt
+cld
+tLE
+bNi
xmt
xmt
xli
-dQY
-bmY
-kUL
+iad
+ldh
+lBk
tYX
dDB
blb
dDB
tYX
-auF
-trB
-trB
-waD
+rBL
+pak
+pak
+mDw
dDB
dDB
dDB
@@ -101383,43 +102108,43 @@ oUd
lun
wNv
mzM
-wCM
-kyZ
+kUQ
+cJA
kJR
-qcB
+lsc
jVM
jVM
jVM
-cLy
+kKK
jVM
sON
-aYj
+wYp
vkh
vkh
vkh
-pnW
-baW
-iQe
-iQe
-ssR
-ssR
-ssR
-ssR
-aVA
-dfc
+riO
+wqF
+vly
+vly
+wKZ
+wKZ
+wKZ
+wKZ
+pEr
+sPW
vkh
-wjT
-dPp
-kUL
+uRo
+uQD
+lBk
tYX
dDB
blb
dDB
tYX
-trB
-trB
-trB
-waD
+pak
+pak
+pak
+mDw
dDB
dDB
dDB
@@ -101640,43 +102365,43 @@ soO
gfs
ivl
mzM
-wCM
-uFG
-tgx
+kUQ
+tGh
+wfw
jVM
-jnO
-pSO
+bMH
+sSf
wzj
-vEY
+hwR
jVM
-oVl
-uBN
+iQE
+fSi
vkh
-eNM
+xgq
vkh
-mce
-ohK
-rrX
-tyz
-dJv
-rVt
-rVt
-rVt
-scR
-sfU
+dNe
+jPs
+rbY
+svm
+wGy
+kAh
+kAh
+kAh
+jCW
+ano
vkh
-nUd
-dPp
-aOt
-iuR
+rrl
+uQD
+hFP
+jca
tYX
tYX
tYX
-iuR
-iNF
-xuJ
-iXi
-waD
+jca
+urV
+nRD
+xjf
+mDw
blb
blb
blb
@@ -101897,42 +102622,42 @@ xSx
jxC
ufb
xCl
-cYY
-kzu
+dRH
+jSx
wiF
jVM
jVM
jVM
jVM
-hHj
-eoM
-cqD
-vYJ
-kTr
-dMi
+tDC
+iQh
+dnw
+mhm
+phu
+xMQ
vkh
-caW
-jMA
-tes
-rPX
+xkx
+bXL
+vnW
+tAi
ycS
-aMZ
-kRs
-qsY
+wpF
+faE
+tyL
ycS
-fxW
+jww
vkh
-nUd
-dPp
-aww
-xuJ
-trB
-trB
-hML
-deR
-diP
-efm
-waD
+rrl
+uQD
+nMg
+nRD
+pak
+pak
+waL
+tez
+wkW
+kiu
+mDw
dDB
dDB
dDB
@@ -102122,7 +102847,7 @@ eND
dbz
fkj
wct
-bGq
+pPI
eBN
fQY
fTh
@@ -102155,40 +102880,40 @@ jye
jOs
mAv
khS
-dIN
+sBc
mwN
jVM
-vMV
-eWC
-eWC
-fUz
+bZT
+dwB
+dHy
+szT
jVM
-iXW
-dRb
+tFd
+rCm
vkh
-tjT
-svE
-lAV
-fYJ
-eGU
-eTJ
-vkI
-xNA
-wuY
-oeZ
-luP
-jFK
-hiD
-nUd
-dPp
-aww
-vtX
-gHg
-trB
-trB
-kHX
-kHX
-dTg
+fsh
+iOr
+nMD
+pJk
+qvI
+abo
+xXj
+tYi
+sHD
+tDh
+jyr
+goj
+tSG
+rrl
+uQD
+nMg
+otV
+qdl
+pak
+pak
+laO
+laO
+wPa
tYX
dDB
dDB
@@ -102412,41 +103137,41 @@ quU
quU
tsF
ubK
-buv
-lZW
-wKM
-oFM
-hPb
+vjl
+mgi
+oSr
+wIK
+plQ
jVM
-cCe
+kpv
jVM
-kPp
-dsP
+koU
+vOc
vkh
-bzJ
-lnD
-fzw
-bKO
-eGU
-eTJ
-luE
-kfO
-phG
-gyy
+tDm
+xag
+tsv
+wmW
+qvI
+abo
+gEw
+sNQ
+bsW
+mca
ycS
-jFK
-tnj
-nUd
-dPp
-aqf
-xcK
-iXi
-waD
-waD
-iXi
-waD
-waD
-iuR
+goj
+seS
+rrl
+uQD
+jjP
+jOd
+xjf
+mDw
+mDw
+xjf
+mDw
+mDw
+jca
dDB
dDB
dDB
@@ -102669,7 +103394,7 @@ liG
rRQ
tsF
kiB
-nBL
+efE
wNW
jVM
jVM
@@ -102680,24 +103405,24 @@ jVM
sON
sON
vkh
-mae
-ksm
-opV
-fVl
-eGU
-ebk
-vkI
-vYW
-mDf
-aYU
+lsV
+jCb
+cpL
+pjx
+qvI
+tlW
+xXj
+oGA
+cgl
+oNP
ycS
-mno
+aaz
vkh
-nUd
-dPp
-qBn
-nsz
-iuR
+rrl
+uQD
+rjl
+qwr
+jca
dDB
dDB
dDB
@@ -102895,7 +103620,7 @@ xvT
itb
eip
eFk
-gPm
+mgQ
xvT
fDk
gcL
@@ -102926,7 +103651,7 @@ jyu
ezx
tsF
vIJ
-kzx
+wsU
twJ
tgl
iSi
@@ -102936,24 +103661,24 @@ tgl
tgl
tgl
vkh
-kXC
-omk
-hsx
-pJc
-bKO
-eGU
-xQE
-vkI
-cIX
-ofU
-omb
+pOI
+mZV
+koR
+yjz
+wmW
+qvI
+sgp
+xXj
+bOJ
+hwk
+ifR
ycS
-lJm
+rRj
vkh
-elN
-dPp
-sFs
-fZZ
+dLO
+uQD
+iaF
+vWT
tYX
dDB
dDB
@@ -103183,7 +103908,7 @@ uff
mak
tsF
qlV
-uFG
+tGh
tmQ
tgl
lut
@@ -103191,26 +103916,26 @@ pbd
wtv
hxp
qhs
-oRv
+dLA
vkh
-cWB
-ccv
-tVp
-ioa
-fBB
-eGU
-eTJ
-wAa
-oDX
-bFd
-iBa
-grI
-ejX
-ove
-nUd
-dPp
-jjZ
-bje
+ovC
+jnl
+mPW
+shI
+kOS
+qvI
+abo
+uTS
+hQj
+whr
+qcL
+wgS
+cBd
+jpl
+rrl
+uQD
+uFb
+tNf
tYX
dDB
dDB
@@ -103256,7 +103981,7 @@ nFD
ljP
pKS
bkY
-lgQ
+unV
mbq
wgL
hgF
@@ -103440,34 +104165,34 @@ rth
mbp
tsF
kpF
-uFG
+tGh
wQB
tgl
lvA
nyy
diK
-xvK
-jgb
+wLr
+bYr
hRc
vkh
-mkD
-mpB
-dxV
-bKO
-bKO
-eGU
-eTJ
-wAa
-cQN
-bXR
-cmB
+xbj
+jlf
+sun
+wmW
+wmW
+qvI
+abo
+uTS
+nmw
+oRX
+eoS
ycS
-swW
-ove
-nUd
-eXZ
-qBn
-sMt
+fCo
+jpl
+rrl
+kli
+aJG
+fkA
tYX
dDB
dDB
@@ -103697,34 +104422,34 @@ jyG
meu
tsF
lAS
-uFG
+tGh
wQB
tgl
wHO
pbG
wvv
-xvK
+wLr
vGe
-xno
+iJa
vkh
vkh
-mru
+aYH
vkh
-wtw
-wtw
-pzW
-lTy
-wAa
-fIl
-fIl
-glA
+msU
+msU
+feT
+ruS
+uTS
+ipB
+ipB
+lKw
ycS
-jFm
-ove
-nUd
-vip
-kmz
-fGT
+sNG
+jpl
+rrl
+xRo
+eVR
+bNs
tYX
dDB
dDB
@@ -103954,34 +104679,34 @@ lGK
mfP
tsF
lPo
-kzu
+jSx
wQB
tgl
tgl
tgl
tgl
-uIP
-dsK
-pHY
+vsj
+wDX
+njO
vkh
-blB
-wKH
-lso
-wOt
-wOt
-gGx
-xtD
-gIv
-cAl
-wOt
-wOt
-wOt
-cvX
+pFn
+qGe
+cgk
+ncO
+ncO
+teS
+kwU
+bmp
+giA
+ncO
+ncO
+ncO
+iRy
vkh
-aWf
-vip
-duE
-aOh
+nGO
+xRo
+jEL
+nmc
xli
blb
blb
@@ -104009,8 +104734,8 @@ llC
rbO
llP
xQa
-pqa
-pqa
+xep
+xep
tFQ
vLc
xrC
@@ -104211,34 +104936,34 @@ lGK
jOS
tsF
vrn
-uFG
+tGh
smf
aCO
-iLA
+hXk
pcK
tgl
-qDd
+miE
xHD
xHD
vkh
-dGm
+cNg
vkh
vkh
vkh
-efC
+tXQ
vkh
-mib
-vfM
+vIx
+pYW
vkh
-fap
-fap
-fap
+ewc
+ewc
+ewc
vkh
vkh
-bnU
-mVc
-giB
-axd
+guX
+ktO
+jvv
+bEs
xli
qir
qir
@@ -104468,15 +105193,15 @@ lGK
mgt
tsF
kiO
-nDV
+cjZ
wNW
-coC
-pVj
-pVj
-cRL
-ose
+mPS
+aOJ
+aOJ
+gma
+seY
vpI
-aBB
+lUV
nMW
tEL
rQN
@@ -104485,18 +105210,18 @@ rZq
vpI
pBu
vpI
-lvr
-aGq
-khY
-khY
-khY
-lmz
-uLK
-diP
-prt
-gaj
-jXJ
-mxS
+inH
+tGR
+hVU
+hVU
+hVU
+ebk
+gRR
+wkW
+oTw
+gDU
+lOv
+ooM
jeW
pvY
xry
@@ -104504,7 +105229,7 @@ ppu
wSF
qir
kIS
-lBq
+ndT
csw
tlX
rVH
@@ -104523,8 +105248,8 @@ tCZ
gUk
rgK
geu
-xza
-xza
+xuF
+xuF
xSO
iTR
pox
@@ -104725,43 +105450,43 @@ iaw
uoB
tsF
kjg
-oXV
-kJX
-kQc
-vrH
-xIw
-xIw
-icN
-mZd
+uRi
+kWE
+gLz
+uix
+iEE
+iEE
+kBO
+hzM
sDZ
-pca
+kNN
uVo
oBA
mut
pjA
mut
-otJ
-xIw
-rTl
-xIw
-rlh
-vrH
-xIw
-fFr
-ddG
-hUj
-hWG
-huj
-fIj
-uhM
-qZy
+nvU
+iEE
+jAw
+iEE
+vzH
+uix
+iEE
+wCV
+wwH
+vXC
+hxL
+byV
+gXJ
+iLO
+jnr
vCO
-lKB
+nZo
vCO
-ile
+sda
wMZ
vnN
-aEo
+uym
pOm
lwk
gUn
@@ -104981,10 +105706,10 @@ gcz
jyM
uoB
jZn
-baJ
+uKw
rji
vAw
-ceS
+rCG
nvE
nvE
nvE
@@ -104994,31 +105719,31 @@ vCZ
uQi
nvE
oCx
-crx
+mvV
rFn
nvE
-tPM
+mcK
kfM
-cRc
-aPK
-aPK
-aPK
-aPK
-mcS
-rLA
-dRT
-loN
-nNz
-inU
-fsb
+huf
+uxq
+uxq
+uxq
+uxq
+mbm
+srk
+bxM
+qOg
+vtU
+exg
+eki
bcv
kov
viy
efB
-lJg
+rSp
xyh
xRI
-lJg
+rSp
hVh
elM
pYr
@@ -105239,9 +105964,9 @@ jzo
uoB
uoB
wSZ
-moj
-xpL
-nJj
+dEi
+hGM
+ooa
dyF
lNp
xRA
@@ -105254,7 +105979,7 @@ qUt
qUt
qUt
qUt
-fNZ
+nEE
qUt
qUt
xJB
@@ -105270,11 +105995,11 @@ uBY
ygu
mHb
ona
-nkW
-riS
-ihd
-gMM
-gBg
+utE
+aeh
+dBa
+gKh
+rEl
dUC
qTK
vnF
@@ -105302,7 +106027,7 @@ vTo
wYA
wPP
uer
-skp
+ayd
tFW
xqN
rnE
@@ -105511,8 +106236,8 @@ qUt
uZK
ptl
ptl
-wrZ
-mvd
+wFo
+mGm
qUt
rnc
ugH
@@ -105769,8 +106494,8 @@ qUt
aIb
qUt
qUt
-uLD
-vmr
+lds
+bCU
qLt
vrY
vrY
@@ -106279,7 +107004,7 @@ bmz
mSa
tPW
qUt
-bxk
+fFo
rex
axz
qUt
@@ -106777,7 +107502,7 @@ xRH
gcz
wSZ
jdp
-gRG
+axb
wSZ
nNj
ujq
@@ -106829,7 +107554,7 @@ qDK
vEz
mGh
wfr
-wya
+fEm
lHJ
vKY
lSK
@@ -107302,12 +108027,12 @@ oyn
fSU
fRV
skd
-ciV
+mFF
rrp
wqj
-aTb
+kUN
wqj
-fHK
+njd
qUt
roD
xDS
@@ -107608,7 +108333,7 @@ toC
bGY
wCK
tDd
-nTz
+pkv
wfr
sCp
vJR
@@ -108082,7 +108807,7 @@ knO
adh
hbz
vIC
-hdZ
+bgv
wua
wua
wua
@@ -108329,7 +109054,7 @@ fuD
xVV
eWP
lNN
-lWp
+cfU
xhD
heN
vjI
@@ -108339,7 +109064,7 @@ wqj
qUt
qUt
qUt
-hdZ
+bgv
qUt
dWW
tnb
@@ -108850,9 +109575,9 @@ wqj
uPM
cPp
wqj
-wrx
+mxJ
qUt
-hdZ
+bgv
qUt
qUt
qUt
@@ -109109,7 +109834,7 @@ eeJ
eeJ
eeJ
qUt
-hdZ
+bgv
tnb
tnb
tnb
@@ -109366,7 +110091,7 @@ gMq
duT
gtk
qUt
-hdZ
+bgv
tnb
qUt
tkq
@@ -109628,7 +110353,7 @@ tNs
tNs
tNs
tNs
-rbW
+mnl
spP
bRt
wsb
@@ -110137,11 +110862,11 @@ opN
eeJ
eeJ
qUt
-xrc
+ndO
qUt
-odD
-mtc
-deS
+whz
+nQc
+hFl
wua
sqA
sJi
@@ -110393,12 +111118,12 @@ rqD
opN
xEM
qUt
-eqG
-mHh
-nNA
-rHY
-mIP
-skN
+epP
+hTq
+vwp
+hEW
+dCn
+aac
wua
wWX
blf
@@ -110650,12 +111375,12 @@ uDz
jXB
nYs
qUt
-ffi
-mHh
-uqq
-qOG
-pXk
-cCv
+nwX
+hTq
+sqW
+dMs
+dig
+sgb
wua
wtX
wtX
@@ -110905,14 +111630,14 @@ rqw
fcU
rem
xvM
-uDE
+mWq
qUt
-lhi
-brw
-mnl
-uOx
-llY
-rdA
+vCh
+dht
+pmd
+oQh
+xJv
+mCu
qUt
sqY
ata
@@ -111140,7 +111865,7 @@ sJR
usd
nFW
tuY
-iAu
+vwF
rqw
qAj
jsU
@@ -111164,11 +111889,11 @@ iIs
axw
shD
qUt
-qnb
-qnb
-oJx
+vHn
+vHn
+vct
qUt
-izo
+lOV
qUt
qUt
srA
@@ -111983,7 +112708,7 @@ ldq
qdR
naN
vOr
-mdG
+tsE
uLj
oig
oig
@@ -114006,7 +114731,7 @@ tPm
fTM
bAs
ykL
-lJB
+frN
oah
wtt
fDQ
@@ -114225,13 +114950,13 @@ iVr
nFW
xUy
nFW
-rlq
+mtv
fjQ
rqw
-ckb
+bci
rqw
oRp
-vvd
+sSD
pzd
bqy
bqy
@@ -114267,7 +114992,7 @@ xPv
uSi
wtu
wKz
-xrX
+vVv
xBj
xUB
yha
@@ -114487,7 +115212,7 @@ aBL
rqw
jsE
rqw
-agp
+cEx
vpP
pzd
bqy
@@ -115005,15 +115730,15 @@ fcW
jVY
cvk
nFW
-uvG
-siN
-ngd
-nuV
-sue
-ngd
-cUB
-baO
-pOT
+jHG
+ogs
+iyx
+aHM
+txc
+iyx
+rXP
+rXh
+dPg
gMz
rem
rQA
@@ -115262,15 +115987,15 @@ xUy
rEd
aWb
nFW
-pTA
-hEw
-bWp
-gjn
-ngd
-ibF
-diG
-baO
-pOT
+gLK
+aRf
+kYm
+xAj
+iyx
+eOc
+vBI
+rXh
+dPg
ycQ
rem
nvB
@@ -115519,13 +116244,13 @@ eav
eav
nFW
nFW
-pOT
-pOT
-tlJ
-cYp
-jTC
-eOX
-pOT
+dPg
+dPg
+tAd
+jNY
+nkt
+omy
+dPg
xQJ
xQJ
xQJ
@@ -115777,12 +116502,12 @@ tLj
wOp
fsq
iRl
-pOT
-pOT
-pTk
-pOT
-pOT
-pOT
+dPg
+dPg
+lAa
+dPg
+dPg
+dPg
xqs
xMO
xQJ
@@ -116053,7 +116778,7 @@ cZx
vMC
apF
vfk
-rWr
+gAf
tLn
pzK
tbD
@@ -116289,7 +117014,7 @@ ogE
jhm
qJH
wQc
-pot
+npc
rUq
lyq
wOp
@@ -117054,7 +117779,7 @@ aJq
aJq
aJq
wOp
-gRH
+jAT
wOp
wOp
nWk
@@ -118137,8 +118862,8 @@ gYH
sYa
yfs
hPU
-xKX
-fKN
+ffS
+oms
xMc
xKX
jsa
@@ -118394,7 +119119,7 @@ uEw
sYa
cqn
xTR
-foI
+bww
gJS
lIL
gJS
@@ -118649,10 +119374,10 @@ cVQ
rOX
qBd
sYa
-rtI
+eHb
dXU
aSy
-deQ
+cbq
tst
deQ
aSy
@@ -119165,11 +119890,11 @@ ugX
sYa
sYa
sYa
-xlP
-xlP
-fSg
-xlP
-xlP
+yck
+yck
+lUx
+yck
+yck
eWI
eWI
eWI
@@ -119422,11 +120147,11 @@ uWl
nbF
cVz
sYa
-rQw
-xlP
-ybF
-xlP
-tGp
+qrD
+yck
+lUx
+yck
+sZL
eWI
asc
usJ
@@ -119679,11 +120404,11 @@ saY
qbo
hnP
sYa
-xlP
-xlP
-jMC
-xlP
-xlP
+yck
+yck
+uBZ
+yck
+yck
eWI
eKf
tNT
@@ -119936,11 +120661,11 @@ bXG
jlN
duc
sYa
-axN
-xlP
-gWf
-xlP
-xlP
+ukZ
+yck
+vdb
+yck
+yck
eWI
fxN
clb
@@ -120193,11 +120918,11 @@ pXQ
kwA
xaR
sYa
-pxW
-xlP
-gpy
-xlP
-mYT
+yck
+yck
+xiY
+yck
+yck
eWI
eWI
eWI
@@ -120450,11 +121175,11 @@ bqR
ryy
boW
sYa
-mwJ
-xlP
-ygf
-xlP
-fvH
+dfn
+yck
+exJ
+yck
+kJv
eWI
blb
blb
@@ -121995,7 +122720,7 @@ wos
sXw
vVX
sTK
-hGr
+haf
vbQ
iVE
ksg
@@ -122233,7 +122958,7 @@ cyx
xok
upe
xok
-avr
+qTI
nuo
eQt
eQt
@@ -122766,7 +123491,7 @@ wos
udv
tSq
mvo
-hGr
+haf
bFw
ulK
cdn
@@ -124284,7 +125009,7 @@ blb
dDB
xaN
dNG
-gJQ
+iGj
vlq
vFn
qNO
@@ -125323,10 +126048,10 @@ oZz
xZJ
aVT
enG
-xHb
-xHb
-xHb
-pHS
+qaK
+qaK
+qaK
+eAt
xpR
kQt
nhl
@@ -125580,7 +126305,7 @@ nWh
xEn
nWh
xnR
-ebo
+vuD
wLZ
xwn
cns
@@ -126602,7 +127327,7 @@ dDB
dDB
blb
yeZ
-iyr
+lXL
dEL
wVg
nzL
@@ -127116,7 +127841,7 @@ blb
blb
nzL
yeZ
-iHv
+puO
lDw
fKd
lDw
@@ -131264,7 +131989,7 @@ xqq
xLY
ylD
lye
-lNF
+uCt
ylD
ylD
ylD
@@ -135310,7 +136035,7 @@ dDB
dDB
dDB
dDB
-wPf
+dDB
dDB
dDB
dDB
@@ -135374,7 +136099,7 @@ dDB
dDB
dDB
dDB
-akZ
+aJq
aJq
aJq
tYT
diff --git a/_maps/map_files/CTF/downtown.dmm b/_maps/map_files/CTF/downtown.dmm
index c61910375820d..fd11025e943c8 100644
--- a/_maps/map_files/CTF/downtown.dmm
+++ b/_maps/map_files/CTF/downtown.dmm
@@ -1831,7 +1831,6 @@
"Ok" = (
/obj/structure/fluff/bus/passable{
icon_state = "bottomdoor";
- layer = 3;
resistance_flags = 64
},
/obj/effect/turf_decal/siding/yellow,
diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm
index ea6076af43a99..b05a493d4e9b3 100644
--- a/_maps/map_files/Deltastation/DeltaStation2.dmm
+++ b/_maps/map_files/Deltastation/DeltaStation2.dmm
@@ -632,6 +632,28 @@
/obj/machinery/ntnet_relay,
/turf/open/floor/circuit/green/telecomms/mainframe,
/area/station/tcommsat/server)
+"ahb" = (
+/obj/machinery/computer/cargo{
+ dir = 8
+ },
+/obj/machinery/camera/directional/east{
+ c_tag = "Cargo Bay - Starboard";
+ name = "cargo camera"
+ },
+/obj/machinery/light/directional/east,
+/obj/effect/turf_decal/bot,
+/obj/machinery/button/door/directional/east{
+ id = "cargounload";
+ name = "Loading Doors";
+ pixel_y = 6
+ },
+/obj/machinery/button/door/directional/east{
+ id = "cargoload";
+ name = "Loading Doors";
+ pixel_y = -6
+ },
+/turf/open/floor/iron,
+/area/station/cargo/storage)
"ahe" = (
/obj/effect/mapping_helpers/burnt_floor,
/turf/open/floor/plating,
@@ -859,17 +881,6 @@
/obj/machinery/light/small/directional/east,
/turf/open/floor/iron,
/area/station/security/prison/visit)
-"ale" = (
-/obj/structure/rack,
-/obj/effect/turf_decal/bot,
-/obj/structure/window/reinforced/spawner/directional/east{
- pixel_x = 3
- },
-/obj/structure/window/reinforced/spawner/directional/north,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/effect/spawner/random/armory/dragnet,
-/turf/open/floor/iron/dark,
-/area/station/ai_monitored/security/armory)
"alG" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -1643,6 +1654,17 @@
},
/turf/open/floor/iron/dark,
/area/station/science/ordnance)
+"atd" = (
+/obj/structure/cable,
+/obj/machinery/computer/security/telescreen/prison/directional/east,
+/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 = 8
+ },
+/obj/machinery/light/directional/east,
+/turf/open/floor/iron,
+/area/station/security/execution/transfer)
"ath" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -1674,6 +1696,13 @@
},
/turf/open/floor/plating,
/area/station/tcommsat/server)
+"atA" = (
+/obj/structure/table/wood,
+/obj/item/paper_bin,
+/obj/item/pen,
+/obj/machinery/computer/security/telescreen/interrogation/directional/west,
+/turf/open/floor/iron/checker,
+/area/station/security/interrogation)
"atG" = (
/obj/effect/turf_decal/stripes/line{
dir = 6
@@ -2227,18 +2256,6 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron,
/area/station/command/heads_quarters/qm)
-"aBf" = (
-/obj/structure/table/glass,
-/obj/item/folder/blue{
- pixel_x = 4;
- pixel_y = 4
- },
-/obj/item/folder/white,
-/obj/item/pen,
-/obj/machinery/computer/security/telescreen/cmo/directional/south,
-/obj/effect/turf_decal/tile/blue/opposingcorners,
-/turf/open/floor/iron/white,
-/area/station/command/heads_quarters/cmo)
"aBn" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/structure/cable,
@@ -2706,28 +2723,6 @@
/obj/effect/turf_decal/tile/blue,
/turf/open/floor/iron,
/area/station/service/hydroponics)
-"aHq" = (
-/obj/structure/table/wood,
-/obj/item/storage/box/matches{
- pixel_x = -2;
- pixel_y = 3
- },
-/obj/item/cigarette/cigar{
- pixel_x = 2;
- pixel_y = 2
- },
-/obj/item/cigarette/cigar/cohiba{
- pixel_x = 3;
- pixel_y = 1
- },
-/obj/item/cigarette/cigar{
- pixel_x = 4
- },
-/obj/effect/turf_decal/tile/blue/half/contrasted{
- dir = 4
- },
-/turf/open/floor/iron/dark,
-/area/station/command/corporate_showroom)
"aHr" = (
/obj/item/kirbyplants/random,
/obj/machinery/light/directional/south,
@@ -2924,6 +2919,12 @@
/obj/effect/landmark/event_spawn,
/turf/open/floor/carpet/green,
/area/station/service/library)
+"aJI" = (
+/obj/item/kirbyplants/random,
+/obj/machinery/light/small/directional/north,
+/obj/structure/extinguisher_cabinet/directional/north,
+/turf/open/floor/iron/dark,
+/area/station/security/interrogation)
"aJK" = (
/obj/structure/urinal/directional/north,
/obj/effect/decal/cleanable/dirt,
@@ -3024,10 +3025,6 @@
/obj/effect/turf_decal/tile/yellow,
/turf/open/floor/iron/white,
/area/station/medical/chemistry)
-"aKU" = (
-/obj/structure/sign/warning/electric_shock/directional/west,
-/turf/open/space/basic,
-/area/space)
"aLv" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -3048,17 +3045,6 @@
dir = 4
},
/area/station/commons/fitness/recreation)
-"aLM" = (
-/obj/machinery/computer/security/telescreen/prison/directional/east,
-/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/red{
- dir = 8
- },
-/obj/machinery/light/directional/east,
-/turf/open/floor/iron,
-/area/station/security/execution/transfer)
"aLN" = (
/obj/machinery/atmospherics/pipe/smart/manifold/purple/visible{
dir = 4
@@ -4473,6 +4459,14 @@
/obj/effect/mapping_helpers/airlock/access/all/command/hop,
/turf/open/floor/wood,
/area/station/command/heads_quarters/hop)
+"beI" = (
+/obj/structure/table/reinforced,
+/obj/item/stock_parts/power_store/cell/high,
+/obj/item/stock_parts/power_store/cell/high,
+/obj/machinery/cell_charger,
+/obj/effect/turf_decal/bot,
+/turf/open/floor/iron,
+/area/station/engineering/main)
"beP" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
@@ -6003,6 +5997,25 @@
},
/turf/open/floor/wood,
/area/station/engineering/break_room)
+"byI" = (
+/obj/structure/table/reinforced,
+/obj/machinery/cell_charger,
+/obj/effect/turf_decal/siding/purple{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/purple{
+ dir = 4
+ },
+/obj/item/stock_parts/power_store/cell/high,
+/turf/open/floor/iron,
+/area/station/science/lab)
+"byO" = (
+/obj/machinery/portable_atmospherics/canister,
+/obj/machinery/atmospherics/components/unary/portables_connector/visible,
+/obj/effect/turf_decal/box,
+/obj/machinery/computer/security/telescreen/test_chamber/directional/north,
+/turf/open/floor/iron,
+/area/station/science/xenobiology)
"byP" = (
/obj/machinery/firealarm/directional/east,
/obj/machinery/camera{
@@ -6186,23 +6199,6 @@
"bAR" = (
/turf/closed/wall/r_wall,
/area/station/engineering/break_room)
-"bAS" = (
-/obj/structure/table/wood,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/item/cigarette/cigar/havana{
- pixel_x = 2;
- pixel_y = 2
- },
-/obj/item/cigarette/cigar/cohiba{
- pixel_x = 6;
- pixel_y = 2
- },
-/obj/item/cigarette/cigar{
- pixel_x = -2;
- pixel_y = 2
- },
-/turf/open/floor/iron/grimy,
-/area/station/command/heads_quarters/hos)
"bAU" = (
/obj/structure/window/reinforced/spawner/directional/east,
/obj/structure/lattice,
@@ -6674,17 +6670,6 @@
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/iron/herringbone,
/area/station/cargo/miningoffice)
-"bFD" = (
-/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible,
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/obj/effect/turf_decal/tile/neutral/half/contrasted{
- dir = 8
- },
-/obj/structure/cable,
-/turf/open/floor/iron/dark,
-/area/station/science/ordnance)
"bFS" = (
/obj/effect/turf_decal/trimline/blue/filled/warning,
/obj/structure/cable,
@@ -6899,14 +6884,6 @@
/obj/effect/mapping_helpers/airlock/access/any/supply/maintenance,
/turf/open/floor/iron,
/area/station/maintenance/fore)
-"bHr" = (
-/obj/structure/table/reinforced,
-/obj/item/stock_parts/power_store/cell/high,
-/obj/item/stock_parts/power_store/cell/high,
-/obj/machinery/cell_charger,
-/obj/effect/turf_decal/bot,
-/turf/open/floor/iron,
-/area/station/engineering/main)
"bHA" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/door/airlock/maintenance_hatch{
@@ -7268,30 +7245,6 @@
},
/turf/open/floor/iron,
/area/station/hallway/secondary/construction)
-"bLy" = (
-/obj/machinery/computer/cargo{
- dir = 8
- },
-/obj/machinery/camera/directional/east{
- c_tag = "Cargo Bay - Starboard";
- name = "cargo camera"
- },
-/obj/machinery/light/directional/east,
-/obj/effect/turf_decal/bot,
-/obj/machinery/button/door/directional/east{
- id = "cargounload";
- layer = 4;
- name = "Loading Doors";
- pixel_y = 6
- },
-/obj/machinery/button/door/directional/east{
- id = "cargoload";
- layer = 4;
- name = "Loading Doors";
- pixel_y = -6
- },
-/turf/open/floor/iron,
-/area/station/cargo/storage)
"bLC" = (
/obj/structure/extinguisher_cabinet/directional/west,
/obj/effect/turf_decal/tile/blue/opposingcorners{
@@ -8050,20 +8003,6 @@
/obj/effect/turf_decal/tile/neutral/full,
/turf/open/floor/iron/large,
/area/station/security/checkpoint/escape)
-"bUN" = (
-/obj/structure/table,
-/obj/structure/cable,
-/obj/machinery/power/apc/auto_name/directional/east,
-/obj/machinery/cell_charger,
-/obj/item/screwdriver{
- pixel_y = -1
- },
-/obj/effect/turf_decal/siding/purple{
- dir = 8
- },
-/obj/item/stock_parts/power_store/cell/high,
-/turf/open/floor/iron,
-/area/station/science/robotics/lab)
"bUQ" = (
/obj/structure/chair/stool/directional/west,
/turf/open/floor/iron,
@@ -8410,6 +8349,17 @@
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/station/maintenance/port/fore)
+"bZM" = (
+/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible,
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/neutral/half/contrasted{
+ dir = 8
+ },
+/obj/structure/cable,
+/turf/open/floor/iron/dark,
+/area/station/science/ordnance)
"bZY" = (
/obj/structure/chair/comfy/brown{
dir = 8
@@ -8816,16 +8766,6 @@
"cfu" = (
/turf/open/floor/circuit/green,
/area/station/ai_monitored/turret_protected/ai_upload)
-"cfx" = (
-/obj/structure/cable,
-/obj/machinery/computer/station_alert{
- dir = 4
- },
-/obj/effect/turf_decal/bot,
-/obj/machinery/computer/security/telescreen/ce/directional/west,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/turf/open/floor/iron/dark,
-/area/station/command/heads_quarters/ce)
"cfy" = (
/obj/effect/turf_decal/stripes/line,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
@@ -8865,6 +8805,15 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/plating,
/area/station/hallway/secondary/construction)
+"cfW" = (
+/obj/structure/table,
+/obj/machinery/cell_charger,
+/obj/item/stock_parts/power_store/cell/high,
+/obj/effect/turf_decal/tile/yellow{
+ dir = 4
+ },
+/turf/open/floor/iron,
+/area/station/hallway/secondary/construction)
"cgf" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
@@ -9438,11 +9387,6 @@
},
/turf/open/floor/iron,
/area/station/engineering/atmos)
-"cmy" = (
-/obj/structure/cable,
-/obj/machinery/computer/security/telescreen/prison/directional/east,
-/turf/open/floor/iron,
-/area/station/security/execution/transfer)
"cmE" = (
/obj/item/kirbyplants/random,
/obj/effect/turf_decal/tile/blue/half/contrasted{
@@ -10178,6 +10122,10 @@
dir = 4
},
/area/station/commons/fitness/recreation)
+"cwG" = (
+/obj/structure/sign/warning/secure_area/directional/west,
+/turf/open/space/basic,
+/area/space/nearstation)
"cwI" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible,
/obj/effect/turf_decal/stripes/line{
@@ -11783,6 +11731,13 @@
/obj/machinery/newscaster/directional/north,
/turf/open/floor/iron,
/area/station/commons/storage/primary)
+"cRf" = (
+/obj/machinery/atmospherics/pipe/smart/simple/purple/visible/layer2,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/machinery/power/apc/auto_name/directional/east,
+/obj/structure/cable,
+/turf/open/floor/iron/dark,
+/area/station/science/ordnance)
"cRl" = (
/obj/effect/turf_decal/siding/wood,
/turf/open/floor/iron/grimy,
@@ -12414,6 +12369,24 @@
dir = 4
},
/area/station/hallway/secondary/entry)
+"cZK" = (
+/obj/structure/table/wood,
+/obj/item/restraints/handcuffs{
+ pixel_y = 6
+ },
+/obj/item/cigarette/cigar/cohiba{
+ pixel_x = 7;
+ pixel_y = -7
+ },
+/obj/item/cigarette/cigar/havana{
+ pixel_x = -3
+ },
+/obj/item/cigarette/cigar{
+ pixel_x = -1;
+ pixel_y = -7
+ },
+/turf/open/floor/carpet,
+/area/station/security/detectives_office)
"cZN" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -12880,6 +12853,14 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron,
/area/station/cargo/warehouse)
+"dfm" = (
+/obj/machinery/atmospherics/pipe/smart/simple/purple/visible/layer2{
+ dir = 6
+ },
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/structure/cable,
+/turf/open/floor/iron/dark,
+/area/station/science/ordnance)
"dfv" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
@@ -13192,10 +13173,6 @@
},
/turf/open/floor/plating,
/area/station/maintenance/department/security)
-"djY" = (
-/obj/structure/sign/warning/secure_area/directional/east,
-/turf/open/space/basic,
-/area/space)
"dka" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
@@ -13585,6 +13562,17 @@
/obj/structure/sign/poster/random/directional/south,
/turf/open/floor/iron/dark,
/area/station/maintenance/department/engine/atmos)
+"dpR" = (
+/obj/structure/rack,
+/obj/effect/turf_decal/bot,
+/obj/structure/window/reinforced/spawner/directional/east{
+ pixel_x = 3
+ },
+/obj/structure/window/reinforced/spawner/directional/north,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/effect/spawner/random/armory/dragnet,
+/turf/open/floor/iron/dark,
+/area/station/ai_monitored/security/armory)
"dqc" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/cable,
@@ -13919,11 +13907,6 @@
/obj/structure/sign/poster/official/random/directional/south,
/turf/open/floor/wood,
/area/station/commons/vacant_room/office)
-"dtk" = (
-/obj/structure/table/wood/poker,
-/obj/item/cigarette/pipe,
-/turf/open/floor/carpet/green,
-/area/station/commons/lounge)
"dtn" = (
/obj/machinery/airalarm/directional/east,
/obj/effect/turf_decal/tile/neutral/fourcorners,
@@ -14222,6 +14205,11 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/grimy,
/area/station/service/library/lounge)
+"dwI" = (
+/obj/effect/turf_decal/tile/blue/half/contrasted,
+/obj/machinery/computer/security/telescreen/minisat/directional/south,
+/turf/open/floor/iron/dark,
+/area/station/command/bridge)
"dwN" = (
/turf/open/floor/iron/half{
dir = 8
@@ -14677,10 +14665,6 @@
},
/turf/open/floor/iron/dark,
/area/station/science/xenobiology)
-"dDB" = (
-/obj/structure/cable,
-/turf/open/floor/iron/dark,
-/area/station/science/ordnance)
"dDT" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/components/trinary/filter{
@@ -15963,12 +15947,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/plating,
/area/station/maintenance/port/aft)
-"dTS" = (
-/obj/structure/sign/nanotrasen{
- pixel_y = -32
- },
-/turf/open/space/basic,
-/area/space)
"dUb" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -16839,6 +16817,11 @@
/obj/effect/mapping_helpers/burnt_floor,
/turf/open/floor/plating,
/area/station/service/abandoned_gambling_den)
+"efv" = (
+/obj/structure/table/wood/poker,
+/obj/item/cigarette/pipe,
+/turf/open/floor/carpet/green,
+/area/station/commons/lounge)
"efQ" = (
/obj/structure/grille,
/obj/structure/lattice,
@@ -16995,6 +16978,16 @@
/obj/effect/turf_decal/bot,
/turf/open/floor/iron,
/area/station/cargo/storage)
+"ehU" = (
+/obj/structure/cable,
+/obj/machinery/computer/station_alert{
+ dir = 4
+ },
+/obj/effect/turf_decal/bot,
+/obj/machinery/computer/security/telescreen/ce/directional/west,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/turf/open/floor/iron/dark,
+/area/station/command/heads_quarters/ce)
"eif" = (
/obj/item/kirbyplants/random,
/obj/machinery/firealarm/directional/north,
@@ -17558,17 +17551,6 @@
/obj/effect/turf_decal/tile/bar/opposingcorners,
/turf/open/floor/iron/dark,
/area/station/service/bar)
-"eqP" = (
-/obj/machinery/camera/directional/west{
- c_tag = "Xenobiology - Secure Cell Interior";
- name = "xenobiology camera";
- network = list("ss13","xeno","rd")
- },
-/obj/machinery/status_display/ai/directional/west,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/machinery/light/cold/directional/west,
-/turf/open/floor/iron/dark,
-/area/station/science/xenobiology)
"eqU" = (
/turf/open/space,
/area/space)
@@ -18053,6 +18035,14 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/central/aft)
+"ewl" = (
+/obj/structure/table,
+/obj/item/stock_parts/power_store/cell/high,
+/obj/item/stock_parts/power_store/cell/high,
+/obj/machinery/cell_charger,
+/obj/structure/extinguisher_cabinet/directional/west,
+/turf/open/floor/iron,
+/area/station/science/robotics/mechbay)
"ewQ" = (
/obj/machinery/atmospherics/pipe/smart/simple/cyan/hidden{
dir = 4
@@ -18185,6 +18175,9 @@
/obj/machinery/photocopier,
/turf/open/floor/iron/white,
/area/station/science/research)
+"eyn" = (
+/turf/open/floor/engine/xenobio,
+/area/station/science/xenobiology)
"eyr" = (
/obj/item/kirbyplants/random,
/obj/machinery/power/apc/auto_name/directional/north,
@@ -18196,6 +18189,16 @@
/obj/effect/turf_decal/tile/red/fourcorners,
/turf/open/floor/iron,
/area/station/security/processing)
+"eyt" = (
+/obj/machinery/atmospherics/components/unary/portables_connector/visible{
+ dir = 8
+ },
+/obj/effect/turf_decal/box,
+/obj/structure/extinguisher_cabinet/directional/north,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/item/radio/intercom/directional/east,
+/turf/open/floor/iron/dark,
+/area/station/science/ordnance/testlab)
"eyH" = (
/obj/effect/turf_decal/siding/purple{
dir = 4
@@ -19110,18 +19113,6 @@
},
/turf/open/floor/iron,
/area/station/security/checkpoint/escape)
-"eKV" = (
-/obj/machinery/camera/directional/north{
- c_tag = "Primary Restroom";
- name = "restroom camera"
- },
-/obj/structure/cable,
-/obj/machinery/power/apc/auto_name/directional/north,
-/obj/effect/turf_decal/tile/neutral/half/contrasted{
- dir = 1
- },
-/turf/open/floor/iron,
-/area/station/commons/toilet/locker)
"eKX" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -19540,6 +19531,14 @@
/obj/effect/mapping_helpers/airlock/access/all/engineering/general,
/turf/open/floor/engine,
/area/station/engineering/supermatter)
+"ePX" = (
+/obj/structure/table/reinforced,
+/obj/item/stock_parts/power_store/cell/high,
+/obj/item/stock_parts/power_store/cell/high,
+/obj/machinery/cell_charger,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/turf/open/floor/iron/dark,
+/area/station/engineering/storage/tech)
"ePZ" = (
/obj/structure/window/reinforced/spawner/directional/south,
/obj/structure/window/reinforced/spawner/directional/north,
@@ -19704,6 +19703,16 @@
},
/turf/open/floor/iron/cafeteria,
/area/station/service/cafeteria)
+"eSo" = (
+/obj/effect/turf_decal/siding/purple{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral/half/contrasted{
+ dir = 4
+ },
+/obj/structure/cable,
+/turf/open/floor/iron/dark,
+/area/station/science/ordnance)
"eSq" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -20755,17 +20764,6 @@
},
/turf/open/floor/iron/white,
/area/station/science/research)
-"fff" = (
-/obj/machinery/power/apc/auto_name/directional/north{
- areastring = "/area/station/science/ordnance/burnchamber"
- },
-/obj/structure/cable,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/machinery/atmospherics/pipe/layer_manifold/supply/visible{
- dir = 4
- },
-/turf/open/floor/iron/dark,
-/area/station/science/ordnance)
"ffi" = (
/obj/structure/cable,
/obj/machinery/power/solar_control{
@@ -21348,15 +21346,6 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/service/abandoned_gambling_den)
-"fmw" = (
-/obj/machinery/cell_charger,
-/obj/structure/table/reinforced,
-/obj/item/stock_parts/power_store/cell/high,
-/obj/effect/turf_decal/stripes/corner{
- dir = 1
- },
-/turf/open/floor/plating,
-/area/station/ai_monitored/turret_protected/aisat_interior)
"fmB" = (
/obj/structure/window/reinforced/spawner/directional/west,
/obj/structure/window/reinforced/spawner/directional/south,
@@ -21470,6 +21459,21 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/command/bridge)
+"fnC" = (
+/obj/structure/cable,
+/obj/machinery/firealarm/directional/east,
+/obj/effect/decal/cleanable/dirt,
+/obj/item/flatpack{
+ board = /obj/item/circuitboard/machine/flatpacker;
+ pixel_x = -6;
+ pixel_y = 5
+ },
+/obj/item/multitool{
+ pixel_x = 8
+ },
+/obj/structure/table,
+/turf/open/floor/iron,
+/area/station/engineering/storage_shared)
"fnD" = (
/obj/structure/table,
/obj/machinery/requests_console/directional/north{
@@ -22364,13 +22368,6 @@
},
/turf/open/floor/iron,
/area/station/engineering/lobby)
-"fzK" = (
-/obj/structure/table/reinforced,
-/obj/machinery/cell_charger,
-/obj/item/stock_parts/power_store/cell/high,
-/obj/machinery/airalarm/directional/east,
-/turf/open/floor/plating,
-/area/station/maintenance/department/electrical)
"fzV" = (
/obj/structure/disposalpipe/segment{
dir = 10
@@ -22657,6 +22654,44 @@
/obj/effect/turf_decal/bot,
/turf/open/floor/iron,
/area/station/engineering/main)
+"fDT" = (
+/obj/item/stack/cable_coil,
+/obj/item/bodypart/arm/right/robot{
+ pixel_x = 3
+ },
+/obj/item/bodypart/arm/left/robot{
+ pixel_x = -3
+ },
+/obj/structure/table,
+/obj/item/radio/intercom/directional/west,
+/obj/item/assembly/prox_sensor{
+ pixel_x = 5
+ },
+/obj/item/assembly/prox_sensor{
+ pixel_x = 5
+ },
+/obj/item/assembly/prox_sensor{
+ pixel_x = 5
+ },
+/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/item/stock_parts/power_store/cell/high{
+ pixel_x = 3;
+ pixel_y = 16
+ },
+/obj/item/stock_parts/power_store/cell/high{
+ pixel_x = -3;
+ pixel_y = 16
+ },
+/obj/item/stock_parts/power_store/cell/high{
+ pixel_y = 15
+ },
+/turf/open/floor/iron,
+/area/station/science/robotics/lab)
"fEd" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/sign/warning/vacuum/directional/west,
@@ -24689,6 +24724,17 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/service/library/private)
+"gdK" = (
+/obj/structure/table/wood,
+/obj/item/cigarette/cigar/cohiba{
+ pixel_x = 3
+ },
+/obj/item/cigarette/cigar/havana{
+ pixel_x = -3
+ },
+/obj/item/cigarette/cigar,
+/turf/open/floor/wood,
+/area/station/command/meeting_room/council)
"gdM" = (
/obj/machinery/conveyor{
dir = 4;
@@ -24952,6 +24998,19 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/aisat/exterior)
+"ggp" = (
+/obj/machinery/light_switch/directional/east,
+/obj/structure/table,
+/obj/item/crowbar,
+/obj/item/wrench,
+/obj/item/clothing/mask/gas,
+/obj/effect/turf_decal/tile/neutral/half/contrasted{
+ dir = 8
+ },
+/obj/machinery/light/cold/directional/north,
+/obj/machinery/airalarm/directional/north,
+/turf/open/floor/iron,
+/area/station/science/xenobiology)
"ggz" = (
/obj/machinery/firealarm/directional/south,
/obj/effect/turf_decal/tile/blue/anticorner/contrasted{
@@ -26789,9 +26848,6 @@
/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/iron,
/area/station/hallway/secondary/exit)
-"gCt" = (
-/turf/open/floor/circuit/green,
-/area/station/science/xenobiology)
"gCB" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -27222,6 +27278,18 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron,
/area/station/cargo/drone_bay)
+"gHJ" = (
+/obj/structure/cable,
+/obj/structure/table/wood,
+/obj/item/cigarette/cigar/cohiba{
+ pixel_x = 3
+ },
+/obj/item/cigarette/cigar/havana{
+ pixel_x = -3
+ },
+/obj/item/cigarette/cigar,
+/turf/open/floor/iron/grimy,
+/area/station/command/heads_quarters/captain)
"gHS" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/stripes/line{
@@ -27887,14 +27955,6 @@
},
/turf/open/floor/iron/cafeteria,
/area/station/service/cafeteria)
-"gQF" = (
-/obj/machinery/atmospherics/pipe/smart/simple/purple/visible/layer2{
- dir = 6
- },
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/structure/cable,
-/turf/open/floor/iron/dark,
-/area/station/science/ordnance)
"gQH" = (
/obj/structure/sign/warning/secure_area/directional/west,
/obj/effect/turf_decal/tile/neutral/fourcorners,
@@ -27980,16 +28040,17 @@
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/iron,
/area/station/engineering/main)
-"gRN" = (
-/obj/structure/cable,
-/obj/machinery/computer/security/telescreen/prison/directional/east,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/turf_decal/tile/red{
+"gRQ" = (
+/obj/machinery/computer/mecha{
dir = 8
},
+/obj/machinery/computer/security/telescreen/rd/directional/east,
+/obj/effect/turf_decal/tile/neutral/half/contrasted{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/purple,
/turf/open/floor/iron,
-/area/station/security/execution/transfer)
+/area/station/command/heads_quarters/rd)
"gRU" = (
/obj/structure/table/reinforced,
/obj/machinery/button/ignition{
@@ -28036,6 +28097,17 @@
},
/turf/open/floor/iron/white,
/area/station/science/xenobiology)
+"gSp" = (
+/obj/machinery/computer/security/telescreen/prison/directional/east,
+/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/red{
+ dir = 8
+ },
+/obj/machinery/light/directional/east,
+/turf/open/floor/iron,
+/area/station/security/execution/transfer)
"gSs" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/effect/turf_decal/tile/neutral/fourcorners,
@@ -28083,6 +28155,18 @@
/obj/machinery/air_sensor/ordnance_burn_chamber,
/turf/open/floor/engine/vacuum,
/area/station/science/ordnance/burnchamber)
+"gTg" = (
+/obj/structure/table/glass,
+/obj/item/folder/blue{
+ pixel_x = 4;
+ pixel_y = 4
+ },
+/obj/item/folder/white,
+/obj/item/pen,
+/obj/machinery/computer/security/telescreen/cmo/directional/south,
+/obj/effect/turf_decal/tile/blue/opposingcorners,
+/turf/open/floor/iron/white,
+/area/station/command/heads_quarters/cmo)
"gTq" = (
/obj/effect/decal/cleanable/robot_debris/old,
/obj/effect/spawner/random/engineering/tank,
@@ -28179,25 +28263,6 @@
/obj/effect/mapping_helpers/airlock/access/all/supply/general,
/turf/open/floor/iron,
/area/station/cargo/storage)
-"gUt" = (
-/obj/structure/table/reinforced,
-/obj/item/stack/cable_coil{
- pixel_x = 3;
- pixel_y = 3
- },
-/obj/item/stack/cable_coil,
-/obj/item/electronics/airlock,
-/obj/item/electronics/airlock,
-/obj/effect/decal/cleanable/dirt,
-/obj/item/stock_parts/power_store/cell/emproof{
- pixel_x = -3;
- pixel_y = 5
- },
-/obj/effect/turf_decal/bot,
-/obj/item/clothing/gloves/color/yellow,
-/obj/machinery/newscaster/directional/east,
-/turf/open/floor/iron,
-/area/station/engineering/storage)
"gUy" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/structure/table,
@@ -28262,6 +28327,12 @@
/obj/machinery/airalarm/directional/west,
/turf/open/floor/iron,
/area/station/tcommsat/server)
+"gUO" = (
+/obj/docking_port/stationary/syndicate/northeast{
+ dir = 8
+ },
+/turf/open/space,
+/area/space)
"gUU" = (
/obj/machinery/door/firedoor,
/obj/effect/turf_decal/tile/neutral/fourcorners,
@@ -28403,6 +28474,14 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/command/gateway)
+"gWT" = (
+/obj/machinery/cell_charger,
+/obj/item/stock_parts/power_store/cell/high,
+/obj/structure/table,
+/obj/machinery/newscaster/directional/west,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/turf/open/floor/iron/dark,
+/area/station/science/circuits)
"gWV" = (
/obj/machinery/door/firedoor,
/obj/effect/mapping_helpers/airlock/access/all/medical/morgue,
@@ -28628,10 +28707,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron,
/area/station/engineering/supermatter/room)
-"haF" = (
-/obj/structure/sign/warning/secure_area/directional/west,
-/turf/open/space/basic,
-/area/space)
"haG" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/trimline/green/filled/line{
@@ -28857,16 +28932,6 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
/turf/open/floor/iron/white/smooth_large,
/area/station/command/heads_quarters/cmo)
-"hdI" = (
-/obj/machinery/atmospherics/components/unary/portables_connector/visible{
- dir = 8
- },
-/obj/effect/turf_decal/box,
-/obj/structure/extinguisher_cabinet/directional/north,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/item/radio/intercom/directional/east,
-/turf/open/floor/iron/dark,
-/area/station/science/ordnance/testlab)
"hdK" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -29042,6 +29107,11 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/aisat/exterior)
+"hfo" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/engine/xenobio,
+/area/station/science/xenobiology)
"hfB" = (
/obj/effect/spawner/random/vending/colavend,
/obj/effect/turf_decal/delivery,
@@ -30228,6 +30298,15 @@
},
/turf/open/floor/iron,
/area/station/commons/storage/tools)
+"hwJ" = (
+/obj/structure/table/reinforced,
+/obj/item/stack/cable_coil,
+/obj/item/electronics/airalarm,
+/obj/item/electronics/firealarm,
+/obj/item/stock_parts/power_store/cell/high,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/iron,
+/area/station/maintenance/port)
"hwK" = (
/obj/structure/cable,
/obj/effect/turf_decal/tile/neutral/half/contrasted{
@@ -30484,6 +30563,14 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/fore)
+"hAY" = (
+/obj/structure/cable,
+/obj/machinery/power/apc/auto_name/directional/north,
+/obj/effect/turf_decal/tile/neutral/half/contrasted{
+ dir = 1
+ },
+/turf/open/floor/iron,
+/area/station/commons/toilet/locker)
"hBb" = (
/obj/effect/turf_decal/stripes/line,
/obj/machinery/light/small/directional/south,
@@ -31769,6 +31856,13 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/grimy,
/area/station/service/abandoned_gambling_den)
+"hSF" = (
+/obj/structure/table/reinforced,
+/obj/machinery/cell_charger,
+/obj/item/stock_parts/power_store/cell/high,
+/obj/machinery/airalarm/directional/east,
+/turf/open/floor/plating,
+/area/station/maintenance/department/electrical)
"hST" = (
/obj/structure/destructible/cult/item_dispenser/archives/library,
/obj/effect/decal/cleanable/cobweb,
@@ -31950,6 +32044,20 @@
/obj/structure/sign/warning/no_smoking,
/turf/closed/wall,
/area/station/engineering/atmos/storage)
+"hUZ" = (
+/obj/structure/table,
+/obj/structure/cable,
+/obj/machinery/power/apc/auto_name/directional/east,
+/obj/machinery/cell_charger,
+/obj/item/screwdriver{
+ pixel_y = -1
+ },
+/obj/effect/turf_decal/siding/purple{
+ dir = 8
+ },
+/obj/item/stock_parts/power_store/cell/high,
+/turf/open/floor/iron,
+/area/station/science/robotics/lab)
"hVi" = (
/obj/machinery/power/apc/auto_name/directional/west,
/obj/structure/cable,
@@ -32929,6 +33037,12 @@
"igg" = (
/turf/closed/wall,
/area/station/science/explab)
+"igi" = (
+/obj/structure/sign/warning/secure_area/directional/south,
+/obj/structure/table/reinforced,
+/obj/machinery/computer/security/telescreen/minisat/directional/east,
+/turf/open/floor/iron/dark,
+/area/station/engineering/transit_tube)
"igl" = (
/obj/structure/disposalpipe/segment{
dir = 6
@@ -33020,13 +33134,6 @@
},
/turf/open/floor/plating,
/area/station/medical/virology)
-"iij" = (
-/obj/structure/table,
-/obj/machinery/cell_charger,
-/obj/item/stock_parts/power_store/cell/high,
-/obj/item/radio/intercom/directional/north,
-/turf/open/floor/iron,
-/area/station/command/teleporter)
"iiy" = (
/obj/structure/easel,
/turf/open/floor/iron,
@@ -33615,6 +33722,11 @@
},
/turf/open/floor/iron,
/area/station/cargo/sorting)
+"ipO" = (
+/obj/structure/lattice,
+/obj/structure/sign/warning/electric_shock/directional/east,
+/turf/open/space/basic,
+/area/space/nearstation)
"ipQ" = (
/turf/closed/wall,
/area/station/command/bridge)
@@ -33627,13 +33739,6 @@
},
/turf/open/floor/iron,
/area/station/engineering/atmos)
-"iqg" = (
-/obj/effect/turf_decal/bot,
-/obj/effect/turf_decal/tile/neutral/full,
-/obj/machinery/holopad,
-/obj/structure/cable,
-/turf/open/floor/iron/dark/smooth_large,
-/area/station/science/ordnance)
"iqj" = (
/obj/effect/turf_decal/trimline/purple/filled/warning,
/turf/open/floor/iron/white,
@@ -34145,6 +34250,13 @@
/obj/effect/spawner/random/structure/grille,
/turf/open/floor/plating,
/area/station/maintenance/port/fore)
+"iwH" = (
+/obj/effect/turf_decal/bot,
+/obj/effect/turf_decal/tile/neutral/full,
+/obj/machinery/holopad,
+/obj/structure/cable,
+/turf/open/floor/iron/dark/smooth_large,
+/area/station/science/ordnance)
"iwW" = (
/obj/structure/sign/painting/library{
pixel_y = -32
@@ -34609,6 +34721,23 @@
/obj/structure/cable,
/turf/open/floor/plating,
/area/station/security/brig)
+"iDd" = (
+/obj/structure/table/reinforced,
+/obj/item/stock_parts/matter_bin,
+/obj/item/stock_parts/matter_bin{
+ pixel_x = 3;
+ pixel_y = 3
+ },
+/obj/item/stock_parts/micro_laser,
+/obj/effect/turf_decal/siding/purple{
+ dir = 8
+ },
+/obj/item/flatpack{
+ board = /obj/item/circuitboard/machine/flatpacker
+ },
+/obj/item/multitool,
+/turf/open/floor/iron,
+/area/station/science/lab)
"iDf" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/box/red/corners{
@@ -34777,11 +34906,6 @@
/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/iron,
/area/station/hallway/secondary/exit)
-"iFt" = (
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/structure/cable,
-/turf/open/floor/iron/dark,
-/area/station/science/ordnance)
"iFD" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/table/wood,
@@ -35083,11 +35207,6 @@
/obj/machinery/duct,
/turf/open/floor/iron,
/area/station/hallway/secondary/exit/departure_lounge)
-"iJw" = (
-/obj/effect/spawner/random/medical/two_percent_xeno_egg_spawner,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/turf/open/floor/iron/dark,
-/area/station/science/xenobiology)
"iJE" = (
/obj/structure/table/wood/fancy,
/obj/machinery/door/window/left/directional/east,
@@ -35559,13 +35678,6 @@
/obj/effect/turf_decal/tile/yellow/opposingcorners,
/turf/open/floor/iron,
/area/station/engineering/supermatter/room)
-"iRd" = (
-/obj/structure/table/reinforced,
-/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/station/science/xenobiology)
"iRf" = (
/obj/machinery/power/turbine/turbine_outlet,
/turf/open/floor/engine,
@@ -35696,6 +35808,12 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/security/interrogation)
+"iSq" = (
+/obj/structure/cable,
+/obj/machinery/nuclearbomb/selfdestruct,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/turf/open/floor/iron/dark,
+/area/station/ai_monitored/command/nuke_storage)
"iSI" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -35985,13 +36103,6 @@
/obj/effect/turf_decal/tile/red/fourcorners,
/turf/open/floor/iron,
/area/station/security/checkpoint/supply)
-"iWz" = (
-/obj/structure/table/reinforced,
-/obj/machinery/cell_charger,
-/obj/item/stock_parts/power_store/cell/high,
-/obj/structure/sign/poster/contraband/self_ai_liberation/directional/north,
-/turf/open/floor/iron,
-/area/station/science/research/abandoned)
"iWA" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -36161,14 +36272,6 @@
"iYi" = (
/turf/closed/wall,
/area/station/commons/toilet/locker)
-"iYp" = (
-/obj/structure/cable,
-/obj/machinery/nuclearbomb/selfdestruct{
- layer = 2
- },
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/turf/open/floor/iron/dark,
-/area/station/ai_monitored/command/nuke_storage)
"iYq" = (
/obj/machinery/computer/prisoner/management{
dir = 4
@@ -36270,6 +36373,25 @@
},
/turf/open/floor/iron,
/area/station/security/execution/transfer)
+"iZH" = (
+/obj/structure/table/reinforced,
+/obj/item/stack/cable_coil{
+ pixel_x = 3;
+ pixel_y = 3
+ },
+/obj/item/stack/cable_coil,
+/obj/item/electronics/airlock,
+/obj/item/electronics/airlock,
+/obj/effect/decal/cleanable/dirt,
+/obj/item/stock_parts/power_store/cell/emproof{
+ pixel_x = -3;
+ pixel_y = 5
+ },
+/obj/effect/turf_decal/bot,
+/obj/item/clothing/gloves/color/yellow,
+/obj/machinery/newscaster/directional/east,
+/turf/open/floor/iron,
+/area/station/engineering/storage)
"iZN" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -36310,6 +36432,15 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/cargo/miningoffice)
+"jae" = (
+/obj/machinery/atmospherics/pipe/smart/simple/cyan/hidden,
+/obj/machinery/computer/security/telescreen/engine/directional/west,
+/obj/effect/turf_decal/bot,
+/obj/machinery/computer/atmos_control/nocontrol/master{
+ dir = 4
+ },
+/turf/open/floor/iron/dark/textured_large,
+/area/station/engineering/atmos/storage/gas)
"jag" = (
/obj/effect/decal/cleanable/blood/old,
/obj/effect/decal/cleanable/dirt,
@@ -37998,13 +38129,6 @@
"jtC" = (
/turf/open/floor/plating,
/area/station/service/abandoned_gambling_den)
-"jtD" = (
-/obj/structure/table/reinforced,
-/obj/machinery/cell_charger,
-/obj/item/stock_parts/power_store/cell/high,
-/obj/effect/turf_decal/bot,
-/turf/open/floor/iron/dark,
-/area/station/engineering/atmos/storage)
"jtV" = (
/obj/structure/sign/warning/electric_shock,
/turf/closed/wall/r_wall,
@@ -38198,6 +38322,18 @@
},
/turf/open/floor/iron,
/area/station/engineering/main)
+"jwW" = (
+/obj/structure/table/reinforced,
+/obj/machinery/cell_charger,
+/obj/item/stock_parts/power_store/cell/high,
+/obj/machinery/firealarm/directional/south,
+/obj/machinery/light_switch/directional/east,
+/obj/effect/turf_decal/bot,
+/obj/effect/turf_decal/tile/neutral/half/contrasted{
+ dir = 1
+ },
+/turf/open/floor/iron/dark,
+/area/station/engineering/break_room)
"jxd" = (
/obj/docking_port/stationary/mining_home/common,
/turf/open/space/basic,
@@ -38216,14 +38352,6 @@
},
/turf/open/floor/iron/dark,
/area/station/security/execution/education)
-"jxj" = (
-/obj/structure/table,
-/obj/item/stock_parts/power_store/cell/high,
-/obj/item/stock_parts/power_store/cell/high,
-/obj/machinery/cell_charger,
-/obj/structure/extinguisher_cabinet/directional/west,
-/turf/open/floor/iron,
-/area/station/science/robotics/mechbay)
"jxm" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -39566,6 +39694,10 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/security/checkpoint/customs/fore)
+"jNV" = (
+/obj/structure/sign/warning/electric_shock/directional/east,
+/turf/open/space/basic,
+/area/space/nearstation)
"jNY" = (
/obj/structure/table/optable,
/obj/machinery/newscaster/directional/north,
@@ -40171,10 +40303,6 @@
},
/turf/open/floor/iron,
/area/station/hallway/secondary/entry)
-"jUT" = (
-/obj/structure/lattice,
-/turf/open/space/basic,
-/area/space)
"jUU" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -41170,6 +41298,15 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/plating,
/area/station/maintenance/department/science)
+"khr" = (
+/obj/machinery/cell_charger,
+/obj/structure/table/reinforced,
+/obj/item/stock_parts/power_store/cell/high,
+/obj/structure/window/reinforced/spawner/directional/south,
+/obj/structure/cable,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/turf/open/floor/iron/dark,
+/area/station/ai_monitored/command/storage/eva)
"khB" = (
/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
@@ -41296,6 +41433,16 @@
/obj/effect/turf_decal/delivery,
/turf/open/floor/iron,
/area/station/engineering/atmos/storage/gas)
+"kiW" = (
+/obj/structure/cable,
+/obj/machinery/computer/security/telescreen/prison/directional/east,
+/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 = 8
+ },
+/turf/open/floor/iron,
+/area/station/security/execution/transfer)
"kiZ" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/mapping_helpers/broken_floor,
@@ -41398,6 +41545,13 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/turret_protected/aisat_interior)
+"kkk" = (
+/obj/machinery/computer/security/telescreen/vault/directional/north,
+/obj/effect/turf_decal/tile/brown/half/contrasted{
+ dir = 1
+ },
+/turf/open/floor/iron,
+/area/station/command/heads_quarters/qm)
"kkm" = (
/obj/effect/turf_decal/trimline/blue/filled/corner{
dir = 8
@@ -44542,13 +44696,6 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron,
/area/station/maintenance/disposal/incinerator)
-"lcP" = (
-/obj/machinery/atmospherics/pipe/smart/simple/purple/visible/layer2,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/machinery/power/apc/auto_name/directional/east,
-/obj/structure/cable,
-/turf/open/floor/iron/dark,
-/area/station/science/ordnance)
"lcT" = (
/obj/structure/cable,
/obj/structure/disposalpipe/segment,
@@ -44899,6 +45046,16 @@
},
/turf/open/floor/iron/white,
/area/station/science/research)
+"lhU" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/computer/security/telescreen/interrogation/directional/west,
+/obj/structure/cable,
+/obj/effect/turf_decal/tile/red{
+ dir = 1
+ },
+/turf/open/floor/iron,
+/area/station/security/brig)
"lhV" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -45129,6 +45286,16 @@
},
/turf/open/floor/iron,
/area/station/security/range)
+"ljZ" = (
+/obj/item/reagent_containers/condiment/enzyme,
+/obj/item/kitchen/rollingpin,
+/obj/structure/table,
+/obj/item/reagent_containers/cup/bowl,
+/obj/item/reagent_containers/cup/beaker{
+ pixel_x = 5
+ },
+/turf/open/floor/iron/cafeteria,
+/area/station/service/kitchen)
"lke" = (
/obj/structure/cable,
/obj/effect/turf_decal/trimline/blue/filled/corner{
@@ -45391,22 +45558,6 @@
/obj/effect/landmark/generic_maintenance_landmark,
/turf/open/floor/plating,
/area/station/maintenance/department/chapel)
-"lnk" = (
-/obj/structure/table/reinforced,
-/obj/item/stack/package_wrap,
-/obj/item/stack/cable_coil{
- pixel_x = 3;
- pixel_y = 3
- },
-/obj/item/stack/cable_coil,
-/obj/item/stock_parts/power_store/cell/high,
-/obj/effect/decal/cleanable/dirt,
-/obj/item/radio/intercom/directional/north,
-/obj/effect/turf_decal/tile/yellow/anticorner/contrasted{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/station/construction/mining/aux_base)
"lnm" = (
/obj/structure/closet/secure_closet/captains,
/obj/effect/turf_decal/stripes/line{
@@ -46259,6 +46410,14 @@
/obj/machinery/incident_display/delam/directional/north,
/turf/open/floor/iron,
/area/station/engineering/main)
+"lyS" = (
+/obj/structure/table/reinforced,
+/obj/item/stack/sheet/iron/fifty,
+/obj/item/stack/sheet/glass/fifty,
+/obj/item/circuitboard/machine/crystallizer,
+/obj/item/stack/cable_coil/thirty,
+/turf/open/floor/iron/dark,
+/area/station/engineering/atmos/hfr_room)
"lyZ" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -47614,16 +47773,6 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/central/fore)
-"lOw" = (
-/obj/machinery/atmospherics/pipe/smart/manifold/purple/visible/layer2{
- dir = 4
- },
-/obj/machinery/meter/layer2,
-/obj/structure/sign/warning/no_smoking/directional/east,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/structure/cable,
-/turf/open/floor/iron/dark,
-/area/station/science/ordnance)
"lOA" = (
/obj/machinery/suit_storage_unit/atmos,
/obj/effect/turf_decal/box/red/corners{
@@ -48473,6 +48622,13 @@
},
/turf/open/floor/iron,
/area/station/cargo/storage)
+"mcm" = (
+/obj/structure/table/reinforced,
+/obj/machinery/cell_charger,
+/obj/item/stock_parts/power_store/cell/high,
+/obj/structure/sign/poster/contraband/self_ai_liberation/directional/north,
+/turf/open/floor/iron,
+/area/station/science/research/abandoned)
"mcp" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{
@@ -48613,19 +48769,6 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/port)
-"mdG" = (
-/obj/structure/rack,
-/obj/item/tank/internals/emergency_oxygen/engi,
-/obj/item/tank/internals/emergency_oxygen/engi,
-/obj/item/wrench,
-/obj/item/stock_parts/power_store/cell/emproof{
- pixel_x = 4;
- pixel_y = 2
- },
-/obj/item/lightreplacer,
-/obj/effect/turf_decal/bot,
-/turf/open/floor/iron/dark,
-/area/station/engineering/atmos/storage)
"mdM" = (
/obj/machinery/computer/records/medical{
dir = 1
@@ -49105,6 +49248,16 @@
/obj/machinery/light/cold/directional/west,
/turf/open/floor/iron/dark/textured_half,
/area/station/science/robotics/lab)
+"mkA" = (
+/obj/structure/disposalpipe/trunk{
+ dir = 4
+ },
+/obj/machinery/disposal/delivery_chute{
+ dir = 8
+ },
+/obj/effect/turf_decal/box/red,
+/turf/open/floor/engine/xenobio,
+/area/station/science/xenobiology)
"mkB" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -49177,6 +49330,17 @@
"mlE" = (
/turf/closed/wall/r_wall,
/area/station/ai_monitored/command/storage/eva)
+"mlR" = (
+/obj/structure/table/reinforced,
+/obj/item/folder/white,
+/obj/item/stock_parts/power_store/cell/high,
+/obj/item/stack/sheet/glass,
+/obj/item/stack/sheet/glass,
+/obj/item/stack/sheet/glass,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/machinery/airalarm/directional/east,
+/turf/open/floor/iron/dark,
+/area/station/engineering/storage/tech)
"mlW" = (
/obj/structure/sign/nanotrasen{
pixel_y = 32
@@ -49600,13 +49764,6 @@
},
/turf/open/floor/wood/tile,
/area/station/service/library/artgallery)
-"msO" = (
-/obj/structure/table/reinforced,
-/obj/item/stock_parts/power_store/cell/high,
-/obj/item/stock_parts/power_store/cell/high,
-/obj/machinery/cell_charger,
-/turf/open/floor/iron,
-/area/station/commons/storage/primary)
"msR" = (
/obj/effect/turf_decal/tile/red/opposingcorners{
dir = 1
@@ -50072,6 +50229,10 @@
/obj/structure/window/reinforced/spawner/directional/north,
/turf/open/space/basic,
/area/space/nearstation)
+"mxw" = (
+/obj/structure/sign/warning/electric_shock/directional/west,
+/turf/open/space/basic,
+/area/space/nearstation)
"mxB" = (
/obj/effect/turf_decal/trimline/blue/filled/line{
dir = 1
@@ -50405,13 +50566,6 @@
/obj/structure/sign/poster/official/safety_eye_protection/directional/south,
/turf/open/floor/plating,
/area/station/maintenance/space_hut/observatory)
-"mCe" = (
-/obj/structure/table/wood,
-/obj/item/paper_bin,
-/obj/item/pen,
-/obj/machinery/computer/security/telescreen/interrogation/directional/west,
-/turf/open/floor/iron/checker,
-/area/station/security/interrogation)
"mCf" = (
/obj/structure/disposalpipe/trunk{
dir = 1
@@ -50699,6 +50853,11 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/maintenance/department/eva/abandoned)
+"mFk" = (
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/structure/cable,
+/turf/open/floor/iron/dark,
+/area/station/science/ordnance)
"mFo" = (
/obj/effect/spawner/random/engineering/tracking_beacon,
/obj/effect/turf_decal/tile/neutral/fourcorners,
@@ -51191,13 +51350,6 @@
},
/turf/open/floor/iron,
/area/station/cargo/office)
-"mKn" = (
-/obj/machinery/portable_atmospherics/canister,
-/obj/machinery/atmospherics/components/unary/portables_connector/visible,
-/obj/effect/turf_decal/box,
-/obj/machinery/computer/security/telescreen/test_chamber/directional/north,
-/turf/open/floor/iron,
-/area/station/science/xenobiology)
"mKp" = (
/obj/structure/chair/comfy/brown{
dir = 4
@@ -52060,18 +52212,6 @@
/obj/effect/turf_decal/siding/wood,
/turf/open/floor/wood/large,
/area/station/service/library)
-"mXr" = (
-/obj/structure/cable,
-/obj/structure/table/wood,
-/obj/item/cigarette/cigar/cohiba{
- pixel_x = 3
- },
-/obj/item/cigarette/cigar/havana{
- pixel_x = -3
- },
-/obj/item/cigarette/cigar,
-/turf/open/floor/iron/grimy,
-/area/station/command/heads_quarters/captain)
"mXy" = (
/turf/open/floor/iron/grimy,
/area/station/command/heads_quarters/hop)
@@ -52137,6 +52277,20 @@
/obj/effect/turf_decal/tile/neutral/full,
/turf/open/floor/iron/large,
/area/station/science/research)
+"mYD" = (
+/obj/structure/disposalpipe/trunk{
+ dir = 1
+ },
+/obj/machinery/disposal/delivery_chute{
+ dir = 4
+ },
+/obj/structure/window/reinforced/spawner/directional/south,
+/obj/structure/window/reinforced/spawner/directional/west,
+/obj/structure/window/reinforced/spawner/directional/north,
+/obj/effect/turf_decal/delivery,
+/obj/machinery/door/window/right/directional/east,
+/turf/open/floor/iron,
+/area/station/maintenance/disposal)
"mYL" = (
/obj/effect/turf_decal/delivery,
/obj/machinery/atmospherics/components/binary/tank_compressor{
@@ -52275,6 +52429,13 @@
/obj/effect/spawner/random/trash/grille_or_waste,
/turf/open/floor/plating,
/area/station/maintenance/fore)
+"nba" = (
+/obj/structure/table/reinforced,
+/obj/machinery/cell_charger,
+/obj/item/stock_parts/power_store/cell/high,
+/obj/effect/turf_decal/bot,
+/turf/open/floor/iron/dark,
+/area/station/engineering/atmos/storage)
"nbc" = (
/turf/open/floor/plating,
/area/station/service/theater/abandoned)
@@ -52503,6 +52664,11 @@
},
/turf/open/floor/iron/dark,
/area/station/service/chapel)
+"nep" = (
+/obj/structure/cable,
+/obj/machinery/computer/security/telescreen/prison/directional/east,
+/turf/open/floor/iron,
+/area/station/security/execution/transfer)
"neu" = (
/obj/structure/bed,
/obj/item/bedsheet/cmo,
@@ -54350,6 +54516,10 @@
/obj/effect/turf_decal/tile/red/opposingcorners,
/turf/open/floor/iron,
/area/station/service/theater)
+"nDZ" = (
+/obj/structure/sign/warning/secure_area/directional/south,
+/turf/open/space/basic,
+/area/space/nearstation)
"nEa" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/structure/cable,
@@ -54405,10 +54575,6 @@
/obj/effect/mapping_helpers/burnt_floor,
/turf/open/floor/plating,
/area/station/maintenance/department/electrical)
-"nET" = (
-/obj/structure/sign/warning/electric_shock/directional/east,
-/turf/open/space/basic,
-/area/space)
"nEZ" = (
/turf/closed/wall/r_wall,
/area/station/security/mechbay)
@@ -54552,17 +54718,6 @@
/obj/effect/turf_decal/tile/neutral/opposingcorners,
/turf/open/floor/iron,
/area/station/commons/vacant_room/commissary)
-"nHc" = (
-/obj/structure/table/wood,
-/obj/item/cigarette/cigar/cohiba{
- pixel_x = 3
- },
-/obj/item/cigarette/cigar/havana{
- pixel_x = -3
- },
-/obj/item/cigarette/cigar,
-/turf/open/floor/wood,
-/area/station/command/meeting_room/council)
"nHd" = (
/obj/structure/cable,
/obj/machinery/door/airlock/maintenance_hatch{
@@ -54791,14 +54946,6 @@
},
/turf/open/floor/iron/white,
/area/station/medical/pharmacy)
-"nJu" = (
-/obj/structure/table/wood,
-/obj/item/pen,
-/obj/effect/turf_decal/siding/dark_red{
- dir = 4
- },
-/turf/open/floor/iron/checker,
-/area/station/security/interrogation)
"nJx" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 8
@@ -55170,18 +55317,6 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron,
/area/station/hallway/primary/central/fore)
-"nOJ" = (
-/obj/structure/table/reinforced,
-/obj/machinery/cell_charger,
-/obj/item/stock_parts/power_store/cell/high,
-/obj/machinery/firealarm/directional/south,
-/obj/machinery/light_switch/directional/east,
-/obj/effect/turf_decal/bot,
-/obj/effect/turf_decal/tile/neutral/half/contrasted{
- dir = 1
- },
-/turf/open/floor/iron/dark,
-/area/station/engineering/break_room)
"nOP" = (
/obj/structure/cable,
/obj/effect/turf_decal/tile/neutral{
@@ -56775,6 +56910,10 @@
},
/turf/open/floor/iron/white,
/area/station/medical/treatment_center)
+"okp" = (
+/obj/structure/cable,
+/turf/open/floor/iron/dark,
+/area/station/science/ordnance)
"okr" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible,
/obj/machinery/meter,
@@ -57875,11 +58014,6 @@
/obj/structure/cable,
/turf/open/floor/wood,
/area/station/command/heads_quarters/hop)
-"ozA" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/circuit/green,
-/area/station/science/xenobiology)
"ozE" = (
/obj/effect/turf_decal/stripes/line,
/obj/effect/decal/cleanable/dirt,
@@ -58265,12 +58399,6 @@
},
/turf/open/floor/engine,
/area/station/science/genetics)
-"oFv" = (
-/obj/docking_port/stationary/syndicate/northeast{
- dir = 8
- },
-/turf/open/space,
-/area/space/nearstation)
"oFC" = (
/obj/machinery/airalarm/directional/west,
/obj/structure/tank_dispenser,
@@ -58307,22 +58435,6 @@
/obj/effect/turf_decal/siding/wood,
/turf/open/floor/wood/large,
/area/station/command/corporate_showroom)
-"oGq" = (
-/obj/structure/disposalpipe/trunk{
- dir = 1
- },
-/obj/machinery/disposal/delivery_chute{
- dir = 4
- },
-/obj/structure/window/reinforced/spawner/directional/south,
-/obj/structure/window/reinforced/spawner/directional/west,
-/obj/structure/window/reinforced/spawner/directional/north,
-/obj/effect/turf_decal/delivery,
-/obj/machinery/door/window/right/directional/east{
- layer = 3
- },
-/turf/open/floor/iron,
-/area/station/maintenance/disposal)
"oGr" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/reagent_dispensers/fueltank,
@@ -58430,19 +58542,6 @@
},
/turf/closed/wall/r_wall,
/area/station/science/ordnance/burnchamber)
-"oHO" = (
-/obj/machinery/light_switch/directional/east,
-/obj/structure/table,
-/obj/item/crowbar,
-/obj/item/wrench,
-/obj/item/clothing/mask/gas,
-/obj/effect/turf_decal/tile/neutral/half/contrasted{
- dir = 8
- },
-/obj/machinery/light/cold/directional/north,
-/obj/machinery/airalarm/directional/north,
-/turf/open/floor/iron,
-/area/station/science/xenobiology)
"oHQ" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -59134,15 +59233,6 @@
},
/turf/open/floor/iron/white,
/area/station/science/lobby)
-"oRA" = (
-/obj/structure/table,
-/obj/machinery/cell_charger,
-/obj/item/stock_parts/power_store/cell/high,
-/obj/effect/turf_decal/tile/yellow{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/station/hallway/secondary/construction)
"oRD" = (
/obj/structure/cable,
/obj/item/circuitboard/computer/secure_data,
@@ -59538,14 +59628,6 @@
/obj/machinery/newscaster/directional/east,
/turf/open/floor/wood,
/area/station/hallway/secondary/service)
-"oXg" = (
-/obj/machinery/cell_charger,
-/obj/item/stock_parts/power_store/cell/high,
-/obj/structure/table,
-/obj/machinery/newscaster/directional/west,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/turf/open/floor/iron/dark,
-/area/station/science/circuits)
"oXi" = (
/obj/effect/turf_decal/bot_white/left,
/obj/effect/turf_decal/tile/neutral{
@@ -59787,6 +59869,17 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/engineering/gravity_generator)
+"pbw" = (
+/obj/machinery/power/apc/auto_name/directional/north{
+ areastring = "/area/station/science/ordnance/burnchamber"
+ },
+/obj/structure/cable,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/machinery/atmospherics/pipe/layer_manifold/supply/visible{
+ dir = 4
+ },
+/turf/open/floor/iron/dark,
+/area/station/science/ordnance)
"pbF" = (
/obj/structure/disposalpipe/segment,
/obj/structure/cable,
@@ -60063,6 +60156,10 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron,
/area/station/engineering/main)
+"pep" = (
+/obj/effect/decal/cleanable/xenoblood,
+/turf/open/floor/engine/xenobio,
+/area/station/science/xenobiology)
"pes" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/poddoor/shutters/window/preopen{
@@ -60839,14 +60936,6 @@
/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/iron,
/area/station/hallway/secondary/command)
-"pnm" = (
-/obj/structure/table/reinforced,
-/obj/item/stack/sheet/iron/fifty,
-/obj/item/stack/sheet/glass/fifty,
-/obj/item/circuitboard/machine/crystallizer,
-/obj/item/stack/cable_coil/thirty,
-/turf/open/floor/iron/dark,
-/area/station/engineering/atmos/hfr_room)
"pnV" = (
/obj/structure/cable,
/obj/structure/chair/office{
@@ -62047,16 +62136,6 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/security/armory)
-"pDx" = (
-/obj/effect/turf_decal/siding/purple{
- dir = 4
- },
-/obj/effect/turf_decal/tile/neutral/half/contrasted{
- dir = 4
- },
-/obj/structure/cable,
-/turf/open/floor/iron/dark,
-/area/station/science/ordnance)
"pDz" = (
/obj/machinery/quantum_server,
/obj/effect/turf_decal/bot/left,
@@ -62380,12 +62459,6 @@
},
/turf/open/floor/iron/dark/corner,
/area/station/maintenance/disposal/incinerator)
-"pGv" = (
-/obj/item/kirbyplants/random,
-/obj/machinery/light/small/directional/north,
-/obj/structure/extinguisher_cabinet/directional/north,
-/turf/open/floor/iron/dark,
-/area/station/security/interrogation)
"pGw" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/sign/poster/random/directional/east,
@@ -62403,14 +62476,6 @@
/obj/item/knife/kitchen,
/turf/open/floor/iron,
/area/station/service/kitchen/abandoned)
-"pGz" = (
-/obj/machinery/vending/coffee,
-/obj/effect/turf_decal/tile/blue/half/contrasted{
- dir = 1
- },
-/obj/machinery/digital_clock/directional/north,
-/turf/open/floor/iron/dark,
-/area/station/command/bridge)
"pGC" = (
/obj/item/kirbyplants/random,
/obj/machinery/light_switch/directional/north{
@@ -62603,10 +62668,6 @@
/obj/effect/turf_decal/tile/neutral/full,
/turf/open/floor/iron/large,
/area/station/science/lab)
-"pJz" = (
-/obj/effect/decal/remains/xeno,
-/turf/open/floor/circuit/green,
-/area/station/science/xenobiology)
"pJM" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
@@ -63357,6 +63418,14 @@
/obj/structure/lattice/catwalk,
/turf/open/space/basic,
/area/station/solars/port/aft)
+"pSm" = (
+/obj/machinery/vending/coffee,
+/obj/effect/turf_decal/tile/blue/half/contrasted{
+ dir = 1
+ },
+/obj/machinery/digital_clock/directional/north,
+/turf/open/floor/iron/dark,
+/area/station/command/bridge)
"pSq" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -63612,14 +63681,6 @@
},
/turf/open/floor/iron/dark/corner,
/area/station/engineering/atmos/pumproom)
-"pUq" = (
-/obj/structure/table/reinforced,
-/obj/item/stock_parts/power_store/cell/high,
-/obj/item/stock_parts/power_store/cell/high,
-/obj/machinery/cell_charger,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/turf/open/floor/iron/dark,
-/area/station/engineering/storage/tech)
"pUw" = (
/obj/machinery/holopad,
/obj/effect/turf_decal/bot,
@@ -63750,12 +63811,32 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/plating,
/area/station/service/abandoned_gambling_den)
+"pVB" = (
+/obj/structure/table,
+/obj/effect/decal/cleanable/dirt,
+/obj/item/reagent_containers/blood/random{
+ pixel_x = 3;
+ pixel_y = 3
+ },
+/obj/item/reagent_containers/blood/random,
+/obj/effect/turf_decal/bot,
+/obj/item/reagent_containers/condiment/enzyme{
+ pixel_x = -6;
+ pixel_y = 8
+ },
+/turf/open/floor/iron,
+/area/station/service/kitchen/abandoned)
"pVD" = (
/obj/effect/mapping_helpers/iannewyear,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/grimy,
/area/station/command/heads_quarters/hop)
+"pVL" = (
+/obj/structure/table/reinforced,
+/obj/machinery/computer/security/telescreen/research/directional/north,
+/turf/open/floor/iron/dark,
+/area/station/command/bridge)
"pVQ" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/effect/mapping_helpers/airlock/abandoned,
@@ -64032,13 +64113,6 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/engineering/atmos)
-"pYW" = (
-/obj/machinery/camera/directional/west{
- c_tag = "Security - Armory External";
- dir = 10
- },
-/turf/open/space/basic,
-/area/space)
"pZc" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -64120,25 +64194,6 @@
/obj/effect/mapping_helpers/broken_floor,
/turf/open/floor/wood,
/area/station/service/abandoned_gambling_den)
-"pZM" = (
-/obj/structure/window/reinforced/spawner/directional/north,
-/obj/structure/disposalpipe/trunk{
- dir = 8
- },
-/obj/machinery/disposal/bin{
- layer = 3.21
- },
-/obj/effect/turf_decal/bot,
-/obj/machinery/door/firedoor/border_only{
- dir = 1
- },
-/obj/machinery/door/poddoor/preopen{
- id = "sci_experimentor";
- name = "Experimentor Blast Door"
- },
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/turf/open/floor/iron/dark,
-/area/station/science/explab)
"qaq" = (
/obj/structure/table,
/obj/item/clothing/gloves/latex,
@@ -65043,6 +65098,25 @@
},
/turf/open/floor/plating,
/area/station/service/abandoned_gambling_den/gaming)
+"qng" = (
+/obj/item/phone{
+ desc = "Supposedly a direct line to Nanotrasen Central Command. It's not even plugged in.";
+ pixel_x = -3;
+ pixel_y = 3
+ },
+/obj/item/cigarette/cigar/cohiba{
+ pixel_x = 6
+ },
+/obj/item/cigarette/cigar/havana{
+ pixel_x = 2
+ },
+/obj/item/cigarette/cigar{
+ pixel_x = 4.5
+ },
+/obj/structure/table/reinforced,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/turf/open/floor/iron,
+/area/station/command/heads_quarters/ce)
"qnr" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -65071,13 +65145,6 @@
},
/turf/open/floor/iron/cafeteria,
/area/station/engineering/atmos)
-"qnC" = (
-/obj/structure/chair/office/light{
- dir = 8
- },
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/turf/open/floor/iron/dark,
-/area/station/science/ordnance/testlab)
"qnG" = (
/obj/machinery/airalarm/directional/south,
/obj/structure/extinguisher_cabinet/directional/east,
@@ -65279,14 +65346,6 @@
},
/turf/open/floor/iron,
/area/station/command/heads_quarters/ce)
-"qpI" = (
-/obj/structure/table,
-/obj/item/binoculars,
-/obj/structure/window/reinforced/spawner/directional/south,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/machinery/computer/security/telescreen/ordnance/directional/west,
-/turf/open/floor/iron/dark,
-/area/station/science/ordnance/testlab)
"qpQ" = (
/obj/structure/window/reinforced/spawner/directional/north,
/obj/structure/window/reinforced/spawner/directional/west,
@@ -67785,6 +67844,13 @@
/obj/item/newspaper,
/turf/open/floor/plating,
/area/station/security/detectives_office/private_investigators_office)
+"qXF" = (
+/obj/structure/chair/office/light{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/turf/open/floor/iron/dark,
+/area/station/science/ordnance/testlab)
"qXJ" = (
/obj/structure/cable,
/obj/effect/turf_decal/stripes/line{
@@ -67884,6 +67950,14 @@
/obj/structure/sign/warning/secure_area,
/turf/closed/wall/r_wall,
/area/station/maintenance/port)
+"qZc" = (
+/obj/effect/turf_decal/box/red,
+/obj/machinery/atmospherics/components/unary/outlet_injector/on{
+ dir = 1
+ },
+/obj/structure/sign/warning/gas_mask/directional/north,
+/turf/open/floor/engine/xenobio,
+/area/station/science/xenobiology)
"qZn" = (
/obj/machinery/status_display/ai/directional/south,
/obj/effect/turf_decal/trimline/yellow/filled/line,
@@ -67991,13 +68065,6 @@
/obj/effect/turf_decal/trimline/blue/end,
/turf/open/floor/iron/dark/textured,
/area/station/engineering/atmos/project)
-"raF" = (
-/obj/machinery/computer/security/telescreen/vault/directional/north,
-/obj/effect/turf_decal/tile/brown/half/contrasted{
- dir = 1
- },
-/turf/open/floor/iron,
-/area/station/command/heads_quarters/qm)
"raI" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -68555,6 +68622,13 @@
/obj/machinery/door/firedoor,
/turf/open/floor/iron,
/area/station/cargo/miningoffice)
+"rim" = (
+/obj/structure/table/reinforced,
+/obj/item/clipboard,
+/obj/item/mining_voucher,
+/obj/item/radio/intercom/directional/north,
+/turf/open/floor/iron/dark,
+/area/station/command/bridge)
"riq" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/grille/broken,
@@ -68720,6 +68794,25 @@
},
/turf/open/floor/wood,
/area/station/service/electronic_marketing_den)
+"rjN" = (
+/obj/structure/table/reinforced,
+/obj/item/stack/sheet/rglass{
+ amount = 50;
+ pixel_x = 2;
+ pixel_y = -2
+ },
+/obj/item/stock_parts/power_store/cell/emproof{
+ pixel_x = 1;
+ pixel_y = 3
+ },
+/obj/effect/turf_decal/bot,
+/obj/machinery/newscaster/directional/east,
+/obj/item/mod/module/plasma_stabilizer,
+/obj/item/mod/module/thermal_regulator,
+/obj/item/mod/module/magboot,
+/obj/item/mod/module/signlang_radio,
+/turf/open/floor/iron,
+/area/station/engineering/storage)
"rjO" = (
/obj/effect/turf_decal/siding/blue{
dir = 9
@@ -69042,25 +69135,6 @@
/obj/machinery/light/dim/directional/east,
/turf/open/floor/iron/dark,
/area/station/tcommsat/computer)
-"rmz" = (
-/obj/structure/table/reinforced,
-/obj/item/stack/sheet/rglass{
- amount = 50;
- pixel_x = 2;
- pixel_y = -2
- },
-/obj/item/stock_parts/power_store/cell/emproof{
- pixel_x = 1;
- pixel_y = 3
- },
-/obj/effect/turf_decal/bot,
-/obj/machinery/newscaster/directional/east,
-/obj/item/mod/module/plasma_stabilizer,
-/obj/item/mod/module/thermal_regulator,
-/obj/item/mod/module/magboot,
-/obj/item/mod/module/signlang_radio,
-/turf/open/floor/iron,
-/area/station/engineering/storage)
"rmI" = (
/obj/structure/table/reinforced,
/obj/item/electronics/apc,
@@ -69275,6 +69349,14 @@
},
/turf/open/floor/iron,
/area/station/maintenance/starboard/aft)
+"rpi" = (
+/obj/structure/table/wood,
+/obj/machinery/light/directional/south,
+/obj/item/stack/package_wrap,
+/obj/item/hand_labeler,
+/obj/machinery/computer/security/telescreen/vault/directional/east,
+/turf/open/floor/wood,
+/area/station/command/heads_quarters/hop)
"rpK" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -70152,6 +70234,19 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/command/bridge)
+"rBY" = (
+/obj/structure/rack,
+/obj/item/tank/internals/emergency_oxygen/engi,
+/obj/item/tank/internals/emergency_oxygen/engi,
+/obj/item/wrench,
+/obj/item/stock_parts/power_store/cell/emproof{
+ pixel_x = 4;
+ pixel_y = 2
+ },
+/obj/item/lightreplacer,
+/obj/effect/turf_decal/bot,
+/turf/open/floor/iron/dark,
+/area/station/engineering/atmos/storage)
"rCc" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -70240,6 +70335,28 @@
"rDL" = (
/turf/open/floor/iron,
/area/station/engineering/storage_shared)
+"rDZ" = (
+/obj/structure/table/wood,
+/obj/item/storage/box/matches{
+ pixel_x = -2;
+ pixel_y = 3
+ },
+/obj/item/cigarette/cigar{
+ pixel_x = 2;
+ pixel_y = 2
+ },
+/obj/item/cigarette/cigar/cohiba{
+ pixel_x = 3;
+ pixel_y = 1
+ },
+/obj/item/cigarette/cigar{
+ pixel_x = 4
+ },
+/obj/effect/turf_decal/tile/blue/half/contrasted{
+ dir = 4
+ },
+/turf/open/floor/iron/dark,
+/area/station/command/corporate_showroom)
"rEb" = (
/obj/machinery/mineral/stacking_machine{
input_dir = 2
@@ -70728,6 +70845,22 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/white,
/area/station/security/medical)
+"rJY" = (
+/obj/structure/table/reinforced,
+/obj/item/stack/package_wrap,
+/obj/item/stack/cable_coil{
+ pixel_x = 3;
+ pixel_y = 3
+ },
+/obj/item/stack/cable_coil,
+/obj/item/stock_parts/power_store/cell/high,
+/obj/effect/decal/cleanable/dirt,
+/obj/item/radio/intercom/directional/north,
+/obj/effect/turf_decal/tile/yellow/anticorner/contrasted{
+ dir = 4
+ },
+/turf/open/floor/iron,
+/area/station/construction/mining/aux_base)
"rKb" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible,
@@ -71468,17 +71601,6 @@
},
/turf/open/floor/iron/white/smooth_large,
/area/station/medical/medbay)
-"rRF" = (
-/obj/structure/table/reinforced,
-/obj/item/folder/white,
-/obj/item/stock_parts/power_store/cell/high,
-/obj/item/stack/sheet/glass,
-/obj/item/stack/sheet/glass,
-/obj/item/stack/sheet/glass,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/machinery/airalarm/directional/east,
-/turf/open/floor/iron/dark,
-/area/station/engineering/storage/tech)
"rRR" = (
/obj/structure/rack,
/obj/effect/turf_decal/bot,
@@ -71680,6 +71802,16 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/science/xenobiology)
+"rUf" = (
+/obj/machinery/camera/directional/west{
+ c_tag = "Xenobiology - Secure Cell Interior";
+ name = "xenobiology camera";
+ network = list("ss13","xeno","rd")
+ },
+/obj/machinery/status_display/ai/directional/west,
+/obj/machinery/light/cold/directional/west,
+/turf/open/floor/engine/xenobio,
+/area/station/science/xenobiology)
"rUj" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/door/poddoor/preopen{
@@ -72169,6 +72301,15 @@
},
/turf/open/floor/iron,
/area/station/service/hydroponics)
+"sas" = (
+/obj/machinery/cell_charger,
+/obj/structure/table/reinforced,
+/obj/item/stock_parts/power_store/cell/high,
+/obj/effect/turf_decal/stripes/corner{
+ dir = 1
+ },
+/turf/open/floor/plating,
+/area/station/ai_monitored/turret_protected/aisat_interior)
"sau" = (
/obj/machinery/blackbox_recorder,
/obj/machinery/atmospherics/pipe/heat_exchanging/simple,
@@ -72606,10 +72747,6 @@
/obj/effect/spawner/random/structure/tank_holder,
/turf/open/floor/plating,
/area/station/maintenance/port/aft)
-"sfE" = (
-/obj/effect/decal/cleanable/xenoblood,
-/turf/open/floor/circuit/green,
-/area/station/science/xenobiology)
"sfH" = (
/obj/effect/landmark/start/hangover,
/obj/effect/turf_decal/tile/neutral{
@@ -72682,6 +72819,12 @@
},
/turf/open/floor/iron,
/area/station/security/brig)
+"sgH" = (
+/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{
+ dir = 10
+ },
+/turf/open/space/basic,
+/area/space/nearstation)
"sgI" = (
/obj/docking_port/stationary/escape_pod{
dir = 4
@@ -72920,6 +73063,16 @@
/obj/structure/cable,
/turf/open/floor/iron/white,
/area/station/medical/virology)
+"skl" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/neutral/half/contrasted{
+ dir = 4
+ },
+/obj/effect/spawner/random/engineering/tracking_beacon,
+/turf/open/floor/iron,
+/area/station/science/xenobiology)
"skr" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/spawner/random/vending/snackvend,
@@ -73829,25 +73982,6 @@
/obj/machinery/light/small/directional/north,
/turf/open/floor/plating,
/area/station/commons/fitness/recreation)
-"swR" = (
-/obj/item/phone{
- desc = "Supposedly a direct line to Nanotrasen Central Command. It's not even plugged in.";
- pixel_x = -3;
- pixel_y = 3
- },
-/obj/item/cigarette/cigar/cohiba{
- pixel_x = 6
- },
-/obj/item/cigarette/cigar/havana{
- pixel_x = 2
- },
-/obj/item/cigarette/cigar{
- pixel_x = 4.5
- },
-/obj/structure/table/reinforced,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/turf/open/floor/iron,
-/area/station/command/heads_quarters/ce)
"swY" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/door/poddoor/shutters/preopen{
@@ -75781,11 +75915,10 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/tcommsat/computer)
-"sVm" = (
-/obj/structure/lattice,
-/obj/structure/sign/warning/electric_shock/directional/east,
+"sVs" = (
+/obj/structure/sign/warning/secure_area/directional/east,
/turf/open/space/basic,
-/area/space)
+/area/space/nearstation)
"sVC" = (
/obj/machinery/atmospherics/components/unary/thermomachine/freezer{
dir = 4
@@ -75871,15 +76004,6 @@
/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/iron,
/area/station/hallway/primary/central/fore)
-"sWJ" = (
-/obj/structure/table/reinforced,
-/obj/item/stack/cable_coil,
-/obj/item/electronics/airalarm,
-/obj/item/electronics/firealarm,
-/obj/item/stock_parts/power_store/cell/high,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron,
-/area/station/maintenance/port)
"sWO" = (
/obj/machinery/atmospherics/pipe/smart/manifold/purple/visible{
dir = 8
@@ -76007,19 +76131,6 @@
/obj/effect/landmark/event_spawn,
/turf/open/floor/iron/grimy,
/area/station/command/meeting_room/council)
-"sXV" = (
-/obj/structure/table/reinforced,
-/obj/item/stock_parts/matter_bin,
-/obj/item/stock_parts/matter_bin{
- pixel_x = 3;
- pixel_y = 3
- },
-/obj/item/stock_parts/micro_laser,
-/obj/effect/turf_decal/siding/purple{
- dir = 8
- },
-/turf/open/floor/iron,
-/area/station/science/lab)
"sYf" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -76788,6 +76899,12 @@
/obj/effect/turf_decal/tile/yellow/opposingcorners,
/turf/open/floor/iron/dark,
/area/station/medical/pharmacy)
+"tjN" = (
+/obj/structure/sign/nanotrasen{
+ pixel_y = -32
+ },
+/turf/open/space/basic,
+/area/space/nearstation)
"tke" = (
/obj/structure/chair{
dir = 1
@@ -77257,24 +77374,6 @@
/obj/structure/cable,
/turf/open/floor/iron/grimy,
/area/station/service/bar/backroom)
-"trf" = (
-/obj/structure/table/wood,
-/obj/item/restraints/handcuffs{
- pixel_y = 6
- },
-/obj/item/cigarette/cigar/cohiba{
- pixel_x = 7;
- pixel_y = -7
- },
-/obj/item/cigarette/cigar/havana{
- pixel_x = -3
- },
-/obj/item/cigarette/cigar{
- pixel_x = -1;
- pixel_y = -7
- },
-/turf/open/floor/carpet,
-/area/station/security/detectives_office)
"trw" = (
/obj/structure/disposalpipe/segment{
dir = 5
@@ -77287,18 +77386,6 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/fore)
-"trC" = (
-/obj/item/reagent_containers/condiment/enzyme{
- layer = 5
- },
-/obj/item/kitchen/rollingpin,
-/obj/structure/table,
-/obj/item/reagent_containers/cup/bowl,
-/obj/item/reagent_containers/cup/beaker{
- pixel_x = 5
- },
-/turf/open/floor/iron/cafeteria,
-/area/station/service/kitchen)
"trG" = (
/obj/machinery/door/window/left/directional/north{
name = "Engineering Delivery";
@@ -77886,6 +77973,17 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/security/interrogation)
+"tyF" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/table/reinforced,
+/obj/item/storage/box/lights/mixed,
+/obj/machinery/airalarm/directional/north,
+/obj/item/stock_parts/power_store/cell/high/empty,
+/obj/effect/turf_decal/tile/brown/half/contrasted{
+ dir = 1
+ },
+/turf/open/floor/iron,
+/area/station/cargo/storage)
"tyK" = (
/obj/machinery/vending/wardrobe/jani_wardrobe,
/turf/open/floor/iron/dark,
@@ -77912,18 +78010,6 @@
},
/turf/open/floor/plating,
/area/station/engineering/atmos/hfr_room)
-"tzc" = (
-/obj/structure/table/reinforced,
-/obj/machinery/cell_charger,
-/obj/effect/turf_decal/siding/purple{
- dir = 8
- },
-/obj/effect/turf_decal/siding/purple{
- dir = 4
- },
-/obj/item/stock_parts/power_store/cell/high,
-/turf/open/floor/iron,
-/area/station/science/lab)
"tzj" = (
/obj/structure/disposalpipe/trunk{
dir = 1
@@ -78020,6 +78106,16 @@
/obj/structure/sign/poster/contraband/random/directional/east,
/turf/open/floor/iron,
/area/station/service/hydroponics/garden)
+"tAB" = (
+/obj/machinery/cell_charger,
+/obj/structure/table/reinforced,
+/obj/machinery/status_display/ai/directional/north,
+/obj/item/rcl/pre_loaded,
+/obj/effect/turf_decal/bot,
+/obj/item/stock_parts/power_store/cell/high,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/turf/open/floor/iron/dark,
+/area/station/command/heads_quarters/ce)
"tAL" = (
/obj/structure/sign/nanotrasen{
pixel_y = 32
@@ -78043,6 +78139,13 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron,
/area/station/engineering/atmos)
+"tAO" = (
+/obj/structure/table,
+/obj/machinery/cell_charger,
+/obj/item/stock_parts/power_store/cell/high,
+/obj/item/radio/intercom/directional/north,
+/turf/open/floor/iron,
+/area/station/command/teleporter)
"tAS" = (
/obj/effect/turf_decal/siding/white,
/obj/structure/cable,
@@ -78476,21 +78579,6 @@
/obj/structure/sign/poster/official/random/directional/west,
/turf/open/floor/wood,
/area/station/maintenance/port/fore)
-"tFu" = (
-/obj/structure/cable,
-/obj/machinery/firealarm/directional/east,
-/obj/effect/decal/cleanable/dirt,
-/obj/item/flatpack{
- board = /obj/item/circuitboard/machine/flatpacker;
- pixel_x = -6;
- pixel_y = 5
- },
-/obj/item/multitool{
- pixel_x = 8
- },
-/obj/structure/table,
-/turf/open/floor/iron,
-/area/station/engineering/storage_shared)
"tFG" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
dir = 1
@@ -80800,11 +80888,6 @@
/obj/machinery/light/directional/east,
/turf/open/floor/iron,
/area/station/engineering/main)
-"uiH" = (
-/obj/structure/table/reinforced,
-/obj/machinery/computer/security/telescreen/research/directional/north,
-/turf/open/floor/iron/dark,
-/area/station/command/bridge)
"uiK" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -80874,13 +80957,6 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron,
/area/station/ai_monitored/command/storage/eva)
-"ujL" = (
-/obj/structure/table/reinforced,
-/obj/item/clipboard,
-/obj/item/mining_voucher,
-/obj/item/radio/intercom/directional/north,
-/turf/open/floor/iron/dark,
-/area/station/command/bridge)
"ujQ" = (
/obj/machinery/status_display/ai/directional/west,
/obj/structure/filingcabinet/security,
@@ -80970,15 +81046,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/white,
/area/station/medical/medbay)
-"ukO" = (
-/obj/machinery/cell_charger,
-/obj/structure/table/reinforced,
-/obj/item/stock_parts/power_store/cell/high,
-/obj/structure/window/reinforced/spawner/directional/south,
-/obj/structure/cable,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/turf/open/floor/iron/dark,
-/area/station/ai_monitored/command/storage/eva)
"ukR" = (
/obj/structure/reagent_dispensers/fueltank,
/turf/open/floor/plating,
@@ -81462,6 +81529,13 @@
},
/turf/open/floor/iron,
/area/station/security/checkpoint/arrivals)
+"uqT" = (
+/obj/structure/table/reinforced,
+/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{
+ dir = 4
+ },
+/turf/open/floor/iron,
+/area/station/science/xenobiology)
"uqX" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/sign/poster/random/directional/north,
@@ -81989,15 +82063,6 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/iron/white/smooth_large,
/area/station/medical/psychology)
-"uxC" = (
-/obj/machinery/atmospherics/pipe/smart/simple/cyan/hidden,
-/obj/machinery/computer/security/telescreen/engine/directional/west,
-/obj/effect/turf_decal/bot,
-/obj/machinery/computer/atmos_control/nocontrol/master{
- dir = 4
- },
-/turf/open/floor/iron/dark/textured_large,
-/area/station/engineering/atmos/storage/gas)
"uxG" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -83163,11 +83228,6 @@
/obj/machinery/light/small/directional/south,
/turf/open/floor/iron,
/area/station/maintenance/department/science)
-"uLX" = (
-/obj/effect/turf_decal/tile/blue/half/contrasted,
-/obj/machinery/computer/security/telescreen/minisat/directional/south,
-/turf/open/floor/iron/dark,
-/area/station/command/bridge)
"uMb" = (
/obj/structure/table,
/obj/item/analyzer,
@@ -84084,10 +84144,6 @@
/obj/effect/mapping_helpers/broken_floor,
/turf/open/floor/plating,
/area/station/maintenance/department/chapel)
-"uXF" = (
-/obj/structure/sign/warning/secure_area/directional/south,
-/turf/open/space/basic,
-/area/space)
"uXK" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/security{
@@ -84118,17 +84174,6 @@
/obj/effect/mapping_helpers/airalarm/tlv_no_checks,
/turf/open/floor/iron/dark,
/area/station/science/ordnance)
-"uXU" = (
-/obj/structure/disposaloutlet{
- dir = 8
- },
-/obj/structure/disposalpipe/trunk{
- dir = 4
- },
-/obj/effect/turf_decal/box/red,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/turf/open/floor/iron/dark,
-/area/station/science/xenobiology)
"uYg" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/carpet/green,
@@ -84190,6 +84235,14 @@
},
/turf/open/floor/iron,
/area/station/engineering/atmos/pumproom)
+"uYG" = (
+/obj/structure/table,
+/obj/item/binoculars,
+/obj/structure/window/reinforced/spawner/directional/south,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/machinery/computer/security/telescreen/ordnance/directional/west,
+/turf/open/floor/iron/dark,
+/area/station/science/ordnance/testlab)
"uYH" = (
/turf/open/floor/plating,
/area/station/maintenance/port/aft)
@@ -84281,16 +84334,6 @@
},
/turf/open/floor/iron,
/area/station/science/research)
-"uZy" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/computer/security/telescreen/interrogation/directional/west,
-/obj/structure/cable,
-/obj/effect/turf_decal/tile/red{
- dir = 1
- },
-/turf/open/floor/iron,
-/area/station/security/brig)
"uZH" = (
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 1
@@ -85147,6 +85190,10 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/central/aft)
+"vma" = (
+/obj/effect/spawner/random/medical/two_percent_xeno_egg_spawner,
+/turf/open/floor/engine/xenobio,
+/area/station/science/xenobiology)
"vmh" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/cafeteria,
@@ -86021,17 +86068,6 @@
/obj/effect/turf_decal/tile/neutral/half/contrasted,
/turf/open/floor/iron,
/area/station/maintenance/starboard/aft)
-"vxq" = (
-/obj/structure/cable,
-/obj/machinery/computer/security/telescreen/prison/directional/east,
-/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 = 8
- },
-/obj/machinery/light/directional/east,
-/turf/open/floor/iron,
-/area/station/security/execution/transfer)
"vxr" = (
/turf/open/floor/iron,
/area/station/security/prison)
@@ -86140,6 +86176,10 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/science/auxlab/firing_range)
+"vyz" = (
+/obj/effect/decal/remains/xeno,
+/turf/open/floor/engine/xenobio,
+/area/station/science/xenobiology)
"vyC" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/mapping_helpers/broken_floor,
@@ -86950,6 +86990,16 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
/area/station/maintenance/department/security)
+"vId" = (
+/obj/machinery/atmospherics/pipe/smart/manifold/purple/visible/layer2{
+ dir = 4
+ },
+/obj/machinery/meter/layer2,
+/obj/structure/sign/warning/no_smoking/directional/east,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/structure/cable,
+/turf/open/floor/iron/dark,
+/area/station/science/ordnance)
"vIq" = (
/obj/structure/cable,
/obj/structure/disposalpipe/junction{
@@ -88321,6 +88371,13 @@
},
/turf/open/floor/plating,
/area/station/maintenance/port/aft)
+"wdm" = (
+/obj/structure/table/reinforced,
+/obj/item/stock_parts/power_store/cell/high,
+/obj/item/stock_parts/power_store/cell/high,
+/obj/machinery/cell_charger,
+/turf/open/floor/iron,
+/area/station/commons/storage/primary)
"wdt" = (
/obj/structure/cable,
/obj/effect/turf_decal/stripes/line{
@@ -89079,16 +89136,6 @@
/obj/item/pen,
/turf/open/floor/iron/white,
/area/station/medical/medbay)
-"wmo" = (
-/obj/machinery/cell_charger,
-/obj/structure/table/reinforced,
-/obj/machinery/status_display/ai/directional/north,
-/obj/item/rcl/pre_loaded,
-/obj/effect/turf_decal/bot,
-/obj/item/stock_parts/power_store/cell/high,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/turf/open/floor/iron/dark,
-/area/station/command/heads_quarters/ce)
"wmp" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 8
@@ -89424,6 +89471,14 @@
/obj/effect/spawner/random/structure/tank_holder,
/turf/open/floor/plating,
/area/station/maintenance/starboard/aft)
+"wpN" = (
+/obj/structure/table/wood,
+/obj/item/pen,
+/obj/effect/turf_decal/siding/dark_red{
+ dir = 4
+ },
+/turf/open/floor/iron/checker,
+/area/station/security/interrogation)
"wpO" = (
/obj/machinery/status_display/ai/directional/north,
/obj/structure/table,
@@ -90153,12 +90208,6 @@
/obj/machinery/light/small/directional/east,
/turf/open/floor/iron,
/area/station/command/heads_quarters/rd)
-"wyN" = (
-/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{
- dir = 10
- },
-/turf/open/space/basic,
-/area/space)
"wzb" = (
/obj/effect/turf_decal/tile/brown/half/contrasted{
dir = 4
@@ -91200,44 +91249,6 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron,
/area/station/medical/pharmacy)
-"wLA" = (
-/obj/item/stack/cable_coil,
-/obj/item/bodypart/arm/right/robot{
- pixel_x = 3
- },
-/obj/item/bodypart/arm/left/robot{
- pixel_x = -3
- },
-/obj/structure/table,
-/obj/item/radio/intercom/directional/west,
-/obj/item/assembly/prox_sensor{
- pixel_x = 5
- },
-/obj/item/assembly/prox_sensor{
- pixel_x = 5
- },
-/obj/item/assembly/prox_sensor{
- pixel_x = 5
- },
-/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/item/stock_parts/power_store/cell/high{
- pixel_x = 3;
- pixel_y = 16
- },
-/obj/item/stock_parts/power_store/cell/high{
- pixel_x = -3;
- pixel_y = 16
- },
-/obj/item/stock_parts/power_store/cell/high{
- pixel_y = 15
- },
-/turf/open/floor/iron,
-/area/station/science/robotics/lab)
"wLK" = (
/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
@@ -92328,11 +92339,6 @@
/obj/machinery/light/small/directional/east,
/turf/open/floor/iron/textured,
/area/station/medical/medbay)
-"xcR" = (
-/obj/effect/spawner/random/engineering/tracking_beacon,
-/obj/effect/landmark/event_spawn,
-/turf/open/floor/circuit/green,
-/area/station/science/xenobiology)
"xcU" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -92350,14 +92356,6 @@
/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance,
/turf/open/floor/iron,
/area/station/maintenance/fore)
-"xdn" = (
-/obj/effect/turf_decal/box/red,
-/obj/machinery/atmospherics/components/unary/outlet_injector/on{
- dir = 1
- },
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/turf/open/floor/iron/dark,
-/area/station/science/xenobiology)
"xdA" = (
/obj/effect/spawner/random/decoration/carpet,
/obj/effect/spawner/random/structure/furniture_parts,
@@ -92566,17 +92564,6 @@
},
/turf/open/space/basic,
/area/space/nearstation)
-"xfG" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/table/reinforced,
-/obj/item/storage/box/lights/mixed,
-/obj/machinery/airalarm/directional/north,
-/obj/item/stock_parts/power_store/cell/high/empty,
-/obj/effect/turf_decal/tile/brown/half/contrasted{
- dir = 1
- },
-/turf/open/floor/iron,
-/area/station/cargo/storage)
"xfR" = (
/obj/machinery/camera/directional/east{
c_tag = "Security - Interrogation Monitoring"
@@ -93810,6 +93797,23 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/security/processing)
+"xvP" = (
+/obj/structure/window/reinforced/spawner/directional/north,
+/obj/structure/disposalpipe/trunk{
+ dir = 8
+ },
+/obj/machinery/disposal/bin,
+/obj/effect/turf_decal/bot,
+/obj/machinery/door/firedoor/border_only{
+ dir = 1
+ },
+/obj/machinery/door/poddoor/preopen{
+ id = "sci_experimentor";
+ name = "Experimentor Blast Door"
+ },
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/turf/open/floor/iron/dark,
+/area/station/science/explab)
"xwa" = (
/obj/machinery/light/directional/south,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -93852,17 +93856,6 @@
},
/turf/open/floor/iron,
/area/station/maintenance/disposal)
-"xwC" = (
-/obj/machinery/computer/mecha{
- dir = 8
- },
-/obj/machinery/computer/security/telescreen/rd/directional/east,
-/obj/effect/turf_decal/tile/neutral/half/contrasted{
- dir = 1
- },
-/obj/effect/turf_decal/tile/purple,
-/turf/open/floor/iron,
-/area/station/command/heads_quarters/rd)
"xwK" = (
/obj/structure/cable,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
@@ -94413,22 +94406,6 @@
},
/turf/open/floor/iron,
/area/station/hallway/secondary/entry)
-"xCC" = (
-/obj/structure/table,
-/obj/effect/decal/cleanable/dirt,
-/obj/item/reagent_containers/blood/random{
- pixel_x = 3;
- pixel_y = 3
- },
-/obj/item/reagent_containers/blood/random,
-/obj/effect/turf_decal/bot,
-/obj/item/reagent_containers/condiment/enzyme{
- layer = 5;
- pixel_x = -6;
- pixel_y = 8
- },
-/turf/open/floor/iron,
-/area/station/service/kitchen/abandoned)
"xCF" = (
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 1
@@ -95063,6 +95040,23 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron,
/area/station/commons/locker)
+"xKh" = (
+/obj/structure/table/wood,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/item/cigarette/cigar/havana{
+ pixel_x = 2;
+ pixel_y = 2
+ },
+/obj/item/cigarette/cigar/cohiba{
+ pixel_x = 6;
+ pixel_y = 2
+ },
+/obj/item/cigarette/cigar{
+ pixel_x = -2;
+ pixel_y = 2
+ },
+/turf/open/floor/iron/grimy,
+/area/station/command/heads_quarters/hos)
"xKn" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/structure/cable,
@@ -96005,14 +95999,13 @@
/obj/machinery/light/warm/directional/west,
/turf/open/floor/wood,
/area/station/service/lawoffice)
-"xYf" = (
-/obj/structure/table/wood,
-/obj/machinery/light/directional/south,
-/obj/item/stack/package_wrap,
-/obj/item/hand_labeler,
-/obj/machinery/computer/security/telescreen/vault/directional/east,
-/turf/open/floor/wood,
-/area/station/command/heads_quarters/hop)
+"xXV" = (
+/obj/machinery/camera/directional/west{
+ c_tag = "Security - Armory External";
+ dir = 10
+ },
+/turf/open/space/basic,
+/area/space/nearstation)
"xYl" = (
/obj/structure/lattice,
/obj/item/toy/figure/ninja,
@@ -96820,12 +96813,6 @@
/obj/effect/landmark/event_spawn,
/turf/open/floor/iron/white,
/area/station/medical/virology)
-"yjJ" = (
-/obj/structure/sign/warning/secure_area/directional/south,
-/obj/structure/table/reinforced,
-/obj/machinery/computer/security/telescreen/minisat/directional/east,
-/turf/open/floor/iron/dark,
-/area/station/engineering/transit_tube)
"yjK" = (
/obj/machinery/holopad,
/obj/effect/turf_decal/bot_white,
@@ -104063,7 +104050,7 @@ ueB
uhL
btH
bPC
-fmw
+sas
bTs
rPe
vvL
@@ -114375,7 +114362,7 @@ aaa
uHd
aaa
qYo
-nET
+jNV
qYo
aaa
qYo
@@ -114383,7 +114370,7 @@ qYo
aaa
qYo
aaa
-nET
+jNV
qYo
aaa
uHd
@@ -114630,7 +114617,7 @@ vVc
aad
aad
aad
-djY
+sVs
nCi
nCi
fqm
@@ -114642,7 +114629,7 @@ fqm
fqm
nCi
nCi
-djY
+sVs
aaa
qYo
aaa
@@ -115370,7 +115357,7 @@ wGy
vVc
vVc
vVc
-sVm
+ipO
abj
abj
lbi
@@ -115405,11 +115392,11 @@ fqm
djS
nCi
nCi
-sfN
-sfN
-eqP
-sfN
-sfN
+eyn
+eyn
+rUf
+eyn
+eyn
nCi
nCi
cJd
@@ -115661,13 +115648,13 @@ chp
fqm
vPU
nCi
-sfN
-sfN
-sfN
-iJw
-sfN
-sfN
-sfN
+eyn
+eyn
+eyn
+vma
+eyn
+eyn
+eyn
nCi
vPU
fqm
@@ -115918,13 +115905,13 @@ rXu
nCi
eVp
nCi
-sfN
-ozA
-pJz
-xcR
-sfE
-gCt
-sfN
+eyn
+hfo
+vyz
+eyn
+pep
+eyn
+eyn
nCi
mFq
nCi
@@ -116145,7 +116132,7 @@ dgk
eqg
uYy
jCY
-yjJ
+igi
vmt
nUT
aaa
@@ -116175,13 +116162,13 @@ gbe
nCi
vPU
nCi
-sfN
-sfN
-sfN
-sfN
-sfN
-sfN
-sfN
+eyn
+eyn
+eyn
+eyn
+eyn
+eyn
+eyn
nCi
vPU
cfb
@@ -116434,9 +116421,9 @@ uWm
nCi
rIb
rIb
-xdn
-sfN
-uXU
+qZc
+eyn
+mkA
uhb
uhb
nCi
@@ -116690,7 +116677,7 @@ pyZ
vBO
uhb
ebW
-kNG
+imx
imx
xsH
umb
@@ -116947,7 +116934,7 @@ aFU
nCi
uhb
xIa
-iRd
+uqT
gxT
kPD
rxX
@@ -117202,11 +117189,11 @@ nCi
cTO
uOn
uhb
-mKn
+byO
fPl
jqr
vxQ
-vxQ
+skl
vxQ
lzc
plQ
@@ -117631,7 +117618,7 @@ aaa
qYo
kvq
aaa
-wyN
+sgH
mJH
pHl
rQI
@@ -117716,7 +117703,7 @@ nCi
fsC
nOv
uhb
-oHO
+ggp
aqF
rqy
jKx
@@ -119227,7 +119214,7 @@ viB
pOz
hEL
gyR
-cfx
+ehU
vyn
eMN
gAw
@@ -119736,12 +119723,12 @@ jLx
dFw
mPr
bAR
-wmo
+tAB
gsV
auh
tMl
apu
-swR
+qng
aHE
wCn
gAw
@@ -120505,7 +120492,7 @@ pQo
uCa
wkj
bqP
-nOJ
+jwW
bAR
gHt
bAV
@@ -121528,7 +121515,7 @@ wiZ
fXF
xkz
hwe
-tFu
+fnC
vpV
uCa
gQk
@@ -121747,7 +121734,7 @@ gqe
wcG
bpg
nDM
-pnm
+lyS
dYj
vZX
umm
@@ -122279,10 +122266,10 @@ sID
pUW
qSm
wIf
-mdG
+rBY
lvJ
jYA
-jtD
+nba
eVG
wqF
npE
@@ -122874,7 +122861,7 @@ wEI
qNb
naL
nEc
-iWz
+mcm
kGQ
bGz
nzb
@@ -123098,7 +123085,7 @@ grl
iJU
pJM
pec
-bHr
+beI
fii
fii
lBz
@@ -123327,7 +123314,7 @@ vnq
ftU
dCX
wdZ
-uxC
+jae
bYK
xLZ
iXc
@@ -124386,11 +124373,11 @@ swD
baw
fii
iqz
-gUt
+iZH
hps
hkJ
tum
-rmz
+rjN
abO
pTC
sNd
@@ -124595,7 +124582,7 @@ vOI
etR
xcU
nmw
-haF
+cwG
qYo
dQS
qYo
@@ -124604,7 +124591,7 @@ aaa
qYo
cut
qYo
-haF
+cwG
aaa
xLZ
nNK
@@ -125456,7 +125443,7 @@ szJ
xoR
hfe
sKR
-qpI
+uYG
fYU
kzc
dqo
@@ -125712,7 +125699,7 @@ fLf
cfL
xoR
aJy
-qnC
+qXF
dkF
fYU
kzc
@@ -125925,7 +125912,7 @@ rnr
lRx
gRl
iQr
-sWJ
+hwJ
pTC
qcM
vcB
@@ -126159,7 +126146,7 @@ aJU
keE
tbf
sdB
-pUq
+ePX
urC
aZo
jPJ
@@ -126737,7 +126724,7 @@ vSX
wEI
qYo
blX
-hdI
+eyt
vQu
dSo
jCf
@@ -126986,7 +126973,7 @@ jqt
qub
uFt
elq
-oXg
+gWT
bWH
jDd
plP
@@ -127469,7 +127456,7 @@ pTC
pTC
unj
fKQ
-wLA
+fDT
xGw
iCI
pTC
@@ -127703,7 +127690,7 @@ tlp
nLY
uyf
klO
-rRF
+mlR
iNR
bCj
tjp
@@ -127748,7 +127735,7 @@ vgu
tYP
hBT
ipr
-xwC
+gRQ
eIh
urt
mjW
@@ -127937,7 +127924,7 @@ xtp
pwA
dyb
eTy
-trC
+ljZ
lZa
xtp
xtp
@@ -127973,7 +127960,7 @@ vcB
vcB
vcB
pTC
-jxj
+ewl
ydp
uTm
nfR
@@ -128253,7 +128240,7 @@ pTC
lLa
fRK
txc
-pZM
+xvP
ffb
dqP
aFp
@@ -129051,7 +129038,7 @@ qaA
jXy
oHM
iLH
-fff
+pbw
vss
oSA
kzc
@@ -129309,7 +129296,7 @@ nJK
yex
iML
tgI
-iFt
+mFk
djT
kzc
kzc
@@ -129566,7 +129553,7 @@ vqx
oHM
iLH
pKR
-iqg
+iwH
uUG
fgy
oFC
@@ -129823,7 +129810,7 @@ hGI
esH
owX
asW
-bFD
+bZM
nSb
jHm
ucu
@@ -130080,7 +130067,7 @@ hNW
hNW
hNW
hNW
-dDB
+okp
hNW
nLP
hNW
@@ -130276,7 +130263,7 @@ uQt
nia
vBY
eYN
-msO
+wdm
iyq
iCO
uED
@@ -130337,7 +130324,7 @@ lzo
vbO
uXN
eqB
-pDx
+eSo
eyH
pwD
eyH
@@ -130553,7 +130540,7 @@ fHD
tCD
khb
rNZ
-bUN
+hUZ
ryp
khb
gmZ
@@ -130594,7 +130581,7 @@ oxo
ojG
oxo
mZK
-gQF
+dfm
vEX
xLj
ctU
@@ -130850,8 +130837,8 @@ qPI
ibH
cBe
ciH
-lcP
-lOw
+cRf
+vId
wCh
cFB
oQq
@@ -132073,7 +132060,7 @@ bog
xaF
awc
xOv
-nHc
+gdK
fxs
lAg
kPM
@@ -132112,7 +132099,7 @@ bgL
mfI
fvi
tpg
-tzc
+byI
oZz
bpM
vzA
@@ -132168,7 +132155,7 @@ gqm
qYo
aaa
lvw
-jUT
+qYo
qYo
aaa
aaa
@@ -132663,7 +132650,7 @@ kzc
aOD
qQM
qQM
-uXF
+nDZ
tgT
xPc
xPc
@@ -133071,7 +133058,7 @@ aWP
qrP
odI
mSA
-dtk
+efv
uDD
msR
mDq
@@ -133142,7 +133129,7 @@ fvi
fvi
fvi
hMa
-sXV
+iDd
gsG
iuU
tZi
@@ -133691,7 +133678,7 @@ kzc
ecm
uYH
qQM
-uXF
+nDZ
tgT
riB
tgT
@@ -133880,7 +133867,7 @@ pRS
kNB
lAv
nAz
-xYf
+rpi
lZx
pgs
lbt
@@ -133929,7 +133916,7 @@ dQT
deW
pMF
uZm
-aBf
+gTg
loe
gaC
lpx
@@ -134151,7 +134138,7 @@ bMB
drM
mlE
odw
-ukO
+khr
eAY
fot
mpb
@@ -134380,7 +134367,7 @@ aaa
wyH
wyH
diL
-ujL
+rim
drj
bog
wuV
@@ -136209,7 +136196,7 @@ duA
cCM
oEC
nqf
-aHq
+rDZ
hTq
qFK
bPv
@@ -137464,10 +137451,10 @@ aaa
wyH
wyH
diL
-uiH
+pVL
drj
bog
-uLX
+dwI
gOU
gOU
vDo
@@ -138492,7 +138479,7 @@ aaa
aad
aaa
diL
-pGz
+pSm
bsC
bog
nkU
@@ -139026,7 +139013,7 @@ nrd
ivA
cVy
kSu
-iij
+tAO
dsT
qBq
fQw
@@ -139197,7 +139184,7 @@ coH
xrr
adR
abi
-lnk
+rJY
aff
afG
afY
@@ -139270,7 +139257,7 @@ uhH
gOU
xRO
wvg
-mXr
+gHJ
icS
gOU
ivA
@@ -140253,7 +140240,7 @@ xGK
jdL
juz
jdL
-xfG
+tyF
hTl
tjl
kdE
@@ -140499,7 +140486,7 @@ sUA
vno
bxe
uWe
-xCC
+pVB
vno
jYU
llB
@@ -142345,7 +142332,7 @@ aaa
lhY
uvJ
qKc
-iYp
+iSq
sJr
wPT
lhY
@@ -142572,7 +142559,7 @@ nDk
ofN
aWN
ivt
-bLy
+ahb
ivt
ktK
egU
@@ -142891,7 +142878,7 @@ vBa
crR
iee
iYi
-eKV
+hAY
npm
qVH
iYi
@@ -143096,7 +143083,7 @@ aad
aad
aad
aJE
-raF
+kkk
aAU
uQZ
xhJ
@@ -143332,7 +143319,7 @@ aad
oeX
sZt
fQL
-oGq
+mYD
xBu
rum
akS
@@ -144409,7 +144396,7 @@ aaa
oIU
eCA
alG
-trf
+cZK
gZz
csy
oIU
@@ -146518,7 +146505,7 @@ feV
wZE
xvr
rmI
-fzK
+hSF
vTn
wZE
dre
@@ -146703,7 +146690,7 @@ jrA
qIH
vgQ
hYa
-mCe
+atA
nup
iSk
jLe
@@ -146960,7 +146947,7 @@ xzJ
hXi
vgQ
csD
-nJu
+wpN
nup
mTT
hgS
@@ -147453,7 +147440,7 @@ aaa
aaa
abj
aaa
-nET
+jNV
aad
aaa
aaa
@@ -147473,7 +147460,7 @@ xPo
krO
pUP
vgQ
-pGv
+aJI
xfR
vgQ
eAW
@@ -147990,7 +147977,7 @@ ybk
jgS
aub
ivK
-uZy
+lhU
fND
ukX
stA
@@ -148225,19 +148212,19 @@ aaa
uHd
aaa
vXr
-cmy
+nep
xIl
obL
-aLM
+gSp
xIl
gjc
-gRN
+kiW
xIl
aSW
-vxq
+atd
xIl
sTq
-gRN
+kiW
ayM
fXC
iKL
@@ -148830,7 +148817,7 @@ iBx
nXH
qAu
kZE
-oRA
+cfW
mzX
xin
dJP
@@ -150836,7 +150823,7 @@ aWO
bLs
iRi
nIV
-ale
+dpR
vyj
snW
auW
@@ -151857,7 +151844,7 @@ aaa
qYo
aaa
qYo
-aKU
+mxw
qYo
aaa
qYo
@@ -152122,7 +152109,7 @@ aaa
aaa
aaa
mfO
-pYW
+xXV
aaa
mfO
aaa
@@ -152363,7 +152350,7 @@ gby
jfR
lPV
qcj
-bAS
+xKh
uTM
nHJ
bRF
@@ -152566,7 +152553,7 @@ aaa
aaa
aaa
aaa
-oFv
+gUO
aaa
aaa
aaa
@@ -153165,7 +153152,7 @@ qYo
uHd
qYo
aad
-dTS
+tjN
uKw
mfC
xFk
@@ -154672,13 +154659,13 @@ gJk
aaa
aad
aaa
-aKU
+mxw
aad
aaa
aad
aaa
aad
-aKU
+mxw
aaa
qYo
aaa
diff --git a/_maps/map_files/IceBoxStation/IceBoxStation.dmm b/_maps/map_files/IceBoxStation/IceBoxStation.dmm
index 5d70bb72e8081..807a18706f3b7 100644
--- a/_maps/map_files/IceBoxStation/IceBoxStation.dmm
+++ b/_maps/map_files/IceBoxStation/IceBoxStation.dmm
@@ -935,14 +935,6 @@
},
/turf/open/floor/iron,
/area/station/command/gateway)
-"apL" = (
-/obj/machinery/modular_computer/preset/engineering,
-/obj/structure/cable,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/machinery/light/small/directional/north,
-/obj/machinery/computer/security/telescreen/engine/directional/north,
-/turf/open/floor/iron/dark,
-/area/station/engineering/engine_smes)
"apS" = (
/obj/structure/cable,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
@@ -1097,17 +1089,6 @@
/obj/item/storage/crayons,
/turf/open/floor/iron,
/area/station/commons/dorms)
-"asb" = (
-/obj/structure/sink/directional/west,
-/obj/structure/cable,
-/obj/machinery/button/door/directional/east{
- id = "xenobio10";
- layer = 4;
- name = "Xenobio Pen 10 Blast DOors";
- req_access = list("xenobiology")
- },
-/turf/open/floor/iron/white,
-/area/station/science/xenobiology)
"asg" = (
/obj/structure/closet,
/obj/effect/spawner/random/maintenance/two,
@@ -1775,6 +1756,9 @@
},
/turf/open/floor/wood/large,
/area/station/commons/lounge)
+"aBv" = (
+/turf/open/floor/engine/vacuum,
+/area/station/science/ordnance/burnchamber)
"aBR" = (
/turf/open/genturf/blue,
/area/icemoon/surface/outdoors/noruins)
@@ -1850,6 +1834,22 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
/area/station/maintenance/port/greater)
+"aCV" = (
+/obj/machinery/door/airlock/medical/glass{
+ name = "Medbay Chemistry Access"
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/door/firedoor,
+/obj/structure/cable,
+/obj/effect/turf_decal/stripes/line,
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/effect/mapping_helpers/airlock/access/all/medical/general,
+/obj/effect/turf_decal/tile/yellow/full,
+/turf/open/floor/iron/large,
+/area/station/medical/treatment_center)
"aCX" = (
/obj/structure/table,
/obj/item/stock_parts/subspace/filter,
@@ -1923,16 +1923,6 @@
/obj/structure/extinguisher_cabinet/directional/south,
/turf/open/floor/iron/white,
/area/station/science/robotics/lab)
-"aEK" = (
-/obj/machinery/atmospherics/components/binary/pump/off,
-/obj/machinery/airlock_sensor/incinerator_ordmix{
- pixel_x = 24
- },
-/obj/machinery/atmospherics/pipe/layer_manifold/supply/hidden{
- dir = 4
- },
-/turf/open/floor/engine,
-/area/station/science/ordnance/burnchamber)
"aEM" = (
/obj/structure/sign/departments/cargo,
/turf/closed/wall/r_wall,
@@ -2138,6 +2128,12 @@
dir = 9
},
/area/station/science/explab)
+"aIv" = (
+/obj/structure/railing/wooden_fence{
+ dir = 1
+ },
+/turf/open/misc/hay/icemoon,
+/area/icemoon/underground/explored)
"aIA" = (
/obj/effect/turf_decal/siding/thinplating/dark{
dir = 9
@@ -2614,16 +2610,6 @@
/obj/item/clothing/shoes/jackboots,
/turf/open/floor/plating,
/area/station/maintenance/starboard/fore)
-"aQn" = (
-/obj/machinery/atmospherics/components/unary/portables_connector/visible{
- dir = 1
- },
-/obj/effect/turf_decal/box,
-/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,
-/area/station/science/ordnance)
"aQy" = (
/obj/effect/turf_decal/siding/wood,
/obj/item/kirbyplants/random/fullysynthetic{
@@ -2634,6 +2620,15 @@
/obj/machinery/firealarm/directional/north,
/turf/open/floor/stone,
/area/mine/eva/lower)
+"aQG" = (
+/obj/effect/turf_decal/trimline/purple/filled/warning{
+ dir = 8
+ },
+/obj/machinery/computer/security/telescreen/test_chamber/directional/east{
+ name = "Xenobio Monitor"
+ },
+/turf/open/floor/iron/white,
+/area/station/science/xenobiology)
"aQJ" = (
/obj/machinery/power/apc/auto_name/directional/north,
/obj/structure/cable,
@@ -2706,6 +2701,16 @@
/obj/machinery/light/small/directional/south,
/turf/open/floor/iron/dark,
/area/station/medical/virology)
+"aRs" = (
+/obj/structure/table,
+/obj/item/folder/white,
+/obj/item/folder/white,
+/obj/item/pen,
+/obj/machinery/power/apc/auto_name/directional/east,
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable,
+/turf/open/floor/iron/dark,
+/area/station/science/explab)
"aRt" = (
/obj/effect/turf_decal/weather/snow/corner{
dir = 4
@@ -2785,17 +2790,6 @@
/obj/effect/turf_decal/siding/yellow,
/turf/open/floor/iron,
/area/station/engineering/atmos/storage/gas)
-"aSw" = (
-/obj/structure/rack,
-/obj/item/lighter,
-/obj/item/clothing/glasses/meson{
- pixel_y = 4
- },
-/obj/item/stock_parts/power_store/cell/high,
-/obj/item/reagent_containers/pill/patch/aiuri,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/turf/open/floor/iron/dark,
-/area/station/command/heads_quarters/ce)
"aSB" = (
/obj/machinery/atmospherics/components/unary/portables_connector/visible,
/obj/effect/turf_decal/box,
@@ -3228,26 +3222,6 @@
/obj/item/bikehorn/rubberducky/plasticducky,
/turf/open/floor/iron/freezer,
/area/mine/laborcamp)
-"aYS" = (
-/obj/effect/turf_decal/bot{
- dir = 1
- },
-/obj/structure/cable,
-/obj/structure/table,
-/obj/item/storage/box/lights/mixed,
-/obj/item/stack/cable_coil,
-/obj/item/stack/cable_coil,
-/obj/item/stock_parts/power_store/cell/emproof,
-/obj/item/stock_parts/power_store/cell/emproof{
- pixel_x = 6;
- pixel_y = -2
- },
-/obj/machinery/light_switch/directional/south{
- pixel_x = 10
- },
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/turf/open/floor/iron/dark,
-/area/station/engineering/engine_smes)
"aZd" = (
/turf/open/floor/plating,
/area/station/medical/virology)
@@ -3815,6 +3789,10 @@
},
/turf/open/floor/plating,
/area/station/maintenance/starboard/aft)
+"bhs" = (
+/obj/item/flashlight/lantern/on,
+/turf/open/misc/hay/icemoon,
+/area/icemoon/underground/explored)
"bht" = (
/obj/structure/closet/lasertag/red,
/obj/effect/spawner/random/contraband/permabrig_gear,
@@ -3868,10 +3846,6 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/engineering/atmos/hfr_room)
-"bil" = (
-/obj/structure/railing/wooden_fence,
-/turf/open/misc/hay/icemoon,
-/area/icemoon/underground/explored)
"bin" = (
/obj/effect/turf_decal/stripes/asteroid/line{
dir = 4
@@ -3895,14 +3869,6 @@
/obj/item/clothing/head/beanie/orange,
/turf/open/floor/iron,
/area/station/cargo/storage)
-"biI" = (
-/obj/machinery/camera/directional/west{
- c_tag = "Xenobiology Test Chamber";
- network = list("ss13","test","rd","xeno")
- },
-/obj/machinery/light/directional/west,
-/turf/open/floor/engine,
-/area/station/science/xenobiology)
"biR" = (
/obj/structure/table/glass,
/obj/item/storage/box/beakers{
@@ -4480,10 +4446,6 @@
/obj/effect/turf_decal/tile/red/half/contrasted,
/turf/open/floor/iron,
/area/station/security/brig/upper)
-"bqX" = (
-/obj/machinery/air_sensor/ordnance_burn_chamber,
-/turf/open/floor/engine/vacuum,
-/area/station/science/ordnance/burnchamber)
"bqY" = (
/obj/structure/closet,
/obj/effect/spawner/random/maintenance/two,
@@ -4575,15 +4537,6 @@
},
/turf/open/floor/plating,
/area/mine/eva/lower)
-"bsc" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/cable,
-/obj/structure/table,
-/obj/machinery/cell_charger,
-/obj/item/stock_parts/power_store/cell/high,
-/obj/item/stock_parts/power_store/cell/high,
-/turf/open/floor/iron,
-/area/station/maintenance/department/electrical)
"bsd" = (
/obj/structure/chair/stool/directional/south,
/obj/structure/sign/poster/official/obey/directional/north,
@@ -5088,6 +5041,12 @@
/obj/structure/girder,
/turf/open/floor/plating,
/area/station/maintenance/fore)
+"byV" = (
+/obj/structure/railing/wooden_fence{
+ dir = 8
+ },
+/turf/open/misc/hay/icemoon,
+/area/icemoon/underground/explored)
"bzc" = (
/obj/machinery/status_display/evac/directional/east,
/obj/effect/turf_decal/tile/blue,
@@ -5234,6 +5193,16 @@
},
/turf/open/floor/iron,
/area/station/command/heads_quarters/ce)
+"bAW" = (
+/obj/machinery/light_switch/directional/north{
+ pixel_x = -7
+ },
+/obj/structure/table,
+/obj/item/stock_parts/power_store/cell/high/empty,
+/obj/machinery/cell_charger,
+/obj/effect/turf_decal/tile/brown/fourcorners,
+/turf/open/floor/iron/dark,
+/area/station/engineering/lobby)
"bAX" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/plating,
@@ -5674,12 +5643,6 @@
/obj/structure/sign/departments/xenobio/directional/south,
/turf/open/floor/plating,
/area/station/science/xenobiology)
-"bGD" = (
-/obj/structure/table/reinforced,
-/obj/structure/reagent_dispensers/wall/peppertank/directional/east,
-/obj/effect/turf_decal/tile/red/full,
-/turf/open/floor/iron/dark/smooth_large,
-/area/station/security/checkpoint/medical)
"bGP" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
/obj/effect/turf_decal/tile/brown/half/contrasted{
@@ -5762,21 +5725,6 @@
dir = 4
},
/area/station/ai_monitored/command/storage/eva)
-"bId" = (
-/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{
- dir = 4
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/obj/machinery/door/firedoor/heavy,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/power/apc/auto_name/directional/north{
- areastring = "/area/station/science/ordnance/burnchamber"
- },
-/obj/structure/cable,
-/turf/open/floor/iron/dark,
-/area/station/science/ordnance)
"bIl" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
@@ -6249,17 +6197,6 @@
},
/turf/open/floor/engine,
/area/station/engineering/atmos/hfr_room)
-"bOy" = (
-/obj/structure/window/reinforced/spawner/directional/north{
- layer = 2.9
- },
-/obj/effect/spawner/random/vending/snackvend,
-/obj/machinery/camera/directional/east{
- c_tag = "Engineering Lobby"
- },
-/obj/structure/extinguisher_cabinet/directional/east,
-/turf/open/floor/iron/dark,
-/area/station/engineering/lobby)
"bOz" = (
/obj/effect/spawner/structure/window/hollow/reinforced/middle{
dir = 1
@@ -6275,12 +6212,6 @@
},
/turf/open/floor/iron/white,
/area/station/medical/chemistry)
-"bOT" = (
-/obj/machinery/atmospherics/components/unary/outlet_injector/on{
- dir = 4
- },
-/turf/open/floor/engine,
-/area/station/science/xenobiology)
"bOX" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -6372,12 +6303,6 @@
/obj/effect/turf_decal/tile/green/full,
/turf/open/floor/iron/dark/smooth_large,
/area/station/medical/virology)
-"bPR" = (
-/obj/structure/railing/wooden_fence{
- dir = 1
- },
-/turf/open/misc/hay/icemoon,
-/area/icemoon/underground/explored)
"bPV" = (
/obj/item/kirbyplants/random/dead,
/turf/open/floor/plating/snowed/icemoon,
@@ -7155,16 +7080,6 @@
},
/turf/open/floor/iron,
/area/station/science/lab)
-"cbP" = (
-/obj/machinery/button/door/directional/east{
- id = "xenobio9";
- layer = 4;
- name = "Xenobio Pen 9 Blast DOors";
- req_access = list("xenobiology")
- },
-/obj/machinery/light/floor,
-/turf/open/floor/iron/white,
-/area/station/science/xenobiology)
"ccg" = (
/obj/machinery/light/directional/west,
/obj/effect/turf_decal/tile/yellow/opposingcorners,
@@ -7775,11 +7690,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/dark,
/area/station/engineering/supermatter/room)
-"cku" = (
-/obj/effect/landmark/event_spawn,
-/obj/effect/spawner/random/engineering/tracking_beacon,
-/turf/open/floor/engine,
-/area/station/science/xenobiology)
"ckN" = (
/obj/structure/cable,
/obj/machinery/newscaster/directional/south,
@@ -7885,6 +7795,17 @@
},
/turf/open/floor/iron,
/area/station/science/ordnance/testlab)
+"clX" = (
+/obj/structure/rack,
+/obj/item/lighter,
+/obj/item/clothing/glasses/meson{
+ pixel_y = 4
+ },
+/obj/item/stock_parts/power_store/cell/high,
+/obj/item/reagent_containers/pill/patch/aiuri,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/turf/open/floor/iron/dark,
+/area/station/command/heads_quarters/ce)
"clY" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -8074,6 +7995,14 @@
/obj/machinery/light/small/directional/south,
/turf/open/floor/plating,
/area/station/maintenance/fore)
+"coy" = (
+/obj/structure/table/wood,
+/obj/item/clothing/mask/fakemoustache,
+/obj/item/cigarette/pipe,
+/obj/item/clothing/glasses/monocle,
+/obj/item/radio/intercom/directional/north,
+/turf/open/floor/iron/grimy,
+/area/station/service/theater)
"coT" = (
/obj/structure/table,
/obj/item/storage/wallet,
@@ -8264,6 +8193,20 @@
/obj/item/radio/intercom/directional/east,
/turf/open/floor/iron/white,
/area/station/science/genetics)
+"crH" = (
+/obj/effect/turf_decal/tile/blue/half/contrasted{
+ dir = 8
+ },
+/obj/machinery/light/small/directional/west,
+/obj/machinery/requests_console/directional/west{
+ department = "Head of Personnel's Desk";
+ name = "Head of Personnel's Requests Console"
+ },
+/obj/effect/mapping_helpers/requests_console/assistance,
+/obj/effect/mapping_helpers/requests_console/announcement,
+/obj/effect/mapping_helpers/requests_console/information,
+/turf/open/floor/iron,
+/area/station/command/heads_quarters/hop)
"crO" = (
/obj/effect/turf_decal/siding/wood,
/obj/structure/railing/corner/end/flip{
@@ -8441,10 +8384,6 @@
/obj/machinery/light/small/directional/west,
/turf/open/floor/wood,
/area/station/commons/vacant_room/office)
-"cuB" = (
-/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/ordnance_burn_chamber_input,
-/turf/open/floor/engine/vacuum,
-/area/station/science/ordnance/burnchamber)
"cuJ" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
dir = 4
@@ -9393,6 +9332,15 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/plating,
/area/station/maintenance/port/greater)
+"cHu" = (
+/obj/machinery/camera/directional/east{
+ c_tag = "Security Post - Engineering"
+ },
+/obj/structure/cable,
+/obj/effect/turf_decal/tile/red,
+/obj/machinery/computer/security/telescreen/engine/directional/east,
+/turf/open/floor/iron/dark,
+/area/station/security/checkpoint/engineering)
"cHB" = (
/obj/machinery/vending/autodrobe,
/turf/open/floor/plating,
@@ -9523,6 +9471,12 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/pink,
/turf/open/floor/plating,
/area/station/maintenance/port/fore)
+"cKg" = (
+/obj/structure/table,
+/turf/open/floor/iron/dark/textured_edge{
+ dir = 8
+ },
+/area/station/security/brig/entrance)
"cKk" = (
/obj/machinery/status_display/evac/directional/north,
/obj/machinery/light/directional/north,
@@ -9870,6 +9824,14 @@
/obj/effect/mapping_helpers/airlock/unres,
/turf/open/floor/plating,
/area/station/maintenance/starboard/fore)
+"cOY" = (
+/obj/structure/table,
+/obj/machinery/cell_charger,
+/obj/item/stock_parts/power_store/cell/potato{
+ name = "\improper Beepsky's emergency battery"
+ },
+/turf/open/floor/plating,
+/area/station/maintenance/fore)
"cPd" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -10271,6 +10233,27 @@
},
/turf/open/floor/wood/parquet,
/area/station/service/theater)
+"cWn" = (
+/obj/effect/turf_decal/bot{
+ dir = 1
+ },
+/obj/structure/table,
+/obj/item/clothing/gloves/color/yellow,
+/obj/item/clothing/gloves/color/yellow,
+/obj/item/clothing/gloves/color/yellow,
+/obj/item/clothing/gloves/color/yellow,
+/obj/item/clothing/gloves/color/yellow,
+/obj/structure/cable,
+/obj/item/mod/module/plasma_stabilizer,
+/obj/item/stock_parts/power_store/cell/emproof{
+ pixel_x = -4;
+ pixel_y = -1
+ },
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/item/mod/module/signlang_radio,
+/obj/item/mod/module/thermal_regulator,
+/turf/open/floor/iron/dark,
+/area/station/engineering/engine_smes)
"cWq" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
/obj/effect/turf_decal/tile/green/half/contrasted{
@@ -11133,6 +11116,21 @@
"diC" = (
/turf/open/floor/iron/dark/textured,
/area/station/ai_monitored/security/armory/upper)
+"diE" = (
+/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{
+ dir = 4
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/machinery/door/firedoor/heavy,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/power/apc/auto_name/directional/north{
+ areastring = "/area/station/science/ordnance/burnchamber"
+ },
+/obj/structure/cable,
+/turf/open/floor/iron/dark,
+/area/station/science/ordnance)
"diI" = (
/obj/machinery/mech_bay_recharge_port,
/obj/item/radio/intercom/directional/south,
@@ -11264,17 +11262,6 @@
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/iron,
/area/station/science/robotics/lab)
-"dkB" = (
-/obj/structure/rack,
-/obj/structure/window/reinforced/spawner/directional/north{
- layer = 2.9
- },
-/obj/effect/turf_decal/tile/red/anticorner/contrasted{
- dir = 4
- },
-/obj/effect/spawner/random/armory/shotgun,
-/turf/open/floor/iron/dark/textured,
-/area/station/ai_monitored/security/armory)
"dkK" = (
/obj/structure/railing/corner,
/obj/effect/turf_decal/stripes/line,
@@ -11319,9 +11306,6 @@
/obj/structure/marker_beacon/burgundy,
/turf/open/floor/plating/snowed/icemoon,
/area/icemoon/surface/outdoors/nospawn)
-"dlu" = (
-/turf/closed/wall/mineral/wood/nonmetal,
-/area/icemoon/underground/explored)
"dlB" = (
/obj/structure/table/wood,
/obj/item/storage/photo_album/chapel,
@@ -11346,17 +11330,6 @@
},
/turf/open/floor/plating,
/area/station/construction)
-"dmj" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible,
-/obj/machinery/button/door/directional/east{
- id = "xenobio11";
- layer = 4;
- name = "Xenobio Pen 11 Blast DOors";
- req_access = list("xenobiology")
- },
-/obj/structure/cable,
-/turf/open/floor/iron/white,
-/area/station/science/xenobiology)
"dmk" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/railing{
@@ -11490,15 +11463,6 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/turret_protected/aisat_interior)
-"doK" = (
-/obj/machinery/button/door/directional/east{
- id = "xenobio8";
- layer = 4;
- name = "Xenobio Pen 8 Blast DOors";
- req_access = list("xenobiology")
- },
-/turf/open/floor/iron/white,
-/area/station/science/xenobiology)
"doM" = (
/obj/structure/table,
/obj/item/paper{
@@ -11511,6 +11475,34 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/wood/large,
/area/mine/eva/lower)
+"doO" = (
+/obj/structure/table,
+/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/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/item/radio/headset/headset_sci{
+ pixel_x = -3
+ },
+/obj/machinery/newscaster/directional/east,
+/obj/machinery/light/directional/east,
+/turf/open/floor/iron,
+/area/station/science/robotics/lab)
"doW" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -11891,16 +11883,6 @@
/obj/effect/mapping_helpers/airlock/access/all/engineering/engine_equipment,
/turf/open/floor/iron,
/area/station/engineering/engine_smes)
-"dtq" = (
-/obj/structure/table/wood,
-/obj/machinery/computer/security/telescreen/prison/directional/north,
-/obj/effect/decal/cleanable/cobweb/cobweb2,
-/obj/machinery/fax{
- fax_name = "Law Office";
- name = "Law Office Fax Machine"
- },
-/turf/open/floor/wood,
-/area/station/service/lawoffice)
"dtr" = (
/obj/machinery/computer/records/medical,
/obj/effect/turf_decal/tile/green/anticorner/contrasted,
@@ -12799,6 +12781,14 @@
},
/turf/open/floor/iron/dark/textured_edge,
/area/station/security/prison)
+"dHx" = (
+/obj/machinery/computer/station_alert{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/machinery/computer/security/telescreen/ce/directional/west,
+/turf/open/floor/iron/dark,
+/area/station/command/heads_quarters/ce)
"dHJ" = (
/obj/structure/cable/multilayer/multiz,
/obj/effect/turf_decal/stripes/line,
@@ -12923,22 +12913,6 @@
/obj/effect/turf_decal/tile/yellow,
/turf/open/floor/iron,
/area/station/tcommsat/computer)
-"dKr" = (
-/obj/structure/table,
-/obj/machinery/computer/security/telescreen/isolation/directional/south,
-/obj/item/clothing/suit/jacket/straight_jacket,
-/obj/item/clothing/suit/jacket/straight_jacket{
- pixel_x = 6
- },
-/obj/machinery/camera/directional/east{
- c_tag = "Security - Permabrig Prep";
- network = list("ss13","prison");
- view_range = 5
- },
-/obj/structure/cable,
-/obj/machinery/light/small/directional/east,
-/turf/open/floor/iron/smooth,
-/area/station/security/execution/transfer)
"dKy" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/door/poddoor/preopen{
@@ -13044,6 +13018,21 @@
/obj/effect/spawner/random/food_or_drink/donkpockets,
/turf/open/floor/iron,
/area/mine/laborcamp)
+"dLS" = (
+/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/ordnance_burn_chamber_input,
+/turf/open/floor/engine/vacuum,
+/area/station/science/ordnance/burnchamber)
+"dMb" = (
+/obj/machinery/door/airlock/research/glass/incinerator/ordmix_interior{
+ name = "Burn Chamber Interior Airlock"
+ },
+/obj/effect/mapping_helpers/airlock/locked,
+/obj/machinery/airlock_controller/incinerator_ordmix{
+ pixel_x = 24
+ },
+/obj/effect/mapping_helpers/airlock/access/all/science/ordnance,
+/turf/open/floor/engine,
+/area/station/science/ordnance/burnchamber)
"dMp" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -13057,20 +13046,6 @@
/obj/item/clothing/under/color/rainbow,
/turf/open/floor/plating,
/area/station/maintenance/port/greater)
-"dMB" = (
-/obj/vehicle/ridden/wheelchair{
- dir = 4
- },
-/obj/effect/turf_decal/trimline/blue/filled/end{
- dir = 1
- },
-/obj/structure/window/reinforced/spawner/directional/north{
- layer = 2.9
- },
-/obj/item/radio/intercom/directional/west,
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/iron/large,
-/area/station/medical/medbay/aft)
"dMH" = (
/obj/machinery/light/directional/north,
/obj/machinery/status_display/evac/directional/north,
@@ -13958,6 +13933,10 @@
/obj/effect/mapping_helpers/airlock/access/all/science/genetics,
/turf/open/floor/iron,
/area/station/science/genetics)
+"ecx" = (
+/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible,
+/turf/closed/wall/r_wall,
+/area/station/science/ordnance/burnchamber)
"ecJ" = (
/obj/effect/landmark/blobstart,
/obj/structure/cable,
@@ -15205,10 +15184,6 @@
"evb" = (
/turf/open/floor/iron,
/area/station/service/janitor)
-"evc" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on,
-/turf/open/floor/engine/vacuum,
-/area/station/science/ordnance/burnchamber)
"evk" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -15699,6 +15674,15 @@
/obj/machinery/door/firedoor,
/turf/open/floor/iron/smooth_large,
/area/station/command/heads_quarters/hos)
+"eEg" = (
+/obj/machinery/button/door/directional/east{
+ id = "xenobio9";
+ name = "Xenobio Pen 9 Blast DOors";
+ req_access = list("xenobiology")
+ },
+/obj/machinery/light/floor,
+/turf/open/floor/iron/white,
+/area/station/science/xenobiology)
"eEh" = (
/obj/structure/table/reinforced,
/obj/item/storage/toolbox/mechanical,
@@ -15710,19 +15694,6 @@
/obj/item/flashlight,
/turf/open/floor/engine,
/area/station/engineering/supermatter/room)
-"eEm" = (
-/obj/structure/closet/crate,
-/obj/item/stack/sheet/iron/fifty,
-/obj/item/stack/rods/fifty,
-/obj/item/stack/sheet/glass/fifty,
-/obj/item/electronics/airlock,
-/obj/item/electronics/airlock,
-/obj/item/stock_parts/power_store/cell/high,
-/obj/item/stack/sheet/mineral/plasma{
- amount = 30
- },
-/turf/open/floor/plating,
-/area/station/engineering/engine_smes)
"eEr" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/sign/warning/directional/south,
@@ -16068,10 +16039,6 @@
dir = 8
},
/area/station/maintenance/port/fore)
-"eLb" = (
-/obj/machinery/iv_drip,
-/turf/open/floor/engine,
-/area/station/science/xenobiology)
"eLl" = (
/obj/structure/disposalpipe/segment{
dir = 5
@@ -16292,10 +16259,6 @@
dir = 4
},
/area/station/ai_monitored/command/storage/eva)
-"eOS" = (
-/obj/structure/table,
-/turf/open/floor/engine,
-/area/station/science/xenobiology)
"ePd" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/structure/grille/broken,
@@ -16890,6 +16853,12 @@
/obj/structure/table/wood,
/turf/open/floor/carpet,
/area/station/command/meeting_room)
+"eYU" = (
+/obj/structure/table,
+/obj/machinery/cell_charger,
+/obj/item/stock_parts/power_store/cell/high/empty,
+/turf/open/floor/iron/dark,
+/area/station/engineering/storage)
"eYX" = (
/obj/effect/turf_decal/trimline/green/filled/corner{
dir = 1
@@ -17101,9 +17070,6 @@
},
/turf/open/floor/iron,
/area/station/engineering/main)
-"fcj" = (
-/turf/closed/wall/r_wall,
-/area/station/science/ordnance/burnchamber)
"fco" = (
/obj/effect/turf_decal/tile/bar/opposingcorners,
/obj/effect/turf_decal/siding/wood{
@@ -17318,6 +17284,14 @@
},
/turf/open/floor/plating,
/area/station/maintenance/fore)
+"fgB" = (
+/obj/machinery/button/door/directional/east{
+ id = "xenobio8";
+ name = "Xenobio Pen 8 Blast DOors";
+ req_access = list("xenobiology")
+ },
+/turf/open/floor/iron/white,
+/area/station/science/xenobiology)
"fgJ" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/structure/cable,
@@ -18467,18 +18441,6 @@
},
/turf/open/floor/iron/dark,
/area/station/engineering/supermatter/room)
-"fyT" = (
-/obj/structure/table,
-/obj/machinery/cell_charger{
- pixel_y = 3
- },
-/obj/item/stock_parts/power_store/cell/high{
- pixel_y = 3
- },
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
-/obj/machinery/airalarm/directional/north,
-/turf/open/floor/iron/textured,
-/area/mine/mechbay)
"fyZ" = (
/obj/machinery/status_display/evac/directional/north,
/turf/open/floor/iron,
@@ -18594,6 +18556,15 @@
},
/turf/open/floor/plating,
/area/station/cargo/drone_bay)
+"fBk" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/machinery/light/directional/west,
+/obj/item/kirbyplants/random/dead/research_director,
+/obj/machinery/computer/security/telescreen/rd/directional/west,
+/turf/open/floor/iron/smooth_half,
+/area/station/command/heads_quarters/rd)
"fBs" = (
/obj/structure/table,
/obj/item/paper,
@@ -18698,10 +18669,6 @@
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/station/medical/medbay/lobby)
-"fCS" = (
-/obj/machinery/door/poddoor/incinerator_ordmix,
-/turf/open/floor/engine/vacuum,
-/area/station/science/ordnance/burnchamber)
"fCW" = (
/obj/structure/extinguisher_cabinet/directional/east,
/turf/open/floor/iron/dark/textured,
@@ -18750,15 +18717,6 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/service/janitor)
-"fDM" = (
-/obj/machinery/camera/directional/east{
- c_tag = "Security Post - Engineering"
- },
-/obj/structure/cable,
-/obj/effect/turf_decal/tile/red,
-/obj/machinery/computer/security/telescreen/engine/directional/east,
-/turf/open/floor/iron/dark,
-/area/station/security/checkpoint/engineering)
"fDP" = (
/obj/structure/cable,
/obj/item/radio/intercom/prison/directional/north,
@@ -19265,14 +19223,6 @@
/obj/machinery/duct,
/turf/open/floor/iron,
/area/station/service/hydroponics)
-"fLH" = (
-/obj/machinery/computer/station_alert{
- dir = 4
- },
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/machinery/computer/security/telescreen/ce/directional/west,
-/turf/open/floor/iron/dark,
-/area/station/command/heads_quarters/ce)
"fLK" = (
/obj/structure/railing/corner{
dir = 8
@@ -19496,13 +19446,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/smooth_large,
/area/station/cargo/warehouse)
-"fPO" = (
-/obj/machinery/light/small/directional/north,
-/obj/machinery/computer/security/telescreen/test_chamber/directional/north,
-/turf/open/floor/iron/white/side{
- dir = 1
- },
-/area/station/command/heads_quarters/rd)
"fPP" = (
/obj/structure/cable,
/obj/structure/disposalpipe/segment{
@@ -19582,12 +19525,25 @@
dir = 1
},
/area/station/security/prison)
-"fQU" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 6
+"fQP" = (
+/obj/structure/table,
+/obj/item/stack/sheet/glass,
+/obj/item/stack/sheet/glass,
+/obj/item/stack/sheet/glass,
+/obj/item/stock_parts/matter_bin,
+/obj/item/stock_parts/matter_bin,
+/obj/item/stock_parts/scanning_module,
+/obj/item/stock_parts/scanning_module,
+/obj/structure/cable,
+/obj/machinery/power/apc/auto_name/directional/east,
+/obj/item/multitool,
+/obj/item/flatpack{
+ board = /obj/item/circuitboard/machine/flatpacker
},
-/turf/open/floor/iron,
-/area/station/engineering/engine_smes)
+/turf/open/floor/iron/white/side{
+ dir = 10
+ },
+/area/station/science/lab)
"fRb" = (
/obj/machinery/door/airlock/maintenance,
/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance,
@@ -19712,6 +19668,10 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/engineering/atmos/mix)
+"fTL" = (
+/obj/machinery/air_sensor/ordnance_burn_chamber,
+/turf/open/floor/engine/vacuum,
+/area/station/science/ordnance/burnchamber)
"fTR" = (
/obj/machinery/light/directional/north,
/obj/structure/sign/warning/electric_shock/directional/north,
@@ -19814,16 +19774,6 @@
},
/turf/open/floor/iron/white,
/area/station/medical/medbay/lobby)
-"fVC" = (
-/obj/structure/table,
-/obj/machinery/cell_charger,
-/obj/item/stock_parts/power_store/cell/high,
-/obj/machinery/ecto_sniffer{
- pixel_x = 6;
- pixel_y = 6
- },
-/turf/open/floor/iron,
-/area/station/science/robotics/lab)
"fVD" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/door/airlock/engineering{
@@ -20330,16 +20280,6 @@
/obj/machinery/power/apc/auto_name/directional/south,
/turf/open/floor/plating,
/area/station/maintenance/port/lesser)
-"gcy" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/obj/machinery/door/firedoor/heavy,
-/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/science/ordnance)
"gcB" = (
/obj/item/pickaxe/improvised{
pixel_x = 7
@@ -20623,12 +20563,6 @@
/obj/structure/closet/crate,
/turf/open/floor/plating,
/area/station/maintenance/department/medical/central)
-"ghA" = (
-/obj/structure/railing/wooden_fence{
- dir = 5
- },
-/turf/open/misc/hay/icemoon,
-/area/icemoon/underground/explored)
"ghE" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/camera/directional/west{
@@ -21002,6 +20936,17 @@
/obj/machinery/food_cart,
/turf/open/floor/iron/freezer,
/area/station/service/kitchen/coldroom)
+"gmv" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/table,
+/obj/item/cigarette{
+ pixel_x = 6;
+ pixel_y = 12
+ },
+/turf/open/floor/iron,
+/area/mine/eva)
"gmJ" = (
/obj/machinery/atmospherics/components/binary/pump{
name = "Port to Infiltrate/Filter"
@@ -21182,6 +21127,30 @@
/obj/machinery/firealarm/directional/south,
/turf/open/floor/iron/grimy,
/area/station/security/detectives_office)
+"gpS" = (
+/obj/machinery/camera/directional/west{
+ c_tag = "Cargo Bay Receiving Dock"
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/machinery/computer/cargo{
+ dir = 4
+ },
+/obj/machinery/button/door/directional/west{
+ id = "QMLoaddoor";
+ name = "Loading Doors";
+ pixel_y = -8;
+ req_access = list("cargo")
+ },
+/obj/machinery/button/door/directional/west{
+ id = "QMLoaddoor2";
+ name = "Loading Doors";
+ pixel_y = 8;
+ req_access = list("cargo")
+ },
+/turf/open/floor/iron,
+/area/station/cargo/storage)
"gpU" = (
/obj/structure/frame/computer,
/obj/item/stack/cable_coil/five,
@@ -21807,6 +21776,27 @@
/obj/effect/landmark/generic_maintenance_landmark,
/turf/open/floor/plating,
/area/station/maintenance/port/aft)
+"gBg" = (
+/obj/structure/table/glass,
+/obj/item/assembly/signaler{
+ pixel_x = 6;
+ pixel_y = 5
+ },
+/obj/item/reagent_containers/dropper{
+ pixel_x = -4;
+ pixel_y = 4
+ },
+/obj/item/stock_parts/power_store/cell/high,
+/obj/item/stack/cable_coil,
+/obj/item/pen{
+ pixel_x = -5;
+ pixel_y = 3
+ },
+/obj/machinery/newscaster/directional/west,
+/turf/open/floor/iron/cafeteria{
+ dir = 8
+ },
+/area/station/science/research)
"gBl" = (
/obj/structure/sign/warning/electric_shock,
/turf/closed/wall/r_wall,
@@ -22023,12 +22013,6 @@
},
/turf/open/misc/asteroid/snow/icemoon,
/area/icemoon/surface/outdoors/nospawn)
-"gEe" = (
-/obj/structure/table,
-/obj/item/binoculars,
-/obj/machinery/computer/security/telescreen/ordnance/directional/north,
-/turf/open/floor/iron,
-/area/station/science/ordnance/testlab)
"gEl" = (
/obj/machinery/door/airlock/maintenance,
/obj/effect/mapping_helpers/airlock/access/any/service/maintenance,
@@ -22379,34 +22363,6 @@
"gIY" = (
/turf/closed/wall,
/area/station/medical/medbay/central)
-"gJi" = (
-/obj/structure/table,
-/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/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/item/radio/headset/headset_sci{
- pixel_x = -3
- },
-/obj/machinery/newscaster/directional/east,
-/obj/machinery/light/directional/east,
-/turf/open/floor/iron,
-/area/station/science/robotics/lab)
"gJs" = (
/obj/machinery/portable_atmospherics/canister,
/obj/structure/disposalpipe/segment,
@@ -22568,6 +22524,16 @@
},
/turf/open/floor/iron/dark/textured,
/area/station/hallway/primary/central)
+"gMI" = (
+/obj/structure/disposaloutlet{
+ dir = 8
+ },
+/obj/structure/disposalpipe/trunk{
+ dir = 4
+ },
+/obj/structure/sign/warning/gas_mask/directional/north,
+/turf/open/floor/engine/xenobio,
+/area/station/science/xenobiology)
"gMK" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -23018,19 +22984,6 @@
/obj/effect/turf_decal/tile/brown/half/contrasted,
/turf/open/floor/iron/dark/side,
/area/mine/eva/lower)
-"gSQ" = (
-/obj/structure/table,
-/obj/item/crowbar/red,
-/obj/item/stock_parts/power_store/cell/high{
- pixel_x = 6;
- pixel_y = -3
- },
-/obj/structure/sign/poster/random/directional/west,
-/obj/effect/turf_decal/tile/yellow/anticorner/contrasted{
- dir = 8
- },
-/turf/open/floor/iron,
-/area/station/hallway/primary/aft)
"gSU" = (
/obj/item/popsicle_stick{
pixel_y = 1;
@@ -23063,22 +23016,6 @@
/obj/machinery/light/directional/west,
/turf/open/floor/plating,
/area/station/cargo/storage)
-"gTi" = (
-/obj/machinery/door/airlock/medical/glass{
- name = "Medbay Chemistry Access"
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/door/firedoor,
-/obj/structure/cable,
-/obj/effect/turf_decal/stripes/line,
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/obj/effect/mapping_helpers/airlock/access/all/medical/general,
-/obj/effect/turf_decal/tile/yellow/full,
-/turf/open/floor/iron/large,
-/area/station/medical/treatment_center)
"gTq" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -23155,15 +23092,6 @@
/obj/structure/sign/poster/contraband/random/directional/east,
/turf/open/floor/plating,
/area/station/maintenance/starboard/aft)
-"gUX" = (
-/obj/effect/turf_decal/trimline/purple/filled/warning{
- dir = 8
- },
-/obj/machinery/computer/security/telescreen/test_chamber/directional/east{
- name = "Xenobio Monitor"
- },
-/turf/open/floor/iron/white,
-/area/station/science/xenobiology)
"gUY" = (
/obj/machinery/power/apc/auto_name/directional/north,
/obj/structure/cable,
@@ -23763,21 +23691,6 @@
/obj/effect/spawner/random/engineering/canister,
/turf/open/floor/plating,
/area/station/maintenance/port/fore)
-"hek" = (
-/obj/structure/table,
-/obj/item/stack/sheet/glass,
-/obj/item/stack/sheet/glass,
-/obj/item/stack/sheet/glass,
-/obj/item/stock_parts/matter_bin,
-/obj/item/stock_parts/matter_bin,
-/obj/item/stock_parts/scanning_module,
-/obj/item/stock_parts/scanning_module,
-/obj/structure/cable,
-/obj/machinery/power/apc/auto_name/directional/east,
-/turf/open/floor/iron/white/side{
- dir = 10
- },
-/area/station/science/lab)
"het" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/structure/sign/warning/gas_mask,
@@ -23798,6 +23711,9 @@
/obj/effect/mapping_helpers/airlock/access/all/supply/mining,
/turf/open/floor/iron/smooth,
/area/mine/mechbay)
+"heF" = (
+/turf/open/floor/engine/xenobio,
+/area/station/science/xenobiology)
"heG" = (
/obj/structure/window/reinforced/spawner/directional/east,
/obj/machinery/computer/gateway_control,
@@ -24232,6 +24148,19 @@
/obj/item/paper,
/turf/open/floor/iron,
/area/station/security/checkpoint/customs/auxiliary)
+"hmy" = (
+/obj/machinery/button/door/directional/east{
+ id = "cmoprivacy";
+ name = "CMO Shutter Control";
+ pixel_y = 23;
+ req_access = list("cmo")
+ },
+/obj/effect/turf_decal/trimline/blue/filled/line{
+ dir = 4
+ },
+/obj/machinery/computer/security/telescreen/cmo/directional/east,
+/turf/open/floor/iron/dark,
+/area/station/command/heads_quarters/cmo)
"hmX" = (
/obj/machinery/atmospherics/pipe/multiz/supply/visible/layer4{
color = "#0000ff";
@@ -24247,6 +24176,12 @@
/obj/structure/mirror/directional/east,
/turf/open/floor/iron/freezer,
/area/station/commons/toilet/locker)
+"hnc" = (
+/obj/structure/railing/wooden_fence{
+ dir = 9
+ },
+/turf/open/misc/hay/icemoon,
+/area/icemoon/underground/explored)
"hnd" = (
/obj/effect/mapping_helpers/burnt_floor,
/turf/open/floor/plating,
@@ -24321,6 +24256,12 @@
/obj/machinery/hydroponics/constructable,
/turf/open/floor/iron/dark,
/area/station/service/hydroponics)
+"hop" = (
+/obj/structure/railing/wooden_fence{
+ dir = 6
+ },
+/turf/open/misc/hay/icemoon,
+/area/icemoon/underground/explored)
"hos" = (
/obj/structure/disposalpipe/trunk/multiz/down{
dir = 1
@@ -24696,6 +24637,12 @@
/obj/structure/tank_holder/oxygen,
/turf/open/floor/plating,
/area/station/maintenance/port/greater)
+"hsU" = (
+/obj/structure/railing/wooden_fence{
+ dir = 4
+ },
+/turf/open/misc/hay/icemoon,
+/area/icemoon/underground/explored)
"htd" = (
/obj/structure/sign/warning/docking/directional/north,
/turf/open/misc/asteroid/snow/icemoon,
@@ -24774,13 +24721,6 @@
/obj/machinery/vending/autodrobe/all_access,
/turf/open/floor/iron,
/area/station/commons/locker)
-"hut" = (
-/obj/structure/table/reinforced,
-/obj/machinery/cell_charger,
-/obj/item/stock_parts/power_store/cell/high,
-/obj/item/rcl/pre_loaded,
-/turf/open/floor/iron,
-/area/station/command/heads_quarters/ce)
"huB" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -24943,6 +24883,9 @@
},
/turf/open/floor/iron,
/area/station/cargo/office)
+"hwL" = (
+/turf/open/misc/hay/icemoon,
+/area/icemoon/underground/explored)
"hwR" = (
/obj/machinery/camera/directional/west{
c_tag = "Security - Equipment Room"
@@ -25127,6 +25070,16 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/white/corner,
/area/station/command/heads_quarters/rd)
+"hAy" = (
+/obj/machinery/navbeacon{
+ codes_txt = "delivery;dir=1";
+ location = "Medbay"
+ },
+/obj/effect/turf_decal/bot,
+/obj/structure/window/reinforced/spawner/directional/east,
+/obj/structure/plasticflaps/opaque,
+/turf/open/floor/iron/dark,
+/area/station/maintenance/department/medical/central)
"hAG" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
dir = 1
@@ -26369,27 +26322,6 @@
/obj/machinery/status_display/evac/directional/south,
/turf/open/floor/wood,
/area/station/service/library)
-"hUf" = (
-/obj/structure/table/glass,
-/obj/item/assembly/signaler{
- pixel_x = 6;
- pixel_y = 5
- },
-/obj/item/reagent_containers/dropper{
- pixel_x = -4;
- pixel_y = 4
- },
-/obj/item/stock_parts/power_store/cell/high,
-/obj/item/stack/cable_coil,
-/obj/item/pen{
- pixel_x = -5;
- pixel_y = 3
- },
-/obj/machinery/newscaster/directional/west,
-/turf/open/floor/iron/cafeteria{
- dir = 8
- },
-/area/station/science/research)
"hUi" = (
/obj/effect/turf_decal/stripes/line{
dir = 6
@@ -26633,6 +26565,19 @@
},
/turf/open/floor/plating/snowed/icemoon,
/area/icemoon/underground/explored)
+"hYU" = (
+/obj/effect/turf_decal/siding/yellow/corner,
+/obj/machinery/status_display/evac/directional/south,
+/obj/structure/table,
+/obj/item/flatpack{
+ board = /obj/item/circuitboard/machine/flatpacker;
+ pixel_x = -5
+ },
+/obj/item/multitool{
+ pixel_x = 8
+ },
+/turf/open/floor/iron,
+/area/station/engineering/lobby)
"hZe" = (
/obj/effect/turf_decal/trimline/yellow/warning{
dir = 1
@@ -26640,6 +26585,10 @@
/obj/effect/turf_decal/trimline/yellow/warning,
/turf/open/floor/plating/snowed/icemoon,
/area/icemoon/underground/explored)
+"hZx" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on,
+/turf/open/floor/engine/vacuum,
+/area/station/science/ordnance/burnchamber)
"hZQ" = (
/obj/item/stack/sheet/iron/five,
/turf/open/floor/plating,
@@ -26665,6 +26614,12 @@
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/station/science/xenobiology)
+"ias" = (
+/obj/structure/table/reinforced,
+/obj/structure/reagent_dispensers/wall/peppertank/directional/east,
+/obj/effect/turf_decal/tile/red/full,
+/turf/open/floor/iron/dark/smooth_large,
+/area/station/security/checkpoint/medical)
"iav" = (
/obj/structure/closet/secure_closet/labor_camp_security,
/obj/effect/turf_decal/tile/red/half/contrasted,
@@ -26951,19 +26906,6 @@
/obj/effect/landmark/start/depsec/science,
/turf/open/floor/iron/dark,
/area/station/security/checkpoint/science)
-"idp" = (
-/obj/machinery/button/door/directional/east{
- id = "cmoprivacy";
- name = "CMO Shutter Control";
- pixel_y = 23;
- req_access = list("cmo")
- },
-/obj/effect/turf_decal/trimline/blue/filled/line{
- dir = 4
- },
-/obj/machinery/computer/security/telescreen/cmo/directional/east,
-/turf/open/floor/iron/dark,
-/area/station/command/heads_quarters/cmo)
"idr" = (
/obj/structure/stairs/north,
/obj/structure/railing{
@@ -26986,12 +26928,6 @@
},
/turf/open/floor/iron/smooth,
/area/station/security/holding_cell)
-"idH" = (
-/obj/structure/railing/wooden_fence{
- dir = 6
- },
-/turf/open/misc/hay/icemoon,
-/area/icemoon/underground/explored)
"idN" = (
/obj/structure/window/reinforced/spawner/directional/north,
/obj/machinery/door/window/brigdoor/left/directional/south{
@@ -27157,15 +27093,6 @@
/obj/structure/cable,
/turf/open/floor/iron/dark/textured,
/area/station/security/execution/transfer)
-"ihN" = (
-/obj/machinery/button/door/directional/west{
- id = "xenobio4";
- layer = 4;
- name = "Xenobio Pen 4 Blast Door";
- req_access = list("xenobiology")
- },
-/turf/open/floor/iron/white,
-/area/station/science/xenobiology)
"iif" = (
/obj/effect/turf_decal/tile/blue/opposingcorners,
/obj/effect/turf_decal/tile/green/opposingcorners{
@@ -27304,11 +27231,6 @@
/obj/effect/landmark/event_spawn,
/turf/open/floor/iron,
/area/station/security/brig/upper)
-"ijW" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible,
-/obj/structure/sign/warning/secure_area/directional/north,
-/turf/open/floor/iron/dark,
-/area/station/science/explab)
"ijY" = (
/obj/structure/flora/rock/icy/style_random,
/turf/open/misc/asteroid/snow/icemoon,
@@ -27521,6 +27443,10 @@
/obj/structure/falsewall,
/turf/open/floor/plating,
/area/station/maintenance/port/lesser)
+"inr" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible,
+/turf/open/floor/engine/xenobio,
+/area/station/science/xenobiology)
"int" = (
/obj/structure/disposalpipe/segment,
/obj/structure/cable,
@@ -27798,6 +27724,14 @@
/obj/item/flashlight/lamp,
/turf/open/floor/plating,
/area/station/maintenance/starboard/aft)
+"iqP" = (
+/obj/machinery/button/door/directional/west{
+ id = "xenobio5";
+ name = "Xenobio Pen 5 Blast Door";
+ req_access = list("xenobiology")
+ },
+/turf/open/floor/iron/white,
+/area/station/science/xenobiology)
"irp" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -27990,6 +27924,16 @@
},
/turf/open/misc/asteroid/snow/icemoon,
/area/icemoon/surface/outdoors/nospawn)
+"itQ" = (
+/obj/machinery/cell_charger,
+/obj/item/stock_parts/power_store/cell/high,
+/obj/item/radio/intercom/directional/north,
+/obj/structure/table/reinforced,
+/obj/effect/turf_decal/tile/neutral/half/contrasted{
+ dir = 1
+ },
+/turf/open/floor/iron/dark,
+/area/station/ai_monitored/command/storage/eva)
"itY" = (
/obj/effect/spawner/random/maintenance,
/turf/open/floor/plating/snowed/icemoon,
@@ -28131,9 +28075,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
/area/station/maintenance/port/fore)
-"iwq" = (
-/turf/open/floor/engine/vacuum,
-/area/station/science/ordnance/burnchamber)
"iwx" = (
/obj/machinery/door/airlock/maintenance{
name = "Xenobiology Maintenance"
@@ -28512,10 +28453,6 @@
dir = 4
},
/area/station/science/explab)
-"iCe" = (
-/obj/machinery/atmospherics/pipe/smart/simple/dark/visible,
-/turf/closed/wall/r_wall,
-/area/station/science/ordnance/burnchamber)
"iCg" = (
/obj/effect/turf_decal/stripes/corner{
dir = 1
@@ -29091,6 +29028,14 @@
},
/turf/open/floor/plating/snowed/smoothed/icemoon,
/area/icemoon/surface/outdoors/nospawn)
+"iMa" = (
+/obj/machinery/button/door/directional/east{
+ id = "xenobio6";
+ name = "Xenobio Pen 6 Blast DOors";
+ req_access = list("xenobiology")
+ },
+/turf/open/floor/iron/white,
+/area/station/science/xenobiology)
"iMf" = (
/obj/structure/cable,
/obj/effect/turf_decal/trimline/dark_blue/line{
@@ -29564,21 +29509,6 @@
/obj/effect/spawner/random/maintenance,
/turf/open/floor/plating,
/area/station/maintenance/department/medical/morgue)
-"iTE" = (
-/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/red/filled/line{
- dir = 4
- },
-/obj/effect/turf_decal/trimline/red/filled/corner{
- dir = 8
- },
-/obj/machinery/holopad,
-/obj/effect/landmark/start/depsec/medical,
-/obj/machinery/computer/security/telescreen/cmo/directional/east,
-/turf/open/floor/iron/dark/smooth_large,
-/area/station/security/checkpoint/medical)
"iTJ" = (
/obj/structure/table,
/obj/item/paper_bin{
@@ -30539,28 +30469,11 @@
/obj/effect/turf_decal/tile/dark/fourcorners,
/turf/open/floor/iron,
/area/mine/living_quarters)
-"jko" = (
-/obj/structure/railing,
-/obj/structure/rack,
-/obj/structure/cable,
-/obj/machinery/door/firedoor/border_only,
-/obj/effect/turf_decal/tile/red/half/contrasted{
- dir = 1
- },
-/obj/effect/spawner/random/armory/dragnet,
-/turf/open/floor/iron/dark/textured,
-/area/station/ai_monitored/security/armory/upper)
"jkH" = (
/obj/structure/training_machine,
/obj/effect/landmark/blobstart,
/turf/open/floor/engine,
/area/station/science/explab)
-"jkK" = (
-/obj/structure/railing/wooden_fence{
- dir = 9
- },
-/turf/open/misc/hay/icemoon,
-/area/icemoon/underground/explored)
"jkN" = (
/obj/effect/spawner/random/entertainment/arcade,
/obj/machinery/status_display/ai/directional/north,
@@ -30960,15 +30873,6 @@
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
/turf/open/floor/iron,
/area/station/hallway/primary/starboard)
-"jrc" = (
-/obj/machinery/button/door/directional/east{
- id = "xenobio6";
- layer = 4;
- name = "Xenobio Pen 6 Blast DOors";
- req_access = list("xenobiology")
- },
-/turf/open/floor/iron/white,
-/area/station/science/xenobiology)
"jre" = (
/turf/closed/wall,
/area/station/maintenance/starboard/lesser)
@@ -31798,6 +31702,9 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/command/nuke_storage)
+"jEa" = (
+/turf/closed/wall/mineral/wood/nonmetal,
+/area/icemoon/underground/explored)
"jEf" = (
/obj/effect/turf_decal/trimline/green/filled/line{
dir = 5
@@ -32592,18 +32499,6 @@
/obj/machinery/space_heater,
/turf/open/floor/plating,
/area/station/maintenance/aft/lesser)
-"jQt" = (
-/obj/machinery/navbeacon{
- codes_txt = "delivery;dir=1";
- location = "Medbay"
- },
-/obj/effect/turf_decal/bot,
-/obj/structure/window/reinforced/spawner/directional/east{
- layer = 2.9
- },
-/obj/structure/plasticflaps/opaque,
-/turf/open/floor/iron/dark,
-/area/station/maintenance/department/medical/central)
"jQz" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -33122,6 +33017,16 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
/turf/open/floor/plating,
/area/station/maintenance/port/aft)
+"jYT" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/machinery/door/firedoor/heavy,
+/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/science/ordnance)
"jYV" = (
/obj/effect/turf_decal/bot_white/left,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
@@ -33358,6 +33263,18 @@
/obj/effect/landmark/event_spawn,
/turf/open/floor/iron/white,
/area/station/medical/medbay/central)
+"kck" = (
+/obj/machinery/cell_charger{
+ pixel_y = 5
+ },
+/obj/item/stock_parts/power_store/cell/high{
+ pixel_y = 6
+ },
+/obj/structure/table/glass,
+/turf/open/floor/iron/white/side{
+ dir = 9
+ },
+/area/station/science/lab)
"kcm" = (
/obj/structure/rack,
/obj/effect/spawner/random/techstorage/command_all,
@@ -34986,6 +34903,12 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/central)
+"kyM" = (
+/obj/structure/table,
+/obj/item/plant_analyzer,
+/obj/item/stock_parts/power_store/cell/high,
+/turf/open/floor/plating,
+/area/station/engineering/storage/tech)
"kyU" = (
/obj/machinery/modular_computer/preset/id,
/obj/machinery/light/directional/north,
@@ -35155,6 +35078,13 @@
},
/turf/open/floor/iron,
/area/station/command/bridge)
+"kBw" = (
+/obj/structure/table/reinforced,
+/obj/machinery/cell_charger,
+/obj/item/stock_parts/power_store/cell/high,
+/obj/item/rcl/pre_loaded,
+/turf/open/floor/iron,
+/area/station/command/heads_quarters/ce)
"kBL" = (
/obj/effect/turf_decal/trimline/blue/filled/line{
dir = 1
@@ -36727,6 +36657,17 @@
},
/turf/open/floor/iron/large,
/area/station/hallway/secondary/entry)
+"kXH" = (
+/obj/structure/table,
+/obj/effect/decal/cleanable/dirt,
+/obj/item/paper_bin{
+ pixel_y = 6
+ },
+/obj/item/taperecorder{
+ pixel_x = 9
+ },
+/turf/open/floor/iron/dark,
+/area/station/science/explab)
"kXI" = (
/obj/effect/turf_decal/weather/snow/corner{
dir = 1
@@ -36811,11 +36752,6 @@
/obj/effect/landmark/event_spawn,
/turf/open/floor/iron/large,
/area/station/engineering/engine_smes)
-"kYN" = (
-/obj/structure/table/wood,
-/obj/item/flashlight/lantern/on,
-/turf/open/misc/hay/icemoon,
-/area/icemoon/underground/explored)
"kZa" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -37033,6 +36969,14 @@
/obj/structure/table/wood,
/turf/open/floor/carpet,
/area/station/commons/dorms)
+"lcQ" = (
+/obj/machinery/door/airlock/research/glass/incinerator/ordmix_exterior{
+ name = "Burn Chamber Exterior Airlock"
+ },
+/obj/effect/mapping_helpers/airlock/locked,
+/obj/effect/mapping_helpers/airlock/access/all/science/ordnance,
+/turf/open/floor/engine/vacuum,
+/area/station/science/ordnance/burnchamber)
"lcY" = (
/obj/structure/sign/poster/official/random/directional/west,
/turf/open/floor/iron/dark,
@@ -37266,15 +37210,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/catwalk_floor/iron_smooth,
/area/station/maintenance/port/fore)
-"lgP" = (
-/obj/machinery/atmospherics/components/binary/pump/on{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/layer_manifold/scrubbers/hidden{
- dir = 8
- },
-/turf/open/floor/engine,
-/area/station/science/ordnance/burnchamber)
"lgW" = (
/obj/machinery/meter/monitored/distro_loop,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/visible,
@@ -38870,6 +38805,10 @@
/obj/structure/cable,
/turf/open/floor/iron/dark,
/area/station/maintenance/disposal)
+"lFC" = (
+/obj/effect/decal/cleanable/blood/old,
+/turf/open/floor/engine/xenobio,
+/area/station/science/xenobiology)
"lFG" = (
/obj/machinery/door/airlock/engineering{
name = "Starboard Bow Solar Access"
@@ -38971,16 +38910,6 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/starboard)
-"lHm" = (
-/obj/machinery/atmospherics/components/binary/pump{
- dir = 4
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/obj/machinery/computer/security/telescreen/test_chamber/directional/north,
-/turf/open/floor/iron,
-/area/station/science/explab)
"lHr" = (
/obj/structure/stairs/north,
/turf/open/floor/iron/freezer,
@@ -39718,22 +39647,6 @@
"lSu" = (
/turf/open/floor/plating/snowed/smoothed/icemoon,
/area/icemoon/surface/outdoors/nospawn)
-"lSw" = (
-/obj/structure/tank_dispenser{
- pixel_x = -1
- },
-/obj/machinery/camera/directional/north{
- c_tag = "Atmospherics Monitoring"
- },
-/obj/structure/window/reinforced/spawner/directional/east{
- layer = 2.9
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/obj/item/radio/intercom/directional/north,
-/turf/open/floor/iron,
-/area/station/engineering/atmos/storage/gas)
"lSF" = (
/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -39856,11 +39769,6 @@
dir = 4
},
/area/station/engineering/storage_shared)
-"lVs" = (
-/obj/structure/table,
-/obj/item/clothing/mask/surgical,
-/turf/open/floor/engine,
-/area/station/science/xenobiology)
"lVt" = (
/obj/machinery/firealarm/directional/west,
/obj/machinery/light/floor,
@@ -40126,17 +40034,6 @@
/obj/structure/rack,
/turf/open/floor/iron/dark,
/area/station/engineering/supermatter/room)
-"mbb" = (
-/obj/structure/cable,
-/obj/machinery/button/door/directional/west{
- id = "xenobio1";
- layer = 4;
- name = "Xenobio Pen 1 Blast Door";
- req_access = list("xenobiology")
- },
-/obj/machinery/light/floor,
-/turf/open/floor/iron,
-/area/station/science/xenobiology)
"mbk" = (
/obj/effect/landmark/start/hangover,
/obj/effect/turf_decal/tile/blue{
@@ -40224,6 +40121,17 @@
/obj/effect/mapping_helpers/airlock/access/all/engineering/general,
/turf/open/floor/plating,
/area/station/engineering/storage_shared)
+"mci" = (
+/obj/structure/railing,
+/obj/structure/rack,
+/obj/structure/cable,
+/obj/machinery/door/firedoor/border_only,
+/obj/effect/turf_decal/tile/red/half/contrasted{
+ dir = 1
+ },
+/obj/effect/spawner/random/armory/dragnet,
+/turf/open/floor/iron/dark/textured,
+/area/station/ai_monitored/security/armory/upper)
"mco" = (
/obj/structure/closet/emcloset,
/turf/open/floor/plating,
@@ -40479,12 +40387,6 @@
},
/turf/open/floor/iron,
/area/station/ai_monitored/command/storage/eva)
-"mhj" = (
-/obj/structure/railing/wooden_fence{
- dir = 10
- },
-/turf/open/misc/hay/icemoon,
-/area/icemoon/underground/explored)
"mhq" = (
/obj/structure/closet,
/obj/effect/spawner/random/maintenance,
@@ -40881,6 +40783,20 @@
/obj/structure/lattice/catwalk,
/turf/open/openspace/icemoon,
/area/station/science/server)
+"moU" = (
+/obj/structure/tank_dispenser{
+ pixel_x = -1
+ },
+/obj/machinery/camera/directional/north{
+ c_tag = "Atmospherics Monitoring"
+ },
+/obj/structure/window/reinforced/spawner/directional/east,
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/item/radio/intercom/directional/north,
+/turf/open/floor/iron,
+/area/station/engineering/atmos/storage/gas)
"mpe" = (
/obj/structure/cable,
/obj/machinery/computer/quantum_console,
@@ -41264,6 +41180,21 @@
},
/turf/open/floor/iron,
/area/station/engineering/atmos)
+"mvZ" = (
+/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/red/filled/line{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/red/filled/corner{
+ dir = 8
+ },
+/obj/machinery/holopad,
+/obj/effect/landmark/start/depsec/medical,
+/obj/machinery/computer/security/telescreen/cmo/directional/east,
+/turf/open/floor/iron/dark/smooth_large,
+/area/station/security/checkpoint/medical)
"mwh" = (
/obj/structure/table,
/obj/item/storage/fancy/donut_box,
@@ -41333,6 +41264,14 @@
},
/turf/open/floor/iron,
/area/station/engineering/atmos)
+"mxq" = (
+/obj/machinery/button/door/directional/east{
+ id = "xenobio7";
+ name = "Xenobio Pen 7 Blast DOors";
+ req_access = list("xenobiology")
+ },
+/turf/open/floor/iron/white,
+/area/station/science/xenobiology)
"mxu" = (
/obj/machinery/digital_clock/directional/north,
/turf/open/floor/iron,
@@ -41582,6 +41521,12 @@
},
/turf/open/floor/plating/snowed/icemoon,
/area/icemoon/surface/outdoors/nospawn)
+"mBw" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 6
+ },
+/turf/open/floor/iron,
+/area/station/engineering/engine_smes)
"mBB" = (
/obj/machinery/door/poddoor/preopen{
id = "ceprivacy";
@@ -41965,17 +41910,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/plating,
/area/station/maintenance/starboard/aft)
-"mIT" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/table,
-/obj/item/cigarette{
- pixel_x = 6;
- pixel_y = 12
- },
-/turf/open/floor/iron,
-/area/mine/eva)
"mJa" = (
/obj/machinery/light/directional/east,
/obj/effect/turf_decal/tile/yellow,
@@ -42106,6 +42040,19 @@
/obj/machinery/duct,
/turf/open/floor/iron/kitchen/diagonal,
/area/station/service/kitchen)
+"mMj" = (
+/obj/structure/closet/crate,
+/obj/item/stack/sheet/iron/fifty,
+/obj/item/stack/rods/fifty,
+/obj/item/stack/sheet/glass/fifty,
+/obj/item/electronics/airlock,
+/obj/item/electronics/airlock,
+/obj/item/stock_parts/power_store/cell/high,
+/obj/item/stack/sheet/mineral/plasma{
+ amount = 30
+ },
+/turf/open/floor/plating,
+/area/station/engineering/engine_smes)
"mMk" = (
/obj/machinery/telecomms/message_server/preset,
/turf/open/floor/iron/dark/telecomms,
@@ -42259,6 +42206,18 @@
},
/turf/open/floor/iron,
/area/station/commons/vacant_room/commissary)
+"mPi" = (
+/obj/vehicle/ridden/wheelchair{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/blue/filled/end{
+ dir = 1
+ },
+/obj/structure/window/reinforced/spawner/directional/north,
+/obj/item/radio/intercom/directional/west,
+/obj/structure/disposalpipe/segment,
+/turf/open/floor/iron/large,
+/area/station/medical/medbay/aft)
"mPq" = (
/obj/machinery/light/small/directional/north,
/turf/open/floor/plating/snowed/smoothed/icemoon,
@@ -42365,6 +42324,15 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/iron/white,
/area/station/science/xenobiology)
+"mRd" = (
+/obj/structure/rack,
+/obj/structure/window/reinforced/spawner/directional/north,
+/obj/effect/turf_decal/tile/red/anticorner/contrasted{
+ dir = 4
+ },
+/obj/effect/spawner/random/armory/shotgun,
+/turf/open/floor/iron/dark/textured,
+/area/station/ai_monitored/security/armory)
"mRr" = (
/obj/structure/cable,
/obj/effect/decal/cleanable/dirt,
@@ -43200,17 +43168,6 @@
/obj/item/kirbyplants/random,
/turf/open/floor/iron,
/area/station/commons/locker)
-"ncx" = (
-/obj/structure/table/wood,
-/obj/item/soap/deluxe{
- pixel_y = 11
- },
-/obj/item/soap/deluxe{
- pixel_y = 6
- },
-/obj/item/soap/deluxe,
-/turf/open/misc/hay/icemoon,
-/area/icemoon/underground/explored)
"ncB" = (
/obj/machinery/door/airlock/security/glass{
name = "Brig Walkway"
@@ -43419,27 +43376,6 @@
/obj/machinery/meter,
/turf/open/floor/engine,
/area/station/engineering/supermatter/room)
-"neV" = (
-/obj/effect/turf_decal/bot{
- dir = 1
- },
-/obj/structure/table,
-/obj/item/clothing/gloves/color/yellow,
-/obj/item/clothing/gloves/color/yellow,
-/obj/item/clothing/gloves/color/yellow,
-/obj/item/clothing/gloves/color/yellow,
-/obj/item/clothing/gloves/color/yellow,
-/obj/structure/cable,
-/obj/item/mod/module/plasma_stabilizer,
-/obj/item/stock_parts/power_store/cell/emproof{
- pixel_x = -4;
- pixel_y = -1
- },
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/item/mod/module/signlang_radio,
-/obj/item/mod/module/thermal_regulator,
-/turf/open/floor/iron/dark,
-/area/station/engineering/engine_smes)
"nfd" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/firealarm/directional/west,
@@ -43628,6 +43564,25 @@
},
/turf/open/floor/plating,
/area/mine/laborcamp)
+"nhY" = (
+/obj/structure/window/reinforced/spawner/directional/north,
+/obj/structure/table/reinforced,
+/obj/item/stack/wrapping_paper{
+ pixel_x = 3;
+ pixel_y = 4
+ },
+/obj/item/stack/package_wrap{
+ pixel_x = -1;
+ pixel_y = -1
+ },
+/obj/item/dest_tagger,
+/obj/effect/turf_decal/tile/brown/half/contrasted{
+ dir = 1
+ },
+/obj/machinery/power/apc/auto_name/directional/east,
+/obj/structure/cable,
+/turf/open/floor/iron,
+/area/station/cargo/sorting)
"nia" = (
/obj/machinery/door/poddoor/shutters/window{
dir = 8;
@@ -44051,16 +44006,6 @@
/obj/machinery/vending/assist,
/turf/open/floor/plating,
/area/station/engineering/storage/tech)
-"nnM" = (
-/obj/structure/table,
-/obj/item/stack/cable_coil{
- pixel_x = -3;
- pixel_y = 3
- },
-/obj/item/stack/cable_coil,
-/obj/item/stock_parts/power_store/cell/high,
-/turf/open/floor/plating,
-/area/station/engineering/storage/tech)
"nnR" = (
/obj/machinery/holopad,
/turf/open/floor/carpet,
@@ -44407,17 +44352,6 @@
/obj/effect/mapping_helpers/broken_floor,
/turf/open/floor/plating,
/area/station/maintenance/aft/lesser)
-"nsq" = (
-/obj/structure/window/reinforced/spawner/directional/north{
- layer = 2.9
- },
-/obj/structure/filingcabinet/filingcabinet,
-/obj/effect/turf_decal/tile/brown/half/contrasted{
- dir = 1
- },
-/obj/structure/cable,
-/turf/open/floor/iron,
-/area/station/cargo/sorting)
"nsr" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -45210,12 +45144,6 @@
},
/turf/open/floor/iron/white,
/area/station/medical/treatment_center)
-"nCW" = (
-/obj/structure/table,
-/turf/open/floor/iron/dark/textured_edge{
- dir = 8
- },
-/area/station/security/brig/entrance)
"nDd" = (
/obj/machinery/status_display/evac/directional/west,
/obj/effect/turf_decal/stripes/corner,
@@ -45365,10 +45293,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/dark,
/area/station/hallway/secondary/entry)
-"nEI" = (
-/obj/item/flashlight/lantern/on,
-/turf/open/misc/hay/icemoon,
-/area/icemoon/underground/explored)
"nEV" = (
/obj/machinery/vending/wardrobe/sec_wardrobe,
/obj/structure/cable,
@@ -46109,18 +46033,6 @@
},
/turf/open/floor/wood,
/area/station/hallway/secondary/service)
-"nQq" = (
-/obj/machinery/cell_charger{
- pixel_y = 5
- },
-/obj/item/stock_parts/power_store/cell/high{
- pixel_y = 6
- },
-/obj/structure/table/glass,
-/turf/open/floor/iron/white/side{
- dir = 9
- },
-/area/station/science/lab)
"nQu" = (
/obj/machinery/holopad,
/obj/effect/turf_decal/bot,
@@ -46451,16 +46363,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/dark/smooth_half,
/area/station/ai_monitored/command/storage/eva)
-"nUI" = (
-/obj/machinery/computer/records/security,
-/obj/machinery/light_switch/directional/north{
- pixel_x = -16
- },
-/obj/machinery/computer/security/telescreen/normal/directional/north,
-/turf/open/floor/iron/dark/textured_edge{
- dir = 8
- },
-/area/station/security/brig/entrance)
"nUJ" = (
/obj/machinery/flasher/directional/east{
id = "brigentry"
@@ -46877,10 +46779,6 @@
},
/turf/open/floor/iron/white,
/area/station/science/xenobiology)
-"ocd" = (
-/obj/machinery/igniter/incinerator_ordmix,
-/turf/open/floor/engine/vacuum,
-/area/station/science/ordnance/burnchamber)
"ocp" = (
/obj/effect/landmark/start/hangover,
/obj/effect/decal/cleanable/dirt,
@@ -47235,16 +47133,6 @@
/obj/structure/urinal/directional/north,
/turf/open/floor/iron/freezer,
/area/station/commons/toilet)
-"oiB" = (
-/obj/machinery/door/airlock/maintenance{
- name = "Chemistry Lab Utilities"
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/mapping_helpers/airlock/access/all/medical/general,
-/turf/open/floor/iron/smooth,
-/area/station/maintenance/department/medical/central)
"oiD" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -47439,6 +47327,15 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/hallway/primary/fore)
+"olv" = (
+/obj/structure/window/reinforced/spawner/directional/north,
+/obj/effect/spawner/random/vending/snackvend,
+/obj/machinery/camera/directional/east{
+ c_tag = "Engineering Lobby"
+ },
+/obj/structure/extinguisher_cabinet/directional/east,
+/turf/open/floor/iron/dark,
+/area/station/engineering/lobby)
"olH" = (
/obj/machinery/door/airlock/command{
name = "Captain's Quarters"
@@ -47595,6 +47492,22 @@
},
/turf/open/floor/plating,
/area/station/security/courtroom)
+"onN" = (
+/obj/structure/table,
+/obj/machinery/computer/security/telescreen/isolation/directional/south,
+/obj/item/clothing/suit/jacket/straight_jacket,
+/obj/item/clothing/suit/jacket/straight_jacket{
+ pixel_x = 6
+ },
+/obj/machinery/camera/directional/east{
+ c_tag = "Security - Permabrig Prep";
+ network = list("ss13","prison");
+ view_range = 5
+ },
+/obj/structure/cable,
+/obj/machinery/light/small/directional/east,
+/turf/open/floor/iron/smooth,
+/area/station/security/execution/transfer)
"onQ" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/turf_decal/siding/wood,
@@ -48167,6 +48080,15 @@
},
/turf/open/floor/iron/dark,
/area/station/security/checkpoint/customs/auxiliary)
+"owo" = (
+/obj/machinery/atmospherics/components/binary/pump/on{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/layer_manifold/scrubbers/hidden{
+ dir = 8
+ },
+/turf/open/floor/engine,
+/area/station/science/ordnance/burnchamber)
"owr" = (
/obj/effect/turf_decal/trimline/blue/filled/line{
dir = 8
@@ -48501,6 +48423,17 @@
/obj/machinery/atmospherics/pipe/smart/simple/violet/visible/layer1,
/turf/open/floor/iron,
/area/station/engineering/atmos/storage)
+"oAJ" = (
+/obj/structure/table/wood,
+/obj/item/raptor_dex{
+ pixel_y = 13
+ },
+/obj/item/raptor_dex{
+ pixel_y = 7
+ },
+/obj/item/raptor_dex,
+/turf/open/misc/hay/icemoon,
+/area/icemoon/underground/explored)
"oAM" = (
/obj/structure/fluff/tram_rail/end{
dir = 4
@@ -48579,6 +48512,28 @@
/obj/structure/cable,
/turf/open/floor/plating,
/area/station/maintenance/solars/starboard/fore)
+"oCm" = (
+/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 = 9
+ },
+/obj/item/stock_parts/power_store/cell/high{
+ pixel_x = 8;
+ pixel_y = -2
+ },
+/obj/item/radio/intercom/directional/west,
+/turf/open/floor/iron/white/side{
+ dir = 4
+ },
+/area/station/science/explab)
"oCs" = (
/obj/structure/table,
/obj/item/radio/headset/headset_med{
@@ -49096,6 +49051,10 @@
},
/turf/open/floor/iron/white,
/area/station/science/lab)
+"oKB" = (
+/obj/machinery/door/poddoor/incinerator_ordmix,
+/turf/open/floor/engine/vacuum,
+/area/station/science/ordnance/burnchamber)
"oKJ" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -49732,6 +49691,16 @@
},
/turf/open/floor/iron/dark,
/area/station/ai_monitored/turret_protected/aisat_interior)
+"oTZ" = (
+/obj/structure/sink/directional/west,
+/obj/structure/cable,
+/obj/machinery/button/door/directional/east{
+ id = "xenobio10";
+ name = "Xenobio Pen 10 Blast DOors";
+ req_access = list("xenobiology")
+ },
+/turf/open/floor/iron/white,
+/area/station/science/xenobiology)
"oUL" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -50128,6 +50097,15 @@
"paM" = (
/turf/closed/wall,
/area/station/engineering/storage/tech)
+"paO" = (
+/obj/structure/table/wood,
+/obj/item/cigarette/cigar{
+ pixel_x = 7;
+ pixel_y = 10
+ },
+/obj/item/storage/box/matches,
+/turf/open/floor/carpet,
+/area/station/command/heads_quarters/captain)
"paT" = (
/obj/machinery/door/poddoor/preopen{
id = "maint3"
@@ -50337,32 +50315,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible,
/turf/open/floor/engine,
/area/station/science/explab)
-"pdR" = (
-/obj/machinery/camera/directional/west{
- c_tag = "Cargo Bay Receiving Dock"
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/obj/machinery/computer/cargo{
- dir = 4
- },
-/obj/machinery/button/door/directional/west{
- id = "QMLoaddoor";
- layer = 4;
- name = "Loading Doors";
- pixel_y = -8;
- req_access = list("cargo")
- },
-/obj/machinery/button/door/directional/west{
- id = "QMLoaddoor2";
- layer = 4;
- name = "Loading Doors";
- pixel_y = 8;
- req_access = list("cargo")
- },
-/turf/open/floor/iron,
-/area/station/cargo/storage)
"pdT" = (
/obj/structure/chair/sofa/corp/right{
dir = 8
@@ -50464,17 +50416,6 @@
/obj/machinery/light/small/directional/east,
/turf/open/floor/plating,
/area/station/engineering/storage/tech)
-"pfJ" = (
-/obj/structure/sink/directional/east,
-/obj/machinery/button/door/directional/west{
- id = "xenobio2";
- layer = 4;
- name = "Xenobio Pen 2 Blast Door";
- req_access = list("xenobiology")
- },
-/obj/machinery/light/floor,
-/turf/open/floor/iron/white,
-/area/station/science/xenobiology)
"pfO" = (
/obj/structure/chair/stool/directional/west,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -50940,6 +50881,16 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/smooth,
/area/station/security/holding_cell)
+"pmA" = (
+/obj/structure/table,
+/obj/machinery/cell_charger,
+/obj/item/stock_parts/power_store/cell/high,
+/obj/machinery/ecto_sniffer{
+ pixel_x = 6;
+ pixel_y = 6
+ },
+/turf/open/floor/iron,
+/area/station/science/robotics/lab)
"pna" = (
/obj/machinery/door/poddoor/preopen{
id = "Engineering";
@@ -51068,6 +51019,10 @@
"poy" = (
/turf/open/floor/carpet/green,
/area/station/service/library)
+"poH" = (
+/obj/effect/spawner/random/medical/two_percent_xeno_egg_spawner,
+/turf/open/floor/engine/xenobio,
+/area/station/science/xenobiology)
"poK" = (
/obj/structure/cable,
/obj/effect/turf_decal/tile/neutral/fourcorners,
@@ -51443,6 +51398,16 @@
/obj/machinery/firealarm/directional/north,
/turf/open/floor/iron/dark,
/area/station/cargo/drone_bay)
+"pvd" = (
+/obj/machinery/door/airlock/maintenance{
+ name = "Chemistry Lab Utilities"
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/mapping_helpers/airlock/access/all/medical/general,
+/turf/open/floor/iron/smooth,
+/area/station/maintenance/department/medical/central)
"pve" = (
/obj/effect/spawner/structure/window,
/turf/open/floor/plating,
@@ -51747,6 +51712,10 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron,
/area/station/engineering/atmos)
+"pzl" = (
+/obj/machinery/atmospherics/pipe/smart/simple/dark/visible,
+/turf/closed/wall/r_wall,
+/area/station/science/ordnance/burnchamber)
"pzn" = (
/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{
dir = 4
@@ -52116,12 +52085,6 @@
},
/turf/open/floor/iron,
/area/station/security/prison/mess)
-"pEY" = (
-/obj/structure/table,
-/obj/item/plant_analyzer,
-/obj/item/stock_parts/power_store/cell/high,
-/turf/open/floor/plating,
-/area/station/engineering/storage/tech)
"pFg" = (
/obj/structure/chair{
dir = 8
@@ -52565,14 +52528,6 @@
},
/turf/open/floor/iron/freezer,
/area/station/commons/toilet/locker)
-"pLx" = (
-/obj/machinery/computer/security{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/computer/security/telescreen/prison/directional/north,
-/turf/open/floor/iron/showroomfloor,
-/area/station/security/warden)
"pLZ" = (
/obj/structure/cable,
/obj/effect/decal/cleanable/dirt,
@@ -52830,14 +52785,6 @@
},
/turf/open/floor/iron/white,
/area/station/medical/virology)
-"pPE" = (
-/obj/machinery/modular_computer/preset/id,
-/obj/machinery/computer/security/telescreen/vault/directional/north,
-/obj/effect/turf_decal/tile/brown/half/contrasted{
- dir = 1
- },
-/turf/open/floor/iron,
-/area/station/command/heads_quarters/qm)
"pPK" = (
/obj/structure/stairs/east,
/turf/open/floor/iron/dark/textured,
@@ -53158,6 +53105,10 @@
},
/turf/open/floor/iron/white,
/area/station/science/genetics)
+"pVg" = (
+/obj/effect/spawner/random/engineering/tracking_beacon,
+/turf/open/floor/iron/white,
+/area/station/science/xenobiology)
"pVl" = (
/obj/machinery/door/airlock/maintenance,
/obj/effect/mapping_helpers/airlock/abandoned,
@@ -53406,15 +53357,6 @@
},
/turf/open/floor/iron,
/area/station/engineering/lobby)
-"pZA" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/obj/machinery/light/directional/west,
-/obj/item/kirbyplants/random/dead/research_director,
-/obj/machinery/computer/security/telescreen/rd/directional/west,
-/turf/open/floor/iron/smooth_half,
-/area/station/command/heads_quarters/rd)
"pZD" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -53604,10 +53546,6 @@
/obj/effect/mapping_helpers/airlock/access/any/engineering/external,
/turf/open/floor/plating,
/area/station/medical/morgue)
-"qbM" = (
-/obj/structure/ore_container/food_trough/raptor_trough,
-/turf/open/misc/hay/icemoon,
-/area/icemoon/underground/explored)
"qbO" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -54249,6 +54187,12 @@
},
/turf/open/floor/iron/showroomfloor,
/area/station/security/warden)
+"qlB" = (
+/obj/structure/table,
+/obj/item/binoculars,
+/obj/machinery/computer/security/telescreen/ordnance/directional/north,
+/turf/open/floor/iron,
+/area/station/science/ordnance/testlab)
"qlG" = (
/obj/structure/table,
/obj/item/stack/sheet/glass/fifty{
@@ -54475,6 +54419,14 @@
/obj/effect/mapping_helpers/burnt_floor,
/turf/open/floor/plating,
/area/station/maintenance/department/medical/morgue)
+"qoS" = (
+/obj/machinery/button/door/directional/west{
+ id = "xenobio3";
+ name = "Xenobio Pen 3 Blast Door";
+ req_access = list("xenobiology")
+ },
+/turf/open/floor/iron/white,
+/area/station/science/xenobiology)
"qoY" = (
/obj/effect/spawner/random/structure/crate_abandoned,
/turf/open/floor/plating,
@@ -55401,6 +55353,12 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/wood,
/area/station/commons/dorms)
+"qBi" = (
+/obj/structure/railing/wooden_fence{
+ dir = 10
+ },
+/turf/open/misc/hay/icemoon,
+/area/icemoon/underground/explored)
"qBj" = (
/obj/structure/cable,
/turf/open/floor/iron/white,
@@ -55696,14 +55654,6 @@
/obj/effect/mapping_helpers/airlock/access/all/service/janitor,
/turf/open/floor/iron,
/area/station/service/janitor)
-"qGe" = (
-/obj/structure/table,
-/obj/item/scalpel{
- pixel_x = 2;
- pixel_y = 6
- },
-/turf/open/floor/engine,
-/area/station/science/xenobiology)
"qGg" = (
/obj/structure/rack,
/obj/item/pickaxe,
@@ -55759,6 +55709,11 @@
/obj/effect/turf_decal/bot_white,
/turf/open/floor/iron/checker,
/area/station/commons/storage/emergency/port)
+"qGX" = (
+/obj/structure/table/wood,
+/obj/item/flashlight/lantern/on,
+/turf/open/misc/hay/icemoon,
+/area/icemoon/underground/explored)
"qHg" = (
/obj/structure/transit_tube/curved/flipped{
dir = 1
@@ -55801,6 +55756,10 @@
/obj/structure/flora/bush/fullgrass/style_random,
/turf/open/floor/grass,
/area/station/service/hydroponics)
+"qHt" = (
+/obj/structure/railing/wooden_fence,
+/turf/open/misc/hay/icemoon,
+/area/icemoon/underground/explored)
"qHz" = (
/obj/machinery/light_switch/directional/west,
/obj/machinery/disposal/bin{
@@ -56693,14 +56652,6 @@
},
/turf/open/floor/iron,
/area/station/service/hydroponics/garden)
-"qTp" = (
-/obj/structure/table/wood,
-/obj/item/clothing/mask/fakemoustache,
-/obj/item/cigarette/pipe,
-/obj/item/clothing/glasses/monocle,
-/obj/item/radio/intercom/directional/north,
-/turf/open/floor/iron/grimy,
-/area/station/service/theater)
"qTs" = (
/turf/open/floor/iron/showroomfloor,
/area/station/security/prison/mess)
@@ -57781,15 +57732,6 @@
/obj/structure/sign/poster/official/random/directional/north,
/turf/open/floor/iron,
/area/station/hallway/primary/starboard)
-"rjT" = (
-/obj/machinery/button/door/directional/west{
- id = "xenobio3";
- layer = 4;
- name = "Xenobio Pen 3 Blast Door";
- req_access = list("xenobiology")
- },
-/turf/open/floor/iron/white,
-/area/station/science/xenobiology)
"rkc" = (
/obj/effect/turf_decal/siding/yellow,
/obj/effect/turf_decal/siding/yellow{
@@ -57884,16 +57826,6 @@
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plating,
/area/station/maintenance/starboard/fore)
-"rlL" = (
-/obj/machinery/light_switch/directional/north{
- pixel_x = -7
- },
-/obj/structure/table,
-/obj/item/stock_parts/power_store/cell/high/empty,
-/obj/machinery/cell_charger,
-/obj/effect/turf_decal/tile/brown/fourcorners,
-/turf/open/floor/iron/dark,
-/area/station/engineering/lobby)
"rlS" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -57928,17 +57860,6 @@
/obj/machinery/firealarm/directional/north,
/turf/open/floor/iron/white,
/area/station/science/ordnance)
-"rms" = (
-/obj/structure/table,
-/obj/effect/decal/cleanable/dirt,
-/obj/item/paper_bin{
- pixel_y = 6
- },
-/obj/item/taperecorder{
- pixel_x = 9
- },
-/turf/open/floor/iron/dark,
-/area/station/science/explab)
"rmv" = (
/obj/structure/rack,
/obj/item/wrench,
@@ -57963,14 +57884,6 @@
/obj/effect/mapping_helpers/airlock/access/all/supply/mining,
/turf/open/floor/iron/dark/textured_half,
/area/mine/mechbay)
-"rmG" = (
-/obj/machinery/door/airlock/research/glass/incinerator/ordmix_exterior{
- name = "Burn Chamber Exterior Airlock"
- },
-/obj/effect/mapping_helpers/airlock/locked,
-/obj/effect/mapping_helpers/airlock/access/all/science/ordnance,
-/turf/open/floor/engine/vacuum,
-/area/station/science/ordnance/burnchamber)
"rmM" = (
/obj/machinery/disposal/bin,
/obj/structure/disposalpipe/trunk{
@@ -58123,10 +58036,6 @@
/obj/machinery/newscaster/directional/south,
/turf/open/floor/iron,
/area/station/science/explab)
-"roW" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/closed/wall/r_wall,
-/area/station/science/ordnance/burnchamber)
"roX" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/structure/cable,
@@ -58744,12 +58653,6 @@
/obj/effect/turf_decal/delivery/red,
/turf/open/floor/iron/textured,
/area/station/hallway/secondary/entry)
-"ryX" = (
-/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/incinerator_ordmix{
- dir = 8
- },
-/turf/open/floor/engine,
-/area/station/science/ordnance/burnchamber)
"rzj" = (
/obj/structure/table,
/obj/item/stack/sheet/iron/fifty{
@@ -58824,17 +58727,6 @@
/obj/machinery/digital_clock/directional/south,
/turf/open/openspace,
/area/station/medical/medbay/lobby)
-"rzY" = (
-/obj/structure/table/wood,
-/obj/item/raptor_dex{
- pixel_y = 13
- },
-/obj/item/raptor_dex{
- pixel_y = 7
- },
-/obj/item/raptor_dex,
-/turf/open/misc/hay/icemoon,
-/area/icemoon/underground/explored)
"rAr" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -59213,18 +59105,6 @@
},
/turf/open/floor/iron/dark,
/area/station/science/ordnance)
-"rEj" = (
-/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/science/ordnance)
-"rEn" = (
-/obj/structure/railing/wooden_fence{
- dir = 4
- },
-/turf/open/misc/hay/icemoon,
-/area/icemoon/underground/explored)
"rEp" = (
/obj/structure/table,
/obj/item/hand_labeler,
@@ -59567,12 +59447,6 @@
},
/turf/open/floor/wood,
/area/station/maintenance/port/aft)
-"rKS" = (
-/obj/machinery/camera/directional/south{
- c_tag = "Dormitory Toilets"
- },
-/turf/open/floor/iron/freezer,
-/area/station/commons/toilet)
"rKX" = (
/obj/machinery/camera{
c_tag = "Surgery B";
@@ -59809,6 +59683,14 @@
/obj/structure/closet/toolcloset,
/turf/open/floor/plating,
/area/station/maintenance/starboard/aft)
+"rPf" = (
+/obj/machinery/computer/security{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/computer/security/telescreen/prison/directional/north,
+/turf/open/floor/iron/showroomfloor,
+/area/station/security/warden)
"rPn" = (
/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible,
/obj/machinery/camera{
@@ -59840,6 +59722,18 @@
"rQf" = (
/turf/open/floor/plating,
/area/station/engineering/supermatter/room)
+"rQh" = (
+/obj/structure/table,
+/obj/machinery/cell_charger{
+ pixel_y = 3
+ },
+/obj/item/stock_parts/power_store/cell/high{
+ pixel_y = 3
+ },
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
+/obj/machinery/airalarm/directional/north,
+/turf/open/floor/iron/textured,
+/area/mine/mechbay)
"rQl" = (
/obj/structure/lattice/catwalk,
/obj/structure/railing/corner,
@@ -60242,6 +60136,14 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/mine/laborcamp)
+"rWa" = (
+/obj/machinery/modular_computer/preset/engineering,
+/obj/structure/cable,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/machinery/light/small/directional/north,
+/obj/machinery/computer/security/telescreen/engine/directional/north,
+/turf/open/floor/iron/dark,
+/area/station/engineering/engine_smes)
"rWh" = (
/obj/effect/turf_decal/weather/snow/corner{
dir = 10
@@ -60371,15 +60273,6 @@
/obj/structure/minecart_rail/railbreak,
/turf/open/floor/plating/snowed/coldroom,
/area/station/service/kitchen/coldroom)
-"rXD" = (
-/obj/machinery/button/door/directional/east{
- id = "xenobio7";
- layer = 4;
- name = "Xenobio Pen 7 Blast DOors";
- req_access = list("xenobiology")
- },
-/turf/open/floor/iron/white,
-/area/station/science/xenobiology)
"rXN" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/command{
@@ -60502,6 +60395,12 @@
dir = 4
},
/area/station/service/chapel)
+"saM" = (
+/obj/machinery/chem_heater/withbuffer,
+/obj/structure/window/reinforced/spawner/directional/north,
+/obj/effect/turf_decal/tile/yellow/full,
+/turf/open/floor/iron/white/smooth_large,
+/area/station/medical/pharmacy)
"sbc" = (
/obj/structure/table/reinforced,
/obj/machinery/door/firedoor,
@@ -61095,6 +60994,14 @@
},
/turf/open/floor/iron/dark,
/area/station/commons/storage/primary)
+"skk" = (
+/obj/structure/window/reinforced/spawner/directional/north,
+/obj/machinery/door/poddoor/shutters/preopen{
+ id = "riot";
+ name = "Security Shutters"
+ },
+/turf/open/floor/glass/reinforced,
+/area/station/hallway/primary/fore)
"skl" = (
/turf/closed/wall,
/area/station/maintenance/fore)
@@ -61348,16 +61255,6 @@
/obj/structure/cable,
/turf/open/floor/plating,
/area/station/maintenance/department/cargo)
-"snv" = (
-/obj/structure/window/reinforced/spawner/directional/north{
- layer = 2.9
- },
-/obj/machinery/door/poddoor/shutters/preopen{
- id = "riot";
- name = "Security Shutters"
- },
-/turf/open/floor/glass/reinforced,
-/area/station/hallway/primary/fore)
"snw" = (
/obj/structure/table,
/obj/machinery/microwave,
@@ -61586,17 +61483,6 @@
dir = 8
},
/area/station/service/chapel)
-"sqH" = (
-/obj/machinery/door/airlock/research/glass/incinerator/ordmix_interior{
- name = "Burn Chamber Interior Airlock"
- },
-/obj/effect/mapping_helpers/airlock/locked,
-/obj/machinery/airlock_controller/incinerator_ordmix{
- pixel_x = 24
- },
-/obj/effect/mapping_helpers/airlock/access/all/science/ordnance,
-/turf/open/floor/engine,
-/area/station/science/ordnance/burnchamber)
"sqN" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -62873,16 +62759,6 @@
/obj/machinery/duct,
/turf/open/floor/iron/kitchen/diagonal,
/area/station/service/kitchen)
-"sHy" = (
-/obj/structure/table,
-/obj/machinery/cell_charger,
-/obj/item/stock_parts/power_store/cell/high,
-/obj/machinery/requests_console/auto_name/directional/north,
-/obj/effect/turf_decal/tile/neutral/half/contrasted{
- dir = 1
- },
-/turf/open/floor/iron/dark,
-/area/station/commons/storage/primary)
"sHC" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -63057,6 +62933,14 @@
/obj/machinery/light/small/dim/directional/north,
/turf/open/floor/plating,
/area/station/maintenance/starboard/lesser)
+"sJx" = (
+/obj/machinery/camera/directional/west{
+ c_tag = "Xenobiology Test Chamber";
+ network = list("ss13","test","rd","xeno")
+ },
+/obj/machinery/light/directional/west,
+/turf/open/floor/engine/xenobio,
+/area/station/science/xenobiology)
"sJA" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -63814,27 +63698,6 @@
},
/turf/open/floor/plating,
/area/station/maintenance/fore/lesser)
-"sXf" = (
-/obj/structure/window/reinforced/spawner/directional/north{
- layer = 2.9
- },
-/obj/structure/table/reinforced,
-/obj/item/stack/wrapping_paper{
- pixel_x = 3;
- pixel_y = 4
- },
-/obj/item/stack/package_wrap{
- pixel_x = -1;
- pixel_y = -1
- },
-/obj/item/dest_tagger,
-/obj/effect/turf_decal/tile/brown/half/contrasted{
- dir = 1
- },
-/obj/machinery/power/apc/auto_name/directional/east,
-/obj/structure/cable,
-/turf/open/floor/iron,
-/area/station/cargo/sorting)
"sXk" = (
/obj/effect/mapping_helpers/broken_floor,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
@@ -64064,6 +63927,16 @@
dir = 1
},
/area/station/engineering/atmos)
+"tbA" = (
+/obj/structure/table/wood,
+/obj/machinery/computer/security/telescreen/prison/directional/north,
+/obj/effect/decal/cleanable/cobweb/cobweb2,
+/obj/machinery/fax{
+ fax_name = "Law Office";
+ name = "Law Office Fax Machine"
+ },
+/turf/open/floor/wood,
+/area/station/service/lawoffice)
"tbE" = (
/obj/effect/turf_decal/tile/bar/opposingcorners,
/obj/effect/landmark/start/bartender,
@@ -64940,16 +64813,6 @@
"trm" = (
/turf/open/floor/plating,
/area/station/science/ordnance/testlab)
-"trn" = (
-/obj/structure/table,
-/obj/item/stock_parts/power_store/cell/high,
-/obj/machinery/cell_charger{
- pixel_y = 5
- },
-/turf/open/floor/iron/white/corner{
- dir = 4
- },
-/area/station/science/explab)
"tru" = (
/obj/structure/chair/pew/left{
dir = 1
@@ -65504,15 +65367,6 @@
dir = 4
},
/area/station/service/chapel)
-"tAK" = (
-/obj/machinery/computer/security/telescreen/interrogation/directional/north,
-/obj/effect/turf_decal/tile/red/anticorner/contrasted{
- dir = 4
- },
-/turf/open/floor/iron/dark/corner{
- dir = 8
- },
-/area/station/security/processing)
"tAL" = (
/obj/structure/table,
/obj/machinery/light/small/directional/south,
@@ -65764,16 +65618,6 @@
},
/turf/open/floor/plating,
/area/station/cargo/storage)
-"tEn" = (
-/obj/machinery/cell_charger,
-/obj/item/stock_parts/power_store/cell/high,
-/obj/item/radio/intercom/directional/north,
-/obj/structure/table/reinforced,
-/obj/effect/turf_decal/tile/neutral/half/contrasted{
- dir = 1
- },
-/turf/open/floor/iron/dark,
-/area/station/ai_monitored/command/storage/eva)
"tEs" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/public/glass{
@@ -65885,6 +65729,12 @@
/obj/effect/turf_decal/tile/blue/half/contrasted,
/turf/open/floor/iron/white,
/area/station/medical/psychology)
+"tFW" = (
+/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/science/ordnance)
"tGi" = (
/obj/effect/turf_decal/stripes/end,
/obj/machinery/door/airlock/external,
@@ -66535,28 +66385,6 @@
/obj/item/trash/energybar,
/turf/open/floor/plating,
/area/station/maintenance/starboard/fore)
-"tPx" = (
-/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 = 9
- },
-/obj/item/stock_parts/power_store/cell/high{
- pixel_x = 8;
- pixel_y = -2
- },
-/obj/item/radio/intercom/directional/west,
-/turf/open/floor/iron/white/side{
- dir = 4
- },
-/area/station/science/explab)
"tPz" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/white/side{
@@ -66921,6 +66749,19 @@
/obj/effect/landmark/event_spawn,
/turf/open/floor/iron/dark,
/area/mine/mechbay)
+"tWF" = (
+/obj/structure/table,
+/obj/item/crowbar/red,
+/obj/item/stock_parts/power_store/cell/high{
+ pixel_x = 6;
+ pixel_y = -3
+ },
+/obj/structure/sign/poster/random/directional/west,
+/obj/effect/turf_decal/tile/yellow/anticorner/contrasted{
+ dir = 8
+ },
+/turf/open/floor/iron,
+/area/station/hallway/primary/aft)
"tWK" = (
/obj/structure/cable,
/turf/open/floor/plating/snowed/icemoon,
@@ -67044,6 +66885,26 @@
/obj/machinery/light/directional/north,
/turf/open/floor/iron,
/area/station/security/prison/garden)
+"tYL" = (
+/obj/structure/table,
+/obj/item/stock_parts/power_store/cell/high,
+/obj/machinery/cell_charger{
+ pixel_y = 5
+ },
+/turf/open/floor/iron/white/corner{
+ dir = 4
+ },
+/area/station/science/explab)
+"tYR" = (
+/obj/machinery/atmospherics/components/unary/portables_connector/visible{
+ dir = 1
+ },
+/obj/effect/turf_decal/box,
+/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,
+/area/station/science/ordnance)
"tYZ" = (
/obj/machinery/door/airlock/external{
name = "External Airlock"
@@ -67408,14 +67269,6 @@
/obj/structure/cable,
/turf/open/floor/plating/snowed/icemoon,
/area/icemoon/surface/outdoors/nospawn)
-"uek" = (
-/obj/structure/table,
-/obj/machinery/cell_charger,
-/obj/item/stock_parts/power_store/cell/potato{
- name = "\improper Beepsky's emergency battery"
- },
-/turf/open/floor/plating,
-/area/station/maintenance/fore)
"uep" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -67739,10 +67592,6 @@
},
/turf/open/floor/wood,
/area/station/maintenance/port/aft)
-"ujp" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible,
-/turf/open/floor/engine,
-/area/station/science/xenobiology)
"ujs" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
@@ -67892,6 +67741,12 @@
},
/turf/open/floor/iron,
/area/station/science/ordnance)
+"ulH" = (
+/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/incinerator_ordmix{
+ dir = 8
+ },
+/turf/open/floor/engine,
+/area/station/science/ordnance/burnchamber)
"uma" = (
/obj/item/chisel,
/obj/item/storage/toolbox/artistic,
@@ -68280,6 +68135,10 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/iron/white,
/area/station/science/research)
+"ush" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/closed/wall/r_wall,
+/area/station/science/ordnance/burnchamber)
"uso" = (
/obj/structure/closet/crate/trashcart,
/obj/effect/spawner/random/contraband/prison,
@@ -68319,6 +68178,15 @@
dir = 10
},
/area/station/security/prison/safe)
+"usV" = (
+/obj/structure/window/reinforced/spawner/directional/north,
+/obj/structure/filingcabinet/filingcabinet,
+/obj/effect/turf_decal/tile/brown/half/contrasted{
+ dir = 1
+ },
+/obj/structure/cable,
+/turf/open/floor/iron,
+/area/station/cargo/sorting)
"utn" = (
/obj/effect/turf_decal/tile/blue/opposingcorners,
/obj/effect/turf_decal/tile/green/opposingcorners{
@@ -69156,15 +69024,6 @@
/obj/structure/cable,
/turf/open/floor/plating,
/area/station/maintenance/fore)
-"uHS" = (
-/obj/structure/disposaloutlet{
- dir = 8
- },
-/obj/structure/disposalpipe/trunk{
- dir = 4
- },
-/turf/open/floor/engine,
-/area/station/science/xenobiology)
"uHV" = (
/obj/structure/disposalpipe/trunk/multiz{
dir = 1
@@ -69432,6 +69291,26 @@
},
/turf/open/floor/iron/dark,
/area/mine/storage)
+"uMw" = (
+/obj/effect/turf_decal/bot{
+ dir = 1
+ },
+/obj/structure/cable,
+/obj/structure/table,
+/obj/item/storage/box/lights/mixed,
+/obj/item/stack/cable_coil,
+/obj/item/stack/cable_coil,
+/obj/item/stock_parts/power_store/cell/emproof,
+/obj/item/stock_parts/power_store/cell/emproof{
+ pixel_x = 6;
+ pixel_y = -2
+ },
+/obj/machinery/light_switch/directional/south{
+ pixel_x = 10
+ },
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/turf/open/floor/iron/dark,
+/area/station/engineering/engine_smes)
"uMx" = (
/obj/machinery/disposal/bin,
/obj/structure/disposalpipe/trunk,
@@ -69638,6 +69517,15 @@
/obj/effect/turf_decal/bot,
/turf/open/floor/iron,
/area/station/commons/vacant_room/commissary)
+"uOR" = (
+/obj/structure/rack,
+/obj/structure/window/reinforced/spawner/directional/north,
+/obj/effect/turf_decal/tile/red/half/contrasted{
+ dir = 8
+ },
+/obj/effect/spawner/random/armory/rubbershot,
+/turf/open/floor/iron/dark/textured,
+/area/station/ai_monitored/security/armory)
"uOW" = (
/obj/effect/turf_decal/trimline/blue/filled/line,
/obj/effect/landmark/start/paramedic,
@@ -69746,6 +69634,14 @@
},
/turf/open/floor/plating,
/area/station/engineering/storage/tech)
+"uRe" = (
+/obj/machinery/button/door/directional/west{
+ id = "xenobio4";
+ name = "Xenobio Pen 4 Blast Door";
+ req_access = list("xenobiology")
+ },
+/turf/open/floor/iron/white,
+/area/station/science/xenobiology)
"uRi" = (
/obj/structure/cable,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
@@ -69859,14 +69755,6 @@
/obj/effect/turf_decal/tile/yellow/fourcorners,
/turf/open/floor/iron/white,
/area/station/medical/medbay/aft)
-"uTc" = (
-/obj/machinery/chem_heater/withbuffer,
-/obj/structure/window/reinforced/spawner/directional/north{
- layer = 2.9
- },
-/obj/effect/turf_decal/tile/yellow/full,
-/turf/open/floor/iron/white/smooth_large,
-/area/station/medical/pharmacy)
"uTf" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
@@ -69935,10 +69823,15 @@
dir = 4
},
/area/station/service/chapel)
-"uUn" = (
-/obj/structure/table/optable,
-/obj/effect/decal/cleanable/blood/old,
-/turf/open/floor/engine,
+"uUj" = (
+/obj/structure/cable,
+/obj/machinery/button/door/directional/west{
+ id = "xenobio1";
+ name = "Xenobio Pen 1 Blast Door";
+ req_access = list("xenobiology")
+ },
+/obj/machinery/light/floor,
+/turf/open/floor/iron,
/area/station/science/xenobiology)
"uUq" = (
/obj/effect/spawner/structure/window/hollow/reinforced/middle,
@@ -70601,6 +70494,10 @@
},
/turf/open/floor/iron,
/area/station/science/ordnance)
+"vfO" = (
+/obj/structure/ore_container/food_trough/raptor_trough,
+/turf/open/misc/hay/icemoon,
+/area/icemoon/underground/explored)
"vfS" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -70735,16 +70632,15 @@
/obj/structure/cable,
/turf/open/floor/plating,
/area/station/engineering/supermatter/room)
+"viK" = (
+/turf/closed/wall/r_wall,
+/area/station/science/ordnance/burnchamber)
"viQ" = (
/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,
/area/station/command/heads_quarters/captain)
-"viR" = (
-/obj/effect/spawner/random/medical/two_percent_xeno_egg_spawner,
-/turf/open/floor/engine,
-/area/station/science/xenobiology)
"viV" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/structure/window/reinforced/spawner/directional/south,
@@ -71294,6 +71190,25 @@
/obj/item/kirbyplants/random,
/turf/open/floor/iron,
/area/station/security/courtroom)
+"vrg" = (
+/obj/machinery/atmospherics/components/binary/pump{
+ dir = 4
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/obj/machinery/computer/security/telescreen/test_chamber/directional/north,
+/turf/open/floor/iron,
+/area/station/science/explab)
+"vrl" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable,
+/obj/structure/table,
+/obj/machinery/cell_charger,
+/obj/item/stock_parts/power_store/cell/high,
+/obj/item/stock_parts/power_store/cell/high,
+/turf/open/floor/iron,
+/area/station/maintenance/department/electrical)
"vrr" = (
/obj/machinery/computer/operating{
dir = 8
@@ -72194,6 +72109,16 @@
},
/turf/open/floor/iron,
/area/mine/laborcamp)
+"vDG" = (
+/obj/structure/table,
+/obj/item/stack/cable_coil{
+ pixel_x = -3;
+ pixel_y = 3
+ },
+/obj/item/stack/cable_coil,
+/obj/item/stock_parts/power_store/cell/high,
+/turf/open/floor/plating,
+/area/station/engineering/storage/tech)
"vDQ" = (
/obj/effect/spawner/random/decoration/flower,
/obj/structure/flora/rock/pile/icy/style_random,
@@ -72269,15 +72194,14 @@
/obj/effect/mapping_helpers/airlock/access/all/supply/general,
/turf/open/floor/iron/smooth,
/area/station/cargo/drone_bay)
-"vFb" = (
-/obj/structure/table/wood,
-/obj/item/cigarette/cigar{
- pixel_x = 7;
- pixel_y = 10
+"vFd" = (
+/obj/machinery/modular_computer/preset/id,
+/obj/machinery/computer/security/telescreen/vault/directional/north,
+/obj/effect/turf_decal/tile/brown/half/contrasted{
+ dir = 1
},
-/obj/item/storage/box/matches,
-/turf/open/floor/carpet,
-/area/station/command/heads_quarters/captain)
+/turf/open/floor/iron,
+/area/station/command/heads_quarters/qm)
"vFg" = (
/obj/structure/falsewall,
/turf/open/floor/plating,
@@ -72411,17 +72335,6 @@
},
/turf/open/floor/iron,
/area/station/cargo/sorting)
-"vHM" = (
-/obj/structure/rack,
-/obj/structure/window/reinforced/spawner/directional/north{
- layer = 2.9
- },
-/obj/effect/turf_decal/tile/red/half/contrasted{
- dir = 8
- },
-/obj/effect/spawner/random/armory/rubbershot,
-/turf/open/floor/iron/dark/textured,
-/area/station/ai_monitored/security/armory)
"vHR" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
dir = 4
@@ -72978,6 +72891,11 @@
"vTc" = (
/turf/closed/wall,
/area/station/medical/chem_storage)
+"vTe" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible,
+/obj/structure/sign/warning/secure_area/directional/north,
+/turf/open/floor/iron/dark,
+/area/station/science/explab)
"vTg" = (
/obj/effect/turf_decal/tile/red{
dir = 8
@@ -73278,20 +73196,6 @@
/obj/item/toy/snowball,
/turf/open/misc/asteroid/snow/icemoon,
/area/icemoon/surface/outdoors/nospawn)
-"vXV" = (
-/obj/effect/turf_decal/tile/blue/half/contrasted{
- dir = 8
- },
-/obj/machinery/light/small/directional/west,
-/obj/machinery/requests_console/directional/west{
- department = "Head of Personnel's Desk";
- name = "Head of Personnel's Requests Console"
- },
-/obj/effect/mapping_helpers/requests_console/assistance,
-/obj/effect/mapping_helpers/requests_console/announcement,
-/obj/effect/mapping_helpers/requests_console/information,
-/turf/open/floor/iron,
-/area/station/command/heads_quarters/hop)
"vYa" = (
/obj/structure/reagent_dispensers/fueltank,
/obj/effect/turf_decal/delivery,
@@ -73541,6 +73445,13 @@
/obj/effect/spawner/random/structure/closet_maintenance,
/turf/open/floor/plating,
/area/station/maintenance/aft/lesser)
+"wbj" = (
+/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible,
+/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,
+/area/station/science/ordnance)
"wbk" = (
/obj/machinery/firealarm/directional/west,
/obj/effect/turf_decal/tile/yellow/opposingcorners,
@@ -74832,19 +74743,6 @@
},
/turf/open/floor/iron/dark/textured,
/area/station/security/prison)
-"wuV" = (
-/obj/effect/turf_decal/siding/yellow/corner,
-/obj/machinery/status_display/evac/directional/south,
-/obj/structure/table,
-/obj/item/flatpack{
- board = /obj/item/circuitboard/machine/flatpacker;
- pixel_x = -5
- },
-/obj/item/multitool{
- pixel_x = 8
- },
-/turf/open/floor/iron,
-/area/station/engineering/lobby)
"wve" = (
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/iron/white,
@@ -74853,9 +74751,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/carpet,
/area/station/service/chapel)
-"wvu" = (
-/turf/open/misc/hay/icemoon,
-/area/icemoon/underground/explored)
"wvv" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -75805,10 +75700,6 @@
/obj/effect/landmark/start/depsec/medical,
/turf/open/floor/iron/dark/smooth_large,
/area/station/security/checkpoint/medical)
-"wKh" = (
-/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible,
-/turf/closed/wall/r_wall,
-/area/station/science/ordnance/burnchamber)
"wKv" = (
/obj/structure/table,
/obj/item/radio/off,
@@ -76149,6 +76040,16 @@
},
/turf/open/floor/plating,
/area/station/maintenance/port/fore)
+"wPu" = (
+/obj/machinery/computer/records/security,
+/obj/machinery/light_switch/directional/north{
+ pixel_x = -16
+ },
+/obj/machinery/computer/security/telescreen/normal/directional/north,
+/turf/open/floor/iron/dark/textured_edge{
+ dir = 8
+ },
+/area/station/security/brig/entrance)
"wPD" = (
/obj/machinery/door/airlock/security/glass{
name = "Evidence Storage"
@@ -76273,12 +76174,6 @@
"wRa" = (
/turf/open/openspace,
/area/station/security/prison)
-"wRc" = (
-/obj/structure/table,
-/obj/machinery/cell_charger,
-/obj/item/stock_parts/power_store/cell/high/empty,
-/turf/open/floor/iron/dark,
-/area/station/engineering/storage)
"wRd" = (
/turf/open/floor/iron,
/area/station/engineering/main)
@@ -77160,6 +77055,13 @@
},
/turf/open/floor/iron,
/area/station/command/heads_quarters/qm)
+"xes" = (
+/obj/machinery/light/small/directional/north,
+/obj/machinery/computer/security/telescreen/test_chamber/directional/north,
+/turf/open/floor/iron/white/side{
+ dir = 1
+ },
+/area/station/command/heads_quarters/rd)
"xex" = (
/obj/machinery/teleport/hub,
/turf/open/floor/plating,
@@ -77855,6 +77757,16 @@
/obj/item/stack/sheet/leather,
/turf/open/floor/iron,
/area/station/maintenance/starboard/fore)
+"xpH" = (
+/obj/structure/table,
+/obj/machinery/cell_charger,
+/obj/item/stock_parts/power_store/cell/high,
+/obj/machinery/requests_console/auto_name/directional/north,
+/obj/effect/turf_decal/tile/neutral/half/contrasted{
+ dir = 1
+ },
+/turf/open/floor/iron/dark,
+/area/station/commons/storage/primary)
"xpJ" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -78064,16 +77976,6 @@
/obj/item/food/grown/carrot,
/turf/open/misc/asteroid/snow/standard_air,
/area/station/science/research)
-"xsP" = (
-/obj/structure/table,
-/obj/item/folder/white,
-/obj/item/folder/white,
-/obj/item/pen,
-/obj/machinery/power/apc/auto_name/directional/east,
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/cable,
-/turf/open/floor/iron/dark,
-/area/station/science/explab)
"xtc" = (
/obj/effect/turf_decal/trimline/blue/filled/warning{
dir = 1
@@ -78410,12 +78312,6 @@
},
/turf/open/floor/iron/dark,
/area/station/engineering/atmos/hfr_room)
-"xxH" = (
-/obj/structure/railing/wooden_fence{
- dir = 8
- },
-/turf/open/misc/hay/icemoon,
-/area/icemoon/underground/explored)
"xxI" = (
/obj/machinery/airalarm/directional/north,
/obj/item/kirbyplants/random,
@@ -78655,6 +78551,10 @@
dir = 1
},
/area/station/science/explab)
+"xBe" = (
+/obj/machinery/igniter/incinerator_ordmix,
+/turf/open/floor/engine/vacuum,
+/area/station/science/ordnance/burnchamber)
"xBh" = (
/obj/machinery/light/directional/north,
/obj/machinery/button/door/directional/north{
@@ -78750,15 +78650,6 @@
/obj/structure/cable,
/turf/open/floor/wood,
/area/station/security/courtroom)
-"xCh" = (
-/obj/machinery/button/door/directional/west{
- id = "xenobio5";
- layer = 4;
- name = "Xenobio Pen 5 Blast Door";
- req_access = list("xenobiology")
- },
-/turf/open/floor/iron/white,
-/area/station/science/xenobiology)
"xCj" = (
/obj/structure/sign/departments/holy,
/turf/closed/wall,
@@ -78899,6 +78790,16 @@
/obj/effect/turf_decal/tile/green/full,
/turf/open/floor/iron/dark/smooth_large,
/area/station/medical/virology)
+"xEp" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible,
+/obj/machinery/button/door/directional/east{
+ id = "xenobio11";
+ name = "Xenobio Pen 11 Blast DOors";
+ req_access = list("xenobiology")
+ },
+/obj/structure/cable,
+/turf/open/floor/iron/white,
+/area/station/science/xenobiology)
"xEt" = (
/obj/structure/closet/bombcloset,
/turf/open/floor/plating,
@@ -78958,13 +78859,6 @@
/obj/machinery/light/small/dim/directional/south,
/turf/open/floor/iron/dark/textured,
/area/station/maintenance/starboard/lesser)
-"xEQ" = (
-/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible,
-/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,
-/area/station/science/ordnance)
"xEW" = (
/obj/structure/closet/firecloset,
/obj/effect/turf_decal/tile/purple/fourcorners,
@@ -79228,6 +79122,12 @@
/obj/machinery/firealarm/directional/south,
/turf/open/floor/iron/dark,
/area/station/science/server)
+"xIM" = (
+/obj/machinery/atmospherics/components/unary/outlet_injector/on{
+ dir = 4
+ },
+/turf/open/floor/engine/xenobio,
+/area/station/science/xenobiology)
"xIS" = (
/obj/item/radio/intercom/directional/east,
/obj/effect/turf_decal/tile/blue,
@@ -79330,6 +79230,16 @@
/obj/effect/landmark/event_spawn,
/turf/open/floor/stone,
/area/station/service/bar/atrium)
+"xKw" = (
+/obj/structure/sink/directional/east,
+/obj/machinery/button/door/directional/west{
+ id = "xenobio2";
+ name = "Xenobio Pen 2 Blast Door";
+ req_access = list("xenobiology")
+ },
+/obj/machinery/light/floor,
+/turf/open/floor/iron/white,
+/area/station/science/xenobiology)
"xKJ" = (
/turf/closed/wall,
/area/station/command/meeting_room)
@@ -79476,10 +79386,6 @@
/obj/structure/cable,
/turf/open/floor/iron/dark/smooth_half,
/area/station/ai_monitored/command/storage/eva)
-"xNa" = (
-/obj/effect/landmark/blobstart,
-/turf/open/floor/engine,
-/area/station/science/xenobiology)
"xNn" = (
/obj/effect/turf_decal/stripes/line{
dir = 5
@@ -79687,6 +79593,12 @@
dir = 1
},
/area/station/security/processing)
+"xQJ" = (
+/obj/structure/railing/wooden_fence{
+ dir = 5
+ },
+/turf/open/misc/hay/icemoon,
+/area/icemoon/underground/explored)
"xQK" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
dir = 1
@@ -80031,6 +79943,17 @@
/obj/item/plate,
/turf/open/floor/iron,
/area/station/security/prison/mess)
+"xWC" = (
+/obj/structure/table/wood,
+/obj/item/soap/deluxe{
+ pixel_y = 11
+ },
+/obj/item/soap/deluxe{
+ pixel_y = 6
+ },
+/obj/item/soap/deluxe,
+/turf/open/misc/hay/icemoon,
+/area/icemoon/underground/explored)
"xWG" = (
/obj/machinery/light/small/directional/south,
/turf/open/floor/iron/freezer,
@@ -80156,6 +80079,16 @@
/obj/structure/cable,
/turf/open/floor/iron/white,
/area/station/medical/medbay/central)
+"xYc" = (
+/obj/machinery/atmospherics/components/binary/pump/off,
+/obj/machinery/airlock_sensor/incinerator_ordmix{
+ pixel_x = 24
+ },
+/obj/machinery/atmospherics/pipe/layer_manifold/supply/hidden{
+ dir = 4
+ },
+/turf/open/floor/engine,
+/area/station/science/ordnance/burnchamber)
"xYj" = (
/obj/machinery/power/apc/auto_name/directional/east,
/obj/structure/cable,
@@ -80516,6 +80449,15 @@
/obj/effect/spawner/random/maintenance,
/turf/open/floor/plating,
/area/station/maintenance/starboard/aft)
+"ydj" = (
+/obj/machinery/computer/security/telescreen/interrogation/directional/north,
+/obj/effect/turf_decal/tile/red/anticorner/contrasted{
+ dir = 4
+ },
+/turf/open/floor/iron/dark/corner{
+ dir = 8
+ },
+/area/station/security/processing)
"ydt" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron,
@@ -165387,7 +165329,7 @@ jzy
pve
xjZ
bGP
-mIT
+gmv
gsF
vSi
kZu
@@ -169245,7 +169187,7 @@ hdb
avh
qGg
uUT
-fyT
+rQh
lQh
diI
uUT
@@ -169948,7 +169890,7 @@ iDt
ijY
pfw
wUj
-dtq
+tbA
jeJ
aFg
vwl
@@ -170245,14 +170187,14 @@ thA
thA
thA
thA
-dlu
-dlu
-dlu
-dlu
-dlu
-dlu
-dlu
-dlu
+jEa
+jEa
+jEa
+jEa
+jEa
+jEa
+jEa
+jEa
qgQ
qgQ
rrl
@@ -170502,14 +170444,14 @@ thA
thA
thA
thA
-dlu
-qbM
-wvu
-wvu
-bPR
-qbM
-wvu
-bil
+jEa
+vfO
+hwL
+hwL
+aIv
+vfO
+hwL
+qHt
ijY
iDt
iDt
@@ -170759,14 +170701,14 @@ thA
thA
thA
thA
-dlu
-nEI
-wvu
-wvu
-bPR
-nEI
-wvu
-bil
+jEa
+bhs
+hwL
+hwL
+aIv
+bhs
+hwL
+qHt
iDt
iDt
iDt
@@ -171016,14 +170958,14 @@ thA
thA
thA
thA
-dlu
-wvu
-wvu
-wvu
-bPR
-wvu
-wvu
-bil
+jEa
+hwL
+hwL
+hwL
+aIv
+hwL
+hwL
+qHt
iDt
iDt
ayJ
@@ -171273,14 +171215,14 @@ tjo
thA
thA
thA
-dlu
-rEn
-rEn
-wvu
-ghA
-rEn
-wvu
-idH
+jEa
+hsU
+hsU
+hwL
+xQJ
+hsU
+hwL
+hop
iDt
iDt
iDt
@@ -171530,14 +171472,14 @@ tjo
thA
thA
thA
-dlu
-wvu
-wvu
-wvu
-wvu
-wvu
-wvu
-wvu
+jEa
+hwL
+hwL
+hwL
+hwL
+hwL
+hwL
+hwL
iDt
iDt
iDt
@@ -171787,14 +171729,14 @@ tjo
thA
thA
thA
-dlu
-ncx
-kYN
-wvu
-wvu
-rzY
-kYN
-wvu
+jEa
+xWC
+qGX
+hwL
+hwL
+oAJ
+qGX
+hwL
ayJ
iDt
iDt
@@ -172044,14 +171986,14 @@ tjo
thA
thA
thA
-dlu
-wvu
-wvu
-wvu
-wvu
-wvu
-wvu
-wvu
+jEa
+hwL
+hwL
+hwL
+hwL
+hwL
+hwL
+hwL
iDt
iDt
iDt
@@ -172301,14 +172243,14 @@ tjo
thA
thA
thA
-dlu
-xxH
-xxH
-wvu
-jkK
-xxH
-wvu
-mhj
+jEa
+byV
+byV
+hwL
+hnc
+byV
+hwL
+qBi
iDt
iDt
iDt
@@ -172558,14 +172500,14 @@ tjo
thA
thA
thA
-dlu
-wvu
-wvu
-wvu
-bPR
-wvu
-wvu
-bil
+jEa
+hwL
+hwL
+hwL
+aIv
+hwL
+hwL
+qHt
iDt
iDt
ayJ
@@ -172815,14 +172757,14 @@ tjo
thA
thA
thA
-dlu
-nEI
-wvu
-wvu
-bPR
-nEI
-wvu
-bil
+jEa
+bhs
+hwL
+hwL
+aIv
+bhs
+hwL
+qHt
iDt
iDt
iDt
@@ -173026,7 +172968,7 @@ yiL
vDx
cxO
xuA
-dkB
+mRd
bYg
yiL
qLD
@@ -173072,14 +173014,14 @@ tjo
thA
thA
thA
-dlu
-qbM
-wvu
-wvu
-bPR
-qbM
-wvu
-bil
+jEa
+vfO
+hwL
+hwL
+aIv
+vfO
+hwL
+qHt
iDt
iDt
iDt
@@ -173329,14 +173271,14 @@ tjo
thA
thA
thA
-dlu
-dlu
-dlu
-dlu
-dlu
-dlu
-dlu
-dlu
+jEa
+jEa
+jEa
+jEa
+jEa
+jEa
+jEa
+jEa
iDx
rrl
iDx
@@ -173540,7 +173482,7 @@ yiL
agF
tgP
rGh
-vHM
+uOR
wyF
yiL
szz
@@ -174833,7 +174775,7 @@ ihB
ddp
hBg
nzj
-dKr
+onN
pOk
par
rsM
@@ -180768,7 +180710,7 @@ thA
xMq
xMq
sBy
-qTp
+coy
xTi
bpc
cag
@@ -189033,12 +188975,12 @@ xMq
alM
oxO
ffe
-lVs
-abe
-abe
-biI
-abe
-eOS
+heF
+heF
+heF
+sJx
+heF
+heF
qLY
eGN
lZX
@@ -189290,12 +189232,12 @@ xMq
alM
oxO
ffe
-qGe
-abe
-cku
-uUn
-xNa
-eOS
+heF
+heF
+heF
+lFC
+heF
+heF
qLY
vfe
tsa
@@ -189547,12 +189489,12 @@ xMq
alM
oxO
ffe
-viR
-abe
-abe
-bOT
-abe
-eLb
+poH
+heF
+heF
+xIM
+heF
+heF
qLY
tkP
fPv
@@ -189805,10 +189747,10 @@ alM
nsp
ffe
qLY
-ctF
-uHS
-ujp
-abe
+qLY
+gMI
+inr
+heF
ctF
qLY
qLY
@@ -190326,24 +190268,24 @@ euM
pMF
sfv
xyn
-dmj
+xEp
wPd
lVt
-asb
+oTZ
pMF
-xCh
-cbP
+iqP
+eEg
pMF
-ihN
-doK
+uRe
+fgB
mBP
-rjT
-rXD
+qoS
+mxq
pMF
-pfJ
-jrc
+xKw
+iMa
pMF
-mbb
+uUj
rkl
nPI
oxO
@@ -191092,7 +191034,7 @@ ffe
oqd
vHq
aZk
-pMF
+pVg
pMF
rdl
iQM
@@ -193666,7 +193608,7 @@ kAH
mHu
jlj
tUo
-aQn
+tYR
hFb
vqv
wQi
@@ -193923,7 +193865,7 @@ uIf
laa
qKt
tUo
-aQn
+tYR
hFb
vqv
qiN
@@ -194180,7 +194122,7 @@ inh
mWj
aNu
tPG
-xEQ
+wbj
qaL
vqv
brt
@@ -194694,7 +194636,7 @@ opD
jGR
hFb
mzb
-rEj
+tFW
rRl
vqv
wZV
@@ -195456,14 +195398,14 @@ thA
thA
rcY
iDt
-fcj
-fcj
-fcj
-fcj
-roW
-roW
-bId
-gcy
+viK
+viK
+viK
+viK
+ush
+ush
+diE
+jYT
jJG
jJG
plX
@@ -195713,12 +195655,12 @@ thA
thA
rcY
iDt
-fCS
-iwq
-cuB
-iCe
-lgP
-iCe
+oKB
+aBv
+dLS
+pzl
+owo
+pzl
vcH
gnq
xEF
@@ -195970,12 +195912,12 @@ thA
thA
rcY
iDt
-fCS
-ocd
-bqX
-rmG
-ryX
-sqH
+oKB
+xBe
+fTL
+lcQ
+ulH
+dMb
qSk
sbd
rEh
@@ -196227,12 +196169,12 @@ thA
thA
rcY
iDt
-fCS
-iwq
-evc
-wKh
-aEK
-wKh
+oKB
+aBv
+hZx
+ecx
+xYc
+ecx
odf
sbd
jaY
@@ -230400,7 +230342,7 @@ kLZ
jPc
xKj
hyY
-pdR
+gpS
huI
gbv
maT
@@ -230625,7 +230567,7 @@ lJO
qzs
jnV
lJO
-sHy
+xpH
gHS
iMT
hqx
@@ -233212,7 +233154,7 @@ pdf
pdf
wBb
tKI
-pPE
+vFd
alT
dcs
kin
@@ -235788,7 +235730,7 @@ ozH
bZg
gst
tZR
-nsq
+usV
dOw
dOw
yhe
@@ -236045,7 +235987,7 @@ gst
oiK
bLW
xjP
-sXf
+nhY
gxO
dKK
xmN
@@ -237557,7 +237499,7 @@ bZx
bZx
bZx
bZx
-snv
+skk
kQi
oWk
bWn
@@ -237633,7 +237575,7 @@ mNY
kCn
mNY
dUn
-eEm
+mMj
cpH
kbJ
kbJ
@@ -237644,7 +237586,7 @@ epY
vWe
kIt
kMY
-wRc
+eYU
lha
kAK
iLY
@@ -237814,7 +237756,7 @@ bZx
bZx
bZx
bZx
-snv
+skk
krQ
skZ
bWn
@@ -238048,7 +237990,7 @@ aWk
diC
bJj
lyG
-jko
+mci
bXy
feJ
xWb
@@ -238071,7 +238013,7 @@ bZx
bZx
bZx
bZx
-snv
+skk
krQ
gYp
bWn
@@ -238107,7 +238049,7 @@ dkb
kmi
iYb
xaA
-vXV
+crH
wjv
pec
fJl
@@ -238328,7 +238270,7 @@ bZx
bZx
bZx
bZx
-snv
+skk
krQ
thI
bWn
@@ -238585,7 +238527,7 @@ bZx
bZx
bZx
bZx
-snv
+skk
krQ
gYp
bWn
@@ -238663,7 +238605,7 @@ mNY
akL
tvF
tvF
-aYS
+uMw
gTK
ruO
fKe
@@ -238842,7 +238784,7 @@ bZx
bZx
bZx
bZx
-snv
+skk
gMK
huT
bWn
@@ -238890,7 +238832,7 @@ ylU
bep
paM
xxQ
-nnM
+vDG
kzO
gdP
ykL
@@ -239099,7 +239041,7 @@ bZx
bZx
bZx
bZx
-snv
+skk
lwO
vTg
bWn
@@ -239339,7 +239281,7 @@ feJ
uGr
uGr
iDq
-pLx
+rPf
lAL
gPp
iDq
@@ -239360,7 +239302,7 @@ wqx
gEb
gYp
bWn
-tEn
+itQ
cGt
wRI
qdE
@@ -239917,7 +239859,7 @@ dnq
vrX
pua
paM
-pEY
+kyM
vJI
uud
gdP
@@ -239948,7 +239890,7 @@ mNY
ixG
aPf
dzJ
-neV
+cWn
twt
mEw
sSJ
@@ -240123,9 +240065,9 @@ sDl
sDl
sDl
psN
-nUI
+wPu
dkY
-nCW
+cKg
hzY
bRn
fng
@@ -240192,7 +240134,7 @@ dPT
pRj
pMu
gVD
-gSQ
+tWF
ajF
qwe
uJH
@@ -240716,7 +240658,7 @@ kKH
pRj
eAj
sro
-apL
+rWa
qkT
kzA
whW
@@ -240975,7 +240917,7 @@ fFy
mNY
bTq
xUP
-fQU
+mBw
rpF
twt
fcg
@@ -241489,7 +241431,7 @@ vkz
uoF
pcg
deD
-fLH
+dHx
qnC
isX
eBI
@@ -241734,7 +241676,7 @@ vvv
tTV
jtA
bID
-rlL
+bAW
miw
gCK
cMd
@@ -241999,7 +241941,7 @@ dcC
jGB
akz
sCA
-aSw
+clX
ojv
bAT
eri
@@ -242244,7 +242186,7 @@ oyj
gwK
nEV
bry
-fDM
+cHu
fLq
hro
tKi
@@ -242258,7 +242200,7 @@ wHj
mBB
juH
ojv
-hut
+kBw
mDw
jDT
qKQ
@@ -242768,7 +242710,7 @@ bDz
rSC
inE
oPU
-wuV
+hYU
qnC
qnC
sCA
@@ -243008,7 +242950,7 @@ uwO
rSx
kRP
kRP
-lSw
+moU
cAR
kNk
tmA
@@ -243247,7 +243189,7 @@ xLF
lpM
oGQ
wKw
-vFb
+paO
mhQ
hUV
aks
@@ -243538,7 +243480,7 @@ nKj
fwW
uxp
afK
-bOy
+olv
vfU
pdV
hqV
@@ -243994,7 +243936,7 @@ yjF
vVw
yjF
qSh
-rKS
+hsB
uja
jcy
iuv
@@ -244990,7 +244932,7 @@ ihb
bnM
iRM
kkl
-tAK
+ydj
gUs
ykw
lbk
@@ -245514,7 +245456,7 @@ bln
bln
fsm
bUx
-uek
+cOY
wph
fnS
skl
@@ -246842,7 +246784,7 @@ azw
eub
eyc
qPt
-uTc
+saM
biR
dmI
tdE
@@ -246850,7 +246792,7 @@ veU
vEQ
kRP
kRP
-oiB
+pvd
kRP
pao
cGA
@@ -247619,7 +247561,7 @@ sEz
jFZ
uoV
gnb
-gTi
+aCV
whh
pQL
nCV
@@ -250467,7 +250409,7 @@ vQP
rdG
jzY
xlh
-jQt
+hAy
uep
uep
uep
@@ -250708,7 +250650,7 @@ rDa
mrB
jQD
slc
-dMB
+mPi
rjC
qjF
pPO
@@ -250953,7 +250895,7 @@ pJC
nKa
dhk
cDT
-iTE
+mvZ
cAI
cMN
uYm
@@ -251210,7 +251152,7 @@ nGA
nKa
nTV
jPl
-bGD
+ias
kXM
nKa
xXV
@@ -252237,7 +252179,7 @@ vwO
pxn
vBG
mQr
-idp
+hmy
rZZ
opc
qPI
@@ -254823,7 +254765,7 @@ jIP
qOH
veX
wHc
-fPO
+xes
pTU
itt
ily
@@ -255600,7 +255542,7 @@ mfV
xpA
uHc
cpg
-gUX
+aQG
cpg
cdl
pMF
@@ -256112,7 +256054,7 @@ mYq
nyH
lFW
rEd
-pZA
+fBk
gSN
jbU
wnX
@@ -257381,8 +257323,8 @@ gqK
nxU
gjg
dxg
-gJi
-fVC
+doO
+pmA
dkr
cHQ
jDm
@@ -257663,7 +257605,7 @@ kLy
bGA
lKq
bNu
-hUf
+gBg
bKm
xMT
hjE
@@ -257671,8 +257613,8 @@ sJP
bkS
pJc
iBO
-tPx
-trn
+oCm
+tYL
bgx
buv
jhC
@@ -259147,7 +259089,7 @@ fLb
oHh
kKL
bpQ
-bsc
+vrl
oih
dmL
lUC
@@ -259979,7 +259921,7 @@ xUk
aSB
tHT
nsZ
-lHm
+vrg
oZn
sFj
rck
@@ -260209,12 +260151,12 @@ mrw
kuV
cAi
qWn
-nQq
+kck
fOR
tFF
tia
qNn
-hek
+fQP
gNi
krY
clo
@@ -260236,9 +260178,9 @@ xUk
sqt
duE
nsZ
-ijW
-xsP
-rms
+vTe
+aRs
+kXH
sXC
rDZ
rDZ
@@ -262792,7 +262734,7 @@ xnt
egR
pSz
elw
-gEe
+qlB
mEU
enq
kuy
diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm
index 1713d3784311d..e1c8703ba1e38 100644
--- a/_maps/map_files/MetaStation/MetaStation.dmm
+++ b/_maps/map_files/MetaStation/MetaStation.dmm
@@ -269,13 +269,6 @@
/obj/machinery/light/small/directional/south,
/turf/open/floor/carpet,
/area/station/commons/dorms)
-"afM" = (
-/obj/structure/table,
-/obj/machinery/cell_charger,
-/obj/item/stock_parts/power_store/cell/high,
-/obj/effect/turf_decal/delivery,
-/turf/open/floor/iron,
-/area/station/engineering/main)
"afZ" = (
/obj/machinery/vending/coffee,
/obj/structure/disposalpipe/segment,
@@ -462,6 +455,11 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron,
/area/station/security/office)
+"ajc" = (
+/obj/structure/table/wood,
+/obj/item/cigarette/pipe,
+/turf/open/floor/wood,
+/area/station/commons/lounge)
"ajq" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -805,14 +803,6 @@
/obj/machinery/power/apc/auto_name/directional/south,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/security/armory)
-"apO" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
-/obj/machinery/light/cold/directional/west,
-/turf/open/floor/iron/dark,
-/area/station/engineering/transit_tube)
"apS" = (
/obj/structure/sink/directional/east,
/obj/effect/turf_decal/stripes/line{
@@ -1006,6 +996,17 @@
},
/turf/open/floor/iron,
/area/station/security/office)
+"atQ" = (
+/obj/structure/table,
+/obj/item/reagent_containers/condiment/enzyme{
+ pixel_x = -7;
+ pixel_y = 13
+ },
+/obj/item/reagent_containers/condiment/flour{
+ pixel_x = 1
+ },
+/turf/open/floor/plating,
+/area/station/maintenance/port/aft)
"aub" = (
/obj/effect/spawner/random/structure/grille,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -1053,6 +1054,10 @@
},
/turf/open/floor/plating,
/area/station/hallway/secondary/entry)
+"auS" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible,
+/turf/open/floor/engine/xenobio,
+/area/station/science/xenobiology)
"ava" = (
/obj/effect/spawner/random/structure/closet_maintenance,
/obj/item/storage/box/lights/mixed,
@@ -1567,6 +1572,31 @@
},
/turf/open/floor/iron,
/area/station/security/execution/transfer)
+"aEa" = (
+/obj/effect/turf_decal/trimline/purple/filled/line{
+ dir = 1
+ },
+/obj/machinery/button/door/directional/north{
+ id = "rdrnd";
+ name = "Research and Development Containment Control";
+ pixel_x = -6;
+ req_access = list("rd")
+ },
+/obj/machinery/button/door/directional/north{
+ id = "rdordnance";
+ name = "Ordnance Containment Control";
+ pixel_x = 6;
+ req_access = list("rd")
+ },
+/obj/machinery/button/door/directional/north{
+ id = "rdoffice";
+ name = "Privacy Control";
+ pixel_y = 34;
+ req_access = list("rd")
+ },
+/obj/machinery/light/small/directional/north,
+/turf/open/floor/iron/white,
+/area/station/command/heads_quarters/rd)
"aEj" = (
/obj/structure/table,
/obj/item/poster/random_official{
@@ -1739,20 +1769,6 @@
/obj/structure/window/reinforced/spawner/directional/north,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/aisat/exterior)
-"aHH" = (
-/obj/machinery/atmospherics/pipe/smart/simple/dark/visible,
-/obj/effect/turf_decal/siding/purple{
- dir = 4
- },
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
- dir = 1
- },
-/obj/machinery/power/apc/auto_name/directional/east{
- areastring = "/area/station/science/ordnance/burnchamber"
- },
-/obj/structure/cable,
-/turf/open/floor/iron/dark,
-/area/station/science/ordnance)
"aHM" = (
/obj/structure/cable,
/obj/structure/disposalpipe/segment{
@@ -2724,31 +2740,6 @@
},
/turf/open/floor/iron,
/area/station/engineering/break_room)
-"aYl" = (
-/obj/structure/table,
-/obj/item/assembly/igniter{
- pixel_x = -5;
- pixel_y = 3
- },
-/obj/item/assembly/igniter{
- pixel_x = 5;
- pixel_y = -4
- },
-/obj/item/assembly/igniter{
- pixel_x = 2;
- pixel_y = 6
- },
-/obj/item/assembly/igniter{
- pixel_x = 2;
- pixel_y = -1
- },
-/obj/machinery/camera/directional/east{
- c_tag = "Xenobiology Lab - Test Chamber";
- network = list("ss13","rd","xeno")
- },
-/obj/machinery/light/cold/directional/east,
-/turf/open/floor/engine,
-/area/station/science/xenobiology)
"aYw" = (
/obj/machinery/door/airlock/external{
name = "Escape Pod Three";
@@ -2931,12 +2922,6 @@
/obj/effect/mapping_helpers/burnt_floor,
/turf/open/floor/plating,
/area/station/maintenance/starboard/greater)
-"baG" = (
-/obj/structure/table,
-/obj/machinery/cell_charger,
-/obj/item/stock_parts/power_store/cell/high,
-/turf/open/floor/plating,
-/area/station/maintenance/port/aft)
"baM" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -3463,6 +3448,17 @@
/obj/structure/cable,
/turf/open/floor/plating,
/area/station/security/warden)
+"bko" = (
+/obj/machinery/computer/upload/ai,
+/obj/machinery/door/window/right/directional/south{
+ name = "Upload Console Window";
+ req_access = list("ai_upload")
+ },
+/obj/structure/window/reinforced/spawner/directional/west,
+/obj/structure/window/reinforced/spawner/directional/east,
+/obj/structure/window/reinforced/spawner/directional/north,
+/turf/open/floor/iron/dark,
+/area/station/ai_monitored/turret_protected/ai_upload)
"bkF" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -3527,6 +3523,12 @@
"blx" = (
/turf/closed/wall,
/area/space/nearstation)
+"blD" = (
+/obj/machinery/atmospherics/components/unary/outlet_injector/on{
+ dir = 8
+ },
+/turf/open/floor/engine/xenobio,
+/area/station/science/xenobiology)
"blF" = (
/obj/structure/showcase/cyborg/old{
pixel_y = 20
@@ -3787,16 +3789,6 @@
/obj/effect/turf_decal/tile/purple,
/turf/open/floor/iron,
/area/station/hallway/primary/central)
-"bpY" = (
-/obj/machinery/light/small/directional/west,
-/obj/item/clothing/mask/animal/horsehead,
-/obj/structure/table/wood,
-/obj/machinery/airalarm/directional/south,
-/obj/item/cigarette/pipe,
-/obj/item/clothing/mask/fakemoustache,
-/obj/structure/sign/poster/contraband/random/directional/west,
-/turf/open/floor/wood,
-/area/station/service/theater)
"bqg" = (
/obj/structure/cable,
/obj/structure/sign/poster/official/random/directional/east,
@@ -3813,11 +3805,6 @@
/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos,
/turf/open/floor/iron/dark,
/area/station/engineering/atmospherics_engine)
-"bqC" = (
-/obj/structure/table/wood,
-/obj/item/cigarette/pipe,
-/turf/open/floor/wood,
-/area/station/commons/lounge)
"bqJ" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -4231,10 +4218,6 @@
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/iron/white,
/area/station/medical/medbay/central)
-"bxr" = (
-/obj/structure/sign/warning/electric_shock/directional/east,
-/turf/open/space/basic,
-/area/space)
"bxE" = (
/obj/machinery/camera/directional/south{
c_tag = "Chemistry South";
@@ -4298,31 +4281,6 @@
/obj/effect/landmark/start/assistant,
/turf/open/floor/iron,
/area/station/commons/fitness/recreation)
-"byE" = (
-/obj/effect/turf_decal/trimline/purple/filled/line{
- dir = 1
- },
-/obj/machinery/button/door/directional/north{
- id = "rdrnd";
- name = "Research and Development Containment Control";
- pixel_x = -6;
- req_access = list("rd")
- },
-/obj/machinery/button/door/directional/north{
- id = "rdordnance";
- name = "Ordnance Containment Control";
- pixel_x = 6;
- req_access = list("rd")
- },
-/obj/machinery/button/door/directional/north{
- id = "rdoffice";
- name = "Privacy Control";
- pixel_y = 34;
- req_access = list("rd")
- },
-/obj/machinery/light/small/directional/north,
-/turf/open/floor/iron/white,
-/area/station/command/heads_quarters/rd)
"byQ" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -4573,14 +4531,6 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/iron,
/area/station/security/office)
-"bEv" = (
-/obj/machinery/door/airlock/research/glass/incinerator/ordmix_exterior{
- name = "Burn Chamber Exterior Airlock"
- },
-/obj/effect/mapping_helpers/airlock/locked,
-/obj/effect/mapping_helpers/airlock/access/all/science/ordnance,
-/turf/open/floor/engine/vacuum,
-/area/station/science/ordnance/burnchamber)
"bEA" = (
/obj/structure/cable,
/obj/machinery/camera/directional/south{
@@ -4665,19 +4615,6 @@
/obj/machinery/newscaster/directional/east,
/turf/open/floor/iron,
/area/station/science/robotics/lab)
-"bFN" = (
-/obj/machinery/chem_dispenser{
- layer = 2.7
- },
-/obj/machinery/button/door/directional/north{
- id = "pharmacy_shutters";
- name = "pharmacy shutters control";
- pixel_x = 24;
- req_access = list("medical")
- },
-/obj/effect/turf_decal/tile/yellow/fourcorners,
-/turf/open/floor/iron/white,
-/area/station/medical/pharmacy)
"bGo" = (
/obj/effect/turf_decal/stripes/corner{
dir = 1
@@ -4898,6 +4835,15 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/hallway/primary/central)
+"bKi" = (
+/obj/structure/rack,
+/obj/effect/turf_decal/tile/blue/half/contrasted{
+ dir = 4
+ },
+/obj/machinery/light/small/directional/west,
+/obj/effect/spawner/random/armory/dragnet,
+/turf/open/floor/iron/dark,
+/area/station/ai_monitored/security/armory)
"bKv" = (
/obj/item/pen,
/obj/structure/table/reinforced,
@@ -5639,18 +5585,6 @@
},
/turf/open/floor/iron,
/area/station/science/lab)
-"bXg" = (
-/obj/effect/turf_decal/trimline/purple/filled/warning{
- dir = 1
- },
-/obj/structure/table,
-/obj/machinery/cell_charger,
-/obj/item/stock_parts/power_store/cell/high,
-/obj/effect/turf_decal/siding/purple{
- dir = 1
- },
-/turf/open/floor/iron,
-/area/station/science/explab)
"bXk" = (
/obj/machinery/telecomms/server/presets/command,
/turf/open/floor/circuit/telecomms/mainframe,
@@ -5737,19 +5671,6 @@
},
/turf/open/floor/iron,
/area/station/service/hydroponics/garden)
-"bZb" = (
-/obj/structure/table,
-/obj/machinery/button/door{
- id = "xenobio6";
- layer = 3.3;
- name = "Xenobio Pen 6 Blast Doors";
- pixel_y = 1;
- req_access = list("xenobiology")
- },
-/obj/structure/window/reinforced/spawner/directional/east,
-/obj/structure/window/reinforced/spawner/directional/north,
-/turf/open/floor/iron,
-/area/station/science/xenobiology)
"bZq" = (
/obj/machinery/seed_extractor,
/obj/effect/turf_decal/stripes/line{
@@ -5831,17 +5752,6 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/aft)
-"cbp" = (
-/obj/structure/chair/office{
- dir = 8
- },
-/obj/machinery/computer/security/telescreen/normal/directional/north,
-/obj/effect/turf_decal/tile/red/anticorner/contrasted{
- dir = 1
- },
-/obj/machinery/light/small/directional/north,
-/turf/open/floor/iron,
-/area/station/hallway/secondary/exit/departure_lounge)
"cbz" = (
/turf/closed/wall,
/area/station/cargo/storage)
@@ -5897,11 +5807,6 @@
},
/turf/open/floor/iron/dark,
/area/station/command/bridge)
-"cdS" = (
-/obj/structure/table,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/turf/open/floor/iron/dark,
-/area/station/science/ordnance/testlab)
"cdX" = (
/turf/closed/wall,
/area/station/engineering/storage/tech)
@@ -6041,10 +5946,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/plating,
/area/station/maintenance/starboard/fore)
-"cgP" = (
-/obj/machinery/air_sensor/ordnance_burn_chamber,
-/turf/open/floor/engine/vacuum,
-/area/station/science/ordnance/burnchamber)
"cgZ" = (
/obj/machinery/light_switch/directional/east,
/obj/structure/cable,
@@ -7213,25 +7114,6 @@
/obj/structure/railing,
/turf/open/floor/iron,
/area/station/cargo/miningoffice)
-"cCM" = (
-/obj/structure/lattice/catwalk,
-/obj/item/reagent_containers/cup/glass/bottle/rum{
- pixel_x = -7;
- pixel_y = 2
- },
-/obj/item/reagent_containers/cup/glass/colocup{
- pixel_x = 3;
- pixel_y = 3
- },
-/obj/item/reagent_containers/cup/glass/colocup{
- pixel_x = 6;
- pixel_y = -4
- },
-/obj/item/cigarette/rollie/cannabis{
- pixel_y = -3
- },
-/turf/open/space/basic,
-/area/space/nearstation)
"cCN" = (
/obj/item/stack/sheet/iron/fifty,
/obj/item/stack/sheet/iron/fifty,
@@ -7287,17 +7169,6 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/science/genetics)
-"cDO" = (
-/obj/structure/table,
-/obj/item/stack/cable_coil{
- pixel_x = -3;
- pixel_y = 3
- },
-/obj/item/stack/cable_coil,
-/obj/item/stock_parts/power_store/cell/high,
-/obj/structure/extinguisher_cabinet/directional/east,
-/turf/open/floor/iron/dark,
-/area/station/engineering/storage/tech)
"cDP" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -7328,6 +7199,9 @@
},
/turf/open/floor/iron,
/area/station/commons/lounge)
+"cEn" = (
+/turf/open/floor/engine/vacuum,
+/area/station/science/ordnance/burnchamber)
"cEv" = (
/obj/item/food/grown/wheat,
/obj/item/food/grown/watermelon,
@@ -7400,6 +7274,23 @@
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/station/security/brig)
+"cGA" = (
+/obj/machinery/atmospherics/components/unary/portables_connector/visible,
+/obj/effect/turf_decal/box,
+/obj/machinery/portable_atmospherics/canister,
+/obj/item/radio/intercom/directional/north,
+/obj/merge_conflict_marker{
+ name = "---Merge Conflict Marker---";
+
+ desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
+ },
+/obj/machinery/atmospherics/components/unary/portables_connector/visible,
+/obj/effect/turf_decal/box,
+/obj/machinery/portable_atmospherics/canister,
+/obj/item/radio/intercom/directional/north,
+/obj/structure/sign/warning/gas_mask/directional/east,
+/turf/open/floor/iron,
+/area/station/science/xenobiology)
"cGG" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -7473,6 +7364,12 @@
},
/turf/open/floor/plating,
/area/station/science/genetics)
+"cIl" = (
+/obj/structure/table,
+/obj/machinery/cell_charger,
+/obj/item/stock_parts/power_store/cell/high,
+/turf/open/floor/plating,
+/area/station/maintenance/port/aft)
"cIK" = (
/obj/machinery/smartfridge/chemistry/preloaded,
/obj/effect/turf_decal/tile/yellow/fourcorners,
@@ -7794,12 +7691,6 @@
/obj/structure/cable,
/turf/open/floor/plating,
/area/station/command/heads_quarters/cmo)
-"cOT" = (
-/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/ordnance_burn_chamber_input{
- dir = 1
- },
-/turf/open/floor/engine/vacuum,
-/area/station/science/ordnance/burnchamber)
"cOX" = (
/obj/structure/sign/warning/radiation/rad_area/directional/north,
/obj/effect/turf_decal/stripes/line{
@@ -7979,14 +7870,6 @@
},
/turf/open/floor/plating,
/area/station/maintenance/starboard/aft)
-"cTk" = (
-/obj/machinery/camera/motion/directional/south{
- active_power_usage = 0;
- c_tag = "Armory - External";
- use_power = 0
- },
-/turf/open/space/basic,
-/area/space)
"cTl" = (
/obj/structure/table/glass,
/obj/item/reagent_containers/syringe,
@@ -8434,6 +8317,25 @@
/obj/structure/cable,
/turf/open/floor/iron/dark,
/area/station/command/heads_quarters/cmo)
+"dbQ" = (
+/obj/machinery/computer/crew{
+ dir = 4
+ },
+/obj/machinery/keycard_auth/directional/south{
+ pixel_x = 6
+ },
+/obj/machinery/button/door/directional/south{
+ id = "cmoprivacy";
+ name = "CMO Privacy Shutters";
+ pixel_x = -8;
+ req_access = list("cmo")
+ },
+/obj/effect/turf_decal/tile/blue/anticorner/contrasted{
+ dir = 8
+ },
+/obj/machinery/computer/security/telescreen/cmo/directional/west,
+/turf/open/floor/iron/white,
+/area/station/command/heads_quarters/cmo)
"dbX" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -8983,12 +8885,6 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/hallway/primary/central)
-"dkX" = (
-/obj/structure/cable,
-/obj/machinery/light/cold/directional/north,
-/obj/machinery/computer/security/telescreen/isolation/directional/north,
-/turf/open/floor/iron,
-/area/station/security/execution/transfer)
"dla" = (
/obj/structure/chair/stool/directional/west,
/obj/effect/turf_decal/trimline/red/warning{
@@ -9189,6 +9085,10 @@
/obj/machinery/light/floor,
/turf/open/floor/iron,
/area/station/commons/locker)
+"dpz" = (
+/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible,
+/turf/closed/wall/r_wall,
+/area/station/science/ordnance/burnchamber)
"dpI" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -9248,27 +9148,6 @@
/obj/structure/closet/emcloset,
/turf/open/floor/plating,
/area/station/hallway/secondary/entry)
-"dqy" = (
-/obj/machinery/status_display/evac/directional/north,
-/obj/machinery/porta_turret/ai,
-/obj/machinery/computer/security/telescreen/minisat/directional/east,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/turf/open/floor/iron/dark,
-/area/station/ai_monitored/turret_protected/aisat_interior)
-"dqE" = (
-/obj/structure/closet/toolcloset,
-/obj/effect/turf_decal/bot,
-/obj/effect/turf_decal/tile/yellow{
- dir = 4
- },
-/obj/machinery/light/small/directional/north,
-/obj/item/lightreplacer{
- pixel_y = 7
- },
-/turf/open/floor/iron/dark/corner{
- dir = 1
- },
-/area/station/engineering/storage_shared)
"dqI" = (
/obj/effect/turf_decal/bot,
/obj/machinery/vending/cigarette,
@@ -9603,24 +9482,6 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/plating,
/area/station/maintenance/port/fore)
-"dwI" = (
-/obj/structure/disposalpipe/trunk{
- dir = 1
- },
-/obj/machinery/disposal/delivery_chute{
- dir = 4
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/obj/structure/window/spawner/directional/south,
-/obj/structure/window/spawner/directional/north,
-/obj/structure/window/spawner/directional/west,
-/obj/machinery/door/window/right/directional/east{
- layer = 3
- },
-/turf/open/floor/plating,
-/area/station/maintenance/disposal)
"dwJ" = (
/obj/structure/lattice,
/obj/effect/spawner/random/structure/grille,
@@ -9721,14 +9582,6 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/science/robotics/mechbay)
-"dzX" = (
-/obj/structure/table,
-/obj/machinery/cell_charger,
-/obj/item/stock_parts/power_store/cell/high,
-/obj/machinery/light_switch/directional/north,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/turf/open/floor/iron/dark,
-/area/station/command/teleporter)
"dzY" = (
/obj/machinery/light/small/directional/south,
/turf/open/floor/engine/n2o,
@@ -9898,6 +9751,22 @@
/obj/effect/landmark/event_spawn,
/turf/open/floor/iron,
/area/station/science/robotics/mechbay)
+"dEk" = (
+/obj/effect/turf_decal/bot,
+/obj/structure/rack,
+/obj/machinery/status_display/evac/directional/east,
+/obj/effect/turf_decal/tile/yellow{
+ dir = 4
+ },
+/obj/item/flatpack{
+ board = /obj/item/circuitboard/machine/flatpacker;
+ pixel_x = -5
+ },
+/obj/item/multitool{
+ pixel_x = 8
+ },
+/turf/open/floor/iron/checker,
+/area/station/engineering/storage_shared)
"dEx" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -9908,14 +9777,6 @@
},
/turf/open/floor/iron,
/area/station/engineering/gravity_generator)
-"dEF" = (
-/obj/machinery/atmospherics/components/binary/pump/on,
-/obj/machinery/light/small/directional/east,
-/obj/machinery/atmospherics/pipe/layer_manifold/supply/hidden{
- dir = 4
- },
-/turf/open/floor/engine,
-/area/station/science/ordnance/burnchamber)
"dEH" = (
/obj/effect/landmark/generic_maintenance_landmark,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
@@ -10033,6 +9894,14 @@
/obj/effect/turf_decal/trimline/green/filled/corner,
/turf/open/floor/iron,
/area/station/hallway/primary/central)
+"dGP" = (
+/obj/machinery/camera/motion/directional/south{
+ active_power_usage = 0;
+ c_tag = "Armory - External";
+ use_power = 0
+ },
+/turf/open/space/basic,
+/area/space/nearstation)
"dGQ" = (
/obj/machinery/light/small/dim/directional/north,
/turf/open/floor/wood,
@@ -10281,12 +10150,6 @@
/obj/structure/cable,
/turf/open/floor/iron/dark,
/area/station/engineering/atmospherics_engine)
-"dLm" = (
-/obj/machinery/sparker/directional/north{
- id = "Xenobio"
- },
-/turf/open/floor/engine,
-/area/station/science/xenobiology)
"dLn" = (
/obj/structure/rack,
/obj/item/wrench/medical,
@@ -10609,20 +10472,6 @@
},
/turf/open/floor/circuit/green/telecomms/mainframe,
/area/station/tcommsat/server)
-"dQL" = (
-/obj/machinery/light_switch/directional/west{
- pixel_x = -20
- },
-/obj/machinery/computer/records/medical{
- dir = 4
- },
-/obj/effect/turf_decal/tile/red/fourcorners,
-/obj/machinery/light/small/directional/west,
-/obj/machinery/computer/security/telescreen/cmo/directional/west{
- name = "Medbay Monitor"
- },
-/turf/open/floor/iron/dark,
-/area/station/security/checkpoint/medical)
"dQO" = (
/obj/effect/landmark/start/atmospheric_technician,
/obj/effect/decal/cleanable/dirt,
@@ -10831,10 +10680,11 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/commons/locker)
-"dTN" = (
-/obj/machinery/atmospherics/pipe/smart/simple/dark/visible,
-/turf/closed/wall/r_wall,
-/area/station/science/ordnance/burnchamber)
+"dTL" = (
+/obj/structure/table,
+/obj/item/cigarette/pipe,
+/turf/open/floor/plating,
+/area/station/maintenance/port)
"dTQ" = (
/obj/effect/turf_decal/trimline/green/filled/corner{
dir = 4
@@ -11055,6 +10905,30 @@
/obj/effect/turf_decal/delivery,
/turf/open/floor/plating,
/area/station/security/prison)
+"dXp" = (
+/obj/structure/table,
+/obj/item/stack/sheet/iron/fifty,
+/obj/item/stack/sheet/iron/fifty,
+/obj/item/stack/sheet/iron/fifty,
+/obj/item/stack/sheet/glass/fifty,
+/obj/item/stack/sheet/glass/fifty,
+/obj/item/stack/sheet/glass/fifty,
+/obj/item/crowbar,
+/obj/item/grenade/chem_grenade/smart_metal_foam,
+/obj/item/grenade/chem_grenade/smart_metal_foam,
+/obj/effect/turf_decal/bot{
+ dir = 1
+ },
+/obj/item/stock_parts/power_store/cell/emproof{
+ pixel_x = -6;
+ pixel_y = 2
+ },
+/obj/item/stock_parts/power_store/cell/emproof{
+ pixel_x = 4;
+ pixel_y = 6
+ },
+/turf/open/floor/iron,
+/area/station/engineering/main)
"dXs" = (
/obj/structure/secure_safe/directional/north{
name = "armory safe A"
@@ -11093,9 +10967,6 @@
},
/turf/open/floor/iron/dark,
/area/station/security/execution/education)
-"dXU" = (
-/turf/open/floor/engine/vacuum,
-/area/station/science/ordnance/burnchamber)
"dYa" = (
/obj/effect/turf_decal/tile/blue/fourcorners,
/turf/open/floor/iron,
@@ -11346,6 +11217,12 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/central)
+"ebR" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
+ dir = 1
+ },
+/turf/open/floor/engine/vacuum,
+/area/station/science/ordnance/burnchamber)
"ebV" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/door/poddoor/shutters/preopen{
@@ -11744,16 +11621,18 @@
dir = 8
},
/area/station/service/chapel)
-"ehN" = (
-/obj/structure/table,
-/obj/machinery/cell_charger{
- pixel_y = 5
+"ehL" = (
+/obj/effect/turf_decal/trimline/purple/filled/warning{
+ dir = 1
},
-/obj/item/stack/cable_coil,
-/obj/item/multitool,
+/obj/structure/table,
+/obj/machinery/cell_charger,
/obj/item/stock_parts/power_store/cell/high,
-/turf/open/floor/engine,
-/area/station/science/xenobiology)
+/obj/effect/turf_decal/siding/purple{
+ dir = 1
+ },
+/turf/open/floor/iron,
+/area/station/science/explab)
"ehX" = (
/turf/open/floor/iron/dark,
/area/station/medical/storage)
@@ -12220,6 +12099,25 @@
},
/turf/open/floor/iron/white,
/area/station/science/cytology)
+"epD" = (
+/obj/structure/lattice/catwalk,
+/obj/item/reagent_containers/cup/glass/bottle/rum{
+ pixel_x = -7;
+ pixel_y = 2
+ },
+/obj/item/reagent_containers/cup/glass/colocup{
+ pixel_x = 3;
+ pixel_y = 3
+ },
+/obj/item/reagent_containers/cup/glass/colocup{
+ pixel_x = 6;
+ pixel_y = -4
+ },
+/obj/item/cigarette/rollie/cannabis{
+ pixel_y = -3
+ },
+/turf/open/space/basic,
+/area/space/nearstation)
"epF" = (
/obj/machinery/chem_master/condimaster{
desc = "Used to separate out liquids - useful for purifying botanical extracts. Also dispenses condiments.";
@@ -12537,25 +12435,6 @@
"eut" = (
/turf/closed/wall,
/area/station/science/robotics/lab)
-"euw" = (
-/obj/effect/turf_decal/stripes/corner{
- dir = 4
- },
-/obj/structure/table/reinforced,
-/obj/machinery/cell_charger,
-/obj/item/stock_parts/power_store/cell/high,
-/obj/machinery/firealarm/directional/west,
-/obj/machinery/camera/directional/north{
- c_tag = "Science Mechbay";
- network = list("ss13","rd")
- },
-/obj/machinery/button/door/directional/north{
- id = "mechbay";
- name = "Mech Bay Shutters Control";
- req_access = list("robotics")
- },
-/turf/open/floor/iron,
-/area/station/science/robotics/mechbay)
"euQ" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -12577,6 +12456,18 @@
/obj/effect/landmark/event_spawn,
/turf/open/floor/iron/white,
/area/station/security/medical)
+"eva" = (
+/obj/structure/table,
+/obj/machinery/button/door{
+ id = "xenobio2";
+ name = "Xenobio Pen 2 Blast Doors";
+ pixel_y = 1;
+ req_access = list("xenobiology")
+ },
+/obj/structure/window/reinforced/spawner/directional/north,
+/obj/structure/window/reinforced/spawner/directional/west,
+/turf/open/floor/iron,
+/area/station/science/xenobiology)
"evf" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 1
@@ -12767,6 +12658,15 @@
/obj/effect/turf_decal/tile/blue/fourcorners,
/turf/open/floor/iron/white,
/area/station/medical/surgery/theatre)
+"eyz" = (
+/obj/machinery/cell_charger{
+ pixel_y = 4
+ },
+/obj/structure/table/glass,
+/obj/item/stock_parts/power_store/cell/high,
+/obj/structure/window/reinforced/spawner/directional/west,
+/turf/open/floor/iron/dark,
+/area/station/command/bridge)
"eyD" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible,
@@ -12788,22 +12688,6 @@
},
/turf/open/floor/iron,
/area/station/security/brig)
-"ezw" = (
-/obj/effect/decal/cleanable/cobweb/cobweb2,
-/obj/effect/turf_decal/siding/wood/corner{
- dir = 8
- },
-/obj/effect/turf_decal/siding/wood{
- dir = 5
- },
-/obj/item/kirbyplants/random{
- pixel_x = -7
- },
-/obj/machinery/camera/directional/north,
-/obj/machinery/digital_clock/directional/east,
-/obj/structure/extinguisher_cabinet/directional/north,
-/turf/open/floor/wood/large,
-/area/station/command/heads_quarters/qm)
"ezT" = (
/obj/machinery/door/airlock/research{
name = "Research Division Access"
@@ -12915,6 +12799,25 @@
/obj/effect/mapping_helpers/airlock/access/any/command/captain,
/turf/open/floor/iron/white,
/area/station/command/heads_quarters/captain/private)
+"eCE" = (
+/obj/machinery/recharger{
+ pixel_y = 4
+ },
+/obj/machinery/camera/directional/north{
+ c_tag = "Security Post - Medbay";
+ network = list("ss13","medbay")
+ },
+/obj/effect/turf_decal/tile/red/fourcorners,
+/obj/machinery/light/small/directional/north,
+/obj/structure/table/reinforced,
+/obj/machinery/requests_console/directional/north{
+ department = "Security";
+ name = "Security Requests Console"
+ },
+/obj/effect/mapping_helpers/requests_console/assistance,
+/obj/effect/mapping_helpers/requests_console/supplies,
+/turf/open/floor/iron/dark,
+/area/station/security/checkpoint/medical)
"eCK" = (
/obj/machinery/computer/arcade/orion_trail{
desc = "For gamers only. Casuals need not apply.";
@@ -13082,6 +12985,23 @@
/obj/machinery/light/small/directional/south,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/aisat/exterior)
+"eGb" = (
+/obj/machinery/computer/mecha{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/purple/filled/line{
+ dir = 5
+ },
+/obj/machinery/requests_console/directional/east{
+ department = "Research Director's Desk";
+ name = "Research Director's Requests Console"
+ },
+/obj/effect/mapping_helpers/requests_console/announcement,
+/obj/effect/mapping_helpers/requests_console/information,
+/obj/effect/mapping_helpers/requests_console/assistance,
+/obj/machinery/computer/security/telescreen/rd/directional/north,
+/turf/open/floor/iron/white,
+/area/station/command/heads_quarters/rd)
"eGd" = (
/obj/machinery/door/window/left/directional/north{
name = "MiniSat Walkway Access"
@@ -13180,16 +13100,6 @@
/obj/machinery/light/small/directional/west,
/turf/open/floor/iron/white,
/area/station/science/research)
-"eJd" = (
-/obj/structure/table/wood,
-/obj/machinery/computer/security/telescreen/prison/directional/north,
-/obj/item/flashlight/lamp/green{
- pixel_x = 1;
- pixel_y = 5
- },
-/obj/item/book/manual/wiki/security_space_law,
-/turf/open/floor/wood,
-/area/station/service/lawoffice)
"eJh" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -13699,10 +13609,6 @@
},
/turf/open/floor/iron,
/area/station/cargo/lobby)
-"eRn" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/closed/wall/r_wall,
-/area/station/science/ordnance/burnchamber)
"eRR" = (
/obj/structure/table,
/obj/item/screwdriver{
@@ -13739,6 +13645,32 @@
/obj/machinery/light/small/directional/north,
/turf/open/floor/engine,
/area/station/science/xenobiology)
+"eSt" = (
+/obj/structure/table,
+/obj/item/paper_bin{
+ pixel_x = -1;
+ pixel_y = 5
+ },
+/obj/item/pen,
+/obj/machinery/button/door/directional/east{
+ id = "Engineering";
+ name = "Engineering Lockdown";
+ pixel_y = 16;
+ req_access = list("engineering")
+ },
+/obj/machinery/button/door/directional/east{
+ id = "atmos";
+ name = "Atmospherics Lockdown";
+ pixel_y = 24;
+ req_access = list("atmospherics")
+ },
+/obj/effect/turf_decal/tile/red/half/contrasted{
+ dir = 4
+ },
+/obj/machinery/light/small/directional/east,
+/obj/machinery/computer/security/telescreen/engine/directional/east,
+/turf/open/floor/iron,
+/area/station/security/checkpoint/engineering)
"eSy" = (
/obj/machinery/computer/station_alert{
dir = 4
@@ -13780,32 +13712,6 @@
},
/turf/open/floor/iron,
/area/station/commons/fitness/recreation)
-"eTt" = (
-/obj/structure/cable,
-/obj/structure/table/wood/fancy/black,
-/obj/item/storage/fancy/cigarettes/cigars/cohiba{
- pixel_x = 3;
- pixel_y = 14
- },
-/obj/item/reagent_containers/cup/glass/bottle/champagne{
- pixel_x = -7;
- pixel_y = 8
- },
-/obj/item/cigarette/cigar{
- pixel_x = 4;
- pixel_y = 3
- },
-/obj/item/cigarette/cigar{
- pixel_x = 8
- },
-/obj/effect/turf_decal/siding/wood{
- dir = 9
- },
-/obj/machinery/keycard_auth/directional/north{
- pixel_x = -5
- },
-/turf/open/floor/wood/large,
-/area/station/command/heads_quarters/qm)
"eTI" = (
/obj/effect/turf_decal/stripes/line{
dir = 10
@@ -14126,6 +14032,11 @@
/obj/effect/landmark/navigate_destination,
/turf/open/floor/iron/white,
/area/station/science/genetics)
+"eZB" = (
+/obj/structure/chair,
+/obj/machinery/computer/security/telescreen/interrogation/directional/west,
+/turf/open/floor/iron/grimy,
+/area/station/security/interrogation)
"eZI" = (
/obj/structure/table,
/obj/item/clothing/glasses/sunglasses{
@@ -14421,6 +14332,20 @@
/obj/item/aquarium_kit,
/turf/open/floor/iron,
/area/station/hallway/secondary/service)
+"ffO" = (
+/obj/structure/closet/toolcloset,
+/obj/effect/turf_decal/bot,
+/obj/effect/turf_decal/tile/yellow{
+ dir = 4
+ },
+/obj/machinery/light/small/directional/north,
+/obj/item/lightreplacer{
+ pixel_y = 7
+ },
+/turf/open/floor/iron/dark/corner{
+ dir = 1
+ },
+/area/station/engineering/storage_shared)
"ffP" = (
/obj/effect/spawner/random/structure/grille,
/turf/open/floor/plating/foam{
@@ -14594,15 +14519,6 @@
},
/turf/open/floor/wood/large,
/area/station/commons/lounge)
-"fhU" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
- dir = 8
- },
-/obj/machinery/light/small/directional/east,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/machinery/computer/security/telescreen/ordnance/directional/east,
-/turf/open/floor/iron/dark,
-/area/station/science/ordnance/testlab)
"fia" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/hatch{
@@ -15273,6 +15189,19 @@
/obj/effect/mapping_helpers/airlock/access/all/security/entrance,
/turf/open/floor/iron,
/area/station/security/brig)
+"frK" = (
+/obj/structure/table/glass,
+/obj/machinery/cell_charger,
+/obj/item/stack/cable_coil,
+/obj/item/assembly/igniter,
+/obj/item/stock_parts/power_store/cell,
+/obj/machinery/power/apc/auto_name/directional/north,
+/obj/structure/cable,
+/obj/effect/turf_decal/tile/purple/anticorner/contrasted{
+ dir = 4
+ },
+/turf/open/floor/iron/white,
+/area/station/science/lobby)
"frZ" = (
/obj/effect/turf_decal/delivery,
/obj/machinery/atmospherics/components/binary/pump{
@@ -15372,6 +15301,20 @@
},
/turf/open/floor/iron/white,
/area/station/medical/medbay/central)
+"fva" = (
+/obj/machinery/light_switch/directional/west{
+ pixel_x = -20
+ },
+/obj/machinery/computer/records/medical{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/red/fourcorners,
+/obj/machinery/light/small/directional/west,
+/obj/machinery/computer/security/telescreen/cmo/directional/west{
+ name = "Medbay Monitor"
+ },
+/turf/open/floor/iron/dark,
+/area/station/security/checkpoint/medical)
"fvE" = (
/turf/closed/wall/r_wall,
/area/station/maintenance/department/medical/central)
@@ -15392,6 +15335,16 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/science/ordnance/testlab)
+"fvP" = (
+/obj/structure/sign/warning/electric_shock/directional/east,
+/turf/open/space/basic,
+/area/space/nearstation)
+"fvR" = (
+/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/incinerator_ordmix{
+ dir = 8
+ },
+/turf/open/floor/engine,
+/area/station/science/ordnance/burnchamber)
"fwb" = (
/obj/effect/turf_decal/tile/brown/opposingcorners,
/turf/open/floor/iron,
@@ -15404,6 +15357,10 @@
},
/turf/open/floor/iron,
/area/station/cargo/storage)
+"fwp" = (
+/obj/item/stack/rods,
+/turf/open/space/basic,
+/area/space/nearstation)
"fwz" = (
/obj/machinery/portable_atmospherics/canister/nitrogen,
/turf/open/floor/iron/dark,
@@ -15448,6 +15405,20 @@
/obj/structure/marker_beacon/olive,
/turf/open/space/basic,
/area/space/nearstation)
+"fxE" = (
+/obj/structure/table/reinforced,
+/obj/item/stock_parts/power_store/cell/high{
+ pixel_x = 4;
+ pixel_y = 5
+ },
+/obj/item/stock_parts/power_store/cell/high{
+ pixel_x = -8;
+ pixel_y = 9
+ },
+/obj/item/stock_parts/power_store/cell/high,
+/obj/machinery/cell_charger,
+/turf/open/floor/iron,
+/area/station/science/robotics/lab)
"fxI" = (
/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -15596,13 +15567,6 @@
/obj/machinery/light/small/directional/south,
/turf/open/floor/iron/grimy,
/area/station/service/chapel/office)
-"fAA" = (
-/obj/structure/table,
-/obj/machinery/cell_charger,
-/obj/machinery/airalarm/directional/east,
-/obj/item/stock_parts/power_store/cell/high,
-/turf/open/floor/iron/dark,
-/area/station/engineering/storage/tech)
"fAE" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -15685,6 +15649,16 @@
/obj/effect/turf_decal/tile/green/fourcorners,
/turf/open/floor/iron,
/area/station/hallway/primary/central)
+"fCB" = (
+/obj/structure/table/wood,
+/obj/machinery/computer/security/telescreen/prison/directional/north,
+/obj/item/flashlight/lamp/green{
+ pixel_x = 1;
+ pixel_y = 5
+ },
+/obj/item/book/manual/wiki/security_space_law,
+/turf/open/floor/wood,
+/area/station/service/lawoffice)
"fDc" = (
/obj/machinery/door/firedoor,
/obj/structure/disposalpipe/segment{
@@ -15700,6 +15674,18 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/central)
+"fDl" = (
+/obj/structure/table,
+/obj/machinery/button/door{
+ id = "xenobio3";
+ name = "Xenobio Pen 3 Blast Doors";
+ pixel_y = 4;
+ req_access = list("xenobiology")
+ },
+/obj/structure/window/reinforced/spawner/directional/east,
+/obj/structure/window/reinforced/spawner/directional/south,
+/turf/open/floor/iron,
+/area/station/science/xenobiology)
"fDC" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 8
@@ -16005,10 +15991,6 @@
/obj/machinery/telecomms/server/presets/supply,
/turf/open/floor/circuit/telecomms/mainframe,
/area/station/tcommsat/server)
-"fIR" = (
-/obj/structure/sign/warning/secure_area/directional/north,
-/turf/open/space/basic,
-/area/space)
"fIS" = (
/obj/machinery/airalarm/directional/south,
/obj/structure/disposalpipe/segment{
@@ -16237,6 +16219,13 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/command/heads_quarters/ce)
+"fMR" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/disposalpipe/segment,
+/obj/item/stock_parts/power_store/cell/high,
+/turf/open/floor/plating,
+/area/station/maintenance/starboard/greater)
"fMT" = (
/obj/structure/table,
/obj/item/radio/intercom/directional/south,
@@ -16263,16 +16252,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/security/brig)
-"fNz" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/closet/crate,
-/obj/effect/spawner/random/maintenance,
-/obj/effect/spawner/random/maintenance,
-/obj/effect/spawner/random/maintenance,
-/obj/effect/turf_decal/stripes/corner,
-/obj/item/reagent_containers/cup/soda_cans/pwr_game,
-/turf/open/floor/iron,
-/area/station/cargo/warehouse)
"fNI" = (
/obj/structure/sign/poster/contraband/random/directional/east,
/turf/open/floor/wood,
@@ -16643,6 +16622,14 @@
/obj/structure/closet/crate,
/turf/open/floor/iron,
/area/station/cargo/sorting)
+"fWo" = (
+/obj/structure/disposalpipe/segment,
+/obj/machinery/computer/security/telescreen/engine/directional/east,
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/turf/open/floor/iron/dark,
+/area/station/command/heads_quarters/ce)
"fWw" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -16873,6 +16860,20 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/hallway/primary/starboard)
+"gaP" = (
+/obj/item/stack/sheet/iron/fifty,
+/obj/item/stack/rods/fifty,
+/obj/item/stack/sheet/glass/fifty,
+/obj/item/electronics/airlock,
+/obj/item/electronics/airlock,
+/obj/item/stock_parts/power_store/cell/high,
+/obj/item/stack/sheet/mineral/plasma{
+ amount = 30
+ },
+/obj/item/gps,
+/obj/structure/closet/crate/engineering,
+/turf/open/floor/plating,
+/area/station/engineering/main)
"gaU" = (
/obj/machinery/button/door/directional/west{
id = "hop";
@@ -16899,25 +16900,15 @@
},
/turf/open/floor/iron/white,
/area/station/medical/storage)
-"gbn" = (
-/obj/machinery/computer/crew{
- dir = 4
- },
-/obj/machinery/keycard_auth/directional/south{
- pixel_x = 6
- },
-/obj/machinery/button/door/directional/south{
- id = "cmoprivacy";
- name = "CMO Privacy Shutters";
- pixel_x = -8;
- req_access = list("cmo")
- },
-/obj/effect/turf_decal/tile/blue/anticorner/contrasted{
- dir = 8
+"gbi" = (
+/obj/machinery/camera/directional/west{
+ active_power_usage = 0;
+ c_tag = "Turbine Vent";
+ network = list("turbine");
+ use_power = 0
},
-/obj/machinery/computer/security/telescreen/cmo/directional/west,
-/turf/open/floor/iron/white,
-/area/station/command/heads_quarters/cmo)
+/turf/open/space/basic,
+/area/space/nearstation)
"gbG" = (
/obj/effect/spawner/random/structure/closet_maintenance,
/obj/item/storage/box/lights/mixed,
@@ -16948,6 +16939,20 @@
/obj/effect/mapping_helpers/airlock/unres,
/turf/open/floor/plating,
/area/station/science/research)
+"gcz" = (
+/obj/structure/closet/crate,
+/obj/item/stock_parts/power_store/cell/high,
+/obj/item/stack/cable_coil{
+ pixel_x = 3;
+ pixel_y = -7
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 9
+ },
+/obj/effect/spawner/random/engineering/flashlight,
+/obj/effect/spawner/random/engineering/flashlight,
+/turf/open/floor/iron,
+/area/station/cargo/miningoffice)
"gcA" = (
/obj/machinery/navbeacon{
codes_txt = "patrol;next_patrol=5-Customs";
@@ -16987,12 +16992,6 @@
},
/turf/open/floor/grass,
/area/station/science/research)
-"gda" = (
-/obj/structure/sign/nanotrasen{
- pixel_x = 32
- },
-/turf/open/space/basic,
-/area/space)
"gdb" = (
/turf/closed/wall/r_wall,
/area/station/security/range)
@@ -17229,18 +17228,6 @@
"ghL" = (
/turf/closed/wall/r_wall,
/area/space/nearstation)
-"gil" = (
-/obj/machinery/atmospherics/components/binary/pump{
- dir = 1
- },
-/obj/machinery/airlock_sensor/incinerator_ordmix{
- pixel_x = -24
- },
-/obj/machinery/atmospherics/pipe/layer_manifold/scrubbers/hidden{
- dir = 4
- },
-/turf/open/floor/engine,
-/area/station/science/ordnance/burnchamber)
"giA" = (
/turf/closed/wall/r_wall,
/area/station/tcommsat/computer)
@@ -17313,19 +17300,6 @@
/obj/effect/turf_decal/bot,
/turf/open/floor/iron,
/area/station/service/hydroponics)
-"gkC" = (
-/obj/structure/table,
-/obj/machinery/button/door{
- id = "xenobio7";
- layer = 3.3;
- name = "Xenobio Pen 7 Blast Doors";
- pixel_y = 4;
- req_access = list("xenobiology")
- },
-/obj/structure/window/reinforced/spawner/directional/south,
-/obj/structure/window/reinforced/spawner/directional/west,
-/turf/open/floor/iron,
-/area/station/science/xenobiology)
"gkD" = (
/obj/machinery/recharger{
pixel_y = 3
@@ -17393,6 +17367,10 @@
/obj/effect/spawner/random/structure/crate,
/turf/open/floor/plating,
/area/station/maintenance/aft/lesser)
+"gmc" = (
+/obj/item/toy/beach_ball/branded,
+/turf/open/space/basic,
+/area/space/nearstation)
"gmi" = (
/obj/structure/cable,
/obj/effect/decal/cleanable/dirt,
@@ -18146,10 +18124,6 @@
/obj/machinery/light/no_nightlight/directional/west,
/turf/open/floor/iron,
/area/station/engineering/atmos)
-"gyK" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible,
-/turf/open/floor/engine,
-/area/station/science/xenobiology)
"gyO" = (
/obj/structure/cable,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
@@ -18177,15 +18151,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/plating,
/area/station/maintenance/port/aft)
-"gzO" = (
-/obj/machinery/firealarm/directional/west,
-/obj/machinery/camera/directional/west{
- c_tag = "Restrooms"
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/duct,
-/turf/open/floor/iron/freezer,
-/area/station/commons/toilet/restrooms)
"gzW" = (
/obj/structure/chair/office{
dir = 8
@@ -18476,12 +18441,6 @@
/obj/structure/table/wood,
/turf/open/floor/carpet,
/area/station/service/chapel/funeral)
-"gFb" = (
-/obj/structure/railing{
- dir = 1
- },
-/turf/open/space/basic,
-/area/space)
"gFd" = (
/obj/machinery/power/terminal,
/obj/machinery/light/small/directional/east,
@@ -18875,19 +18834,6 @@
},
/turf/open/floor/iron,
/area/station/engineering/main)
-"gLU" = (
-/obj/structure/table,
-/obj/effect/turf_decal/siding{
- dir = 9
- },
-/obj/item/stock_parts/matter_bin{
- pixel_x = 3;
- pixel_y = 3
- },
-/obj/item/stock_parts/matter_bin,
-/obj/item/stock_parts/micro_laser,
-/turf/open/floor/iron,
-/area/station/science/lab)
"gLY" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/rack,
@@ -19337,19 +19283,6 @@
/obj/effect/mapping_helpers/burnt_floor,
/turf/open/floor/plating,
/area/station/maintenance/starboard/fore)
-"gVE" = (
-/obj/structure/table/glass,
-/obj/machinery/cell_charger,
-/obj/item/stack/cable_coil,
-/obj/item/assembly/igniter,
-/obj/item/stock_parts/power_store/cell,
-/obj/machinery/power/apc/auto_name/directional/north,
-/obj/structure/cable,
-/obj/effect/turf_decal/tile/purple/anticorner/contrasted{
- dir = 4
- },
-/turf/open/floor/iron/white,
-/area/station/science/lobby)
"gVO" = (
/obj/effect/turf_decal/trimline/purple/corner{
dir = 1
@@ -19518,6 +19451,18 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/commons/fitness/recreation)
+"gYB" = (
+/obj/structure/table,
+/obj/machinery/button/door{
+ id = "xenobio7";
+ name = "Xenobio Pen 7 Blast Doors";
+ pixel_y = 4;
+ req_access = list("xenobiology")
+ },
+/obj/structure/window/reinforced/spawner/directional/south,
+/obj/structure/window/reinforced/spawner/directional/west,
+/turf/open/floor/iron,
+/area/station/science/xenobiology)
"gYC" = (
/obj/effect/spawner/random/trash/mess,
/obj/effect/spawner/random/engineering/tracking_beacon,
@@ -19818,6 +19763,14 @@
/obj/effect/mapping_helpers/burnt_floor,
/turf/open/floor/plating,
/area/station/maintenance/starboard/lesser)
+"her" = (
+/obj/structure/filingcabinet,
+/obj/machinery/computer/security/telescreen/minisat/directional/east,
+/obj/effect/turf_decal/tile/red/half/contrasted{
+ dir = 4
+ },
+/turf/open/floor/iron,
+/area/station/security/checkpoint/engineering)
"hey" = (
/obj/structure/window/reinforced/spawner/directional/west,
/obj/structure/window/reinforced/spawner/directional/south,
@@ -21098,6 +21051,13 @@
/obj/structure/window/reinforced/spawner/directional/south,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/aisat/exterior)
+"hAJ" = (
+/obj/machinery/light/small/directional/west,
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable,
+/obj/structure/sign/poster/official/random/directional/west,
+/turf/open/floor/iron,
+/area/station/commons/toilet/auxiliary)
"hAL" = (
/obj/machinery/door/poddoor/shutters{
dir = 4;
@@ -21572,6 +21532,14 @@
},
/turf/open/floor/iron/dark,
/area/station/engineering/transit_tube)
+"hKl" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/turf_decal/tile/blue{
+ dir = 8
+ },
+/obj/machinery/light/cold/directional/west,
+/turf/open/floor/iron/dark,
+/area/station/engineering/transit_tube)
"hKp" = (
/obj/effect/decal/cleanable/cobweb/cobweb2,
/obj/effect/spawner/random/structure/closet_maintenance,
@@ -21993,20 +21961,6 @@
},
/turf/open/floor/wood,
/area/station/service/cafeteria)
-"hSi" = (
-/obj/item/stack/sheet/iron/fifty,
-/obj/item/stack/rods/fifty,
-/obj/item/stack/sheet/glass/fifty,
-/obj/item/electronics/airlock,
-/obj/item/electronics/airlock,
-/obj/item/stock_parts/power_store/cell/high,
-/obj/item/stack/sheet/mineral/plasma{
- amount = 30
- },
-/obj/item/gps,
-/obj/structure/closet/crate/engineering,
-/turf/open/floor/plating,
-/area/station/engineering/main)
"hSl" = (
/obj/machinery/atmospherics/pipe/smart/simple/purple/visible{
dir = 4
@@ -22428,23 +22382,6 @@
},
/turf/open/floor/plating,
/area/station/maintenance/port/fore)
-"hZg" = (
-/obj/structure/closet/crate,
-/obj/machinery/power/apc/auto_name/directional/west,
-/obj/item/stack/cable_coil{
- pixel_x = 3;
- pixel_y = -7
- },
-/obj/item/stock_parts/power_store/cell/high,
-/obj/machinery/light_switch/directional/north,
-/obj/effect/spawner/random/engineering/flashlight,
-/obj/effect/spawner/random/engineering/flashlight,
-/obj/effect/turf_decal/tile/brown/half/contrasted{
- dir = 4
- },
-/obj/structure/cable,
-/turf/open/floor/iron,
-/area/station/cargo/miningoffice)
"hZn" = (
/obj/structure/cable,
/obj/effect/turf_decal/siding/wood{
@@ -22873,15 +22810,6 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/engineering/storage/tech)
-"ihN" = (
-/obj/machinery/computer/security/telescreen/prison/directional/south,
-/obj/structure/cable,
-/obj/effect/turf_decal/tile/red{
- dir = 8
- },
-/obj/effect/landmark/event_spawn,
-/turf/open/floor/iron,
-/area/station/security/office)
"ihW" = (
/obj/structure/lattice/catwalk,
/obj/structure/disposalpipe/trunk{
@@ -23099,6 +23027,12 @@
/obj/structure/cable,
/turf/open/floor/plating,
/area/station/security/range)
+"ila" = (
+/obj/effect/turf_decal/trimline/red/filled/corner,
+/obj/machinery/light/directional/east,
+/obj/machinery/computer/security/telescreen/interrogation/directional/east,
+/turf/open/floor/iron,
+/area/station/security/brig)
"ilg" = (
/obj/machinery/hydroponics/soil,
/obj/effect/decal/cleanable/dirt,
@@ -23300,6 +23234,12 @@
/obj/machinery/duct,
/turf/open/floor/plating,
/area/station/maintenance/department/engine)
+"ioO" = (
+/obj/structure/sign/nanotrasen{
+ pixel_x = 32
+ },
+/turf/open/space/basic,
+/area/space/nearstation)
"ioZ" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -23362,6 +23302,10 @@
},
/turf/open/floor/plating,
/area/station/engineering/supermatter/room)
+"iqe" = (
+/obj/effect/spawner/random/engineering/tracking_beacon,
+/turf/open/floor/iron/white,
+/area/station/science/xenobiology)
"iqo" = (
/obj/effect/landmark/start/quartermaster,
/turf/open/floor/carpet/orange,
@@ -24406,6 +24350,13 @@
},
/turf/open/floor/plating,
/area/station/maintenance/port/fore)
+"iIK" = (
+/obj/machinery/chem_dispenser,
+/obj/effect/turf_decal/tile/yellow/anticorner/contrasted{
+ dir = 8
+ },
+/turf/open/floor/iron/white,
+/area/station/medical/chemistry)
"iIP" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -24711,19 +24662,6 @@
/obj/item/banner/cargo,
/turf/open/space/basic,
/area/space/nearstation)
-"iNK" = (
-/obj/structure/table,
-/obj/machinery/button/door{
- id = "xenobio2";
- layer = 3.3;
- name = "Xenobio Pen 2 Blast Doors";
- pixel_y = 1;
- req_access = list("xenobiology")
- },
-/obj/structure/window/reinforced/spawner/directional/north,
-/obj/structure/window/reinforced/spawner/directional/west,
-/turf/open/floor/iron,
-/area/station/science/xenobiology)
"iNQ" = (
/obj/structure/cable,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
@@ -25064,16 +25002,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/engineering/main)
-"iSU" = (
-/obj/structure/table/reinforced,
-/obj/machinery/cell_charger,
-/obj/item/stock_parts/power_store/cell/high,
-/obj/item/rcl/pre_loaded,
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/turf/open/floor/iron,
-/area/station/command/heads_quarters/ce)
"iTc" = (
/obj/machinery/atmospherics/pipe/smart/manifold/purple/visible{
dir = 4
@@ -25107,19 +25035,6 @@
/obj/effect/turf_decal/tile/red/opposingcorners,
/turf/open/floor/iron,
/area/station/security/checkpoint/science)
-"iTQ" = (
-/obj/structure/table,
-/obj/machinery/button/door{
- id = "xenobio1";
- layer = 3.3;
- name = "Xenobio Pen 1 Blast Doors";
- pixel_y = 1;
- req_access = list("xenobiology")
- },
-/obj/structure/window/reinforced/spawner/directional/west,
-/obj/structure/window/reinforced/spawner/directional/north,
-/turf/open/floor/iron,
-/area/station/science/xenobiology)
"iTX" = (
/obj/machinery/meter,
/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible{
@@ -26443,6 +26358,15 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/hallway/secondary/command)
+"jrt" = (
+/obj/machinery/computer/security/telescreen/auxbase/directional/south,
+/obj/structure/cable,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/yellow/half/contrasted,
+/turf/open/floor/iron,
+/area/station/construction/mining/aux_base)
"jrL" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -26656,16 +26580,6 @@
},
/turf/open/floor/engine/vacuum,
/area/station/maintenance/disposal/incinerator)
-"jvo" = (
-/obj/machinery/atmospherics/pipe/smart/simple/dark/visible,
-/obj/effect/turf_decal/siding/purple{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/firealarm/directional/east,
-/obj/structure/cable,
-/turf/open/floor/iron/dark,
-/area/station/science/ordnance)
"jvr" = (
/obj/structure/table/glass,
/obj/item/folder/blue,
@@ -27171,6 +27085,17 @@
/obj/effect/turf_decal/bot,
/turf/open/floor/iron,
/area/station/service/hydroponics/garden)
+"jCi" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/closet/crate,
+/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/random/maintenance,
+/obj/effect/turf_decal/stripes/corner,
+/obj/item/reagent_containers/cup/soda_cans/pwr_game,
+/obj/structure/sign/poster/contraband/random/directional/south,
+/turf/open/floor/iron,
+/area/station/cargo/warehouse)
"jCj" = (
/obj/item/toy/basketball,
/turf/open/floor/plating,
@@ -27394,16 +27319,6 @@
},
/turf/open/floor/iron/white/smooth_large,
/area/station/medical/treatment_center)
-"jGN" = (
-/obj/machinery/computer/station_alert{
- dir = 1
- },
-/obj/machinery/light/directional/south,
-/obj/machinery/computer/security/telescreen/minisat/directional/south,
-/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/ai_monitored/command/storage/satellite)
"jGO" = (
/obj/machinery/hydroponics/soil,
/obj/item/cultivator,
@@ -28005,13 +27920,6 @@
/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance,
/turf/open/floor/plating,
/area/station/maintenance/port/greater)
-"jQz" = (
-/obj/machinery/atmospherics/components/unary/outlet_injector/on{
- dir = 8
- },
-/obj/effect/spawner/random/engineering/tracking_beacon,
-/turf/open/floor/engine,
-/area/station/science/xenobiology)
"jQM" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/command{
@@ -28348,6 +28256,23 @@
},
/turf/open/floor/iron/dark/corner,
/area/station/engineering/atmos/storage/gas)
+"jUY" = (
+/obj/machinery/door/airlock/research/glass/incinerator/ordmix_interior,
+/obj/effect/mapping_helpers/airlock/locked,
+/obj/machinery/airlock_controller/incinerator_ordmix{
+ pixel_x = -24
+ },
+/obj/machinery/button/ignition/incinerator/ordmix{
+ pixel_x = 24;
+ pixel_y = -6
+ },
+/obj/machinery/button/door/incinerator_vent_ordmix{
+ pixel_x = 24;
+ pixel_y = 8
+ },
+/obj/effect/mapping_helpers/airlock/access/all/science/ordnance,
+/turf/open/floor/engine,
+/area/station/science/ordnance/burnchamber)
"jVb" = (
/obj/effect/spawner/random/trash/garbage{
spawn_scatter_radius = 1
@@ -28563,6 +28488,17 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/space,
/area/space/nearstation)
+"jZG" = (
+/obj/structure/chair/office{
+ dir = 8
+ },
+/obj/machinery/computer/security/telescreen/normal/directional/north,
+/obj/effect/turf_decal/tile/red/anticorner/contrasted{
+ dir = 1
+ },
+/obj/machinery/light/small/directional/north,
+/turf/open/floor/iron,
+/area/station/hallway/secondary/exit/departure_lounge)
"jZP" = (
/obj/effect/turf_decal/siding/purple{
dir = 5
@@ -28632,16 +28568,6 @@
},
/turf/open/floor/iron/dark/corner,
/area/station/engineering/atmos)
-"kaU" = (
-/obj/structure/closet{
- name = "evidence closet 3"
- },
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/effect/turf_decal/tile/red/half/contrasted{
- dir = 4
- },
-/turf/open/floor/iron/dark,
-/area/station/security/evidence)
"kbo" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -28730,14 +28656,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/dark,
/area/station/command/bridge)
-"kcu" = (
-/obj/structure/table,
-/obj/item/stack/sheet/iron{
- amount = 10
- },
-/obj/item/electropack,
-/turf/open/floor/engine,
-/area/station/science/xenobiology)
"kcF" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -28926,10 +28844,6 @@
/obj/effect/turf_decal/tile/green/half/contrasted,
/turf/open/floor/iron/white,
/area/station/medical/virology)
-"kgC" = (
-/obj/machinery/door/poddoor/incinerator_ordmix,
-/turf/open/floor/engine/vacuum,
-/area/station/science/ordnance/burnchamber)
"kgV" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -28991,19 +28905,6 @@
/obj/structure/cable,
/turf/open/floor/plating,
/area/station/hallway/primary/central)
-"kif" = (
-/obj/item/emptysandbag,
-/obj/item/emptysandbag,
-/obj/item/emptysandbag,
-/obj/item/emptysandbag{
- pixel_x = 8
- },
-/obj/item/emptysandbag{
- pixel_x = -9
- },
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron,
-/area/station/cargo/warehouse)
"kir" = (
/obj/structure/disposalpipe/sorting/mail/flip{
dir = 4
@@ -29079,27 +28980,6 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/carpet,
/area/station/service/theater)
-"kkk" = (
-/obj/machinery/computer/cargo{
- dir = 4
- },
-/obj/effect/turf_decal/bot,
-/obj/machinery/button/door/directional/west{
- id = "QMLoaddoor";
- layer = 4;
- name = "Loading Doors";
- pixel_y = -8;
- req_access = list("cargo")
- },
-/obj/machinery/button/door/directional/west{
- id = "QMLoaddoor2";
- layer = 4;
- name = "Loading Doors";
- pixel_y = 8;
- req_access = list("cargo")
- },
-/turf/open/floor/iron,
-/area/station/cargo/storage)
"kkr" = (
/obj/structure/plasticflaps/opaque,
/obj/machinery/door/poddoor/preopen{
@@ -29279,6 +29159,16 @@
/obj/machinery/status_display/evac,
/turf/closed/wall,
/area/station/commons/lounge)
+"kmI" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible,
+/obj/structure/cable,
+/obj/machinery/computer/security/telescreen/turbine/directional/east,
+/turf/open/floor/iron,
+/area/station/maintenance/disposal/incinerator)
"kmN" = (
/turf/open/floor/plating,
/area/station/maintenance/starboard/lesser)
@@ -29605,10 +29495,6 @@
},
/turf/open/floor/iron,
/area/station/service/hydroponics/garden)
-"ktw" = (
-/obj/structure/sign/warning/electric_shock/directional/north,
-/turf/open/space/basic,
-/area/space)
"ktz" = (
/obj/effect/turf_decal/stripes/corner{
dir = 1
@@ -29733,6 +29619,14 @@
},
/turf/open/floor/plating,
/area/station/maintenance/port/aft)
+"kvX" = (
+/obj/machinery/camera/directional/east{
+ c_tag = "Xenobiology Lab - Test Chamber";
+ network = list("ss13","rd","xeno")
+ },
+/obj/machinery/light/cold/directional/east,
+/turf/open/floor/engine/xenobio,
+/area/station/science/xenobiology)
"kwb" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
@@ -29827,32 +29721,6 @@
/obj/effect/turf_decal/tile/red/half/contrasted,
/turf/open/floor/iron,
/area/station/security/office)
-"kxC" = (
-/obj/structure/table,
-/obj/item/paper_bin{
- pixel_x = -1;
- pixel_y = 5
- },
-/obj/item/pen,
-/obj/machinery/button/door/directional/east{
- id = "Engineering";
- name = "Engineering Lockdown";
- pixel_y = 16;
- req_access = list("engineering")
- },
-/obj/machinery/button/door/directional/east{
- id = "atmos";
- name = "Atmospherics Lockdown";
- pixel_y = 24;
- req_access = list("atmospherics")
- },
-/obj/effect/turf_decal/tile/red/half/contrasted{
- dir = 4
- },
-/obj/machinery/light/small/directional/east,
-/obj/machinery/computer/security/telescreen/engine/directional/east,
-/turf/open/floor/iron,
-/area/station/security/checkpoint/engineering)
"kxH" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -30305,6 +30173,25 @@
},
/turf/open/floor/iron/dark,
/area/station/command/bridge)
+"kGn" = (
+/obj/machinery/computer/cargo{
+ dir = 4
+ },
+/obj/effect/turf_decal/bot,
+/obj/machinery/button/door/directional/west{
+ id = "QMLoaddoor";
+ name = "Loading Doors";
+ pixel_y = -8;
+ req_access = list("cargo")
+ },
+/obj/machinery/button/door/directional/west{
+ id = "QMLoaddoor2";
+ name = "Loading Doors";
+ pixel_y = 8;
+ req_access = list("cargo")
+ },
+/turf/open/floor/iron,
+/area/station/cargo/storage)
"kGq" = (
/obj/machinery/light/directional/south,
/obj/structure/disposalpipe/segment{
@@ -30341,24 +30228,6 @@
/obj/machinery/light/small/directional/north,
/turf/open/floor/iron/white,
/area/station/science/lab)
-"kGR" = (
-/obj/machinery/button/ignition{
- id = "Xenobio";
- pixel_x = -4;
- pixel_y = -3
- },
-/obj/machinery/button/door/directional/north{
- id = "Xenolab";
- name = "Test Chamber Blast Doors";
- pixel_x = 6;
- pixel_y = -2;
- req_access = list("xenobiology")
- },
-/obj/structure/table/reinforced/plastitaniumglass,
-/obj/structure/window/reinforced/spawner/directional/west,
-/obj/machinery/computer/security/telescreen/test_chamber/directional/north,
-/turf/open/floor/iron,
-/area/station/science/xenobiology)
"kHg" = (
/obj/structure/cable,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
@@ -30392,6 +30261,24 @@
},
/turf/open/floor/engine,
/area/station/science/xenobiology)
+"kHM" = (
+/obj/machinery/button/ignition{
+ id = "Xenobio";
+ pixel_x = -4;
+ pixel_y = -3
+ },
+/obj/machinery/button/door/directional/north{
+ id = "Xenolab";
+ name = "Test Chamber Blast Doors";
+ pixel_x = 6;
+ pixel_y = -2;
+ req_access = list("xenobiology")
+ },
+/obj/structure/table/reinforced/plastitaniumglass,
+/obj/structure/window/reinforced/spawner/directional/west,
+/obj/machinery/computer/security/telescreen/test_chamber/directional/north,
+/turf/open/floor/iron,
+/area/station/science/xenobiology)
"kHN" = (
/obj/structure/window/reinforced/spawner/directional/west,
/turf/open/floor/engine,
@@ -30445,6 +30332,16 @@
/obj/effect/landmark/start/hangover,
/turf/open/floor/wood,
/area/station/service/library)
+"kJN" = (
+/obj/machinery/computer/station_alert{
+ dir = 1
+ },
+/obj/machinery/light/directional/south,
+/obj/machinery/computer/security/telescreen/minisat/directional/south,
+/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/ai_monitored/command/storage/satellite)
"kJO" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -30746,6 +30643,12 @@
/obj/effect/mapping_helpers/mail_sorting/service/law_office,
/turf/open/floor/plating,
/area/station/maintenance/fore)
+"kOG" = (
+/obj/structure/cable,
+/obj/machinery/light/cold/directional/north,
+/obj/machinery/computer/security/telescreen/isolation/directional/north,
+/turf/open/floor/iron,
+/area/station/security/execution/transfer)
"kOK" = (
/turf/open/floor/plating,
/area/station/hallway/primary/port)
@@ -30993,6 +30896,16 @@
/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance/departmental,
/turf/open/floor/plating,
/area/station/maintenance/starboard/fore)
+"kSL" = (
+/obj/machinery/atmospherics/pipe/smart/simple/dark/visible,
+/obj/effect/turf_decal/siding/purple{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/firealarm/directional/east,
+/obj/structure/cable,
+/turf/open/floor/iron/dark,
+/area/station/science/ordnance)
"kSN" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 8
@@ -31013,11 +30926,22 @@
/obj/machinery/shieldgen,
/turf/open/floor/plating,
/area/station/engineering/main)
+"kSX" = (
+/obj/machinery/status_display/evac/directional/north,
+/obj/machinery/porta_turret/ai,
+/obj/machinery/computer/security/telescreen/minisat/directional/east,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/turf/open/floor/iron/dark,
+/area/station/ai_monitored/turret_protected/aisat_interior)
"kTn" = (
/obj/machinery/firealarm/directional/south,
/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/iron,
/area/station/commons/locker)
+"kTw" = (
+/obj/machinery/igniter/incinerator_ordmix,
+/turf/open/floor/engine/vacuum,
+/area/station/science/ordnance/burnchamber)
"kTO" = (
/obj/effect/turf_decal/trimline/blue/filled/line{
dir = 4
@@ -31548,6 +31472,15 @@
/obj/effect/spawner/random/trash/janitor_supplies,
/turf/open/floor/plating,
/area/station/maintenance/port)
+"lcK" = (
+/obj/machinery/computer/security/telescreen/prison/directional/south,
+/obj/structure/cable,
+/obj/effect/turf_decal/tile/red{
+ dir = 8
+ },
+/obj/effect/landmark/event_spawn,
+/turf/open/floor/iron,
+/area/station/security/office)
"ldc" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/cable,
@@ -32122,15 +32055,6 @@
},
/turf/open/floor/plating,
/area/station/maintenance/fore)
-"loY" = (
-/obj/structure/rack,
-/obj/effect/turf_decal/tile/blue/half/contrasted{
- dir = 4
- },
-/obj/machinery/light/small/directional/west,
-/obj/effect/spawner/random/armory/dragnet,
-/turf/open/floor/iron/dark,
-/area/station/ai_monitored/security/armory)
"lpo" = (
/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{
dir = 4
@@ -32706,6 +32630,10 @@
"lAM" = (
/turf/closed/wall/r_wall,
/area/station/security/brig)
+"lAQ" = (
+/obj/effect/spawner/random/medical/two_percent_xeno_egg_spawner,
+/turf/open/floor/engine/xenobio,
+/area/station/science/xenobiology)
"lAY" = (
/obj/structure/closet{
name = "evidence closet 5"
@@ -32745,14 +32673,6 @@
"lBA" = (
/turf/open/floor/wood/large,
/area/station/commons/lounge)
-"lBN" = (
-/obj/machinery/computer/security/telescreen/tcomms/directional/east,
-/obj/machinery/computer/telecomms/monitor{
- dir = 8;
- network = "tcommsat"
- },
-/turf/open/floor/iron/grimy,
-/area/station/tcommsat/computer)
"lCb" = (
/obj/structure/cable,
/obj/structure/sign/poster/ripped/directional/south,
@@ -33142,6 +33062,11 @@
/obj/structure/lattice,
/turf/open/space/basic,
/area/space/nearstation)
+"lMM" = (
+/obj/structure/table,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/turf/open/floor/iron/dark,
+/area/station/science/ordnance/testlab)
"lMW" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -33382,23 +33307,6 @@
/obj/machinery/airalarm/directional/north,
/turf/open/floor/iron,
/area/station/security/prison)
-"lPS" = (
-/obj/structure/table,
-/obj/machinery/button/door{
- id = "xenobio8";
- layer = 3.3;
- name = "Xenobio Pen 8 Blast Doors";
- pixel_y = 4;
- req_access = list("xenobiology")
- },
-/obj/item/reagent_containers/spray/cleaner{
- pixel_x = 10;
- pixel_y = -1
- },
-/obj/structure/window/reinforced/spawner/directional/west,
-/obj/structure/window/reinforced/spawner/directional/north,
-/turf/open/floor/iron,
-/area/station/science/xenobiology)
"lPZ" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/door/poddoor/preopen{
@@ -33425,6 +33333,17 @@
},
/turf/open/floor/iron,
/area/station/maintenance/disposal/incinerator)
+"lQo" = (
+/obj/machinery/light/directional/south,
+/obj/machinery/firealarm/directional/south,
+/obj/structure/rack,
+/obj/item/storage/briefcase/secure,
+/obj/item/cigarette/cigar,
+/obj/effect/turf_decal/tile/blue/half/contrasted{
+ dir = 1
+ },
+/turf/open/floor/iron/dark,
+/area/station/command/bridge)
"lQp" = (
/obj/effect/turf_decal/trimline/red/filled/line{
dir = 4
@@ -34035,21 +33954,6 @@
/obj/effect/turf_decal/box,
/turf/open/floor/iron/dark,
/area/station/security/mechbay)
-"mcF" = (
-/obj/structure/table,
-/obj/machinery/button/door{
- id = "xenobio4";
- layer = 3.3;
- name = "Xenobio Pen 4 Blast Doors";
- pixel_y = 4;
- req_access = list("xenobiology");
- sync_doors = 4
- },
-/obj/structure/window/reinforced/spawner/directional/south,
-/obj/structure/window/reinforced/spawner/directional/east,
-/obj/structure/window/reinforced/spawner/directional/north,
-/turf/open/floor/iron,
-/area/station/science/xenobiology)
"mcP" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/public/glass{
@@ -34384,6 +34288,16 @@
/obj/effect/turf_decal/tile/bar,
/turf/open/floor/iron,
/area/station/hallway/primary/starboard)
+"mjE" = (
+/obj/structure/rack,
+/obj/item/aicard,
+/obj/item/radio/off,
+/obj/effect/turf_decal/tile/blue/half/contrasted{
+ dir = 1
+ },
+/obj/machinery/computer/security/telescreen/minisat/directional/south,
+/turf/open/floor/iron/dark,
+/area/station/command/bridge)
"mjH" = (
/obj/machinery/ai_slipper{
uses = 10
@@ -35241,27 +35155,6 @@
/obj/machinery/light/directional/north,
/turf/open/floor/iron,
/area/station/cargo/sorting)
-"mzm" = (
-/obj/structure/table,
-/obj/item/reagent_containers/condiment/saltshaker{
- layer = 3.1;
- pixel_x = -2;
- pixel_y = 2
- },
-/obj/item/reagent_containers/condiment/peppermill{
- desc = "Often used to flavor food or make people sneeze. Fashionably moved to the left side of the table.";
- pixel_x = -8;
- pixel_y = 2
- },
-/obj/item/reagent_containers/condiment/enzyme{
- pixel_x = 9;
- pixel_y = 3
- },
-/obj/item/book/manual/chef_recipes,
-/obj/effect/turf_decal/tile/red/opposingcorners,
-/obj/structure/window/spawner/directional/south,
-/turf/open/floor/iron/white,
-/area/station/security/prison/mess)
"mzu" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
@@ -35322,6 +35215,22 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/plating,
/area/station/maintenance/starboard/greater)
+"mAL" = (
+/obj/structure/table,
+/obj/machinery/button/door{
+ id = "xenobio8";
+ name = "Xenobio Pen 8 Blast Doors";
+ pixel_y = 4;
+ req_access = list("xenobiology")
+ },
+/obj/item/reagent_containers/spray/cleaner{
+ pixel_x = 10;
+ pixel_y = -1
+ },
+/obj/structure/window/reinforced/spawner/directional/west,
+/obj/structure/window/reinforced/spawner/directional/north,
+/turf/open/floor/iron,
+/area/station/science/xenobiology)
"mBf" = (
/obj/structure/table/wood,
/obj/machinery/recharger,
@@ -35500,20 +35409,6 @@
},
/turf/open/floor/iron,
/area/station/engineering/atmos)
-"mDC" = (
-/obj/structure/table,
-/obj/machinery/button/door{
- id = "xenobio5";
- layer = 3.3;
- name = "Xenobio Pen 5 Blast Doors";
- pixel_y = 4;
- req_access = list("xenobiology")
- },
-/obj/structure/window/reinforced/spawner/directional/north,
-/obj/structure/window/reinforced/spawner/directional/east,
-/obj/structure/window/reinforced/spawner/directional/south,
-/turf/open/floor/iron,
-/area/station/science/xenobiology)
"mDL" = (
/obj/machinery/portable_atmospherics/pump,
/obj/effect/turf_decal/delivery,
@@ -36353,30 +36248,6 @@
/obj/effect/mapping_helpers/burnt_floor,
/turf/open/floor/plating,
/area/station/maintenance/starboard/fore)
-"mSI" = (
-/obj/machinery/turretid{
- control_area = "/area/station/ai_monitored/turret_protected/ai_upload";
- icon_state = "control_stun";
- name = "AI Upload Turret Control";
- pixel_y = 28
- },
-/obj/item/radio/intercom/directional/north{
- broadcasting = 1;
- frequency = 1447;
- name = "Private Channel";
- pixel_x = -26
- },
-/obj/effect/landmark/start/cyborg,
-/obj/machinery/light/small/directional/west,
-/obj/machinery/computer/security/telescreen/aiupload/directional/west,
-/obj/structure/cable,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
- dir = 4
- },
-/obj/machinery/power/apc/auto_name/directional/south,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/turf/open/floor/iron/dark,
-/area/station/ai_monitored/turret_protected/ai_upload_foyer)
"mSM" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
@@ -36551,12 +36422,6 @@
/obj/structure/cable,
/turf/open/floor/wood,
/area/station/service/bar/backroom)
-"mWd" = (
-/obj/structure/railing{
- dir = 4
- },
-/turf/open/space/basic,
-/area/space)
"mWA" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -36592,6 +36457,12 @@
/obj/structure/window/spawner/directional/west,
/turf/open/floor/iron/dark,
/area/station/medical/storage)
+"mWJ" = (
+/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/ordnance_burn_chamber_input{
+ dir = 1
+ },
+/turf/open/floor/engine/vacuum,
+/area/station/science/ordnance/burnchamber)
"mWU" = (
/turf/open/floor/iron,
/area/station/maintenance/space_hut)
@@ -36686,11 +36557,6 @@
},
/turf/open/floor/plating,
/area/station/command/heads_quarters/qm)
-"mYb" = (
-/obj/structure/chair,
-/obj/machinery/computer/security/telescreen/interrogation/directional/west,
-/turf/open/floor/iron/grimy,
-/area/station/security/interrogation)
"mYq" = (
/obj/effect/turf_decal/plaque{
icon_state = "L8"
@@ -36887,6 +36753,18 @@
/obj/effect/turf_decal/bot,
/turf/open/floor/iron,
/area/station/service/hydroponics)
+"nbN" = (
+/obj/structure/table,
+/obj/machinery/button/door{
+ id = "xenobio1";
+ name = "Xenobio Pen 1 Blast Doors";
+ pixel_y = 1;
+ req_access = list("xenobiology")
+ },
+/obj/structure/window/reinforced/spawner/directional/west,
+/obj/structure/window/reinforced/spawner/directional/north,
+/turf/open/floor/iron,
+/area/station/science/xenobiology)
"nbS" = (
/obj/structure/table,
/obj/effect/turf_decal/tile/red/half/contrasted{
@@ -37202,13 +37080,6 @@
/obj/structure/sign/poster/official/random/directional/east,
/turf/open/floor/plating,
/area/station/commons/toilet/auxiliary)
-"nhU" = (
-/obj/machinery/status_display/ai/directional/north,
-/obj/machinery/porta_turret/ai,
-/obj/machinery/computer/security/telescreen/research/directional/west,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/turf/open/floor/iron/dark,
-/area/station/ai_monitored/turret_protected/aisat_interior)
"nib" = (
/obj/effect/turf_decal/trimline/red/filled/line{
dir = 4
@@ -37252,6 +37123,18 @@
dir = 8
},
/area/station/medical/morgue)
+"niV" = (
+/obj/machinery/atmospherics/components/binary/pump{
+ dir = 1
+ },
+/obj/machinery/airlock_sensor/incinerator_ordmix{
+ pixel_x = -24
+ },
+/obj/machinery/atmospherics/pipe/layer_manifold/scrubbers/hidden{
+ dir = 4
+ },
+/turf/open/floor/engine,
+/area/station/science/ordnance/burnchamber)
"niY" = (
/obj/structure/disposalpipe/segment,
/obj/structure/lattice/catwalk,
@@ -37478,17 +37361,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/closed/wall/r_wall,
/area/station/maintenance/disposal/incinerator)
-"nnh" = (
-/obj/machinery/light_switch/directional/south,
-/obj/structure/table/wood,
-/obj/item/razor{
- pixel_x = -4;
- pixel_y = 2
- },
-/obj/item/cigarette/cigar,
-/obj/item/reagent_containers/cup/glass/flask/gold,
-/turf/open/floor/carpet,
-/area/station/command/heads_quarters/captain/private)
"nnl" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
/obj/structure/disposalpipe/segment{
@@ -37526,6 +37398,13 @@
/obj/structure/cable,
/turf/open/floor/iron/dark,
/area/station/security/office)
+"nnu" = (
+/obj/structure/table,
+/obj/machinery/cell_charger,
+/obj/item/stock_parts/power_store/cell/high,
+/obj/effect/turf_decal/delivery,
+/turf/open/floor/iron,
+/area/station/engineering/main)
"nnD" = (
/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{
dir = 4
@@ -38057,6 +37936,20 @@
/obj/structure/cable,
/turf/open/floor/wood,
/area/station/command/corporate_showroom)
+"nvk" = (
+/obj/structure/table,
+/obj/machinery/button/door{
+ id = "xenobio4";
+ name = "Xenobio Pen 4 Blast Doors";
+ pixel_y = 4;
+ req_access = list("xenobiology");
+ sync_doors = 4
+ },
+/obj/structure/window/reinforced/spawner/directional/south,
+/obj/structure/window/reinforced/spawner/directional/east,
+/obj/structure/window/reinforced/spawner/directional/north,
+/turf/open/floor/iron,
+/area/station/science/xenobiology)
"nvn" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
@@ -38133,18 +38026,6 @@
/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible/layer5,
/turf/closed/wall,
/area/station/engineering/atmos/pumproom)
-"nwL" = (
-/obj/machinery/computer/upload/ai,
-/obj/machinery/door/window/right/directional/south{
- name = "Upload Console Window";
- req_access = list("ai_upload");
- layer = 3.1
- },
-/obj/structure/window/reinforced/spawner/directional/west,
-/obj/structure/window/reinforced/spawner/directional/east,
-/obj/structure/window/reinforced/spawner/directional/north,
-/turf/open/floor/iron/dark,
-/area/station/ai_monitored/turret_protected/ai_upload)
"nwT" = (
/obj/structure/disposalpipe/sorting/mail/flip{
dir = 8
@@ -38349,6 +38230,10 @@
/obj/effect/landmark/event_spawn,
/turf/open/floor/iron,
/area/station/engineering/atmos)
+"nAo" = (
+/obj/structure/sign/warning/electric_shock/directional/north,
+/turf/open/space/basic,
+/area/space/nearstation)
"nAC" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -38644,6 +38529,10 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/dark,
/area/station/security/execution/education)
+"nEJ" = (
+/obj/machinery/door/poddoor/incinerator_ordmix,
+/turf/open/floor/engine/vacuum,
+/area/station/science/ordnance/burnchamber)
"nET" = (
/obj/machinery/atmospherics/components/unary/portables_connector/visible{
dir = 1
@@ -38800,15 +38689,6 @@
},
/turf/open/floor/iron,
/area/station/hallway/secondary/command)
-"nJn" = (
-/obj/machinery/chem_dispenser{
- layer = 2.7
- },
-/obj/effect/turf_decal/tile/yellow/half/contrasted{
- dir = 4
- },
-/turf/open/floor/iron/white,
-/area/station/medical/pharmacy)
"nJo" = (
/obj/machinery/smartfridge/organ,
/obj/machinery/door/poddoor/shutters/preopen{
@@ -38819,10 +38699,6 @@
/obj/machinery/door/firedoor,
/turf/open/floor/iron/dark,
/area/station/medical/treatment_center)
-"nJr" = (
-/obj/effect/spawner/random/medical/two_percent_xeno_egg_spawner,
-/turf/open/floor/engine,
-/area/station/science/xenobiology)
"nJu" = (
/obj/structure/closet/secure_closet/security/sec,
/obj/effect/turf_decal/tile/red/half/contrasted{
@@ -38830,23 +38706,6 @@
},
/turf/open/floor/iron/dark,
/area/station/security/lockers)
-"nJA" = (
-/obj/machinery/door/airlock/research/glass/incinerator/ordmix_interior,
-/obj/effect/mapping_helpers/airlock/locked,
-/obj/machinery/airlock_controller/incinerator_ordmix{
- pixel_x = -24
- },
-/obj/machinery/button/ignition/incinerator/ordmix{
- pixel_x = 24;
- pixel_y = -6
- },
-/obj/machinery/button/door/incinerator_vent_ordmix{
- pixel_x = 24;
- pixel_y = 8
- },
-/obj/effect/mapping_helpers/airlock/access/all/science/ordnance,
-/turf/open/floor/engine,
-/area/station/science/ordnance/burnchamber)
"nJG" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -38997,10 +38856,6 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/port)
-"nLZ" = (
-/obj/item/toy/beach_ball/branded,
-/turf/open/space/basic,
-/area/space)
"nMf" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -39233,6 +39088,10 @@
/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/iron,
/area/station/hallway/primary/central)
+"nPS" = (
+/obj/machinery/air_sensor/ordnance_burn_chamber,
+/turf/open/floor/engine/vacuum,
+/area/station/science/ordnance/burnchamber)
"nQz" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/effect/spawner/random/trash/janitor_supplies,
@@ -39332,14 +39191,6 @@
/obj/structure/window/reinforced/spawner/directional/west,
/turf/open/floor/wood,
/area/station/command/heads_quarters/captain/private)
-"nRQ" = (
-/obj/machinery/light/directional/south,
-/obj/effect/turf_decal/delivery,
-/obj/structure/table,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/machinery/computer/security/telescreen/ordnance/directional/south,
-/turf/open/floor/iron/dark,
-/area/station/science/ordnance/testlab)
"nRU" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -39519,12 +39370,6 @@
/obj/effect/turf_decal/trimline/blue/filled/warning,
/turf/open/floor/iron/white,
/area/station/medical/medbay/central)
-"nWF" = (
-/obj/structure/railing{
- dir = 8
- },
-/turf/open/space/basic,
-/area/space)
"nWS" = (
/obj/structure/window/reinforced/spawner/directional/west,
/turf/open/space,
@@ -39678,12 +39523,6 @@
/obj/machinery/bookbinder,
/turf/open/floor/wood,
/area/station/service/library)
-"nZL" = (
-/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/incinerator_ordmix{
- dir = 8
- },
-/turf/open/floor/engine,
-/area/station/science/ordnance/burnchamber)
"oac" = (
/obj/structure/cable,
/turf/open/floor/iron,
@@ -39854,6 +39693,12 @@
/obj/structure/window/reinforced/spawner/directional/east,
/turf/open/floor/iron/dark,
/area/station/command/heads_quarters/rd)
+"obU" = (
+/obj/machinery/cell_charger,
+/obj/item/stock_parts/power_store/cell/crap,
+/obj/structure/table/wood,
+/turf/open/floor/carpet,
+/area/station/command/corporate_showroom)
"ocg" = (
/obj/structure/extinguisher_cabinet/directional/south,
/obj/structure/cable,
@@ -39985,12 +39830,6 @@
/obj/effect/mapping_helpers/airlock/access/all/service/hydroponics,
/turf/open/floor/iron,
/area/station/service/hydroponics)
-"oet" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
- dir = 1
- },
-/turf/open/floor/engine/vacuum,
-/area/station/science/ordnance/burnchamber)
"oew" = (
/turf/open/floor/iron,
/area/station/commons/fitness/recreation)
@@ -40323,14 +40162,6 @@
/obj/structure/sign/poster/random/directional/south,
/turf/open/floor/plating,
/area/station/hallway/secondary/service)
-"omd" = (
-/obj/structure/table,
-/obj/machinery/cell_charger,
-/obj/item/stock_parts/power_store/cell/high,
-/obj/item/stock_parts/power_store/cell/high,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron,
-/area/station/ai_monitored/command/storage/eva)
"ome" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -40346,6 +40177,23 @@
/obj/machinery/duct,
/turf/open/floor/plating,
/area/station/maintenance/port/aft)
+"omq" = (
+/obj/item/storage/box/matches{
+ pixel_x = -2;
+ pixel_y = 3
+ },
+/obj/item/cigarette/cigar{
+ pixel_x = 4;
+ pixel_y = 1
+ },
+/obj/item/cigarette/cigar{
+ pixel_x = -4;
+ pixel_y = 1
+ },
+/obj/item/cigarette/cigar/cohiba,
+/obj/structure/table/wood,
+/turf/open/floor/carpet,
+/area/station/command/corporate_showroom)
"omA" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
@@ -40379,6 +40227,22 @@
/obj/machinery/light/directional/west,
/turf/open/floor/iron/white,
/area/station/medical/medbay/central)
+"onw" = (
+/obj/structure/disposalpipe/trunk{
+ dir = 1
+ },
+/obj/machinery/disposal/delivery_chute{
+ dir = 4
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/obj/structure/window/spawner/directional/south,
+/obj/structure/window/spawner/directional/north,
+/obj/structure/window/spawner/directional/west,
+/obj/machinery/door/window/right/directional/east,
+/turf/open/floor/plating,
+/area/station/maintenance/disposal)
"onD" = (
/obj/effect/turf_decal/stripes/line{
dir = 6
@@ -40722,6 +40586,17 @@
},
/turf/open/water,
/area/station/service/hydroponics/garden)
+"otH" = (
+/obj/structure/table/glass,
+/obj/item/folder/blue{
+ pixel_y = 3
+ },
+/obj/item/pen,
+/obj/machinery/computer/security/telescreen/minisat/directional/south,
+/obj/effect/turf_decal/tile/blue,
+/obj/structure/window/reinforced/spawner/directional/east,
+/turf/open/floor/iron/dark,
+/area/station/engineering/transit_tube)
"otI" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -40750,6 +40625,16 @@
},
/turf/open/floor/plating,
/area/station/maintenance/port/fore)
+"ouc" = (
+/obj/structure/table/wood,
+/obj/machinery/computer/security/telescreen/prison/directional/north,
+/obj/item/flashlight/lamp/green{
+ pixel_x = 1;
+ pixel_y = 5
+ },
+/obj/item/restraints/handcuffs,
+/turf/open/floor/carpet,
+/area/station/security/detectives_office)
"oue" = (
/obj/effect/turf_decal/stripes/line{
dir = 9
@@ -40760,6 +40645,12 @@
},
/turf/open/floor/iron/dark/textured_large,
/area/station/science/cytology)
+"ouf" = (
+/obj/machinery/firealarm/directional/west,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/duct,
+/turf/open/floor/iron/freezer,
+/area/station/commons/toilet/restrooms)
"ouj" = (
/obj/structure/bed/medical/emergency,
/obj/structure/bed/medical/emergency,
@@ -41201,6 +41092,12 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/turret_protected/ai)
+"oDf" = (
+/obj/machinery/sparker/directional/north{
+ id = "Xenobio"
+ },
+/turf/open/floor/engine/xenobio,
+/area/station/science/xenobiology)
"oDl" = (
/obj/machinery/door/airlock/maintenance,
/obj/structure/cable,
@@ -41210,30 +41107,12 @@
/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance,
/turf/open/floor/plating,
/area/station/maintenance/starboard/greater)
-"oDH" = (
-/obj/structure/table,
-/obj/item/stack/sheet/iron/fifty,
-/obj/item/stack/sheet/iron/fifty,
-/obj/item/stack/sheet/iron/fifty,
-/obj/item/stack/sheet/glass/fifty,
-/obj/item/stack/sheet/glass/fifty,
-/obj/item/stack/sheet/glass/fifty,
-/obj/item/crowbar,
-/obj/item/grenade/chem_grenade/smart_metal_foam,
-/obj/item/grenade/chem_grenade/smart_metal_foam,
-/obj/effect/turf_decal/bot{
- dir = 1
- },
-/obj/item/stock_parts/power_store/cell/emproof{
- pixel_x = -6;
- pixel_y = 2
- },
-/obj/item/stock_parts/power_store/cell/emproof{
- pixel_x = 4;
- pixel_y = 6
+"oDv" = (
+/obj/structure/railing{
+ dir = 4
},
-/turf/open/floor/iron,
-/area/station/engineering/main)
+/turf/open/space/basic,
+/area/space/nearstation)
"oDJ" = (
/obj/structure/sign/warning/vacuum/external,
/turf/closed/wall,
@@ -41444,13 +41323,6 @@
/obj/effect/mapping_helpers/airlock/access/any/medical/maintenance,
/turf/open/floor/plating,
/area/station/medical/medbay/central)
-"oGj" = (
-/obj/machinery/atmospherics/components/unary/portables_connector/visible,
-/obj/effect/turf_decal/box,
-/obj/machinery/portable_atmospherics/canister,
-/obj/item/radio/intercom/directional/north,
-/turf/open/floor/iron,
-/area/station/science/xenobiology)
"oGn" = (
/obj/machinery/door/airlock/maintenance{
name = "Fuel Closet"
@@ -41466,31 +41338,6 @@
/obj/machinery/atmospherics/pipe/smart/simple/orange/visible,
/turf/open/space/basic,
/area/space/nearstation)
-"oGH" = (
-/obj/machinery/light/directional/east,
-/obj/structure/table,
-/obj/machinery/recharger{
- pixel_x = 6;
- pixel_y = 4
- },
-/obj/item/paper_bin{
- pixel_x = -11;
- pixel_y = 7
- },
-/obj/item/pen{
- pixel_x = -11;
- pixel_y = 7
- },
-/obj/item/hand_labeler{
- pixel_x = -10;
- pixel_y = -6
- },
-/obj/effect/turf_decal/trimline/dark_red/filled/line{
- dir = 4
- },
-/obj/machinery/computer/security/telescreen/prison/directional/east,
-/turf/open/floor/iron,
-/area/station/security/warden)
"oGK" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -41777,14 +41624,6 @@
},
/turf/open/floor/plating,
/area/station/command/heads_quarters/hos)
-"oMh" = (
-/obj/structure/filingcabinet,
-/obj/machinery/computer/security/telescreen/minisat/directional/east,
-/obj/effect/turf_decal/tile/red/half/contrasted{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/station/security/checkpoint/engineering)
"oMx" = (
/obj/effect/mapping_helpers/airlock/access/any/supply/bit_den,
/obj/machinery/door/airlock/maintenance{
@@ -42014,6 +41853,32 @@
},
/turf/open/floor/iron/cafeteria,
/area/station/service/kitchen)
+"oRA" = (
+/obj/structure/table,
+/obj/item/stack/cable_coil{
+ pixel_x = 3;
+ pixel_y = -7
+ },
+/obj/item/stack/cable_coil,
+/obj/item/electronics/airlock,
+/obj/item/electronics/airlock,
+/obj/item/clothing/ears/earmuffs{
+ pixel_x = -3;
+ pixel_y = -2
+ },
+/obj/item/clothing/ears/earmuffs{
+ pixel_x = -5;
+ pixel_y = 6
+ },
+/obj/effect/turf_decal/bot{
+ dir = 1
+ },
+/obj/item/stock_parts/power_store/cell/emproof{
+ pixel_x = -4;
+ pixel_y = 6
+ },
+/turf/open/floor/iron,
+/area/station/engineering/main)
"oRM" = (
/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{
dir = 4
@@ -42101,6 +41966,12 @@
/obj/item/radio/intercom/directional/north,
/turf/open/floor/wood,
/area/station/command/heads_quarters/hop)
+"oTi" = (
+/obj/machinery/light/small/dim/directional/west,
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/sign/poster/contraband/random/directional/west,
+/turf/open/floor/iron,
+/area/station/cargo/warehouse)
"oTj" = (
/obj/machinery/atmospherics/pipe/bridge_pipe/scrubbers/visible,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -42251,14 +42122,6 @@
"oWk" = (
/turf/closed/wall/r_wall,
/area/station/maintenance/starboard/aft)
-"oWm" = (
-/obj/structure/disposalpipe/segment,
-/obj/machinery/computer/security/telescreen/engine/directional/east,
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/turf/open/floor/iron/dark,
-/area/station/command/heads_quarters/ce)
"oWF" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/dark,
@@ -42597,6 +42460,15 @@
},
/turf/open/floor/iron/white,
/area/station/command/heads_quarters/cmo)
+"pcP" = (
+/obj/structure/table,
+/obj/machinery/cell_charger,
+/obj/item/stock_parts/power_store/cell/high,
+/obj/effect/turf_decal/bot{
+ dir = 1
+ },
+/turf/open/floor/iron,
+/area/station/command/gateway)
"pcS" = (
/obj/item/stack/ore/silver,
/obj/item/stack/ore/silver,
@@ -42742,6 +42614,14 @@
},
/turf/open/floor/iron/dark,
/area/station/ai_monitored/security/armory)
+"pfE" = (
+/obj/machinery/atmospherics/components/binary/pump/on,
+/obj/machinery/light/small/directional/east,
+/obj/machinery/atmospherics/pipe/layer_manifold/supply/hidden{
+ dir = 4
+ },
+/turf/open/floor/engine,
+/area/station/science/ordnance/burnchamber)
"pfP" = (
/obj/effect/turf_decal/stripes/line,
/obj/machinery/light_switch/directional/south,
@@ -42968,6 +42848,10 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/hallway/primary/central)
+"pjy" = (
+/obj/machinery/atmospherics/pipe/smart/simple/dark/visible,
+/turf/closed/wall/r_wall,
+/area/station/science/ordnance/burnchamber)
"pjS" = (
/obj/machinery/vending/cigarette,
/obj/structure/extinguisher_cabinet/directional/east,
@@ -43510,6 +43394,21 @@
},
/turf/open/floor/iron,
/area/station/commons/dorms)
+"psK" = (
+/obj/structure/table/glass,
+/obj/item/tank/internals/emergency_oxygen{
+ pixel_x = -8
+ },
+/obj/item/clothing/mask/breath{
+ pixel_x = 4
+ },
+/obj/machinery/atmospherics/pipe/layer_manifold/supply/hidden,
+/obj/effect/turf_decal/tile/blue{
+ dir = 8
+ },
+/obj/machinery/firealarm/directional/south,
+/turf/open/floor/iron/dark,
+/area/station/engineering/transit_tube)
"psT" = (
/turf/open/floor/iron/dark,
/area/station/science/lab)
@@ -44000,6 +43899,23 @@
},
/turf/open/floor/iron/white,
/area/station/medical/chemistry)
+"pCy" = (
+/obj/effect/decal/cleanable/cobweb/cobweb2,
+/obj/effect/turf_decal/siding/wood/corner{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/wood{
+ dir = 5
+ },
+/obj/item/kirbyplants/random{
+ pixel_x = -7
+ },
+/obj/machinery/camera/directional/north,
+/obj/machinery/digital_clock/directional/east,
+/obj/structure/extinguisher_cabinet/directional/north,
+/obj/item/poster/traitor,
+/turf/open/floor/wood/large,
+/area/station/command/heads_quarters/qm)
"pCJ" = (
/obj/effect/turf_decal/siding/wood/corner{
dir = 4
@@ -44883,6 +44799,31 @@
/obj/item/reagent_containers/spray/pepper,
/turf/open/floor/iron,
/area/station/security/execution/transfer)
+"pRF" = (
+/obj/machinery/light/directional/east,
+/obj/structure/table,
+/obj/machinery/recharger{
+ pixel_x = 6;
+ pixel_y = 4
+ },
+/obj/item/paper_bin{
+ pixel_x = -11;
+ pixel_y = 7
+ },
+/obj/item/pen{
+ pixel_x = -11;
+ pixel_y = 7
+ },
+/obj/item/hand_labeler{
+ pixel_x = -10;
+ pixel_y = -6
+ },
+/obj/effect/turf_decal/trimline/dark_red/filled/line{
+ dir = 4
+ },
+/obj/machinery/computer/security/telescreen/prison/directional/east,
+/turf/open/floor/iron,
+/area/station/security/warden)
"pRM" = (
/obj/structure/window/spawner/directional/south,
/mob/living/basic/cow{
@@ -45404,16 +45345,6 @@
},
/turf/open/floor/iron/dark,
/area/station/security/courtroom)
-"qcD" = (
-/obj/structure/rack,
-/obj/item/aicard,
-/obj/item/radio/off,
-/obj/effect/turf_decal/tile/blue/half/contrasted{
- dir = 1
- },
-/obj/machinery/computer/security/telescreen/minisat/directional/south,
-/turf/open/floor/iron/dark,
-/area/station/command/bridge)
"qcP" = (
/obj/effect/landmark/blobstart,
/obj/effect/mapping_helpers/burnt_floor,
@@ -46132,30 +46063,6 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/cargo/miningoffice)
-"qqs" = (
-/obj/structure/table,
-/obj/item/multitool{
- pixel_x = 4;
- pixel_y = 12
- },
-/obj/item/multitool{
- pixel_x = -4;
- pixel_y = 8
- },
-/obj/item/stock_parts/power_store/cell/high{
- pixel_y = -4
- },
-/obj/item/stock_parts/power_store/cell/high{
- pixel_x = -4;
- pixel_y = -6
- },
-/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible/layer5,
-/obj/machinery/atmospherics/pipe/smart/simple/purple/visible,
-/obj/item/multitool{
- pixel_y = 10
- },
-/turf/open/floor/iron/dark/textured,
-/area/station/engineering/atmos)
"qrg" = (
/obj/machinery/light_switch/directional/north,
/turf/open/floor/circuit/green{
@@ -46186,12 +46093,6 @@
},
/turf/open/floor/engine/co2,
/area/station/engineering/atmos)
-"qrw" = (
-/obj/structure/bed/dogbed/renault,
-/mob/living/basic/pet/fox/renault,
-/obj/machinery/computer/security/telescreen/minisat/directional/south,
-/turf/open/floor/carpet,
-/area/station/command/heads_quarters/captain/private)
"qrF" = (
/obj/machinery/computer/exodrone_control_console{
dir = 1
@@ -46328,12 +46229,6 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/command/heads_quarters/ce)
-"qtq" = (
-/obj/machinery/cell_charger,
-/obj/item/stock_parts/power_store/cell/crap,
-/obj/structure/table/wood,
-/turf/open/floor/carpet,
-/area/station/command/corporate_showroom)
"qua" = (
/obj/machinery/atmospherics/pipe/smart/manifold/yellow/visible{
dir = 1
@@ -46935,6 +46830,18 @@
},
/turf/open/floor/iron/dark,
/area/station/security/courtroom)
+"qGj" = (
+/obj/structure/table,
+/obj/machinery/button/door{
+ id = "xenobio6";
+ name = "Xenobio Pen 6 Blast Doors";
+ pixel_y = 1;
+ req_access = list("xenobiology")
+ },
+/obj/structure/window/reinforced/spawner/directional/east,
+/obj/structure/window/reinforced/spawner/directional/north,
+/turf/open/floor/iron,
+/area/station/science/xenobiology)
"qGn" = (
/obj/structure/table,
/obj/item/hfr_box/body/waste_output,
@@ -47007,12 +46914,6 @@
},
/turf/open/floor/iron,
/area/station/engineering/atmos)
-"qHm" = (
-/obj/machinery/pdapainter/engineering,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/machinery/computer/security/telescreen/ce/directional/south,
-/turf/open/floor/iron/dark,
-/area/station/command/heads_quarters/ce)
"qHs" = (
/obj/structure/sign/warning/docking,
/turf/closed/wall,
@@ -47436,17 +47337,6 @@
},
/turf/open/floor/iron,
/area/station/security/prison)
-"qNO" = (
-/obj/structure/table/glass,
-/obj/item/folder/blue{
- pixel_y = 3
- },
-/obj/item/pen,
-/obj/machinery/computer/security/telescreen/minisat/directional/south,
-/obj/effect/turf_decal/tile/blue,
-/obj/structure/window/reinforced/spawner/directional/east,
-/turf/open/floor/iron/dark,
-/area/station/engineering/transit_tube)
"qNV" = (
/obj/machinery/holopad,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -47598,6 +47488,17 @@
},
/turf/open/floor/carpet,
/area/station/service/library)
+"qQl" = (
+/obj/machinery/chem_dispenser,
+/obj/machinery/button/door/directional/north{
+ id = "pharmacy_shutters";
+ name = "pharmacy shutters control";
+ pixel_x = 24;
+ req_access = list("medical")
+ },
+/obj/effect/turf_decal/tile/yellow/fourcorners,
+/turf/open/floor/iron/white,
+/area/station/medical/pharmacy)
"qQm" = (
/obj/structure/cable,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
@@ -47683,21 +47584,6 @@
},
/turf/open/floor/iron,
/area/station/commons/locker)
-"qRq" = (
-/obj/structure/table/glass,
-/obj/item/tank/internals/emergency_oxygen{
- pixel_x = -8
- },
-/obj/item/clothing/mask/breath{
- pixel_x = 4
- },
-/obj/machinery/atmospherics/pipe/layer_manifold/supply/hidden,
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
-/obj/machinery/firealarm/directional/south,
-/turf/open/floor/iron/dark,
-/area/station/engineering/transit_tube)
"qRz" = (
/obj/machinery/atmospherics/components/unary/portables_connector/visible,
/obj/effect/spawner/random/trash/janitor_supplies,
@@ -47932,6 +47818,16 @@
/obj/effect/turf_decal/tile/purple/half/contrasted,
/turf/open/floor/iron/white,
/area/station/science/lobby)
+"qUC" = (
+/obj/machinery/light/small/directional/west,
+/obj/item/clothing/mask/animal/horsehead,
+/obj/structure/table/wood,
+/obj/machinery/airalarm/directional/south,
+/obj/item/cigarette/pipe,
+/obj/item/clothing/mask/fakemoustache,
+/obj/structure/sign/poster/contraband/random/directional/west,
+/turf/open/floor/wood,
+/area/station/service/theater)
"qUQ" = (
/obj/structure/chair{
dir = 8
@@ -47972,6 +47868,13 @@
/obj/effect/turf_decal/tile/neutral/half/contrasted,
/turf/open/floor/iron,
/area/station/service/hydroponics/garden)
+"qWc" = (
+/obj/machinery/chem_dispenser,
+/obj/effect/turf_decal/tile/yellow/half/contrasted{
+ dir = 4
+ },
+/turf/open/floor/iron/white,
+/area/station/medical/pharmacy)
"qWg" = (
/obj/structure/lattice,
/obj/structure/sign/warning/secure_area/directional/east,
@@ -48554,10 +48457,6 @@
},
/turf/open/floor/iron,
/area/station/cargo/drone_bay)
-"rgM" = (
-/obj/structure/sign/poster/traitor/random,
-/turf/closed/wall,
-/area/station/cargo/warehouse)
"rgS" = (
/obj/machinery/modular_computer/preset/civilian{
dir = 1
@@ -48728,32 +48627,6 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/hallway/primary/aft)
-"rkx" = (
-/obj/structure/table,
-/obj/item/stack/cable_coil{
- pixel_x = 3;
- pixel_y = -7
- },
-/obj/item/stack/cable_coil,
-/obj/item/electronics/airlock,
-/obj/item/electronics/airlock,
-/obj/item/clothing/ears/earmuffs{
- pixel_x = -3;
- pixel_y = -2
- },
-/obj/item/clothing/ears/earmuffs{
- pixel_x = -5;
- pixel_y = 6
- },
-/obj/effect/turf_decal/bot{
- dir = 1
- },
-/obj/item/stock_parts/power_store/cell/emproof{
- pixel_x = -4;
- pixel_y = 6
- },
-/turf/open/floor/iron,
-/area/station/engineering/main)
"rkA" = (
/obj/structure/table,
/obj/item/cultivator,
@@ -49088,6 +48961,23 @@
/obj/structure/window/reinforced/spawner/directional/east,
/turf/open/space,
/area/space/nearstation)
+"rqX" = (
+/obj/structure/table,
+/obj/effect/turf_decal/siding{
+ dir = 9
+ },
+/obj/item/stock_parts/matter_bin{
+ pixel_x = 3;
+ pixel_y = 3
+ },
+/obj/item/stock_parts/matter_bin,
+/obj/item/stock_parts/micro_laser,
+/obj/item/flatpack{
+ board = /obj/item/circuitboard/machine/flatpacker
+ },
+/obj/item/multitool,
+/turf/open/floor/iron,
+/area/station/science/lab)
"rrg" = (
/obj/structure/cable,
/obj/effect/spawner/structure/window/reinforced,
@@ -49220,10 +49110,6 @@
},
/turf/open/floor/iron,
/area/station/ai_monitored/command/storage/eva)
-"rtj" = (
-/obj/machinery/igniter/incinerator_ordmix,
-/turf/open/floor/engine/vacuum,
-/area/station/science/ordnance/burnchamber)
"rtz" = (
/obj/effect/turf_decal/siding/wood/corner,
/obj/effect/turf_decal/siding/wood{
@@ -50321,19 +50207,6 @@
/obj/machinery/light/small/directional/south,
/turf/open/floor/plating,
/area/station/maintenance/department/engine)
-"rMe" = (
-/obj/structure/table,
-/obj/machinery/button/door{
- id = "xenobio3";
- layer = 3.3;
- name = "Xenobio Pen 3 Blast Doors";
- pixel_y = 4;
- req_access = list("xenobiology")
- },
-/obj/structure/window/reinforced/spawner/directional/east,
-/obj/structure/window/reinforced/spawner/directional/south,
-/turf/open/floor/iron,
-/area/station/science/xenobiology)
"rMl" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -50547,25 +50420,6 @@
},
/turf/open/floor/iron/white,
/area/station/command/heads_quarters/cmo)
-"rQk" = (
-/obj/machinery/recharger{
- pixel_y = 4
- },
-/obj/machinery/camera/directional/north{
- c_tag = "Security Post - Medbay";
- network = list("ss13","medbay")
- },
-/obj/effect/turf_decal/tile/red/fourcorners,
-/obj/machinery/light/small/directional/north,
-/obj/structure/table/reinforced,
-/obj/machinery/requests_console/directional/north{
- department = "Security";
- name = "Security Requests Console"
- },
-/obj/effect/mapping_helpers/requests_console/assistance,
-/obj/effect/mapping_helpers/requests_console/supplies,
-/turf/open/floor/iron/dark,
-/area/station/security/checkpoint/medical)
"rQl" = (
/obj/structure/table/reinforced,
/obj/machinery/door/firedoor,
@@ -50955,6 +50809,14 @@
/obj/effect/landmark/navigate_destination,
/turf/open/floor/plating,
/area/station/science/ordnance/testlab)
+"rXz" = (
+/obj/machinery/light/directional/south,
+/obj/effect/turf_decal/delivery,
+/obj/structure/table,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/machinery/computer/security/telescreen/ordnance/directional/south,
+/turf/open/floor/iron/dark,
+/area/station/science/ordnance/testlab)
"rXJ" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/chair/stool/directional/east,
@@ -50963,9 +50825,6 @@
},
/turf/open/floor/iron,
/area/station/security/prison/visit)
-"rXT" = (
-/turf/closed/wall/r_wall,
-/area/station/science/ordnance/burnchamber)
"rXW" = (
/obj/item/radio/intercom/directional/west,
/obj/structure/table/glass,
@@ -51655,6 +51514,17 @@
/obj/structure/window/reinforced/spawner/directional/north,
/turf/open/floor/wood,
/area/station/command/heads_quarters/captain/private)
+"ska" = (
+/obj/structure/closet{
+ name = "evidence closet 3"
+ },
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/effect/turf_decal/tile/red/half/contrasted{
+ dir = 4
+ },
+/obj/item/poster/traitor,
+/turf/open/floor/iron/dark,
+/area/station/security/evidence)
"skx" = (
/obj/effect/turf_decal/tile/yellow/half/contrasted{
dir = 8
@@ -52639,6 +52509,13 @@
},
/turf/open/floor/iron,
/area/station/hallway/secondary/entry)
+"sDl" = (
+/obj/structure/table,
+/obj/machinery/cell_charger,
+/obj/machinery/airalarm/directional/east,
+/obj/item/stock_parts/power_store/cell/high,
+/turf/open/floor/iron/dark,
+/area/station/engineering/storage/tech)
"sDo" = (
/obj/structure/cable,
/obj/effect/landmark/event_spawn,
@@ -52993,6 +52870,10 @@
},
/turf/open/floor/iron/dark,
/area/station/science/ordnance)
+"sJm" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/closed/wall/r_wall,
+/area/station/science/ordnance/burnchamber)
"sJL" = (
/obj/item/crowbar,
/obj/structure/cable,
@@ -53783,6 +53664,30 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/engineering/atmos)
+"sVL" = (
+/obj/machinery/turretid{
+ control_area = "/area/station/ai_monitored/turret_protected/ai_upload";
+ icon_state = "control_stun";
+ name = "AI Upload Turret Control";
+ pixel_y = 28
+ },
+/obj/item/radio/intercom/directional/north{
+ broadcasting = 1;
+ frequency = 1447;
+ name = "Private Channel";
+ pixel_x = -26
+ },
+/obj/effect/landmark/start/cyborg,
+/obj/machinery/light/small/directional/west,
+/obj/machinery/computer/security/telescreen/aiupload/directional/west,
+/obj/structure/cable,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+ dir = 4
+ },
+/obj/machinery/power/apc/auto_name/directional/south,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/turf/open/floor/iron/dark,
+/area/station/ai_monitored/turret_protected/ai_upload_foyer)
"sVM" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -53896,6 +53801,20 @@
/obj/machinery/light/small/directional/north,
/turf/open/floor/iron,
/area/station/security/prison/garden)
+"sXy" = (
+/obj/machinery/atmospherics/pipe/smart/simple/dark/visible,
+/obj/effect/turf_decal/siding/purple{
+ dir = 4
+ },
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+ dir = 1
+ },
+/obj/machinery/power/apc/auto_name/directional/east{
+ areastring = "/area/station/science/ordnance/burnchamber"
+ },
+/obj/structure/cable,
+/turf/open/floor/iron/dark,
+/area/station/science/ordnance)
"sXF" = (
/obj/effect/turf_decal/trimline/purple/line{
dir = 1
@@ -54439,20 +54358,6 @@
/obj/item/kirbyplants/random,
/turf/open/floor/iron,
/area/station/hallway/primary/port)
-"tjc" = (
-/obj/structure/table/reinforced,
-/obj/item/stock_parts/power_store/cell/high{
- pixel_x = 4;
- pixel_y = 5
- },
-/obj/item/stock_parts/power_store/cell/high{
- pixel_x = -8;
- pixel_y = 9
- },
-/obj/item/stock_parts/power_store/cell/high,
-/obj/machinery/cell_charger,
-/turf/open/floor/iron,
-/area/station/science/robotics/lab)
"tjf" = (
/obj/machinery/hydroponics/soil{
pixel_y = 8
@@ -54542,6 +54447,31 @@
},
/turf/open/space,
/area/space)
+"tks" = (
+/obj/item/emptysandbag,
+/obj/item/emptysandbag,
+/obj/item/emptysandbag,
+/obj/item/emptysandbag{
+ pixel_x = 8
+ },
+/obj/item/emptysandbag{
+ pixel_x = -9
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/sign/poster/contraband/random/directional/south,
+/turf/open/floor/iron,
+/area/station/cargo/warehouse)
+"tkD" = (
+/obj/machinery/light_switch/directional/south,
+/obj/structure/table/wood,
+/obj/item/razor{
+ pixel_x = -4;
+ pixel_y = 2
+ },
+/obj/item/cigarette/cigar,
+/obj/item/reagent_containers/cup/glass/flask/gold,
+/turf/open/floor/carpet,
+/area/station/command/heads_quarters/captain/private)
"tkE" = (
/obj/machinery/requests_console/directional/east{
department = "Bridge";
@@ -54565,6 +54495,30 @@
/obj/item/radio/intercom/prison/directional/north,
/turf/open/floor/iron,
/area/station/security/prison)
+"tkT" = (
+/obj/structure/table,
+/obj/item/multitool{
+ pixel_x = 4;
+ pixel_y = 12
+ },
+/obj/item/multitool{
+ pixel_x = -4;
+ pixel_y = 8
+ },
+/obj/item/stock_parts/power_store/cell/high{
+ pixel_y = -4
+ },
+/obj/item/stock_parts/power_store/cell/high{
+ pixel_x = -4;
+ pixel_y = -6
+ },
+/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible/layer5,
+/obj/machinery/atmospherics/pipe/smart/simple/purple/visible,
+/obj/item/multitool{
+ pixel_y = 10
+ },
+/turf/open/floor/iron/dark/textured,
+/area/station/engineering/atmos)
"tlh" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -54718,11 +54672,6 @@
},
/turf/open/floor/iron/dark,
/area/station/command/heads_quarters/rd)
-"tnF" = (
-/obj/machinery/light/small/dim/directional/west,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron,
-/area/station/cargo/warehouse)
"tnG" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/showcase/machinery/oldpod{
@@ -54798,15 +54747,6 @@
/obj/structure/window/reinforced/spawner/directional/south,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/aisat/exterior)
-"tpA" = (
-/obj/machinery/cell_charger{
- pixel_y = 4
- },
-/obj/structure/table/glass,
-/obj/item/stock_parts/power_store/cell/high,
-/obj/structure/window/reinforced/spawner/directional/west,
-/turf/open/floor/iron/dark,
-/area/station/command/bridge)
"tpD" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/cable,
@@ -54966,6 +54906,14 @@
/obj/item/knife/kitchen,
/turf/open/floor/iron/white,
/area/station/science/cytology)
+"tsN" = (
+/obj/structure/table,
+/obj/machinery/cell_charger,
+/obj/item/stock_parts/power_store/cell/high,
+/obj/machinery/light_switch/directional/north,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/turf/open/floor/iron/dark,
+/area/station/command/teleporter)
"tsT" = (
/obj/effect/turf_decal/stripes/corner{
dir = 1
@@ -55187,6 +55135,10 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/aft)
+"txe" = (
+/obj/structure/sign/warning/electric_shock/directional/south,
+/turf/open/space/basic,
+/area/space/nearstation)
"txg" = (
/obj/machinery/suit_storage_unit/security,
/obj/effect/turf_decal/tile/neutral/fourcorners,
@@ -55220,6 +55172,12 @@
},
/turf/open/floor/iron,
/area/station/commons/locker)
+"txp" = (
+/obj/structure/bed/dogbed/renault,
+/mob/living/basic/pet/fox/renault,
+/obj/machinery/computer/security/telescreen/minisat/directional/south,
+/turf/open/floor/carpet,
+/area/station/command/heads_quarters/captain/private)
"txz" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -55885,10 +55843,6 @@
},
/turf/open/floor/iron/white,
/area/station/science/research)
-"tLb" = (
-/obj/structure/sign/warning/electric_shock/directional/south,
-/turf/open/space/basic,
-/area/space)
"tLc" = (
/obj/structure/cable,
/obj/structure/disposalpipe/segment{
@@ -56556,17 +56510,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/dark,
/area/station/security/execution/education)
-"tVk" = (
-/obj/machinery/light/directional/south,
-/obj/machinery/firealarm/directional/south,
-/obj/structure/rack,
-/obj/item/storage/briefcase/secure,
-/obj/item/cigarette/cigar,
-/obj/effect/turf_decal/tile/blue/half/contrasted{
- dir = 1
- },
-/turf/open/floor/iron/dark,
-/area/station/command/bridge)
"tVm" = (
/obj/structure/closet/secure_closet/brig,
/obj/effect/turf_decal/trimline/red/filled/line{
@@ -57565,16 +57508,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron,
/area/station/commons/fitness/recreation)
-"unK" = (
-/obj/structure/table/wood,
-/obj/machinery/computer/security/telescreen/prison/directional/north,
-/obj/item/flashlight/lamp/green{
- pixel_x = 1;
- pixel_y = 5
- },
-/obj/item/restraints/handcuffs,
-/turf/open/floor/carpet,
-/area/station/security/detectives_office)
"unL" = (
/turf/closed/wall,
/area/station/maintenance/starboard/greater)
@@ -57810,6 +57743,25 @@
/obj/structure/chair/stool/directional/east,
/turf/open/floor/iron,
/area/station/commons/dorms)
+"urN" = (
+/obj/effect/turf_decal/stripes/corner{
+ dir = 4
+ },
+/obj/structure/table/reinforced,
+/obj/machinery/cell_charger,
+/obj/item/stock_parts/power_store/cell/high,
+/obj/machinery/firealarm/directional/west,
+/obj/machinery/camera/directional/north{
+ c_tag = "Science Mechbay";
+ network = list("ss13","rd")
+ },
+/obj/machinery/button/door/directional/north{
+ id = "mechbay";
+ name = "Mech Bay Shutters Control";
+ req_access = list("robotics")
+ },
+/turf/open/floor/iron,
+/area/station/science/robotics/mechbay)
"urQ" = (
/obj/structure/lattice/catwalk,
/obj/item/stack/cable_coil,
@@ -58057,6 +58009,13 @@
},
/turf/open/floor/iron,
/area/station/security/mechbay)
+"uvo" = (
+/obj/machinery/status_display/ai/directional/north,
+/obj/machinery/porta_turret/ai,
+/obj/machinery/computer/security/telescreen/research/directional/west,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/turf/open/floor/iron/dark,
+/area/station/ai_monitored/turret_protected/aisat_interior)
"uvw" = (
/obj/machinery/status_display/supply{
pixel_y = 32
@@ -58304,15 +58263,6 @@
/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/iron,
/area/station/hallway/primary/aft)
-"uzl" = (
-/obj/machinery/camera/directional/west{
- active_power_usage = 0;
- c_tag = "Turbine Vent";
- network = list("turbine");
- use_power = 0
- },
-/turf/open/space/basic,
-/area/space)
"uzJ" = (
/obj/effect/turf_decal/trimline/blue/filled/warning{
dir = 4
@@ -58501,6 +58451,19 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/central)
+"uDL" = (
+/obj/structure/table,
+/obj/machinery/button/door{
+ id = "xenobio5";
+ name = "Xenobio Pen 5 Blast Doors";
+ pixel_y = 4;
+ req_access = list("xenobiology")
+ },
+/obj/structure/window/reinforced/spawner/directional/north,
+/obj/structure/window/reinforced/spawner/directional/east,
+/obj/structure/window/reinforced/spawner/directional/south,
+/turf/open/floor/iron,
+/area/station/science/xenobiology)
"uDP" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/structure/cable,
@@ -58828,6 +58791,26 @@
/obj/machinery/status_display/evac/directional/south,
/turf/open/floor/engine,
/area/station/engineering/supermatter/room)
+"uIa" = (
+/obj/structure/table,
+/obj/item/reagent_containers/condiment/saltshaker{
+ pixel_x = -2;
+ pixel_y = 2
+ },
+/obj/item/reagent_containers/condiment/peppermill{
+ desc = "Often used to flavor food or make people sneeze. Fashionably moved to the left side of the table.";
+ pixel_x = -8;
+ pixel_y = 2
+ },
+/obj/item/reagent_containers/condiment/enzyme{
+ pixel_x = 9;
+ pixel_y = 3
+ },
+/obj/item/book/manual/chef_recipes,
+/obj/effect/turf_decal/tile/red/opposingcorners,
+/obj/structure/window/spawner/directional/south,
+/turf/open/floor/iron/white,
+/area/station/security/prison/mess)
"uIe" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/structure/cable,
@@ -58895,22 +58878,6 @@
/obj/machinery/computer/accounting,
/turf/open/floor/wood,
/area/station/command/heads_quarters/hop)
-"uJz" = (
-/obj/effect/turf_decal/bot,
-/obj/structure/rack,
-/obj/machinery/status_display/evac/directional/east,
-/obj/effect/turf_decal/tile/yellow{
- dir = 4
- },
-/obj/item/flatpack{
- board = /obj/item/circuitboard/machine/flatpacker;
- pixel_x = -5
- },
-/obj/item/multitool{
- pixel_x = 8
- },
-/turf/open/floor/iron/checker,
-/area/station/engineering/storage_shared)
"uJB" = (
/obj/structure/chair/stool/directional/east,
/turf/open/floor/iron,
@@ -59267,6 +59234,14 @@
},
/turf/open/floor/iron,
/area/station/service/hydroponics/garden)
+"uPS" = (
+/obj/structure/table,
+/obj/machinery/cell_charger,
+/obj/item/stock_parts/power_store/cell/high,
+/obj/item/stock_parts/power_store/cell/high,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron,
+/area/station/ai_monitored/command/storage/eva)
"uQe" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -59415,6 +59390,17 @@
/obj/effect/landmark/start/medical_doctor,
/turf/open/floor/iron/dark,
/area/station/medical/storage)
+"uTp" = (
+/obj/machinery/computer/upload/borg,
+/obj/machinery/door/window/left/directional/south{
+ name = "Cyborg Upload Console Window";
+ req_access = list("ai_upload")
+ },
+/obj/structure/window/reinforced/spawner/directional/west,
+/obj/structure/window/reinforced/spawner/directional/east,
+/obj/structure/window/reinforced/spawner/directional/north,
+/turf/open/floor/iron/dark,
+/area/station/ai_monitored/turret_protected/ai_upload)
"uTw" = (
/obj/machinery/portable_atmospherics/canister/air,
/obj/effect/spawner/random/maintenance,
@@ -59869,13 +59855,6 @@
/obj/effect/turf_decal/tile/red/fourcorners,
/turf/open/floor/iron/white,
/area/station/security/prison/safe)
-"vag" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/disposalpipe/segment,
-/obj/item/stock_parts/power_store/cell/high,
-/turf/open/floor/plating,
-/area/station/maintenance/starboard/greater)
"vaB" = (
/obj/structure/cable,
/obj/effect/spawner/structure/window/reinforced,
@@ -59998,6 +59977,12 @@
},
/turf/open/floor/plating,
/area/station/service/chapel/funeral)
+"vda" = (
+/obj/machinery/pdapainter/engineering,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/machinery/computer/security/telescreen/ce/directional/south,
+/turf/open/floor/iron/dark,
+/area/station/command/heads_quarters/ce)
"vde" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/button/door/directional/north{
@@ -60177,15 +60162,14 @@
},
/turf/open/floor/iron/white,
/area/station/command/heads_quarters/cmo)
-"vhb" = (
-/obj/machinery/chem_dispenser{
- layer = 2.7
- },
-/obj/effect/turf_decal/tile/yellow/anticorner/contrasted{
- dir = 8
+"vhd" = (
+/obj/machinery/computer/security/telescreen/tcomms/directional/east,
+/obj/machinery/computer/telecomms/monitor{
+ dir = 8;
+ network = "tcommsat"
},
-/turf/open/floor/iron/white,
-/area/station/medical/chemistry)
+/turf/open/floor/iron/grimy,
+/area/station/tcommsat/computer)
"vhj" = (
/obj/structure/chair{
name = "Judge"
@@ -60250,25 +60234,6 @@
/mob/living/carbon/human/species/monkey,
/turf/open/floor/grass,
/area/station/medical/virology)
-"vis" = (
-/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,
-/area/station/ai_monitored/command/nuke_storage)
-"viF" = (
-/obj/machinery/computer/upload/borg,
-/obj/machinery/door/window/left/directional/south{
- layer = 3.1;
- name = "Cyborg Upload Console Window";
- req_access = list("ai_upload")
- },
-/obj/structure/window/reinforced/spawner/directional/west,
-/obj/structure/window/reinforced/spawner/directional/east,
-/obj/structure/window/reinforced/spawner/directional/north,
-/turf/open/floor/iron/dark,
-/area/station/ai_monitored/turret_protected/ai_upload)
"viH" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/effect/spawner/structure/window/reinforced,
@@ -60465,6 +60430,14 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/hallway/secondary/exit/departure_lounge)
+"vkJ" = (
+/obj/machinery/door/airlock/research/glass/incinerator/ordmix_exterior{
+ name = "Burn Chamber Exterior Airlock"
+ },
+/obj/effect/mapping_helpers/airlock/locked,
+/obj/effect/mapping_helpers/airlock/access/all/science/ordnance,
+/turf/open/floor/engine/vacuum,
+/area/station/science/ordnance/burnchamber)
"vkO" = (
/obj/structure/table,
/obj/item/clothing/gloves/latex,
@@ -61045,20 +61018,6 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/fore)
-"vuz" = (
-/obj/structure/closet/crate,
-/obj/item/stock_parts/power_store/cell/high,
-/obj/item/stack/cable_coil{
- pixel_x = 3;
- pixel_y = -7
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 9
- },
-/obj/effect/spawner/random/engineering/flashlight,
-/obj/effect/spawner/random/engineering/flashlight,
-/turf/open/floor/iron,
-/area/station/cargo/miningoffice)
"vuJ" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/engineering/glass{
@@ -61140,11 +61099,6 @@
/obj/effect/mapping_helpers/broken_floor,
/turf/open/floor/plating,
/area/station/hallway/secondary/entry)
-"vwi" = (
-/obj/structure/table,
-/obj/item/cigarette/pipe,
-/turf/open/floor/plating,
-/area/station/maintenance/port)
"vwn" = (
/obj/item/kirbyplants/organic/plant10,
/turf/open/floor/wood/large,
@@ -61482,16 +61436,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/engineering/gravity_generator)
-"vCu" = (
-/obj/machinery/light/small/directional/west,
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/cable,
-/obj/machinery/camera/directional/west{
- c_tag = "Auxilary Restrooms"
- },
-/obj/structure/sign/poster/official/random/directional/west,
-/turf/open/floor/iron,
-/area/station/commons/toilet/auxiliary)
"vCC" = (
/obj/structure/cable,
/obj/structure/disposalpipe/segment{
@@ -61611,23 +61555,6 @@
/obj/structure/cable,
/turf/open/floor/plating,
/area/station/maintenance/port)
-"vEv" = (
-/obj/machinery/computer/mecha{
- dir = 8
- },
-/obj/effect/turf_decal/trimline/purple/filled/line{
- dir = 5
- },
-/obj/machinery/requests_console/directional/east{
- department = "Research Director's Desk";
- name = "Research Director's Requests Console"
- },
-/obj/effect/mapping_helpers/requests_console/announcement,
-/obj/effect/mapping_helpers/requests_console/information,
-/obj/effect/mapping_helpers/requests_console/assistance,
-/obj/machinery/computer/security/telescreen/rd/directional/north,
-/turf/open/floor/iron/white,
-/area/station/command/heads_quarters/rd)
"vEw" = (
/obj/structure/chair/stool/directional/south,
/obj/item/radio/intercom/prison/directional/north,
@@ -62016,6 +61943,15 @@
/obj/effect/mapping_helpers/burnt_floor,
/turf/open/floor/plating,
/area/station/maintenance/port/aft)
+"vKW" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+ dir = 8
+ },
+/obj/machinery/light/small/directional/east,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/machinery/computer/security/telescreen/ordnance/directional/east,
+/turf/open/floor/iron/dark,
+/area/station/science/ordnance/testlab)
"vLb" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -62956,16 +62892,6 @@
},
/turf/open/floor/plating,
/area/station/maintenance/starboard/greater)
-"waf" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible,
-/obj/structure/cable,
-/obj/machinery/computer/security/telescreen/turbine/directional/east,
-/turf/open/floor/iron,
-/area/station/maintenance/disposal/incinerator)
"wag" = (
/obj/machinery/computer/records/medical,
/obj/structure/cable,
@@ -63486,6 +63412,16 @@
/obj/effect/landmark/start/hangover/closet,
/turf/open/floor/iron,
/area/station/hallway/secondary/entry)
+"wiQ" = (
+/obj/structure/table/reinforced,
+/obj/machinery/cell_charger,
+/obj/item/stock_parts/power_store/cell/high,
+/obj/item/rcl/pre_loaded,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/turf/open/floor/iron,
+/area/station/command/heads_quarters/ce)
"wiS" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/structure/cable,
@@ -63772,23 +63708,6 @@
},
/turf/open/floor/plating,
/area/station/maintenance/aft/lesser)
-"wpo" = (
-/obj/item/storage/box/matches{
- pixel_x = -2;
- pixel_y = 3
- },
-/obj/item/cigarette/cigar{
- pixel_x = 4;
- pixel_y = 1
- },
-/obj/item/cigarette/cigar{
- pixel_x = -4;
- pixel_y = 1
- },
-/obj/item/cigarette/cigar/cohiba,
-/obj/structure/table/wood,
-/turf/open/floor/carpet,
-/area/station/command/corporate_showroom)
"wpr" = (
/obj/machinery/firealarm/directional/east,
/obj/effect/turf_decal/stripes/line{
@@ -64378,6 +64297,17 @@
},
/turf/open/floor/plating,
/area/station/maintenance/starboard/fore)
+"wAc" = (
+/obj/structure/table,
+/obj/item/stack/cable_coil{
+ pixel_x = -3;
+ pixel_y = 3
+ },
+/obj/item/stack/cable_coil,
+/obj/item/stock_parts/power_store/cell/high,
+/obj/structure/extinguisher_cabinet/directional/east,
+/turf/open/floor/iron/dark,
+/area/station/engineering/storage/tech)
"wAk" = (
/obj/machinery/status_display/evac/directional/south,
/obj/structure/disposalpipe/segment{
@@ -65022,6 +64952,10 @@
},
/turf/open/floor/plating,
/area/station/maintenance/department/engine)
+"wOJ" = (
+/obj/structure/sign/warning/secure_area/directional/north,
+/turf/open/space/basic,
+/area/space/nearstation)
"wOR" = (
/obj/effect/landmark/event_spawn,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -65278,6 +65212,14 @@
/obj/effect/landmark/event_spawn,
/turf/open/floor/iron/white,
/area/station/medical/medbay/central)
+"wSC" = (
+/obj/structure/filingcabinet,
+/obj/item/folder/documents,
+/obj/effect/turf_decal/bot_white,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/item/poster/traitor,
+/turf/open/floor/iron/dark,
+/area/station/ai_monitored/command/nuke_storage)
"wSI" = (
/obj/structure/table/reinforced,
/obj/machinery/door/firedoor,
@@ -65292,6 +65234,32 @@
/obj/effect/turf_decal/tile/green/fourcorners,
/turf/open/floor/iron,
/area/station/service/hydroponics)
+"wTn" = (
+/obj/structure/cable,
+/obj/structure/table/wood/fancy/black,
+/obj/item/storage/fancy/cigarettes/cigars/cohiba{
+ pixel_x = 3;
+ pixel_y = 14
+ },
+/obj/item/reagent_containers/cup/glass/bottle/champagne{
+ pixel_x = -7;
+ pixel_y = 8
+ },
+/obj/item/cigarette/cigar{
+ pixel_x = 4;
+ pixel_y = 3
+ },
+/obj/item/cigarette/cigar{
+ pixel_x = 8
+ },
+/obj/effect/turf_decal/siding/wood{
+ dir = 9
+ },
+/obj/machinery/keycard_auth/directional/north{
+ pixel_x = -5
+ },
+/turf/open/floor/wood/large,
+/area/station/command/heads_quarters/qm)
"wTp" = (
/obj/structure/table/reinforced,
/obj/machinery/door/window/brigdoor/left/directional/north{
@@ -65750,15 +65718,6 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/port)
-"xbg" = (
-/obj/structure/table,
-/obj/machinery/cell_charger,
-/obj/item/stock_parts/power_store/cell/high,
-/obj/effect/turf_decal/bot{
- dir = 1
- },
-/turf/open/floor/iron,
-/area/station/command/gateway)
"xbT" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -66738,10 +66697,6 @@
/obj/effect/turf_decal/tile/blue/fourcorners,
/turf/open/floor/iron/white,
/area/station/medical/treatment_center)
-"xtw" = (
-/obj/item/stack/rods,
-/turf/open/space/basic,
-/area/space)
"xtz" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -66755,15 +66710,6 @@
/obj/effect/turf_decal/trimline/brown/filled/corner,
/turf/open/floor/iron,
/area/station/cargo/storage)
-"xtY" = (
-/obj/machinery/computer/security/telescreen/auxbase/directional/south,
-/obj/structure/cable,
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
- dir = 8
- },
-/obj/effect/turf_decal/tile/yellow/half/contrasted,
-/turf/open/floor/iron,
-/area/station/construction/mining/aux_base)
"xtZ" = (
/obj/structure/lattice,
/obj/machinery/atmospherics/pipe/smart/simple/green/visible,
@@ -67605,18 +67551,6 @@
/obj/machinery/newscaster/directional/north,
/turf/open/floor/iron,
/area/station/service/hydroponics)
-"xIK" = (
-/obj/structure/table,
-/obj/item/reagent_containers/condiment/enzyme{
- layer = 5;
- pixel_x = -7;
- pixel_y = 13
- },
-/obj/item/reagent_containers/condiment/flour{
- pixel_x = 1
- },
-/turf/open/floor/plating,
-/area/station/maintenance/port/aft)
"xIM" = (
/obj/machinery/computer/operating{
dir = 8
@@ -67732,6 +67666,9 @@
},
/turf/open/floor/iron,
/area/station/construction/mining/aux_base)
+"xMk" = (
+/turf/closed/wall/r_wall,
+/area/station/science/ordnance/burnchamber)
"xMl" = (
/obj/machinery/navbeacon{
codes_txt = "patrol;next_patrol=15-Court";
@@ -68244,12 +68181,6 @@
},
/turf/open/floor/engine/vacuum,
/area/station/engineering/atmos)
-"xWr" = (
-/obj/effect/turf_decal/trimline/red/filled/corner,
-/obj/machinery/light/directional/east,
-/obj/machinery/computer/security/telescreen/interrogation/directional/east,
-/turf/open/floor/iron,
-/area/station/security/brig)
"xWE" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/effect/turf_decal/tile/yellow/half/contrasted{
@@ -68463,10 +68394,6 @@
},
/turf/open/floor/plating,
/area/station/maintenance/fore/lesser)
-"xYZ" = (
-/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible,
-/turf/closed/wall/r_wall,
-/area/station/science/ordnance/burnchamber)
"xZb" = (
/obj/effect/spawner/random/structure/grille,
/turf/open/floor/plating,
@@ -68475,6 +68402,23 @@
/obj/item/radio/intercom/directional/north,
/turf/open/floor/iron,
/area/station/security/courtroom)
+"xZe" = (
+/obj/structure/closet/crate,
+/obj/machinery/power/apc/auto_name/directional/west,
+/obj/item/stack/cable_coil{
+ pixel_x = 3;
+ pixel_y = -7
+ },
+/obj/item/stock_parts/power_store/cell/high,
+/obj/machinery/light_switch/directional/north,
+/obj/effect/spawner/random/engineering/flashlight,
+/obj/effect/spawner/random/engineering/flashlight,
+/obj/effect/turf_decal/tile/brown/half/contrasted{
+ dir = 4
+ },
+/obj/structure/cable,
+/turf/open/floor/iron,
+/area/station/cargo/miningoffice)
"xZu" = (
/obj/structure/sink/kitchen/directional/east{
desc = "A sink used for washing one's hands and face. It looks rusty and home-made";
@@ -68599,6 +68543,9 @@
},
/turf/open/floor/plating,
/area/station/maintenance/port/fore)
+"ybW" = (
+/turf/open/floor/engine/xenobio,
+/area/station/science/xenobiology)
"yce" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -68666,9 +68613,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/plating,
/area/station/maintenance/port/fore)
-"ycv" = (
-/turf/open/floor/iron/white,
-/area/station/science/xenobiology)
"ycw" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -79557,10 +79501,10 @@ lMJ
aaa
aaa
aaa
-mWd
+oDv
aaa
aaa
-mWd
+oDv
aaa
aaa
aaa
@@ -81367,7 +81311,7 @@ aDa
aDa
iYU
oSc
-xtY
+jrt
aDb
rew
lGL
@@ -81434,7 +81378,7 @@ aaa
aaa
aaa
aaa
-nLZ
+gmc
aaa
aaa
aaa
@@ -81922,7 +81866,7 @@ aaa
aaa
aaa
aaa
-mWd
+oDv
aaa
aaa
aaa
@@ -82716,7 +82660,7 @@ aaa
aaa
aaa
aaa
-bxr
+fvP
aaa
aaa
lZV
@@ -83752,7 +83696,7 @@ qPC
rKQ
xjH
xjH
-fIR
+wOJ
aaa
aaa
lMJ
@@ -84780,7 +84724,7 @@ rKQ
rKQ
xjH
xjH
-ktw
+nAo
aaa
aaa
lMJ
@@ -84922,7 +84866,7 @@ aaa
aaa
aaa
aaa
-xtw
+fwp
aaa
fcJ
aaa
@@ -85206,7 +85150,7 @@ lMJ
lMJ
lMJ
pnI
-vuz
+gcz
xDu
pcS
pnI
@@ -85450,7 +85394,7 @@ aaa
aaa
aaa
aaa
-mWd
+oDv
aaa
aaa
lMJ
@@ -85512,7 +85456,7 @@ pOa
pOa
uOH
jUb
-xIK
+atQ
bar
nBp
dqN
@@ -85743,7 +85687,7 @@ cbz
dBE
vQs
vQs
-rgM
+vQs
hor
vQs
vQs
@@ -85764,7 +85708,7 @@ lMY
pOa
mrN
gXe
-vwi
+dTL
tql
pOa
aDl
@@ -85808,7 +85752,7 @@ rKQ
rKQ
xjH
xjH
-fIR
+wOJ
aaa
aaa
aaa
@@ -86000,10 +85944,10 @@ eOb
gvA
vQs
ePj
-tnF
+oTi
dKY
-kif
-rgM
+tks
+vQs
dHc
dHc
bZY
@@ -86246,7 +86190,7 @@ yeq
yeq
cvv
wcy
-kkk
+kGn
fXZ
sUc
vsO
@@ -86269,7 +86213,7 @@ iOc
qwG
fjD
rEj
-vCu
+hAJ
cwc
kXa
fjD
@@ -86317,7 +86261,7 @@ aaa
aaa
lMJ
lMJ
-cCM
+epD
cDD
lMJ
lMJ
@@ -86480,7 +86424,7 @@ qvJ
nxi
bWw
mqn
-dwI
+onw
iPE
vfv
wXv
@@ -86747,7 +86691,7 @@ jXu
bZz
vRr
paD
-hZg
+xZe
dSG
apC
sUD
@@ -86837,7 +86781,7 @@ gAf
tSw
tSw
aaa
-gda
+ioO
aaa
aaa
sGL
@@ -87031,8 +86975,8 @@ xbZ
kZI
nbd
vKn
-fNz
-rgM
+jCi
+vQs
vQs
hyW
xOw
@@ -87615,7 +87559,7 @@ gnL
ckz
dWA
ecz
-fIR
+wOJ
aaa
lMJ
aaa
@@ -88089,7 +88033,7 @@ kRA
jUb
xYq
dqN
-baG
+cIl
jUb
rvI
jUb
@@ -89330,7 +89274,7 @@ heR
kQP
hqD
kQP
-eTt
+wTn
nwm
izI
kQP
@@ -89543,7 +89487,7 @@ tGX
aXa
aKl
lds
-mzm
+uIa
hXQ
bVF
fGP
@@ -90355,7 +90299,7 @@ wWe
aTU
jzE
kQP
-ezw
+pCy
aSv
aLW
jle
@@ -90859,7 +90803,7 @@ fOB
jXu
aaa
rlU
-vis
+wSC
dhz
ixT
oXK
@@ -91621,7 +91565,7 @@ eWA
sjP
aaa
aaa
-bxr
+fvP
jXu
rOz
sHu
@@ -92727,7 +92671,7 @@ rQd
cJm
jGw
bJG
-gbn
+dbQ
bqX
ulR
qXL
@@ -92740,7 +92684,7 @@ qXL
oqk
xZB
hIJ
-vhb
+iIK
lrZ
kiz
nmQ
@@ -92961,7 +92905,7 @@ jIg
dTr
rIL
bwN
-omd
+uPS
ukk
rGm
gqX
@@ -92971,7 +92915,7 @@ qPJ
luN
wde
jJd
-dQL
+fva
umS
qPJ
bgS
@@ -93225,7 +93169,7 @@ gqX
htd
oGK
qPJ
-rQk
+eCE
waH
vbV
ixr
@@ -93917,7 +93861,7 @@ sjP
sjP
sjP
sjP
-dkX
+kOG
yey
jTZ
aBL
@@ -94213,12 +94157,12 @@ aaa
aJS
oOl
rxx
-viF
+uTp
aPv
oWF
eQg
aJS
-mSI
+sVL
aUx
qhF
htd
@@ -94241,7 +94185,7 @@ ndS
urA
pFG
gBD
-dzX
+tsN
fRu
hVE
xXw
@@ -94727,7 +94671,7 @@ aaa
aJS
bpu
wzH
-nwL
+bko
aPv
iIQ
aRV
@@ -94959,7 +94903,7 @@ lAM
aaa
aaa
rJB
-kaU
+ska
nqD
sfK
rTw
@@ -95199,7 +95143,7 @@ aaa
aaa
aaa
aaa
-nWF
+sKY
aaa
sIe
gkn
@@ -95516,7 +95460,7 @@ nxO
qXF
qXF
aMB
-tVk
+lQo
duI
jnt
cdC
@@ -95549,7 +95493,7 @@ keK
lXA
mVE
hxq
-nJn
+qWc
nqB
kxa
eIO
@@ -95773,7 +95717,7 @@ dUj
gGy
hmq
fUj
-qcD
+mjE
duI
duI
lwt
@@ -95801,7 +95745,7 @@ nxy
nxy
aYJ
hEc
-bFN
+qQl
qJn
hYA
jsh
@@ -95988,7 +95932,7 @@ aaa
aaa
aeq
xCo
-loY
+bKi
tTP
fdQ
uou
@@ -96030,7 +95974,7 @@ gGy
qVc
dMY
jYL
-tpA
+eyz
aAt
duI
pCO
@@ -96242,7 +96186,7 @@ aaa
jLw
aaa
aaa
-cTk
+dGP
aeq
dXs
tJE
@@ -96302,7 +96246,7 @@ haP
jzN
fEC
eQe
-qtq
+obU
iAA
oSo
cgF
@@ -96771,7 +96715,7 @@ ewj
bkl
wZU
pMy
-oGH
+pRF
orx
eeq
sDS
@@ -96817,7 +96761,7 @@ jzN
wyp
gzi
cyU
-wpo
+omq
oSo
iXb
kdx
@@ -97009,7 +96953,7 @@ aaa
aaa
aaa
aaa
-tLb
+txe
iTZ
ahj
ahj
@@ -97343,7 +97287,7 @@ rgZ
suW
hJF
cZK
-euw
+urN
cXg
nyy
gVl
@@ -97379,7 +97323,7 @@ jjs
dKC
xLu
dKC
-cbp
+jZG
ctL
oPD
iUm
@@ -98378,7 +98322,7 @@ cBV
xlv
eut
bUo
-tjc
+fxE
jtS
bFH
mMl
@@ -98873,7 +98817,7 @@ nse
bmb
lwg
aAK
-xbg
+pcP
tvE
qJU
hPM
@@ -99366,7 +99310,7 @@ kGq
syo
oOz
tLi
-nnh
+tkD
tyY
vFx
tyY
@@ -99394,7 +99338,7 @@ kON
ylQ
bGC
wHu
-gVE
+frK
ibw
ibw
nIP
@@ -99592,7 +99536,7 @@ wVt
jzD
wxj
kZG
-ihN
+lcK
kYg
kYg
ylZ
@@ -99633,7 +99577,7 @@ jxv
sqJ
gPA
lZM
-qrw
+txp
syo
lSz
vQe
@@ -100120,7 +100064,7 @@ jAP
fEn
xXC
xNU
-eJd
+fCB
xlf
lWg
byw
@@ -100345,7 +100289,7 @@ aaa
aaa
aaa
aaa
-tLb
+txe
gdb
ikZ
gdb
@@ -100429,7 +100373,7 @@ otB
bdv
jXK
sQB
-gLU
+rqX
buT
oOB
kZx
@@ -100459,12 +100403,12 @@ fhi
fhi
uEo
fiS
-rXT
-eRn
-rXT
-rXT
-rXT
-rXT
+xMk
+sJm
+xMk
+xMk
+xMk
+xMk
lMJ
uGg
nFa
@@ -100623,11 +100567,11 @@ pyY
sNB
xWm
mLL
-xWr
+ila
vkb
cLl
sWV
-unK
+ouc
mOt
clq
aKa
@@ -100716,12 +100660,12 @@ huj
fhi
xEU
iqx
-xYZ
-gil
-xYZ
-oet
-dXU
-kgC
+dpz
+niV
+dpz
+ebR
+cEn
+nEJ
lMJ
uGg
nFa
@@ -100973,12 +100917,12 @@ fhi
fhi
fhi
twy
-nJA
-nZL
-bEv
-cgP
-rtj
-kgC
+jUY
+fvR
+vkJ
+nPS
+kTw
+nEJ
lMJ
uGg
nFa
@@ -101227,15 +101171,15 @@ gyQ
rbD
jwj
ujk
-jvo
-aHH
+kSL
+sXy
iYE
-dTN
-dEF
-dTN
-cOT
-dXU
-kgC
+pjy
+pfE
+pjy
+mWJ
+cEn
+nEJ
lMJ
uGg
wpn
@@ -101392,7 +101336,7 @@ gMZ
cju
gMZ
mFf
-mYb
+eZB
sHt
qrn
qRg
@@ -101971,7 +101915,7 @@ ftj
wXF
doM
tZo
-bXg
+ehL
oFT
gvS
oYZ
@@ -102430,7 +102374,7 @@ fRW
qnS
uxb
hAk
-gzO
+ouf
eqn
jSb
kAF
@@ -103285,7 +103229,7 @@ guG
iAs
coe
tfV
-nRQ
+rXz
oLS
lMJ
aaa
@@ -103517,7 +103461,7 @@ sIW
bRb
cKm
tAg
-byE
+aEa
poq
vYE
lAH
@@ -103774,7 +103718,7 @@ sIW
jSk
rkT
tAg
-vEv
+eGb
pkx
hBB
wnY
@@ -104827,8 +104771,8 @@ qBF
nCG
tqx
bOm
-fhU
-cdS
+vKW
+lMM
kYD
aaa
aaa
@@ -105795,7 +105739,7 @@ aSk
tlZ
lje
klZ
-bqC
+ajc
fqD
wSs
pur
@@ -106836,7 +106780,7 @@ rHz
aFW
dqX
qLp
-bpY
+qUC
obG
izZ
tNQ
@@ -107585,10 +107529,10 @@ psZ
psZ
qXB
gAU
-cDO
+wAc
oUK
eRR
-fAA
+sDl
cdX
sDE
hjS
@@ -107599,7 +107543,7 @@ ggM
ggM
dLq
lzL
-vag
+fMR
lzL
lzL
scG
@@ -107889,7 +107833,7 @@ lMJ
lMJ
lMJ
lMJ
-uzl
+gbi
aaa
aaa
aaa
@@ -108342,7 +108286,7 @@ rpx
dPy
loA
poc
-oDH
+dXp
uXd
tfg
tfg
@@ -108599,12 +108543,12 @@ oKx
gLK
joo
sHT
-rkx
+oRA
uXd
dVc
bYp
gXu
-hSi
+gaP
uXd
gMG
dWG
@@ -108616,7 +108560,7 @@ nLz
fEL
rSi
pCt
-qHm
+vda
sqE
mEO
gnS
@@ -109127,7 +109071,7 @@ woL
jLo
nwC
nLz
-iSU
+wiQ
hYE
rEd
sby
@@ -109375,7 +109319,7 @@ cnK
jPe
dPy
poc
-afM
+nnu
cnK
giH
aJj
@@ -109385,7 +109329,7 @@ fbf
nie
qtm
fyJ
-oWm
+fWo
cuc
adz
tUw
@@ -109422,7 +109366,7 @@ svK
yec
xhb
uQk
-waf
+kmI
vzc
gUY
pnH
@@ -111181,7 +111125,7 @@ qLw
tdf
mdk
kYG
-dqE
+ffO
oFH
oFH
sSz
@@ -111695,7 +111639,7 @@ hko
uLp
qTX
kYG
-uJz
+dEk
iHy
vSC
eKw
@@ -111964,8 +111908,8 @@ dRA
wCe
khu
hUu
-kxC
-oMh
+eSt
+her
mEG
nRp
dtY
@@ -112478,9 +112422,9 @@ wsI
fia
sRW
hKi
-apO
+hKl
lLB
-qRq
+psK
rzT
cWy
xRZ
@@ -113249,7 +113193,7 @@ rLZ
fJy
ygp
tyE
-qNO
+otH
bDq
rRR
laE
@@ -113293,7 +113237,7 @@ kWc
xiL
bus
hMv
-iTQ
+nbN
vGq
avx
vBf
@@ -113303,7 +113247,7 @@ qQJ
vGq
bjs
gyI
-lPS
+mAL
xiL
kvO
bPB
@@ -113518,7 +113462,7 @@ efd
nwK
fFC
uVf
-qqs
+tkT
gDq
ich
jnQ
@@ -114834,7 +114778,7 @@ oyj
xiL
mtu
lHh
-iNK
+eva
faD
iWc
cXP
@@ -114844,7 +114788,7 @@ vvD
cXP
lVB
iWc
-gkC
+gYB
xlH
mtu
xiL
@@ -115604,19 +115548,19 @@ hbK
hbK
oyj
xiL
-rMe
+fDl
rwx
vFh
dac
evD
pJf
-ycv
+iqe
tIe
min
min
wFy
ohD
-bZb
+qGj
xiL
lmn
hbK
@@ -115864,13 +115808,13 @@ xiL
hWa
imw
iHH
-mcF
+nvk
rrL
rSW
min
ckI
sCv
-mDC
+uDL
toM
eOP
hWa
@@ -116078,7 +116022,7 @@ twf
lMJ
lMJ
blx
-gFb
+hHO
aaa
aaa
fuu
@@ -116893,7 +116837,7 @@ goW
msN
xiL
jlU
-kGR
+kHM
lyL
mao
mCu
@@ -117150,7 +117094,7 @@ rDf
uhs
fjd
jlU
-oGj
+cGA
sZN
msR
xkv
@@ -117363,7 +117307,7 @@ oAQ
lMJ
lMJ
blx
-gFb
+hHO
aaa
aaa
fuu
@@ -117407,7 +117351,7 @@ rDf
eUe
eSb
nnc
-hdy
+nnc
nnc
rvK
nnc
@@ -117664,11 +117608,11 @@ hbK
mgS
hbK
jlU
-mtu
-mtu
-gyK
-mtu
-mtu
+ybW
+ybW
+auS
+ybW
+ybW
jlU
hbK
mTg
@@ -117921,11 +117865,11 @@ tmU
fGy
wyo
jlU
-dLm
-mtu
-gyK
-mtu
-mtu
+oDf
+ybW
+auS
+ybW
+ybW
jlU
qgn
mCV
@@ -118178,11 +118122,11 @@ pWT
rDf
uLa
jlU
-mtu
-mtu
-jQz
-nJr
-mtu
+ybW
+ybW
+blD
+lAQ
+ybW
jlU
lUS
pHt
@@ -118391,7 +118335,7 @@ oAQ
lMJ
lMJ
blx
-gFb
+hHO
aaa
aaa
aaa
@@ -118435,11 +118379,11 @@ hbK
wrc
wrc
jlU
-mtu
-mtu
-mtu
-mtu
-mtu
+ybW
+ybW
+ybW
+ybW
+ybW
jlU
wrc
wrc
@@ -118693,9 +118637,9 @@ aaa
lMJ
jlU
jlU
-ehN
-aYl
-kcu
+ybW
+kvX
+ybW
jlU
jlU
lMJ
@@ -123525,7 +123469,7 @@ uUX
azv
dKG
bjQ
-nhU
+uvo
pQv
tSP
qiH
@@ -124553,7 +124497,7 @@ iCV
mCL
pIE
bjQ
-dqy
+kSX
rNs
tSP
mZW
@@ -124816,7 +124760,7 @@ txh
bjQ
giA
hSe
-lBN
+vhd
pDe
ueE
jGr
@@ -125327,7 +125271,7 @@ ldP
xgE
uFw
tXz
-jGN
+kJN
gfU
gfU
gfU
diff --git a/_maps/map_files/NorthStar/north_star.dmm b/_maps/map_files/NorthStar/north_star.dmm
index 3e9ca40048097..8b15423662cb3 100644
--- a/_maps/map_files/NorthStar/north_star.dmm
+++ b/_maps/map_files/NorthStar/north_star.dmm
@@ -72,13 +72,6 @@
/obj/machinery/duct,
/turf/open/floor/iron,
/area/station/commons/toilet)
-"aaN" = (
-/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible/layer4{
- dir = 8
- },
-/obj/structure/cable,
-/turf/open/floor/iron/dark,
-/area/station/science/ordnance/testlab)
"aaO" = (
/obj/machinery/computer/atmos_alert{
dir = 4
@@ -209,12 +202,6 @@
/obj/effect/landmark/navigate_destination/dockarrival,
/turf/open/floor/iron/textured_large,
/area/station/hallway/secondary/entry)
-"acl" = (
-/obj/structure/railing{
- dir = 8
- },
-/turf/open/space/openspace,
-/area/space)
"acp" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/dark,
@@ -289,15 +276,6 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/pod/light,
/area/station/maintenance/floor3/starboard/fore)
-"acL" = (
-/obj/structure/table/wood,
-/obj/item/cigarette/cigar/cohiba,
-/obj/effect/turf_decal/trimline/blue/line{
- dir = 1
- },
-/obj/effect/turf_decal/trimline/blue/line,
-/turf/open/floor/carpet/blue,
-/area/station/command/meeting_room)
"adq" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -1144,6 +1122,24 @@
/obj/effect/landmark/start/scientist,
/turf/open/floor/iron/dark/smooth_large,
/area/station/science/lobby)
+"aoE" = (
+/obj/structure/table,
+/obj/item/stock_parts/micro_laser,
+/obj/item/stock_parts/servo{
+ pixel_x = 15;
+ pixel_y = 4
+ },
+/obj/item/reagent_containers/dropper{
+ pixel_x = -2;
+ pixel_y = 9
+ },
+/obj/effect/turf_decal/tile/purple/fourcorners,
+/obj/item/flatpack{
+ board = /obj/item/circuitboard/machine/flatpacker
+ },
+/obj/item/multitool,
+/turf/open/floor/iron/white,
+/area/station/science/lab)
"aoG" = (
/obj/effect/turf_decal/siding/white{
dir = 4
@@ -2751,6 +2747,12 @@
},
/turf/closed/wall/r_wall,
/area/station/maintenance/disposal/incinerator)
+"aKo" = (
+/obj/structure/railing/corner{
+ dir = 4
+ },
+/turf/open/space/openspace,
+/area/space/nearstation)
"aKq" = (
/obj/structure/window/reinforced/spawner/directional/west,
/obj/structure/flora/bush/sparsegrass/style_random,
@@ -3423,12 +3425,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/dark,
/area/station/science/robotics/lab)
-"aTO" = (
-/obj/machinery/power/shuttle_engine/propulsion/burst{
- dir = 4
- },
-/turf/open/floor/plating/airless,
-/area/space)
"aTU" = (
/obj/effect/turf_decal/trimline/purple/line,
/obj/effect/turf_decal/trimline/purple/line{
@@ -4412,6 +4408,12 @@
},
/turf/open/floor/iron/white/smooth_large,
/area/station/science/robotics/lab)
+"bft" = (
+/obj/effect/turf_decal/tile/blue/opposingcorners,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
+/obj/machinery/computer/security/telescreen/minisat/directional/west,
+/turf/open/floor/iron/dark,
+/area/station/command/teleporter)
"bfx" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -4431,6 +4433,18 @@
/obj/machinery/light/directional/south,
/turf/open/floor/iron/dark/side,
/area/station/hallway/floor1/aft)
+"bfD" = (
+/obj/effect/turf_decal/siding/thinplating_new/dark{
+ dir = 4
+ },
+/obj/effect/turf_decal/arrows{
+ dir = 4
+ },
+/obj/structure/railing,
+/obj/effect/decal/cleanable/robot_debris,
+/obj/effect/landmark/start/bitrunner,
+/turf/open/floor/iron/dark/textured_large,
+/area/station/cargo/bitrunning/den)
"bfM" = (
/obj/structure/railing{
dir = 8
@@ -5846,6 +5860,12 @@
},
/turf/open/floor/iron/white/textured,
/area/station/medical/treatment_center)
+"buZ" = (
+/obj/machinery/camera/motion/directional/west{
+ c_tag = "Minisat - Aft"
+ },
+/turf/open/space/openspace,
+/area/space/nearstation)
"bvc" = (
/obj/effect/turf_decal/trimline/brown/filled/line{
dir = 8
@@ -6881,14 +6901,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
/area/station/medical/abandoned)
-"bJA" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible/layer4{
- dir = 8
- },
-/obj/structure/cable,
-/turf/open/floor/iron/dark,
-/area/station/science/ordnance/testlab)
"bJQ" = (
/obj/structure/railing/corner{
dir = 1
@@ -7207,12 +7219,6 @@
},
/turf/open/floor/engine/hull,
/area/space/nearstation)
-"bOk" = (
-/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
- dir = 4
- },
-/turf/open/space/basic,
-/area/space)
"bOq" = (
/obj/machinery/door/airlock/maintenance/external,
/obj/effect/turf_decal/stripes/line{
@@ -8431,12 +8437,6 @@
/obj/structure/closet/firecloset,
/turf/open/floor/pod/dark,
/area/station/maintenance/floor2/port/aft)
-"cep" = (
-/obj/effect/turf_decal/tile/blue/opposingcorners,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
-/obj/machinery/computer/security/telescreen/minisat/directional/west,
-/turf/open/floor/iron/dark,
-/area/station/command/teleporter)
"cev" = (
/obj/structure/cable,
/obj/machinery/door/airlock/hatch{
@@ -8745,6 +8745,12 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/security/prison)
+"cik" = (
+/obj/machinery/pdapainter/engineering,
+/obj/machinery/camera/autoname/directional/west,
+/obj/machinery/computer/security/telescreen/engine/directional/south,
+/turf/open/floor/iron/dark/textured,
+/area/station/command/heads_quarters/ce)
"cil" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -10670,20 +10676,6 @@
/obj/structure/lattice,
/turf/open/space/basic,
/area/space/nearstation)
-"cIc" = (
-/obj/machinery/door/airlock/highsecurity{
- name = "AI Upload"
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/obj/effect/mapping_helpers/airlock/access/any/command/ai_upload,
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
- dir = 4
- },
-/obj/structure/sign/departments/aiupload/directional/south,
-/turf/open/floor/iron/dark,
-/area/station/ai_monitored/turret_protected/ai_upload_foyer)
"cId" = (
/obj/effect/turf_decal/tile/blue/anticorner/contrasted{
dir = 8
@@ -10691,6 +10683,24 @@
/obj/machinery/firealarm/directional/south,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/turret_protected/aisat/hallway)
+"cIj" = (
+/obj/effect/turf_decal/tile/blue/fourcorners,
+/obj/structure/table/reinforced/rglass,
+/obj/machinery/cell_charger{
+ pixel_y = 10
+ },
+/obj/machinery/cell_charger{
+ pixel_y = 1
+ },
+/obj/item/stock_parts/power_store/cell/high{
+ pixel_y = 9;
+ pixel_x = -1
+ },
+/obj/item/stock_parts/power_store/cell/high{
+ pixel_x = -1
+ },
+/turf/open/floor/iron/white/textured,
+/area/station/medical/treatment_center)
"cIl" = (
/obj/machinery/vending/hydronutrients,
/obj/effect/turf_decal/siding/green{
@@ -11430,20 +11440,6 @@
},
/turf/open/floor/engine,
/area/station/maintenance/disposal/incinerator)
-"cSb" = (
-/obj/structure/table,
-/obj/item/stock_parts/micro_laser,
-/obj/item/stock_parts/servo{
- pixel_x = 15;
- pixel_y = 4
- },
-/obj/item/reagent_containers/dropper{
- pixel_x = -2;
- pixel_y = 9
- },
-/obj/effect/turf_decal/tile/purple/fourcorners,
-/turf/open/floor/iron/white,
-/area/station/science/lab)
"cSc" = (
/obj/item/food/cornchips/green{
pixel_x = -8;
@@ -12682,12 +12678,6 @@
},
/turf/open/floor/pod/dark,
/area/station/maintenance/floor2/port/aft)
-"djc" = (
-/obj/structure/railing{
- dir = 4
- },
-/turf/open/space/openspace,
-/area/space)
"djd" = (
/obj/structure/cable,
/turf/open/floor/iron/dark,
@@ -12789,12 +12779,6 @@
/obj/machinery/atmospherics/pipe/smart/simple/supply/visible,
/turf/open/floor/iron,
/area/station/engineering/atmos)
-"dkn" = (
-/obj/structure/railing/corner{
- dir = 4
- },
-/turf/open/space/openspace,
-/area/space)
"dks" = (
/obj/structure/girder,
/obj/item/stack/sheet/iron,
@@ -12841,17 +12825,6 @@
/obj/structure/cable,
/turf/open/floor/plating,
/area/station/security/prison/safe)
-"dlR" = (
-/obj/item/radio/intercom/directional/north{
- broadcasting = 1;
- frequency = 1447;
- listening = 0;
- name = "Private Channel"
- },
-/obj/machinery/recharge_station,
-/obj/machinery/computer/security/telescreen/minisat/directional/east,
-/turf/open/floor/circuit,
-/area/station/ai_monitored/turret_protected/aisat/service)
"dlW" = (
/turf/closed/wall,
/area/station/maintenance/floor4/starboard/aft)
@@ -13029,6 +13002,15 @@
/obj/effect/turf_decal/tile/bar/opposingcorners,
/turf/open/floor/iron/checker,
/area/station/service/bar/atrium)
+"dpq" = (
+/obj/structure/table/wood,
+/obj/item/cigarette/cigar/cohiba,
+/obj/effect/turf_decal/trimline/blue/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/blue/line,
+/turf/open/floor/carpet/blue,
+/area/station/command/meeting_room)
"dps" = (
/obj/effect/turf_decal/siding/wood{
dir = 1
@@ -13678,6 +13660,12 @@
/obj/structure/table,
/turf/open/floor/iron/white,
/area/station/science/circuits)
+"dyg" = (
+/obj/structure/railing/corner{
+ dir = 8
+ },
+/turf/open/space/openspace,
+/area/space/nearstation)
"dyk" = (
/obj/structure/transit_tube/station/dispenser{
dir = 8
@@ -14453,11 +14441,6 @@
/obj/structure/cable,
/turf/open/floor/pod/light,
/area/station/maintenance/floor1/starboard/fore)
-"dIJ" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/turf/open/floor/iron/white,
-/area/station/science/ordnance/testlab)
"dIO" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -14740,16 +14723,6 @@
},
/turf/open/floor/iron/dark/textured_large,
/area/station/hallway/secondary/exit/departure_lounge)
-"dMt" = (
-/obj/machinery/computer/security/telescreen/minisat/directional/east,
-/obj/machinery/camera/directional/south{
- c_tag = "MiniSat Exterior Access";
- network = list("minisat")
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/firealarm/directional/south,
-/turf/open/floor/iron/dark,
-/area/station/ai_monitored/turret_protected/aisat)
"dMA" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -15426,6 +15399,13 @@
/obj/structure/grille,
/turf/open/floor/plating,
/area/station/maintenance/floor2/starboard)
+"dVg" = (
+/obj/structure/table,
+/obj/item/cigarette/candy{
+ pixel_x = 4
+ },
+/turf/open/floor/iron/dark/smooth_large,
+/area/station/hallway/floor1/aft)
"dVi" = (
/turf/open/floor/wood/large,
/area/station/service/library/lounge)
@@ -15638,17 +15618,6 @@
/obj/structure/closet/firecloset,
/turf/open/floor/pod/light,
/area/station/maintenance/floor1/port/fore)
-"dXy" = (
-/obj/structure/table/glass,
-/obj/machinery/defibrillator_mount/directional/east,
-/obj/item/storage/box/syringes{
- pixel_y = 6
- },
-/obj/item/stack/medical/mesh{
- layer = 3.01
- },
-/turf/open/floor/iron/white,
-/area/station/medical/treatment_center)
"dXz" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/spawner/random/trash/graffiti{
@@ -15837,6 +15806,21 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/catwalk_floor,
/area/station/maintenance/floor1/port/fore)
+"eaM" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
+/obj/effect/turf_decal/trimline/blue/filled/line{
+ dir = 9
+ },
+/obj/effect/turf_decal/trimline/blue/filled/corner,
+/obj/machinery/turretid{
+ control_area = "/area/station/ai_monitored/turret_protected/ai_upload";
+ icon_state = "control_stun";
+ name = "AI Upload turret control";
+ pixel_y = 28
+ },
+/obj/machinery/computer/security/telescreen/aiupload/directional/west,
+/turf/open/floor/iron/dark,
+/area/station/ai_monitored/turret_protected/ai_upload_foyer)
"eaW" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/cable,
@@ -17148,21 +17132,6 @@
},
/turf/open/floor/plating,
/area/station/engineering/supermatter)
-"etb" = (
-/obj/effect/turf_decal/tile/yellow{
- dir = 1
- },
-/obj/effect/turf_decal/tile/brown{
- dir = 4
- },
-/obj/structure/cable,
-/obj/machinery/airalarm/directional/north,
-/obj/structure/rack,
-/obj/item/stock_parts/power_store/cell/lead,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron,
-/area/station/cargo/storage)
"etj" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
dir = 1
@@ -17661,6 +17630,14 @@
/obj/item/radio/intercom/directional/south,
/turf/open/floor/iron,
/area/station/maintenance/disposal/incinerator)
+"eAq" = (
+/obj/structure/table,
+/obj/item/reagent_containers/cup/beaker{
+ pixel_x = 5
+ },
+/obj/item/reagent_containers/condiment/enzyme,
+/turf/open/floor/iron/kitchen,
+/area/station/service/kitchen)
"eAr" = (
/obj/effect/turf_decal/stripes/line,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -18221,21 +18198,6 @@
dir = 4
},
/area/station/command/bridge)
-"eIg" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
-/obj/effect/turf_decal/trimline/blue/filled/line{
- dir = 9
- },
-/obj/effect/turf_decal/trimline/blue/filled/corner,
-/obj/machinery/turretid{
- control_area = "/area/station/ai_monitored/turret_protected/ai_upload";
- icon_state = "control_stun";
- name = "AI Upload turret control";
- pixel_y = 28
- },
-/obj/machinery/computer/security/telescreen/aiupload/directional/west,
-/turf/open/floor/iron/dark,
-/area/station/ai_monitored/turret_protected/ai_upload_foyer)
"eIq" = (
/obj/structure/chair/stool/directional/west,
/obj/effect/turf_decal/trimline/red/warning{
@@ -18854,14 +18816,6 @@
/obj/machinery/duct,
/turf/open/floor/iron/kitchen,
/area/station/service/kitchen)
-"eSq" = (
-/obj/structure/railing/corner,
-/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible/layer4{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/smart/simple/purple/visible,
-/turf/open/floor/iron/dark,
-/area/station/science/ordnance/testlab)
"eSw" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/chair/stool/directional/south,
@@ -18930,6 +18884,15 @@
/obj/machinery/newscaster/directional/west,
/turf/open/floor/wood,
/area/station/hallway/secondary/entry)
+"eTC" = (
+/obj/structure/table/glass,
+/obj/machinery/defibrillator_mount/directional/east,
+/obj/item/storage/box/syringes{
+ pixel_y = 6
+ },
+/obj/item/stack/medical/mesh,
+/turf/open/floor/iron/white,
+/area/station/medical/treatment_center)
"eTH" = (
/obj/structure/flora/bush/sparsegrass/style_random,
/mob/living/carbon/human/species/monkey,
@@ -19601,6 +19564,13 @@
},
/turf/open/floor/iron/dark/side,
/area/station/hallway/floor1/fore)
+"feF" = (
+/obj/effect/turf_decal/box/corners{
+ dir = 4
+ },
+/obj/structure/sign/warning/gas_mask/directional/east,
+/turf/open/floor/engine/xenobio,
+/area/station/science/xenobiology)
"feH" = (
/obj/effect/turf_decal/tile/purple/half/contrasted{
dir = 4
@@ -20599,6 +20569,11 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/white,
/area/station/medical/virology)
+"frG" = (
+/obj/structure/rack,
+/obj/effect/spawner/random/armory/dragnet,
+/turf/open/floor/iron/dark,
+/area/station/ai_monitored/security/armory)
"frL" = (
/turf/closed/wall,
/area/station/engineering/gravity_generator)
@@ -21129,6 +21104,11 @@
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/station/service/kitchen)
+"fAE" = (
+/obj/machinery/holopad,
+/obj/structure/cable,
+/turf/open/floor/iron/white,
+/area/station/science/ordnance/testlab)
"fAP" = (
/obj/effect/turf_decal/trimline/purple/filled/corner{
dir = 1
@@ -21263,9 +21243,6 @@
/obj/structure/stairs/north,
/turf/open/floor/iron/white/small,
/area/station/medical/chemistry)
-"fCp" = (
-/turf/open/floor/plating/airless,
-/area/space)
"fCq" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/effect/landmark/generic_maintenance_landmark,
@@ -23291,15 +23268,6 @@
/obj/machinery/door/firedoor,
/turf/open/floor/iron,
/area/station/cargo/warehouse)
-"gcm" = (
-/obj/effect/turf_decal/tile/blue/fourcorners,
-/obj/structure/table/reinforced/rglass,
-/obj/item/pai_card,
-/obj/item/reagent_containers/spray/cleaner{
- layer = 3.01
- },
-/turf/open/floor/iron/white/textured,
-/area/station/medical/treatment_center)
"gcs" = (
/obj/machinery/power/apc/auto_name/directional/south,
/obj/effect/turf_decal/tile/green/half,
@@ -23483,6 +23451,10 @@
/obj/structure/cable,
/turf/open/floor/catwalk_floor,
/area/station/maintenance/floor3/port)
+"geR" = (
+/obj/structure/railing/corner,
+/turf/open/space/openspace,
+/area/space/nearstation)
"geY" = (
/turf/open/floor/iron/dark/side{
dir = 5
@@ -23576,6 +23548,11 @@
/obj/structure/chair,
/turf/open/floor/iron/white,
/area/station/medical/medbay/lobby)
+"ggy" = (
+/obj/machinery/atmospherics/pipe/smart/manifold/purple/visible/layer2,
+/obj/machinery/atmospherics/pipe/smart/simple/purple/visible,
+/turf/open/floor/iron/dark,
+/area/station/science/ordnance/testlab)
"ggD" = (
/obj/effect/turf_decal/tile/neutral/opposingcorners{
dir = 8
@@ -23655,26 +23632,6 @@
},
/turf/open/floor/catwalk_floor/iron_smooth,
/area/station/maintenance/disposal)
-"ghy" = (
-/obj/effect/turf_decal/tile/blue/fourcorners,
-/obj/structure/table/reinforced/rglass,
-/obj/machinery/cell_charger{
- pixel_y = 10
- },
-/obj/machinery/cell_charger{
- pixel_y = 1;
- layer = 2.91
- },
-/obj/item/stock_parts/power_store/cell/high{
- pixel_y = 9;
- pixel_x = -1
- },
-/obj/item/stock_parts/power_store/cell/high{
- pixel_x = -1;
- layer = 3.01
- },
-/turf/open/floor/iron/white/textured,
-/area/station/medical/treatment_center)
"ghH" = (
/obj/effect/turf_decal/tile/blue/half{
dir = 4
@@ -23874,6 +23831,24 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/iron/checker,
/area/station/commons/locker)
+"gkv" = (
+/obj/machinery/computer/upload/ai,
+/obj/structure/window/reinforced/spawner/directional/north,
+/obj/structure/window/reinforced/spawner/directional/east,
+/obj/structure/window/reinforced/spawner/directional/west,
+/obj/effect/turf_decal/tile/blue/half/contrasted{
+ dir = 1
+ },
+/obj/machinery/camera/directional/north{
+ c_tag = "AI Upload Chamber - Fore";
+ network = list("aiupload")
+ },
+/obj/machinery/door/window/right/directional/south{
+ name = "Upload Console Window";
+ req_access = list("ai_upload")
+ },
+/turf/open/floor/iron/dark,
+/area/station/ai_monitored/turret_protected/ai_upload)
"gkx" = (
/obj/machinery/atmospherics/components/binary/pump/layer2{
dir = 8
@@ -24338,6 +24313,24 @@
/obj/structure/cable,
/turf/open/floor/iron/dark,
/area/station/security/prison/visit)
+"gra" = (
+/obj/structure/rack,
+/obj/item/stock_parts/micro_laser{
+ pixel_y = 7
+ },
+/obj/item/stock_parts/power_store/cell/high{
+ pixel_x = -4;
+ pixel_y = -6
+ },
+/obj/item/vending_refill/wardrobe/science_wardrobe{
+ pixel_y = 18
+ },
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+ dir = 8
+ },
+/obj/item/radio/intercom/directional/east,
+/turf/open/floor/iron/white,
+/area/station/science/lower)
"grb" = (
/obj/effect/turf_decal/trimline/green/filled/line,
/obj/effect/turf_decal/trimline/green/filled/line{
@@ -24704,13 +24697,6 @@
/obj/structure/window/reinforced/tinted/spawner/directional/west,
/turf/open/floor/carpet,
/area/station/commons/vacant_room/office)
-"gwe" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
- dir = 1
- },
-/obj/structure/cable,
-/turf/open/floor/iron/white,
-/area/station/science/ordnance/testlab)
"gwl" = (
/obj/effect/turf_decal/trimline/brown/filled/line{
dir = 4
@@ -24875,6 +24861,12 @@
/obj/structure/chair,
/turf/open/floor/iron/white/textured,
/area/station/medical/treatment_center)
+"gya" = (
+/obj/machinery/power/shuttle_engine/huge{
+ dir = 4
+ },
+/turf/open/floor/plating/airless,
+/area/space/nearstation)
"gyd" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/trimline/brown/filled/line{
@@ -25711,10 +25703,6 @@
/obj/effect/landmark/start/captain,
/turf/open/floor/wood/tile,
/area/station/command/heads_quarters/captain/private)
-"gJl" = (
-/obj/machinery/computer/security/telescreen/engine_waste/directional/north,
-/turf/open/floor/engine,
-/area/station/engineering/supermatter/room)
"gJm" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
dir = 8
@@ -26267,6 +26255,21 @@
initial_gas_mix = "TEMP=2.7"
},
/area/station/science/ordnance/bomb)
+"gQW" = (
+/obj/effect/turf_decal/tile/yellow{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/brown{
+ dir = 4
+ },
+/obj/structure/cable,
+/obj/machinery/airalarm/directional/north,
+/obj/structure/rack,
+/obj/item/stock_parts/power_store/cell/lead,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron,
+/area/station/cargo/storage)
"gRf" = (
/obj/machinery/door/airlock/public/glass{
name = "Public Airlock"
@@ -26458,14 +26461,6 @@
/obj/machinery/light/small/directional/south,
/turf/open/floor/engine,
/area/station/maintenance/disposal/incinerator)
-"gTZ" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/computer/security/telescreen/engine_waste/directional/east,
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/iron/dark/textured_large,
-/area/station/engineering/atmos/pumproom)
"gUc" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/light_switch/directional/south,
@@ -27045,17 +27040,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/dark,
/area/station/security/courtroom)
-"hbW" = (
-/obj/structure/railing{
- layer = 3.1
- },
-/obj/effect/turf_decal/trimline/blue/filled/line{
- dir = 6
- },
-/obj/structure/closet/firecloset,
-/obj/structure/cable,
-/turf/open/floor/iron,
-/area/station/hallway/floor4/fore)
"hbX" = (
/obj/structure/cable,
/obj/machinery/power/apc/auto_name/directional/north,
@@ -27150,6 +27134,12 @@
},
/turf/open/floor/pod/light,
/area/station/maintenance/floor1/starboard/fore)
+"hdk" = (
+/obj/structure/railing/corner{
+ dir = 1
+ },
+/turf/open/space/openspace,
+/area/space/nearstation)
"hds" = (
/obj/effect/turf_decal/stripes/corner{
dir = 4
@@ -28256,11 +28246,6 @@
},
/turf/open/floor/pod/dark,
/area/station/maintenance/floor2/starboard/aft)
-"hsA" = (
-/obj/structure/extinguisher_cabinet/directional/east,
-/obj/machinery/camera/autoname/directional/east,
-/turf/open/floor/iron,
-/area/station/commons/toilet)
"hsG" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible,
/turf/open/floor/engine,
@@ -28865,13 +28850,6 @@
/obj/structure/flora/bush/style_random,
/turf/open/floor/grass,
/area/station/security/courtroom)
-"hAH" = (
-/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/smart/simple/purple/visible,
-/turf/open/floor/iron/dark,
-/area/station/science/ordnance/testlab)
"hAI" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/structure/cable,
@@ -29328,24 +29306,6 @@
/obj/machinery/atmospherics/pipe/smart/simple/purple,
/turf/open/floor/engine/vacuum,
/area/station/science/ordnance/freezerchamber)
-"hGG" = (
-/obj/structure/rack,
-/obj/item/stock_parts/micro_laser{
- pixel_y = 7
- },
-/obj/item/stock_parts/power_store/cell/high{
- pixel_x = -4;
- pixel_y = -6
- },
-/obj/item/vending_refill/wardrobe/science_wardrobe{
- pixel_y = 18
- },
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
- dir = 8
- },
-/obj/item/radio/intercom/directional/east,
-/turf/open/floor/iron/white,
-/area/station/science/lower)
"hGL" = (
/obj/machinery/light/small/directional/north,
/obj/effect/decal/cleanable/dirt,
@@ -30910,6 +30870,14 @@
/obj/item/radio/intercom/directional/west,
/turf/open/floor/iron,
/area/station/engineering/engine_smes)
+"ibO" = (
+/obj/structure/table,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/cell_charger,
+/obj/item/stock_parts/power_store/cell/high/empty,
+/obj/structure/sign/poster/contraband/random/directional/east,
+/turf/open/floor/iron/dark,
+/area/station/commons/vacant_room/commissary)
"ibT" = (
/obj/effect/turf_decal/delivery,
/obj/effect/decal/cleanable/dirt,
@@ -30991,6 +30959,11 @@
/obj/structure/ladder,
/turf/open/floor/pod/light,
/area/station/maintenance/floor2/starboard/fore)
+"ict" = (
+/obj/machinery/netpod,
+/obj/structure/railing,
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/station/cargo/bitrunning/den)
"icE" = (
/obj/effect/turf_decal/trimline/blue/filled/line{
dir = 8
@@ -31500,12 +31473,6 @@
dir = 1
},
/area/station/security/office)
-"ijV" = (
-/obj/effect/turf_decal/tile/purple/opposingcorners,
-/obj/machinery/computer/security/telescreen/rd/directional/west,
-/obj/machinery/pdapainter/research,
-/turf/open/floor/iron/white,
-/area/station/command/heads_quarters/rd)
"ijX" = (
/obj/structure/cable,
/obj/effect/spawner/structure/window/hollow/directional,
@@ -33264,13 +33231,6 @@
},
/turf/open/floor/engine,
/area/station/engineering/supermatter)
-"iGR" = (
-/obj/structure/table,
-/obj/effect/turf_decal/tile/purple/opposingcorners,
-/obj/machinery/cell_charger,
-/obj/item/stock_parts/power_store/cell/high,
-/turf/open/floor/iron/white,
-/area/station/science/circuits)
"iGY" = (
/obj/machinery/door/airlock/medical{
name = "Medical Break Room"
@@ -33325,12 +33285,6 @@
name = "lab floor"
},
/area/station/science/robotics/lab)
-"iHL" = (
-/obj/machinery/pdapainter/engineering,
-/obj/machinery/camera/autoname/directional/west,
-/obj/machinery/computer/security/telescreen/engine/directional/south,
-/turf/open/floor/iron/dark/textured,
-/area/station/command/heads_quarters/ce)
"iHM" = (
/obj/machinery/vending/wallmed/directional/west,
/obj/effect/turf_decal/tile/blue/opposingcorners,
@@ -33794,25 +33748,6 @@
"iOA" = (
/turf/closed/wall/r_wall,
/area/station/maintenance/floor2/starboard)
-"iOD" = (
-/obj/machinery/computer/upload/ai,
-/obj/structure/window/reinforced/spawner/directional/north,
-/obj/structure/window/reinforced/spawner/directional/east,
-/obj/structure/window/reinforced/spawner/directional/west,
-/obj/effect/turf_decal/tile/blue/half/contrasted{
- dir = 1
- },
-/obj/machinery/camera/directional/north{
- c_tag = "AI Upload Chamber - Fore";
- network = list("aiupload")
- },
-/obj/machinery/door/window/right/directional/south{
- name = "Upload Console Window";
- req_access = list("ai_upload");
- layer = 3
- },
-/turf/open/floor/iron/dark,
-/area/station/ai_monitored/turret_protected/ai_upload)
"iOL" = (
/obj/structure/bookcase/random,
/obj/effect/turf_decal/trimline/blue/filled/line,
@@ -34516,6 +34451,21 @@
/obj/machinery/light/directional/west,
/turf/open/floor/iron/white,
/area/station/cargo/miningdock)
+"iYe" = (
+/obj/structure/table,
+/obj/item/ai_module/reset/purge,
+/obj/effect/turf_decal/trimline/blue/filled/line{
+ dir = 10
+ },
+/obj/effect/turf_decal/trimline/blue/filled/corner{
+ dir = 4
+ },
+/obj/structure/window/reinforced/spawner/directional/north,
+/obj/effect/spawner/random/aimodule/neutral{
+ pixel_x = 15
+ },
+/turf/open/floor/iron/dark,
+/area/station/ai_monitored/turret_protected/ai_upload_foyer)
"iYA" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -35011,6 +34961,12 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/science/robotics/lab)
+"jeK" = (
+/obj/machinery/power/shuttle_engine/propulsion/burst{
+ dir = 4
+ },
+/turf/open/floor/plating/airless,
+/area/space/nearstation)
"jeQ" = (
/obj/structure/table/reinforced,
/obj/machinery/camera/directional/south{
@@ -35294,14 +35250,6 @@
},
/turf/open/floor/iron/dark,
/area/station/commons/storage/tools)
-"jjj" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/turf_decal/stripes{
- dir = 1
- },
-/obj/structure/cable,
-/turf/open/floor/iron/white,
-/area/station/science/ordnance/testlab)
"jjo" = (
/obj/machinery/holopad,
/turf/open/floor/iron/white/textured_large,
@@ -35383,17 +35331,6 @@
},
/turf/open/floor/mineral/silver,
/area/station/service/chapel)
-"jkD" = (
-/obj/structure/cable,
-/obj/machinery/power/apc/auto_name/directional/east{
- cell_type = /obj/item/stock_parts/power_store/battery/hyper
- },
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
- dir = 8
- },
-/obj/machinery/light/small/directional/north,
-/turf/open/floor/iron/smooth_large,
-/area/station/tcommsat/server)
"jkH" = (
/obj/machinery/holopad,
/turf/open/floor/iron/white,
@@ -36038,6 +35975,12 @@
/obj/machinery/holopad,
/turf/open/floor/wood,
/area/station/commons/dorms/apartment2)
+"jty" = (
+/obj/structure/railing{
+ dir = 1
+ },
+/turf/open/space/openspace,
+/area/space/nearstation)
"jtC" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -36733,6 +36676,13 @@
},
/turf/open/floor/iron/dark,
/area/station/hallway/floor1/aft)
+"jCo" = (
+/obj/machinery/computer/security/telescreen/vault/directional/east,
+/obj/machinery/computer/security{
+ dir = 8
+ },
+/turf/open/floor/iron/dark,
+/area/station/command/heads_quarters/hop)
"jCz" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -37351,11 +37301,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
/area/station/maintenance/floor4/starboard)
-"jJM" = (
-/obj/machinery/atmospherics/pipe/smart/manifold/purple/visible/layer2,
-/obj/machinery/atmospherics/pipe/smart/simple/purple/visible,
-/turf/open/floor/iron/dark,
-/area/station/science/ordnance/testlab)
"jJP" = (
/obj/effect/decal/cleanable/glass,
/turf/open/floor/engine,
@@ -38150,6 +38095,24 @@
},
/turf/open/floor/catwalk_floor,
/area/station/maintenance/floor2/port/fore)
+"jVw" = (
+/obj/structure/table,
+/obj/item/reagent_containers/condiment/saltshaker{
+ pixel_x = -2;
+ pixel_y = 2
+ },
+/obj/item/reagent_containers/condiment/peppermill{
+ desc = "Often used to flavor food or make people sneeze. Fashionably moved to the left side of the table.";
+ pixel_x = -8;
+ pixel_y = 2
+ },
+/obj/item/reagent_containers/condiment/enzyme{
+ pixel_x = 9;
+ pixel_y = 3
+ },
+/obj/item/book/manual/chef_recipes,
+/turf/open/floor/iron,
+/area/station/security/prison)
"jVK" = (
/turf/closed/wall/r_wall,
/area/station/security/prison)
@@ -38629,6 +38592,14 @@
/obj/item/radio/intercom/directional/north,
/turf/open/floor/iron/grimy,
/area/station/security/detectives_office)
+"kbV" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/turf_decal/stripes{
+ dir = 1
+ },
+/obj/structure/cable,
+/turf/open/floor/iron/white,
+/area/station/science/ordnance/testlab)
"kbZ" = (
/obj/effect/turf_decal/box/corners{
dir = 8
@@ -39347,6 +39318,12 @@
/obj/effect/decal/cleanable/oil/streak,
/turf/open/floor/iron/textured_large,
/area/station/engineering/lobby)
+"kjJ" = (
+/obj/structure/railing{
+ dir = 8
+ },
+/turf/open/space/openspace,
+/area/space/nearstation)
"kjW" = (
/obj/effect/turf_decal/trimline/green/filled/line{
dir = 5
@@ -39556,6 +39533,12 @@
},
/turf/open/floor/wood/tile,
/area/station/service/library)
+"knz" = (
+/obj/effect/turf_decal/tile/purple/opposingcorners,
+/obj/machinery/computer/security/telescreen/rd/directional/west,
+/obj/machinery/pdapainter/research,
+/turf/open/floor/iron/white,
+/area/station/command/heads_quarters/rd)
"knH" = (
/turf/open/openspace,
/area/station/ai_monitored/turret_protected/aisat/service)
@@ -41957,6 +41940,14 @@
},
/turf/open/floor/iron/dark/side,
/area/station/engineering/engine_smes)
+"kSG" = (
+/obj/effect/turf_decal/bot,
+/obj/structure/table/reinforced,
+/obj/item/stock_parts/power_store/cell/high,
+/obj/machinery/cell_charger,
+/obj/structure/window/reinforced/spawner/directional/south,
+/turf/open/floor/iron/dark/smooth_large,
+/area/station/science/robotics/mechbay)
"kSN" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -42482,20 +42473,6 @@
/obj/machinery/light/directional/north,
/turf/open/floor/eighties,
/area/station/commons/dorms/room2)
-"kZr" = (
-/obj/item/stack/sheet/iron/fifty,
-/obj/item/stack/rods/fifty,
-/obj/item/stack/sheet/glass/fifty,
-/obj/item/electronics/airlock,
-/obj/item/electronics/airlock,
-/obj/item/stock_parts/power_store/cell/high,
-/obj/item/stack/sheet/mineral/plasma{
- amount = 30
- },
-/obj/item/gps,
-/obj/structure/closet/crate/engineering,
-/turf/open/floor/plating,
-/area/station/engineering/lobby)
"kZv" = (
/obj/machinery/power/apc/auto_name/directional/east,
/obj/structure/cable,
@@ -42520,6 +42497,14 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/dark,
/area/station/hallway/floor3/fore)
+"kZI" = (
+/obj/structure/table/reinforced,
+/obj/item/stock_parts/power_store/cell/high,
+/obj/machinery/cell_charger,
+/obj/effect/turf_decal/tile/blue/fourcorners,
+/obj/machinery/airalarm/directional/east,
+/turf/open/floor/iron/dark,
+/area/station/command/bridge)
"kZS" = (
/obj/effect/turf_decal/siding/wood,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
@@ -44100,20 +44085,6 @@
dir = 9
},
/area/station/security/prison)
-"luo" = (
-/obj/effect/turf_decal/siding/thinplating_new/dark{
- dir = 4
- },
-/obj/effect/turf_decal/arrows{
- dir = 4
- },
-/obj/structure/railing{
- layer = 3.1
- },
-/obj/effect/decal/cleanable/robot_debris,
-/obj/effect/landmark/start/bitrunner,
-/turf/open/floor/iron/dark/textured_large,
-/area/station/cargo/bitrunning/den)
"luv" = (
/obj/machinery/power/apc/auto_name/directional/north,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -45274,6 +45245,13 @@
/obj/structure/window/spawner/directional/west,
/turf/open/floor/plating/airless,
/area/station/maintenance/solars/starboard/aft)
+"lKm" = (
+/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible/layer4{
+ dir = 8
+ },
+/obj/structure/cable,
+/turf/open/floor/iron/dark,
+/area/station/science/ordnance/testlab)
"lKn" = (
/obj/effect/turf_decal/trimline/blue/filled/line,
/turf/open/floor/iron,
@@ -45979,21 +45957,6 @@
/obj/effect/decal/cleanable/plastic,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/turret_protected/aisat)
-"lSI" = (
-/obj/machinery/computer/upload/borg,
-/obj/structure/window/reinforced/spawner/directional/north,
-/obj/structure/window/reinforced/spawner/directional/east,
-/obj/structure/window/reinforced/spawner/directional/west,
-/obj/machinery/door/window/left/directional/south{
- layer = 3.1;
- name = "Cyborg Upload Console Window";
- req_access = list("ai_upload")
- },
-/obj/effect/turf_decal/tile/blue/half/contrasted{
- dir = 1
- },
-/turf/open/floor/iron/dark,
-/area/station/ai_monitored/turret_protected/ai_upload)
"lSJ" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/cable,
@@ -46494,6 +46457,20 @@
"lYR" = (
/turf/open/misc/grass,
/area/station/maintenance/floor1/starboard)
+"lYT" = (
+/obj/machinery/computer/upload/borg,
+/obj/structure/window/reinforced/spawner/directional/north,
+/obj/structure/window/reinforced/spawner/directional/east,
+/obj/structure/window/reinforced/spawner/directional/west,
+/obj/machinery/door/window/left/directional/south{
+ name = "Cyborg Upload Console Window";
+ req_access = list("ai_upload")
+ },
+/obj/effect/turf_decal/tile/blue/half/contrasted{
+ dir = 1
+ },
+/turf/open/floor/iron/dark,
+/area/station/ai_monitored/turret_protected/ai_upload)
"lYU" = (
/obj/effect/turf_decal/tile/purple/opposingcorners,
/obj/machinery/dna_infuser,
@@ -47418,22 +47395,6 @@
/obj/machinery/duct,
/turf/open/floor/iron/dark/textured,
/area/station/commons/fitness)
-"mko" = (
-/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{
- dir = 4
- },
-/obj/machinery/computer/security/telescreen/ordnance/directional/north,
-/obj/machinery/computer/pod/old/mass_driver_controller/ordnancedriver,
-/obj/structure/table,
-/obj/item/binoculars{
- pixel_x = 6;
- pixel_y = 6
- },
-/obj/effect/turf_decal/siding/thinplating/dark{
- dir = 5
- },
-/turf/open/floor/iron/white,
-/area/station/science/ordnance/storage)
"mkE" = (
/obj/effect/turf_decal/tile/blue/opposingcorners,
/obj/item/wrench,
@@ -49071,12 +49032,6 @@
dir = 1
},
/area/station/hallway/secondary/exit)
-"mFQ" = (
-/obj/structure/table,
-/obj/machinery/cell_charger,
-/obj/item/stock_parts/power_store/cell/high,
-/turf/open/floor/catwalk_floor/iron_dark,
-/area/station/ai_monitored/command/storage/eva)
"mFV" = (
/obj/structure/bodycontainer/morgue,
/obj/machinery/light/small/directional/west,
@@ -51965,28 +51920,6 @@
},
/turf/open/floor/iron/dark/textured,
/area/station/medical/cryo)
-"nqP" = (
-/obj/structure/window/reinforced/plasma/spawner/directional/east,
-/obj/structure/table/reinforced/plasmarglass,
-/obj/item/stock_parts/power_store/cell/lead{
- pixel_x = -5;
- pixel_y = 8
- },
-/obj/item/usb_cable{
- name = "jumper cable";
- pixel_x = -10;
- pixel_y = 12
- },
-/obj/item/lead_pipe{
- pixel_x = -5
- },
-/obj/item/reagent_containers/spray/cleaner{
- pixel_x = 6;
- pixel_y = 7
- },
-/obj/item/reagent_containers/syringe,
-/turf/open/floor/pod/dark,
-/area/station/service/kitchen/abandoned)
"nqU" = (
/obj/effect/turf_decal/stripes/line{
dir = 9
@@ -52394,6 +52327,12 @@
dir = 4
},
/area/station/hallway/floor1/fore)
+"nwk" = (
+/obj/structure/table,
+/obj/machinery/cell_charger,
+/obj/item/stock_parts/power_store/cell/high,
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/station/ai_monitored/command/storage/eva)
"nwx" = (
/obj/item/wallframe/button,
/obj/effect/mapping_helpers/burnt_floor,
@@ -52450,6 +52389,28 @@
},
/turf/open/floor/plating,
/area/station/maintenance/disposal)
+"nxB" = (
+/obj/structure/window/reinforced/plasma/spawner/directional/east,
+/obj/structure/table/reinforced/plasmarglass,
+/obj/item/stock_parts/power_store/cell/lead{
+ pixel_x = -5;
+ pixel_y = 8
+ },
+/obj/item/usb_cable{
+ name = "jumper cable";
+ pixel_x = -10;
+ pixel_y = 12
+ },
+/obj/item/lead_pipe{
+ pixel_x = -5
+ },
+/obj/item/reagent_containers/spray/cleaner{
+ pixel_x = 6;
+ pixel_y = 7
+ },
+/obj/item/reagent_containers/syringe,
+/turf/open/floor/pod/dark,
+/area/station/service/kitchen/abandoned)
"nxC" = (
/obj/effect/turf_decal/stripes/full,
/obj/machinery/door/airlock{
@@ -52926,30 +52887,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/pod/light,
/area/station/maintenance/floor1/starboard/fore)
-"nDQ" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
-/obj/structure/table/reinforced,
-/obj/structure/window/spawner/directional/south,
-/obj/effect/turf_decal/trimline/yellow/corner{
- dir = 4
- },
-/obj/item/storage/toolbox/mechanical{
- pixel_x = 8;
- pixel_y = -4
- },
-/obj/item/flatpack{
- board = /obj/item/circuitboard/machine/flatpacker;
- pixel_x = -6;
- pixel_y = 5
- },
-/obj/item/multitool{
- pixel_x = 7;
- pixel_y = 10
- },
-/turf/open/floor/iron/corner{
- dir = 4
- },
-/area/station/engineering/lobby)
"nEa" = (
/obj/structure/table/wood,
/obj/item/flashlight/lamp/green,
@@ -53006,13 +52943,6 @@
"nEI" = (
/turf/open/floor/circuit,
/area/station/ai_monitored/turret_protected/aisat_interior)
-"nEM" = (
-/obj/item/fishing_rod,
-/obj/structure/closet,
-/obj/effect/spawner/random/maintenance/three,
-/obj/item/cigarette/pipe,
-/turf/open/floor/pod/light,
-/area/station/maintenance/floor2/starboard/fore)
"nEO" = (
/obj/structure/table,
/obj/item/screwdriver,
@@ -53410,6 +53340,16 @@
/obj/structure/foamedmetal,
/turf/open/floor/engine,
/area/station/maintenance/floor1/port/aft)
+"nJz" = (
+/obj/structure/table,
+/obj/machinery/cell_charger,
+/obj/item/stock_parts/power_store/cell/high,
+/obj/effect/turf_decal/stripes/white/line{
+ dir = 8
+ },
+/obj/machinery/status_display/ai/directional/east,
+/turf/open/floor/iron/dark,
+/area/station/science/auxlab)
"nJC" = (
/obj/item/restraints/handcuffs,
/obj/item/restraints/handcuffs,
@@ -53747,6 +53687,12 @@
},
/turf/open/floor/pod/light,
/area/station/maintenance/floor3/port/fore)
+"nOK" = (
+/obj/machinery/power/shuttle_engine/large{
+ dir = 4
+ },
+/turf/open/floor/plating/airless,
+/area/space/nearstation)
"nOO" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/structure/cable,
@@ -54221,6 +54167,15 @@
"nUM" = (
/turf/open/floor/iron/textured_large,
/area/station/cargo/office)
+"nUN" = (
+/obj/machinery/computer/security/telescreen/auxbase/directional/south,
+/obj/structure/cable,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/yellow/half/contrasted,
+/turf/open/floor/iron,
+/area/station/construction/mining/aux_base)
"nUO" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -54354,6 +54309,14 @@
},
/turf/open/floor/iron/dark/smooth_large,
/area/station/service/kitchen/abandoned)
+"nWl" = (
+/obj/machinery/door/firedoor/border_only,
+/obj/structure/railing,
+/obj/machinery/atmospherics/components/unary/thermomachine/freezer{
+ dir = 1
+ },
+/turf/open/floor/iron/dark,
+/area/station/science/ordnance/testlab)
"nWo" = (
/turf/open/floor/carpet/red,
/area/station/commons/dorms/room1)
@@ -55339,6 +55302,10 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/dark,
/area/station/command/teleporter)
+"ojO" = (
+/obj/machinery/camera/autoname/directional/east,
+/turf/open/space/openspace,
+/area/space/nearstation)
"ojU" = (
/obj/structure/table/wood,
/turf/open/floor/wood,
@@ -55533,13 +55500,13 @@
/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance,
/turf/open/floor/catwalk_floor,
/area/station/maintenance/floor2/port/aft)
-"omq" = (
-/obj/machinery/computer/security/telescreen/vault/directional/east,
-/obj/machinery/computer/security{
- dir = 8
- },
-/turf/open/floor/iron/dark,
-/area/station/command/heads_quarters/hop)
+"omo" = (
+/obj/structure/table/reinforced/plastitaniumglass,
+/obj/structure/window/reinforced/spawner/directional/west,
+/obj/structure/cable,
+/mob/living/basic/parrot/poly,
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/station/command/heads_quarters/ce)
"omr" = (
/turf/open/floor/iron/stairs{
dir = 8
@@ -55729,20 +55696,6 @@
/obj/machinery/light/warm/directional/north,
/turf/open/floor/carpet/orange,
/area/station/service/chapel/funeral)
-"ooT" = (
-/obj/structure/table,
-/obj/machinery/cell_charger,
-/obj/item/stock_parts/power_store/cell/high,
-/obj/effect/turf_decal/stripes/white/line{
- dir = 4
- },
-/obj/item/folder/white{
- pixel_y = 13
- },
-/obj/machinery/power/apc/auto_name/directional/west,
-/obj/structure/cable,
-/turf/open/floor/iron/dark,
-/area/station/science/lab)
"ooV" = (
/obj/effect/decal/cleanable/dirt,
/obj/item/ammo_casing/c38{
@@ -55990,6 +55943,17 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/carpet,
/area/station/medical/psychology)
+"orW" = (
+/obj/structure/cable,
+/obj/machinery/power/apc/auto_name/directional/east{
+ cell_type = /obj/item/stock_parts/power_store/battery/hyper
+ },
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+ dir = 8
+ },
+/obj/machinery/light/small/directional/north,
+/turf/open/floor/iron/smooth_large,
+/area/station/tcommsat/server)
"osk" = (
/obj/effect/turf_decal/siding/wood,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -56129,16 +56093,6 @@
/obj/structure/chair,
/turf/open/floor/iron/kitchen/herringbone,
/area/station/service/kitchen/diner)
-"ouy" = (
-/obj/machinery/atmospherics/pipe/smart/simple/purple/hidden/layer1{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/computer/security/telescreen/engine_waste/directional/south,
-/turf/open/floor/catwalk_floor/iron,
-/area/station/engineering/atmos/pumproom)
"ouD" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -56327,6 +56281,15 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/engine,
/area/station/maintenance/floor1/port/aft)
+"oxB" = (
+/obj/structure/railing,
+/obj/effect/turf_decal/trimline/blue/filled/line{
+ dir = 6
+ },
+/obj/structure/closet/firecloset,
+/obj/structure/cable,
+/turf/open/floor/iron,
+/area/station/hallway/floor4/fore)
"oxJ" = (
/obj/structure/railing{
dir = 8
@@ -57362,16 +57325,6 @@
},
/turf/open/floor/iron,
/area/station/hallway/secondary/service)
-"oLE" = (
-/obj/effect/turf_decal/trimline/neutral/warning{
- dir = 8
- },
-/obj/machinery/airalarm/directional/east,
-/obj/machinery/cell_charger,
-/obj/item/stock_parts/power_store/cell/high,
-/obj/structure/table/reinforced,
-/turf/open/floor/iron/dark,
-/area/station/command/gateway)
"oLG" = (
/obj/structure/beebox,
/turf/open/floor/grass,
@@ -57608,11 +57561,6 @@
/obj/structure/extinguisher_cabinet/directional/north,
/turf/open/floor/iron/white,
/area/station/science/lower)
-"oOW" = (
-/obj/structure/rack,
-/obj/effect/spawner/random/armory/dragnet,
-/turf/open/floor/iron/dark,
-/area/station/ai_monitored/security/armory)
"oOY" = (
/obj/structure/table/wood/fancy/red,
/obj/item/flashlight/flare/candle,
@@ -58380,15 +58328,6 @@
/obj/item/tank/internals/emergency_oxygen,
/turf/open/floor/iron/smooth,
/area/station/tcommsat/computer)
-"oZd" = (
-/obj/machinery/computer/security/telescreen/auxbase/directional/south,
-/obj/structure/cable,
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
- dir = 8
- },
-/obj/effect/turf_decal/tile/yellow/half/contrasted,
-/turf/open/floor/iron,
-/area/station/construction/mining/aux_base)
"oZj" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -59553,17 +59492,6 @@
dir = 8
},
/area/station/hallway/floor3/fore)
-"pqH" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{
- dir = 4
- },
-/obj/machinery/power/apc/auto_name/directional/north{
- areastring = "/area/station/science/ordnance/burnchamber"
- },
-/obj/structure/cable,
-/turf/open/floor/iron/dark,
-/area/station/science/ordnance/testlab)
"pqO" = (
/obj/effect/decal/cleanable/glass,
/obj/item/shard,
@@ -60674,14 +60602,6 @@
/obj/structure/closet/firecloset,
/turf/open/floor/pod/dark,
/area/station/maintenance/floor3/starboard/aft)
-"pEY" = (
-/obj/structure/table,
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/cell_charger,
-/obj/item/stock_parts/power_store/cell/high/empty,
-/obj/structure/sign/poster/contraband/random/directional/east,
-/turf/open/floor/iron/dark,
-/area/station/commons/vacant_room/commissary)
"pEZ" = (
/obj/structure/closet/radiation,
/obj/effect/turf_decal/box,
@@ -60788,10 +60708,6 @@
dir = 8
},
/area/station/security/office)
-"pGz" = (
-/obj/structure/cable,
-/turf/open/floor/iron/dark,
-/area/station/science/ordnance/testlab)
"pGG" = (
/obj/structure/ladder,
/obj/structure/lattice/catwalk,
@@ -61057,6 +60973,13 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/iron/dark,
/area/station/hallway/floor1/fore)
+"pJQ" = (
+/obj/effect/turf_decal/tile/blue/fourcorners,
+/obj/structure/table/reinforced/rglass,
+/obj/item/pai_card,
+/obj/item/reagent_containers/spray/cleaner,
+/turf/open/floor/iron/white/textured,
+/area/station/medical/treatment_center)
"pJV" = (
/obj/machinery/airalarm/directional/west,
/turf/open/floor/iron/dark,
@@ -61346,12 +61269,6 @@
/obj/item/radio/intercom/directional/east,
/turf/open/floor/iron/dark,
/area/station/security/evidence)
-"pNV" = (
-/obj/machinery/power/shuttle_engine/large{
- dir = 4
- },
-/turf/open/floor/plating/airless,
-/area/space)
"pNW" = (
/obj/effect/turf_decal/tile/blue/half/contrasted{
dir = 1
@@ -61991,6 +61908,9 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/hallway/floor3/aft)
+"pXb" = (
+/turf/open/space/openspace,
+/area/space/nearstation)
"pXg" = (
/obj/effect/mapping_helpers/airlock/access/all/science/xenobio,
/obj/machinery/door/airlock/hatch{
@@ -63098,6 +63018,20 @@
},
/turf/open/floor/iron,
/area/station/cargo/miningdock)
+"qlT" = (
+/obj/structure/table,
+/obj/machinery/cell_charger,
+/obj/item/stock_parts/power_store/cell/high,
+/obj/effect/turf_decal/stripes/white/line{
+ dir = 4
+ },
+/obj/item/folder/white{
+ pixel_y = 13
+ },
+/obj/machinery/power/apc/auto_name/directional/west,
+/obj/structure/cable,
+/turf/open/floor/iron/dark,
+/area/station/science/lab)
"qmb" = (
/obj/effect/turf_decal/trimline/brown/filled/line{
dir = 1
@@ -64237,6 +64171,20 @@
/obj/machinery/door/firedoor,
/turf/open/floor/iron/white,
/area/station/science/cytology)
+"qzq" = (
+/obj/item/stack/sheet/iron/fifty,
+/obj/item/stack/rods/fifty,
+/obj/item/stack/sheet/glass/fifty,
+/obj/item/electronics/airlock,
+/obj/item/electronics/airlock,
+/obj/item/stock_parts/power_store/cell/high,
+/obj/item/stack/sheet/mineral/plasma{
+ amount = 30
+ },
+/obj/item/gps,
+/obj/structure/closet/crate/engineering,
+/turf/open/floor/plating,
+/area/station/engineering/lobby)
"qzx" = (
/obj/structure/bookcase/random/fiction,
/turf/open/floor/carpet/royalblack,
@@ -65335,6 +65283,12 @@
/obj/effect/turf_decal/trimline/blue/filled/corner,
/turf/open/floor/iron/dark/side,
/area/station/hallway/floor2/aft)
+"qOL" = (
+/obj/structure/rack,
+/obj/item/mod/core/standard,
+/obj/item/stock_parts/power_store/cell/high,
+/turf/open/floor/pod/light,
+/area/station/maintenance/floor3/port/aft)
"qON" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/airalarm/directional/south,
@@ -65619,12 +65573,6 @@
},
/turf/open/floor/engine,
/area/station/science/ordnance/burnchamber)
-"qRS" = (
-/obj/structure/railing/corner{
- dir = 8
- },
-/turf/open/space/openspace,
-/area/space)
"qRW" = (
/obj/structure/disposalpipe/junction{
dir = 8
@@ -65857,6 +65805,10 @@
/obj/machinery/mecha_part_fabricator,
/turf/open/floor/iron/dark,
/area/station/science/auxlab)
+"qVW" = (
+/obj/structure/railing,
+/turf/open/space/openspace,
+/area/space/nearstation)
"qWc" = (
/obj/effect/turf_decal/trimline/blue/warning{
dir = 1
@@ -66512,12 +66464,6 @@
},
/turf/open/floor/glass/reinforced,
/area/station/service/library)
-"rdv" = (
-/obj/structure/rack,
-/obj/item/mod/core/standard,
-/obj/item/stock_parts/power_store/cell/high,
-/turf/open/floor/pod/light,
-/area/station/maintenance/floor3/port/aft)
"rdx" = (
/obj/machinery/atmospherics/pipe/layer_manifold/scrubbers/visible{
dir = 4
@@ -66787,16 +66733,6 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/catwalk_floor/iron,
/area/station/engineering/atmos)
-"rgx" = (
-/obj/structure/table,
-/obj/machinery/cell_charger,
-/obj/item/stock_parts/power_store/cell/high,
-/obj/effect/turf_decal/stripes/white/line{
- dir = 8
- },
-/obj/machinery/status_display/ai/directional/east,
-/turf/open/floor/iron/dark,
-/area/station/science/auxlab)
"rgy" = (
/obj/effect/turf_decal/tile/purple/opposingcorners,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
@@ -66916,18 +66852,6 @@
/obj/machinery/light/small/blacklight/directional/east,
/turf/open/floor/pod/light,
/area/station/maintenance/floor4/starboard)
-"rhO" = (
-/obj/item/kirbyplants/random,
-/obj/machinery/airalarm/directional/west,
-/obj/effect/turf_decal/tile/red{
- dir = 8
- },
-/obj/effect/turf_decal/tile/red{
- dir = 4
- },
-/obj/machinery/computer/security/telescreen/interrogation/directional/north,
-/turf/open/floor/iron/dark,
-/area/station/security/interrogation)
"rhR" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -67035,11 +66959,6 @@
/obj/structure/railing/corner/end,
/turf/open/floor/iron/dark,
/area/station/hallway/floor1/aft)
-"rjB" = (
-/obj/structure/sign/warning/biohazard/directional/east,
-/obj/machinery/light/cold/no_nightlight/directional/east,
-/turf/open/floor/engine/xenobio,
-/area/station/science/xenobiology)
"rjD" = (
/turf/closed/wall,
/area/station/hallway/floor1/aft)
@@ -69219,6 +69138,18 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/commons/vacant_room/commissary)
+"rRt" = (
+/obj/item/kirbyplants/random,
+/obj/machinery/airalarm/directional/west,
+/obj/effect/turf_decal/tile/red{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 4
+ },
+/obj/machinery/computer/security/telescreen/interrogation/directional/north,
+/turf/open/floor/iron/dark,
+/area/station/security/interrogation)
"rRu" = (
/obj/structure/table,
/obj/item/holosign_creator/robot_seat/restaurant{
@@ -69446,6 +69377,13 @@
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
/turf/open/floor/engine/cult,
/area/station/service/library/private)
+"rUf" = (
+/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/simple/purple/visible,
+/turf/open/floor/iron/dark,
+/area/station/science/ordnance/testlab)
"rUh" = (
/obj/effect/turf_decal/stripes{
dir = 10
@@ -69845,6 +69783,10 @@
/obj/effect/turf_decal/stripes/white/corner,
/turf/open/floor/iron/dark,
/area/station/science/ordnance/testlab)
+"sai" = (
+/obj/machinery/computer/security/telescreen/engine_waste/directional/north,
+/turf/open/floor/engine,
+/area/station/engineering/supermatter/room)
"sal" = (
/obj/structure/cable,
/turf/open/floor/iron/kitchen,
@@ -69864,10 +69806,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/catwalk_floor,
/area/station/maintenance/floor1/port)
-"sav" = (
-/obj/effect/turf_decal/box/corners,
-/turf/open/floor/engine/xenobio,
-/area/station/science/xenobiology)
"saA" = (
/obj/effect/turf_decal/siding/thinplating_new{
dir = 1
@@ -70240,6 +70178,22 @@
dir = 9
},
/area/station/security/brig)
+"sfE" = (
+/obj/structure/table,
+/obj/item/storage/toolbox/emergency{
+ pixel_y = 12
+ },
+/obj/item/stack/cable_coil/cut{
+ pixel_y = 7
+ },
+/obj/item/stock_parts/power_store/cell/lead{
+ pixel_x = 5;
+ pixel_y = 4
+ },
+/obj/item/wirecutters,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/pod/light,
+/area/station/maintenance/floor1/starboard/fore)
"sfG" = (
/obj/item/radio/intercom/directional/north,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
@@ -70611,13 +70565,6 @@
/obj/structure/bookcase/random/fiction,
/turf/open/floor/wood/tile,
/area/station/service/library)
-"slC" = (
-/obj/structure/table/reinforced/plastitaniumglass,
-/obj/structure/window/reinforced/spawner/directional/west,
-/obj/structure/cable,
-/mob/living/basic/parrot/poly,
-/turf/open/floor/catwalk_floor/iron_dark,
-/area/station/command/heads_quarters/ce)
"slI" = (
/obj/item/radio/intercom/directional/west,
/obj/structure/window/reinforced/spawner/directional/south,
@@ -71643,6 +71590,13 @@
},
/turf/open/floor/iron/dark,
/area/station/hallway/secondary/exit/departure_lounge)
+"sAf" = (
+/obj/structure/table/reinforced,
+/obj/machinery/cell_charger,
+/obj/item/stock_parts/power_store/cell/high,
+/obj/item/radio/intercom/directional/west,
+/turf/open/floor/iron/dark/smooth_large,
+/area/station/science/robotics/lab)
"sAi" = (
/obj/effect/turf_decal/trimline/red/filled/line,
/obj/effect/turf_decal/trimline/red/arrow_ccw{
@@ -71732,6 +71686,13 @@
/obj/machinery/light/cold/no_nightlight/directional/east,
/turf/open/floor/iron/dark,
/area/station/security/checkpoint/second)
+"sBo" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+ dir = 1
+ },
+/obj/structure/cable,
+/turf/open/floor/iron/white,
+/area/station/science/ordnance/testlab)
"sBp" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -72502,12 +72463,6 @@
/obj/structure/cable,
/turf/open/floor/pod/light,
/area/station/maintenance/solars/port/aft)
-"sKZ" = (
-/obj/machinery/camera/motion/directional/west{
- c_tag = "Minisat - Aft"
- },
-/turf/open/space/openspace,
-/area/space)
"sLe" = (
/obj/effect/turf_decal/stripes/line,
/obj/effect/decal/cleanable/dirt,
@@ -74161,6 +74116,17 @@
/obj/effect/spawner/random/trash/mess,
/turf/open/floor/pod/light,
/area/station/maintenance/floor4/starboard)
+"tfv" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{
+ dir = 4
+ },
+/obj/machinery/power/apc/auto_name/directional/north{
+ areastring = "/area/station/science/ordnance/burnchamber"
+ },
+/obj/structure/cable,
+/turf/open/floor/iron/dark,
+/area/station/science/ordnance/testlab)
"tfw" = (
/obj/effect/turf_decal/siding/wood,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -74561,10 +74527,6 @@
"tlt" = (
/turf/open/floor/catwalk_floor,
/area/station/maintenance/floor2/port/fore)
-"tlJ" = (
-/obj/machinery/camera/autoname/directional/east,
-/turf/open/space/openspace,
-/area/space)
"tlK" = (
/obj/machinery/disposal/bin,
/obj/structure/disposalpipe/trunk{
@@ -74726,16 +74688,6 @@
/obj/effect/spawner/random/contraband/prison,
/turf/open/floor/iron/dark,
/area/station/maintenance/floor2/starboard/aft)
-"tnM" = (
-/obj/structure/table,
-/obj/machinery/cell_charger{
- pixel_y = 5
- },
-/obj/item/stack/cable_coil,
-/obj/item/multitool,
-/obj/item/stock_parts/power_store/cell/high,
-/turf/open/floor/pod,
-/area/station/maintenance/floor4/port/fore)
"tnN" = (
/obj/structure/railing{
dir = 8
@@ -75138,14 +75090,6 @@
dir = 8
},
/area/station/hallway/floor2/aft)
-"tsB" = (
-/obj/effect/turf_decal/siding/white,
-/obj/structure/railing,
-/obj/machinery/cell_charger,
-/obj/item/stock_parts/power_store/cell/high,
-/obj/structure/table/reinforced/rglass,
-/turf/open/floor/iron/large,
-/area/station/science/robotics/lab)
"tsN" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -75683,6 +75627,16 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/white,
/area/station/medical/abandoned)
+"tzz" = (
+/obj/effect/turf_decal/trimline/neutral/warning{
+ dir = 8
+ },
+/obj/machinery/airalarm/directional/east,
+/obj/machinery/cell_charger,
+/obj/item/stock_parts/power_store/cell/high,
+/obj/structure/table/reinforced,
+/turf/open/floor/iron/dark,
+/area/station/command/gateway)
"tzA" = (
/obj/effect/turf_decal/siding/wood{
dir = 9
@@ -77984,6 +77938,10 @@
/obj/structure/table/wood,
/turf/open/floor/bamboo/tatami/black,
/area/station/commons/storage/art)
+"ufX" = (
+/obj/machinery/light/cold/no_nightlight/directional/east,
+/turf/open/floor/engine/xenobio,
+/area/station/science/xenobiology)
"ugb" = (
/obj/structure/marker_beacon/burgundy,
/obj/effect/turf_decal/trimline/brown/warning{
@@ -78302,10 +78260,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/textured,
/area/station/cargo/storage)
-"ujI" = (
-/obj/structure/railing,
-/turf/open/space/openspace,
-/area/space)
"ujQ" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 8
@@ -78688,6 +78642,13 @@
dir = 1
},
/area/station/hallway/floor2/aft)
+"uqf" = (
+/obj/item/fishing_rod,
+/obj/structure/closet,
+/obj/effect/spawner/random/maintenance/three,
+/obj/item/cigarette/pipe,
+/turf/open/floor/pod/light,
+/area/station/maintenance/floor2/starboard/fore)
"uqi" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -79332,6 +79293,14 @@
},
/turf/open/floor/iron/dark,
/area/station/hallway/floor3/fore)
+"uzF" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible/layer4{
+ dir = 8
+ },
+/obj/structure/cable,
+/turf/open/floor/iron/dark,
+/area/station/science/ordnance/testlab)
"uzH" = (
/obj/effect/turf_decal/stripes{
dir = 8
@@ -79707,6 +79676,11 @@
},
/turf/open/floor/carpet/royalblack,
/area/station/service/theater)
+"uEJ" = (
+/obj/effect/turf_decal/box/corners,
+/obj/structure/sign/warning/biohazard/directional/east,
+/turf/open/floor/engine/xenobio,
+/area/station/science/xenobiology)
"uEK" = (
/obj/effect/decal/cleanable/blood/tracks,
/obj/structure/chair{
@@ -79795,6 +79769,16 @@
/obj/effect/spawner/random/engineering/tool,
/turf/open/floor/pod/light,
/area/station/maintenance/department/engine/atmos)
+"uFX" = (
+/obj/machinery/atmospherics/pipe/smart/simple/purple/hidden/layer1{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/computer/security/telescreen/engine_waste/directional/south,
+/turf/open/floor/catwalk_floor/iron,
+/area/station/engineering/atmos/pumproom)
"uGc" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
/obj/machinery/light/directional/north,
@@ -80892,14 +80876,6 @@
},
/turf/open/floor/iron/checker,
/area/station/cargo/miningdock)
-"uSL" = (
-/obj/effect/turf_decal/bot,
-/obj/structure/table/reinforced,
-/obj/item/stock_parts/power_store/cell/high,
-/obj/machinery/cell_charger,
-/obj/structure/window/reinforced/spawner/directional/south,
-/turf/open/floor/iron/dark/smooth_large,
-/area/station/science/robotics/mechbay)
"uSN" = (
/obj/structure/railing,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -82546,16 +82522,6 @@
"voT" = (
/turf/closed/wall,
/area/station/maintenance/floor4/port/fore)
-"voX" = (
-/obj/machinery/door/firedoor/border_only,
-/obj/structure/railing{
- layer = 3.1
- },
-/obj/machinery/atmospherics/components/unary/thermomachine/freezer{
- dir = 1
- },
-/turf/open/floor/iron/dark,
-/area/station/science/ordnance/testlab)
"vpa" = (
/obj/item/kirbyplants/random,
/turf/open/floor/iron/dark,
@@ -82786,6 +82752,14 @@
"vrA" = (
/turf/closed/wall,
/area/station/medical/morgue)
+"vrG" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/computer/security/telescreen/engine_waste/directional/east,
+/obj/structure/disposalpipe/segment,
+/turf/open/floor/iron/dark/textured_large,
+/area/station/engineering/atmos/pumproom)
"vrJ" = (
/obj/effect/turf_decal/tile/blue/half{
dir = 4
@@ -83427,13 +83401,6 @@
/obj/effect/turf_decal/trimline/brown/arrow_ccw,
/turf/open/floor/iron/dark/side,
/area/station/cargo/lobby)
-"vzo" = (
-/obj/machinery/netpod,
-/obj/structure/railing{
- layer = 3.1
- },
-/turf/open/floor/catwalk_floor/iron_dark,
-/area/station/cargo/bitrunning/den)
"vzu" = (
/obj/effect/landmark/start/psychologist,
/obj/structure/sign/poster/official/random/directional/south,
@@ -83805,6 +83772,14 @@
dir = 1
},
/area/station/cargo/sorting)
+"vEC" = (
+/obj/structure/railing/corner,
+/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible/layer4{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/smart/simple/purple/visible,
+/turf/open/floor/iron/dark,
+/area/station/science/ordnance/testlab)
"vED" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/structure/cable,
@@ -83868,6 +83843,17 @@
/obj/machinery/portable_atmospherics/canister/oxygen,
/turf/open/floor/pod/light,
/area/station/maintenance/floor4/port)
+"vFU" = (
+/obj/item/radio/intercom/directional/north{
+ broadcasting = 1;
+ frequency = 1447;
+ listening = 0;
+ name = "Private Channel"
+ },
+/obj/machinery/recharge_station,
+/obj/machinery/computer/security/telescreen/minisat/directional/east,
+/turf/open/floor/circuit,
+/area/station/ai_monitored/turret_protected/aisat/service)
"vFV" = (
/obj/effect/turf_decal/trimline/blue/end,
/obj/effect/mapping_helpers/airlock/access/any/command/general,
@@ -84048,6 +84034,10 @@
},
/turf/open/floor/wood,
/area/station/command/heads_quarters/hop)
+"vIj" = (
+/obj/structure/cable,
+/turf/open/floor/iron/dark,
+/area/station/science/ordnance/testlab)
"vIn" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -84639,21 +84629,6 @@
/obj/structure/window/reinforced/spawner/directional/north,
/turf/open/floor/iron/cafeteria,
/area/station/engineering/atmos)
-"vQf" = (
-/obj/structure/table,
-/obj/item/ai_module/reset/purge,
-/obj/effect/turf_decal/trimline/blue/filled/line{
- dir = 10
- },
-/obj/effect/turf_decal/trimline/blue/filled/corner{
- dir = 4
- },
-/obj/structure/window/reinforced/spawner/directional/north,
-/obj/effect/spawner/random/aimodule/neutral{
- pixel_x = 15
- },
-/turf/open/floor/iron/dark,
-/area/station/ai_monitored/turret_protected/ai_upload_foyer)
"vQg" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -84914,12 +84889,6 @@
/obj/machinery/power/apc/auto_name/directional/south,
/turf/open/floor/pod/dark,
/area/station/maintenance/floor2/port)
-"vTV" = (
-/obj/effect/turf_decal/box/corners{
- dir = 4
- },
-/turf/open/floor/engine/xenobio,
-/area/station/science/xenobiology)
"vTY" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -85155,13 +85124,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/textured_large,
/area/station/hallway/secondary/entry)
-"vWP" = (
-/obj/structure/table/reinforced,
-/obj/machinery/cell_charger,
-/obj/item/stock_parts/power_store/cell/high,
-/obj/item/radio/intercom/directional/west,
-/turf/open/floor/iron/dark/smooth_large,
-/area/station/science/robotics/lab)
"vWQ" = (
/obj/effect/turf_decal/siding/wood{
dir = 8
@@ -85588,12 +85550,6 @@
},
/turf/open/floor/iron/white,
/area/station/science/lower)
-"wbT" = (
-/obj/structure/railing{
- dir = 1
- },
-/turf/open/space/openspace,
-/area/space)
"wci" = (
/obj/effect/turf_decal/siding/wood/corner{
dir = 4
@@ -86328,25 +86284,6 @@
},
/turf/open/floor/plating,
/area/station/hallway/secondary/exit/escape_pod)
-"wkP" = (
-/obj/structure/table,
-/obj/item/reagent_containers/condiment/saltshaker{
- layer = 3.1;
- pixel_x = -2;
- pixel_y = 2
- },
-/obj/item/reagent_containers/condiment/peppermill{
- desc = "Often used to flavor food or make people sneeze. Fashionably moved to the left side of the table.";
- pixel_x = -8;
- pixel_y = 2
- },
-/obj/item/reagent_containers/condiment/enzyme{
- pixel_x = 9;
- pixel_y = 3
- },
-/obj/item/book/manual/chef_recipes,
-/turf/open/floor/iron,
-/area/station/security/prison)
"wkX" = (
/turf/open/floor/catwalk_floor,
/area/station/hallway/floor2/fore)
@@ -86567,6 +86504,12 @@
},
/turf/open/floor/iron,
/area/station/hallway/floor3/aft)
+"wni" = (
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
+ dir = 4
+ },
+/turf/open/space/basic,
+/area/space/nearstation)
"wnq" = (
/obj/effect/baseturf_helper/reinforced_plating/ceiling,
/obj/machinery/light_switch/directional/south,
@@ -87438,6 +87381,30 @@
/obj/effect/spawner/random/maintenance,
/turf/open/floor/pod/light,
/area/station/maintenance/floor2/port/aft)
+"wyg" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
+/obj/structure/table/reinforced,
+/obj/structure/window/spawner/directional/south,
+/obj/effect/turf_decal/trimline/yellow/corner{
+ dir = 4
+ },
+/obj/item/storage/toolbox/mechanical{
+ pixel_x = 8;
+ pixel_y = -4
+ },
+/obj/item/flatpack{
+ board = /obj/item/circuitboard/machine/flatpacker;
+ pixel_x = -6;
+ pixel_y = 5
+ },
+/obj/item/multitool{
+ pixel_x = 7;
+ pixel_y = 10
+ },
+/turf/open/floor/iron/corner{
+ dir = 4
+ },
+/area/station/engineering/lobby)
"wym" = (
/obj/effect/turf_decal/siding/wood{
dir = 10
@@ -87628,6 +87595,20 @@
dir = 8
},
/area/station/medical/chemistry)
+"wAl" = (
+/obj/machinery/door/airlock/highsecurity{
+ name = "AI Upload"
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/cable,
+/obj/effect/mapping_helpers/airlock/access/any/command/ai_upload,
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+ dir = 4
+ },
+/obj/structure/sign/departments/aiupload/directional/south,
+/turf/open/floor/iron/dark,
+/area/station/ai_monitored/turret_protected/ai_upload_foyer)
"wAz" = (
/obj/machinery/vending/autodrobe,
/obj/machinery/light_switch/directional/east,
@@ -88168,6 +88149,14 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/pod/light,
/area/station/maintenance/floor4/port/aft)
+"wIf" = (
+/obj/effect/turf_decal/siding/white,
+/obj/structure/railing,
+/obj/machinery/cell_charger,
+/obj/item/stock_parts/power_store/cell/high,
+/obj/structure/table/reinforced/rglass,
+/turf/open/floor/iron/large,
+/area/station/science/robotics/lab)
"wIn" = (
/obj/structure/sign/poster/official/random/directional/west,
/obj/structure/easel,
@@ -88280,22 +88269,6 @@
},
/turf/open/floor/iron/dark,
/area/station/command/heads_quarters/hos)
-"wIX" = (
-/obj/structure/table,
-/obj/item/storage/toolbox/emergency{
- pixel_y = 12
- },
-/obj/item/stack/cable_coil/cut{
- pixel_y = 7
- },
-/obj/item/stock_parts/power_store/cell/lead{
- pixel_x = 5;
- pixel_y = 4
- },
-/obj/item/wirecutters,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/pod/light,
-/area/station/maintenance/floor1/starboard/fore)
"wJf" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 1
@@ -89394,6 +89367,10 @@
},
/turf/open/floor/plating,
/area/station/maintenance/floor2/starboard/fore)
+"wXe" = (
+/obj/structure/extinguisher_cabinet/directional/east,
+/turf/open/floor/iron,
+/area/station/commons/toilet)
"wXg" = (
/obj/machinery/light/floor,
/turf/open/floor/iron/dark/side{
@@ -89567,6 +89544,12 @@
/obj/effect/turf_decal/bot,
/turf/open/floor/iron,
/area/station/maintenance/floor1/starboard/fore)
+"wZE" = (
+/obj/structure/railing{
+ dir = 4
+ },
+/turf/open/space/openspace,
+/area/space/nearstation)
"wZH" = (
/obj/effect/turf_decal/caution{
dir = 4
@@ -90441,12 +90424,6 @@
/obj/machinery/door/firedoor,
/turf/open/floor/iron/white,
/area/station/medical/pharmacy)
-"xln" = (
-/obj/machinery/power/shuttle_engine/huge{
- dir = 4
- },
-/turf/open/floor/plating/airless,
-/area/space)
"xlu" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -90578,6 +90555,16 @@
},
/turf/open/floor/pod/light,
/area/station/maintenance/floor1/starboard/fore)
+"xof" = (
+/obj/structure/table,
+/obj/machinery/cell_charger{
+ pixel_y = 5
+ },
+/obj/item/stack/cable_coil,
+/obj/item/multitool,
+/obj/item/stock_parts/power_store/cell/high,
+/turf/open/floor/pod,
+/area/station/maintenance/floor4/port/fore)
"xoj" = (
/obj/effect/turf_decal/trimline/green/filled/line{
dir = 6
@@ -91122,16 +91109,6 @@
},
/turf/open/floor/iron/dark,
/area/station/science/ordnance/storage)
-"xvN" = (
-/obj/structure/table,
-/obj/item/reagent_containers/cup/beaker{
- pixel_x = 5
- },
-/obj/item/reagent_containers/condiment/enzyme{
- layer = 5
- },
-/turf/open/floor/iron/kitchen,
-/area/station/service/kitchen)
"xvO" = (
/obj/effect/decal/cleanable/oil,
/obj/effect/decal/cleanable/dirt,
@@ -91270,11 +91247,6 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/iron,
/area/station/commons/vacant_room/office)
-"xxA" = (
-/obj/machinery/holopad,
-/obj/structure/cable,
-/turf/open/floor/iron/white,
-/area/station/science/ordnance/testlab)
"xxC" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron,
@@ -91331,6 +91303,9 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/iron/dark/textured,
/area/station/security/checkpoint/second)
+"xyo" = (
+/turf/open/space/basic,
+/area/space/nearstation)
"xyw" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -92306,13 +92281,6 @@
},
/turf/open/floor/catwalk_floor,
/area/station/maintenance/floor3/port)
-"xJX" = (
-/obj/structure/table,
-/obj/item/cigarette/candy{
- pixel_x = 4
- },
-/turf/open/floor/iron/dark/smooth_large,
-/area/station/hallway/floor1/aft)
"xKa" = (
/obj/effect/turf_decal/stripes/white/corner,
/turf/open/floor/iron/dark/corner,
@@ -92343,10 +92311,6 @@
/obj/structure/cable,
/turf/open/floor/iron/dark,
/area/station/security/evidence)
-"xKt" = (
-/obj/structure/railing/corner,
-/turf/open/space/openspace,
-/area/space)
"xKy" = (
/obj/machinery/modular_computer/preset/id{
dir = 8
@@ -92499,14 +92463,6 @@
dir = 8
},
/area/station/hallway/floor3/aft)
-"xMV" = (
-/obj/structure/table/reinforced,
-/obj/item/stock_parts/power_store/cell/high,
-/obj/machinery/cell_charger,
-/obj/effect/turf_decal/tile/blue/fourcorners,
-/obj/machinery/airalarm/directional/east,
-/turf/open/floor/iron/dark,
-/area/station/command/bridge)
"xMW" = (
/obj/structure/cable,
/obj/structure/disposalpipe/junction{
@@ -92548,6 +92504,11 @@
dir = 4
},
/area/station/engineering/atmos/office)
+"xNw" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/cable,
+/turf/open/floor/iron/white,
+/area/station/science/ordnance/testlab)
"xNx" = (
/obj/structure/disposalpipe/segment,
/turf/open/floor/iron,
@@ -93026,12 +92987,6 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/maintenance/disposal/incinerator)
-"xUk" = (
-/obj/structure/railing/corner{
- dir = 1
- },
-/turf/open/space/openspace,
-/area/space)
"xUB" = (
/obj/machinery/light/floor,
/turf/open/floor/iron/dark/side{
@@ -93239,6 +93194,16 @@
/obj/machinery/bluespace_vendor/directional/south,
/turf/open/floor/iron/dark/side,
/area/station/hallway/floor1/fore)
+"xWQ" = (
+/obj/machinery/computer/security/telescreen/minisat/directional/east,
+/obj/machinery/camera/directional/south{
+ c_tag = "MiniSat Exterior Access";
+ network = list("minisat")
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/firealarm/directional/south,
+/turf/open/floor/iron/dark,
+/area/station/ai_monitored/turret_protected/aisat)
"xWV" = (
/obj/effect/turf_decal/tile/green/half,
/obj/effect/landmark/navigate_destination/dockescpod,
@@ -93679,6 +93644,13 @@
/obj/structure/table/reinforced,
/turf/open/floor/iron/kitchen/herringbone,
/area/station/service/kitchen)
+"ydf" = (
+/obj/structure/table,
+/obj/effect/turf_decal/tile/purple/opposingcorners,
+/obj/machinery/cell_charger,
+/obj/item/stock_parts/power_store/cell/high,
+/turf/open/floor/iron/white,
+/area/station/science/circuits)
"ydi" = (
/obj/machinery/firealarm/directional/south,
/obj/effect/landmark/navigate_destination/chapel,
@@ -94240,6 +94212,22 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/carpet/red,
/area/station/service/theater)
+"ylq" = (
+/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{
+ dir = 4
+ },
+/obj/machinery/computer/security/telescreen/ordnance/directional/north,
+/obj/machinery/computer/pod/old/mass_driver_controller/ordnancedriver,
+/obj/structure/table,
+/obj/item/binoculars{
+ pixel_x = 6;
+ pixel_y = 6
+ },
+/obj/effect/turf_decal/siding/thinplating/dark{
+ dir = 5
+ },
+/turf/open/floor/iron/white,
+/area/station/science/ordnance/storage)
"yls" = (
/obj/effect/turf_decal/trimline/blue/filled/line{
dir = 4
@@ -110618,7 +110606,7 @@ wUH
hyN
wBR
pTR
-oZd
+nUN
wBR
wBR
wBR
@@ -116235,7 +116223,7 @@ owI
owI
oic
oic
-wIX
+sfE
laR
oic
jdc
@@ -117522,7 +117510,7 @@ tXe
tXe
cOT
sxb
-luo
+bfD
hTP
lNW
qZU
@@ -117779,7 +117767,7 @@ tXe
tXe
pjw
scn
-vzo
+ict
dqM
bED
qZU
@@ -118560,7 +118548,7 @@ eaW
lSJ
mxC
jUP
-etb
+gQW
myW
kga
uTH
@@ -131945,7 +131933,7 @@ nor
rcc
sHG
uxT
-jkD
+orW
qkL
snO
jRp
@@ -135279,7 +135267,7 @@ eIr
oyH
xnr
fvO
-xJX
+dVg
oaa
uYB
tLa
@@ -136576,7 +136564,7 @@ sQD
lOI
sjs
oFr
-iHL
+cik
kzE
fmb
xgH
@@ -136831,7 +136819,7 @@ nPb
rCO
cjc
aRI
-slC
+omo
bgs
hZt
kzE
@@ -137855,7 +137843,7 @@ wmU
pVZ
uKL
rGe
-nDQ
+wyg
wWw
xFR
gPc
@@ -138608,7 +138596,7 @@ kDg
vsL
kDg
rBP
-kZr
+qzq
ykU
mMO
tCC
@@ -140408,7 +140396,7 @@ oIy
irk
nDr
kBz
-gTZ
+vrG
bwl
wlA
kGK
@@ -141434,13 +141422,13 @@ hQy
vmr
vmr
skj
-ouy
+uFX
sAH
hhb
gGt
qEw
sAH
-gJl
+sai
jSD
ppd
uyD
@@ -143241,7 +143229,7 @@ mjv
tZD
oIy
owI
-bOk
+wni
owI
cHX
owI
@@ -143251,7 +143239,7 @@ biH
owI
cHX
owI
-bOk
+wni
owI
dEc
xMY
@@ -143756,7 +143744,7 @@ gxT
fmg
owI
jkM
-bOk
+wni
jkM
owI
caC
@@ -143764,7 +143752,7 @@ wqD
mdr
owI
jkM
-bOk
+wni
jkM
owI
oyh
@@ -144013,7 +144001,7 @@ teq
teq
owI
jkM
-bOk
+wni
jkM
owI
caC
@@ -144021,7 +144009,7 @@ wqD
mdr
owI
jkM
-bOk
+wni
jkM
owI
oyh
@@ -144784,7 +144772,7 @@ sKt
teq
owI
jkM
-bOk
+wni
jkM
owI
caC
@@ -144792,7 +144780,7 @@ wqD
mdr
owI
jkM
-bOk
+wni
jkM
owI
oyh
@@ -145041,7 +145029,7 @@ xqr
gIz
owI
jkM
-bOk
+wni
jkM
owI
caC
@@ -145049,7 +145037,7 @@ wqD
mdr
owI
jkM
-bOk
+wni
jkM
owI
oyh
@@ -146972,265 +146960,14 @@ owI
owI
owI
owI
-"}
-(206,1,1) = {"
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-aTO
-fCp
-pNV
-aTO
-fCp
-fCp
-xln
-aTO
-fCp
-fCp
-xln
-teq
-teq
-teq
-teq
-teq
-teq
-teq
-teq
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-iSU
-iSU
-iSU
-iSU
-iSU
-iSU
-iSU
-iSU
-fCp
-fCp
-xln
-aTO
-fCp
-fCp
-xln
-aTO
-fCp
-pNV
-aTO
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
-owI
+"}
+(206,1,1) = {"
owI
owI
owI
owI
owI
owI
-"}
-(207,1,1) = {"
owI
owI
owI
@@ -147322,6 +147059,25 @@ owI
owI
owI
owI
+jeK
+rcO
+nOK
+jeK
+rcO
+rcO
+gya
+jeK
+rcO
+rcO
+gya
+teq
+teq
+teq
+teq
+teq
+teq
+teq
+teq
owI
owI
owI
@@ -147329,16 +147085,8 @@ owI
owI
owI
owI
-fCp
-fCp
owI
-fCp
-fCp
-fCp
owI
-fCp
-fCp
-fCp
owI
owI
owI
@@ -147353,6 +147101,25 @@ owI
owI
owI
owI
+iSU
+iSU
+iSU
+iSU
+iSU
+iSU
+iSU
+iSU
+rcO
+rcO
+gya
+jeK
+rcO
+rcO
+gya
+jeK
+rcO
+nOK
+jeK
owI
owI
owI
@@ -147378,16 +147145,8 @@ owI
owI
owI
owI
-fCp
-fCp
-fCp
owI
-fCp
-fCp
-fCp
owI
-fCp
-fCp
owI
owI
owI
@@ -147458,6 +147217,23 @@ owI
owI
owI
owI
+"}
+(207,1,1) = {"
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
owI
owI
owI
@@ -147486,8 +147262,6 @@ owI
owI
owI
owI
-"}
-(208,1,1) = {"
owI
owI
owI
@@ -147543,8 +147317,16 @@ owI
owI
owI
owI
+rcO
+rcO
owI
+rcO
+rcO
+rcO
owI
+rcO
+rcO
+rcO
owI
owI
owI
@@ -147584,8 +147366,16 @@ owI
owI
owI
owI
+rcO
+rcO
+rcO
owI
+rcO
+rcO
+rcO
owI
+rcO
+rcO
owI
owI
owI
@@ -147684,6 +147474,204 @@ owI
owI
owI
owI
+"}
+(208,1,1) = {"
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+xyo
+xyo
+xyo
+owI
+xyo
+xyo
+xyo
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+xyo
+xyo
+xyo
+owI
+xyo
+xyo
+xyo
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
+owI
owI
owI
owI
@@ -174625,7 +174613,7 @@ oyh
oyh
oyh
oyh
-ucA
+pXb
ucA
ucA
ucA
@@ -174882,7 +174870,7 @@ oyh
oyh
oyh
oyh
-ucA
+pXb
ucA
ucA
ucA
@@ -175139,7 +175127,7 @@ oyh
oyh
oyh
oyh
-ucA
+pXb
ucA
ucA
ucA
@@ -175396,7 +175384,7 @@ oyh
oyh
oyh
oyh
-ucA
+pXb
ucA
ucA
ucA
@@ -175653,7 +175641,7 @@ oyh
oyh
oyh
oyh
-ucA
+pXb
ucA
ucA
ucA
@@ -175910,7 +175898,7 @@ oyh
oyh
oyh
oyh
-ucA
+pXb
ucA
ucA
ucA
@@ -180751,7 +180739,7 @@ wwu
wwu
wwu
wwu
-nEM
+uqf
qdW
sbw
wwu
@@ -181561,7 +181549,7 @@ lQI
lQI
ozr
jJu
-nqP
+nxB
qiR
rkZ
kms
@@ -182040,7 +182028,7 @@ mKZ
sxl
naI
lNN
-iGR
+ydf
xuv
jBm
xuv
@@ -182819,7 +182807,7 @@ oFY
mBZ
ijS
obj
-rgx
+nJz
sEL
biW
xWe
@@ -184619,7 +184607,7 @@ kJg
kmR
lcB
kGf
-ooT
+qlT
wXC
ePa
rNg
@@ -185132,7 +185120,7 @@ mhT
jFr
sif
lvS
-cSb
+aoE
mUJ
jnV
sif
@@ -187947,7 +187935,7 @@ hge
hge
hge
oiO
-ijV
+knz
pKO
aiN
jDc
@@ -188987,7 +188975,7 @@ kXZ
wbS
eGF
dpL
-hGG
+gra
bvx
btp
dpL
@@ -196714,7 +196702,7 @@ tOW
rwv
bCd
dzM
-gcm
+pJQ
txp
aaU
coZ
@@ -197226,7 +197214,7 @@ woE
biz
dzM
kUl
-ghy
+cIj
dzM
dYM
scx
@@ -198000,7 +197988,7 @@ iDr
thd
bYb
bnC
-dXy
+eTC
thd
aHK
aZW
@@ -200828,7 +200816,7 @@ bet
iAb
bif
fSi
-vWP
+sAf
aal
aAK
ybG
@@ -203126,7 +203114,7 @@ lkA
pZW
nyE
nyE
-cIc
+wAl
nyE
nyE
kuB
@@ -203137,7 +203125,7 @@ igE
hcr
jbR
cqR
-uSL
+kSG
aFs
jeF
blv
@@ -203382,9 +203370,9 @@ sBb
ybB
rkY
nyE
-eIg
+eaM
eiD
-vQf
+iYe
nyE
sgJ
kzK
@@ -204169,7 +204157,7 @@ bgz
bid
grk
bmL
-tsB
+wIf
mOH
jhU
btW
@@ -204665,7 +204653,7 @@ mPw
uZF
svu
uZF
-lSI
+lYT
biR
vLx
vpA
@@ -204922,7 +204910,7 @@ mPw
uZF
svu
uZF
-iOD
+gkv
biR
nqb
xAu
@@ -251205,7 +251193,7 @@ sFt
oEU
oSA
sFt
-xvN
+eAq
fWl
bQG
vZF
@@ -256821,9 +256809,9 @@ umb
nqi
fXR
yhT
-vTV
-rjB
-sav
+feF
+ufX
+uEJ
iHm
sSB
ccV
@@ -261712,7 +261700,7 @@ isU
cdj
eAi
spT
-hsA
+wXe
fmK
plX
bex
@@ -261995,7 +261983,7 @@ oNV
eLw
cmh
kSU
-pEY
+ibO
piR
piR
roj
@@ -267657,7 +267645,7 @@ hLo
piR
xRs
bKR
-rdv
+qOL
piR
mom
hcT
@@ -276117,11 +276105,11 @@ ucA
ucA
ucA
ucA
-xKt
-djc
-djc
-djc
-dkn
+geR
+wZE
+wZE
+wZE
+aKo
ucA
ucA
ucA
@@ -276374,11 +276362,11 @@ ucA
ucA
ucA
ucA
-ujI
+qVW
edA
pRs
pRs
-wbT
+jty
ucA
ucA
ucA
@@ -276631,11 +276619,11 @@ ucA
ucA
ucA
ucA
-ujI
+qVW
pRs
pRs
pRs
-wbT
+jty
ucA
ucA
ucA
@@ -276888,11 +276876,11 @@ ucA
ucA
ucA
ucA
-qRS
-acl
+dyg
+kjJ
pRs
-acl
-xUk
+kjJ
+hdk
ucA
ucA
ucA
@@ -307210,7 +307198,7 @@ ucA
ucA
ucA
ucA
-tlJ
+ojO
ucA
gMe
gMe
@@ -307220,7 +307208,7 @@ gMe
gMe
gMe
ucA
-tlJ
+ojO
ucA
ucA
ucA
@@ -309523,7 +309511,7 @@ bfx
eGK
onE
aNs
-xMV
+kZI
wFT
gaJ
qOq
@@ -309535,7 +309523,7 @@ qNY
iTN
qGF
uIx
-tnM
+xof
lvm
vSG
mpK
@@ -311845,7 +311833,7 @@ lgD
ykw
hIb
fKZ
-hbW
+oxB
dbZ
hKg
raq
@@ -313137,7 +313125,7 @@ fUm
oTx
uqc
nYe
-cep
+bft
fwj
lOe
uIx
@@ -313387,7 +313375,7 @@ rti
vuU
wgO
rZb
-acL
+dpq
jKF
fXa
sFa
@@ -315417,8 +315405,8 @@ mSG
mSG
aSX
aSX
-pqH
-bJA
+tfv
+uzF
mKu
hHi
fMc
@@ -315675,10 +315663,10 @@ dWz
lYx
unQ
wMU
-aaN
-pGz
-jjj
-dIJ
+lKm
+vIj
+kbV
+xNw
oTq
jjT
hmM
@@ -315930,12 +315918,12 @@ vPP
rrs
mCU
hGC
-jJM
-hAH
-eSq
+ggy
+rUf
+vEC
tHk
bDn
-gwe
+sBo
eoI
nPE
nPE
@@ -316192,7 +316180,7 @@ wMU
aqm
kFy
xTG
-xxA
+fAE
xdE
nPE
uZr
@@ -316203,7 +316191,7 @@ fkN
fQx
nTJ
iXS
-mFQ
+nwk
hNh
hNh
hNh
@@ -316446,7 +316434,7 @@ oOA
tyR
tyR
xqB
-voX
+nWl
kFy
eTV
auO
@@ -317746,7 +317734,7 @@ xvr
hIB
nTo
hns
-oLE
+tzz
jbr
iXS
eHr
@@ -318754,7 +318742,7 @@ ucA
xuh
lln
lln
-mko
+ylq
eNX
bNP
nQj
@@ -320057,7 +320045,7 @@ nPE
qPv
iQe
wqP
-omq
+jCo
obK
kpI
dJC
@@ -322652,7 +322640,7 @@ cbw
lOp
ira
dtX
-oOW
+frG
qjr
qjr
qjr
@@ -326507,7 +326495,7 @@ bJm
oZo
gXi
gDx
-rhO
+rRt
ftZ
tBk
sCO
@@ -330619,7 +330607,7 @@ yeU
jVK
vWn
mRa
-wkP
+jVw
uTc
nOa
vVW
@@ -333430,7 +333418,7 @@ oyh
nbP
tIl
fEv
-dMt
+xWQ
nbP
oyh
oyh
@@ -337558,7 +337546,7 @@ oyh
oyh
fMl
sWs
-wbT
+jty
ucA
ucA
ucA
@@ -337791,7 +337779,7 @@ oyh
aFj
aFj
aFj
-dlR
+vFU
cRs
uEb
uEb
@@ -337813,9 +337801,9 @@ oyh
oyh
oyh
oyh
-acl
-acl
-xUk
+kjJ
+kjJ
+hdk
ucA
ucA
ucA
@@ -338564,7 +338552,7 @@ ucA
ucA
ucA
ucA
-sKZ
+buZ
ucA
ucA
ucA
@@ -338575,7 +338563,7 @@ ucA
ucA
ucA
ucA
-sKZ
+buZ
ucA
ucA
ucA
@@ -341653,11 +341641,11 @@ ucA
ucA
ucA
ucA
-xKt
-djc
-djc
-djc
-dkn
+geR
+wZE
+wZE
+wZE
+aKo
ucA
ucA
ucA
@@ -341910,11 +341898,11 @@ ucA
ucA
ucA
ucA
-ujI
+qVW
edA
pRs
pRs
-wbT
+jty
ucA
ucA
ucA
@@ -342167,7 +342155,7 @@ ucA
ucA
ucA
ucA
-ujI
+qVW
pRs
pRs
ucA
diff --git a/_maps/map_files/debug/runtimestation.dmm b/_maps/map_files/debug/runtimestation.dmm
index a2d6ba70275d9..7d949fb043d0c 100644
--- a/_maps/map_files/debug/runtimestation.dmm
+++ b/_maps/map_files/debug/runtimestation.dmm
@@ -1273,13 +1273,11 @@
/obj/effect/turf_decal/bot,
/obj/machinery/button/door/directional/east{
id = "cargounload";
- layer = 4;
name = "Loading Doors";
pixel_y = 8
},
/obj/machinery/button/door/directional/east{
id = "cargoload";
- layer = 4;
name = "Loading Doors";
pixel_y = -8
},
diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm
index 9b5baa411fa10..5bb0f1d14cc7c 100644
--- a/_maps/map_files/generic/CentCom.dmm
+++ b/_maps/map_files/generic/CentCom.dmm
@@ -912,17 +912,6 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/centcom/central_command_areas/control)
-"ec" = (
-/obj/structure/railing{
- dir = 4;
- layer = 4.1
- },
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/effect/turf_decal/siding/dark{
- dir = 4
- },
-/turf/open/floor/iron/dark,
-/area/centcom/central_command_areas/evacuation/ship)
"eg" = (
/obj/structure/table/wood,
/obj/item/storage/box/drinkingglasses,
@@ -2088,27 +2077,6 @@
},
/turf/open/floor/iron,
/area/centcom/central_command_areas/prison)
-"jy" = (
-/obj/machinery/button/door/indestructible{
- id = "XCCQMLoaddoor";
- layer = 4;
- name = "Loading Doors";
- pixel_x = -27;
- pixel_y = -5
- },
-/obj/machinery/button/door/indestructible{
- id = "XCCQMLoaddoor2";
- layer = 4;
- name = "Loading Doors";
- pixel_x = -27;
- pixel_y = 5
- },
-/obj/machinery/computer/cargo{
- dir = 4
- },
-/obj/effect/turf_decal/bot,
-/turf/open/floor/iron,
-/area/centcom/central_command_areas/supply)
"jA" = (
/obj/structure/fans/tiny/invisible,
/turf/open/floor/holofloor/hyperspace,
@@ -2519,6 +2487,26 @@
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/iron/dark,
/area/centcom/central_command_areas/supplypod)
+"lG" = (
+/obj/structure/table/wood,
+/obj/item/phone{
+ desc = "Supposedly a direct line to Nanotrasen Central Command. It's not even plugged in.";
+ pixel_x = -3;
+ pixel_y = 3
+ },
+/obj/item/cigarette/cigar/cohiba{
+ pixel_x = 6
+ },
+/obj/item/cigarette/cigar/havana{
+ pixel_x = 2
+ },
+/obj/item/cigarette/cigar{
+ pixel_x = 4.5
+ },
+/obj/machinery/newscaster/directional/north,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/turf/open/floor/iron/dark,
+/area/centcom/central_command_areas/briefing)
"lJ" = (
/obj/machinery/door/airlock/centcom{
name = "Shuttle Control Office"
@@ -2793,22 +2781,6 @@
/obj/machinery/status_display/evac/directional/north,
/turf/open/floor/iron,
/area/centcom/central_command_areas/prison)
-"mT" = (
-/obj/structure/table/reinforced,
-/obj/machinery/recharger,
-/obj/machinery/button/door/indestructible{
- id = "XCCsecdepartment";
- layer = 3;
- name = "CC Security Checkpoint Control";
- pixel_x = 24;
- pixel_y = 24
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 10
- },
-/obj/machinery/status_display/evac/directional/north,
-/turf/open/floor/iron,
-/area/centcom/central_command_areas/prison)
"mW" = (
/obj/structure/reagent_dispensers/wall/peppertank/directional/west,
/obj/effect/turf_decal/tile/red/half/contrasted{
@@ -2844,11 +2816,34 @@
/obj/structure/sign/poster/official/enlist/directional/east,
/turf/open/floor/iron/dark/textured_large,
/area/centcom/central_command_areas/evacuation/ship)
+"nd" = (
+/obj/machinery/computer/records/security{
+ dir = 8
+ },
+/obj/machinery/button/door/indestructible{
+ id = "XCCcustoms1";
+ name = "CC Emergency Docks Control";
+ pixel_x = 24;
+ pixel_y = 24
+ },
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/turf/open/floor/iron/dark,
+/area/centcom/central_command_areas/evacuation)
"ne" = (
/obj/effect/turf_decal/tile/green,
/obj/machinery/status_display/ai/directional/south,
/turf/open/floor/iron,
/area/centcom/central_command_areas/ferry)
+"ng" = (
+/obj/structure/railing{
+ dir = 10
+ },
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/effect/turf_decal/siding/dark{
+ dir = 10
+ },
+/turf/open/floor/iron/dark,
+/area/centcom/central_command_areas/evacuation/ship)
"nj" = (
/obj/machinery/firealarm/directional/west,
/obj/effect/turf_decal/tile/bar/opposingcorners,
@@ -3248,20 +3243,6 @@
},
/turf/open/floor/iron,
/area/centcom/central_command_areas/supply)
-"oV" = (
-/obj/structure/table/wood,
-/obj/item/storage/briefcase/secure{
- pixel_x = 5;
- pixel_y = 5
- },
-/obj/item/storage/lockbox/medal,
-/obj/machinery/newscaster{
- pixel_x = 32
- },
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/machinery/computer/security/telescreen/research/directional/south,
-/turf/open/floor/iron/dark,
-/area/centcom/central_command_areas/admin)
"oW" = (
/obj/structure/flora/bush/lavendergrass/style_random,
/obj/structure/flora/bush/sparsegrass/style_random,
@@ -3287,6 +3268,21 @@
},
/turf/open/floor/stone,
/area/centcom/central_command_areas/evacuation/ship)
+"pa" = (
+/obj/structure/table/reinforced,
+/obj/machinery/recharger,
+/obj/machinery/button/door/indestructible{
+ id = "XCCsecdepartment";
+ name = "CC Security Checkpoint Control";
+ pixel_x = 24;
+ pixel_y = 24
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 10
+ },
+/obj/machinery/status_display/evac/directional/north,
+/turf/open/floor/iron,
+/area/centcom/central_command_areas/prison)
"pb" = (
/obj/effect/landmark/thunderdome/two,
/obj/effect/turf_decal/stripes/line,
@@ -3313,6 +3309,27 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/centcom/central_command_areas/supply)
+"pe" = (
+/obj/structure/table/wood,
+/obj/item/phone{
+ desc = "Supposedly a direct line to Nanotrasen Central Command. It's not even plugged in.";
+ pixel_x = -3;
+ pixel_y = 3
+ },
+/obj/item/cigarette/cigar/cohiba{
+ pixel_x = 6
+ },
+/obj/item/cigarette/cigar/havana{
+ pixel_x = 2
+ },
+/obj/item/cigarette/cigar{
+ pixel_x = 4.5
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+ dir = 10
+ },
+/turf/open/floor/iron/grimy,
+/area/centcom/central_command_areas/admin)
"pf" = (
/obj/structure/table/reinforced,
/obj/item/crowbar/red,
@@ -4042,18 +4059,6 @@
},
/turf/open/floor/iron,
/area/centcom/central_command_areas/ferry)
-"sw" = (
-/obj/structure/railing{
- dir = 8;
- layer = 4.1
- },
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/effect/turf_decal/siding/dark{
- dir = 8
- },
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron/dark,
-/area/centcom/central_command_areas/evacuation/ship)
"sz" = (
/obj/machinery/status_display/evac/directional/west,
/obj/effect/turf_decal/tile/neutral/fourcorners,
@@ -4716,6 +4721,28 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/centcom/central_command_areas/admin)
+"vz" = (
+/obj/structure/table/reinforced,
+/obj/structure/railing{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/effect/turf_decal/siding/dark{
+ dir = 4
+ },
+/obj/item/paper_bin{
+ pixel_y = 3;
+ pixel_x = -6
+ },
+/obj/item/pen{
+ pixel_x = -5;
+ pixel_y = 3
+ },
+/obj/item/clipboard{
+ pixel_x = 5
+ },
+/turf/open/floor/iron/dark,
+/area/centcom/central_command_areas/evacuation/ship)
"vA" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/structure/sign/directions/engineering{
@@ -4904,27 +4931,6 @@
/obj/machinery/light/small/directional/west,
/turf/open/floor/iron/smooth_large,
/area/centcom/central_command_areas/evacuation/ship)
-"wl" = (
-/obj/machinery/modular_computer/preset/id/centcom{
- dir = 1
- },
-/obj/machinery/button/door/indestructible{
- id = "XCCcustoms1";
- layer = 3.5;
- name = "CC Customs 1 Control";
- pixel_x = 8;
- pixel_y = -24
- },
-/obj/machinery/button/door/indestructible{
- id = "XCCcustoms2";
- layer = 3.5;
- name = "CC Customs 2 Control";
- pixel_x = -8;
- pixel_y = -24
- },
-/obj/effect/turf_decal/tile/red/half/contrasted,
-/turf/open/floor/iron/dark,
-/area/centcom/central_command_areas/control)
"wm" = (
/obj/effect/landmark/thunderdome/one,
/obj/effect/turf_decal/stripes/line{
@@ -6447,30 +6453,6 @@
/obj/machinery/light/directional/west,
/turf/open/floor/iron,
/area/centcom/central_command_areas/control)
-"CT" = (
-/obj/structure/table/reinforced,
-/obj/structure/railing{
- dir = 8;
- layer = 4.1
- },
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/effect/turf_decal/siding/dark{
- dir = 8
- },
-/obj/item/folder/red{
- pixel_x = -2;
- pixel_y = -2
- },
-/obj/item/folder/blue{
- pixel_x = 2;
- pixel_y = 2
- },
-/obj/item/gun/ballistic/automatic/pistol/m1911{
- pixel_y = 7;
- pixel_x = 2
- },
-/turf/open/floor/iron/dark,
-/area/centcom/central_command_areas/evacuation/ship)
"CU" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
/obj/structure/cable,
@@ -6507,6 +6489,26 @@
},
/turf/open/floor/iron,
/area/centcom/central_command_areas/control)
+"Db" = (
+/obj/structure/table/wood,
+/obj/item/phone{
+ desc = "Supposedly a direct line to Nanotrasen Central Command. It's not even plugged in.";
+ pixel_x = -3;
+ pixel_y = 3
+ },
+/obj/item/cigarette/cigar/cohiba{
+ pixel_x = 6
+ },
+/obj/item/cigarette/cigar/havana{
+ pixel_x = 2
+ },
+/obj/item/cigarette/cigar{
+ pixel_x = 4.5
+ },
+/obj/machinery/airalarm/directional/south,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/turf/open/floor/iron/dark,
+/area/centcom/tdome/administration)
"Dg" = (
/obj/machinery/light/floor,
/turf/open/floor/iron/white,
@@ -6897,6 +6899,25 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/centcom/central_command_areas/courtroom)
+"Fl" = (
+/obj/machinery/button/door/indestructible{
+ id = "XCCQMLoaddoor";
+ name = "Loading Doors";
+ pixel_x = -27;
+ pixel_y = -5
+ },
+/obj/machinery/button/door/indestructible{
+ id = "XCCQMLoaddoor2";
+ name = "Loading Doors";
+ pixel_x = -27;
+ pixel_y = 5
+ },
+/obj/machinery/computer/cargo{
+ dir = 4
+ },
+/obj/effect/turf_decal/bot,
+/turf/open/floor/iron,
+/area/centcom/central_command_areas/supply)
"Fo" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/structure/sign/directions/engineering{
@@ -6910,6 +6931,16 @@
/obj/structure/sign/warning/secure_area,
/turf/closed/indestructible/riveted,
/area/centcom/central_command_areas/control)
+"Ft" = (
+/obj/structure/railing{
+ dir = 6
+ },
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/effect/turf_decal/siding/dark{
+ dir = 6
+ },
+/turf/open/floor/iron/dark,
+/area/centcom/central_command_areas/evacuation/ship)
"Fu" = (
/obj/item/kirbyplants/organic/plant21,
/obj/machinery/firealarm/directional/west,
@@ -7317,17 +7348,6 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/centcom/central_command_areas/control)
-"HZ" = (
-/obj/structure/railing{
- dir = 6;
- layer = 3.1
- },
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/effect/turf_decal/siding/dark{
- dir = 6
- },
-/turf/open/floor/iron/dark,
-/area/centcom/central_command_areas/evacuation/ship)
"Ic" = (
/obj/machinery/door/poddoor{
id = "thunderdomehea";
@@ -7412,6 +7432,16 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/centcom/central_command_areas/control)
+"Ix" = (
+/obj/structure/railing{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/effect/turf_decal/siding/dark{
+ dir = 4
+ },
+/turf/open/floor/iron/dark,
+/area/centcom/central_command_areas/evacuation/ship)
"IK" = (
/obj/structure/closet/secure_closet/ert_sec,
/obj/effect/turf_decal/stripes/line{
@@ -7434,6 +7464,18 @@
/obj/machinery/light/directional/south,
/turf/open/floor/grass,
/area/centcom/tdome/administration)
+"IS" = (
+/obj/structure/table/reinforced,
+/obj/item/reagent_containers/cup/glass/bottle/whiskey{
+ pixel_y = 19;
+ pixel_x = 7
+ },
+/obj/item/cigarette/cigar/havana{
+ pixel_x = -6;
+ pixel_y = 5
+ },
+/turf/open/floor/iron,
+/area/centcom/central_command_areas/supplypod)
"IX" = (
/obj/effect/turf_decal/siding/dark_blue{
dir = 6
@@ -7495,10 +7537,6 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/centcom/tdome/administration)
-"JO" = (
-/obj/machinery/modular_computer/preset/id/centcom,
-/turf/open/floor/iron/grimy,
-/area/centcom/central_command_areas/admin)
"JU" = (
/obj/structure/chair{
dir = 4
@@ -7796,17 +7834,6 @@
},
/turf/open/floor/iron,
/area/centcom/central_command_areas/evacuation)
-"Lz" = (
-/obj/structure/railing{
- dir = 10;
- layer = 3.1
- },
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/effect/turf_decal/siding/dark{
- dir = 10
- },
-/turf/open/floor/iron/dark,
-/area/centcom/central_command_areas/evacuation/ship)
"LA" = (
/obj/effect/turf_decal/siding/wideplating_new/dark{
dir = 8
@@ -7943,12 +7970,35 @@
/obj/structure/speaking_tile,
/turf/closed/mineral/ash_rock,
/area/awaymission/errorroom)
+"Ma" = (
+/obj/machinery/modular_computer/preset/id/centcom,
+/turf/open/floor/iron/grimy,
+/area/centcom/central_command_areas/admin)
"Mf" = (
/obj/effect/landmark/thunderdome/one,
/obj/effect/turf_decal/tile/neutral/fourcorners,
/obj/effect/light_emitter/thunderdome,
/turf/open/floor/iron,
/area/centcom/tdome/arena)
+"Mh" = (
+/obj/machinery/modular_computer/preset/id/centcom{
+ dir = 1
+ },
+/obj/machinery/button/door/indestructible{
+ id = "XCCcustoms1";
+ name = "CC Customs 1 Control";
+ pixel_x = 8;
+ pixel_y = -24
+ },
+/obj/machinery/button/door/indestructible{
+ id = "XCCcustoms2";
+ name = "CC Customs 2 Control";
+ pixel_x = -8;
+ pixel_y = -24
+ },
+/obj/effect/turf_decal/tile/red/half/contrasted,
+/turf/open/floor/iron/dark,
+/area/centcom/central_command_areas/control)
"Mn" = (
/obj/effect/turf_decal/tile/red/half/contrasted{
dir = 8
@@ -8571,26 +8621,6 @@
/obj/machinery/light/small/directional/east,
/turf/open/floor/iron/dark,
/area/centcom/central_command_areas/briefing)
-"Pe" = (
-/obj/structure/table/wood,
-/obj/item/phone{
- desc = "Supposedly a direct line to Nanotrasen Central Command. It's not even plugged in.";
- pixel_x = -3;
- pixel_y = 3
- },
-/obj/item/cigarette/cigar/cohiba{
- pixel_x = 6
- },
-/obj/item/cigarette/cigar/havana{
- pixel_x = 2
- },
-/obj/item/cigarette/cigar{
- pixel_x = 4.5
- },
-/obj/machinery/status_display/evac/directional/north,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/turf/open/floor/iron/dark,
-/area/centcom/central_command_areas/courtroom)
"Pg" = (
/obj/machinery/computer/auxiliary_base/directional/north,
/obj/structure/table/reinforced,
@@ -8758,27 +8788,6 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/centcom/central_command_areas/briefing)
-"PR" = (
-/obj/structure/table/wood,
-/obj/item/phone{
- desc = "Supposedly a direct line to Nanotrasen Central Command. It's not even plugged in.";
- pixel_x = -3;
- pixel_y = 3
- },
-/obj/item/cigarette/cigar/cohiba{
- pixel_x = 6
- },
-/obj/item/cigarette/cigar/havana{
- pixel_x = 2
- },
-/obj/item/cigarette/cigar{
- pixel_x = 4.5
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
- dir = 10
- },
-/turf/open/floor/iron/grimy,
-/area/centcom/central_command_areas/admin)
"PT" = (
/obj/effect/turf_decal/tile/red/half/contrasted,
/turf/open/floor/iron,
@@ -8928,29 +8937,6 @@
/obj/effect/turf_decal/tile/green,
/turf/open/floor/iron,
/area/centcom/tdome/observation)
-"QB" = (
-/obj/structure/table/reinforced,
-/obj/structure/railing{
- dir = 4;
- layer = 4.1
- },
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/effect/turf_decal/siding/dark{
- dir = 4
- },
-/obj/item/paper_bin{
- pixel_y = 3;
- pixel_x = -6
- },
-/obj/item/pen{
- pixel_x = -5;
- pixel_y = 3
- },
-/obj/item/clipboard{
- pixel_x = 5
- },
-/turf/open/floor/iron/dark,
-/area/centcom/central_command_areas/evacuation/ship)
"QC" = (
/turf/closed/indestructible/riveted,
/area/centcom/tdome/observation)
@@ -8989,26 +8975,6 @@
/obj/machinery/light/directional/north,
/turf/open/floor/iron/dark,
/area/centcom/tdome/observation)
-"QU" = (
-/obj/structure/table/wood,
-/obj/item/phone{
- desc = "Supposedly a direct line to Nanotrasen Central Command. It's not even plugged in.";
- pixel_x = -3;
- pixel_y = 3
- },
-/obj/item/cigarette/cigar/cohiba{
- pixel_x = 6
- },
-/obj/item/cigarette/cigar/havana{
- pixel_x = 2
- },
-/obj/item/cigarette/cigar{
- pixel_x = 4.5
- },
-/obj/machinery/airalarm/directional/south,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/turf/open/floor/iron/dark,
-/area/centcom/tdome/administration)
"QV" = (
/turf/open/floor/iron/grimy,
/area/centcom/central_command_areas/admin)
@@ -9469,18 +9435,6 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/centcom/central_command_areas/admin)
-"Tj" = (
-/obj/structure/table/reinforced,
-/obj/item/reagent_containers/cup/glass/bottle/whiskey{
- pixel_y = 19;
- pixel_x = 7
- },
-/obj/item/cigarette/cigar/havana{
- pixel_x = -6;
- pixel_y = 5
- },
-/turf/open/floor/iron,
-/area/centcom/central_command_areas/supplypod)
"Tl" = (
/obj/structure/table/wood,
/obj/structure/plaque/static_plaque/thunderdome{
@@ -9887,6 +9841,17 @@
dir = 10
},
/area/centcom/central_command_areas/evacuation)
+"Ve" = (
+/obj/structure/railing{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/effect/turf_decal/siding/dark{
+ dir = 8
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/iron/dark,
+/area/centcom/central_command_areas/evacuation/ship)
"Vf" = (
/obj/item/kirbyplants/organic/plant21{
pixel_x = -3;
@@ -10032,6 +9997,26 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/centcom/central_command_areas/control)
+"VD" = (
+/obj/structure/table/wood,
+/obj/item/phone{
+ desc = "Supposedly a direct line to Nanotrasen Central Command. It's not even plugged in.";
+ pixel_x = -3;
+ pixel_y = 3
+ },
+/obj/item/cigarette/cigar/cohiba{
+ pixel_x = 6
+ },
+/obj/item/cigarette/cigar/havana{
+ pixel_x = 2
+ },
+/obj/item/cigarette/cigar{
+ pixel_x = 4.5
+ },
+/obj/machinery/status_display/evac/directional/north,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/turf/open/floor/iron/dark,
+/area/centcom/central_command_areas/courtroom)
"VF" = (
/obj/machinery/computer/crew{
dir = 4
@@ -10084,20 +10069,6 @@
},
/turf/open/floor/iron/dark,
/area/centcom/tdome/observation)
-"VY" = (
-/obj/machinery/computer/records/security{
- dir = 8
- },
-/obj/machinery/button/door/indestructible{
- id = "XCCcustoms1";
- layer = 3;
- name = "CC Emergency Docks Control";
- pixel_x = 24;
- pixel_y = 24
- },
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/turf/open/floor/iron/dark,
-/area/centcom/central_command_areas/evacuation)
"VZ" = (
/obj/structure/closet/secure_closet/ert_med,
/obj/structure/sign/directions/medical{
@@ -10151,6 +10122,29 @@
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/centcom/tdome/administration)
+"Wo" = (
+/obj/structure/table/reinforced,
+/obj/structure/railing{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/effect/turf_decal/siding/dark{
+ dir = 8
+ },
+/obj/item/folder/red{
+ pixel_x = -2;
+ pixel_y = -2
+ },
+/obj/item/folder/blue{
+ pixel_x = 2;
+ pixel_y = 2
+ },
+/obj/item/gun/ballistic/automatic/pistol/m1911{
+ pixel_y = 7;
+ pixel_x = 2
+ },
+/turf/open/floor/iron/dark,
+/area/centcom/central_command_areas/evacuation/ship)
"Wp" = (
/obj/item/storage/briefcase{
pixel_x = -3;
@@ -10235,26 +10229,6 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/centcom/central_command_areas/briefing)
-"WO" = (
-/obj/structure/table/wood,
-/obj/item/phone{
- desc = "Supposedly a direct line to Nanotrasen Central Command. It's not even plugged in.";
- pixel_x = -3;
- pixel_y = 3
- },
-/obj/item/cigarette/cigar/cohiba{
- pixel_x = 6
- },
-/obj/item/cigarette/cigar/havana{
- pixel_x = 2
- },
-/obj/item/cigarette/cigar{
- pixel_x = 4.5
- },
-/obj/machinery/newscaster/directional/north,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/turf/open/floor/iron/dark,
-/area/centcom/central_command_areas/briefing)
"WP" = (
/obj/machinery/computer/station_alert{
dir = 8
@@ -10382,6 +10356,20 @@
},
/turf/open/floor/iron/white,
/area/centcom/tdome/observation)
+"Xm" = (
+/obj/structure/table/wood,
+/obj/item/storage/briefcase/secure{
+ pixel_x = 5;
+ pixel_y = 5
+ },
+/obj/item/storage/lockbox/medal,
+/obj/machinery/newscaster{
+ pixel_x = 32
+ },
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/machinery/computer/security/telescreen/research/directional/south,
+/turf/open/floor/iron/dark,
+/area/centcom/central_command_areas/admin)
"Xn" = (
/obj/machinery/computer/security/telescreen,
/obj/structure/table/reinforced,
@@ -38391,10 +38379,10 @@ aa
aa
aa
Lw
-QB
-ec
+vz
+Ix
Ae
-HZ
+Ft
OI
Lt
Lt
@@ -39419,10 +39407,10 @@ aa
aa
aa
Lw
-CT
-sw
+Wo
+Ve
dv
-Lz
+ng
OI
Lt
Lt
@@ -47608,7 +47596,7 @@ WQ
xh
WQ
mD
-WO
+lG
eF
eF
eF
@@ -48365,7 +48353,7 @@ aa
On
Yc
VK
-PR
+pe
Uh
Xo
WU
@@ -49652,9 +49640,9 @@ yO
To
nk
Gf
-oV
+Xm
On
-JO
+Ma
Vz
Em
hT
@@ -50919,7 +50907,7 @@ iO
jc
jn
iP
-jy
+Fl
jD
jL
jc
@@ -53557,7 +53545,7 @@ uE
Pr
Xw
Sz
-QU
+Db
uf
Wn
uf
@@ -57354,7 +57342,7 @@ kU
lv
lP
il
-mT
+pa
lL
hW
oa
@@ -57881,7 +57869,7 @@ iu
ZS
sK
GX
-wl
+Mh
iu
vR
Ab
@@ -61748,7 +61736,7 @@ xt
vZ
AY
cg
-VY
+nd
Xb
CE
WF
@@ -61973,7 +61961,7 @@ aa
aa
aa
Hv
-Pe
+VD
rk
kH
le
@@ -63292,7 +63280,7 @@ tV
cg
cg
cg
-Tj
+IS
Su
Yn
Vk
diff --git a/_maps/map_files/tramstation/tramstation.dmm b/_maps/map_files/tramstation/tramstation.dmm
index c7686749c5031..3ad27b33c368a 100644
--- a/_maps/map_files/tramstation/tramstation.dmm
+++ b/_maps/map_files/tramstation/tramstation.dmm
@@ -1960,11 +1960,6 @@
},
/turf/open/floor/iron/dark/herringbone,
/area/station/commons/vacant_room)
-"agG" = (
-/obj/structure/dresser,
-/obj/item/cigarette/cigar/havana,
-/turf/open/floor/iron/grimy,
-/area/station/commons/vacant_room)
"agH" = (
/obj/machinery/power/apc/auto_name/directional/west,
/obj/structure/reagent_dispensers/beerkeg,
@@ -2955,15 +2950,6 @@
},
/turf/open/floor/iron,
/area/station/security/checkpoint/engineering)
-"aoN" = (
-/obj/machinery/elevator_control_panel{
- layer = 3.1;
- pixel_y = 2;
- linked_elevator_id = "tram_xeno_lift";
- preset_destination_names = list("2"="Lower Deck", "3"="Upper Deck")
- },
-/turf/closed/wall,
-/area/station/science/xenobiology)
"aoV" = (
/obj/effect/turf_decal/trimline/neutral/filled/line,
/turf/open/floor/iron/dark,
@@ -3263,17 +3249,6 @@
},
/turf/open/floor/iron,
/area/station/security/office)
-"asI" = (
-/obj/structure/table,
-/obj/machinery/requests_console/directional/east{
- name = "EVA Requests Console";
- department = "EVA"
- },
-/obj/effect/mapping_helpers/requests_console/assistance,
-/obj/machinery/cell_charger,
-/obj/item/stock_parts/power_store/cell/high,
-/turf/open/floor/iron,
-/area/station/ai_monitored/command/storage/eva)
"asQ" = (
/obj/structure/sign/warning/no_smoking,
/turf/closed/wall,
@@ -6454,12 +6429,6 @@
/obj/machinery/light/directional/north,
/turf/open/floor/iron,
/area/station/engineering/atmospherics_engine)
-"bhf" = (
-/obj/effect/spawner/random/engineering/tracking_beacon,
-/obj/effect/landmark/event_spawn,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible,
-/turf/open/floor/engine,
-/area/station/science/xenobiology)
"bhr" = (
/turf/closed/wall/rock/porous,
/area/station/security/prison/workout)
@@ -6672,6 +6641,15 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/carpet,
/area/station/commons/dorms)
+"bmd" = (
+/obj/structure/table,
+/obj/machinery/cell_charger,
+/obj/item/stock_parts/power_store/cell/high,
+/obj/effect/turf_decal/trimline/white/filled/line{
+ dir = 1
+ },
+/turf/open/floor/iron/dark,
+/area/station/engineering/storage/tech)
"bmp" = (
/obj/effect/turf_decal/trimline/green/corner{
dir = 1
@@ -7464,6 +7442,18 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/cargo/miningdock)
+"bCb" = (
+/obj/structure/table/reinforced,
+/obj/machinery/keycard_auth/directional/south,
+/obj/item/rcl/pre_loaded,
+/obj/machinery/computer/security/telescreen/ce/directional/west,
+/obj/effect/turf_decal/trimline/yellow/filled/line{
+ dir = 1
+ },
+/obj/item/clipboard,
+/obj/item/paper/monitorkey,
+/turf/open/floor/iron/dark,
+/area/station/command/heads_quarters/ce)
"bCc" = (
/obj/machinery/status_display/evac/directional/north,
/turf/open/misc/asteroid,
@@ -7682,16 +7672,6 @@
"bGJ" = (
/turf/open/floor/wood,
/area/station/service/theater)
-"bGP" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
- dir = 8
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/computer/security/telescreen/ordnance/directional/south,
-/turf/open/floor/iron,
-/area/station/science/ordnance/testlab)
"bGV" = (
/obj/effect/turf_decal/trimline/green/filled/line{
dir = 5
@@ -7852,6 +7832,13 @@
/obj/effect/turf_decal/siding/thinplating/dark,
/turf/open/floor/iron/white,
/area/station/science/research)
+"bJN" = (
+/obj/structure/table,
+/obj/machinery/cell_charger,
+/obj/item/stock_parts/power_store/cell/high,
+/obj/effect/turf_decal/trimline/neutral/filled/line,
+/turf/open/floor/iron,
+/area/station/commons/storage/primary)
"bJP" = (
/obj/structure/railing{
dir = 10
@@ -8459,16 +8446,6 @@
/obj/effect/turf_decal/siding/thinplating,
/turf/open/floor/iron,
/area/station/cargo/storage)
-"bTI" = (
-/obj/effect/turf_decal/trimline/red/filled/line{
- dir = 6
- },
-/obj/machinery/computer/security/telescreen/prison/directional/east,
-/obj/structure/disposalpipe/segment{
- dir = 9
- },
-/turf/open/floor/iron,
-/area/station/security/office)
"bTN" = (
/obj/effect/turf_decal/trimline/neutral/filled/corner,
/obj/structure/disposalpipe/segment{
@@ -9190,16 +9167,6 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/science/robotics/lab)
-"cdM" = (
-/obj/structure/table,
-/obj/machinery/cell_charger{
- pixel_y = 5
- },
-/obj/item/stack/cable_coil,
-/obj/item/multitool,
-/obj/item/stock_parts/power_store/cell/high,
-/turf/open/floor/engine,
-/area/station/science/xenobiology)
"cdN" = (
/obj/machinery/button/ignition/incinerator/atmos,
/turf/closed/wall/r_wall,
@@ -9745,13 +9712,6 @@
},
/turf/open/floor/wood,
/area/station/service/library)
-"coV" = (
-/obj/structure/table,
-/obj/machinery/cell_charger,
-/obj/item/stock_parts/power_store/cell/high,
-/obj/effect/turf_decal/trimline/neutral/filled/line,
-/turf/open/floor/iron,
-/area/station/commons/storage/primary)
"cpl" = (
/obj/effect/turf_decal/trimline/blue/filled/line,
/turf/open/floor/iron/white,
@@ -10411,6 +10371,21 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/hallway/secondary/exit/departure_lounge)
+"czC" = (
+/obj/structure/railing/corner{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/red/filled/line,
+/obj/effect/turf_decal/trimline/red/corner{
+ dir = 4
+ },
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+ dir = 4
+ },
+/obj/machinery/light/small/directional/south,
+/obj/item/radio/intercom/directional/south,
+/turf/open/floor/iron,
+/area/station/security/checkpoint/supply)
"czP" = (
/obj/machinery/door/firedoor,
/obj/effect/turf_decal/trimline/neutral/filled/line{
@@ -10511,12 +10486,6 @@
/obj/machinery/computer/security/telescreen/entertainment/directional/east,
/turf/open/floor/wood/large,
/area/station/service/barber)
-"cAK" = (
-/obj/effect/spawner/random/medical/two_percent_xeno_egg_spawner,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible,
-/obj/machinery/light/directional/north,
-/turf/open/floor/engine,
-/area/station/science/xenobiology)
"cBo" = (
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 4
@@ -10565,6 +10534,23 @@
/obj/machinery/light/warm/directional/east,
/turf/open/floor/wood,
/area/station/service/theater)
+"cCB" = (
+/obj/effect/turf_decal/trimline/purple/filled/line{
+ dir = 8
+ },
+/obj/structure/table/reinforced,
+/obj/item/stock_parts/matter_bin{
+ pixel_x = 3;
+ pixel_y = 3
+ },
+/obj/item/stock_parts/matter_bin,
+/obj/item/stock_parts/micro_laser,
+/obj/item/multitool,
+/obj/item/flatpack{
+ board = /obj/item/circuitboard/machine/flatpacker
+ },
+/turf/open/floor/iron/white,
+/area/station/science/lab)
"cCD" = (
/obj/effect/turf_decal/trimline/red/filled/line,
/obj/machinery/duct,
@@ -10721,31 +10707,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/commons/fitness/recreation)
-"cFH" = (
-/obj/structure/table/wood,
-/obj/structure/sign/picture_frame/showroom/two{
- pixel_x = 8;
- pixel_y = 32
- },
-/obj/structure/sign/picture_frame/showroom/one{
- pixel_x = -8;
- pixel_y = 32
- },
-/obj/item/storage/box/matches{
- pixel_x = -2;
- pixel_y = 3
- },
-/obj/item/cigarette/cigar{
- pixel_x = -4;
- pixel_y = 1
- },
-/obj/item/cigarette/cigar{
- pixel_x = 4;
- pixel_y = 1
- },
-/obj/item/cigarette/cigar/cohiba,
-/turf/open/floor/wood,
-/area/station/command/meeting_room)
"cFP" = (
/obj/effect/turf_decal/trimline/yellow/filled/line{
dir = 10
@@ -13432,6 +13393,14 @@
/obj/machinery/light/small/dim/directional/south,
/turf/open/floor/catwalk_floor,
/area/station/hallway/primary/tram/center)
+"dCQ" = (
+/obj/machinery/elevator_control_panel{
+ pixel_y = 2;
+ linked_elevator_id = "tram_xeno_lift";
+ preset_destination_names = list("2"="Lower Deck", "3"="Upper Deck")
+ },
+/turf/closed/wall/r_wall,
+/area/station/science/xenobiology)
"dCU" = (
/obj/effect/turf_decal/trimline/red/filled/line,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
@@ -13682,6 +13651,13 @@
},
/turf/open/floor/iron/dark,
/area/station/service/chapel/monastery)
+"dGP" = (
+/obj/structure/table,
+/obj/structure/extinguisher_cabinet/directional/north,
+/obj/machinery/cell_charger,
+/obj/item/stock_parts/power_store/cell/high,
+/turf/open/floor/iron,
+/area/station/ai_monitored/command/storage/eva)
"dHc" = (
/obj/structure/window/reinforced/spawner/directional/west,
/obj/structure/table,
@@ -15022,21 +14998,6 @@
/obj/effect/turf_decal/stripes/white/line,
/turf/open/floor/plating,
/area/station/maintenance/tram/left)
-"egx" = (
-/obj/structure/table/reinforced,
-/obj/item/stock_parts/power_store/cell/high{
- pixel_x = -5;
- pixel_y = 8
- },
-/obj/item/stock_parts/power_store/cell/high{
- pixel_x = 7;
- pixel_y = 8
- },
-/obj/item/stock_parts/power_store/cell/high,
-/obj/machinery/cell_charger,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/turf/open/floor/iron/dark,
-/area/station/science/robotics/lab)
"egD" = (
/obj/machinery/door/airlock/highsecurity{
name = "Prison Maintenance Access";
@@ -15112,11 +15073,6 @@
/obj/machinery/status_display/ai/directional/south,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/turret_protected/aisat_interior)
-"eiy" = (
-/obj/structure/table/reinforced,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible,
-/turf/open/floor/iron/dark,
-/area/station/science/xenobiology)
"eiR" = (
/obj/structure/disposalpipe/segment{
dir = 10
@@ -15947,13 +15903,6 @@
/obj/structure/cable,
/turf/open/floor/iron/freezer,
/area/station/medical/coldroom)
-"eyh" = (
-/obj/effect/turf_decal/siding/wood{
- dir = 8
- },
-/obj/machinery/computer/security/telescreen/minisat/directional/south,
-/turf/open/floor/carpet,
-/area/station/command/heads_quarters/captain)
"eyy" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
dir = 4
@@ -16584,6 +16533,10 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron,
/area/station/engineering/atmos)
+"eMw" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible,
+/turf/open/floor/engine/xenobio,
+/area/station/science/xenobiology)
"eMF" = (
/obj/structure/chair/office{
dir = 4
@@ -17289,6 +17242,16 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron,
/area/station/maintenance/port/central)
+"eZi" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 5
+ },
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+ dir = 8
+ },
+/obj/machinery/computer/security/telescreen/aiupload,
+/turf/open/floor/iron/white,
+/area/station/science/xenobiology)
"eZE" = (
/obj/effect/turf_decal/trimline/neutral/filled/line{
dir = 8
@@ -17402,6 +17365,16 @@
/obj/structure/cable,
/turf/open/floor/iron/dark,
/area/station/cargo/miningdock/oresilo)
+"fcZ" = (
+/obj/structure/table,
+/obj/machinery/cell_charger,
+/obj/item/storage/toolbox/electrical{
+ pixel_x = 4;
+ pixel_y = 9
+ },
+/obj/item/stock_parts/power_store/cell/high,
+/turf/open/floor/iron/dark,
+/area/station/science/explab)
"fdc" = (
/obj/machinery/brm,
/obj/machinery/conveyor{
@@ -19833,6 +19806,17 @@
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/station/hallway/secondary/entry)
+"fXk" = (
+/obj/effect/turf_decal/trimline/yellow/filled/line{
+ dir = 10
+ },
+/obj/structure/closet/radiation,
+/obj/effect/turf_decal/bot{
+ dir = 1
+ },
+/obj/machinery/computer/security/telescreen/engine/directional/south,
+/turf/open/floor/iron,
+/area/station/engineering/main)
"fXl" = (
/obj/effect/turf_decal/tile/neutral/tram,
/turf/open/indestructible/tram/plate,
@@ -19871,16 +19855,6 @@
/obj/structure/cable,
/turf/open/floor/plating,
/area/station/security/checkpoint/engineering)
-"fXX" = (
-/obj/effect/turf_decal/trimline/yellow/filled/line{
- dir = 8
- },
-/obj/structure/table,
-/obj/machinery/cell_charger,
-/obj/item/stock_parts/power_store/cell/high,
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/iron,
-/area/station/engineering/main)
"fXY" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/structure/cable,
@@ -20207,6 +20181,18 @@
"geG" = (
/turf/open/floor/iron,
/area/station/hallway/secondary/exit)
+"geK" = (
+/obj/machinery/camera{
+ dir = 9;
+ network = list("ss13","Security");
+ c_tag = "Security - Detective's Office"
+ },
+/obj/structure/cable,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
+/obj/machinery/light/warm/directional/north,
+/obj/machinery/firealarm/directional/north,
+/turf/open/floor/iron/grimy,
+/area/station/security/detectives_office)
"geX" = (
/obj/effect/turf_decal/trimline/neutral/filled/corner{
dir = 8
@@ -20323,6 +20309,13 @@
},
/turf/open/floor/iron/dark,
/area/station/service/chapel)
+"ggW" = (
+/obj/structure/rack,
+/obj/item/radio/intercom/directional/north,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/effect/spawner/random/armory/dragnet,
+/turf/open/floor/iron/dark,
+/area/station/ai_monitored/security/armory)
"ghg" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/catwalk_floor,
@@ -20610,6 +20603,16 @@
/obj/effect/turf_decal/trimline/tram/filled/warning,
/turf/open/floor/iron,
/area/station/hallway/primary/tram/right)
+"glK" = (
+/obj/structure/window/reinforced/spawner/directional/north,
+/obj/structure/chair/office/light{
+ dir = 4
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/turf/open/floor/iron/dark,
+/area/station/science/ordnance/testlab)
"glP" = (
/obj/structure/chair/plastic,
/turf/open/floor/eighties/red,
@@ -21156,6 +21159,24 @@
},
/turf/open/floor/iron,
/area/station/maintenance/disposal/incinerator)
+"gwA" = (
+/obj/structure/rack,
+/obj/structure/table,
+/obj/machinery/computer/security/telescreen/test_chamber/directional/north,
+/obj/item/storage/box/beakers{
+ pixel_x = 5;
+ pixel_y = 3
+ },
+/obj/item/grenade/chem_grenade{
+ pixel_x = -7;
+ pixel_y = 7
+ },
+/obj/item/grenade/chem_grenade{
+ pixel_x = -7;
+ pixel_y = 1
+ },
+/turf/open/floor/iron/dark,
+/area/station/science/explab)
"gwK" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/light/small/dim/directional/west,
@@ -21687,6 +21708,9 @@
/obj/structure/holosign/barrier/atmos/tram,
/turf/open/floor/plating,
/area/station/maintenance/tram/right)
+"gFD" = (
+/turf/open/floor/plating/airless,
+/area/space/nearstation)
"gFI" = (
/obj/machinery/door/airlock{
name = "Private Quarters N";
@@ -22577,6 +22601,9 @@
/obj/machinery/firealarm/directional/south,
/turf/open/floor/iron,
/area/station/hallway/secondary/exit/departure_lounge)
+"gXY" = (
+/turf/open/floor/engine/xenobio,
+/area/station/science/xenobiology)
"gYd" = (
/obj/machinery/rnd/production/techfab/department/security,
/obj/effect/turf_decal/trimline/red/filled/line{
@@ -23107,6 +23134,11 @@
},
/turf/open/floor/iron,
/area/station/security/prison/workout)
+"hiH" = (
+/obj/machinery/pdapainter/research,
+/obj/machinery/computer/security/telescreen/rd/directional/south,
+/turf/open/floor/iron/cafeteria,
+/area/station/command/heads_quarters/rd)
"hiR" = (
/obj/machinery/door/airlock{
name = "Bathroom"
@@ -23115,21 +23147,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/freezer,
/area/station/science/lower)
-"hiT" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/obj/structure/table,
-/obj/item/stack/sheet/glass/fifty,
-/obj/item/stack/sheet/iron/fifty,
-/obj/effect/turf_decal/trimline/yellow/filled/line{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/item/circuitboard/machine/crystallizer,
-/turf/open/floor/iron/dark,
-/area/station/engineering/atmospherics_engine)
"hiZ" = (
/obj/structure/bodycontainer/morgue/beeper_off,
/turf/open/floor/iron/dark,
@@ -23199,18 +23216,6 @@
},
/turf/open/floor/iron/white,
/area/station/science/xenobiology)
-"hks" = (
-/obj/effect/turf_decal/trimline/purple/filled/line{
- dir = 1
- },
-/obj/structure/table,
-/obj/machinery/cell_charger,
-/obj/item/stock_parts/power_store/cell/potato{
- pixel_x = 6;
- pixel_y = 10
- },
-/turf/open/floor/iron/white,
-/area/station/science/lobby)
"hkt" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/trimline/yellow/corner{
@@ -23534,6 +23539,17 @@
/obj/machinery/computer/security/telescreen/entertainment/directional/east,
/turf/open/floor/wood/large,
/area/station/service/barber)
+"hqw" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/trimline/neutral/filled/line{
+ dir = 4
+ },
+/obj/effect/turf_decal/bot,
+/obj/structure/closet/crate/preopen,
+/obj/item/stock_parts/power_store/cell/empty,
+/obj/effect/spawner/random/engineering/flashlight,
+/turf/open/floor/iron,
+/area/station/cargo/warehouse)
"hqN" = (
/obj/structure/weightmachine/weightlifter,
/obj/effect/turf_decal/tile/neutral/fourcorners,
@@ -23558,6 +23574,16 @@
/obj/structure/table/wood,
/turf/open/floor/wood,
/area/station/service/theater)
+"hrq" = (
+/obj/effect/turf_decal/trimline/yellow/filled/line{
+ dir = 8
+ },
+/obj/structure/table,
+/obj/machinery/cell_charger,
+/obj/item/stock_parts/power_store/cell/high,
+/obj/structure/disposalpipe/segment,
+/turf/open/floor/iron,
+/area/station/engineering/main)
"hrr" = (
/obj/structure/table/reinforced,
/obj/machinery/microwave/engineering/cell_included,
@@ -24033,19 +24059,6 @@
/obj/structure/cable/layer1,
/turf/open/floor/plating/airless,
/area/station/solars/starboard/fore)
-"hDF" = (
-/obj/machinery/computer/apc_control{
- dir = 1
- },
-/obj/machinery/requests_console/directional/south{
- name = "Chief Engineer's Request Console";
- department = "Chief Engineer's Desk"
- },
-/obj/effect/mapping_helpers/requests_console/announcement,
-/obj/effect/mapping_helpers/requests_console/supplies,
-/obj/machinery/computer/security/telescreen/engine/directional/west,
-/turf/open/floor/iron/dark,
-/area/station/command/heads_quarters/ce)
"hDI" = (
/turf/closed/wall/r_wall,
/area/station/engineering/supermatter)
@@ -24194,18 +24207,6 @@
},
/turf/open/floor/iron,
/area/station/cargo/storage)
-"hGd" = (
-/obj/effect/turf_decal/trimline/purple/filled/line{
- dir = 8
- },
-/obj/machinery/computer/security/telescreen/aiupload/directional/west,
-/obj/item/kirbyplants/photosynthetic,
-/obj/machinery/camera/directional/west{
- network = list("ss13","rd");
- c_tag = "Science - AI Access Hallway"
- },
-/turf/open/floor/iron/dark,
-/area/station/science/lower)
"hGt" = (
/obj/structure/table,
/obj/item/stack/sheet/glass/fifty,
@@ -25283,6 +25284,11 @@
},
/turf/open/floor/iron,
/area/station/science/robotics/mechbay)
+"ibA" = (
+/obj/structure/dresser,
+/obj/item/cigarette/cigar/havana,
+/turf/open/floor/iron/grimy,
+/area/station/commons/vacant_room)
"ibW" = (
/obj/effect/spawner/xmastree,
/turf/open/floor/carpet,
@@ -25352,6 +25358,16 @@
/obj/structure/chair/stool/directional/north,
/turf/open/floor/iron,
/area/station/science/robotics/mechbay)
+"icN" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/structure/cable,
+/obj/machinery/door/poddoor/preopen{
+ name = "Test Chamber Blast Door";
+ id = "Xenolab"
+ },
+/obj/structure/sign/warning/gas_mask/directional/north,
+/turf/open/floor/plating,
+/area/station/science/xenobiology)
"icO" = (
/obj/effect/turf_decal/siding/thinplating/corner,
/obj/item/banner/cargo/mundane,
@@ -26139,14 +26155,6 @@
},
/turf/open/floor/iron/stairs/medium,
/area/station/commons/dorms)
-"itq" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/obj/effect/turf_decal/siding/thinplating/corner,
-/obj/machinery/computer/security/telescreen/test_chamber/directional/north,
-/turf/open/floor/iron/dark,
-/area/station/science/xenobiology)
"itE" = (
/obj/modular_map_root/tramstation{
name = "atmoscilower";
@@ -26398,17 +26406,6 @@
/obj/machinery/status_display/evac/directional/east,
/turf/open/floor/circuit/green,
/area/station/ai_monitored/turret_protected/ai_upload)
-"ixH" = (
-/obj/structure/lattice/catwalk,
-/obj/structure/cable,
-/obj/structure/railing{
- dir = 4
- },
-/obj/structure/railing{
- dir = 8
- },
-/turf/open/space/openspace,
-/area/space)
"ixO" = (
/obj/structure/chair/comfy/brown{
dir = 8;
@@ -26528,13 +26525,6 @@
},
/turf/open/floor/plating,
/area/station/hallway/secondary/exit)
-"iAr" = (
-/obj/effect/turf_decal/bot,
-/obj/effect/spawner/random/structure/closet_empty/crate,
-/obj/effect/spawner/random/maintenance/two,
-/obj/item/stock_parts/power_store/cell/high/empty,
-/turf/open/floor/iron,
-/area/station/cargo/storage)
"iAt" = (
/obj/structure/lattice/catwalk,
/turf/open/openspace/airless,
@@ -28622,13 +28612,6 @@
},
/turf/open/floor/iron,
/area/station/cargo/storage)
-"jlQ" = (
-/obj/structure/rack,
-/obj/item/radio/intercom/directional/north,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/effect/spawner/random/armory/dragnet,
-/turf/open/floor/iron/dark,
-/area/station/ai_monitored/security/armory)
"jlX" = (
/obj/effect/turf_decal/trimline/red/filled/line{
dir = 8
@@ -29242,21 +29225,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/white,
/area/station/medical/virology)
-"jvW" = (
-/obj/structure/railing/corner{
- dir = 4
- },
-/obj/effect/turf_decal/trimline/red/filled/line,
-/obj/effect/turf_decal/trimline/red/corner{
- dir = 4
- },
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
- dir = 4
- },
-/obj/machinery/light/small/directional/south,
-/obj/item/radio/intercom/directional/south,
-/turf/open/floor/iron,
-/area/station/security/checkpoint/supply)
"jwa" = (
/obj/effect/turf_decal/trimline/brown/filled/line{
dir = 8
@@ -29640,6 +29608,24 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/cafeteria,
/area/station/security/prison/mess)
+"jCi" = (
+/obj/effect/turf_decal/trimline/brown/filled/line{
+ dir = 5
+ },
+/obj/effect/turf_decal/trimline/yellow/filled/warning{
+ dir = 5
+ },
+/obj/structure/cable,
+/obj/structure/table,
+/obj/item/multitool{
+ pixel_x = 8
+ },
+/obj/item/flatpack{
+ board = /obj/item/circuitboard/machine/flatpacker;
+ pixel_x = -5
+ },
+/turf/open/floor/iron,
+/area/station/engineering/break_room)
"jCn" = (
/obj/effect/turf_decal/trimline/neutral/filled/line{
dir = 1
@@ -30567,6 +30553,18 @@
},
/turf/open/floor/iron/dark,
/area/station/ai_monitored/command/nuke_storage)
+"jVK" = (
+/obj/effect/turf_decal/trimline/purple/filled/line{
+ dir = 1
+ },
+/obj/structure/table,
+/obj/machinery/cell_charger,
+/obj/item/stock_parts/power_store/cell/potato{
+ pixel_x = 6;
+ pixel_y = 10
+ },
+/turf/open/floor/iron/white,
+/area/station/science/lobby)
"jVT" = (
/obj/structure/table,
/obj/effect/turf_decal/trimline/neutral/filled/line{
@@ -31739,6 +31737,29 @@
/obj/machinery/newscaster/directional/south,
/turf/open/floor/iron,
/area/station/hallway/primary/tram/left)
+"klq" = (
+/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 = 9
+ },
+/obj/item/stock_parts/power_store/cell/high{
+ pixel_x = 8;
+ pixel_y = -2
+ },
+/obj/machinery/camera/directional/south{
+ network = list("ss13","rd");
+ c_tag = "Science - Testing Lab"
+ },
+/turf/open/floor/iron,
+/area/station/science/explab)
"kly" = (
/obj/structure/cable,
/obj/structure/disposalpipe/junction/flip{
@@ -31838,6 +31859,13 @@
/obj/structure/sink/kitchen/directional/south,
/turf/open/floor/iron/white,
/area/station/commons/vacant_room)
+"knq" = (
+/obj/structure/table/wood,
+/obj/structure/sign/flag/nanotrasen/directional/north,
+/obj/machinery/cell_charger,
+/obj/item/stock_parts/power_store/cell/crap,
+/turf/open/floor/wood,
+/area/station/command/meeting_room)
"knO" = (
/obj/effect/turf_decal/trimline/blue/filled/corner,
/obj/effect/turf_decal/trimline/blue/filled/corner{
@@ -31889,6 +31917,16 @@
},
/turf/open/floor/iron,
/area/station/hallway/secondary/exit)
+"koC" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+ dir = 8
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/machinery/computer/security/telescreen/ordnance/directional/south,
+/turf/open/floor/iron,
+/area/station/science/ordnance/testlab)
"kpd" = (
/obj/effect/turf_decal/trimline/blue/filled/corner,
/turf/open/floor/iron/white,
@@ -32118,14 +32156,6 @@
},
/turf/open/floor/iron,
/area/station/engineering/atmos)
-"ksk" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/obj/effect/turf_decal/siding/thinplating,
-/obj/effect/landmark/event_spawn,
-/turf/open/floor/iron/dark,
-/area/station/science/xenobiology)
"ksm" = (
/obj/machinery/door/airlock/atmos{
name = "Turbine Access"
@@ -32473,15 +32503,6 @@
/obj/structure/cable,
/turf/open/floor/iron/showroomfloor,
/area/station/security/lockers)
-"kzq" = (
-/obj/structure/table/reinforced,
-/obj/effect/turf_decal/trimline/red/filled/line{
- dir = 9
- },
-/obj/machinery/firealarm/directional/north,
-/obj/machinery/computer/security/telescreen/cargo_sec/directional/west,
-/turf/open/floor/iron,
-/area/station/security/checkpoint/supply)
"kzw" = (
/obj/effect/spawner/random/vending/snackvend,
/obj/effect/turf_decal/stripes/line{
@@ -32867,13 +32888,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/white,
/area/station/security/execution/education)
-"kGv" = (
-/obj/structure/disposaloutlet{
- dir = 1
- },
-/obj/structure/disposalpipe/trunk,
-/turf/open/floor/engine,
-/area/station/science/xenobiology)
"kGA" = (
/obj/structure/railing,
/obj/machinery/door/firedoor/border_only,
@@ -33514,13 +33528,6 @@
},
/turf/open/floor/iron/white,
/area/station/science/xenobiology)
-"kQP" = (
-/obj/structure/table,
-/obj/structure/extinguisher_cabinet/directional/north,
-/obj/machinery/cell_charger,
-/obj/item/stock_parts/power_store/cell/high,
-/turf/open/floor/iron,
-/area/station/ai_monitored/command/storage/eva)
"kQR" = (
/obj/structure/flora/bush/lavendergrass/style_random,
/obj/item/food/grown/banana/bunch{
@@ -33743,6 +33750,31 @@
},
/turf/open/floor/iron/white,
/area/station/science/lab)
+"kUb" = (
+/obj/structure/table/wood,
+/obj/structure/sign/picture_frame/showroom/two{
+ pixel_x = 8;
+ pixel_y = 32
+ },
+/obj/structure/sign/picture_frame/showroom/one{
+ pixel_x = -8;
+ pixel_y = 32
+ },
+/obj/item/storage/box/matches{
+ pixel_x = -2;
+ pixel_y = 3
+ },
+/obj/item/cigarette/cigar{
+ pixel_x = -4;
+ pixel_y = 1
+ },
+/obj/item/cigarette/cigar{
+ pixel_x = 4;
+ pixel_y = 1
+ },
+/obj/item/cigarette/cigar/cohiba,
+/turf/open/floor/wood,
+/area/station/command/meeting_room)
"kUg" = (
/obj/structure/reagent_dispensers/watertank/high,
/obj/structure/railing{
@@ -33992,6 +34024,23 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/white,
/area/station/medical/virology)
+"kXU" = (
+/obj/structure/rack,
+/obj/item/clothing/glasses/meson{
+ pixel_y = 4
+ },
+/obj/item/lighter,
+/obj/item/reagent_containers/pill/patch/aiuri,
+/obj/item/stock_parts/power_store/cell/high,
+/obj/effect/turf_decal/trimline/yellow/filled/line{
+ dir = 1
+ },
+/obj/structure/window/reinforced/spawner/directional/west,
+/obj/item/computer_disk/engineering,
+/obj/item/computer_disk/engineering,
+/obj/item/computer_disk/engineering,
+/turf/open/floor/iron,
+/area/station/command/heads_quarters/ce)
"kXZ" = (
/obj/machinery/door/airlock{
name = "Private Quarters L";
@@ -34642,6 +34691,16 @@
},
/turf/open/floor/iron,
/area/station/cargo/drone_bay)
+"llv" = (
+/obj/effect/turf_decal/trimline/brown/filled/corner{
+ dir = 1
+ },
+/obj/machinery/computer/security/telescreen/vault/directional/north,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+ dir = 4
+ },
+/turf/open/floor/iron,
+/area/station/command/heads_quarters/qm)
"llE" = (
/obj/effect/landmark/event_spawn,
/obj/effect/landmark/navigate_destination/kitchen,
@@ -35351,16 +35410,6 @@
},
/turf/open/floor/engine/plasma,
/area/station/engineering/atmos)
-"lxd" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 5
- },
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
- dir = 8
- },
-/obj/machinery/computer/security/telescreen/aiupload,
-/turf/open/floor/iron/white,
-/area/station/science/xenobiology)
"lxi" = (
/obj/structure/window/reinforced/spawner/directional/north,
/obj/structure/cable,
@@ -35988,11 +36037,6 @@
/obj/machinery/newscaster/directional/east,
/turf/open/floor/iron,
/area/station/commons/dorms)
-"lHJ" = (
-/obj/machinery/pdapainter/research,
-/obj/machinery/computer/security/telescreen/rd/directional/south,
-/turf/open/floor/iron/cafeteria,
-/area/station/command/heads_quarters/rd)
"lHU" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
@@ -37172,13 +37216,6 @@
},
/turf/open/floor/iron,
/area/station/hallway/secondary/command)
-"mbe" = (
-/obj/machinery/camera/motion/directional/south{
- network = list("ss13","minisat");
- c_tag = "Secure - AI Lower External North"
- },
-/turf/open/space/basic,
-/area/space)
"mbk" = (
/obj/effect/turf_decal/sand,
/obj/effect/turf_decal/trimline/red/filled/line{
@@ -37546,6 +37583,25 @@
/obj/structure/cable,
/turf/open/floor/engine,
/area/station/engineering/supermatter/room)
+"mgK" = (
+/obj/structure/table,
+/obj/item/clothing/gloves/color/yellow,
+/obj/item/clothing/gloves/color/yellow,
+/obj/item/clothing/gloves/color/yellow,
+/obj/item/clothing/gloves/color/yellow,
+/obj/item/clothing/gloves/color/yellow,
+/obj/item/storage/box/lights/mixed,
+/obj/item/stack/cable_coil,
+/obj/item/stock_parts/power_store/cell/emproof,
+/obj/item/stock_parts/power_store/cell/emproof,
+/obj/machinery/camera/emp_proof{
+ dir = 10;
+ network = list("ss13","engineering");
+ c_tag = "Engineering - SMES Misc"
+ },
+/obj/machinery/light/small/directional/west,
+/turf/open/floor/iron/dark,
+/area/station/engineering/engine_smes)
"mgS" = (
/turf/open/floor/iron/cafeteria,
/area/station/security/prison/mess)
@@ -37606,16 +37662,6 @@
/obj/effect/mapping_helpers/airlock/locked,
/turf/open/floor/plating,
/area/station/hallway/primary/tram/center)
-"mhJ" = (
-/obj/effect/turf_decal/trimline/brown/filled/corner{
- dir = 1
- },
-/obj/machinery/computer/security/telescreen/vault/directional/north,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/station/command/heads_quarters/qm)
"min" = (
/obj/effect/turf_decal/trimline/green/filled/line{
dir = 4
@@ -37663,12 +37709,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/carpet,
/area/station/command/heads_quarters/captain)
-"mjl" = (
-/obj/machinery/computer/security/telescreen/turbine/directional/east,
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/cable,
-/turf/open/floor/iron,
-/area/station/maintenance/disposal/incinerator)
"mjp" = (
/obj/structure/transport/linear/tram/corner/southeast,
/obj/structure/tram/spoiler{
@@ -38214,6 +38254,16 @@
},
/turf/open/floor/engine,
/area/station/science/xenobiology)
+"mug" = (
+/obj/machinery/camera/directional/north{
+ network = list("ss13","rd","xeno");
+ c_tag = "Science - Xenobiology Lower Containment Chamber"
+ },
+/obj/machinery/atmospherics/components/unary/outlet_injector/on{
+ dir = 4
+ },
+/turf/open/floor/engine/xenobio,
+/area/station/science/xenobiology)
"mur" = (
/obj/effect/turf_decal/trimline/brown/filled/line,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -38401,23 +38451,6 @@
/obj/machinery/light/dim/directional/east,
/turf/open/floor/iron,
/area/station/maintenance/port/central)
-"mzi" = (
-/obj/structure/rack,
-/obj/item/clothing/glasses/meson{
- pixel_y = 4
- },
-/obj/item/lighter,
-/obj/item/reagent_containers/pill/patch/aiuri,
-/obj/item/stock_parts/power_store/cell/high,
-/obj/effect/turf_decal/trimline/yellow/filled/line{
- dir = 1
- },
-/obj/structure/window/reinforced/spawner/directional/west,
-/obj/item/computer_disk/engineering,
-/obj/item/computer_disk/engineering,
-/obj/item/computer_disk/engineering,
-/turf/open/floor/iron,
-/area/station/command/heads_quarters/ce)
"mzs" = (
/obj/effect/turf_decal/trimline/neutral/filled/line{
dir = 8
@@ -38741,12 +38774,6 @@
},
/turf/open/floor/wood/large,
/area/station/service/theater)
-"mFh" = (
-/obj/machinery/sparker/directional/west{
- id = "Xenobio"
- },
-/turf/open/floor/engine,
-/area/station/science/xenobiology)
"mFo" = (
/obj/effect/turf_decal/trimline/red/filled/line{
dir = 4
@@ -38791,10 +38818,6 @@
"mGw" = (
/turf/closed/wall,
/area/station/service/barber)
-"mGB" = (
-/obj/structure/filingcabinet,
-/turf/open/floor/iron/grimy,
-/area/station/security/detectives_office)
"mGN" = (
/obj/effect/turf_decal/siding/thinplating/end,
/obj/machinery/button/door{
@@ -39678,6 +39701,10 @@
/obj/effect/turf_decal/trimline/tram/filled/warning,
/turf/open/floor/iron,
/area/station/hallway/primary/tram/center)
+"mYZ" = (
+/obj/structure/filingcabinet,
+/turf/open/floor/iron/grimy,
+/area/station/security/detectives_office)
"mZc" = (
/obj/machinery/atmospherics/pipe/bridge_pipe/dark/visible{
dir = 8
@@ -40263,6 +40290,21 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/white,
/area/station/science/xenobiology)
+"njk" = (
+/obj/structure/table/reinforced,
+/obj/item/stock_parts/power_store/cell/high{
+ pixel_x = -5;
+ pixel_y = 8
+ },
+/obj/item/stock_parts/power_store/cell/high{
+ pixel_x = 7;
+ pixel_y = 8
+ },
+/obj/item/stock_parts/power_store/cell/high,
+/obj/machinery/cell_charger,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/turf/open/floor/iron/dark,
+/area/station/science/robotics/lab)
"njl" = (
/obj/machinery/duct,
/obj/effect/turf_decal/trimline/neutral/filled/corner{
@@ -41099,6 +41141,17 @@
},
/turf/open/floor/iron,
/area/station/hallway/secondary/exit)
+"nxM" = (
+/obj/structure/table,
+/obj/machinery/requests_console/directional/east{
+ name = "EVA Requests Console";
+ department = "EVA"
+ },
+/obj/effect/mapping_helpers/requests_console/assistance,
+/obj/machinery/cell_charger,
+/obj/item/stock_parts/power_store/cell/high,
+/turf/open/floor/iron,
+/area/station/ai_monitored/command/storage/eva)
"nxN" = (
/obj/item/radio/intercom/directional/west,
/turf/open/floor/iron,
@@ -41450,19 +41503,6 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/iron/white,
/area/station/science/xenobiology)
-"nDR" = (
-/obj/effect/turf_decal/trimline/purple/filled/line{
- dir = 8
- },
-/obj/structure/table/reinforced,
-/obj/item/stock_parts/matter_bin{
- pixel_x = 3;
- pixel_y = 3
- },
-/obj/item/stock_parts/matter_bin,
-/obj/item/stock_parts/micro_laser,
-/turf/open/floor/iron/white,
-/area/station/science/lab)
"nDX" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -43503,6 +43543,12 @@
/obj/machinery/light/directional/east,
/turf/open/floor/iron,
/area/station/security/brig)
+"opV" = (
+/obj/machinery/sparker/directional/west{
+ id = "Xenobio"
+ },
+/turf/open/floor/engine/xenobio,
+/area/station/science/xenobiology)
"oqh" = (
/obj/effect/turf_decal/stripes/line{
dir = 10
@@ -43956,6 +44002,27 @@
},
/turf/open/space/openspace,
/area/station/solars/starboard/fore)
+"ozH" = (
+/obj/structure/table,
+/obj/effect/decal/cleanable/dirt,
+/obj/item/stock_parts/power_store/cell/crap/empty{
+ pixel_x = 6;
+ pixel_y = 10
+ },
+/obj/item/stock_parts/power_store/cell/crap/empty{
+ pixel_x = 6;
+ pixel_y = 2
+ },
+/obj/item/stock_parts/power_store/cell/crap/empty{
+ pixel_x = -7;
+ pixel_y = 7
+ },
+/obj/item/stock_parts/power_store/cell/crap/empty{
+ pixel_x = -2;
+ pixel_y = -2
+ },
+/turf/open/floor/iron/smooth,
+/area/station/security/mechbay)
"ozM" = (
/obj/structure/table/wood/poker,
/obj/item/storage/dice,
@@ -44177,6 +44244,18 @@
"oFd" = (
/turf/open/floor/iron,
/area/station/hallway/secondary/construction/engineering)
+"oFl" = (
+/obj/effect/turf_decal/trimline/purple/filled/line{
+ dir = 8
+ },
+/obj/machinery/computer/security/telescreen/aiupload/directional/west,
+/obj/item/kirbyplants/photosynthetic,
+/obj/machinery/camera/directional/west{
+ network = list("ss13","rd");
+ c_tag = "Science - AI Access Hallway"
+ },
+/turf/open/floor/iron/dark,
+/area/station/science/lower)
"oFo" = (
/obj/effect/turf_decal/trimline/neutral/filled/line{
dir = 8
@@ -44733,25 +44812,6 @@
/obj/machinery/light/warm/directional/south,
/turf/open/floor/wood,
/area/station/service/theater)
-"oSi" = (
-/obj/structure/table,
-/obj/item/clothing/gloves/color/yellow,
-/obj/item/clothing/gloves/color/yellow,
-/obj/item/clothing/gloves/color/yellow,
-/obj/item/clothing/gloves/color/yellow,
-/obj/item/clothing/gloves/color/yellow,
-/obj/item/storage/box/lights/mixed,
-/obj/item/stack/cable_coil,
-/obj/item/stock_parts/power_store/cell/emproof,
-/obj/item/stock_parts/power_store/cell/emproof,
-/obj/machinery/camera/emp_proof{
- dir = 10;
- network = list("ss13","engineering");
- c_tag = "Engineering - SMES Misc"
- },
-/obj/machinery/light/small/directional/west,
-/turf/open/floor/iron/dark,
-/area/station/engineering/engine_smes)
"oSl" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -44826,6 +44886,13 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/wood,
/area/station/command/heads_quarters/captain/private)
+"oTz" = (
+/obj/machinery/computer/security/telescreen/cmo/directional/north,
+/obj/effect/turf_decal/trimline/blue/filled/line{
+ dir = 4
+ },
+/turf/open/floor/iron/dark,
+/area/station/command/heads_quarters/cmo)
"oTA" = (
/turf/closed/wall,
/area/station/commons/fitness/recreation/entertainment)
@@ -45112,6 +45179,14 @@
},
/turf/open/floor/iron,
/area/station/security/brig)
+"oZE" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/thinplating/corner,
+/obj/machinery/computer/security/telescreen/test_chamber/directional/north,
+/turf/open/floor/iron/dark,
+/area/station/science/xenobiology)
"pal" = (
/obj/structure/disposalpipe/segment{
dir = 10
@@ -45348,13 +45423,6 @@
},
/turf/open/floor/iron/dark,
/area/station/command/bridge)
-"pdX" = (
-/obj/machinery/computer/security/telescreen/cmo/directional/north,
-/obj/effect/turf_decal/trimline/blue/filled/line{
- dir = 4
- },
-/turf/open/floor/iron/dark,
-/area/station/command/heads_quarters/cmo)
"pdZ" = (
/obj/machinery/door/airlock/research/glass{
name = "Robotics Lab"
@@ -46629,19 +46697,6 @@
/obj/effect/turf_decal/tile/bar/opposingcorners,
/turf/open/floor/iron,
/area/station/cargo/miningdock/cafeteria)
-"pzq" = (
-/obj/structure/table,
-/obj/item/stack/cable_coil{
- pixel_x = -3;
- pixel_y = 3
- },
-/obj/item/stack/cable_coil,
-/obj/item/stock_parts/power_store/cell/high,
-/obj/effect/turf_decal/trimline/white/filled/corner{
- dir = 4
- },
-/turf/open/floor/iron/dark,
-/area/station/engineering/storage/tech)
"pzv" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
dir = 8
@@ -46732,6 +46787,24 @@
/obj/effect/mapping_helpers/airlock/unres,
/turf/open/floor/iron/white,
/area/station/science/research)
+"pAM" = (
+/obj/machinery/power/apc/auto_name/directional/west,
+/obj/effect/turf_decal/trimline/red/filled/line{
+ dir = 10
+ },
+/obj/structure/cable,
+/obj/machinery/light_switch/directional/south{
+ pixel_x = 10;
+ pixel_y = -24
+ },
+/obj/machinery/button/door/directional/south{
+ id = "crgdoor";
+ req_access = list("brig_entrance");
+ name = "Cargo Cell Control";
+ normaldoorcontrol = 1
+ },
+/turf/open/floor/iron,
+/area/station/security/checkpoint/supply)
"pAR" = (
/obj/machinery/firealarm/directional/west,
/obj/effect/turf_decal/trimline/red/filled/line{
@@ -47571,16 +47644,6 @@
dir = 10
},
/area/station/service/chapel)
-"pPk" = (
-/obj/structure/window/reinforced/spawner/directional/north,
-/obj/structure/chair/office/light{
- dir = 4
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/turf/open/floor/iron/dark,
-/area/station/science/ordnance/testlab)
"pPn" = (
/obj/effect/turf_decal/trimline/purple/filled/corner{
dir = 8
@@ -47605,6 +47668,15 @@
},
/turf/open/floor/glass,
/area/station/commons/fitness/recreation)
+"pPF" = (
+/obj/structure/table/reinforced,
+/obj/effect/turf_decal/trimline/red/filled/line{
+ dir = 9
+ },
+/obj/machinery/firealarm/directional/north,
+/obj/machinery/computer/security/telescreen/cargo_sec/directional/west,
+/turf/open/floor/iron,
+/area/station/security/checkpoint/supply)
"pPN" = (
/obj/effect/turf_decal/trimline/dark_red/warning{
dir = 10
@@ -47628,29 +47700,6 @@
"pQx" = (
/turf/open/misc/asteroid/dug,
/area/station/science/explab)
-"pQy" = (
-/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 = 9
- },
-/obj/item/stock_parts/power_store/cell/high{
- pixel_x = 8;
- pixel_y = -2
- },
-/obj/machinery/camera/directional/south{
- network = list("ss13","rd");
- c_tag = "Science - Testing Lab"
- },
-/turf/open/floor/iron,
-/area/station/science/explab)
"pQF" = (
/obj/structure/table,
/obj/machinery/reagentgrinder,
@@ -47658,18 +47707,6 @@
/obj/effect/turf_decal/tile/green/fourcorners,
/turf/open/floor/iron/dark,
/area/station/service/hydroponics)
-"pQL" = (
-/obj/machinery/camera{
- dir = 9;
- network = list("ss13","Security");
- c_tag = "Security - Detective's Office"
- },
-/obj/structure/cable,
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
-/obj/machinery/light/warm/directional/north,
-/obj/machinery/firealarm/directional/north,
-/turf/open/floor/iron/grimy,
-/area/station/security/detectives_office)
"pQO" = (
/obj/machinery/atmospherics/components/binary/pump/on{
name = "Gas to Cooling Loop";
@@ -47851,6 +47888,12 @@
},
/turf/open/floor/carpet,
/area/station/command/heads_quarters/qm)
+"pUY" = (
+/obj/effect/turf_decal/trimline/neutral/filled/line{
+ dir = 5
+ },
+/turf/open/floor/iron/airless,
+/area/space/nearstation)
"pUZ" = (
/obj/effect/turf_decal/stripes/line,
/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible,
@@ -48072,6 +48115,13 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/catwalk_floor,
/area/station/maintenance/starboard/greater)
+"pZg" = (
+/obj/effect/turf_decal/bot,
+/obj/effect/spawner/random/structure/closet_empty/crate,
+/obj/effect/spawner/random/maintenance/two,
+/obj/item/stock_parts/power_store/cell/high/empty,
+/turf/open/floor/iron,
+/area/station/cargo/storage)
"pZr" = (
/mob/living/basic/mouse/brown/tom,
/turf/open/misc/asteroid,
@@ -48156,24 +48206,6 @@
"qas" = (
/turf/closed/wall/rust,
/area/station/hallway/primary/tram/center)
-"qaH" = (
-/obj/machinery/power/apc/auto_name/directional/west,
-/obj/effect/turf_decal/trimline/red/filled/line{
- dir = 10
- },
-/obj/structure/cable,
-/obj/machinery/light_switch/directional/south{
- pixel_x = 10;
- pixel_y = -24
- },
-/obj/machinery/button/door/directional/south{
- id = "crgdoor";
- req_access = list("brig_entrance");
- name = "Cargo Cell Control";
- normaldoorcontrol = 1
- },
-/turf/open/floor/iron,
-/area/station/security/checkpoint/supply)
"qaM" = (
/obj/machinery/holopad,
/obj/effect/turf_decal/bot,
@@ -48262,12 +48294,6 @@
/obj/structure/sign/calendar/directional/east,
/turf/open/floor/iron/dark,
/area/station/command/heads_quarters/ce)
-"qcE" = (
-/obj/machinery/camera/directional/north{
- c_tag = "Civilian - Restroom North"
- },
-/turf/open/floor/iron/freezer,
-/area/station/commons/toilet)
"qcG" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/iron/smooth,
@@ -48315,6 +48341,19 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/white,
/area/station/medical/medbay/central)
+"qdr" = (
+/obj/structure/closet/crate,
+/obj/item/stack/sheet/iron/fifty,
+/obj/item/stack/rods/fifty,
+/obj/item/stack/sheet/glass/fifty,
+/obj/item/electronics/airlock,
+/obj/item/electronics/airlock,
+/obj/item/stock_parts/power_store/cell/high,
+/obj/item/stack/sheet/mineral/plasma{
+ amount = 30
+ },
+/turf/open/floor/plating,
+/area/station/engineering/engine_smes)
"qdy" = (
/obj/structure/cable,
/turf/open/floor/iron,
@@ -48838,17 +48877,6 @@
},
/turf/open/floor/iron/white,
/area/station/science/xenobiology)
-"qlK" = (
-/obj/machinery/camera/directional/west{
- network = list("ss13","Security","cargo");
- c_tag = "Cargo - Security Outpost"
- },
-/obj/effect/turf_decal/trimline/red/filled/line{
- dir = 8
- },
-/obj/structure/cable,
-/turf/open/floor/iron,
-/area/station/security/checkpoint/supply)
"qmc" = (
/obj/effect/turf_decal/trimline/yellow/filled/line{
dir = 5
@@ -49022,14 +49050,6 @@
/obj/effect/landmark/start/prisoner,
/turf/open/floor/iron,
/area/station/security/prison)
-"qpr" = (
-/obj/structure/table/reinforced,
-/obj/machinery/cell_charger{
- pixel_y = 4
- },
-/obj/item/stock_parts/power_store/cell/high,
-/turf/open/floor/iron,
-/area/station/command/bridge)
"qpu" = (
/obj/effect/turf_decal/trimline/red/filled/corner{
dir = 8
@@ -49340,6 +49360,13 @@
/obj/machinery/light/small/directional/west,
/turf/open/floor/iron,
/area/station/security/prison/safe)
+"qvu" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 8
+ },
+/obj/machinery/computer/security/telescreen/minisat/directional/south,
+/turf/open/floor/carpet,
+/area/station/command/heads_quarters/captain)
"qvF" = (
/obj/effect/turf_decal/stripes/line{
dir = 6
@@ -49365,24 +49392,6 @@
},
/turf/open/floor/iron,
/area/station/security/prison/work)
-"qwn" = (
-/obj/effect/turf_decal/trimline/brown/filled/line{
- dir = 5
- },
-/obj/effect/turf_decal/trimline/yellow/filled/warning{
- dir = 5
- },
-/obj/structure/cable,
-/obj/structure/table,
-/obj/item/multitool{
- pixel_x = 8
- },
-/obj/item/flatpack{
- board = /obj/item/circuitboard/machine/flatpacker;
- pixel_x = -5
- },
-/turf/open/floor/iron,
-/area/station/engineering/break_room)
"qwq" = (
/obj/structure/table/wood,
/obj/item/radio/intercom,
@@ -49548,6 +49557,15 @@
},
/turf/open/floor/wood/large,
/area/station/service/theater)
+"qzB" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/thinplating,
+/obj/effect/landmark/event_spawn,
+/obj/effect/spawner/random/engineering/tracking_beacon,
+/turf/open/floor/iron/dark,
+/area/station/science/xenobiology)
"qzI" = (
/obj/structure/sign/warning/vacuum/external/directional/south,
/obj/effect/turf_decal/trimline/yellow/filled/line,
@@ -49861,6 +49879,12 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/wood,
/area/station/service/library)
+"qDB" = (
+/obj/machinery/computer/security/telescreen/turbine/directional/east,
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable,
+/turf/open/floor/iron,
+/area/station/maintenance/disposal/incinerator)
"qDF" = (
/obj/effect/turf_decal/trimline/blue/filled/line{
dir = 4
@@ -50199,18 +50223,6 @@
/obj/structure/cable,
/turf/open/floor/iron/dark,
/area/station/science/server)
-"qKW" = (
-/obj/structure/table/reinforced,
-/obj/machinery/keycard_auth/directional/south,
-/obj/item/rcl/pre_loaded,
-/obj/machinery/computer/security/telescreen/ce/directional/west,
-/obj/effect/turf_decal/trimline/yellow/filled/line{
- dir = 1
- },
-/obj/item/clipboard,
-/obj/item/paper/monitorkey,
-/turf/open/floor/iron/dark,
-/area/station/command/heads_quarters/ce)
"qLD" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -50448,17 +50460,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/commons/dorms)
-"qPQ" = (
-/obj/effect/turf_decal/trimline/yellow/filled/line{
- dir = 10
- },
-/obj/structure/closet/radiation,
-/obj/effect/turf_decal/bot{
- dir = 1
- },
-/obj/machinery/computer/security/telescreen/engine/directional/south,
-/turf/open/floor/iron,
-/area/station/engineering/main)
"qPV" = (
/obj/machinery/power/apc/auto_name/directional/south,
/obj/structure/cable,
@@ -50514,6 +50515,21 @@
},
/turf/open/floor/wood,
/area/station/commons/dorms)
+"qRj" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/structure/table,
+/obj/item/stack/sheet/glass/fifty,
+/obj/item/stack/sheet/iron/fifty,
+/obj/effect/turf_decal/trimline/yellow/filled/line{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/item/circuitboard/machine/crystallizer,
+/turf/open/floor/iron/dark,
+/area/station/engineering/atmospherics_engine)
"qRn" = (
/obj/machinery/vending/assist,
/obj/effect/turf_decal/trimline/white/filled/line,
@@ -50760,26 +50776,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron,
/area/station/hallway/primary/tram/left)
-"qVL" = (
-/obj/structure/table,
-/obj/item/assembly/igniter{
- pixel_x = -5;
- pixel_y = 3
- },
-/obj/item/assembly/igniter{
- pixel_x = 5;
- pixel_y = -4
- },
-/obj/item/assembly/igniter{
- pixel_x = 2;
- pixel_y = 6
- },
-/obj/item/assembly/igniter{
- pixel_x = 2;
- pixel_y = -1
- },
-/turf/open/floor/engine,
-/area/station/science/xenobiology)
"qVN" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -51388,6 +51384,14 @@
/obj/effect/landmark/navigate_destination/aiupload,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/turret_protected/ai_upload)
+"reJ" = (
+/obj/structure/table/reinforced,
+/obj/machinery/cell_charger{
+ pixel_y = 4
+ },
+/obj/item/stock_parts/power_store/cell/high,
+/turf/open/floor/iron,
+/area/station/command/bridge)
"reU" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/camera/directional/south{
@@ -52897,16 +52901,6 @@
/obj/structure/sign/clock/directional/north,
/turf/open/floor/iron,
/area/station/security/prison)
-"rKD" = (
-/obj/structure/table,
-/obj/machinery/cell_charger,
-/obj/item/storage/toolbox/electrical{
- pixel_x = 4;
- pixel_y = 9
- },
-/obj/item/stock_parts/power_store/cell/high,
-/turf/open/floor/iron/dark,
-/area/station/science/explab)
"rKL" = (
/obj/machinery/newscaster/directional/east,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -53512,6 +53506,16 @@
/obj/item/toy/plush/goatplushie,
/turf/open/floor/iron/white,
/area/station/commons/vacant_room)
+"rSL" = (
+/obj/effect/turf_decal/trimline/red/filled/line{
+ dir = 6
+ },
+/obj/machinery/computer/security/telescreen/prison/directional/east,
+/obj/structure/disposalpipe/segment{
+ dir = 9
+ },
+/turf/open/floor/iron,
+/area/station/security/office)
"rTm" = (
/obj/structure/sign/warning/vacuum/external{
pixel_x = 32
@@ -53610,6 +53614,19 @@
},
/turf/open/floor/iron/cafeteria,
/area/station/commons/dorms/laundry)
+"rVw" = (
+/obj/structure/table,
+/obj/item/stack/cable_coil{
+ pixel_x = -3;
+ pixel_y = 3
+ },
+/obj/item/stack/cable_coil,
+/obj/item/stock_parts/power_store/cell/high,
+/obj/effect/turf_decal/trimline/white/filled/corner{
+ dir = 4
+ },
+/turf/open/floor/iron/dark,
+/area/station/engineering/storage/tech)
"rVD" = (
/obj/effect/turf_decal/trimline/green/corner,
/obj/effect/turf_decal/trimline/green/corner{
@@ -53756,9 +53773,6 @@
},
/turf/open/floor/iron/dark,
/area/station/medical/storage)
-"rYE" = (
-/turf/open/floor/plating/airless,
-/area/space)
"rYL" = (
/obj/structure/chair/comfy/black{
dir = 8
@@ -54034,11 +54048,24 @@
/obj/machinery/light/directional/east,
/turf/open/floor/iron,
/area/station/commons/fitness)
+"sdJ" = (
+/obj/effect/spawner/random/medical/two_percent_xeno_egg_spawner,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible,
+/obj/machinery/light/directional/north,
+/turf/open/floor/engine/xenobio,
+/area/station/science/xenobiology)
"sdK" = (
/obj/machinery/duct,
/obj/effect/decal/cleanable/food/flour,
/turf/open/floor/iron/cafeteria,
/area/station/service/kitchen)
+"sdV" = (
+/obj/structure/disposaloutlet{
+ dir = 1
+ },
+/obj/structure/disposalpipe/trunk,
+/turf/open/floor/engine/xenobio,
+/area/station/science/xenobiology)
"sed" = (
/obj/effect/turf_decal/trimline/dark_green/filled/line{
dir = 10
@@ -54277,12 +54304,6 @@
/obj/structure/cable,
/turf/open/floor/iron/white,
/area/station/science/lower)
-"siX" = (
-/obj/effect/turf_decal/trimline/neutral/filled/line{
- dir = 5
- },
-/turf/open/floor/iron/airless,
-/area/space)
"siZ" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -54329,6 +54350,17 @@
/obj/machinery/light/directional/south,
/turf/open/floor/iron/dark,
/area/station/science/robotics/lab)
+"sjx" = (
+/obj/structure/lattice/catwalk,
+/obj/structure/cable,
+/obj/structure/railing{
+ dir = 4
+ },
+/obj/structure/railing{
+ dir = 8
+ },
+/turf/open/space/openspace,
+/area/space/nearstation)
"sjE" = (
/obj/effect/turf_decal/trimline/yellow/filled/line{
dir = 8
@@ -54939,13 +54971,6 @@
},
/turf/open/floor/iron,
/area/station/hallway/secondary/entry)
-"stg" = (
-/obj/structure/table/wood,
-/obj/structure/sign/flag/nanotrasen/directional/north,
-/obj/machinery/cell_charger,
-/obj/item/stock_parts/power_store/cell/crap,
-/turf/open/floor/wood,
-/area/station/command/meeting_room)
"stk" = (
/turf/open/floor/iron/smooth,
/area/station/maintenance/department/science)
@@ -56787,6 +56812,19 @@
"tby" = (
/turf/open/floor/iron/white,
/area/station/science/research)
+"tbA" = (
+/obj/machinery/computer/apc_control{
+ dir = 1
+ },
+/obj/machinery/requests_console/directional/south{
+ name = "Chief Engineer's Request Console";
+ department = "Chief Engineer's Desk"
+ },
+/obj/effect/mapping_helpers/requests_console/announcement,
+/obj/effect/mapping_helpers/requests_console/supplies,
+/obj/machinery/computer/security/telescreen/engine/directional/west,
+/turf/open/floor/iron/dark,
+/area/station/command/heads_quarters/ce)
"tbK" = (
/obj/structure/table,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -57757,10 +57795,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/wood,
/area/station/command/heads_quarters/captain/private)
-"ttj" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible,
-/turf/open/floor/engine,
-/area/station/science/xenobiology)
"tto" = (
/obj/machinery/hydroponics/constructable,
/obj/effect/turf_decal/trimline/green/line{
@@ -57795,17 +57829,6 @@
},
/turf/open/floor/iron,
/area/station/cargo/miningdock)
-"ttS" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/trimline/neutral/filled/line{
- dir = 4
- },
-/obj/effect/turf_decal/bot,
-/obj/structure/closet/crate/preopen,
-/obj/item/stock_parts/power_store/cell/empty,
-/obj/effect/spawner/random/engineering/flashlight,
-/turf/open/floor/iron,
-/area/station/cargo/warehouse)
"tuf" = (
/obj/structure/window/reinforced/spawner/directional/east,
/obj/structure/table,
@@ -58220,14 +58243,6 @@
/obj/machinery/disposal/bin,
/turf/open/floor/iron/white,
/area/station/science/xenobiology)
-"tBo" = (
-/obj/structure/table,
-/obj/item/stack/sheet/iron{
- amount = 10
- },
-/obj/item/electropack,
-/turf/open/floor/engine,
-/area/station/science/xenobiology)
"tBu" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/door/airlock/external{
@@ -58291,9 +58306,6 @@
},
/turf/open/floor/iron,
/area/station/cargo/storage)
-"tCf" = (
-/turf/open/misc/asteroid/airless,
-/area/space)
"tCi" = (
/turf/open/floor/iron/dark,
/area/station/service/chapel/monastery)
@@ -58386,16 +58398,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/dark,
/area/station/service/chapel/office)
-"tEx" = (
-/obj/machinery/camera/directional/north{
- network = list("ss13","rd","xeno");
- c_tag = "Science - Xenobiology Lower Containment Chamber"
- },
-/obj/machinery/atmospherics/components/unary/outlet_injector/on{
- dir = 4
- },
-/turf/open/floor/engine,
-/area/station/science/xenobiology)
"tED" = (
/obj/effect/turf_decal/tile/neutral/tram,
/obj/effect/turf_decal/stripes/white/line,
@@ -59178,6 +59180,13 @@
/obj/machinery/light/directional/north,
/turf/open/floor/engine,
/area/station/engineering/supermatter/room)
+"tSC" = (
+/obj/machinery/camera/motion/directional/south{
+ network = list("ss13","minisat");
+ c_tag = "Secure - AI Lower External North"
+ },
+/turf/open/space/basic,
+/area/space/nearstation)
"tTc" = (
/obj/effect/turf_decal/caution/stand_clear/white{
dir = 1
@@ -59868,15 +59877,6 @@
"ufO" = (
/turf/open/floor/iron,
/area/station/commons/fitness/recreation)
-"ugd" = (
-/obj/structure/table,
-/obj/machinery/cell_charger,
-/obj/item/stock_parts/power_store/cell/high,
-/obj/effect/turf_decal/trimline/white/filled/line{
- dir = 1
- },
-/turf/open/floor/iron/dark,
-/area/station/engineering/storage/tech)
"ugf" = (
/obj/structure/bed{
dir = 8
@@ -62774,6 +62774,11 @@
},
/turf/open/floor/wood/parquet,
/area/station/medical/psychology)
+"vam" = (
+/obj/structure/table/reinforced,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible,
+/turf/open/floor/iron/dark,
+/area/station/science/xenobiology)
"vaq" = (
/obj/structure/ladder,
/obj/effect/decal/cleanable/dirt,
@@ -63919,6 +63924,17 @@
},
/turf/open/floor/iron/dark,
/area/station/engineering/atmospherics_engine)
+"vsY" = (
+/obj/machinery/camera/directional/west{
+ network = list("ss13","Security","cargo");
+ c_tag = "Cargo - Security Outpost"
+ },
+/obj/effect/turf_decal/trimline/red/filled/line{
+ dir = 8
+ },
+/obj/structure/cable,
+/turf/open/floor/iron,
+/area/station/security/checkpoint/supply)
"vtb" = (
/obj/machinery/door/firedoor,
/obj/effect/turf_decal/stripes/white/full,
@@ -65841,6 +65857,13 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/commons/fitness/recreation)
+"wed" = (
+/obj/structure/railing{
+ dir = 4
+ },
+/obj/machinery/netpod,
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/station/cargo/bitrunning/den)
"wei" = (
/obj/effect/turf_decal/trimline/red/filled/corner,
/obj/effect/turf_decal/trimline/red/filled/corner{
@@ -66315,19 +66338,6 @@
},
/turf/open/floor/iron/dark,
/area/station/service/chapel/monastery)
-"wnM" = (
-/obj/structure/closet/crate,
-/obj/item/stack/sheet/iron/fifty,
-/obj/item/stack/rods/fifty,
-/obj/item/stack/sheet/glass/fifty,
-/obj/item/electronics/airlock,
-/obj/item/electronics/airlock,
-/obj/item/stock_parts/power_store/cell/high,
-/obj/item/stack/sheet/mineral/plasma{
- amount = 30
- },
-/turf/open/floor/plating,
-/area/station/engineering/engine_smes)
"wnP" = (
/obj/machinery/door/airlock/hatch{
name = "Emergency Exit"
@@ -66496,32 +66506,6 @@
},
/turf/open/floor/iron,
/area/station/hallway/secondary/service)
-"wrz" = (
-/obj/structure/rack,
-/obj/structure/table,
-/obj/machinery/computer/security/telescreen/test_chamber/directional/north,
-/obj/item/storage/box/beakers{
- pixel_x = 5;
- pixel_y = 3
- },
-/obj/item/grenade/chem_grenade{
- pixel_x = -7;
- pixel_y = 7
- },
-/obj/item/grenade/chem_grenade{
- pixel_x = -7;
- pixel_y = 1
- },
-/turf/open/floor/iron/dark,
-/area/station/science/explab)
-"wrJ" = (
-/obj/structure/railing{
- dir = 4;
- layer = 3.1
- },
-/obj/machinery/netpod,
-/turf/open/floor/catwalk_floor/iron_dark,
-/area/station/cargo/bitrunning/den)
"wrT" = (
/obj/structure/table/glass,
/obj/item/grenade/chem_grenade,
@@ -67042,27 +67026,6 @@
/obj/structure/reagent_dispensers/foamtank,
/turf/open/floor/iron,
/area/station/engineering/atmos)
-"wAH" = (
-/obj/structure/table,
-/obj/effect/decal/cleanable/dirt,
-/obj/item/stock_parts/power_store/cell/crap/empty{
- pixel_x = 6;
- pixel_y = 10
- },
-/obj/item/stock_parts/power_store/cell/crap/empty{
- pixel_x = 6;
- pixel_y = 2
- },
-/obj/item/stock_parts/power_store/cell/crap/empty{
- pixel_x = -7;
- pixel_y = 7
- },
-/obj/item/stock_parts/power_store/cell/crap/empty{
- pixel_x = -2;
- pixel_y = -2
- },
-/turf/open/floor/iron/smooth,
-/area/station/security/mechbay)
"wAI" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -67410,6 +67373,14 @@
/obj/structure/railing,
/turf/open/floor/plating/elevatorshaft,
/area/station/science/lower)
+"wHE" = (
+/obj/machinery/elevator_control_panel{
+ pixel_y = 2;
+ linked_elevator_id = "tram_xeno_lift";
+ preset_destination_names = list("2"="Lower Deck", "3"="Upper Deck")
+ },
+/turf/closed/wall,
+/area/station/science/xenobiology)
"wHH" = (
/obj/structure/cable,
/obj/structure/disposalpipe/segment,
@@ -67469,10 +67440,6 @@
/obj/effect/landmark/event_spawn,
/turf/open/floor/iron/cafeteria,
/area/station/security/prison/mess)
-"wIP" = (
-/obj/structure/lattice,
-/turf/open/space/openspace,
-/area/space)
"wIT" = (
/obj/structure/chair/wood,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -69281,12 +69248,6 @@
},
/turf/open/floor/iron/white,
/area/station/medical/medbay/central)
-"xut" = (
-/obj/machinery/camera/directional/south{
- c_tag = "Civilian - Restroom South"
- },
-/turf/open/floor/iron/freezer,
-/area/station/commons/toilet)
"xuA" = (
/obj/structure/closet/secure_closet/medical2,
/obj/effect/turf_decal/trimline/blue/filled/line{
@@ -69612,15 +69573,6 @@
},
/turf/open/floor/iron,
/area/station/cargo/storage)
-"xAM" = (
-/obj/machinery/elevator_control_panel{
- layer = 3.1;
- pixel_y = 2;
- linked_elevator_id = "tram_xeno_lift";
- preset_destination_names = list("2"="Lower Deck", "3"="Upper Deck")
- },
-/turf/closed/wall/r_wall,
-/area/station/science/xenobiology)
"xAR" = (
/obj/machinery/door/airlock/security{
name = "Prison Workshop"
@@ -70428,10 +70380,6 @@
/obj/machinery/light/small/dim/directional/west,
/turf/open/floor/iron,
/area/station/maintenance/tram/left)
-"xRm" = (
-/obj/structure/lattice,
-/turf/open/space/basic,
-/area/space)
"xRn" = (
/turf/open/floor/plating,
/area/station/hallway/secondary/service)
@@ -85064,12 +85012,12 @@ apC
apC
veV
veV
-qcE
+hAD
hAD
veV
pdr
kMD
-xut
+hAD
veV
veV
apC
@@ -99202,7 +99150,7 @@ jIG
jHb
tPW
tPW
-oSi
+mgK
jIG
abM
abM
@@ -99965,7 +99913,7 @@ mOW
iwV
nav
fEK
-ugd
+bmd
pkp
jYz
kSp
@@ -100481,7 +100429,7 @@ bUj
kdb
yih
pkp
-wnM
+qdr
ifX
iRe
wJt
@@ -100990,7 +100938,7 @@ abM
jnq
jIy
tsa
-pzq
+rVw
hJa
kdb
msU
@@ -101526,10 +101474,10 @@ lku
oxs
sna
gRQ
-fXX
+hrq
cuQ
arO
-qPQ
+fXk
qHs
asA
bWN
@@ -103067,7 +103015,7 @@ kHR
tga
rnf
xBD
-qKW
+bCb
sHH
sHH
sHH
@@ -103326,7 +103274,7 @@ pTl
ozd
eOP
wGk
-hDF
+tbA
sHH
ydk
qHs
@@ -103824,7 +103772,7 @@ ixT
gYI
cgR
ial
-qwn
+jCi
amV
mvy
iXQ
@@ -103834,7 +103782,7 @@ dor
fSp
vKv
roB
-mzi
+kXU
iHK
bAK
jsW
@@ -106091,7 +106039,7 @@ pCM
kzx
oSl
kzx
-coV
+bJN
alg
aes
khE
@@ -111297,14 +111245,14 @@ ibY
ibY
ibY
ibY
-hiT
+qRj
gjj
rCd
pts
gEs
nXQ
rnA
-mjl
+qDB
atX
wAQ
qWU
@@ -117213,7 +117161,7 @@ hDT
keT
iEF
fof
-aoN
+wHE
knb
hQk
aHT
@@ -118236,7 +118184,7 @@ qVr
qVr
kkx
cJP
-lxd
+eZi
mLE
dGs
dGs
@@ -118986,7 +118934,7 @@ cJS
nhj
cVU
oRz
-pQy
+klq
sQZ
nhj
prI
@@ -119240,7 +119188,7 @@ owO
owO
owO
cJS
-rKD
+fcZ
cVU
cFW
cFW
@@ -119497,7 +119445,7 @@ sQZ
sQZ
sQZ
sQZ
-wrz
+gwA
hIY
tVK
vIF
@@ -119809,7 +119757,7 @@ vXM
vXM
vXM
vXM
-mbe
+tSC
xvl
fLB
xly
@@ -120295,7 +120243,7 @@ lxW
iix
qQa
vtd
-hGd
+oFl
iGF
xkg
tXA
@@ -124138,7 +124086,7 @@ kNE
nMB
qAl
nMB
-bGP
+koC
frV
wco
lwt
@@ -124650,7 +124598,7 @@ ign
olR
vvF
vjA
-pPk
+glK
dWM
ign
ign
@@ -130869,8 +130817,8 @@ vXM
vXM
vXM
vXM
-xRm
-rYE
+pHM
+gFD
vXM
vXM
vXM
@@ -131125,9 +131073,9 @@ vXM
vXM
vXM
vXM
-xRm
-rYE
-rYE
+pHM
+gFD
+gFD
vXM
vXM
vXM
@@ -131382,9 +131330,9 @@ vXM
vXM
vXM
vXM
-xRm
-siX
-xRm
+pHM
+pUY
+pHM
vXM
vXM
vXM
@@ -131640,7 +131588,7 @@ vXM
vXM
vXM
vXM
-xRm
+pHM
vXM
vXM
vXM
@@ -143725,7 +143673,7 @@ aaa
aaa
gcp
agw
-agG
+ibA
gcp
aaa
aaa
@@ -150804,7 +150752,7 @@ fLY
tFk
kcV
xNL
-wAH
+ozH
tFk
aaa
aaa
@@ -151072,8 +151020,8 @@ hzN
hzN
hzN
hzN
-kQP
-asI
+dGP
+nxM
rcx
hzN
xQv
@@ -154668,7 +154616,7 @@ mwg
ceF
avX
qyZ
-stg
+knq
joF
kSZ
bvq
@@ -156187,7 +156135,7 @@ aaa
aaa
aaa
dEv
-jlQ
+ggW
sne
ubk
hgn
@@ -156467,7 +156415,7 @@ blo
fxK
lpg
qyZ
-cFH
+kUb
xcH
oho
bPp
@@ -156482,7 +156430,7 @@ aQO
rup
wzm
rAh
-qpr
+reJ
eUy
mgq
nhV
@@ -158252,7 +158200,7 @@ wbH
wbH
qPI
cQM
-bTI
+rSL
ppr
gki
cGg
@@ -158536,9 +158484,9 @@ kOr
cvf
iUw
moq
-eyh
+qvu
xEo
-mGB
+mYZ
aCS
pIl
gdF
@@ -158795,7 +158743,7 @@ aBt
crE
tEl
xEo
-pQL
+geK
kyq
pIl
dUl
@@ -159635,7 +159583,7 @@ opb
oOJ
oOJ
stK
-ixH
+sjx
sOg
oOJ
uXM
@@ -161438,7 +161386,7 @@ pMW
pMW
pMW
sdb
-wIP
+avE
pMW
pMW
pMW
@@ -166544,7 +166492,7 @@ gnM
apC
abM
mBq
-pdX
+oTz
kHy
fxM
qUL
@@ -179869,7 +179817,7 @@ abM
abM
abM
usY
-kzq
+pPF
tJR
usY
abM
@@ -180127,7 +180075,7 @@ abM
abM
usY
kiT
-jvW
+czC
usY
usY
usY
@@ -180153,7 +180101,7 @@ ixu
eeE
muZ
gSF
-egx
+njk
uje
dLO
dLO
@@ -180366,7 +180314,7 @@ aaa
aaa
eSQ
eSQ
-wrJ
+wed
dRY
cTU
cTU
@@ -180385,8 +180333,8 @@ lZW
usY
mgh
uYZ
-qlK
-qaH
+vsY
+pAM
vUE
bMb
kdz
@@ -180890,7 +180838,7 @@ uax
uax
mur
qza
-mhJ
+llv
aAJ
riJ
aAJ
@@ -181171,7 +181119,7 @@ mEd
kuq
aHq
lfQ
-hks
+jVK
aHQ
tFB
vnu
@@ -181951,7 +181899,7 @@ oxL
fJQ
mlM
bxG
-nDR
+cCB
fFR
tPZ
pqV
@@ -181969,9 +181917,9 @@ uvU
umu
qVr
qVr
-mFh
-bfH
-bfH
+opV
+gXY
+gXY
qVr
gYw
cHY
@@ -182225,14 +182173,14 @@ pbH
mAL
nKU
qVr
-tEx
-bfH
-bfH
-bfH
+mug
+gXY
+gXY
+gXY
qVr
-pNa
-eiy
-itq
+icN
+vam
+oZE
qyQ
qyQ
gun
@@ -182422,7 +182370,7 @@ cdy
iWz
hFV
gDr
-iAr
+pZg
uax
axG
bTx
@@ -182482,11 +182430,11 @@ pbH
bmz
pIx
qVr
-ttj
-bfH
-bfH
-bfH
-bfH
+eMw
+gXY
+gXY
+gXY
+gXY
pNa
qNk
xmY
@@ -182495,7 +182443,7 @@ eJQ
bNx
aSt
aSt
-xAM
+dCQ
aaa
aaa
aaa
@@ -182739,14 +182687,14 @@ qKE
chE
pHX
qVr
-cAK
-ttj
-bhf
-ttj
-ttj
+sdJ
+eMw
+eMw
+eMw
+eMw
nzg
cwj
-ksk
+qzB
bsh
rQr
aMh
@@ -182996,11 +182944,11 @@ pbH
kBo
kJA
qVr
-bfH
-bfH
-bfH
-bfH
-kGv
+gXY
+gXY
+gXY
+gXY
+sdV
qSS
cFQ
xmY
@@ -183248,15 +183196,15 @@ kye
tes
kye
kye
-lHJ
+hiH
pbH
mAL
nKU
qVr
-bfH
-bfH
-bfH
-bfH
+gXY
+gXY
+gXY
+gXY
qVr
jqK
ijR
@@ -183511,9 +183459,9 @@ vSa
cJR
qVr
qVr
-cdM
-qVL
-tBo
+gXY
+gXY
+gXY
qVr
gYw
vav
@@ -185253,7 +185201,7 @@ udQ
udQ
aWL
tft
-ttS
+hqw
qyg
utY
fHV
@@ -190956,7 +190904,7 @@ pMW
pMW
pMW
iLP
-tCf
+aac
iLP
pMW
pMW
diff --git a/_maps/map_files/wawastation/wawastation.dmm b/_maps/map_files/wawastation/wawastation.dmm
index 43b845a5acf37..bfdf5b0e1d448 100644
--- a/_maps/map_files/wawastation/wawastation.dmm
+++ b/_maps/map_files/wawastation/wawastation.dmm
@@ -48,6 +48,12 @@
/obj/structure/window/spawner/directional/north,
/turf/open/floor/iron/dark,
/area/station/commons/fitness/recreation)
+"abf" = (
+/obj/structure/window/reinforced/spawner/directional/west,
+/obj/structure/stairs/north,
+/obj/structure/window/reinforced/spawner/directional/east,
+/turf/open/floor/iron/dark/textured_large,
+/area/station/engineering/storage/tech)
"abh" = (
/obj/machinery/atmospherics/pipe/smart/simple/purple/visible{
dir = 6
@@ -129,6 +135,18 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/command/gateway)
+"abP" = (
+/obj/effect/turf_decal/caution/stand_clear/red,
+/obj/effect/turf_decal/stripes/line,
+/obj/machinery/door/poddoor/shutters/window/preopen{
+ id = "ordstorage"
+ },
+/obj/structure/cable,
+/obj/effect/turf_decal/stripes/corner{
+ dir = 1
+ },
+/turf/open/floor/iron/white,
+/area/station/science/ordnance/storage)
"abX" = (
/obj/machinery/door/airlock/public/glass{
name = "Library"
@@ -581,19 +599,6 @@
},
/turf/open/floor/iron/textured_large,
/area/station/medical/treatment_center)
-"ajs" = (
-/obj/machinery/door/poddoor/shutters/window{
- id = "ordauxgarage";
- dir = 1
- },
-/obj/effect/turf_decal/caution/stand_clear,
-/obj/effect/turf_decal/sand/plating,
-/obj/effect/turf_decal/stripes/asteroid/line,
-/obj/effect/turf_decal/stripes/asteroid/line{
- dir = 1
- },
-/turf/open/floor/plating,
-/area/station/science/ordnance)
"ajK" = (
/obj/machinery/door/firedoor,
/obj/effect/landmark/navigate_destination/bar,
@@ -950,6 +955,13 @@
},
/turf/open/floor/iron/dark/textured,
/area/station/medical/morgue)
+"apl" = (
+/obj/structure/chair/wood{
+ dir = 1
+ },
+/obj/machinery/light/small/directional/east,
+/turf/open/floor/carpet,
+/area/station/commons/dorms)
"apx" = (
/obj/structure/table/reinforced,
/obj/structure/desk_bell,
@@ -979,14 +991,6 @@
"apQ" = (
/turf/closed/wall,
/area/station/service/library)
-"apW" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/spawner/random/structure/closet_empty/crate,
-/obj/item/stock_parts/power_store/cell,
-/obj/structure/broken_flooring,
-/obj/machinery/airalarm/directional/north,
-/turf/open/floor/plating,
-/area/station/cargo/warehouse)
"aqa" = (
/obj/structure/railing,
/obj/machinery/door/firedoor/border_only,
@@ -1214,16 +1218,6 @@
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/iron/textured_large,
/area/station/service/hydroponics/garden)
-"auA" = (
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/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/simple/green/hidden{
- dir = 5
- },
-/turf/open/floor/iron/dark,
-/area/station/science/ordnance)
"auB" = (
/turf/open/floor/engine,
/area/station/medical/chemistry)
@@ -1356,10 +1350,6 @@
},
/turf/open/floor/iron,
/area/station/security/prison)
-"awf" = (
-/obj/machinery/igniter/incinerator_ordmix,
-/turf/open/floor/engine/vacuum,
-/area/station/science/ordnance/burnchamber)
"awi" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/cable,
@@ -1710,6 +1700,15 @@
},
/turf/open/openspace,
/area/station/security/prison/shower)
+"aCh" = (
+/obj/structure/window/spawner/directional/east,
+/obj/effect/turf_decal/stripes/corner{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/portable_atmospherics/scrubber,
+/turf/open/floor/iron/dark/smooth_large,
+/area/station/science/ordnance)
"aCp" = (
/obj/effect/turf_decal/tile/red/half/contrasted{
dir = 1
@@ -1873,6 +1872,12 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/wood/tile,
/area/station/service/bar)
+"aFg" = (
+/obj/item/toy/plush/lizard_plushie/space/green{
+ name = "Delaminates-The-Supermatter"
+ },
+/turf/open/misc/asteroid/airless,
+/area/space/nearstation)
"aFp" = (
/obj/machinery/light/directional/south,
/obj/structure/dresser,
@@ -2037,12 +2042,6 @@
/obj/structure/railing/corner,
/turf/open/floor/iron,
/area/station/security/prison)
-"aHZ" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/turf/open/floor/plating/airless,
-/area/space)
"aIc" = (
/obj/structure/table,
/obj/effect/spawner/random/bureaucracy/paper,
@@ -2253,33 +2252,6 @@
/obj/structure/rack,
/turf/open/floor/plating,
/area/station/maintenance/department/medical/central)
-"aKU" = (
-/obj/effect/landmark/start/ai/secondary,
-/obj/machinery/door/window/brigdoor/left/directional/north{
- layer = 4.1;
- name = "Tertiary AI Core Access";
- req_access = list("ai_upload");
- pixel_y = 3
- },
-/obj/item/radio/intercom/directional/south{
- pixel_x = -27;
- freerange = 1;
- listening = 0;
- name = "Common Channel"
- },
-/obj/item/radio/intercom/directional/south{
- pixel_x = 27;
- frequency = 1447;
- freerange = 1;
- listening = 0;
- name = "Private Channel"
- },
-/obj/machinery/flasher/directional/east{
- pixel_y = 8;
- id = "AI"
- },
-/turf/open/floor/circuit/green,
-/area/station/ai_monitored/turret_protected/ai)
"aLe" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -2292,6 +2264,17 @@
/obj/item/radio/intercom/directional/south,
/turf/open/floor/iron,
/area/station/cargo/warehouse/upper)
+"aLF" = (
+/obj/machinery/door/firedoor/heavy,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/machinery/door/airlock/research{
+ name = "Ordnance Auxiliary Storage"
+ },
+/obj/effect/mapping_helpers/airlock/access/all/science/ordnance,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/atmospherics/pipe/smart/simple/green/hidden,
+/turf/open/floor/iron/dark,
+/area/station/science/ordnance)
"aLH" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -2367,11 +2350,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/wood,
/area/station/commons/lounge)
-"aMS" = (
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/iron/dark,
-/area/station/science/ordnance)
"aMU" = (
/obj/structure/window/reinforced/spawner/directional/west,
/obj/structure/flora/bush/fullgrass/style_random,
@@ -3322,16 +3300,6 @@
"bfN" = (
/turf/open/floor/iron/dark,
/area/station/maintenance/radshelter/civil)
-"bfX" = (
-/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{
- dir = 4
- },
-/obj/effect/decal/cleanable/blood/drip,
-/obj/effect/decal/cleanable/blood/footprints{
- dir = 8
- },
-/turf/open/floor/engine,
-/area/station/science/xenobiology)
"bga" = (
/obj/structure/chair/wood{
dir = 4
@@ -3527,6 +3495,18 @@
/obj/effect/spawner/random/structure/steam_vent,
/turf/open/floor/plating,
/area/station/maintenance/port/greater)
+"bjK" = (
+/obj/structure/barricade/wooden,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/smart/simple/green/visible{
+ dir = 4
+ },
+/obj/item/flashlight/glowstick/blue{
+ start_on = 1;
+ light_range = 2
+ },
+/turf/open/floor/plating,
+/area/station/maintenance/department/science)
"bjM" = (
/obj/effect/turf_decal/tile/brown/opposingcorners{
dir = 1
@@ -3589,6 +3569,12 @@
/obj/effect/turf_decal/sand/plating,
/turf/open/floor/plating,
/area/station/asteroid)
+"blP" = (
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/effect/mapping_helpers/broken_floor,
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/iron/dark,
+/area/station/science/ordnance)
"bme" = (
/obj/structure/sign/warning,
/turf/closed/wall/r_wall,
@@ -3641,13 +3627,11 @@
/obj/effect/spawner/random/engineering/tracking_beacon,
/turf/open/floor/carpet,
/area/station/service/theater)
-"bnb" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/components/binary/valve{
- dir = 4
- },
-/turf/open/floor/plating,
-/area/station/maintenance/department/science)
+"bnk" = (
+/obj/structure/railing,
+/obj/effect/spawner/random/structure/closet_private,
+/turf/open/floor/carpet/red,
+/area/station/command/heads_quarters/qm)
"bnn" = (
/obj/effect/turf_decal/tile/purple/full,
/turf/open/floor/iron/dark/smooth_large,
@@ -3735,15 +3719,10 @@
/obj/effect/spawner/random/structure/table_or_rack,
/turf/open/floor/plating,
/area/station/maintenance/port/lesser)
-"bpN" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/door/airlock/maintenance,
-/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance,
-/obj/structure/disposalpipe/segment,
-/obj/effect/mapping_helpers/airlock/abandoned,
-/obj/effect/decal/cleanable/blood/old,
-/turf/open/floor/plating,
-/area/station/maintenance/central/greater)
+"bpA" = (
+/obj/machinery/computer/security/telescreen/ordnance/directional/south,
+/turf/open/floor/iron/white,
+/area/station/science/ordnance/testlab)
"bpW" = (
/obj/effect/turf_decal/stripes/white/line,
/obj/effect/turf_decal/tile/neutral/fourcorners,
@@ -4470,16 +4449,6 @@
/obj/structure/girder/displaced,
/turf/open/misc/asteroid,
/area/station/maintenance/central/greater)
-"bCr" = (
-/obj/machinery/computer/security/mining{
- dir = 8
- },
-/obj/machinery/keycard_auth/directional/east,
-/obj/effect/turf_decal/tile/dark_blue/half/contrasted{
- dir = 4
- },
-/turf/open/floor/iron/dark,
-/area/station/command/bridge)
"bCv" = (
/obj/effect/decal/cleanable/blood/old,
/obj/item/restraints/handcuffs,
@@ -4586,6 +4555,25 @@
/obj/machinery/airalarm/directional/east,
/turf/open/floor/iron,
/area/station/security/prison)
+"bEe" = (
+/obj/structure/ladder,
+/obj/structure/window/reinforced/spawner/directional/east{
+ pixel_x = 3
+ },
+/obj/machinery/door/window/brigdoor/left/directional/south{
+ pixel_y = -3;
+ name = "Monkey Pen";
+ req_one_access = list("genetics")
+ },
+/obj/machinery/camera/autoname/directional/west{
+ network = list("ss13","rd")
+ },
+/obj/effect/turf_decal/siding/purple/corner,
+/obj/structure/sign/poster/random/directional/north,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/iron/white/textured,
+/area/station/science/genetics)
"bEn" = (
/turf/open/floor/iron/showroomfloor,
/area/station/command/heads_quarters/hos)
@@ -4640,6 +4628,9 @@
},
/turf/open/floor/iron/dark,
/area/station/command/heads_quarters/hos)
+"bFj" = (
+/turf/closed/wall/rock/porous,
+/area/station/science/ordnance)
"bFw" = (
/obj/machinery/door/window/right/directional/east{
name = "Delivery Door";
@@ -4751,6 +4742,14 @@
dir = 8
},
/area/station/science/xenobiology)
+"bGR" = (
+/obj/structure/chair{
+ name = "Defense"
+ },
+/obj/machinery/power/apc/auto_name/directional/north,
+/obj/structure/cable,
+/turf/open/floor/iron,
+/area/station/security/courtroom)
"bGW" = (
/obj/structure/cable,
/obj/effect/spawner/random/engineering/tracking_beacon,
@@ -5200,21 +5199,6 @@
},
/turf/open/floor/iron/white,
/area/station/medical/exam_room)
-"bRl" = (
-/obj/machinery/suit_storage_unit/captain{
- req_access = list("captain")
- },
-/obj/effect/turf_decal/siding/wood{
- dir = 4
- },
-/obj/machinery/airalarm/directional/north,
-/obj/machinery/computer/security/telescreen/minisat/directional/west,
-/turf/open/floor/carpet/royalblue,
-/area/station/command/heads_quarters/captain/private)
-"bRD" = (
-/obj/structure/table,
-/turf/open/floor/iron/white,
-/area/station/science/ordnance/testlab)
"bRI" = (
/obj/machinery/rnd/production/techfab/department/medical,
/obj/effect/turf_decal/tile/blue/fourcorners,
@@ -5231,6 +5215,11 @@
/obj/effect/mapping_helpers/broken_floor,
/turf/open/floor/plating,
/area/station/maintenance/port/greater)
+"bRZ" = (
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/machinery/atmospherics/pipe/smart/simple/green/hidden,
+/turf/open/floor/iron/dark,
+/area/station/science/ordnance)
"bSr" = (
/obj/effect/turf_decal/siding/purple{
dir = 4
@@ -5371,16 +5360,6 @@
dir = 8
},
/area/station/science/xenobiology)
-"bUu" = (
-/obj/structure/table,
-/obj/machinery/cell_charger,
-/obj/item/stock_parts/power_store/cell,
-/obj/effect/turf_decal/tile/purple/half/contrasted{
- dir = 1
- },
-/obj/machinery/airalarm/directional/north,
-/turf/open/floor/iron/white,
-/area/station/science/lobby)
"bUx" = (
/obj/effect/landmark/event_spawn,
/obj/effect/decal/cleanable/dirt,
@@ -5778,6 +5757,17 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/catwalk_floor/iron_dark,
/area/station/ai_monitored/turret_protected/aisat_interior)
+"cbT" = (
+/obj/structure/cable,
+/obj/machinery/door/airlock/command,
+/obj/effect/mapping_helpers/airlock/access/any/command/general,
+/obj/effect/mapping_helpers/airlock/autoname,
+/obj/machinery/door/firedoor,
+/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/admin/general,
+/turf/open/floor/iron/dark/smooth_large,
+/area/station/command/emergency_closet)
"cca" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -6182,11 +6172,6 @@
/obj/effect/turf_decal/delivery,
/turf/open/floor/iron/dark,
/area/station/engineering/supermatter/room)
-"ckb" = (
-/obj/effect/turf_decal/siding/dark_blue,
-/obj/machinery/holopad,
-/turf/open/floor/iron/textured_large,
-/area/station/command/bridge)
"ckc" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/grass,
@@ -6249,15 +6234,6 @@
/obj/item/storage/box/hug/medical,
/turf/open/floor/iron,
/area/station/hallway/secondary/exit/departure_lounge)
-"clQ" = (
-/obj/effect/spawner/structure/window/reinforced/plasma,
-/obj/machinery/door/poddoor/preopen{
- id = "rdoffice";
- name = "Research Director's Shutters"
- },
-/obj/structure/cable,
-/turf/open/floor/plating,
-/area/station/command/heads_quarters/rd)
"clX" = (
/obj/machinery/seed_extractor,
/obj/effect/turf_decal/stripes/line{
@@ -6412,12 +6388,6 @@
dir = 4
},
/area/station/hallway/secondary/exit/departure_lounge)
-"cqf" = (
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/effect/mapping_helpers/broken_floor,
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/iron/dark,
-/area/station/science/ordnance)
"cqm" = (
/obj/structure/cable,
/obj/machinery/camera/autoname/directional/south{
@@ -6427,17 +6397,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/turret_protected/aisat/foyer)
-"cqt" = (
-/obj/machinery/atmospherics/components/unary/portables_connector/visible{
- dir = 8
- },
-/obj/effect/turf_decal/bot,
-/obj/machinery/button/door/directional/east{
- name = "shutter control";
- id = "ordauxgarage"
- },
-/turf/open/floor/plating,
-/area/station/science/ordnance)
"cqH" = (
/obj/structure/transit_tube,
/obj/structure/lattice,
@@ -6637,23 +6596,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron,
/area/station/construction/mining/aux_base)
-"ctE" = (
-/obj/machinery/door/airlock/research{
- name = "Research Division Access"
- },
-/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{
- cycle_id = "sci-entrance"
- },
-/obj/effect/mapping_helpers/airlock/unres{
- dir = 4
- },
-/obj/machinery/door/firedoor,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/effect/mapping_helpers/airlock/access/all/science/general,
-/turf/open/floor/iron/white,
-/area/station/science/research)
"ctL" = (
/obj/structure/window/reinforced/spawner/directional/west,
/obj/structure/cable,
@@ -6784,9 +6726,6 @@
/obj/structure/rack,
/turf/open/floor/plating,
/area/station/maintenance/central/lesser)
-"cxg" = (
-/turf/open/misc/asteroid/airless,
-/area/space)
"cxr" = (
/obj/structure/cable,
/obj/machinery/power/apc/auto_name/directional/east,
@@ -6933,35 +6872,12 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/plating,
/area/station/cargo/storage)
-"cAy" = (
-/obj/structure/table/glass,
-/obj/item/flatpack{
- board = /obj/item/circuitboard/machine/flatpacker;
- pixel_x = -5
- },
-/obj/item/multitool{
- pixel_x = 8
- },
-/turf/open/floor/iron,
-/area/station/engineering/lobby)
"cAC" = (
/obj/effect/turf_decal/stripes/end{
dir = 4
},
/turf/open/floor/plating/airless,
/area/station/science/ordnance/bomb)
-"cAG" = (
-/obj/machinery/atmospherics/components/binary/pump{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/layer_manifold/supply/hidden{
- dir = 1
- },
-/obj/machinery/camera/autoname/directional/west{
- network = list("ss13","rd")
- },
-/turf/open/floor/engine,
-/area/station/science/ordnance/burnchamber)
"cAQ" = (
/obj/vehicle/sealed/mecha/ripley/cargo,
/obj/effect/decal/cleanable/dirt,
@@ -7133,6 +7049,22 @@
/obj/effect/turf_decal/stripes,
/turf/open/floor/engine,
/area/station/engineering/atmospherics_engine)
+"cEi" = (
+/obj/machinery/light/small/directional/north,
+/obj/machinery/cell_charger,
+/obj/structure/table/reinforced,
+/obj/item/stock_parts/power_store/cell/high,
+/obj/machinery/camera/autoname/directional/east{
+ network = list("ss13","rd")
+ },
+/obj/effect/turf_decal/siding/purple/corner{
+ dir = 8
+ },
+/obj/effect/turf_decal/stripes/corner{
+ dir = 1
+ },
+/turf/open/floor/iron,
+/area/station/science/robotics/mechbay)
"cEr" = (
/obj/structure/chair/sofa/bench/right{
dir = 1
@@ -7426,10 +7358,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/engineering/atmos)
-"cKD" = (
-/mob/living/basic/mining/basilisk,
-/turf/open/misc/asteroid/airless,
-/area/space)
"cLd" = (
/obj/machinery/oven/range,
/obj/machinery/light/directional/north,
@@ -7522,6 +7450,12 @@
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plating,
/area/station/maintenance/department/medical)
+"cMM" = (
+/obj/structure/railing{
+ dir = 8
+ },
+/turf/open/space/basic,
+/area/space/nearstation)
"cMR" = (
/obj/structure/safe/floor,
/obj/item/stack/spacecash/c1000,
@@ -7695,6 +7629,14 @@
dir = 4
},
/area/station/science/research)
+"cPs" = (
+/obj/machinery/portable_atmospherics/pump,
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/iron/dark/smooth_large,
+/area/station/science/ordnance)
"cPt" = (
/turf/closed/wall/r_wall,
/area/station/science/lab)
@@ -7770,12 +7712,6 @@
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/wood/parquet,
/area/station/cargo/boutique)
-"cQu" = (
-/obj/machinery/atmospherics/pipe/smart/simple/dark/hidden{
- dir = 8
- },
-/turf/open/floor/engine/vacuum,
-/area/station/science/ordnance/burnchamber)
"cQK" = (
/obj/effect/turf_decal/trimline/blue/filled/line{
dir = 4
@@ -7806,13 +7742,6 @@
},
/turf/open/floor/iron,
/area/station/hallway/secondary/exit/departure_lounge)
-"cQX" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 9
- },
-/obj/structure/cable,
-/turf/open/floor/iron/white,
-/area/station/science/ordnance/storage)
"cRa" = (
/obj/structure/window/reinforced/spawner/directional/south,
/obj/structure/chair/office{
@@ -7909,13 +7838,6 @@
},
/turf/open/floor/iron,
/area/station/command/heads_quarters/ce)
-"cSI" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 9
- },
-/obj/machinery/portable_atmospherics/scrubber,
-/turf/open/floor/iron/dark/smooth_large,
-/area/station/science/ordnance)
"cSJ" = (
/obj/structure/table,
/obj/effect/spawner/random/food_or_drink/snack,
@@ -8122,6 +8044,12 @@
dir = 1
},
/area/station/science/xenobiology)
+"cWM" = (
+/obj/machinery/atmospherics/pipe/smart/simple/dark/hidden{
+ dir = 8
+ },
+/turf/open/floor/engine/vacuum,
+/area/station/science/ordnance/burnchamber)
"cWX" = (
/obj/effect/turf_decal/arrows,
/obj/machinery/firealarm/directional/west,
@@ -8146,6 +8074,9 @@
},
/turf/open/floor/iron/dark,
/area/station/service/bar)
+"cXf" = (
+/turf/closed/mineral/asteroid,
+/area/space/nearstation)
"cXh" = (
/obj/effect/spawner/random/trash/caution_sign,
/obj/effect/mapping_helpers/broken_floor,
@@ -8251,6 +8182,10 @@
/mob/living/basic/goat/pete,
/turf/open/floor/iron/kitchen_coldroom/freezerfloor,
/area/station/service/kitchen)
+"cYI" = (
+/obj/structure/fluff/iced_abductor,
+/turf/open/misc/asteroid/airless,
+/area/space/nearstation)
"cYP" = (
/obj/effect/landmark/event_spawn,
/obj/structure/cable,
@@ -8299,6 +8234,14 @@
"cZE" = (
/turf/open/openspace,
/area/station/command/meeting_room)
+"cZP" = (
+/obj/structure/table,
+/obj/item/reagent_containers/cup/beaker{
+ pixel_x = 5
+ },
+/obj/item/reagent_containers/condiment/enzyme,
+/turf/open/floor/iron/kitchen,
+/area/station/service/kitchen)
"dai" = (
/obj/machinery/power/port_gen/pacman,
/turf/open/floor/plating,
@@ -8365,19 +8308,19 @@
},
/turf/open/floor/carpet/executive,
/area/station/command/meeting_room)
-"dbJ" = (
-/obj/machinery/door/airlock/command/glass{
- name = "Bridge"
- },
-/obj/effect/mapping_helpers/airlock/access/any/command/general,
-/obj/machinery/door/firedoor,
+"dbA" = (
+/obj/effect/turf_decal/tile/neutral/fourcorners,
/obj/structure/cable,
-/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{
- cycle_id = "bridgec"
+/obj/structure/disposalpipe/segment{
+ dir = 9
},
-/obj/effect/mapping_helpers/airlock/access/any/admin/general,
-/turf/open/floor/iron,
-/area/station/hallway/secondary/command)
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/simple/green/hidden{
+ dir = 4
+ },
+/turf/open/floor/iron/dark,
+/area/station/science/ordnance)
"dbN" = (
/obj/effect/turf_decal/tile/neutral{
dir = 4
@@ -8756,6 +8699,18 @@
},
/turf/open/floor/iron,
/area/station/cargo/miningoffice)
+"dhz" = (
+/obj/machinery/atmospherics/components/binary/pump{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/layer_manifold/supply/hidden{
+ dir = 1
+ },
+/obj/machinery/camera/autoname/directional/west{
+ network = list("ss13","rd")
+ },
+/turf/open/floor/engine,
+/area/station/science/ordnance/burnchamber)
"dhH" = (
/obj/effect/turf_decal/siding/thinplating_new{
dir = 1
@@ -9065,24 +9020,6 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/central)
-"dmE" = (
-/obj/machinery/door/airlock/research{
- name = "Research Division Access"
- },
-/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{
- cycle_id = "sci-entrance"
- },
-/obj/effect/mapping_helpers/airlock/unres{
- dir = 4
- },
-/obj/machinery/door/firedoor,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/effect/mapping_helpers/airlock/access/all/science/general,
-/turf/open/floor/iron/white,
-/area/station/science/research)
"dmH" = (
/obj/effect/turf_decal/siding/white{
dir = 4
@@ -9243,11 +9180,6 @@
},
/turf/open/floor/iron/white,
/area/station/medical/virology)
-"dpf" = (
-/obj/structure/transport/linear/public,
-/obj/machinery/light/floor/transport,
-/turf/open/floor/plating/elevatorshaft,
-/area/station/medical/treatment_center)
"dpj" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/dark,
@@ -9414,16 +9346,6 @@
dir = 8
},
/area/station/science/robotics/lab)
-"drZ" = (
-/obj/effect/turf_decal/tile/green/half/contrasted{
- dir = 4
- },
-/obj/structure/chair{
- name = "Defense"
- },
-/obj/structure/cable,
-/turf/open/floor/iron,
-/area/station/security/courtroom)
"dsa" = (
/obj/effect/turf_decal/tile/red/half/contrasted{
dir = 8
@@ -9572,12 +9494,6 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/fore)
-"duB" = (
-/obj/structure/cable,
-/obj/structure/window/reinforced/spawner/directional/west,
-/obj/machinery/firealarm/directional/east,
-/turf/open/floor/iron/dark,
-/area/station/security/prison)
"duS" = (
/obj/machinery/duct,
/obj/structure/cable,
@@ -9715,29 +9631,6 @@
},
/turf/open/floor/iron,
/area/station/commons/locker)
-"dyS" = (
-/obj/machinery/door/airlock/research/glass/incinerator/ordmix_exterior{
- name = "Burn Chamber Interior Airlock";
- id_tag = "ordmix_airlock_interior"
- },
-/obj/effect/mapping_helpers/airlock/locked,
-/obj/effect/mapping_helpers/airlock/access/all/science/ordnance,
-/obj/machinery/airlock_controller/incinerator_ordmix{
- pixel_y = -26
- },
-/obj/machinery/button/ignition/incinerator/ordmix{
- pixel_x = -6;
- pixel_y = 24
- },
-/obj/machinery/button/door/incinerator_vent_ordmix{
- pixel_x = 8;
- pixel_y = 24
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/turf/open/floor/engine/vacuum,
-/area/station/science/ordnance/burnchamber)
"dyV" = (
/obj/structure/railing{
dir = 1
@@ -10107,14 +10000,6 @@
},
/turf/open/floor/iron/dark,
/area/station/ai_monitored/command/storage/eva)
-"dCv" = (
-/obj/structure/railing{
- layer = 3.01
- },
-/obj/structure/dresser,
-/obj/machinery/light_switch/directional/west,
-/turf/open/floor/carpet/red,
-/area/station/command/heads_quarters/qm)
"dCG" = (
/obj/effect/turf_decal/trimline/blue/filled/line{
dir = 1
@@ -10149,6 +10034,10 @@
/obj/structure/cable/multilayer/connected,
/turf/open/floor/iron,
/area/station/engineering/main)
+"dDi" = (
+/obj/machinery/air_sensor/ordnance_burn_chamber,
+/turf/open/floor/engine/vacuum,
+/area/station/science/ordnance/burnchamber)
"dDm" = (
/obj/machinery/power/apc/auto_name/directional/north,
/obj/effect/decal/cleanable/dirt/dust,
@@ -10347,22 +10236,6 @@
},
/turf/open/floor/iron/white,
/area/station/medical/paramedic)
-"dHy" = (
-/obj/machinery/light/small/directional/north,
-/obj/machinery/cell_charger,
-/obj/structure/table/reinforced,
-/obj/item/stock_parts/power_store/cell/high,
-/obj/machinery/camera/autoname/directional/east{
- network = list("ss13","rd")
- },
-/obj/effect/turf_decal/siding/purple/corner{
- dir = 8
- },
-/obj/effect/turf_decal/stripes/corner{
- dir = 1
- },
-/turf/open/floor/iron,
-/area/station/science/robotics/mechbay)
"dHL" = (
/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible,
/obj/effect/turf_decal/tile/yellow{
@@ -10514,12 +10387,6 @@
},
/turf/open/floor/iron/dark,
/area/station/security/execution/education)
-"dJM" = (
-/obj/structure/table/optable,
-/obj/item/radio/intercom/directional/east,
-/obj/effect/decal/cleanable/blood/old,
-/turf/open/floor/engine,
-/area/station/science/xenobiology)
"dKp" = (
/obj/structure/lattice/catwalk,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -10563,6 +10430,18 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron,
/area/station/hallway/secondary/command)
+"dLy" = (
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/structure/table,
+/obj/machinery/cell_charger,
+/obj/item/stock_parts/power_store/cell/high,
+/obj/machinery/button/door/directional/south{
+ id = "evashutter";
+ name = "E.V.A. Storage Shutter Control";
+ req_access = list("command")
+ },
+/turf/open/floor/iron/dark,
+/area/station/ai_monitored/command/storage/eva)
"dLI" = (
/obj/effect/landmark/event_spawn,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
@@ -10580,10 +10459,6 @@
/obj/machinery/camera/autoname/directional/south,
/turf/open/floor/iron,
/area/station/engineering/atmos/upper)
-"dLY" = (
-/obj/structure/broken_flooring/singular/directional/east,
-/turf/open/space/openspace,
-/area/space)
"dMa" = (
/obj/structure/chair/office,
/obj/effect/turf_decal/tile/brown/fourcorners,
@@ -10814,6 +10689,10 @@
/obj/structure/cable/layer1,
/turf/open/floor/engine,
/area/station/engineering/supermatter/room)
+"dPK" = (
+/obj/structure/broken_flooring/singular/directional/east,
+/turf/open/space/openspace,
+/area/space/nearstation)
"dPN" = (
/obj/structure/chair,
/turf/open/floor/glass/reinforced,
@@ -10834,6 +10713,12 @@
/obj/machinery/door/firedoor,
/turf/open/floor/catwalk_floor/iron_dark,
/area/station/ai_monitored/turret_protected/aisat_interior)
+"dQa" = (
+/obj/structure/closet/crate/critter,
+/mob/living/basic/mothroach,
+/obj/item/stack/spacecash/c100,
+/turf/open/space/basic,
+/area/space/nearstation)
"dQr" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
/turf/open/floor/iron/dark/textured,
@@ -11076,6 +10961,28 @@
/obj/machinery/computer/security/telescreen/entertainment/directional/east,
/turf/open/floor/iron,
/area/station/hallway/primary/central)
+"dTV" = (
+/obj/machinery/light/dim/directional/west,
+/obj/structure/cable,
+/obj/machinery/cell_charger,
+/obj/item/stock_parts/power_store/cell/high,
+/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/disposalpipe/segment,
+/obj/item/holosign_creator/atmos{
+ pixel_y = 5
+ },
+/obj/structure/table,
+/obj/item/holosign_creator/atmos{
+ pixel_y = 7
+ },
+/turf/open/floor/iron/dark/corner{
+ dir = 8
+ },
+/area/station/engineering/atmos/upper)
"dUb" = (
/obj/machinery/airalarm/directional/west,
/obj/item/kirbyplants/random,
@@ -11083,10 +10990,6 @@
/obj/machinery/firealarm/directional/south,
/turf/open/floor/iron/dark,
/area/station/security/warden)
-"dUc" = (
-/obj/structure/lattice,
-/turf/open/space/basic,
-/area/space)
"dUi" = (
/turf/closed/wall/r_wall,
/area/station/engineering/lobby)
@@ -11250,12 +11153,6 @@
},
/turf/open/floor/iron/dark,
/area/station/security/lockers)
-"dXh" = (
-/obj/structure/disposalpipe/trunk{
- dir = 4
- },
-/turf/closed/wall,
-/area/station/cargo/storage)
"dXN" = (
/obj/machinery/door/airlock/research{
name = "Robotics Lab Storage"
@@ -11518,14 +11415,6 @@
/obj/effect/turf_decal/tile/blue/fourcorners,
/turf/open/floor/iron/white,
/area/station/medical/treatment_center)
-"ebE" = (
-/obj/effect/spawner/structure/window/hollow/end,
-/turf/open/floor/plating,
-/area/station/security/courtroom)
-"ebN" = (
-/obj/structure/broken_flooring/pile/directional/east,
-/turf/open/space/openspace,
-/area/space)
"ebP" = (
/obj/machinery/power/apc/auto_name/directional/west,
/obj/effect/mapping_helpers/apc/cell_5k,
@@ -11591,20 +11480,6 @@
},
/turf/open/floor/iron,
/area/station/engineering/atmos)
-"ecM" = (
-/obj/structure/table,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/item/storage/toolbox/mechanical{
- pixel_x = -2;
- pixel_y = 8
- },
-/obj/item/storage/toolbox/mechanical{
- pixel_x = 3;
- pixel_y = -2
- },
-/obj/structure/cable,
-/turf/open/floor/iron/dark,
-/area/station/science/ordnance)
"edv" = (
/obj/machinery/computer/order_console/cook,
/turf/open/floor/iron,
@@ -11696,10 +11571,6 @@
},
/turf/open/floor/iron/dark,
/area/station/science/ordnance)
-"efL" = (
-/obj/effect/spawner/structure/window/reinforced/plasma,
-/turf/open/floor/engine/vacuum,
-/area/station/science/ordnance/burnchamber)
"efQ" = (
/obj/structure/cable,
/obj/effect/decal/cleanable/dirt,
@@ -11742,12 +11613,6 @@
/obj/machinery/light_switch/directional/east,
/turf/open/floor/iron,
/area/station/command/gateway)
-"egV" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
- dir = 8
- },
-/turf/open/floor/engine/vacuum,
-/area/station/science/ordnance/burnchamber)
"egY" = (
/obj/machinery/light_switch/directional/west,
/turf/open/openspace,
@@ -12023,11 +11888,6 @@
/obj/structure/door_assembly,
/turf/open/misc/asteroid,
/area/station/asteroid)
-"elG" = (
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/machinery/atmospherics/pipe/smart/simple/green/hidden,
-/turf/open/floor/iron/dark,
-/area/station/science/ordnance)
"elT" = (
/obj/effect/turf_decal/tile/neutral/opposingcorners{
dir = 1
@@ -12039,6 +11899,12 @@
/obj/machinery/igniter/incinerator_atmos,
/turf/open/floor/engine/airless,
/area/station/maintenance/disposal/incinerator)
+"emb" = (
+/obj/machinery/power/apc/auto_name/directional/west,
+/obj/structure/cable,
+/obj/machinery/portable_atmospherics/canister/oxygen,
+/turf/open/floor/iron/white,
+/area/station/science/ordnance/storage)
"emf" = (
/obj/structure/window/spawner/directional/south,
/obj/structure/window/spawner/directional/north,
@@ -12097,18 +11963,6 @@
/obj/structure/stairs/north,
/turf/open/floor/iron,
/area/station/command/corporate_showroom)
-"enX" = (
-/obj/effect/turf_decal/caution/stand_clear/red,
-/obj/effect/turf_decal/stripes/line,
-/obj/machinery/door/poddoor/shutters/window/preopen{
- id = "ordstorage"
- },
-/obj/structure/cable,
-/obj/effect/turf_decal/stripes/corner{
- dir = 1
- },
-/turf/open/floor/iron/white,
-/area/station/science/ordnance/storage)
"eon" = (
/obj/effect/spawner/random/structure/chair_comfy{
dir = 4
@@ -12399,23 +12253,9 @@
/turf/open/floor/plating,
/area/station/maintenance/central/greater)
"esX" = (
-/obj/structure/table/reinforced,
-/obj/item/stock_parts/power_store/cell/high{
- pixel_x = 4;
- pixel_y = 5
- },
-/obj/item/stock_parts/power_store/cell/high{
- pixel_x = -8;
- pixel_y = 9
- },
-/obj/item/stock_parts/power_store/cell/high,
-/obj/machinery/cell_charger,
-/obj/item/borg/upgrade/rename{
- pixel_x = 3;
- pixel_y = 18
- },
-/turf/open/floor/iron/dark/textured,
-/area/station/science/robotics/lab)
+/obj/effect/turf_decal/siding/dark_blue,
+/turf/open/floor/iron/textured_large,
+/area/station/command/bridge)
"etg" = (
/obj/machinery/shower/directional/north,
/obj/effect/turf_decal/tile/green/anticorner/contrasted{
@@ -12464,6 +12304,15 @@
},
/turf/open/floor/iron,
/area/station/service/hydroponics)
+"etE" = (
+/obj/machinery/door/airlock/engineering/glass{
+ name = "Primary Tool Storage"
+ },
+/obj/structure/cable,
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron,
+/area/station/commons/storage/primary)
"etI" = (
/obj/structure/table,
/obj/effect/spawner/random/food_or_drink/snack,
@@ -12573,18 +12422,6 @@
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/iron,
/area/station/maintenance/department/medical/central)
-"ewa" = (
-/obj/effect/turf_decal/tile/yellow/fourcorners,
-/obj/structure/table,
-/obj/item/stock_parts/power_store/cell/emproof{
- pixel_y = 6
- },
-/obj/item/stock_parts/power_store/cell/emproof{
- pixel_y = 3
- },
-/obj/item/stock_parts/power_store/cell/emproof,
-/turf/open/floor/iron,
-/area/station/engineering/main)
"ewr" = (
/obj/effect/spawner/random/trash/botanical_waste,
/obj/effect/mapping_helpers/burnt_floor,
@@ -12765,6 +12602,17 @@
},
/turf/open/floor/iron/white/smooth_large,
/area/station/command/heads_quarters/cmo)
+"ezH" = (
+/obj/effect/turf_decal/tile/brown/half/contrasted{
+ dir = 1
+ },
+/obj/machinery/door/firedoor/border_only{
+ dir = 4
+ },
+/obj/machinery/requests_console/auto_name/directional/north,
+/obj/effect/mapping_helpers/requests_console/assistance,
+/turf/open/floor/iron,
+/area/station/cargo/storage)
"ezL" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -12786,6 +12634,12 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron,
/area/station/cargo/storage)
+"ezT" = (
+/obj/machinery/sparker/directional/south{
+ id = "Xenobio"
+ },
+/turf/open/floor/engine/xenobio,
+/area/station/science/xenobiology)
"ezZ" = (
/obj/structure/closet/crate/goldcrate,
/obj/effect/turf_decal/tile/neutral/fourcorners,
@@ -13126,6 +12980,17 @@
},
/turf/open/floor/engine,
/area/station/science/xenobiology)
+"eFd" = (
+/obj/machinery/door/poddoor/shutters{
+ id = "ordauxgarage";
+ dir = 1
+ },
+/obj/effect/turf_decal/sand/plating,
+/obj/effect/turf_decal/stripes/asteroid/end{
+ dir = 4
+ },
+/turf/open/floor/plating,
+/area/station/science/ordnance)
"eFj" = (
/obj/structure/cable,
/obj/structure/disposalpipe/segment{
@@ -13144,6 +13009,12 @@
/obj/machinery/door/firedoor,
/turf/open/floor/iron,
/area/station/service/hydroponics/garden)
+"eFs" = (
+/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{
+ dir = 4
+ },
+/turf/open/floor/engine/vacuum,
+/area/station/science/ordnance/burnchamber)
"eFu" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/firealarm/directional/east,
@@ -13163,14 +13034,6 @@
/obj/structure/table,
/turf/open/floor/iron/textured,
/area/station/security/processing)
-"eFJ" = (
-/obj/structure/table,
-/obj/item/biopsy_tool,
-/obj/machinery/sparker/directional/north{
- id = "Xenobio"
- },
-/turf/open/floor/engine,
-/area/station/science/xenobiology)
"eFK" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -13240,6 +13103,17 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron,
/area/station/commons/storage/art)
+"eGL" = (
+/obj/machinery/door/poddoor/shutters{
+ dir = 4;
+ id = "ordauxgarage"
+ },
+/obj/effect/turf_decal/sand/plating,
+/obj/effect/turf_decal/stripes/asteroid/end{
+ dir = 1
+ },
+/turf/open/floor/plating,
+/area/station/science/ordnance)
"eGN" = (
/obj/structure/cable,
/obj/structure/disposalpipe/segment{
@@ -13250,13 +13124,6 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/central)
-"eHa" = (
-/obj/effect/turf_decal/tile/dark_blue/half/contrasted{
- dir = 4
- },
-/obj/structure/sign/poster/official/random/directional/east,
-/turf/open/floor/iron,
-/area/station/command/bridge)
"eHc" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
dir = 1
@@ -13290,13 +13157,6 @@
},
/turf/open/floor/plating,
/area/station/engineering/supermatter/room)
-"eIo" = (
-/obj/structure/statue/sandstone/venus{
- dir = 1;
- layer = 3.3
- },
-/turf/open/floor/grass,
-/area/station/science/research)
"eIy" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
dir = 1
@@ -13396,20 +13256,11 @@
"eKR" = (
/turf/closed/wall/r_wall,
/area/station/command/bridge)
-"eKT" = (
-/obj/structure/table,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/item/pipe_dispenser{
- pixel_x = 3;
- pixel_y = 7
- },
-/obj/item/pipe_dispenser,
-/obj/machinery/power/apc/auto_name/directional/south{
- areastring = "/area/station/science/ordnance/burnchamber"
- },
-/obj/structure/cable,
-/turf/open/floor/iron/dark,
-/area/station/science/ordnance)
+"eLa" = (
+/obj/item/radio/intercom/directional/east,
+/obj/effect/decal/cleanable/blood/old,
+/turf/open/floor/engine/xenobio,
+/area/station/science/xenobiology)
"eLe" = (
/obj/machinery/power/apc/auto_name/directional/east,
/obj/effect/turf_decal/tile/red/half/contrasted{
@@ -13610,15 +13461,6 @@
/obj/structure/sign/poster/random/directional/west,
/turf/open/floor/plating,
/area/station/maintenance/department/medical)
-"eQJ" = (
-/obj/structure/rack,
-/obj/effect/turf_decal/tile/red/half/contrasted{
- dir = 1
- },
-/obj/item/radio/intercom/directional/south,
-/obj/effect/spawner/random/armory/dragnet,
-/turf/open/floor/iron/dark,
-/area/station/ai_monitored/security/armory)
"eQQ" = (
/obj/machinery/door/firedoor/border_only{
dir = 4
@@ -13912,6 +13754,32 @@
/obj/machinery/door/firedoor,
/turf/open/floor/iron,
/area/station/commons/locker)
+"eXX" = (
+/obj/effect/landmark/start/ai/secondary,
+/obj/machinery/door/window/brigdoor/right/directional/south{
+ name = "Secondary AI Core Access";
+ req_access = list("ai_upload");
+ pixel_y = -4
+ },
+/obj/machinery/flasher/directional/west{
+ id = "AI";
+ pixel_y = -8
+ },
+/obj/item/radio/intercom/directional/north{
+ pixel_x = -27;
+ frequency = 1447;
+ freerange = 1;
+ on = 0;
+ name = "Private Channel"
+ },
+/obj/item/radio/intercom/directional/north{
+ pixel_x = 27;
+ name = "Common Channel";
+ freerange = 1;
+ listening = 0
+ },
+/turf/open/floor/circuit/green,
+/area/station/ai_monitored/turret_protected/ai)
"eYd" = (
/obj/effect/turf_decal/tile/brown/anticorner/contrasted,
/obj/machinery/button/door/directional/south{
@@ -14136,12 +14004,6 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/starboard)
-"fbN" = (
-/obj/machinery/light/small/directional/south,
-/obj/effect/spawner/random/structure/closet_empty/crate/with_loot,
-/obj/item/coin/plasma,
-/turf/open/misc/asteroid,
-/area/station/maintenance/department/science)
"fcH" = (
/obj/structure/frame/computer{
anchored = 1;
@@ -14256,10 +14118,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible/layer2,
/turf/open/floor/plating,
/area/station/maintenance/disposal/incinerator)
-"feR" = (
-/obj/machinery/computer/security/telescreen/ordnance/directional/south,
-/turf/open/floor/iron/white,
-/area/station/science/ordnance/testlab)
"feU" = (
/obj/structure/cable,
/obj/machinery/door/airlock/maintenance/external,
@@ -14310,19 +14168,6 @@
},
/turf/closed/wall/r_wall,
/area/station/engineering/atmos/pumproom)
-"ffK" = (
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/structure/cable,
-/obj/structure/disposalpipe/segment{
- dir = 9
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/simple/green/hidden{
- dir = 4
- },
-/turf/open/floor/iron/dark,
-/area/station/science/ordnance)
"ffT" = (
/obj/structure/rack,
/obj/effect/spawner/random/maintenance/no_decals/two,
@@ -14378,6 +14223,20 @@
/obj/effect/turf_decal/sand/plating,
/turf/open/floor/plating,
/area/station/maintenance/solars/port/fore)
+"fgZ" = (
+/obj/machinery/door/airlock/engineering/glass{
+ name = "Engineering Foyer"
+ },
+/obj/effect/mapping_helpers/airlock/access/any/engineering/general,
+/obj/structure/cable,
+/obj/machinery/door/firedoor,
+/obj/effect/landmark/navigate_destination/engineering,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/effect/mapping_helpers/airlock/access/any/engineering/construction,
+/turf/open/floor/iron,
+/area/station/engineering/lobby)
"fhs" = (
/obj/effect/turf_decal/trimline/blue/filled/line{
dir = 8
@@ -14483,13 +14342,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/textured,
/area/station/construction/mining/aux_base)
-"fjb" = (
-/obj/structure/window/reinforced/spawner/directional/north,
-/obj/structure/window/reinforced/spawner/directional/east{
- layer = 2.9
- },
-/turf/open/floor/engine,
-/area/station/science/xenobiology)
"fjg" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 4
@@ -14535,6 +14387,9 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
/turf/open/floor/iron/white/smooth_large,
/area/station/medical/chemistry/minisat)
+"fjO" = (
+/turf/open/floor/iron/showroomfloor,
+/area/station/command/heads_quarters/qm)
"fkh" = (
/obj/effect/spawner/random/structure/grille{
loot = list(/obj/structure/grille = 4, /obj/structure/grille/broken = 1)
@@ -14591,12 +14446,6 @@
/obj/effect/spawner/random/maintenance,
/turf/open/floor/plating,
/area/station/maintenance/department/medical/central)
-"flF" = (
-/obj/structure/railing{
- dir = 8
- },
-/turf/open/space/basic,
-/area/space)
"flH" = (
/obj/structure/closet/boxinggloves,
/obj/effect/landmark/start/hangover/closet,
@@ -14615,6 +14464,17 @@
},
/turf/open/floor/iron,
/area/station/engineering/atmos)
+"flW" = (
+/obj/structure/table/wood,
+/obj/item/stock_parts/power_store/cell/crap,
+/obj/item/clothing/head/collectable/hop{
+ name = "novelty HoP hat"
+ },
+/obj/effect/turf_decal/siding/wood{
+ dir = 8
+ },
+/turf/open/floor/wood/tile,
+/area/station/command/corporate_showroom)
"flZ" = (
/obj/structure/cable,
/obj/structure/disposalpipe/sorting/mail/flip{
@@ -14685,6 +14545,17 @@
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/iron/herringbone,
/area/station/hallway/primary/central)
+"fnB" = (
+/obj/machinery/suit_storage_unit/captain{
+ req_access = list("captain")
+ },
+/obj/effect/turf_decal/siding/wood{
+ dir = 4
+ },
+/obj/machinery/airalarm/directional/north,
+/obj/machinery/computer/security/telescreen/minisat/directional/west,
+/turf/open/floor/carpet/royalblue,
+/area/station/command/heads_quarters/captain/private)
"fnG" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -14964,28 +14835,6 @@
},
/turf/open/floor/iron/dark/smooth_large,
/area/station/hallway/primary/central)
-"fst" = (
-/obj/machinery/light/dim/directional/west,
-/obj/structure/cable,
-/obj/machinery/cell_charger,
-/obj/item/stock_parts/power_store/cell/high,
-/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/disposalpipe/segment,
-/obj/item/holosign_creator/atmos{
- pixel_y = 5
- },
-/obj/structure/table,
-/obj/item/holosign_creator/atmos{
- pixel_y = 7
- },
-/turf/open/floor/iron/dark/corner{
- dir = 8
- },
-/area/station/engineering/atmos/upper)
"fsu" = (
/obj/structure/railing{
dir = 1
@@ -15053,12 +14902,6 @@
},
/turf/open/floor/plating/airless,
/area/station/science/ordnance/bomb)
-"fsV" = (
-/obj/effect/decal/cleanable/blood/old{
- icon_state = "gib3-old"
- },
-/turf/open/floor/engine,
-/area/station/science/xenobiology)
"fsZ" = (
/obj/machinery/door/window/brigdoor/left/directional/south{
name = "Research Director Observation";
@@ -15166,13 +15009,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/white,
/area/station/science/ordnance/storage)
-"fuZ" = (
-/obj/effect/turf_decal/trimline/green/filled/line{
- dir = 4
- },
-/obj/machinery/firealarm/directional/east,
-/turf/open/floor/iron/white,
-/area/station/hallway/secondary/entry)
"fvd" = (
/obj/machinery/duct,
/obj/effect/turf_decal/tile/dark_green/opposingcorners,
@@ -15472,12 +15308,27 @@
/obj/machinery/air_sensor/carbon_tank,
/turf/open/floor/engine/co2,
/area/station/engineering/atmos)
-"fzW" = (
-/obj/structure/table/glass,
-/obj/machinery/cell_charger,
-/obj/item/stock_parts/power_store/cell/high,
+"fzN" = (
+/obj/machinery/computer/cargo{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/brown/half/contrasted{
+ dir = 8
+ },
+/obj/machinery/button/door/directional/west{
+ id = "QMLoaddoor";
+ name = "Loading Doors";
+ pixel_y = -8;
+ req_access = list("cargo")
+ },
+/obj/machinery/button/door/directional/west{
+ id = "QMLoaddoor2";
+ name = "Loading Doors";
+ pixel_y = 8;
+ req_access = list("cargo")
+ },
/turf/open/floor/iron,
-/area/station/engineering/lobby)
+/area/station/cargo/storage)
"fzY" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -16117,6 +15968,13 @@
},
/turf/open/floor/carpet/purple,
/area/station/service/library)
+"fKp" = (
+/obj/structure/table/wood,
+/obj/item/flashlight/lamp,
+/obj/machinery/camera/autoname/directional/north,
+/obj/machinery/keycard_auth/directional/north,
+/turf/open/floor/carpet/green,
+/area/station/command/heads_quarters/hop)
"fKs" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 4
@@ -16163,11 +16021,6 @@
},
/turf/open/floor/iron/half,
/area/station/security/breakroom)
-"fLM" = (
-/obj/structure/transport/linear/public,
-/obj/machinery/light/floor/transport,
-/turf/open/floor/plating/elevatorshaft,
-/area/station/cargo/storage)
"fLU" = (
/obj/effect/spawner/random/trash/mess,
/obj/effect/mapping_helpers/broken_floor,
@@ -16235,6 +16088,20 @@
/obj/machinery/light/dim/directional/east,
/turf/open/floor/iron,
/area/station/commons/storage/tools)
+"fNj" = (
+/obj/structure/table,
+/obj/item/paper_bin,
+/obj/item/pen,
+/obj/item/clothing/glasses/science,
+/obj/machinery/camera/autoname/directional/north{
+ network = list("ss13","rd")
+ },
+/obj/item/flatpack{
+ board = /obj/item/circuitboard/machine/flatpacker
+ },
+/obj/item/multitool,
+/turf/open/floor/iron/white,
+/area/station/science/lab)
"fNk" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
/turf/open/floor/iron/dark,
@@ -16470,18 +16337,6 @@
/obj/structure/disposalpipe/trunk,
/turf/open/floor/iron,
/area/station/engineering/lobby)
-"fQr" = (
-/obj/machinery/atmospherics/components/binary/pump{
- dir = 8
- },
-/obj/machinery/airalarm/directional/south,
-/obj/effect/mapping_helpers/airalarm/mixingchamber_access,
-/obj/effect/mapping_helpers/airalarm/link{
- chamber_id = "ordnancefreezer"
- },
-/obj/effect/mapping_helpers/airalarm/tlv_no_checks,
-/turf/open/floor/iron/dark,
-/area/station/science/ordnance)
"fQG" = (
/obj/machinery/door/airlock/virology/glass{
name = "Virology Lab";
@@ -16621,6 +16476,26 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/dark,
/area/station/science/ordnance)
+"fSH" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 8
+ },
+/obj/machinery/button/door/directional/south{
+ id = "capshut";
+ pixel_x = -8;
+ name = "shutter control"
+ },
+/obj/machinery/fax{
+ fax_name = "Captain's Office";
+ name = "Captain's Fax Machine"
+ },
+/obj/structure/table/reinforced,
+/obj/machinery/keycard_auth/directional/south{
+ pixel_y = -24;
+ pixel_x = 8
+ },
+/turf/open/floor/carpet/royalblue,
+/area/station/command/heads_quarters/captain/private)
"fSK" = (
/obj/effect/turf_decal/trimline/blue/filled/line{
dir = 6
@@ -16902,6 +16777,10 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron,
/area/station/security/courtroom)
+"fYA" = (
+/obj/machinery/computer/security/telescreen/rd/directional/south,
+/turf/open/floor/glass/reinforced/plasma,
+/area/station/command/heads_quarters/rd)
"fYQ" = (
/obj/effect/turf_decal/tile/yellow{
dir = 1
@@ -17258,6 +17137,13 @@
},
/turf/open/floor/wood/parquet,
/area/station/medical/psychology)
+"gez" = (
+/obj/effect/turf_decal/tile/dark_blue/half/contrasted{
+ dir = 4
+ },
+/obj/structure/sign/poster/official/random/directional/east,
+/turf/open/floor/iron,
+/area/station/command/bridge)
"geB" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -17470,6 +17356,18 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/cargo/drone_bay)
+"giX" = (
+/obj/effect/turf_decal/tile/yellow/fourcorners,
+/obj/structure/table,
+/obj/item/stock_parts/power_store/cell/emproof{
+ pixel_y = 6
+ },
+/obj/item/stock_parts/power_store/cell/emproof{
+ pixel_y = 3
+ },
+/obj/item/stock_parts/power_store/cell/emproof,
+/turf/open/floor/iron,
+/area/station/engineering/main)
"gjo" = (
/obj/structure/cable,
/obj/machinery/button/door/directional/east{
@@ -17673,11 +17571,6 @@
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/iron/dark,
/area/station/security/mechbay)
-"gmm" = (
-/obj/structure/table,
-/obj/item/storage/box/monkeycubes,
-/turf/open/floor/engine,
-/area/station/science/xenobiology)
"gms" = (
/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{
dir = 4
@@ -17738,16 +17631,6 @@
/obj/effect/spawner/random/structure/crate,
/turf/open/floor/plating,
/area/station/maintenance/department/medical/central)
-"gop" = (
-/obj/effect/landmark/blobstart,
-/obj/structure/closet/crate/science{
- opened = 1;
- icon_state = "scicrateopen"
- },
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/turf_decal/stripes/line,
-/turf/open/floor/iron/dark/smooth_large,
-/area/station/science/ordnance)
"goB" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/decal/cleanable/blood/tracks,
@@ -17817,6 +17700,11 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/fore)
+"gqi" = (
+/obj/effect/turf_decal/siding/dark_blue,
+/obj/machinery/holopad,
+/turf/open/floor/iron/textured_large,
+/area/station/command/bridge)
"gql" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -17881,15 +17769,15 @@
/obj/structure/cable,
/turf/open/floor/iron/white,
/area/station/science/lobby)
-"grm" = (
-/obj/machinery/door/poddoor/shutters/window{
+"grr" = (
+/obj/machinery/atmospherics/components/unary/thermomachine/freezer/on{
dir = 4;
- id = "ordauxgarage"
+ name = "euthanization chamber freezer"
},
-/obj/effect/turf_decal/stripes/asteroid/end,
-/obj/effect/turf_decal/sand/plating,
-/turf/open/floor/plating,
-/area/station/science/ordnance)
+/obj/structure/window/reinforced/spawner/directional/east,
+/obj/effect/turf_decal/tile/blue/fourcorners,
+/turf/open/floor/iron,
+/area/station/science/xenobiology)
"grv" = (
/obj/structure/table/glass,
/obj/item/clothing/head/cone{
@@ -17916,6 +17804,16 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/showroomfloor,
/area/station/engineering/main)
+"grB" = (
+/obj/effect/spawner/random{
+ loot = list(/obj/item/cardboard_cutout/nuclear_operative,/obj/item/cardboard_cutout/nuclear_operative,/obj/structure/fluff/balloon_nuke);
+ spawn_all_loot = 1;
+ spawn_loot_chance = 5;
+ spawn_loot_double = 0;
+ spawn_scatter_radius = 1
+ },
+/turf/open/space/basic,
+/area/space/nearstation)
"grK" = (
/obj/effect/turf_decal/tile/neutral,
/obj/machinery/newscaster/directional/east,
@@ -17945,29 +17843,6 @@
},
/turf/open/openspace,
/area/station/engineering/supermatter/room)
-"gsi" = (
-/obj/machinery/computer/cargo{
- dir = 4
- },
-/obj/effect/turf_decal/tile/brown/half/contrasted{
- dir = 8
- },
-/obj/machinery/button/door/directional/west{
- id = "QMLoaddoor";
- layer = 4;
- name = "Loading Doors";
- pixel_y = -8;
- req_access = list("cargo")
- },
-/obj/machinery/button/door/directional/west{
- id = "QMLoaddoor2";
- layer = 4;
- name = "Loading Doors";
- pixel_y = 8;
- req_access = list("cargo")
- },
-/turf/open/floor/iron,
-/area/station/cargo/storage)
"gsm" = (
/obj/machinery/hydroponics/constructable,
/obj/machinery/firealarm/directional/north,
@@ -17998,9 +17873,6 @@
},
/turf/open/floor/iron,
/area/station/engineering/lobby)
-"gsW" = (
-/turf/closed/wall/rock/porous,
-/area/station/science/ordnance)
"gtj" = (
/obj/effect/turf_decal/tile/brown/anticorner/contrasted{
dir = 4
@@ -18182,6 +18054,16 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron,
/area/station/engineering/atmos)
+"gvT" = (
+/obj/effect/turf_decal/tile/yellow/anticorner/contrasted{
+ dir = 4
+ },
+/obj/structure/closet/toolcloset,
+/obj/machinery/computer/security/telescreen/auxbase/directional/east,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/light_switch/directional/north,
+/turf/open/floor/iron,
+/area/station/construction/mining/aux_base)
"gwq" = (
/obj/machinery/camera/autoname/directional/south,
/obj/effect/turf_decal/tile/neutral,
@@ -18833,41 +18715,6 @@
/obj/machinery/light/small/broken/directional/east,
/turf/open/floor/iron/freezer,
/area/station/maintenance/department/medical/central)
-"gHL" = (
-/obj/structure/table,
-/obj/effect/turf_decal/bot,
-/obj/machinery/camera/directional/west{
- c_tag = "Science Ordnance Test Lab";
- network = list("ss13","rd")
- },
-/obj/item/assembly/prox_sensor{
- pixel_y = 2
- },
-/obj/item/assembly/prox_sensor{
- pixel_x = 9;
- pixel_y = -2
- },
-/obj/item/assembly/prox_sensor{
- pixel_x = -4;
- pixel_y = 1
- },
-/obj/item/assembly/prox_sensor{
- pixel_x = 8;
- pixel_y = 9
- },
-/obj/machinery/requests_console/directional/west{
- department = "Ordnance Test Range";
- name = "Test Range Requests Console"
- },
-/obj/effect/mapping_helpers/requests_console/information,
-/obj/effect/mapping_helpers/requests_console/assistance,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/item/binoculars{
- pixel_y = -10;
- pixel_x = -5
- },
-/turf/open/floor/iron/dark,
-/area/station/science/ordnance/testlab)
"gHN" = (
/turf/closed/wall,
/area/station/medical/chemistry/minisat)
@@ -18988,6 +18835,13 @@
},
/turf/open/floor/plating,
/area/station/service/chapel/funeral)
+"gKe" = (
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/machinery/airalarm/directional/north,
+/obj/structure/filingcabinet,
+/obj/machinery/firealarm/directional/west,
+/turf/open/floor/iron/dark,
+/area/station/science/ordnance)
"gKt" = (
/turf/closed/wall,
/area/station/science/auxlab/firing_range)
@@ -19096,21 +18950,6 @@
/obj/machinery/door/firedoor,
/turf/open/floor/iron/white/textured_large,
/area/station/science/xenobiology)
-"gME" = (
-/obj/effect/turf_decal/delivery,
-/obj/structure/table,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/item/raw_anomaly_core/random{
- pixel_x = -5;
- pixel_y = 7
- },
-/obj/item/raw_anomaly_core/random,
-/obj/item/raw_anomaly_core/random{
- pixel_x = 7;
- pixel_y = 9
- },
-/turf/open/floor/iron/dark,
-/area/station/science/ordnance/testlab)
"gMH" = (
/obj/machinery/door/airlock/maintenance,
/obj/effect/mapping_helpers/airlock/abandoned,
@@ -19353,6 +19192,12 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/iron/white,
/area/station/medical/chemistry/minisat)
+"gSN" = (
+/obj/effect/turf_decal/trimline/green/filled/line,
+/obj/structure/railing/corner,
+/obj/machinery/firealarm/directional/south,
+/turf/open/floor/iron/white,
+/area/station/hallway/secondary/entry)
"gSY" = (
/obj/item/target/syndicate,
/turf/open/floor/engine,
@@ -19389,16 +19234,6 @@
/obj/machinery/door/firedoor/border_only,
/turf/open/floor/iron/white,
/area/station/science/research)
-"gTF" = (
-/obj/structure/table,
-/obj/effect/turf_decal/tile/brown/anticorner/contrasted{
- dir = 8
- },
-/obj/effect/spawner/random/entertainment/cigarette_pack,
-/obj/item/cigarette/rollie/mindbreaker,
-/obj/machinery/airalarm/directional/east,
-/turf/open/floor/iron,
-/area/station/cargo/miningoffice)
"gTI" = (
/obj/effect/turf_decal/trimline/blue/filled/line{
dir = 4
@@ -19533,6 +19368,9 @@
dir = 10
},
/area/station/command/meeting_room)
+"gUJ" = (
+/turf/closed/wall/r_wall,
+/area/station/science/ordnance/burnchamber)
"gUK" = (
/obj/effect/turf_decal/tile/neutral/fourcorners,
/obj/effect/turf_decal/siding/purple{
@@ -19909,6 +19747,16 @@
/obj/effect/spawner/structure/window,
/turf/open/floor/plating,
/area/station/commons/storage/primary)
+"hbg" = (
+/obj/machinery/atmospherics/components/binary/pump/on{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/layer_manifold/scrubbers/hidden,
+/obj/machinery/airlock_sensor/incinerator_ordmix{
+ pixel_y = -24
+ },
+/turf/open/floor/engine,
+/area/station/science/ordnance/burnchamber)
"hbh" = (
/obj/effect/turf_decal/tile/red/half/contrasted{
dir = 1
@@ -19985,6 +19833,21 @@
"hbV" = (
/turf/open/floor/iron/dark,
/area/station/science/xenobiology)
+"hcd" = (
+/obj/machinery/door/airlock/research{
+ name = "Research Division Access"
+ },
+/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{
+ cycle_id = "sci-entrance"
+ },
+/obj/effect/mapping_helpers/airlock/unres{
+ dir = 4
+ },
+/obj/machinery/door/firedoor,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/mapping_helpers/airlock/access/all/science/general,
+/turf/open/floor/iron/white,
+/area/station/science/research)
"hce" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -20182,6 +20045,19 @@
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/station/engineering/atmos)
+"hfq" = (
+/obj/machinery/door/airlock/engineering/glass{
+ name = "Break Room"
+ },
+/obj/effect/mapping_helpers/airlock/access/any/engineering/general,
+/obj/structure/cable,
+/obj/effect/turf_decal/tile/yellow/fourcorners,
+/obj/machinery/door/firedoor,
+/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/engineering/construction,
+/turf/open/floor/iron,
+/area/station/engineering/break_room)
"hfv" = (
/obj/effect/mapping_helpers/broken_floor,
/obj/effect/decal/cleanable/dirt/dust,
@@ -20202,6 +20078,16 @@
/obj/structure/flora/coconuts,
/turf/open/floor/grass,
/area/station/science/genetics)
+"hfF" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/structure/cable,
+/obj/machinery/door/poddoor/preopen{
+ id = "Xenolab";
+ name = "Test Chamber Blast Door"
+ },
+/obj/structure/sign/warning/gas_mask/directional/south,
+/turf/open/floor/engine,
+/area/station/science/xenobiology)
"hfH" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/structure/cable,
@@ -20246,6 +20132,15 @@
},
/turf/open/floor/engine,
/area/station/engineering/supermatter/room)
+"hgq" = (
+/obj/machinery/door/poddoor/shutters/window{
+ dir = 4;
+ id = "ordauxgarage"
+ },
+/obj/effect/turf_decal/stripes/asteroid/end,
+/obj/effect/turf_decal/sand/plating,
+/turf/open/floor/plating,
+/area/station/science/ordnance)
"hgB" = (
/obj/machinery/door/airlock/maintenance/external,
/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance,
@@ -20441,6 +20336,11 @@
},
/turf/open/floor/plating,
/area/station/maintenance/department/science)
+"hkP" = (
+/obj/machinery/door/firedoor,
+/obj/effect/turf_decal/tile/purple/anticorner/contrasted,
+/turf/open/floor/iron/white,
+/area/station/science/lobby)
"hld" = (
/obj/structure/cable,
/obj/machinery/firealarm/directional/east,
@@ -20593,6 +20493,19 @@
/obj/structure/cable,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/turret_protected/aisat/teleporter)
+"hng" = (
+/obj/machinery/portable_atmospherics/canister/anesthetic_mix,
+/obj/machinery/atmospherics/components/unary/portables_connector/visible{
+ dir = 1
+ },
+/obj/structure/window/reinforced/spawner/directional/east,
+/obj/machinery/door/window/right/directional/north{
+ req_access = list("medical");
+ name = "Anti Assistant Protection Door"
+ },
+/obj/effect/turf_decal/tile/blue/fourcorners,
+/turf/open/floor/iron/white,
+/area/station/medical/treatment_center)
"hnh" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 4
@@ -20739,6 +20652,12 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/central)
+"hpC" = (
+/obj/machinery/light/small/directional/south,
+/obj/effect/spawner/random/structure/closet_empty/crate/with_loot,
+/obj/item/coin/plasma,
+/turf/open/misc/asteroid,
+/area/station/maintenance/department/science)
"hpT" = (
/obj/machinery/door/airlock/command{
name = "Quartermaster's Office"
@@ -21115,6 +21034,13 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/engineering/main)
+"huT" = (
+/obj/effect/turf_decal/trimline/green/filled/line{
+ dir = 4
+ },
+/obj/machinery/firealarm/directional/east,
+/turf/open/floor/iron/white,
+/area/station/hallway/secondary/entry)
"huX" = (
/obj/structure/closet,
/obj/effect/spawner/random/maintenance/two,
@@ -21423,6 +21349,12 @@
/obj/structure/cable,
/turf/open/floor/iron/dark,
/area/station/science/xenobiology)
+"hBW" = (
+/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{
+ dir = 4
+ },
+/turf/closed/wall/r_wall,
+/area/station/science/ordnance/burnchamber)
"hBX" = (
/obj/machinery/computer/records/security,
/obj/effect/turf_decal/tile/green/anticorner/contrasted{
@@ -21454,10 +21386,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/hallway/secondary/exit/departure_lounge)
-"hCu" = (
-/obj/effect/turf_decal/sand/plating,
-/turf/open/floor/plating/airless,
-/area/space)
"hCv" = (
/obj/machinery/mech_bay_recharge_port{
dir = 2
@@ -21532,17 +21460,6 @@
"hDo" = (
/turf/closed/wall/r_wall,
/area/station/security/evidence)
-"hDJ" = (
-/obj/machinery/door/poddoor/shutters{
- dir = 4;
- id = "ordauxgarage"
- },
-/obj/effect/turf_decal/sand/plating,
-/obj/effect/turf_decal/stripes/asteroid/end{
- dir = 1
- },
-/turf/open/floor/plating,
-/area/station/science/ordnance)
"hDK" = (
/obj/effect/turf_decal/tile/neutral,
/obj/machinery/camera/autoname/directional/south,
@@ -21550,6 +21467,16 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/hallway/primary/central)
+"hDM" = (
+/obj/effect/turf_decal/sand/plating,
+/obj/machinery/light/small/directional/south,
+/obj/structure/broken_flooring/pile,
+/obj/machinery/atmospherics/components/binary/pump/off/green/hidden{
+ dir = 4;
+ name = "Aux Oxygen To Port"
+ },
+/turf/open/floor/plating,
+/area/station/science/ordnance)
"hDV" = (
/obj/effect/turf_decal/tile/yellow/diagonal_centre,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -21621,6 +21548,13 @@
/obj/machinery/atmospherics/components/tank/plasma,
/turf/open/misc/asteroid,
/area/station/maintenance/disposal/incinerator)
+"hFq" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/components/binary/valve{
+ dir = 4
+ },
+/turf/open/floor/plating,
+/area/station/maintenance/department/science)
"hFA" = (
/obj/machinery/light/small/directional/south,
/obj/effect/turf_decal/stripes/asteroid/line{
@@ -21634,12 +21568,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/engineering/atmos)
-"hFN" = (
-/obj/machinery/atmospherics/components/unary/outlet_injector/on{
- dir = 8
- },
-/turf/open/floor/engine,
-/area/station/science/xenobiology)
"hFO" = (
/obj/machinery/power/apc/auto_name/directional/north,
/obj/structure/cable,
@@ -21824,6 +21752,19 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron,
/area/station/science/robotics/mechbay)
+"hJj" = (
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/structure/cable,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/simple/green/hidden{
+ dir = 5
+ },
+/turf/open/floor/iron/dark,
+/area/station/science/ordnance)
"hJo" = (
/obj/structure/closet/emcloset,
/turf/open/floor/plating,
@@ -22404,16 +22345,6 @@
dir = 1
},
/area/station/engineering/atmos/pumproom)
-"hTZ" = (
-/obj/structure/table,
-/obj/item/reagent_containers/cup/beaker{
- pixel_x = 5
- },
-/obj/item/reagent_containers/condiment/enzyme{
- layer = 5
- },
-/turf/open/floor/iron/kitchen,
-/area/station/service/kitchen)
"hUm" = (
/obj/machinery/light/cold/dim/directional/south,
/turf/open/floor/catwalk_floor/iron_dark,
@@ -22477,6 +22408,14 @@
/obj/effect/turf_decal/bot,
/turf/open/floor/engine,
/area/station/science/xenobiology)
+"hVb" = (
+/obj/item/stock_parts/power_store/cell/bluespace{
+ rigged = 1;
+ pixel_x = -5;
+ pixel_y = -8
+ },
+/turf/open/misc/asteroid,
+/area/station/asteroid)
"hVe" = (
/obj/effect/turf_decal/bot{
dir = 1
@@ -22488,14 +22427,6 @@
/obj/machinery/airalarm/directional/west,
/turf/open/floor/iron,
/area/station/engineering/storage)
-"hVm" = (
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/atmospherics/pipe/smart/simple/green/hidden{
- dir = 6
- },
-/turf/open/floor/iron/dark,
-/area/station/science/ordnance)
"hVs" = (
/obj/structure/cable,
/turf/open/floor/plating,
@@ -22525,6 +22456,11 @@
/obj/machinery/telecomms/hub/preset,
/turf/open/floor/circuit/green/telecomms/mainframe,
/area/station/tcommsat/server)
+"hWf" = (
+/obj/structure/window/reinforced/spawner/directional/north,
+/obj/structure/window/reinforced/spawner/directional/east,
+/turf/open/floor/engine,
+/area/station/science/xenobiology)
"hWt" = (
/obj/effect/turf_decal/box/corners{
dir = 8
@@ -22866,6 +22802,41 @@
/obj/item/radio/intercom/directional/west,
/turf/open/floor/plating,
/area/station/hallway/secondary/entry)
+"idN" = (
+/obj/structure/table,
+/obj/effect/turf_decal/bot,
+/obj/machinery/camera/directional/west{
+ c_tag = "Science Ordnance Test Lab";
+ network = list("ss13","rd")
+ },
+/obj/item/assembly/prox_sensor{
+ pixel_y = 2
+ },
+/obj/item/assembly/prox_sensor{
+ pixel_x = 9;
+ pixel_y = -2
+ },
+/obj/item/assembly/prox_sensor{
+ pixel_x = -4;
+ pixel_y = 1
+ },
+/obj/item/assembly/prox_sensor{
+ pixel_x = 8;
+ pixel_y = 9
+ },
+/obj/machinery/requests_console/directional/west{
+ department = "Ordnance Test Range";
+ name = "Test Range Requests Console"
+ },
+/obj/effect/mapping_helpers/requests_console/information,
+/obj/effect/mapping_helpers/requests_console/assistance,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/item/binoculars{
+ pixel_y = -10;
+ pixel_x = -5
+ },
+/turf/open/floor/iron/dark,
+/area/station/science/ordnance/testlab)
"idU" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/dark,
@@ -22976,9 +22947,6 @@
/obj/machinery/camera/autoname/directional/south,
/turf/open/floor/iron,
/area/station/engineering/lobby)
-"ifd" = (
-/turf/open/floor/engine/airless,
-/area/space)
"ifj" = (
/turf/open/floor/circuit/red,
/area/station/ai_monitored/turret_protected/ai_upload)
@@ -23422,11 +23390,6 @@
/obj/item/storage/box/monkeycubes,
/turf/open/floor/iron/white/textured_half,
/area/station/science/xenobiology)
-"ioL" = (
-/obj/item/radio/intercom/directional/east,
-/obj/machinery/portable_atmospherics/canister/oxygen,
-/turf/open/floor/iron/white,
-/area/station/science/ordnance/storage)
"ioP" = (
/obj/structure/cable/multilayer/multiz,
/obj/effect/decal/cleanable/dirt,
@@ -23459,26 +23422,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/security/armory)
-"ipq" = (
-/obj/structure/table,
-/obj/item/reagent_containers/condiment/saltshaker{
- layer = 3.1;
- pixel_x = -2;
- pixel_y = 2
- },
-/obj/item/reagent_containers/condiment/peppermill{
- desc = "Often used to flavor food or make people sneeze. Fashionably moved to the left side of the table.";
- pixel_x = -8;
- pixel_y = 2
- },
-/obj/item/reagent_containers/condiment/enzyme{
- pixel_x = 9;
- pixel_y = 3
- },
-/obj/item/book/manual/chef_recipes,
-/obj/effect/turf_decal/tile/red/opposingcorners,
-/turf/open/floor/iron/white,
-/area/station/security/prison/mess)
"ipu" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/dark/hidden,
/obj/machinery/door/airlock/public/glass/incinerator/atmos_interior,
@@ -23559,6 +23502,10 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron,
/area/station/security/prison/garden)
+"iqu" = (
+/obj/effect/spawner/random/medical/two_percent_xeno_egg_spawner,
+/turf/open/floor/engine/xenobio,
+/area/station/science/xenobiology)
"iqE" = (
/obj/structure/table/reinforced,
/obj/machinery/door/window/left/directional/west{
@@ -23578,26 +23525,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron,
/area/station/hallway/primary/central)
-"irf" = (
-/obj/structure/ladder,
-/obj/structure/window/reinforced/spawner/directional/east{
- layer = 2.9;
- pixel_x = 3
- },
-/obj/machinery/door/window/brigdoor/left/directional/south{
- pixel_y = -3;
- name = "Monkey Pen";
- req_one_access = list("genetics")
- },
-/obj/machinery/camera/autoname/directional/west{
- network = list("ss13","rd")
- },
-/obj/effect/turf_decal/siding/purple/corner,
-/obj/structure/sign/poster/random/directional/north,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/iron/white/textured,
-/area/station/science/genetics)
"irx" = (
/obj/structure/chair/sofa/bench/right{
dir = 4
@@ -23771,6 +23698,10 @@
"iuB" = (
/turf/open/floor/plating/elevatorshaft,
/area/station/ai_monitored/turret_protected/aisat_interior)
+"iuE" = (
+/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/incinerator_ordmix,
+/turf/open/floor/engine,
+/area/station/science/ordnance/burnchamber)
"iuU" = (
/obj/structure/window/reinforced/spawner/directional/west,
/mob/living/basic/bot/cleanbot,
@@ -24075,10 +24006,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/hallway/primary/central)
-"iAM" = (
-/obj/machinery/computer/security/telescreen/rd/directional/south,
-/turf/open/floor/glass/reinforced/plasma,
-/area/station/command/heads_quarters/rd)
"iBe" = (
/obj/structure/chair/pew/right{
dir = 4
@@ -24284,6 +24211,17 @@
dir = 1
},
/area/station/service/chapel)
+"iEL" = (
+/obj/structure/table/glass,
+/obj/item/flatpack{
+ board = /obj/item/circuitboard/machine/flatpacker;
+ pixel_x = -5
+ },
+/obj/item/multitool{
+ pixel_x = 8
+ },
+/turf/open/floor/iron,
+/area/station/engineering/lobby)
"iEO" = (
/turf/closed/wall,
/area/station/security/prison/mess)
@@ -24316,19 +24254,6 @@
},
/turf/open/floor/iron/white,
/area/station/security/medical)
-"iFn" = (
-/obj/structure/closet/crate,
-/obj/item/stack/sheet/iron/fifty,
-/obj/item/stack/rods/fifty,
-/obj/item/stack/sheet/glass/fifty,
-/obj/item/electronics/airlock,
-/obj/item/electronics/airlock,
-/obj/item/stock_parts/power_store/cell/high,
-/obj/item/stack/sheet/mineral/plasma{
- amount = 30
- },
-/turf/open/floor/plating,
-/area/station/engineering/storage)
"iFq" = (
/obj/structure/cable,
/obj/structure/disposalpipe/segment{
@@ -24497,11 +24422,6 @@
},
/turf/open/floor/iron,
/area/station/commons/storage/tools)
-"iII" = (
-/obj/machinery/shower/directional/east,
-/obj/machinery/camera/autoname/directional/south,
-/turf/open/floor/iron/showroomfloor,
-/area/station/cargo/storage)
"iIR" = (
/obj/structure/cable,
/obj/structure/disposalpipe/sorting/mail/flip{
@@ -24563,6 +24483,14 @@
},
/turf/open/floor/iron,
/area/station/cargo/storage)
+"iJs" = (
+/obj/machinery/camera/directional/east{
+ c_tag = "Xenobiology Lab - Secure Pen";
+ network = list("ss13","rd","xeno")
+ },
+/obj/structure/sign/warning/biohazard/directional/east,
+/turf/open/floor/engine/xenobio,
+/area/station/science/xenobiology)
"iJt" = (
/obj/structure/cable,
/obj/effect/turf_decal/trimline/yellow/filled/line{
@@ -24618,13 +24546,22 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/dark/small,
/area/station/science/cytology)
-"iJZ" = (
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/machinery/airalarm/directional/north,
-/obj/structure/filingcabinet,
-/obj/machinery/firealarm/directional/west,
-/turf/open/floor/iron/dark,
-/area/station/science/ordnance)
+"iKb" = (
+/obj/machinery/door/poddoor/shutters/window/preopen{
+ id = "ordstorage"
+ },
+/obj/effect/turf_decal/stripes/line,
+/obj/machinery/button/door/directional/east{
+ req_access = list("ordnance");
+ name = "Ordnance Storage Shutter Control";
+ id = "ordstorage"
+ },
+/obj/effect/turf_decal/caution/stand_clear/red,
+/obj/effect/turf_decal/stripes/corner{
+ dir = 4
+ },
+/turf/open/floor/iron/white,
+/area/station/science/ordnance/storage)
"iKc" = (
/turf/open/floor/iron/white,
/area/station/science/lobby)
@@ -24875,18 +24812,6 @@
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plating,
/area/station/maintenance/disposal)
-"iPz" = (
-/obj/effect/turf_decal/stripes/line,
-/obj/structure/window/reinforced/survival_pod/spawner/directional/south,
-/obj/structure/table,
-/obj/machinery/cell_charger,
-/obj/item/stock_parts/power_store/cell/high,
-/obj/effect/turf_decal/bot{
- dir = 1
- },
-/obj/machinery/airalarm/directional/west,
-/turf/open/floor/iron,
-/area/station/command/gateway)
"iPH" = (
/obj/structure/cable,
/turf/open/floor/iron/dark,
@@ -24900,13 +24825,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/dark,
/area/station/command/corporate_showroom)
-"iPW" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/components/tank/oxygen{
- dir = 8
- },
-/turf/open/floor/plating,
-/area/station/maintenance/department/science)
"iQt" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/spawner/random/trash/food_packaging,
@@ -25123,6 +25041,10 @@
/obj/machinery/light/directional/east,
/turf/open/openspace,
/area/station/engineering/supermatter/room)
+"iWb" = (
+/obj/machinery/light/floor,
+/turf/open/floor/engine/xenobio,
+/area/station/science/xenobiology)
"iWn" = (
/obj/effect/turf_decal/trimline/yellow/filled/line{
dir = 10
@@ -25364,11 +25286,6 @@
},
/turf/open/floor/iron/white,
/area/station/medical/medbay/central)
-"jbL" = (
-/obj/machinery/door/firedoor,
-/obj/effect/turf_decal/tile/purple/anticorner/contrasted,
-/turf/open/floor/iron/white,
-/area/station/science/lobby)
"jbM" = (
/obj/effect/turf_decal/tile/neutral/fourcorners,
/obj/structure/table/reinforced,
@@ -25669,6 +25586,12 @@
},
/turf/open/floor/wood/parquet,
/area/station/service/theater)
+"jgE" = (
+/obj/structure/statue/sandstone/venus{
+ dir = 1
+ },
+/turf/open/floor/grass,
+/area/station/science/research)
"jgH" = (
/obj/machinery/holopad,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -26102,6 +26025,17 @@
},
/turf/open/floor/iron/textured,
/area/station/cargo/storage)
+"jnV" = (
+/obj/machinery/disposal/bin,
+/obj/effect/turf_decal/tile/blue/fourcorners,
+/obj/effect/turf_decal/box/white{
+ color = "#52B4E9"
+ },
+/obj/structure/disposalpipe/trunk,
+/obj/machinery/requests_console/auto_name/directional/north,
+/obj/effect/mapping_helpers/requests_console/assistance,
+/turf/open/floor/iron/white,
+/area/station/medical/storage)
"jnY" = (
/obj/effect/spawner/structure/window/reinforced/plasma,
/obj/structure/cable,
@@ -26376,11 +26310,6 @@
"jsC" = (
/turf/closed/wall/r_wall,
/area/station/maintenance/department/medical/central)
-"jsI" = (
-/turf/closed/mineral/random/stationside/asteroid/porus{
- mineralChance = 20
- },
-/area/space/nearstation)
"jsL" = (
/obj/effect/turf_decal/bot{
dir = 1
@@ -26420,6 +26349,14 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
/area/station/maintenance/aft/upper)
+"jtG" = (
+/obj/structure/closet/secure_closet/security/med,
+/obj/structure/cable,
+/obj/effect/turf_decal/tile/red/fourcorners,
+/obj/item/radio/intercom/directional/north,
+/obj/machinery/power/apc/auto_name/directional/west,
+/turf/open/floor/iron/dark,
+/area/station/security/checkpoint/medical)
"jtR" = (
/obj/structure/flora/bush/sunny/style_random,
/turf/open/floor/grass,
@@ -26537,13 +26474,13 @@
},
/turf/open/floor/wood,
/area/station/commons/lounge)
-"jvV" = (
-/obj/machinery/computer/operating{
- dir = 8
- },
-/obj/structure/sign/warning/biohazard/directional/east,
-/turf/open/floor/engine,
-/area/station/science/xenobiology)
+"jvU" = (
+/obj/structure/table,
+/obj/machinery/cell_charger,
+/obj/item/stock_parts/power_store/cell/high,
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/iron,
+/area/station/hallway/primary/central)
"jwa" = (
/obj/structure/lattice,
/obj/effect/spawner/random/structure/grille,
@@ -26788,6 +26725,13 @@
},
/turf/open/floor/plating/airless,
/area/station/science/ordnance/bomb)
+"jAb" = (
+/obj/machinery/camera/motion/directional/west{
+ network = list("aicore");
+ c_tag = "Secure - AI Upper External East"
+ },
+/turf/open/space/openspace,
+/area/space/nearstation)
"jAd" = (
/obj/machinery/teleport/hub,
/turf/open/floor/iron/dark,
@@ -27124,21 +27068,15 @@
},
/turf/open/floor/engine,
/area/station/medical/chemistry)
-"jEw" = (
-/obj/effect/mapping_helpers/broken_floor,
-/obj/structure/closet/crate/science{
- opened = 1;
- icon_state = "scicrateopen"
- },
-/obj/item/tank,
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/turf_decal/stripes/line,
-/turf/open/floor/iron/dark/smooth_large,
-/area/station/science/ordnance)
"jED" = (
/obj/machinery/camera/autoname/directional/east,
/turf/open/floor/iron/freezer,
/area/station/security/prison/shower)
+"jEO" = (
+/obj/structure/transport/linear/public,
+/obj/machinery/light/floor/transport,
+/turf/open/floor/plating/elevatorshaft,
+/area/station/medical/treatment_center)
"jEX" = (
/obj/machinery/newscaster/directional/west,
/turf/open/floor/carpet/orange,
@@ -27299,6 +27237,15 @@
/obj/machinery/firealarm/directional/west,
/turf/open/floor/iron/dark,
/area/station/command/corporate_showroom)
+"jHE" = (
+/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/simple/green/hidden{
+ dir = 9
+ },
+/turf/open/floor/iron/white,
+/area/station/science/ordnance/testlab)
"jHH" = (
/obj/machinery/disposal/bin,
/obj/machinery/airalarm/directional/east,
@@ -27403,14 +27350,6 @@
/obj/structure/sign/poster/contraband/lusty_xenomorph/directional/north,
/turf/open/floor/plating,
/area/station/maintenance/central/greater)
-"jIY" = (
-/obj/structure/chair{
- name = "Defense"
- },
-/obj/machinery/power/apc/auto_name/directional/north,
-/obj/structure/cable,
-/turf/open/floor/iron,
-/area/station/security/courtroom)
"jJb" = (
/turf/closed/wall/r_wall,
/area/station/hallway/secondary/entry)
@@ -27451,6 +27390,12 @@
/obj/structure/closet/crate/trashcart/filled,
/turf/open/floor/plating,
/area/station/maintenance/department/medical/central)
+"jJJ" = (
+/obj/structure/window/reinforced/spawner/directional/north,
+/obj/structure/flora/bush/fullgrass/style_random,
+/obj/structure/window/reinforced/spawner/directional/east,
+/turf/open/floor/grass,
+/area/station/science/research)
"jJS" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -27544,6 +27489,10 @@
},
/turf/open/floor/iron/dark/corner,
/area/station/engineering/atmos)
+"jLn" = (
+/mob/living/basic/mining/basilisk,
+/turf/open/misc/asteroid/airless,
+/area/space/nearstation)
"jLp" = (
/obj/machinery/photocopier,
/turf/open/floor/carpet/purple,
@@ -27908,27 +27857,18 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron,
/area/station/commons/vacant_room/commissary)
-"jSs" = (
-/obj/machinery/door/airlock/command{
- name = "Head of Personnel's Booth"
- },
-/obj/effect/turf_decal/siding/wood,
-/obj/effect/mapping_helpers/airlock/access/any/command/hop,
-/obj/machinery/door/firedoor,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{
- cycle_id = "bridgehop"
- },
-/turf/open/floor/carpet/green,
-/area/station/command/heads_quarters/hop)
"jSu" = (
/obj/machinery/atmospherics/pipe/smart/simple/green/visible{
dir = 8
},
/turf/open/floor/iron,
/area/station/engineering/atmos)
+"jSz" = (
+/obj/effect/turf_decal/trimline/yellow/filled/line,
+/obj/machinery/chem_dispenser,
+/obj/machinery/light/directional/south,
+/turf/open/floor/iron/white,
+/area/station/medical/chemistry)
"jSE" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -28359,6 +28299,22 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/hallway/secondary/command)
+"kaD" = (
+/obj/item/circuitboard/machine/thermomachine,
+/obj/item/circuitboard/machine/thermomachine,
+/obj/item/storage/bag/construction,
+/obj/item/storage/bag/construction,
+/obj/item/storage/bag/construction,
+/obj/item/stock_parts/power_store/cell/high,
+/obj/item/stock_parts/power_store/cell/high,
+/obj/item/stock_parts/power_store/cell/high,
+/obj/structure/closet/crate,
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/machinery/light/dim/directional/south,
+/turf/open/floor/iron/large,
+/area/station/engineering/atmos)
"kaJ" = (
/obj/effect/turf_decal/tile/red/half/contrasted,
/obj/structure/cable,
@@ -28394,6 +28350,12 @@
/obj/effect/spawner/random/food_or_drink/snack,
/turf/open/floor/iron/white/herringbone,
/area/station/science/breakroom)
+"kbO" = (
+/obj/structure/window/reinforced/spawner/directional/south,
+/obj/structure/flora/bush/fullgrass/style_random,
+/obj/structure/window/reinforced/spawner/directional/east,
+/turf/open/floor/grass,
+/area/station/science/research)
"kbT" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/landmark/event_spawn,
@@ -28401,6 +28363,18 @@
/obj/effect/turf_decal/bot,
/turf/open/floor/iron/dark,
/area/station/command/bridge)
+"kbU" = (
+/obj/machinery/door/airlock/command{
+ name = "Head of Personnel's Quarters"
+ },
+/obj/effect/turf_decal/siding/wood,
+/obj/machinery/door/firedoor,
+/obj/effect/mapping_helpers/airlock/access/any/command/hop,
+/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{
+ cycle_id = "bridgehop"
+ },
+/turf/open/floor/iron,
+/area/station/command/heads_quarters/hop)
"kbW" = (
/obj/structure/chair/plastic{
dir = 8
@@ -28766,11 +28740,11 @@
/obj/machinery/disposal/bin,
/turf/open/floor/iron,
/area/station/commons/storage/primary)
-"khJ" = (
-/obj/effect/decal/cleanable/blood/old{
- icon_state = "gib5-old"
+"khB" = (
+/obj/machinery/sparker/directional/north{
+ id = "Xenobio"
},
-/turf/open/floor/engine,
+/turf/open/floor/engine/xenobio,
/area/station/science/xenobiology)
"khL" = (
/obj/effect/turf_decal/trimline/green/filled/line,
@@ -28998,18 +28972,6 @@
/obj/machinery/light/directional/east,
/turf/open/floor/iron/kitchen,
/area/station/service/kitchen)
-"kkJ" = (
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/structure/table,
-/obj/machinery/cell_charger,
-/obj/item/stock_parts/power_store/cell/high,
-/obj/machinery/button/door/directional/south{
- id = "evashutter";
- name = "E.V.A. Storage Shutter Control";
- req_access = list("command")
- },
-/turf/open/floor/iron/dark,
-/area/station/ai_monitored/command/storage/eva)
"kkK" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
dir = 4
@@ -29494,18 +29456,6 @@
/obj/machinery/light/directional/east,
/turf/open/floor/iron,
/area/station/security/prison)
-"krz" = (
-/obj/machinery/atmospherics/components/unary/thermomachine/freezer/on{
- dir = 4;
- name = "euthanization chamber freezer";
- layer = 2.89
- },
-/obj/structure/window/reinforced/spawner/directional/east{
- layer = 2.9
- },
-/obj/effect/turf_decal/tile/blue/fourcorners,
-/turf/open/floor/iron,
-/area/station/science/xenobiology)
"krJ" = (
/obj/machinery/atmospherics/pipe/smart/simple/purple/visible{
dir = 10
@@ -29781,6 +29731,12 @@
},
/turf/open/floor/iron/white,
/area/station/medical/storage)
+"kxc" = (
+/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/ordnance_burn_chamber_input{
+ dir = 8
+ },
+/turf/open/floor/engine/vacuum,
+/area/station/science/ordnance/burnchamber)
"kxk" = (
/obj/effect/turf_decal/tile/neutral/diagonal_centre,
/obj/machinery/camera/autoname/directional/north,
@@ -30044,18 +30000,6 @@
/obj/structure/cable,
/turf/open/floor/iron/large,
/area/station/service/hydroponics/garden)
-"kBr" = (
-/obj/structure/barricade/wooden,
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/pipe/smart/simple/green/visible{
- dir = 4
- },
-/obj/item/flashlight/glowstick/blue{
- start_on = 1;
- light_range = 2
- },
-/turf/open/floor/plating,
-/area/station/maintenance/department/science)
"kBt" = (
/obj/machinery/modular_computer/preset/civilian,
/obj/machinery/button/door/directional/north{
@@ -30613,6 +30557,13 @@
/obj/structure/cable,
/turf/open/floor/plating,
/area/station/maintenance/aft/upper)
+"kKS" = (
+/obj/structure/table,
+/obj/machinery/cell_charger,
+/obj/item/stock_parts/power_store/cell/high,
+/obj/machinery/light_switch/directional/south,
+/turf/open/floor/iron/white,
+/area/station/science/lab)
"kLi" = (
/turf/closed/wall/mineral/plastitanium/nodiagonal,
/area/station/maintenance/department/medical/central)
@@ -30718,11 +30669,27 @@
},
/turf/open/floor/engine,
/area/station/command/corporate_dock)
+"kNM" = (
+/obj/machinery/door/airlock/multi_tile/public{
+ name = "Corporate Private Dock"
+ },
+/obj/structure/cable,
+/obj/machinery/door/firedoor,
+/obj/effect/mapping_helpers/airlock/access/any/command/general,
+/obj/effect/mapping_helpers/airlock/access/any/admin/general,
+/turf/open/floor/iron/dark/smooth_large,
+/area/station/command/corporate_dock)
"kNO" = (
/obj/effect/turf_decal/siding/wood,
/obj/machinery/newscaster/directional/south,
/turf/open/floor/wood,
/area/station/service/library)
+"kNP" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
+ dir = 8
+ },
+/turf/open/floor/engine/vacuum,
+/area/station/science/ordnance/burnchamber)
"kNX" = (
/obj/structure/table/reinforced,
/obj/structure/window/reinforced/spawner/directional/east,
@@ -30878,16 +30845,6 @@
/obj/structure/sign/poster/random/directional/north,
/turf/open/floor/iron,
/area/station/cargo/storage)
-"kQV" = (
-/obj/effect/turf_decal/trimline/dark_blue/filled/line{
- dir = 4
- },
-/obj/machinery/computer/security/telescreen/cmo/directional/east,
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
- dir = 1
- },
-/turf/open/floor/holofloor/dark,
-/area/station/command/heads_quarters/cmo)
"kRl" = (
/obj/effect/landmark/event_spawn,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -31232,6 +31189,16 @@
/obj/effect/spawner/random/structure/closet_maintenance,
/turf/open/floor/plating,
/area/station/maintenance/department/medical/central)
+"kWj" = (
+/obj/machinery/computer/security/telescreen/interrogation/directional/east,
+/obj/effect/turf_decal/tile/red/half/contrasted{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/cable,
+/obj/structure/disposalpipe/segment,
+/turf/open/floor/iron,
+/area/station/security/interrogation)
"kWk" = (
/obj/effect/turf_decal/stripes/line,
/obj/structure/cable,
@@ -31356,6 +31323,10 @@
/obj/effect/mapping_helpers/requests_console/assistance,
/turf/open/floor/iron/dark,
/area/station/command/bridge)
+"kYV" = (
+/obj/structure/girder,
+/turf/open/misc/asteroid/airless,
+/area/space/nearstation)
"kYW" = (
/obj/structure/table/reinforced,
/obj/structure/displaycase/forsale/kitchen{
@@ -31445,6 +31416,10 @@
/obj/machinery/door/firedoor,
/turf/open/floor/iron,
/area/station/service/hydroponics)
+"kZT" = (
+/obj/structure/sign/warning/biohazard/directional/east,
+/turf/open/floor/engine/xenobio,
+/area/station/science/xenobiology)
"laf" = (
/obj/effect/spawner/random/structure/chair_comfy{
dir = 4
@@ -31496,6 +31471,20 @@
/obj/structure/rack,
/turf/open/floor/plating,
/area/station/maintenance/central/lesser)
+"laW" = (
+/obj/structure/table,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/item/pipe_dispenser{
+ pixel_x = 3;
+ pixel_y = 7
+ },
+/obj/item/pipe_dispenser,
+/obj/machinery/power/apc/auto_name/directional/south{
+ areastring = "/area/station/science/ordnance/burnchamber"
+ },
+/obj/structure/cable,
+/turf/open/floor/iron/dark,
+/area/station/science/ordnance)
"lbg" = (
/turf/open/floor/plating,
/area/station/cargo/storage)
@@ -31604,6 +31593,10 @@
},
/turf/open/floor/plating,
/area/station/hallway/secondary/entry)
+"ldS" = (
+/obj/structure/table,
+/turf/open/floor/iron/white,
+/area/station/science/ordnance/testlab)
"ldT" = (
/obj/machinery/portable_atmospherics/pump,
/turf/open/floor/plating,
@@ -31680,12 +31673,6 @@
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/iron,
/area/station/security/brig/entrance)
-"lfq" = (
-/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{
- dir = 8
- },
-/turf/closed/wall/r_wall,
-/area/station/science/ordnance/burnchamber)
"lfu" = (
/obj/effect/turf_decal/tile/dark_red/opposingcorners,
/obj/effect/landmark/start/bartender,
@@ -32024,6 +32011,17 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/plating,
/area/station/maintenance/department/medical/central)
+"lmw" = (
+/obj/machinery/door/poddoor/shutters{
+ id = "ordauxgarage";
+ dir = 1
+ },
+/obj/effect/turf_decal/sand/plating,
+/obj/effect/turf_decal/stripes/asteroid/end{
+ dir = 8
+ },
+/turf/open/floor/plating,
+/area/station/science/ordnance)
"lmI" = (
/obj/structure/lattice,
/obj/machinery/atmospherics/components/unary/passive_vent/layer2{
@@ -32081,13 +32079,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron,
/area/station/ai_monitored/command/storage/eva)
-"lny" = (
-/obj/structure/window/reinforced/spawner/directional/east{
- layer = 2.9
- },
-/obj/machinery/light/directional/south,
-/turf/open/floor/engine,
-/area/station/science/xenobiology)
"lnG" = (
/obj/structure/bed,
/obj/machinery/airalarm/directional/north,
@@ -32142,18 +32133,6 @@
/obj/item/toy/figure/borg,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/turret_protected/aisat/teleporter)
-"loC" = (
-/obj/machinery/door/airlock/command{
- name = "Head of Personnel's Quarters"
- },
-/obj/effect/turf_decal/siding/wood,
-/obj/machinery/door/firedoor,
-/obj/effect/mapping_helpers/airlock/access/any/command/hop,
-/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{
- cycle_id = "bridgehop"
- },
-/turf/open/floor/iron,
-/area/station/command/heads_quarters/hop)
"loR" = (
/obj/effect/mapping_helpers/broken_floor,
/obj/machinery/power/port_gen/pacman/pre_loaded,
@@ -32250,6 +32229,11 @@
/obj/effect/landmark/event_spawn,
/turf/open/floor/iron,
/area/station/cargo/drone_bay)
+"lqZ" = (
+/obj/item/radio/intercom/directional/east,
+/obj/machinery/portable_atmospherics/canister/oxygen,
+/turf/open/floor/iron/white,
+/area/station/science/ordnance/storage)
"lrc" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -32784,15 +32768,6 @@
dir = 4
},
/area/station/command/meeting_room)
-"lBm" = (
-/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/simple/green/hidden{
- dir = 9
- },
-/turf/open/floor/iron/white,
-/area/station/science/ordnance/testlab)
"lBu" = (
/obj/effect/turf_decal/tile/brown/half/contrasted{
dir = 1
@@ -32868,10 +32843,10 @@
/obj/item/radio/intercom/directional/north,
/turf/open/floor/iron/white,
/area/station/medical/chemistry/minisat)
-"lCK" = (
-/obj/effect/turf_decal/siding/dark_blue,
-/turf/open/floor/iron/textured_large,
-/area/station/command/bridge)
+"lCD" = (
+/obj/structure/lattice,
+/turf/open/floor/engine/airless,
+/area/space/nearstation)
"lCO" = (
/obj/structure/chair/pew{
dir = 4
@@ -33151,10 +33126,6 @@
"lHm" = (
/turf/closed/wall,
/area/station/engineering/storage/tech)
-"lHp" = (
-/obj/effect/spawner/random/medical/two_percent_xeno_egg_spawner,
-/turf/open/floor/engine,
-/area/station/science/xenobiology)
"lHx" = (
/obj/machinery/door/airlock/engineering{
name = "Auxiliary Base Construction"
@@ -33568,15 +33539,6 @@
},
/turf/open/floor/plating,
/area/station/maintenance/central/lesser)
-"lQe" = (
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/structure/table,
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/cable/multilayer/connected,
-/obj/machinery/cell_charger,
-/obj/item/stock_parts/power_store/cell/high,
-/turf/open/floor/iron/dark,
-/area/station/ai_monitored/command/storage/satellite)
"lQl" = (
/obj/structure/cable,
/obj/effect/spawner/structure/window/hollow/reinforced/end{
@@ -34003,13 +33965,6 @@
},
/turf/open/floor/iron/dark/textured,
/area/station/science/robotics/lab)
-"lYo" = (
-/obj/structure/table,
-/obj/machinery/cell_charger,
-/obj/item/stock_parts/power_store/cell/high,
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/iron,
-/area/station/hallway/primary/central)
"lYp" = (
/obj/structure/railing/corner{
dir = 4
@@ -34160,6 +34115,10 @@
/obj/machinery/firealarm/directional/west,
/turf/open/floor/wood,
/area/station/commons/lounge)
+"maT" = (
+/obj/structure/window/reinforced/spawner/directional/west,
+/turf/open/floor/glass/reinforced,
+/area/station/security/prison)
"maY" = (
/obj/structure/table/wood,
/obj/effect/turf_decal/tile/red/half/contrasted{
@@ -34324,15 +34283,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/dark,
/area/station/security/lockers)
-"meT" = (
-/obj/effect/turf_decal/tile/brown/half/contrasted,
-/obj/machinery/disposal/bin,
-/obj/structure/disposalpipe/trunk{
- dir = 1
- },
-/obj/machinery/digital_clock/directional/south,
-/turf/open/floor/iron,
-/area/station/cargo/storage)
"mff" = (
/obj/effect/turf_decal/tile/blue/half/contrasted,
/turf/open/floor/iron,
@@ -34358,17 +34308,6 @@
/obj/effect/baseturf_helper/reinforced_plating/ceiling,
/turf/open/floor/iron/dark,
/area/station/science/ordnance)
-"mgi" = (
-/obj/machinery/door/poddoor/shutters{
- id = "ordauxgarage";
- dir = 1
- },
-/obj/effect/turf_decal/sand/plating,
-/obj/effect/turf_decal/stripes/asteroid/end{
- dir = 8
- },
-/turf/open/floor/plating,
-/area/station/science/ordnance)
"mgn" = (
/obj/docking_port/stationary{
dir = 8;
@@ -34492,6 +34431,10 @@
},
/turf/open/floor/iron/dark,
/area/station/security/warden)
+"mie" = (
+/obj/structure/broken_flooring/singular/directional/south,
+/turf/open/space/openspace,
+/area/space/nearstation)
"mil" = (
/obj/machinery/atmospherics/pipe/multiz/scrubbers/visible/layer2{
name = "chimpanzee filth exhaust"
@@ -34545,12 +34488,6 @@
/obj/structure/cable,
/turf/open/floor/iron/dark,
/area/station/security/checkpoint/engineering)
-"miM" = (
-/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/ordnance_burn_chamber_input{
- dir = 8
- },
-/turf/open/floor/engine/vacuum,
-/area/station/science/ordnance/burnchamber)
"miR" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -34565,6 +34502,13 @@
/obj/effect/spawner/random/trash/mess,
/turf/open/floor/plating,
/area/station/maintenance/central/greater)
+"miX" = (
+/obj/effect/turf_decal/siding/purple{
+ dir = 1
+ },
+/obj/machinery/computer/security/telescreen/ordnance/directional/south,
+/turf/open/floor/iron/white,
+/area/station/science/ordnance/testlab)
"mjd" = (
/obj/machinery/light/directional/south,
/obj/machinery/cell_charger,
@@ -34814,21 +34758,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/dark,
/area/station/maintenance/department/engine)
-"mnm" = (
-/obj/machinery/chem_dispenser{
- layer = 2.7
- },
-/obj/item/radio/intercom/directional/north,
-/obj/effect/turf_decal/trimline/yellow/filled/line{
- dir = 1
- },
-/obj/effect/turf_decal/trimline/yellow/filled/mid_joiner{
- dir = 1
- },
-/turf/open/floor/iron/white/smooth_edge{
- dir = 1
- },
-/area/station/medical/pharmacy)
"mnt" = (
/obj/structure/cable,
/obj/structure/disposalpipe/segment{
@@ -34881,14 +34810,6 @@
"mnP" = (
/turf/open/floor/iron,
/area/station/service/hydroponics)
-"mnS" = (
-/obj/machinery/portable_atmospherics/pump,
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/iron/dark/smooth_large,
-/area/station/science/ordnance)
"mnU" = (
/obj/effect/turf_decal/trimline/yellow/filled/line{
dir = 1
@@ -35173,21 +35094,6 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/fore)
-"mtG" = (
-/obj/machinery/door/airlock/command,
-/obj/machinery/door/firedoor,
-/obj/effect/mapping_helpers/airlock/access/any/command/general,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{
- cycle_id = "bridgec"
- },
-/obj/effect/mapping_helpers/airlock/access/any/admin/general,
-/turf/open/floor/iron/dark/side{
- dir = 4
- },
-/area/station/command/corporate_showroom)
"mtH" = (
/turf/open/floor/plating/airless,
/area/station/solars/port)
@@ -35205,6 +35111,16 @@
},
/turf/open/floor/wood,
/area/station/security/detectives_office/private_investigators_office)
+"mtU" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/structure/cable,
+/obj/machinery/door/poddoor/preopen{
+ id = "Xenolab";
+ name = "Test Chamber Blast Door"
+ },
+/obj/structure/sign/warning/gas_mask/directional/north,
+/turf/open/floor/engine,
+/area/station/science/xenobiology)
"mua" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/decal/cleanable/blood/old,
@@ -35626,20 +35542,6 @@
/obj/structure/weightmachine,
/turf/open/floor/iron/white/textured_large,
/area/station/commons/fitness/recreation)
-"mBX" = (
-/obj/machinery/door/airlock/engineering/glass{
- name = "Engineering Foyer"
- },
-/obj/effect/mapping_helpers/airlock/access/any/engineering/general,
-/obj/structure/cable,
-/obj/machinery/door/firedoor,
-/obj/effect/landmark/navigate_destination/engineering,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/effect/mapping_helpers/airlock/access/any/engineering/construction,
-/turf/open/floor/iron,
-/area/station/engineering/lobby)
"mBY" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 4
@@ -35699,6 +35601,16 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/kitchen,
/area/station/service/kitchen)
+"mCH" = (
+/obj/machinery/computer/security{
+ dir = 4
+ },
+/obj/structure/sign/poster/official/random/directional/west,
+/obj/effect/turf_decal/tile/dark_blue/half/contrasted{
+ dir = 8
+ },
+/turf/open/floor/iron/dark,
+/area/station/command/bridge)
"mCN" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/structure/cable,
@@ -35733,10 +35645,6 @@
/obj/machinery/holopad,
/turf/open/floor/wood/parquet,
/area/station/cargo/boutique)
-"mDx" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/closed/wall/r_wall,
-/area/station/science/ordnance/burnchamber)
"mDF" = (
/obj/effect/turf_decal/trimline/blue/filled/line{
dir = 4
@@ -35815,17 +35723,6 @@
/obj/effect/mapping_helpers/broken_floor,
/turf/open/floor/plating,
/area/station/maintenance/port/greater)
-"mFa" = (
-/obj/machinery/door/firedoor/heavy,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/machinery/door/airlock/research{
- name = "Ordnance Auxiliary Storage"
- },
-/obj/effect/mapping_helpers/airlock/access/all/science/ordnance,
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/atmospherics/pipe/smart/simple/green/hidden,
-/turf/open/floor/iron/dark,
-/area/station/science/ordnance)
"mFb" = (
/obj/structure/fans/tiny,
/obj/machinery/door/poddoor/massdriver_chapel,
@@ -35854,21 +35751,21 @@
/obj/item/clothing/gloves/color/yellow,
/turf/open/floor/iron/dark,
/area/station/security/execution/education)
-"mFR" = (
-/obj/effect/turf_decal/tile/yellow/anticorner/contrasted{
- dir = 4
- },
-/obj/structure/closet/toolcloset,
-/obj/machinery/computer/security/telescreen/auxbase/directional/east,
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/light_switch/directional/north,
-/turf/open/floor/iron,
-/area/station/construction/mining/aux_base)
"mFT" = (
/obj/machinery/newscaster/directional/west,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/freezer,
/area/station/security/prison/shower)
+"mGg" = (
+/obj/effect/landmark/blobstart,
+/obj/structure/closet/crate/science{
+ opened = 1;
+ icon_state = "scicrateopen"
+ },
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/turf_decal/stripes/line,
+/turf/open/floor/iron/dark/smooth_large,
+/area/station/science/ordnance)
"mGk" = (
/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{
dir = 9
@@ -35900,6 +35797,21 @@
/obj/effect/spawner/structure/window,
/turf/open/floor/plating,
/area/station/hallway/primary/central)
+"mGw" = (
+/obj/machinery/door/airlock/command,
+/obj/machinery/door/firedoor,
+/obj/effect/mapping_helpers/airlock/access/any/command/general,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{
+ cycle_id = "bridgec"
+ },
+/obj/effect/mapping_helpers/airlock/access/any/admin/general,
+/turf/open/floor/iron/dark/side{
+ dir = 4
+ },
+/area/station/command/corporate_showroom)
"mGG" = (
/turf/closed/wall,
/area/station/security/breakroom)
@@ -36017,15 +35929,6 @@
},
/turf/open/floor/wood/large,
/area/station/cargo/boutique)
-"mIG" = (
-/obj/structure/window/spawner/directional/east,
-/obj/effect/turf_decal/stripes/corner{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/portable_atmospherics/scrubber,
-/turf/open/floor/iron/dark/smooth_large,
-/area/station/science/ordnance)
"mIH" = (
/obj/structure/lattice,
/obj/effect/turf_decal/stripes/asteroid/line{
@@ -36150,13 +36053,6 @@
"mKD" = (
/turf/closed/wall,
/area/station/hallway/secondary/command)
-"mKF" = (
-/obj/structure/table,
-/obj/machinery/cell_charger,
-/obj/item/stock_parts/power_store/cell/high,
-/obj/machinery/light_switch/directional/south,
-/turf/open/floor/iron/white,
-/area/station/science/lab)
"mKJ" = (
/obj/structure/lattice/catwalk,
/obj/machinery/camera/autoname/directional/south,
@@ -36322,20 +36218,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/dark,
/area/station/security/courtroom)
-"mOc" = (
-/obj/machinery/door/airlock/research{
- name = "Research Division Access"
- },
-/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{
- cycle_id = "sci-entrance"
- },
-/obj/effect/mapping_helpers/airlock/unres{
- dir = 4
- },
-/obj/machinery/door/firedoor,
-/obj/effect/mapping_helpers/airlock/access/all/science/general,
-/turf/open/floor/iron/white,
-/area/station/science/research)
"mOo" = (
/obj/effect/turf_decal/tile/brown/half/contrasted,
/turf/open/floor/iron,
@@ -36365,6 +36247,15 @@
/obj/item/radio/intercom/directional/west,
/turf/open/floor/iron,
/area/station/cargo/storage)
+"mOS" = (
+/obj/machinery/igniter/incinerator_ordmix,
+/turf/open/floor/engine/vacuum,
+/area/station/science/ordnance/burnchamber)
+"mOY" = (
+/obj/structure/window/reinforced/spawner/directional/east,
+/obj/machinery/light/directional/north,
+/turf/open/floor/engine,
+/area/station/science/xenobiology)
"mPl" = (
/obj/machinery/computer/scan_consolenew{
dir = 1
@@ -36562,14 +36453,6 @@
/obj/item/pen,
/turf/open/floor/carpet,
/area/station/service/lawoffice)
-"mTZ" = (
-/obj/structure/closet/secure_closet/security/med,
-/obj/structure/cable,
-/obj/effect/turf_decal/tile/red/fourcorners,
-/obj/item/radio/intercom/directional/north,
-/obj/machinery/power/apc/auto_name/directional/west,
-/turf/open/floor/iron/dark,
-/area/station/security/checkpoint/medical)
"mUg" = (
/obj/effect/turf_decal/trimline/yellow/filled/line,
/turf/open/floor/iron,
@@ -36637,6 +36520,15 @@
/obj/machinery/camera/autoname/directional/south,
/turf/open/floor/iron/dark/corner,
/area/station/engineering/atmos)
+"mVR" = (
+/obj/structure/rack,
+/obj/effect/turf_decal/tile/red/half/contrasted{
+ dir = 1
+ },
+/obj/item/radio/intercom/directional/south,
+/obj/effect/spawner/random/armory/dragnet,
+/turf/open/floor/iron/dark,
+/area/station/ai_monitored/security/armory)
"mVU" = (
/obj/effect/spawner/random/maintenance/two,
/obj/effect/spawner/random/structure/crate,
@@ -36769,6 +36661,18 @@
},
/turf/open/floor/plating/airless,
/area/station/maintenance/department/medical/central)
+"mXT" = (
+/obj/effect/turf_decal/stripes/line,
+/obj/structure/window/reinforced/survival_pod/spawner/directional/south,
+/obj/structure/table,
+/obj/machinery/cell_charger,
+/obj/item/stock_parts/power_store/cell/high,
+/obj/effect/turf_decal/bot{
+ dir = 1
+ },
+/obj/machinery/airalarm/directional/west,
+/turf/open/floor/iron,
+/area/station/command/gateway)
"mXV" = (
/obj/effect/turf_decal/tile/red/anticorner/contrasted{
dir = 4
@@ -36915,6 +36819,10 @@
/obj/effect/spawner/random/structure/chair_flipped,
/turf/open/floor/plating,
/area/station/maintenance/department/medical/central)
+"mZP" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/closed/wall/r_wall,
+/area/station/science/ordnance/burnchamber)
"mZY" = (
/obj/machinery/piratepad/civilian,
/obj/effect/turf_decal/bot_white,
@@ -37036,9 +36944,6 @@
},
/turf/open/floor/iron/white,
/area/station/medical/medbay/central)
-"nbS" = (
-/turf/open/floor/engine/vacuum,
-/area/station/science/ordnance/burnchamber)
"ncc" = (
/obj/structure/flora/bush/flowers_br/style_random,
/obj/structure/window/spawner/directional/north,
@@ -37144,6 +37049,12 @@
},
/turf/closed/wall,
/area/station/service/bar)
+"ndC" = (
+/obj/structure/table/glass,
+/obj/effect/spawner/random/food_or_drink/snack,
+/obj/effect/spawner/random/food_or_drink/refreshing_beverage,
+/turf/open/floor/iron,
+/area/station/engineering/lobby)
"ndI" = (
/obj/structure/table,
/obj/item/hand_labeler,
@@ -37257,13 +37168,6 @@
},
/turf/open/floor/engine,
/area/station/engineering/supermatter)
-"neH" = (
-/obj/effect/turf_decal/tile/dark_blue/half/contrasted{
- dir = 8
- },
-/obj/machinery/computer/security/telescreen/minisat/directional/west,
-/turf/open/floor/iron,
-/area/station/command/bridge)
"neM" = (
/obj/effect/turf_decal/trimline/yellow/filled/line,
/obj/structure/cable,
@@ -37338,6 +37242,10 @@
},
/turf/open/floor/glass/reinforced,
/area/station/science/xenobiology)
+"nfm" = (
+/obj/effect/landmark/carpspawn,
+/turf/open/space/openspace,
+/area/space/nearstation)
"nfn" = (
/obj/effect/turf_decal/siding/wood{
dir = 4
@@ -37443,6 +37351,20 @@
dir = 10
},
/area/station/maintenance/radshelter/medical)
+"nhc" = (
+/obj/machinery/door/airlock/research{
+ name = "Research Division Access"
+ },
+/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{
+ cycle_id = "sci-entrance"
+ },
+/obj/effect/mapping_helpers/airlock/unres{
+ dir = 4
+ },
+/obj/machinery/door/firedoor,
+/obj/effect/mapping_helpers/airlock/access/all/science/general,
+/turf/open/floor/iron/white,
+/area/station/science/research)
"nhf" = (
/obj/machinery/computer/records/medical/laptop{
dir = 8;
@@ -37480,6 +37402,11 @@
},
/turf/open/floor/iron,
/area/station/engineering/atmos)
+"nia" = (
+/obj/machinery/atmospherics/components/trinary/filter/atmos/flipped/co2,
+/obj/effect/turf_decal/tile/blue/fourcorners,
+/turf/open/floor/catwalk_floor/flat_white,
+/area/station/medical/treatment_center)
"nii" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -37622,20 +37549,6 @@
dir = 1
},
/area/station/engineering/atmos)
-"nkM" = (
-/turf/closed/wall/r_wall,
-/area/station/science/ordnance/burnchamber)
-"nli" = (
-/obj/machinery/atmospherics/pipe/smart/simple/dark/visible,
-/obj/machinery/airalarm/directional/east,
-/obj/effect/mapping_helpers/airalarm/mixingchamber_access,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/mapping_helpers/airalarm/link{
- chamber_id = "ordnanceburn"
- },
-/obj/effect/mapping_helpers/airalarm/tlv_no_checks,
-/turf/open/floor/iron/dark,
-/area/station/science/ordnance)
"nlu" = (
/obj/effect/turf_decal/trimline/blue/filled/line,
/obj/structure/cable,
@@ -37691,6 +37604,16 @@
/obj/structure/cable/multilayer/multiz,
/turf/open/floor/plating,
/area/station/maintenance/port/greater)
+"nmF" = (
+/obj/machinery/computer/security/mining{
+ dir = 8
+ },
+/obj/machinery/keycard_auth/directional/east,
+/obj/effect/turf_decal/tile/dark_blue/half/contrasted{
+ dir = 4
+ },
+/turf/open/floor/iron/dark,
+/area/station/command/bridge)
"nmG" = (
/obj/effect/turf_decal/trimline/blue/filled/end,
/obj/structure/cable,
@@ -37728,21 +37651,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/white,
/area/station/medical/medbay/central)
-"nnt" = (
-/obj/machinery/computer/security/qm,
-/obj/effect/turf_decal/siding/wood{
- dir = 9
- },
-/obj/machinery/computer/security/telescreen/vault/directional/north,
-/obj/machinery/button/door/directional/west{
- id = "qmprivacy";
- name = "Privacy Shutters Control"
- },
-/obj/machinery/keycard_auth/directional/west{
- pixel_y = 12
- },
-/turf/open/floor/wood,
-/area/station/command/heads_quarters/qm)
"nnv" = (
/obj/structure/table/reinforced/rglass,
/obj/effect/turf_decal/tile/blue/fourcorners,
@@ -38019,10 +37927,6 @@
},
/turf/open/floor/plating,
/area/station/maintenance/department/medical/central)
-"nsH" = (
-/obj/structure/lattice,
-/turf/open/space/openspace,
-/area/space)
"nsI" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -38039,10 +37943,6 @@
},
/turf/open/floor/iron/white,
/area/station/hallway/secondary/entry)
-"ntd" = (
-/obj/machinery/camera/autoname/directional/north,
-/turf/open/floor/iron/showroomfloor,
-/area/station/command/heads_quarters/qm)
"ntQ" = (
/obj/structure/sign/warning/docking,
/turf/closed/wall,
@@ -38064,14 +37964,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/chapel,
/area/station/service/chapel)
-"nur" = (
-/obj/structure/chair/wood{
- dir = 1;
- layer = 2.89
- },
-/obj/machinery/light/small/directional/east,
-/turf/open/floor/carpet,
-/area/station/commons/dorms)
"nuu" = (
/obj/machinery/bouldertech/refinery,
/obj/machinery/conveyor{
@@ -38176,6 +38068,16 @@
/obj/machinery/camera/autoname/directional/south,
/turf/open/floor/iron,
/area/station/security/detectives_office)
+"nwi" = (
+/obj/structure/table,
+/obj/machinery/cell_charger,
+/obj/item/stock_parts/power_store/cell,
+/obj/effect/turf_decal/tile/purple/half/contrasted{
+ dir = 1
+ },
+/obj/machinery/airalarm/directional/north,
+/turf/open/floor/iron/white,
+/area/station/science/lobby)
"nwp" = (
/obj/effect/turf_decal/tile/blue/anticorner/contrasted{
dir = 8
@@ -38519,6 +38421,12 @@
/obj/machinery/power/port_gen/pacman/pre_loaded,
/turf/open/floor/plating,
/area/station/maintenance/aft/upper)
+"nCv" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 5
+ },
+/turf/open/floor/iron/white,
+/area/station/science/ordnance/storage)
"nCH" = (
/obj/effect/turf_decal/tile/blue/anticorner/contrasted,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
@@ -38830,17 +38738,6 @@
/obj/effect/spawner/random/clothing/pirate_or_bandana,
/turf/open/floor/plating,
/area/station/maintenance/aft/upper)
-"nKa" = (
-/obj/machinery/disposal/bin,
-/obj/effect/turf_decal/tile/blue/fourcorners,
-/obj/effect/turf_decal/box/white{
- color = "#52B4E9"
- },
-/obj/structure/disposalpipe/trunk,
-/obj/machinery/requests_console/auto_name/directional/north,
-/obj/effect/mapping_helpers/requests_console/assistance,
-/turf/open/floor/iron/white,
-/area/station/medical/storage)
"nKc" = (
/obj/effect/turf_decal/tile/yellow/half/contrasted{
dir = 1
@@ -39065,12 +38962,6 @@
/obj/machinery/camera/autoname/directional/south,
/turf/open/floor/iron,
/area/station/hallway/primary/central)
-"nNl" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 5
- },
-/turf/open/floor/iron/white,
-/area/station/science/ordnance/storage)
"nNo" = (
/obj/effect/turf_decal/trimline/yellow/filled/line{
dir = 1
@@ -39176,13 +39067,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/dark,
/area/station/science/ordnance)
-"nQm" = (
-/obj/machinery/camera/motion/directional/west{
- network = list("aicore");
- c_tag = "Secure - AI Upper External East"
- },
-/turf/open/space/openspace,
-/area/space)
"nQs" = (
/obj/machinery/light/small/directional/north,
/turf/open/misc/asteroid,
@@ -39270,6 +39154,22 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/iron/white,
/area/station/medical/medbay/central)
+"nSZ" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 9
+ },
+/obj/machinery/portable_atmospherics/scrubber,
+/turf/open/floor/iron/dark/smooth_large,
+/area/station/science/ordnance)
+"nTb" = (
+/obj/effect/turf_decal/tile/brown/half/contrasted,
+/obj/machinery/disposal/bin,
+/obj/structure/disposalpipe/trunk{
+ dir = 1
+ },
+/obj/machinery/digital_clock/directional/south,
+/turf/open/floor/iron,
+/area/station/cargo/storage)
"nTm" = (
/obj/structure/chair/office{
dir = 1
@@ -39303,6 +39203,12 @@
/obj/item/radio/intercom/directional/south,
/turf/open/floor/iron,
/area/station/medical/coldroom)
+"nTB" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/turf/open/floor/plating/airless,
+/area/space/nearstation)
"nTT" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -39450,6 +39356,11 @@
/obj/machinery/light/warm/directional/east,
/turf/open/floor/wood/tile,
/area/station/service/chapel)
+"nYi" = (
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/iron/dark,
+/area/station/science/ordnance)
"nYj" = (
/obj/effect/turf_decal/stripes/line,
/obj/effect/decal/cleanable/dirt,
@@ -39582,12 +39493,6 @@
"oaP" = (
/turf/open/floor/plating,
/area/station/maintenance/department/medical/central)
-"oaR" = (
-/obj/structure/closet/crate/critter,
-/mob/living/basic/mothroach,
-/obj/item/stack/spacecash/c100,
-/turf/open/space/basic,
-/area/space)
"oaY" = (
/obj/effect/landmark/start/medical_doctor,
/obj/effect/turf_decal/trimline/blue/filled/line,
@@ -39874,6 +39779,20 @@
"ohk" = (
/turf/open/misc/asteroid,
/area/station/maintenance/disposal/incinerator)
+"ohq" = (
+/obj/structure/table,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/item/storage/toolbox/mechanical{
+ pixel_x = -2;
+ pixel_y = 8
+ },
+/obj/item/storage/toolbox/mechanical{
+ pixel_x = 3;
+ pixel_y = -2
+ },
+/obj/structure/cable,
+/turf/open/floor/iron/dark,
+/area/station/science/ordnance)
"ohu" = (
/obj/effect/mapping_helpers/broken_floor,
/obj/structure/table,
@@ -39947,12 +39866,6 @@
},
/turf/open/floor/iron/textured,
/area/station/cargo/drone_bay)
-"ojR" = (
-/obj/machinery/power/apc/auto_name/directional/west,
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/simple/green/hidden,
-/turf/open/floor/iron/white,
-/area/station/science/ordnance/testlab)
"oka" = (
/obj/effect/turf_decal/siding/purple{
dir = 1
@@ -40096,12 +40009,6 @@
/obj/machinery/quantum_server,
/turf/open/floor/circuit,
/area/station/cargo/bitrunning/den)
-"omE" = (
-/obj/structure/table/glass,
-/obj/effect/spawner/random/food_or_drink/snack,
-/obj/effect/spawner/random/food_or_drink/refreshing_beverage,
-/turf/open/floor/iron,
-/area/station/engineering/lobby)
"omL" = (
/obj/machinery/door/firedoor/border_only{
dir = 8
@@ -40636,6 +40543,21 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/dark,
/area/station/engineering/atmospherics_engine)
+"owV" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/door/airlock/maintenance,
+/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance,
+/obj/effect/mapping_helpers/airlock/abandoned,
+/obj/effect/decal/cleanable/blood/old,
+/turf/open/floor/plating,
+/area/station/maintenance/central/greater)
+"oxg" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 9
+ },
+/obj/structure/cable,
+/turf/open/floor/iron/white,
+/area/station/science/ordnance/storage)
"oxB" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -40660,20 +40582,6 @@
/obj/machinery/light_switch/directional/south,
/turf/open/floor/iron,
/area/station/service/hydroponics)
-"oxN" = (
-/obj/machinery/door/airlock/multi_tile/public{
- dir = 4
- },
-/obj/effect/mapping_helpers/airlock/access/any/command/general,
-/obj/machinery/door/firedoor,
-/obj/effect/mapping_helpers/airlock/unres{
- dir = 8
- },
-/obj/structure/cable,
-/obj/effect/mapping_helpers/airlock/autoname,
-/obj/effect/mapping_helpers/airlock/access/any/admin/general,
-/turf/open/floor/iron/dark/smooth_large,
-/area/station/command/meeting_room)
"oxU" = (
/obj/effect/turf_decal/siding/wood{
dir = 1
@@ -41034,6 +40942,10 @@
},
/turf/open/floor/iron/dark,
/area/station/medical/morgue)
+"oEL" = (
+/obj/effect/spawner/structure/window/hollow/end,
+/turf/open/floor/plating,
+/area/station/security/courtroom)
"oEN" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/effect/spawner/random/maintenance,
@@ -41905,16 +41817,6 @@
},
/turf/open/floor/iron,
/area/station/security/prison)
-"oUk" = (
-/obj/effect/spawner/random{
- loot = list(/obj/item/cardboard_cutout/nuclear_operative,/obj/item/cardboard_cutout/nuclear_operative,/obj/structure/fluff/balloon_nuke);
- spawn_all_loot = 1;
- spawn_loot_chance = 5;
- spawn_loot_double = 0;
- spawn_scatter_radius = 1
- },
-/turf/open/space/basic,
-/area/space)
"oUm" = (
/obj/effect/turf_decal/tile/red/anticorner/contrasted{
dir = 8
@@ -41995,15 +41897,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/circuit/green,
/area/station/ai_monitored/turret_protected/ai_upload)
-"oVV" = (
-/obj/structure/table,
-/obj/machinery/camera/directional/east{
- c_tag = "Xenobiology Lab - Secure Pen";
- network = list("ss13","rd","xeno")
- },
-/obj/structure/sign/warning/biohazard/directional/east,
-/turf/open/floor/engine,
-/area/station/science/xenobiology)
"oVX" = (
/obj/structure/table,
/obj/structure/window/spawner/directional/east,
@@ -42049,6 +41942,16 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/plating,
/area/station/maintenance/solars/port)
+"oWw" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 9
+ },
+/obj/effect/turf_decal/siding/thinplating/dark{
+ dir = 9
+ },
+/obj/machinery/firealarm/directional/west,
+/turf/open/floor/iron/checker,
+/area/station/science/research)
"oWy" = (
/obj/effect/turf_decal/box/corners,
/turf/open/floor/iron/dark,
@@ -42354,6 +42257,25 @@
/obj/item/radio/intercom/directional/west,
/turf/open/floor/iron/white,
/area/station/hallway/secondary/entry)
+"pbv" = (
+/obj/structure/table,
+/obj/item/reagent_containers/condiment/saltshaker{
+ pixel_x = -2;
+ pixel_y = 2
+ },
+/obj/item/reagent_containers/condiment/peppermill{
+ desc = "Often used to flavor food or make people sneeze. Fashionably moved to the left side of the table.";
+ pixel_x = -8;
+ pixel_y = 2
+ },
+/obj/item/reagent_containers/condiment/enzyme{
+ pixel_x = 9;
+ pixel_y = 3
+ },
+/obj/item/book/manual/chef_recipes,
+/obj/effect/turf_decal/tile/red/opposingcorners,
+/turf/open/floor/iron/white,
+/area/station/security/prison/mess)
"pbA" = (
/obj/machinery/air_sensor/incinerator_tank,
/turf/open/floor/engine/airless,
@@ -42468,6 +42390,13 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron,
/area/station/security)
+"pdL" = (
+/obj/machinery/camera/motion/directional/north{
+ network = list("aicore");
+ c_tag = "Secure - AI Upper External South"
+ },
+/turf/open/space/openspace,
+/area/space/nearstation)
"pdR" = (
/obj/effect/turf_decal/stripes{
dir = 8
@@ -42483,6 +42412,12 @@
},
/turf/open/floor/engine,
/area/station/engineering/supermatter/room)
+"pdW" = (
+/obj/effect/decal/cleanable/blood/old{
+ icon_state = "gib3-old"
+ },
+/turf/open/floor/engine/xenobio,
+/area/station/science/xenobiology)
"peo" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -42586,12 +42521,6 @@
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/iron,
/area/station/security/detectives_office)
-"pgJ" = (
-/obj/structure/table/reinforced,
-/obj/effect/turf_decal/tile/red/fourcorners,
-/obj/structure/cable,
-/turf/open/floor/iron/dark,
-/area/station/security/checkpoint/medical)
"pgN" = (
/obj/machinery/light/small/dim/directional/east,
/obj/structure/closet/crate/medical,
@@ -42600,21 +42529,22 @@
/obj/effect/mapping_helpers/broken_floor,
/turf/open/floor/iron,
/area/station/maintenance/department/cargo)
-"pgS" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 9
- },
-/obj/effect/turf_decal/siding/thinplating/dark{
- dir = 9
- },
-/obj/machinery/firealarm/directional/west,
-/turf/open/floor/iron/checker,
-/area/station/science/research)
"pgW" = (
/obj/effect/turf_decal/trimline/blue/filled/corner,
/obj/effect/landmark/start/medical_doctor,
/turf/open/floor/iron/white,
/area/station/medical/treatment_center)
+"pgX" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/door/airlock/maintenance,
+/obj/effect/mapping_helpers/airlock/unres{
+ dir = 1
+ },
+/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/plating,
+/area/station/maintenance/central/greater)
"phi" = (
/obj/machinery/duct,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -42747,6 +42677,20 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/plating,
/area/station/hallway/secondary/exit/departure_lounge)
+"pjf" = (
+/obj/effect/turf_decal/trimline/blue/filled/line{
+ dir = 9
+ },
+/obj/machinery/lift_indicator/directional/south{
+ linked_elevator_id = "medbay1";
+ pixel_x = -32
+ },
+/obj/machinery/button/elevator/directional/south{
+ id = "medbay1";
+ pixel_x = -32
+ },
+/turf/open/floor/iron/white,
+/area/station/medical/treatment_center)
"pjk" = (
/obj/machinery/portable_atmospherics/canister/nitrogen,
/turf/open/floor/engine/n2,
@@ -42830,6 +42774,14 @@
dir = 1
},
/area/station/engineering/atmos/storage/gas)
+"pka" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/light/small/broken/directional/north,
+/obj/machinery/atmospherics/components/tank/oxygen{
+ dir = 4
+ },
+/turf/open/floor/plating,
+/area/station/maintenance/department/science)
"pkl" = (
/turf/closed/wall,
/area/station/maintenance/solars/starboard/fore)
@@ -43512,6 +43464,19 @@
/obj/effect/turf_decal/tile/blue/fourcorners,
/turf/open/floor/iron/white,
/area/station/medical/treatment_center)
+"pwo" = (
+/obj/machinery/chem_dispenser,
+/obj/item/radio/intercom/directional/north,
+/obj/effect/turf_decal/trimline/yellow/filled/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/yellow/filled/mid_joiner{
+ dir = 1
+ },
+/turf/open/floor/iron/white/smooth_edge{
+ dir = 1
+ },
+/area/station/medical/pharmacy)
"pwt" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/broken_flooring/pile{
@@ -43525,28 +43490,12 @@
/obj/effect/turf_decal/delivery,
/turf/open/floor/iron/dark,
/area/station/commons/locker)
-"pwE" = (
-/obj/machinery/atmospherics/components/unary/portables_connector/visible{
- dir = 8
- },
-/obj/effect/turf_decal/box/red,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/machinery/camera/autoname/directional/north{
- network = list("ss13","rd")
- },
-/obj/machinery/portable_atmospherics/canister,
-/turf/open/floor/iron/dark,
-/area/station/science/ordnance/testlab)
"pwO" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 8
},
/turf/open/floor/iron/white/smooth_large,
/area/station/medical/treatment_center)
-"pwU" = (
-/obj/structure/fluff/iced_abductor,
-/turf/open/misc/asteroid/airless,
-/area/space)
"pwV" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
@@ -43743,10 +43692,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/engineering/break_room)
-"pAK" = (
-/obj/item/stack/cable_coil,
-/turf/open/space/openspace,
-/area/space)
"pAP" = (
/obj/effect/spawner/random/food_or_drink/seed{
spawn_all_loot = 1;
@@ -43761,6 +43706,19 @@
/obj/machinery/newscaster/directional/south,
/turf/open/floor/iron,
/area/station/security/prison/garden)
+"pBf" = (
+/obj/structure/closet/crate,
+/obj/item/stack/sheet/iron/fifty,
+/obj/item/stack/rods/fifty,
+/obj/item/stack/sheet/glass/fifty,
+/obj/item/electronics/airlock,
+/obj/item/electronics/airlock,
+/obj/item/stock_parts/power_store/cell/high,
+/obj/item/stack/sheet/mineral/plasma{
+ amount = 30
+ },
+/turf/open/floor/plating,
+/area/station/engineering/storage)
"pBg" = (
/obj/effect/turf_decal/tile/yellow/anticorner/contrasted{
dir = 1
@@ -44207,6 +44165,10 @@
},
/turf/open/floor/iron/white,
/area/station/science/research)
+"pIB" = (
+/obj/structure/window/reinforced/spawner/directional/south,
+/turf/open/floor/glass/reinforced,
+/area/station/security/prison)
"pIF" = (
/obj/structure/table/reinforced,
/obj/machinery/door/window/brigdoor/right/directional/north{
@@ -44297,14 +44259,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/freezer,
/area/station/commons/toilet/restrooms)
-"pKI" = (
-/obj/structure/window/reinforced/spawner/directional/south,
-/obj/structure/flora/bush/fullgrass/style_random,
-/obj/structure/window/reinforced/spawner/directional/east{
- layer = 2.9
- },
-/turf/open/floor/grass,
-/area/station/science/research)
"pLd" = (
/obj/machinery/door/airlock/security,
/obj/machinery/door/firedoor,
@@ -44487,14 +44441,6 @@
/obj/effect/decal/cleanable/cobweb,
/turf/open/floor/plating,
/area/station/maintenance/department/cargo)
-"pNW" = (
-/obj/effect/turf_decal/trimline/yellow/filled/line,
-/obj/machinery/chem_dispenser{
- layer = 2.7
- },
-/obj/machinery/light/directional/south,
-/turf/open/floor/iron/white,
-/area/station/medical/chemistry)
"pOd" = (
/obj/structure/disposalpipe/segment{
dir = 10
@@ -44815,6 +44761,20 @@
/obj/item/food/sandwich/cheese,
/turf/open/floor/iron/dark/textured,
/area/station/command/heads_quarters/cmo)
+"pTx" = (
+/obj/machinery/door/airlock/research{
+ name = "Ordnance Lab"
+ },
+/obj/effect/mapping_helpers/airlock/access/all/science/ordnance,
+/obj/structure/cable,
+/obj/machinery/door/firedoor/heavy,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/simple/green/hidden{
+ dir = 4
+ },
+/turf/open/floor/catwalk_floor/flat_white,
+/area/station/science/ordnance)
"pTC" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
dir = 1
@@ -44934,14 +44894,6 @@
/obj/machinery/light/small/directional/south,
/turf/open/floor/iron/textured,
/area/station/commons/storage/art)
-"pVd" = (
-/obj/structure/chair/wood{
- dir = 1;
- layer = 2.89
- },
-/obj/structure/railing,
-/turf/open/floor/carpet,
-/area/station/service/theater)
"pVh" = (
/obj/machinery/light/warm/directional/south,
/obj/effect/turf_decal/siding/wood,
@@ -44987,16 +44939,6 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/cargo/warehouse/upper)
-"pWh" = (
-/obj/machinery/computer/security/telescreen/interrogation/directional/east,
-/obj/effect/turf_decal/tile/red/half/contrasted{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/iron,
-/area/station/security/interrogation)
"pWn" = (
/obj/structure/railing/corner{
dir = 8
@@ -45110,6 +45052,16 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/wood/large,
/area/station/cargo/boutique)
+"pXt" = (
+/obj/structure/table,
+/obj/effect/turf_decal/tile/brown/anticorner/contrasted{
+ dir = 8
+ },
+/obj/effect/spawner/random/entertainment/cigarette_pack,
+/obj/item/cigarette/rollie/mindbreaker,
+/obj/machinery/airalarm/directional/east,
+/turf/open/floor/iron,
+/area/station/cargo/miningoffice)
"pXA" = (
/obj/structure/broken_flooring/side/directional/north,
/obj/effect/decal/cleanable/dirt/dust,
@@ -45210,17 +45162,6 @@
/obj/effect/spawner/random/structure/grille,
/turf/open/floor/plating,
/area/station/maintenance/department/cargo)
-"pZK" = (
-/obj/machinery/door/airlock/research/glass/incinerator/ordmix_exterior{
- name = "Burn Chamber Exterior Airlock"
- },
-/obj/effect/mapping_helpers/airlock/locked,
-/obj/effect/mapping_helpers/airlock/access/all/science/ordnance,
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/turf/open/floor/engine/vacuum,
-/area/station/science/ordnance/burnchamber)
"pZP" = (
/obj/machinery/atmospherics/pipe/multiz/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/multiz/scrubbers/visible/layer2,
@@ -45533,12 +45474,6 @@
/obj/structure/cable,
/turf/open/floor/iron/dark,
/area/station/command/heads_quarters/hop)
-"qgy" = (
-/obj/effect/turf_decal/trimline/green/filled/line,
-/obj/structure/railing/corner,
-/obj/machinery/firealarm/directional/south,
-/turf/open/floor/iron/white,
-/area/station/hallway/secondary/entry)
"qgA" = (
/obj/structure/window/spawner/directional/east,
/obj/structure/table,
@@ -45592,17 +45527,17 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/textured_large,
/area/station/engineering/storage/tech)
-"qhg" = (
-/obj/structure/cable,
-/obj/machinery/door/airlock/command,
-/obj/effect/mapping_helpers/airlock/access/any/command/general,
-/obj/effect/mapping_helpers/airlock/autoname,
-/obj/machinery/door/firedoor,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+"qgZ" = (
+/obj/machinery/atmospherics/pipe/smart/simple/dark/visible,
+/obj/machinery/airalarm/directional/east,
+/obj/effect/mapping_helpers/airalarm/mixingchamber_access,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/mapping_helpers/airlock/access/any/admin/general,
-/turf/open/floor/iron/dark/smooth_large,
-/area/station/command/emergency_closet)
+/obj/effect/mapping_helpers/airalarm/link{
+ chamber_id = "ordnanceburn"
+ },
+/obj/effect/mapping_helpers/airalarm/tlv_no_checks,
+/turf/open/floor/iron/dark,
+/area/station/science/ordnance)
"qhm" = (
/obj/effect/turf_decal/sand/plating,
/obj/effect/turf_decal/stripes/asteroid/line{
@@ -45632,6 +45567,19 @@
"qhP" = (
/turf/closed/wall/r_wall,
/area/station/security/execution/education)
+"qhQ" = (
+/obj/machinery/door/poddoor/shutters/window{
+ id = "ordauxgarage";
+ dir = 1
+ },
+/obj/effect/turf_decal/caution/stand_clear,
+/obj/effect/turf_decal/sand/plating,
+/obj/effect/turf_decal/stripes/asteroid/line,
+/obj/effect/turf_decal/stripes/asteroid/line{
+ dir = 1
+ },
+/turf/open/floor/plating,
+/area/station/science/ordnance)
"qhS" = (
/obj/structure/disposalpipe/junction/flip{
dir = 1
@@ -45735,10 +45683,6 @@
},
/turf/open/floor/plating,
/area/station/maintenance/solars/port/fore)
-"qjk" = (
-/obj/structure/broken_flooring/singular/directional/south,
-/turf/open/space/openspace,
-/area/space)
"qjp" = (
/obj/structure/flora/bush/flowers_yw/style_random,
/obj/structure/window/spawner/directional/north,
@@ -45798,6 +45742,21 @@
/obj/item/screwdriver,
/turf/open/floor/iron,
/area/station/hallway/primary/central)
+"qkZ" = (
+/obj/machinery/computer/security/qm,
+/obj/effect/turf_decal/siding/wood{
+ dir = 9
+ },
+/obj/machinery/computer/security/telescreen/vault/directional/north,
+/obj/machinery/button/door/directional/west{
+ id = "qmprivacy";
+ name = "Privacy Shutters Control"
+ },
+/obj/machinery/keycard_auth/directional/west{
+ pixel_y = 12
+ },
+/turf/open/floor/wood,
+/area/station/command/heads_quarters/qm)
"qlc" = (
/obj/effect/spawner/random/structure/chair_comfy{
dir = 1
@@ -45851,17 +45810,6 @@
/obj/machinery/airalarm/directional/west,
/turf/open/floor/circuit/green,
/area/station/ai_monitored/command/nuke_storage)
-"qmg" = (
-/obj/structure/table/wood,
-/obj/item/stock_parts/power_store/cell/crap,
-/obj/item/clothing/head/collectable/hop{
- name = "novelty HoP hat"
- },
-/obj/effect/turf_decal/siding/wood{
- dir = 8
- },
-/turf/open/floor/wood/tile,
-/area/station/command/corporate_showroom)
"qml" = (
/obj/machinery/chem_master,
/obj/effect/turf_decal/trimline/yellow/filled/line,
@@ -45896,15 +45844,6 @@
/obj/machinery/door/firedoor,
/turf/open/floor/plating,
/area/station/hallway/secondary/command)
-"qmD" = (
-/obj/machinery/door/airlock/engineering/glass{
- name = "Primary Tool Storage"
- },
-/obj/structure/cable,
-/obj/structure/disposalpipe/segment,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron,
-/area/station/commons/storage/primary)
"qmI" = (
/obj/effect/turf_decal/tile/purple/fourcorners,
/obj/machinery/light/small/directional/north,
@@ -45948,6 +45887,17 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/iron/white,
/area/station/medical/medbay/central)
+"qny" = (
+/obj/machinery/atmospherics/components/unary/portables_connector/visible{
+ dir = 8
+ },
+/obj/effect/turf_decal/bot,
+/obj/machinery/button/door/directional/east{
+ name = "shutter control";
+ id = "ordauxgarage"
+ },
+/turf/open/floor/plating,
+/area/station/science/ordnance)
"qnQ" = (
/obj/effect/turf_decal/stripes/line,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -45956,14 +45906,6 @@
},
/turf/open/floor/iron/white/smooth_half,
/area/station/science/robotics/lab)
-"qnV" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/light/small/broken/directional/north,
-/obj/machinery/atmospherics/components/tank/oxygen{
- dir = 4
- },
-/turf/open/floor/plating,
-/area/station/maintenance/department/science)
"qob" = (
/obj/structure/table,
/obj/item/stock_parts/micro_laser{
@@ -46125,6 +46067,16 @@
/obj/machinery/light/directional/south,
/turf/open/floor/engine,
/area/station/engineering/supermatter/room)
+"qqG" = (
+/obj/machinery/door/airlock/maintenance,
+/obj/effect/mapping_helpers/airlock/unres{
+ dir = 1
+ },
+/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance,
+/obj/effect/mapping_helpers/airlock/abandoned,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/plating,
+/area/station/maintenance/central/greater)
"qqH" = (
/obj/effect/turf_decal/tile/red/half/contrasted{
dir = 4
@@ -46771,12 +46723,6 @@
/obj/item/book/codex_gigas,
/turf/open/floor/engine/cult,
/area/station/service/library)
-"qEr" = (
-/obj/structure/table,
-/obj/item/electropack,
-/obj/item/electropack,
-/turf/open/floor/engine,
-/area/station/science/xenobiology)
"qEC" = (
/obj/effect/turf_decal/stripes{
dir = 1
@@ -46842,10 +46788,6 @@
},
/turf/open/floor/iron/dark,
/area/station/ai_monitored/turret_protected/aisat/teleporter)
-"qFS" = (
-/obj/structure/window/reinforced/spawner/directional/south,
-/turf/open/floor/glass/reinforced,
-/area/station/security/prison)
"qGk" = (
/turf/closed/wall/r_wall,
/area/station/hallway/secondary/command)
@@ -46985,6 +46927,21 @@
/obj/structure/girder,
/turf/open/misc/asteroid,
/area/station/asteroid)
+"qII" = (
+/obj/effect/turf_decal/delivery,
+/obj/structure/table,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/item/raw_anomaly_core/random{
+ pixel_x = -5;
+ pixel_y = 7
+ },
+/obj/item/raw_anomaly_core/random,
+/obj/item/raw_anomaly_core/random{
+ pixel_x = 7;
+ pixel_y = 9
+ },
+/turf/open/floor/iron/dark,
+/area/station/science/ordnance/testlab)
"qIJ" = (
/obj/structure/table/wood,
/obj/effect/spawner/random/engineering/tool,
@@ -47136,6 +47093,18 @@
/obj/structure/cable,
/turf/open/floor/iron/dark,
/area/station/security/lockers)
+"qMa" = (
+/obj/machinery/suit_storage_unit/ce,
+/obj/machinery/requests_console/directional/south{
+ department = "Chief Engineer's Desk";
+ name = "Chief Engineer's Request Console"
+ },
+/obj/machinery/computer/security/telescreen/ce/directional/west,
+/obj/effect/turf_decal/trimline/yellow/filled/line{
+ dir = 10
+ },
+/turf/open/floor/iron,
+/area/station/command/heads_quarters/ce)
"qMd" = (
/obj/effect/turf_decal/tile/dark_red/opposingcorners,
/obj/effect/landmark/start/bartender,
@@ -47568,17 +47537,6 @@
},
/turf/open/openspace,
/area/station/science/xenobiology)
-"qUz" = (
-/obj/machinery/door/airlock/maintenance,
-/obj/effect/mapping_helpers/airlock/unres{
- dir = 1
- },
-/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance,
-/obj/structure/disposalpipe/segment,
-/obj/effect/mapping_helpers/airlock/abandoned,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/plating,
-/area/station/maintenance/central/greater)
"qUA" = (
/obj/effect/landmark/generic_maintenance_landmark,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
@@ -47812,6 +47770,17 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/catwalk_floor/iron_dark,
/area/station/maintenance/department/engine)
+"qZf" = (
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/structure/cable,
+/obj/machinery/light/directional/east,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/simple/green/hidden{
+ dir = 10
+ },
+/turf/open/floor/iron/dark,
+/area/station/science/ordnance)
"qZh" = (
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/iron,
@@ -48063,16 +48032,6 @@
},
/turf/open/floor/iron/checker,
/area/station/maintenance/department/medical)
-"rcz" = (
-/obj/machinery/computer/security{
- dir = 4
- },
-/obj/structure/sign/poster/official/random/directional/west,
-/obj/effect/turf_decal/tile/dark_blue/half/contrasted{
- dir = 8
- },
-/turf/open/floor/iron/dark,
-/area/station/command/bridge)
"rcG" = (
/obj/machinery/mech_bay_recharge_port{
dir = 1
@@ -48137,22 +48096,6 @@
/obj/machinery/telecomms/processor/preset_one,
/turf/open/floor/circuit/green/telecomms/mainframe,
/area/station/tcommsat/server)
-"rdP" = (
-/obj/machinery/chem_dispenser{
- layer = 2.7
- },
-/obj/machinery/newscaster/directional/east,
-/obj/effect/turf_decal/trimline/yellow/filled/line{
- dir = 6
- },
-/obj/effect/turf_decal/trimline/yellow/filled/mid_joiner,
-/obj/effect/turf_decal/trimline/yellow/filled/mid_joiner{
- dir = 4
- },
-/turf/open/floor/iron/white/smooth_corner{
- dir = 1
- },
-/area/station/medical/pharmacy)
"rdR" = (
/obj/structure/broken_flooring/pile,
/obj/effect/decal/cleanable/dirt/dust,
@@ -48601,9 +48544,19 @@
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/iron,
/area/station/security/brig/entrance)
+"rjP" = (
+/obj/structure/table/glass,
+/obj/machinery/cell_charger,
+/obj/item/stock_parts/power_store/cell/high,
+/turf/open/floor/iron,
+/area/station/engineering/lobby)
"rjX" = (
/turf/closed/wall,
/area/station/security/courtroom)
+"rjZ" = (
+/obj/structure/sign/poster/contraband/communist_state/directional/east,
+/turf/open/space/basic,
+/area/space/nearstation)
"rka" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -48612,15 +48565,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/dark,
/area/station/science/xenobiology)
-"rkd" = (
-/obj/structure/closet/crate/science,
-/obj/item/wrench,
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/firealarm/directional/west,
-/obj/effect/spawner/random/maintenance,
-/obj/effect/turf_decal/stripes/line,
-/turf/open/floor/iron/dark/smooth_large,
-/area/station/science/ordnance)
"rkm" = (
/obj/machinery/washing_machine,
/turf/open/floor/iron/freezer,
@@ -48721,18 +48665,6 @@
},
/turf/open/floor/engine,
/area/station/engineering/atmospherics_engine)
-"rkZ" = (
-/obj/machinery/suit_storage_unit/ce,
-/obj/machinery/requests_console/directional/south{
- department = "Chief Engineer's Desk";
- name = "Chief Engineer's Request Console"
- },
-/obj/machinery/computer/security/telescreen/ce/directional/west,
-/obj/effect/turf_decal/trimline/yellow/filled/line{
- dir = 10
- },
-/turf/open/floor/iron,
-/area/station/command/heads_quarters/ce)
"rlp" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
@@ -48879,20 +48811,15 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron,
/area/station/security)
-"roK" = (
-/obj/machinery/door/airlock/research{
- name = "Ordnance Lab"
- },
-/obj/effect/mapping_helpers/airlock/access/all/science/ordnance,
-/obj/structure/cable,
-/obj/machinery/door/firedoor/heavy,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/simple/green/hidden{
- dir = 4
- },
-/turf/open/floor/catwalk_floor/flat_white,
-/area/station/science/ordnance)
+"roH" = (
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/structure/table,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/cable/multilayer/connected,
+/obj/machinery/cell_charger,
+/obj/item/stock_parts/power_store/cell/high,
+/turf/open/floor/iron/dark,
+/area/station/ai_monitored/command/storage/satellite)
"roO" = (
/obj/machinery/door/airlock/security/glass{
name = "Prison Wing"
@@ -49017,13 +48944,6 @@
/obj/item/radio/intercom/directional/west,
/turf/open/floor/iron/dark,
/area/station/security/execution/education)
-"rqC" = (
-/obj/machinery/camera/motion/directional/north{
- network = list("aicore");
- c_tag = "Secure - AI Upper External South"
- },
-/turf/open/space/openspace,
-/area/space)
"rqJ" = (
/obj/machinery/air_sensor/plasma_tank,
/turf/open/floor/engine/plasma,
@@ -49275,6 +49195,12 @@
},
/turf/open/floor/iron/white/textured,
/area/station/maintenance/department/medical/central)
+"rvu" = (
+/obj/structure/cable,
+/obj/structure/window/reinforced/spawner/directional/west,
+/obj/machinery/firealarm/directional/east,
+/turf/open/floor/iron/dark,
+/area/station/security/prison)
"rwf" = (
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plating,
@@ -49467,19 +49393,6 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/iron/white,
/area/station/medical/treatment_center)
-"ryG" = (
-/obj/structure/cable,
-/obj/machinery/door/airlock/engineering/glass{
- name = "Break Room"
- },
-/obj/effect/turf_decal/tile/yellow/fourcorners,
-/obj/machinery/door/firedoor,
-/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/engineering/general,
-/obj/effect/mapping_helpers/airlock/access/any/engineering/construction,
-/turf/open/floor/iron,
-/area/station/engineering/break_room)
"ryP" = (
/obj/structure/closet/secure_closet/brig{
id = "Cell 2";
@@ -49929,6 +49842,10 @@
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plating,
/area/station/maintenance/department/medical/central)
+"rFl" = (
+/obj/item/stack/cable_coil,
+/turf/open/space/openspace,
+/area/space/nearstation)
"rFt" = (
/obj/machinery/shower/directional/west,
/obj/effect/landmark/start/prisoner,
@@ -50222,6 +50139,16 @@
/obj/structure/cable,
/turf/open/floor/iron/dark,
/area/station/hallway/secondary/exit/departure_lounge)
+"rKH" = (
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/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/simple/green/hidden{
+ dir = 5
+ },
+/turf/open/floor/iron/dark,
+/area/station/science/ordnance)
"rKW" = (
/obj/machinery/photocopier,
/obj/effect/turf_decal/bot_red,
@@ -50665,6 +50592,14 @@
"rTM" = (
/turf/closed/wall/r_wall,
/area/station/security/mechbay)
+"rTR" = (
+/obj/effect/turf_decal/tile/red/anticorner/contrasted,
+/obj/machinery/computer/security/telescreen/prison/directional/south,
+/obj/machinery/modular_computer/preset/cargochat/security{
+ dir = 1
+ },
+/turf/open/floor/iron,
+/area/station/security/office)
"rTV" = (
/obj/effect/turf_decal/tile/red/half/contrasted{
dir = 8
@@ -50726,6 +50661,12 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/grass,
/area/station/security/prison/garden)
+"rVm" = (
+/obj/effect/decal/cleanable/blood/old{
+ icon_state = "gib5-old"
+ },
+/turf/open/floor/engine/xenobio,
+/area/station/science/xenobiology)
"rVo" = (
/obj/effect/turf_decal/siding/wood{
dir = 1
@@ -51264,6 +51205,18 @@
},
/turf/open/floor/engine,
/area/station/hallway/secondary/entry)
+"sbE" = (
+/obj/machinery/atmospherics/components/unary/portables_connector/visible{
+ dir = 8
+ },
+/obj/effect/turf_decal/box/red,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/machinery/camera/autoname/directional/north{
+ network = list("ss13","rd")
+ },
+/obj/machinery/portable_atmospherics/canister,
+/turf/open/floor/iron/dark,
+/area/station/science/ordnance/testlab)
"sbL" = (
/obj/machinery/door/airlock/engineering{
name = "Aft Port Solar Access"
@@ -51282,6 +51235,12 @@
/obj/structure/lattice/catwalk,
/turf/open/openspace,
/area/station/science/xenobiology)
+"sbS" = (
+/obj/machinery/power/apc/auto_name/directional/west,
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/simple/green/hidden,
+/turf/open/floor/iron/white,
+/area/station/science/ordnance/testlab)
"sbU" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/spawner/random/structure/crate,
@@ -51518,17 +51477,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron,
/area/station/engineering/main)
-"sgR" = (
-/obj/effect/turf_decal/tile/brown/half/contrasted{
- dir = 1
- },
-/obj/machinery/door/firedoor/border_only{
- dir = 4
- },
-/obj/machinery/requests_console/auto_name/directional/north,
-/obj/effect/mapping_helpers/requests_console/assistance,
-/turf/open/floor/iron,
-/area/station/cargo/storage)
"sgW" = (
/obj/structure/chair/office/tactical{
dir = 8
@@ -52334,18 +52282,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron,
/area/station/maintenance/disposal/incinerator)
-"sug" = (
-/obj/structure/table,
-/obj/item/assembly/igniter{
- pixel_x = 4;
- pixel_y = 3
- },
-/obj/item/assembly/igniter,
-/obj/machinery/sparker/directional/south{
- id = "Xenobio"
- },
-/turf/open/floor/engine,
-/area/station/science/xenobiology)
"suq" = (
/obj/effect/landmark/start/station_engineer,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -52720,6 +52656,13 @@
},
/turf/open/floor/iron/white,
/area/station/science/lobby)
+"sAS" = (
+/obj/structure/chair/wood{
+ dir = 1
+ },
+/obj/structure/railing,
+/turf/open/floor/carpet,
+/area/station/service/theater)
"sBb" = (
/obj/effect/turf_decal/tile/brown/anticorner/contrasted{
dir = 4
@@ -52840,13 +52783,6 @@
},
/turf/open/floor/iron,
/area/station/engineering/break_room)
-"sDq" = (
-/obj/structure/window/reinforced/spawner/directional/east{
- layer = 2.9
- },
-/obj/machinery/light/directional/north,
-/turf/open/floor/engine,
-/area/station/science/xenobiology)
"sDr" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -52915,6 +52851,10 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/dark/corner,
/area/station/engineering/atmos)
+"sEM" = (
+/obj/structure/broken_flooring/pile/directional/east,
+/turf/open/space/openspace,
+/area/space/nearstation)
"sEY" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/structure/chair/comfy{
@@ -53259,16 +53199,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/dark,
/area/station/service/bar/backroom)
-"sLr" = (
-/obj/machinery/atmospherics/components/binary/pump/on{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/layer_manifold/scrubbers/hidden,
-/obj/machinery/airlock_sensor/incinerator_ordmix{
- pixel_y = -24
- },
-/turf/open/floor/engine,
-/area/station/science/ordnance/burnchamber)
"sLt" = (
/obj/machinery/camera/autoname/directional/east,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -53476,6 +53406,9 @@
/obj/structure/cable,
/turf/open/floor/plating,
/area/station/security/checkpoint/science)
+"sPG" = (
+/turf/open/floor/engine/vacuum,
+/area/station/science/ordnance/burnchamber)
"sPS" = (
/obj/effect/turf_decal/tile/dark_blue,
/obj/structure/disposalpipe/segment{
@@ -53832,6 +53765,12 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/dark/textured_large,
/area/station/engineering/storage/tech)
+"sWX" = (
+/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{
+ dir = 8
+ },
+/turf/closed/wall/r_wall,
+/area/station/science/ordnance/burnchamber)
"sWY" = (
/obj/machinery/door/airlock/external/glass{
name = "Mining Dock Airlock"
@@ -54228,6 +54167,23 @@
"tdq" = (
/turf/open/floor/plating,
/area/station/maintenance/department/cargo)
+"tdN" = (
+/obj/machinery/door/airlock/research{
+ name = "Research Division Access"
+ },
+/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{
+ cycle_id = "sci-entrance"
+ },
+/obj/effect/mapping_helpers/airlock/unres{
+ dir = 4
+ },
+/obj/machinery/door/firedoor,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/effect/mapping_helpers/airlock/access/all/science/general,
+/turf/open/floor/iron/white,
+/area/station/science/research)
"tdW" = (
/obj/effect/turf_decal/tile/red/anticorner/contrasted{
dir = 4
@@ -54235,6 +54191,12 @@
/obj/machinery/rnd/production/techfab/department/security,
/turf/open/floor/iron,
/area/station/security/office)
+"teg" = (
+/obj/structure/table/reinforced,
+/obj/effect/turf_decal/tile/red/fourcorners,
+/obj/structure/cable,
+/turf/open/floor/iron/dark,
+/area/station/security/checkpoint/medical)
"tel" = (
/obj/effect/spawner/structure/window/reinforced/plasma,
/obj/structure/lattice/catwalk,
@@ -54302,6 +54264,23 @@
},
/turf/open/space/basic,
/area/space/nearstation)
+"tgn" = (
+/obj/machinery/computer/pod/old/mass_driver_controller/trash{
+ pixel_x = -32;
+ pixel_y = 6;
+ range = 5
+ },
+/obj/structure/cable,
+/obj/machinery/button/door/directional/west{
+ id = "Disposal Exit";
+ name = "Disposal Vent Control";
+ req_access = list("maint_tunnels");
+ pixel_x = -32;
+ pixel_y = -6
+ },
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plating,
+/area/station/maintenance/disposal)
"tgr" = (
/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
dir = 6
@@ -54634,6 +54613,9 @@
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/station/medical/medbay/lobby)
+"tmq" = (
+/turf/open/floor/engine/xenobio,
+/area/station/science/xenobiology)
"tms" = (
/obj/machinery/chem_heater/withbuffer,
/obj/structure/extinguisher_cabinet/directional/north,
@@ -54732,6 +54714,16 @@
/obj/machinery/airalarm/directional/north,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/turret_protected/ai_upload_foyer)
+"tnC" = (
+/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/blood/drip,
+/obj/effect/decal/cleanable/blood/footprints{
+ dir = 8
+ },
+/turf/open/floor/engine/xenobio,
+/area/station/science/xenobiology)
"tnD" = (
/obj/item/bodypart/leg/left,
/turf/open/floor/plating/airless,
@@ -54821,16 +54813,6 @@
/obj/machinery/telecomms/bus/preset_two,
/turf/open/floor/circuit/green/telecomms/mainframe,
/area/station/tcommsat/server)
-"toV" = (
-/obj/structure/table,
-/obj/item/paper_bin,
-/obj/item/pen,
-/obj/item/clothing/glasses/science,
-/obj/machinery/camera/autoname/directional/north{
- network = list("ss13","rd")
- },
-/turf/open/floor/iron/white,
-/area/station/science/lab)
"tpj" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -55096,6 +55078,12 @@
/obj/structure/cable,
/turf/open/floor/plating,
/area/station/command/gateway)
+"ttZ" = (
+/obj/machinery/atmospherics/components/unary/outlet_injector/on{
+ dir = 8
+ },
+/turf/open/floor/engine/xenobio,
+/area/station/science/xenobiology)
"tus" = (
/obj/machinery/plumbing/sender{
dir = 4
@@ -55143,13 +55131,6 @@
/obj/structure/railing,
/turf/open/floor/plating,
/area/station/maintenance/central/greater)
-"tuT" = (
-/obj/effect/turf_decal/siding/purple{
- dir = 1
- },
-/obj/machinery/computer/security/telescreen/ordnance/directional/south,
-/turf/open/floor/iron/white,
-/area/station/science/ordnance/testlab)
"tuY" = (
/obj/effect/turf_decal/trimline/blue/arrow_ccw{
dir = 1
@@ -55235,6 +55216,20 @@
/obj/effect/turf_decal/caution/stand_clear,
/turf/open/floor/engine,
/area/station/command/corporate_dock)
+"txu" = (
+/obj/machinery/chem_dispenser,
+/obj/machinery/newscaster/directional/east,
+/obj/effect/turf_decal/trimline/yellow/filled/line{
+ dir = 6
+ },
+/obj/effect/turf_decal/trimline/yellow/filled/mid_joiner,
+/obj/effect/turf_decal/trimline/yellow/filled/mid_joiner{
+ dir = 4
+ },
+/turf/open/floor/iron/white/smooth_corner{
+ dir = 1
+ },
+/area/station/medical/pharmacy)
"txw" = (
/obj/structure/table,
/obj/effect/spawner/round_default_module,
@@ -55377,6 +55372,15 @@
},
/turf/open/floor/iron/large,
/area/station/hallway/secondary/exit/departure_lounge)
+"tAs" = (
+/obj/machinery/suit_storage_unit/standard_unit,
+/obj/machinery/door/window/brigdoor/right/directional/east{
+ req_access = list("command")
+ },
+/obj/effect/turf_decal/bot,
+/obj/machinery/light/small/dim/directional/west,
+/turf/open/floor/iron,
+/area/station/command/bridge)
"tAt" = (
/obj/machinery/power/smes,
/turf/open/floor/plating,
@@ -55423,23 +55427,6 @@
},
/turf/open/floor/engine,
/area/station/engineering/supermatter/room)
-"tBe" = (
-/obj/machinery/computer/pod/old/mass_driver_controller/trash{
- pixel_x = -32;
- pixel_y = 6;
- range = 5
- },
-/obj/structure/cable,
-/obj/machinery/button/door/directional/west{
- id = "Disposal Exit";
- name = "Disposal Vent Control";
- req_access = list("maint_tunnels");
- pixel_x = -32;
- pixel_y = -6
- },
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/plating,
-/area/station/maintenance/disposal)
"tBg" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -55468,6 +55455,11 @@
/obj/machinery/light/small/directional/north,
/turf/open/floor/iron,
/area/station/cargo/boutique)
+"tBl" = (
+/obj/structure/window/reinforced/spawner/directional/south,
+/obj/structure/window/reinforced/spawner/directional/east,
+/turf/open/floor/engine,
+/area/station/science/xenobiology)
"tBo" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -55483,13 +55475,6 @@
},
/turf/open/floor/engine/vacuum,
/area/station/engineering/atmos)
-"tBC" = (
-/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{
- dir = 4
- },
-/obj/effect/decal/cleanable/blood/drip,
-/turf/open/floor/engine,
-/area/station/science/xenobiology)
"tBF" = (
/obj/structure/closet/secure_closet/chief_medical,
/obj/item/screwdriver,
@@ -55678,6 +55663,13 @@
"tEy" = (
/turf/open/floor/plating,
/area/station/maintenance/department/bridge)
+"tEB" = (
+/obj/machinery/door/airlock/engineering/glass{
+ name = "Primary Tool Storage"
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/iron,
+/area/station/commons/storage/primary)
"tEH" = (
/obj/machinery/light/directional/east,
/obj/effect/turf_decal/tile/dark_blue/half/contrasted{
@@ -55715,18 +55707,6 @@
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/iron/dark,
/area/station/security/mechbay)
-"tFf" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/door/airlock/maintenance,
-/obj/effect/mapping_helpers/airlock/unres{
- dir = 1
- },
-/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance,
-/obj/structure/disposalpipe/segment,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/plating,
-/area/station/maintenance/central/greater)
"tFD" = (
/obj/structure/sink/directional/west,
/obj/structure/mirror/directional/east,
@@ -55817,6 +55797,19 @@
/obj/machinery/light_switch/directional/west,
/turf/open/floor/iron/white/smooth_large,
/area/station/medical/chemistry)
+"tGU" = (
+/obj/structure/cable,
+/obj/machinery/door/airlock/engineering/glass{
+ name = "Break Room"
+ },
+/obj/effect/turf_decal/tile/yellow/fourcorners,
+/obj/machinery/door/firedoor,
+/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/engineering/general,
+/obj/effect/mapping_helpers/airlock/access/any/engineering/construction,
+/turf/open/floor/iron,
+/area/station/engineering/break_room)
"tGW" = (
/obj/machinery/atmospherics/pipe/smart/simple/dark/visible,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -56099,13 +56092,6 @@
/obj/item/clothing/suit/utility/fire/firefighter,
/turf/open/floor/plating/reinforced,
/area/station/command/emergency_closet)
-"tMu" = (
-/obj/structure/railing{
- layer = 3.01
- },
-/obj/effect/spawner/random/structure/closet_private,
-/turf/open/floor/carpet/red,
-/area/station/command/heads_quarters/qm)
"tMz" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
@@ -56294,6 +56280,18 @@
/obj/machinery/telecomms/bus/preset_one,
/turf/open/floor/circuit/green/telecomms/mainframe,
/area/station/tcommsat/server)
+"tOz" = (
+/obj/machinery/atmospherics/components/binary/pump{
+ dir = 8
+ },
+/obj/machinery/airalarm/directional/south,
+/obj/effect/mapping_helpers/airalarm/mixingchamber_access,
+/obj/effect/mapping_helpers/airalarm/link{
+ chamber_id = "ordnancefreezer"
+ },
+/obj/effect/mapping_helpers/airalarm/tlv_no_checks,
+/turf/open/floor/iron/dark,
+/area/station/science/ordnance)
"tOA" = (
/obj/machinery/door/airlock/highsecurity{
name = "Gravity Generator Room"
@@ -56349,6 +56347,14 @@
dir = 8
},
/area/station/service/hydroponics/garden)
+"tOZ" = (
+/obj/machinery/computer/records/medical,
+/obj/effect/turf_decal/tile/red/fourcorners,
+/obj/machinery/computer/security/telescreen/cmo/directional/north{
+ name = "Medbay Monitor"
+ },
+/turf/open/floor/iron/dark,
+/area/station/security/checkpoint/medical)
"tPb" = (
/obj/structure/window/reinforced/spawner/directional/south,
/obj/structure/window/reinforced/spawner/directional/west,
@@ -56488,6 +56494,14 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/dark,
/area/station/science/xenobiology)
+"tRT" = (
+/obj/structure/table/reinforced,
+/obj/item/storage/medkit/regular,
+/obj/effect/turf_decal/tile/dark_blue/half/contrasted{
+ dir = 1
+ },
+/turf/open/floor/iron/dark,
+/area/station/command/bridge)
"tRX" = (
/obj/effect/turf_decal/tile/red/half/contrasted{
dir = 8
@@ -56624,13 +56638,6 @@
dir = 4
},
/area/station/command/meeting_room)
-"tUF" = (
-/obj/structure/table/wood,
-/obj/item/flashlight/lamp,
-/obj/machinery/camera/autoname/directional/north,
-/obj/machinery/keycard_auth/directional/north,
-/turf/open/floor/carpet/green,
-/area/station/command/heads_quarters/hop)
"tUG" = (
/obj/structure/chair/stool/bar/directional/west,
/obj/effect/turf_decal/siding/wood{
@@ -56652,6 +56659,14 @@
/obj/structure/cable,
/turf/closed/wall/r_wall,
/area/station/engineering/main)
+"tVn" = (
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/atmospherics/pipe/smart/simple/green/hidden{
+ dir = 6
+ },
+/turf/open/floor/iron/dark,
+/area/station/science/ordnance)
"tVF" = (
/obj/effect/spawner/structure/window/hollow/reinforced/middle,
/obj/structure/cable,
@@ -56728,6 +56743,13 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/central)
+"tWo" = (
+/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/blood/drip,
+/turf/open/floor/engine/xenobio,
+/area/station/science/xenobiology)
"tWs" = (
/obj/effect/spawner/random/structure/grille,
/obj/structure/cable,
@@ -56938,11 +56960,6 @@
/obj/machinery/light/small/directional/west,
/turf/open/floor/iron/showroomfloor,
/area/station/maintenance/department/engine)
-"uak" = (
-/obj/structure/table,
-/obj/item/restraints/handcuffs,
-/turf/open/floor/engine,
-/area/station/science/xenobiology)
"uat" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -57049,6 +57066,24 @@
/obj/effect/landmark/start/hangover/closet,
/turf/open/floor/iron,
/area/station/commons/fitness/recreation)
+"uby" = (
+/obj/structure/transport/linear/public,
+/obj/machinery/light/floor/transport,
+/turf/open/floor/plating/elevatorshaft,
+/area/station/cargo/storage)
+"ubF" = (
+/obj/machinery/door/airlock/command/glass{
+ name = "Bridge"
+ },
+/obj/effect/mapping_helpers/airlock/access/any/command/general,
+/obj/machinery/door/firedoor,
+/obj/structure/cable,
+/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{
+ cycle_id = "bridgec"
+ },
+/obj/effect/mapping_helpers/airlock/access/any/admin/general,
+/turf/open/floor/iron,
+/area/station/hallway/secondary/command)
"ubV" = (
/obj/structure/chair{
dir = 1
@@ -57248,16 +57283,6 @@
/obj/structure/cable,
/turf/open/floor/iron/dark,
/area/station/command/gateway)
-"ufW" = (
-/obj/effect/turf_decal/tile/red/anticorner/contrasted{
- dir = 1
- },
-/obj/structure/table,
-/obj/item/restraints/handcuffs/cable/yellow,
-/obj/item/restraints/handcuffs,
-/obj/machinery/computer/security/telescreen/normal/directional/west,
-/turf/open/floor/iron,
-/area/station/hallway/secondary/exit/departure_lounge)
"ugh" = (
/obj/machinery/door/airlock/research{
name = "Research and Development Lab"
@@ -57667,13 +57692,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron,
/area/station/hallway/primary/starboard)
-"umA" = (
-/obj/structure/window/reinforced/spawner/directional/south,
-/obj/structure/window/reinforced/spawner/directional/east{
- layer = 2.9
- },
-/turf/open/floor/engine,
-/area/station/science/xenobiology)
"umK" = (
/obj/effect/spawner/random/structure/crate_abandoned,
/turf/open/floor/plating,
@@ -57710,6 +57728,9 @@
"unk" = (
/turf/closed/wall/rock/porous,
/area/station/asteroid)
+"unp" = (
+/turf/open/floor/engine/airless,
+/area/space/nearstation)
"unA" = (
/obj/machinery/air_sensor/nitrogen_tank,
/turf/open/floor/engine/n2,
@@ -57766,11 +57787,6 @@
/obj/machinery/atmospherics/components/binary/valve,
/turf/open/floor/plating,
/area/station/maintenance/department/medical/central)
-"uoP" = (
-/obj/machinery/atmospherics/components/trinary/filter/atmos/flipped/co2,
-/obj/effect/turf_decal/tile/blue/fourcorners,
-/turf/open/floor/catwalk_floor/flat_white,
-/area/station/medical/treatment_center)
"uoY" = (
/obj/structure/cable,
/obj/effect/turf_decal/trimline/purple/filled/arrow_ccw,
@@ -58220,22 +58236,6 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/engineering/storage)
-"uwV" = (
-/obj/machinery/door/poddoor/shutters/window/preopen{
- id = "ordstorage"
- },
-/obj/effect/turf_decal/stripes/line,
-/obj/machinery/button/door/directional/east{
- req_access = list("ordnance");
- name = "Ordnance Storage Shutter Control";
- id = "ordstorage"
- },
-/obj/effect/turf_decal/caution/stand_clear/red,
-/obj/effect/turf_decal/stripes/corner{
- dir = 4
- },
-/turf/open/floor/iron/white,
-/area/station/science/ordnance/storage)
"uwW" = (
/obj/structure/cable/layer1,
/turf/open/floor/iron,
@@ -58367,6 +58367,11 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/security/office)
+"uzn" = (
+/obj/structure/flora/bush/fullgrass/style_random,
+/obj/structure/window/reinforced/spawner/directional/east,
+/turf/open/floor/grass,
+/area/station/science/research)
"uzv" = (
/obj/effect/turf_decal/siding/purple{
dir = 1
@@ -58384,6 +58389,17 @@
"uzH" = (
/turf/open/floor/iron,
/area/station/commons/locker)
+"uzJ" = (
+/obj/machinery/door/airlock/research/glass/incinerator/ordmix_exterior{
+ name = "Burn Chamber Exterior Airlock"
+ },
+/obj/effect/mapping_helpers/airlock/locked,
+/obj/effect/mapping_helpers/airlock/access/all/science/ordnance,
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/turf/open/floor/engine/vacuum,
+/area/station/science/ordnance/burnchamber)
"uzQ" = (
/turf/open/floor/iron/white/textured_large,
/area/station/commons/fitness/recreation)
@@ -58777,6 +58793,13 @@
/obj/machinery/camera/autoname/directional/north,
/turf/open/floor/iron/white,
/area/station/hallway/secondary/entry)
+"uHc" = (
+/obj/effect/turf_decal/tile/dark_blue/half/contrasted{
+ dir = 8
+ },
+/obj/machinery/computer/security/telescreen/minisat/directional/west,
+/turf/open/floor/iron,
+/area/station/command/bridge)
"uHz" = (
/obj/structure/lattice/catwalk,
/turf/open/openspace{
@@ -58885,14 +58908,6 @@
/obj/structure/cable,
/turf/open/floor/plating/airless,
/area/station/solars/port)
-"uJq" = (
-/obj/machinery/computer/records/medical,
-/obj/effect/turf_decal/tile/red/fourcorners,
-/obj/machinery/computer/security/telescreen/cmo/directional/north{
- name = "Medbay Monitor"
- },
-/turf/open/floor/iron/dark,
-/area/station/security/checkpoint/medical)
"uJt" = (
/obj/effect/mapping_helpers/engraving,
/turf/closed/wall,
@@ -59263,20 +59278,6 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/iron/large,
/area/station/service/hydroponics/garden)
-"uPg" = (
-/obj/effect/turf_decal/trimline/blue/filled/line{
- dir = 9
- },
-/obj/machinery/lift_indicator/directional/south{
- linked_elevator_id = "medbay1";
- pixel_x = -32
- },
-/obj/machinery/button/elevator/directional/south{
- id = "medbay1";
- pixel_x = -32
- },
-/turf/open/floor/iron/white,
-/area/station/medical/treatment_center)
"uPi" = (
/obj/effect/turf_decal/tile/brown/half/contrasted,
/obj/effect/decal/cleanable/dirt,
@@ -59651,19 +59652,6 @@
},
/turf/open/floor/iron/dark/corner,
/area/station/engineering/atmos/upper)
-"uXb" = (
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/structure/cable,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/simple/green/hidden{
- dir = 5
- },
-/turf/open/floor/iron/dark,
-/area/station/science/ordnance)
"uXe" = (
/obj/structure/cable,
/obj/effect/decal/cleanable/dirt,
@@ -59673,6 +59661,10 @@
},
/turf/open/floor/iron,
/area/station/maintenance/disposal/incinerator)
+"uXn" = (
+/obj/machinery/shower/directional/east,
+/turf/open/floor/iron/showroomfloor,
+/area/station/cargo/storage)
"uXp" = (
/obj/docking_port/stationary{
dir = 2;
@@ -59861,23 +59853,9 @@
},
/turf/open/floor/iron/white,
/area/station/medical/virology)
-"vay" = (
-/obj/structure/table/reinforced,
-/obj/item/storage/medkit/regular,
-/obj/effect/turf_decal/tile/dark_blue/half/contrasted{
- dir = 1
- },
-/turf/open/floor/iron/dark,
-/area/station/command/bridge)
"vaC" = (
/turf/open/floor/catwalk_floor/iron_dark,
/area/station/command/corporate_dock)
-"vaU" = (
-/obj/item/toy/plush/lizard_plushie/space/green{
- name = "Delaminates-The-Supermatter"
- },
-/turf/open/misc/asteroid/airless,
-/area/space)
"vaY" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/broken_flooring/pile,
@@ -59956,22 +59934,6 @@
/obj/effect/mapping_helpers/airlock/access/all/service/crematorium,
/turf/open/floor/iron/dark,
/area/station/service/chapel/office)
-"vcZ" = (
-/obj/item/circuitboard/machine/thermomachine,
-/obj/item/circuitboard/machine/thermomachine,
-/obj/item/storage/bag/construction,
-/obj/item/storage/bag/construction,
-/obj/item/storage/bag/construction,
-/obj/item/stock_parts/power_store/cell/high,
-/obj/item/stock_parts/power_store/cell/high,
-/obj/item/stock_parts/power_store/cell/high,
-/obj/structure/closet/crate,
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/obj/machinery/light/dim/directional/south,
-/turf/open/floor/iron/large,
-/area/station/engineering/atmos)
"vdb" = (
/obj/effect/turf_decal/trimline/blue/filled/line{
dir = 1
@@ -60167,10 +60129,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/catwalk_floor/iron_dark,
/area/station/maintenance/department/engine)
-"vgW" = (
-/obj/structure/lattice,
-/turf/open/floor/engine/airless,
-/area/space)
"vhf" = (
/obj/machinery/atmospherics/pipe/multiz/supply/visible/layer4,
/obj/machinery/atmospherics/pipe/multiz/scrubbers/visible/layer2,
@@ -60218,12 +60176,6 @@
},
/turf/open/floor/iron/dark,
/area/station/command/bridge)
-"vib" = (
-/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{
- dir = 4
- },
-/turf/open/floor/engine/vacuum,
-/area/station/science/ordnance/burnchamber)
"viK" = (
/obj/effect/turf_decal/tile/dark_blue/half/contrasted{
dir = 8
@@ -60293,17 +60245,6 @@
/obj/effect/turf_decal/tile/red/half/contrasted,
/turf/open/floor/iron,
/area/station/security/warden)
-"vjB" = (
-/obj/machinery/door/poddoor/shutters{
- id = "ordauxgarage";
- dir = 1
- },
-/obj/effect/turf_decal/sand/plating,
-/obj/effect/turf_decal/stripes/asteroid/end{
- dir = 4
- },
-/turf/open/floor/plating,
-/area/station/science/ordnance)
"vjD" = (
/obj/structure/cable,
/obj/structure/sign/poster/random/directional/north,
@@ -60348,14 +60289,6 @@
/obj/effect/turf_decal/stripes/full,
/turf/open/floor/iron,
/area/station/science/robotics/mechbay)
-"vkv" = (
-/obj/item/stock_parts/power_store/cell/bluespace{
- rigged = 1;
- pixel_x = -5;
- pixel_y = -8
- },
-/turf/open/misc/asteroid,
-/area/station/asteroid)
"vkx" = (
/obj/machinery/recycler{
dir = 4
@@ -60385,6 +60318,22 @@
/obj/structure/tank_dispenser/oxygen,
/turf/open/floor/plating,
/area/station/engineering/supermatter/room)
+"vkP" = (
+/obj/machinery/door/airlock/command/glass{
+ name = "Bridge"
+ },
+/obj/effect/mapping_helpers/airlock/access/any/command/general,
+/obj/structure/cable,
+/obj/machinery/door/firedoor,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/disposalpipe/segment,
+/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{
+ cycle_id = "bridgec"
+ },
+/obj/effect/mapping_helpers/airlock/access/any/admin/general,
+/turf/open/floor/iron,
+/area/station/hallway/secondary/command)
"vkR" = (
/obj/machinery/firealarm/directional/west,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
@@ -60976,12 +60925,6 @@
mineralChance = 20
},
/area/station/asteroid)
-"vxZ" = (
-/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{
- dir = 4
- },
-/turf/closed/wall/r_wall,
-/area/station/science/ordnance/burnchamber)
"vyj" = (
/obj/structure/stairs/east,
/obj/structure/railing,
@@ -61243,6 +61186,13 @@
},
/turf/open/floor/engine,
/area/station/science/xenobiology)
+"vDA" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/components/tank/oxygen{
+ dir = 8
+ },
+/turf/open/floor/plating,
+/area/station/maintenance/department/science)
"vDK" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -61394,14 +61344,6 @@
},
/turf/open/floor/iron,
/area/station/security/brig)
-"vFG" = (
-/obj/structure/window/reinforced/spawner/directional/west,
-/obj/structure/stairs/north,
-/obj/structure/window/reinforced/spawner/directional/east{
- layer = 2.9
- },
-/turf/open/floor/iron/dark/textured_large,
-/area/station/engineering/storage/tech)
"vFH" = (
/obj/effect/turf_decal/trimline/blue/line{
dir = 9
@@ -61557,6 +61499,10 @@
/obj/effect/landmark/event_spawn,
/turf/open/floor/iron/dark,
/area/station/hallway/secondary/exit/departure_lounge)
+"vId" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/closed/wall/r_wall,
+/area/station/science/ordnance/burnchamber)
"vIi" = (
/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible,
/obj/effect/turf_decal/tile/yellow{
@@ -61657,13 +61603,6 @@
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plating,
/area/station/maintenance/department/cargo)
-"vLa" = (
-/obj/structure/flora/bush/fullgrass/style_random,
-/obj/structure/window/reinforced/spawner/directional/east{
- layer = 2.9
- },
-/turf/open/floor/grass,
-/area/station/science/research)
"vLs" = (
/obj/effect/turf_decal/sand/plating,
/obj/structure/fence,
@@ -61724,6 +61663,12 @@
},
/turf/open/floor/wood,
/area/station/commons/lounge)
+"vMf" = (
+/obj/structure/railing,
+/obj/structure/dresser,
+/obj/machinery/light_switch/directional/west,
+/turf/open/floor/carpet/red,
+/area/station/command/heads_quarters/qm)
"vMm" = (
/obj/machinery/atmospherics/pipe/multiz/supply/hidden/layer4{
dir = 4
@@ -61751,27 +61696,10 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/dark,
/area/station/service/bar)
-"vME" = (
-/obj/machinery/door/airlock/engineering/glass{
- name = "Break Room"
- },
-/obj/effect/mapping_helpers/airlock/access/any/engineering/general,
-/obj/structure/cable,
-/obj/effect/turf_decal/tile/yellow/fourcorners,
-/obj/machinery/door/firedoor,
-/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/engineering/construction,
-/turf/open/floor/iron,
-/area/station/engineering/break_room)
"vMN" = (
/obj/structure/flora/coconuts,
/turf/open/floor/grass,
/area/station/medical/chemistry)
-"vMR" = (
-/obj/machinery/door/poddoor/incinerator_ordmix,
-/turf/open/floor/engine/vacuum,
-/area/station/science/ordnance/burnchamber)
"vNc" = (
/obj/machinery/modular_computer/preset/id{
dir = 1
@@ -62002,15 +61930,6 @@
/obj/structure/grille,
/turf/open/floor/plating,
/area/station/engineering/supermatter/room)
-"vQf" = (
-/obj/machinery/suit_storage_unit/standard_unit,
-/obj/machinery/door/window/brigdoor/right/directional/east{
- req_access = list("command")
- },
-/obj/effect/turf_decal/bot,
-/obj/machinery/light/small/dim/directional/west,
-/turf/open/floor/iron,
-/area/station/command/bridge)
"vQn" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 1
@@ -62260,6 +62179,10 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/showroomfloor,
/area/station/engineering/main)
+"vUP" = (
+/obj/machinery/door/poddoor/incinerator_ordmix,
+/turf/open/floor/engine/vacuum,
+/area/station/science/ordnance/burnchamber)
"vVe" = (
/obj/structure/lattice/catwalk,
/obj/structure/cable,
@@ -62432,6 +62355,21 @@
/obj/structure/cable,
/turf/open/floor/plating,
/area/station/maintenance/department/medical/central)
+"vXW" = (
+/obj/machinery/door/airlock/command{
+ name = "Head of Personnel's Booth"
+ },
+/obj/effect/turf_decal/siding/wood,
+/obj/effect/mapping_helpers/airlock/access/any/command/hop,
+/obj/machinery/door/firedoor,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/cable,
+/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{
+ cycle_id = "bridgehop"
+ },
+/turf/open/floor/carpet/green,
+/area/station/command/heads_quarters/hop)
"vYg" = (
/obj/effect/turf_decal/bot/right,
/turf/open/floor/engine,
@@ -62445,6 +62383,41 @@
"vYz" = (
/turf/closed/wall/r_wall,
/area/station/medical/chemistry/minisat)
+"vYD" = (
+/obj/effect/landmark/start/ai/secondary,
+/obj/machinery/door/window/brigdoor/left/directional/north{
+ name = "Tertiary AI Core Access";
+ req_access = list("ai_upload");
+ pixel_y = 3
+ },
+/obj/item/radio/intercom/directional/south{
+ pixel_x = -27;
+ freerange = 1;
+ listening = 0;
+ name = "Common Channel"
+ },
+/obj/item/radio/intercom/directional/south{
+ pixel_x = 27;
+ frequency = 1447;
+ freerange = 1;
+ listening = 0;
+ name = "Private Channel"
+ },
+/obj/machinery/flasher/directional/east{
+ pixel_y = 8;
+ id = "AI"
+ },
+/turf/open/floor/circuit/green,
+/area/station/ai_monitored/turret_protected/ai)
+"vYH" = (
+/obj/effect/spawner/structure/window/reinforced/plasma,
+/obj/machinery/door/poddoor/preopen{
+ id = "rdoffice";
+ name = "Research Director's Shutters"
+ },
+/obj/structure/cable,
+/turf/open/floor/plating,
+/area/station/command/heads_quarters/rd)
"vYL" = (
/obj/machinery/computer/atmos_control/nitrous_tank,
/obj/effect/turf_decal/tile/yellow{
@@ -62603,6 +62576,16 @@
/obj/effect/turf_decal/tile/dark_blue/half/contrasted,
/turf/open/floor/iron/dark,
/area/station/command/bridge)
+"wbg" = (
+/obj/effect/turf_decal/tile/green/half/contrasted{
+ dir = 4
+ },
+/obj/structure/chair{
+ name = "Defense"
+ },
+/obj/structure/cable,
+/turf/open/floor/iron,
+/area/station/security/courtroom)
"wbC" = (
/obj/effect/turf_decal/siding/dark_blue{
dir = 1
@@ -62645,6 +62628,14 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/fore)
+"wcl" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/spawner/random/structure/closet_empty/crate,
+/obj/item/stock_parts/power_store/cell,
+/obj/structure/broken_flooring,
+/obj/machinery/airalarm/directional/north,
+/turf/open/floor/plating,
+/area/station/cargo/warehouse)
"wcm" = (
/obj/effect/turf_decal/tile/neutral/fourcorners,
/obj/machinery/light/cold/directional/north,
@@ -62881,10 +62872,6 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/central)
-"wgI" = (
-/obj/machinery/air_sensor/ordnance_burn_chamber,
-/turf/open/floor/engine/vacuum,
-/area/station/science/ordnance/burnchamber)
"wgK" = (
/obj/effect/turf_decal/box/corners{
dir = 8
@@ -63180,17 +63167,6 @@
/obj/effect/turf_decal/stripes,
/turf/open/floor/iron/dark,
/area/station/engineering/atmospherics_engine)
-"wmM" = (
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/structure/cable,
-/obj/machinery/light/directional/east,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/simple/green/hidden{
- dir = 10
- },
-/turf/open/floor/iron/dark,
-/area/station/science/ordnance)
"wmO" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/glass/reinforced,
@@ -63226,12 +63202,6 @@
dir = 8
},
/area/station/science/xenobiology)
-"wnH" = (
-/obj/machinery/power/apc/auto_name/directional/west,
-/obj/structure/cable,
-/obj/machinery/portable_atmospherics/canister/oxygen,
-/turf/open/floor/iron/white,
-/area/station/science/ordnance/storage)
"wnL" = (
/turf/open/floor/plating,
/area/station/medical/medbay/central)
@@ -63436,6 +63406,10 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/iron/white,
/area/station/medical/treatment_center)
+"wrZ" = (
+/obj/effect/spawner/structure/window/reinforced/plasma,
+/turf/open/floor/engine/vacuum,
+/area/station/science/ordnance/burnchamber)
"wsa" = (
/obj/structure/table,
/obj/item/paper,
@@ -63855,6 +63829,24 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/command/storage/satellite)
+"wzW" = (
+/obj/machinery/door/airlock/research{
+ name = "Research Division Access"
+ },
+/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{
+ cycle_id = "sci-entrance"
+ },
+/obj/effect/mapping_helpers/airlock/unres{
+ dir = 4
+ },
+/obj/machinery/door/firedoor,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/effect/mapping_helpers/airlock/access/all/science/general,
+/turf/open/floor/iron/white,
+/area/station/science/research)
"wzX" = (
/obj/structure/flora/tree/palm/style_random,
/turf/open/floor/grass,
@@ -64377,10 +64369,6 @@
/obj/structure/closet,
/turf/open/floor/iron/textured,
/area/station/hallway/primary/central)
-"wHl" = (
-/obj/structure/girder,
-/turf/open/misc/asteroid/airless,
-/area/space)
"wHo" = (
/obj/effect/turf_decal/tile/neutral,
/obj/effect/spawner/random/entertainment/arcade{
@@ -64462,13 +64450,27 @@
},
/turf/open/floor/iron/dark,
/area/station/medical/chemistry/minisat)
+"wJo" = (
+/obj/structure/table/reinforced,
+/obj/item/stock_parts/power_store/cell/high{
+ pixel_x = 4;
+ pixel_y = 5
+ },
+/obj/item/stock_parts/power_store/cell/high{
+ pixel_x = -8;
+ pixel_y = 9
+ },
+/obj/item/stock_parts/power_store/cell/high,
+/obj/machinery/cell_charger,
+/obj/item/borg/upgrade/rename{
+ pixel_x = 3;
+ pixel_y = 18
+ },
+/turf/open/floor/iron/dark/textured,
+/area/station/science/robotics/lab)
"wJy" = (
/turf/closed/wall,
/area/station/medical/storage)
-"wJC" = (
-/obj/structure/sign/poster/contraband/communist_state/directional/east,
-/turf/open/space/basic,
-/area/space)
"wJN" = (
/obj/machinery/space_heater/improvised_chem_heater,
/turf/open/floor/plating,
@@ -64541,6 +64543,16 @@
},
/turf/open/floor/iron/white,
/area/station/hallway/secondary/entry)
+"wLy" = (
+/obj/effect/turf_decal/trimline/dark_blue/filled/line{
+ dir = 4
+ },
+/obj/machinery/computer/security/telescreen/cmo/directional/east,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+ dir = 1
+ },
+/turf/open/floor/holofloor/dark,
+/area/station/command/heads_quarters/cmo)
"wLA" = (
/obj/structure/bed{
dir = 1
@@ -64908,9 +64920,6 @@
/obj/machinery/status_display/ai/directional/west,
/turf/open/floor/iron,
/area/station/hallway/primary/central)
-"wSj" = (
-/turf/closed/mineral/asteroid,
-/area/space)
"wSn" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/carpet,
@@ -65047,21 +65056,6 @@
/obj/effect/spawner/structure/window/reinforced/plasma,
/turf/open/floor/plating,
/area/station/engineering/atmos)
-"wVL" = (
-/obj/machinery/door/airlock/research{
- name = "Research Division Access"
- },
-/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{
- cycle_id = "sci-entrance"
- },
-/obj/effect/mapping_helpers/airlock/unres{
- dir = 4
- },
-/obj/machinery/door/firedoor,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/effect/mapping_helpers/airlock/access/all/science/general,
-/turf/open/floor/iron/white,
-/area/station/science/research)
"wWk" = (
/obj/effect/turf_decal/stripes{
dir = 1
@@ -65205,14 +65199,6 @@
/obj/effect/mapping_helpers/airlock/autoname,
/turf/open/floor/iron,
/area/station/command/heads_quarters/rd)
-"wYO" = (
-/obj/effect/turf_decal/tile/red/anticorner/contrasted,
-/obj/machinery/computer/security/telescreen/prison/directional/south,
-/obj/machinery/modular_computer/preset/cargochat/security{
- dir = 1
- },
-/turf/open/floor/iron,
-/area/station/security/office)
"wYW" = (
/obj/machinery/door/airlock/research{
autoclose = 0;
@@ -65368,19 +65354,6 @@
/obj/effect/turf_decal/siding/purple/corner,
/turf/open/floor/iron/white/smooth_large,
/area/station/science/research)
-"xaC" = (
-/obj/machinery/portable_atmospherics/canister/anesthetic_mix,
-/obj/machinery/atmospherics/components/unary/portables_connector/visible{
- dir = 1
- },
-/obj/structure/window/reinforced/spawner/directional/east,
-/obj/machinery/door/window/right/directional/north{
- req_access = list("medical");
- name = "Anti Assistant Protection Door"
- },
-/obj/effect/turf_decal/tile/blue/fourcorners,
-/turf/open/floor/iron/white,
-/area/station/medical/treatment_center)
"xaH" = (
/obj/structure/filingcabinet,
/obj/machinery/button/ticket_machine{
@@ -65455,10 +65428,6 @@
/obj/structure/rack,
/turf/open/floor/plating,
/area/station/asteroid)
-"xbr" = (
-/obj/structure/window/reinforced/spawner/directional/west,
-/turf/open/floor/glass/reinforced,
-/area/station/security/prison)
"xbs" = (
/obj/machinery/airalarm/directional/south,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -65708,10 +65677,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/cargo/storage)
-"xfQ" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/closed/wall/r_wall,
-/area/station/science/ordnance/burnchamber)
"xfS" = (
/obj/structure/sign/departments/aisat/directional/east,
/obj/effect/turf_decal/tile/dark_blue/anticorner/contrasted{
@@ -65778,6 +65743,29 @@
"xhJ" = (
/turf/closed/wall/r_wall,
/area/station/command/heads_quarters/cmo)
+"xhT" = (
+/obj/machinery/door/airlock/research/glass/incinerator/ordmix_exterior{
+ name = "Burn Chamber Interior Airlock";
+ id_tag = "ordmix_airlock_interior"
+ },
+/obj/effect/mapping_helpers/airlock/locked,
+/obj/effect/mapping_helpers/airlock/access/all/science/ordnance,
+/obj/machinery/airlock_controller/incinerator_ordmix{
+ pixel_y = -26
+ },
+/obj/machinery/button/ignition/incinerator/ordmix{
+ pixel_x = -6;
+ pixel_y = 24
+ },
+/obj/machinery/button/door/incinerator_vent_ordmix{
+ pixel_x = 8;
+ pixel_y = 24
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/turf/open/floor/engine/vacuum,
+/area/station/science/ordnance/burnchamber)
"xhV" = (
/obj/machinery/door/airlock/medical/glass{
name = "Medbay"
@@ -66088,27 +66076,6 @@
/obj/item/radio/intercom/directional/south,
/turf/open/floor/iron,
/area/station/maintenance/disposal/incinerator)
-"xna" = (
-/obj/structure/table,
-/obj/item/tank/internals/anesthetic,
-/turf/open/floor/engine,
-/area/station/science/xenobiology)
-"xnc" = (
-/obj/machinery/door/airlock/command/glass{
- name = "Bridge"
- },
-/obj/effect/mapping_helpers/airlock/access/any/command/general,
-/obj/structure/cable,
-/obj/machinery/door/firedoor,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/disposalpipe/segment,
-/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{
- cycle_id = "bridgec"
- },
-/obj/effect/mapping_helpers/airlock/access/any/admin/general,
-/turf/open/floor/iron,
-/area/station/hallway/secondary/command)
"xne" = (
/obj/structure/cable,
/obj/effect/spawner/random/maintenance/two,
@@ -66608,6 +66575,17 @@
/obj/structure/cable/layer1,
/turf/open/floor/engine,
/area/station/engineering/supermatter/room)
+"xwJ" = (
+/obj/effect/mapping_helpers/broken_floor,
+/obj/structure/closet/crate/science{
+ opened = 1;
+ icon_state = "scicrateopen"
+ },
+/obj/item/tank,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/turf_decal/stripes/line,
+/turf/open/floor/iron/dark/smooth_large,
+/area/station/science/ordnance)
"xwO" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/disposalpipe/segment,
@@ -66640,16 +66618,16 @@
},
/turf/open/floor/iron,
/area/station/engineering/atmos/pumproom)
-"xxs" = (
-/obj/machinery/door/airlock/multi_tile/public{
- name = "Corporate Private Dock"
+"xxv" = (
+/obj/effect/turf_decal/tile/red/anticorner/contrasted{
+ dir = 1
},
-/obj/structure/cable,
-/obj/machinery/door/firedoor,
-/obj/effect/mapping_helpers/airlock/access/any/command/general,
-/obj/effect/mapping_helpers/airlock/access/any/admin/general,
-/turf/open/floor/iron/dark/smooth_large,
-/area/station/command/corporate_dock)
+/obj/structure/table,
+/obj/item/restraints/handcuffs/cable/yellow,
+/obj/item/restraints/handcuffs,
+/obj/machinery/computer/security/telescreen/normal/directional/west,
+/turf/open/floor/iron,
+/area/station/hallway/secondary/exit/departure_lounge)
"xxH" = (
/obj/machinery/firealarm/directional/south,
/obj/effect/turf_decal/stripes/line{
@@ -66666,14 +66644,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron,
/area/station/engineering/atmos)
-"xxO" = (
-/obj/structure/window/reinforced/spawner/directional/north,
-/obj/structure/flora/bush/fullgrass/style_random,
-/obj/structure/window/reinforced/spawner/directional/east{
- layer = 2.9
- },
-/turf/open/floor/grass,
-/area/station/science/research)
"xxT" = (
/obj/structure/chair/wood,
/obj/effect/turf_decal/siding/wood{
@@ -66955,6 +66925,11 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/carpet/purple,
/area/station/service/library)
+"xCV" = (
+/obj/structure/window/reinforced/spawner/directional/east,
+/obj/machinery/light/directional/south,
+/turf/open/floor/engine,
+/area/station/science/xenobiology)
"xCX" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -67271,16 +67246,6 @@
/obj/item/radio/intercom/directional/west,
/turf/open/floor/iron,
/area/station/hallway/primary/central)
-"xJt" = (
-/obj/effect/turf_decal/sand/plating,
-/obj/machinery/light/small/directional/south,
-/obj/structure/broken_flooring/pile,
-/obj/machinery/atmospherics/components/binary/pump/off/green/hidden{
- dir = 4;
- name = "Aux Oxygen To Port"
- },
-/turf/open/floor/plating,
-/area/station/science/ordnance)
"xJA" = (
/obj/structure/table/wood/fancy/blue,
/obj/effect/spawner/random/aimodule/neutral,
@@ -67418,26 +67383,6 @@
},
/turf/open/floor/iron/dark/textured,
/area/station/medical/morgue)
-"xNb" = (
-/obj/effect/turf_decal/siding/wood{
- dir = 8
- },
-/obj/machinery/button/door/directional/south{
- id = "capshut";
- pixel_x = -8;
- name = "shutter control"
- },
-/obj/machinery/fax{
- fax_name = "Captain's Office";
- name = "Captain's Fax Machine"
- },
-/obj/structure/table/reinforced,
-/obj/machinery/keycard_auth/directional/south{
- pixel_y = -24;
- pixel_x = 8
- },
-/turf/open/floor/carpet/royalblue,
-/area/station/command/heads_quarters/captain/private)
"xNh" = (
/obj/effect/turf_decal/stripes/corner{
dir = 4
@@ -67733,6 +67678,20 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/iron,
/area/station/cargo/storage)
+"xTN" = (
+/obj/machinery/door/airlock/multi_tile/public{
+ dir = 4
+ },
+/obj/effect/mapping_helpers/airlock/access/any/command/general,
+/obj/machinery/door/firedoor,
+/obj/effect/mapping_helpers/airlock/unres{
+ dir = 8
+ },
+/obj/structure/cable,
+/obj/effect/mapping_helpers/airlock/autoname,
+/obj/effect/mapping_helpers/airlock/access/any/admin/general,
+/turf/open/floor/iron/dark/smooth_large,
+/area/station/command/meeting_room)
"xTP" = (
/obj/machinery/atmospherics/pipe/smart/simple/green/visible{
dir = 5
@@ -67888,33 +67847,15 @@
/obj/effect/landmark/start/bitrunner,
/turf/open/floor/catwalk_floor/iron_dark,
/area/station/cargo/bitrunning/den)
-"xWR" = (
-/obj/effect/landmark/start/ai/secondary,
-/obj/machinery/door/window/brigdoor/right/directional/south{
- layer = 4.1;
- name = "Secondary AI Core Access";
- req_access = list("ai_upload");
- pixel_y = -4
- },
-/obj/machinery/flasher/directional/west{
- id = "AI";
- pixel_y = -8
- },
-/obj/item/radio/intercom/directional/north{
- pixel_x = -27;
- frequency = 1447;
- freerange = 1;
- on = 0;
- name = "Private Channel"
- },
-/obj/item/radio/intercom/directional/north{
- pixel_x = 27;
- name = "Common Channel";
- freerange = 1;
- listening = 0
- },
-/turf/open/floor/circuit/green,
-/area/station/ai_monitored/turret_protected/ai)
+"xXf" = (
+/obj/structure/closet/crate/science,
+/obj/item/wrench,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/firealarm/directional/west,
+/obj/effect/spawner/random/maintenance,
+/obj/effect/turf_decal/stripes/line,
+/turf/open/floor/iron/dark/smooth_large,
+/area/station/science/ordnance)
"xXh" = (
/obj/machinery/power/shieldwallgen,
/obj/effect/decal/cleanable/dirt/dust,
@@ -67958,10 +67899,6 @@
},
/turf/open/floor/iron/dark,
/area/station/medical/morgue)
-"xXF" = (
-/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/incinerator_ordmix,
-/turf/open/floor/engine,
-/area/station/science/ordnance/burnchamber)
"xXY" = (
/obj/effect/turf_decal/tile/neutral/opposingcorners,
/obj/effect/turf_decal/siding/wideplating/dark/end{
@@ -68291,13 +68228,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/plating,
/area/station/service/theater)
-"ydy" = (
-/obj/machinery/door/airlock/engineering/glass{
- name = "Primary Tool Storage"
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/iron,
-/area/station/commons/storage/primary)
"ydC" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/holosign/barrier,
@@ -80478,7 +80408,7 @@ uMa
sdc
sdc
hCS
-apW
+wcl
lLk
lLk
sWd
@@ -80729,7 +80659,7 @@ sfu
sfu
bgv
lam
-gsi
+fzN
lam
goX
nZt
@@ -80787,7 +80717,7 @@ oDH
bfl
bwC
wfz
-dUc
+bwC
bwC
shs
cLf
@@ -81740,7 +81670,7 @@ eio
eio
mxq
iPw
-tBe
+tgn
vjZ
jtd
bPP
@@ -82276,7 +82206,7 @@ ghU
icM
hoX
wOU
-nnt
+qkZ
dNW
hdK
xiV
@@ -82303,7 +82233,7 @@ kFT
kFT
qIS
osT
-uoP
+nia
ioh
gzw
dKw
@@ -82521,7 +82451,7 @@ jch
oey
dhN
sdc
-sgR
+ezH
eQQ
vSt
umh
@@ -82554,7 +82484,7 @@ pzx
jgH
yds
kFT
-mTZ
+jtG
hQK
dPg
fvo
@@ -82562,7 +82492,7 @@ jPO
osT
dci
piH
-xaC
+hng
dKw
dKw
dKw
@@ -82811,7 +82741,7 @@ mBj
jHx
iJF
kFT
-uJq
+tOZ
sGt
ltj
fvo
@@ -82819,10 +82749,10 @@ pwn
eaL
eUB
dgR
-uPg
+pjf
bui
yit
-dpf
+jEO
yit
dKw
miD
@@ -83070,7 +83000,7 @@ vGn
kFT
moH
bhZ
-pgJ
+teg
fvo
lcM
eaL
@@ -83807,11 +83737,11 @@ uDB
uDB
uDB
sdc
-fLM
+uby
soZ
jCX
jCX
-fLM
+uby
sdc
guF
uyL
@@ -84330,7 +84260,7 @@ xSE
twR
uyL
dUS
-meT
+nTb
sdc
mHU
cAQ
@@ -84344,7 +84274,7 @@ ylV
wdx
rnk
rnk
-nKa
+jnV
kxa
gwA
mcl
@@ -84835,11 +84765,11 @@ iHv
rZJ
rAK
sdc
-fLM
+uby
jCX
qzF
jCX
-fLM
+uby
sdc
dro
uyL
@@ -85317,7 +85247,7 @@ eFK
iEO
oCR
bxs
-ipq
+pbv
jza
mHL
iHG
@@ -86691,7 +86621,7 @@ mXM
cLf
cLf
cLf
-oaR
+dQa
cLf
cLf
cLf
@@ -86919,7 +86849,7 @@ vLx
lZb
mAa
qfB
-mnm
+pwo
bII
icw
mnc
@@ -87436,7 +87366,7 @@ qfB
vyO
hjW
dGs
-rdP
+txu
qfB
rgx
goI
@@ -88955,7 +88885,7 @@ axi
bAw
cGP
ygb
-iPz
+mXT
lQN
qsI
haf
@@ -89182,7 +89112,7 @@ gPZ
pDG
nGd
xst
-wYO
+rTR
ecC
wrx
gpV
@@ -89248,7 +89178,7 @@ jNJ
pUY
kJT
hgV
-wJC
+rjZ
bwC
uuN
gJE
@@ -90715,7 +90645,7 @@ laF
mnX
rkt
bqr
-pWh
+kWj
pyF
waJ
lEM
@@ -90789,9 +90719,9 @@ uZx
paa
lqf
rnk
-jsI
-jsI
-jsI
+vxX
+vxX
+vxX
cLf
cLf
bwC
@@ -90999,7 +90929,7 @@ heI
jAG
oed
oed
-ebE
+oEL
fpH
bxH
oed
@@ -91046,8 +90976,8 @@ uZx
paa
pDQ
rnk
-jsI
-jsI
+vxX
+vxX
rnk
rnk
rnk
@@ -91254,7 +91184,7 @@ rWZ
bZH
sRV
jAG
-jIY
+bGR
wpc
mAX
aHl
@@ -91511,7 +91441,7 @@ dIT
ked
ked
iCa
-drZ
+wbg
dBS
vhT
fYj
@@ -91534,7 +91464,7 @@ tWs
acc
oRa
hWx
-lYo
+jvU
acc
vjq
pKb
@@ -93287,7 +93217,7 @@ axD
axD
axD
axD
-bRl
+fnB
jxq
vEF
axD
@@ -94318,11 +94248,11 @@ jpd
jRc
ruc
jcW
-xNb
+fSH
axD
eKR
sgz
-tUF
+fKp
sPv
eoo
iLG
@@ -94577,13 +94507,13 @@ aEP
axD
axD
axD
-vQf
+tAs
sgz
vlD
puT
tsP
wNa
-jSs
+vXW
jzC
mcw
aKg
@@ -94827,15 +94757,15 @@ cLf
bqX
bqX
bhY
-rcz
+mCH
eYO
mrq
eBK
bQc
-neH
+uHc
nZB
fCY
-loC
+kbU
ejb
fZr
bUM
@@ -95387,7 +95317,7 @@ enu
cLd
cdk
fTl
-hTZ
+cZP
bJo
cdk
rPg
@@ -95849,7 +95779,7 @@ cLf
iUF
cLf
cLf
-oUk
+grB
cLf
cLf
bqX
@@ -95858,7 +95788,7 @@ yhk
fUR
rUi
typ
-ckb
+gqi
jlw
iRB
gkQ
@@ -95868,7 +95798,7 @@ alc
jZj
nAx
kaz
-dbJ
+ubF
mMH
sPS
jww
@@ -96115,7 +96045,7 @@ qlc
wbf
lYZ
typ
-lCK
+esX
aHs
iRB
kZg
@@ -96125,7 +96055,7 @@ cgo
wHs
odL
wHs
-xnc
+vkP
rEp
qgd
xaI
@@ -96637,7 +96567,7 @@ oOP
eKR
eKR
juw
-mtG
+mGw
juw
juw
juw
@@ -96882,7 +96812,7 @@ cLf
cLf
bqX
cQP
-vay
+tRT
eon
sZK
sZK
@@ -97140,12 +97070,12 @@ cLf
bqX
bqX
tsJ
-bCr
+nmF
kYU
jTd
rkz
lrc
-eHa
+gez
vQP
ita
hOb
@@ -97967,7 +97897,7 @@ fkn
sAc
bmL
wSn
-pVd
+sAS
axa
xbs
bmp
@@ -98441,7 +98371,7 @@ juw
juw
juw
wxW
-qmg
+flW
dTd
npg
juw
@@ -101016,7 +100946,7 @@ lnZ
dCu
xUR
vRm
-kkJ
+dLy
utM
xsv
tHF
@@ -101024,7 +100954,7 @@ tCE
rOq
fDa
wGu
-nur
+apl
jkG
fDa
mgV
@@ -102088,7 +102018,7 @@ nSH
oqz
kXz
oqz
-ydy
+tEB
dct
hqk
jFc
@@ -102297,12 +102227,12 @@ vfJ
vfJ
vfJ
vfJ
-bUu
+nwi
grl
pJN
iKc
rSL
-jbL
+hkP
lFE
cBr
deY
@@ -102832,7 +102762,7 @@ nJF
stw
azv
dZd
-esX
+wJo
lYm
azv
azv
@@ -103116,7 +103046,7 @@ uLY
teG
sHg
sHg
-qmD
+etE
wKY
iFq
jFc
@@ -103557,7 +103487,7 @@ cLf
vxX
dZy
fhG
-lQe
+roH
qrt
rmx
wHJ
@@ -103848,7 +103778,7 @@ ipv
tdk
hkc
swi
-dHy
+cEi
cBB
trL
nMP
@@ -104101,9 +104031,9 @@ qIQ
irJ
rBI
cPt
-ctE
+tdN
ixU
-mOc
+nhc
swi
swi
swi
@@ -104356,12 +104286,12 @@ cPt
lcj
tCz
dfr
-mKF
+kKS
cPt
iQZ
oqp
dfM
-pgS
+oWw
lMT
ixU
ixU
@@ -104394,7 +104324,7 @@ cLf
cLf
uuN
xAy
-vFG
+abf
ugN
pWE
hYF
@@ -105124,14 +105054,14 @@ vfJ
rXG
raz
cPt
-toV
+fNj
hEw
irJ
cPt
cPt
-dmE
+wzW
ixU
-wVL
+hcd
ixU
ixU
ixU
@@ -105688,7 +105618,7 @@ cwk
joB
dUi
nCe
-mBX
+fgZ
xma
dUi
xma
@@ -106463,7 +106393,7 @@ gEJ
jEc
sJo
xKC
-omE
+ndC
jxd
mQk
dUi
@@ -106674,7 +106604,7 @@ tVF
wAy
mUP
hfB
-eIo
+jgE
smE
xCw
rAz
@@ -106714,13 +106644,13 @@ qsu
kFp
csB
pAB
-ryG
+tGU
sIx
cFc
iCM
grv
dUi
-cAy
+iEL
vqI
ger
dUi
@@ -106930,9 +106860,9 @@ mmV
tVF
jiw
sHn
-xxO
-vLa
-pKI
+jJJ
+uzn
+kbO
lBJ
puX
thf
@@ -106975,7 +106905,7 @@ gTV
aGQ
kEn
jxd
-fzW
+rjP
gur
mkE
jxd
@@ -107483,7 +107413,7 @@ vIi
dpU
eyg
gTV
-vME
+hfq
gTV
eyg
wpn
@@ -107930,11 +107860,11 @@ cLf
cLf
cLf
cLf
-flF
+cMM
neT
utU
neT
-flF
+cMM
cLf
cLf
cLf
@@ -108739,7 +108669,7 @@ sSN
nal
gOY
vxX
-cxg
+kkx
vxX
bwC
bwC
@@ -108990,13 +108920,13 @@ pQG
atb
qVB
iOH
-fQr
+tOz
gOY
tDS
cpJ
gOY
-cxg
-cxg
+kkx
+kkx
vxX
nbu
nbu
@@ -109241,7 +109171,7 @@ ilp
jTB
jTB
mHc
-wnH
+emb
gOY
nQl
jSR
@@ -109252,8 +109182,8 @@ uPL
pVG
oLj
gOY
-wHl
-cxg
+kYV
+kkx
vxX
nbu
aXt
@@ -109498,8 +109428,8 @@ ilp
jTB
jGd
eBH
-cQX
-enX
+oxg
+abP
rSB
bwj
mSG
@@ -109509,8 +109439,8 @@ gOY
wOn
gOY
gOY
-cxg
-cxg
+kkx
+kkx
vxX
nbu
aXt
@@ -109766,8 +109696,8 @@ bPc
efJ
dPh
gOY
-cxg
-cxg
+kkx
+kkx
vxX
nbu
aXt
@@ -110024,7 +109954,7 @@ rkI
rYe
gOY
gOY
-cxg
+kkx
vxX
nbu
nbu
@@ -110281,7 +110211,7 @@ fDz
fDz
gqV
gOY
-cxg
+kkx
vxX
nbu
pIV
@@ -110296,7 +110226,7 @@ rFZ
bND
mjR
bND
-vcZ
+kaD
fTX
fTX
fTX
@@ -110538,7 +110468,7 @@ fDz
dyd
vrG
gOY
-cxg
+kkx
vxX
nbu
pIV
@@ -110783,19 +110713,19 @@ ilp
jTB
cuA
cuA
-nNl
-uwV
+nCv
+iKb
vNl
nCo
tGW
tGW
-nli
+qgZ
pLk
vvE
aWM
vzP
gOY
-cxg
+kkx
vxX
nbu
pIV
@@ -111040,19 +110970,19 @@ ilp
jTB
jTB
kQB
-ioL
+lqZ
gOY
aks
tTK
tvB
-cSI
-nkM
-vxZ
-dyS
-lfq
-mDx
+nSZ
+gUJ
+hBW
+xhT
+sWX
+vId
gOY
-cxg
+kkx
vxX
nbu
nbu
@@ -111302,14 +111232,14 @@ gOY
gOY
tTK
rFA
-mIG
-xfQ
-cAG
-xXF
-sLr
-mDx
-cxg
-cxg
+aCh
+mZP
+dhz
+iuE
+hbg
+vId
+kkx
+kkx
vxX
nbu
msY
@@ -111550,23 +111480,23 @@ aku
uOo
aku
aku
-fbN
-gsW
-gsW
-mnS
-mnS
+hpC
+bFj
+bFj
+cPs
+cPs
gOY
-iJZ
+gKe
lcd
-ecM
-eKT
-nkM
-vxZ
-pZK
-lfq
-nkM
-cxg
-cxg
+ohq
+laW
+gUJ
+hBW
+uzJ
+sWX
+gUJ
+kkx
+kkx
vxX
nbu
msY
@@ -111808,22 +111738,22 @@ uOo
aku
aku
pkw
-mgi
-rkd
-aMS
-hVm
-mFa
-elG
-uXb
+lmw
+xXf
+nYi
+tVn
+aLF
+bRZ
+hJj
cmn
jgl
-efL
-cQu
-wgI
-vib
-vMR
+wrZ
+cWM
+dDi
+eFs
+vUP
bwC
-cxg
+kkx
vxX
nbu
msY
@@ -111876,7 +111806,7 @@ cvL
mCm
cpG
hRX
-iFn
+pBf
prc
prc
prc
@@ -112065,22 +111995,22 @@ uOo
aku
aku
aku
-ajs
-gop
-cqf
-xJt
+qhQ
+mGg
+blP
+hDM
gOY
joD
-ffK
+dbA
cut
rcR
-efL
-miM
-awf
-egV
-vMR
+wrZ
+kxc
+mOS
+kNP
+vUP
bwC
-cxg
+kkx
vxX
nbu
nbu
@@ -112322,20 +112252,20 @@ aku
aku
aku
aku
-vjB
-jEw
+eFd
+xwJ
cmn
-cqt
+qny
gOY
kke
-wmM
-auA
+qZf
+rKH
icz
-efL
-nbS
-nbS
-nbS
-vMR
+wrZ
+sPG
+sPG
+sPG
+vUP
bwC
cLf
vxX
@@ -112579,20 +112509,20 @@ aku
aku
aku
uro
-gsW
-hDJ
-grm
-gsW
+bFj
+eGL
+hgq
+bFj
gOY
gOY
gOY
-roK
+pTx
gOY
-nkM
-nkM
-nkM
-nkM
-nkM
+gUJ
+gUJ
+gUJ
+gUJ
+gUJ
bwC
cLf
bwC
@@ -112842,12 +112772,12 @@ xAd
wfU
rbS
kAI
-ojR
-lBm
+sbS
+jHE
uvx
mna
gXw
-gHL
+idN
jGy
moe
bwC
@@ -113353,7 +113283,7 @@ tsz
lJq
obA
vfJ
-kBr
+bjK
vfJ
moe
tLh
@@ -113397,8 +113327,8 @@ kGZ
vuh
wmr
bBr
-dUc
-dUc
+bwC
+bwC
jnY
alX
kQF
@@ -113610,7 +113540,7 @@ uYH
aQm
obA
upd
-bnb
+hFq
upd
moe
rHG
@@ -113654,8 +113584,8 @@ nLd
owL
fpg
bBr
-dUc
-dUc
+bwC
+bwC
jnY
alX
nPW
@@ -113866,8 +113796,8 @@ lJq
jBM
lJq
obA
-qnV
-iPW
+pka
+vDA
hkG
moe
mJU
@@ -113875,7 +113805,7 @@ bpW
oix
oix
hmG
-gME
+qII
xGg
moe
bwC
@@ -113911,7 +113841,7 @@ bBr
kUX
kUX
kUX
-dUc
+bwC
vxX
uFC
spr
@@ -114127,10 +114057,10 @@ vfJ
vfJ
vfJ
moe
-pwE
+sbE
dlE
xjq
-feR
+bpA
moe
fDj
fDj
@@ -114901,7 +114831,7 @@ cLf
cLf
bwC
ojz
-aHZ
+nTB
ojz
bwC
bwC
@@ -114957,8 +114887,8 @@ ncv
ncm
uFC
vxX
-cxg
-cxg
+kkx
+kkx
xzT
tgj
tgj
@@ -115470,7 +115400,7 @@ sIm
sIm
kEu
uFC
-vaU
+aFg
vxX
vxX
vxX
@@ -118510,17 +118440,17 @@ bwC
jQS
tLO
jQS
-sDq
+mOY
aJA
-umA
+tBl
beE
asn
hBF
sAf
jSV
-fjb
+hWf
aJA
-lny
+xCV
jQS
ifV
jQS
@@ -120314,7 +120244,7 @@ jQS
ufD
jQS
tMz
-krz
+grr
tMz
jQS
sOj
@@ -122358,8 +122288,8 @@ cLf
cLf
cLf
bwC
-dUc
-dUc
+bwC
+bwC
fZF
jQS
jQS
@@ -122615,8 +122545,8 @@ cLf
cLf
cLf
bwC
-dUc
-dUc
+bwC
+bwC
fZF
jQS
jQS
@@ -122625,11 +122555,11 @@ jQS
jQS
jQS
jQS
-pXV
+mtU
pXV
hNP
pXV
-pXV
+hfF
jQS
jQS
jQS
@@ -122881,13 +122811,13 @@ fZF
fZF
jQS
jQS
-kOL
-kOL
-fsV
-bfX
-kOL
-kOL
-kOL
+tmq
+tmq
+pdW
+tnC
+tmq
+tmq
+tmq
jQS
jQS
fZF
@@ -123138,13 +123068,13 @@ cLf
fZF
jQS
jQS
-eFJ
-kOL
-kOL
-tBC
-kOL
-kOL
-qEr
+khB
+tmq
+tmq
+tWo
+tmq
+tmq
+tmq
jQS
jQS
fZF
@@ -123395,13 +123325,13 @@ bwC
fZF
jQS
jQS
-gmm
-kOL
-mvh
-hFN
-mvh
-khJ
-sug
+tmq
+tmq
+iWb
+ttZ
+iWb
+rVm
+ezT
jQS
jQS
fZF
@@ -123652,13 +123582,13 @@ cLf
fZF
jQS
jQS
-kOL
-kOL
-kOL
-kOL
-kOL
-kOL
-lHp
+tmq
+tmq
+tmq
+tmq
+tmq
+tmq
+iqu
jQS
jQS
fZF
@@ -123910,11 +123840,11 @@ fZF
jQS
jQS
jQS
-uak
-oVV
-dJM
-jvV
-xna
+tmq
+iJs
+eLa
+kZT
+tmq
jQS
jQS
jQS
@@ -138823,23 +138753,280 @@ hhX
hhX
hhX
hhX
-vYz
-vYz
-jsn
-qHs
-czT
-sHz
-rRL
-jVu
-aDI
-ory
-aTE
+vYz
+vYz
+jsn
+qHs
+czT
+sHz
+rRL
+jVu
+aDI
+ory
+aTE
+aUf
+aUf
+vxX
+vxX
+vxX
+fYe
+fYe
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+"}
+(19,1,2) = {"
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
+hhX
aUf
+oJG
+kvo
+qyq
+wUH
+wUH
+hqd
+rqP
+jin
+qyq
+fUv
+pkA
aUf
vxX
vxX
vxX
-fYe
+vxX
fYe
hhX
hhX
@@ -138918,7 +139105,7 @@ hhX
hhX
hhX
"}
-(19,1,2) = {"
+(20,1,2) = {"
hhX
hhX
hhX
@@ -139080,24 +139267,24 @@ hhX
hhX
hhX
hhX
-aUf
-oJG
-kvo
+urC
+jrm
qyq
-wUH
-wUH
-hqd
-rqP
-jin
qyq
-fUv
-pkA
-aUf
-vxX
-vxX
+doO
+doO
+qyq
+sRq
+tSX
+nzC
+qyq
+wMe
+wnw
+fYe
+fYe
vxX
vxX
-fYe
+hhX
hhX
hhX
hhX
@@ -139175,7 +139362,7 @@ hhX
hhX
hhX
"}
-(20,1,2) = {"
+(21,1,2) = {"
hhX
hhX
hhX
@@ -139338,22 +139525,22 @@ hhX
hhX
hhX
urC
-jrm
-qyq
+nYj
qyq
+wUH
+qbk
doO
+xfa
+wUH
+rqP
+slG
doO
-qyq
-sRq
-tSX
-nzC
-qyq
-wMe
+wJk
wnw
fYe
fYe
-vxX
-vxX
+fYe
+fYe
hhX
hhX
hhX
@@ -139432,7 +139619,7 @@ hhX
hhX
hhX
"}
-(21,1,2) = {"
+(22,1,2) = {"
hhX
hhX
hhX
@@ -139596,21 +139783,21 @@ hhX
hhX
urC
nYj
+mua
+qyq
qyq
wUH
-qbk
-doO
-xfa
wUH
-rqP
-slG
-doO
-wJk
+sRq
+wqq
+lPC
+qyq
+wMe
wnw
fYe
fYe
fYe
-fYe
+hhX
hhX
hhX
hhX
@@ -139689,7 +139876,7 @@ hhX
hhX
hhX
"}
-(22,1,2) = {"
+(23,1,2) = {"
hhX
hhX
hhX
@@ -139852,21 +140039,21 @@ hhX
hhX
hhX
urC
-nYj
-mua
-qyq
+jrm
qyq
-wUH
-wUH
+xfa
sRq
-wqq
-lPC
qyq
-wMe
+jEd
+xfa
+qyq
+dRZ
+qyq
+wJk
wnw
fYe
-fYe
-fYe
+qHE
+hhX
hhX
hhX
hhX
@@ -139946,7 +140133,7 @@ hhX
hhX
hhX
"}
-(23,1,2) = {"
+(24,1,2) = {"
hhX
hhX
hhX
@@ -140111,18 +140298,18 @@ hhX
urC
jrm
qyq
-xfa
sRq
-qyq
-jEd
xfa
qyq
-dRZ
+xfa
+sRq
qyq
+vZb
+sRq
wJk
wnw
fYe
-qHE
+fYe
hhX
hhX
hhX
@@ -140203,7 +140390,7 @@ hhX
hhX
hhX
"}
-(24,1,2) = {"
+(25,1,2) = {"
hhX
hhX
hhX
@@ -140367,15 +140554,15 @@ hhX
hhX
urC
jrm
-qyq
-sRq
-xfa
-qyq
-xfa
-sRq
-qyq
-vZb
-sRq
+pJF
+bcg
+bcg
+bcg
+bcg
+bcg
+nSF
+vVj
+mua
wJk
wnw
fYe
@@ -140460,7 +140647,7 @@ hhX
hhX
hhX
"}
-(25,1,2) = {"
+(26,1,2) = {"
hhX
hhX
hhX
@@ -140624,16 +140811,16 @@ hhX
hhX
urC
jrm
-pJF
-bcg
-bcg
-bcg
-bcg
-bcg
-nSF
-vVj
-mua
-wJk
+qyq
+bDN
+sRq
+wqq
+qyq
+wUH
+sRq
+lSI
+gSJ
+tIO
wnw
fYe
fYe
@@ -140717,92 +140904,7 @@ hhX
hhX
hhX
"}
-(26,1,2) = {"
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
+(27,1,2) = {"
hhX
hhX
hhX
@@ -140879,21 +140981,6 @@ hhX
hhX
hhX
hhX
-urC
-jrm
-qyq
-bDN
-sRq
-wqq
-qyq
-wUH
-sRq
-lSI
-gSJ
-tIO
-wnw
-fYe
-fYe
hhX
hhX
hhX
@@ -140973,14 +141060,28 @@ hhX
hhX
hhX
hhX
-"}
-(27,1,2) = {"
hhX
hhX
hhX
hhX
hhX
hhX
+aUf
+ray
+ogP
+qyq
+qyq
+xfa
+qyq
+qyq
+qyq
+czD
+isO
+oqV
+vYz
+fYe
+fYe
+fYe
hhX
hhX
hhX
@@ -141059,6 +141160,8 @@ hhX
hhX
hhX
hhX
+"}
+(28,1,2) = {"
hhX
hhX
hhX
@@ -141136,22 +141239,6 @@ hhX
hhX
hhX
hhX
-aUf
-ray
-ogP
-qyq
-qyq
-xfa
-qyq
-qyq
-qyq
-czD
-isO
-oqV
-vYz
-fYe
-fYe
-fYe
hhX
hhX
hhX
@@ -141230,14 +141317,28 @@ hhX
hhX
hhX
hhX
-"}
-(28,1,2) = {"
hhX
hhX
hhX
hhX
hhX
hhX
+aUf
+aUf
+nEY
+egz
+egz
+nsi
+nQy
+tuF
+wUH
+eZo
+wCR
+vYz
+vYz
+vxX
+fYe
+fYe
hhX
hhX
hhX
@@ -141316,6 +141417,8 @@ hhX
hhX
hhX
hhX
+"}
+(29,1,2) = {"
hhX
hhX
hhX
@@ -141393,22 +141496,6 @@ hhX
hhX
hhX
hhX
-aUf
-aUf
-nEY
-egz
-egz
-nsi
-nQy
-tuF
-wUH
-eZo
-wCR
-vYz
-vYz
-vxX
-fYe
-fYe
hhX
hhX
hhX
@@ -141457,6 +141544,7 @@ hhX
hhX
hhX
hhX
+fNW
hhX
hhX
hhX
@@ -141487,14 +141575,27 @@ hhX
hhX
hhX
hhX
-"}
-(29,1,2) = {"
hhX
hhX
hhX
hhX
hhX
hhX
+vYz
+nck
+nck
+nck
+aUf
+aUf
+aUf
+eSs
+iXA
+vYz
+vYz
+vxX
+vxX
+vxX
+fYe
hhX
hhX
hhX
@@ -141573,6 +141674,8 @@ hhX
hhX
hhX
hhX
+"}
+(30,1,2) = {"
hhX
hhX
hhX
@@ -141614,7 +141717,6 @@ hhX
hhX
hhX
hhX
-fNW
hhX
hhX
hhX
@@ -141651,21 +141753,6 @@ hhX
hhX
hhX
hhX
-vYz
-nck
-nck
-nck
-aUf
-aUf
-aUf
-eSs
-iXA
-vYz
-vYz
-vxX
-vxX
-vxX
-fYe
hhX
hhX
hhX
@@ -141744,8 +141831,6 @@ hhX
hhX
hhX
hhX
-"}
-(30,1,2) = {"
hhX
hhX
hhX
@@ -141753,10 +141838,20 @@ hhX
hhX
hhX
hhX
+jVV
hhX
hhX
hhX
+jVV
hhX
+foL
+wku
+plV
+iVG
+eYP
+gHN
+gHN
+vxX
hhX
hhX
hhX
@@ -141836,6 +141931,8 @@ hhX
hhX
hhX
hhX
+"}
+(31,1,2) = {"
hhX
hhX
hhX
@@ -141908,20 +142005,10 @@ hhX
hhX
hhX
hhX
-jVV
hhX
hhX
hhX
-jVV
hhX
-foL
-wku
-plV
-iVG
-eYP
-gHN
-gHN
-vxX
hhX
hhX
hhX
@@ -142001,8 +142088,6 @@ hhX
hhX
hhX
hhX
-"}
-(31,1,2) = {"
hhX
hhX
hhX
@@ -142010,7 +142095,20 @@ hhX
hhX
hhX
hhX
+aUf
+rup
+rup
+rup
+vYz
hhX
+foL
+wku
+dPG
+fUx
+htV
+gxy
+dni
+jVV
hhX
hhX
hhX
@@ -142090,6 +142188,8 @@ hhX
hhX
hhX
hhX
+"}
+(32,1,2) = {"
hhX
hhX
hhX
@@ -142165,20 +142265,7 @@ hhX
hhX
hhX
hhX
-aUf
-rup
-rup
-rup
-vYz
hhX
-foL
-wku
-dPG
-fUx
-htV
-gxy
-dni
-jVV
hhX
hhX
hhX
@@ -142245,6 +142332,7 @@ hhX
hhX
hhX
hhX
+fNW
hhX
hhX
hhX
@@ -142258,13 +142346,26 @@ hhX
hhX
hhX
hhX
-"}
-(32,1,2) = {"
hhX
hhX
hhX
hhX
hhX
+aUf
+aUf
+cWi
+xjw
+guN
+vYz
+vYz
+gHN
+uTk
+hro
+eYP
+eYP
+rup
+gHN
+jVV
hhX
hhX
hhX
@@ -142344,6 +142445,8 @@ hhX
hhX
hhX
hhX
+"}
+(33,1,2) = {"
hhX
hhX
hhX
@@ -142402,7 +142505,6 @@ hhX
hhX
hhX
hhX
-fNW
hhX
hhX
hhX
@@ -142421,21 +142523,6 @@ hhX
hhX
hhX
hhX
-aUf
-aUf
-cWi
-xjw
-guN
-vYz
-vYz
-gHN
-uTk
-hro
-eYP
-eYP
-rup
-gHN
-jVV
hhX
hhX
hhX
@@ -142515,17 +142602,27 @@ hhX
hhX
hhX
hhX
-"}
-(33,1,2) = {"
hhX
hhX
hhX
hhX
hhX
hhX
+vYz
+drz
+xqE
+qRe
+nxY
+iON
+waZ
+fxg
+xZV
+vqr
+foL
hhX
hhX
hhX
+jVV
hhX
hhX
hhX
@@ -142605,6 +142702,8 @@ hhX
hhX
hhX
hhX
+"}
+(34,1,2) = {"
hhX
hhX
hhX
@@ -142678,21 +142777,9 @@ hhX
hhX
hhX
hhX
-vYz
-drz
-xqE
-qRe
-nxY
-iON
-waZ
-fxg
-xZV
-vqr
-foL
hhX
hhX
hhX
-jVV
hhX
hhX
hhX
@@ -142772,16 +142859,27 @@ hhX
hhX
hhX
hhX
-"}
-(34,1,2) = {"
hhX
hhX
hhX
hhX
hhX
+vxX
+vYz
+fJV
+wdI
+lHX
+rdU
+rmU
+qOZ
+kYs
+eZu
+dPG
+foL
hhX
hhX
hhX
+jVV
hhX
hhX
hhX
@@ -142789,177 +142887,9 @@ hhX
hhX
hhX
hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-vxX
-vYz
-fJV
-wdI
-lHX
-rdU
-rmU
-qOZ
-kYs
-eZu
-dPG
-foL
-hhX
-hhX
-hhX
-jVV
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
-hhX
+hen
+hen
+hen
hhX
hhX
hhX
@@ -143214,9 +143144,9 @@ hhX
hhX
hhX
hhX
-hhX
-hhX
-hhX
+hen
+hen
+hen
hhX
hhX
hhX
@@ -143471,9 +143401,9 @@ vxX
hhX
hhX
fZF
-hhX
-hhX
-hhX
+hen
+hen
+hen
fZF
hhX
hhX
@@ -143728,9 +143658,9 @@ fYe
fYe
qHE
fZF
-hhX
-hhX
-hhX
+hen
+hen
+hen
fZF
hhX
hhX
@@ -145714,11 +145644,11 @@ hhX
hhX
hhX
hhX
-hhX
-hhX
-hhX
-hhX
-hhX
+hen
+hen
+hen
+hen
+hen
vxX
vxX
vxX
@@ -145971,11 +145901,11 @@ hhX
hhX
hhX
hhX
-hhX
-fNW
-hhX
-hhX
-hhX
+hen
+nfm
+hen
+hen
+hen
vxX
vxX
vxX
@@ -146002,7 +145932,7 @@ wli
aJP
iaN
sdc
-dXh
+sdc
fVZ
fVZ
sdc
@@ -146228,11 +146158,11 @@ hhX
hhX
hhX
hhX
-hhX
-hhX
-hhX
-hhX
-hhX
+hen
+hen
+hen
+hen
+hen
vxX
vxX
vxX
@@ -147798,7 +147728,7 @@ bBo
iaN
fON
jds
-gTF
+pXt
sdc
sdc
rWv
@@ -147817,7 +147747,7 @@ mUi
fpx
rDE
uIx
-dCv
+vMf
fxF
fxF
wOU
@@ -148074,7 +148004,7 @@ mUi
rxK
tCm
lwu
-tMu
+bnk
fxF
fxF
wOU
@@ -148345,7 +148275,7 @@ dhj
xmy
sZH
pWr
-pNW
+jSz
ahq
kuI
sKt
@@ -149614,7 +149544,7 @@ gli
gli
wEd
wOU
-ntd
+fjO
pZj
wOU
vxX
@@ -150593,7 +150523,7 @@ jOV
kDb
ctL
qCU
-duB
+rvu
nvR
fDi
uEX
@@ -151361,8 +151291,8 @@ hHw
uRG
oyP
dAq
-xbr
-qFS
+maT
+pIB
wSc
jOV
vxX
@@ -151382,7 +151312,7 @@ mqA
uaT
tGw
ipc
-eQJ
+mVR
hED
vxX
vxX
@@ -151409,7 +151339,7 @@ sdc
rDa
ljk
jTa
-iII
+uXn
vOu
dDm
xeA
@@ -153234,7 +153164,7 @@ vxX
gvw
gjt
jEf
-kQV
+wLy
uKv
evg
gvw
@@ -153462,7 +153392,7 @@ oMn
ocJ
brc
ofc
-qUz
+qqG
hhU
xCI
gYW
@@ -154994,7 +154924,7 @@ vxX
gYW
dum
hdN
-bpN
+owV
hdN
gYW
ucb
@@ -156026,7 +155956,7 @@ mMN
jVk
jVk
fuk
-tFf
+pgX
xiM
hVN
aLN
@@ -156569,7 +156499,7 @@ sxV
sxV
hrI
leZ
-qgy
+gSN
uXD
uXD
uXD
@@ -157590,7 +157520,7 @@ oKx
oKx
dzu
oKx
-fuZ
+huT
mCn
cUv
nsY
@@ -161146,7 +161076,7 @@ jxE
ttt
ttt
ttt
-qhg
+cbT
ttt
wcH
fib
@@ -161400,7 +161330,7 @@ tot
pWn
ylD
rTc
-xxs
+kNM
xeF
flm
qeA
@@ -161715,7 +161645,7 @@ mGW
mGW
iZz
nHK
-ufW
+xxv
vwn
eRf
vRC
@@ -162937,7 +162867,7 @@ fIv
fIv
fIv
iEQ
-oxN
+xTN
fIv
fIv
fIv
@@ -165827,7 +165757,7 @@ vDa
gMk
gMk
lAj
-mFR
+gvT
kRX
hRO
ajS
@@ -169417,7 +169347,7 @@ mCN
xAy
cLf
hhX
-ifd
+unp
bkk
eng
msi
@@ -169674,7 +169604,7 @@ gVC
xAy
cLf
hhX
-ifd
+unp
bkk
qwG
msi
@@ -169879,7 +169809,7 @@ wYj
pdo
sJT
vxX
-pvT
+uif
hhX
hhX
fYe
@@ -169931,7 +169861,7 @@ sWT
bdC
fSP
tPb
-vgW
+lCD
uJV
qwG
eeB
@@ -170188,7 +170118,7 @@ pbY
xAy
cLf
hhX
-ifd
+unp
bkk
oJU
eeB
@@ -170445,7 +170375,7 @@ rCv
xAy
cLf
hhX
-ifd
+unp
bkk
qwG
eeB
@@ -170690,7 +170620,7 @@ vxX
vxX
vxX
gMk
-vkv
+hVb
vxX
dtQ
vxX
@@ -170731,9 +170661,9 @@ vxX
vxX
vxX
vxX
-hhX
-hhX
-hhX
+hen
+hen
+hen
jVV
hhX
hhX
@@ -171407,7 +171337,7 @@ uVI
pFE
kWb
kWb
-xWR
+eXX
qDl
qDl
kdR
@@ -171417,7 +171347,7 @@ kWb
mjq
qDl
qDl
-aKU
+vYD
kWb
kWb
vxX
@@ -172191,7 +172121,7 @@ vAB
kWb
kWb
kWb
-cxg
+fYe
hhX
hhX
hhX
@@ -172448,7 +172378,7 @@ kWb
kWb
kWb
kWb
-rqC
+pdL
hhX
hhX
hhX
@@ -172549,13 +172479,13 @@ qzZ
qzZ
igG
mtH
-qjk
-dLY
+mie
+dPK
uJc
mml
mml
eLU
-nsH
+jVV
oID
hhX
hhX
@@ -172704,7 +172634,7 @@ kWb
kWb
kWb
kWb
-cxg
+fYe
hhX
hhX
hhX
@@ -172716,7 +172646,7 @@ fYe
lJq
raz
lAc
-irf
+bEe
tsy
jCT
rin
@@ -172799,7 +172729,7 @@ jdd
hhX
hhX
hhX
-dLY
+dPK
hhX
hhX
hhX
@@ -173030,7 +172960,7 @@ vHa
aWD
aWD
aWD
-ewa
+giX
gCT
kgb
gaI
@@ -173312,9 +173242,9 @@ vxX
jVV
pnS
hhX
-ebN
+sEM
hhX
-pAK
+rFl
hhX
vUj
mml
@@ -173468,7 +173398,7 @@ vxX
hhX
hhX
jVV
-nQm
+jAb
jVV
hhX
hhX
@@ -174301,7 +174231,7 @@ kHU
kHU
kHU
ouG
-fst
+dTV
dBp
bPH
dUi
@@ -174575,7 +174505,7 @@ wtH
wtH
rsw
vEq
-rkZ
+qMa
wtH
wtH
aWD
@@ -176579,7 +176509,7 @@ raz
raz
nzk
fpY
-clQ
+vYH
ssg
vtN
ylR
@@ -177870,7 +177800,7 @@ gmH
rXS
tOL
fPv
-iAM
+fYA
iFN
mZn
oND
@@ -179655,8 +179585,8 @@ uif
mNZ
mNZ
fYe
-hhX
-hhX
+hen
+hen
fYe
mNZ
mNZ
@@ -179912,9 +179842,9 @@ fYe
fYe
fYe
fYe
-hhX
-hhX
-hhX
+hen
+hen
+hen
mNZ
mNZ
mNZ
@@ -180169,10 +180099,10 @@ mNZ
mNZ
mNZ
fYe
-hhX
-hhX
-hhX
-hCu
+hen
+hen
+hen
+umg
hhX
jVV
hhX
@@ -180426,9 +180356,9 @@ hhX
hhX
hhX
hhX
-hhX
-hhX
-hhX
+hen
+hen
+hen
hhX
hhX
jVV
@@ -180683,9 +180613,9 @@ hhX
hhX
hhX
hhX
-hhX
-hhX
-hhX
+hen
+hen
+hen
hhX
hhX
uOY
@@ -180721,9 +180651,9 @@ vxX
vxX
vxX
vxX
-cxg
-cxg
-cxg
+fYe
+fYe
+fYe
hhX
hhX
hhX
@@ -180952,8 +180882,8 @@ fDj
wou
qSt
jYT
-tuT
-bRD
+miX
+ldS
fDj
hhX
hhX
@@ -197243,8 +197173,8 @@ hhX
hhX
hhX
hhX
-cxg
-cxg
+kkx
+kkx
hhX
hhX
hhX
@@ -197499,10 +197429,10 @@ hhX
hhX
hhX
hhX
-cxg
-cKD
-wSj
-cxg
+kkx
+jLn
+cXf
+kkx
hhX
hhX
hhX
@@ -197755,11 +197685,11 @@ hhX
hhX
hhX
hhX
-cxg
-wSj
-pwU
-wSj
-wSj
+kkx
+cXf
+cYI
+cXf
+cXf
hhX
hhX
hhX
@@ -198012,10 +197942,10 @@ hhX
hhX
hhX
hhX
-cxg
-wSj
-wSj
-wSj
+kkx
+cXf
+cXf
+cXf
hhX
hhX
hhX
diff --git a/_maps/modular_generic/ice_l_storage.dmm b/_maps/modular_generic/ice_l_storage.dmm
index 5914568908c58..6aca9bec648fb 100644
--- a/_maps/modular_generic/ice_l_storage.dmm
+++ b/_maps/modular_generic/ice_l_storage.dmm
@@ -38,9 +38,7 @@
/turf/closed/wall/ice,
/area/template_noop)
"i" = (
-/obj/structure/railing{
- layer = 4
- },
+/obj/structure/railing,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/space_heater,
/turf/open/floor/plastic,
@@ -122,17 +120,13 @@
},
/obj/item/trash/can,
/obj/effect/decal/cleanable/dirt,
-/obj/structure/railing{
- layer = 4
- },
+/obj/structure/railing,
/turf/open/floor/plastic,
/area/template_noop)
"y" = (
/obj/structure/closet/crate/bin,
/obj/effect/decal/cleanable/dirt,
-/obj/structure/railing{
- layer = 4
- },
+/obj/structure/railing,
/turf/open/floor/plastic,
/area/template_noop)
"z" = (
@@ -164,9 +158,7 @@
/turf/open/floor/plating,
/area/template_noop)
"D" = (
-/obj/structure/railing{
- layer = 4
- },
+/obj/structure/railing,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plastic,
/area/template_noop)
@@ -203,9 +195,7 @@
/obj/structure/chair/plastic{
dir = 1
},
-/obj/structure/railing{
- layer = 4
- },
+/obj/structure/railing,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plastic,
/area/template_noop)
diff --git a/_maps/shuttles/emergency_birdshot.dmm b/_maps/shuttles/emergency_birdshot.dmm
index aef9231e620ed..9aef543f4d5e4 100644
--- a/_maps/shuttles/emergency_birdshot.dmm
+++ b/_maps/shuttles/emergency_birdshot.dmm
@@ -88,22 +88,10 @@
},
/turf/open/floor/mineral/titanium/tiled/white,
/area/shuttle/escape)
-"eY" = (
-/obj/machinery/light/small/directional/south,
-/obj/structure/table,
-/obj/item/reagent_containers/cup/glass/bottle/vodka{
- pixel_x = -6;
- pixel_y = 14
- },
-/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
- pixel_x = 3;
- pixel_y = 2
- },
-/obj/item/cigarette/dromedary{
- pixel_x = 8;
- pixel_y = 15
- },
-/turf/open/floor/mineral/titanium/white,
+"eS" = (
+/obj/structure/lattice,
+/obj/item/stack/rods/two,
+/turf/template_noop,
/area/shuttle/escape)
"fd" = (
/obj/effect/decal/cleanable/plastic,
@@ -284,10 +272,6 @@
},
/turf/open/floor/glass/reinforced,
/area/shuttle/escape)
-"mU" = (
-/obj/structure/lattice,
-/turf/template_noop,
-/area/template_noop)
"no" = (
/obj/item/trash/popcorn/caramel,
/turf/open/floor/mineral/titanium,
@@ -409,6 +393,10 @@
/obj/effect/spawner/structure/window/reinforced/shuttle,
/turf/open/floor/plating,
/area/shuttle/escape)
+"sw" = (
+/obj/structure/lattice,
+/turf/template_noop,
+/area/shuttle/escape)
"sS" = (
/obj/structure/chair/comfy/shuttle{
dir = 4
@@ -536,6 +524,23 @@
},
/turf/open/floor/mineral/titanium/yellow,
/area/shuttle/escape)
+"yx" = (
+/obj/machinery/light/small/directional/south,
+/obj/structure/table,
+/obj/item/reagent_containers/cup/glass/bottle/vodka{
+ pixel_x = -6;
+ pixel_y = 14
+ },
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
+ pixel_x = 3;
+ pixel_y = 2
+ },
+/obj/item/cigarette/dromedary{
+ pixel_x = 8;
+ pixel_y = 15
+ },
+/turf/open/floor/mineral/titanium/white,
+/area/shuttle/escape)
"zq" = (
/obj/structure/window/reinforced/spawner/directional/north,
/obj/machinery/power/shuttle_engine/heater,
@@ -548,11 +553,6 @@
/obj/item/trash/can/food/beans,
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
-"Aw" = (
-/obj/structure/lattice,
-/obj/item/stack/rods/two,
-/turf/template_noop,
-/area/template_noop)
"Ay" = (
/obj/item/shard{
pixel_y = 19
@@ -1035,7 +1035,7 @@ LX
LX
ON
Ko
-eY
+yx
LX
rZ
LX
@@ -1183,7 +1183,7 @@ WH
De
ye
LX
-mU
+sw
nQ
ax
LX
@@ -1194,7 +1194,7 @@ LX
ax
nQ
nQ
-mU
+sw
Sm
hF
LX
@@ -1214,23 +1214,23 @@ yj
MW
rZ
rZ
-mU
-mU
-mU
-mU
+sw
+sw
+sw
+sw
IN
pl
ry
-mU
-mU
-mU
-mU
-mU
+sw
+sw
+sw
+sw
+sw
mp
ig
Kh
Uh
-mU
+sw
nQ
nQ
nQ
@@ -1248,11 +1248,11 @@ nQ
nQ
nQ
nQ
-mU
+sw
IN
cr
oC
-mU
+sw
nQ
nQ
nQ
@@ -1261,7 +1261,7 @@ HS
ig
fd
AK
-mU
+sw
nQ
nQ
nQ
@@ -1276,23 +1276,23 @@ nO
MW
rZ
rZ
-mU
-mU
-mU
-mU
+sw
+sw
+sw
+sw
bx
ig
ry
-mU
-mU
-mU
-mU
-mU
+sw
+sw
+sw
+sw
+sw
Vo
jt
oN
IK
-mU
+sw
nQ
nQ
nQ
@@ -1307,7 +1307,7 @@ xg
De
eR
LX
-mU
+sw
nQ
ax
LX
@@ -1318,7 +1318,7 @@ LX
ax
nQ
nQ
-mU
+sw
Sm
hF
LX
@@ -1327,7 +1327,7 @@ LX
ax
nQ
bo
-mU
+sw
nQ
nQ
"}
@@ -1359,7 +1359,7 @@ ho
LX
LX
RW
-mU
+sw
nQ
"}
(13,1,1) = {"
@@ -1389,7 +1389,7 @@ Ly
Oq
tb
MC
-mU
+sw
LX
ST
"}
@@ -1422,7 +1422,7 @@ LX
VA
Em
Ay
-mU
+sw
"}
(15,1,1) = {"
nQ
@@ -1451,7 +1451,7 @@ tu
xC
tj
Iv
-mU
+sw
fv
ce
"}
@@ -1481,7 +1481,7 @@ eH
oL
ho
kH
-Aw
+eS
sU
LX
bo
diff --git a/_maps/shuttles/emergency_casino.dmm b/_maps/shuttles/emergency_casino.dmm
index a3280acfeb7b4..c1332f0ef1ded 100644
--- a/_maps/shuttles/emergency_casino.dmm
+++ b/_maps/shuttles/emergency_casino.dmm
@@ -753,7 +753,6 @@
/area/shuttle/escape)
"wv" = (
/obj/structure/tank_dispenser/oxygen{
- layer = 2.7;
pixel_x = -1;
pixel_y = 2
},
diff --git a/_maps/shuttles/emergency_cruise.dmm b/_maps/shuttles/emergency_cruise.dmm
index 8045930388cef..c111505c14789 100644
--- a/_maps/shuttles/emergency_cruise.dmm
+++ b/_maps/shuttles/emergency_cruise.dmm
@@ -857,7 +857,6 @@
"sz" = (
/obj/machinery/shuttle_manipulator{
desc = "A holographic display of the cruise shuttle we're on right now.";
- layer = 2.7;
max_integrity = 99999;
name = "shuttle holographic display"
},
@@ -1345,7 +1344,6 @@
density = 1;
icon = 'icons/obj/machines/shuttle_manipulator.dmi';
icon_state = "hologram_on";
- layer = 2.8;
light_color = "#2cb2e8";
light_range = 2;
max_integrity = 7500;
@@ -1358,7 +1356,6 @@
desc = "This is the shuttle we're on. It's amazing what Nanotrasen can do once they actually put more than ten seconds of effort into their projects.";
icon = 'icons/obj/machines/shuttle_manipulator.dmi';
icon_state = "hologram_whiteship";
- layer = 4;
light_color = "#2cb2e8";
light_range = 7;
max_integrity = 75000;
diff --git a/_maps/shuttles/emergency_fame.dmm b/_maps/shuttles/emergency_fame.dmm
index 368de11546d7a..919a8651b378a 100644
--- a/_maps/shuttles/emergency_fame.dmm
+++ b/_maps/shuttles/emergency_fame.dmm
@@ -605,7 +605,6 @@
/area/shuttle/escape/brig)
"zc" = (
/obj/structure/tank_dispenser/oxygen{
- layer = 2.7;
pixel_x = -1;
pixel_y = 2
},
diff --git a/_maps/shuttles/emergency_fish.dmm b/_maps/shuttles/emergency_fish.dmm
index 3726a7399d9ab..b99aa01b096bf 100644
--- a/_maps/shuttles/emergency_fish.dmm
+++ b/_maps/shuttles/emergency_fish.dmm
@@ -311,21 +311,18 @@
"qO" = (
/obj/structure/table/wood,
/obj/item/fishing_line{
- layer = 4;
pixel_x = 6;
pixel_y = 3
},
-/obj/item/fishing_hook{
- layer = 5;
- pixel_y = 3
- },
/obj/item/bait_can/worm{
- pixel_x = -5;
pixel_y = 13
},
/obj/effect/turf_decal/tile/dark/half/contrasted{
dir = 4
},
+/obj/item/fishing_hook{
+ pixel_y = 3
+ },
/turf/open/floor/wood/tile,
/area/shuttle/escape)
"rj" = (
@@ -586,12 +583,7 @@
/area/shuttle/escape)
"IM" = (
/obj/structure/table/wood,
-/obj/item/fishing_hook{
- layer = 5;
- pixel_y = 3
- },
/obj/item/fishing_line{
- layer = 4;
pixel_x = 6;
pixel_y = 3
},
@@ -602,6 +594,9 @@
/obj/effect/turf_decal/tile/dark/half/contrasted{
dir = 4
},
+/obj/item/fishing_hook{
+ pixel_y = 3
+ },
/turf/open/floor/wood/tile,
/area/shuttle/escape)
"Jh" = (
diff --git a/_maps/shuttles/emergency_luxury.dmm b/_maps/shuttles/emergency_luxury.dmm
index af17c03a0d8be..74b18ef61b4de 100644
--- a/_maps/shuttles/emergency_luxury.dmm
+++ b/_maps/shuttles/emergency_luxury.dmm
@@ -138,9 +138,7 @@
name = "Escape Shuttle Cell"
},
/obj/effect/mapping_helpers/airlock/access/all/security/general,
-/obj/machinery/scanner_gate/luxury_shuttle{
- layer = 2.6
- },
+/obj/machinery/scanner_gate/luxury_shuttle,
/turf/open/indestructible/white,
/area/shuttle/escape/brig)
"gY" = (
@@ -340,9 +338,7 @@
/obj/structure/closet/crate/large,
/obj/effect/turf_decal/delivery,
/obj/effect/decal/cleanable/dirt,
-/obj/structure/window/reinforced/spawner/directional/east{
- layer = 2.9
- },
+/obj/structure/window/reinforced/spawner/directional/east,
/obj/item/toy/plush/rouny{
name = "rouny plushie"
},
@@ -444,9 +440,7 @@
/obj/machinery/power/shuttle_engine/heater{
dir = 8
},
-/obj/structure/window/reinforced/spawner/directional/east{
- layer = 2.9
- },
+/obj/structure/window/reinforced/spawner/directional/east,
/turf/open/floor/plating,
/area/shuttle/escape)
"sH" = (
@@ -630,9 +624,7 @@
/turf/open/floor/mineral/titanium/white,
/area/shuttle/escape/luxury)
"Bj" = (
-/obj/structure/window/reinforced/spawner/directional/east{
- layer = 2.9
- },
+/obj/structure/window/reinforced/spawner/directional/east,
/obj/effect/spawner/random/structure/closet_private,
/turf/open/floor/iron/white/herringbone,
/area/shuttle/escape/luxury)
@@ -653,9 +645,7 @@
/area/shuttle/escape)
"BK" = (
/obj/structure/girder,
-/obj/structure/window/reinforced/spawner/directional/east{
- layer = 2.9
- },
+/obj/structure/window/reinforced/spawner/directional/east,
/obj/effect/turf_decal/delivery,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron,
@@ -667,9 +657,7 @@
/turf/open/floor/iron,
/area/shuttle/escape)
"Ck" = (
-/obj/machinery/scanner_gate/luxury_shuttle{
- layer = 2.6
- },
+/obj/machinery/scanner_gate/luxury_shuttle,
/obj/machinery/door/airlock/silver{
name = "First Class"
},
@@ -695,18 +683,14 @@
dir = 2;
name = "Luxurious Emergency Shuttle"
},
-/obj/machinery/scanner_gate/luxury_shuttle{
- layer = 2.6
- },
+/obj/machinery/scanner_gate/luxury_shuttle,
/obj/machinery/door/airlock/silver{
name = "First Class"
},
/turf/open/floor/carpet/blue,
/area/shuttle/escape/luxury)
"Dj" = (
-/obj/structure/window/reinforced/spawner/directional/east{
- layer = 2.9
- },
+/obj/structure/window/reinforced/spawner/directional/east,
/obj/structure/rack,
/obj/effect/spawner/random/trash/soap,
/turf/open/floor/iron/white/herringbone,
@@ -792,9 +776,7 @@
/obj/structure/girder,
/obj/effect/turf_decal/delivery,
/obj/effect/decal/cleanable/dirt,
-/obj/structure/window/reinforced/spawner/directional/east{
- layer = 2.9
- },
+/obj/structure/window/reinforced/spawner/directional/east,
/turf/open/floor/iron,
/area/shuttle/escape)
"EZ" = (
@@ -1080,9 +1062,7 @@
/turf/open/floor/carpet/green,
/area/shuttle/escape/luxury)
"Rk" = (
-/obj/machinery/scanner_gate/luxury_shuttle{
- layer = 2.6
- },
+/obj/machinery/scanner_gate/luxury_shuttle,
/obj/effect/mapping_helpers/airlock/access/all/security/general,
/obj/machinery/door/airlock/security/glass{
name = "Escape Shuttle Cell"
diff --git a/_maps/shuttles/emergency_meta.dmm b/_maps/shuttles/emergency_meta.dmm
index 5a4ca2c48326f..f1064a77fdaf0 100644
--- a/_maps/shuttles/emergency_meta.dmm
+++ b/_maps/shuttles/emergency_meta.dmm
@@ -160,7 +160,6 @@
/area/shuttle/escape)
"aA" = (
/obj/structure/tank_dispenser/oxygen{
- layer = 2.7;
pixel_x = -1;
pixel_y = 2
},
diff --git a/_maps/shuttles/emergency_meteor.dmm b/_maps/shuttles/emergency_meteor.dmm
index 658c290b95684..9d05cf8cc62c4 100644
--- a/_maps/shuttles/emergency_meteor.dmm
+++ b/_maps/shuttles/emergency_meteor.dmm
@@ -6,9 +6,7 @@
/turf/closed/mineral/asteroid/porous,
/area/shuttle/escape/meteor)
"c" = (
-/obj/structure/window/reinforced/spawner/directional/north{
- layer = 2.9
- },
+/obj/structure/window/reinforced/spawner/directional/north,
/turf/open/misc/asteroid,
/area/shuttle/escape/meteor)
"d" = (
diff --git a/_maps/shuttles/emergency_monastery.dmm b/_maps/shuttles/emergency_monastery.dmm
index dbc203630102b..4041e4e0588c5 100644
--- a/_maps/shuttles/emergency_monastery.dmm
+++ b/_maps/shuttles/emergency_monastery.dmm
@@ -40,13 +40,6 @@
/obj/structure/grille/broken,
/turf/open/space/basic,
/area/shuttle/escape)
-"aN" = (
-/obj/structure/window/reinforced/spawner/directional/south,
-/obj/structure/window/reinforced/spawner/directional/west{
- layer = 2.9
- },
-/turf/open/space/basic,
-/area/shuttle/escape)
"aO" = (
/obj/structure/sign/plaques/kiddie{
desc = "It reads: PRIVATE EXHIBIT - Please inquire with library staff for guided tours.";
@@ -65,16 +58,8 @@
/obj/effect/spawner/structure/window/reinforced,
/turf/closed/wall,
/area/shuttle/escape)
-"aT" = (
-/obj/structure/window/reinforced/spawner/directional/west{
- layer = 2.9
- },
-/turf/open/space/basic,
-/area/shuttle/escape)
"aW" = (
-/obj/structure/window/reinforced/spawner/directional/east{
- layer = 2.9
- },
+/obj/structure/window/reinforced/spawner/directional/east,
/obj/structure/lattice,
/turf/open/space/basic,
/area/shuttle/escape)
@@ -103,9 +88,7 @@
/area/shuttle/escape)
"bl" = (
/obj/structure/window/reinforced/spawner/directional/south,
-/obj/structure/window/reinforced/spawner/directional/east{
- layer = 2.9
- },
+/obj/structure/window/reinforced/spawner/directional/east,
/turf/open/space/basic,
/area/shuttle/escape)
"bn" = (
@@ -145,13 +128,6 @@
/obj/structure/window/reinforced/spawner/directional/west,
/turf/open/floor/plating,
/area/shuttle/escape)
-"bx" = (
-/obj/machinery/power/shuttle_engine/propulsion,
-/obj/structure/window/reinforced/spawner/directional/west{
- layer = 2.9
- },
-/turf/open/floor/plating,
-/area/shuttle/escape)
"by" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/sign/painting/library_private{
@@ -162,13 +138,9 @@
/area/shuttle/escape)
"bC" = (
/obj/machinery/power/shuttle_engine/heater,
-/obj/structure/window/reinforced/spawner/directional/east{
- layer = 2.9
- },
+/obj/structure/window/reinforced/spawner/directional/east,
/obj/structure/window/reinforced/spawner/directional/north,
-/obj/structure/window/reinforced/spawner/directional/west{
- layer = 2.9
- },
+/obj/structure/window/reinforced/spawner/directional/west,
/turf/open/floor/plating,
/area/shuttle/escape)
"bI" = (
@@ -428,13 +400,6 @@
/obj/structure/window/reinforced/spawner/directional/east,
/turf/open/space/basic,
/area/shuttle/escape)
-"hC" = (
-/obj/machinery/power/shuttle_engine/propulsion,
-/obj/structure/window/reinforced/spawner/directional/east{
- layer = 2.9
- },
-/turf/open/floor/plating,
-/area/shuttle/escape)
"hI" = (
/obj/machinery/atmospherics/components/binary/pump/on{
dir = 4;
@@ -467,9 +432,7 @@
/obj/structure/window/reinforced/spawner/directional/north{
pixel_y = 1
},
-/obj/structure/window/reinforced/spawner/directional/west{
- layer = 2.9
- },
+/obj/structure/window/reinforced/spawner/directional/west,
/turf/open/space/basic,
/area/shuttle/escape)
"hW" = (
@@ -495,7 +458,6 @@
"hZ" = (
/obj/structure/table/wood,
/obj/item/paper_bin{
- layer = 2.9;
pixel_x = -2;
pixel_y = 4
},
@@ -633,9 +595,7 @@
"jt" = (
/obj/machinery/power/shuttle_engine/heater,
/obj/structure/window/reinforced/spawner/directional/north,
-/obj/structure/window/reinforced/spawner/directional/west{
- layer = 2.9
- },
+/obj/structure/window/reinforced/spawner/directional/west,
/turf/open/floor/plating,
/area/shuttle/escape)
"jx" = (
@@ -910,12 +870,6 @@
/obj/effect/spawner/structure/window/reinforced/tinted,
/turf/open/floor/iron/dark,
/area/shuttle/escape)
-"nQ" = (
-/obj/structure/window/reinforced/spawner/directional/east{
- layer = 2.9
- },
-/turf/open/space/basic,
-/area/shuttle/escape)
"oa" = (
/obj/structure/chair/wood,
/turf/open/floor/carpet,
@@ -932,12 +886,6 @@
/obj/machinery/vending/wardrobe/curator_wardrobe,
/turf/open/floor/iron/dark,
/area/shuttle/escape)
-"om" = (
-/obj/structure/window/reinforced/spawner/directional/east{
- layer = 2.9
- },
-/turf/open/space,
-/area/shuttle/escape)
"ov" = (
/obj/machinery/light/small/directional/east,
/obj/machinery/camera/directional/east{
@@ -1078,7 +1026,6 @@
"qi" = (
/obj/structure/table/wood,
/obj/item/paper_bin{
- layer = 2.9;
pixel_x = -2;
pixel_y = 4
},
@@ -1632,7 +1579,6 @@
"yP" = (
/obj/structure/table/wood,
/obj/item/reagent_containers/condiment/saltshaker{
- layer = 3.1;
pixel_x = -2;
pixel_y = 2
},
@@ -1662,12 +1608,9 @@
/area/shuttle/escape)
"zh" = (
/obj/effect/decal/cleanable/cobweb/cobweb2,
-/obj/item/stack/sheet/glass/fifty{
- layer = 4
- },
+/obj/item/stack/sheet/glass/fifty,
/obj/item/stack/sheet/iron{
- amount = 20;
- layer = 3.1
+ amount = 20
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 10
@@ -2162,9 +2105,7 @@
pixel_y = 4
},
/obj/item/reagent_containers/condiment/peppermill,
-/obj/item/storage/box/ingredients/wildcard{
- layer = 3.1
- },
+/obj/item/storage/box/ingredients/wildcard,
/turf/open/floor/iron,
/area/shuttle/escape)
"FA" = (
@@ -2664,12 +2605,6 @@
},
/turf/open/floor/iron/dark,
/area/shuttle/escape)
-"Ms" = (
-/obj/structure/window/reinforced/spawner/directional/west{
- layer = 2.9
- },
-/turf/open/space,
-/area/shuttle/escape)
"Mt" = (
/obj/structure/lattice,
/turf/open/space,
@@ -2712,12 +2647,8 @@
/area/shuttle/escape)
"Nb" = (
/obj/machinery/power/shuttle_engine/propulsion,
-/obj/structure/window/reinforced/spawner/directional/east{
- layer = 2.9
- },
-/obj/structure/window/reinforced/spawner/directional/west{
- layer = 2.9
- },
+/obj/structure/window/reinforced/spawner/directional/east,
+/obj/structure/window/reinforced/spawner/directional/west,
/turf/open/floor/plating,
/area/shuttle/escape)
"Nf" = (
@@ -2886,9 +2817,7 @@
"Pb" = (
/obj/machinery/power/shuttle_engine/heater,
/obj/structure/window/reinforced/spawner/directional/north,
-/obj/structure/window/reinforced/spawner/directional/east{
- layer = 2.9
- },
+/obj/structure/window/reinforced/spawner/directional/east,
/turf/open/floor/plating,
/area/shuttle/escape)
"Pe" = (
@@ -2974,7 +2903,6 @@
"Qj" = (
/obj/structure/table/wood,
/obj/item/paper_bin{
- layer = 2.9;
pixel_x = -2;
pixel_y = 4
},
@@ -3254,9 +3182,7 @@
/turf/open/floor/iron/dark,
/area/shuttle/escape)
"SU" = (
-/obj/structure/window/reinforced/spawner/directional/east{
- layer = 2.9
- },
+/obj/structure/window/reinforced/spawner/directional/east,
/turf/open/floor/mineral/plastitanium/red,
/area/shuttle/escape/brig)
"SV" = (
@@ -3498,9 +3424,7 @@
/area/shuttle/escape)
"VF" = (
/obj/structure/window/reinforced/spawner/directional/south,
-/obj/structure/window/reinforced/spawner/directional/west{
- layer = 2.9
- },
+/obj/structure/window/reinforced/spawner/directional/west,
/obj/machinery/atmospherics/components/unary/outlet_injector/on/layer2{
name = "Outlet Injector"
},
@@ -3508,9 +3432,7 @@
/area/shuttle/escape)
"VM" = (
/obj/machinery/mass_driver/chapelgun,
-/obj/structure/window/reinforced/spawner/directional/east{
- layer = 2.9
- },
+/obj/structure/window/reinforced/spawner/directional/east,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/dark,
/area/shuttle/escape)
@@ -3632,9 +3554,7 @@
/turf/open/floor/iron/dark,
/area/shuttle/escape)
"Xx" = (
-/obj/structure/window/reinforced/spawner/directional/east{
- layer = 2.9
- },
+/obj/structure/window/reinforced/spawner/directional/east,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 1
},
@@ -3750,9 +3670,7 @@
/obj/structure/window/reinforced/spawner/directional/north{
pixel_y = 1
},
-/obj/structure/window/reinforced/spawner/directional/east{
- layer = 2.9
- },
+/obj/structure/window/reinforced/spawner/directional/east,
/turf/open/space/basic,
/area/shuttle/escape)
"YZ" = (
@@ -3797,9 +3715,7 @@
/area/shuttle/escape)
"Zn" = (
/obj/structure/window/reinforced/spawner/directional/south,
-/obj/structure/window/reinforced/spawner/directional/east{
- layer = 2.9
- },
+/obj/structure/window/reinforced/spawner/directional/east,
/turf/open/floor/mineral/plastitanium/red,
/area/shuttle/escape/brig)
"Zr" = (
@@ -4380,8 +4296,8 @@ nr
nr
nr
nr
-om
-nQ
+af
+hq
JG
JG
JG
@@ -5118,8 +5034,8 @@ nr
nr
nr
nr
-aT
-aT
+IM
+IM
JG
JG
JG
@@ -5483,9 +5399,9 @@ JG
(21,1,1) = {"
af
af
-nQ
+hq
aW
-nQ
+hq
bl
zE
jc
@@ -6056,7 +5972,7 @@ JG
"}
(28,1,1) = {"
JG
-aN
+jS
zE
wt
Mf
@@ -6216,7 +6132,7 @@ Ho
Ho
Ho
jt
-bx
+bv
"}
(30,1,1) = {"
JG
@@ -6380,17 +6296,17 @@ Ho
Ho
Ho
Pb
-hC
+Ye
"}
(32,1,1) = {"
JG
JG
-aT
-aT
-Ms
-Ms
-Ms
-aT
+IM
+IM
+Jl
+Jl
+Jl
+IM
JG
JG
JG
diff --git a/_maps/shuttles/emergency_nature.dmm b/_maps/shuttles/emergency_nature.dmm
index a1fa04c1c6a73..0f793c714753e 100644
--- a/_maps/shuttles/emergency_nature.dmm
+++ b/_maps/shuttles/emergency_nature.dmm
@@ -177,7 +177,6 @@
dir = 10
},
/obj/structure/tank_dispenser/oxygen{
- layer = 2.7;
pixel_x = -1;
pixel_y = 2
},
diff --git a/_maps/shuttles/emergency_pubby.dmm b/_maps/shuttles/emergency_pubby.dmm
index f346fe323c6e4..84780e4332b9d 100644
--- a/_maps/shuttles/emergency_pubby.dmm
+++ b/_maps/shuttles/emergency_pubby.dmm
@@ -276,9 +276,7 @@
/area/shuttle/escape)
"bd" = (
/obj/structure/window/reinforced/spawner/directional/south,
-/obj/structure/window/reinforced/spawner/directional/west{
- layer = 2.9
- },
+/obj/structure/window/reinforced/spawner/directional/west,
/obj/structure/table,
/obj/item/food/canned/beans{
pixel_x = 3;
@@ -395,15 +393,11 @@
/turf/open/floor/mineral/plastitanium/red,
/area/shuttle/escape/brig)
"bB" = (
-/obj/structure/window/reinforced/spawner/directional/east{
- layer = 2.9
- },
+/obj/structure/window/reinforced/spawner/directional/east,
/turf/open/floor/mineral/plastitanium/red,
/area/shuttle/escape/brig)
"bC" = (
-/obj/structure/window/reinforced/spawner/directional/west{
- layer = 2.9
- },
+/obj/structure/window/reinforced/spawner/directional/west,
/turf/open/floor/mineral/plastitanium/red,
/area/shuttle/escape/brig)
"bD" = (
@@ -485,9 +479,7 @@
/area/shuttle/escape)
"jO" = (
/obj/structure/closet/secure_closet/freezer/fridge,
-/obj/structure/window/reinforced/spawner/directional/west{
- layer = 2.9
- },
+/obj/structure/window/reinforced/spawner/directional/west,
/obj/item/food/butterdog,
/obj/item/food/cakeslice/apple,
/obj/item/food/cakeslice/brioche,
@@ -548,9 +540,7 @@
/turf/open/floor/mineral/plastitanium/red,
/area/shuttle/escape/brig)
"xt" = (
-/obj/structure/window/reinforced/spawner/directional/west{
- layer = 2.9
- },
+/obj/structure/window/reinforced/spawner/directional/west,
/turf/open/floor/plating,
/area/shuttle/escape)
"Br" = (
@@ -599,9 +589,7 @@
"ZM" = (
/obj/structure/table/glass,
/obj/item/storage/medkit/regular,
-/obj/structure/window/reinforced/spawner/directional/east{
- layer = 2.9
- },
+/obj/structure/window/reinforced/spawner/directional/east,
/obj/machinery/vending/wallmed/directional/north{
use_power = 0
},
diff --git a/_maps/shuttles/emergency_tranquility.dmm b/_maps/shuttles/emergency_tranquility.dmm
index 5458e59c84316..3019f72a1d2da 100644
--- a/_maps/shuttles/emergency_tranquility.dmm
+++ b/_maps/shuttles/emergency_tranquility.dmm
@@ -37,8 +37,7 @@
dir = 4
},
/obj/structure/railing{
- dir = 4;
- layer = 4.1
+ dir = 4
},
/turf/open/floor/wood,
/area/shuttle/escape)
@@ -354,8 +353,7 @@
/obj/effect/turf_decal/siding/wood,
/obj/structure/railing{
color = "#A47449";
- dir = 2;
- layer = 3.1
+ dir = 2
},
/obj/structure/table/wood,
/obj/machinery/reagentgrinder{
@@ -461,8 +459,7 @@
"jl" = (
/obj/structure/railing{
color = "#A47449";
- dir = 10;
- layer = 3.1
+ dir = 10
},
/obj/structure/flora/bush/fullgrass/style_2,
/obj/effect/turf_decal/siding/wood{
@@ -511,8 +508,7 @@
"jM" = (
/obj/structure/railing{
color = "#A47449";
- dir = 6;
- layer = 3.1
+ dir = 6
},
/obj/effect/turf_decal/siding/wood{
dir = 6
@@ -537,8 +533,7 @@
},
/obj/structure/railing{
color = "#A47449";
- dir = 10;
- layer = 3.1
+ dir = 10
},
/obj/structure/flora/bush/fullgrass,
/obj/effect/turf_decal/siding/wood{
@@ -695,8 +690,7 @@
"nA" = (
/obj/structure/railing/corner{
dir = 8;
- color = "#A47449";
- layer = 3.1
+ color = "#A47449"
},
/obj/structure/flora/rock/pile/jungle/style_3{
pixel_x = -4
@@ -739,8 +733,7 @@
"oj" = (
/obj/structure/railing{
color = "#A47449";
- dir = 10;
- layer = 3.1
+ dir = 10
},
/obj/effect/turf_decal/siding/wood{
dir = 10
@@ -767,8 +760,7 @@
},
/obj/structure/railing{
color = "#A47449";
- dir = 10;
- layer = 3.1
+ dir = 10
},
/turf/open/floor/grass,
/area/shuttle/escape)
@@ -819,8 +811,7 @@
"pf" = (
/obj/structure/railing{
color = "#A47449";
- dir = 6;
- layer = 3.1
+ dir = 6
},
/obj/effect/turf_decal/siding/wood{
dir = 6
@@ -1013,8 +1004,7 @@
},
/obj/structure/railing{
color = "#A47449";
- dir = 6;
- layer = 3.1
+ dir = 6
},
/obj/effect/turf_decal/siding/wood{
dir = 6
@@ -1058,9 +1048,7 @@
/area/shuttle/escape)
"uR" = (
/obj/effect/turf_decal/siding/wood,
-/obj/structure/railing{
- layer = 3.1
- },
+/obj/structure/railing,
/turf/open/floor/wood/large,
/area/shuttle/escape)
"uT" = (
@@ -1211,16 +1199,14 @@
dir = 4
},
/obj/structure/railing{
- dir = 4;
- layer = 4.1
+ dir = 4
},
/turf/open/floor/wood,
/area/shuttle/escape)
"ya" = (
/obj/structure/railing/corner{
dir = 8;
- color = "#A47449";
- layer = 3.1
+ color = "#A47449"
},
/obj/structure/flora/bush/large/style_2{
pixel_x = -6;
@@ -1283,8 +1269,7 @@
},
/obj/structure/railing{
color = "#A47449";
- dir = 6;
- layer = 3.1
+ dir = 6
},
/obj/effect/turf_decal/weather/dirt{
dir = 5
@@ -1315,8 +1300,7 @@
dir = 4
},
/obj/structure/railing{
- dir = 4;
- layer = 4.1
+ dir = 4
},
/obj/effect/turf_decal/siding/wood/corner{
dir = 8
@@ -1515,8 +1499,7 @@
"Ci" = (
/obj/structure/railing{
color = "#A47449";
- dir = 6;
- layer = 3.1
+ dir = 6
},
/obj/effect/turf_decal/siding/wood{
dir = 6
@@ -1563,8 +1546,7 @@
},
/obj/structure/railing{
color = "#A47449";
- dir = 2;
- layer = 3.1
+ dir = 2
},
/obj/machinery/chem_master/condimaster{
desc = "Used to separate out liquids - useful for purifying botanical extracts. Also dispenses condiments.";
@@ -1796,9 +1778,7 @@
/turf/open/floor/iron/dark/small,
/area/shuttle/escape)
"Hq" = (
-/obj/structure/railing{
- layer = 3.1
- },
+/obj/structure/railing,
/obj/effect/turf_decal/siding/dark,
/obj/effect/turf_decal/trimline/blue/line,
/turf/open/floor/iron/dark/small,
@@ -1944,9 +1924,7 @@
/turf/open/water,
/area/shuttle/escape)
"Kk" = (
-/obj/structure/railing{
- layer = 3.1
- },
+/obj/structure/railing,
/obj/effect/turf_decal/siding/dark,
/obj/effect/turf_decal/trimline/blue/line,
/obj/machinery/light/floor,
@@ -2011,8 +1989,7 @@
},
/obj/structure/railing{
color = "#A47449";
- dir = 4;
- layer = 3.2
+ dir = 4
},
/obj/structure/flora/bush/flowers_pp,
/obj/structure/flora/bush/flowers_pp/style_2,
@@ -2122,8 +2099,7 @@
/obj/structure/flora/bush/fullgrass/style_random,
/obj/structure/railing{
color = "#A47449";
- dir = 8;
- layer = 3.2
+ dir = 8
},
/turf/open/floor/grass,
/area/shuttle/escape)
@@ -2176,8 +2152,7 @@
"Oj" = (
/obj/structure/railing{
color = "#A47449";
- dir = 10;
- layer = 3.1
+ dir = 10
},
/obj/effect/turf_decal/siding/wood{
dir = 10
@@ -2357,8 +2332,7 @@
/obj/structure/table/wood,
/obj/item/flashlight/lamp/green{
pixel_x = 7;
- pixel_y = 14;
- layer = 3.1
+ pixel_y = 14
},
/obj/item/paper_bin{
pixel_x = -5;
@@ -2377,15 +2351,11 @@
/area/shuttle/escape)
"Sl" = (
/obj/effect/turf_decal/siding/wood,
-/obj/structure/railing{
- layer = 3.1
- },
+/obj/structure/railing,
/turf/open/floor/wood/tile,
/area/shuttle/escape)
"St" = (
-/obj/structure/railing{
- layer = 3.1
- },
+/obj/structure/railing,
/obj/machinery/computer/communications{
dir = 8
},
@@ -2454,7 +2424,6 @@
/area/shuttle/escape)
"Tw" = (
/obj/structure/statue/sandstone/venus{
- layer = 4;
anchored = 1
},
/turf/open/floor/wood,
@@ -2540,8 +2509,7 @@
/obj/effect/turf_decal/siding/wood,
/obj/structure/railing{
color = "#A47449";
- dir = 2;
- layer = 3.1
+ dir = 2
},
/obj/machinery/microwave,
/obj/structure/table/wood,
diff --git a/_maps/shuttles/emergency_venture.dmm b/_maps/shuttles/emergency_venture.dmm
index 6b72f22dc295a..29ad2a695d191 100644
--- a/_maps/shuttles/emergency_venture.dmm
+++ b/_maps/shuttles/emergency_venture.dmm
@@ -647,7 +647,6 @@
/area/shuttle/escape)
"Jz" = (
/obj/structure/tank_dispenser/oxygen{
- layer = 2.7;
pixel_x = -1;
pixel_y = 2
},
diff --git a/_maps/shuttles/emergency_wawa.dmm b/_maps/shuttles/emergency_wawa.dmm
index 01d03aa7c5d9c..458ffa8a17902 100644
--- a/_maps/shuttles/emergency_wawa.dmm
+++ b/_maps/shuttles/emergency_wawa.dmm
@@ -111,7 +111,7 @@
/obj/structure/lattice,
/obj/structure/marker_beacon/burgundy,
/turf/template_noop,
-/area/template_noop)
+/area/shuttle/escape)
"au" = (
/obj/structure/chair/comfy/shuttle{
dir = 1
@@ -210,8 +210,7 @@
},
/obj/structure/fans/tiny/shield{
max_integrity = 400;
- name = "recycling shield";
- layer = 2.61
+ name = "recycling shield"
},
/turf/open/floor/plating,
/area/shuttle/escape)
@@ -573,8 +572,7 @@
},
/obj/structure/fans/tiny/shield{
max_integrity = 400;
- name = "recycling shield";
- layer = 2.61
+ name = "recycling shield"
},
/turf/open/floor/plating,
/area/shuttle/escape)
@@ -728,7 +726,7 @@
"Pw" = (
/obj/structure/lattice,
/turf/template_noop,
-/area/template_noop)
+/area/shuttle/escape)
"QP" = (
/obj/machinery/conveyor/auto/inverted{
dir = 1
diff --git a/_maps/shuttles/ferry_lighthouse.dmm b/_maps/shuttles/ferry_lighthouse.dmm
index 18197d61f1401..b5bb7186693e8 100644
--- a/_maps/shuttles/ferry_lighthouse.dmm
+++ b/_maps/shuttles/ferry_lighthouse.dmm
@@ -192,8 +192,7 @@
"bb" = (
/obj/machinery/conveyor{
dir = 1;
- id = "garbage";
- layer = 2.5
+ id = "garbage"
},
/turf/open/floor/wood,
/area/shuttle/transport)
diff --git a/_maps/shuttles/hunter_mi13_foodtruck.dmm b/_maps/shuttles/hunter_mi13_foodtruck.dmm
new file mode 100644
index 0000000000000..9b42fab671f61
--- /dev/null
+++ b/_maps/shuttles/hunter_mi13_foodtruck.dmm
@@ -0,0 +1,998 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"aa" = (
+/obj/effect/spawner/structure/window/reinforced/shuttle,
+/obj/machinery/door/poddoor/shutters{
+ id = "foodtruck_backroom_shutters";
+ dir = 4
+ },
+/turf/open/floor/plating,
+/area/shuttle/hunter/mi13_foodtruck)
+"ab" = (
+/obj/machinery/computer/operating{
+ dir = 1
+ },
+/turf/open/floor/circuit/red/off,
+/area/shuttle/hunter/mi13_foodtruck)
+"af" = (
+/obj/structure/table/reinforced/plastitaniumglass,
+/obj/item/surgery_tray/full,
+/obj/structure/sign/poster/contraband/hacking_guide/directional/south,
+/turf/open/floor/circuit/red/off,
+/area/shuttle/hunter/mi13_foodtruck)
+"ag" = (
+/obj/structure/tank_dispenser/oxygen,
+/obj/structure/cable/layer1,
+/turf/open/floor/circuit/red/off,
+/area/shuttle/hunter/mi13_foodtruck)
+"ah" = (
+/obj/effect/mapping_helpers/airlock/cutaiwire,
+/obj/effect/mapping_helpers/airlock/access/any/syndicate/general,
+/obj/machinery/door/airlock/vault{
+ normalspeed = 0;
+ name = "Secure Door";
+ desc = "An imposing looking door. It looks reinforced."
+ },
+/turf/open/floor/mineral/plastitanium,
+/area/shuttle/hunter/mi13_foodtruck)
+"aj" = (
+/obj/machinery/power/shuttle_engine/heater,
+/turf/closed/wall/mineral/titanium,
+/area/shuttle/hunter/mi13_foodtruck)
+"al" = (
+/obj/structure/railing{
+ dir = 4
+ },
+/turf/open/floor/mineral/titanium,
+/area/shuttle/hunter/mi13_foodtruck)
+"ao" = (
+/obj/structure/sign/poster/contraband/bountyhunters/directional/north,
+/turf/open/floor/mineral/titanium,
+/area/shuttle/hunter/mi13_foodtruck)
+"bY" = (
+/turf/open/floor/iron/kitchen/small,
+/area/shuttle/hunter/mi13_foodtruck)
+"cm" = (
+/obj/structure/lattice,
+/obj/structure/marker_beacon/burgundy,
+/turf/template_noop,
+/area/shuttle/hunter/mi13_foodtruck)
+"dg" = (
+/obj/structure/closet/secure_closet/freezer/empty,
+/obj/machinery/light/dim/directional/east,
+/obj/item/food/fries{
+ pixel_x = -2;
+ pixel_y = -8
+ },
+/obj/item/food/fries{
+ pixel_y = -11
+ },
+/obj/item/food/fries{
+ pixel_x = 3;
+ pixel_y = -7
+ },
+/obj/item/food/fries{
+ pixel_x = -3;
+ pixel_y = -3
+ },
+/obj/item/food/fries{
+ pixel_x = -3
+ },
+/obj/item/food/fries{
+ pixel_x = 5;
+ pixel_y = -2
+ },
+/obj/item/food/burger/cheese{
+ pixel_y = 7;
+ pixel_x = -5
+ },
+/obj/item/food/burger/cheese{
+ pixel_y = 7;
+ pixel_x = 5
+ },
+/obj/item/food/fishandchips{
+ pixel_y = -8
+ },
+/turf/open/floor/iron/kitchen/small,
+/area/shuttle/hunter/mi13_foodtruck)
+"dB" = (
+/obj/machinery/vending/clothing,
+/obj/structure/sign/poster/official/high_class_martini/directional/north,
+/turf/open/floor/circuit/red/off,
+/area/shuttle/hunter/mi13_foodtruck)
+"dC" = (
+/obj/structure/table/reinforced/plastitaniumglass,
+/obj/item/binoculars{
+ pixel_y = 10
+ },
+/obj/item/traitor_bug{
+ pixel_y = 6;
+ pixel_x = 6
+ },
+/obj/item/traitor_bug{
+ pixel_y = 3;
+ pixel_x = -5
+ },
+/obj/item/storage/box/zipties{
+ pixel_y = -4;
+ pixel_x = 4
+ },
+/turf/open/floor/circuit/red/off,
+/area/shuttle/hunter/mi13_foodtruck)
+"dJ" = (
+/obj/machinery/computer/records/security/syndie,
+/turf/open/floor/circuit/red/off,
+/area/shuttle/hunter/mi13_foodtruck)
+"eA" = (
+/obj/machinery/vending/medical/syndicate_access/cybersun,
+/obj/machinery/airalarm/directional/west,
+/obj/effect/mapping_helpers/airalarm/syndicate_access,
+/turf/open/floor/circuit/red/off,
+/area/shuttle/hunter/mi13_foodtruck)
+"eP" = (
+/obj/structure/table/reinforced/plastitaniumglass,
+/obj/machinery/light/dim/directional/north,
+/obj/structure/cable/layer1,
+/obj/machinery/button/door{
+ id = "foodtruck_right_window";
+ pixel_x = 6;
+ name = "SHUTTERS - R"
+ },
+/obj/machinery/button/door{
+ id = "foodtruck_left_window";
+ pixel_x = -6;
+ name = "SHUTTERS - L"
+ },
+/obj/item/reagent_containers/cup/glass/mug/tea{
+ pixel_x = 8;
+ pixel_y = -9
+ },
+/turf/open/floor/circuit/red/off,
+/area/shuttle/hunter/mi13_foodtruck)
+"fo" = (
+/obj/effect/turf_decal/siding/dark_red{
+ dir = 4
+ },
+/turf/open/floor/mineral/plastitanium,
+/area/shuttle/hunter/mi13_foodtruck)
+"gc" = (
+/obj/structure/closet/crate/cardboard/mothic,
+/obj/item/storage/box/mothic_rations{
+ pixel_x = -6;
+ pixel_y = 7
+ },
+/obj/item/storage/box/mothic_rations{
+ pixel_x = 8;
+ pixel_y = 7
+ },
+/obj/item/storage/box/mothic_rations{
+ pixel_x = -6;
+ pixel_y = -1
+ },
+/obj/item/storage/box/mothic_rations{
+ pixel_x = 8;
+ pixel_y = -1
+ },
+/obj/item/poster/random_contraband{
+ poster_type = /obj/structure/sign/poster/contraband/mothic_rations;
+ name = "mothic ration poster";
+ desc = "A rolled up poster.";
+ pixel_y = 7
+ },
+/turf/open/floor/mineral/plastitanium,
+/area/shuttle/hunter/mi13_foodtruck)
+"gs" = (
+/obj/structure/cable/layer1,
+/obj/effect/turf_decal/siding/dark_red{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/dark_red{
+ dir = 8
+ },
+/turf/open/floor/mineral/plastitanium,
+/area/shuttle/hunter/mi13_foodtruck)
+"gv" = (
+/obj/structure/closet/crate/freezer,
+/obj/machinery/button/door/directional/west{
+ name = "External Shutter Switch";
+ id = "foodtruck_backroom_shutters"
+ },
+/obj/item/pizzabox/margherita{
+ pixel_y = 5
+ },
+/obj/item/food/burrito{
+ pixel_x = -9;
+ pixel_y = 2
+ },
+/obj/item/food/burrito{
+ pixel_x = -1;
+ pixel_y = 2
+ },
+/obj/item/food/burrito{
+ pixel_x = 8;
+ pixel_y = 2
+ },
+/turf/open/floor/mineral/plastitanium,
+/area/shuttle/hunter/mi13_foodtruck)
+"hB" = (
+/obj/machinery/power/shuttle_engine/propulsion,
+/turf/template_noop,
+/area/shuttle/hunter/mi13_foodtruck)
+"iO" = (
+/obj/structure/noticeboard/directional/north,
+/turf/open/floor/mineral/titanium,
+/area/shuttle/hunter/mi13_foodtruck)
+"jb" = (
+/obj/machinery/light/dim/directional/south,
+/obj/structure/cable/layer1,
+/obj/effect/turf_decal/siding/dark_red{
+ dir = 1
+ },
+/obj/machinery/power/terminal{
+ dir = 1;
+ cable_layer = 1
+ },
+/turf/open/floor/mineral/plastitanium,
+/area/shuttle/hunter/mi13_foodtruck)
+"jc" = (
+/obj/machinery/light/floor,
+/obj/structure/table/reinforced,
+/obj/structure/railing{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 4
+ },
+/turf/open/floor/mineral/titanium,
+/area/shuttle/hunter/mi13_foodtruck)
+"jw" = (
+/obj/structure/closet/cardboard,
+/obj/structure/cable/layer1,
+/obj/item/cardboard_cutout,
+/obj/item/cardboard_cutout,
+/obj/item/cardboard_cutout,
+/obj/item/cardboard_cutout,
+/obj/item/storage/crayons,
+/obj/item/soap/syndie{
+ pixel_y = -7
+ },
+/obj/item/mop{
+ pixel_y = 2;
+ pixel_x = 4
+ },
+/obj/effect/spawner/random/trash/bucket,
+/turf/open/floor/circuit/red/off,
+/area/shuttle/hunter/mi13_foodtruck)
+"jA" = (
+/obj/effect/turf_decal/siding/dark_red/corner,
+/obj/item/storage/toolbox/syndicate,
+/obj/effect/turf_decal/siding/dark_red{
+ dir = 1
+ },
+/turf/open/floor/mineral/plastitanium,
+/area/shuttle/hunter/mi13_foodtruck)
+"kf" = (
+/obj/effect/turf_decal/box,
+/turf/closed/wall/mineral/titanium/nodiagonal,
+/area/shuttle/hunter/mi13_foodtruck)
+"kj" = (
+/obj/structure/table/reinforced/plastitaniumglass,
+/obj/item/ammo_box/c9mm{
+ pixel_x = 5;
+ pixel_y = 8
+ },
+/obj/item/ammo_box/magazine/m9mm/ap{
+ pixel_x = -7
+ },
+/obj/item/ammo_box/magazine/m9mm/ap,
+/obj/item/ammo_box/magazine/m9mm/ap{
+ pixel_x = 7
+ },
+/obj/effect/turf_decal/siding/dark_red{
+ dir = 1
+ },
+/turf/open/floor/circuit/red/off,
+/area/shuttle/hunter/mi13_foodtruck)
+"ku" = (
+/turf/closed/wall/mineral/titanium/nodiagonal,
+/area/shuttle/hunter/mi13_foodtruck)
+"kv" = (
+/obj/machinery/door/window/brigdoor/right/directional/east{
+ req_access = list("syndicate")
+ },
+/obj/effect/turf_decal/caution/stand_clear{
+ dir = 8
+ },
+/obj/effect/turf_decal/bot,
+/obj/effect/turf_decal/siding/dark{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 4
+ },
+/turf/open/floor/mineral/titanium,
+/area/shuttle/hunter/mi13_foodtruck)
+"lp" = (
+/obj/effect/turf_decal/siding/dark_red{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/dark_red{
+ dir = 8
+ },
+/turf/open/floor/mineral/plastitanium,
+/area/shuttle/hunter/mi13_foodtruck)
+"lX" = (
+/obj/structure/table/reinforced/plastitaniumglass,
+/obj/structure/sign/poster/contraband/kss13/directional/north,
+/obj/machinery/reagentgrinder,
+/turf/open/floor/circuit/red/off,
+/area/shuttle/hunter/mi13_foodtruck)
+"mT" = (
+/obj/machinery/power/smes/magical{
+ cable_layer = 1;
+ name = "cybersun power storage unit";
+ desc = "A high-capacity superconducting magnetic energy storage (SMES) unit. Produces power via a top-secret method."
+ },
+/obj/structure/cable/layer1,
+/turf/open/floor/circuit/red,
+/area/shuttle/hunter/mi13_foodtruck)
+"nh" = (
+/obj/structure/sign/poster/ripped/directional/south,
+/turf/open/floor/mineral/titanium,
+/area/shuttle/hunter/mi13_foodtruck)
+"oA" = (
+/obj/structure/railing{
+ dir = 8
+ },
+/obj/effect/turf_decal/arrows{
+ pixel_y = 16
+ },
+/turf/open/floor/mineral/titanium,
+/area/shuttle/hunter/mi13_foodtruck)
+"pQ" = (
+/obj/structure/cable/layer1,
+/obj/machinery/computer/shuttle/hunter{
+ req_access = list("syndicate")
+ },
+/turf/open/floor/circuit/red/off,
+/area/shuttle/hunter/mi13_foodtruck)
+"pU" = (
+/obj/structure/chair/comfy/shuttle/tactical{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/dark_red/end{
+ dir = 4
+ },
+/turf/open/floor/mineral/plastitanium,
+/area/shuttle/hunter/mi13_foodtruck)
+"pZ" = (
+/obj/structure/railing/corner{
+ dir = 1
+ },
+/turf/open/floor/mineral/titanium,
+/area/shuttle/hunter/mi13_foodtruck)
+"sN" = (
+/obj/structure/table/reinforced,
+/obj/machinery/computer/security/telescreen/entertainment/directional/north,
+/obj/structure/railing{
+ dir = 4
+ },
+/obj/item/reagent_containers/condiment/vinegar{
+ pixel_y = 9
+ },
+/obj/item/reagent_containers/condiment/mayonnaise{
+ pixel_x = 5;
+ pixel_y = 6
+ },
+/obj/item/reagent_containers/condiment/ketchup{
+ pixel_x = -5;
+ pixel_y = 6
+ },
+/obj/item/reagent_containers/condiment/saltshaker{
+ pixel_x = -2;
+ pixel_y = -3
+ },
+/obj/item/reagent_containers/condiment/peppermill{
+ pixel_y = -4;
+ pixel_x = 4
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 4
+ },
+/turf/open/floor/mineral/titanium,
+/area/shuttle/hunter/mi13_foodtruck)
+"te" = (
+/obj/structure/fans/tiny,
+/obj/docking_port/stationary{
+ dir = 4;
+ dwidth = 7;
+ height = 15;
+ name = "Deep Space";
+ shuttle_id = "huntership_home";
+ width = 13
+ },
+/obj/docking_port/mobile{
+ name = "food truck";
+ rechargeTime = 1800;
+ dir = 4;
+ shuttle_id = "huntership";
+ port_direction = 8
+ },
+/obj/effect/turf_decal/stripes{
+ dir = 8
+ },
+/obj/machinery/door/poddoor/shutters{
+ id = "foodtruck_shutters";
+ dir = 8
+ },
+/turf/open/floor/plating,
+/area/shuttle/hunter/mi13_foodtruck)
+"tW" = (
+/obj/structure/table/optable,
+/turf/open/floor/circuit/red/off,
+/area/shuttle/hunter/mi13_foodtruck)
+"ua" = (
+/obj/structure/sign/poster/contraband/donk_co/directional/south,
+/turf/open/floor/mineral/titanium,
+/area/shuttle/hunter/mi13_foodtruck)
+"ui" = (
+/obj/structure/table/reinforced,
+/obj/item/food/classic_hard_shell_taco{
+ pixel_x = 2;
+ pixel_y = 10
+ },
+/obj/item/food/classic_hard_shell_taco{
+ pixel_y = 8
+ },
+/obj/item/food/classic_hard_shell_taco{
+ pixel_y = 6;
+ pixel_x = -2
+ },
+/obj/item/food/classic_hard_shell_taco{
+ pixel_y = 4;
+ pixel_x = -4
+ },
+/obj/item/food/classic_hard_shell_taco{
+ pixel_y = 2;
+ pixel_x = -6
+ },
+/obj/item/food/classic_hard_shell_taco{
+ pixel_x = -8
+ },
+/obj/structure/sign/poster/contraband/eat/directional/east,
+/turf/open/floor/iron/kitchen/small,
+/area/shuttle/hunter/mi13_foodtruck)
+"uq" = (
+/obj/effect/mob_spawn/ghost_role/human/fugitive/mi13/chef{
+ dir = 4
+ },
+/turf/open/floor/circuit/red/off,
+/area/shuttle/hunter/mi13_foodtruck)
+"we" = (
+/obj/machinery/power/apc/auto_name/directional/south{
+ cable_layer = 1
+ },
+/obj/structure/cable/layer1,
+/obj/effect/turf_decal/siding/dark_red/corner{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/dark_red/corner{
+ dir = 1
+ },
+/obj/effect/mapping_helpers/apc/syndicate_access,
+/turf/open/floor/mineral/plastitanium,
+/area/shuttle/hunter/mi13_foodtruck)
+"wA" = (
+/obj/structure/lattice/catwalk,
+/turf/template_noop,
+/area/shuttle/hunter/mi13_foodtruck)
+"xg" = (
+/obj/structure/chair/comfy/shuttle/tactical{
+ dir = 1
+ },
+/obj/structure/cable/layer1,
+/obj/effect/turf_decal/siding/dark_red/end{
+ dir = 1
+ },
+/turf/open/floor/mineral/plastitanium,
+/area/shuttle/hunter/mi13_foodtruck)
+"xG" = (
+/obj/structure/railing/corner{
+ dir = 8
+ },
+/turf/open/floor/mineral/titanium,
+/area/shuttle/hunter/mi13_foodtruck)
+"zJ" = (
+/obj/effect/turf_decal/siding/dark_red{
+ dir = 1
+ },
+/turf/open/floor/mineral/plastitanium,
+/area/shuttle/hunter/mi13_foodtruck)
+"Ak" = (
+/obj/machinery/computer/camera_advanced/shuttle_docker/syndicate/hunter{
+ x_offset = -6;
+ y_offset = -7
+ },
+/obj/structure/cable/layer1,
+/turf/open/floor/circuit/red/off,
+/area/shuttle/hunter/mi13_foodtruck)
+"Am" = (
+/obj/structure/lattice,
+/turf/template_noop,
+/area/shuttle/hunter/mi13_foodtruck)
+"An" = (
+/obj/effect/spawner/structure/window/reinforced/shuttle,
+/obj/structure/cable/layer1,
+/obj/machinery/door/poddoor{
+ id = "foodtruck_right_window"
+ },
+/turf/open/floor/plating,
+/area/shuttle/hunter/mi13_foodtruck)
+"Ay" = (
+/obj/effect/turf_decal/siding/dark_red{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/dark_red,
+/turf/open/floor/mineral/plastitanium,
+/area/shuttle/hunter/mi13_foodtruck)
+"AF" = (
+/obj/structure/fans/tiny,
+/obj/machinery/door/poddoor/shutters{
+ id = "foodtruck_shutters";
+ dir = 8
+ },
+/obj/effect/turf_decal/stripes{
+ dir = 8
+ },
+/turf/open/floor/plating,
+/area/shuttle/hunter/mi13_foodtruck)
+"AP" = (
+/obj/effect/turf_decal/arrows,
+/obj/structure/railing{
+ dir = 8
+ },
+/turf/open/floor/mineral/titanium,
+/area/shuttle/hunter/mi13_foodtruck)
+"Bn" = (
+/obj/machinery/computer/crew/syndie,
+/turf/open/floor/circuit/red,
+/area/shuttle/hunter/mi13_foodtruck)
+"CF" = (
+/obj/structure/fans/tiny,
+/obj/effect/turf_decal/stripes{
+ dir = 8
+ },
+/obj/machinery/door/poddoor/shutters{
+ id = "foodtruck_shutters";
+ dir = 8
+ },
+/turf/open/floor/plating,
+/area/shuttle/hunter/mi13_foodtruck)
+"CY" = (
+/obj/machinery/deepfryer,
+/obj/structure/noticeboard/directional/north,
+/turf/open/floor/iron/kitchen/small,
+/area/shuttle/hunter/mi13_foodtruck)
+"Dp" = (
+/obj/effect/turf_decal/arrows{
+ dir = 8;
+ pixel_x = 16
+ },
+/obj/structure/railing/corner{
+ dir = 4
+ },
+/turf/open/floor/mineral/titanium,
+/area/shuttle/hunter/mi13_foodtruck)
+"Ev" = (
+/obj/effect/spawner/structure/window/reinforced/shuttle,
+/obj/structure/cable/layer1,
+/obj/machinery/door/poddoor{
+ id = "foodtruck_left_window"
+ },
+/turf/open/floor/plating,
+/area/shuttle/hunter/mi13_foodtruck)
+"Ff" = (
+/obj/effect/turf_decal/siding/dark_red,
+/obj/effect/turf_decal/siding/dark_red{
+ dir = 1
+ },
+/turf/open/floor/mineral/plastitanium,
+/area/shuttle/hunter/mi13_foodtruck)
+"Fv" = (
+/obj/machinery/light/dim/directional/west,
+/obj/effect/turf_decal/siding/dark_red{
+ dir = 4
+ },
+/turf/open/floor/mineral/plastitanium,
+/area/shuttle/hunter/mi13_foodtruck)
+"IG" = (
+/obj/structure/marker_beacon/burgundy,
+/obj/structure/lattice,
+/turf/template_noop,
+/area/shuttle/hunter/mi13_foodtruck)
+"Jv" = (
+/obj/structure/cable/layer1,
+/obj/effect/turf_decal/siding/dark_red/corner{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/dark_red/corner{
+ dir = 1
+ },
+/obj/machinery/airalarm/directional/south,
+/obj/effect/mapping_helpers/airalarm/syndicate_access,
+/turf/open/floor/mineral/plastitanium,
+/area/shuttle/hunter/mi13_foodtruck)
+"KV" = (
+/obj/structure/table/reinforced/plastitaniumglass,
+/obj/item/reagent_containers/cup/glass/mug/tea{
+ pixel_x = 8;
+ pixel_y = 9
+ },
+/obj/item/reagent_containers/cup/beaker{
+ pixel_x = 8
+ },
+/obj/item/reagent_containers/cup/beaker{
+ pixel_x = -5;
+ pixel_y = 3
+ },
+/obj/item/reagent_containers/pill/cyanide{
+ pixel_y = -9;
+ pixel_x = -2
+ },
+/turf/open/floor/circuit/red/off,
+/area/shuttle/hunter/mi13_foodtruck)
+"Lm" = (
+/obj/machinery/vending/dinnerware,
+/obj/machinery/airalarm/directional/east,
+/obj/effect/mapping_helpers/airalarm/syndicate_access,
+/turf/open/floor/iron/kitchen/small,
+/area/shuttle/hunter/mi13_foodtruck)
+"Ml" = (
+/obj/machinery/computer/camera_advanced/syndie{
+ dir = 1
+ },
+/turf/open/floor/circuit/red,
+/area/shuttle/hunter/mi13_foodtruck)
+"MZ" = (
+/obj/effect/mob_spawn/ghost_role/human/fugitive/mi13{
+ dir = 4
+ },
+/turf/open/floor/circuit/red/off,
+/area/shuttle/hunter/mi13_foodtruck)
+"NJ" = (
+/obj/effect/turf_decal/siding/dark_red,
+/obj/effect/turf_decal/siding/dark_red/corner{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/dark_red/corner{
+ dir = 1
+ },
+/turf/open/floor/mineral/plastitanium,
+/area/shuttle/hunter/mi13_foodtruck)
+"OU" = (
+/obj/machinery/fugitive_locator,
+/turf/open/floor/circuit/red,
+/area/shuttle/hunter/mi13_foodtruck)
+"Pq" = (
+/turf/template_noop,
+/area/template_noop)
+"PE" = (
+/obj/machinery/fugitive_capture,
+/turf/open/floor/circuit/red,
+/area/shuttle/hunter/mi13_foodtruck)
+"QV" = (
+/obj/effect/turf_decal/siding/dark_red/corner{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/dark_red,
+/turf/open/floor/mineral/plastitanium,
+/area/shuttle/hunter/mi13_foodtruck)
+"RO" = (
+/obj/machinery/button/door/directional/east{
+ id = "foodtruck_shutters";
+ name = "External Shutter Switch"
+ },
+/obj/structure/table/reinforced,
+/obj/item/storage/cans/sixsoda,
+/turf/open/floor/iron/kitchen/small,
+/area/shuttle/hunter/mi13_foodtruck)
+"Sw" = (
+/obj/machinery/door/airlock/vault{
+ normalspeed = 0;
+ name = "Secure Door";
+ desc = "An imposing looking door. It looks reinforced."
+ },
+/obj/effect/mapping_helpers/airlock/cutaiwire,
+/obj/effect/mapping_helpers/airlock/access/any/syndicate/general,
+/turf/open/floor/mineral/plastitanium,
+/area/shuttle/hunter/mi13_foodtruck)
+"SP" = (
+/obj/structure/table/reinforced/plastitaniumglass,
+/obj/item/pinpointer/shuttle,
+/turf/open/floor/circuit/red/off,
+/area/shuttle/hunter/mi13_foodtruck)
+"UF" = (
+/obj/machinery/door/airlock/external{
+ name = "Fire Escape";
+ desc = "If you really need to escape in a hurry, try this door.";
+ id_tag = "foodtruck_firescape"
+ },
+/obj/structure/fans/tiny,
+/obj/effect/mapping_helpers/airlock/access/any/syndicate/general,
+/obj/effect/mapping_helpers/airlock/locked,
+/obj/effect/mapping_helpers/airlock/cutaiwire,
+/turf/open/floor/mineral/plastitanium,
+/area/shuttle/hunter/mi13_foodtruck)
+"Xc" = (
+/obj/effect/turf_decal/arrows{
+ dir = 4
+ },
+/obj/structure/railing/corner,
+/turf/open/floor/mineral/titanium,
+/area/shuttle/hunter/mi13_foodtruck)
+"XE" = (
+/obj/machinery/suit_storage_unit/syndicate{
+ mod_type = null;
+ suit_type = /obj/item/clothing/suit/space/syndicate/black;
+ helmet_type = /obj/item/clothing/head/helmet/space/syndicate/black
+ },
+/obj/machinery/button/door/directional/east{
+ id = "foodtruck_firescape";
+ normaldoorcontrol = 1;
+ specialfunctions = 4;
+ pixel_y = -10;
+ name = "Fire Escape Bolt Switch"
+ },
+/turf/open/floor/circuit/red/off,
+/area/shuttle/hunter/mi13_foodtruck)
+"Yi" = (
+/obj/structure/table/reinforced/plastitaniumglass,
+/obj/item/reagent_containers/syringe{
+ pixel_y = -3;
+ pixel_x = -5
+ },
+/obj/item/reagent_containers/dropper{
+ pixel_y = 6;
+ pixel_x = -3
+ },
+/obj/item/reagent_containers/cup/beaker/large{
+ pixel_y = 6;
+ pixel_x = 8
+ },
+/obj/item/reagent_containers/pill/cyanide{
+ pixel_y = -6;
+ pixel_x = 10
+ },
+/turf/open/floor/circuit/red/off,
+/area/shuttle/hunter/mi13_foodtruck)
+"YW" = (
+/obj/structure/table/reinforced,
+/obj/structure/railing{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 4
+ },
+/turf/open/floor/mineral/titanium,
+/area/shuttle/hunter/mi13_foodtruck)
+
+(1,1,1) = {"
+Pq
+Pq
+Pq
+Pq
+Pq
+ku
+AF
+CF
+te
+CF
+CF
+CF
+ku
+Pq
+Pq
+"}
+(2,1,1) = {"
+Pq
+Pq
+Pq
+cm
+Am
+ku
+ao
+Xc
+al
+al
+Dp
+ua
+ku
+IG
+Pq
+"}
+(3,1,1) = {"
+Pq
+Pq
+Pq
+Pq
+wA
+ku
+iO
+xG
+oA
+AP
+pZ
+nh
+ku
+aj
+hB
+"}
+(4,1,1) = {"
+cm
+Ev
+Ev
+ku
+ku
+ku
+sN
+jc
+YW
+YW
+jc
+kv
+ku
+aj
+hB
+"}
+(5,1,1) = {"
+Ev
+Ev
+jw
+MZ
+zJ
+Sw
+bY
+bY
+bY
+bY
+bY
+bY
+ku
+cm
+Pq
+"}
+(6,1,1) = {"
+Ev
+Ak
+xg
+gs
+Jv
+ku
+CY
+ui
+dg
+Lm
+bY
+RO
+ku
+Pq
+Pq
+"}
+(7,1,1) = {"
+ku
+eP
+SP
+mT
+jb
+ku
+ku
+ku
+ku
+ku
+ah
+kf
+ku
+Pq
+Pq
+"}
+(8,1,1) = {"
+An
+pQ
+xg
+gs
+we
+ku
+eA
+jA
+Fv
+fo
+QV
+gv
+ku
+Pq
+Pq
+"}
+(9,1,1) = {"
+An
+An
+ag
+XE
+zJ
+ah
+lp
+NJ
+PE
+OU
+Ay
+gc
+ku
+cm
+Pq
+"}
+(10,1,1) = {"
+cm
+An
+An
+ku
+UF
+ku
+dB
+Ff
+MZ
+uq
+Ay
+tW
+ku
+aj
+hB
+"}
+(11,1,1) = {"
+Pq
+Pq
+Pq
+Pq
+wA
+ku
+dJ
+pU
+Ml
+Bn
+pU
+ab
+ku
+aj
+hB
+"}
+(12,1,1) = {"
+Pq
+Pq
+Pq
+cm
+Am
+ku
+lX
+KV
+Yi
+dC
+kj
+af
+ku
+IG
+Pq
+"}
+(13,1,1) = {"
+Pq
+Pq
+Pq
+Pq
+Pq
+ku
+aa
+aa
+aa
+aa
+aa
+aa
+ku
+Pq
+Pq
+"}
diff --git a/_maps/shuttles/labour_box.dmm b/_maps/shuttles/labour_box.dmm
index f1eeb8e5b04d9..4adb12a5321b2 100644
--- a/_maps/shuttles/labour_box.dmm
+++ b/_maps/shuttles/labour_box.dmm
@@ -104,9 +104,7 @@
/area/shuttle/labor)
"r" = (
/obj/machinery/power/shuttle_engine/heater,
-/obj/structure/window/reinforced/spawner/directional/north{
- layer = 2.9
- },
+/obj/structure/window/reinforced/spawner/directional/north,
/turf/open/floor/plating/airless,
/area/shuttle/labor)
"s" = (
diff --git a/_maps/shuttles/labour_delta.dmm b/_maps/shuttles/labour_delta.dmm
index 62b590b8c82fc..aa4e90090d985 100644
--- a/_maps/shuttles/labour_delta.dmm
+++ b/_maps/shuttles/labour_delta.dmm
@@ -242,9 +242,7 @@
/area/shuttle/labor)
"x" = (
/obj/machinery/power/shuttle_engine/heater,
-/obj/structure/window/reinforced/spawner/directional/north{
- layer = 2.9
- },
+/obj/structure/window/reinforced/spawner/directional/north,
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plating/airless,
/area/shuttle/labor)
diff --git a/_maps/shuttles/labour_generic.dmm b/_maps/shuttles/labour_generic.dmm
index 82b20d6f5ed28..fe7c0b4b12ebc 100644
--- a/_maps/shuttles/labour_generic.dmm
+++ b/_maps/shuttles/labour_generic.dmm
@@ -99,9 +99,7 @@
/area/shuttle/labor)
"r" = (
/obj/machinery/power/shuttle_engine/heater,
-/obj/structure/window/reinforced/spawner/directional/north{
- layer = 2.9
- },
+/obj/structure/window/reinforced/spawner/directional/north,
/turf/open/floor/plating/airless,
/area/shuttle/labor)
"s" = (
diff --git a/_maps/shuttles/mining_box.dmm b/_maps/shuttles/mining_box.dmm
index c9771c932e5a2..98607ead77fc3 100644
--- a/_maps/shuttles/mining_box.dmm
+++ b/_maps/shuttles/mining_box.dmm
@@ -45,9 +45,7 @@
/area/shuttle/mining)
"j" = (
/obj/machinery/power/shuttle_engine/heater,
-/obj/structure/window/reinforced/spawner/directional/north{
- layer = 2.9
- },
+/obj/structure/window/reinforced/spawner/directional/north,
/obj/structure/window/reinforced/spawner/directional/west,
/obj/structure/window/reinforced/spawner/directional/east,
/turf/open/floor/plating,
diff --git a/_maps/shuttles/mining_common_meta.dmm b/_maps/shuttles/mining_common_meta.dmm
index 0acf76371b881..f8aee42a870a7 100644
--- a/_maps/shuttles/mining_common_meta.dmm
+++ b/_maps/shuttles/mining_common_meta.dmm
@@ -45,9 +45,7 @@
/area/shuttle/mining)
"j" = (
/obj/machinery/power/shuttle_engine/heater,
-/obj/structure/window/reinforced/spawner/directional/north{
- layer = 2.9
- },
+/obj/structure/window/reinforced/spawner/directional/north,
/obj/structure/window/reinforced/spawner/directional/west,
/obj/structure/window/reinforced/spawner/directional/east,
/turf/open/floor/plating,
diff --git a/_maps/shuttles/mining_delta.dmm b/_maps/shuttles/mining_delta.dmm
index 8b731c6f024d2..7ee1e5662e812 100644
--- a/_maps/shuttles/mining_delta.dmm
+++ b/_maps/shuttles/mining_delta.dmm
@@ -224,9 +224,7 @@
/area/shuttle/mining)
"t" = (
/obj/machinery/power/shuttle_engine/propulsion/burst,
-/obj/structure/window/reinforced/spawner/directional/north{
- layer = 2.9
- },
+/obj/structure/window/reinforced/spawner/directional/north,
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plating/airless,
/area/shuttle/mining)
diff --git a/_maps/shuttles/mining_freight.dmm b/_maps/shuttles/mining_freight.dmm
index 70605f222e7fd..ead08ff80ac31 100644
--- a/_maps/shuttles/mining_freight.dmm
+++ b/_maps/shuttles/mining_freight.dmm
@@ -106,7 +106,7 @@
/obj/effect/spawner/structure/window/reinforced/shuttle,
/obj/machinery/power/shuttle_engine/heater,
/turf/open/floor/plating,
-/area/template_noop)
+/area/shuttle/mining)
"q" = (
/obj/structure/ore_box,
/obj/effect/turf_decal/delivery,
diff --git a/_maps/shuttles/mining_large.dmm b/_maps/shuttles/mining_large.dmm
index 56cf2ef7d3333..f1c0d3a4cf2e6 100644
--- a/_maps/shuttles/mining_large.dmm
+++ b/_maps/shuttles/mining_large.dmm
@@ -322,9 +322,7 @@
/area/shuttle/mining/large)
"G" = (
/obj/machinery/power/shuttle_engine/heater,
-/obj/structure/window/reinforced/spawner/directional/north{
- layer = 2.9
- },
+/obj/structure/window/reinforced/spawner/directional/north,
/turf/open/floor/plating/airless,
/area/shuttle/mining/large)
"H" = (
diff --git a/_maps/shuttles/pirate_default.dmm b/_maps/shuttles/pirate_default.dmm
index b60aae281e0f8..f17528fe4d4e3 100644
--- a/_maps/shuttles/pirate_default.dmm
+++ b/_maps/shuttles/pirate_default.dmm
@@ -463,23 +463,6 @@
/obj/structure/sign/warning/vacuum/external/directional/east,
/turf/open/floor/plating,
/area/shuttle/pirate)
-"br" = (
-/obj/structure/table/wood,
-/obj/item/storage/box/matches,
-/obj/item/reagent_containers/cup/glass/bottle/rum{
- name = "Captain Pete's Private Reserve Cuban Spaced Rum";
- pixel_x = -6;
- pixel_y = 8
- },
-/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
- pixel_x = 6;
- pixel_y = 12
- },
-/obj/item/cigarette/cigar,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/stripes/line,
-/turf/open/floor/wood,
-/area/shuttle/pirate)
"bt" = (
/obj/effect/turf_decal/stripes/line{
dir = 10
@@ -795,6 +778,21 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
/area/shuttle/pirate)
+"lk" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 9
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/rack{
+ dir = 8
+ },
+/obj/item/storage/box/lethalshot,
+/obj/item/gun/ballistic/shotgun/automatic/combat{
+ pixel_x = -2;
+ pixel_y = 2
+ },
+/turf/open/floor/pod/light,
+/area/shuttle/pirate)
"mD" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on,
/obj/structure/closet/secure_closet/personal,
@@ -831,22 +829,6 @@
},
/turf/open/floor/iron/dark,
/area/shuttle/pirate)
-"vB" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 9
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/rack{
- dir = 8;
- layer = 2.9
- },
-/obj/item/storage/box/lethalshot,
-/obj/item/gun/ballistic/shotgun/automatic/combat{
- pixel_x = -2;
- pixel_y = 2
- },
-/turf/open/floor/pod/light,
-/area/shuttle/pirate)
"wf" = (
/obj/machinery/door/airlock{
name = "Unisex Restrooms"
@@ -903,6 +885,23 @@
},
/turf/open/floor/plating,
/area/shuttle/pirate)
+"Ic" = (
+/obj/structure/table/wood,
+/obj/item/storage/box/matches,
+/obj/item/reagent_containers/cup/glass/bottle/rum{
+ name = "Captain Pete's Private Reserve Cuban Spaced Rum";
+ pixel_x = -6;
+ pixel_y = 8
+ },
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
+ pixel_x = 6;
+ pixel_y = 12
+ },
+/obj/item/cigarette/cigar,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/stripes/line,
+/turf/open/floor/wood,
+/area/shuttle/pirate)
"JT" = (
/obj/effect/turf_decal/stripes/line{
dir = 5
@@ -1056,7 +1055,7 @@ Oe
OL
zw
dy
-br
+Ic
ep
er
af
@@ -1179,7 +1178,7 @@ sP
aj
ek
bA
-vB
+lk
aj
np
aO
diff --git a/_maps/shuttles/pirate_dutchman.dmm b/_maps/shuttles/pirate_dutchman.dmm
index b599698bc6f5c..30ac4b4317d78 100644
--- a/_maps/shuttles/pirate_dutchman.dmm
+++ b/_maps/shuttles/pirate_dutchman.dmm
@@ -387,6 +387,15 @@
},
/turf/open/floor/wood/airless,
/area/shuttle/pirate/flying_dutchman)
+"rR" = (
+/obj/machinery/computer/camera_advanced/shuttle_docker/syndicate/pirate{
+ dir = 1;
+ x_offset = 7;
+ y_offset = -3;
+ view_range = 10
+ },
+/turf/open/floor/carpet/royalblack/airless,
+/area/shuttle/pirate/flying_dutchman)
"sa" = (
/obj/effect/turf_decal/siding/wood/corner{
dir = 4
@@ -484,14 +493,6 @@
},
/turf/open/floor/wood/airless,
/area/shuttle/pirate/flying_dutchman)
-"xA" = (
-/obj/machinery/computer/camera_advanced/shuttle_docker/syndicate/pirate{
- dir = 1;
- x_offset = -4;
- y_offset = -8
- },
-/turf/open/floor/carpet/royalblack/airless,
-/area/shuttle/pirate/flying_dutchman)
"xY" = (
/obj/structure/railing/corner{
color = "#4C3117";
@@ -610,27 +611,6 @@
/obj/machinery/light/floor,
/turf/open/floor/wood/airless,
/area/shuttle/pirate/flying_dutchman)
-"Dr" = (
-/obj/structure/table,
-/obj/item/reagent_containers/cup/glass/bottle/rum{
- desc = "Rum with ghostly properties that can help the drinker enter the spirit realm. It has fermented under the sea of space for ages.";
- name = "Ghost Pirate Rum";
- pixel_x = -4;
- pixel_y = 12
- },
-/obj/item/cigarette/cigar{
- pixel_x = 4
- },
-/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
- pixel_x = -7;
- pixel_y = 5
- },
-/obj/item/lighter{
- pixel_x = 8;
- pixel_y = 11
- },
-/turf/open/floor/carpet/royalblack/airless,
-/area/shuttle/pirate/flying_dutchman)
"Ew" = (
/obj/effect/turf_decal/siding/wood{
dir = 5
@@ -808,6 +788,27 @@
},
/turf/open/floor/wood/airless,
/area/shuttle/pirate/flying_dutchman)
+"Qe" = (
+/obj/structure/table,
+/obj/item/reagent_containers/cup/glass/bottle/rum{
+ desc = "Rum with ghostly properties that can help the drinker enter the spirit realm. It has fermented under the sea of space for ages.";
+ name = "Ghost Pirate Rum";
+ pixel_x = -4;
+ pixel_y = 12
+ },
+/obj/item/cigarette/cigar{
+ pixel_x = 4
+ },
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
+ pixel_x = -7;
+ pixel_y = 5
+ },
+/obj/item/lighter{
+ pixel_x = 8;
+ pixel_y = 11
+ },
+/turf/open/floor/carpet/royalblack/airless,
+/area/shuttle/pirate/flying_dutchman)
"QM" = (
/obj/structure/festivus{
anchored = 1;
@@ -1274,7 +1275,7 @@ gS
WR
tH
kz
-Dr
+Qe
WR
"}
(13,1,1) = {"
@@ -1301,7 +1302,7 @@ WR
WR
Ms
WQ
-xA
+rR
WR
"}
(14,1,1) = {"
diff --git a/_maps/shuttles/pirate_ex_interdyne.dmm b/_maps/shuttles/pirate_ex_interdyne.dmm
index e5e576e3d65f9..dce984f19c993 100644
--- a/_maps/shuttles/pirate_ex_interdyne.dmm
+++ b/_maps/shuttles/pirate_ex_interdyne.dmm
@@ -169,7 +169,7 @@
"aF" = (
/obj/machinery/computer/camera_advanced/shuttle_docker/syndicate/pirate{
dir = 4;
- x_offset = -3;
+ x_offset = 0;
y_offset = 7
},
/turf/open/floor/iron/dark,
diff --git a/_maps/shuttles/pirate_geode.dmm b/_maps/shuttles/pirate_geode.dmm
index afb582e432203..2f6a573aae050 100644
--- a/_maps/shuttles/pirate_geode.dmm
+++ b/_maps/shuttles/pirate_geode.dmm
@@ -430,8 +430,7 @@
"vY" = (
/obj/machinery/computer/camera_advanced/shuttle_docker/syndicate/pirate{
dir = 8;
- x_offset = 10;
- y_offset = 5
+ x_offset = -8
},
/obj/effect/turf_decal/weather/dirt{
dir = 3
@@ -487,7 +486,7 @@
/obj/effect/turf_decal/stripes/white/line{
dir = 8
},
-/turf/open/floor/plating,
+/turf/open/floor/plating/airless,
/area/shuttle/pirate)
"yz" = (
/obj/structure/flora/lunar_plant/style_3,
@@ -838,7 +837,7 @@
/obj/machinery/power/shuttle_engine/propulsion{
dir = 8
},
-/turf/open/floor/plating,
+/turf/open/floor/plating/airless,
/area/shuttle/pirate)
"Pr" = (
/obj/structure/table/wood,
diff --git a/_maps/shuttles/pirate_grey.dmm b/_maps/shuttles/pirate_grey.dmm
index 23bc06b5dc922..22356be732c36 100644
--- a/_maps/shuttles/pirate_grey.dmm
+++ b/_maps/shuttles/pirate_grey.dmm
@@ -353,8 +353,9 @@
/obj/machinery/light/small/directional/west,
/obj/machinery/computer/camera_advanced/shuttle_docker/syndicate/pirate{
dir = 4;
- x_offset = -3;
- y_offset = 7
+ x_offset = -5;
+ y_offset = 12;
+ view_range = 10
},
/obj/effect/decal/cleanable/dirt,
/obj/machinery/firealarm/directional/south,
@@ -854,7 +855,7 @@
},
/obj/effect/mapping_helpers/airlock/cutaiwire,
/obj/docking_port/mobile/pirate{
- dir = 4
+ dir = 8
},
/obj/structure/fans/tiny,
/turf/open/floor/pod/light,
@@ -1231,7 +1232,7 @@
/area/shuttle/pirate)
"Pn" = (
/turf/closed/wall,
-/area/template_noop)
+/area/shuttle/pirate)
"PM" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/spawner/random/trash/grille_or_waste,
diff --git a/_maps/shuttles/pirate_irs.dmm b/_maps/shuttles/pirate_irs.dmm
index e01639a9a9fe6..4fd5a8c357342 100644
--- a/_maps/shuttles/pirate_irs.dmm
+++ b/_maps/shuttles/pirate_irs.dmm
@@ -1027,9 +1027,7 @@
/obj/structure/railing{
dir = 10
},
-/obj/machinery/shower/directional/south{
- layer = 4
- },
+/obj/machinery/shower/directional/south,
/obj/effect/turf_decal/box,
/obj/structure/fluff/shower_drain,
/turf/open/floor/iron/dark,
@@ -1420,7 +1418,11 @@
},
/area/shuttle/pirate)
"LV" = (
-/obj/machinery/computer/camera_advanced/shuttle_docker/syndicate/pirate,
+/obj/machinery/computer/camera_advanced/shuttle_docker/syndicate/pirate{
+ y_offset = 11;
+ x_offset = -4;
+ view_range = 10
+ },
/obj/effect/turf_decal/trimline/dark_blue/filled/line{
dir = 5
},
diff --git a/_maps/shuttles/pirate_silverscale.dmm b/_maps/shuttles/pirate_silverscale.dmm
index f32e70b1e451d..519a17b4659d9 100644
--- a/_maps/shuttles/pirate_silverscale.dmm
+++ b/_maps/shuttles/pirate_silverscale.dmm
@@ -79,10 +79,6 @@
/obj/effect/turf_decal/trimline/yellow/warning,
/turf/open/floor/plating/airless,
/area/shuttle/pirate)
-"eK" = (
-/obj/machinery/power/shuttle_engine/propulsion,
-/turf/open/floor/plating/airless,
-/area/shuttle/pirate)
"eU" = (
/obj/structure/chair/comfy/shuttle,
/turf/open/floor/carpet/royalblack,
@@ -337,7 +333,7 @@
dir = 6
},
/turf/open/floor/plating/airless,
-/area/template_noop)
+/area/shuttle/pirate)
"xj" = (
/obj/structure/table/glass,
/obj/item/storage/medkit/brute,
@@ -355,8 +351,7 @@
/area/shuttle/pirate)
"xR" = (
/obj/structure/rack{
- dir = 8;
- layer = 2.9
+ dir = 8
},
/obj/item/melee/energy/sword/saber/purple{
pixel_y = 12
@@ -462,7 +457,7 @@
width = 26
},
/obj/docking_port/mobile/pirate{
- dir = 4;
+ dir = 8;
launch_status = 0;
movement_force = list("KNOCKDOWN"=0,"THROW"=0);
name = "Silverscale Cruiser";
@@ -652,8 +647,9 @@
"Mo" = (
/obj/machinery/computer/camera_advanced/shuttle_docker/syndicate/pirate{
dir = 8;
- x_offset = 10;
- y_offset = 5
+ x_offset = 12;
+ y_offset = 5;
+ view_range = 10
},
/turf/open/floor/iron/dark/side{
dir = 8
@@ -695,12 +691,10 @@
pixel_y = 10
},
/obj/item/reagent_containers/cup/glass/bottle/hcider{
- layer = 3.1;
pixel_x = -6;
pixel_y = 8
},
/obj/item/reagent_containers/cup/glass/bottle/rum{
- layer = 3.2;
pixel_x = -15;
pixel_y = 4
},
@@ -713,7 +707,6 @@
pixel_y = 15
},
/obj/item/reagent_containers/cup/glass/bottle/wine{
- layer = 3.1;
pixel_x = 3;
pixel_y = 5
},
@@ -784,8 +777,7 @@
/area/shuttle/pirate)
"RO" = (
/obj/structure/rack{
- dir = 8;
- layer = 2.9
+ dir = 8
},
/obj/item/ammo_box/strilka310,
/obj/item/ammo_box/strilka310{
@@ -942,8 +934,7 @@
/area/shuttle/pirate)
"Yj" = (
/obj/structure/rack{
- dir = 8;
- layer = 2.9
+ dir = 8
},
/obj/item/storage/box/lethalshot,
/obj/item/storage/box/lethalshot,
@@ -1022,7 +1013,7 @@ rB
Ww
Ww
Ww
-eK
+Ww
Ww
Ww
Ww
diff --git a/_maps/shuttles/ruin_cyborg_mothership.dmm b/_maps/shuttles/ruin_cyborg_mothership.dmm
index 8ee4eb11a6a32..4e0fff656e83d 100644
--- a/_maps/shuttles/ruin_cyborg_mothership.dmm
+++ b/_maps/shuttles/ruin_cyborg_mothership.dmm
@@ -43,9 +43,7 @@
/area/shuttle/ruin/cyborg_mothership)
"dI" = (
/obj/machinery/power/shuttle_engine/heater,
-/obj/structure/window/reinforced/spawner/directional/north{
- layer = 2.9
- },
+/obj/structure/window/reinforced/spawner/directional/north,
/turf/template_noop,
/area/shuttle/ruin/cyborg_mothership)
"dO" = (
@@ -232,9 +230,7 @@
/turf/open/floor/plating/airless,
/area/shuttle/ruin/cyborg_mothership)
"nM" = (
-/obj/structure/window/reinforced/spawner/directional/north{
- layer = 2.9
- },
+/obj/structure/window/reinforced/spawner/directional/north,
/obj/structure/closet/crate/preopen,
/obj/effect/turf_decal/stripes/asteroid/line{
dir = 8
@@ -733,9 +729,7 @@
/area/shuttle/ruin/cyborg_mothership)
"OY" = (
/obj/machinery/power/shuttle_engine/heater,
-/obj/structure/window/reinforced/spawner/directional/north{
- layer = 2.9
- },
+/obj/structure/window/reinforced/spawner/directional/north,
/obj/structure/window/reinforced/spawner/directional/west,
/turf/template_noop,
/area/shuttle/ruin/cyborg_mothership)
@@ -796,9 +790,7 @@
/area/shuttle/ruin/cyborg_mothership)
"SV" = (
/obj/machinery/power/shuttle_engine/heater,
-/obj/structure/window/reinforced/spawner/directional/north{
- layer = 2.9
- },
+/obj/structure/window/reinforced/spawner/directional/north,
/obj/structure/window/reinforced/spawner/directional/east,
/turf/template_noop,
/area/shuttle/ruin/cyborg_mothership)
@@ -809,9 +801,7 @@
/area/shuttle/ruin/cyborg_mothership)
"TH" = (
/obj/effect/decal/cleanable/dirt,
-/obj/structure/window/reinforced/spawner/directional/north{
- layer = 2.9
- },
+/obj/structure/window/reinforced/spawner/directional/north,
/obj/effect/turf_decal/stripes/asteroid/line{
dir = 4
},
diff --git a/_maps/shuttles/starfury_corvette.dmm b/_maps/shuttles/starfury_corvette.dmm
index 498f8198cb421..877375fa4e785 100644
--- a/_maps/shuttles/starfury_corvette.dmm
+++ b/_maps/shuttles/starfury_corvette.dmm
@@ -58,7 +58,9 @@
/area/shuttle/sbc_corvette)
"ai" = (
/obj/machinery/computer/camera_advanced/shuttle_docker/syndicate/corvette{
- dir = 8
+ dir = 8;
+ y_offset = 0;
+ x_offset = -3
},
/obj/effect/turf_decal/stripes/red/line{
dir = 4
@@ -70,7 +72,10 @@
id_tag = "SBC_corvette_bolt";
name = "Syndicate Corvette Airlock"
},
-/obj/docking_port/mobile/syndicate_corvette,
+/obj/docking_port/mobile/syndicate_corvette{
+ preferred_direction = 1;
+ port_direction = 4
+ },
/obj/structure/fans/tiny,
/obj/effect/mapping_helpers/airlock/access/all/syndicate/general,
/obj/effect/turf_decal/siding/thinplating_new/dark{
@@ -290,8 +295,7 @@
/area/shuttle/sbc_corvette)
"aO" = (
/obj/machinery/door/poddoor/preopen{
- id = "SBC_corvette_blast";
- layer = 3
+ id = "SBC_corvette_blast"
},
/obj/effect/spawner/structure/window/reinforced/plasma/plastitanium,
/turf/open/floor/plating,
diff --git a/_maps/shuttles/whiteship_birdshot.dmm b/_maps/shuttles/whiteship_birdshot.dmm
index f6b31535db634..6d1854a7e9a8f 100644
--- a/_maps/shuttles/whiteship_birdshot.dmm
+++ b/_maps/shuttles/whiteship_birdshot.dmm
@@ -116,6 +116,33 @@
},
/turf/open/floor/iron/smooth_large,
/area/shuttle/abandoned/cargo)
+"eB" = (
+/obj/structure/closet/secure_closet/freezer/fridge/open,
+/obj/item/reagent_containers/condiment/enzyme,
+/obj/item/food/meat/slab/synthmeat{
+ pixel_x = -3;
+ pixel_y = 3
+ },
+/obj/item/food/meat/slab/synthmeat{
+ pixel_x = -3;
+ pixel_y = 3
+ },
+/obj/item/food/meat/slab/synthmeat{
+ pixel_x = -3;
+ pixel_y = 3
+ },
+/obj/item/reagent_containers/condiment/flour{
+ pixel_x = -3;
+ pixel_y = 3
+ },
+/obj/item/reagent_containers/condiment/flour{
+ pixel_x = -3;
+ pixel_y = 3
+ },
+/obj/item/reagent_containers/condiment/milk,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/iron/cafeteria,
+/area/shuttle/abandoned/bar)
"eC" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/cable,
@@ -174,20 +201,6 @@
},
/turf/open/floor/iron,
/area/shuttle/abandoned/bar)
-"fW" = (
-/obj/machinery/porta_turret/centcom_shuttle/weak{
- dir = 4
- },
-/turf/closed/wall/mineral/titanium,
-/area/shuttle/abandoned/crew)
-"gj" = (
-/obj/machinery/computer/camera_advanced/shuttle_docker/whiteship{
- dir = 1;
- x_offset = 4
- },
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron/dark/small,
-/area/shuttle/abandoned/bridge)
"gs" = (
/obj/machinery/power/terminal{
dir = 4
@@ -231,6 +244,12 @@
/obj/structure/cable,
/turf/open/floor/catwalk_floor,
/area/shuttle/abandoned/crew)
+"hG" = (
+/obj/machinery/porta_turret/centcom_shuttle/weak{
+ dir = 4
+ },
+/turf/closed/wall/mineral/titanium,
+/area/shuttle/abandoned/crew)
"hT" = (
/obj/effect/spawner/structure/window/reinforced/shuttle,
/obj/machinery/door/firedoor,
@@ -283,6 +302,12 @@
/obj/machinery/firealarm/directional/west,
/turf/open/floor/iron/dark/small,
/area/shuttle/abandoned/bridge)
+"jC" = (
+/obj/machinery/porta_turret/centcom_shuttle/weak{
+ dir = 4
+ },
+/turf/closed/wall/mineral/titanium,
+/area/shuttle/abandoned/bridge)
"jY" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/suit_storage_unit/standard_unit,
@@ -359,35 +384,6 @@
/obj/structure/cable,
/turf/open/floor/catwalk_floor,
/area/shuttle/abandoned/crew)
-"nz" = (
-/obj/structure/closet/secure_closet/freezer/fridge/open,
-/obj/item/reagent_containers/condiment/enzyme{
- layer = 5
- },
-/obj/item/food/meat/slab/synthmeat{
- pixel_x = -3;
- pixel_y = 3
- },
-/obj/item/food/meat/slab/synthmeat{
- pixel_x = -3;
- pixel_y = 3
- },
-/obj/item/food/meat/slab/synthmeat{
- pixel_x = -3;
- pixel_y = 3
- },
-/obj/item/reagent_containers/condiment/flour{
- pixel_x = -3;
- pixel_y = 3
- },
-/obj/item/reagent_containers/condiment/flour{
- pixel_x = -3;
- pixel_y = 3
- },
-/obj/item/reagent_containers/condiment/milk,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron/cafeteria,
-/area/shuttle/abandoned/bar)
"nL" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 8
@@ -532,9 +528,6 @@
},
/turf/open/floor/iron/small,
/area/shuttle/abandoned/medbay)
-"ry" = (
-/turf/closed/wall/mineral/titanium,
-/area/shuttle/abandoned/bar)
"rO" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/components/unary/vent_pump/on,
@@ -1049,6 +1042,14 @@
/obj/machinery/light/small/directional/east,
/turf/open/floor/iron/freezer,
/area/shuttle/abandoned/medbay)
+"Ib" = (
+/obj/machinery/computer/camera_advanced/shuttle_docker/whiteship{
+ dir = 1;
+ x_offset = 4
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/iron/dark/small,
+/area/shuttle/abandoned/bridge)
"Is" = (
/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
@@ -1158,12 +1159,6 @@
},
/turf/open/floor/iron,
/area/shuttle/abandoned/bar)
-"Lj" = (
-/obj/machinery/porta_turret/centcom_shuttle/weak{
- dir = 4
- },
-/turf/closed/wall/mineral/titanium,
-/area/shuttle/abandoned/pod)
"Ll" = (
/obj/structure/cable,
/obj/machinery/atmospherics/components/unary/vent_pump/on{
@@ -1248,6 +1243,9 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on,
/turf/open/floor/iron/smooth,
/area/shuttle/abandoned/crew)
+"OO" = (
+/turf/closed/wall/mineral/titanium,
+/area/shuttle/abandoned/bar)
"PC" = (
/obj/effect/spawner/structure/window/reinforced/shuttle,
/obj/machinery/door/poddoor{
@@ -1265,12 +1263,6 @@
},
/turf/open/floor/iron/grimy,
/area/shuttle/abandoned/crew)
-"Qf" = (
-/obj/machinery/porta_turret/centcom_shuttle/weak{
- dir = 4
- },
-/turf/closed/wall/mineral/titanium,
-/area/shuttle/abandoned/bridge)
"Ql" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/sign/poster/official/random/directional/north,
@@ -1336,6 +1328,12 @@
},
/turf/open/floor/iron/small,
/area/shuttle/abandoned/cargo)
+"RA" = (
+/obj/machinery/porta_turret/centcom_shuttle/weak{
+ dir = 4
+ },
+/turf/closed/wall/mineral/titanium,
+/area/shuttle/abandoned/pod)
"RH" = (
/obj/structure/chair{
dir = 4
@@ -1824,7 +1822,7 @@ wd
Tg
"}
(14,1,1) = {"
-fW
+hG
NK
NK
NK
@@ -1844,7 +1842,7 @@ Zy
NK
NK
NK
-fW
+hG
"}
(15,1,1) = {"
lt
@@ -1952,7 +1950,7 @@ fU
Gg
GS
wY
-nz
+eB
JP
Kf
jv
@@ -2002,7 +2000,7 @@ JP
JP
UK
Uu
-gj
+Ib
XB
lt
lt
@@ -2015,7 +2013,7 @@ pv
xr
qO
pv
-ry
+OO
lt
lt
lt
@@ -2037,7 +2035,7 @@ lt
PN
BZ
BZ
-Lj
+RA
lt
lt
lt
@@ -2045,7 +2043,7 @@ lt
lt
lt
lt
-Qf
+jC
YJ
YJ
XB
diff --git a/_maps/shuttles/whiteship_donut.dmm b/_maps/shuttles/whiteship_donut.dmm
index daf150b4cdf2f..2bb707ef9d73b 100644
--- a/_maps/shuttles/whiteship_donut.dmm
+++ b/_maps/shuttles/whiteship_donut.dmm
@@ -34,13 +34,6 @@
/obj/structure/window/reinforced/spawner/directional/south,
/turf/open/floor/plating/airless,
/area/shuttle/abandoned)
-"aX" = (
-/obj/machinery/power/shuttle_engine/heater,
-/obj/structure/window/reinforced/spawner/directional/north{
- layer = 2.9
- },
-/turf/open/floor/plating/airless,
-/area/shuttle/abandoned)
"be" = (
/obj/machinery/power/shuttle_engine/propulsion/left,
/turf/open/floor/plating/airless,
@@ -58,6 +51,11 @@
/obj/item/stock_parts/power_store/cell/high,
/turf/open/floor/iron/airless,
/area/shuttle/abandoned)
+"cq" = (
+/obj/machinery/power/shuttle_engine/heater,
+/obj/structure/window/reinforced/spawner/directional/north,
+/turf/open/floor/plating/airless,
+/area/shuttle/abandoned)
"da" = (
/obj/machinery/light/small/directional/west,
/obj/structure/table,
@@ -443,6 +441,17 @@
/obj/structure/window/reinforced/tinted/spawner/directional/north,
/turf/open/floor/iron/showroomfloor/airless,
/area/shuttle/abandoned)
+"VL" = (
+/obj/machinery/computer/camera_advanced/shuttle_docker/whiteship{
+ dir = 1;
+ x_offset = 0;
+ y_offset = 9
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/item/disk/holodisk/donutstation/whiteship,
+/obj/effect/turf_decal/tile/blue/half/contrasted,
+/turf/open/floor/iron/airless,
+/area/shuttle/abandoned)
"Wf" = (
/obj/machinery/computer/mech_bay_power_console{
dir = 8
@@ -466,17 +475,6 @@
},
/turf/open/floor/iron/airless,
/area/shuttle/abandoned)
-"XY" = (
-/obj/machinery/computer/camera_advanced/shuttle_docker/whiteship{
- dir = 1;
- x_offset = 0;
- y_offset = 9
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/item/disk/holodisk/donutstation/whiteship,
-/obj/effect/turf_decal/tile/blue/half/contrasted,
-/turf/open/floor/iron/airless,
-/area/shuttle/abandoned)
"YO" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/light/directional/south,
@@ -545,7 +543,7 @@ pM
nu
YO
ab
-aX
+cq
be
aa
aa
@@ -565,7 +563,7 @@ ac
KL
Te
ab
-aX
+cq
bf
aa
aa
@@ -647,7 +645,7 @@ ui
PT
gf
Xd
-XY
+VL
bq
"}
(9,1,1) = {"
@@ -765,7 +763,7 @@ MT
hP
eu
ab
-aX
+cq
be
aa
aa
@@ -785,7 +783,7 @@ qy
BM
kI
ab
-aX
+cq
bf
aa
aa
diff --git a/_maps/shuttles/whiteship_meta.dmm b/_maps/shuttles/whiteship_meta.dmm
index 9939b4b55ff87..1557622647809 100644
--- a/_maps/shuttles/whiteship_meta.dmm
+++ b/_maps/shuttles/whiteship_meta.dmm
@@ -1361,7 +1361,6 @@
pixel_y = 14
},
/obj/item/reagent_containers/condiment/enzyme{
- layer = 5;
pixel_x = -5;
pixel_y = 6
},
diff --git a/_maps/shuttles/whiteship_pubby.dmm b/_maps/shuttles/whiteship_pubby.dmm
index db7f00e5149c6..fd16482390e25 100644
--- a/_maps/shuttles/whiteship_pubby.dmm
+++ b/_maps/shuttles/whiteship_pubby.dmm
@@ -268,15 +268,6 @@
/obj/machinery/recharger,
/turf/open/floor/pod/light,
/area/shuttle/abandoned)
-"lV" = (
-/obj/machinery/computer/camera_advanced/shuttle_docker/whiteship{
- y_offset = 2;
- x_offset = -8
- },
-/obj/effect/decal/cleanable/cobweb/cobweb2,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/pod/dark,
-/area/shuttle/abandoned)
"mh" = (
/obj/effect/turf_decal/trimline/purple/filled/corner{
dir = 8
@@ -403,6 +394,11 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
/area/shuttle/abandoned)
+"qy" = (
+/obj/machinery/power/shuttle_engine/heater,
+/obj/structure/window/reinforced/spawner/directional/north,
+/turf/open/floor/plating/airless,
+/area/shuttle/abandoned)
"qS" = (
/obj/structure/table,
/obj/machinery/cell_charger,
@@ -536,24 +532,6 @@
/obj/machinery/light/small/built/directional/west,
/turf/open/floor/iron/dark,
/area/shuttle/abandoned)
-"vB" = (
-/obj/machinery/door/airlock/external/ruin,
-/obj/effect/turf_decal/loading_area/white{
- dir = 8
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
- dir = 8
- },
-/obj/docking_port/mobile{
- dir = 8;
- shuttle_id = "whiteship";
- launch_status = 0;
- name = "White Ship";
- port_direction = 4
- },
-/turf/open/floor/plating,
-/area/shuttle/abandoned)
"vJ" = (
/obj/effect/turf_decal/trimline/purple/filled/line,
/obj/effect/decal/cleanable/dirt,
@@ -593,13 +571,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/dark,
/area/shuttle/abandoned)
-"zw" = (
-/obj/machinery/power/shuttle_engine/heater,
-/obj/structure/window/reinforced/spawner/directional/north{
- layer = 2.9
- },
-/turf/open/floor/plating/airless,
-/area/shuttle/abandoned)
"zY" = (
/turf/template_noop,
/area/template_noop)
@@ -993,6 +964,24 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/dark,
/area/shuttle/abandoned)
+"Oe" = (
+/obj/machinery/door/airlock/external/ruin,
+/obj/effect/turf_decal/loading_area/white{
+ dir = 8
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+ dir = 8
+ },
+/obj/docking_port/mobile{
+ dir = 8;
+ shuttle_id = "whiteship";
+ launch_status = 0;
+ name = "White Ship";
+ port_direction = 4
+ },
+/turf/open/floor/plating,
+/area/shuttle/abandoned)
"Pu" = (
/obj/machinery/light/small/built/directional/west,
/obj/effect/turf_decal/siding/purple{
@@ -1002,6 +991,15 @@
/obj/item/rack_parts,
/turf/open/floor/iron/white/diagonal,
/area/shuttle/abandoned)
+"QZ" = (
+/obj/machinery/computer/camera_advanced/shuttle_docker/whiteship{
+ y_offset = 2;
+ x_offset = -8
+ },
+/obj/effect/decal/cleanable/cobweb/cobweb2,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/pod/dark,
+/area/shuttle/abandoned)
"Ra" = (
/obj/effect/turf_decal/trimline/purple/filled/end{
dir = 8
@@ -1346,7 +1344,7 @@ Sc
Sc
ED
xl
-zw
+qy
UX
"}
(7,1,1) = {"
@@ -1366,7 +1364,7 @@ cE
Sc
ot
cx
-zw
+qy
UX
"}
(8,1,1) = {"
@@ -1411,7 +1409,7 @@ Sc
"}
(10,1,1) = {"
Fw
-lV
+QZ
Np
nQ
jT
@@ -1446,7 +1444,7 @@ Ky
Sc
Rr
vJ
-zw
+qy
UX
"}
(12,1,1) = {"
@@ -1466,7 +1464,7 @@ Sc
Sc
UC
AA
-zw
+qy
UX
"}
(13,1,1) = {"
@@ -1560,7 +1558,7 @@ zY
zY
Sc
jT
-vB
+Oe
jT
Sc
zY
diff --git a/_maps/templates/battlecruiser_starfury.dmm b/_maps/templates/battlecruiser_starfury.dmm
index dae5d84a869b4..6d8923461f297 100644
--- a/_maps/templates/battlecruiser_starfury.dmm
+++ b/_maps/templates/battlecruiser_starfury.dmm
@@ -19,15 +19,6 @@
"ac" = (
/turf/closed/wall/mineral/plastitanium,
/area/shuttle/sbc_starfury)
-"ad" = (
-/obj/machinery/door/poddoor/preopen{
- id = "syndie_battlecruier_bridge_blast";
- layer = 3
- },
-/obj/structure/cable,
-/obj/effect/spawner/structure/window/reinforced/plasma/plastitanium,
-/turf/open/floor/plating,
-/area/shuttle/sbc_starfury)
"ae" = (
/turf/closed/wall/mineral/plastitanium/nodiagonal,
/area/shuttle/sbc_starfury)
@@ -407,15 +398,6 @@
},
/turf/open/floor/iron/dark,
/area/shuttle/sbc_starfury)
-"bx" = (
-/obj/machinery/door/poddoor/preopen{
- id = "syndie_battlecruier_bridge_blast";
- layer = 3
- },
-/obj/effect/spawner/structure/window/reinforced/plasma/plastitanium,
-/obj/structure/cable,
-/turf/open/floor/plating,
-/area/shuttle/sbc_starfury)
"by" = (
/obj/structure/sign/warning/secure_area,
/turf/closed/wall/mineral/plastitanium/nodiagonal,
@@ -616,6 +598,24 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/dark/textured,
/area/shuttle/sbc_starfury)
+"cp" = (
+/obj/structure/table/wood,
+/obj/item/folder/syndicate/red{
+ pixel_x = -5;
+ pixel_y = 2
+ },
+/obj/item/cigarette/cigar{
+ pixel_x = 5;
+ pixel_y = 7
+ },
+/obj/item/storage/box/matches,
+/obj/item/pen{
+ pixel_x = -5
+ },
+/obj/machinery/airalarm/directional/east,
+/obj/effect/mapping_helpers/airalarm/syndicate_access,
+/turf/open/floor/carpet/red,
+/area/shuttle/sbc_starfury)
"cs" = (
/obj/structure/table/reinforced/plastitaniumglass,
/obj/structure/cable,
@@ -645,6 +645,14 @@
},
/turf/open/floor/iron/dark,
/area/shuttle/sbc_starfury)
+"cy" = (
+/obj/structure/table,
+/obj/machinery/cell_charger,
+/obj/item/stock_parts/power_store/cell/high,
+/obj/effect/turf_decal/siding/thinplating_new/dark,
+/obj/effect/turf_decal/stripes/red/line,
+/turf/open/floor/mineral/plastitanium/red,
+/area/shuttle/sbc_starfury)
"cz" = (
/obj/machinery/newscaster/directional/south,
/obj/structure/table/reinforced/plastitaniumglass,
@@ -985,21 +993,10 @@
/obj/effect/turf_decal/stripes/red/line,
/turf/open/floor/iron/dark,
/area/shuttle/sbc_starfury)
-"dO" = (
+"dR" = (
/obj/structure/sign/warning/secure_area/directional/east{
desc = "A warning sign which reads 'KEEP CLEAR: SHUTTLE BAY'";
icon_state = "space";
- layer = 4;
- name = "KEEP CLEAR: SHUTTLE BAY"
- },
-/obj/effect/turf_decal/stripes/red/line,
-/turf/open/floor/iron/dark,
-/area/shuttle/sbc_starfury)
-"dS" = (
-/obj/structure/sign/warning/secure_area/directional/west{
- desc = "A warning sign which reads 'KEEP CLEAR: SHUTTLE BAY'";
- icon_state = "space";
- layer = 4;
name = "KEEP CLEAR: SHUTTLE BAY"
},
/obj/effect/turf_decal/stripes/red/line,
@@ -1584,15 +1581,6 @@
/obj/machinery/door/airlock/multi_tile/public/glass,
/turf/open/floor/pod/light,
/area/shuttle/sbc_starfury)
-"fE" = (
-/obj/structure/table/reinforced,
-/obj/machinery/cell_charger,
-/obj/item/stock_parts/power_store/cell/high,
-/obj/effect/turf_decal/tile/yellow/anticorner/contrasted{
- dir = 8
- },
-/turf/open/floor/iron,
-/area/shuttle/sbc_starfury)
"fF" = (
/obj/effect/mapping_helpers/airlock/access/all/syndicate/general,
/obj/machinery/door/firedoor/heavy,
@@ -1615,14 +1603,6 @@
/obj/effect/mapping_helpers/airlock/access/all/syndicate/general,
/turf/open/floor/iron/showroomfloor,
/area/shuttle/sbc_starfury)
-"fR" = (
-/obj/structure/table,
-/obj/machinery/cell_charger,
-/obj/item/stock_parts/power_store/cell/high,
-/obj/effect/turf_decal/siding/thinplating_new/dark,
-/obj/effect/turf_decal/stripes/red/line,
-/turf/open/floor/mineral/plastitanium/red,
-/area/shuttle/sbc_starfury)
"fS" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -1631,6 +1611,25 @@
},
/turf/open/floor/iron/dark,
/area/shuttle/sbc_starfury)
+"ga" = (
+/obj/structure/rack{
+ dir = 8
+ },
+/obj/item/mod/control/pre_equipped/elite{
+ pixel_x = 1;
+ pixel_y = 5
+ },
+/obj/item/clothing/mask/gas/syndicate{
+ pixel_x = 5;
+ pixel_y = 5
+ },
+/obj/item/mod/control/pre_equipped/elite{
+ pixel_x = -4
+ },
+/obj/item/clothing/mask/gas/syndicate,
+/obj/machinery/firealarm/directional/south,
+/turf/open/floor/pod/light,
+/area/shuttle/sbc_starfury)
"gc" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/mop_bucket,
@@ -1646,18 +1645,6 @@
},
/turf/open/floor/iron/dark,
/area/shuttle/sbc_starfury)
-"gp" = (
-/obj/structure/sign/warning/secure_area/directional/east{
- desc = "A warning sign which reads 'KEEP CLEAR: SHUTTLE BAY'";
- icon_state = "space";
- layer = 4;
- name = "KEEP CLEAR: SHUTTLE BAY"
- },
-/obj/effect/turf_decal/stripes/red/line{
- dir = 1
- },
-/turf/open/floor/iron/dark,
-/area/shuttle/sbc_starfury)
"gx" = (
/obj/effect/mob_spawn/ghost_role/human/syndicate/battlecruiser{
dir = 8
@@ -1687,21 +1674,6 @@
},
/turf/open/floor/mineral/plastitanium/red,
/area/shuttle/sbc_starfury)
-"gC" = (
-/obj/structure/sign/warning/secure_area/directional/west{
- desc = "A warning sign which reads 'KEEP CLEAR: SHUTTLE BAY'";
- icon_state = "space";
- layer = 4;
- name = "KEEP CLEAR: SHUTTLE BAY"
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/obj/effect/turf_decal/tile/red/half/contrasted{
- dir = 8
- },
-/turf/open/floor/iron/dark,
-/area/shuttle/sbc_starfury)
"gD" = (
/obj/structure/disposalpipe/segment,
/obj/structure/cable,
@@ -1741,6 +1713,19 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/shuttle/sbc_starfury)
+"gN" = (
+/obj/structure/table,
+/obj/machinery/cell_charger,
+/obj/item/stock_parts/power_store/cell/high,
+/obj/structure/cable,
+/obj/effect/turf_decal/siding/thinplating_new/dark{
+ dir = 8
+ },
+/obj/effect/turf_decal/stripes/red/line{
+ dir = 8
+ },
+/turf/open/floor/mineral/plastitanium/red,
+/area/shuttle/sbc_starfury)
"gO" = (
/obj/effect/turf_decal/tile/red/half/contrasted{
dir = 8
@@ -2190,38 +2175,6 @@
/obj/effect/mapping_helpers/airlock/cutaiwire,
/turf/open/floor/iron/dark,
/area/shuttle/sbc_starfury)
-"hZ" = (
-/obj/structure/rack{
- dir = 8;
- layer = 2.9
- },
-/obj/item/gun/ballistic/automatic/m90{
- pixel_x = -3;
- pixel_y = 3
- },
-/obj/item/gun/ballistic/automatic/m90,
-/obj/item/gun/ballistic/automatic/m90{
- pixel_x = 3;
- pixel_y = -3
- },
-/turf/open/floor/pod/light,
-/area/shuttle/sbc_starfury)
-"ia" = (
-/obj/structure/rack{
- dir = 8;
- layer = 2.9
- },
-/obj/item/gun/ballistic/shotgun/bulldog{
- pixel_x = -3;
- pixel_y = 3
- },
-/obj/item/gun/ballistic/shotgun/bulldog,
-/obj/item/gun/ballistic/shotgun/bulldog{
- pixel_x = 3;
- pixel_y = -3
- },
-/turf/open/floor/pod/light,
-/area/shuttle/sbc_starfury)
"ib" = (
/obj/structure/closet/secure_closet{
anchored = 1;
@@ -2368,21 +2321,6 @@
/obj/effect/turf_decal/tile/red/anticorner/contrasted,
/turf/open/floor/iron/dark,
/area/shuttle/sbc_starfury)
-"io" = (
-/obj/structure/rack{
- dir = 8;
- layer = 2.9
- },
-/obj/item/gun/ballistic/revolver/syndicate{
- pixel_x = 2;
- pixel_y = 5
- },
-/obj/item/gun/ballistic/revolver/syndicate{
- pixel_x = -1;
- pixel_y = 2
- },
-/turf/open/floor/pod/light,
-/area/shuttle/sbc_starfury)
"iq" = (
/obj/machinery/microwave,
/obj/structure/table/wood,
@@ -2449,16 +2387,6 @@
/obj/effect/mapping_helpers/airalarm/syndicate_access,
/turf/open/floor/iron,
/area/shuttle/sbc_starfury)
-"ix" = (
-/obj/structure/rack{
- dir = 8;
- layer = 2.9
- },
-/obj/item/storage/belt/military,
-/obj/item/ammo_box/magazine/m7mm,
-/obj/item/gun/ballistic/automatic/l6_saw,
-/turf/open/floor/pod/light,
-/area/shuttle/sbc_starfury)
"iy" = (
/obj/item/storage/box/donkpockets{
pixel_x = 2
@@ -2512,24 +2440,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/carpet/red,
/area/shuttle/sbc_starfury)
-"iG" = (
-/obj/structure/table/wood,
-/obj/item/folder/syndicate/red{
- pixel_x = -5;
- pixel_y = 2
- },
-/obj/item/cigarette/cigar{
- pixel_x = 5;
- pixel_y = 7
- },
-/obj/item/storage/box/matches,
-/obj/item/pen{
- pixel_x = -5
- },
-/obj/machinery/airalarm/directional/east,
-/obj/effect/mapping_helpers/airalarm/syndicate_access,
-/turf/open/floor/carpet/red,
-/area/shuttle/sbc_starfury)
"iI" = (
/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/tile/red/half/contrasted{
@@ -2557,26 +2467,6 @@
},
/turf/open/floor/plating,
/area/shuttle/sbc_starfury)
-"iN" = (
-/obj/structure/rack{
- dir = 8;
- layer = 2.9
- },
-/obj/item/mod/control/pre_equipped/elite{
- pixel_x = 1;
- pixel_y = 5
- },
-/obj/item/clothing/mask/gas/syndicate{
- pixel_x = 5;
- pixel_y = 5
- },
-/obj/item/mod/control/pre_equipped/elite{
- pixel_x = -4
- },
-/obj/item/clothing/mask/gas/syndicate,
-/obj/machinery/firealarm/directional/south,
-/turf/open/floor/pod/light,
-/area/shuttle/sbc_starfury)
"iO" = (
/obj/structure/table,
/obj/item/shield/energy{
@@ -3172,19 +3062,6 @@
/obj/effect/mapping_helpers/airlock/cutaiwire,
/turf/open/floor/plating,
/area/shuttle/sbc_starfury)
-"kN" = (
-/obj/structure/sign/warning/secure_area/directional/north{
- desc = "A warning sign which reads 'EXTERNAL AIRLOCK'";
- icon_state = "space";
- layer = 4;
- name = "EXTERNAL AIRLOCK"
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/obj/machinery/light/small/red/directional/north,
-/turf/open/floor/plating,
-/area/shuttle/sbc_starfury)
"kO" = (
/obj/structure/table/reinforced,
/obj/item/clothing/gloves/color/yellow{
@@ -3244,18 +3121,14 @@
},
/turf/open/floor/mineral/plastitanium,
/area/shuttle/sbc_starfury)
-"lf" = (
-/obj/structure/sign/warning/secure_area/directional/north{
- desc = "A warning sign which reads 'EXTERNAL AIRLOCK'";
- icon_state = "space";
- layer = 4;
- name = "EXTERNAL AIRLOCK"
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 4
+"lg" = (
+/obj/structure/table/reinforced,
+/obj/machinery/cell_charger,
+/obj/item/stock_parts/power_store/cell/high,
+/obj/effect/turf_decal/tile/yellow/anticorner/contrasted{
+ dir = 8
},
-/obj/machinery/light/small/red/directional/north,
-/turf/open/floor/plating,
+/turf/open/floor/iron,
/area/shuttle/sbc_starfury)
"lh" = (
/obj/effect/turf_decal/tile/yellow{
@@ -3786,6 +3659,17 @@
/obj/effect/turf_decal/siding/dark_red,
/turf/open/floor/iron/dark/textured_large,
/area/shuttle/sbc_starfury)
+"pO" = (
+/obj/structure/rack{
+ dir = 8
+ },
+/obj/machinery/airalarm/directional/east,
+/obj/item/storage/belt/military,
+/obj/item/ammo_box/magazine/sniper_rounds,
+/obj/item/gun/ballistic/rifle/sniper_rifle/syndicate,
+/obj/effect/mapping_helpers/airalarm/syndicate_access,
+/turf/open/floor/pod/light,
+/area/shuttle/sbc_starfury)
"pQ" = (
/obj/machinery/door/airlock/maintenance{
name = "Starfury Engineering Maintenance"
@@ -4171,6 +4055,17 @@
/obj/machinery/firealarm/directional/north,
/turf/open/floor/pod/dark,
/area/shuttle/sbc_starfury)
+"wG" = (
+/obj/structure/sign/warning/secure_area/directional/east{
+ desc = "A warning sign which reads 'KEEP CLEAR: SHUTTLE BAY'";
+ icon_state = "space";
+ name = "KEEP CLEAR: SHUTTLE BAY"
+ },
+/obj/effect/turf_decal/stripes/red/line{
+ dir = 1
+ },
+/turf/open/floor/iron/dark,
+/area/shuttle/sbc_starfury)
"wN" = (
/obj/machinery/porta_turret/syndicate/energy{
dir = 9
@@ -4301,6 +4196,15 @@
/obj/machinery/portable_atmospherics/pump,
/turf/open/floor/plating,
/area/shuttle/sbc_starfury)
+"yH" = (
+/obj/structure/sign/warning/secure_area/directional/west{
+ desc = "A warning sign which reads 'KEEP CLEAR: SHUTTLE BAY'";
+ icon_state = "space";
+ name = "KEEP CLEAR: SHUTTLE BAY"
+ },
+/obj/effect/turf_decal/stripes/red/line,
+/turf/open/floor/iron/dark,
+/area/shuttle/sbc_starfury)
"yM" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -4549,19 +4453,6 @@
/obj/structure/cable,
/turf/open/floor/iron/dark/textured,
/area/shuttle/sbc_starfury)
-"Dy" = (
-/obj/structure/table,
-/obj/machinery/cell_charger,
-/obj/item/stock_parts/power_store/cell/high,
-/obj/structure/cable,
-/obj/effect/turf_decal/siding/thinplating_new/dark{
- dir = 8
- },
-/obj/effect/turf_decal/stripes/red/line{
- dir = 8
- },
-/turf/open/floor/mineral/plastitanium/red,
-/area/shuttle/sbc_starfury)
"Dz" = (
/obj/item/crowbar/red,
/obj/structure/cable,
@@ -4569,6 +4460,21 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/dark/textured_large,
/area/shuttle/sbc_starfury)
+"DH" = (
+/obj/structure/rack{
+ dir = 8
+ },
+/obj/item/gun/ballistic/shotgun/bulldog{
+ pixel_x = -3;
+ pixel_y = 3
+ },
+/obj/item/gun/ballistic/shotgun/bulldog,
+/obj/item/gun/ballistic/shotgun/bulldog{
+ pixel_x = 3;
+ pixel_y = -3
+ },
+/turf/open/floor/pod/light,
+/area/shuttle/sbc_starfury)
"DS" = (
/obj/structure/rack,
/obj/item/stack/sheet/mineral/uranium{
@@ -4839,6 +4745,19 @@
/obj/effect/mapping_helpers/airlock/cutaiwire,
/turf/open/floor/plating,
/area/shuttle/sbc_starfury)
+"In" = (
+/obj/item/book/manual/wiki/barman_recipes,
+/obj/item/reagent_containers/cup/glass/shaker{
+ pixel_x = 10
+ },
+/obj/structure/table/reinforced/plastitaniumglass,
+/obj/effect/turf_decal/siding/dark{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/bar,
+/obj/machinery/computer/security/telescreen/entertainment/directional/west,
+/turf/open/floor/iron/dark,
+/area/shuttle/sbc_starfury)
"ID" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -4874,6 +4793,15 @@
},
/turf/open/floor/plating,
/area/shuttle/sbc_starfury)
+"Ja" = (
+/obj/structure/rack{
+ dir = 8
+ },
+/obj/item/storage/belt/military,
+/obj/item/ammo_box/magazine/m7mm,
+/obj/item/gun/ballistic/automatic/l6_saw,
+/turf/open/floor/pod/light,
+/area/shuttle/sbc_starfury)
"Je" = (
/obj/effect/turf_decal/tile/bar/diagonal_centre,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -4885,18 +4813,6 @@
/obj/effect/spawner/structure/window/reinforced/plasma/plastitanium,
/turf/open/floor/plating,
/area/shuttle/sbc_starfury)
-"Jl" = (
-/obj/structure/rack{
- dir = 8;
- layer = 2.9
- },
-/obj/machinery/airalarm/directional/east,
-/obj/item/storage/belt/military,
-/obj/item/ammo_box/magazine/sniper_rounds,
-/obj/item/gun/ballistic/rifle/sniper_rifle/syndicate,
-/obj/effect/mapping_helpers/airalarm/syndicate_access,
-/turf/open/floor/pod/light,
-/area/shuttle/sbc_starfury)
"Jm" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -4926,31 +4842,6 @@
/obj/machinery/light/small/directional/east,
/turf/open/floor/plating,
/area/shuttle/sbc_starfury)
-"JL" = (
-/obj/structure/rack{
- dir = 8;
- layer = 2.9
- },
-/obj/item/card/emag{
- pixel_x = -2;
- pixel_y = 2
- },
-/obj/item/card/emag,
-/obj/item/card/emag{
- pixel_x = 2;
- pixel_y = -2
- },
-/obj/item/clothing/glasses/thermal{
- pixel_x = -3;
- pixel_y = 3
- },
-/obj/item/clothing/glasses/thermal,
-/obj/item/clothing/glasses/thermal{
- pixel_x = 3;
- pixel_y = -3
- },
-/turf/open/floor/pod/light,
-/area/shuttle/sbc_starfury)
"JP" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -5073,6 +4964,17 @@
/obj/machinery/light/small/red/directional/north,
/turf/open/floor/plating,
/area/shuttle/sbc_starfury)
+"MQ" = (
+/obj/structure/closet/crate,
+/obj/item/stock_parts/power_store/cell/high,
+/obj/item/stock_parts/power_store/cell/high{
+ pixel_x = -3;
+ pixel_y = -3
+ },
+/obj/item/inducer/syndicate,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/turf/open/floor/iron/dark,
+/area/shuttle/sbc_starfury)
"MR" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
@@ -5279,6 +5181,18 @@
},
/turf/open/floor/mineral/plastitanium/red,
/area/shuttle/sbc_starfury)
+"QH" = (
+/obj/structure/sign/warning/secure_area/directional/north{
+ desc = "A warning sign which reads 'EXTERNAL AIRLOCK'";
+ icon_state = "space";
+ name = "EXTERNAL AIRLOCK"
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/obj/machinery/light/small/red/directional/north,
+/turf/open/floor/plating,
+/area/shuttle/sbc_starfury)
"QR" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
@@ -5345,19 +5259,6 @@
/obj/machinery/firealarm/directional/south,
/turf/open/floor/engine,
/area/shuttle/sbc_starfury)
-"RX" = (
-/obj/item/book/manual/wiki/barman_recipes,
-/obj/item/reagent_containers/cup/glass/shaker{
- pixel_x = 10
- },
-/obj/structure/table/reinforced/plastitaniumglass,
-/obj/effect/turf_decal/siding/dark{
- dir = 1
- },
-/obj/effect/turf_decal/tile/bar,
-/obj/machinery/computer/security/telescreen/entertainment/directional/west,
-/turf/open/floor/iron/dark,
-/area/shuttle/sbc_starfury)
"Sb" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/centcom{
@@ -5451,6 +5352,20 @@
/obj/effect/turf_decal/tile/red/half/contrasted,
/turf/open/floor/iron/dark,
/area/shuttle/sbc_starfury)
+"Ud" = (
+/obj/structure/rack{
+ dir = 8
+ },
+/obj/item/gun/ballistic/revolver/syndicate{
+ pixel_x = 2;
+ pixel_y = 5
+ },
+/obj/item/gun/ballistic/revolver/syndicate{
+ pixel_x = -1;
+ pixel_y = 2
+ },
+/turf/open/floor/pod/light,
+/area/shuttle/sbc_starfury)
"Ue" = (
/obj/machinery/power/turbine/inlet_compressor,
/obj/effect/turf_decal/stripes/red/end{
@@ -5458,6 +5373,14 @@
},
/turf/open/floor/plating/airless,
/area/shuttle/sbc_starfury)
+"Uf" = (
+/obj/machinery/door/poddoor/preopen{
+ id = "syndie_battlecruier_bridge_blast"
+ },
+/obj/structure/cable,
+/obj/effect/spawner/structure/window/reinforced/plasma/plastitanium,
+/turf/open/floor/plating,
+/area/shuttle/sbc_starfury)
"Uy" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/structure/cable,
@@ -5487,6 +5410,20 @@
},
/turf/open/floor/iron,
/area/shuttle/sbc_starfury)
+"UQ" = (
+/obj/structure/sign/warning/secure_area/directional/west{
+ desc = "A warning sign which reads 'KEEP CLEAR: SHUTTLE BAY'";
+ icon_state = "space";
+ name = "KEEP CLEAR: SHUTTLE BAY"
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/red/half/contrasted{
+ dir = 8
+ },
+/turf/open/floor/iron/dark,
+/area/shuttle/sbc_starfury)
"UU" = (
/obj/structure/table/reinforced,
/obj/item/storage/medkit/regular{
@@ -5550,6 +5487,14 @@
dir = 9
},
/area/shuttle/sbc_starfury)
+"VM" = (
+/obj/machinery/door/poddoor/preopen{
+ id = "syndie_battlecruier_bridge_blast"
+ },
+/obj/effect/spawner/structure/window/reinforced/plasma/plastitanium,
+/obj/structure/cable,
+/turf/open/floor/plating,
+/area/shuttle/sbc_starfury)
"VS" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/effect/turf_decal/tile/yellow/half/contrasted,
@@ -5618,16 +5563,29 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/dark/side,
/area/shuttle/sbc_starfury)
-"WI" = (
-/obj/structure/closet/crate,
-/obj/item/stock_parts/power_store/cell/high,
-/obj/item/stock_parts/power_store/cell/high{
+"WS" = (
+/obj/structure/rack{
+ dir = 8
+ },
+/obj/item/card/emag{
+ pixel_x = -2;
+ pixel_y = 2
+ },
+/obj/item/card/emag,
+/obj/item/card/emag{
+ pixel_x = 2;
+ pixel_y = -2
+ },
+/obj/item/clothing/glasses/thermal{
pixel_x = -3;
+ pixel_y = 3
+ },
+/obj/item/clothing/glasses/thermal,
+/obj/item/clothing/glasses/thermal{
+ pixel_x = 3;
pixel_y = -3
},
-/obj/item/inducer/syndicate,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/turf/open/floor/iron/dark,
+/turf/open/floor/pod/light,
/area/shuttle/sbc_starfury)
"WV" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -5748,6 +5706,21 @@
},
/turf/open/floor/pod/dark,
/area/shuttle/sbc_starfury)
+"Yl" = (
+/obj/structure/rack{
+ dir = 8
+ },
+/obj/item/gun/ballistic/automatic/m90{
+ pixel_x = -3;
+ pixel_y = 3
+ },
+/obj/item/gun/ballistic/automatic/m90,
+/obj/item/gun/ballistic/automatic/m90{
+ pixel_x = 3;
+ pixel_y = -3
+ },
+/turf/open/floor/pod/light,
+/area/shuttle/sbc_starfury)
"Yt" = (
/obj/machinery/space_heater,
/obj/effect/turf_decal/bot_red,
@@ -5806,6 +5779,18 @@
},
/turf/open/floor/engine,
/area/shuttle/sbc_starfury)
+"ZS" = (
+/obj/structure/sign/warning/secure_area/directional/north{
+ desc = "A warning sign which reads 'EXTERNAL AIRLOCK'";
+ icon_state = "space";
+ name = "EXTERNAL AIRLOCK"
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/machinery/light/small/red/directional/north,
+/turf/open/floor/plating,
+/area/shuttle/sbc_starfury)
"ZZ" = (
/obj/structure/disposalpipe/segment{
dir = 5
@@ -6064,7 +6049,7 @@ ce
ae
hd
hD
-RX
+In
iq
iy
ae
@@ -6093,7 +6078,7 @@ aa
aa
aa
ac
-bx
+VM
ae
ah
cH
@@ -6279,7 +6264,7 @@ aa
aa
aa
ae
-kN
+ZS
ae
MP
aH
@@ -6365,7 +6350,7 @@ aa
aa
aa
ae
-bx
+VM
ae
xr
aH
@@ -6445,7 +6430,7 @@ ri
ay
ay
XI
-dO
+dR
dV
eR
cO
@@ -6484,7 +6469,7 @@ Jf
ae
kz
kO
-fE
+lg
ae
ae
Fc
@@ -6505,7 +6490,7 @@ Ou
Ou
Ou
vT
-bx
+VM
dq
vk
ay
@@ -6573,7 +6558,7 @@ aa
aa
Ou
vT
-bx
+VM
ne
IM
ae
@@ -6636,10 +6621,10 @@ aa
aa
aa
aa
-ad
-ad
-ad
-ad
+Uf
+Uf
+Uf
+Uf
ae
by
Sb
@@ -6703,8 +6688,8 @@ aa
(14,1,1) = {"
aa
aa
-ad
-ad
+Uf
+Uf
aU
bj
eJ
@@ -6718,7 +6703,7 @@ ay
ag
dY
UB
-fR
+cy
ec
eB
aH
@@ -6739,7 +6724,7 @@ hB
ST
ec
dV
-gp
+wG
oA
ay
hm
@@ -6771,7 +6756,7 @@ aa
(15,1,1) = {"
aa
aa
-ad
+Uf
ct
aV
aJ
@@ -6839,7 +6824,7 @@ ac
(16,1,1) = {"
aa
aa
-ad
+Uf
al
Dd
xi
@@ -6906,8 +6891,8 @@ mO
"}
(17,1,1) = {"
aa
-ad
-ad
+Uf
+Uf
UU
az
aK
@@ -6974,7 +6959,7 @@ ir
"}
(18,1,1) = {"
aa
-ad
+Uf
pm
an
aA
@@ -7018,7 +7003,7 @@ hq
hP
ae
iu
-iG
+cp
nz
ae
Qf
@@ -7042,7 +7027,7 @@ ir
"}
(19,1,1) = {"
aa
-ad
+Uf
wo
ao
aB
@@ -7110,7 +7095,7 @@ ae
"}
(20,1,1) = {"
aa
-ad
+Uf
bo
ap
aC
@@ -7178,8 +7163,8 @@ mO
"}
(21,1,1) = {"
aa
-ad
-ad
+Uf
+Uf
aq
aD
aO
@@ -7247,7 +7232,7 @@ ir
(22,1,1) = {"
aa
aa
-ad
+Uf
ar
vr
xO
@@ -7284,7 +7269,7 @@ ST
ae
ae
gB
-Dy
+gN
gY
Fl
hS
@@ -7315,7 +7300,7 @@ ir
(23,1,1) = {"
aa
aa
-ad
+Uf
bC
aE
aP
@@ -7383,8 +7368,8 @@ ac
(24,1,1) = {"
aa
aa
-ad
-ad
+Uf
+Uf
be
bt
FC
@@ -7419,7 +7404,7 @@ hB
ST
ec
fF
-gC
+UQ
hs
gO
hv
@@ -7452,10 +7437,10 @@ aa
aa
aa
aa
-ad
-ad
-ad
-ad
+Uf
+Uf
+Uf
+Uf
ae
by
po
@@ -7525,7 +7510,7 @@ aa
aa
aa
vT
-bx
+VM
ck
Zm
ae
@@ -7593,7 +7578,7 @@ Ou
Ou
Ou
vT
-bx
+VM
bV
Wv
ay
@@ -7669,7 +7654,7 @@ xD
ay
ay
PF
-dS
+yH
AJ
dd
ik
@@ -7725,7 +7710,7 @@ aa
aa
aa
ae
-bx
+VM
ae
xr
aH
@@ -7763,14 +7748,14 @@ ae
ae
ae
Yi
-hZ
-hZ
+Yl
+Yl
ec
mQ
ae
nR
Xr
-WI
+MQ
ae
ko
ae
@@ -7834,7 +7819,7 @@ sB
ec
ec
ec
-JL
+WS
ae
XN
qf
@@ -7899,10 +7884,10 @@ gF
gR
Ay
sB
-ia
-io
+DH
+Ud
ec
-iN
+ga
ae
nR
jB
@@ -7911,7 +7896,7 @@ aa
aa
aa
ae
-lf
+QH
ae
fB
aH
@@ -7938,7 +7923,7 @@ ae
ae
Jm
da
-bx
+VM
aa
aa
aa
@@ -7997,7 +7982,7 @@ aa
aa
aa
ac
-bx
+VM
ae
BN
vk
@@ -8036,8 +8021,8 @@ UH
ae
hC
ib
-Jl
-ix
+pO
+Ja
fj
ae
ae
diff --git a/_maps/templates/holodeck_basketball.dmm b/_maps/templates/holodeck_basketball.dmm
index 7af2c536439bb..3260193010956 100644
--- a/_maps/templates/holodeck_basketball.dmm
+++ b/_maps/templates/holodeck_basketball.dmm
@@ -9,8 +9,7 @@
/area/template_noop)
"b" = (
/obj/structure/hoop{
- dir = 1;
- layer = 4.1
+ dir = 1
},
/obj/effect/turf_decal/tile/green/half/contrasted,
/turf/open/floor/holofloor,
@@ -44,9 +43,7 @@
/turf/open/floor/holofloor,
/area/template_noop)
"k" = (
-/obj/structure/hoop{
- layer = 3.9
- },
+/obj/structure/hoop,
/obj/effect/turf_decal/tile/red/half/contrasted{
dir = 1
},
diff --git a/_maps/templates/holodeck_kobayashi.dmm b/_maps/templates/holodeck_kobayashi.dmm
index babaeaac2a0d1..bb8c5c297acf1 100644
--- a/_maps/templates/holodeck_kobayashi.dmm
+++ b/_maps/templates/holodeck_kobayashi.dmm
@@ -5,14 +5,12 @@
"c" = (
/obj/machinery/button/massdriver/indestructible{
id = "trektorpedo1";
- layer = 3.9;
name = "photon torpedo button";
pixel_x = -16;
pixel_y = -5
},
/obj/machinery/button/massdriver/indestructible{
id = "trektorpedo2";
- layer = 3.9;
name = "photon torpedo button";
pixel_x = 16;
pixel_y = -5
@@ -131,9 +129,7 @@
/obj/structure/rack,
/obj/item/clothing/under/trek/engsec,
/obj/item/clothing/under/trek/engsec,
-/obj/structure/window/reinforced/spawner/directional/east{
- layer = 2.9
- },
+/obj/structure/window/reinforced/spawner/directional/east,
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 1
},
@@ -144,9 +140,7 @@
/turf/open/floor/holofloor/plating,
/area/template_noop)
"J" = (
-/obj/structure/window/reinforced/spawner/directional/east{
- layer = 2.9
- },
+/obj/structure/window/reinforced/spawner/directional/east,
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 1
},
diff --git a/_maps/templates/holodeck_lounge.dmm b/_maps/templates/holodeck_lounge.dmm
index defc5771555d5..1582a29bc5b0f 100644
--- a/_maps/templates/holodeck_lounge.dmm
+++ b/_maps/templates/holodeck_lounge.dmm
@@ -31,17 +31,15 @@
icon_state = "wood"
},
/area/template_noop)
-"f" = (
-/obj/structure/table/wood,
-/obj/item/flashlight/lamp/green{
- layer = 3.3
- },
+"e" = (
+/obj/structure/table/wood/shuttle_bar,
+/obj/structure/window/reinforced/spawner/directional/east,
/turf/open/floor/holofloor{
dir = 9;
icon_state = "wood"
},
/area/template_noop)
-"h" = (
+"g" = (
/obj/structure/table/wood,
/obj/item/cigarette/pipe,
/obj/effect/holodeck_effect/random_book,
@@ -55,15 +53,6 @@
icon_state = "wood"
},
/area/template_noop)
-"j" = (
-/obj/structure/window/reinforced/spawner/directional/east{
- layer = 2.9
- },
-/turf/open/floor/holofloor{
- dir = 9;
- icon_state = "wood"
- },
-/area/template_noop)
"k" = (
/obj/structure/table/wood/poker,
/obj/item/storage/box/matches,
@@ -72,16 +61,6 @@
icon_state = "wood"
},
/area/template_noop)
-"l" = (
-/obj/structure/chair/stool/bar/directional/south,
-/obj/structure/window/reinforced/spawner/directional/east{
- layer = 2.9
- },
-/turf/open/floor/holofloor{
- dir = 9;
- icon_state = "wood"
- },
-/area/template_noop)
"m" = (
/obj/structure/chair/wood,
/turf/open/floor/holofloor{
@@ -106,6 +85,14 @@
"q" = (
/turf/open/floor/holofloor/carpet,
/area/template_noop)
+"s" = (
+/obj/structure/table/wood,
+/obj/item/flashlight/lamp/green,
+/turf/open/floor/holofloor{
+ dir = 9;
+ icon_state = "wood"
+ },
+/area/template_noop)
"t" = (
/obj/structure/table/wood/shuttle_bar,
/obj/item/book/manual/wiki/barman_recipes,
@@ -123,6 +110,14 @@
icon_state = "wood"
},
/area/template_noop)
+"v" = (
+/obj/structure/table/wood/poker,
+/obj/item/cigarette/pipe,
+/turf/open/floor/holofloor{
+ dir = 9;
+ icon_state = "wood"
+ },
+/area/template_noop)
"w" = (
/obj/structure/table/wood,
/obj/item/instrument/saxophone,
@@ -254,14 +249,6 @@
icon_state = "wood"
},
/area/template_noop)
-"T" = (
-/obj/structure/table/wood/poker,
-/obj/item/cigarette/pipe,
-/turf/open/floor/holofloor{
- dir = 9;
- icon_state = "wood"
- },
-/area/template_noop)
"U" = (
/obj/structure/table/wood/poker,
/obj/item/storage/dice,
@@ -277,11 +264,16 @@
icon_state = "wood"
},
/area/template_noop)
-"Y" = (
-/obj/structure/table/wood/shuttle_bar,
-/obj/structure/window/reinforced/spawner/directional/east{
- layer = 2.9
+"W" = (
+/obj/structure/window/reinforced/spawner/directional/east,
+/turf/open/floor/holofloor{
+ dir = 9;
+ icon_state = "wood"
},
+/area/template_noop)
+"X" = (
+/obj/structure/chair/stool/bar/directional/south,
+/obj/structure/window/reinforced/spawner/directional/east,
/turf/open/floor/holofloor{
dir = 9;
icon_state = "wood"
@@ -305,7 +297,7 @@ H
a
"}
(2,1,1) = {"
-f
+s
z
z
z
@@ -322,9 +314,9 @@ u
u
z
z
-j
-l
-Y
+W
+X
+e
c
G
"}
@@ -355,7 +347,7 @@ p
(6,1,1) = {"
m
P
-T
+v
o
z
F
@@ -398,5 +390,5 @@ O
q
E
E
-h
+g
"}
diff --git a/_maps/templates/lazy_templates/ninja_den.dmm b/_maps/templates/lazy_templates/ninja_den.dmm
index b1506b72efed5..88f4bce19d45a 100644
--- a/_maps/templates/lazy_templates/ninja_den.dmm
+++ b/_maps/templates/lazy_templates/ninja_den.dmm
@@ -1691,7 +1691,6 @@
pixel_y = 4
},
/obj/item/reagent_containers/condiment/enzyme{
- layer = 5;
pixel_x = 10;
pixel_y = 2
},
@@ -2040,9 +2039,7 @@
/obj/item/food/grown/cabbage,
/obj/item/food/grown/cherries,
/obj/item/food/grown/cherries,
-/obj/item/reagent_containers/condiment/enzyme{
- layer = 5
- },
+/obj/item/reagent_containers/condiment/enzyme,
/obj/item/food/grown/redbeet,
/turf/open/floor/catwalk_floor,
/area/centcom/central_command_areas/holding)
diff --git a/_maps/templates/lazy_templates/nukie_base.dmm b/_maps/templates/lazy_templates/nukie_base.dmm
index bc136b886becf..416516483a5e9 100644
--- a/_maps/templates/lazy_templates/nukie_base.dmm
+++ b/_maps/templates/lazy_templates/nukie_base.dmm
@@ -1475,35 +1475,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/orange/hidden/layer5,
/turf/closed/indestructible/syndicate,
/area/centcom/syndicate_mothership/control)
-"qs" = (
-/obj/machinery/light/small/directional/west,
-/obj/structure/closet/secure_closet/freezer/fridge/open,
-/obj/item/food/meat/slab/rawcrab,
-/obj/item/food/meat/slab/rawcrab,
-/obj/item/food/meat/slab/rawcrab,
-/obj/item/food/fishmeat,
-/obj/item/food/fishmeat,
-/obj/item/food/fishmeat,
-/obj/item/food/grown/tomato,
-/obj/item/food/grown/tomato,
-/obj/item/food/grown/tomato,
-/obj/item/reagent_containers/condiment/enzyme{
- layer = 5
- },
-/obj/item/storage/fancy/egg_box,
-/obj/item/storage/fancy/egg_box,
-/obj/item/reagent_containers/condiment/milk,
-/obj/item/reagent_containers/condiment/milk,
-/obj/item/reagent_containers/condiment/flour{
- pixel_x = -5;
- pixel_y = 9
- },
-/obj/item/reagent_containers/condiment/flour{
- pixel_x = -5;
- pixel_y = 9
- },
-/turf/open/floor/plastic,
-/area/centcom/syndicate_mothership/expansion_fridgerummage)
"qv" = (
/obj/item/kirbyplants/random,
/turf/open/floor/mineral/titanium,
@@ -2579,32 +2550,6 @@
},
/turf/open/floor/mineral/plastitanium/red,
/area/centcom/syndicate_mothership/expansion_bombthreat)
-"DY" = (
-/obj/structure/table/wood/poker,
-/obj/machinery/light/warm/directional/north,
-/obj/item/reagent_containers/cup/glass/bottle/whiskey{
- pixel_x = -4;
- pixel_y = 14
- },
-/obj/item/toy/cards/deck{
- pixel_x = 3;
- pixel_y = 6
- },
-/obj/item/cigarette/robust{
- pixel_x = -4;
- pixel_y = 1
- },
-/obj/effect/decal/cleanable/ash{
- pixel_x = 12;
- pixel_y = -6
- },
-/obj/effect/spawner/random/entertainment/lighter{
- pixel_x = 9;
- pixel_y = -3
- },
-/obj/effect/turf_decal/tile/bar/opposingcorners,
-/turf/open/floor/iron,
-/area/centcom/syndicate_mothership/control)
"DZ" = (
/turf/closed/indestructible/syndicate,
/area/centcom/syndicate_mothership/control)
@@ -2711,6 +2656,32 @@
},
/turf/open/floor/mineral/plastitanium,
/area/centcom/syndicate_mothership/expansion_chemicalwarfare)
+"FK" = (
+/obj/structure/table/wood/poker,
+/obj/machinery/light/warm/directional/north,
+/obj/item/reagent_containers/cup/glass/bottle/whiskey{
+ pixel_x = -4;
+ pixel_y = 14
+ },
+/obj/item/toy/cards/deck{
+ pixel_x = 3;
+ pixel_y = 6
+ },
+/obj/item/cigarette/robust{
+ pixel_x = -4;
+ pixel_y = 1
+ },
+/obj/effect/decal/cleanable/ash{
+ pixel_x = 12;
+ pixel_y = -6
+ },
+/obj/effect/spawner/random/entertainment/lighter{
+ pixel_x = 9;
+ pixel_y = -3
+ },
+/obj/effect/turf_decal/tile/bar/opposingcorners,
+/turf/open/floor/iron,
+/area/centcom/syndicate_mothership/control)
"FM" = (
/turf/closed/indestructible/opsglass,
/area/centcom/syndicate_mothership/expansion_bombthreat)
@@ -3007,6 +2978,33 @@
},
/turf/open/misc/asteroid/snow/airless,
/area/centcom/syndicate_mothership)
+"HX" = (
+/obj/machinery/light/small/directional/west,
+/obj/structure/closet/secure_closet/freezer/fridge/open,
+/obj/item/food/meat/slab/rawcrab,
+/obj/item/food/meat/slab/rawcrab,
+/obj/item/food/meat/slab/rawcrab,
+/obj/item/food/fishmeat,
+/obj/item/food/fishmeat,
+/obj/item/food/fishmeat,
+/obj/item/food/grown/tomato,
+/obj/item/food/grown/tomato,
+/obj/item/food/grown/tomato,
+/obj/item/reagent_containers/condiment/enzyme,
+/obj/item/storage/fancy/egg_box,
+/obj/item/storage/fancy/egg_box,
+/obj/item/reagent_containers/condiment/milk,
+/obj/item/reagent_containers/condiment/milk,
+/obj/item/reagent_containers/condiment/flour{
+ pixel_x = -5;
+ pixel_y = 9
+ },
+/obj/item/reagent_containers/condiment/flour{
+ pixel_x = -5;
+ pixel_y = 9
+ },
+/turf/open/floor/plastic,
+/area/centcom/syndicate_mothership/expansion_fridgerummage)
"Ia" = (
/obj/machinery/camera/autoname/directional/north{
network = list("nukie")
@@ -6421,7 +6419,7 @@ rJ
Cf
nU
ek
-qs
+HX
ek
DZ
eK
@@ -7043,7 +7041,7 @@ DZ
Gr
tc
mJ
-DY
+FK
lQ
Nb
VK
diff --git a/_maps/templates/lazy_templates/wizard_den.dmm b/_maps/templates/lazy_templates/wizard_den.dmm
index 2415fe227c6b0..fb0f9a946d1ef 100644
--- a/_maps/templates/lazy_templates/wizard_den.dmm
+++ b/_maps/templates/lazy_templates/wizard_den.dmm
@@ -44,18 +44,6 @@
/obj/structure/showcase/machinery/rng,
/turf/open/floor/engine/cult,
/area/centcom/wizard_station)
-"dr" = (
-/obj/structure/table/wood,
-/obj/item/cigarette/cigar{
- pixel_y = -9;
- pixel_x = -5
- },
-/obj/item/camera/spooky{
- pixel_y = 7;
- pixel_x = 2
- },
-/turf/open/floor/engine/cult,
-/area/centcom/wizard_station)
"dB" = (
/obj/machinery/light/small/directional/east,
/turf/open/floor/engine/cult,
@@ -184,6 +172,13 @@
/obj/machinery/computer/shuttle,
/turf/open/floor/carpet/red,
/area/centcom/wizard_station)
+"kG" = (
+/obj/structure/railing,
+/obj/structure/railing/corner{
+ dir = 4
+ },
+/turf/open/floor/engine/cult,
+/area/centcom/wizard_station)
"kZ" = (
/turf/open/floor/engine/cult,
/area/centcom/wizard_station)
@@ -215,6 +210,13 @@
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/engine/cult,
/area/centcom/wizard_station)
+"mJ" = (
+/obj/structure/railing,
+/obj/structure/railing{
+ dir = 1
+ },
+/turf/open/floor/engine/cult,
+/area/centcom/wizard_station)
"nc" = (
/obj/structure/table/wood,
/turf/open/floor/engine/cult,
@@ -327,16 +329,6 @@
/obj/machinery/griddle,
/turf/open/floor/iron,
/area/centcom/wizard_station)
-"qg" = (
-/obj/structure/railing{
- layer = 3.1
- },
-/obj/structure/railing{
- layer = 3.1;
- dir = 1
- },
-/turf/open/floor/engine/cult,
-/area/centcom/wizard_station)
"ql" = (
/obj/structure/table/wood,
/obj/item/flashlight/lamp/green{
@@ -510,15 +502,6 @@
},
/turf/open/floor/plastic,
/area/centcom/wizard_station)
-"yX" = (
-/obj/structure/railing{
- layer = 3.1
- },
-/obj/structure/railing/corner{
- dir = 4
- },
-/turf/open/floor/engine/cult,
-/area/centcom/wizard_station)
"zB" = (
/turf/open/floor/iron,
/area/centcom/wizard_station)
@@ -665,6 +648,18 @@
},
/turf/open/floor/iron,
/area/centcom/wizard_station)
+"JU" = (
+/obj/structure/table/wood,
+/obj/item/cigarette/cigar{
+ pixel_y = -9;
+ pixel_x = -5
+ },
+/obj/item/camera/spooky{
+ pixel_y = 7;
+ pixel_x = 2
+ },
+/turf/open/floor/engine/cult,
+/area/centcom/wizard_station)
"JW" = (
/obj/machinery/door/window/left/directional/east,
/turf/open/floor/engine/cult,
@@ -1556,7 +1551,7 @@ kZ
uy
VB
TX
-yX
+kG
VB
VB
op
@@ -1602,7 +1597,7 @@ kZ
uy
VB
fX
-qg
+mJ
fX
VB
VB
@@ -1648,7 +1643,7 @@ LU
cy
VB
eI
-qg
+mJ
fX
fX
dk
@@ -1740,7 +1735,7 @@ LU
cy
VB
fX
-qg
+mJ
fX
fX
dk
@@ -1786,7 +1781,7 @@ kZ
uy
VB
fX
-qg
+mJ
fX
VB
VB
@@ -1832,7 +1827,7 @@ kZ
uy
VB
fX
-qg
+mJ
VB
VB
op
@@ -1857,7 +1852,7 @@ op
op
TG
TG
-dr
+JU
HD
VB
Dq
diff --git a/_maps/templates/shelter_2.dmm b/_maps/templates/shelter_2.dmm
index b12848b01daf6..38a742b85fd53 100644
--- a/_maps/templates/shelter_2.dmm
+++ b/_maps/templates/shelter_2.dmm
@@ -62,9 +62,7 @@
/turf/open/floor/pod,
/area/misc/survivalpod)
"n" = (
-/obj/structure/window/reinforced/survival_pod/spawner/directional/west{
- layer = 3
- },
+/obj/structure/window/reinforced/survival_pod/spawner/directional/west,
/obj/machinery/door/window/survival_pod/left/directional/north,
/turf/open/floor/carpet/black,
/area/misc/survivalpod)
diff --git a/_maps/virtual_domains/beach_bar.dmm b/_maps/virtual_domains/beach_bar.dmm
index 6368168416193..5e1c6f753b8ac 100644
--- a/_maps/virtual_domains/beach_bar.dmm
+++ b/_maps/virtual_domains/beach_bar.dmm
@@ -491,9 +491,7 @@
/area/virtual_domain/fullbright)
"xR" = (
/obj/structure/window/reinforced/spawner/directional/east,
-/obj/structure/window/reinforced/spawner/directional/north{
- layer = 2.9
- },
+/obj/structure/window/reinforced/spawner/directional/north,
/obj/structure/chair/stool/directional/south,
/obj/item/storage/backpack/duffelbag,
/obj/item/clothing/under/shorts/red,
@@ -685,9 +683,7 @@
/turf/closed/wall/mineral/sandstone,
/area/virtual_domain/fullbright)
"Em" = (
-/obj/item/reagent_containers/condiment/enzyme{
- layer = 5
- },
+/obj/item/reagent_containers/condiment/enzyme,
/obj/item/reagent_containers/cup/beaker{
pixel_x = 5
},
diff --git a/code/__DEFINES/antagonists.dm b/code/__DEFINES/antagonists.dm
index cd5d6a8305f6c..04a7471a2a3b7 100644
--- a/code/__DEFINES/antagonists.dm
+++ b/code/__DEFINES/antagonists.dm
@@ -365,6 +365,7 @@ GLOBAL_LIST_INIT(human_invader_antagonists, list(
#define HUNTER_PACK_RUSSIAN "Russian Fugitive Hunters"
#define HUNTER_PACK_BOUNTY "Bounty Fugitive Hunters"
#define HUNTER_PACK_PSYKER "Psyker Fugitive Hunters"
+#define HUNTER_PACK_MI13 "MI13 Fugitive Hunters"
/// Changeling abilities with DNA cost = this are innately given to all changelings
#define CHANGELING_POWER_INNATE -1
diff --git a/code/__DEFINES/dcs/signals/signals_mob/signals_mob_main.dm b/code/__DEFINES/dcs/signals/signals_mob/signals_mob_main.dm
index 8ada1c30be3c3..8be5b1fdb64aa 100644
--- a/code/__DEFINES/dcs/signals/signals_mob/signals_mob_main.dm
+++ b/code/__DEFINES/dcs/signals/signals_mob/signals_mob_main.dm
@@ -155,7 +155,7 @@
///Mob is trying to open the wires of a target [/atom], from /datum/wires/interactable(): (atom/target)
#define COMSIG_TRY_WIRES_INTERACT "try_wires_interact"
#define COMPONENT_CANT_INTERACT_WIRES (1<<0)
-///Mob is trying to emote, from /datum/emote/proc/run_emote(): (key, params, type_override, intentional)
+///Mob is trying to emote, from /datum/emote/proc/run_emote(): (key, params, type_override, intentional, emote)
#define COMSIG_MOB_PRE_EMOTED "mob_pre_emoted"
#define COMPONENT_CANT_EMOTE (1<<0)
#define COMSIG_MOB_EMOTED(emote_key) "mob_emoted_[emote_key]"
@@ -205,7 +205,7 @@
///Sent by pilot of mech in /obj/vehicle/sealed/mecha/on_mouseclick when using mech equipment : (/obj/vehicle/sealed/mecha/mech)
#define COMSIG_MOB_USED_MECH_EQUIPMENT "mob_used_mech_equipment"
///Sent by pilot of mech in /obj/vehicle/sealed/mecha/on_mouseclick when triggering mech punch : (/obj/vehicle/sealed/mecha/mech)
-#define COMSIG_MOB_USED_MECH_MELEE "mob_used_mech_melee"
+#define COMSIG_MOB_USED_CLICK_MECH_MELEE "mob_used_click_mech_melee"
///from living/flash_act(), when a mob is successfully flashed.
#define COMSIG_MOB_FLASHED "mob_flashed"
diff --git a/code/__DEFINES/icon_smoothing.dm b/code/__DEFINES/icon_smoothing.dm
index 94e9105f4a387..a853fde0c5dee 100644
--- a/code/__DEFINES/icon_smoothing.dm
+++ b/code/__DEFINES/icon_smoothing.dm
@@ -3,34 +3,33 @@
#define SMOOTH_CORNERS (1<<0)
/// Smoothing system in where adjacencies are calculated and used to select a pre-baked icon_state, encoded by bitmasking.
#define SMOOTH_BITMASK (1<<1)
+/// Limits SMOOTH_BITMASK to only cardinal directions, for use with cardinal smoothing
+#define SMOOTH_BITMASK_CARDINALS (1<<2)
/// Atom has diagonal corners, with underlays under them.
-#define SMOOTH_DIAGONAL_CORNERS (1<<2)
+#define SMOOTH_DIAGONAL_CORNERS (1<<3)
/// Atom will smooth with the borders of the map.
-#define SMOOTH_BORDER (1<<3)
+#define SMOOTH_BORDER (1<<4)
/// Atom is currently queued to smooth.
-#define SMOOTH_QUEUED (1<<4)
+#define SMOOTH_QUEUED (1<<5)
/// Smooths with objects, and will thus need to scan turfs for contents.
-#define SMOOTH_OBJ (1<<5)
+#define SMOOTH_OBJ (1<<6)
/// Uses directional object smoothing, so we care not only about something being on the right turf, but also its direction
/// Changes the meaning of smoothing_junction, instead of representing the directions we are smoothing in
/// it represents the sides of our directional border object that have a neighbor
/// Is incompatible with SMOOTH_CORNERS because border objects don't have corners
-#define SMOOTH_BORDER_OBJECT (1<<6)
-/// Has a smooth broken sprite, used to decide whether to apply an offset to the broken overlay or not. For /turf/open only.
-#define SMOOTH_BROKEN_TURF (1<<7)
-/// Has a smooth burnt sprite, used to decide whether to apply an offset to the burnt overlay or not. For /turf/open only.
-#define SMOOTH_BURNT_TURF (1<<8)
+#define SMOOTH_BORDER_OBJECT (1<<7)
+
+#define USES_SMOOTHING (SMOOTH_CORNERS|SMOOTH_BITMASK|SMOOTH_BITMASK_CARDINALS)
DEFINE_BITFIELD(smoothing_flags, list(
"SMOOTH_CORNERS" = SMOOTH_CORNERS,
"SMOOTH_BITMASK" = SMOOTH_BITMASK,
+ "SMOOTH_BITMASK_CARDINALS" = SMOOTH_BITMASK_CARDINALS,
"SMOOTH_DIAGONAL_CORNERS" = SMOOTH_DIAGONAL_CORNERS,
"SMOOTH_BORDER" = SMOOTH_BORDER,
"SMOOTH_QUEUED" = SMOOTH_QUEUED,
"SMOOTH_OBJ" = SMOOTH_OBJ,
"SMOOTH_BORDER_OBJECT" = SMOOTH_BORDER_OBJECT,
- "SMOOTH_BROKEN_TURF" = SMOOTH_BROKEN_TURF,
- "SMOOTH_BURNT_TURF" = SMOOTH_BURNT_TURF,
))
/// Components of a smoothing junction
@@ -44,6 +43,9 @@ DEFINE_BITFIELD(smoothing_flags, list(
#define SOUTHWEST_JUNCTION (1<<6)
#define NORTHWEST_JUNCTION (1<<7)
+#define CARDINAL_SMOOTHING_JUNCTIONS (NORTH_JUNCTION|SOUTH_JUNCTION|EAST_JUNCTION|WEST_JUNCTION)
+#define ALL_SMOOTHING_JUNCTIONS (NORTH_JUNCTION|SOUTH_JUNCTION|EAST_JUNCTION|WEST_JUNCTION|NORTHEAST_JUNCTION|SOUTHEAST_JUNCTION|SOUTHWEST_JUNCTION|NORTHWEST_JUNCTION)
+
DEFINE_BITFIELD(smoothing_junction, list(
"NORTH_JUNCTION" = NORTH_JUNCTION,
"SOUTH_JUNCTION" = SOUTH_JUNCTION,
@@ -57,7 +59,7 @@ DEFINE_BITFIELD(smoothing_junction, list(
/*smoothing macros*/
-#define QUEUE_SMOOTH(thing_to_queue) if(thing_to_queue.smoothing_flags & (SMOOTH_CORNERS|SMOOTH_BITMASK)) {SSicon_smooth.add_to_queue(thing_to_queue)}
+#define QUEUE_SMOOTH(thing_to_queue) if(thing_to_queue.smoothing_flags & USES_SMOOTHING) {SSicon_smooth.add_to_queue(thing_to_queue)}
#define QUEUE_SMOOTH_NEIGHBORS(thing_to_queue) for(var/atom/atom_neighbor as anything in orange(1, thing_to_queue)) {QUEUE_SMOOTH(atom_neighbor)}
diff --git a/code/__DEFINES/obj_flags.dm b/code/__DEFINES/obj_flags.dm
index c050c73f23133..9f575de9fbc55 100644
--- a/code/__DEFINES/obj_flags.dm
+++ b/code/__DEFINES/obj_flags.dm
@@ -75,20 +75,18 @@
#define DANGEROUS_OBJECT (1<<10)
/// Clothes that use large icons, for applying the proper overlays like blood
#define LARGE_WORN_ICON (1<<11)
-/// Clothes that block speech (i.e the muzzle). Can be applied to any clothing piece.
-#define BLOCKS_SPEECH (1<<12)
/// prevents from placing on plasmaman helmet or modsuit hat holder
-#define STACKABLE_HELMET_EXEMPT (1<<13)
+#define STACKABLE_HELMET_EXEMPT (1<<12)
/// Prevents plasmamen from igniting when wearing this
-#define PLASMAMAN_PREVENT_IGNITION (1<<14)
+#define PLASMAMAN_PREVENT_IGNITION (1<<13)
/// Usable as casting clothes by wizards (matters for suits, glasses and headwear)
-#define CASTING_CLOTHES (1<<15)
+#define CASTING_CLOTHES (1<<14)
///Moths can't eat the clothing that has this flag.
-#define INEDIBLE_CLOTHING (1<<16)
+#define INEDIBLE_CLOTHING (1<<15)
/// Headgear/helmet allows internals
-#define HEADINTERNALS (1<<17)
+#define HEADINTERNALS (1<<16)
/// Prevents masks from getting adjusted from enabling internals
-#define INTERNALS_ADJUST_EXEMPT (1<<18)
+#define INTERNALS_ADJUST_EXEMPT (1<<17)
/// Integrity defines for clothing (not flags but close enough)
#define CLOTHING_PRISTINE 0 // We have no damage on the clothing
diff --git a/code/__DEFINES/traits/declarations.dm b/code/__DEFINES/traits/declarations.dm
index f3b6020b051ba..c04b57241c7e0 100644
--- a/code/__DEFINES/traits/declarations.dm
+++ b/code/__DEFINES/traits/declarations.dm
@@ -617,6 +617,8 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
#define TRAIT_CHEF_KISS "chefs_kiss"
/// Allows clowns to bend balloons into animals
#define TRAIT_BALLOON_SUTRA "balloon_sutra"
+/// Allows detectives to identify chemicals by taste
+#define TRAIT_DETECTIVES_TASTE "detectives_taste"
///Movement type traits for movables. See elements/movetype_handler.dm
#define TRAIT_MOVE_GROUND "move_ground"
diff --git a/code/__DEFINES/traits/sources.dm b/code/__DEFINES/traits/sources.dm
index 278510bd23fbe..759101dc2abd5 100644
--- a/code/__DEFINES/traits/sources.dm
+++ b/code/__DEFINES/traits/sources.dm
@@ -190,6 +190,8 @@
#define MOD_TRAIT "mod"
/// Trait applied to tram passengers
#define TRAM_PASSENGER_TRAIT "tram-passenger"
+/// Trait given by a fulton extraction pack
+#define FULTON_PACK_TRAIT "fulton-pack"
/// Trait granted by the berserker hood.
#define BERSERK_TRAIT "berserk_trait"
diff --git a/code/__DEFINES/~meta_defines_include.dm b/code/__DEFINES/~meta_defines_include.dm
index f76bad5662536..73e817cba85b5 100644
--- a/code/__DEFINES/~meta_defines_include.dm
+++ b/code/__DEFINES/~meta_defines_include.dm
@@ -1 +1 @@
-#include "..\..\massmeta\~meta_defines\meta_defines_all.dm"
+#include "..\..\massmeta\modular_meta_defines.dm"
diff --git a/code/__HELPERS/icon_smoothing.dm b/code/__HELPERS/icon_smoothing.dm
index 5c5ff5a059a30..c53d9df2d2c05 100644
--- a/code/__HELPERS/icon_smoothing.dm
+++ b/code/__HELPERS/icon_smoothing.dm
@@ -177,7 +177,7 @@ xxx xxx xxx
corners_diagonal_smooth(calculate_adjacencies())
else
corners_cardinal_smooth(calculate_adjacencies())
- else if(smoothing_flags & SMOOTH_BITMASK)
+ else if(smoothing_flags & (SMOOTH_BITMASK|SMOOTH_BITMASK_CARDINALS))
bitmask_smooth()
else
CRASH("smooth_icon called for [src] with smoothing_flags == [smoothing_flags]")
@@ -430,7 +430,7 @@ xxx xxx xxx
SET_ADJ_IN_DIR(WEST, WEST)
// If there's nothing going on already
- if(!(new_junction & (NORTH|SOUTH)) || !(new_junction & (EAST|WEST)))
+ if(smoothing_flags & SMOOTH_BITMASK_CARDINALS || !(new_junction & (NORTH|SOUTH)) || !(new_junction & (EAST|WEST)))
set_smoothed_icon_state(new_junction)
return
@@ -518,13 +518,13 @@ xxx xxx xxx
/proc/smooth_zlevel(zlevel, now = FALSE)
var/list/away_turfs = Z_TURFS(zlevel)
for(var/turf/turf_to_smooth as anything in away_turfs)
- if(turf_to_smooth.smoothing_flags & (SMOOTH_CORNERS|SMOOTH_BITMASK))
+ if(turf_to_smooth.smoothing_flags & USES_SMOOTHING)
if(now)
turf_to_smooth.smooth_icon()
else
QUEUE_SMOOTH(turf_to_smooth)
for(var/atom/movable/movable_to_smooth as anything in turf_to_smooth)
- if(movable_to_smooth.smoothing_flags & (SMOOTH_CORNERS|SMOOTH_BITMASK))
+ if(movable_to_smooth.smoothing_flags & USES_SMOOTHING)
if(now)
movable_to_smooth.smooth_icon()
else
@@ -655,15 +655,6 @@ xxx xxx xxx
smoothing_groups = null
canSmoothWith = null
-#undef NORTH_JUNCTION
-#undef SOUTH_JUNCTION
-#undef EAST_JUNCTION
-#undef WEST_JUNCTION
-#undef NORTHEAST_JUNCTION
-#undef NORTHWEST_JUNCTION
-#undef SOUTHEAST_JUNCTION
-#undef SOUTHWEST_JUNCTION
-
#undef NO_ADJ_FOUND
#undef ADJ_FOUND
#undef NULLTURF_BORDER
diff --git a/code/_globalvars/bitfields.dm b/code/_globalvars/bitfields.dm
index f98178d537fa3..ea1b16d71cef8 100644
--- a/code/_globalvars/bitfields.dm
+++ b/code/_globalvars/bitfields.dm
@@ -83,7 +83,6 @@ DEFINE_BITFIELD(car_traits, list(
DEFINE_BITFIELD(clothing_flags, list(
"ANTI_TINFOIL_MANEUVER" = ANTI_TINFOIL_MANEUVER,
- "BLOCKS_SPEECH" = BLOCKS_SPEECH,
"BLOCK_GAS_SMOKE_EFFECT" = BLOCK_GAS_SMOKE_EFFECT,
"CASTING_CLOTHES" = CASTING_CLOTHES,
"GAS_FILTERING" = GAS_FILTERING,
diff --git a/code/_globalvars/configuration.dm b/code/_globalvars/configuration.dm
index e43d803fc4f29..5bece07319c78 100644
--- a/code/_globalvars/configuration.dm
+++ b/code/_globalvars/configuration.dm
@@ -11,10 +11,6 @@ GLOBAL_VAR_INIT(hub_visibility, FALSE)
GLOBAL_VAR_INIT(ooc_allowed, TRUE) // used with admin verbs to disable ooc - not a config option apparently
GLOBAL_VAR_INIT(dooc_allowed, TRUE)
-GLOBAL_VAR_INIT(enter_allowed, TRUE)
-GLOBAL_VAR_INIT(shuttle_frozen, FALSE)
-GLOBAL_VAR_INIT(shuttle_left, FALSE)
-GLOBAL_VAR_INIT(tinted_weldhelh, TRUE)
// Debug is used exactly once (in living.dm) but is commented out in a lot of places. It is not set anywhere and only checked.
diff --git a/code/_globalvars/game_modes.dm b/code/_globalvars/game_modes.dm
index 8a1493e383dbc..10d923343717e 100644
--- a/code/_globalvars/game_modes.dm
+++ b/code/_globalvars/game_modes.dm
@@ -1,8 +1,6 @@
GLOBAL_VAR(common_report) //Contains common part of roundend report
GLOBAL_VAR(survivor_report) //Contains shared survivor report for roundend report (part of personal report)
-
-GLOBAL_VAR_INIT(wavesecret, 0) // meteor mode, delays wave progression, terrible name
GLOBAL_DATUM(start_state, /datum/station_state) // Used in round-end report
/// We want reality_smash_tracker to exist only once and be accessible from anywhere.
diff --git a/code/_globalvars/lists/mapping.dm b/code/_globalvars/lists/mapping.dm
index 45f59fb447514..a7c7584d23aad 100644
--- a/code/_globalvars/lists/mapping.dm
+++ b/code/_globalvars/lists/mapping.dm
@@ -132,9 +132,6 @@ GLOBAL_LIST_EMPTY(bar_areas)
/// List of all the maps that have been cached for /proc/load_map
GLOBAL_LIST_EMPTY(cached_maps)
-/// Away missions
-GLOBAL_LIST_EMPTY(vr_spawnpoints)
-
/// Just a list of all the area objects in the game
/// Note, areas can have duplicate types
GLOBAL_LIST_EMPTY(areas)
diff --git a/code/_globalvars/lists/mobs.dm b/code/_globalvars/lists/mobs.dm
index 942c8cbf6b121..d91eec6e1bc87 100644
--- a/code/_globalvars/lists/mobs.dm
+++ b/code/_globalvars/lists/mobs.dm
@@ -43,7 +43,6 @@ GLOBAL_LIST_INIT(abstract_mob_types, list(
GLOBAL_LIST_EMPTY(player_list) //all mobs **with clients attached**.
GLOBAL_LIST_EMPTY(keyloop_list) //as above but can be limited to boost performance
GLOBAL_LIST_EMPTY(mob_list) //all mobs, including clientless
-GLOBAL_LIST_EMPTY(mob_directory) //mob_id -> mob
GLOBAL_LIST_EMPTY(alive_mob_list) //all alive mobs, including clientless. Excludes /mob/dead/new_player
GLOBAL_LIST_EMPTY(suicided_mob_list) //contains a list of all mobs that suicided, including their associated ghosts.
GLOBAL_LIST_EMPTY(drones_list)
@@ -56,7 +55,6 @@ GLOBAL_LIST_EMPTY(mob_living_list) //all instances of /mob/living and subtypes
GLOBAL_LIST_EMPTY(carbon_list) //all instances of /mob/living/carbon and subtypes, notably does not contain brains or simple animals
GLOBAL_LIST_EMPTY(human_list) //all instances of /mob/living/carbon/human and subtypes
GLOBAL_LIST_EMPTY(ai_list)
-GLOBAL_LIST_EMPTY(pai_list)
GLOBAL_LIST_EMPTY(available_ai_shells)
GLOBAL_LIST_INIT(simple_animals, list(list(),list(),list())) // One for each AI_* status define
GLOBAL_LIST_EMPTY(spidermobs) //all sentient spider mobs
@@ -133,8 +131,6 @@ GLOBAL_LIST_INIT_TYPED(species_prototypes, /datum/species, init_species_prototyp
species_list[species_type] = new species_type()
return species_list
-GLOBAL_LIST_EMPTY(sentient_disease_instances)
-
GLOBAL_LIST_EMPTY(latejoin_ai_cores)
GLOBAL_LIST_EMPTY(mob_config_movespeed_type_lookup)
diff --git a/code/_globalvars/traits/_traits.dm b/code/_globalvars/traits/_traits.dm
index 18b4c6ca2b47f..2c56c0481cfe5 100644
--- a/code/_globalvars/traits/_traits.dm
+++ b/code/_globalvars/traits/_traits.dm
@@ -189,6 +189,7 @@ GLOBAL_LIST_INIT(traits_by_type, list(
"TRAIT_DEATHCOMA" = TRAIT_DEATHCOMA,
"TRAIT_DEFIB_BLACKLISTED" = TRAIT_DEFIB_BLACKLISTED,
"TRAIT_DEPRESSION" = TRAIT_DEPRESSION,
+ "TRAIT_DETECTIVES_TASTE" = TRAIT_DETECTIVES_TASTE,
"TRAIT_DETECT_STORM" = TRAIT_DETECT_STORM,
"TRAIT_DIAGNOSTIC_HUD" = TRAIT_DIAGNOSTIC_HUD,
"TRAIT_DISCOORDINATED_TOOL_USER" = TRAIT_DISCOORDINATED_TOOL_USER,
diff --git a/code/controllers/subsystem/ambience.dm b/code/controllers/subsystem/ambience.dm
index 712a8cd80f5de..cae5d85246d80 100644
--- a/code/controllers/subsystem/ambience.dm
+++ b/code/controllers/subsystem/ambience.dm
@@ -86,3 +86,52 @@ SUBSYSTEM_DEF(ambience)
if(!M.has_light_nearby() && prob(0.5))
return ..(M, pick(minecraft_cave_noises))
return ..()
+
+/**
+ * Ambience buzz handling called by either area/Enter() or refresh_looping_ambience()
+ */
+
+/mob/proc/update_ambience_area(area/new_area)
+
+ var/old_tracked_area = ambience_tracked_area
+ if(old_tracked_area)
+ UnregisterSignal(old_tracked_area, COMSIG_AREA_POWER_CHANGE)
+ ambience_tracked_area = null
+ if(!client)
+ return
+ if(new_area)
+ ambience_tracked_area = new_area
+ RegisterSignal(ambience_tracked_area, COMSIG_AREA_POWER_CHANGE, PROC_REF(refresh_looping_ambience), TRUE)
+
+ refresh_looping_ambience()
+
+/mob/proc/refresh_looping_ambience()
+ SIGNAL_HANDLER
+
+ if(!client) // If a tree falls in the woods.
+ return
+
+ var/area/my_area = get_area(src)
+ var/sound_to_use = my_area.ambient_buzz
+
+ if(!sound_to_use || !(client.prefs.read_preference(/datum/preference/toggle/sound_ship_ambience)))
+ SEND_SOUND(src, sound(null, repeat = 0, wait = 0, channel = CHANNEL_BUZZ))
+ client.current_ambient_sound = null
+ return
+
+ if(!can_hear()) // Can the mob hear?
+ SEND_SOUND(src, sound(null, repeat = 0, wait = 0, channel = CHANNEL_BUZZ))
+ client.current_ambient_sound = null
+ return
+
+ //Station ambience is dependant on a functioning and charged APC with enviorment power enabled.
+ if(!is_mining_level(my_area.z) && ((!my_area.apc || !my_area.apc.operating || !my_area.apc.cell?.charge && my_area.requires_power || !my_area.power_environ)))
+ SEND_SOUND(src, sound(null, repeat = 0, wait = 0, channel = CHANNEL_BUZZ))
+ client.current_ambient_sound = null
+ return
+ else
+ if(sound_to_use == client.current_ambient_sound) // Don't reset current loops
+ return
+
+ client.current_ambient_sound = sound_to_use
+ SEND_SOUND(src, sound(my_area.ambient_buzz, repeat = 1, wait = 0, volume = my_area.ambient_buzz_vol, channel = CHANNEL_BUZZ))
diff --git a/code/datums/components/crafting/tiles.dm b/code/datums/components/crafting/tiles.dm
index 5f7c41e012e0c..3125f4c1e85cf 100644
--- a/code/datums/components/crafting/tiles.dm
+++ b/code/datums/components/crafting/tiles.dm
@@ -7,3 +7,23 @@
result = /obj/item/stack/tile/carpet/black
result_amount = 50
category = CAT_TILES
+
+/datum/crafting_recipe/wired_glass
+ name = "Wired Glass Tile"
+ result = /obj/item/stack/tile/light
+ reqs = list(
+ /obj/item/stack/sheet/iron = 1,
+ /obj/item/stack/sheet/glass = 1,
+ /obj/item/stack/cable_coil = 5,
+ )
+ category = CAT_TILES
+
+/datum/crafting_recipe/circuit
+ name = "Circuit Tile"
+ result = /obj/item/stack/tile/circuit
+ reqs = list(
+ /obj/item/stack/sheet/iron = 1,
+ /obj/item/stack/sheet/glass = 1,
+ /obj/item/stack/cable_coil = 5,
+ )
+ category = CAT_TILES
diff --git a/code/datums/components/knockoff.dm b/code/datums/components/knockoff.dm
index db72072789c45..3fe007736a1d0 100644
--- a/code/datums/components/knockoff.dm
+++ b/code/datums/components/knockoff.dm
@@ -23,6 +23,10 @@
/datum/component/knockoff/RegisterWithParent()
RegisterSignal(parent, COMSIG_ITEM_EQUIPPED, PROC_REF(on_equipped))
RegisterSignal(parent, COMSIG_ITEM_DROPPED, PROC_REF(on_dropped))
+ var/atom/movable/atom_parent = parent
+ var/mob/living/as_mob = atom_parent.loc
+ if(ismob(as_mob))
+ on_equipped(atom_parent, as_mob, as_mob.get_slot_by_item(atom_parent)) // lie a little
/datum/component/knockoff/UnregisterFromParent()
UnregisterSignal(parent, list(COMSIG_ITEM_EQUIPPED, COMSIG_ITEM_DROPPED))
diff --git a/code/datums/components/riding/riding_mob.dm b/code/datums/components/riding/riding_mob.dm
index 78158c55e8eb7..3cc853cc77a17 100644
--- a/code/datums/components/riding/riding_mob.dm
+++ b/code/datums/components/riding/riding_mob.dm
@@ -137,25 +137,18 @@
return ..()
/// Yeets the rider off, used for animals and cyborgs, redefined for humans who shove their piggyback rider off
-/datum/component/riding/creature/proc/force_dismount(mob/living/rider, gentle = FALSE)
+/datum/component/riding/creature/proc/force_dismount(mob/living/rider, throw_range = 8, throw_speed = 3, gentle = FALSE)
var/atom/movable/movable_parent = parent
movable_parent.unbuckle_mob(rider)
-
+ rider.Knockdown(3 SECONDS)
+ if(throw_range == 0)
+ return
if(!iscyborg(movable_parent) && !isanimal_or_basicmob(movable_parent))
return
-
var/turf/target = get_edge_target_turf(movable_parent, movable_parent.dir)
- var/turf/targetm = get_step(get_turf(movable_parent), movable_parent.dir)
- rider.Move(targetm)
- rider.Knockdown(3 SECONDS)
- if(gentle)
- rider.visible_message(span_warning("[rider] is thrown clear of [movable_parent]!"), \
- span_warning("You're thrown clear of [movable_parent]!"))
- rider.throw_at(target, 8, 3, movable_parent, gentle = TRUE)
- else
- rider.visible_message(span_warning("[rider] is thrown violently from [movable_parent]!"), \
- span_warning("You're thrown violently from [movable_parent]!"))
- rider.throw_at(target, 14, 5, movable_parent, gentle = FALSE)
+ rider.visible_message(span_warning("[rider] is thrown clear of [movable_parent]!"), \
+ span_warning("You're thrown clear of [movable_parent]!"))
+ rider.throw_at(target, throw_range, throw_speed, movable_parent, gentle = gentle)
/// If we're a cyborg or animal and we spin, we yeet whoever's on us off us
/datum/component/riding/creature/proc/check_emote(mob/living/user, datum/emote/emote)
@@ -540,7 +533,33 @@
/datum/component/riding/creature/raptor
require_minigame = TRUE
- ride_check_flags = RIDER_NEEDS_ARM
+ ride_check_flags = RIDER_NEEDS_ARM | UNBUCKLE_DISABLED_RIDER
+
+/datum/component/riding/creature/raptor/Initialize(mob/living/riding_mob, force, ride_check_flags, potion_boost)
+ . = ..()
+ RegisterSignal(parent, COMSIG_PROJECTILE_PREHIT, PROC_REF(on_bullet_hit))
+ RegisterSignal(parent, COMSIG_MOB_AFTER_APPLY_DAMAGE, PROC_REF(on_attacked))
+
+/datum/component/riding/creature/raptor/proc/on_bullet_hit(atom/target, list/bullet_args, obj/projectile/hit_projectile)
+ SIGNAL_HANDLER
+
+ if(hit_projectile.armor_flag == ENERGY)
+ freak_out()
+
+/datum/component/riding/creature/raptor/proc/on_attacked(mob/living/source, damage_dealt, damagetype, def_zone, blocked, wound_bonus, bare_wound_bonus, sharpness, attack_direction, obj/item/attacking_item)
+ SIGNAL_HANDLER
+
+ if(damagetype == STAMINA)
+ freak_out()
+
+/datum/component/riding/creature/raptor/proc/freak_out()
+ var/mob/living/living_parent = parent
+ if(!length(living_parent.buckled_mobs))
+ return
+ living_parent.balloon_alert_to_viewers("freaks out!")
+ living_parent.spin(spintime = 2 SECONDS, speed = 1)
+ for(var/mob/living/buckled_mob in living_parent.buckled_mobs)
+ force_dismount(buckled_mob, throw_range = 2, gentle = TRUE)
/datum/component/riding/creature/raptor/handle_specials()
. = ..()
diff --git a/code/datums/elements/muffles_speech.dm b/code/datums/elements/muffles_speech.dm
new file mode 100644
index 0000000000000..bbf41e3c4deef
--- /dev/null
+++ b/code/datums/elements/muffles_speech.dm
@@ -0,0 +1,48 @@
+/datum/element/muffles_speech
+
+/datum/element/muffles_speech/Attach(datum/target)
+ . = ..()
+ if(!isitem(target))
+ return ELEMENT_INCOMPATIBLE
+
+ RegisterSignal(target, COMSIG_ITEM_EQUIPPED, PROC_REF(equipped))
+ RegisterSignal(target, COMSIG_ITEM_DROPPED, PROC_REF(dropped))
+
+/datum/element/muffles_speech/Detach(datum/source)
+ . = ..()
+ UnregisterSignal(source, list(COMSIG_ITEM_EQUIPPED, COMSIG_ITEM_DROPPED))
+
+/datum/element/muffles_speech/proc/equipped(obj/item/source, mob/user, slot)
+ SIGNAL_HANDLER
+ if(source.slot_flags & slot)
+ RegisterSignal(user, COMSIG_MOB_SAY, PROC_REF(muzzle_talk))
+ RegisterSignal(user, COMSIG_MOB_PRE_EMOTED, PROC_REF(emote_override))
+
+/datum/element/muffles_speech/proc/dropped(obj/item/source, mob/user)
+ SIGNAL_HANDLER
+ UnregisterSignal(user, list(COMSIG_MOB_PRE_EMOTED, COMSIG_MOB_SAY))
+
+/datum/element/muffles_speech/proc/emote_override(mob/living/source, key, params, type_override, intentional, datum/emote/emote)
+ SIGNAL_HANDLER
+ if(!emote.hands_use_check && (emote.emote_type & EMOTE_AUDIBLE))
+ source.audible_message("makes a [pick("strong ", "weak ", "")]noise.", audible_message_flags = EMOTE_MESSAGE|ALWAYS_SHOW_SELF_MESSAGE)
+ return COMPONENT_CANT_EMOTE
+ return NONE
+
+/datum/element/muffles_speech/proc/muzzle_talk(datum/source, list/speech_args)
+ SIGNAL_HANDLER
+
+ var/spoken_message = speech_args[SPEECH_MESSAGE]
+ if(spoken_message)
+ var/list/words = splittext(spoken_message, " ")
+ var/yell_suffix = copytext(spoken_message, findtext(spoken_message, "!"))
+ spoken_message = ""
+
+ for(var/ind = 1 to length(words))
+ var/new_word = ""
+ for(var/i = 1 to length(words[ind]) + rand(-1,1))
+ new_word += "m"
+ new_word += "f"
+ words[ind] = yell_suffix ? uppertext(new_word) : new_word
+ spoken_message = "[jointext(words, " ")][yell_suffix]"
+ speech_args[SPEECH_MESSAGE] = spoken_message
diff --git a/code/datums/elements/relay_attackers.dm b/code/datums/elements/relay_attackers.dm
index 5f5bf7ed5893f..fd87cb3bc2c8e 100644
--- a/code/datums/elements/relay_attackers.dm
+++ b/code/datums/elements/relay_attackers.dm
@@ -85,7 +85,7 @@
SIGNAL_HANDLER
relay_attacker(target, attacker, ATTACKER_DAMAGING_ATTACK)
-/datum/element/relay_attackers/proc/on_attack_mech(atom/target, obj/vehicle/sealed/mecha/mecha_attacker, mob/living/pilot)
+/datum/element/relay_attackers/proc/on_attack_mech(atom/target, obj/vehicle/sealed/mecha/mecha_attacker, mob/living/pilot, mecha_attack_cooldown)
SIGNAL_HANDLER
relay_attacker(target, mecha_attacker, ATTACKER_DAMAGING_ATTACK)
diff --git a/code/datums/emotes.dm b/code/datums/emotes.dm
index 36d405450af15..7006d6d6daa71 100644
--- a/code/datums/emotes.dm
+++ b/code/datums/emotes.dm
@@ -38,8 +38,6 @@
var/emote_type = EMOTE_VISIBLE
/// Checks if the mob can use its hands before performing the emote.
var/hands_use_check = FALSE
- /// Will only work if the emote is EMOTE_AUDIBLE.
- var/muzzle_ignore = FALSE
/// Types that are allowed to use that emote.
var/list/mob_type_allowed_typecache = /mob
/// Types that are NOT allowed to use that emote.
@@ -90,7 +88,7 @@
/datum/emote/proc/run_emote(mob/user, params, type_override, intentional = FALSE)
if(!can_run_emote(user, TRUE, intentional))
return FALSE
- if(SEND_SIGNAL(user, COMSIG_MOB_PRE_EMOTED, key, params, type_override, intentional) & COMPONENT_CANT_EMOTE)
+ if(SEND_SIGNAL(user, COMSIG_MOB_PRE_EMOTED, key, params, type_override, intentional, src) & COMPONENT_CANT_EMOTE)
return TRUE // We don't return FALSE because the error output would be incorrect, provide your own if necessary.
var/msg = select_message_type(user, message, intentional)
if(params && message_param)
@@ -259,8 +257,6 @@
return .
var/mob/living/living_user = user
- if(!muzzle_ignore && user.is_muzzled() && emote_type & EMOTE_AUDIBLE)
- return "makes a [pick("strong ", "weak ", "")]noise."
if(HAS_MIND_TRAIT(user, TRAIT_MIMING) && message_mime)
. = message_mime
if(isalienadult(user) && message_alien)
@@ -338,9 +334,7 @@
* Returns a bool about whether or not the user should play a sound when performing the emote.
*/
/datum/emote/proc/should_play_sound(mob/user, intentional = FALSE)
- if(emote_type & EMOTE_AUDIBLE && !muzzle_ignore)
- if(user.is_muzzled())
- return FALSE
+ if(emote_type & EMOTE_AUDIBLE && !hands_use_check)
if(HAS_TRAIT(user, TRAIT_MUTE))
return FALSE
if(ishuman(user))
diff --git a/code/datums/id_trim/ruins.dm b/code/datums/id_trim/ruins.dm
index de58590ba8a9f..36284e06b72c4 100644
--- a/code/datums/id_trim/ruins.dm
+++ b/code/datums/id_trim/ruins.dm
@@ -27,7 +27,7 @@
/// Trim for the oldstation ruin/Charlie station to access APCs and other equipment
/datum/id_trim/away/old/equipment
- access = list(ACCESS_AWAY_GENERAL, ACCESS_ENGINEERING, ACCESS_ENGINE_EQUIP)
+ access = list(ACCESS_AWAY_GENERAL, ACCESS_AWAY_ENGINEERING, ACCESS_ENGINEERING, ACCESS_ENGINE_EQUIP)
assignment = "Engine Equipment Access"
/// Trim for the oldstation ruin/Charlie station to access robots, and downloading of paper publishing software for experiments
diff --git a/code/datums/mutations/_combined.dm b/code/datums/mutations/_combined.dm
index 534d94550c41b..baa7c2c1215b5 100644
--- a/code/datums/mutations/_combined.dm
+++ b/code/datums/mutations/_combined.dm
@@ -50,5 +50,5 @@
result = /datum/mutation/human/martyrdom
/datum/generecipe/heckacious
- required = "/datum/mutation/human/wacky; /datum/mutation/human/trichromatic"
+ required = "/datum/mutation/human/wacky; /datum/mutation/human/stoner"
result = /datum/mutation/human/heckacious
diff --git a/code/datums/mutations/reach.dm b/code/datums/mutations/reach.dm
index 5186a1be0627a..1c46976e76bee 100644
--- a/code/datums/mutations/reach.dm
+++ b/code/datums/mutations/reach.dm
@@ -66,7 +66,7 @@
/// signal sent when prompting if an item can be equipped
/datum/mutation/human/elastic_arms/proc/on_owner_equipping_item(mob/living/carbon/human/owner, obj/item/pick_item)
SIGNAL_HANDLER
- if(pick_item.w_class > WEIGHT_CLASS_BULKY) // cant decide if i should limit to huge or bulky.
+ if((pick_item.w_class > WEIGHT_CLASS_BULKY) && !(pick_item.item_flags & ABSTRACT|HAND_ITEM)) // cant decide if i should limit to huge or bulky.
pick_item.balloon_alert(owner, "arms too floppy to wield!")
return COMPONENT_LIVING_CANT_PUT_IN_HAND
diff --git a/code/datums/mutations/speech.dm b/code/datums/mutations/speech.dm
index 5b917aa1397b9..98560bb252679 100644
--- a/code/datums/mutations/speech.dm
+++ b/code/datums/mutations/speech.dm
@@ -40,24 +40,13 @@
speech_args[SPEECH_SPANS] |= SPAN_SANS
-// Lower rust floor probability
-// Make it only happen on open turf
-// Add early return to wall hitting
-// Fix throw at on cult sac
-// Reduce tochat prob on rust floor
-// add trait rusty to windows
-// aim assist on rc doesnt work
-// also in general
-// give master seek to rusted harvester
-
/datum/mutation/human/heckacious
name = "heckacious larincks"
desc = "duge what is WISH your words man..........."
quality = MINOR_NEGATIVE
- text_gain_indication = span_sans(span_red("aw SHIT man. your throat feels like FUCKASS."))
+ text_gain_indication = span_sans("aw SHIT man. your throat feels like FUCKASS.")
text_lose_indication = span_notice("The demonic entity possessing your larynx has finally released its grasp.")
locked = TRUE
- conflicts = list(/datum/mutation/human/trichromatic) // they both modify with the same spans. also would be way too annoying
/datum/mutation/human/heckacious/on_acquiring(mob/living/carbon/human/owner)
if(..())
@@ -111,11 +100,15 @@
// Random caps
if(prob(10))
- editing_word = uppertext(editing_word)
+ editing_word = prob(85) ? uppertext(editing_word) : LOWER_TEXT(editing_word)
// some times....... we add DOTS...
if(prob(10))
for(var/dotnum in 1 to rand(2, 8))
editing_word += "."
+ // change for bold/italics/underline as well!
+ if(prob(10))
+ var/extra_emphasis = pick("+", "_", "|")
+ editing_word = extra_emphasis + editing_word + extra_emphasis
// If no replacement we do it manually
if(!word_edited)
@@ -133,9 +126,6 @@
patchword += replacetext(editing_word[letter], "", editing_word[letter] + editing_word[letter])
editing_word = patchword
- // Some words are randomly recolored and resized so they get a few of these
- editing_word = span_class_handler(editing_word)
-
LAZYADD(edited_message_words, editing_word)
var/edited_message = jointext(edited_message_words, " ")
@@ -144,74 +134,6 @@
speech_args[SPEECH_MESSAGE] = message
-/datum/mutation/human/heckacious/proc/span_class_handler(message, looped = FALSE)
- // Sadly combining span colors will not combine the colors of the message
- if(prob(15))
- switch(rand(1,3))
- if(1)
- message = span_red(message)
- if(2)
- message = span_blue(message)
- if(3)
- message = span_green(message)
- if(prob(15))
- switch(rand(1,2))
- if(1)
- message = span_big(message)
- if(2)
- message = span_small(message)
- // do it AGAIN
- if(prob(40))
- span_class_handler(message, looped = TRUE)
- return message
-
-/datum/mutation/human/trichromatic
- name = "Trichromatic Larynx"
- desc = "A strange mutation originating from Clown Planet which alters the color of the patient's vocal chords."
- quality = MINOR_NEGATIVE
- text_gain_indication = span_red("You") + span_blue(" feel ") + span_green("Weird.")
- text_lose_indication = span_notice("Your colors feel normal again.")
- conflicts = list(/datum/mutation/human/heckacious)
-
-/datum/mutation/human/trichromatic/on_acquiring(mob/living/carbon/human/owner)
- if(..())
- return
- RegisterSignal(owner, COMSIG_MOB_SAY, PROC_REF(handle_speech))
-
-/datum/mutation/human/trichromatic/on_losing(mob/living/carbon/human/owner)
- if(..())
- return
- UnregisterSignal(owner, COMSIG_MOB_SAY)
-
-/datum/mutation/human/trichromatic/proc/handle_speech(datum/source, list/speech_args)
- SIGNAL_HANDLER
-
- var/message = speech_args[SPEECH_MESSAGE]
-
- var/list/message_words = splittext(message, " ")
- var/list/static/span_combo_list = list("green", "red", "blue")
- var/words_key = 1
- for(var/i in message_words)
- message_words[words_key] = span_class_handler(message_words[words_key])
- words_key++
-
- var/edited_message = jointext(message_words, " ")
-
- message = trim(edited_message)
-
- speech_args[SPEECH_MESSAGE] = message
-
-/datum/mutation/human/trichromatic/proc/span_class_handler(message)
- // Sadly combining span colors will not combine the colors of the message
- switch(rand(1,3))
- if(1)
- message = span_red(message)
- if(2)
- message = span_blue(message)
- if(3)
- message = span_green(message)
- return message
-
/datum/mutation/human/mute
name = "Mute"
desc = "Completely inhibits the vocal section of the brain."
@@ -369,7 +291,6 @@
name = "Stoner"
desc = "A common mutation that severely decreases intelligence."
quality = NEGATIVE
- locked = TRUE
text_gain_indication = span_notice("You feel...totally chill, man!")
text_lose_indication = span_notice("You feel like you have a better sense of time.")
diff --git a/code/datums/mutations/touch.dm b/code/datums/mutations/touch.dm
index d80510fb1feec..fb2e34b9492f2 100644
--- a/code/datums/mutations/touch.dm
+++ b/code/datums/mutations/touch.dm
@@ -142,8 +142,8 @@
// If you crunch the numbers it sounds crazy good,
// but I think that's a fair reward for combining the efforts of Genetics, Medbay, and Mining to reach a hidden mechanic.
if(HAS_TRAIT_FROM(mendicant, TRAIT_HIPPOCRATIC_OATH, HIPPOCRATIC_OATH_TRAIT))
- heal_multiplier *= 2
- pain_multiplier *= 0.5
+ heal_multiplier = 2
+ pain_multiplier = 0.5
to_chat(mendicant, span_green("You can feel the magic of the Rod of Aesculapius aiding your efforts!"))
beam_icon = "sendbeam"
var/obj/item/rod_of_asclepius/rod = locate() in mendicant.contents
@@ -154,8 +154,8 @@
// If a normal pacifist, heal and hurt more!
else if(HAS_TRAIT(mendicant, TRAIT_PACIFISM))
- heal_multiplier *= 1.75
- pain_multiplier *= 1.75
+ heal_multiplier = 1.75
+ pain_multiplier = 1.75
to_chat(mendicant, span_green("Your peaceful nature helps you guide all the pain to yourself."))
var/success
@@ -165,7 +165,7 @@
success = do_simple_heal(mendicant, hurtguy, heal_multiplier, pain_multiplier)
// Both types can be ignited (technically at least), so we can just do this here.
- if(hurtguy.has_status_effect(/datum/status_effect/fire_handler/fire_stacks))
+ if(hurtguy.fire_stacks > 0)
mendicant.set_fire_stacks(hurtguy.fire_stacks * pain_multiplier, remove_wet_stacks = TRUE)
if(hurtguy.on_fire)
mendicant.ignite_mob()
@@ -201,7 +201,7 @@
if(IS_ORGANIC_LIMB(possible_limb))
mendicant_organic_limbs += possible_limb
// None? Gtfo
- if(isnull(mendicant_organic_limbs))
+ if(!length(mendicant_organic_limbs))
return .
// Try to use our active hand, otherwise pick at random
diff --git a/code/datums/shuttles/hunter.dm b/code/datums/shuttles/hunter.dm
index d8b7f708324e2..ade978c937e07 100644
--- a/code/datums/shuttles/hunter.dm
+++ b/code/datums/shuttles/hunter.dm
@@ -17,3 +17,7 @@
/datum/map_template/shuttle/hunter/psyker
suffix = "psyker"
name = "Psyker Fortune-Telling Ship"
+
+/datum/map_template/shuttle/hunter/mi13_foodtruck
+ suffix = "mi13_foodtruck"
+ name = "Perfectly Ordinary Food Truck"
diff --git a/code/datums/wounds/cranial_fissure.dm b/code/datums/wounds/cranial_fissure.dm
index 9bd9969f428cd..0b7c00dee7e32 100644
--- a/code/datums/wounds/cranial_fissure.dm
+++ b/code/datums/wounds/cranial_fissure.dm
@@ -12,10 +12,16 @@
viable_zones = list(BODY_ZONE_HEAD)
/datum/wound_pregen_data/cranial_fissure/get_weight(obj/item/bodypart/limb, woundtype, damage, attack_direction, damage_source)
- if (limb.owner?.stat < HARD_CRIT)
- return 0
+ if (isnull(limb.owner))
+ return ..()
- return ..()
+ if (HAS_TRAIT(limb.owner, TRAIT_CURSED) && (limb.get_mangled_state() & BODYPART_MANGLED_INTERIOR))
+ return ..()
+
+ if (limb.owner.stat >= HARD_CRIT)
+ return ..()
+
+ return 0
/// A wound applied when receiving significant enough damage to the head.
/// Will allow other players to take your eyes out of your head, and slipping
diff --git a/code/game/area/areas.dm b/code/game/area/areas.dm
index 51d660af0459f..36ce8c5a24fe4 100644
--- a/code/game/area/areas.dm
+++ b/code/game/area/areas.dm
@@ -540,39 +540,9 @@ GLOBAL_LIST_EMPTY(teleportlocs)
for(var/atom/movable/recipient as anything in arrived.important_recursive_contents[RECURSIVE_CONTENTS_AREA_SENSITIVE])
SEND_SIGNAL(recipient, COMSIG_ENTER_AREA, src)
- if(!isliving(arrived))
- return
-
- var/mob/living/L = arrived
- if(!L.ckey)
- return
-
- if(ambient_buzz != old_area.ambient_buzz)
- L.refresh_looping_ambience()
-
-///Tries to play looping ambience to the mobs.
-/mob/proc/refresh_looping_ambience()
- if(!client) //if a tree falls in the woods...
- return
- var/area/my_area = get_area(src)
- var/sound_to_use = my_area.ambient_buzz
-
- if(!sound_to_use || !(client.prefs.read_preference(/datum/preference/toggle/sound_ship_ambience)))
- SEND_SOUND(src, sound(null, repeat = 0, wait = 0, channel = CHANNEL_BUZZ))
- client.current_ambient_sound = null
- return
-
- if(!can_hear())
- SEND_SOUND(src, sound(null, repeat = 0, wait = 0, channel = CHANNEL_BUZZ))
- client.current_ambient_sound = null
- return
-
- if(sound_to_use == client.current_ambient_sound)
- return //don't reset current loops.
-
- client.current_ambient_sound = sound_to_use
- SEND_SOUND(src, sound(sound_to_use, repeat = 1, wait = 0, volume = my_area.ambient_buzz_vol, channel = CHANNEL_BUZZ))
-
+ if(ismob(arrived))
+ var/mob/mob = arrived
+ mob.update_ambience_area(src)
/**
* Called when an atom exits an area
diff --git a/code/game/area/areas/shuttles.dm b/code/game/area/areas/shuttles.dm
index e27d330ae250e..504efe0742ad1 100644
--- a/code/game/area/areas/shuttles.dm
+++ b/code/game/area/areas/shuttles.dm
@@ -73,6 +73,11 @@
name = "Russian Cargo Hauler"
requires_power = TRUE
+/area/shuttle/hunter/mi13_foodtruck
+ name = "Perfectly Ordinary Food Truck"
+ requires_power = TRUE
+ ambience_index = AMBIENCE_DANGER
+
////////////////////////////White Ship////////////////////////////
/area/shuttle/abandoned
diff --git a/code/game/machinery/computer/apc_control.dm b/code/game/machinery/computer/apc_control.dm
index 2b5cfa14c7c28..97bf368d3e25e 100644
--- a/code/game/machinery/computer/apc_control.dm
+++ b/code/game/machinery/computer/apc_control.dm
@@ -205,3 +205,6 @@
. = ..()
if(active_apc)
disconnect_apc()
+
+/obj/machinery/computer/apc_control/away
+ req_access = list(ACCESS_AWAY_ENGINEERING)
diff --git a/code/game/machinery/computer/arcade/battle.dm b/code/game/machinery/computer/arcade/battle.dm
index b97dac9e15dad..9733759b5caf4 100644
--- a/code/game/machinery/computer/arcade/battle.dm
+++ b/code/game/machinery/computer/arcade/battle.dm
@@ -505,7 +505,7 @@
return TRUE
if(BATTLE_ARCADE_PLAYER_HEAVY_ATTACK)
if(player_current_mp < SPELL_MP_COST)
- say("You don't have enough MP to counterattack!")
+ say("You don't have enough MP to heavy attack!")
player_turn = TRUE
return TRUE
player_current_mp -= SPELL_MP_COST
diff --git a/code/game/machinery/doors/brigdoors.dm b/code/game/machinery/doors/brigdoors.dm
index 34a161acac1b3..26dc09204a70c 100644
--- a/code/game/machinery/doors/brigdoors.dm
+++ b/code/game/machinery/doors/brigdoors.dm
@@ -173,21 +173,21 @@
* * seconds - Return the time in seconds if TRUE, else deciseconds.
*/
/obj/machinery/status_display/door_timer/proc/time_left(seconds = FALSE)
- . = max(0, timer_duration + activation_time - world.time)
+ . = max(0, timer_duration + (activation_time ? activation_time - world.time : 0))
if(seconds)
. /= (1 SECONDS)
/**
* Set the timer. Does NOT automatically start counting down, but does update the display.
*
- * returns TRUE if no change occurred
+ * returns FALSE if no change occurred
*
* Arguments:
* value - time in deciseconds to set the timer for.
*/
/obj/machinery/status_display/door_timer/proc/set_timer(value)
- var/new_time = clamp(value, 0, MAX_TIMER + world.time - activation_time)
- . = new_time == timer_duration //return 1 on no change
+ var/new_time = clamp(value, 0, MAX_TIMER)
+ . = new_time != timer_duration //return 1 on change
timer_duration = new_time
update_content()
diff --git a/code/game/machinery/doors/windowdoor.dm b/code/game/machinery/doors/windowdoor.dm
index 4c1d4ad2d5154..8dca3d1bdadb2 100644
--- a/code/game/machinery/doors/windowdoor.dm
+++ b/code/game/machinery/doors/windowdoor.dm
@@ -111,9 +111,9 @@
return
autoclose = TRUE
if(check_access(null))
- sleep(5 SECONDS)
+ sleep(8 SECONDS)
else //secure doors close faster
- sleep(2 SECONDS)
+ sleep(5 SECONDS)
if(!density && autoclose) //did someone change state while we slept?
close()
diff --git a/code/game/machinery/lightswitch.dm b/code/game/machinery/lightswitch.dm
index f9075b4318fac..04883800f31ef 100644
--- a/code/game/machinery/lightswitch.dm
+++ b/code/game/machinery/lightswitch.dm
@@ -42,8 +42,8 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/light_switch, 26)
if(isnull(held_item))
context[SCREENTIP_CONTEXT_LMB] = area.lightswitch ? "Flick off" : "Flick on"
return CONTEXTUAL_SCREENTIP_SET
- if(held_item.tool_behaviour != TOOL_SCREWDRIVER)
- context[SCREENTIP_CONTEXT_RMB] = "Deconstruct"
+ if(held_item.tool_behaviour == TOOL_SCREWDRIVER)
+ context[SCREENTIP_CONTEXT_LMB] = "Deconstruct"
return CONTEXTUAL_SCREENTIP_SET
return .
@@ -69,17 +69,20 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/light_switch, 26)
/obj/machinery/light_switch/examine(mob/user)
. = ..()
. += "It is [(machine_stat & NOPOWER) ? "unpowered" : (area.lightswitch ? "on" : "off")]."
+ . += span_notice("It's screwed and secured to the wall.")
/obj/machinery/light_switch/interact(mob/user)
. = ..()
set_lights(!area.lightswitch)
-/obj/machinery/light_switch/attackby_secondary(obj/item/weapon, mob/user, params)
- if(weapon.tool_behaviour == TOOL_SCREWDRIVER)
- to_chat(user, "You pop \the [src] off the wall.")
- deconstruct()
- return COMPONENT_CANCEL_ATTACK_CHAIN
- return ..()
+/obj/machinery/light_switch/screwdriver_act(mob/living/user, obj/item/tool)
+ user.visible_message(span_notice("[user] starts unscrewing [src]..."), span_notice("You start unscrewing [src]..."))
+ if(!tool.use_tool(src, user, 40, volume = 50))
+ return ITEM_INTERACT_BLOCKING
+ user.visible_message(span_notice("[user] unscrews [src]!"), span_notice("You detach [src] from the wall."))
+ playsound(src, 'sound/items/deconstruct.ogg', 50, TRUE)
+ deconstruct(TRUE)
+ return ITEM_INTERACT_SUCCESS
/obj/machinery/light_switch/proc/set_lights(status)
if(area.lightswitch == status)
diff --git a/code/game/machinery/shieldgen.dm b/code/game/machinery/shieldgen.dm
index 4e7a80e166388..d961c68dc8ed6 100644
--- a/code/game/machinery/shieldgen.dm
+++ b/code/game/machinery/shieldgen.dm
@@ -286,6 +286,10 @@
icon = 'icons/obj/machines/shield_generator.dmi'
icon_state = "shield_wall_gen"
base_icon_state = "shield_wall_gen"
+ light_on = FALSE
+ light_range = 2.5
+ light_power = 2
+ light_color = LIGHT_COLOR_BLUE
anchored = FALSE
density = TRUE
req_access = list(ACCESS_TELEPORTER)
@@ -325,6 +329,10 @@
RegisterSignal(src, COMSIG_ATOM_SINGULARITY_TRY_MOVE, PROC_REF(block_singularity_if_active))
set_wires(new /datum/wires/shieldwallgen(src))
+/obj/machinery/power/shieldwallgen/update_appearance(updates)
+ . = ..()
+ set_light(l_on = !!active)
+
/obj/machinery/power/shieldwallgen/update_icon_state()
icon_state = "[base_icon_state][active ? "_on" : ""]"
return ..()
@@ -530,7 +538,10 @@
icon_state = "shieldwall"
density = TRUE
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
- light_range = 3
+ light_range = 2.5
+ light_power = 0.7
+ light_color = LIGHT_COLOR_BLUE
+ var/primary_direction = NONE
var/needs_power = FALSE
var/obj/machinery/power/shieldwallgen/gen_primary
var/obj/machinery/power/shieldwallgen/gen_secondary
@@ -554,6 +565,10 @@
gen_secondary = null
return ..()
+/obj/machinery/shieldwall/update_overlays()
+ . = ..()
+ . += emissive_appearance(icon, icon_state, src, alpha = 200)
+
/obj/machinery/shieldwall/process()
if(needs_power)
if(!gen_primary || !gen_primary.active || !gen_secondary || !gen_secondary.active)
diff --git a/code/game/objects/effects/decals/cleanable/misc.dm b/code/game/objects/effects/decals/cleanable/misc.dm
index fcc4afa14944d..04da0c517b0a6 100644
--- a/code/game/objects/effects/decals/cleanable/misc.dm
+++ b/code/game/objects/effects/decals/cleanable/misc.dm
@@ -81,11 +81,11 @@
if(T.tiled_dirt)
smoothing_flags = SMOOTH_BITMASK
QUEUE_SMOOTH(src)
- if(smoothing_flags & (SMOOTH_CORNERS|SMOOTH_BITMASK))
+ if(smoothing_flags & USES_SMOOTHING)
QUEUE_SMOOTH_NEIGHBORS(src)
/obj/effect/decal/cleanable/dirt/Destroy()
- if(smoothing_flags & (SMOOTH_CORNERS|SMOOTH_BITMASK))
+ if(smoothing_flags & USES_SMOOTHING)
QUEUE_SMOOTH_NEIGHBORS(src)
return ..()
diff --git a/code/game/objects/items/extinguisher.dm b/code/game/objects/items/extinguisher.dm
index ac309e275d77c..1e879d4422ced 100644
--- a/code/game/objects/items/extinguisher.dm
+++ b/code/game/objects/items/extinguisher.dm
@@ -190,7 +190,7 @@
balloon_alert(user, "already full!")
return TRUE
// Make sure we're refilling with the proper chem.
- if(!(target.reagents.has_reagent(chem)))
+ if(!(target.reagents.has_reagent(chem, check_subtypes = TRUE)))
balloon_alert(user, "can't refill with this liquid!")
return TRUE
var/obj/structure/reagent_dispensers/W = target //will it work?
diff --git a/code/game/objects/items/handcuffs.dm b/code/game/objects/items/handcuffs.dm
index d3e8bdd0ad88d..5b74053299931 100644
--- a/code/game/objects/items/handcuffs.dm
+++ b/code/game/objects/items/handcuffs.dm
@@ -537,6 +537,8 @@
gender = NEUTER
///Amount of time to knock the target down for once it's hit in deciseconds.
var/knockdown = 0
+ ///Reference of the mob we will attempt to snare
+ var/datum/weakref/ensnare_mob_ref
/obj/item/restraints/legcuffs/bola/throw_at(atom/target, range, speed, mob/thrower, spin=1, diagonals_first = 0, datum/callback/callback, gentle = FALSE, quickstart = TRUE)
if(!..())
@@ -546,21 +548,32 @@
/obj/item/restraints/legcuffs/bola/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum)
if(..() || !iscarbon(hit_atom))//if it gets caught or the target can't be cuffed,
return//abort
- ensnare(hit_atom)
+ //The mob has been hit, save the reference for ensnaring
+ ensnare_mob_ref = WEAKREF(hit_atom)
+
+/obj/item/restraints/legcuffs/bola/after_throw(datum/callback/callback)
+ . = ..()
+ if (isnull(ensnare_mob_ref))
+ return
+ var/atom/ensnare_mob = ensnare_mob_ref.resolve()
+ if (!isnull(ensnare_mob))
+ ensnare(ensnare_mob)
+ ensnare_mob_ref = null
/**
* Attempts to legcuff someone with the bola
*
* Arguments:
- * * C - the carbon that we will try to ensnare
+ * * snared_mob - the carbon that we will try to ensnare
*/
-/obj/item/restraints/legcuffs/bola/proc/ensnare(mob/living/carbon/C)
- if(!C.legcuffed && C.num_legs >= 2)
- visible_message(span_danger("\The [src] ensnares [C]!"), span_userdanger("\The [src] ensnares you!"))
- C.equip_to_slot(src, ITEM_SLOT_LEGCUFFED)
- SSblackbox.record_feedback("tally", "handcuffs", 1, type)
- C.Knockdown(knockdown)
- playsound(src, 'sound/effects/snap.ogg', 50, TRUE)
+/obj/item/restraints/legcuffs/bola/proc/ensnare(mob/living/carbon/snared_mob)
+ if(snared_mob.legcuffed || snared_mob.num_legs < 2)
+ return
+ visible_message(span_danger("\The [src] ensnares [snared_mob]!"), span_userdanger("\The [src] ensnares you!"))
+ snared_mob.equip_to_slot(src, ITEM_SLOT_LEGCUFFED)
+ SSblackbox.record_feedback("tally", "handcuffs", 1, type)
+ snared_mob.Knockdown(knockdown)
+ playsound(src, 'sound/effects/snap.ogg', 50, TRUE)
/**
* A traitor variant of the bola.
diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm
index cc9bc3bcb9659..d32df2562402f 100644
--- a/code/game/objects/items/stacks/sheets/sheet_types.dm
+++ b/code/game/objects/items/stacks/sheets/sheet_types.dm
@@ -87,9 +87,9 @@ GLOBAL_LIST_INIT(metal_recipes, list ( \
new/datum/stack_recipe("wall girders (anchored)", /obj/structure/girder, 2, time = 4 SECONDS, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ONE_PER_TURF | CRAFT_ON_SOLID_GROUND, placement_checks = STACK_CHECK_TRAM_FORBIDDEN, trait_booster = TRAIT_QUICK_BUILD, trait_modifier = 0.75, category = CAT_STRUCTURE), \
null, \
null, \
- new/datum/stack_recipe("computer frame", /obj/structure/frame/computer, 5, time = 2.5 SECONDS, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ONE_PER_TURF | CRAFT_ON_SOLID_GROUND, category = CAT_EQUIPMENT), \
- new/datum/stack_recipe("modular console", /obj/machinery/modular_computer, 10, time = 2.5 SECONDS, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ONE_PER_TURF | CRAFT_ON_SOLID_GROUND, category = CAT_EQUIPMENT), \
- new/datum/stack_recipe("machine frame", /obj/structure/frame/machine, 5, time = 2.5 SECONDS, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ONE_PER_TURF | CRAFT_ON_SOLID_GROUND, category = CAT_EQUIPMENT), \
+ new/datum/stack_recipe("computer frame", /obj/structure/frame/computer, 5, time = 2.5 SECONDS, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ONE_PER_TURF | CRAFT_ON_SOLID_GROUND, category = CAT_STRUCTURE), \
+ new/datum/stack_recipe("modular console", /obj/machinery/modular_computer, 10, time = 2.5 SECONDS, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ONE_PER_TURF | CRAFT_ON_SOLID_GROUND, category = CAT_STRUCTURE), \
+ new/datum/stack_recipe("machine frame", /obj/structure/frame/machine, 5, time = 2.5 SECONDS, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ONE_PER_TURF | CRAFT_ON_SOLID_GROUND, category = CAT_STRUCTURE), \
null, \
new /datum/stack_recipe_list("airlock assemblies", list( \
new /datum/stack_recipe("standard airlock assembly", /obj/structure/door_assembly, 4, time = 5 SECONDS, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ONE_PER_TURF | CRAFT_ON_SOLID_GROUND, category = CAT_DOORS), \
@@ -113,24 +113,37 @@ GLOBAL_LIST_INIT(metal_recipes, list ( \
)), \
null, \
new/datum/stack_recipe("firelock frame", /obj/structure/firelock_frame, 3, time = 5 SECONDS, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ONE_PER_TURF | CRAFT_ON_SOLID_GROUND, category = CAT_DOORS), \
- new/datum/stack_recipe("turret frame", /obj/machinery/porta_turret_construct, 5, time = 2.5 SECONDS, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ONE_PER_TURF | CRAFT_ON_SOLID_GROUND, category = CAT_EQUIPMENT), \
- new/datum/stack_recipe("meatspike frame", /obj/structure/kitchenspike_frame, 5, time = 2.5 SECONDS, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ONE_PER_TURF | CRAFT_ON_SOLID_GROUND, category = CAT_EQUIPMENT), \
- new/datum/stack_recipe("reflector frame", /obj/structure/reflector, 5, time = 2.5 SECONDS, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ONE_PER_TURF | CRAFT_ON_SOLID_GROUND, category = CAT_EQUIPMENT), \
+ new/datum/stack_recipe("turret frame", /obj/machinery/porta_turret_construct, 5, time = 2.5 SECONDS, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ONE_PER_TURF | CRAFT_ON_SOLID_GROUND, category = CAT_STRUCTURE), \
+ new/datum/stack_recipe("meatspike frame", /obj/structure/kitchenspike_frame, 5, time = 2.5 SECONDS, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ONE_PER_TURF | CRAFT_ON_SOLID_GROUND, category = CAT_STRUCTURE), \
+ new/datum/stack_recipe("reflector frame", /obj/structure/reflector, 5, time = 2.5 SECONDS, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ONE_PER_TURF | CRAFT_ON_SOLID_GROUND, category = CAT_STRUCTURE), \
null, \
new/datum/stack_recipe("grenade casing", /obj/item/grenade/chem_grenade, crafting_flags = NONE, category = CAT_CHEMISTRY), \
- new/datum/stack_recipe("light fixture frame", /obj/item/wallframe/light_fixture, 2, crafting_flags = NONE, category = CAT_EQUIPMENT), \
- new/datum/stack_recipe("small light fixture frame", /obj/item/wallframe/light_fixture/small, 1, crafting_flags = NONE, category = CAT_EQUIPMENT), \
+ new/datum/stack_recipe("light fixture frame", /obj/item/wallframe/light_fixture, 2, crafting_flags = NONE, category = CAT_STRUCTURE), \
+ new/datum/stack_recipe("small light fixture frame", /obj/item/wallframe/light_fixture/small, 1, crafting_flags = NONE, category = CAT_STRUCTURE), \
null, \
- new/datum/stack_recipe("apc frame", /obj/item/wallframe/apc, 2, crafting_flags = NONE, category = CAT_EQUIPMENT), \
- new/datum/stack_recipe("air alarm frame", /obj/item/wallframe/airalarm, 2, crafting_flags = NONE, category = CAT_EQUIPMENT), \
- new/datum/stack_recipe("fire alarm frame", /obj/item/wallframe/firealarm, 2, crafting_flags = NONE, category = CAT_EQUIPMENT), \
- new/datum/stack_recipe("extinguisher cabinet frame", /obj/item/wallframe/extinguisher_cabinet, 2, crafting_flags = NONE, category = CAT_EQUIPMENT), \
- new/datum/stack_recipe("button frame", /obj/item/wallframe/button, 1, crafting_flags = NONE, category = CAT_EQUIPMENT), \
+ new/datum/stack_recipe("apc frame", /obj/item/wallframe/apc, 2, crafting_flags = NONE, category = CAT_STRUCTURE), \
+ new/datum/stack_recipe("air alarm frame", /obj/item/wallframe/airalarm, 2, crafting_flags = NONE, category = CAT_STRUCTURE), \
+ new/datum/stack_recipe("fire alarm frame", /obj/item/wallframe/firealarm, 2, crafting_flags = NONE, category = CAT_STRUCTURE), \
+ new/datum/stack_recipe("extinguisher cabinet frame", /obj/item/wallframe/extinguisher_cabinet, 2, crafting_flags = NONE, category = CAT_STRUCTURE), \
+ new/datum/stack_recipe("button frame", /obj/item/wallframe/button, 1, crafting_flags = NONE, category = CAT_STRUCTURE), \
+ new/datum/stack_recipe("light switch frame", /obj/item/wallframe/light_switch, 1, crafting_flags = NONE, category = CAT_STRUCTURE), \
+ new/datum/stack_recipe("sparker frame", /obj/item/wallframe/sparker, 1, crafting_flags = NONE, category = CAT_STRUCTURE), \
+ new/datum/stack_recipe("turret control frame", /obj/item/wallframe/turret_control, 6, crafting_flags = NONE, category = CAT_STRUCTURE), \
+ new/datum/stack_recipe("camera assembly", /obj/item/wallframe/camera, 1, crafting_flags = NONE, category = CAT_STRUCTURE), \
+ new/datum/stack_recipe("newscaster frame", /obj/item/wallframe/newscaster, 7, crafting_flags = NONE, category = CAT_STRUCTURE), \
+ new/datum/stack_recipe("status display frame", /obj/item/wallframe/status_display, 7, crafting_flags = NONE, category = CAT_STRUCTURE), \
+ new/datum/stack_recipe("intercom frame", /obj/item/wallframe/intercom, 2, crafting_flags = NONE, category = CAT_STRUCTURE), \
+ new/datum/stack_recipe("requests console frame", /obj/item/wallframe/requests_console, 7, crafting_flags = NONE, category = CAT_STRUCTURE), \
+ new/datum/stack_recipe("telescreen turbine frame", /obj/item/wallframe/telescreen/turbine, 7, crafting_flags = NONE, category = CAT_STRUCTURE), \
+ new/datum/stack_recipe("telescreen engine frame", /obj/item/wallframe/telescreen/engine, 7, crafting_flags = NONE, category = CAT_STRUCTURE), \
+ new/datum/stack_recipe("telescreen auxbase frame", /obj/item/wallframe/telescreen/auxbase, 7, crafting_flags = NONE, category = CAT_STRUCTURE), \
+ new/datum/stack_recipe("tram controller frame", /obj/item/wallframe/tram/controller, 20, crafting_flags = NONE, category = CAT_STRUCTURE), \
+ new/datum/stack_recipe("tram display frame", /obj/item/wallframe/indicator_display, 7, crafting_flags = NONE, category = CAT_STRUCTURE), \
null, \
new/datum/stack_recipe("iron door", /obj/structure/mineral_door/iron, 20, time = 5 SECONDS, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ONE_PER_TURF | CRAFT_ON_SOLID_GROUND | CRAFT_APPLIES_MATS, category = CAT_DOORS), \
new/datum/stack_recipe("filing cabinet", /obj/structure/filingcabinet, 2, time = 10 SECONDS, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ONE_PER_TURF | CRAFT_ON_SOLID_GROUND, category = CAT_FURNITURE), \
new/datum/stack_recipe("desk bell", /obj/structure/desk_bell, 2, time = 3 SECONDS, crafting_flags = NONE, category = CAT_FURNITURE), \
- new/datum/stack_recipe("floodlight frame", /obj/structure/floodlight_frame, 5, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ONE_PER_TURF | CRAFT_ON_SOLID_GROUND, category = CAT_EQUIPMENT), \
+ new/datum/stack_recipe("floodlight frame", /obj/structure/floodlight_frame, 5, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ONE_PER_TURF | CRAFT_ON_SOLID_GROUND, category = CAT_STRUCTURE), \
new/datum/stack_recipe("voting box", /obj/structure/votebox, 15, time = 5 SECONDS, crafting_flags = NONE, category = CAT_ENTERTAINMENT), \
new/datum/stack_recipe("pestle", /obj/item/pestle, 1, time = 5 SECONDS, crafting_flags = NONE, category = CAT_CHEMISTRY), \
new/datum/stack_recipe("hygienebot assembly", /obj/item/bot_assembly/hygienebot, 2, time = 5 SECONDS, crafting_flags = NONE, category = CAT_ROBOT), \
diff --git a/code/game/objects/items/stacks/tiles/tile_types.dm b/code/game/objects/items/stacks/tiles/tile_types.dm
index 073a35ed1013c..89e6cae389dbd 100644
--- a/code/game/objects/items/stacks/tiles/tile_types.dm
+++ b/code/game/objects/items/stacks/tiles/tile_types.dm
@@ -1075,6 +1075,11 @@
inhand_icon_state = "tile-bcircuit"
turf_type = /turf/open/floor/circuit
merge_type = /obj/item/stack/tile/circuit
+ tile_reskin_types = list(
+ /obj/item/stack/tile/circuit,
+ /obj/item/stack/tile/circuit/green,
+ /obj/item/stack/tile/circuit/red,
+ )
/obj/item/stack/tile/circuit/green
name = "green circuit tile"
diff --git a/code/game/objects/items/storage/backpack.dm b/code/game/objects/items/storage/backpack.dm
index 10c95056afffb..c01203e3d50fb 100644
--- a/code/game/objects/items/storage/backpack.dm
+++ b/code/game/objects/items/storage/backpack.dm
@@ -32,10 +32,6 @@
* Backpack Types
*/
-/obj/item/storage/backpack/old/Initialize(mapload)
- . = ..()
- atom_storage.max_total_storage = 12
-
/obj/item/bag_of_holding_inert
name = "inert bag of holding"
desc = "What is currently a just an unwieldly block of metal with a slot ready to accept a bluespace anomaly core."
diff --git a/code/game/objects/items/tanks/tank_types.dm b/code/game/objects/items/tanks/tank_types.dm
index 70c0ea0822a41..40989915a68ce 100644
--- a/code/game/objects/items/tanks/tank_types.dm
+++ b/code/game/objects/items/tanks/tank_types.dm
@@ -77,6 +77,14 @@
. += span_notice("A warning is etched into [src]...")
. += span_warning("There is no process in the body that uses N2O, so patients will exhale the N2O... exposing you to it. Make sure to work in a well-ventilated space to avoid sleepy mishaps.")
+/obj/item/tank/internals/anesthetic/pure
+ desc = "A tank with pure N2O. There is a warning sticker crudely slapped onto the tank."
+ icon_state = "anesthetic_warning"
+
+/obj/item/tank/internals/anesthetic/pure/populate_gas()
+ air_contents.assert_gases(/datum/gas/nitrous_oxide)
+ air_contents.gases[/datum/gas/nitrous_oxide][MOLES] = (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)
+
/*
* Plasma
*/
diff --git a/code/game/objects/items/theft_tools.dm b/code/game/objects/items/theft_tools.dm
index 41edfaea37e88..e13251fe8e5ea 100644
--- a/code/game/objects/items/theft_tools.dm
+++ b/code/game/objects/items/theft_tools.dm
@@ -247,13 +247,6 @@
if(ismob(loc))
to_chat(loc, span_warning("[src] is permanently sealed, [sliver] is safely contained."))
-/obj/item/nuke_core_container/supermatter/attackby(obj/item/hemostat/supermatter/tongs, mob/user)
- if(istype(tongs))
- //try to load shard into core
- load(tongs, user)
- else
- return ..()
-
/obj/item/scalpel/supermatter
name = "supermatter scalpel"
desc = "A scalpel with a fragile tip of condensed hyper-noblium gas, searingly cold to the touch, that can safely shave a sliver off a supermatter crystal."
@@ -295,11 +288,15 @@
/obj/item/hemostat/supermatter/interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers)
if(!sliver)
- return NONE
+ return ..()
+ if (istype(interacting_with, /obj/item/nuke_core_container/supermatter))
+ var/obj/item/nuke_core_container/supermatter/container = interacting_with
+ container.load(src, user)
+ return ITEM_INTERACT_SUCCESS
if(ismovable(interacting_with) && interacting_with != sliver)
Consume(interacting_with, user)
return ITEM_INTERACT_SUCCESS
- return NONE
+ return ..()
/obj/item/hemostat/supermatter/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum) // no instakill supermatter javelins
if(sliver)
diff --git a/code/game/objects/structures.dm b/code/game/objects/structures.dm
index f43cc8dfa1cd4..ff6e6e171bb06 100644
--- a/code/game/objects/structures.dm
+++ b/code/game/objects/structures.dm
@@ -19,7 +19,7 @@
/obj/structure/Initialize(mapload)
. = ..()
- if(smoothing_flags & (SMOOTH_CORNERS|SMOOTH_BITMASK))
+ if(smoothing_flags & USES_SMOOTHING)
QUEUE_SMOOTH(src)
QUEUE_SMOOTH_NEIGHBORS(src)
if(smoothing_flags & SMOOTH_CORNERS)
@@ -28,7 +28,7 @@
/obj/structure/Destroy(force)
GLOB.cameranet.updateVisibility(src)
- if(smoothing_flags & (SMOOTH_CORNERS|SMOOTH_BITMASK))
+ if(smoothing_flags & USES_SMOOTHING)
QUEUE_SMOOTH_NEIGHBORS(src)
return ..()
diff --git a/code/game/objects/structures/bedsheet_bin.dm b/code/game/objects/structures/bedsheet_bin.dm
index 32ed0d14d873b..5e6b35531f182 100644
--- a/code/game/objects/structures/bedsheet_bin.dm
+++ b/code/game/objects/structures/bedsheet_bin.dm
@@ -581,6 +581,10 @@ LINEN BINS
anchored = FALSE
+/obj/structure/bedsheetbin/Initialize(mapload)
+ . = ..()
+ register_context()
+
/obj/structure/bedsheetbin/examine(mob/user)
. = ..()
if(amount < 1)
@@ -590,6 +594,28 @@ LINEN BINS
else
. += "There are [amount] bed sheets in the bin."
+/obj/structure/bedsheetbin/add_context(atom/source, list/context, obj/item/held_item, mob/living/user)
+ if(isnull(held_item))
+ if(amount)
+ context[SCREENTIP_CONTEXT_LMB] = "Take bedsheet"
+ return CONTEXTUAL_SCREENTIP_SET
+ return
+
+ if(istype(held_item, /obj/item/bedsheet))
+ context[SCREENTIP_CONTEXT_LMB] = "Put in"
+ return CONTEXTUAL_SCREENTIP_SET
+
+ if(held_item.tool_behaviour == TOOL_SCREWDRIVER)
+ context[SCREENTIP_CONTEXT_RMB] = "Disassemble"
+ . = CONTEXTUAL_SCREENTIP_SET
+ else if(held_item.tool_behaviour == TOOL_WRENCH)
+ context[SCREENTIP_CONTEXT_RMB] = "[anchored ? "Una" : "A"]nchor"
+ . = CONTEXTUAL_SCREENTIP_SET
+
+ if(amount && held_item.w_class < WEIGHT_CLASS_BULKY)
+ context[SCREENTIP_CONTEXT_LMB] = "Hide item in"
+ . = CONTEXTUAL_SCREENTIP_SET
+ return .
/obj/structure/bedsheetbin/update_icon_state()
switch(amount)
@@ -607,7 +633,7 @@ LINEN BINS
update_appearance()
..()
-/obj/structure/bedsheetbin/screwdriver_act(mob/living/user, obj/item/tool)
+/obj/structure/bedsheetbin/screwdriver_act_secondary(mob/living/user, obj/item/tool)
if(amount)
to_chat(user, span_warning("The [src] must be empty first!"))
return ITEM_INTERACT_SUCCESS
@@ -617,27 +643,45 @@ LINEN BINS
qdel(src)
return ITEM_INTERACT_SUCCESS
-/obj/structure/bedsheetbin/wrench_act(mob/living/user, obj/item/tool)
+/obj/structure/bedsheetbin/wrench_act_secondary(mob/living/user, obj/item/tool)
. = ..()
default_unfasten_wrench(user, tool, time = 0.5 SECONDS)
return ITEM_INTERACT_SUCCESS
-/obj/structure/bedsheetbin/attackby(obj/item/I, mob/user, params)
- if(istype(I, /obj/item/bedsheet))
- if(!user.transferItemToLoc(I, src))
- return
- sheets.Add(I)
- amount++
- to_chat(user, span_notice("You put [I] in [src]."))
- update_appearance()
+/obj/structure/bedsheetbin/item_interaction(mob/living/user, obj/item/tool, list/modifiers)
+ if(istype(tool, /obj/item/bedsheet))
+ return bedsheet_act(user, tool)
- else if(amount && !hidden && I.w_class < WEIGHT_CLASS_BULKY) //make sure there's sheets to hide it among, make sure nothing else is hidden in there.
- if(!user.transferItemToLoc(I, src))
- to_chat(user, span_warning("\The [I] is stuck to your hand, you cannot hide it among the sheets!"))
- return
- hidden = I
- to_chat(user, span_notice("You hide [I] among the sheets."))
+ // Everything else we try to hide
+ return hide_item_act(user, tool)
+/obj/structure/bedsheetbin/proc/bedsheet_act(mob/living/user, obj/item/tool)
+ if(!user.transferItemToLoc(tool, src, silent = FALSE))
+ return ITEM_INTERACT_BLOCKING
+ sheets.Add(tool)
+ amount++
+ to_chat(user, span_notice("You put [tool] in [src]."))
+ update_appearance()
+ return ITEM_INTERACT_SUCCESS
+
+/obj/structure/bedsheetbin/proc/hide_item_act(mob/living/user, obj/item/tool)
+ if(user.combat_mode)
+ return NONE
+ if(tool.w_class >= WEIGHT_CLASS_BULKY)
+ balloon_alert(user, "too big!")
+ return ITEM_INTERACT_BLOCKING
+ if(!amount)
+ balloon_alert(user, "nothing to hide under!")
+ return ITEM_INTERACT_BLOCKING
+ if(hidden)
+ balloon_alert(user, "already something there!")
+ return ITEM_INTERACT_BLOCKING
+ if(!user.transferItemToLoc(tool, src, silent = FALSE))
+ to_chat(user, span_warning("\The [tool] is stuck to your hand, you cannot hide it among the sheets!"))
+ return ITEM_INTERACT_BLOCKING
+ hidden = tool
+ to_chat(user, span_notice("You hide [tool] among the sheets."))
+ return ITEM_INTERACT_SUCCESS
/obj/structure/bedsheetbin/attack_paw(mob/user, list/modifiers)
return attack_hand(user, modifiers)
diff --git a/code/game/objects/structures/grille.dm b/code/game/objects/structures/grille.dm
index 37b894e277307..3bd3e00cc273b 100644
--- a/code/game/objects/structures/grille.dm
+++ b/code/game/objects/structures/grille.dm
@@ -42,7 +42,7 @@
return
. = ..()
- if((updates & UPDATE_SMOOTHING) && (smoothing_flags & (SMOOTH_CORNERS|SMOOTH_BITMASK)))
+ if((updates & UPDATE_SMOOTHING) && (smoothing_flags & USES_SMOOTHING))
QUEUE_SMOOTH(src)
/obj/structure/grille/update_icon_state()
diff --git a/code/game/objects/structures/mineral_doors.dm b/code/game/objects/structures/mineral_doors.dm
index d794f24dd0894..d67f61e9442bb 100644
--- a/code/game/objects/structures/mineral_doors.dm
+++ b/code/game/objects/structures/mineral_doors.dm
@@ -300,7 +300,7 @@
/obj/structure/mineral_door/paperframe/Initialize(mapload)
. = ..()
- if(smoothing_flags & (SMOOTH_CORNERS|SMOOTH_BITMASK))
+ if(smoothing_flags & USES_SMOOTHING)
QUEUE_SMOOTH_NEIGHBORS(src)
/obj/structure/mineral_door/paperframe/examine(mob/user)
@@ -333,6 +333,6 @@
return ..()
/obj/structure/mineral_door/paperframe/Destroy()
- if(smoothing_flags & (SMOOTH_CORNERS|SMOOTH_BITMASK))
+ if(smoothing_flags & USES_SMOOTHING)
QUEUE_SMOOTH_NEIGHBORS(src)
return ..()
diff --git a/code/game/objects/structures/secure_safe.dm b/code/game/objects/structures/secure_safe.dm
index 76c3ab4575f6c..9e1bf9b5adef9 100644
--- a/code/game/objects/structures/secure_safe.dm
+++ b/code/game/objects/structures/secure_safe.dm
@@ -74,15 +74,15 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/secure_safe, 32)
There appears to be a small amount of surface corrosion. It doesn't look like it could withstand much of an explosion.\
Due to the expensive material, it was made incredibly small to cut corners, leaving only enough room to fit something as slim as an ID card."
icon = 'icons/obj/structures.dmi'
- icon_state = "safe"
- base_icon_state = "safe"
+ icon_state = "spare_safe"
+ base_icon_state = "spare_safe"
armor_type = /datum/armor/safe_caps_spare
max_integrity = 300
damage_deflection = 30 // prevents stealing the captain's spare using null rods/lavaland monsters/AP projectiles
density = TRUE
- anchored_tabletop_offset = 4
+ anchored_tabletop_offset = 6
custom_materials = list(/datum/material/gold = SMALL_MATERIAL_AMOUNT)
- material_flags = MATERIAL_EFFECTS | MATERIAL_COLOR
+ material_flags = MATERIAL_EFFECTS
/datum/armor/safe_caps_spare
melee = 100
@@ -95,9 +95,6 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/secure_safe, 32)
/obj/structure/secure_safe/caps_spare/Initialize(mapload)
. = ..()
- var/matrix/small_safe_transformation = new
- small_safe_transformation.Scale(0.6)
- transform = small_safe_transformation
atom_storage.set_holdable(/obj/item/card/id)
AddComponent(/datum/component/lockable_storage, \
lock_code = SSid_access.spare_id_safe_code, \
diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm
index 0a499440d4eb8..69c6aca505f36 100644
--- a/code/game/objects/structures/tables_racks.dm
+++ b/code/game/objects/structures/tables_racks.dm
@@ -92,7 +92,7 @@
/obj/structure/table/update_icon(updates=ALL)
. = ..()
- if((updates & UPDATE_SMOOTHING) && (smoothing_flags & (SMOOTH_CORNERS|SMOOTH_BITMASK)))
+ if((updates & UPDATE_SMOOTHING) && (smoothing_flags & USES_SMOOTHING))
QUEUE_SMOOTH(src)
QUEUE_SMOOTH_NEIGHBORS(src)
diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm
index 0076019532118..6c41b2f8b157d 100644
--- a/code/game/objects/structures/window.dm
+++ b/code/game/objects/structures/window.dm
@@ -393,7 +393,7 @@
//This proc is used to update the icons of nearby windows.
/obj/structure/window/proc/update_nearby_icons()
update_appearance()
- if(smoothing_flags & (SMOOTH_CORNERS|SMOOTH_BITMASK))
+ if(smoothing_flags & USES_SMOOTHING)
QUEUE_SMOOTH_NEIGHBORS(src)
//merges adjacent full-tile windows into one
@@ -402,7 +402,7 @@
if(QDELETED(src) || !fulltile)
return
- if((updates & UPDATE_SMOOTHING) && (smoothing_flags & (SMOOTH_CORNERS|SMOOTH_BITMASK)))
+ if((updates & UPDATE_SMOOTHING) && (smoothing_flags & USES_SMOOTHING))
QUEUE_SMOOTH(src)
var/ratio = atom_integrity / max_integrity
@@ -901,7 +901,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/window/reinforced/tinted/frosted/spaw
/obj/structure/window/paperframe/update_icon(updates=ALL)
. = ..()
- if((updates & UPDATE_SMOOTHING) && (smoothing_flags & (SMOOTH_CORNERS|SMOOTH_BITMASK)))
+ if((updates & UPDATE_SMOOTHING) && (smoothing_flags & USES_SMOOTHING))
QUEUE_SMOOTH(src)
/obj/structure/window/paperframe/update_overlays()
diff --git a/code/game/turfs/open/_open.dm b/code/game/turfs/open/_open.dm
index 1d5b5671c2c0b..7297f8433261e 100644
--- a/code/game/turfs/open/_open.dm
+++ b/code/game/turfs/open/_open.dm
@@ -11,7 +11,11 @@
/// Determines the type of damage overlay that will be used for the tile
var/damaged_dmi = null
var/broken = FALSE
+ /// Are broken overlays smoothed? if they are we have to change a little bit about how we render them
+ var/smooth_broken = FALSE
var/burnt = FALSE
+ /// Are burnt overlays smoothed? if they are we have to change a little bit about how we render them
+ var/smooth_burnt = FALSE
/// Returns a list of every turf state considered "broken".
@@ -47,7 +51,7 @@
if(broken)
var/mutable_appearance/broken_appearance = mutable_appearance(damaged_dmi, pick(broken_states()))
- if(smoothing_flags && !(smoothing_flags & SMOOTH_BROKEN_TURF))
+ if(smoothing_flags && !smooth_broken)
var/matrix/translation = new
translation.Translate(-LARGE_TURF_SMOOTHING_X_OFFSET, -LARGE_TURF_SMOOTHING_Y_OFFSET)
broken_appearance.transform = translation
@@ -62,7 +66,7 @@
else
burnt_appearance = mutable_appearance(damaged_dmi, pick(broken_states()))
- if(smoothing_flags && !(smoothing_flags & SMOOTH_BURNT_TURF))
+ if(smoothing_flags && !smooth_burnt)
var/matrix/translation = new
translation.Translate(-LARGE_TURF_SMOOTHING_X_OFFSET, -LARGE_TURF_SMOOTHING_Y_OFFSET)
burnt_appearance.transform = translation
diff --git a/code/game/turfs/open/asteroid.dm b/code/game/turfs/open/asteroid.dm
index aa295e1e8346e..8db5753a7196b 100644
--- a/code/game/turfs/open/asteroid.dm
+++ b/code/game/turfs/open/asteroid.dm
@@ -223,7 +223,7 @@ GLOBAL_LIST_EMPTY(dug_up_basalt)
return TRUE
return FALSE
-/turf/open/misc/grass/burnt_states()
+/turf/open/misc/asteroid/snow/burnt_states()
return list("snow_dug")
/turf/open/misc/asteroid/snow/icemoon
diff --git a/code/game/turfs/open/floor/fancy_floor.dm b/code/game/turfs/open/floor/fancy_floor.dm
index 935cb3b1f2c24..4d79e6b1b3141 100644
--- a/code/game/turfs/open/floor/fancy_floor.dm
+++ b/code/game/turfs/open/floor/fancy_floor.dm
@@ -276,11 +276,11 @@
if(!. || !(updates & UPDATE_SMOOTHING))
return
if(!broken && !burnt)
- if(smoothing_flags & (SMOOTH_CORNERS|SMOOTH_BITMASK))
+ if(smoothing_flags & USES_SMOOTHING)
QUEUE_SMOOTH(src)
else
make_plating()
- if(smoothing_flags & (SMOOTH_CORNERS|SMOOTH_BITMASK))
+ if(smoothing_flags & USES_SMOOTHING)
QUEUE_SMOOTH_NEIGHBORS(src)
/turf/open/floor/carpet/lone
diff --git a/code/game/turfs/open/floor/hull.dm b/code/game/turfs/open/floor/hull.dm
index 54ea29e051a45..6836c29b960ec 100644
--- a/code/game/turfs/open/floor/hull.dm
+++ b/code/game/turfs/open/floor/hull.dm
@@ -10,6 +10,16 @@
name = "shuttle ceiling plating"
var/old_turf_type
+/turf/open/floor/engine/hull/ceiling/Initialize(mapload)
+ . = ..()
+ if(!istype(loc, /area/space))
+ return
+ if(istype(loc, /area/space/nearstation))
+ return
+ new /obj/effect/mapping_error (src) //We're in a normal space tile, meaning we aren't lit correct.
+ ///datum/unit_test/mapping_nearstation_test.dm SHOULD fail this case automatically
+ //this is just here so the mapper responsible can easily see where the issues are directly on the map.
+
/turf/open/floor/engine/hull/ceiling/AfterChange(flags, oldType)
. = ..()
old_turf_type = oldType
diff --git a/code/game/turfs/open/grass.dm b/code/game/turfs/open/grass.dm
index d1779ad7499ac..4dd5946a7ed14 100644
--- a/code/game/turfs/open/grass.dm
+++ b/code/game/turfs/open/grass.dm
@@ -10,9 +10,11 @@
barefootstep = FOOTSTEP_GRASS
clawfootstep = FOOTSTEP_GRASS
heavyfootstep = FOOTSTEP_GENERIC_HEAVY
- smoothing_flags = SMOOTH_BITMASK | SMOOTH_BROKEN_TURF | SMOOTH_BURNT_TURF
+ smoothing_flags = SMOOTH_BITMASK
smoothing_groups = SMOOTH_GROUP_TURF_OPEN + SMOOTH_GROUP_FLOOR_GRASS
canSmoothWith = SMOOTH_GROUP_FLOOR_GRASS + SMOOTH_GROUP_CLOSED_TURFS
+ smooth_broken = TRUE
+ smooth_burnt = TRUE
layer = HIGH_TURF_LAYER
rust_resistance = RUST_RESISTANCE_ORGANIC
damaged_dmi = 'icons/turf/floors/grass_damaged.dmi'
@@ -24,13 +26,13 @@
var/base_burnt_icon_state = "grass_damaged"
/turf/open/misc/grass/broken_states()
- if (!smoothing_junction || !(smoothing_flags & SMOOTH_BROKEN_TURF))
+ if (!smoothing_junction || !smooth_broken)
return list("[base_broken_icon_state]-255")
return list("[base_broken_icon_state]-[smoothing_junction]")
/turf/open/misc/grass/burnt_states()
- if (!smoothing_junction || !(smoothing_flags & SMOOTH_BURNT_TURF))
+ if (!smoothing_junction || !smooth_burnt)
return list("[base_burnt_icon_state]-255")
return list("[base_burnt_icon_state]-[smoothing_junction]")
diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm
index 565adb22dbc00..10165f869174f 100644
--- a/code/game/turfs/turf.dm
+++ b/code/game/turfs/turf.dm
@@ -153,7 +153,7 @@ GLOBAL_LIST_EMPTY(station_turfs)
SETUP_SMOOTHING()
- if (smoothing_flags & (SMOOTH_CORNERS|SMOOTH_BITMASK))
+ if (smoothing_flags & USES_SMOOTHING)
QUEUE_SMOOTH(src)
for(var/atom/movable/content as anything in src)
diff --git a/code/modules/antagonists/cult/cult_items.dm b/code/modules/antagonists/cult/cult_items.dm
index ef7292267d69f..33710d9199853 100644
--- a/code/modules/antagonists/cult/cult_items.dm
+++ b/code/modules/antagonists/cult/cult_items.dm
@@ -332,6 +332,7 @@ Striking a noncultist, however, will tear their flesh."}
else
to_chat(user, span_warning("The bola seems to take on a life of its own!"))
ensnare(user)
+ user.update_held_items()
#undef CULT_BOLA_PICKUP_STUN
diff --git a/code/modules/antagonists/fugitive/hunters/hunter.dm b/code/modules/antagonists/fugitive/hunters/hunter.dm
index b75cba69e528a..ba26645364712 100644
--- a/code/modules/antagonists/fugitive/hunters/hunter.dm
+++ b/code/modules/antagonists/fugitive/hunters/hunter.dm
@@ -42,6 +42,10 @@
to_chat(owner, span_danger("GOOD EVENING, WE ARE PSYKER HUNTE- NO, PSYKER SHIKARIS!"))
to_chat(owner, span_danger("A brainling hit us up on the holopad with an offer we could NOT pass up. We kidnap some fools for them, and in exchange we get a LIFETIME SUPPLY OF GORE."))
to_chat(owner, span_danger("Our gore supply has been running thin as of late -- How could we say no? The binge MUST go on!"))
+ if(HUNTER_PACK_MI13)
+ to_chat(owner, span_danger("Agents, we have detected a wanted fugitive in Nanotrasen controlled space."))
+ to_chat(owner, span_danger("Your mission is simple. Infiltrate the facility and extract the target, dead or alive."))
+ to_chat(owner, span_danger("This is a stealth infiltration mission in hostile enemy territory. Be wary, and avoid being caught if possible."))
to_chat(owner, span_boldannounce("You are not an antagonist in that you may kill whomever you please, but you can do anything to ensure the capture of the fugitives, even if that means going through the station."))
owner.announce_objectives()
diff --git a/code/modules/antagonists/fugitive/hunters/hunter_outfits.dm b/code/modules/antagonists/fugitive/hunters/hunter_outfits.dm
index 7df6818cdc44a..5491251d1aa53 100644
--- a/code/modules/antagonists/fugitive/hunters/hunter_outfits.dm
+++ b/code/modules/antagonists/fugitive/hunters/hunter_outfits.dm
@@ -216,6 +216,56 @@
id_trim = /datum/id_trim/bounty_hunter/psykers/seer
+/datum/outfit/mi13_hunter
+ name = "\improper MI13 Fugitive Retrieval Agent"
+ uniform = /obj/item/clothing/under/syndicate/sniper
+ back = /obj/item/storage/backpack/satchel/leather
+ ears = /obj/item/radio/headset/syndicate
+ glasses = /obj/item/clothing/glasses/sunglasses
+ gloves = /obj/item/clothing/gloves/combat
+ shoes = /obj/item/clothing/shoes/laceup
+ belt = /obj/item/restraints/handcuffs/cable/zipties
+ l_pocket = /obj/item/gun/ballistic/automatic/pistol
+ r_pocket = /obj/item/suppressor
+ id = /obj/item/card/id/advanced/chameleon/black
+ box = /obj/item/storage/box/survival/syndie
+ implants = list(/obj/item/implant/explosive)
+
+/datum/outfit/mi13_hunter/pre_equip(mob/living/carbon/human/agent, visualsOnly = FALSE)
+ backpack_contents = list()
+ backpack_contents += pick_weight(list(/obj/item/ammo_box/magazine/m9mm = 80,
+ /obj/item/ammo_box/magazine/m9mm/hp = 10,
+ /obj/item/ammo_box/magazine/m9mm/ap = 5,
+ /obj/item/ammo_box/magazine/m9mm/fire = 5,
+ ))
+ backpack_contents += pick_weight(list(
+ /obj/item/pen/edagger = 40,
+ /obj/item/knife/combat = 30,
+ /obj/item/assembly/flash = 30,
+ ))
+ backpack_contents += pick_weight(list(
+ /obj/item/grenade/c4 = 20,
+ /obj/item/implanter/freedom = 20,
+ /obj/item/clothing/mask/chameleon = 20,
+ /obj/item/language_manual/codespeak_manual/unlimited = 10,
+ /obj/item/storage/mail_counterfeit_device = 10,
+ /obj/item/traitor_machine_trapper = 10,
+ /obj/item/gun/ballistic/automatic/pistol/clandestine/fisher = 10,
+ ))
+
+/datum/outfit/mi13_hunter/post_equip(mob/living/carbon/human/agent, visualsOnly = FALSE)
+ if(visualsOnly)
+ return
+ var/obj/item/card/id/wearing = agent.wear_id
+ wearing.registered_name = agent.real_name
+ wearing.update_label()
+
+/datum/outfit/mi13_hunter/chef
+ name = "\improper MI13 Fugitive Retrieval Agent - Chef Disguise"
+ head = /obj/item/clothing/head/utility/chefhat
+ suit = /obj/item/clothing/suit/apron/chef
+ mask = /obj/item/clothing/mask/fakemoustache
+
//ids and ert code
/obj/item/card/id/advanced/bountyhunter
diff --git a/code/modules/antagonists/heretic/heretic_antag.dm b/code/modules/antagonists/heretic/heretic_antag.dm
index 3411384b7b8fe..f31639c508c73 100644
--- a/code/modules/antagonists/heretic/heretic_antag.dm
+++ b/code/modules/antagonists/heretic/heretic_antag.dm
@@ -60,17 +60,17 @@
/// Wether we are allowed to ascend
var/feast_of_owls = FALSE
/// Static list of what each path converts to in the UI (colors are TGUI colors)
- var/static/list/path_to_ui_color = list(
- PATH_START = "grey",
- PATH_SIDE = "green",
- PATH_RUST = "brown",
- PATH_FLESH = "red",
- PATH_ASH = "white",
- PATH_VOID = "blue",
- PATH_BLADE = "label", // my favorite color is label
- PATH_COSMIC = "purple",
- PATH_LOCK = "yellow",
- PATH_MOON = "blue",
+ var/static/list/path_to_ui_bgr = list(
+ PATH_START = "node_side",
+ PATH_SIDE = "node_side",
+ PATH_RUST = "node_rust",
+ PATH_FLESH = "node_flesh",
+ PATH_ASH = "node_ash",
+ PATH_VOID = "node_void",
+ PATH_BLADE = "node_blade",
+ PATH_COSMIC = "node_cosmos",
+ PATH_LOCK = "node_lock",
+ PATH_MOON = "node_moon",
)
var/static/list/path_to_rune_color = list(
@@ -98,6 +98,82 @@
LAZYNULL(sac_targets)
return ..()
+/datum/antagonist/heretic/proc/get_icon_of_knowledge(datum/heretic_knowledge/knowledge)
+ //basic icon parameters
+ var/icon_path = 'icons/mob/actions/actions_ecult.dmi'
+ var/icon_state = "eye"
+ var/icon_frame = knowledge.research_tree_icon_frame
+ var/icon_dir = knowledge.research_tree_icon_dir
+ //can't imagine why you would want this one, so it can't be overridden by the knowledge
+ var/icon_moving = 0
+
+ //item transmutation knowledge does not generate its own icon due to implementation difficulties, the icons have to be specified in the override vars
+
+ //if the knowledge has a special icon, use that
+ if(!isnull(knowledge.research_tree_icon_path))
+ icon_path = knowledge.research_tree_icon_path
+ icon_state = knowledge.research_tree_icon_state
+
+ //if the knowledge is a spell, use the spell's button
+ else if(ispath(knowledge,/datum/heretic_knowledge/spell))
+ var/datum/heretic_knowledge/spell/spell_knowledge = knowledge
+ var/datum/action/cooldown/spell/result_spell = spell_knowledge.spell_to_add
+ icon_path = result_spell.button_icon
+ icon_state = result_spell.button_icon_state
+
+ //if the knowledge is a summon, use the mob sprite
+ else if(ispath(knowledge,/datum/heretic_knowledge/summon))
+ var/datum/heretic_knowledge/summon/summon_knowledge = knowledge
+ var/mob/living/result_mob = summon_knowledge.mob_to_summon
+ icon_path = result_mob.icon
+ icon_state = result_mob.icon_state
+
+ //if the knowledge is an eldritch mark, use the mark sprite
+ else if(ispath(knowledge,/datum/heretic_knowledge/mark))
+ var/datum/heretic_knowledge/mark/mark_knowledge = knowledge
+ var/datum/status_effect/eldritch/mark_effect = mark_knowledge.mark_type
+ icon_path = mark_effect.effect_icon
+ icon_state = mark_effect.effect_icon_state
+
+ //if the knowledge is an ascension, use the achievement sprite
+ else if(ispath(knowledge,/datum/heretic_knowledge/ultimate))
+ var/datum/heretic_knowledge/ultimate/ascension_knowledge = knowledge
+ var/datum/award/achievement/misc/achievement = ascension_knowledge.ascension_achievement
+ if(!isnull(achievement))
+ icon_path = achievement.icon
+ icon_state = achievement.icon_state
+
+ var/list/result_parameters = list()
+ result_parameters["icon"] = icon_path
+ result_parameters["state"] = icon_state
+ result_parameters["frame"] = icon_frame
+ result_parameters["dir"] = icon_dir
+ result_parameters["moving"] = icon_moving
+ return result_parameters
+
+/datum/antagonist/heretic/proc/get_knowledge_data(datum/heretic_knowledge/knowledge, done)
+
+ var/list/knowledge_data = list()
+
+ knowledge_data["path"] = knowledge
+ knowledge_data["icon_params"] = get_icon_of_knowledge(knowledge)
+ knowledge_data["name"] = initial(knowledge.name)
+ knowledge_data["gainFlavor"] = initial(knowledge.gain_text)
+ knowledge_data["cost"] = initial(knowledge.cost)
+ knowledge_data["disabled"] = (!done) && (initial(knowledge.cost) > knowledge_points)
+ knowledge_data["bgr"] = (path_to_ui_bgr[initial(knowledge.route)] || "side")
+ knowledge_data["finished"] = done
+ knowledge_data["ascension"] = ispath(knowledge,/datum/heretic_knowledge/ultimate)
+
+ //description of a knowledge might change, make sure we are not shown the initial() value in that case
+ if(done)
+ var/datum/heretic_knowledge/knowledge_instance = researched_knowledge[knowledge]
+ knowledge_data["desc"] = knowledge_instance.desc
+ else
+ knowledge_data["desc"] = initial(knowledge.desc)
+
+ return knowledge_data
+
/datum/antagonist/heretic/ui_data(mob/user)
var/list/data = list()
@@ -105,26 +181,32 @@
data["total_sacrifices"] = total_sacrifices
data["ascended"] = ascended
+ var/list/tiers = list()
+
// This should be cached in some way, but the fact that final knowledge
// has to update its disabled state based on whether all objectives are complete,
// makes this very difficult. I'll figure it out one day maybe
+ for(var/datum/heretic_knowledge/knowledge as anything in researched_knowledge)
+ var/list/knowledge_data = get_knowledge_data(knowledge,TRUE)
+
+ while(initial(knowledge.depth) > tiers.len)
+ tiers += list(list("nodes"=list()))
+
+ tiers[initial(knowledge.depth)]["nodes"] += list(knowledge_data)
+
for(var/datum/heretic_knowledge/knowledge as anything in get_researchable_knowledge())
- var/list/knowledge_data = list()
- knowledge_data["path"] = knowledge
- knowledge_data["name"] = initial(knowledge.name)
- knowledge_data["desc"] = initial(knowledge.desc)
- knowledge_data["gainFlavor"] = initial(knowledge.gain_text)
- knowledge_data["cost"] = initial(knowledge.cost)
- knowledge_data["disabled"] = initial(knowledge.cost) > knowledge_points
+ var/list/knowledge_data = get_knowledge_data(knowledge,FALSE)
// Final knowledge can't be learned until all objectives are complete.
if(ispath(knowledge, /datum/heretic_knowledge/ultimate))
- knowledge_data["disabled"] = !can_ascend()
+ knowledge_data["disabled"] ||= !can_ascend()
- knowledge_data["hereticPath"] = initial(knowledge.route)
- knowledge_data["color"] = path_to_ui_color[initial(knowledge.route)] || "grey"
+ while(initial(knowledge.depth) > tiers.len)
+ tiers += list(list("nodes"=list()))
- data["learnableKnowledge"] += list(knowledge_data)
+ tiers[initial(knowledge.depth)]["nodes"] += list(knowledge_data)
+
+ data["knowledge_tiers"] = tiers
return data
@@ -134,18 +216,6 @@
data["objectives"] = get_objectives()
data["can_change_objective"] = can_assign_self_objectives
- for(var/path in researched_knowledge)
- var/list/knowledge_data = list()
- var/datum/heretic_knowledge/found_knowledge = researched_knowledge[path]
- knowledge_data["name"] = found_knowledge.name
- knowledge_data["desc"] = found_knowledge.desc
- knowledge_data["gainFlavor"] = found_knowledge.gain_text
- knowledge_data["cost"] = found_knowledge.cost
- knowledge_data["hereticPath"] = found_knowledge.route
- knowledge_data["color"] = path_to_ui_color[found_knowledge.route] || "grey"
-
- data["learnedKnowledge"] += list(knowledge_data)
-
return data
/datum/antagonist/heretic/ui_act(action, params)
diff --git a/code/modules/antagonists/heretic/heretic_knowledge.dm b/code/modules/antagonists/heretic/heretic_knowledge.dm
index 6758b0774046b..6cfa8db05608f 100644
--- a/code/modules/antagonists/heretic/heretic_knowledge.dm
+++ b/code/modules/antagonists/heretic/heretic_knowledge.dm
@@ -38,6 +38,14 @@
var/priority = 0
/// What path is this on. If set to "null", assumed to be unreachable (or abstract).
var/route
+ /// In case we want to override the default UI icon getter and plug in our own icon instead.
+ /// if research_tree_icon_path is not null, research_tree_icon_state must also be specified or things may break
+ var/research_tree_icon_path
+ var/research_tree_icon_state
+ var/research_tree_icon_frame = 1
+ var/research_tree_icon_dir = SOUTH
+ /// Level of knowledge tree where this knowledge should be in the UI
+ var/depth = 1
///Determines what kind of monster ghosts will ignore from here on out. Defaults to POLL_IGNORE_HERETIC_MONSTER, but we define other types of monsters for more granularity.
var/poll_ignore_define = POLL_IGNORE_HERETIC_MONSTER
@@ -263,6 +271,7 @@
limit = 2
cost = 1
priority = MAX_KNOWLEDGE_PRIORITY - 5
+ depth = 2
/datum/heretic_knowledge/limited_amount/starting/New()
. = ..()
@@ -287,6 +296,7 @@
abstract_parent_type = /datum/heretic_knowledge/mark
mutually_exclusive = TRUE
cost = 2
+ depth = 5
/// The status effect typepath we apply on people on mansus grasp.
var/datum/status_effect/eldritch/mark_type
@@ -352,6 +362,7 @@
abstract_parent_type = /datum/heretic_knowledge/blade_upgrade
mutually_exclusive = TRUE
cost = 2
+ depth = 9
/datum/heretic_knowledge/blade_upgrade/on_gain(mob/user, datum/antagonist/heretic/our_heretic)
RegisterSignal(user, COMSIG_HERETIC_BLADE_ATTACK, PROC_REF(on_eldritch_blade))
@@ -592,6 +603,9 @@
mutually_exclusive = TRUE
cost = 1
priority = MAX_KNOWLEDGE_PRIORITY - 10 // A pretty important midgame ritual.
+ depth = 6
+ research_tree_icon_path = 'icons/obj/antags/eldritch.dmi'
+ research_tree_icon_state = "book_open"
/// Whether we've done the ritual. Only doable once.
var/was_completed = FALSE
@@ -685,6 +699,9 @@
cost = 2
priority = MAX_KNOWLEDGE_PRIORITY + 1 // Yes, the final ritual should be ABOVE the max priority.
required_atoms = list(/mob/living/carbon/human = 3)
+ depth = 11
+ //use this to store the achievement typepath
+ var/datum/award/achievement/misc/ascension_achievement
/datum/heretic_knowledge/ultimate/on_research(mob/user, datum/antagonist/heretic/our_heretic)
. = ..()
@@ -745,6 +762,8 @@
source = user,
header = "A Heretic is Ascending!",
)
+ if(!isnull(ascension_achievement))
+ user.client?.give_award(ascension_achievement, user)
heretic_datum.increase_rust_strength()
return TRUE
diff --git a/code/modules/antagonists/heretic/items/eldritch_flask.dm b/code/modules/antagonists/heretic/items/eldritch_flask.dm
index 95b77f956188c..409bcd473ed7d 100644
--- a/code/modules/antagonists/heretic/items/eldritch_flask.dm
+++ b/code/modules/antagonists/heretic/items/eldritch_flask.dm
@@ -4,5 +4,5 @@
name = "flask of eldritch essence"
desc = "Toxic to the closed minded, yet refreshing to those with knowledge of the beyond."
icon = 'icons/obj/antags/eldritch.dmi'
- icon_state = "eldrich_flask"
+ icon_state = "eldritch_flask"
list_reagents = list(/datum/reagent/eldritch = 50)
diff --git a/code/modules/antagonists/heretic/items/keyring.dm b/code/modules/antagonists/heretic/items/keyring.dm
index dc1291bc03437..c0df68ec7cc3f 100644
--- a/code/modules/antagonists/heretic/items/keyring.dm
+++ b/code/modules/antagonists/heretic/items/keyring.dm
@@ -185,7 +185,7 @@
if(reference_resolved)
make_portal(user, reference_resolved, target)
- to_chat(user, span_notice("You use [src], to link [link] and [target] together."))
+ to_chat(user, span_notice("You use [src], to link [reference_resolved] and [target] together."))
link = null
balloon_alert(user, "link 2/2")
else
diff --git a/code/modules/antagonists/heretic/knowledge/ash_lore.dm b/code/modules/antagonists/heretic/knowledge/ash_lore.dm
index 9386611304292..b74569f1a1447 100644
--- a/code/modules/antagonists/heretic/knowledge/ash_lore.dm
+++ b/code/modules/antagonists/heretic/knowledge/ash_lore.dm
@@ -1,5 +1,7 @@
/**
* # The path of Ash.
+ * Spell names are in this language: OLD NORDIC
+ * Both are related: Nordic Mythology-Yggdrassil-Ash Tree Genus-Ash
*
* Goes as follows:
*
@@ -39,6 +41,8 @@
)
result_atoms = list(/obj/item/melee/sickly_blade/ash)
route = PATH_ASH
+ research_tree_icon_path = 'icons/obj/weapons/khopesh.dmi'
+ research_tree_icon_state = "ash_blade"
/datum/heretic_knowledge/ashen_grasp
name = "Grasp of Ash"
@@ -48,6 +52,9 @@
next_knowledge = list(/datum/heretic_knowledge/spell/ash_passage)
cost = 1
route = PATH_ASH
+ depth = 3
+ research_tree_icon_path = 'icons/ui_icons/antags/heretic/knowledge.dmi'
+ research_tree_icon_state = "grasp_ash"
/datum/heretic_knowledge/ashen_grasp/on_gain(mob/user, datum/antagonist/heretic/our_heretic)
RegisterSignal(user, COMSIG_HERETIC_MANSUS_GRASP_ATTACK, PROC_REF(on_mansus_grasp))
@@ -80,6 +87,7 @@
spell_to_add = /datum/action/cooldown/spell/jaunt/ethereal_jaunt/ash
cost = 1
route = PATH_ASH
+ depth = 4
/datum/heretic_knowledge/mark/ash_mark
name = "Mark of Ash"
@@ -119,6 +127,8 @@
spell_to_add = /datum/action/cooldown/spell/charged/beam/fire_blast
cost = 1
route = PATH_ASH
+ depth = 7
+ research_tree_icon_frame = 7
/datum/heretic_knowledge/mad_mask
@@ -142,6 +152,9 @@
result_atoms = list(/obj/item/clothing/mask/madness_mask)
cost = 1
route = PATH_ASH
+ research_tree_icon_path = 'icons/obj/clothing/masks.dmi'
+ research_tree_icon_state = "mad_mask"
+ depth = 8
/datum/heretic_knowledge/blade_upgrade/ash
name = "Fiery Blade"
@@ -150,6 +163,8 @@
His city, the people he swore to watch... and watch he did, as they all burnt to cinders."
next_knowledge = list(/datum/heretic_knowledge/spell/flame_birth)
route = PATH_ASH
+ research_tree_icon_path = 'icons/ui_icons/antags/heretic/knowledge.dmi'
+ research_tree_icon_state = "blade_upgrade_ash"
/datum/heretic_knowledge/blade_upgrade/ash/do_melee_effects(mob/living/source, mob/living/target, obj/item/melee/sickly_blade/blade)
if(source == target)
@@ -173,6 +188,8 @@
spell_to_add = /datum/action/cooldown/spell/aoe/fiery_rebirth
cost = 1
route = PATH_ASH
+ depth = 10
+ research_tree_icon_frame = 5
/datum/heretic_knowledge/ultimate/ash_final
name = "Ashlord's Rite"
@@ -187,6 +204,7 @@
for the Nightwatcher brought forth the rite to mankind! His gaze continues, as now I am one with the flames, \
WITNESS MY ASCENSION, THE ASHY LANTERN BLAZES ONCE MORE!"
route = PATH_ASH
+ ascension_achievement = /datum/award/achievement/misc/ash_ascension
/// A static list of all traits we apply on ascension.
var/static/list/traits_to_apply = list(
TRAIT_BOMBIMMUNE,
@@ -215,7 +233,7 @@
text = "[generate_heretic_text()] Fear the blaze, for the Ashlord, [user.real_name] has ascended! The flames shall consume all! [generate_heretic_text()]",
title = "[generate_heretic_text()]",
sound = 'sound/ambience/antag/heretic/ascend_ash.ogg',
- color_override = "pink",
+ color_override = "white",
)
var/datum/action/cooldown/spell/fire_sworn/circle_spell = new(user.mind)
@@ -233,6 +251,5 @@
var/datum/action/cooldown/spell/aoe/fiery_rebirth/fiery_rebirth = locate() in user.actions
fiery_rebirth?.cooldown_time *= 0.16
- user.client?.give_award(/datum/award/achievement/misc/ash_ascension, user)
if(length(traits_to_apply))
user.add_traits(traits_to_apply, MAGIC_TRAIT)
diff --git a/code/modules/antagonists/heretic/knowledge/blade_lore.dm b/code/modules/antagonists/heretic/knowledge/blade_lore.dm
index 6553353745517..357e789416d1d 100644
--- a/code/modules/antagonists/heretic/knowledge/blade_lore.dm
+++ b/code/modules/antagonists/heretic/knowledge/blade_lore.dm
@@ -1,5 +1,7 @@
/**
* # The path of Blades. Stab stab.
+ * Spell names are in this language: ARAMAIC
+ * Both are related: Aramaic-Damascus-Blade
*
* Goes as follows:
*
@@ -43,6 +45,8 @@
result_atoms = list(/obj/item/melee/sickly_blade/dark)
limit = 5 // It's the blade path, it's a given
route = PATH_BLADE
+ research_tree_icon_path = 'icons/obj/weapons/khopesh.dmi'
+ research_tree_icon_state = "dark_blade"
/datum/heretic_knowledge/blade_grasp
name = "Grasp of the Blade"
@@ -52,6 +56,9 @@
next_knowledge = list(/datum/heretic_knowledge/blade_dance)
cost = 1
route = PATH_BLADE
+ depth = 3
+ research_tree_icon_path = 'icons/ui_icons/antags/heretic/knowledge.dmi'
+ research_tree_icon_state = "grasp_blade"
/datum/heretic_knowledge/blade_grasp/on_gain(mob/user, datum/antagonist/heretic/our_heretic)
RegisterSignal(user, COMSIG_HERETIC_MANSUS_GRASP_ATTACK, PROC_REF(on_mansus_grasp))
@@ -111,6 +118,9 @@
)
cost = 1
route = PATH_BLADE
+ depth = 4
+ research_tree_icon_path = 'icons/mob/actions/actions_ecult.dmi'
+ research_tree_icon_state = "shatter"
/// Whether the counter-attack is ready or not.
/// Used instead of cooldowns, so we can give feedback when it's ready again
var/riposte_ready = TRUE
@@ -231,6 +241,7 @@
spell_to_add = /datum/action/cooldown/spell/realignment
cost = 1
route = PATH_BLADE
+ depth = 7
/// The amount of blood flow reduced per level of severity of gained bleeding wounds for Stance of the Torn Champion.
#define BLOOD_FLOW_PER_SEVEIRTY -1
@@ -251,6 +262,10 @@
)
cost = 1
route = PATH_BLADE
+ depth = 8
+ research_tree_icon_path = 'icons/effects/blood.dmi'
+ research_tree_icon_state = "suitblood"
+ research_tree_icon_dir = SOUTH
/// Whether we're currently in duelist stance, gaining certain buffs (low health)
var/in_duelist_stance = FALSE
@@ -310,6 +325,8 @@
a flurry of blades, neither hitting their mark, for the Champion was indomitable."
next_knowledge = list(/datum/heretic_knowledge/spell/furious_steel)
route = PATH_BLADE
+ research_tree_icon_path = 'icons/ui_icons/antags/heretic/knowledge.dmi'
+ research_tree_icon_state = "blade_upgrade_blade"
/// How much force do we apply to the offhand?
var/offand_force_decrement = 0
/// How much force was the last weapon we offhanded with? If it's different, we need to re-calculate the decrement
@@ -380,6 +397,7 @@
spell_to_add = /datum/action/cooldown/spell/pointed/projectile/furious_steel
cost = 1
route = PATH_BLADE
+ depth = 10
/datum/heretic_knowledge/ultimate/blade_final
name = "Maelstrom of Silver"
@@ -393,6 +411,7 @@
gain_text = "The Torn Champion is freed! I will become the blade reunited, and with my greater ambition, \
I AM UNMATCHED! A STORM OF STEEL AND SILVER IS UPON US! WITNESS MY ASCENSION!"
route = PATH_BLADE
+ ascension_achievement = /datum/award/achievement/misc/blade_ascension
/datum/heretic_knowledge/ultimate/blade_final/is_valid_sacrifice(mob/living/carbon/human/sacrifice)
. = ..()
@@ -409,7 +428,6 @@
sound = 'sound/ambience/antag/heretic/ascend_blade.ogg',
color_override = "pink",
)
- user.client?.give_award(/datum/award/achievement/misc/blade_ascension, user)
ADD_TRAIT(user, TRAIT_NEVER_WOUNDED, name)
RegisterSignal(user, COMSIG_HERETIC_BLADE_ATTACK, PROC_REF(on_eldritch_blade))
user.apply_status_effect(/datum/status_effect/protective_blades/recharging, null, 8, 30, 0.25 SECONDS, 1 MINUTES)
diff --git a/code/modules/antagonists/heretic/knowledge/cosmic_lore.dm b/code/modules/antagonists/heretic/knowledge/cosmic_lore.dm
index 6e22ebc37900a..8a94aada74a67 100644
--- a/code/modules/antagonists/heretic/knowledge/cosmic_lore.dm
+++ b/code/modules/antagonists/heretic/knowledge/cosmic_lore.dm
@@ -1,5 +1,7 @@
/**
* # The path of Cosmos.
+ * Spell names are in this language: SUMERIAN
+ * Both are related: Sumerian-Original-Primordial-Cosmic
*
* Goes as follows:
*
@@ -38,6 +40,8 @@
)
result_atoms = list(/obj/item/melee/sickly_blade/cosmic)
route = PATH_COSMIC
+ research_tree_icon_path = 'icons/obj/weapons/khopesh.dmi'
+ research_tree_icon_state = "cosmic_blade"
/datum/heretic_knowledge/cosmic_grasp
name = "Grasp of Cosmos"
@@ -48,6 +52,9 @@
next_knowledge = list(/datum/heretic_knowledge/spell/cosmic_runes)
cost = 1
route = PATH_COSMIC
+ depth = 3
+ research_tree_icon_path = 'icons/ui_icons/antags/heretic/knowledge.dmi'
+ research_tree_icon_state = "grasp_cosmos"
/datum/heretic_knowledge/cosmic_grasp/on_gain(mob/user, datum/antagonist/heretic/our_heretic)
RegisterSignal(user, COMSIG_HERETIC_MANSUS_GRASP_ATTACK, PROC_REF(on_mansus_grasp))
@@ -78,6 +85,7 @@
spell_to_add = /datum/action/cooldown/spell/cosmic_rune
cost = 1
route = PATH_COSMIC
+ depth = 4
/datum/heretic_knowledge/mark/cosmic_mark
name = "Mark of Cosmos"
@@ -107,6 +115,7 @@
spell_to_add = /datum/action/cooldown/spell/touch/star_touch
cost = 1
route = PATH_COSMIC
+ depth = 7
/datum/heretic_knowledge/spell/star_blast
name = "Star Blast"
@@ -123,6 +132,7 @@
spell_to_add = /datum/action/cooldown/spell/pointed/projectile/star_blast
cost = 1
route = PATH_COSMIC
+ depth = 8
/datum/heretic_knowledge/blade_upgrade/cosmic
name = "Cosmic Blade"
@@ -135,6 +145,8 @@
The blades now glistened with fragmented power. I fell to the ground and wept at the beast's feet."
next_knowledge = list(/datum/heretic_knowledge/spell/cosmic_expansion)
route = PATH_COSMIC
+ research_tree_icon_path = 'icons/ui_icons/antags/heretic/knowledge.dmi'
+ research_tree_icon_state = "blade_upgrade_cosmos"
/// Storage for the second target.
var/datum/weakref/second_target
/// Storage for the third target.
@@ -233,6 +245,7 @@
spell_to_add = /datum/action/cooldown/spell/conjure/cosmic_expansion
cost = 1
route = PATH_COSMIC
+ depth = 10
/datum/heretic_knowledge/ultimate/cosmic_final
name = "Creators's Gift"
@@ -250,6 +263,7 @@
I closed my eyes with my head laid against their form. I was safe. \
WITNESS MY ASCENSION!"
route = PATH_COSMIC
+ ascension_achievement = /datum/award/achievement/misc/cosmic_ascension
/// A static list of command we can use with our mob.
var/static/list/star_gazer_commands = list(
/datum/pet_command/idle,
@@ -271,7 +285,7 @@
text = "[generate_heretic_text()] A Star Gazer has arrived into the station, [user.real_name] has ascended! This station is the domain of the Cosmos! [generate_heretic_text()]",
title = "[generate_heretic_text()]",
sound = 'sound/ambience/antag/heretic/ascend_cosmic.ogg',
- color_override = "pink",
+ color_override = "purple",
)
var/mob/living/basic/heretic_summon/star_gazer/star_gazer_mob = new /mob/living/basic/heretic_summon/star_gazer(loc)
star_gazer_mob.maxHealth = INFINITY
@@ -296,5 +310,3 @@
var/datum/action/cooldown/spell/conjure/cosmic_expansion/cosmic_expansion_spell = locate() in user.actions
cosmic_expansion_spell?.ascended = TRUE
-
- user.client?.give_award(/datum/award/achievement/misc/cosmic_ascension, user)
diff --git a/code/modules/antagonists/heretic/knowledge/flesh_lore.dm b/code/modules/antagonists/heretic/knowledge/flesh_lore.dm
index 4a7b2fd205297..e0b82651bc9d6 100644
--- a/code/modules/antagonists/heretic/knowledge/flesh_lore.dm
+++ b/code/modules/antagonists/heretic/knowledge/flesh_lore.dm
@@ -5,6 +5,8 @@
/**
* # The path of Flesh.
+ * Spell names are in this language: LATIN
+ * Both are related: Latin-Rome-Hedonism-Flesh
*
* Goes as follows:
*
@@ -44,6 +46,8 @@
result_atoms = list(/obj/item/melee/sickly_blade/flesh)
limit = 3 // Bumped up so they can arm up their ghouls too.
route = PATH_FLESH
+ research_tree_icon_path = 'icons/obj/weapons/khopesh.dmi'
+ research_tree_icon_state = "flesh_blade"
/datum/heretic_knowledge/limited_amount/starting/base_flesh/on_research(mob/user, datum/antagonist/heretic/our_heretic)
. = ..()
@@ -64,6 +68,9 @@
limit = 1
cost = 1
route = PATH_FLESH
+ depth = 3
+ research_tree_icon_path = 'icons/ui_icons/antags/heretic/knowledge.dmi'
+ research_tree_icon_state = "grasp_flesh"
/datum/heretic_knowledge/limited_amount/flesh_grasp/on_gain(mob/user, datum/antagonist/heretic/our_heretic)
RegisterSignal(user, COMSIG_HERETIC_MANSUS_GRASP_ATTACK, PROC_REF(on_mansus_grasp))
@@ -137,6 +144,10 @@
limit = 2
cost = 1
route = PATH_FLESH
+ research_tree_icon_path = 'icons/ui_icons/antags/heretic/knowledge.dmi'
+ research_tree_icon_state = "ghoul_voiceless"
+
+ depth = 4
/datum/heretic_knowledge/limited_amount/flesh_ghoul/recipe_snowflake_check(mob/living/user, list/atoms, list/selected_atoms, turf/loc)
. = ..()
@@ -227,6 +238,7 @@
spell_to_add = /datum/action/cooldown/spell/touch/flesh_surgery
cost = 1
route = PATH_FLESH
+ depth = 7
/datum/heretic_knowledge/summon/raw_prophet
name = "Raw Ritual"
@@ -250,6 +262,7 @@
cost = 1
route = PATH_FLESH
poll_ignore_define = POLL_IGNORE_RAW_PROPHET
+ depth = 8
/datum/heretic_knowledge/blade_upgrade/flesh
name = "Bleeding Steel"
@@ -258,6 +271,8 @@
I finally began to understand. And then, blood rained from the heavens."
next_knowledge = list(/datum/heretic_knowledge/summon/stalker)
route = PATH_FLESH
+ research_tree_icon_path = 'icons/ui_icons/antags/heretic/knowledge.dmi'
+ research_tree_icon_state = "blade_upgrade_flesh"
///What type of wound do we apply on hit
var/wound_type = /datum/wound/slash/flesh/severe
@@ -292,6 +307,7 @@
cost = 1
route = PATH_FLESH
poll_ignore_define = POLL_IGNORE_STALKER
+ depth = 10
/datum/heretic_knowledge/ultimate/flesh_final
name = "Priest's Final Hymn"
@@ -308,6 +324,7 @@
Reality will bend to THE LORD OF THE NIGHT or be unraveled! WITNESS MY ASCENSION!"
required_atoms = list(/mob/living/carbon/human = 4)
route = PATH_FLESH
+ ascension_achievement = /datum/award/achievement/misc/flesh_ascension
/datum/heretic_knowledge/ultimate/flesh_final/on_finished_recipe(mob/living/user, list/selected_atoms, turf/loc)
. = ..()
@@ -315,13 +332,12 @@
text = "[generate_heretic_text()] Ever coiling vortex. Reality unfolded. ARMS OUTREACHED, THE LORD OF THE NIGHT, [user.real_name] has ascended! Fear the ever twisting hand! [generate_heretic_text()]",
title = "[generate_heretic_text()]",
sound = 'sound/ambience/antag/heretic/ascend_flesh.ogg',
- color_override = "pink",
+ color_override = "red",
)
var/datum/action/cooldown/spell/shapeshift/shed_human_form/worm_spell = new(user.mind)
worm_spell.Grant(user)
- user.client?.give_award(/datum/award/achievement/misc/flesh_ascension, user)
var/datum/antagonist/heretic/heretic_datum = IS_HERETIC(user)
var/datum/heretic_knowledge/limited_amount/flesh_grasp/grasp_ghoul = heretic_datum.get_knowledge(/datum/heretic_knowledge/limited_amount/flesh_grasp)
diff --git a/code/modules/antagonists/heretic/knowledge/general_side.dm b/code/modules/antagonists/heretic/knowledge/general_side.dm
index 2dc2719227b1c..27f0e11b4467b 100644
--- a/code/modules/antagonists/heretic/knowledge/general_side.dm
+++ b/code/modules/antagonists/heretic/knowledge/general_side.dm
@@ -12,6 +12,9 @@
)
cost = 1
route = PATH_SIDE
+ depth = 8
+ research_tree_icon_path = 'icons/mob/actions/actions_animal.dmi'
+ research_tree_icon_state = "gaze"
/datum/heretic_knowledge/reroll_targets/recipe_snowflake_check(mob/living/user, list/atoms, list/selected_atoms, turf/loc)
diff --git a/code/modules/antagonists/heretic/knowledge/lock_lore.dm b/code/modules/antagonists/heretic/knowledge/lock_lore.dm
index 2807167d819fb..b238d6dd3c7f3 100644
--- a/code/modules/antagonists/heretic/knowledge/lock_lore.dm
+++ b/code/modules/antagonists/heretic/knowledge/lock_lore.dm
@@ -1,5 +1,7 @@
/**
* # The path of Lock.
+ * Spell names are in this language: EGYPTIAN
+ * Both are related: Egyptian-Mysteries-Secrets-Lock
*
* Goes as follows:
*
@@ -39,6 +41,8 @@
result_atoms = list(/obj/item/melee/sickly_blade/lock)
limit = 2
route = PATH_LOCK
+ research_tree_icon_path = 'icons/obj/weapons/khopesh.dmi'
+ research_tree_icon_state = "key_blade"
/datum/heretic_knowledge/lock_grasp
name = "Grasp of Lock"
@@ -49,6 +53,9 @@
next_knowledge = list(/datum/heretic_knowledge/key_ring)
cost = 1
route = PATH_LOCK
+ depth = 3
+ research_tree_icon_path = 'icons/ui_icons/antags/heretic/knowledge.dmi'
+ research_tree_icon_state = "grasp_lock"
/datum/heretic_knowledge/lock_grasp/on_gain(mob/user, datum/antagonist/heretic/our_heretic)
RegisterSignal(user, COMSIG_HERETIC_MANSUS_GRASP_ATTACK_SECONDARY, PROC_REF(on_secondary_mansus_grasp))
@@ -111,6 +118,9 @@
)
cost = 1
route = PATH_LOCK
+ research_tree_icon_path = 'icons/obj/card.dmi'
+ research_tree_icon_state = "card_gold"
+ depth = 4
/datum/heretic_knowledge/mark/lock_mark
name = "Mark of Lock"
@@ -140,6 +150,9 @@
next_knowledge = list(/datum/heretic_knowledge/spell/burglar_finesse)
cost = 1
route = PATH_LOCK
+ research_tree_icon_path = 'icons/obj/service/library.dmi'
+ research_tree_icon_state = "heretichandbook"
+ depth = 7
/datum/heretic_knowledge/spell/burglar_finesse
name = "Burglar's Finesse"
@@ -156,6 +169,7 @@
spell_to_add = /datum/action/cooldown/spell/pointed/burglar_finesse
cost = 1
route = PATH_LOCK
+ depth = 8
/datum/heretic_knowledge/blade_upgrade/flesh/lock //basically a chance-based weeping avulsion version of the former
name = "Opening Blade"
@@ -164,6 +178,8 @@
next_knowledge = list(/datum/heretic_knowledge/spell/caretaker_refuge)
route = PATH_LOCK
wound_type = /datum/wound/slash/flesh/critical
+ research_tree_icon_path = 'icons/ui_icons/antags/heretic/knowledge.dmi'
+ research_tree_icon_state = "blade_upgrade_lock"
var/chance = 35
/datum/heretic_knowledge/blade_upgrade/flesh/lock/do_melee_effects(mob/living/source, mob/living/target, obj/item/melee/sickly_blade/blade)
@@ -183,6 +199,7 @@
route = PATH_LOCK
spell_to_add = /datum/action/cooldown/spell/caretaker
cost = 1
+ depth = 10
/datum/heretic_knowledge/ultimate/lock_final
name = "Unlock the Labyrinth"
@@ -199,6 +216,7 @@
The Labyrinth will be Locked no more, and freedom will be ours! WITNESS US!"
required_atoms = list(/mob/living/carbon/human = 3)
route = PATH_LOCK
+ ascension_achievement = /datum/award/achievement/misc/lock_ascension
/datum/heretic_knowledge/ultimate/lock_final/recipe_snowflake_check(mob/living/user, list/atoms, list/selected_atoms, turf/loc)
. = ..()
@@ -225,15 +243,13 @@
text = "Delta-class dimensional anomaly detec[generate_heretic_text()] Reality rended, torn. Gates open, doors open, [user.real_name] has ascended! Fear the tide! [generate_heretic_text()]",
title = "[generate_heretic_text()]",
sound = 'sound/ambience/antag/heretic/ascend_knock.ogg',
- color_override = "pink",
+ color_override = "yellow",
)
- user.client?.give_award(/datum/award/achievement/misc/lock_ascension, user)
// buffs
var/datum/action/cooldown/spell/shapeshift/eldritch/ascension/transform_spell = new(user.mind)
transform_spell.Grant(user)
- user.client?.give_award(/datum/award/achievement/misc/lock_ascension, user)
var/datum/antagonist/heretic/heretic_datum = IS_HERETIC(user)
var/datum/heretic_knowledge/blade_upgrade/flesh/lock/blade_upgrade = heretic_datum.get_knowledge(/datum/heretic_knowledge/blade_upgrade/flesh/lock)
blade_upgrade.chance += 30
diff --git a/code/modules/antagonists/heretic/knowledge/moon_lore.dm b/code/modules/antagonists/heretic/knowledge/moon_lore.dm
index 4b61648329214..5ba55b64058cb 100644
--- a/code/modules/antagonists/heretic/knowledge/moon_lore.dm
+++ b/code/modules/antagonists/heretic/knowledge/moon_lore.dm
@@ -1,5 +1,7 @@
/**
* # The path of Moon.
+ * Spell names are in this language: ANCIENT HEBREW
+ * Both are related: Ancient Hebrew-Moon Mysticism-Moon
*
* Goes as follows:
*
@@ -39,6 +41,8 @@
)
result_atoms = list(/obj/item/melee/sickly_blade/moon)
route = PATH_MOON
+ research_tree_icon_path = 'icons/obj/weapons/khopesh.dmi'
+ research_tree_icon_state = "moon_blade"
/datum/heretic_knowledge/base_moon/on_gain(mob/user, datum/antagonist/heretic/our_heretic)
add_traits(user ,TRAIT_EMPATH, REF(src))
@@ -51,6 +55,9 @@
next_knowledge = list(/datum/heretic_knowledge/spell/moon_smile)
cost = 1
route = PATH_MOON
+ depth = 3
+ research_tree_icon_path = 'icons/ui_icons/antags/heretic/knowledge.dmi'
+ research_tree_icon_state = "grasp_moon"
/datum/heretic_knowledge/moon_grasp/on_gain(mob/user, datum/antagonist/heretic/our_heretic)
RegisterSignal(user, COMSIG_HERETIC_MANSUS_GRASP_ATTACK, PROC_REF(on_mansus_grasp))
@@ -82,6 +89,7 @@
spell_to_add = /datum/action/cooldown/spell/pointed/moon_smile
cost = 1
route = PATH_MOON
+ depth = 4
/datum/heretic_knowledge/mark/moon_mark
name = "Mark of Moon"
@@ -107,6 +115,7 @@
spell_to_add = /datum/action/cooldown/spell/pointed/projectile/moon_parade
cost = 1
route = PATH_MOON
+ depth = 7
/datum/heretic_knowledge/moon_amulet
@@ -130,6 +139,10 @@
result_atoms = list(/obj/item/clothing/neck/heretic_focus/moon_amulet)
cost = 1
route = PATH_MOON
+ depth = 8
+ research_tree_icon_path = 'icons/obj/antags/eldritch.dmi'
+ research_tree_icon_state = "moon_amulette"
+ research_tree_icon_frame = 9
/datum/heretic_knowledge/blade_upgrade/moon
name = "Moonlight Blade"
@@ -137,6 +150,8 @@
gain_text = "His wit was sharp as a blade, cutting through the lie to bring us joy."
next_knowledge = list(/datum/heretic_knowledge/spell/moon_ringleader)
route = PATH_MOON
+ research_tree_icon_path = 'icons/ui_icons/antags/heretic/knowledge.dmi'
+ research_tree_icon_state = "blade_upgrade_moon"
/datum/heretic_knowledge/blade_upgrade/moon/do_melee_effects(mob/living/source, mob/living/target, obj/item/melee/sickly_blade/blade)
if(source == target)
@@ -164,6 +179,8 @@
spell_to_add = /datum/action/cooldown/spell/aoe/moon_ringleader
cost = 1
route = PATH_MOON
+ depth = 10
+ research_tree_icon_frame = 5
/datum/heretic_knowledge/ultimate/moon_final
name = "The Last Act"
@@ -176,6 +193,7 @@
for where the Ringleader had started the parade, I shall continue it unto the suns demise \
WITNESS MY ASCENSION, THE MOON SMILES ONCE MORE AND FOREVER MORE IT SHALL!"
route = PATH_MOON
+ ascension_achievement = /datum/award/achievement/misc/moon_ascension
/datum/heretic_knowledge/ultimate/moon_final/is_valid_sacrifice(mob/living/sacrifice)
@@ -193,10 +211,9 @@
The truth shall finally devour the lie! [generate_heretic_text()]",
title = "[generate_heretic_text()]",
sound = 'sound/ambience/antag/heretic/ascend_moon.ogg',
- color_override = "pink",
+ color_override = "blue",
)
- user.client?.give_award(/datum/award/achievement/misc/moon_ascension, user)
ADD_TRAIT(user, TRAIT_MADNESS_IMMUNE, REF(src))
user.mind.add_antag_datum(/datum/antagonist/lunatic/master)
RegisterSignal(user, COMSIG_LIVING_LIFE, PROC_REF(on_life))
diff --git a/code/modules/antagonists/heretic/knowledge/rust_lore.dm b/code/modules/antagonists/heretic/knowledge/rust_lore.dm
index 5a10b55d1c8f4..5e96119135f71 100644
--- a/code/modules/antagonists/heretic/knowledge/rust_lore.dm
+++ b/code/modules/antagonists/heretic/knowledge/rust_lore.dm
@@ -1,5 +1,6 @@
/**
* # The path of Rust.
+ * Spell names are in this language: OLD SLAVIC
*
* Goes as follows:
*
@@ -42,6 +43,8 @@
)
result_atoms = list(/obj/item/melee/sickly_blade/rust)
route = PATH_RUST
+ research_tree_icon_path = 'icons/obj/weapons/khopesh.dmi'
+ research_tree_icon_state = "rust_blade"
/datum/heretic_knowledge/rust_fist
name = "Grasp of Rust"
@@ -52,6 +55,9 @@
next_knowledge = list(/datum/heretic_knowledge/rust_regen)
cost = 1
route = PATH_RUST
+ depth = 3
+ research_tree_icon_path = 'icons/ui_icons/antags/heretic/knowledge.dmi'
+ research_tree_icon_state = "grasp_rust"
/datum/heretic_knowledge/rust_fist/on_gain(mob/user, datum/antagonist/heretic/our_heretic)
RegisterSignal(user, COMSIG_HERETIC_MANSUS_GRASP_ATTACK, PROC_REF(on_mansus_grasp))
@@ -93,6 +99,9 @@
)
cost = 1
route = PATH_RUST
+ research_tree_icon_path = 'icons/effects/eldritch.dmi'
+ research_tree_icon_state = "cloud_swirl"
+ depth = 4
/datum/heretic_knowledge/rust_regen/on_gain(mob/user, datum/antagonist/heretic/our_heretic)
user.AddElement(/datum/element/leeching_walk)
@@ -128,6 +137,7 @@
spell_to_add = /datum/action/cooldown/spell/pointed/rust_construction
cost = 1
route = PATH_RUST
+ depth = 7
/datum/heretic_knowledge/spell/area_conversion
name = "Aggressive Spread"
@@ -145,6 +155,8 @@
spell_to_add = /datum/action/cooldown/spell/aoe/rust_conversion
cost = 1
route = PATH_RUST
+ depth = 8
+ research_tree_icon_frame = 5
/datum/heretic_knowledge/spell/area_conversion/on_gain(mob/user, datum/antagonist/heretic/our_heretic)
. = ..()
@@ -157,6 +169,8 @@
The heavy rust weights it down. You stare deeply into it. The Rusted Hills call for you, now."
next_knowledge = list(/datum/heretic_knowledge/spell/entropic_plume)
route = PATH_RUST
+ research_tree_icon_path = 'icons/ui_icons/antags/heretic/knowledge.dmi'
+ research_tree_icon_state = "blade_upgrade_rust"
/datum/heretic_knowledge/blade_upgrade/rust/on_gain(mob/user, datum/antagonist/heretic/our_heretic)
. = ..()
@@ -181,6 +195,7 @@
spell_to_add = /datum/action/cooldown/spell/cone/staggered/entropic_plume
cost = 1
route = PATH_RUST
+ depth = 10
/datum/heretic_knowledge/spell/entropic_plume/on_gain(mob/user)
. = ..()
@@ -197,6 +212,7 @@
gain_text = "Champion of rust. Corruptor of steel. Fear the dark, for the RUSTBRINGER has come! \
The Blacksmith forges ahead! Rusted Hills, CALL MY NAME! WITNESS MY ASCENSION!"
route = PATH_RUST
+ ascension_achievement = /datum/award/achievement/misc/rust_ascension
/// If TRUE, then immunities are currently active.
var/immunities_active = FALSE
/// A typepath to an area that we must finish the ritual in.
@@ -242,7 +258,7 @@
text = "[generate_heretic_text()] Fear the decay, for the Rustbringer, [user.real_name] has ascended! None shall escape the corrosion! [generate_heretic_text()]",
title = "[generate_heretic_text()]",
sound = 'sound/ambience/antag/heretic/ascend_rust.ogg',
- color_override = "pink",
+ color_override = "brown",
)
trigger(loc)
RegisterSignal(user, COMSIG_MOVABLE_MOVED, PROC_REF(on_move))
diff --git a/code/modules/antagonists/heretic/knowledge/sacrifice_knowledge/sacrifice_knowledge.dm b/code/modules/antagonists/heretic/knowledge/sacrifice_knowledge/sacrifice_knowledge.dm
index b35d34839dabc..8da3b90494899 100644
--- a/code/modules/antagonists/heretic/knowledge/sacrifice_knowledge/sacrifice_knowledge.dm
+++ b/code/modules/antagonists/heretic/knowledge/sacrifice_knowledge/sacrifice_knowledge.dm
@@ -16,6 +16,9 @@
cost = 0
priority = MAX_KNOWLEDGE_PRIORITY // Should be at the top
route = PATH_START
+ research_tree_icon_path = 'icons/effects/eldritch.dmi'
+ research_tree_icon_state = "eye_close"
+ research_tree_icon_frame = 1
/// How many targets do we generate?
var/num_targets_to_generate = 5
/// Whether we've generated a heretic sacrifice z-level yet, from any heretic.
diff --git a/code/modules/antagonists/heretic/knowledge/side_ash_moon.dm b/code/modules/antagonists/heretic/knowledge/side_ash_moon.dm
index f933bbfda1d26..758ee0548d5fc 100644
--- a/code/modules/antagonists/heretic/knowledge/side_ash_moon.dm
+++ b/code/modules/antagonists/heretic/knowledge/side_ash_moon.dm
@@ -16,6 +16,9 @@
result_atoms = list(/obj/item/clothing/neck/eldritch_amulet)
cost = 1
route = PATH_SIDE
+ research_tree_icon_path = 'icons/obj/antags/eldritch.dmi'
+ research_tree_icon_state = "eye_medalion"
+ depth = 4
/datum/heretic_knowledge/curse/paralysis
name = "Curse of Paralysis"
@@ -37,6 +40,9 @@
curse_color = "#f19a9a"
cost = 1
route = PATH_SIDE
+ research_tree_icon_path = 'icons/ui_icons/antags/heretic/knowledge.dmi'
+ research_tree_icon_state = "curse_paralysis"
+ depth = 8
/datum/heretic_knowledge/curse/paralysis/curse(mob/living/carbon/human/chosen_mob, boosted = FALSE)
if(chosen_mob.usable_legs <= 0) // What're you gonna do, curse someone who already can't walk?
@@ -75,6 +81,7 @@
cost = 1
route = PATH_SIDE
poll_ignore_define = POLL_IGNORE_ASH_SPIRIT
+ depth = 10
/datum/heretic_knowledge/summon/ashy/cleanup_atoms(list/selected_atoms)
var/obj/item/bodypart/head/ritual_head = locate() in selected_atoms
diff --git a/code/modules/antagonists/heretic/knowledge/side_blade_rust.dm b/code/modules/antagonists/heretic/knowledge/side_blade_rust.dm
index 2a6d1e8058d3d..3a0f17ed48391 100644
--- a/code/modules/antagonists/heretic/knowledge/side_blade_rust.dm
+++ b/code/modules/antagonists/heretic/knowledge/side_blade_rust.dm
@@ -16,6 +16,10 @@
result_atoms = list(/obj/item/clothing/suit/hooded/cultrobes/eldritch)
cost = 1
route = PATH_SIDE
+ research_tree_icon_path = 'icons/obj/clothing/suits/armor.dmi'
+ research_tree_icon_state = "eldritch_armor"
+ research_tree_icon_frame = 12
+ depth = 4
/datum/heretic_knowledge/crucible
name = "Mawed Crucible"
@@ -34,6 +38,9 @@
result_atoms = list(/obj/structure/destructible/eldritch_crucible)
cost = 1
route = PATH_SIDE
+ research_tree_icon_path = 'icons/obj/antags/eldritch.dmi'
+ research_tree_icon_state = "crucible"
+ depth = 8
/datum/heretic_knowledge/rifle
name = "Lionhunter's Rifle"
@@ -59,9 +66,12 @@
result_atoms = list(/obj/item/gun/ballistic/rifle/lionhunter)
cost = 1
route = PATH_SIDE
+ depth = 8
+ research_tree_icon_path = 'icons/obj/weapons/guns/ballistic.dmi'
+ research_tree_icon_state = "goldrevolver"
/datum/heretic_knowledge/rifle_ammo
- name = "Lionhunter Rifle Ammunition (free)"
+ name = "Lionhunter Rifle Ammunition"
desc = "Allows you to transmute 3 ballistic ammo casings (used or unused) of any caliber, \
including shotgun shot, with any animal hide to create an extra clip of ammunition for the Lionhunter Rifle."
gain_text = "The weapon came with three rough iron balls, intended to be used as ammunition. \
@@ -74,6 +84,9 @@
result_atoms = list(/obj/item/ammo_box/strilka310/lionhunter)
cost = 0
route = PATH_SIDE
+ research_tree_icon_path = 'icons/obj/weapons/guns/ammo.dmi'
+ research_tree_icon_state = "310_strip"
+ depth = 8
/// A list of calibers that the ritual will deny. Only ballistic calibers are allowed.
var/static/list/caliber_blacklist = list(
CALIBER_LASER,
@@ -107,3 +120,4 @@
spell_to_add = /datum/action/cooldown/mob_cooldown/charge/rust
cost = 1
route = PATH_SIDE
+ depth = 10
diff --git a/code/modules/antagonists/heretic/knowledge/side_cosmos_ash.dm b/code/modules/antagonists/heretic/knowledge/side_cosmos_ash.dm
index 14a003ce11c0b..1a08236aee64d 100644
--- a/code/modules/antagonists/heretic/knowledge/side_cosmos_ash.dm
+++ b/code/modules/antagonists/heretic/knowledge/side_cosmos_ash.dm
@@ -19,6 +19,8 @@
cost = 1
route = PATH_SIDE
poll_ignore_define = POLL_IGNORE_FIRE_SHARK
+ depth = 4
+ research_tree_icon_dir = EAST
/datum/heretic_knowledge/spell/space_phase
name = "Space Phase"
@@ -32,6 +34,8 @@
spell_to_add = /datum/action/cooldown/spell/jaunt/space_crawl
cost = 1
route = PATH_SIDE
+ depth = 8
+ research_tree_icon_frame = 6
/datum/heretic_knowledge/eldritch_coin
name = "Eldritch Coin"
@@ -51,3 +55,6 @@
result_atoms = list(/obj/item/coin/eldritch)
cost = 1
route = PATH_SIDE
+ research_tree_icon_path = 'icons/obj/economy.dmi'
+ research_tree_icon_state = "coin_heretic"
+ depth = 10
diff --git a/code/modules/antagonists/heretic/knowledge/side_flesh_void.dm b/code/modules/antagonists/heretic/knowledge/side_flesh_void.dm
index 4a315575d61b7..a958ab3f272bb 100644
--- a/code/modules/antagonists/heretic/knowledge/side_flesh_void.dm
+++ b/code/modules/antagonists/heretic/knowledge/side_flesh_void.dm
@@ -19,6 +19,9 @@
result_atoms = list(/obj/item/clothing/suit/hooded/cultrobes/void)
cost = 1
route = PATH_SIDE
+ research_tree_icon_path = 'icons/obj/clothing/suits/armor.dmi'
+ research_tree_icon_state = "void_cloak"
+ depth = 4
/datum/heretic_knowledge/spell/blood_siphon
name = "Blood Siphon"
@@ -32,6 +35,7 @@
spell_to_add = /datum/action/cooldown/spell/pointed/blood_siphon
cost = 1
route = PATH_SIDE
+ depth = 8
/datum/heretic_knowledge/spell/cleave
name = "Blood Cleave"
@@ -46,3 +50,4 @@
spell_to_add = /datum/action/cooldown/spell/pointed/cleave
cost = 1
route = PATH_SIDE
+ depth = 10
diff --git a/code/modules/antagonists/heretic/knowledge/side_lock_flesh.dm b/code/modules/antagonists/heretic/knowledge/side_lock_flesh.dm
index 74013f2b0bd1d..706b83abac7b3 100644
--- a/code/modules/antagonists/heretic/knowledge/side_lock_flesh.dm
+++ b/code/modules/antagonists/heretic/knowledge/side_lock_flesh.dm
@@ -12,6 +12,7 @@
spell_to_add = /datum/action/cooldown/spell/aoe/wave_of_desperation
cost = 1
route = PATH_SIDE
+ depth = 8
/datum/heretic_knowledge/spell/apetra_vulnera
name = "Apetra Vulnera"
@@ -26,3 +27,4 @@
spell_to_add = /datum/action/cooldown/spell/pointed/apetra_vulnera
cost = 1
route = PATH_SIDE
+ depth = 10
diff --git a/code/modules/antagonists/heretic/knowledge/side_lock_moon.dm b/code/modules/antagonists/heretic/knowledge/side_lock_moon.dm
index ac56b9ba24006..1e265b974980f 100644
--- a/code/modules/antagonists/heretic/knowledge/side_lock_moon.dm
+++ b/code/modules/antagonists/heretic/knowledge/side_lock_moon.dm
@@ -13,6 +13,7 @@
spell_to_add = /datum/action/cooldown/spell/pointed/mind_gate
cost = 1
route = PATH_SIDE
+ depth = 4
/datum/heretic_knowledge/unfathomable_curio
name = "Unfathomable Curio"
@@ -33,6 +34,9 @@
result_atoms = list(/obj/item/storage/belt/unfathomable_curio)
cost = 1
route = PATH_SIDE
+ research_tree_icon_path = 'icons/obj/clothing/belts.dmi'
+ research_tree_icon_state = "unfathomable_curio"
+ depth = 8
/datum/heretic_knowledge/painting
name = "Unsealed Arts"
@@ -53,6 +57,9 @@
result_atoms = list(/obj/item/canvas)
cost = 1
route = PATH_SIDE
+ research_tree_icon_path = 'icons/obj/signs.dmi'
+ research_tree_icon_state = "eldritch_painting_weeping"
+ depth = 8
/datum/heretic_knowledge/painting/recipe_snowflake_check(mob/living/user, list/atoms, list/selected_atoms, turf/loc)
if(locate(/obj/item/organ/internal/eyes) in atoms)
diff --git a/code/modules/antagonists/heretic/knowledge/side_rust_cosmos.dm b/code/modules/antagonists/heretic/knowledge/side_rust_cosmos.dm
index 56999243b5de3..11918c66a2906 100644
--- a/code/modules/antagonists/heretic/knowledge/side_rust_cosmos.dm
+++ b/code/modules/antagonists/heretic/knowledge/side_rust_cosmos.dm
@@ -17,6 +17,9 @@
result_atoms = list(/obj/item/reagent_containers/cup/beaker/eldritch)
cost = 1
route = PATH_SIDE
+ depth = 4
+ research_tree_icon_path = 'icons/obj/antags/eldritch.dmi'
+ research_tree_icon_state = "eldritch_flask"
/datum/heretic_knowledge/entropy_pulse
name = "Pulse of Entropy"
@@ -28,6 +31,10 @@
)
cost = 0
route = PATH_SIDE
+ research_tree_icon_path = 'icons/mob/actions/actions_ecult.dmi'
+ research_tree_icon_state = "corrode"
+ research_tree_icon_frame = 10
+ depth = 4
var/rusting_range = 8
/datum/heretic_knowledge/entropy_pulse/on_finished_recipe(mob/living/user, list/selected_atoms, turf/loc)
@@ -60,6 +67,9 @@
curse_color = "#c1ffc9"
cost = 1
route = PATH_SIDE
+ research_tree_icon_path = 'icons/ui_icons/antags/heretic/knowledge.dmi'
+ research_tree_icon_state = "curse_corrosion"
+ depth = 8
/datum/heretic_knowledge/curse/corrosion/curse(mob/living/carbon/human/chosen_mob, boosted = FALSE)
to_chat(chosen_mob, span_danger("You feel very ill..."))
@@ -92,6 +102,7 @@
cost = 1
route = PATH_SIDE
poll_ignore_define = POLL_IGNORE_RUST_SPIRIT
+ depth = 8
/datum/heretic_knowledge/summon/rusty/cleanup_atoms(list/selected_atoms)
var/obj/item/bodypart/head/ritual_head = locate() in selected_atoms
diff --git a/code/modules/antagonists/heretic/knowledge/side_void_blade.dm b/code/modules/antagonists/heretic/knowledge/side_void_blade.dm
index e044eee8619ef..56945262e3cb0 100644
--- a/code/modules/antagonists/heretic/knowledge/side_void_blade.dm
+++ b/code/modules/antagonists/heretic/knowledge/side_void_blade.dm
@@ -23,6 +23,9 @@
limit = 1
cost = 1
route = PATH_SIDE
+ research_tree_icon_path = 'icons/ui_icons/antags/heretic/knowledge.dmi'
+ research_tree_icon_state = "ghoul_shattered"
+ depth = 4
/datum/heretic_knowledge/limited_amount/risen_corpse/recipe_snowflake_check(mob/living/user, list/atoms, list/selected_atoms, turf/loc)
. = ..()
@@ -139,6 +142,9 @@
result_atoms = list(/obj/item/melee/rune_carver)
cost = 1
route = PATH_SIDE
+ depth = 8
+ research_tree_icon_path = 'icons/obj/antags/eldritch.dmi'
+ research_tree_icon_state = "rune_carver"
/datum/heretic_knowledge/summon/maid_in_mirror
name = "Maid in the Mirror"
@@ -162,3 +168,4 @@
route = PATH_SIDE
mob_to_summon = /mob/living/basic/heretic_summon/maid_in_the_mirror
poll_ignore_define = POLL_IGNORE_MAID_IN_MIRROR
+ depth = 10
diff --git a/code/modules/antagonists/heretic/knowledge/starting_lore.dm b/code/modules/antagonists/heretic/knowledge/starting_lore.dm
index 50b57fd9e96b4..0a93659884a14 100644
--- a/code/modules/antagonists/heretic/knowledge/starting_lore.dm
+++ b/code/modules/antagonists/heretic/knowledge/starting_lore.dm
@@ -1,4 +1,5 @@
// Heretic starting knowledge.
+// Default heretic language is Ancient Greek, because, uh, they're like ancient and shit.
/// Global list of all heretic knowledge that have route = PATH_START. List of PATHS.
GLOBAL_LIST_INIT(heretic_start_knowledge, initialize_starting_knowledge())
@@ -48,6 +49,9 @@ GLOBAL_LIST_INIT(heretic_start_knowledge, initialize_starting_knowledge())
cost = 0
priority = MAX_KNOWLEDGE_PRIORITY - 1 // Knowing how to remake your heart is important
route = PATH_START
+ research_tree_icon_path = 'icons/obj/antags/eldritch.dmi'
+ research_tree_icon_state = "living_heart"
+ research_tree_icon_frame = 1
/// The typepath of the organ type required for our heart.
var/required_organ_type = /obj/item/organ/internal/heart
@@ -204,6 +208,8 @@ GLOBAL_LIST_INIT(heretic_start_knowledge, initialize_starting_knowledge())
cost = 0
priority = MAX_KNOWLEDGE_PRIORITY - 2 // Not as important as making a heart or sacrificing, but important enough.
route = PATH_START
+ research_tree_icon_path = 'icons/obj/clothing/neck.dmi'
+ research_tree_icon_state = "eldritch_necklace"
/datum/heretic_knowledge/spell/cloak_of_shadows
name = "Cloak of Shadow"
@@ -238,6 +244,8 @@ GLOBAL_LIST_INIT(heretic_start_knowledge, initialize_starting_knowledge())
route = PATH_START
priority = MAX_KNOWLEDGE_PRIORITY - 3 // Least priority out of the starting knowledges, as it's an optional boon.
var/static/list/non_mob_bindings = typecacheof(list(/obj/item/stack/sheet/leather, /obj/item/stack/sheet/animalhide))
+ research_tree_icon_path = 'icons/obj/antags/eldritch.dmi'
+ research_tree_icon_state = "book"
/datum/heretic_knowledge/codex_cicatrix/parse_required_item(atom/item_path, number_of_things)
if(item_path == /obj/item/pen)
@@ -300,6 +308,8 @@ GLOBAL_LIST_INIT(heretic_start_knowledge, initialize_starting_knowledge())
gain_text = "Under the soft glow of unreason there is a beast that stalks the night. I shall bring it forth and let it enter my presence. It will feast upon my amibitions and leave knowledge in its wake."
route = PATH_START
required_atoms = list()
+ research_tree_icon_path = 'icons/mob/actions/actions_animal.dmi'
+ research_tree_icon_state = "god_transmit"
/datum/heretic_knowledge/feast_of_owls/can_be_invoked(datum/antagonist/heretic/invoker)
return !invoker.feast_of_owls
diff --git a/code/modules/antagonists/heretic/knowledge/void_lore.dm b/code/modules/antagonists/heretic/knowledge/void_lore.dm
index da1864f87dbc5..482de8184401b 100644
--- a/code/modules/antagonists/heretic/knowledge/void_lore.dm
+++ b/code/modules/antagonists/heretic/knowledge/void_lore.dm
@@ -1,5 +1,7 @@
/**
* # The path of VOID.
+ * Spell names are in this language: PALI
+ * Both are related: Pali-Buddhism-Nothingness-Void
*
* Goes as follows:
*
@@ -37,6 +39,8 @@
required_atoms = list(/obj/item/knife = 1)
result_atoms = list(/obj/item/melee/sickly_blade/void)
route = PATH_VOID
+ research_tree_icon_path = 'icons/obj/weapons/khopesh.dmi'
+ research_tree_icon_state = "void_blade"
/datum/heretic_knowledge/limited_amount/starting/base_void/recipe_snowflake_check(mob/living/user, list/atoms, list/selected_atoms, turf/loc)
if(!isopenturf(loc))
@@ -58,6 +62,9 @@
next_knowledge = list(/datum/heretic_knowledge/cold_snap)
cost = 1
route = PATH_VOID
+ depth = 3
+ research_tree_icon_path = 'icons/ui_icons/antags/heretic/knowledge.dmi'
+ research_tree_icon_state = "grasp_void"
/datum/heretic_knowledge/void_grasp/on_gain(mob/user, datum/antagonist/heretic/our_heretic)
RegisterSignal(user, COMSIG_HERETIC_MANSUS_GRASP_ATTACK, PROC_REF(on_mansus_grasp))
@@ -88,6 +95,9 @@
)
cost = 1
route = PATH_VOID
+ research_tree_icon_path = 'icons/effects/effects.dmi'
+ research_tree_icon_state = "the_freezer"
+ depth = 4
/datum/heretic_knowledge/cold_snap/on_gain(mob/user, datum/antagonist/heretic/our_heretic)
user.add_traits(list(TRAIT_NOBREATH, TRAIT_RESISTCOLD), type)
@@ -119,6 +129,7 @@
spell_to_add = /datum/action/cooldown/spell/cone/staggered/cone_of_cold/void
cost = 1
route = PATH_VOID
+ depth = 7
/datum/heretic_knowledge/spell/void_phase
name = "Void Phase"
@@ -135,6 +146,8 @@
spell_to_add = /datum/action/cooldown/spell/pointed/void_phase
cost = 1
route = PATH_VOID
+ depth = 8
+ research_tree_icon_frame = 7
/datum/heretic_knowledge/blade_upgrade/void
name = "Seeking Blade"
@@ -142,6 +155,8 @@
gain_text = "Fleeting memories, fleeting feet. I mark my way with frozen blood upon the snow. Covered and forgotten."
next_knowledge = list(/datum/heretic_knowledge/spell/void_pull)
route = PATH_VOID
+ research_tree_icon_path = 'icons/ui_icons/antags/heretic/knowledge.dmi'
+ research_tree_icon_state = "blade_upgrade_void"
/datum/heretic_knowledge/blade_upgrade/void/do_ranged_effects(mob/living/user, mob/living/target, obj/item/melee/sickly_blade/blade)
if(!target.has_status_effect(/datum/status_effect/eldritch))
@@ -168,6 +183,8 @@
spell_to_add = /datum/action/cooldown/spell/aoe/void_pull
cost = 1
route = PATH_VOID
+ depth = 10
+ research_tree_icon_frame = 6
/datum/heretic_knowledge/ultimate/void_final
name = "Waltz at the End of Time"
@@ -180,6 +197,7 @@
The Aristocrat stands before me, beckoning. We will play a waltz to the whispers of dying reality, \
as the world is destroyed before our eyes. The void will return all to nothing, WITNESS MY ASCENSION!"
route = PATH_VOID
+ ascension_achievement = /datum/award/achievement/misc/void_ascension
///soundloop for the void theme
var/datum/looping_sound/void_loop/sound_loop
///Reference to the ongoing voidstrom that surrounds the heretic
@@ -203,9 +221,8 @@
text = "[generate_heretic_text()] The nobleman of void [user.real_name] has arrived, stepping along the Waltz that ends worlds! [generate_heretic_text()]",
title = "[generate_heretic_text()]",
sound = 'sound/ambience/antag/heretic/ascend_void.ogg',
- color_override = "pink",
+ color_override = "blue",
)
- user.client?.give_award(/datum/award/achievement/misc/void_ascension, user)
ADD_TRAIT(user, TRAIT_RESISTLOWPRESSURE, MAGIC_TRAIT)
// Let's get this show on the road!
diff --git a/code/modules/antagonists/heretic/magic/aggressive_spread.dm b/code/modules/antagonists/heretic/magic/aggressive_spread.dm
index dfb4a94847406..0c14550f0b269 100644
--- a/code/modules/antagonists/heretic/magic/aggressive_spread.dm
+++ b/code/modules/antagonists/heretic/magic/aggressive_spread.dm
@@ -10,8 +10,8 @@
school = SCHOOL_FORBIDDEN
cooldown_time = 30 SECONDS
- invocation = "A'GRSV SPR'D"
- invocation_type = INVOCATION_WHISPER
+ invocation = "Agresiv'noe rasprostra-neniye!"
+ invocation_type = INVOCATION_SHOUT
spell_requirements = NONE
aoe_radius = 2
diff --git a/code/modules/antagonists/heretic/magic/apetravulnera.dm b/code/modules/antagonists/heretic/magic/apetravulnera.dm
index e80d08911848c..eedef71f4b6c8 100644
--- a/code/modules/antagonists/heretic/magic/apetravulnera.dm
+++ b/code/modules/antagonists/heretic/magic/apetravulnera.dm
@@ -10,8 +10,8 @@
school = SCHOOL_FORBIDDEN
cooldown_time = 45 SECONDS
- invocation = "AP'TRA VULN'RA!"
- invocation_type = INVOCATION_WHISPER
+ invocation = "Shea' shen-eh!"
+ invocation_type = INVOCATION_SHOUT
spell_requirements = NONE
cast_range = 4
diff --git a/code/modules/antagonists/heretic/magic/ash_ascension.dm b/code/modules/antagonists/heretic/magic/ash_ascension.dm
index 8b564198a61eb..70422a7c48a37 100644
--- a/code/modules/antagonists/heretic/magic/ash_ascension.dm
+++ b/code/modules/antagonists/heretic/magic/ash_ascension.dm
@@ -10,7 +10,7 @@
school = SCHOOL_FORBIDDEN
cooldown_time = 70 SECONDS
- invocation = "FL'MS"
+ invocation = "EID'R-ELDR!!!"
invocation_type = INVOCATION_WHISPER
spell_requirements = NONE
@@ -72,8 +72,8 @@
school = SCHOOL_FORBIDDEN
cooldown_time = 30 SECONDS
- invocation = "C'SC'DE"
- invocation_type = INVOCATION_WHISPER
+ invocation = "ILLA-LASARA'FOSS!!!"
+ invocation_type = INVOCATION_SHOUT
spell_requirements = NONE
/// The radius the flames will go around the caster.
@@ -112,7 +112,7 @@
school = SCHOOL_FORBIDDEN
cooldown_time = 300
- invocation = "F'RE"
+ invocation = "Eld'sky!"
invocation_type = INVOCATION_WHISPER
spell_requirements = NONE
diff --git a/code/modules/antagonists/heretic/magic/ash_jaunt.dm b/code/modules/antagonists/heretic/magic/ash_jaunt.dm
index 41242063a9098..4f8c59d635145 100644
--- a/code/modules/antagonists/heretic/magic/ash_jaunt.dm
+++ b/code/modules/antagonists/heretic/magic/ash_jaunt.dm
@@ -10,7 +10,7 @@
school = SCHOOL_FORBIDDEN
cooldown_time = 15 SECONDS
- invocation = "ASH'N P'SSG'"
+ invocation = "Askgraar' goetur!"
invocation_type = INVOCATION_WHISPER
spell_requirements = NONE
diff --git a/code/modules/antagonists/heretic/magic/blood_cleave.dm b/code/modules/antagonists/heretic/magic/blood_cleave.dm
index d5317f23e344b..b3370a3ccc614 100644
--- a/code/modules/antagonists/heretic/magic/blood_cleave.dm
+++ b/code/modules/antagonists/heretic/magic/blood_cleave.dm
@@ -10,7 +10,7 @@
school = SCHOOL_FORBIDDEN
cooldown_time = 45 SECONDS
- invocation = "CL'VE!"
+ invocation = "Fer're!"
invocation_type = INVOCATION_WHISPER
spell_requirements = NONE
diff --git a/code/modules/antagonists/heretic/magic/blood_siphon.dm b/code/modules/antagonists/heretic/magic/blood_siphon.dm
index 1e3d6258826d4..6280353a072a5 100644
--- a/code/modules/antagonists/heretic/magic/blood_siphon.dm
+++ b/code/modules/antagonists/heretic/magic/blood_siphon.dm
@@ -11,7 +11,7 @@
school = SCHOOL_FORBIDDEN
cooldown_time = 15 SECONDS
- invocation = "FL'MS O'ET'RN'ITY."
+ invocation = "Sanguis suctio!"
invocation_type = INVOCATION_WHISPER
spell_requirements = NONE
diff --git a/code/modules/antagonists/heretic/magic/burglar_finesse.dm b/code/modules/antagonists/heretic/magic/burglar_finesse.dm
index a90acb8495f14..c5264119bb48e 100644
--- a/code/modules/antagonists/heretic/magic/burglar_finesse.dm
+++ b/code/modules/antagonists/heretic/magic/burglar_finesse.dm
@@ -9,7 +9,7 @@
school = SCHOOL_FORBIDDEN
cooldown_time = 40 SECONDS
- invocation = "Y'O'K!"
+ invocation = "Khenem"
invocation_type = INVOCATION_WHISPER
spell_requirements = NONE
diff --git a/code/modules/antagonists/heretic/magic/cosmic_expansion.dm b/code/modules/antagonists/heretic/magic/cosmic_expansion.dm
index 3fb197d392cb0..6869dc0df51c0 100644
--- a/code/modules/antagonists/heretic/magic/cosmic_expansion.dm
+++ b/code/modules/antagonists/heretic/magic/cosmic_expansion.dm
@@ -11,7 +11,7 @@
school = SCHOOL_FORBIDDEN
cooldown_time = 45 SECONDS
- invocation = "C'SM'S 'XP'ND"
+ invocation = "An'gar baltil!"
invocation_type = INVOCATION_SHOUT
spell_requirements = NONE
diff --git a/code/modules/antagonists/heretic/magic/cosmic_runes.dm b/code/modules/antagonists/heretic/magic/cosmic_runes.dm
index 207b60ae9393a..e07aa4fbe8b8a 100644
--- a/code/modules/antagonists/heretic/magic/cosmic_runes.dm
+++ b/code/modules/antagonists/heretic/magic/cosmic_runes.dm
@@ -11,7 +11,7 @@
school = SCHOOL_FORBIDDEN
cooldown_time = 15 SECONDS
- invocation = "ST'R R'N'"
+ invocation = "Is'zara-runen"
invocation_type = INVOCATION_WHISPER
spell_requirements = NONE
diff --git a/code/modules/antagonists/heretic/magic/eldritch_blind.dm b/code/modules/antagonists/heretic/magic/eldritch_blind.dm
index 8df20503821b0..413ff4fe67810 100644
--- a/code/modules/antagonists/heretic/magic/eldritch_blind.dm
+++ b/code/modules/antagonists/heretic/magic/eldritch_blind.dm
@@ -5,7 +5,7 @@
overlay_icon_state = "bg_heretic_border"
school = SCHOOL_FORBIDDEN
- invocation = "E'E'S"
+ invocation = "Caecus"
spell_requirements = NONE
cast_range = 10
diff --git a/code/modules/antagonists/heretic/magic/eldritch_emplosion.dm b/code/modules/antagonists/heretic/magic/eldritch_emplosion.dm
index c68ed07c81f8c..4028f80f84cea 100644
--- a/code/modules/antagonists/heretic/magic/eldritch_emplosion.dm
+++ b/code/modules/antagonists/heretic/magic/eldritch_emplosion.dm
@@ -8,7 +8,7 @@
school = SCHOOL_FORBIDDEN
cooldown_time = 30 SECONDS
- invocation = "E'P"
+ invocation = "Pulsus Energiae"
invocation_type = INVOCATION_WHISPER
spell_requirements = NONE
diff --git a/code/modules/antagonists/heretic/magic/eldritch_shapeshift.dm b/code/modules/antagonists/heretic/magic/eldritch_shapeshift.dm
index e598f1f9215b9..bde032a3b39fd 100644
--- a/code/modules/antagonists/heretic/magic/eldritch_shapeshift.dm
+++ b/code/modules/antagonists/heretic/magic/eldritch_shapeshift.dm
@@ -7,7 +7,7 @@
overlay_icon_state = "bg_heretic_border"
school = SCHOOL_FORBIDDEN
- invocation = "SH'PE"
+ invocation = "Forma"
invocation_type = INVOCATION_WHISPER
spell_requirements = NONE
diff --git a/code/modules/antagonists/heretic/magic/fire_blast.dm b/code/modules/antagonists/heretic/magic/fire_blast.dm
index 4c17ca5ffc0de..8c6d632be9f2d 100644
--- a/code/modules/antagonists/heretic/magic/fire_blast.dm
+++ b/code/modules/antagonists/heretic/magic/fire_blast.dm
@@ -12,7 +12,7 @@
school = SCHOOL_FORBIDDEN
cooldown_time = 45 SECONDS
- invocation = "V'LC'N!"
+ invocation = "Eld'fjall!"
invocation_type = INVOCATION_SHOUT
spell_requirements = NONE
channel_time = 5 SECONDS
diff --git a/code/modules/antagonists/heretic/magic/flesh_ascension.dm b/code/modules/antagonists/heretic/magic/flesh_ascension.dm
index a2d792080e058..add0704a8d61a 100644
--- a/code/modules/antagonists/heretic/magic/flesh_ascension.dm
+++ b/code/modules/antagonists/heretic/magic/flesh_ascension.dm
@@ -9,7 +9,7 @@
school = SCHOOL_FORBIDDEN
- invocation = "REALITY UNCOIL!"
+ invocation = "REALITAS EXSERPAT!!"
invocation_type = INVOCATION_SHOUT
spell_requirements = NONE
diff --git a/code/modules/antagonists/heretic/magic/flesh_surgery.dm b/code/modules/antagonists/heretic/magic/flesh_surgery.dm
index 2ca256419efca..96ccb8450f97b 100644
--- a/code/modules/antagonists/heretic/magic/flesh_surgery.dm
+++ b/code/modules/antagonists/heretic/magic/flesh_surgery.dm
@@ -11,8 +11,8 @@
school = SCHOOL_FORBIDDEN
cooldown_time = 20 SECONDS
- invocation = "CL'M M'N!" // "CLAIM MINE", but also almost "KALI MA"
- invocation_type = INVOCATION_SHOUT
+ invocation = "Carnis chirurgia"
+ invocation_type = INVOCATION_WHISPER
spell_requirements = NONE
hand_path = /obj/item/melee/touch_attack/flesh_surgery
diff --git a/code/modules/antagonists/heretic/magic/furious_steel.dm b/code/modules/antagonists/heretic/magic/furious_steel.dm
index 0ab882a9289e1..36c7c07608bcb 100644
--- a/code/modules/antagonists/heretic/magic/furious_steel.dm
+++ b/code/modules/antagonists/heretic/magic/furious_steel.dm
@@ -11,7 +11,7 @@
school = SCHOOL_FORBIDDEN
cooldown_time = 60 SECONDS
- invocation = "F'LSH'NG S'LV'R!"
+ invocation = "Ham'sana-qasep!"
invocation_type = INVOCATION_SHOUT
spell_requirements = NONE
diff --git a/code/modules/antagonists/heretic/magic/manse_link.dm b/code/modules/antagonists/heretic/magic/manse_link.dm
index 06fd4dd9863f4..e077c6db2b45f 100644
--- a/code/modules/antagonists/heretic/magic/manse_link.dm
+++ b/code/modules/antagonists/heretic/magic/manse_link.dm
@@ -11,7 +11,7 @@
school = SCHOOL_FORBIDDEN
cooldown_time = 20 SECONDS
- invocation = "PI'RC' TH' M'ND."
+ invocation = "Diaperaste' to-myalo!"
invocation_type = INVOCATION_SHOUT
spell_requirements = NONE
antimagic_flags = MAGIC_RESISTANCE|MAGIC_RESISTANCE_MIND
diff --git a/code/modules/antagonists/heretic/magic/mansus_grasp.dm b/code/modules/antagonists/heretic/magic/mansus_grasp.dm
index e3fbb364f6b1f..483425f3847b5 100644
--- a/code/modules/antagonists/heretic/magic/mansus_grasp.dm
+++ b/code/modules/antagonists/heretic/magic/mansus_grasp.dm
@@ -10,7 +10,7 @@
school = SCHOOL_EVOCATION
cooldown_time = 10 SECONDS
- invocation = "R'CH T'H TR'TH!"
+ invocation = "Ad verum per aspera!"
invocation_type = INVOCATION_SHOUT
// Mimes can cast it. Chaplains can cast it. Anyone can cast it, so long as they have a hand.
spell_requirements = SPELL_CASTABLE_WITHOUT_INVOCATION
diff --git a/code/modules/antagonists/heretic/magic/mind_gate.dm b/code/modules/antagonists/heretic/magic/mind_gate.dm
index c5a6e74452a61..aa6b8ef20af4d 100644
--- a/code/modules/antagonists/heretic/magic/mind_gate.dm
+++ b/code/modules/antagonists/heretic/magic/mind_gate.dm
@@ -11,7 +11,7 @@
school = SCHOOL_FORBIDDEN
cooldown_time = 20 SECONDS
- invocation = "Op' 'oY 'Mi'd"
+ invocation = "Sha'ar ha-da'at"
invocation_type = INVOCATION_WHISPER
spell_requirements = NONE
cast_range = 6
diff --git a/code/modules/antagonists/heretic/magic/moon_parade.dm b/code/modules/antagonists/heretic/magic/moon_parade.dm
index 3b7f1d007cd6e..4919500e351de 100644
--- a/code/modules/antagonists/heretic/magic/moon_parade.dm
+++ b/code/modules/antagonists/heretic/magic/moon_parade.dm
@@ -11,7 +11,7 @@
school = SCHOOL_FORBIDDEN
cooldown_time = 30 SECONDS
- invocation = "L'N'R P'RAD"
+ invocation = "Tsiyun' levani!"
invocation_type = INVOCATION_SHOUT
spell_requirements = NONE
diff --git a/code/modules/antagonists/heretic/magic/moon_ringleader.dm b/code/modules/antagonists/heretic/magic/moon_ringleader.dm
index 3c0b1d2aedb52..e62c34bb990bb 100644
--- a/code/modules/antagonists/heretic/magic/moon_ringleader.dm
+++ b/code/modules/antagonists/heretic/magic/moon_ringleader.dm
@@ -12,7 +12,7 @@
school = SCHOOL_FORBIDDEN
cooldown_time = 1 MINUTES
- invocation = "R''S 'E"
+ invocation = "Manahel-qomem!"
invocation_type = INVOCATION_SHOUT
spell_requirements = NONE
diff --git a/code/modules/antagonists/heretic/magic/moon_smile.dm b/code/modules/antagonists/heretic/magic/moon_smile.dm
index 35f2d77e3e6b6..236fd257e385d 100644
--- a/code/modules/antagonists/heretic/magic/moon_smile.dm
+++ b/code/modules/antagonists/heretic/magic/moon_smile.dm
@@ -12,7 +12,7 @@
school = SCHOOL_FORBIDDEN
cooldown_time = 20 SECONDS
- invocation = "Mo'N S'M'LE"
+ invocation = "Hiyuk-levana!"
invocation_type = INVOCATION_SHOUT
spell_requirements = NONE
cast_range = 6
diff --git a/code/modules/antagonists/heretic/magic/nightwatcher_rebirth.dm b/code/modules/antagonists/heretic/magic/nightwatcher_rebirth.dm
index 4e37f5db17fed..8a9b60644b6b7 100644
--- a/code/modules/antagonists/heretic/magic/nightwatcher_rebirth.dm
+++ b/code/modules/antagonists/heretic/magic/nightwatcher_rebirth.dm
@@ -11,7 +11,7 @@
school = SCHOOL_FORBIDDEN
cooldown_time = 1 MINUTES
- invocation = "GL'RY T' TH' N'GHT'W'TCH'ER"
+ invocation = "Dyrth-a Vaktry'ggjandi"
invocation_type = INVOCATION_WHISPER
spell_requirements = SPELL_REQUIRES_HUMAN
diff --git a/code/modules/antagonists/heretic/magic/realignment.dm b/code/modules/antagonists/heretic/magic/realignment.dm
index d3ddc03fbbef3..dbce0fe0940dd 100644
--- a/code/modules/antagonists/heretic/magic/realignment.dm
+++ b/code/modules/antagonists/heretic/magic/realignment.dm
@@ -14,8 +14,8 @@
cooldown_reduction_per_rank = -6 SECONDS // we're not a wizard spell but we use the levelling mechanic
spell_max_level = 10 // we can get up to / over a minute duration cd time
- invocation = "R'S'T."
- invocation_type = INVOCATION_SHOUT
+ invocation = "Rasut"
+ invocation_type = INVOCATION_WHISPER
spell_requirements = NONE
/datum/action/cooldown/spell/realignment/is_valid_target(atom/cast_on)
diff --git a/code/modules/antagonists/heretic/magic/rust_wave.dm b/code/modules/antagonists/heretic/magic/rust_wave.dm
index 0282a32b2b687..7ecb3fd0ffbba 100644
--- a/code/modules/antagonists/heretic/magic/rust_wave.dm
+++ b/code/modules/antagonists/heretic/magic/rust_wave.dm
@@ -13,8 +13,8 @@
school = SCHOOL_FORBIDDEN
cooldown_time = 30 SECONDS
- invocation = "'NTR'P'C PL'M'"
- invocation_type = INVOCATION_WHISPER
+ invocation = "Entro'pichniy-plim!"
+ invocation_type = INVOCATION_SHOUT
spell_requirements = NONE
cone_levels = 5
@@ -78,8 +78,8 @@
school = SCHOOL_FORBIDDEN
cooldown_time = 35 SECONDS
- invocation = "SPR'D TH' WO'D"
- invocation_type = INVOCATION_WHISPER
+ invocation = "Diffunde' verbum!"
+ invocation_type = INVOCATION_SHOUT
spell_requirements = NONE
projectile_type = /obj/projectile/magic/aoe/rust_wave
diff --git a/code/modules/antagonists/heretic/magic/star_blast.dm b/code/modules/antagonists/heretic/magic/star_blast.dm
index 3eb62b7ada814..294608a03b998 100644
--- a/code/modules/antagonists/heretic/magic/star_blast.dm
+++ b/code/modules/antagonists/heretic/magic/star_blast.dm
@@ -10,7 +10,7 @@
school = SCHOOL_FORBIDDEN
cooldown_time = 20 SECONDS
- invocation = "R'T'T' ST'R!"
+ invocation = "Pi-rig is'zara!"
invocation_type = INVOCATION_SHOUT
spell_requirements = NONE
diff --git a/code/modules/antagonists/heretic/magic/star_touch.dm b/code/modules/antagonists/heretic/magic/star_touch.dm
index 89c5d02e7d498..dff56df4e3f1f 100644
--- a/code/modules/antagonists/heretic/magic/star_touch.dm
+++ b/code/modules/antagonists/heretic/magic/star_touch.dm
@@ -13,7 +13,7 @@
sound = 'sound/items/welder.ogg'
school = SCHOOL_FORBIDDEN
cooldown_time = 15 SECONDS
- invocation = "ST'R 'N'RG'!"
+ invocation = "An'gar sig!"
invocation_type = INVOCATION_SHOUT
spell_requirements = NONE
antimagic_flags = MAGIC_RESISTANCE
diff --git a/code/modules/antagonists/heretic/magic/void_cold_cone.dm b/code/modules/antagonists/heretic/magic/void_cold_cone.dm
index 92c45dc10b010..40dc9612a50f6 100644
--- a/code/modules/antagonists/heretic/magic/void_cold_cone.dm
+++ b/code/modules/antagonists/heretic/magic/void_cold_cone.dm
@@ -11,7 +11,7 @@
school = SCHOOL_FORBIDDEN
cooldown_time = 30 SECONDS
- invocation = "FR'ZE!"
+ invocation = "Sunya'kop!"
invocation_type = INVOCATION_SHOUT
spell_requirements = NONE
diff --git a/code/modules/antagonists/heretic/magic/void_phase.dm b/code/modules/antagonists/heretic/magic/void_phase.dm
index 350ca0f29c100..f3f0864224c4c 100644
--- a/code/modules/antagonists/heretic/magic/void_phase.dm
+++ b/code/modules/antagonists/heretic/magic/void_phase.dm
@@ -12,8 +12,8 @@
school = SCHOOL_FORBIDDEN
cooldown_time = 30 SECONDS
- invocation = "RE'L'TY PH'S'E."
- invocation_type = INVOCATION_WHISPER
+ invocation = "Sunya'sthiti!"
+ invocation_type = INVOCATION_SHOUT
spell_requirements = NONE
cast_range = 9
diff --git a/code/modules/antagonists/heretic/magic/void_pull.dm b/code/modules/antagonists/heretic/magic/void_pull.dm
index 2021bf8a04e4f..dc4673b0714ce 100644
--- a/code/modules/antagonists/heretic/magic/void_pull.dm
+++ b/code/modules/antagonists/heretic/magic/void_pull.dm
@@ -11,8 +11,8 @@
school = SCHOOL_FORBIDDEN
cooldown_time = 40 SECONDS
- invocation = "BR'NG F'RTH TH'M T' M'."
- invocation_type = INVOCATION_WHISPER
+ invocation = "Sunya'apamkti!"
+ invocation_type = INVOCATION_SHOUT
spell_requirements = NONE
aoe_radius = 7
diff --git a/code/modules/antagonists/heretic/magic/wave_of_desperation.dm b/code/modules/antagonists/heretic/magic/wave_of_desperation.dm
index 3b78b56ddc0ba..b9502f08967bb 100644
--- a/code/modules/antagonists/heretic/magic/wave_of_desperation.dm
+++ b/code/modules/antagonists/heretic/magic/wave_of_desperation.dm
@@ -11,8 +11,8 @@
school = SCHOOL_FORBIDDEN
cooldown_time = 5 MINUTES
- invocation = "F'K 'FF."
- invocation_type = INVOCATION_WHISPER
+ invocation = "Kher' Sekh-em waaef'k!"
+ invocation_type = INVOCATION_SHOUT
spell_requirements = NONE
aoe_radius = 3
diff --git a/code/modules/atmospherics/machinery/portable/canister.dm b/code/modules/atmospherics/machinery/portable/canister.dm
index c3dae6241620d..af13be0bbbf9b 100644
--- a/code/modules/atmospherics/machinery/portable/canister.dm
+++ b/code/modules/atmospherics/machinery/portable/canister.dm
@@ -101,6 +101,8 @@
/obj/machinery/portable_atmospherics/canister/examine(user)
. = ..()
+ if(atom_integrity < max_integrity)
+ . += span_notice("Integrity compromised, repair hull with a welding tool.")
. += span_notice("A sticker on its side says MAX SAFE PRESSURE: [siunit_pressure(initial(pressure_limit), 0)]; MAX SAFE TEMPERATURE: [siunit(temp_limit, "K", 0)] .")
. += span_notice("The hull is welded together and can be cut apart.")
if(internal_cell)
@@ -109,8 +111,6 @@
. += span_notice("Warning, no cell installed, use a screwdriver to open the hatch and insert one.")
if(panel_open)
. += span_notice("Hatch open, close it with a screwdriver.")
- if(integrity_failure)
- . += span_notice("Integrity compromised, repair hull with a welding tool.")
// Please keep the canister types sorted
// Basic canister per gas below here
diff --git a/code/modules/atmospherics/machinery/portable/scrubber.dm b/code/modules/atmospherics/machinery/portable/scrubber.dm
index 09c6c64709b9a..6f66e9e07d2c0 100644
--- a/code/modules/atmospherics/machinery/portable/scrubber.dm
+++ b/code/modules/atmospherics/machinery/portable/scrubber.dm
@@ -1,16 +1,17 @@
/obj/machinery/portable_atmospherics/scrubber
name = "portable air scrubber"
+ desc = "A portable variant of the station scrubbers, capable of filtering gas from the air around it or inserted tank. May also be wrenched into a port."
icon_state = "scrubber"
density = TRUE
max_integrity = 250
- volume = 1000
+ volume = 2000
///Is the machine on?
var/on = FALSE
///the rate the machine will scrub air
- var/volume_rate = 1000
+ var/volume_rate = 650
///Multiplier with ONE_ATMOSPHERE, if the enviroment pressure is higher than that, the scrubber won't work
- var/overpressure_m = 80
+ var/overpressure_m = 100
///Should the machine use overlay in update_overlays() when open/close?
var/use_overlays = TRUE
///List of gases that can be scrubbed
@@ -59,8 +60,13 @@
excited = TRUE
- var/atom/target = holding || get_turf(src)
- scrub(target.return_air())
+ if(!isnull(holding))
+ scrub(holding.return_air())
+ return ..()
+
+ var/turf/epicentre = get_turf(src)
+ for(var/turf/open/openturf in epicentre.get_atmos_adjacent_turfs(alldir = TRUE))
+ scrub(openturf.return_air())
return ..()
/**
@@ -68,28 +74,39 @@
* Arguments:
* * mixture: the gas mixture to be scrubbed
*/
-/obj/machinery/portable_atmospherics/scrubber/proc/scrub(datum/gas_mixture/mixture)
+/obj/machinery/portable_atmospherics/scrubber/proc/scrub(datum/gas_mixture/environment)
if(air_contents.return_pressure() >= overpressure_m * ONE_ATMOSPHERE)
return
- var/transfer_moles = min(1, volume_rate / mixture.volume) * mixture.total_moles()
+ var/list/env_gases = environment.gases
- var/datum/gas_mixture/filtering = mixture.remove(transfer_moles) // Remove part of the mixture to filter.
- var/datum/gas_mixture/filtered = new
- if(!filtering)
- return
+ //contains all of the gas we're sucking out of the tile, gets put into our parent pipenet
+ var/datum/gas_mixture/filtered_out = new
+ var/list/filtered_gases = filtered_out.gases
+ filtered_out.temperature = environment.temperature
- filtered.temperature = filtering.temperature
- for(var/gas in filtering.gases & scrubbing)
- filtered.add_gas(gas)
- filtered.gases[gas][MOLES] = filtering.gases[gas][MOLES] // Shuffle the "bad" gasses to the filtered mixture.
- filtering.gases[gas][MOLES] = 0
- filtering.garbage_collect() // Now that the gasses are set to 0, clean up the mixture.
+ //maximum percentage of the turfs gas we can filter
+ var/removal_ratio = min(1, volume_rate / environment.volume)
- air_contents.merge(filtered) // Store filtered out gasses.
- mixture.merge(filtering) // Returned the cleaned gas.
- if(!holding)
- air_update_turf(FALSE, FALSE)
+ var/total_moles_to_remove = 0
+ for(var/gas in scrubbing & env_gases)
+ total_moles_to_remove += env_gases[gas][MOLES]
+
+ if(total_moles_to_remove == 0)//sometimes this gets non gc'd values
+ environment.garbage_collect()
+ return FALSE
+
+ for(var/gas in scrubbing & env_gases)
+ filtered_out.add_gas(gas)
+ var/transferred_moles = max(QUANTIZE(env_gases[gas][MOLES] * removal_ratio * (env_gases[gas][MOLES] / total_moles_to_remove)), min(MOLAR_ACCURACY*1000, env_gases[gas][MOLES]))
+
+ filtered_gases[gas][MOLES] = transferred_moles
+ env_gases[gas][MOLES] -= transferred_moles
+
+ environment.garbage_collect()
+
+ //Remix the resulting gases
+ air_contents.merge(filtered_out)
/obj/machinery/portable_atmospherics/scrubber/emp_act(severity)
. = ..()
diff --git a/code/modules/clothing/masks/muzzle.dm b/code/modules/clothing/masks/muzzle.dm
index 32f29a54a1f43..6154e7762cb52 100644
--- a/code/modules/clothing/masks/muzzle.dm
+++ b/code/modules/clothing/masks/muzzle.dm
@@ -5,11 +5,14 @@
inhand_icon_state = "blindfold"
lefthand_file = 'icons/mob/inhands/clothing/glasses_lefthand.dmi'
righthand_file = 'icons/mob/inhands/clothing/glasses_righthand.dmi'
- clothing_flags = BLOCKS_SPEECH
flags_cover = MASKCOVERSMOUTH
w_class = WEIGHT_CLASS_SMALL
equip_delay_other = 20
+/obj/item/clothing/mask/muzzle/Initialize(mapload)
+ . = ..()
+ AddElement(/datum/element/muffles_speech)
+
/obj/item/clothing/mask/muzzle/attack_paw(mob/user, list/modifiers)
if(iscarbon(user))
var/mob/living/carbon/carbon_user = user
@@ -26,7 +29,7 @@
lefthand_file = 'icons/mob/inhands/clothing/masks_lefthand.dmi'
righthand_file = 'icons/mob/inhands/clothing/masks_righthand.dmi'
body_parts_covered = NONE
- clothing_flags = MASKINTERNALS | BLOCKS_SPEECH
+ clothing_flags = MASKINTERNALS
armor_type = /datum/armor/muzzle_breath
equip_delay_other = 25 // my sprite has 4 straps, a-la a head harness. takes a while to equip, longer than a muzzle
@@ -37,7 +40,7 @@
worn_icon_state = "tape_piece_worn"
inhand_icon_state = null
w_class = WEIGHT_CLASS_TINY
- clothing_flags = INEDIBLE_CLOTHING|BLOCKS_SPEECH
+ clothing_flags = INEDIBLE_CLOTHING
equip_delay_other = 40
strip_delay = 40
greyscale_config = /datum/greyscale_config/tape_piece
diff --git a/code/modules/clothing/suits/labcoat.dm b/code/modules/clothing/suits/labcoat.dm
index de7878fa643e1..e5cda21a78a77 100644
--- a/code/modules/clothing/suits/labcoat.dm
+++ b/code/modules/clothing/suits/labcoat.dm
@@ -69,6 +69,10 @@
greyscale_config_worn = /datum/greyscale_config/labcoat/worn
greyscale_colors = "#EEEEEE#4A77A1#4A77A1#7095C2"
+/obj/item/clothing/suit/toggle/labcoat/genetics/Initialize(mapload)
+ . = ..()
+ allowed += /obj/item/sequence_scanner
+
/obj/item/clothing/suit/toggle/labcoat/chemist
name = "chemist labcoat"
desc = "A suit that protects against minor chemical spills. Has an orange stripe on the shoulder."
diff --git a/code/modules/clothing/suits/wintercoats.dm b/code/modules/clothing/suits/wintercoats.dm
index 02c3399db7b4d..cbbe357690846 100644
--- a/code/modules/clothing/suits/wintercoats.dm
+++ b/code/modules/clothing/suits/wintercoats.dm
@@ -502,6 +502,10 @@
inhand_icon_state = null
hoodtype = /obj/item/clothing/head/hooded/winterhood/science/genetics
+/obj/item/clothing/suit/hooded/wintercoat/science/genetics/Initialize(mapload)
+ . = ..()
+ allowed += /obj/item/sequence_scanner
+
/obj/item/clothing/head/hooded/winterhood/science/genetics
desc = "A white winter coat hood. It's warm."
icon_state = "hood_genetics"
diff --git a/code/modules/events/ghost_role/fugitive_event.dm b/code/modules/events/ghost_role/fugitive_event.dm
index 88d63d91bb5fe..9eb792a6f6ab3 100644
--- a/code/modules/events/ghost_role/fugitive_event.dm
+++ b/code/modules/events/ghost_role/fugitive_event.dm
@@ -61,6 +61,7 @@
HUNTER_PACK_RUSSIAN,
HUNTER_PACK_BOUNTY,
HUNTER_PACK_PSYKER,
+ HUNTER_PACK_MI13,
)
addtimer(CALLBACK(src, PROC_REF(check_spawn_hunters), hunter_backstory, 10 MINUTES), 1 MINUTES)
role_name = "fugitive hunter"
@@ -124,6 +125,8 @@
ship = new /datum/map_template/shuttle/hunter/bounty
if(HUNTER_PACK_PSYKER)
ship = new /datum/map_template/shuttle/hunter/psyker
+ if(HUNTER_PACK_MI13)
+ ship = new/datum/map_template/shuttle/hunter/mi13_foodtruck
var/x = rand(TRANSITIONEDGE,world.maxx - TRANSITIONEDGE - ship.width)
var/y = rand(TRANSITIONEDGE,world.maxy - TRANSITIONEDGE - ship.height)
@@ -152,6 +155,38 @@
header = "Spawn Here!",
)
- priority_announce("Unidentified ship detected near the station.")
+ var/list/announcement_text_list = list()
+ var/announcement_title = ""
+ switch(backstory)
+ if(HUNTER_PACK_COPS)
+ announcement_text_list += "Attention Crew of [GLOB.station_name], this is the Police. A wanted criminal has been reported taking refuge on your station."
+ announcement_text_list += "We have a warrant from the SSC authorities to take them into custody. Officers have been dispatched to your location."
+ announcement_text_list += "We demand your cooperation in bringing this criminal to justice."
+ announcement_title += "Spacepol Command"
+ if(HUNTER_PACK_RUSSIAN)
+ announcement_text_list += "Zdraviya zhelaju, [GLOB.station_name] crew. We are coming to your station."
+ announcement_text_list += "There is a criminal aboard. We will arrest them and return them to the gulag. That's good, yes?"
+ announcement_title += "Russian Freighter"
+ if(HUNTER_PACK_BOUNTY)
+ announcement_text_list += "[GLOB.station_name]. One of our bounty marks has ended up on your station. We will be arriving to collect shortly."
+ announcement_text_list += "Let's make this quick. If you don't want trouble, stay the hell out of our way."
+ announcement_title += "Unregistered Signal"
+ if(HUNTER_PACK_PSYKER)
+ announcement_text_list += "HEY, CAN YOU HEAR US? We're coming to your station. There's a bad guy down there, really bad guy. We need to arrest them."
+ announcement_text_list += "We're also offering fortune telling services out of the front door if you have paying customers."
+ announcement_title += "Fortune-Telling Entertainment Shuttle"
+ if(HUNTER_PACK_MI13)
+ announcement_text_list += "Illegal intrusion detected in the crew monitoring network. Central Command has been informed."
+ announcement_text_list += "Please report any suspicious individuals or behaviour to your local security team."
+ announcement_title += "Nanotrasen Intrusion Countermeasures Electronics"
+ if(!length(announcement_text_list))
+ announcement_text_list += "Unidentified ship detected near the station."
+ stack_trace("Fugitive hunter announcement was unable to generate an announcement text based on backstory: [backstory]")
+
+ if(!length(announcement_title))
+ announcement_title += "Unknown Signal"
+ stack_trace("Fugitive hunter announcement was unable to generate an announcement title based on backstory: [backstory]")
+
+ priority_announce(jointext(announcement_text_list, " "), announcement_title)
#undef TEAM_BACKSTORY_SIZE
diff --git a/code/modules/holodeck/turfs.dm b/code/modules/holodeck/turfs.dm
index 7432de695175e..0eb05fcdc3049 100644
--- a/code/modules/holodeck/turfs.dm
+++ b/code/modules/holodeck/turfs.dm
@@ -164,7 +164,7 @@
/turf/open/floor/holofloor/carpet/update_icon(updates=ALL)
. = ..()
- if((updates & UPDATE_SMOOTHING) && overfloor_placed && smoothing_flags & (SMOOTH_CORNERS|SMOOTH_BITMASK))
+ if((updates & UPDATE_SMOOTHING) && overfloor_placed && smoothing_flags & USES_SMOOTHING)
QUEUE_SMOOTH(src)
/turf/open/floor/holofloor/wood
diff --git a/code/modules/jobs/job_types/detective.dm b/code/modules/jobs/job_types/detective.dm
index 0ed502b2529bf..00bd8790d9bd0 100644
--- a/code/modules/jobs/job_types/detective.dm
+++ b/code/modules/jobs/job_types/detective.dm
@@ -73,6 +73,8 @@
)
implants = list(/obj/item/implant/mindshield)
+ skillchips = list(/obj/item/skillchip/job/detectives_taste)
+
/datum/outfit/job/detective/pre_equip(mob/living/carbon/human/human, visualsOnly = FALSE)
. = ..()
if (human.age < AGE_MINOR)
diff --git a/code/modules/library/skill_learning/job_skillchips/detective.dm b/code/modules/library/skill_learning/job_skillchips/detective.dm
new file mode 100644
index 0000000000000..427b8566e7e1f
--- /dev/null
+++ b/code/modules/library/skill_learning/job_skillchips/detective.dm
@@ -0,0 +1,9 @@
+/obj/item/skillchip/job/detectives_taste
+ name = "DET.ekt skillchip"
+ desc = "Detective \"Encyclopedic Knowledge of Tastes\" v1.21"
+ auto_traits = list(TRAIT_DETECTIVES_TASTE)
+ skill_name = "Detective's Taste"
+ skill_description = "Deduce the minute chemical compositions of any liquid substance just by swishing it around your mouth for a bit."
+ skill_icon = "vial"
+ activate_message = span_notice("An explosion of flavors hit your mouth as you remember the secret tastebuds long forgotten.")
+ deactivate_message = span_notice("Your mouth dulls to the hidden tastes of the world.")
diff --git a/code/modules/lootpanel/contents.dm b/code/modules/lootpanel/contents.dm
index 4bb255b15611b..44f4acd47f24c 100644
--- a/code/modules/lootpanel/contents.dm
+++ b/code/modules/lootpanel/contents.dm
@@ -18,6 +18,9 @@
for(var/atom/thing as anything in source_turf.contents)
// validate
+ if(!istype(thing))
+ stack_trace("Non-atom in the contents of [source_turf]!")
+ continue
if(thing.mouse_opacity == MOUSE_OPACITY_TRANSPARENT)
continue
if(thing.IsObscured())
diff --git a/code/modules/lootpanel/search_object.dm b/code/modules/lootpanel/search_object.dm
index 4de60b04a678a..3550c62ef4133 100644
--- a/code/modules/lootpanel/search_object.dm
+++ b/code/modules/lootpanel/search_object.dm
@@ -25,12 +25,12 @@
if(isturf(item))
RegisterSignal(item, COMSIG_TURF_CHANGE, PROC_REF(on_turf_change))
- else
RegisterSignals(item, list(
- COMSIG_ITEM_PICKUP,
- COMSIG_MOVABLE_MOVED,
- COMSIG_QDELETING,
+ COMSIG_ATOM_ENTERED,
+ COMSIG_ATOM_EXITED,
), PROC_REF(on_item_moved))
+ else
+ RegisterSignal(item, COMSIG_QDELETING, PROC_REF(on_item_moved))
// Icon generation conditions //////////////
// Condition 1: Icon is complex
diff --git a/code/modules/mapping/mapping_helpers.dm b/code/modules/mapping/mapping_helpers.dm
index e59b04e6c7efa..e81425b9a1a80 100644
--- a/code/modules/mapping/mapping_helpers.dm
+++ b/code/modules/mapping/mapping_helpers.dm
@@ -107,6 +107,12 @@
return
return ..(ceiling)
+///Used for marking mapping errors. These should only be created by cases explicitly caught by unit tests, and should NEVER actually appear in production.
+/obj/effect/mapping_error
+ name = "I AM ERROR"
+ desc = "IF YOU SEE ME, YELL AT A MAPPER!!!"
+ icon = 'icons/effects/mapping_helpers.dmi'
+ icon_state = "mapping_error"
/obj/effect/mapping_helpers
icon = 'icons/effects/mapping_helpers.dmi'
diff --git a/code/modules/meteors/meteor_types.dm b/code/modules/meteors/meteor_types.dm
index 9096ab24afec8..504cca702de00 100644
--- a/code/modules/meteors/meteor_types.dm
+++ b/code/modules/meteors/meteor_types.dm
@@ -459,8 +459,8 @@
/obj/effect/meteor/pumpkin
name = "PUMPKING"
desc = "THE PUMPKING'S COMING!"
- icon = 'icons/obj/meteor_spooky.dmi'
- icon_state = "pumpkin"
+ icon = 'icons/obj/meteor.dmi'
+ icon_state = "spooky"
hits = 10
heavy = TRUE
dropamt = 1
diff --git a/code/modules/mining/fulton.dm b/code/modules/mining/fulton.dm
index 56b65c456197b..649acabfcae4a 100644
--- a/code/modules/mining/fulton.dm
+++ b/code/modules/mining/fulton.dm
@@ -97,13 +97,10 @@ GLOBAL_LIST_EMPTY(total_extraction_beacons)
if(uses_left <= 0)
user.transferItemToLoc(src, thing, TRUE)
- var/mutable_appearance/balloon
- var/mutable_appearance/balloon2
- var/mutable_appearance/balloon3
-
if(isliving(thing))
var/mob/living/creature = thing
creature.Paralyze(32 SECONDS) // Keep them from moving during the duration of the extraction
+ ADD_TRAIT(creature, TRAIT_FORCED_STANDING, FULTON_PACK_TRAIT) // Prevents animation jank from happening
if(creature.buckled)
creature.buckled.unbuckle_mob(creature, TRUE) // Unbuckle them to prevent anchoring problems
else
@@ -113,14 +110,15 @@ GLOBAL_LIST_EMPTY(total_extraction_beacons)
var/obj/effect/extraction_holder/holder_obj = new(get_turf(thing))
holder_obj.appearance = thing.appearance
thing.forceMove(holder_obj)
- balloon2 = mutable_appearance('icons/effects/fulton_balloon.dmi', "fulton_expand")
+ var/mutable_appearance/balloon2 = mutable_appearance('icons/effects/fulton_balloon.dmi', "fulton_expand", layer = VEHICLE_LAYER)
balloon2.pixel_y = 10
balloon2.appearance_flags = RESET_COLOR | RESET_ALPHA | RESET_TRANSFORM
holder_obj.add_overlay(balloon2)
+ addtimer(CALLBACK(src, PROC_REF(create_balloon), thing, user, holder_obj, balloon2), 0.4 SECONDS)
+ return ITEM_INTERACT_SUCCESS
- sleep(0.4 SECONDS)
-
- balloon = mutable_appearance('icons/effects/fulton_balloon.dmi', "fulton_balloon")
+/obj/item/extraction_pack/proc/create_balloon(atom/movable/thing, mob/living/user, obj/effect/extraction_holder/holder_obj, mutable_appearance/balloon2)
+ var/mutable_appearance/balloon = mutable_appearance('icons/effects/fulton_balloon.dmi', "fulton_balloon", layer = VEHICLE_LAYER)
balloon.pixel_y = 10
balloon.appearance_flags = RESET_COLOR | RESET_ALPHA | RESET_TRANSFORM
holder_obj.cut_overlay(balloon2)
@@ -132,6 +130,7 @@ GLOBAL_LIST_EMPTY(total_extraction_beacons)
animate(pixel_z = -5, time = 1 SECONDS, flags = ANIMATION_RELATIVE)
animate(pixel_z = 5, time = 1 SECONDS, flags = ANIMATION_RELATIVE)
animate(pixel_z = -5, time = 1 SECONDS, flags = ANIMATION_RELATIVE)
+
sleep(6 SECONDS)
playsound(holder_obj.loc, 'sound/items/fultext_launch.ogg', vol = 50, vary = TRUE, extrarange = -3)
@@ -146,7 +145,7 @@ GLOBAL_LIST_EMPTY(total_extraction_beacons)
sleep(3 SECONDS)
var/turf/flooring_near_beacon = list()
- var/turf/beacon_turf = get_turf(beacon)
+ var/turf/beacon_turf = get_turf(beacon_ref.resolve())
for(var/turf/floor as anything in RANGE_TURFS(1, beacon_turf))
if(!floor.is_blocked_turf())
flooring_near_beacon += floor
@@ -159,26 +158,28 @@ GLOBAL_LIST_EMPTY(total_extraction_beacons)
animate(holder_obj, pixel_z = -990, time = 5 SECONDS, flags = ANIMATION_RELATIVE)
animate(pixel_z = 5, time = 1 SECONDS, flags = ANIMATION_RELATIVE)
animate(pixel_z = -5, time = 1 SECONDS, flags = ANIMATION_RELATIVE)
+
sleep(7 SECONDS)
- balloon3 = mutable_appearance('icons/effects/fulton_balloon.dmi', "fulton_retract")
+ var/mutable_appearance/balloon3 = mutable_appearance('icons/effects/fulton_balloon.dmi', "fulton_retract", layer = VEHICLE_LAYER)
balloon3.pixel_y = 10
balloon3.appearance_flags = RESET_COLOR | RESET_ALPHA | RESET_TRANSFORM
holder_obj.cut_overlay(balloon)
holder_obj.add_overlay(balloon3)
+
sleep(0.4 SECONDS)
holder_obj.cut_overlay(balloon3)
+ if (isliving(thing))
+ REMOVE_TRAIT(thing, TRAIT_FORCED_STANDING, FULTON_PACK_TRAIT)
thing.set_anchored(FALSE) // An item has to be unanchored to be extracted in the first place.
thing.set_density(initial(thing.density))
animate(holder_obj, pixel_z = -10, time = 0.5 SECONDS, flags = ANIMATION_RELATIVE)
sleep(0.5 SECONDS)
-
thing.forceMove(holder_obj.loc)
qdel(holder_obj)
if(uses_left <= 0)
qdel(src)
- return ITEM_INTERACT_SUCCESS
/obj/item/fulton_core
name = "extraction beacon assembly kit"
diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm
index 1a7b362ec2e73..c1a81b9d33847 100644
--- a/code/modules/mob/dead/observer/observer.dm
+++ b/code/modules/mob/dead/observer/observer.dm
@@ -359,6 +359,12 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
abstract_move(destination) // move like the wind
return TRUE
+/mob/dead/observer/Moved(atom/old_loc, movement_dir, forced, list/old_locs, momentum_change)
+ . = ..()
+ var/area/new_area = get_area(src)
+ if(new_area != ambience_tracked_area)
+ update_ambience_area(new_area)
+
/mob/dead/observer/verb/reenter_corpse()
set category = "Ghost"
set name = "Re-enter Corpse"
diff --git a/code/modules/mob/inventory.dm b/code/modules/mob/inventory.dm
index 7a63d0fc8e622..2d22c11ee71f8 100644
--- a/code/modules/mob/inventory.dm
+++ b/code/modules/mob/inventory.dm
@@ -405,22 +405,6 @@
items -= held_items
return items
-/**
- * Used to return a list of equipped items on a human mob; does not by default include held items, see include_flags
- *
- * Argument(s):
- * * Optional - include_flags, (see obj.flags.dm) describes which optional things to include or not (pockets, accessories, held items)
- */
-
-/mob/living/carbon/human/get_equipped_items(include_flags = NONE)
- var/list/items = ..()
- if(!(include_flags & INCLUDE_POCKETS))
- items -= list(l_store, r_store, s_store)
- if((include_flags & INCLUDE_ACCESSORIES) && w_uniform)
- var/obj/item/clothing/under/worn_under = w_uniform
- items += worn_under.attached_accessories
- return items
-
/**
* Returns the items that were succesfully unequipped.
*/
@@ -439,36 +423,88 @@
dropped_items |= return_val
return dropped_items
-/mob/living/carbon/proc/check_obscured_slots(transparent_protection)
- var/obscured = NONE
- var/hidden_slots = NONE
-
- for(var/obj/item/equipped_item in get_equipped_items())
- hidden_slots |= equipped_item.flags_inv
- if(transparent_protection)
- hidden_slots |= equipped_item.transparent_protection
-
- if(hidden_slots & HIDENECK)
- obscured |= ITEM_SLOT_NECK
- if(hidden_slots & HIDEMASK)
- obscured |= ITEM_SLOT_MASK
- if(hidden_slots & HIDEEYES)
- obscured |= ITEM_SLOT_EYES
- if(hidden_slots & HIDEEARS)
- obscured |= ITEM_SLOT_EARS
- if(hidden_slots & HIDEGLOVES)
- obscured |= ITEM_SLOT_GLOVES
- if(hidden_slots & HIDEJUMPSUIT)
- obscured |= ITEM_SLOT_ICLOTHING
- if(hidden_slots & HIDESHOES)
- obscured |= ITEM_SLOT_FEET
- if(hidden_slots & HIDESUITSTORAGE)
- obscured |= ITEM_SLOT_SUITSTORE
- if(hidden_slots & HIDEHEADGEAR)
- obscured |= ITEM_SLOT_HEAD
-
- return obscured
+/**
+ * Try to equip an item to a slot on the mob
+ *
+ * This is a SAFE proc. Use this instead of equip_to_slot()!
+ *
+ * set qdel_on_fail to have it delete W if it fails to equip
+ *
+ * set disable_warning to disable the 'you are unable to equip that' warning.
+ *
+ * unset redraw_mob to prevent the mob icons from being redrawn at the end.
+ *
+ * Initial is used to indicate whether or not this is the initial equipment (job datums etc) or just a player doing it
+ *
+ * set indirect_action to allow insertions into "soft" locked objects, things that are easily opened by the owning mob
+ */
+/mob/proc/equip_to_slot_if_possible(obj/item/W, slot, qdel_on_fail = FALSE, disable_warning = FALSE, redraw_mob = TRUE, bypass_equip_delay_self = FALSE, initial = FALSE, indirect_action = FALSE)
+ if(!istype(W) || QDELETED(W)) //This qdeleted is to prevent stupid behavior with things that qdel during init, like say stacks
+ return FALSE
+ if(!W.mob_can_equip(src, slot, disable_warning, bypass_equip_delay_self, indirect_action = indirect_action))
+ if(qdel_on_fail)
+ qdel(W)
+ else if(!disable_warning)
+ to_chat(src, span_warning("You are unable to equip that!"))
+ return FALSE
+ equip_to_slot(W, slot, initial, redraw_mob, indirect_action = indirect_action) //This proc should not ever fail.
+ return TRUE
+
+/**
+ * Actually equips an item to a slot (UNSAFE)
+ *
+ * This is an UNSAFE proc. It merely handles the actual job of equipping. All the checks on
+ * whether you can or can't equip need to be done before! Use mob_can_equip() for that task.
+ *
+ *In most cases you will want to use equip_to_slot_if_possible()
+ */
+/mob/proc/equip_to_slot(obj/item/equipping, slot, initial = FALSE, redraw_mob = FALSE, indirect_action = FALSE)
+ return
+
+/**
+ * Equip an item to the slot or delete
+ *
+ * This is just a commonly used configuration for the equip_to_slot_if_possible() proc, used to
+ * equip people when the round starts and when events happen and such.
+ *
+ * Also bypasses equip delay checks, since the mob isn't actually putting it on.
+ * Initial is used to indicate whether or not this is the initial equipment (job datums etc) or just a player doing it
+ * set indirect_action to allow insertions into "soft" locked objects, things that are easily opened by the owning mob
+ */
+/mob/proc/equip_to_slot_or_del(obj/item/W, slot, initial = FALSE, indirect_action = FALSE)
+ return equip_to_slot_if_possible(W, slot, TRUE, TRUE, FALSE, TRUE, initial, indirect_action)
+
+/**
+ * Auto equip the passed in item the appropriate slot based on equipment priority
+ *
+ * puts the item "W" into an appropriate slot in a human's inventory
+ *
+ * returns 0 if it cannot, 1 if successful
+ */
+/mob/proc/equip_to_appropriate_slot(obj/item/W, qdel_on_fail = FALSE, indirect_action = FALSE)
+ if(!istype(W))
+ return FALSE
+ var/slot_priority = W.slot_equipment_priority
+
+ if(!slot_priority)
+ slot_priority = list( \
+ ITEM_SLOT_BACK, ITEM_SLOT_ID,\
+ ITEM_SLOT_ICLOTHING, ITEM_SLOT_OCLOTHING,\
+ ITEM_SLOT_MASK, ITEM_SLOT_HEAD, ITEM_SLOT_NECK,\
+ ITEM_SLOT_FEET, ITEM_SLOT_GLOVES,\
+ ITEM_SLOT_EARS, ITEM_SLOT_EYES,\
+ ITEM_SLOT_BELT, ITEM_SLOT_SUITSTORE,\
+ ITEM_SLOT_LPOCKET, ITEM_SLOT_RPOCKET,\
+ ITEM_SLOT_DEX_STORAGE\
+ )
+ for(var/slot in slot_priority)
+ if(equip_to_slot_if_possible(W, slot, disable_warning = TRUE, redraw_mob = TRUE, indirect_action = indirect_action))
+ return TRUE
+
+ if(qdel_on_fail)
+ qdel(W)
+ return FALSE
/// Tries to equip an item, store it in open storage, or in next best storage
/obj/item/proc/equip_to_best_slot(mob/user)
@@ -549,27 +585,6 @@
if(hud_used)
hud_used.build_hand_slots()
-/mob/living/carbon/human/change_number_of_hands(amt)
- var/old_limbs = held_items.len
- if(amt < old_limbs)
- for(var/i in hand_bodyparts.len to amt step -1)
- var/obj/item/bodypart/BP = hand_bodyparts[i]
- BP.dismember()
- hand_bodyparts[i] = null
- hand_bodyparts.len = amt
- else if(amt > old_limbs)
- hand_bodyparts.len = amt
- for(var/i in old_limbs+1 to amt)
- var/path = /obj/item/bodypart/arm/left
- if(!(i % 2))
- path = /obj/item/bodypart/arm/right
-
- var/obj/item/bodypart/BP = new path ()
- BP.held_index = i
- BP.try_attach_limb(src, TRUE)
- hand_bodyparts[i] = BP
- ..() //Don't redraw hands until we have organs for them
-
//GetAllContents that is reasonable and not stupid
/mob/living/proc/get_all_gear()
var/list/processing_list = get_equipped_items(INCLUDE_POCKETS | INCLUDE_ACCESSORIES | INCLUDE_HELD)
diff --git a/code/modules/mob/living/basic/jungle/seedling/seedling.dm b/code/modules/mob/living/basic/jungle/seedling/seedling.dm
index 5a958d3ca7c18..7a853b8a9d086 100644
--- a/code/modules/mob/living/basic/jungle/seedling/seedling.dm
+++ b/code/modules/mob/living/basic/jungle/seedling/seedling.dm
@@ -30,6 +30,7 @@
lighting_cutoff_green = 20
lighting_cutoff_blue = 25
mob_size = MOB_SIZE_LARGE
+ faction = list(FACTION_PLANTS)
attack_sound = 'sound/weapons/bladeslice.ogg'
attack_vis_effect = ATTACK_EFFECT_SLASH
ai_controller = /datum/ai_controller/basic_controller/seedling
@@ -206,7 +207,7 @@
/mob/living/basic/seedling/meanie
maxHealth = 400
health = 400
- faction = list(FACTION_JUNGLE)
+ faction = list(FACTION_JUNGLE, FACTION_PLANTS)
ai_controller = /datum/ai_controller/basic_controller/seedling/meanie
seedling_commands = list(
/datum/pet_command/idle,
diff --git a/code/modules/mob/living/basic/lavaland/raptor/_raptor.dm b/code/modules/mob/living/basic/lavaland/raptor/_raptor.dm
index 8cd3c567a7d2d..784f5dd369907 100644
--- a/code/modules/mob/living/basic/lavaland/raptor/_raptor.dm
+++ b/code/modules/mob/living/basic/lavaland/raptor/_raptor.dm
@@ -309,4 +309,8 @@ GLOBAL_LIST_EMPTY(raptor_population)
animated = FALSE
insert_on_attack = FALSE
+/datum/storage/raptor_storage/on_mousedropped_onto(datum/source, obj/item/dropping, mob/user)
+ ..()
+ return NONE
+
#undef HAPPINESS_BOOST_DAMPENER
diff --git a/code/modules/mob/living/basic/lavaland/watcher/watcher_overwatch.dm b/code/modules/mob/living/basic/lavaland/watcher/watcher_overwatch.dm
index 541a4ed9e1c7e..a61ea0743f9a4 100644
--- a/code/modules/mob/living/basic/lavaland/watcher/watcher_overwatch.dm
+++ b/code/modules/mob/living/basic/lavaland/watcher/watcher_overwatch.dm
@@ -76,7 +76,7 @@
COMSIG_MOB_ITEM_ATTACK,
COMSIG_MOB_THROW,
COMSIG_MOB_USED_MECH_EQUIPMENT,
- COMSIG_MOB_USED_MECH_MELEE,
+ COMSIG_MOB_USED_CLICK_MECH_MELEE,
COMSIG_MOVABLE_MOVED,
)
diff --git a/code/modules/mob/living/blood.dm b/code/modules/mob/living/blood.dm
index a5162dea0dc42..8b970605af84a 100644
--- a/code/modules/mob/living/blood.dm
+++ b/code/modules/mob/living/blood.dm
@@ -103,15 +103,15 @@
investigate_log("has died of bloodloss.", INVESTIGATE_DEATHS)
death()
- // Blood ratio! if you have 230 blood, this equals 0.5 as that's half of the current value, 560.
- var/effective_blood_ratio = blood_volume/BLOOD_VOLUME_NORMAL
+ // Blood ratio! if you have 280 blood, this equals 0.5 as that's half of the current value, 560.
+ var/effective_blood_ratio = blood_volume / BLOOD_VOLUME_NORMAL
- // If your ratio is less than one (you're missing any blood) and your oxyloss is under that ratio %, start getting oxy damage.
+ // If your ratio is less than one (you're missing any blood) and your oxyloss is under missing blood %, start getting oxy damage.
// This damage accrues faster the less blood you have.
// If KO or in hardcrit, the damage accrues even then to prevent being perma-KO.
- if(((effective_blood_ratio < 1) && (getOxyLoss() < (effective_blood_ratio * 100))) || (stat in list(UNCONSCIOUS, HARD_CRIT)))
+ if(((effective_blood_ratio < 1) && (getOxyLoss() < ((1 - effective_blood_ratio) * 100))) || (stat in list(UNCONSCIOUS, HARD_CRIT)))
// At roughly half blood this equals to 3 oxyloss per tick. At 90% blood it's close to 0.5
- var/rounded_oxyloss = round(0.01 * (BLOOD_VOLUME_NORMAL - blood_volume) * seconds_per_tick, 0.25)
+ var/rounded_oxyloss = round(0.01 * (BLOOD_VOLUME_NORMAL - blood_volume), 0.25) * seconds_per_tick
adjustOxyLoss(rounded_oxyloss, updating_health = TRUE)
/// Has each bodypart update its bleed/wound overlay icon states
diff --git a/code/modules/mob/living/carbon/alien/adult/alien_powers.dm b/code/modules/mob/living/carbon/alien/adult/alien_powers.dm
index f3cfbfda8a9ee..999ec07f41a65 100644
--- a/code/modules/mob/living/carbon/alien/adult/alien_powers.dm
+++ b/code/modules/mob/living/carbon/alien/adult/alien_powers.dm
@@ -251,7 +251,8 @@ Doesn't work on other aliens/AI.*/
plasma_cost = 50
/datum/action/cooldown/alien/acid/neurotoxin/IsAvailable(feedback = FALSE)
- if(owner.is_muzzled())
+ var/mob/living/carbon/as_carbon = owner
+ if(istype(as_carbon) && as_carbon.is_mouth_covered(ITEM_SLOT_MASK))
return FALSE
if(!isturf(owner.loc))
return FALSE
diff --git a/code/modules/mob/living/carbon/alien/alien.dm b/code/modules/mob/living/carbon/alien/alien.dm
index f8210c77368cc..a995eafbb3ac0 100644
--- a/code/modules/mob/living/carbon/alien/alien.dm
+++ b/code/modules/mob/living/carbon/alien/alien.dm
@@ -76,6 +76,7 @@
return pick (list("xltrails_1", "xltrails2"))
else
return pick (list("xttrails_1", "xttrails2"))
+
/*----------------------------------------
Proc: AddInfectionImages()
Des: Gives the client of the alien an image on each infected mob.
diff --git a/code/modules/mob/living/carbon/alien/special/facehugger.dm b/code/modules/mob/living/carbon/alien/special/facehugger.dm
index d068610b28f7a..d1ec6d7e88038 100644
--- a/code/modules/mob/living/carbon/alien/special/facehugger.dm
+++ b/code/modules/mob/living/carbon/alien/special/facehugger.dm
@@ -24,6 +24,7 @@
layer = MOB_LAYER
max_integrity = 100
item_flags = XENOMORPH_HOLDABLE
+ slowdown = 2
var/stat = CONSCIOUS //UNCONSCIOUS is the idle state in this case
var/sterile = FALSE
@@ -39,6 +40,7 @@
)
AddElement(/datum/element/connect_loc, loc_connections)
AddElement(/datum/element/atmos_sensitive, mapload)
+ AddElement(/datum/element/muffles_speech)
RegisterSignal(src, COMSIG_LIVING_TRYING_TO_PULL, PROC_REF(react_to_mob))
@@ -122,7 +124,7 @@
/obj/item/clothing/mask/facehugger/proc/valid_to_attach(mob/living/hit_mob)
// valid targets: carbons except aliens and devils
- // facehugger state early exit checks
+ // facehugger state early exit checks (Note: Melbert does not want dead people to be huggable)
if(stat != CONSCIOUS)
return FALSE
if(attached)
@@ -171,9 +173,12 @@
log_combat(target, src, "was facehugged by")
return TRUE // time for a smoke
-/obj/item/clothing/mask/facehugger/proc/Attach(mob/living/M)
- if(!valid_to_attach(M))
+/obj/item/clothing/mask/facehugger/proc/Attach(mob/living/victim)
+ if(!valid_to_attach(victim))
return
+
+ if(victim.stat < UNCONSCIOUS) //sorry bro you gotta be awake
+ victim.say("AAAA!!") //triggers muffled speech and also visual feedback i guess
// early returns and validity checks done: attach.
attached++
//ensure we detach once we no longer need to be attached
@@ -181,12 +186,12 @@
if(!sterile)
- M.take_bodypart_damage(strength,0) //done here so that humans in helmets take damage
- M.Unconscious(MAX_IMPREGNATION_TIME/0.3) //something like 25 ticks = 20 seconds with the default settings
-
+ victim.take_bodypart_damage(strength,0) //done here so that humans in helmets take damage
+ if(real && !sterile)
+ victim.Knockdown(5 SECONDS)
GoIdle() //so it doesn't jump the people that tear it off
- addtimer(CALLBACK(src, PROC_REF(Impregnate), M), rand(MIN_IMPREGNATION_TIME, MAX_IMPREGNATION_TIME))
+ addtimer(CALLBACK(src, PROC_REF(Impregnate), victim), rand(MIN_IMPREGNATION_TIME, MAX_IMPREGNATION_TIME))
/obj/item/clothing/mask/facehugger/proc/detach()
attached = 0
@@ -249,6 +254,29 @@
visible_message(span_danger("[src] curls up into a ball!"))
+ // chest maybe because getting slammed in the chest would knock it off your face while dead
+ AddComponent(/datum/component/knockoff, knockoff_chance = 40, target_zones = list(BODY_ZONE_HEAD, BODY_ZONE_CHEST), slots_knockoffable = slot_flags)
+
+/obj/item/clothing/mask/facehugger/allow_attack_hand_drop(mob/living/carbon/human/user)
+ if(!real || sterile || user.get_organ_by_type(/obj/item/organ/internal/body_egg/alien_embryo))
+ return ..()
+ if(istype(user) && ishuman(loc) && stat != DEAD)
+ if(user == loc && user.get_item_by_slot(slot_flags) == src)
+ to_chat(user, span_userdanger("[src] is latched on too tight! Get help or wait for it to let go!"))
+ return FALSE
+ return ..()
+
+/obj/item/clothing/mask/facehugger/mouse_drop_dragged(atom/over, mob/user, src_location, over_location, params)
+ var/mob/living/carbon/human/wearer = loc
+ if(!istype(wearer) || user != wearer)
+ return
+ if(!real || sterile || user.get_organ_by_type(/obj/item/organ/internal/body_egg/alien_embryo))
+ return ..()
+ if(wearer.get_item_by_slot(slot_flags) == src && stat != DEAD)
+ to_chat(user, span_userdanger("[src] is latched on too tight! Get help or wait for it to let go!"))
+ return
+ return ..()
+
/proc/CanHug(mob/living/M)
if(!istype(M))
return FALSE
@@ -268,6 +296,7 @@
name = "Lamarr"
desc = "The Research Director's pet, a domesticated and debeaked xenomorph facehugger. Friendly, but may still try to couple with your head."
sterile = TRUE
+ slowdown = 1.5 //lamarr is too fat after being fed in captivity to effectively slow people down or something
/obj/item/clothing/mask/facehugger/dead
icon_state = "facehugger_dead"
@@ -287,6 +316,7 @@
real = FALSE
sterile = TRUE
tint = 3 //Makes it feel more authentic when it latches on
+ slowdown = 0
/obj/item/clothing/mask/facehugger/toy/Die()
return
diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm
index 539dfd64ce353..98948e6a9af90 100644
--- a/code/modules/mob/living/carbon/carbon.dm
+++ b/code/modules/mob/living/carbon/carbon.dm
@@ -228,13 +228,6 @@
. = ..()
loc.handle_fall(src)//it's loc so it doesn't call the mob's handle_fall which does nothing
-/mob/living/carbon/is_muzzled()
- for (var/obj/item/clothing/clothing in get_equipped_items())
- if(clothing.clothing_flags & BLOCKS_SPEECH)
- return TRUE
- return FALSE
-
-
/mob/living/carbon/resist_buckle()
if(!HAS_TRAIT(src, TRAIT_RESTRAINED))
buckled.user_unbuckle_mob(src, src)
diff --git a/code/modules/mob/living/carbon/emote.dm b/code/modules/mob/living/carbon/emote.dm
index 856622203927a..00699196ae9b6 100644
--- a/code/modules/mob/living/carbon/emote.dm
+++ b/code/modules/mob/living/carbon/emote.dm
@@ -20,7 +20,6 @@
key = "clap"
key_third_person = "claps"
message = "claps."
- muzzle_ignore = TRUE
hands_use_check = TRUE
emote_type = EMOTE_AUDIBLE | EMOTE_VISIBLE
audio_cooldown = 5 SECONDS
@@ -185,7 +184,6 @@
message_param = "snaps their fingers at %t."
emote_type = EMOTE_AUDIBLE | EMOTE_VISIBLE
hands_use_check = TRUE
- muzzle_ignore = TRUE
/datum/emote/living/carbon/snap/get_sound(mob/living/user)
if(ishuman(user))
diff --git a/code/modules/mob/living/carbon/human/inventory.dm b/code/modules/mob/living/carbon/human/inventory.dm
index b1efa734321c5..b4838e978d6fe 100644
--- a/code/modules/mob/living/carbon/human/inventory.dm
+++ b/code/modules/mob/living/carbon/human/inventory.dm
@@ -1,3 +1,20 @@
+
+/**
+ * Used to return a list of equipped items on a human mob; does not by default include held items, see include_flags
+ *
+ * Argument(s):
+ * * Optional - include_flags, (see obj.flags.dm) describes which optional things to include or not (pockets, accessories, held items)
+ */
+
+/mob/living/carbon/human/get_equipped_items(include_flags = NONE)
+ var/list/items = ..()
+ if(!(include_flags & INCLUDE_POCKETS))
+ items -= list(l_store, r_store, s_store)
+ if((include_flags & INCLUDE_ACCESSORIES) && w_uniform)
+ var/obj/item/clothing/under/worn_under = w_uniform
+ items += worn_under.attached_accessories
+ return items
+
/mob/living/carbon/human/can_equip(obj/item/equip_target, slot, disable_warning = FALSE, bypass_equip_delay_self = FALSE, ignore_equipped = FALSE, indirect_action = FALSE)
if(SEND_SIGNAL(src, COMSIG_HUMAN_EQUIPPING_ITEM, equip_target, slot) == COMPONENT_BLOCK_EQUIP)
return FALSE
@@ -390,3 +407,24 @@
return
stored.attack_hand(src) // take out thing from item in storage slot
return
+
+/mob/living/carbon/human/change_number_of_hands(amt)
+ var/old_limbs = held_items.len
+ if(amt < old_limbs)
+ for(var/i in hand_bodyparts.len to amt step -1)
+ var/obj/item/bodypart/BP = hand_bodyparts[i]
+ BP.dismember()
+ hand_bodyparts[i] = null
+ hand_bodyparts.len = amt
+ else if(amt > old_limbs)
+ hand_bodyparts.len = amt
+ for(var/i in old_limbs+1 to amt)
+ var/path = /obj/item/bodypart/arm/left
+ if(!(i % 2))
+ path = /obj/item/bodypart/arm/right
+
+ var/obj/item/bodypart/BP = new path ()
+ BP.held_index = i
+ BP.try_attach_limb(src, TRUE)
+ hand_bodyparts[i] = BP
+ ..() //Don't redraw hands until we have organs for them
diff --git a/code/modules/mob/living/carbon/inventory.dm b/code/modules/mob/living/carbon/inventory.dm
index de6a2692c9b6f..a377568246404 100644
--- a/code/modules/mob/living/carbon/inventory.dm
+++ b/code/modules/mob/living/carbon/inventory.dm
@@ -1,3 +1,33 @@
+/mob/living/carbon/proc/check_obscured_slots(transparent_protection)
+ var/obscured = NONE
+ var/hidden_slots = NONE
+
+ for(var/obj/item/equipped_item in get_equipped_items())
+ hidden_slots |= equipped_item.flags_inv
+ if(transparent_protection)
+ hidden_slots |= equipped_item.transparent_protection
+
+ if(hidden_slots & HIDENECK)
+ obscured |= ITEM_SLOT_NECK
+ if(hidden_slots & HIDEMASK)
+ obscured |= ITEM_SLOT_MASK
+ if(hidden_slots & HIDEEYES)
+ obscured |= ITEM_SLOT_EYES
+ if(hidden_slots & HIDEEARS)
+ obscured |= ITEM_SLOT_EARS
+ if(hidden_slots & HIDEGLOVES)
+ obscured |= ITEM_SLOT_GLOVES
+ if(hidden_slots & HIDEJUMPSUIT)
+ obscured |= ITEM_SLOT_ICLOTHING
+ if(hidden_slots & HIDESHOES)
+ obscured |= ITEM_SLOT_FEET
+ if(hidden_slots & HIDESUITSTORAGE)
+ obscured |= ITEM_SLOT_SUITSTORE
+ if(hidden_slots & HIDEHEADGEAR)
+ obscured |= ITEM_SLOT_HEAD
+
+ return obscured
+
/mob/living/carbon/get_item_by_slot(slot_id)
switch(slot_id)
if(ITEM_SLOT_BACK)
diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm
index 3ee43801a7621..5a5995e207235 100644
--- a/code/modules/mob/living/living_defense.dm
+++ b/code/modules/mob/living/living_defense.dm
@@ -411,7 +411,7 @@
if(!user.get_bodypart(BODY_ZONE_HEAD))
return FALSE
- if(user.is_muzzled() || user.is_mouth_covered(ITEM_SLOT_MASK))
+ if(user.is_mouth_covered(ITEM_SLOT_MASK))
to_chat(user, span_warning("You can't bite with your mouth covered!"))
return FALSE
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm
index b4cafdb6d538d..4156d9678bca0 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm
@@ -538,12 +538,12 @@ Difficulty: Hard
/obj/effect/temp_visual/hierophant/wall/Initialize(mapload, new_caster)
. = ..()
- if(smoothing_flags & (SMOOTH_CORNERS|SMOOTH_BITMASK))
+ if(smoothing_flags & USES_SMOOTHING)
QUEUE_SMOOTH_NEIGHBORS(src)
QUEUE_SMOOTH(src)
/obj/effect/temp_visual/hierophant/wall/Destroy()
- if(smoothing_flags & (SMOOTH_CORNERS|SMOOTH_BITMASK))
+ if(smoothing_flags & USES_SMOOTHING)
QUEUE_SMOOTH_NEIGHBORS(src)
return ..()
diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/elite.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/elite.dm
index 8558601f12467..623e18e0494be 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/elite.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/elite.dm
@@ -408,12 +408,12 @@ While using this makes the system rely on OnFire, it still gives options for tim
/obj/effect/temp_visual/elite_tumor_wall/Initialize(mapload, new_caster)
. = ..()
- if(smoothing_flags & (SMOOTH_CORNERS|SMOOTH_BITMASK))
+ if(smoothing_flags & USES_SMOOTHING)
QUEUE_SMOOTH_NEIGHBORS(src)
QUEUE_SMOOTH(src)
/obj/effect/temp_visual/elite_tumor_wall/Destroy()
- if(smoothing_flags & (SMOOTH_CORNERS|SMOOTH_BITMASK))
+ if(smoothing_flags & USES_SMOOTHING)
QUEUE_SMOOTH_NEIGHBORS(src)
return ..()
diff --git a/code/modules/mob/login.dm b/code/modules/mob/login.dm
index 81a9fa7c62447..a4964add6c865 100644
--- a/code/modules/mob/login.dm
+++ b/code/modules/mob/login.dm
@@ -99,7 +99,8 @@
update_client_colour()
update_mouse_pointer()
- refresh_looping_ambience()
+ update_ambience_area(get_area(src))
+
if(!can_hear())
stop_sound_channel(CHANNEL_AMBIENCE)
diff --git a/code/modules/mob/logout.dm b/code/modules/mob/logout.dm
index cf937e42bb74f..09d50c8436c71 100644
--- a/code/modules/mob/logout.dm
+++ b/code/modules/mob/logout.dm
@@ -3,6 +3,7 @@
log_message("[key_name(src)] is no longer owning mob [src]([src.type])", LOG_OWNERSHIP)
SStgui.on_logout(src)
remove_from_player_list()
+ update_ambience_area(null) // Unset ambience vars so it plays again on login
..()
if(loc)
diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index f24f5a58c0d8d..6ec820bc469c9 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -6,7 +6,6 @@
* * GLOB.dead_mob_list
* * GLOB.alive_mob_list
* * GLOB.all_clockwork_mobs
- * * GLOB.mob_directory
*
* Unsets the focus var
*
@@ -67,7 +66,6 @@
*
* Adds to global lists
* * GLOB.mob_list
- * * GLOB.mob_directory (by tag)
* * GLOB.dead_mob_list - if mob is dead
* * GLOB.alive_mob_list - if the mob is alive
*
@@ -441,88 +439,6 @@
return FALSE
-/**
- * Try to equip an item to a slot on the mob
- *
- * This is a SAFE proc. Use this instead of equip_to_slot()!
- *
- * set qdel_on_fail to have it delete W if it fails to equip
- *
- * set disable_warning to disable the 'you are unable to equip that' warning.
- *
- * unset redraw_mob to prevent the mob icons from being redrawn at the end.
- *
- * Initial is used to indicate whether or not this is the initial equipment (job datums etc) or just a player doing it
- *
- * set indirect_action to allow insertions into "soft" locked objects, things that are easily opened by the owning mob
- */
-/mob/proc/equip_to_slot_if_possible(obj/item/W, slot, qdel_on_fail = FALSE, disable_warning = FALSE, redraw_mob = TRUE, bypass_equip_delay_self = FALSE, initial = FALSE, indirect_action = FALSE)
- if(!istype(W) || QDELETED(W)) //This qdeleted is to prevent stupid behavior with things that qdel during init, like say stacks
- return FALSE
- if(!W.mob_can_equip(src, slot, disable_warning, bypass_equip_delay_self, indirect_action = indirect_action))
- if(qdel_on_fail)
- qdel(W)
- else if(!disable_warning)
- to_chat(src, span_warning("You are unable to equip that!"))
- return FALSE
- equip_to_slot(W, slot, initial, redraw_mob, indirect_action = indirect_action) //This proc should not ever fail.
- return TRUE
-
-/**
- * Actually equips an item to a slot (UNSAFE)
- *
- * This is an UNSAFE proc. It merely handles the actual job of equipping. All the checks on
- * whether you can or can't equip need to be done before! Use mob_can_equip() for that task.
- *
- *In most cases you will want to use equip_to_slot_if_possible()
- */
-/mob/proc/equip_to_slot(obj/item/equipping, slot, initial = FALSE, redraw_mob = FALSE, indirect_action = FALSE)
- return
-
-/**
- * Equip an item to the slot or delete
- *
- * This is just a commonly used configuration for the equip_to_slot_if_possible() proc, used to
- * equip people when the round starts and when events happen and such.
- *
- * Also bypasses equip delay checks, since the mob isn't actually putting it on.
- * Initial is used to indicate whether or not this is the initial equipment (job datums etc) or just a player doing it
- * set indirect_action to allow insertions into "soft" locked objects, things that are easily opened by the owning mob
- */
-/mob/proc/equip_to_slot_or_del(obj/item/W, slot, initial = FALSE, indirect_action = FALSE)
- return equip_to_slot_if_possible(W, slot, TRUE, TRUE, FALSE, TRUE, initial, indirect_action)
-
-/**
- * Auto equip the passed in item the appropriate slot based on equipment priority
- *
- * puts the item "W" into an appropriate slot in a human's inventory
- *
- * returns 0 if it cannot, 1 if successful
- */
-/mob/proc/equip_to_appropriate_slot(obj/item/W, qdel_on_fail = FALSE, indirect_action = FALSE)
- if(!istype(W))
- return FALSE
- var/slot_priority = W.slot_equipment_priority
-
- if(!slot_priority)
- slot_priority = list( \
- ITEM_SLOT_BACK, ITEM_SLOT_ID,\
- ITEM_SLOT_ICLOTHING, ITEM_SLOT_OCLOTHING,\
- ITEM_SLOT_MASK, ITEM_SLOT_HEAD, ITEM_SLOT_NECK,\
- ITEM_SLOT_FEET, ITEM_SLOT_GLOVES,\
- ITEM_SLOT_EARS, ITEM_SLOT_EYES,\
- ITEM_SLOT_BELT, ITEM_SLOT_SUITSTORE,\
- ITEM_SLOT_LPOCKET, ITEM_SLOT_RPOCKET,\
- ITEM_SLOT_DEX_STORAGE\
- )
-
- for(var/slot in slot_priority)
- if(equip_to_slot_if_possible(W, slot, disable_warning = TRUE, redraw_mob = TRUE, indirect_action = indirect_action))
- return TRUE
-
- if(qdel_on_fail)
- qdel(W)
- return FALSE
/**
* Reset the attached clients perspective (viewpoint)
*
@@ -889,10 +805,6 @@
set category = null
return
-///Is the mob muzzled (default false)
-/mob/proc/is_muzzled()
- return FALSE
-
/// Adds this list to the output to the stat browser
/mob/proc/get_status_tab_items()
. = list("") //we want to offset unique stuff from standard stuff
diff --git a/code/modules/mob/mob_defines.dm b/code/modules/mob/mob_defines.dm
index a0658c3a02b38..2206efd0e13ce 100644
--- a/code/modules/mob/mob_defines.dm
+++ b/code/modules/mob/mob_defines.dm
@@ -191,3 +191,6 @@
var/active_typing_indicator
///the icon currently used for the thinking indicator's bubble
var/active_thinking_indicator
+
+ /// A ref of the area we're taking our ambient loop from.
+ var/area/ambience_tracked_area
diff --git a/code/modules/mob/mob_lists.dm b/code/modules/mob/mob_lists.dm
index 9fd097a1fd6a4..f43f82ac24609 100644
--- a/code/modules/mob/mob_lists.dm
+++ b/code/modules/mob/mob_lists.dm
@@ -1,12 +1,10 @@
///Adds the mob reference to the list and directory of all mobs. Called on Initialize().
/mob/proc/add_to_mob_list()
GLOB.mob_list |= src
- GLOB.mob_directory[tag] = src
///Removes the mob reference from the list and directory of all mobs. Called on Destroy().
/mob/proc/remove_from_mob_list()
GLOB.mob_list -= src
- GLOB.mob_directory -= tag
///Adds the mob reference to the list of all mobs alive. If mob is cliented, it adds it to the list of all living player-mobs.
/mob/proc/add_to_alive_mob_list()
diff --git a/code/modules/mob/mob_say.dm b/code/modules/mob/mob_say.dm
index 568aee6690292..6b8c8f9aa6b2a 100644
--- a/code/modules/mob/mob_say.dm
+++ b/code/modules/mob/mob_say.dm
@@ -106,9 +106,6 @@
if(!allow_mimes && HAS_MIND_TRAIT(src, TRAIT_MIMING))
return FALSE
- if(is_muzzled())
- return FALSE
-
return ..()
///Speak as a dead person (ghost etc)
diff --git a/code/modules/mob_spawn/ghost_roles/fugitive_hunter_roles.dm b/code/modules/mob_spawn/ghost_roles/fugitive_hunter_roles.dm
index 5b9e043349ea0..0165b27f21a1a 100644
--- a/code/modules/mob_spawn/ghost_roles/fugitive_hunter_roles.dm
+++ b/code/modules/mob_spawn/ghost_roles/fugitive_hunter_roles.dm
@@ -96,3 +96,18 @@
if I assisted them with my 'flesh-gaze'. They're a bunch of freaks, but at least they leave me be after I'm done helping them..."
back_story = HUNTER_PACK_PSYKER
outfit = /datum/outfit/psyker_seer
+
+/obj/effect/mob_spawn/ghost_role/human/fugitive/mi13
+ name = "top-secret pod"
+ desc = "You don't have the classification to know what this pod contains or what its purpose is."
+ icon = 'icons/obj/machines/sleeper.dmi'
+ icon_state = "sleeper_s"
+ prompt_name = "a MI13 agent"
+ you_are_text = "I am an agent sent by MI13."
+ flavour_text = "Your mission is to infiltrate the space around SS13 and capture the fugitives on board, dead or alive. Your shuttle has been disguised as an ordinary food truck to help you remain undetected. \
+ This is a stealth mission in enemy territory. Reinforcements will not be sent to save you. Microbombs have been implanted in case of capture. Do not disappoint."
+ back_story = HUNTER_PACK_MI13
+ outfit = /datum/outfit/mi13_hunter
+
+/obj/effect/mob_spawn/ghost_role/human/fugitive/mi13/chef
+ outfit = /datum/outfit/mi13_hunter/chef
diff --git a/code/modules/modular_computers/computers/item/pda.dm b/code/modules/modular_computers/computers/item/pda.dm
index 2fb7863445de2..f1fced454e4d3 100644
--- a/code/modules/modular_computers/computers/item/pda.dm
+++ b/code/modules/modular_computers/computers/item/pda.dm
@@ -149,14 +149,14 @@
if(tool.w_class >= WEIGHT_CLASS_SMALL) // Anything equal to or larger than small won't work
user.balloon_alert(user, "too big!")
return ITEM_INTERACT_BLOCKING
- if(inserted_item)
- balloon_alert(user, "no room!")
- return ITEM_INTERACT_BLOCKING
if(!user.transferItemToLoc(tool, src))
return ITEM_INTERACT_BLOCKING
- balloon_alert(user, "inserted [tool]")
- inserted_item = tool
- playsound(src, 'sound/machines/pda_button1.ogg', 50, TRUE)
+ if(inserted_item)
+ swap_pen(user, tool)
+ else
+ balloon_alert(user, "inserted [tool]")
+ inserted_item = tool
+ playsound(src, 'sound/machines/pda_button1.ogg', 50, TRUE)
return ITEM_INTERACT_SUCCESS
@@ -185,6 +185,14 @@
update_appearance()
playsound(src, 'sound/machines/pda_button2.ogg', 50, TRUE)
+/obj/item/modular_computer/pda/proc/swap_pen(mob/user, obj/item/tool)
+ if(inserted_item)
+ balloon_alert(user, "swapped pens")
+ user.put_in_hands(inserted_item)
+ inserted_item = tool
+ update_appearance()
+ playsound(src, 'sound/machines/pda_button1.ogg', 50, TRUE)
+
/obj/item/modular_computer/pda/proc/explode(mob/target, mob/bomber, from_message_menu = FALSE)
var/turf/current_turf = get_turf(src)
diff --git a/code/modules/modular_computers/computers/machinery/console_presets.dm b/code/modules/modular_computers/computers/machinery/console_presets.dm
index ad87960603c35..94ff9439e3b11 100644
--- a/code/modules/modular_computers/computers/machinery/console_presets.dm
+++ b/code/modules/modular_computers/computers/machinery/console_presets.dm
@@ -33,6 +33,17 @@
/datum/computer_file/program/scipaper_program,
)
+/obj/machinery/modular_computer/preset/research/away
+ name = "old research console"
+ desc = "An old computer used for writing research papers."
+ starting_programs = list(
+ /datum/computer_file/program/scipaper_program,
+ )
+
+/obj/machinery/modular_computer/preset/research/away/Initialize(mapload)
+ . = ..()
+ cpu.device_theme = PDA_THEME_RETRO
+
// ===== COMMAND CONSOLE =====
/obj/machinery/modular_computer/preset/command
name = "command console"
diff --git a/code/modules/pai/pai.dm b/code/modules/pai/pai.dm
index acde3c51a5c50..4268c040e2bcd 100644
--- a/code/modules/pai/pai.dm
+++ b/code/modules/pai/pai.dm
@@ -164,7 +164,6 @@
QDEL_NULL(signaler)
QDEL_NULL(leash)
card = null
- GLOB.pai_list.Remove(src)
return ..()
// Need to override parent here because the message we dispatch is turf-based, not based on the location of the object because that could be fuckin anywhere
@@ -221,7 +220,6 @@
if(istype(loc, /obj/item/modular_computer))
give_messenger_ability()
START_PROCESSING(SSfastprocess, src)
- GLOB.pai_list += src
make_laws()
for(var/law in laws.inherent)
lawcheck += law
diff --git a/code/modules/power/supermatter/supermatter_gas.dm b/code/modules/power/supermatter/supermatter_gas.dm
index 35b9db0731f92..fe0ed388148b5 100644
--- a/code/modules/power/supermatter/supermatter_gas.dm
+++ b/code/modules/power/supermatter/supermatter_gas.dm
@@ -216,7 +216,7 @@ GLOBAL_LIST_INIT(sm_gas_behavior, init_sm_gas())
desc = "Will generate electrical zaps."
/datum/sm_gas/zauker/extra_effects(obj/machinery/power/supermatter_crystal/sm)
- if(!prob(sm.gas_percentage[/datum/gas/zauker]))
+ if(!prob(sm.gas_percentage[/datum/gas/zauker] * 100))
return
playsound(sm.loc, 'sound/weapons/emitter2.ogg', 100, TRUE, extrarange = 10)
sm.supermatter_zap(
diff --git a/code/modules/projectiles/guns/special/hand_of_midas.dm b/code/modules/projectiles/guns/special/hand_of_midas.dm
index 68b8158c32d9f..e92ffe8d0bf22 100644
--- a/code/modules/projectiles/guns/special/hand_of_midas.dm
+++ b/code/modules/projectiles/guns/special/hand_of_midas.dm
@@ -37,20 +37,26 @@
balloon_alert(user, "not enough gold")
// Siphon gold from a victim, recharging our gun & removing their Midas Blight debuff in the process.
+/obj/item/gun/magic/midas_hand/interact_with_atom_secondary(atom/interacting_with, mob/living/user, list/modifiers)
+ if(!isliving(interacting_with))
+ return ITEM_INTERACT_BLOCKING
+ return suck_gold(interacting_with, user)
+
/obj/item/gun/magic/midas_hand/ranged_interact_with_atom_secondary(atom/interacting_with, mob/living/user, list/modifiers)
if(!isliving(interacting_with) || !IN_GIVEN_RANGE(user, interacting_with, gold_suck_range))
return ITEM_INTERACT_BLOCKING
- if(interacting_with == user)
+ return suck_gold(interacting_with, user)
+
+/obj/item/gun/magic/midas_hand/proc/suck_gold(mob/living/victim, mob/living/user)
+ if(victim == user)
balloon_alert(user, "can't siphon from self!")
return ITEM_INTERACT_BLOCKING
- if(!interacting_with.reagents)
+ if(!victim.reagents)
return ITEM_INTERACT_BLOCKING
-
- var/gold_amount = interacting_with.reagents.get_reagent_amount(/datum/reagent/gold, type_check = REAGENT_SUB_TYPE)
+ var/gold_amount = victim.reagents.get_reagent_amount(/datum/reagent/gold, type_check = REAGENT_SUB_TYPE)
if(!gold_amount)
balloon_alert(user, "no gold in bloodstream!")
return ITEM_INTERACT_BLOCKING
- var/mob/living/victim = interacting_with
var/gold_beam = user.Beam(victim, icon_state = "drain_gold")
if(!do_after(
user = user,
diff --git a/code/modules/projectiles/projectile/special/temperature.dm b/code/modules/projectiles/projectile/special/temperature.dm
index 2a8b6ca6b6938..182bb715466d3 100644
--- a/code/modules/projectiles/projectile/special/temperature.dm
+++ b/code/modules/projectiles/projectile/special/temperature.dm
@@ -61,3 +61,4 @@
var/turf/location = get_turf(src)
new /obj/effect/hotspot(location)
location.hotspot_expose(700, 50, 1)
+ return ..()
diff --git a/code/modules/reagents/chemistry/holder/reactions.dm b/code/modules/reagents/chemistry/holder/reactions.dm
index 80241173deebf..3fbcb57a43424 100644
--- a/code/modules/reagents/chemistry/holder/reactions.dm
+++ b/code/modules/reagents/chemistry/holder/reactions.dm
@@ -339,6 +339,7 @@
my_atom.visible_message(span_notice("[iconhtml] \The [my_atom]'s power is consumed in the reaction."))
extract.name = "used slime extract"
extract.desc = "This extract has been used up."
+ extract.grind_results.Cut()
//finish the reaction
selected_reaction.on_reaction(src, null, multiplier)
diff --git a/code/modules/reagents/chemistry/reagents.dm b/code/modules/reagents/chemistry/reagents.dm
index 11947c7060271..576d62585f7a8 100644
--- a/code/modules/reagents/chemistry/reagents.dm
+++ b/code/modules/reagents/chemistry/reagents.dm
@@ -250,7 +250,9 @@ Primarily used in reagents/reaction_agents
/// Should return a associative list where keys are taste descriptions and values are strength ratios
/datum/reagent/proc/get_taste_description(mob/living/taster)
- return list("[taste_description]" = 1)
+ if(isnull(taster) || !HAS_TRAIT(taster, TRAIT_DETECTIVES_TASTE))
+ return list("[taste_description]" = 1)
+ return list("[LOWER_TEXT(name)]" = 1)
/**
* Used when you want the default reagents purity to be equal to the normal effects
diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm
index df14037ac1e8f..77205b577929d 100644
--- a/code/modules/reagents/chemistry/reagents/other_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm
@@ -127,6 +127,16 @@
if(data["blood_DNA"])
bloodsplatter.add_blood_DNA(list(data["blood_DNA"] = data["blood_type"]))
+/datum/reagent/blood/get_taste_description(mob/living/taster)
+ if(isnull(taster))
+ return ..()
+ if(!HAS_TRAIT(taster, TRAIT_DETECTIVES_TASTE))
+ return ..()
+ var/blood_type = data?["blood_type"]
+ if(!blood_type)
+ return ..()
+ return list("[blood_type] type blood" = 1)
+
/datum/reagent/consumable/liquidgibs
name = "Liquid Gibs"
color = "#CC4633"
diff --git a/code/modules/reagents/reagent_containers/cups/_cup.dm b/code/modules/reagents/reagent_containers/cups/_cup.dm
index fb3aa38271802..87df7765233ec 100644
--- a/code/modules/reagents/reagent_containers/cups/_cup.dm
+++ b/code/modules/reagents/reagent_containers/cups/_cup.dm
@@ -228,6 +228,8 @@
worn_icon_state = "beaker"
custom_materials = list(/datum/material/glass=SMALL_MATERIAL_AMOUNT*5)
fill_icon_thresholds = list(0, 1, 20, 40, 60, 80, 100)
+ pickup_sound = 'sound/items/handling/beaker_pickup.ogg'
+ drop_sound = 'sound/items/handling/beaker_place.ogg'
/obj/item/reagent_containers/cup/beaker/Initialize(mapload)
. = ..()
diff --git a/code/modules/research/designs/autolathe/engineering_designs.dm b/code/modules/research/designs/autolathe/engineering_designs.dm
index dc87b747959ca..c376a1ac1c55a 100644
--- a/code/modules/research/designs/autolathe/engineering_designs.dm
+++ b/code/modules/research/designs/autolathe/engineering_designs.dm
@@ -10,18 +10,6 @@
)
departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING
-/datum/design/sparker
- name = "Sparker WallFrame"
- id = "sparker"
- build_type = PROTOLATHE | AWAY_LATHE | AUTOLATHE
- materials = list(/datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT, /datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT)
- build_path = /obj/item/wallframe/sparker
- category = list(
- RND_CATEGORY_INITIAL,
- RND_CATEGORY_CONSTRUCTION + RND_SUBCATEGORY_CONSTRUCTION_MOUNTS,
- )
- departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING
-
/datum/design/tracker_electronics
name = "Solar Tracking Electronics"
id = "solar_tracker"
@@ -95,18 +83,6 @@
)
departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING
-/datum/design/turret_control_frame
- name = "Turret Control Frame"
- id = "turret_control"
- build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE
- materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT*6)
- build_path = /obj/item/wallframe/turret_control
- category = list(
- RND_CATEGORY_INITIAL,
- RND_CATEGORY_CONSTRUCTION + RND_SUBCATEGORY_CONSTRUCTION_MOUNTS,
- )
- departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING
-
/datum/design/large_welding_tool
name = "Industrial Welding Tool"
id = "large_welding_tool"
@@ -119,55 +95,6 @@
)
departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING
-/datum/design/camera_assembly
- name = "Camera Assembly"
- id = "camera_assembly"
- build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE
- materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT*4, /datum/material/glass = SMALL_MATERIAL_AMOUNT*2.5)
- build_path = /obj/item/wallframe/camera
- category = list(
- RND_CATEGORY_INITIAL,
- RND_CATEGORY_CONSTRUCTION + RND_SUBCATEGORY_CONSTRUCTION_MOUNTS,
- )
- departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING
-
-/datum/design/newscaster_frame
- name = "Newscaster Frame"
- id = "newscaster_frame"
- build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE
- materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT*7, /datum/material/glass = SHEET_MATERIAL_AMOUNT*4)
- build_path = /obj/item/wallframe/newscaster
- category = list(
- RND_CATEGORY_INITIAL,
- RND_CATEGORY_CONSTRUCTION + RND_SUBCATEGORY_CONSTRUCTION_MOUNTS,
- )
- departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING
-
-/datum/design/status_display_frame
- name = "Status Display Frame"
- id = "status_display_frame"
- build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE
- materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT*7, /datum/material/glass = SHEET_MATERIAL_AMOUNT*4)
- build_path = /obj/item/wallframe/status_display
- category = list(
- RND_CATEGORY_INITIAL,
- RND_CATEGORY_CONSTRUCTION + RND_SUBCATEGORY_CONSTRUCTION_MOUNTS,
- )
- departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING
-
-
-/datum/design/intercom_frame
- name = "Intercom Frame"
- id = "intercom_frame"
- build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE
- materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT*0.75, /datum/material/glass =SMALL_MATERIAL_AMOUNT*0.25)
- build_path = /obj/item/wallframe/intercom
- category = list(
- RND_CATEGORY_INITIAL,
- RND_CATEGORY_CONSTRUCTION + RND_SUBCATEGORY_CONSTRUCTION_MOUNTS,
- )
- departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING
-
/datum/design/earmuffs
name = "Earmuffs"
id = "earmuffs"
@@ -323,130 +250,3 @@
RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_ATMOSPHERICS,
)
departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING
-
-/datum/design/requests_console
- name = "Requests Console Frame"
- id = "requests_console"
- build_type = AUTOLATHE | PROTOLATHE
- materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT*7, /datum/material/glass = SHEET_MATERIAL_AMOUNT*4)
- build_path = /obj/item/wallframe/requests_console
- category = list(
- RND_CATEGORY_INITIAL,
- RND_CATEGORY_CONSTRUCTION + RND_SUBCATEGORY_CONSTRUCTION_MOUNTS
- )
- departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING
-
-/datum/design/light_switch_frame
- name = "Light Switch Frame"
- id = "light_switch_frame"
- build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE
- materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT*0.75, /datum/material/glass =SMALL_MATERIAL_AMOUNT*0.25)
- build_path = /obj/item/wallframe/light_switch
- category = list(
- RND_CATEGORY_INITIAL,
- RND_CATEGORY_CONSTRUCTION + RND_SUBCATEGORY_CONSTRUCTION_MOUNTS
- )
- departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING
-
-/datum/design/telescreen_turbine
- name = "Turbine Telescreen"
- id = "telescreen_turbine"
- build_type = PROTOLATHE
- materials = list(
- /datum/material/iron = SHEET_MATERIAL_AMOUNT*5,
- /datum/material/glass =SHEET_MATERIAL_AMOUNT * 2.5,
- )
- build_path = /obj/item/wallframe/telescreen/turbine
- category = list(
- RND_CATEGORY_INITIAL,
- RND_CATEGORY_CONSTRUCTION + RND_SUBCATEGORY_CONSTRUCTION_MOUNTS,
- )
- departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING
-
-/datum/design/telescreen_engine
- name = "Engine Telescreen"
- id = "telescreen_engine"
- build_type = PROTOLATHE
- materials = list(
- /datum/material/iron = SHEET_MATERIAL_AMOUNT*5,
- /datum/material/glass =SHEET_MATERIAL_AMOUNT * 2.5,
- )
- build_path = /obj/item/wallframe/telescreen/engine
- category = list(
- RND_CATEGORY_INITIAL,
- RND_CATEGORY_CONSTRUCTION + RND_SUBCATEGORY_CONSTRUCTION_MOUNTS,
- )
- departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING
-
-/datum/design/telescreen_auxbase
- name = "Auxiliary Base Telescreen"
- id = "telescreen_auxbase"
- build_type = PROTOLATHE
- materials = list(
- /datum/material/iron = SHEET_MATERIAL_AMOUNT*5,
- /datum/material/glass =SHEET_MATERIAL_AMOUNT * 2.5,
- )
- build_path = /obj/item/wallframe/telescreen/auxbase
- category = list(
- RND_CATEGORY_INITIAL,
- RND_CATEGORY_CONSTRUCTION + RND_SUBCATEGORY_CONSTRUCTION_MOUNTS,
- )
- departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING
-
-/datum/design/tram_controller
- name = "Tram Controller Cabinet"
- id = "tram_controller"
- build_type = PROTOLATHE
- materials = list(
- /datum/material/titanium = SHEET_MATERIAL_AMOUNT * 4,
- /datum/material/iron = SHEET_MATERIAL_AMOUNT * 2,
- /datum/material/gold = SHEET_MATERIAL_AMOUNT * 7,
- /datum/material/silver = SHEET_MATERIAL_AMOUNT * 7,
- /datum/material/diamond = SHEET_MATERIAL_AMOUNT * 4,
- )
- build_path = /obj/item/wallframe/tram/controller
- category = list(
- RND_CATEGORY_INITIAL,
- RND_CATEGORY_CONSTRUCTION + RND_SUBCATEGORY_CONSTRUCTION_MOUNTS,
- )
- departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING
-
-/datum/design/tram_display
- name = "Tram Indicator Display"
- id = "tram_display"
- build_type = PROTOLATHE
- materials = list(
- /datum/material/titanium = SHEET_MATERIAL_AMOUNT * 4,
- /datum/material/iron = SHEET_MATERIAL_AMOUNT * 1,
- /datum/material/glass =SHEET_MATERIAL_AMOUNT * 2,
- )
- build_path = /obj/item/wallframe/indicator_display
- category = list(
- RND_CATEGORY_INITIAL,
- RND_CATEGORY_CONSTRUCTION + RND_SUBCATEGORY_CONSTRUCTION_MOUNTS,
- )
- departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING
-
-/datum/design/tram_floor_dark
- name = "Dark Tram Tile"
- id = "tram_floor_dark"
- build_type = PROTOLATHE
- materials = list(/datum/material/plastic = SHEET_MATERIAL_AMOUNT * 0.25)
- build_path = /obj/item/stack/thermoplastic
- category = list(
- RND_CATEGORY_INITIAL,
- RND_CATEGORY_CONSTRUCTION + RND_SUBCATEGORY_CONSTRUCTION_MATERIALS,
- )
- departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING
-
-/datum/design/tram_floor_light
- name = "Light Tram Tile"
- id = "tram_floor_light"
- build_type = PROTOLATHE
- materials = list(/datum/material/plastic = SHEET_MATERIAL_AMOUNT * 0.25)
- build_path = /obj/item/stack/thermoplastic/light
- category = list(
- RND_CATEGORY_INITIAL,
- RND_CATEGORY_CONSTRUCTION + RND_SUBCATEGORY_CONSTRUCTION_MATERIALS,
- )
- departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING
diff --git a/code/modules/research/designs/autolathe/multi-department_designs.dm b/code/modules/research/designs/autolathe/multi-department_designs.dm
index ea1c94ff89c27..734dcbc97e084 100644
--- a/code/modules/research/designs/autolathe/multi-department_designs.dm
+++ b/code/modules/research/designs/autolathe/multi-department_designs.dm
@@ -483,43 +483,6 @@
)
departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING | DEPARTMENT_BITFLAG_SCIENCE
-/datum/design/circuit
- name = "Blue Circuit Tile"
- id = "circuit"
- build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE
- materials = list(/datum/material/iron =SMALL_MATERIAL_AMOUNT*5, /datum/material/glass =SMALL_MATERIAL_AMOUNT*5)
- build_path = /obj/item/stack/tile/circuit
- category = list(
- RND_CATEGORY_INITIAL,
- RND_CATEGORY_CONSTRUCTION + RND_SUBCATEGORY_CONSTRUCTION_MATERIALS,
- )
- departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING | DEPARTMENT_BITFLAG_SCIENCE
-
-
-/datum/design/circuitgreen
- name = "Green Circuit Tile"
- id = "circuitgreen"
- build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE
- materials = list(/datum/material/iron =SMALL_MATERIAL_AMOUNT*5, /datum/material/glass =SMALL_MATERIAL_AMOUNT*5)
- build_path = /obj/item/stack/tile/circuit/green
- category = list(
- RND_CATEGORY_INITIAL,
- RND_CATEGORY_CONSTRUCTION + RND_SUBCATEGORY_CONSTRUCTION_MATERIALS,
- )
- departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING | DEPARTMENT_BITFLAG_SCIENCE
-
-/datum/design/circuitred
- name = "Red Circuit Tile"
- id = "circuitred"
- build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE
- materials = list(/datum/material/iron =SMALL_MATERIAL_AMOUNT*5, /datum/material/glass =SMALL_MATERIAL_AMOUNT*5)
- build_path = /obj/item/stack/tile/circuit/red
- category = list(
- RND_CATEGORY_INITIAL,
- RND_CATEGORY_CONSTRUCTION + RND_SUBCATEGORY_CONSTRUCTION_MATERIALS,
- )
- departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING | DEPARTMENT_BITFLAG_SCIENCE
-
/datum/design/conveyor_belt
name = "Conveyor Belt"
id = "conveyor_belt"
diff --git a/code/modules/research/experimentor.dm b/code/modules/research/experimentor.dm
index affe82275ab14..4a08ae44df16c 100644
--- a/code/modules/research/experimentor.dm
+++ b/code/modules/research/experimentor.dm
@@ -558,7 +558,7 @@
/obj/item/relic
name = "strange object"
desc = "What mysteries could this hold? Maybe Research & Development could find out."
- icon = 'icons/obj/devices/assemblies.dmi'
+ icon = 'icons/obj/devices/artifacts.dmi'
var/realName = "defined object"
var/revealed = FALSE
var/realProc
@@ -567,7 +567,7 @@
/obj/item/relic/Initialize(mapload)
. = ..()
- icon_state = pick("shock_kit","armor-igniter-analyzer","infra-igniter0","infra-igniter1","radio-multitool","prox-radio1","radio-radio","timer-multitool0","radio-igniter-tank")
+ icon_state = pick("prototype1","prototype2","prototype3","prototype4","prototype5","prototype6","prototype7","prototype8","prototype9")
realName = "[pick("broken","twisted","spun","improved","silly","regular","badly made")] [pick("device","object","toy","illegal tech","weapon")]"
diff --git a/code/modules/research/techweb/nodes/atmos_nodes.dm b/code/modules/research/techweb/nodes/atmos_nodes.dm
index e2f29171d9d98..a35c5f4c185ea 100644
--- a/code/modules/research/techweb/nodes/atmos_nodes.dm
+++ b/code/modules/research/techweb/nodes/atmos_nodes.dm
@@ -68,6 +68,7 @@
"HFR_interface",
"HFR_moderator_input",
"HFR_waste_output",
+ "adv_fire_extinguisher",
"bolter_wrench",
"rpd_loaded",
"engine_goggles",
@@ -92,14 +93,13 @@
"rcd_ammo",
"weldingmask",
"magboots",
- "adv_fire_extinguisher",
)
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_4_POINTS)
discount_experiments = list(/datum/experiment/ordnance/gaseous/noblium = TECHWEB_TIER_4_POINTS)
/datum/techweb_node/rcd_upgrade
id = TECHWEB_NODE_RCD_UPGRADE
- display_name = "Rapid Device Upgrade Designs"
+ display_name = "Rapid Construction Device Upgrades"
description = "New designs and enhancements for RCD and RPD."
prereq_ids = list(TECHWEB_NODE_EXP_TOOLS, TECHWEB_NODE_PARTS_BLUESPACE)
design_ids = list(
diff --git a/code/modules/research/techweb/nodes/engi_nodes.dm b/code/modules/research/techweb/nodes/engi_nodes.dm
index cb487f41b8db1..626dd6981d0ce 100644
--- a/code/modules/research/techweb/nodes/engi_nodes.dm
+++ b/code/modules/research/techweb/nodes/engi_nodes.dm
@@ -88,6 +88,7 @@
"comm_monitor",
"comm_server",
"message_monitor",
+ "ntnet_relay",
"s_hub",
"s_messaging",
"s_server",
@@ -142,16 +143,6 @@
"wirecutters",
"light_bulb",
"light_tube",
- "intercom_frame",
- "newscaster_frame",
- "status_display_frame",
- "circuit",
- "circuitgreen",
- "circuitred",
- "tram_floor_dark",
- "tram_floor_light",
- "tram_controller",
- "tram_display",
"crossing_signal",
"guideway_sensor",
)
diff --git a/code/modules/research/techweb/nodes/medbay_nodes.dm b/code/modules/research/techweb/nodes/medbay_nodes.dm
index 3f2239ced22e9..51bc5f1504902 100644
--- a/code/modules/research/techweb/nodes/medbay_nodes.dm
+++ b/code/modules/research/techweb/nodes/medbay_nodes.dm
@@ -23,6 +23,8 @@
"stethoscope",
"beaker",
"large_beaker",
+ "chem_pack",
+ "blood_pack",
"syringe",
"dropper",
"pillbottle",
@@ -40,8 +42,6 @@
prereq_ids = list(TECHWEB_NODE_MEDBAY_EQUIP)
design_ids = list(
"xlarge_beaker",
- "blood_pack",
- "chem_pack",
"med_spray_bottle",
"medigel",
"medipen_refiller",
diff --git a/code/modules/research/techweb/nodes/research_nodes.dm b/code/modules/research/techweb/nodes/research_nodes.dm
index 82a64f8c82338..0cdbdb6548b4a 100644
--- a/code/modules/research/techweb/nodes/research_nodes.dm
+++ b/code/modules/research/techweb/nodes/research_nodes.dm
@@ -13,7 +13,6 @@
"destructive_analyzer",
"destructive_scanner",
"experi_scanner",
- "ntnet_relay",
"laptop",
"portadrive_basic",
"portadrive_advanced",
diff --git a/code/modules/research/techweb/nodes/security_nodes.dm b/code/modules/research/techweb/nodes/security_nodes.dm
index b876b3ec677ea..c85639b0aecb1 100644
--- a/code/modules/research/techweb/nodes/security_nodes.dm
+++ b/code/modules/research/techweb/nodes/security_nodes.dm
@@ -21,7 +21,6 @@
description = "All the essentials to subdue a mime."
prereq_ids = list(TECHWEB_NODE_BASIC_ARMS)
design_ids = list(
- "camera_assembly",
"secdata",
"mining",
"prisonmanage",
@@ -30,7 +29,6 @@
"security_photobooth",
"photobooth",
"scanner_gate",
- "turret_control",
"pepperspray",
"dragnet_beacon",
"inspector",
diff --git a/code/modules/research/xenobiology/xenobiology.dm b/code/modules/research/xenobiology/xenobiology.dm
index 34d7f4d507a46..9f22520d6ab10 100644
--- a/code/modules/research/xenobiology/xenobiology.dm
+++ b/code/modules/research/xenobiology/xenobiology.dm
@@ -10,7 +10,7 @@
throwforce = 0
throw_speed = 3
throw_range = 6
- grind_results = list()
+ grind_results = list(/datum/reagent/toxin/slimejelly = 20)
///uses before it goes inert
var/extract_uses = 1
///deletion timer, for delayed reactions
@@ -44,11 +44,6 @@
. = ..()
create_reagents(100, INJECTABLE | DRAWABLE)
-/obj/item/slime_extract/on_grind()
- . = ..()
- if(extract_uses)
- grind_results[/datum/reagent/toxin/slimejelly] = 20
-
/**
* Effect when activated by a Luminescent.
*
diff --git a/code/modules/shuttle/shuttle_rotate.dm b/code/modules/shuttle/shuttle_rotate.dm
index 734e2337df518..cb7cad65b6ba1 100644
--- a/code/modules/shuttle/shuttle_rotate.dm
+++ b/code/modules/shuttle/shuttle_rotate.dm
@@ -12,7 +12,7 @@ If ever any of these procs are useful for non-shuttles, rename it to proc/rotate
setDir(angle2dir(rotation+dir2angle(dir)))
//resmooth if need be.
- if(params & ROTATE_SMOOTH && smoothing_flags & (SMOOTH_CORNERS|SMOOTH_BITMASK))
+ if(params & ROTATE_SMOOTH && smoothing_flags & USES_SMOOTHING)
QUEUE_SMOOTH(src)
//rotate the pixel offsets too.
diff --git a/code/modules/surgery/bodyparts/head.dm b/code/modules/surgery/bodyparts/head.dm
index 66f42c1e039ba..16a9a288bf0ba 100644
--- a/code/modules/surgery/bodyparts/head.dm
+++ b/code/modules/surgery/bodyparts/head.dm
@@ -141,7 +141,7 @@
if (!can_dismember)
return FALSE
- if(owner.stat < HARD_CRIT)
+ if(!HAS_TRAIT(owner, TRAIT_CURSED) && owner.stat < HARD_CRIT)
return FALSE
return ..()
diff --git a/code/modules/surgery/bodyparts/parts.dm b/code/modules/surgery/bodyparts/parts.dm
index 97fa50d76c85b..6e3b5ca921bc4 100644
--- a/code/modules/surgery/bodyparts/parts.dm
+++ b/code/modules/surgery/bodyparts/parts.dm
@@ -48,7 +48,7 @@
old_owner.gib(DROP_ALL_REMAINS)
/obj/item/bodypart/chest/can_dismember(obj/item/item)
- if(owner.stat < HARD_CRIT || !contents.len)
+ if((!HAS_TRAIT(owner, TRAIT_CURSED) && owner.stat < HARD_CRIT) || !contents.len)
return FALSE
return ..()
diff --git a/code/modules/surgery/experimental_dissection.dm b/code/modules/surgery/experimental_dissection.dm
index 69c246d9e8de5..95c952e7724d4 100644
--- a/code/modules/surgery/experimental_dissection.dm
+++ b/code/modules/surgery/experimental_dissection.dm
@@ -1,5 +1,5 @@
///How many research points you gain from dissecting a Human.
-#define BASE_HUMAN_REWARD 500
+#define BASE_HUMAN_REWARD 10
/datum/surgery/advanced/experimental_dissection
name = "Experimental Dissection"
diff --git a/code/modules/unit_tests/_unit_tests.dm b/code/modules/unit_tests/_unit_tests.dm
index 593b949e2b22f..d164bca069dab 100644
--- a/code/modules/unit_tests/_unit_tests.dm
+++ b/code/modules/unit_tests/_unit_tests.dm
@@ -180,6 +180,7 @@
#include "map_landmarks.dm"
#include "mapload_space_verification.dm"
#include "mapping.dm"
+#include "mapping_nearstation_test.dm"
#include "mecha_damage.dm"
#include "medical_wounds.dm"
#include "merge_type.dm"
diff --git a/code/modules/unit_tests/mapload_space_verification.dm b/code/modules/unit_tests/mapload_space_verification.dm
index 35556c85fb482..843de4f8fdde2 100644
--- a/code/modules/unit_tests/mapload_space_verification.dm
+++ b/code/modules/unit_tests/mapload_space_verification.dm
@@ -32,6 +32,8 @@
var/area/turf_area = get_area(iterated_turf)
if(!isspaceturf(iterated_turf) || is_type_in_typecache(turf_area, excluded_area_typecache))
continue // Alright, so let's assume we have intended behavior. If something yorks, we'll get a bare `/area` (maploader?) or a mapper is doing something they shouldn't be doing.
+ if(HAS_TRAIT(iterated_turf, TRAIT_HYPERSPACE_STOPPED))
+ continue // This means that a shuttle with a noop template turf is just temporarily parked ontop of us and that we're not actually a part of it. We don't have to care about it as it will leave us alone when it flies away.
// We need turf_area.type for the error message because we have fifteen million ruin areas named "Unexplored Location" and it's completely unhelpful here.
TEST_FAIL("Space turf [iterated_turf.type] found in non-allowed area ([turf_area.type]) at [AREACOORD(iterated_turf)]! Please ensure that all space turfs are in an /area/space!")
diff --git a/code/modules/unit_tests/mapping_nearstation_test.dm b/code/modules/unit_tests/mapping_nearstation_test.dm
new file mode 100644
index 0000000000000..d428b826634b5
--- /dev/null
+++ b/code/modules/unit_tests/mapping_nearstation_test.dm
@@ -0,0 +1,40 @@
+///Detects movables that may have been accidentally placed in space, as well as movables which do not have the proper nearspace area (meaning they aren't lit properly.)
+/datum/unit_test/mapping_nearstation_test
+ priority = TEST_PRE
+
+/datum/unit_test/mapping_nearstation_test/Run()
+ if(SSmapping.is_planetary())
+ return //No need to test for orphaned spaced atoms on this map.
+
+ var/list/safe_atoms = typecacheof(list(
+ /atom/movable/mirage_holder,
+ /obj/docking_port,
+ /obj/effect/landmark,
+ /obj/effect/abstract,
+ /obj/effect/mapping_error,
+ )) //Mapping stuff that we don't actually have to be concerned about.
+ var/list/safe_areas = typecacheof(list(
+ /area/misc/testroom,
+ /area/station/holodeck,
+ ))
+
+ for(var/station_z in SSmapping.levels_by_trait(ZTRAIT_STATION))
+ var/list/turfs_to_check = Z_TURFS(station_z)
+ for(var/turf/station_turf as anything in turfs_to_check)
+ var/area/turf_area = station_turf.loc
+ if(turf_area.static_lighting || is_type_in_typecache(turf_area, safe_areas)) //Only care about turfs that don't have lighting enabled.
+ continue
+ var/has_thing = FALSE
+ for(var/atom/movable/thing_on_the_turf as anything in station_turf.contents) //Find an item on the turf, this can help the mapper identify the turf more easily when combined with the exact coords.
+ if(is_type_in_typecache(thing_on_the_turf, safe_atoms))
+ continue
+ TEST_FAIL("[station_turf.x], [station_turf.y], [station_turf.z]: [thing_on_the_turf.type] with area of type [turf_area.type]")
+ has_thing = TRUE
+ break
+ if(!has_thing && !isspaceturf(station_turf) && !istype(station_turf, /turf/open/openspace)) //In case it's just a turf without an area
+ if(istype(station_turf, /turf/open/floor/engine/hull/ceiling))
+ TEST_FAIL("[station_turf.x], [station_turf.y], [station_turf.z]: [station_turf.type] with area of type [turf_area.type]. The turf on the z-level below is a shuttle dock and generated me! An error landmark has been generated on the map for easier debugging!")
+ else
+ TEST_FAIL("[station_turf.x], [station_turf.y], [station_turf.z]: [station_turf.type] with area of type [turf_area.type]")
+ if(!succeeded)
+ TEST_FAIL("Movable Atom located without a proper area. Please verify they are supposed to be there. If they are correct, change the area to /area/space/nearstation (or the correct surrounding type).")
diff --git a/code/modules/vehicles/mecha/_mecha.dm b/code/modules/vehicles/mecha/_mecha.dm
index f36beee83cd77..32aa4f1f7a309 100644
--- a/code/modules/vehicles/mecha/_mecha.dm
+++ b/code/modules/vehicles/mecha/_mecha.dm
@@ -16,6 +16,7 @@
* Clicks are wither translated into mech_melee_attack (see mech_melee_attack.dm)
* Or are used to call action() on equipped gear
* Cooldown for gear is on the mech because exploits
+ * Cooldown for melee is on mech_melee_attack also because exploits
*/
/obj/vehicle/sealed/mecha
name = "exosuit"
@@ -28,7 +29,6 @@
movedelay = 1 SECONDS
move_force = MOVE_FORCE_VERY_STRONG
move_resist = MOVE_FORCE_EXTREMELY_STRONG
- COOLDOWN_DECLARE(mecha_bump_smash)
light_system = OVERLAY_LIGHT_DIRECTIONAL
light_on = FALSE
light_range = 6
@@ -139,7 +139,7 @@
var/turnsound = 'sound/mecha/mechturn.ogg'
///Cooldown duration between melee punches
- var/melee_cooldown = 10
+ var/melee_cooldown = CLICK_CD_SLOW
///TIme taken to leave the mech
var/exit_delay = 2 SECONDS
@@ -194,9 +194,6 @@
///Wether we are strafing
var/strafe = FALSE
- ///Cooldown length between bumpsmashes
- var/smashcooldown = 3
-
///Bool for whether this mech can only be used on lavaland
var/lavaland_only = FALSE
@@ -703,10 +700,9 @@
return
use_energy(melee_energy_drain)
- SEND_SIGNAL(user, COMSIG_MOB_USED_MECH_MELEE, src)
- target.mech_melee_attack(src, user)
- TIMER_COOLDOWN_START(src, COOLDOWN_MECHA_MELEE_ATTACK, melee_cooldown)
-
+ SEND_SIGNAL(user, COMSIG_MOB_USED_CLICK_MECH_MELEE, src)
+ if(target.mech_melee_attack(src, user))
+ TIMER_COOLDOWN_START(src, COOLDOWN_MECHA_MELEE_ATTACK, melee_cooldown)
/// Driver alt clicks anything while in mech
/obj/vehicle/sealed/mecha/proc/on_click_alt(mob/user, atom/target, params)
diff --git a/code/modules/vehicles/mecha/equipment/weapons/weapons.dm b/code/modules/vehicles/mecha/equipment/weapons/weapons.dm
index d13b90e5659f7..5b50ac935236b 100644
--- a/code/modules/vehicles/mecha/equipment/weapons/weapons.dm
+++ b/code/modules/vehicles/mecha/equipment/weapons/weapons.dm
@@ -4,14 +4,22 @@
equipment_slot = MECHA_WEAPON
destroy_sound = 'sound/mecha/weapdestr.ogg'
mech_flags = EXOSUIT_MODULE_COMBAT
+ /// The type of bullet generated by the mecha weapon.
var/projectile
+ /// The sound of the mecha weapon firing.
var/fire_sound
+ /// How many shots are fired per action.
var/projectiles_per_shot = 1
+ /// The degrees by which each individual bullet fans out from a central point. A predictable spray of bullets.
var/variance = 0
- var/randomspread = FALSE //use random spread for machineguns, instead of shotgun scatter
+ /// Whether our bullets go off trajectory while firing randomly. Used to replicate recoil and not a structured, predictable spray.
+ var/randomspread = FALSE
+ /// The amount in deciseconds that the weapon sleeps between shots to simulate a 'burst fire'. The delay stops another bullet from being fired while sleeping.
var/projectile_delay = 0
- var/firing_effect_type = /obj/effect/temp_visual/dir_setting/firing_effect //the visual effect appearing when the weapon is fired.
- var/kickback = TRUE //Will using this weapon in no grav push mecha back.
+ //the visual effect appearing when the weapon is fired.
+ var/firing_effect_type = /obj/effect/temp_visual/dir_setting/firing_effect
+ /// Will using this weapon in no grav push mecha back.
+ var/kickback = TRUE
/obj/item/mecha_parts/mecha_equipment/weapon/special_attaching_interaction(attach_right = FALSE, obj/vehicle/sealed/mecha/mech, mob/user, checkonly = FALSE)
var/obj/item/mecha_parts/mecha_equipment/concealed_weapon_bay/bay
@@ -43,17 +51,19 @@
/obj/item/mecha_parts/mecha_equipment/weapon/action(mob/source, atom/target, list/modifiers)
if(!action_checks(target))
return FALSE
+
+ /// Find our mecha, find the opposite direction. Used for kickback while the mecha is drifting in zero-g to launch us in this direction.
var/newtonian_target = REVERSE_DIR(chassis.dir)
. = ..()//start the cooldown early because of sleeps
- for(var/i in 1 to projectiles_per_shot)
+ for(var/projectiles_to_shoot in 1 to projectiles_per_shot)
if(energy_drain && !chassis.has_charge(energy_drain))//in case we run out of energy mid-burst, such as emp
break
var/spread = 0
if(variance)
if(randomspread)
- spread = round((rand() - 0.5) * variance)
+ spread = round((rand(0 , 1) - 0.5) * variance, 1)
else
- spread = round((i / projectiles_per_shot - 0.5) * variance)
+ spread = round((projectiles_to_shoot / projectiles_per_shot - 0.5) * variance, 1)
var/obj/projectile/projectile_obj = new projectile(get_turf(src))
projectile_obj.log_override = TRUE //we log being fired ourselves a little further down.
diff --git a/code/modules/vehicles/mecha/mech_melee_attack.dm b/code/modules/vehicles/mecha/mech_melee_attack.dm
index 08669ebdd0ca8..e5c7b0aac72f3 100644
--- a/code/modules/vehicles/mecha/mech_melee_attack.dm
+++ b/code/modules/vehicles/mecha/mech_melee_attack.dm
@@ -2,7 +2,7 @@
* ## Mech melee attack
* Called when a mech melees a target with fists
* Handles damaging the target & associated effects
- * return value is number of damage dealt
+ * return value is number of damage dealt. returning a value puts our mech onto attack cooldown.
* Arguments:
* * mecha_attacker: Mech attacking this target
* * user: mob that initiated the attack from inside the mech as a controller
@@ -14,6 +14,9 @@
return 0
/turf/closed/wall/mech_melee_attack(obj/vehicle/sealed/mecha/mecha_attacker, mob/living/user)
+ if(!user.combat_mode)
+ return 0
+
mecha_attacker.do_attack_animation(src)
switch(mecha_attacker.damtype)
if(BRUTE)
@@ -31,7 +34,26 @@
..()
return 100 //this is an arbitrary "damage" number since the actual damage is rng dismantle
-/obj/mech_melee_attack(obj/vehicle/sealed/mecha/mecha_attacker, mob/living/user)
+/obj/structure/mech_melee_attack(obj/vehicle/sealed/mecha/mecha_attacker, mob/living/user)
+ if(!user.combat_mode)
+ return 0
+
+ mecha_attacker.do_attack_animation(src)
+ switch(mecha_attacker.damtype)
+ if(BRUTE)
+ playsound(src, 'sound/weapons/punch4.ogg', 50, TRUE)
+ if(BURN)
+ playsound(src, 'sound/items/welder.ogg', 50, TRUE)
+ else
+ return 0
+ mecha_attacker.visible_message(span_danger("[mecha_attacker] hits [src]!"), span_danger("You hit [src]!"), null, COMBAT_MESSAGE_RANGE)
+ ..()
+ return take_damage(mecha_attacker.force * 3, mecha_attacker.damtype, "melee", FALSE, get_dir(src, mecha_attacker)) // multiplied by 3 so we can hit objs hard but not be overpowered against mobs.
+
+/obj/machinery/mech_melee_attack(obj/vehicle/sealed/mecha/mecha_attacker, mob/living/user)
+ if(!user.combat_mode)
+ return 0
+
mecha_attacker.do_attack_animation(src)
switch(mecha_attacker.damtype)
if(BRUTE)
diff --git a/code/modules/vehicles/mecha/mecha_movement.dm b/code/modules/vehicles/mecha/mecha_movement.dm
index 53e61690aba7f..3c743bd7fb357 100644
--- a/code/modules/vehicles/mecha/mecha_movement.dm
+++ b/code/modules/vehicles/mecha/mecha_movement.dm
@@ -154,13 +154,17 @@
return
if(.) //mech was thrown/door/whatever
return
- if(bumpsmash) //Need a pilot to push the PUNCH button.
- if(COOLDOWN_FINISHED(src, mecha_bump_smash))
- var/list/mob/mobster = return_drivers()
- obstacle.mech_melee_attack(src, mobster[1])
- COOLDOWN_START(src, mecha_bump_smash, smashcooldown)
- if(!obstacle || obstacle.CanPass(src, get_dir(obstacle, src) || dir)) // The else is in case the obstacle is in the same turf.
- step(src,dir)
+
+ // Whether or not we're on our mecha melee cooldown
+ var/on_cooldown = TIMER_COOLDOWN_RUNNING(src, COOLDOWN_MECHA_MELEE_ATTACK)
+
+ if(bumpsmash && !on_cooldown)
+ // Our pilot for this evening
+ var/list/mob/mobster = return_drivers()
+ if(obstacle.mech_melee_attack(src, mobster[1]))
+ TIMER_COOLDOWN_START(src, COOLDOWN_MECHA_MELEE_ATTACK, melee_cooldown * 0.3)
+ if(!obstacle || obstacle.CanPass(src, get_dir(obstacle, src) || dir)) // The else is in case the obstacle is in the same turf.
+ step(src,dir)
if(isobj(obstacle))
var/obj/obj_obstacle = obstacle
if(!obj_obstacle.anchored && obj_obstacle.move_resist <= move_force)
diff --git a/html/changelogs/AutoChangeLog-pr-84144.yml b/html/changelogs/AutoChangeLog-pr-84144.yml
new file mode 100644
index 0000000000000..4435e9f594361
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-84144.yml
@@ -0,0 +1,5 @@
+author: "DaCoolBoss"
+delete-after: True
+changes:
+ - rscadd: "Ghost role food truck merchants may occasionally turn up at the station."
+ - rscadd: "Adds a new fugitive hunter type, MI13 secret agents."
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-84379.yml b/html/changelogs/AutoChangeLog-pr-84379.yml
new file mode 100644
index 0000000000000..f50ab9c9172aa
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-84379.yml
@@ -0,0 +1,7 @@
+author: "MTandi"
+delete-after: True
+changes:
+ - qol: "It is easier to do some required techweb experiments on Charlie station now"
+ - bugfix: "Fixed experimental dissection surgeries giving too many points"
+ - balance: "Techweb: Moved NTNet relay back to tcomms node"
+ - balance: "Techweb: Moved blood pack and chem pack to the starting node"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-84417.yml b/html/changelogs/AutoChangeLog-pr-84417.yml
new file mode 100644
index 0000000000000..ba8600075a5aa
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-84417.yml
@@ -0,0 +1,4 @@
+author: "GremlinSeeker"
+delete-after: True
+changes:
+ - bugfix: "fixed Birdshot bar and surrounding areas not properly connected to the power grid."
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-84418.yml b/html/changelogs/AutoChangeLog-pr-84418.yml
new file mode 100644
index 0000000000000..96f0d7f7b7c43
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-84418.yml
@@ -0,0 +1,5 @@
+author: "MrDas"
+delete-after: True
+changes:
+ - bugfix: "Bolas now slowdown properly."
+ - bugfix: "Cult bolas no longer leave in-hand sprite when they ensnare to non-cult user."
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-84423.yml b/html/changelogs/AutoChangeLog-pr-84423.yml
new file mode 100644
index 0000000000000..ff3e09efedbf6
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-84423.yml
@@ -0,0 +1,4 @@
+author: "bob-b-b"
+delete-after: True
+changes:
+ - rscadd: "Added flatpacker & multitool to all R&D labs"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-84425.yml b/html/changelogs/AutoChangeLog-pr-84425.yml
new file mode 100644
index 0000000000000..93229357e8cfa
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-84425.yml
@@ -0,0 +1,5 @@
+author: "DaCoolBoss"
+delete-after: True
+changes:
+ - bugfix: "Removed three traitor posters from Cargo Warehouse's walls. (Metastation)"
+ - balance: "Added one traitor poster each to the QM's Office, Vault and Evidence Storage to compensate. (Metastation)"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-84426.yml b/html/changelogs/AutoChangeLog-pr-84426.yml
new file mode 100644
index 0000000000000..bee3baaa2efd9
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-84426.yml
@@ -0,0 +1,4 @@
+author: "Rhials"
+delete-after: True
+changes:
+ - balance: "All cameras in bathrooms and showers have been removed."
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-84452.yml b/html/changelogs/AutoChangeLog-pr-84452.yml
new file mode 100644
index 0000000000000..66b0f2f96b06f
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-84452.yml
@@ -0,0 +1,4 @@
+author: "Sosmaster9000"
+delete-after: True
+changes:
+ - balance: "Xenobiologists now have a BZ-filled containment pen. Don't breathe that!\nbalance:Some items which either cannot be printed elsewhere or are part of game progression (e.g. teleporter endpoints and, of course, Nanners) have been moved. Alien Spawnpoints are in the same spot."
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-84515.yml b/html/changelogs/AutoChangeLog-pr-84515.yml
new file mode 100644
index 0000000000000..4be2aa57124dd
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-84515.yml
@@ -0,0 +1,8 @@
+author: "carlarctg"
+delete-after: True
+changes:
+ - rscdel: "Removed Trichromatic Larynx per @mothblocks decision that it looks uggo."
+ - rscdel: "Replaced heckacious laryncks' color and size changes with random bolding, italics, and underlining."
+ - rscadd: "Stoner has been un-locked and replaces TL in the above's recipe."
+ - bugfix: "Fixed elastic arms users being unable to use abstract items like mending touch or shock touch."
+ - bugfix: "Fixed mending touch being bad"
\ No newline at end of file
diff --git a/html/changelogs/archive/2024-07.yml b/html/changelogs/archive/2024-07.yml
new file mode 100644
index 0000000000000..18b6fc43a0061
--- /dev/null
+++ b/html/changelogs/archive/2024-07.yml
@@ -0,0 +1,153 @@
+2024-07-01:
+ Ben10Omintrix:
+ - balance: raptors will now knock off their rider and disable them if hit by any
+ energy projectiles or if they recieve any stamina damage
+ Chestlet:
+ - bugfix: Nanotrasen sent us a batch of faulty canisters. They've been recalled
+ and replaced with less faulty canisters.
+ - bugfix: Zauker SM interaction works correctly now.
+ DaCoolBoss:
+ - image: Relics ("strange objects") now have unique sprites.
+ Iajret:
+ - bugfix: fixed blood loss knocking you down at somewhat safe (~80%) blood levels
+ LemonInTheDark:
+ - rscadd: Shield generators and shield gen walls now glow a light blue. Pretty!
+ MTandi:
+ - qol: Made light tiles available in the crafting menu
+ - qol: Circuit tile variants can be cycled in-hand
+ - rscadd: Moved loose tiles and wall frames from lathe designs to other tiles and
+ frames in the crafting menu
+ Melbert:
+ - rscadd: Humanizing a monkey removes undergarments such as socks
+ - qol: Handheld Genetic Scanners fit in Geneticist equipment suit storage
+ Pickle-Coding:
+ - code_imp: Supermatter zap power generation takes perspective of the machines subsystem.
+ Rhials:
+ - rscadd: Bounty Hunter teams now have personalized announcements for when they
+ are spawned in.
+ ShizCalev:
+ - bugfix: The power for all science burn chambers across all maps now works properly.
+ SmArtKar:
+ - image: Captain's spare safe received a new texture
+ - bugfix: Vent-born wendigos no longer create one-way portals
+ - image: Decluttered card textures
+ - bugfix: You can grind slime extracts in reagent grinders once more.
+ - bugfix: Pyrokinesis bolts no longer have infinite range and create trails of fiery
+ doom.
+ - qol: RD's labcoat is now classified as an actual labcoat instead of a glorified
+ jacket, allowing them to put science-related stuffs into it
+ - image: You can now toggle RD's labcoat
+ ViktorKoL:
+ - rscadd: Added a new UI for heretic research.
+ Wallem:
+ - rscadd: The detective now starts with the DET.ekt Skillchip, which allows them
+ to identify chemicals and bloodtypes by taste.
+ YesterdaysPromise:
+ - image: updated halloween metoer sprites.
+ aaaa1023:
+ - qol: 'Increased the viewrange in the navigation camera console on the following
+ shuttles: Silverscale pirate shuttle, the Flying Dutchman pirate shuttle, the
+ IRS pirate shuttle, and the Greytide pirate shuttle.'
+ - bugfix: Fixed the Battlecruiser corvette, Silverscale pirate shuttle, and the
+ Greytide pirate shuttle flying in incorrect directions in hyperspace.
+ - bugfix: Fixed the Navigation console camera eye on various pirate ships being
+ off centre.
+ carlarctg:
+ - spellcheck: Heretic spell invocations now use one dead language per path. Altered
+ a few invocation types.
+ grungussuss:
+ - qol: Windoors now stay open for 8 seconds instead of 5
+ - qol: Secure windoors now stay open for 5 seconds instead of 2
+ mc-oofert:
+ - bugfix: brig cell timer ui works properly now
+ - bugfix: wawastation arrivals has firealarms so you may now leave
+ necromanceranne:
+ - bugfix: Mecha weaponry is capable, for the first time ever, of experiencing recoil.
+ This was an intended mechanic, I promise. The code just literally never worked.
+ - bugfix: Mecha bump melee attacks and click melee attacks are now on the same cooldown,
+ but have varying cooldown timers. You will always bump attack faster than you
+ will click.
+ - bugfix: You must be in combat mode to punch objects and to bumpsmash into objects.
+ - bugfix: Stops mecha being able to punch literally any object and damage them.
+ - code_imp: Tidies up some of the autodoc comments for mech weapons.
+ spockye:
+ - bugfix: fixed Wawastation areas
+ - bugfix: fixed wawastation disposals
+ thegrb93:
+ - bugfix: Game not refocusing after closing a TGUI
+ xXPawnStarrXx:
+ - rscdel: Removed cordons on deathmatch maps, since they're autoadded now.
+2024-07-02:
+ 00-Steven:
+ - code_imp: Moved bedsheet bin interactions to the item interaction code. Please
+ report any issues.
+ - qol: Made bedsheet bin tool interactions right click, such that left click is
+ consistently for putting in items.
+ - qol: Added usage screentips to bedsheet bins.
+ - qol: Added more feedback to failing to hide items in bedsheet bins.
+ - sound: Made putting items in bedsheet bins not silent (If the items have associated
+ pickup/drop sounds).
+ - code_imp: Deconstructing light switches now uses the proper tool action and tool
+ usage code, please report any issues.
+ - bugfix: Attempting to deconstruct a light switch by unscrewing it no longer makes
+ you hit it even on a success.
+ - sound: Deconstructing a light switch actually plays tool usage and deconstruction
+ sounds.
+ - qol: Deconstructing light switches is now a left click with a screwdriver parallel
+ to other unscrewing actions.
+ - bugfix: Screentips for deconstructing a light switch no longer show up on every
+ item EXCEPT screwdrivers.
+ - qol: Added an examine hint denoting light switches are screwed to the wall.
+ - qol: Added visible messages for someone deconstructing a light switch parallel
+ to deconstructing intercoms.
+ Bisar:
+ - qol: Loot panels should update more predictably and informatively now.
+ - code_imp: Lootpanels have more consistent logic on when they automatically update.
+ Jolly:
+ - code_imp: Behind the scenes, maps had a little bit of tweaking. If you see things
+ rendering in weird ways, or they don't look like how they used to/supposed to,
+ please report them on GitHub!
+ Kapu (ported by StrangeWeirdKitten):
+ - bugfix: Ambience buzz will now respect ship ambience prefrences for observers.
+ - sound: Ambience buzz requires APC enviorment power to function
+ Kocma-san:
+ - qol: you can now swap pens in pdas
+ LemonInTheDark:
+ - bugfix: Some varieties of snow now visually melt properly again when burned
+ ShizCalev:
+ - bugfix: Fixed a number of shuttles having parts (such as lattices) completely
+ disappearing.
+ - bugfix: Fixed the ceilings above shuttles on station maps being full-bright.
+ - bugfix: Fixed lattices sometimes appearing at random locations in space on station
+ maps.
+ - bugfix: Cleaned up a number of accidentally placed objects in space across all
+ station maps.
+ - bugfix: Fixed a false positive with the mapload_space_verification unit test failing
+ on turfs that weren't actually part of shuttles.
+ - code_imp: Added a unit test that automatically finds all base space turfs with
+ objects on them, as well as non-space turfs that are set to space areas (meaning
+ that these squares weren't lit properly.)
+ SmArtKar:
+ - bugfix: You no longer get dusted upon trying to store your supermatter sliver.
+ - bugfix: Fulton animation is no longer sideways.
+ - bugfix: Hand of Midas now works point-blank.
+ TheBoondock:
+ - sound: added pickup and drop sound for beakers
+ carlarctg:
+ - bugfix: Fix /datum/weakref appearing when linking airlock heretic portals
+ hyperjll:
+ - bugfix: 'Hostile plant monsters (EX: Killer Tomatoes) no longer act hostile toward
+ Seedlings.'
+ jlsnow301:
+ - bugfix: Fixed some UI bugs in the power monitor screen.
+ lorwp:
+ - bugfix: extinguishers now can be filled with subtypes of water again (Namely,
+ holy water)
+ mc-oofert:
+ - balance: Facehuggers dont make people go to sleep but muffles speech
+ - code_imp: Very very minor xenomorph code cleanup
+ - refactor: Muzzles are now an element
+ - balance: portable air scrubbers scrub in a 3x3 square + hold as much gas as a
+ canister
+ nikothedude:
+ - rscadd: Being cursed now enables disembowlements/cranial fissures outside of hardcrit
diff --git a/icons/effects/mapping_helpers.dmi b/icons/effects/mapping_helpers.dmi
index ad09351e787f6..47684f4664e89 100644
Binary files a/icons/effects/mapping_helpers.dmi and b/icons/effects/mapping_helpers.dmi differ
diff --git a/icons/mob/clothing/back.dmi b/icons/mob/clothing/back.dmi
index eb3f87d9c71f0..be83d83d4228c 100644
Binary files a/icons/mob/clothing/back.dmi and b/icons/mob/clothing/back.dmi differ
diff --git a/icons/obj/antags/eldritch.dmi b/icons/obj/antags/eldritch.dmi
index 7f6af6bfe2e65..664311e5c7c47 100644
Binary files a/icons/obj/antags/eldritch.dmi and b/icons/obj/antags/eldritch.dmi differ
diff --git a/icons/obj/canisters.dmi b/icons/obj/canisters.dmi
index 436467648880b..1555cf0a4782e 100644
Binary files a/icons/obj/canisters.dmi and b/icons/obj/canisters.dmi differ
diff --git a/icons/obj/card.dmi b/icons/obj/card.dmi
index 95453cb46edc8..0f44555ca965f 100644
Binary files a/icons/obj/card.dmi and b/icons/obj/card.dmi differ
diff --git a/icons/obj/devices/artifacts.dmi b/icons/obj/devices/artifacts.dmi
new file mode 100644
index 0000000000000..f9402be79a60e
Binary files /dev/null and b/icons/obj/devices/artifacts.dmi differ
diff --git a/icons/obj/meteor.dmi b/icons/obj/meteor.dmi
index 9fde3f3ef68ea..6b47fe485c34b 100644
Binary files a/icons/obj/meteor.dmi and b/icons/obj/meteor.dmi differ
diff --git a/icons/obj/meteor_spooky.dmi b/icons/obj/meteor_spooky.dmi
deleted file mode 100644
index 287d5b47bd0f7..0000000000000
Binary files a/icons/obj/meteor_spooky.dmi and /dev/null differ
diff --git a/icons/obj/structures.dmi b/icons/obj/structures.dmi
index c7b38cb6d1aab..94b88301f7aab 100644
Binary files a/icons/obj/structures.dmi and b/icons/obj/structures.dmi differ
diff --git a/icons/ui_icons/antags/heretic/knowledge.dmi b/icons/ui_icons/antags/heretic/knowledge.dmi
new file mode 100644
index 0000000000000..d24de1a5f0e81
Binary files /dev/null and b/icons/ui_icons/antags/heretic/knowledge.dmi differ
diff --git a/massmeta/code/modules/antags/wizard/equipment/spellbook_entries/offensive.dm b/massmeta/code/modules/antags/wizard/equipment/spellbook_entries/offensive.dm
new file mode 100644
index 0000000000000..fe97eaf69bc14
--- /dev/null
+++ b/massmeta/code/modules/antags/wizard/equipment/spellbook_entries/offensive.dm
@@ -0,0 +1,11 @@
+#define SPELLBOOK_CATEGORY_OFFENSIVE "Offensive"
+// Offensive wizard spells
+
+/datum/spellbook_entry/testicular_torsion
+ name = "Testicular Torsion"
+ desc = "A dark spell capable of exploding victim's balls."
+ spell_type = /datum/action/cooldown/spell/touch/testicular_torsion
+ cost = 1
+ category = SPELLBOOK_CATEGORY_OFFENSIVE
+
+#undef SPELLBOOK_CATEGORY_OFFENSIVE
diff --git a/massmeta/code/modules/clothing/suits/labcoat.dm b/massmeta/code/modules/clothing/suits/labcoat.dm
index e6b3e88529f3d..eb7a088aa9742 100644
--- a/massmeta/code/modules/clothing/suits/labcoat.dm
+++ b/massmeta/code/modules/clothing/suits/labcoat.dm
@@ -8,7 +8,9 @@
/obj/item/clothing/suit/toggle/labcoat/research_director
icon = 'massmeta/icons/obj/clothing/suits/labcoat.dmi'
+ icon_state = "labcoat"
worn_icon = 'massmeta/icons/mob/clothing/suits/labcoat.dmi'
+ worn_icon_state = "labcoat"
/obj/item/clothing/suit/toggle/labcoat/genetics
icon = 'massmeta/icons/obj/clothing/suits/labcoat.dmi'
@@ -28,4 +30,4 @@
/obj/item/clothing/suit/toggle/labcoat/roboticist
icon = 'massmeta/icons/obj/clothing/suits/labcoat.dmi'
- worn_icon = 'massmeta/icons/mob/clothing/suits/labcoat.dmi'
\ No newline at end of file
+ worn_icon = 'massmeta/icons/mob/clothing/suits/labcoat.dmi'
diff --git a/massmeta/code/modules/spells/spell_types/touch/testicular_torsion.dm b/massmeta/code/modules/spells/spell_types/touch/testicular_torsion.dm
new file mode 100644
index 0000000000000..9c07e34fe1ea0
--- /dev/null
+++ b/massmeta/code/modules/spells/spell_types/touch/testicular_torsion.dm
@@ -0,0 +1,44 @@
+/// Слабый Scream for me, ломает ноги, заставляет людей выкрикивать фразы, а ещё имеет прикольный звук применения.
+/datum/action/cooldown/spell/touch/testicular_torsion
+ name = "Testicular Torsion"
+ desc = "This wicked spell twistes and crushes victim's balls \
+ causing them to feel immense pain, may also break their legs."
+ button_icon = 'massmeta/icons/mob/actions/actions_spells.dmi'
+ button_icon_state = "torsion"
+ sound = "massmeta/sounds/smites/testicular_torsion.ogg"
+
+ school = SCHOOL_SANGUINE
+ invocation_type = INVOCATION_SHOUT
+ cooldown_time = 35 SECONDS
+ cooldown_reduction_per_rank = 6 SECONDS
+
+ invocation = "T'STICULA' TOR'SION!!"
+
+ hand_path = /obj/item/melee/touch_attack/testicular_torsion
+
+/datum/action/cooldown/spell/touch/testicular_torsion/on_antimagic_triggered(obj/item/melee/touch_attack/hand, mob/living/victim, mob/living/carbon/caster)
+ caster.visible_message(
+ span_warning("The feedback mutilates [caster]'s arm!"),
+ span_userdanger("The spell bounces from [victim]'s skin back into your arm!"),
+ )
+ var/obj/item/bodypart/to_wound = caster.get_holding_bodypart_of_item(hand)
+ caster.cause_wound_of_type_and_severity(WOUND_SLASH, to_wound, WOUND_SEVERITY_MODERATE, WOUND_SEVERITY_CRITICAL)
+
+/datum/action/cooldown/spell/touch/testicular_torsion/cast_on_hand_hit(obj/item/melee/touch_attack/hand, mob/living/victim, mob/living/carbon/caster)
+ if(!ishuman(victim))
+ return
+ var/mob/living/carbon/human/human_victim = victim
+ human_victim.apply_damage(rand(40, 55), BRUTE, BODY_ZONE_L_LEG, wound_bonus = rand(45, 75), forced = TRUE)
+ human_victim.apply_damage(rand(40, 55), BRUTE, BODY_ZONE_R_LEG, wound_bonus = rand(45, 75), forced = TRUE)
+ var/list/phrase = world.file2list("massmeta/strings/balls_phrases.txt")
+ human_victim.say(pick(phrase))
+ human_victim.emote("screech")
+ return TRUE
+
+/obj/item/melee/touch_attack/testicular_torsion
+ name = "\improper Bloody hand"
+ desc = "Why would you even inspect this hand? Do people even read this text? What would you expect to see here, do you want me to describe this item? Surely I will do.. \
+ This hand is glowing with dark power, appears that it may explode victim's balls and break their legs. Is that what you wanted to hear?" /// Ломаем четвертую стену, потому что могу :)
+ icon = 'icons/obj/weapons/hand.dmi'
+ icon_state = "disintegrate"
+ inhand_icon_state = "disintegrate"
diff --git a/massmeta/features/additional_circuit/readme.md b/massmeta/features/additional_circuit/readme.md
index b25626a707d13..a618f8da5225c 100644
--- a/massmeta/features/additional_circuit/readme.md
+++ b/massmeta/features/additional_circuit/readme.md
@@ -1,3 +1,30 @@
-# Credits
+## Module ID: ADDITIONAL_CIRCUITS
-Jake Park
+### Description:
+
+Добавляет микросхемы для "Циркуитов".
+
+
+### TG Proc/File Changes:
+
+- N/A
+
+
+### Modular Overrides:
+
+- N/A
+
+
+### Defines:
+
+- N/A
+
+
+### TGUI Files:
+
+- N/A
+
+
+### Credits:
+
+- N/A
diff --git a/massmeta/features/hardsuits/includes.dm b/massmeta/features/hardsuits/includes.dm
new file mode 100644
index 0000000000000..d20842f4c5df7
--- /dev/null
+++ b/massmeta/features/hardsuits/includes.dm
@@ -0,0 +1,5 @@
+#include "code\_jetpack.dm"
+#include "code\armor.dm"
+#include "code\hardsuit.dm"
+#include "code\helmet.dm"
+#include "code\space_suit_beacon.dm"
diff --git a/massmeta/features/hardsuits/readme.md b/massmeta/features/hardsuits/readme.md
new file mode 100644
index 0000000000000..9efb5de9f3b06
--- /dev/null
+++ b/massmeta/features/hardsuits/readme.md
@@ -0,0 +1,30 @@
+## Module ID: HARDSUITS
+
+### Description:
+
+Добавляет Космические костюмы (hardsuit). Делает их досупным для выдора игроку помимо Мод-костюма (mod-suit).
+
+
+### TG Proc/File Changes:
+
+TODO:
+
+
+### Modular Overrides:
+
+TODO:
+
+
+### Defines:
+
+- ~meta_defines/inventory.dm
+
+
+### TGUI Files:
+
+- N/A
+
+
+### Credits:
+
+- N/A
diff --git a/massmeta/code/modules/reagents/chemistry/reagents/drinks/drink_reagents.dm b/massmeta/features/kvass/code/drink_reagents.dm
similarity index 87%
rename from massmeta/code/modules/reagents/chemistry/reagents/drinks/drink_reagents.dm
rename to massmeta/features/kvass/code/drink_reagents.dm
index 90ff52ee7dd8d..98d9605232298 100644
--- a/massmeta/code/modules/reagents/chemistry/reagents/drinks/drink_reagents.dm
+++ b/massmeta/features/kvass/code/drink_reagents.dm
@@ -1,5 +1,3 @@
-// Квас - это очень полезный напиток.
-
/datum/reagent/consumable/kvass
name = "Kvass"
description = "Kvaaaaaaass."
@@ -27,4 +25,5 @@
. = ..()
affected_mob.set_jitter_if_lower(5 SECONDS * REM * seconds_per_tick)
if(SPT_PROB(7.5, seconds_per_tick))
- affected_mob.say(pick_list_replacements(KVASS_PHRASES_FILE, "kvass_phrases"), forced = /datum/reagent/consumable/kvass)
+ var/list/phrase = world.file2list("massmeta/features/kvass/string/kvass.txt")
+ affected_mob.say(pick(phrase), forced = /datum/reagent/consumable/kvass)
diff --git a/massmeta/code/modules/cargo/exports/large_objects.dm b/massmeta/features/kvass/code/large_objects.dm
similarity index 85%
rename from massmeta/code/modules/cargo/exports/large_objects.dm
rename to massmeta/features/kvass/code/large_objects.dm
index 234d05afcb403..1ad1829ce6afb 100644
--- a/massmeta/code/modules/cargo/exports/large_objects.dm
+++ b/massmeta/features/kvass/code/large_objects.dm
@@ -1,5 +1,3 @@
-// Sell Kvaaaaaass TANK!&?
-
/datum/export/large/reagent_dispenser/kvass
unit_name = "kvasstank"
export_types = list(/obj/structure/reagent_dispensers/kvasstank)
diff --git a/massmeta/code/modules/cargo/packs/materials.dm b/massmeta/features/kvass/code/materials.dm
similarity index 75%
rename from massmeta/code/modules/cargo/packs/materials.dm
rename to massmeta/features/kvass/code/materials.dm
index 7b75bc9ab71af..f3986d7ca4920 100644
--- a/massmeta/code/modules/cargo/packs/materials.dm
+++ b/massmeta/features/kvass/code/materials.dm
@@ -1,9 +1,7 @@
-// Kvaaaaaaaaass TANK
-
/datum/supply_pack/materials/kvasstank
name = "Kvass Tank Crate"
desc = "Contains a yellow barrel full of kvass."
cost = CARGO_CRATE_VALUE * 2
contains = list(/obj/structure/reagent_dispensers/kvasstank)
crate_name = "kvass tank crate"
- crate_type = /obj/structure/closet/crate/large/soviet
\ No newline at end of file
+ crate_type = /obj/structure/closet/crate/large/soviet
diff --git a/massmeta/code/modules/reagents/reagent_dispenser.dm b/massmeta/features/kvass/code/reagent_dispenser.dm
similarity index 75%
rename from massmeta/code/modules/reagents/reagent_dispenser.dm
rename to massmeta/features/kvass/code/reagent_dispenser.dm
index ccb44a5ef1832..3297278e1c81b 100644
--- a/massmeta/code/modules/reagents/reagent_dispenser.dm
+++ b/massmeta/features/kvass/code/reagent_dispenser.dm
@@ -1,9 +1,7 @@
-// Kvaaaaaass!!!
-
/obj/structure/reagent_dispensers/kvasstank
name = "kvass tank"
desc = "Yellow barrel full of divine liquid."
- icon = 'massmeta/icons/drinks/chemical_tanks.dmi'
+ icon = 'massmeta/features/kvass/icons/chemical_tanks.dmi'
icon_state = "kvass"
reagent_id = /datum/reagent/consumable/kvass
openable = TRUE
diff --git a/massmeta/code/modules/reagents/reagent_containers/cups/soda.dm b/massmeta/features/kvass/code/soda.dm
similarity index 85%
rename from massmeta/code/modules/reagents/reagent_containers/cups/soda.dm
rename to massmeta/features/kvass/code/soda.dm
index 8c4ae9418da10..2723eb1f4381d 100644
--- a/massmeta/code/modules/reagents/reagent_containers/cups/soda.dm
+++ b/massmeta/features/kvass/code/soda.dm
@@ -1,7 +1,7 @@
/obj/item/reagent_containers/cup/soda_cans/kvass
name = "Kvass"
desc = "Kvaaaaaaaass."
- icon = 'massmeta/icons/drinks/soda.dmi'
+ icon = 'massmeta/features/kvass/icons/soda.dmi'
icon_state = "kvass"
list_reagents = list(/datum/reagent/consumable/kvass = 30)
drink_type = GRAIN
diff --git a/massmeta/code/modules/reagents/chemistry/reagents/drinks/glass_styles/sodas.dm b/massmeta/features/kvass/code/sodas.dm
similarity index 73%
rename from massmeta/code/modules/reagents/chemistry/reagents/drinks/glass_styles/sodas.dm
rename to massmeta/features/kvass/code/sodas.dm
index b78dd05008c11..04198f054cabb 100644
--- a/massmeta/code/modules/reagents/chemistry/reagents/drinks/glass_styles/sodas.dm
+++ b/massmeta/features/kvass/code/sodas.dm
@@ -1,8 +1,6 @@
-// Kvaaaaaaaaaass
-
/datum/glass_style/drinking_glass/kvass
required_drink_type = /datum/reagent/consumable/kvass
name = "glass of Kvass"
desc = "A glass of Kvaaaaaaass."
- icon = 'massmeta/icons/drinks/drinks.dmi'
+ icon = 'massmeta/features/kvass/icons/drinks.dmi'
icon_state = "kvass"
diff --git a/massmeta/features/kvass/icons/chemical_tanks.dmi b/massmeta/features/kvass/icons/chemical_tanks.dmi
new file mode 100644
index 0000000000000..e330d75104c4a
Binary files /dev/null and b/massmeta/features/kvass/icons/chemical_tanks.dmi differ
diff --git a/massmeta/features/kvass/icons/drinks.dmi b/massmeta/features/kvass/icons/drinks.dmi
new file mode 100644
index 0000000000000..f6415d8cf9612
Binary files /dev/null and b/massmeta/features/kvass/icons/drinks.dmi differ
diff --git a/massmeta/features/kvass/icons/janitor.dmi b/massmeta/features/kvass/icons/janitor.dmi
new file mode 100644
index 0000000000000..eb81fc3e2c9f8
Binary files /dev/null and b/massmeta/features/kvass/icons/janitor.dmi differ
diff --git a/massmeta/features/kvass/icons/soda.dmi b/massmeta/features/kvass/icons/soda.dmi
new file mode 100644
index 0000000000000..ad1769a3784a0
Binary files /dev/null and b/massmeta/features/kvass/icons/soda.dmi differ
diff --git a/massmeta/features/kvass/includes.dm b/massmeta/features/kvass/includes.dm
new file mode 100644
index 0000000000000..386a88438bda7
--- /dev/null
+++ b/massmeta/features/kvass/includes.dm
@@ -0,0 +1,6 @@
+#include "code\drink_reagents.dm"
+#include "code\large_objects.dm"
+#include "code\materials.dm"
+#include "code\reagent_dispenser.dm"
+#include "code\soda.dm"
+#include "code\sodas.dm"
diff --git a/massmeta/features/kvass/readme.md b/massmeta/features/kvass/readme.md
new file mode 100644
index 0000000000000..d96266e8097bd
--- /dev/null
+++ b/massmeta/features/kvass/readme.md
@@ -0,0 +1,30 @@
+## Module ID: KVASS
+
+### Description:
+
+Добавляет Квасс, мммм квасс!
+
+
+### TG Proc/File Changes:
+
+- code/modules/reagents/reagent_containers/cups/soda.dm
+
+
+### Modular Overrides:
+
+- N/A
+
+
+### Defines:
+
+- N/A
+
+
+### TGUI Files:
+
+- N/A
+
+
+### Credits:
+
+- N/A
diff --git a/massmeta/features/kvass/string/kvass.txt b/massmeta/features/kvass/string/kvass.txt
new file mode 100644
index 0000000000000..bbeb68e78a05c
--- /dev/null
+++ b/massmeta/features/kvass/string/kvass.txt
@@ -0,0 +1,7 @@
+Квааааасс!!!
+Обожаю Квасс!
+Мой Любимый Напиток!
+ММммммм, Квасс!!
+Обожаю я пить квасс
+Вятский сас
+КВАСС!!!
\ No newline at end of file
diff --git a/massmeta/features/readme.md b/massmeta/features/readme.md
new file mode 100644
index 0000000000000..76a62191c6631
--- /dev/null
+++ b/massmeta/features/readme.md
@@ -0,0 +1,16 @@
+## Тут лежат все наши НОВЫЕ модульные файлы, каждый в своем модуле. У каждого такого модуля должно быть своё уникальное название.
+
+### Каждый модуль должен строиться по след. структуре:
+
+| Папка/Файл | Описание |
+| ------------------ | ---------------------------------------------- |
+| **code/** 📁 | Модульный код (.dm) |
+| **icon/** 📁 | Модульные иконки или картинки (.dmi .png) |
+| **sound/** 📁 | Модульные аудио файлы (.ogg .waw) |
+| **string/** 📁 | Модульный файлы строк (.txt .json) |
+| **includes.dm** 📄 | Добавление всех ваших файлов в папке **code/** |
+| **readme.md** 📝 | Полная документация к модулю |
+
+⚠️ В каждом модуле обязан быть хотя бы файл **readme.dm**! ⚠️
+
+⚠️ Если в модуле присутсвтует какой-либо код в папке **code/**, то обязательно должен быть файл инклюдов этого кода в **includes.dm**! ⚠️
\ No newline at end of file
diff --git a/massmeta/features/revert_glasses/readme.md b/massmeta/features/revert_glasses/readme.md
new file mode 100644
index 0000000000000..b176fd8c8d408
--- /dev/null
+++ b/massmeta/features/revert_glasses/readme.md
@@ -0,0 +1,32 @@
+## Module ID: REVERT_GLASSES
+
+### Description:
+
+Возвращает солнцезащитным очкам и всем худам на основе этих очков защиту от сварки.
+Было спровоцированно PR'ом: ...?
+
+
+### TG Proc/File Changes:
+
+- N/A
+
+
+### Modular Overrides:
+
+- massmeta/code/modules/clothing/glasses/_glasses.dm
+- massmeta/code/modules/clothing/glasses/hud.dm
+
+
+### Defines:
+
+- N/A
+
+
+### TGUI Files:
+
+- N/A
+
+
+### Credits:
+
+- N/A
diff --git a/massmeta/features/smites/testicular_torsion.dm b/massmeta/features/smites/code/testicular_torsion.dm
similarity index 86%
rename from massmeta/features/smites/testicular_torsion.dm
rename to massmeta/features/smites/code/testicular_torsion.dm
index 69c4c8626a0d5..42226c1423283 100644
--- a/massmeta/features/smites/testicular_torsion.dm
+++ b/massmeta/features/smites/code/testicular_torsion.dm
@@ -16,11 +16,11 @@
carbon_target.apply_damage(rand(20, 40), BRUTE, BODY_ZONE_L_LEG, wound_bonus = rand(35,60), forced = TRUE)
carbon_target.apply_damage(rand(20, 40), BRUTE, BODY_ZONE_R_LEG, wound_bonus = rand(35,60), forced = TRUE)
carbon_target.emote("scream")
- var/list/phrase = world.file2list("massmeta/strings/balls_phrases.txt")
+ var/list/phrase = world.file2list("massmeta/features/smites/string/balls_phrases.txt")
carbon_target.say(pick(phrase))
carbon_target.Paralyze(15 SECONDS)
- playsound(target, 'massmeta/sounds/smites/testicular_torsion.ogg', 60)
+ playsound(target, 'massmeta/features/smites/sound/testicular_torsion.ogg', 60)
carbon_target.visible_message(
span_danger("You can see [carbon_target]'s balls being crushed by an unknown force! You can feel the pain just by looking at it."),
span_userdanger("You can feel like your balls are being crushed!"),
diff --git a/massmeta/features/smites/includes.dm b/massmeta/features/smites/includes.dm
new file mode 100644
index 0000000000000..8aa31e7ae1633
--- /dev/null
+++ b/massmeta/features/smites/includes.dm
@@ -0,0 +1 @@
+#include "code\testicular_torsion.dm"
diff --git a/massmeta/features/smites/readme.md b/massmeta/features/smites/readme.md
new file mode 100644
index 0000000000000..ec56ea9bcedcc
--- /dev/null
+++ b/massmeta/features/smites/readme.md
@@ -0,0 +1,30 @@
+## Module ID: TESTICULAR_TORSION
+
+### Description:
+
+Добавляет админский Смайт "Testicular torsion".
+
+
+### TG Proc/File Changes:
+
+- N/A
+
+
+### Modular Overrides:
+
+- N/A
+
+
+### Defines:
+
+- N/A
+
+
+### TGUI Files:
+
+- N/A
+
+
+### Credits:
+
+- N/A
diff --git a/massmeta/sounds/smites/testicular_torsion.ogg b/massmeta/features/smites/sound/testicular_torsion.ogg
similarity index 100%
rename from massmeta/sounds/smites/testicular_torsion.ogg
rename to massmeta/features/smites/sound/testicular_torsion.ogg
diff --git a/massmeta/strings/balls_phrases.txt b/massmeta/features/smites/string/balls_phrases.txt
similarity index 100%
rename from massmeta/strings/balls_phrases.txt
rename to massmeta/features/smites/string/balls_phrases.txt
diff --git a/massmeta/code/game/objects/structures/crates_lockers/crates/large.dm b/massmeta/features/soviet_crate/code/large.dm
similarity index 80%
rename from massmeta/code/game/objects/structures/crates_lockers/crates/large.dm
rename to massmeta/features/soviet_crate/code/large.dm
index d79111e5eba4e..7b96d0642dbe9 100644
--- a/massmeta/code/game/objects/structures/crates_lockers/crates/large.dm
+++ b/massmeta/features/soviet_crate/code/large.dm
@@ -1,6 +1,6 @@
/obj/structure/closet/crate/large/soviet
name = "unusual large crate"
desc = "A deeply scratched wooden crate with erased markings. You'll need a crowbar to get it open."
- icon = 'massmeta/icons/obj/storage/crates.dmi'
+ icon = 'massmeta/features/soviet_crate/icons/crates.dmi'
icon_state = "largecrate_soviet"
base_icon_state = "largecrate_soviet"
diff --git a/massmeta/icons/obj/storage/crates.dmi b/massmeta/features/soviet_crate/icons/crates.dmi
similarity index 100%
rename from massmeta/icons/obj/storage/crates.dmi
rename to massmeta/features/soviet_crate/icons/crates.dmi
diff --git a/massmeta/features/soviet_crate/includes.dm b/massmeta/features/soviet_crate/includes.dm
new file mode 100644
index 0000000000000..beff06938d4b6
--- /dev/null
+++ b/massmeta/features/soviet_crate/includes.dm
@@ -0,0 +1 @@
+#include "code\large.dm"
diff --git a/massmeta/features/soviet_crate/readme.md b/massmeta/features/soviet_crate/readme.md
new file mode 100644
index 0000000000000..9d0d7212f2248
--- /dev/null
+++ b/massmeta/features/soviet_crate/readme.md
@@ -0,0 +1,30 @@
+## Module ID: SOVIET_CRATE
+
+### Description:
+
+Добавляет старый, советский, зелёный, деревянный... Ящик!
+
+
+### TG Proc/File Changes:
+
+- N/A
+
+
+### Modular Overrides:
+
+- N/A
+
+
+### Defines:
+
+- N/A
+
+
+### TGUI Files:
+
+- N/A
+
+
+### Credits:
+
+- N/A
diff --git a/massmeta/icons/mob/actions/actions_spells.dmi b/massmeta/icons/mob/actions/actions_spells.dmi
new file mode 100644
index 0000000000000..a8ef4d21d7389
Binary files /dev/null and b/massmeta/icons/mob/actions/actions_spells.dmi differ
diff --git a/massmeta/master_files/code/modules/clothing/glasses/_glasses.dm b/massmeta/master_files/code/modules/clothing/glasses/_glasses.dm
new file mode 100644
index 0000000000000..14fd62106f335
--- /dev/null
+++ b/massmeta/master_files/code/modules/clothing/glasses/_glasses.dm
@@ -0,0 +1,2 @@
+/obj/item/clothing/glasses/sunglasses
+ flash_protect = FLASH_PROTECTION_WELDER
diff --git a/massmeta/master_files/code/modules/clothing/glasses/hud.dm b/massmeta/master_files/code/modules/clothing/glasses/hud.dm
new file mode 100644
index 0000000000000..a71a752a924d6
--- /dev/null
+++ b/massmeta/master_files/code/modules/clothing/glasses/hud.dm
@@ -0,0 +1,11 @@
+/obj/item/clothing/glasses/hud/health/sunglasses
+ flash_protect = FLASH_PROTECTION_WELDER
+
+/obj/item/clothing/glasses/hud/diagnostic/sunglasses
+ flash_protect = FLASH_PROTECTION_WELDER
+
+/obj/item/clothing/glasses/hud/security/sunglasses
+ flash_protect = FLASH_PROTECTION_WELDER
+
+/obj/item/clothing/glasses/hud/spacecop
+ flash_protect = FLASH_PROTECTION_WELDER
diff --git a/massmeta/master_files/readme.md b/massmeta/master_files/readme.md
new file mode 100644
index 0000000000000..70d01b57ddc22
--- /dev/null
+++ b/massmeta/master_files/readme.md
@@ -0,0 +1,3 @@
+## Тут лежат все наши Модульные Перепределения кода /TG/Station.
+
+⚠️ Обязательно соблюдайте Иерархию папок файловой системы оффов ТГ! ⚠️
diff --git a/massmeta/modular_meta.dm b/massmeta/modular_meta.dm
index d418e5af488b6..443a6a9aa55cf 100644
--- a/massmeta/modular_meta.dm
+++ b/massmeta/modular_meta.dm
@@ -1,18 +1,27 @@
/*
-*
-* Это основной файл куда будут складываться все наши модульные добавления.
-* Добавлять только:
-* Модули (.dm файлами)
-* Сам этот файл добавлен в tgstation.dme
-*
-*Все Defines файлы лежат в папке "~meta_defines\", однако там идет переопределение пути для того чтобы не ругались тесты.
-*
-*/
+ * Это основной файл куда будут складываться все наши модульные добавления.
+ * Добавлять только:
+ * Модули (.dm файлами)
+ * Сам этот файл добавлен в tgstation.dme
+ *
+ * Все Defines файлы лежат в папке "~meta_defines\"
+ *
+ * Все файлы должны быть в алфавитном порядке
+ */
-//modular files
+// Modular files (covered with tests)
+
+// BEGIN_INCLUDE
+#include "features\additional_circuit\includes.dm"
+#include "features\hardsuits\includes.dm"
+#include "features\kvass\includes.dm"
+#include "features\smites\includes.dm"
+#include "features\soviet_crate\includes.dm"
+// END_INCLUDE
//master files (unsorted, TODO: need modularization)
+
#include "code\_globalvars\lists\names.dm"
#include "code\__HELPERS\names.dm"
#include "interface\interface.dm"
@@ -80,17 +89,8 @@
//cheburek Car
#include "code\modules\vehicles\cars\cheburek.dm"
#include "code\modules\vehicles\vehicle_actions.dm"
-#include "code\game\objects\structures\crates_lockers\crates\large.dm"
#include "code\modules\cargo\packs\imports.dm"
-//features
-#include "features\additional_circuit\includes.dm"
-#include "features\hardsuits\code\_jetpack.dm"
-#include "features\hardsuits\code\armor.dm"
-#include "features\hardsuits\code\hardsuit.dm"
-#include "features\hardsuits\code\helmet.dm"
-#include "features\hardsuits\code\space_suit_beacon.dm"
-
//buts
#include "code\modules\surgery\organs\internal\butts\butts.dm"
#include "code\modules\surgery\organs\internal\butts\butts_init.dm"
@@ -102,13 +102,6 @@
#include "code\modules\clothing\under\undersuit.dm"
#include "code\modules\clothing\masks\moustache_ru.dm"
-//kvass
-#include "code\modules\cargo\exports\large_objects.dm"
-#include "code\modules\cargo\packs\materials.dm"
-#include "code\modules\reagents\chemistry\reagents\drinks\drink_reagents.dm"
-#include "code\modules\reagents\chemistry\reagents\drinks\glass_styles\sodas.dm"
-#include "code\modules\reagents\reagent_containers\cups\soda.dm"
-#include "code\modules\reagents\reagent_dispenser.dm"
-
-//smites
-#include "features\smites\testicular_torsion.dm"
+//Testicular_torsion wizard
+#include "code\modules\spells\spell_types\touch\testicular_torsion.dm"
+#include "code\modules\antags\wizard\equipment\spellbook_entries\offensive.dm"
diff --git a/massmeta/modular_meta_defines.dm b/massmeta/modular_meta_defines.dm
new file mode 100644
index 0000000000000..899edc4d54590
--- /dev/null
+++ b/massmeta/modular_meta_defines.dm
@@ -0,0 +1,10 @@
+/*
+ * На этот файл идёт переадресация из code/__DEFINES/~meta_defines_include.dm
+ *
+ * Все файлы должны быть в алфавитном порядке
+ */
+
+// BEGIN_INCLUDE
+#include "~meta_defines\butt_furrt.dm"
+#include "~meta_defines\inventory.dm"
+// END_INCLUDE
diff --git a/massmeta/modular_meta_master.dm b/massmeta/modular_meta_master.dm
new file mode 100644
index 0000000000000..cc8bbd9d03cb5
--- /dev/null
+++ b/massmeta/modular_meta_master.dm
@@ -0,0 +1,12 @@
+/*
+ * Тут все инклюды модульных изменений файлов /TG/Station
+ *
+ * Все файлы должны быть в алфавитном порядке
+ *
+ * Сам этот файл добавлен в tgstation.dme
+ */
+
+// BEGIN_INCLUDE
+#include "master_files\code\modules\clothing\glasses\_glasses.dm"
+#include "master_files\code\modules\clothing\glasses\hud.dm"
+// END_INCLUDE
diff --git a/massmeta/modularization_guide.md b/massmeta/modularization_guide.md
new file mode 100644
index 0000000000000..501e1078d689e
--- /dev/null
+++ b/massmeta/modularization_guide.md
@@ -0,0 +1,399 @@
+# Руководство по модуляризации кода - MassMeta style, v0.3
+
+## Чем тщательнее вы соблюдаете правила из этого руководства - тем меньше претензий будет к вам и ваш PR будет быстрее замержан в репозиторий.
+
+## Вступление
+
+Разработка и поддержка отдельной код-базы, что постоянно подсасывает обновления с основного проекта (в нашем случае это /TG/station) - это ну ооочень непростая задача, многие подобные "типо модульные" проекты утонули в грязном коде (посмотри в код Монке-станции), а подобные "Авгиевые конюшни" поддерживать - та ещё запара.
+
+Поймите, чем больше разрастается наш модульный код - тем тщательнее нужно его поддерживать для дальнейшей нашей работы.
+
+Удобство сопровождения вашего дополнительного кода - является одной из основных причин соблюдения МОДУЛЬНОСТИ у нашего проекта.
+
+Хорошо организованный и документированный код избавляет наш Моск при дальнейшем "обновлении до оффов ТГ" или внесении или удалении "фичи". **Сделай все сразу качественно как можешь.**
+
+Этот документ будет обновляться и изменяться каждый раз, когда в него будут добавляться новые исключения. Возможно, время от времени стоит проверять, возможно тут появится более правильный/удобный прием модуляризации.
+
+GitHub - это одна из многих видов систем контроля версий (СКВ). Мы на ней т.к. оффы ТГ тоже на ней. Сам Git одновременно и достаточно проработан в плане алгоритмов, он ими же и ограничен. Они не всегда могут однозначно разрешить определенные изменения в коде, что приводит к конфликтам, которые придется Вам починять вручную.
+
+**Все Баг-фиксы и прочую дичь Ты льешь только в корневой проект ТГ**
+
+### Важное примечание - ТЕСТИРУЙТЕ СВОИ PR'ы
+
+Как ответственный ТГ К*дер - Вы несете ответственность за тестирование вашего контента. Ты - это и тестировщик, что тестирует свой продукт для клиентов - игроков. А игроков на сервере обычно больше 1-го, то порой нужно проверять вашу фичу вдвоем/втроем/итд.
+
+Если вам нужен отдельный клиент для тестирования, вы можете использовать гостевой аккаунт, выйдя из BYOND-хаба и зайдя на локалку как Guest. Как только вас уже доконал этот кодинг фичи - закидывай PR на репозиторий и жди пока тебе его починят (заставят переделывать твоими же ручками).
+
+## Из-за чего же весь сыр-бор?
+
+### Итак, у Вас возник конфликт...
+
+Предположим в оригинале у нас было так:
+
+```byond
+var/something = 1
+```
+
+и вдруг нам протребовалось изменить значение с 1 на 2 для нашего проекта,
+
+```diff
+- var/something = 1
++ var/something = 2 //MASSMETA EDIT
+```
+
+но внезапно наш доблестный ТГ К*дер с оффов вносит свои изменения в основную код-базу, меняя её с 1 на 4,
+
+```diff
+- var/something = 1
++ var/something = 4
+```
+затем мы решили синхронизировать изменения ни о чём не подозревая, однако видим следующее,
+
+```byond
+var/something = 2 //MASSMETA EDIT
+```
+
+Как бы ни был прост данный пример, но он приводит к относительно простому конфликту.
+
+Где мы начинаем думать головой, чтобы выбрать наилучший вариант вручную.
+
+### Выходы из ситуации
+
+ТЫ - ТОТ КТО РЕШАЕТ КОНФЛИКТЫ, ПРОГРАММА - ГЛУПА И ГОТОВА В ЛЮБОЙ МОМЕНТ ПОДСТАВИТЬ ТЕБЯ, НЕ НАДЕЙСЯ НА НЕЁ!
+
+Ну так о чем мы... Ах да, МОДУЛЯРИЗАЦИЯ!
+
+**Модуляризация** означает, что большинство изменений и дополнений, которые мы делаем, будут храниться в отдельной папке **`modular_meta/`**, там наш код полностью независим от основного кода. Однако не всегда возможно все сделать полностью модульным, подобные случаи должны быть особым образом отмечены комментариями, указывающими, где начинаются изменения, где они заканчиваются, и к какой функции они относятся.
+
+## Протокол модуляризации
+
+«Как корабль назовешь, так он и поплывет». Придумайте короткое (но информативное) название для своего пиара для дальнейших пометок ваших изменений в коде. (Вы аналогично можете назвать вашу ветку (Branch) в вашем репозитории). После того как вы придумали название - то проверь, нет ли уже подобного в проекте!
+
+Например, `DNA-FEATURE-WINGS` или `XENOARCHEAOLOGY` или `SHUTTLE_TOGGLE` - Мы будем использовать его в будущей документации, как некий уникальный ID. Он должен быть единым во всех ваших изменениях/дополнениях. Все пометки ДОЛЖНЫ быть абсолютно одинаковыми! Это необходимо для удобства поиска.
+
+Затем вам нужно создать основную папку, в которой вы будете локально работать, назови сразу её подобно ID твоего модуля. Например, `modular_meta/modules/shuttle_toggle`.
+
+### Карты
+
+В нашем репозитории не предполагается держать модульные карты (это которые с применением авто-мапперов).
+
+Используются карты:
+* оригинальные с офф ТГ (без изменений)
+* заимствованные с других билдов (некоторые желательно не менять, уточните)
+* наши самодельные = полностью независимые (например: ProtoBoxStation)
+
+### Ресурсы: изображения (.png), звуки (.ogg), значки (.dmi) и прочие бинарники (= не Текст).
+
+Git сам по себе может справиться с конфликтами двоичных файлов, однако Вы - нет. Для вас бинарник будет выглядеть как беспорядочный набор всякого, поэтому вносить изменения в основные Бинарные файлы категорически не рекомендуется.
+
+Все (кроме TGUI, строк и конфигов со строками) добавленные нами файлы должны быть помещены в ту же модульную папку, что и ваш код. Это означает, что все локаально хранится в папке вашего модуля: звуки, значки и файлы кода. - УДОБНО!
+
+- ***Пример:*** Решили Вы добавить нового моба для лаваленда.
+
+ Прежде всего вы создаете свою модульную папку. Например: `modular_meta/modules/lavalandmob`
+
+ Далее Вы создаете подпапки для каждого компонента (если нужно).
+ Например:
+ * `/code` для кода
+ * `/sounds` для звуковых файлов
+ * `/icons` для любых файлов картинок/значков.
+
+ После этого вам нужно будет установить ссылки на ваши файлы в коде.
+
+ ```byond
+ /mob/lavaland/newmob
+ icon = 'modular_meta/modules/lavalandmob/icons/mob.dmi'
+ icon_state = "dead_1"
+ sound = 'modular_meta/modules/lavalandmob/sounds/boom.ogg'
+ ```
+
+ Это гарантирует нам, что ваш код является полностью модульным и облегчит его будущие изменения.
+
+- С прочими "нетекстовыми" файлами следует обращаться аналогичным образом, в зависимости от контекста каждого конкретного случая. Если у вас есть сомнения, обратитесь за советами и предложениями к сопровождающему проекта или другим участникам.
+
+- Any additional clothing icon files you add MUST go into the existing files in master_files clothing section. (непонятно что имел ввиду автор)
+
+### Папка `master_files` (oh yes Sir!)
+
+Вы всегда должны помещать любые модульные переопределения значков, звуков, кода и т. д. в эту папку, и они **должны** соответствовать структуре папки основного кода.
+
+Пример: `code/modules/mob/living/living.dm` -> `modular_meta/master_files/code/modules/mob/living/living.dm`
+
+Это сделано для того, чтобы было проще выяснить, что вы или кто-то другой поменяли в Базовом файле, без необходимости поиска в определениях процедур.
+
+Это также помогает предотвратить многократное переопределение одного и того же процесса модулями. Более подробная информация об этих типах редактирования расскажется позже.
+
+### Полностью модульные части вашего кода
+
+Раздел ниже относительно прост, там будет рассказано об основах Модульности с понятными примерами, так как руководство предназначено, скорее, для новичков.
+
+Правило гласит, что если вы сможете обойтись без этого, то не следует вносить изменения в файлы основной код-базы. За некоторыми исключениями, которые будут упомянуты в ближайшее время.
+
+Короче говоря, большая часть модульного кода будет размещена во вложенных папках вашей основной папки модуля **`modular_meta/modules/yourmodule/code/`**, с теми же правилами, что и в случае с остальными файлами. Не отражайте структуру папок основного кода в модульной папке!
+
+Например, `modular_meta/modules/xenoarcheaology/code`, содержит весь код, инструменты, предметы и прочее, связанное с этим.
+
+Такие модули, за исключением _очень_ простых, **должны** иметь в своей папке `readme.md`, содержащий следующее:
+
+- ссылки на PR'ы, которые внедрили этот модуль или внесли в него какие-либо существенные изменения
+- краткое описание модуля
+- список файлов, измененных в основном коде, с кратким описанием изменений, а также список изменений в других модульных файлах, не являющихся частью того же модуля, которые были необходимы для правильной работы этого модуля
+- (опционально) немного более подробная документация для корректировки кода на будущее, которая будет полезна при дальнейшем развитии и сопровождении
+- авторство
+
+***Примерный Шаблон:*** [Тык](module_template.md)
+
+## Модульные переопределения (важно!!)
+
+Обратите внимание, что можно модульно добавлять код перед или за основной процедурой, не редактируя исходную процедуру, а обращаясь к родительской процедуре с помощью `. = ..()` или `..()`. Аналогичным образом можно добавить новый var к существующему datum или obj, не редактируя напрямую файлы офф ТГ.
+
+**Примечание о переопределении proc: Если вы можете, это не значит, что вы должны!!!**
+
+В целом, такой подход является хорошей идеей и поощряется, когда это возможно. Однако это не жесткое правило, и иногда "//MASSMETA EDIT" предпочтительнее. Просто постарайтесь использовать здравый смысл в этом вопросе.
+
+Например: пожалуйста, не вставляйте всю TG-процедуру в модульную переопределённую процедуру, внесите одно небольшое изменение, а затем объявите её "полностью модульной". Эти процедуры - абсолютный кошмар для поддержки, потому что как только что-то изменится, вам придется обновлять переопределенную процедуру.
+
+Иногда вы даже не знаете о существовании переопределения, если оно компилируется нормально и не вызывает никаких ошибок. Это часто приводит к тому, что функции, которые были добавлены выше по течению, здесь отсутствуют. Так что да. Избегайте этого. Нет ничего страшного, если что-то не является полностью модульным. Иногда это лучший выбор из двух зол.
+
+Лучшими кандидатами для модульных переопределений proc являются те, в которых вы можете просто добавить что-то после вызова родителя или ловко вплести вызов родителя в середину, чтобы достичь желаемого эффекта.
+
+Производительность также следует учитывать, когда вы переопределяете горячую (часто вызываемую) процедуру (например, Life()), поскольку каждый дополнительный вызов увеличивает накладные расходы сервера. В таких случаях редактирование "//MASSMETA EDIT" намного критичны к общей производительности кода. Однако для большинства процедур об этом даже и не нужно беспокоиться.
+
+### Эти модульные переопределения должны храниться именно в `master_files`, и вам следует по возможности избегать их размещения внутри модулей.
+
+Для простоты предположим, что вы хотите заставить оружие искрить при выстреле для имитации дульной вспышки и вы хотите, чтобы это можно было использовать с любыми видами оружия.
+
+В модульном файле можно начать с добавления переменной var.
+
+```byond
+/obj/item/gun
+ var/muzzle_flash = TRUE
+```
+
+И все будет работать как полагается. После этого, допустим, вы захотите проверить var и вызвать искры после выстрела.
+Зная, что исходный proc, вызываемый при стрельбе, является
+
+```byond
+/obj/item/gun/proc/shoot_live_shot(mob/living/user, pointblank = 0, atom/pbtarget = null, message = 1)
+```
+
+вы можете определить для него дочернюю процедуру, которая будет вставлена в цепочку наследования связанных с ней процедур (выглядит на вид сложно, но в таких простых случаях, как этот, вам не нужно беспокоиться)
+
+```byond
+/obj/item/gun/shoot_live_shot(mob/living/user, pointblank = 0, atom/pbtarget = null, message = 1)
+ . = ..() //. is the default return value, we assign what the parent proc returns to it, as we call it before ours
+ if(muzzle_flash)
+ spawn_sparks(src) //For simplicity, I assume you've already made a proc for this
+```
+
+На этом мы закончили с основами.
+
+### Немодульные изменения основного кода - ВАЖНО
+
+Время от времени наступает момент, когда редактирование основных файлов становится неизбежным.
+
+Пожалуйста, не забудьте записать факт их изменения в readme.md вашего модуля.
+
+В этих случаях мы решили применить следующую стандартизацию с примерами:
+
+- **Добавление:**
+
+ ```byond
+ //MASSMETA EDIT ADDITION BEGIN - SHUTTLE_TOGGLE - (Optional Reason/comment)
+ var/adminEmergencyNoRecall = FALSE
+ var/lastMode = SHUTTLE_IDLE
+ var/lastCallTime = 6000
+ //MASSMETA EDIT ADDITION END
+ ```
+
+- **Удаление:**
+
+ ```byond
+ //MASSMETA EDIT REMOVAL BEGIN - SHUTTLE_TOGGLE - (Optional Reason/comment)
+ /*
+ for(var/obj/docking_port/stationary/S in stationary)
+ if(S.id = id)
+ return S
+ */
+ //MASSMETA EDIT REMOVAL END
+ WARNING("couldn't find dock with id: [id]")
+ ```
+
+ И для любых удалений, которые перемещаются в другие файлы:
+
+ ```byond
+ //MASSMETA EDIT REMOVAL BEGIN - SHUTTLE_TOGGLE - (Moved to modular_meta/shuttle_toggle/randomverbs.dm)
+ /*
+ /client/proc/admin_call_shuttle()
+ set category = "Admin - Events"
+ set name = "Call Shuttle"
+
+ if(EMERGENCY_AT_LEAST_DOCKED)
+ return
+
+ if(!check_rights(R_ADMIN))
+ return
+
+ var/confirm = alert(src, "You sure?", "Confirm", "Yes", "No")
+ if(confirm != "Yes")
+ return
+
+ SSshuttle.emergency.request()
+ SSblackbox.record_feedback("tally", "admin_verb", 1, "Call Shuttle") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+ log_admin("[key_name(usr)] admin-called the emergency shuttle.")
+ message_admins(span_adminnotice("[key_name_admin(usr)] admin-called the emergency shuttle."))
+ return
+ */
+ //MASSMETA EDIT REMOVAL END
+ ```
+
+- **Изменения:**
+
+ ```byond
+ //MASSMETA EDIT CHANGE BEGIN - SHUTTLE_TOGGLE - (Optional Reason/comment)
+ //if(SHUTTLE_STRANDED, SHUTTLE_ESCAPE) - MASSMETA EDIT - ORIGINAL
+ if(SHUTTLE_STRANDED, SHUTTLE_ESCAPE, SHUTTLE_DISABLED)
+ //MASSMETA EDIT CHANGE END
+ return 1
+ ```
+
+ при небольшом локальном изменении кода хорошим тоном будет в комментарии указать то что было там до вашего вмешательства.
+
+## Особые случаи модульного кода
+
+Из каждого правила есть исключения, обусловленные множеством обстоятельств.
+
+### Определения
+Свои модульные определения (defines) помещаем именно в папку **`massmeta/~meta_defines`**.
+
+Если у вас есть определение, которое используется более чем в одном файле, оно **обязательно** должно быть объявлено там.
+
+Если у вас есть define, который используется в одном файле и больше нигде не предполагается, объявите его вверху файла, а `#undef MY_DEFINE` - внизу файла. Это нужно для того, чтобы сохранить чистоту контекстных меню и не запутать тех, кто использует IDE (по типу VS Code) с автозаполнением.
+
+(Сам byond работает с дефайнами только в директории **`code/__DEFINES`**, туда идет переопределение нашего файла.)
+
+### Компоновка модульной папки
+Чтобы сохранить общий стиль и обеспечить удобную навигацию по большинству модулей, а также контролировать количество файлов и папок в репозитории, вы должны следовать этой схеме.
+
+Убедитесь, что имена папок точно соответствуют указанным.
+
+Самая верхняя папка: module_id
+
+**НЕ КОПИРУЙТЕ ФАЙЛОВУЮ СТРУКТУРУ ОСНОВНОГО КОДА ОФФОВ ТГ В СВОЙ МОДУЛЬ!!!**
+
+**Code** (код): Все файлы .DM должны располагаться здесь.
+
+- Делай так: /modular_meta/modules/module_id/code/disease_mob.dm
+- НЕ так: /modular_meta/modules/module_id/code/modules/antagonists/disease/disease_mob.dm
+
+**Icons** (изображения/иконки): Все файлы .DMI должны располагаться здесь.
+
+- Делай так: /modular_meta/modules/module_id/icons/mining_righthand.dmi
+- НЕ так: /modular_meta/modules/module_id/icons/mob/inhands/equipment/mining_righthand.dmi
+
+**Sound** (звуки/музыка): Все файлы .OGG должны располагаться здесь.
+
+- Делай так: /modular_meta/modules/module_id/sound/space_dragon_roar.ogg
+- НЕ так: /modular_meta/modules/module_id/sound/creatures/space_dragon_roar.ogg
+
+Файл Readme следует поместить в родительскую папку /modular_meta/modules/module_id.
+
+**ДЕРЖИТЕ РАЗНЫЕ ТИПЫ ФАЙЛОВ ПО СВОИ ПАПКАМ!**
+
+### Комментировнный код (= неиспользуемый) - НЕ ДЕЛАЙТЕ ЭТОГО
+
+Если вы комментируете избыточный код в модулях - значит его нужно полностью удалить.
+
+Даже если вы думаете, что кто-то собирается переделать то, что вы закомментировали, не делайте этого, gitblame существует не просто так, (прим. от переводчика: есть такая команда 'git blame', что позволяет показать, историю редактирования конкретной строки кода).
+
+Это относится и к файлам, не комментируйте целые файлы, просто удалите это безобразие. Это поможет нам избежать их раздувания и бессмысленных комментариев. Тем более вы всегда можете посмотреть что было именно в этом файле просто нажав в гите "Посмотреть историю изменений".
+
+**Это не относится к немодульным изменениям.**
+
+### Иерархия инклюдов (includes.dm) ваших модулей
+
+У Скайратов (в данном случае у Nova Sector) все новые файлы сразу включаются в общий файл tgstation.dme, что я считаю достаточно трудным для дальнейшней поддрежки, да и в целом не особо согласуется с их модульным принципом.
+
+В корне папки /modular_meta лежит файл modular_meta.dm (он включен в общий tgstation.dme)
+
+В этом файле описаны все дополнения, которые мы добавили в наш проект модульно. Они тоже представлены в виде .dm файлов. (например hardsuits.dm)
+
+Каждый такой .dm файл в каждом модуле содержит в себе все наши дополнительные модульные-файлы (тоже .dm).
+
+Таким образом мы соблюдаем некую красивую иерархию.
+
+### Вставка в код своих строковых (.txt .json) и config файлов
+
+Помещаете свои файлы в подпапку **`strings/~modular_meta_strings`**.
+По аналогии и config-файлами **`config/~modular_meta_config`**.
+
+Не забывайте выставлять правильный файловый путь к вашему файлу с учетом новой подпапки!
+
+## Модульный TGUI (TG User Interface)
+
+TGUI - еще один исключительный случай, поскольку он использует javascript и не может быть модульным, нежели же код DM.
+
+ВСЕ файлы tgui находятся в папке `/tgui/packages/tgui/interfaces` и ее подкаталогах; отдельной папки для пользовательских интерфейсов Massmeta не существует.
+
+### Изменение файлов самих офф ТГ
+
+При изменении оригинальных файлов TGUI действуют те же правила, что и при изменении вышележащего кода DM, однако схема написания комментариев порой тут несколько иная.
+
+Вы можете использовать как `// MASSMETA EDIT`, так и `/* MASSMETA EDIT */`, хотя в некоторых случаях вам придется использовать одно вместо другого. (в некотрых языках '//' - могут не являться комментированием, учтите это)
+
+В целом, старайтесь, чтобы комментарии к изменениям находились на той же строке, что и само изменение. Предпочтительно внутри JSX-тега. Например:
+
+```js
+ act('spin', { high_quality: true })}
+ icon="rat" // MASSMETA EDIT ADDITION
+
+```
+
+```js
+ act('spin', { high_quality: true })}
+ // MASSMETA EDIT ADDITION START - another example, multiline changes
+ icon="rat"
+ tooltip="spin the rat."
+ // MASSMETA EDIT ADDITION END
+
+```
+
+```js
+
+```
+
+Если это не представляется возможным, вы можете заключить ваше редактирование в фигурные скобки, например так:
+
+```js
+{/* MASSMETA EDIT ADDITION START */}
+
+ someProp="whatever"
+
+{/* MASSMETA EDIT ADDITION END */}
+```
+
+### Создание новых файлов TGUI
+
+** ВАЖНО! При создании нового файла TGUI с нуля, пожалуйста, добавьте следующее в самом верху файла (строка 1):**
+
+```js
+// THIS IS A MASSMETA UI FILE
+```
+
+Таким образом, они легко идентифицируются как модульные файлы TGUI .tsx/.jsx. Собственно ничего больше делать и не нужно, комментарии "// MASSMETA EDIT" в модульном файле TGUI не нужны.
+
+
+
+## В заключении
+
+Терпение и труд - ТГ к*дера перетрут. Если мы будем последовательны, то в конечном итоге это избавит НАС от будущих болей в области ГМ, когда Нам (Вам) же придется разрешать конфликты вручную.
+Благодаря более скрупулезному документированию будет сразу понятно, какие изменения были сделаны, где и с помощью каких функций, и все станет гораздо менее двусмысленным и запутанным.
+
+Желаю удачи в ТГ к*динге. Помните, что сообщество всегда готово помочь вам, если вдруг понадобится помощь.
diff --git a/massmeta/module_template.md b/massmeta/module_template.md
index ff9d70955b9fe..c3f17afd5ab04 100644
--- a/massmeta/module_template.md
+++ b/massmeta/module_template.md
@@ -1,10 +1,8 @@
-https://github.com/Huz2e/massmeta/pull/
+## Module ID:
-## \
-
-Module ID:
+
### Description:
@@ -32,11 +30,12 @@ E.g:
- N/A
-### Included files that are not contained in this module:
+### TGUI Files:
- N/A
-
+
### Credits:
+- N/A
diff --git a/massmeta/readme.md b/massmeta/readme.md
index 501e1078d689e..776ec7697e849 100644
--- a/massmeta/readme.md
+++ b/massmeta/readme.md
@@ -1,399 +1,21 @@
-# Руководство по модуляризации кода - MassMeta style, v0.3
+### Это модульная папка проекта МассМета
-## Чем тщательнее вы соблюдаете правила из этого руководства - тем меньше претензий будет к вам и ваш PR будет быстрее замержан в репозиторий.
+Здесь находятся:
-## Вступление
-Разработка и поддержка отдельной код-базы, что постоянно подсасывает обновления с основного проекта (в нашем случае это /TG/station) - это ну ооочень непростая задача, многие подобные "типо модульные" проекты утонули в грязном коде (посмотри в код Монке-станции), а подобные "Авгиевые конюшни" поддерживать - та ещё запара.
+| Папка/Файл | Описание
+| ------------------------------- | -------------------------------------------------------------|
+| **~meta_defines** 📁 | Папка со всеми нашими модульно определенными defines |
+| **master_files** 📁 | Файлы, что мы модульно Переопределили у /TG/Station |
+| **modules** 📁 | Все Новые модульные файлы |
+| **tools** 📁 | Инструменты, что позволяют удобнее вести проект |
+| **modular_meta.dm** 📄 | Файл, где описаны все наши модули, что мы добавляем в проект |
+| **modular_meta_defines.dm** 📄 | Файл, где описаны все наши модульно определенные defines |
+| **modularization_guide.md** 📝 | Инструкция по модульному ведению проекта (на Русском) |
+| **module_template.md** 📝 | Примерный шаблон, как должно выглядеть описание вашего PR'а |
-Поймите, чем больше разрастается наш модульный код - тем тщательнее нужно его поддерживать для дальнейшей нашей работы.
+⚠️ Все Defines, применяющиеся в вашем модуле, должны быть реализованы в папке **~meta_defines**! ⚠️
-Удобство сопровождения вашего дополнительного кода - является одной из основных причин соблюдения МОДУЛЬНОСТИ у нашего проекта.
+📚 Вам предоставлено **modularization_guide.md** пособие на Русском, о том как модульно вести проект.
-Хорошо организованный и документированный код избавляет наш Моск при дальнейшем "обновлении до оффов ТГ" или внесении или удалении "фичи". **Сделай все сразу качественно как можешь.**
-
-Этот документ будет обновляться и изменяться каждый раз, когда в него будут добавляться новые исключения. Возможно, время от времени стоит проверять, возможно тут появится более правильный/удобный прием модуляризации.
-
-GitHub - это одна из многих видов систем контроля версий (СКВ). Мы на ней т.к. оффы ТГ тоже на ней. Сам Git одновременно и достаточно проработан в плане алгоритмов, он ими же и ограничен. Они не всегда могут однозначно разрешить определенные изменения в коде, что приводит к конфликтам, которые придется Вам починять вручную.
-
-**Все Баг-фиксы и прочую дичь Ты льешь только в корневой проект ТГ**
-
-### Важное примечание - ТЕСТИРУЙТЕ СВОИ PR'ы
-
-Как ответственный ТГ К*дер - Вы несете ответственность за тестирование вашего контента. Ты - это и тестировщик, что тестирует свой продукт для клиентов - игроков. А игроков на сервере обычно больше 1-го, то порой нужно проверять вашу фичу вдвоем/втроем/итд.
-
-Если вам нужен отдельный клиент для тестирования, вы можете использовать гостевой аккаунт, выйдя из BYOND-хаба и зайдя на локалку как Guest. Как только вас уже доконал этот кодинг фичи - закидывай PR на репозиторий и жди пока тебе его починят (заставят переделывать твоими же ручками).
-
-## Из-за чего же весь сыр-бор?
-
-### Итак, у Вас возник конфликт...
-
-Предположим в оригинале у нас было так:
-
-```byond
-var/something = 1
-```
-
-и вдруг нам протребовалось изменить значение с 1 на 2 для нашего проекта,
-
-```diff
-- var/something = 1
-+ var/something = 2 //MASSMETA EDIT
-```
-
-но внезапно наш доблестный ТГ К*дер с оффов вносит свои изменения в основную код-базу, меняя её с 1 на 4,
-
-```diff
-- var/something = 1
-+ var/something = 4
-```
-затем мы решили синхронизировать изменения ни о чём не подозревая, однако видим следующее,
-
-```byond
-var/something = 2 //MASSMETA EDIT
-```
-
-Как бы ни был прост данный пример, но он приводит к относительно простому конфликту.
-
-Где мы начинаем думать головой, чтобы выбрать наилучший вариант вручную.
-
-### Выходы из ситуации
-
-ТЫ - ТОТ КТО РЕШАЕТ КОНФЛИКТЫ, ПРОГРАММА - ГЛУПА И ГОТОВА В ЛЮБОЙ МОМЕНТ ПОДСТАВИТЬ ТЕБЯ, НЕ НАДЕЙСЯ НА НЕЁ!
-
-Ну так о чем мы... Ах да, МОДУЛЯРИЗАЦИЯ!
-
-**Модуляризация** означает, что большинство изменений и дополнений, которые мы делаем, будут храниться в отдельной папке **`modular_meta/`**, там наш код полностью независим от основного кода. Однако не всегда возможно все сделать полностью модульным, подобные случаи должны быть особым образом отмечены комментариями, указывающими, где начинаются изменения, где они заканчиваются, и к какой функции они относятся.
-
-## Протокол модуляризации
-
-«Как корабль назовешь, так он и поплывет». Придумайте короткое (но информативное) название для своего пиара для дальнейших пометок ваших изменений в коде. (Вы аналогично можете назвать вашу ветку (Branch) в вашем репозитории). После того как вы придумали название - то проверь, нет ли уже подобного в проекте!
-
-Например, `DNA-FEATURE-WINGS` или `XENOARCHEAOLOGY` или `SHUTTLE_TOGGLE` - Мы будем использовать его в будущей документации, как некий уникальный ID. Он должен быть единым во всех ваших изменениях/дополнениях. Все пометки ДОЛЖНЫ быть абсолютно одинаковыми! Это необходимо для удобства поиска.
-
-Затем вам нужно создать основную папку, в которой вы будете локально работать, назови сразу её подобно ID твоего модуля. Например, `modular_meta/modules/shuttle_toggle`.
-
-### Карты
-
-В нашем репозитории не предполагается держать модульные карты (это которые с применением авто-мапперов).
-
-Используются карты:
-* оригинальные с офф ТГ (без изменений)
-* заимствованные с других билдов (некоторые желательно не менять, уточните)
-* наши самодельные = полностью независимые (например: ProtoBoxStation)
-
-### Ресурсы: изображения (.png), звуки (.ogg), значки (.dmi) и прочие бинарники (= не Текст).
-
-Git сам по себе может справиться с конфликтами двоичных файлов, однако Вы - нет. Для вас бинарник будет выглядеть как беспорядочный набор всякого, поэтому вносить изменения в основные Бинарные файлы категорически не рекомендуется.
-
-Все (кроме TGUI, строк и конфигов со строками) добавленные нами файлы должны быть помещены в ту же модульную папку, что и ваш код. Это означает, что все локаально хранится в папке вашего модуля: звуки, значки и файлы кода. - УДОБНО!
-
-- ***Пример:*** Решили Вы добавить нового моба для лаваленда.
-
- Прежде всего вы создаете свою модульную папку. Например: `modular_meta/modules/lavalandmob`
-
- Далее Вы создаете подпапки для каждого компонента (если нужно).
- Например:
- * `/code` для кода
- * `/sounds` для звуковых файлов
- * `/icons` для любых файлов картинок/значков.
-
- После этого вам нужно будет установить ссылки на ваши файлы в коде.
-
- ```byond
- /mob/lavaland/newmob
- icon = 'modular_meta/modules/lavalandmob/icons/mob.dmi'
- icon_state = "dead_1"
- sound = 'modular_meta/modules/lavalandmob/sounds/boom.ogg'
- ```
-
- Это гарантирует нам, что ваш код является полностью модульным и облегчит его будущие изменения.
-
-- С прочими "нетекстовыми" файлами следует обращаться аналогичным образом, в зависимости от контекста каждого конкретного случая. Если у вас есть сомнения, обратитесь за советами и предложениями к сопровождающему проекта или другим участникам.
-
-- Any additional clothing icon files you add MUST go into the existing files in master_files clothing section. (непонятно что имел ввиду автор)
-
-### Папка `master_files` (oh yes Sir!)
-
-Вы всегда должны помещать любые модульные переопределения значков, звуков, кода и т. д. в эту папку, и они **должны** соответствовать структуре папки основного кода.
-
-Пример: `code/modules/mob/living/living.dm` -> `modular_meta/master_files/code/modules/mob/living/living.dm`
-
-Это сделано для того, чтобы было проще выяснить, что вы или кто-то другой поменяли в Базовом файле, без необходимости поиска в определениях процедур.
-
-Это также помогает предотвратить многократное переопределение одного и того же процесса модулями. Более подробная информация об этих типах редактирования расскажется позже.
-
-### Полностью модульные части вашего кода
-
-Раздел ниже относительно прост, там будет рассказано об основах Модульности с понятными примерами, так как руководство предназначено, скорее, для новичков.
-
-Правило гласит, что если вы сможете обойтись без этого, то не следует вносить изменения в файлы основной код-базы. За некоторыми исключениями, которые будут упомянуты в ближайшее время.
-
-Короче говоря, большая часть модульного кода будет размещена во вложенных папках вашей основной папки модуля **`modular_meta/modules/yourmodule/code/`**, с теми же правилами, что и в случае с остальными файлами. Не отражайте структуру папок основного кода в модульной папке!
-
-Например, `modular_meta/modules/xenoarcheaology/code`, содержит весь код, инструменты, предметы и прочее, связанное с этим.
-
-Такие модули, за исключением _очень_ простых, **должны** иметь в своей папке `readme.md`, содержащий следующее:
-
-- ссылки на PR'ы, которые внедрили этот модуль или внесли в него какие-либо существенные изменения
-- краткое описание модуля
-- список файлов, измененных в основном коде, с кратким описанием изменений, а также список изменений в других модульных файлах, не являющихся частью того же модуля, которые были необходимы для правильной работы этого модуля
-- (опционально) немного более подробная документация для корректировки кода на будущее, которая будет полезна при дальнейшем развитии и сопровождении
-- авторство
-
-***Примерный Шаблон:*** [Тык](module_template.md)
-
-## Модульные переопределения (важно!!)
-
-Обратите внимание, что можно модульно добавлять код перед или за основной процедурой, не редактируя исходную процедуру, а обращаясь к родительской процедуре с помощью `. = ..()` или `..()`. Аналогичным образом можно добавить новый var к существующему datum или obj, не редактируя напрямую файлы офф ТГ.
-
-**Примечание о переопределении proc: Если вы можете, это не значит, что вы должны!!!**
-
-В целом, такой подход является хорошей идеей и поощряется, когда это возможно. Однако это не жесткое правило, и иногда "//MASSMETA EDIT" предпочтительнее. Просто постарайтесь использовать здравый смысл в этом вопросе.
-
-Например: пожалуйста, не вставляйте всю TG-процедуру в модульную переопределённую процедуру, внесите одно небольшое изменение, а затем объявите её "полностью модульной". Эти процедуры - абсолютный кошмар для поддержки, потому что как только что-то изменится, вам придется обновлять переопределенную процедуру.
-
-Иногда вы даже не знаете о существовании переопределения, если оно компилируется нормально и не вызывает никаких ошибок. Это часто приводит к тому, что функции, которые были добавлены выше по течению, здесь отсутствуют. Так что да. Избегайте этого. Нет ничего страшного, если что-то не является полностью модульным. Иногда это лучший выбор из двух зол.
-
-Лучшими кандидатами для модульных переопределений proc являются те, в которых вы можете просто добавить что-то после вызова родителя или ловко вплести вызов родителя в середину, чтобы достичь желаемого эффекта.
-
-Производительность также следует учитывать, когда вы переопределяете горячую (часто вызываемую) процедуру (например, Life()), поскольку каждый дополнительный вызов увеличивает накладные расходы сервера. В таких случаях редактирование "//MASSMETA EDIT" намного критичны к общей производительности кода. Однако для большинства процедур об этом даже и не нужно беспокоиться.
-
-### Эти модульные переопределения должны храниться именно в `master_files`, и вам следует по возможности избегать их размещения внутри модулей.
-
-Для простоты предположим, что вы хотите заставить оружие искрить при выстреле для имитации дульной вспышки и вы хотите, чтобы это можно было использовать с любыми видами оружия.
-
-В модульном файле можно начать с добавления переменной var.
-
-```byond
-/obj/item/gun
- var/muzzle_flash = TRUE
-```
-
-И все будет работать как полагается. После этого, допустим, вы захотите проверить var и вызвать искры после выстрела.
-Зная, что исходный proc, вызываемый при стрельбе, является
-
-```byond
-/obj/item/gun/proc/shoot_live_shot(mob/living/user, pointblank = 0, atom/pbtarget = null, message = 1)
-```
-
-вы можете определить для него дочернюю процедуру, которая будет вставлена в цепочку наследования связанных с ней процедур (выглядит на вид сложно, но в таких простых случаях, как этот, вам не нужно беспокоиться)
-
-```byond
-/obj/item/gun/shoot_live_shot(mob/living/user, pointblank = 0, atom/pbtarget = null, message = 1)
- . = ..() //. is the default return value, we assign what the parent proc returns to it, as we call it before ours
- if(muzzle_flash)
- spawn_sparks(src) //For simplicity, I assume you've already made a proc for this
-```
-
-На этом мы закончили с основами.
-
-### Немодульные изменения основного кода - ВАЖНО
-
-Время от времени наступает момент, когда редактирование основных файлов становится неизбежным.
-
-Пожалуйста, не забудьте записать факт их изменения в readme.md вашего модуля.
-
-В этих случаях мы решили применить следующую стандартизацию с примерами:
-
-- **Добавление:**
-
- ```byond
- //MASSMETA EDIT ADDITION BEGIN - SHUTTLE_TOGGLE - (Optional Reason/comment)
- var/adminEmergencyNoRecall = FALSE
- var/lastMode = SHUTTLE_IDLE
- var/lastCallTime = 6000
- //MASSMETA EDIT ADDITION END
- ```
-
-- **Удаление:**
-
- ```byond
- //MASSMETA EDIT REMOVAL BEGIN - SHUTTLE_TOGGLE - (Optional Reason/comment)
- /*
- for(var/obj/docking_port/stationary/S in stationary)
- if(S.id = id)
- return S
- */
- //MASSMETA EDIT REMOVAL END
- WARNING("couldn't find dock with id: [id]")
- ```
-
- И для любых удалений, которые перемещаются в другие файлы:
-
- ```byond
- //MASSMETA EDIT REMOVAL BEGIN - SHUTTLE_TOGGLE - (Moved to modular_meta/shuttle_toggle/randomverbs.dm)
- /*
- /client/proc/admin_call_shuttle()
- set category = "Admin - Events"
- set name = "Call Shuttle"
-
- if(EMERGENCY_AT_LEAST_DOCKED)
- return
-
- if(!check_rights(R_ADMIN))
- return
-
- var/confirm = alert(src, "You sure?", "Confirm", "Yes", "No")
- if(confirm != "Yes")
- return
-
- SSshuttle.emergency.request()
- SSblackbox.record_feedback("tally", "admin_verb", 1, "Call Shuttle") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
- log_admin("[key_name(usr)] admin-called the emergency shuttle.")
- message_admins(span_adminnotice("[key_name_admin(usr)] admin-called the emergency shuttle."))
- return
- */
- //MASSMETA EDIT REMOVAL END
- ```
-
-- **Изменения:**
-
- ```byond
- //MASSMETA EDIT CHANGE BEGIN - SHUTTLE_TOGGLE - (Optional Reason/comment)
- //if(SHUTTLE_STRANDED, SHUTTLE_ESCAPE) - MASSMETA EDIT - ORIGINAL
- if(SHUTTLE_STRANDED, SHUTTLE_ESCAPE, SHUTTLE_DISABLED)
- //MASSMETA EDIT CHANGE END
- return 1
- ```
-
- при небольшом локальном изменении кода хорошим тоном будет в комментарии указать то что было там до вашего вмешательства.
-
-## Особые случаи модульного кода
-
-Из каждого правила есть исключения, обусловленные множеством обстоятельств.
-
-### Определения
-Свои модульные определения (defines) помещаем именно в папку **`massmeta/~meta_defines`**.
-
-Если у вас есть определение, которое используется более чем в одном файле, оно **обязательно** должно быть объявлено там.
-
-Если у вас есть define, который используется в одном файле и больше нигде не предполагается, объявите его вверху файла, а `#undef MY_DEFINE` - внизу файла. Это нужно для того, чтобы сохранить чистоту контекстных меню и не запутать тех, кто использует IDE (по типу VS Code) с автозаполнением.
-
-(Сам byond работает с дефайнами только в директории **`code/__DEFINES`**, туда идет переопределение нашего файла.)
-
-### Компоновка модульной папки
-Чтобы сохранить общий стиль и обеспечить удобную навигацию по большинству модулей, а также контролировать количество файлов и папок в репозитории, вы должны следовать этой схеме.
-
-Убедитесь, что имена папок точно соответствуют указанным.
-
-Самая верхняя папка: module_id
-
-**НЕ КОПИРУЙТЕ ФАЙЛОВУЮ СТРУКТУРУ ОСНОВНОГО КОДА ОФФОВ ТГ В СВОЙ МОДУЛЬ!!!**
-
-**Code** (код): Все файлы .DM должны располагаться здесь.
-
-- Делай так: /modular_meta/modules/module_id/code/disease_mob.dm
-- НЕ так: /modular_meta/modules/module_id/code/modules/antagonists/disease/disease_mob.dm
-
-**Icons** (изображения/иконки): Все файлы .DMI должны располагаться здесь.
-
-- Делай так: /modular_meta/modules/module_id/icons/mining_righthand.dmi
-- НЕ так: /modular_meta/modules/module_id/icons/mob/inhands/equipment/mining_righthand.dmi
-
-**Sound** (звуки/музыка): Все файлы .OGG должны располагаться здесь.
-
-- Делай так: /modular_meta/modules/module_id/sound/space_dragon_roar.ogg
-- НЕ так: /modular_meta/modules/module_id/sound/creatures/space_dragon_roar.ogg
-
-Файл Readme следует поместить в родительскую папку /modular_meta/modules/module_id.
-
-**ДЕРЖИТЕ РАЗНЫЕ ТИПЫ ФАЙЛОВ ПО СВОИ ПАПКАМ!**
-
-### Комментировнный код (= неиспользуемый) - НЕ ДЕЛАЙТЕ ЭТОГО
-
-Если вы комментируете избыточный код в модулях - значит его нужно полностью удалить.
-
-Даже если вы думаете, что кто-то собирается переделать то, что вы закомментировали, не делайте этого, gitblame существует не просто так, (прим. от переводчика: есть такая команда 'git blame', что позволяет показать, историю редактирования конкретной строки кода).
-
-Это относится и к файлам, не комментируйте целые файлы, просто удалите это безобразие. Это поможет нам избежать их раздувания и бессмысленных комментариев. Тем более вы всегда можете посмотреть что было именно в этом файле просто нажав в гите "Посмотреть историю изменений".
-
-**Это не относится к немодульным изменениям.**
-
-### Иерархия инклюдов (includes.dm) ваших модулей
-
-У Скайратов (в данном случае у Nova Sector) все новые файлы сразу включаются в общий файл tgstation.dme, что я считаю достаточно трудным для дальнейшней поддрежки, да и в целом не особо согласуется с их модульным принципом.
-
-В корне папки /modular_meta лежит файл modular_meta.dm (он включен в общий tgstation.dme)
-
-В этом файле описаны все дополнения, которые мы добавили в наш проект модульно. Они тоже представлены в виде .dm файлов. (например hardsuits.dm)
-
-Каждый такой .dm файл в каждом модуле содержит в себе все наши дополнительные модульные-файлы (тоже .dm).
-
-Таким образом мы соблюдаем некую красивую иерархию.
-
-### Вставка в код своих строковых (.txt .json) и config файлов
-
-Помещаете свои файлы в подпапку **`strings/~modular_meta_strings`**.
-По аналогии и config-файлами **`config/~modular_meta_config`**.
-
-Не забывайте выставлять правильный файловый путь к вашему файлу с учетом новой подпапки!
-
-## Модульный TGUI (TG User Interface)
-
-TGUI - еще один исключительный случай, поскольку он использует javascript и не может быть модульным, нежели же код DM.
-
-ВСЕ файлы tgui находятся в папке `/tgui/packages/tgui/interfaces` и ее подкаталогах; отдельной папки для пользовательских интерфейсов Massmeta не существует.
-
-### Изменение файлов самих офф ТГ
-
-При изменении оригинальных файлов TGUI действуют те же правила, что и при изменении вышележащего кода DM, однако схема написания комментариев порой тут несколько иная.
-
-Вы можете использовать как `// MASSMETA EDIT`, так и `/* MASSMETA EDIT */`, хотя в некоторых случаях вам придется использовать одно вместо другого. (в некотрых языках '//' - могут не являться комментированием, учтите это)
-
-В целом, старайтесь, чтобы комментарии к изменениям находились на той же строке, что и само изменение. Предпочтительно внутри JSX-тега. Например:
-
-```js
- act('spin', { high_quality: true })}
- icon="rat" // MASSMETA EDIT ADDITION
-
-```
-
-```js
- act('spin', { high_quality: true })}
- // MASSMETA EDIT ADDITION START - another example, multiline changes
- icon="rat"
- tooltip="spin the rat."
- // MASSMETA EDIT ADDITION END
-
-```
-
-```js
-
-```
-
-Если это не представляется возможным, вы можете заключить ваше редактирование в фигурные скобки, например так:
-
-```js
-{/* MASSMETA EDIT ADDITION START */}
-
- someProp="whatever"
-
-{/* MASSMETA EDIT ADDITION END */}
-```
-
-### Создание новых файлов TGUI
-
-** ВАЖНО! При создании нового файла TGUI с нуля, пожалуйста, добавьте следующее в самом верху файла (строка 1):**
-
-```js
-// THIS IS A MASSMETA UI FILE
-```
-
-Таким образом, они легко идентифицируются как модульные файлы TGUI .tsx/.jsx. Собственно ничего больше делать и не нужно, комментарии "// MASSMETA EDIT" в модульном файле TGUI не нужны.
-
-
-
-## В заключении
-
-Терпение и труд - ТГ к*дера перетрут. Если мы будем последовательны, то в конечном итоге это избавит НАС от будущих болей в области ГМ, когда Нам (Вам) же придется разрешать конфликты вручную.
-Благодаря более скрупулезному документированию будет сразу понятно, какие изменения были сделаны, где и с помощью каких функций, и все станет гораздо менее двусмысленным и запутанным.
-
-Желаю удачи в ТГ к*динге. Помните, что сообщество всегда готово помочь вам, если вдруг понадобится помощь.
+💡 Для вашего удобства предоставленна примерная схема содержания вашего PR'а на наш репозиторй в **module_template.md**.
diff --git a/tools/massmeta_check_grep.sh b/massmeta/tools/massmeta_check_grep.sh
similarity index 100%
rename from tools/massmeta_check_grep.sh
rename to massmeta/tools/massmeta_check_grep.sh
diff --git a/massmeta/tools/readme.md b/massmeta/tools/readme.md
new file mode 100644
index 0000000000000..0df2c4ad2cf3b
--- /dev/null
+++ b/massmeta/tools/readme.md
@@ -0,0 +1,3 @@
+## Тут лежат все наши Новые Инструменты проверки нашего кода.
+
+Они находятся только в данной папке. К ним идет обращение в файле: **.github/workflows/ci_suite.yml**
diff --git a/massmeta/tools/ticked_file_enforcement/schemas/modular_meta.json b/massmeta/tools/ticked_file_enforcement/schemas/modular_meta.json
new file mode 100644
index 0000000000000..d7204d7555c34
--- /dev/null
+++ b/massmeta/tools/ticked_file_enforcement/schemas/modular_meta.json
@@ -0,0 +1,7 @@
+{
+ "file": "massmeta/modular_meta.dm",
+ "scannable_directory": "massmeta/features/",
+ "subdirectories": true,
+ "excluded_files": [],
+ "forbidden_includes": []
+}
diff --git a/massmeta/tools/ticked_file_enforcement/schemas/modular_meta_defines.json b/massmeta/tools/ticked_file_enforcement/schemas/modular_meta_defines.json
new file mode 100644
index 0000000000000..e2a72f9ed5d35
--- /dev/null
+++ b/massmeta/tools/ticked_file_enforcement/schemas/modular_meta_defines.json
@@ -0,0 +1,7 @@
+{
+ "file": "massmeta/modular_meta_defines.dm",
+ "scannable_directory": "massmeta/~meta_defines/",
+ "subdirectories": true,
+ "excluded_files": [],
+ "forbidden_includes": []
+}
diff --git a/massmeta/tools/ticked_file_enforcement/schemas/modular_meta_master.json b/massmeta/tools/ticked_file_enforcement/schemas/modular_meta_master.json
new file mode 100644
index 0000000000000..fe4c9bf68f2a4
--- /dev/null
+++ b/massmeta/tools/ticked_file_enforcement/schemas/modular_meta_master.json
@@ -0,0 +1,7 @@
+{
+ "file": "massmeta/modular_meta_master.dm",
+ "scannable_directory": "massmeta/master_files/",
+ "subdirectories": true,
+ "excluded_files": [],
+ "forbidden_includes": []
+}
diff --git a/massmeta/tools/ticked_file_enforcement/ticked_file_enforcement.py b/massmeta/tools/ticked_file_enforcement/ticked_file_enforcement.py
new file mode 100644
index 0000000000000..32fe9db93df66
--- /dev/null
+++ b/massmeta/tools/ticked_file_enforcement/ticked_file_enforcement.py
@@ -0,0 +1,212 @@
+import codecs
+import fnmatch
+import functools
+import glob
+import json
+import os
+import sys
+
+# simple way to check if we're running on github actions, or on a local machine
+on_github = os.getenv("GITHUB_ACTIONS") == "true"
+
+def green(text):
+ return "\033[32m" + str(text) + "\033[0m"
+
+def red(text):
+ return "\033[31m" + str(text) + "\033[0m"
+
+def blue(text):
+ return "\033[34m" + str(text) + "\033[0m"
+
+schema = json.load(sys.stdin)
+file_reference = schema["file"]
+file_reference_basename = os.path.basename(file_reference)
+scannable_directory = schema["scannable_directory"]
+subdirectories = schema["subdirectories"]
+FORBIDDEN_INCLUDES = schema["forbidden_includes"]
+excluded_files = schema["excluded_files"]
+
+def post_error(string):
+ print(red(f"Ticked File Enforcement [{file_reference}]: " + string))
+ if on_github:
+ print(f"::error file={file_reference},line=1,title=Ticked File Enforcement::{string}")
+
+for excluded_file in excluded_files:
+ full_file_path = scannable_directory + excluded_file
+ if not os.path.isfile(full_file_path):
+ post_error(f"Excluded file {full_file_path} does not exist, please remove it!")
+ sys.exit(1)
+
+file_extensions = ("dm", "dmf")
+
+reading = False
+lines = []
+total = 0
+
+# need just for better logs look
+if (scannable_directory == "massmeta/features/") or (scannable_directory == "massmeta/~meta_defines/") or (scannable_directory == "massmeta/master_files/"):
+ print(blue(f"Scanning Modular Code..."))
+ print(blue(f" Checking files in [{scannable_directory}]"))
+
+with open(file_reference, 'r') as file:
+ for line in file:
+ total += 1
+ line = line.strip()
+
+ if line == "// BEGIN_INCLUDE":
+ reading = True
+ continue
+ elif line == "// END_INCLUDE":
+ break
+ elif not reading:
+ continue
+
+ # need to make full path
+ if (scannable_directory == "massmeta/features/") or (scannable_directory == "massmeta/~meta_defines/") or (scannable_directory == "massmeta/master_files/"):
+ line = line[:10] + "massmeta\\" + line[10:]
+
+ # checks defines folder
+ fail_no_include_modular = False
+ if scannable_directory == "massmeta/~meta_defines/":
+ module_file_path = line.replace('\\', '/')
+ module_file_path_clean = module_file_path[10:-1]
+ print(f" [{module_file_path_clean}]")
+ if (module_file_path_clean[9:22] != "~meta_defines"):
+ print(red(f" File [{module_file_path_clean}] must be in \"~meta_defines/\" folder"))
+ fail_no_include_modular = True
+
+ # checks master folder
+ if scannable_directory == "massmeta/master_files/":
+ module_file_path = line.replace('\\', '/')
+ module_file_path_clean = module_file_path[10:-1]
+ print(f" [{module_file_path_clean}]")
+ if (module_file_path_clean[9:21] != "master_files"):
+ print(red(f" File [{module_file_path_clean}] must be in \"master_files/\" folder"))
+ fail_no_include_modular = True
+
+ lines.append(line)
+
+ # checks main module folder
+ if scannable_directory == "massmeta/features/":
+ module_file_path = line.replace('\\', '/')
+ module_file_path_clean = module_file_path[10:-1]
+ print(f" [{module_file_path_clean}] with in it:")
+ if module_file_path_clean[-11:] != "includes.dm":
+ print(red(f" File [{module_file_path_clean}] must be named \"includes.dm\", skipping the file."))
+ fail_no_include_modular = True
+ continue
+
+ with open(module_file_path_clean, 'r') as extra_file:
+ for extra_line in extra_file:
+ total += 1
+ extra_line = extra_line.strip()
+ if (extra_line[10:14] != "code"):
+ print(red(f" File [{extra_line}] must be in \"code/\" folder"))
+ fail_no_include_modular = True
+
+ # make full path
+ extra_line = line[:-12] + extra_line[10:]
+ lines.append(extra_line)
+ extra_line.replace('\\', '/')
+ print(f" [{extra_line[10:-1]}]")
+
+ if fail_no_include_modular:
+ post_error(f"Modular Ticked File Enforcement has failed!")
+ sys.exit(1)
+
+offset = total - len(lines)
+print(blue(f"Ticked File Enforcement: {offset} lines were ignored in output for [{file_reference}]."))
+fail_no_include = False
+
+scannable_files = []
+for file_extension in file_extensions:
+ compiled_directory = f"{scannable_directory}/**/*.{file_extension}"
+ scannable_files += glob.glob(compiled_directory, recursive=True)
+
+if len(scannable_files) == 0:
+ post_error(f"No files were found in {scannable_directory}. Ticked File Enforcement has failed!")
+ sys.exit(1)
+
+for code_file in scannable_files:
+ dm_path = ""
+
+ if subdirectories is True:
+ dm_path = code_file.replace('/', '\\')
+ else:
+ dm_path = os.path.basename(code_file)
+
+ included = f"#include \"{dm_path}\"" in lines
+
+ forbid_include = False
+ for forbidable in FORBIDDEN_INCLUDES:
+ if not fnmatch.fnmatch(code_file, forbidable):
+ continue
+
+ forbid_include = True
+
+ if included:
+ post_error(f"{dm_path} should NOT be included.")
+ fail_no_include = True
+
+ if forbid_include:
+ continue
+
+ if not included:
+ if(dm_path == file_reference_basename):
+ continue
+
+ if(dm_path in excluded_files):
+ continue
+
+ post_error(f"Missing include for {dm_path}.")
+ fail_no_include = True
+
+if fail_no_include:
+ sys.exit(1)
+
+def compare_lines(a, b):
+ # Remove initial include as well as the final quotation mark
+ a = a[len("#include \""):-1].lower()
+ b = b[len("#include \""):-1].lower()
+
+ split_by_period = a.split('.')
+ a_suffix = ""
+ if len(split_by_period) >= 2:
+ a_suffix = split_by_period[len(split_by_period) - 1]
+ split_by_period = b.split('.')
+ b_suffix = ""
+ if len(split_by_period) >= 2:
+ b_suffix = split_by_period[len(split_by_period) - 1]
+
+ a_segments = a.split('\\')
+ b_segments = b.split('\\')
+
+ for (a_segment, b_segment) in zip(a_segments, b_segments):
+ a_is_file = a_segment.endswith(file_extensions)
+ b_is_file = b_segment.endswith(file_extensions)
+
+ # code\something.dm will ALWAYS come before code\directory\something.dm
+ if a_is_file and not b_is_file:
+ return -1
+
+ if b_is_file and not a_is_file:
+ return 1
+
+ # interface\something.dm will ALWAYS come after code\something.dm
+ if a_segment != b_segment:
+ # if we're at the end of a compare, then this is about the file name
+ # files with longer suffixes come after ones with shorter ones
+ if a_suffix != b_suffix:
+ return (a_suffix > b_suffix) - (a_suffix < b_suffix)
+ return (a_segment > b_segment) - (a_segment < b_segment)
+
+ print(f"Two lines were exactly the same ({a} vs. {b})")
+ sys.exit(1)
+
+sorted_lines = sorted(lines, key = functools.cmp_to_key(compare_lines))
+for (index, line) in enumerate(lines):
+ if sorted_lines[index] != line:
+ post_error(f"The include at line {index + offset} is out of order ({line}, expected {sorted_lines[index]})")
+ sys.exit(1)
+
+print(green(f"Ticked File Enforcement: [{file_reference}] All includes (for {len(scannable_files)} scanned files) are in order!"))
diff --git a/massmeta/~meta_defines/meta_defines_all.dm b/massmeta/~meta_defines/meta_defines_all.dm
deleted file mode 100644
index 96dfa242b1ab2..0000000000000
--- a/massmeta/~meta_defines/meta_defines_all.dm
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "inventory.dm"
-#include "butt_furrt.dm"
diff --git a/massmeta/~meta_defines/readme.md b/massmeta/~meta_defines/readme.md
index 7647433003d31..e25a2d40f5a8b 100644
--- a/massmeta/~meta_defines/readme.md
+++ b/massmeta/~meta_defines/readme.md
@@ -1 +1,3 @@
-На этот файл идёт переадресация из code/__DEFINES/~meta_defines_include.dm
+## Тут лежат все наши Новые Defines, что мы определили в нашем модуле, они все добавлены в файле:
+
+**massmeta/modular_meta_defines.dm**
diff --git a/sound/attributions.txt b/sound/attributions.txt
index 1934edd9453d0..dff6c31cb7f84 100644
--- a/sound/attributions.txt
+++ b/sound/attributions.txt
@@ -200,3 +200,9 @@ https://freesound.org/people/MattRuthSound/sounds/561895/
ayylien.ogg was made by remixing:
SCIRetro_Energy Swells Synth_Funky Audio_Sonics Spices by Funky_Audio under CC0 -- https://freesound.org/people/realtheremin/sounds/119011/
scifi_scare_a.aiff by realtheremin under CC0 -- https://freesound.org/people/Funky_Audio/sounds/729392/
+
+
+beaker_pickup.ogg was made by lowering pitch:
+Bottle Tap.wav by alex_alexalex -- https://freesound.org/s/395492/ -- License: Attribution NonCommercial 3.0
+beaker_place.ogg was made by cutting and lowering pitch:
+place glass object.wav by milpower -- https://freesound.org/s/353105/ -- License: Creative Commons 0
diff --git a/sound/items/handling/beaker_pickup.ogg b/sound/items/handling/beaker_pickup.ogg
new file mode 100644
index 0000000000000..c31bf6856dcaf
Binary files /dev/null and b/sound/items/handling/beaker_pickup.ogg differ
diff --git a/sound/items/handling/beaker_place.ogg b/sound/items/handling/beaker_place.ogg
new file mode 100644
index 0000000000000..14b3868d0673d
Binary files /dev/null and b/sound/items/handling/beaker_place.ogg differ
diff --git a/strings/heckacious.json b/strings/heckacious.json
index 1d43f0bfaffee..1c648ce123815 100644
--- a/strings/heckacious.json
+++ b/strings/heckacious.json
@@ -75,7 +75,6 @@
"seeing": "scoping",
"great": "choice",
"look": "lonk",
- "shit": "balls warmed oveur",
"battery": "babbery",
"retard": "dicktard",
"gay": "homo",
@@ -93,6 +92,7 @@
"dude": [ "duge", "bro", "brah" ],
"'": [ "'", "" ],
"i'm": [ "im", "i am" ],
+ "shit": [ "balls warmed oveur", "shit" ],
"he's": [ "hes", "he is", "he'ss" ]
}
}
diff --git a/tgstation.dme b/tgstation.dme
index 3ac901c60cf96..8d06a6c0b050e 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -1474,6 +1474,7 @@
#include "code\datums\elements\move_force_on_death.dm"
#include "code\datums\elements\movement_turf_changer.dm"
#include "code\datums\elements\movetype_handler.dm"
+#include "code\datums\elements\muffles_speech.dm"
#include "code\datums\elements\nerfed_pulling.dm"
#include "code\datums\elements\noisy_movement.dm"
#include "code\datums\elements\noticable_organ.dm"
@@ -4401,6 +4402,7 @@
#include "code\modules\library\skill_learning\job_skillchips\_job.dm"
#include "code\modules\library\skill_learning\job_skillchips\chef.dm"
#include "code\modules\library\skill_learning\job_skillchips\clown.dm"
+#include "code\modules\library\skill_learning\job_skillchips\detective.dm"
#include "code\modules\library\skill_learning\job_skillchips\janitor.dm"
#include "code\modules\library\skill_learning\job_skillchips\miner.dm"
#include "code\modules\library\skill_learning\job_skillchips\psychologist.dm"
@@ -6288,4 +6290,5 @@
#include "interface\fonts\tiny_unicode.dm"
#include "interface\fonts\vcr_osd_mono.dm"
#include "massmeta\modular_meta.dm"
+#include "massmeta\modular_meta_master.dm"
// END_INCLUDE
diff --git a/tgui/packages/tgui/components/DmIcon.tsx b/tgui/packages/tgui/components/DmIcon.tsx
index fb6816576ac0c..bb785fc6e3968 100644
--- a/tgui/packages/tgui/components/DmIcon.tsx
+++ b/tgui/packages/tgui/components/DmIcon.tsx
@@ -29,7 +29,7 @@ type Props = {
/** Frame number. Default is 1 */
frame: number;
/** Movement state. Default is false */
- movement: boolean;
+ movement: any;
}> &
BoxProps;
@@ -49,7 +49,7 @@ export function DmIcon(props: Props) {
const [iconRef, setIconRef] = useState('');
- const query = `${iconRef}?state=${icon_state}&dir=${direction}&movement=${movement}&frame=${frame}`;
+ const query = `${iconRef}?state=${icon_state}&dir=${direction}&movement=${!!movement}&frame=${frame}`;
useEffect(() => {
async function fetchRefMap() {
diff --git a/tgui/packages/tgui/interfaces/AntagInfoHeretic.tsx b/tgui/packages/tgui/interfaces/AntagInfoHeretic.tsx
index 30908b606fa2f..b8156772553c4 100644
--- a/tgui/packages/tgui/interfaces/AntagInfoHeretic.tsx
+++ b/tgui/packages/tgui/interfaces/AntagInfoHeretic.tsx
@@ -2,8 +2,7 @@ import { BooleanLike } from 'common/react';
import { useState } from 'react';
import { useBackend } from '../backend';
-import { BlockQuote, Box, Button, Section, Stack, Tabs } from '../components';
-import { CssColor } from '../constants';
+import { Box, Button, DmIcon, Flex, Section, Stack, Tabs } from '../components';
import { Window } from '../layouts';
import {
Objective,
@@ -35,20 +34,33 @@ const hereticYellow = {
color: 'yellow',
};
+type IconParams = {
+ icon: string;
+ state: string;
+ frame: number;
+ dir: number;
+ moving: BooleanLike;
+};
+
type Knowledge = {
path: string;
+ icon_params: IconParams;
name: string;
desc: string;
gainFlavor: string;
cost: number;
- disabled: boolean;
- hereticPath: string;
- color: CssColor;
+ bgr: string;
+ disabled: BooleanLike;
+ finished: BooleanLike;
+ ascension: BooleanLike;
};
type KnowledgeInfo = {
- learnableKnowledge: Knowledge[];
- learnedKnowledge: Knowledge[];
+ knowledge_tiers: KnowledgeTier[];
+};
+
+type KnowledgeTier = {
+ nodes: Knowledge[];
};
type Info = {
@@ -219,63 +231,96 @@ const InformationSection = (props) => {
);
};
-const ResearchedKnowledge = (props) => {
- const { data } = useBackend();
- const { learnedKnowledge } = data;
+const KnowledgeTree = (props) => {
+ const { data, act } = useBackend();
+ const { knowledge_tiers } = data;
return (
-
-
-
- {(!learnedKnowledge.length && 'None!') ||
- learnedKnowledge.map((learned) => (
-
-
+
+
+ DAWN
+
+
+ {knowledge_tiers.length === 0
+ ? 'None!'
+ : knowledge_tiers.map((tier, i) => (
+
+
+ {tier.nodes.map((node) => (
+
+ act('research', { path: node.path })
+ }
+ width={node.ascension ? '192px' : '64px'}
+ height={node.ascension ? '192px' : '64px'}
+ m="8px"
+ style={{
+ borderRadius: '50%',
+ }}
+ >
+
+
+
+ {!node.finished &&
+ (node.cost > 0 ? node.cost : 'FREE')}
+
+
+ {!!node.ascension && (
+
+ DUSK
+
+ )}
+
+ ))}
+
+
))}
-
-
-
- );
-};
-
-const KnowledgeShop = (props) => {
- const { data, act } = useBackend();
- const { learnableKnowledge } = data;
-
- return (
-
-
- {(!learnableKnowledge.length && 'None!') ||
- learnableKnowledge.map((toLearn) => (
-
- 0
- ? `${toLearn.name}: ${toLearn.cost}
- point${toLearn.cost !== 1 ? 's' : ''}`
- : toLearn.name
- }`}
- tooltip={toLearn.desc}
- onClick={() => act('research', { path: toLearn.path })}
- />
- {!!toLearn.gainFlavor && (
-
- {toLearn.gainFlavor}
-
- )}
-
- ))}
-
-
+
+
);
};
@@ -284,23 +329,16 @@ const ResearchInfo = (props) => {
const { charges } = data;
return (
-
+
+
+ You have {charges || 0}
+
+ knowledge point{charges !== 1 ? 's' : ''}
+ {' '}
+ to spend.
+
-
-
- You have {charges || 0}
-
- knowledge point{charges !== 1 ? 's' : ''}
- {' '}
- to spend.
-
-
-
-
-
-
-
-
+
);
diff --git a/tgui/packages/tgui/interfaces/NtosPowerMonitor.tsx b/tgui/packages/tgui/interfaces/NtosPowerMonitor.tsx
index 295c41c3c72d3..bb7f7d1d527a2 100644
--- a/tgui/packages/tgui/interfaces/NtosPowerMonitor.tsx
+++ b/tgui/packages/tgui/interfaces/NtosPowerMonitor.tsx
@@ -4,7 +4,7 @@ import { PowerMonitorContent } from './PowerMonitor';
export const NtosPowerMonitor = (props) => {
return (
-
+
diff --git a/tgui/packages/tgui/interfaces/PowerMonitor.jsx b/tgui/packages/tgui/interfaces/PowerMonitor.jsx
deleted file mode 100644
index 039e700f68cea..0000000000000
--- a/tgui/packages/tgui/interfaces/PowerMonitor.jsx
+++ /dev/null
@@ -1,230 +0,0 @@
-import { map, sortBy } from 'common/collections';
-import { flow } from 'common/fp';
-import { toFixed } from 'common/math';
-import { useState } from 'react';
-
-import { useBackend } from '../backend';
-import {
- Box,
- Button,
- Chart,
- ColorBox,
- Dimmer,
- Flex,
- Icon,
- LabeledList,
- ProgressBar,
- Section,
- Stack,
- Table,
-} from '../components';
-import { Window } from '../layouts';
-
-const PEAK_DRAW = 500000;
-
-export const powerRank = (str) => {
- const unit = String(str.split(' ')[1]).toLowerCase();
- return ['w', 'kw', 'mw', 'gw'].indexOf(unit);
-};
-
-export const PowerMonitor = () => {
- return (
-
-
-
-
-
- );
-};
-
-export const PowerMonitorContent = (props) => {
- const { data } = useBackend();
- const { history = { supply: [], demand: [] } } = data;
- const [sortByField, setSortByField] = useState(null);
- const supply = history.supply[history.supply.length - 1] || 0;
- const demand = history.demand[history.demand.length - 1] || 0;
- const supplyData = history.supply.map((value, i) => [i, value]);
- const demandData = history.demand.map((value, i) => [i, value]);
- const maxValue = Math.max(PEAK_DRAW, ...history.supply, ...history.demand);
- // Process area data
- const areas = flow([
- (areas) =>
- map(areas, (area, i) => ({
- ...area,
- // Generate a unique id
- id: area.name + i,
- })),
- sortByField === 'name' && ((areas) => sortBy(areas, (area) => area.name)),
- sortByField === 'charge' &&
- ((areas) => sortBy(areas, (area) => -area.charge)),
- sortByField === 'draw' &&
- ((areas) =>
- sortBy(
- areas,
- (area) => -powerRank(area.load),
- (area) => -parseFloat(area.load),
- )),
- ])(data.areas);
- return (
- <>
- {areas.length === 0 && (
-
-
-
-
-
-
- No APCs found!
-
-
-
- )}
-
-
-
-
-
-
- {toFixed(supply / 1000) + ' kW'}
-
-
-
-
- {toFixed(demand / 1000) + ' kW'}
-
-
-
-
-
-
-
-
-
-
-
-
- Sort by:
-
- setSortByField(sortByField !== 'name' && 'name')}
- />
- setSortByField(sortByField !== 'charge' && 'charge')}
- />
- setSortByField(sortByField !== 'draw' && 'draw')}
- />
-
-
-
- Area
- Charge
- Draw
-
- Eqp
-
-
- Lgt
-
-
- Env
-
-
- {areas.map((area, i) => (
-
- {area.name}
-
-
-
-
- {area.load}
-
-
-
-
-
-
-
-
-
-
-
- ))}
-
-
- >
- );
-};
-
-export const AreaCharge = (props) => {
- const { charging, charge } = props;
- return (
- <>
- 50 ? 'battery-half' : 'battery-quarter')) ||
- (charging === 1 && 'bolt') ||
- (charging === 2 && 'battery-full')
- }
- color={
- (charging === 0 && (charge > 50 ? 'yellow' : 'red')) ||
- (charging === 1 && 'yellow') ||
- (charging === 2 && 'green')
- }
- />
-
- {toFixed(charge) + '%'}
-
- >
- );
-};
-
-const AreaStatusColorBox = (props) => {
- const { status } = props;
- const power = Boolean(status & 2);
- const mode = Boolean(status & 1);
- const tooltipText = (power ? 'On' : 'Off') + ` [${mode ? 'auto' : 'manual'}]`;
- return (
-
- );
-};
diff --git a/tgui/packages/tgui/interfaces/PowerMonitor.tsx b/tgui/packages/tgui/interfaces/PowerMonitor.tsx
new file mode 100644
index 0000000000000..b311ae15ede54
--- /dev/null
+++ b/tgui/packages/tgui/interfaces/PowerMonitor.tsx
@@ -0,0 +1,318 @@
+import { useState } from 'react';
+import {
+ Box,
+ Button,
+ Chart,
+ ColorBox,
+ Flex,
+ Icon,
+ LabeledList,
+ ProgressBar,
+ Section,
+ Stack,
+ Table,
+} from 'tgui-core/components';
+import { toFixed } from 'tgui-core/math';
+
+import { useBackend } from '../backend';
+import { Tooltip } from '../components';
+import { Window } from '../layouts';
+import { LoadingScreen } from './common/LoadingToolbox';
+
+type Data = {
+ areas: Area[];
+ history: PowerHistory;
+};
+
+type Area = {
+ charge: number;
+ charging: number;
+ env: number;
+ eqp: number;
+ lgt: number;
+ load: string;
+ name: string;
+};
+
+type PowerHistory = {
+ demand: number[];
+ supply: number[];
+};
+
+export function powerRank(str: string): number {
+ const unit = String(str.split(' ')[1]).toLowerCase();
+ return ['w', 'kw', 'mw', 'gw'].indexOf(unit);
+}
+
+// Oh no not another sorting algorithm
+function powerSort(a: Area, b: Area): number {
+ const sortedByRank = powerRank(a.load) - powerRank(b.load);
+ const sortedByLoad = parseFloat(a.load) - parseFloat(b.load);
+
+ if (sortedByRank !== 0) {
+ return sortedByRank;
+ }
+ return sortedByLoad;
+}
+
+function nameSort(a: Area, b: Area): number {
+ if (a.name < b.name) {
+ return -1;
+ }
+ if (a.name > b.name) {
+ return 1;
+ }
+ return 0;
+}
+
+export function PowerMonitor() {
+ return (
+
+
+
+
+
+ );
+}
+
+const PEAK_DRAW = 500000;
+
+export function PowerMonitorContent(props) {
+ const { data } = useBackend();
+ const { history } = data;
+
+ if (!history) {
+ return <>Loading...>;
+ }
+
+ const supply = history.supply[history.supply.length - 1] || 0;
+ const demand = history.demand[history.demand.length - 1] || 0;
+
+ const supplyData = history.supply.map((value, i) => [i, value]);
+ const demandData = history.demand.map((value, i) => [i, value]);
+
+ const maxValue = Math.max(PEAK_DRAW, ...history.supply, ...history.demand);
+
+ if (supplyData.length === 0 || demandData.length === 0) {
+ return ;
+ }
+
+ return (
+
+
+
+
+
+
+
+
+ {toFixed(supply / 1000) + ' kW'}
+
+
+
+
+ {toFixed(demand / 1000) + ' kW'}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ );
+}
+
+function StationAreas(props) {
+ const { data } = useBackend();
+
+ const [sortByField, setSortByField] = useState('');
+
+ const areas = data.areas
+ .map((area, i) => ({
+ ...area,
+ // Generate a unique id
+ id: area.name + i,
+ }))
+ .sort((a, b) => {
+ if (sortByField === 'name') {
+ return nameSort(a, b);
+ }
+ if (sortByField === 'charge') {
+ return a.charge - b.charge;
+ }
+ if (sortByField === 'draw') {
+ return powerSort(b, a);
+ }
+ return 0;
+ });
+
+ return (
+
+
+
+
+ Sort by:
+
+ setSortByField(sortByField !== 'name' ? 'name' : '')}
+ >
+ Name
+
+
+ setSortByField(sortByField !== 'charge' ? 'charge' : '')
+ }
+ >
+ Charge
+
+ setSortByField(sortByField !== 'draw' ? 'draw' : '')}
+ >
+ Draw
+
+
+
+
+
+
+
+
+ Area
+ Charge
+
+ Draw
+
+
+ Eqp
+
+
+ Lgt
+
+
+ Env
+
+
+ {areas.map((area) => (
+
+ {area.name}
+
+
+
+
+ {area.load}
+
+
+
+
+
+
+
+
+
+
+
+ ))}
+
+
+
+
+ );
+}
+
+type AreaChargeProps = {
+ charge: number;
+ charging: number;
+};
+
+const NOT_CHARGING = 0;
+const CHARGING = 1;
+const CHARGED = 2;
+
+export function AreaCharge(props: AreaChargeProps) {
+ const { charging, charge } = props;
+
+ let name: string;
+ if (charging === NOT_CHARGING) {
+ name = charge > 50 ? 'battery-half' : 'battery-quarter';
+ } else if (charging === CHARGING) {
+ name = 'bolt';
+ } else {
+ name = 'battery-full';
+ }
+
+ return (
+ <>
+ 50 ? 'yellow' : 'red')) ||
+ (charging === CHARGING && 'yellow') ||
+ (charging === CHARGED && 'green')
+ }
+ />
+
+ {toFixed(charge) + '%'}
+
+ >
+ );
+}
+
+type AreaStatusColorBoxProps = {
+ status: number;
+};
+
+function AreaStatusColorBox(props: AreaStatusColorBoxProps) {
+ const { status } = props;
+
+ const power = Boolean(status & 2);
+ const mode = Boolean(status & 1);
+ const tooltipText = (power ? 'On' : 'Off') + ` [${mode ? 'auto' : 'manual'}]`;
+
+ return (
+
+
+
+ );
+}
diff --git a/tgui/packages/tgui/package.json b/tgui/packages/tgui/package.json
index a9ab77fac4526..ffbb15ba176d0 100644
--- a/tgui/packages/tgui/package.json
+++ b/tgui/packages/tgui/package.json
@@ -16,7 +16,7 @@
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-popper": "^2.3.0",
- "tgui-core": "^1.0.18",
+ "tgui-core": "^1.1.2",
"tgui-dev-server": "workspace:*",
"tgui-polyfill": "workspace:*"
}
diff --git a/tgui/yarn.lock b/tgui/yarn.lock
index 5421adc80571b..88b94e8cda5b0 100644
--- a/tgui/yarn.lock
+++ b/tgui/yarn.lock
@@ -8281,13 +8281,13 @@ __metadata:
languageName: unknown
linkType: soft
-"tgui-core@npm:^1.0.18":
- version: 1.0.18
- resolution: "tgui-core@npm:1.0.18"
+"tgui-core@npm:^1.1.2":
+ version: 1.1.2
+ resolution: "tgui-core@npm:1.1.2"
peerDependencies:
react: ^18.2.0
react-dom: ^18.2.0
- checksum: 10c0/f5fa9078649ba0aa052116cd3ecbbb3a38113e9c32e6875c233d074f38db6abdb4dbfc3fb846d3cd125d4572eaf999988a082c1650b94ae429ace90e56deaca9
+ checksum: 10c0/05edc2215daf63bdb126f57aa74e17875784dbe1fadf19f1218dabb17dfffcd63b3c6a1678eb8a5b10b8d325755c1e124f1298350be20af913e9cd0d5a749ec9
languageName: node
linkType: hard
@@ -8399,7 +8399,7 @@ __metadata:
react: "npm:^18.2.0"
react-dom: "npm:^18.2.0"
react-popper: "npm:^2.3.0"
- tgui-core: "npm:^1.0.18"
+ tgui-core: "npm:^1.1.2"
tgui-dev-server: "workspace:*"
tgui-polyfill: "workspace:*"
languageName: unknown
diff --git a/tools/ci/check_grep.sh b/tools/ci/check_grep.sh
index c78e8fecf7c87..8a2b715502ff5 100644
--- a/tools/ci/check_grep.sh
+++ b/tools/ci/check_grep.sh
@@ -21,12 +21,14 @@ if command -v rg >/dev/null 2>&1; then
fi
code_files="code/**/**.dm"
map_files="_maps/**/**.dmm"
+ shuttle_map_files="_maps/shuttles/**.dmm"
code_x_515="code/**/!(__byond_version_compat).dm"
else
pcre2_support=0
grep=grep
code_files="-r --include=code/**/**.dm"
map_files="-r --include=_maps/**/**.dmm"
+ shuttle_map_files="-r --include=_maps/shuttles/**.dmm"
code_x_515="-r --include=code/**/!(__byond_version_compat).dm"
fi
@@ -304,6 +306,12 @@ if [ "$pcre2_support" -eq 1 ]; then
echo -e "${RED}ERROR: Invalid pronoun helper found.${NC}"
st=1
fi;
+ part "shuttle area checker"
+ if $grep -PU '(},|\/obj|\/mob|\/turf\/(?!template_noop).+)[^()]+\/area\/template_noop\)' $shuttle_map_files; then
+ echo
+ echo -e "${RED}ERROR: Shuttle has objs or turfs in a template_noop area. Please correct their areas to a shuttle subtype.${NC}"
+ st=1
+fi;
else
echo -e "${RED}pcre2 not supported, skipping checks requiring pcre2"
echo -e "if you want to run these checks install ripgrep with pcre2 support.${NC}"
diff --git a/tools/maplint/lints/banned_obj_vars.yml b/tools/maplint/lints/banned_obj_vars.yml
new file mode 100644
index 0000000000000..076aa20386a87
--- /dev/null
+++ b/tools/maplint/lints/banned_obj_vars.yml
@@ -0,0 +1,4 @@
+help: "This var is obsolete/no longer in use. Please remove it."
+/obj:
+ banned_variables:
+ layer: