From 01cf2bdc58185d8afcc79e69bd179d1f037a476a Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Tue, 24 Mar 2020 20:20:18 -0700 Subject: [PATCH] k --- code/__HELPERS/files.dm | 4 - code/__HELPERS/logging.dm | 15 +- code/__defines/subsystems.dm | 3 - code/controllers/autotransfer.dm | 9 +- .../configuration_old/configuration.dm | 45 +-- .../configuration_old/configuration_vr.dm | 10 +- code/controllers/subsystems/mobs.dm | 10 - code/controllers/subsystems/time_track.dm | 26 -- code/controllers/subsystems/transcore_vr.dm | 10 - code/controllers/subsystems/vote.dm | 7 +- code/controllers/verbs.dm | 71 ---- code/datums/world_topic.dm | 4 - code/game/world.dm | 327 +----------------- code/global.dm | 5 - .../security levels/security levels.dm | 30 +- .../vore/appearance/sprite_accessories_vr.dm | 9 - code/modules/vore/eating/vore_vr.dm | 7 +- 17 files changed, 38 insertions(+), 554 deletions(-) diff --git a/code/__HELPERS/files.dm b/code/__HELPERS/files.dm index 79ec5d553ed..02aea4e3544 100644 --- a/code/__HELPERS/files.dm +++ b/code/__HELPERS/files.dm @@ -53,11 +53,7 @@ /client/proc/file_spam_check() var/time_to_wait = fileaccess_timer - world.time if(time_to_wait > 0) -<<<<<<< HEAD to_chat(src, "Error: file_spam_check(): Spam. Please wait [round(time_to_wait/10)] seconds.") -======= - src << "log_world: file_spam_check(): Spam. Please wait [round(time_to_wait/10)] seconds." ->>>>>>> citrp/master return 1 fileaccess_timer = world.time + FTPDELAY return 0 diff --git a/code/__HELPERS/logging.dm b/code/__HELPERS/logging.dm index d4512cc2de1..5cdc06ec393 100644 --- a/code/__HELPERS/logging.dm +++ b/code/__HELPERS/logging.dm @@ -33,11 +33,7 @@ /proc/log_access_in(client/new_client) if (config_legacy.log_access) var/message = "[key_name(new_client)] - IP:[new_client.address] - CID:[new_client.computer_id] - BYOND v[new_client.byond_version]" -<<<<<<< HEAD - WRITE_LOG(diary, "ACCESS IN: [message]") //VOREStation Edit -======= WRITE_LOG(GLOB.world_game_log, "ACCESS IN: [message]") ->>>>>>> citrp/master /proc/log_access_out(mob/last_mob) if (config_legacy.log_access) @@ -75,15 +71,12 @@ if (config_legacy.log_whisper) WRITE_LOG(GLOB.world_game_log, "WHISPER: [speaker.simple_info_line()]: [html_decode(text)]") -<<<<<<< HEAD if(speaker.client) speaker.dialogue_log += "([time_stamp()]) ([speaker]/[speaker.client]) SAY: - [text]" GLOB.round_text_log += "([time_stamp()]) ([speaker]/[speaker.client]) SAY: - [text]" -======= /proc/log_access(text) WRITE_LOG(GLOB.world_game_log, "ACCESS: [text]") ->>>>>>> citrp/master /proc/log_emote(text, mob/speaker) if (config_legacy.log_emote) @@ -107,7 +100,7 @@ /proc/log_eventsay(text, mob/speaker) <<<<<<< HEAD - if (config.log_adminchat) + if (config_legacy.log_adminchat) WRITE_LOG(diary, "EVENTSAY: [speaker.simple_info_line()]: [html_decode(text)]") ======= if (config_legacy.log_adminchat) @@ -132,7 +125,7 @@ /proc/log_pda(text, mob/speaker) <<<<<<< HEAD - if (config.log_pda) + if (config_legacy.log_pda) WRITE_LOG(diary, "PDA: [speaker.simple_info_line()]: [html_decode(text)]") speaker.dialogue_log += "([time_stamp()]) ([speaker]/[speaker.client]) MSG: - [text]" @@ -141,7 +134,7 @@ /proc/log_to_dd(text) world.log << text //this comes before the config check because it can't possibly runtime - if(config.log_world_output) + if(config_legacy.log_world_output) WRITE_LOG(diary, "DD_OUTPUT: [text]") ======= if (config_legacy.log_pda) @@ -157,7 +150,7 @@ WRITE_LOG(diary, "MISC: [text]") /proc/log_topic(text) - if(config.log_topic) + if(config_legacy.log_topic) WRITE_LOG(diary, "TOPIC: [text]") /proc/log_href(text) diff --git a/code/__defines/subsystems.dm b/code/__defines/subsystems.dm index 3387a6b6409..d5a168a53b2 100644 --- a/code/__defines/subsystems.dm +++ b/code/__defines/subsystems.dm @@ -83,12 +83,9 @@ var/global/list/runlevel_flags = list(RUNLEVEL_LOBBY, RUNLEVEL_SETUP, RUNLEVEL_G #define FIRE_PRIORITY_SHUTTLES 5 #define FIRE_PRIORITY_ORBIT 8 #define FIRE_PRIORITY_VOTE 9 -<<<<<<< HEAD #define FIRE_PRIORITY_AI 10 -======= #define FIRE_PRIORITY_PING 10 #define FIRE_PRIORITY_SERVER_MAINT 10 ->>>>>>> citrp/master #define FIRE_PRIORITY_GARBAGE 15 #define FIRE_PRIORITY_CHARSETUP 25 #define FIRE_PRIORITY_AIRFLOW 30 diff --git a/code/controllers/autotransfer.dm b/code/controllers/autotransfer.dm index 0cfafb5035b..4c987d40283 100644 --- a/code/controllers/autotransfer.dm +++ b/code/controllers/autotransfer.dm @@ -8,17 +8,10 @@ datum/controller/transfer_controller var/shift_hard_end = 0 //VOREStation Edit var/shift_last_vote = 0 //Citadel Edit datum/controller/transfer_controller/New() -<<<<<<< HEAD - timerbuffer = config.vote_autotransfer_initial - shift_hard_end = config.vote_autotransfer_initial + (config.vote_autotransfer_interval * NUMBER_OF_VOTE_EXTENSIONS) //VOREStation Edit //Change this "1" to how many extend votes you want there to be. - shift_last_vote = shift_hard_end - config.vote_autotransfer_interval //VOREStation Edit - START_PROCESSING(SSobj, src) -======= timerbuffer = config_legacy.vote_autotransfer_initial shift_hard_end = config_legacy.vote_autotransfer_initial + (config_legacy.vote_autotransfer_interval * NUMBER_OF_VOTE_EXTENSIONS) //VOREStation Edit //Change this "1" to how many extend votes you want there to be. shift_last_vote = shift_hard_end - config_legacy.vote_autotransfer_interval //VOREStation Edit - processing_objects += src ->>>>>>> citrp/master + START_PROCESSING(SSobj, src) datum/controller/transfer_controller/Destroy() STOP_PROCESSING(SSobj, src) diff --git a/code/controllers/configuration_old/configuration.dm b/code/controllers/configuration_old/configuration.dm index 95e16035884..52e4d802dd4 100644 --- a/code/controllers/configuration_old/configuration.dm +++ b/code/controllers/configuration_old/configuration.dm @@ -379,7 +379,7 @@ config_legacy.log_runtime = 1 if ("log_topic") - config.log_topic = text2num(value) + config_legacy.log_topic = text2num(value) if ("generate_map") config_legacy.generate_map = 1 @@ -435,16 +435,11 @@ if ("allow_ai") config_legacy.allow_ai = 1 -<<<<<<< HEAD:code/controllers/configuration.dm if ("allow_ai_shells") - config.allow_ai_shells = TRUE + config_legacy.allow_ai_shells = TRUE if("give_free_ai_shell") - config.give_free_ai_shell = TRUE -======= - if ("allow_ai_drones") - config_legacy.allow_ai_drones = 1 ->>>>>>> citrp/master:code/controllers/configuration_old/configuration.dm + config_legacy.give_free_ai_shell = TRUE // if ("authentication") // config_legacy.enable_authentication = 1 @@ -558,11 +553,11 @@ if(req_pos) req_name = lowertext(copytext(value, 1, req_pos)) req_value = copytext(value, req_pos + 1) - if(req_name in config.modes) + if(req_name in config_legacy.modes) if(is_secret_override) - config.player_requirements_secret[req_name] = text2num(req_value) + config_legacy.player_requirements_secret[req_name] = text2num(req_value) else - config.player_requirements[req_name] = text2num(req_value) + config_legacy.player_requirements[req_name] = text2num(req_value) else log_misc("Unknown game mode player requirement configuration definition: [req_name].") else @@ -572,7 +567,7 @@ config_legacy.allow_random_events = 1 if("enable_game_master") - config.enable_game_master = 1 + config_legacy.enable_game_master = 1 if("kick_inactive") config_legacy.kick_inactive = text2num(value) @@ -820,21 +815,17 @@ config_legacy.second_click_limit = text2num(value) if("minute_topic_limit") -<<<<<<< HEAD:code/controllers/configuration.dm - config.minute_topic_limit = text2num(value) - if("random_submap_orientation") - config.random_submap_orientation = 1 - - if("second_topic_limit") - config.second_topic_limit = text2num(value) - if("autostart_solars") - config.autostart_solars = TRUE -======= config_legacy.minute_topic_limit = text2num(value) + if("random_submap_orientation") + config_legacy.random_submap_orientation = 1 + + if("second_topic_limit") + config_legacy.second_topic_limit = text2num(value) + if("autostart_solars") + config_legacy.autostart_solars = TRUE if("second_topic_limit") config_legacy.second_topic_limit = text2num(value) ->>>>>>> citrp/master:code/controllers/configuration_old/configuration.dm else log_misc("Unknown setting in configuration: '[name]'") @@ -874,13 +865,9 @@ if("bones_can_break") config_legacy.bones_can_break = value if("limbs_can_break") -<<<<<<< HEAD:code/controllers/configuration.dm - config.limbs_can_break = value - if("allow_headgibs") - config.allow_headgibs = TRUE -======= config_legacy.limbs_can_break = value ->>>>>>> citrp/master:code/controllers/configuration_old/configuration.dm + if("allow_headgibs") + config_legacy.allow_headgibs = TRUE if("run_speed") config_legacy.run_speed = value diff --git a/code/controllers/configuration_old/configuration_vr.dm b/code/controllers/configuration_old/configuration_vr.dm index af0c4e0e8ec..76bf395a40a 100644 --- a/code/controllers/configuration_old/configuration_vr.dm +++ b/code/controllers/configuration_old/configuration_vr.dm @@ -12,7 +12,7 @@ var/require_flavor = FALSE /hook/startup/proc/read_vs_config() - var/list/Lines = file2list("config/legacy/config.txt") + var/list/Lines = file2list("config/legacy/config_legacy.txt") for(var/t in Lines) if(!t) continue @@ -55,11 +55,7 @@ if ("time_off") config_legacy.time_off = TRUE if ("pto_job_change") -<<<<<<< HEAD:code/controllers/configuration_vr.dm - config.pto_job_change = TRUE - if ("require_flavor") - config.require_flavor = TRUE -======= config_legacy.pto_job_change = TRUE ->>>>>>> citrp/master:code/controllers/configuration_old/configuration_vr.dm + if ("require_flavor") + config_legacy.require_flavor = TRUE return 1 diff --git a/code/controllers/subsystems/mobs.dm b/code/controllers/subsystems/mobs.dm index 12c53aad224..95a05902306 100644 --- a/code/controllers/subsystems/mobs.dm +++ b/code/controllers/subsystems/mobs.dm @@ -46,20 +46,10 @@ SUBSYSTEM_DEF(mobs) else // Right now mob.Life() is unstable enough I think we need to use a try catch. // Obviously we should try and get rid of this for performance reasons when we can. -<<<<<<< HEAD - try - if(M.low_priority && !(M.z in busy_z_levels)) - slept_mobs++ - continue - M.Life(times_fired) - catch(var/exception/e) - log_runtime(e, M, "Caught by [name] subsystem") -======= if(M.low_priority && !(M.z in busy_z_levels)) slept_mobs++ continue M.Life(times_fired) ->>>>>>> citrp/master if (MC_TICK_CHECK) return diff --git a/code/controllers/subsystems/time_track.dm b/code/controllers/subsystems/time_track.dm index d5dac25121a..88dcfa1a99a 100644 --- a/code/controllers/subsystems/time_track.dm +++ b/code/controllers/subsystems/time_track.dm @@ -1,10 +1,6 @@ SUBSYSTEM_DEF(time_track) name = "Time Tracking" -<<<<<<< HEAD - wait = 600 -======= wait = 1 SECONDS ->>>>>>> citrp/master flags = SS_NO_INIT|SS_NO_TICK_CHECK runlevels = RUNLEVEL_LOBBY | RUNLEVELS_DEFAULT @@ -20,27 +16,6 @@ SUBSYSTEM_DEF(time_track) var/last_tick_byond_time = 0 var/last_tick_tickcount = 0 -<<<<<<< HEAD -/datum/controller/subsystem/time_track/fire() - - var/current_realtime = REALTIMEOFDAY - var/current_byondtime = world.time - var/current_tickcount = world.time/world.tick_lag - - if (!first_run) - var/tick_drift = max(0, (((current_realtime - last_tick_realtime) - (current_byondtime - last_tick_byond_time)) / world.tick_lag)) - - time_dilation_current = tick_drift / (current_tickcount - last_tick_tickcount) * 100 - - time_dilation_avg_fast = MC_AVERAGE_FAST(time_dilation_avg_fast, time_dilation_current) - time_dilation_avg = MC_AVERAGE(time_dilation_avg, time_dilation_avg_fast) - time_dilation_avg_slow = MC_AVERAGE_SLOW(time_dilation_avg_slow, time_dilation_avg) - else - first_run = FALSE - last_tick_realtime = current_realtime - last_tick_byond_time = current_byondtime - last_tick_tickcount = current_tickcount -======= var/last_measurement = 0 var/measurement_delay = 60 @@ -72,4 +47,3 @@ SUBSYSTEM_DEF(time_track) //stat_time_text = "Server Time: [time2text(world.timeofday, "YYYY-MM-DD hh:mm:ss")]\n\nRound Time: [WORLDTIME2TEXT("hh:mm:ss")]\n\nStation Time: [STATION_TIME_TIMESTAMP("hh:mm:ss", world.time)]\n\n[time_dilation_text]" stat_time_text = time_dilation_text ->>>>>>> citrp/master diff --git a/code/controllers/subsystems/transcore_vr.dm b/code/controllers/subsystems/transcore_vr.dm index 401c72a6640..6006f5a9e99 100644 --- a/code/controllers/subsystems/transcore_vr.dm +++ b/code/controllers/subsystems/transcore_vr.dm @@ -170,13 +170,8 @@ SUBSYSTEM_DEF(transcore) /datum/controller/subsystem/transcore/proc/add_backup(var/datum/transhuman/mind_record/MR) ASSERT(MR) backed_up[MR.mindname] = MR -<<<<<<< HEAD backed_up = sortTim(backed_up, /proc/cmp_text_asc, TRUE) - log_debug("Added [MR.mindname] to transcore DB.") -======= - backed_up = sortAssoc(backed_up) subsystem_log("Added [MR.mindname] to transcore DB.") ->>>>>>> citrp/master // Remove a mind_record from the backup-checking list. Keeps track of it in has_left // Why do we do that? ~Leshana /datum/controller/subsystem/transcore/proc/stop_backup(var/datum/transhuman/mind_record/MR) @@ -190,13 +185,8 @@ SUBSYSTEM_DEF(transcore) /datum/controller/subsystem/transcore/proc/add_body(var/datum/transhuman/body_record/BR) ASSERT(BR) body_scans[BR.mydna.name] = BR -<<<<<<< HEAD body_scans = sortTim(body_scans, /proc/cmp_text_asc, TRUE) - log_debug("Added [BR.mydna.name] to transcore body DB.") -======= - body_scans = sortAssoc(body_scans) subsystem_log("Added [BR.mydna.name] to transcore body DB.") ->>>>>>> citrp/master // Remove a body record from the database (Usually done when someone cryos) // Why? ~Leshana /datum/controller/subsystem/transcore/proc/remove_body(var/datum/transhuman/body_record/BR) diff --git a/code/controllers/subsystems/vote.dm b/code/controllers/subsystems/vote.dm index 60055e52ea7..d0ed341a6be 100644 --- a/code/controllers/subsystems/vote.dm +++ b/code/controllers/subsystems/vote.dm @@ -78,13 +78,8 @@ SUBSYSTEM_DEF(vote) if(votes > greatest_votes) greatest_votes = votes -<<<<<<< HEAD - if(!config.vote_no_default && choices.len) // Default-vote for everyone who didn't vote - var/non_voters = (GLOB.clients.len - total_votes) -======= if(!config_legacy.vote_no_default && choices.len) // Default-vote for everyone who didn't vote - var/non_voters = (clients.len - total_votes) ->>>>>>> citrp/master + var/non_voters = (GLOB.clients.len - total_votes) if(non_voters > 0) if(mode == VOTE_RESTART) choices["Continue Playing"] += non_voters diff --git a/code/controllers/verbs.dm b/code/controllers/verbs.dm index 6a961e9ad52..1c4484d9b58 100644 --- a/code/controllers/verbs.dm +++ b/code/controllers/verbs.dm @@ -63,16 +63,11 @@ usr.client.debug_variables(antag) message_admins("Admin [key_name_admin(usr)] is debugging the [antag.role_text] template.") -<<<<<<< HEAD /client/proc/debug_controller() -======= -/client/proc/debug_controller(controller in list("Master","Ticker","Ticker Process","Air","Jobs","Sun","Radio","Supply","Shuttles","Emergency Shuttle","Legacy Configuration","pAI", "Cameras", "Transfer Controller", "Gas Data","Event","Plants","Alarm","Nano","Chemistry","Vote","Xenobio","Planets")) ->>>>>>> citrp/master set category = "Debug" set name = "Debug Controller" set desc = "Debug the various subsystems/controllers for the game (be careful!)" -<<<<<<< HEAD if(!holder) return var/list/options = list() @@ -117,72 +112,6 @@ feedback_add_details("admin_verb", "DebugController") message_admins("Admin [key_name_admin(mob)] is debugging the [pick] controller.") debug_variables(D) -======= - if(!holder) return - switch(controller) - if("Master") - debug_variables(master_controller) - feedback_add_details("admin_verb","DMC") - if("Ticker") - debug_variables(ticker) - feedback_add_details("admin_verb","DTicker") - if("Ticker Process") - debug_variables(tickerProcess) - feedback_add_details("admin_verb","DTickerProcess") - if("Air") - debug_variables(air_master) - feedback_add_details("admin_verb","DAir") - if("Jobs") - debug_variables(job_master) - feedback_add_details("admin_verb","DJobs") - if("Sun") - debug_variables(sun) - feedback_add_details("admin_verb","DSun") - if("Radio") - debug_variables(radio_controller) - feedback_add_details("admin_verb","DRadio") - if("Supply") - debug_variables(supply_controller) - feedback_add_details("admin_verb","DSupply") - if("Shuttles") - debug_variables(shuttle_controller) - feedback_add_details("admin_verb","DShuttles") - if("Emergency Shuttle") - debug_variables(emergency_shuttle) - feedback_add_details("admin_verb","DEmergency") - if("Legacy Configuration") - debug_variables(config_legacy) - feedback_add_details("admin_verb","DConf") - if("pAI") - debug_variables(paiController) - feedback_add_details("admin_verb","DpAI") - if("Cameras") - debug_variables(cameranet) - feedback_add_details("admin_verb","DCameras") - if("Transfer Controller") - debug_variables(transfer_controller) - feedback_add_details("admin_verb","DAutovoter") - if("Gas Data") - debug_variables(gas_data) - feedback_add_details("admin_verb","DGasdata") - if("Event") - debug_variables(event_manager) - feedback_add_details("admin_verb", "DEvent") - if("Plants") - debug_variables(plant_controller) - feedback_add_details("admin_verb", "DPlants") - if("Alarm") - debug_variables(alarm_manager) - feedback_add_details("admin_verb", "DAlarm") - if("Nano") - debug_variables(GLOB.nanomanager) - feedback_add_details("admin_verb", "DNano") - if("Chemistry") - debug_variables(chemistryProcess) - feedback_add_details("admin_verb", "DChem") - message_admins("Admin [key_name_admin(usr)] is debugging the [controller] controller.") - return ->>>>>>> citrp/master //VOREStation Edit Begin /client/proc/debug_process_scheduler() diff --git a/code/datums/world_topic.dm b/code/datums/world_topic.dm index dd95a3a1421..a415c794294 100644 --- a/code/datums/world_topic.dm +++ b/code/datums/world_topic.dm @@ -54,11 +54,7 @@ log = FALSE /datum/world_topic/playing/Run(list/input) -<<<<<<< HEAD - return player_list.len -======= return length(player_list) ->>>>>>> citrp/master /datum/world_topic/pr_announce keyword = "announce" diff --git a/code/game/world.dm b/code/game/world.dm index 0578f2b696d..7a9b3c8031c 100644 --- a/code/game/world.dm +++ b/code/game/world.dm @@ -28,7 +28,7 @@ GLOBAL_LIST(topic_status_cache) GLOB.revdata = new - config.Load(params[OVERRIDE_CONFIG_DIRECTORY_PARAMETER]) + config_legacy.Load(params[OVERRIDE_CONFIG_DIRECTORY_PARAMETER]) SetupLogs() @@ -111,7 +111,7 @@ GLOBAL_LIST(topic_status_cache) /world/proc/SetupExternalRsc() #if (PRELOAD_RSC == 0) - GLOB.external_rsc_urls = world.file2list("[global.config.directory]/external_rsc_urls.txt","\n") + GLOB.external_rsc_urls = world.file2list("[global.config_legacy.directory]/external_rsc_urls.txt","\n") var/i=1 while(i<=GLOB.external_rsc_urls.len) if(GLOB.external_rsc_urls[i]) @@ -197,329 +197,6 @@ GLOBAL_LIST(topic_status_cache) handler = new handler() return handler.TryRun(input) -<<<<<<< HEAD -*/ - -//temporary compatibility patch start - var/static/list/topic_handlers = TopicHandlers() - - var/list/input = params2list(T) - var/datum/world_topic/handler - for(var/I in topic_handlers) - if(I in input) - handler = topic_handlers[I] - break - - if(handler) - handler = new handler - . = handler.TryRun(input) - -//END - - if (T == "ping") - var/x = 1 - for (var/client/C) - x++ - return x - -/* - - if (T == "ping") - var/x = 1 - for (var/client/C) - x++ - return x - - else if(T == "players") - var/n = 0 - for(var/mob/M in player_list) - if(M.client) - n++ - return n - - else if (copytext(T,1,7) == "status") - var/input[] = params2list(T) - var/list/s = list() - s["version"] = game_version - s["mode"] = master_mode - s["respawn"] = config.abandon_allowed - s["enter"] = config.enter_allowed - s["vote"] = config.allow_vote_mode - s["ai"] = config.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. - s["players"] = 0 - s["stationtime"] = stationtime2text() - s["roundduration"] = roundduration2text() - - if(input["status"] == "2") - var/list/players = list() - var/list/admins = list() - - for(var/client/C in GLOB.clients) - if(C.holder) - if(C.holder.fakekey) - continue - admins[C.key] = C.holder.rank - players += C.key - - s["players"] = players.len - s["playerlist"] = list2params(players) - var/list/adm = get_admin_counts() - var/list/presentmins = adm["present"] - var/list/afkmins = adm["afk"] - s["admins"] = presentmins.len + afkmins.len //equivalent to the info gotten from adminwho - s["adminlist"] = list2params(admins) - else - var/n = 0 - var/admins = 0 - - for(var/client/C in GLOB.clients) - if(C.holder) - if(C.holder.fakekey) - continue //so stealthmins aren't revealed by the hub - admins++ - s["player[n]"] = C.key - n++ - - s["players"] = n - s["admins"] = admins - - return list2params(s) - - else if(T == "manifest") - var/list/positions = list() - var/list/set_names = list( - "heads" = command_positions, - "sec" = security_positions, - "eng" = engineering_positions, - "med" = medical_positions, - "sci" = science_positions, - "car" = cargo_positions, - "pla" = planet_positions, //VOREStation Edit, - "civ" = civilian_positions, - "bot" = nonhuman_positions - ) - - for(var/datum/data/record/t in data_core.general) - var/name = t.fields["name"] - var/rank = t.fields["rank"] - var/real_rank = make_list_rank(t.fields["real_rank"]) - - var/department = 0 - for(var/k in set_names) - if(real_rank in set_names[k]) - if(!positions[k]) - positions[k] = list() - positions[k][name] = rank - department = 1 - if(!department) - if(!positions["misc"]) - positions["misc"] = list() - positions["misc"][name] = rank - - // Synthetics don't have actual records, so we will pull them from here. - for(var/mob/living/silicon/ai/ai in mob_list) - if(!positions["bot"]) - positions["bot"] = list() - positions["bot"][ai.name] = "Artificial Intelligence" - for(var/mob/living/silicon/robot/robot in mob_list) - // No combat/syndicate cyborgs, no drones, and no AI shells. - if(robot.shell) - continue - if(robot.module && robot.module.hide_on_manifest) - continue - if(!positions["bot"]) - positions["bot"] = list() - positions["bot"][robot.name] = "[robot.modtype] [robot.braintype]" - - for(var/k in positions) - positions[k] = list2params(positions[k]) // converts positions["heads"] = list("Bob"="Captain", "Bill"="CMO") into positions["heads"] = "Bob=Captain&Bill=CMO" - - return list2params(positions) - - else if(T == "revision") - if(revdata.revision) - return list2params(list(branch = revdata.branch, date = revdata.date, revision = revdata.revision)) - else - return "unknown" - - else if(copytext(T,1,5) == "info") - var/input[] = params2list(T) - if(input["key"] != config.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 - return "Bad Key (Throttled)" - - world_topic_spam_protect_time = world.time - world_topic_spam_protect_ip = addr - - return "Bad Key" - - var/list/search = params2list(input["info"]) - var/list/ckeysearch = list() - for(var/text in search) - ckeysearch += ckey(text) - - var/list/match = list() - - for(var/mob/M in mob_list) - var/strings = list(M.name, M.ckey) - if(M.mind) - strings += M.mind.assigned_role - strings += M.mind.special_role - for(var/text in strings) - if(ckey(text) in ckeysearch) - match[M] += 10 // an exact match is far better than a partial one - else - for(var/searchstr in search) - if(findtext(text, searchstr)) - match[M] += 1 - - var/maxstrength = 0 - for(var/mob/M in match) - maxstrength = max(match[M], maxstrength) - for(var/mob/M in match) - if(match[M] < maxstrength) - match -= M - - if(!match.len) - return "No matches" - else if(match.len == 1) - var/mob/M = match[1] - var/info = list() - info["key"] = M.key - info["name"] = M.name == M.real_name ? M.name : "[M.name] ([M.real_name])" - info["role"] = M.mind ? (M.mind.assigned_role ? M.mind.assigned_role : "No role") : "No mind" - var/turf/MT = get_turf(M) - info["loc"] = M.loc ? "[M.loc]" : "null" - info["turf"] = MT ? "[MT] @ [MT.x], [MT.y], [MT.z]" : "null" - info["area"] = MT ? "[MT.loc]" : "null" - info["antag"] = M.mind ? (M.mind.special_role ? M.mind.special_role : "Not antag") : "No mind" - info["hasbeenrev"] = M.mind ? M.mind.has_been_rev : "No mind" - info["stat"] = M.stat - info["type"] = M.type - if(isliving(M)) - var/mob/living/L = M - info["damage"] = list2params(list( - oxy = L.getOxyLoss(), - tox = L.getToxLoss(), - fire = L.getFireLoss(), - brute = L.getBruteLoss(), - clone = L.getCloneLoss(), - brain = L.getBrainLoss() - )) - else - info["damage"] = "non-living" - info["gender"] = M.gender - return list2params(info) - else - var/list/ret = list() - for(var/mob/M in match) - ret[M.key] = M.name - return list2params(ret) - - else if(copytext(T,1,9) == "adminmsg") - /* - We got an adminmsg from IRC bot lets split the input then validate the input. - expected output: - 1. adminmsg = ckey of person the message is to - 2. msg = contents of message, parems2list requires - 3. validatationkey = the key the bot has, it should match the gameservers commspassword in it's configuration. - 4. sender = the ircnick that send the message. - */ - - - var/input[] = params2list(T) - if(input["key"] != config.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 - return "Bad Key (Throttled)" - - world_topic_spam_protect_time = world.time - world_topic_spam_protect_ip = addr - - return "Bad Key" - - var/client/C - var/req_ckey = ckey(input["adminmsg"]) - - for(var/client/K in GLOB.clients) - if(K.ckey == req_ckey) - C = K - break - if(!C) - return "No client with that name on server" - - var/rank = input["rank"] - if(!rank) - rank = "Admin" - - var/message = "IRC-[rank] PM from IRC-[input["sender"]]: [input["msg"]]" - var/amessage = "IRC-[rank] PM from IRC-[input["sender"]] to [key_name(C)] : [input["msg"]]" - - C.received_irc_pm = world.time - C.irc_admin = input["sender"] - - C << 'sound/effects/adminhelp.ogg' - C << message - - - for(var/client/A in admins) - if(A != C) - A << amessage - - return "Message Successful" - - else if(copytext(T,1,6) == "notes") - /* - We got a request for notes from the IRC Bot - expected output: - 1. notes = ckey of person the notes lookup is for - 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.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 - return "Bad Key (Throttled)" - - world_topic_spam_protect_time = world.time - world_topic_spam_protect_ip = addr - return "Bad Key" - - return show_player_info_irc(ckey(input["notes"])) - - else if(copytext(T,1,4) == "age") - var/input[] = params2list(T) - if(input["key"] != config.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 - return "Bad Key (Throttled)" - - world_topic_spam_protect_time = world.time - world_topic_spam_protect_ip = addr - return "Bad Key" - - var/age = get_player_age(input["age"]) - if(isnum(age)) - if(age >= 0) - return "[age]" - else - return "Ckey not found" - else - return "Database connection failed or not set up" -*/ -======= ->>>>>>> citrp/master /world/Reboot(reason = 0, fast_track = FALSE) if (reason || fast_track) //special reboot, do none of the normal stuff diff --git a/code/global.dm b/code/global.dm index 9298c70098e..0b27b6a20af 100644 --- a/code/global.dm +++ b/code/global.dm @@ -84,12 +84,7 @@ var/list/reverse_dir = list( // reverse_dir[dir] = reverse of dir 23, 28, 30, 29, 31, 48, 50, 49, 51, 56, 58, 57, 59, 52, 54, 53, 55, 60, 62, 61, 63 ) -<<<<<<< HEAD -var/datum/configuration/config = null -======= var/datum/configuration_legacy/config_legacy = null -var/datum/sun/sun = null ->>>>>>> citrp/master var/list/combatlog = list() var/list/IClog = list() diff --git a/code/modules/security levels/security levels.dm b/code/modules/security levels/security levels.dm index 52f3781f431..76ea32c8f4c 100644 --- a/code/modules/security levels/security levels.dm +++ b/code/modules/security levels/security levels.dm @@ -32,41 +32,31 @@ if(level >= SEC_LEVEL_GREEN && level <= SEC_LEVEL_DELTA && level != security_level) switch(level) if(SEC_LEVEL_GREEN) -<<<<<<< HEAD - security_announcement_down.Announce("[config.alert_desc_green]", "Attention! Alert level lowered to code green.") -======= - security_announcement_down.Announce("[config_legacy.alert_desc_green]", "Attention! Security level lowered to green") ->>>>>>> citrp/master + security_announcement_down.Announce("[config_legacy.alert_desc_green]", "Attention! Alert level lowered to code green.") security_level = SEC_LEVEL_GREEN if(SEC_LEVEL_YELLOW) if(security_level < SEC_LEVEL_YELLOW) - security_announcement_up.Announce("[config.alert_desc_yellow_upto]", "Attention! Alert level elevated to yellow") + security_announcement_up.Announce("[config_legacy.alert_desc_yellow_upto]", "Attention! Alert level elevated to yellow") else - security_announcement_down.Announce("[config.alert_desc_yellow_downto]", "Attention! Alert level lowered to yellow") + security_announcement_down.Announce("[config_legacy.alert_desc_yellow_downto]", "Attention! Alert level lowered to yellow") security_level = SEC_LEVEL_YELLOW if(SEC_LEVEL_VIOLET) if(security_level < SEC_LEVEL_VIOLET) - security_announcement_up.Announce("[config.alert_desc_violet_upto]", "Attention! Alert level elevated to violet") + security_announcement_up.Announce("[config_legacy.alert_desc_violet_upto]", "Attention! Alert level elevated to violet") else - security_announcement_down.Announce("[config.alert_desc_violet_downto]", "Attention! Alert level lowered to violet") + security_announcement_down.Announce("[config_legacy.alert_desc_violet_downto]", "Attention! Alert level lowered to violet") security_level = SEC_LEVEL_VIOLET if(SEC_LEVEL_ORANGE) if(security_level < SEC_LEVEL_ORANGE) - security_announcement_up.Announce("[config.alert_desc_orange_upto]", "Attention! Alert level elevated to orange") + security_announcement_up.Announce("[config_legacy.alert_desc_orange_upto]", "Attention! Alert level elevated to orange") else - security_announcement_down.Announce("[config.alert_desc_orange_downto]", "Attention! Alert level lowered to orange") + security_announcement_down.Announce("[config_legacy.alert_desc_orange_downto]", "Attention! Alert level lowered to orange") security_level = SEC_LEVEL_ORANGE if(SEC_LEVEL_BLUE) if(security_level < SEC_LEVEL_BLUE) -<<<<<<< HEAD - security_announcement_up.Announce("[config.alert_desc_blue_upto]", "Attention! Alert level elevated to blue") + security_announcement_up.Announce("[config_legacy.alert_desc_blue_upto]", "Attention! Alert level elevated to blue") else - security_announcement_down.Announce("[config.alert_desc_blue_downto]", "Attention! Alert level lowered to blue") -======= - security_announcement_up.Announce("[config_legacy.alert_desc_blue_upto]", "Attention! Security level elevated to blue") - else - security_announcement_down.Announce("[config_legacy.alert_desc_blue_downto]", "Attention! Security level lowered to blue") ->>>>>>> citrp/master + security_announcement_down.Announce("[config_legacy.alert_desc_blue_downto]", "Attention! Alert level lowered to blue") security_level = SEC_LEVEL_BLUE if(SEC_LEVEL_RED) if(security_level < SEC_LEVEL_RED) @@ -80,7 +70,7 @@ CC.post_status("alert", "redalert")*/ if(SEC_LEVEL_DELTA) <<<<<<< HEAD - security_announcement_up.Announce("[config.alert_desc_delta]", "Attention! Delta alert level reached!", new_sound = 'sound/effects/siren.ogg') + security_announcement_up.Announce("[config_legacy.alert_desc_delta]", "Attention! Delta alert level reached!", new_sound = 'sound/effects/siren.ogg') ======= security_announcement_up.Announce("[config_legacy.alert_desc_delta]", "Attention! Delta security level reached!", new_sound = 'sound/effects/siren.ogg') >>>>>>> citrp/master diff --git a/code/modules/vore/appearance/sprite_accessories_vr.dm b/code/modules/vore/appearance/sprite_accessories_vr.dm index abdb6d093b7..3729c0bf1cf 100644 --- a/code/modules/vore/appearance/sprite_accessories_vr.dm +++ b/code/modules/vore/appearance/sprite_accessories_vr.dm @@ -1654,19 +1654,11 @@ extra_overlay = "buggofirefly_vass_markings" extra_overlay_w = "buggofatfirefly_vass_markings" -<<<<<<< HEAD /datum/sprite_accessory/tail/tail_smooth name = "Smooth Lizard Tail, Colorable" desc = "" icon_state = "tail_smooth" ani_state = "tail_smooth_w" -======= -/datum/sprite_accessory/tail/lizard_tail_smooth - name = "Lizard Tail (Smooth)" - desc = "" - icon_state = "lizard_tail_smooth" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY /datum/sprite_accessory/tail/lizard_tail_dark_tiger name = "Lizard Tail (Dark Tiger)" @@ -1686,6 +1678,5 @@ name = "Lizard Tail (Spiked)" desc = "" icon_state = "lizard_tail_spiked" ->>>>>>> citrp/master do_colouration = 1 color_blend_mode = ICON_MULTIPLY \ No newline at end of file diff --git a/code/modules/vore/eating/vore_vr.dm b/code/modules/vore/eating/vore_vr.dm index 3deb56649a2..0605644c905 100644 --- a/code/modules/vore/eating/vore_vr.dm +++ b/code/modules/vore/eating/vore_vr.dm @@ -25,13 +25,8 @@ V::::::V V::::::VO:::::::OOO:::::::ORR:::::R R:::::REE::::::EEEEEE // Overrides/additions to stock defines go here, as well as hooks. Sort them by // the object they are overriding. So all /mob/living together, etc. // -<<<<<<< HEAD -/datum/configuration - var/items_survive_digestion = TRUE //For configuring if the important_items survive digestion -======= /datum/configuration_legacy - var/items_survive_digestion = 1 //For configuring if the important_items survive digestion ->>>>>>> citrp/master + var/items_survive_digestion = TRUE //For configuring if the important_items survive digestion // // The datum type bolted onto normal preferences datums for storing Virgo stuff