Adds a new spawnpoint to spacefarers, the fuel depot. (#8850)

code/game/objects/effects/landmarks.dm

@@ -46,6 +46,10 @@
 			GLOB.latejoin_plainspath += loc
 			delete_me = 1
 			return
+		if("JoinLateFuelDepot")
+			GLOB.latejoin_fueldepot += loc
+			delete_me = 1
+			return
 		//CHOMPEdit End
 		if("JoinLateElevator")
 			latejoin_elevator += loc

maps/southern_cross/overmap/space/fueldepot.dm

@@ -25,8 +25,9 @@
 	icon_state = "fueldepot_g"
 	unknown_state = "station"
 	known = TRUE
-	start_x  = 10 // Future note: remove these two vars if we ever want this to have a random spawn location on the overmap.
+	//start_x  = 10 // Future note: remove these two vars if we ever want this to have a random spawn location on the overmap. //Yes c:
-	start_y  = 11
+	//start_y  = 11
+	docking_codes = null
 
 
 // -- Areas -- //
@@ -37,6 +38,12 @@
 	icon_state = "dark"
 	lightswitch = FALSE
 
+/area/sc_away/fueldepotspawn
+	name = "Away Mission - Fuel Depot Sleeping Quarters"
+	icon = 'icons/turf/areas_vr.dmi'
+	icon_state = "dark"
+	lightswitch = TRUE
+
 
 // -- Landmarks -- //
 

maps/southern_cross/southern_cross_defines.dm

@@ -104,7 +104,7 @@ but they don't actually change anything about the load order
 							NETWORK_SUPPLY
 							)
 	usable_email_tlds = list("freemail.nt")
-	allowed_spawns = list("Arrivals Shuttle","Gateway", "Cryogenic Storage", "Cyborg Storage", "Station gateway", "Sif plains")
+	allowed_spawns = list("Arrivals Shuttle","Gateway", "Cryogenic Storage", "Cyborg Storage", "Station gateway", "Sif plains", "Fuel Depot")
 	default_skybox = /datum/skybox_settings/southern_cross
 	unit_test_exempt_areas = list(/area/ninja_dojo, /area/shuttle/ninja)
 	unit_test_exempt_from_atmos = list(/area/tcomm/chamber)

modular_chomp/code/global.dm

@@ -4,6 +4,7 @@ GLOBAL_LIST_INIT(shell_module_blacklist, list(
 	))
 GLOBAL_LIST_EMPTY(latejoin_gatewaystation)
 GLOBAL_LIST_EMPTY(latejoin_plainspath)
+GLOBAL_LIST_EMPTY(latejoin_fueldepot)
 
 var/list/talk_sound_map = rlist(
 								list(

modular_chomp/code/modules/client/preferences_spawnpoints.dm

@@ -32,3 +32,12 @@
 /datum/spawnpoint/plainspath/New()
 	..()
 	turfs = GLOB.latejoin_plainspath
+
+/datum/spawnpoint/fueldepot
+	display_name = "Fuel Depot"
+	msg = "woke up in the fuel depot"
+	restrict_job = list(JOB_OUTSIDER)
+
+/datum/spawnpoint/fueldepot/New()
+	..()
+	turfs = GLOB.latejoin_fueldepot

modular_chomp/maps/overmap/om_ships/cybershuttle-10x11.dmm

@@ -4,7 +4,7 @@
 /area/template_noop)
 "c" = (
 /obj/machinery/computer/ship/helm{
-	req_one_access = newlist()
+	req_one_access = null
 	},
 /turf/simulated/floor/tiled/techfloor,
 /area/shuttle/cybershuttle)
@@ -13,6 +13,12 @@
 /obj/fruitspawner/watermelon,
 /obj/item/device/gps/explorer,
 /obj/item/device/gps/explorer,
+/obj/structure/closet/walllocker_double/east,
+/obj/item/weapon/gun/projectile/garand,
+/obj/item/ammo_magazine/clip/medium,
+/obj/item/ammo_magazine/clip/medium,
+/obj/item/ammo_magazine/clip/medium,
+/obj/item/weapon/storage/firstaid/regular,
 /turf/simulated/floor/tiled/techfloor,
 /area/shuttle/cybershuttle)
 "e" = (
@@ -26,18 +32,27 @@
 	},
 /obj/effect/map_helper/airlock/door/ext_door,
 /obj/machinery/airlock_sensor/airlock_exterior/shuttle{
-	dir = 6;
+	dir = 4;
 	pixel_y = 25
 	},
 /obj/effect/map_helper/airlock/sensor/ext_sensor,
 /turf/simulated/floor/plating,
 /area/shuttle/cybershuttle)
+"f" = (
+/obj/machinery/ion_engine{
+	dir = 1
+	},
+/obj/structure/window/plastitanium{
+	dir = 4
+	},
+/turf/simulated/shuttle/plating/airless/carry,
+/area/shuttle/cybershuttle)
 "g" = (
 /turf/simulated/floor/tiled/techfloor,
 /area/shuttle/cybershuttle)
 "h" = (
 /obj/machinery/computer/ship/engines{
-	dir = 1
+	dir = 4
 	},
 /turf/simulated/floor/tiled/techfloor,
 /area/shuttle/cybershuttle)
@@ -45,28 +60,24 @@
 /obj/machinery/ion_engine{
 	dir = 1
 	},
-/obj/structure/window/plastitanium{
-	dir = 8
-	},
 /turf/simulated/shuttle/plating/airless/carry,
 /area/shuttle/cybershuttle)
 "k" = (
 /obj/machinery/light,
-/obj/machinery/atmospherics/pipe/tank/air/full{
+/obj/machinery/atmospherics/portables_connector{
-	start_pressure = 10000
+	dir = 2
 	},
+/obj/machinery/portable_atmospherics/canister/air/airlock,
 /turf/simulated/floor/tiled/techfloor,
 /area/shuttle/cybershuttle)
 "l" = (
 /turf/simulated/wall/rthull,
 /area/shuttle/cybershuttle)
 "m" = (
-/obj/machinery/power/terminal{
-	dir = 2
-	},
 /obj/structure/cable/yellow{
+	d1 = 2;
 	d2 = 4;
-	icon_state = "0-4"
+	icon_state = "2-4"
 	},
 /turf/simulated/floor/tiled/techfloor,
 /area/shuttle/cybershuttle)
@@ -81,6 +92,10 @@
 /area/shuttle/cybershuttle)
 "q" = (
 /obj/machinery/computer/shuttle_control/explore/cybershuttle,
+/obj/structure/cable/yellow{
+	d2 = 4;
+	icon_state = "0-4"
+	},
 /turf/simulated/floor/tiled/techfloor,
 /area/shuttle/cybershuttle)
 "r" = (
@@ -139,6 +154,28 @@
 	},
 /turf/simulated/floor/plating,
 /area/shuttle/cybershuttle)
+"C" = (
+/obj/structure/table/survival_pod,
+/obj/item/glass_jar{
+	pixel_y = 13;
+	pixel_x = 6
+	},
+/obj/random/action_figure{
+	pixel_y = -4;
+	pixel_x = -9
+	},
+/obj/item/weapon/dice/d20,
+/obj/item/weapon/deck/tarot,
+/obj/item/weapon/material/sword/katana{
+	pixel_y = -4;
+	pixel_x = 5
+	},
+/obj/item/clothing/head/fedora{
+	pixel_x = -4;
+	pixel_y = 10
+	},
+/turf/simulated/floor/tiled/techfloor,
+/area/shuttle/cybershuttle)
 "D" = (
 /obj/structure/window/plastitanium/full,
 /obj/structure/grille/rustic{
@@ -169,18 +206,12 @@
 	},
 /turf/simulated/floor/tiled/techfloor,
 /area/shuttle/cybershuttle)
-"P" = (
+"Q" = (
 /obj/machinery/ion_engine{
 	dir = 1
 	},
 /obj/structure/window/plastitanium{
-	dir = 4
+	dir = 8
-	},
-/turf/simulated/shuttle/plating/airless/carry,
-/area/shuttle/cybershuttle)
-"Q" = (
-/obj/machinery/ion_engine{
-	dir = 1
 	},
 /turf/simulated/shuttle/plating/airless/carry,
 /area/shuttle/cybershuttle)
@@ -247,6 +278,13 @@
 	},
 /turf/simulated/floor/plating,
 /area/shuttle/cybershuttle)
+"Z" = (
+/obj/machinery/power/terminal{
+	dir = 2
+	},
+/obj/structure/cable/yellow,
+/turf/simulated/floor/tiled/techfloor,
+/area/shuttle/cybershuttle)
 
 (1,1,1) = {"
 a
@@ -269,10 +307,10 @@ a
 a
 a
 a
+a
 T
 l
-j
+Q
-a
 "}
 (3,1,1) = {"
 a
@@ -284,8 +322,8 @@ l
 W
 l
 l
-Q
+l
-a
+j
 "}
 (4,1,1) = {"
 a
@@ -295,10 +333,10 @@ J
 g
 F
 g
+C
 h
 l
 l
-a
 "}
 (5,1,1) = {"
 a
@@ -309,9 +347,9 @@ g
 g
 g
 m
+Z
 o
-Q
+j
-a
 "}
 (6,1,1) = {"
 a
@@ -322,9 +360,9 @@ g
 S
 t
 r
+g
 z
-Q
+j
-a
 "}
 (7,1,1) = {"
 a
@@ -337,7 +375,7 @@ R
 w
 l
 l
-a
+l
 "}
 (8,1,1) = {"
 a
@@ -349,8 +387,8 @@ l
 e
 l
 l
-Q
+l
-a
+j
 "}
 (9,1,1) = {"
 a
@@ -360,10 +398,10 @@ a
 a
 a
 a
+a
 y
 l
-P
+f
-a
 "}
 (10,1,1) = {"
 a

modular_chomp/maps/overmap/om_ships/metawhiteship.dm

@@ -0,0 +1,87 @@
+// Compile in the map for CI testing if we're testing compileability of all the maps
+#if MAP_TEST
+#include "metawhiteship30x21.dmm"
+#endif
+
+// Map template for spawning the shuttle
+/datum/map_template/om_ships/metawhiteship
+	name = "OM Ship - Meta White Ship"
+	desc = "A small privately-owned vessel."
+	mappath = 'metawhiteship30x21.dmm'
+	annihilate = TRUE
+
+// The shuttle's area(s)
+
+/area/shuttle/metawhiteship
+	name = "\improper MetaMaterial Salvage Ship"
+	ambience = AMBIENCE_HANGAR
+	icon_state = "shuttle2"
+	requires_power = TRUE
+	has_gravity = TRUE
+
+/area/shuttle/metawhiteship/gen
+	name = "\improper MetaMaterial Salvage Ship - Living Quarters"
+	icon_state = "shuttle2"
+/area/shuttle/metawhiteship/eng
+	name = "\improper MetaMaterial Salvage Ship - Engineering"
+	icon_state = "shuttle2"
+
+/area/shuttle/metawhiteship/cargo
+	name = "\improper MetaMaterial Salvage Ship - Cargo Bay"
+	icon_state = "shuttle2"
+
+/area/shuttle/metawhiteship/food
+	name = "\improper MetaMaterial Salvage Ship - Recreational Lounge"
+	icon_state = "shuttle2"
+
+/area/shuttle/metawhiteship/bridge
+	name = "\improper MetaMaterial Salvage Ship - Bridge"
+	ambience = AMBIENCE_HIGHSEC
+	icon_state = "shuttle2"
+// The shuttle's 'shuttle' computer
+/obj/machinery/computer/shuttle_control/explore/metawhiteship
+	name = "short jump console"
+	shuttle_tag = "MetaMaterial Salvage Ship" //These names must match
+	req_one_access = null
+
+// A shuttle lateloader landmark
+/obj/effect/shuttle_landmark/shuttle_initializer/metawhiteship
+	name = "Origin - MetaMaterial Salvage Ship"
+	base_area = /area/space
+	base_turf = /turf/space
+	landmark_tag = "omship_spawn_metawhiteship"
+	shuttle_type = /datum/shuttle/autodock/overmap/metawhiteship
+
+// The 'shuttle'
+/datum/shuttle/autodock/overmap/metawhiteship
+	name = "MetaMaterial Salvage Ship" //These names must match
+	current_location = "omship_spawn_metawhiteship"
+	docking_controller_tag = "metawhiteship_docker" //This is the only thing you map in and var edit, use the map helpers to designate doors and pumps
+	shuttle_area = list(	/area/shuttle/metawhiteship/gen,
+					/area/shuttle/metawhiteship/cargo,
+					/area/shuttle/metawhiteship/food,
+					/area/shuttle/metawhiteship/bridge,
+					/area/shuttle/metawhiteship/eng
+					)
+	defer_initialisation = TRUE //We're not loaded until an admin does it
+
+// The 'ship'
+/obj/effect/overmap/visitable/ship/landable/metawhiteship
+	name = "MetaMaterial Salvage Ship" //These names must match
+	scanner_desc = @{"[i]Registration[/i]: PRIVATE
+[i]Class[/i]: Small Shuttle
+[i]Transponder[/i]: Transmitting (CIV), non-hostile
+[b]Notice[/b]: Small private vessel"}
+	vessel_mass = 2250
+	vessel_size = SHIP_SIZE_SMALL
+	shuttle = "MetaMaterial Salvage Ship" //These names must match
+	fore_dir = EAST
+	known = FALSE
+
+/datum/map_template/shelter/superpose/metawhiteship
+	shelter_id = "MetaWhiteShip"
+	mappath = 'metawhiteship30x21.dmm'
+	name = "MetaMaterial Salvage Ship"
+	description = "A medium size salvage whiteship"
+	superpose = FALSE
+	shuttle = TRUE

modular_chomp/maps/overmap/om_ships/offmap.dm

@@ -13,3 +13,4 @@
 #include "cruiser.dm"
 #include "pizzashuttle.dm"
 #include "cybershuttle.dm"
+#include "metawhiteship.dm"

modular_chomp/maps/overmap/om_ships/pizzashuttle.dm

@@ -48,6 +48,7 @@
 	vessel_mass = 900 //YEET
 	vessel_size = SHIP_SIZE_TINY
 	shuttle = "Pizza Gut" //These names must match
+	known = FALSE
 
 /datum/map_template/shelter/superpose/pizzashuttle
 	shelter_id = "PizzaShuttle"

modular_chomp/maps/overmap/om_ships/sdf_corvettes.dm

@@ -18,7 +18,7 @@
 	mappath = 'sdf_corvette_wreck.dmm'
 	annihilate = TRUE
 
-/datum/map_template/om_ships/sdf_corvette
+/datum/map_template/om_ships/sdf_corvette_wreck
 	name = "OM Ship - SDF Cutter (new Z)"
 	desc = "A small SDF cutter, outfitted with an ORB/OFD."
 	mappath = 'sdf_cutter.dmm'

modular_chomp/maps/overmap/om_ships/whiteship-26x33.dmm

@@ -67,9 +67,6 @@
 "cu" = (
 /obj/item/weapon/towel/random,
 /obj/item/weapon/towel/random,
-/obj/machinery/door/airlock/glass_science{
-	id_tag = "stop_opening_this_you_idiots"
-	},
 /turf/simulated/floor/wood,
 /area/shuttle/whiteshipOM2)
 "cw" = (
@@ -87,7 +84,8 @@
 /obj/machinery/door/firedoor/border_only,
 /obj/effect/map_helper/airlock/sensor/int_sensor,
 /obj/machinery/airlock_sensor{
-	pixel_y = 25
+	pixel_y = 25;
+	dir = 8
 	},
 /turf/simulated/floor/plating,
 /area/shuttle/whiteshipOM2)
@@ -229,7 +227,7 @@
 	pixel_y = -25
 	},
 /turf/template_noop,
-/area/shuttle/whiteshipOM2)
+/area/template_noop)
 "iQ" = (
 /obj/structure/table/wooden_reinforced,
 /obj/structure/flora/pottedplant/smallcactus{
@@ -294,7 +292,8 @@
 	},
 /obj/machinery/embedded_controller/radio/airlock/docking_port{
 	id_tag = "whiteship_docker2";
-	pixel_y = 25
+	pixel_y = 25;
+	frequency = 1380
 	},
 /obj/effect/floor_decal/industrial/warning{
 	dir = 5
@@ -442,9 +441,6 @@
 	},
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/shuttle/whiteshipOM2)
-"oX" = (
-/turf/template_noop,
-/area/shuttle/whiteshipOM2)
 "pk" = (
 /obj/machinery/atmospherics/binary/pump,
 /obj/machinery/atmospherics/pipe/simple/hidden{
@@ -1204,7 +1200,7 @@
 	},
 /obj/effect/map_helper/airlock/sensor/ext_sensor,
 /obj/machinery/airlock_sensor/airlock_exterior/shuttle{
-	dir = 6;
+	dir = 4;
 	pixel_y = 25
 	},
 /turf/simulated/floor/plating,
@@ -1638,7 +1634,7 @@
 	},
 /obj/effect/floor_decal/industrial/warning/corner,
 /obj/machinery/power/emitter{
-	dir = 1
+	dir = 4
 	},
 /turf/simulated/floor/tiled/techfloor,
 /area/shuttle/whiteshipOM2)
@@ -1720,7 +1716,8 @@
 	pixel_y = 13;
 	req_access = null;
 	pixel_x = -24;
-	dir = 4
+	dir = 4;
+	specialfunctions = 4
 	},
 /turf/simulated/floor/tiled/techmaint,
 /area/shuttle/whiteshipOM2)
@@ -1938,7 +1935,8 @@
 	},
 /obj/machinery/airlock_sensor{
 	frequency = 1380;
-	pixel_y = -28
+	pixel_y = -28;
+	dir = 1
 	},
 /obj/effect/map_helper/airlock/atmos/chamber_pump,
 /obj/effect/map_helper/airlock/sensor/chamber_sensor,
@@ -2927,15 +2925,15 @@ Eq
 (22,1,1) = {"
 Eq
 sH
-oX
+Eq
-oX
+Eq
-oX
+Eq
-oX
+Eq
-oX
+Eq
-oX
+Eq
-oX
+Eq
-oX
+Eq
-oX
+Eq
 iv
 sH
 sH
@@ -2946,16 +2944,16 @@ sH
 WL
 sH
 sH
-oX
+Eq
-oX
+Eq
-oX
+Eq
-oX
+Eq
-oX
+Eq
-oX
+Eq
-oX
+Eq
-oX
+Eq
-oX
+Eq
-oX
+Eq
 sH
 Eq
 "}