TGS3 Config Changes (#27632)

* TGS3 Config Changes

* Line endings

* Map config code change

* Missed a few

* The word comment has lost it's meaning to me

* This is a terrible name but whatever

code/controllers/configuration.dm

@@ -827,6 +827,8 @@
 			if ("endmap")
 				maplist[currentmap.map_name] = currentmap
 				currentmap = null
+			if ("disabled")
+				currentmap = null
 			else
 				GLOB.config_error_log << "Unknown command in map vote config: '[command]'"
 

config/admin_ranks.txt

@@ -11,7 +11,9 @@
 ##############################################################################################################
 # PLEASE NOTE: depending on config options, some abilities will be unavailable regardless if you have permission to use them!
 
-# KEYWORDS:
+# Follow the format below when documenting new keywords so the server tools may parse it
+
+# BEGIN_KEYWORDS
 # +ADMIN = general admin tools, verbs etc
 # +FUN = events, other event-orientated actions. Access to the fun secrets in the secrets panel.
 # +BAN = the ability to ban, jobban and fullban
@@ -26,6 +28,7 @@
 # +SOUND (or +SOUNDS) = allows you to upload and play sounds
 # +SPAWN (or +CREATE) = mob transformations, spawning of most atoms including mobs (high-risk atoms, e.g. blackholes, will require the +FUN flag too)
 # +EVERYTHING (or +HOST or +ALL) = Simply gives you everything without having to type every flag
+# END_KEYWORDS
 
 Admin Observer
 Moderator		= +ADMIN

config/config.txt

@@ -1,4 +1,4 @@
-## Server name: This appears at the top of the screen in-game and in the BYOND hub. Remove the # infront of SERVERNAME and replace 'tgstation' with the name of your choice.
+## Server name: This appears at the top of the screen in-game and in the BYOND hub. Uncomment and replace 'tgstation' with the name of your choice.
 # SERVERNAME tgstation
 
 ## Server SQL name: This is the name used to identify the server to the SQL DB, distinct from SERVERNAME as it must be at most 32 characters.
@@ -7,29 +7,29 @@
 ## Station name: The name of the station as it is referred to in-game. If commented out, the game will generate a random name instead.
 STATIONNAME Space Station 13
 
-## Put on byond hub: uncomment this to put your server on the byond hub.
+## Put on byond hub: Uncomment this to put your server on the byond hub.
 #HUB
 
-# Lobby time: This is the amount of time between rounds that players have to setup their characters and be ready.
+## Lobby time: This is the amount of time between rounds that players have to setup their characters and be ready.
 LOBBY_COUNTDOWN 120
 
-# Round End Time: This is the amount of time after the round ends that players have to murder death kill each other.
+## Round End Time: This is the amount of time after the round ends that players have to murder death kill each other.
 ROUND_END_COUNTDOWN 90
 
-## Add a # infront of this if you want to use the SQL based admin system, the legacy system uses admins.txt. You need to set up your database to use the SQL based system.
+## Comment this out if you want to use the SQL based admin system, the legacy system uses admins.txt. You need to set up your database to use the SQL based system.
 ADMIN_LEGACY_SYSTEM
 
-## Add a # infront of this if you want to use the SQL based banning system. The legacy systems use the files in the data folder. You need to set up your database to use the SQL based system.
+## Comment this out if you want to use the SQL based banning system. The legacy systems use the files in the data folder. You need to set up your database to use the SQL based system.
 BAN_LEGACY_SYSTEM
 
-## Unhash this entry to have certain jobs require your account to be at least a certain number of days old to select. You can configure the exact age requirement for different jobs by editing
+## Uncomment this entry to have certain jobs require your account to be at least a certain number of days old to select. You can configure the exact age requirement for different jobs by editing
 ## the minimal_player_age variable in the files in folder /code/game/jobs/job/.. for the job you want to edit. Set minimal_player_age to 0 to disable age requirement for that job.
 ## REQUIRES the database set up to work. Keep it hashed if you don't have a database set up.
 ## NOTE: If you have just set-up the database keep this DISABLED, as player age is determined from the first time they connect to the server with the database up. If you just set it up, it means
 ## you have noone older than 0 days, since noone has been logged yet. Only turn this on once you have had the database up for 30 days.
 #USE_AGE_RESTRICTION_FOR_JOBS
 
-# Uncomment this to have the job system use the player's account creation date, rather than the when they first joined the server for job timers.
+## Uncomment this to have the job system use the player's account creation date, rather than the when they first joined the server for job timers.
 #USE_ACCOUNT_AGE_FOR_JOBS
 
 ## log OOC channel
@@ -130,11 +130,11 @@ HOSTEDBY Yournamehere
 ## Uncomment this to stop people connecting to your server without a registered ckey. (i.e. guest-* are all blocked from connecting)
 GUEST_BAN
 
-## Comment to disable checking for the cid randomizer dll. (disabled if database isn't enabled or connected)
+## Comment this out to disable checking for the cid randomizer dll. (disabled if database isn't enabled or connected)
 CHECK_RANDOMIZER
 
-### IPINTEL:
+## IPINTEL:
-### This allows you to detect likely proxies by checking ips against getipintel.net
+## This allows you to detect likely proxies by checking ips against getipintel.net
 ## Rating to warn at: (0.90 is good, 1 is 100% likely to be a spammer/proxy, 0.8 is 80%, etc) anything equal to or higher then this number triggers an admin warning
 #IPINTEL_RATING_BAD 0.90
 ## Contact email, (required to use the service, leaving blank or default disables IPINTEL)
@@ -158,7 +158,7 @@ CHECK_RANDOMIZER
 #USEWHITELIST
 
 ## set a server location for world reboot. Don't include the byond://, just give the address and port.
-# Don't set this to the same server, BYOND will automatically restart players to the server when it has restarted.
+## Don't set this to the same server, BYOND will automatically restart players to the server when it has restarted.
 # SERVER ss13.example.com:2506
 
 ## forum address
@@ -167,13 +167,13 @@ CHECK_RANDOMIZER
 ## Wiki address
 # WIKIURL http://www.tgstation13.org/wiki
 
-##Rules address
+## Rules address
 # RULESURL http://www.tgstation13.org/wiki/Rules
 
-##Github address
+## Github address
 # GITHUBURL https://www.github.com/tgstation/-tg-station
 
-##Github repo id
+## Github repo id
 ##This can be found by going to https://api.github.com/users/<user name here>/repos
 ##Or https://api.github.com/orgs/<org name here>/repos if the repo owner is an organization 
 # GITHUBREPOID 3234987
@@ -185,23 +185,20 @@ CHECK_RANDOMIZER
 ##Toggle for having jobs load up from the .txt
 # LOAD_JOBS_FROM_TXT
 
-##Remove the # mark infront of this to forbid admins from possessing the singularity.
+## Uncomment this to forbid admins from possessing the singularity.
 #FORBID_SINGULO_POSSESSION
 
-## Remove the # to show a popup 'reply to' window to every non-admin that recieves an adminPM.
+## Uncomment to show a popup 'reply to' window to every non-admin that recieves an adminPM.
 ## The intention is to make adminPMs more visible. (although I fnd popups annoying so this defaults to off)
 #POPUP_ADMIN_PM
 
-## Remove the # to allow special 'Easter-egg' events on special holidays such as seasonal holidays and stuff like 'Talk Like a Pirate Day' :3 YAARRR
+## Uncomment to allow special 'Easter-egg' events on special holidays such as seasonal holidays and stuff like 'Talk Like a Pirate Day' :3 YAARRR
 ALLOW_HOLIDAYS
 
-##Remove the # mark if you are going to use the SVN irc bot to relay adminhelps
+## Uncomment to show the names of the admin sending a pm from IRC instead of showing as a stealthmin.
-#USEIRCBOT
-
-##Uncomment to show the names of the admin sending a pm from IRC instead of showing as a stealthmin.
 #SHOW_IRC_NAME
 
-##Defines the ticklimit for subsystem initialization (In percents of a byond tick). Lower makes world start smoother. Higher makes it faster.
+## Defines the ticklimit for subsystem initialization (In percents of a byond tick). Lower makes world start smoother. Higher makes it faster.
 ##This is currently a testing optimized setting. A good value for production would be 98.
 TICK_LIMIT_MC_INIT 500
 
@@ -335,3 +332,6 @@ MINUTE_TOPIC_LIMIT 100
 #ERROR_SILENCE_TIME 6000
 ##How long to wait between messaging admins about occurences of an unique error
 #ERROR_MSG_DELAY 50
+
+## Send a message to IRC when starting a new game
+#IRC_ANNOUNCE_NEW_GAME

config/dbconfig.txt

@@ -2,11 +2,11 @@
 ## This is used for stats, feedback gathering,
 ## administration, and the in game library.
 
-## Should SQL be enabled? Uncomment to enable.
+## Should SQL be enabled? Uncomment to enable
 #SQL_ENABLED
 
 ## Server the MySQL database can be found at.
-# Examples: localhost, 200.135.5.43, www.mysqldb.com, etc.
+## Examples: localhost, 200.135.5.43, www.mysqldb.com, etc.
 ADDRESS localhost
 
 ## MySQL server port (default is 3306).
@@ -20,9 +20,8 @@ FEEDBACK_DATABASE feedback
 ##IE:
 ##	FEEDBACK_TABLEPREFIX 
 ##	FEEDBACK_TABLEPREFIX SS13_
-##
+## Remove "SS13_" if you are using the standard schema file.
-## Leave as is if you are using the standard schema file.
+FEEDBACK_TABLEPREFIX SS13_
-FEEDBACK_TABLEPREFIX 
 
 ## Username/Login used to access the database.
 FEEDBACK_LOGIN username

config/game_options.txt

@@ -1,33 +1,33 @@
-### HEALTH ###
+## HEALTH ###
 
-#Damage multiplier, effects both weapons and healing on all mobs. For example, 1.25 would result in 25% higher damage.
+##Damage multiplier, effects both weapons and healing on all mobs. For example, 1.25 would result in 25% higher damage.
 DAMAGE_MULTIPLIER 1
 
-### REVIVAL ###
+## REVIVAL ###
 
-# whether pod plants work or not
+## whether pod plants work or not
 REVIVAL_POD_PLANTS
 
-# whether cloning tubes work or not
+## whether cloning tubes work or not
 REVIVAL_CLONING
 
-# amount of time (in hundredths of seconds) for which a brain retains the "spark of life" after the person's death (set to -1 for infinite)
+## amount of time (in hundredths of seconds) for which a brain retains the "spark of life" after the person's death (set to -1 for infinite)
 REVIVAL_BRAIN_LIFE -1
 
-### RENAMING ###
+## RENAMING ###
 
-#Uncomment to allow cyborgs to rename themselves at roundstart.  Has no effect on roboticists renaming cyborgs the normal way.
+## Uncomment to allow cyborgs to rename themselves at roundstart.  Has no effect on roboticists renaming cyborgs the normal way.
 #RENAME_CYBORG
 
-### OOC DURING ROUND ###
+## OOC DURING ROUND ###
-#Comment this out if you want OOC to be automatically disabled during the round, it will be enabled during the lobby and after the round end results.
+## Comment this out if you want OOC to be automatically disabled during the round, it will be enabled during the lobby and after the round end results.
 OOC_DURING_ROUND
 
-### EMOJI ###
+## EMOJI ###
-#Comment this out if you want to disable emojis
+## Comment this out if you want to disable emojis
 EMOJIS
 
-### MOB MOVEMENT ###
+## MOB MOVEMENT ###
 
 ## We suggest editing these variables ingame to find a good speed for your server.
 ## To do this you must be a high level admin. Open the 'debug' tab ingame.
@@ -49,7 +49,7 @@ SLIME_DELAY 0
 ANIMAL_DELAY 0
 
 
-### NAMES ###
+## NAMES ###
 ## If uncommented this adds a random surname to a player's name if they only specify one name.
 #HUMANS_NEED_SURNAMES
 
@@ -57,7 +57,7 @@ ANIMAL_DELAY 0
 #FORCE_RANDOM_NAMES
 
 
-### ALERT LEVELS ###
+## ALERT LEVELS ###
 ALERT_GREEN All threats to the station have passed. Security may not have weapons visible, privacy laws are once again fully enforced.
 ALERT_BLUE_UPTO The station has received reliable information about possible hostile activity on the station. Security staff may have weapons visible, random searches are permitted.
 ALERT_BLUE_DOWNTO The immediate threat has passed. Security may no longer have weapons drawn at all times, but may continue to have them visible. Random searches are still allowed.
@@ -67,7 +67,7 @@ ALERT_DELTA Destruction of the station is imminent. All crew are instructed to o
 
 
 
-### GAME MODES ###
+## GAME MODES ###
 
 ## Uncomment to not send a roundstart intercept report. Gamemodes may override this.
 #NO_INTERCEPT_REPORT
@@ -142,7 +142,7 @@ MIDROUND_ANTAG ABDUCTION
 #MIDROUND_ANTAG  RAGINMAGES
 #MIDROUND_ANTAG  MONKEY
 
-## Uncomment for overrides of the minimum / maximum number of players in a round type. 
+## Uncomment these for overrides of the minimum / maximum number of players in a round type. 
 ## If you set any of these occasionally check to see if you still need them as the modes
 ## will still be actively rebalanced around the SUGGESTED populations, not your overrides.
 ## Notes: For maximum number of players a value of -1 means no maximum. Setting minimums to 
@@ -213,8 +213,8 @@ CHANGELING_SCALING_COEFF 6
 ## Set to 0 to disable scaling and use default numbers instead.
 SECURITY_SCALING_COEFF 8
 
-# The number of objectives traitors get.
+## The number of objectives traitors get.
-# Not including escaping/hijacking.
+## Not including escaping/hijacking.
 TRAITOR_OBJECTIVES_AMOUNT 2
 
 ## Uncomment to prohibit jobs that start with loyalty
@@ -233,8 +233,8 @@ ALLOW_LATEJOIN_ANTAGONISTS
 ## Uncomment to allow players to see the set odds of different rounds in secret/random in the get server revision screen. This will NOT tell the current roundtype.
 #SHOW_GAME_TYPE_ODDS
 
-### RANDOM EVENTS ###
+## RANDOM EVENTS ###
-## Comment this to disable random events during the round.
+## Comment this out to disable random events during the round.
 ALLOW_RANDOM_EVENTS
 
 ## Multiplier for earliest start time of dangerous events.
@@ -246,34 +246,34 @@ EVENTS_MIN_TIME_MUL 1
 EVENTS_MIN_PLAYERS_MUL 1
 
 
-### AI ###
+## AI ###
 
 ## Allow the AI job to be picked.
 ALLOW_AI
 
-### Secborg ###
+## Secborg ###
 ## Uncomment to prevent the security cyborg module from being chosen
 #DISABLE_SECBORG
 
-### Peacekeeper Borg ###
+## Peacekeeper Borg ###
 ## Uncomment to prevent the peacekeeper cyborg module from being chosen
 #DISABLE_PEACEBORG
 
-### AWAY MISSIONS ###
+## AWAY MISSIONS ###
 
 ## How long the delay is before the Away Mission gate opens. Default is half an hour.
 ## 600 is one minute.
 GATEWAY_DELAY 18000
 
 
-### ACCESS ###
+## ACCESS ###
 
 ## If the number of players ready at round starts exceeds this threshold, JOBS_HAVE_MINIMAL_ACCESS will automatically be enabled. Otherwise, it will be disabled.
 ## This is useful for accomodating both low and high population rounds on the same server.
-## Comment out or set to 0 to disable this automatic toggle.
+## Comment this out or set to 0 to disable this automatic toggle.
 MINIMAL_ACCESS_THRESHOLD 20
 
-## Comment this out if you wish to use the setup where jobs have more access.
+## Comment this out this if you wish to use the setup where jobs have more access.
 ## This is intended for servers with low populations - where there are not enough
 ## players to fill all roles, so players need to do more than just one job.
 ## This option is ignored if MINIMAL_ACCESS_THRESHOLD is used.
@@ -282,35 +282,35 @@ MINIMAL_ACCESS_THRESHOLD 20
 ## Uncomment to give assistants maint access.
 #ASSISTANTS_HAVE_MAINT_ACCESS
 
-## Uncoment to give security maint access. Note that if you comment JOBS_HAVE_MINIMAL_ACCESS security already gets maint from that.
+## Uncoment to give security maint access. Note that if you dectivate JOBS_HAVE_MINIMAL_ACCESS security already gets maint from that.
 #SECURITY_HAS_MAINT_ACCESS
 
 ## Uncomment to give everyone maint access.
 #EVERYONE_HAS_MAINT_ACCESS
 
-## Comment this to make security officers spawn in departmental security posts
+## Comment this out this to make security officers spawn in departmental security posts
 SEC_START_BRIG
 
 
-### GHOST INTERACTION ###
+## GHOST INTERACTION ###
 ## Uncomment to let ghosts spin chairs. You may be wondering why this is a config option. Don't ask.
 #GHOST_INTERACTION
 
-### NON-VOCAL SILICONS ###
+## NON-VOCAL SILICONS ###
-## Uncomment to stop the AI, or cyborgs, from having vocal communication.
+## Uncomment these to stop the AI, or cyborgs, from having vocal communication.
 #SILENT_AI
 #SILENT_BORG
 
-### SANDBOX PANEL AUTOCLOSE ###
+## SANDBOX PANEL AUTOCLOSE ###
 ## The sandbox panel's item spawning dialog now stays open even after you click an option.
 ## If you find that your players are abusing the sandbox panel, this option may slow them down
 ## without preventing people from using it properly.
 ## Only functions in sandbox game mode.
 #SANDBOX_AUTOCLOSE
 
-### ROUNDSTART SILICON LAWS ###
+## ROUNDSTART SILICON LAWS ###
 ## This controls what the AI's laws are at the start of the round.
-## Set to 0/commented for "off", silicons will just start with Asimov.
+## Set to 0/commented out for "off", silicons will just start with Asimov.
 ## Set to 1 for "custom", silicons will start with the custom laws defined in silicon_laws.txt. (If silicon_laws.txt is empty, the AI will spawn with asimov and Custom boards will auto-delete.)
 ## Set to 2 for "random", silicons will start with a random lawset picked from random laws specified below.
 ## Set to 3 for "weighted random", using values in "silicon_weights.txt", a law will be selected, with weights specifed in that file.
@@ -378,7 +378,7 @@ LAW_WEIGHT buildawall,0
 
 ##------------------------------------------------
 
-### SILICON LAW MAX AMOUNT ###
+## SILICON LAW MAX AMOUNT ###
 ## The maximum number of laws a silicon can have
 ## Attempting to upload laws past this point will fail unless the AI is reset
 SILICON_MAX_LAW_AMOUNT 12
@@ -435,7 +435,7 @@ ASSISTANT_CAP -1
 ## Uncomment to bring back old grey suit assistants instead of the now default rainbow colored assistants.
 #GREY_ASSISTANTS
 
-### Midround Antag (aka Mulligan antag) config options ###
+## Midround Antag (aka Mulligan antag) config options ###
 
 ## A time, in minutes, after which the midround antag system stops attempting to run and continuous rounds end immediately upon completion.
 MIDROUND_ANTAG_TIME_CHECK 60
@@ -443,18 +443,18 @@ MIDROUND_ANTAG_TIME_CHECK 60
 ## A ratio of living to total crew members, the lower this is, the more people will have to die in order for midround antag to be skipped
 MIDROUND_ANTAG_LIFE_CHECK 0.7
 
-###Limit Spell Choices##
+##Limit Spell Choices##
 ## Uncomment to disallow wizards from using certain spells that may be too chaotic/fun for your playerbase
 
 #NO_SUMMON_GUNS
 #NO_SUMMON_MAGIC
 #NO_SUMMON_EVENTS
 
-##Comment for "normal" explosions, which ignore obstacles
+## Comment this out for "normal" explosions, which ignore obstacles
-##Uncomment for explosions that react to doors and walls
+## Uncomment for explosions that react to doors and walls
 REACTIONARY_EXPLOSIONS
 
-### Configure the bomb cap
+## Configure the bomb cap
 ## This caps all explosions to the specified range. Used for both balance reasons and to prevent overloading the server and lagging the game out.
 ## This is given as the 3rd number(light damage) in the standard (1,2,3) explosion notation. The other numbers are derived by dividing by 2 and 4.
 ## eg: If you give the number 20. The bomb cap will be 5,10,20.
@@ -469,23 +469,23 @@ BOMBCAP 20
 
 
 ## Lavaland "Budget"
-# Lavaland ruin spawning has an imaginary budget to spend on ruins, where
+## Lavaland ruin spawning has an imaginary budget to spend on ruins, where
-# a less lootfilled or smaller or less round effecting ruin costs less to
+## a less lootfilled or smaller or less round effecting ruin costs less to
-# spawn, while the converse is true. Alter this number to affect the amount
+## spawn, while the converse is true. Alter this number to affect the amount
-# of ruins.
+## of ruins.
 LAVALAND_BUDGET 60
 
 ## Space Ruin Budged
 Space_Budget 16
 
-#Time in ds from when a player latejoins till the arrival shuttle docks at the station
+## Time in ds from when a player latejoins till the arrival shuttle docks at the station
-#Must be at least 30 to not break parallax I recommended at least 55 to be visually/aurally appropriate
+## Must be at least 30 to not break parallax I recommended at least 55 to be visually/aurally appropriate
 ARRIVALS_SHUTTLE_DOCK_WINDOW 55
 
-#Uncomment to prevent late join players from spawning if the arrivals shuttle is depressurized
+## Uncomment to prevent late join players from spawning if the arrivals shuttle is depressurized
 #ARRIVALS_SHUTTLE_REQUIRE_SAFE_LATEJOIN
 
-# How many wirechewing rodents you want to spawn on exposed maintenane wires at the start of the round. You may wish to set this to 0 if you're testing powernets.
+## How many wirechewing rodents you want to spawn on exposed maintenane wires at the start of the round. You may wish to set this to 0 if you're testing powernets.
 
 MICE_ROUNDSTART 10
 

config/maps.txt

@@ -10,6 +10,7 @@ Format:
 	maxplayers [number] (0 or less disables this requirement)
 	default (The last map with this defined will get all votes of players who have not explicitly voted for a map)
 	voteweight [number] (How much to count each player vote as, defaults to 1, setting to 0.5 counts each vote as half a vote, 2 as double, etc, Setting to 0 disables the map but allows players to still pick it)
+	disabled (disables the map)
 endmap
 
 map tgstation2
@@ -36,3 +37,7 @@ endmap
 map cerestation
 	minplayers 45
 endmap
+
+map runtimestation
+	disabled
+endmap

config/server_to_tool_bridge_port.txt

@@ -0,0 +1 @@
+45678