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

Update configuration.dm

Browse Source
This commit is contained in:
Nadyr
2021-04-30 02:07:07 -04:00
committed by GitHub
parent f67bd28e3a
commit 0286a50c34
1 changed files with 1131 additions and 1139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
code/controllers/configuration.dm
View File

@@ -284,19 +284,11 @@ var/list/gamemode_cache = list()
var/static/disable_cid_warn_popup = FALSE var/static/disable_cid_warn_popup = FALSE
// whether or not to use the nightshift subsystem to perform lighting changes // whether or not to use the nightshift subsystem to perform lighting changes
<<<<<<< HEAD
var/static/enable_night_shifts = FALSE
||||||| parent of 7ee3781614... Merge pull request #10219 from VOREStation/upstream-merge-8055
var/static/enable_night_shifts = FALSE
=======
var/static/enable_night_shifts = FALSE var/static/enable_night_shifts = FALSE
// How strictly the loadout enforces object species whitelists // How strictly the loadout enforces object species whitelists
var/loadout_whitelist = LOADOUT_WHITELIST_LAX var/loadout_whitelist = LOADOUT_WHITELIST_LAX
>>>>>>> 7ee3781614... Merge pull request #10219 from VOREStation/upstream-merge-8055
var/static/vgs_access_identifier = null // VOREStation Edit - VGS var/static/vgs_access_identifier = null // VOREStation Edit - VGS
var/static/vgs_server_port = null // VOREStation Edit - VGS var/static/vgs_server_port = null // VOREStation Edit - VGS