diff --git a/code/modules/economy/trader.dm b/code/modules/economy/trader.dm
index b95fcfa6bbd..0a24136e4dc 100644
--- a/code/modules/economy/trader.dm
+++ b/code/modules/economy/trader.dm
@@ -256,12 +256,13 @@
var/obj/dt = pick(pt)
forceMove(get_turf(dt))
dir = dt.dir
+ log_admin("[src] has been placed at [loc], [x],[y],[z]")
else
- log_and_message_admins("tried to move itself but its target pick list was empty, so it was not moved. (JMP)")
+ log_and_message_admins("[src] tried to move itself but its target pick list was empty, so it was not moved. (JMP)")
/obj/move_trader_landmark //You need to place the trader somewhere in the world and enable the 'move_trader' var. When the trader initializes, it will make a list of these landmarks and then move itself.
- name = "trader spawner"
- desc = "Spawns a trader!"
+ name = "trader mover"
+ desc = "A trader can be moved to here!"
icon = 'icons/obj/landmark_vr.dmi'
icon_state = "blue-x"
invisibility = 101
diff --git a/maps/expedition_vr/beach/beach.dmm b/maps/expedition_vr/beach/beach.dmm
index e2ef0578d29..dac7a905f83 100644
--- a/maps/expedition_vr/beach/beach.dmm
+++ b/maps/expedition_vr/beach/beach.dmm
@@ -500,6 +500,13 @@
/obj/structure/simple_door/sandstone,
/turf/simulated/floor/tiled/asteroid_steel,
/area/tether_away/beach/resort/janibar)
+"gq" = (
+/obj/move_trader_landmark{
+ dir = 8;
+ trader_type = /obj/trader/general
+ },
+/turf/simulated/floor/outdoors/grass,
+/area/tether_away/beach/cavebase)
"gw" = (
/obj/structure/bonfire,
/turf/simulated/mineral/floor/cave{
@@ -1245,6 +1252,10 @@
/obj/machinery/light/small{
dir = 8
},
+/obj/move_trader_landmark{
+ dir = 4;
+ trader_type = /obj/trader/general
+ },
/turf/simulated/floor/outdoors/grass,
/area/tether_away/beach/resort/janibar)
"yz" = (
@@ -1385,6 +1396,14 @@
},
/turf/simulated/floor/lino,
/area/tether_away/beach/resort/kitchen)
+"BC" = (
+/obj/structure/table/bench/sifwooden/padded,
+/obj/move_trader_landmark{
+ dir = 4;
+ trader_type = /obj/trader/general
+ },
+/turf/simulated/floor/wood,
+/area/tether_away/beach/resort/kitchen)
"BF" = (
/turf/simulated/wall/sandstone,
/area/tether_away/beach/resort/dorm3)
@@ -1527,6 +1546,13 @@
/obj/structure/flora/ausbushes/ywflowers,
/turf/simulated/floor/outdoors/grass,
/area/tether_away/beach/resort)
+"Ff" = (
+/obj/move_trader_landmark{
+ dir = 4;
+ trader_type = /obj/trader/general
+ },
+/turf/simulated/floor/beach/sand/outdoors,
+/area/tether_away/beach/resort)
"Fm" = (
/obj/structure/cable{
d1 = 4;
@@ -5447,7 +5473,7 @@ Xd
Xd
Xd
Xd
-LQ
+gq
Xd
Xd
xy
@@ -10595,7 +10621,7 @@ zV
yf
as
ad
-as
+BC
yf
as
ad
@@ -15524,7 +15550,7 @@ lI
lI
Nv
Fm
-Nv
+Ff
lI
pP
lI
diff --git a/maps/gateway_vr/eggnogtown.dmm b/maps/gateway_vr/eggnogtown.dmm
index eda19d994eb..175934ba36b 100644
--- a/maps/gateway_vr/eggnogtown.dmm
+++ b/maps/gateway_vr/eggnogtown.dmm
@@ -650,7 +650,9 @@
pixel_x = 28;
pixel_y = -26
},
-/turf/simulated/floor/outdoors/newdirt,
+/turf/simulated/floor/outdoors/newdirt{
+ outdoors = 0
+ },
/area/gateway/eggnogtown/greenhouse)
"cD" = (
/obj/structure/bonfire,
@@ -972,9 +974,7 @@
"fS" = (
/obj/machinery/portable_atmospherics/hydroponics/soil,
/obj/machinery/light,
-/turf/simulated/floor/outdoors/grass/forest{
- outdoors = 0
- },
+/turf/simulated/floor/outdoors/grass/forest,
/area/gateway/eggnogtown/greenhouse)
"fX" = (
/obj/structure/grille,
@@ -1081,7 +1081,9 @@
/area/gateway/eggnogtown/kitchihome/den)
"gP" = (
/obj/item/weapon/stool/padded,
-/turf/simulated/floor/outdoors/newdirt,
+/turf/simulated/floor/outdoors/newdirt{
+ outdoors = 0
+ },
/area/gateway/eggnogtown/greenhouse)
"gS" = (
/turf/simulated/wall/wood,
@@ -1183,6 +1185,10 @@
/obj/structure/bed/chair/sofa/black{
dir = 8
},
+/obj/move_trader_landmark{
+ dir = 8;
+ trader_type = /obj/trader/general
+ },
/turf/simulated/floor/wood,
/area/gateway/eggnogtown/hall/south)
"iq" = (
@@ -1244,6 +1250,14 @@
/obj/structure/simple_door/iron,
/turf/simulated/floor/bmarble,
/area/gateway/eggnogtown/arturoswolfden)
+"jy" = (
+/obj/item/weapon/stool/padded{
+ dir = 8
+ },
+/turf/simulated/floor/outdoors/newdirt{
+ outdoors = 0
+ },
+/area/gateway/eggnogtown/greenhouse)
"jB" = (
/obj/structure/table/woodentable,
/obj/item/toy/plushie/black_fox,
@@ -1279,9 +1293,7 @@
/obj/machinery/light{
dir = 8
},
-/turf/simulated/floor/outdoors/grass/forest{
- outdoors = 0
- },
+/turf/simulated/floor/outdoors/grass/forest,
/area/gateway/eggnogtown/greenhouse)
"kG" = (
/obj/machinery/telecomms/relay,
@@ -1918,7 +1930,10 @@
/turf/simulated/floor/tiled/techmaint,
/area/gateway/eggnogtown/dining/storage)
"tc" = (
-/turf/simulated/floor/outdoors/grass/forest{
+/obj/item/weapon/stool/padded{
+ dir = 4
+ },
+/turf/simulated/floor/outdoors/newdirt{
outdoors = 0
},
/area/gateway/eggnogtown/greenhouse)
@@ -2010,9 +2025,7 @@
/obj/machinery/alarm/alarms_hidden{
pixel_y = 21
},
-/turf/simulated/floor/outdoors/grass/forest{
- outdoors = 0
- },
+/turf/simulated/floor/outdoors/grass/forest,
/area/gateway/eggnogtown/greenhouse)
"uk" = (
/obj/machinery/light_switch{
@@ -2148,9 +2161,7 @@
/obj/machinery/light{
dir = 1
},
-/turf/simulated/floor/outdoors/grass/forest{
- outdoors = 0
- },
+/turf/simulated/floor/outdoors/grass/forest,
/area/gateway/eggnogtown/greenhouse)
"wj" = (
/turf/simulated/wall/wood,
@@ -2725,7 +2736,9 @@
/area/gateway/eggnogtown/vibeout)
"Fd" = (
/obj/structure/bonfire/permanent,
-/turf/simulated/floor/outdoors/newdirt,
+/turf/simulated/floor/outdoors/newdirt{
+ outdoors = 0
+ },
/area/gateway/eggnogtown/greenhouse)
"Fe" = (
/turf/simulated/wall/wood,
@@ -2744,6 +2757,22 @@
/obj/machinery/cell_charger,
/turf/simulated/floor/reinforced,
/area/gateway/eggnogtown/loniabode)
+"Fo" = (
+/obj/move_trader_landmark{
+ dir = 8;
+ trader_type = /obj/trader/general
+ },
+/turf/simulated/floor/bmarble,
+/area/gateway/eggnogtown/hotsprings)
+"Fs" = (
+/obj/move_trader_landmark{
+ dir = 4;
+ trader_type = /obj/trader/general
+ },
+/turf/simulated/floor/wood{
+ temperature = 258.15
+ },
+/area/gateway/eggnogtown)
"Ft" = (
/turf/simulated/floor/tiled/monotile,
/area/gateway/eggnogtown/dining/botany)
@@ -3005,7 +3034,9 @@
/turf/simulated/floor/tiled/monotile,
/area/gateway/eggnogtown/dining/botany)
"Jm" = (
-/turf/simulated/floor/outdoors/newdirt,
+/turf/simulated/floor/outdoors/newdirt{
+ outdoors = 0
+ },
/area/gateway/eggnogtown/greenhouse)
"Jp" = (
/obj/machinery/door/airlock{
@@ -3104,6 +3135,10 @@
/obj/structure/bed/chair/sofa/black{
dir = 4
},
+/obj/move_trader_landmark{
+ dir = 4;
+ trader_type = /obj/trader/general
+ },
/turf/simulated/floor/wood,
/area/gateway/eggnogtown/hall/south)
"KI" = (
@@ -4041,9 +4076,7 @@
/obj/machinery/light{
dir = 4
},
-/turf/simulated/floor/outdoors/grass/forest{
- outdoors = 0
- },
+/turf/simulated/floor/outdoors/grass/forest,
/area/gateway/eggnogtown/greenhouse)
"XF" = (
/turf/simulated/wall/wood,
@@ -6711,7 +6744,7 @@ Xp
QT
LJ
Iw
-Iw
+Fo
Iw
Iw
Iw
@@ -8095,8 +8128,8 @@ Xp
Xp
Yc
kb
-tc
-tc
+wt
+wt
YZ
YZ
YZ
@@ -8237,10 +8270,10 @@ Xp
Xp
iq
wt
-tc
+wt
hS
YZ
-gP
+tc
YZ
YZ
oN
@@ -8670,7 +8703,7 @@ Jm
Jm
YZ
YZ
-tc
+wt
Yc
OH
Wr
@@ -8805,13 +8838,13 @@ Xp
Xp
iq
wt
-tc
+wt
YZ
YZ
-gP
+jy
YZ
YZ
-tc
+wt
wt
iq
Xp
@@ -8947,13 +8980,13 @@ Xp
Xp
Yc
uh
-tc
-tc
+wt
+wt
YZ
YZ
YZ
-tc
-tc
+wt
+wt
XE
Yc
Xp
@@ -17810,7 +17843,7 @@ aL
aL
aL
aL
-nN
+Fs
aL
aL
aL
diff --git a/maps/gateway_vr/eggnogtownunderground.dmm b/maps/gateway_vr/eggnogtownunderground.dmm
index 7da812dcca2..14c39d3f483 100644
--- a/maps/gateway_vr/eggnogtownunderground.dmm
+++ b/maps/gateway_vr/eggnogtownunderground.dmm
@@ -1,78 +1,58 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"aa" = (
/turf/simulated/mineral/floor/ignore_cavegen{
- nitrogen = 82.1472;
- oxygen = 21.8366;
temperature = 258.15
},
/area/gateway/eggnogtown/underground)
"ab" = (
/turf/simulated/mineral/ignore_cavegen{
- nitrogen = 82.1472;
- oxygen = 21.8366;
temperature = 258.15
},
/area/gateway/eggnogtown/underground)
"ac" = (
/obj/random/mob/semirandom_mob_spawner/vore/retaliate,
/turf/simulated/mineral/floor/ignore_cavegen{
- nitrogen = 82.1472;
- oxygen = 21.8366;
temperature = 258.15
},
/area/gateway/eggnogtown/underground)
"ad" = (
/obj/machinery/light/small,
/turf/simulated/mineral/floor/ignore_cavegen{
- nitrogen = 82.1472;
- oxygen = 21.8366;
temperature = 258.15
},
/area/gateway/eggnogtown/hotspring)
"ae" = (
/obj/random/mob/semirandom_mob_spawner/vore/retaliate/b,
/turf/simulated/mineral/floor/ignore_cavegen{
- nitrogen = 82.1472;
- oxygen = 21.8366;
temperature = 258.15
},
/area/gateway/eggnogtown/underground)
"af" = (
/turf/simulated/mineral/floor/ignore_cavegen{
- nitrogen = 82.1472;
- oxygen = 21.8366;
temperature = 303.15
},
/area/gateway/eggnogtown/underground)
"ag" = (
/obj/random/mob/semirandom_mob_spawner/vore/retaliate/c,
/turf/simulated/mineral/floor/ignore_cavegen{
- nitrogen = 82.1472;
- oxygen = 21.8366;
temperature = 258.15
},
/area/gateway/eggnogtown/underground)
"ah" = (
/obj/random/mob/semirandom_mob_spawner/vore/retaliate,
/turf/simulated/mineral/floor/ignore_cavegen{
- nitrogen = 82.1472;
- oxygen = 21.8366;
temperature = 303.15
},
/area/gateway/eggnogtown/underground)
"ai" = (
/obj/random/mob/semirandom_mob_spawner/vore/retaliate/c,
/turf/simulated/mineral/floor/ignore_cavegen{
- nitrogen = 82.1472;
- oxygen = 21.8366;
temperature = 303.15
},
/area/gateway/eggnogtown/underground)
"aj" = (
/obj/random/mob/semirandom_mob_spawner/vore/retaliate/b,
/turf/simulated/mineral/floor/ignore_cavegen{
- nitrogen = 82.1472;
- oxygen = 21.8366;
temperature = 303.15
},
/area/gateway/eggnogtown/underground)
@@ -81,8 +61,6 @@
dir = 8
},
/turf/simulated/mineral/floor/ignore_cavegen{
- nitrogen = 82.1472;
- oxygen = 21.8366;
temperature = 303.15
},
/area/gateway/eggnogtown/hotsprings)
@@ -91,8 +69,6 @@
dir = 4
},
/turf/simulated/mineral/floor/ignore_cavegen{
- nitrogen = 82.1472;
- oxygen = 21.8366;
temperature = 303.15
},
/area/gateway/eggnogtown/hotsprings)
@@ -101,8 +77,6 @@
dir = 8
},
/turf/simulated/mineral/floor/ignore_cavegen{
- nitrogen = 82.1472;
- oxygen = 21.8366;
temperature = 258.15
},
/area/gateway/eggnogtown/underground)
@@ -111,24 +85,18 @@
dir = 8
},
/turf/simulated/mineral/floor/ignore_cavegen{
- nitrogen = 82.1472;
- oxygen = 21.8366;
temperature = 258.15
},
/area/gateway/eggnogtown/underground)
"ao" = (
/obj/random/mob/semirandom_mob_spawner/vore/hostile,
/turf/simulated/mineral/floor/ignore_cavegen{
- nitrogen = 82.1472;
- oxygen = 21.8366;
temperature = 303.15
},
/area/gateway/eggnogtown/underground)
"ap" = (
/obj/random/awayloot,
/turf/simulated/mineral/floor/ignore_cavegen{
- nitrogen = 82.1472;
- oxygen = 21.8366;
temperature = 303.15
},
/area/gateway/eggnogtown/underground)
@@ -137,8 +105,6 @@
dir = 5
},
/turf/simulated/mineral/floor/ignore_cavegen{
- nitrogen = 82.1472;
- oxygen = 21.8366;
temperature = 258.15
},
/area/gateway/eggnogtown/underground)
@@ -147,15 +113,11 @@
dir = 4
},
/turf/simulated/mineral/floor/ignore_cavegen{
- nitrogen = 82.1472;
- oxygen = 21.8366;
temperature = 258.15
},
/area/gateway/eggnogtown/underground)
"as" = (
/turf/simulated/mineral/ignore_cavegen{
- nitrogen = 82.1472;
- oxygen = 21.8366;
temperature = 258.15
},
/area/gateway/eggnogtown/vibeout)
@@ -687,6 +649,15 @@
temperature = 258.15
},
/area/gateway/eggnogtown/houserhomestead/basement)
+"MG" = (
+/obj/move_trader_landmark{
+ dir = 8;
+ trader_type = /obj/trader/general
+ },
+/turf/simulated/mineral/floor/ignore_cavegen{
+ temperature = 303.15
+ },
+/area/gateway/eggnogtown/underground)
"Oa" = (
/obj/structure/bed/chair/bay/comfy/black{
dir = 4
@@ -2536,7 +2507,7 @@ gA
gA
af
af
-af
+MG
cb
cb
cb
@@ -2544,7 +2515,7 @@ cb
cb
cb
cb
-af
+MG
af
af
gA
diff --git a/maps/gateway_vr/variable/arynthilake_a.dmm b/maps/gateway_vr/variable/arynthilake_a.dmm
index ccf5fd4fe0a..afc16589d3b 100644
--- a/maps/gateway_vr/variable/arynthilake_a.dmm
+++ b/maps/gateway_vr/variable/arynthilake_a.dmm
@@ -1670,6 +1670,13 @@
/obj/structure/table/bench/marble,
/turf/simulated/floor/tiled/eris/white/techfloor,
/area/gateway/arynthilake/dome)
+"FJ" = (
+/obj/move_trader_landmark{
+ dir = 4;
+ trader_type = /obj/trader/general
+ },
+/turf/simulated/floor/outdoors/grass,
+/area/gateway/arynthilake)
"FR" = (
/obj/structure/ladder,
/turf/simulated/floor/tiled/eris/dark/monofloor,
@@ -1681,6 +1688,13 @@
/obj/machinery/light/small,
/turf/simulated/floor/wood,
/area/gateway/arynthilake/dome)
+"Ga" = (
+/obj/move_trader_landmark{
+ dir = 8;
+ trader_type = /obj/trader/general
+ },
+/turf/simulated/floor/lino,
+/area/gateway/arynthilake/dome)
"Gc" = (
/obj/structure/table/steel_reinforced,
/obj/item/weapon/book/manual/chef_recipes,
@@ -2016,6 +2030,13 @@
/obj/structure/flora/tree/bigtree,
/turf/simulated/floor/outdoors/grass/forest,
/area/gateway/arynthilake/dome)
+"NF" = (
+/obj/move_trader_landmark{
+ dir = 4;
+ trader_type = /obj/trader/general
+ },
+/turf/simulated/floor/lino,
+/area/gateway/arynthilake/dome)
"NG" = (
/obj/effect/floor_decal/industrial/warning/dust{
dir = 6
@@ -2224,6 +2245,16 @@
outdoors = 1
},
/area/gateway/arynthilake)
+"Sj" = (
+/obj/move_trader_landmark{
+ dir = 8;
+ trader_type = /obj/trader/general
+ },
+/turf/simulated/floor/plating{
+ edge_blending_priority = 1;
+ outdoors = 1
+ },
+/area/gateway/arynthilake/gateway)
"Ss" = (
/obj/effect/floor_decal/industrial/warning/dust{
dir = 9
@@ -4179,7 +4210,7 @@ au
al
al
al
-al
+FJ
al
al
au
@@ -6358,7 +6389,7 @@ Nm
fo
hw
hw
-Sw
+NF
Sw
ba
DP
@@ -7210,7 +7241,7 @@ fo
hw
Nm
hw
-Sw
+Ga
Sw
ba
qK
@@ -10946,7 +10977,7 @@ bD
bD
Fm
bH
-rs
+Sj
Zr
au
au
@@ -17840,7 +17871,7 @@ au
al
al
al
-al
+FJ
au
Zr
au
diff --git a/maps/gateway_vr/variable/arynthilake_b.dmm b/maps/gateway_vr/variable/arynthilake_b.dmm
index a7e041b07f0..bbba59342e4 100644
--- a/maps/gateway_vr/variable/arynthilake_b.dmm
+++ b/maps/gateway_vr/variable/arynthilake_b.dmm
@@ -103,6 +103,13 @@
/obj/random/mob/semirandom_mob_spawner/animal/retaliate/c,
/turf/simulated/floor/outdoors/grass/forest,
/area/gateway/arynthilake)
+"cP" = (
+/obj/move_trader_landmark{
+ dir = 8;
+ trader_type = /obj/trader/general
+ },
+/turf/simulated/floor/lino,
+/area/gateway/arynthilake/dome)
"cQ" = (
/obj/random/mob/semirandom_mob_spawner/fish/e,
/turf/simulated/floor/water,
@@ -556,6 +563,10 @@
/obj/structure/bed/chair/sofa/right/brown{
dir = 4
},
+/obj/move_trader_landmark{
+ dir = 4;
+ trader_type = /obj/trader/general
+ },
/turf/simulated/floor/carpet,
/area/gateway/arynthilake/dome)
"kv" = (
@@ -845,6 +856,13 @@
/obj/item/weapon/bedsheet/bluedouble,
/turf/simulated/floor/carpet/bcarpet,
/area/gateway/arynthilake/dome)
+"qh" = (
+/obj/move_trader_landmark{
+ dir = 8;
+ trader_type = /obj/trader/general
+ },
+/turf/simulated/floor/outdoors/grass,
+/area/gateway/arynthilake)
"qy" = (
/obj/structure/table/fancyblack,
/obj/item/weapon/flame/candle/candelabra,
@@ -890,6 +908,13 @@
outdoors = 1
},
/area/gateway/arynthilake)
+"rv" = (
+/obj/move_trader_landmark{
+ dir = 4;
+ trader_type = /obj/trader/general
+ },
+/turf/simulated/floor/outdoors/grass,
+/area/gateway/arynthilake/dome)
"rz" = (
/turf/simulated/floor/beach/sand/desert,
/area/gateway/arynthilake/caves)
@@ -1435,6 +1460,16 @@
/obj/effect/landmark/mcguffin_spawner,
/turf/simulated/floor/plating/external,
/area/gateway/arynthilake/caveruins)
+"FN" = (
+/obj/move_trader_landmark{
+ dir = 8;
+ trader_type = /obj/trader/general
+ },
+/turf/simulated/floor/plating{
+ edge_blending_priority = 1;
+ outdoors = 1
+ },
+/area/gateway/arynthilake/gateway)
"Gg" = (
/obj/structure/bed/chair{
dir = 4
@@ -14182,7 +14217,7 @@ pa
iL
lt
Ix
-MP
+FN
Vo
Vo
Vo
@@ -17825,7 +17860,7 @@ lQ
lQ
lQ
lQ
-nC
+rv
iG
nC
nC
@@ -18398,7 +18433,7 @@ lQ
iG
nC
nC
-cu
+cP
cu
hH
cS
@@ -20763,7 +20798,7 @@ Vo
sP
sP
sP
-sP
+qh
sP
sP
Vo
diff --git a/maps/gateway_vr/variable/honlethhighlands_a.dmm b/maps/gateway_vr/variable/honlethhighlands_a.dmm
index 7bb7359a333..b07c16fb64d 100644
--- a/maps/gateway_vr/variable/honlethhighlands_a.dmm
+++ b/maps/gateway_vr/variable/honlethhighlands_a.dmm
@@ -364,6 +364,13 @@
/obj/random/mob/semirandom_mob_spawner/humanoid/retaliate/b,
/turf/simulated/floor/tiled/techfloor,
/area/gateway/honlethhighlands/gate)
+"bP" = (
+/obj/move_trader_landmark{
+ dir = 4;
+ trader_type = /obj/trader/general
+ },
+/turf/simulated/floor/lino,
+/area/gateway/honlethhighlands/town/kitchen)
"bY" = (
/obj/machinery/alarm/alarms_hidden{
pixel_y = 21
@@ -449,7 +456,9 @@
/obj/machinery/light{
dir = 8
},
-/obj/item/weapon/stool,
+/obj/item/weapon/stool{
+ dir = 4
+ },
/turf/simulated/floor/wood,
/area/gateway/honlethhighlands/town/bar)
"dF" = (
@@ -576,6 +585,10 @@
/obj/structure/bed/chair/sofa/left/brown{
dir = 4
},
+/obj/move_trader_landmark{
+ dir = 4;
+ trader_type = /obj/trader/general
+ },
/turf/simulated/floor/tiled/techfloor,
/area/gateway/honlethhighlands/gate)
"gB" = (
@@ -735,7 +748,9 @@
/turf/simulated/floor/tiled,
/area/gateway/honlethhighlands/town/command)
"kL" = (
-/obj/item/weapon/stool,
+/obj/item/weapon/stool{
+ dir = 1
+ },
/turf/simulated/floor/plating,
/area/gateway/honlethhighlands/town/bar)
"kS" = (
@@ -902,7 +917,9 @@
},
/area/gateway/honlethhighlands/town/garden)
"nx" = (
-/obj/item/weapon/stool/padded,
+/obj/item/weapon/stool/padded{
+ dir = 4
+ },
/obj/random/mob/semirandom_mob_spawner/humanoid/retaliate,
/turf/simulated/floor/lino,
/area/gateway/honlethhighlands/town/bar)
@@ -1080,7 +1097,9 @@
/turf/simulated/floor/tiled,
/area/gateway/honlethhighlands/town/command)
"qB" = (
-/obj/item/weapon/stool/padded,
+/obj/item/weapon/stool/padded{
+ dir = 1
+ },
/obj/random/junk,
/turf/simulated/floor/wood,
/area/gateway/honlethhighlands/town/bar)
@@ -1340,7 +1359,9 @@
/turf/simulated/floor/tiled,
/area/gateway/honlethhighlands/town/command)
"uu" = (
-/obj/item/weapon/stool/padded,
+/obj/item/weapon/stool/padded{
+ dir = 8
+ },
/obj/random/junk,
/turf/simulated/floor/plating,
/area/gateway/honlethhighlands/town/bar)
@@ -1390,6 +1411,12 @@
/obj/random/awayloot,
/turf/simulated/floor/plating,
/area/gateway/honlethhighlands/town/xenobio)
+"vt" = (
+/obj/item/weapon/stool/padded{
+ dir = 1
+ },
+/turf/simulated/floor/wood,
+/area/gateway/honlethhighlands/town/bar)
"vG" = (
/obj/machinery/light/small{
dir = 8
@@ -1981,7 +2008,9 @@
d2 = 4;
icon_state = "0-4"
},
-/obj/item/weapon/stool/padded,
+/obj/item/weapon/stool/padded{
+ dir = 8
+ },
/turf/simulated/floor/lino,
/area/gateway/honlethhighlands/town/bar)
"Ey" = (
@@ -2190,7 +2219,9 @@
},
/area/gateway/honlethhighlands/town/garden)
"JI" = (
-/obj/item/weapon/stool/padded,
+/obj/item/weapon/stool/padded{
+ dir = 8
+ },
/turf/simulated/floor/lino,
/area/gateway/honlethhighlands/town/bar)
"JL" = (
@@ -2279,6 +2310,10 @@
pixel_x = 19;
pixel_y = -9
},
+/obj/move_trader_landmark{
+ dir = 8;
+ trader_type = /obj/trader/general
+ },
/turf/simulated/floor/tiled/techfloor,
/area/gateway/honlethhighlands/gate)
"Lk" = (
@@ -2566,6 +2601,16 @@
},
/turf/simulated/floor/plating,
/area/gateway/honlethhighlands/town/xenobio)
+"Rx" = (
+/obj/item/weapon/stool/padded{
+ dir = 8
+ },
+/obj/move_trader_landmark{
+ dir = 8;
+ trader_type = /obj/trader/general
+ },
+/turf/simulated/floor/lino,
+/area/gateway/honlethhighlands/town/bar)
"RA" = (
/obj/effect/floor_decal/techfloor{
dir = 10
@@ -16369,7 +16414,7 @@ Aa
dF
yP
JI
-JI
+Rx
JI
Ev
he
@@ -16935,10 +16980,10 @@ aI
he
ro
AF
-BS
+vt
BS
aP
-BS
+vt
UN
hN
An
@@ -19229,7 +19274,7 @@ aI
Tg
lj
uN
-lj
+bP
lj
lj
lj
diff --git a/maps/gateway_vr/variable/honlethhighlands_b.dmm b/maps/gateway_vr/variable/honlethhighlands_b.dmm
index 9a62e9b8468..c5d6bc7e8b4 100644
--- a/maps/gateway_vr/variable/honlethhighlands_b.dmm
+++ b/maps/gateway_vr/variable/honlethhighlands_b.dmm
@@ -306,6 +306,13 @@
temperature = 253.15
},
/area/gateway/honlethhighlands/beach)
+"bq" = (
+/obj/move_trader_landmark{
+ dir = 8;
+ trader_type = /obj/trader/general
+ },
+/turf/simulated/floor/plating,
+/area/gateway/honlethhighlands/town/xenobio)
"bw" = (
/obj/effect/floor_decal/techfloor{
dir = 10
@@ -431,7 +438,9 @@
/obj/machinery/light{
dir = 8
},
-/obj/item/weapon/stool,
+/obj/item/weapon/stool{
+ dir = 4
+ },
/turf/simulated/floor/wood,
/area/gateway/honlethhighlands/town/bar)
"dF" = (
@@ -563,6 +572,10 @@
/obj/structure/bed/chair/sofa/left/brown{
dir = 4
},
+/obj/move_trader_landmark{
+ dir = 4;
+ trader_type = /obj/trader/general
+ },
/turf/simulated/floor/tiled/techfloor,
/area/gateway/honlethhighlands/gate)
"gB" = (
@@ -677,6 +690,12 @@
/obj/item/modular_computer/console/preset/civilian,
/turf/simulated/floor/tiled,
/area/gateway/honlethhighlands/town/command)
+"jq" = (
+/obj/item/weapon/stool/padded{
+ dir = 1
+ },
+/turf/simulated/floor/wood,
+/area/gateway/honlethhighlands/town/bar)
"jE" = (
/obj/machinery/gateway/brass{
pixel_y = 6
@@ -736,7 +755,9 @@
/turf/simulated/floor/tiled,
/area/gateway/honlethhighlands/town/command)
"kL" = (
-/obj/item/weapon/stool,
+/obj/item/weapon/stool{
+ dir = 1
+ },
/turf/simulated/floor/plating,
/area/gateway/honlethhighlands/town/bar)
"kS" = (
@@ -1102,7 +1123,9 @@
/turf/simulated/floor/tiled,
/area/gateway/honlethhighlands/town/command)
"qB" = (
-/obj/item/weapon/stool/padded,
+/obj/item/weapon/stool/padded{
+ dir = 1
+ },
/obj/random/junk,
/turf/simulated/floor/wood,
/area/gateway/honlethhighlands/town/bar)
@@ -1361,7 +1384,9 @@
},
/area/gateway/honlethhighlands/town)
"uu" = (
-/obj/item/weapon/stool/padded,
+/obj/item/weapon/stool/padded{
+ dir = 8
+ },
/obj/random/junk,
/turf/simulated/floor/plating,
/area/gateway/honlethhighlands/town/bar)
@@ -1382,7 +1407,9 @@
/turf/simulated/floor/lino,
/area/gateway/honlethhighlands/town/kitchen)
"uP" = (
-/obj/item/weapon/stool/padded,
+/obj/item/weapon/stool/padded{
+ dir = 4
+ },
/obj/random/mob/semirandom_mob_spawner/humanoid,
/turf/simulated/floor/lino,
/area/gateway/honlethhighlands/town/bar)
@@ -1983,7 +2010,9 @@
d2 = 4;
icon_state = "0-4"
},
-/obj/item/weapon/stool/padded,
+/obj/item/weapon/stool/padded{
+ dir = 8
+ },
/turf/simulated/floor/lino,
/area/gateway/honlethhighlands/town/bar)
"EP" = (
@@ -2183,7 +2212,9 @@
},
/area/gateway/honlethhighlands/town/garden)
"JI" = (
-/obj/item/weapon/stool/padded,
+/obj/item/weapon/stool/padded{
+ dir = 8
+ },
/turf/simulated/floor/lino,
/area/gateway/honlethhighlands/town/bar)
"JL" = (
@@ -2273,6 +2304,10 @@
pixel_x = 19;
pixel_y = -9
},
+/obj/move_trader_landmark{
+ dir = 8;
+ trader_type = /obj/trader/general
+ },
/turf/simulated/floor/tiled/techfloor,
/area/gateway/honlethhighlands/gate)
"Lk" = (
@@ -2359,7 +2394,9 @@
/turf/simulated/floor/carpet/purcarpet,
/area/gateway/honlethhighlands)
"Nt" = (
-/obj/item/weapon/stool/padded,
+/obj/item/weapon/stool/padded{
+ dir = 1
+ },
/obj/random/mob/semirandom_mob_spawner/humanoid,
/turf/simulated/floor/wood,
/area/gateway/honlethhighlands/town/bar)
@@ -2643,6 +2680,16 @@
/obj/structure/window/reinforced/full,
/turf/simulated/floor/plating,
/area/gateway/honlethhighlands/town/kitchen)
+"TA" = (
+/obj/item/weapon/stool/padded{
+ dir = 8
+ },
+/obj/move_trader_landmark{
+ dir = 8;
+ trader_type = /obj/trader/general
+ },
+/turf/simulated/floor/lino,
+/area/gateway/honlethhighlands/town/bar)
"TE" = (
/obj/random/awayloot,
/turf/simulated/floor/outdoors/rocks{
@@ -16408,7 +16455,7 @@ Aa
dF
yP
JI
-JI
+TA
JI
Ev
he
@@ -16974,7 +17021,7 @@ aI
he
ro
AF
-BS
+jq
BS
aP
Nt
@@ -17289,7 +17336,7 @@ vi
lk
em
px
-lk
+bq
Dk
aI
aI
diff --git a/maps/gateway_vr/wildwest.dmm b/maps/gateway_vr/wildwest.dmm
index 4aa6d1cace9..2a42bcc14f0 100644
--- a/maps/gateway_vr/wildwest.dmm
+++ b/maps/gateway_vr/wildwest.dmm
@@ -515,7 +515,9 @@
/turf/simulated/floor/tiled/white,
/area/awaymission/wwmines)
"dM" = (
-/obj/item/weapon/stool,
+/obj/item/weapon/stool{
+ dir = 1
+ },
/mob/living/simple_mob/humanoid/merc/ranged,
/turf/simulated/floor/wood,
/area/awaymission/wwmines)
@@ -827,7 +829,9 @@
/turf/simulated/wall/sandstone,
/area/awaymission/wwmines)
"fT" = (
-/obj/item/weapon/stool,
+/obj/item/weapon/stool{
+ dir = 1
+ },
/turf/simulated/floor/wood,
/area/awaymission/wwmines)
"fW" = (
@@ -1379,7 +1383,9 @@
/turf/simulated/floor/grass,
/area/awaymission/wwgov)
"we" = (
-/obj/item/weapon/stool,
+/obj/item/weapon/stool{
+ dir = 1
+ },
/mob/living/simple_mob/humanoid/merc/melee,
/turf/simulated/floor/wood,
/area/awaymission/wwmines)
diff --git a/maps/offmap_vr/talon/talon_v2.dmm b/maps/offmap_vr/talon/talon_v2.dmm
index 59d89d7a429..31339143b67 100644
--- a/maps/offmap_vr/talon/talon_v2.dmm
+++ b/maps/offmap_vr/talon/talon_v2.dmm
@@ -3572,6 +3572,13 @@
/obj/machinery/portable_atmospherics/canister/empty/phoron,
/turf/simulated/floor/plating,
/area/talon_v2/engineering/port_store)
+"lj" = (
+/obj/move_trader_landmark{
+ dir = 8;
+ trader_type = /obj/trader/general
+ },
+/turf/simulated/floor/plating,
+/area/talon_v2/engineering/star_store)
"lk" = (
/obj/machinery/light/small{
dir = 4
@@ -4482,6 +4489,14 @@
},
/turf/simulated/floor/tiled/white,
/area/talon_v2/crew_quarters/bar)
+"oi" = (
+/obj/structure/catwalk,
+/obj/move_trader_landmark{
+ dir = 4;
+ trader_type = /obj/trader/general
+ },
+/turf/simulated/floor/plating,
+/area/talon_v2/maintenance/fore_port)
"ok" = (
/obj/structure/bed/pod,
/obj/item/weapon/bedsheet/brown,
@@ -23309,7 +23324,7 @@ aa
lT
Re
Re
-XQ
+oi
XQ
XQ
jQ
@@ -28033,7 +28048,7 @@ aL
oE
iH
tS
-in
+lj
in
in
in
diff --git a/maps/om_adventure/pois/cabin1.dmm b/maps/om_adventure/pois/cabin1.dmm
index 289930ef777..419919404e6 100644
--- a/maps/om_adventure/pois/cabin1.dmm
+++ b/maps/om_adventure/pois/cabin1.dmm
@@ -95,6 +95,13 @@
/obj/item/weapon/flame/candle,
/turf/simulated/floor/wood,
/area/om_adventure/poi/cabin1)
+"G" = (
+/obj/move_trader_landmark{
+ dir = 4;
+ trader_type = /obj/trader/general
+ },
+/turf/template_noop,
+/area/template_noop)
"H" = (
/obj/structure/table/woodentable,
/obj/random/tech_supply,
@@ -119,6 +126,10 @@
/obj/structure/bed/chair/sofa/left/brown{
dir = 8
},
+/obj/move_trader_landmark{
+ dir = 8;
+ trader_type = /obj/trader/general
+ },
/turf/simulated/floor/wood,
/area/om_adventure/poi/cabin1)
"S" = (
@@ -248,7 +259,7 @@ s
r
Q
a
-a
+G
a
a
"}
diff --git a/maps/om_adventure/pois/cabin2.dmm b/maps/om_adventure/pois/cabin2.dmm
index 005b5b3a1ed..d0d13c3951f 100644
--- a/maps/om_adventure/pois/cabin2.dmm
+++ b/maps/om_adventure/pois/cabin2.dmm
@@ -30,6 +30,13 @@
/obj/random/multiple/underdark/treasure,
/turf/simulated/floor/bmarble,
/area/om_adventure/poi/cabin2)
+"m" = (
+/obj/move_trader_landmark{
+ dir = 8;
+ trader_type = /obj/trader/general
+ },
+/turf/template_noop,
+/area/template_noop)
"n" = (
/obj/tether_away_spawner/spookyland,
/turf/simulated/floor/wood,
@@ -127,6 +134,10 @@
/obj/structure/bed/chair/sofa/right/brown{
dir = 4
},
+/obj/move_trader_landmark{
+ dir = 4;
+ trader_type = /obj/trader/general
+ },
/turf/simulated/floor/carpet/bcarpet,
/area/om_adventure/poi/cabin2)
"L" = (
@@ -250,7 +261,7 @@ H
r
Q
M
-a
+m
z
a
M
diff --git a/maps/om_adventure/pois/camp.dmm b/maps/om_adventure/pois/camp.dmm
index 13960f38546..ced5709932e 100644
--- a/maps/om_adventure/pois/camp.dmm
+++ b/maps/om_adventure/pois/camp.dmm
@@ -2,6 +2,13 @@
"a" = (
/turf/template_noop,
/area/template_noop)
+"i" = (
+/obj/move_trader_landmark{
+ dir = 4;
+ trader_type = /obj/trader/general
+ },
+/turf/template_noop,
+/area/template_noop)
"n" = (
/obj/structure/table/rack/steel,
/obj/fiftyspawner/log,
@@ -35,6 +42,13 @@
/obj/item/weapon/storage/box/matches,
/turf/simulated/floor/outdoors/newdirt,
/area/om_adventure/poi/camp)
+"Y" = (
+/obj/move_trader_landmark{
+ dir = 8;
+ trader_type = /obj/trader/general
+ },
+/turf/simulated/floor/outdoors/newdirt,
+/area/om_adventure/poi/camp)
(1,1,1) = {"
a
@@ -86,7 +100,7 @@ a
a
a
H
-a
+i
M
H
x
@@ -185,7 +199,7 @@ a
a
a
H
-H
+Y
x
a
a
diff --git a/maps/om_adventure/pois/medicalcenter.dmm b/maps/om_adventure/pois/medicalcenter.dmm
index c63fd95ef53..7130db01d95 100644
--- a/maps/om_adventure/pois/medicalcenter.dmm
+++ b/maps/om_adventure/pois/medicalcenter.dmm
@@ -17,6 +17,13 @@
/obj/tether_away_spawner/spookyland,
/turf/simulated/floor/tiled/eris/white/orangecorner,
/area/om_adventure/poi/medicalcenter)
+"p" = (
+/obj/move_trader_landmark{
+ dir = 4;
+ trader_type = /obj/trader/general
+ },
+/turf/simulated/floor/tiled/eris/white/orangecorner,
+/area/om_adventure/poi/medicalcenter)
"q" = (
/turf/simulated/floor/tiled/eris/white/orangecorner,
/area/om_adventure/poi/medicalcenter)
@@ -46,6 +53,10 @@
/obj/structure/bed/chair/sofa/left/blue{
dir = 8
},
+/obj/move_trader_landmark{
+ dir = 8;
+ trader_type = /obj/trader/general
+ },
/turf/simulated/floor/tiled/eris/white/orangecorner,
/area/om_adventure/poi/medicalcenter)
"A" = (
@@ -207,7 +218,7 @@ q
H
q
A
-q
+p
W
q
k
diff --git a/maps/om_adventure/pois/shippart1.dmm b/maps/om_adventure/pois/shippart1.dmm
index 7d2831eade1..8fe8459aa26 100644
--- a/maps/om_adventure/pois/shippart1.dmm
+++ b/maps/om_adventure/pois/shippart1.dmm
@@ -17,6 +17,13 @@
/obj/effect/floor_decal/rust,
/turf/simulated/floor/plating/eris/under,
/area/om_adventure/poi/shippart1)
+"i" = (
+/obj/move_trader_landmark{
+ dir = 4;
+ trader_type = /obj/trader/general
+ },
+/turf/template_noop,
+/area/template_noop)
"j" = (
/obj/tether_away_spawner/spookyland,
/turf/template_noop,
@@ -65,6 +72,13 @@
/obj/structure/salvageable/bliss,
/turf/simulated/floor/tiled/eris/dark/monofloor,
/area/om_adventure/poi/shippart1)
+"K" = (
+/obj/move_trader_landmark{
+ dir = 8;
+ trader_type = /obj/trader/general
+ },
+/turf/template_noop,
+/area/template_noop)
"M" = (
/obj/item/weapon/material/shard,
/obj/effect/floor_decal/rust,
@@ -133,7 +147,7 @@ a
a
a
a
-a
+i
a
a
a
@@ -354,7 +368,7 @@ a
a
a
a
-a
+K
a
a
X
diff --git a/maps/om_adventure/pois/shuttlewreck2.dmm b/maps/om_adventure/pois/shuttlewreck2.dmm
index c741ee70559..50e8e0b4831 100644
--- a/maps/om_adventure/pois/shuttlewreck2.dmm
+++ b/maps/om_adventure/pois/shuttlewreck2.dmm
@@ -64,6 +64,10 @@
/obj/machinery/light{
dir = 4
},
+/obj/move_trader_landmark{
+ dir = 8;
+ trader_type = /obj/trader/general
+ },
/turf/simulated/shuttle/floor/white,
/area/om_adventure/poi/shuttlewreck2)
"r" = (
@@ -79,6 +83,10 @@
/obj/machinery/light{
dir = 8
},
+/obj/move_trader_landmark{
+ dir = 4;
+ trader_type = /obj/trader/general
+ },
/turf/simulated/shuttle/floor/white,
/area/om_adventure/poi/shuttlewreck2)
"w" = (
diff --git a/maps/om_adventure/pois/shuttlewreck4.dmm b/maps/om_adventure/pois/shuttlewreck4.dmm
index 28fc4367d9f..bde678213dc 100644
--- a/maps/om_adventure/pois/shuttlewreck4.dmm
+++ b/maps/om_adventure/pois/shuttlewreck4.dmm
@@ -30,6 +30,13 @@
"q" = (
/turf/simulated/floor/tiled/eris/dark/monofloor,
/area/om_adventure/poi/shuttlewreck4)
+"r" = (
+/obj/move_trader_landmark{
+ dir = 8;
+ trader_type = /obj/trader/general
+ },
+/turf/template_noop,
+/area/template_noop)
"t" = (
/obj/structure/bed/chair/bay/shuttle{
dir = 4
@@ -46,6 +53,13 @@
"v" = (
/turf/simulated/wall/eris/r_wall,
/area/om_adventure/poi/shuttlewreck4)
+"w" = (
+/obj/move_trader_landmark{
+ dir = 4;
+ trader_type = /obj/trader/general
+ },
+/turf/template_noop,
+/area/template_noop)
"x" = (
/turf/simulated/floor/plating/eris/airless,
/area/om_adventure/poi/shuttlewreck4)
@@ -157,7 +171,7 @@ j
a
a
j
-j
+w
a
j
h
@@ -361,7 +375,7 @@ j
j
j
j
-j
+r
j
j
j
diff --git a/maps/om_adventure/pois/woodentemple.dmm b/maps/om_adventure/pois/woodentemple.dmm
index 585cfc0a29a..d12c7fa6807 100644
--- a/maps/om_adventure/pois/woodentemple.dmm
+++ b/maps/om_adventure/pois/woodentemple.dmm
@@ -137,8 +137,16 @@
/turf/simulated/floor/wood,
/area/om_adventure/poi/woodentemple)
"W" = (
-/obj/trader/general{
- dir = 8
+/obj/move_trader_landmark{
+ dir = 8;
+ trader_type = /obj/trader/general
+ },
+/turf/simulated/floor/wood,
+/area/om_adventure/poi/woodentemple)
+"X" = (
+/obj/move_trader_landmark{
+ dir = 4;
+ trader_type = /obj/trader/general
},
/turf/simulated/floor/wood,
/area/om_adventure/poi/woodentemple)
@@ -226,7 +234,7 @@ C
j
d
A
-d
+X
m
N
Q
diff --git a/maps/stellardelight/ship_centcom.dmm b/maps/stellardelight/ship_centcom.dmm
index d7bca2204d2..6de916b0c17 100644
--- a/maps/stellardelight/ship_centcom.dmm
+++ b/maps/stellardelight/ship_centcom.dmm
@@ -576,6 +576,12 @@
"bF" = (
/turf/simulated/floor/reinforced,
/area/shuttle/centcom/ccbay)
+"bG" = (
+/obj/trader/general{
+ move_trader = 1
+ },
+/turf/simulated/floor/tiled,
+/area/shuttle/centcom/ccbay)
"bJ" = (
/obj/structure/table/rack,
/obj/item/weapon/storage/box/pillbottles,
@@ -28602,7 +28608,7 @@ bS
fR
bY
lM
-Bx
+bG
Bx
Bx
Bx
diff --git a/maps/stellardelight/stellar_delight3.dmm b/maps/stellardelight/stellar_delight3.dmm
index 94b58cab548..f81e75775d4 100644
--- a/maps/stellardelight/stellar_delight3.dmm
+++ b/maps/stellardelight/stellar_delight3.dmm
@@ -9951,6 +9951,10 @@
/obj/structure/cable/green{
icon_state = "1-2"
},
+/obj/move_trader_landmark{
+ dir = 4;
+ trader_type = /obj/trader/general
+ },
/turf/simulated/floor,
/area/maintenance/stellardelight/deck3/portfore)
"Ki" = (
@@ -10241,6 +10245,13 @@
},
/turf/simulated/floor/tiled/techfloor/grid,
/area/tcommsat/computer)
+"Li" = (
+/obj/move_trader_landmark{
+ dir = 8;
+ trader_type = /obj/trader/general
+ },
+/turf/simulated/floor,
+/area/maintenance/stellardelight/deck3/starboardaft)
"Lm" = (
/obj/item/device/paicard,
/obj/structure/table/glass,
@@ -27133,7 +27144,7 @@ NL
qy
NL
by
-KJ
+Li
KJ
le
ww
diff --git a/maps/tether/submaps/tether_centcom.dmm b/maps/tether/submaps/tether_centcom.dmm
index fd39fa6cc8d..fdbd8460325 100644
--- a/maps/tether/submaps/tether_centcom.dmm
+++ b/maps/tether/submaps/tether_centcom.dmm
@@ -3401,6 +3401,12 @@
/obj/machinery/computer/skills,
/turf/simulated/floor/tiled/dark,
/area/centcom/security)
+"lt" = (
+/obj/trader/general{
+ move_trader = 1
+ },
+/turf/simulated/floor/tiled,
+/area/shuttle/centcom/ccbay)
"lu" = (
/obj/machinery/light{
dir = 8
@@ -28624,7 +28630,7 @@ bS
fR
bY
ac
-nJ
+lt
nJ
nJ
nJ
diff --git a/maps/tether/tether-02-surface2.dmm b/maps/tether/tether-02-surface2.dmm
index 7a0997f6f40..f9fd05e2ab0 100644
--- a/maps/tether/tether-02-surface2.dmm
+++ b/maps/tether/tether-02-surface2.dmm
@@ -33383,6 +33383,13 @@
},
/turf/simulated/floor/wood,
/area/tether/surfacebase/reading_room)
+"jSc" = (
+/obj/move_trader_landmark{
+ dir = 8;
+ trader_type = /obj/trader/general
+ },
+/turf/simulated/floor/tiled,
+/area/tether/surfacebase/southhall)
"jUQ" = (
/obj/effect/floor_decal/techfloor{
dir = 8
@@ -33929,6 +33936,13 @@
/obj/item/weapon/grenade/anti_photon,
/turf/simulated/floor/plating,
/area/tether/surfacebase/funny/hideyhole)
+"opK" = (
+/obj/move_trader_landmark{
+ dir = 4;
+ trader_type = /obj/trader/general
+ },
+/turf/simulated/floor/plating,
+/area/maintenance/lower/rnd)
"oXH" = (
/obj/structure/cable/cyan{
d1 = 1;
@@ -44760,7 +44774,7 @@ avD
aBJ
aCw
avD
-aEc
+opK
aED
aFi
aFT
@@ -51215,7 +51229,7 @@ bkq
bkG
bgU
blk
-blG
+jSc
blT
bmb
abn