diff --git a/code/__defines/configuration_ch.dm b/code/__defines/configuration.dm similarity index 100% rename from code/__defines/configuration_ch.dm rename to code/__defines/configuration.dm diff --git a/code/__defines/rust_g.dm b/code/__defines/rust_g.dm index 5404cebed9..e5805bc481 100644 --- a/code/__defines/rust_g.dm +++ b/code/__defines/rust_g.dm @@ -48,6 +48,48 @@ /// Gets the version of rust_g /proc/rustg_get_version() return RUSTG_CALL(RUST_G, "get_version")() +#define rustg_dmi_strip_metadata(fname) RUSTG_CALL(RUST_G, "dmi_strip_metadata")(fname) +#define rustg_dmi_create_png(path, width, height, data) RUSTG_CALL(RUST_G, "dmi_create_png")(path, width, height, data) +#define rustg_dmi_resize_png(path, width, height, resizetype) RUSTG_CALL(RUST_G, "dmi_resize_png")(path, width, height, resizetype) +/** + * input: must be a path, not an /icon; you have to do your own handling if it is one, as icon objects can't be directly passed to rustg. + * + * output: json_encode'd list. json_decode to get a flat list with icon states in the order they're in inside the .dmi + */ +#define rustg_dmi_icon_states(fname) RUSTG_CALL(RUST_G, "dmi_icon_states")(fname) + +#define rustg_file_read(fname) RUSTG_CALL(RUST_G, "file_read")(fname) +#define rustg_file_exists(fname) (RUSTG_CALL(RUST_G, "file_exists")(fname) == "true") +#define rustg_file_write(text, fname) RUSTG_CALL(RUST_G, "file_write")(text, fname) +#define rustg_file_append(text, fname) RUSTG_CALL(RUST_G, "file_append")(text, fname) +#define rustg_file_get_line_count(fname) text2num(RUSTG_CALL(RUST_G, "file_get_line_count")(fname)) +#define rustg_file_seek_line(fname, line) RUSTG_CALL(RUST_G, "file_seek_line")(fname, "[line]") + +#ifdef RUSTG_OVERRIDE_BUILTINS +#define file2text(fname) rustg_file_read("[fname]") +#define text2file(text, fname) rustg_file_append(text, "[fname]") +#endif + +/// Returns the git hash of the given revision, ex. "HEAD". +#define rustg_git_revparse(rev) RUSTG_CALL(RUST_G, "rg_git_revparse")(rev) + +/** + * Returns the date of the given revision in the format YYYY-MM-DD. + * Returns null if the revision is invalid. + */ +#define rustg_git_commit_date(rev) RUSTG_CALL(RUST_G, "rg_git_commit_date")(rev) + +#define rustg_hash_string(algorithm, text) LIBCALL(RUST_G, "hash_string")(algorithm, text) +#define rustg_hash_file(algorithm, fname) LIBCALL(RUST_G, "hash_file")(algorithm, fname) + +#define RUSTG_HASH_MD5 "md5" +#define RUSTG_HASH_SHA1 "sha1" +#define RUSTG_HASH_SHA256 "sha256" +#define RUSTG_HASH_SHA512 "sha512" + +#ifdef RUSTG_OVERRIDE_BUILTINS +#define md5(thing) (isfile(thing) ? rustg_hash_file(RUSTG_HASH_MD5, "[thing]") : rustg_hash_string(RUSTG_HASH_MD5, thing)) +#endif /** * Sets up the Aho-Corasick automaton with its default options. @@ -107,36 +149,6 @@ #define rustg_cnoise_generate(percentage, smoothing_iterations, birth_limit, death_limit, width, height) \ RUSTG_CALL(RUST_G, "cnoise_generate")(percentage, smoothing_iterations, birth_limit, death_limit, width, height) -#define rustg_dmi_strip_metadata(fname) RUSTG_CALL(RUST_G, "dmi_strip_metadata")(fname) -#define rustg_dmi_create_png(path, width, height, data) RUSTG_CALL(RUST_G, "dmi_create_png")(path, width, height, data) -#define rustg_dmi_resize_png(path, width, height, resizetype) RUSTG_CALL(RUST_G, "dmi_resize_png")(path, width, height, resizetype) -/** - * input: must be a path, not an /icon; you have to do your own handling if it is one, as icon objects can't be directly passed to rustg. - * - * output: json_encode'd list. json_decode to get a flat list with icon states in the order they're in inside the .dmi - */ -#define rustg_dmi_icon_states(fname) RUSTG_CALL(RUST_G, "dmi_icon_states")(fname) - -#define rustg_file_read(fname) RUSTG_CALL(RUST_G, "file_read")(fname) -#define rustg_file_exists(fname) (RUSTG_CALL(RUST_G, "file_exists")(fname) == "true") -#define rustg_file_write(text, fname) RUSTG_CALL(RUST_G, "file_write")(text, fname) -#define rustg_file_append(text, fname) RUSTG_CALL(RUST_G, "file_append")(text, fname) -#define rustg_file_get_line_count(fname) text2num(RUSTG_CALL(RUST_G, "file_get_line_count")(fname)) -#define rustg_file_seek_line(fname, line) RUSTG_CALL(RUST_G, "file_seek_line")(fname, "[line]") - -#ifdef RUSTG_OVERRIDE_BUILTINS - #define file2text(fname) rustg_file_read("[fname]") - #define text2file(text, fname) rustg_file_append(text, "[fname]") -#endif - -/// Returns the git hash of the given revision, ex. "HEAD". -#define rustg_git_revparse(rev) RUSTG_CALL(RUST_G, "rg_git_revparse")(rev) - -/** - * Returns the date of the given revision in the format YYYY-MM-DD. - * Returns null if the revision is invalid. - */ -#define rustg_git_commit_date(rev) RUSTG_CALL(RUST_G, "rg_git_commit_date")(rev) #define RUSTG_HTTP_METHOD_GET "get" #define RUSTG_HTTP_METHOD_PUT "put" @@ -159,6 +171,16 @@ #define rustg_noise_get_at_coordinates(seed, x, y) RUSTG_CALL(RUST_G, "noise_get_at_coordinates")(seed, x, y) +/* + * Takes in a string and json_encode()"d lists to produce a sanitized string. + * This function operates on whitelists, there is currently no way to blacklist. + * Args: + * * text: the string to sanitize. + * * attribute_whitelist_json: a json_encode()'d list of HTML attributes to allow in the final string. + * * tag_whitelist_json: a json_encode()'d list of HTML tags to allow in the final string. + */ +#define rustg_sanitize_html(text, attribute_whitelist_json, tag_whitelist_json) RUSTG_CALL(RUST_G, "sanitize_html")(text, attribute_whitelist_json, tag_whitelist_json) + #define rustg_sql_connect_pool(options) RUSTG_CALL(RUST_G, "sql_connect_pool")(options) #define rustg_sql_query_async(handle, query, params) RUSTG_CALL(RUST_G, "sql_query_async")(handle, query, params) #define rustg_sql_query_blocking(handle, query, params) RUSTG_CALL(RUST_G, "sql_query_blocking")(handle, query, params) @@ -199,4 +221,3 @@ #define url_encode(text) rustg_url_encode(text) #define url_decode(text) rustg_url_decode(text) #endif - diff --git a/code/_global_vars/configuration_ch.dm b/code/_global_vars/configuration.dm similarity index 100% rename from code/_global_vars/configuration_ch.dm rename to code/_global_vars/configuration.dm diff --git a/code/_global_vars/sensitive.dm b/code/_global_vars/sensitive.dm deleted file mode 100644 index 8de09f4f3a..0000000000 --- a/code/_global_vars/sensitive.dm +++ /dev/null @@ -1,11 +0,0 @@ -// MySQL configuration -GLOBAL_REAL_VAR(sqladdress) = "localhost" -GLOBAL_REAL_VAR(sqlport) = "3306" -GLOBAL_REAL_VAR(sqldb) = "tgstation" -GLOBAL_REAL_VAR(sqllogin) = "root" -GLOBAL_REAL_VAR(sqlpass) = "" -// Feedback gathering sql connection -GLOBAL_REAL_VAR(sqlfdbkdb) = "test" -GLOBAL_REAL_VAR(sqlfdbklogin) = "root" -GLOBAL_REAL_VAR(sqlfdbkpass) = "" -GLOBAL_REAL_VAR(sqllogging) = 0 // Should we log deaths, population stats, etc.? diff --git a/code/_helpers/logging.dm b/code/_helpers/logging.dm index f21d0164fb..34d6eec3df 100644 --- a/code/_helpers/logging.dm +++ b/code/_helpers/logging.dm @@ -28,22 +28,22 @@ /proc/log_admin(text) admin_log.Add(text) - if (CONFIG_GET(flag/log_admin)) // CHOMPEdit + if (CONFIG_GET(flag/log_admin)) WRITE_LOG(diary, "ADMIN: [text]") /proc/log_adminpm(text, client/source, client/dest) admin_log.Add(text) - if (CONFIG_GET(flag/log_admin)) // CHOMPEdit + if (CONFIG_GET(flag/log_admin)) WRITE_LOG(diary, "ADMINPM: [key_name(source)]->[key_name(dest)]: [html_decode(text)]") /proc/log_pray(text, client/source) admin_log.Add(text) - if (CONFIG_GET(flag/log_admin)) // CHOMPEdit + if (CONFIG_GET(flag/log_admin)) WRITE_LOG(diary, "PRAY: [key_name(source)]: [text]") /proc/log_debug(text) - //if (CONFIG_GET(flag/log_debug)) // CHOMPEdit - // WRITE_LOG(debug_log, "DEBUG: [sanitize(text)]") + //if (CONFIG_GET(flag/log_debug)) // CHOMPRemove + // WRITE_LOG(debug_log, "DEBUG: [sanitize(text)]") // CHOMPRemove WRITE_LOG(debug_log, "DEBUG: [sanitize(text)]") for(var/client/C in GLOB.admins) @@ -53,25 +53,25 @@ html = span_filter_debuglogs("DEBUG: [text]")) /proc/log_game(text) - if (CONFIG_GET(flag/log_game)) // CHOMPEdit + if (CONFIG_GET(flag/log_game)) WRITE_LOG(diary, "GAME: [text]") /proc/log_vote(text) - if (CONFIG_GET(flag/log_vote)) // CHOMPEdit + if (CONFIG_GET(flag/log_vote)) WRITE_LOG(diary, "VOTE: [text]") /proc/log_access_in(client/new_client) - if (CONFIG_GET(flag/log_access)) // CHOMPEdit + if (CONFIG_GET(flag/log_access)) var/message = "[key_name(new_client)] - IP:[new_client.address] - CID:[new_client.computer_id] - BYOND v[new_client.byond_version]" WRITE_LOG(diary, "ACCESS IN: [message]") //VOREStation Edit /proc/log_access_out(mob/last_mob) - if (CONFIG_GET(flag/log_access)) // CHOMPEdit + if (CONFIG_GET(flag/log_access)) var/message = "[key_name(last_mob)] - IP:[last_mob.lastKnownIP] - CID:Logged Out - BYOND Logged Out" WRITE_LOG(diary, "ACCESS OUT: [message]") /proc/log_say(text, mob/speaker) - if (CONFIG_GET(flag/log_say)) // CHOMPEdit + if (CONFIG_GET(flag/log_say)) WRITE_LOG(diary, "SAY: [speaker.simple_info_line()]: [html_decode(text)]") //Log the message to in-game dialogue logs, as well. //CHOMPEdit Begin @@ -92,7 +92,7 @@ //CHOMPEdit End /proc/log_ooc(text, client/user) - if (CONFIG_GET(flag/log_ooc)) // CHOMPEdit + if (CONFIG_GET(flag/log_ooc)) WRITE_LOG(diary, "OOC: [user.simple_info_line()]: [html_decode(text)]") if(!SSdbcore.IsConnected()) establish_db_connection() @@ -108,7 +108,7 @@ //GLOB.round_text_log += span_bold("([time_stamp()])") + " (" + span_bold("[user]") + ") " + span_underline("OOC:") + " - " + span_blue(span_bold("[text]")) /proc/log_aooc(text, client/user) - if (CONFIG_GET(flag/log_ooc)) // CHOMPEdit + if (CONFIG_GET(flag/log_ooc)) WRITE_LOG(diary, "AOOC: [user.simple_info_line()]: [html_decode(text)]") if(!SSdbcore.IsConnected()) establish_db_connection() @@ -124,7 +124,7 @@ //GLOB.round_text_log += span_bold("([time_stamp()])") + " (" + span_bold("[user]") + ") " + span_underline("AOOC:") + " - " + span_red(span_bold("[text]")) /proc/log_looc(text, client/user) - if (CONFIG_GET(flag/log_ooc)) // CHOMPEdit + if (CONFIG_GET(flag/log_ooc)) WRITE_LOG(diary, "LOOC: [user.simple_info_line()]: [html_decode(text)]") if(!SSdbcore.IsConnected()) establish_db_connection() @@ -140,7 +140,7 @@ //GLOB.round_text_log += span_bold("([time_stamp()])") + " (" + span_bold("[user]") + ") " + span_underline("LOOC:") + " - " + span_orange(span_bold("[text]")) /proc/log_whisper(text, mob/speaker) - if (CONFIG_GET(flag/log_whisper)) // CHOMPEdit + if (CONFIG_GET(flag/log_whisper)) WRITE_LOG(diary, "WHISPER: [speaker.simple_info_line()]: [html_decode(text)]") if(speaker.client) @@ -159,7 +159,7 @@ qdel(query_insert) /proc/log_emote(text, mob/speaker) - if (CONFIG_GET(flag/log_emote)) // CHOMPEdit + if (CONFIG_GET(flag/log_emote)) WRITE_LOG(diary, "EMOTE: [speaker.simple_info_line()]: [html_decode(text)]") //CHOMPEdit Begin if(speaker.client) @@ -179,23 +179,23 @@ //CHOMPEdit End /proc/log_attack(attacker, defender, message) - if (CONFIG_GET(flag/log_attack)) // CHOMPEdit + if (CONFIG_GET(flag/log_attack)) WRITE_LOG(diary, "ATTACK: [attacker] against [defender]: [message]") /proc/log_adminsay(text, mob/speaker) - if (CONFIG_GET(flag/log_adminchat)) // CHOMPEdit + if (CONFIG_GET(flag/log_adminchat)) WRITE_LOG(diary, "ADMINSAY: [speaker.simple_info_line()]: [html_decode(text)]") /proc/log_modsay(text, mob/speaker) - if (CONFIG_GET(flag/log_adminchat)) // CHOMPEdit + if (CONFIG_GET(flag/log_adminchat)) WRITE_LOG(diary, "MODSAY: [speaker.simple_info_line()]: [html_decode(text)]") /proc/log_eventsay(text, mob/speaker) - if (CONFIG_GET(flag/log_adminchat)) // CHOMPEdit + if (CONFIG_GET(flag/log_adminchat)) WRITE_LOG(diary, "EVENTSAY: [speaker.simple_info_line()]: [html_decode(text)]") /proc/log_ghostsay(text, mob/speaker) - if (CONFIG_GET(flag/log_say)) // CHOMPEdit + if (CONFIG_GET(flag/log_say)) WRITE_LOG(diary, "DEADCHAT: [speaker.simple_info_line()]: [html_decode(text)]") //CHOMPEdit Begin if(speaker.client) @@ -216,7 +216,7 @@ //CHOMPEdit End /proc/log_ghostemote(text, mob/speaker) - if (CONFIG_GET(flag/log_emote)) // CHMOPEdit + if (CONFIG_GET(flag/log_emote)) WRITE_LOG(diary, "DEADEMOTE: [speaker.simple_info_line()]: [html_decode(text)]") //CHOMPEdit Begin if(speaker.client) @@ -234,11 +234,11 @@ //CHOMPEdit End /proc/log_adminwarn(text) - if (CONFIG_GET(flag/log_adminwarn)) // CHOMPEdit + if (CONFIG_GET(flag/log_adminwarn)) WRITE_LOG(diary, "ADMINWARN: [html_decode(text)]") /proc/log_pda(text, mob/speaker) - if (CONFIG_GET(flag/log_pda)) // CHOMPEdit + if (CONFIG_GET(flag/log_pda)) WRITE_LOG(diary, "PDA: [speaker.simple_info_line()]: [html_decode(text)]") //CHOMPEdit Begin if(speaker.client) @@ -260,8 +260,8 @@ /proc/log_to_dd(text) to_world_log(text) //this comes before the config check because it can't possibly runtime - //if(CONFIG_GET(flag/log_world_output)) // CHOMPEdit - // WRITE_LOG(diary, "DD_OUTPUT: [text]") + //if(CONFIG_GET(flag/log_world_output)) // CHOMPRemove + // WRITE_LOG(diary, "DD_OUTPUT: [text]") // CHOMPRemove WRITE_LOG(diary, "DD_OUTPUT: [text]") /proc/log_error(text) diff --git a/code/_helpers/logging/debug_ch.dm b/code/_helpers/logging/debug.dm similarity index 100% rename from code/_helpers/logging/debug_ch.dm rename to code/_helpers/logging/debug.dm diff --git a/code/_helpers/logging_vr.dm b/code/_helpers/logging_vr.dm index d8969228c0..abaf7a0654 100644 --- a/code/_helpers/logging_vr.dm +++ b/code/_helpers/logging_vr.dm @@ -1,5 +1,5 @@ /proc/log_nsay(text, inside, mob/speaker) - if (CONFIG_GET(flag/log_say)) // CHOMPEdit + if (CONFIG_GET(flag/log_say)) WRITE_LOG(diary, "NSAY (NIF:[inside]): [speaker.simple_info_line()]: [html_decode(text)]") //CHOMPEdit Begin if(speaker.client) @@ -17,7 +17,7 @@ //CHOMPEdit End /proc/log_nme(text, inside, mob/speaker) - if (CONFIG_GET(flag/log_emote)) // CHOMPEdit + if (CONFIG_GET(flag/log_emote)) WRITE_LOG(diary, "NME (NIF:[inside]): [speaker.simple_info_line()]: [html_decode(text)]") //CHOMPEdit Begin if(speaker.client) @@ -35,7 +35,7 @@ //CHOMPEdit End /proc/log_subtle(text, mob/speaker) - if (CONFIG_GET(flag/log_emote)) // CHOMPEdit + if (CONFIG_GET(flag/log_emote)) WRITE_LOG(diary, "SUBTLE: [speaker.simple_info_line()]: [html_decode(text)]") //CHOMPEdit Begin if(speaker.client) diff --git a/code/_helpers/mobs.dm b/code/_helpers/mobs.dm index 40cfc85f81..409b0491ee 100644 --- a/code/_helpers/mobs.dm +++ b/code/_helpers/mobs.dm @@ -374,7 +374,7 @@ Proc for attack log creation, because really why not cached_character_icons[cachekey] = . /proc/not_has_ooc_text(mob/user) - if (CONFIG_GET(flag/allow_metadata) && (!user.client?.prefs?.metadata || length(user.client.prefs.metadata) < 15)) // CHOMPEdit + if (CONFIG_GET(flag/allow_metadata) && (!user.client?.prefs?.metadata || length(user.client.prefs.metadata) < 15)) to_chat(user, span_warning("Please set informative OOC notes related to RP/ERP preferences. Set them using the 'OOC Notes' button on the 'General' tab in character setup.")) return TRUE return FALSE diff --git a/code/_helpers/nameof_ch.dm b/code/_helpers/nameof.dm similarity index 100% rename from code/_helpers/nameof_ch.dm rename to code/_helpers/nameof.dm diff --git a/code/_helpers/names.dm b/code/_helpers/names.dm index 439a5eaf91..12d2c08e86 100644 --- a/code/_helpers/names.dm +++ b/code/_helpers/names.dm @@ -92,8 +92,8 @@ var/religion_name = null new_station_name += pick("13","XIII","Thirteen") - if (config && CONFIG_GET(string/servername)) // CHOMPEdit - world.name = "[CONFIG_GET(string/servername)]: [name]" // CHOMPEdit + if (config && CONFIG_GET(string/servername)) + world.name = "[CONFIG_GET(string/servername)]: [name]" else world.name = new_station_name @@ -104,8 +104,8 @@ var/religion_name = null using_map.station_name = name - if (config && CONFIG_GET(string/servername)) // CHOMPEdit - world.name = "[CONFIG_GET(string/servername)]: [name]" // CHOMPEdit + if (config && CONFIG_GET(string/servername)) + world.name = "[CONFIG_GET(string/servername)]: [name]" else world.name = name diff --git a/code/_helpers/type2type.dm b/code/_helpers/type2type.dm index f01c1263f4..0e0dd58295 100644 --- a/code/_helpers/type2type.dm +++ b/code/_helpers/type2type.dm @@ -8,7 +8,6 @@ * angle2dir */ -// CHOMPEdit Start //Splits the text of a file at seperator and returns them in a list. //returns an empty list if the file doesn't exist /world/proc/file2list(filename, seperator="\n", trim = TRUE) @@ -36,7 +35,6 @@ return "turf" else //regex everything else (works for /proc too) return lowertext(replacetext("[the_type]", "[type2parent(the_type)]/", "")) -// CHOMPEdit End // Returns an integer given a hexadecimal number string as input. /proc/hex2num(hex) diff --git a/code/_helpers/unsorted.dm b/code/_helpers/unsorted.dm index e8606811be..7e63f79ae4 100644 --- a/code/_helpers/unsorted.dm +++ b/code/_helpers/unsorted.dm @@ -1389,9 +1389,6 @@ var/mob/dview/dview_mob = new #undef NOT_FLAG #undef HAS_FLAG -//datum may be null, but it does need to be a typed var -//#define NAMEOF(datum, X) (#X || ##datum.##X) // CHOMPEdit: Moved to nameof_ch.dm - #define VARSET_LIST_CALLBACK(target, var_name, var_value) CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(___callbackvarset), ##target, ##var_name, ##var_value) //dupe code because dm can't handle 3 level deep macros #define VARSET_CALLBACK(datum, var, var_value) CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(___callbackvarset), ##datum, NAMEOF(##datum, ##var), ##var_value) diff --git a/code/_helpers/unsorted_vr.dm b/code/_helpers/unsorted_vr.dm index 2b7eae4ea4..88c6dba1b2 100644 --- a/code/_helpers/unsorted_vr.dm +++ b/code/_helpers/unsorted_vr.dm @@ -43,26 +43,26 @@ //Sender is optional /proc/admin_chat_message(var/message = "Debug Message", var/color = "#FFFFFF", var/sender) - if (!CONFIG_GET(string/chat_webhook_url) || !message) // CHOMPEdit + if (!CONFIG_GET(string/chat_webhook_url) || !message) return spawn(0) var/query_string = "type=adminalert" - query_string += "&key=[url_encode(CONFIG_GET(string/chat_webhook_key))]" // CHOMPEdit + query_string += "&key=[url_encode(CONFIG_GET(string/chat_webhook_key))]" query_string += "&msg=[url_encode(message)]" query_string += "&color=[url_encode(color)]" if(sender) query_string += "&from=[url_encode(sender)]" - world.Export("[CONFIG_GET(string/chat_webhook_url)]?[query_string]") // CHOMPEdit + world.Export("[CONFIG_GET(string/chat_webhook_url)]?[query_string]") /proc/admin_action_message(var/admin = "INVALID", var/user = "INVALID", var/action = "INVALID", var/reason = "INVALID", var/time = "INVALID") - if (!CONFIG_GET(string/chat_webhook_url) || !action) // CHOMPEdit + if (!CONFIG_GET(string/chat_webhook_url) || !action) return spawn(0) var/query_string = "type=adminaction" - query_string += "&key=[url_encode(CONFIG_GET(string/chat_webhook_key))]" // CHOMPEdit + query_string += "&key=[url_encode(CONFIG_GET(string/chat_webhook_key))]" query_string += "&admin=[url_encode(admin)]" query_string += "&user=[url_encode(user)]" query_string += "&action=[url_encode(action)]" query_string += "&reason=[url_encode(reason)]" query_string += "&time=[url_encode(time)]" - world.Export("[CONFIG_GET(string/chat_webhook_url)]?[query_string]") // CHOMPEdit + world.Export("[CONFIG_GET(string/chat_webhook_url)]?[query_string]") diff --git a/code/_onclick/click.dm b/code/_onclick/click.dm index 747c659d46..9947b037ba 100644 --- a/code/_onclick/click.dm +++ b/code/_onclick/click.dm @@ -158,7 +158,7 @@ next_click = max(world.time + timeout, next_click) /mob/proc/checkClickCooldown() - if(next_click > world.time && !CONFIG_GET(flag/no_click_cooldown)) // CHOMPEdit + if(next_click > world.time && !CONFIG_GET(flag/no_click_cooldown)) return FALSE return TRUE diff --git a/code/controllers/autotransfer.dm b/code/controllers/autotransfer.dm index 52362febfb..f3f298f900 100644 --- a/code/controllers/autotransfer.dm +++ b/code/controllers/autotransfer.dm @@ -6,9 +6,9 @@ var/datum/controller/transfer_controller/transfer_controller var/shift_hard_end = 0 //VOREStation Edit var/shift_last_vote = 0 //VOREStation Edit /datum/controller/transfer_controller/New() - timerbuffer = CONFIG_GET(number/vote_autotransfer_initial) // CHOMPEdit + timerbuffer = CONFIG_GET(number/vote_autotransfer_initial) shift_hard_end = CONFIG_GET(number/vote_autotransfer_initial) + (CONFIG_GET(number/vote_autotransfer_interval) * 2) //CHOMPStation Edit //Change this "1" to how many extend votes you want there to be. //Note: Fuck you whoever just slapped a number here instead of using the FUCKING CONFIG LIKE ALL THE OTHER NUMBERS HERE - shift_last_vote = shift_hard_end - CONFIG_GET(number/vote_autotransfer_interval) //VOREStation Edit // CHOMPEdit + shift_last_vote = shift_hard_end - CONFIG_GET(number/vote_autotransfer_interval) //VOREStation Edit START_PROCESSING(SSprocessing, src) /datum/controller/transfer_controller/Destroy() @@ -23,9 +23,9 @@ var/datum/controller/transfer_controller/transfer_controller to_world(span_world(span_notice("Warning: This upcoming round-extend vote will be your last chance to vote for shift extension. Wrap up your scenes in the next 60 minutes if the round is extended."))) //CHOMPStation Edit if (round_duration_in_ds >= shift_hard_end - 1 MINUTE) init_shift_change(null, 1) - shift_hard_end = timerbuffer + CONFIG_GET(number/vote_autotransfer_interval) //If shuttle somehow gets recalled, let's force it to call again next time a vote would occur. // CHOMPEdit - timerbuffer = timerbuffer + CONFIG_GET(number/vote_autotransfer_interval) //Just to make sure a vote doesn't occur immediately afterwords. // CHOMPEdit + shift_hard_end = timerbuffer + CONFIG_GET(number/vote_autotransfer_interval) //If shuttle somehow gets recalled, let's force it to call again next time a vote would occur. + timerbuffer = timerbuffer + CONFIG_GET(number/vote_autotransfer_interval) //Just to make sure a vote doesn't occur immediately afterwords. else if (round_duration_in_ds >= timerbuffer - 1 MINUTE) SSvote.start_vote(new /datum/vote/crew_transfer) //VOREStation Edit END - timerbuffer = timerbuffer + CONFIG_GET(number/vote_autotransfer_interval) // CHOMPEdit + timerbuffer = timerbuffer + CONFIG_GET(number/vote_autotransfer_interval) diff --git a/code/controllers/configuration_ch/config_entry.dm b/code/controllers/configuration/config_entry.dm similarity index 100% rename from code/controllers/configuration_ch/config_entry.dm rename to code/controllers/configuration/config_entry.dm diff --git a/code/controllers/configuration_ch/configuration.dm b/code/controllers/configuration/configuration.dm similarity index 100% rename from code/controllers/configuration_ch/configuration.dm rename to code/controllers/configuration/configuration.dm diff --git a/code/controllers/configuration_ch/entries/chompstation.dm b/code/controllers/configuration/entries/chompstation.dm similarity index 100% rename from code/controllers/configuration_ch/entries/chompstation.dm rename to code/controllers/configuration/entries/chompstation.dm diff --git a/code/controllers/configuration_ch/entries/dbconfig.dm b/code/controllers/configuration/entries/dbconfig.dm similarity index 91% rename from code/controllers/configuration_ch/entries/dbconfig.dm rename to code/controllers/configuration/entries/dbconfig.dm index 2dbc1fb075..d14ca42e68 100644 --- a/code/controllers/configuration_ch/entries/dbconfig.dm +++ b/code/controllers/configuration/entries/dbconfig.dm @@ -46,8 +46,8 @@ /datum/config_entry/number/max_concurrent_queries/ValidateAndSet(str_val) . = ..() - if (.) - SSdbcore.max_concurrent_queries = config_entry_value + //if (.) TODO: ENABLE THIS IN FUTURE DB PRs + //SSdbcore.max_concurrent_queries = config_entry_value TODO: ENABLE THIS IN FUTURE DB PRs /// The exe for mariadbd.exe. /// Shouldn't really be set on production servers, primarily for EZDB. diff --git a/code/controllers/configuration_ch/entries/game_options.dm b/code/controllers/configuration/entries/game_options.dm similarity index 98% rename from code/controllers/configuration_ch/entries/game_options.dm rename to code/controllers/configuration/entries/game_options.dm index 5508d5e168..867460f861 100644 --- a/code/controllers/configuration_ch/entries/game_options.dm +++ b/code/controllers/configuration/entries/game_options.dm @@ -12,12 +12,10 @@ /datum/config_entry/flag/limbs_can_break /datum/config_entry/number/organ_health_multiplier - integer = FALSE - default = 1.0 + default = 1 /datum/config_entry/number/organ_regeneration_multiplier - integer = FALSE - default = 1.0 + default = 1 // FIXME: Unused ///datum/config_entry/flag/revival_pod_plants diff --git a/code/controllers/configuration_ch/entries/general.dm b/code/controllers/configuration/entries/general.dm similarity index 99% rename from code/controllers/configuration_ch/entries/general.dm rename to code/controllers/configuration/entries/general.dm index 06e9e5a021..555ae7c9fe 100644 --- a/code/controllers/configuration_ch/entries/general.dm +++ b/code/controllers/configuration/entries/general.dm @@ -51,6 +51,9 @@ /// logs world.log to a file /datum/config_entry/flag/log_runtime +/// logs sql stuff +/datum/config_entry/flag/log_sql + /// log to_world_log(messages) /datum/config_entry/flag/log_world_output @@ -571,7 +574,7 @@ /// 0 / RAD_RESIST_CALC_DIV = Each turf absorbs some fraction of the working radiation level /// 1 / RAD_RESIST_CALC_SUB = Each turf absorbs a fixed amount of radiation /datum/config_entry/flag/radiation_resistance_calc_mode - default = RAD_RESIST_CALC_DIV + default = RAD_RESIST_CALC_DIV // CHOMPEdit /datum/config_entry/flag/radiation_resistance_calc_mode/ValidateAndSet(str_val) if(!VASProcCallGuard(str_val)) diff --git a/code/controllers/configuration_ch/entries/resources.dm b/code/controllers/configuration/entries/resources.dm similarity index 100% rename from code/controllers/configuration_ch/entries/resources.dm rename to code/controllers/configuration/entries/resources.dm diff --git a/code/controllers/configuration_ch/entries/vorestation.dm b/code/controllers/configuration/entries/vorestation.dm similarity index 98% rename from code/controllers/configuration_ch/entries/vorestation.dm rename to code/controllers/configuration/entries/vorestation.dm index 38d0dcda5c..ae9730dbc4 100644 --- a/code/controllers/configuration_ch/entries/vorestation.dm +++ b/code/controllers/configuration/entries/vorestation.dm @@ -34,7 +34,7 @@ /// Hours /datum/config_entry/number/pto_cap - default = 200 + default = 200 // CHOMPEdit protection = CONFIG_ENTRY_LOCKED /datum/config_entry/flag/require_flavor diff --git a/code/controllers/configuration_ch/legacy.dm b/code/controllers/configuration/legacy.dm similarity index 100% rename from code/controllers/configuration_ch/legacy.dm rename to code/controllers/configuration/legacy.dm diff --git a/code/controllers/configuration_ch.dm b/code/controllers/configuration_ch.dm deleted file mode 100644 index 2dcb5657db..0000000000 --- a/code/controllers/configuration_ch.dm +++ /dev/null @@ -1,125 +0,0 @@ -// Making this file to allow us to easily understand the location of any modifications to the config file made by Chompers and to try and prevent any conflicts happening in the future. -// Basically a copy pasta from virgo's configuration.dm file but it'll make life easer for us to just toggle on/off. - - -/datum/configuration - var/discord_restriction = FALSE - var/use_jobwhitelist = TRUE - var/emojis = FALSE - - var/vorefootstep_volume = 75 //In future see about making a function to adjust volume serverside in config.txt, easy to do with reenable values. - Jack - - var/nodebot_enabled = 0 //So, nodebot is a supplement to the TGS discord bot pretty much. For things likes faxes and the manifest it's very helpful because it's able to render html into an image and post it. - var/nodebot_location //We need to print the manifest to this location so nodebot can render it to chat. //NOTE: TO BE REPLACED BY BETTER CODE FOR FETCHING MANIFEST - - //These are for tgs4 channels, for discord chatbots used in TGS. - var/ahelp_channel_tag - var/fax_channel_tag - var/role_request_channel_tag - - //These are for the role request TGS discord bot. Role IDs to ping. - var/role_request_id_command - var/role_request_id_security - var/role_request_id_engineering - var/role_request_id_medical - var/role_request_id_research - var/role_request_id_supply - var/role_request_id_service - var/role_request_id_expedition - var/role_request_id_silicon - - var/discord_faxes_autoprint = 0 //Only turn this on if you're not using the nodebot. - var/discord_faxes_disabled = 0 //Turn this off if you don't want the TGS bot sending you messages whenever a fax is sent to central. - var/discord_ahelps_disabled = 0 //Turn this off if you don't want the TGS bot sending you messages whenever an ahelp ticket is created. - var/discord_ahelps_all = 0 //Turn this on if you want all admin-PMs to go to be sent to discord, and not only the first message of a ticket. - - - var/list/ip_whitelist = list() - -/hook/startup/proc/read_ch_config() - var/list/Lines = file2list("config/config.txt") - for(var/t in Lines) - if(!t) continue - - t = trim(t) - if (length(t) == 0) - continue - else if (copytext(t, 1, 2) == "#") - continue - - var/pos = findtext(t, " ") - var/name = null - var/value = null - - if (pos) - name = lowertext(copytext(t, 1, pos)) - value = copytext(t, pos + 1) - else - name = lowertext(t) - - if (!name) - continue - - switch (name) - if ("discord_restriction") - config.discord_restriction = 1 - if ("use_jobwhitelist") - config.use_jobwhitelist = 1 - if ("disable_emojis") - config.emojis = 0 - if ("nodebot_enabled") - config.nodebot_enabled = 1 - if ("discord_faxes_autoprint") - config.discord_faxes_autoprint = 1 - if ("discord_faxes_disabled") - config.discord_faxes_disabled = 1 - if ("discord_ahelps_disabled") - config.discord_ahelps_disabled = 1 - if ("discord_ahelps_all") - config.discord_ahelps_all = 1 - if ("nodebot_location") - config.nodebot_location = value - if ("ahelp_channel_tag") - config.ahelp_channel_tag = value - if ("fax_channel_tag") - config.fax_channel_tag = value - if ("role_request_channel_tag") - config.role_request_channel_tag = value - if ("role_request_id_command") - config.role_request_id_command = value - if ("role_request_id_security") - config.role_request_id_security = value - if ("role_request_id_engineering") - config.role_request_id_engineering = value - if ("role_request_id_medical") - config.role_request_id_medical = value - if ("role_request_id_research") - config.role_request_id_research = value - if ("role_request_id_supply") - config.role_request_id_supply = value - if ("role_request_id_service") - config.role_request_id_service = value - if ("role_request_id_expedition") - config.role_request_id_expedition = value - if ("role_request_id_silicon") - config.role_request_id_silicon = value - if("job_camp_time_limit") - config.job_camp_time_limit = value MINUTES - - - var/list/ip_whitelist_lines = file2list("config/ip_whitelist.txt") - var/increment = 1 - for(var/t in ip_whitelist_lines) - if (!t) continue - t = trim(t) - if (length(t) == 0) - continue - else if (copytext(t, 1, 2) == "#") - continue - var/ip_address = splittext(t, ",") - for (var/name in ip_address) - config.ip_whitelist[name] = increment - increment += 1 - - - return 1 diff --git a/code/controllers/master.dm b/code/controllers/master.dm index 82f60cb235..4e1081f557 100644 --- a/code/controllers/master.dm +++ b/code/controllers/master.dm @@ -205,7 +205,7 @@ GLOBAL_REAL(Master, /datum/controller/master) = new var/start_timeofday = REALTIMEOFDAY // Initialize subsystems. - current_ticklimit = CONFIG_GET(number/tick_limit_mc_init) // CHOMPEdit + current_ticklimit = CONFIG_GET(number/tick_limit_mc_init) for (var/datum/controller/subsystem/SS in subsystems) if (SS.flags & SS_NO_INIT) continue @@ -226,7 +226,7 @@ GLOBAL_REAL(Master, /datum/controller/master) = new if (!current_runlevel) SetRunLevel(RUNLEVEL_LOBBY) - // GLOB.revdata = new // It can load revdata now, from tgs or .git or whatever // CHOMPEDIT + // GLOB.revdata = new // It can load revdata now, from tgs or .git or whatever // Sort subsystems by display setting for easy access. sortTim(subsystems, GLOBAL_PROC_REF(cmp_subsystem_display)) @@ -236,7 +236,7 @@ GLOBAL_REAL(Master, /datum/controller/master) = new #else world.sleep_offline = 1 #endif - world.change_fps(CONFIG_GET(number/fps)) // CHOMPEdit + world.change_fps(CONFIG_GET(number/fps)) var/initialized_tod = REALTIMEOFDAY sleep(1) initializations_finished_with_no_players_logged_in = initialized_tod < REALTIMEOFDAY - 10 @@ -725,9 +725,7 @@ GLOBAL_REAL(Master, /datum/controller/master) = new for(var/datum/controller/subsystem/SS as anything in subsystems) SS.StopLoadingMap() -// CHOMPEdit Begin /datum/controller/master/proc/OnConfigLoad() for (var/thing in subsystems) var/datum/controller/subsystem/SS = thing SS.OnConfigLoad() -// CHOMPEdit End diff --git a/code/controllers/subsystem.dm b/code/controllers/subsystem.dm index 7fc81af178..1badd0a453 100644 --- a/code/controllers/subsystem.dm +++ b/code/controllers/subsystem.dm @@ -224,10 +224,10 @@ if(SS_SLEEPING) state = SS_PAUSING -// CHOMPEdit Start /// Called after the config has been loaded or reloaded. /datum/controller/subsystem/proc/OnConfigLoad() +// CHOMPEdit Start /** * Used to initialize the subsystem. This is expected to be overriden by subtypes. */ diff --git a/code/controllers/subsystems/assets.dm b/code/controllers/subsystems/assets.dm index 96fb1b304e..d34d05ff55 100644 --- a/code/controllers/subsystems/assets.dm +++ b/code/controllers/subsystems/assets.dm @@ -6,9 +6,9 @@ SUBSYSTEM_DEF(assets) var/list/preload = list() var/datum/asset_transport/transport = new() -/datum/controller/subsystem/assets/OnConfigLoad() // CHOMPEdit +/datum/controller/subsystem/assets/OnConfigLoad() var/newtransporttype = /datum/asset_transport - switch (CONFIG_GET(string/asset_transport)) // CHOMPEdit + switch (CONFIG_GET(string/asset_transport)) if ("webroot") newtransporttype = /datum/asset_transport/webroot diff --git a/code/controllers/subsystems/inactivity.dm b/code/controllers/subsystems/inactivity.dm index a465d4b6f9..bc7a5a7dde 100644 --- a/code/controllers/subsystems/inactivity.dm +++ b/code/controllers/subsystems/inactivity.dm @@ -6,7 +6,7 @@ SUBSYSTEM_DEF(inactivity) var/number_kicked = 0 /datum/controller/subsystem/inactivity/fire(resumed = FALSE) - if (!CONFIG_GET(number/kick_inactive)) // CHOMPEdit + if (!CONFIG_GET(number/kick_inactive)) can_fire = FALSE return if (!resumed) @@ -15,8 +15,8 @@ SUBSYSTEM_DEF(inactivity) while(client_list.len) var/client/C = client_list[client_list.len] client_list.len-- - if(C.is_afk(CONFIG_GET(number/kick_inactive) MINUTES) && can_kick(C)) // CHOMPEdit - to_chat_immediate(C, world.time, span_warning("You have been inactive for more than [CONFIG_GET(number/kick_inactive)] minute\s and have been disconnected.")) // CHOMPEdit + if(C.is_afk(CONFIG_GET(number/kick_inactive) MINUTES) && can_kick(C)) + to_chat_immediate(C, world.time, span_warning("You have been inactive for more than [CONFIG_GET(number/kick_inactive)] minute\s and have been disconnected.")) var/information if(C.mob) diff --git a/code/controllers/subsystems/lighting.dm b/code/controllers/subsystems/lighting.dm index 099123ef5f..aefe01f0ae 100644 --- a/code/controllers/subsystems/lighting.dm +++ b/code/controllers/subsystems/lighting.dm @@ -20,7 +20,7 @@ SUBSYSTEM_DEF(lighting) /datum/controller/subsystem/lighting/Initialize() // CHOMPEdit if(!subsystem_initialized) - if (CONFIG_GET(flag/starlight)) // CHOMPEdit + if (CONFIG_GET(flag/starlight)) for(var/area/A in world) if (A.dynamic_lighting == DYNAMIC_LIGHTING_IFSTARLIGHT) A.luminosity = 0 diff --git a/code/controllers/subsystems/mapping.dm b/code/controllers/subsystems/mapping.dm index c9e656b8b6..3be7bf6022 100644 --- a/code/controllers/subsystems/mapping.dm +++ b/code/controllers/subsystems/mapping.dm @@ -18,7 +18,7 @@ SUBSYSTEM_DEF(mapping) world.max_z_changed() // This is to set up the player z-level list, maxz hasn't actually changed (probably) load_map_templates() - if(CONFIG_GET(flag/generate_map)) // CHOMPEdit + if(CONFIG_GET(flag/generate_map)) // Map-gen is still very specific to the map, however putting it here should ensure it loads in the correct order. using_map.perform_map_generation() @@ -50,8 +50,8 @@ SUBSYSTEM_DEF(mapping) // Choose an engine type var/datum/map_template/engine/chosen_type = null - if (LAZYLEN(CONFIG_GET(str_list/engine_map))) // CHOMPEdit - var/chosen_name = pick(CONFIG_GET(str_list/engine_map)) // CHOMPEdit + if (LAZYLEN(CONFIG_GET(str_list/engine_map))) + var/chosen_name = pick(CONFIG_GET(str_list/engine_map)) chosen_type = map_templates[chosen_name] if(!istype(chosen_type)) error("Configured engine map [chosen_name] is not a valid engine map name!") diff --git a/code/controllers/subsystems/media_tracks.dm b/code/controllers/subsystems/media_tracks.dm index 6bd30db4a1..f43eb4d6d0 100644 --- a/code/controllers/subsystems/media_tracks.dm +++ b/code/controllers/subsystems/media_tracks.dm @@ -19,7 +19,7 @@ SUBSYSTEM_DEF(media_tracks) return SS_INIT_SUCCESS // CHOMPEdit /datum/controller/subsystem/media_tracks/proc/load_tracks() - for(var/filename in CONFIG_GET(str_list/jukebox_track_files)) // CHOMPEdit + for(var/filename in CONFIG_GET(str_list/jukebox_track_files)) report_progress("Loading jukebox track: [filename]") if(!fexists(filename)) diff --git a/code/controllers/subsystems/nightshift.dm b/code/controllers/subsystems/nightshift.dm index 32c377305f..fa1d626e6d 100644 --- a/code/controllers/subsystems/nightshift.dm +++ b/code/controllers/subsystems/nightshift.dm @@ -11,7 +11,7 @@ SUBSYSTEM_DEF(nightshift) var/high_security_mode = FALSE /datum/controller/subsystem/nightshift/Initialize() - if(!CONFIG_GET(flag/enable_night_shifts)) // CHOMPEdit + if(!CONFIG_GET(flag/enable_night_shifts)) can_fire = FALSE /* if(config.randomize_shift_time) diff --git a/code/controllers/subsystems/persist_vr.dm b/code/controllers/subsystems/persist_vr.dm index 82b04e57dc..608909bdcb 100644 --- a/code/controllers/subsystems/persist_vr.dm +++ b/code/controllers/subsystems/persist_vr.dm @@ -16,7 +16,7 @@ SUBSYSTEM_DEF(persist) // Do PTO Accruals /datum/controller/subsystem/persist/proc/update_department_hours(var/resumed = FALSE) - if(!CONFIG_GET(flag/time_off)) // CHOMPEdit + if(!CONFIG_GET(flag/time_off)) return establish_db_connection() @@ -78,7 +78,7 @@ SUBSYSTEM_DEF(persist) play_hours[department_earning] = wait_in_hours // Cap it - dept_hours[department_earning] = min(CONFIG_GET(number/pto_cap), dept_hours[department_earning]) // CHOMPEdit + dept_hours[department_earning] = min(CONFIG_GET(number/pto_cap), dept_hours[department_earning]) // Okay we figured it out, lets update database! var/sql_ckey = sql_sanitize_text(C.ckey) diff --git a/code/controllers/subsystems/persistence.dm b/code/controllers/subsystems/persistence.dm index 3133187f80..a89cd78b43 100644 --- a/code/controllers/subsystems/persistence.dm +++ b/code/controllers/subsystems/persistence.dm @@ -27,7 +27,7 @@ SUBSYSTEM_DEF(persistence) /datum/controller/subsystem/persistence/proc/track_value(var/atom/value, var/track_type) - if(CONFIG_GET(flag/persistence_disabled)) //if the config is set to persistence disabled, nothing will save or load. // CHOMPEdit + if(CONFIG_GET(flag/persistence_disabled)) //if the config is set to persistence disabled, nothing will save or load. return var/turf/T = get_turf(value) diff --git a/code/controllers/subsystems/radiation.dm b/code/controllers/subsystems/radiation.dm index 42856d7009..e3e8ae1102 100644 --- a/code/controllers/subsystems/radiation.dm +++ b/code/controllers/subsystems/radiation.dm @@ -24,7 +24,7 @@ SUBSYSTEM_DEF(radiation) if(QDELETED(S)) sources -= S else if(S.decay) - S.update_rad_power(S.rad_power - CONFIG_GET(number/radiation_decay_rate)) // COMPEdit + S.update_rad_power(S.rad_power - CONFIG_GET(number/radiation_decay_rate)) if (MC_TICK_CHECK) return @@ -93,12 +93,12 @@ SUBSYSTEM_DEF(radiation) origin.calc_rad_resistance() if(origin.cached_rad_resistance) - if(CONFIG_GET(flag/radiation_resistance_calc_mode) == RAD_RESIST_CALC_DIV) // CHOMPEdit - working = round((working / (origin.cached_rad_resistance * CONFIG_GET(number/radiation_resistance_multiplier))), 0.01) // CHOMPEdit - else if(CONFIG_GET(flag/radiation_resistance_calc_mode) == RAD_RESIST_CALC_SUB) // CHOMPEdit - working = round((working - (origin.cached_rad_resistance * CONFIG_GET(number/radiation_resistance_multiplier))), 0.01) // CHOMPEdit + if(CONFIG_GET(flag/radiation_resistance_calc_mode) == RAD_RESIST_CALC_DIV) + working = round((working / (origin.cached_rad_resistance * CONFIG_GET(number/radiation_resistance_multiplier))), 0.01) + else if(CONFIG_GET(flag/radiation_resistance_calc_mode) == RAD_RESIST_CALC_SUB) + working = round((working - (origin.cached_rad_resistance * CONFIG_GET(number/radiation_resistance_multiplier))), 0.01) - if(working <= CONFIG_GET(number/radiation_lower_limit)) // Too far from this source // CHOMPEdit + if(working <= CONFIG_GET(number/radiation_lower_limit)) // Too far from this source working = 0 // May as well be 0 break @@ -106,7 +106,7 @@ SUBSYSTEM_DEF(radiation) // Shouldn't really ever have practical uses, but standing in a room literally made from uranium is more dangerous than standing next to a single uranium vase . += working / (dist ** 2) - if(. <= CONFIG_GET(number/radiation_lower_limit)) // CHOMPEdit + if(. <= CONFIG_GET(number/radiation_lower_limit)) . = 0 // Add a radiation source instance to the repository. It will override any existing source on the same turf. diff --git a/code/controllers/subsystems/sqlite.dm b/code/controllers/subsystems/sqlite.dm index ed63595b39..c771ee5ffe 100644 --- a/code/controllers/subsystems/sqlite.dm +++ b/code/controllers/subsystems/sqlite.dm @@ -14,7 +14,7 @@ SUBSYSTEM_DEF(sqlite) return SS_INIT_SUCCESS // CHOMPEdit /datum/controller/subsystem/sqlite/proc/connect() - if(!CONFIG_GET(flag/sqlite_enabled)) // CHOMPEdit + if(!CONFIG_GET(flag/sqlite_enabled)) return if(!sqlite_db) @@ -104,17 +104,17 @@ SUBSYSTEM_DEF(sqlite) return !sqlite_check_for_errors(query, "Insert Feedback") /datum/controller/subsystem/sqlite/proc/can_submit_feedback(client/C) - if(!CONFIG_GET(flag/sqlite_enabled)) // CHOMPEdit + if(!CONFIG_GET(flag/sqlite_enabled)) return FALSE - if(CONFIG_GET(number/sqlite_feedback_min_age) && !is_old_enough(C)) // CHOMPEdit + if(CONFIG_GET(number/sqlite_feedback_min_age) && !is_old_enough(C)) return FALSE - if(CONFIG_GET(number/sqlite_feedback_cooldown) > 0 && get_feedback_cooldown(C.key, CONFIG_GET(number/sqlite_feedback_cooldown), sqlite_db) > 0) // CHOMPEdit + if(CONFIG_GET(number/sqlite_feedback_cooldown) > 0 && get_feedback_cooldown(C.key, CONFIG_GET(number/sqlite_feedback_cooldown), sqlite_db) > 0) return FALSE return TRUE // Returns TRUE if the player is 'old' enough, according to the config. /datum/controller/subsystem/sqlite/proc/is_old_enough(client/C) - if(get_player_age(C.key) < CONFIG_GET(number/sqlite_feedback_min_age)) // CHOMPEdit + if(get_player_age(C.key) < CONFIG_GET(number/sqlite_feedback_min_age)) return FALSE return TRUE diff --git a/code/controllers/subsystems/ticker.dm b/code/controllers/subsystems/ticker.dm index 1c7ce54073..59b0c1dc73 100644 --- a/code/controllers/subsystems/ticker.dm +++ b/code/controllers/subsystems/ticker.dm @@ -51,8 +51,8 @@ var/global/datum/controller/subsystem/ticker/ticker global.ticker = src // TODO - Remove this! Change everything to point at SSticker intead /datum/controller/subsystem/ticker/Initialize() - pregame_timeleft = CONFIG_GET(number/pregame_time) // CHOMPEdit - send2mainirc("Server lobby is loaded and open at byond://[CONFIG_GET(string/serverurl) ? CONFIG_GET(string/serverurl) : (CONFIG_GET(string/server) ? CONFIG_GET(string/server) : "[world.address]:[world.port]")]") // CHOMPEdit + pregame_timeleft = CONFIG_GET(number/pregame_time) + send2mainirc("Server lobby is loaded and open at byond://[CONFIG_GET(string/serverurl) ? CONFIG_GET(string/serverurl) : (CONFIG_GET(string/server) ? CONFIG_GET(string/server) : "[world.address]:[world.port]")]") SSwebhooks.send( WEBHOOK_ROUNDPREP, list( @@ -108,7 +108,7 @@ var/global/datum/controller/subsystem/ticker/ticker round_start_time = world.time // otherwise round_start_time would be 0 for the signals if(!setup_choose_gamemode()) // It failed, go back to lobby state and re-send the welcome message - pregame_timeleft = CONFIG_GET(number/pregame_time) // CHOMPEdit + pregame_timeleft = CONFIG_GET(number/pregame_time) // SSvote.gamemode_vote_called = FALSE // Allow another autogamemode vote current_state = GAME_STATE_PREGAME Master.SetRunLevel(RUNLEVEL_LOBBY) @@ -135,8 +135,8 @@ var/global/datum/controller/subsystem/ticker/ticker if(!src.mode) var/list/weighted_modes = list() for(var/datum/game_mode/GM in runnable_modes) - weighted_modes[GM.config_tag] = CONFIG_GET(keyed_list/probabilities)[GM.config_tag] // CHOMPEdit - src.mode = config.gamemode_cache[pickweight(weighted_modes)] // CHOMPEdit + weighted_modes[GM.config_tag] = CONFIG_GET(keyed_list/probabilities)[GM.config_tag] + src.mode = config.gamemode_cache[pickweight(weighted_modes)] else src.mode = config.pick_mode(master_mode) @@ -150,7 +150,7 @@ var/global/datum/controller/subsystem/ticker/ticker job_master.DivideOccupations() // Apparently important for new antagonist system to register specific job antags properly. if(!src.mode.can_start()) - to_world(span_danger(span_bold("Unable to start [mode.name].") + " Not enough players readied, [CONFIG_GET(keyed_list/player_requirements)[mode.config_tag]] players needed. Reverting to pregame lobby.")) // CHOMPEdit + to_world(span_filter_system(span_bold("Unable to start [mode.name].") + " Not enough players readied, [CONFIG_GET(keyed_list/player_requirements)[mode.config_tag]] players needed. Reverting to pregame lobby.")) mode.fail_setup() mode = null job_master.ResetOccupations() @@ -198,7 +198,7 @@ var/global/datum/controller/subsystem/ticker/ticker current_state = GAME_STATE_PLAYING Master.SetRunLevel(RUNLEVEL_GAME) - if(CONFIG_GET(flag/sql_enabled)) // CHOMPEdit + if(CONFIG_GET(flag/sql_enabled)) statistic_cycle() // Polls population totals regularly and stores them in an SQL DB -- TLE return 1 @@ -214,7 +214,7 @@ var/global/datum/controller/subsystem/ticker/ticker // Calculate if game and/or mode are finished (Complicated by the continuous_rounds config option) var/game_finished = FALSE var/mode_finished = FALSE - if (CONFIG_GET(flag/continuous_rounds)) // Game keeps going after mode ends. // CHOMPEdit + if (CONFIG_GET(flag/continuous_rounds)) // Game keeps going after mode ends. game_finished = (emergency_shuttle.returned() || mode.station_was_nuked) mode_finished = ((end_game_state >= END_GAME_MODE_FINISHED) || mode.check_finished()) // Short circuit if already finished. else // Game ends when mode does diff --git a/code/datums/ai_law_sets.dm b/code/datums/ai_law_sets.dm index 23f981b262..38d99905dc 100644 --- a/code/datums/ai_law_sets.dm +++ b/code/datums/ai_law_sets.dm @@ -27,7 +27,7 @@ selectable = 0 /datum/ai_laws/nanotrasen/malfunction/New() - set_zeroth_law(CONFIG_GET(string/law_zero)) // CHOMPEdit + set_zeroth_law(CONFIG_GET(string/law_zero)) ..() /************* NanoTrasen Aggressive *************/ diff --git a/code/datums/helper_datums/getrev.dm b/code/datums/helper_datums/getrev.dm index 3f68ab7eb8..d75c0b2188 100644 --- a/code/datums/helper_datums/getrev.dm +++ b/code/datums/helper_datums/getrev.dm @@ -1,5 +1,3 @@ -//GLOBAL_DATUM(revdata, /datum/getrev) // CHOMPEdit - /datum/getrev var/branch var/revision @@ -50,7 +48,7 @@ var/details = ": '" + html_encode(tm.title) + "' by " + html_encode(tm.author) + " at commit " + html_encode(copytext_char(cm, 1, 11)) if(details && findtext(details, "\[s\]") && (!usr || !usr.client.holder)) continue - . += "#[tm.number][details]" // CHOMPEdit + . += "#[tm.number][details]" /client/verb/showrevinfo() set category = "OOC.Game" //CHOMPEdit @@ -65,8 +63,8 @@ if(GLOB.revdata.revision) msg += span_bold("Server revision:") + " B:[GLOB.revdata.branch] D:[GLOB.revdata.date]" - if(CONFIG_GET(string/githuburl)) // CHOMPEdit - msg += span_bold("Commit:") + " [GLOB.revdata.revision]" // CHOMPEdit + if(CONFIG_GET(string/githuburl)) + msg += span_bold("Commit:") + " [GLOB.revdata.revision]" else msg += span_bold("Commit:") + " [GLOB.revdata.revision]" // CHOMPEdit - Actually SHOW the revision else diff --git a/code/datums/managed_browsers/feedback_form.dm b/code/datums/managed_browsers/feedback_form.dm index e1a90763ab..15bf63f535 100644 --- a/code/datums/managed_browsers/feedback_form.dm +++ b/code/datums/managed_browsers/feedback_form.dm @@ -19,7 +19,7 @@ GENERAL_PROTECT_DATUM(/datum/managed_browser/feedback_form) var/feedback_hide_author = FALSE /datum/managed_browser/feedback_form/New(client/new_client) - feedback_topic = CONFIG_GET(str_list/sqlite_feedback_topics)[1] // CHOMPEdit + feedback_topic = CONFIG_GET(str_list/sqlite_feedback_topics)[1] ..(new_client) /datum/managed_browser/feedback_form/Destroy() @@ -29,7 +29,7 @@ GENERAL_PROTECT_DATUM(/datum/managed_browser/feedback_form) // Privacy option is allowed if both the config allows it, and the pepper file exists and isn't blank. /datum/managed_browser/feedback_form/proc/can_be_private() - return CONFIG_GET(flag/sqlite_feedback_privacy) && SSsqlite.get_feedback_pepper() // CHOMPEdit + return CONFIG_GET(flag/sqlite_feedback_privacy) && SSsqlite.get_feedback_pepper() /datum/managed_browser/feedback_form/display() if(!my_client) @@ -70,11 +70,11 @@ GENERAL_PROTECT_DATUM(/datum/managed_browser/feedback_form) dat += my_client.ckey dat += "
" - var/list/sqlite_feedback_topics = CONFIG_GET(str_list/sqlite_feedback_topics) // CHOMPEdit - if(sqlite_feedback_topics.len > 1) // CHOMPEdit + var/list/sqlite_feedback_topics = CONFIG_GET(str_list/sqlite_feedback_topics) + if(sqlite_feedback_topics.len > 1) dat += "Topic: [href(src, list("feedback_choose_topic" = 1), feedback_topic)]
" else - dat += "Topic: [sqlite_feedback_topics[1]]
" // CHOMPEdit + dat += "Topic: [sqlite_feedback_topics[1]]
" dat += "
" if(feedback_body) @@ -85,7 +85,7 @@ GENERAL_PROTECT_DATUM(/datum/managed_browser/feedback_form) dat += href(src, list("feedback_edit_body" = 1), "Edit") dat += "
" - if(CONFIG_GET(number/sqlite_feedback_cooldown)) // CHOMPEdit + if(CONFIG_GET(number/sqlite_feedback_cooldown)) dat += "Please note that you will have to wait [CONFIG_GET(number/sqlite_feedback_cooldown)] day\s before \ being able to write more feedback after submitting.
" @@ -113,7 +113,7 @@ GENERAL_PROTECT_DATUM(/datum/managed_browser/feedback_form) return if(href_list["feedback_choose_topic"]) - feedback_topic = tgui_input_list(my_client, "Choose the topic you want to submit your feedback under.", "Feedback Topic", CONFIG_GET(str_list/sqlite_feedback_topics)) // CHOMPEdit + feedback_topic = tgui_input_list(my_client, "Choose the topic you want to submit your feedback under.", "Feedback Topic", CONFIG_GET(str_list/sqlite_feedback_topics)) display() return diff --git a/code/datums/managed_browsers/feedback_viewer.dm b/code/datums/managed_browsers/feedback_viewer.dm index 891a1c6e27..b779932a8a 100644 --- a/code/datums/managed_browsers/feedback_viewer.dm +++ b/code/datums/managed_browsers/feedback_viewer.dm @@ -143,7 +143,7 @@ if(href_list["filter_topic"]) var/topic_to_search = tgui_input_text(my_client, "Write desired topic here. Partial topics are allowed. \ - \nThe current topics in the config are [english_list(CONFIG_GET(str_list/sqlite_feedback_topics))].", "Filter by Topic", null) // CHOMPEdit + \nThe current topics in the config are [english_list(CONFIG_GET(str_list/sqlite_feedback_topics))].", "Filter by Topic", null) if(topic_to_search) last_query = feedback_filter(SQLITE_FEEDBACK_COLUMN_TOPIC, topic_to_search) diff --git a/code/defines/procs/dbcore.dm b/code/defines/procs/dbcore.dm index c4ba715489..8728c569b7 100644 --- a/code/defines/procs/dbcore.dm +++ b/code/defines/procs/dbcore.dm @@ -56,7 +56,7 @@ var/DB_PORT = 3306 // This is the port your MySQL server is running on (3306 is _db_con = _dm_db_new_con() /DBConnection/proc/Connect(dbi_handler=src.dbi,user_handler=src.user,password_handler=src.password,cursor_handler) - if(!config.sql_enabled) + if(!CONFIG_GET(flag/sql_enabled)) return 0 if(!src) return 0 cursor_handler = src.default_cursor @@ -66,7 +66,7 @@ var/DB_PORT = 3306 // This is the port your MySQL server is running on (3306 is /DBConnection/proc/Disconnect() return _dm_db_close(_db_con) /DBConnection/proc/IsConnected() - if(!config.sql_enabled) return 0 + if(!CONFIG_GET(flag/sql_enabled)) return 0 var/success = _dm_db_is_connected(_db_con) return success @@ -76,8 +76,8 @@ var/DB_PORT = 3306 // This is the port your MySQL server is running on (3306 is /DBConnection/proc/SelectDB(database_name,dbi) if(IsConnected()) Disconnect() //return Connect("[dbi?"[dbi]":"dbi:mysql:[database_name]:[DB_SERVER]:[DB_PORT]"]",user,password) - return Connect("[dbi?"[dbi]":"dbi:mysql:[database_name]:[sqladdress]:[sqlport]"]",user,password) -/DBConnection/proc/NewQuery(sql_query,cursor_handler=src.default_cursor) return new/datum/db_query(sql_query,src,cursor_handler) + return Connect("[dbi?"[dbi]":"dbi:mysql:[database_name]:[CONFIG_GET(string/address)]:[CONFIG_GET(number/port)]"]",user,password) +/DBConnection/proc/NewQuery(sql_query,cursor_handler=src.default_cursor) return new/DBQuery(sql_query,src,cursor_handler) /datum/db_query/New(sql_query,DBConnection/connection_handler,cursor_handler) diff --git a/code/defines/procs/statistics.dm b/code/defines/procs/statistics.dm index f2c7496e49..0c87b4235c 100644 --- a/code/defines/procs/statistics.dm +++ b/code/defines/procs/statistics.dm @@ -1,5 +1,5 @@ /proc/sql_poll_population() - if(!CONFIG_GET(flag/enable_stat_tracking)) // CHOMPEdit + if(!CONFIG_GET(flag/enable_stat_tracking)) return var/admincount = GLOB.admins.len var/playercount = 0 @@ -19,15 +19,15 @@ /proc/sql_report_round_start() // TODO - if(!CONFIG_GET(flag/enable_stat_tracking)) // CHOMPEdit + if(!CONFIG_GET(flag/enable_stat_tracking)) return /proc/sql_report_round_end() // TODO - if(!CONFIG_GET(flag/enable_stat_tracking)) // CHOMPEdit + if(!CONFIG_GET(flag/enable_stat_tracking)) return /proc/sql_report_death(var/mob/living/carbon/human/H) - if(!CONFIG_GET(flag/enable_stat_tracking)) // CHOMPEdit + if(!CONFIG_GET(flag/enable_stat_tracking)) return if(!H) return @@ -62,7 +62,7 @@ /proc/sql_report_cyborg_death(var/mob/living/silicon/robot/H) - if(!CONFIG_GET(flag/enable_stat_tracking)) // CHOMPEdit + if(!CONFIG_GET(flag/enable_stat_tracking)) return if(!H) return @@ -98,7 +98,7 @@ /proc/statistic_cycle() set waitfor = 0 - if(!CONFIG_GET(flag/enable_stat_tracking)) // CHOMPEdit + if(!CONFIG_GET(flag/enable_stat_tracking)) return while(1) sql_poll_population() diff --git a/code/game/antagonist/alien/borer.dm b/code/game/antagonist/alien/borer.dm index 41faa0f293..c36cd16d31 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_GET(flag/aliens_allowed)) ..() // CHOMPEdit + if(CONFIG_GET(flag/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 a1ffdc3325..585caeec72 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_GET(flag/aliens_allowed)) ..() // CHOMPEdit + if(CONFIG_GET(flag/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 efda607e58..d9d11999f3 100644 --- a/code/game/antagonist/antagonist.dm +++ b/code/game/antagonist/antagonist.dm @@ -91,7 +91,7 @@ get_starting_locations() if(!role_text_plural) role_text_plural = role_text - if(CONFIG_GET(flag/protect_roles_from_antagonist)) // CHOMPEdit + if(CONFIG_GET(flag/protect_roles_from_antagonist)) restricted_jobs |= protected_jobs if(antaghud_indicator) if(!hud_icon_reference) @@ -112,7 +112,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_GET(flag/use_age_restriction_for_antags) && player.current.client.player_age < minimum_player_age) // CHOMPEdit + else if(CONFIG_GET(flag/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 0c282a9d16..7ea5782aa5 100644 --- a/code/game/antagonist/antagonist_create.dm +++ b/code/game/antagonist/antagonist_create.dm @@ -106,13 +106,13 @@ to_chat(player.current, span_notice("[leader_welcome_text]")) else to_chat(player.current, span_notice("[welcome_text]")) - if (CONFIG_GET(flag/objectives_disabled)) // CHOMPEdit + if (CONFIG_GET(flag/objectives_disabled)) to_chat(player.current, span_notice("[antag_text]")) if((flags & ANTAG_HAS_NUKE) && !spawned_nuke) create_nuke() - if (!CONFIG_GET(flag/objectives_disabled)) // CHOMPEdit + if (!CONFIG_GET(flag/objectives_disabled)) show_objectives(player) return 1 diff --git a/code/game/antagonist/antagonist_helpers.dm b/code/game/antagonist/antagonist_helpers.dm index 9b5cbf891b..fc08d68e56 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_GET(flag/protect_roles_from_antagonist) && (player.assigned_role in protected_jobs)) // CHOMPEdit + if(CONFIG_GET(flag/protect_roles_from_antagonist) && (player.assigned_role in protected_jobs)) return FALSE if(avoid_silicons) var/datum/job/J = SSjob.get_job(player.assigned_role) diff --git a/code/game/antagonist/antagonist_objectives.dm b/code/game/antagonist/antagonist_objectives.dm index 8ad3464077..612d3e6d00 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_GET(flag/objectives_disabled)) // CHOMPEdit + if(CONFIG_GET(flag/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_GET(flag/objectives_disabled)) // CHOMPEdit + if(CONFIG_GET(flag/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_GET(flag/objectives_disabled)) // CHOMPEdit + if(CONFIG_GET(flag/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 71838b33f2..7df32b76aa 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_GET(flag/ninjas_allowed)) ..() // CHOMPEdit + if(CONFIG_GET(flag/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 3d9c75559f..691b22f852 100644 --- a/code/game/antagonist/outsider/raider.dm +++ b/code/game/antagonist/outsider/raider.dm @@ -152,7 +152,7 @@ var/datum/antagonist/raider/raiders var/win_msg = "" //No objectives, go straight to the feedback. - if(CONFIG_GET(flag/objectives_disabled) || !global_objectives.len) // CHOMPEdit + if(CONFIG_GET(flag/objectives_disabled) || !global_objectives.len) return var/success = global_objectives.len diff --git a/code/game/dna/dna_modifier.dm b/code/game/dna/dna_modifier.dm index e2759add87..614eb7e981 100644 --- a/code/game/dna/dna_modifier.dm +++ b/code/game/dna/dna_modifier.dm @@ -428,7 +428,7 @@ occupantData["isViableSubject"] = 0 occupantData["health"] = connected.occupant.health occupantData["maxHealth"] = connected.occupant.maxHealth - occupantData["minHealth"] = CONFIG_GET(number/health_threshold_dead) // CHOMPEdit + occupantData["minHealth"] = CONFIG_GET(number/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 a4152be8af..9035f3f164 100644 --- a/code/game/gamemodes/cult/runes.dm +++ b/code/game/gamemodes/cult/runes.dm @@ -277,7 +277,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_GET(number/organ_health_multiplier)) && (affected.status & ORGAN_BROKEN)) // CHOMPEdit + if((affected.damage < affected.min_broken_damage * CONFIG_GET(number/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/cult/soulstone.dm b/code/game/gamemodes/cult/soulstone.dm index 5d0d30c7c0..59c9c62e82 100644 --- a/code/game/gamemodes/cult/soulstone.dm +++ b/code/game/gamemodes/cult/soulstone.dm @@ -109,7 +109,7 @@ if(src.imprinted != "empty") to_chat(U, span_danger("Capture failed!") + ": The soul stone has already been imprinted with [src.imprinted]'s mind!") return - if ((T.health + T.halloss) > CONFIG_GET(number/health_threshold_crit) && T.stat != DEAD) // CHOMPEdit + if ((T.health + T.halloss) > CONFIG_GET(number/health_threshold_crit) && T.stat != DEAD) to_chat(U, span_danger("Capture failed!") + ": Kill or maim the victim first!") return if(T.client == null) diff --git a/code/game/gamemodes/events/holidays/Other.dm b/code/game/gamemodes/events/holidays/Other.dm index fc09a9bb86..4f29575e09 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_GET(flag/allow_random_events)) return // CHOMPEdit + if(!CONFIG_GET(flag/allow_random_events)) return Show2Group4Delay(ScreenText(null,"
GAME OVER
"),null,150) for(var/i=1,i<=4,i++) spawn_dynamic_event() diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm index 4598d43b14..adf1b0435b 100644 --- a/code/game/gamemodes/game_mode.dm +++ b/code/game/gamemodes/game_mode.dm @@ -148,10 +148,10 @@ var/global/list/additional_antag_types = list() playerC++ if(master_mode=="secret") - if(playerC < CONFIG_GET(keyed_list/player_requirements_secret)[config_tag]) // CHOMPEdit + if(playerC < CONFIG_GET(keyed_list/player_requirements_secret)[config_tag]) return 0 else - if(playerC < CONFIG_GET(keyed_list/player_requirements)[config_tag]) // CHOMPEdit + if(playerC < CONFIG_GET(keyed_list/player_requirements)[config_tag]) return 0 if(!(antag_templates && antag_templates.len)) @@ -273,7 +273,7 @@ var/global/list/additional_antag_types = list() for(var/datum/antagonist/antag in antag_templates) if(!antag.antags_are_dead()) return 0 - if(CONFIG_GET(flag/continuous_rounds)) // CHOMPEdit + if(CONFIG_GET(flag/continuous_rounds)) emergency_shuttle.auto_recall = 0 return 0 return 1 @@ -473,7 +473,7 @@ var/global/list/additional_antag_types = list() /datum/game_mode/proc/create_antagonists() - if(!CONFIG_GET(flag/traitor_scaling)) // CHOMPEdit + if(!CONFIG_GET(flag/traitor_scaling)) antag_scaling_coeff = 0 if(antag_tags && antag_tags.len) diff --git a/code/game/gamemodes/nuclear/nuclear.dm b/code/game/gamemodes/nuclear/nuclear.dm index c5c80c6177..9d60efdb65 100644 --- a/code/game/gamemodes/nuclear/nuclear.dm +++ b/code/game/gamemodes/nuclear/nuclear.dm @@ -33,7 +33,7 @@ var/list/nuke_disks = list() return 0 /datum/game_mode/nuclear/declare_completion() - if(CONFIG_GET(flag/objectives_disabled)) // CHOMPEdit + if(CONFIG_GET(flag/objectives_disabled)) ..() return var/disk_rescued = 1 diff --git a/code/game/gamemodes/technomancer/spells/mend_organs.dm b/code/game/gamemodes/technomancer/spells/mend_organs.dm index 46dbf1f3d0..18856d5d35 100644 --- a/code/game/gamemodes/technomancer/spells/mend_organs.dm +++ b/code/game/gamemodes/technomancer/spells/mend_organs.dm @@ -44,7 +44,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_GET(number/organ_health_multiplier)) && (affected.status & ORGAN_BROKEN)) // CHOMPEdit + if((affected.damage < affected.min_broken_damage * CONFIG_GET(number/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/game/jobs/job/assistant.dm b/code/game/jobs/job/assistant.dm index 4f15ea5cb6..6aa9753352 100644 --- a/code/game/jobs/job/assistant.dm +++ b/code/game/jobs/job/assistant.dm @@ -24,7 +24,7 @@ ) */ //VOREStation Removal: no alt-titles for visitors /datum/job/assistant/get_access() - if(CONFIG_GET(flag/assistant_maint)) // CHOMPEdit + if(CONFIG_GET(flag/assistant_maint)) return list(access_maint_tunnels) else return list() diff --git a/code/game/jobs/job/assistant_vr.dm b/code/game/jobs/job/assistant_vr.dm index e2f8fc430c..78671193e1 100644 --- a/code/game/jobs/job/assistant_vr.dm +++ b/code/game/jobs/job/assistant_vr.dm @@ -78,11 +78,11 @@ /datum/job/intern/New() ..() if(config) - total_positions = CONFIG_GET(number/limit_interns) // CHOMPEdit - spawn_positions = CONFIG_GET(number/limit_interns) // CHOMPEdit + total_positions = CONFIG_GET(number/limit_interns) + spawn_positions = CONFIG_GET(number/limit_interns) /datum/job/intern/get_access() - if(CONFIG_GET(flag/assistant_maint)) // CHOMPEdit + if(CONFIG_GET(flag/assistant_maint)) return list(access_maint_tunnels) else return list() @@ -103,8 +103,8 @@ /datum/job/assistant/New() ..() if(config) - total_positions = CONFIG_GET(number/limit_visitors) // CHOMPEdit - spawn_positions = CONFIG_GET(number/limit_visitors) // CHOMPEdit + total_positions = CONFIG_GET(number/limit_visitors) + spawn_positions = CONFIG_GET(number/limit_visitors) /datum/job/assistant/get_access() return list() diff --git a/code/game/jobs/job/job.dm b/code/game/jobs/job/job.dm index b474a20589..026e3a2dba 100644 --- a/code/game/jobs/job/job.dm +++ b/code/game/jobs/job/job.dm @@ -102,7 +102,7 @@ . = outfit.equip_base(H, title, alt_title) /datum/job/proc/get_access() - if(!config || CONFIG_GET(flag/jobs_have_minimal_access)) // CHOMPEdit + if(!config || CONFIG_GET(flag/jobs_have_minimal_access)) return src.minimal_access.Copy() else return src.access.Copy() @@ -112,7 +112,7 @@ return (available_in_days(C) == 0) //Available in 0 days = available right now = player is old enough to play. /datum/job/proc/available_in_days(client/C) - if(C && CONFIG_GET(flag/use_age_restriction_for_jobs) && isnum(C.player_age) && isnum(minimal_player_age)) // CHOMPEdit + if(C && CONFIG_GET(flag/use_age_restriction_for_jobs) && isnum(C.player_age) && isnum(minimal_player_age)) return max(0, minimal_player_age - C.player_age) return 0 diff --git a/code/game/jobs/job/job_vr.dm b/code/game/jobs/job/job_vr.dm index c2b1b7cae2..3796714b5e 100644 --- a/code/game/jobs/job/job_vr.dm +++ b/code/game/jobs/job/job_vr.dm @@ -30,7 +30,7 @@ return (available_in_playhours(C) == 0) /datum/job/proc/available_in_playhours(client/C) - if(C && CONFIG_GET(flag/use_playtime_restriction_for_jobs) && dept_time_required) // CHOMPEdit + if(C && CONFIG_GET(flag/use_playtime_restriction_for_jobs) && dept_time_required) if(isnum(C.play_hours[pto_type])) // Has played that department before return max(0, dept_time_required - C.play_hours[pto_type]) else // List doesn't have that entry, maybe never played, maybe invalid PTO type (you should fix that...) @@ -41,7 +41,7 @@ // Captain gets every department combined /datum/job/captain/available_in_playhours(client/C) - if(C && CONFIG_GET(flag/use_playtime_restriction_for_jobs) && dept_time_required) // CHOMPEdit + if(C && CONFIG_GET(flag/use_playtime_restriction_for_jobs) && dept_time_required) var/remaining_time_needed = dept_time_required for(var/key in C.play_hours) if(isnum(C.play_hours[key]) && !(key == PTO_TALON)) @@ -51,7 +51,7 @@ // HoP gets civilian, cargo, and exploration combined /datum/job/hop/available_in_playhours(client/C) - if(C && CONFIG_GET(flag/use_playtime_restriction_for_jobs) && dept_time_required) // CHOMPEdit + if(C && CONFIG_GET(flag/use_playtime_restriction_for_jobs) && dept_time_required) var/remaining_time_needed = dept_time_required if(isnum(C.play_hours[PTO_CIVILIAN])) remaining_time_needed = max(0, remaining_time_needed - C.play_hours[PTO_CIVILIAN]) diff --git a/code/game/jobs/job/special_vr.dm b/code/game/jobs/job/special_vr.dm index 76b7d8f590..1cdce5e991 100644 --- a/code/game/jobs/job/special_vr.dm +++ b/code/game/jobs/job/special_vr.dm @@ -125,7 +125,7 @@ title = JOB_ALT_FOOL /datum/job/clown/get_access() - if(CONFIG_GET(flag/assistant_maint)) // CHOMPEdit + if(CONFIG_GET(flag/assistant_maint)) return list(access_maint_tunnels, access_entertainment, access_clown, access_tomfoolery) else return list(access_entertainment, access_clown, access_tomfoolery) @@ -153,7 +153,7 @@ title = JOB_ALT_PASEUR /datum/job/mime/get_access() - if(CONFIG_GET(flag/assistant_maint)) // CHOMPEdit + if(CONFIG_GET(flag/assistant_maint)) return list(access_maint_tunnels, access_entertainment, access_tomfoolery, access_mime) else return list(access_entertainment, access_tomfoolery, access_mime) diff --git a/code/game/jobs/job_controller.dm b/code/game/jobs/job_controller.dm index 027b800616..c8d3cfdb8a 100644 --- a/code/game/jobs/job_controller.dm +++ b/code/game/jobs/job_controller.dm @@ -599,7 +599,7 @@ var/global/datum/controller/occupations/job_master return H /datum/controller/occupations/proc/LoadJobs(jobsfile) //ran during round setup, reads info from jobs.txt -- Urist - if(!CONFIG_GET(flag/load_jobs_from_txt)) // CHOMPEdit + if(!CONFIG_GET(flag/load_jobs_from_txt)) return 0 var/list/jobEntries = file2list(jobsfile) diff --git a/code/game/jobs/whitelist.dm b/code/game/jobs/whitelist.dm index d1e41b2c26..f46b6688b1 100644 --- a/code/game/jobs/whitelist.dm +++ b/code/game/jobs/whitelist.dm @@ -3,7 +3,7 @@ GLOBAL_LIST_EMPTY(whitelist) // CHOMPEdit - Managed Globals /hook/startup/proc/loadWhitelist() - if(CONFIG_GET(flag/usewhitelist)) // CHOMPEdit + if(CONFIG_GET(flag/usewhitelist)) load_whitelist() return 1 @@ -21,7 +21,7 @@ GLOBAL_LIST_EMPTY(whitelist) // CHOMPEdit - Managed Globals GLOBAL_LIST_EMPTY(alien_whitelist) // CHOMPEdit - Managed Globals /hook/startup/proc/loadAlienWhitelist() - if(CONFIG_GET(flag/usealienwhitelist)) // CHOMPEdit + if(CONFIG_GET(flag/usealienwhitelist)) load_alienwhitelist() return 1 @@ -113,7 +113,7 @@ GLOBAL_LIST_EMPTY(alien_whitelist) // CHOMPEdit - Managed Globals return 1 /proc/whitelist_overrides(mob/M) - if(!CONFIG_GET(flag/usealienwhitelist)) // CHOMPEdit + if(!CONFIG_GET(flag/usealienwhitelist)) return TRUE if(check_rights(R_ADMIN|R_EVENT, 0, M)) return TRUE diff --git a/code/game/machinery/Sleeper.dm b/code/game/machinery/Sleeper.dm index 7e36014c07..9fd2be58fc 100644 --- a/code/game/machinery/Sleeper.dm +++ b/code/game/machinery/Sleeper.dm @@ -190,7 +190,7 @@ occupantData["stat"] = occupant.stat occupantData["health"] = occupant.health occupantData["maxHealth"] = occupant.maxHealth - occupantData["minHealth"] = CONFIG_GET(number/health_threshold_dead) // CHOMPEdit + occupantData["minHealth"] = CONFIG_GET(number/health_threshold_dead) occupantData["bruteLoss"] = occupant.getBruteLoss() occupantData["oxyLoss"] = occupant.getOxyLoss() occupantData["toxLoss"] = occupant.getToxLoss() diff --git a/code/game/machinery/computer/Operating.dm b/code/game/machinery/computer/Operating.dm index 1b27235409..ed07a6158b 100644 --- a/code/game/machinery/computer/Operating.dm +++ b/code/game/machinery/computer/Operating.dm @@ -68,7 +68,7 @@ occupantData["stat"] = occupant.stat occupantData["health"] = occupant.health occupantData["maxHealth"] = occupant.maxHealth - occupantData["minHealth"] = CONFIG_GET(number/health_threshold_dead) // CHOMPEdit + occupantData["minHealth"] = CONFIG_GET(number/health_threshold_dead) occupantData["bruteLoss"] = occupant.getBruteLoss() occupantData["oxyLoss"] = occupant.getOxyLoss() occupantData["toxLoss"] = occupant.getToxLoss() diff --git a/code/game/machinery/computer/cloning.dm b/code/game/machinery/computer/cloning.dm index 63a9cf5a1b..7ed5905f25 100644 --- a/code/game/machinery/computer/cloning.dm +++ b/code/game/machinery/computer/cloning.dm @@ -336,7 +336,7 @@ set_temp("Error: Not enough biomass.", "danger") else if(pod.mess) set_temp("Error: The cloning pod is malfunctioning.", "danger") - else if(!CONFIG_GET(flag/revival_cloning)) // CHOMPEdit + else if(!CONFIG_GET(flag/revival_cloning)) set_temp("Error: Unable to initiate cloning cycle.", "danger") else cloneresult = pod.growclone(C) diff --git a/code/game/machinery/computer/timeclock_vr.dm b/code/game/machinery/computer/timeclock_vr.dm index 4ed048a7ad..1ee28461c7 100644 --- a/code/game/machinery/computer/timeclock_vr.dm +++ b/code/game/machinery/computer/timeclock_vr.dm @@ -102,7 +102,7 @@ "timeoff_factor" = job.timeoff_factor, "pto_department" = job.pto_type ) - if(CONFIG_GET(flag/time_off) && CONFIG_GET(flag/pto_job_change)) // CHOMPEdit + if(CONFIG_GET(flag/time_off) && CONFIG_GET(flag/pto_job_change)) data["allow_change_job"] = TRUE if(job && job.timeoff_factor < 0) // Currently are Off Duty, so gotta lookup what on-duty jobs are open data["job_choices"] = getOpenOnDutyJobs(user, job.pto_type) diff --git a/code/game/machinery/cryo.dm b/code/game/machinery/cryo.dm index a50833ac84..647d6da1bc 100644 --- a/code/game/machinery/cryo.dm +++ b/code/game/machinery/cryo.dm @@ -113,7 +113,7 @@ occupantData["stat"] = occupant.stat occupantData["health"] = occupant.health occupantData["maxHealth"] = occupant.getMaxHealth() - occupantData["minHealth"] = CONFIG_GET(number/health_threshold_dead) // CHOMPEdit + occupantData["minHealth"] = CONFIG_GET(number/health_threshold_dead) occupantData["bruteLoss"] = occupant.getBruteLoss() occupantData["oxyLoss"] = occupant.getOxyLoss() occupantData["toxLoss"] = occupant.getToxLoss() diff --git a/code/game/objects/effects/decals/cleanable.dm b/code/game/objects/effects/decals/cleanable.dm index 5b0bb30a61..7338689e33 100644 --- a/code/game/objects/effects/decals/cleanable.dm +++ b/code/game/objects/effects/decals/cleanable.dm @@ -19,7 +19,7 @@ generic_filth = TRUE means when the decal is saved, it will be switched out for age = _age if(random_icon_states && length(src.random_icon_states) > 0) src.icon_state = pick(src.random_icon_states) - if(!mapload || !CONFIG_GET(flag/persistence_ignore_mapload)) // CHOMPEdit + if(!mapload || !CONFIG_GET(flag/persistence_ignore_mapload)) SSpersistence.track_value(src, /datum/persistent/filth) jan_icon = new/obj/effect/decal/jan_hud(src.loc) . = ..() diff --git a/code/game/objects/explosion.dm b/code/game/objects/explosion.dm index 0e5e444554..430b6ebf3d 100644 --- a/code/game/objects/explosion.dm +++ b/code/game/objects/explosion.dm @@ -1,7 +1,7 @@ //TODO: Flash range does nothing currently /proc/explosion(turf/epicenter, devastation_range, heavy_impact_range, light_impact_range, flash_range, adminlog = 1, z_transfer = UP|DOWN, shaped) - var/multi_z_scalar = CONFIG_GET(number/multi_z_explosion_scalar) // CHOMPEdit + var/multi_z_scalar = CONFIG_GET(number/multi_z_explosion_scalar) spawn(0) var/start = world.timeofday epicenter = get_turf(epicenter) @@ -74,7 +74,7 @@ var/x0 = epicenter.x var/y0 = epicenter.y var/z0 = epicenter.z - if(CONFIG_GET(flag/use_recursive_explosions)) // CHOMPEdit + if(CONFIG_GET(flag/use_recursive_explosions)) var/power = devastation_range * 2 + heavy_impact_range + light_impact_range //The ranges add up, ie light 14 includes both heavy 7 and devestation 3. So this calculation means devestation counts for 4, heavy for 2 and light for 1 power, giving us a cap of 27 power. explosion_rec(epicenter, power, shaped) else diff --git a/code/game/objects/items/contraband_vr.dm b/code/game/objects/items/contraband_vr.dm index 1dcf8d8aa5..1052a490b6 100644 --- a/code/game/objects/items/contraband_vr.dm +++ b/code/game/objects/items/contraband_vr.dm @@ -59,7 +59,7 @@ /obj/item/toy/nanotrasenballoon, /obj/item/toy/syndicateballoon, /obj/item/aiModule/syndicate, - /obj/item/book/manual/wiki/engineering_hacking, // CHOMPEdit + /obj/item/book/manual/wiki/engineering_hacking, /obj/item/card/emag, /obj/item/card/emag_broken, /obj/item/card/id/syndicate, diff --git a/code/game/objects/items/crayons.dm b/code/game/objects/items/crayons.dm index d194769534..128718a365 100644 --- a/code/game/objects/items/crayons.dm +++ b/code/game/objects/items/crayons.dm @@ -111,7 +111,7 @@ to_chat(user, "You finish drawing.") var/msg = "[user.client.key] ([user]) has drawn [drawtype] (with [src]) at [target.x],[target.y],[target.z]." - if(CONFIG_GET(flag/log_graffiti)) // CHOMPEdit + if(CONFIG_GET(flag/log_graffiti)) message_admins(msg) log_game(msg) //We will log it anyways. diff --git a/code/game/objects/items/devices/communicator/phone.dm b/code/game/objects/items/devices/communicator/phone.dm index e9c40d8b4d..1d1dc4a709 100644 --- a/code/game/objects/items/devices/communicator/phone.dm +++ b/code/game/objects/items/devices/communicator/phone.dm @@ -290,7 +290,7 @@ if(confirm != "Yes") return - if(CONFIG_GET(flag/antag_hud_restricted) && has_enabled_antagHUD == 1) // CHOMPEdit + if(CONFIG_GET(flag/antag_hud_restricted) && has_enabled_antagHUD == 1) to_chat(src, span_danger("You have used the antagHUD and cannot respawn or use communicators!")) return diff --git a/code/game/objects/items/devices/defib.dm b/code/game/objects/items/devices/defib.dm index 8753fb49c1..4666c83a91 100644 --- a/code/game/objects/items/devices/defib.dm +++ b/code/game/objects/items/devices/defib.dm @@ -299,10 +299,10 @@ H.updatehealth() if(H.isSynthetic()) - if(H.health + H.getOxyLoss() + H.getToxLoss() <= CONFIG_GET(number/health_threshold_dead)) // CHOMPEdit + if(H.health + H.getOxyLoss() + H.getToxLoss() <= CONFIG_GET(number/health_threshold_dead)) return "buzzes, \"Resuscitation failed - Severe damage detected. Begin manual repair before further attempts futile.\"" - else if(H.health + H.getOxyLoss() <= CONFIG_GET(number/health_threshold_dead) || (HUSK in H.mutations) || !H.can_defib) // CHOMPEdit + else if(H.health + H.getOxyLoss() <= CONFIG_GET(number/health_threshold_dead) || (HUSK in H.mutations) || !H.can_defib) return "buzzes, \"Resuscitation failed - Severe tissue damage makes recovery of patient impossible via defibrillator. Further attempts futile.\"" var/bad_vital_organ = check_vital_organs(H) @@ -435,7 +435,7 @@ H.apply_damage(burn_damage_amt, BURN, BP_TORSO) //set oxyloss so that the patient is just barely in crit, if possible - var/barely_in_crit = CONFIG_GET(number/health_threshold_crit) - 1 // CHOMPEdit + var/barely_in_crit = CONFIG_GET(number/health_threshold_crit) - 1 var/adjust_health = barely_in_crit - H.health //need to increase health by this much H.adjustOxyLoss(-adjust_health) diff --git a/code/game/objects/items/trash.dm b/code/game/objects/items/trash.dm index d555d36d99..41bab1e08f 100644 --- a/code/game/objects/items/trash.dm +++ b/code/game/objects/items/trash.dm @@ -17,7 +17,7 @@ age = _age /obj/item/trash/Initialize(mapload) - if(!mapload || !CONFIG_GET(flag/persistence_ignore_mapload)) // CHOMPEdit + if(!mapload || !CONFIG_GET(flag/persistence_ignore_mapload)) SSpersistence.track_value(src, /datum/persistent/filth/trash) . = ..() diff --git a/code/game/objects/items/weapons/manuals.dm b/code/game/objects/items/weapons/manuals.dm index e276bd7e61..d8d1e99b52 100644 --- a/code/game/objects/items/weapons/manuals.dm +++ b/code/game/objects/items/weapons/manuals.dm @@ -5,30 +5,6 @@ due_date = 0 // Game time in 1/10th seconds unique = 1 // 0 - Normal book, 1 - Should not be treated as normal book, unable to be copied, unable to be modified -/* CHOMPEdit Start -/obj/item/book/manual/engineering_construction - name = "Station Repairs and Construction" - icon_state ="bookEngineering" - item_state = "book3" - author = "Engineering Encyclopedia" // Who wrote the thing, can be changed by pen or PC. It is not automatically assigned - title = "Station Repairs and Construction" - -/obj/item/book/manual/engineering_construction/New() - ..() - dat = {" - - - - - - - - - - - "} -*/ // CHOMPEdit End - /obj/item/book/manual/engineering_particle_accelerator name = "Particle Accelerator User's Guide" icon_state ="bookParticleAccelerator" @@ -320,30 +296,6 @@ "} // CHOMPedit END : Updating the R-UST manual -/* CHOMPEdit Start -/obj/item/book/manual/engineering_hacking - name = "Hacking" - icon_state ="bookHacking" - item_state = "book2" - author = "Engineering Encyclopedia" // Who wrote the thing, can be changed by pen or PC. It is not automatically assigned - title = "Hacking" - -/obj/item/book/manual/engineering_hacking/New() - ..() - dat = {" - - - - - - - - - - - "} -*/ // CHOMPEdit End - /obj/item/book/manual/engineering_singularity_safety name = "Singularity Safety in Special Circumstances" icon_state ="bookEngineeringSingularitySafety" @@ -677,26 +629,6 @@ "} -/* CHOMPEdit Start -/obj/item/book/manual/robotics_manual - name = "Guide to Robotics" - icon_state ="evabook" - item_state = "book3" - author = "Simple Robotics" // Who wrote the thing, can be changed by pen or PC. It is not automatically assigned - title = "Guide to Robotics" - -/obj/item/book/manual/robotics_manual/New() - ..() - dat = {" - - - - - - - "} -*/ // CHOMPEdit End - /obj/item/book/manual/robotics_cyborgs name = JOB_CYBORG + "s for Dummies" icon_state = "borgbook" @@ -902,104 +834,6 @@ "} - -/* CHOMPEdit Start -/obj/item/book/manual/security_space_law - name = "Corporate Regulations" - desc = "A set of corporate guidelines for keeping law and order on privately-owned space stations." - icon_state = "bookSpaceLaw" - item_state = "book13" - author = "The Company" - title = "Corporate Regulations" - -/obj/item/book/manual/security_space_law/New() - ..() - dat = {" - - - - - - - - - - - "} - - - -/obj/item/book/manual/medical_diagnostics_manual - name = "Medical Diagnostics Manual" - desc = "First, do no harm. A detailed medical practitioner's guide." - icon_state = "bookMedical" - item_state = "book12" - author = "Medical Department" - title = "Medical Diagnostics Manual" - -/obj/item/book/manual/medical_diagnostics_manual/New() - ..() - dat = {" - - - - -
-

The Oath

- - The Medical Oath sworn by recognised medical practitioners in the employ of [using_map.company_name]
- -
    -
  1. Now, as a new doctor, I solemnly promise that I will, to the best of my ability, serve humanity-caring for the sick, promoting good health, and alleviating pain and suffering.
    2. -
  2. I recognise that the practice of medicine is a privilege with which comes considerable responsibility and I will not abuse my position.
    3. -
  3. I will practise medicine with integrity, humility, honesty, and compassion-working with my fellow doctors and other colleagues to meet the needs of my patients.
    4. -
  4. I shall never intentionally do or administer anything to the overall harm of my patients.
    5. -
  5. I will not permit considerations of gender, race, religion, political affiliation, sexual orientation, nationality, or social standing to influence my duty of care.
    6. -
  6. I will oppose policies in breach of human rights and will not participate in them. I will strive to change laws that are contrary to my profession's ethics and will work towards a fairer distribution of health resources.
    7. -
  7. I will assist my patients to make informed decisions that coincide with their own values and beliefs and will uphold patient confidentiality.
    8. -
  8. I will recognise the limits of my knowledge and seek to maintain and increase my understanding and skills throughout my professional life. I will acknowledge and try to remedy my own mistakes and honestly assess and respond to those of others.
    9. -
  9. I will seek to promote the advancement of medical knowledge through teaching and research.
    10. -
  10. I make this declaration solemnly, freely, and upon my honour.
    11. -

- -
- - - - - - "} - - -/obj/item/book/manual/engineering_guide - name = "Engineering Textbook" - icon_state ="bookEngineering2" - item_state = "book3" - author = "Engineering Encyclopedia" - title = "Engineering Textbook" - -/obj/item/book/manual/engineering_guide/New() - ..() - dat = {" - - - - - - - - - - "} -*/ // CHOMPEdit End - /obj/item/book/manual/chef_recipes name = JOB_CHEF + " Recipes" icon_state = "cooked_book" diff --git a/code/game/objects/items/weapons/manuals_vr.dm b/code/game/objects/items/weapons/manuals_vr.dm index b996b6e680..a5506f0f4c 100644 --- a/code/game/objects/items/weapons/manuals_vr.dm +++ b/code/game/objects/items/weapons/manuals_vr.dm @@ -6,7 +6,7 @@ author = "NanoTrasen" title = "Standard Operating Procedure" -/obj/item/book/manual/standard_operating_procedure/Initialize() // CHOMPEdit +/obj/item/book/manual/standard_operating_procedure/Initialize() ..() dat = {" @@ -29,7 +29,7 @@ author = "Jeremiah Acacius" title = "Corporate Regulations" -/obj/item/book/manual/command_guide/Initialize() // CHOMPEdit +/obj/item/book/manual/command_guide/Initialize() ..() dat = {" diff --git a/code/game/objects/items/weapons/wiki_manuals_ch.dm b/code/game/objects/items/weapons/wiki_manuals.dm similarity index 98% rename from code/game/objects/items/weapons/wiki_manuals_ch.dm rename to code/game/objects/items/weapons/wiki_manuals.dm index bf1b337050..8ba6b68dab 100644 --- a/code/game/objects/items/weapons/wiki_manuals_ch.dm +++ b/code/game/objects/items/weapons/wiki_manuals.dm @@ -36,7 +36,7 @@ var/wiki_url = CONFIG_GET(string/wikiurl) if(!wiki_url) //user.balloon_alert(user, "this book is empty!") - to_chat(user, "this book is empty!") + to_chat(user, span_info("this book is empty!")) return //credit_book_to_reader(user) @@ -91,7 +91,7 @@ var/wiki_url = CONFIG_GET(string/wikiurl) if(!wiki_url) //user.balloon_alert(user, "this book is empty!") - to_chat(user, "this book is empty!") + to_chat(user, span_info("this book is empty!")) return var/dat = {" diff --git a/code/game/objects/structures/gravemarker.dm b/code/game/objects/structures/gravemarker.dm index 6d37ba5f47..fe00579c78 100644 --- a/code/game/objects/structures/gravemarker.dm +++ b/code/game/objects/structures/gravemarker.dm @@ -122,7 +122,7 @@ return if(usr.stat || usr.restrained()) return - if(ismouse(usr) || (isobserver(usr) && !CONFIG_GET(flag/ghost_interaction))) // CHOMPEdit + if(ismouse(usr) || (isobserver(usr) && !CONFIG_GET(flag/ghost_interaction))) return src.set_dir(turn(src.dir, 270)) @@ -141,7 +141,7 @@ return if(usr.stat || usr.restrained()) return - if(ismouse(usr) || (isobserver(usr) && !CONFIG_GET(flag/ghost_interaction))) // CHOMPEdit + if(ismouse(usr) || (isobserver(usr) && !CONFIG_GET(flag/ghost_interaction))) return src.set_dir(turn(src.dir, 90)) diff --git a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm index 4a2735f173..890f0bd345 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm @@ -75,7 +75,7 @@ return if(usr.stat || usr.restrained()) return - if(ismouse(usr) || (isobserver(usr) && !CONFIG_GET(flag/ghost_interaction))) // CHOMPEdit + if(ismouse(usr) || (isobserver(usr) && !CONFIG_GET(flag/ghost_interaction))) return src.set_dir(turn(src.dir, 270)) @@ -89,7 +89,7 @@ return if(usr.stat || usr.restrained()) return - if(ismouse(usr) || (isobserver(usr) && !CONFIG_GET(flag/ghost_interaction))) // CHOMPEdit + if(ismouse(usr) || (isobserver(usr) && !CONFIG_GET(flag/ghost_interaction))) return src.set_dir(turn(src.dir, 90)) diff --git a/code/game/objects/structures/trash_pile_vr.dm b/code/game/objects/structures/trash_pile_vr.dm index 25b6a0b14b..88f55909f5 100644 --- a/code/game/objects/structures/trash_pile_vr.dm +++ b/code/game/objects/structures/trash_pile_vr.dm @@ -84,7 +84,7 @@ return ..() /obj/structure/trash_pile/attack_ghost(mob/observer/user as mob) - if(CONFIG_GET(flag/disable_player_mice)) // CHOMPEdit + if(CONFIG_GET(flag/disable_player_mice)) to_chat(user, span_warning("Spawning as a mouse is currently disabled.")) return @@ -116,7 +116,7 @@ host = new /mob/living/simple_mob/animal/passive/mouse(get_turf(src)) if(host) - if(CONFIG_GET(flag/uneducated_mice)) // CHOMPEdit + if(CONFIG_GET(flag/uneducated_mice)) host.universal_understand = 0 announce_ghost_joinleave(src, 0, "They are now a mouse.") host.ckey = user.ckey diff --git a/code/game/turfs/space/space.dm b/code/game/turfs/space/space.dm index 2b936d49c8..400e0d405d 100644 --- a/code/game/turfs/space/space.dm +++ b/code/game/turfs/space/space.dm @@ -13,7 +13,7 @@ var/forced_dirs = 0 //Force this one to pretend it's an overedge turf /turf/space/Initialize() - if(CONFIG_GET(flag/starlight)) // CHOMPEdit + if(CONFIG_GET(flag/starlight)) update_starlight() //Sprite stuff only beyond here @@ -75,7 +75,7 @@ /turf/space/proc/update_starlight() if(locate(/turf/simulated) in orange(src,1)) - set_light(CONFIG_GET(flag/starlight)) // CHOMPEdit + set_light(CONFIG_GET(flag/starlight)) else set_light(0) diff --git a/code/game/world.dm b/code/game/world.dm index 1b2d6c5a57..aa1060aa08 100644 --- a/code/game/world.dm +++ b/code/game/world.dm @@ -31,22 +31,21 @@ to_world_log("Your server's byond version does not meet the recommended requirements for this server. Please update BYOND") TgsNew(new /datum/tgs_event_handler/impl, TGS_SECURITY_TRUSTED) // CHOMPEdit - tgs event handler - // VgsNew() // VOREStation Edit - VGS // CHOMPEdit - Has to be initialized after config was loaded - config.Load(params[OVERRIDE_CONFIG_DIRECTORY_PARAMETER]) // CHOMPEdit + config.Load(params[OVERRIDE_CONFIG_DIRECTORY_PARAMETER]) - ConfigLoaded() // CHOMPEdit - makeDatumRefLists() // CHOMPEdit - VgsNew() // CHOMPEdit + ConfigLoaded() + makeDatumRefLists() + VgsNew() - var/servername = CONFIG_GET(string/servername) // CHOMPEdit - if(config && servername != null && CONFIG_GET(flag/server_suffix) && world.port > 0) // CHOMPEdit + var servername = CONFIG_GET(string/servername) + if(config && servername != null && CONFIG_GET(flag/server_suffix) && world.port > 0) // dumb and hardcoded but I don't care~ - servername += " #[(world.port % 1000) / 100]" // CHOMPEdit - CONFIG_SET(string/servername, servername) // CHOMPEdit + servername += " #[(world.port % 1000) / 100]" + CONFIG_SET(string/servername, servername) // TODO - Figure out what this is. Can you assign to world.log? - // if(config && CONFIG_GET(flag/log_runtime)) // CHOMPEdit + // if(config && CONFIG_FLAG(flag/log_runtime)) // log = file("data/logs/runtime/[time2text(world.realtime,"YYYY-MM-DD-(hh-mm-ss)")]-runtime.log") GLOB.timezoneOffset = world.timezone * 36000 @@ -95,14 +94,13 @@ #endif spawn(3000) //so we aren't adding to the round-start lag - if(CONFIG_GET(flag/ToRban)) // CHOMPEdit + if(CONFIG_GET(flag/ToRban)) ToRban_autoupdate() #undef RECOMMENDED_VERSION return -// CHOMPEdit Start /// Runs after config is loaded but before Master is initialized /world/proc/ConfigLoaded() // Everything in here is prioritized in a very specific way. @@ -110,15 +108,14 @@ // (i.e. basically nothing should be added before load_admins() in here) // Try to set round ID - SSdbcore.InitializeRound() + SSdbcore.InitializeRound() // CHOMPEdit //apply a default value to config.python_path, if needed - if (!CONFIG_GET(string/python_path)) // CHOMPEdit + if (!CONFIG_GET(string/python_path)) if(world.system_type == UNIX) - CONFIG_SET(string/python_path, "/usr/bin/env python2") // CHOMPEdit + CONFIG_SET(string/python_path, "/usr/bin/env python2") else //probably windows, if not this should work anyway - CONFIG_SET(string/python_path, "python") // CHOMPEdit -// CHOMPEdit End + CONFIG_SET(string/python_path, "python") var/world_topic_spam_protect_ip = "0.0.0.0" var/world_topic_spam_protect_time = world.timeofday @@ -146,11 +143,11 @@ var/world_topic_spam_protect_time = world.timeofday var/list/s = list() s["version"] = game_version s["mode"] = master_mode - s["respawn"] = CONFIG_GET(flag/abandon_allowed) // CHOMPEdit - s["persistance"] = CONFIG_GET(flag/persistence_disabled) // CHOMPEdit - s["enter"] = CONFIG_GET(flag/enter_allowed) // CHOMPEdit - s["vote"] = CONFIG_GET(flag/allow_vote_mode) // CHOMPEdit - s["ai"] = CONFIG_GET(flag/allow_ai) // CHOMPEdit + s["respawn"] = CONFIG_GET(flag/abandon_allowed) + s["persistance"] = CONFIG_GET(flag/persistence_disabled) + s["enter"] = CONFIG_GET(flag/enter_allowed) + s["vote"] = CONFIG_GET(flag/allow_vote_mode) + s["ai"] = CONFIG_GET(flag/allow_ai) s["host"] = host ? host : null // This is dumb, but spacestation13.com's banners break if player count isn't the 8th field of the reply, so... this has to go here. @@ -283,7 +280,7 @@ var/world_topic_spam_protect_time = world.timeofday else if(copytext(T,1,5) == "info") var/input[] = params2list(T) - if(input["key"] != CONFIG_GET(string/comms_password)) // CHOMPEdit + if(input["key"] != CONFIG_GET(string/comms_password)) if(world_topic_spam_protect_ip == addr && abs(world_topic_spam_protect_time - world.time) < 50) spawn(50) @@ -370,7 +367,7 @@ var/world_topic_spam_protect_time = world.timeofday var/input[] = params2list(T) - if(input["key"] != CONFIG_GET(string/comms_password)) // CHOMPEdit + if(input["key"] != CONFIG_GET(string/comms_password)) if(world_topic_spam_protect_ip == addr && abs(world_topic_spam_protect_time - world.time) < 50) spawn(50) @@ -420,7 +417,7 @@ var/world_topic_spam_protect_time = world.timeofday 2. validationkey = the key the bot has, it should match the gameservers commspassword in it's configuration. */ var/input[] = params2list(T) - if(input["key"] != CONFIG_GET(string/comms_password)) // CHOMPEdit + if(input["key"] != CONFIG_GET(string/comms_password)) if(world_topic_spam_protect_ip == addr && abs(world_topic_spam_protect_time - world.time) < 50) spawn(50) @@ -435,7 +432,7 @@ var/world_topic_spam_protect_time = world.timeofday else if(copytext(T,1,4) == "age") var/input[] = params2list(T) - if(input["key"] != CONFIG_GET(string/comms_password)) // CHOMPEdit + if(input["key"] != CONFIG_GET(string/comms_password)) if(world_topic_spam_protect_ip == addr && abs(world_topic_spam_protect_time - world.time) < 50) spawn(50) world_topic_spam_protect_time = world.time @@ -471,8 +468,8 @@ var/world_topic_spam_protect_time = world.timeofday else Master.Shutdown() //run SS shutdowns for(var/client/C in GLOB.clients) - if(CONFIG_GET(string/server)) //if you set a server location in config.txt, it sends you there instead of trying to reconnect to the same world address. -- NeoFite // CHOMPEdit - C << link("byond://[CONFIG_GET(string/server)]") // CHOMPEdit + if(CONFIG_GET(string/server)) //if you set a server location in config.txt, it sends you there instead of trying to reconnect to the same world address. -- NeoFite + C << link("byond://[CONFIG_GET(string/server)]") TgsReboot() log_world("World rebooted at [time_stamp()]") @@ -506,14 +503,14 @@ var/world_topic_spam_protect_time = world.timeofday /world/proc/load_motd() join_motd = file2text("config/motd.txt") -/* CHOMPEdit Start +/* Replaced with configuration controller /proc/load_configuration() config = new /datum/configuration() config.load("config/config.txt") config.load("config/game_options.txt","game_options") config.loadsql("config/dbconfig.txt") config.loadforumsql("config/forumdbconfig.txt") -*/ // CHOMPEdit End +*/ /hook/startup/proc/loadMods() world.load_mods() @@ -521,7 +518,7 @@ var/world_topic_spam_protect_time = world.timeofday return 1 /world/proc/load_mods() - if(CONFIG_GET(flag/admin_legacy_system)) // CHOMPEdit + if(CONFIG_GET(flag/admin_legacy_system)) var/text = file2text("config/moderators.txt") if (!text) error("Failed to load config/mods.txt") @@ -542,7 +539,7 @@ var/world_topic_spam_protect_time = world.timeofday D.associate(GLOB.directory[ckey]) /world/proc/load_mentors() - if(CONFIG_GET(flag/admin_legacy_system)) // CHOMPEdit + if(CONFIG_GET(flag/admin_legacy_system)) var/text = file2text("config/mentors.txt") if (!text) error("Failed to load config/mentors.txt") @@ -579,8 +576,8 @@ var/world_topic_spam_protect_time = world.timeofday /world/proc/update_status() var/s = "" - if (config && CONFIG_GET(string/servername)) // CHOMPEdit - s += span_bold("[CONFIG_GET(string/servername)]") + " — " // CHOMPEdit + if (config && CONFIG_GET(string/servername)) + s += span_bold("[CONFIG_GET(string/servername)]") + " — " s += span_bold("[station_name()]"); s += " (" @@ -601,16 +598,16 @@ var/world_topic_spam_protect_time = world.timeofday if (!CONFIG_GET(flag/enter_allowed)) features += "closed" - features += CONFIG_GET(flag/abandon_allowed) ? "respawn" : "no respawn" // CHOMPEdit + features += CONFIG_GET(flag/abandon_allowed) ? "respawn" : "no respawn" - features += CONFIG_GET(flag/persistence_disabled) ? "persistence disabled" : "persistence enabled" // CHOMPEdit + features += CONFIG_GET(flag/persistence_disabled) ? "persistence disabled" : "persistence enabled" - features += CONFIG_GET(flag/persistence_ignore_mapload) ? "persistence mapload disabled" : "persistence mapload enabled" // CHOMPEdit + features += CONFIG_GET(flag/persistence_ignore_mapload) ? "persistence mapload disabled" : "persistence mapload enabled" - if (config && CONFIG_GET(flag/allow_vote_mode)) // CHOMPEdit + if (config && CONFIG_GET(flag/allow_vote_mode)) features += "vote" - if (config && CONFIG_GET(flag/allow_ai)) // CHOMPEdit + if (config && CONFIG_GET(flag/allow_ai)) features += "AI allowed" var/n = 0 @@ -624,8 +621,8 @@ var/world_topic_spam_protect_time = world.timeofday features += "~[n] player" - if (config && CONFIG_GET(string/hostedby)) // CHOMPEdit - features += "hosted by [CONFIG_GET(string/hostedby)]" // CHOMPEdit + if (config && CONFIG_GET(string/hostedby)) + features += "hosted by [CONFIG_GET(string/hostedby)]" if (features) s += ": [jointext(features, ", ")]" @@ -639,7 +636,7 @@ var/failed_db_connections = 0 var/failed_old_db_connections = 0 /hook/startup/proc/connectDB() - if(!CONFIG_GET(flag/sql_enabled)) //CHOMPEdit + if(!CONFIG_GET(flag/sql_enabled)) to_world_log("SQL connection disabled in config.") else if(establish_db_connection())//CHOMPEdit Begin to_world_log("Feedback database connection established.") @@ -665,7 +662,7 @@ var/failed_old_db_connections = 0 return 1 /*/proc/setup_database_connection() CHOMPEdit TGSQL - if(!config.sql_enabled) + if(!CONFIG_GET(flag/sql_enabled)) return 0 if(failed_db_connections > FAILED_DB_CONNECTION_CUTOFF) //If it failed to establish a connection more than 5 times in a row, don't bother attempting to conenct anymore. return 0 @@ -673,11 +670,11 @@ var/failed_old_db_connections = 0 if(!dbcon) dbcon = new() - var/user = sqlfdbklogin - var/pass = sqlfdbkpass - var/db = sqlfdbkdb - var/address = sqladdress - var/port = sqlport + var/user = CONFIG_GET(string/feedback_login) + var/pass = CONFIG_GET(string/feedback_password) + var/db = CONFIG_GET(string/feedback_database) + var/address = CONFIG_GET(string/address) + var/port = CONFIG_GET(number/port) dbcon.Connect("dbi:mysql:[db]:[address]:[port]","[user]","[pass]") . = dbcon.IsConnected() @@ -702,48 +699,6 @@ var/failed_old_db_connections = 0 /proc/establish_db_connection() //CHOMPEdit TGSQL return SSdbcore.Connect() - -/hook/startup/proc/connectOldDB() - if(!CONFIG_GET(flag/sql_enabled)) // CHOMPEdit - to_world_log("SQL connection disabled in config.") - else if(establish_old_db_connection()) //CHOMPEdit Begin - to_world_log("SQL database connection established.") - else - to_world_log("SQL database connection failed") - //CHOMPEdit End - return 1 - -//These two procs are for the old database, while it's being phased out. See the tgstation.sql file in the SQL folder for more information. -/*/proc/setup_old_database_connection() //CHOMPStation TGSQL - if(!config.sql_enabled) - return 0 - - if(failed_old_db_connections > FAILED_DB_CONNECTION_CUTOFF) //If it failed to establish a connection more than 5 times in a row, don't bother attempting to conenct anymore. - return 0 - - if(!dbcon_old) - dbcon_old = new() - - var/user = sqllogin - var/pass = sqlpass - var/db = sqldb - var/address = sqladdress - var/port = sqlport - - dbcon_old.Connect("dbi:mysql:[db]:[address]:[port]","[user]","[pass]") - . = dbcon_old.IsConnected() - if ( . ) - failed_old_db_connections = 0 //If this connection succeeded, reset the failed connections counter. - else - failed_old_db_connections++ //If it failed, increase the failed connections counter. - to_world_log(dbcon.ErrorMsg()) - - return .*/ - -//This proc ensures that the connection to the feedback database (global variable dbcon) is established -/proc/establish_old_db_connection() - return SSdbcore.Connect() - /* CHOMPedit // Cleans up DB connections and recreates them /proc/reset_database_connections() @@ -759,7 +714,7 @@ var/failed_old_db_connections = 0 if(dbcon_old?.IsConnected()) results += "WARNING: dbcon_old is connected, not touching it, but is this intentional?" - if(!config.sql_enabled) + if(!CONFIG_GET(flag/sql_enabled)) results += "stopping because config.sql_enabled = false" else . = setup_database_connection() @@ -808,10 +763,10 @@ var/failed_old_db_connections = 0 /proc/get_world_url() . = "byond://" - if(CONFIG_GET(string/serverurl)) // CHOMPEdit - . += CONFIG_GET(string/serverurl) // CHOMPEdit - else if(CONFIG_GET(string/server)) // CHOMPEdit - . += CONFIG_GET(string/server) // CHOMPEdit + if(CONFIG_GET(string/serverurl)) + . += CONFIG_GET(string/serverurl) + else if(CONFIG_GET(string/server)) + . += CONFIG_GET(string/server) else . += "[world.address]:[world.port]" diff --git a/code/global.dm b/code/global.dm index b3012800c8..d48911eee2 100644 --- a/code/global.dm +++ b/code/global.dm @@ -88,8 +88,6 @@ var/list/reverse_dir = list( // reverse_dir[dir] = reverse of dir ) var/global/const/SQRT_TWO = 1.41421356237 -// var/datum/configuration/config = null // CHOMPEdit - var/list/combatlog = list() var/list/IClog = list() var/list/OOClog = list() diff --git a/code/global_init.dm b/code/global_init.dm index 00992aec7b..3d4f9d3e00 100644 --- a/code/global_init.dm +++ b/code/global_init.dm @@ -24,8 +24,6 @@ var/global/datum/global_init/init = new () debug_log << "[log_end]\n[log_end]\nStarting up. [time_stamp()][log_end]\n---------------------[log_end]" */ //VOREStation Removal End decls_repository = new() - //load_configuration() // CHOMP Edit - //makeDatumRefLists() // CHOMP Edit initialize_integrated_circuits_list() diff --git a/code/modules/admin/IsBanned.dm b/code/modules/admin/IsBanned.dm index 5f1d52c16a..9ab28a1b7b 100644 --- a/code/modules/admin/IsBanned.dm +++ b/code/modules/admin/IsBanned.dm @@ -5,21 +5,21 @@ return ..() //Guest Checking - if(!CONFIG_GET(flag/guests_allowed) && IsGuestKey(key)) // CHOMPEdit + if(!CONFIG_GET(flag/guests_allowed) && IsGuestKey(key)) log_adminwarn("Failed Login: [key] - Guests not allowed") message_admins(span_blue("Failed Login: [key] - Guests not allowed")) return list("reason"="guest", "desc"="\nReason: Guests not allowed. Please sign in with a byond account.") //check if the IP address is a known TOR node - if(config && CONFIG_GET(flag/ToRban) && ToRban_isbanned(address)) // CHOMPEdit + if(config && CONFIG_GET(flag/ToRban) && ToRban_isbanned(address)) log_adminwarn("Failed Login: [src] - Banned: ToR") message_admins(span_blue("Failed Login: [src] - Banned: ToR")) //ban their computer_id and ckey for posterity AddBan(ckey(key), computer_id, "Use of ToR", "Automated Ban", 0, 0) - return list("reason"="Using ToR", "desc"="\nReason: The network you are using to connect has been banned.\nIf you believe this is a mistake, please request help at [CONFIG_GET(string/banappeals)]") // CHOMPEdit + return list("reason"="Using ToR", "desc"="\nReason: The network you are using to connect has been banned.\nIf you believe this is a mistake, please request help at [CONFIG_GET(string/banappeals)]") - if(CONFIG_GET(flag/ban_legacy_system)) // CHOMPEdit + if(CONFIG_GET(flag/ban_legacy_system)) //Ban Checking . = CheckBan( ckey(key), computer_id, address ) diff --git a/code/modules/admin/NewBan.dm b/code/modules/admin/NewBan.dm index ef5f4fb75f..75f50ca7c8 100644 --- a/code/modules/admin/NewBan.dm +++ b/code/modules/admin/NewBan.dm @@ -10,8 +10,8 @@ var/savefile/Banlist . = list() var/appeal - if(config && CONFIG_GET(string/banappeals)) // CHOMPEdit - appeal = "\nFor more information on your ban, or to appeal, head to [CONFIG_GET(string/banappeals)]" // CHOMPEdit + if(config && CONFIG_GET(string/banappeals)) + appeal = "\nFor more information on your ban, or to appeal, head to [CONFIG_GET(string/banappeals)]" Banlist.cd = "/base" if( "[ckey][id]" in Banlist.dir ) Banlist.cd = "[ckey][id]" diff --git a/code/modules/admin/ToRban.dm b/code/modules/admin/ToRban.dm index ee9ddac404..fe8cf26625 100644 --- a/code/modules/admin/ToRban.dm +++ b/code/modules/admin/ToRban.dm @@ -52,11 +52,11 @@ ToRban_update() if("toggle") if(config) - if(CONFIG_GET(flag/ToRban)) // CHOMPEdit - CONFIG_SET(flag/ToRban, FALSE) // CHOMPEdit + if(CONFIG_GET(flag/ToRban)) + CONFIG_SET(flag/ToRban, FALSE) message_admins(span_red("ToR banning disabled.")) else - CONFIG_SET(flag/ToRban, TRUE) // CHOMPEdit + CONFIG_SET(flag/ToRban, TRUE) message_admins(span_green("ToR banning enabled.")) if("show") var/savefile/F = new(TORFILE) diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm index 51fec5c62c..3ca0b81cbd 100644 --- a/code/modules/admin/admin.dm +++ b/code/modules/admin/admin.dm @@ -757,8 +757,8 @@ var/datum/announcement/minor/admin_min_announcer = new if(!check_rights(R_ADMIN)) return - CONFIG_SET(flag/ooc_allowed, !CONFIG_GET(flag/ooc_allowed)) // CHOMPEdit - if (CONFIG_GET(flag/ooc_allowed)) // CHOMPEdit + CONFIG_SET(flag/ooc_allowed, !CONFIG_GET(flag/ooc_allowed)) + if (CONFIG_GET(flag/ooc_allowed)) to_world(span_world("The OOC channel has been globally enabled!")) else to_world(span_world("The OOC channel has been globally disabled!")) @@ -773,8 +773,8 @@ var/datum/announcement/minor/admin_min_announcer = new if(!check_rights(R_ADMIN)) return - CONFIG_SET(flag/looc_allowed, !CONFIG_GET(flag/looc_allowed)) // CHOMPEdit - if (CONFIG_GET(flag/looc_allowed)) // CHOMPEdit + CONFIG_SET(flag/looc_allowed, !CONFIG_GET(flag/looc_allowed)) + if (CONFIG_GET(flag/looc_allowed)) to_world(span_world("The LOOC channel has been globally enabled!")) else to_world(span_world("The LOOC channel has been globally disabled!")) @@ -790,8 +790,8 @@ var/datum/announcement/minor/admin_min_announcer = new if(!check_rights(R_ADMIN)) return - CONFIG_SET(flag/dsay_allowed, !CONFIG_GET(flag/dsay_allowed)) // CHOMPEdit - if (CONFIG_GET(flag/dsay_allowed)) // CHOMPEdit + CONFIG_SET(flag/dsay_allowed, !CONFIG_GET(flag/dsay_allowed)) + if (CONFIG_GET(flag/dsay_allowed)) to_world(span_world("Deadchat has been globally enabled!")) else to_world(span_world("Deadchat has been globally disabled!")) @@ -807,7 +807,7 @@ var/datum/announcement/minor/admin_min_announcer = new if(!check_rights(R_ADMIN)) return - CONFIG_SET(flag/dooc_allowed, !CONFIG_GET(flag/dooc_allowed)) // CHOMPEdit + CONFIG_SET(flag/dooc_allowed, !CONFIG_GET(flag/dooc_allowed)) log_admin("[key_name(usr)] toggled Dead OOC.") message_admins("[key_name_admin(usr)] toggled Dead OOC.", 1) feedback_add_details("admin_verb","TDOOC") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! @@ -829,9 +829,9 @@ var/datum/announcement/minor/admin_min_announcer = new set category = "Server.Game" //CHOMPEdit set desc="Toggle traitor scaling" set name="Toggle Traitor Scaling" - CONFIG_SET(flag/traitor_scaling, !CONFIG_GET(flag/traitor_scaling)) // CHOMPEdit - log_admin("[key_name(usr)] toggled Traitor Scaling to [CONFIG_GET(flag/traitor_scaling)].") // CHOMPEdit - message_admins("[key_name_admin(usr)] toggled Traitor Scaling [CONFIG_GET(flag/traitor_scaling) ? "on" : "off"].", 1) // CHOMPEdit + CONFIG_SET(flag/traitor_scaling, !CONFIG_GET(flag/traitor_scaling)) + log_admin("[key_name(usr)] toggled Traitor Scaling to [CONFIG_GET(flag/traitor_scaling)].") + message_admins("[key_name_admin(usr)] toggled Traitor Scaling [CONFIG_GET(flag/traitor_scaling) ? "on" : "off"].", 1) feedback_add_details("admin_verb","TTS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /datum/admins/proc/startnow() @@ -861,8 +861,8 @@ var/datum/announcement/minor/admin_min_announcer = new set category = "Server.Game" //CHOMPEdit set desc="People can't enter" set name="Toggle Entering" - CONFIG_SET(flag/enter_allowed, !CONFIG_GET(flag/enter_allowed)) // CHOMPEdit - if (!CONFIG_GET(flag/enter_allowed)) // CHOMPEdit + CONFIG_SET(flag/enter_allowed, !CONFIG_GET(flag/enter_allowed)) + if (!CONFIG_GET(flag/enter_allowed)) to_world(span_world("New players may no longer enter the game.")) else to_world(span_world("New players may now enter the game.")) @@ -875,8 +875,8 @@ var/datum/announcement/minor/admin_min_announcer = new set category = "Server.Game" //CHOMPEdit set desc="People can't be AI" set name="Toggle AI" - CONFIG_SET(flag/allow_ai, !CONFIG_GET(flag/allow_ai)) // CHOMPEdit - if (!CONFIG_GET(flag/allow_ai)) // CHOMPEdit + CONFIG_SET(flag/allow_ai, !CONFIG_GET(flag/allow_ai)) + if (!CONFIG_GET(flag/allow_ai)) to_world(span_world("The AI job is no longer chooseable.")) else to_world(span_world("The AI job is chooseable now.")) @@ -888,13 +888,13 @@ var/datum/announcement/minor/admin_min_announcer = new set category = "Server.Game" //CHOMPEdit set desc="Respawn basically" set name="Toggle Respawn" - CONFIG_SET(flag/abandon_allowed, !CONFIG_GET(flag/abandon_allowed)) // CHOMPEdit - if(CONFIG_GET(flag/abandon_allowed)) // CHOMPEdit + CONFIG_SET(flag/abandon_allowed, !CONFIG_GET(flag/abandon_allowed)) + if(CONFIG_GET(flag/abandon_allowed)) to_world(span_world("You may now respawn.")) else to_world(span_world("You may no longer respawn :(")) - message_admins(span_blue("[key_name_admin(usr)] toggled respawn to [CONFIG_GET(flag/abandon_allowed) ? "On" : "Off"]."), 1) // CHOMPEdit - log_admin("[key_name(usr)] toggled respawn to [CONFIG_GET(flag/abandon_allowed) ? "On" : "Off"].") // CHOMPEdit + message_admins(span_blue("[key_name_admin(usr)] toggled respawn to [CONFIG_GET(flag/abandon_allowed) ? "On" : "Off"]."), 1) + log_admin("[key_name(usr)] toggled respawn to [CONFIG_GET(flag/abandon_allowed) ? "On" : "Off"].") world.update_status() feedback_add_details("admin_verb","TR") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! @@ -902,15 +902,15 @@ var/datum/announcement/minor/admin_min_announcer = new set category = "Server.Config" //CHOMPEdit set desc="Whether persistent data will be saved from now on." set name="Toggle Persistent Data" - CONFIG_SET(flag/persistence_disabled, !CONFIG_GET(flag/persistence_disabled)) // CHOMPEdit -/* CHOMP Edit: the entire world doesn't need to know. - if(!config.persistence_disabled) + CONFIG_SET(flag/persistence_disabled, !CONFIG_GET(flag/persistence_disabled)) + /* CHOMP Edit: the entire world doesn't need to know. + if(!CONFIG_GET(flag/persistence_disabled)) to_world(span_world("Persistence is now enabled.")) else to_world(span_world("Persistence is no longer enabled.")) -*/ - message_admins(span_blue("[key_name_admin(usr)] toggled persistence to [CONFIG_GET(flag/persistence_disabled) ? "Off" : "On"]."), 1) // CHOMPEdit - log_admin("[key_name(usr)] toggled persistence to [CONFIG_GET(flag/persistence_disabled) ? "Off" : "On"].") // CHOMPEdit + */ + message_admins(span_blue("[key_name_admin(usr)] toggled persistence to [CONFIG_GET(flag/persistence_disabled) ? "Off" : "On"]."), 1) + log_admin("[key_name(usr)] toggled persistence to [CONFIG_GET(flag/persistence_disabled) ? "Off" : "On"].") world.update_status() feedback_add_details("admin_verb","TPD") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! @@ -918,13 +918,13 @@ var/datum/announcement/minor/admin_min_announcer = new set category = "Server.Config" //CHOMPEdit set desc="Whether mapload persistent data will be saved from now on." set name="Toggle Mapload Persistent Data" - CONFIG_SET(flag/persistence_ignore_mapload, !CONFIG_GET(flag/persistence_ignore_mapload)) // CHOMPEdit - if(!CONFIG_GET(flag/persistence_ignore_mapload)) // CHOMPEdit + CONFIG_SET(flag/persistence_ignore_mapload, !CONFIG_GET(flag/persistence_ignore_mapload)) + if(!CONFIG_GET(flag/persistence_ignore_mapload)) to_world(span_world("Persistence is now enabled.")) else to_world(span_world("Persistence is no longer enabled.")) - message_admins(span_blue("[key_name_admin(usr)] toggled persistence to [CONFIG_GET(flag/persistence_ignore_mapload) ? "Off" : "On"]."), 1) // CHOMPEdit - log_admin("[key_name(usr)] toggled persistence to [CONFIG_GET(flag/persistence_ignore_mapload) ? "Off" : "On"].") // CHOMPEdit + message_admins(span_blue("[key_name_admin(usr)] toggled persistence to [CONFIG_GET(flag/persistence_ignore_mapload) ? "Off" : "On"]."), 1) + log_admin("[key_name(usr)] toggled persistence to [CONFIG_GET(flag/persistence_ignore_mapload) ? "Off" : "On"].") world.update_status() feedback_add_details("admin_verb","TMPD") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! @@ -932,18 +932,18 @@ var/datum/announcement/minor/admin_min_announcer = new set category = "Server.Game" //CHOMPEdit set desc="Toggle alien mobs" set name="Toggle Aliens" - CONFIG_SET(flag/aliens_allowed, !CONFIG_GET(flag/aliens_allowed)) // CHOMPEdit - log_admin("[key_name(usr)] toggled Aliens to [CONFIG_GET(flag/aliens_allowed)].") // CHOMPEdit - message_admins("[key_name_admin(usr)] toggled Aliens [CONFIG_GET(flag/aliens_allowed) ? "on" : "off"].", 1) // CHOMPEdit + CONFIG_SET(flag/aliens_allowed, !CONFIG_GET(flag/aliens_allowed)) + log_admin("[key_name(usr)] toggled Aliens to [CONFIG_GET(flag/aliens_allowed)].") + message_admins("[key_name_admin(usr)] toggled Aliens [CONFIG_GET(flag/aliens_allowed) ? "on" : "off"].", 1) feedback_add_details("admin_verb","TA") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /datum/admins/proc/toggle_space_ninja() set category = "Server.Game" //CHOMPEdit set desc="Toggle space ninjas spawning." set name="Toggle Space Ninjas" - CONFIG_SET(flag/ninjas_allowed, !CONFIG_GET(flag/ninjas_allowed)) // CHOMPEdit - log_admin("[key_name(usr)] toggled Space Ninjas to [CONFIG_GET(flag/ninjas_allowed)].") // CHOMPEdit - message_admins("[key_name_admin(usr)] toggled Space Ninjas [CONFIG_GET(flag/ninjas_allowed) ? "on" : "off"].", 1) // CHOMPEdit + CONFIG_SET(flag/ninjas_allowed, !CONFIG_GET(flag/ninjas_allowed)) + log_admin("[key_name(usr)] toggled Space Ninjas to [CONFIG_GET(flag/ninjas_allowed)].") + message_admins("[key_name_admin(usr)] toggled Space Ninjas [CONFIG_GET(flag/ninjas_allowed) ? "on" : "off"].", 1) feedback_add_details("admin_verb","TSN") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /datum/admins/proc/delay() @@ -970,24 +970,24 @@ var/datum/announcement/minor/admin_min_announcer = new set category = "Server.Game" //CHOMPEdit set desc="Toggle admin jumping" set name="Toggle Jump" - CONFIG_SET(flag/allow_admin_jump, !CONFIG_GET(flag/allow_admin_jump)) // CHOMPEdit - message_admins(span_blue("Toggled admin jumping to [CONFIG_GET(flag/allow_admin_jump)].")) // CHOMPEdit + CONFIG_SET(flag/allow_admin_jump, !CONFIG_GET(flag/allow_admin_jump)) + message_admins(span_blue("Toggled admin jumping to [CONFIG_GET(flag/allow_admin_jump)].")) feedback_add_details("admin_verb","TJ") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /datum/admins/proc/adspawn() set category = "Server.Game" //CHOMPEdit set desc="Toggle admin spawning" set name="Toggle Spawn" - CONFIG_SET(flag/allow_admin_spawning, !CONFIG_GET(flag/allow_admin_spawning)) // CHOMPEdit - message_admins(span_blue("Toggled admin item spawning to [CONFIG_GET(flag/allow_admin_spawning)].")) // CHOMPEdit + CONFIG_SET(flag/allow_admin_spawning, !CONFIG_GET(flag/allow_admin_spawning)) + message_admins(span_blue("Toggled admin item spawning to [CONFIG_GET(flag/allow_admin_spawning)].")) feedback_add_details("admin_verb","TAS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /datum/admins/proc/adrev() set category = "Server.Game" //CHOMPEdit set desc="Toggle admin revives" set name="Toggle Revive" - CONFIG_SET(flag/allow_admin_rev, !CONFIG_GET(flag/allow_admin_rev)) // CHOMPEdit - message_admins(span_blue("Toggled reviving to [CONFIG_GET(flag/allow_admin_rev)].")) // CHOMPEdit + CONFIG_SET(flag/allow_admin_rev, !CONFIG_GET(flag/allow_admin_rev)) + message_admins(span_blue("Toggled reviving to [CONFIG_GET(flag/allow_admin_rev)].")) feedback_add_details("admin_verb","TAR") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /datum/admins/proc/immreboot() @@ -1012,7 +1012,7 @@ var/datum/announcement/minor/admin_min_announcer = new set category = "Admin.Moderation" //CHOMPEdit set name = "Unprison" if (M.z == 2) - if (CONFIG_GET(flag/allow_admin_jump)) // CHOMPEdit + if (CONFIG_GET(flag/allow_admin_jump)) M.loc = pick(latejoin) message_admins("[key_name_admin(usr)] has unprisoned [key_name_admin(M)]", 1) log_admin("[key_name(usr)] has unprisoned [key_name(M)]") @@ -1244,8 +1244,8 @@ var/datum/announcement/minor/admin_min_announcer = new set category = "Debug" set desc="Reduces view range when wearing welding helmets" set name="Toggle tinted welding helmets." - CONFIG_SET(flag/welder_vision, !CONFIG_GET(flag/welder_vision)) // CHOMPEdit - if (CONFIG_GET(flag/welder_vision)) // CHOMPEdit + CONFIG_SET(flag/welder_vision, !CONFIG_GET(flag/welder_vision)) + if (CONFIG_GET(flag/welder_vision)) to_world(span_world("Reduced welder vision has been enabled!")) else to_world(span_world("Reduced welder vision has been disabled!")) @@ -1257,13 +1257,13 @@ var/datum/announcement/minor/admin_min_announcer = new set category = "Server.Config" //CHOMPEdit set desc="Guests can't enter" set name="Toggle guests" - CONFIG_SET(flag/guests_allowed, !CONFIG_GET(flag/guests_allowed)) // CHOMPEdit - if (!CONFIG_GET(flag/guests_allowed)) // CHOMPEdit + CONFIG_SET(flag/guests_allowed, !CONFIG_GET(flag/guests_allowed)) + if (!CONFIG_GET(flag/guests_allowed)) to_world(span_world("Guests may no longer enter the game.")) else to_world(span_world("Guests may now enter the game.")) - log_admin("[key_name(usr)] toggled guests game entering [CONFIG_GET(flag/guests_allowed) ? "":"dis"]allowed.") // CHOMPEdit - message_admins(span_blue("[key_name_admin(usr)] toggled guests game entering [CONFIG_GET(flag/guests_allowed) ? "":"dis"]allowed."), 1) // CHOMPEdit + log_admin("[key_name(usr)] toggled guests game entering [CONFIG_GET(flag/guests_allowed)?"":"dis"]allowed.") + message_admins(span_blue("[key_name_admin(usr)] toggled guests game entering [CONFIG_GET(flag/guests_allowed)?"":"dis"]allowed."), 1) feedback_add_details("admin_verb","TGU") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /datum/admins/proc/output_ai_laws() diff --git a/code/modules/admin/admin_investigate.dm b/code/modules/admin/admin_investigate.dm index bdb1654155..4044715952 100644 --- a/code/modules/admin/admin_investigate.dm +++ b/code/modules/admin/admin_investigate.dm @@ -39,7 +39,7 @@ src << browse(F,"window=investigate[subject];size=800x300") if("hrefs") //persistant logs and stuff - if(config && CONFIG_GET(flag/log_hrefs)) // CHOMPEdit + if(config && CONFIG_GET(flag/log_hrefs)) if(href_logfile) src << browse(href_logfile,"window=investigate[subject];size=800x300") else diff --git a/code/modules/admin/admin_ranks.dm b/code/modules/admin/admin_ranks.dm index 858923238b..03acefe2c4 100644 --- a/code/modules/admin/admin_ranks.dm +++ b/code/modules/admin/admin_ranks.dm @@ -115,7 +115,7 @@ var/list/admin_ranks = list() //list of all ranks with associated rights if(!SSdbcore.IsConnected()) //CHOMPEdit TGSQL error("Failed to connect to database in load_admins(). Reverting to legacy system.") log_misc("Failed to connect to database in load_admins(). Reverting to legacy system.") - CONFIG_SET(flag/admin_legacy_system, TRUE) // CHOMPEdit + CONFIG_SET(flag/admin_legacy_system, TRUE) load_admins() return @@ -139,7 +139,7 @@ var/list/admin_ranks = list() //list of all ranks with associated rights if(!admin_datums) error("The database query in load_admins() resulted in no admins being added to the list. Reverting to legacy system.") log_misc("The database query in load_admins() resulted in no admins being added to the list. Reverting to legacy system.") - CONFIG_SET(flag/admin_legacy_system, TRUE) // CHOMPEdit + CONFIG_SET(flag/admin_legacy_system, TRUE) load_admins() return diff --git a/code/modules/admin/admin_verb_lists_vr.dm b/code/modules/admin/admin_verb_lists_vr.dm index 9573d7f047..f8012f7346 100644 --- a/code/modules/admin/admin_verb_lists_vr.dm +++ b/code/modules/admin/admin_verb_lists_vr.dm @@ -593,7 +593,7 @@ var/list/admin_verbs_event_manager = list( if(holder.rights & R_SERVER) add_verb(src, admin_verbs_server) if(holder.rights & R_DEBUG) add_verb(src, admin_verbs_debug) - if(CONFIG_GET(flag/debugparanoid) && !(holder.rights & R_ADMIN)) // CHOMPEdit + if(CONFIG_GET(flag/debugparanoid) && !(holder.rights & R_ADMIN)) remove_verb(src, admin_verbs_paranoid_debug) //Right now it's just callproc but we can easily add others later on. if(holder.rights & R_POSSESS) add_verb(src, admin_verbs_possess) if(holder.rights & R_PERMISSIONS) add_verb(src, admin_verbs_permissions) diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index 7fca58448a..ba18117feb 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -127,7 +127,7 @@ set name = "Display Job bans" set category = "Admin.Investigate" //CHOMPEdit if(holder) - if(CONFIG_GET(flag/ban_legacy_system)) // CHOMPEdit + if(CONFIG_GET(flag/ban_legacy_system)) holder.Jobbans() else holder.DB_ban_panel() @@ -138,7 +138,7 @@ set name = "Unban Panel" set category = "Admin.Game" //CHOMPEdit if(holder) - if(CONFIG_GET(flag/ban_legacy_system)) // CHOMPEdit + if(CONFIG_GET(flag/ban_legacy_system)) holder.unbanpanel() else holder.DB_ban_panel() @@ -411,8 +411,8 @@ set category = "Server.Config" //CHOMPEdit if(!holder) return if(config) - CONFIG_SET(flag/log_hrefs, !CONFIG_GET(flag/log_hrefs)) // CHOMPEdit - message_admins(span_bold("[key_name_admin(usr)] [CONFIG_GET(flag/log_hrefs) ? "started" : "stopped"] logging hrefs")) // CHOMPEdit + CONFIG_SET(flag/log_hrefs, !CONFIG_GET(flag/log_hrefs)) + message_admins(span_bold("[key_name_admin(usr)] [CONFIG_GET(flag/log_hrefs) ? "started" : "stopped"] logging hrefs")) /client/proc/check_ai_laws() set name = "Check AI Laws" @@ -513,16 +513,16 @@ set category = "Server.Game" //CHOMPEdit if(!holder) return if(config) - CONFIG_SET(flag/cult_ghostwriter, !CONFIG_GET(flag/cult_ghostwriter)) // CHOMPEdit - message_admins("Admin [key_name_admin(usr)] has [CONFIG_GET(flag/cult_ghostwriter) ? "en" : "dis"]abled ghost writers.", 1) // CHOMPEdit + CONFIG_SET(flag/cult_ghostwriter, !CONFIG_GET(flag/cult_ghostwriter)) + message_admins("Admin [key_name_admin(usr)] has [CONFIG_GET(flag/cult_ghostwriter) ? "en" : "dis"]abled ghost writers.", 1) /client/proc/toggledrones() set name = "Toggle maintenance drones" set category = "Server.Game" //CHOMPEdit if(!holder) return if(config) - CONFIG_SET(flag/allow_drone_spawn, !CONFIG_GET(flag/allow_drone_spawn)) // CHOMPEdit - message_admins("Admin [key_name_admin(usr)] has [CONFIG_GET(flag/allow_drone_spawn) ? "en" : "dis"]abled maintenance drones.", 1) // CHOMPEdit + CONFIG_SET(flag/allow_drone_spawn, !CONFIG_GET(flag/allow_drone_spawn)) + message_admins("Admin [key_name_admin(usr)] has [CONFIG_GET(flag/allow_drone_spawn) ? "en" : "dis"]abled maintenance drones.", 1) /client/proc/man_up(mob/T as mob in mob_list) set category = "Fun.Do Not" //CHOMPEdit diff --git a/code/modules/admin/admin_verbs_vr.dm b/code/modules/admin/admin_verbs_vr.dm index 19128c4b57..4c8db50364 100644 --- a/code/modules/admin/admin_verbs_vr.dm +++ b/code/modules/admin/admin_verbs_vr.dm @@ -95,7 +95,7 @@ var/dat = "Book Inventory Management\n" dat += "

ADMINISTRATIVE MANAGEMENT

" - establish_old_db_connection() + establish_db_connection() if(!SSdbcore.IsConnected()) dat += "ERROR: Unable to contact External Archive. Please contact your system administrator for assistance." @@ -134,8 +134,8 @@ var/which = tgui_alert(usr, "Which do you want to toggle?", "Choose Recolour Toggle", list("Robot", "Simple Mob")) switch(which) if("Robot") - CONFIG_SET(flag/allow_robot_recolor, !CONFIG_GET(flag/allow_robot_recolor)) // CHOMPEdit - to_chat(usr, "You have [CONFIG_GET(flag/allow_robot_recolor) ? "enabled" : "disabled"] newly spawned cyborgs to spawn with the recolour verb") // CHOMPEdit + CONFIG_SET(flag/allow_robot_recolor, !CONFIG_GET(flag/allow_robot_recolor)) + to_chat(usr, "You have [CONFIG_GET(flag/allow_robot_recolor) ? "enabled" : "disabled"] newly spawned cyborgs to spawn with the recolour verb") if("Simple Mob") - CONFIG_SET(flag/allow_simple_mob_recolor, !CONFIG_GET(flag/allow_simple_mob_recolor)) //CHOMPEdit - to_chat(usr, "You have [CONFIG_GET(flag/allow_simple_mob_recolor) ? "enabled" : "disabled"] newly spawned simple mobs to spawn with the recolour verb") //CHOMPEdit + CONFIG_SET(flag/allow_simple_mob_recolor, !CONFIG_GET(flag/allow_simple_mob_recolor)) + to_chat(usr, "You have [CONFIG_GET(flag/allow_simple_mob_recolor) ? "enabled" : "disabled"] newly spawned simple mobs to spawn with the recolour verb") diff --git a/code/modules/admin/banjob.dm b/code/modules/admin/banjob.dm index 07e433ca44..25fed4845d 100644 --- a/code/modules/admin/banjob.dm +++ b/code/modules/admin/banjob.dm @@ -21,9 +21,9 @@ var/jobban_keylist[0] //to store the keys & ranks */ if (guest_jobbans(rank)) - if(CONFIG_GET(flag/guest_jobban) && IsGuestKey(M.key)) // CHOMPEdit + if(CONFIG_GET(flag/guest_jobban) && IsGuestKey(M.key)) return "Guest Job-ban" - if(CONFIG_GET(flag/usewhitelist) && !check_whitelist(M)) // CHOMPEdit + if(CONFIG_GET(flag/usewhitelist) && !check_whitelist(M)) return "Whitelisted Job" return ckey_is_jobbanned(M.ckey, rank) @@ -59,7 +59,7 @@ DEBUG return 1 /proc/jobban_loadbanfile() - if(CONFIG_GET(flag/ban_legacy_system)) // CHOMPEdit + if(CONFIG_GET(flag/ban_legacy_system)) var/savefile/S=new("data/job_full.ban") S["keys[0]"] >> jobban_keylist log_admin("Loading jobban_rank") @@ -72,7 +72,7 @@ DEBUG if(!establish_db_connection()) error("Database connection failed. Reverting to the legacy ban system.") log_misc("Database connection failed. Reverting to the legacy ban system.") - CONFIG_SET(flag/ban_legacy_system, TRUE) // CHOMPedit + CONFIG_SET(flag/ban_legacy_system, TRUE) jobban_loadbanfile() return diff --git a/code/modules/admin/permissionverbs/permissionedit.dm b/code/modules/admin/permissionverbs/permissionedit.dm index aa989dff42..0bbebee89c 100644 --- a/code/modules/admin/permissionverbs/permissionedit.dm +++ b/code/modules/admin/permissionverbs/permissionedit.dm @@ -45,7 +45,7 @@ usr << browse(output,"window=editrights;size=600x500") /datum/admins/proc/log_admin_rank_modification(var/adm_ckey, var/new_rank) - if(CONFIG_GET(flag/admin_legacy_system)) return // CHOMPEdit + if(CONFIG_GET(flag/admin_legacy_system)) return if(!usr.client) return @@ -99,7 +99,7 @@ to_chat(usr, span_filter_adminlog("[span_blue("Admin rank changed.")]")) /datum/admins/proc/log_admin_permission_modification(var/adm_ckey, var/new_permission) - if(CONFIG_GET(flag/admin_legacy_system)) return // CHOMPEdit + if(CONFIG_GET(flag/admin_legacy_system)) return if(!usr.client) return diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index b705d3f784..1e0bc5cc61 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -178,19 +178,19 @@ if(null,"") return if("*New Rank*") new_rank = tgui_input_text(usr, "Please input a new rank", "New custom rank") - if(CONFIG_GET(flag/admin_legacy_system)) // CHOMPEdit + if(CONFIG_GET(flag/admin_legacy_system)) new_rank = ckeyEx(new_rank) if(!new_rank) to_chat(usr, span_filter_adminlog(span_warning("Error: Topic 'editrights': Invalid rank"))) return - if(CONFIG_GET(flag/admin_legacy_system)) // CHOMPEdit + if(CONFIG_GET(flag/admin_legacy_system)) if(admin_ranks.len) if(new_rank in admin_ranks) rights = admin_ranks[new_rank] //we typed a rank which already exists, use its rights else admin_ranks[new_rank] = 0 //add the new rank to admin_ranks else - if(CONFIG_GET(flag/admin_legacy_system)) // CHOMPEdit + if(CONFIG_GET(flag/admin_legacy_system)) new_rank = ckeyEx(new_rank) rights = admin_ranks[new_rank] //we input an existing rank, use its rights @@ -682,7 +682,7 @@ to_chat(usr, span_filter_adminlog(span_warning("You do not have the appropriate permissions to add job bans!"))) return - if(check_rights(R_MOD,0) && !check_rights(R_ADMIN,0) && !CONFIG_GET(flag/mods_can_job_tempban)) // If mod and tempban disabled // CHOMPEdit + if(check_rights(R_MOD,0) && !check_rights(R_ADMIN,0) && !CONFIG_GET(flag/mods_can_job_tempban)) // If mod and tempban disabled to_chat(usr, span_filter_adminlog(span_warning("Mod jobbanning is disabled!"))) return @@ -785,14 +785,14 @@ if(!check_rights(R_MOD,0) && !check_rights(R_BAN, 0)) to_chat(usr, span_filter_adminlog(span_warning("You cannot issue temporary job-bans!"))) return - if(CONFIG_GET(flag/ban_legacy_system)) // CHOMPEdit + if(CONFIG_GET(flag/ban_legacy_system)) to_chat(usr, span_filter_adminlog(span_warning("Your server is using the legacy banning system, which does not support temporary job bans. Consider upgrading. Aborting ban."))) return var/mins = tgui_input_number(usr,"How long (in minutes)?","Ban time",1440) if(!mins) return - if(check_rights(R_MOD, 0) && !check_rights(R_BAN, 0) && mins > CONFIG_GET(number/mod_job_tempban_max)) // CHOMPEdit - to_chat(usr, span_filter_adminlog(span_warning("Moderators can only job tempban up to [CONFIG_GET(number/mod_job_tempban_max)] minutes!"))) // CHOMPEdit + if(check_rights(R_MOD, 0) && !check_rights(R_BAN, 0) && mins > CONFIG_GET(number/mod_job_tempban_max)) + to_chat(usr, span_filter_adminlog(span_warning("Moderators can only job tempban up to [CONFIG_GET(number/mod_job_tempban_max)] minutes!"))) return var/reason = sanitize(tgui_input_text(usr,"Reason?","Please State Reason","")) if(!reason) @@ -844,7 +844,7 @@ //Unbanning joblist //all jobs in joblist are banned already OR we didn't give a reason (implying they shouldn't be banned) if(joblist.len) //at least 1 banned job exists in joblist so we have stuff to unban. - if(!CONFIG_GET(flag/ban_legacy_system)) // CHOMPEdit + if(!CONFIG_GET(flag/ban_legacy_system)) to_chat(usr, span_filter_adminlog("Unfortunately, database based unbanning cannot be done through this panel")) DB_ban_panel(M.ckey) return @@ -907,7 +907,7 @@ to_chat(usr, span_warning("You do not have the appropriate permissions to add bans!")) return - if(check_rights(R_MOD,0) && !check_rights(R_ADMIN, 0) && !CONFIG_GET(flag/mods_can_job_tempban)) // If mod and tempban disabled // CHOMPEdit + if(check_rights(R_MOD,0) && !check_rights(R_ADMIN, 0) && !CONFIG_GET(flag/mods_can_job_tempban)) // If mod and tempban disabled to_chat(usr, span_warning("Mod jobbanning is disabled!")) return @@ -923,8 +923,8 @@ var/mins = tgui_input_number(usr,"How long (in minutes)?","Ban time",1440) if(!mins) return - if(check_rights(R_MOD, 0) && !check_rights(R_BAN, 0) && mins > CONFIG_GET(number/mod_tempban_max)) // CHOMPEdit - to_chat(usr, span_warning("Moderators can only job tempban up to [CONFIG_GET(number/mod_tempban_max)] minutes!")) // CHOMPEdit + if(check_rights(R_MOD, 0) && !check_rights(R_BAN, 0) && mins > CONFIG_GET(number/mod_tempban_max)) + to_chat(usr, span_warning("Moderators can only job tempban up to [CONFIG_GET(number/mod_tempban_max)] minutes!")) return if(mins >= 525600) mins = 525599 var/reason = sanitize(tgui_input_text(usr,"Reason?","reason","Griefer")) @@ -938,8 +938,8 @@ feedback_inc("ban_tmp",1) DB_ban_record(BANTYPE_TEMP, M, mins, reason) feedback_inc("ban_tmp_mins",mins) - if(CONFIG_GET(string/banappeals)) // CHOMPEdit - to_chat(M, span_filter_system(span_warning("To try to resolve this matter head to [CONFIG_GET(string/banappeals)]"))) // CHOMPEdit + if(CONFIG_GET(string/banappeals)) + to_chat(M, span_filter_system(span_warning("To try to resolve this matter head to [CONFIG_GET(string/banappeals)]"))) else to_chat(M, span_filter_system(span_warning("No ban appeals URL has been set."))) log_admin("[usr.client.ckey] has banned [M.ckey].\nReason: [reason]\nThis will be removed in [mins] minutes.") @@ -964,8 +964,8 @@ AddBan(M.ckey, M.computer_id, reason, usr.ckey, 0, 0) to_chat(M, span_filter_system(span_critical("You have been banned by [usr.client.ckey].\nReason: [reason]."))) to_chat(M, span_filter_system(span_warning("This is a permanent ban."))) - if(CONFIG_GET(string/banappeals)) // CHOMPEdit - to_chat(M, span_filter_system(span_warning("To try to resolve this matter head to [CONFIG_GET(string/banappeals)]"))) // CHOMPEdit + if(CONFIG_GET(string/banappeals)) + to_chat(M, span_filter_system(span_warning("To try to resolve this matter head to [CONFIG_GET(string/banappeals)]"))) else to_chat(M, span_filter_system(span_warning("No ban appeals URL has been set."))) ban_unban_log_save("[usr.client.ckey] has permabanned [M.ckey]. - Reason: [reason] - This is a permanent ban.") @@ -1260,7 +1260,7 @@ to_chat(usr, span_filter_adminlog("This can only be used on instances of type /mob/living")) return - if(CONFIG_GET(flag/allow_admin_rev)) // CHOMPEdit + if(CONFIG_GET(flag/allow_admin_rev)) L.revive() message_admins(span_red("Admin [key_name_admin(usr)] healed / revived [key_name_admin(L)]!"), 1) log_admin("[key_name(usr)] healed / Rrvived [key_name(L)]") @@ -1368,13 +1368,13 @@ to_chat(X, take_msg) to_chat(M, span_filter_pm(span_boldnotice("Your adminhelp is being attended to by [usr.client]. Thanks for your patience!"))) // VoreStation Edit Start - if (CONFIG_GET(string/chat_webhook_url)) // CHOMPEdit + if (CONFIG_GET(string/chat_webhook_url)) spawn(0) var/query_string = "type=admintake" - query_string += "&key=[url_encode(CONFIG_GET(string/chat_webhook_key))]" // CHOMPEdit + query_string += "&key=[url_encode(CONFIG_GET(string/chat_webhook_key))]" query_string += "&admin=[url_encode(key_name(usr.client))]" query_string += "&user=[url_encode(key_name(M))]" - world.Export("[CONFIG_GET(string/chat_webhook_url)]?[query_string]") // CHOMPEdit + world.Export("[CONFIG_GET(string/chat_webhook_url)]?[query_string]") // VoreStation Edit End else to_chat(usr, span_warning("Unable to locate mob.")) @@ -1587,7 +1587,7 @@ else if(href_list["jumpto"]) if(!check_rights(R_ADMIN|R_MOD|R_DEBUG|R_EVENT)) return - if(!CONFIG_GET(flag/allow_admin_jump)) // CHOMPEdit + if(!CONFIG_GET(flag/allow_admin_jump)) tgui_alert_async(usr, "Admin jumping disabled") return @@ -1607,7 +1607,7 @@ else if(href_list["getmob"]) if(!check_rights(R_ADMIN|R_MOD|R_DEBUG|R_EVENT)) return - if(!CONFIG_GET(flag/allow_admin_jump)) // CHOMPEdit + if(!CONFIG_GET(flag/allow_admin_jump)) tgui_alert_async(usr, "Admin jumping disabled") return if(tgui_alert(usr, "Confirm?", "Message", list("Yes", "No")) != "Yes") @@ -1626,7 +1626,7 @@ else if(href_list["sendmob"]) if(!check_rights(R_ADMIN|R_MOD|R_DEBUG|R_EVENT)) return - if(!CONFIG_GET(flag/allow_admin_jump)) // CHOMPEdit + if(!CONFIG_GET(flag/allow_admin_jump)) tgui_alert_async(usr, "Admin jumping disabled") return @@ -1694,7 +1694,7 @@ else if(href_list["object_list"]) //this is the laggiest thing ever if(!check_rights(R_SPAWN)) return - if(!CONFIG_GET(flag/allow_admin_spawning)) // CHOMPEdit + if(!CONFIG_GET(flag/allow_admin_spawning)) to_chat(usr, span_filter_adminlog("Spawning of items is not allowed.")) return diff --git a/code/modules/admin/verbs/adminhelp.dm b/code/modules/admin/verbs/adminhelp.dm index 53b040e7ca..1212f06226 100644 --- a/code/modules/admin/verbs/adminhelp.dm +++ b/code/modules/admin/verbs/adminhelp.dm @@ -474,10 +474,10 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new) log_admin(msg) AddInteraction("[key_name_admin(usr)] is now handling this ticket.") var/query_string = "type=admintake" - query_string += "&key=[url_encode(CONFIG_GET(string/chat_webhook_key))]" // CHOMPEdit + query_string += "&key=[url_encode(CONFIG_GET(string/chat_webhook_key))]" query_string += "&admin=[url_encode(key_name(usr))]" query_string += "&user=[url_encode(key_name(initiator))]" - world.Export("[CONFIG_GET(string/chat_webhook_url)]?[query_string]") // CHOMPEdit + world.Export("[CONFIG_GET(string/chat_webhook_url)]?[query_string]") diff --git a/code/modules/admin/verbs/adminhelp_vr.dm b/code/modules/admin/verbs/adminhelp_vr.dm index 5296065f2f..bd8d9a7b77 100644 --- a/code/modules/admin/verbs/adminhelp_vr.dm +++ b/code/modules/admin/verbs/adminhelp_vr.dm @@ -6,7 +6,7 @@ Reason: Replaced with "Tickets System" */ /datum/admin_help/proc/send2adminchat() - if(!CONFIG_GET(string/chat_webhook_url)) // CHOMPEdit + if(!CONFIG_GET(string/chat_webhook_url)) return var/list/adm = get_admin_counts() @@ -15,12 +15,12 @@ Reason: Replaced with "Tickets System" 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_GET(string/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_GET(string/chat_webhook_url)]?[query_string]") // CHOMPEdit + world.Export("[CONFIG_GET(string/chat_webhook_url)]?[query_string]") /client/verb/adminspice() set category = "Admin" diff --git a/code/modules/admin/verbs/adminjump.dm b/code/modules/admin/verbs/adminjump.dm index 2d50ec7e83..83847d51db 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|R_EVENT)) return - if(!CONFIG_GET(flag/allow_admin_jump)) // CHOMPEdit + if(!CONFIG_GET(flag/allow_admin_jump)) tgui_alert_async(usr, "Admin jumping disabled") return @@ -36,7 +36,7 @@ set category = "Admin.Game" //CHOMPEdit if(!check_rights(R_ADMIN|R_MOD|R_DEBUG|R_EVENT)) return - if(CONFIG_GET(flag/allow_admin_jump)) // CHOMPEdit + if(CONFIG_GET(flag/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() @@ -59,7 +59,7 @@ /// Performs the jumps, also called from admin Topic() for JMP links /client/proc/do_jumptomob(var/mob/M) - if(!CONFIG_GET(flag/allow_admin_jump)) // CHOMPEdit + if(!CONFIG_GET(flag/allow_admin_jump)) tgui_alert_async(usr, "Admin jumping disabled") return @@ -86,7 +86,7 @@ if(!check_rights(R_ADMIN|R_MOD|R_DEBUG|R_EVENT)) return - if (CONFIG_GET(flag/allow_admin_jump)) // CHOMPEdit + if (CONFIG_GET(flag/allow_admin_jump)) if(src.mob) var/mob/A = src.mob A.on_mob_jump() @@ -108,7 +108,7 @@ if(!check_rights(R_ADMIN|R_MOD|R_DEBUG|R_EVENT)) return - if(CONFIG_GET(flag/allow_admin_jump)) // CHOMPEdit + if(CONFIG_GET(flag/allow_admin_jump)) var/list/keys = list() for(var/mob/M in player_list) keys += M.client @@ -132,7 +132,7 @@ if(!check_rights(R_ADMIN|R_MOD|R_DEBUG|R_EVENT)) return - if(CONFIG_GET(flag/allow_admin_jump)) // CHOMPEdit + if(CONFIG_GET(flag/allow_admin_jump)) if(!M) //VOREStation Edit M = tgui_input_list(usr, "Pick a mob:", "Get Mob", mob_list) //VOREStation Edit if(!M) @@ -155,7 +155,7 @@ if(!check_rights(R_ADMIN|R_MOD|R_DEBUG|R_EVENT)) return - if(CONFIG_GET(flag/allow_admin_jump)) // CHOMPEdit + if(CONFIG_GET(flag/allow_admin_jump)) var/list/keys = list() for(var/mob/M in player_list) keys += M.client @@ -183,7 +183,7 @@ if(!check_rights(R_ADMIN|R_MOD|R_DEBUG|R_EVENT)) return - if(CONFIG_GET(flag/allow_admin_jump)) // CHOMPEdit + if(CONFIG_GET(flag/allow_admin_jump)) var/area/A = tgui_input_list(usr, "Pick an area:", "Send Mob", return_sorted_areas()) if(!A) return @@ -208,7 +208,7 @@ if(!check_rights(R_ADMIN|R_DEBUG|R_EVENT)) return - if(CONFIG_GET(flag/allow_admin_jump)) // CHOMPEdit + if(CONFIG_GET(flag/allow_admin_jump)) if(isnull(tx)) tx = tgui_input_number(usr, "Select X coordinate", "Move Atom", null, null) if(!tx) return diff --git a/code/modules/admin/verbs/adminpm.dm b/code/modules/admin/verbs/adminpm.dm index 3dbb578997..d49506792f 100644 --- a/code/modules/admin/verbs/adminpm.dm +++ b/code/modules/admin/verbs/adminpm.dm @@ -183,7 +183,7 @@ 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_GET(flag/popup_admin_pm)) // CHOMPEdit + if(CONFIG_GET(flag/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 09e5ad9dc3..aaeb82bae4 100644 --- a/code/modules/admin/verbs/debug.dm +++ b/code/modules/admin/verbs/debug.dm @@ -64,9 +64,9 @@ to_chat(user, span_notice("\The [I] does [DPS] damage per second.")) if(DPS > 0) to_chat(user, span_notice("At your maximum health ([user.getMaxHealth()]), it would take approximately;")) - to_chat(user, span_notice("[(user.getMaxHealth() - CONFIG_GET(number/health_threshold_softcrit)) / DPS] seconds to softcrit you. ([CONFIG_GET(number/health_threshold_softcrit)] health)")) // CHOMPEdit - to_chat(user, span_notice("[(user.getMaxHealth() - CONFIG_GET(number/health_threshold_crit)) / DPS] seconds to hardcrit you. ([CONFIG_GET(number/health_threshold_crit)] health)")) // CHOMPEdit - to_chat(user, span_notice("[(user.getMaxHealth() - CONFIG_GET(number/health_threshold_dead)) / DPS] seconds to kill you. ([CONFIG_GET(number/health_threshold_dead)] health)")) // CHOMPEdit + to_chat(user, span_notice("[(user.getMaxHealth() - CONFIG_GET(number/health_threshold_softcrit)) / DPS] seconds to softcrit you. ([CONFIG_GET(number/health_threshold_softcrit)] health)")) + to_chat(user, span_notice("[(user.getMaxHealth() - CONFIG_GET(number/health_threshold_crit)) / DPS] seconds to hardcrit you. ([CONFIG_GET(number/health_threshold_crit)] health)")) + to_chat(user, span_notice("[(user.getMaxHealth() - CONFIG_GET(number/health_threshold_dead)) / DPS] seconds to kill you. ([CONFIG_GET(number/health_threshold_dead)] health)")) else to_chat(user, span_warning("You need to be a living mob, with hands, and for an object to be in your active hand, to use this verb.")) @@ -206,9 +206,9 @@ set category = "Server.Game" //CHOMPEdit set name = "Toggle Aliens" - CONFIG_SET(flag/aliens_allowed, !CONFIG_GET(flag/aliens_allowed)) // CHOMPEdit - log_admin("[key_name(src)] has turned aliens [CONFIG_GET(flag/aliens_allowed) ? "on" : "off"].") // CHOMPEdit - message_admins("[key_name_admin(src)] has turned aliens [CONFIG_GET(flag/aliens_allowed) ? "on" : "off"].", 0) // CHOMPEdit + CONFIG_SET(flag/aliens_allowed, !CONFIG_GET(flag/aliens_allowed)) + log_admin("[key_name(src)] has turned aliens [CONFIG_GET(flag/aliens_allowed) ? "on" : "off"].") + message_admins("[key_name_admin(src)] has turned aliens [CONFIG_GET(flag/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/fps.dm b/code/modules/admin/verbs/fps.dm index 829294689b..cfc5766e28 100644 --- a/code/modules/admin/verbs/fps.dm +++ b/code/modules/admin/verbs/fps.dm @@ -8,12 +8,12 @@ if(!check_rights(R_DEBUG)) return - var/new_fps = round(tgui_input_number(usr, "Sets game frames-per-second. Can potentially break the game (default: [CONFIG_GET(number/fps)])", "FPS", world.fps, round(CONFIG_GET(number/fps) * 1.5))) // CHOMPEdit + var/new_fps = round(tgui_input_number(usr, "Sets game frames-per-second. Can potentially break the game (default: [CONFIG_GET(number/fps)])", "FPS", world.fps), round(CONFIG_GET(number/fps) * 1.5)) if(new_fps <= 0) to_chat(src, span_danger("Error: set_server_fps(): Invalid world.fps value. No changes made.")) return - if(new_fps > CONFIG_GET(number/fps) * 1.5) // CHOMPEdit - if(tgui_alert(src, "You are setting fps to a high value:\n\t[new_fps] frames-per-second\n\tconfig.fps = [CONFIG_GET(number/fps)]", "Warning!", list("Confirm", "ABORT-ABORT-ABORT")) != "Confirm") // CHOMPEdit + if(new_fps > CONFIG_GET(number/fps) * 1.5) + if(tgui_alert(src, "You are setting fps to a high value:\n\t[new_fps] frames-per-second\n\tconfig.fps = [CONFIG_GET(number/fps)]", "Warning!", list("Confirm", "ABORT-ABORT-ABORT")) != "Confirm") return var/msg = "[key_name(src)] has modified world.fps to [new_fps]" diff --git a/code/modules/admin/verbs/panicbunker.dm b/code/modules/admin/verbs/panicbunker.dm index 678a744688..7d5910247c 100644 --- a/code/modules/admin/verbs/panicbunker.dm +++ b/code/modules/admin/verbs/panicbunker.dm @@ -5,13 +5,13 @@ if(!check_rights(R_ADMIN)) return - if (!CONFIG_GET(flag/sql_enabled)) // CHOMPEdit + if (!CONFIG_GET(flag/sql_enabled)) to_chat(usr, span_adminnotice("The Database is not enabled!")) return - CONFIG_SET(flag/panic_bunker, !CONFIG_GET(flag/panic_bunker)) // CHOMPEdit + CONFIG_SET(flag/panic_bunker, !CONFIG_GET(flag/panic_bunker)) - log_and_message_admins("[key_name(usr)] has toggled the Panic Bunker, it is now [(CONFIG_GET(flag/panic_bunker) ? "on" : "off")].") // CHOMPEdit + log_and_message_admins("[key_name(usr)] has toggled the Panic Bunker, it is now [(CONFIG_GET(flag/panic_bunker) ? "on":"off")].") if (CONFIG_GET(flag/panic_bunker) && (!SSdbcore.IsConnected())) //CHOMPEdit TGSQL 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! @@ -23,9 +23,9 @@ if(!check_rights(R_ADMIN)) return - CONFIG_SET(flag/paranoia_logging, !CONFIG_GET(flag/paranoia_logging)) // CHOMPEdit + CONFIG_SET(flag/paranoia_logging, !CONFIG_GET(flag/paranoia_logging)) - log_and_message_admins("[key_name(usr)] has toggled Paranoia Logging, it is now [(CONFIG_GET(flag/paranoia_logging) ? "on" : "off")].") // CHOMPEdit + log_and_message_admins("[key_name(usr)] has toggled Paranoia Logging, it is now [(CONFIG_GET(flag/paranoia_logging) ? "on":"off")].") if (CONFIG_GET(flag/paranoia_logging) && (!SSdbcore.IsConnected())) //CHOMPEdit TGSQL 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! @@ -37,9 +37,9 @@ if(!check_rights(R_ADMIN)) return - CONFIG_SET(flag/ip_reputation, !CONFIG_GET(flag/ip_reputation)) // CHOMPEdit + CONFIG_SET(flag/ip_reputation, !CONFIG_GET(flag/ip_reputation)) - log_and_message_admins("[key_name(usr)] has toggled IP reputation checks, it is now [(CONFIG_GET(flag/ip_reputation) ? "on" : "off")].") // CHOMPEdit + log_and_message_admins("[key_name(usr)] has toggled IP reputation checks, it is now [(CONFIG_GET(flag/ip_reputation) ? "on":"off")].") if (CONFIG_GET(flag/ip_reputation) && (!SSdbcore.IsConnected())) //CHOMPEdit TGSQL message_admins("The database is not connected! IP reputation logging will not be able to allow existing players to bypass the reputation checks (if that is enabled).") feedback_add_details("admin_verb","IPREP") //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 8412413ffc..75cc598f1f 100644 --- a/code/modules/admin/verbs/playsound.dm +++ b/code/modules/admin/verbs/playsound.dm @@ -119,7 +119,7 @@ var/list/sounds_cache = list() /proc/web_sound(mob/user, input, credit) if(!check_rights(R_SOUNDS)) return - var/ytdl = CONFIG_GET(string/invoke_youtubedl) // CHOMPEdit + var/ytdl = CONFIG_GET(string/invoke_youtubedl) if(!ytdl) to_chat(user, span_boldwarning("Youtube-dl was not configured, action unavailable"), confidential = TRUE) //Check config.txt for the INVOKE_YOUTUBEDL value return @@ -220,7 +220,7 @@ var/list/sounds_cache = list() if(!check_rights(R_SOUNDS)) return - var/ytdl = CONFIG_GET(string/invoke_youtubedl) // CHOMPEdit + var/ytdl = CONFIG_GET(string/invoke_youtubedl) if(!ytdl) to_chat(src, span_boldwarning("Youtube-dl was not configured, action unavailable"), confidential = TRUE) //Check config.txt for the INVOKE_YOUTUBEDL value return diff --git a/code/modules/admin/verbs/possess.dm b/code/modules/admin/verbs/possess.dm index b9d71b83e7..0ce3fd727e 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_GET(flag/forbid_singulo_possession)) // CHOMPEdit + if(CONFIG_GET(flag/forbid_singulo_possession)) to_chat(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 985b2ba87d..0d0eff927b 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -173,7 +173,7 @@ /proc/cmd_admin_mute(mob/M as mob, mute_type, automute = 0) if(automute) - if(!CONFIG_GET(flag/automute_on)) // CHOMPEdit + if(!CONFIG_GET(flag/automute_on)) return else if(!usr || !usr.client) @@ -321,7 +321,7 @@ Ccomp's first proc. return var/action="" - if(CONFIG_GET(flag/antag_hud_allowed)) // CHOMPEdit + if(CONFIG_GET(flag/antag_hud_allowed)) for(var/mob/observer/dead/g in get_ghosts()) if(!g.client.holder) //Remove the verb from non-admin ghosts remove_verb(g, /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 to_chat(g, span_boldwarning("The Administrator has disabled AntagHUD ")) - CONFIG_SET(flag/antag_hud_allowed, FALSE) // CHOMPEdit + CONFIG_SET(flag/antag_hud_allowed, FALSE) to_chat(src, span_boldwarning("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 add_verb(g, /mob/observer/dead/verb/toggle_antagHUD) to_chat(g, span_boldnotice("The Administrator has enabled AntagHUD")) // Notify all observers they can now use AntagHUD - CONFIG_SET(flag/antag_hud_allowed, TRUE) // CHOMPEdit + CONFIG_SET(flag/antag_hud_allowed, TRUE) action = "enabled" to_chat(src, span_boldnotice("AntagHUD usage has been enabled")) @@ -356,11 +356,11 @@ Ccomp's first proc. return var/action="" - if(CONFIG_GET(flag/antag_hud_restricted)) // CHOMPEdit + if(CONFIG_GET(flag/antag_hud_restricted)) for(var/mob/observer/dead/g in get_ghosts()) to_chat(g, span_boldnotice("The administrator has lifted restrictions on joining the round if you use AntagHUD")) action = "lifted restrictions" - CONFIG_SET(flag/antag_hud_restricted, FALSE) // CHOMPEdit + CONFIG_SET(flag/antag_hud_restricted, FALSE) to_chat(src, span_boldnotice("AntagHUD restrictions have been lifted")) else for(var/mob/observer/dead/g in get_ghosts()) @@ -369,7 +369,7 @@ Ccomp's first proc. g.antagHUD = 0 g.has_enabled_antagHUD = 0 action = "placed restrictions" - CONFIG_SET(flag/antag_hud_restricted, TRUE) // CHOMPEdit + CONFIG_SET(flag/antag_hud_restricted, TRUE) to_chat(src, span_boldwarning("AntagHUD restrictions have been enabled")) log_admin("[key_name(usr)] has [action] on joining the round if they use AntagHUD") @@ -634,7 +634,7 @@ Traitors and the like can also be revived with the previous role mostly intact. if(!istype(M)) tgui_alert_async(usr, "Cannot revive a ghost") return - if(CONFIG_GET(flag/allow_admin_rev)) // CHOMPEdit + if(CONFIG_GET(flag/allow_admin_rev)) M.revive() log_admin("[key_name(usr)] healed / revived [key_name(M)]") @@ -1029,12 +1029,12 @@ Traitors and the like can also be revived with the previous role mostly intact. if(!check_rights(R_SERVER)) return //VOREStation Edit - if(!CONFIG_GET(flag/allow_random_events)) // CHOMPEdit - CONFIG_SET(flag/allow_random_events, TRUE) // CHOMPEdit + if(!CONFIG_GET(flag/allow_random_events)) + CONFIG_SET(flag/allow_random_events, TRUE) to_chat(usr, "Random events enabled") message_admins("Admin [key_name_admin(usr)] has enabled random events.", 1) else - CONFIG_SET(flag/allow_random_events, FALSE) // CHOMPEdit + CONFIG_SET(flag/allow_random_events, FALSE) to_chat(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/asset_cache/asset_list.dm b/code/modules/asset_cache/asset_list.dm index 4e070e705c..da1670729a 100644 --- a/code/modules/asset_cache/asset_list.dm +++ b/code/modules/asset_cache/asset_list.dm @@ -61,7 +61,7 @@ GLOBAL_LIST_EMPTY(asset_datums) /// Returns whether or not the asset should attempt to read from cache /datum/asset/proc/should_refresh() - return !cross_round_cachable || !CONFIG_GET(flag/cache_assets) // CHOMPEdit + return !cross_round_cachable || !CONFIG_GET(flag/cache_assets) /// Simply takes any generated file and saves it to the round-specific /logs folder. Useful for debugging potential issues with spritesheet generation/display. /// Only called when the SAVE_SPRITESHEETS config option is uncommented. @@ -180,7 +180,7 @@ GLOBAL_LIST_EMPTY(asset_datums) return // If it's cached, may as well load it now, while the loading is cheap - if(CONFIG_GET(flag/cache_assets) && cross_round_cachable) // CHOMPEdit + if(CONFIG_GET(flag/cache_assets) && cross_round_cachable) load_immediately = TRUE create_spritesheets() @@ -209,12 +209,12 @@ GLOBAL_LIST_EMPTY(asset_datums) text2file(generate_css(), file_directory) SSassets.transport.register_asset(css_name, fcopy_rsc(file_directory)) - if(CONFIG_GET(flag/save_spritesheets)) // CHOMPEdit + if(CONFIG_GET(flag/save_spritesheets)) save_to_logs(file_name = css_name, file_location = file_directory) fdel(file_directory) - if (CONFIG_GET(flag/cache_assets) && cross_round_cachable) // CHOMPEdit + if (CONFIG_GET(flag/cache_assets) && cross_round_cachable) write_to_cache() fully_generated = TRUE // If we were ever in there, remove ourselves @@ -267,7 +267,7 @@ GLOBAL_LIST_EMPTY(asset_datums) size[SPRSZ_STRIPPED] = icon(file_directory) // this is useful here for determining if weird sprite issues (like having a white background) are a cause of what we're doing DM-side or not since we can see the full flattened thing at-a-glance. - if(CONFIG_GET(flag/save_spritesheets)) // CHOMPEdit + if(CONFIG_GET(flag/save_spritesheets)) save_to_logs(file_name = png_name, file_location = file_directory) fdel(file_directory) @@ -321,7 +321,7 @@ GLOBAL_LIST_EMPTY(asset_datums) rustg_file_write(replaced_css, replaced_css_filename) SSassets.transport.register_asset(finalized_name, replaced_css_filename) - if(CONFIG_GET(flag/save_spritesheets)) // CHOMPEdit + if(CONFIG_GET(flag/save_spritesheets)) save_to_logs(file_name = finalized_name, file_location = replaced_css_filename) fdel(replaced_css_filename) diff --git a/code/modules/asset_cache/transports/asset_transport.dm b/code/modules/asset_cache/transports/asset_transport.dm index 6195f68e37..db19277abf 100644 --- a/code/modules/asset_cache/transports/asset_transport.dm +++ b/code/modules/asset_cache/transports/asset_transport.dm @@ -12,14 +12,14 @@ /// Called when the transport is loaded by the config controller, not called on the default transport unless it gets loaded by a config change. /datum/asset_transport/proc/Load() - if (CONFIG_GET(flag/asset_simple_preload)) // CHOMPEdit + if (CONFIG_GET(flag/asset_simple_preload)) for(var/client/C in GLOB.clients) addtimer(CALLBACK(src, PROC_REF(send_assets_slow), C, preload), 1 SECONDS) /// Initialize - Called when SSassets initializes. /datum/asset_transport/proc/Initialize(list/assets) preload = assets.Copy() - if (!CONFIG_GET(flag/asset_simple_preload)) // CHOMPEdit + if (!CONFIG_GET(flag/asset_simple_preload)) return for(var/client/C in GLOB.clients) addtimer(CALLBACK(src, PROC_REF(send_assets_slow), C, preload), 1 SECONDS) diff --git a/code/modules/asset_cache/transports/webroot_transport.dm b/code/modules/asset_cache/transports/webroot_transport.dm index 9b40940eaa..e3cb33b8fa 100644 --- a/code/modules/asset_cache/transports/webroot_transport.dm +++ b/code/modules/asset_cache/transports/webroot_transport.dm @@ -25,7 +25,7 @@ /// Saves the asset to the webroot taking into account namespaces and hashes. /datum/asset_transport/webroot/proc/save_asset_to_webroot(datum/asset_cache_item/ACI) - var/webroot = CONFIG_GET(string/asset_cdn_webroot) // CHOMPEdit + var/webroot = CONFIG_GET(string/asset_cdn_webroot) var/newpath = "[webroot][get_asset_suffex(ACI)]" if (fexists(newpath)) return @@ -39,7 +39,7 @@ /datum/asset_transport/webroot/get_asset_url(asset_name, datum/asset_cache_item/asset_cache_item) if (!istype(asset_cache_item)) asset_cache_item = SSassets.cache[asset_name] - var/url = CONFIG_GET(string/asset_cdn_url) //config loading will handle making sure this ends in a / // CHOMPEdit + var/url = CONFIG_GET(string/asset_cdn_url) //config loading will handle making sure this ends in a / return "[url][get_asset_suffex(asset_cache_item)]" /datum/asset_transport/webroot/proc/get_asset_suffex(datum/asset_cache_item/asset_cache_item) @@ -76,11 +76,11 @@ return FALSE /datum/asset_transport/webroot/validate_config(log = TRUE) - if (!CONFIG_GET(string/asset_cdn_url)) // CHOMPEdit + if (!CONFIG_GET(string/asset_cdn_url)) if (log) log_asset("ERROR: [type]: Invalid Config: ASSET_CDN_URL") return FALSE - if (!CONFIG_GET(string/asset_cdn_webroot)) // CHOMPEdit + if (!CONFIG_GET(string/asset_cdn_webroot)) if (log) log_asset("ERROR: [type]: Invalid Config: ASSET_CDN_WEBROOT") return FALSE diff --git a/code/modules/awaymissions/gateway.dm b/code/modules/awaymissions/gateway.dm index 223bab6a72..149d2e9d28 100644 --- a/code/modules/awaymissions/gateway.dm +++ b/code/modules/awaymissions/gateway.dm @@ -43,7 +43,7 @@ GLOBAL_DATUM(gateway_station, /obj/machinery/gateway/centerstation) GLOB.gateway_station = src update_icon() - wait = world.time + CONFIG_GET(number/gateway_delay) //+ thirty minutes default // CHOMPEdit + wait = world.time + CONFIG_GET(number/gateway_delay) //+ thirty minutes default if(GLOB.gateway_away) awaygate = GLOB.gateway_away diff --git a/code/modules/client/client procs.dm b/code/modules/client/client procs.dm index 0098b7bed7..f9bb791283 100644 --- a/code/modules/client/client procs.dm +++ b/code/modules/client/client procs.dm @@ -122,7 +122,7 @@ stat_panel.reinitialize() //CHOMPEdit //Logs all hrefs - if(config && CONFIG_GET(flag/log_hrefs) && href_logfile) // CHOMPEdit + if(config && CONFIG_GET(flag/log_hrefs) && href_logfile) WRITE_LOG(href_logfile, "[src] (usr:[usr]) || [hsrc ? "[hsrc] " : ""][href]") //byond bug ID:2256651 @@ -192,7 +192,7 @@ if(byond_version < MIN_CLIENT_VERSION) //Out of date client. return null - if(!CONFIG_GET(flag/guests_allowed) && IsGuestKey(key)) // CHOMPEdit + if(!CONFIG_GET(flag/guests_allowed) && IsGuestKey(key)) alert(src,"This server doesn't allow guest accounts to play. Please go to https://www.byond.com/ and register for a key.","Guest") // Not tgui_alert del(src) return @@ -297,7 +297,7 @@ if(CONFIG_GET(flag/aggressive_changelog)) // CHOMPEdit src.changes() - if(CONFIG_GET(flag/paranoia_logging)) // CHOMPEdit + if(CONFIG_GET(flag/paranoia_logging)) var/alert = FALSE //VOREStation Edit start. if(isnum(player_age) && player_age == 0) log_and_message_admins("PARANOIA: [key_name(src)] has connected here for the first time.") @@ -426,29 +426,30 @@ //Panic bunker code if (isnum(player_age) && player_age == 0) //first connection - if (CONFIG_GET(flag/panic_bunker) && !holder && !deadmin_holder) // CHOMPEdit + if (CONFIG_GET(flag/panic_bunker) && !holder && !deadmin_holder) log_adminwarn("Failed Login: [key] - New account attempting to connect during panic bunker") message_admins(span_adminnotice("Failed Login: [key] - New account attempting to connect during panic bunker")) disconnect_with_message("Sorry but the server is currently not accepting connections from never before seen players.") return 0 // IP Reputation Check - if(CONFIG_GET(flag/ip_reputation)) // CHOMPEdit - if(CONFIG_GET(flag/ipr_allow_existing) && player_age >= CONFIG_GET(number/ipr_minimum_age)) // CHOMPEdit + if(CONFIG_GET(flag/ip_reputation)) + if(CONFIG_GET(flag/ipr_allow_existing) && player_age >= CONFIG_GET(number/ipr_minimum_age)) log_admin("Skipping IP reputation check on [key] with [address] because of player age") else if(update_ip_reputation()) //It is set now - if(ip_reputation >= CONFIG_GET(number/ipr_bad_score)) //It's bad // CHOMPEdit + if(ip_reputation >= CONFIG_GET(number/ipr_bad_score)) //It's bad + //Log it - if(CONFIG_GET(flag/paranoia_logging)) //We don't block, but we want paranoia log messages // CHOMPEdit + if(CONFIG_GET(flag/paranoia_logging)) //We don't block, but we want paranoia log messages log_and_message_admins("[key] at [address] has bad IP reputation: [ip_reputation]. Will be kicked if enabled in config.") else //We just log it log_admin("[key] at [address] has bad IP reputation: [ip_reputation]. Will be kicked if enabled in config.") //Take action if required - if(CONFIG_GET(flag/ipr_block_bad_ips) && CONFIG_GET(flag/ipr_allow_existing)) //We allow players of an age, but you don't meet it // CHOMPEdit - disconnect_with_message("Sorry, we only allow VPN/Proxy/Tor usage for players who have spent at least [CONFIG_GET(number/ipr_minimum_age)] days on the server. If you are unable to use the internet without your VPN/Proxy/Tor, please contact an admin out-of-game to let them know so we can accommodate this.") // CHOMPEdit + if(CONFIG_GET(flag/ipr_block_bad_ips) && CONFIG_GET(flag/ipr_allow_existing)) //We allow players of an age, but you don't meet it + disconnect_with_message("Sorry, we only allow VPN/Proxy/Tor usage for players who have spent at least [CONFIG_GET(number/ipr_minimum_age)] days on the server. If you are unable to use the internet without your VPN/Proxy/Tor, please contact an admin out-of-game to let them know so we can accommodate this.") return 0 - else if(CONFIG_GET(flag/ipr_block_bad_ips)) //We don't allow players of any particular age // CHOMPEdit + else if(CONFIG_GET(flag/ipr_block_bad_ips)) //We don't allow players of any particular age disconnect_with_message("Sorry, we do not accept connections from users via VPN/Proxy/Tor connections. If you believe this is in error, contact an admin out-of-game.") return 0 else @@ -510,7 +511,7 @@ src << browse('code/modules/asset_cache/validate_assets.html', "window=asset_cache_browser") //Precache the client with all other assets slowly, so as to not block other browse() calls - if (CONFIG_GET(flag/asset_simple_preload)) // CHOMPEdit + if (CONFIG_GET(flag/asset_simple_preload)) addtimer(CALLBACK(SSassets.transport, TYPE_PROC_REF(/datum/asset_transport, send_assets_slow), src, SSassets.transport.preload), 5 SECONDS) /mob/proc/MayRespawn() @@ -557,7 +558,7 @@ //You're welcome to replace this proc with your own that does your own cool stuff. //Just set the client's ip_reputation var and make sure it makes sense with your config settings (higher numbers are worse results) /client/proc/update_ip_reputation() - var/request = "https://check.getipintel.net/check.php?ip=[address]&contact=[CONFIG_GET(string/ipr_email)]" // CHOMPEdit + var/request = "https://check.getipintel.net/check.php?ip=[address]&contact=[CONFIG_GET(string/ipr_email)]" var/http[] = world.Export(request) /* Debug @@ -573,7 +574,7 @@ //429 is rate limit exceeded if(text2num(http["STATUS"]) == 429) log_and_message_admins("getipintel.net reports HTTP status 429. IP reputation checking is now disabled. If you see this, let a developer know.") - CONFIG_SET(flag/ip_reputation, FALSE) // CHOMPEdit + CONFIG_SET(flag/ip_reputation, FALSE) return FALSE var/content = file2text(http["CONTENT"]) //world.Export actually returns a file object in CONTENT @@ -604,7 +605,7 @@ log_and_message_admins(ipr_error) if(fatal) - CONFIG_SET(flag/ip_reputation, FALSE) // CHOMPEdit + CONFIG_SET(flag/ip_reputation, FALSE) log_and_message_admins("With this error, IP reputation checking is disabled for this shift. Let a developer know.") return FALSE diff --git a/code/modules/client/client procs_vr.dm b/code/modules/client/client procs_vr.dm index 9f2425d2cb..fdc861aa18 100644 --- a/code/modules/client/client procs_vr.dm +++ b/code/modules/client/client procs_vr.dm @@ -17,10 +17,10 @@ //Service returns a single float in html body /client/proc/ipr_getipintel() - if(!CONFIG_GET(string/ipr_email)) // CHOMPEdit + if(!CONFIG_GET(string/ipr_email)) return -1 - var/request = "https://check.getipintel.net/check.php?ip=[address]&contact=[CONFIG_GET(string/ipr_email)]" // CHOMPEdit + var/request = "https://check.getipintel.net/check.php?ip=[address]&contact=[CONFIG_GET(string/ipr_email)]" var/http[] = world.Export(request) if(!http || !islist(http)) //If we couldn't check, the service might be down, fail-safe. @@ -30,7 +30,7 @@ //429 is rate limit exceeded if(text2num(http["STATUS"]) == 429) log_and_message_admins("getipintel.net reports HTTP status 429. IP reputation checking is now disabled. If you see this, let a developer know.") - CONFIG_SET(flag/ip_reputation, FALSE) // CHOMPEdit + CONFIG_SET(flag/ip_reputation, FALSE) return -1 var/content = file2text(http["CONTENT"]) //world.Export actually returns a file object in CONTENT @@ -61,7 +61,7 @@ log_and_message_admins(ipr_error) if(fatal) - CONFIG_SET(flag/ip_reputation, FALSE) // CHOMPEdit + CONFIG_SET(flag/ip_reputation, FALSE) log_and_message_admins("With this error, IP reputation checking is disabled for this shift. Let a developer know.") return -1 @@ -71,10 +71,10 @@ //Service returns JSON in html body /client/proc/ipr_ipqualityscore() - if(!CONFIG_GET(string/ipqualityscore_apikey)) // CHOMPEdit + if(!CONFIG_GET(string/ipqualityscore_apikey)) return -1 - var/request = "https://www.ipqualityscore.com/api/json/ip/[CONFIG_GET(string/ipqualityscore_apikey)]/[address]?strictness=1&fast=true&byond_key=[key]" // CHOMPEdit + var/request = "https://www.ipqualityscore.com/api/json/ip/[CONFIG_GET(string/ipqualityscore_apikey)]/[address]?strictness=1&fast=true&byond_key=[key]" var/http[] = world.Export(request) if(!http || !islist(http)) //If we couldn't check, the service might be down, fail-safe. diff --git a/code/modules/client/preference_setup/general/01_basic.dm b/code/modules/client/preference_setup/general/01_basic.dm index 9ae3ac9bf6..045a909416 100644 --- a/code/modules/client/preference_setup/general/01_basic.dm +++ b/code/modules/client/preference_setup/general/01_basic.dm @@ -68,7 +68,7 @@ // 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_GET(flag/humans_need_surnames)) // CHOMPEdit + if(CONFIG_GET(flag/humans_need_surnames)) var/firstspace = findtext(pref.real_name, " ") var/name_length = length(pref.real_name) if(!firstspace) //we need a surname @@ -103,7 +103,7 @@ . += span_bold("Pronouns:") + " [gender2text(pref.identifying_gender)]
" . += span_bold("Age:") + " [pref.age] Birthday: [pref.bday_month]/[pref.bday_day] - Announce?: [pref.bday_announce ? "Yes" : "Disabled"]
" //ChompEDIT - DISABLE the announcement . += span_bold("Spawn Point") + ": [pref.spawnpoint]
" - if(CONFIG_GET(flag/allow_metadata)) // CHOMPEdit + if(CONFIG_GET(flag/allow_metadata)) //CHOMPEdit Start . += span_bold("OOC Notes: EditFavsLikesMaybesDislikes") + "
" . += "Detailed field or short list system? [pref.matadata_ooc_style ? "Lists" : "Fields"]

" diff --git a/code/modules/client/preference_setup/general/02_language.dm b/code/modules/client/preference_setup/general/02_language.dm index 0c5ff401b3..033d4f935c 100644 --- a/code/modules/client/preference_setup/general/02_language.dm +++ b/code/modules/client/preference_setup/general/02_language.dm @@ -48,8 +48,8 @@ pref.alternate_languages -= language if(isnull(pref.language_prefixes) || !pref.language_prefixes.len) - var/list/prefixes = CONFIG_GET(str_list/language_prefixes) // CHOMPEdit - pref.language_prefixes = prefixes.Copy() // CHOMPEdit + var/list/prefixes = CONFIG_GET(str_list/language_prefixes) + pref.language_prefixes = prefixes.Copy() for(var/prefix in pref.language_prefixes) if(prefix in forbidden_prefixes) pref.language_prefixes -= prefix @@ -145,8 +145,8 @@ pref.language_prefixes = keys return TOPIC_REFRESH else if(href_list["reset_prefix"]) - var/list/prefixes = CONFIG_GET(str_list/language_prefixes) // CHOMPEdit - pref.language_prefixes = prefixes.Copy() // CHOMPEdit + var/list/prefixes = CONFIG_GET(str_list/language_prefixes) + pref.language_prefixes = prefixes.Copy() return TOPIC_REFRESH else if(href_list["set_custom_key"]) diff --git a/code/modules/client/preference_setup/global/01_ui.dm b/code/modules/client/preference_setup/global/01_ui.dm index b31b82bc57..9c40d06396 100644 --- a/code/modules/client/preference_setup/global/01_ui.dm +++ b/code/modules/client/preference_setup/global/01_ui.dm @@ -179,4 +179,4 @@ return ..() /datum/category_item/player_setup_item/player_global/ui/proc/can_select_ooc_color(var/mob/user) - return CONFIG_GET(flag/allow_admin_ooccolor) && check_rights(R_ADMIN|R_EVENT|R_FUN, 0, user) // CHOMPEdit + return CONFIG_GET(flag/allow_admin_ooccolor) && check_rights(R_ADMIN|R_EVENT|R_FUN, 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 9ccd7b1c21..3fddd3552e 100644 --- a/code/modules/client/preference_setup/global/02_settings.dm +++ b/code/modules/client/preference_setup/global/02_settings.dm @@ -17,4 +17,4 @@ /datum/category_item/player_setup_item/player_global/settings/sanitize_preferences() 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_GET(number/character_slots), initial(pref.default_slot)) // CHOMPEdit + pref.default_slot = sanitize_integer(pref.default_slot, 1, CONFIG_GET(number/character_slots), initial(pref.default_slot)) diff --git a/code/modules/client/preference_setup/loadout/loadout.dm b/code/modules/client/preference_setup/loadout/loadout.dm index 135c3a4811..91035ecd88 100644 --- a/code/modules/client/preference_setup/loadout/loadout.dm +++ b/code/modules/client/preference_setup/loadout/loadout.dm @@ -80,10 +80,10 @@ var/list/gear_datums = list() for(var/gear_name in gear_datums) var/datum/gear/G = gear_datums[gear_name] - if(G.whitelisted && CONFIG_GET(flag/loadout_whitelist) != LOADOUT_WHITELIST_OFF && pref.client) //VOREStation Edit. // CHOMPEdit - if(CONFIG_GET(flag/loadout_whitelist) == LOADOUT_WHITELIST_STRICT && G.whitelisted != pref.species) // CHOMPEdit + if(G.whitelisted && CONFIG_GET(flag/loadout_whitelist) != LOADOUT_WHITELIST_OFF && pref.client) //VOREStation Edit. + if(CONFIG_GET(flag/loadout_whitelist) == LOADOUT_WHITELIST_STRICT && G.whitelisted != pref.species) continue - if(CONFIG_GET(flag/loadout_whitelist) == LOADOUT_WHITELIST_LAX && !is_alien_whitelisted(preference_mob(), GLOB.all_species[G.whitelisted])) // CHOMPEdit + if(CONFIG_GET(flag/loadout_whitelist) == LOADOUT_WHITELIST_LAX && !is_alien_whitelisted(preference_mob(), GLOB.all_species[G.whitelisted])) continue if(max_cost && G.cost > max_cost) @@ -237,14 +237,14 @@ var/list/gear_datums = list() if(href_list["next_slot"]) //change the current slot number pref.gear_slot = pref.gear_slot+1 - if(pref.gear_slot > CONFIG_GET(number/loadout_slots)) // CHOMPEdit + if(pref.gear_slot > CONFIG_GET(number/loadout_slots)) pref.gear_slot = 1 //If we're moving down a slot.. else if(href_list["prev_slot"]) //change current slot one down pref.gear_slot = pref.gear_slot-1 if(pref.gear_slot<1) - pref.gear_slot = CONFIG_GET(number/loadout_slots) // CHOMPEdit + pref.gear_slot = CONFIG_GET(number/loadout_slots) // Set the currently selected gear to whatever's in the new slot if(pref.gear_list["[pref.gear_slot]"]) pref.gear = pref.gear_list["[pref.gear_slot]"] diff --git a/code/modules/client/preference_setup/occupation/occupation.dm b/code/modules/client/preference_setup/occupation/occupation.dm index ea43d57a2f..6b13b3a0e3 100644 --- a/code/modules/client/preference_setup/occupation/occupation.dm +++ b/code/modules/client/preference_setup/occupation/occupation.dm @@ -282,7 +282,7 @@ dat += "You answer to [job.supervisors] normally." dat += "
" - if(CONFIG_GET(string/wikiurl)) // CHOMPEdit + if(CONFIG_GET(string/wikiurl)) dat += "Open wiki page in browser" var/alt_title = pref.GetPlayerAltTitle(job) @@ -300,7 +300,7 @@ else if(href_list["job_wiki"]) var/rank = href_list["job_wiki"] - open_link(user,"[CONFIG_GET(string/wikiurl)][rank]") // CHOMPEdit + open_link(user,"[CONFIG_GET(string/wikiurl)][rank]") return ..() diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index 3e399c4271..3adc6a07c8 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -376,8 +376,8 @@ var/list/preferences_datums = list() if(!istype(user, /mob/new_player)) return if(href_list["preference"] == "open_whitelist_forum") - if(CONFIG_GET(string/forumurl)) // CHOMPEdit - user << link(CONFIG_GET(string/forumurl)) // CHOMPEdit + if(CONFIG_GET(string/forumurl)) + user << link(CONFIG_GET(string/forumurl)) else to_chat(user, span_danger("The forum URL is not set in the server configuration.")) return @@ -464,7 +464,7 @@ var/list/preferences_datums = list() var/default var/list/charlist = list() - for(var/i in 1 to CONFIG_GET(number/character_slots)) //CHOMPEdit + for(var/i in 1 to CONFIG_GET(number/character_slots)) var/list/save_data = savefile.get_entry("character[i]", list()) var/name = save_data["real_name"] var/nickname = save_data["nickname"] @@ -505,7 +505,7 @@ var/list/preferences_datums = list() var/list/charlist = list() - for(var/i in 1 to CONFIG_GET(number/character_slots)) //CHOMPEdit + for(var/i in 1 to CONFIG_GET(number/character_slots)) var/list/save_data = savefile.get_entry("character[i]", list()) var/name = save_data["real_name"] var/nickname = save_data["nickname"] diff --git a/code/modules/client/preferences/migrations/14_nifs.dm b/code/modules/client/preferences/migrations/14_nifs.dm index da2a25a71e..95f039591e 100644 --- a/code/modules/client/preferences/migrations/14_nifs.dm +++ b/code/modules/client/preferences/migrations/14_nifs.dm @@ -2,7 +2,7 @@ /datum/preferences/proc/migration_14_nifs(datum/json_savefile/S) var/datum/json_savefile/new_savefile = new /datum/json_savefile(nif_savefile_path(client_ckey)) - for(var/slot in 1 to CONFIG_GET(number/character_slots)) //CHOMPEdit + for(var/slot in 1 to CONFIG_GET(number/character_slots)) var/list/prefs = S.get_entry("character[slot]", null) if(!islist(prefs)) continue diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm index 58130c3270..b0ec02a892 100644 --- a/code/modules/client/preferences_savefile.dm +++ b/code/modules/client/preferences_savefile.dm @@ -204,7 +204,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car if(!slot) slot = default_slot - slot = sanitize_integer(slot, 1, CONFIG_GET(number/character_slots), initial(default_slot)) // CHOMPEdit + slot = sanitize_integer(slot, 1, CONFIG_GET(number/character_slots), initial(default_slot)) if(slot != default_slot) default_slot = slot savefile.set_entry("default_slot", slot) @@ -261,7 +261,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car // This basically just changes default_slot without loading the correct data, so the next save call will overwrite // the slot - slot = sanitize_integer(slot, 1, CONFIG_GET(number/character_slots), initial(default_slot)) // CHOMPEdit + slot = sanitize_integer(slot, 1, CONFIG_GET(number/character_slots), initial(default_slot)) if(slot != default_slot) default_slot = slot nif_path = nif_durability = nif_savedata = null //VOREStation Add - Don't copy NIF diff --git a/code/modules/client/preferences_tgui.dm b/code/modules/client/preferences_tgui.dm index b5086632b8..69361e1478 100644 --- a/code/modules/client/preferences_tgui.dm +++ b/code/modules/client/preferences_tgui.dm @@ -93,7 +93,7 @@ /datum/preferences/proc/create_character_profiles() var/list/profiles = list() - for(var/index in 1 to CONFIG_GET(number/character_slots)) //CHOMPEdit + for(var/index in 1 to CONFIG_GET(number/character_slots)) // TODO: It won't be updated in the savefile yet, so just read the name directly // if(index == default_slot) // profiles += read_preference(/datum/preference/name/real_name) diff --git a/code/modules/client/verbs/ooc.dm b/code/modules/client/verbs/ooc.dm index 1057851be8..23ef7568b8 100644 --- a/code/modules/client/verbs/ooc.dm +++ b/code/modules/client/verbs/ooc.dm @@ -20,26 +20,26 @@ return if(!holder) - if(!CONFIG_GET(flag/ooc_allowed)) // CHOMPEdit + if(!CONFIG_GET(flag/ooc_allowed)) to_chat(src, span_danger("OOC is globally muted.")) return - if(!CONFIG_GET(flag/dooc_allowed) && (mob.stat == DEAD)) // CHOMPEdit + if(!CONFIG_GET(flag/dooc_allowed) && (mob.stat == DEAD)) to_chat(usr, span_danger("OOC for dead mobs has been turned off.")) return if(prefs.muted & MUTE_OOC) to_chat(src, span_danger("You cannot use OOC (muted).")) return - if(findtext(msg, "byond://") && !CONFIG_GET(flag/allow_byond_links)) // CHOMPEdit + if(findtext(msg, "byond://") && !CONFIG_GET(flag/allow_byond_links)) to_chat(src, span_bold("Advertising other servers is not allowed.")) log_admin("[key_name(src)] has attempted to advertise in OOC: [msg]") message_admins("[key_name_admin(src)] has attempted to advertise in OOC: [msg]") return - if(findtext(msg, "discord.gg") && !CONFIG_GET(flag/allow_discord_links)) // CHOMPEdit + if(findtext(msg, "discord.gg") && !CONFIG_GET(flag/allow_discord_links)) to_chat(src, span_bold("Advertising discords is not allowed.")) log_admin("[key_name(src)] has attempted to advertise a discord server in OOC: [msg]") message_admins("[key_name_admin(src)] has attempted to advertise a discord server in OOC: [msg]") return - if((findtext(msg, "http://") || findtext(msg, "https://")) && !CONFIG_GET(flag/allow_url_links)) // CHOMPEdit + if((findtext(msg, "http://") || findtext(msg, "https://")) && !CONFIG_GET(flag/allow_url_links)) to_chat(src, span_bold("Posting external links is not allowed.")) log_admin("[key_name(src)] has attempted to post a link in OOC: [msg]") message_admins("[key_name_admin(src)] has attempted to post a link in OOC: [msg]") @@ -76,7 +76,7 @@ display_name = "[holder.fakekey]/([src.key])" else display_name = holder.fakekey - if(holder && !holder.fakekey && (holder.rights & R_ADMIN|R_FUN|R_EVENT) && CONFIG_GET(flag/allow_admin_ooccolor) && (src.prefs.ooccolor != initial(src.prefs.ooccolor))) // keeping this for the badmins // CHOMPEdit + if(holder && !holder.fakekey && (holder.rights & R_ADMIN|R_FUN|R_EVENT) && CONFIG_GET(flag/allow_admin_ooccolor) && (src.prefs.ooccolor != initial(src.prefs.ooccolor))) // keeping this for the badmins to_chat(target, span_ooc("" + create_text_tag("ooc", "OOC:", target) + " [display_name]: [span_message(msg)]")) else to_chat(target, span_ooc("" + create_text_tag("ooc", "OOC:", target) + " [display_name]: " + span_message(msg)) + "") @@ -106,26 +106,26 @@ return if(!holder) - if(!CONFIG_GET(flag/looc_allowed)) // CHOMPEdit + if(!CONFIG_GET(flag/looc_allowed)) to_chat(src, span_danger("LOOC is globally muted.")) return - if(!CONFIG_GET(flag/dooc_allowed) && (mob.stat == DEAD)) // CHOMPEdit + if(!CONFIG_GET(flag/dooc_allowed) && (mob.stat == DEAD)) to_chat(usr, span_danger("OOC for dead mobs has been turned off.")) return if(prefs.muted & MUTE_LOOC) to_chat(src, span_danger("You cannot use OOC (muted).")) return - if(findtext(msg, "byond://") && !CONFIG_GET(flag/allow_byond_links)) // CHOMPEdit + if(findtext(msg, "byond://") && !CONFIG_GET(flag/allow_byond_links)) to_chat(src, span_bold("Advertising other servers is not allowed.")) log_admin("[key_name(src)] has attempted to advertise in OOC: [msg]") message_admins("[key_name_admin(src)] has attempted to advertise in OOC: [msg]") return - if(findtext(msg, "discord.gg") && !CONFIG_GET(flag/allow_discord_links)) // CHOMPEdit + if(findtext(msg, "discord.gg") && !CONFIG_GET(flag/allow_discord_links)) to_chat(src, span_bold("Advertising discords is not allowed.")) log_admin("[key_name(src)] has attempted to advertise a discord server in OOC: [msg]") message_admins("[key_name_admin(src)] has attempted to advertise a discord server in OOC: [msg]") return - if((findtext(msg, "http://") || findtext(msg, "https://")) && !CONFIG_GET(flag/allow_url_links)) // CHOMPEdit + if((findtext(msg, "http://") || findtext(msg, "https://")) && !CONFIG_GET(flag/allow_url_links)) to_chat(src, span_bold("Posting external links is not allowed.")) log_admin("[key_name(src)] has attempted to post a link in OOC: [msg]") message_admins("[key_name_admin(src)] has attempted to post a link in OOC: [msg]") diff --git a/code/modules/client/verbs/who.dm b/code/modules/client/verbs/who.dm index 5bae7914b6..18ef749110 100644 --- a/code/modules/client/verbs/who.dm +++ b/code/modules/client/verbs/who.dm @@ -113,13 +113,13 @@ msg = span_bold("Current Admins ([num_admins_online]):") + "\n" + msg - if(CONFIG_GET(flag/show_mods)) // CHOMPEdit - msg += "\n" + span_bold(" Current Moderators ([num_mods_online]):") + "\n" + modmsg //YW EDIT + if(CONFIG_GET(flag/show_mods)) + msg += "\n" + span_bold(" Current Moderators ([num_mods_online]):") + "\n" + modmsg // CHOMPEdit - if(CONFIG_GET(flag/show_devs)) // CHOMPEdit + if(CONFIG_GET(flag/show_devs)) msg += "\n" + span_bold(" Current Developers ([num_devs_online]):") + "\n" + devmsg - if(CONFIG_GET(flag/show_event_managers)) // CHOMPEdit + if(CONFIG_GET(flag/show_event_managers)) msg += "\n" + span_bold(" Current Miscellaneous ([num_event_managers_online]):") + "\n" + eventMmsg var/num_mentors_online = 0 @@ -141,7 +141,7 @@ mmsg += " (AFK - [round(seconds / 60)] minutes, [seconds % 60] seconds)" mmsg += "\n" - if(CONFIG_GET(flag/show_mentors)) // CHOMPEdit + if(CONFIG_GET(flag/show_mentors)) msg += "\n" + span_bold(" Current Mentors ([num_mentors_online]):") + "\n" + mmsg msg += "\n" + span_info("Adminhelps are also sent to Discord. If no admins are available in game try anyway and an admin on Discord may see it and respond.") diff --git a/code/modules/events/event_container.dm b/code/modules/events/event_container.dm index b03054e8f7..15d28de3b5 100644 --- a/code/modules/events/event_container.dm +++ b/code/modules/events/event_container.dm @@ -28,7 +28,7 @@ var/global/list/severity_to_string = list(EVENT_LEVEL_MUNDANE = "Mundane", EVENT if(!next_event_time) set_event_delay() - if(delayed || !CONFIG_GET(flag/allow_random_events)) // CHOMPEdit + if(delayed || !CONFIG_GET(flag/allow_random_events)) next_event_time += (world.time - last_world_time) else if(world.time > next_event_time) start_event() @@ -85,13 +85,12 @@ 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_GET(number/expected_round_length) - time_passed) / 300)) // CHOMPEdit + var/weight_modifier = max(0, round((CONFIG_GET(number/expected_round_length) - time_passed) / 300)) weight = weight - weight_modifier return weight /datum/event_container/proc/set_event_delay() - // CHOMPEdit Start var/list/event_delays switch(severity) @@ -106,7 +105,6 @@ var/global/list/severity_to_string = list(EVENT_LEVEL_MUNDANE = "Mundane", EVENT if(next_event_time == 0 && event_delays) var/lower = (event_delays["lower"] MINUTES) var/upper = (event_delays["upper"] MINUTES) - // CHOMPEdit End var/event_delay = rand(lower, upper) next_event_time = world.time + event_delay // Otherwise, follow the standard setup process @@ -125,7 +123,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_GET(number_list/event_delay_lower)[severity] MINUTES, CONFIG_GET(number_list/event_delay_upper)[severity] MINUTES) * playercount_modifier // CHOMPEdit + var/event_delay = rand(CONFIG_GET(number_list/event_delay_lower)[severity] MINUTES, CONFIG_GET(number_list/event_delay_upper)[severity] MINUTES) * 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 ef05c2630e..6d3699b6d8 100644 --- a/code/modules/events/event_dynamic.dm +++ b/code/modules/events/event_dynamic.dm @@ -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_GET(flag/allow_random_events)) // CHOMPEdit + if(!CONFIG_GET(flag/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 aa9711c0e6..5ab9a91ab4 100644 --- a/code/modules/events/event_manager.dm +++ b/code/modules/events/event_manager.dm @@ -19,7 +19,7 @@ /datum/controller/subsystem/events/proc/GetInteractWindow() var/html = "Refresh" - html += "Pause All - [CONFIG_GET(flag/allow_random_events) ? "Pause" : "Resume"]" // CHOMPEdit + html += "Pause All - [CONFIG_GET(flag/allow_random_events) ? "Pause" : "Resume"]" if(selected_event_container) var/event_time = max(0, selected_event_container.next_event_time - world.time) @@ -153,8 +153,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_SET(flag/allow_random_events, text2num(href_list["pause_all"])) // CHOMPEdit - log_and_message_admins("has [CONFIG_GET(flag/allow_random_events) ? "resumed" : "paused"] countdown for all events.") // CHOMPEdit + CONFIG_SET(flag/allow_random_events, text2num(href_list["pause_all"])) + log_and_message_admins("has [CONFIG_GET(flag/allow_random_events) ? "resumed" : "paused"] countdown for all events.") else if(href_list["interval"]) var/delay = tgui_input_number(usr, "Enter delay modifier. A value less than one means events fire more often, higher than one less often.", "Set Interval Modifier") if(delay && delay > 0) diff --git a/code/modules/ext_scripts/irc.dm b/code/modules/ext_scripts/irc.dm index 6914da7901..2b4d3a5ff5 100644 --- a/code/modules/ext_scripts/irc.dm +++ b/code/modules/ext_scripts/irc.dm @@ -26,16 +26,16 @@ */ /proc/send2mainirc(var/msg) - if(CONFIG_GET(string/main_irc)) // CHOMPEdit - send2irc(CONFIG_GET(string/main_irc), msg) // CHOMPEdit + if(CONFIG_GET(string/main_irc)) + send2irc(CONFIG_GET(string/main_irc), msg) return /proc/send2adminirc(var/msg) - if(CONFIG_GET(string/admin_irc)) // CHOMPEdit - send2irc(CONFIG_GET(string/admin_irc), msg) // CHOMPEdit + if(CONFIG_GET(string/admin_irc)) + send2irc(CONFIG_GET(string/admin_irc), msg) return /hook/startup/proc/ircNotify() - send2mainirc("Server starting up on byond://[CONFIG_GET(string/serverurl) ? CONFIG_GET(string/serverurl) : (CONFIG_GET(string/server) ? CONFIG_GET(string/server) : "[world.address]:[world.port]")]") // CHOMPEdit + send2mainirc("Server starting up on byond://[CONFIG_GET(string/serverurl) ? CONFIG_GET(string/serverurl) : (CONFIG_GET(string/server) ? CONFIG_GET(string/server) : "[world.address]:[world.port]")]") return 1 diff --git a/code/modules/library/lib_items.dm b/code/modules/library/lib_items.dm index bb095088d1..552773d777 100644 --- a/code/modules/library/lib_items.dm +++ b/code/modules/library/lib_items.dm @@ -131,9 +131,9 @@ Book Cart End /obj/structure/bookcase/manuals/medical/New() ..() new /obj/item/book/manual/medical_cloning(src) - new /obj/item/book/manual/wiki/medical_diagnostics_manual(src) // CHOMPEdit - new /obj/item/book/manual/wiki/medical_diagnostics_manual(src) // CHOMPEdit - new /obj/item/book/manual/wiki/medical_diagnostics_manual(src) // CHOMPEdit + new /obj/item/book/manual/wiki/medical_diagnostics_manual(src) + new /obj/item/book/manual/wiki/medical_diagnostics_manual(src) + new /obj/item/book/manual/wiki/medical_diagnostics_manual(src) update_icon() @@ -142,10 +142,10 @@ Book Cart End /obj/structure/bookcase/manuals/engineering/New() ..() - new /obj/item/book/manual/wiki/engineering_construction(src) // CHOMPEdit + new /obj/item/book/manual/wiki/engineering_construction(src) new /obj/item/book/manual/engineering_particle_accelerator(src) - new /obj/item/book/manual/wiki/engineering_hacking(src) // CHOMPEdit - new /obj/item/book/manual/wiki/engineering_guide(src) // CHOMPEdit + new /obj/item/book/manual/wiki/engineering_hacking(src) + new /obj/item/book/manual/wiki/engineering_guide(src) new /obj/item/book/manual/atmospipes(src) new /obj/item/book/manual/engineering_singularity_safety(src) new /obj/item/book/manual/evaguide(src) @@ -199,7 +199,7 @@ Book Cart End to_chat(user, span_notice("The pages of [title] have been cut out!")) return if(src.dat) - display_content(user) // CHOMPEdit + display_content(user) user.visible_message("[user] opens a book titled \"[src.title]\" and begins reading intently.") playsound(src, 'sound/bureaucracy/bookopen.ogg', 50, 1) onclose(user, "book") @@ -207,11 +207,9 @@ Book Cart End else to_chat(user, "This book is completely blank!") -// CHOMPEdit Start /// Proc that handles sending the book information to the user, as well as some housekeeping stuff. /obj/item/book/proc/display_content(mob/living/user) user << browse("Penned by [author].
" + "[dat]", "window=book") -// CHOMPEdit End /obj/item/book/attackby(obj/item/W as obj, mob/user as mob) if(carved) @@ -303,7 +301,7 @@ Book Cart End if(user.zone_sel.selecting == O_EYES) user.visible_message(span_notice("You open up the book and show it to [M]."), \ span_notice(" [user] opens up a book and shows it to [M].")) - display_content(M) // CHOMPEdit + display_content(M) user.setClickCooldown(DEFAULT_QUICK_COOLDOWN) //to prevent spam /* diff --git a/code/modules/library/lib_machines.dm b/code/modules/library/lib_machines.dm index 1a72636269..f088c6011b 100644 --- a/code/modules/library/lib_machines.dm +++ b/code/modules/library/lib_machines.dm @@ -44,7 +44,7 @@ Filter by Author: [author]
\[Start Search\]
"} if(1) - establish_old_db_connection() + establish_db_connection() if(!SSdbcore.IsConnected()) //CHOMPEdit TGSQL dat += span_red(span_bold("ERROR") + ": Unable to contact External Archive. Please contact your system administrator for assistance.") + "
" else if(!SQLquery) @@ -281,7 +281,7 @@ No.
"} if(8) dat += "

External Archive

" //VOREStation Edit - establish_old_db_connection() + establish_db_connection() //dat += "

" + span_red("arning: System Administrator has slated this archive for removal. Personal uploads should be taken to the NT board of internal literature.") + "

" //VOREStation Removal @@ -320,7 +320,7 @@ var/dat = "Book Inventory Management\n" // dat += "

ADMINISTRATIVE MANAGEMENT

" - establish_old_db_connection() + establish_db_connection() if(!SSdbcore.IsConnected()) dat += span_red(span_bold("ERROR") + ": Unable to contact External Archive. Please contact your system administrator for assistance.") @@ -441,7 +441,7 @@ if(scanner.cache.unique) tgui_alert_async(usr, "This book has been rejected from the database. Aborting!") else - establish_old_db_connection() + establish_db_connection() if(!SSdbcore.IsConnected()) //CHOMPEdit TGSQL tgui_alert_async(usr, "Connection to Archive has been severed. Aborting.") else @@ -467,7 +467,7 @@ if(href_list["targetid"]) var/sqlid = sanitizeSQL(href_list["targetid"]) - establish_old_db_connection() + establish_db_connection() if(!SSdbcore.IsConnected()) //CHOMPEdit TGSQL tgui_alert_async(usr, "Connection to Archive has been severed. Aborting.") if(bibledelay) diff --git a/code/modules/lighting/lighting_overlay.dm b/code/modules/lighting/lighting_overlay.dm index 69465db23e..7faedb0a2a 100644 --- a/code/modules/lighting/lighting_overlay.dm +++ b/code/modules/lighting/lighting_overlay.dm @@ -30,8 +30,9 @@ affected_turf.lighting_object = src affected_turf.set_luminosity(0) - for(var/turf/space/space_tile in RANGE_TURFS(1, affected_turf)) - space_tile.update_starlight() + if(CONFIG_GET(flag/starlight)) + for(var/turf/space/space_tile in RANGE_TURFS(1, affected_turf)) + space_tile.update_starlight() needs_update = TRUE SSlighting.objects_queue += src diff --git a/code/modules/mob/_modifiers/unholy.dm b/code/modules/mob/_modifiers/unholy.dm index a4743a5307..0f4ab94db9 100644 --- a/code/modules/mob/_modifiers/unholy.dm +++ b/code/modules/mob/_modifiers/unholy.dm @@ -132,7 +132,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_GET(number/organ_health_multiplier)) && (affected.status & ORGAN_BROKEN)) // CHOMPEdit + if((affected.damage < affected.min_broken_damage * CONFIG_GET(number/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 5cbc48c8c4..81ce137cb7 100644 --- a/code/modules/mob/dead/observer/observer.dm +++ b/code/modules/mob/dead/observer/observer.dm @@ -324,13 +324,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_GET(flag/antag_hud_allowed) && !client.holder) // CHOMPEdit + if(!CONFIG_GET(flag/antag_hud_allowed) && !client.holder) to_chat(src, span_filter_notice(span_red("Admins have disabled this for this round."))) return if(jobban_isbanned(src, JOB_ANTAGHUD)) to_chat(src, span_filter_notice(span_red(span_bold("You have been banned from using this feature")))) return - if(CONFIG_GET(flag/antag_hud_restricted) && !has_enabled_antagHUD && !client.holder) // CHOMPEdit + if(CONFIG_GET(flag/antag_hud_restricted) && !has_enabled_antagHUD && !client.holder) var/response = tgui_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?",list("Yes","No")) if(response != "Yes") return can_reenter_corpse = FALSE @@ -661,7 +661,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.Join" //CHOMPEdit - if(CONFIG_GET(flag/disable_player_mice)) // CHOMPEdit + if(CONFIG_GET(flag/disable_player_mice)) to_chat(src, span_warning("Spawning as a mouse is currently disabled.")) return @@ -704,7 +704,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp to_chat(src, span_warning("Unable to find any unwelded vents to spawn mice at.")) if(host) - if(CONFIG_GET(flag/uneducated_mice)) // CHOMPEdit + if(CONFIG_GET(flag/uneducated_mice)) host.universal_understand = 0 announce_ghost_joinleave(src, 0, "They are now a mouse.") host.ckey = src.ckey @@ -734,7 +734,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_GET(flag/cult_ghostwriter)) // CHOMPEdit + if(!CONFIG_GET(flag/cult_ghostwriter)) to_chat(src, span_filter_notice(span_red("That verb is not currently permitted."))) return @@ -746,7 +746,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_GET(number/cult_ghostwriter_req_cultists)) // CHOMPEdit + if(cult.current_antagonists.len > CONFIG_GET(number/cult_ghostwriter_req_cultists)) ghosts_can_write = 1 if(!ghosts_can_write && !check_rights(R_ADMIN|R_EVENT|R_FUN, 0)) //Let's allow for admins to write in blood for events and the such. @@ -926,7 +926,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp if(feedback) to_chat(src, span_warning("Your non-dead body prevent you from respawning.")) return 0 - if(CONFIG_GET(flag/antag_hud_restricted) && has_enabled_antagHUD == 1) // CHOMPEdit + if(CONFIG_GET(flag/antag_hud_restricted) && has_enabled_antagHUD == 1) if(feedback) to_chat(src, span_warning("antagHUD restrictions prevent you from respawning.")) return 0 diff --git a/code/modules/mob/emote.dm b/code/modules/mob/emote.dm index 93791083b1..218289215a 100644 --- a/code/modules/mob/emote.dm +++ b/code/modules/mob/emote.dm @@ -16,7 +16,7 @@ return if(!src.client.holder) - if(!CONFIG_GET(flag/dsay_allowed)) // CHOMPEdit + if(!CONFIG_GET(flag/dsay_allowed)) to_chat(src, span_danger("Deadchat is globally muted.")) return diff --git a/code/modules/mob/language/language.dm b/code/modules/mob/language/language.dm index 4f92a87d64..98fa4cf555 100644 --- a/code/modules/mob/language/language.dm +++ b/code/modules/mob/language/language.dm @@ -252,13 +252,13 @@ if(client && client.prefs.language_prefixes && client.prefs.language_prefixes.len) return client.prefs.language_prefixes[1] - return CONFIG_GET(str_list/language_prefixes)[1] // CHOMPEdit + return CONFIG_GET(str_list/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_GET(str_list/language_prefixes) // CHOMPEdit + return prefix in CONFIG_GET(str_list/language_prefixes) //TBD /mob/proc/check_lang_data() diff --git a/code/modules/mob/living/carbon/brain/life.dm b/code/modules/mob/living/carbon/brain/life.dm index 8ac3a42e6d..62859e344d 100644 --- a/code/modules/mob/living/carbon/brain/life.dm +++ b/code/modules/mob/living/carbon/brain/life.dm @@ -94,7 +94,7 @@ silent = 0 deaf_loop.stop() // CHOMPStation Add: Ear Ringing/Deafness - Not sure if we need this, but, safety. else //ALIVE. LIGHTS ARE ON - if( !container && (health < CONFIG_GET(number/health_threshold_dead) || ((world.time - timeofhostdeath) > CONFIG_GET(number/revival_brain_life))) ) // CHOMPEdit + if( !container && (health < CONFIG_GET(number/health_threshold_dead) || ((world.time - timeofhostdeath) > CONFIG_GET(number/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 c246d93476..f4d90e9712 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_GET(number/health_threshold_crit))) //First, resolve location and get a breath // CHOMPEdit + if(air_master.current_cycle%4==2 || failed_last_breath || (health < CONFIG_GET(number/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_GET(number/health_threshold_crit) && !(CE_STABLE in chem_effects)) //crit aka circulatory shock // CHOMPEdit + if(health < CONFIG_GET(number/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 823d69f9aa..56e464bcf5 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -198,7 +198,7 @@ return shock_damage /mob/living/carbon/proc/help_shake_act(mob/living/carbon/M) - if (src.health >= CONFIG_GET(number/health_threshold_crit)) // CHOMPEdit + if (src.health >= CONFIG_GET(number/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 5d07d74b09..6397b86fc1 100644 --- a/code/modules/mob/living/carbon/human/appearance.dm +++ b/code/modules/mob/living/carbon/human/appearance.dm @@ -180,7 +180,7 @@ for(var/current_species_name in GLOB.all_species) var/datum/species/current_species = GLOB.all_species[current_species_name] - if(check_whitelist && CONFIG_GET(flag/usealienwhitelist) && !check_rights(R_ADMIN|R_EVENT, 0, src)) //If we're using the whitelist, make sure to check it! // CHOMPEdit + if(check_whitelist && CONFIG_GET(flag/usealienwhitelist) && !check_rights(R_ADMIN|R_EVENT, 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 2df0839d5a..5f250b0fef 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -238,7 +238,7 @@ if(update) UpdateDamageIcon() /mob/living/carbon/human/proc/implant_loyalty(override = FALSE) // Won't override by default. - if(!CONFIG_GET(flag/use_loyalty_implants) && !override) return // Nuh-uh. // CHOMPEdit + if(!CONFIG_GET(flag/use_loyalty_implants) && !override) return // Nuh-uh. var/obj/item/implant/loyalty/L = new/obj/item/implant/loyalty(src) if(L.handle_implant(src, BP_HEAD)) @@ -1781,7 +1781,7 @@ return ..() /mob/living/carbon/human/pull_damage() - if(((health - halloss) <= CONFIG_GET(number/health_threshold_softcrit))) // CHOMPEdit + if(((health - halloss) <= CONFIG_GET(number/health_threshold_softcrit))) for(var/name in organs_by_name) var/obj/item/organ/external/e = organs_by_name[name] if(!e) diff --git a/code/modules/mob/living/carbon/human/human_attackhand.dm b/code/modules/mob/living/carbon/human/human_attackhand.dm index 4918177843..720996857f 100644 --- a/code/modules/mob/living/carbon/human/human_attackhand.dm +++ b/code/modules/mob/living/carbon/human/human_attackhand.dm @@ -75,7 +75,7 @@ if (istype(H) && attempt_to_scoop(H)) return 0; // VOREStation Edit - End - if(istype(H) && health < CONFIG_GET(number/health_threshold_crit)) // CHOMPEdit + if(istype(H) && health < CONFIG_GET(number/health_threshold_crit)) if(!H.check_has_mouth()) to_chat(H, span_danger("You don't have a mouth, you cannot perform CPR!")) return @@ -104,7 +104,7 @@ H.visible_message(span_danger("\The [H] performs CPR on \the [src]!")) to_chat(H, span_warning("Repeat at least every 7 seconds.")) - if(istype(H) && health > CONFIG_GET(number/health_threshold_dead)) // CHOMPEdit + if(istype(H) && health > CONFIG_GET(number/health_threshold_dead)) adjustOxyLoss(-(min(getOxyLoss(), 5))) updatehealth() to_chat(src, span_notice("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 4467678651..0a5e3753b0 100644 --- a/code/modules/mob/living/carbon/human/human_damage.dm +++ b/code/modules/mob/living/carbon/human/human_damage.dm @@ -43,7 +43,7 @@ // CHOMPEdit End: Pain //TODO: fix husking - if( ((getMaxHealth() - total_burn) < CONFIG_GET(number/health_threshold_dead) * huskmodifier) && stat == DEAD) // CHOMPEdit + if( ((getMaxHealth() - total_burn) < CONFIG_GET(number/health_threshold_dead) * huskmodifier) && 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 c3363e141a..620ff05460 100644 --- a/code/modules/mob/living/carbon/human/human_defense.dm +++ b/code/modules/mob/living/carbon/human/human_defense.dm @@ -369,7 +369,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_GET(number/organ_health_multiplier))*100 // CHOMPEdit + var/dislocate_chance = effective_force/(dislocate_mult * organ.min_broken_damage * CONFIG_GET(number/organ_health_multiplier))*100 if(prob(dislocate_chance * (100 - blocked)/100)) visible_message(span_danger("[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 ffedad346f..debaa20b8c 100644 --- a/code/modules/mob/living/carbon/human/human_movement.dm +++ b/code/modules/mob/living/carbon/human/human_movement.dm @@ -116,7 +116,7 @@ . *= 0.5 . -= chem_effects[CE_SPEEDBOOST] // give 'em a buff on top. - . = max(HUMAN_LOWEST_SLOWDOWN, . + CONFIG_GET(number/human_delay)) // Minimum return should be the same as force_max_speed // CHOMPEdit + . = max(HUMAN_LOWEST_SLOWDOWN, . + CONFIG_GET(number/human_delay)) // Minimum return should be the same as force_max_speed . += ..() /mob/living/carbon/human/Moved() @@ -286,7 +286,7 @@ if(step_count % 2 == 0) //CHOMPAdd, since I removed the returns up above, need this to track each odd step. return - var/volume = CONFIG_GET(number/footstep_volume) // CHOMPEdit + var/volume = CONFIG_GET(number/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 fbcad4379f..0a62513cbf 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -558,7 +558,7 @@ if(!breath || (breath.total_moles == 0)) failed_last_breath = 1 - if(health > CONFIG_GET(number/health_threshold_crit)) // CHOMPEdit + if(health > CONFIG_GET(number/health_threshold_crit)) adjustOxyLoss(HUMAN_MAX_OXYLOSS) else adjustOxyLoss(HUMAN_CRIT_MAX_OXYLOSS) @@ -1264,7 +1264,7 @@ else //ALIVE. LIGHTS ARE ON updatehealth() //TODO - if(health <= CONFIG_GET(number/health_threshold_dead) || (should_have_organ("brain") && !has_brain())) // CHOMPEdit + if(health <= CONFIG_GET(number/health_threshold_dead) || (should_have_organ("brain") && !has_brain())) death() blinded = 1 silent = 0 @@ -1652,7 +1652,7 @@ //clear_fullscreen("belly3") //Chomp disable, using our own implementation //clear_fullscreen("belly4") //Chomp disable, using our own implementation - if(CONFIG_GET(flag/welder_vision)) // CHOMPEdit + if(CONFIG_GET(flag/welder_vision)) var/found_welder if(species.short_sighted) found_welder = 1 @@ -2093,7 +2093,7 @@ if(stat == DEAD) holder.icon_state = "-100" // X_X else - holder.icon_state = RoundHealth((health-CONFIG_GET(number/health_threshold_crit))/(getMaxHealth()-CONFIG_GET(number/health_threshold_crit))*100) // CHOMPEdit + holder.icon_state = RoundHealth((health-CONFIG_GET(number/health_threshold_crit))/(getMaxHealth()-CONFIG_GET(number/health_threshold_crit))*100) if(block_hud) holder.icon_state = "hudblank" apply_hud(HEALTH_HUD, holder) 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 24535d143a..298179fa5a 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_GET(flag/show_human_death_message)) // CHOMPEdit + if(CONFIG_GET(flag/show_human_death_message)) return ((H && H.isSynthetic()) ? "gives one shrill beep before falling lifeless." : death_message) else return DEATHGASP_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 df2e2ffd71..2b56bcc06b 100644 --- a/code/modules/mob/living/carbon/human/species/station/alraune.dm +++ b/code/modules/mob/living/carbon/human/species/station/alraune.dm @@ -140,7 +140,7 @@ if(!breath || (breath.total_moles == 0)) H.failed_last_breath = 1 - if(H.health > CONFIG_GET(number/health_threshold_crit)) // CHOMPEdit + if(H.health > CONFIG_GET(number/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 804b8880d3..8b13e0aeea 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 that will eventually hatch into a new xenomorph larva. Life finds a way." set category = "Abilities.Alien" //CHOMPEdit - if(!CONFIG_GET(flag/aliens_allowed)) // CHOMPEdit + if(!CONFIG_GET(flag/aliens_allowed)) to_chat(src, "You begin to lay an egg, but hesitate. You suspect it isn't allowed.") remove_verb(src, /mob/living/carbon/human/proc/lay_egg) return diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index 48de8b7663..566cc0113e 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -741,7 +741,7 @@ set category = "OOC.Game" //CHOMPEdit set src in view() //VOREStation Edit Start - Making it so SSD people have prefs with fallback to original style. - if(CONFIG_GET(flag/allow_metadata)) // CHOMPEdit + if(CONFIG_GET(flag/allow_metadata)) if(ooc_notes) ooc_notes_window(usr) // to_chat(usr, span_filter_notice("[src]'s Metainfo:
[ooc_notes]")) @@ -1206,7 +1206,7 @@ add_attack_logs(src,M,"Thrown via grab to [end_T.x],[end_T.y],[end_T.z]") if(ishuman(M)) var/mob/living/carbon/human/N = M - if((N.health + N.halloss) < CONFIG_GET(number/health_threshold_crit) || N.stat == DEAD) // CHOMPEdit + if((N.health + N.halloss) < CONFIG_GET(number/health_threshold_crit) || N.stat == DEAD) N.adjustBruteLoss(rand(10,30)) src.drop_from_inventory(G) diff --git a/code/modules/mob/living/silicon/ai/ai_remote_control.dm b/code/modules/mob/living/silicon/ai/ai_remote_control.dm index 0c3f133d71..74ad4a9882 100644 --- a/code/modules/mob/living/silicon/ai/ai_remote_control.dm +++ b/code/modules/mob/living/silicon/ai/ai_remote_control.dm @@ -2,12 +2,12 @@ var/mob/living/silicon/robot/deployed_shell = null //For shell control /mob/living/silicon/ai/Initialize() - if(CONFIG_GET(flag/allow_ai_shells)) // CHOMPEdit + if(CONFIG_GET(flag/allow_ai_shells)) add_verb(src, /mob/living/silicon/ai/proc/deploy_to_shell_act) return ..() /mob/living/silicon/ai/proc/deploy_to_shell(var/mob/living/silicon/robot/target) - if(!CONFIG_GET(flag/allow_ai_shells)) // CHOMPEdit + if(!CONFIG_GET(flag/allow_ai_shells)) to_chat(src, span_warning("AI Shells are not allowed on this server. You shouldn't have this verb because of it, so consider making a bug report.")) return diff --git a/code/modules/mob/living/silicon/ai/malf.dm b/code/modules/mob/living/silicon/ai/malf.dm index 66bd6e5344..5a4d018bcd 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_GET(number/health_threshold_dead))/2 // CHOMPEdit + return (health - CONFIG_GET(number/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 22df5ec79f..724390796a 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_GET(number/health_threshold_dead) && src.stat != 2) // CHOMPEdit + if (src.health <= CONFIG_GET(number/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 661abec8df..48a181b25d 100644 --- a/code/modules/mob/living/silicon/robot/drone/drone.dm +++ b/code/modules/mob/living/silicon/robot/drone/drone.dm @@ -239,7 +239,7 @@ var/list/mob_hat_cache = list() var/datum/gender/TU = gender_datums[user.get_visible_gender()] if(stat == 2) - if(!CONFIG_GET(flag/allow_drone_spawn) || emagged || health < -35) //It's dead, Dave. // CHOMPEdit + if(!CONFIG_GET(flag/allow_drone_spawn) || emagged || health < -35) //It's dead, Dave. to_chat(user, span_danger("The interface is fried, and a distressing burned smell wafts from the robot's interior. You're not rebooting this one.")) return @@ -251,7 +251,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_GET(number/max_maint_drones)) // CHOMPEdit + if(drones < CONFIG_GET(number/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 d98cdb9b78..7e3aa61f0d 100644 --- a/code/modules/mob/living/silicon/robot/drone/drone_manufacturer.dm +++ b/code/modules/mob/living/silicon/robot/drone/drone_manufacturer.dm @@ -57,14 +57,14 @@ icon_state = "drone_fab_active" var/elapsed = world.time - time_last_drone - drone_progress = round((elapsed / CONFIG_GET(number/drone_build_time)) * 100) // CHOMPEdit + drone_progress = round((elapsed / CONFIG_GET(number/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) . = ..() - if(produce_drones && drone_progress >= 100 && istype(user,/mob/observer/dead) && CONFIG_GET(flag/allow_drone_spawn) && count_drones() < CONFIG_GET(number/max_maint_drones)) // CHOMPEdit + if(produce_drones && drone_progress >= 100 && istype(user,/mob/observer/dead) && CONFIG_GET(flag/allow_drone_spawn) && count_drones() < CONFIG_GET(number/max_maint_drones)) . += "
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) @@ -72,7 +72,7 @@ if(stat & NOPOWER) return - if(!produce_drones || !CONFIG_GET(flag/allow_drone_spawn) || count_drones() >= CONFIG_GET(number/max_maint_drones)) // CHOMPEdit + if(!produce_drones || !CONFIG_GET(flag/allow_drone_spawn) || count_drones() >= CONFIG_GET(number/max_maint_drones)) return if(player && !istype(player.mob,/mob/observer/dead)) @@ -102,7 +102,7 @@ to_chat(src, span_danger("The game hasn't started yet!")) return - if(!CONFIG_GET(flag/allow_drone_spawn)) // CHOMPEdit + if(!CONFIG_GET(flag/allow_drone_spawn)) to_chat(src, span_danger("That verb is not currently permitted.")) return @@ -117,7 +117,7 @@ return // VOREStation Addition Start - if(CONFIG_GET(flag/use_age_restriction_for_jobs) && isnum(src.client.player_age)) // CHOMPEdit + if(CONFIG_GET(flag/use_age_restriction_for_jobs) && isnum(src.client.player_age)) var/time_till_play = max(0, 3 - src.client.player_age) if(time_till_play) to_chat(usr, span_danger("You have not been playing on the server long enough to join as drone.")) diff --git a/code/modules/mob/living/silicon/robot/life.dm b/code/modules/mob/living/silicon/robot/life.dm index b74cd4a207..a1d3ff3fe0 100644 --- a/code/modules/mob/living/silicon/robot/life.dm +++ b/code/modules/mob/living/silicon/robot/life.dm @@ -82,7 +82,7 @@ //if(src.resting) // VOREStation edit. Our borgos would rather not. // Weaken(5) - if(health < CONFIG_GET(number/health_threshold_dead) && src.stat != 2) //die only once // CHOMPEdit + if(health < CONFIG_GET(number/health_threshold_dead) && src.stat != 2) //die only once death() if (src.stat != 2) //Alive. @@ -246,7 +246,7 @@ src.healths.icon_state = "health3" else if(health >= 0) src.healths.icon_state = "health4" - else if(health >= CONFIG_GET(number.health_threshold_dead)) // CHOMPEdit + else if(health >= CONFIG_GET(number/health_threshold_dead)) src.healths.icon_state = "health5" else src.healths.icon_state = "health6" diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index 28789a7fcf..a1d73d948c 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -1365,13 +1365,13 @@ /mob/living/silicon/robot/proc/add_robot_verbs() add_verb(src, robot_verbs_default) add_verb(src, silicon_subsystems) - if(CONFIG_GET(flag/allow_robot_recolor)) // CHOMPEdit + if(CONFIG_GET(flag/allow_robot_recolor)) add_verb(src, /mob/living/silicon/robot/proc/ColorMate) /mob/living/silicon/robot/proc/remove_robot_verbs() remove_verb(src, robot_verbs_default) remove_verb(src, silicon_subsystems) - if(CONFIG_GET(flag/allow_robot_recolor)) // CHOMPEdit + if(CONFIG_GET(flag/allow_robot_recolor)) remove_verb(src, /mob/living/silicon/robot/proc/ColorMate) // Uses power from cyborg's cell. Returns 1 on success or 0 on failure. diff --git a/code/modules/mob/living/silicon/robot/robot_movement.dm b/code/modules/mob/living/silicon/robot/robot_movement.dm index 35a8ccfd97..53d25f7132 100644 --- a/code/modules/mob/living/silicon/robot/robot_movement.dm +++ b/code/modules/mob/living/silicon/robot/robot_movement.dm @@ -39,7 +39,7 @@ if(nutrition > 1000) //CHOMPAdd . += nutrition / 2000 //CHOMPAdd - . += CONFIG_GET(number/robot_delay) // CHOMPEdit + . += CONFIG_GET(number/robot_delay) . += ..() diff --git a/code/modules/mob/living/silicon/robot/robot_remote_control.dm b/code/modules/mob/living/silicon/robot/robot_remote_control.dm index 88a5e3f204..8520448d5a 100644 --- a/code/modules/mob/living/silicon/robot/robot_remote_control.dm +++ b/code/modules/mob/living/silicon/robot/robot_remote_control.dm @@ -214,7 +214,7 @@ GLOBAL_LIST_EMPTY(available_ai_shells) undeploy("Remote session terminated.") /mob/living/silicon/robot/attack_ai(mob/user) - if(shell && CONFIG_GET(flag/allow_ai_shells) && (!connected_ai || connected_ai == user)) // CHOMPEdit + if(shell && CONFIG_GET(flag/allow_ai_shells) && (!connected_ai || connected_ai == user)) var/mob/living/silicon/ai/AI = user if(istype(AI)) // Just in case we're clicked by a borg AI.deploy_to_shell(src) @@ -231,6 +231,6 @@ GLOBAL_LIST_EMPTY(available_ai_shells) delete_me = TRUE /obj/effect/landmark/free_ai_shell/Initialize() - if(CONFIG_GET(flag/allow_ai_shells) && CONFIG_GET(flag/give_free_ai_shell)) // CHOMPEdit + if(CONFIG_GET(flag/allow_ai_shells) && CONFIG_GET(flag/give_free_ai_shell)) new /mob/living/silicon/robot/ai_shell(get_turf(src)) return ..() diff --git a/code/modules/mob/living/simple_mob/simple_mob.dm b/code/modules/mob/living/simple_mob/simple_mob.dm index 536a3a6fba..2ef81898e4 100644 --- a/code/modules/mob/living/simple_mob/simple_mob.dm +++ b/code/modules/mob/living/simple_mob/simple_mob.dm @@ -205,7 +205,7 @@ if(organ_names) organ_names = GET_DECL(organ_names) - if(CONFIG_GET(flag/allow_simple_mob_recolor)) //CHOMPEdit + if(CONFIG_GET(flag/allow_simple_mob_recolor)) add_verb(src, /mob/living/simple_mob/proc/ColorMate) AddElement(/datum/element/footstep, FOOTSTEP_MOB_SHOE, 1, -6) // CHOMPEdit - Giving them all shoe footsteps FOR NOW until I go through all of them and give appropiate ones @@ -293,7 +293,7 @@ . += injury_level // VOREStation Edit Stop - . += CONFIG_GET(number/animal_delay) // CHOMPEdit + . += CONFIG_GET(number/animal_delay) . += ..() diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/pets/cat_vr.dm b/code/modules/mob/living/simple_mob/subtypes/animal/pets/cat_vr.dm index c676ff86d7..5e6062339a 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/pets/cat_vr.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/pets/cat_vr.dm @@ -52,7 +52,7 @@ if (has_AI() && friend) var/friend_dist = get_dist(src,friend) if (friend_dist <= 1) - if (friend.stat >= DEAD || friend.health <= CONFIG_GET(number/health_threshold_softcrit)) // CHOMPEdit + if (friend.stat >= DEAD || friend.health <= CONFIG_GET(number/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/login.dm b/code/modules/mob/login.dm index e53e5c65cd..7f72aa87e3 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_GET(flag/log_access)) // CHOMPEdit + if(CONFIG_GET(flag/log_access)) for(var/mob/M in player_list) if(M == src) continue if( M.key && (M.key != key) ) @@ -20,7 +20,7 @@ if( (client.connection != "web") && (M.computer_id == client.computer_id) ) if(matches) matches += " and " matches += "ID ([client.computer_id])" - if(!CONFIG_GET(flag/disable_cid_warn_popup)) // CHOMPEdit + if(!CONFIG_GET(flag/disable_cid_warn_popup)) tgui_alert_async(usr, "You appear to have logged in with another key this round, which is not permitted. Please contact an administrator if you believe this message to be in error.") if(matches) if(M.client) diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index 3ec5288e07..d8b3de10c4 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -351,9 +351,9 @@ // Special cases, can never respawn if(ticker?.mode?.deny_respawn) time = -1 - else if(!CONFIG_GET(flag/abandon_allowed)) // CHOMPEdit + else if(!CONFIG_GET(flag/abandon_allowed)) time = -1 - else if(!CONFIG_GET(flag/respawn)) // CHOMPEdit + else if(!CONFIG_GET(flag/respawn)) time = -1 // Special case for observing before game start @@ -362,7 +362,7 @@ // Wasn't given a time, use the config time else if(!time) - time = CONFIG_GET(number/respawn_time) // CHOMPEdit + time = CONFIG_GET(number/respawn_time) var/keytouse = ckey // Try harder to find a key to use @@ -374,7 +374,7 @@ GLOB.respawn_timers[keytouse] = world.time + time /mob/observer/dead/set_respawn_timer() - if(CONFIG_GET(flag/antag_hud_restricted) && has_enabled_antagHUD) // CHOMPEdit + if(CONFIG_GET(flag/antag_hud_restricted) && has_enabled_antagHUD) ..(-1) else return // Don't set it, no need diff --git a/code/modules/mob/mob_movement.dm b/code/modules/mob/mob_movement.dm index b6e5be9653..744f2451d1 100644 --- a/code/modules/mob/mob_movement.dm +++ b/code/modules/mob/mob_movement.dm @@ -24,9 +24,9 @@ if("run") if(drowsyness > 0) . += 6 - . += CONFIG_GET(number/run_speed) // CHOMPEdit + . += CONFIG_GET(number/run_speed) if("walk") - . += CONFIG_GET(number/walk_speed) // CHOMPEdit + . += CONFIG_GET(number/walk_speed) /client/proc/client_dir(input, direction=-1) return turn(input, direction*dir2angle(dir)) diff --git a/code/modules/mob/new_player/login.dm b/code/modules/mob/new_player/login.dm index f1a246c600..e673ec8b95 100644 --- a/code/modules/mob/new_player/login.dm +++ b/code/modules/mob/new_player/login.dm @@ -33,7 +33,7 @@ var/obj/effect/lobby_image = new /obj/effect/lobby_image to_chat(src, examine_block("
[join_motd]
")) if(has_respawned) - to_chat(usr, CONFIG_GET(string/respawn_message)) // CHOMPEdit + to_chat(usr, CONFIG_GET(string/respawn_message)) has_respawned = FALSE if(!mind) @@ -90,10 +90,10 @@ var/obj/effect/lobby_image = new /obj/effect/lobby_image // So we can be more wordy and give links. to_chat(src, span_userdanger("Your client version has known issues.") + " Please consider using a different version: https://www.byond.com/download/build/.") var/chat_message = "" - if(CONFIG_GET(number/suggested_byond_version)) // CHOMPEdit - chat_message += "We suggest using version [CONFIG_GET(number/suggested_byond_version)]." // CHOMPEdit - if(CONFIG_GET(number/suggested_byond_build)) // CHOMPEdit - chat_message += "[CONFIG_GET(number/suggested_byond_build)]." // CHOMPEdit + if(CONFIG_GET(number/suggested_byond_version)) + chat_message += "We suggest using version [CONFIG_GET(number/suggested_byond_version)]." + if(CONFIG_GET(number/suggested_byond_build)) + chat_message += "[CONFIG_GET(number/suggested_byond_build)]." chat_message += " If you find this version doesn't work for you, let us know." to_chat(src, chat_message) to_chat(src, "Tip: You can always use the '.zip' versions of BYOND and keep multiple versions in folders wherever you want, rather than uninstalling/reinstalling. Just make sure BYOND is *really* closed (check your system tray for the icon) before starting a different version.") diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm index 919e0f23f4..75166b91f5 100644 --- a/code/modules/mob/new_player/new_player.dm +++ b/code/modules/mob/new_player/new_player.dm @@ -214,7 +214,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_GET(flag/antag_hud_allowed)) // For new ghosts we remove the verb from even showing up if it's not allowed. // CHOMPEdit + if(!client.holder && !CONFIG_GET(flag/antag_hud_allowed)) // For new ghosts we remove the verb from even showing up if it's not allowed. remove_verb(observer, /mob/observer/dead/verb/toggle_antagHUD) // Poor guys, don't know what they are missing! observer.key = key observer.set_respawn_timer(time_till_respawn()) // Will keep their existing time if any, or return 0 and pass 0 into set_respawn_timer which will use the defaults @@ -444,7 +444,7 @@ if(!ticker || ticker.current_state != GAME_STATE_PLAYING) to_chat(usr, span_red("The round is either not ready, or has already finished...")) return 0 - if(!CONFIG_GET(flag/enter_allowed)) // CHOMPEdit + if(!CONFIG_GET(flag/enter_allowed)) to_chat(usr, span_notice("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 b346f309bb..197dcb4bba 100644 --- a/code/modules/mob/new_player/new_player_vr.dm +++ b/code/modules/mob/new_player/new_player_vr.dm @@ -7,12 +7,12 @@ return TRUE //No Flavor Text - if (CONFIG_GET(flag/require_flavor) && !(J.mob_type & JOB_SILICON) && (!client?.prefs?.flavor_texts["general"] || length(client.prefs.flavor_texts["general"]) < 30)) // CHOMPEdit + if (CONFIG_GET(flag/require_flavor) && !(J.mob_type & JOB_SILICON) && (!client?.prefs?.flavor_texts["general"] || length(client.prefs.flavor_texts["general"]) < 30)) to_chat(src,span_warning("Please set your general flavor text to give a basic description of your character. Set it using the 'Set Flavor text' button on the 'General' tab in character setup, and choosing 'General' category.")) pass = FALSE //No OOC notes - if (CONFIG_GET(flag/allow_metadata) && (!client?.prefs?.metadata || length(client.prefs.metadata) < 15)) // CHOMPEdit + if (CONFIG_GET(flag/allow_metadata) && (!client?.prefs?.metadata || length(client.prefs.metadata) < 15)) to_chat(src,span_warning("Please set informative OOC notes related to RP/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 ae2e2e384b..f68bb469b8 100644 --- a/code/modules/mob/say.dm +++ b/code/modules/mob/say.dm @@ -70,7 +70,7 @@ return // Clientless mobs shouldn't be trying to talk in deadchat. if(!client.holder) - if(!CONFIG_GET(flag/dsay_allowed)) // CHOMPEdit + if(!CONFIG_GET(flag/dsay_allowed)) to_chat(src, span_danger("Deadchat is globally muted.")) return diff --git a/code/modules/organs/internal/brain.dm b/code/modules/organs/internal/brain.dm index 1720df3b73..24f08844ee 100644 --- a/code/modules/organs/internal/brain.dm +++ b/code/modules/organs/internal/brain.dm @@ -80,7 +80,7 @@ GLOBAL_LIST_BOILERPLATE(all_brain_organs, /obj/item/organ/internal/brain) /obj/item/organ/internal/brain/Initialize() // CHOMPEdit . = ..() // CHOMPEdit - health = CONFIG_GET(number/default_brain_health) // CHOMPEdit + health = CONFIG_GET(number/default_brain_health) defib_timer = (CONFIG_GET(number/defib_timer) MINUTES) / 2 // CHOMPEdit spawn(5) if(brainmob) diff --git a/code/modules/organs/organ.dm b/code/modules/organs/organ.dm index cee13ae438..15c56be88c 100644 --- a/code/modules/organs/organ.dm +++ b/code/modules/organs/organ.dm @@ -179,7 +179,7 @@ var/list/organ_cache = list() if(B && prob(40) && !isbelly(loc)) //VOREStation Edit reagents.remove_reagent("blood",0.1) blood_splatter(src,B,1) - if(CONFIG_GET(flag/organs_decay) && decays) damage += rand(1,3) // CHOMPEdit + if(CONFIG_GET(flag/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 5736e7afbc..8e23c7bc93 100644 --- a/code/modules/organs/organ_external.dm +++ b/code/modules/organs/organ_external.dm @@ -308,7 +308,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_GET(flag/limbs_can_break)) // CHOMPedit + if(is_damageable(brute + burn) || !CONFIG_GET(flag/limbs_can_break)) if(brute) if(can_cut) if(sharp && !edge) @@ -322,7 +322,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_GET(number/organ_health_multiplier) - (brute_dam + burn_dam) // CHOMPEdit + var/can_inflict = max_damage * CONFIG_GET(number/organ_health_multiplier) - (brute_dam + burn_dam) var/spillover = 0 if(can_inflict) if (brute > 0) @@ -339,7 +339,7 @@ //How much brute damage is left to inflict spillover += max(0, brute - can_inflict) - can_inflict = max_damage * CONFIG_GET(number/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. // CHOMPEdit + can_inflict = max_damage * CONFIG_GET(number/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 @@ -350,7 +350,7 @@ //If there is pain to dispense. if(spillover) - owner.shock_stage += spillover * CONFIG_GET(number/organ_damage_spillover_multiplier) // CHOMPEdit + owner.shock_stage += spillover * CONFIG_GET(number/organ_damage_spillover_multiplier) // sync the organ's damage with its wounds src.update_damages() @@ -359,7 +359,7 @@ //If limb took enough damage, try to cut or tear it off if(owner && loc == owner && !is_stump()) - if(!cannot_amputate && CONFIG_GET(flag/limbs_can_break) && (brute_dam + burn_dam) >= (max_damage * CONFIG_GET(number/organ_health_multiplier))) // CHOMPEdit + if(!cannot_amputate && CONFIG_GET(flag/limbs_can_break) && (brute_dam + burn_dam) >= (max_damage * CONFIG_GET(number/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. @@ -548,7 +548,7 @@ This function completely restores a damaged organ to perfect condition. owner.custom_pain("You feel something rip in your [name]!", 50) if((damage > 5 || damage + burn_dam >= 15) && type == BURN && (robotic < ORGAN_ROBOT) && !(species.flags & NO_BLOOD)) - var/fluid_loss = 0.1 * (damage/(owner.getMaxHealth() - CONFIG_GET(number/health_threshold_dead))) * owner.species.blood_volume*(1 - owner.species.blood_level_fatal) // CHOMPEdit //CHOMPedit 2, reduce fluid loss 4-fold so lasers dont suck your blood + var/fluid_loss = 0.1 * (damage/(owner.getMaxHealth() - CONFIG_GET(number/health_threshold_dead))) * owner.species.blood_volume*(1 - owner.species.blood_level_fatal) //CHOMPedit reduce fluid loss 4-fold so lasers dont suck your blood owner.remove_blood(fluid_loss) // first check whether we can widen an existing wound if(wounds.len > 0 && prob(max(50+(number_wounds-1)*10,90))) @@ -772,7 +772,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_GET(number/organ_regeneration_multiplier) // CHOMPEdit + heal_amt = heal_amt * CONFIG_GET(number/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 @@ -822,7 +822,7 @@ Note that amputating the affected organ does in fact remove the infection from t status |= ORGAN_BLEEDING //Bone fractures - if(CONFIG_GET(flag/bones_can_break) && brute_dam > min_broken_damage * CONFIG_GET(number/organ_health_multiplier) && !(robotic >= ORGAN_ROBOT)) // CHOMPEdit + if(CONFIG_GET(flag/bones_can_break) && brute_dam > min_broken_damage * CONFIG_GET(number/organ_health_multiplier) && !(robotic >= ORGAN_ROBOT)) src.fracture() update_health() @@ -1112,7 +1112,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_GET(number/organ_health_multiplier)) // CHOMPEdit + if(brute_dam > min_broken_damage * CONFIG_GET(number/organ_health_multiplier)) return 0 //will just immediately fracture again status &= ~ORGAN_BROKEN diff --git a/code/modules/organs/subtypes/standard.dm b/code/modules/organs/subtypes/standard.dm index 6e64b7596b..2d5f187af0 100644 --- a/code/modules/organs/subtypes/standard.dm +++ b/code/modules/organs/subtypes/standard.dm @@ -283,7 +283,7 @@ var/eyes_over_markings = FALSE //VOREStation edit /obj/item/organ/external/head/Initialize() - if(CONFIG_GET(flag/allow_headgibs)) // CHOMPEdit + if(CONFIG_GET(flag/allow_headgibs)) cannot_gib = FALSE return ..() diff --git a/code/modules/paperwork/faxmachine.dm b/code/modules/paperwork/faxmachine.dm index 3d480dbee5..e8f0c994b9 100644 --- a/code/modules/paperwork/faxmachine.dm +++ b/code/modules/paperwork/faxmachine.dm @@ -475,16 +475,16 @@ Extracted to its own procedure for easier logic handling with paper bundles. if (istype(fax, /obj/item/paper)) var/obj/item/paper/P = fax var/text = "[P.name][P.info][P.stamps]"; - file("[CONFIG_GET(string/fax_export_dir)]/fax_[faxid].html") << text; // CHOMPEdit + file("[CONFIG_GET(string/fax_export_dir)]/fax_[faxid].html") << text; else if (istype(fax, /obj/item/photo)) var/obj/item/photo/H = fax - fcopy(H.img, "[CONFIG_GET(string/fax_export_dir)]/photo_[faxid].png") // CHOMPEdit + fcopy(H.img, "[CONFIG_GET(string/fax_export_dir)]/photo_[faxid].png") var/text = "[H.name]" \ + "" \ + "" \ + "[H.scribble ? "
Written on the back:
[H.scribble]" : ""]"\ + "" - file("[CONFIG_GET(string/fax_export_dir)]/fax_[faxid].html") << text // CHOMPEdit + file("[CONFIG_GET(string/fax_export_dir)]/fax_[faxid].html") << text else if (istype(fax, /obj/item/paper_bundle)) var/obj/item/paper_bundle/B = fax var/data = "" @@ -493,7 +493,7 @@ Extracted to its own procedure for easier logic handling with paper bundles. var/page_faxid = export_fax(pageobj) data += "Page [page] - [pageobj.name]
" var/text = "[B.name][data]" - file("[CONFIG_GET(string/fax_export_dir)]/fax_[faxid].html") << text // CHOMPEdit + file("[CONFIG_GET(string/fax_export_dir)]/fax_[faxid].html") << text return faxid @@ -502,16 +502,16 @@ Extracted to its own procedure for easier logic handling with paper bundles. * Call the chat webhook to transmit a notification of an admin fax to the admin chat. */ /obj/machinery/photocopier/faxmachine/proc/message_chat_admins(var/mob/sender, var/faxname, var/obj/item/sent, var/faxid, font_colour="#006100") - if (CONFIG_GET(string/chat_webhook_url)) // CHOMPEdit + if (CONFIG_GET(string/chat_webhook_url)) spawn(0) var/query_string = "type=fax" - query_string += "&key=[url_encode(CONFIG_GET(string/chat_webhook_key))]" // CHOMPEdit + query_string += "&key=[url_encode(CONFIG_GET(string/chat_webhook_key))]" query_string += "&faxid=[url_encode(faxid)]" query_string += "&color=[url_encode(font_colour)]" query_string += "&faxname=[url_encode(faxname)]" query_string += "&sendername=[url_encode(sender.name)]" query_string += "&sentname=[url_encode(sent.name)]" - world.Export("[CONFIG_GET(string/chat_webhook_url)]?[query_string]") // CHOMPEdit + world.Export("[CONFIG_GET(string/chat_webhook_url)]?[query_string]") @@ -520,12 +520,12 @@ Extracted to its own procedure for easier logic handling with paper bundles. * Call the chat webhook to transmit a notification of a job request */ /obj/machinery/photocopier/faxmachine/proc/message_chat_rolerequest(var/font_colour="#006100", var/role_to_ping, var/reason, var/jobname) - if(CONFIG_GET(string/chat_webhook_url)) // CHOMPEdit + if(CONFIG_GET(string/chat_webhook_url)) spawn(0) var/query_string = "type=rolerequest" - query_string += "&key=[url_encode(CONFIG_GET(string/chat_webhook_key))]" // CHOMPEdit + query_string += "&key=[url_encode(CONFIG_GET(string/chat_webhook_key))]" query_string += "&ping=[url_encode(role_to_ping)]" query_string += "&color=[url_encode(font_colour)]" query_string += "&reason=[url_encode(reason)]" query_string += "&job=[url_encode(jobname)]" - world.Export("[CONFIG_GET(string/chat_webhook_url)]?[query_string]") // CHOMPEdit + world.Export("[CONFIG_GET(string/chat_webhook_url)]?[query_string]") diff --git a/code/modules/persistence/graffiti.dm b/code/modules/persistence/graffiti.dm index e952f8af7a..033aa212d5 100644 --- a/code/modules/persistence/graffiti.dm +++ b/code/modules/persistence/graffiti.dm @@ -30,7 +30,7 @@ random_icon_states.Remove(W.icon_state) if(random_icon_states.len) icon_state = pick(random_icon_states) - if(!mapload || !CONFIG_GET(flag/persistence_ignore_mapload)) // CHOMPEdit + if(!mapload || !CONFIG_GET(flag/persistence_ignore_mapload)) SSpersistence.track_value(src, /datum/persistent/graffiti) . = ..() diff --git a/code/modules/power/solar.dm b/code/modules/power/solar.dm index 23b30c4195..68977e267a 100644 --- a/code/modules/power/solar.dm +++ b/code/modules/power/solar.dm @@ -299,7 +299,7 @@ GLOBAL_LIST_EMPTY(solars_list) /obj/machinery/power/solar_control/proc/auto_start(forced = FALSE) // Automatically sets the solars, if allowed. - if(forced || auto_start == SOLAR_AUTO_START_YES || (auto_start == SOLAR_AUTO_START_CONFIG && CONFIG_GET(flag/autostart_solars))) // CHOMPEdit + if(forced || auto_start == SOLAR_AUTO_START_YES || (auto_start == SOLAR_AUTO_START_CONFIG && CONFIG_GET(flag/autostart_solars)) ) track = 2 // Auto tracking mode. search_for_connected() if(connected_tracker) diff --git a/code/modules/radiation/radiation.dm b/code/modules/radiation/radiation.dm index 19747a9267..f0f38ae54e 100644 --- a/code/modules/radiation/radiation.dm +++ b/code/modules/radiation/radiation.dm @@ -18,12 +18,12 @@ /datum/radiation_source/proc/update_rad_power(var/new_power = null) if(new_power == null || new_power == rad_power) return // No change - else if(new_power <= CONFIG_GET(number/radiation_lower_limit)) // CHOMPEdit + else if(new_power <= CONFIG_GET(number/radiation_lower_limit)) qdel(src) // Decayed to nothing else rad_power = new_power if(!flat) - range = min(round(sqrt(rad_power / CONFIG_GET(number/radiation_lower_limit))), 31) // R = rad_power / dist**2 - Solve for dist // CHOMPEdit + range = min(round(sqrt(rad_power / CONFIG_GET(number/radiation_lower_limit))), 31) // R = rad_power / dist**2 - Solve for dist return /turf @@ -38,7 +38,7 @@ else if(O.density) //So open doors don't get counted var/datum/material/M = O.get_material() if(!M) continue - cached_rad_resistance += (M.weight + M.radiation_resistance) / CONFIG_GET(number/radiation_material_resistance_divisor) // CHOMPEdit + cached_rad_resistance += (M.weight + M.radiation_resistance) / CONFIG_GET(number/radiation_material_resistance_divisor) // Looks like storing the contents length is meant to be a basic check if the cache is stale due to items enter/exiting. Better than nothing so I'm leaving it as is. ~Leshana SSradiation.resistance_cache[src] = (length(contents) + 1) return @@ -49,7 +49,7 @@ temp_rad_resistance += material.weight + material.radiation_resistance if(reinf_material) temp_rad_resistance += reinf_material.weight + reinf_material.radiation_resistance - cached_rad_resistance = (density ? (temp_rad_resistance) / CONFIG_GET(number/radiation_material_resistance_divisor) : 0) // CHOMPEdit + cached_rad_resistance = (density ? (temp_rad_resistance) / CONFIG_GET(number/radiation_material_resistance_divisor) : 0) return /turf/simulated/mineral/calc_rad_resistance() diff --git a/code/modules/resleeving/computers.dm b/code/modules/resleeving/computers.dm index 9206f1788d..2ec7dc4051 100644 --- a/code/modules/resleeving/computers.dm +++ b/code/modules/resleeving/computers.dm @@ -338,7 +338,7 @@ return //Disabled in config. - else if(!CONFIG_GET(flag/revival_cloning)) // CHOMPEdit + else if(!CONFIG_GET(flag/revival_cloning)) set_temp("Error: Unable to initiate growing cycle.", "danger") active_br = null return diff --git a/code/modules/resleeving/machines.dm b/code/modules/resleeving/machines.dm index 96d9517adc..5e21943868 100644 --- a/code/modules/resleeving/machines.dm +++ b/code/modules/resleeving/machines.dm @@ -205,7 +205,7 @@ /obj/machinery/clonepod/transhuman/get_completion() if(occupant) - return 100 * ((occupant.health + abs(CONFIG_GET(number/health_threshold_dead))) / (occupant.maxHealth + abs(CONFIG_GET(number/health_threshold_dead)))) // CHOMPEdit + return 100 * ((occupant.health + abs(CONFIG_GET(number/health_threshold_dead))) / (occupant.maxHealth + abs(CONFIG_GET(number/health_threshold_dead)))) return 0 /obj/machinery/clonepod/transhuman/examine(mob/user, infix, suffix) diff --git a/code/modules/security levels/keycard authentication.dm b/code/modules/security levels/keycard authentication.dm index af953fd833..307570a01e 100644 --- a/code/modules/security levels/keycard authentication.dm +++ b/code/modules/security levels/keycard authentication.dm @@ -89,7 +89,7 @@ if(screen == 1) dat += "Select an event to trigger: