cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes incoming PR, removes now-duplicated code

Browse Source 
Removes mapping_vr.dm, engine.dm, and engine_areas.dm, given that these are now enabled in the core engine.dm
This commit is contained in:
Rykka
2020-08-27 21:41:29 -04:00
parent c69d4ab48a
commit 6f3ca562ed
7 changed files with 6 additions and 193 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
code/controllers/configuration.dm
View File

@@ -205,18 +205,6 @@ var/list/gamemode_cache = list()
var/static/enter_allowed = 1
<<<<<<< HEAD
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/use_irc_bot = 0
var/use_node_bot = 0
var/irc_bot_port = 0
@@ -229,7 +217,6 @@ var/list/gamemode_cache = list()
var/use_overmap = 0
var/static/list/engine_map // Comma separated list of engines to choose from. Blank means fully random.
>>>>>>> 3e4bf4a... Merge pull request #7574 from Rykka-Stormheart/shep-dev-engine-randomization
// Event settings
var/static/expected_round_length = 3 * 60 * 60 * 10 // 3 hours