diff --git a/html/changelogs/DreamySkrell-merchant-dock-fixed.yml b/html/changelogs/DreamySkrell-merchant-dock-fixed.yml
new file mode 100644
index 00000000000..04a2d1d957c
--- /dev/null
+++ b/html/changelogs/DreamySkrell-merchant-dock-fixed.yml
@@ -0,0 +1,42 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes:
+# bugfix
+# wip (For works in progress)
+# tweak
+# soundadd
+# sounddel
+# rscadd (general adding of nice things)
+# rscdel (general deleting of nice things)
+# imageadd
+# imagedel
+# maptweak
+# spellcheck (typo fixes)
+# experiment
+# balance
+# admin
+# backend
+# security
+# refactor
+#################################
+
+# Your name.
+author: DreamySkrell
+
+# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made. See valid prefix list above.
+# INDENT WITH TWO SPACES. NOT TABS. SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes:
+ - maptweak: "Merchant shuttle landmarks updated to newest standard."
+ - maptweak: "Minor post-3/4 fixes for merchant shuttle and base."
diff --git a/maps/aurora/code/aurora_shuttles.dm b/maps/aurora/code/aurora_shuttles.dm
index 4b69ed25845..a36c9166f92 100644
--- a/maps/aurora/code/aurora_shuttles.dm
+++ b/maps/aurora/code/aurora_shuttles.dm
@@ -158,7 +158,8 @@ AURORA_ESCAPE_POD(4)
name = "Second Deck Starboard Dock 1"
landmark_tag = "nav_merchant_dock"
docking_controller = "merchant_shuttle_dock"
- landmark_flags = SLANDMARK_FLAG_AUTOSET
+ base_turf = /turf/space
+ base_area = /area/space
//-// Admin Corvette //-//
diff --git a/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm b/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm
index 585b3ce9399..5be413cd670 100644
--- a/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm
+++ b/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm
@@ -2294,6 +2294,9 @@
pixel_x = -32;
req_access = list(13)
},
+/obj/effect/shuttle_landmark/merchant/dock{
+ dir = 1
+ },
/turf/simulated/floor/plating,
/area/security/checkpoint2)
"aZA" = (
@@ -48367,10 +48370,6 @@
},
/turf/simulated/floor/tiled/full,
/area/engineering/engine_airlock)
-"xnZ" = (
-/obj/effect/shuttle_landmark/merchant/dock,
-/turf/template_noop,
-/area/template_noop)
"xoj" = (
/obj/effect/floor_decal/spline/fancy/wood,
/turf/simulated/floor/wood,
@@ -61193,7 +61192,7 @@ qgN
qgN
qgN
qgN
-xnZ
+qgN
qgN
qgN
qgN
@@ -62806,7 +62805,7 @@ kAJ
eYD
wFj
udR
-udR
+wFj
qgN
qgN
qgN
@@ -63208,9 +63207,9 @@ jWV
jWV
haK
aQb
+wFj
udR
-udR
-udR
+wFj
qgN
qgN
qgN
@@ -65026,9 +65025,9 @@ pkH
pkH
pkH
aQb
+wFj
udR
-udR
-udR
+wFj
qgN
qgN
qgN
@@ -65432,7 +65431,7 @@ jWV
jWV
wFj
udR
-udR
+wFj
qgN
qgN
qgN
diff --git a/maps/sccv_horizon/sccv_horizon-4_centcomm.dmm b/maps/sccv_horizon/sccv_horizon-4_centcomm.dmm
index 86eadede32a..5b6ace7b1a8 100644
--- a/maps/sccv_horizon/sccv_horizon-4_centcomm.dmm
+++ b/maps/sccv_horizon/sccv_horizon-4_centcomm.dmm
@@ -476,15 +476,18 @@
},
/area/centcom/bar)
"abs" = (
-/obj/machinery/light{
- dir = 1;
- icon_state = "tube_empty"
+/obj/machinery/door/airlock/external{
+ frequency = 1380;
+ icon_state = "door_locked";
+ id_tag = "centcom_dock_airlock";
+ locked = 1;
+ name = "Arrivals Airlock";
+ req_access = list(13);
+ dir = 4
},
-/obj/effect/shuttle_landmark/supply/horizon/start{
- dir = 1
- },
-/turf/unsimulated/floor/plating,
-/area/centcom/suppy)
+/obj/effect/floor_decal/industrial/hatch/yellow,
+/turf/unsimulated/floor,
+/area/centcom/evac)
"abt" = (
/obj/effect/floor_decal/industrial/warning{
dir = 9
@@ -857,22 +860,6 @@
},
/turf/unsimulated/floor,
/area/centcom/control)
-"act" = (
-/obj/effect/step_trigger/teleporter/random{
- affect_ghosts = 1;
- name = "escapeshuttle_leave";
- teleport_x = 25;
- teleport_x_offset = 245;
- teleport_y = 25;
- teleport_y_offset = 245;
- teleport_z = 6;
- teleport_z_offset = 6
- },
-/obj/effect/shuttle_landmark/mining/transit{
- dir = 1
- },
-/turf/space/transit/north,
-/area/template_noop)
"acu" = (
/turf/simulated/wall/shuttle/unique/hapt{
desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean.";
@@ -1118,26 +1105,7 @@
icon_state = "dark_preview"
},
/area/centcom/control)
-"adb" = (
-/obj/machinery/door/airlock/external{
- frequency = 1380;
- icon_state = "door_locked";
- id_tag = "centcom_dock_airlock";
- locked = 1;
- name = "Arrivals Airlock";
- req_access = list(13);
- dir = 4
- },
-/obj/effect/floor_decal/industrial/hatch/yellow,
-/turf/unsimulated/floor,
-/area/centcom/evac)
"adc" = (
-/obj/structure/window/reinforced/crescent{
- dir = 1
- },
-/turf/simulated/wall/shuttle/scc,
-/area/supply/dock)
-"add" = (
/obj/machinery/door/airlock/centcom{
name = "Holding Cells";
req_access = list(150);
@@ -2351,17 +2319,6 @@
icon_state = "wood"
},
/area/centcom/control)
-"afo" = (
-/obj/machinery/door/airlock/external{
- frequency = 1337;
- icon_state = "door_locked";
- id_tag = "merchant_station_door";
- locked = 1;
- req_access = list(110);
- dir = 4
- },
-/turf/simulated/floor/tiled,
-/area/merchant_station/warehouse)
"afp" = (
/obj/effect/landmark{
name = "CCIAEscort"
@@ -5109,16 +5066,6 @@
"alc" = (
/turf/simulated/floor/tiled/ramp/bottom,
/area/merchant_station)
-"ald" = (
-/obj/structure/curtain/open/shower,
-/obj/effect/floor_decal/corner/dark_blue/full{
- dir = 8
- },
-/obj/machinery/shower{
- pixel_y = 20
- },
-/turf/simulated/floor/tiled,
-/area/merchant_station)
"ale" = (
/obj/structure/closet/gmcloset,
/obj/random/backpack,
@@ -5476,22 +5423,6 @@
/obj/random/plushie,
/turf/simulated/floor/wood,
/area/merchant_station)
-"alL" = (
-/obj/structure/sink{
- pixel_y = 18
- },
-/obj/structure/mirror{
- pixel_y = 33
- },
-/obj/machinery/light{
- dir = 4;
- icon_state = "tube_empty"
- },
-/obj/effect/floor_decal/corner/dark_blue{
- dir = 5
- },
-/turf/simulated/floor/tiled,
-/area/merchant_station)
"alM" = (
/obj/effect/floor_decal/corner/red/diagonal,
/obj/structure/table/standard,
@@ -5741,16 +5672,6 @@
},
/turf/simulated/floor/tiled/white,
/area/merchant_station)
-"amh" = (
-/obj/effect/decal/fake_object{
- density = 1;
- desc = "Locked during work hours due to safety concerns. Particularly pirate ones.";
- icon = 'icons/obj/doors/Doorglass.dmi';
- icon_state = "door_locked";
- name = "Upper Levels Access"
- },
-/turf/simulated/floor/tiled,
-/area/merchant_station)
"ami" = (
/obj/structure/curtain/black{
icon_state = "open";
@@ -5759,15 +5680,6 @@
},
/turf/simulated/floor/wood,
/area/merchant_station)
-"amj" = (
-/obj/structure/toilet{
- dir = 4
- },
-/obj/effect/floor_decal/corner/dark_blue{
- dir = 9
- },
-/turf/simulated/floor/tiled,
-/area/merchant_station)
"amk" = (
/obj/effect/floor_decal/corner/red/diagonal,
/obj/effect/floor_decal/spline/plain{
@@ -5968,20 +5880,6 @@
},
/turf/simulated/floor/lino,
/area/merchant_station)
-"amI" = (
-/obj/effect/landmark{
- name = "LateJoinMerchant"
- },
-/obj/effect/ghostspawpoint/button{
- desc = "This button is used for summoning an assistant from the upper floors.";
- dir = 8;
- identifier = "MerchantAss";
- name = "call button";
- pixel_x = 24;
- pixel_y = 26
- },
-/turf/simulated/floor/tiled,
-/area/merchant_station)
"amJ" = (
/obj/structure/sign/nosmoking_2,
/turf/simulated/wall,
@@ -6161,26 +6059,6 @@
},
/turf/simulated/floor/tiled/dark,
/area/supply/dock)
-"anj" = (
-/obj/effect/floor_decal/industrial/hatch/yellow,
-/obj/machinery/door/airlock/external{
- frequency = 1380;
- icon_state = "door_locked";
- id_tag = "cargo_shuttle_airlock";
- locked = 1;
- name = "Cargo Shuttle";
- req_access = list(13,31);
- dir = 1
- },
-/turf/simulated/floor/tiled/dark,
-/area/supply/dock)
-"ank" = (
-/obj/effect/step_trigger/thrower/shuttle/north,
-/obj/effect/shuttle_landmark/intrepid/transit{
- dir = 1
- },
-/turf/space/transit/north,
-/area/template_noop)
"anl" = (
/obj/structure/window/reinforced/crescent{
dir = 1
@@ -7458,10 +7336,6 @@
/obj/effect/floor_decal/industrial/hatch/yellow,
/turf/unsimulated/floor,
/area/centcom/evac)
-"arz" = (
-/obj/item/modular_computer/console/preset/merchant,
-/turf/simulated/floor/wood,
-/area/merchant_station/warehouse)
"arC" = (
/obj/machinery/conveyor_switch/oneway{
id = "merchant_shipping";
@@ -7845,37 +7719,6 @@
/obj/structure/window/shuttle/scc_space_ship/cardinal,
/turf/simulated/floor/plating,
/area/shuttle/merchant)
-"asJ" = (
-/obj/structure/table/reinforced,
-/obj/item/storage/secure/briefcase,
-/turf/simulated/floor/tiled/dark,
-/area/shuttle/merchant)
-"asK" = (
-/obj/item/storage/secure/safe{
- pixel_x = 8;
- pixel_y = 36
- },
-/obj/structure/bed/stool/padded/brown,
-/obj/machinery/button/remote/blast_door{
- id = "merchant_windows";
- name = "viewing shutters";
- pixel_x = -7;
- pixel_y = 25;
- req_access = null
- },
-/obj/machinery/light{
- dir = 1;
- icon_state = "tube_empty"
- },
-/obj/machinery/button/remote/blast_door{
- id = "merchant_airlock";
- name = "external airlock shutter";
- pixel_x = -7;
- pixel_y = 35;
- req_access = null
- },
-/turf/simulated/floor/tiled/dark,
-/area/shuttle/merchant)
"asL" = (
/obj/machinery/vending/wallmed1{
pixel_y = 30;
@@ -7967,57 +7810,6 @@
/obj/structure/bed/stool/chair/office/dark,
/turf/simulated/floor/wood,
/area/shuttle/merchant)
-"asU" = (
-/obj/structure/closet/secure_closet/merchant,
-/obj/item/device/hand_labeler,
-/obj/item/stack/packageWrap,
-/obj/item/device/price_scanner,
-/obj/structure/window/reinforced{
- dir = 4
- },
-/obj/machinery/button/remote/blast_door{
- id = "merchant_windows";
- name = "viewing shutters";
- pixel_x = -7;
- pixel_y = 25;
- req_access = null
- },
-/obj/machinery/button/remote/blast_door{
- id = "merchant_airlock";
- name = "external airlock shutter";
- pixel_x = -7;
- pixel_y = 35;
- req_access = null
- },
-/turf/simulated/floor/wood,
-/area/shuttle/merchant)
-"asV" = (
-/obj/machinery/door/airlock/external{
- frequency = 1337;
- icon_state = "door_locked";
- id_tag = "merchant_shuttle_hatch";
- layer = 2.8;
- name = "Ship External Access";
- open_layer = 2.8;
- req_access = list(110);
- dir = 4
- },
-/obj/effect/floor_decal/industrial/warning{
- dir = 8
- },
-/obj/effect/floor_decal/industrial/warning{
- dir = 4
- },
-/obj/effect/floor_decal/industrial/warning,
-/obj/effect/floor_decal/industrial/warning{
- dir = 1
- },
-/obj/machinery/door/blast/shutters/open{
- id = "merchant_airlock";
- name = "external airlock shutter"
- },
-/turf/simulated/floor/tiled,
-/area/shuttle/merchant)
"asW" = (
/obj/structure/shuttle_part/ert{
icon_state = "0,0";
@@ -8342,12 +8134,6 @@
"atV" = (
/turf/simulated/floor/tiled,
/area/shuttle/merchant)
-"atW" = (
-/obj/effect/floor_decal/industrial/warning{
- dir = 5
- },
-/turf/simulated/floor/tiled,
-/area/shuttle/merchant)
"atX" = (
/obj/machinery/computer/shuttle_control/merchant{
dir = 4
@@ -8364,15 +8150,6 @@
"atZ" = (
/turf/simulated/floor/tiled/dark,
/area/shuttle/merchant)
-"aua" = (
-/obj/machinery/door/airlock/silver{
- hashatch = 0;
- name = "Bridge";
- req_access = list(110);
- dir = 4
- },
-/turf/simulated/floor/tiled/dark,
-/area/shuttle/merchant)
"aub" = (
/obj/effect/floor_decal/corner/beige{
dir = 9
@@ -8673,10 +8450,6 @@
/obj/structure/flora/ausbushes/ppflowers,
/turf/simulated/floor/grass,
/area/centcom/evac)
-"auI" = (
-/obj/effect/shuttle_landmark/merchant/start,
-/turf/simulated/floor/tiled/dark,
-/area/shuttle/merchant)
"auJ" = (
/obj/effect/floor_decal/corner/beige{
dir = 6
@@ -8703,49 +8476,6 @@
},
/turf/simulated/floor/tiled/dark,
/area/shuttle/merchant)
-"auU" = (
-/obj/machinery/door/airlock/external{
- frequency = 1337;
- icon_state = "door_locked";
- id_tag = "merchant_shuttle_hatch";
- layer = 2.8;
- name = "Ship External Access";
- open_layer = 2.8;
- req_access = list(110);
- dir = 4
- },
-/obj/effect/floor_decal/industrial/warning{
- dir = 8
- },
-/obj/effect/floor_decal/industrial/warning{
- dir = 4
- },
-/turf/simulated/floor/tiled/dark,
-/area/shuttle/merchant)
-"auV" = (
-/obj/effect/floor_decal/industrial/warning{
- dir = 4
- },
-/obj/machinery/light{
- dir = 4;
- icon_state = "tube_empty"
- },
-/obj/machinery/atm{
- pixel_x = 32
- },
-/turf/simulated/floor/tiled,
-/area/shuttle/merchant)
-"auW" = (
-/obj/structure/table/reinforced,
-/obj/machinery/button/remote/blast_door{
- dir = 4;
- id = "merchant_bridge";
- name = "bridge window shutters";
- pixel_x = -6;
- pixel_y = -1
- },
-/turf/simulated/floor/carpet/blue,
-/area/shuttle/merchant)
"auX" = (
/obj/random/pottedplant,
/turf/simulated/floor/lino,
@@ -9068,28 +8798,6 @@
/obj/effect/floor_decal/industrial/warning,
/turf/simulated/floor/tiled,
/area/shuttle/merchant)
-"avH" = (
-/obj/effect/floor_decal/industrial/warning{
- dir = 6
- },
-/obj/structure/closet/walllocker/emerglocker/north{
- pixel_x = 32;
- pixel_y = 0
- },
-/turf/simulated/floor/tiled,
-/area/shuttle/merchant)
-"avI" = (
-/obj/structure/table/reinforced,
-/obj/item/storage/wallet/random,
-/turf/simulated/floor/tiled/dark,
-/area/shuttle/merchant)
-"avJ" = (
-/obj/structure/closet/secure_closet/merchant,
-/obj/machinery/light{
- icon_state = "tube_empty"
- },
-/turf/simulated/floor/tiled/dark,
-/area/shuttle/merchant)
"avK" = (
/obj/structure/table/standard,
/obj/item/stack/packageWrap,
@@ -9115,16 +8823,6 @@
},
/turf/simulated/floor/tiled,
/area/merchant_station/warehouse)
-"avP" = (
-/obj/structure/closet/secure_closet/merchant,
-/obj/machinery/embedded_controller/radio/simple_docking_controller{
- frequency = 1337;
- id_tag = "merchant_shuttle";
- pixel_y = -24;
- tag_door = "merchant_shuttle_hatch"
- },
-/turf/simulated/floor/tiled/dark,
-/area/shuttle/merchant)
"avQ" = (
/obj/machinery/door/window/northright{
name = "display case";
@@ -10186,17 +9884,6 @@
"axN" = (
/turf/unsimulated/floor,
/area/centcom/evac)
-"axZ" = (
-/obj/machinery/door/airlock/external{
- frequency = 1337;
- icon_state = "door_locked";
- id_tag = "merchant_station_door";
- locked = 1;
- req_access = list(110);
- dir = 1
- },
-/turf/simulated/floor/tiled,
-/area/merchant_station/warehouse)
"ayr" = (
/obj/machinery/autolathe{
desc = "Your typical Autolathe. It appears to have much more options than your regular one, however...";
@@ -10531,13 +10218,6 @@
/obj/structure/lattice,
/turf/space/dynamic,
/area/template_noop)
-"azc" = (
-/obj/machinery/light{
- dir = 4;
- icon_state = "tube_empty"
- },
-/turf/simulated/floor/tiled,
-/area/merchant_station/warehouse)
"azv" = (
/obj/item/gun/launcher/grenade{
pixel_x = -2;
@@ -10916,16 +10596,6 @@
/obj/effect/map_effect/window_spawner/full/reinforced/firedoor,
/turf/simulated/floor/tiled/dark/full,
/area/merchant_station/warehouse)
-"aAg" = (
-/obj/structure/grille,
-/obj/machinery/door/firedoor,
-/obj/machinery/door/blast/shutters/open{
- id = "merchant_airlock";
- name = "viewing shutter"
- },
-/obj/structure/window/shuttle/scc_space_ship/cardinal,
-/turf/simulated/floor/plating,
-/area/shuttle/merchant)
"aAh" = (
/obj/structure/shuttle/engine/propulsion/burst{
dir = 4
@@ -35323,10 +34993,6 @@
/obj/effect/shuttle_landmark/legion/interim,
/turf/space/transit/east,
/area/template_noop)
-"bIK" = (
-/obj/effect/shuttle_landmark/merchant/interim,
-/turf/space/transit/east,
-/area/template_noop)
"bIL" = (
/turf/simulated/floor/holofloor/tiled,
/area/horizon/holodeck/source_emptycourt)
@@ -36847,6 +36513,13 @@
/obj/effect/decal/cleanable/cobweb2,
/turf/simulated/floor/exoplanet/barren/raskara,
/area/centcom/shared_dream)
+"cNj" = (
+/obj/structure/curtain/open/shower,
+/obj/machinery/shower{
+ pixel_y = 20
+ },
+/turf/simulated/floor/tiled/white,
+/area/merchant_station)
"cTG" = (
/turf/simulated/floor/holofloor/grass{
dir = 9;
@@ -36869,6 +36542,12 @@
},
/turf/simulated/floor/exoplanet/grass,
/area/centcom/shared_dream)
+"cVH" = (
+/obj/effect/shuttle_landmark/merchant/interim{
+ dir = 1
+ },
+/turf/space/transit/east,
+/area/template_noop)
"cWa" = (
/obj/effect/decal/fake_object{
density = 1;
@@ -37077,6 +36756,19 @@
/obj/structure/flora/tree/dead,
/turf/simulated/floor/holofloor/snow,
/area/horizon/holodeck/source_snowfield)
+"dGw" = (
+/obj/effect/decal/fake_object{
+ density = 1;
+ desc = "Locked during work hours due to safety concerns. Particularly pirate ones.";
+ icon = 'icons/obj/doors/basic/single/generic/door.dmi';
+ icon_state = "preview_glass";
+ name = "Upper Levels Access";
+ dir = 1;
+ pixel_x = -16;
+ pixel_y = -16
+ },
+/turf/simulated/floor/tiled,
+/area/merchant_station)
"dHv" = (
/obj/structure/flora/ausbushes/sparsegrass,
/obj/structure/flora/ausbushes/pointybush,
@@ -37107,6 +36799,15 @@
/obj/effect/floor_decal/spline/fancy/wood/cee,
/turf/simulated/floor/holofloor/grass,
/area/horizon/holodeck/source_battlemonsters)
+"dNo" = (
+/obj/structure/table/reinforced,
+/obj/item/storage/secure/briefcase,
+/obj/machinery/light{
+ dir = 1;
+ icon_state = "tube_empty"
+ },
+/turf/simulated/floor/tiled/dark,
+/area/shuttle/merchant)
"dPA" = (
/obj/effect/floor_decal/spline/plain/corner{
dir = 8
@@ -37124,6 +36825,20 @@
/obj/structure/flora/grass/green,
/turf/simulated/floor/exoplanet/snow,
/area/centcom/shared_dream)
+"dSS" = (
+/obj/machinery/door/airlock/external{
+ frequency = 1337;
+ icon_state = "door_locked";
+ id_tag = "merchant_station_door";
+ locked = 1;
+ req_access = list(110);
+ dir = 1
+ },
+/obj/effect/floor_decal/industrial/warning/cee{
+ dir = 1
+ },
+/turf/simulated/floor/tiled,
+/area/merchant_station/warehouse)
"dXh" = (
/obj/effect/floor_decal/snowdrift/large,
/turf/simulated/floor/exoplanet/snow,
@@ -37178,6 +36893,19 @@
/obj/structure/window/reinforced/holowindow,
/turf/simulated/floor/holofloor/tiled,
/area/horizon/holodeck/source_gym)
+"efY" = (
+/obj/structure/sink{
+ pixel_y = 18
+ },
+/obj/structure/mirror{
+ pixel_y = 33
+ },
+/obj/machinery/light{
+ dir = 4;
+ icon_state = "tube_empty"
+ },
+/turf/simulated/floor/tiled/white,
+/area/merchant_station)
"egX" = (
/obj/structure/flora/rock,
/turf/simulated/floor/exoplanet/barren,
@@ -37269,6 +36997,14 @@
},
/turf/simulated/floor/exoplanet/grass/grove,
/area/centcom/shared_dream)
+"eyE" = (
+/obj/effect/floor_decal/industrial/warning{
+ dir = 6
+ },
+/obj/structure/closet/emcloset,
+/obj/effect/floor_decal/industrial/outline/emergency_closet,
+/turf/simulated/floor/tiled,
+/area/shuttle/merchant)
"eBq" = (
/turf/simulated/floor/holofloor/beach/sand{
icon_state = "desert0"
@@ -37469,6 +37205,12 @@
},
/turf/simulated/floor/exoplanet/barren/raskara,
/area/centcom/shared_dream)
+"fHT" = (
+/obj/structure/toilet{
+ dir = 4
+ },
+/turf/simulated/floor/tiled/white,
+/area/merchant_station)
"fJr" = (
/obj/effect/decal/fake_object{
dir = 4;
@@ -37703,6 +37445,20 @@
},
/turf/simulated/floor/holofloor/snow,
/area/horizon/holodeck/source_adhomai)
+"gwr" = (
+/obj/machinery/door/airlock/external{
+ frequency = 1337;
+ icon_state = "door_locked";
+ id_tag = "merchant_shuttle_hatch";
+ layer = 2.8;
+ name = "Ship External Access";
+ open_layer = 2.8;
+ req_access = list(110);
+ dir = 4
+ },
+/obj/effect/floor_decal/industrial/hatch/yellow,
+/turf/simulated/floor/tiled/dark,
+/area/shuttle/merchant)
"gwW" = (
/turf/simulated/floor/holofloor/beach/sand{
icon_state = "desert3"
@@ -37761,6 +37517,10 @@
/obj/item/flame/candle,
/turf/simulated/floor/holofloor/wood,
/area/horizon/holodeck/source_chapel)
+"gEC" = (
+/obj/structure/closet/secure_closet/merchant,
+/turf/simulated/floor/tiled/dark,
+/area/shuttle/merchant)
"gHp" = (
/obj/structure/shuttle_part/ccia{
icon_state = "3,4"
@@ -38009,6 +37769,37 @@
},
/turf/simulated/floor/marble,
/area/horizon/holodeck/source_trinary)
+"hvO" = (
+/obj/machinery/door/airlock/external{
+ frequency = 1337;
+ icon_state = "door_locked";
+ id_tag = "merchant_station_door";
+ locked = 1;
+ req_access = list(110);
+ dir = 1
+ },
+/obj/effect/shuttle_landmark/merchant/start{
+ dir = 1
+ },
+/obj/effect/floor_decal/industrial/warning/cee,
+/turf/simulated/floor/tiled,
+/area/merchant_station/warehouse)
+"hxG" = (
+/obj/effect/step_trigger/teleporter/random{
+ affect_ghosts = 1;
+ name = "escapeshuttle_leave";
+ teleport_x = 25;
+ teleport_x_offset = 245;
+ teleport_y = 25;
+ teleport_y_offset = 245;
+ teleport_z = 6;
+ teleport_z_offset = 6
+ },
+/obj/effect/shuttle_landmark/mining/transit{
+ dir = 1
+ },
+/turf/space/transit/north,
+/area/template_noop)
"hzT" = (
/obj/structure/table/stone/marble,
/obj/structure/window/reinforced/holowindow{
@@ -38041,6 +37832,16 @@
name = "overgrowth"
},
/area/horizon/holodeck/source_moghes)
+"hRC" = (
+/obj/machinery/door/airlock/silver{
+ hashatch = 0;
+ name = "Bridge";
+ req_access = list(110);
+ dir = 4
+ },
+/obj/effect/floor_decal/industrial/hatch/yellow,
+/turf/simulated/floor/tiled/dark,
+/area/shuttle/merchant)
"hRM" = (
/obj/effect/floor_decal/spline/fancy/wood/corner{
dir = 8
@@ -38326,6 +38127,19 @@
},
/turf/simulated/floor/exoplanet/snow,
/area/centcom/shared_dream)
+"iRU" = (
+/obj/effect/floor_decal/industrial/hatch/yellow,
+/obj/machinery/door/airlock/external{
+ frequency = 1380;
+ icon_state = "door_locked";
+ id_tag = "cargo_shuttle_airlock";
+ locked = 1;
+ name = "Cargo Shuttle";
+ req_access = list(13,31);
+ dir = 1
+ },
+/turf/simulated/floor/tiled/dark,
+/area/supply/dock)
"iTm" = (
/obj/effect/decal/fake_object/light_source/invisible{
light_color = "#64C864";
@@ -38365,6 +38179,24 @@
},
/turf/simulated/floor/holofloor/reinforced,
/area/horizon/holodeck/source_jupiter)
+"iXb" = (
+/obj/machinery/door/airlock/external{
+ frequency = 1337;
+ icon_state = "door_locked";
+ id_tag = "merchant_shuttle_hatch";
+ layer = 2.8;
+ name = "Ship External Access";
+ open_layer = 2.8;
+ req_access = list(110);
+ dir = 1
+ },
+/obj/machinery/door/blast/shutters/open{
+ id = "merchant_airlock";
+ name = "external airlock shutter"
+ },
+/obj/effect/floor_decal/industrial/hatch/yellow,
+/turf/simulated/floor/tiled,
+/area/shuttle/merchant)
"iYs" = (
/obj/effect/floor_decal/corner/red/full{
dir = 8
@@ -38539,6 +38371,22 @@
},
/turf/simulated/floor/carpet/purple,
/area/centcom/shared_dream)
+"juc" = (
+/obj/effect/landmark{
+ name = "LateJoinMerchant"
+ },
+/obj/effect/ghostspawpoint/button{
+ desc = "This button is used for summoning an assistant from the upper floors.";
+ dir = 8;
+ identifier = "MerchantAss";
+ name = "call button";
+ pixel_x = 24;
+ pixel_y = 26;
+ icon = 'icons/obj/airlock_machines.dmi';
+ icon_state = "airlock_control_standby"
+ },
+/turf/simulated/floor/tiled,
+/area/merchant_station)
"jvc" = (
/obj/structure/flora/log_bench{
dir = 8
@@ -38644,12 +38492,6 @@
},
/turf/simulated/floor/holofloor/tiled,
/area/horizon/holodeck/source_thunderdomecourt)
-"jWJ" = (
-/obj/effect/shuttle_landmark/canary/transit{
- dir = 1
- },
-/turf/space/transit/north,
-/area/template_noop)
"kcw" = (
/obj/effect/floor_decal/corner/red/diagonal,
/turf/simulated/floor/marble/dark,
@@ -38702,6 +38544,12 @@
/obj/effect/floor_decal/spline/plain/corner,
/turf/simulated/floor/exoplanet/barren,
/area/centcom/shared_dream)
+"kjZ" = (
+/obj/effect/shuttle_landmark/canary/transit{
+ dir = 1
+ },
+/turf/space/transit/north,
+/area/template_noop)
"klh" = (
/obj/structure/bed/stool/chair/sofa/corner/concave/brown{
dir = 8
@@ -38792,6 +38640,16 @@
/obj/effect/floor_decal/corner/grey/diagonal,
/turf/simulated/floor/marble,
/area/horizon/holodeck/source_trinary)
+"kDv" = (
+/obj/effect/floor_decal/industrial/warning{
+ dir = 5
+ },
+/obj/machinery/light{
+ dir = 4;
+ icon_state = "tube_empty"
+ },
+/turf/simulated/floor/tiled,
+/area/shuttle/merchant)
"kGH" = (
/obj/structure/flora/ausbushes/sparsegrass,
/obj/effect/floor_decal/spline/fancy/wood/corner{
@@ -38896,6 +38754,16 @@
},
/turf/simulated/floor/holofloor/wood,
/area/horizon/holodeck/source_courtroom)
+"kTU" = (
+/obj/machinery/light{
+ dir = 1;
+ icon_state = "tube_empty"
+ },
+/obj/effect/shuttle_landmark/supply/horizon/start{
+ dir = 1
+ },
+/turf/unsimulated/floor/plating,
+/area/centcom/suppy)
"kUJ" = (
/obj/effect/floor_decal/spline/fancy/wood,
/obj/effect/decal/fake_object{
@@ -39022,6 +38890,43 @@
},
/turf/simulated/floor/reinforced,
/area/shuttle/merchant)
+"lxe" = (
+/obj/structure/closet/secure_closet/merchant,
+/obj/machinery/embedded_controller/radio/simple_docking_controller{
+ frequency = 1337;
+ id_tag = "merchant_shuttle";
+ pixel_y = -19;
+ tag_door = "merchant_shuttle_hatch";
+ dir = 1
+ },
+/turf/simulated/floor/tiled/dark,
+/area/shuttle/merchant)
+"lxg" = (
+/obj/structure/closet/secure_closet/merchant,
+/obj/item/device/hand_labeler,
+/obj/item/stack/packageWrap,
+/obj/item/device/price_scanner,
+/obj/structure/window/reinforced{
+ dir = 4
+ },
+/obj/machinery/button/remote/blast_door{
+ id = "merchant_windows";
+ name = "viewing shutters";
+ pixel_x = -7;
+ pixel_y = 25;
+ req_access = null;
+ dir = 1
+ },
+/obj/machinery/button/remote/blast_door{
+ id = "merchant_airlock";
+ name = "external airlock shutter";
+ pixel_x = -7;
+ pixel_y = 35;
+ req_access = null;
+ dir = 1
+ },
+/turf/simulated/floor/wood,
+/area/shuttle/merchant)
"lxi" = (
/obj/effect/decal/fake_object/light_source{
icon = 'icons/effects/props/holodeck/konyang/32x96.dmi';
@@ -40147,6 +40052,12 @@
/obj/structure/table/wood,
/turf/simulated/floor/holofloor/wood,
/area/horizon/holodeck/source_sauna)
+"pMI" = (
+/obj/item/modular_computer/console/preset/merchant{
+ dir = 2
+ },
+/turf/simulated/floor/wood,
+/area/merchant_station/warehouse)
"pRF" = (
/obj/effect/floor_decal/snowdrift{
dir = 1
@@ -40338,6 +40249,9 @@
},
/turf/simulated/floor/holofloor/carpet,
/area/horizon/holodeck/source_biesel)
+"qMQ" = (
+/turf/simulated/floor/tiled/white,
+/area/merchant_station)
"qNQ" = (
/obj/structure/table/wood,
/obj/effect/floor_decal/spline/fancy/wood,
@@ -40380,6 +40294,13 @@
},
/turf/simulated/floor/holofloor/carpet,
/area/horizon/holodeck/source_meetinghall)
+"qVG" = (
+/obj/effect/step_trigger/thrower/shuttle/north,
+/obj/effect/shuttle_landmark/intrepid/transit{
+ dir = 1
+ },
+/turf/space/transit/north,
+/area/template_noop)
"qXZ" = (
/obj/effect/floor_decal/spline/fancy/wood{
dir = 4
@@ -40387,6 +40308,16 @@
/obj/structure/railing/mapped,
/turf/simulated/floor/holofloor/wood,
/area/horizon/holodeck/source_theatre)
+"qYm" = (
+/obj/effect/floor_decal/industrial/warning{
+ dir = 4
+ },
+/obj/machinery/atm{
+ dir = 4;
+ pixel_x = 16
+ },
+/turf/simulated/floor/tiled,
+/area/shuttle/merchant)
"rbx" = (
/turf/simulated/floor/exoplanet/water/shallow{
dir = 1;
@@ -41226,6 +41157,17 @@
name = "shallow water"
},
/area/horizon/holodeck/source_konyang)
+"uEo" = (
+/obj/structure/table/reinforced,
+/obj/machinery/button/remote/blast_door{
+ dir = 10;
+ id = "merchant_bridge";
+ name = "bridge window shutters";
+ pixel_x = -6;
+ pixel_y = 0
+ },
+/turf/simulated/floor/carpet/blue,
+/area/shuttle/merchant)
"uFh" = (
/obj/effect/floor_decal/corner/red{
dir = 9
@@ -41280,6 +41222,19 @@
icon_state = "desert"
},
/area/centcom/shared_dream)
+"uSI" = (
+/obj/machinery/light{
+ dir = 4;
+ icon_state = "tube_empty"
+ },
+/obj/effect/floor_decal/industrial/warning{
+ dir = 8
+ },
+/obj/effect/floor_decal/industrial/warning{
+ dir = 4
+ },
+/turf/simulated/floor/tiled,
+/area/merchant_station/warehouse)
"uUV" = (
/obj/effect/floor_decal/spline/plain/corner,
/turf/simulated/floor/exoplanet/grass/grove,
@@ -41553,6 +41508,30 @@
icon_state = "water"
},
/area/horizon/holodeck/source_moghes)
+"wbR" = (
+/obj/item/storage/secure/safe{
+ pixel_x = 8;
+ pixel_y = 36
+ },
+/obj/structure/bed/stool/padded/brown,
+/obj/machinery/button/remote/blast_door{
+ id = "merchant_windows";
+ name = "viewing shutters";
+ pixel_x = -7;
+ pixel_y = 25;
+ req_access = null;
+ dir = 1
+ },
+/obj/machinery/button/remote/blast_door{
+ id = "merchant_airlock";
+ name = "external airlock shutter";
+ pixel_x = -7;
+ pixel_y = 35;
+ req_access = null;
+ dir = 1
+ },
+/turf/simulated/floor/tiled/dark,
+/area/shuttle/merchant)
"wcr" = (
/obj/effect/floor_decal/corner/yellow,
/turf/simulated/floor/marble/dark,
@@ -41703,6 +41682,14 @@
/obj/effect/floor_decal/corner/white,
/turf/simulated/floor/holofloor/tiled,
/area/horizon/holodeck/source_battlemonsters)
+"wWR" = (
+/obj/structure/table/reinforced,
+/obj/item/storage/wallet/random,
+/obj/machinery/light{
+ icon_state = "tube_empty"
+ },
+/turf/simulated/floor/tiled/dark,
+/area/shuttle/merchant)
"wXq" = (
/obj/structure/table/wood,
/obj/effect/floor_decal/carpet{
@@ -41908,6 +41895,12 @@
},
/turf/simulated/floor/holofloor/tiled,
/area/horizon/holodeck/source_emptycourt)
+"xND" = (
+/obj/structure/window/reinforced/crescent{
+ dir = 1
+ },
+/turf/simulated/wall/shuttle/scc,
+/area/supply/dock)
"xNG" = (
/obj/effect/floor_decal/spline/plain{
dir = 1
@@ -51327,7 +51320,7 @@ aQJ
anh
aQJ
aPv
-adc
+xND
aMt
aOi
aNR
@@ -51831,8 +51824,8 @@ axj
jqV
aJs
aNR
-abs
-anj
+kTU
+iRU
anf
anf
anf
@@ -52355,7 +52348,7 @@ aQJ
aQK
aQJ
ani
-adc
+xND
aMt
aOi
aNR
@@ -55532,7 +55525,7 @@ aac
aab
aac
aac
-jWJ
+kjZ
aac
aac
aac
@@ -65938,9 +65931,9 @@ amF
amF
ats
ats
-adb
-adb
-adb
+abs
+abs
+abs
ats
ats
amF
@@ -72736,7 +72729,7 @@ aab
aac
aac
aac
-ank
+qVG
aac
aac
aac
@@ -78341,7 +78334,7 @@ bFg
bFg
bFg
bFg
-bIK
+bFg
bFg
bFg
bFg
@@ -79107,8 +79100,7 @@ bFg
bFg
bFg
bFg
-bFg
-bHF
+bHt
bFg
bFg
bFg
@@ -79116,9 +79108,10 @@ bFg
bFg
bFg
bFg
-bHE
bFg
bFg
+bJw
+bFg
bFg
bFg
bFg
@@ -79364,8 +79357,9 @@ bFg
bFg
bFg
bFg
+bHt
bFg
-bHF
+cVH
bFg
bFg
bFg
@@ -79373,8 +79367,7 @@ bFg
bFg
bFg
bFg
-bHE
-bFg
+bJw
bFg
bFg
bFg
@@ -85274,7 +85267,7 @@ aac
aac
aac
aac
-act
+hxG
aac
aac
aac
@@ -95728,7 +95721,7 @@ bix
bix
bix
bix
-add
+adc
bnq
boZ
bpJ
@@ -95937,7 +95930,7 @@ eKp
tbb
atA
atX
-auW
+uEo
fEN
sLS
aaa
@@ -95985,7 +95978,7 @@ bix
bix
bix
bix
-add
+adc
bnr
bnr
bta
@@ -96191,11 +96184,11 @@ aaa
aaa
aaa
asM
-asJ
+dNo
atM
atY
atM
-avI
+wWR
aAH
aaa
aaa
@@ -96448,11 +96441,11 @@ aaa
aaa
aaa
aAe
-asK
+wbR
atM
atM
atM
-avJ
+gEC
aAe
aaa
aaa
@@ -96709,7 +96702,7 @@ asL
atN
atZ
atZ
-avP
+lxe
aAe
aAe
aaa
@@ -96959,12 +96952,12 @@ aaa
aaa
aaa
aam
-aam
+aaa
apk
aAe
aAe
aAe
-aua
+hRC
aAe
aAe
aAe
@@ -97216,7 +97209,7 @@ ayX
aam
aam
aam
-aam
+aaa
aaa
aAe
asP
@@ -97992,7 +97985,7 @@ aaa
aoc
asO
atP
-auI
+atZ
auZ
avT
amV
@@ -99008,7 +99001,7 @@ anx
aoa
apf
amd
-arz
+pMI
arM
arP
avN
@@ -99515,8 +99508,8 @@ aam
aam
aam
ajR
-ald
-amj
+cNj
+fHT
ajR
anp
aob
@@ -99532,7 +99525,7 @@ axc
amd
aaa
aAe
-asU
+lxg
atT
auT
avd
@@ -99772,8 +99765,8 @@ aam
aam
aam
ajR
-alL
-aoj
+efY
+qMQ
ajR
any
aob
@@ -99791,7 +99784,7 @@ aaa
aAe
aAe
aAe
-auU
+gwr
asH
aAe
aAe
@@ -100046,7 +100039,7 @@ rCq
amd
amd
amd
-aAg
+aAe
atU
avY
ave
@@ -100300,10 +100293,10 @@ atJ
auP
axf
axf
-axZ
-azc
-afo
-asV
+dSS
+uSI
+hvO
+iXb
anB
atV
avG
@@ -100560,10 +100553,10 @@ axf
amd
amd
amd
-aAg
-atW
-auV
-avH
+aAe
+kDv
+qYm
+eyE
aAe
aaa
aaa
@@ -103114,8 +103107,8 @@ ajR
akB
alc
alJ
-amh
-amI
+dGw
+juc
aoj
aok
anr