Skip to content

Commit

Permalink
Cleans up a few dead config entries (#452)
Browse files Browse the repository at this point in the history
  • Loading branch information
francinum authored Aug 1, 2023
1 parent e7e610d commit 69bf256
Show file tree
Hide file tree
Showing 7 changed files with 4 additions and 123 deletions.
19 changes: 4 additions & 15 deletions code/controllers/configuration/entries/game_options.dm
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
/datum/config_entry/number_list/repeated_mode_adjust

/datum/config_entry/keyed_list/max_pop
key_mode = KEY_MODE_TEXT
value_mode = VALUE_MODE_NUM
Expand Down Expand Up @@ -48,12 +46,12 @@

/datum/config_entry/flag/disable_warops

/datum/config_entry/number/traitor_scaling_coeff //how much does the amount of players get divided by to determine traitors
/datum/config_entry/number/traitor_scaling_coeff //how much does the amount of players get divided by to determine traitors [UNUSED]
default = 6
integer = FALSE
min_val = 0

/datum/config_entry/number/brother_scaling_coeff //how many players per brother team
/datum/config_entry/number/brother_scaling_coeff //how many players per brother team [UNUSED]
default = 25
integer = FALSE
min_val = 0
Expand All @@ -73,12 +71,12 @@
default = 6
min_val = 1

/datum/config_entry/number/changeling_scaling_coeff //how much does the amount of players get divided by to determine changelings
/datum/config_entry/number/changeling_scaling_coeff //how much does the amount of players get divided by to determine changelings [UNUSED]
default = 6
integer = FALSE
min_val = 0

/datum/config_entry/number/ecult_scaling_coeff //how much does the amount of players get divided by to determine e_cult
/datum/config_entry/number/ecult_scaling_coeff //how much does the amount of players get divided by to determine e_cult (Heretic) [UNUSED]
default = 6
integer = FALSE
min_val = 0
Expand Down Expand Up @@ -170,11 +168,6 @@

/datum/config_entry/flag/revival_pod_plants

/datum/config_entry/number/revival_brain_life
default = -1
integer = FALSE
min_val = -1

/datum/config_entry/flag/ooc_during_round

// deprecated for unclear name
Expand Down Expand Up @@ -267,8 +260,6 @@
movedelay_type = /mob/living/simple_animal
/////////////////////////////////////////////////

/datum/config_entry/flag/virtual_reality //Will virtual reality be loaded

/datum/config_entry/flag/roundstart_away //Will random away mission be loaded.

/datum/config_entry/number/gateway_delay //How long the gateway takes before it activates. Default is half an hour. Only matters if roundstart_away is enabled.
Expand All @@ -288,8 +279,6 @@
/datum/config_entry/flag/silent_ai
/datum/config_entry/flag/silent_borg

/datum/config_entry/flag/sandbox_autoclose // close the sandbox panel after spawning an item, potentially reducing griff

/datum/config_entry/number/default_laws //Controls what laws the AI spawns with.
default = 0
min_val = 0
Expand Down
4 changes: 0 additions & 4 deletions code/controllers/configuration/entries/general.dm
Original file line number Diff line number Diff line change
Expand Up @@ -245,8 +245,6 @@
/datum/config_entry/flag/load_legacy_ranks_only //Loads admin ranks only from legacy admin_ranks.txt, while enabled ranks are mirrored to the database
protection = CONFIG_ENTRY_LOCKED

/datum/config_entry/string/hostedby

/datum/config_entry/flag/norespawn

/datum/config_entry/flag/usewhitelist
Expand Down Expand Up @@ -331,8 +329,6 @@

/datum/config_entry/flag/kick_inactive //force disconnect for inactive players

/datum/config_entry/flag/load_jobs_from_txt

/datum/config_entry/flag/forbid_singulo_possession

/datum/config_entry/flag/automute_on //enables automuting/spam prevention
Expand Down
14 changes: 0 additions & 14 deletions code/controllers/subsystem/job.dm
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,6 @@ SUBSYSTEM_DEF(job)
setup_job_lists()
if(!length(all_occupations))
SetupOccupations()
if(CONFIG_GET(flag/load_jobs_from_txt))
LoadJobs()
set_overflow_role(CONFIG_GET(string/overflow_job))
setup_employers()
return ..()
Expand Down Expand Up @@ -618,18 +616,6 @@ SUBSYSTEM_DEF(job)
else //We ran out of spare locker spawns!
break


/datum/controller/subsystem/job/proc/LoadJobs()
var/jobstext = file2text("[global.config.directory]/jobs.txt")
for(var/datum/job/job as anything in joinable_occupations)
var/regex/jobs = new("[job.title]=(-1|\\d+),(-1|\\d+)")
jobs.Find(jobstext)
if(length(jobs.group)<2)
stack_trace("failed to find a job entry for [job.title] in jobs.txt")
continue
job.total_positions = text2num(jobs.group[1])
job.spawn_positions = text2num(jobs.group[2])

/datum/controller/subsystem/job/proc/HandleFeedbackGathering()
for(var/datum/job/job as anything in joinable_occupations)
var/high = 0 //high
Expand Down
6 changes: 0 additions & 6 deletions code/controllers/subsystem/mapping.dm
Original file line number Diff line number Diff line change
Expand Up @@ -97,12 +97,6 @@ SUBSYSTEM_DEF(mapping)
if(CONFIG_GET(flag/roundstart_away))
createRandomZlevel(prob(CONFIG_GET(number/config_gateway_chance)))

// Load the virtual reality hub
if(CONFIG_GET(flag/virtual_reality))
to_chat(world, span_boldannounce("Loading virtual reality..."))
load_new_z_level("_maps/RandomZLevels/VR/vrhub.dmm", "Virtual Reality Hub")
to_chat(world, span_boldannounce("Virtual reality loaded."))

loading_ruins = TRUE
setup_ruins()
loading_ruins = FALSE
Expand Down
22 changes: 0 additions & 22 deletions config/config.txt
Original file line number Diff line number Diff line change
Expand Up @@ -221,9 +221,6 @@ VOTE_PERIOD 600
## disable abandon mob
NORESPAWN

## set a hosted by name for unix platforms
HOSTEDBY Octus

## Uncomment this to stop people connecting to your server without a registered ckey. (i.e. guest-* are all blocked from connecting)
GUEST_BAN

Expand Down Expand Up @@ -296,9 +293,6 @@ GITHUBURL https://github.com/DaedalusDock/Gameserver
# INVOKE_YOUTUBEDL youtube-dl

## In-game features
##Toggle for having jobs load up from the .txt
# LOAD_JOBS_FROM_TXT

## Uncomment this to forbid admins from possessing the singularity.
#FORBID_SINGULO_POSSESSION

Expand Down Expand Up @@ -567,22 +561,6 @@ CENTCOM_BAN_DB https://centcom.melonmesa.com/ban/search
## of their connection attempt.
#ADMIN_2FA_URL https://example.com/id/%ID%

#### DISCORD STUFFS ####
## MAKE SURE ALL SECTIONS OF THIS ARE FILLED OUT BEFORE ENABLING
## Discord IDs can be obtained by following this guide: https://support.discord.com/hc/en-us/articles/206346498-Where-can-I-find-my-User-Server-Message-ID-

## Uncomment to enable discord auto-roling when users link their BYOND and Discord accounts
#ENABLE_DISCORD_AUTOROLE

## Add your discord bot token here. Make sure it has the ability to manage roles
#DISCORD_TOKEN someDiscordToken

## Add the ID of your guild (server) here
#DISCORD_GUILDID 000000000000000000

## Add the ID of the role you want assigning here
#DISCORD_ROLEID 000000000000000000

## How long in seconds after which a hard delete is treated as causing lag. This can be a float and supports a precision as low as nanoseconds.
#HARD_DELETES_OVERRUN_THRESHOLD 0.5

Expand Down
13 changes: 0 additions & 13 deletions config/game_options.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,6 @@ DAMAGE_MULTIPLIER 1
## whether pod plants work or not
REVIVAL_POD_PLANTS

## 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

## 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.
OOC_DURING_ROUND
Expand Down Expand Up @@ -160,9 +157,6 @@ ALLOW_AI_MULTICAM

## AWAY MISSIONS ###

## Uncomment to load the virtual reality hub map
#VIRTUAL_REALITY

## Uncomment to load one of the missions from awaymissionconfig.txt or away_missions/ at roundstart.
#ROUNDSTART_AWAY

Expand Down Expand Up @@ -212,13 +206,6 @@ NEAR_DEATH_EXPERIENCE
#SILENT_AI
#SILENT_BORG

## 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 ###
## This controls what the AI's laws are at the start of the round.
## Set to 0/commented out for "off", silicons will just start with Asimov.
Expand Down
49 changes: 0 additions & 49 deletions config/jobs.txt

This file was deleted.

0 comments on commit 69bf256

Please sign in to comment.