Skip to content

Commit

Permalink
Tidies Configs (#3705)
Browse files Browse the repository at this point in the history
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request

Removes a bunch of unused config options to reduce confusion when people
edit the config, and prevents people from using options that are fully
deprecated.

## Why It's Good For The Game

See about

## Changelog

:cl:
config: Removes a lot of old, unused config options
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->
  • Loading branch information
MarkSuckerberg authored Nov 9, 2024
1 parent 6592304 commit ccafc66
Show file tree
Hide file tree
Showing 7 changed files with 1 addition and 195 deletions.
48 changes: 0 additions & 48 deletions code/controllers/configuration/entries/game_options.dm
Original file line number Diff line number Diff line change
Expand Up @@ -120,11 +120,6 @@
min_val = 0
max_val = 1

/datum/config_entry/number/shuttle_refuel_delay
config_entry_value = 12000
integer = FALSE
min_val = 0

/datum/config_entry/flag/show_game_type_odds //if set this allows players to see the odds of each roundtype on the get revision screen

/datum/config_entry/keyed_list/roundstart_races //races you can play as from the get go.
Expand Down Expand Up @@ -250,15 +245,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.
config_entry_value = 18000
integer = FALSE
min_val = 0

/datum/config_entry/flag/ghost_interaction

/datum/config_entry/flag/near_death_experience //If carbons can hear ghosts when unconscious and very close to death
Expand Down Expand Up @@ -293,32 +279,9 @@
config_entry_value = -1
min_val = -1

/datum/config_entry/string/overflow_job
config_entry_value = "Assistant"

/datum/config_entry/flag/starlight
/datum/config_entry/flag/grey_assistants

/datum/config_entry/number/lavaland_budget
config_entry_value = 60
integer = FALSE
min_val = 0

/datum/config_entry/number/whitesands_budget
config_entry_value = 60
integer = FALSE
min_val = 0

/datum/config_entry/number/icemoon_budget
config_entry_value = 90
integer = FALSE
min_val = 0

/datum/config_entry/number/space_budget
config_entry_value = 16
integer = FALSE
min_val = 0

/datum/config_entry/flag/allow_random_events // Enables random events mid-round when set

/datum/config_entry/number/events_min_time_mul // Multipliers for random events minimal starting time and minimal players amounts
Expand Down Expand Up @@ -352,13 +315,6 @@
GLOB.MAX_EX_FLASH_RANGE = config_entry_value
GLOB.MAX_EX_FLAME_RANGE = config_entry_value

/datum/config_entry/number/emergency_shuttle_autocall_threshold
min_val = 0
max_val = 1
integer = FALSE

/datum/config_entry/flag/ic_printing

/datum/config_entry/flag/roundstart_traits

/datum/config_entry/flag/randomize_shift_time
Expand All @@ -373,10 +329,6 @@
config_entry_value = 64
min_val = 0

/datum/config_entry/number/maxfine
config_entry_value = 1000
min_val = 0

/datum/config_entry/flag/dynamic_config_enabled

/datum/config_entry/number/respawn_timer
Expand Down
40 changes: 0 additions & 40 deletions code/controllers/configuration/entries/general.dm
Original file line number Diff line number Diff line change
Expand Up @@ -137,8 +137,6 @@

/datum/config_entry/flag/no_dead_vote // dead people can't vote

/datum/config_entry/flag/allow_metadata // Metadata is supported.

/// Gives the ability to send players a maptext popup.
/datum/config_entry/flag/popup_admin_pm

Expand Down Expand Up @@ -289,8 +287,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 Expand Up @@ -322,8 +318,6 @@
min_val = 0
integer = FALSE

/datum/config_entry/flag/maprotation

/datum/config_entry/number/auto_lag_switch_pop //Number of clients at which drastic lag mitigation measures kick in
config_entry_value = null
min_val = 0
Expand Down Expand Up @@ -408,14 +402,6 @@

/datum/config_entry/flag/announce_admin_login

/datum/config_entry/flag/allow_map_voting
deprecated_by = /datum/config_entry/flag/preference_map_voting

/datum/config_entry/flag/allow_map_voting/DeprecationUpdate(value)
return value

/datum/config_entry/flag/preference_map_voting

/datum/config_entry/number/client_warn_version
config_entry_value = null
min_val = 500
Expand Down Expand Up @@ -525,36 +511,10 @@

/datum/config_entry/flag/auto_profile

//BeginWS Edit
/datum/config_entry/flag/minimaps_enabled
config_entry_value = TRUE
//EndWS Edit
/datum/config_entry/string/centcom_ban_db // URL for the CentCom Galactic Ban DB API

/datum/config_entry/string/centcom_source_whitelist

/datum/config_entry/number/whitesands_atmos_moles
config_entry_value = 103
integer = FALSE
min_val = 10
max_val = 200

/datum/config_entry/keyed_list/whitesands_atmos_mix
key_mode = KEY_MODE_TEXT
value_mode = VALUE_MODE_NUM
lowercase = FALSE
splitter = " "


/datum/config_entry/keyed_list/whitesands_atmos_mix/ValidateListEntry(key_name, key_value)
var/list/gas_types = gas_types()
for (var/type in gas_types)
var/datum/gas/T = type
if (initial(T.id) == key_name)
// even a high pressure zone will be less than 1.5x one atmos
return key_value > 0 && key_value < 1.5
return FALSE

// Elasticsearch stuffs
/datum/config_entry/flag/elasticsearch_metrics_enabled

Expand Down
11 changes: 0 additions & 11 deletions code/game/area/areas.dm
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,6 @@
///Boolean to limit the areas (subtypes included) that atoms in this area can smooth with. Used for shuttles.
var/area_limited_icon_smoothing = FALSE

///WS Addition - Color on minimaps, if it's null (which is default) it makes one at random.
var/minimap_color

var/list/power_usage

var/lighting_colour_tube = "#FFF6ED"
Expand Down Expand Up @@ -128,14 +125,6 @@ GLOBAL_LIST_EMPTY(teleportlocs)
* Adds the item to the GLOB.areas_by_type list based on area type
*/
/area/New()
if(!minimap_color) // goes in New() because otherwise it doesn't fucking work
// generate one using the icon_state
if(icon_state && icon_state != "unknown")
var/icon/I = new(icon, icon_state, dir)
I.Scale(1,1)
minimap_color = I.GetPixel(1,1)
else // no icon state? use random.
minimap_color = rgb(rand(50,70),rand(50,70),rand(50,70))
// This interacts with the map loader, so it needs to be set immediately
// rather than waiting for atoms to initialize.
if (area_flags & UNIQUE_AREA)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,6 @@
C.visible_message("<span class='notice'>[C] coughs up a half-digested telecrystal</span>","<span class='notice'>You cough up a half-digested telecrystal!</span>")
break

CONFIG_SET(number/shuttle_refuel_delay, max(CONFIG_GET(number/shuttle_refuel_delay), CHALLENGE_SHUTTLE_DELAY))
SSblackbox.record_feedback("amount", "nuclear_challenge_mode", 1)

qdel(src)
Expand Down
2 changes: 0 additions & 2 deletions code/modules/awaymissions/zlevel.dm
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@ GLOBAL_LIST_INIT(potentialRandomZlevels, generateMapList(filename = "[global.con
if(!current)
current = new
current.id = id
if(delay)
current.wait = CONFIG_GET(number/gateway_delay)
GLOB.gateway_destinations += current
current.target_turfs += get_turf(src)

Expand Down
20 changes: 1 addition & 19 deletions config/config.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ $include dbconfig.txt
$include comms.txt
$include resources.txt
$include interviews.txt
$include atmos_mix.txt

# You can use the @ character at the beginning of a config option to lock it from being edited in-game
# Example usage:
Expand Down Expand Up @@ -156,9 +155,6 @@ LOG_CLONING
## log shuttle actions
LOG_SHUTTLE

## Enable the demo subsystem
# DEMOS_ENABLED

## Log all timers on timer auto reset
# LOG_TIMERS_ON_BUCKET_RESET

Expand Down Expand Up @@ -210,9 +206,6 @@ VOTE_AUTOTRANSFER_INTERVAL 18000
## disable abandon mob
#NORESPAWN

## disables calling del(src) on newmobs if they logout before spawnin in
# DONT_DEL_NEWMOB

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

Expand Down Expand Up @@ -300,8 +293,6 @@ CHECK_RANDOMIZER
# 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 @@ -399,23 +390,14 @@ NOTIFY_NEW_PLAYER_ACCOUNT_AGE 1
#AGGRESSIVE_CHANGELOG

## Comment this out if you've used the mass conversion sql proc for notes or want to stop converting notes
AUTOCONVERT_NOTES
#AUTOCONVERT_NOTES

## Comment this out to stop admin messages sent anytime an admin disconnects from a round in play, you can edit the messages in admin.dm
ANNOUNCE_ADMIN_LOGOUT

## Uncomment to have an admin message sent anytime an admin connects to a round in play, you can edit the messages in admin.dm
#ANNOUNCE_ADMIN_LOGIN

## Map rotation
## You should edit maps.txt to match your configuration when you enable this.
MAPROTATION

## Map voting
## Allows players to vote with their preffered map setting
## When it's set to zero, the map will be randomly picked each round
PREFERENCE_MAP_VOTING 1

## AUTOADMIN
## The default admin rank
AUTOADMIN_RANK Game Master
Expand Down
Loading

0 comments on commit ccafc66

Please sign in to comment.