Orion Mobile Station Revamp

html/changelogs/Ben10083 - Orion Ship Revamp.yml

@@ -0,0 +1,58 @@
+################################
+# 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
+#     - (fixes bugs)
+#   wip
+#     - (work in progress)
+#   qol
+#     - (quality of life)
+#   soundadd
+#     - (adds a sound)
+#   sounddel
+#     - (removes a sound)
+#   rscadd
+#     - (adds a feature)
+#   rscdel
+#     - (removes a feature)
+#   imageadd
+#     - (adds an image or sprite)
+#   imagedel
+#     - (removes an image or sprite)
+#   spellcheck
+#     - (fixes spelling or grammar)
+#   experiment
+#     - (experimental change)
+#   balance
+#     - (balance changes)
+#   code_imp
+#     - (misc internal code change)
+#   refactor
+#     - (refactors code)
+#   config
+#     - (makes a change to the config files)
+#   admin
+#     - (makes changes to administrator tools)
+#   server
+#     - (miscellaneous changes to server)
+#################################
+
+# Your name.
+author: Ben10083
+
+# 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, this gets changed to [] after reading.  Just remove the brackets when you add new shit.
+# Please surround your changes in  double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog.
+changes:
+  - rscadd: "Various improvements to the Orion Express mobile station, including new docking arms for docking in all directions."

maps/away/ships/orion/orion_express_ship.dm

@@ -85,6 +85,16 @@
 	ambience = AMBIENCE_MAINTENANCE
 	icon_state = "engine"
 
+/area/ship/orion/docking1
+	name = "Primary Docking Arm"
+	ambience = AMBIENCE_GENERIC
+	icon_state = "exit"
+
+/area/ship/orion/docking2
+	name = "Secondary Docking Arm"
+	ambience = AMBIENCE_GENERIC
+	icon_state = "exit"
+
 // Shuttle
 /area/shuttle/orion_shuttle/
 	requires_power = TRUE
@@ -136,7 +146,12 @@
 	initial_generic_waypoints = list(
 		"nav_orion_express_ship_1",
 		"nav_orion_express_ship_2",
-		"nav_orion_express_ship_3"
+		"nav_orion_express_ship_3",
+		"nav_orion_express_ship_4",
+		"nav_orion_express_ship_dock_aft",
+		"nav_orion_express_ship_dock_fore",
+		"nav_orion_express_ship_dock_port",
+		"nav_orion_express_ship_dock_starboard"
 	)
 
 	invisible_until_ghostrole_spawn = TRUE
@@ -158,23 +173,83 @@
 	base_area = /area/space
 
 /obj/effect/shuttle_landmark/orion_express_ship/nav2
-	name = "Orion Express Mobile Station - Port Airlock"
+	name = "Orion Express Mobile Station - Starboard Side"
 	landmark_tag = "nav_orion_express_ship_2"
 	base_turf = /turf/space/dynamic
 	base_area = /area/space
 
 /obj/effect/shuttle_landmark/orion_express_ship/nav3
-	name = "Orion Express Mobile Station - Aft Airlock"
+	name = "Orion Express Mobile Station - Fore Side"
 	landmark_tag = "nav_orion_express_ship_3"
-	docking_controller = "orion_traveler_port"
+	base_turf = /turf/space/dynamic
 	base_area = /area/space
+
+/obj/effect/shuttle_landmark/orion_express_ship/nav4
+	name = "Orion Express Mobile Station - Aft Side"
+	landmark_tag = "nav_orion_express_ship_4"
 	base_turf = /turf/space/dynamic
+	base_area = /area/space
 
 /obj/effect/shuttle_landmark/orion_express_ship/transit
 	name = "In transit"
 	landmark_tag = "nav_transit_orion_express_ship"
 	base_turf = /turf/space/transit/north
 
+// Docks
+
+/obj/effect/map_effect/marker/airlock/docking/orion_express_ship/shuttle
+	name = "Orion Express Mobile Station - Shuttle Dock"
+	landmark_tag = "nav_orion_express_ship_dock_shuttle"
+	master_tag = "orion_traveler_shuttle"
+
+/obj/effect/shuttle_landmark/orion_express_ship/aft
+	name = "Orion Express Mobile Station - Aft Dock"
+	landmark_tag = "nav_orion_express_ship_dock_aft"
+	docking_controller = "orion_traveler_port_aft"
+	base_area = /area/space
+	base_turf = /turf/space/dynamic
+
+/obj/effect/map_effect/marker/airlock/docking/orion_express_ship/aft
+	name = "Orion Express Mobile Station - Aft Dock"
+	landmark_tag = "nav_orion_express_ship_dock_aft"
+	master_tag = "orion_traveler_port_aft"
+
+/obj/effect/shuttle_landmark/orion_express_ship/fore
+	name = "Orion Express Mobile Station - Fore Dock"
+	landmark_tag = "nav_orion_express_ship_dock_fore"
+	docking_controller = "orion_traveler_port_fore"
+	base_area = /area/space
+	base_turf = /turf/space/dynamic
+
+/obj/effect/map_effect/marker/airlock/docking/orion_express_ship/fore
+	name = "Orion Express Mobile Station - Fore Dock"
+	landmark_tag = "nav_orion_express_ship_dock_fore"
+	master_tag = "orion_traveler_port_fore"
+
+/obj/effect/shuttle_landmark/orion_express_ship/starboard
+	name = "Orion Express Mobile Station - Starboard Dock"
+	landmark_tag = "nav_orion_express_ship_dock_starboard"
+	docking_controller = "orion_traveler_port_starboard"
+	base_area = /area/space
+	base_turf = /turf/space/dynamic
+
+/obj/effect/map_effect/marker/airlock/docking/orion_express_ship/starboard
+	name = "Orion Express Mobile Station - Starboard Dock"
+	landmark_tag = "nav_orion_express_ship_dock_starboard"
+	master_tag = "orion_traveler_port_starboard"
+
+/obj/effect/shuttle_landmark/orion_express_ship/port
+	name = "Orion Express Mobile Station - Port Dock"
+	landmark_tag = "nav_orion_express_ship_dock_port"
+	docking_controller = "orion_traveler_port_port"
+	base_area = /area/space
+	base_turf = /turf/space/dynamic
+
+/obj/effect/map_effect/marker/airlock/docking/orion_express_ship/port
+	name = "Orion Express Mobile Station - Port Dock"
+	landmark_tag = "nav_orion_express_ship_dock_port"
+	master_tag = "orion_traveler_port_port"
+
 //shuttle stuff
 /obj/effect/overmap/visitable/ship/landable/orion_express_shuttle
 	name = "Orion Express Shuttle"
@@ -211,7 +286,7 @@
 /obj/effect/shuttle_landmark/orion_express_shuttle/hangar
 	name = "Orion Express Shuttle Hangar"
 	landmark_tag = "nav_hangar_orion_express"
-	docking_controller = "orion_traveler_n_port"
+	docking_controller = "orion_traveler_shuttle"
 	base_turf = /turf/space/dynamic
 	base_area = /area/space