Skip to content

Commit

Permalink
Disable roundstart ships (#2822)
Browse files Browse the repository at this point in the history
<!-- 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. -->
  • Loading branch information
thgvr authored May 31, 2024
1 parent 638d7e0 commit 40ea5a3
Show file tree
Hide file tree
Showing 7 changed files with 4 additions and 8 deletions.
1 change: 0 additions & 1 deletion _maps/configs/independent_beluga.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
],
"starting_funds": 4000,
"limit": 2,
"roundstart": true,
"job_slots": {
"Captain": {
"outfit": "/datum/outfit/job/independent/captain",
Expand Down
1 change: 0 additions & 1 deletion _maps/configs/independent_dwayne.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
"Mining",
"Generalist"
],
"roundstart": true,
"limit": 1,
"job_slots": {
"Captain": {
Expand Down
1 change: 0 additions & 1 deletion _maps/configs/independent_mudskipper.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
"SPACE"
],
"map_path": "_maps/shuttles/independent/independent_mudskipper.dmm",
"roundstart": true,
"limit": 2,
"starting_funds": 1500,
"job_slots": {
Expand Down
1 change: 0 additions & 1 deletion _maps/configs/independent_rigger.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
"Generalist"
],
"map_path": "_maps/shuttles/independent/independent_rigger.dmm",
"roundstart": true,
"limit": 1,
"job_slots": {
"Captain": {
Expand Down
1 change: 0 additions & 1 deletion _maps/configs/independent_shetland.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
1 change: 0 additions & 1 deletion _maps/configs/nanotrasen_skipper.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
"Mining"
],
"starting_funds": 4500,
"roundstart": true,
"job_slots": {
"Captain": {
"outfit": "/datum/outfit/job/nanotrasen/captain",
Expand Down
6 changes: 4 additions & 2 deletions code/controllers/subsystem/overmap.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)]
Expand All @@ -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.
Expand Down

0 comments on commit 40ea5a3

Please sign in to comment.