" + . += "#[tm.number][details]
" //END OF CITADEL CHANGES diff --git a/code/datums/repositories/radiation.dm b/code/datums/repositories/radiation.dm index 5056d8f0530..f7827634e18 100644 --- a/code/datums/repositories/radiation.dm +++ b/code/datums/repositories/radiation.dm @@ -30,7 +30,7 @@ var/global/repository/radiation/radiation_repository = new() else rad_power = new_power if(!flat) - range = min(round(sqrt(rad_power / config.radiation_lower_limit)), 31) // R = rad_power / dist**2 - Solve for dist + range = min(round(sqrt(rad_power / config_legacy.radiation_lower_limit)), 31) // R = rad_power / dist**2 - Solve for dist // Ray trace from all active radiation sources to T and return the strongest effect. /repository/radiation/proc/get_rads_at_turf(var/turf/T) @@ -61,7 +61,7 @@ var/global/repository/radiation/radiation_repository = new() origin = get_step_towards(origin, T) //Raytracing if(!(origin in resistance_cache)) //Only get the resistance if we don't already know it. origin.calc_rad_resistance() - working = max((working - (origin.cached_rad_resistance * config.radiation_resistance_multiplier)), 0) + working = max((working - (origin.cached_rad_resistance * config_legacy.radiation_resistance_multiplier)), 0) if(working <= .) break // Already affected by a stronger source (or its zero...) . = max((working * (1 / (dist ** 2))), .) //Butchered version of the inverse square law. Works for this purpose diff --git a/code/datums/world_topic.dm b/code/datums/world_topic.dm index c17129a8b85..41a8bfe1b06 100644 --- a/code/datums/world_topic.dm +++ b/code/datums/world_topic.dm @@ -26,7 +26,7 @@ var/require_comms_key = FALSE /datum/world_topic/proc/TryRun(list/input) - key_valid = config && config.comms_key == input["key"] && (config.comms_key != initial(config.comms_key)) //no fucking defaults allowed. + key_valid = config && config_legacy.comms_key == input["key"] && (config_legacy.comms_key != initial(config_legacy.comms_key)) //no fucking defaults allowed. //key_valid = config && (CONFIG_GET(string/comms_key) == input["key"]) if(require_comms_key && !key_valid) return "Bad Key" diff --git a/code/game/antagonist/alien/borer.dm b/code/game/antagonist/alien/borer.dm index e852bc8418f..533962164ae 100644 --- a/code/game/antagonist/alien/borer.dm +++ b/code/game/antagonist/alien/borer.dm @@ -63,7 +63,7 @@ var/datum/antagonist/borer/borers borer.forceMove(get_turf(pick(get_vents()))) /datum/antagonist/borer/attempt_random_spawn() - if(config.aliens_allowed) ..() + if(config_legacy.aliens_allowed) ..() /datum/antagonist/borer/proc/get_vents() var/list/vents = list() diff --git a/code/game/antagonist/alien/xenomorph.dm b/code/game/antagonist/alien/xenomorph.dm index e69db8aee7c..6459b61eb1e 100644 --- a/code/game/antagonist/alien/xenomorph.dm +++ b/code/game/antagonist/alien/xenomorph.dm @@ -27,7 +27,7 @@ var/datum/antagonist/xenos/xenomorphs xenomorphs = src /datum/antagonist/xenos/attempt_random_spawn() - if(config.aliens_allowed) ..() + if(config_legacy.aliens_allowed) ..() /datum/antagonist/xenos/proc/get_vents() var/list/vents = list() diff --git a/code/game/antagonist/antagonist.dm b/code/game/antagonist/antagonist.dm index 7496551c25f..0ba23511a1a 100644 --- a/code/game/antagonist/antagonist.dm +++ b/code/game/antagonist/antagonist.dm @@ -89,7 +89,7 @@ get_starting_locations() if(!role_text_plural) role_text_plural = role_text - if(config.protect_roles_from_antagonist) + if(config_legacy.protect_roles_from_antagonist) restricted_jobs |= protected_jobs if(antaghud_indicator) if(!hud_icon_reference) @@ -110,7 +110,7 @@ if(ghosts_only && !istype(player.current, /mob/observer/dead)) candidates -= player log_debug("[key_name(player)] is not eligible to become a [role_text]: Only ghosts may join as this role! They have been removed from the draft.") - else if(config.use_age_restriction_for_antags && player.current.client.player_age < minimum_player_age) + else if(config_legacy.use_age_restriction_for_antags && player.current.client.player_age < minimum_player_age) candidates -= player log_debug("[key_name(player)] is not eligible to become a [role_text]: Is only [player.current.client.player_age] day\s old, has to be [minimum_player_age] day\s!") else if(player.special_role) diff --git a/code/game/antagonist/antagonist_create.dm b/code/game/antagonist/antagonist_create.dm index a53037ead3e..af34c647f6a 100644 --- a/code/game/antagonist/antagonist_create.dm +++ b/code/game/antagonist/antagonist_create.dm @@ -102,13 +102,13 @@ player.current << "[leader_welcome_text]" else player.current << "[welcome_text]" - if (config.objectives_disabled) + if (config_legacy.objectives_disabled) player.current << "[antag_text]" if((flags & ANTAG_HAS_NUKE) && !spawned_nuke) create_nuke() - if (!config.objectives_disabled) + if (!config_legacy.objectives_disabled) show_objectives(player) return 1 diff --git a/code/game/antagonist/antagonist_helpers.dm b/code/game/antagonist/antagonist_helpers.dm index c8f2928ced7..b46e29c71ed 100644 --- a/code/game/antagonist/antagonist_helpers.dm +++ b/code/game/antagonist/antagonist_helpers.dm @@ -8,7 +8,7 @@ if(!ignore_role) if(player.assigned_role in restricted_jobs) return FALSE - if(config.protect_roles_from_antagonist && (player.assigned_role in protected_jobs)) + if(config_legacy.protect_roles_from_antagonist && (player.assigned_role in protected_jobs)) return FALSE return TRUE diff --git a/code/game/antagonist/antagonist_objectives.dm b/code/game/antagonist/antagonist_objectives.dm index 5dc6c5f327a..a09aefcc3e0 100644 --- a/code/game/antagonist/antagonist_objectives.dm +++ b/code/game/antagonist/antagonist_objectives.dm @@ -1,12 +1,12 @@ /datum/antagonist/proc/create_global_objectives() - if(config.objectives_disabled) + if(config_legacy.objectives_disabled) return 0 if(global_objectives && global_objectives.len) return 0 return 1 /datum/antagonist/proc/create_objectives(var/datum/mind/player) - if(config.objectives_disabled) + if(config_legacy.objectives_disabled) return 0 if(create_global_objectives() || global_objectives.len) player.objectives |= global_objectives @@ -17,7 +17,7 @@ /datum/antagonist/proc/check_victory() var/result = 1 - if(config.objectives_disabled) + if(config_legacy.objectives_disabled) return 1 if(global_objectives && global_objectives.len) for(var/datum/objective/O in global_objectives) diff --git a/code/game/antagonist/outsider/ninja.dm b/code/game/antagonist/outsider/ninja.dm index 02a314b1f3d..5a7872bd1b3 100644 --- a/code/game/antagonist/outsider/ninja.dm +++ b/code/game/antagonist/outsider/ninja.dm @@ -23,7 +23,7 @@ var/datum/antagonist/ninja/ninjas ninjas = src /datum/antagonist/ninja/attempt_random_spawn() - if(config.ninjas_allowed) ..() + if(config_legacy.ninjas_allowed) ..() /datum/antagonist/ninja/create_objectives(var/datum/mind/ninja) diff --git a/code/game/antagonist/outsider/raider.dm b/code/game/antagonist/outsider/raider.dm index c130d8e66fa..6b4167fa979 100644 --- a/code/game/antagonist/outsider/raider.dm +++ b/code/game/antagonist/outsider/raider.dm @@ -151,7 +151,7 @@ var/datum/antagonist/raider/raiders var/win_msg = "" //No objectives, go straight to the feedback. - if(config.objectives_disabled || !global_objectives.len) + if(config_legacy.objectives_disabled || !global_objectives.len) return var/success = global_objectives.len diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm index 15d90e81f05..d87cad0df9e 100644 --- a/code/game/atoms_movable.dm +++ b/code/game/atoms_movable.dm @@ -240,7 +240,7 @@ if(z in using_map.sealed_levels) return - if(config.use_overmap) + if(config_legacy.use_overmap) overmap_spacetravel(get_turf(src), src) return diff --git a/code/game/dna/dna_modifier.dm b/code/game/dna/dna_modifier.dm index 623ccc11a32..79df35fc22f 100644 --- a/code/game/dna/dna_modifier.dm +++ b/code/game/dna/dna_modifier.dm @@ -411,7 +411,7 @@ occupantData["isViableSubject"] = 0 occupantData["health"] = connected.occupant.health occupantData["maxHealth"] = connected.occupant.maxHealth - occupantData["minHealth"] = config.health_threshold_dead + occupantData["minHealth"] = config_legacy.health_threshold_dead occupantData["uniqueEnzymes"] = connected.occupant.dna.unique_enzymes occupantData["uniqueIdentity"] = connected.occupant.dna.uni_identity occupantData["structuralEnzymes"] = connected.occupant.dna.struc_enzymes diff --git a/code/game/gamemodes/cult/runes.dm b/code/game/gamemodes/cult/runes.dm index f250a8654c9..ad81353a9aa 100644 --- a/code/game/gamemodes/cult/runes.dm +++ b/code/game/gamemodes/cult/runes.dm @@ -286,7 +286,7 @@ var/list/sacrificed = list() H.sdisabilities &= ~BLIND for(var/obj/item/organ/E in H.bad_external_organs) var/obj/item/organ/external/affected = E - if((affected.damage < affected.min_broken_damage * config.organ_health_multiplier) && (affected.status & ORGAN_BROKEN)) + if((affected.damage < affected.min_broken_damage * config_legacy.organ_health_multiplier) && (affected.status & ORGAN_BROKEN)) affected.status &= ~ORGAN_BROKEN for(var/datum/wound/W in affected.wounds) if(istype(W, /datum/wound/internal_bleeding)) diff --git a/code/game/gamemodes/events.dm b/code/game/gamemodes/events.dm index 4b2ab0cd7d9..a698d738010 100644 --- a/code/game/gamemodes/events.dm +++ b/code/game/gamemodes/events.dm @@ -11,7 +11,7 @@ dust_swarm("weak") if(!event) //CARN: checks to see if random events are enabled. - if(config.allow_random_events) + if(config_legacy.allow_random_events) if(prob(eventchance)) event() hadevent = 1 @@ -26,7 +26,7 @@ var/eventNumbersToPickFrom = list(1,2,4,5,6,7,8,9,10,11,12,13,14, 15) //so ninjas don't cause "empty" events. - if((world.time/10)>=3600 && config.ninjas_allowed && !sent_ninja_to_station)//If an hour has passed, relatively speaking. Also, if ninjas are allowed to spawn and if there is not already a ninja for the round. + if((world.time/10)>=3600 && config_legacy.ninjas_allowed && !sent_ninja_to_station)//If an hour has passed, relatively speaking. Also, if ninjas are allowed to spawn and if there is not already a ninja for the round. eventNumbersToPickFrom += 3 switch(pick(eventNumbersToPickFrom)) if(1) @@ -70,7 +70,7 @@ qdel(P) */ if(3) - if((world.time/10)>=3600 && config.ninjas_allowed && !sent_ninja_to_station)//If an hour has passed, relatively speaking. Also, if ninjas are allowed to spawn and if there is not already a ninja for the round. + if((world.time/10)>=3600 && config_legacy.ninjas_allowed && !sent_ninja_to_station)//If an hour has passed, relatively speaking. Also, if ninjas are allowed to spawn and if there is not already a ninja for the round. space_ninja_arrival()//Handled in space_ninja.dm. Doesn't announce arrival, all sneaky-like. if(4) mini_blob_event() diff --git a/code/game/gamemodes/events/holidays/Holidays.dm b/code/game/gamemodes/events/holidays/Holidays.dm index 6673ce56147..1abbd424aa0 100644 --- a/code/game/gamemodes/events/holidays/Holidays.dm +++ b/code/game/gamemodes/events/holidays/Holidays.dm @@ -1,4 +1,4 @@ -//Uncommenting ALLOW_HOLIDAYS in config.txt will enable Holidays +//Uncommenting ALLOW_HOLIDAYS in config_legacy.txt will enable Holidays var/global/list/Holiday = list() //Holidays are lists now, so we can have more than one holiday at the same time (hey, you never know). //Just thinking ahead! Here's the foundations to a more robust Holiday event system. diff --git a/code/game/gamemodes/events/holidays/Other.dm b/code/game/gamemodes/events/holidays/Other.dm index bd64fda833f..d83ac82f9cc 100644 --- a/code/game/gamemodes/events/holidays/Other.dm +++ b/code/game/gamemodes/events/holidays/Other.dm @@ -3,7 +3,7 @@ hadevent = 1 message_admins("The apocalypse has begun! (this holiday event can be disabled by toggling events off within 60 seconds)") spawn(600) - if(!config.allow_random_events) return + if(!config_legacy.allow_random_events) return Show2Group4Delay(ScreenText(null,"
"} - for(var/mode in config.modes) - dat += {"[config.mode_names[mode]]
"} + for(var/mode in config_legacy.modes) + dat += {"[config_legacy.mode_names[mode]]
"} dat += {"Secret
"} dat += {"Random
"} dat += {"Now: [master_mode]"} @@ -925,8 +925,8 @@ if(master_mode != "secret") return alert(usr, "The game mode has to be secret!", null, null, null, null) var/dat = {"What game mode do you want to force secret to be? Use this if you want to change the game mode, but want the players to believe it's secret. This will only work if the current game mode is secret.
"} - for(var/mode in config.modes) - dat += {"[config.mode_names[mode]]
"} + for(var/mode in config_legacy.modes) + dat += {"[config_legacy.mode_names[mode]]
"} dat += {"Random (default)
"} dat += {"Now: [secret_force_mode]"} usr << browse(dat, "window=f_secret") @@ -937,9 +937,9 @@ if (ticker && ticker.mode) return alert(usr, "The game has already started.", null, null, null, null) master_mode = href_list["c_mode2"] - log_admin("[key_name(usr)] set the mode as [config.mode_names[master_mode]].") - message_admins("[key_name_admin(usr)] set the mode as [config.mode_names[master_mode]].", 1) - world << "The mode is now: [config.mode_names[master_mode]]" + log_admin("[key_name(usr)] set the mode as [config_legacy.mode_names[master_mode]].") + message_admins("[key_name_admin(usr)] set the mode as [config_legacy.mode_names[master_mode]].", 1) + world << "The mode is now: [config_legacy.mode_names[master_mode]]" Game() // updates the main game menu world.save_mode(master_mode) .(href, list("c_mode"=1)) @@ -1144,7 +1144,7 @@ usr << "This can only be used on instances of type /mob/living" return - if(config.allow_admin_rev) + if(config_legacy.allow_admin_rev) L.revive() message_admins("Admin [key_name_admin(usr)] healed / revived [key_name_admin(L)]!", 1) log_admin("[key_name(usr)] healed / Rrvived [key_name(L)]") @@ -1256,13 +1256,13 @@ to_chat(X, take_msg) to_chat(M, "Your adminhelp is being attended to by [usr.client]. Thanks for your patience!") // VoreStation Edit Start - if (config.chat_webhook_url) + if (config_legacy.chat_webhook_url) spawn(0) var/query_string = "type=admintake" - query_string += "&key=[url_encode(config.chat_webhook_key)]" + query_string += "&key=[url_encode(config_legacy.chat_webhook_key)]" query_string += "&admin=[url_encode(key_name(usr.client))]" query_string += "&user=[url_encode(key_name(M))]" - world.Export("[config.chat_webhook_url]?[query_string]") + world.Export("[config_legacy.chat_webhook_url]?[query_string]") // VoreStation Edit End else to_chat(usr, "Unable to locate mob.") @@ -1557,7 +1557,7 @@ else if(href_list["object_list"]) //this is the laggiest thing ever if(!check_rights(R_SPAWN)) return - if(!config.allow_admin_spawning) + if(!config_legacy.allow_admin_spawning) usr << "Spawning of items is not allowed." return diff --git a/code/modules/admin/verbs/adminhelp_vr.dm b/code/modules/admin/verbs/adminhelp_vr.dm index 9f3aee4a838..ac6bf1cc1fb 100644 --- a/code/modules/admin/verbs/adminhelp_vr.dm +++ b/code/modules/admin/verbs/adminhelp_vr.dm @@ -1,16 +1,16 @@ -/datum/admin_help/proc/send2adminchat() - if(!config.chat_webhook_url) +/datum/admin_help/proc/send2adminchat() + if(!config_legacy.chat_webhook_url) return - var/list/adm = get_admin_counts() + var/list/adm = get_admin_counts() var/list/afkmins = adm["afk"] var/list/allmins = adm["total"] spawn(0) //Unreliable world.Exports() var/query_string = "type=adminhelp" - query_string += "&key=[url_encode(config.chat_webhook_key)]" + query_string += "&key=[url_encode(config_legacy.chat_webhook_key)]" query_string += "&from=[url_encode(key_name(initiator))]" query_string += "&msg=[url_encode(html_decode(name))]" query_string += "&admin_number=[allmins.len]" query_string += "&admin_number_afk=[afkmins.len]" - world.Export("[config.chat_webhook_url]?[query_string]") + world.Export("[config_legacy.chat_webhook_url]?[query_string]") diff --git a/code/modules/admin/verbs/adminjump.dm b/code/modules/admin/verbs/adminjump.dm index 3208798ef14..d5168082df8 100644 --- a/code/modules/admin/verbs/adminjump.dm +++ b/code/modules/admin/verbs/adminjump.dm @@ -11,7 +11,7 @@ if(!check_rights(R_ADMIN|R_MOD|R_DEBUG)) return - if(config.allow_admin_jump) + if(config_legacy.allow_admin_jump) usr.on_mob_jump() usr.loc = pick(get_area_turfs(A)) @@ -26,7 +26,7 @@ set category = "Admin" if(!check_rights(R_ADMIN|R_MOD|R_DEBUG)) return - if(config.allow_admin_jump) + if(config_legacy.allow_admin_jump) log_admin("[key_name(usr)] jumped to [T.x],[T.y],[T.z] in [T.loc]") message_admins("[key_name_admin(usr)] jumped to [T.x],[T.y],[T.z] in [T.loc]", 1) usr.on_mob_jump() @@ -43,7 +43,7 @@ if(!check_rights(R_ADMIN|R_MOD|R_DEBUG)) return - if(config.allow_admin_jump) + if(config_legacy.allow_admin_jump) log_admin("[key_name(usr)] jumped to [key_name(M)]") message_admins("[key_name_admin(usr)] jumped to [key_name_admin(M)]", 1) if(src.mob) @@ -65,7 +65,7 @@ if(!check_rights(R_ADMIN|R_MOD|R_DEBUG)) return - if (config.allow_admin_jump) + if (config_legacy.allow_admin_jump) if(src.mob) var/mob/A = src.mob A.on_mob_jump() @@ -85,7 +85,7 @@ if(!check_rights(R_ADMIN|R_MOD|R_DEBUG)) return - if(config.allow_admin_jump) + if(config_legacy.allow_admin_jump) var/list/keys = list() for(var/mob/M in player_list) keys += M.client @@ -108,7 +108,7 @@ set desc = "Mob to teleport" if(!check_rights(R_ADMIN|R_MOD|R_DEBUG)) return - if(config.allow_admin_jump) + if(config_legacy.allow_admin_jump) log_admin("[key_name(usr)] jumped to [key_name(M)]") var/msg = "[key_name_admin(usr)] jumped to [key_name_admin(M)]" message_admins(msg) @@ -127,7 +127,7 @@ if(!check_rights(R_ADMIN|R_MOD|R_DEBUG)) return - if(config.allow_admin_jump) + if(config_legacy.allow_admin_jump) var/list/keys = list() for(var/mob/M in player_list) keys += M.client @@ -156,7 +156,7 @@ return var/area/A = input(usr, "Pick an area.", "Pick an area") in return_sorted_areas() if(A) - if(config.allow_admin_jump) + if(config_legacy.allow_admin_jump) M.on_mob_jump() M.loc = pick(get_area_turfs(A)) feedback_add_details("admin_verb","SMOB") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! diff --git a/code/modules/admin/verbs/adminpm.dm b/code/modules/admin/verbs/adminpm.dm index cdad6b41691..152dd0de720 100644 --- a/code/modules/admin/verbs/adminpm.dm +++ b/code/modules/admin/verbs/adminpm.dm @@ -181,8 +181,8 @@ //always play non-admin recipients the adminhelp sound recipient << 'sound/effects/adminhelp.ogg' - //AdminPM popup for ApocStation and anybody else who wants to use it. Set it with POPUP_ADMIN_PM in config.txt ~Carn - if(config.popup_admin_pm) + //AdminPM popup for ApocStation and anybody else who wants to use it. Set it with POPUP_ADMIN_PM in config_legacy.txt ~Carn + if(config_legacy.popup_admin_pm) spawn() //so we don't hold the caller proc up var/sender = src var/sendername = key diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm index 8a09d357046..f03ceeec2b1 100644 --- a/code/modules/admin/verbs/debug.dm +++ b/code/modules/admin/verbs/debug.dm @@ -64,9 +64,9 @@ to_chat(user, "\The [I] does [DPS] damage per second.") if(DPS > 0) to_chat(user, "At your maximum health ([user.getMaxHealth()]), it would take approximately;") - to_chat(user, "[(user.getMaxHealth() - config.health_threshold_softcrit) / DPS] seconds to softcrit you. ([config.health_threshold_softcrit] health)") - to_chat(user, "[(user.getMaxHealth() - config.health_threshold_crit) / DPS] seconds to hardcrit you. ([config.health_threshold_crit] health)") - to_chat(user, "[(user.getMaxHealth() - config.health_threshold_dead) / DPS] seconds to kill you. ([config.health_threshold_dead] health)") + to_chat(user, "[(user.getMaxHealth() - config_legacy.health_threshold_softcrit) / DPS] seconds to softcrit you. ([config_legacy.health_threshold_softcrit] health)") + to_chat(user, "[(user.getMaxHealth() - config_legacy.health_threshold_crit) / DPS] seconds to hardcrit you. ([config_legacy.health_threshold_crit] health)") + to_chat(user, "[(user.getMaxHealth() - config_legacy.health_threshold_dead) / DPS] seconds to kill you. ([config_legacy.health_threshold_dead] health)") else to_chat(user, "You need to be a living mob, with hands, and for an object to be in your active hand, to use this verb.") @@ -202,9 +202,9 @@ set category = "Server" set name = "Toggle Aliens" - config.aliens_allowed = !config.aliens_allowed - log_admin("[key_name(src)] has turned aliens [config.aliens_allowed ? "on" : "off"].") - message_admins("[key_name_admin(src)] has turned aliens [config.aliens_allowed ? "on" : "off"].", 0) + config_legacy.aliens_allowed = !config_legacy.aliens_allowed + log_admin("[key_name(src)] has turned aliens [config_legacy.aliens_allowed ? "on" : "off"].") + message_admins("[key_name_admin(src)] has turned aliens [config_legacy.aliens_allowed ? "on" : "off"].", 0) feedback_add_details("admin_verb","TAL") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/cmd_display_del_log() diff --git a/code/modules/admin/verbs/panicbunker.dm b/code/modules/admin/verbs/panicbunker.dm index 8b9948f829f..e1684eea57f 100644 --- a/code/modules/admin/verbs/panicbunker.dm +++ b/code/modules/admin/verbs/panicbunker.dm @@ -3,18 +3,18 @@ GLOBAL_LIST_EMPTY(PB_bypass) /client/proc/panicbunker() set category = "Server" set name = "Toggle Panic Bunker" - + if(!check_rights(R_ADMIN)) return - if (!config.sql_enabled) + if (!config_legacy.sql_enabled) to_chat(usr, "The Database is not enabled!") return - config.panic_bunker = (!config.panic_bunker) + config_legacy.panic_bunker = (!config_legacy.panic_bunker) - log_and_message_admins("[key_name(usr)] has toggled the Panic Bunker, it is now [(config.panic_bunker?"on":"off")]") - if (config.panic_bunker && (!dbcon || !dbcon.IsConnected())) + log_and_message_admins("[key_name(usr)] has toggled the Panic Bunker, it is now [(config_legacy.panic_bunker?"on":"off")]") + if (config_legacy.panic_bunker && (!dbcon || !dbcon.IsConnected())) message_admins("The Database is not connected! Panic bunker will not work until the connection is reestablished.") feedback_add_details("admin_verb","PANIC") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! @@ -22,7 +22,7 @@ GLOBAL_LIST_EMPTY(PB_bypass) set category = "Server" set name = "Add PB Bypass" set desc = "Allows a given ckey to connect despite the panic bunker for a given round." - if(!config.sql_enabled) + if(!config_legacy.sql_enabled) to_chat(usr, "The Database is not enabled!") return @@ -35,7 +35,7 @@ GLOBAL_LIST_EMPTY(PB_bypass) set category = "Server" set name = "Revoke PB Bypass" set desc = "Revoke's a ckey's permission to bypass the panic bunker for a given round." - if(!config.sql_enabled) + if(!config_legacy.sql_enabled) to_chat(usr, "The Database is not enabled!") return @@ -51,9 +51,9 @@ GLOBAL_LIST_EMPTY(PB_bypass) if(!check_rights(R_ADMIN)) return - config.paranoia_logging = (!config.paranoia_logging) + config_legacy.paranoia_logging = (!config_legacy.paranoia_logging) - log_and_message_admins("[key_name(usr)] has toggled Paranoia Logging, it is now [(config.paranoia_logging?"on":"off")]") - if (config.paranoia_logging && (!dbcon || !dbcon.IsConnected())) + log_and_message_admins("[key_name(usr)] has toggled Paranoia Logging, it is now [(config_legacy.paranoia_logging?"on":"off")]") + if (config_legacy.paranoia_logging && (!dbcon || !dbcon.IsConnected())) message_admins("The Database is not connected! Paranoia logging will not be able to give 'player age' (time since first connection) warnings, only Byond account warnings.") feedback_add_details("admin_verb","PARLOG") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! diff --git a/code/modules/admin/verbs/playsound.dm b/code/modules/admin/verbs/playsound.dm index a8c2072296d..619cedb14b0 100644 --- a/code/modules/admin/verbs/playsound.dm +++ b/code/modules/admin/verbs/playsound.dm @@ -60,7 +60,7 @@ var/ytdl = CONFIG_GET(string/invoke_youtubedl) if(!ytdl) - to_chat(src, "Youtube-dl was not configured, action unavailable") //Check config.txt for the INVOKE_YOUTUBEDL value + to_chat(src, "Youtube-dl was not configured, action unavailable") //Check config_legacy.txt for the INVOKE_YOUTUBEDL value return var/web_sound_input = input("Enter content URL (supported sites only, leave blank to stop playing)", "Play Internet Sound via youtube-dl") as text|null diff --git a/code/modules/admin/verbs/possess.dm b/code/modules/admin/verbs/possess.dm index aa100623ff1..9b20d786816 100644 --- a/code/modules/admin/verbs/possess.dm +++ b/code/modules/admin/verbs/possess.dm @@ -3,7 +3,7 @@ set category = "Object" if(istype(O,/obj/singularity)) - if(config.forbid_singulo_possession) + if(config_legacy.forbid_singulo_possession) usr << "It is forbidden to possess singularities." return diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index e7b147792f7..b96d89572f3 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -186,7 +186,7 @@ proc/cmd_admin_mute(mob/M as mob, mute_type, automute = 0) if(automute) - if(!config.automute_on) + if(!config_legacy.automute_on) return else if(!usr || !usr.client) @@ -298,7 +298,7 @@ Ccomp's first proc. return var/mob/observer/dead/G = ghosts[target] - if(G.has_enabled_antagHUD && config.antag_hud_restricted) + if(G.has_enabled_antagHUD && config_legacy.antag_hud_restricted) var/response = alert(src, "Are you sure you wish to allow this individual to play?","Ghost has used AntagHUD","Yes","No") if(response == "No") return G.timeofdeath=-19999 /* time of death is checked in /mob/verb/abandon_mob() which is the Respawn verb. @@ -321,7 +321,7 @@ Ccomp's first proc. if(!holder) src << "Only administrators may use this command." var/action="" - if(config.antag_hud_allowed) + if(config_legacy.antag_hud_allowed) for(var/mob/observer/dead/g in get_ghosts()) if(!g.client.holder) //Remove the verb from non-admin ghosts g.verbs -= /mob/observer/dead/verb/toggle_antagHUD @@ -329,7 +329,7 @@ Ccomp's first proc. g.antagHUD = 0 // Disable it on those that have it enabled g.has_enabled_antagHUD = 2 // We'll allow them to respawn g << "The Administrator has disabled AntagHUD " - config.antag_hud_allowed = 0 + config_legacy.antag_hud_allowed = 0 src << "AntagHUD usage has been disabled" action = "disabled" else @@ -337,7 +337,7 @@ Ccomp's first proc. if(!g.client.holder) // Add the verb back for all non-admin ghosts g.verbs += /mob/observer/dead/verb/toggle_antagHUD g << "The Administrator has enabled AntagHUD " // Notify all observers they can now use AntagHUD - config.antag_hud_allowed = 1 + config_legacy.antag_hud_allowed = 1 action = "enabled" src << "AntagHUD usage has been enabled" @@ -354,11 +354,11 @@ Ccomp's first proc. if(!holder) src << "Only administrators may use this command." var/action="" - if(config.antag_hud_restricted) + if(config_legacy.antag_hud_restricted) for(var/mob/observer/dead/g in get_ghosts()) g << "The administrator has lifted restrictions on joining the round if you use AntagHUD" action = "lifted restrictions" - config.antag_hud_restricted = 0 + config_legacy.antag_hud_restricted = 0 src << "AntagHUD restrictions have been lifted" else for(var/mob/observer/dead/g in get_ghosts()) @@ -367,7 +367,7 @@ Ccomp's first proc. g.antagHUD = 0 g.has_enabled_antagHUD = 0 action = "placed restrictions" - config.antag_hud_restricted = 1 + config_legacy.antag_hud_restricted = 1 src << "AntagHUD restrictions have been enabled" log_admin("[key_name(usr)] has [action] on joining the round if they use AntagHUD") @@ -576,7 +576,7 @@ Traitors and the like can also be revived with the previous role mostly intact. if(!istype(M)) alert("Cannot revive a ghost") return - if(config.allow_admin_rev) + if(config_legacy.allow_admin_rev) M.revive() log_admin("[key_name(usr)] healed / revived [key_name(M)]") @@ -772,7 +772,7 @@ Traitors and the like can also be revived with the previous role mostly intact. M << "To try to resolve this matter head to http://ss13.donglabs.com/forum/" log_admin("[usr.client.ckey] has banned [M.ckey].\nReason: [reason]\nThis will be removed in [mins] minutes.") message_admins("[usr.client.ckey] has banned [M.ckey].\nReason: [reason]\nThis will be removed in [mins] minutes.") - world.Export("http://216.38.134.132/adminlog.php?type=ban&key=[usr.client.key]&key2=[M.key]&msg=[html_decode(reason)]&time=[mins]&server=[replacetext(config.server_name, "#", "")]") + world.Export("http://216.38.134.132/adminlog.php?type=ban&key=[usr.client.key]&key2=[M.key]&msg=[html_decode(reason)]&time=[mins]&server=[replacetext(config_legacy.server_name, "#", "")]") del(M.client) qdel(M) else @@ -787,7 +787,7 @@ Traitors and the like can also be revived with the previous role mostly intact. M << "To try to resolve this matter head to http://ss13.donglabs.com/forum/" log_admin("[usr.client.ckey] has banned [M.ckey].\nReason: [reason]\nThis is a permanent ban.") message_admins("[usr.client.ckey] has banned [M.ckey].\nReason: [reason]\nThis is a permanent ban.") - world.Export("http://216.38.134.132/adminlog.php?type=ban&key=[usr.client.key]&key2=[M.key]&msg=[html_decode(reason)]&time=perma&server=[replacetext(config.server_name, "#", "")]") + world.Export("http://216.38.134.132/adminlog.php?type=ban&key=[usr.client.key]&key2=[M.key]&msg=[html_decode(reason)]&time=perma&server=[replacetext(config_legacy.server_name, "#", "")]") del(M.client) qdel(M) */ @@ -969,12 +969,12 @@ Traitors and the like can also be revived with the previous role mostly intact. set desc = "Toggles random events such as meteors, black holes, blob (but not space dust) on/off" if(!check_rights(R_SERVER|R_EVENT)) return - if(!config.allow_random_events) - config.allow_random_events = 1 + if(!config_legacy.allow_random_events) + config_legacy.allow_random_events = 1 usr << "Random events enabled" message_admins("Admin [key_name_admin(usr)] has enabled random events.", 1) else - config.allow_random_events = 0 + config_legacy.allow_random_events = 0 usr << "Random events disabled" message_admins("Admin [key_name_admin(usr)] has disabled random events.", 1) feedback_add_details("admin_verb","TRE") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! diff --git a/code/modules/admin/verbs/ticklag.dm b/code/modules/admin/verbs/ticklag.dm index b5255af3a8d..fd29074ed9e 100644 --- a/code/modules/admin/verbs/ticklag.dm +++ b/code/modules/admin/verbs/ticklag.dm @@ -15,9 +15,9 @@ world.tick_lag = newtick feedback_add_details("admin_verb","TICKLAG") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! - switch(alert("Enable Tick Compensation?","Tick Comp is currently: [config.Tickcomp]","Yes","No")) - if("Yes") config.Tickcomp = 1 - else config.Tickcomp = 0 + switch(alert("Enable Tick Compensation?","Tick Comp is currently: [config_legacy.Tickcomp]","Yes","No")) + if("Yes") config_legacy.Tickcomp = 1 + else config_legacy.Tickcomp = 0 else src << "Error: ticklag(): Invalid world.ticklag value. No changes made." diff --git a/code/modules/awaymissions/gateway.dm b/code/modules/awaymissions/gateway.dm index 67431dd7877..aef14cde408 100644 --- a/code/modules/awaymissions/gateway.dm +++ b/code/modules/awaymissions/gateway.dm @@ -36,7 +36,7 @@ /obj/machinery/gateway/centerstation/Initialize() update_icon() - wait = world.time + config.gateway_delay //+ thirty minutes default + wait = world.time + config_legacy.gateway_delay //+ thirty minutes default awaygate = locate(/obj/machinery/gateway/centeraway) . = ..() density = 1 //VOREStation Add diff --git a/code/modules/client/client_click.dm b/code/modules/client/client_click.dm index be5e9a9b403..cda81fb5d60 100644 --- a/code/modules/client/client_click.dm +++ b/code/modules/client/client_click.dm @@ -3,7 +3,7 @@ var/list/L = params2list(params) if (object && object == middragatom && L["left"]) ab = max(0, 5 SECONDS-(world.time-middragtime)*0.1) - var/mcl = config.minute_click_limit //CONFIG_GET(number/minute_click_limit) + var/mcl = config_legacy.minute_click_limit //CONFIG_GET(number/minute_click_limit) if (!holder && mcl) var/minute = round(world.time, 600) if (!clicklimiter) @@ -28,7 +28,7 @@ to_chat(src, "[msg]") return - var/scl = config.second_click_limit //CONFIG_GET(number/second_click_limit) + var/scl = config_legacy.second_click_limit //CONFIG_GET(number/second_click_limit) if (!holder && scl) var/second = round(world.time, 10) if (!clicklimiter) diff --git a/code/modules/client/client_procs.dm b/code/modules/client/client_procs.dm index 4d78049331d..84204d5a9ff 100644 --- a/code/modules/client/client_procs.dm +++ b/code/modules/client/client_procs.dm @@ -23,7 +23,7 @@ if(!(connection in list("seeker", "web"))) //Invalid connection type. return null - if(!config.guests_allowed && IsGuestKey(key)) + if(!config_legacy.guests_allowed && IsGuestKey(key)) alert(src,"This server doesn't allow guest accounts to play. Please go to http://www.byond.com/ and register for a key.","Guest","OK") del(src) return @@ -113,12 +113,12 @@ if(prefs.lastchangelog != changelog_hash) //bolds the changelog button on the interface so we know there are updates. src << "You have unread updates in the changelog." winset(src, "rpane.changelog", "background-color=#eaeaea;font-style=bold") - if(config.aggressive_changelog) + if(config_legacy.aggressive_changelog) src.changes() hook_vr("client_new",list(src)) //VOREStation Code - if(config.paranoia_logging) + if(config_legacy.paranoia_logging) if(isnum(player_age) && player_age == -1) log_and_message_admins("PARANOIA: [key_name(src)] has connected here for the first time.") if(isnum(account_age) && account_age <= 2) @@ -244,17 +244,17 @@ //Panic bunker code if ((player_age == -1) && !(ckey in GLOB.PB_bypass)) //first connection - if (config.panic_bunker && !holder && !deadmin_holder) + if (config_legacy.panic_bunker && !holder && !deadmin_holder) log_adminwarn("Failed Login: [key] - New account attempting to connect during panic bunker") message_admins("Failed Login: [key] - New account attempting to connect during panic bunker") - to_chat(src, config.panic_bunker_message) + to_chat(src, config_legacy.panic_bunker_message) qdel(src) return 0 if(player_age == -1) player_age = 0 //math requires this to not be -1. // VOREStation Edit Start - Department Hours - if(config.time_off) + if(config_legacy.time_off) var/DBQuery/query_hours = dbcon.NewQuery("SELECT department, hours FROM vr_player_hours WHERE ckey = '[sql_ckey]'") query_hours.Execute() while(query_hours.NextRow()) diff --git a/code/modules/client/client_topic.dm b/code/modules/client/client_topic.dm index f18160abd9d..6500af16ffc 100644 --- a/code/modules/client/client_topic.dm +++ b/code/modules/client/client_topic.dm @@ -32,7 +32,7 @@ src << browse("...", "window=asset_cache_browser") */ - var/mtl = config.minute_topic_limit //CONFIG_GET(number/minute_topic_limit) + var/mtl = config_legacy.minute_topic_limit //CONFIG_GET(number/minute_topic_limit) if (!holder && mtl) var/minute = round(world.time, 600) if (!topiclimiter) @@ -51,7 +51,7 @@ to_chat(src, "[msg]") return - var/stl = config.second_topic_limit //CONFIG_GET(number/second_topic_limit) + var/stl = config_legacy.second_topic_limit //CONFIG_GET(number/second_topic_limit) if (!holder && stl) var/second = round(world.time, 10) if (!topiclimiter) @@ -93,7 +93,7 @@ //Logs all hrefs - if(config && config.log_hrefs && href_logfile) + if(config && config_legacy.log_hrefs && href_logfile) log_href("[src] (usr:[usr]) || [hsrc ? "[hsrc] " : ""][href]") switch(href_list["_src_"]) diff --git a/code/modules/client/preference_setup/general/01_basic.dm b/code/modules/client/preference_setup/general/01_basic.dm index 6b93b33fafc..f1017921b62 100644 --- a/code/modules/client/preference_setup/general/01_basic.dm +++ b/code/modules/client/preference_setup/general/01_basic.dm @@ -1,161 +1,161 @@ -datum/preferences - var/biological_gender = MALE - var/identifying_gender = MALE - -datum/preferences/proc/set_biological_gender(var/gender) - biological_gender = gender - identifying_gender = gender - -/datum/category_item/player_setup_item/general/basic - name = "Basic" - sort_order = 1 - -/datum/category_item/player_setup_item/general/basic/load_character(var/savefile/S) - S["real_name"] >> pref.real_name - S["nickname"] >> pref.nickname - S["name_is_always_random"] >> pref.be_random_name - S["gender"] >> pref.biological_gender - S["id_gender"] >> pref.identifying_gender - S["age"] >> pref.age - S["spawnpoint"] >> pref.spawnpoint - S["OOC_Notes"] >> pref.metadata - -/datum/category_item/player_setup_item/general/basic/save_character(var/savefile/S) - S["real_name"] << pref.real_name - S["nickname"] << pref.nickname - S["name_is_always_random"] << pref.be_random_name - S["gender"] << pref.biological_gender - S["id_gender"] << pref.identifying_gender - S["age"] << pref.age - S["spawnpoint"] << pref.spawnpoint - S["OOC_Notes"] << pref.metadata - -/datum/category_item/player_setup_item/general/basic/sanitize_character() - pref.age = sanitize_integer(pref.age, get_min_age(), get_max_age(), initial(pref.age)) - pref.biological_gender = sanitize_inlist(pref.biological_gender, get_genders(), pick(get_genders())) - pref.identifying_gender = (pref.identifying_gender in all_genders_define_list) ? pref.identifying_gender : pref.biological_gender - pref.real_name = sanitize_name(pref.real_name, pref.species, is_FBP()) - if(!pref.real_name) - pref.real_name = random_name(pref.identifying_gender, pref.species) - pref.nickname = sanitize_name(pref.nickname) - pref.spawnpoint = sanitize_inlist(pref.spawnpoint, spawntypes, initial(pref.spawnpoint)) - pref.be_random_name = sanitize_integer(pref.be_random_name, 0, 1, initial(pref.be_random_name)) - -// Moved from /datum/preferences/proc/copy_to() -/datum/category_item/player_setup_item/general/basic/copy_to_mob(var/mob/living/carbon/human/character) - if(config.humans_need_surnames) - var/firstspace = findtext(pref.real_name, " ") - var/name_length = length(pref.real_name) - if(!firstspace) //we need a surname - pref.real_name += " [pick(last_names)]" - else if(firstspace == name_length) - pref.real_name += "[pick(last_names)]" - - character.real_name = pref.real_name - character.name = character.real_name - if(character.dna) - character.dna.real_name = character.real_name - - character.nickname = pref.nickname - - character.gender = pref.biological_gender - character.identifying_gender = pref.identifying_gender - character.age = pref.age - -/datum/category_item/player_setup_item/general/basic/content() - . = list() - . += "Name: " - . += "[pref.real_name]
" - . += "Randomize Name
" - . += "Always Random Name: [pref.be_random_name ? "Yes" : "No"]
" - . += "Nickname: " - . += "[pref.nickname]" - . += "
" - . += "Biological Sex: [gender2text(pref.biological_gender)]
" - . += "Pronouns: [gender2text(pref.identifying_gender)]
" - . += "Age: [pref.age]
" - . += "Spawn Point: [pref.spawnpoint]
" - if(config.allow_Metadata) - . += "OOC Notes: Edit
" - . = jointext(.,null) - -/datum/category_item/player_setup_item/general/basic/OnTopic(var/href,var/list/href_list, var/mob/user) - if(href_list["rename"]) - var/raw_name = input(user, "Choose your character's name:", "Character Name") as text|null - if (!isnull(raw_name) && CanUseTopic(user)) - var/new_name = sanitize_name(raw_name, pref.species, is_FBP()) - if(new_name) - pref.real_name = new_name - return TOPIC_REFRESH - else - user << "Invalid name. Your name should be at least 2 and at most [MAX_NAME_LEN] characters long. It may only contain the characters A-Z, a-z, -, ' and ." - return TOPIC_NOACTION - - else if(href_list["random_name"]) - pref.real_name = random_name(pref.identifying_gender, pref.species) - return TOPIC_REFRESH - - else if(href_list["always_random_name"]) - pref.be_random_name = !pref.be_random_name - return TOPIC_REFRESH - - else if(href_list["nickname"]) - var/raw_nickname = input(user, "Choose your character's nickname:", "Character Nickname") as text|null - if (!isnull(raw_nickname) && CanUseTopic(user)) - var/new_nickname = sanitize_name(raw_nickname, pref.species, is_FBP()) - if(new_nickname) - pref.nickname = new_nickname - return TOPIC_REFRESH - else - user << "Invalid name. Your name should be at least 2 and at most [MAX_NAME_LEN] characters long. It may only contain the characters A-Z, a-z, -, ' and ." - return TOPIC_NOACTION - - else if(href_list["bio_gender"]) - var/new_gender = input(user, "Choose your character's biological sex:", "Character Preference", pref.biological_gender) as null|anything in get_genders() - if(new_gender && CanUseTopic(user)) - pref.set_biological_gender(new_gender) - return TOPIC_REFRESH_UPDATE_PREVIEW - - else if(href_list["id_gender"]) - var/new_gender = input(user, "Choose your character's pronouns:", "Character Preference", pref.identifying_gender) as null|anything in all_genders_define_list - if(new_gender && CanUseTopic(user)) - pref.identifying_gender = new_gender - return TOPIC_REFRESH - - else if(href_list["age"]) - var/min_age = get_min_age() - var/max_age = get_max_age() - var/new_age = input(user, "Choose your character's age:\n([min_age]-[max_age])", "Character Preference", pref.age) as num|null - if(new_age && CanUseTopic(user)) - pref.age = max(min(round(text2num(new_age)), max_age), min_age) - return TOPIC_REFRESH - - else if(href_list["spawnpoint"]) - var/list/spawnkeys = list() - for(var/spawntype in spawntypes) - spawnkeys += spawntype - var/choice = input(user, "Where would you like to spawn when late-joining?") as null|anything in spawnkeys - if(!choice || !spawntypes[choice] || !CanUseTopic(user)) return TOPIC_NOACTION - pref.spawnpoint = choice - return TOPIC_REFRESH - - else if(href_list["metadata"]) - var/new_metadata = sanitize(input(user, "Enter any information you'd like others to see, such as Roleplay-preferences:", "Game Preference" , html_decode(pref.metadata)) as message, extra = 0) //VOREStation Edit - if(new_metadata && CanUseTopic(user)) - pref.metadata = new_metadata - return TOPIC_REFRESH - - return ..() - -/datum/category_item/player_setup_item/general/basic/proc/get_genders() - var/datum/species/S - if(pref.species) - S = all_species[pref.species] - else - S = all_species[SPECIES_HUMAN] - var/list/possible_genders = S.genders - if(!pref.organ_data || pref.organ_data[BP_TORSO] != "cyborg") - return possible_genders - possible_genders = possible_genders.Copy() - possible_genders |= NEUTER - return possible_genders +datum/preferences + var/biological_gender = MALE + var/identifying_gender = MALE + +datum/preferences/proc/set_biological_gender(var/gender) + biological_gender = gender + identifying_gender = gender + +/datum/category_item/player_setup_item/general/basic + name = "Basic" + sort_order = 1 + +/datum/category_item/player_setup_item/general/basic/load_character(var/savefile/S) + S["real_name"] >> pref.real_name + S["nickname"] >> pref.nickname + S["name_is_always_random"] >> pref.be_random_name + S["gender"] >> pref.biological_gender + S["id_gender"] >> pref.identifying_gender + S["age"] >> pref.age + S["spawnpoint"] >> pref.spawnpoint + S["OOC_Notes"] >> pref.metadata + +/datum/category_item/player_setup_item/general/basic/save_character(var/savefile/S) + S["real_name"] << pref.real_name + S["nickname"] << pref.nickname + S["name_is_always_random"] << pref.be_random_name + S["gender"] << pref.biological_gender + S["id_gender"] << pref.identifying_gender + S["age"] << pref.age + S["spawnpoint"] << pref.spawnpoint + S["OOC_Notes"] << pref.metadata + +/datum/category_item/player_setup_item/general/basic/sanitize_character() + pref.age = sanitize_integer(pref.age, get_min_age(), get_max_age(), initial(pref.age)) + pref.biological_gender = sanitize_inlist(pref.biological_gender, get_genders(), pick(get_genders())) + pref.identifying_gender = (pref.identifying_gender in all_genders_define_list) ? pref.identifying_gender : pref.biological_gender + pref.real_name = sanitize_name(pref.real_name, pref.species, is_FBP()) + if(!pref.real_name) + pref.real_name = random_name(pref.identifying_gender, pref.species) + pref.nickname = sanitize_name(pref.nickname) + pref.spawnpoint = sanitize_inlist(pref.spawnpoint, spawntypes, initial(pref.spawnpoint)) + pref.be_random_name = sanitize_integer(pref.be_random_name, 0, 1, initial(pref.be_random_name)) + +// Moved from /datum/preferences/proc/copy_to() +/datum/category_item/player_setup_item/general/basic/copy_to_mob(var/mob/living/carbon/human/character) + if(config_legacy.humans_need_surnames) + var/firstspace = findtext(pref.real_name, " ") + var/name_length = length(pref.real_name) + if(!firstspace) //we need a surname + pref.real_name += " [pick(last_names)]" + else if(firstspace == name_length) + pref.real_name += "[pick(last_names)]" + + character.real_name = pref.real_name + character.name = character.real_name + if(character.dna) + character.dna.real_name = character.real_name + + character.nickname = pref.nickname + + character.gender = pref.biological_gender + character.identifying_gender = pref.identifying_gender + character.age = pref.age + +/datum/category_item/player_setup_item/general/basic/content() + . = list() + . += "Name: " + . += "[pref.real_name]
" + . += "Randomize Name
" + . += "Always Random Name: [pref.be_random_name ? "Yes" : "No"]
" + . += "Nickname: " + . += "[pref.nickname]" + . += "
" + . += "Biological Sex: [gender2text(pref.biological_gender)]
" + . += "Pronouns: [gender2text(pref.identifying_gender)]
" + . += "Age: [pref.age]
" + . += "Spawn Point: [pref.spawnpoint]
" + if(config_legacy.allow_Metadata) + . += "OOC Notes: Edit
" + . = jointext(.,null) + +/datum/category_item/player_setup_item/general/basic/OnTopic(var/href,var/list/href_list, var/mob/user) + if(href_list["rename"]) + var/raw_name = input(user, "Choose your character's name:", "Character Name") as text|null + if (!isnull(raw_name) && CanUseTopic(user)) + var/new_name = sanitize_name(raw_name, pref.species, is_FBP()) + if(new_name) + pref.real_name = new_name + return TOPIC_REFRESH + else + user << "Invalid name. Your name should be at least 2 and at most [MAX_NAME_LEN] characters long. It may only contain the characters A-Z, a-z, -, ' and ." + return TOPIC_NOACTION + + else if(href_list["random_name"]) + pref.real_name = random_name(pref.identifying_gender, pref.species) + return TOPIC_REFRESH + + else if(href_list["always_random_name"]) + pref.be_random_name = !pref.be_random_name + return TOPIC_REFRESH + + else if(href_list["nickname"]) + var/raw_nickname = input(user, "Choose your character's nickname:", "Character Nickname") as text|null + if (!isnull(raw_nickname) && CanUseTopic(user)) + var/new_nickname = sanitize_name(raw_nickname, pref.species, is_FBP()) + if(new_nickname) + pref.nickname = new_nickname + return TOPIC_REFRESH + else + user << "Invalid name. Your name should be at least 2 and at most [MAX_NAME_LEN] characters long. It may only contain the characters A-Z, a-z, -, ' and ." + return TOPIC_NOACTION + + else if(href_list["bio_gender"]) + var/new_gender = input(user, "Choose your character's biological sex:", "Character Preference", pref.biological_gender) as null|anything in get_genders() + if(new_gender && CanUseTopic(user)) + pref.set_biological_gender(new_gender) + return TOPIC_REFRESH_UPDATE_PREVIEW + + else if(href_list["id_gender"]) + var/new_gender = input(user, "Choose your character's pronouns:", "Character Preference", pref.identifying_gender) as null|anything in all_genders_define_list + if(new_gender && CanUseTopic(user)) + pref.identifying_gender = new_gender + return TOPIC_REFRESH + + else if(href_list["age"]) + var/min_age = get_min_age() + var/max_age = get_max_age() + var/new_age = input(user, "Choose your character's age:\n([min_age]-[max_age])", "Character Preference", pref.age) as num|null + if(new_age && CanUseTopic(user)) + pref.age = max(min(round(text2num(new_age)), max_age), min_age) + return TOPIC_REFRESH + + else if(href_list["spawnpoint"]) + var/list/spawnkeys = list() + for(var/spawntype in spawntypes) + spawnkeys += spawntype + var/choice = input(user, "Where would you like to spawn when late-joining?") as null|anything in spawnkeys + if(!choice || !spawntypes[choice] || !CanUseTopic(user)) return TOPIC_NOACTION + pref.spawnpoint = choice + return TOPIC_REFRESH + + else if(href_list["metadata"]) + var/new_metadata = sanitize(input(user, "Enter any information you'd like others to see, such as Roleplay-preferences:", "Game Preference" , html_decode(pref.metadata)) as message, extra = 0) //VOREStation Edit + if(new_metadata && CanUseTopic(user)) + pref.metadata = new_metadata + return TOPIC_REFRESH + + return ..() + +/datum/category_item/player_setup_item/general/basic/proc/get_genders() + var/datum/species/S + if(pref.species) + S = all_species[pref.species] + else + S = all_species[SPECIES_HUMAN] + var/list/possible_genders = S.genders + if(!pref.organ_data || pref.organ_data[BP_TORSO] != "cyborg") + return possible_genders + possible_genders = possible_genders.Copy() + possible_genders |= NEUTER + return possible_genders diff --git a/code/modules/client/preference_setup/general/02_language.dm b/code/modules/client/preference_setup/general/02_language.dm index 22c8fd1267a..f8c2a132693 100644 --- a/code/modules/client/preference_setup/general/02_language.dm +++ b/code/modules/client/preference_setup/general/02_language.dm @@ -1,97 +1,97 @@ -/datum/category_item/player_setup_item/general/language - name = "Language" - sort_order = 2 - -/datum/category_item/player_setup_item/general/language/load_character(var/savefile/S) - S["language"] >> pref.alternate_languages - S["language_prefixes"] >> pref.language_prefixes - -/datum/category_item/player_setup_item/general/language/save_character(var/savefile/S) - S["language"] << pref.alternate_languages - S["language_prefixes"] << pref.language_prefixes - -/datum/category_item/player_setup_item/general/language/sanitize_character() - if(!islist(pref.alternate_languages)) pref.alternate_languages = list() - if(pref.species) - var/datum/species/S = all_species[pref.species] - if(S && pref.alternate_languages.len > S.num_alternate_languages) - pref.alternate_languages.len = S.num_alternate_languages // Truncate to allowed length - if(isnull(pref.language_prefixes) || !pref.language_prefixes.len) - pref.language_prefixes = config.language_prefixes.Copy() - -/datum/category_item/player_setup_item/general/language/content() - . += "Languages
" - var/datum/species/S = all_species[pref.species] - if(S.language) - . += "- [S.language]
" - if(S.default_language && S.default_language != S.language) - . += "- [S.default_language]
" - if(S.num_alternate_languages) - if(pref.alternate_languages.len) - for(var/i = 1 to pref.alternate_languages.len) - var/lang = pref.alternate_languages[i] - . += "- [lang] - remove
" - - if(pref.alternate_languages.len < S.num_alternate_languages) - . += "- add ([S.num_alternate_languages - pref.alternate_languages.len] remaining)
" - else - . += "- [pref.species] cannot choose secondary languages.
" - - . += "Language Keys
" - . += " [jointext(pref.language_prefixes, " ")] Change Reset
" - -/datum/category_item/player_setup_item/general/language/OnTopic(var/href,var/list/href_list, var/mob/user) - if(href_list["remove_language"]) - var/index = text2num(href_list["remove_language"]) - pref.alternate_languages.Cut(index, index+1) - return TOPIC_REFRESH - else if(href_list["add_language"]) - var/datum/species/S = all_species[pref.species] - if(pref.alternate_languages.len >= S.num_alternate_languages) - alert(user, "You have already selected the maximum number of alternate languages for this species!") - else - var/list/available_languages = S.secondary_langs.Copy() - for(var/L in all_languages) - var/datum/language/lang = all_languages[L] - if(!(lang.flags & RESTRICTED) && (is_lang_whitelisted(user, lang))) - available_languages |= L - - // make sure we don't let them waste slots on the default languages - available_languages -= S.language - available_languages -= S.default_language - available_languages -= pref.alternate_languages - - if(!available_languages.len) - alert(user, "There are no additional languages available to select.") - else - var/new_lang = input(user, "Select an additional language", "Character Generation", null) as null|anything in available_languages - if(new_lang && pref.alternate_languages.len < S.num_alternate_languages) - pref.alternate_languages |= new_lang - return TOPIC_REFRESH - - else if(href_list["change_prefix"]) - var/char - var/keys[0] - do - char = input("Enter a single special character.\nYou may re-select the same characters.\nThe following characters are already in use by radio: ; : .\nThe following characters are already in use by special say commands: ! * ^", "Enter Character - [3 - keys.len] remaining") as null|text - if(char) - if(length(char) > 1) - alert(user, "Only single characters allowed.", "Error", "Ok") - else if(char in list(";", ":", ".")) - alert(user, "Radio character. Rejected.", "Error", "Ok") - else if(char in list("!","*", "^")) - alert(user, "Say character. Rejected.", "Error", "Ok") - else if(contains_az09(char)) - alert(user, "Non-special character. Rejected.", "Error", "Ok") - else - keys.Add(char) - while(char && keys.len < 3) - - if(keys.len == 3) - pref.language_prefixes = keys - return TOPIC_REFRESH - else if(href_list["reset_prefix"]) - pref.language_prefixes = config.language_prefixes.Copy() - return TOPIC_REFRESH - - return ..() +/datum/category_item/player_setup_item/general/language + name = "Language" + sort_order = 2 + +/datum/category_item/player_setup_item/general/language/load_character(var/savefile/S) + S["language"] >> pref.alternate_languages + S["language_prefixes"] >> pref.language_prefixes + +/datum/category_item/player_setup_item/general/language/save_character(var/savefile/S) + S["language"] << pref.alternate_languages + S["language_prefixes"] << pref.language_prefixes + +/datum/category_item/player_setup_item/general/language/sanitize_character() + if(!islist(pref.alternate_languages)) pref.alternate_languages = list() + if(pref.species) + var/datum/species/S = all_species[pref.species] + if(S && pref.alternate_languages.len > S.num_alternate_languages) + pref.alternate_languages.len = S.num_alternate_languages // Truncate to allowed length + if(isnull(pref.language_prefixes) || !pref.language_prefixes.len) + pref.language_prefixes = config_legacy.language_prefixes.Copy() + +/datum/category_item/player_setup_item/general/language/content() + . += "Languages
" + var/datum/species/S = all_species[pref.species] + if(S.language) + . += "- [S.language]
" + if(S.default_language && S.default_language != S.language) + . += "- [S.default_language]
" + if(S.num_alternate_languages) + if(pref.alternate_languages.len) + for(var/i = 1 to pref.alternate_languages.len) + var/lang = pref.alternate_languages[i] + . += "- [lang] - remove
" + + if(pref.alternate_languages.len < S.num_alternate_languages) + . += "- add ([S.num_alternate_languages - pref.alternate_languages.len] remaining)
" + else + . += "- [pref.species] cannot choose secondary languages.
" + + . += "Language Keys
" + . += " [jointext(pref.language_prefixes, " ")] Change Reset
" + +/datum/category_item/player_setup_item/general/language/OnTopic(var/href,var/list/href_list, var/mob/user) + if(href_list["remove_language"]) + var/index = text2num(href_list["remove_language"]) + pref.alternate_languages.Cut(index, index+1) + return TOPIC_REFRESH + else if(href_list["add_language"]) + var/datum/species/S = all_species[pref.species] + if(pref.alternate_languages.len >= S.num_alternate_languages) + alert(user, "You have already selected the maximum number of alternate languages for this species!") + else + var/list/available_languages = S.secondary_langs.Copy() + for(var/L in all_languages) + var/datum/language/lang = all_languages[L] + if(!(lang.flags & RESTRICTED) && (is_lang_whitelisted(user, lang))) + available_languages |= L + + // make sure we don't let them waste slots on the default languages + available_languages -= S.language + available_languages -= S.default_language + available_languages -= pref.alternate_languages + + if(!available_languages.len) + alert(user, "There are no additional languages available to select.") + else + var/new_lang = input(user, "Select an additional language", "Character Generation", null) as null|anything in available_languages + if(new_lang && pref.alternate_languages.len < S.num_alternate_languages) + pref.alternate_languages |= new_lang + return TOPIC_REFRESH + + else if(href_list["change_prefix"]) + var/char + var/keys[0] + do + char = input("Enter a single special character.\nYou may re-select the same characters.\nThe following characters are already in use by radio: ; : .\nThe following characters are already in use by special say commands: ! * ^", "Enter Character - [3 - keys.len] remaining") as null|text + if(char) + if(length(char) > 1) + alert(user, "Only single characters allowed.", "Error", "Ok") + else if(char in list(";", ":", ".")) + alert(user, "Radio character. Rejected.", "Error", "Ok") + else if(char in list("!","*", "^")) + alert(user, "Say character. Rejected.", "Error", "Ok") + else if(contains_az09(char)) + alert(user, "Non-special character. Rejected.", "Error", "Ok") + else + keys.Add(char) + while(char && keys.len < 3) + + if(keys.len == 3) + pref.language_prefixes = keys + return TOPIC_REFRESH + else if(href_list["reset_prefix"]) + pref.language_prefixes = config_legacy.language_prefixes.Copy() + return TOPIC_REFRESH + + return ..() diff --git a/code/modules/client/preference_setup/global/01_ui.dm b/code/modules/client/preference_setup/global/01_ui.dm index 5b1314d05f6..494158f3cd8 100644 --- a/code/modules/client/preference_setup/global/01_ui.dm +++ b/code/modules/client/preference_setup/global/01_ui.dm @@ -1,96 +1,96 @@ -/datum/category_item/player_setup_item/player_global/ui - name = "UI" - sort_order = 1 - -/datum/category_item/player_setup_item/player_global/ui/load_preferences(var/savefile/S) - S["UI_style"] >> pref.UI_style - S["UI_style_color"] >> pref.UI_style_color - S["UI_style_alpha"] >> pref.UI_style_alpha - S["ooccolor"] >> pref.ooccolor - S["tooltipstyle"] >> pref.tooltipstyle - S["client_fps"] >> pref.client_fps - -/datum/category_item/player_setup_item/player_global/ui/save_preferences(var/savefile/S) - S["UI_style"] << pref.UI_style - S["UI_style_color"] << pref.UI_style_color - S["UI_style_alpha"] << pref.UI_style_alpha - S["ooccolor"] << pref.ooccolor - S["tooltipstyle"] << pref.tooltipstyle - S["client_fps"] << pref.client_fps - -/datum/category_item/player_setup_item/player_global/ui/sanitize_preferences() - pref.UI_style = sanitize_inlist(pref.UI_style, all_ui_styles, initial(pref.UI_style)) - pref.UI_style_color = sanitize_hexcolor(pref.UI_style_color, initial(pref.UI_style_color)) - pref.UI_style_alpha = sanitize_integer(pref.UI_style_alpha, 0, 255, initial(pref.UI_style_alpha)) - pref.ooccolor = sanitize_hexcolor(pref.ooccolor, initial(pref.ooccolor)) - pref.tooltipstyle = sanitize_inlist(pref.tooltipstyle, all_tooltip_styles, initial(pref.tooltipstyle)) - pref.client_fps = sanitize_integer(pref.client_fps, 0, MAX_CLIENT_FPS, initial(pref.client_fps)) - -/datum/category_item/player_setup_item/player_global/ui/content(var/mob/user) - . = "UI Style: [pref.UI_style]
" - . += "Custom UI (recommended for White UI):
" - . += "-Color: [pref.UI_style_color]
| __ |
" - . += "-Alpha(transparency): [pref.UI_style_alpha] reset
" - . += "Tooltip Style: [pref.tooltipstyle]
" - . += "Client FPS: [pref.client_fps]
" - if(can_select_ooc_color(user)) - . += "OOC Color: " - if(pref.ooccolor == initial(pref.ooccolor)) - . += "Using Default
" - else - . += "[pref.ooccolor]
| __ |
" - -/datum/category_item/player_setup_item/player_global/ui/OnTopic(var/href,var/list/href_list, var/mob/user) - if(href_list["select_style"]) - var/UI_style_new = input(user, "Choose UI style.", "Character Preference", pref.UI_style) as null|anything in all_ui_styles - if(!UI_style_new || !CanUseTopic(user)) return TOPIC_NOACTION - pref.UI_style = UI_style_new - return TOPIC_REFRESH - - else if(href_list["select_color"]) - var/UI_style_color_new = input(user, "Choose UI color, dark colors are not recommended!", "Global Preference", pref.UI_style_color) as color|null - if(isnull(UI_style_color_new) || !CanUseTopic(user)) return TOPIC_NOACTION - pref.UI_style_color = UI_style_color_new - return TOPIC_REFRESH - - else if(href_list["select_alpha"]) - var/UI_style_alpha_new = input(user, "Select UI alpha (transparency) level, between 50 and 255.", "Global Preference", pref.UI_style_alpha) as num|null - if(isnull(UI_style_alpha_new) || (UI_style_alpha_new < 50 || UI_style_alpha_new > 255) || !CanUseTopic(user)) return TOPIC_NOACTION - pref.UI_style_alpha = UI_style_alpha_new - return TOPIC_REFRESH - - else if(href_list["select_ooc_color"]) - var/new_ooccolor = input(user, "Choose OOC color:", "Global Preference") as color|null - if(new_ooccolor && can_select_ooc_color(user) && CanUseTopic(user)) - pref.ooccolor = new_ooccolor - return TOPIC_REFRESH - - else if(href_list["select_tooltip_style"]) - var/tooltip_style_new = input(user, "Choose tooltip style.", "Global Preference", pref.tooltipstyle) as null|anything in all_tooltip_styles - if(!tooltip_style_new || !CanUseTopic(user)) return TOPIC_NOACTION - pref.tooltipstyle = tooltip_style_new - return TOPIC_REFRESH - - else if(href_list["select_client_fps"]) - var/fps_new = input(user, "Input Client FPS (1-200, 0 uses server FPS)", "Global Preference", pref.client_fps) as null|num - if(isnull(fps_new) || !CanUseTopic(user)) return TOPIC_NOACTION - if(fps_new < 0 || fps_new > MAX_CLIENT_FPS) return TOPIC_NOACTION - pref.client_fps = fps_new - if(pref.client) - pref.client.fps = fps_new - return TOPIC_REFRESH - - else if(href_list["reset"]) - switch(href_list["reset"]) - if("ui") - pref.UI_style_color = initial(pref.UI_style_color) - if("alpha") - pref.UI_style_alpha = initial(pref.UI_style_alpha) - if("ooc") - pref.ooccolor = initial(pref.ooccolor) - return TOPIC_REFRESH - - return ..() - -/datum/category_item/player_setup_item/player_global/ui/proc/can_select_ooc_color(var/mob/user) - return config.allow_admin_ooccolor && check_rights(R_ADMIN, 0, user) +/datum/category_item/player_setup_item/player_global/ui + name = "UI" + sort_order = 1 + +/datum/category_item/player_setup_item/player_global/ui/load_preferences(var/savefile/S) + S["UI_style"] >> pref.UI_style + S["UI_style_color"] >> pref.UI_style_color + S["UI_style_alpha"] >> pref.UI_style_alpha + S["ooccolor"] >> pref.ooccolor + S["tooltipstyle"] >> pref.tooltipstyle + S["client_fps"] >> pref.client_fps + +/datum/category_item/player_setup_item/player_global/ui/save_preferences(var/savefile/S) + S["UI_style"] << pref.UI_style + S["UI_style_color"] << pref.UI_style_color + S["UI_style_alpha"] << pref.UI_style_alpha + S["ooccolor"] << pref.ooccolor + S["tooltipstyle"] << pref.tooltipstyle + S["client_fps"] << pref.client_fps + +/datum/category_item/player_setup_item/player_global/ui/sanitize_preferences() + pref.UI_style = sanitize_inlist(pref.UI_style, all_ui_styles, initial(pref.UI_style)) + pref.UI_style_color = sanitize_hexcolor(pref.UI_style_color, initial(pref.UI_style_color)) + pref.UI_style_alpha = sanitize_integer(pref.UI_style_alpha, 0, 255, initial(pref.UI_style_alpha)) + pref.ooccolor = sanitize_hexcolor(pref.ooccolor, initial(pref.ooccolor)) + pref.tooltipstyle = sanitize_inlist(pref.tooltipstyle, all_tooltip_styles, initial(pref.tooltipstyle)) + pref.client_fps = sanitize_integer(pref.client_fps, 0, MAX_CLIENT_FPS, initial(pref.client_fps)) + +/datum/category_item/player_setup_item/player_global/ui/content(var/mob/user) + . = "UI Style: [pref.UI_style]
" + . += "Custom UI (recommended for White UI):
" + . += "-Color: [pref.UI_style_color]
| __ |
" + . += "-Alpha(transparency): [pref.UI_style_alpha] reset
" + . += "Tooltip Style: [pref.tooltipstyle]
" + . += "Client FPS: [pref.client_fps]
" + if(can_select_ooc_color(user)) + . += "OOC Color: " + if(pref.ooccolor == initial(pref.ooccolor)) + . += "Using Default
" + else + . += "[pref.ooccolor]
| __ |
" + +/datum/category_item/player_setup_item/player_global/ui/OnTopic(var/href,var/list/href_list, var/mob/user) + if(href_list["select_style"]) + var/UI_style_new = input(user, "Choose UI style.", "Character Preference", pref.UI_style) as null|anything in all_ui_styles + if(!UI_style_new || !CanUseTopic(user)) return TOPIC_NOACTION + pref.UI_style = UI_style_new + return TOPIC_REFRESH + + else if(href_list["select_color"]) + var/UI_style_color_new = input(user, "Choose UI color, dark colors are not recommended!", "Global Preference", pref.UI_style_color) as color|null + if(isnull(UI_style_color_new) || !CanUseTopic(user)) return TOPIC_NOACTION + pref.UI_style_color = UI_style_color_new + return TOPIC_REFRESH + + else if(href_list["select_alpha"]) + var/UI_style_alpha_new = input(user, "Select UI alpha (transparency) level, between 50 and 255.", "Global Preference", pref.UI_style_alpha) as num|null + if(isnull(UI_style_alpha_new) || (UI_style_alpha_new < 50 || UI_style_alpha_new > 255) || !CanUseTopic(user)) return TOPIC_NOACTION + pref.UI_style_alpha = UI_style_alpha_new + return TOPIC_REFRESH + + else if(href_list["select_ooc_color"]) + var/new_ooccolor = input(user, "Choose OOC color:", "Global Preference") as color|null + if(new_ooccolor && can_select_ooc_color(user) && CanUseTopic(user)) + pref.ooccolor = new_ooccolor + return TOPIC_REFRESH + + else if(href_list["select_tooltip_style"]) + var/tooltip_style_new = input(user, "Choose tooltip style.", "Global Preference", pref.tooltipstyle) as null|anything in all_tooltip_styles + if(!tooltip_style_new || !CanUseTopic(user)) return TOPIC_NOACTION + pref.tooltipstyle = tooltip_style_new + return TOPIC_REFRESH + + else if(href_list["select_client_fps"]) + var/fps_new = input(user, "Input Client FPS (1-200, 0 uses server FPS)", "Global Preference", pref.client_fps) as null|num + if(isnull(fps_new) || !CanUseTopic(user)) return TOPIC_NOACTION + if(fps_new < 0 || fps_new > MAX_CLIENT_FPS) return TOPIC_NOACTION + pref.client_fps = fps_new + if(pref.client) + pref.client.fps = fps_new + return TOPIC_REFRESH + + else if(href_list["reset"]) + switch(href_list["reset"]) + if("ui") + pref.UI_style_color = initial(pref.UI_style_color) + if("alpha") + pref.UI_style_alpha = initial(pref.UI_style_alpha) + if("ooc") + pref.ooccolor = initial(pref.ooccolor) + return TOPIC_REFRESH + + return ..() + +/datum/category_item/player_setup_item/player_global/ui/proc/can_select_ooc_color(var/mob/user) + return config_legacy.allow_admin_ooccolor && check_rights(R_ADMIN, 0, user) diff --git a/code/modules/client/preference_setup/global/02_settings.dm b/code/modules/client/preference_setup/global/02_settings.dm index f213c15a8af..3734ce0aa1c 100644 --- a/code/modules/client/preference_setup/global/02_settings.dm +++ b/code/modules/client/preference_setup/global/02_settings.dm @@ -1,133 +1,133 @@ -/datum/preferences - var/preferences_enabled = null - var/preferences_disabled = null - -/datum/category_item/player_setup_item/player_global/settings - name = "Settings" - sort_order = 2 - -/datum/category_item/player_setup_item/player_global/settings/load_preferences(var/savefile/S) - S["lastchangelog"] >> pref.lastchangelog - S["lastnews"] >> pref.lastnews - S["default_slot"] >> pref.default_slot - S["preferences"] >> pref.preferences_enabled - S["preferences_disabled"] >> pref.preferences_disabled - -/datum/category_item/player_setup_item/player_global/settings/save_preferences(var/savefile/S) - S["lastchangelog"] << pref.lastchangelog - S["lastnews"] << pref.lastnews - S["default_slot"] << pref.default_slot - S["preferences"] << pref.preferences_enabled - S["preferences_disabled"] << pref.preferences_disabled - -/datum/category_item/player_setup_item/player_global/settings/sanitize_preferences() - // Ensure our preferences are lists. - if(!istype(pref.preferences_enabled, /list)) - pref.preferences_enabled = list() - if(!istype(pref.preferences_disabled, /list)) - pref.preferences_disabled = list() - - // Arrange preferences that have never been enabled/disabled. - var/list/client_preference_keys = list() - for(var/cp in get_client_preferences()) - var/datum/client_preference/client_pref = cp - client_preference_keys += client_pref.key - if((client_pref.key in pref.preferences_enabled) || (client_pref.key in pref.preferences_disabled)) - continue - - if(client_pref.enabled_by_default) - pref.preferences_enabled += client_pref.key - else - pref.preferences_disabled += client_pref.key - - // Clean out preferences that no longer exist. - for(var/key in pref.preferences_enabled) - if(!(key in client_preference_keys)) - pref.preferences_enabled -= key - for(var/key in pref.preferences_disabled) - if(!(key in client_preference_keys)) - pref.preferences_disabled -= key - - pref.lastchangelog = sanitize_text(pref.lastchangelog, initial(pref.lastchangelog)) - pref.lastnews = sanitize_text(pref.lastnews, initial(pref.lastnews)) - pref.default_slot = sanitize_integer(pref.default_slot, 1, config.character_slots, initial(pref.default_slot)) - -/datum/category_item/player_setup_item/player_global/settings/content(var/mob/user) - . = list() - . += "Preferences
" - . += "
| [client_pref.description]: | " - if(pref_mob.is_preference_enabled(client_pref.key)) - . += "[client_pref.enabled_description] | [client_pref.disabled_description] | " - else - . += "[client_pref.enabled_description] | [client_pref.disabled_description] | " - . += "
" + . += "
| [client_pref.description]: | " + if(pref_mob.is_preference_enabled(client_pref.key)) + . += "[client_pref.enabled_description] | [client_pref.disabled_description] | " + else + . += "[client_pref.enabled_description] | [client_pref.disabled_description] | " + . += "
" var/name - for(var/i=1, i<= config.character_slots, i++) + for(var/i=1, i<= config_legacy.character_slots, i++) S.cd = "/character[i]" S["real_name"] >> name if(!name) name = "Character[i]" diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm index 571fbb7a223..9a9061cff58 100644 --- a/code/modules/client/preferences_savefile.dm +++ b/code/modules/client/preferences_savefile.dm @@ -83,7 +83,7 @@ S.cd = "/" if(!slot) slot = default_slot if(slot != SAVE_RESET) // SAVE_RESET will reset the slot as though it does not exist, but keep the current slot for saving purposes. - slot = sanitize_integer(slot, 1, config.character_slots, initial(default_slot)) + slot = sanitize_integer(slot, 1, config_legacy.character_slots, initial(default_slot)) if(slot != default_slot) default_slot = slot S["default_slot"] << slot diff --git a/code/modules/error_handler/error_handler.dm b/code/modules/error_handler/error_handler.dm index 8ea71852d46..817919b30b7 100644 --- a/code/modules/error_handler/error_handler.dm +++ b/code/modules/error_handler/error_handler.dm @@ -62,7 +62,7 @@ GLOBAL_VAR_INIT(total_runtimes_skipped, 0) var/configured_error_cooldown var/configured_error_limit var/configured_error_silence_time - if(config && config.entries) + if(config && config_legacy.entries) configured_error_cooldown = CONFIG_GET(number/error_cooldown) configured_error_limit = CONFIG_GET(number/error_limit) configured_error_silence_time = CONFIG_GET(number/error_silence_time) diff --git a/code/modules/events/event_container.dm b/code/modules/events/event_container.dm index 06f470971eb..5d1d6502f37 100644 --- a/code/modules/events/event_container.dm +++ b/code/modules/events/event_container.dm @@ -25,7 +25,7 @@ var/global/list/severity_to_string = list(EVENT_LEVEL_MUNDANE = "Mundane", EVENT if(!next_event_time) set_event_delay() - if(delayed || !config.allow_random_events) + if(delayed || !config_legacy.allow_random_events) next_event_time += (world.time - last_world_time) else if(world.time > next_event_time) start_event() @@ -79,16 +79,16 @@ var/global/list/severity_to_string = list(EVENT_LEVEL_MUNDANE = "Mundane", EVENT var/last_time = last_event_time[EM] if(last_time) var/time_passed = world.time - last_time - var/weight_modifier = max(0, round((config.expected_round_length - time_passed) / 300)) + var/weight_modifier = max(0, round((config_legacy.expected_round_length - time_passed) / 300)) weight = weight - weight_modifier return weight /datum/event_container/proc/set_event_delay() // If the next event time has not yet been set and we have a custom first time start - if(next_event_time == 0 && config.event_first_run[severity]) - var/lower = config.event_first_run[severity]["lower"] - var/upper = config.event_first_run[severity]["upper"] + if(next_event_time == 0 && config_legacy.event_first_run[severity]) + var/lower = config_legacy.event_first_run[severity]["lower"] + var/upper = config_legacy.event_first_run[severity]["upper"] var/event_delay = rand(lower, upper) next_event_time = world.time + event_delay // Otherwise, follow the standard setup process @@ -107,7 +107,7 @@ var/global/list/severity_to_string = list(EVENT_LEVEL_MUNDANE = "Mundane", EVENT playercount_modifier = 0.8 playercount_modifier = playercount_modifier * delay_modifier - var/event_delay = rand(config.event_delay_lower[severity], config.event_delay_upper[severity]) * playercount_modifier + var/event_delay = rand(config_legacy.event_delay_lower[severity], config_legacy.event_delay_upper[severity]) * playercount_modifier next_event_time = world.time + event_delay log_debug("Next event of severity [severity_to_string[severity]] in [(next_event_time - world.time)/600] minutes.") diff --git a/code/modules/events/event_dynamic.dm b/code/modules/events/event_dynamic.dm index 92b2ae036c6..b3407a50b81 100644 --- a/code/modules/events/event_dynamic.dm +++ b/code/modules/events/event_dynamic.dm @@ -11,7 +11,7 @@ dust_swarm("weak")*/ if(!event) //CARN: checks to see if random events are enabled. - if(config.allow_random_events) + if(config_legacy.allow_random_events) hadevent = event() else Holiday_Random_Event() @@ -24,7 +24,7 @@ var/list/event_last_fired = list() //Always triggers an event when called, dynamically chooses events based on job population /proc/spawn_dynamic_event() - if(!config.allow_random_events) + if(!config_legacy.allow_random_events) return var/minutes_passed = world.time/600 diff --git a/code/modules/events/event_manager.dm b/code/modules/events/event_manager.dm index e156c0161eb..fbd798815eb 100644 --- a/code/modules/events/event_manager.dm +++ b/code/modules/events/event_manager.dm @@ -80,7 +80,7 @@ /datum/event_manager/proc/GetInteractWindow() var/html = "Refresh" - html += "Pause All - [config.allow_random_events ? "Pause" : "Resume"]" + html += "Pause All - [config_legacy.allow_random_events ? "Pause" : "Resume"]" if(selected_event_container) var/event_time = max(0, selected_event_container.next_event_time - world.time) @@ -215,8 +215,8 @@ EC.delayed = !EC.delayed log_and_message_admins("has [EC.delayed ? "paused" : "resumed"] countdown for [severity_to_string[EC.severity]] events.") else if(href_list["pause_all"]) - config.allow_random_events = text2num(href_list["pause_all"]) - log_and_message_admins("has [config.allow_random_events ? "resumed" : "paused"] countdown for all events.") + config_legacy.allow_random_events = text2num(href_list["pause_all"]) + log_and_message_admins("has [config_legacy.allow_random_events ? "resumed" : "paused"] countdown for all events.") else if(href_list["interval"]) var/delay = input("Enter delay modifier. A value less than one means events fire more often, higher than one less often.", "Set Interval Modifier") as num|null if(delay && delay > 0) diff --git a/code/modules/ext_scripts/irc.dm b/code/modules/ext_scripts/irc.dm index e76c2055b75..05e7aca7344 100644 --- a/code/modules/ext_scripts/irc.dm +++ b/code/modules/ext_scripts/irc.dm @@ -1,15 +1,15 @@ /proc/send2irc(var/channel, var/msg) return // VOREStation Edit - Can't exploit shell if we never call shell! - if (config.use_irc_bot) - if (config.use_node_bot) - shell("node bridge.js -h \"[config.irc_bot_host]\" -p \"[config.irc_bot_port]\" -c \"[channel]\" -m \"[escape_shell_arg(msg)]\"") + if (config_legacy.use_irc_bot) + if (config_legacy.use_node_bot) + shell("node bridge.js -h \"[config_legacy.irc_bot_host]\" -p \"[config_legacy.irc_bot_port]\" -c \"[channel]\" -m \"[escape_shell_arg(msg)]\"") else - if (config.irc_bot_host) - if(config.irc_bot_export) + if (config_legacy.irc_bot_host) + if(config_legacy.irc_bot_export) spawn(-1) // spawn here prevents hanging in the case that the bot isn't reachable - world.Export("http://[config.irc_bot_host]:45678?[list2params(list(pwd=config.comms_password, chan=channel, mesg=msg))]") + world.Export("http://[config_legacy.irc_bot_host]:45678?[list2params(list(pwd=config_legacy.comms_password, chan=channel, mesg=msg))]") else - if(config.use_lib_nudge) + if(config_legacy.use_lib_nudge) var/nudge_lib if(world.system_type == MS_WINDOWS) nudge_lib = "lib\\nudge.dll" @@ -17,24 +17,24 @@ nudge_lib = "lib/nudge.so" spawn(0) - call(nudge_lib, "nudge")("[config.comms_password]","[config.irc_bot_host]","[channel]","[escape_shell_arg(msg)]") + call(nudge_lib, "nudge")("[config_legacy.comms_password]","[config_legacy.irc_bot_host]","[channel]","[escape_shell_arg(msg)]") else spawn(0) - ext_python("ircbot_message.py", "[config.comms_password] [config.irc_bot_host] [channel] [escape_shell_arg(msg)]") + ext_python("ircbot_message.py", "[config_legacy.comms_password] [config_legacy.irc_bot_host] [channel] [escape_shell_arg(msg)]") return /proc/send2mainirc(var/msg) - if(config.main_irc) - send2irc(config.main_irc, msg) + if(config_legacy.main_irc) + send2irc(config_legacy.main_irc, msg) return /proc/send2adminirc(var/msg) - if(config.admin_irc) - send2irc(config.admin_irc, msg) + if(config_legacy.admin_irc) + send2irc(config_legacy.admin_irc, msg) return /hook/startup/proc/ircNotify() - send2mainirc("Server starting up on byond://[config.serverurl ? config.serverurl : (config.server ? config.server : "[world.address]:[world.port]")]") + send2mainirc("Server starting up on byond://[config_legacy.serverurl ? config_legacy.serverurl : (config_legacy.server ? config_legacy.server : "[world.address]:[world.port]")]") return 1 diff --git a/code/modules/ext_scripts/python.dm b/code/modules/ext_scripts/python.dm index eb6e61aea27..49a823bd62f 100644 --- a/code/modules/ext_scripts/python.dm +++ b/code/modules/ext_scripts/python.dm @@ -24,5 +24,5 @@ if(world.system_type == MS_WINDOWS) script = replacetext(script, "/", "\\") - var/command = config.python_path + " " + script + " " + args + var/command = config_legacy.python_path + " " + script + " " + args return shell(command) \ No newline at end of file diff --git a/code/modules/mob/_modifiers/unholy.dm b/code/modules/mob/_modifiers/unholy.dm index cc4a23aa403..8b89e571e26 100644 --- a/code/modules/mob/_modifiers/unholy.dm +++ b/code/modules/mob/_modifiers/unholy.dm @@ -131,7 +131,7 @@ for(var/obj/item/organ/E in H.bad_external_organs) // Fix bones var/obj/item/organ/external/affected = E - if((affected.damage < affected.min_broken_damage * config.organ_health_multiplier) && (affected.status & ORGAN_BROKEN)) + if((affected.damage < affected.min_broken_damage * config_legacy.organ_health_multiplier) && (affected.status & ORGAN_BROKEN)) affected.status &= ~ORGAN_BROKEN for(var/datum/wound/W in affected.wounds) // Fix IB diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm index a5a0715e100..e53a3677590 100644 --- a/code/modules/mob/dead/observer/observer.dm +++ b/code/modules/mob/dead/observer/observer.dm @@ -177,7 +177,7 @@ Works together with spawning an observer, noted above. B.update() if(ghost.client) ghost.client.time_died_as_mouse = ghost.timeofdeath - if(ghost.client && !ghost.client.holder && !config.antag_hud_allowed) // For new ghosts we remove the verb from even showing up if it's not allowed. + if(ghost.client && !ghost.client.holder && !config_legacy.antag_hud_allowed) // For new ghosts we remove the verb from even showing up if it's not allowed. ghost.verbs -= /mob/observer/dead/verb/toggle_antagHUD // Poor guys, don't know what they are missing! return ghost @@ -278,13 +278,13 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp set name = "Toggle AntagHUD" set desc = "Toggles AntagHUD allowing you to see who is the antagonist" - if(!config.antag_hud_allowed && !client.holder) + if(!config_legacy.antag_hud_allowed && !client.holder) src << "Admins have disabled this for this round." return if(jobban_isbanned(src, "AntagHUD")) src << "You have been banned from using this feature" return - if(config.antag_hud_restricted && !has_enabled_antagHUD && !client.holder) + if(config_legacy.antag_hud_restricted && !has_enabled_antagHUD && !client.holder) var/response = alert(src, "If you turn this on, you will not be able to take any part in the round.","Are you sure you want to turn this feature on?","Yes","No") if(response == "No") return can_reenter_corpse = FALSE @@ -474,7 +474,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp set name = "Become mouse" set category = "Ghost" - if(config.disable_player_mice) + if(config_legacy.disable_player_mice) src << "Spawning as a mouse is currently disabled." return @@ -511,7 +511,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp src << "Unable to find any unwelded vents to spawn mice at." if(host) - if(config.uneducated_mice) + if(config_legacy.uneducated_mice) host.universal_understand = 0 announce_ghost_joinleave(src, 0, "They are now a mouse.") host.ckey = src.ckey @@ -544,7 +544,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp set name = "Write in blood" set desc = "If the round is sufficiently spooky, write a short message in blood on the floor or a wall. Remember, no IC in OOC or OOC in IC." - if(!(config.cult_ghostwriter)) + if(!(config_legacy.cult_ghostwriter)) src << "That verb is not currently permitted." return @@ -556,7 +556,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp var/ghosts_can_write if(ticker.mode.name == "cult") - if(cult.current_antagonists.len > config.cult_ghostwriter_req_cultists) + if(cult.current_antagonists.len > config_legacy.cult_ghostwriter_req_cultists) ghosts_can_write = 1 if(!ghosts_can_write && !check_rights(R_ADMIN, 0)) //Let's allow for admins to write in blood for events and the such. @@ -716,7 +716,7 @@ mob/observer/dead/MayRespawn(var/feedback = 0) if(feedback) src << "Your non-dead body prevent you from respawning." return 0 - if(config.antag_hud_restricted && has_enabled_antagHUD == 1) + if(config_legacy.antag_hud_restricted && has_enabled_antagHUD == 1) if(feedback) src << "antagHUD restrictions prevent you from respawning." return 0 diff --git a/code/modules/mob/emote.dm b/code/modules/mob/emote.dm index 0ecdb2fc20e..3d20fc68a15 100644 --- a/code/modules/mob/emote.dm +++ b/code/modules/mob/emote.dm @@ -63,7 +63,7 @@ return if(!src.client.holder) - if(!config.dsay_allowed) + if(!config_legacy.dsay_allowed) src << "Deadchat is globally muted." return diff --git a/code/modules/mob/language/language.dm b/code/modules/mob/language/language.dm index f4b107e1813..1f94831137e 100644 --- a/code/modules/mob/language/language.dm +++ b/code/modules/mob/language/language.dm @@ -185,13 +185,13 @@ if(client && client.prefs.language_prefixes && client.prefs.language_prefixes.len) return client.prefs.language_prefixes[1] - return config.language_prefixes[1] + return config_legacy.language_prefixes[1] /mob/proc/is_language_prefix(var/prefix) if(client && client.prefs.language_prefixes && client.prefs.language_prefixes.len) return prefix in client.prefs.language_prefixes - return prefix in config.language_prefixes + return prefix in config_legacy.language_prefixes //TBD /mob/verb/check_languages() diff --git a/code/modules/mob/living/carbon/brain/life.dm b/code/modules/mob/living/carbon/brain/life.dm index 759b6472ea8..06cb7d63be6 100644 --- a/code/modules/mob/living/carbon/brain/life.dm +++ b/code/modules/mob/living/carbon/brain/life.dm @@ -94,7 +94,7 @@ blinded = 1 silent = 0 else //ALIVE. LIGHTS ARE ON - if( !container && (health < config.health_threshold_dead || ((world.time - timeofhostdeath) > config.revival_brain_life)) ) + if( !container && (health < config_legacy.health_threshold_dead || ((world.time - timeofhostdeath) > config_legacy.revival_brain_life)) ) death() blinded = 1 silent = 0 diff --git a/code/modules/mob/living/carbon/breathe.dm b/code/modules/mob/living/carbon/breathe.dm index 2b8ce410635..6d5ef5763d4 100644 --- a/code/modules/mob/living/carbon/breathe.dm +++ b/code/modules/mob/living/carbon/breathe.dm @@ -2,7 +2,7 @@ //Start of a breath chain, calls breathe() /mob/living/carbon/handle_breathing() - if(air_master.current_cycle%4==2 || failed_last_breath || (health < config.health_threshold_crit)) //First, resolve location and get a breath + if(air_master.current_cycle%4==2 || failed_last_breath || (health < config_legacy.health_threshold_crit)) //First, resolve location and get a breath breathe() /mob/living/carbon/proc/breathe() @@ -12,7 +12,7 @@ var/datum/gas_mixture/breath = null //First, check if we can breathe at all - if(health < config.health_threshold_crit && !(CE_STABLE in chem_effects)) //crit aka circulatory shock + if(health < config_legacy.health_threshold_crit && !(CE_STABLE in chem_effects)) //crit aka circulatory shock AdjustLosebreath(1) if(losebreath>0) //Suffocating so do not take a breath diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index 3de9ccc8470..682cc0a34ef 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -138,7 +138,7 @@ return shock_damage /mob/living/carbon/proc/help_shake_act(mob/living/carbon/M) - if (src.health >= config.health_threshold_crit) + if (src.health >= config_legacy.health_threshold_crit) if(src == M && istype(src, /mob/living/carbon/human)) var/mob/living/carbon/human/H = src var/datum/gender/T = gender_datums[H.get_visible_gender()] diff --git a/code/modules/mob/living/carbon/human/appearance.dm b/code/modules/mob/living/carbon/human/appearance.dm index 84e25b948e3..efc296e8c91 100644 --- a/code/modules/mob/living/carbon/human/appearance.dm +++ b/code/modules/mob/living/carbon/human/appearance.dm @@ -147,7 +147,7 @@ for(var/current_species_name in all_species) var/datum/species/current_species = all_species[current_species_name] - if(check_whitelist && config.usealienwhitelist && !check_rights(R_ADMIN, 0, src)) //If we're using the whitelist, make sure to check it! + if(check_whitelist && config_legacy.usealienwhitelist && !check_rights(R_ADMIN, 0, src)) //If we're using the whitelist, make sure to check it! if(!(current_species.spawn_flags & SPECIES_CAN_JOIN)) continue if(whitelist.len && !(current_species_name in whitelist)) diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 30f56f2406e..1cc0d14b558 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -174,7 +174,7 @@ if(update) UpdateDamageIcon() /mob/living/carbon/human/proc/implant_loyalty(override = FALSE) // Won't override by default. - if(!config.use_loyalty_implants && !override) return // Nuh-uh. + if(!config_legacy.use_loyalty_implants && !override) return // Nuh-uh. var/obj/item/weapon/implant/loyalty/L = new/obj/item/weapon/implant/loyalty(src) if(L.handle_implant(src, BP_HEAD)) diff --git a/code/modules/mob/living/carbon/human/human_attackhand.dm b/code/modules/mob/living/carbon/human/human_attackhand.dm index db1d9080ad5..80de9ac4e17 100644 --- a/code/modules/mob/living/carbon/human/human_attackhand.dm +++ b/code/modules/mob/living/carbon/human/human_attackhand.dm @@ -84,7 +84,7 @@ if (istype(H) && attempt_to_scoop(H)) return 0; // VOREStation Edit - End - if(istype(H) && health < config.health_threshold_crit) + if(istype(H) && health < config_legacy.health_threshold_crit) if(!H.check_has_mouth()) H << "You don't have a mouth, you cannot perform CPR!" return @@ -113,7 +113,7 @@ H.visible_message("\The [H] performs CPR on \the [src]!") H << "Repeat at least every 7 seconds." - if(istype(H) && health > config.health_threshold_dead) + if(istype(H) && health > config_legacy.health_threshold_dead) adjustOxyLoss(-(min(getOxyLoss(), 5))) updatehealth() src << "You feel a breath of fresh air enter your lungs. It feels good." diff --git a/code/modules/mob/living/carbon/human/human_damage.dm b/code/modules/mob/living/carbon/human/human_damage.dm index fec7ec6bffc..04a5002179b 100644 --- a/code/modules/mob/living/carbon/human/human_damage.dm +++ b/code/modules/mob/living/carbon/human/human_damage.dm @@ -17,7 +17,7 @@ health = getMaxHealth() - getOxyLoss() - getToxLoss() - getCloneLoss() - total_burn - total_brute //TODO: fix husking - if( ((getMaxHealth() - total_burn) < config.health_threshold_dead) && stat == DEAD) + if( ((getMaxHealth() - total_burn) < config_legacy.health_threshold_dead) && stat == DEAD) ChangeToHusk() return diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm index 3f6dc132a49..016ea768e66 100644 --- a/code/modules/mob/living/carbon/human/human_defense.dm +++ b/code/modules/mob/living/carbon/human/human_defense.dm @@ -310,7 +310,7 @@ emp_act effective_force -= round(effective_force*0.8) //want the dislocation chance to be such that the limb is expected to dislocate after dealing a fraction of the damage needed to break the limb - var/dislocate_chance = effective_force/(dislocate_mult * organ.min_broken_damage * config.organ_health_multiplier)*100 + var/dislocate_chance = effective_force/(dislocate_mult * organ.min_broken_damage * config_legacy.organ_health_multiplier)*100 if(prob(dislocate_chance * (100 - blocked)/100)) visible_message("[src]'s [organ.joint] [pick("gives way","caves in","crumbles","collapses")]!") organ.dislocate(1) diff --git a/code/modules/mob/living/carbon/human/human_movement.dm b/code/modules/mob/living/carbon/human/human_movement.dm index 0c733f0fd53..807a58c8f9c 100644 --- a/code/modules/mob/living/carbon/human/human_movement.dm +++ b/code/modules/mob/living/carbon/human/human_movement.dm @@ -136,7 +136,7 @@ tally = tally/2 tally -= chem_effects[CE_SPEEDBOOST] // give 'em a buff on top. - return max(-3, tally+config.human_delay) // Minimum return should be the same as force_max_speed + return max(-3, tally+config_legacy.human_delay) // Minimum return should be the same as force_max_speed /mob/living/carbon/human/Process_Spacemove(var/check_drift = 0) //Can we act? @@ -190,7 +190,7 @@ // Handle footstep sounds /mob/living/carbon/human/handle_footstep(var/turf/T) - if(!config.footstep_volume || !T.footstep_sounds || !T.footstep_sounds.len) + if(!config_legacy.footstep_volume || !T.footstep_sounds || !T.footstep_sounds.len) return // Future Upgrades - Multi species support var/list/footstep_sounds = T.footstep_sounds["human"] @@ -208,7 +208,7 @@ if(m_intent == "run" && step_count++ % 2 != 0) return - var/volume = config.footstep_volume + var/volume = config_legacy.footstep_volume // Reduce volume while walking or barefoot if(!shoes || m_intent == "walk") diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index 1c2c507b405..929afbcc05f 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -368,7 +368,7 @@ var/last_message = 0 if(!breath || (breath.total_moles == 0)) failed_last_breath = 1 - if(health > config.health_threshold_crit) + if(health > config_legacy.health_threshold_crit) adjustOxyLoss(HUMAN_MAX_OXYLOSS) else adjustOxyLoss(HUMAN_CRIT_MAX_OXYLOSS) @@ -926,14 +926,14 @@ var/last_message = 0 else //ALIVE. LIGHTS ARE ON updatehealth() //TODO - if(health <= config.health_threshold_dead || (should_have_organ("brain") && !has_brain())) + if(health <= config_legacy.health_threshold_dead || (should_have_organ("brain") && !has_brain())) death() blinded = 1 silent = 0 return 1 //UNCONSCIOUS. NO-ONE IS HOME - if((getOxyLoss() > (species.total_health/2)) || (health <= config.health_threshold_crit)) + if((getOxyLoss() > (species.total_health/2)) || (health <= config_legacy.health_threshold_crit)) Paralyse(3) if(hallucination) @@ -1285,7 +1285,7 @@ var/last_message = 0 set_fullscreen(eye_blurry, "blurry", /obj/screen/fullscreen/blurry) set_fullscreen(druggy, "high", /obj/screen/fullscreen/high) - if(config.welder_vision) + if(config_legacy.welder_vision) var/found_welder if(species.short_sighted) found_welder = 1 @@ -1490,12 +1490,12 @@ var/last_message = 0 if(status_flags & GODMODE) return 0 //godmode if(!can_feel_pain()) return - if(health < config.health_threshold_softcrit)// health 0 makes you immediately collapse + if(health < config_legacy.health_threshold_softcrit)// health 0 makes you immediately collapse shock_stage = max(shock_stage, 61) if(traumatic_shock >= 80) shock_stage += 1 - else if(health < config.health_threshold_softcrit) + else if(health < config_legacy.health_threshold_softcrit) shock_stage = max(shock_stage, 61) else shock_stage = min(shock_stage, 160) @@ -1604,7 +1604,7 @@ var/last_message = 0 if(stat == DEAD) holder.icon_state = "-100" // X_X else - holder.icon_state = RoundHealth((health-config.health_threshold_crit)/(getMaxHealth()-config.health_threshold_crit)*100) + holder.icon_state = RoundHealth((health-config_legacy.health_threshold_crit)/(getMaxHealth()-config_legacy.health_threshold_crit)*100) apply_hud(HEALTH_HUD, holder) if (CHECK_BITFIELD(hud_updateflag, LIFE_HUD)) diff --git a/code/modules/mob/living/carbon/human/species/species_getters.dm b/code/modules/mob/living/carbon/human/species/species_getters.dm index efb053eddfe..4886b3cb2a2 100644 --- a/code/modules/mob/living/carbon/human/species/species_getters.dm +++ b/code/modules/mob/living/carbon/human/species/species_getters.dm @@ -41,7 +41,7 @@ return ((H && H.isSynthetic()) ? "encounters a hardware fault and suddenly reboots!" : knockout_message) /datum/species/proc/get_death_message(var/mob/living/carbon/human/H) - if(config.show_human_death_message) + if(config_legacy.show_human_death_message) return ((H && H.isSynthetic()) ? "gives one shrill beep before falling lifeless." : death_message) else return "no message" diff --git a/code/modules/mob/living/carbon/human/species/station/alraune.dm b/code/modules/mob/living/carbon/human/species/station/alraune.dm index 3e5b4302d93..5f436fb2d2c 100644 --- a/code/modules/mob/living/carbon/human/species/station/alraune.dm +++ b/code/modules/mob/living/carbon/human/species/station/alraune.dm @@ -142,7 +142,7 @@ if(!breath || (breath.total_moles == 0)) H.failed_last_breath = 1 - if(H.health > config.health_threshold_crit) + if(H.health > config_legacy.health_threshold_crit) H.adjustOxyLoss(ALRAUNE_MAX_OXYLOSS) else H.adjustOxyLoss(ALRAUNE_CRIT_MAX_OXYLOSS) diff --git a/code/modules/mob/living/carbon/human/species/xenomorphs/alien_powers.dm b/code/modules/mob/living/carbon/human/species/xenomorphs/alien_powers.dm index 0c8ca611fea..9b15f62882a 100644 --- a/code/modules/mob/living/carbon/human/species/xenomorphs/alien_powers.dm +++ b/code/modules/mob/living/carbon/human/species/xenomorphs/alien_powers.dm @@ -83,7 +83,7 @@ set desc = "Lay an egg to produce huggers to impregnate prey with." set category = "Abilities" - if(!config.aliens_allowed) + if(!config_legacy.aliens_allowed) src << "You begin to lay an egg, but hesitate. You suspect it isn't allowed." verbs -= /mob/living/carbon/human/proc/lay_egg return diff --git a/code/modules/mob/living/carbon/metroid/metroid.dm b/code/modules/mob/living/carbon/metroid/metroid.dm index a7883ebffab..4b585605d46 100644 --- a/code/modules/mob/living/carbon/metroid/metroid.dm +++ b/code/modules/mob/living/carbon/metroid/metroid.dm @@ -98,7 +98,7 @@ if(health <= 0) // if damaged, the slime moves twice as slow tally *= 2 - return tally + config.slime_delay + return tally + config_legacy.slime_delay /mob/living/carbon/slime/Bump(atom/movable/AM as mob|obj, yes) if ((!(yes) || now_pushing)) diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index 1d32933810a..46801ce81c0 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -726,7 +726,7 @@ default behaviour is: set category = "OOC" set src in view() //VOREStation Edit Start - Making it so SSD people have prefs with fallback to original style. - if(config.allow_Metadata) + if(config_legacy.allow_Metadata) if(ooc_notes) to_chat(usr, "[src]'s Metainfo:
[ooc_notes]") else if(client) diff --git a/code/modules/mob/living/silicon/ai/malf.dm b/code/modules/mob/living/silicon/ai/malf.dm index 2422d06fe8f..57d4a2f3f56 100644 --- a/code/modules/mob/living/silicon/ai/malf.dm +++ b/code/modules/mob/living/silicon/ai/malf.dm @@ -105,7 +105,7 @@ // Returns percentage of AI's remaining hardware integrity (maxhealth - (bruteloss + fireloss)) /mob/living/silicon/ai/proc/hardware_integrity() - return (health-config.health_threshold_dead)/2 + return (health-config_legacy.health_threshold_dead)/2 // Shows capacitor charge and hardware integrity information to the AI in Status tab. /mob/living/silicon/ai/show_system_integrity() diff --git a/code/modules/mob/living/silicon/decoy/life.dm b/code/modules/mob/living/silicon/decoy/life.dm index 8a6aa8be436..bfd684436ba 100644 --- a/code/modules/mob/living/silicon/decoy/life.dm +++ b/code/modules/mob/living/silicon/decoy/life.dm @@ -2,7 +2,7 @@ if (src.stat == 2) return else - if (src.health <= config.health_threshold_dead && src.stat != 2) + if (src.health <= config_legacy.health_threshold_dead && src.stat != 2) death() return diff --git a/code/modules/mob/living/silicon/robot/drone/drone.dm b/code/modules/mob/living/silicon/robot/drone/drone.dm index 5be78fba2f1..0fef1cf49b4 100644 --- a/code/modules/mob/living/silicon/robot/drone/drone.dm +++ b/code/modules/mob/living/silicon/robot/drone/drone.dm @@ -188,7 +188,7 @@ var/list/mob_hat_cache = list() var/datum/gender/TU = gender_datums[user.get_visible_gender()] if(stat == 2) - if(!config.allow_drone_spawn || emagged || health < -35) //It's dead, Dave. + if(!config_legacy.allow_drone_spawn || emagged || health < -35) //It's dead, Dave. to_chat(user, "The interface is fried, and a distressing burned smell wafts from the robot's interior. You're not rebooting this one.") return @@ -200,7 +200,7 @@ var/list/mob_hat_cache = list() var/drones = 0 for(var/mob/living/silicon/robot/drone/D in player_list) drones++ - if(drones < config.max_maint_drones) + if(drones < config_legacy.max_maint_drones) request_player() return diff --git a/code/modules/mob/living/silicon/robot/drone/drone_manufacturer.dm b/code/modules/mob/living/silicon/robot/drone/drone_manufacturer.dm index e0e40180e72..be2d3a032f2 100644 --- a/code/modules/mob/living/silicon/robot/drone/drone_manufacturer.dm +++ b/code/modules/mob/living/silicon/robot/drone/drone_manufacturer.dm @@ -54,14 +54,14 @@ icon_state = "drone_fab_active" var/elapsed = world.time - time_last_drone - drone_progress = round((elapsed/config.drone_build_time)*100) + drone_progress = round((elapsed/config_legacy.drone_build_time)*100) if(drone_progress >= 100) visible_message("\The [src] voices a strident beep, indicating a drone chassis is prepared.") /obj/machinery/drone_fabricator/examine(mob/user) ..(user) - if(produce_drones && drone_progress >= 100 && istype(user,/mob/observer/dead) && config.allow_drone_spawn && count_drones() < config.max_maint_drones) + if(produce_drones && drone_progress >= 100 && istype(user,/mob/observer/dead) && config_legacy.allow_drone_spawn && count_drones() < config_legacy.max_maint_drones) user << "
A drone is prepared. Select 'Join As Drone' from the Ghost tab to spawn as a maintenance drone." /obj/machinery/drone_fabricator/proc/create_drone(var/client/player) @@ -69,7 +69,7 @@ if(stat & NOPOWER) return - if(!produce_drones || !config.allow_drone_spawn || count_drones() >= config.max_maint_drones) + if(!produce_drones || !config_legacy.allow_drone_spawn || count_drones() >= config_legacy.max_maint_drones) return if(player && !istype(player.mob,/mob/observer/dead)) @@ -99,7 +99,7 @@ src << "The game hasn't started yet!" return - if(!(config.allow_drone_spawn)) + if(!(config_legacy.allow_drone_spawn)) src << "That verb is not currently permitted." return diff --git a/code/modules/mob/living/silicon/robot/drone/drone_remote_control.dm b/code/modules/mob/living/silicon/robot/drone/drone_remote_control.dm index 4980c24ca3e..b0157a42321 100644 --- a/code/modules/mob/living/silicon/robot/drone/drone_remote_control.dm +++ b/code/modules/mob/living/silicon/robot/drone/drone_remote_control.dm @@ -6,7 +6,7 @@ /mob/living/silicon/robot/drone/attack_ai(var/mob/living/silicon/ai/user) - if(!istype(user) || controlling_ai || !config.allow_drone_spawn || !config.allow_ai_drones) + if(!istype(user) || controlling_ai || !config_legacy.allow_drone_spawn || !config_legacy.allow_ai_drones) return if(client || key) @@ -35,7 +35,7 @@ /obj/machinery/drone_fabricator/attack_ai(var/mob/living/silicon/ai/user as mob) - if(!istype(user) || user.controlling_drone || !config.allow_drone_spawn || !config.allow_ai_drones) + if(!istype(user) || user.controlling_drone || !config_legacy.allow_drone_spawn || !config_legacy.allow_ai_drones) return if(stat & NOPOWER) @@ -50,7 +50,7 @@ to_chat(user, "\The [src] is not ready to produce a new drone.") return - if(count_drones() >= config.max_maint_drones) + if(count_drones() >= config_legacy.max_maint_drones) to_chat(user, "The drone control subsystems are tasked to capacity; they cannot support any more drones.") return diff --git a/code/modules/mob/living/silicon/robot/life.dm b/code/modules/mob/living/silicon/robot/life.dm index 24e669c8249..fbad07e5554 100644 --- a/code/modules/mob/living/silicon/robot/life.dm +++ b/code/modules/mob/living/silicon/robot/life.dm @@ -83,7 +83,7 @@ //if(src.resting) // VOREStation edit. Our borgos would rather not. // Weaken(5) - if(health < config.health_threshold_dead && src.stat != 2) //die only once + if(health < config_legacy.health_threshold_dead && src.stat != 2) //die only once death() if (src.stat != 2) //Alive. @@ -226,7 +226,7 @@ src.healths.icon_state = "health3" if(0 to 50) src.healths.icon_state = "health4" - if(config.health_threshold_dead to 0) + if(config_legacy.health_threshold_dead to 0) src.healths.icon_state = "health5" else src.healths.icon_state = "health6" diff --git a/code/modules/mob/living/silicon/robot/robot_movement.dm b/code/modules/mob/living/silicon/robot/robot_movement.dm index bfc5a14eea2..c2007af9a02 100644 --- a/code/modules/mob/living/silicon/robot/robot_movement.dm +++ b/code/modules/mob/living/silicon/robot/robot_movement.dm @@ -20,7 +20,7 @@ if(module_active && istype(module_active,/obj/item/borg/combat/mobility)) tally-=2 // VOREStation Edit - return tally+config.robot_delay + return tally+config_legacy.robot_delay // NEW: Use power while moving. /mob/living/silicon/robot/SelfMove(turf/n, direct) diff --git a/code/modules/mob/living/simple_animal/animals/cat.dm b/code/modules/mob/living/simple_animal/animals/cat.dm index 43ebac36595..7b220195dfc 100644 --- a/code/modules/mob/living/simple_animal/animals/cat.dm +++ b/code/modules/mob/living/simple_animal/animals/cat.dm @@ -114,7 +114,7 @@ handle_stance(STANCE_FOLLOW) if (friend_dist <= 1) - if (friend.stat >= DEAD || friend.health <= config.health_threshold_softcrit) + if (friend.stat >= DEAD || friend.health <= config_legacy.health_threshold_softcrit) if (prob((friend.stat < DEAD)? 50 : 15)) var/verb = pick("meows", "mews", "mrowls") audible_emote(pick("[verb] in distress.", "[verb] anxiously.")) diff --git a/code/modules/mob/living/simple_animal/animals/fox_vr.dm b/code/modules/mob/living/simple_animal/animals/fox_vr.dm index 3f2c9876c58..ca4d05b8d9b 100644 --- a/code/modules/mob/living/simple_animal/animals/fox_vr.dm +++ b/code/modules/mob/living/simple_animal/animals/fox_vr.dm @@ -134,7 +134,7 @@ handle_stance(STANCE_FOLLOW) if (friend_dist <= 1) - if (friend.stat >= DEAD || friend.health <= config.health_threshold_softcrit) + if (friend.stat >= DEAD || friend.health <= config_legacy.health_threshold_softcrit) if (prob((friend.stat < DEAD)? 50 : 15)) var/verb = pick("yaps", "howls", "whines") audible_emote(pick("[verb] in distress.", "[verb] anxiously.")) diff --git a/code/modules/mob/living/simple_animal/constructs/soulstone.dm b/code/modules/mob/living/simple_animal/constructs/soulstone.dm index 48bd5cc90d5..2be974c2402 100644 --- a/code/modules/mob/living/simple_animal/constructs/soulstone.dm +++ b/code/modules/mob/living/simple_animal/constructs/soulstone.dm @@ -105,7 +105,7 @@ if(src.imprinted != "empty") U << "Capture failed!: The soul stone has already been imprinted with [src.imprinted]'s mind!" return - if ((T.health + T.halloss) > config.health_threshold_crit && T.stat != DEAD) + if ((T.health + T.halloss) > config_legacy.health_threshold_crit && T.stat != DEAD) U << "Capture failed!: Kill or maim the victim first!" return if(T.client == null) diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm index 869dbba7c51..b10c1742aaa 100644 --- a/code/modules/mob/living/simple_animal/simple_animal.dm +++ b/code/modules/mob/living/simple_animal/simple_animal.dm @@ -736,7 +736,7 @@ if(m_intent == "walk") tally *= 1.5 - return tally+config.animal_delay + return tally+config_legacy.animal_delay /mob/living/simple_animal/Stat() ..() diff --git a/code/modules/mob/living/simple_animal/slime/slime.dm b/code/modules/mob/living/simple_animal/slime/slime.dm index c4ac0112af2..2b8472306a4 100644 --- a/code/modules/mob/living/simple_animal/slime/slime.dm +++ b/code/modules/mob/living/simple_animal/slime/slime.dm @@ -269,7 +269,7 @@ if(bodytemperature < 183.222) . += (283.222 - bodytemperature) / 10 * 1.75 - . += config.slime_delay + . += config_legacy.slime_delay /mob/living/simple_animal/slime/Process_Spacemove() return 2 diff --git a/code/modules/mob/living/simple_animal/vore/otie.dm b/code/modules/mob/living/simple_animal/vore/otie.dm index 11ffab26234..67c686669c6 100644 --- a/code/modules/mob/living/simple_animal/vore/otie.dm +++ b/code/modules/mob/living/simple_animal/vore/otie.dm @@ -313,7 +313,7 @@ lay_down() if (friend_dist <= 1) - if (friend.stat >= DEAD || friend.health <= config.health_threshold_softcrit) + if (friend.stat >= DEAD || friend.health <= config_legacy.health_threshold_softcrit) if (prob((friend.stat < DEAD)? 50 : 15)) var/verb = pick("whines", "yelps", "whimpers") audible_emote(pick("[verb] in distress.", "[verb] anxiously.")) diff --git a/code/modules/mob/login.dm b/code/modules/mob/login.dm index 8471dd83074..9e8d0cc7af1 100644 --- a/code/modules/mob/login.dm +++ b/code/modules/mob/login.dm @@ -4,7 +4,7 @@ lastKnownIP = client.address computer_id = client.computer_id log_access_in(client) - if(config.log_access) + if(config_legacy.log_access) for(var/mob/M in player_list) if(M == src) continue if( M.key && (M.key != key) ) @@ -71,4 +71,3 @@ if(!client.tooltips) client.tooltips = new(client) - \ No newline at end of file diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index 56630a904e5..c9f5b51dc6d 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -349,7 +349,7 @@ set name = "Respawn" set category = "OOC" - if (!( config.abandon_allowed )) + if (!( config_legacy.abandon_allowed )) to_chat(usr, "Respawn is disabled.") return if ((stat != 2 || !( ticker ))) @@ -362,7 +362,7 @@ var/deathtime = world.time - src.timeofdeath if(istype(src,/mob/observer/dead)) var/mob/observer/dead/G = src - if(G.has_enabled_antagHUD == 1 && config.antag_hud_restricted) + if(G.has_enabled_antagHUD == 1 && config_legacy.antag_hud_restricted) to_chat(usr, "By using the antagHUD you forfeit the ability to join the round.") return var/deathtimeminutes = round(deathtime / 600) @@ -557,7 +557,7 @@ GLOBAL_VAR_INIT(exploit_warn_spam_prevention, 0) /mob/proc/pull_damage() if(ishuman(src)) var/mob/living/carbon/human/H = src - if(H.health - H.halloss <= config.health_threshold_softcrit) + if(H.health - H.halloss <= config_legacy.health_threshold_softcrit) for(var/name in H.organs_by_name) var/obj/item/organ/external/e = H.organs_by_name[name] if(e && H.lying) diff --git a/code/modules/mob/mob_movement.dm b/code/modules/mob/mob_movement.dm index dea0e3adeba..68620e53338 100644 --- a/code/modules/mob/mob_movement.dm +++ b/code/modules/mob/mob_movement.dm @@ -277,9 +277,9 @@ if("run") if(mob.drowsyness > 0) move_delay += 6 - move_delay += config.run_speed + move_delay += config_legacy.run_speed if("walk") - move_delay += config.walk_speed + move_delay += config_legacy.walk_speed move_delay += mob.movement_delay() if(istype(mob.buckled, /obj/vehicle) || istype(mob.buckled, /mob)) //VOREStation Edit: taur riding. I think. diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm index f9473d612ad..7e20f0016c6 100644 --- a/code/modules/mob/new_player/new_player.dm +++ b/code/modules/mob/new_player/new_player.dm @@ -82,7 +82,7 @@ stat("Game Mode:", "Secret") else if(ticker.hide_mode == 0) - stat("Game Mode:", "[config.mode_names[master_mode]]") // Old setting for showing the game mode + stat("Game Mode:", "[config_legacy.mode_names[master_mode]]") // Old setting for showing the game mode if(ticker.current_state == GAME_STATE_PREGAME) stat("Time To Start:", "[ticker.pregame_timeleft][round_progressing ? "" : " (DELAYED)"]") @@ -144,7 +144,7 @@ client.prefs.real_name = random_name(client.prefs.identifying_gender) observer.real_name = client.prefs.real_name observer.name = observer.real_name - if(!client.holder && !config.antag_hud_allowed) // For new ghosts we remove the verb from even showing up if it's not allowed. + if(!client.holder && !config_legacy.antag_hud_allowed) // For new ghosts we remove the verb from even showing up if it's not allowed. observer.verbs -= /mob/observer/dead/verb/toggle_antagHUD // Poor guys, don't know what they are missing! observer.key = key qdel(src) @@ -158,7 +158,7 @@ return /* if(client.prefs.species != "Human" && !check_rights(R_ADMIN, 0)) //VORESTATION EDITS: THE COMMENTED OUT AREAS FROM LINE 154 TO 178 - if (config.usealienwhitelist) + if (config_legacy.usealienwhitelist) if(!is_alien_whitelisted(src, client.prefs.species)) src << alert("You are currently not whitelisted to Play [client.prefs.species].") return 0 @@ -169,7 +169,7 @@ ViewManifest() if(href_list["SelectedJob"]) - + //Prevents people rejoining as same character. for (var/mob/living/carbon/human/C in mob_list) var/char_name = client.prefs.real_name @@ -177,7 +177,7 @@ usr << "There is a character that already exists with the same name - [C.real_name], please join with a different one, or use Quit the Round with the previous character." //VOREStation Edit return - if(!config.enter_allowed) + if(!config_legacy.enter_allowed) usr << "There is an administrative lock on entering the game!" return else if(ticker && ticker.mode && ticker.mode.explosion_in_progress) @@ -339,7 +339,7 @@ if(!ticker || ticker.current_state != GAME_STATE_PLAYING) usr << "The round is either not ready, or has already finished..." return 0 - if(!config.enter_allowed) + if(!config_legacy.enter_allowed) usr << "There is an administrative lock on entering the game!" return 0 if(!IsJobAvailable(rank)) diff --git a/code/modules/mob/new_player/new_player_vr.dm b/code/modules/mob/new_player/new_player_vr.dm index 10ad4dba14c..779a19a1d96 100644 --- a/code/modules/mob/new_player/new_player_vr.dm +++ b/code/modules/mob/new_player/new_player_vr.dm @@ -2,7 +2,7 @@ var/pass = TRUE //No OOC notes - if (config.allow_Metadata && client && client.prefs && (isnull(client.prefs.metadata) || length(client.prefs.metadata) < 15)) + if (config_legacy.allow_Metadata && client && client.prefs && (isnull(client.prefs.metadata) || length(client.prefs.metadata) < 15)) to_chat(src,"Please set informative OOC notes related to ERP preferences. Set them using the 'OOC Notes' button on the 'General' tab in character setup.") pass = FALSE diff --git a/code/modules/mob/say.dm b/code/modules/mob/say.dm index 417ad608977..8a5839105ae 100644 --- a/code/modules/mob/say.dm +++ b/code/modules/mob/say.dm @@ -39,7 +39,7 @@ return // Clientless mobs shouldn't be trying to talk in deadchat. if(!src.client.holder) - if(!config.dsay_allowed) + if(!config_legacy.dsay_allowed) src << "Deadchat is globally muted." return diff --git a/code/modules/organs/internal/brain.dm b/code/modules/organs/internal/brain.dm index 0dcd380d5e4..c3490766b64 100644 --- a/code/modules/organs/internal/brain.dm +++ b/code/modules/organs/internal/brain.dm @@ -64,7 +64,7 @@ GLOBAL_LIST_BOILERPLATE(all_brain_organs, /obj/item/organ/internal/brain) /obj/item/organ/internal/brain/New() ..() - health = config.default_brain_health + health = config_legacy.default_brain_health spawn(5) if(brainmob && brainmob.client) brainmob.client.screen.len = null //clear the hud diff --git a/code/modules/organs/organ.dm b/code/modules/organs/organ.dm index 214bd788f08..6e090fc22f5 100644 --- a/code/modules/organs/organ.dm +++ b/code/modules/organs/organ.dm @@ -128,7 +128,7 @@ var/list/organ_cache = list() if(B && prob(40)) reagents.remove_reagent("blood",0.1) blood_splatter(src,B,1) - if(config.organs_decay && decays) damage += rand(1,3) + if(config_legacy.organs_decay && decays) damage += rand(1,3) if(damage >= max_damage) damage = max_damage adjust_germ_level(rand(2,6)) diff --git a/code/modules/organs/organ_external.dm b/code/modules/organs/organ_external.dm index e6e8f7f5efb..fb9330d992e 100644 --- a/code/modules/organs/organ_external.dm +++ b/code/modules/organs/organ_external.dm @@ -291,7 +291,7 @@ // push them faster into paincrit though, as the additional damage is converted into shock. var/brute_overflow = 0 var/burn_overflow = 0 - if(is_damageable(brute + burn) || !config.limbs_can_break) + if(is_damageable(brute + burn) || !config_legacy.limbs_can_break) if(brute) if(can_cut) if(sharp && !edge) @@ -305,7 +305,7 @@ else //If we can't inflict the full amount of damage, spread the damage in other ways //How much damage can we actually cause? - var/can_inflict = max_damage * config.organ_health_multiplier - (brute_dam + burn_dam) + var/can_inflict = max_damage * config_legacy.organ_health_multiplier - (brute_dam + burn_dam) var/spillover = 0 if(can_inflict) if (brute > 0) @@ -322,7 +322,7 @@ //How much brute damage is left to inflict spillover += max(0, brute - can_inflict) - can_inflict = max_damage * config.organ_health_multiplier - (brute_dam + burn_dam) //Refresh the can_inflict var, so burn doesn't overload the limb if it is set to take both. + can_inflict = max_damage * config_legacy.organ_health_multiplier - (brute_dam + burn_dam) //Refresh the can_inflict var, so burn doesn't overload the limb if it is set to take both. if (burn > 0 && can_inflict) //Inflict all burn damage we can @@ -333,7 +333,7 @@ //If there is pain to dispense. if(spillover) - owner.shock_stage += spillover * config.organ_damage_spillover_multiplier + owner.shock_stage += spillover * config_legacy.organ_damage_spillover_multiplier // sync the organ's damage with its wounds src.update_damages() @@ -342,7 +342,7 @@ //If limb took enough damage, try to cut or tear it off if(owner && loc == owner && !is_stump()) - if(!cannot_amputate && config.limbs_can_break && (brute_dam + burn_dam) >= (max_damage * config.organ_health_multiplier)) + if(!cannot_amputate && config_legacy.limbs_can_break && (brute_dam + burn_dam) >= (max_damage * config_legacy.organ_health_multiplier)) //organs can come off in three cases //1. If the damage source is edge_eligible and the brute damage dealt exceeds the edge threshold, then the organ is cut off. //2. If the damage amount dealt exceeds the disintegrate threshold, the organ is completely obliterated. @@ -516,7 +516,7 @@ This function completely restores a damaged organ to perfect condition. //Burn damage can cause fluid loss due to blistering and cook-off if((damage > 5 || damage + burn_dam >= 15) && type == BURN && (robotic < ORGAN_ROBOT) && !(species.flags & NO_BLOOD) && !istype(owner.loc,/mob/living) && !istype(owner.loc,/obj/item/device/dogborg/sleeper)) // VOREStation Edit - var/fluid_loss = 0.4 * (damage/(owner.getMaxHealth() - config.health_threshold_dead)) * owner.species.blood_volume*(1 - BLOOD_VOLUME_SURVIVE/100) + var/fluid_loss = 0.4 * (damage/(owner.getMaxHealth() - config_legacy.health_threshold_dead)) * owner.species.blood_volume*(1 - BLOOD_VOLUME_SURVIVE/100) owner.remove_blood(fluid_loss) // first check whether we can widen an existing wound @@ -741,7 +741,7 @@ Note that amputating the affected organ does in fact remove the infection from t //we only update wounds once in [wound_update_accuracy] ticks so have to emulate realtime heal_amt = heal_amt * wound_update_accuracy //configurable regen speed woo, no-regen hardcore or instaheal hugbox, choose your destiny - heal_amt = heal_amt * config.organ_regeneration_multiplier + heal_amt = heal_amt * config_legacy.organ_regeneration_multiplier // amount of healing is spread over all the wounds heal_amt = heal_amt / (wounds.len + 1) // making it look prettier on scanners @@ -791,7 +791,7 @@ Note that amputating the affected organ does in fact remove the infection from t status |= ORGAN_BLEEDING //Bone fractures - if(config.bones_can_break && brute_dam > min_broken_damage * config.organ_health_multiplier && !(robotic >= ORGAN_ROBOT)) + if(config_legacy.bones_can_break && brute_dam > min_broken_damage * config_legacy.organ_health_multiplier && !(robotic >= ORGAN_ROBOT)) src.fracture() update_health() @@ -1075,7 +1075,7 @@ Note that amputating the affected organ does in fact remove the infection from t /obj/item/organ/external/proc/mend_fracture() if(robotic >= ORGAN_ROBOT) return 0 //ORGAN_BROKEN doesn't have the same meaning for robot limbs - if(brute_dam > min_broken_damage * config.organ_health_multiplier) + if(brute_dam > min_broken_damage * config_legacy.organ_health_multiplier) return 0 //will just immediately fracture again status &= ~ORGAN_BROKEN diff --git a/code/modules/overmap/sectors.dm b/code/modules/overmap/sectors.dm index 5309b05096f..4197e118cea 100644 --- a/code/modules/overmap/sectors.dm +++ b/code/modules/overmap/sectors.dm @@ -1,124 +1,124 @@ - -//=================================================================================== -//Hook for building overmap -//=================================================================================== -var/global/list/map_sectors = list() - -/hook/startup/proc/build_map() - if(!config.use_overmap) - return 1 - testing("Building overmap...") - var/obj/effect/mapinfo/data - for(var/level in 1 to world.maxz) - data = locate("sector[level]") - if (data) - testing("Located sector \"[data.name]\" at [data.mapx],[data.mapy] corresponding to zlevel [level]") - map_sectors["[level]"] = new data.obj_type(data) - return 1 - -//=================================================================================== -//Metaobject for storing information about sector this zlevel is representing. -//Should be placed only once on every zlevel. -//=================================================================================== -/obj/effect/mapinfo/ - name = "map info metaobject" - icon = 'icons/mob/screen1.dmi' - icon_state = "x2" - invisibility = 101 - var/obj_type //type of overmap object it spawns - var/landing_area //type of area used as inbound shuttle landing, null if no shuttle landing area - var/zlevel - var/mapx //coordinates on the - var/mapy //overmap zlevel - var/known = 1 - -/obj/effect/mapinfo/New() - tag = "sector[z]" - zlevel = z - loc = null - -/obj/effect/mapinfo/sector - name = "generic sector" - obj_type = /obj/effect/map/sector - -/obj/effect/mapinfo/ship - name = "generic ship" - obj_type = /obj/effect/map/ship - - -//=================================================================================== -//Overmap object representing zlevel -//=================================================================================== - -/obj/effect/map - name = "map object" - icon = 'icons/obj/items.dmi' - icon_state = "sheet-plasteel" - var/map_z = 0 - var/area/shuttle/shuttle_landing - var/always_known = 1 - -/obj/effect/map/New(var/obj/effect/mapinfo/data) - map_z = data.zlevel - name = data.name - always_known = data.known - if (data.icon != 'icons/mob/screen1.dmi') - icon = data.icon - icon_state = data.icon_state - if(data.desc) - desc = data.desc - var/new_x = data.mapx ? data.mapx : rand(OVERMAP_EDGE, world.maxx - OVERMAP_EDGE) - var/new_y = data.mapy ? data.mapy : rand(OVERMAP_EDGE, world.maxy - OVERMAP_EDGE) - loc = locate(new_x, new_y, OVERMAP_ZLEVEL) - - if(data.landing_area) - shuttle_landing = locate(data.landing_area) - -/obj/effect/map/CanPass(atom/movable/A) - testing("[A] attempts to enter sector\"[name]\"") - return 1 - -/obj/effect/map/Crossed(atom/movable/A) - testing("[A] has entered sector\"[name]\"") - if (istype(A,/obj/effect/map/ship)) - var/obj/effect/map/ship/S = A - S.current_sector = src - -/obj/effect/map/Uncrossed(atom/movable/A) - testing("[A] has left sector\"[name]\"") - if (istype(A,/obj/effect/map/ship)) - var/obj/effect/map/ship/S = A - S.current_sector = null - -/obj/effect/map/sector - name = "generic sector" - desc = "Sector with some stuff in it." - anchored = 1 - -//Space stragglers go here - -/obj/effect/map/sector/temporary - name = "Deep Space" - icon_state = "" - always_known = 0 - -/obj/effect/map/sector/temporary/New(var/nx, var/ny, var/nz) - loc = locate(nx, ny, OVERMAP_ZLEVEL) - map_z = nz - map_sectors["[map_z]"] = src - testing("Temporary sector at [x],[y] was created, corresponding zlevel is [map_z].") - -/obj/effect/map/sector/temporary/Destroy() - map_sectors["[map_z]"] = null - testing("Temporary sector at [x],[y] was deleted.") - if (can_die()) - testing("Associated zlevel disappeared.") - world.maxz-- - -/obj/effect/map/sector/temporary/proc/can_die(var/mob/observer) - testing("Checking if sector at [map_z] can die.") - for(var/mob/M in player_list) - if(M != observer && M.z == map_z) - testing("There are people on it.") - return 0 - return 1 + +//=================================================================================== +//Hook for building overmap +//=================================================================================== +var/global/list/map_sectors = list() + +/hook/startup/proc/build_map() + if(!config_legacy.use_overmap) + return 1 + testing("Building overmap...") + var/obj/effect/mapinfo/data + for(var/level in 1 to world.maxz) + data = locate("sector[level]") + if (data) + testing("Located sector \"[data.name]\" at [data.mapx],[data.mapy] corresponding to zlevel [level]") + map_sectors["[level]"] = new data.obj_type(data) + return 1 + +//=================================================================================== +//Metaobject for storing information about sector this zlevel is representing. +//Should be placed only once on every zlevel. +//=================================================================================== +/obj/effect/mapinfo/ + name = "map info metaobject" + icon = 'icons/mob/screen1.dmi' + icon_state = "x2" + invisibility = 101 + var/obj_type //type of overmap object it spawns + var/landing_area //type of area used as inbound shuttle landing, null if no shuttle landing area + var/zlevel + var/mapx //coordinates on the + var/mapy //overmap zlevel + var/known = 1 + +/obj/effect/mapinfo/New() + tag = "sector[z]" + zlevel = z + loc = null + +/obj/effect/mapinfo/sector + name = "generic sector" + obj_type = /obj/effect/map/sector + +/obj/effect/mapinfo/ship + name = "generic ship" + obj_type = /obj/effect/map/ship + + +//=================================================================================== +//Overmap object representing zlevel +//=================================================================================== + +/obj/effect/map + name = "map object" + icon = 'icons/obj/items.dmi' + icon_state = "sheet-plasteel" + var/map_z = 0 + var/area/shuttle/shuttle_landing + var/always_known = 1 + +/obj/effect/map/New(var/obj/effect/mapinfo/data) + map_z = data.zlevel + name = data.name + always_known = data.known + if (data.icon != 'icons/mob/screen1.dmi') + icon = data.icon + icon_state = data.icon_state + if(data.desc) + desc = data.desc + var/new_x = data.mapx ? data.mapx : rand(OVERMAP_EDGE, world.maxx - OVERMAP_EDGE) + var/new_y = data.mapy ? data.mapy : rand(OVERMAP_EDGE, world.maxy - OVERMAP_EDGE) + loc = locate(new_x, new_y, OVERMAP_ZLEVEL) + + if(data.landing_area) + shuttle_landing = locate(data.landing_area) + +/obj/effect/map/CanPass(atom/movable/A) + testing("[A] attempts to enter sector\"[name]\"") + return 1 + +/obj/effect/map/Crossed(atom/movable/A) + testing("[A] has entered sector\"[name]\"") + if (istype(A,/obj/effect/map/ship)) + var/obj/effect/map/ship/S = A + S.current_sector = src + +/obj/effect/map/Uncrossed(atom/movable/A) + testing("[A] has left sector\"[name]\"") + if (istype(A,/obj/effect/map/ship)) + var/obj/effect/map/ship/S = A + S.current_sector = null + +/obj/effect/map/sector + name = "generic sector" + desc = "Sector with some stuff in it." + anchored = 1 + +//Space stragglers go here + +/obj/effect/map/sector/temporary + name = "Deep Space" + icon_state = "" + always_known = 0 + +/obj/effect/map/sector/temporary/New(var/nx, var/ny, var/nz) + loc = locate(nx, ny, OVERMAP_ZLEVEL) + map_z = nz + map_sectors["[map_z]"] = src + testing("Temporary sector at [x],[y] was created, corresponding zlevel is [map_z].") + +/obj/effect/map/sector/temporary/Destroy() + map_sectors["[map_z]"] = null + testing("Temporary sector at [x],[y] was deleted.") + if (can_die()) + testing("Associated zlevel disappeared.") + world.maxz-- + +/obj/effect/map/sector/temporary/proc/can_die(var/mob/observer) + testing("Checking if sector at [map_z] can die.") + for(var/mob/M in player_list) + if(M != observer && M.z == map_z) + testing("There are people on it.") + return 0 + return 1 diff --git a/code/modules/paperwork/faxmachine_vr.dm b/code/modules/paperwork/faxmachine_vr.dm index c470c0cd843..820e49fffe9 100644 --- a/code/modules/paperwork/faxmachine_vr.dm +++ b/code/modules/paperwork/faxmachine_vr.dm @@ -11,16 +11,16 @@ if (istype(fax, /obj/item/weapon/paper)) var/obj/item/weapon/paper/P = fax var/text = "
" \
+ "[H.scribble ? "Written on the back:
[H.scribble]" : ""]"\ + "" - file("[config.fax_export_dir]/fax_[faxid].html") << text + file("[config_legacy.fax_export_dir]/fax_[faxid].html") << text else if (istype(fax, /obj/item/weapon/paper_bundle)) var/obj/item/weapon/paper_bundle/B = fax var/data = "" @@ -29,23 +29,23 @@ var/page_faxid = export_fax(pageobj) data += "Page [page] - [pageobj.name]
" var/text = "
- "
dat += "
- Red alert " - if(!config.ert_admin_call_only) + if(!config_legacy.ert_admin_call_only) dat += "
- Emergency Response Team " dat += "
- Grant Emergency Maintenance Access " @@ -181,7 +181,7 @@ feedback_inc("alert_keycard_auth_ert",1) /obj/machinery/keycard_auth/proc/is_ert_blocked() - if(config.ert_admin_call_only) return 1 + if(config_legacy.ert_admin_call_only) return 1 return ticker.mode && ticker.mode.ert_disabled var/global/maint_all_access = 0 diff --git a/code/modules/security levels/security levels.dm b/code/modules/security levels/security levels.dm index 6114290e212..61844bfc41f 100644 --- a/code/modules/security levels/security levels.dm +++ b/code/modules/security levels/security levels.dm @@ -4,7 +4,7 @@ //2 = code red //3 = code delta -//config.alert_desc_blue_downto +//config_legacy.alert_desc_blue_downto /var/datum/announcement/priority/security/security_announcement_up = new(do_log = 0, do_newscast = 1, new_sound = sound('sound/misc/notice1.ogg')) /var/datum/announcement/priority/security/security_announcement_down = new(do_log = 0, do_newscast = 1) @@ -23,26 +23,26 @@ if(level >= SEC_LEVEL_GREEN && level <= SEC_LEVEL_DELTA && level != security_level) switch(level) if(SEC_LEVEL_GREEN) - security_announcement_down.Announce("[config.alert_desc_green]", "Attention! Security level lowered to green") + security_announcement_down.Announce("[config_legacy.alert_desc_green]", "Attention! Security level lowered to green") security_level = SEC_LEVEL_GREEN if(SEC_LEVEL_BLUE) if(security_level < SEC_LEVEL_BLUE) - security_announcement_up.Announce("[config.alert_desc_blue_upto]", "Attention! Security level elevated to blue") + security_announcement_up.Announce("[config_legacy.alert_desc_blue_upto]", "Attention! Security level elevated to blue") else - security_announcement_down.Announce("[config.alert_desc_blue_downto]", "Attention! Security level lowered to blue") + security_announcement_down.Announce("[config_legacy.alert_desc_blue_downto]", "Attention! Security level lowered to blue") security_level = SEC_LEVEL_BLUE if(SEC_LEVEL_RED) if(security_level < SEC_LEVEL_RED) - security_announcement_up.Announce("[config.alert_desc_red_upto]", "Attention! Code red!") + security_announcement_up.Announce("[config_legacy.alert_desc_red_upto]", "Attention! Code red!") else - security_announcement_down.Announce("[config.alert_desc_red_downto]", "Attention! Code red!") + security_announcement_down.Announce("[config_legacy.alert_desc_red_downto]", "Attention! Code red!") security_level = SEC_LEVEL_RED /* - At the time of commit, setting status displays didn't work properly var/obj/machinery/computer/communications/CC = locate(/obj/machinery/computer/communications,world) if(CC) CC.post_status("alert", "redalert")*/ if(SEC_LEVEL_DELTA) - security_announcement_up.Announce("[config.alert_desc_delta]", "Attention! Delta security level reached!", new_sound = 'sound/effects/siren.ogg') + security_announcement_up.Announce("[config_legacy.alert_desc_delta]", "Attention! Delta security level reached!", new_sound = 'sound/effects/siren.ogg') security_level = SEC_LEVEL_DELTA var/newlevel = get_security_level() diff --git a/code/modules/vehicles/Securitrain_vr.dm b/code/modules/vehicles/Securitrain_vr.dm index 0aaa8560d31..0dc6ca5f9ca 100644 --- a/code/modules/vehicles/Securitrain_vr.dm +++ b/code/modules/vehicles/Securitrain_vr.dm @@ -379,7 +379,7 @@ else move_delay = max(0, (-car_limit * active_engines) + train_length - active_engines) //limits base overweight so you cant overspeed trains move_delay *= (1 / max(1, active_engines)) * 2 //overweight penalty (scaled by the number of engines) - move_delay += config.run_speed //base reference speed + move_delay += config_legacy.run_speed //base reference speed move_delay *= 1.1 //makes cargo trains 10% slower than running when not overweight /obj/vehicle/train/security/trolley/update_car(var/train_length, var/active_engines) diff --git a/code/modules/vehicles/cargo_train.dm b/code/modules/vehicles/cargo_train.dm index 1e351573355..24b9e24fd99 100644 --- a/code/modules/vehicles/cargo_train.dm +++ b/code/modules/vehicles/cargo_train.dm @@ -365,7 +365,7 @@ else move_delay = max(0, (-car_limit * active_engines) + train_length - active_engines) //limits base overweight so you cant overspeed trains move_delay *= (1 / max(1, active_engines)) * 2 //overweight penalty (scaled by the number of engines) - move_delay += config.run_speed //base reference speed + move_delay += config_legacy.run_speed //base reference speed move_delay *= speed_mod //makes cargo trains 10% slower than running when not overweight /obj/vehicle/train/trolley/update_car(var/train_length, var/active_engines) diff --git a/code/modules/vehicles/rover_vr.dm b/code/modules/vehicles/rover_vr.dm index d0752ccc96a..4b06416b31b 100644 --- a/code/modules/vehicles/rover_vr.dm +++ b/code/modules/vehicles/rover_vr.dm @@ -394,7 +394,7 @@ else move_delay = max(0, (-car_limit * active_engines) + train_length - active_engines) //limits base overweight so you cant overspeed trains move_delay *= (1 / max(1, active_engines)) * 2 //overweight penalty (scaled by the number of engines) - move_delay += config.run_speed //base reference speed + move_delay += config_legacy.run_speed //base reference speed move_delay *= 1.1 //makes cargo trains 10% slower than running when not overweight /obj/vehicle/train/rover/trolley/update_car(var/train_length, var/active_engines) diff --git a/code/modules/vore/eating/belly_obj_vr.dm b/code/modules/vore/eating/belly_obj_vr.dm index 71db1bea967..35244d8ce5b 100644 --- a/code/modules/vore/eating/belly_obj_vr.dm +++ b/code/modules/vore/eating/belly_obj_vr.dm @@ -360,7 +360,7 @@ M.release_vore_contents(include_absorbed = TRUE, silent = TRUE) //Drop all items into the belly. - if(config.items_survive_digestion) + if(config_legacy.items_survive_digestion) for(var/obj/item/W in M) if(istype(W,/obj/item/organ/internal/mmi_holder/posibrain)) var/obj/item/organ/internal/mmi_holder/MMI = W diff --git a/interface/interface.dm b/interface/interface.dm index 6ecfde4e7cd..b117897d59e 100644 --- a/interface/interface.dm +++ b/interface/interface.dm @@ -3,15 +3,15 @@ set name = "wiki" set desc = "Type what you want to know about. This will open the wiki on your web browser." set category = "OOC" - if(config.wikiurl) + if(config_legacy.wikiurl) if(query) - if(config.wikisearchurl) - var/output = replacetext(config.wikisearchurl, "%s", url_encode(query)) + if(config_legacy.wikisearchurl) + var/output = replacetext(config_legacy.wikisearchurl, "%s", url_encode(query)) src << link(output) else src << " The wiki search URL is not set in the server configuration." else - src << link(config.wikiurl) + src << link(config_legacy.wikiurl) else src << "The wiki URL is not set in the server configuration." return @@ -20,10 +20,10 @@ set name = "forum" set desc = "Visit the forum." set hidden = 1 - if( config.forumurl ) + if( config_legacy.forumurl ) if(alert("This will open the forum in your browser. Are you sure?",,"Yes","No")=="No") return - src << link(config.forumurl) + src << link(config_legacy.forumurl) else src << "The forum URL is not set in the server configuration." return @@ -33,10 +33,10 @@ set desc = "Show Server Rules." set hidden = 1 - if(config.rulesurl) + if(config_legacy.rulesurl) if(alert("This will open the rules in your browser. Are you sure?",,"Yes","No")=="No") return - src << link(config.rulesurl) + src << link(config_legacy.rulesurl) else src << "The rules URL is not set in the server configuration." return @@ -46,10 +46,10 @@ set desc = "See the map." set hidden = 1 - if(config.mapurl) + if(config_legacy.mapurl) if(alert("This will open the map in your browser. Are you sure?",,"Yes","No")=="No") return - src << link(config.mapurl) + src << link(config_legacy.mapurl) else src << "The map URL is not set in the server configuration." return @@ -59,10 +59,10 @@ set desc = "Visit the GitHub" set hidden = 1 - if(config.githuburl) + if(config_legacy.githuburl) if(alert("This will open the GitHub in your browser. Are you sure?",,"Yes","No")=="No") return - src << link(config.githuburl) + src << link(config_legacy.githuburl) else src << "The GitHub URL is not set in the server configuration." return diff --git a/vorestation.dme b/vorestation.dme index 5c944e98ca7..e225edf1e9b 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -76,7 +76,7 @@ #include "code\__DEFINES\subsystems_vr.dm" #include "code\__DEFINES\supply.dm" #include "code\__DEFINES\targeting.dm" -#include "code\__DEFINES\tgs.config.dm" +#include "code\__DEFINES\tgs.config_legacy.dm" #include "code\__DEFINES\tgs.dm" #include "code\__DEFINES\time.dm" #include "code\__DEFINES\traits.dm"