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

Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac

Browse Source
This commit is contained in:
izac112
2020-05-27 20:10:55 +02:00
parent 9aa2fe7d0a c41156173d
commit e807b80281
159 changed files with 28268 additions and 25848 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
code/controllers/configuration.dm
View File

@@ -69,7 +69,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 = "<span class='notice'><B>Make sure to play a different character, and please roleplay correctly!</B></span>"
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
@@ -233,7 +237,11 @@ var/list/gamemode_cache = list()
var/static/dooc_allowed = 1
var/static/dsay_allowed = 1
var/static/starlight = 0 // Whether space turfs have ambient light or not
var/allow_byond_links = 0
var/allow_discord_links = 0
var/allow_url_links = 0 // honestly if I were you i'd leave this one off, only use in dire situations
var/starlight = 0 // Whether space turfs have ambient light or not
var/static/list/ert_species = list(SPECIES_HUMAN)
@@ -273,6 +281,9 @@ var/list/gamemode_cache = list()
// whether or not to use the nightshift subsystem to perform lighting changes
var/static/enable_night_shifts = FALSE
var/static/vgs_access_identifier = null // VOREStation Edit - VGS
var/static/vgs_server_port = null // VOREStation Edit - VGS
/datum/configuration/New()
var/list/L = typesof(/datum/game_mode) - /datum/game_mode
@@ -424,6 +435,15 @@ var/list/gamemode_cache = list()
if ("allow_admin_spawning")
config.allow_admin_spawning = 1
if ("allow_byond_links")
allow_byond_links = 1
if ("allow_discord_links")
allow_discord_links = 1
if ("allow_url_links")
allow_url_links = 1
if ("no_dead_vote")
config.vote_no_dead = 1
@@ -470,6 +490,13 @@ var/list/gamemode_cache = list()
if ("norespawn")
config.respawn = 0
if ("respawn_time")
var/raw_minutes = text2num(value)
config.respawn_time = raw_minutes MINUTES
if ("respawn_message")
config.respawn_message = value
if ("servername")
config.server_name = value
@@ -897,6 +924,13 @@ var/list/gamemode_cache = list()
if("enable_night_shifts")
config.enable_night_shifts = TRUE
// VOREStation Edit Start - Can't be in _vr file because it is loaded too late.
if("vgs_access_identifier")
config.vgs_access_identifier = value
if("vgs_server_port")
config.vgs_server_port = text2num(value)
// VOREStation Edit End
else
log_misc("Unknown setting in configuration: '[name]'")