Removes BoxStation in favor of IceBox

This commit is contained in:
skoglol
2020-07-06 15:03:07 +02:00
parent 2d6c10c1ad
commit eca1ebad92
8 changed files with 9 additions and 121378 deletions
+1 -1
View File
@@ -10,7 +10,7 @@
#include "map_files\Deltastation\DeltaStation2.dmm"
#include "map_files\MetaStation\MetaStation.dmm"
#include "map_files\PubbyStation\PubbyStation.dmm"
#include "map_files\BoxStation\BoxStation.dmm"
#include "map_files\IceBoxStation\IceBoxStation.dmm"
#ifdef TRAVISBUILDING
#include "templates.dm"
-11
View File
@@ -1,11 +0,0 @@
{
"map_name": "Box Station",
"map_path": "map_files/BoxStation",
"map_file": "BoxStation.dmm",
"shuttles": {
"cargo": "cargo_box",
"ferry": "ferry_fancy",
"whiteship": "whiteship_box",
"emergency": "emergency_box"
}
}
File diff suppressed because it is too large Load Diff
@@ -1,7 +0,0 @@
#define JOB_MODIFICATION_MAP_NAME "BoxStation"
/datum/job/prisoner/New()
..()
MAP_JOB_CHECK
total_positions = 4 //Other maps' brigs are too small for four, but Box's will be relatively empty otherwise; hopefully should be able to flesh out other maps's brigs in time so they can all be set to a cap of four prisoners
spawn_positions = 4
+1 -1
View File
@@ -59,7 +59,7 @@ SUBSYSTEM_DEF(mapping)
var/old_config = config
config = global.config.defaultmap
if(!config || config.defaulted)
to_chat(world, "<span class='boldannounce'>Unable to load next or default map config, defaulting to Box Station</span>")
to_chat(world, "<span class='boldannounce'>Unable to load next or default map config, defaulting to Meta Station</span>")
config = old_config
loadWorld()
repopulate_sorted_areas()
+6 -6
View File
@@ -5,7 +5,7 @@
/datum/map_config
// Metadata
var/config_filename = "_maps/boxstation.json"
var/config_filename = "_maps/metastation.json"
var/defaulted = TRUE // set to FALSE by LoadConfig() succeeding
// Config from maps.txt
var/config_max_users = 0
@@ -13,10 +13,10 @@
var/voteweight = 1
var/votable = FALSE
// Config actually from the JSON - should default to Box
var/map_name = "Box Station"
var/map_path = "map_files/BoxStation"
var/map_file = "BoxStation.dmm"
// Config actually from the JSON - should default to Meta
var/map_name = "Meta Station"
var/map_path = "map_files/MetaStation"
var/map_file = "MetaStation.dmm"
var/traits = null
var/space_ruin_levels = 7
@@ -72,7 +72,7 @@
map_path = json["map_path"]
map_file = json["map_file"]
// "map_file": "BoxStation.dmm"
// "map_file": "MetaStation.dmm"
if (istext(map_file))
if (!fexists("_maps/[map_path]/[map_file]"))
log_world("Map file ([map_path]/[map_file]) does not exist!")
@@ -3,8 +3,5 @@
#include "..\..\..\..\_maps\map_files\PubbyStation\job_changes.dm"
#undef JOB_MODIFICATION_MAP_NAME
#include "..\..\..\..\_maps\map_files\BoxStation\job_changes.dm"
#undef JOB_MODIFICATION_MAP_NAME
#include "..\..\..\..\_maps\map_files\IceBoxStation\job_changes.dm"
#undef JOB_MODIFICATION_MAP_NAME
+1 -6
View File
@@ -13,13 +13,8 @@ Format:
votable (is this map votable)
endmap
map boxstation
#default
#voteweight 1.5
votable
endmap
map metastation
#default
minplayers 25
#voteweight 0.5
votable