Merchant shuttle landmarks updated to newest standard (#17378)

* huhh

* a

* a

---------

Co-authored-by: DreamySkrell <>

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."

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 //-//
 

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