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

Merge upstream PR

Browse Source
This commit is contained in:
Aronai Sieyes
2020-05-21 15:43:40 -04:00
parent 0c200c9483
commit 62c3bdd2e7
3 changed files with 1 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/controllers/configuration.dm
View File

@@ -232,15 +232,11 @@ var/list/gamemode_cache = list()
var/static/dooc_allowed = 1
var/static/dsay_allowed = 1
<<<<<<< HEAD
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
>>>>>>> 3fbc72a... Merge pull request #7206 from GeneriedJenelle/patch-1
var/static/list/ert_species = list(SPECIES_HUMAN)