From 40ea5a30affa057faa2a28ab8446da2bcf3dcb0d Mon Sep 17 00:00:00 2001
From: thgvr <81882910+thgvr@users.noreply.github.com>
Date: Thu, 30 May 2024 19:19:01 -0700
Subject: [PATCH] Disable roundstart ships (#2822)

<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request
This system circumvents our design as well as timelocks
<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

## Changelog

:cl:
add: Roundstart ships no longer spawn
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->
---
 _maps/configs/independent_beluga.json     | 1 -
 _maps/configs/independent_dwayne.json     | 1 -
 _maps/configs/independent_mudskipper.json | 1 -
 _maps/configs/independent_rigger.json     | 1 -
 _maps/configs/independent_shetland.json   | 1 -
 _maps/configs/nanotrasen_skipper.json     | 1 -
 code/controllers/subsystem/overmap.dm     | 6 ++++--
 7 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/_maps/configs/independent_beluga.json b/_maps/configs/independent_beluga.json
index 64230b0dc797..6d7926a8e845 100644
--- a/_maps/configs/independent_beluga.json
+++ b/_maps/configs/independent_beluga.json
@@ -13,7 +13,6 @@
 	],
 	"starting_funds": 4000,
 	"limit": 2,
-	"roundstart": true,
 	"job_slots": {
 		"Captain": {
 			"outfit": "/datum/outfit/job/independent/captain",
diff --git a/_maps/configs/independent_dwayne.json b/_maps/configs/independent_dwayne.json
index 1cd4a3683f0f..64f68af68752 100644
--- a/_maps/configs/independent_dwayne.json
+++ b/_maps/configs/independent_dwayne.json
@@ -15,7 +15,6 @@
 		"Mining",
 		"Generalist"
 	],
-	"roundstart": true,
 	"limit": 1,
 	"job_slots": {
 		"Captain": {
diff --git a/_maps/configs/independent_mudskipper.json b/_maps/configs/independent_mudskipper.json
index 1dfd48861d13..9f4cf32e0cf8 100644
--- a/_maps/configs/independent_mudskipper.json
+++ b/_maps/configs/independent_mudskipper.json
@@ -14,7 +14,6 @@
 		"SPACE"
 	],
 	"map_path": "_maps/shuttles/independent/independent_mudskipper.dmm",
-	"roundstart": true,
 	"limit": 2,
 	"starting_funds": 1500,
 	"job_slots": {
diff --git a/_maps/configs/independent_rigger.json b/_maps/configs/independent_rigger.json
index 3550773cc0e4..e36b57ca750a 100644
--- a/_maps/configs/independent_rigger.json
+++ b/_maps/configs/independent_rigger.json
@@ -15,7 +15,6 @@
 		"Generalist"
 	],
 	"map_path": "_maps/shuttles/independent/independent_rigger.dmm",
-	"roundstart": true,
 	"limit": 1,
 	"job_slots": {
 		"Captain": {
diff --git a/_maps/configs/independent_shetland.json b/_maps/configs/independent_shetland.json
index 344f9a99ee50..de5873f80d75 100644
--- a/_maps/configs/independent_shetland.json
+++ b/_maps/configs/independent_shetland.json
@@ -14,7 +14,6 @@
 	],
 	"map_path": "_maps/shuttles/independent/independent_shetland.dmm",
 	"map_id": "independent_shetland",
-	"roundstart": true,
 	"job_slots": {
 		"Captain": {
 			"outfit": "/datum/outfit/job/independent/captain/cheap",
diff --git a/_maps/configs/nanotrasen_skipper.json b/_maps/configs/nanotrasen_skipper.json
index 9ced4c28038c..2f61c3afa601 100644
--- a/_maps/configs/nanotrasen_skipper.json
+++ b/_maps/configs/nanotrasen_skipper.json
@@ -17,7 +17,6 @@
 	"Mining"
 	],
 	"starting_funds": 4500,
-	"roundstart": true,
 	"job_slots": {
 		"Captain": {
 			"outfit": "/datum/outfit/job/nanotrasen/captain",
diff --git a/code/controllers/subsystem/overmap.dm b/code/controllers/subsystem/overmap.dm
index 93852230b244..1304eeeb34ea 100644
--- a/code/controllers/subsystem/overmap.dm
+++ b/code/controllers/subsystem/overmap.dm
@@ -133,7 +133,7 @@ SUBSYSTEM_DEF(overmap)
 		spawn_ruin_levels()
 
 	spawn_outpost()
-	spawn_initial_ships()
+	//spawn_initial_ships()
 
 /**
  * VERY Simple random generation for overmap events, spawns the event in a random turf and sometimes spreads it out similar to ores
@@ -212,6 +212,7 @@ SUBSYSTEM_DEF(overmap)
 	new found_type(location)
 	return
 
+/*
 /datum/controller/subsystem/overmap/proc/spawn_initial_ships()
 #ifndef UNIT_TESTS
 	var/datum/map_template/shuttle/selected_template = SSmapping.maplist[pick(SSmapping.maplist)]
@@ -224,10 +225,11 @@ SUBSYSTEM_DEF(overmap)
 		query_round_map_name.Execute()
 		qdel(query_round_map_name)
 #endif
+*/
 
 /**
  * Spawns a controlled ship with the passed template at the template's preferred spawn location.
- * Inteded for ship purchases, etc.
+ * Intended for ship purchases, etc.
  */
 /datum/controller/subsystem/overmap/proc/spawn_ship_at_start(datum/map_template/shuttle/template)
 	//Should never happen, but just in case. This'll delay the next spawn until the current one is done.