From b43102392eb8962e7a207535a22159113b3c094f Mon Sep 17 00:00:00 2001 From: Atermonera Date: Thu, 27 Aug 2020 19:17:03 -0700 Subject: [PATCH 1/4] Travis only loads legal engines --- code/controllers/configuration.dm | 56 ++++++++++++++++++++++++++++--- 1 file changed, 52 insertions(+), 4 deletions(-) diff --git a/code/controllers/configuration.dm b/code/controllers/configuration.dm index 71384823012..b7083941c43 100644 --- a/code/controllers/configuration.dm +++ b/code/controllers/configuration.dm @@ -68,11 +68,11 @@ var/list/gamemode_cache = list() var/static/allow_ai_shells = FALSE // allow AIs to enter and leave special borg shells at will, and for those shells to be buildable. var/static/give_free_ai_shell = FALSE // allows a specific spawner object to instantiate a premade AI Shell var/static/hostedby = null - + var/static/respawn = 1 var/static/respawn_time = 3000 // time before a dead player is allowed to respawn (in ds, though the config file asks for minutes, and it's converted below) var/static/respawn_message = "Make sure to play a different character, and please roleplay correctly!" - + var/static/guest_jobban = 1 var/static/usewhitelist = 0 var/static/kick_inactive = 0 //force disconnect for inactive players after this many minutes, if non-0 @@ -178,6 +178,7 @@ var/list/gamemode_cache = list() var/static/walk_speed = 0 //Mob specific modifiers. NOTE: These will affect different mob types in different ways +<<<<<<< HEAD var/static/human_delay = 0 var/static/robot_delay = 0 var/static/monkey_delay = 0 @@ -215,6 +216,47 @@ var/list/gamemode_cache = list() var/static/python_path = "" //Path to the python executable. Defaults to "python" on windows and "/usr/bin/env python2" on unix var/static/use_lib_nudge = 0 //Use the C library nudge instead of the python nudge. var/static/use_overmap = 0 +======= + var/human_delay = 0 + var/robot_delay = 0 + var/monkey_delay = 0 + var/alien_delay = 0 + var/slime_delay = 0 + var/animal_delay = 0 + + var/footstep_volume = 0 + + var/admin_legacy_system = 0 //Defines whether the server uses the legacy admin system with admins.txt or the SQL system. Config option in config.txt + var/ban_legacy_system = 0 //Defines whether the server uses the legacy banning system with the files in /data or the SQL system. Config option in config.txt + var/use_age_restriction_for_jobs = 0 //Do jobs use account age restrictions? --requires database + var/use_age_restriction_for_antags = 0 //Do antags use account age restrictions? --requires database + + var/simultaneous_pm_warning_timeout = 100 + + var/use_recursive_explosions //Defines whether the server uses recursive or circular explosions. + var/multi_z_explosion_scalar = 0.5 //Multiplier for how much weaker explosions are on neighboring z levels. + + var/assistant_maint = 0 //Do assistants get maint access? + var/gateway_delay = 18000 //How long the gateway takes before it activates. Default is half an hour. + var/ghost_interaction = 0 + + var/comms_password = "" + + var/enter_allowed = 1 + + var/use_irc_bot = 0 + var/use_node_bot = 0 + var/irc_bot_port = 0 + var/irc_bot_host = "" + var/irc_bot_export = 0 // whether the IRC bot in use is a Bot32 (or similar) instance; Bot32 uses world.Export() instead of nudge.py/libnudge + var/main_irc = "" + var/admin_irc = "" + var/python_path = "" //Path to the python executable. Defaults to "python" on windows and "/usr/bin/env python2" on unix + var/use_lib_nudge = 0 //Use the C library nudge instead of the python nudge. + var/use_overmap = 0 + + var/static/list/engine_map = list("Supermatter Engine", "Edison's Bane") // Comma separated list of engines to choose from. Blank means fully random. +>>>>>>> 1d80ba3... Merge pull request #7586 from Atermonera/master // Event settings var/static/expected_round_length = 3 * 60 * 60 * 10 // 3 hours @@ -492,7 +534,7 @@ var/list/gamemode_cache = list() if ("respawn_time") var/raw_minutes = text2num(value) config.respawn_time = raw_minutes MINUTES - + if ("respawn_message") config.respawn_message = value @@ -582,7 +624,7 @@ var/list/gamemode_cache = list() if("persistence_disabled") config.persistence_disabled = TRUE // Previously this forcibly set persistence enabled in the saves. - + if("persistence_ignore_mapload") config.persistence_ignore_mapload = TRUE @@ -787,6 +829,12 @@ var/list/gamemode_cache = list() if("use_overmap") config.use_overmap = 1 +<<<<<<< HEAD +======= + + if("engine_map") + config.engine_map = splittext(value, ",") +>>>>>>> 1d80ba3... Merge pull request #7586 from Atermonera/master /* if("station_levels") using_map.station_levels = text2numlist(value, ";") From 5446f5a74bd16265bf5b207add6c9c922e2a382d Mon Sep 17 00:00:00 2001 From: Novacat <35587478+Novacat@users.noreply.github.com> Date: Fri, 28 Aug 2020 13:07:05 -0400 Subject: [PATCH 2/4] Update configuration.dm --- code/controllers/configuration.dm | 43 ------------------------------- 1 file changed, 43 deletions(-) diff --git a/code/controllers/configuration.dm b/code/controllers/configuration.dm index b7083941c43..0b8e23a0e7a 100644 --- a/code/controllers/configuration.dm +++ b/code/controllers/configuration.dm @@ -178,45 +178,6 @@ var/list/gamemode_cache = list() var/static/walk_speed = 0 //Mob specific modifiers. NOTE: These will affect different mob types in different ways -<<<<<<< HEAD - var/static/human_delay = 0 - var/static/robot_delay = 0 - var/static/monkey_delay = 0 - var/static/alien_delay = 0 - var/static/slime_delay = 0 - var/static/animal_delay = 0 - - var/static/footstep_volume = 0 - - var/static/admin_legacy_system = 0 //Defines whether the server uses the legacy admin system with admins.txt or the SQL system. Config option in config.txt - var/static/ban_legacy_system = 0 //Defines whether the server uses the legacy banning system with the files in /data or the SQL system. Config option in config.txt - var/static/use_age_restriction_for_jobs = 0 //Do jobs use account age restrictions? --requires database - var/static/use_age_restriction_for_antags = 0 //Do antags use account age restrictions? --requires database - - var/static/simultaneous_pm_warning_timeout = 100 - - var/static/use_recursive_explosions //Defines whether the server uses recursive or circular explosions. - var/static/multi_z_explosion_scalar = 0.5 //Multiplier for how much weaker explosions are on neighboring z levels. - - var/static/assistant_maint = 0 //Do assistants get maint access? - var/static/gateway_delay = 18000 //How long the gateway takes before it activates. Default is half an hour. - var/static/ghost_interaction = 0 - - var/static/comms_password = "" - - var/static/enter_allowed = 1 - - var/static/use_irc_bot = 0 - var/static/use_node_bot = 0 - var/static/irc_bot_port = 0 - var/static/irc_bot_host = "" - var/static/irc_bot_export = 0 // whether the IRC bot in use is a Bot32 (or similar) instance; Bot32 uses world.Export() instead of nudge.py/libnudge - var/static/main_irc = "" - var/static/admin_irc = "" - var/static/python_path = "" //Path to the python executable. Defaults to "python" on windows and "/usr/bin/env python2" on unix - var/static/use_lib_nudge = 0 //Use the C library nudge instead of the python nudge. - var/static/use_overmap = 0 -======= var/human_delay = 0 var/robot_delay = 0 var/monkey_delay = 0 @@ -256,7 +217,6 @@ var/list/gamemode_cache = list() var/use_overmap = 0 var/static/list/engine_map = list("Supermatter Engine", "Edison's Bane") // Comma separated list of engines to choose from. Blank means fully random. ->>>>>>> 1d80ba3... Merge pull request #7586 from Atermonera/master // Event settings var/static/expected_round_length = 3 * 60 * 60 * 10 // 3 hours @@ -829,12 +789,9 @@ var/list/gamemode_cache = list() if("use_overmap") config.use_overmap = 1 -<<<<<<< HEAD -======= if("engine_map") config.engine_map = splittext(value, ",") ->>>>>>> 1d80ba3... Merge pull request #7586 from Atermonera/master /* if("station_levels") using_map.station_levels = text2numlist(value, ";") From 2391911403db67df6227c42ef48301a9c0eb6b4a Mon Sep 17 00:00:00 2001 From: Novacat <35587478+Novacat@users.noreply.github.com> Date: Fri, 28 Aug 2020 13:09:52 -0400 Subject: [PATCH 3/4] Update configuration.dm --- code/controllers/configuration.dm | 60 +++++++++++++++---------------- 1 file changed, 29 insertions(+), 31 deletions(-) diff --git a/code/controllers/configuration.dm b/code/controllers/configuration.dm index 0b8e23a0e7a..34a8776b2b1 100644 --- a/code/controllers/configuration.dm +++ b/code/controllers/configuration.dm @@ -177,45 +177,43 @@ var/list/gamemode_cache = list() var/static/run_speed = 0 var/static/walk_speed = 0 - //Mob specific modifiers. NOTE: These will affect different mob types in different ways - var/human_delay = 0 - var/robot_delay = 0 - var/monkey_delay = 0 - var/alien_delay = 0 - var/slime_delay = 0 - var/animal_delay = 0 + //Mob specific modifiers. NOTE: These will affect different mob types in different ways var/static/human_delay = 0 + var/static/robot_delay = 0 + var/static/monkey_delay = 0 + var/static/alien_delay = 0 + var/static/slime_delay = 0 + var/static/animal_delay = 0 - var/footstep_volume = 0 + var/static/footstep_volume = 0 - var/admin_legacy_system = 0 //Defines whether the server uses the legacy admin system with admins.txt or the SQL system. Config option in config.txt - var/ban_legacy_system = 0 //Defines whether the server uses the legacy banning system with the files in /data or the SQL system. Config option in config.txt - var/use_age_restriction_for_jobs = 0 //Do jobs use account age restrictions? --requires database - var/use_age_restriction_for_antags = 0 //Do antags use account age restrictions? --requires database + var/static/admin_legacy_system = 0 //Defines whether the server uses the legacy admin system with admins.txt or the SQL system. Config option in config.txt + var/static/ban_legacy_system = 0 //Defines whether the server uses the legacy banning system with the files in /data or the SQL system. Config option in config.txt + var/static/use_age_restriction_for_jobs = 0 //Do jobs use account age restrictions? --requires database + var/static/use_age_restriction_for_antags = 0 //Do antags use account age restrictions? --requires database - var/simultaneous_pm_warning_timeout = 100 + var/static/simultaneous_pm_warning_timeout = 100 - var/use_recursive_explosions //Defines whether the server uses recursive or circular explosions. - var/multi_z_explosion_scalar = 0.5 //Multiplier for how much weaker explosions are on neighboring z levels. + var/static/use_recursive_explosions //Defines whether the server uses recursive or circular explosions. + var/static/multi_z_explosion_scalar = 0.5 //Multiplier for how much weaker explosions are on neighboring z levels. - var/assistant_maint = 0 //Do assistants get maint access? - var/gateway_delay = 18000 //How long the gateway takes before it activates. Default is half an hour. - var/ghost_interaction = 0 + var/static/assistant_maint = 0 //Do assistants get maint access? + var/static/gateway_delay = 18000 //How long the gateway takes before it activates. Default is half an hour. + var/static/ghost_interaction = 0 - var/comms_password = "" + var/static/comms_password = "" - var/enter_allowed = 1 - - var/use_irc_bot = 0 - var/use_node_bot = 0 - var/irc_bot_port = 0 - var/irc_bot_host = "" - var/irc_bot_export = 0 // whether the IRC bot in use is a Bot32 (or similar) instance; Bot32 uses world.Export() instead of nudge.py/libnudge - var/main_irc = "" - var/admin_irc = "" - var/python_path = "" //Path to the python executable. Defaults to "python" on windows and "/usr/bin/env python2" on unix - var/use_lib_nudge = 0 //Use the C library nudge instead of the python nudge. - var/use_overmap = 0 + var/static/enter_allowed = 1 + var/static/use_irc_bot = 0 + var/static/use_node_bot = 0 + var/static/irc_bot_port = 0 + var/static/irc_bot_host = "" + var/static/irc_bot_export = 0 // whether the IRC bot in use is a Bot32 (or similar) instance; Bot32 uses world.Export() instead of nudge.py/libnudge + var/static/main_irc = "" + var/static/admin_irc = "" + var/static/python_path = "" //Path to the python executable. Defaults to "python" on windows and "/usr/bin/env python2" on unix + var/static/use_lib_nudge = 0 //Use the C library nudge instead of the python nudge. + var/static/use_overmap = 0 var/static/list/engine_map = list("Supermatter Engine", "Edison's Bane") // Comma separated list of engines to choose from. Blank means fully random. // Event settings From e528a598573cf0fb09d32c92da37654a74dd1751 Mon Sep 17 00:00:00 2001 From: Novacat <35587478+Novacat@users.noreply.github.com> Date: Fri, 28 Aug 2020 13:10:57 -0400 Subject: [PATCH 4/4] Update configuration.dm --- code/controllers/configuration.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/controllers/configuration.dm b/code/controllers/configuration.dm index 34a8776b2b1..7f2a2f55440 100644 --- a/code/controllers/configuration.dm +++ b/code/controllers/configuration.dm @@ -177,7 +177,8 @@ var/list/gamemode_cache = list() var/static/run_speed = 0 var/static/walk_speed = 0 - //Mob specific modifiers. NOTE: These will affect different mob types in different ways var/static/human_delay = 0 + //Mob specific modifiers. NOTE: These will affect different mob types in different ways + var/static/human_delay = 0 var/static/robot_delay = 0 var/static/monkey_delay = 0 var/static/alien_delay = 0