mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-07-20 03:25:49 +01:00
Added a tiny map for testing changes (#17704)
* Added a tiny map for testing changes * I forgot to commit this * Addressed review * Expanded to 255x255 for consistency * Update config/example/config.toml Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com> Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
This commit is contained in:
File diff suppressed because it is too large
Load Diff
@@ -26,6 +26,8 @@
|
||||
var/internal_ip = "127.0.0.1"
|
||||
/// Are we using an external handler for TOS
|
||||
var/external_tos_handler = FALSE
|
||||
/// Whether to load test_tiny instead of the normal map
|
||||
var/load_test_map = FALSE
|
||||
|
||||
/datum/configuration_section/system_configuration/load_data(list/data)
|
||||
// Use the load wrappers here. That way the default isnt made 'null' if you comment out the config line
|
||||
@@ -44,3 +46,5 @@
|
||||
|
||||
CONFIG_LOAD_STR(instance_id, data["instance_id"])
|
||||
CONFIG_LOAD_STR(internal_ip, data["internal_ip"])
|
||||
|
||||
CONFIG_LOAD_BOOL(load_test_map, data["load_test_map"])
|
||||
|
||||
@@ -126,6 +126,9 @@ SUBSYSTEM_DEF(mapping)
|
||||
|
||||
// Loads in the station
|
||||
/datum/controller/subsystem/mapping/proc/loadStation()
|
||||
if(GLOB.configuration.system.load_test_map)
|
||||
log_startup_progress("Loading test map, overridden by configuration.")
|
||||
map_datum = new /datum/map/test_tiny
|
||||
ASSERT(map_datum.map_path)
|
||||
if(!fexists(map_datum.map_path))
|
||||
// Make a VERY OBVIOUS error
|
||||
|
||||
@@ -0,0 +1,4 @@
|
||||
/datum/map/test_tiny
|
||||
fluff_name = "test_tiny"
|
||||
technical_name = "test_tiny"
|
||||
map_path = "_maps/map_files/test_tiny/test_tiny.dmm"
|
||||
@@ -742,6 +742,8 @@ instance_id = "paradise_main"
|
||||
internal_ip = "127.0.0.1"
|
||||
# Are we handling TOS consents on an external service?
|
||||
external_tos_handler = false
|
||||
# Whether to load test_tiny instead of the normal map.
|
||||
load_test_map = false
|
||||
|
||||
|
||||
################################################################
|
||||
|
||||
@@ -1760,6 +1760,7 @@
|
||||
#include "code\modules\mapping\delta.dm"
|
||||
#include "code\modules\mapping\mapping_helpers.dm"
|
||||
#include "code\modules\mapping\metastation.dm"
|
||||
#include "code\modules\mapping\test_tiny.dm"
|
||||
#include "code\modules\martial_arts\adminfu.dm"
|
||||
#include "code\modules\martial_arts\brawling.dm"
|
||||
#include "code\modules\martial_arts\cqc.dm"
|
||||
|
||||
Reference in New Issue
Block a user