cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +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/dooc_allowed = 1
var/static/dsay_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_byond_links = 0
var/allow_discord_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/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/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) var/static/list/ert_species = list(SPECIES_HUMAN)

3
code/game/verbs/ooc.dm
View File

@@ -34,13 +34,11 @@
log_admin("[key_name(src)] has attempted to advertise in OOC: [msg]") log_admin("[key_name(src)] has attempted to advertise in OOC: [msg]")
message_admins("[key_name_admin(src)] has attempted to advertise in OOC: [msg]") message_admins("[key_name_admin(src)] has attempted to advertise in OOC: [msg]")
return return
<<<<<<< HEAD
//VOREStation Add - No talking during voting //VOREStation Add - No talking during voting
if(SSvote && SSvote.mode) if(SSvote && SSvote.mode)
to_chat(src, "<span class='danger'>OOC is not allowed during voting.</span>") to_chat(src, "<span class='danger'>OOC is not allowed during voting.</span>")
return return
//VOREStation Add End //VOREStation Add End
=======
if(findtext(msg, "discord.gg") && !config.allow_discord_links) if(findtext(msg, "discord.gg") && !config.allow_discord_links)
to_chat(src, "<B>Advertising discords is not allowed.</B>") to_chat(src, "<B>Advertising discords is not allowed.</B>")
log_admin("[key_name(src)] has attempted to advertise a discord server in OOC: [msg]") log_admin("[key_name(src)] has attempted to advertise a discord server in OOC: [msg]")
@@ -51,7 +49,6 @@
log_admin("[key_name(src)] has attempted to post a link in OOC: [msg]") log_admin("[key_name(src)] has attempted to post a link in OOC: [msg]")
message_admins("[key_name_admin(src)] has attempted to post a link in OOC: [msg]") message_admins("[key_name_admin(src)] has attempted to post a link in OOC: [msg]")
return return
>>>>>>> 3fbc72a... Merge pull request #7206 from GeneriedJenelle/patch-1
log_ooc(msg, src) log_ooc(msg, src)

5
config/example/config.txt
View File

@@ -532,15 +532,12 @@ SQLITE_FEEDBACK_MIN_AGE 7
## Comment this out if you don't want to use the 'nightshift lighting' subsystem to adjust lights based on ingame time ## Comment this out if you don't want to use the 'nightshift lighting' subsystem to adjust lights based on ingame time
ENABLE_NIGHT_SHIFTS ENABLE_NIGHT_SHIFTS
<<<<<<< HEAD
## Comment this out to enable playtime restrictions for jobs in their respective departments (mostly for heads) ## Comment this out to enable playtime restrictions for jobs in their respective departments (mostly for heads)
# USE_PLAYTIME_RESTRICTION_FOR_JOBS # USE_PLAYTIME_RESTRICTION_FOR_JOBS
=======
## OOC/LOOC control ##
## OOC/LOOC control ##
# Uncomment to allow links of the following kinds. # # Uncomment to allow links of the following kinds. #
# ALLOW_BYOND_LINKS # ALLOW_BYOND_LINKS
# ALLOW_DISCORD_LINKS # ALLOW_DISCORD_LINKS
ALLOW_URL_LINKS ALLOW_URL_LINKS
>>>>>>> 3fbc72a... Merge pull request #7206 from GeneriedJenelle/patch-1